diff --git a/MANIFEST.in b/MANIFEST.in
deleted file mode 100644
index 14b24c66..00000000
--- a/MANIFEST.in
+++ /dev/null
@@ -1,9 +0,0 @@
-include README.rst
-include LICENSE.rst
-include setup.py
-include setup.cfg
-include pyproject.toml
-include ablog/*.py
-include ablog/templates/*.html
-include ablog/locale/sphinx.pot
-include ablog/locale/*/LC_MESSAGES/sphinx.*o
diff --git a/ablog/__init__.py b/ablog/__init__.py
index ecaa0ee3..66210b3f 100755
--- a/ablog/__init__.py
+++ b/ablog/__init__.py
@@ -30,7 +30,7 @@
 
 def anchor(post):
     """
-    Return anchor string for posts that arepage sections.
+    Return anchor string for posts that are page sections.
     """
 
     if post.section:
diff --git a/ablog/locales/ca/LC_MESSAGES/sphinx.po b/ablog/locales/ca/LC_MESSAGES/sphinx.po
index a4330d74..d5b5d0a3 100644
--- a/ablog/locales/ca/LC_MESSAGES/sphinx.po
+++ b/ablog/locales/ca/LC_MESSAGES/sphinx.po
@@ -22,7 +22,7 @@ msgstr ""
 msgid "Updated on "
 msgstr "Actualitzat el "
 
-#: ablog/post.py:601 ablog/templates/authors.html:2
+#: ablog/post.py:601 ablog/templates/ablog/authors.html:2
 msgid "Authors"
 msgstr "Autors"
 
@@ -30,7 +30,7 @@ msgstr "Autors"
 msgid "Posts by"
 msgstr "Publicacions de"
 
-#: ablog/post.py:602 ablog/templates/locations.html:3
+#: ablog/post.py:602 ablog/templates/ablog/locations.html:3
 msgid "Locations"
 msgstr "Ubicacions"
 
@@ -38,7 +38,7 @@ msgstr "Ubicacions"
 msgid "Posts from"
 msgstr "Publicacions des de"
 
-#: ablog/post.py:603 ablog/templates/languages.html:3
+#: ablog/post.py:603 ablog/templates/ablog/languages.html:3
 msgid "Languages"
 msgstr "Idiomes"
 
@@ -46,7 +46,7 @@ msgstr "Idiomes"
 msgid "Posts in"
 msgstr "Publicacions en"
 
-#: ablog/post.py:604 ablog/templates/categories.html:3
+#: ablog/post.py:604 ablog/templates/ablog/categories.html:3
 msgid "Categories"
 msgstr "Categories"
 
@@ -58,8 +58,8 @@ msgstr "Totes les publicacions"
 msgid "Posted in"
 msgstr "Publicat al"
 
-#: ablog/post.py:606 ablog/templates/postcard2.html:57
-#: ablog/templates/tagcloud.html:2
+#: ablog/post.py:606 ablog/templates/ablog/postcard2.html:57
+#: ablog/templates/ablog/tagcloud.html:2
 msgid "Tags"
 msgstr "Etiquetes"
 
@@ -79,46 +79,46 @@ msgstr "Totes les"
 msgid "Drafts"
 msgstr "Borradors"
 
-#: ablog/templates/archives.html:3
+#: ablog/templates/ablog/archives.html:3
 msgid "Archives"
 msgstr "Arxius"
 
-#: ablog/templates/collection.html:47
+#: ablog/templates/ablog/collection.html:47
 msgid "Read more ..."
 msgstr "Llegir-ne més ..."
 
-#: ablog/templates/postcard2.html:5
+#: ablog/templates/ablog/postcard2.html:5
 msgid "Update"
 msgstr "Actualització"
 
-#: ablog/templates/postcard2.html:12
+#: ablog/templates/ablog/postcard2.html:12
 msgid "Author"
 msgstr "Autor"
 
-#: ablog/templates/postcard2.html:24
+#: ablog/templates/ablog/postcard2.html:24
 msgid "Location"
 msgstr "Ubicació"
 
-#: ablog/templates/postcard2.html:35
+#: ablog/templates/ablog/postcard2.html:35
 msgid "Language"
 msgstr "Idioma"
 
