diff --git a/_config.yml b/_config.yml
index 01c554bcc..3ab2a4e3b 100644
--- a/_config.yml
+++ b/_config.yml
@@ -31,6 +31,8 @@ slack_invite_url: "https://join.slack.com/t/bitcoindesign/shared_invite/zt-1rxp5
 discord_invite_url: "https://discord.gg/K7aQ5PErht"
 youtube_url: "https://www.youtube.com/c/BitcoinDesign"
 twitter_url: "https://twitter.com/bitcoin_design"
+nostr_url: "https://nosta.me/_@bitcoin.design"
+bitcoin_tv_url: "https://bitcointv.com/c/bitcoindesign/videos"
 
 # Build settings
 theme: minima
diff --git a/_includes/bitcoin-tv.svg b/_includes/bitcoin-tv.svg
new file mode 100644
index 000000000..af39f5452
--- /dev/null
+++ b/_includes/bitcoin-tv.svg
@@ -0,0 +1,4 @@
+<svg width="30" height="30" viewBox="0 0 30 30" stroke="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3 16.1016C3 12.2356 6.13401 9.10156 10 9.10156H25C26.1046 9.10156 27 9.99699 27 11.1016V25.1016C27 26.2061 26.1046 27.1016 25 27.1016H10C6.13401 27.1016 3 23.9676 3 20.1016V16.1016ZM6 16.1016C6 13.8924 7.79086 12.1016 10 12.1016H16C18.2091 12.1016 20 13.8924 20 16.1016V20.1016C20 22.3107 18.2091 24.1016 16 24.1016H10C7.79086 24.1016 6 22.3107 6 20.1016V16.1016ZM23.5 24.1016C24.3284 24.1016 25 23.43 25 22.6016C25 21.7731 24.3284 21.1016 23.5 21.1016C22.6716 21.1016 22 21.7731 22 22.6016C22 23.43 22.6716 24.1016 23.5 24.1016ZM25 18.1016C25 18.93 24.3284 19.6016 23.5 19.6016C22.6716 19.6016 22 18.93 22 18.1016C22 17.2731 22.6716 16.6016 23.5 16.6016C24.3284 16.6016 25 17.2731 25 18.1016ZM23.5 15.1016C24.3284 15.1016 25 14.43 25 13.6016C25 12.7731 24.3284 12.1016 23.5 12.1016C22.6716 12.1016 22 12.7731 22 13.6016C22 14.43 22.6716 15.1016 23.5 15.1016Z"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M18.2559 2.24408C18.5813 2.56951 18.5813 3.09714 18.2559 3.42258L16.3452 5.3333H17.6667C18.0037 5.3333 18.3076 5.53633 18.4365 5.84773C18.5655 6.15912 18.4942 6.51755 18.2559 6.75588L14.9226 10.0892C14.5972 10.4146 14.0695 10.4146 13.7441 10.0892C13.4187 9.76374 13.4187 9.23611 13.7441 8.91068L15.6548 6.99995H14.3333C13.9963 6.99995 13.6924 6.79692 13.5635 6.48553C13.4345 6.17413 13.5058 5.81571 13.7441 5.57738L17.0774 2.24408C17.4028 1.91864 17.9305 1.91864 18.2559 2.24408Z"/>
+</svg>
diff --git a/_includes/footer.html b/_includes/footer.html
index 2aa58c954..311c22b37 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -1,18 +1,18 @@
 <footer class="site-footer">
   <div class="wrapper">
 
-    <a class="-logo" href="{{ "/" | relative_url }}" aria-label="Bitcoin design community logo">
+    <a class="-logo" href="{{ "/" | relative_url }}" aria-label="Bitcoin design community logo" title="Bitcoin design community logo">
       {% include bitcoin-design-community-medium.svg %}
     </a>
 
+    {%- include social.html -%}  
+
     <div class="edit-license">
       <a class="-edit" target="_blank" rel="noopener" href="{{site.github_repository_url}}blob/master/{{page.path}}">Edit this page</a>
 
       <a class="-license" href="{{ "/LICENSE" }}">License</a>
     </div>
 
-    {%- include social.html -%}  
-
     <nav class="footer-nav" aria-label="Footer navigation">
       {%- for path in page_paths -%}
         {%- assign my_page = site.pages | where: "path", path | first -%}
diff --git a/_includes/header.html b/_includes/header.html
index 7811a6367..18145cd68 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -28,7 +28,7 @@
           {%- endfor -%}
         </nav>
       {%- endif -%}
