jmapio · neilj · May 5, 2026 · May 4, 2026 · May 1, 2026 · May 1, 2026
diff --git a/.prettierignore b/.prettierignore
@@ -1,2 +1,4 @@
 _includes/toc.liquid
 generated-*
+_collections/_combomark
+_collections/_logomark
diff --git a/_collections/_combomark/jmap-combination-mark-dark.liquid b/_collections/_combomark/jmap-combination-mark-dark.liquid
@@ -0,0 +1,14 @@
+---
+permalink: /brand/assets/jmap-combination-mark-dark.svg
+theme: dark
+---
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 210 80" fill="none">
+    <path d="M138.889 22.6051L132.463 39.748L126.037 22.6051H116.041V56.8908H123.055V34.6219L129.775 52.5211H135.193L141.913 34.6219V56.8908H148.927V22.6051H138.889Z" fill="#CFD0D0"/>
+    <path d="M156.112 56.8913H163.126V48.0678H172.996V56.8913H180.01V28.9921C180.01 25.5047 177.154 22.6476 173.668 22.6476H162.412C158.926 22.6476 156.07 25.5047 156.07 28.9921V56.8913H156.112ZM163.168 29.6644H173.038V41.0509H163.168V29.6644Z" fill="#CFD0D0"/>
+    <path d="M187.229 22.605V56.8487H194.243V48.0252H203.693C207.179 48.0252 210.035 45.168 210.035 41.6806V28.9075C210.035 25.4201 207.179 22.563 203.693 22.563H187.229V22.605ZM194.243 41.0084V29.6218H202.979V41.0084H194.243Z" fill="#CFD0D0"/>
+    <path d="M94.9567 22.6051V29.6219H101.971V49.832H93.3187V42.8152H86.3047V50.7143C86.3047 54.1177 89.0347 56.8488 92.4367 56.8488H102.643C106.129 56.8488 108.985 53.9917 108.985 50.5043V22.6051H94.9567Z" fill="#CFD0D0"/>
+    <path d="M64.1689 46.6804L61.2289 43.7392C61.0189 43.5291 60.6409 43.5291 60.3889 43.7392L55.7689 48.361C55.5589 48.5711 55.5589 48.9493 55.7689 49.2014L58.7089 52.1426L53.9629 56.8905H68.8729V41.9745L64.1269 46.7224L64.1689 46.6804Z" fill="#45BA75"/>
+    <path d="M68.9181 64.5797H61.1901V69.4956C61.1901 71.0503 59.9301 72.2687 58.4181 72.2687H10.4961C8.94209 72.2687 7.72409 71.0082 7.72409 69.4956V56.6805C7.72409 55.336 8.22809 54.0755 9.19409 53.1511L30.1521 32.1847C31.2441 31.0923 32.7141 30.378 34.2261 30.294C35.9061 30.2099 37.5021 30.8402 38.6781 32.0166L42.8361 36.1763C43.0461 36.3864 43.4241 36.3864 43.6761 36.1763L48.2961 31.5545C48.5061 31.3444 48.5061 30.9662 48.2961 30.7141L44.3481 26.7645C41.8281 24.2435 38.5101 22.6889 34.9821 22.5629C31.1601 22.4368 27.5061 23.8654 24.8181 26.5545L3.73409 47.7309C1.34009 50.1259 -0.00390625 53.3192 -0.00390625 56.7225V69.5376C-0.00390625 75.336 4.70009 80.0418 10.4961 80.0418H58.4181C64.2141 80.0418 68.9181 75.336 68.9181 69.5376V64.6217V64.5797Z" fill="#45BA75"/>
+    <path d="M4.74209 33.319L7.68209 36.2601C7.89209 36.4702 8.27009 36.4702 8.52209 36.2601L13.1421 31.6383C13.3521 31.4282 13.3521 31.0501 13.1421 30.798L10.2021 27.8568L14.9481 23.1089H-0.00390625V38.0249L4.74209 33.277V33.319Z" fill="#45BA75"/>
+    <path d="M-0.00390625 15.4202H7.72409V10.5042C7.72409 8.94958 8.98409 7.73109 10.4961 7.73109H58.4181C59.9721 7.73109 61.1901 8.9916 61.1901 10.5042V23.3193C61.1901 24.6639 60.6861 25.9244 59.7201 26.8487L38.7621 47.8151C37.6701 48.9076 36.2001 49.6219 34.6881 49.7059C33.0081 49.7899 31.4121 49.1597 30.2361 47.9832L26.0781 43.8235C25.8681 43.6134 25.4901 43.6134 25.2381 43.8235L20.6181 48.4454C20.4081 48.6555 20.4081 49.0336 20.6181 49.2857L24.5661 53.2353C27.0861 55.7563 30.4041 57.3109 33.9321 57.437C37.7541 57.563 41.4081 56.1345 44.0961 53.4454L65.1801 32.3529C67.5741 29.958 68.9181 26.7647 68.9181 23.3613V10.5462C68.9181 4.70588 64.2141 0 58.4181 0H10.4961C4.70009 0 -0.00390625 4.70588 -0.00390625 10.5042V15.4202Z" fill="#45BA75"/>
+</svg>
diff --git a/_collections/_combomark/jmap-combination-mark-light.liquid b/_collections/_combomark/jmap-combination-mark-light.liquid
@@ -0,0 +1,14 @@
+---
+permalink: /brand/assets/jmap-combination-mark-light.svg
+theme: light
+---
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 210 80" fill="none">
+    <path d="M138.889 22.6051L132.463 39.748L126.037 22.6051H116.041V56.8908H123.055V34.6219L129.775 52.5211H135.193L141.913 34.6219V56.8908H148.927V22.6051H138.889Z" fill="#282C2D"/>
+    <path d="M156.112 56.8905H163.126V48.067H172.996V56.8905H180.01V28.9914C180.01 25.504 177.154 22.6469 173.668 22.6469H162.412C158.926 22.6469 156.07 25.504 156.07 28.9914V56.8905H156.112ZM163.168 29.6637H173.038V41.0502H163.168V29.6637Z" fill="#282C2D"/>
+    <path d="M187.229 22.605V56.8487H194.243V48.0252H203.693C207.179 48.0252 210.035 45.168 210.035 41.6806V28.9075C210.035 25.4201 207.179 22.563 203.693 22.563H187.229V22.605ZM194.243 41.0084V29.6218H202.979V41.0084H194.243Z" fill="#282C2D"/>
+    <path d="M94.9567 22.6051V29.6219H101.971V49.832H93.3187V42.8152H86.3047V50.7143C86.3047 54.1177 89.0347 56.8488 92.4367 56.8488H102.643C106.129 56.8488 108.985 53.9917 108.985 50.5043V22.6051H94.9567Z" fill="#282C2D"/>
+    <path d="M64.1689 46.6804L61.2289 43.7392C61.0189 43.5291 60.6409 43.5291 60.3889 43.7392L55.7689 48.361C55.5589 48.5711 55.5589 48.9493 55.7689 49.2014L58.7089 52.1426L53.9629 56.8905H68.8729V41.9745L64.1269 46.7224L64.1689 46.6804Z" fill="#0D7A68"/>
+    <path d="M68.9181 64.5797H61.1901V69.4956C61.1901 71.0503 59.9301 72.2687 58.4181 72.2687H10.4961C8.94209 72.2687 7.72409 71.0082 7.72409 69.4956V56.6805C7.72409 55.336 8.22809 54.0755 9.19409 53.1511L30.1521 32.1847C31.2441 31.0923 32.7141 30.378 34.2261 30.294C35.9061 30.2099 37.5021 30.8402 38.6781 32.0166L42.8361 36.1763C43.0461 36.3864 43.4241 36.3864 43.6761 36.1763L48.2961 31.5545C48.5061 31.3444 48.5061 30.9662 48.2961 30.7141L44.3481 26.7645C41.8281 24.2435 38.5101 22.6889 34.9821 22.5629C31.1601 22.4368 27.5061 23.8654 24.8181 26.5545L3.73409 47.7309C1.34009 50.1259 -0.00390625 53.3192 -0.00390625 56.7225V69.5376C-0.00390625 75.336 4.70009 80.0418 10.4961 80.0418H58.4181C64.2141 80.0418 68.9181 75.336 68.9181 69.5376V64.6217V64.5797Z" fill="#0D7A68"/>
+    <path d="M4.74209 33.319L7.68209 36.2601C7.89209 36.4702 8.27009 36.4702 8.52209 36.2601L13.1421 31.6383C13.3521 31.4282 13.3521 31.0501 13.1421 30.798L10.2021 27.8568L14.9481 23.1089H-0.00390625V38.0249L4.74209 33.277V33.319Z" fill="#0D7A68"/>
+    <path d="M-0.00390625 15.4202H7.72409V10.5042C7.72409 8.94958 8.98409 7.73109 10.4961 7.73109H58.4181C59.9721 7.73109 61.1901 8.9916 61.1901 10.5042V23.3193C61.1901 24.6639 60.6861 25.9244 59.7201 26.8487L38.7621 47.8151C37.6701 48.9076 36.2001 49.6219 34.6881 49.7059C33.0081 49.7899 31.4121 49.1597 30.2361 47.9832L26.0781 43.8235C25.8681 43.6134 25.4901 43.6134 25.2381 43.8235L20.6181 48.4454C20.4081 48.6555 20.4081 49.0336 20.6181 49.2857L24.5661 53.2353C27.0861 55.7563 30.4041 57.3109 33.9321 57.437C37.7541 57.563 41.4081 56.1345 44.0961 53.4454L65.1801 32.3529C67.5741 29.958 68.9181 26.7647 68.9181 23.3613V10.5462C68.9181 4.70588 64.2141 0 58.4181 0H10.4961C4.70009 0 -0.00390625 4.70588 -0.00390625 10.5042V15.4202Z" fill="#0D7A68"/>
+</svg>
diff --git a/_collections/_logomark/jmap-logomark-dark.liquid b/_collections/_logomark/jmap-logomark-dark.liquid
@@ -0,0 +1,10 @@
+---
+permalink: /brand/assets/jmap-logomark-dark.svg
+theme: dark
+---
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 69 80" fill="none">
+    <path d="M64.2584 46.6933L61.3193 43.7563C61.0923 43.5294 60.7222 43.5294 60.4952 43.7563L55.8657 48.3824C55.6387 48.6093 55.6387 48.979 55.8657 49.2059L58.8049 52.1429L54.0703 56.874H69.0014V41.9496L64.2584 46.6891V46.6933Z" fill="#45BA75"/>
+    <path d="M69.002 64.584H61.2862V69.5041C61.2862 71.0462 60.0374 72.2941 58.4943 72.2941H10.5054C8.96228 72.2941 7.71347 71.0462 7.71347 69.5041V56.7016C7.71347 55.3655 8.23486 54.1092 9.18093 53.1638L30.15 32.21C31.2475 31.1134 32.6939 30.3991 34.2413 30.3319C35.9316 30.2604 37.5294 30.8865 38.7151 32.0714L42.8862 36.2394C43.1133 36.4663 43.4833 36.4663 43.7104 36.2394L48.3398 31.6134C48.5668 31.3865 48.5668 31.0167 48.3398 30.7899L44.3705 26.8235C41.8645 24.3193 38.5301 22.752 34.9897 22.626C31.155 22.4915 27.5263 23.9243 24.8268 26.6176L3.72736 47.7142C1.32645 50.1134 0.00195312 53.3067 0.00195312 56.7016V69.5041C0.00195312 75.2898 4.71548 79.9999 10.5054 79.9999H58.4985C64.301 79.9999 69.002 75.2983 69.002 69.5041V64.584Z" fill="#45BA75"/>
+    <path d="M4.74491 33.3066L7.68404 36.2436C7.91109 36.4705 8.28111 36.4705 8.50817 36.2436L13.1376 31.6176C13.3647 31.3907 13.3647 31.0209 13.1376 30.794L10.1985 27.8571L14.933 23.126H0.00195312V38.0503L4.74491 33.3109V33.3066Z" fill="#45BA75"/>
+    <path d="M0.00195312 15.416H7.71768V10.4958C7.71768 8.95378 8.96649 7.70588 10.5096 7.70588H58.5027C60.0458 7.70588 61.2946 8.95378 61.2946 10.4958V23.2983C61.2946 24.6345 60.7732 25.8908 59.8272 26.8361L38.8581 47.7899C37.7606 48.8866 36.3142 49.6008 34.7668 49.6681C33.0765 49.7395 31.4787 49.1134 30.293 47.9286L26.1219 43.7605C25.8948 43.5336 25.5248 43.5336 25.2977 43.7605L20.6683 48.3866C20.4413 48.6134 20.4413 48.9832 20.6683 49.2101L24.6376 53.1765C27.1436 55.6807 30.478 57.2479 34.0184 57.374C37.8531 57.5084 41.4818 56.0756 44.1813 53.3824L65.2892 32.2899C67.6901 29.8908 69.0146 26.6975 69.0146 23.3025V10.5C69.002 4.71008 64.2926 0 58.4985 0H10.5054C4.70287 0 0.00195312 4.70168 0.00195312 10.4958V15.416Z" fill="#45BA75"/>
+</svg>
diff --git a/_collections/_logomark/jmap-logomark-light.liquid b/_collections/_logomark/jmap-logomark-light.liquid
@@ -0,0 +1,10 @@
+---
+permalink: /brand/assets/jmap-logomark-light.svg
+theme: light
+---
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 69 80" fill="none">
+    <path d="M64.2488 46.6806L61.3055 43.7394C61.0952 43.5294 60.7168 43.5294 60.4645 43.7394L55.8393 48.3613C55.6291 48.5714 55.6291 48.9495 55.8393 49.2016L58.7826 52.1428L54.0312 56.8907H68.9581V41.9747L64.2068 46.7226L64.2488 46.6806Z" fill="#282C2D"/>
+    <path d="M69 64.5798H61.2633V69.4958C61.2633 71.0504 60.0018 72.2689 58.4881 72.2689H10.5119C8.95612 72.2689 7.73675 71.0084 7.73675 69.4958V56.6806C7.73675 55.3361 8.24132 54.0756 9.20841 53.1512L30.1901 32.1848C31.2834 31.0924 32.755 30.3781 34.2687 30.2941C35.9506 30.21 37.5484 30.8403 38.7258 32.0168L42.8885 36.1764C43.0987 36.3865 43.4771 36.3865 43.7294 36.1764L48.3547 31.5546C48.5649 31.3445 48.5649 30.9663 48.3547 30.7142L44.4022 26.7647C41.8793 24.2437 38.5576 22.689 35.0256 22.563C31.1993 22.4369 27.5411 23.8655 24.8501 26.5546L3.74223 47.7311C1.34552 50.126 0 53.3193 0 56.7226V69.5378C0 75.3361 4.70932 80.042 10.5119 80.042H58.4881C64.2907 80.042 69 75.3361 69 69.5378V64.6218V64.5798Z" fill="#282C2D"/>
+    <path d="M4.75137 33.3193L7.6947 36.2605C7.90494 36.4706 8.28336 36.4706 8.53565 36.2605L13.1609 31.6387C13.3711 31.4286 13.3711 31.0504 13.1609 30.7983L10.2175 27.8572L14.9689 23.1093H0V38.0252L4.75137 33.2773V33.3193Z" fill="#282C2D"/>
+    <path d="M0 15.4202H7.73675V10.5042C7.73675 8.94958 8.99817 7.73109 10.5119 7.73109H58.4881C60.0439 7.73109 61.2633 8.9916 61.2633 10.5042V23.3193C61.2633 24.6639 60.7587 25.9244 59.7916 26.8487L38.8099 47.8151C37.7166 48.9076 36.245 49.6219 34.7313 49.7059C33.0494 49.7899 31.4516 49.1597 30.2742 47.9832L26.1115 43.8235C25.9013 43.6134 25.5229 43.6134 25.2706 43.8235L20.6453 48.4454C20.4351 48.6555 20.4351 49.0336 20.6453 49.2857L24.5978 53.2353C27.1207 55.7563 30.4424 57.3109 33.9744 57.437C37.8007 57.563 41.4589 56.1345 44.1499 53.4454L65.2578 32.3529C67.6545 29.958 69 26.7647 69 23.3613V10.5462C69 4.70588 64.2907 0 58.4881 0H10.5119C4.70932 0 0 4.70588 0 10.5042V15.4202Z" fill="#282C2D"/>
+</svg>
diff --git a/_config.yml b/_config.yml
@@ -11,3 +11,15 @@ exclude:
     - prettier.config.mjs
     - stylelint.config.js
     - README.md