-#: ablog/templates/postcard2.html:46
+#: ablog/templates/ablog/postcard2.html:46
 msgid "Category"
 msgstr "Categoria"
 
-#: ablog/templates/postcard2.html:60
+#: ablog/templates/ablog/postcard2.html:60
 msgid "Tag"
 msgstr "Etiqueta"
 
-#: ablog/templates/postnavy.html:5
+#: ablog/templates/ablog/postnavy.html:5
 msgid "Previous"
 msgstr "Anterior"
 
-#: ablog/templates/postnavy.html:15
+#: ablog/templates/ablog/postnavy.html:15
 msgid "Next"
 msgstr "Següent"
 
-#: ablog/templates/recentposts.html:3
+#: ablog/templates/ablog/recentposts.html:3
 msgid "Recent Posts"
 msgstr "Publicacions recents"
diff --git a/ablog/locales/de/LC_MESSAGES/sphinx.po b/ablog/locales/de/LC_MESSAGES/sphinx.po
index e763b7c1..f7477264 100644
--- a/ablog/locales/de/LC_MESSAGES/sphinx.po
+++ b/ablog/locales/de/LC_MESSAGES/sphinx.po
@@ -21,7 +21,7 @@ msgstr ""
 msgid "Updated on"
 msgstr "Aktualisiert am"
 
-#: ablog/post.py:387 ablog/templates/authors.html:2
+#: ablog/post.py:387 ablog/templates/ablog/authors.html:2
 msgid "Authors"
 msgstr "Autoren"
 
@@ -29,7 +29,7 @@ msgstr "Autoren"
 msgid "Posts by"
 msgstr "Einträge von"
 
-#: ablog/post.py:388 ablog/templates/locations.html:2
+#: ablog/post.py:388 ablog/templates/ablog/locations.html:2
 msgid "Locations"
 msgstr "Orte"
 
@@ -37,7 +37,7 @@ msgstr "Orte"
 msgid "Posts from"
 msgstr "Einträge aus"
 
-#: ablog/post.py:389 ablog/templates/languages.html:2
+#: ablog/post.py:389 ablog/templates/ablog/languages.html:2
 msgid "Languages"
 msgstr "Sprachen"
 
@@ -45,7 +45,7 @@ msgstr "Sprachen"
 msgid "Posts in"
 msgstr "Einträge in"
 
-#: ablog/post.py:390 ablog/templates/categories.html:2
+#: ablog/post.py:390 ablog/templates/ablog/categories.html:2
 msgid "Categories"
 msgstr "Kategorien"
 
@@ -57,8 +57,8 @@ msgstr "Alle Einträge"
 msgid "Posted in"
 msgstr "Einträge in"
 
-#: ablog/post.py:392 ablog/templates/postcard2.html:43
-#: ablog/templates/tagcloud.html:2
+#: ablog/post.py:392 ablog/templates/ablog/postcard2.html:43
+#: ablog/templates/ablog/tagcloud.html:2
 msgid "Tags"
 msgstr "Schlagworte"
 
@@ -70,46 +70,46 @@ msgstr "Einträge mit Schlagwort"
 msgid "Drafts"
 msgstr "Entwurf"
 
-#: ablog/templates/archive.html:49
+#: ablog/templates/ablog/archive.html:49
 msgid "Read more ..."
 msgstr "Weiter..."
 
-#: ablog/templates/archives.html:2
+#: ablog/templates/ablog/archives.html:2
 msgid "Archives"
 msgstr "Archive"
 
-#: ablog/templates/postcard2.html:2
+#: ablog/templates/ablog/postcard2.html:2
 msgid "Update"
 msgstr "Aktualisierung"
 
-#: ablog/templates/postcard2.html:7
+#: ablog/templates/ablog/postcard2.html:7
 msgid "Author"
 msgstr "Autor"
 
-#: ablog/templates/postcard2.html:16
+#: ablog/templates/ablog/postcard2.html:16
 msgid "Location"
 msgstr "Ort"
 
-#: ablog/templates/postcard2.html:25
+#: ablog/templates/ablog/postcard2.html:25
 msgid "Language"
 msgstr "Sprache"
 