-      <button class="nav-search" aria-expanded="false" aria-controls="toggled-search" aria-label="Toggle search" id="search-trigger" onclick="toggleSearch()">
+      <button class="nav-search" aria-expanded="false" aria-controls="toggled-search" aria-label="Toggle search" title="Toggle search" id="search-trigger" onclick="toggleSearch()">
         <svg viewBox="0 0 44 44" class="search-icon"><use xlink:href="#svg-search"></use></svg>
       </button>
 
diff --git a/_includes/nostr.svg b/_includes/nostr.svg
new file mode 100644
index 000000000..305e109a2
--- /dev/null
+++ b/_includes/nostr.svg
@@ -0,0 +1,3 @@
+<svg width="30" height="30" viewBox="0 0 30 30" stroke="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M26.425 13.9091V25.4419C26.425 25.8756 26.0731 26.2275 25.6394 26.2275H16.2114C15.7777 26.2275 15.4257 25.8756 15.4257 25.4419V23.2941C15.4687 20.6614 15.7472 18.1395 16.332 16.9922C16.6825 16.3021 17.2603 15.9266 17.9241 15.7257C19.1781 15.3488 21.3785 15.6065 22.3124 15.5622C22.3124 15.5622 25.1336 15.6744 25.1336 14.0768C25.1336 12.7909 23.8727 12.892 23.8727 12.892C22.4829 12.9281 21.4242 12.8338 20.7383 12.5636C19.5896 12.1119 19.5508 11.2833 19.5467 11.0062C19.4899 7.8053 14.7703 7.42147 10.612 8.21545C6.06566 9.0801 10.6619 15.5968 10.6619 24.2959V25.4571C10.6536 25.8839 10.3085 26.2289 9.87898 26.2289H5.21071C4.777 26.2289 4.42505 25.877 4.42505 25.4433V5.4968C4.42505 5.06309 4.777 4.71114 5.21071 4.71114H9.59907C10.0328 4.71114 10.3847 5.06309 10.3847 5.4968C10.3847 6.14113 11.1094 6.50002 11.6332 6.1245C13.2115 4.99381 15.2373 4.39105 17.5042 4.39105C22.5826 4.39105 26.4223 7.35081 26.4223 13.9091H26.425ZM17.9947 11.5687C17.9947 10.6403 17.2423 9.88794 16.3139 9.88794C15.3856 9.88794 14.6331 10.6403 14.6331 11.5687C14.6331 12.4971 15.3856 13.2495 16.3139 13.2495C17.2423 13.2495 17.9947 12.4971 17.9947 11.5687Z"/>
+</svg>
diff --git a/_includes/social.html b/_includes/social.html
index bc77d8295..1c29cbd70 100644
--- a/_includes/social.html
+++ b/_includes/social.html
@@ -1,30 +1,44 @@
 <nav class="social-media-list">
-  <a 
-    rel="me" 
-    href="{{ site.discord_invite_url }}" 
+  <a
+    rel="me"
+    href="{{ site.discord_invite_url }}"
     title="Bitcoin Design Discord"
   >
     {% include discord.svg %}
   </a>
-  <a 
-    rel="me" 
-    href="https://github.com/BitcoinDesign" 
+  <a
+    rel="me"
+    href="https://github.com/BitcoinDesign"
     title="Bitcoin Design on Github"
   >
     {% include github.svg %}
   </a>
-  <a 
-    rel="me" 
-    href="{{ site.twitter_url }}" 
+  <a
+    rel="me"
+    href="{{ site.nostr_url }}"
+    title="Bitcoin Design on Nostr"
+  >
+    {% include nostr.svg %}
+  </a>
+  <a
+    rel="me"
+    href="{{ site.twitter_url }}"
     title="Bitcoin Design on Twitter"
   >
     {% include twitter.svg %}
   </a>
-  <a 
-    rel="me" 
-    href="{{ site.youtube_url }}" 
+  <a
+    rel="me"
+    href="{{ site.youtube_url }}"
     title="Bitcoin Design on YouTube"
   >
     {% include youtube.svg %}
   </a>
+  <a
+    rel="me"
+    href="{{ site.bitcoin_tv_url }}"
+    title="Bitcoin Design on BitcoinTV"
+  >
+    {% include bitcoin-tv.svg %}
+  </a>
 </nav>
diff --git a/_sass/minima/_base.scss b/_sass/minima/_base.scss
index e9bcdd2f2..297532c01 100644
--- a/_sass/minima/_base.scss
+++ b/_sass/minima/_base.scss
@@ -607,7 +607,7 @@ a.skip-to-content-link {
   border-bottom-right-radius: 5px;
   transition: transform 150ms $ease;
 
-  &:focus {
+  &:focus-visible {
     transform: translate(-50%, 0%);
   }
 }
diff --git a/_sass/minima/_nav-list.scss b/_sass/minima/_nav-list.scss
index 2f9262b38..f3684acd4 100644
--- a/_sass/minima/_nav-list.scss
+++ b/_sass/minima/_nav-list.scss
@@ -82,7 +82,7 @@
       }
 
       &:active,
