diff --git a/assets/css/components/markup.pcss b/assets/css/components/markup.pcss
index 716a8f16..6fee115e 100644
--- a/assets/css/components/markup.pcss
+++ b/assets/css/components/markup.pcss
@@ -1,111 +1,148 @@
 .markup {
-  a {
-    @apply underline;
-
-    &:hover {
-      @apply no-underline
+    h1, h2, h3, h4. h5 {
+        margin-bottom: 0;
+        font-weight: 600 !important
     }
 
-    &:focus {
-      @apply p-px -m-px bg-blue-700 text-white outline-none
+    a {
+        text-decoration: underline
     }
-  }
 
-  p {
-    @apply leading-relaxed;
-
-    + p {
-      @apply mt-4
+    a:hover {
+        text-decoration: none
     }
-  }
 
-  ol {
-    @apply list-decimal
-  }
+    a:focus {
+        color: white;
+        background: #0b6cb0;
+        outline: none;
+        padding: 1px;
+        margin: -1px
+    }
 
-  ul {
-    @apply list-disc;
-  }
+    p {
+        @apply leading-relaxed
+    }
 
-  ol,
-  ul {
-    @apply pl-5;
+    p + p {
+        @apply mt-6
+    }
+
+    ul {
+        @apply list-disc pl-6
+    }
 
     li + li {
-      @apply mt-2
+        @apply mt-4
     }
-  }
 
-  p {
-    + blockquote,
-    + ol,
-    + ul,
-    + div[v-pre] {
-      @apply mt-4
+    a {
+        @apply underline;
+
+        &:hover {
+            @apply no-underline
+        }
+
+        &:focus {
+            @apply p-px -m-px bg-blue-700 text-white outline-none
+        }
     }
-  }
 
-  blockquote + * {
-    @apply mt-4
-  }
+    p {
+        @apply leading-relaxed;
 
-  code {
-    @apply -my-px px-1 py-px border border-gray-400 text-sm bg-gray-200
-  }
+        + p {
+            @apply mt-4
+        }
+    }
 
-  pre {
-    @apply border-l-3 border-gray-400 text-sm bg-gray-200;
+    ol {
+        @apply list-decimal
+    }
+
+    ul {
+        @apply list-disc;
+    }
+
+    ol,
+    ul {
+        @apply pl-5;
+
+        li + li {
+            @apply mt-2
+        }
+    }
+
+    p {
+        + blockquote,
+        + ol,
+        + ul,
+        + div[v-pre] {
+            @apply mt-4
+        }
+    }
+
+    blockquote + * {
+        @apply mt-4
+    }
 
     code {
-      @apply p-6 block border-none leading-loose text-sm overflow-x-scroll
-    }
-  }
-
-  * + pre,
-  * + div[v-pre] {
-    @apply my-4
-  }
-
-  img,
-  figure {
-    @apply my-8
-  }
-
-  figure {
-    img {
-      @apply m-0
+        @apply -my-px px-1 py-px border border-gray-400 text-sm bg-gray-200
     }
 
-    figcaption {
-      @apply mt-3
+    pre {
+        @apply border-l-3 border-gray-400 text-sm bg-gray-200;
+
+        code {
+            @apply p-6 block border-none leading-loose text-sm overflow-x-scroll
+        }
     }
-  }
 
-  h2 {
-    @apply leading-tight
-  }
+    * + pre,
+    * + div[v-pre] {
+        @apply my-4
+    }
 
-  * + h2 {
-    @apply mt-8
-  }
+    img,
+    figure {
+        @apply my-8
+    }
 
-  h2 + * {
-    @apply mt-4
-  }
+    figure {
+        img {
+            @apply m-0
+        }
 
-  h3 {
-    @apply text-xl font-bold leading-tight
-  }
+        figcaption {
+            @apply mt-3
+        }
+    }
 
-  * + h3 {
-    @apply mt-6
-  }
+    h2 {
+        @apply leading-tight
+    }
 
-  h3 + * {
-    @apply mt-2
-  }
+    * + h2 {
+        @apply mt-8
+    }
 
-  h2 + h3 {
-    @apply mt-4
-  }
+    h2 + * {
+        @apply mt-4
+    }
+
+    h3 {
+        @apply text-xl font-bold leading-tight
+    }
+
+    * + h3 {
+        @apply mt-6
+    }
+
+    h3 + * {
+        @apply mt-2
+    }
+
+    h2 + h3 {
+        @apply mt-4
+    }
 }
diff --git a/source/_pages/about2.md b/source/_pages/about2.md
new file mode 100644
index 00000000..b1e853b0
--- /dev/null
+++ b/source/_pages/about2.md
@@ -0,0 +1,54 @@
+---
+layout: default
+technologies:
+    backend: [PHP (5-7), MySQL, PHPUnit, Behat]
+    frontend: [HTML, Twig, CSS, Sass/Less, Tailwind CSS, Vue.js, Alpine.js, Jest]
+    frameworks: [Drupal, WordPress, Symfony, Laravel, Sculpin, Jekyll]
+    other: [Git, GitHub, Linux, Vagrant, Docker, Fabric, Ansible, Puppet, Apache, Nginx, Jenkins]
+---
+<div class="markup mx-auto px-4 max-w-2xl text-lg" markdown="1">
+# About me
+
+<img class="mt-8 border border-gray-400" src="/images/drupalcamp-north.jpeg">
+
+{% set company = site.companies[site.work.company] %}
+Hi, I’m Oliver. I'm a web developer, systems administrator, open source project creator and maintainer, community organiser, speaker and mentor based in Wales, UK.
+
+I currently work for [{{company.name}}][company_url] as a {{ site.work.role }}. In my spare time, I'm sometimes available for freelance development or systems administration work.
+
+I specialise in working with the Drupal content management system, Symfony framework, Linux operating systems and Ansible for server provisioning and application deployments.
+
+I started learning and using Drupal in 2007, was previously employed by the [Drupal Association][drupal_association] to work on drupal.org, and am an Acquia certified Drupal 8 Grand Master.
+
+I’m a big advocate for automated testing and test driven development, and am currently [writing a book](/book) on automated testing with Drupal.
+
+[company_url]: {{company.url}}
+[drupal_association]: {{site.companies.drupal_association.url}}
+
+## Technologies
+
+- **Back-end:** {{ page.technologies.backend|join(', ') }}
+- **Front-end:** {{ page.technologies.frontend|join(', ') }}
+- **Frameworks/CMSes:** {{ page.technologies.frameworks|join(', ') }}
+- **Other:** {{ page.technologies.other|join(', ') }}
+
+## Open source
+My Drupal related projects can be found on [Drupal.org][drupalorg]. Everything else is on [GitHub][github].
+
+[drupalorg]: {{site.drupalorg.url_new}}
+[github]: {{site.github.url}}
+
+## Community
+I'm an organiser of the [PHP South Wales user group][php_south_wales]. We hold monthly meetups in Cardiff including talk nights, coding sessions, workshops and socials.
+
+ I was previously the organiser of the Drupal Bristol and South Wales Drupal user groups, and a co-organiser of the PHP South West user group and the DrupalCamp Bristol conference.
+ 
+ [php_south_wales]: https://phpsouthwales.uk
+
+## Speaking
+I also occasionally do live streams of coding conference talks. These can be found on my [YouTube channel][youtube].
+
+[youtube]: {{site.youtube.channel.url}}
+
+## Contact me
+</div>
diff --git a/source/images/drupalcamp-north.jpeg b/source/images/drupalcamp-north.jpeg
new file mode 100644
index 00000000..c9f85c58
Binary files /dev/null and b/source/images/drupalcamp-north.jpeg differ