-#: ablog/templates/postcard2.html:34
+#: ablog/templates/ablog/postcard2.html:34
 msgid "Category"
 msgstr "Kategorie"
 
-#: ablog/templates/postcard2.html:44
+#: ablog/templates/ablog/postcard2.html:44
 msgid "Tag"
 msgstr "Schlagwort"
 
-#: ablog/templates/postnavy.html:7
+#: ablog/templates/ablog/postnavy.html:7
 msgid "Previous"
 msgstr "Vorige"
 
-#: ablog/templates/postnavy.html:17
+#: ablog/templates/ablog/postnavy.html:17
 msgid "Next"
 msgstr "Nächste"
 
-#: ablog/templates/recentposts.html:2
+#: ablog/templates/ablog/recentposts.html:2
 msgid "Recent Posts"
 msgstr "Neue Einträge"
diff --git a/ablog/locales/es/LC_MESSAGES/sphinx.po b/ablog/locales/es/LC_MESSAGES/sphinx.po
index 850e5620..7c62a61f 100644
--- a/ablog/locales/es/LC_MESSAGES/sphinx.po
+++ b/ablog/locales/es/LC_MESSAGES/sphinx.po
@@ -22,7 +22,7 @@ msgstr ""
 msgid "Updated on"
 msgstr "Actualizado el"
 
-#: ablog/post.py:387 ablog/templates/authors.html:2
+#: ablog/post.py:387 ablog/templates/ablog/authors.html:2
 msgid "Authors"
 msgstr "Autores"
 
@@ -30,7 +30,7 @@ msgstr "Autores"
 msgid "Posts by"
 msgstr "Entradas por"
 
-#: ablog/post.py:388 ablog/templates/locations.html:2
+#: ablog/post.py:388 ablog/templates/ablog/locations.html:2
 msgid "Locations"
 msgstr "Lugares"
 
@@ -38,7 +38,7 @@ msgstr "Lugares"
 msgid "Posts from"
 msgstr "Entradas desde"
 
-#: ablog/post.py:389 ablog/templates/languages.html:2
+#: ablog/post.py:389 ablog/templates/ablog/languages.html:2
 msgid "Languages"
 msgstr "Idiomas"
 
@@ -46,7 +46,7 @@ msgstr "Idiomas"
 msgid "Posts in"
 msgstr "Entradas en"
 
-#: ablog/post.py:390 ablog/templates/categories.html:2
+#: ablog/post.py:390 ablog/templates/ablog/categories.html:2
 msgid "Categories"
 msgstr "Categorías"
 
@@ -58,8 +58,8 @@ msgstr "Todas las entradas"
 msgid "Posted in"
 msgstr "Publicado en"
 
-#: ablog/post.py:392 ablog/templates/postcard2.html:43
-#: ablog/templates/tagcloud.html:2
+#: ablog/post.py:392 ablog/templates/ablog/postcard2.html:43
+#: ablog/templates/ablog/tagcloud.html:2
 msgid "Tags"
 msgstr "Etiquetas"
 
@@ -71,46 +71,46 @@ msgstr "Entradas etiquetadas"
 msgid "Drafts"
 msgstr "Borradores"
 
-#: ablog/templates/archive.html:49
+#: ablog/templates/ablog/archive.html:49
 msgid "Read more ..."
 msgstr "Leer más ..."
 
-#: ablog/templates/archives.html:2
+#: ablog/templates/ablog/archives.html:2
 msgid "Archives"
 msgstr "Archivos"
 
-#: ablog/templates/postcard2.html:2
+#: ablog/templates/ablog/postcard2.html:2
 msgid "Update"
 msgstr "Actualizado"
 
-#: ablog/templates/postcard2.html:7
+#: ablog/templates/ablog/postcard2.html:7
 msgid "Author"
 msgstr "Autor"
 
-#: ablog/templates/postcard2.html:16
+#: ablog/templates/ablog/postcard2.html:16
 msgid "Location"
 msgstr "Lugar"
 
-#: ablog/templates/postcard2.html:25
+#: ablog/templates/ablog/postcard2.html:25
 msgid "Language"
 msgstr "Idioma"
 
-#: ablog/templates/postcard2.html:34
+#: ablog/templates/ablog/postcard2.html:34
 msgid "Category"
 msgstr "Categoría"
 
