diff --git a/404.html b/404.html
index fd9ff20..d19e5c3 100644
--- a/404.html
+++ b/404.html
@@ -6,9 +6,6 @@ permalink: /404.html
 redirect_from:
   - /norobots/
   - /assets/
-  - /tabs/
-  - /categories/
-  - /tags/
   - /posts/
 
 dynamic_title: true
@@ -16,5 +13,9 @@ dynamic_title: true
 
 <div class="lead">
   <p>Sorry, we've misplaced that URL or it's pointing to something that doesn't exist. </p>
-  <p><a href="{{ site.baseurl }}/">Head back Home</a> to try finding it again, or search for it on the <a href="{{ site.baseurl }}/tabs/archives">Archives page</a>.</p>
+  <p>
+    <a href="{{ '/' | relative_url }}">Head back Home</a>
+    to try finding it again, or search for it on the
+    <a href="{{ 'archives' | relative_url }}">Archives page</a>.
+  </p>
 </div>
diff --git a/README.md b/README.md
index 607bc22..d8e55ef 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ The startup template for [**Jekyll Theme Chirpy**][chirpy].
 When installing the Chirpy through [RubyGems][gem], Jekyll can only read files in the folders `_includes`, `_layout`, `_sass` and `assets`, as well as a small part of options of the `_config.yml` file from the theme's gem (use the command `bundle info --path jekyll-theme-chirpy` to locate). To fully use all the features of Chirpy, you also need to copy other files/directories and config options from the theme's gem to your Jekyll site. So we extract all the required things of the theme's gem to help you quickly use Chirpy.
 
 ```shell
-# The critical files/directories to run the theme
+# The critical files/directories to run Chirpy theme
 ├── _data
 ├── _plugins
 ├── _tabs