diff --git a/.JuliaFormatter.toml b/.JuliaFormatter.toml
deleted file mode 100644
index 7f659436..00000000
--- a/.JuliaFormatter.toml
+++ /dev/null
@@ -1 +0,0 @@
-whitespace_in_kwargs = true
\ No newline at end of file
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 70900061..88c9cf4a 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -39,24 +39,15 @@ jobs:
             ${{ runner.os }}-
       - uses: julia-actions/julia-buildpkg@v1
       - uses: julia-actions/julia-runtest@v1
-  julia-format:
-    name: Formatter
+  runic:
+    name: Runic formatting
     runs-on: ubuntu-latest
     steps:
-      - uses: julia-actions/setup-julia@latest
       - uses: actions/checkout@v4
-      - name: Install JuliaFormatter and format
-        run: |
-          julia --color=yes -e 'using Pkg; Pkg.add(PackageSpec(name="JuliaFormatter"))'
-          julia --color=yes -e 'using JuliaFormatter; format(".", verbose=true)'
-      - name: Format check
-        run: |
-          julia --color=yes -e '
-          out = Cmd(`git diff --name-only`) |> read |> String
-          if out == ""
-              exit(0)
-          else
-              @error "Some files have not been formatted !!!"
-              write(stdout, out)
-              exit(1)
-          end'
+      - uses: julia-actions/setup-julia@v2
+        with:
+          version: '1.11'
+      - uses: julia-actions/cache@v2
+      - uses: fredrikekre/runic-action@v1
+        with:
+          version: '1'
diff --git a/Project.toml b/Project.toml
index f8a06d0d..61f78cb2 100644
--- a/Project.toml
+++ b/Project.toml
@@ -9,7 +9,7 @@ Git = "d7ba0133-e1db-5d97-8f8c-041e4b3a1eb2"
 Gumbo = "708ec375-b3d6-5a57-a7ce-8257bf98657a"
 HypertextLiteral = "ac1192a8-f4b3-4bfe-ba22-af5b92cd3ab2"
 JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
-NodeJS = "2bd173c7-0d6d-553b-b6af-13a54713934c"
+NodeJS_22_jll = "8fca9ca2-e7a1-5ccf-8c05-43be5a78664f"
 Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 
 [compat]
@@ -18,7 +18,7 @@ Git = "1"
 Gumbo = "0.8.2"
 HypertextLiteral = "0.9"
 JSON = "0.20,0.21"
-NodeJS = "1, 2"
+NodeJS_22_jll = "22.15.0"
 julia = "1"
 
 [extras]