-      &:focus {
+      &:focus-visible {
         border-width: 0;
         background-color: rgba(var(--primary-color-rgb), 0.1);
       }
diff --git a/_sass/minima/_search-page.scss b/_sass/minima/_search-page.scss
index ecc42f35d..15704365a 100644
--- a/_sass/minima/_search-page.scss
+++ b/_sass/minima/_search-page.scss
@@ -23,7 +23,7 @@
       box-sizing: border-box;
 
       &:active,
-      &:focus {
+      &:focus-visible {
         border-color: var(--primary-color);
         outline: none;
       }
diff --git a/_sass/minima/_site-footer.scss b/_sass/minima/_site-footer.scss
index 542211707..433947893 100644
--- a/_sass/minima/_site-footer.scss
+++ b/_sass/minima/_site-footer.scss
@@ -18,7 +18,6 @@
     a.-logo {
       display: block;
       line-height: 1;
-      order: 1;
 
       svg {
         width: 50px;
@@ -38,7 +37,6 @@
 
     .edit-license {
       border-top: 1px solid black;
-      order: 3;
       flex-basis: 100%;
       display: flex;
       justify-content: space-between;
@@ -50,6 +48,10 @@
         color: black;
         font-size: 16px;
 
+        &:visited {
+          color: #808080;
+        }
+
         &:hover {
           color: var(--primary-color);
         }
@@ -59,7 +61,6 @@
     nav.social-media-list {
       display: flex;
       align-items: center;
-      order: 2;
       margin-left: auto;
 
       a {
@@ -72,6 +73,12 @@
           transition: all 150ms $ease;
         }
 
+        &:visited {
+          svg {
+            fill: #808080 !important;
+          }
+        }
+
         &:hover {
           svg {
             fill: var(--primary-color) !important;
@@ -79,7 +86,7 @@
         }
 
         & + a {
-          margin-left: 15px;
+          margin-left: 20px;
         }
       }
     }
@@ -100,7 +107,12 @@
         color: black;
         font-size: 16px;
 
-        &:hover {
+        &:visited {
+          color: #808080;
+        }
+
+        &:hover,
+        &.active {
           color: var(--primary-color);
         }
       }
@@ -126,6 +138,18 @@
       }
     }
   }
+
+  @include media-query(small) {
+    .wrapper {
+      nav.social-media-list {
+        a {
+          & + a {
+            margin-left: 5px;
+          }
+        }
+      }
+    }
+  }
 }
 
 body.sidebar {
diff --git a/_sass/minima/_site-header.scss b/_sass/minima/_site-header.scss
index a869f999c..c94237e89 100644
--- a/_sass/minima/_site-header.scss
+++ b/_sass/minima/_site-header.scss
@@ -28,13 +28,8 @@
             letter-spacing: -0.5px;
             color: var(--frontHex);
             transition: color 100ms $ease;
-            // outline: none;
             white-space: nowrap;
 
-            &:focus {
-                outline: 2px solid var(--primary-color);
-            }
-
             svg {
                 width: 40px;
                 height: 40px;
@@ -50,7 +45,8 @@
                 color: $site-title-color;
             }
 
-            &:focus {
+            &:focus-visible {
+                outline: 2px solid var(--primary-color);
                 background-color: rgba(var(--primary-color), 0.05);
             }
 
@@ -79,7 +75,7 @@
                     text-decoration: none;
                 }
 
-                &:focus {
+                &:focus-visible {
                     background-color: rgba(var(--primary-color), 0.1);
                 }
 
@@ -109,7 +105,7 @@
                 transition: color 100ms linear;
             }
 
-            &:focus {
+            &:focus-visible {
                 background-color: rgba(var(--primary-color), 0.05);
             }
 
@@ -155,7 +151,7 @@
                     position: relative;
                     background-color: transparent;
 
-                    &:focus {
+                    &:focus-visible {
                         outline: none;
                     }
                 }
@@ -264,7 +260,7 @@
                     height: 44px;
                 }
 
-                &:focus {
+                &:focus-visible {
                     background-color: rgba(var(--primary-color), 0.05);
                 }
 
diff --git a/_sass/minima/_units-and-symbols-page.scss b/_sass/minima/_units-and-symbols-page.scss
index 0ebd9f0e2..3b6574fd6 100644
--- a/_sass/minima/_units-and-symbols-page.scss
+++ b/_sass/minima/_units-and-symbols-page.scss
@@ -39,7 +39,7 @@
                 margin: 0;
             }
 
-            &:focus {
+            &:focus-visible {
                 outline: none;
             }
         }