diff --git a/napari_sphinx_theme/footer.html b/napari_sphinx_theme/footer.html
index 562280cf..323864da 100644
--- a/napari_sphinx_theme/footer.html
+++ b/napari_sphinx_theme/footer.html
@@ -1,7 +1,25 @@
-<footer class="napari-footer">
-  {% for footer_item in theme_footer_items %}
-    <div class="footer-item">
-      {% include footer_item %}
+{% if theme_footer_start or theme_footer_center or theme_footer_end %}
+<div class="bd-footer__inner bd-page-width">
+  {% if theme_footer_start %}
+    <div class="footer-items__start">
+      {% for item in theme_footer_start %}
+        <div class="footer-item">{% include item %}</div>
+      {% endfor %}
     </div>
-  {% endfor %}
-</footer>
+  {% endif %}
+  {% if theme_footer_center %}
+    <div class="footer-items__center">
+      {% for item in theme_footer_center %}
+        <div class="footer-item">{% include item %}</div>
+      {% endfor %}
+    </div>
+  {% endif %}
+  {% if theme_footer_end %}
+    <div class="footer-items__end">
+      {% for item in theme_footer_end %}
+        <div class="footer-item">{% include item %}</div>
+      {% endfor %}
+    </div>
+  {% endif %}
+</div>
+{% endif %}
diff --git a/napari_sphinx_theme/layout.html b/napari_sphinx_theme/layout.html
new file mode 100644
index 00000000..d6052a82
--- /dev/null
+++ b/napari_sphinx_theme/layout.html
@@ -0,0 +1,7 @@
+{%- extends "pydata_sphinx_theme/layout.html" %}
+
+{%- block footer %}
+  <footer class="napari-footer">
+    {%- include "footer.html" %}
+  </footer>
+{%- endblock %}
diff --git a/napari_sphinx_theme/napari-footer-links.html b/napari_sphinx_theme/napari-footer-links.html
index 472b5511..80587f94 100644
--- a/napari_sphinx_theme/napari-footer-links.html
+++ b/napari_sphinx_theme/napari-footer-links.html
@@ -1,40 +1,40 @@
-<a class="footer-icon__hover-blue" href="https://napari.org" target="_blank" rel="noreferrer">
+<a class="footer-icon__hover-blue" href="https://napari.org" title="napari.org" target="_blank" rel="noreferrer">
   {% include "partials/napari.html" %}
   <span>napari</span>
 </a>
 
-<a class="footer-icon__hover-blue" href="https://napari-hub.org" target="_blank" rel="noreferrer">
+<a class="footer-icon__hover-blue" href="https://napari-hub.org" title="napari hub" target="_blank" rel="noreferrer">
   {% include "partials/napari-hub.html" %}
   {% include "partials/napari-hub-light-blue.html" %}
-  <span>napari hub</span>
+  <span>Plugins</span>
 </a>
 
-<a class="footer-icon__hover-blue" href="https://github.com/napari/napari" target="_blank" rel="noreferrer">
+<a class="footer-icon__hover-blue" href="https://github.com/napari/napari" title="GitHub" target="_blank" rel="noreferrer">
   {% include "partials/github.html" %}
   {% include "partials/github-light-blue.html" %}
-  <span>GitHub</span>
+  <span>Code</span>
 </a>
 
-<a class="footer-icon__hover-blue" href="https://fosstodon.org/@napari" target="_blank" rel="noreferrer">
+<a class="footer-icon__hover-blue" href="https://fosstodon.org/@napari" title="Mastodon" target="_blank" rel="noreferrer">
   {% include "partials/mastodon.html" %}
   {% include "partials/mastodon-light-blue.html" %}
   <span>Mastodon</span>
 </a>
 
-<a class="footer-icon__hover-blue" href="https://twitter.com/napari_imaging" target="_blank" rel="noreferrer">
+<a class="footer-icon__hover-blue" href="https://twitter.com/napari_imaging" title="Twitter" target="_blank" rel="noreferrer">
   {% include "partials/twitter.html" %}
   {% include "partials/twitter-light-blue.html" %}
   <span>Twitter</span>
 </a>
 
