diff --git a/config.toml b/config.toml
index 219bd3818..e1da6e6a2 100644
--- a/config.toml
+++ b/config.toml
@@ -35,57 +35,40 @@ previousProjectVersionReleased = "2023-11-27"
 
 [menu]
   [[menu.main]]
-    name = 'NiFi Documentation 2.0.0-M1'
-    url = '/documentation'
-    weight = -1
-    parent = 'Documentation'
-  [[menu.main]]
-    name = 'NiFi Wiki'
+    name = 'Wiki'
     url = 'https://cwiki.apache.org/confluence/display/NIFI'
-    weight = 10
+    weight = 3
     parent = 'Documentation'
     [menu.main.params]
       external = true
-  [[menu.right]]
-    name = 'Release Notes'
-    url = 'https://cwiki.apache.org/confluence/display/NIFI/Release+Notes'
-    weight = -1
-    parent = 'Downloads'
-    [menu.right.params]
-      external = true
   [[menu.right]]
     name = 'GitHub'
     url = 'https://github.com/apache/nifi'
     [menu.right.params]
       external = true
   [[menu.main]]
-    name = 'Contributor Guide'
+    name = 'Contributing'
     url = 'https://cwiki.apache.org/confluence/display/NIFI/Contributor+Guide'
-    weight = 10
+    weight = 1
     parent = 'Development'
     [menu.main.params]
       external = true
   [[menu.main]]
-    name = 'People'
+    name = 'Team'
     url = '/community'
-    weight = 2
+    weight = 3
     parent = 'Community'
-  [[menu.main]]
-    name = 'Developer Guide'
-    url = '/development'
-    weight = 2
-    parent = 'Development'
   [[menu.main]]
     name = 'Issues'
     url = 'https://issues.apache.org/jira/browse/NIFI'
-    weight = 11
+    weight = 2
     parent = 'Development'
     [menu.main.params]
       external = true
   [[menu.main]]
-    name = 'GitHub Source'
+    name = 'Source'
     url = 'https://github.com/apache/nifi'
-    weight = 12
+    weight = 3
     parent = 'Development'
     [menu.main.params]
       external = true
@@ -102,14 +85,9 @@ previousProjectVersionReleased = "2023-11-27"
     [menu.apache.params]
       external = true
 [[menu.main]]
-  name = 'MiNiFi Wiki'
+  name = 'Wiki'
   url = 'https://cwiki.apache.org/confluence/display/MiNiFi'
   weight = 10
   parent = "MiNiFi"
   [menu.main.params]
     external = true
-[[menu.main]]
-  name = 'Projects Overview'
-  url = '/projects'
-  weight = -1
-  parent = "Projects"
diff --git a/content/community/mailing_lists.md b/content/community/contact.md
similarity index 91%
rename from content/community/mailing_lists.md
rename to content/community/contact.md
index 15182f077..999a8fede 100644
--- a/content/community/mailing_lists.md
+++ b/content/community/contact.md
@@ -1,17 +1,22 @@
 ---
-title: Mailing Lists
+title: Contact
 menu:
   main:
     parent: "Community"
-    name: Mailing Lists
+    name: Contact
     weight: 1
 ---
 
