diff --git a/config.toml b/config.toml
index c38abaa..c3c8d5c 100644
--- a/config.toml
+++ b/config.toml
@@ -51,15 +51,15 @@ firstname = "Sakino"
 profilePicture = "images/profile1.jpg"
 siteLogo = ""
 keywords = ""
-favicon = "images/"
+favicon = "favicon/"
 pronouns = "she/her"
 
 [languages.en.Params]
 
-description = "Dedicated Dad"
+description = "Dedicated Mum"
 
 [languages.jp.Params]
-description = "日本語の紹介を書くーQuintessentially Celtic, vehemently Viking, passionately European, unashamedly, proudly Scottish, craft beer and single malt whisky lover, enthusiastic cook, vegan, perpetually exhausted dad, pronouns: he/him"
+description = ""
 
 ## Social Links
 [[params.socialIcons]]
@@ -77,41 +77,30 @@ weight= 100
 url = "/"
 
 [[languages.en.menu.main]]
-name = "Blogs"
+name = "Education"
 weight = 200
-url = "/blog/"
+url = "/category/education/"
 
 [[languages.en.menu.main]]
-name = "Articles"
+name = "Health"
 weight = 300
-url = "/article/"
+url = "/category/health"
 
 [[languages.en.menu.main]]
-name = "Notes"
+name = "Simple Life"
 weight = 400
-url = "/note/"
+url = "/category/simple-life"
 
 [[languages.en.menu.main]]
-name = "Photos"
+name = "Environment"
 weight = 500
-url = "/photo/"
+url = "/category/environment"
 
 [[languages.en.menu.main]]
-name = "Bookmarks"
+name = "Self Development"
 weight = 600
-url = "/bookmarks/"
+url = "/category/self-development"
 
-[[languages.en.menu.main]]
-name = "Résumé"
-weight = 700
-url = "/resume/"
-identifier = "resume"
-
-[[languages.en.menu.main]]
-name = "Feeds"
-weight = 800
-url = "/feeds/"
-identifier = "feeds"
 
 [languages.jp]
 weight = 10
