diff --git a/themes/modern/pages/404.htm b/themes/modern/pages/404.htm
new file mode 100644
index 000000000..b9bb579a8
--- /dev/null
+++ b/themes/modern/pages/404.htm
@@ -0,0 +1,10 @@
+title = "Page not found (404)"
+url = "/404"
+layout = "cms"
+==
+<div class="jumbotron">
+    <div class="container">
+        <h1>Page not found</h1>
+        <p>We're sorry, but the page you requested cannot be found.</p>
+    </div>
+</div>
diff --git a/themes/modern/pages/category.htm b/themes/modern/pages/category.htm
index 77f85c2d9..4f8dbad5c 100644
--- a/themes/modern/pages/category.htm
+++ b/themes/modern/pages/category.htm
@@ -5,6 +5,10 @@ is_hidden = 0
 robot_index = "index"
 robot_follow = "follow"
 
+[viewBag]
+localeUrl[en] = "/category/:slug"
+localeTitle[en] = "Category"
+
 [blogPosts]
 pageNumber = "{{ :page }}"
 categoryFilter = "{{ :slug }}"
@@ -13,9 +17,6 @@ noPostsMessage = "No posts found"
 sortOrder = "published_at desc"
 categoryPage = "category"
 postPage = "post"
-
-[viewBag]
-localeUrl[en] = "/category/:slug"
 ==
 <div class="main__content">
     <div class="heading">
@@ -45,4 +46,4 @@ localeUrl[en] = "/category/:slug"
         field: document.getElementById('calendar')
     });
 </script>
-{% endput %}
+{% endput %}
\ No newline at end of file
diff --git a/themes/modern/pages/tag.htm b/themes/modern/pages/tag.htm
new file mode 100644
index 000000000..4f13fe500
--- /dev/null
+++ b/themes/modern/pages/tag.htm
@@ -0,0 +1,48 @@
+title = "Тег"
+url = "/tag/:slug"
+layout = "cms"
+is_hidden = 0
+robot_index = "index"
+robot_follow = "follow"
+
+[viewBag]
+localeUrl[en] = "/tag/:slug"
+localeTitle[en] = "Tag"
+
+[blogTagSearch]
+tag = "{{ :tag }}"
+pagination = 1
+page = "{{ :page }}"
+resultsPerPage = 10
+postPage = "post"
+categoryPage = "category"
+==
+<div class="main__content">
+    <div class="heading">
+        <div class="heading__title">
+            {{category.name}}
+        </div>
+        {% for item in posts %}
+        {% partial 'post_list_item' post = item %}
+        {% else %}
+        <p>No posts found</p>
+        {% endfor %}
+        {% partial 'pagination'%}
+    </div>
+</div>
+<div class="main__sidebar">
+    {% partial 'calendar' %}
+    {% partial 'tags' %}
+</div>
+{% put scripts %}
+<script src="{{['assets/js/moment.min.js','assets/js/lightpick.js','assets/js/lazy.js','assets/js/main.js']|theme}}"></script>
+<script>
+    var picker = new Lightpick({
+        inline: true,
+        selectBackward: true,
+        selectForward: false,
+        lang: '{{activeLocale}}',
+        field: document.getElementById('calendar')
+    });
+</script>
+{% endput %}
\ No newline at end of file
diff --git a/themes/modern/partials/tags.htm b/themes/modern/partials/tags.htm
index 9efa9beba..456f74e60 100644
--- a/themes/modern/partials/tags.htm
+++ b/themes/modern/partials/tags.htm
@@ -1,61 +1,17 @@
+[blogTags]
+hideOrphans = 1
+results = 10
+direction = "desc"
+
+[viewBag]
+==
 <div class="main__sidebar-title">
     {{'page.tags'|_}}
 </div>
 <div class="main__sidebar-tag">
-    <a class="main__sidebar-tag-link" href="#">
-        COVID-19
+{% for tag in tags %}
+    <a class="main__sidebar-tag-link" href="{{tag.url}}">
+        {{tag.title}}
     </a>
-    <a class="main__sidebar-tag-link" href="#">
-        АЗЕРБАЙДЖАН
-    </a>
-    <a class="main__sidebar-tag-link" href="#">
-        АФГАНИСТАН
-    </a>
-    <a class="main__sidebar-tag-link" href="#">
-        КАСПИЙ
-    </a>
-    <a class="main__sidebar-tag-link" href="#">
-        COVID-19
-    </a>
-    <a class="main__sidebar-tag-link" href="#">
-        КИТАЙ
-    </a>
-    <a class="main__sidebar-tag-link" href="#">
-        ИРАН
-    </a>
-    <a class="main__sidebar-tag-link" href="#">
-        АЗЕРБАЙДЖАН
-    </a>
-
-    <a class="main__sidebar-tag-link" href="#">
-        COVID-19
-    </a>
-    <a class="main__sidebar-tag-link" href="#">
-        АЗЕРБАЙДЖАН
-    </a>
-    <a class="main__sidebar-tag-link" href="#">
-        COVID-19
-    </a>
-    <a class="main__sidebar-tag-link" href="#">
-        СПОРТ
-    </a>
-    <a class="main__sidebar-tag-link" href="#">
-        COVID-19
-    </a>
-    <a class="main__sidebar-tag-link" href="#">
-        ТУРИЗМ
-    </a>
-    <a class="main__sidebar-tag-link" href="#">
-        COVID-19
-    </a>
-    <a class="main__sidebar-tag-link" href="#">
-        УЗБЕКИСТАН
-    </a>
-    <a class="main__sidebar-tag-link" href="#">
-        COVID-19
-    </a>
-    <a class="main__sidebar-tag-link" href="#">
-        УЗБЕКИСТАН
-    </a>
-
-</div>
+{% endofr%}
+</div>
\ No newline at end of file