diff --git a/.asf.yaml b/.asf.yaml
index 468e9cf..1a6eaaa 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -1,9 +1,8 @@
 pelican:
-  whoami: master
-  target: asf-staging
-
-staging:
-  whoami: asf-staging
+  whoami: production
+  target: asf-site
+publish:
+  whoami: asf-site
 
 github:
   labels:
@@ -16,6 +15,6 @@
     merge:  true
     rebase: false
   protected_branches:
-    master
+    main
     production
 
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..6f456b8
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+# Don't merge the ASF config file, which has details about THIS branch:
+.asf.yaml merge=ours
diff --git a/README.md b/README.md
index 701e7fe..6a3b352 100644
--- a/README.md
+++ b/README.md
@@ -6,18 +6,19 @@
 
 ## Building the site
 
-The site is written in [Markdown][9] syntax and built into a static site using [Pelican][1]. The site is re-built automatically by [ASF Buildbot][5] on every push to master branch and the result can be previewed at [lucene.staged.apache.org][6]. Build success/failure emails are sent to [commits@lucene.apache.org][7] mailing list. Read more about the mechanics behind auto building in [INFRA Confluence][8].
- 
+The site is written in [Markdown][9] syntax and built into a static site using [Pelican][1]. The site is re-built automatically by [ASF Buildbot][5] on every push to main branch and the result can be previewed at [lucene.staged.apache.org][6]. Build success/failure emails are sent to [commits@lucene.apache.org][7] mailing list. Read more about the mechanics behind auto building in [INFRA Confluence][8].
+
+
 If the staged site looks good, simply merge the changes to branch `production` and the site will be deployed in a minute or two. Note that simple edits can also be done directly in the GitHub UI rather than clone -> edit -> commit -> push.
 
-> **IMPORTANT**: Please never commit directly to `production` branch. All commits should go to master, and then merge master to production. Note that it **is** possible to make a Pull Request for the merge from `master-->production`. If you do so, please merge using a merge commit rather than a squash merge.
+> **IMPORTANT**: Please never commit directly to `production` branch. All commits should go to main, and then merge main to production. Note that it **is** possible to make a Pull Request for the merge from `main-->production`. If you do so, please merge using a merge commit rather than a squash merge.
 
 For larger edits it is recommended to build and preview the site locally. This lets you see the result of your changes instantly without committing anything. The next sections detail that procedure. The TL;DR instructions goes like this:
 
     # Usage: ./build.sh [-l] [<other pelican arguments>]
     #        -l     Live build and reload source changes on localhost:8000
     #        --help Show full help for options that Pelican accepts
-    ./build -l
+    ./build.sh -l
 
 Now go to <http://localhost:8000> to view the beautiful Lucene web page served from your laptop with live-preview of updates :)
 
diff --git a/build.sh b/build.sh
index da0c3fb..b1bc212 100755
--- a/build.sh
+++ b/build.sh
@@ -41,11 +41,11 @@
   exit 2
 fi
 if [[ -d env ]]; then
-  source env/bin/activate && pip -q install --upgrade pip && pip -q install -r requirements.txt >/dev/null
+  source env/bin/activate && pip3 -q install --upgrade pip && pip3 -q install -r requirements.txt >/dev/null
 fi
 if [[ ! $(pelican -h 2>/dev/null) ]]; then
   echo "No pelican installed, attempting install"
-  python3 -m venv env && source env/bin/activate && pip -q install --upgrade pip && pip install -r requirements.txt
+  python3 -m venv env && source env/bin/activate && pip3 -q install --upgrade pip && pip3 install -r requirements.txt
   if [[ $? -gt 0 ]]; then
     echo "Failed pelican install, exiting."
     exit 2
@@ -61,4 +61,4 @@
   echo "Building Lucene site."
   echo "To build and serve live edits locally, run this script with -l argument. Use -h for help."
   pelican $@
