diff --git a/assets/icons/logo.svg b/assets/icons/logo.svg
deleted file mode 100644
index 0e4368f9ea79bb655ab56ada1dcf19bdb3c456d2..0000000000000000000000000000000000000000
--- a/assets/icons/logo.svg
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
- "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
- width="79.000000pt" height="79.000000pt" viewBox="0 0 79.000000 79.000000"
- preserveAspectRatio="xMidYMid meet">
-
-<g transform="translate(0.000000,79.000000) scale(0.100000,-0.100000)"
-fill="#000000" stroke="none">
-<path d="M106 764 c-14 -13 -16 -49 -14 -257 l3 -242 2 234 c3 201 6 237 20
-253 9 10 20 18 25 18 4 0 8 -120 8 -267 l0 -268 -25 -11 c-21 -10 -24 -9 -28
-10 -2 11 -5 -20 -6 -70 -1 -58 3 -94 11 -102 9 -9 5 -12 -20 -12 -18 0 -32 -4
--32 -10 0 -6 115 -10 324 -10 206 0 327 4 331 10 4 6 -7 10 -24 10 -24 0 -31
-4 -31 20 0 13 -7 20 -20 20 -17 0 -20 7 -20 45 0 38 3 45 20 45 18 0 20 6 18
-63 -1 41 -3 50 -5 25 l-4 -38 -210 0 -209 0 0 270 0 270 210 0 210 0 3 -222 2
--223 3 228 2 227 -264 0 c-227 0 -267 -2 -280 -16z m94 -264 c0 -263 0 -270
--20 -270 -20 0 -20 7 -20 270 0 263 0 270 20 270 20 0 20 -7 20 -270z m440
--300 c0 -6 -97 -11 -257 -12 l-258 -3 0 -50 0 -50 258 -3 c160 -1 257 -6 257
--12 0 -6 -96 -10 -260 -10 -246 0 -260 1 -270 19 -14 27 -13 104 2 119 15 15
-528 17 528 2z m-40 -30 c0 -6 -83 -10 -230 -10 -147 0 -230 4 -230 10 0 6 83
-10 230 10 147 0 230 -4 230 -10z m-113 -37 c-64 -2 -170 -2 -235 0 -64 1 -11
-3 118 3 129 0 182 -2 117 -3z m113 -33 c0 -6 -83 -10 -230 -10 -147 0 -230 4
--230 10 0 6 83 10 230 10 147 0 230 -4 230 -10z"/>
-<path d="M407 679 c-9 -6 -23 -25 -31 -43 -12 -28 -18 -33 -40 -29 -14 3 -37
-2 -51 -1 -31 -8 -34 -42 -5 -79 16 -20 17 -26 6 -30 -8 -3 -17 -25 -21 -48 -9
--53 11 -73 65 -64 34 6 36 4 48 -29 15 -42 46 -55 72 -31 11 10 22 25 25 34 3
-10 17 17 39 18 74 3 95 39 56 94 l-21 28 21 29 c12 16 20 40 18 53 -3 21 -10
-25 -53 29 -40 4 -50 9 -50 23 0 26 -55 58 -78 46z m39 -38 c1 -13 7 -27 14
--31 23 -14 -25 -32 -54 -20 -30 11 -31 12 -10 51 18 36 48 36 50 0z m-102 -47
-c23 -9 20 -50 -6 -68 -24 -17 -40 -9 -59 26 -19 35 20 59 65 42z m225 -3 c16
--10 8 -42 -17 -65 -17 -15 -20 -14 -40 4 -26 25 -29 57 -4 63 29 8 46 7 61 -2z
-m-179 -26 c-7 -9 -15 -13 -17 -11 -7 7 7 26 19 26 6 0 6 -6 -2 -15z m90 0 c0
--9 -6 -12 -15 -9 -8 4 -15 10 -15 15 0 5 7 9 15 9 8 0 15 -7 15 -15z m-25 -17
-c37 -16 36 -77 -1 -99 -25 -15 -29 -15 -55 0 -37 21 -41 72 -7 95 27 19 30 19
-63 4z m-105 -48 c0 -5 -5 -10 -11 -10 -5 0 -7 5 -4 10 3 6 8 10 11 10 2 0 4
--4 4 -10z m170 1 c0 -6 -4 -13 -10 -16 -5 -3 -10 1 -10 9 0 9 5 16 10 16 6 0
-10 -4 10 -9z m60 -79 c0 -20 -27 -25 -60 -11 -36 16 -37 25 -8 57 l23 23 22
--28 c13 -15 23 -34 23 -41z m-280 48 c0 -5 -2 -10 -4 -10 -3 0 -8 5 -11 10 -3
-6 -1 10 4 10 6 0 11 -4 11 -10z m58 -38 c-2 -23 -9 -28 -37 -30 -18 -2 -38 1
--43 6 -12 12 1 42 18 42 8 0 17 7 20 15 10 26 46 -2 42 -33z m38 -9 c-7 -7
--26 7 -26 19 0 6 6 6 15 -2 9 -7 13 -15 11 -17z m84 2 c0 -9 -6 -12 -15 -9 -8
-4 -12 10 -9 15 8 14 24 10 24 -6z m-16 -49 c-3 -12 -14 -29 -23 -39 -17 -17
--18 -17 -33 0 -29 33 -31 59 -6 70 34 15 70 -4 62 -31z"/>
-<path d="M392 528 c-19 -19 -14 -46 12 -63 29 -19 54 -10 62 21 11 43 -42 74
--74 42z m53 -28 c0 -16 -6 -26 -18 -28 -19 -4 -32 20 -23 44 9 25 41 13 41
--16z"/>
-<path d="M8 43 c7 -3 16 -2 19 1 4 3 -2 6 -13 5 -11 0 -14 -3 -6 -6z"/>
-<path d="M728 43 c6 -2 18 -2 25 0 6 3 1 5 -13 5 -14 0 -19 -2 -12 -5z"/>
-</g>
-</svg>
diff --git a/assets/logo.png b/assets/logo.png
deleted file mode 100644
index 264dc8fa6d0c7169ffde3afc0ec91a3b6f51d00a..0000000000000000000000000000000000000000
Binary files a/assets/logo.png and /dev/null differ
diff --git a/config.toml b/config.toml
index b3e1b58b1589ad8b419171311e7f736e212841e8..fbebd2c83891781e2568d13f1b6e24c1f9d02229 100644
--- a/config.toml
+++ b/config.toml
@@ -64,7 +64,7 @@ breadcrumb_disable = false
 #  Set to true to hide the sidebar search box (the top nav search box will still be displayed if search is enabled)
 sidebar_search_disable = true
 #  Set to false if you don't want to display a logo (/assets/icons/logo.svg) in the top nav bar
