diff --git a/README.md b/README.md
index 15ba5805..0d9464e0 100644
--- a/README.md
+++ b/README.md
@@ -92,11 +92,11 @@ Single pages use the `link` page parameter, if any, as the reference for
an anchor around the page title, if any. If the page or site parameter
`math` is set to true, math typesetting is enabled with KaTeX.
-The `paige_search` layout provides full site search. It requires setting
+The `paige-search` layout provides full site search. It requires setting
`outputs.home` to `["html", "json", "rss"]` in `config.yaml`.
-If `partials/paige_head_last.html` exists in the site, it is included at
-the end of the head tag. If `partials/paige_body_last.html` exists in
+If `partials/paige-head-last.html` exists in the site, it is included at
+the end of the head tag. If `partials/paige-body-last.html` exists in
the site, it is included at the end of the body tag.
To hide the theme link, set the site parameter `paigehidethemelink` to
diff --git a/exampleSite/content/search.md b/exampleSite/content/search.md
index df56441b..00e55856 100644
--- a/exampleSite/content/search.md
+++ b/exampleSite/content/search.md
@@ -1,4 +1,4 @@
---
-layout: paige_search
+layout: paige-search
title: Search
---
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 8a9190c5..482a1a61 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -1,23 +1,23 @@
- {{ partial "paige_head.html" . }}
+ {{ partial "paige-head.html" . }}
- {{ partial "paige_header.html" . }}
+ {{ partial "paige-header.html" . }}
{{ block "main" . }}{{ end }}
- {{ partial "paige_footer.html" . }}
+ {{ partial "paige-footer.html" . }}
- {{ partial "paige_script.html" . }}
- {{ if templates.Exists "partials/paige_body_last.html" }}
- {{ partial "paige_body_last.html" . }}
+ {{ partial "paige-script.html" . }}
+ {{ if templates.Exists "partials/paige-body-last.html" }}
+ {{ partial "paige-body-last.html" . }}
{{ end }}
diff --git a/layouts/_default/home.html b/layouts/_default/home.html
index 7a3a45f8..b37e4d14 100644
--- a/layouts/_default/home.html
+++ b/layouts/_default/home.html
@@ -1,7 +1,7 @@
{{ define "main" }}
-{{ partial "paige_title.html" . }}
-{{ partial "paige_description.html" . }}
-{{ partial "paige_date.html" . }}
+{{ partial "paige-title.html" . }}
+{{ partial "paige-description.html" . }}
+{{ partial "paige-date.html" . }}
{{ if .Params.stretch }}
{{ end }}
@@ -20,6 +20,6 @@
{{ end }}
-{{ partial "paige_content.html" . }}
-{{ partial "paige_social.html" . }}
+{{ partial "paige-content.html" . }}
+{{ partial "paige-social.html" . }}
{{ end }}
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 3220df11..647e144f 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,4 +1,4 @@
{{ define "main" }}
-{{ partial "paige_main.html" . }}
-{{ partial "paige_pages.html" . }}
+{{ partial "paige-main.html" . }}
+{{ partial "paige-pages.html" . }}
{{ end }}
diff --git a/layouts/_default/paige-search.html b/layouts/_default/paige-search.html
new file mode 100644
index 00000000..f23f2880
--- /dev/null
+++ b/layouts/_default/paige-search.html
@@ -0,0 +1,4 @@
+{{ define "main" }}
+{{ partial "paige-main.html" . }}
+{{ partial "paige-search.html" . }}
+{{ end }}
diff --git a/layouts/_default/paige_search.html b/layouts/_default/paige_search.html
deleted file mode 100644
index 9456fc99..00000000
--- a/layouts/_default/paige_search.html
+++ /dev/null
@@ -1,4 +0,0 @@
-{{ define "main" }}
-{{ partial "paige_main.html" . }}
-{{ partial "paige_search.html" . }}
-{{ end }}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index ec127610..237496b9 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,3 +1,3 @@
{{ define "main" }}
-{{ partial "paige_main.html" . }}
+{{ partial "paige-main.html" . }}
{{ end }}
diff --git a/layouts/_default/taxonomy.html b/layouts/_default/taxonomy.html
index d76ea9ee..d104b16d 100644
--- a/layouts/_default/taxonomy.html
+++ b/layouts/_default/taxonomy.html
@@ -1,5 +1,5 @@
{{ define "main" }}
-{{ partial "paige_main.html" . }}
+{{ partial "paige-main.html" . }}
{{ if .Pages }}
diff --git a/layouts/_default/term.html b/layouts/_default/term.html
index 3220df11..647e144f 100644
--- a/layouts/_default/term.html
+++ b/layouts/_default/term.html
@@ -1,4 +1,4 @@
{{ define "main" }}
-{{ partial "paige_main.html" . }}
-{{ partial "paige_pages.html" . }}
+{{ partial "paige-main.html" . }}
+{{ partial "paige-pages.html" . }}
{{ end }}
diff --git a/layouts/partials/paige_content.html b/layouts/partials/paige-content.html
similarity index 100%
rename from layouts/partials/paige_content.html
rename to layouts/partials/paige-content.html
diff --git a/layouts/partials/paige_date.html b/layouts/partials/paige-date.html
similarity index 100%
rename from layouts/partials/paige_date.html
rename to layouts/partials/paige-date.html
diff --git a/layouts/partials/paige_description.html b/layouts/partials/paige-description.html
similarity index 100%
rename from layouts/partials/paige_description.html
rename to layouts/partials/paige-description.html
diff --git a/layouts/partials/paige_footer.html b/layouts/partials/paige-footer.html
similarity index 100%
rename from layouts/partials/paige_footer.html
rename to layouts/partials/paige-footer.html
diff --git a/layouts/partials/paige-head.html b/layouts/partials/paige-head.html
new file mode 100644
index 00000000..9e0d3551
--- /dev/null
+++ b/layouts/partials/paige-head.html
@@ -0,0 +1,9 @@
+
+ {{ partial "paige-meta.html" . }}
+ {{ partial "paige-titles.html" . }}
+ {{ partial "paige-link.html" . }}
+ {{ partial "paige-style.html" . }}
+ {{ if templates.Exists "partials/paige-head-last.html" }}
+ {{ partial "paige-head-last.html" . }}
+ {{ end }}
+
diff --git a/layouts/partials/paige_header.html b/layouts/partials/paige-header.html
similarity index 59%
rename from layouts/partials/paige_header.html
rename to layouts/partials/paige-header.html
index 46a05900..cbd801ac 100644
--- a/layouts/partials/paige_header.html
+++ b/layouts/partials/paige-header.html
@@ -1,5 +1,5 @@
{{ if .Site.Menus.main }}
- {{ partial "paige_menu.html" . }}
+ {{ partial "paige-menu.html" . }}
{{ end }}
diff --git a/layouts/partials/paige_link.html b/layouts/partials/paige-link.html
similarity index 95%
rename from layouts/partials/paige_link.html
rename to layouts/partials/paige-link.html
index 9fe32c8a..6c101c27 100644
--- a/layouts/partials/paige_link.html
+++ b/layouts/partials/paige-link.html
@@ -12,7 +12,7 @@
{{ end }}
{{ if .AlternativeOutputFormats }}
-{{ $title := partial "paige_titles.html" . }}
+{{ $title := partial "paige-titles.html" . }}
{{ range .AlternativeOutputFormats }}
{{ end }}
diff --git a/layouts/partials/paige-main.html b/layouts/partials/paige-main.html
new file mode 100644
index 00000000..94a58fc7
--- /dev/null
+++ b/layouts/partials/paige-main.html
@@ -0,0 +1,4 @@
+{{ partial "paige-title.html" . }}
+{{ partial "paige-description.html" . }}
+{{ partial "paige-date.html" . }}
+{{ partial "paige-content.html" . }}
diff --git a/layouts/partials/paige_menu.html b/layouts/partials/paige-menu.html
similarity index 100%
rename from layouts/partials/paige_menu.html
rename to layouts/partials/paige-menu.html
diff --git a/layouts/partials/paige_meta.html b/layouts/partials/paige-meta.html
similarity index 100%
rename from layouts/partials/paige_meta.html
rename to layouts/partials/paige-meta.html
diff --git a/layouts/partials/paige_pages.html b/layouts/partials/paige-pages.html
similarity index 92%
rename from layouts/partials/paige_pages.html
rename to layouts/partials/paige-pages.html
index 19394fb8..7b53ebcb 100644
--- a/layouts/partials/paige_pages.html
+++ b/layouts/partials/paige-pages.html
@@ -15,7 +15,7 @@
{{ end }}
{{ if or $p.HasPrev $p.HasNext }}
- {{ partial "paige_pagination.html" . }}
+ {{ partial "paige-pagination.html" . }}
{{ end }}
diff --git a/layouts/partials/paige_pagination.html b/layouts/partials/paige-pagination.html
similarity index 100%
rename from layouts/partials/paige_pagination.html
rename to layouts/partials/paige-pagination.html
diff --git a/layouts/partials/paige_script.html b/layouts/partials/paige-script.html
similarity index 100%
rename from layouts/partials/paige_script.html
rename to layouts/partials/paige-script.html
diff --git a/layouts/partials/paige_search.html b/layouts/partials/paige-search.html
similarity index 100%
rename from layouts/partials/paige_search.html
rename to layouts/partials/paige-search.html
diff --git a/layouts/partials/paige_social.html b/layouts/partials/paige-social.html
similarity index 100%
rename from layouts/partials/paige_social.html
rename to layouts/partials/paige-social.html
diff --git a/layouts/partials/paige_style.html b/layouts/partials/paige-style.html
similarity index 100%
rename from layouts/partials/paige_style.html
rename to layouts/partials/paige-style.html
diff --git a/layouts/partials/paige_title.html b/layouts/partials/paige-title.html
similarity index 100%
rename from layouts/partials/paige_title.html
rename to layouts/partials/paige-title.html
diff --git a/layouts/partials/paige_titles.html b/layouts/partials/paige-titles.html
similarity index 100%
rename from layouts/partials/paige_titles.html
rename to layouts/partials/paige-titles.html
diff --git a/layouts/partials/paige_head.html b/layouts/partials/paige_head.html
deleted file mode 100644
index c9d95d8a..00000000
--- a/layouts/partials/paige_head.html
+++ /dev/null
@@ -1,9 +0,0 @@
-
- {{ partial "paige_meta.html" . }}
- {{ partial "paige_titles.html" . }}
- {{ partial "paige_link.html" . }}
- {{ partial "paige_style.html" . }}
- {{ if templates.Exists "partials/paige_head_last.html" }}
- {{ partial "paige_head_last.html" . }}
- {{ end }}
-
diff --git a/layouts/partials/paige_main.html b/layouts/partials/paige_main.html
deleted file mode 100644
index 81976a24..00000000
--- a/layouts/partials/paige_main.html
+++ /dev/null
@@ -1,4 +0,0 @@
-{{ partial "paige_title.html" . }}
-{{ partial "paige_description.html" . }}
-{{ partial "paige_date.html" . }}
-{{ partial "paige_content.html" . }}