diff --git a/assets/default/pagefind.css b/assets/default/pagefind.css
new file mode 100644
index 00000000..1969e7f9
--- /dev/null
+++ b/assets/default/pagefind.css
@@ -0,0 +1,152 @@
+#multi-page-nav .search {
+    margin-left: auto;
+    font-size: 16px;
+}
+
+#multi-page-nav .search .search-keybinding {
+    float: right;
+    width: 0;
+    transform: translateX(-1em);
+    color: #999;
+}
+
+#multi-page-nav .search:focus-within .search-keybinding {
+    display: none;
+}
+
+#multi-page-nav .search #search-input {
+    border: 1px solid #666;
+    border-radius: 3.2px;
+    color: #999;
+    background-color: unset;
+    height: 28px;
+    font-family: inherit;
+    width: 20em;
+    font-size: 14px;
+    padding: 0 8px;
+}
+
+#multi-page-nav .search #search-input::placeholder {
+    color: #999;
+    opacity: 1;
+}
+
+#multi-page-nav .search:focus-within #search-input {
+    background-color: #fff;
+    outline: none;
+    box-shadow: none;
+    color: #000;
+}
+
+.theme--documenter-dark #multi-page-nav .search:focus-within #search-input {
+    background-color: #202227;
+    color: #eee;
+}
+
+#multi-page-nav .search:focus-within .suggestions {
+    display: block;
+}
+
+#multi-page-nav .hidden {
+    display: none !important;
+}
+
+#multi-page-nav .suggestions {
+    margin: -5px 1.5rem 0 0;
+    display: none;
+    background: #fff;
+    min-width: 20em;
+    max-width: 50vw;
+    position: absolute;
+    border: 1px solid #cfd4db;
+    border-radius: 6px;
+    padding: .4rem;
+    list-style-type: none;
+    z-index: 10;
+    right: 0;
+    max-height: max(50vh, 250px);
+    overflow-y: auto;
+}
+
+.theme--documenter-dark #multi-page-nav .suggestions {
+    background: #2e3138;
+    border: 1px solid #5e6d6f;
+}
+
+#multi-page-nav .suggestions mark {
+    background-color: inherit;
+    color: #000;
+}
+.theme--documenter-dark #multi-page-nav .suggestions mark {
+    color: #fff;
+}
+
+#multi-page-nav .suggestions .suggestion {
+    line-height: 1.3;
+    border-radius: 4px;
+    
+    overflow: hidden;
+    text-overflow: ellipsis;
+    word-break: break-all;
+}
+#multi-page-nav .suggestions .sub-suggestions .suggestion {
+    margin-left: 1rem;
+}
+
+#multi-page-nav .suggestions .suggestion-header {
+    padding: .4rem .6rem;
+}
+#multi-page-nav .suggestions .suggestion-header:focus-visible {
+    outline: none;
+}
+.theme--documenter-dark #multi-page-nav .suggestions .suggestion-header:hover,
+.theme--documenter-dark #multi-page-nav .suggestions .suggestion-header:focus {
+    background-color: #202227;
+}
+#multi-page-nav .suggestions .suggestion-header:hover,
+#multi-page-nav .suggestions .suggestion-header:focus {
+    background-color: #eee;
+}
+
+#multi-page-nav .suggestions .suggestion .suggestion-excerpt {
+    font-size: small;
+    color: #666;
+}
+.theme--documenter-dark #multi-page-nav .suggestions .suggestion .suggestion-excerpt {
+    color: #aaa;
+}
+
+#multi-page-nav .suggestion .suggestion-title {
+    font-size: 1.2rem;
+    font-weight: bold;
+}
+
+#multi-page-nav .suggestion .sub-suggestions .suggestion-title {
+    font-size: 1rem;
+}
+
+#multi-page-nav .suggestion a {
+    display: block;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    color: black;
+}
+
+.theme--documenter-dark #multi-page-nav .suggestion a {
+    color: white;
+}
+
+#multi-page-nav .suggestions .suggestion .page-title {
+    font-weight: bold;
+}
+
+@media screen and (max-width: 1055px) {
+    #multi-page-nav .search #search-input {
+        width: 100%;
+    }
+    #multi-page-nav .suggestions {
+        max-width: 100vw;
+        width: calc(100% - 3.5rem);
+        margin: 10px 2.5em 4.5em 0;
+    }
+}
diff --git a/assets/default/pagefind_integration.js b/assets/default/pagefind_integration.js
new file mode 100644
index 00000000..746ace91
--- /dev/null
+++ b/assets/default/pagefind_integration.js
@@ -0,0 +1,150 @@
+// custom search widget
+(async function() {
+    const MAX_RESULTS = 20
+    let FOCUSABLE_ELEMENTS = []
+    let FOCUSED_ELEMENT_INDEX = 0
+
+    const pagefind = await import(window.MULTIDOCUMENTER_ROOT_PATH + "pagefind/pagefind.js")
+
+    function initialize() {
+        pagefind.init()
+        registerSearchListener()
+
+        document.body.addEventListener('keydown', ev => {
+            if (document.activeElement === document.body && (ev.key === '/' || ev.key === 's')) {
+                document.getElementById('search-input').focus()
+                ev.preventDefault()
+            }
+        })
+    }
+
+    function registerSearchListener() {
+        const input = document.getElementById('search-input')
+        const suggestions = document.getElementById('search-result-container')
+
+        async function runSearch() {
+            const query = input.value
+
+            const search = await pagefind.debouncedSearch(query, {}, 300);
+
+            if (search) {
+                buildResults(search.results)
+            }
+        }
+
+        input.addEventListener('keyup', ev => {
+            runSearch()
+        })
+
+        input.addEventListener('keydown', ev => {
+            if (ev.key === 'ArrowDown') {
+                FOCUSED_ELEMENT_INDEX = 0
+                FOCUSABLE_ELEMENTS[FOCUSED_ELEMENT_INDEX].focus()
+                ev.preventDefault()
+                return
+            } else if (ev.key === 'ArrowUp') {
+                FOCUSED_ELEMENT_INDEX = FOCUSABLE_ELEMENTS.length - 1
+                FOCUSABLE_ELEMENTS[FOCUSED_ELEMENT_INDEX].focus()
+                ev.preventDefault()
+                return
+            }
+        })
+
+        suggestions.addEventListener('keydown', ev => {
+            if (ev.key === 'ArrowDown') {
+                FOCUSED_ELEMENT_INDEX += 1
+                if (FOCUSED_ELEMENT_INDEX < FOCUSABLE_ELEMENTS.length) {
+                    FOCUSABLE_ELEMENTS[FOCUSED_ELEMENT_INDEX].focus()
+                } else {
+                    FOCUSED_ELEMENT_INDEX = -1
+                    input.focus()
+                }
+                ev.preventDefault()
+            } else if (ev.key === 'ArrowUp') {
+                FOCUSED_ELEMENT_INDEX -= 1
+                if (FOCUSED_ELEMENT_INDEX >= 0) {
+                    FOCUSABLE_ELEMENTS[FOCUSED_ELEMENT_INDEX].focus()
+                } else {
+                    FOCUSED_ELEMENT_INDEX = -1
+                    input.focus()
+                }
+                ev.preventDefault()
+            }
+        })
+
+        input.addEventListener('focus', ev => {
+            runSearch()
+        })
+    }
+
+    function renderResult(result) {
+        const entry = document.createElement('li')
+        entry.classList.add('suggestion')
+
+        const linkContainer = document.createElement('a')
+        linkContainer.classList.add('suggestion-header')
+        linkContainer.setAttribute('href', result.url)
+
+        const page = document.createElement('p')
+        page.classList.add('suggestion-title')
+
+        const pageTitle = document.createElement('span')
+        pageTitle.innerText = result.title ?? result.meta.title
+
+        page.appendChild(pageTitle)
+
+        const excerpt = document.createElement('p')
+        excerpt.classList.add('suggestion-excerpt')
+        excerpt.innerHTML = result.excerpt
+
+        linkContainer.appendChild(page)
+        linkContainer.appendChild(excerpt)
+
+        entry.appendChild(linkContainer)
+
+        return entry
+    }
+
+    async function buildResults(results) {
+        const suggestions = document.getElementById('search-result-container')
+
+        const children = await Promise.all(results.slice(0, MAX_RESULTS - 1).map(async (r, i) => {
+            const data = await r.data()
+
+            const entry = renderResult(data)
+
+            if (data.sub_results.length > 0) {
+                const subResults = document.createElement('ol')
+                subResults.classList.add('sub-suggestions')
+
+                data.sub_results.forEach(subresult => {
+                    const entry = renderResult(subresult)
+                    subResults.appendChild(entry)
+                })
+                entry.appendChild(subResults)
+            }
+            
+            return entry
+        }))
+
+        if (results.length > 0) {
+            suggestions.classList.remove('hidden')
+        } else {
+            suggestions.classList.add('hidden')
+        }
+
+        
+        suggestions.replaceChildren(
+            ...children
+        )
+
+        FOCUSED_ELEMENT_INDEX = -1
+        FOCUSABLE_ELEMENTS = [...suggestions.querySelectorAll('a')]
+    }
+
+    if (document.readyState === 'loading') {
+        document.addEventListener('DOMContentLoaded', initialize)
+    } else {
+        initialize()
+    };
+})()
diff --git a/docs/make.jl b/docs/make.jl
index dfc83730..e3bcdb48 100644
--- a/docs/make.jl
+++ b/docs/make.jl
@@ -23,12 +23,12 @@ open(joinpath(@__DIR__, "src", "index.md"), write = true) do io
         io,
         """
 
-## Docstrings
+        ## Docstrings
 
-```@autodocs
-Modules = [MultiDocumenter]
-```
-""",
+        ```@autodocs
+        Modules = [MultiDocumenter]
+        ```
+        """,
     )
 end
 cp(
diff --git a/src/MultiDocumenter.jl b/src/MultiDocumenter.jl
index cb085d87..896affca 100644
--- a/src/MultiDocumenter.jl
+++ b/src/MultiDocumenter.jl
@@ -5,31 +5,31 @@ using HypertextLiteral
 import Git: git
 
 module DocumenterTools
-import Gumbo, AbstractTrees
-include("documentertools/walkdocs.jl")
-include("documentertools/canonical_urls.jl")
+    import Gumbo, AbstractTrees
+    include("documentertools/walkdocs.jl")
+    include("documentertools/canonical_urls.jl")
 end
 
 """
