25 files changed, 31 insertions, 31 deletions
diff --git a/README.md b/README.md
index c419c89..7afd40c 100644
--- a/README.md
+++ b/README.md
@@ -162,7 +162,7 @@ And then you can just format an entire section of snippets using a single
 `include`:
 
 ```
-{% include snippets/section.html section_id='hello' %}
+{% include jekyll-theme/snippets/section.html section_id='hello' %}
 ```
 
 The line above would output both hello.hpp and hello.cpp to the page.
@@ -181,7 +181,7 @@ The gist is:
 [shell]: _posts/2022-03-21-shell.md
 
 ```
-{% include shell.html cmd='echo 123' out='123' %}
+{% include jekyll-theme/shell.html cmd='echo 123' out='123' %}
 ```
 
 ### Typesetting math
diff --git a/_includes/categories/all.html b/_includes/jekyll-theme/categories/all.html
index 71b4bb6..71b4bb6 100644
--- a/_includes/categories/all.html
+++ b/_includes/jekyll-theme/categories/all.html
diff --git a/_includes/categories/category.html b/_includes/jekyll-theme/categories/category.html
index f7b7a8c..f7b7a8c 100644
--- a/_includes/categories/category.html
+++ b/_includes/jekyll-theme/categories/category.html
diff --git a/_includes/common/footer.html b/_includes/jekyll-theme/footer.html
index 9331784..9331784 100644
--- a/_includes/common/footer.html
+++ b/_includes/jekyll-theme/footer.html
diff --git a/_includes/common/ga.html b/_includes/jekyll-theme/ga.html
index 56eaca7..56eaca7 100644
--- a/_includes/common/ga.html
+++ b/_includes/jekyll-theme/ga.html
diff --git a/_includes/common/header.html b/_includes/jekyll-theme/header.html
index 07ba1c5..0e83d50 100644
--- a/_includes/common/header.html
+++ b/_includes/jekyll-theme/header.html
@@ -43,7 +43,7 @@
       <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
     <![endif]-->
 
-    {% include mathjax.html %}
+    {% include jekyll-theme/mathjax.html %}
 
     <link rel="stylesheet" href="{{ '/assets/css/jekyll-theme.css' | relative_url }}">
 
@@ -71,10 +71,10 @@
     {% endfor %}
 
     {% if site.settings.ga_tag %}
-      {% include common/ga.html ga_tag=site.settings.ga_tag %}
+      {% include jekyll-theme/ga.html ga_tag=site.settings.ga_tag %}
     {% endif %}
   </head>
   <body>
     <div style="display: flex; flex-direction: column; min-height: 100vh;">
-      {% include common/navbar.html %}
+      {% include jekyll-theme/navbar.html %}
       <div class="container" style="flex: 1;">
diff --git a/_includes/mathjax.html b/_includes/jekyll-theme/mathjax.html
index e01e380..e01e380 100644
--- a/_includes/mathjax.html
+++ b/_includes/jekyll-theme/mathjax.html
diff --git a/_includes/common/navbar.html b/_includes/jekyll-theme/navbar.html
index 67db12e..67db12e 100644
--- a/_includes/common/navbar.html
+++ b/_includes/jekyll-theme/navbar.html
diff --git a/_includes/posts/feed.html b/_includes/jekyll-theme/posts/feed.html
index 4b4ea8b..dac6798 100644
--- a/_includes/posts/feed.html
+++ b/_includes/jekyll-theme/posts/feed.html
@@ -18,6 +18,6 @@
     </div>
   {% endfor %}
   <div class="text-center">
-    {% include posts/paginator.html %}
+    {% include jekyll-theme/posts/paginator.html %}
   </div>
 {% endif %}
diff --git a/_includes/posts/paginator.html b/_includes/jekyll-theme/posts/paginator.html
index 471383c..471383c 100644
--- a/_includes/posts/paginator.html
+++ b/_includes/jekyll-theme/posts/paginator.html
diff --git a/_includes/shell.html b/_includes/jekyll-theme/shell.html
index 9b7ed4d..9b7ed4d 100644
--- a/_includes/shell.html
+++ b/_includes/jekyll-theme/shell.html
diff --git a/_includes/common/sidebar.html b/_includes/jekyll-theme/sidebar.html
index 4eeeac2..e4732f2 100644
--- a/_includes/common/sidebar.html
+++ b/_includes/jekyll-theme/sidebar.html
@@ -25,7 +25,7 @@
 </div>
 {% endcapture %}
 