-#: ablog/templates/postcard2.html:44
+#: ablog/templates/ablog/postcard2.html:44
 msgid "Tag"
 msgstr "Etiqueta"
 
-#: ablog/templates/postnavy.html:7
+#: ablog/templates/ablog/postnavy.html:7
 msgid "Previous"
 msgstr "Anterior"
 
-#: ablog/templates/postnavy.html:17
+#: ablog/templates/ablog/postnavy.html:17
 msgid "Next"
 msgstr "Siguiente"
 
-#: ablog/templates/recentposts.html:2
+#: ablog/templates/ablog/recentposts.html:2
 msgid "Recent Posts"
 msgstr "Entradas recientes"
diff --git a/ablog/locales/et/LC_MESSAGES/sphinx.po b/ablog/locales/et/LC_MESSAGES/sphinx.po
index daa43898..579fd266 100644
--- a/ablog/locales/et/LC_MESSAGES/sphinx.po
+++ b/ablog/locales/et/LC_MESSAGES/sphinx.po
@@ -21,7 +21,7 @@ msgstr ""
 msgid "Updated on"
 msgstr "Uuendus"
 
-#: ablog/post.py:387 ablog/templates/authors.html:2
+#: ablog/post.py:387 ablog/templates/ablog/authors.html:2
 msgid "Authors"
 msgstr "Autorid"
 
@@ -29,7 +29,7 @@ msgstr "Autorid"
 msgid "Posts by"
 msgstr "Postitused autorilt"
 
-#: ablog/post.py:388 ablog/templates/locations.html:2
+#: ablog/post.py:388 ablog/templates/ablog/locations.html:2
 msgid "Locations"
 msgstr "Kohad"
 
@@ -37,7 +37,7 @@ msgstr "Kohad"
 msgid "Posts from"
 msgstr ""
 
-#: ablog/post.py:389 ablog/templates/languages.html:2
+#: ablog/post.py:389 ablog/templates/ablog/languages.html:2
 msgid "Languages"
 msgstr "Keeltes"
 
@@ -45,7 +45,7 @@ msgstr "Keeltes"
 msgid "Posts in"
 msgstr ""
 
-#: ablog/post.py:390 ablog/templates/categories.html:2
+#: ablog/post.py:390 ablog/templates/ablog/categories.html:2
 msgid "Categories"
 msgstr "Kategooriad"
 
@@ -57,8 +57,8 @@ msgstr "Kõik postitused"
 msgid "Posted in"
 msgstr "Postitused kategoorias"
 
-#: ablog/post.py:392 ablog/templates/postcard2.html:43
-#: ablog/templates/tagcloud.html:2
+#: ablog/post.py:392 ablog/templates/ablog/postcard2.html:43
+#: ablog/templates/ablog/tagcloud.html:2
 msgid "Tags"
 msgstr "Märksõnad"
 
@@ -70,46 +70,46 @@ msgstr "Postitused märksõnaga"
 msgid "Drafts"
 msgstr "Eelnõu"
 
-#: ablog/templates/archive.html:49
+#: ablog/templates/ablog/archive.html:49
 msgid "Read more ..."
 msgstr "Edasi..."
 
-#: ablog/templates/archives.html:2
+#: ablog/templates/ablog/archives.html:2
 msgid "Archives"
 msgstr "Arhiiv"
 
-#: ablog/templates/postcard2.html:2
+#: ablog/templates/ablog/postcard2.html:2
 msgid "Update"
 msgstr "Ajakohastama"
 
-#: ablog/templates/postcard2.html:7
+#: ablog/templates/ablog/postcard2.html:7
 msgid "Author"
 msgstr "Autor"
 
-#: ablog/templates/postcard2.html:16
+#: ablog/templates/ablog/postcard2.html:16
 msgid "Location"
 msgstr "Koht"
 
-#: ablog/templates/postcard2.html:25
+#: ablog/templates/ablog/postcard2.html:25
 msgid "Language"
 msgstr "Keel"
 
-#: ablog/templates/postcard2.html:34
+#: ablog/templates/ablog/postcard2.html:34
 msgid "Category"
 msgstr "Kategooria"
 