-    SearchConfig(index_versions = ["stable"], engine = MultiDocumenter.FlexSearch, lowfi = false)
+    SearchConfig(index_versions = ["stable"], engine = MultiDocumenter.PageFind, lowfi = false)
 
 `index_versions` is a vector of relative paths used for generating the search index. Only
 the first matching path is considered.
-`engine` may be `MultiDocumenter.FlexSearch`, `MultiDocumenter.Stork`, or a module that conforms
-to the expected API (which is currently undocumented).
+`engine` may be `MultiDocumenter.PageFind`, `MultiDocumenter.FlexSearch`, `MultiDocumenter.Stork`,
+or a module that conforms to the expected API (which is currently undocumented).
 `lowfi = true` will try to minimize search index size. Only relevant for flexsearch.
 """
 Base.@kwdef mutable struct SearchConfig
     index_versions = ["stable", "dev"]
-    engine = FlexSearch
+    engine = PageFind
     lowfi = false
 end
 
 """
     abstract type DropdownComponent
 
-The supertype for any component that can be put in a dropdown column and 
-rendered using `MultiDocumenter.render(::YourComponent, thispagepath, dir, prettyurls)`.  
+The supertype for any component that can be put in a dropdown column and
+rendered using `MultiDocumenter.render(::YourComponent, thispagepath, dir, prettyurls)`.
 
 All `DropdownComponent`s go in [`Column`](@ref)s, which go in [`MegaDropdownNav`](@ref).
 
