diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index dcdcbbd..585c7c2 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -35,18 +35,10 @@
   {{- end}}
 
   <link rel="stylesheet"
-        href="https://fonts.googleapis.com/css?family=Open+Sans:400,400i,700&display=swap">
+        href="/fonts.css">
 
-  <link rel="stylesheet"
-        href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.1/css/all.min.css"
-        integrity="sha256-mmgLkCYLUQbXn0B1SRqzHar6dCnv9oZFPEC1g1cwlkk="
-        crossorigin="anonymous" />
 
-  <link rel="apple-touch-icon-precomposed"
-        sizes="144x144"
-        href="/apple-touch-icon-144-precomposed.png">
-
-  <link rel="shortcut icon" href="/favicon.png">
+  <link rel="shortcut icon" href="/favicon.ico">
 
   <!-- RSS -->
   {{ range .AlternativeOutputFormats -}}
@@ -56,26 +48,16 @@
 <body>
   {{ partial "sidebar.html" . }}
 
-  <main class="content container">
+  <main class="content container" data-pagefind-body>
   {{ block "main" . -}}{{- end }}
   </main>
 
   {{ partial "footer.html" . }}
 
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.1/js/all.min.js"
-          integrity="sha256-MAgcygDRahs+F/Nk5Vz387whB4kSK9NXlDN3w58LLq0="
-          crossorigin="anonymous"></script>
-
-
-  <script src="{{ `js/jquery.min.js` | relURL }}"></script>
-  <script src="{{ `js/soho.js` | relURL }}"></script>
 
   {{ range $.Site.Params.customJs -}}
   <script src="{{ . | relURL }}"></script>
   {{- end}}
 
-    {{ if not hugo.IsServer }}
-      {{ template "_internal/google_analytics.html" . }}
-    {{ end }}
 </body>
 </html>
diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html
index 48bfd1a..f2b66d4 100644
--- a/layouts/partials/sidebar.html
+++ b/layouts/partials/sidebar.html
@@ -1,4 +1,4 @@
-<aside class="sidebar">
+<aside class="sidebar" data-pagefind-ignore="all">
   <div class="container">
     <div class="sidebar-about">
       {{ with .Site.Params.gravatar }}
@@ -40,7 +40,8 @@
     <section class="social-icons">
       {{ range $item := .Site.Params.socialIcons }}
       <a href="{{ $item.url }}" rel="me" title="{{ $item.title }}" target="_blank">
-        <i class="fab {{ $item.icon }}" aria-hidden="true"></i>
+        <!-- i class="{{ $item.icon }}" aria-hidden="true"></i -->
+	<img src='/fa/svgs/{{ $item.icon }}.svg' style='width:32px; height:32px; display:inline; filter:invert(100%)'>
       </a>
       {{ end }}
     </section>
