diff --git a/CHANGELOG.md b/CHANGELOG.md
index 161767cc680eb4ed3849e0d0c8ed448c4d356e0a..31f0d6f62336a1641d8d21c279856579a28a921b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## 1.1.1
+## 2.0.0
 
 * Removed content folder and moved out the Fedipage site into a separate repo.
     This should make it easier for people who use this site to update from the
@@ -10,6 +10,12 @@
 * Card shortcodes no longer need to be linkable. By leaving the url argument as
     an empty string it will not render as a clickable link.
 * Fixed microblog submenu so it no longer extends past bottom of the page.
+* Made `/layout/top_list_generic` site generic, it no longer mentions Fedipage.
+* Made the `/layout/menu/html` dynamic so now there is no need to edit it when
+    you customize sections.
+* Created type `page` and moved `/content/_index.md` to be that type. This
+    breaks backwards compatibility therefore we must bump major version
+    according to semantic versioning.
 
 ## 1.1.0
 
diff --git a/README.md b/README.md
index a5478b45757dc6f29b4f12dc08a04641b532102c..5486a74165e9c5fa197cac706d76f63770dbed2a 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,25 @@ This project (excluding post content itself) is released under the Apache Licens
 
 # Fresh install
 
+## Changing Default Sections
+
+By default this site contains the following three blog sections: `news`,
+`projects`, and `resource`. Unfortunately the sections arent easily configurable
+just yet.
+
+### Renaming
+
+1. Change the name of the `/layouts/partials/top_list_<section>.html` to the
+new name and edit its content.
+1. Modify `./clean-build.cjs` at the bottom of the file to include the name of
+the new section.
+1. Rename directory `./layouts/<section>` to the name of the new section, or
+    create a new directory using an existing directory as a template.
+1. Edit `./layouts/<section>/list.html` to point to the new section partial
+(first line).
+1. Change or create a new directory for section content under
+`/content/<new_section>`
+
 ## Update /hugo.toml
 
 You can use `/hugo.toml.example` as a starting point. Copy this file (dont move
diff --git a/api/nodeinfo/2.1.ts b/api/nodeinfo/2.1.ts
index bb784103698522b737ad8d790ed19edbba04800a..98e27930e55f8e903df8b9004dd342d9ad53a66e 100644
--- a/api/nodeinfo/2.1.ts
+++ b/api/nodeinfo/2.1.ts
@@ -9,7 +9,7 @@ export default function (req: VercelRequest, res: VercelResponse) {
       "name": "Fedipage",
       "repository": "https://git.qoto.org/fedipage/fedipage",
       "homepage": "https://fedipage.com/",
-      "version": "1.1.1"
+      "version": "2.0.0"
     },
     "protocols": [
       "activitypub"
diff --git a/config/_default/hugo.toml b/config/_default/hugo.toml
index 441c0e3cfe5937f8d62b9e9868d0abfca7de88e2..f65f0efef09eb2b099da856c990f5b2b6dff0998 100644
--- a/config/_default/hugo.toml
+++ b/config/_default/hugo.toml
@@ -9,6 +9,7 @@ defaultContentLanguageInSubdir = false
 
 enableRobotsTXT = true
 uglyURLs=false
+pluralizelisttitles=false
 
 [services.rss]
 limit = 50
diff --git a/layouts/index.html b/layouts/page/single.html
similarity index 100%
rename from layouts/index.html
rename to layouts/page/single.html
diff --git a/layouts/partials/menu.html b/layouts/partials/menu.html
index be1ff1fc5b0453dec5f2ac11ed69318eb04a80da..8798875839abc034d94c32681c25c1183a688ed0 100644
--- a/layouts/partials/menu.html
+++ b/layouts/partials/menu.html
@@ -14,10 +14,12 @@
 		</div>
 		<div class="navbar__items navbar__items--right">
 			<a class="navbar__item navbar__link" href="/">Home</a>
-			<a class="navbar__item navbar__link" href="/news">News</a>
-			<a class="navbar__item navbar__link" href="/projects">Projects</a>
-      <a class="navbar__item navbar__link" href="/resource">Resources</a>
-			<a class="displayOnlyInLargeViewport_16CL button button--primary" href={{ site.Params.repoUrl }} style="margin:0;margin-left:15px">OUR GIT →</a>
+			{{ range (where .Site.Pages "Section" "") }}
+		     {{ range .Pages }}
+						<a class="navbar__item navbar__link" href="{{ .Permalink }}">{{ .Title }}</a>
+		     {{ end }}
+		  {{ end }}
+			<a class="displayOnlyInLargeViewport_16CL button button--primary" href={{ site.Params.repoUrl }} style="margin:0;margin-left:15px">MY GIT →</a>
 		</div>
 	</div>
 	<div role="presentation" class="navbar-sidebar__backdrop"></div>
@@ -34,17 +36,15 @@
 					<li class="menu__list-item">
 						<a class="menu__link" href="/">Home</a>
 					</li>
-					<li class="menu__list-item">
-						<a class="menu__link" href="/news">News</a>
-					</li>
-					<li class="menu__list-item">
-						<a class="menu__link" href="/projects">Projects</a>
-					</li>
-          <li class="menu__list-item">
-						<a class="menu__link" href="/resource">Resources</a>
-					</li>
+					{{ range (where .Site.Pages "Section" "") }}
+				     {{ range .Pages }}
+								<li class="menu__list-item">
+									<a class="menu__link" href="{{ .Permalink }}">{{ .Title }}</a>
+								</li>
+				     {{ end }}
+				  {{ end }}
 					<div style="margin:5px;margin-top:15px"></div>
-					<a class="button button--block button--primary" href={{ site.Params.repoUrl }}>OUR GITLAB →</a>
+					<a class="button button--block button--primary" href={{ site.Params.repoUrl }}>MY GIT →</a>
 				</ul>
 			</div>
 		</div>
diff --git a/layouts/partials/top_list_generic.html b/layouts/partials/top_list_generic.html
index 33a648257eee3afa2ae47fe58fb498fa6a3defb2..bf84b00fe0bd609dda58888b762df1e3f7b47ea1 100644
--- a/layouts/partials/top_list_generic.html
+++ b/layouts/partials/top_list_generic.html
@@ -5,7 +5,7 @@
     <div class="main-wrapper">
       <header class='subheader'>
         <div class='container'>
-          <h2 class='page-title'> FLEAR <small>Free & Libre Engineers for Amateur Radio</small>
+          <h2 class='page-title'> {{ .Title }}
           </h2>
         </div>
       </header>