+collections_dir: _collections
+collections:
+    combomark:
+        output: true
+        order:
+            - jmap-combination-mark-light.liquid
+            - jmap-combination-mark-dark.liquid
+    logomark:
+        output: true
+        order:
+            - jmap-logomark-light.liquid
+            - jmap-logomark-dark.liquid
diff --git a/_includes/components/combomark-link.liquid b/_includes/components/combomark-link.liquid
@@ -0,0 +1,3 @@
+<a href='{{ site.baseurl }}/' class='jmap-combomark-link' aria-label='jmap.io'>
+    {% include icons/jmap-combomark.liquid %}
+</a>
diff --git a/_includes/components/hero.liquid b/_includes/components/hero.liquid
@@ -25,13 +25,18 @@
                         {%- if is_external -%}
                             target='_blank'
                         {%- endif -%}
+                        {% if link.download %}
+                            download
+                        {% endif %}
                     >
                         <span class='button__label'>{{- link.label -}}</span>
                         {% if is_external %}
                             <span class='u-visually-hidden'>(opens in new window)</span>
                             <span class='button__icon'>
                                 {% include icons/external-link.liquid %}
                             </span>
+                        {% elsif link.icon %}
+                            <span class='button__icon'>{% include icons/{{ link.icon }}.liquid %}</span>
                         {% endif %}
                     </a>
                 {% endfor %}

