diff --git a/konfluks/templates/calendar.md b/konfluks/templates/calendar.md
index e27acbe..f1072a2 100644
--- a/konfluks/templates/calendar.md
+++ b/konfluks/templates/calendar.md
@@ -2,7 +2,7 @@
 title: "{{ event.name }}"
 date: "{{ event.begin }}" #2021-06-10T10:46:33+02:00
 draft: false
-categories: "calendar"
+source: "lumbung calendar"
 event_begin: "{{ event.begin }}"
 event_end: "{{ event.end }}"
 duration: "{{ event.duration }}"
diff --git a/konfluks/templates/feed.md b/konfluks/templates/feed.md
index 29d8e91..54492f1 100644
--- a/konfluks/templates/feed.md
+++ b/konfluks/templates/feed.md
@@ -3,11 +3,11 @@ title: "{{ frontmatter.title }}"
 date: "{{ frontmatter.date }}" #2021-06-10T10:46:33+02:00
 draft: false
 summary: "{{ frontmatter.summary }}"
-authors: {% if frontmatter.author %} ["{{ frontmatter.author }}"] {% endif %}
+contributors: {% if frontmatter.author %} ["{{ frontmatter.author }}"] {% endif %}
 original_link: "{{ frontmatter.original_link }}"
 feed_name: "{{ frontmatter.feed_name}}"
-categories: ["{{ frontmatter.card_type }}", "{{ frontmatter.feed_name}}"]
-contributors: ["{{ frontmatter.feed_name}}"]
+card_type: "{{ frontmatter.card_type }}"
+sources: ["{{ frontmatter.feed_name}}"]
 tags: {{ frontmatter.tags }}
 {% if frontmatter.featured_image %}featured_image: "{{frontmatter.featured_image}}"{% endif %}
 ---
diff --git a/konfluks/templates/hashtag.md b/konfluks/templates/hashtag.md
index 1148b79..ed41ffe 100644
--- a/konfluks/templates/hashtag.md
+++ b/konfluks/templates/hashtag.md
@@ -1,10 +1,8 @@
 ---
 date: {{ post_metadata.created_at }} #2021-06-10T10:46:33+02:00
 draft: false
-authors: ["{{ post_metadata.account.display_name }}"]
-contributors: ["{{ post_metadata.account.acct}}"]
+contributors: ["{{ post_metadata.account.display_name }}"]
 avatar: {{ post_metadata.account.avatar }}
-categories: ["shouts"]
 title: {{ post_metadata.account.display_name }}
 tags: [{% for i in post_metadata.tags %} "{{ i.name }}", {% endfor %}]
 images: [{% for i in post_metadata.media_attachments %}{% if i.type == "image" %}"{{ i.url | localize_media_url  }}", {%endif%}{% endfor %}]
diff --git a/konfluks/templates/timeline.md b/konfluks/templates/timeline.md
index 0cc9c2b..b089a76 100644
--- a/konfluks/templates/timeline.md
+++ b/konfluks/templates/timeline.md
@@ -3,10 +3,10 @@ title: "{{ frontmatter.title }}"
 date: "{{ frontmatter.date }}" #2021-06-10T10:46:33+02:00
 draft: false
 summary: "{{ frontmatter.summary }}"
-authors: {% if frontmatter.author %} ["{{ frontmatter.author }}"] {% endif %}
+contributors: {% if frontmatter.author %} ["{{ frontmatter.author }}"] {% endif %}
 original_link: "{{ frontmatter.original_link }}"
 feed_name: "{{ frontmatter.feed_name}}"
-categories: ["timeline", "{{ frontmatter.feed_name}}"]
+sources: ["timeline", "{{ frontmatter.feed_name}}"]
 timelines: {{ frontmatter.timelines }}
 hidden: true
 ---
diff --git a/konfluks/templates/video.md b/konfluks/templates/video.md
index 076a1bf..eafa1a8 100644
--- a/konfluks/templates/video.md
+++ b/konfluks/templates/video.md
@@ -9,7 +9,7 @@ channel_url: "{{ v.channel.url }}"
 contributors: ["{{ v.account.display_name }}"]
 preview_image: "{{ preview_image }}"
 images: ["./{{ preview_image }}"]
-categories: ["tv","{{ v.channel.display_name }}"]
+sources: ["{{ v.channel.display_name }}"]
 is_live: {{ v.is_live }}
 ---