diff --git a/content/note/5fef461b/index.md b/content/note/5fef461b/index.md
deleted file mode 100644
index 370032b..0000000
--- a/content/note/5fef461b/index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-date: '2021-01-01 15:56:11'
-draft: false
-posttype: note
-slug: 5fef461b
-title: note
----
-test
diff --git a/content/note/5fef473d/index.md b/content/note/5fef473d/index.md
deleted file mode 100644
index ca75102..0000000
--- a/content/note/5fef473d/index.md
+++ /dev/null
@@ -1,17 +0,0 @@
----
-date: '2021-01-01 16:01:01'
-draft: false
-posttype: note
-slug: 5fef473d
-title: note
----
-# TEST Header
-**bold**
-*italic*
-
-- list 1
-- list 2
-
-https://sakino.kelbie.scot
-
-[link here](https://sakino.kelbie.scot)
diff --git a/content/note/5fef49d7/index.md b/content/note/5fef49d7/index.md
deleted file mode 100644
index 4f10cd4..0000000
--- a/content/note/5fef49d7/index.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-category:
-    - education
-date: '2021-01-01 16:12:07'
-draft: false
-posttype: note
-slug: 5fef49d7
-title: note
----
-test
diff --git a/static/favicon/android-chrome-192x192.png b/static/favicon/android-chrome-192x192.png
new file mode 100644
index 0000000..775b4df
Binary files /dev/null and b/static/favicon/android-chrome-192x192.png differ
diff --git a/static/favicon/android-chrome-256x256.png b/static/favicon/android-chrome-256x256.png
new file mode 100644
index 0000000..d4fa008
Binary files /dev/null and b/static/favicon/android-chrome-256x256.png differ
diff --git a/static/favicon/apple-touch-icon.png b/static/favicon/apple-touch-icon.png
new file mode 100644
index 0000000..7e04f60
Binary files /dev/null and b/static/favicon/apple-touch-icon.png differ
diff --git a/static/favicon/browserconfig.xml b/static/favicon/browserconfig.xml
new file mode 100644
index 0000000..ed5dd79
--- /dev/null
+++ b/static/favicon/browserconfig.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig>
+    <msapplication>
+        <tile>
+            <square150x150logo src="favicon/mstile-150x150.png"/>
+            <TileColor>#da532c</TileColor>
+        </tile>
+    </msapplication>
+</browserconfig>
diff --git a/static/favicon/favicon-16x16.png b/static/favicon/favicon-16x16.png
new file mode 100644
index 0000000..78d3f27
Binary files /dev/null and b/static/favicon/favicon-16x16.png differ
diff --git a/static/favicon/favicon-32x32.png b/static/favicon/favicon-32x32.png
new file mode 100644
index 0000000..0f09631
Binary files /dev/null and b/static/favicon/favicon-32x32.png differ
diff --git a/static/favicon/favicon.ico b/static/favicon/favicon.ico
new file mode 100644
index 0000000..6a9aa00
Binary files /dev/null and b/static/favicon/favicon.ico differ
diff --git a/static/favicon/mstile-150x150.png b/static/favicon/mstile-150x150.png
new file mode 100644
index 0000000..a41c81d
Binary files /dev/null and b/static/favicon/mstile-150x150.png differ
diff --git a/static/favicon/safari-pinned-tab.svg b/static/favicon/safari-pinned-tab.svg
new file mode 100644
index 0000000..57c20d3
--- /dev/null
+++ b/static/favicon/safari-pinned-tab.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+ "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+ width="368.000000pt" height="368.000000pt" viewBox="0 0 368.000000 368.000000"
+ preserveAspectRatio="xMidYMid meet">
+<metadata>
+Created by potrace 1.11, written by Peter Selinger 2001-2013
+</metadata>
+<g transform="translate(0.000000,368.000000) scale(0.100000,-0.100000)"
+fill="#000000" stroke="none">
+<path d="M690 1840 l0 -1840 1150 0 1150 0 0 1840 0 1840 -1150 0 -1150 0 0
+-1840z"/>
+</g>
+</svg>
diff --git a/static/favicon/site.webmanifest b/static/favicon/site.webmanifest
new file mode 100644
index 0000000..6d25c20
--- /dev/null
+++ b/static/favicon/site.webmanifest
@@ -0,0 +1,19 @@
+{
+    "name": "",
+    "short_name": "",
+    "icons": [
+        {
+            "src": "android-chrome-192x192.png",
+            "sizes": "192x192",
+            "type": "image/png"
+        },
+        {
+            "src": "android-chrome-256x256.png",
+            "sizes": "256x256",
+            "type": "image/png"
+        }
+    ],
+    "theme_color": "#ffffff",
+    "background_color": "#ffffff",
+    "display": "standalone"
+}
diff --git a/static/images/profile1.jpg b/static/images/profile1.jpg
new file mode 100644
index 0000000..fe0a204
Binary files /dev/null and b/static/images/profile1.jpg differ
diff --git a/static/images/profile2.jpg b/static/images/profile2.jpg
new file mode 100644
index 0000000..38ee1d0
Binary files /dev/null and b/static/images/profile2.jpg differ
diff --git a/themes/nipponalba/layouts/_default/list.html b/themes/nipponalba/layouts/_default/list.html
index 8ab741d..971561d 100644
--- a/themes/nipponalba/layouts/_default/list.html
+++ b/themes/nipponalba/layouts/_default/list.html
@@ -1,58 +1,21 @@
 {{ define "main" }}
 <section class="archive">
   <section class="archive-listing">
-   <span class="list-title">{{if not (eq .Name "Blog")}}{{ .Name }}{{ end }}{{if eq .Name "Blog"}}All Blogs{{ end }} <a href="{{ .Permalink }}index.xml"><i class="fa fa-rss fa-2x fa-fw" aria-hidden="true" title="{{ .Name }} RSS feed"></i></a></span>
-      {{ if eq .Type "article" "blog"}}<ul class="listing">{{ range .Data.Pages.GroupByDate "2006" }}
-      {{ range .Pages }}
-        <li class="archive-listing-item">
-          {{ if eq .Type "blog"}}
-            <span class="list-blog"><a class="u-url" href="{{ .Permalink }}" title="{{ .Title }}">
-              {{ $image := (replace .Title " " "") }}
-              {{ $image := print "/images/" $image ".jpg" }}
-              <img class="banner" src="{{ ( $image | urlize ) | relLangURL }}" />
-              <span class="p-name entry-title">{{ .Title }}</span></a>
-            </span>
-            {{end}}
-            {{ if eq .Type "article"}}
-            <span class="list-article h-entry entry"><a class="u-url" href="{{ .Permalink }}">
-                {{ with .Page.Params.Image }}{{ partial "image.html" . }}{{ end }}<span class="p-name entry-title">{{ .Title }}</span>
-            <section class="e-content">{{ .Description }}</section>
-            </a></span>
-              {{end}}
-          </li>
-    {{ end }}{{end}}</ul>{{else}}
-<ul class="listing">
+   <span class="list-title">{{ humanize .Name }}<a href="{{ .Permalink }}index.xml"><i class="fa fa-rss fa-2x fa-fw" aria-hidden="true" title="{{ .Name }} RSS feed"></i></a></span>
+   <ul class="listing">
     {{ range .Pages }}
-      <li class="archive-listing-item">
-          {{ if not (eq .Type "note" "photo") }}
-          {{ if eq .Type "article"}}
-          <span class="list-article h-entry entry"><a class="u-url" href="{{ .Permalink }}">
-              {{ with .Page.Params.Image }}{{ partial "image.html" . }}{{ end }}<span class="p-name entry-title">{{ .Title }}</span>
-          <section class="e-content">{{ .Description }}</section>
-          </a></span>
-          {{else}}<span class="listing-post"><a href="{{ .Permalink }}" title="{{ .Title }}">{{ .Title }}</span>{{end}}{{else}}
-            {{ if eq .Type "note"}}
-            <span class="list-category"><a class="u-url" href="{{ .Permalink }}" title="{{ .Title }}">
-              <span class="note-banner">{{ humanize .Type }}</span>
-              <span class="p-summary e-content"><p>{{ .Summary }}</p></span></a>
-            </span>{{else}}
-            <article class="list-category index-photo h-entry entry"><a class="u-url" href="{{ .Permalink }}">
-            <section class="e-content">
-                <section class="photos">
-                {{ range first 1 .Page.Params.Photo }}
-                  {{ if isset . "value" }}
-                  <img class="u-photo thumb" src="{{ replace .value "800." "300."}}" alt="{{ .alt }}"/>
-                  {{ else }}
-                  <img class="u-photo thumb" src="{{ replace . "800." "300."}}" alt="Alt not yet added, will fix!"/>
-                  {{ end }}
-                {{end}}
-                </section>
-
-            </section>
-            </a></article>{{end}}{{end}}
+      <li class="post h-feed contents">
+          {{ if eq .Type "note"}}
+            <span class="archive_content h-entry entry">
+              <span class="info-date"><a href="{{ .Permalink }}" class="u-url"><time class="dt-published" datetime="{{ .Date.Format "2 Jan 2006 15:04 GMT" }}">{{ .Date.Format "2 Jan 2006 15:04 GMT" }}</time></a></span>
+              <section class="p-name e-content">{{ .Content }}</section>
+              <section class="info">
+              <span class="categories_span">{{ with .Page.Params.category }}Categories: {{ partial "taxonomy/categories.html" . }}{{ end }}</span><br/>
+              </section>
+            </span>{{end}}
         </li>
   {{ end }}</ul>
-    {{ end }}
+
 </section>
   </section>
 {{ end }}
diff --git a/themes/nipponalba/layouts/_default/single.html b/themes/nipponalba/layouts/_default/single.html
index be6ade2..4c76c6e 100644
--- a/themes/nipponalba/layouts/_default/single.html
+++ b/themes/nipponalba/layouts/_default/single.html
@@ -2,15 +2,11 @@
 {{ if not (eq .Type "response" "bookmarkof")}}
 <article class="post h-entry entry contents">
   <section class="author" style="display:none;">
-    <a rel="author" class="p-author h-card" rel="me" href="https://jon.kelbie.scot">{{ .Site.Params.Author }}<img src="/images/profile1.jpg"/></a>
+    <a rel="author" class="p-author h-card" rel="me" href="https://sakino.kelbie.scot">{{ .Site.Params.Author }}<img src="/images/profile1.jpg"/></a>
   </section>
-    {{ with .Page.Params.Image }}{{ partial "image.html" . }}{{ end }}
-          <section class="post_content">{{ if eq .Type "article" }}<h3 class="p-name entry-title">{{ .Title }}</h3><b>{{ .Description }}</b><section class="info">
-          <span class="blogs_span">{{ with .Page.Params.Blog }}Blog: {{ partial "taxonomy/blog.html" . }}{{ end }}</span><span class="info-date"><time class="dt-published" datetime="{{ .Date.Format "2 Jan 2006 15:04 GMT" }}">{{ .Date.Format "02/01/2006 15:04 GMT" }}</time></span><br/>
-          <span class="categories_span">{{ with .Page.Params.category }}Categories: {{ partial "taxonomy/categories.html" . }}{{ end }}</span><span class="reading-time">{{ .ReadingTime }}-minute read</span><br/>
-          <span class="tags_span">{{ with .Page.Params.tag }}Tags: {{ partial "taxonomy/tags.html" . }}{{ end }}</span>
-          </section>{{ end }}
-{{ if eq .Type "article" }}<section class="e-content">{{else}}<section class="e-content p-name">{{end}}
+  <section class="post_content">
+  <span class="info-date"><a href="{{ .Permalink }}" class="u-url"><time class="dt-published" datetime="{{ .Date.Format "2 Jan 2006 15:04 GMT" }}">{{ .Date.Format "2 Jan 2006 15:04 GMT" }}</time></a></span>
+<section class="e-content"><section class="e-content p-name">
   {{ .Content }}
   {{ if eq .Type "photo"}}
     <section class="photogrid">
@@ -30,36 +26,9 @@
     {{ end }}<br/>
 </section>
 <section class="info">
-{{ if not (eq .Type "article") }}<span class="categories_span">{{ with .Page.Params.category }}Categories: {{ partial "taxonomy/categories.html" . }}{{ end }}</span>{{ end }}
-<span class="info-date"><a href="{{ .Permalink }}" class="u-url"><time class="dt-published" datetime="{{ .Date.Format "2 Jan 2006 15:04 GMT" }}">{{ .Date.Format "02/01/2006 15:04 GMT" }}</time></a></span></section>
+{{ if not (eq .Type "article") }}<span class="categories_span">{{ with .Page.Params.category }}Categories: {{ partial "taxonomy/categories.html" . }}{{ end }}</span>{{ end }}<br/>
+</section></section>
 
-<hr/>
-<section id="interactions"><h4>Interactions</h4>
-<section id="webmention-form">
-  Interactions on this site are possible only via <a href="https://indieweb.org/Webmention" title="Webmention is a web standard for mentions and conversations across the web, a powerful building block that is used for a growing federated network of comments, likes, reposts, and other rich interactions across the decentralized social web." class="u-url" target="_blank">webmentions</a>.  Alternatively, contact me via <a href="xmpp:jk@nipponalba.scot" class="u-url" target="_blank">xmpp</a>, <a href="https://matrix.to/#/@jk:nipponalba.scot" class="u-url" target="_blank">matrix</a> or <a href="mailto:jon@kelbie.scot" class="u-url">email</a>.<br/><br/>
-  <form action="https://webmention.io/jon.kelbie.scot/webmention" method="post">
-      <label>Did you mention this {{ .Type }} on your website? Put the URL of your post here:</label><br/>
-      <input name="source" type="url"/>
-      <input name="target" value="{{ .Permalink }}" type="hidden"/>
-      <input value="Send Webmention" type="submit"/>
-  </form>
-  <p>Alternatively, if you do not have a webmentions enabled website then you can leave a message using the comment parade form below.</p>
-<details id="commentparade"><summary>Comment Parade</summary><p>Please copy the following and paste into the URL field below: <span class="url">{{.Permalink }}</span></p><embed type="text/html" class="commentparade" src="https://commentpara.de"></embed></details>
-<p>All going well, interactions will take a few minutes to appear, possibly longer due to .. gremlins.</p>
-</section>
-{{ $mention_ids := index $.Site.Data.index .RelPermalink }}
-{{ if isset $mention_ids 0}}
-{{ $mentions := apply $mention_ids "index" $.Site.Data.mentions "." }}
-{{ $mentions := sort $mentions "wm-received" }}
-<section id="webmentions">
-  <section class="like interaction"><h4>Likes</h4>{{ range $mentions }}{{ if eq (index . "wm-property") "like-of" }}
-      <a href="{{ .author.url }}"><img class="remote_profile" src="{{ .author.photo }}" title="{{ .author.name }}" alt="{{ .author.name }}" /></a>{{ end}}
-  {{ end }}</section>
-  <section class="share interaction"><h4>Shares</h4>{{ range $mentions }}{{ if eq (index . "wm-property") "repost-of" }}
-      <a href="{{ .author.url }}"><img class="remote_profile" src="{{ .author.photo }}" title="{{ .author.name }}" alt="{{ .author.name }}" /></a>{{ end}}
-  {{ end }}</section>
-  <h4>Comments & Replies</h4>{{ partial "webmention.html" $mentions }}
-</section>{{ end }}</section>
 </article>
 {{ else if eq .Type "bookmarkof" }}
 <section class="bookmarks">{{ $cats := slice }}
diff --git a/themes/nipponalba/layouts/index.html b/themes/nipponalba/layouts/index.html
index 5cc1d84..57f5c7a 100644
--- a/themes/nipponalba/layouts/index.html
+++ b/themes/nipponalba/layouts/index.html
@@ -1,50 +1,20 @@
 {{ define "main" }}
 <section class="about">
 <section class="h-feed">
-  <section class="latest_note"><h2>Latest note</h2>
-  {{ range (first 1 (where .Site.RegularPages "Type" "=" "note")) }}
+  <section class="latest_note"><h2>Latest notes</h2>
+  {{ range (first 3 (where .Site.RegularPages "Type" "=" "note")) }}
   <article class="index-note h-entry entry">
     <section class="author" style="display:none;">
       <a rel="author" class="p-author h-card" rel="me" href="https://jon.kelbie.scot">{{ .Site.Params.Author }}<img src="/images/profile1.jpg"/></a>
     </section>
+    <span class="info-date"><a href="{{ .Permalink }}" class="u-url"><time class="dt-published" datetime="{{ .Date.Format "2 Jan 2006 15:04 GMT" }}">{{ .Date.Format "2 Jan 2006 15:04 GMT" }}</time></a></span>
     <section class="e-content">{{ .Content }}
   </section>
   <section class="info">
-    {{ if eq .Type "article" }}
-    <span class="blogs_span">{{ with .Page.Params.Blog }}Blog: {{ partial "taxonomy/blog.html" . }}{{ end }}</span><span class="info-date"><time class="dt-published" datetime="{{ .Date.Format "2 Jan 2006 15:04 GMT" }}">{{ .Date.Format "02/01/2006 15:04 GMT" }}</time></span><br/>
-    <span class="categories_span">{{ with .Page.Params.category }}Categories: {{ partial "taxonomy/categories.html" . }}{{ end }}</span><span class="reading-time">{{ .ReadingTime }}-minute read</span><br/>
-    <span class="tags_span">{{ with .Page.Params.tag }}Tags: {{ partial "taxonomy/tags.html" . }}{{ end }}</span>
-    {{ else }}
-    <span class="categories_span">{{ with .Page.Params.category }}Categories: {{ partial "taxonomy/categories.html" . }}{{ end }}</span><span class="info-date"><a href="{{ .Permalink }}" class="u-url"><time class="dt-published" datetime="{{ .Date.Format "2 Jan 2006 15:04 GMT" }}">{{ .Date.Format "02/01/2006 15:04 GMT" }}</time></a></span><br/>
-    {{ end }}
+        <span class="categories_span">{{ with .Page.Params.category }}Categories: {{ partial "taxonomy/categories.html" . }}{{ end }}</span><br/>
   </section>
 </article> {{ end }}
 </section>
-    <section class="latest_articles"><h2>Latest articles</h2>
-    {{ range (first 3 (where .Site.RegularPages "Type" "=" "article")) }}
-    <article class="index-article h-entry entry"><a class="u-url" href="{{ .Permalink }}" title="{{ .Title }}">
-      {{ range first 1 .Page.Params.image }} <img class="banner" src="{{ replace . "images" "images/300" }}"/>{{ end }}<span class="p-name entry-title">{{ .Title }}</span>
-    <section class="e-content">{{ .Description }}</section>
-    </a></article>{{ end }}</section>
-    <section class="latest_photos"><h2>Latest photos</h2>
-      {{ range (first 3 (where .Site.RegularPages "Type" "=" "photo")) }}
-      <article class="index-photo h-entry entry"><a class="u-url" href="{{ .Permalink }}">
-      <section class="e-content">
-        {{ if eq .Type "photo"}}
-          <section class="photos">
-        {{ $summary := .Content }}
-          {{ range first 1 .Page.Params.Photo }}
-            {{ if isset . "value" }}
-            <img class="u-photo thumb" src="{{ replace .value "800." "300."}}" title="{{$summary}}" alt="{{ .alt }}"/>
-            {{ else }}
-            <img class="u-photo thumb" src="{{ replace . "800." "300."}}" title="{{$summary}}" alt="Alt not yet added, will fix!"/>
-            {{ end }}
-          {{end}}
-          </section>
-          {{end}}
-      </section>
-      </a></article>{{ end }}</section>
-<a href="https://brid.gy/publish/mastodon"></a>
     </section>
 </section>
 
diff --git a/themes/nipponalba/layouts/partials/aside.html b/themes/nipponalba/layouts/partials/aside.html
index ef63ccc..ddaf726 100644
--- a/themes/nipponalba/layouts/partials/aside.html
+++ b/themes/nipponalba/layouts/partials/aside.html
@@ -1,5 +1,5 @@
 <section class="h-card p-author">
-<img class="u-photo" src="{{ .Site.Params.ProfilePicture }}" alt="profile picture">
+<img class="u-photo" src="{{ .Site.Params.ProfilePicture }}" alt="profile picture"><br/>
 <span rel="author" class="title p-name" rel="me">{{ .Site.Params.Author }}</span><br/>
   <ul class="social-links">
     {{ range $item := .Site.Params.socialIcons }}
@@ -7,34 +7,28 @@
       <i class="fa {{ $item.icon }}" aria-hidden="true" title="{{ $item.title }}"></i>
     </a>
     {{ end }}
-    <span id="session"><a href="#"><img src="images/session.png" title="Session ID QR Code" alt="Session messenger icon"/>
-<span><img src="images/sessionid.png" title="Session ID QR Code" alt="Session messenger id QR code"/></span></a></span>
 </ul>
 <section class="description">
   <h4 class="p-note">{{ .Site.Params.description }}<br/>
   Pronouns: <span class="p-x-pronoun-nominative">she</span>/<span class="p-x-pronoun-oblique">her</span>/<span class="p-x-pronoun-posessive">hers</span></h4>
   <section class="interests">
-  <span class="p-category">Craft Beer</span>
-  <span class="p-category">Single Malt Whisky</span>
-  <span class="p-category">Homebrewing</span>
-  <span class="p-category">Scottish Politics</span>
-  <span class="p-category">Scottish History</span>
-  <span class="p-category">Japanese History</span>
-  <span class="p-category">Tech</span>
-  <span class="p-category">Veganism</span>
-  <span class="p-category">Cooking</span></section>
+  <span class="p-category">Education</span>
+  <span class="p-category">Parenting</span>
+  <span class="p-category">Language</span>
+  <span class="p-category">Exercise</span>
+  <span class="p-category">Environment</span>
+  <span class="p-category">Food</span>
+  <span class="p-category">Community</span>
+  <span class="p-category">Minimalism</span>
+  <span class="p-category">Materialism</span></section>
 </section>
 <section style="display:none">
 <span class="p-country-name">Scotland or Japan</span>
 <a class="u-email" rel="me" href="mailto:sakino@kelbie.scot"></a>
 <a class="u-url u-uid" rel="me" href="https://sakino.kelbie.scot"></a>
 </section>
-<section class="doing">
-  <section class="reading h-product"><i class="fa fa-book" aria-hidden="true" target="_blank"></i> <a href="https://www.sciencedirect.com/book/9781782423317/brewing-microbiology" class="u-url" title="now reading: Brewing Microbiology"><span class="p-name">Brewing Microbiology</span><img class="u-photo" src="/images/reading/brewing-microbiology.jpg"/></a></section>
-  <section class="playing h-product"><i class="fa fa-gamepad" aria-hidden="true"></i> <a href="https://www.cyberpunk.net" class="u-url" target="_blank" title="now playing: Cyberpunk 2077"><span class="p-name">Cyberpunk 2077</span><img class="u-photo" src="/images/playing/cyberpunk2077.jpg"/></a></section>
-  <section class="watching h-product"><i class="fa fa-television" aria-hidden="true"></i> <a href="https://www.themoviedb.org/tv/63639-the-expanse" class="u-url" target="_blank" title="now watching: The Expanse"><span class="p-name">The Expanse</span><img class="u-photo" src="/images/watching/theexpanse.jpg"/></a></section>
-</section>
+
 </section>
 <hr/>
 <section class="site-info">&copy; {{ now.Format "2006"}} | <a href="https://creativecommons.org/licenses/by/4.0/" target="_blank">CC-BY 4.0</a> | <a href="{{ .Permalink }}index.xml"><i class="fa fa-rss fa-fw" aria-hidden="true" title="Blog RSS feed"></i></a><br/>
-Made with ❤ and <a href="https://gohugo.io/">Hugo</a> by {{ .Site.Params.author }}</section>
+Made with ❤ and <a href="https://gohugo.io/">Hugo</a> <br/>by <a href="https://jon.kelbie.scot" target="_blank">Jon Kelbie</a></section>
diff --git a/themes/nipponalba/layouts/partials/navbar.html b/themes/nipponalba/layouts/partials/navbar.html
index 7283f47..6ac215d 100644
--- a/themes/nipponalba/layouts/partials/navbar.html
+++ b/themes/nipponalba/layouts/partials/navbar.html
@@ -4,17 +4,5 @@
         {{ range .Site.Menus.main }}
         <li id="{{ .Name }}"><a {{if or ($currentPage.IsMenuCurrent "main" .) ($currentPage.HasMenuCurrent "main" .) }}class="current"{{end}} href="{{ .URL }}" title="{{ .Name }}">{{ .Name }}</a></li>
         {{ end }}
-        {{ if .IsTranslated }}
-        {{ range .Translations }}
-        <li><a rel="alternate" href="{{ .RelPermalink }}" hreflang="{{ .Lang }}" lang="{{ .Lang }}">{{ .Language.LanguageName }}<i class="fa fa-language fa-2x language" aria-hidden="true" title="Language"></i></a></li>
-        {{ end }}
-        {{ else }}
-        {{ range .Site.Languages }}
-        {{ if ne $.Site.Language.Lang .Lang }}
-        <li><a rel="alternate" href="{{ .Lang | relURL }}" hreflang="{{ .Lang }}" lang="{{ .Lang }}">{{ .LanguageName }} <i class="fa fa-language fa-2x language" aria-hidden="true" title="言語"></i></a></li>
-        {{ end }}
-        {{ end }}
-        {{ end }}
-        <li><label for="theme-switch"><i class="fa fa-adjust fa-2x light" aria-hidden="true" title="light/dark mode switch"></i></label></li>
         </nav>
 </header>
diff --git a/themes/nipponalba/static/css/style.css b/themes/nipponalba/static/css/style.css
index 873a9dc..60ec0a1 100644
--- a/themes/nipponalba/static/css/style.css
+++ b/themes/nipponalba/static/css/style.css
@@ -164,20 +164,22 @@ html { font-family: 'Inter', sans-serif;}
   html { font-family: 'Inter var', sans-serif; }
 }
 :root {
-  --dark-link:#e6ffff;
-  --dark-text:#87d5ff;
-  --dark-bg:#5c5458;
+  --green:#1B7742;
+  --blue:#20603C;
+  --dark-link:#E9E9E9;
+  --dark-text:#E9E9E9;
+  --dark-bg:#5DA797;
   --dark-opacity: 0.75;
-  --light-text:#084c72;
-  --light-bg:#f0f2d7;
-  --light-link:#00569b;
+  --light-text:#454545;
+  --light-bg:#E9E9E9;
+  --light-link:#1B7742;
   --light-opacity:1;
   --light-shadow:rgba(0,0,0,0.06);
   --light-border:rgba(150,150,150,0.3);
-  --text-colour: var(--dark-text);
-  --bg-colour: var(--dark-bg);
-  --link-colour: var(--dark-link);
-  --opacity-img: var(--dark-opacity);
+  --text-colour: var(--light-text);
+  --bg-colour: var(--light-bg);
+  --link-colour: var(--light-link);
+  --opacity-img: var(--light-opacity);
   --border-colour: var(--light-border);
   --shadow-colour: var(--light-shadow);
 }