-{% include common/sidebar_entry.html header='About' content=about_content %}
+{% include jekyll-theme/sidebar_entry.html header='About' content=about_content %}
 
 {% if site.posts.size > 0 %}
 
@@ -40,7 +40,7 @@
 </div>
 {% endcapture %}
 
-{% include common/sidebar_entry.html header='Latest posts' content=latest_posts_content %}
+{% include jekyll-theme/sidebar_entry.html header='Latest posts' content=latest_posts_content %}
 {% endif %}
 
 </div>
diff --git a/_includes/common/sidebar_entry.html b/_includes/jekyll-theme/sidebar_entry.html
index 761119d..761119d 100644
--- a/_includes/common/sidebar_entry.html
+++ b/_includes/jekyll-theme/sidebar_entry.html
diff --git a/_includes/snippets/footer.html b/_includes/jekyll-theme/snippets/footer.html
index d60469c..d60469c 100644
--- a/_includes/snippets/footer.html
+++ b/_includes/jekyll-theme/snippets/footer.html
diff --git a/_includes/snippets/header.html b/_includes/jekyll-theme/snippets/header.html
index 673fc5a..673fc5a 100644
--- a/_includes/snippets/header.html
+++ b/_includes/jekyll-theme/snippets/header.html
diff --git a/_includes/snippets/section.html b/_includes/jekyll-theme/snippets/section.html
index cbb778f..3e7e748 100644
--- a/_includes/snippets/section.html
+++ b/_includes/jekyll-theme/snippets/section.html
@@ -5,7 +5,7 @@
 {% endif %}
 
 {% for i in page.snippets[include.section_id] %}