diff --git a/_includes/components/jmap-logo.liquid b/_includes/components/jmap-logo.liquid
diff --git a/_includes/components/logo-card-actions.liquid b/_includes/components/logo-card-actions.liquid
@@ -0,0 +1,15 @@
+<div class='logo-card__actions'>
+    <a
+        class='button button--outline logo-card__button u-text-sm'
+        href='{{ include.download_url }}'
+        download
+    >
+        <span>Download</span>
+        {% include icons/arrow-down-tray.liquid %}
+    </a>
+    <button class='button button--outline logo-card__button u-text-sm' data-action='copy'>
+        <span class='button__label'>Copy</span>
+        {% include icons/document-duplicate.liquid %}
+        <span data-clipboard-content>{{ include.clipboard_content }}</span>
+    </button>
+</div>
diff --git a/_includes/footer.liquid b/_includes/footer.liquid
@@ -2,7 +2,7 @@
     <div class='u-wrapper'>
         <div class='footer__inner'>
             <div class='footer__brand'>
-                {% include components/jmap-logo.liquid %}
+                {% include components/combomark-link.liquid %}
                 <p>The open internet standard replacing IMAP with a simpler, faster, and more capable protocol.</p>
             </div>
             <div class='footer__col'>
@@ -12,6 +12,7 @@
                     <li><a href='{{ site.baseurl }}/client/'>Client guide</a></li>
                     <li><a href='{{ site.baseurl }}/server/'>Server guide</a></li>
                     <li><a href='{{ site.baseurl }}/crash-course/'>Crash course</a></li>