-#: ablog/templates/postcard2.html:44
+#: ablog/templates/ablog/postcard2.html:44
 msgid "Tag"
 msgstr "Märksõna"
 
-#: ablog/templates/postnavy.html:7
+#: ablog/templates/ablog/postnavy.html:7
 msgid "Previous"
 msgstr "Eelmine"
 
-#: ablog/templates/postnavy.html:17
+#: ablog/templates/ablog/postnavy.html:17
 msgid "Next"
 msgstr "Järgmine"
 
-#: ablog/templates/recentposts.html:2
+#: ablog/templates/ablog/recentposts.html:2
 msgid "Recent Posts"
 msgstr "Viimased postitused"
diff --git a/ablog/locales/fr/LC_MESSAGES/sphinx.po b/ablog/locales/fr/LC_MESSAGES/sphinx.po
index 09a7e22c..f258d3d8 100644
--- a/ablog/locales/fr/LC_MESSAGES/sphinx.po
+++ b/ablog/locales/fr/LC_MESSAGES/sphinx.po
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.8.0\n"
 
-#: ablog/post.py:525 ablog/templates/authors.html:2
+#: ablog/post.py:525 ablog/templates/ablog/authors.html:2
 msgid "Authors"
 msgstr "Auteurs"
 
@@ -26,7 +26,7 @@ msgstr "Auteurs"
 msgid "Posts by"
 msgstr "Billets par"
 
-#: ablog/post.py:526 ablog/templates/locations.html:2
+#: ablog/post.py:526 ablog/templates/ablog/locations.html:2
 msgid "Locations"
 msgstr "Lieux"
 
@@ -34,7 +34,7 @@ msgstr "Lieux"
 msgid "Posts from"
 msgstr "Billets depuis"
 
-#: ablog/post.py:527 ablog/templates/languages.html:2
+#: ablog/post.py:527 ablog/templates/ablog/languages.html:2
 msgid "Languages"
 msgstr "Langues"
 
@@ -42,7 +42,7 @@ msgstr "Langues"
 msgid "Posts in"
 msgstr "Billets dans"
 
-#: ablog/post.py:528 ablog/templates/categories.html:2
+#: ablog/post.py:528 ablog/templates/ablog/categories.html:2
 msgid "Categories"
 msgstr "Catégories"
 
@@ -54,8 +54,8 @@ msgstr "Tous les billets"
 msgid "Posted in"
 msgstr "Publié dans"
 
-#: ablog/post.py:530 ablog/templates/postcard2.html:43
-#: ablog/templates/tagcloud.html:2
+#: ablog/post.py:530 ablog/templates/ablog/postcard2.html:43
+#: ablog/templates/ablog/tagcloud.html:2
 msgid "Tags"
 msgstr "Tags"
 
@@ -75,46 +75,46 @@ msgstr "Tous les billets"
 msgid "Drafts"
 msgstr "Brouillons"
 
-#: ablog/templates/archives.html:2
+#: ablog/templates/ablog/archives.html:2
 msgid "Archives"
 msgstr "Archives"
 
-#: ablog/templates/collection.html:48
+#: ablog/templates/ablog/collection.html:48
 msgid "Read more ..."
 msgstr "Lire plus…"
 
-#: ablog/templates/postcard2.html:2
+#: ablog/templates/ablog/postcard2.html:2
 msgid "Update"
 msgstr "Mis à jour"
 
-#: ablog/templates/postcard2.html:7
+#: ablog/templates/ablog/postcard2.html:7
 msgid "Author"
 msgstr "Auteur"
 
-#: ablog/templates/postcard2.html:16
+#: ablog/templates/ablog/postcard2.html:16
 msgid "Location"
 msgstr "Lieu"
 
-#: ablog/templates/postcard2.html:25
+#: ablog/templates/ablog/postcard2.html:25
 msgid "Language"
 msgstr "Langue"
 
-#: ablog/templates/postcard2.html:34
+#: ablog/templates/ablog/postcard2.html:34
 msgid "Category"
 msgstr "Catégorie"
 
-#: ablog/templates/postcard2.html:44
+#: ablog/templates/ablog/postcard2.html:44
 msgid "Tag"
 msgstr "Tag"
 
