diff --git a/README.md b/README.md
index 002480f..40782bd 100644
--- a/README.md
+++ b/README.md
@@ -142,7 +142,7 @@ yarn auto-changelog
 [4]: https://gohugo.io/getting-started/quick-start/#step-3-add-a-theme
 [5]: #social-media-metadata
 [6]: https://git.milhit.ch/igor/portfoligor/src/branch/dev/LICENSE
-[7]: screenshots/theme-example.png "Screenshot of my own site using this theme"
+[7]: screenshots/theme-example-v030.png "Screenshot of my own site using this theme"
 [8]: ./CHANGELOG.md
 [9]: https://github.com/CookPete/auto-changelog
 [10]: ./.auto-changelog
diff --git a/assets/scss/_lists.scss b/assets/scss/_lists.scss
index 3ec6ffe..418d6c3 100644
--- a/assets/scss/_lists.scss
+++ b/assets/scss/_lists.scss
@@ -88,7 +88,7 @@
 
     > li:not(:last-child) {
       &::after {
-        content: ' /';
+        content: ' / ';
         white-space: pre;
       }
     }
diff --git a/assets/scss/_medias.scss b/assets/scss/_medias.scss
index 880ddce..4272627 100644
--- a/assets/scss/_medias.scss
+++ b/assets/scss/_medias.scss
@@ -18,7 +18,7 @@
 
   figcaption p {
     font-size: smaller;
-    padding-left: .5rem;
+    padding-left: .5em;
     text-align: left;
   }
 }
@@ -31,7 +31,7 @@
     flex-direction: row;
 
     img {
-      width: 8rem;
+      width: 8em;
     }
 
     div {
@@ -58,8 +58,8 @@
 
 figure {
   border-radius: var(--pico-border-radius);
-  margin: 1em auto;
-  padding: .4rem;
+  margin: var(--pico-spacing) auto;
+  padding: .4em;
   border: $purple-200 solid var(--pico-border-width);
   width: 80%;
 
@@ -71,7 +71,7 @@ figure {
     font-size: smaller;
 
     p {
-      margin: .2rem 0;
+      margin: .2em 0;
       text-align: center;
     }
   }
@@ -84,7 +84,6 @@ figure {
 
   @media (min-width: 768px) {
     max-width: 97%;
-    margin: auto;
     padding-right: 0;
   }
 }
diff --git a/assets/scss/_texts.scss b/assets/scss/_texts.scss
index 54e477a..4cfa09a 100644
--- a/assets/scss/_texts.scss
+++ b/assets/scss/_texts.scss
@@ -9,7 +9,7 @@
 .verse {
   line-height: var(--line-height-verse);
   @media (min-width: 768px) {
-    margin-left: 3rem;
+    margin-left: 3em;
   }
 
   p:not(:last-child) {
@@ -20,7 +20,7 @@
   }
 
   br {
-    margin-bottom: .5rem;
+    margin-bottom: calc(var(--pico-spacing)/2);
   }
 }
 
@@ -35,12 +35,12 @@ mark {
 
   blockquote {
     margin: 0;
-    margin-left: .5rem;
-    padding: 0 0 0 .5rem;
+    margin-left: calc(var(--pico-spacing)/2);
+    padding: 0 0 0 calc(var(--pico-spacing)/2);
 
     p {
       text-align: left;
-      margin: .4rem 0;
+      margin: .4em 0;
     }
 
     em {
@@ -49,7 +49,7 @@ mark {
 
     figcaption {
       text-align: right;
-      margin-top: 1rem;
+      margin-top: var(--pico-spacing);
     }
   }
 }
diff --git a/assets/scss/_variables.scss b/assets/scss/_variables.scss
index 04306d7..c175699 100644
--- a/assets/scss/_variables.scss
+++ b/assets/scss/_variables.scss
@@ -7,8 +7,8 @@
   --pico-font-family: "mylilex", serif, var(--pico-font-family-emoji);
   --pico-font-weight: 400;
   --line-height-verse: 1.4;
-  --verse-p-bottom-space: 2rem;
-  --verse-p-bottom-space-larger: 3rem;
+  --verse-p-bottom-space: 2em;
+  --verse-p-bottom-space-larger: 3em;
 }
 
 h1,
@@ -28,15 +28,15 @@ tfoot td {
 
 [data-theme=light],
   :root:not([data-theme=dark]) {
-  --logo-color: #000000;
+  --logo-color: var(--pico-color);
 }
 
 @media only screen and (prefers-color-scheme: dark) {
   :root:not([data-theme]) {
-    --logo-color: #ffffff;
+    --logo-color: var(--pico-color);
   }
 }
 
 [data-theme=dark] {
-  --logo-color: #ffffff;
+  --logo-color: var(--pico-color);
 }
diff --git a/screenshots/theme-example-v030.png b/screenshots/theme-example-v030.png
new file mode 100644
index 0000000..effc8f0
Binary files /dev/null and b/screenshots/theme-example-v030.png differ