+                    <li><a href='{{ site.baseurl }}/brand/'>Brand</a></li>
                 </ul>
             </div>
             <div class='footer__col'>

diff --git a/_includes/header.liquid b/_includes/header.liquid
@@ -1,7 +1,7 @@
 <header class='header'>
     <div class='header__inner u-wrapper'>
         <div class='header__logo'>
-            {% include components/jmap-logo.liquid %}
+            {% include components/combomark-link.liquid %}
         </div>
         <nav class='header__nav' aria-label='Primary'>
             <ul class='header__links'>

diff --git a/_includes/icons/arrow-down-tray.liquid b/_includes/icons/arrow-down-tray.liquid
@@ -0,0 +1,10 @@
+<svg
+    xmlns='http://www.w3.org/2000/svg'
+    fill='none'
+    viewBox='0 0 24 24'
+    stroke-width='1.5'
+    stroke='currentColor'
+    class='i-arrow-down-tray'
+>
+    <path stroke-linecap="round" stroke-linejoin="round" d="M3 16.5v2.25A2.25 2.25 0 0 0 5.25 21h13.5A2.25 2.25 0 0 0 21 18.75V16.5M16.5 12 12 16.5m0 0L7.5 12m4.5 4.5V3" />
+</svg>
diff --git a/_includes/icons/check-micro.liquid b/_includes/icons/check-micro.liquid
@@ -0,0 +1,3 @@
+<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='currentColor' class='i-check-micro'>
+    <path fill-rule="evenodd" d="M12.416 3.376a.75.75 0 0 1 .208 1.04l-5 7.5a.75.75 0 0 1-1.154.114l-3-3a.75.75 0 0 1 1.06-1.06l2.353 2.353 4.493-6.74a.75.75 0 0 1 1.04-.207Z" clip-rule="evenodd" />
+</svg>
diff --git a/_includes/icons/check.liquid b/_includes/icons/check.liquid
@@ -0,0 +1,10 @@
+<svg
+    xmlns='http://www.w3.org/2000/svg'
+    fill='none'
+    viewBox='0 0 24 24'
+    stroke-width='1.5'
+    stroke='currentColor'
+    class='i-check'
+>
+    <path stroke-linecap="round" stroke-linejoin="round" d="m4.5 12.75 6 6 9-13.5" />
+</svg>
diff --git a/_includes/icons/close-micro.liquid b/_includes/icons/close-micro.liquid
@@ -0,0 +1,3 @@
+<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='currentColor' class='i-close-micro'>
+    <path d="M5.28 4.22a.75.75 0 0 0-1.06 1.06L6.94 8l-2.72 2.72a.75.75 0 1 0 1.06 1.06L8 9.06l2.72 2.72a.75.75 0 1 0 1.06-1.06L9.06 8l2.72-2.72a.75.75 0 0 0-1.06-1.06L8 6.94 5.28 4.22Z" />
+</svg>
diff --git a/_includes/icons/document-duplicate-micro.liquid b/_includes/icons/document-duplicate-micro.liquid
@@ -0,0 +1,4 @@
+<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='currentColor' class='i-document-duplicate-micro'>
+    <path d="M5.5 3.5A1.5 1.5 0 0 1 7 2h2.879a1.5 1.5 0 0 1 1.06.44l2.122 2.12a1.5 1.5 0 0 1 .439 1.061V9.5A1.5 1.5 0 0 1 12 11V8.621a3 3 0 0 0-.879-2.121L9 4.379A3 3 0 0 0 6.879 3.5H5.5Z" />
+    <path d="M4 5a1.5 1.5 0 0 0-1.5 1.5v6A1.5 1.5 0 0 0 4 14h5a1.5 1.5 0 0 0 1.5-1.5V8.621a1.5 1.5 0 0 0-.44-1.06L7.94 5.439A1.5 1.5 0 0 0 6.878 5H4Z" />
+</svg>
diff --git a/_includes/icons/document-duplicate.liquid b/_includes/icons/document-duplicate.liquid
@@ -0,0 +1,10 @@
+<svg
+    xmlns='http://www.w3.org/2000/svg'
+    fill='none'
+    viewBox='0 0 24 24'
+    stroke-width='1.5'
+    stroke='currentColor'
+    class='i-document-duplicate'
+>
+    <path stroke-linecap="round" stroke-linejoin="round" d="M15.75 17.25v3.375c0 .621-.504 1.125-1.125 1.125h-9.75a1.125 1.125 0 0 1-1.125-1.125V7.875c0-.621.504-1.125 1.125-1.125H6.75a9.06 9.06 0 0 1 1.5.124m7.5 10.376h3.375c.621 0 1.125-.504 1.125-1.125V11.25c0-4.46-3.243-8.161-7.5-8.876a9.06 9.06 0 0 0-1.5-.124H9.375c-.621 0-1.125.504-1.125 1.125v3.5m7.5 10.375H9.375a1.125 1.125 0 0 1-1.125-1.125v-9.25m12 6.625v-1.875a3.375 3.375 0 0 0-3.375-3.375h-1.5a1.125 1.125 0 0 1-1.125-1.125v-1.5a3.375 3.375 0 0 0-3.375-3.375H9.75" />
+</svg>