-navbar_logo = true
+navbar_logo = false
 # Set to true to disable the About link in the site footer
 footer_about_disable = false
 
diff --git a/layouts/shortcodes/mindmap.html b/layouts/shortcodes/mindmap.html
new file mode 100644
index 0000000000000000000000000000000000000000..d323bc4878bcaf7ae067b0985f7913b2f3e04d22
--- /dev/null
+++ b/layouts/shortcodes/mindmap.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<meta http-equiv="X-UA-Compatible" content="ie=edge">
+<title>Markmap</title>
+<style>
+* {
+  margin: 0;
+  padding: 0;
+}
+#mindmap {
+  display: block;
+  width: 100vw;
+  height: 100vh;
+}
+</style>
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/markmap-toolbar@0.1.6/dist/style.min.css">
+</head>
+<body>
+<svg id="mindmap"></svg>
+<script src="https://cdn.jsdelivr.net/npm/d3@6.6.0"></script><script src="https://cdn.jsdelivr.net/npm/markmap-view@0.2.6"></script><script src="https://cdn.jsdelivr.net/npm/markmap-toolbar@0.1.6/dist/index.umd.min.js"></script><script>(r => {
+          setTimeout(r);
+        })(() => {
+  const {
+    markmap,
+    mm
+  } = window;
+  const toolbar = new markmap.Toolbar();
+  toolbar.attach(mm);
+  const el = toolbar.render();
+  el.setAttribute('style', 'position:absolute;bottom:20px;right:20px');
+  document.body.append(el);
+})</script><script>((getMarkmap, getOptions, data) => {
+        const {
+          Markmap
+        } = getMarkmap();
+        window.mm = Markmap.create('svg#mindmap', getOptions == null ? void 0 : getOptions(), data);
+      })(() => window.markmap,null,{"t":"list_item","d":2,"p":{"lines":[0,1]},"v":"Cryptographic Migration &amp; Agility","c":[{"t":"list_item","d":4,"p":{"lines":[1,2]},"v":"Agility","c":[{"t":"list_item","d":6,"p":{"lines":[2,3]},"v":"Development Considerations (Refs: 9)"},{"t":"list_item","d":6,"p":{"lines":[3,4]},"v":"Frontiers of Cryptography (Refs: 3)"},{"t":"list_item","d":6,"p":{"lines":[4,5]},"v":"Incentives (Refs: 3)"},{"t":"list_item","d":6,"p":{"lines":[5,6]},"v":"Modalities (Refs: 8)"},{"t":"list_item","d":6,"p":{"lines":[6,7]},"v":"Testing (Refs: 1)"}]},{"t":"list_item","d":4,"p":{"lines":[7,8]},"v":"Migration","c":[{"t":"list_item","d":6,"p":{"lines":[8,9]},"v":"PQC Algorithms (Refs: 20)"},{"t":"list_item","d":6,"p":{"lines":[9,10]},"v":"Automation and Frameworks (Refs: 2)"},{"t":"list_item","d":6,"p":{"lines":[10,11]},"v":"Performance Considerations (Refs: 23)"},{"t":"list_item","d":6,"p":{"lines":[11,12]},"v":"Algorithm Migration Process (Refs: 9)"},{"t":"list_item","d":6,"p":{"lines":[12,13]},"v":"Security Considerations (Refs: 13)"},{"t":"list_item","d":6,"p":{"lines":[13,14]},"v":"New Standards (Refs: 5)"}]}]})</script>
+</body>
+</html>
diff --git a/mindmap_gen/mindmap.md b/mindmap_gen/mindmap.md
new file mode 100644
index 0000000000000000000000000000000000000000..4defd88f36db5fd4d796f0d448fb9913f9454f47
--- /dev/null
+++ b/mindmap_gen/mindmap.md
@@ -0,0 +1,14 @@
+- Cryptographic Migration & Agility
+  - Agility
+    - Development Considerations (Refs: 9)
+    - Frontiers of Cryptography (Refs: 3)
+    - Incentives (Refs: 3)
+    - Modalities (Refs: 8)
+    - Testing (Refs: 1)
+  - Migration
+    - PQC Algorithms (Refs: 20)
+    - Automation and Frameworks (Refs: 2)
+    - Performance Considerations (Refs: 23)
+    - Algorithm Migration Process (Refs: 9)
+    - Security Considerations (Refs: 13)
+    - New Standards (Refs: 5)
diff --git a/static/favicons/_head.html b/static/favicons/_head.html
index 81a0f455be8e9a9350b4af90f1ff5dc8ccaca81b..66931b4c348a565c8820a7f50a1fa3d45930a0cd 100644
--- a/static/favicons/_head.html
+++ b/static/favicons/_head.html
@@ -1,5 +1,5 @@
-<link rel="icon" type="image/png" href="/iconx/favicon-16x16.png" sizes="16x16">
-<link rel="icon" type="image/png" href="/iconx/favicon-32x32.png" sizes="32x32">
-<link rel="icon" type="image/png" href="/iconx/android-192x192.png" sizes="192x192">
-<link rel="apple-touch-icon" href="/iconx/apple-touch-icon-180x180.png" sizes="180x180">
-<meta name="msapplication-config" content="/iconx/browserconfig.xml">
\ No newline at end of file
+<link rel="icon" type="image/png" href="favicon-16x16.png" sizes="16x16">
+<link rel="icon" type="image/png" href="favicon-32x32.png" sizes="32x32">
+<link rel="icon" type="image/png" href="android-192x192.png" sizes="192x192">
+<link rel="apple-touch-icon" href="apple-touch-icon-180x180.png" sizes="180x180">
+<meta name="msapplication-config" content="browserconfig.xml">
\ No newline at end of file
diff --git a/static/favicons/apple-touch-icon-180x180.png b/static/favicons/apple-touch-icon-180x180.png
index dd976f04a6a53b8ade75f8d07ae587de5502ea55..0a74fc793536f5af5ea582a52b6c33d9249fdba0 100644
Binary files a/static/favicons/apple-touch-icon-180x180.png and b/static/favicons/apple-touch-icon-180x180.png differ
diff --git a/static/favicons/browserconfig.xml b/static/favicons/browserconfig.xml
index db83441d8cbcf3f535f888d8d26d3c81591eb782..55729d9d8ca1fa7cb83021ca6d7454b121c35b22 100644
--- a/static/favicons/browserconfig.xml
+++ b/static/favicons/browserconfig.xml
@@ -2,10 +2,10 @@
 <browserconfig>
   <msapplication>
     <tile>