@@ -196,27 +198,6 @@ html { font-family: 'Inter', sans-serif;}
   --opacity-img: var(--light-opacity);
 }
 
-/* Switched mode */
-.theme-switch:checked ~ *,
-.theme-switch:checked + *,
-.theme-switch:checked + * + *,
-.theme-switch:checked + * + * + *{
-  --text-colour:var(--light-text);
-  --bg-colour:var(--light-bg);
-  --link-colour:var(--light-link);
-  --opacity-img: var(--light-opacity);
-}
-
-.theme-switch{
-  display:none;
-}
-
-.light{
-  display:inline;
-  float:right;
-  color:var(--text-colour);
-}
-
 html {
   -webkit-animation-fill-mode: forwards;
 }
@@ -264,12 +245,8 @@ table, td, th{
   border: 1px dotted var(--text-colour);
   padding:15px;
 }
-h3 {
-  color: var(--text-colour);
-  font-size: 22px;
-  font-weight: 600;
-  line-height: 1.6;
-}
+
+
 h4 {
   color: var(--text-colour);
   font-size: 16px;
@@ -282,17 +259,19 @@ h4 {
 }
 #page-top {
   width: 100%;
-  max-width: 1000px;
+  max-width: 800px;
   z-index: 3;
   height: 60px;
   border-bottom: 1px solid var(--border-colour);
   background: var(--bg-colour);
   margin: 0 auto;
 }