-#: ablog/templates/postnavy.html:7
+#: ablog/templates/ablog/postnavy.html:7
 msgid "Previous"
 msgstr "Précédent"
 
-#: ablog/templates/postnavy.html:17
+#: ablog/templates/ablog/postnavy.html:17
 msgid "Next"
 msgstr "Suivant"
 
-#: ablog/templates/recentposts.html:2
+#: ablog/templates/ablog/recentposts.html:2
 msgid "Recent Posts"
 msgstr "Billets récents"
diff --git a/ablog/locales/ru/LC_MESSAGES/sphinx.po b/ablog/locales/ru/LC_MESSAGES/sphinx.po
index 63edab0a..d117a471 100644
--- a/ablog/locales/ru/LC_MESSAGES/sphinx.po
+++ b/ablog/locales/ru/LC_MESSAGES/sphinx.po
@@ -23,7 +23,7 @@ msgstr ""
 msgid "Updated on"
 msgstr "Обновлено"
 
-#: ablog/post.py:387 ablog/templates/authors.html:2
+#: ablog/post.py:387 ablog/templates/ablog/authors.html:2
 msgid "Authors"
 msgstr "Авторы"
 
@@ -31,7 +31,7 @@ msgstr "Авторы"
 msgid "Posts by"
 msgstr "Опубликовано"
 
-#: ablog/post.py:388 ablog/templates/locations.html:2
+#: ablog/post.py:388 ablog/templates/ablog/locations.html:2
 msgid "Locations"
 msgstr ""
 
@@ -39,7 +39,7 @@ msgstr ""
 msgid "Posts from"
 msgstr "Сообщения из"
 
-#: ablog/post.py:389 ablog/templates/languages.html:2
+#: ablog/post.py:389 ablog/templates/ablog/languages.html:2
 msgid "Languages"
 msgstr "Языки"
 
@@ -47,7 +47,7 @@ msgstr "Языки"
 msgid "Posts in"
 msgstr "Сообщений в"
 
-#: ablog/post.py:390 ablog/templates/categories.html:2
+#: ablog/post.py:390 ablog/templates/ablog/categories.html:2
 msgid "Categories"
 msgstr "Категории"
 
@@ -59,8 +59,8 @@ msgstr "Все записи"
 msgid "Posted in"
 msgstr "Опубликовано в"
 
-#: ablog/post.py:392 ablog/templates/postcard2.html:43
-#: ablog/templates/tagcloud.html:2
+#: ablog/post.py:392 ablog/templates/ablog/postcard2.html:43
+#: ablog/templates/ablog/tagcloud.html:2
 msgid "Tags"
 msgstr "Теги"
 
@@ -72,46 +72,46 @@ msgstr "Сообщения с тегом"
 msgid "Drafts"
 msgstr "Черновик"
 
-#: ablog/templates/archive.html:49
+#: ablog/templates/ablog/archive.html:49
 msgid "Read more ..."
 msgstr "Читать ..."
 
-#: ablog/templates/archives.html:2
+#: ablog/templates/ablog/archives.html:2
 msgid "Archives"
 msgstr "Архив"
 
-#: ablog/templates/postcard2.html:2
+#: ablog/templates/ablog/postcard2.html:2
 msgid "Update"
 msgstr "Обновить"
 
-#: ablog/templates/postcard2.html:7
+#: ablog/templates/ablog/postcard2.html:7
 msgid "Author"
 msgstr "Автор"
 
-#: ablog/templates/postcard2.html:16
+#: ablog/templates/ablog/postcard2.html:16
 msgid "Location"
 msgstr "Расположение"
 
-#: ablog/templates/postcard2.html:25
+#: ablog/templates/ablog/postcard2.html:25
 msgid "Language"
 msgstr "Язык"
 
-#: ablog/templates/postcard2.html:34
+#: ablog/templates/ablog/postcard2.html:34
 msgid "Category"
 msgstr "Категория"
 
-#: ablog/templates/postcard2.html:44
+#: ablog/templates/ablog/postcard2.html:44
 msgid "Tag"
 msgstr "Тег"
 
-#: ablog/templates/postnavy.html:7
+#: ablog/templates/ablog/postnavy.html:7
 msgid "Previous"
 msgstr "Предыдущий"
 