-fi
\ No newline at end of file
+fi
diff --git a/content/core/core_news/2021-04-12-8-8-2-available.md b/content/core/core_news/2021-04-12-8-8-2-available.md
new file mode 100644
index 0000000..1c08840
--- /dev/null
+++ b/content/core/core_news/2021-04-12-8-8-2-available.md
@@ -0,0 +1,22 @@
+Title: Apache Lucene™ 8.8.2 available
+category: core/news
+URL:
+save_as:
+
+The Lucene PMC is pleased to announce the release of Apache Lucene 8.8.2.
+
+Apache Lucene is a high-performance, full-featured text search engine library written entirely in Java. It is a technology suitable for nearly any application that requires full-text search, especially cross-platform.
+
+This release contains three bug fixes. The release is available for immediate download at:
+
+  <https://lucene.apache.org/core/downloads.html>
+
+### Lucene 8.8.2 Release Highlights:
+
+ * LUCENE-9870: Fix Circle2D intersectsLine t-value (distance) range clamp
+ * LUCENE-9744: NPE on a degenerate query in MinimumShouldMatchIntervalsSource$MinimumMatchesIterator.getSubMatches().
+ * LUCENE-9762: DoubleValuesSource.fromQuery (also used by FunctionScoreQuery.boostByQuery) could throw an exception when the query implements TwoPhaseIterator and when the score is requested repeatedly
+
+Please read CHANGES.txt for a full list of changes:
+
+  <https://lucene.apache.org/core/8_8_2/changes/Changes.html>
diff --git a/content/core/core_news/2021-06-16-8-9-0-available.md b/content/core/core_news/2021-06-16-8-9-0-available.md
new file mode 100644
index 0000000..e8f46f0
--- /dev/null
+++ b/content/core/core_news/2021-06-16-8-9-0-available.md
@@ -0,0 +1,23 @@
+Title: Apache Lucene™ 8.9.0 available
+category: core/news
+URL:
+save_as:
+
+The Lucene PMC is pleased to announce the release of Apache Lucene 8.9.0.
+
+Apache Lucene is a high-performance, full-featured text search engine library written entirely in Java. It is a technology suitable for nearly any application that requires full-text search, especially cross-platform.
+
+This release contains numerous bug fixes, optimizations, and improvements, some of which are highlighted below. The release is available for immediate download at:
+
+  <https://lucene.apache.org/core/downloads.html>
+
+### Lucene 8.9.0 Release Highlights:
+
+ * Compression was added to SortedSet DocValues, which allowed to significantly reduce their size on disk.
+ * BM25FQuery was extended to handle similarities beyond BM25Similarity. It was renamed to CombinedFieldQuery to reflect its more general scope.
+ * A new PatternTypingFilter was added to allow setting a type attribute on tokens based on a configured set of regular expressions.
+ * An option was added to supply a custom leaf sorter for IndexWriter and DirectoryReader, which allows to speed up sort queries with a provided sort criteria.
+
+Please read CHANGES.txt for a full list of new features and changes:
+
+  <https://lucene.apache.org/core/8_9_0/changes/Changes.html>
diff --git a/content/core/core_news/2021-09-27-8-10-0-available.md b/content/core/core_news/2021-09-27-8-10-0-available.md
new file mode 100644
index 0000000..63da0f1
--- /dev/null
+++ b/content/core/core_news/2021-09-27-8-10-0-available.md
@@ -0,0 +1,35 @@
+Title: Apache Lucene™ 8.10.0 available
+category: core/news
+URL:
+save_as:
+
+The Lucene PMC is pleased to announce the release of Apache Lucene 8.10.0.
+
+Apache Lucene is a high-performance, full-featured text search engine library written entirely in Java. It is a technology suitable for nearly any application that requires full-text search, especially cross-platform.
+
+This release contains numerous bug fixes, optimizations, and improvements, some of which are highlighted below. The release is available for immediate download at:
+
+  <https://lucene.apache.org/core/downloads.html>
+
+### Lucene 8.10.0 Release Highlights:
+
+#### New features
+- Multi-valued fields are now supported in numeric range facet counting
+- Added new analyzer for Telugu
+- Near-real-time readers opened from an IndexCommit can now sort their leaves
+- SimpleText codec now implements skipping for its postings lists
+
+#### Optimizations
+- Performance improvements for faceting, including a new protected API to control which fields are counted for drill-down during drill sideways, and optimized drill sideways iterating
+- RegexpQuery's detection of adversarial (ReDoS) regular expressions is improved, catching exotic cases that it missed before, and throwing TooComplexToDeterminizeException
+- Speedup for computing the leading prefix and trailing suffix from an Automaton, and for managing powersets during determinize
+- Speedups for stored fields retrieval with the default codec (BEST_SPEED)
+- IndexWriter uses less RAM when buffering documents, especially in the case of many unique fields
+- forceMerge will now merge any number of segments at once, making it much faster in many cases
+- Compression improvements for docvalues storage
+
+... plus a number of exciting bug fixes!
+
+Please read CHANGES.txt for a full list of new features and changes:
+
+  <https://lucene.apache.org/core/8_10_0/changes/Changes.html>
\ No newline at end of file
diff --git a/content/core/core_news/2021-10-18-8-10-1-available.md b/content/core/core_news/2021-10-18-8-10-1-available.md
new file mode 100644
index 0000000..307c80a
--- /dev/null
+++ b/content/core/core_news/2021-10-18-8-10-1-available.md
@@ -0,0 +1,24 @@
+Title: Apache Lucene™ 8.10.1 available
+category: core/news
+URL:
+save_as:
+
+The Lucene PMC is pleased to announce the release of Apache Lucene 8.10.1.
+
+Apache Lucene is a high-performance, full-featured text search engine library written entirely in Java. It is a technology suitable for nearly any application that requires full-text search, especially cross-platform.
+
+This release contains bug fixes. The release is available for immediate download at:
+
+  <https://lucene.apache.org/core/downloads.html>
+
+### Lucene 8.10.1 Release Highlights:
+
+#### Bug fixes
+
+- MultiCollector now handles single leaf collector that wants to skip low-scoring hits but the combined score mode doesn't allow it.
+- Fix for sort optimization with search_after that was wrongly skipping document whose values are equal to the last value of the previous page.
+- Fix for sort optimization with a chunked bulk scorer that was wrongly skipping documents.
+
+Please read CHANGES.txt for a full list of changes:
+
+  <https://lucene.apache.org/core/8_10_1/changes/Changes.html>
diff --git a/content/core/core_news/2021-11-16-8-11-0-available.md b/content/core/core_news/2021-11-16-8-11-0-available.md
new file mode 100644
index 0000000..6c9c307
--- /dev/null
+++ b/content/core/core_news/2021-11-16-8-11-0-available.md
@@ -0,0 +1,21 @@
+Title: Apache Lucene™ 8.11.0 available
+category: core/news
+URL:
+save_as:
+
+The Lucene PMC is pleased to announce the release of Apache Lucene 8.11.0.
+
+Apache Lucene is a high-performance, full-featured text search engine library written entirely in Java. It is a technology suitable for nearly any application that requires full-text search, especially cross-platform.
+
+This release contains numerous bug fixes, optimizations, and improvements, some of which are highlighted below. The release is available for immediate download at:
+
+  <https://lucene.apache.org/core/downloads.html>
+
+### Lucene 8.11.0 Release Highlights:
+
+ * Facets now properly ignore deleted documents when accumulating facet counts for all documents.
+ * CheckIndex can run concurrently.
+
+Please read CHANGES.txt for a full list of new features and changes:
+
+  <https://lucene.apache.org/core/8_11_0/changes/Changes.html>
diff --git a/content/core/core_news/2021-12-07-9-0-0-available.md b/content/core/core_news/2021-12-07-9-0-0-available.md
new file mode 100644
index 0000000..49f4140
--- /dev/null
+++ b/content/core/core_news/2021-12-07-9-0-0-available.md
@@ -0,0 +1,44 @@
+Title: Apache Lucene™ 9.0.0 available
+category: core/news
+URL:
+save_as:
+
+The Lucene PMC is pleased to announce the release of Apache Lucene 9.0.0.
+
+Apache Lucene is a high-performance, full-featured search engine library written entirely in Java. It is a technology suitable for nearly any application that requires structured search, full-text search, faceting, nearest-neighbor search across high-dimensionality vectors, spell correction or query suggestions.
+
+This release contains numerous bug fixes, optimizations, and improvements, some of which are highlighted below. The release is available for immediate download at:
+
+  <https://lucene.apache.org/core/downloads.html>
+
+### Lucene 9.0.0 Release Highlights:
+
+#### System requirements
+
+ - Lucene 9.0 requires JDK 11 or newer
+
+#### New features
+
+ - Support for indexing high-dimensionality numeric vectors to perform nearest-neighbor search, using the Hierarchical Navigable Small World graph algorithm
+ - New Analyzers for Serbian, Nepali, and Tamil languages
+ - IME-friendly autosuggest for Japanese
+ - Snowball 2, adding Hindi, Indonesian, Nepali, Serbian, Tamil, and Yiddish stemmers
+ - New normalization/stemming for Swedish and Norwegian
+
+#### Optimizations
+
+ - Up to 400% faster taxonomy faceting
+ - 10-15% faster indexing of multi-dimensional points
+ - Several times faster sorting on fields that are indexed with points. This optimization used to be an opt-in in late 8.x releases and is now opt-out as of 9.0.
+ - ConcurrentMergeScheduler now assumes fast I/O, likely improving indexing speed in case where heuristics would incorrectly detect whether the system had modern I/O or not
+ - Encoding of postings lists changed from FOR-delta to PFOR-delta to save further disk space
+
+#### Other
+
+ - File formats have all been changed from big-endian order to little endian order
+ - Lucene 9 no longer has split packages. This required renaming some packages outside of the lucene-core JAR, so you will need to adjust some imports accordingly.
+ - Using Lucene 9 with the module system should be considered experimental. We expect to make progress on this in future 9.x releases.
+
+Please read CHANGES.txt for a full list of new features and changes:
+
+  <https://lucene.apache.org/core/9_0_0/changes/Changes.html>
diff --git a/content/core/core_news/2021-12-16-8-11-1-available.md b/content/core/core_news/2021-12-16-8-11-1-available.md
new file mode 100644
index 0000000..8db2ee9
--- /dev/null
+++ b/content/core/core_news/2021-12-16-8-11-1-available.md
@@ -0,0 +1,17 @@
+Title: Apache Lucene™ 8.11.1 available
+category: core/news
+URL:
+save_as:
+
+The Lucene PMC is pleased to announce the release of Apache Lucene 8.11.1.
+
+Apache Lucene is a high-performance, full-featured text search engine library written entirely in Java. It is a technology suitable for nearly any application that requires full-text search, especially cross-platform.
+
+This release contains one bug fix. The release is available for immediate download at:
+
+  <https://lucene.apache.org/core/downloads.html>
+
+### Lucene 8.11.1 Release Highlights:
+
+ * Log4j is upgraded to v2.16.0 to mitigate CVE-2021-44228 (for Luke users)
+
diff --git a/content/core/core_news/2022-03-22-9-1-0-available.md b/content/core/core_news/2022-03-22-9-1-0-available.md
new file mode 100644
index 0000000..a8f51f5
--- /dev/null
+++ b/content/core/core_news/2022-03-22-9-1-0-available.md
@@ -0,0 +1,40 @@
+Title: Apache Lucene™ 9.1.0 available
+category: core/news
+URL:
+save_as:
+
+The Lucene PMC is pleased to announce the release of Apache Lucene 9.1.0.
+
+Apache Lucene is a high-performance, full-featured search engine library written entirely in Java. It is a technology suitable for nearly any application that requires structured search, full-text search, faceting, nearest-neighbor search across high-dimensionality vectors, spell correction or query suggestions.
+
+This release contains numerous bug fixes, optimizations, and improvements, some of which are highlighted below. The release is available for immediate download at:
+
+  <https://lucene.apache.org/core/downloads.html>
+
+### Lucene 9.1.0 Release Highlights:
+
+#### New features
+
+ - Lucene JARs are now proper Java modules, with module descriptors and dependency information
+ - Support for filtering in nearest-neighbor vector search
+ - Support for intervals queries in the standard query syntax
+ - A new token filter SpanishPluralStemFilter for precise stemming of Spanish plurals
+
+#### Optimizations
+
+ - Up to 30% improvement in index throughput for high-dimensional vectors 
+ - Up to 10% faster nearest neighbor searches on high-dimensional vectors
+ - Faster execution of "count" searches across different query types
+ - Faster counting for taxonomy facets
+ - Several other search speed-ups, including improvements to PointRangeQuery, MultiRangeQuery, and CoveringRangeQuery
+
+#### Other
+
+ - The test framework is now a module, so all classes have been moved from to org.apache.lucene.tests.* to avoid package name conflicts
+ - Lucene now faithfully implements the HNSW algorithm for nearest neighbor search by supporting multiple graph layers
+
+… plus a number of helpful bug fixes!
+
+Please read CHANGES.txt for a full list of new features and changes:
+
+  <https://lucene.apache.org/core/9_1_0/changes/Changes.html>
diff --git a/content/pages/core/corenews.md b/content/pages/core/corenews.md
index 7305b8f..02f85ca 100644
--- a/content/pages/core/corenews.md
+++ b/content/pages/core/corenews.md
@@ -1,6 +1,9 @@
-Title: Lucene<span style="vertical-align: super; font-size: xx-small">TM</span> Core News
+Title: Lucene™ Core News
 URL: core/corenews.html
 save_as: core/corenews.html
 template: lucene/core/news
 
+Apache Lucene is a high-performance, full-featured search engine library written entirely in Java.
+It is a technology suitable for nearly any application that requires structured search, full-text search, faceting, nearest-neighbor search across high-dimensionality vectors, spell correction or query suggestions.
+
 You may also read these news as an [ATOM feed](/feeds/core/news.atom.xml).
