diff --git a/flatfilecms/templates/atom.jinja2 b/flatfilecms/templates/atom.jinja2
index 43c13ac..ea80056 100644
--- a/flatfilecms/templates/atom.jinja2
+++ b/flatfilecms/templates/atom.jinja2
@@ -5,16 +5,16 @@
{{subtitle}}
{%- endif %}
- {%- if alternate %}
-
+ {%- if 'links' in feed and feed['index'] %}
+
{%- endif %}
{{(pages[0][1].page['updated'] or pages[0][1].page['published']).isoformat()}}+00:00
- urn:uuid:{{id}}
+ urn:uuid:{{feed['id']}}
- {{author['name']}}
+ {{feed['author']['name']}}
- {%- if category %}
-
+ {%- if feed['category'] %}
+
{%- endif %}
flatfilecms
{%- for item in pages %}
diff --git a/flatfilecms/templates/base.jinja2 b/flatfilecms/templates/base.jinja2
index 4a9b0aa..0fcc915 100644
--- a/flatfilecms/templates/base.jinja2
+++ b/flatfilecms/templates/base.jinja2
@@ -2,19 +2,19 @@
- {% block head -%}
+ {%- block head %}
- {% if amphtml is defined -%}
+ {%- if amphtml is defined %}
- {% endif -%}
- {% for link in alternate -%}
-
- {% endfor -%}
+ {%- endif %}
+ {%- if feed is defined %}
+
+ {%- endif %}
{{title}}
{% block links %}
{%- endblock %}
diff --git a/flatfilecms/templates/blogposts.jinja2 b/flatfilecms/templates/blogposts.jinja2
index d7a8a05..197ebac 100644
--- a/flatfilecms/templates/blogposts.jinja2
+++ b/flatfilecms/templates/blogposts.jinja2
@@ -1,5 +1,5 @@
{% extends "layout.jinja2" %}
-{% if header_class is not defined %}{% set header_class="light" %}{%endif%}
+{%- if header_class is not defined %}{% set header_class="light" %}{%endif%}
{% block content %}
{% for item in pages %}
@@ -17,8 +17,4 @@
{% endfor %}
-{% set atom_feed = alternate|selectattr('type', 'equalto', 'application/atom+xml')|first -%}
-{% if atom_feed -%}
-
Подписаться на обновления:
-{% endif -%}
{% endblock %}
diff --git a/flatfilecms/templates/feedlinks.jinja2 b/flatfilecms/templates/feedlinks.jinja2
new file mode 100644
index 0000000..94c0116
--- /dev/null
+++ b/flatfilecms/templates/feedlinks.jinja2
@@ -0,0 +1,22 @@
+{%- if feed is defined and 'links' in feed %}
+
+
Лента сообщений в удобном формате:
+
+ {%- if 'index' in feed['links'] %}
+
+ {%- endif %}
+ {%- if 'atom' in feed['links'] %}
+
+ {%- endif %}
+ {%- if 'twitter' in feed['links'] %}
+
+ {%- endif %}
+ {%- if 'telegram' in feed['links'] %}
+
+ {%- endif %}
+ {%- if 'facebook' in feed['links'] %}
+
+ {%- endif %}
+