diff --git a/config.rb b/config.rb
index 77291ff..b36c6fc 100644
--- a/config.rb
+++ b/config.rb
@@ -60,7 +60,8 @@ activate :blog do |blog|
   blog.day_link = "{year}/{month}/{day}.html"
   blog.default_extension = ".md.erb"
 
-  blog.tag_template = "tag.html"
+  blog.tag_template = "list.html"
+  blog.year_template = "list.html"
   # blog.calendar_template = "calendar.html"
 
   # Enable pagination
diff --git a/source/tag.html.haml b/source/list.html.haml
similarity index 82%
rename from source/tag.html.haml
rename to source/list.html.haml
index 864e850..bda2170 100644
--- a/source/tag.html.haml
+++ b/source/list.html.haml
@@ -13,7 +13,13 @@ cover_license: '[Cover Image](https://unsplash.com/photos/2ShvY8Lf6l0) by [Lukas
         %span.word Menu
   .vertical
     .main-header-content.inner
-      %h1.page-title= tagname
+      %h1.page-title
+        - case page_type
+        - when 'tag'
+          = tagname
+        - when 'year'
+          Archive for
+          = year
       %h2.page-description= pluralize(page_articles.count, 'post')
 
 %main#content.content{role: :main}