-#: ablog/templates/postnavy.html:17
+#: ablog/templates/ablog/postnavy.html:17
 msgid "Next"
 msgstr "Следующий"
 
-#: ablog/templates/recentposts.html:2
+#: ablog/templates/ablog/recentposts.html:2
 msgid "Recent Posts"
 msgstr "Недавние Записи"
diff --git a/ablog/locales/tr/LC_MESSAGES/sphinx.po b/ablog/locales/tr/LC_MESSAGES/sphinx.po
index bd79826f..8652d2e5 100644
--- a/ablog/locales/tr/LC_MESSAGES/sphinx.po
+++ b/ablog/locales/tr/LC_MESSAGES/sphinx.po
@@ -21,7 +21,7 @@ msgstr ""
 msgid "Updated on"
 msgstr "Güncelleme"
 
-#: ablog/post.py:387 ablog/templates/authors.html:2
+#: ablog/post.py:387 ablog/templates/ablog/authors.html:2
 msgid "Authors"
 msgstr "Yazarlar"
 
@@ -29,7 +29,7 @@ msgstr "Yazarlar"
 msgid "Posts by"
 msgstr "Yazar"
 
-#: ablog/post.py:388 ablog/templates/locations.html:2
+#: ablog/post.py:388 ablog/templates/ablog/locations.html:2
 msgid "Locations"
 msgstr "Mevkiler"
 
@@ -37,7 +37,7 @@ msgstr "Mevkiler"
 msgid "Posts from"
 msgstr "Mevki"
 
-#: ablog/post.py:389 ablog/templates/languages.html:2
+#: ablog/post.py:389 ablog/templates/ablog/languages.html:2
 msgid "Languages"
 msgstr "Diller"
 
@@ -45,7 +45,7 @@ msgstr "Diller"
 msgid "Posts in"
 msgstr "Kategori"
 
-#: ablog/post.py:390 ablog/templates/categories.html:2
+#: ablog/post.py:390 ablog/templates/ablog/categories.html:2
 msgid "Categories"
 msgstr "Kategoriler"
 
@@ -57,8 +57,8 @@ msgstr "Bütün yazılar"
 msgid "Posted in"
 msgstr "Sene"
 
-#: ablog/post.py:392 ablog/templates/postcard2.html:43
-#: ablog/templates/tagcloud.html:2
+#: ablog/post.py:392 ablog/templates/ablog/postcard2.html:43
+#: ablog/templates/ablog/tagcloud.html:2
 msgid "Tags"
 msgstr "Etiketler"
 
@@ -70,46 +70,46 @@ msgstr "Etiket"
 msgid "Drafts"
 msgstr "Taslaklar"
 
-#: ablog/templates/archive.html:49
+#: ablog/templates/ablog/archive.html:49
 msgid "Read more ..."
 msgstr "Okumaya devam et ..."
 
-#: ablog/templates/archives.html:2
+#: ablog/templates/ablog/archives.html:2
 msgid "Archives"
 msgstr "Arşiv"
 
-#: ablog/templates/postcard2.html:2
+#: ablog/templates/ablog/postcard2.html:2
 msgid "Update"
 msgstr "Güncelleme"
 
-#: ablog/templates/postcard2.html:7
+#: ablog/templates/ablog/postcard2.html:7
 msgid "Author"
 msgstr "Yazar"
 
-#: ablog/templates/postcard2.html:16
+#: ablog/templates/ablog/postcard2.html:16
 msgid "Location"
 msgstr "Mevki"
 
-#: ablog/templates/postcard2.html:25
+#: ablog/templates/ablog/postcard2.html:25
 msgid "Language"
 msgstr "Dil"
 
-#: ablog/templates/postcard2.html:34
+#: ablog/templates/ablog/postcard2.html:34
 msgid "Category"
 msgstr "Kategori"
 
-#: ablog/templates/postcard2.html:44
+#: ablog/templates/ablog/postcard2.html:44
 msgid "Tag"
 msgstr "Etiket"
 
-#: ablog/templates/postnavy.html:7
+#: ablog/templates/ablog/postnavy.html:7
 msgid "Previous"
 msgstr "Önceki"
 
