diff --git a/assets/styles/common/page.scss b/assets/styles/common/page.scss
index 708c542..b51ffe8 100644
--- a/assets/styles/common/page.scss
+++ b/assets/styles/common/page.scss
@@ -118,9 +118,13 @@
 	}
 	/* tables */
 	table {text-align: center;}
-	thead {font-weight: 700;}
+	thead {
+		font-weight: 700;
+		background: var(--ui-overlay);
+		color: var(--ui-overlay-text);
+	}
 	th, td {
-		border: 1px solid black;
+		border: 1px solid var(--ui-text);
 		padding: 0.5em;
 	}
 	/* {{<hint>}} shortcode */
diff --git a/assets/styles/print.scss b/assets/styles/print.scss
index 428b01b..92663d4 100644
--- a/assets/styles/print.scss
+++ b/assets/styles/print.scss
@@ -8,7 +8,7 @@
 .header-nav,
 .docs-nav,
 .site-footer,
-.edit-on-github,
+.edit-link,
 .footnote-backref
 {
 	display: none;
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 11ed0b0..7386b9c 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -5,7 +5,8 @@
 			<div class="container">
 				<h1 class="page-title">{{ .Title }}</h1>
 				<p class="page-summary">{{.Page.Summary}}</p>
-				<p class="lastmod">Last modified <datetime class="date">{{ .Lastmod.Format "Mon Jan 2, 2006" }}</datetime><span class="edit-on-github"> - <a href="{{.Site.Params.repo}}/edit/{{.Site.Params.branch}}/content/{{.File.Lang}}/{{.File.Path}}">Edit this page on Github</a></span></p>
+				
+				<p class="lastmod">Last modified <datetime class="date">{{ .Lastmod.Format "Mon Jan 2, 2006" }}</datetime><span class="edit-link"> - <a href='{{if eq .Site.Params.forge "github"}}{{printf "https://github.com/%s/edit/%s/%s/%s" .Site.Params.repo .Site.Params.branch .Site.Language.ContentDir .File.Path}}{{else if eq .Site.Params.forge "gitea"}}{{printf "%s/%s/_edit/%s/%s/%s" .Site.Params.forgeUrl .Site.Params.repo .Site.Params.branch (cond (isset .Site.Language "ContentDir") .Site.Language.ContentDir "content") .File.Path}}{{else}}#{{end}}'>Edit this page</a></span></p>
 				{{ partial "i18nlist.html" . }}
 			</div>
 		</header>
diff --git a/layouts/index.html b/layouts/index.html
index 43a9e71..dd1ccc3 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -17,7 +17,7 @@
 		<section class="content section">
 			<div class="container">
 				{{ .Content }}
-				<p class="lastmod">Last modified <datetime class="date"> {{ .Lastmod.Format "Mon Jan 2, 2006" }} </datetime> - <a href="{{.Site.Params.repo}}/edit/{{.Site.Params.branch}}/content/{{.File.Lang}}/{{.File.Path}}">Edit this page on Github</a></p>
+				<p class="lastmod">Last modified <datetime class="date"><span class="edit-link">{{ .Lastmod.Format "Mon Jan 2, 2006" }}</datetime> - <a href='{{if eq .Site.Params.forge "github"}}{{printf "https://github.com/%s/edit/%s/%s/%s" .Site.Params.repo .Site.Params.branch .Site.Language.ContentDir .File.Path}}{{else if eq .Site.Params.forge "gitea"}}{{printf "%s/%s/_edit/%s/%s/%s" .Site.Params.forgeUrl .Site.Params.repo .Site.Params.branch (cond (isset .Site.Language "ContentDir") .Site.Language.ContentDir "content") .File.Path}}{{else}}#{{end}}'>Edit this page</a></span></p>
 			</div>
 		</section>
 	</article>
diff --git a/layouts/partials/breadcrumbs.html b/layouts/partials/breadcrumbs.html
new file mode 100644
index 0000000..d64bd3a
--- /dev/null
+++ b/layouts/partials/breadcrumbs.html
@@ -0,0 +1,14 @@
+<ul class="breadcrumbs">
+	{{ template "breadcrumb" (dict "p1" . "p2" .) }}
+ </ul>
+ 
+ {{ define "breadcrumb" }}
+	{{ if .p1.Parent }}
+	  {{ template "breadcrumb" (dict "p1" .p1.Parent "p2" .p2 )  }}
+	{{ else if not .p1.IsHome }}
+	  {{ template "breadcrumb" (dict "p1" .p1.Site.Home "p2" .p2 )  }}
+	{{ end }}
+	<li{{ if eq .p1 .p2 }} class="active"{{ end }}>
+	  <a href="{{ .p1.RelPermalink }}">{{ .p1.Title }}</a>
+	</li>
+ {{ end }}
\ No newline at end of file
diff --git a/layouts/partials/docs-menu.html b/layouts/partials/nav-docs.html
similarity index 98%
rename from layouts/partials/docs-menu.html
rename to layouts/partials/nav-docs.html
index 7103fd0..13a03f4 100644
--- a/layouts/partials/docs-menu.html
+++ b/layouts/partials/nav-docs.html
@@ -4,7 +4,7 @@
 		<label class="toggle-menu__label" for="toggle"><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24"
 				fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
 				<path stroke-linecap="round" stroke-linejoin="round" d="M4 6h16M4 12h16M4 18h7" />
-			</svg> Menu</label>
+			</svg> Documentation Menu</label>
 		<ul class="menu">
 			<a id="menu" href="#top">Skip menu</a>
 			{{ $currentPage := . }}
diff --git a/layouts/partials/nav-footer.html b/layouts/partials/nav-footer.html
new file mode 100644
index 0000000..45365d0
--- /dev/null
+++ b/layouts/partials/nav-footer.html
@@ -0,0 +1,15 @@
+<nav class="footer-nav">
+		<ul class="menu">
+			{{ $currentPage := . }}
+			{{ range .Site.Menus.footer }}
+			<li
+				class='{{ if or ($currentPage.IsMenuCurrent "footer" .) (eq $currentPage.Section .Identifier) }}active{{ end }}'>
+				<a href="{{ .URL | absLangURL }}">
+					{{ .Pre }}
+					<span>{{ .Name }}</span>
+					{{ .Post }}
+				</a>
+			</li>
+			{{ end }}
+		</ul>
+</nav>
\ No newline at end of file
diff --git a/layouts/partials/main-menu.html b/layouts/partials/nav-header.html
similarity index 100%
rename from layouts/partials/main-menu.html
rename to layouts/partials/nav-header.html
diff --git a/layouts/partials/site-footer.html b/layouts/partials/site-footer.html
index 00ad607..725da41 100644
--- a/layouts/partials/site-footer.html
+++ b/layouts/partials/site-footer.html
@@ -1,20 +1,8 @@
 <footer class="site-footer">
 	<hr>
 	<div class="container">
-		<ul class="breadcrumbs">
-			{{ template "breadcrumb" (dict "p1" . "p2" .) }}
-		</ul>
+		{{ partial "nav-footer.html" . }}
 		<a href="#top">back to top</a>
 	</div>
 </footer>
 
-{{ define "breadcrumb" }}
-  {{ if .p1.Parent }}
-    {{ template "breadcrumb" (dict "p1" .p1.Parent "p2" .p2 )  }}
-  {{ else if not .p1.IsHome }}
-    {{ template "breadcrumb" (dict "p1" .p1.Site.Home "p2" .p2 )  }}
-  {{ end }}
-  <li{{ if eq .p1 .p2 }} class="active"{{ end }}>
-    <a href="{{ .p1.RelPermalink }}">{{ .p1.Title }}</a>
-  </li>
-{{ end }}
\ No newline at end of file
diff --git a/layouts/partials/site-header.html b/layouts/partials/site-header.html
index 72fc840..614cf84 100644
--- a/layouts/partials/site-header.html
+++ b/layouts/partials/site-header.html
@@ -4,10 +4,10 @@
 			<img class="site-icon" height="32" src="{{.Site.Params.icon}}">
 			<p class="site-title">{{.Site.Params.title}}</p>
 		</a>
-		{{ partial "main-menu.html" . }}
+		{{ partial "nav-header.html" . }}
 	</div>
 </header>
 <div class="scroll-margin" style="position: relative;">
 	<div id="top" style="scroll-margin-top: var(--header-height);"></div>
 </div>
-{{ partial "docs-menu.html" . }}
\ No newline at end of file
+{{ partial "nav-docs.html" . }}
\ No newline at end of file