diff --git a/layouts/partials/custom-head.html b/layouts/_partials/custom-head.html
similarity index 100%
rename from layouts/partials/custom-head.html
rename to layouts/_partials/custom-head.html
diff --git a/layouts/partials/footer.html b/layouts/_partials/footer.html
similarity index 100%
rename from layouts/partials/footer.html
rename to layouts/_partials/footer.html
diff --git a/layouts/partials/pagination.html b/layouts/_partials/pagination.html
similarity index 100%
rename from layouts/partials/pagination.html
rename to layouts/_partials/pagination.html
diff --git a/layouts/partials/prev-next.html b/layouts/_partials/prev-next.html
similarity index 100%
rename from layouts/partials/prev-next.html
rename to layouts/_partials/prev-next.html
diff --git a/layouts/partials/related.html b/layouts/_partials/related.html
similarity index 100%
rename from layouts/partials/related.html
rename to layouts/_partials/related.html
diff --git a/layouts/partials/taxonomy/categories.html b/layouts/_partials/taxonomy/categories.html
similarity index 100%
rename from layouts/partials/taxonomy/categories.html
rename to layouts/_partials/taxonomy/categories.html
diff --git a/layouts/blog/list.html b/layouts/blog/list.html
index eae0734..3e58389 100644
--- a/layouts/blog/list.html
+++ b/layouts/blog/list.html
@@ -39,7 +39,7 @@
 {{ end }}
 
         {{end}}
-        {{ template "partials/pagination.html" . }}
+        {{ template "_partials/pagination.html" . }}
     </div>
 </div>
 {{ end }}
diff --git a/layouts/categories/list.html b/layouts/categories/list.html
index 192199e..7bb778d 100644
--- a/layouts/categories/list.html
+++ b/layouts/categories/list.html
@@ -6,7 +6,7 @@
 
 <div>
     <div class="listHeader">
-        <h1>{{ .Title }}  <a href="{{ . }}/index.xml">/rss.xml</a></h1>
+        <h1>{{ .Title }}  <a href="{{ .Page.RelPermalink }}index.xml">/rss.xml</a></h1>
     </div>
 
     {{ with .Content }}
@@ -37,7 +37,7 @@
 
 
         {{end}}
-        {{ template "partials/pagination.html" . }}
+        {{ template "_partials/pagination.html" . }}
     </div>
 </div>
 
diff --git a/layouts/categories/category.rss.xml b/layouts/categories/rss.xml
similarity index 100%
rename from layouts/categories/category.rss.xml
rename to layouts/categories/rss.xml
diff --git a/layouts/_default/index.json b/layouts/index.json
similarity index 100%
rename from layouts/_default/index.json
rename to layouts/index.json
diff --git a/layouts/_default/blog.rss.xml b/layouts/rss.xml
similarity index 100%
rename from layouts/_default/blog.rss.xml
rename to layouts/rss.xml
diff --git a/layouts/_default/single.html b/layouts/single.html
similarity index 97%
rename from layouts/_default/single.html
rename to layouts/single.html
index c624d53..af5349a 100644
--- a/layouts/_default/single.html
+++ b/layouts/single.html
@@ -30,7 +30,7 @@
                 {{ partial "taxonomy/tags.html" . }}
             {{ end }}
         </dl>
-   {{ template "partials/prev-next.html" . }}
+   {{ template "_partials/prev-next.html" . }}
     </section>
     {{ end }}
     <div>
diff --git a/layouts/tags/list.html b/layouts/tags/list.html
index fc9d03b..4157b5e 100644
--- a/layouts/tags/list.html
+++ b/layouts/tags/list.html
@@ -6,7 +6,7 @@
 
 <div>
     <div class="listHeader">
-        <h1>{{ .Title }}   <a href="{{ . }}/index.xml">/rss.xml</a></h1>
+        <h1>{{ .Title }}  <a href="{{ .Page.RelPermalink }}index.xml">/rss.xml</a></h1>
     </div>
 
     {{ with .Content }}
@@ -37,7 +37,7 @@
 
 
         {{end}}
-        {{ template "partials/pagination.html" . }}
+        {{ template "_partials/pagination.html" . }}
     </div>
 </div>
 
diff --git a/layouts/tags/taxonomy.rss.xml b/layouts/tags/rss.xml
similarity index 100%
rename from layouts/tags/taxonomy.rss.xml
rename to layouts/tags/rss.xml