diff --git a/content/web.md b/content/web/index.md
similarity index 68%
rename from content/web.md
rename to content/web/index.md
index a8409e1..b2b466e 100644
--- a/content/web.md
+++ b/content/web/index.md
@@ -2,118 +2,12 @@
 title = "Web Résumé"
 post_title = "Dan Jones"
 toc = true
+layout = "web-resume"
 Description = "Experienced web developer"
 +++
-
-<section id="contact">
-
-Fort Bend, TX 77069   
-+1 (704) 326-1626 &bull; [dan&#x40;danielrayjones&#x2e;com](mailto:dan&#x40;danielrayjones&#x2e;com)
-<span class="printonly"><br/>https://danielrayjones.com/</span>
-
-</section><!-- /#contact -->
-
-<section id="summary">
-
-## Skills
-
-- HTML
-- CSS
-- SCSS
-- JavaScript
-- vue.js
-- jQuery
-- AJAX
-- React
-- PHP
-- go
-- MySQL
-- Laravel
-- Yii
-- Wordpress
-- Git
-- node.js
-- MongoDB
-- Linux
-- Docker
-- AWS
-- Google App Engine
-{.skills}
-
-</section><!-- /#summary -->
-
-<section id="projects">
-
-## Open Source Projects
-
-<section class="projects">
-
-<section class="project middleware">
-
-### gin error middleware
-
-[🔗](https://pkg.go.dev/codeberg.org/danjones000/gin-error-handler)
-A middleware for go gin framework and wrapper functions to make handling errors easier and more idiomatic.
-
-</section><!-- /.project.middleware -->
-
-<section class="project responsable">
-
-### Responsable Errors
-
-[🔗](https://pkg.go.dev/codeberg.org/danjones000/responsable-errors)
-A small go library that provides errors that can be more useful in the context of a web app. The heart of gin error middleware.
-
-</section><!-- /.project.responsable -->
-
-<section class="project log">
-
-### droplogger
-
-[🔗](https://gitlab.com/danjones000/droplogger)
-Python logging application especially suited for life-logging with IFTTT and Dropbox.
-
-#### my-log
-
-[🔗](https://codeberg.org/danjones000/my-log/)
-A work-in-progress complete rewrite of droplogger in go.
-
-</section><!-- /.project.log -->
-
-<section class="project strip-beats">
-
-### strip-beats
-
-[🔗](https://codeberg.org/danjones000/strip-beats)
-go cli app for transforming a folder of music videos and music files, with semi-automatic tagging, and user-friendly TUI. *This is a work in progress. Not yet fully functional.*
-
-</section><!-- /.project.strip-beats -->
-
-<section class="project object-spy">
-
-### Object Spy
-
-[🔗](https://packagist.org/packages/danjones000/object-spy)
-PHP debugging library that makes it easy to inspect private properties and methods without using reflection.
-
-</section><!-- /.project.object-spy -->
-
-<section class="project go-status">
-
-### http go status
-
-[🔗](https://codeberg.org/danjones000/http-go-status)
-Super simple web server that just returns the HTTP status you ask for. Useful for testing.
-
-</section><!-- /.project.go-status -->
-
-</section><!-- /.projects -->
-
-</section><!-- /#projects -->
-
 <section id="workhistory">
 
-## Work History
+## Work Experience
 
 - [**GRIN**](https://grin.co)   
   *Principal Software Engineer/Back-end Architect*   
@@ -205,14 +99,3 @@ Super simple web server that just returns the HTTP status you ask for. Useful fo
 {.history}
 
 </section><!-- /#workhistory -->
-
-<section id="codesamples" class="noprint">
-
-## Code Samples
-
-- [Codeberg](https://codeberg.org/danjones000)
-- [GitLab](https://gitlab.com/danjones000)
-- [GitHub](https://github.com/goodevilgenius)
-- [GitHub Gists](https://gist.github.com/goodevilgenius)
-
-</section><!-- /#codesamples -->
diff --git a/content/web/sections/005-contact.md b/content/web/sections/005-contact.md
new file mode 100644
index 0000000..f6ca617
--- /dev/null
+++ b/content/web/sections/005-contact.md
@@ -0,0 +1,6 @@
+---
+id: contact
+---
+Fort Bend, TX 77069   
++1 (704) 326-1626 &bull; [dan&#x40;danielrayjones&#x2e;com](mailto:dan&#x40;danielrayjones&#x2e;com)
+<span class="printonly"><br/>https://danielrayjones.com/</span>
diff --git a/content/web/sections/010-skills.md b/content/web/sections/010-skills.md
new file mode 100644
index 0000000..d9be6fb
--- /dev/null
+++ b/content/web/sections/010-skills.md
@@ -0,0 +1,27 @@
+---
+id: skills
+---
+## Skills
+
+- HTML
+- CSS
+- SCSS
+- JavaScript
+- vue.js
+- jQuery
+- AJAX
+- React
+- PHP
+- go
+- MySQL
+- Laravel
+- Yii
+- Wordpress
+- Git
+- node.js
+- MongoDB
+- Linux
+- Docker
+- AWS
+- Google App Engine
+{.skills}
diff --git a/content/web/sections/040-code.md b/content/web/sections/040-code.md
new file mode 100644
index 0000000..8edef19
--- /dev/null
+++ b/content/web/sections/040-code.md
@@ -0,0 +1,10 @@
+---
+id: codesamples
+class: noprint
+---
+## Code Samples
+
+- [Codeberg](https://codeberg.org/danjones000)
+- [GitLab](https://gitlab.com/danjones000)
+- [GitHub](https://github.com/goodevilgenius)
+- [GitHub Gists](https://gist.github.com/goodevilgenius)
diff --git a/content/web/sections/050-projects.md b/content/web/sections/050-projects.md
new file mode 100644
index 0000000..3c4331d
--- /dev/null
+++ b/content/web/sections/050-projects.md
@@ -0,0 +1,67 @@
+---
+id: projects
+---
+## Open Source Projects
+
+<section class="projects">
+
+<section class="project middleware">
+
+### gin error middleware
+
+<a href="https://pkg.go.dev/codeberg.org/danjones000/gin-error-handler" class="noprint">🔗</a>
+A middleware for go gin framework and wrapper functions to make handling errors easier and more idiomatic.
+
+</section><!-- /.project.middleware -->
+
+<section class="project responsable">
+
+### Responsable Errors
+
+<a href="https://pkg.go.dev/codeberg.org/danjones000/responsable-errors" class="noprint">🔗</a>
+A small go library that provides errors that can be more useful in the context of a web app. The heart of gin error middleware.
+
+</section><!-- /.project.responsable -->
+
+<section class="project log">
+
+### droplogger
+
+<a href="https://gitlab.com/danjones000/droplogger" class="noprint">🔗</a>
+Python logging application especially suited for life-logging with IFTTT and Dropbox.
+
+#### my-log
+
+<a href="https://codeberg.org/danjones000/my-log/" class="noprint">🔗</a>
+A work-in-progress complete rewrite of droplogger in go.
+
+</section><!-- /.project.log -->
+
+<section class="project strip-beats">
+
+### strip-beats
+
+<a href="https://codeberg.org/danjones000/strip-beats" class="noprint">🔗</a>
+go cli app for transforming a folder of music videos and music files, with semi-automatic tagging, and user-friendly TUI. *This is a work in progress. Not yet fully functional.*
+
+</section><!-- /.project.strip-beats -->
+
+<section class="project object-spy">
+
+### Object Spy
+
+<a href="https://packagist.org/packages/danjones000/object-spy" class="noprint">🔗</a>
+PHP debugging library that makes it easy to inspect private properties and methods without using reflection.
+
+</section><!-- /.project.object-spy -->
+
+<section class="project go-status">
+
+### http go status
+
+<a href="https://codeberg.org/danjones000/http-go-status" class="noprint">🔗</a>
+Super simple web server that just returns the HTTP status you ask for. Useful for testing.
+
+</section><!-- /.project.go-status -->
+
+</section><!-- /.projects -->
diff --git a/hugo.toml b/hugo.toml
index 5d4131f..db0f942 100644
--- a/hugo.toml
+++ b/hugo.toml
@@ -47,6 +47,11 @@ url = "https://microwords.goodevilgenius.org/"
 [markup]
 defaultMarkdownHandler = 'goldmark'
 
+[markup.tableOfContents]
+ordered = false
+startLevel = 2
+endLevel = 4
+
 [markup.goldmark.parser.attribute]
 block = true
 title = true
diff --git a/layouts/_default/web-resume.html b/layouts/_default/web-resume.html
new file mode 100644
index 0000000..429febf
--- /dev/null
+++ b/layouts/_default/web-resume.html
@@ -0,0 +1,76 @@
+{{ define "body" }}
+<body id="web-resume">
+{{ end }}
+
+{{ define "main" }}
+    <main class="post">
+
+        <div class="post-info">
+            {{ if .IsTranslated }}
+            <p>
+                {{ i18n "postAvailable" }}
+                {{ range .Translations }}
+                    <a href="{{ .Permalink }}"><span class="flag fi fi-{{ index $.Site.Data.langFlags (.Lang) }}"></span></a>
+                {{ end}}
+            </p>
+            {{ end }}
+        </div>
+
+        <article>
+            <h2 class="post-title">
+                <a href="{{ .Permalink }}">{{ with .Params.post_title }}{{ . | markdownify }}{{ else }}{{ .Title | markdownify }}{{ end }}</a>
+            </h2>
+
+            {{ if .Params.Cover }}
+                <figure class="post-cover">
+                    <img src="{{ .Params.Cover | absURL }}" alt="{{ .Title }}" />
+                
+                    {{ if .Params.CoverCaption }}
+                        <figcaption class="center">{{ .Params.CoverCaption | markdownify }}</figcaption>
+                    {{ end }}
+                </figure>
+            {{ end }}
+            
+            {{ if .Params.toc }}
+                <hr />
+                <aside id="toc">
+                <div class="toc-title">{{ i18n "tableOfContents" }}</div>
+                <nav id="TableOfContents">
+                    <ul>
+                        {{ range .Resources.Match "sections/*.md" }}
+                            {{ $toc := strings.Substr .TableOfContents 37 }}
+                            {{ $toc = strings.TrimSuffix "</ul>\n</nav>" $toc }}
+                            {{ $toc | safeHTML }}
+                        {{ end }}
+
+                        {{ $toc := strings.Substr .TableOfContents 37 }}
+                        {{ $toc = strings.TrimSuffix "</ul>\n</nav>" $toc }}
+                        {{ $toc | safeHTML }}
+                    </ul>
+                </nav>
+                </aside>
+                <hr />
+            {{ end }}
+            {{ range .Resources.Match "sections/*.md" }}
+                <aside id="{{ .Params.id }}" class="{{ .Params.class }}">
+                    {{ .Content }}
+                </aside>
+            {{ end }}
+
+            <div class="post-content">
+                {{ .Content }}
+            </div>
+        </article>
+
+        <hr />
+
+        <div class="post-info">
+            {{ partial "tags.html" .Params.tags }}
+            {{ partial "categories.html" . }}
+
+            {{- if .GitInfo }}
+			    <p><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-git-commit"><circle cx="12" cy="12" r="4"></circle><line x1="1.05" y1="12" x2="7" y2="12"></line><line x1="17.01" y1="12" x2="22.96" y2="12"></line></svg><a href="{{ .Site.Params.gitUrl -}}{{ .GitInfo.Hash }}" target="_blank" rel="noopener">{{ .GitInfo.AbbreviatedHash }}</a> @ {{ if .Site.Params.dateformNum }}{{ dateFormat .Site.Params.dateformNum .GitInfo.AuthorDate.Local }}{{ else }}{{ dateFormat "2006-01-02" .GitInfo.AuthorDate.Local }}{{ end }}</p>
+			{{- end }}
+  		</div>
+    </main>
+{{ end }}