diff --git a/content/pages/core/developer.md b/content/pages/core/developer.md
index 807e5ae..be4a79a 100644
--- a/content/pages/core/developer.md
+++ b/content/pages/core/developer.md
@@ -1,4 +1,4 @@
-Title: Lucene<span style="vertical-align: super; font-size: xx-small">TM</span> Dev
+Title: Lucene™ Dev
 URL: core/developer.html
 save_as: core/developer.html
 theme: lucene-core
@@ -7,11 +7,9 @@
 ## Source Code
 The source files are stored using GIT (see https://git-scm.com/documentation)
 
-- Latest **master**:
+- Latest **main**:
 `git clone https://github.com/apache/lucene.git`
   
-**NOTE:** Until the Solr project split is complete, the code is still located in <https://github.com/apache/lucene-solr.git> 
-
 ## Making a Contribution
 Lucene Java is always looking for contributions. See the [Wiki][1] for details on contributing.
 
@@ -23,30 +21,21 @@
 ###Nightly Build Javadocs
 Unofficial nightly Javadocs are also generated by Jenkins:
 
-- Unofficial Javadocs from the nightly **master** build are available [here][3].
-
-
-### Clover Test Coverage Reports
-[Clover][4] test coverage results are available:
-
-- As of the most recent nightly **master** build: [here][5]
-
+- Unofficial Javadocs from the nightly **main** build are available [here][3].
 
 ### Nightly Build Download
 
-- Nightly build artifacts are based on the **master** version of the code checked into [GIT][6]: <br/>
-  [Download master Artifacts][7]. Also, Maven artifacts are available from [the ASF snapshot repository][8].
+- Nightly build artifacts are based on the **main** version of the code checked into [GIT][4]: <br/>
+  [Download main Artifacts][5]. Also, Maven artifacts are available from [the ASF snapshot repository][6].
 
 ## Nightly Benchmarks
 
-- Nightly automated benchmarks based on the **master** version of the code are available [here][9].
+- Nightly automated benchmarks based on the **main** version of the code are available [here][7].
 
 [1]: https://cwiki.apache.org/confluence/display/LUCENE/HowToContribute
-[2]: http://jenkins-ci.org/
-[3]: https://ci-builds.apache.org/job/Lucene/job/Lucene-Artifacts-master/javadoc/
-[4]: http://www.atlassian.com/software/clover/
-[5]: https://ci-builds.apache.org/job/Lucene/job/Lucene-Solr-Clover-master/lastSuccessfulBuild/clover-report/dashboard.html
-[6]: https://git-wip-us.apache.org/repos/asf?p=lucene.git
-[7]: https://ci-builds.apache.org/job/Lucene/job/Lucene-Artifacts-master/lastSuccessfulBuild/artifact/lucene/dist/
-[8]: https://repository.apache.org/snapshots/org/apache/lucene/
-[9]: http://home.apache.org/~mikemccand/lucenebench/
+[2]: https://www.jenkins.io/
+[3]: https://ci-builds.apache.org/job/Lucene/job/Lucene-Artifacts-main/javadoc/
+[4]: https://git-wip-us.apache.org/repos/asf?p=lucene.git
+[5]: https://ci-builds.apache.org/job/Lucene/job/Lucene-Artifacts-main/lastSuccessfulBuild/
+[6]: https://repository.apache.org/snapshots/org/apache/lucene/
+[7]: http://home.apache.org/~mikemccand/lucenebench/
diff --git a/content/pages/core/discussion.md b/content/pages/core/discussion.md
index 6c9d7fc..d9c67f4 100644
--- a/content/pages/core/discussion.md
+++ b/content/pages/core/discussion.md
@@ -1,4 +1,4 @@
-Title: Lucene<span style="vertical-align: super; font-size: xx-small">TM</span> Mailing Lists and IRC
+Title: Lucene™ Mailing Lists and IRC
 URL: core/discussion.html
 save_as: core/discussion.html
 template: lucene/core/page
@@ -14,8 +14,7 @@
 - Subscribe: [java-user-subscribe](mailto:java-user-subscribe@lucene.apache.org)
 - Unsubscribe: [java-user-unsubscribe](mailto:java-user-unsubscribe@lucene.apache.org)
 - Send: [java-user](mailto:java-user@lucene.apache.org) \(Requires subscription\)
-- [Official Apache Archive](http://mail-archives.apache.org/mod_mbox/lucene-java-user/)
-- [Old Jakarta Archive](http://mail-archives.apache.org/mod_mbox/jakarta-lucene-user/)
+- [Apache Archive](http://mail-archives.apache.org/mod_mbox/lucene-java-user/)
 
 ## Developer Lists
 
@@ -30,7 +29,7 @@
 - Subscribe: [dev-subscribe](mailto:dev-subscribe@lucene.apache.org)
 - Unsubscribe: [dev-unsubscribe](mailto:dev-unsubscribe@lucene.apache.org)
 - Send: [dev](mailto:dev@lucene.apache.org) \(Requires subscription\)
-- [Official Apache Archive](http://mail-archives.apache.org/mod_mbox/lucene-dev/)
+- [Apache Archive](http://mail-archives.apache.org/mod_mbox/lucene-dev/)
 
 ### Issue Notifications: issues@lucene ###
 
@@ -50,7 +49,7 @@
 
 Unsubscribe: [builds-unsubscribe](mailto:builds-unsubscribe@lucene.apache.org)
 
-[Official Apache Archive](http://mail-archives.apache.org/mod_mbox/lucene-builds/)
+[Apache Archive](http://mail-archives.apache.org/mod_mbox/lucene-builds/)
 
 ### Commit Notifications: commits@lucene
 
@@ -58,7 +57,7 @@
 
 - Subscribe: [commits-subscribe](mailto:commits-subscribe@lucene.apache.org)
 - Unsubscribe: [commits-unsubscribe](mailto:commits-unsubscribe@lucene.apache.org)
-- [Official Apache Archive](http://mail-archives.apache.org/mod_mbox/lucene-commits/)
+- [Apache Archive](http://mail-archives.apache.org/mod_mbox/lucene-commits/)
 
 
 ## IRC
diff --git a/content/pages/core/documentation.md b/content/pages/core/documentation.md
index 66f2b19..ce6e80e 100644
--- a/content/pages/core/documentation.md
+++ b/content/pages/core/documentation.md
@@ -1,4 +1,4 @@
-Title: Lucene<span style="vertical-align: super; font-size: xx-small">TM</span> Release Docs
+Title: Lucene™ Release Docs
 URL: core/documentation.html
 save_as: core/documentation.html
 template: lucene/core/documentation
diff --git a/content/pages/core/downloads.md b/content/pages/core/downloads.md
index 47ebc41..6a77001 100644
--- a/content/pages/core/downloads.md
+++ b/content/pages/core/downloads.md
@@ -1,4 +1,4 @@
-Title: Lucene<span style="vertical-align: super; font-size: xx-small">TM</span> Downloads
+Title: Lucene™ Downloads
 URL: core/downloads.html
 save_as: core/downloads.html
 template: lucene/core/downloads
diff --git a/content/pages/core/features.md b/content/pages/core/features.md
index 31fc81b..cae7f96 100644
--- a/content/pages/core/features.md
+++ b/content/pages/core/features.md
@@ -1,4 +1,4 @@
-Title: Lucene<span style="vertical-align: super; font-size: xx-small">TM</span> Features
+Title: Lucene™ Features
 URL: core/features.html
 save_as: core/features.html
 template: lucene/core/page
@@ -7,7 +7,7 @@
 
 ## Scalable, High-Performance Indexing
 
-* over [150GB/hour on modern hardware](http://home.apache.org/~mikemccand/lucenebench/indexing.html)
+* over [800GB/hour on modern hardware](http://home.apache.org/~mikemccand/lucenebench/indexing.html)
 * small RAM requirements -- only 1MB heap
 * incremental indexing as fast as batch indexing
 * index size roughly 20-30% the size of text indexed
@@ -17,6 +17,7 @@
 * ranked searching -- best results returned first
 * many powerful query types: phrase queries, wildcard queries, proximity queries, range queries and more
 * fielded searching (e.g. title, author, contents)
+* nearest-neighbor search for high-dimensionality vectors
 * sorting by any field
 * multiple-index searching with merged results
 * allows simultaneous update and searching
@@ -29,4 +30,8 @@
 
 * Available as Open Source software under the [Apache License](https://www.apache.org/licenses/LICENSE-2.0.html) which lets you use Lucene in both commercial and Open Source programs
 * 100%-pure Java
-* Implementations in [other programming languages available](https://cwiki.apache.org/confluence/display/lucene/LuceneImplementations) that are index-compatible
\ No newline at end of file
+* Implementations in [other programming languages available](https://cwiki.apache.org/confluence/display/lucene/LuceneImplementations) that are index-compatible
+
+## Utility tools
+
+* integrated desktop GUI tool (Luke): a utility for browsing, searching and maintaining indexes and documents. It can be started with "bin/luke.{sh|cmd}".
diff --git a/content/pages/core/index.md b/content/pages/core/index.md
index b398539..92cc256 100644
--- a/content/pages/core/index.md
+++ b/content/pages/core/index.md
@@ -4,22 +4,22 @@
 theme: lucene-core
 template: lucene/core/page
 
-Apache Lucene<span style="vertical-align: super; font-size: xx-small">TM</span> is a
-high-performance, full-featured text search engine library written entirely in Java.
-It is a technology suitable for nearly any application that requires full-text search,
-especially cross-platform.
+Apache Lucene™ is a
+high-performance, full-featured search engine library written entirely in Java.
+It is a technology suitable for nearly any application that requires structured
+search, full-text search, faceting, nearest-neighbor search across
+high-dimensionality vectors, spell correction or query suggestions.
 
 Apache Lucene is an open source project available for free download. Please use the
 links on the right to access Lucene.
 
-# Lucene<span style="vertical-align: super; font-size: xx-small">TM</span> Features
+# Lucene™ Features
 
 Lucene offers powerful features through a simple API:
 
-
 ## Scalable, High-Performance Indexing
 
-- over [150GB/hour on modern hardware][1]
+- over [800GB/hour on modern hardware][1]
 - small RAM requirements -- only 1MB heap
 - incremental indexing as fast as batch indexing
 - index size roughly 20-30% the size of text indexed
@@ -30,6 +30,7 @@
 - many powerful query types: phrase queries, wildcard queries, proximity
   queries, range queries and more
 - fielded searching (e.g. title, author, contents)
+* nearest-neighbor search for high-dimensionality vectors
 - sorting by any field
 - multiple-index searching with merged results
 - allows simultaneous update and searching
diff --git a/content/pages/core/quickstart.md b/content/pages/core/quickstart.md
index ff6ca81..d45bc58 100644
--- a/content/pages/core/quickstart.md
+++ b/content/pages/core/quickstart.md
@@ -1,4 +1,4 @@
-Title: Lucene<span style="vertical-align: super; font-size: xx-small">TM</span> Tutorials
+Title: Lucene™ Tutorials
 URL: core/quickstart.html
 save_as: core/quickstart.html
 template: lucene/core/quickstart
diff --git a/content/pages/core/systemreqs.md b/content/pages/core/systemreqs.md
index c69d72b..ac58703 100644
--- a/content/pages/core/systemreqs.md
+++ b/content/pages/core/systemreqs.md
@@ -1,4 +1,4 @@
-Title: Lucene<span style="vertical-align: super; font-size: xx-small">TM</span> System Requirements
+Title: Lucene™ System Requirements
 URL: core/systemreqs.html
 save_as: core/systemreqs.html
 template: lucene/core/systemreqs
diff --git a/content/pages/openrelevance/index.md b/content/pages/openrelevance/index.md
index 27e291c..0472fc9 100644
--- a/content/pages/openrelevance/index.md
+++ b/content/pages/openrelevance/index.md
@@ -4,15 +4,12 @@
 template: lucene/openrelevance/index
 
 The Open Relevance Project (ORP) was a small Apache
-Lucene<span style="vertical-align: super; font-size: xx-small">TM</span> sub-project
+Lucene™ sub-project
 aimed at making materials for doing relevance testing for Information Retrieval (IR),
 Machine Learning and Natural Language Processing (NLP) into open source.
 
 Our initial focus was on creating collections, judgments, queries and tools for the
-Lucene ecosystem of projects (Lucene Java,
-Solr<span style="vertical-align: super; font-size: xx-small">TM</span>,
-Nutch<span style="vertical-align: super; font-size: xx-small">TM</span>,
-Mahout<span style="vertical-align: super; font-size: xx-small">TM</span>, etc.)
+Lucene ecosystem of projects (Lucene Java, Solr™, Nutch™, Mahout™, etc.)
 that can be used to judge relevance in a free, repeatable manner.
 
 <span style="color: red; font-weight: bold">The Apache Lucene Project Management Committee decided in a vote,
diff --git a/content/pages/privacy.md b/content/pages/privacy.md
index 927d612..d86930f 100644
--- a/content/pages/privacy.md
+++ b/content/pages/privacy.md
@@ -3,16 +3,5 @@
 save_as: privacy.html
 template: lucene/tlp/page
 
-Information about your use of this website is collected using server access logs and a tracking cookie. The collected information consists of the following:
-
-The IP address from which you access the website;
-The type of browser and operating system you use to access our site;
-The date and time you access our site;
-The pages you visit; and
-The addresses of pages from where you followed a link to our site.
-Part of this information is gathered using a tracking cookie set by the [Google Analytics](http://www.google.com/analytics) service and handled by Google as described in their [privacy policy](http://www.google.com/privacy.html). See your browser documentation for instructions on how to disable the cookie if you prefer not to share this data with Google.
-
-We use the gathered information to help us make our site more useful to visitors and to better understand how and when our site is
- used. We do not track or collect personally identifiable information or associate gathered data with any personally identifying information from other sources.
-
-By using this website, you consent to the collection of this data in the manner and for the purpose described above.
+Information about your use of this website is collected using server access logs, and stored in aggregated and
+anonoymized form for the purpose of usage statistics. We don't use 3rd party trackers.
diff --git a/content/pages/pylucene/features.md b/content/pages/pylucene/features.md
index 497a9e4..2253f46 100644
--- a/content/pages/pylucene/features.md
+++ b/content/pages/pylucene/features.md
@@ -22,7 +22,7 @@
 ## API documentation
 
 PyLucene is closely tracking Java
-Lucene<span style="vertical-align: super; font-size: xx-small">TM</span> releases.
+Lucene™ releases.
 It intends to supports the entire Lucene API.
 
 
diff --git a/content/pages/pylucene/index.md b/content/pages/pylucene/index.md
index 6534b01..46e5b1f 100644
--- a/content/pages/pylucene/index.md
+++ b/content/pages/pylucene/index.md
@@ -6,8 +6,7 @@
 ## What is PyLucene ?
 
 PyLucene is a [Python](https://www.python.org) extension for accessing Java
-[Lucene](https://lucene.apache.org/java/)
-<span style="vertical-align: super; font-size: xx-small">TM</span>. Its goal
+[Lucene](https://lucene.apache.org/java/)™. Its goal
 is to allow you to use Lucene's text indexing and searching capabilities from
 Python. It is API compatible with Java Lucene version 9.1.0 as of April 27th,
 2022.
diff --git a/content/pages/pylucene/mailing-lists.md b/content/pages/pylucene/mailing-lists.md
index 5d343ee..3c861dd 100644
--- a/content/pages/pylucene/mailing-lists.md
+++ b/content/pages/pylucene/mailing-lists.md
@@ -5,7 +5,7 @@
 
 ## Users
 
-Historically, Lucene<span style="vertical-align: super; font-size: xx-small">TM</span>
+Historically, Lucene™
 user issues or questions have almost always been best addressed on the Java Lucene
 User mailing list. PyLucene users with general Lucene questions should consider
 contacting the [Java Lucene User](https://lucene.apache.org/java/docs/mailinglists.html#Java%20User%20List)
diff --git a/content/pages/site-instructions.md b/content/pages/site-instructions.md
index 6ae8d37..a54cee8 100644
--- a/content/pages/site-instructions.md
+++ b/content/pages/site-instructions.md
@@ -3,8 +3,8 @@
 save_as: site-instructions.html
 template: lucene/tlp/page
 
-## Editing Content on the Lucene<span style="vertical-align: super; font-size: xx-small">TM</span> sites
+## Editing Content on the Lucene™ sites
 
 The web site is hosted in its own git repository `lucene-site` (see [Github](https://github.com/apache/lucene-site/) and [Gitbox](https://gitbox.apache.org/repos/asf/lucene-site.git)).
 
-Pushing to the `master` branch will update the [staging site](https://lucene.staged.apache.org) while pushing to `production` branch will update the main web site. Read the [README.md](https://github.com/apache/lucene-site/blob/master/README.md) file for further instructions.
+Pushing to the `main` branch will update the [staging site](https://lucene.staged.apache.org) while pushing to `production` branch will update the main web site. Read the [README.md](https://github.com/apache/lucene-site/blob/main/README.md) file for further instructions.
diff --git a/content/pages/whoweare.md b/content/pages/whoweare.md
index 32d6d1d..bed1e76 100644
--- a/content/pages/whoweare.md
+++ b/content/pages/whoweare.md
@@ -3,7 +3,7 @@
 save_as: whoweare.html
 template: lucene/tlp/page
 
-## Lucene<span style="vertical-align: super; font-size: xx-small">TM</span> Committers
+## Lucene™ Committers
 - *[Namgyu Kim](https://www.linkedin.com/in/danmuzi)* (namgyu@...)
 - *[Ramkumar Aiyengar](https://www.linkedin.com/in/andyetitmoves)* (andyetitmoves@...)
 - *Ahmet Arslan* (iorixxx@...)
@@ -28,6 +28,7 @@
 - *Tomas Fernandez Lobbe* (tflobbe@...)
 - *Jim Ferenczi* (jimczi@...)
 - *[Jason Gerlowski](https://twitter.com/jeg90)* (gerlowskija@...)
+- *[Michael Gibney](https://michaelgibney.net/)* (magibney@...)
 - *Ilan Ginzburg* (ilan@...)
 - *[Otis Gospodnetic](http://www.sematext.com)* (otis@...)
 - *Dennis Gove* (dpgove@...)
@@ -72,7 +73,7 @@
 - *[Shalin Shekhar Mangar](http://shal.in)* (shalin@...)
 - *Sami Siren* (siren@...)
 - *[David Smiley](http://www.linkedin.com/in/davidwsmiley)* (dsmiley@...)
-- *Michael Sokolov* (sokolov@...)
+- *[Michael Sokolov](http://falutin.net)* (sokolov@...)
 - *Cassandra Targett* (ctargett@...)
 - *Tommaso Teofili* (tommaso@...)
 - *Varun Thacker* (varun@...)
@@ -86,6 +87,10 @@
 - *Karl Wright* (kwright@...)
 - *[Areek Zillur](http://www.linkedin.com/in/areekzillur)* (areek@...)
 - *Nhat Nguyen* (dnhatn@...)
+- *[Zach Chen](http://www.linkedin.com/in/zacharychen)* (zacharymorn@...)
+- *[Greg Miller](http://www.linkedin.com/in/greg-miller-7399636)* (gsmiller@...)
+- *[Patrick Zhai](https://www.linkedin.com/in/haoyu-zhai-23b226136)* (patrickz@...)
+- *Feng Guo* (guofeng@...)
 
 ## Emeritus
 
@@ -94,6 +99,7 @@
 - *Peter Carlson* (carlson@...)
 - *Tal Dayan* (zapta@...)
 - *Bertrand Delacretaz* (bdelacretaz@...)
+- *Erick Erickson* (erick@...)
 - *Scott Ganyo* (scottganyo@...)
 - *Brian Goetz* (briangoetz@...)
 - *Christoph Goller* (goller@...)
@@ -120,7 +126,6 @@
   - *Mike Drob* (mdrob@...)
   - *James Dyer* (jdyer@...)
   - *Shai Erera* (shaie@...)
-  - *Erick Erickson* (erick@...)
   - *Ryan Ernst* (rjernst@...)
   - *Tomas Fernandez Lobbe* (tflobbe@...)
   - *Scott Ganyo* (scottganyo@...)
diff --git a/content/pylucene/doap.rdf b/content/pylucene/doap.rdf
new file mode 100644
index 0000000..dfb62f6
--- /dev/null
+++ b/content/pylucene/doap.rdf
@@ -0,0 +1,334 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl"?>
+<rdf:RDF xml:lang="en"
+         xmlns="http://usefulinc.com/ns/doap#"
+         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns:asfext="http://projects.apache.org/ns/asfext#"
+         xmlns:foaf="http://xmlns.com/foaf/0.1/">
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+         https://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+  <Project rdf:about="https://lucene.apache.org/pylucene/index.html">
+    <created>2009-01-08</created>
+    <license rdf:resource="https://spdx.org/licenses/Apache-2.0" />
+    <name>Apache PyLucene</name>
+    <homepage rdf:resource="https://lucene.apache.org/pylucene/index.html" />
+    <asfext:pmc rdf:resource="https://lucene.apache.org" />
+    <shortdesc>PyLucene is a Python extension for accessing Java Lucene.</shortdesc>
+    <description>PyLucene is a Python extension for accessing Java Lucene TM. Its goal is to allow you to use Lucene's text indexing and searching capabilities from Python.</description>
+    <bug-database rdf:resource="https://issues.apache.org/jira/projects/PYLUCENE" />
+    <mailing-list rdf:resource="https://lucene.apache.org/pylucene/mailing-lists.html" />
+    <download-page rdf:resource="https://www.apache.org/dyn/closer.lua/lucene/pylucene/" />
+    <programming-language>C++</programming-language>
+    <programming-language>Python</programming-language>
+    <category rdf:resource="http://projects.apache.org/category/search" />
+    <category rdf:resource="http://projects.apache.org/category/library" />
+    <category rdf:resource="http://projects.apache.org/category/python" />
+    <category rdf:resource="http://projects.apache.org/category/c++" />
+    <release>
+      <Version>
+        <name>pylucene-9.1.0</name>
+        <created>2022-04-27</created>
+        <revision>9.1.0</revision>
+      </Version>
+    </release>
+    <release>
+      <Version>
+        <name>pylucene-8.11.0</name>
+        <created>2021-12-15</created>
+        <revision>8.11.0</revision>
+      </Version>
+    </release>
+    <release>
+      <Version>
+        <name>pylucene-8.9.0</name>
+        <created>2021-06-22</created>
+        <revision>8.9.0</revision>
+      </Version>
+    </release>
+    <release>
+      <Version>
+        <name>pylucene-8.8.1</name>
+        <created>2021-03-08</created>
+        <revision>8.8.1</revision>
+      </Version>
+    </release>
+    <release>
+      <Version>
+        <name>pylucene-8.6.1</name>
+        <created>2020-09-09</created>
+        <revision>8.6.1</revision>
+      </Version>
+    </release>
+    <release>
+      <Version>
+        <name>pylucene-8.3.0</name>
+        <created>2020-04-29</created>
+        <revision>8.3.0</revision>
+      </Version>
+    </release>
+    <release>
+      <Version>
+        <name>pylucene-8.1.1</name>
+        <created>2019-09-11</created>
+        <revision>8.1.1</revision>
+      </Version>
+    </release>
+    <release>
+      <Version>
+        <name>pylucene-7.7.1</name>
+        <created>2019-03-18</created>
+        <revision>7.7.1</revision>
+      </Version>
+    </release>
+    <release>
+      <Version>
+        <name>pylucene-7.6.0</name>
+        <created>2019-01-11</created>
+        <revision>7.6.0</revision>
+      </Version>
+    </release>
+    <release>
+      <Version>
+        <name>pylucene-7.5.0</name>
+        <created>2018-10-19</created>
+        <revision>7.5.0</revision>
+      </Version>
+    </release>
+    <release>
+      <Version>
+        <name>pylucene-7.4.0</name>
+        <created>2018-09-03</created>
+        <revision>7.4.0</revision>
+      </Version>
+    </release>
+    <release>
+      <Version>
+        <name>pylucene-6.5.0</name>
+        <created>2017-04-06</created>
+        <revision>6.5.0</revision>
+      </Version>
+    </release>
+    <release>
+      <Version>
+        <name>pylucene-6.4.1</name>
+        <created>2017-02-14</created>
+        <revision>6.4.1</revision>
+      </Version>
+    </release>
+    <release>
+      <Version>
+        <name>pylucene-6.2.0</name>
+        <created>2016-09-18</created>
+        <revision>6.2.0</revision>
+      </Version>
+    </release>
+    <release>
+      <Version>
+        <name>pylucene-4.10.1-1</name>
+        <created>2014-10-06</created>
+        <revision>4.10.1-1</revision>
+      </Version>
+    </release>
+    <release>
+      <Version>
+        <name>pylucene-4.9.0-0</name>
+        <created>2014-07-17</created>
+        <revision>4.9.0-0</revision>
+      </Version>
+    </release>
+    <release>
+      <Version>
+        <name>pylucene-4.8.0-1</name>
+        <created>2014-05-03</created>
+        <revision>4.8.0-1</revision>
+      </Version>
+    </release>
+    <release>
+      <Version>
+        <name>pylucene-4.7.2-1</name>
+        <created>2014-04-28</created>
+        <revision>4.7.2-1</revision>
+      </Version>
+    </release>
+    <release>
+      <Version>
+        <name>pylucene-4.6.1-1</name>
+        <created>2014-02-13</created>
+        <revision>4.6.1-1</revision>
+      </Version>
+    </release>
+    <release>
+      <Version>
+        <name>pylucene-4.5.1-1</name>
+        <created>2013-11-04</created>
+        <revision>4.5.1-1</revision>
+      </Version>
+    </release>
+    <release>
+      <Version>
+        <name>pylucene-4.4.0-1</name>
+        <created>2013-08-23</created>
+        <revision>4.4.0-1</revision>
+      </Version>
+    </release>
+    <release>
+      <Version>
+        <name>pylucene-4.3.0-1</name>
+        <created>2013-05-14</created>
+        <revision>4.3.0-1</revision>
+      </Version>
+    </release>
+    <release>
+      <Version>
+        <name>pylucene-3.6.2-1</name>
+        <created>2013-01-04</created>
+        <revision>3.6.2-1</revision>
+      </Version>
+    </release>
+    <release>
+      <Version>
+        <name>pylucene-3.6.1-2</name>
+        <created>2012-08-24</created>
+        <revision>3.6.1-2</revision>
+      </Version>
+    </release>
+    <release>
+      <Version>
+        <name>pylucene-3.6.0-2</name>
+        <created>2012-05-11</created>
+        <revision>3.6.0-2</revision>
+      </Version>
+    </release>
+    <release>
+      <Version>
+        <name>pylucene-3.5.0-3</name>
+        <created>2011-12-12</created>
+        <revision>3.5.0-3</revision>
+      </Version>
+    </release>
+    <release>
+      <Version>
+        <name>pylucene-3.4.0-1</name>
+        <created>2011-09-19</created>
+        <revision>3.4.0-1</revision>
+      </Version>
+    </release>
+    <release>
+      <Version>
+        <name>pylucene-3.3.3</name>
+        <created>2011-07-23</created>
+        <revision>3.3.3</revision>
+      </Version>
+    </release>
+    <release>
+      <Version>
+        <name>pylucene-3.2.0-1</name>
+        <created>2011-06-09</created>
+        <revision>3.2.0-1</revision>
+      </Version>
+    </release>
+    <release>
+      <Version>
+        <name>pylucene-3.1.0-1</name>
+        <created>2011-04-04</created>
+        <revision>3.1.0-1</revision>
+      </Version>
+    </release>
+    <release>
+      <Version>
+        <name>pylucene-3.0.3-1</name>
+        <created>2010-12-16</created>
+        <revision>3.0.3-1</revision>
+      </Version>
+    </release>
+    <release>
+      <Version>
+        <name>pylucene-2.9.4-1</name>
+        <created>2010-12-16</created>
+        <revision>2.9.4-1</revision>
+      </Version>
+    </release>
+    <release>
+      <Version>
+        <name>pylucene-3.0.2-1</name>
+        <created>2010-07-02</created>
+        <revision>3.0.2-1</revision>
+      </Version>
+    </release>
+    <release>
+      <Version>
+        <name>pylucene-2.9.3-1</name>
+        <created>2010-07-02</created>
+        <revision>2.9.3-1</revision>
+      </Version>
+    </release>
+    <release>
+      <Version>
+        <name>pylucene-3.0.1-1</name>
+        <created>2010-03-03</created>
+        <revision>3.0.1-1</revision>
+      </Version>
+    </release>
+    <release>
+      <Version>
+        <name>pylucene-2.9.2-1</name>
+        <created>2010-03-03</created>
+        <revision>2.9.2-1</revision>
+      </Version>
+    </release>
+    <release>
+      <Version>
+        <name>pylucene-3.0.0-1</name>
+        <created>2009-12-08</created>
+        <revision>3.0.0-1</revision>
+      </Version>
+    </release>
+    <release>
+      <Version>
+        <name>pylucene-2.9.1-1</name>
+        <created>2009-11-10</created>
+        <revision>2.9.1-1</revision>
+      </Version>
+    </release>
+    <release>
+      <Version>
+        <name>pylucene-2.9.0-1</name>
+        <created>2009-10-13</created>
+        <revision>2.9.0-1</revision>
+      </Version>
+    </release>
+    <release>
+      <Version>
+        <name>pylucene-2.4.1-1</name>
+        <created>2009-04-03</created>
+        <revision>2.4.1-1</revision>
+      </Version>
+    </release>
+    <repository>
+      <SVNRepository>
+        <location rdf:resource="https://svn.apache.org/repos/asf/lucene/pylucene/"/>
+        <browse rdf:resource="https://svn.apache.org/viewvc/lucene/pylucene/"/>
+      </SVNRepository>
+    </repository>
+    <maintainer>
+      <foaf:Person>
+        <foaf:name>Apache Lucene</foaf:name>
+          <foaf:mbox rdf:resource="mailto:dev@lucene.apache.org"/>
+      </foaf:Person>
+    </maintainer>
+  </Project>
+</rdf:RDF>
diff --git a/pelicanconf.py b/pelicanconf.py
index 9ab6a25..863b376 100755
--- a/pelicanconf.py
+++ b/pelicanconf.py
@@ -10,9 +10,9 @@
 SITEURL = ''
 CURRENTYEAR = date.today().year
 
-LUCENE_LATEST_RELEASE = '8.8.1'
-LUCENE_LATEST_RELEASE_DATE = datetime(2021, 2, 22)
-LUCENE_PREVIOUS_MAJOR_RELEASE = '7.7.3'
+LUCENE_LATEST_RELEASE = '9.1.0'
+LUCENE_LATEST_RELEASE_DATE = datetime(2022, 3, 22)
+LUCENE_PREVIOUS_MAJOR_RELEASE = '8.11.1'
 
 # This string will be appended to all unversioned css and js resources to prevent caching surprises on edits.
 # The theme's htaccess file also sets a cache-control header with longer lifetime, if the v=XXXX query string is added.
@@ -74,7 +74,7 @@
 SOCIAL = (('You can add links in your config file', '#'),
           ('Another social link', '#'),)
 
-GOOGLE_ANALYTICS_TRACKING_ID = 'UA-94576-12'
+#GOOGLE_ANALYTICS_TRACKING_ID = 'UA-94576-12'
 
 DEFAULT_PAGINATION = False
 
diff --git a/themes/lucene/static/images/lucene/core/mantle-innovation.png b/themes/lucene/static/images/lucene/core/mantle-innovation.png
index a6deb63..377d574 100644
--- a/themes/lucene/static/images/lucene/core/mantle-innovation.png
+++ b/themes/lucene/static/images/lucene/core/mantle-innovation.png
Binary files differ
diff --git a/themes/lucene/static/images/lucene/core/mantle-lucene.png b/themes/lucene/static/images/lucene/core/mantle-lucene.png
index 95a6733..da6af21 100644
--- a/themes/lucene/static/images/lucene/core/mantle-lucene.png
+++ b/themes/lucene/static/images/lucene/core/mantle-lucene.png
Binary files differ
diff --git a/themes/lucene/static/images/lucene/lucene-favicon.ico b/themes/lucene/static/images/lucene/lucene-favicon.ico
index 8b51dc4..dff7332 100755
--- a/themes/lucene/static/images/lucene/lucene-favicon.ico
+++ b/themes/lucene/static/images/lucene/lucene-favicon.ico
Binary files differ
diff --git a/themes/lucene/static/images/lucene/lucene-favicon.png b/themes/lucene/static/images/lucene/lucene-favicon.png
index 1a31ab8..718236e 100644
--- a/themes/lucene/static/images/lucene/lucene-favicon.png
+++ b/themes/lucene/static/images/lucene/lucene-favicon.png
Binary files differ
diff --git a/themes/lucene/static/images/lucene/lucene_logo_green_300.png b/themes/lucene/static/images/lucene/lucene_logo_green_300.png
index 994ce27..3afcdfa 100644
--- a/themes/lucene/static/images/lucene/lucene_logo_green_300.png
+++ b/themes/lucene/static/images/lucene/lucene_logo_green_300.png
Binary files differ
diff --git a/themes/lucene/static/images/lucene/lucene_og_image.png b/themes/lucene/static/images/lucene/lucene_og_image.png
new file mode 100644
index 0000000..56ad84c
--- /dev/null
+++ b/themes/lucene/static/images/lucene/lucene_og_image.png
Binary files differ
diff --git a/themes/lucene/static/images/lucene/tlp/mantle-lucene.png b/themes/lucene/static/images/lucene/tlp/mantle-lucene.png
index c4d9e68..da6af21 100644
--- a/themes/lucene/static/images/lucene/tlp/mantle-lucene.png
+++ b/themes/lucene/static/images/lucene/tlp/mantle-lucene.png
Binary files differ
diff --git a/themes/lucene/templates/_analytics.html b/themes/lucene/templates/_analytics.html
deleted file mode 100644
index 714c119..0000000
--- a/themes/lucene/templates/_analytics.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<script type="text/javascript">
-
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', '{{ GOOGLE_ANALYTICS_TRACKING_ID}}']);
-  _gaq.push(['_trackPageview']);
-
-  (function() {
-    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-  })();
-
-</script>
diff --git a/themes/lucene/templates/htaccess.template b/themes/lucene/templates/htaccess.template
index 36002cc..6683183 100644
--- a/themes/lucene/templates/htaccess.template
+++ b/themes/lucene/templates/htaccess.template
@@ -26,7 +26,7 @@
 ### Pre-CMS site redirects
 
 # DOAP file redirects to source repository
-RedirectMatch Permanent ^/core/doap.rdf https://gitbox.apache.org/repos/asf?p=lucene-solr.git;a=blob_plain;f=dev-tools/doap/lucene.rdf;hb=HEAD
+RedirectMatch Permanent ^/core/doap.rdf https://gitbox.apache.org/repos/asf?p=lucene.git;a=blob_plain;f=dev-tools/doap/lucene.rdf;hb=HEAD
 
 # page renames
 RedirectMatch Permanent ^/who.html /whoweare.html
@@ -97,9 +97,11 @@
 
 ### Javadocs
 
-# Hack: Append slash, if folder name does not end with slash - everything containing a "." is treated as file and excluded from redirect:
-RewriteRule ^core/\d+_\d+_\d+/(?!.+\.\w+$|.+/$).+$   $0/ [R=301,L]
+# TODO: Move the javadocs to a subfolder core/docs/ instead of directly below core/
 
-# __root/docs.lucene.apache.org/content/ is a special alias added by INFRA-19439, so we can refer to stuff in other places like SVN:
-RewriteRule ^core/\d+_\d+_\d+/.*$         __root/docs.lucene.apache.org/content/$0 [PT]
+# Hack: Append slash, if folder name does not end with slash - everything containing a "." is treated as file and excluded from redirect:
+RewriteRule ^core/\d+(?!.+\.\w+$|.+/$).+$   $0/ [R=301,L]
+
+# __root/docs.lucene.apache.org/ is a special alias added by INFRA-19439, so we can refer to stuff in other places like SVN:
+RewriteRule ^core/\d+.*$         __root/docs.lucene.apache.org/$0 [PT]
 
diff --git a/themes/lucene/templates/lucene/_javascript.html b/themes/lucene/templates/lucene/_javascript.html
index fb36111..b9b8d3e 100644
--- a/themes/lucene/templates/lucene/_javascript.html
+++ b/themes/lucene/templates/lucene/_javascript.html
@@ -1,3 +1,4 @@
 <script type="text/javascript" src="{{ SITEURL }}/theme/javascript/lucene/prototype.js{{ STATIC_RESOURCE_SUFFIX }}"></script>
 <script type="text/javascript" src="{{ SITEURL }}/theme/javascript/lucene/effects.js{{ STATIC_RESOURCE_SUFFIX }}"></script>
 <script type="text/javascript" src="{{ SITEURL }}/theme/javascript/lucene/slides.js{{ STATIC_RESOURCE_SUFFIX }}"></script>
+<script src="https://www.apachecon.com/event-images/snippet.js"></script>
diff --git a/themes/lucene/templates/lucene/base.html b/themes/lucene/templates/lucene/base.html
index 4721082..3a88076 100644
--- a/themes/lucene/templates/lucene/base.html
+++ b/themes/lucene/templates/lucene/base.html
@@ -7,8 +7,16 @@
        content="apache, apache lucene, apache solr, solr, lucene
        search, information retrieval, spell checking, faceting, inverted index,
        open source"/>{% endblock %}
+    {% block ogmeta %}
+    <meta property="og:type" content="website" />
+    <meta property="og:url" content="https://lucene.apache.org/{{ page.url }}"/>
+    <meta property="og:title" content="{{ page.title }}"/>
+    <meta property="og:description" content="{{ page.content | striptags | replace("\"", "&quot;") | truncate(137, False, '...') }}"/>
+    <meta property="og:image" content="https://lucene.apache.org/theme/images/lucene/lucene_og_image.png{{ STATIC_RESOURCE_SUFFIX }}"/>
+    <meta property="og:image:secure_url" content="https://lucene.apache.org/theme/images/lucene/lucene_og_image.png{{ STATIC_RESOURCE_SUFFIX }}"/>
+    {% endblock %}
     {% block favicon %}<link rel="shortcut icon" type="image/png"
-    href="{{ SITEURL }}/theme/images/lucene/lucene-favicon.png"/>{% endblock %}
+                                                 href="{{ SITEURL }}/theme/images/lucene/lucene-favicon.png{{ STATIC_RESOURCE_SUFFIX }}"/>{% endblock %}
     {% block css %}{% endblock %}
     {% block javascript %}{% endblock %}
   </head>
@@ -19,9 +27,8 @@
         <div id="logo" style="float:left">
           {% block logo %}
           <a href="{{ SITEURL }}/">
-            <img border="0" src="{{ SITEURL }}/theme/images/lucene/lucene_logo_green_300.png" alt="Lucene Logo"/>
+            <img border="0" src="{{ SITEURL }}/theme/images/lucene/lucene_logo_green_300.png{{ STATIC_RESOURCE_SUFFIX }}" alt="Lucene Logo"/>
           </a>
-          <div style="position:absolute;right:100px;top:10px;"><span style="vertical-align: super; font-size: xx-small">TM</span></div>
           {% endblock %}
         </div>
 <!-- TODO: Search disabled as it does not work, 2021-02-21
@@ -52,6 +59,5 @@
 
       {% include "lucene/_footer.html" %}
     </div> <!-- End #wrap -->
-    {% include "_analytics.html" %}
   </body>
 </html>
diff --git a/themes/lucene/templates/lucene/core/_sidebar.html b/themes/lucene/templates/lucene/core/_sidebar.html
index 3ac1ec4..783ec82 100644
--- a/themes/lucene/templates/lucene/core/_sidebar.html
+++ b/themes/lucene/templates/lucene/core/_sidebar.html
@@ -29,7 +29,7 @@
 
 <h1 id="events">Events</h1>
 <ul>
-  <li><a href="https://www.apache.org/events/current-event.html" target="_blank"><img src="https://www.apache.org/events/current-event-125x125.png"></a></li>
+  <a class="acevent" data-format="square" data-mode="light" data-width="160" data-style="border: 1px solid lightgrey"></a>
 </ul>
 
 <h1 id="asf-links">ASF links</h1>
diff --git a/themes/lucene/templates/lucene/core/_slides.html b/themes/lucene/templates/lucene/core/_slides.html
index 6917186..647a0ad 100644
--- a/themes/lucene/templates/lucene/core/_slides.html
+++ b/themes/lucene/templates/lucene/core/_slides.html
@@ -8,7 +8,7 @@
     </div>
   </div>
   <div class="mantle">
-    <img alt="Apache Lucene" src="{{ SITEURL }}/theme/images/lucene/core/mantle-lucene.png"/>
+    <img alt="Apache Lucene" src="{{ SITEURL }}/theme/images/lucene/core/mantle-lucene.png{{ STATIC_RESOURCE_SUFFIX }}"/>
   </div>
 </div>
 <div id="slide2" style="display:none">
@@ -21,7 +21,7 @@
     </div>
   </div>
   <div class="mantle">
-    <img alt="Lucene Power" src="{{ SITEURL }}/theme/images/lucene/mantle-power.png"/>
+    <img alt="Lucene Power" src="{{ SITEURL }}/theme/images/lucene/mantle-power.png{{ STATIC_RESOURCE_SUFFIX }}"/>
   </div>
 </div>
 <div id="slide3" style="display:none">
@@ -34,7 +34,7 @@
     </div>
   </div>
   <div class="mantle">
-    <img alt="Apache Lucene" src="{{ SITEURL }}/theme/images/lucene/core/mantle-innovation.png"/>
+    <img alt="Apache Lucene" src="{{ SITEURL }}/theme/images/lucene/core/mantle-innovation.png{{ STATIC_RESOURCE_SUFFIX }}"/>
   </div>
 </div>
 <div id="slide4" style="display:none">
@@ -47,6 +47,6 @@
     </div>
   </div>
   <div class="mantle">
-    <img alt="Apache Software Foundation" src="{{ SITEURL }}/theme/images/lucene/mantle-asf.png"/>
+    <img alt="Apache Software Foundation" src="{{ SITEURL }}/theme/images/lucene/mantle-asf.png{{ STATIC_RESOURCE_SUFFIX }}"/>
   </div>
 </div>
diff --git a/themes/lucene/templates/lucene/core/downloads.html b/themes/lucene/templates/lucene/core/downloads.html
index d9895ad..7151f95 100644
--- a/themes/lucene/templates/lucene/core/downloads.html
+++ b/themes/lucene/templates/lucene/core/downloads.html
@@ -20,10 +20,6 @@
       <a href="https://www.apache.org/dyn/closer.lua/lucene/java/{{ LUCENE_LATEST_RELEASE }}/lucene-{{ LUCENE_LATEST_RELEASE }}.tgz">lucene-{{ LUCENE_LATEST_RELEASE }}.tgz</a>
       [<a href="https://downloads.apache.org/lucene/java/{{ LUCENE_LATEST_RELEASE }}/lucene-{{ LUCENE_LATEST_RELEASE }}.tgz.asc">PGP</a>]
       [<a href="https://downloads.apache.org/lucene/java/{{ LUCENE_LATEST_RELEASE }}/lucene-{{ LUCENE_LATEST_RELEASE }}.tgz.sha512">SHA512</a>]
-      /
-      <a href="https://www.apache.org/dyn/closer.lua/lucene/java/{{ LUCENE_LATEST_RELEASE }}/lucene-{{ LUCENE_LATEST_RELEASE }}.zip">lucene-{{ LUCENE_LATEST_RELEASE }}.zip</a>
-      [<a href="https://downloads.apache.org/lucene/java/{{ LUCENE_LATEST_RELEASE }}/lucene-{{ LUCENE_LATEST_RELEASE }}.zip.asc">PGP</a>]
-      [<a href="https://downloads.apache.org/lucene/java/{{ LUCENE_LATEST_RELEASE }}/lucene-{{ LUCENE_LATEST_RELEASE }}.zip.sha512">SHA512</a>]
     </li>
 
     <li><a href="{{ SITEURL }}/core/{{ LUCENE_LATEST_RELEASE | replace(".", "_") }}/changes/Changes.html">Change log</a></li>
diff --git a/themes/lucene/templates/lucene/openrelevance/_sidebar.html b/themes/lucene/templates/lucene/openrelevance/_sidebar.html
index 65a4116..cda3efd 100644
--- a/themes/lucene/templates/lucene/openrelevance/_sidebar.html
+++ b/themes/lucene/templates/lucene/openrelevance/_sidebar.html
@@ -6,7 +6,7 @@
 
 <h1 id="events">Events<a class="headerlink" href="#events" title="Permanent link">¶</a></h1>
 <ul>
-  <li><a href="https://www.apache.org/events/current-event.html" target="_blank"><img src="https://www.apache.org/events/current-event-125x125.png"></a></li>
+  <a class="acevent" data-format="square" data-mode="light" data-width="160" data-style="border: 1px solid lightgrey"></a>
 </ul>
 
 <h1 id="asf-links">ASF links<a class="headerlink" href="#asf-links" title="Permanent link">¶</a></h1>
diff --git a/themes/lucene/templates/lucene/pylucene/_sidebar.html b/themes/lucene/templates/lucene/pylucene/_sidebar.html
index 1f1ab59..d85edbe 100644
--- a/themes/lucene/templates/lucene/pylucene/_sidebar.html
+++ b/themes/lucene/templates/lucene/pylucene/_sidebar.html
@@ -15,7 +15,7 @@
 
 <h1 id="events">Events<a class="headerlink" href="#events" title="Permanent link">¶</a></h1>
 <ul>
-  <li><a href="https://www.apache.org/events/current-event.html" target="_blank"><img src="https://www.apache.org/events/current-event-125x125.png"></a></li>
+  <a class="acevent" data-format="square" data-mode="light" data-width="160" data-style="border: 1px solid lightgrey"></a>
 </ul>
 
 <h1 id="asf-links">ASF links<a class="headerlink" href="#asf-links" title="Permanent link">¶</a></h1>
diff --git a/themes/lucene/templates/lucene/pylucene/jcc/_sidebar.html b/themes/lucene/templates/lucene/pylucene/jcc/_sidebar.html
index 44cd04d..287f332 100644
--- a/themes/lucene/templates/lucene/pylucene/jcc/_sidebar.html
+++ b/themes/lucene/templates/lucene/pylucene/jcc/_sidebar.html
@@ -7,7 +7,7 @@
 
 <h1 id="events">Events<a class="headerlink" href="#events" title="Permanent link">¶</a></h1>
 <ul>
-  <li><a href="https://www.apache.org/events/current-event.html" target="_blank"><img src="https://www.apache.org/events/current-event-125x125.png"></a></li>
+  <a class="acevent" data-format="square" data-mode="light" data-width="160" data-style="border: 1px solid lightgrey"></a>
 </ul>
 
 <h1 id="asf-links">ASF links<a class="headerlink" href="#asf-links" title="Permanent link">¶</a></h1>
diff --git a/themes/lucene/templates/lucene/tlp/_sidebar.html b/themes/lucene/templates/lucene/tlp/_sidebar.html
index 3b5dee0..db916b3 100644
--- a/themes/lucene/templates/lucene/tlp/_sidebar.html
+++ b/themes/lucene/templates/lucene/tlp/_sidebar.html
@@ -22,7 +22,7 @@
 
 <h1 id="events">Events<a class="headerlink" href="#events" title="Permanent link">¶</a></h1>
 <ul>
-  <li><a href="https://www.apache.org/events/current-event.html" target="_blank"><img src="https://www.apache.org/events/current-event-125x125.png"></a></li>
+  <a class="acevent" data-format="square" data-mode="light" data-width="160" data-style="border: 1px solid lightgrey"></a>
 </ul>
 
 <h1 id="asf-links">ASF links<a class="headerlink" href="#asf-links" title="Permanent link">¶</a></h1>
diff --git a/themes/lucene/templates/lucene/tlp/_slides.html b/themes/lucene/templates/lucene/tlp/_slides.html
index 3a34864..5b47d38 100644
--- a/themes/lucene/templates/lucene/tlp/_slides.html
+++ b/themes/lucene/templates/lucene/tlp/_slides.html
@@ -4,10 +4,10 @@
   </div>
   <div class="descwrapper"><div class="description">
       Apache Lucene set the standard for search and indexing performance.
-      Lucene is the search core of both Apache Solr<span style="vertical-align: super; font-size: xx-small">TM</span> and Elasticsearch<span style="vertical-align: super; font-size: xx-small">TM</span>.
+      Lucene is the search core of both Apache Solr™ and Elasticsearch™.
     </div></div>
     <div class="mantle">
-      <img alt="Apache Lucene" src="{{ SITEURL }}/theme/images/lucene/tlp/mantle-lucene.png"/>
+      <img alt="Apache Lucene" src="{{ SITEURL }}/theme/images/lucene/tlp/mantle-lucene.png{{ STATIC_RESOURCE_SUFFIX }}"/>
     </div>
 </div>
 <div id="slide2" style="display:none">
@@ -19,7 +19,7 @@
       from mobile devices to sites like Twitter, Apple and Wikipedia.
     </div></div>
     <div class="mantle">
-      <img alt="Lucene Power" src="{{ SITEURL }}/theme/images/lucene/mantle-power.png"/>
+      <img alt="Lucene Power" src="{{ SITEURL }}/theme/images/lucene/mantle-power.png{{ STATIC_RESOURCE_SUFFIX }}"/>
     </div>
 </div>
 <div id="slide3" style="display:none">
@@ -30,7 +30,7 @@
       The goal of Apache Lucene is to provide world class search capabilities
     </div></div>
     <div class="mantle">
-      <img alt="Apache Mahout community" src="{{ SITEURL }}/theme/images/lucene/tlp/mantle-community.png"/>
+      <img alt="Apache Mahout community" src="{{ SITEURL }}/theme/images/lucene/tlp/mantle-community.png{{ STATIC_RESOURCE_SUFFIX }}"/>
     </div>
 </div>
 <div id="slide4" style="display:none">
@@ -41,6 +41,6 @@
       Apache Lucene is distributed under a commercially friendly Apache Software license
     </div></div>
     <div class="mantle">
-      <img alt="Apache Software Foundation" src="{{ SITEURL }}/theme/images/lucene/mantle-asf.png"/>
+      <img alt="Apache Software Foundation" src="{{ SITEURL }}/theme/images/lucene/mantle-asf.png{{ STATIC_RESOURCE_SUFFIX }}"/>
     </div>
 </div>
diff --git a/themes/lucene/templates/lucene/tlp/index.html b/themes/lucene/templates/lucene/tlp/index.html
index 9bfa451..06f1415 100644
--- a/themes/lucene/templates/lucene/tlp/index.html
+++ b/themes/lucene/templates/lucene/tlp/index.html
@@ -4,8 +4,8 @@
 {{ super() }}
 
 <p>
-  The Apache Lucene<span style="vertical-align: super; font-size: xx-small">TM</span> project develops open-source search
-  software. The project releases a core search library, named Lucene<span style="vertical-align: super; font-size: xx-small">TM</span> core,
+  The Apache Lucene™ project develops open-source search
+  software. The project releases a core search library, named Lucene™ core,
   as well as PyLucene, a python binding for Lucene.
 </p>
 
@@ -30,9 +30,9 @@
 <div>
   <p>
     <a href="https://solr.apache.org/">
-      <img src="/theme/images/solr/Solr_Logo_200x101.png" width="100" alt="Solr Logo" align="left" class="solrlogo" />
+      <img src="/theme/images/solr/Solr_Logo_200x101.png{{ STATIC_RESOURCE_SUFFIX }}" width="100" alt="Solr Logo" align="left" class="solrlogo" />
     </a>
-    <b>ANNOUNCEMENT:</b> The <a href="https://solr.apache.org/">Solr<span style="vertical-align: super; font-size: xx-small">TM</span></a>
+    <b>ANNOUNCEMENT:</b> The <a href="https://solr.apache.org/">Solr™</a>
     sub project has moved to a separate Top Level Project (TLP). All things Solr can now be found at
     <a href="https://solr.apache.org/">https://solr.apache.org/</a>. Mailing lists and git repositories have changed,
     please see details on the Solr website.