-<a class="footer-icon__hover-blue" href="https://forum.image.sc/tag/napari" target="_blank" rel="noreferrer">
+<a class="footer-icon__hover-blue" href="https://forum.image.sc/tag/napari" title="image.sc" target="_blank" rel="noreferrer">
   {% include "partials/image-sc.html" %}
   {% include "partials/image-sc-light-blue.html" %}
-  <span>image.sc</span>
+  <span>Forum</span>
 </a>
 
-<a class="footer-icon__hover-blue" href="https://napari.zulipchat.com" target="_blank" rel="noreferrer">
+<a class="footer-icon__hover-blue" href="https://napari.zulipchat.com" title="Zulip" target="_blank" rel="noreferrer">
   {% include "partials/zulip.html" %}
   {% include "partials/zulip-light-blue.html" %}
-  <span>Zulip</span>
+  <span>Chat</span>
 </a>
diff --git a/napari_sphinx_theme/napari-layout.html b/napari_sphinx_theme/napari-layout.html
deleted file mode 100644
index b9540743..00000000
--- a/napari_sphinx_theme/napari-layout.html
+++ /dev/null
@@ -1,23 +0,0 @@
-{%- extends "pydata_sphinx_theme/layout.html" %}
-
-{%- block extrahead %}
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <meta name="docsearch:language" content="{{ language }}">
-    {% for favicon in theme_favicons %}
-      {% if favicon.href[:4] == 'http'%}
-      <link rel="{{ favicon.rel }}" sizes="{{ favicon.sizes }}" href="{{ favicon.href }}">
-      {% else %}
-      <link rel="{{ favicon.rel }}" sizes="{{ favicon.sizes }}" href="{{ pathto('_static/' + favicon.href, 1) }}">
-      {% endif %}
-    {% endfor %}
-{%- endblock %}
-
-{% block content %}
-
-  {{ super() }}
-
-{%- endblock %}
-
-{%- block footer %}
-{%- include "footer.html" %}
-{%- endblock %}
diff --git a/napari_sphinx_theme/static/css/napari-sphinx-theme.css b/napari_sphinx_theme/static/css/napari-sphinx-theme.css
index 01740246..bdeaa8e9 100644
--- a/napari_sphinx_theme/static/css/napari-sphinx-theme.css
+++ b/napari_sphinx_theme/static/css/napari-sphinx-theme.css
@@ -83,8 +83,6 @@ h1 {
     align-items: center;
     justify-content: space-between;
     background-color: black;
-    padding-left: 1.5rem;
-    padding-right: 1.5rem;
     padding-top: 1.5rem;
     padding-bottom: 0.5rem;
     margin-top: 75px;
@@ -206,6 +204,23 @@ h1 {
     display: block;
 }
 
+/* Recommended by PST */
+.footer-items__start, .footer-items__end {
+  flex-direction: row;
+}
+
+.bd-footer__inner {
+    display: flex;
+    flex-shrink: 0;
+    flex-direction: row;
+    flex-wrap: wrap;
+    width: 100%;
+    max-width: 100%;
+    align-items: center;
+    justify-content: space-between;
+    background-color: black;
+}
+
 /****************************
  Nav bar section
 *****************************/
diff --git a/napari_sphinx_theme/theme.conf b/napari_sphinx_theme/theme.conf
index 70d6707a..fe5a2993 100644
--- a/napari_sphinx_theme/theme.conf
+++ b/napari_sphinx_theme/theme.conf
@@ -20,5 +20,9 @@ navbar_align = content
 navbar_start = navbar-logo.html
 navbar_center = navbar-nav.html
 navbar_end = navbar-icon-links.html
-footer_items = napari-footer-links.html, napari-copyright.html
 page_sidebar_items = page-toc.html
+article_footer_items =
+content_footer_items =
+footer_start = napari-footer-links.html
+footer_center =
+footer_end = napari-copyright.html
\ No newline at end of file