-  {% include snippets/header.html snippet_path=i section_id=include.section_id %}
+  {% include jekyll-theme/snippets/header.html snippet_path=i section_id=include.section_id %}
 
 {% capture snippet %}
 ```{{ page.snippets_language }}
@@ -14,7 +14,7 @@
 
 {{ snippet | markdownify }}
 
-  {% include snippets/footer.html %}
+  {% include jekyll-theme/snippets/footer.html %}
 {% endfor %}
 
 </div>
diff --git a/_layouts/default.html b/_layouts/default.html
index eaae1b9..1f39d9f 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -1,4 +1,4 @@
-{% include common/header.html %}
+{% include jekyll-theme/header.html %}
 <div class="row">
   <div class="col-md-8">
     {{ content }}
@@ -8,7 +8,7 @@
     {% endunless %}
   </div>
   <div class="col-md-4">
-    {% include common/sidebar.html %}
+    {% include jekyll-theme/sidebar.html %}
   </div>
 </div>
-{% include common/footer.html %}
+{% include jekyll-theme/footer.html %}
diff --git a/_layouts/plain.html b/_layouts/plain.html
index db09984..59b594f 100644
--- a/_layouts/plain.html
+++ b/_layouts/plain.html
@@ -1,7 +1,7 @@
-{% include common/header.html %}
+{% include jekyll-theme/header.html %}
 <div class="row">
   <div class="col-md-12">
     {{ content }}
   </div>
 </div>
-{% include common/footer.html %}
+{% include jekyll-theme/footer.html %}
diff --git a/_posts/2021-04-09-snippets.md b/_posts/2021-04-09-snippets.md
index a320e07..3621e80 100644
--- a/_posts/2021-04-09-snippets.md
+++ b/_posts/2021-04-09-snippets.md
@@ -14,11 +14,11 @@ snippets:
 ---
 It's pretty simple, just use the corresponding include:
 
-{% include snippets/section.html section_id='hello' %}
+{% include jekyll-theme/snippets/section.html section_id='hello' %}
 
 This is another set of snippets:
 
-{% include snippets/section.html section_id='world' %}
+{% include jekyll-theme/snippets/section.html section_id='world' %}
 
 Of course, you can insert a code snippet using the regular Markdown syntax
 without any highlighting:
diff --git a/_posts/2021-04-10-collapsible.md b/_posts/2021-04-10-collapsible.md
index bb555c0..0997f3a 100644
--- a/_posts/2021-04-10-collapsible.md
+++ b/_posts/2021-04-10-collapsible.md
@@ -18,8 +18,8 @@ Just set a front matter value to make them collapsible, and voilà!
 
 [other post]: {{ site.baseurl }}{% post_url 2021-04-09-snippets %}
 
-{% include snippets/section.html section_id='hello' %}
+{% include jekyll-theme/snippets/section.html section_id='hello' %}
 
 This is another set of snippets:
 
-{% include snippets/section.html section_id='world' %}
+{% include jekyll-theme/snippets/section.html section_id='world' %}
diff --git a/_posts/2022-03-21-shell.md b/_posts/2022-03-21-shell.md
index 8a330ff..340d0b5 100644
--- a/_posts/2022-03-21-shell.md
+++ b/_posts/2022-03-21-shell.md
@@ -7,11 +7,11 @@ category: Work
 It's easy to style shell commands and their outputs.
 Here's a one-line command and a one-line output.
 
-{% include shell.html cmd='echo 1' out='1' %}
+{% include jekyll-theme/shell.html cmd='echo 1' out='1' %}
 
 You can pass multiple commands and multi-line output to the include as well:
 
-{% include shell.html cmd='echo 1
+{% include jekyll-theme/shell.html cmd='echo 1
 echo 2' out='1
 2' %}
 
@@ -30,12 +30,12 @@ touch test.txt && \
 456
 {% endcapture %}
 
-{% include shell.html cmd=cmd1 out=out1 %}
+{% include jekyll-theme/shell.html cmd=cmd1 out=out1 %}
 
 You can display multiple commands one after another.
 
-{% include shell.html cmd="printf 'Hello\n'" out='Hello' %}
-{% include shell.html cmd="printf 'World\n'" out='World' %}
+{% include jekyll-theme/shell.html cmd="printf 'Hello\n'" out='Hello' %}
+{% include jekyll-theme/shell.html cmd="printf 'World\n'" out='World' %}
 
 Only the last one will have a bottom margin.
 
@@ -48,11 +48,11 @@ printf '%s\n' 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 {% endcapture %}
 
-{% include shell.html cmd=cmd1 out=out1 %}
+{% include jekyll-theme/shell.html cmd=cmd1 out=out1 %}
 
 This is ugly though, so please don't do that.
 
 Commands don't necessarily have to have output:
 
-{% include shell.html cmd='mkdir test' %}
-{% include shell.html cmd='cd test' %}
+{% include jekyll-theme/shell.html cmd='mkdir test' %}
+{% include jekyll-theme/shell.html cmd='cd test' %}
diff --git a/archive/index.html b/archive/index.html
index 39f465d..aade24b 100644
--- a/archive/index.html
+++ b/archive/index.html
@@ -5,4 +5,4 @@ navbar:
   link: true
   priority: 3
 ---
-{% include categories/all.html %}
+{% include jekyll-theme/categories/all.html %}
diff --git a/feed/index.html b/feed/index.html
index 7227bab..0288344 100644
--- a/feed/index.html
+++ b/feed/index.html
@@ -8,4 +8,4 @@ navbar:
 sidebar:
   hide: true
 ---
-{% include posts/feed.html %}
+{% include jekyll-theme/posts/feed.html %}
diff --git a/life/index.html b/life/index.html
index 4412437..1df20f1 100644
--- a/life/index.html
+++ b/life/index.html
@@ -1,4 +1,4 @@
 ---
 title: Life
 ---
-{% include categories/category.html category=page.title archive_link='/archive/' %}
+{% include jekyll-theme/categories/category.html category=page.title archive_link='/archive/' %}
diff --git a/work/index.html b/work/index.html
index 5bd34ca..c2a2f9d 100644
--- a/work/index.html
+++ b/work/index.html
@@ -1,4 +1,4 @@
 ---
 title: Work
 ---
-{% include categories/category.html category=page.title archive_link='/archive/' %}
+{% include jekyll-theme/categories/category.html category=page.title archive_link='/archive/' %}