-    <square70x70logo src="/iconx/tile70x70.png" />
-    <square150x150logo src="/iconx/tile150x150.png" />
-    <wide310x150logo src="/iconx/tile310x150.png" />
-    <square310x310logo src="/iconx/tile310x310.png" />
+    <square70x70logo src="tile70x70.png" />
+    <square150x150logo src="tile150x150.png" />
+    <wide310x150logo src="tile310x150.png" />
+    <square310x310logo src="tile310x310.png" />
     <tilecolor>transparent</tilecolor>
     </tile>
   </msapplication>
diff --git a/static/favicons/favicon-16x16.png b/static/favicons/favicon-16x16.png
index e08214bc85464882ba659a5754b779bdb43634c6..00227231b3ce585e38d73954551830a392405c7e 100644
Binary files a/static/favicons/favicon-16x16.png and b/static/favicons/favicon-16x16.png differ
diff --git a/static/favicons/favicon-32x32.png b/static/favicons/favicon-32x32.png
index 9057eaf44720a2da711fc95116cdb5d5e575cc23..d713d1d875322076239eb96a4e64cfd006d0c97f 100644
Binary files a/static/favicons/favicon-32x32.png and b/static/favicons/favicon-32x32.png differ
diff --git a/static/favicons/favicon.ico b/static/favicons/favicon.ico
index 40e5b1516290f254e86323b1ce6ea4bb9d0cb0ea..583d597db8e58e7007655d8ad74d87679a2f9954 100644
Binary files a/static/favicons/favicon.ico and b/static/favicons/favicon.ico differ
diff --git a/static/favicons/pwa-192x192.png b/static/favicons/pwa-192x192.png
index 75f7db8bd4ed1add71a68392da15177e29705ca5..fcdca8133f2f9bf6d392149878024ec09c30c16f 100644
Binary files a/static/favicons/pwa-192x192.png and b/static/favicons/pwa-192x192.png differ
diff --git a/static/favicons/pwa-512x512.png b/static/favicons/pwa-512x512.png
index e96ca9daf9f58fdb28483d025ff2d2c48df60faf..636c1ea15df6537cd1754c870d34d7a0024b4519 100644
Binary files a/static/favicons/pwa-512x512.png and b/static/favicons/pwa-512x512.png differ
diff --git a/static/favicons/tile150x150.png b/static/favicons/tile150x150.png
index eb43cc641bcabed1ea156c59435fd7bf9ab9a2c1..093f4432782db8f282f7734d8273ccf8053c4244 100644
Binary files a/static/favicons/tile150x150.png and b/static/favicons/tile150x150.png differ
diff --git a/static/favicons/tile310x150.png b/static/favicons/tile310x150.png
index 51faa2446177bc00fc5a3a772fd9dbaf62bf88ee..0f75aa27695b4cbb6580617bddb497f97ead329a 100644
Binary files a/static/favicons/tile310x150.png and b/static/favicons/tile310x150.png differ
diff --git a/static/favicons/tile310x310.png b/static/favicons/tile310x310.png
index ef7b5a42c6c24639182affdeb28921725985e1c5..142e9dfadd5f592792b8aa2ea6a1d992319e1de7 100644
Binary files a/static/favicons/tile310x310.png and b/static/favicons/tile310x310.png differ
diff --git a/static/favicons/tile70x70.png b/static/favicons/tile70x70.png
index b5fff428d9c8bd6e9b2e39384bc97da644fdd2ab..f02879c55a7ff57337de801ba4f8d8d720fb3816 100644
Binary files a/static/favicons/tile70x70.png and b/static/favicons/tile70x70.png differ
diff --git a/static/logo.ico b/static/logo.ico
deleted file mode 100644
index e007d4977cf297d230559de2e83bb7930ba72bc8..0000000000000000000000000000000000000000
Binary files a/static/logo.ico and /dev/null differ