-#: ablog/templates/postnavy.html:17
+#: ablog/templates/ablog/postnavy.html:17
 msgid "Next"
 msgstr "Sonraki"
 
-#: ablog/templates/recentposts.html:2
+#: ablog/templates/ablog/recentposts.html:2
 msgid "Recent Posts"
 msgstr "Yeni Yazılar"
diff --git a/ablog/locales/zh_CN/LC_MESSAGES/sphinx.po b/ablog/locales/zh_CN/LC_MESSAGES/sphinx.po
index 588e32d4..7f213e8d 100644
--- a/ablog/locales/zh_CN/LC_MESSAGES/sphinx.po
+++ b/ablog/locales/zh_CN/LC_MESSAGES/sphinx.po
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.7.0\n"
 
-#: ablog/post.py:525 ablog/templates/authors.html:2
+#: ablog/post.py:525 ablog/templates/ablog/authors.html:2
 msgid "Authors"
 msgstr "作者"
 
@@ -26,7 +26,7 @@ msgstr "作者"
 msgid "Posts by"
 msgstr "文章"
 
-#: ablog/post.py:526 ablog/templates/locations.html:2
+#: ablog/post.py:526 ablog/templates/ablog/locations.html:2
 msgid "Locations"
 msgstr "地点"
 
@@ -34,7 +34,7 @@ msgstr "地点"
 msgid "Posts from"
 msgstr "文章自"
 
-#: ablog/post.py:527 ablog/templates/languages.html:2
+#: ablog/post.py:527 ablog/templates/ablog/languages.html:2
 msgid "Languages"
 msgstr "语言"
 
@@ -42,7 +42,7 @@ msgstr "语言"
 msgid "Posts in"
 msgstr "文章："
 
-#: ablog/post.py:528 ablog/templates/categories.html:2
+#: ablog/post.py:528 ablog/templates/ablog/categories.html:2
 msgid "Categories"
 msgstr "类别"
 
@@ -54,8 +54,8 @@ msgstr "所有文章"
 msgid "Posted in"
 msgstr "文章："
 
-#: ablog/post.py:530 ablog/templates/postcard2.html:43
-#: ablog/templates/tagcloud.html:2
+#: ablog/post.py:530 ablog/templates/ablog/postcard2.html:43
+#: ablog/templates/ablog/tagcloud.html:2
 msgid "Tags"
 msgstr "标签"
 
@@ -75,46 +75,46 @@ msgstr "所有"
 msgid "Drafts"
 msgstr "草稿"
 
-#: ablog/templates/archives.html:2
+#: ablog/templates/ablog/archives.html:2
 msgid "Archives"
 msgstr "归档"
 
-#: ablog/templates/collection.html:48
+#: ablog/templates/ablog/collection.html:48
 msgid "Read more ..."
 msgstr "更多 ..."
 
-#: ablog/templates/postcard2.html:2
+#: ablog/templates/ablog/postcard2.html:2
 msgid "Update"
 msgstr "更新"
 
-#: ablog/templates/postcard2.html:7
+#: ablog/templates/ablog/postcard2.html:7
 msgid "Author"
 msgstr "作者"
 
-#: ablog/templates/postcard2.html:16
+#: ablog/templates/ablog/postcard2.html:16
 msgid "Location"
 msgstr "地点"
 
-#: ablog/templates/postcard2.html:25
+#: ablog/templates/ablog/postcard2.html:25
 msgid "Language"
 msgstr "语言"
 
-#: ablog/templates/postcard2.html:34
+#: ablog/templates/ablog/postcard2.html:34
 msgid "Category"
 msgstr "类别"
 
-#: ablog/templates/postcard2.html:44
+#: ablog/templates/ablog/postcard2.html:44
 msgid "Tag"
 msgstr "标签"
 
-#: ablog/templates/postnavy.html:7
+#: ablog/templates/ablog/postnavy.html:7
 msgid "Previous"
 msgstr "上一篇"
 
-#: ablog/templates/postnavy.html:17
+#: ablog/templates/ablog/postnavy.html:17
 msgid "Next"
 msgstr "下一篇"
 
-#: ablog/templates/recentposts.html:2
+#: ablog/templates/ablog/recentposts.html:2
 msgid "Recent Posts"
 msgstr "最近文章"