-# Apache {{< project-label >}} Mailing Lists
+# Apache {{< project-label >}} Contact Information
 
 See the [Apache Software Foundation Mailing List Tips](http://apache.org/foundation/mailinglists.html) for
 recommendations on how to interact with the community.
 
+## Slack
+
+- [Apache NiFi on Slack](https://apachenifi.slack.com/)
+- New users can join the workspace using the [invitation link](https://join.slack.com/t/apachenifi/shared_invite/zt-11njbtkdx-ZRU8FKYSWoEHRJetidy0zA)
+
 ## Users Mailing List
 
 List for getting help, asking questions, and reporting problems.
@@ -49,11 +54,6 @@ List for receiving automated notification of issues or comments from Jira or Git
 ## Security Mailing List
 
 Private list for reporting potential security issues.
-See [Apache NiFi Security Reporting]({{< ref "/documentation/security.html" >}}) for more details.
+See [Apache NiFi Security Reporting]({{< ref "/documentation/security" >}}) for more details.
 
 - [Send](mailto:security@nifi.apache.org)
-
-# Apache {{< project-label >}} Chat
-
-- [Apache NiFi on Slack](https://apachenifi.slack.com/)
-- New users can join the workspace using the [invitation link](https://join.slack.com/t/apachenifi/shared_invite/zt-11njbtkdx-ZRU8FKYSWoEHRJetidy0zA)
diff --git a/content/community/powered-by-nifi.md b/content/community/powered-by.md
similarity index 99%
rename from content/community/powered-by-nifi.md
rename to content/community/powered-by.md
index 73b51d291..d532e88a8 100644
--- a/content/community/powered-by-nifi.md
+++ b/content/community/powered-by.md
@@ -1,9 +1,9 @@
 ---
-title: Powered by NiFi
+title: Powered By
 menu:
   main:
     parent: "Community"
-    name: Powered by NiFi
+    name: Powered By
     weight: 3
 ---
 
diff --git a/content/development/_index.md b/content/development/_index.md
index 128c9159d..33daccc31 100644
--- a/content/development/_index.md
+++ b/content/development/_index.md
@@ -6,4 +6,16 @@ menu:
     weight: 2
 ---
 
-<iframe class="documentation-container" src="http://nifi.apache.org/docs/nifi-docs/html/developer-guide.html"></iframe>
+# Apache {{< project-label >}} Development
+
+## Development Process
+
+- [Contributing](https://cwiki.apache.org/confluence/display/NIFI/Contributor+Guide) {{< external-icon >}}
+- [Commit and Release Signing]({{< ref "documentation/guides/signing" >}})
+- [Developing](https://nifi.apache.org/documentation/nifi-{{< param currentProjectVersion >}}/html/developer-guide.html)
+- [Licensing]({{< ref "documentation/guides/licensing" >}})
+
+## Development Resources
+
+- [Issues](https://issues.apache.org/jira/browse/NIFI) {{< external-icon >}}
+- [Source](https://github.com/apache/nifi) {{< external-icon >}}
diff --git a/content/documentation/_index.md b/content/documentation/_index.md
index ce677f496..f79c8b013 100644
--- a/content/documentation/_index.md
+++ b/content/documentation/_index.md
@@ -7,4 +7,16 @@ menu:
     weight: 1
 ---
 
-<iframe class="documentation-container" src="https://nifi.apache.org/documentation/nifi-{{< param currentProjectVersion >}}/"></iframe>
+# Apache {{< project-label >}} Documentation
+
+## Configuration and Component Properties
+
+- [NiFi Documentation {{< param currentProjectVersion >}}]({{< ref "/documentation/v2" >}})
+- [NiFi Documentation {{< param previousProjectVersion >}}]({{< ref "/documentation/v1" >}})
+
+## Reference Information
+
+- [Guides]({{< ref "/documentation/guides" >}})
+- [Security Reporting]({{< ref "/documentation/security" >}})
+- [Videos](https://cwiki.apache.org/confluence/display/NIFI/Project+Videos) {{< external-icon >}}
+- [Wiki](https://cwiki.apache.org/confluence/display/NIFI/) {{< external-icon >}}
diff --git a/content/documentation/guides/_index.md b/content/documentation/guides/_index.md
new file mode 100644
index 000000000..f367bf85a
--- /dev/null
+++ b/content/documentation/guides/_index.md
@@ -0,0 +1,23 @@
+---
+title: Guides
+menu:
+  main:
+    name: Guides
+    parent: "Documentation"
+    weight: 3
+---
+
+# Apache {{< project-label >}} Guides
+
+## Development Process
+
+- [Contributing](https://cwiki.apache.org/confluence/display/NIFI/Contributor+Guide) {{< external-icon >}}
+- [Commit and Release Signing]({{< ref "documentation/guides/signing" >}})
+- [Developing](https://nifi.apache.org/documentation/nifi-{{< param currentProjectVersion >}}/html/developer-guide.html)
+- [Licensing]({{< ref "documentation/guides/licensing" >}})
+
+## Release Process
+
+- [Flow Design System Releases]({{< ref "documentation/guides/fds-releases" >}})
+- [Maven Plugin Releases]({{< ref "documentation/guides/maven-plugin-releases" >}})
+- [Releases]({{< ref "documentation/guides/releases" >}})
diff --git a/content/development/fds-release-guide.md b/content/documentation/guides/fds-releases.md
similarity index 99%
rename from content/development/fds-release-guide.md
rename to content/documentation/guides/fds-releases.md
index c8e5053a4..e8fa953f4 100644
--- a/content/development/fds-release-guide.md
+++ b/content/documentation/guides/fds-releases.md
@@ -1,13 +1,8 @@
 ---
-title: Flow Design System Release Guidelines
-menu:
-  main:
-    parent: "Development"
-    name: FDS Release Guide
-    weight: 5
+title: Flow Design System Releases
 ---
 
-# Apache {{< project-label >}} Flow Design System Release Guidelines
+# Apache {{< project-label >}} Flow Design System Releases
 
 The purpose of this document is to capture and describe the steps involved in producing
 an official release of Apache NiFi Flow Design System.  It is written specifically to someone acting in the
diff --git a/content/development/licensing-guide.md b/content/documentation/guides/licensing.md
similarity index 98%
rename from content/development/licensing-guide.md
rename to content/documentation/guides/licensing.md
index b2724b7e1..7e3b20ec7 100644
--- a/content/development/licensing-guide.md
+++ b/content/documentation/guides/licensing.md
@@ -1,13 +1,8 @@
 ---
 title: Licensing Guide
-menu:
-  main:
-    parent: "Development"
-    name: Licensing Guide
-    weight: 6
 ---
 
-# Apache {{< project-label >}} Release Guidelines
+# Apache {{< project-label >}} Licensing
 
 This document provides guidance to contributors of Apache NiFi to help properly account for licensing, notice, and legal requirements.
 
diff --git a/content/development/nifi-maven-release-guide.md b/content/documentation/guides/maven-plugin-releases.md
similarity index 99%
rename from content/development/nifi-maven-release-guide.md
rename to content/documentation/guides/maven-plugin-releases.md
index 7f357d81e..c5e35e5fa 100644
--- a/content/development/nifi-maven-release-guide.md
+++ b/content/documentation/guides/maven-plugin-releases.md
@@ -1,13 +1,8 @@
 ---
-title: NAR Maven Plugin Release Guide
-menu:
-  main:
-    parent: "Development"
-    name: NAR Maven Plugin Release Guide
-    weight: 4
+title: NAR Maven Plugin Releases
 ---
 
-# Apache {{< project-label >}} NAR Maven Plugin Release Guidelines
+# Apache {{< project-label >}} NAR Maven Plugin Releases
 
 The purpose of this document is to capture and describe the steps involved in producing
 an official release of Apache NiFi NAR Maven Plugin. It is written specifically to someone acting in the
diff --git a/content/development/release-guide.md b/content/documentation/guides/releases.md
similarity index 99%
rename from content/development/release-guide.md
rename to content/documentation/guides/releases.md
index 90a6d9af0..b32820f1b 100644
--- a/content/development/release-guide.md
+++ b/content/documentation/guides/releases.md
@@ -1,13 +1,8 @@
 ---
-title: Release Guide
-menu:
-  main:
-    parent: "Development"
-    name: Release Guide
-    weight: 3
+title: Releases
 ---
 
-# Apache {{< project-label >}} Release Guidelines
+# Apache {{< project-label >}} Releases
 
 This document describes the steps required to build and release an official version of the project.
 
diff --git a/content/development/gpg.md b/content/documentation/guides/signing.md
similarity index 99%
rename from content/development/gpg.md
rename to content/documentation/guides/signing.md
index 85ed3e1f2..fd7ad8ead 100644
--- a/content/development/gpg.md
+++ b/content/documentation/guides/signing.md
@@ -1,10 +1,5 @@
 ---
 title: Commit and Release Signing
-menu:
-  main:
-    parent: "Development"
-    name: Commit and Release Signing
-    weight: 3
 ---
 
 # Apache {{< project-label >}} Commit and Release Signing
diff --git a/content/documentation/security.md b/content/documentation/security.md
index 92c2781d6..ba9e7ad6e 100644
--- a/content/documentation/security.md
+++ b/content/documentation/security.md
@@ -1,10 +1,10 @@
 ---
-title: Apache NiFi Security Reporting
+title: Security Reporting
 menu:
   main:
     name: Security Reporting
     parent: "Documentation"
-    weight: 2
+    weight: 3
 ---
 
 # Apache {{< project-label >}} Security
diff --git a/content/documentation/project-documentation.md b/content/documentation/v1/_index.md
similarity index 87%
rename from content/documentation/project-documentation.md
rename to content/documentation/v1/_index.md
index d95c6268a..82e20504f 100644
--- a/content/documentation/project-documentation.md
+++ b/content/documentation/v1/_index.md
@@ -1,5 +1,5 @@
 ---
-title: "Documentation"
+title: "Documentation for 1.24.0"
 layout: "documentation"
 iframe: true
 menu:
diff --git a/content/documentation/v2/_index.md b/content/documentation/v2/_index.md
new file mode 100644
index 000000000..b1e90bfe8
--- /dev/null
+++ b/content/documentation/v2/_index.md
@@ -0,0 +1,12 @@
+---
+title: "Documentation for 2.0.0-M1"
+layout: "documentation"
+iframe: true
+menu:
+  main:
+    name: NiFi Documentation 2.0.0-M1
+    parent: "Documentation"
+    weight: 1
+---
+
+<iframe class="documentation-container" src="https://nifi.apache.org/documentation/nifi-{{< param currentProjectVersion >}}/"></iframe>
diff --git a/content/documentation/videos.md b/content/documentation/videos.md
deleted file mode 100644
index ee980887a..000000000
--- a/content/documentation/videos.md
+++ /dev/null
@@ -1,39 +0,0 @@
----
-title: Apache NiFi Videos
-menu:
-  main:
-    name: NiFi Videos
-    parent: "Documentation"
-    weight: 4
----
-
-# Apache {{< project-label >}} Videos
-
-## Conference Presentations
-
-- {{< youtube-embed id="V77M-8ABrdE" title="Hadoop Summit 2016 - Apache NiFi in this Hadoop Ecosystem" >}}
-- {{< youtube-embed id="sQCgtCoZyFQ" title="OSCON 2015 - Beyond Messaging: Enterprise Dataflow with Apache NiFi" >}}
-
-## What's New
-
-- {{< youtube-embed id="h503MibiENY" title="What's New in NiFi 1.14" >}}
-
-## Walkthroughs
-
-- {{< youtube-embed id="VyzoD8eh-t0" title="Apache NiFi with Kafka's Exactly Once Semantics" >}}
-- {{< youtube-embed id="RjWstt7nRVY" title="Apache NiFi Anti-Patterns Part 1" >}}
-- {{< youtube-embed id="v1CoQk730qs" title="Apache NiFi Anti-Patterns Part 2" >}}
-- {{< youtube-embed id="by9P0Zi8Dk8" title="Apache NiFi Anti-Patterns Part 3" >}}
-- {{< youtube-embed id="pZq0EbfDBy4" title="Apache NiFi Anti-Patterns Part 4" >}}
-- {{< youtube-embed id="JbUjYr6Kd3I" title="Apache NiFi Anti-Patterns Part 5" >}}
-
-## Getting Started
-
-- {{< youtube-embed id="Y5znvcJ_NWo" title="NiFi User Interface Overview" >}}
-- {{< youtube-embed id="jctMMHTdTQI" title="How to Build a Simple Flow - Part 1" >}}
-- {{< youtube-embed id="X6bPFgaBDIo" title="How to Build a Simple Flow - Part 2" >}}
-- {{< youtube-embed id="hAveiDgDj-8" title="How to Create Process Groups" >}}
-- {{< youtube-embed id="PpmL-IMoCnU" title="How to Create and Add Templates" >}}
-- {{< youtube-embed id="XfY9AEOYLHI" title="Summary Page Overview" >}}
-- {{< youtube-embed id="WUKXed_bLws" title="Provenance Overview" >}}
-- {{< youtube-embed id="HU5_3PlNmtQ" title="Managing Templates" >}}
diff --git a/content/download/_index.md b/content/download/_index.md
index 2b7877030..21f2f3116 100644
--- a/content/download/_index.md
+++ b/content/download/_index.md
@@ -10,13 +10,26 @@ subject to rate limiting.
 OpenPGP [Project Keys](https://downloads.apache.org/nifi/KEYS) can be used for
 [download verification](https://www.apache.org/info/verification.html).
 
-<ul class="uk-tab" uk-switcher>
-  <li><a class="uk-active" href="#nifi">NiFi</a></li>
-  <li><a href="#minifi">MiNiFi</a></li>
-  <li><a href="#registry">Registry</a></li>
-  <li><a href="#fds">FDS</a></li>
+<ul uk-tab>
+  <li id="download-nifi"><a href="">NiFi</a></li>
+  <li id="download-minifi"><a href="">MiNiFi</a></li>
+  <li id="download-registry"><a href="">Registry</a></li>
+  <li id="download-fds"><a href="">FDS</a></li>
 </ul>
 
+<script type="text/javascript">
+window.addEventListener('uikit:init', () => {
+    var hash = window.location.hash
+    if (hash) {
+        var hashDownloadId = hash.replace(/^#/, 'download-');
+        var downloadElement = document.getElementById(hashDownloadId);
+        if (downloadElement) { 
+            downloadElement.classList.add('uk-active'); 
+        }
+    }
+});
+</script>
+
 <ul class="uk-switcher">
 <li>
 
diff --git a/content/projects/_index.md b/content/projects/_index.md
index e93b55464..41c864f77 100644
--- a/content/projects/_index.md
+++ b/content/projects/_index.md
@@ -26,13 +26,11 @@ following features:
 - Integration with NiFi for follow-on dataflow management      
 </div>
 
-  <a class="uk-button uk-button-primary uk-button-small uk-margin-right" href="/projects/minifi/download">Download</a>
+  <a class="uk-button uk-button-primary uk-button-small uk-margin-right" href="/download/#minifi">Download</a>
   
 </div>
 </div>
 
-
-
 <div class="uk-card uk-card-default uk-margin-top">
   <div class="uk-card-body">
 <div class="uk-column-1-4@l">
@@ -46,8 +44,7 @@ across one or more instances of NiFi or MiNiFi. Registry provides the following
 - Integration with NiFi to allow storing, retrieving, and upgrading versioned flows from a Flow Registry
 - Administration of the Registry for defining users, groups, and policies
     </div>
-
-  <a class="uk-button uk-button-primary uk-button-small uk-margin-right" href="/projects/registry">Download</a>
+  <a class="uk-button uk-button-primary uk-button-small uk-margin-right" href="/download/#registry">Download</a>
 
 </div>
 </div>
@@ -63,7 +60,7 @@ MiNiFi, and Registry, as well as any other open source web application. Features
 - Integration with NPM public registry
     
 
-<a class="uk-button uk-button-primary uk-button-small uk-margin-right" href="/projects/fds">Download</a>
+<a class="uk-button uk-button-primary uk-button-small uk-margin-right" href="/download/#fds">Download</a>
 
 </div>
   </div>
diff --git a/content/projects/fds.md b/content/projects/fds.md
index e3725adaa..b767c1794 100644
--- a/content/projects/fds.md
+++ b/content/projects/fds.md
@@ -1,9 +1,9 @@
 ---
-title: Apache NiFi - Flow Design System
+title: Flow Design System
 menu:
   main:
     parent: "Projects"
-    name: FDS
+    name: Flow Design System
     weight: 3
 ---
 
@@ -30,13 +30,3 @@ Future efforts may include capabilities to support additional UI/UX concepts as
 
 - [Apache Gitbox](https://gitbox.apache.org/repos/asf?p=nifi-fds.git)
 - [GitHub](https://github.com/apache/nifi-fds)
-
-## Releases
-
-### FDS 0.3.0 [Release Notes](https://cwiki.apache.org/confluence/display/NIFI/Release+Notes#ReleaseNotes-NiFiFlowDesignSystem0.3.0)
-
-{{< fds-download-links label="Source" version=0.3.0 >}}
-
-### FDS 0.2.0 [Release Notes](https://cwiki.apache.org/confluence/display/NIFI/Release+Notes#ReleaseNotes-NiFiFlowDesignSystem0.2.0)
-
-{{< fds-download-links label="Source" version=0.2.0 site=archives >}}
\ No newline at end of file
diff --git a/content/projects/minifi/_index.md b/content/projects/minifi/_index.md
index fa2649d64..b0328faf1 100644
--- a/content/projects/minifi/_index.md
+++ b/content/projects/minifi/_index.md
@@ -25,3 +25,14 @@ Apache NiFi MiNiFi provides the following features:
 
 MiNiFi functions in the role of an agent acting immediately at, or directly adjacent to, source sensors, systems, or
 servers.
+
+## MiNiFi C++
+
+The C++ agent is a native reimplementation of MiNiFi Java. It consumes fewer system resources but has a limited subset
+of processors, with properties differing from MiNiFi Java Processors. The C++ agent supports gathering and pushing data
+to downstream consumers while minimizing system impact.
+
+## MiNiFi Java
+
+The Java agent is built from the same codebase as NiFi, enabling it to run most of NiFi’s processors. The Java agent
+provides maximum flexibility to make routing and processing decisions at the point of origin.
diff --git a/content/projects/minifi/download.md b/content/projects/minifi/download.md
deleted file mode 100644
index f32ef39b2..000000000
--- a/content/projects/minifi/download.md
+++ /dev/null
@@ -1,48 +0,0 @@
----
-title: MiNiFi Download
-menu:
-  main:
-    parent: "MiNiFi"
-    name: Download
-    weight: 6
----
-
-<div class="downloads">
-
-# MiNiFi Download
-
-Apache NiFi [Project Keys](https://downloads.apache.org/nifi/KEYS) can be used to
-[verify downloads](https://www.apache.org/info/verification.html).
-
-Please allow up to 24 hours for mirrors to synchronize following the release of a new version.
-
-Previous releases can be found in [release archives](https://archive.apache.org/dist/nifi/).
-Please avoid repeated downloads from archives to avoid infrastructure rate limits.
-
-### MiNiFi Java {{< param currentProjectVersion >}} [Release Notes](https://cwiki.apache.org/confluence/display/NIFI/Release+Notes#ReleaseNotes-Version{{< param currentProjectVersion >}})
-
-- Released: {{< param currentProjectVersionReleased >}}
-#### Sources
- {{< download-links label="Source" extension=source-release.zip >}}
-#### Binaries
- {{< download-links label="MiNiFi" project=minifi extension=-bin.zip >}}
- {{< download-links label="MiNiFi Toolkit" project=minifi qualifier=toolkit extension=-bin.zip >}}
- {{< download-links label="Command and Control" project=minifi qualifier=c2 extension=-bin.zip >}}
-
-### MiNiFi C++ 0.15.0 [Release Notes](https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=65145325#ReleaseNotesMiNiFi(C++)-Versioncpp-0.15.0)
-
-- Released: 2023-09-01 
-#### Sources
-{{< cpp-download-links label="Source" version=0.15.0 extension=source.tar.gz >}}
-#### Binaries
-{{< cpp-download-links label="MiNiFi C++" version=0.15.0 extension=bin.tar.gz >}}
-
-### MiNiFi C++ 0.14.0 [Release Notes](https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=65145325#ReleaseNotesMiNiFi(C++)-Versioncpp-0.14.0)
-
-- Released: 2023-04-17
-#### Sources
-{{< cpp-download-links label="Source" version=0.14.0 extension=source.tar.gz >}}
-#### Binaries
-{{< cpp-download-links label="MiNiFi C++" version=0.14.0 extension=bin-linux.tar.gz >}}
-
-</div>
\ No newline at end of file
diff --git a/content/projects/minifi/getting-started.md b/content/projects/minifi/getting-started.md
deleted file mode 100644
index d8e63c83b..000000000
--- a/content/projects/minifi/getting-started.md
+++ /dev/null
@@ -1,124 +0,0 @@
----
-title: MiNiFi Getting Started
-menu:
-  main:
-    parent: "MiNiFi"
-    name: Getting Started
-    weight: 1
----
-
-# Getting Started
-
-This page explains how to configure and deploy MiNiFi agents.
-
-The Java agent is able to run most of [NiFi's available processors](http://nifi.apache.org/docs.html), but is a larger binary distribution (49MB) and consumes greater system resources (24MB max JVM heapsize by default). If you need maximum flexibility to make routing and processing decisions at your data's point of origin, the Java agent is a good fit.
-
-The C++ agent is a smaller binary (3.2MB), consumes low system memory (about 5MB at idle) but has [a limited subset of processors](https://github.com/apache/nifi-minifi-cpp#caveats). If your primary concern is gathering and pushing data to downstream consumers and minimizing system impact, the C++ agent is a good fit.
-
-
-1. Install the appropriate OS level dependencies:
-
-  #### MiNiFi Java:
-
-  - Java 1.8+
-
-  #### MiNiFi C++:
-   ###### RHEL/CentOS:
-   - yum install -y epel-release
-   - yum install -y leveldb
-
-   ###### Debian/Ubuntu:
-   - apt install -y libleveldb-dev
-   - apt install -y libxml2
-2. Download the relevant compressed binary from the [Downloads](download.html) page
-3. Copy and decompress the binary to your target deployment environment
-4. Set the MINIFI_HOME environment variable to your decompressed binary directory
-5. From $MINIFI_HOME, ./bin/minifi.sh {start|stop|run|restart|status|flowStatus|dump|install}
-
-*flowStatus* and *dump* are available only for MiNiFi Java.
-
-For MiNiFi Java, the agent logs to $MINIFI_HOME/logs/minifi-app.log.
-
-For MiNiFi C++, the agent logs to $MINIFI_HOME/minifi-app.log.txt
-
-# Configuring MiNiFi Agent Flows
-
-Agents execute the flow defined in $MINIFI_HOME/conf/config.yml. The shipped config.yml file has an "empty" flow.
-
-While it's possible to create and modify config.yml programmatically or by hand, the more common scenario is to:
-1. Use NiFi's web interface to define a flow
-2. Save the flow as a template and download its XML file
-3. Use the [Converter Toolkit](minifi-toolkit.html) to convert the template XML to an equivalent config.yml
-4. Put the config.yml file in $MINIFI_HOME/conf and start the agent.
-
-# Pushing Data From MiNiFi to NiFi
-
-What follows is an illustrated walkthrough of configuring MiNiFi and NiFi to generate and collect log data.
-
-If you're new to NiFi, watch the [NiFi introductory video series](http://nifi.apache.org/videos.html) before proceeding. If you don't already have NiFi, you can download it from [here](http://nifi.apache.org/download.html).
-
-## Configuring NiFi to Receive Data
-
-First, check that $NIFI_HOME/conf/nifi.properties has a Site to Site input socket port specified:
-```
-# Site to Site properties
-nifi.remote.input.host=
-nifi.remote.input.secure=false
-nifi.remote.input.socket.port=1026
-nifi.remote.input.http.enabled=true
-nifi.remote.input.http.transaction.ttl=30 sec
-```
-
-Restart NiFi so changes take effect.
-
-On NiFi's web UI, place an Input Port "From MiNiFi" and connect it to a downstream processor.
-
-## Creating the MiNiFi Flow
-
-Create a new process group, and double click on it to enter it. Working inside this new processor group will let us create a clean template that includes flow components meant to run in MiNiFi.
-
-Inside the process group, create a Remote Process Group (RPG) and give it the URL of your NiFi instance. The RPG will connect to NiFi and discover the input port created earlier.
-
-Create a TailFile processor and connect it to the RPG, selecting the "From MiNiFi" input port.
-
-Now create a template, download it as an XML file, and download the [Converter ToolKit](download.html).
-
-From the toolkit directory:
-```
-[user@host minifi-toolkit-0.0.1]# ./bin/config.sh transform /path/to/template.xml /output/path/config.yml
-
-Java home: /usr/lib/jvm/jre-1.8.0-openjdk
-MiNiFi Toolkit home: /minifi-toolkit-0.0.1
-
-
-No validation errors found in template.
-```
-
-Open the config.yml file and add Port and Host to a Properties section at the end of the Input Ports section (at the end of the file):
-```
-Remote Processing Groups:
-- name: http://localhost:8080/nifi
-  url: http://localhost:8080/nifi
-  comment: ''
-  timeout: 30 sec
-  yield period: 10 sec
-  Input Ports:
-  - id: AUTOGENERATED_NIFI_PORT_ID_HERE
-    name: MiNiFi-input
-    comment: ''
-    max concurrent tasks: 1
-    use compression: false
-    Properties: # Deviates from spec and will later be removed when this is autonegotiated		
-        Port: 1026		
-        Host Name: localhost
-```
-
-Copy the generated config.yml file into $MINIFI/conf/config.yml, and start MiNiFi:
-```
-[user@host nifi-minifi-cpp-0.1.0]# ./bin/minifi.sh start
-Starting MiNiFi with PID 463 and pid file /nifi-minifi-cpp-0.1.0/bin/.minifi.pid
-```
-
-After a few seconds, you should see NiFi receiving data on the input port.
-
-If you do not see data in the queue, it may have already been consumed by the downstream processor (PutFile in this case). If no data is arriving on the input port at all, check the MiNiFi log files, and confirm that the file being tailed exists and is not empty.
diff --git a/content/projects/minifi/system-admin-guide.md b/content/projects/minifi/java-agent-administration.md
similarity index 99%
rename from content/projects/minifi/system-admin-guide.md
rename to content/projects/minifi/java-agent-administration.md
index c82608171..3ef7a9268 100644
--- a/content/projects/minifi/system-admin-guide.md
+++ b/content/projects/minifi/java-agent-administration.md
@@ -1,9 +1,9 @@
 ---
-title: MiNiFi System Administrator's Guide
+title: MiNiFi Java Agent Administration
 menu:
   main:
     parent: "MiNiFi"
-    name: System Admin Guide
+    name: Java Agent Administration
     weight: 3
 ---
 
diff --git a/content/projects/minifi/minifi-java-agent-quick-start.md b/content/projects/minifi/java-agent-introduction.md
similarity index 99%
rename from content/projects/minifi/minifi-java-agent-quick-start.md
rename to content/projects/minifi/java-agent-introduction.md
index 1b2c482b0..1e4ff5bdc 100644
--- a/content/projects/minifi/minifi-java-agent-quick-start.md
+++ b/content/projects/minifi/java-agent-introduction.md
@@ -1,9 +1,9 @@
 ---
-title: MiNiFi Java Agent Quick Start Guide
+title: MiNiFi Java Agent Introduction
 menu:
   main:
     parent: "MiNiFi"
-    name: Quick Start Guide
+    name: Java Agent Introduction
     weight: 2
 ---
 
diff --git a/content/projects/registry.md b/content/projects/registry.md
index fcbbe8fa4..492bb69c5 100644
--- a/content/projects/registry.md
+++ b/content/projects/registry.md
@@ -1,5 +1,5 @@
 ---
-title: Apache NiFi Registry
+title: Registry
 menu:
   main:
     parent: "Projects"
@@ -35,28 +35,3 @@ Apache NiFi Registry provides the following features:
 - {{< youtube-embed id="qD03ao3R-a4" title="Setting Up a Secure Apache NiFi Registry" >}}
 - {{< youtube-embed id="DSO12fhnZ90" title="Setting Up a Secure NiFi to Integrate with a Secure NiFi Registry" >}}
 - {{< youtube-embed id="kK7eVppg9Aw" title="Storing Versioned Flows in a Git Repository" >}}
-
-## Releases
-
-Apache NiFi [Project Keys](https://downloads.apache.org/nifi/KEYS) can be used to
-[verify downloads](https://www.apache.org/info/verification.html).
-
-Please allow up to 24 hours for mirrors to synchronize following the release of a new version.
-
-### Registry {{< param currentProjectVersion >}} [Release Notes](https://cwiki.apache.org/confluence/display/NIFI/Release+Notes#ReleaseNotes-Version{{< param currentProjectVersion >}})
-
-- Released: {{< param currentProjectVersionReleased >}}
-
-#### Sources
-{{< download-links label="Source" extension=-source-release.zip >}}
-#### Binaries
-{{< download-links label="NiFi Registry" qualifier="registry" extension=-bin.zip >}}
-
-### Registry {{< param previousProjectVersion >}} [Release Notes](https://cwiki.apache.org/confluence/display/NIFI/Release+Notes#ReleaseNotes-Version{{< param previousProjectVersion >}})
-
-- Released: {{< param previousProjectVersionReleased >}}
-
-#### Sources
-{{< download-links version="previous" label="Source" extension=-source-release.zip >}}
-#### Binaries
-{{< download-links version="previous" label="NiFi Registry" qualifier="registry" extension=-bin.zip >}}
diff --git a/layouts/shortcodes/external-icon.html b/layouts/shortcodes/external-icon.html
new file mode 100644
index 000000000..0dc13aaa8
--- /dev/null
+++ b/layouts/shortcodes/external-icon.html
@@ -0,0 +1 @@
+<span uk-icon="link"></span>
diff --git a/layouts/shortcodes/project-label.html b/layouts/shortcodes/project-label.html
index d889061a8..c4b524108 100644
--- a/layouts/shortcodes/project-label.html
+++ b/layouts/shortcodes/project-label.html
@@ -1 +1 @@
-<span class="ni">ni</span><span class="fi">fi</span>
+<span class="ni">Ni</span><span class="fi">Fi</span>
diff --git a/static/.htaccess b/static/.htaccess
index f551e20c0..512bf92b4 100644
--- a/static/.htaccess
+++ b/static/.htaccess
@@ -7,5 +7,16 @@ RewriteRule     ^(.*)$ https://%{SERVER_NAME}%{REQUEST_URI} [L,R]
 # Redirect component documentation to specified version
 RewriteRule ^docs/nifi-docs/components/org\.apache\.nifi/([^\/]+?)/[^\/]+?/(.*)$ docs/nifi-docs/components/org.apache.nifi/$1/1.24.0/$2 [L]
 
-# Rewrite registry-security.html to security.html for merged tracking
-RewriteRule ^registry-security\.html$ /security.html [L,R]
+# Rewrite historical links
+RewriteRule ^docs\.html$ /documentation/v2/ [L,R]
+RewriteRule ^download\.html$ /download/ [L,R]
+RewriteRule ^faq\.html$ /documentation/ [L,R]
+RewriteRule ^fds\.html$ /projects/fds/ [L,R]
+RewriteRule ^mailing_lists\.html$ /community/contact/ [L,R]
+RewriteRule ^people\.html$ /community/ [L,R]
+RewriteRule ^powered-by-nifi\.html$ /community/powered-by/ [L,R]
+RewriteRule ^project-documentation\.html$ /documentation/v2/ [L,R]
+RewriteRule ^registry-security\.html$ /documentation/security/ [L,R]
+RewriteRule ^registry\.html$ /projects/registry/ [L,R]
+RewriteRule ^security\.html$ /documentation/security/ [L,R]
+RewriteRule ^videos\.html$ /documentation/ [L,R]
diff --git a/themes/nifi/layouts/partials/head.html b/themes/nifi/layouts/partials/head.html
index 45b798e3f..4ab77ee41 100644
--- a/themes/nifi/layouts/partials/head.html
+++ b/themes/nifi/layouts/partials/head.html
@@ -34,7 +34,6 @@
   <meta name="twitter:title" content="{{ .Title }}">
   <link rel="icon" href="/images/apache-nifi-drop-logo.svg">
   <link rel="stylesheet" href="/uikit/css/uikit.min.css">
-  <link rel="stylesheet" href="/uikit/css/uikit-icons.min.css">
   <link rel="stylesheet" href="/css/main.css?version=1">
   {{ partial "matomo.html" . -}}
 </head>