@@ -72,14 +72,14 @@ struct MultiDocRef <: DropdownComponent
 end
 
 function MultiDocRef(;
-    upstream,
-    name,
-    path,
-    giturl = "",
-    branch = "gh-pages",
-    fix_canonical_url = true,
-)
-    MultiDocRef(upstream, path, name, fix_canonical_url, giturl, branch)
+        upstream,
+        name,
+        path,
+        giturl = "",
+        branch = "gh-pages",
+        fix_canonical_url = true,
+    )
+    return MultiDocRef(upstream, path, name, fix_canonical_url, giturl, branch)
 end
 
 """
@@ -128,15 +128,17 @@ function walk_outputs(f, root, docs::Vector, dirs::Vector{String})
             break
         end
     end
+    return nothing
 end
 
 include("renderers.jl")
+include("search/pagefind.jl")
 include("search/flexsearch.jl")
 include("search/stork.jl")
 include("canonical.jl")
 include("sitemap.jl")
 
-const DEFAULT_ENGINE = SearchConfig(index_versions = ["stable", "dev"], engine = FlexSearch)
+const DEFAULT_ENGINE = SearchConfig(; index_versions = ["stable", "dev"], engine = PageFind)
 
 """
     make(
@@ -174,22 +176,22 @@ Aggregates multiple Documenter.jl-based documentation pages `docs` into `outdir`
 - `sitemap_filename` can be used to override the default sitemap filename (`sitemap.xml`)
 """
 function make(
-    outdir,
-    docs::Vector;
-    assets_dir = nothing,
-    brand_image::Union{Nothing,BrandImage} = nothing,
-    custom_stylesheets = [],
-    custom_scripts = [],
-    search_engine = DEFAULT_ENGINE,
-    prettyurls = true,
-    rootpath = "/",
-    hide_previews = true,
-    canonical_domain::Union{AbstractString,Nothing} = nothing,
-    sitemap::Bool = false,
-    sitemap_filename::AbstractString = "sitemap.xml",
-    # This keyword is for internal test use only:
-    _override_windows_isinteractive_check::Bool = false,
-)
+        outdir,
+        docs::Vector;
+        assets_dir = nothing,
+        brand_image::Union{Nothing, BrandImage} = nothing,
+        custom_stylesheets = [],
+        custom_scripts = [],
+        search_engine = DEFAULT_ENGINE,
+        prettyurls = true,
+        rootpath = "/",
+        hide_previews = true,
+        canonical_domain::Union{AbstractString, Nothing} = nothing,
+        sitemap::Bool = false,
+        sitemap_filename::AbstractString = "sitemap.xml",
+        # This keyword is for internal test use only:
+        _override_windows_isinteractive_check::Bool = false,
+    )
     if Sys.iswindows() && !isinteractive()
         if _override_windows_isinteractive_check || isinteractive()
             @warn """
@@ -213,9 +215,13 @@ function make(
     else
         !isnothing(canonical_domain)
         if !startswith(canonical_domain, r"^https?://")
-            throw(ArgumentError("""
-            Invalid value for canonical_domain: $(canonical_domain)
-            Must start with http:// or https://"""))
+            throw(
+                ArgumentError(
+                    """
+                    Invalid value for canonical_domain: $(canonical_domain)
+                    Must start with http:// or https://"""
+                )
+            )
         end
         # We'll strip any trailing /-s though, in case the user passed something like
         # https://example.org/, because we want to concatenate the file paths with `/`
@@ -246,13 +252,6 @@ function make(
     isdir(out_assets) || mkpath(out_assets)
     cp(joinpath(@__DIR__, "..", "assets", "default"), joinpath(out_assets, "default"))
 
-    if search_engine != false
-        if search_engine.engine == Stork && !Stork.has_stork()
-            @warn "stork binary not found. Falling back to flexsearch as search_engine."
-            search_engine = DEFAULT_ENGINE
-        end
-    end
-
     inject_styles_and_global_navigation(
         dir,
         docs,
@@ -347,11 +346,11 @@ function maybe_clone(docs::Vector)
 end
 
 function make_output_structure(
-    docs::Vector{DropdownComponent},
-    prettyurls,
-    hide_previews;
-    canonical::Union{AbstractString,Nothing},
-)
+        docs::Vector{DropdownComponent},
+        prettyurls,
+        hide_previews;
+        canonical::Union{AbstractString, Nothing},
+    )
     dir = mktempdir()
 
     for doc in Iterators.filter(x -> x isa MultiDocRef, docs)
@@ -387,13 +386,13 @@ function make_output_structure(
 end
 
 function make_global_nav(
-    dir,
-    docs::Vector,
-    thispagepath,
-    brand_image,
-    search_engine,
-    prettyurls,
-)
+        dir,
+        docs::Vector,
+        thispagepath,
+        brand_image,
+        search_engine,
+        prettyurls,
+    )
     nav = @htl """
     <nav id="multi-page-nav">
         $(render(brand_image, dir, thispagepath))
@@ -470,15 +469,15 @@ end
 
 
 function inject_styles_and_global_navigation(
-    dir,
-    docs::Vector,
-    brand_image,
-    custom_stylesheets,
-    custom_scripts,
-    search_engine,
-    prettyurls,
-    rootpath,
-)
+        dir,
+        docs::Vector,
+        brand_image,
+        custom_stylesheets,
+        custom_scripts,
+        search_engine,
+        prettyurls,
+        rootpath,
+    )
 
     if search_engine != false
         search_engine.engine.inject_script!(custom_scripts, rootpath)
@@ -497,9 +496,9 @@ function inject_styles_and_global_navigation(
             isfile(path) || continue
             page = read(path, String)
             if startswith(
-                page,
-                "<!--This file is automatically generated by Documenter.jl-->",
-            )
+                    page,
+                    "<!--This file is automatically generated by Documenter.jl-->",
+                )
                 continue
             end
 
@@ -527,7 +526,7 @@ function inject_styles_and_global_navigation(
                         elseif Gumbo.tag(el) == :body && !isempty(el.children)
                             documenter_div = first(el.children)
                             if documenter_div isa Gumbo.HTMLElement &&
-                               Gumbo.getattr(documenter_div, "id", "") == "documenter"
+                                    Gumbo.getattr(documenter_div, "id", "") == "documenter"
                                 @debug "Could not detect Documenter page layout in $path. This may be due to an old version of Documenter."
                             end
                             # inject global navigation as first element in body
@@ -553,6 +552,8 @@ function inject_styles_and_global_navigation(
             end
         end
     end
+
+    return nothing
 end
 
 end
diff --git a/src/canonical.jl b/src/canonical.jl
index c78efa38..36fa58c1 100644
--- a/src/canonical.jl
+++ b/src/canonical.jl
@@ -1,10 +1,10 @@
 # This files contains the functions used to implement the canonical URL
 # update functionality.
 function fix_canonical_url!(
-    doc::MultiDocRef;
-    canonical::Union{AbstractString,Nothing},
-    root_dir::AbstractString,
-)
+        doc::MultiDocRef;
+        canonical::Union{AbstractString, Nothing},
+        root_dir::AbstractString,
+    )
     # If the user didn't set `canonical`, then we don't need to do anything
     isnothing(canonical) && return nothing
     # The user can also disable the canonical URL fixing on a per-package basis
@@ -20,4 +20,6 @@ function fix_canonical_url!(
         @error "Unable to update canonical URLs for this package" doc exception =
             (e, catch_backtrace())
     end
+
+    return nothing
 end
diff --git a/src/documentertools/canonical_urls.jl b/src/documentertools/canonical_urls.jl
index ae3665f3..1951cee0 100644
--- a/src/documentertools/canonical_urls.jl
+++ b/src/documentertools/canonical_urls.jl
@@ -16,9 +16,9 @@
   specifying the root of the canonical URL.
 """
 function update_canonical_links_for_version(
-    docs_directory::AbstractString;
-    canonical::AbstractString,
-)
+        docs_directory::AbstractString;
+        canonical::AbstractString,
+    )
     canonical = rstrip(canonical, '/')
 
     walkdocs(docs_directory, isdochtml) do fileinfo
@@ -26,7 +26,7 @@ function update_canonical_links_for_version(
         # Determine the
         filepath = splitpath(fileinfo.relpath)
         new_canonical_href = if filepath[end] == "index.html"
-            joinurl(canonical, filepath[1:end-1]...) * '/'
+            joinurl(canonical, filepath[1:(end - 1)]...) * '/'
         else
             joinurl(canonical, filepath[1:end]...)
         end
@@ -66,6 +66,7 @@ function update_canonical_links_for_version(
             @error "Multiple canonical tags!" file = fileinfo.relpath
         end
     end
+    return nothing
 end
 
 is_canonical_element(e) =
@@ -123,6 +124,7 @@ function update_canonical_links(docs_directory::AbstractString; canonical::Abstr
         @debug "Updating canonical URLs for a version" path canonical_full_root
         update_canonical_links_for_version(path; canonical = canonical_full_root)
     end
+    return nothing
 end
 
 function canonical_directory_from_redirect_index_html(docs_directory::AbstractString)
@@ -130,7 +132,7 @@ function canonical_directory_from_redirect_index_html(docs_directory::AbstractSt
     isfile(redirect_index_html_path) || return nothing
     redirect_url = get_meta_redirect_url(redirect_index_html_path)
     isnothing(redirect_url) && return nothing
-    splitpath(normpath(redirect_url))
+    return splitpath(normpath(redirect_url))
 end
 
 """
@@ -235,16 +237,26 @@ function extract_versions_list(versions_js::AbstractString)
     versions_js_content = read(versions_js, String)
     m = match(r"var\s+DOC_VERSIONS\s*=\s*\[([0-9A-Za-z\"\s.,+-]+)\]", versions_js_content)
     if isnothing(m)
-        throw(ArgumentError("""
-        Could not find DOC_VERSIONS in $(versions_js):
-        $(versions_js_content)"""))
+        throw(
+            ArgumentError(
+                """
+                Could not find DOC_VERSIONS in $(versions_js):
+                $(versions_js_content)
+                """
+            )
+        )
     end
     versions = strip.(c -> isspace(c) || (c == '"'), split(m[1], ","))
     filter!(!isempty, versions)
     if isempty(versions)
-        throw(ArgumentError("""
-        DOC_VERSIONS empty in $(versions_js):
-        $(versions_js_content)"""))
+        throw(
+            ArgumentError(
+                """
+                DOC_VERSIONS empty in $(versions_js):
+                $(versions_js_content)
+                """
+            )
+        )
     end
     return versions
 end
diff --git a/src/search/flexsearch.jl b/src/search/flexsearch.jl
index a2a41994..fee1e4d6 100644
--- a/src/search/flexsearch.jl
+++ b/src/search/flexsearch.jl
@@ -1,6 +1,11 @@
 module FlexSearch
-import Gumbo, JSON, AbstractTrees, NodeJS
-using HypertextLiteral
+
+using Gumbo: Gumbo
+using JSON: JSON
+using AbstractTrees: AbstractTrees
+using NodeJS_22_jll: node
+using HypertextLiteral: @htl
+
 import ..walk_outputs
 
 const ID = Ref(0)
@@ -8,7 +13,7 @@ const ID = Ref(0)
 mutable struct Fragment
     id::Int
     title::String
-    ref::Union{String,Nothing}
+    ref::Union{String, Nothing}
     content::String
 end
 
@@ -31,12 +36,12 @@ SearchIndex() = SearchIndex([])
 
 is_section_start(el) =
     Gumbo.hasattr(el, "id") && (
-        Gumbo.tag(el) in (:h1, :h2, :h3, :h4, :h5, :h6, :h7, :h8) || (
-            Gumbo.tag(el) == :a &&
+    Gumbo.tag(el) in (:h1, :h2, :h3, :h4, :h5, :h6, :h7, :h8) || (
+        Gumbo.tag(el) == :a &&
             Gumbo.hasattr(el, "href") &&
             Gumbo.getattr(el, "class", "") == "docstring-binding"
-        )
     )
+)
 
 function add_fragment(doc, el)
     ref = nothing
@@ -61,6 +66,7 @@ function add_fragment(doc, el)
             current.content = string(current.content, ' ', Gumbo.text(e))
         end
     end
+    return nothing
 end
 
 function add_to_index!(index, ref, file)
@@ -82,6 +88,7 @@ function add_to_index!(index, ref, file)
         end
     end
     push!(index.documents, doc)
+    return nothing
 end
 
 function generate_index(root, docs, config, rootpath)
@@ -101,10 +108,12 @@ function inject_script!(custom_scripts, rootpath)
         custom_scripts,
         Docs.HTML("window.MULTIDOCUMENTER_ROOT_PATH = '$(rootpath)'"),
     )
+    return nothing
 end
 
 function inject_styles!(custom_styles)
     pushfirst!(custom_styles, joinpath("assets", "default", "flexsearch.css"))
+    return nothing
 end
 
 function render()
@@ -142,6 +151,7 @@ function to_json_index(index::SearchIndex, file)
         end
         JSON.end_array(writer)
     end
+    return nothing
 end
 
 function build_search_index(root, docs, config, rootpath)
@@ -151,7 +161,7 @@ function build_search_index(root, docs, config, rootpath)
     file = config.lowfi ? "gensearch-lowfi.js" : "gensearch.js"
     println("Writing $(config.lowfi ? "lowfi" : "") flexsearch index:")
     cd(root) do
-        run(`$(NodeJS.nodejs_cmd()) $(joinpath(@__DIR__, "..", "..", "flexsearch", file))`)
+        run(`$(node()) $(joinpath(@__DIR__, "..", "..", "flexsearch", file))`)
     end
     return nothing
 end
diff --git a/src/search/pagefind.jl b/src/search/pagefind.jl
new file mode 100644
index 00000000..0808bacb
--- /dev/null
+++ b/src/search/pagefind.jl
@@ -0,0 +1,45 @@
+module PageFind
+using NodeJS_22_jll: npx, npm
+using HypertextLiteral: @htl
+
+function inject_script!(custom_scripts, rootpath)
+    pushfirst!(custom_scripts, joinpath("assets", "default", "pagefind_integration.js"))
+    pushfirst!(custom_scripts, joinpath("pagefind", "pagefind.js"))
+    pushfirst!(
+        custom_scripts,
+        Docs.HTML("window.MULTIDOCUMENTER_ROOT_PATH = '$(rootpath)'"),
+    )
+    return nothing
+end
+
+function inject_styles!(custom_styles)
+    pushfirst!(custom_styles, joinpath("assets", "default", "pagefind.css"))
+    return nothing
+end
+
+function render()
+    return @htl """
+    <div class="search nav-item">
+        <input id="search-input" placeholder="Search everywhere...">
+        <ol id="search-result-container" class="suggestions hidden">
+        </ol>
+        <div class="search-keybinding">/</div>
+    </div>
+    """
+end
+
+function build_search_index(root, docs, config, rootpath)
+    if !success(Cmd(`$(npx) pagefind -V`; dir = root))
+        @info "Installing pagefind into $root."
+        if !success(Cmd(`$(npm) install pagefind`; dir = root))
+            error("Could not install pagefind.")
+        end
+    end
+
+    pattern = "*/{$(join(config.index_versions, ","))}/**/*.{html}"
+
+    run(`$(npx) pagefind --site $(root) --glob $(pattern) --root-selector article`)
+    return nothing
+end
+
+end
diff --git a/src/search/stork.jl b/src/search/stork.jl
index 57d50c2e..598a869d 100644
--- a/src/search/stork.jl
+++ b/src/search/stork.jl
@@ -15,6 +15,9 @@ function has_stork()
 end
 
 function build_search_index(root, docs, config, _)
+    if !has_stork()
+        error("Stork search engine not found. Aborting")
+    end
     config = make_stork_config(root, docs, config)
     config_path = joinpath(root, "stork.config.toml")
     index_path = joinpath(root, "stork.st")
@@ -58,16 +61,18 @@ function add_to_index!(files, ref, path)
     end
 
     push!(files, Dict("path" => path, "url" => ref, "title" => title))
-    return
+    return nothing
 end
 
 function inject_script!(custom_scripts, _)
     pushfirst!(custom_scripts, joinpath("assets", "default", "stork.js"))
     pushfirst!(custom_scripts, joinpath("assets", "default", "stork_integration.js"))
+    return nothing
 end
 
 function inject_styles!(custom_styles)
     pushfirst!(custom_styles, joinpath("assets", "default", "stork.css"))
+    return nothing
 end
 
 function render()
diff --git a/src/sitemap.jl b/src/sitemap.jl
index 6a097cdc..46589e80 100644
--- a/src/sitemap.jl
+++ b/src/sitemap.jl
@@ -21,6 +21,8 @@ function Base.showerror(io::IO, e::SitemapTooLargeError)
     println(io, "SitemapTooLargeError: $(e.msg)")
     println(io, " limit is $(e.limit), but sitemap has $(e.value)")
     print(io, SITEMAP_LIMIT_MSG)
+
+    return nothing
 end
 function check_sitemap_size_limit(msg::AbstractString, value::Integer, limit::Integer)
     if value > limit
@@ -29,23 +31,26 @@ function check_sitemap_size_limit(msg::AbstractString, value::Integer, limit::In
         # Soft limits are 80% of the full limit
         @warn "Sitemap too large: $(msg) (> 80% soft limit)\n$(SITEMAP_LIMIT_MSG)"
     end
+
     return nothing
 end
 
 function make_sitemap(;
-    sitemap_filename::AbstractString,
-    sitemap_root::AbstractString,
-    docs_root_directory::AbstractString,
-)
+        sitemap_filename::AbstractString,
+        sitemap_root::AbstractString,
+        docs_root_directory::AbstractString,
+    )
     # Determine the list of sitemap URLs by finding all canonical URLs
     sitemap_urls = find_sitemap_urls(; docs_root_directory, sitemap_root)
     if length(sitemap_urls) == 0
         @error "No sitemap URLs found"
-        return
+        return nothing
     end
     sitemap_bytes = make_sitemap_bytes(sitemap_urls)
     # Write the actual sitemap.xml file into the output directory
     write(joinpath(docs_root_directory, sitemap_filename), sitemap_bytes)
+
+    return nothing
 end
 
 function make_sitemap_bytes(sitemap_urls)::Vector{UInt8}
@@ -75,9 +80,9 @@ function make_sitemap_bytes(sitemap_urls)::Vector{UInt8}
 end
 
 function find_sitemap_urls(;
-    docs_root_directory::AbstractString,
-    sitemap_root::AbstractString,
-)
+        docs_root_directory::AbstractString,
+        sitemap_root::AbstractString,
+    )
     # On Windows, .relpath should have \ as path separators, which we have to
     # "normalize" to /-s for web
     canonical_urls = String[]
@@ -91,13 +96,13 @@ function find_sitemap_urls(;
             if DocumenterTools.get_meta_redirect_url(html) === nothing
                 @warn "Canonical URL missing: $(fileinfo.relpath)"
             end
-            return
+            return nothing
         end
         # Check that the canonincal URL is correct.
         # First, we check that the root part is actually what we expect it to be.
         if !startswith(canonical_href, sitemap_root)
             @warn "Invalid canonical URL, excluded from sitemap." canonical_href fileinfo.fullpath
-            return
+            return nothing
         end
         # Let's make sure we're not adding duplicates, but first we must normalize the URL
         canonical_href = normalize_canonical_url(canonical_href)
diff --git a/test/documentertools.jl b/test/documentertools.jl
index e1705d97..21b336c8 100644
--- a/test/documentertools.jl
+++ b/test/documentertools.jl
@@ -61,38 +61,41 @@ function withfiles(f, files::Pair...)
         @debug "ls -Alh $path" * read(`ls -Alh $path`, String)
         f(path)
     end
+    return
 end
 
 @testset "canonical_urls" begin
     @testset "parsing versions.js" begin
         withfiles(
             "versions.js" => """
-      var DOC_VERSIONS = [
-          "stable",
-          "v0.27",
-          "v0.1",
-          "dev",
-      ];
-      """,
+                var DOC_VERSIONS = [
+                    "stable",
+                    "v0.27",
+                    "v0.1",
+                    "dev",
+                ];
+                """,
             "v0.27" => :dir,
             "v0.1" => :dir,
             "dev" => :dir,
             "stable" => (:symlink, "v0.27"),
         ) do path
             @test DocumenterTools.extract_versions_list(joinpath(path, "versions.js")) ==
-                  ["stable", "v0.27", "v0.1", "dev"]
+                ["stable", "v0.27", "v0.1", "dev"]
             @test DocumenterTools.canonical_version_from_versions_js(path) == "stable"
         end
 
-        withfiles("versions.js" => """
-            var DOC_VERSIONS = [
-                "v1",
-                "v2",
-                "dev",
-            ];
-            """, "v1" => :dir, "v2" => :dir, "dev" => :dir) do path
+        withfiles(
+            "versions.js" => """
+                var DOC_VERSIONS = [
+                    "v1",
+                    "v2",
+                    "dev",
+                ];
+                """, "v1" => :dir, "v2" => :dir, "dev" => :dir
+        ) do path
             @test DocumenterTools.extract_versions_list(joinpath(path, "versions.js")) ==
-                  ["v1", "v2", "dev"]
+                ["v1", "v2", "dev"]
             @test DocumenterTools.canonical_version_from_versions_js(path) == "v2"
         end
     end
@@ -100,7 +103,7 @@ end
     @testset "parsing redirect index.html" begin
         mktempdir() do path
             @test DocumenterTools.canonical_directory_from_redirect_index_html(path) ===
-                  nothing
+                nothing
         end
 
         mktempdir() do path
@@ -108,13 +111,13 @@ end
             write(
                 file,
                 """
-    <!--This file is automatically generated by Documenter.jl-->
-    <meta http-equiv="refresh" content="0; url=./stable/"/>
-    """,
+                <!--This file is automatically generated by Documenter.jl-->
+                <meta http-equiv="refresh" content="0; url=./stable/"/>
+                """,
             )
             @test DocumenterTools.get_meta_redirect_url(file) == "./stable/"
             @test DocumenterTools.canonical_directory_from_redirect_index_html(path) ==
-                  ["stable"]
+                ["stable"]
         end
     end
 
@@ -122,7 +125,7 @@ end
         out = tempname()
         cp(joinpath(FIXTURES, "simple.pre"), out)
         @test DocumenterTools.canonical_directory_from_redirect_index_html(out) ==
-              ["stable"]
+            ["stable"]
         DocumenterTools.update_canonical_links(
             out;
             canonical = "https://example.org/this-is-test",
diff --git a/test/runtests.jl b/test/runtests.jl
index dfc60334..1d062f7c 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -95,7 +95,7 @@ if Sys.iswindows() && !isinteractive()
         docs;
         search_engine = MultiDocumenter.SearchConfig(
             index_versions = ["stable", "dev"],
-            engine = MultiDocumenter.FlexSearch,
+            engine = MultiDocumenter.PageFind,
         ),
         custom_scripts = [
             "foo/bar.js",
@@ -114,7 +114,7 @@ MultiDocumenter.make(
     docs;
     search_engine = MultiDocumenter.SearchConfig(
         index_versions = ["stable", "dev"],
-        engine = MultiDocumenter.FlexSearch,
+        engine = MultiDocumenter.PageFind,
     ),
     custom_scripts = [
         "foo/bar.js",
@@ -146,9 +146,9 @@ MultiDocumenter.make(
         end
 
         @test read(joinpath(outpath, "inf", "index.html"), String) == """
-        <!--This file is automatically generated by Documenter.jl-->
-        <meta http-equiv="refresh" content="0; url=./stable/"/>
-        """
+            <!--This file is automatically generated by Documenter.jl-->
+            <meta http-equiv="refresh" content="0; url=./stable/"/>
+            """
 
         # We override the sitemap filename
         @test !isfile(joinpath(outpath, "sitemap.xml"))
@@ -210,23 +210,8 @@ MultiDocumenter.make(
         @test occursin(canonical_href, index)
     end
 
-    @testset "flexsearch" begin
-        @test isdir(outpath, "search-data")
-        store_content = read(joinpath(outpath, "search-data", "store.json"), String)
-        @test !isempty(store_content)
-        @test occursin("Infiltrator.jl", store_content)
-        @test occursin("@infiltrate", store_content)
-        # We can't traverse symlinks on Windows, so stable/ things do not get
-        # written into the search index. Instead, it looks like we write dev/
-        if Sys.iswindows()
-            @test !occursin("$(rootpath)inf/stable/", store_content)
-            @test !occursin("$(rootpath)inf/stable/", store_content)
-            @test occursin("/inf/dev/", store_content)
-        else
-            @test occursin("$(rootpath)inf/stable/", store_content)
-            @test occursin("$(rootpath)inf/stable/", store_content)
-            @test !occursin("/inf/dev/", store_content)
-        end
+    @testset "pagefind" begin
+        @test isdir(outpath, "pagefind")
     end
 
     @testset "sitemap" begin
@@ -244,36 +229,36 @@ MultiDocumenter.make(
             @test MultiDocumenter.normalize_canonical_url("foo.html") == "foo.html"
             @test MultiDocumenter.normalize_canonical_url("/foo.html") == "/foo.html"
             @test MultiDocumenter.normalize_canonical_url("/foo/bar.html") ==
-                  "/foo/bar.html"
+                "/foo/bar.html"
             @test MultiDocumenter.normalize_canonical_url("/foo.html/") == "/foo.html/"
             @test MultiDocumenter.normalize_canonical_url("/index.html") == "/"
             @test MultiDocumenter.normalize_canonical_url("/foo/index.html") == "/foo/"
             @test MultiDocumenter.normalize_canonical_url("/foo/index.html") == "/foo/"
             @test MultiDocumenter.normalize_canonical_url("/foo/index.html/") ==
-                  "/foo/index.html/"
+                "/foo/index.html/"
             @test MultiDocumenter.normalize_canonical_url("/foo/index.html/bar") ==
-                  "/foo/index.html/bar"
+                "/foo/index.html/bar"
             @test MultiDocumenter.normalize_canonical_url("/foo/index.html/bar/") ==
-                  "/foo/index.html/bar/"
+                "/foo/index.html/bar/"
             @test MultiDocumenter.normalize_canonical_url("/foo/index.html/bar/baz.html") ==
-                  "/foo/index.html/bar/baz.html"
+                "/foo/index.html/bar/baz.html"
             @test MultiDocumenter.normalize_canonical_url(
                 "/foo/index.html/bar/index.html",
             ) == "/foo/index.html/bar/"
             # Full URL test cases
             @test MultiDocumenter.normalize_canonical_url("https://example.org") ==
-                  "https://example.org"
+                "https://example.org"
             @test MultiDocumenter.normalize_canonical_url("https://example.org/") ==
-                  "https://example.org/"
+                "https://example.org/"
             @test MultiDocumenter.normalize_canonical_url("https://example.org/foo.html") ==
-                  "https://example.org/foo.html"
+                "https://example.org/foo.html"
             @test MultiDocumenter.normalize_canonical_url(
                 "https://example.org/index.html",
             ) == "https://example.org/"
             @test MultiDocumenter.normalize_canonical_url("https://example.org/foo") ==
-                  "https://example.org/foo"
+                "https://example.org/foo"
             @test MultiDocumenter.normalize_canonical_url("https://example.org/foo/") ==
-                  "https://example.org/foo/"
+                "https://example.org/foo/"
             @test MultiDocumenter.normalize_canonical_url(
                 "https://example.org/foo/index.html",
             ) == "https://example.org/foo/"
@@ -286,26 +271,32 @@ MultiDocumenter.make(
 
         @testset "make_sitemap_bytes" begin
             @test MultiDocumenter.make_sitemap_bytes(String[]) == b"""
-            <?xml version="1.0" encoding="UTF-8"?>
-            <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-            </urlset>
-            """
+                <?xml version="1.0" encoding="UTF-8"?>
+                <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+                </urlset>
+                """
             @test MultiDocumenter.make_sitemap_bytes(String["foo"]) == b"""
-            <?xml version="1.0" encoding="UTF-8"?>
-            <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-            <url><loc>foo</loc></url>
-            </urlset>
-            """
-            @test_logs (:warn,) MultiDocumenter.make_sitemap_bytes(["foo" for _ = 1:45_000])
-            @test_throws MultiDocumenter.SitemapTooLargeError MultiDocumenter.make_sitemap_bytes([
-                "foo" for _ = 1:50_001
-            ])
-            @test_logs (:warn,) MultiDocumenter.make_sitemap_bytes([
-                "x"^4500 for _ = 1:10_000
-            ])
-            @test_throws MultiDocumenter.SitemapTooLargeError MultiDocumenter.make_sitemap_bytes([
-                "x"^6500 for _ = 1:10_000
-            ])
+                <?xml version="1.0" encoding="UTF-8"?>
+                <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+                <url><loc>foo</loc></url>
+                </urlset>
+                """
+            @test_logs (:warn,) MultiDocumenter.make_sitemap_bytes(["foo" for _ in 1:45_000])
+            @test_throws MultiDocumenter.SitemapTooLargeError MultiDocumenter.make_sitemap_bytes(
+                [
+                    "foo" for _ in 1:50_001
+                ]
+            )
+            @test_logs (:warn,) MultiDocumenter.make_sitemap_bytes(
+                [
+                    "x"^4500 for _ in 1:10_000
+                ]
+            )
+            @test_throws MultiDocumenter.SitemapTooLargeError MultiDocumenter.make_sitemap_bytes(
+                [
+                    "x"^6500 for _ in 1:10_000
+                ]
+            )
         end
 
         sitemap_content = read(joinpath(outpath, "sitemap-mydocs.xml"), String)