-#page-top a {
-  color: var(--text-colour);
+#page-top nav li, #page-top nav li a{
+  background: var(--link-colour);
+  color: var(--bg-colour);
 }
-#page-top a:hover {
+#page-top nav li:hover, #page-top nav li:hover a{
+  background: var(--bg-colour);
   color: var(--link-colour);
 }
 nav {
@@ -307,6 +286,13 @@ nav li{
   display: initial;
   padding-right: 20px;
   font-weight:bolder;
+  background-color: var(--link-colour);
+  padding:5px;
+  color: var(--bg-colour);
+  box-shadow: 0 1px 2px var(--shadow-colour);
+  border: 1px solid var(--border-colour);
+  border-radius:5px;
+  margin-right: 5px;
 }
 nav li i{
   margin:0;
@@ -327,14 +313,14 @@ nav i{
   top:-5px;
 }
 main {
-  max-width: 1000px;
+  max-width: 800px;
   margin: 0 auto;
   background: var(--bg-colour);
 }
 
 main{
   display:grid;
-  grid-template-columns: calc(100% - 207px) 185px;
+  grid-template-columns: calc(100% - 250px) 250px;
   grid-template-rows: auto;
   }
 
@@ -350,20 +336,21 @@ main{
   box-shadow: 0 2px 3px var(--shadow-colour);
   border: 1px solid var(--border-colour);
   border-radius:15px;
-  height: 1300px;
+  height: 770px;
   grid-column: 2;
-  max-width:185px;
-  width:185px;
+  max-width:250px;
+  width:rgb(255, 0, 0);px;
   text-align:center;
 }
 .profile img{
-  width:165px;
+  width:230px;
   border-radius: 5px;
+  display:block;
 }
 .profile .title{
- font-size: 1.8rem;
+ font-size: 1.2rem;
  font-weight: bold;
- letter-spacing: 1.5px;
+ letter-spacing: 1.1px;
  line-height: 1;
  }
 .social-links {
@@ -389,25 +376,13 @@ main{
     padding-left: 4px;
     display: inline;
   }
-#session a span{
-  visibility:hidden;
-  display:block;
-  position:absolute;
-}
-#session a span img{
-  min-width: 160px;
-  opacity: 1;
-}
-#session a:hover, #session a:hover span{
-  visibility:visible;
-  z-index: 1;
-}
+
 .profile .description{
   text-align:center;
 }
 
 .profile .interests .p-category{
-  background-color: var(--link-colour);
+  background-color: var(--blue);
   padding:5px;
   color: var(--bg-colour);
   box-shadow: 0 1px 2px var(--shadow-colour);
@@ -416,22 +391,6 @@ main{
   display:inline-block;
   margin:2px;
 }
-.profile .doing{
-  margin-top: 10px;
-  font-weight:bolder;
-}
-.watching, .playing, .reading{
-  padding:5px;
-}
-
-.watching img, .playing img{
-  max-height:100px;
-  object-fit:cover;
-  object-position:top;
-}
- .reading img{
-   object-fit:contain;
- }
 
 .site-info{
   font-size:13px;
@@ -449,9 +408,8 @@ main{
 }
 .index-note{
   width:92%;
-}
-.resume{
-  width:97%;
+  margin-bottom: 20px;
+  background: var(--light-bg)
 }
 .index-article, .index-photo, .list-article, .list-blog, .list-category{
   box-shadow: 0 2px 3px var(--shadow-colour);
@@ -504,11 +462,16 @@ main{
 .info{
   padding: 30px 0;
   font-size:13px;
-  display:grid;
-  grid-template-columns: repeat (80%. 20%);
+
 }
 .blogs_span, .categories_span, .tags_span{
-  grid-column: 1;
+  width: 100%;
+  display:block;
+}
+.info-date{
+  text-align:right;
+  float:right;
+
 }
 .category, .blog, .tag {
   font-size: 13px;
@@ -523,6 +486,7 @@ main{
 .categories li, .tags li{
   list-style:none;
   display:inline;
+  text-transform: capitalize;
 }
 .tag::before {
   content: "#";
@@ -545,20 +509,8 @@ main{
 .info-date a{
   text-decoration:underline;
 }
-.reading-time{
-  display:inline;
-  grid-column: 2;
-  text-align:right;
-  font-weight:bold;
-}
-.syndication{
-  grid-column:2;
-  text-align:right;
-  font-size:13px;
-  margin:0;
-}
+
 .stream{
-  padding-bottom:150px;
   margin: 0 auto;
 }
 
@@ -570,7 +522,7 @@ main{
   margin: 20px 0;
   padding: 0;
   }
-.index_content, .post_content{
+.index_content, .post_content, .archive_content{
     text-align:justify;
     width:97%;
     padding: 10px;
@@ -581,16 +533,6 @@ main{
   margin: 0 auto;
   border-radius:15px;
 }
-
-.banner{
-  width:100%;
-  max-height: 300px;
-  object-fit:scale-down;
-  object-position:top;
-  border-top-left-radius:15px;
-  border-top-right-radius:15px;
-}
-
 .h-entry p a {
   text-decoration: underline;
   color: var(--link-colour);
@@ -598,189 +540,11 @@ main{
 .h-entry a:hover {
   color: var(--link-colour);
 }
-.education, .work{
-  margin: 10px 0px;
-  padding-top: 0px;
-  display:grid;
-  grid-template-columns: 200px auto;
-  grid-template-rows: auto;
-}
-.skills{
-  margin: 10px 0px;
-}
-
-.daterange{
-  color: var(--link-colour);
-  font-style: italic;
-  margin-right: 20px;
-  grid-column: 1;
-  font-size:14px;
-}
-.institution, .organisation, .jobdescription{
-  display:block;
-  grid-column: 2;
-}
-.jobtitle, .degree{
-  grid-column:2;
-  font-weight:bolder;
-}
-.institution, .organisation{
-  font-style:italic;
-}
-.organisation{
-  padding-left: 20px;
-}
-.skilltype summary{
-  font-weight:bolder;
-}
-.skilltype ul{
-  display: flex;
-  flex-wrap: wrap;
-  margin:0;
-  padding: 0;
-}
-.skilltype li{
-  list-style:none;
-  display: inline;
-  padding: 5px;
-  border: 1px solid var(--border-colour);
-  border-radius: 5px;
-  margin: 5px;
-}
-#interactions{
-  margin:20px 0 10px 0;
-  padding:0;
-  display:grid;
-  grid-template-rows: repeat (20px, 40px, auto);
-  width:100%;
-  padding-bottom:150px;
-}
-#webmention-form{
-grid-row: 2;
-  margin-top:20px;
-  width: 100%;
-}
-#webmention-form label{
-line-height: 2;
-}
-#webmention-form input[type=url]{
-  width: 60%;
-}
-#webmentions{
-  grid-row: 4;
-  margin-top: 0 20px 0 0 ;
-  padding: 0 0 200px 0;
-}
-.interaction h4{
-  line-height:15px;
-  padding:0;
-  margin:0;
-}
-.interaction.like, .interaction.share{
-  border:0;
-  color: var(--text-colour);
-  padding:2px;
-  margin:30px 0 0 0;
-  display:flex;
-  width:100%;
-  min-height:30px;
-}
-.interaction.like h4, .interaction.share h4{
-  margin-right: 20px;
-}
-.interaction.like img,.interaction.share img{
-  display:inline;
-  width:30px;
-  height:30px;
-  padding:0;
-  margin:2px;
-  position:relative;
-  top:-10px;
-  border-radius: 50%;
-  border: 1px solid var(--border-colour);
-  box-shadow: 0 2px 3px var(--shadow-colour);
-}
-.interaction.like img:nth-child(1),.interaction.share img:nth-child(1){
-  margin-left:10px;
-}
-.interaction.mention, .interaction.reply{
-  border:1px solid var(--border-colour);
-  border-radius:15px;
-  display:grid;
-  grid-template-columns: 80px auto;
-  min-height: 60px;
-  padding: 10px;
-  margin: 10px 0px;
-}
-.interaction.mention .remote_profile, .interaction.reply .remote_profile{
-  width: 80px;
-}
-.interaction.mention .remote_profile img, .interaction.reply .remote_profile img{
-  width: 50px;
-  height: 50px;
-  object-fit:cover;
-  border-radius: 50%;
-  margin: 0 auto;
-}
-.intactivity{
-  font-size:13px;
-  font-style: italic;
-  line-height:18px;
-  text-align:left;
-}
-.intcontent{
-  font-size:15px;
-  vertical-align:top;
-  text-align:left;
-  padding-left: 10px;
-}
-.interaction time{
-  font-size:13px;
-}
 
 .description {
   color: var(--text-colour);
 }
-.archive-listing-item{
-  margin:0;
-  padding:0;
-}
-.list-article, .list-blog, .list-category{
-  display:inline-block;
-  float:left;
-  margin:5px 10px 5px 0;
-}
-.list-blog{
- height:190px;
- width: 350px;
- text-align:center;
-}
-.list-blog img{
-  height:150px;
-  width:350px;
-}
-.list-category{
- height: 220px;
-}
-.list-category p{
-  color: var(--link-colour);
-  line-height: normal;
-  padding: 5px;
-}
-.note-banner{
-  height:30px;
-  text-align:center;
-  font-weight: bold;
-  display:block;
-  vertical-align:middle;
-  font-size:24px;
-  text-transform:lowercase;
-  padding:10px;
-  color:var(--bg-colour);
-  background-color: var(--link-colour);
-  border-top-left-radius:15px;
-  border-top-right-radius:15px;
-}
+
 .list-title{
   font-size:30px;
   font-weight:bold;
@@ -797,9 +561,10 @@ line-height: 2;
   padding:0;
   margin:0;
 }
-.listing li {
+.listing li.post {
   list-style-type: none;
-  padding: 0;
+  padding: 10px;
+  width: 95%;
 }
 .listing-title {
   font-size: 24px;
@@ -807,10 +572,6 @@ line-height: 2;
   font-weight: 600;
   line-height: 2.2em;
 }
-
-.listing-post {
-  padding-bottom: 5px;
-}
 .post-time {
   float: right;
   color: var(--text-colour);
@@ -834,10 +595,6 @@ line-height: 2;
   padding-top: 50px;
 }
 
-.pixelfed_embed {
-  margin:0 auto;
-  display:block;
-}
 hr {
   color: var(--text-colour);
 }
@@ -846,37 +603,9 @@ hr {
   display:none;
 }
 
-#response p{
-  margin:0;
-}
-.response-top{
-  font-style:italic;
-}
 time{
   font-size:13px;
 }
-.bookmarks, #response-details{
-  box-shadow: 0 2px 3px var(--shadow-colour);
-  border: 1px solid var(--border-colour);
-  border-radius: 15px;
-  margin-top: 20px;
-  width:95%;
-  padding:10px;
-}
-.bookmark {
-  border: 1px solid var(--border-colour);
-  padding: 10px;
-  margin-bottom: 5px;
-  border-radius: 15px;
-}
-.bookmark .p-content{
-  display:inline;
-  margin:0;
-  padding:0;
-}
-.bookmark a{
-  text-decoration:underline;
-}
 .picture{
   flex: calc(100% / 3);
   max-width:calc(100% / 3);
@@ -928,30 +657,13 @@ hr{
 .anchor:target {
   display:block;
 }
-.feeds {
-  width: 95%;
-  margin-top: 20px;
-}
-.feedrow {
-  display:grid;
-  grid-template-columns: 80% auto;
-}
-.feedrow .description{
-  grid-column: 1;
-}
-.feedrow .feedlinks{
-  grid-column: 2;
-}
-.commentparade {
-  width:100%;
-  overflow:auto;
-  background: var(--background-colour);
-  padding:0;
-  height:250px;
+
+
+h1 {
   color: var(--text-colour);
-}
-#commentparade .url{
-  font-weight:bolder;
+  font-size: 20px;
+  font-weight: 600;
+  line-height: 1.4;
 }
 
 @media screen and (max-width: 960px) {
@@ -966,9 +678,6 @@ hr{
   main {
     width:95%;
   }
-.interactions{
-  padding-bottom: 100px;
-}
   .pagination li{
     padding:10px 40px;
     height: 30px;