diff --git a/lumbunglib/templates/feed.md b/lumbunglib/templates/feed.md
index ddef11d..d9f3f9a 100644
--- a/lumbunglib/templates/feed.md
+++ b/lumbunglib/templates/feed.md
@@ -3,7 +3,7 @@ title: "{{ frontmatter.title }}"
 date: "{{ frontmatter.date }}" #2021-06-10T10:46:33+02:00
 draft: false
 summary: "{{ frontmatter.summary }}"
-author: "{{ frontmatter.author }}"
+authors: {% if frontmatter.author %} ["{{ frontmatter.author }}"] {% endif %}
 original_link: "{{ frontmatter.original_link }}"
 feed_name: "{{ frontmatter.feed_name}}"
 categories: ["{{ frontmatter.card_type }}", "{{ frontmatter.feed_name}}"]
diff --git a/lumbunglib/templates/hashtag.md b/lumbunglib/templates/hashtag.md
index 786ff6b..bdcacba 100644
--- a/lumbunglib/templates/hashtag.md
+++ b/lumbunglib/templates/hashtag.md
@@ -1,12 +1,12 @@
 ---
-date: "{{ post_metadata.created_at }}" #2021-06-10T10:46:33+02:00
+date: {{ post_metadata.created_at }} #2021-06-10T10:46:33+02:00
 draft: false
-author: "{{ post_metadata.account.display_name }}"
-avatar: "{{ post_metadata.account.avatar }}"
+authors: ["{{ post_metadata.account.display_name }}"]
+avatar: {{ post_metadata.account.avatar }}
 categories: ["shouts"]
-images: [{% for i in post_metadata.media_attachments %} "{{ i.url }}", {% endfor %}]
-title: "{{ post_metadata.account.display_name }}"
-tags: [{% for i in post_metadata.tags %} "{{ i.name }}", {% endfor %}]
+images: [{% for i in post_metadata.media_attachments %} {{ i.url }}, {% endfor %}]
+title: {{ post_metadata.account.display_name }}
+tags: [{% for i in post_metadata.tags %} {{ i.name }} {% endfor %}]
 ---
 
 {% for item in post_metadata.media_attachments %}