From 8fe32fd778d4d58ad71928f533c5181cc6e99f7d Mon Sep 17 00:00:00 2001
From: techie2000 <38585780+techie2000@users.noreply.github.com>
Date: Fri, 13 May 2022 20:03:20 +0100
Subject: [PATCH 001/405] Correct 'reload scrapes' path (#2583)

---
 ui/v2.5/src/docs/en/Scraping.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/v2.5/src/docs/en/Scraping.md b/ui/v2.5/src/docs/en/Scraping.md
index d95b0f285..69710fc04 100644
--- a/ui/v2.5/src/docs/en/Scraping.md
+++ b/ui/v2.5/src/docs/en/Scraping.md
@@ -39,7 +39,7 @@ Scrapers are added by placing yaml configuration files (format: `scrapername.yml
 
 > **⚠️ Note:** Some scrapers may require more than just the yaml file, consult the individual scraper documentation
 
-After the yaml files are added, removed or edited while stash is running, they can be reloaded going to `Settings > Scrapers` and clicking `Reload Scrapers`.
+After the yaml files are added, removed or edited while stash is running, they can be reloaded going to `Settings > Metadata Providers > Scrapers` and clicking `Reload Scrapers`.
 
 The stash community maintains a number of custom scraper configuration files that can be found [here](https://github.com/stashapp/CommunityScrapers).
   
@@ -70,4 +70,4 @@ When used in combination with stash-box, the user can optionally submit scene fi
 
 ## Identify Task
 
-This task iterates through your Scenes and attempts to identify the scene using a selection of scraping sources. This task can be found under `Settings -> Tasks -> "Identify..." (Button)`. For more information see the [Tasks > Identify](/help/Identify.md) page.
\ No newline at end of file
+This task iterates through your Scenes and attempts to identify the scene using a selection of scraping sources. This task can be found under `Settings -> Tasks -> "Identify..." (Button)`. For more information see the [Tasks > Identify](/help/Identify.md) page.

From 714afd98b4e894567e9b67720378859c1ee0da27 Mon Sep 17 00:00:00 2001
From: DogmaDragon <103123951+DogmaDragon@users.noreply.github.com>
Date: Sun, 20 Apr 2025 11:22:59 +0300
Subject: [PATCH 002/405] Update README to mention official forum [skip ci]

---
 README.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4debcfa91..dd33460e6 100644
--- a/README.md
+++ b/README.md
@@ -48,6 +48,10 @@ Many community-maintained scrapers are available for download from [CommunityScr
 
 <sub>[StashDB](http://stashdb.org) is the canonical instance of our open source metadata API, [stash-box](https://github.com/stashapp/stash-box).</sub>
 
+# Join Our Community
+
+We are excited to announce that we have a new home for support, feature requests, and discussions related to Stash and its associated projects. Join our community on the [Discourse forum](https://discourse.stashapp.cc) to connect with other users, share your ideas, and get help from fellow enthusiasts.
+
 # Translation
 [![Translate](https://translate.stashapp.cc/widgets/stash/-/stash-desktop-client/svg-badge.svg)](https://translate.stashapp.cc/engage/stash/)
 🇧🇷 🇨🇳 🇩🇰 🇳🇱 🇬🇧 🇪🇪 🇫🇮 🇫🇷 🇩🇪 🇮🇹 🇯🇵 🇰🇷 🇵🇱 🇷🇺 🇪🇸 🇸🇪 🇹🇼 🇹🇷
@@ -56,9 +60,10 @@ Stash is available in 25 languages (so far!) and it could be in your language to
 
 # Support (FAQ)
 
-Check out our documentation on [Stash-Docs](https://docs.stashapp.cc) for information about the software, questions, guides, add-ons and more. 
+Check out our documentation on [Stash-Docs](https://docs.stashapp.cc) for information about the software documentation, guides. 
 
 For more help you can:
+* Join the community [Discourse forum](https://discourse.stashapp.cc)
 * Check the in-app documentation, in the top right corner of the app (it's also mirrored on [Stash-Docs](https://docs.stashapp.cc/in-app-manual))
 * Join the [Matrix space](https://matrix.to/#/#stashapp:unredacted.org)
 * Join the [Discord server](https://discord.gg/2TsNFKt), where the community can offer support.

From 497146adc54093bfba3c41574f92408094c80890 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Mon, 23 Jun 2025 14:11:51 +1000
Subject: [PATCH 003/405] Support patching Pagination and PaginationIndex
 (#5957)

---
 ui/v2.5/src/components/List/Pagination.tsx | 205 +++++++++++----------
 1 file changed, 103 insertions(+), 102 deletions(-)

diff --git a/ui/v2.5/src/components/List/Pagination.tsx b/ui/v2.5/src/components/List/Pagination.tsx
index e5cc89b40..e117b532e 100644
--- a/ui/v2.5/src/components/List/Pagination.tsx
+++ b/ui/v2.5/src/components/List/Pagination.tsx
@@ -14,6 +14,7 @@ import { Icon } from "../Shared/Icon";
 import { faCheck, faChevronDown } from "@fortawesome/free-solid-svg-icons";
 import { useStopWheelScroll } from "src/utils/form";
 import { Placement } from "react-bootstrap/esm/Overlay";
+import { PatchComponent } from "src/patch";
 
 const PageCount: React.FC<{
   totalPages: number;
@@ -158,114 +159,114 @@ interface IPaginationIndexProps {
 
 const minPagesForCompact = 4;
 
-export const Pagination: React.FC<IPaginationProps> = ({
-  itemsPerPage,
-  currentPage,
-  totalItems,
-  onChangePage,
-  pagePopupPlacement,
-}) => {
-  const intl = useIntl();
-  const totalPages = useMemo(
-    () => Math.ceil(totalItems / itemsPerPage),
-    [totalItems, itemsPerPage]
-  );
+export const Pagination: React.FC<IPaginationProps> = PatchComponent(
+  "Pagination",
+  ({
+    itemsPerPage,
+    currentPage,
+    totalItems,
+    onChangePage,
+    pagePopupPlacement,
+  }) => {
+    const intl = useIntl();
+    const totalPages = useMemo(
+      () => Math.ceil(totalItems / itemsPerPage),
+      [totalItems, itemsPerPage]
+    );
 
-  const pageButtons = useMemo(() => {
-    if (totalPages >= minPagesForCompact)
-      return (
-        <PageCount
-          totalPages={totalPages}
-          currentPage={currentPage}
-          onChangePage={onChangePage}
-          pagePopupPlacement={pagePopupPlacement}
-        />
-      );
+    const pageButtons = useMemo(() => {
+      if (totalPages >= minPagesForCompact)
+        return (
+          <PageCount
+            totalPages={totalPages}
+            currentPage={currentPage}
+            onChangePage={onChangePage}
+            pagePopupPlacement={pagePopupPlacement}
+          />
+        );
 
-    const pages = [...Array(totalPages).keys()].map((i) => i + 1);
+      const pages = [...Array(totalPages).keys()].map((i) => i + 1);
 
-    return pages.map((page: number) => (
-      <Button
-        variant="secondary"
-        key={page}
-        active={currentPage === page}
-        onClick={() => onChangePage(page)}
-      >
-        <FormattedNumber value={page} />
-      </Button>
-    ));
-  }, [totalPages, currentPage, onChangePage, pagePopupPlacement]);
+      return pages.map((page: number) => (
+        <Button
+          variant="secondary"
+          key={page}
+          active={currentPage === page}
+          onClick={() => onChangePage(page)}
+        >
+          <FormattedNumber value={page} />
+        </Button>
+      ));
+    }, [totalPages, currentPage, onChangePage, pagePopupPlacement]);
 
-  if (totalPages <= 1) return <div />;
+    if (totalPages <= 1) return <div />;
 
-  return (
-    <ButtonGroup className="pagination">
-      <Button
-        variant="secondary"
-        disabled={currentPage === 1}
-        onClick={() => onChangePage(1)}
-        title={intl.formatMessage({ id: "pagination.first" })}
-      >
-        <span>«</span>
-      </Button>
-      <Button
-        variant="secondary"
-        disabled={currentPage === 1}
-        onClick={() => onChangePage(currentPage - 1)}
-        title={intl.formatMessage({ id: "pagination.previous" })}
-      >
-        &lt;
-      </Button>
-      {pageButtons}
-      <Button
-        variant="secondary"
-        disabled={currentPage === totalPages}
-        onClick={() => onChangePage(currentPage + 1)}
-        title={intl.formatMessage({ id: "pagination.next" })}
-      >
-        &gt;
-      </Button>
-      <Button
-        variant="secondary"
-        disabled={currentPage === totalPages}
-        onClick={() => onChangePage(totalPages)}
-        title={intl.formatMessage({ id: "pagination.last" })}
-      >
-        <span>»</span>
-      </Button>
-    </ButtonGroup>
-  );
-};
+    return (
+      <ButtonGroup className="pagination">
+        <Button
+          variant="secondary"
+          disabled={currentPage === 1}
+          onClick={() => onChangePage(1)}
+          title={intl.formatMessage({ id: "pagination.first" })}
+        >
+          <span>«</span>
+        </Button>
+        <Button
+          variant="secondary"
+          disabled={currentPage === 1}
+          onClick={() => onChangePage(currentPage - 1)}
+          title={intl.formatMessage({ id: "pagination.previous" })}
+        >
+          &lt;
+        </Button>
+        {pageButtons}
+        <Button
+          variant="secondary"
+          disabled={currentPage === totalPages}
+          onClick={() => onChangePage(currentPage + 1)}
+          title={intl.formatMessage({ id: "pagination.next" })}
+        >
+          &gt;
+        </Button>
+        <Button
+          variant="secondary"
+          disabled={currentPage === totalPages}
+          onClick={() => onChangePage(totalPages)}
+          title={intl.formatMessage({ id: "pagination.last" })}
+        >
+          <span>»</span>
+        </Button>
+      </ButtonGroup>
+    );
+  }
+);
 
-export const PaginationIndex: React.FC<IPaginationIndexProps> = ({
-  loading,
-  itemsPerPage,
-  currentPage,
-  totalItems,
-  metadataByline,
-}) => {
-  const intl = useIntl();
+export const PaginationIndex: React.FC<IPaginationIndexProps> = PatchComponent(
+  "PaginationIndex",
+  ({ loading, itemsPerPage, currentPage, totalItems, metadataByline }) => {
+    const intl = useIntl();
 
-  if (loading) return null;
+    if (loading) return null;
 
-  // Build the pagination index string
-  const firstItemCount: number = Math.min(
-    (currentPage - 1) * itemsPerPage + 1,
-    totalItems
-  );
-  const lastItemCount: number = Math.min(
-    firstItemCount + (itemsPerPage - 1),
-    totalItems
-  );
-  const indexText: string = `${intl.formatNumber(
-    firstItemCount
-  )}-${intl.formatNumber(lastItemCount)} of ${intl.formatNumber(totalItems)}`;
+    // Build the pagination index string
+    const firstItemCount: number = Math.min(
+      (currentPage - 1) * itemsPerPage + 1,
+      totalItems
+    );
+    const lastItemCount: number = Math.min(
+      firstItemCount + (itemsPerPage - 1),
+      totalItems
+    );
+    const indexText: string = `${intl.formatNumber(
+      firstItemCount
+    )}-${intl.formatNumber(lastItemCount)} of ${intl.formatNumber(totalItems)}`;
 
-  return (
-    <span className="filter-container text-muted paginationIndex center-text">
-      {indexText}
-      <br />
-      {metadataByline}
-    </span>
-  );
-};
+    return (
+      <span className="filter-container text-muted paginationIndex center-text">
+        {indexText}
+        <br />
+        {metadataByline}
+      </span>
+    );
+  }
+);

From 5177f71dbdde25e436df278001c4f316703cbd5e Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Mon, 23 Jun 2025 14:12:07 +1000
Subject: [PATCH 004/405] Fix UI crash in performer -> gallery wall lightbox
 (#5947)

---
 ui/v2.5/src/hooks/Lightbox/hooks.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui/v2.5/src/hooks/Lightbox/hooks.ts b/ui/v2.5/src/hooks/Lightbox/hooks.ts
index 958dc7d41..a0b1f931d 100644
--- a/ui/v2.5/src/hooks/Lightbox/hooks.ts
+++ b/ui/v2.5/src/hooks/Lightbox/hooks.ts
@@ -138,6 +138,7 @@ export const useGalleryLightbox = (id: string, chapters: IChapter[] = []) => {
       });
     else {
       setLightboxState({
+        images: [],
         isLoading: true,
         isVisible: true,
         initialIndex: index,

From 019fe81de952f7c5fd4531631ad0cb12cb8c0a97 Mon Sep 17 00:00:00 2001
From: feederbox826 <144178721+feederbox826@users.noreply.github.com>
Date: Mon, 23 Jun 2025 00:13:01 -0400
Subject: [PATCH 005/405] Update Freeones scraper from CommunityScrapers
 (#5956)

https://github.com/stashapp/CommunityScrapers/commit/1b103ad2d5f0b2f1e123869aeea6123d3325a759

Co-authored-by: feederbox826 <feederbox826@users.noreply.github.com>
---
 pkg/scraper/freeones.go | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkg/scraper/freeones.go b/pkg/scraper/freeones.go
index 4b414541d..96caf2fec 100644
--- a/pkg/scraper/freeones.go
+++ b/pkg/scraper/freeones.go
@@ -108,7 +108,11 @@ xPathScrapers:
       Image:
         selector: //div[contains(@class,'image-container')]//a/img/@src
       Gender:
-        fixed: "Female"
+        selector: //h1/*[1]/*[1]/text()Add commentMore actions
+        postProcess:
+          - replace:
+            - regex: .+ identifies as (.+)
+              with: $1
       DeathDate:
         selector: //div[contains(text(),'Passed away on')]
         postProcess:
@@ -124,7 +128,7 @@ xPathScrapers:
             - regex: \skg
               with: ""
 
-# Last Updated January 2, 2024
+# Last Updated June 22, 2025
 `
 
 func getFreeonesScraper(globalConfig GlobalConfig) scraper {

From e69238307c18ddadd90665b808885e4bd2eb897e Mon Sep 17 00:00:00 2001
From: dogwithakeyboard <128322708+dogwithakeyboard@users.noreply.github.com>
Date: Mon, 23 Jun 2025 22:59:27 +0100
Subject: [PATCH 006/405] add missing property to death date item (#5962)

---
 .../Performers/PerformerDetails/PerformerDetailsPanel.tsx   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerDetailsPanel.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerDetailsPanel.tsx
index e96d464be..d01709287 100644
--- a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerDetailsPanel.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerDetailsPanel.tsx
@@ -94,7 +94,11 @@ export const PerformerDetailsPanel: React.FC<IPerformerDetails> =
           }
           fullWidth={fullWidth}
         />
-        <DetailItem id="death_date" value={performer.death_date} />
+        <DetailItem
+          id="death_date"
+          value={performer.death_date}
+          fullWidth={fullWidth}
+        />
         {performer.country ? (
           <DetailItem
             id="country"

From 4b5424dd51ebd3b0c0d216dec37c3dcfd6ea90d4 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Tue, 24 Jun 2025 08:27:41 +1000
Subject: [PATCH 007/405] Update manual with new patchable components

---
 ui/v2.5/src/docs/en/Manual/UIPluginApi.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ui/v2.5/src/docs/en/Manual/UIPluginApi.md b/ui/v2.5/src/docs/en/Manual/UIPluginApi.md
index 4453dfb10..37c9993ba 100644
--- a/ui/v2.5/src/docs/en/Manual/UIPluginApi.md
+++ b/ui/v2.5/src/docs/en/Manual/UIPluginApi.md
@@ -181,6 +181,8 @@ Returns `void`.
 - `GroupSelect`
 - `GroupSelect.sort`
 - `NumberSetting`
+- `Pagination`
+- `PaginationIndex`
 - `PerformerAppearsWithPanel`
 - `PerformerCard`
 - `PerformerCard.Details`

From 81c3988777264dc922f0b9bc517b3b995090632b Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Tue, 24 Jun 2025 13:01:28 +1000
Subject: [PATCH 008/405] Give bottom pagination bar transparent background
 (#5958)

---
 ui/v2.5/src/components/List/styles.scss | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ui/v2.5/src/components/List/styles.scss b/ui/v2.5/src/components/List/styles.scss
index cc43bbecd..9a719b4b2 100644
--- a/ui/v2.5/src/components/List/styles.scss
+++ b/ui/v2.5/src/components/List/styles.scss
@@ -952,7 +952,7 @@ input[type="range"].zoom-slider {
 }
 
 .pagination-footer {
-  background-color: $body-bg;
+  background-color: transparent;
   bottom: $navbar-height;
   padding: 0.5rem 1rem;
   position: sticky;
@@ -964,5 +964,10 @@ input[type="range"].zoom-slider {
 
   .pagination {
     margin-bottom: 0;
+
+    .btn:disabled {
+      color: #888;
+      opacity: 1;
+    }
   }
 }

From 8d78fd682d250f9ce6ab33b728226d99bb64279f Mon Sep 17 00:00:00 2001
From: damontecres <154766448+damontecres@users.noreply.github.com>
Date: Mon, 23 Jun 2025 23:02:19 -0400
Subject: [PATCH 009/405] Include searching by tag sort name (#5963)

---
 pkg/sqlite/tag.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/sqlite/tag.go b/pkg/sqlite/tag.go
index f690220a7..08337616e 100644
--- a/pkg/sqlite/tag.go
+++ b/pkg/sqlite/tag.go
@@ -607,7 +607,7 @@ func (qb *TagStore) Query(ctx context.Context, tagFilter *models.TagFilterType,
 
 	if q := findFilter.Q; q != nil && *q != "" {
 		query.join(tagAliasesTable, "", "tag_aliases.tag_id = tags.id")
-		searchColumns := []string{"tags.name", "tag_aliases.alias"}
+		searchColumns := []string{"tags.name", "tag_aliases.alias", "tags.sort_name"}
 		query.parseQueryString(searchColumns, *q)
 	}
 

From 704041d5e05be3fa2f04dd867f45b77cf35b212e Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Tue, 24 Jun 2025 13:05:17 +1000
Subject: [PATCH 010/405] Add findFiles and findFile graphql queries (#5941)

* Add findFile and findFiles
* Add parent folder and zip file fields to file graphql types
* Add parent_folder, zip_file fields to Folder graphql type
* Add format to ImageFile type
* Add format filter fields to image/video file filters
---
 gqlgen.yml                               |   2 +
 graphql/schema/schema.graphql            |  10 +
 graphql/schema/types/file.graphql        |  71 +++++-
 graphql/schema/types/filters.graphql     |  71 ++++++
 internal/api/fields.go                   |  23 ++
 internal/api/loaders/dataloaders.go      |  18 ++
 internal/api/loaders/folderloader_gen.go | 224 +++++++++++++++++
 internal/api/models.go                   |  36 +++
 internal/api/resolver.go                 |   8 +
 internal/api/resolver_model_file.go      |  86 +++++--
 internal/api/resolver_model_folder.go    |  20 ++
 internal/api/resolver_query_find_file.go | 120 +++++++++
 pkg/models/file.go                       |  33 ++-
 pkg/models/filter.go                     |  28 +++
 pkg/models/image.go                      |   2 +-
 pkg/models/mocks/FolderReaderWriter.go   |  23 ++
 pkg/models/model_file.go                 |  12 +
 pkg/models/query.go                      |   4 +-
 pkg/models/repository_folder.go          |   1 +
 pkg/models/scene.go                      |   2 +-
 pkg/sqlite/batch.go                      |   2 +-
 pkg/sqlite/criterion_handlers.go         |  11 +
 pkg/sqlite/file.go                       |  81 +++++-
 pkg/sqlite/file_filter.go                | 302 +++++++++++++++++++++++
 pkg/sqlite/file_filter_test.go           | 101 ++++++++
 pkg/sqlite/folder.go                     |  47 ++++
 26 files changed, 1293 insertions(+), 45 deletions(-)
 create mode 100644 internal/api/fields.go
 create mode 100644 internal/api/loaders/folderloader_gen.go
 create mode 100644 internal/api/resolver_model_folder.go
 create mode 100644 internal/api/resolver_query_find_file.go
 create mode 100644 pkg/sqlite/file_filter.go
 create mode 100644 pkg/sqlite/file_filter_test.go

diff --git a/gqlgen.yml b/gqlgen.yml
index d3b8fc67f..b949d44dc 100644
--- a/gqlgen.yml
+++ b/gqlgen.yml
@@ -35,6 +35,8 @@ models:
     model: github.com/stashapp/stash/internal/api.BoolMap
   PluginConfigMap:
     model: github.com/stashapp/stash/internal/api.PluginConfigMap
+  File:
+    model: github.com/stashapp/stash/internal/api.File
   VideoFile:
     fields:
       # override float fields - #1572
diff --git a/graphql/schema/schema.graphql b/graphql/schema/schema.graphql
index 51718aee3..1ca653403 100644
--- a/graphql/schema/schema.graphql
+++ b/graphql/schema/schema.graphql
@@ -6,6 +6,16 @@ type Query {
   findDefaultFilter(mode: FilterMode!): SavedFilter
     @deprecated(reason: "default filter now stored in UI config")
 
+  "Find a file by its id or path"
+  findFile(id: ID, path: String): BaseFile!
+
+  "Queries for Files"
+  findFiles(
+    file_filter: FileFilterType
+    filter: FindFilterType
+    ids: [ID!]
+  ): FindFilesResultType!
+
   "Find a scene by ID or Checksum"
   findScene(id: ID, checksum: String): Scene
   findSceneByHash(input: SceneHashInput!): Scene
diff --git a/graphql/schema/types/file.graphql b/graphql/schema/types/file.graphql
index 8dea777bd..c967c38f2 100644
--- a/graphql/schema/types/file.graphql
+++ b/graphql/schema/types/file.graphql
@@ -7,8 +7,11 @@ type Folder {
   id: ID!
   path: String!
 
-  parent_folder_id: ID
-  zip_file_id: ID
+  parent_folder_id: ID @deprecated(reason: "Use parent_folder instead")
+  zip_file_id: ID @deprecated(reason: "Use zip_file instead")
+
+  parent_folder: Folder!
+  zip_file: BasicFile
 
   mod_time: Time!
 
@@ -21,8 +24,32 @@ interface BaseFile {
   path: String!
   basename: String!
 
-  parent_folder_id: ID!
-  zip_file_id: ID
+  parent_folder_id: ID! @deprecated(reason: "Use parent_folder instead")
+  zip_file_id: ID @deprecated(reason: "Use zip_file instead")
+
+  parent_folder: Folder!
+  zip_file: BasicFile
+
+  mod_time: Time!
+  size: Int64!
+
+  fingerprint(type: String!): String
+  fingerprints: [Fingerprint!]!
+
+  created_at: Time!
+  updated_at: Time!
+}
+
+type BasicFile implements BaseFile {
+  id: ID!
+  path: String!
+  basename: String!
+
+  parent_folder_id: ID! @deprecated(reason: "Use parent_folder instead")
+  zip_file_id: ID @deprecated(reason: "Use zip_file instead")
+
+  parent_folder: Folder!
+  zip_file: BasicFile
 
   mod_time: Time!
   size: Int64!
@@ -39,8 +66,11 @@ type VideoFile implements BaseFile {
   path: String!
   basename: String!
 
-  parent_folder_id: ID!
-  zip_file_id: ID
+  parent_folder_id: ID! @deprecated(reason: "Use parent_folder instead")
+  zip_file_id: ID @deprecated(reason: "Use zip_file instead")
+
+  parent_folder: Folder!
+  zip_file: BasicFile
 
   mod_time: Time!
   size: Int64!
@@ -66,8 +96,11 @@ type ImageFile implements BaseFile {
   path: String!
   basename: String!
 
-  parent_folder_id: ID!
-  zip_file_id: ID
+  parent_folder_id: ID! @deprecated(reason: "Use parent_folder instead")
+  zip_file_id: ID @deprecated(reason: "Use zip_file instead")
+
+  parent_folder: Folder!
+  zip_file: BasicFile
 
   mod_time: Time!
   size: Int64!
@@ -75,6 +108,7 @@ type ImageFile implements BaseFile {
   fingerprint(type: String!): String
   fingerprints: [Fingerprint!]!
 
+  format: String!
   width: Int!
   height: Int!
 
@@ -89,8 +123,11 @@ type GalleryFile implements BaseFile {
   path: String!
   basename: String!
 
-  parent_folder_id: ID!
-  zip_file_id: ID
+  parent_folder_id: ID! @deprecated(reason: "Use parent_folder instead")
+  zip_file_id: ID @deprecated(reason: "Use zip_file instead")
+
+  parent_folder: Folder!
+  zip_file: BasicFile
 
   mod_time: Time!
   size: Int64!
@@ -125,3 +162,17 @@ input FileSetFingerprintsInput {
   "only supplied fingerprint types will be modified"
   fingerprints: [SetFingerprintsInput!]!
 }
+
+type FindFilesResultType {
+  count: Int!
+
+  "Total megapixels of any image files"
+  megapixels: Float!
+  "Total duration in seconds of any video files"
+  duration: Float!
+
+  "Total file size in bytes"
+  size: Int!
+
+  files: [BaseFile!]!
+}
diff --git a/graphql/schema/types/filters.graphql b/graphql/schema/types/filters.graphql
index 14bb8680b..cab47172e 100644
--- a/graphql/schema/types/filters.graphql
+++ b/graphql/schema/types/filters.graphql
@@ -681,6 +681,77 @@ input ImageFilterType {
   tags_filter: TagFilterType
 }
 
+input FileFilterType {
+  AND: FileFilterType
+  OR: FileFilterType
+  NOT: FileFilterType
+
+  path: StringCriterionInput
+  basename: StringCriterionInput
+  dir: StringCriterionInput
+
+  parent_folder: HierarchicalMultiCriterionInput
+
+  "Filter by modification time"
+  mod_time: TimestampCriterionInput
+
+  "Filter files that have an exact match available"
+  duplicated: PHashDuplicationCriterionInput
+
+  "find files based on hash"
+  hashes: [FingerprintFilterInput!]
+
+  video_file_filter: VideoFileFilterInput
+  image_file_filter: ImageFileFilterInput
+
+  scene_count: IntCriterionInput
+  image_count: IntCriterionInput
+  gallery_count: IntCriterionInput
+
+  "Filter by related scenes that meet this criteria"
+  scenes_filter: SceneFilterType
+  "Filter by related images that meet this criteria"
+  images_filter: ImageFilterType
+  "Filter by related galleries that meet this criteria"
+  galleries_filter: GalleryFilterType
+
+  "Filter by creation time"
+  created_at: TimestampCriterionInput
+  "Filter by last update time"
+  updated_at: TimestampCriterionInput
+}
+
+input VideoFileFilterInput {
+  resolution: ResolutionCriterionInput
+  orientation: OrientationCriterionInput
+  framerate: IntCriterionInput
+  bitrate: IntCriterionInput
+  format: StringCriterionInput
+  video_codec: StringCriterionInput
+  audio_codec: StringCriterionInput
+
+  "in seconds"
+  duration: IntCriterionInput
+
+  captions: StringCriterionInput
+
+  interactive: Boolean
+  interactive_speed: IntCriterionInput
+}
+
+input ImageFileFilterInput {
+  format: StringCriterionInput
+  resolution: ResolutionCriterionInput
+  orientation: OrientationCriterionInput
+}
+
+input FingerprintFilterInput {
+  type: String!
+  value: String!
+  "Hamming distance - defaults to 0"
+  distance: Int
+}
+
 enum CriterionModifier {
   "="
   EQUALS
diff --git a/internal/api/fields.go b/internal/api/fields.go
new file mode 100644
index 000000000..5f47ed06f
--- /dev/null
+++ b/internal/api/fields.go
@@ -0,0 +1,23 @@
+package api
+
+import (
+	"context"
+
+	"github.com/99designs/gqlgen/graphql"
+)
+
+type queryFields []string
+
+func collectQueryFields(ctx context.Context) queryFields {
+	fields := graphql.CollectAllFields(ctx)
+	return queryFields(fields)
+}
+
+func (f queryFields) Has(field string) bool {
+	for _, v := range f {
+		if v == field {
+			return true
+		}
+	}
+	return false
+}
diff --git a/internal/api/loaders/dataloaders.go b/internal/api/loaders/dataloaders.go
index 493c353d7..38f72b0a1 100644
--- a/internal/api/loaders/dataloaders.go
+++ b/internal/api/loaders/dataloaders.go
@@ -10,6 +10,7 @@
 //go:generate go run github.com/vektah/dataloaden TagLoader int *github.com/stashapp/stash/pkg/models.Tag
 //go:generate go run github.com/vektah/dataloaden GroupLoader int *github.com/stashapp/stash/pkg/models.Group
 //go:generate go run github.com/vektah/dataloaden FileLoader github.com/stashapp/stash/pkg/models.FileID github.com/stashapp/stash/pkg/models.File
+//go:generate go run github.com/vektah/dataloaden FolderLoader github.com/stashapp/stash/pkg/models.FolderID *github.com/stashapp/stash/pkg/models.Folder
 //go:generate go run github.com/vektah/dataloaden SceneFileIDsLoader int []github.com/stashapp/stash/pkg/models.FileID
 //go:generate go run github.com/vektah/dataloaden ImageFileIDsLoader int []github.com/stashapp/stash/pkg/models.FileID
 //go:generate go run github.com/vektah/dataloaden GalleryFileIDsLoader int []github.com/stashapp/stash/pkg/models.FileID
@@ -62,6 +63,7 @@ type Loaders struct {
 	TagByID    *TagLoader
 	GroupByID  *GroupLoader
 	FileByID   *FileLoader
+	FolderByID *FolderLoader
 }
 
 type Middleware struct {
@@ -117,6 +119,11 @@ func (m Middleware) Middleware(next http.Handler) http.Handler {
 				maxBatch: maxBatch,
 				fetch:    m.fetchFiles(ctx),
 			},
+			FolderByID: &FolderLoader{
+				wait:     wait,
+				maxBatch: maxBatch,
+				fetch:    m.fetchFolders(ctx),
+			},
 			SceneFiles: &SceneFileIDsLoader{
 				wait:     wait,
 				maxBatch: maxBatch,
@@ -279,6 +286,17 @@ func (m Middleware) fetchFiles(ctx context.Context) func(keys []models.FileID) (
 	}
 }
 
+func (m Middleware) fetchFolders(ctx context.Context) func(keys []models.FolderID) ([]*models.Folder, []error) {
+	return func(keys []models.FolderID) (ret []*models.Folder, errs []error) {
+		err := m.Repository.WithDB(ctx, func(ctx context.Context) error {
+			var err error
+			ret, err = m.Repository.Folder.FindMany(ctx, keys)
+			return err
+		})
+		return ret, toErrorSlice(err)
+	}
+}
+
 func (m Middleware) fetchScenesFileIDs(ctx context.Context) func(keys []int) ([][]models.FileID, []error) {
 	return func(keys []int) (ret [][]models.FileID, errs []error) {
 		err := m.Repository.WithDB(ctx, func(ctx context.Context) error {
diff --git a/internal/api/loaders/folderloader_gen.go b/internal/api/loaders/folderloader_gen.go
new file mode 100644
index 000000000..ca2518b82
--- /dev/null
+++ b/internal/api/loaders/folderloader_gen.go
@@ -0,0 +1,224 @@
+// Code generated by github.com/vektah/dataloaden, DO NOT EDIT.
+
+package loaders
+
+import (
+	"sync"
+	"time"
+
+	"github.com/stashapp/stash/pkg/models"
+)
+
+// FolderLoaderConfig captures the config to create a new FolderLoader
+type FolderLoaderConfig struct {
+	// Fetch is a method that provides the data for the loader
+	Fetch func(keys []models.FolderID) ([]*models.Folder, []error)
+
+	// Wait is how long wait before sending a batch
+	Wait time.Duration
+
+	// MaxBatch will limit the maximum number of keys to send in one batch, 0 = not limit
+	MaxBatch int
+}
+
+// NewFolderLoader creates a new FolderLoader given a fetch, wait, and maxBatch
+func NewFolderLoader(config FolderLoaderConfig) *FolderLoader {
+	return &FolderLoader{
+		fetch:    config.Fetch,
+		wait:     config.Wait,
+		maxBatch: config.MaxBatch,
+	}
+}
+
+// FolderLoader batches and caches requests
+type FolderLoader struct {
+	// this method provides the data for the loader
+	fetch func(keys []models.FolderID) ([]*models.Folder, []error)
+
+	// how long to done before sending a batch
+	wait time.Duration
+
+	// this will limit the maximum number of keys to send in one batch, 0 = no limit
+	maxBatch int
+
+	// INTERNAL
+
+	// lazily created cache
+	cache map[models.FolderID]*models.Folder
+
+	// the current batch. keys will continue to be collected until timeout is hit,
+	// then everything will be sent to the fetch method and out to the listeners
+	batch *folderLoaderBatch
+
+	// mutex to prevent races
+	mu sync.Mutex
+}
+
+type folderLoaderBatch struct {
+	keys    []models.FolderID
+	data    []*models.Folder
+	error   []error
+	closing bool
+	done    chan struct{}
+}
+
+// Load a Folder by key, batching and caching will be applied automatically
+func (l *FolderLoader) Load(key models.FolderID) (*models.Folder, error) {
+	return l.LoadThunk(key)()
+}
+
+// LoadThunk returns a function that when called will block waiting for a Folder.
+// This method should be used if you want one goroutine to make requests to many
+// different data loaders without blocking until the thunk is called.
+func (l *FolderLoader) LoadThunk(key models.FolderID) func() (*models.Folder, error) {
+	l.mu.Lock()
+	if it, ok := l.cache[key]; ok {
+		l.mu.Unlock()
+		return func() (*models.Folder, error) {
+			return it, nil
+		}
+	}
+	if l.batch == nil {
+		l.batch = &folderLoaderBatch{done: make(chan struct{})}
+	}
+	batch := l.batch
+	pos := batch.keyIndex(l, key)
+	l.mu.Unlock()
+
+	return func() (*models.Folder, error) {
+		<-batch.done
+
+		var data *models.Folder
+		if pos < len(batch.data) {
+			data = batch.data[pos]
+		}
+
+		var err error
+		// its convenient to be able to return a single error for everything
+		if len(batch.error) == 1 {
+			err = batch.error[0]
+		} else if batch.error != nil {
+			err = batch.error[pos]
+		}
+
+		if err == nil {
+			l.mu.Lock()
+			l.unsafeSet(key, data)
+			l.mu.Unlock()
+		}
+
+		return data, err
+	}
+}
+
+// LoadAll fetches many keys at once. It will be broken into appropriate sized
+// sub batches depending on how the loader is configured
+func (l *FolderLoader) LoadAll(keys []models.FolderID) ([]*models.Folder, []error) {
+	results := make([]func() (*models.Folder, error), len(keys))
+
+	for i, key := range keys {
+		results[i] = l.LoadThunk(key)
+	}
+
+	folders := make([]*models.Folder, len(keys))
+	errors := make([]error, len(keys))
+	for i, thunk := range results {
+		folders[i], errors[i] = thunk()
+	}
+	return folders, errors
+}
+
+// LoadAllThunk returns a function that when called will block waiting for a Folders.
+// This method should be used if you want one goroutine to make requests to many
+// different data loaders without blocking until the thunk is called.
+func (l *FolderLoader) LoadAllThunk(keys []models.FolderID) func() ([]*models.Folder, []error) {
+	results := make([]func() (*models.Folder, error), len(keys))
+	for i, key := range keys {
+		results[i] = l.LoadThunk(key)
+	}
+	return func() ([]*models.Folder, []error) {
+		folders := make([]*models.Folder, len(keys))
+		errors := make([]error, len(keys))
+		for i, thunk := range results {
+			folders[i], errors[i] = thunk()
+		}
+		return folders, errors
+	}
+}
+
+// Prime the cache with the provided key and value. If the key already exists, no change is made
+// and false is returned.
+// (To forcefully prime the cache, clear the key first with loader.clear(key).prime(key, value).)
+func (l *FolderLoader) Prime(key models.FolderID, value *models.Folder) bool {
+	l.mu.Lock()
+	var found bool
+	if _, found = l.cache[key]; !found {
+		// make a copy when writing to the cache, its easy to pass a pointer in from a loop var
+		// and end up with the whole cache pointing to the same value.
+		cpy := *value
+		l.unsafeSet(key, &cpy)
+	}
+	l.mu.Unlock()
+	return !found
+}
+
+// Clear the value at key from the cache, if it exists
+func (l *FolderLoader) Clear(key models.FolderID) {
+	l.mu.Lock()
+	delete(l.cache, key)
+	l.mu.Unlock()
+}
+
+func (l *FolderLoader) unsafeSet(key models.FolderID, value *models.Folder) {
+	if l.cache == nil {
+		l.cache = map[models.FolderID]*models.Folder{}
+	}
+	l.cache[key] = value
+}
+
+// keyIndex will return the location of the key in the batch, if its not found
+// it will add the key to the batch
+func (b *folderLoaderBatch) keyIndex(l *FolderLoader, key models.FolderID) int {
+	for i, existingKey := range b.keys {
+		if key == existingKey {
+			return i
+		}
+	}
+
+	pos := len(b.keys)
+	b.keys = append(b.keys, key)
+	if pos == 0 {
+		go b.startTimer(l)
+	}
+
+	if l.maxBatch != 0 && pos >= l.maxBatch-1 {
+		if !b.closing {
+			b.closing = true
+			l.batch = nil
+			go b.end(l)
+		}
+	}
+
+	return pos
+}
+
+func (b *folderLoaderBatch) startTimer(l *FolderLoader) {
+	time.Sleep(l.wait)
+	l.mu.Lock()
+
+	// we must have hit a batch limit and are already finalizing this batch
+	if b.closing {
+		l.mu.Unlock()
+		return
+	}
+
+	l.batch = nil
+	l.mu.Unlock()
+
+	b.end(l)
+}
+
+func (b *folderLoaderBatch) end(l *FolderLoader) {
+	b.data, b.error = l.fetch(b.keys)
+	close(b.done)
+}
diff --git a/internal/api/models.go b/internal/api/models.go
index d8f4dc63c..1c7346697 100644
--- a/internal/api/models.go
+++ b/internal/api/models.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	"github.com/stashapp/stash/pkg/models"
+	"github.com/stashapp/stash/pkg/sliceutil"
 )
 
 type BaseFile interface {
@@ -27,6 +28,29 @@ func convertVisualFile(f models.File) (VisualFile, error) {
 	}
 }
 
+func convertBaseFile(f models.File) BaseFile {
+	if f == nil {
+		return nil
+	}
+
+	switch f := f.(type) {
+	case BaseFile:
+		return f
+	case *models.VideoFile:
+		return &VideoFile{VideoFile: f}
+	case *models.ImageFile:
+		return &ImageFile{ImageFile: f}
+	case *models.BaseFile:
+		return &BasicFile{BaseFile: f}
+	default:
+		panic("unknown file type")
+	}
+}
+
+func convertBaseFiles(files []models.File) []BaseFile {
+	return sliceutil.Map(files, convertBaseFile)
+}
+
 type GalleryFile struct {
 	*models.BaseFile
 }
@@ -62,3 +86,15 @@ func (ImageFile) IsVisualFile() {}
 func (f *ImageFile) Fingerprints() []models.Fingerprint {
 	return f.ImageFile.Fingerprints
 }
+
+type BasicFile struct {
+	*models.BaseFile
+}
+
+func (BasicFile) IsBaseFile() {}
+
+func (BasicFile) IsVisualFile() {}
+
+func (f *BasicFile) Fingerprints() []models.Fingerprint {
+	return f.BaseFile.Fingerprints
+}
diff --git a/internal/api/resolver.go b/internal/api/resolver.go
index f3097969d..061d0e1a9 100644
--- a/internal/api/resolver.go
+++ b/internal/api/resolver.go
@@ -95,6 +95,12 @@ func (r *Resolver) VideoFile() VideoFileResolver {
 func (r *Resolver) ImageFile() ImageFileResolver {
 	return &imageFileResolver{r}
 }
+func (r *Resolver) BasicFile() BasicFileResolver {
+	return &basicFileResolver{r}
+}
+func (r *Resolver) Folder() FolderResolver {
+	return &folderResolver{r}
+}
 func (r *Resolver) SavedFilter() SavedFilterResolver {
 	return &savedFilterResolver{r}
 }
@@ -125,6 +131,8 @@ type tagResolver struct{ *Resolver }
 type galleryFileResolver struct{ *Resolver }
 type videoFileResolver struct{ *Resolver }
 type imageFileResolver struct{ *Resolver }
+type basicFileResolver struct{ *Resolver }
+type folderResolver struct{ *Resolver }
 type savedFilterResolver struct{ *Resolver }
 type pluginResolver struct{ *Resolver }
 type configResultResolver struct{ *Resolver }
diff --git a/internal/api/resolver_model_file.go b/internal/api/resolver_model_file.go
index 35013cfbd..4b9995311 100644
--- a/internal/api/resolver_model_file.go
+++ b/internal/api/resolver_model_file.go
@@ -1,30 +1,80 @@
 package api
 
-import "context"
+import (
+	"context"
 
-func (r *galleryFileResolver) Fingerprint(ctx context.Context, obj *GalleryFile, type_ string) (*string, error) {
-	fp := obj.BaseFile.Fingerprints.For(type_)
-	if fp != nil {
-		v := fp.Value()
-		return &v, nil
+	"github.com/stashapp/stash/internal/api/loaders"
+	"github.com/stashapp/stash/pkg/models"
+)
+
+func fingerprintResolver(fp models.Fingerprints, type_ string) (*string, error) {
+	fingerprint := fp.For(type_)
+	if fingerprint != nil {
+		value := fingerprint.Value()
+		return &value, nil
 	}
 	return nil, nil
 }
 
+func (r *galleryFileResolver) Fingerprint(ctx context.Context, obj *GalleryFile, type_ string) (*string, error) {
+	return fingerprintResolver(obj.BaseFile.Fingerprints, type_)
+}
+
 func (r *imageFileResolver) Fingerprint(ctx context.Context, obj *ImageFile, type_ string) (*string, error) {
-	fp := obj.ImageFile.Fingerprints.For(type_)
-	if fp != nil {
-		v := fp.Value()
-		return &v, nil
-	}
-	return nil, nil
+	return fingerprintResolver(obj.ImageFile.Fingerprints, type_)
 }
 
 func (r *videoFileResolver) Fingerprint(ctx context.Context, obj *VideoFile, type_ string) (*string, error) {
-	fp := obj.VideoFile.Fingerprints.For(type_)
-	if fp != nil {
-		v := fp.Value()
-		return &v, nil
-	}
-	return nil, nil
+	return fingerprintResolver(obj.VideoFile.Fingerprints, type_)
+}
+
+func (r *basicFileResolver) Fingerprint(ctx context.Context, obj *BasicFile, type_ string) (*string, error) {
+	return fingerprintResolver(obj.BaseFile.Fingerprints, type_)
+}
+
+func (r *galleryFileResolver) ParentFolder(ctx context.Context, obj *GalleryFile) (*models.Folder, error) {
+	return loaders.From(ctx).FolderByID.Load(obj.ParentFolderID)
+}
+
+func (r *imageFileResolver) ParentFolder(ctx context.Context, obj *ImageFile) (*models.Folder, error) {
+	return loaders.From(ctx).FolderByID.Load(obj.ParentFolderID)
+}
+
+func (r *videoFileResolver) ParentFolder(ctx context.Context, obj *VideoFile) (*models.Folder, error) {
+	return loaders.From(ctx).FolderByID.Load(obj.ParentFolderID)
+}
+
+func (r *basicFileResolver) ParentFolder(ctx context.Context, obj *BasicFile) (*models.Folder, error) {
+	return loaders.From(ctx).FolderByID.Load(obj.ParentFolderID)
+}
+
+func zipFileResolver(ctx context.Context, zipFileID *models.FileID) (*BasicFile, error) {
+	if zipFileID == nil {
+		return nil, nil
+	}
+
+	f, err := loaders.From(ctx).FileByID.Load(*zipFileID)
+	if err != nil {
+		return nil, err
+	}
+
+	return &BasicFile{
+		BaseFile: f.Base(),
+	}, nil
+}
+
+func (r *galleryFileResolver) ZipFile(ctx context.Context, obj *GalleryFile) (*BasicFile, error) {
+	return zipFileResolver(ctx, obj.ZipFileID)
+}
+
+func (r *imageFileResolver) ZipFile(ctx context.Context, obj *ImageFile) (*BasicFile, error) {
+	return zipFileResolver(ctx, obj.ZipFileID)
+}
+
+func (r *videoFileResolver) ZipFile(ctx context.Context, obj *VideoFile) (*BasicFile, error) {
+	return zipFileResolver(ctx, obj.ZipFileID)
+}
+
+func (r *basicFileResolver) ZipFile(ctx context.Context, obj *BasicFile) (*BasicFile, error) {
+	return zipFileResolver(ctx, obj.ZipFileID)
 }
diff --git a/internal/api/resolver_model_folder.go b/internal/api/resolver_model_folder.go
new file mode 100644
index 000000000..ee6bbfd05
--- /dev/null
+++ b/internal/api/resolver_model_folder.go
@@ -0,0 +1,20 @@
+package api
+
+import (
+	"context"
+
+	"github.com/stashapp/stash/internal/api/loaders"
+	"github.com/stashapp/stash/pkg/models"
+)
+
+func (r *folderResolver) ParentFolder(ctx context.Context, obj *models.Folder) (*models.Folder, error) {
+	if obj.ParentFolderID == nil {
+		return nil, nil
+	}
+
+	return loaders.From(ctx).FolderByID.Load(*obj.ParentFolderID)
+}
+
+func (r *folderResolver) ZipFile(ctx context.Context, obj *models.Folder) (*BasicFile, error) {
+	return zipFileResolver(ctx, obj.ZipFileID)
+}
diff --git a/internal/api/resolver_query_find_file.go b/internal/api/resolver_query_find_file.go
new file mode 100644
index 000000000..ae53a89b4
--- /dev/null
+++ b/internal/api/resolver_query_find_file.go
@@ -0,0 +1,120 @@
+package api
+
+import (
+	"context"
+	"errors"
+	"strconv"
+
+	"github.com/stashapp/stash/pkg/models"
+	"github.com/stashapp/stash/pkg/sliceutil/stringslice"
+)
+
+func (r *queryResolver) FindFile(ctx context.Context, id *string, path *string) (BaseFile, error) {
+	var ret models.File
+	if err := r.withReadTxn(ctx, func(ctx context.Context) error {
+		qb := r.repository.File
+		var err error
+		switch {
+		case id != nil:
+			idInt, err := strconv.Atoi(*id)
+			if err != nil {
+				return err
+			}
+			var files []models.File
+			files, err = qb.Find(ctx, models.FileID(idInt))
+			if err != nil {
+				return err
+			}
+			if len(files) > 0 {
+				ret = files[0]
+			}
+		case path != nil:
+			ret, err = qb.FindByPath(ctx, *path)
+			if err == nil && ret == nil {
+				return errors.New("file not found")
+			}
+		default:
+			return errors.New("either id or path must be provided")
+		}
+
+		return err
+	}); err != nil {
+		return nil, err
+	}
+
+	return convertBaseFile(ret), nil
+}
+
+func (r *queryResolver) FindFiles(
+	ctx context.Context,
+	fileFilter *models.FileFilterType,
+	filter *models.FindFilterType,
+	ids []string,
+) (ret *FindFilesResultType, err error) {
+	var fileIDs []models.FileID
+	if len(ids) > 0 {
+		fileIDsInt, err := stringslice.StringSliceToIntSlice(ids)
+		if err != nil {
+			return nil, err
+		}
+
+		fileIDs = models.FileIDsFromInts(fileIDsInt)
+	}
+
+	if err := r.withReadTxn(ctx, func(ctx context.Context) error {
+		var files []models.File
+		var err error
+
+		fields := collectQueryFields(ctx)
+		result := &models.FileQueryResult{}
+
+		if len(fileIDs) > 0 {
+			files, err = r.repository.File.Find(ctx, fileIDs...)
+			if err == nil {
+				result.Count = len(files)
+				for _, f := range files {
+					if asVideo, ok := f.(*models.VideoFile); ok {
+						result.TotalDuration += asVideo.Duration
+					}
+					if asImage, ok := f.(*models.ImageFile); ok {
+						result.Megapixels += asImage.Megapixels()
+					}
+
+					result.TotalSize += f.Base().Size
+				}
+			}
+		} else {
+			result, err = r.repository.File.Query(ctx, models.FileQueryOptions{
+				QueryOptions: models.QueryOptions{
+					FindFilter: filter,
+					Count:      fields.Has("count"),
+				},
+				FileFilter:    fileFilter,
+				TotalDuration: fields.Has("duration"),
+				Megapixels:    fields.Has("megapixels"),
+				TotalSize:     fields.Has("size"),
+			})
+			if err == nil {
+				files, err = result.Resolve(ctx)
+			}
+		}
+
+		if err != nil {
+			return err
+		}
+
+		ret = &FindFilesResultType{
+			Count:      result.Count,
+			Files:      convertBaseFiles(files),
+			Duration:   result.TotalDuration,
+			Megapixels: result.Megapixels,
+			Size:       int(result.TotalSize),
+		}
+
+		return nil
+	}); err != nil {
+		return nil, err
+	}
+
+	return ret, nil
+}
diff --git a/pkg/models/file.go b/pkg/models/file.go
index e6ce41d1e..1b77af21a 100644
--- a/pkg/models/file.go
+++ b/pkg/models/file.go
@@ -9,15 +9,34 @@ import (
 type FileQueryOptions struct {
 	QueryOptions
 	FileFilter *FileFilterType
+
+	TotalDuration bool
+	Megapixels    bool
+	TotalSize     bool
 }
 
 type FileFilterType struct {
-	And *FileFilterType `json:"AND"`
-	Or  *FileFilterType `json:"OR"`
-	Not *FileFilterType `json:"NOT"`
+	OperatorFilter[FileFilterType]
 
 	// Filter by path
 	Path *StringCriterionInput `json:"path"`
+
+	Basename        *StringCriterionInput            `json:"basename"`
+	Dir             *StringCriterionInput            `json:"dir"`
+	ParentFolder    *HierarchicalMultiCriterionInput `json:"parent_folder"`
+	ModTime         *TimestampCriterionInput         `json:"mod_time"`
+	Duplicated      *PHashDuplicationCriterionInput  `json:"duplicated"`
+	Hashes          []*FingerprintFilterInput        `json:"hashes"`
+	VideoFileFilter *VideoFileFilterInput            `json:"video_file_filter"`
+	ImageFileFilter *ImageFileFilterInput            `json:"image_file_filter"`
+	SceneCount      *IntCriterionInput               `json:"scene_count"`
+	ImageCount      *IntCriterionInput               `json:"image_count"`
+	GalleryCount    *IntCriterionInput               `json:"gallery_count"`
+	ScenesFilter    *SceneFilterType                 `json:"scenes_filter"`
+	ImagesFilter    *ImageFilterType                 `json:"images_filter"`
+	GalleriesFilter *GalleryFilterType               `json:"galleries_filter"`
+	CreatedAt       *TimestampCriterionInput         `json:"created_at"`
+	UpdatedAt       *TimestampCriterionInput         `json:"updated_at"`
 }
 
 func PathsFileFilter(paths []string) *FileFilterType {
@@ -53,10 +72,10 @@ func PathsFileFilter(paths []string) *FileFilterType {
 }
 
 type FileQueryResult struct {
-	// can't use QueryResult because id type is wrong
-
-	IDs   []FileID
-	Count int
+	QueryResult[FileID]
+	TotalDuration float64
+	Megapixels    float64
+	TotalSize     int64
 
 	getter     FileGetter
 	files      []File
diff --git a/pkg/models/filter.go b/pkg/models/filter.go
index 2d25f6516..97d850a55 100644
--- a/pkg/models/filter.go
+++ b/pkg/models/filter.go
@@ -200,3 +200,31 @@ type CustomFieldCriterionInput struct {
 	Value    []any             `json:"value"`
 	Modifier CriterionModifier `json:"modifier"`
 }
+
+type FingerprintFilterInput struct {
+	Type  string `json:"type"`
+	Value string `json:"value"`
+	// Hamming distance - defaults to 0
+	Distance *int `json:"distance,omitempty"`
+}
+
+type VideoFileFilterInput struct {
+	Format      *StringCriterionInput      `json:"format,omitempty"`
+	Resolution  *ResolutionCriterionInput  `json:"resolution,omitempty"`
+	Orientation *OrientationCriterionInput `json:"orientation,omitempty"`
+	Framerate   *IntCriterionInput         `json:"framerate,omitempty"`
+	Bitrate     *IntCriterionInput         `json:"bitrate,omitempty"`
+	VideoCodec  *StringCriterionInput      `json:"video_codec,omitempty"`
+	AudioCodec  *StringCriterionInput      `json:"audio_codec,omitempty"`
+	// in seconds
+	Duration         *IntCriterionInput    `json:"duration,omitempty"`
+	Captions         *StringCriterionInput `json:"captions,omitempty"`
+	Interactive      *bool                 `json:"interactive,omitempty"`
+	InteractiveSpeed *IntCriterionInput    `json:"interactive_speed,omitempty"`
+}
+
+type ImageFileFilterInput struct {
+	Format      *StringCriterionInput      `json:"format,omitempty"`
+	Resolution  *ResolutionCriterionInput  `json:"resolution,omitempty"`
+	Orientation *OrientationCriterionInput `json:"orientation,omitempty"`
+}
diff --git a/pkg/models/image.go b/pkg/models/image.go
index 370315159..9d2c6f016 100644
--- a/pkg/models/image.go
+++ b/pkg/models/image.go
@@ -106,7 +106,7 @@ type ImageQueryOptions struct {
 }
 
 type ImageQueryResult struct {
-	QueryResult
+	QueryResult[int]
 	Megapixels float64
 	TotalSize  float64
 
diff --git a/pkg/models/mocks/FolderReaderWriter.go b/pkg/models/mocks/FolderReaderWriter.go
index 968bed4ad..020764942 100644
--- a/pkg/models/mocks/FolderReaderWriter.go
+++ b/pkg/models/mocks/FolderReaderWriter.go
@@ -178,6 +178,29 @@ func (_m *FolderReaderWriter) FindByZipFileID(ctx context.Context, zipFileID mod
 	return r0, r1
 }
 
+// FindMany provides a mock function with given fields: ctx, id
+func (_m *FolderReaderWriter) FindMany(ctx context.Context, id []models.FolderID) ([]*models.Folder, error) {
+	ret := _m.Called(ctx, id)
+
+	var r0 []*models.Folder
+	if rf, ok := ret.Get(0).(func(context.Context, []models.FolderID) []*models.Folder); ok {
+		r0 = rf(ctx, id)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).([]*models.Folder)
+		}
+	}
+
+	var r1 error
+	if rf, ok := ret.Get(1).(func(context.Context, []models.FolderID) error); ok {
+		r1 = rf(ctx, id)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
 // Update provides a mock function with given fields: ctx, f
 func (_m *FolderReaderWriter) Update(ctx context.Context, f *models.Folder) error {
 	ret := _m.Called(ctx, f)
diff --git a/pkg/models/model_file.go b/pkg/models/model_file.go
index e9df57990..f6b8bdc51 100644
--- a/pkg/models/model_file.go
+++ b/pkg/models/model_file.go
@@ -79,6 +79,14 @@ func (i FileID) MarshalGQL(w io.Writer) {
 	fmt.Fprint(w, strconv.Quote(i.String()))
 }
 
+func FileIDsFromInts(ids []int) []FileID {
+	ret := make([]FileID, len(ids))
+	for i, id := range ids {
+		ret[i] = FileID(id)
+	}
+	return ret
+}
+
 // DirEntry represents a file or directory in the file system.
 type DirEntry struct {
 	ZipFileID *FileID `json:"zip_file_id"`
@@ -252,6 +260,10 @@ func (f ImageFile) GetHeight() int {
 	return f.Height
 }
 
+func (f ImageFile) Megapixels() float64 {
+	return float64(f.Width*f.Height) / 1e6
+}
+
 func (f ImageFile) GetFormat() string {
 	return f.Format
 }
diff --git a/pkg/models/query.go b/pkg/models/query.go
index 1b2d347b9..a6e15bc4e 100644
--- a/pkg/models/query.go
+++ b/pkg/models/query.go
@@ -5,7 +5,7 @@ type QueryOptions struct {
 	Count      bool
 }
 
-type QueryResult struct {
-	IDs   []int
+type QueryResult[T comparable] struct {
+	IDs   []T
 	Count int
 }
diff --git a/pkg/models/repository_folder.go b/pkg/models/repository_folder.go
index c3f82f529..20c155ead 100644
--- a/pkg/models/repository_folder.go
+++ b/pkg/models/repository_folder.go
@@ -5,6 +5,7 @@ import "context"
 // FolderGetter provides methods to get folders by ID.
 type FolderGetter interface {
 	Find(ctx context.Context, id FolderID) (*Folder, error)
+	FindMany(ctx context.Context, id []FolderID) ([]*Folder, error)
 }
 
 // FolderFinder provides methods to find folders.
diff --git a/pkg/models/scene.go b/pkg/models/scene.go
index c7be343d9..9f28d40ba 100644
--- a/pkg/models/scene.go
+++ b/pkg/models/scene.go
@@ -126,7 +126,7 @@ type SceneQueryOptions struct {
 }
 
 type SceneQueryResult struct {
-	QueryResult
+	QueryResult[int]
 	TotalDuration float64
 	TotalSize     float64
 
diff --git a/pkg/sqlite/batch.go b/pkg/sqlite/batch.go
index 71ad5d354..a59438835 100644
--- a/pkg/sqlite/batch.go
+++ b/pkg/sqlite/batch.go
@@ -3,7 +3,7 @@ package sqlite
 const defaultBatchSize = 1000
 
 // batchExec executes the provided function in batches of the provided size.
-func batchExec(ids []int, batchSize int, fn func(batch []int) error) error {
+func batchExec[T any](ids []T, batchSize int, fn func(batch []T) error) error {
 	for i := 0; i < len(ids); i += batchSize {
 		end := i + batchSize
 		if end > len(ids) {
diff --git a/pkg/sqlite/criterion_handlers.go b/pkg/sqlite/criterion_handlers.go
index 55ff31fca..82b9cfc65 100644
--- a/pkg/sqlite/criterion_handlers.go
+++ b/pkg/sqlite/criterion_handlers.go
@@ -70,6 +70,17 @@ func stringCriterionHandler(c *models.StringCriterionInput, column string) crite
 	}
 }
 
+func joinedStringCriterionHandler(c *models.StringCriterionInput, column string, addJoinFn func(f *filterBuilder)) criterionHandlerFunc {
+	return func(ctx context.Context, f *filterBuilder) {
+		if c != nil {
+			if addJoinFn != nil {
+				addJoinFn(f)
+			}
+			stringCriterionHandler(c, column)(ctx, f)
+		}
+	}
+}
+
 func enumCriterionHandler(modifier models.CriterionModifier, values []string, column string) criterionHandlerFunc {
 	return func(ctx context.Context, f *filterBuilder) {
 		if modifier.IsValid() {
diff --git a/pkg/sqlite/file.go b/pkg/sqlite/file.go
index 6bf6e32b5..ea2084c2c 100644
--- a/pkg/sqlite/file.go
+++ b/pkg/sqlite/file.go
@@ -275,6 +275,43 @@ func (r fileQueryRows) resolve() []models.File {
 	return ret
 }
 
+type fileRepositoryType struct {
+	repository
+	scenes    joinRepository
+	images    joinRepository
+	galleries joinRepository
+}
+
+var (
+	fileRepository = fileRepositoryType{
+		repository: repository{
+			tableName: sceneTable,
+			idColumn:  idColumn,
+		},
+		scenes: joinRepository{
+			repository: repository{
+				tableName: scenesFilesTable,
+				idColumn:  fileIDColumn,
+			},
+			fkColumn: sceneIDColumn,
+		},
+		images: joinRepository{
+			repository: repository{
+				tableName: imagesFilesTable,
+				idColumn:  fileIDColumn,
+			},
+			fkColumn: imageIDColumn,
+		},
+		galleries: joinRepository{
+			repository: repository{
+				tableName: galleriesFilesTable,
+				idColumn:  fileIDColumn,
+			},
+			fkColumn: galleryIDColumn,
+		},
+	}
+)
+
 type FileStore struct {
 	repository
 
@@ -830,9 +867,11 @@ func (qb *FileStore) makeFilter(ctx context.Context, fileFilter *models.FileFilt
 		query.not(qb.makeFilter(ctx, fileFilter.Not))
 	}
 
-	query.handleCriterion(ctx, pathCriterionHandler(fileFilter.Path, "folders.path", "files.basename", nil))
+	filter := filterBuilderFromHandler(ctx, &fileFilterHandler{
+		fileFilter: fileFilter,
+	})
 
-	return query
+	return filter
 }
 
 func (qb *FileStore) Query(ctx context.Context, options models.FileQueryOptions) (*models.FileQueryResult, error) {
@@ -890,7 +929,7 @@ func (qb *FileStore) Query(ctx context.Context, options models.FileQueryOptions)
 }
 
 func (qb *FileStore) queryGroupedFields(ctx context.Context, options models.FileQueryOptions, query queryBuilder) (*models.FileQueryResult, error) {
-	if !options.Count {
+	if !options.Count && !options.TotalDuration && !options.Megapixels && !options.TotalSize {
 		// nothing to do - return empty result
 		return models.NewFileQueryResult(qb), nil
 	}
@@ -898,14 +937,43 @@ func (qb *FileStore) queryGroupedFields(ctx context.Context, options models.File
 	aggregateQuery := qb.newQuery()
 
 	if options.Count {
-		aggregateQuery.addColumn("COUNT(temp.id) as total")
+		aggregateQuery.addColumn("COUNT(DISTINCT temp.id) as total")
+	}
+
+	if options.TotalDuration {
+		query.addJoins(
+			join{
+				table:    videoFileTable,
+				onClause: "files.id = video_files.file_id",
+			},
+		)
+		query.addColumn("COALESCE(video_files.duration, 0) as duration")
+		aggregateQuery.addColumn("COALESCE(SUM(temp.duration), 0) as duration")
+	}
+	if options.Megapixels {
+		query.addJoins(
+			join{
+				table:    imageFileTable,
+				onClause: "files.id = image_files.file_id",
+			},
+		)
+		query.addColumn("COALESCE(image_files.width, 0) * COALESCE(image_files.height, 0) as megapixels")
+		aggregateQuery.addColumn("COALESCE(SUM(temp.megapixels), 0) / 1000000 as megapixels")
+	}
+
+	if options.TotalSize {
+		query.addColumn("COALESCE(files.size, 0) as size")
+		aggregateQuery.addColumn("COALESCE(SUM(temp.size), 0) as size")
 	}
 
 	const includeSortPagination = false
 	aggregateQuery.from = fmt.Sprintf("(%s) as temp", query.toSQL(includeSortPagination))
 
 	out := struct {
-		Total int
+		Total      int
+		Duration   float64
+		Megapixels float64
+		Size       int64
 	}{}
 	if err := qb.repository.queryStruct(ctx, aggregateQuery.toSQL(includeSortPagination), query.args, &out); err != nil {
 		return nil, err
@@ -913,6 +981,9 @@ func (qb *FileStore) queryGroupedFields(ctx context.Context, options models.File
 
 	ret := models.NewFileQueryResult(qb)
 	ret.Count = out.Total
+	ret.Megapixels = out.Megapixels
+	ret.TotalDuration = out.Duration
+	ret.TotalSize = out.Size
 
 	return ret, nil
 }
diff --git a/pkg/sqlite/file_filter.go b/pkg/sqlite/file_filter.go
new file mode 100644
index 000000000..b115fee35
--- /dev/null
+++ b/pkg/sqlite/file_filter.go
@@ -0,0 +1,302 @@
+package sqlite
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/stashapp/stash/pkg/models"
+	"github.com/stashapp/stash/pkg/utils"
+)
+
+type fileFilterHandler struct {
+	fileFilter *models.FileFilterType
+}
+
+func (qb *fileFilterHandler) validate() error {
+	fileFilter := qb.fileFilter
+	if fileFilter == nil {
+		return nil
+	}
+
+	if err := validateFilterCombination(fileFilter.OperatorFilter); err != nil {
+		return err
+	}
+
+	if subFilter := fileFilter.SubFilter(); subFilter != nil {
+		sqb := &fileFilterHandler{fileFilter: subFilter}
+		if err := sqb.validate(); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func (qb *fileFilterHandler) handle(ctx context.Context, f *filterBuilder) {
+	fileFilter := qb.fileFilter
+	if fileFilter == nil {
+		return
+	}
+
+	if err := qb.validate(); err != nil {
+		f.setError(err)
+		return
+	}
+
+	sf := fileFilter.SubFilter()
+	if sf != nil {
+		sub := &fileFilterHandler{sf}
+		handleSubFilter(ctx, sub, f, fileFilter.OperatorFilter)
+	}
+
+	f.handleCriterion(ctx, qb.criterionHandler())
+}
+
+func (qb *fileFilterHandler) criterionHandler() criterionHandler {
+	fileFilter := qb.fileFilter
+	return compoundHandler{
+		&videoFileFilterHandler{
+			filter: fileFilter.VideoFileFilter,
+		},
+		&imageFileFilterHandler{
+			filter: fileFilter.ImageFileFilter,
+		},
+
+		pathCriterionHandler(fileFilter.Path, "folders.path", "files.basename", nil),
+		stringCriterionHandler(fileFilter.Basename, "files.basename"),
+		stringCriterionHandler(fileFilter.Dir, "folders.path"),
+		&timestampCriterionHandler{fileFilter.ModTime, "files.mod_time", nil},
+
+		qb.parentFolderCriterionHandler(fileFilter.ParentFolder),
+
+		qb.sceneCountCriterionHandler(fileFilter.SceneCount),
+		qb.imageCountCriterionHandler(fileFilter.ImageCount),
+		qb.galleryCountCriterionHandler(fileFilter.GalleryCount),
+
+		qb.hashesCriterionHandler(fileFilter.Hashes),
+
+		qb.phashDuplicatedCriterionHandler(fileFilter.Duplicated),
+		&timestampCriterionHandler{fileFilter.CreatedAt, "files.created_at", nil},
+		&timestampCriterionHandler{fileFilter.UpdatedAt, "files.updated_at", nil},
+
+		&relatedFilterHandler{
+			relatedIDCol:   "scenes_files.scene_id",
+			relatedRepo:    sceneRepository.repository,
+			relatedHandler: &sceneFilterHandler{fileFilter.ScenesFilter},
+			joinFn: func(f *filterBuilder) {
+				fileRepository.scenes.innerJoin(f, "", "files.id")
+			},
+		},
+		&relatedFilterHandler{
+			relatedIDCol:   "images_files.image_id",
+			relatedRepo:    imageRepository.repository,
+			relatedHandler: &imageFilterHandler{fileFilter.ImagesFilter},
+			joinFn: func(f *filterBuilder) {
+				fileRepository.images.innerJoin(f, "", "files.id")
+			},
+		},
+		&relatedFilterHandler{
+			relatedIDCol:   "galleries_files.gallery_id",
+			relatedRepo:    galleryRepository.repository,
+			relatedHandler: &galleryFilterHandler{fileFilter.GalleriesFilter},
+			joinFn: func(f *filterBuilder) {
+				fileRepository.galleries.innerJoin(f, "", "files.id")
+			},
+		},
+	}
+}
+
+func (qb *fileFilterHandler) parentFolderCriterionHandler(folder *models.HierarchicalMultiCriterionInput) criterionHandlerFunc {
+	return func(ctx context.Context, f *filterBuilder) {
+		if folder == nil {
+			return
+		}
+
+		folderCopy := *folder
+		switch folderCopy.Modifier {
+		case models.CriterionModifierEquals:
+			folderCopy.Modifier = models.CriterionModifierIncludesAll
+		case models.CriterionModifierNotEquals:
+			folderCopy.Modifier = models.CriterionModifierExcludes
+		}
+
+		hh := hierarchicalMultiCriterionHandlerBuilder{
+			primaryTable: fileTable,
+			foreignTable: folderTable,
+			foreignFK:    "parent_folder_id",
+			parentFK:     "parent_folder_id",
+		}
+
+		hh.handler(&folderCopy)(ctx, f)
+	}
+}
+
+func (qb *fileFilterHandler) sceneCountCriterionHandler(c *models.IntCriterionInput) criterionHandlerFunc {
+	h := countCriterionHandlerBuilder{
+		primaryTable: fileTable,
+		joinTable:    scenesFilesTable,
+		primaryFK:    fileIDColumn,
+	}
+
+	return h.handler(c)
+}
+
+func (qb *fileFilterHandler) imageCountCriterionHandler(c *models.IntCriterionInput) criterionHandlerFunc {
+	h := countCriterionHandlerBuilder{
+		primaryTable: fileTable,
+		joinTable:    imagesFilesTable,
+		primaryFK:    fileIDColumn,
+	}
+
+	return h.handler(c)
+}
+
+func (qb *fileFilterHandler) galleryCountCriterionHandler(c *models.IntCriterionInput) criterionHandlerFunc {
+	h := countCriterionHandlerBuilder{
+		primaryTable: fileTable,
+		joinTable:    galleriesFilesTable,
+		primaryFK:    fileIDColumn,
+	}
+
+	return h.handler(c)
+}
+
+func (qb *fileFilterHandler) phashDuplicatedCriterionHandler(duplicatedFilter *models.PHashDuplicationCriterionInput) criterionHandlerFunc {
+	return func(ctx context.Context, f *filterBuilder) {
+		// TODO: Wishlist item: Implement Distance matching
+		if duplicatedFilter != nil {
+			var v string
+			if *duplicatedFilter.Duplicated {
+				v = ">"
+			} else {
+				v = "="
+			}
+
+			f.addInnerJoin("(SELECT file_id FROM files_fingerprints INNER JOIN (SELECT fingerprint FROM files_fingerprints WHERE type = 'phash' GROUP BY fingerprint HAVING COUNT (fingerprint) "+v+" 1) dupes on files_fingerprints.fingerprint = dupes.fingerprint)", "scph", "files.id = scph.file_id")
+		}
+	}
+}
+
+func (qb *fileFilterHandler) hashesCriterionHandler(hashes []*models.FingerprintFilterInput) criterionHandlerFunc {
+	return func(ctx context.Context, f *filterBuilder) {
+		// TODO - this won't work for AND/OR combinations
+		for i, hash := range hashes {
+			t := fmt.Sprintf("file_fingerprints_%d", i)
+			f.addLeftJoin(fingerprintTable, t, fmt.Sprintf("files.id = %s.file_id AND %s.type = ?", t, t), hash.Type)
+
+			value, _ := utils.StringToPhash(hash.Value)
+			distance := 0
+			if hash.Distance != nil {
+				distance = *hash.Distance
+			}
+
+			if distance > 0 {
+				// needed to avoid a type mismatch
+				f.addWhere(fmt.Sprintf("typeof(%s.fingerprint) = 'integer'", t))
+				f.addWhere(fmt.Sprintf("phash_distance(%s.fingerprint, ?) < ?", t), value, distance)
+			} else {
+				// use the default handler
+				intCriterionHandler(&models.IntCriterionInput{
+					Value:    int(value),
+					Modifier: models.CriterionModifierEquals,
+				}, t+".fingerprint", nil)(ctx, f)
+			}
+		}
+	}
+}
+
+type videoFileFilterHandler struct {
+	filter *models.VideoFileFilterInput
+}
+
+func (qb *videoFileFilterHandler) handle(ctx context.Context, f *filterBuilder) {
+	videoFileFilter := qb.filter
+	if videoFileFilter == nil {
+		return
+	}
+	f.handleCriterion(ctx, qb.criterionHandler())
+}
+
+func (qb *videoFileFilterHandler) criterionHandler() criterionHandler {
+	videoFileFilter := qb.filter
+	return compoundHandler{
+		joinedStringCriterionHandler(videoFileFilter.Format, "video_files.format", qb.addVideoFilesTable),
+		floatIntCriterionHandler(videoFileFilter.Duration, "video_files.duration", qb.addVideoFilesTable),
+		resolutionCriterionHandler(videoFileFilter.Resolution, "video_files.height", "video_files.width", qb.addVideoFilesTable),
+		orientationCriterionHandler(videoFileFilter.Orientation, "video_files.height", "video_files.width", qb.addVideoFilesTable),
+		floatIntCriterionHandler(videoFileFilter.Framerate, "ROUND(video_files.frame_rate)", qb.addVideoFilesTable),
+		intCriterionHandler(videoFileFilter.Bitrate, "video_files.bit_rate", qb.addVideoFilesTable),
+		qb.codecCriterionHandler(videoFileFilter.VideoCodec, "video_files.video_codec", qb.addVideoFilesTable),
+		qb.codecCriterionHandler(videoFileFilter.AudioCodec, "video_files.audio_codec", qb.addVideoFilesTable),
+
+		boolCriterionHandler(videoFileFilter.Interactive, "video_files.interactive", qb.addVideoFilesTable),
+		intCriterionHandler(videoFileFilter.InteractiveSpeed, "video_files.interactive_speed", qb.addVideoFilesTable),
+
+		qb.captionCriterionHandler(videoFileFilter.Captions),
+	}
+}
+
+func (qb *videoFileFilterHandler) addVideoFilesTable(f *filterBuilder) {
+	f.addLeftJoin(videoFileTable, "", "video_files.file_id = files.id")
+}
+
+func (qb *videoFileFilterHandler) codecCriterionHandler(codec *models.StringCriterionInput, codecColumn string, addJoinFn func(f *filterBuilder)) criterionHandlerFunc {
+	return func(ctx context.Context, f *filterBuilder) {
+		if codec != nil {
+			if addJoinFn != nil {
+				addJoinFn(f)
+			}
+
+			stringCriterionHandler(codec, codecColumn)(ctx, f)
+		}
+	}
+}
+
+func (qb *videoFileFilterHandler) captionCriterionHandler(captions *models.StringCriterionInput) criterionHandlerFunc {
+	h := stringListCriterionHandlerBuilder{
+		primaryTable: sceneTable,
+		primaryFK:    sceneIDColumn,
+		joinTable:    videoCaptionsTable,
+		stringColumn: captionCodeColumn,
+		addJoinTable: func(f *filterBuilder) {
+			f.addLeftJoin(videoCaptionsTable, "", "video_captions.file_id = files.id")
+		},
+		excludeHandler: func(f *filterBuilder, criterion *models.StringCriterionInput) {
+			excludeClause := `files.id NOT IN (
+				SELECT files.id from files 
+				INNER JOIN video_captions on video_captions.file_id = files.id 
+				WHERE video_captions.language_code LIKE ?
+			)`
+			f.addWhere(excludeClause, criterion.Value)
+
+			// TODO - should we also exclude null values?
+		},
+	}
+
+	return h.handler(captions)
+}
+
+type imageFileFilterHandler struct {
+	filter *models.ImageFileFilterInput
+}
+
+func (qb *imageFileFilterHandler) handle(ctx context.Context, f *filterBuilder) {
+	ff := qb.filter
+	if ff == nil {
+		return
+	}
+	f.handleCriterion(ctx, qb.criterionHandler())
+}
+
+func (qb *imageFileFilterHandler) criterionHandler() criterionHandler {
+	ff := qb.filter
+	return compoundHandler{
+		joinedStringCriterionHandler(ff.Format, "image_files.format", qb.addImageFilesTable),
+		resolutionCriterionHandler(ff.Resolution, "image_files.height", "image_files.width", qb.addImageFilesTable),
+		orientationCriterionHandler(ff.Orientation, "image_files.height", "image_files.width", qb.addImageFilesTable),
+	}
+}
+
+func (qb *imageFileFilterHandler) addImageFilesTable(f *filterBuilder) {
+	f.addLeftJoin(imageFileTable, "", "image_files.file_id = files.id")
+}
diff --git a/pkg/sqlite/file_filter_test.go b/pkg/sqlite/file_filter_test.go
new file mode 100644
index 000000000..7bc6f3e6b
--- /dev/null
+++ b/pkg/sqlite/file_filter_test.go
@@ -0,0 +1,101 @@
+//go:build integration
+// +build integration
+
+package sqlite_test
+
+import (
+	"context"
+	"strconv"
+	"testing"
+
+	"github.com/stashapp/stash/pkg/models"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestFileQuery(t *testing.T) {
+	tests := []struct {
+		name        string
+		findFilter  *models.FindFilterType
+		filter      *models.FileFilterType
+		includeIdxs []int
+		includeIDs  []int
+		excludeIdxs []int
+		wantErr     bool
+	}{
+		{
+			name: "path",
+			filter: &models.FileFilterType{
+				Path: &models.StringCriterionInput{
+					Value:    getPrefixedStringValue("file", fileIdxStartVideoFiles, "basename"),
+					Modifier: models.CriterionModifierIncludes,
+				},
+			},
+			includeIdxs: []int{fileIdxStartVideoFiles},
+			excludeIdxs: []int{fileIdxStartImageFiles},
+		},
+		{
+			name: "basename",
+			filter: &models.FileFilterType{
+				Basename: &models.StringCriterionInput{
+					Value:    getPrefixedStringValue("file", fileIdxStartVideoFiles, "basename"),
+					Modifier: models.CriterionModifierIncludes,
+				},
+			},
+			includeIdxs: []int{fileIdxStartVideoFiles},
+			excludeIdxs: []int{fileIdxStartImageFiles},
+		},
+		{
+			name: "dir",
+			filter: &models.FileFilterType{
+				Path: &models.StringCriterionInput{
+					Value:    folderPaths[folderIdxWithSceneFiles],
+					Modifier: models.CriterionModifierIncludes,
+				},
+			},
+			includeIDs:  []int{int(sceneFileIDs[sceneIdxWithGroup])},
+			excludeIdxs: []int{fileIdxStartImageFiles},
+		},
+		{
+			name: "parent folder",
+			filter: &models.FileFilterType{
+				ParentFolder: &models.HierarchicalMultiCriterionInput{
+					Value: []string{
+						strconv.Itoa(int(folderIDs[folderIdxWithSceneFiles])),
+					},
+					Modifier: models.CriterionModifierIncludes,
+				},
+			},
+			includeIDs:  []int{int(sceneFileIDs[sceneIdxWithGroup])},
+			excludeIdxs: []int{fileIdxStartImageFiles},
+		},
+		// TODO - add more tests for other file filters
+	}
+
+	for _, tt := range tests {
+		runWithRollbackTxn(t, tt.name, func(t *testing.T, ctx context.Context) {
+			assert := assert.New(t)
+
+			results, err := db.File.Query(ctx, models.FileQueryOptions{
+				FileFilter: tt.filter,
+				QueryOptions: models.QueryOptions{
+					FindFilter: tt.findFilter,
+				},
+			})
+			if (err != nil) != tt.wantErr {
+				t.Errorf("SceneStore.Query() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+
+			include := indexesToIDs(sceneIDs, tt.includeIdxs)
+			include = append(include, tt.includeIDs...)
+			exclude := indexesToIDs(sceneIDs, tt.excludeIdxs)
+
+			for _, i := range include {
+				assert.Contains(results.IDs, models.FileID(i))
+			}
+			for _, e := range exclude {
+				assert.NotContains(results.IDs, models.FileID(e))
+			}
+		})
+	}
+}
diff --git a/pkg/sqlite/folder.go b/pkg/sqlite/folder.go
index 4cf632d49..f90a578bd 100644
--- a/pkg/sqlite/folder.go
+++ b/pkg/sqlite/folder.go
@@ -6,6 +6,7 @@ import (
 	"errors"
 	"fmt"
 	"path/filepath"
+	"slices"
 
 	"github.com/doug-martin/goqu/v9"
 	"github.com/doug-martin/goqu/v9/exp"
@@ -225,6 +226,52 @@ func (qb *FolderStore) Find(ctx context.Context, id models.FolderID) (*models.Fo
 	return ret, nil
 }
 
+// FindByIDs finds multiple folders by their IDs.
+// No check is made to see if the folders exist, and the order of the returned folders
+// is not guaranteed to be the same as the order of the input IDs.
+func (qb *FolderStore) FindByIDs(ctx context.Context, ids []models.FolderID) ([]*models.Folder, error) {
+	folders := make([]*models.Folder, 0, len(ids))
+
+	table := qb.table()
+	if err := batchExec(ids, defaultBatchSize, func(batch []models.FolderID) error {
+		q := qb.selectDataset().Prepared(true).Where(table.Col(idColumn).In(batch))
+		unsorted, err := qb.getMany(ctx, q)
+		if err != nil {
+			return err
+		}
+
+		folders = append(folders, unsorted...)
+
+		return nil
+	}); err != nil {
+		return nil, err
+	}
+
+	return folders, nil
+}
+
+func (qb *FolderStore) FindMany(ctx context.Context, ids []models.FolderID) ([]*models.Folder, error) {
+	folders := make([]*models.Folder, len(ids))
+
+	unsorted, err := qb.FindByIDs(ctx, ids)
+	if err != nil {
+		return nil, err
+	}
+
+	for _, s := range unsorted {
+		i := slices.Index(ids, s.ID)
+		folders[i] = s
+	}
+
+	for i := range folders {
+		if folders[i] == nil {
+			return nil, fmt.Errorf("folder with id %d not found", ids[i])
+		}
+	}
+
+	return folders, nil
+}
+
 func (qb *FolderStore) FindByPath(ctx context.Context, p string) (*models.Folder, error) {
 	q := qb.selectDataset().Prepared(true).Where(qb.table().Col("path").Eq(p))
 

From 27bc6c8fca4515f3fbb208e227f5667a59105d6a Mon Sep 17 00:00:00 2001
From: DogmaDragon <103123951+DogmaDragon@users.noreply.github.com>
Date: Thu, 26 Jun 2025 00:33:55 +0300
Subject: [PATCH 011/405] Update captions documentation (#5967)

* Update captions documentation to clarify file location and naming conventions
* Clarify naming convention
---
 ui/v2.5/src/docs/en/Manual/Captions.md | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/ui/v2.5/src/docs/en/Manual/Captions.md b/ui/v2.5/src/docs/en/Manual/Captions.md
index e52fc54bb..df2bee8bc 100644
--- a/ui/v2.5/src/docs/en/Manual/Captions.md
+++ b/ui/v2.5/src/docs/en/Manual/Captions.md
@@ -2,15 +2,17 @@
 
 Stash supports captioning with SRT and VTT files.
 
-These files need to be named as follows:
+Captions will only be detected if they are located in the same folder as the corresponding scene file.
+
+Ensure the caption files follow these naming conventions:
 
 ## Scene
 
-- {scene_name}.{language_code}.ext
-- {scene_name}.ext
+- {scene_file_name}.{language_code}.ext
+- {scene_file_name}.ext
 
 Where `{language_code}` is defined by the [ISO-6399-1](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes) (2 letters) standard and `ext` is the file extension. Captions files without a language code will be labeled as Unknown in the video player but will work fine.
 
 Scenes with captions can be filtered with the `captions` criterion.
 
-**Note:** If the caption file was added after the scene was initially added during scan you will need to run a Selective Scan task for it to show up. 
+**Note:** If the caption file was added after the scene was initially added during scan, you will need to run a Selective Scan task for it to show up.

From d0a7b09bf3c23a422b26731f101da5b6db018009 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Thu, 26 Jun 2025 09:17:22 +1000
Subject: [PATCH 012/405] Scene list toolbar (#5938)

* Add sticky query toolbar to scenes page
* Filter button accept count instead of filter
* Add play button
* Add create button functionality. Remove new scene button from navbar
* Separate toolbar into component
* Separate sort by select component
* Don't show filter tags control if no criteria
* Add utility setter methods to ListFilterModel
* Add results header with display options
* Use css for filter tag styling
* Add className to OperationDropdown and Item
* Increase size of sidebar controls on mobile
---
 ui/v2.5/src/components/List/FilterTags.tsx    |   6 +-
 .../components/List/Filters/FilterButton.tsx  |  16 +-
 .../components/List/Filters/FilterSidebar.tsx |  26 +-
 ui/v2.5/src/components/List/ListFilter.tsx    | 171 ++++----
 .../components/List/ListOperationButtons.tsx  |  26 +-
 ui/v2.5/src/components/List/styles.scss       |  38 +-
 ui/v2.5/src/components/MainNavbar.tsx         |   1 -
 ui/v2.5/src/components/Scenes/SceneList.tsx   | 384 +++++++++++++++---
 ui/v2.5/src/components/Scenes/styles.scss     |  89 ++++
 ui/v2.5/src/components/Shared/styles.scss     |   7 +-
 ui/v2.5/src/index.scss                        |  15 +-
 ui/v2.5/src/locales/en-GB.json                |   6 +-
 .../src/models/list-filter/filter-options.ts  |   2 +-
 ui/v2.5/src/models/list-filter/filter.ts      |  28 ++
 14 files changed, 642 insertions(+), 173 deletions(-)

diff --git a/ui/v2.5/src/components/List/FilterTags.tsx b/ui/v2.5/src/components/List/FilterTags.tsx
index a384f05ca..b690f8781 100644
--- a/ui/v2.5/src/components/List/FilterTags.tsx
+++ b/ui/v2.5/src/components/List/FilterTags.tsx
@@ -101,8 +101,12 @@ export const FilterTags: React.FC<IFilterTagsProps> = ({
     );
   }
 
+  if (criteria.length === 0) {
+    return null;
+  }
+
   return (
-    <div className="d-flex justify-content-center mb-2 wrap-tags filter-tags">
+    <div className="wrap-tags filter-tags">
       {criteria.map(renderFilterTags)}
       {criteria.length >= 3 && (
         <Button
diff --git a/ui/v2.5/src/components/List/Filters/FilterButton.tsx b/ui/v2.5/src/components/List/Filters/FilterButton.tsx
index b92ddcf0d..63e026df2 100644
--- a/ui/v2.5/src/components/List/Filters/FilterButton.tsx
+++ b/ui/v2.5/src/components/List/Filters/FilterButton.tsx
@@ -1,28 +1,32 @@
-import React, { useMemo } from "react";
+import React from "react";
 import { Badge, Button } from "react-bootstrap";
-import { ListFilterModel } from "src/models/list-filter/filter";
 import { faFilter } from "@fortawesome/free-solid-svg-icons";
 import { Icon } from "src/components/Shared/Icon";
 import { useIntl } from "react-intl";
 
 interface IFilterButtonProps {
-  filter: ListFilterModel;
+  count?: number;
   onClick: () => void;
+  title?: string;
 }
 
 export const FilterButton: React.FC<IFilterButtonProps> = ({
-  filter,
+  count = 0,
   onClick,
+  title,
 }) => {
   const intl = useIntl();
-  const count = useMemo(() => filter.count(), [filter]);
+
+  if (!title) {
+    title = intl.formatMessage({ id: "search_filter.edit_filter" });
+  }
 
   return (
     <Button
       variant="secondary"
       className="filter-button"
       onClick={onClick}
-      title={intl.formatMessage({ id: "search_filter.edit_filter" })}
+      title={title}
     >
       <Icon icon={faFilter} />
       {count ? (
diff --git a/ui/v2.5/src/components/List/Filters/FilterSidebar.tsx b/ui/v2.5/src/components/List/Filters/FilterSidebar.tsx
index e9bdd6647..0ff201f86 100644
--- a/ui/v2.5/src/components/List/Filters/FilterSidebar.tsx
+++ b/ui/v2.5/src/components/List/Filters/FilterSidebar.tsx
@@ -1,29 +1,22 @@
 import React, { useEffect } from "react";
 import { FormattedMessage } from "react-intl";
-import { SidebarSection, SidebarToolbar } from "src/components/Shared/Sidebar";
+import { SidebarSection } from "src/components/Shared/Sidebar";
 import { ListFilterModel } from "src/models/list-filter/filter";
-import { FilterButton } from "./FilterButton";
 import { SearchTermInput } from "../ListFilter";
 import { SidebarSavedFilterList } from "../SavedFilterList";
 import { View } from "../views";
 import useFocus from "src/utils/focus";
 import ScreenUtils from "src/utils/screen";
 import Mousetrap from "mousetrap";
-
-export const FilteredSidebarToolbar: React.FC<{
-  onClose?: () => void;
-}> = ({ onClose, children }) => {
-  return <SidebarToolbar onClose={onClose}>{children}</SidebarToolbar>;
-};
+import { Button } from "react-bootstrap";
 
 export const FilteredSidebarHeader: React.FC<{
   sidebarOpen: boolean;
-  onClose?: () => void;
   showEditFilter: () => void;
   filter: ListFilterModel;
   setFilter: (filter: ListFilterModel) => void;
   view?: View;
-}> = ({ sidebarOpen, onClose, showEditFilter, filter, setFilter, view }) => {
+}> = ({ sidebarOpen, showEditFilter, filter, setFilter, view }) => {
   const focus = useFocus();
   const [, setFocus] = focus;
 
@@ -37,15 +30,24 @@ export const FilteredSidebarHeader: React.FC<{
 
   return (
     <>
-      <FilteredSidebarToolbar onClose={onClose} />
       <div className="sidebar-search-container">
         <SearchTermInput
           filter={filter}
           onFilterUpdate={setFilter}
           focus={focus}
         />
-        <FilterButton onClick={() => showEditFilter()} filter={filter} />
       </div>
+
+      <div>
+        <Button
+          className="edit-filter-button"
+          size="sm"
+          onClick={() => showEditFilter()}
+        >
+          <FormattedMessage id="search_filter.edit_filter" />
+        </Button>
+      </div>
+
       <SidebarSection
         className="sidebar-saved-filters"
         text={<FormattedMessage id="search_filter.saved_filters" />}
diff --git a/ui/v2.5/src/components/List/ListFilter.tsx b/ui/v2.5/src/components/List/ListFilter.tsx
index 4933c7e75..99bae365e 100644
--- a/ui/v2.5/src/components/List/ListFilter.tsx
+++ b/ui/v2.5/src/components/List/ListFilter.tsx
@@ -36,6 +36,7 @@ import { useDebounce } from "src/hooks/debounce";
 import { View } from "./views";
 import { ClearableInput } from "../Shared/ClearableInput";
 import { useStopWheelScroll } from "src/utils/form";
+import { ISortByOption } from "src/models/list-filter/filter-options";
 
 export function useDebouncedSearchInput(
   filter: ListFilterModel,
@@ -230,6 +231,94 @@ export const PageSizeSelector: React.FC<{
   );
 };
 
+export const SortBySelect: React.FC<{
+  className?: string;
+  sortBy: string | undefined;
+  sortDirection: SortDirectionEnum;
+  options: ISortByOption[];
+  onChangeSortBy: (eventKey: string | null) => void;
+  onChangeSortDirection: () => void;
+  onReshuffleRandomSort: () => void;
+}> = ({
+  className,
+  sortBy,
+  sortDirection,
+  options,
+  onChangeSortBy,
+  onChangeSortDirection,
+  onReshuffleRandomSort,
+}) => {
+  const intl = useIntl();
+
+  const currentSortBy = options.find((o) => o.value === sortBy);
+
+  function renderSortByOptions() {
+    return options
+      .map((o) => {
+        return {
+          message: intl.formatMessage({ id: o.messageID }),
+          value: o.value,
+        };
+      })
+      .sort((a, b) => a.message.localeCompare(b.message))
+      .map((option) => (
+        <Dropdown.Item
+          onSelect={onChangeSortBy}
+          key={option.value}
+          className="bg-secondary text-white"
+          eventKey={option.value}
+        >
+          {option.message}
+        </Dropdown.Item>
+      ));
+  }
+
+  return (
+    <Dropdown as={ButtonGroup} className={className}>
+      <InputGroup.Prepend>
+        <Dropdown.Toggle variant="secondary">
+          {currentSortBy
+            ? intl.formatMessage({ id: currentSortBy.messageID })
+            : ""}
+        </Dropdown.Toggle>
+      </InputGroup.Prepend>
+      <Dropdown.Menu className="bg-secondary text-white">
+        {renderSortByOptions()}
+      </Dropdown.Menu>
+      <OverlayTrigger
+        overlay={
+          <Tooltip id="sort-direction-tooltip">
+            {sortDirection === SortDirectionEnum.Asc
+              ? intl.formatMessage({ id: "ascending" })
+              : intl.formatMessage({ id: "descending" })}
+          </Tooltip>
+        }
+      >
+        <Button variant="secondary" onClick={onChangeSortDirection}>
+          <Icon
+            icon={
+              sortDirection === SortDirectionEnum.Asc ? faCaretUp : faCaretDown
+            }
+          />
+        </Button>
+      </OverlayTrigger>
+      {sortBy === "random" && (
+        <OverlayTrigger
+          overlay={
+            <Tooltip id="sort-reshuffle-tooltip">
+              {intl.formatMessage({ id: "actions.reshuffle" })}
+            </Tooltip>
+          }
+        >
+          <Button variant="secondary" onClick={onReshuffleRandomSort}>
+            <Icon icon={faRandom} />
+          </Button>
+        </OverlayTrigger>
+      )}
+    </Dropdown>
+  );
+};
+
 interface IListFilterProps {
   onFilterUpdate: (newFilter: ListFilterModel) => void;
   filter: ListFilterModel;
@@ -247,8 +336,6 @@ export const ListFilter: React.FC<IListFilterProps> = ({
 }) => {
   const filterOptions = filter.options;
 
-  const intl = useIntl();
-
   useEffect(() => {
     Mousetrap.bind("r", () => onReshuffleRandomSort());
 
@@ -289,32 +376,7 @@ export const ListFilter: React.FC<IListFilterProps> = ({
     onFilterUpdate(newFilter);
   }
 
-  function renderSortByOptions() {
-    return filterOptions.sortByOptions
-      .map((o) => {
-        return {
-          message: intl.formatMessage({ id: o.messageID }),
-          value: o.value,
-        };
-      })
-      .sort((a, b) => a.message.localeCompare(b.message))
-      .map((option) => (
-        <Dropdown.Item
-          onSelect={onChangeSortBy}
-          key={option.value}
-          className="bg-secondary text-white"
-          eventKey={option.value}
-        >
-          {option.message}
-        </Dropdown.Item>
-      ));
-  }
-
   function render() {
-    const currentSortBy = filterOptions.sortByOptions.find(
-      (o) => o.value === filter.sortBy
-    );
-
     return (
       <>
         {!withSidebar && (
@@ -342,56 +404,21 @@ export const ListFilter: React.FC<IListFilterProps> = ({
             >
               <FilterButton
                 onClick={() => openFilterDialog()}
-                filter={filter}
+                count={filter.count()}
               />
             </OverlayTrigger>
           </ButtonGroup>
         )}
 
-        <Dropdown as={ButtonGroup} className="mr-2">
-          <InputGroup.Prepend>
-            <Dropdown.Toggle variant="secondary">
-              {currentSortBy
-                ? intl.formatMessage({ id: currentSortBy.messageID })
-                : ""}
-            </Dropdown.Toggle>
-          </InputGroup.Prepend>
-          <Dropdown.Menu className="bg-secondary text-white">
-            {renderSortByOptions()}
-          </Dropdown.Menu>
-          <OverlayTrigger
-            overlay={
-              <Tooltip id="sort-direction-tooltip">
-                {filter.sortDirection === SortDirectionEnum.Asc
-                  ? intl.formatMessage({ id: "ascending" })
-                  : intl.formatMessage({ id: "descending" })}
-              </Tooltip>
-            }
-          >
-            <Button variant="secondary" onClick={onChangeSortDirection}>
-              <Icon
-                icon={
-                  filter.sortDirection === SortDirectionEnum.Asc
-                    ? faCaretUp
-                    : faCaretDown
-                }
-              />
-            </Button>
-          </OverlayTrigger>
-          {filter.sortBy === "random" && (
-            <OverlayTrigger
-              overlay={
-                <Tooltip id="sort-reshuffle-tooltip">
-                  {intl.formatMessage({ id: "actions.reshuffle" })}
-                </Tooltip>
-              }
-            >
-              <Button variant="secondary" onClick={onReshuffleRandomSort}>
-                <Icon icon={faRandom} />
-              </Button>
-            </OverlayTrigger>
-          )}
-        </Dropdown>
+        <SortBySelect
+          className="mr-2"
+          sortBy={filter.sortBy}
+          sortDirection={filter.sortDirection}
+          options={filterOptions.sortByOptions}
+          onChangeSortBy={onChangeSortBy}
+          onChangeSortDirection={onChangeSortDirection}
+          onReshuffleRandomSort={onReshuffleRandomSort}
+        />
 
         <PageSizeSelector
           pageSize={filter.itemsPerPage}
diff --git a/ui/v2.5/src/components/List/ListOperationButtons.tsx b/ui/v2.5/src/components/List/ListOperationButtons.tsx
index 8ea21df98..6bb31339a 100644
--- a/ui/v2.5/src/components/List/ListOperationButtons.tsx
+++ b/ui/v2.5/src/components/List/ListOperationButtons.tsx
@@ -15,14 +15,17 @@ import {
   faPencilAlt,
   faTrash,
 } from "@fortawesome/free-solid-svg-icons";
+import cx from "classnames";
 
-export const OperationDropdown: React.FC<PropsWithChildren<{}>> = ({
-  children,
-}) => {
+export const OperationDropdown: React.FC<
+  PropsWithChildren<{
+    className?: string;
+  }>
+> = ({ className, children }) => {
   if (!children) return null;
 
   return (
-    <Dropdown as={ButtonGroup}>
+    <Dropdown className={className} as={ButtonGroup}>
       <Dropdown.Toggle variant="secondary" id="more-menu">
         <Icon icon={faEllipsisH} />
       </Dropdown.Toggle>
@@ -33,6 +36,21 @@ export const OperationDropdown: React.FC<PropsWithChildren<{}>> = ({
   );
 };
 
+export const OperationDropdownItem: React.FC<{
+  text: string;
+  onClick: () => void;
+  className?: string;
+}> = ({ text, onClick, className }) => {
+  return (
+    <Dropdown.Item
+      className={cx("bg-secondary text-white", className)}
+      onClick={onClick}
+    >
+      {text}
+    </Dropdown.Item>
+  );
+};
+
 export interface IListFilterOperation {
   text: string;
   onClick: () => void;
diff --git a/ui/v2.5/src/components/List/styles.scss b/ui/v2.5/src/components/List/styles.scss
index 9a719b4b2..49deb5983 100644
--- a/ui/v2.5/src/components/List/styles.scss
+++ b/ui/v2.5/src/components/List/styles.scss
@@ -412,6 +412,12 @@ input[type="range"].zoom-slider {
   }
 }
 
+.filter-tags {
+  display: flex;
+  justify-content: center;
+  margin-bottom: 0.5rem;
+}
+
 .filter-tags .clear-all-button {
   color: $text-color;
   // to match filter pills
@@ -929,25 +935,49 @@ input[type="range"].zoom-slider {
 }
 
 .sidebar {
+  // make controls slightly larger on mobile
+  @include media-breakpoint-down(xs) {
+    .btn,
+    .form-control {
+      font-size: 1.25rem;
+    }
+  }
+
   .sidebar-search-container {
     display: flex;
     margin-bottom: 0.5rem;
-    margin-top: 0.25rem;
   }
 
   .search-term-input {
     flex-grow: 1;
-    margin-right: 0.25rem;
+    margin-right: 0;
 
     .clearable-text-field {
       height: 100%;
     }
   }
+
+  .edit-filter-button {
+    width: 100%;
+  }
+
+  .sidebar-footer {
+    background-color: $body-bg;
+    bottom: 0;
+    display: none;
+    padding: 0.5rem;
+    position: sticky;
+
+    @include media-breakpoint-down(xs) {
+      display: flex;
+      justify-content: center;
+    }
+  }
 }
 
 @include media-breakpoint-down(xs) {
-  .sidebar .search-term-input {
-    margin-right: 0.5rem;
+  .sidebar .sidebar-search-container {
+    margin-top: 0.25rem;
   }
 }
 
diff --git a/ui/v2.5/src/components/MainNavbar.tsx b/ui/v2.5/src/components/MainNavbar.tsx
index 98bbc26c6..59f8e51aa 100644
--- a/ui/v2.5/src/components/MainNavbar.tsx
+++ b/ui/v2.5/src/components/MainNavbar.tsx
@@ -103,7 +103,6 @@ const allMenuItems: IMenuItem[] = [
     href: "/scenes",
     icon: faPlayCircle,
     hotkey: "g s",
-    userCreatable: true,
   },
   {
     name: "images",
diff --git a/ui/v2.5/src/components/Scenes/SceneList.tsx b/ui/v2.5/src/components/Scenes/SceneList.tsx
index 3f9bf6315..fd75b96be 100644
--- a/ui/v2.5/src/components/Scenes/SceneList.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneList.tsx
@@ -19,7 +19,13 @@ import { SceneCardsGrid } from "./SceneCardsGrid";
 import { TaggerContext } from "../Tagger/context";
 import { IdentifyDialog } from "../Dialogs/IdentifyDialog/IdentifyDialog";
 import { ConfigurationContext } from "src/hooks/Config";
-import { faPlay } from "@fortawesome/free-solid-svg-icons";
+import {
+  faPencil,
+  faPlay,
+  faPlus,
+  faTimes,
+  faTrash,
+} from "@fortawesome/free-solid-svg-icons";
 import { SceneMergeModal } from "./SceneMergeDialog";
 import { objectTitle } from "src/core/files";
 import TextUtils from "src/utils/text";
@@ -27,8 +33,10 @@ import { View } from "../List/views";
 import { FileSize } from "../Shared/FileSize";
 import { LoadedContent } from "../List/PagedList";
 import { useCloseEditDelete, useFilterOperations } from "../List/util";
-import { IListFilterOperation } from "../List/ListOperationButtons";
-import { FilteredListToolbar } from "../List/FilteredListToolbar";
+import {
+  OperationDropdown,
+  OperationDropdownItem,
+} from "../List/ListOperationButtons";
 import { useFilteredItemList } from "../List/ItemList";
 import { FilterTags } from "../List/FilterTags";
 import { Sidebar, SidebarPane, useSidebarState } from "../Shared/Sidebar";
@@ -49,6 +57,11 @@ import {
 } from "../List/Filters/FilterSidebar";
 import { PatchContainerComponent } from "src/patch";
 import { Pagination, PaginationIndex } from "../List/Pagination";
+import { Button, ButtonGroup, ButtonToolbar } from "react-bootstrap";
+import { FilterButton } from "../List/Filters/FilterButton";
+import { Icon } from "../Shared/Icon";
+import { ListViewOptions } from "../List/ListViewOptions";
+import { PageSizeSelector, SortBySelect } from "../List/ListFilter";
 
 function renderMetadataByline(result: GQL.FindScenesQueryResult) {
   const duration = result?.data?.findScenes?.duration;
@@ -82,33 +95,51 @@ function renderMetadataByline(result: GQL.FindScenesQueryResult) {
 function usePlayScene() {
   const history = useHistory();
 
+  const { configuration: config } = useContext(ConfigurationContext);
+  const cont = config?.interface.continuePlaylistDefault ?? false;
+  const autoPlay = config?.interface.autostartVideoOnPlaySelected ?? false;
+
   const playScene = useCallback(
-    (queue: SceneQueue, sceneID: string, options: IPlaySceneOptions) => {
-      history.push(queue.makeLink(sceneID, options));
+    (queue: SceneQueue, sceneID: string, options?: IPlaySceneOptions) => {
+      history.push(
+        queue.makeLink(sceneID, { autoPlay, continue: cont, ...options })
+      );
     },
-    [history]
+    [history, cont, autoPlay]
   );
 
   return playScene;
 }
 
 function usePlaySelected(selectedIds: Set<string>) {
-  const { configuration: config } = useContext(ConfigurationContext);
   const playScene = usePlayScene();
 
   const playSelected = useCallback(() => {
     // populate queue and go to first scene
     const sceneIDs = Array.from(selectedIds.values());
     const queue = SceneQueue.fromSceneIDList(sceneIDs);
-    const autoPlay = config?.interface.autostartVideoOnPlaySelected ?? false;
-    playScene(queue, sceneIDs[0], { autoPlay });
-  }, [selectedIds, config?.interface.autostartVideoOnPlaySelected, playScene]);
+
+    playScene(queue, sceneIDs[0]);
+  }, [selectedIds, playScene]);
 
   return playSelected;
 }
 
+function usePlayFirst() {
+  const playScene = usePlayScene();
+
+  const playFirst = useCallback(
+    (queue: SceneQueue, sceneID: string, index: number) => {
+      // populate queue and go to first scene
+      playScene(queue, sceneID, { sceneIndex: index });
+    },
+    [playScene]
+  );
+
+  return playFirst;
+}
+
 function usePlayRandom(filter: ListFilterModel, count: number) {
-  const { configuration: config } = useContext(ConfigurationContext);
   const playScene = usePlayScene();
 
   const playRandom = useCallback(async () => {
@@ -130,15 +161,9 @@ function usePlayRandom(filter: ListFilterModel, count: number) {
     if (scene) {
       // navigate to the image player page
       const queue = SceneQueue.fromListFilterModel(filterCopy);
-      const autoPlay = config?.interface.autostartVideoOnPlaySelected ?? false;
-      playScene(queue, scene.id, { sceneIndex: index, autoPlay });
+      playScene(queue, scene.id, { sceneIndex: index });
     }
-  }, [
-    filter,
-    count,
-    config?.interface.autostartVideoOnPlaySelected,
-    playScene,
-  ]);
+  }, [filter, count, playScene]);
 
   return playRandom;
 }
@@ -213,12 +238,23 @@ const SidebarContent: React.FC<{
   sidebarOpen: boolean;
   onClose?: () => void;
   showEditFilter: (editingCriterion?: string) => void;
-}> = ({ filter, setFilter, view, showEditFilter, sidebarOpen, onClose }) => {
+  count?: number;
+}> = ({
+  filter,
+  setFilter,
+  view,
+  showEditFilter,
+  sidebarOpen,
+  onClose,
+  count,
+}) => {
+  const showResultsId =
+    count !== undefined ? "actions.show_count_results" : "actions.show_results";
+
   return (
     <>
       <FilteredSidebarHeader
         sidebarOpen={sidebarOpen}
-        onClose={onClose}
         showEditFilter={showEditFilter}
         filter={filter}
         setFilter={setFilter}
@@ -262,10 +298,193 @@ const SidebarContent: React.FC<{
           setFilter={setFilter}
         />
       </ScenesFilterSidebarSections>
+
+      <div className="sidebar-footer">
+        <Button className="sidebar-close-button" onClick={onClose}>
+          <FormattedMessage id={showResultsId} values={{ count }} />
+        </Button>
+      </div>
     </>
   );
 };
 
+interface IOperations {
+  text: string;
+  onClick: () => void;
+  isDisplayed?: () => boolean;
+  className?: string;
+}
+
+const ListToolbarContent: React.FC<{
+  criteriaCount: number;
+  items: GQL.SlimSceneDataFragment[];
+  selectedIds: Set<string>;
+  operations: IOperations[];
+  onToggleSidebar: () => void;
+  onSelectAll: () => void;
+  onSelectNone: () => void;
+  onEdit: () => void;
+  onDelete: () => void;
+  onPlay: () => void;
+  onCreateNew: () => void;
+}> = ({
+  criteriaCount,
+  items,
+  selectedIds,
+  operations,
+  onToggleSidebar,
+  onSelectAll,
+  onSelectNone,
+  onEdit,
+  onDelete,
+  onPlay,
+  onCreateNew,
+}) => {
+  const intl = useIntl();
+
+  const hasSelection = selectedIds.size > 0;
+
+  return (
+    <>
+      {!hasSelection && (
+        <div>
+          <FilterButton
+            onClick={() => onToggleSidebar()}
+            count={criteriaCount}
+            title={intl.formatMessage({ id: "actions.sidebar.toggle" })}
+          />
+        </div>
+      )}
+      {hasSelection && (
+        <div className="selected-items-info">
+          <Button
+            variant="secondary"
+            className="minimal"
+            onClick={() => onSelectNone()}
+            title={intl.formatMessage({ id: "actions.select_none" })}
+          >
+            <Icon icon={faTimes} />
+          </Button>
+          <span>{selectedIds.size} selected</span>
+          <Button variant="link" onClick={() => onSelectAll()}>
+            <FormattedMessage id="actions.select_all" />
+          </Button>
+        </div>
+      )}
+      <div>
+        <ButtonGroup>
+          {!!items.length && (
+            <Button
+              className="play-button"
+              variant="secondary"
+              onClick={() => onPlay()}
+              title={intl.formatMessage({ id: "actions.play" })}
+            >
+              <Icon icon={faPlay} />
+            </Button>
+          )}
+          {!hasSelection && (
+            <Button
+              className="create-new-button"
+              variant="secondary"
+              onClick={() => onCreateNew()}
+              title={intl.formatMessage(
+                { id: "actions.create_entity" },
+                { entityType: intl.formatMessage({ id: "scene" }) }
+              )}
+            >
+              <Icon icon={faPlus} />
+            </Button>
+          )}
+
+          {hasSelection && (
+            <>
+              <Button variant="secondary" onClick={() => onEdit()}>
+                <Icon icon={faPencil} />
+              </Button>
+              <Button
+                variant="danger"
+                className="btn-danger-minimal"
+                onClick={() => onDelete()}
+              >
+                <Icon icon={faTrash} />
+              </Button>
+            </>
+          )}
+
+          <OperationDropdown className="scene-list-operations">
+            {operations.map((o) => {
+              if (o.isDisplayed && !o.isDisplayed()) {
+                return null;
+              }
+
+              return (
+                <OperationDropdownItem
+                  key={o.text}
+                  onClick={o.onClick}
+                  text={o.text}
+                  className={o.className}
+                />
+              );
+            })}
+          </OperationDropdown>
+        </ButtonGroup>
+      </div>
+    </>
+  );
+};
+
+const ListResultsHeader: React.FC<{
+  loading: boolean;
+  filter: ListFilterModel;
+  totalCount: number;
+  metadataByline?: React.ReactNode;
+  onChangeFilter: (filter: ListFilterModel) => void;
+}> = ({ loading, filter, totalCount, metadataByline, onChangeFilter }) => {
+  return (
+    <ButtonToolbar className="scene-list-header">
+      <div>
+        <PaginationIndex
+          loading={loading}
+          itemsPerPage={filter.itemsPerPage}
+          currentPage={filter.currentPage}
+          totalItems={totalCount}
+          metadataByline={metadataByline}
+        />
+      </div>
+      <div>
+        <SortBySelect
+          options={filter.options.sortByOptions}
+          sortBy={filter.sortBy}
+          sortDirection={filter.sortDirection}
+          onChangeSortBy={(s) =>
+            onChangeFilter(filter.setSortBy(s ?? undefined))
+          }
+          onChangeSortDirection={() =>
+            onChangeFilter(filter.toggleSortDirection())
+          }
+          onReshuffleRandomSort={() =>
+            onChangeFilter(filter.reshuffleRandomSort())
+          }
+        />
+        <PageSizeSelector
+          pageSize={filter.itemsPerPage}
+          setPageSize={(s) => onChangeFilter(filter.setPageSize(s))}
+        />
+        <ListViewOptions
+          displayMode={filter.displayMode}
+          zoomIndex={filter.zoomIndex}
+          displayModeOptions={filter.options.displayModeOptions}
+          onSetDisplayMode={(mode) =>
+            onChangeFilter(filter.setDisplayMode(mode))
+          }
+          onSetZoom={(zoom) => onChangeFilter(filter.setZoom(zoom))}
+        />
+      </div>
+    </ButtonToolbar>
+  );
+};
+
 interface IFilteredScenes {
   filterHook?: (filter: ListFilterModel) => ListFilterModel;
   defaultSort?: string;
@@ -312,6 +531,7 @@ export const FilteredSceneList = (props: IFilteredScenes) => {
     selectedIds,
     selectedItems,
     onSelectChange,
+    onSelectAll,
     onSelectNone,
     hasSelection,
   } = listSelect;
@@ -337,13 +557,36 @@ export const FilteredSceneList = (props: IFilteredScenes) => {
   });
 
   const metadataByline = useMemo(() => {
-    if (cachedResult.loading) return "";
+    if (cachedResult.loading) return null;
 
-    return renderMetadataByline(cachedResult) ?? "";
+    return renderMetadataByline(cachedResult) ?? null;
   }, [cachedResult]);
 
-  const playSelected = usePlaySelected(selectedIds);
+  const queue = useMemo(() => SceneQueue.fromListFilterModel(filter), [filter]);
+
   const playRandom = usePlayRandom(filter, totalCount);
+  const playSelected = usePlaySelected(selectedIds);
+  const playFirst = usePlayFirst();
+
+  function onCreateNew() {
+    history.push("/scenes/new");
+  }
+
+  function onPlay() {
+    if (items.length === 0) {
+      return;
+    }
+
+    // if there are selected items, play those
+    if (hasSelection) {
+      playSelected();
+      return;
+    }
+
+    // otherwise, play the first item in the list
+    const sceneID = items[0].id;
+    playFirst(queue, sceneID, 0);
+  }
 
   function onExport(all: boolean) {
     showModal(
@@ -381,16 +624,41 @@ export const FilteredSceneList = (props: IFilteredScenes) => {
     );
   }
 
-  const otherOperations: IListFilterOperation[] = [
+  function onEdit() {
+    showModal(
+      <EditScenesDialog selected={selectedItems} onClose={onCloseEditDelete} />
+    );
+  }
+
+  function onDelete() {
+    showModal(
+      <DeleteScenesDialog
+        selected={selectedItems}
+        onClose={onCloseEditDelete}
+      />
+    );
+  }
+
+  const otherOperations = [
     {
-      text: intl.formatMessage({ id: "actions.play_selected" }),
-      onClick: playSelected,
-      isDisplayed: () => hasSelection,
-      icon: faPlay,
+      text: intl.formatMessage({ id: "actions.play" }),
+      onClick: () => onPlay(),
+      isDisplayed: () => items.length > 0,
+      className: "play-item",
+    },
+    {
+      text: intl.formatMessage(
+        { id: "actions.create_entity" },
+        { entityType: intl.formatMessage({ id: "scene" }) }
+      ),
+      onClick: () => onCreateNew(),
+      isDisplayed: () => !hasSelection,
+      className: "create-new-item",
     },
     {
       text: intl.formatMessage({ id: "actions.play_random" }),
       onClick: playRandom,
+      isDisplayed: () => totalCount > 1,
     },
     {
       text: `${intl.formatMessage({ id: "actions.generate" })}…`,
@@ -452,34 +720,36 @@ export const FilteredSceneList = (props: IFilteredScenes) => {
               view={view}
               sidebarOpen={showSidebar}
               onClose={() => setShowSidebar(false)}
+              count={cachedResult.loading ? undefined : totalCount}
             />
           </Sidebar>
           <div>
-            <FilteredListToolbar
+            <ButtonToolbar
+              className={cx("scene-list-toolbar", {
+                "has-selection": hasSelection,
+              })}
+            >
+              <ListToolbarContent
+                criteriaCount={filter.count()}
+                items={items}
+                selectedIds={selectedIds}
+                operations={otherOperations}
+                onToggleSidebar={() => setShowSidebar(!showSidebar)}
+                onSelectAll={() => onSelectAll()}
+                onSelectNone={() => onSelectNone()}
+                onEdit={onEdit}
+                onDelete={onDelete}
+                onCreateNew={onCreateNew}
+                onPlay={onPlay}
+              />
+            </ButtonToolbar>
+
+            <ListResultsHeader
+              loading={cachedResult.loading}
               filter={filter}
-              setFilter={setFilter}
-              showEditFilter={showEditFilter}
-              view={view}
-              listSelect={listSelect}
-              onEdit={() =>
-                showModal(
-                  <EditScenesDialog
-                    selected={selectedItems}
-                    onClose={onCloseEditDelete}
-                  />
-                )
-              }
-              onDelete={() => {
-                showModal(
-                  <DeleteScenesDialog
-                    selected={selectedItems}
-                    onClose={onCloseEditDelete}
-                  />
-                );
-              }}
-              operations={otherOperations}
-              onToggleSidebar={() => setShowSidebar((v) => !v)}
-              zoomable
+              totalCount={totalCount}
+              metadataByline={metadataByline}
+              onChangeFilter={(newFilter) => setFilter(newFilter)}
             />
 
             <FilterTags
@@ -489,14 +759,6 @@ export const FilteredSceneList = (props: IFilteredScenes) => {
               onRemoveAll={() => clearAllCriteria()}
             />
 
-            <PaginationIndex
-              loading={cachedResult.loading}
-              itemsPerPage={filter.itemsPerPage}
-              currentPage={filter.currentPage}
-              totalItems={totalCount}
-              metadataByline={metadataByline}
-            />
-
             <LoadedContent loading={result.loading} error={result.error}>
               <SceneList
                 filter={effectiveFilter}
diff --git a/ui/v2.5/src/components/Scenes/styles.scss b/ui/v2.5/src/components/Scenes/styles.scss
index 61a4cdbac..e389e85cf 100644
--- a/ui/v2.5/src/components/Scenes/styles.scss
+++ b/ui/v2.5/src/components/Scenes/styles.scss
@@ -1003,3 +1003,92 @@ input[type="range"].blue-slider {
     }
   }
 }
+
+.scene-list-toolbar,
+.scene-list-header {
+  align-items: center;
+  background-color: $body-bg;
+  display: flex;
+  justify-content: space-between;
+
+  > div {
+    align-items: center;
+    display: flex;
+    gap: 0.5rem;
+    justify-content: flex-start;
+
+    &:last-child {
+      flex-shrink: 0;
+      justify-content: flex-end;
+      margin-left: auto;
+    }
+  }
+}
+
+.scene-list-toolbar {
+  flex-wrap: wrap;
+  // offset the main padding
+  margin-top: -0.5rem;
+  padding-bottom: 0.5rem;
+  padding-top: 0.5rem;
+  position: sticky;
+  top: $navbar-height;
+  z-index: 10;
+
+  @include media-breakpoint-down(xs) {
+    top: 0;
+  }
+
+  .selected-items-info .btn {
+    margin-right: 0.5rem;
+  }
+
+  // hide drop down menu items for play and create new
+  // when the buttons are visible
+  @include media-breakpoint-up(sm) {
+    .scene-list-operations {
+      .play-item,
+      .create-new-item {
+        display: none;
+      }
+    }
+  }
+
+  // hide play and create new buttons on xs screens
+  // show these in the drop down menu instead
+  @include media-breakpoint-down(xs) {
+    .play-button,
+    .create-new-button {
+      display: none;
+    }
+  }
+}
+
+.scene-list-header {
+  flex-wrap: wrap-reverse;
+  gap: 0.5rem;
+  margin-bottom: 0.5rem;
+
+  .paginationIndex {
+    margin: 0;
+  }
+
+  // center the header on smaller screens
+  @include media-breakpoint-down(sm) {
+    & > div,
+    & > div:last-child {
+      flex-basis: 100%;
+      justify-content: center;
+      margin-left: auto;
+      margin-right: auto;
+    }
+  }
+}
+
+.detail-body .scene-list-toolbar {
+  top: calc($sticky-detail-header-height + $navbar-height);
+
+  @include media-breakpoint-down(xs) {
+    top: 0;
+  }
+}
diff --git a/ui/v2.5/src/components/Shared/styles.scss b/ui/v2.5/src/components/Shared/styles.scss
index c80c92fdd..b3726cd4f 100644
--- a/ui/v2.5/src/components/Shared/styles.scss
+++ b/ui/v2.5/src/components/Shared/styles.scss
@@ -774,8 +774,9 @@ $sidebar-width: 250px;
   .sidebar {
     bottom: 0;
     left: 0;
-    margin-top: 4rem;
+    margin-top: $navbar-height;
     overflow-y: auto;
+    padding-top: 0.5rem;
     position: fixed;
     scrollbar-gutter: stable;
     top: 0;
@@ -890,8 +891,7 @@ $sticky-header-height: calc(50px + 3.3rem);
     padding-left: 0;
     position: sticky;
 
-    // sticky detail header is 50px + 3.3rem
-    top: calc(50px + 3.3rem);
+    top: calc($sticky-detail-header-height + $navbar-height);
 
     .sidebar-toolbar {
       padding-top: 15px;
@@ -918,7 +918,6 @@ $sticky-header-height: calc(50px + 3.3rem);
       flex: 100% 0 0;
       height: calc(100vh - 4rem);
       max-height: calc(100vh - 4rem);
-      padding-top: 0;
       top: 0;
     }
 
diff --git a/ui/v2.5/src/index.scss b/ui/v2.5/src/index.scss
index 9393397ed..c013b852a 100755
--- a/ui/v2.5/src/index.scss
+++ b/ui/v2.5/src/index.scss
@@ -1,9 +1,10 @@
 // variables required by other scss files
 
 // this is calculated from the existing height
-// TODO: we should set this explicitly in the navbar
 $navbar-height: 48.75px;
 
+$sticky-detail-header-height: 50px;
+
 @import "styles/theme";
 @import "styles/range";
 @import "styles/scrollbars";
@@ -55,7 +56,7 @@ body {
 
   @include media-breakpoint-down(xs) {
     @media (orientation: portrait) {
-      padding: 1rem 0 $navbar-height;
+      padding: 0.5rem 0 $navbar-height;
     }
   }
 }
@@ -85,10 +86,10 @@ dd {
 
 .sticky.detail-header {
   display: block;
-  min-height: 50px;
+  min-height: $sticky-detail-header-height;
   padding: unset;
   position: fixed;
-  top: 3.3rem;
+  top: $navbar-height;
   z-index: 10;
 
   @media (max-width: 576px) {
@@ -692,8 +693,7 @@ div.dropdown-menu {
 
   .badge {
     margin: unset;
-    // stylelint-disable declaration-no-important
-    white-space: normal !important;
+    white-space: normal;
   }
 }
 
@@ -1025,6 +1025,9 @@ div.dropdown-menu {
       top: auto;
     }
   }
+  @include media-breakpoint-up(xl) {
+    height: $navbar-height;
+  }
 
   .navbar-toggler {
     padding: 0.5em 0;
diff --git a/ui/v2.5/src/locales/en-GB.json b/ui/v2.5/src/locales/en-GB.json
index b69e5a763..3d342754f 100644
--- a/ui/v2.5/src/locales/en-GB.json
+++ b/ui/v2.5/src/locales/en-GB.json
@@ -81,6 +81,7 @@
     "open_random": "Open Random",
     "optimise_database": "Optimise Database",
     "overwrite": "Overwrite",
+    "play": "Play",
     "play_random": "Play Random",
     "play_selected": "Play selected",
     "preview": "Preview",
@@ -124,9 +125,12 @@
     "set_image": "Set image…",
     "show": "Show",
     "show_configuration": "Show Configuration",
+    "show_results": "Show results",
+    "show_count_results": "Show {count} results",
     "sidebar": {
       "close": "Close sidebar",
-      "open": "Open sidebar"
+      "open": "Open sidebar",
+      "toggle": "Toggle sidebar"
     },
     "skip": "Skip",
     "split": "Split",
diff --git a/ui/v2.5/src/models/list-filter/filter-options.ts b/ui/v2.5/src/models/list-filter/filter-options.ts
index 68bc23e79..32b86e786 100644
--- a/ui/v2.5/src/models/list-filter/filter-options.ts
+++ b/ui/v2.5/src/models/list-filter/filter-options.ts
@@ -1,7 +1,7 @@
 import { CriterionOption } from "./criteria/criterion";
 import { DisplayMode } from "./types";
 
-interface ISortByOption {
+export interface ISortByOption {
   messageID: string;
   value: string;
 }
diff --git a/ui/v2.5/src/models/list-filter/filter.ts b/ui/v2.5/src/models/list-filter/filter.ts
index e7cf6a6eb..ac9d9de1e 100644
--- a/ui/v2.5/src/models/list-filter/filter.ts
+++ b/ui/v2.5/src/models/list-filter/filter.ts
@@ -521,6 +521,34 @@ export class ListFilterModel {
   public setPageSize(pageSize: number) {
     const ret = this.clone();
     ret.itemsPerPage = pageSize;
+    ret.currentPage = 1; // reset to first page
+    return ret;
+  }
+
+  public setSortBy(sortBy: string | undefined) {
+    const ret = this.clone();
+    ret.sortBy = sortBy;
+    ret.currentPage = 1; // reset to first page
+    return ret;
+  }
+
+  public toggleSortDirection() {
+    const ret = this.clone();
+
+    if (ret.sortDirection === SortDirectionEnum.Asc) {
+      ret.sortDirection = SortDirectionEnum.Desc;
+    } else {
+      ret.sortDirection = SortDirectionEnum.Asc;
+    }
+
+    ret.currentPage = 1; // reset to first page
+    return ret;
+  }
+
+  public reshuffleRandomSort() {
+    const ret = this.clone();
+    ret.currentPage = 1;
+    ret.randomSeed = -1;
     return ret;
   }
 

From 661d2f64bb97b0bdeda9b1e58635120ed9b6b3dc Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Thu, 26 Jun 2025 15:47:45 +1000
Subject: [PATCH 013/405] Make path criterion default modifier includes instead
 of equals (#5968)

---
 .../src/models/list-filter/criteria/country.ts   | 10 +++++-----
 .../src/models/list-filter/criteria/criterion.ts | 16 +++++++---------
 ui/v2.5/src/models/list-filter/criteria/path.ts  | 12 +++++++-----
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/ui/v2.5/src/models/list-filter/criteria/country.ts b/ui/v2.5/src/models/list-filter/criteria/country.ts
index 2430c2a59..e29ac97ff 100644
--- a/ui/v2.5/src/models/list-filter/criteria/country.ts
+++ b/ui/v2.5/src/models/list-filter/criteria/country.ts
@@ -3,11 +3,11 @@ import { CriterionModifier } from "src/core/generated-graphql";
 import { getCountryByISO } from "src/utils/country";
 import { StringCriterion, StringCriterionOption } from "./criterion";
 
-export const CountryCriterionOption = new StringCriterionOption(
-  "country",
-  "country",
-  () => new CountryCriterion()
-);
+export const CountryCriterionOption = new StringCriterionOption({
+  messageID: "country",
+  type: "country",
+  makeCriterion: () => new CountryCriterion(),
+});
 
 export class CountryCriterion extends StringCriterion {
   constructor() {
diff --git a/ui/v2.5/src/models/list-filter/criteria/criterion.ts b/ui/v2.5/src/models/list-filter/criteria/criterion.ts
index d06272c4c..a4d3a145c 100644
--- a/ui/v2.5/src/models/list-filter/criteria/criterion.ts
+++ b/ui/v2.5/src/models/list-filter/criteria/criterion.ts
@@ -526,13 +526,12 @@ export class IHierarchicalLabeledIdCriterion extends ModifierCriterion<IHierarch
 
 export class StringCriterionOption extends ModifierCriterionOption {
   constructor(
-    messageID: string,
-    value: CriterionType,
-    makeCriterion?: () => ModifierCriterion<CriterionValue>
+    options: Partial<
+      Omit<IModifierCriterionOptionParams, "messageID" | "type">
+    > &
+      Pick<IModifierCriterionOptionParams, "messageID" | "type">
   ) {
     super({
-      messageID,
-      type: value,
       modifierOptions: [
         CriterionModifier.Equals,
         CriterionModifier.NotEquals,
@@ -545,9 +544,8 @@ export class StringCriterionOption extends ModifierCriterionOption {
       ],
       defaultModifier: CriterionModifier.Equals,
       inputType: "text",
-      makeCriterion: makeCriterion
-        ? makeCriterion
-        : () => new StringCriterion(this),
+      makeCriterion: () => new StringCriterion(this),
+      ...options,
     });
   }
 }
@@ -556,7 +554,7 @@ export function createStringCriterionOption(
   type: CriterionType,
   messageID?: string
 ) {
-  return new StringCriterionOption(messageID ?? type, type);
+  return new StringCriterionOption({ messageID: messageID ?? type, type });
 }
 
 export class MandatoryStringCriterionOption extends ModifierCriterionOption {
diff --git a/ui/v2.5/src/models/list-filter/criteria/path.ts b/ui/v2.5/src/models/list-filter/criteria/path.ts
index 2b57faf85..42a7789cf 100644
--- a/ui/v2.5/src/models/list-filter/criteria/path.ts
+++ b/ui/v2.5/src/models/list-filter/criteria/path.ts
@@ -1,10 +1,12 @@
+import { CriterionModifier } from "src/core/generated-graphql";
 import { StringCriterion, StringCriterionOption } from "./criterion";
 
-export const PathCriterionOption = new StringCriterionOption(
-  "path",
-  "path",
-  () => new PathCriterion()
-);
+export const PathCriterionOption = new StringCriterionOption({
+  messageID: "path",
+  type: "path",
+  defaultModifier: CriterionModifier.Includes,
+  makeCriterion: () => new PathCriterion(),
+});
 
 export class PathCriterion extends StringCriterion {
   constructor() {

From 7eff7f02d09b0de6c631533fe95ce804583fd946 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Thu, 26 Jun 2025 15:48:29 +1000
Subject: [PATCH 014/405] Add findFolder and findFolders queries to graphql
 schema (#5965)

* Add findFolder and findFolders queries to graphql schema
* Add zip file criterion to file and folder queries
---
 graphql/schema/schema.graphql              |  10 ++
 graphql/schema/types/file.graphql          |   7 +-
 graphql/schema/types/filters.graphql       |  27 +++
 internal/api/resolver_query_find_folder.go | 100 ++++++++++++
 pkg/models/file.go                         |   1 +
 pkg/models/folder.go                       |  92 +++++++++++
 pkg/models/mocks/FolderReaderWriter.go     |  23 +++
 pkg/models/model_folder.go                 |   8 +
 pkg/models/repository_folder.go            |   5 +
 pkg/sqlite/file.go                         |   2 +-
 pkg/sqlite/file_filter.go                  |  38 +++++
 pkg/sqlite/file_filter_test.go             |  32 +++-
 pkg/sqlite/folder.go                       | 181 ++++++++++++++++++++-
 pkg/sqlite/folder_filter.go                | 150 +++++++++++++++++
 pkg/sqlite/folder_filter_test.go           |  95 +++++++++++
 pkg/sqlite/setup_test.go                   |  41 ++++-
 16 files changed, 800 insertions(+), 12 deletions(-)
 create mode 100644 internal/api/resolver_query_find_folder.go
 create mode 100644 pkg/models/folder.go
 create mode 100644 pkg/sqlite/folder_filter.go
 create mode 100644 pkg/sqlite/folder_filter_test.go

diff --git a/graphql/schema/schema.graphql b/graphql/schema/schema.graphql
index 1ca653403..7d0a761da 100644
--- a/graphql/schema/schema.graphql
+++ b/graphql/schema/schema.graphql
@@ -16,6 +16,16 @@ type Query {
     ids: [ID!]
   ): FindFilesResultType!
 
+  "Find a file by its id or path"
+  findFolder(id: ID, path: String): Folder!
+
+  "Queries for Files"
+  findFolders(
+    folder_filter: FolderFilterType
+    filter: FindFilterType
+    ids: [ID!]
+  ): FindFoldersResultType!
+
   "Find a scene by ID or Checksum"
   findScene(id: ID, checksum: String): Scene
   findSceneByHash(input: SceneHashInput!): Scene
diff --git a/graphql/schema/types/file.graphql b/graphql/schema/types/file.graphql
index c967c38f2..835479fad 100644
--- a/graphql/schema/types/file.graphql
+++ b/graphql/schema/types/file.graphql
@@ -10,7 +10,7 @@ type Folder {
   parent_folder_id: ID @deprecated(reason: "Use parent_folder instead")
   zip_file_id: ID @deprecated(reason: "Use zip_file instead")
 
-  parent_folder: Folder!
+  parent_folder: Folder
   zip_file: BasicFile
 
   mod_time: Time!
@@ -176,3 +176,8 @@ type FindFilesResultType {
 
   files: [BaseFile!]!
 }
+
+type FindFoldersResultType {
+  count: Int!
+  folders: [Folder!]!
+}
diff --git a/graphql/schema/types/filters.graphql b/graphql/schema/types/filters.graphql
index cab47172e..23ec4ca48 100644
--- a/graphql/schema/types/filters.graphql
+++ b/graphql/schema/types/filters.graphql
@@ -691,6 +691,7 @@ input FileFilterType {
   dir: StringCriterionInput
 
   parent_folder: HierarchicalMultiCriterionInput
+  zip_file: MultiCriterionInput
 
   "Filter by modification time"
   mod_time: TimestampCriterionInput
@@ -721,6 +722,32 @@ input FileFilterType {
   updated_at: TimestampCriterionInput
 }
 
+input FolderFilterType {
+  AND: FolderFilterType
+  OR: FolderFilterType
+  NOT: FolderFilterType
+
+  path: StringCriterionInput
+
+  parent_folder: HierarchicalMultiCriterionInput
+  zip_file: MultiCriterionInput
+
+  "Filter by modification time"
+  mod_time: TimestampCriterionInput
+
+  gallery_count: IntCriterionInput
+
+  "Filter by files that meet this criteria"
+  files_filter: FileFilterType
+  "Filter by related galleries that meet this criteria"
+  galleries_filter: GalleryFilterType
+
+  "Filter by creation time"
+  created_at: TimestampCriterionInput
+  "Filter by last update time"
+  updated_at: TimestampCriterionInput
+}
+
 input VideoFileFilterInput {
   resolution: ResolutionCriterionInput
   orientation: OrientationCriterionInput
diff --git a/internal/api/resolver_query_find_folder.go b/internal/api/resolver_query_find_folder.go
new file mode 100644
index 000000000..a7a798dd1
--- /dev/null
+++ b/internal/api/resolver_query_find_folder.go
@@ -0,0 +1,100 @@
+package api
+
+import (
+	"context"
+	"errors"
+	"strconv"
+
+	"github.com/stashapp/stash/pkg/models"
+	"github.com/stashapp/stash/pkg/sliceutil/stringslice"
+)
+
+func (r *queryResolver) FindFolder(ctx context.Context, id *string, path *string) (*models.Folder, error) {
+	var ret *models.Folder
+	if err := r.withReadTxn(ctx, func(ctx context.Context) error {
+		qb := r.repository.Folder
+		var err error
+		switch {
+		case id != nil:
+			idInt, err := strconv.Atoi(*id)
+			if err != nil {
+				return err
+			}
+			ret, err = qb.Find(ctx, models.FolderID(idInt))
+			if err != nil {
+				return err
+			}
+		case path != nil:
+			ret, err = qb.FindByPath(ctx, *path)
+			if err == nil && ret == nil {
+				return errors.New("folder not found")
+			}
+		default:
+			return errors.New("either id or path must be provided")
+		}
+
+		return err
+	}); err != nil {
+		return nil, err
+	}
+
+	return ret, nil
+}
+
+func (r *queryResolver) FindFolders(
+	ctx context.Context,
+	folderFilter *models.FolderFilterType,
+	filter *models.FindFilterType,
+	ids []string,
+) (ret *FindFoldersResultType, err error) {
+	var folderIDs []models.FolderID
+	if len(ids) > 0 {
+		folderIDsInt, err := stringslice.StringSliceToIntSlice(ids)
+		if err != nil {
+			return nil, err
+		}
+
+		folderIDs = models.FolderIDsFromInts(folderIDsInt)
+	}
+
+	if err := r.withReadTxn(ctx, func(ctx context.Context) error {
+		var folders []*models.Folder
+		var err error
+
+		fields := collectQueryFields(ctx)
+		result := &models.FolderQueryResult{}
+
+		if len(folderIDs) > 0 {
+			folders, err = r.repository.Folder.FindMany(ctx, folderIDs)
+			if err == nil {
+				result.Count = len(folders)
+			}
+		} else {
+			result, err = r.repository.Folder.Query(ctx, models.FolderQueryOptions{
+				QueryOptions: models.QueryOptions{
+					FindFilter: filter,
+					Count:      fields.Has("count"),
+				},
+				FolderFilter: folderFilter,
+			})
+			if err == nil {
+				folders, err = result.Resolve(ctx)
+			}
+		}
+
+		if err != nil {
+			return err
+		}
+
+		ret = &FindFoldersResultType{
+			Count:   result.Count,
+			Folders: folders,
+		}
+
+		return nil
+	}); err != nil {
+		return nil, err
+	}
+
+	return ret, nil
+}
diff --git a/pkg/models/file.go b/pkg/models/file.go
index 1b77af21a..63c30ba4d 100644
--- a/pkg/models/file.go
+++ b/pkg/models/file.go
@@ -24,6 +24,7 @@ type FileFilterType struct {
 	Basename        *StringCriterionInput            `json:"basename"`
 	Dir             *StringCriterionInput            `json:"dir"`
 	ParentFolder    *HierarchicalMultiCriterionInput `json:"parent_folder"`
+	ZipFile         *MultiCriterionInput             `json:"zip_file"`
 	ModTime         *TimestampCriterionInput         `json:"mod_time"`
 	Duplicated      *PHashDuplicationCriterionInput  `json:"duplicated"`
 	Hashes          []*FingerprintFilterInput        `json:"hashes"`
diff --git a/pkg/models/folder.go b/pkg/models/folder.go
new file mode 100644
index 000000000..ada9e17b7
--- /dev/null
+++ b/pkg/models/folder.go
@@ -0,0 +1,92 @@
+package models
+
+import (
+	"context"
+	"path/filepath"
+	"strings"
+)
+
+type FolderQueryOptions struct {
+	QueryOptions
+	FolderFilter *FolderFilterType
+
+	TotalDuration bool
+	Megapixels    bool
+	TotalSize     bool
+}
+
+type FolderFilterType struct {
+	OperatorFilter[FolderFilterType]
+
+	Path     *StringCriterionInput `json:"path,omitempty"`
+	Basename *StringCriterionInput `json:"basename,omitempty"`
+	// Filter by parent directory path
+	Dir          *StringCriterionInput            `json:"dir,omitempty"`
+	ParentFolder *HierarchicalMultiCriterionInput `json:"parent_folder,omitempty"`
+	ZipFile      *MultiCriterionInput             `json:"zip_file,omitempty"`
+	// Filter by modification time
+	ModTime      *TimestampCriterionInput `json:"mod_time,omitempty"`
+	GalleryCount *IntCriterionInput       `json:"gallery_count,omitempty"`
+	// Filter by files that meet this criteria
+	FilesFilter *FileFilterType `json:"files_filter,omitempty"`
+	// Filter by related galleries that meet this criteria
+	GalleriesFilter *GalleryFilterType `json:"galleries_filter,omitempty"`
+	// Filter by creation time
+	CreatedAt *TimestampCriterionInput `json:"created_at,omitempty"`
+	// Filter by last update time
+	UpdatedAt *TimestampCriterionInput `json:"updated_at,omitempty"`
+}
+
+func PathsFolderFilter(paths []string) *FileFilterType {
+	if paths == nil {
+		return nil
+	}
+
+	sep := string(filepath.Separator)
+
+	var ret *FileFilterType
+	var or *FileFilterType
+	for _, p := range paths {
+		newOr := &FileFilterType{}
+		if or != nil {
+			or.Or = newOr
+		} else {
+			ret = newOr
+		}
+
+		or = newOr
+
+		if !strings.HasSuffix(p, sep) {
+			p += sep
+		}
+
+		or.Path = &StringCriterionInput{
+			Modifier: CriterionModifierEquals,
+			Value:    p + "%",
+		}
+	}
+
+	return ret
+}
+
+type FolderQueryResult struct {
+	QueryResult[FolderID]
+
+	getter     FolderGetter
+	folders    []*Folder
+	resolveErr error
+}
+
+func NewFolderQueryResult(folderGetter FolderGetter) *FolderQueryResult {
+	return &FolderQueryResult{
+		getter: folderGetter,
+	}
+}
+
+func (r *FolderQueryResult) Resolve(ctx context.Context) ([]*Folder, error) {
+	// cache results
+	if r.folders == nil && r.resolveErr == nil {
+		r.folders, r.resolveErr = r.getter.FindMany(ctx, r.IDs)
+	}
+	return r.folders, r.resolveErr
+}
diff --git a/pkg/models/mocks/FolderReaderWriter.go b/pkg/models/mocks/FolderReaderWriter.go
index 020764942..512925fd6 100644
--- a/pkg/models/mocks/FolderReaderWriter.go
+++ b/pkg/models/mocks/FolderReaderWriter.go
@@ -201,6 +201,29 @@ func (_m *FolderReaderWriter) FindMany(ctx context.Context, id []models.FolderID
 	return r0, r1
 }
 
+// Query provides a mock function with given fields: ctx, options
+func (_m *FolderReaderWriter) Query(ctx context.Context, options models.FolderQueryOptions) (*models.FolderQueryResult, error) {
+	ret := _m.Called(ctx, options)
+
+	var r0 *models.FolderQueryResult
+	if rf, ok := ret.Get(0).(func(context.Context, models.FolderQueryOptions) *models.FolderQueryResult); ok {
+		r0 = rf(ctx, options)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*models.FolderQueryResult)
+		}
+	}
+
+	var r1 error
+	if rf, ok := ret.Get(1).(func(context.Context, models.FolderQueryOptions) error); ok {
+		r1 = rf(ctx, options)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
 // Update provides a mock function with given fields: ctx, f
 func (_m *FolderReaderWriter) Update(ctx context.Context, f *models.Folder) error {
 	ret := _m.Called(ctx, f)
diff --git a/pkg/models/model_folder.go b/pkg/models/model_folder.go
index 590cdd7bd..39897aa60 100644
--- a/pkg/models/model_folder.go
+++ b/pkg/models/model_folder.go
@@ -35,6 +35,14 @@ func (i FolderID) MarshalGQL(w io.Writer) {
 	fmt.Fprint(w, strconv.Quote(i.String()))
 }
 
+func FolderIDsFromInts(ids []int) []FolderID {
+	ret := make([]FolderID, len(ids))
+	for i, id := range ids {
+		ret[i] = FolderID(id)
+	}
+	return ret
+}
+
 // Folder represents a folder in the file system.
 type Folder struct {
 	ID FolderID `json:"id"`
diff --git a/pkg/models/repository_folder.go b/pkg/models/repository_folder.go
index 20c155ead..671e8780d 100644
--- a/pkg/models/repository_folder.go
+++ b/pkg/models/repository_folder.go
@@ -17,6 +17,10 @@ type FolderFinder interface {
 	FindByParentFolderID(ctx context.Context, parentFolderID FolderID) ([]*Folder, error)
 }
 
+type FolderQueryer interface {
+	Query(ctx context.Context, options FolderQueryOptions) (*FolderQueryResult, error)
+}
+
 type FolderCounter interface {
 	CountAllInPaths(ctx context.Context, p []string) (int, error)
 }
@@ -48,6 +52,7 @@ type FolderFinderDestroyer interface {
 // FolderReader provides all methods to read folders.
 type FolderReader interface {
 	FolderFinder
+	FolderQueryer
 	FolderCounter
 }
 
diff --git a/pkg/sqlite/file.go b/pkg/sqlite/file.go
index ea2084c2c..ad3442ff7 100644
--- a/pkg/sqlite/file.go
+++ b/pkg/sqlite/file.go
@@ -321,7 +321,7 @@ type FileStore struct {
 func NewFileStore() *FileStore {
 	return &FileStore{
 		repository: repository{
-			tableName: sceneTable,
+			tableName: fileTable,
 			idColumn:  idColumn,
 		},
 
diff --git a/pkg/sqlite/file_filter.go b/pkg/sqlite/file_filter.go
index b115fee35..60ca01648 100644
--- a/pkg/sqlite/file_filter.go
+++ b/pkg/sqlite/file_filter.go
@@ -68,6 +68,7 @@ func (qb *fileFilterHandler) criterionHandler() criterionHandler {
 		&timestampCriterionHandler{fileFilter.ModTime, "files.mod_time", nil},
 
 		qb.parentFolderCriterionHandler(fileFilter.ParentFolder),
+		qb.zipFileCriterionHandler(fileFilter.ZipFile),
 
 		qb.sceneCountCriterionHandler(fileFilter.SceneCount),
 		qb.imageCountCriterionHandler(fileFilter.ImageCount),
@@ -106,6 +107,43 @@ func (qb *fileFilterHandler) criterionHandler() criterionHandler {
 	}
 }
 
+func (qb *fileFilterHandler) zipFileCriterionHandler(criterion *models.MultiCriterionInput) criterionHandlerFunc {
+	return func(ctx context.Context, f *filterBuilder) {
+		if criterion != nil {
+			if criterion.Modifier == models.CriterionModifierIsNull || criterion.Modifier == models.CriterionModifierNotNull {
+				var notClause string
+				if criterion.Modifier == models.CriterionModifierNotNull {
+					notClause = "NOT"
+				}
+
+				f.addWhere(fmt.Sprintf("files.zip_file_id IS %s NULL", notClause))
+				return
+			}
+
+			if len(criterion.Value) == 0 {
+				return
+			}
+
+			var args []interface{}
+			for _, tagID := range criterion.Value {
+				args = append(args, tagID)
+			}
+
+			whereClause := ""
+			havingClause := ""
+			switch criterion.Modifier {
+			case models.CriterionModifierIncludes:
+				whereClause = "files.zip_file_id IN " + getInBinding(len(criterion.Value))
+			case models.CriterionModifierExcludes:
+				whereClause = "files.zip_file_id NOT IN " + getInBinding(len(criterion.Value))
+			}
+
+			f.addWhere(whereClause, args...)
+			f.addHaving(havingClause)
+		}
+	}
+}
+
 func (qb *fileFilterHandler) parentFolderCriterionHandler(folder *models.HierarchicalMultiCriterionInput) criterionHandlerFunc {
 	return func(ctx context.Context, f *filterBuilder) {
 		if folder == nil {
diff --git a/pkg/sqlite/file_filter_test.go b/pkg/sqlite/file_filter_test.go
index 7bc6f3e6b..50eed0129 100644
--- a/pkg/sqlite/file_filter_test.go
+++ b/pkg/sqlite/file_filter_test.go
@@ -18,7 +18,7 @@ func TestFileQuery(t *testing.T) {
 		findFilter  *models.FindFilterType
 		filter      *models.FileFilterType
 		includeIdxs []int
-		includeIDs  []int
+		includeIDs  []models.FileID
 		excludeIdxs []int
 		wantErr     bool
 	}{
@@ -52,7 +52,7 @@ func TestFileQuery(t *testing.T) {
 					Modifier: models.CriterionModifierIncludes,
 				},
 			},
-			includeIDs:  []int{int(sceneFileIDs[sceneIdxWithGroup])},
+			includeIDs:  []models.FileID{sceneFileIDs[sceneIdxWithGroup]},
 			excludeIdxs: []int{fileIdxStartImageFiles},
 		},
 		{
@@ -65,7 +65,20 @@ func TestFileQuery(t *testing.T) {
 					Modifier: models.CriterionModifierIncludes,
 				},
 			},
-			includeIDs:  []int{int(sceneFileIDs[sceneIdxWithGroup])},
+			includeIDs:  []models.FileID{sceneFileIDs[sceneIdxWithGroup]},
+			excludeIdxs: []int{fileIdxStartImageFiles},
+		},
+		{
+			name: "zip file",
+			filter: &models.FileFilterType{
+				ZipFile: &models.MultiCriterionInput{
+					Value: []string{
+						strconv.Itoa(int(fileIDs[fileIdxZip])),
+					},
+					Modifier: models.CriterionModifierIncludes,
+				},
+			},
+			includeIDs:  []models.FileID{fileIDs[fileIdxInZip]},
 			excludeIdxs: []int{fileIdxStartImageFiles},
 		},
 		// TODO - add more tests for other file filters
@@ -86,15 +99,18 @@ func TestFileQuery(t *testing.T) {
 				return
 			}
 
-			include := indexesToIDs(sceneIDs, tt.includeIdxs)
-			include = append(include, tt.includeIDs...)
-			exclude := indexesToIDs(sceneIDs, tt.excludeIdxs)
+			include := indexesToIDPtrs(fileIDs, tt.includeIdxs)
+			for _, id := range tt.includeIDs {
+				v := id
+				include = append(include, &v)
+			}
+			exclude := indexesToIDPtrs(fileIDs, tt.excludeIdxs)
 
 			for _, i := range include {
-				assert.Contains(results.IDs, models.FileID(i))
+				assert.Contains(results.IDs, models.FileID(*i))
 			}
 			for _, e := range exclude {
-				assert.NotContains(results.IDs, models.FileID(e))
+				assert.NotContains(results.IDs, models.FileID(*e))
 			}
 		})
 	}
diff --git a/pkg/sqlite/folder.go b/pkg/sqlite/folder.go
index f90a578bd..3ac962b8b 100644
--- a/pkg/sqlite/folder.go
+++ b/pkg/sqlite/folder.go
@@ -16,6 +16,7 @@ import (
 )
 
 const folderTable = "folders"
+const folderIDColumn = "folder_id"
 
 type folderRow struct {
 	ID             models.FolderID `db:"id" goqu:"skipinsert"`
@@ -83,6 +84,25 @@ func (r folderQueryRows) resolve() []*models.Folder {
 	return ret
 }
 
+type folderRepositoryType struct {
+	repository
+
+	galleries repository
+}
+
+var (
+	folderRepository = folderRepositoryType{
+		repository: repository{
+			tableName: folderTable,
+			idColumn:  idColumn,
+		},
+		galleries: repository{
+			tableName: galleryTable,
+			idColumn:  folderIDColumn,
+		},
+	}
+)
+
 type FolderStore struct {
 	repository
 
@@ -92,7 +112,7 @@ type FolderStore struct {
 func NewFolderStore() *FolderStore {
 	return &FolderStore{
 		repository: repository{
-			tableName: sceneTable,
+			tableName: folderTable,
 			idColumn:  idColumn,
 		},
 
@@ -360,3 +380,162 @@ func (qb *FolderStore) FindByZipFileID(ctx context.Context, zipFileID models.Fil
 
 	return qb.getMany(ctx, q)
 }
+
+func (qb *FolderStore) validateFilter(fileFilter *models.FolderFilterType) error {
+	const and = "AND"
+	const or = "OR"
+	const not = "NOT"
+
+	if fileFilter.And != nil {
+		if fileFilter.Or != nil {
+			return illegalFilterCombination(and, or)
+		}
+		if fileFilter.Not != nil {
+			return illegalFilterCombination(and, not)
+		}
+
+		return qb.validateFilter(fileFilter.And)
+	}
+
+	if fileFilter.Or != nil {
+		if fileFilter.Not != nil {
+			return illegalFilterCombination(or, not)
+		}
+
+		return qb.validateFilter(fileFilter.Or)
+	}
+
+	if fileFilter.Not != nil {
+		return qb.validateFilter(fileFilter.Not)
+	}
+
+	return nil
+}
+
+func (qb *FolderStore) makeFilter(ctx context.Context, folderFilter *models.FolderFilterType) *filterBuilder {
+	query := &filterBuilder{}
+
+	if folderFilter.And != nil {
+		query.and(qb.makeFilter(ctx, folderFilter.And))
+	}
+	if folderFilter.Or != nil {
+		query.or(qb.makeFilter(ctx, folderFilter.Or))
+	}
+	if folderFilter.Not != nil {
+		query.not(qb.makeFilter(ctx, folderFilter.Not))
+	}
+
+	filter := filterBuilderFromHandler(ctx, &folderFilterHandler{
+		folderFilter: folderFilter,
+	})
+
+	return filter
+}
+
+func (qb *FolderStore) Query(ctx context.Context, options models.FolderQueryOptions) (*models.FolderQueryResult, error) {
+	folderFilter := options.FolderFilter
+	findFilter := options.FindFilter
+
+	if folderFilter == nil {
+		folderFilter = &models.FolderFilterType{}
+	}
+	if findFilter == nil {
+		findFilter = &models.FindFilterType{}
+	}
+
+	query := qb.newQuery()
+
+	distinctIDs(&query, folderTable)
+
+	if q := findFilter.Q; q != nil && *q != "" {
+		searchColumns := []string{"folders.path"}
+		query.parseQueryString(searchColumns, *q)
+	}
+
+	if err := qb.validateFilter(folderFilter); err != nil {
+		return nil, err
+	}
+	filter := qb.makeFilter(ctx, folderFilter)
+
+	if err := query.addFilter(filter); err != nil {
+		return nil, err
+	}
+
+	if err := qb.setQuerySort(&query, findFilter); err != nil {
+		return nil, err
+	}
+	query.sortAndPagination += getPagination(findFilter)
+
+	result, err := qb.queryGroupedFields(ctx, options, query)
+	if err != nil {
+		return nil, fmt.Errorf("error querying aggregate fields: %w", err)
+	}
+
+	idsResult, err := query.findIDs(ctx)
+	if err != nil {
+		return nil, fmt.Errorf("error finding IDs: %w", err)
+	}
+
+	result.IDs = make([]models.FolderID, len(idsResult))
+	for i, id := range idsResult {
+		result.IDs[i] = models.FolderID(id)
+	}
+
+	return result, nil
+}
+
+func (qb *FolderStore) queryGroupedFields(ctx context.Context, options models.FolderQueryOptions, query queryBuilder) (*models.FolderQueryResult, error) {
+	if !options.Count {
+		// nothing to do - return empty result
+		return models.NewFolderQueryResult(qb), nil
+	}
+
+	aggregateQuery := qb.newQuery()
+
+	if options.Count {
+		aggregateQuery.addColumn("COUNT(DISTINCT temp.id) as total")
+	}
+
+	const includeSortPagination = false
+	aggregateQuery.from = fmt.Sprintf("(%s) as temp", query.toSQL(includeSortPagination))
+
+	out := struct {
+		Total      int
+		Duration   float64
+		Megapixels float64
+		Size       int64
+	}{}
+	if err := qb.repository.queryStruct(ctx, aggregateQuery.toSQL(includeSortPagination), query.args, &out); err != nil {
+		return nil, err
+	}
+
+	ret := models.NewFolderQueryResult(qb)
+	ret.Count = out.Total
+
+	return ret, nil
+}
+
+var folderSortOptions = sortOptions{
+	"created_at",
+	"id",
+	"path",
+	"random",
+	"updated_at",
+}
+
+func (qb *FolderStore) setQuerySort(query *queryBuilder, findFilter *models.FindFilterType) error {
+	if findFilter == nil || findFilter.Sort == nil || *findFilter.Sort == "" {
+		return nil
+	}
+	sort := findFilter.GetSort("path")
+
+	// CVE-2024-32231 - ensure sort is in the list of allowed sorts
+	if err := folderSortOptions.validateSort(sort); err != nil {
+		return err
+	}
+
+	direction := findFilter.GetDirection()
+	query.sortAndPagination += getSort(sort, direction, "folders")
+
+	return nil
+}
diff --git a/pkg/sqlite/folder_filter.go b/pkg/sqlite/folder_filter.go
new file mode 100644
index 000000000..2fda0d1e3
--- /dev/null
+++ b/pkg/sqlite/folder_filter.go
@@ -0,0 +1,150 @@
+package sqlite
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/stashapp/stash/pkg/models"
+)
+
+type folderFilterHandler struct {
+	folderFilter *models.FolderFilterType
+}
+
+func (qb *folderFilterHandler) validate() error {
+	folderFilter := qb.folderFilter
+	if folderFilter == nil {
+		return nil
+	}
+
+	if err := validateFilterCombination(folderFilter.OperatorFilter); err != nil {
+		return err
+	}
+
+	if subFilter := folderFilter.SubFilter(); subFilter != nil {
+		sqb := &folderFilterHandler{folderFilter: subFilter}
+		if err := sqb.validate(); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func (qb *folderFilterHandler) handle(ctx context.Context, f *filterBuilder) {
+	folderFilter := qb.folderFilter
+	if folderFilter == nil {
+		return
+	}
+
+	if err := qb.validate(); err != nil {
+		f.setError(err)
+		return
+	}
+
+	sf := folderFilter.SubFilter()
+	if sf != nil {
+		sub := &folderFilterHandler{sf}
+		handleSubFilter(ctx, sub, f, folderFilter.OperatorFilter)
+	}
+
+	f.handleCriterion(ctx, qb.criterionHandler())
+}
+
+func (qb *folderFilterHandler) criterionHandler() criterionHandler {
+	folderFilter := qb.folderFilter
+	return compoundHandler{
+		stringCriterionHandler(folderFilter.Path, "folders.path"),
+		&timestampCriterionHandler{folderFilter.ModTime, "folders.mod_time", nil},
+
+		qb.parentFolderCriterionHandler(folderFilter.ParentFolder),
+		qb.zipFileCriterionHandler(folderFilter.ZipFile),
+
+		qb.galleryCountCriterionHandler(folderFilter.GalleryCount),
+
+		&timestampCriterionHandler{folderFilter.CreatedAt, "folders.created_at", nil},
+		&timestampCriterionHandler{folderFilter.UpdatedAt, "folders.updated_at", nil},
+
+		&relatedFilterHandler{
+			relatedIDCol:   "galleries.id",
+			relatedRepo:    galleryRepository.repository,
+			relatedHandler: &galleryFilterHandler{folderFilter.GalleriesFilter},
+			joinFn: func(f *filterBuilder) {
+				folderRepository.galleries.innerJoin(f, "", "folders.id")
+			},
+		},
+	}
+}
+
+func (qb *folderFilterHandler) zipFileCriterionHandler(criterion *models.MultiCriterionInput) criterionHandlerFunc {
+	return func(ctx context.Context, f *filterBuilder) {
+		if criterion != nil {
+			if criterion.Modifier == models.CriterionModifierIsNull || criterion.Modifier == models.CriterionModifierNotNull {
+				var notClause string
+				if criterion.Modifier == models.CriterionModifierNotNull {
+					notClause = "NOT"
+				}
+
+				f.addWhere(fmt.Sprintf("folders.zip_file_id IS %s NULL", notClause))
+				return
+			}
+
+			if len(criterion.Value) == 0 {
+				return
+			}
+
+			var args []interface{}
+			for _, tagID := range criterion.Value {
+				args = append(args, tagID)
+			}
+
+			whereClause := ""
+			havingClause := ""
+			switch criterion.Modifier {
+			case models.CriterionModifierIncludes:
+				whereClause = "folders.zip_file_id IN " + getInBinding(len(criterion.Value))
+			case models.CriterionModifierExcludes:
+				whereClause = "folders.zip_file_id NOT IN " + getInBinding(len(criterion.Value))
+			}
+
+			f.addWhere(whereClause, args...)
+			f.addHaving(havingClause)
+		}
+	}
+}
+
+func (qb *folderFilterHandler) parentFolderCriterionHandler(folder *models.HierarchicalMultiCriterionInput) criterionHandlerFunc {
+	return func(ctx context.Context, f *filterBuilder) {
+		if folder == nil {
+			return
+		}
+
+		folderCopy := *folder
+		switch folderCopy.Modifier {
+		case models.CriterionModifierEquals:
+			folderCopy.Modifier = models.CriterionModifierIncludesAll
+		case models.CriterionModifierNotEquals:
+			folderCopy.Modifier = models.CriterionModifierExcludes
+		}
+
+		hh := hierarchicalMultiCriterionHandlerBuilder{
+			primaryTable: folderTable,
+			foreignTable: folderTable,
+			foreignFK:    "parent_folder_id",
+			parentFK:     "parent_folder_id",
+		}
+
+		hh.handler(&folderCopy)(ctx, f)
+	}
+}
+
+func (qb *folderFilterHandler) galleryCountCriterionHandler(galleryCount *models.IntCriterionInput) criterionHandlerFunc {
+	return func(ctx context.Context, f *filterBuilder) {
+		if galleryCount != nil {
+			f.addLeftJoin("galleries", "", "galleries.folder_id = folders.id")
+			clause, args := getIntCriterionWhereClause("count(distinct galleries.id)", *galleryCount)
+
+			f.addHaving(clause, args...)
+		}
+	}
+}
diff --git a/pkg/sqlite/folder_filter_test.go b/pkg/sqlite/folder_filter_test.go
new file mode 100644
index 000000000..c1c7d7a37
--- /dev/null
+++ b/pkg/sqlite/folder_filter_test.go
@@ -0,0 +1,95 @@
+//go:build integration
+// +build integration
+
+package sqlite_test
+
+import (
+	"context"
+	"strconv"
+	"testing"
+
+	"github.com/stashapp/stash/pkg/models"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestFolderQuery(t *testing.T) {
+	tests := []struct {
+		name        string
+		findFilter  *models.FindFilterType
+		filter      *models.FolderFilterType
+		includeIdxs []int
+		includeIDs  []models.FolderID
+		excludeIdxs []int
+		wantErr     bool
+	}{
+		{
+			name: "path",
+			filter: &models.FolderFilterType{
+				Path: &models.StringCriterionInput{
+					Value:    getFolderPath(folderIdxWithSubFolder, nil),
+					Modifier: models.CriterionModifierIncludes,
+				},
+			},
+			includeIdxs: []int{folderIdxWithSubFolder, folderIdxWithParentFolder},
+			excludeIdxs: []int{folderIdxInZip},
+		},
+		{
+			name: "parent folder",
+			filter: &models.FolderFilterType{
+				ParentFolder: &models.HierarchicalMultiCriterionInput{
+					Value: []string{
+						strconv.Itoa(int(folderIDs[folderIdxWithSubFolder])),
+					},
+					Modifier: models.CriterionModifierIncludes,
+				},
+			},
+			includeIdxs: []int{folderIdxWithParentFolder},
+			excludeIdxs: []int{folderIdxWithSubFolder, folderIdxInZip},
+		},
+		{
+			name: "zip file",
+			filter: &models.FolderFilterType{
+				ZipFile: &models.MultiCriterionInput{
+					Value: []string{
+						strconv.Itoa(int(fileIDs[fileIdxZip])),
+					},
+					Modifier: models.CriterionModifierIncludes,
+				},
+			},
+			includeIdxs: []int{folderIdxInZip},
+			excludeIdxs: []int{folderIdxForObjectFiles},
+		},
+		// TODO - add more tests for other folder filters
+	}
+
+	for _, tt := range tests {
+		runWithRollbackTxn(t, tt.name, func(t *testing.T, ctx context.Context) {
+			assert := assert.New(t)
+
+			results, err := db.Folder.Query(ctx, models.FolderQueryOptions{
+				FolderFilter: tt.filter,
+				QueryOptions: models.QueryOptions{
+					FindFilter: tt.findFilter,
+				},
+			})
+			if (err != nil) != tt.wantErr {
+				t.Errorf("SceneStore.Query() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+
+			include := indexesToIDPtrs(folderIDs, tt.includeIdxs)
+			for _, id := range tt.includeIDs {
+				v := id
+				include = append(include, &v)
+			}
+			exclude := indexesToIDPtrs(folderIDs, tt.excludeIdxs)
+
+			for _, i := range include {
+				assert.Contains(results.IDs, models.FolderID(*i))
+			}
+			for _, e := range exclude {
+				assert.NotContains(results.IDs, models.FolderID(*e))
+			}
+		})
+	}
+}
diff --git a/pkg/sqlite/setup_test.go b/pkg/sqlite/setup_test.go
index 72aeab5bb..a1df897ca 100644
--- a/pkg/sqlite/setup_test.go
+++ b/pkg/sqlite/setup_test.go
@@ -578,6 +578,22 @@ func indexToID(ids []int, idx int) int {
 	return ids[idx]
 }
 
+func indexesToIDPtrs[T any](ids []T, indexes []int) []*T {
+	ret := make([]*T, len(indexes))
+	for i, idx := range indexes {
+		ret[i] = indexToIDPtr(ids, idx)
+	}
+
+	return ret
+}
+
+func indexToIDPtr[T any](ids []T, idx int) *T {
+	if idx < 0 {
+		return nil
+	}
+	return &ids[idx]
+}
+
 func indexFromID(ids []int, id int) int {
 	for i, v := range ids {
 		if v == id {
@@ -675,7 +691,9 @@ func populateDB() error {
 			return fmt.Errorf("creating files: %w", err)
 		}
 
-		// TODO - link folders to zip files
+		if err := linkFoldersToZip(ctx); err != nil {
+			return fmt.Errorf("linking folders to zip files: %w", err)
+		}
 
 		if err := createTags(ctx, db.Tag, tagsNameCase, tagsNameNoCase); err != nil {
 			return fmt.Errorf("error creating tags: %s", err.Error())
@@ -798,6 +816,27 @@ func createFolders(ctx context.Context) error {
 	return nil
 }
 
+func linkFoldersToZip(ctx context.Context) error {
+	// link folders to zip files
+	for folderIdx, fileIdx := range folderZipFiles {
+		folderID := folderIDs[folderIdx]
+		fileID := fileIDs[fileIdx]
+
+		f, err := db.Folder.Find(ctx, folderID)
+		if err != nil {
+			return fmt.Errorf("Error finding folder [%d] to link to zip file [%d]", folderID, fileID)
+		}
+
+		f.ZipFileID = &fileID
+
+		if err := db.Folder.Update(ctx, f); err != nil {
+			return fmt.Errorf("Error linking folder [%d] to zip file [%d]: %s", folderIdx, fileIdx, err.Error())
+		}
+	}
+
+	return nil
+}
+
 func getFileBaseName(index int) string {
 	return getPrefixedStringValue("file", index, "basename")
 }

From 3af472d3b2fdda1061c9b401aa4a73efab507a2f Mon Sep 17 00:00:00 2001
From: DogmaDragon <103123951+DogmaDragon@users.noreply.github.com>
Date: Fri, 27 Jun 2025 05:54:44 +0300
Subject: [PATCH 015/405] Fix typo in Plugins documentation for clarity (#5972)

---
 ui/v2.5/src/docs/en/Manual/Plugins.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ui/v2.5/src/docs/en/Manual/Plugins.md b/ui/v2.5/src/docs/en/Manual/Plugins.md
index 47b87cf01..f7517aa2c 100644
--- a/ui/v2.5/src/docs/en/Manual/Plugins.md
+++ b/ui/v2.5/src/docs/en/Manual/Plugins.md
@@ -1,6 +1,7 @@
 # Plugins
 
 Stash supports plugins that can do the following:
+
 - perform custom tasks when triggered by the user from the Tasks page
 - perform custom tasks when triggered from specific events
 - add custom CSS to the UI
@@ -14,7 +15,7 @@ Plugin tasks can be implemented using embedded Javascript, or by calling an exte
 
 Plugins can be installed and managed from the `Settings > Plugins` page. 
 
-Scrapers are installed using the `Available Plugins` section. This section allows configuring sources from which to install plugins. The `Community (stable)` source is configured by default. This source contains plugins for the current _stable_ version of stash.
+Plugins are installed using the `Available Plugins` section. This section allows configuring sources from which to install plugins. The `Community (stable)` source is configured by default. This source contains plugins for the current _stable_ version of stash.
 
 These are the plugin sources maintained by the stashapp organisation:
 

From 5323d68d3d3234a00de67be838b9ea93105af74f Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Fri, 27 Jun 2025 16:26:03 +1000
Subject: [PATCH 016/405] Add graphql playground link to tools panel (#5807)

* Add graphql playground link to tools panel
* Move to separate section
---
 .../Settings/SettingsToolsPanel.tsx           | 60 ++++++++++++-------
 ui/v2.5/src/locales/en-GB.json                |  2 +
 2 files changed, 40 insertions(+), 22 deletions(-)

diff --git a/ui/v2.5/src/components/Settings/SettingsToolsPanel.tsx b/ui/v2.5/src/components/Settings/SettingsToolsPanel.tsx
index 8168ffb99..e3577a499 100644
--- a/ui/v2.5/src/components/Settings/SettingsToolsPanel.tsx
+++ b/ui/v2.5/src/components/Settings/SettingsToolsPanel.tsx
@@ -5,33 +5,49 @@ import { Link } from "react-router-dom";
 import { Setting } from "./Inputs";
 import { SettingSection } from "./SettingSection";
 import { PatchContainerComponent } from "src/patch";
+import { ExternalLink } from "../Shared/ExternalLink";
 
 const SettingsToolsSection = PatchContainerComponent("SettingsToolsSection");
 
 export const SettingsToolsPanel: React.FC = () => {
   return (
-    <SettingSection headingID="config.tools.scene_tools">
-      <SettingsToolsSection>
-        <Setting
-          heading={
-            <Link to="/sceneFilenameParser">
-              <Button>
-                <FormattedMessage id="config.tools.scene_filename_parser.title" />
-              </Button>
-            </Link>
-          }
-        />
+    <>
+      <SettingSection headingID="config.tools.heading">
+        <SettingsToolsSection>
+          <Setting
+            heading={
+              <ExternalLink href="/playground">
+                <Button>
+                  <FormattedMessage id="config.tools.graphql_playground" />
+                </Button>
+              </ExternalLink>
+            }
+          />
+        </SettingsToolsSection>
+      </SettingSection>
+      <SettingSection headingID="config.tools.scene_tools">
+        <SettingsToolsSection>
+          <Setting
+            heading={
+              <Link to="/sceneFilenameParser">
+                <Button>
+                  <FormattedMessage id="config.tools.scene_filename_parser.title" />
+                </Button>
+              </Link>
+            }
+          />
 
-        <Setting
-          heading={
-            <Link to="/sceneDuplicateChecker">
-              <Button>
-                <FormattedMessage id="config.tools.scene_duplicate_checker" />
-              </Button>
-            </Link>
-          }
-        />
-      </SettingsToolsSection>
-    </SettingSection>
+          <Setting
+            heading={
+              <Link to="/sceneDuplicateChecker">
+                <Button>
+                  <FormattedMessage id="config.tools.scene_duplicate_checker" />
+                </Button>
+              </Link>
+            }
+          />
+        </SettingsToolsSection>
+      </SettingSection>
+    </>
   );
 };
diff --git a/ui/v2.5/src/locales/en-GB.json b/ui/v2.5/src/locales/en-GB.json
index 3d342754f..8095870cb 100644
--- a/ui/v2.5/src/locales/en-GB.json
+++ b/ui/v2.5/src/locales/en-GB.json
@@ -569,6 +569,8 @@
       "set_name_date_details_from_metadata_if_present": "Set name, date, details from embedded file metadata"
     },
     "tools": {
+      "graphql_playground": "GraphQL playground",
+      "heading": "Tools",
       "scene_duplicate_checker": "Scene Duplicate Checker",
       "scene_filename_parser": {
         "add_field": "Add Field",

From 429022a46865fcb902499adb5c41fa27867184d3 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Mon, 30 Jun 2025 07:51:53 +1000
Subject: [PATCH 017/405] Handle marshalling scraped movie to group (#5974)

---
 internal/api/scraped_content.go | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/internal/api/scraped_content.go b/internal/api/scraped_content.go
index 6288812ef..f7d40c95d 100644
--- a/internal/api/scraped_content.go
+++ b/internal/api/scraped_content.go
@@ -135,6 +135,13 @@ func marshalScrapedGroups(content []scraper.ScrapedContent) ([]*models.ScrapedGr
 			ret = append(ret, m)
 		case models.ScrapedGroup:
 			ret = append(ret, &m)
+		// it's possible that a scraper returns models.ScrapedMovie
+		case *models.ScrapedMovie:
+			g := m.ScrapedGroup()
+			ret = append(ret, &g)
+		case models.ScrapedMovie:
+			g := m.ScrapedGroup()
+			ret = append(ret, &g)
 		default:
 			return nil, fmt.Errorf("%w: cannot turn ScrapedContent into ScrapedGroup", models.ErrConversion)
 		}

From bd8ec8cb832e55eb9b3e769a10119e90083b3d8f Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Mon, 30 Jun 2025 07:52:12 +1000
Subject: [PATCH 018/405] Don't update stash ids when scraping from stash-box
 (#5975)

---
 .../Performers/PerformerDetails/PerformerEditPanel.tsx           | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
index df5b62b05..a3f128fee 100644
--- a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
@@ -466,7 +466,6 @@ export const PerformerEditPanel: React.FC<IPerformerDetails> = ({
       setScraper(undefined);
     } else {
       setScrapedPerformer(result);
-      updateStashIDs(performerResult.remote_site_id);
     }
   }
 

From 7215b6e9180ef99d62785e58d6ff7c795f60e1d1 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Mon, 30 Jun 2025 07:52:32 +1000
Subject: [PATCH 019/405] Ensure tmp dir is created before creating temp file
 (#5977)

---
 pkg/models/paths/paths_generated.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkg/models/paths/paths_generated.go b/pkg/models/paths/paths_generated.go
index d87e1eed6..2b5f5003e 100644
--- a/pkg/models/paths/paths_generated.go
+++ b/pkg/models/paths/paths_generated.go
@@ -43,6 +43,9 @@ func (gp *generatedPaths) GetTmpPath(fileName string) string {
 // TempFile creates a temporary file using os.CreateTemp.
 // It is the equivalent of calling os.CreateTemp using Tmp and pattern.
 func (gp *generatedPaths) TempFile(pattern string) (*os.File, error) {
+	if err := gp.EnsureTmpDir(); err != nil {
+		logger.Warnf("Could not ensure existence of a temporary directory: %v", err)
+	}
 	return os.CreateTemp(gp.Tmp, pattern)
 }
 

From 61ab6ce6bd7eb1a825d8df9507c94a303ad7bbdc Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Mon, 30 Jun 2025 07:52:53 +1000
Subject: [PATCH 020/405] Fix funscript parsing issues  (#5978)

* Accept floating point numbers for at field in funscript
* Ignore type of script version field
* Write rounded ints for csv
---
 .../generator_interactive_heatmap_speed.go    | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/internal/manager/generator_interactive_heatmap_speed.go b/internal/manager/generator_interactive_heatmap_speed.go
index ac6ca53bd..d10ce5b19 100644
--- a/internal/manager/generator_interactive_heatmap_speed.go
+++ b/internal/manager/generator_interactive_heatmap_speed.go
@@ -28,7 +28,8 @@ type InteractiveHeatmapSpeedGenerator struct {
 
 type Script struct {
 	// Version of Launchscript
-	Version string `json:"version"`
+	// #5600 - ignore version, don't validate type
+	Version json.RawMessage `json:"version"`
 	// Inverted causes up and down movement to be flipped.
 	Inverted bool `json:"inverted,omitempty"`
 	// Range is the percentage of a full stroke to use.
@@ -40,7 +41,7 @@ type Script struct {
 // Action is a move at a specific time.
 type Action struct {
 	// At time in milliseconds the action should fire.
-	At int64 `json:"at"`
+	At float64 `json:"at"`
 	// Pos is the place in percent to move to.
 	Pos int `json:"pos"`
 
@@ -109,8 +110,8 @@ func (g *InteractiveHeatmapSpeedGenerator) LoadFunscriptData(path string, sceneD
 	// trim actions with negative timestamps to avoid index range errors when generating heatmap
 	// #3181 - also trim actions that occur after the scene duration
 	loggedBadTimestamp := false
-	sceneDurationMilli := int64(sceneDuration * 1000)
-	isValid := func(x int64) bool {
+	sceneDurationMilli := sceneDuration * 1000
+	isValid := func(x float64) bool {
 		return x >= 0 && x < sceneDurationMilli
 	}
 
@@ -132,7 +133,7 @@ func (g *InteractiveHeatmapSpeedGenerator) LoadFunscriptData(path string, sceneD
 
 func (funscript *Script) UpdateIntensityAndSpeed() {
 
-	var t1, t2 int64
+	var t1, t2 float64
 	var p1, p2 int
 	var intensity float64
 	for i := range funscript.Actions {
@@ -241,13 +242,13 @@ func (gt GradientTable) GetYRange(t float64) [2]float64 {
 
 func (funscript Script) getGradientTable(numSegments int, sceneDurationMilli int64) GradientTable {
 	const windowSize = 15
-	const backfillThreshold = 500
+	const backfillThreshold = float64(500)
 
 	segments := make([]struct {
 		count     int
 		intensity int
 		yRange    [2]float64
-		at        int64
+		at        float64
 	}, numSegments)
 	gradient := make(GradientTable, numSegments)
 	posList := []int{}
@@ -297,7 +298,7 @@ func (funscript Script) getGradientTable(numSegments int, sceneDurationMilli int
 
 	// Fill in gaps in segments
 	for i := 0; i < numSegments; i++ {
-		segmentTS := (maxts / int64(numSegments)) * int64(i)
+		segmentTS := float64((maxts / int64(numSegments)) * int64(i))
 
 		// Empty segment - fill it with the previous up to backfillThreshold ms
 		if segments[i].count == 0 {
@@ -406,7 +407,8 @@ func ConvertFunscriptToCSV(funscriptPath string) ([]byte, error) {
 			pos = convertRange(pos, 0, funscript.Range, 0, 100)
 		}
 
-		buffer.WriteString(fmt.Sprintf("%d,%d\r\n", action.At, pos))
+		// I don't know whether the csv format requires int or float, so for now we'll use int
+		buffer.WriteString(fmt.Sprintf("%d,%d\r\n", int(math.Round(action.At)), pos))
 	}
 	return buffer.Bytes(), nil
 }

From 6f4920cb8106804ddd32873144593140f5298baa Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Mon, 30 Jun 2025 07:53:08 +1000
Subject: [PATCH 021/405] Update custom css links and replace plex theme link
 with themes link (#5976)

---
 ui/v2.5/src/docs/en/Manual/Interface.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/v2.5/src/docs/en/Manual/Interface.md b/ui/v2.5/src/docs/en/Manual/Interface.md
index 0f5fc23c4..31c7e25d4 100644
--- a/ui/v2.5/src/docs/en/Manual/Interface.md
+++ b/ui/v2.5/src/docs/en/Manual/Interface.md
@@ -30,9 +30,9 @@ By default, when a scene has a resume point, the scene player will automatically
 
 ## Custom CSS
 
-The stash UI can be customised using custom CSS. See [here](https://docs.stashapp.cc/user-interface-ui/custom-css-snippets) for a community-curated set of CSS snippets to customise your UI. 
+The stash UI can be customised using custom CSS. See [here](https://docs.stashapp.cc/themes/custom-css-snippets/) for a community-curated set of CSS snippets to customise your UI. 
 
-[Stash Plex Theme](https://docs.stashapp.cc/user-interface-ui/themes/plex) is a community created theme inspired by the popular Plex interface.
+There is also a [collection of community-created themes](https://docs.stashapp.cc/themes/list/#browse-themes) available.
 
 ## Custom Javascript
 

From 3a232b1d6c92bc3cdd3bea7922cb8e73f9148a52 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Mon, 30 Jun 2025 07:53:33 +1000
Subject: [PATCH 022/405] Pagination styling (#5973)

* Raise pagination slightly to avoid occlusion from link bar
* Add shadow to pagination
---
 ui/v2.5/src/components/List/styles.scss | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/ui/v2.5/src/components/List/styles.scss b/ui/v2.5/src/components/List/styles.scss
index 49deb5983..d025ed6c1 100644
--- a/ui/v2.5/src/components/List/styles.scss
+++ b/ui/v2.5/src/components/List/styles.scss
@@ -984,14 +984,20 @@ input[type="range"].zoom-slider {
 .pagination-footer {
   background-color: transparent;
   bottom: $navbar-height;
-  padding: 0.5rem 1rem;
+  margin: auto;
+  padding: 0.5rem 1rem 0.75rem;
   position: sticky;
+  width: fit-content;
   z-index: 10;
 
   @include media-breakpoint-up(sm) {
     bottom: 0;
   }
 
+  .pagination.btn-group {
+    box-shadow: 0 8px 10px 2px rgb(0 0 0 / 30%);
+  }
+
   .pagination {
     margin-bottom: 0;
 

From f01f95ddfb88ff02fc199c6c5dcd54a38e5115dc Mon Sep 17 00:00:00 2001
From: QxxxGit <71350626+QxxxGit@users.noreply.github.com>
Date: Mon, 30 Jun 2025 23:48:16 -0400
Subject: [PATCH 023/405] Organize UIPluginApi.md docs and pluginApi.d.ts
 (#5971)

* Organized alphabetically and removed duplicate Setting and TabTitleCounter
* Organized components alphabetically
* Add missing PerformerDetailsPanel and PerformerDetailsPanel.DetailGroup
* Add missing SceneFileInfoPanel component
* Add missing MainNavBar.MenuItems and MainNavBar.UtilityItems in docs
---
 ui/v2.5/src/docs/en/Manual/UIPluginApi.md |  31 ++---
 ui/v2.5/src/pluginApi.d.ts                | 138 +++++++++++-----------
 2 files changed, 86 insertions(+), 83 deletions(-)

diff --git a/ui/v2.5/src/docs/en/Manual/UIPluginApi.md b/ui/v2.5/src/docs/en/Manual/UIPluginApi.md
index 37c9993ba..f010deb38 100644
--- a/ui/v2.5/src/docs/en/Manual/UIPluginApi.md
+++ b/ui/v2.5/src/docs/en/Manual/UIPluginApi.md
@@ -153,8 +153,8 @@ Returns `void`.
 - `CompressedPerformerDetailsPanel`
 - `ConstantSetting`
 - `CountrySelect`
-- `CustomFields`
 - `CustomFieldInput`
+- `CustomFields`
 - `DateInput`
 - `DetailImage`
 - `ExternalLinkButtons`
@@ -169,6 +169,9 @@ Returns `void`.
 - `GalleryIDSelect`
 - `GallerySelect`
 - `GallerySelect.sort`
+- `GroupIDSelect`
+- `GroupSelect`
+- `GroupSelect.sort`
 - `HeaderImage`
 - `HoverPopover`
 - `Icon`
@@ -176,10 +179,9 @@ Returns `void`.
 - `ImageInput`
 - `LightboxLink`
 - `LoadingIndicator`
+- `MainNavBar.MenuItems`
+- `MainNavBar.UtilityItems`
 - `ModalSetting`
-- `GroupIDSelect`
-- `GroupSelect`
-- `GroupSelect.sort`
 - `NumberSetting`
 - `Pagination`
 - `PaginationIndex`
@@ -192,16 +194,17 @@ Returns `void`.
 - `PerformerCard.Title`
 - `PerformerDetailsPanel`
 - `PerformerDetailsPanel.DetailGroup`
-- `PerformerIDSelect`
-- `PerformerPage`
-- `PerformerSelect`
-- `PerformerSelect.sort`
 - `PerformerGalleriesPanel`
 - `PerformerGroupsPanel`
 - `PerformerHeaderImage`
+- `PerformerIDSelect`
 - `PerformerImagesPanel`
+- `PerformerPage`
 - `PerformerScenesPanel`
+- `PerformerSelect`
+- `PerformerSelect.sort`
 - `PluginRoutes`
+- `PluginSettings`
 - `RatingNumber`
 - `RatingStars`
 - `RatingSystem`
@@ -210,18 +213,20 @@ Returns `void`.
 - `SceneCard.Image`
 - `SceneCard.Overlays`
 - `SceneCard.Popovers`
+- `SceneFileInfoPanel`
 - `SceneIDSelect`
 - `ScenePage`
-- `ScenePage.Tabs`
 - `ScenePage.TabContent`
+- `ScenePage.Tabs`
 - `ScenePlayer`
 - `SceneSelect`
 - `SceneSelect.sort`
 - `SelectSetting`
 - `Setting`
+- `SettingGroup`
 - `SettingModal`
-- `StringSetting`
 - `StringListSetting`
+- `StringSetting`
 - `StudioIDSelect`
 - `StudioSelect`
 - `StudioSelect.sort`
@@ -233,15 +238,11 @@ Returns `void`.
 - `TagCard.Overlays`
 - `TagCard.Popovers`
 - `TagCard.Title`
-- `TagLink`
-- `TabTitleCounter`
 - `TagIDSelect`
+- `TagLink`
 - `TagSelect`
 - `TagSelect.sort`
 - `TruncatedText`
-- `PluginSettings`
-- `Setting`
-- `SettingGroup`
 
 ### `PluginApi.Event`
 
diff --git a/ui/v2.5/src/pluginApi.d.ts b/ui/v2.5/src/pluginApi.d.ts
index 2e6d23266..da4a64765 100644
--- a/ui/v2.5/src/pluginApi.d.ts
+++ b/ui/v2.5/src/pluginApi.d.ts
@@ -652,88 +652,90 @@ declare namespace PluginApi {
     }>;
   }
   const components: {
-    HoverPopover: React.FC<any>;
-    TagLink: React.FC<any>;
-    LoadingIndicator: React.FC<any>;
-    Icon: React.FC<any>;
-    "MainNavBar.MenuItems": React.FC<any>;
-    "MainNavBar.UtilityItems": React.FC<any>;
-    PerformerSelect: React.FC<any>;
-    PerformerIDSelect: React.FC<any>;
-    TagSelect: React.FC<any>;
-    TagIDSelect: React.FC<any>;
-    StudioSelect: React.FC<any>;
-    StudioIDSelect: React.FC<any>;
-    GallerySelect: React.FC<any>;
-    GalleryIDSelect: React.FC<any>;
-    GroupSelect: React.FC<any>;
-    GroupIDSelect: React.FC<any>;
-    SceneSelect: React.FC<any>;
-    SceneIDSelect: React.FC<any>;
-    DateInput: React.FC<any>;
-    CountrySelect: React.FC<any>;
-    FolderSelect: React.FC<any>;
-    "SceneCard.Popovers": React.FC<any>;
-    "SceneCard.Details": React.FC<any>;
-    "SceneCard.Overlays": React.FC<any>;
-    "SceneCard.Image": React.FC<any>;
-    PluginSettings: React.FC<any>;
-    Setting: React.FC<any>;
-    SettingGroup: React.FC<any>;
+    AlertModal: React.FC<any>;
+    BackgroundImage: React.FC<any>;
     BooleanSetting: React.FC<any>;
-    SelectSetting: React.FC<any>;
     ChangeButtonSetting: React.FC<any>;
-    SettingModal: React.FC<any>;
-    ModalSetting: React.FC<any>;
-    StringSetting: React.FC<any>;
-    NumberSetting: React.FC<any>;
-    StringListSetting: React.FC<any>;
     ConstantSetting: React.FC<any>;
-    SceneFileInfoPanel: React.FC<any>;
-    PerformerPage: React.FC<any>;
-    PerformerAppearsWithPanel: React.FC<any>;
-    PerformerGalleriesPanel: React.FC<any>;
-    PerformerGroupsPanel: React.FC<any>;
-    PerformerHeaderImage: React.FC<any>;
-    PerformerScenesPanel: React.FC<any>;
-    PerformerImagesPanel: React.FC<any>;
-    TabTitleCounter: React.FC<any>;
-    PerformerCard: React.FC<any>;
+    CountrySelect: React.FC<any>;
+    CustomFieldInput: React.FC<any>;
+    CustomFields: React.FC<any>;
+    DateInput: React.FC<any>;
+    DetailImage: React.FC<any>;
     ExternalLinkButtons: React.FC<any>;
     ExternalLinksButton: React.FC<any>;
-    CustomFields: React.FC<any>;
-    CustomFieldInput: React.FC<any>;
-    ImageInput: React.FC<any>;
-    DetailImage: React.FC<any>;
-    HeaderImage: React.FC<any>;
-    LightboxLink: React.FC<any>;
-    "PerformerCard.Popovers": React.FC<any>;
-    "PerformerCard.Details": React.FC<any>;
-    "PerformerCard.Overlays": React.FC<any>;
-    "PerformerCard.Image": React.FC<any>;
-    "PerformerCard.Title": React.FC<any>;
-    "TagCard.Popovers": React.FC<any>;
-    "TagCard.Details": React.FC<any>;
-    "TagCard.Overlays": React.FC<any>;
-    "TagCard.Image": React.FC<any>;
-    "TagCard.Title": React.FC<any>;
-    ScenePage: React.FC<any>;
-    "ScenePage.Tabs": React.FC<any>;
-    "ScenePage.TabContent": React.FC<any>;
-    ScenePlayer: React.FC<any>;
+    FolderSelect: React.FC<any>;
     FrontPage: React.FC<any>;
     GalleryCard: React.FC<any>;
     "GalleryCard.Details": React.FC<any>;
     "GalleryCard.Image": React.FC<any>;
     "GalleryCard.Overlays": React.FC<any>;
     "GalleryCard.Popovers": React.FC<any>;
-    TruncatedText: React.FC<any>;
-    SweatDrops: React.FC<any>;
-    AlertModal: React.FC<any>;
-    BackgroundImage: React.FC<any>;
+    GalleryIDSelect: React.FC<any>;
+    GallerySelect: React.FC<any>;
+    GroupIDSelect: React.FC<any>;
+    GroupSelect: React.FC<any>;
+    HeaderImage: React.FC<any>;
+    HoverPopover: React.FC<any>;
+    Icon: React.FC<any>;
+    ImageInput: React.FC<any>;
+    LightboxLink: React.FC<any>;
+    LoadingIndicator: React.FC<any>;
+    "MainNavBar.MenuItems": React.FC<any>;
+    "MainNavBar.UtilityItems": React.FC<any>;
+    ModalSetting: React.FC<any>;
+    NumberSetting: React.FC<any>;
+    PerformerAppearsWithPanel: React.FC<any>;
+    PerformerCard: React.FC<any>;
+    "PerformerCard.Details": React.FC<any>;
+    "PerformerCard.Image": React.FC<any>;
+    "PerformerCard.Overlays": React.FC<any>;
+    "PerformerCard.Popovers": React.FC<any>;
+    "PerformerCard.Title": React.FC<any>;
+    PerformerDetailsPanel: React.FC<any>;
+    "PerformerDetailsPanel.DetailGroup": React.FC<any>;
+    PerformerGalleriesPanel: React.FC<any>;
+    PerformerGroupsPanel: React.FC<any>;
+    PerformerHeaderImage: React.FC<any>;
+    PerformerIDSelect: React.FC<any>;
+    PerformerImagesPanel: React.FC<any>;
+    PerformerPage: React.FC<any>;
+    PerformerScenesPanel: React.FC<any>;
+    PerformerSelect: React.FC<any>;
+    PluginSettings: React.FC<any>;
     RatingNumber: React.FC<any>;
     RatingStars: React.FC<any>;
     RatingSystem: React.FC<any>;
+    SceneFileInfoPanel: React.FC<any>;
+    SceneIDSelect: React.FC<any>;
+    ScenePage: React.FC<any>;
+    "ScenePage.TabContent": React.FC<any>;
+    "ScenePage.Tabs": React.FC<any>;
+    ScenePlayer: React.FC<any>;
+    SceneSelect: React.FC<any>;
+    "SceneCard.Details": React.FC<any>;
+    "SceneCard.Image": React.FC<any>;
+    "SceneCard.Overlays": React.FC<any>;
+    "SceneCard.Popovers": React.FC<any>;
+    SelectSetting: React.FC<any>;
+    Setting: React.FC<any>;
+    SettingGroup: React.FC<any>;
+    SettingModal: React.FC<any>;
+    StringListSetting: React.FC<any>;
+    StringSetting: React.FC<any>;
+    StudioIDSelect: React.FC<any>;
+    StudioSelect: React.FC<any>;
+    SweatDrops: React.FC<any>;
+    TabTitleCounter: React.FC<any>;
+    TagIDSelect: React.FC<any>;
+    "TagCard.Details": React.FC<any>;
+    "TagCard.Image": React.FC<any>;
+    "TagCard.Overlays": React.FC<any>;
+    "TagCard.Popovers": React.FC<any>;
+    "TagCard.Title": React.FC<any>;
+    TagLink: React.FC<any>;
+    TagSelect: React.FC<any>;
+    TruncatedText: React.FC<any>;
   };
   type PatchableComponentNames = keyof typeof components | string;
   namespace utils {

From d98e9c661847ca771a49d282fb3580c1d043c0d5 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Wed, 2 Jul 2025 16:34:40 +1000
Subject: [PATCH 024/405] Show filter tags in scene list toolbar (#5969)

* Add filter tags to toolbar
* Show overflow control if filter tags overflow
* Remove second set of filter tags from top of page
* Add border around filter area
---
 ui/v2.5/src/components/List/FilterTags.tsx  | 199 +++++++++++++++++++-
 ui/v2.5/src/components/List/styles.scss     |  17 +-
 ui/v2.5/src/components/Scenes/SceneList.tsx |  32 ++--
 ui/v2.5/src/components/Scenes/styles.scss   |  39 +++-
 ui/v2.5/src/components/Shared/styles.scss   |   8 +
 ui/v2.5/src/locales/en-GB.json              |   3 +-
 6 files changed, 273 insertions(+), 25 deletions(-)

diff --git a/ui/v2.5/src/components/List/FilterTags.tsx b/ui/v2.5/src/components/List/FilterTags.tsx
index b690f8781..8d9b24e40 100644
--- a/ui/v2.5/src/components/List/FilterTags.tsx
+++ b/ui/v2.5/src/components/List/FilterTags.tsx
@@ -1,11 +1,18 @@
-import React, { PropsWithChildren } from "react";
-import { Badge, BadgeProps, Button } from "react-bootstrap";
+import React, {
+  PropsWithChildren,
+  useEffect,
+  useLayoutEffect,
+  useReducer,
+  useRef,
+} from "react";
+import { Badge, BadgeProps, Button, Overlay, Popover } from "react-bootstrap";
 import { Criterion } from "src/models/list-filter/criteria/criterion";
 import { FormattedMessage, useIntl } from "react-intl";
 import { Icon } from "../Shared/Icon";
 import { faTimes } from "@fortawesome/free-solid-svg-icons";
 import { BsPrefixProps, ReplaceProps } from "react-bootstrap/esm/helpers";
 import { CustomFieldsCriterion } from "src/models/list-filter/criteria/custom-fields";
+import { useDebounce } from "src/hooks/debounce";
 
 type TagItemProps = PropsWithChildren<
   ReplaceProps<"span", BsPrefixProps<"span"> & BadgeProps>
@@ -41,11 +48,59 @@ export const FilterTag: React.FC<{
   );
 };
 
+const MoreFilterTags: React.FC<{
+  tags: React.ReactNode[];
+}> = ({ tags }) => {
+  const [showTooltip, setShowTooltip] = React.useState(false);
+  const target = useRef(null);
+
+  if (!tags.length) {
+    return null;
+  }
+
+  function handleMouseEnter() {
+    setShowTooltip(true);
+  }
+
+  function handleMouseLeave() {
+    setShowTooltip(false);
+  }
+
+  return (
+    <>
+      <Overlay target={target.current} placement="bottom" show={showTooltip}>
+        <Popover
+          id="more-criteria-popover"
+          className="hover-popover-content"
+          onMouseEnter={handleMouseEnter}
+          onMouseLeave={handleMouseLeave}
+          onClick={handleMouseLeave}
+        >
+          {tags}
+        </Popover>
+      </Overlay>
+      <Badge
+        ref={target}
+        className={"tag-item more-tags"}
+        variant="secondary"
+        onMouseEnter={handleMouseEnter}
+        onMouseLeave={handleMouseLeave}
+      >
+        <FormattedMessage
+          id="search_filter.more_filter_criteria"
+          values={{ count: tags.length }}
+        />
+      </Badge>
+    </>
+  );
+};
+
 interface IFilterTagsProps {
   criteria: Criterion[];
   onEditCriterion: (c: Criterion) => void;
   onRemoveCriterion: (c: Criterion, valueIndex?: number) => void;
   onRemoveAll: () => void;
+  truncateOnOverflow?: boolean;
 }
 
 export const FilterTags: React.FC<IFilterTagsProps> = ({
@@ -53,8 +108,117 @@ export const FilterTags: React.FC<IFilterTagsProps> = ({
   onEditCriterion,
   onRemoveCriterion,
   onRemoveAll,
+  truncateOnOverflow = false,
 }) => {
   const intl = useIntl();
+  const ref = useRef<HTMLDivElement>(null);
+
+  const [cutoff, setCutoff] = React.useState<number | undefined>();
+  const elementGap = 10; // Adjust this value based on your CSS gap or margin
+  const moreTagWidth = 80; // reserve space for the "more" tag
+
+  const [, forceUpdate] = useReducer((x) => x + 1, 0);
+
+  const debounceResetCutoff = useDebounce(
+    () => {
+      setCutoff(undefined);
+      // setting cutoff won't trigger a re-render if it's already undefined
+      // so we force a re-render to recalculate the cutoff
+      forceUpdate();
+    },
+    100 // Adjust the debounce delay as needed
+  );
+
+  // trigger recalculation of cutoff when control resizes
+  useEffect(() => {
+    if (!truncateOnOverflow || !ref.current) {
+      return;
+    }
+
+    const resizeObserver = new ResizeObserver(() => {
+      debounceResetCutoff();
+    });
+
+    const { current } = ref;
+    resizeObserver.observe(current);
+
+    return () => {
+      resizeObserver.disconnect();
+    };
+  }, [truncateOnOverflow, debounceResetCutoff]);
+
+  // we need to check this on every render, and the call to setCutoff _should_ be safe
+  /* eslint-disable-next-line react-hooks/exhaustive-deps */
+  useLayoutEffect(() => {
+    if (!truncateOnOverflow) {
+      setCutoff(undefined);
+      return;
+    }
+
+    const { current } = ref;
+
+    if (current) {
+      // calculate the number of tags that can fit in the container
+      const containerWidth = current.clientWidth;
+      const children = Array.from(current.children);
+
+      // don't recalculate anything if the more tag is visible and cutoff is already set
+      const moreTags = children.find((child) => {
+        return (child as HTMLElement).classList.contains("more-tags");
+      });
+
+      if (moreTags && !!cutoff) {
+        return;
+      }
+
+      const childTags = children.filter((child) => {
+        return (
+          (child as HTMLElement).classList.contains("tag-item") ||
+          (child as HTMLElement).classList.contains("clear-all-button")
+        );
+      });
+
+      const clearAllButton = children.find((child) => {
+        return (child as HTMLElement).classList.contains("clear-all-button");
+      });
+
+      // calculate the total width without the more tag
+      const defaultTotalWidth = childTags.reduce((total, child, idx) => {
+        return (
+          total +
+          ((child as HTMLElement).offsetWidth ?? 0) +
+          (idx === childTags.length - 1 ? 0 : elementGap)
+        );
+      }, 0);
+
+      if (containerWidth >= defaultTotalWidth) {
+        // if the container is wide enough to fit all tags, reset cutoff
+        setCutoff(undefined);
+        return;
+      }
+
+      let totalWidth = 0;
+      let visibleCount = 0;
+
+      // reserve space for the more tags control
+      totalWidth += moreTagWidth;
+
+      // reserve space for the clear all button if present
+      if (clearAllButton) {
+        totalWidth += (clearAllButton as HTMLElement).offsetWidth ?? 0;
+      }
+
+      for (const child of children) {
+        totalWidth += ((child as HTMLElement).offsetWidth ?? 0) + elementGap;
+        if (totalWidth > containerWidth) {
+          break;
+        }
+        visibleCount++;
+      }
+
+      setCutoff(visibleCount);
+    }
+  });
 
   function onRemoveCriterionTag(
     criterion: Criterion,
@@ -72,7 +236,7 @@ export const FilterTags: React.FC<IFilterTagsProps> = ({
     onEditCriterion(criterion);
   }
 
-  function renderFilterTags(criterion: Criterion) {
+  function getFilterTags(criterion: Criterion) {
     if (
       criterion instanceof CustomFieldsCriterion &&
       criterion.value.length > 1
@@ -105,9 +269,34 @@ export const FilterTags: React.FC<IFilterTagsProps> = ({
     return null;
   }
 
+  const className = "wrap-tags filter-tags";
+
+  const filterTags = criteria.map((c) => getFilterTags(c)).flat();
+
+  if (cutoff && filterTags.length > cutoff) {
+    const visibleCriteria = filterTags.slice(0, cutoff);
+    const hiddenCriteria = filterTags.slice(cutoff);
+
+    return (
+      <div className={className} ref={ref}>
+        {visibleCriteria}
+        <MoreFilterTags tags={hiddenCriteria} />
+        {criteria.length >= 3 && (
+          <Button
+            variant="minimal"
+            className="clear-all-button"
+            onClick={() => onRemoveAll()}
+          >
+            <FormattedMessage id="actions.clear" />
+          </Button>
+        )}
+      </div>
+    );
+  }
+
   return (
-    <div className="wrap-tags filter-tags">
-      {criteria.map(renderFilterTags)}
+    <div className={className} ref={ref}>
+      {filterTags}
       {criteria.length >= 3 && (
         <Button
           variant="minimal"
diff --git a/ui/v2.5/src/components/List/styles.scss b/ui/v2.5/src/components/List/styles.scss
index d025ed6c1..199417819 100644
--- a/ui/v2.5/src/components/List/styles.scss
+++ b/ui/v2.5/src/components/List/styles.scss
@@ -416,13 +416,18 @@ input[type="range"].zoom-slider {
   display: flex;
   justify-content: center;
   margin-bottom: 0.5rem;
-}
 
-.filter-tags .clear-all-button {
-  color: $text-color;
-  // to match filter pills
-  line-height: 16px;
-  padding: 0;
+  .more-tags {
+    background-color: transparent;
+    color: #fff;
+  }
+
+  .clear-all-button {
+    color: $text-color;
+    // to match filter pills
+    line-height: 16px;
+    padding: 0;
+  }
 }
 
 .filter-button {
diff --git a/ui/v2.5/src/components/Scenes/SceneList.tsx b/ui/v2.5/src/components/Scenes/SceneList.tsx
index fd75b96be..51795fe61 100644
--- a/ui/v2.5/src/components/Scenes/SceneList.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneList.tsx
@@ -62,6 +62,7 @@ import { FilterButton } from "../List/Filters/FilterButton";
 import { Icon } from "../Shared/Icon";
 import { ListViewOptions } from "../List/ListViewOptions";
 import { PageSizeSelector, SortBySelect } from "../List/ListFilter";
+import { Criterion } from "src/models/list-filter/criteria/criterion";
 
 function renderMetadataByline(result: GQL.FindScenesQueryResult) {
   const duration = result?.data?.findScenes?.duration;
@@ -316,11 +317,14 @@ interface IOperations {
 }
 
 const ListToolbarContent: React.FC<{
-  criteriaCount: number;
+  criteria: Criterion[];
   items: GQL.SlimSceneDataFragment[];
   selectedIds: Set<string>;
   operations: IOperations[];
   onToggleSidebar: () => void;
+  onEditCriterion: (c: Criterion) => void;
+  onRemoveCriterion: (criterion: Criterion, valueIndex?: number) => void;
+  onRemoveAllCriterion: () => void;
   onSelectAll: () => void;
   onSelectNone: () => void;
   onEdit: () => void;
@@ -328,11 +332,14 @@ const ListToolbarContent: React.FC<{
   onPlay: () => void;
   onCreateNew: () => void;
 }> = ({
-  criteriaCount,
+  criteria,
   items,
   selectedIds,
   operations,
   onToggleSidebar,
+  onEditCriterion,
+  onRemoveCriterion,
+  onRemoveAllCriterion,
   onSelectAll,
   onSelectNone,
   onEdit,
@@ -350,9 +357,16 @@ const ListToolbarContent: React.FC<{
         <div>
           <FilterButton
             onClick={() => onToggleSidebar()}
-            count={criteriaCount}
+            count={criteria.length}
             title={intl.formatMessage({ id: "actions.sidebar.toggle" })}
           />
+          <FilterTags
+            criteria={criteria}
+            onEditCriterion={onEditCriterion}
+            onRemoveCriterion={onRemoveCriterion}
+            onRemoveAll={onRemoveAllCriterion}
+            truncateOnOverflow
+          />
         </div>
       )}
       {hasSelection && (
@@ -730,11 +744,14 @@ export const FilteredSceneList = (props: IFilteredScenes) => {
               })}
             >
               <ListToolbarContent
-                criteriaCount={filter.count()}
+                criteria={filter.criteria}
                 items={items}
                 selectedIds={selectedIds}
                 operations={otherOperations}
                 onToggleSidebar={() => setShowSidebar(!showSidebar)}
+                onEditCriterion={(c) => showEditFilter(c.criterionOption.type)}
+                onRemoveCriterion={removeCriterion}
+                onRemoveAllCriterion={() => clearAllCriteria()}
                 onSelectAll={() => onSelectAll()}
                 onSelectNone={() => onSelectNone()}
                 onEdit={onEdit}
@@ -752,13 +769,6 @@ export const FilteredSceneList = (props: IFilteredScenes) => {
               onChangeFilter={(newFilter) => setFilter(newFilter)}
             />
 
-            <FilterTags
-              criteria={filter.criteria}
-              onEditCriterion={(c) => showEditFilter(c.criterionOption.type)}
-              onRemoveCriterion={removeCriterion}
-              onRemoveAll={() => clearAllCriteria()}
-            />
-
             <LoadedContent loading={result.loading} error={result.error}>
               <SceneList
                 filter={effectiveFilter}
diff --git a/ui/v2.5/src/components/Scenes/styles.scss b/ui/v2.5/src/components/Scenes/styles.scss
index e389e85cf..279552575 100644
--- a/ui/v2.5/src/components/Scenes/styles.scss
+++ b/ui/v2.5/src/components/Scenes/styles.scss
@@ -1020,13 +1020,13 @@ input[type="range"].blue-slider {
     &:last-child {
       flex-shrink: 0;
       justify-content: flex-end;
-      margin-left: auto;
     }
   }
 }
 
 .scene-list-toolbar {
-  flex-wrap: wrap;
+  flex-wrap: nowrap;
+  gap: 1rem;
   // offset the main padding
   margin-top: -0.5rem;
   padding-bottom: 0.5rem;
@@ -1062,6 +1062,35 @@ input[type="range"].blue-slider {
       display: none;
     }
   }
+
+  > div:first-child {
+    border: 1px solid $secondary;
+    border-radius: 0.25rem;
+    flex-grow: 1;
+    overflow-x: hidden;
+
+    .filter-button {
+      border-bottom-right-radius: 0;
+      border-top-right-radius: 0;
+    }
+  }
+
+  .filter-tags {
+    flex-grow: 1;
+    flex-wrap: nowrap;
+    justify-content: flex-start;
+    margin-bottom: 0;
+    width: calc(100% - 35px - 0.5rem);
+
+    @include media-breakpoint-down(xs) {
+      overflow-x: auto;
+      scrollbar-width: thin;
+    }
+
+    .tag-item {
+      white-space: nowrap;
+    }
+  }
 }
 
 .scene-list-header {
@@ -1092,3 +1121,9 @@ input[type="range"].blue-slider {
     top: 0;
   }
 }
+
+#more-criteria-popover {
+  box-shadow: 0 8px 10px 2px rgb(0 0 0 / 30%);
+  max-width: 400px;
+  padding: 0.25rem;
+}
diff --git a/ui/v2.5/src/components/Shared/styles.scss b/ui/v2.5/src/components/Shared/styles.scss
index b3726cd4f..10e381bd8 100644
--- a/ui/v2.5/src/components/Shared/styles.scss
+++ b/ui/v2.5/src/components/Shared/styles.scss
@@ -788,6 +788,14 @@ $sidebar-width: 250px;
     margin-left: -$sidebar-width;
   }
 
+  &.hide-sidebar .sidebar + div {
+    width: 100%;
+  }
+
+  &:not(.hide-sidebar) .sidebar + div {
+    width: calc(100% - $sidebar-width);
+  }
+
   > :nth-child(2) {
     flex-grow: 1;
     padding-left: 0.5rem;
diff --git a/ui/v2.5/src/locales/en-GB.json b/ui/v2.5/src/locales/en-GB.json
index 8095870cb..bd6308425 100644
--- a/ui/v2.5/src/locales/en-GB.json
+++ b/ui/v2.5/src/locales/en-GB.json
@@ -1317,7 +1317,8 @@
     "edit_filter": "Edit Filter",
     "name": "Filter",
     "saved_filters": "Saved filters",
-    "update_filter": "Update Filter"
+    "update_filter": "Update Filter",
+    "more_filter_criteria": "+{count} more"
   },
   "second": "Second",
   "seconds": "Seconds",

From dcfb3b7d37f2232e165dc660adb8599ebad867c2 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Wed, 2 Jul 2025 17:07:01 +1000
Subject: [PATCH 025/405] Throw error on re-registering component only if in
 prod environment (#5990)

This was causing an error when hot-reloading components, meaning that the components would not be refreshed.
---
 ui/v2.5/src/patch.tsx | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/ui/v2.5/src/patch.tsx b/ui/v2.5/src/patch.tsx
index 548993a07..2d1d3543e 100644
--- a/ui/v2.5/src/patch.tsx
+++ b/ui/v2.5/src/patch.tsx
@@ -39,7 +39,13 @@ export function RegisterComponent<T extends Function>(
 ) {
   // register with the plugin api
   if (components[component]) {
-    throw new Error("Component " + component + " has already been registered");
+    // only throw an error in production, in development we allow
+    // multiple registrations to allow for hot reloading of components
+    if (!import.meta.env.DEV) {
+      throw new Error(
+        "Component " + component + " has already been registered"
+      );
+    }
   }
 
   components[component] = fn;

From 108c0c7de59091a1e22c4f8003de81443d26f395 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Thu, 3 Jul 2025 10:40:51 +1000
Subject: [PATCH 026/405] Use /plugins instead of /plugin in testReact

---
 pkg/plugin/examples/react-component/src/testReact.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkg/plugin/examples/react-component/src/testReact.tsx b/pkg/plugin/examples/react-component/src/testReact.tsx
index d2733fb26..677e13aac 100644
--- a/pkg/plugin/examples/react-component/src/testReact.tsx
+++ b/pkg/plugin/examples/react-component/src/testReact.tsx
@@ -192,7 +192,7 @@ interface IPluginApi {
     );
   };
 
-  PluginApi.register.route("/plugin/test-react", TestPage);
+  PluginApi.register.route("/plugins/test-react", TestPage);
 
   PluginApi.patch.before("SettingsToolsSection", function (props: any) {
     const {
@@ -206,7 +206,7 @@ interface IPluginApi {
             {props.children}
             <Setting
               heading={
-                <Link to="/plugin/test-react">
+                <Link to="/plugins/test-react">
                   <Button>
                     Test page
                   </Button>
@@ -232,7 +232,7 @@ interface IPluginApi {
             <NavLink
               className="nav-utility"
               exact
-              to="/plugin/test-react"
+              to="/plugins/test-react"
             >
               <Button
                 className="minimal d-flex align-items-center h-100"

From 1b3a8acab2af959fba70927a4bbd3e2de2206d43 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Thu, 3 Jul 2025 13:07:37 +1000
Subject: [PATCH 027/405] Bring back select all/none to scene list (#5993)

---
 ui/v2.5/src/components/Scenes/SceneList.tsx | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/ui/v2.5/src/components/Scenes/SceneList.tsx b/ui/v2.5/src/components/Scenes/SceneList.tsx
index 51795fe61..ebe5be7e3 100644
--- a/ui/v2.5/src/components/Scenes/SceneList.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneList.tsx
@@ -669,6 +669,16 @@ export const FilteredSceneList = (props: IFilteredScenes) => {
       isDisplayed: () => !hasSelection,
       className: "create-new-item",
     },
+    {
+      text: intl.formatMessage({ id: "actions.select_all" }),
+      onClick: () => onSelectAll(),
+      isDisplayed: () => totalCount > 0,
+    },
+    {
+      text: intl.formatMessage({ id: "actions.select_none" }),
+      onClick: () => onSelectNone(),
+      isDisplayed: () => hasSelection,
+    },
     {
       text: intl.formatMessage({ id: "actions.play_random" }),
       onClick: playRandom,

From 642b0f22918d742f5f5311374af1f16652fb34bd Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Thu, 3 Jul 2025 14:41:06 +1000
Subject: [PATCH 028/405] Add missing keybinds to scene list (#5994)

---
 ui/v2.5/src/components/Scenes/SceneList.tsx | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/ui/v2.5/src/components/Scenes/SceneList.tsx b/ui/v2.5/src/components/Scenes/SceneList.tsx
index ebe5be7e3..a35864f97 100644
--- a/ui/v2.5/src/components/Scenes/SceneList.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneList.tsx
@@ -564,6 +564,25 @@ export const FilteredSceneList = (props: IFilteredScenes) => {
     setShowSidebar,
   });
 
+  useEffect(() => {
+    Mousetrap.bind("e", () => {
+      if (hasSelection) {
+        onEdit?.();
+      }
+    });
+
+    Mousetrap.bind("d d", () => {
+      if (hasSelection) {
+        onDelete?.();
+      }
+    });
+
+    return () => {
+      Mousetrap.unbind("e");
+      Mousetrap.unbind("d d");
+    };
+  });
+
   const onCloseEditDelete = useCloseEditDelete({
     closeModal,
     onSelectNone,

From 694675470ec33d0e32cef7ea7e454de2ae1ab315 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Tue, 8 Jul 2025 10:40:54 +1000
Subject: [PATCH 029/405] Map parent studio after creation (#5996)

---
 ui/v2.5/src/components/Tagger/context.tsx | 27 +++++++++++++++++------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/ui/v2.5/src/components/Tagger/context.tsx b/ui/v2.5/src/components/Tagger/context.tsx
index 9b1e996de..434a47cce 100644
--- a/ui/v2.5/src/components/Tagger/context.tsx
+++ b/ui/v2.5/src/components/Tagger/context.tsx
@@ -680,15 +680,28 @@ export const TaggerContext: React.FC = ({ children }) => {
           return r;
         }
 
+        let resultStudio = r.studio;
+        if (resultStudio.name === studio.name) {
+          resultStudio = {
+            ...resultStudio,
+            stored_id: studioID,
+          };
+        }
+
+        // #5821 - set the stored_id of the parent studio if it matches too
+        if (resultStudio.parent?.name === studio.name) {
+          resultStudio = {
+            ...resultStudio,
+            parent: {
+              ...resultStudio.parent,
+              stored_id: studioID,
+            },
+          };
+        }
+
         return {
           ...r,
-          studio:
-            r.studio.name === studio.name
-              ? {
-                  ...r.studio,
-                  stored_id: studioID,
-                }
-              : r.studio,
+          studio: resultStudio,
         };
       });
 

From dd9a1f5ce34a31e0ad36bce1ddeaec36387acc83 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Tue, 8 Jul 2025 10:41:12 +1000
Subject: [PATCH 030/405] Apply filter hook to subpage sidebar filters (#5995)

* Apply filterHook to sidebar filters on subpages
* Hide studio filter in studio subpage
---
 .../List/Filters/LabeledIdFilter.tsx          | 31 +++++++++++--------
 .../List/Filters/PerformersFilter.tsx         | 18 ++++++-----
 .../components/List/Filters/StudiosFilter.tsx | 18 ++++++-----
 .../components/List/Filters/TagsFilter.tsx    | 18 ++++++-----
 ui/v2.5/src/components/Scenes/SceneList.tsx   | 24 +++++++++-----
 5 files changed, 65 insertions(+), 44 deletions(-)

diff --git a/ui/v2.5/src/components/List/Filters/LabeledIdFilter.tsx b/ui/v2.5/src/components/List/Filters/LabeledIdFilter.tsx
index ef309ecde..200c16917 100644
--- a/ui/v2.5/src/components/List/Filters/LabeledIdFilter.tsx
+++ b/ui/v2.5/src/components/List/Filters/LabeledIdFilter.tsx
@@ -321,18 +321,24 @@ export function useCriterion(
   return { criterion, setCriterion };
 }
 
+export interface IUseQueryHookProps {
+  q: string;
+  filter?: ListFilterModel;
+  filterHook?: (filter: ListFilterModel) => ListFilterModel;
+  skip: boolean;
+}
+
 export function useQueryState(
-  useQuery: (
-    q: string,
-    filter: ListFilterModel,
-    skip: boolean
-  ) => ILoadResults<ILabeledId[]>,
+  useQuery: (props: IUseQueryHookProps) => ILoadResults<ILabeledId[]>,
   filter: ListFilterModel,
-  skip: boolean
+  skip: boolean,
+  options?: {
+    filterHook?: (filter: ListFilterModel) => ListFilterModel;
+  }
 ) {
   const [query, setQuery] = useState("");
   const { results: queryResults } = useCacheResults(
-    useQuery(query, filter, skip)
+    useQuery({ q: query, filter, filterHook: options?.filterHook, skip })
   );
 
   return { query, setQuery, queryResults };
@@ -431,11 +437,8 @@ export function useLabeledIdFilterState(props: {
   option: CriterionOption;
   filter: ListFilterModel;
   setFilter: (f: ListFilterModel) => void;
-  useQuery: (
-    q: string,
-    filter: ListFilterModel,
-    skip: boolean
-  ) => ILoadResults<ILabeledId[]>;
+  filterHook?: (filter: ListFilterModel) => ListFilterModel;
+  useQuery: (props: IUseQueryHookProps) => ILoadResults<ILabeledId[]>;
   singleValue?: boolean;
   hierarchical?: boolean;
   includeSubMessageID?: string;
@@ -444,6 +447,7 @@ export function useLabeledIdFilterState(props: {
     option,
     filter,
     setFilter,
+    filterHook,
     useQuery,
     singleValue = false,
     hierarchical = false,
@@ -456,7 +460,8 @@ export function useLabeledIdFilterState(props: {
   const { query, setQuery, queryResults } = useQueryState(
     useQuery,
     filter,
-    skip
+    skip,
+    { filterHook }
   );
 
   const { criterion, setCriterion } = useCriterion(option, filter, setFilter);
diff --git a/ui/v2.5/src/components/List/Filters/PerformersFilter.tsx b/ui/v2.5/src/components/List/Filters/PerformersFilter.tsx
index 84e3dd19b..79ad18c1b 100644
--- a/ui/v2.5/src/components/List/Filters/PerformersFilter.tsx
+++ b/ui/v2.5/src/components/List/Filters/PerformersFilter.tsx
@@ -12,6 +12,7 @@ import { sortByRelevance } from "src/utils/query";
 import { ListFilterModel } from "src/models/list-filter/filter";
 import { CriterionOption } from "src/models/list-filter/criteria/criterion";
 import {
+  IUseQueryHookProps,
   makeQueryVariables,
   setObjectFilter,
   useLabeledIdFilterState,
@@ -69,13 +70,12 @@ function sortResults(
   });
 }
 
-function usePerformerQueryFilter(
-  query: string,
-  f?: ListFilterModel,
-  skip?: boolean
-) {
+function usePerformerQueryFilter(props: IUseQueryHookProps) {
+  const { q: query, filter: f, skip, filterHook } = props;
+  const appliedFilter = filterHook && f ? filterHook(f.clone()) : f;
+
   const { data, loading } = useFindPerformersForSelectQuery({
-    variables: queryVariables(query, f),
+    variables: queryVariables(query, appliedFilter),
     skip,
   });
 
@@ -88,7 +88,7 @@ function usePerformerQueryFilter(
 }
 
 function usePerformerQuery(query: string, skip?: boolean) {
-  return usePerformerQueryFilter(query, undefined, skip);
+  return usePerformerQueryFilter({ q: query, skip: !!skip });
 }
 
 const PerformersFilter: React.FC<IPerformersFilter> = ({
@@ -109,10 +109,12 @@ export const SidebarPerformersFilter: React.FC<{
   option: CriterionOption;
   filter: ListFilterModel;
   setFilter: (f: ListFilterModel) => void;
-}> = ({ title, option, filter, setFilter }) => {
+  filterHook?: (f: ListFilterModel) => ListFilterModel;
+}> = ({ title, option, filter, setFilter, filterHook }) => {
   const state = useLabeledIdFilterState({
     filter,
     setFilter,
+    filterHook,
     option,
     useQuery: usePerformerQueryFilter,
   });
diff --git a/ui/v2.5/src/components/List/Filters/StudiosFilter.tsx b/ui/v2.5/src/components/List/Filters/StudiosFilter.tsx
index e9c05013d..9065f2452 100644
--- a/ui/v2.5/src/components/List/Filters/StudiosFilter.tsx
+++ b/ui/v2.5/src/components/List/Filters/StudiosFilter.tsx
@@ -10,6 +10,7 @@ import { sortByRelevance } from "src/utils/query";
 import { CriterionOption } from "src/models/list-filter/criteria/criterion";
 import { ListFilterModel } from "src/models/list-filter/filter";
 import {
+  IUseQueryHookProps,
   makeQueryVariables,
   setObjectFilter,
   useLabeledIdFilterState,
@@ -56,13 +57,12 @@ function sortResults(
   });
 }
 
-function useStudioQueryFilter(
-  query: string,
-  filter?: ListFilterModel,
-  skip?: boolean
-) {
+function useStudioQueryFilter(props: IUseQueryHookProps) {
+  const { q: query, filter: f, skip, filterHook } = props;
+  const appliedFilter = filterHook && f ? filterHook(f.clone()) : f;
+
   const { data, loading } = useFindStudiosForSelectQuery({
-    variables: queryVariables(query, filter),
+    variables: queryVariables(query, appliedFilter),
     skip,
   });
 
@@ -75,7 +75,7 @@ function useStudioQueryFilter(
 }
 
 function useStudioQuery(query: string, skip?: boolean) {
-  return useStudioQueryFilter(query, undefined, skip);
+  return useStudioQueryFilter({ q: query, skip: !!skip });
 }
 
 const StudiosFilter: React.FC<IStudiosFilter> = ({
@@ -97,10 +97,12 @@ export const SidebarStudiosFilter: React.FC<{
   option: CriterionOption;
   filter: ListFilterModel;
   setFilter: (f: ListFilterModel) => void;
-}> = ({ title, option, filter, setFilter }) => {
+  filterHook?: (f: ListFilterModel) => ListFilterModel;
+}> = ({ title, option, filter, setFilter, filterHook }) => {
   const state = useLabeledIdFilterState({
     filter,
     setFilter,
+    filterHook,
     option,
     useQuery: useStudioQueryFilter,
     singleValue: true,
diff --git a/ui/v2.5/src/components/List/Filters/TagsFilter.tsx b/ui/v2.5/src/components/List/Filters/TagsFilter.tsx
index 0a3f8c942..e8e25db56 100644
--- a/ui/v2.5/src/components/List/Filters/TagsFilter.tsx
+++ b/ui/v2.5/src/components/List/Filters/TagsFilter.tsx
@@ -10,6 +10,7 @@ import { sortByRelevance } from "src/utils/query";
 import { CriterionOption } from "src/models/list-filter/criteria/criterion";
 import { ListFilterModel } from "src/models/list-filter/filter";
 import {
+  IUseQueryHookProps,
   makeQueryVariables,
   setObjectFilter,
   useLabeledIdFilterState,
@@ -65,13 +66,12 @@ function sortResults(
   });
 }
 
-function useTagQueryFilter(
-  query: string,
-  filter?: ListFilterModel,
-  skip?: boolean
-) {
+function useTagQueryFilter(props: IUseQueryHookProps) {
+  const { q: query, filter: f, skip, filterHook } = props;
+  const appliedFilter = filterHook && f ? filterHook(f.clone()) : f;
+
   const { data, loading } = useFindTagsForSelectQuery({
-    variables: queryVariables(query, filter),
+    variables: queryVariables(query, appliedFilter),
     skip,
   });
 
@@ -84,7 +84,7 @@ function useTagQueryFilter(
 }
 
 function useTagQuery(query: string, skip?: boolean) {
-  return useTagQueryFilter(query, undefined, skip);
+  return useTagQueryFilter({ q: query, skip: !!skip });
 }
 
 const TagsFilter: React.FC<ITagsFilter> = ({ criterion, setCriterion }) => {
@@ -102,10 +102,12 @@ export const SidebarTagsFilter: React.FC<{
   option: CriterionOption;
   filter: ListFilterModel;
   setFilter: (f: ListFilterModel) => void;
-}> = ({ title, option, filter, setFilter }) => {
+  filterHook?: (f: ListFilterModel) => ListFilterModel;
+}> = ({ title, option, filter, setFilter, filterHook }) => {
   const state = useLabeledIdFilterState({
     filter,
     setFilter,
+    filterHook,
     option,
     useQuery: useTagQueryFilter,
     hierarchical: true,
diff --git a/ui/v2.5/src/components/Scenes/SceneList.tsx b/ui/v2.5/src/components/Scenes/SceneList.tsx
index a35864f97..0420de93c 100644
--- a/ui/v2.5/src/components/Scenes/SceneList.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneList.tsx
@@ -235,6 +235,7 @@ const ScenesFilterSidebarSections = PatchContainerComponent(
 const SidebarContent: React.FC<{
   filter: ListFilterModel;
   setFilter: (filter: ListFilterModel) => void;
+  filterHook?: (filter: ListFilterModel) => ListFilterModel;
   view?: View;
   sidebarOpen: boolean;
   onClose?: () => void;
@@ -243,6 +244,7 @@ const SidebarContent: React.FC<{
 }> = ({
   filter,
   setFilter,
+  filterHook,
   view,
   showEditFilter,
   sidebarOpen,
@@ -252,6 +254,8 @@ const SidebarContent: React.FC<{
   const showResultsId =
     count !== undefined ? "actions.show_count_results" : "actions.show_results";
 
+  const hideStudios = view === View.StudioScenes;
+
   return (
     <>
       <FilteredSidebarHeader
@@ -263,19 +267,23 @@ const SidebarContent: React.FC<{
       />
 
       <ScenesFilterSidebarSections>
-        <SidebarStudiosFilter
-          title={<FormattedMessage id="studios" />}
-          data-type={StudiosCriterionOption.type}
-          option={StudiosCriterionOption}
-          filter={filter}
-          setFilter={setFilter}
-        />
+        {!hideStudios && (
+          <SidebarStudiosFilter
+            title={<FormattedMessage id="studios" />}
+            data-type={StudiosCriterionOption.type}
+            option={StudiosCriterionOption}
+            filter={filter}
+            setFilter={setFilter}
+            filterHook={filterHook}
+          />
+        )}
         <SidebarPerformersFilter
           title={<FormattedMessage id="performers" />}
           data-type={PerformersCriterionOption.type}
           option={PerformersCriterionOption}
           filter={filter}
           setFilter={setFilter}
+          filterHook={filterHook}
         />
         <SidebarTagsFilter
           title={<FormattedMessage id="tags" />}
@@ -283,6 +291,7 @@ const SidebarContent: React.FC<{
           option={TagsCriterionOption}
           filter={filter}
           setFilter={setFilter}
+          filterHook={filterHook}
         />
         <SidebarRatingFilter
           title={<FormattedMessage id="rating" />}
@@ -759,6 +768,7 @@ export const FilteredSceneList = (props: IFilteredScenes) => {
             <SidebarContent
               filter={filter}
               setFilter={setFilter}
+              filterHook={filterHook}
               showEditFilter={showEditFilter}
               view={view}
               sidebarOpen={showSidebar}

From 21ee88b149b303a64eefa39caea61524e0165156 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Tue, 8 Jul 2025 10:41:33 +1000
Subject: [PATCH 031/405] Search term filter tag on scene list (#5991)

* Add search term to filter tags on scene list page

Clicking on the tag selects all on the search term input. Clicking on the x erases it.

* Ensure clear criteria maintains consistent behaviour on other pages
---
 ui/v2.5/src/components/List/FilterTags.tsx    | 64 +++++++++++--------
 .../components/List/Filters/FilterSidebar.tsx | 13 +++-
 ui/v2.5/src/components/List/util.ts           |  9 ++-
 ui/v2.5/src/components/Scenes/SceneList.tsx   | 25 +++++++-
 ui/v2.5/src/index.scss                        |  9 ++-
 ui/v2.5/src/models/list-filter/filter.ts      | 12 +++-
 ui/v2.5/src/utils/focus.ts                    |  8 ++-
 7 files changed, 103 insertions(+), 37 deletions(-)

diff --git a/ui/v2.5/src/components/List/FilterTags.tsx b/ui/v2.5/src/components/List/FilterTags.tsx
index 8d9b24e40..6812edcf7 100644
--- a/ui/v2.5/src/components/List/FilterTags.tsx
+++ b/ui/v2.5/src/components/List/FilterTags.tsx
@@ -9,31 +9,37 @@ import { Badge, BadgeProps, Button, Overlay, Popover } from "react-bootstrap";
 import { Criterion } from "src/models/list-filter/criteria/criterion";
 import { FormattedMessage, useIntl } from "react-intl";
 import { Icon } from "../Shared/Icon";
-import { faTimes } from "@fortawesome/free-solid-svg-icons";
+import { faMagnifyingGlass, faTimes } from "@fortawesome/free-solid-svg-icons";
 import { BsPrefixProps, ReplaceProps } from "react-bootstrap/esm/helpers";
 import { CustomFieldsCriterion } from "src/models/list-filter/criteria/custom-fields";
 import { useDebounce } from "src/hooks/debounce";
+import cx from "classnames";
 
 type TagItemProps = PropsWithChildren<
   ReplaceProps<"span", BsPrefixProps<"span"> & BadgeProps>
 >;
 
 export const TagItem: React.FC<TagItemProps> = (props) => {
-  const { children } = props;
+  const { className, children, ...others } = props;
   return (
-    <Badge className="tag-item" variant="secondary" {...props}>
+    <Badge
+      className={cx("tag-item", className)}
+      variant="secondary"
+      {...others}
+    >
       {children}
     </Badge>
   );
 };
 
 export const FilterTag: React.FC<{
+  className?: string;
   label: React.ReactNode;
   onClick: React.MouseEventHandler<HTMLSpanElement>;
   onRemove: React.MouseEventHandler<HTMLElement>;
-}> = ({ label, onClick, onRemove }) => {
+}> = ({ className, label, onClick, onRemove }) => {
   return (
-    <TagItem onClick={onClick}>
+    <TagItem className={className} onClick={onClick}>
       {label}
       <Button
         variant="secondary"
@@ -96,18 +102,24 @@ const MoreFilterTags: React.FC<{
 };
 
 interface IFilterTagsProps {
+  searchTerm?: string;
   criteria: Criterion[];
+  onEditSearchTerm?: () => void;
   onEditCriterion: (c: Criterion) => void;
   onRemoveCriterion: (c: Criterion, valueIndex?: number) => void;
   onRemoveAll: () => void;
+  onRemoveSearchTerm?: () => void;
   truncateOnOverflow?: boolean;
 }
 
 export const FilterTags: React.FC<IFilterTagsProps> = ({
+  searchTerm,
   criteria,
   onEditCriterion,
   onRemoveCriterion,
   onRemoveAll,
+  onEditSearchTerm,
+  onRemoveSearchTerm,
   truncateOnOverflow = false,
 }) => {
   const intl = useIntl();
@@ -265,7 +277,7 @@ export const FilterTags: React.FC<IFilterTagsProps> = ({
     );
   }
 
-  if (criteria.length === 0) {
+  if (criteria.length === 0 && !searchTerm) {
     return null;
   }
 
@@ -273,31 +285,31 @@ export const FilterTags: React.FC<IFilterTagsProps> = ({
 
   const filterTags = criteria.map((c) => getFilterTags(c)).flat();
 
-  if (cutoff && filterTags.length > cutoff) {
-    const visibleCriteria = filterTags.slice(0, cutoff);
-    const hiddenCriteria = filterTags.slice(cutoff);
-
-    return (
-      <div className={className} ref={ref}>
-        {visibleCriteria}
-        <MoreFilterTags tags={hiddenCriteria} />
-        {criteria.length >= 3 && (
-          <Button
-            variant="minimal"
-            className="clear-all-button"
-            onClick={() => onRemoveAll()}
-          >
-            <FormattedMessage id="actions.clear" />
-          </Button>
-        )}
-      </div>
+  if (searchTerm && searchTerm.length > 0) {
+    filterTags.unshift(
+      <FilterTag
+        key="search-term"
+        className="search-term-filter-tag"
+        label={
+          <span className="search-term">
+            <Icon icon={faMagnifyingGlass} />
+            {searchTerm}
+          </span>
+        }
+        onClick={() => onEditSearchTerm?.()}
+        onRemove={() => onRemoveSearchTerm?.()}
+      />
     );
   }
 
+  const visibleCriteria = cutoff ? filterTags.slice(0, cutoff) : filterTags;
+  const hiddenCriteria = cutoff ? filterTags.slice(cutoff) : [];
+
   return (
     <div className={className} ref={ref}>
-      {filterTags}
-      {criteria.length >= 3 && (
+      {visibleCriteria}
+      <MoreFilterTags tags={hiddenCriteria} />
+      {filterTags.length >= 3 && (
         <Button
           variant="minimal"
           className="clear-all-button"
diff --git a/ui/v2.5/src/components/List/Filters/FilterSidebar.tsx b/ui/v2.5/src/components/List/Filters/FilterSidebar.tsx
index 0ff201f86..6e26670d7 100644
--- a/ui/v2.5/src/components/List/Filters/FilterSidebar.tsx
+++ b/ui/v2.5/src/components/List/Filters/FilterSidebar.tsx
@@ -16,8 +16,17 @@ export const FilteredSidebarHeader: React.FC<{
   filter: ListFilterModel;
   setFilter: (filter: ListFilterModel) => void;
   view?: View;
-}> = ({ sidebarOpen, showEditFilter, filter, setFilter, view }) => {
-  const focus = useFocus();
+  focus?: ReturnType<typeof useFocus>;
+}> = ({
+  sidebarOpen,
+  showEditFilter,
+  filter,
+  setFilter,
+  view,
+  focus: providedFocus,
+}) => {
+  const localFocus = useFocus();
+  const focus = providedFocus ?? localFocus;
   const [, setFocus] = focus;
 
   // Set the focus on the input field when the sidebar is opened
diff --git a/ui/v2.5/src/components/List/util.ts b/ui/v2.5/src/components/List/util.ts
index bb85145e7..717f9c289 100644
--- a/ui/v2.5/src/components/List/util.ts
+++ b/ui/v2.5/src/components/List/util.ts
@@ -196,9 +196,12 @@ export function useFilterOperations(props: {
     [setFilter]
   );
 
-  const clearAllCriteria = useCallback(() => {
-    setFilter((cv) => cv.clearCriteria());
-  }, [setFilter]);
+  const clearAllCriteria = useCallback(
+    (includeSearchTerm = false) => {
+      setFilter((cv) => cv.clearCriteria(includeSearchTerm));
+    },
+    [setFilter]
+  );
 
   return {
     setPage,
diff --git a/ui/v2.5/src/components/Scenes/SceneList.tsx b/ui/v2.5/src/components/Scenes/SceneList.tsx
index 0420de93c..93c7e4d9e 100644
--- a/ui/v2.5/src/components/Scenes/SceneList.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneList.tsx
@@ -63,6 +63,7 @@ import { Icon } from "../Shared/Icon";
 import { ListViewOptions } from "../List/ListViewOptions";
 import { PageSizeSelector, SortBySelect } from "../List/ListFilter";
 import { Criterion } from "src/models/list-filter/criteria/criterion";
+import useFocus from "src/utils/focus";
 
 function renderMetadataByline(result: GQL.FindScenesQueryResult) {
   const duration = result?.data?.findScenes?.duration;
@@ -241,6 +242,7 @@ const SidebarContent: React.FC<{
   onClose?: () => void;
   showEditFilter: (editingCriterion?: string) => void;
   count?: number;
+  focus?: ReturnType<typeof useFocus>;
 }> = ({
   filter,
   setFilter,
@@ -250,6 +252,7 @@ const SidebarContent: React.FC<{
   sidebarOpen,
   onClose,
   count,
+  focus,
 }) => {
   const showResultsId =
     count !== undefined ? "actions.show_count_results" : "actions.show_results";
@@ -264,6 +267,7 @@ const SidebarContent: React.FC<{
         filter={filter}
         setFilter={setFilter}
         view={view}
+        focus={focus}
       />
 
       <ScenesFilterSidebarSections>
@@ -326,6 +330,7 @@ interface IOperations {
 }
 
 const ListToolbarContent: React.FC<{
+  searchTerm: string;
   criteria: Criterion[];
   items: GQL.SlimSceneDataFragment[];
   selectedIds: Set<string>;
@@ -334,6 +339,8 @@ const ListToolbarContent: React.FC<{
   onEditCriterion: (c: Criterion) => void;
   onRemoveCriterion: (criterion: Criterion, valueIndex?: number) => void;
   onRemoveAllCriterion: () => void;
+  onEditSearchTerm: () => void;
+  onRemoveSearchTerm: () => void;
   onSelectAll: () => void;
   onSelectNone: () => void;
   onEdit: () => void;
@@ -341,6 +348,7 @@ const ListToolbarContent: React.FC<{
   onPlay: () => void;
   onCreateNew: () => void;
 }> = ({
+  searchTerm,
   criteria,
   items,
   selectedIds,
@@ -349,6 +357,8 @@ const ListToolbarContent: React.FC<{
   onEditCriterion,
   onRemoveCriterion,
   onRemoveAllCriterion,
+  onEditSearchTerm,
+  onRemoveSearchTerm,
   onSelectAll,
   onSelectNone,
   onEdit,
@@ -370,10 +380,13 @@ const ListToolbarContent: React.FC<{
             title={intl.formatMessage({ id: "actions.sidebar.toggle" })}
           />
           <FilterTags
+            searchTerm={searchTerm}
             criteria={criteria}
             onEditCriterion={onEditCriterion}
             onRemoveCriterion={onRemoveCriterion}
             onRemoveAll={onRemoveAllCriterion}
+            onEditSearchTerm={onEditSearchTerm}
+            onRemoveSearchTerm={onRemoveSearchTerm}
             truncateOnOverflow
           />
         </div>
@@ -520,6 +533,9 @@ export const FilteredSceneList = (props: IFilteredScenes) => {
   const intl = useIntl();
   const history = useHistory();
 
+  const searchFocus = useFocus();
+  const [, setSearchFocus] = searchFocus;
+
   const { filterHook, defaultSort, view, alterQuery, fromGroupId } = props;
 
   // States
@@ -774,6 +790,7 @@ export const FilteredSceneList = (props: IFilteredScenes) => {
               sidebarOpen={showSidebar}
               onClose={() => setShowSidebar(false)}
               count={cachedResult.loading ? undefined : totalCount}
+              focus={searchFocus}
             />
           </Sidebar>
           <div>
@@ -783,6 +800,7 @@ export const FilteredSceneList = (props: IFilteredScenes) => {
               })}
             >
               <ListToolbarContent
+                searchTerm={filter.searchTerm}
                 criteria={filter.criteria}
                 items={items}
                 selectedIds={selectedIds}
@@ -790,7 +808,12 @@ export const FilteredSceneList = (props: IFilteredScenes) => {
                 onToggleSidebar={() => setShowSidebar(!showSidebar)}
                 onEditCriterion={(c) => showEditFilter(c.criterionOption.type)}
                 onRemoveCriterion={removeCriterion}
-                onRemoveAllCriterion={() => clearAllCriteria()}
+                onRemoveAllCriterion={() => clearAllCriteria(true)}
+                onEditSearchTerm={() => {
+                  setShowSidebar(true);
+                  setSearchFocus(true);
+                }}
+                onRemoveSearchTerm={() => setFilter(filter.clearSearchTerm())}
                 onSelectAll={() => onSelectAll()}
                 onSelectNone={() => onSelectNone()}
                 onEdit={onEdit}
diff --git a/ui/v2.5/src/index.scss b/ui/v2.5/src/index.scss
index c013b852a..fb4d82a1c 100755
--- a/ui/v2.5/src/index.scss
+++ b/ui/v2.5/src/index.scss
@@ -698,8 +698,10 @@ div.dropdown-menu {
 }
 
 .tag-item {
+  align-items: center;
   background-color: $muted-gray;
   color: $dark-text;
+  display: flex;
   font-size: 12px;
   font-weight: 400;
   line-height: 16px;
@@ -710,17 +712,20 @@ div.dropdown-menu {
     cursor: pointer;
   }
 
+  .search-term svg {
+    margin-left: 0;
+  }
+
   .btn {
     background: none;
     border: none;
     bottom: 2px;
     color: $dark-text;
     font-size: 12px;
-    line-height: 1rem;
+    line-height: 16px;
     margin-right: -0.5rem;
     opacity: 0.5;
     padding: 0 0.5rem;
-    position: relative;
 
     &:active,
     &:hover {
diff --git a/ui/v2.5/src/models/list-filter/filter.ts b/ui/v2.5/src/models/list-filter/filter.ts
index ac9d9de1e..2a68cd6a2 100644
--- a/ui/v2.5/src/models/list-filter/filter.ts
+++ b/ui/v2.5/src/models/list-filter/filter.ts
@@ -476,13 +476,23 @@ export class ListFilterModel {
     return this.setCriteria(criteria);
   }
 
-  public clearCriteria() {
+  public clearCriteria(clearSearchTerm = false) {
     const ret = this.clone();
+    if (clearSearchTerm) {
+      ret.searchTerm = "";
+    }
     ret.criteria = [];
     ret.currentPage = 1;
     return ret;
   }
 
+  public clearSearchTerm() {
+    const ret = this.clone();
+    ret.searchTerm = "";
+    ret.currentPage = 1; // reset to first page
+    return ret;
+  }
+
   public setCriteria(criteria: Criterion[]) {
     const ret = this.clone();
     ret.criteria = criteria;
diff --git a/ui/v2.5/src/utils/focus.ts b/ui/v2.5/src/utils/focus.ts
index f1ede47f9..cf1b20a88 100644
--- a/ui/v2.5/src/utils/focus.ts
+++ b/ui/v2.5/src/utils/focus.ts
@@ -2,10 +2,14 @@ import { useRef, useEffect, useCallback } from "react";
 
 const useFocus = () => {
   const htmlElRef = useRef<HTMLInputElement | null>(null);
-  const setFocus = useCallback(() => {
+  const setFocus = useCallback((selectAll?: boolean) => {
     const currentEl = htmlElRef.current;
     if (currentEl) {
-      currentEl.focus();
+      if (selectAll) {
+        currentEl.select();
+      } else {
+        currentEl.focus();
+      }
     }
   }, []);
 

From 14be3c24ffcba1f8d898a3bc42d1cec38992af5c Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Tue, 8 Jul 2025 13:12:46 +1000
Subject: [PATCH 032/405] Revert "Search term filter tag on scene list (#5991)"
 (#6003)

This reverts commit 21ee88b149b303a64eefa39caea61524e0165156.
---
 ui/v2.5/src/components/List/FilterTags.tsx    | 64 ++++++++-----------
 .../components/List/Filters/FilterSidebar.tsx | 13 +---
 ui/v2.5/src/components/List/util.ts           |  9 +--
 ui/v2.5/src/components/Scenes/SceneList.tsx   | 25 +-------
 ui/v2.5/src/index.scss                        |  9 +--
 ui/v2.5/src/models/list-filter/filter.ts      | 12 +---
 ui/v2.5/src/utils/focus.ts                    |  8 +--
 7 files changed, 37 insertions(+), 103 deletions(-)

diff --git a/ui/v2.5/src/components/List/FilterTags.tsx b/ui/v2.5/src/components/List/FilterTags.tsx
index 6812edcf7..8d9b24e40 100644
--- a/ui/v2.5/src/components/List/FilterTags.tsx
+++ b/ui/v2.5/src/components/List/FilterTags.tsx
@@ -9,37 +9,31 @@ import { Badge, BadgeProps, Button, Overlay, Popover } from "react-bootstrap";
 import { Criterion } from "src/models/list-filter/criteria/criterion";
 import { FormattedMessage, useIntl } from "react-intl";
 import { Icon } from "../Shared/Icon";
-import { faMagnifyingGlass, faTimes } from "@fortawesome/free-solid-svg-icons";
+import { faTimes } from "@fortawesome/free-solid-svg-icons";
 import { BsPrefixProps, ReplaceProps } from "react-bootstrap/esm/helpers";
 import { CustomFieldsCriterion } from "src/models/list-filter/criteria/custom-fields";
 import { useDebounce } from "src/hooks/debounce";
-import cx from "classnames";
 
 type TagItemProps = PropsWithChildren<
   ReplaceProps<"span", BsPrefixProps<"span"> & BadgeProps>
 >;
 
 export const TagItem: React.FC<TagItemProps> = (props) => {
-  const { className, children, ...others } = props;
+  const { children } = props;
   return (
-    <Badge
-      className={cx("tag-item", className)}
-      variant="secondary"
-      {...others}
-    >
+    <Badge className="tag-item" variant="secondary" {...props}>
       {children}
     </Badge>
   );
 };
 
 export const FilterTag: React.FC<{
-  className?: string;
   label: React.ReactNode;
   onClick: React.MouseEventHandler<HTMLSpanElement>;
   onRemove: React.MouseEventHandler<HTMLElement>;
-}> = ({ className, label, onClick, onRemove }) => {
+}> = ({ label, onClick, onRemove }) => {
   return (
-    <TagItem className={className} onClick={onClick}>
+    <TagItem onClick={onClick}>
       {label}
       <Button
         variant="secondary"
@@ -102,24 +96,18 @@ const MoreFilterTags: React.FC<{
 };
 
 interface IFilterTagsProps {
-  searchTerm?: string;
   criteria: Criterion[];
-  onEditSearchTerm?: () => void;
   onEditCriterion: (c: Criterion) => void;
   onRemoveCriterion: (c: Criterion, valueIndex?: number) => void;
   onRemoveAll: () => void;
-  onRemoveSearchTerm?: () => void;
   truncateOnOverflow?: boolean;
 }
 
 export const FilterTags: React.FC<IFilterTagsProps> = ({
-  searchTerm,
   criteria,
   onEditCriterion,
   onRemoveCriterion,
   onRemoveAll,
-  onEditSearchTerm,
-  onRemoveSearchTerm,
   truncateOnOverflow = false,
 }) => {
   const intl = useIntl();
@@ -277,7 +265,7 @@ export const FilterTags: React.FC<IFilterTagsProps> = ({
     );
   }
 
-  if (criteria.length === 0 && !searchTerm) {
+  if (criteria.length === 0) {
     return null;
   }
 
@@ -285,31 +273,31 @@ export const FilterTags: React.FC<IFilterTagsProps> = ({
 
   const filterTags = criteria.map((c) => getFilterTags(c)).flat();
 
-  if (searchTerm && searchTerm.length > 0) {
-    filterTags.unshift(
-      <FilterTag
-        key="search-term"
-        className="search-term-filter-tag"
-        label={
-          <span className="search-term">
-            <Icon icon={faMagnifyingGlass} />
-            {searchTerm}
-          </span>
-        }
-        onClick={() => onEditSearchTerm?.()}
-        onRemove={() => onRemoveSearchTerm?.()}
-      />
+  if (cutoff && filterTags.length > cutoff) {
+    const visibleCriteria = filterTags.slice(0, cutoff);
+    const hiddenCriteria = filterTags.slice(cutoff);
+
+    return (
+      <div className={className} ref={ref}>
+        {visibleCriteria}
+        <MoreFilterTags tags={hiddenCriteria} />
+        {criteria.length >= 3 && (
+          <Button
+            variant="minimal"
+            className="clear-all-button"
+            onClick={() => onRemoveAll()}
+          >
+            <FormattedMessage id="actions.clear" />
+          </Button>
+        )}
+      </div>
     );
   }
 
-  const visibleCriteria = cutoff ? filterTags.slice(0, cutoff) : filterTags;
-  const hiddenCriteria = cutoff ? filterTags.slice(cutoff) : [];
-
   return (
     <div className={className} ref={ref}>
-      {visibleCriteria}
-      <MoreFilterTags tags={hiddenCriteria} />
-      {filterTags.length >= 3 && (
+      {filterTags}
+      {criteria.length >= 3 && (
         <Button
           variant="minimal"
           className="clear-all-button"
diff --git a/ui/v2.5/src/components/List/Filters/FilterSidebar.tsx b/ui/v2.5/src/components/List/Filters/FilterSidebar.tsx
index 6e26670d7..0ff201f86 100644
--- a/ui/v2.5/src/components/List/Filters/FilterSidebar.tsx
+++ b/ui/v2.5/src/components/List/Filters/FilterSidebar.tsx
@@ -16,17 +16,8 @@ export const FilteredSidebarHeader: React.FC<{
   filter: ListFilterModel;
   setFilter: (filter: ListFilterModel) => void;
   view?: View;
-  focus?: ReturnType<typeof useFocus>;
-}> = ({
-  sidebarOpen,
-  showEditFilter,
-  filter,
-  setFilter,
-  view,
-  focus: providedFocus,
-}) => {
-  const localFocus = useFocus();
-  const focus = providedFocus ?? localFocus;
+}> = ({ sidebarOpen, showEditFilter, filter, setFilter, view }) => {
+  const focus = useFocus();
   const [, setFocus] = focus;
 
   // Set the focus on the input field when the sidebar is opened
diff --git a/ui/v2.5/src/components/List/util.ts b/ui/v2.5/src/components/List/util.ts
index 717f9c289..bb85145e7 100644
--- a/ui/v2.5/src/components/List/util.ts
+++ b/ui/v2.5/src/components/List/util.ts
@@ -196,12 +196,9 @@ export function useFilterOperations(props: {
     [setFilter]
   );
 
-  const clearAllCriteria = useCallback(
-    (includeSearchTerm = false) => {
-      setFilter((cv) => cv.clearCriteria(includeSearchTerm));
-    },
-    [setFilter]
-  );
+  const clearAllCriteria = useCallback(() => {
+    setFilter((cv) => cv.clearCriteria());
+  }, [setFilter]);
 
   return {
     setPage,
diff --git a/ui/v2.5/src/components/Scenes/SceneList.tsx b/ui/v2.5/src/components/Scenes/SceneList.tsx
index 93c7e4d9e..0420de93c 100644
--- a/ui/v2.5/src/components/Scenes/SceneList.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneList.tsx
@@ -63,7 +63,6 @@ import { Icon } from "../Shared/Icon";
 import { ListViewOptions } from "../List/ListViewOptions";
 import { PageSizeSelector, SortBySelect } from "../List/ListFilter";
 import { Criterion } from "src/models/list-filter/criteria/criterion";
-import useFocus from "src/utils/focus";
 
 function renderMetadataByline(result: GQL.FindScenesQueryResult) {
   const duration = result?.data?.findScenes?.duration;
@@ -242,7 +241,6 @@ const SidebarContent: React.FC<{
   onClose?: () => void;
   showEditFilter: (editingCriterion?: string) => void;
   count?: number;
-  focus?: ReturnType<typeof useFocus>;
 }> = ({
   filter,
   setFilter,
@@ -252,7 +250,6 @@ const SidebarContent: React.FC<{
   sidebarOpen,
   onClose,
   count,
-  focus,
 }) => {
   const showResultsId =
     count !== undefined ? "actions.show_count_results" : "actions.show_results";
@@ -267,7 +264,6 @@ const SidebarContent: React.FC<{
         filter={filter}
         setFilter={setFilter}
         view={view}
-        focus={focus}
       />
 
       <ScenesFilterSidebarSections>
@@ -330,7 +326,6 @@ interface IOperations {
 }
 
 const ListToolbarContent: React.FC<{
-  searchTerm: string;
   criteria: Criterion[];
   items: GQL.SlimSceneDataFragment[];
   selectedIds: Set<string>;
@@ -339,8 +334,6 @@ const ListToolbarContent: React.FC<{
   onEditCriterion: (c: Criterion) => void;
   onRemoveCriterion: (criterion: Criterion, valueIndex?: number) => void;
   onRemoveAllCriterion: () => void;
-  onEditSearchTerm: () => void;
-  onRemoveSearchTerm: () => void;
   onSelectAll: () => void;
   onSelectNone: () => void;
   onEdit: () => void;
@@ -348,7 +341,6 @@ const ListToolbarContent: React.FC<{
   onPlay: () => void;
   onCreateNew: () => void;
 }> = ({
-  searchTerm,
   criteria,
   items,
   selectedIds,
@@ -357,8 +349,6 @@ const ListToolbarContent: React.FC<{
   onEditCriterion,
   onRemoveCriterion,
   onRemoveAllCriterion,
-  onEditSearchTerm,
-  onRemoveSearchTerm,
   onSelectAll,
   onSelectNone,
   onEdit,
@@ -380,13 +370,10 @@ const ListToolbarContent: React.FC<{
             title={intl.formatMessage({ id: "actions.sidebar.toggle" })}
           />
           <FilterTags
-            searchTerm={searchTerm}
             criteria={criteria}
             onEditCriterion={onEditCriterion}
             onRemoveCriterion={onRemoveCriterion}
             onRemoveAll={onRemoveAllCriterion}
-            onEditSearchTerm={onEditSearchTerm}
-            onRemoveSearchTerm={onRemoveSearchTerm}
             truncateOnOverflow
           />
         </div>
@@ -533,9 +520,6 @@ export const FilteredSceneList = (props: IFilteredScenes) => {
   const intl = useIntl();
   const history = useHistory();
 
-  const searchFocus = useFocus();
-  const [, setSearchFocus] = searchFocus;
-
   const { filterHook, defaultSort, view, alterQuery, fromGroupId } = props;
 
   // States
@@ -790,7 +774,6 @@ export const FilteredSceneList = (props: IFilteredScenes) => {
               sidebarOpen={showSidebar}
               onClose={() => setShowSidebar(false)}
               count={cachedResult.loading ? undefined : totalCount}
-              focus={searchFocus}
             />
           </Sidebar>
           <div>
@@ -800,7 +783,6 @@ export const FilteredSceneList = (props: IFilteredScenes) => {
               })}
             >
               <ListToolbarContent
-                searchTerm={filter.searchTerm}
                 criteria={filter.criteria}
                 items={items}
                 selectedIds={selectedIds}
@@ -808,12 +790,7 @@ export const FilteredSceneList = (props: IFilteredScenes) => {
                 onToggleSidebar={() => setShowSidebar(!showSidebar)}
                 onEditCriterion={(c) => showEditFilter(c.criterionOption.type)}
                 onRemoveCriterion={removeCriterion}
-                onRemoveAllCriterion={() => clearAllCriteria(true)}
-                onEditSearchTerm={() => {
-                  setShowSidebar(true);
-                  setSearchFocus(true);
-                }}
-                onRemoveSearchTerm={() => setFilter(filter.clearSearchTerm())}
+                onRemoveAllCriterion={() => clearAllCriteria()}
                 onSelectAll={() => onSelectAll()}
                 onSelectNone={() => onSelectNone()}
                 onEdit={onEdit}
diff --git a/ui/v2.5/src/index.scss b/ui/v2.5/src/index.scss
index fb4d82a1c..c013b852a 100755
--- a/ui/v2.5/src/index.scss
+++ b/ui/v2.5/src/index.scss
@@ -698,10 +698,8 @@ div.dropdown-menu {
 }
 
 .tag-item {
-  align-items: center;
   background-color: $muted-gray;
   color: $dark-text;
-  display: flex;
   font-size: 12px;
   font-weight: 400;
   line-height: 16px;
@@ -712,20 +710,17 @@ div.dropdown-menu {
     cursor: pointer;
   }
 
-  .search-term svg {
-    margin-left: 0;
-  }
-
   .btn {
     background: none;
     border: none;
     bottom: 2px;
     color: $dark-text;
     font-size: 12px;
-    line-height: 16px;
+    line-height: 1rem;
     margin-right: -0.5rem;
     opacity: 0.5;
     padding: 0 0.5rem;
+    position: relative;
 
     &:active,
     &:hover {
diff --git a/ui/v2.5/src/models/list-filter/filter.ts b/ui/v2.5/src/models/list-filter/filter.ts
index 2a68cd6a2..ac9d9de1e 100644
--- a/ui/v2.5/src/models/list-filter/filter.ts
+++ b/ui/v2.5/src/models/list-filter/filter.ts
@@ -476,23 +476,13 @@ export class ListFilterModel {
     return this.setCriteria(criteria);
   }
 
-  public clearCriteria(clearSearchTerm = false) {
+  public clearCriteria() {
     const ret = this.clone();
-    if (clearSearchTerm) {
-      ret.searchTerm = "";
-    }
     ret.criteria = [];
     ret.currentPage = 1;
     return ret;
   }
 
-  public clearSearchTerm() {
-    const ret = this.clone();
-    ret.searchTerm = "";
-    ret.currentPage = 1; // reset to first page
-    return ret;
-  }
-
   public setCriteria(criteria: Criterion[]) {
     const ret = this.clone();
     ret.criteria = criteria;
diff --git a/ui/v2.5/src/utils/focus.ts b/ui/v2.5/src/utils/focus.ts
index cf1b20a88..f1ede47f9 100644
--- a/ui/v2.5/src/utils/focus.ts
+++ b/ui/v2.5/src/utils/focus.ts
@@ -2,14 +2,10 @@ import { useRef, useEffect, useCallback } from "react";
 
 const useFocus = () => {
   const htmlElRef = useRef<HTMLInputElement | null>(null);
-  const setFocus = useCallback((selectAll?: boolean) => {
+  const setFocus = useCallback(() => {
     const currentEl = htmlElRef.current;
     if (currentEl) {
-      if (selectAll) {
-        currentEl.select();
-      } else {
-        currentEl.focus();
-      }
+      currentEl.focus();
     }
   }, []);
 

From e23bdfa2046d682586d9bbded3de4ac4d2028866 Mon Sep 17 00:00:00 2001
From: feederbox826 <144178721+feederbox826@users.noreply.github.com>
Date: Tue, 9 Sep 2025 01:03:55 -0400
Subject: [PATCH 033/405] Add media hardware key support (#6031)

---
 .../src/components/ScenePlayer/ScenePlayer.tsx   | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/ui/v2.5/src/components/ScenePlayer/ScenePlayer.tsx b/ui/v2.5/src/components/ScenePlayer/ScenePlayer.tsx
index 5749f6331..4440f80df 100644
--- a/ui/v2.5/src/components/ScenePlayer/ScenePlayer.tsx
+++ b/ui/v2.5/src/components/ScenePlayer/ScenePlayer.tsx
@@ -120,6 +120,22 @@ function handleHotkeys(player: VideoJsPlayer, event: videojs.KeyboardEvent) {
     return;
   }
 
+  const skipButtons = player.skipButtons();
+  if (skipButtons) {
+    // handle multimedia keys
+    switch (event.key) {
+      case "MediaTrackNext":
+        if (!skipButtons.onNext) return;
+        skipButtons.onNext();
+        break;
+      case "MediaTrackPrevious":
+        if (!skipButtons.onPrevious) return;
+        skipButtons.onPrevious();
+        break;
+      // MediaPlayPause handled by videojs
+    }
+  }
+
   switch (event.which) {
     case 32: // space
     case 13: // enter

From c0ba119ebf94fddbc711f680e69e2b333781e3a8 Mon Sep 17 00:00:00 2001
From: feederbox826 <144178721+feederbox826@users.noreply.github.com>
Date: Tue, 9 Sep 2025 01:04:39 -0400
Subject: [PATCH 034/405] exclude empty regex exclude (#6023)

---
 internal/manager/exclude_files.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/internal/manager/exclude_files.go b/internal/manager/exclude_files.go
index 6c5452d0d..7ab24b51c 100644
--- a/internal/manager/exclude_files.go
+++ b/internal/manager/exclude_files.go
@@ -60,6 +60,10 @@ func generateRegexps(patterns []string) []*regexp.Regexp {
 	var fileRegexps []*regexp.Regexp
 
 	for _, pattern := range patterns {
+		if pattern == "" || pattern == " " {
+			logger.Warnf("Skipping empty exclude pattern")
+			continue
+		}
 		if !strings.HasPrefix(pattern, "(?i)") {
 			pattern = "(?i)" + pattern
 		}

From b5b207c940b1bae137127dfeb3579e65a6a1d461 Mon Sep 17 00:00:00 2001
From: feederbox826 <144178721+feederbox826@users.noreply.github.com>
Date: Tue, 9 Sep 2025 01:07:00 -0400
Subject: [PATCH 035/405] remove ruby and faraday gem (#6020)

---
 docker/ci/x86_64/Dockerfile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/docker/ci/x86_64/Dockerfile b/docker/ci/x86_64/Dockerfile
index f0f1e242b..957da347c 100644
--- a/docker/ci/x86_64/Dockerfile
+++ b/docker/ci/x86_64/Dockerfile
@@ -12,9 +12,8 @@ RUN if [ "$TARGETPLATFORM" = "linux/arm/v6" ];   then BIN=stash-linux-arm32v6; \
 FROM --platform=$TARGETPLATFORM alpine:latest AS app
 COPY --from=binary /stash /usr/bin/
 
-RUN apk add --no-cache ca-certificates python3 py3-requests py3-requests-toolbelt py3-lxml py3-pip ffmpeg ruby tzdata vips vips-tools \
-    && pip install --user --break-system-packages mechanicalsoup cloudscraper stashapp-tools \
-    && gem install faraday
+RUN apk add --no-cache ca-certificates python3 py3-requests py3-requests-toolbelt py3-lxml py3-pip ffmpeg tzdata vips vips-tools \
+    && pip install --user --break-system-packages mechanicalsoup cloudscraper stashapp-tools
 ENV STASH_CONFIG_FILE=/root/.stash/config.yml
 
 # Basic build-time metadata as defined at https://github.com/opencontainers/image-spec/blob/main/annotations.md#pre-defined-annotation-keys

From fd36c0fac7051ff6dae40f3808af4a6aefa143ed Mon Sep 17 00:00:00 2001
From: gregpetersonanon <gregpetersonanon@proton.me>
Date: Mon, 8 Sep 2025 22:10:13 -0700
Subject: [PATCH 036/405] Allow scan to continue when encountering an error
 (#6073)

---
 pkg/file/folder_rename_detect.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkg/file/folder_rename_detect.go b/pkg/file/folder_rename_detect.go
index 4f6d31bd5..4c057461b 100644
--- a/pkg/file/folder_rename_detect.go
+++ b/pkg/file/folder_rename_detect.go
@@ -107,7 +107,8 @@ func (s *scanJob) detectFolderMove(ctx context.Context, file scanFile) (*models.
 
 		info, err := d.Info()
 		if err != nil {
-			return fmt.Errorf("reading info for %q: %w", path, err)
+			logger.Errorf("reading info for %q: %v", path, err)
+			return nil
 		}
 
 		if !s.acceptEntry(ctx, path, info) {

From b1883f3df57d868ade3fe20b9339e39755b86acd Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Tue, 9 Sep 2025 16:44:51 +1000
Subject: [PATCH 037/405] Add gallery link to image lightbox (#6012)

---
 ui/v2.5/src/core/files.ts                |  2 +-
 ui/v2.5/src/core/galleries.ts            |  2 +-
 ui/v2.5/src/hooks/Lightbox/Lightbox.tsx  | 30 ++++++++++++++++++++----
 ui/v2.5/src/hooks/Lightbox/lightbox.scss | 17 +++++++++++++-
 ui/v2.5/src/hooks/Lightbox/types.ts      | 12 ++++++++++
 5 files changed, 55 insertions(+), 8 deletions(-)

diff --git a/ui/v2.5/src/core/files.ts b/ui/v2.5/src/core/files.ts
index d17d34d16..b90d10193 100644
--- a/ui/v2.5/src/core/files.ts
+++ b/ui/v2.5/src/core/files.ts
@@ -6,7 +6,7 @@ export interface IFile {
 }
 
 interface IObjectWithFiles {
-  files?: IFile[];
+  files?: GQL.Maybe<IFile[]>;
 }
 
 export interface IObjectWithTitleFiles extends IObjectWithFiles {
diff --git a/ui/v2.5/src/core/galleries.ts b/ui/v2.5/src/core/galleries.ts
index bedc2453e..722ba8d3b 100644
--- a/ui/v2.5/src/core/galleries.ts
+++ b/ui/v2.5/src/core/galleries.ts
@@ -6,7 +6,7 @@ interface IFile {
 }
 
 interface IGallery {
-  files: IFile[];
+  files: GQL.Maybe<IFile[]>;
   folder?: GQL.Maybe<IFile>;
 }
 
diff --git a/ui/v2.5/src/hooks/Lightbox/Lightbox.tsx b/ui/v2.5/src/hooks/Lightbox/Lightbox.tsx
index 0af1e835b..6e4eb856a 100644
--- a/ui/v2.5/src/hooks/Lightbox/Lightbox.tsx
+++ b/ui/v2.5/src/hooks/Lightbox/Lightbox.tsx
@@ -44,11 +44,13 @@ import {
   faSearchMinus,
   faTimes,
   faBars,
+  faImages,
 } from "@fortawesome/free-solid-svg-icons";
 import { RatingSystem } from "src/components/Shared/Rating/RatingSystem";
 import { useDebounce } from "../debounce";
 import { isVideo } from "src/utils/visualFile";
 import { imageTitle } from "src/core/files";
+import { galleryTitle } from "src/core/galleries";
 
 const CLASSNAME = "Lightbox";
 const CLASSNAME_HEADER = `${CLASSNAME}-header`;
@@ -62,6 +64,8 @@ const CLASSNAME_OPTIONS_INLINE = `${CLASSNAME_OPTIONS}-inline`;
 const CLASSNAME_RIGHT = `${CLASSNAME_HEADER}-right`;
 const CLASSNAME_FOOTER = `${CLASSNAME}-footer`;
 const CLASSNAME_FOOTER_LEFT = `${CLASSNAME_FOOTER}-left`;
+const CLASSNAME_FOOTER_CENTER = `${CLASSNAME_FOOTER}-center`;
+const CLASSNAME_FOOTER_RIGHT = `${CLASSNAME_FOOTER}-right`;
 const CLASSNAME_DISPLAY = `${CLASSNAME}-display`;
 const CLASSNAME_CAROUSEL = `${CLASSNAME}-carousel`;
 const CLASSNAME_INSTANT = `${CLASSNAME_CAROUSEL}-instant`;
@@ -933,14 +937,30 @@ export const LightboxComponent: React.FC<IProps> = ({
               </>
             )}
           </div>
-          <div>
+          <div className={CLASSNAME_FOOTER_CENTER}>
             {currentImage && (
-              <Link to={`/images/${currentImage.id}`} onClick={() => close()}>
-                {title ?? ""}
-              </Link>
+              <>
+                <Link
+                  className="image-link"
+                  to={`/images/${currentImage.id}`}
+                  onClick={() => close()}
+                >
+                  {title ?? ""}
+                </Link>
+                {currentImage.galleries?.length ? (
+                  <Link
+                    className="image-gallery-link"
+                    to={`/galleries/${currentImage.galleries[0].id}`}
+                    onClick={() => close()}
+                  >
+                    <Icon icon={faImages} />
+                    {galleryTitle(currentImage.galleries[0])}
+                  </Link>
+                ) : null}
+              </>
             )}
           </div>
-          <div></div>
+          <div className={CLASSNAME_FOOTER_RIGHT}></div>
         </div>
       </>
     );
diff --git a/ui/v2.5/src/hooks/Lightbox/lightbox.scss b/ui/v2.5/src/hooks/Lightbox/lightbox.scss
index b12de3cf9..95a5fbc42 100644
--- a/ui/v2.5/src/hooks/Lightbox/lightbox.scss
+++ b/ui/v2.5/src/hooks/Lightbox/lightbox.scss
@@ -105,10 +105,25 @@
       padding-left: 1em;
     }
 
+    &-center {
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      padding-left: 1em;
+      text-align: center;
+    }
+
     a {
       color: $text-color;
-      font-weight: bold;
       text-decoration: none;
+
+      .fa-icon {
+        margin-right: 0.5rem;
+      }
+
+      &.image-link {
+        font-weight: bold;
+      }
     }
   }
 
diff --git a/ui/v2.5/src/hooks/Lightbox/types.ts b/ui/v2.5/src/hooks/Lightbox/types.ts
index 56c9d6b71..58cdc8434 100644
--- a/ui/v2.5/src/hooks/Lightbox/types.ts
+++ b/ui/v2.5/src/hooks/Lightbox/types.ts
@@ -14,6 +14,17 @@ interface IFiles {
   video_codec?: GQL.Maybe<string>;
 }
 
+interface IWithPath {
+  path: string;
+}
+
+export interface IGallery {
+  id: string;
+  title?: GQL.Maybe<string>;
+  files?: GQL.Maybe<IWithPath[]>;
+  folder?: GQL.Maybe<IWithPath>;
+}
+
 export interface ILightboxImage {
   id?: string;
   title?: GQL.Maybe<string>;
@@ -21,6 +32,7 @@ export interface ILightboxImage {
   o_counter?: GQL.Maybe<number>;
   paths: IImagePaths;
   visual_files?: IFiles[];
+  galleries?: GQL.Maybe<IGallery[]>;
 }
 
 export interface IChapter {

From cc97e96eaad64bae50c013affe914fc5356b3935 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Tue, 9 Sep 2025 16:45:29 +1000
Subject: [PATCH 038/405] Add wall zoom functionality (#6011)

* Show zoom slider when wall view active
* Add zoom functionality to scene wall
* Add zoom functionality to image wall
* Add zoom functionality to gallery wall
* Add zoom functionality for marker wall
---
 .../src/components/Galleries/GalleryList.tsx  |  2 +-
 ui/v2.5/src/components/Galleries/styles.scss  | 80 +++++++++++++------
 ui/v2.5/src/components/Images/ImageList.tsx   | 29 ++++++-
 .../src/components/List/ListViewOptions.tsx   |  3 +-
 ui/v2.5/src/components/Scenes/SceneList.tsx   |  8 +-
 .../src/components/Scenes/SceneMarkerList.tsx |  5 +-
 .../Scenes/SceneMarkerWallPanel.tsx           | 26 +++++-
 .../src/components/Scenes/SceneWallPanel.tsx  | 32 +++++++-
 8 files changed, 148 insertions(+), 37 deletions(-)

diff --git a/ui/v2.5/src/components/Galleries/GalleryList.tsx b/ui/v2.5/src/components/Galleries/GalleryList.tsx
index 7becbe93a..a0930b927 100644
--- a/ui/v2.5/src/components/Galleries/GalleryList.tsx
+++ b/ui/v2.5/src/components/Galleries/GalleryList.tsx
@@ -149,7 +149,7 @@ export const GalleryList: React.FC<IGalleryList> = ({
       if (filter.displayMode === DisplayMode.Wall) {
         return (
           <div className="row">
-            <div className="GalleryWall">
+            <div className={`GalleryWall zoom-${filter.zoomIndex}`}>
               {result.data.findGalleries.galleries.map((gallery) => (
                 <GalleryWallCard key={gallery.id} gallery={gallery} />
               ))}
diff --git a/ui/v2.5/src/components/Galleries/styles.scss b/ui/v2.5/src/components/Galleries/styles.scss
index 12439a94d..58116e936 100644
--- a/ui/v2.5/src/components/Galleries/styles.scss
+++ b/ui/v2.5/src/components/Galleries/styles.scss
@@ -206,7 +206,7 @@ $galleryTabWidth: 450px;
   }
 }
 
-.GalleryWall {
+div.GalleryWall {
   display: flex;
   flex-wrap: wrap;
   margin: 0 auto;
@@ -249,28 +249,6 @@ $galleryTabWidth: 450px;
     z-index: 1;
   }
 
-  @mixin galleryWidth($width) {
-    height: math.div($width, 3) * 2;
-
-    &-landscape {
-      width: $width;
-    }
-
-    &-portrait {
-      width: math.div($width, 2);
-    }
-  }
-
-  @media (min-width: 576px) {
-    @include galleryWidth(96vw);
-  }
-  @media (min-width: 768px) {
-    @include galleryWidth(48vw);
-  }
-  @media (min-width: 1200px) {
-    @include galleryWidth(32vw);
-  }
-
   &-img {
     height: 100%;
     object-fit: cover;
@@ -355,6 +333,62 @@ $galleryTabWidth: 450px;
   }
 }
 
+div.GalleryWall {
+  @mixin galleryWidth($width) {
+    height: math.div($width, 3) * 2;
+
+    &-landscape {
+      width: $width;
+    }
+
+    &-portrait {
+      width: math.div($width, 2);
+    }
+  }
+
+  .GalleryWallCard {
+    @media (min-width: 576px) {
+      @include galleryWidth(96vw);
+    }
+  }
+
+  &.zoom-0 .GalleryWallCard {
+    @media (min-width: 768px) {
+      @include galleryWidth(16vw);
+    }
+    @media (min-width: 1200px) {
+      @include galleryWidth(10vw);
+    }
+  }
+
+  &.zoom-1 .GalleryWallCard {
+    @media (min-width: 768px) {
+      @include galleryWidth(24vw);
+    }
+    @media (min-width: 1200px) {
+      @include galleryWidth(16vw);
+    }
+  }
+
+  &.zoom-2 .GalleryWallCard {
+    @media (min-width: 768px) {
+      @include galleryWidth(32vw);
+    }
+    @media (min-width: 1200px) {
+      @include galleryWidth(24vw);
+    }
+  }
+
+  &.zoom-3 .GalleryWallCard {
+    @media (min-width: 768px) {
+      @include galleryWidth(48vw);
+    }
+    @media (min-width: 1200px) {
+      @include galleryWidth(32vw);
+    }
+  }
+}
+
 .gallery-file-card.card {
   margin: 0;
   padding: 0;
diff --git a/ui/v2.5/src/components/Images/ImageList.tsx b/ui/v2.5/src/components/Images/ImageList.tsx
index 12eb264b1..a468c2815 100644
--- a/ui/v2.5/src/components/Images/ImageList.tsx
+++ b/ui/v2.5/src/components/Images/ImageList.tsx
@@ -35,9 +35,22 @@ interface IImageWallProps {
   currentPage: number;
   pageCount: number;
   handleImageOpen: (index: number) => void;
+  zoomIndex: number;
 }
 
-const ImageWall: React.FC<IImageWallProps> = ({ images, handleImageOpen }) => {
+const zoomWidths = [280, 340, 480, 640];
+const breakpointZoomHeights = [
+  { minWidth: 576, heights: [100, 120, 240, 360] },
+  { minWidth: 768, heights: [120, 160, 240, 480] },
+  { minWidth: 1200, heights: [120, 160, 240, 300] },
+  { minWidth: 1400, heights: [160, 240, 300, 480] },
+];
+
+const ImageWall: React.FC<IImageWallProps> = ({
+  images,
+  zoomIndex,
+  handleImageOpen,
+}) => {
   const { configuration } = useContext(ConfigurationContext);
   const uiConfig = configuration?.ui;
 
@@ -76,11 +89,21 @@ const ImageWall: React.FC<IImageWallProps> = ({ images, handleImageOpen }) => {
   );
 
   function columns(containerWidth: number) {
-    let preferredSize = 300;
+    let preferredSize = zoomWidths[zoomIndex];
     let columnCount = containerWidth / preferredSize;
     return Math.round(columnCount);
   }
 
+  function targetRowHeight(containerWidth: number) {
+    let zoomHeight = 280;
+    breakpointZoomHeights.forEach((e) => {
+      if (containerWidth >= e.minWidth) {
+        zoomHeight = e.heights[zoomIndex];
+      }
+    });
+    return zoomHeight;
+  }
+
   return (
     <div className="gallery">
       {photos.length ? (
@@ -91,6 +114,7 @@ const ImageWall: React.FC<IImageWallProps> = ({ images, handleImageOpen }) => {
           margin={uiConfig?.imageWallOptions?.margin!}
           direction={uiConfig?.imageWallOptions?.direction!}
           columns={columns}
+          targetRowHeight={targetRowHeight}
         />
       ) : null}
     </div>
@@ -211,6 +235,7 @@ const ImageListImages: React.FC<IImageListImages> = ({
         currentPage={filter.currentPage}
         pageCount={pageCount}
         handleImageOpen={handleImageOpen}
+        zoomIndex={filter.zoomIndex}
       />
     );
   }
diff --git a/ui/v2.5/src/components/List/ListViewOptions.tsx b/ui/v2.5/src/components/List/ListViewOptions.tsx
index e83ff9290..1ea928983 100644
--- a/ui/v2.5/src/components/List/ListViewOptions.tsx
+++ b/ui/v2.5/src/components/List/ListViewOptions.tsx
@@ -130,7 +130,8 @@ export const ListViewOptions: React.FC<IListViewOptionsProps> = ({
               <div className="display-mode-menu">
                 {onSetZoom &&
                 zoomIndex !== undefined &&
-                displayMode === DisplayMode.Grid ? (
+                (displayMode === DisplayMode.Grid ||
+                  displayMode === DisplayMode.Wall) ? (
                   <div className="zoom-slider-container">
                     <ZoomSelect
                       minZoom={minZoom}
diff --git a/ui/v2.5/src/components/Scenes/SceneList.tsx b/ui/v2.5/src/components/Scenes/SceneList.tsx
index 0420de93c..a59d2c395 100644
--- a/ui/v2.5/src/components/Scenes/SceneList.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneList.tsx
@@ -219,7 +219,13 @@ const SceneList: React.FC<{
     );
   }
   if (filter.displayMode === DisplayMode.Wall) {
-    return <SceneWallPanel scenes={scenes} sceneQueue={queue} />;
+    return (
+      <SceneWallPanel
+        scenes={scenes}
+        sceneQueue={queue}
+        zoomIndex={filter.zoomIndex}
+      />
+    );
   }
   if (filter.displayMode === DisplayMode.Tagger) {
     return <Tagger scenes={scenes} queue={queue} />;
diff --git a/ui/v2.5/src/components/Scenes/SceneMarkerList.tsx b/ui/v2.5/src/components/Scenes/SceneMarkerList.tsx
index f28ac718b..94eb6e133 100644
--- a/ui/v2.5/src/components/Scenes/SceneMarkerList.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneMarkerList.tsx
@@ -95,7 +95,10 @@ export const SceneMarkerList: React.FC<ISceneMarkerList> = ({
 
     if (filter.displayMode === DisplayMode.Wall) {
       return (
-        <MarkerWallPanel markers={result.data.findSceneMarkers.scene_markers} />
+        <MarkerWallPanel
+          markers={result.data.findSceneMarkers.scene_markers}
+          zoomIndex={filter.zoomIndex}
+        />
       );
     }
 
diff --git a/ui/v2.5/src/components/Scenes/SceneMarkerWallPanel.tsx b/ui/v2.5/src/components/Scenes/SceneMarkerWallPanel.tsx
index f240b36e6..5202b94d1 100644
--- a/ui/v2.5/src/components/Scenes/SceneMarkerWallPanel.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneMarkerWallPanel.tsx
@@ -120,6 +120,7 @@ export const MarkerWallItem: React.FC<RenderImageProps<IMarkerPhoto>> = (
 
 interface IMarkerWallProps {
   markers: GQL.SceneMarkerDataFragment[];
+  zoomIndex: number;
 }
 
 // HACK: typescript doesn't allow Gallery to accept a parameter for some reason
@@ -152,9 +153,14 @@ function getDimensions(file?: IFile) {
   };
 }
 
-const defaultTargetRowHeight = 250;
+const breakpointZoomHeights = [
+  { minWidth: 576, heights: [100, 120, 240, 360] },
+  { minWidth: 768, heights: [120, 160, 240, 480] },
+  { minWidth: 1200, heights: [120, 160, 240, 300] },
+  { minWidth: 1400, heights: [160, 240, 300, 480] },
+];
 
-const MarkerWall: React.FC<IMarkerWallProps> = ({ markers }) => {
+const MarkerWall: React.FC<IMarkerWallProps> = ({ markers, zoomIndex }) => {
   const history = useHistory();
 
   const margin = 3;
@@ -202,6 +208,16 @@ const MarkerWall: React.FC<IMarkerWallProps> = ({ markers }) => {
     return Math.round(columnCount);
   }
 
+  function targetRowHeight(containerWidth: number) {
+    let zoomHeight = 280;
+    breakpointZoomHeights.forEach((e) => {
+      if (containerWidth >= e.minWidth) {
+        zoomHeight = e.heights[zoomIndex];
+      }
+    });
+    return zoomHeight;
+  }
+
   const renderImage = useCallback((props: RenderImageProps<IMarkerPhoto>) => {
     return <MarkerWallItem {...props} />;
   }, []);
@@ -216,7 +232,7 @@ const MarkerWall: React.FC<IMarkerWallProps> = ({ markers }) => {
           margin={margin}
           direction={direction}
           columns={columns}
-          targetRowHeight={defaultTargetRowHeight}
+          targetRowHeight={targetRowHeight}
         />
       ) : null}
     </div>
@@ -225,10 +241,12 @@ const MarkerWall: React.FC<IMarkerWallProps> = ({ markers }) => {
 
 interface IMarkerWallPanelProps {
   markers: GQL.SceneMarkerDataFragment[];
+  zoomIndex: number;
 }
 
 export const MarkerWallPanel: React.FC<IMarkerWallPanelProps> = ({
   markers,
+  zoomIndex,
 }) => {
-  return <MarkerWall markers={markers} />;
+  return <MarkerWall markers={markers} zoomIndex={zoomIndex} />;
 };
diff --git a/ui/v2.5/src/components/Scenes/SceneWallPanel.tsx b/ui/v2.5/src/components/Scenes/SceneWallPanel.tsx
index 546a1488a..dcc0bf734 100644
--- a/ui/v2.5/src/components/Scenes/SceneWallPanel.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneWallPanel.tsx
@@ -126,14 +126,24 @@ function getDimensions(s: GQL.SlimSceneDataFragment) {
 interface ISceneWallProps {
   scenes: GQL.SlimSceneDataFragment[];
   sceneQueue?: SceneQueue;
+  zoomIndex: number;
 }
 
 // HACK: typescript doesn't allow Gallery to accept a parameter for some reason
 const SceneGallery = Gallery as unknown as GalleryI<IScenePhoto>;
 
-const defaultTargetRowHeight = 250;
+const breakpointZoomHeights = [
+  { minWidth: 576, heights: [100, 120, 240, 360] },
+  { minWidth: 768, heights: [120, 160, 240, 480] },
+  { minWidth: 1200, heights: [120, 160, 240, 300] },
+  { minWidth: 1400, heights: [160, 240, 300, 480] },
+];
 
-const SceneWall: React.FC<ISceneWallProps> = ({ scenes, sceneQueue }) => {
+const SceneWall: React.FC<ISceneWallProps> = ({
+  scenes,
+  sceneQueue,
+  zoomIndex,
+}) => {
   const history = useHistory();
 
   const margin = 3;
@@ -186,6 +196,16 @@ const SceneWall: React.FC<ISceneWallProps> = ({ scenes, sceneQueue }) => {
     return Math.round(columnCount);
   }
 
+  function targetRowHeight(containerWidth: number) {
+    let zoomHeight = 280;
+    breakpointZoomHeights.forEach((e) => {
+      if (containerWidth >= e.minWidth) {
+        zoomHeight = e.heights[zoomIndex];
+      }
+    });
+    return zoomHeight;
+  }
+
   const renderImage = useCallback((props: RenderImageProps<IScenePhoto>) => {
     return <SceneWallItem {...props} />;
   }, []);
@@ -200,7 +220,7 @@ const SceneWall: React.FC<ISceneWallProps> = ({ scenes, sceneQueue }) => {
           margin={margin}
           direction={direction}
           columns={columns}
-          targetRowHeight={defaultTargetRowHeight}
+          targetRowHeight={targetRowHeight}
         />
       ) : null}
     </div>
@@ -210,11 +230,15 @@ const SceneWall: React.FC<ISceneWallProps> = ({ scenes, sceneQueue }) => {
 interface ISceneWallPanelProps {
   scenes: GQL.SlimSceneDataFragment[];
   sceneQueue?: SceneQueue;
+  zoomIndex: number;
 }
 
 export const SceneWallPanel: React.FC<ISceneWallPanelProps> = ({
   scenes,
   sceneQueue,
+  zoomIndex,
 }) => {
-  return <SceneWall scenes={scenes} sceneQueue={sceneQueue} />;
+  return (
+    <SceneWall scenes={scenes} sceneQueue={sceneQueue} zoomIndex={zoomIndex} />
+  );
 };

From 12c4e1f61c49cd4e625a62e9bde7df9e02c0c47c Mon Sep 17 00:00:00 2001
From: Otter Bot Society <76196097+OtterBotSociety@users.noreply.github.com>
Date: Mon, 8 Sep 2025 23:48:16 -0700
Subject: [PATCH 039/405] Treat images with no exif metadata as well-oriented
 (#6006)

---
 pkg/file/image/orientation.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkg/file/image/orientation.go b/pkg/file/image/orientation.go
index 84f5774cf..0d9ebb2e3 100644
--- a/pkg/file/image/orientation.go
+++ b/pkg/file/image/orientation.go
@@ -4,6 +4,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"strings"
 
 	"github.com/rwcarlsen/goexif/exif"
 	"github.com/stashapp/stash/pkg/logger"
@@ -33,7 +34,7 @@ func areDimensionsFlipped(fs models.FS, path string) (bool, error) {
 
 	x, err := exif.Decode(r)
 	if err != nil {
-		if errors.Is(err, io.EOF) {
+		if errors.Is(err, io.EOF) || strings.Contains(err.Error(), "failed to find exif") {
 			// no exif data
 			return false, nil
 		}

From edcc4e896892aba93484e929d833e1bec5eab627 Mon Sep 17 00:00:00 2001
From: feederbox826 <144178721+feederbox826@users.noreply.github.com>
Date: Tue, 16 Sep 2025 00:25:22 -0400
Subject: [PATCH 040/405] Fix descender line-height (#6087)

---
 ui/v2.5/src/index.scss | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ui/v2.5/src/index.scss b/ui/v2.5/src/index.scss
index c013b852a..d73cd3b2a 100755
--- a/ui/v2.5/src/index.scss
+++ b/ui/v2.5/src/index.scss
@@ -1411,3 +1411,8 @@ select {
   overflow-y: auto;
   padding-right: 1.5rem;
 }
+
+// Fix descenders clipping in line-height #6047
+h3 .TruncatedText {
+  line-height: 1.5;
+}

From 98716d556819974970c9c124e7ab0355af551fc4 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Wed, 17 Sep 2025 14:41:48 +1000
Subject: [PATCH 041/405] Show search field always (#6079)

---
 .../components/List/Filters/FilterSidebar.tsx | 14 ------
 ui/v2.5/src/components/Scenes/SceneList.tsx   | 49 ++++++++++++-------
 ui/v2.5/src/components/Scenes/styles.scss     | 30 +++++++++++-
 ui/v2.5/src/components/Shared/styles.scss     |  2 -
 ui/v2.5/src/index.scss                        |  2 +
 5 files changed, 62 insertions(+), 35 deletions(-)

diff --git a/ui/v2.5/src/components/List/Filters/FilterSidebar.tsx b/ui/v2.5/src/components/List/Filters/FilterSidebar.tsx
index 0ff201f86..8f76c83e2 100644
--- a/ui/v2.5/src/components/List/Filters/FilterSidebar.tsx
+++ b/ui/v2.5/src/components/List/Filters/FilterSidebar.tsx
@@ -68,20 +68,6 @@ export function useFilteredSidebarKeybinds(props: {
 }) {
   const { showSidebar, setShowSidebar } = props;
 
-  // Show the sidebar when the user presses the "/" key
-  useEffect(() => {
-    Mousetrap.bind("/", (e) => {
-      if (!showSidebar) {
-        setShowSidebar(true);
-        e.preventDefault();
-      }
-    });
-
-    return () => {
-      Mousetrap.unbind("/");
-    };
-  }, [showSidebar, setShowSidebar]);
-
   // Hide the sidebar when the user presses the "Esc" key
   useEffect(() => {
     Mousetrap.bind("esc", (e) => {
diff --git a/ui/v2.5/src/components/Scenes/SceneList.tsx b/ui/v2.5/src/components/Scenes/SceneList.tsx
index a59d2c395..07fc04119 100644
--- a/ui/v2.5/src/components/Scenes/SceneList.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneList.tsx
@@ -61,7 +61,11 @@ import { Button, ButtonGroup, ButtonToolbar } from "react-bootstrap";
 import { FilterButton } from "../List/Filters/FilterButton";
 import { Icon } from "../Shared/Icon";
 import { ListViewOptions } from "../List/ListViewOptions";
-import { PageSizeSelector, SortBySelect } from "../List/ListFilter";
+import {
+  PageSizeSelector,
+  SearchTermInput,
+  SortBySelect,
+} from "../List/ListFilter";
 import { Criterion } from "src/models/list-filter/criteria/criterion";
 
 function renderMetadataByline(result: GQL.FindScenesQueryResult) {
@@ -332,11 +336,12 @@ interface IOperations {
 }
 
 const ListToolbarContent: React.FC<{
-  criteria: Criterion[];
+  filter: ListFilterModel;
   items: GQL.SlimSceneDataFragment[];
   selectedIds: Set<string>;
   operations: IOperations[];
   onToggleSidebar: () => void;
+  onSetFilter: (filter: ListFilterModel) => void;
   onEditCriterion: (c: Criterion) => void;
   onRemoveCriterion: (criterion: Criterion, valueIndex?: number) => void;
   onRemoveAllCriterion: () => void;
@@ -347,11 +352,12 @@ const ListToolbarContent: React.FC<{
   onPlay: () => void;
   onCreateNew: () => void;
 }> = ({
-  criteria,
+  filter,
   items,
   selectedIds,
   operations,
   onToggleSidebar,
+  onSetFilter,
   onEditCriterion,
   onRemoveCriterion,
   onRemoveAllCriterion,
@@ -364,25 +370,31 @@ const ListToolbarContent: React.FC<{
 }) => {
   const intl = useIntl();
 
+  const { criteria } = filter;
   const hasSelection = selectedIds.size > 0;
 
   return (
     <>
       {!hasSelection && (
-        <div>
-          <FilterButton
-            onClick={() => onToggleSidebar()}
-            count={criteria.length}
-            title={intl.formatMessage({ id: "actions.sidebar.toggle" })}
-          />
-          <FilterTags
-            criteria={criteria}
-            onEditCriterion={onEditCriterion}
-            onRemoveCriterion={onRemoveCriterion}
-            onRemoveAll={onRemoveAllCriterion}
-            truncateOnOverflow
-          />
-        </div>
+        <>
+          <div className="search-container">
+            <SearchTermInput filter={filter} onFilterUpdate={onSetFilter} />
+          </div>
+          <div className="filter-section">
+            <FilterButton
+              onClick={() => onToggleSidebar()}
+              count={criteria.length}
+              title={intl.formatMessage({ id: "actions.sidebar.toggle" })}
+            />
+            <FilterTags
+              criteria={criteria}
+              onEditCriterion={onEditCriterion}
+              onRemoveCriterion={onRemoveCriterion}
+              onRemoveAll={onRemoveAllCriterion}
+              truncateOnOverflow
+            />
+          </div>
+        </>
       )}
       {hasSelection && (
         <div className="selected-items-info">
@@ -789,7 +801,8 @@ export const FilteredSceneList = (props: IFilteredScenes) => {
               })}
             >
               <ListToolbarContent
-                criteria={filter.criteria}
+                filter={filter}
+                onSetFilter={setFilter}
                 items={items}
                 selectedIds={selectedIds}
                 operations={otherOperations}
diff --git a/ui/v2.5/src/components/Scenes/styles.scss b/ui/v2.5/src/components/Scenes/styles.scss
index 279552575..679cf84b5 100644
--- a/ui/v2.5/src/components/Scenes/styles.scss
+++ b/ui/v2.5/src/components/Scenes/styles.scss
@@ -1063,7 +1063,7 @@ input[type="range"].blue-slider {
     }
   }
 
-  > div:first-child {
+  > div.filter-section {
     border: 1px solid $secondary;
     border-radius: 0.25rem;
     flex-grow: 1;
@@ -1075,6 +1075,23 @@ input[type="range"].blue-slider {
     }
   }
 
+  .search-container {
+    border-right: 1px solid $secondary;
+    display: block;
+    margin-right: -0.5rem;
+    padding-right: 10px;
+    width: calc($sidebar-width - 15px);
+
+    .search-term-input {
+      margin-right: 0;
+      width: 100%;
+
+      .clearable-text-field {
+        height: 100%;
+      }
+    }
+  }
+
   .filter-tags {
     flex-grow: 1;
     flex-wrap: nowrap;
@@ -1093,6 +1110,17 @@ input[type="range"].blue-slider {
   }
 }
 
+@include media-breakpoint-up(xl) {
+  .sidebar-pane:not(.hide-sidebar) .scene-list-toolbar .search-container {
+    display: none;
+  }
+}
+@include media-breakpoint-down(md) {
+  .sidebar-pane.hide-sidebar .scene-list-toolbar .search-container {
+    display: none;
+  }
+}
+
 .scene-list-header {
   flex-wrap: wrap-reverse;
   gap: 0.5rem;
diff --git a/ui/v2.5/src/components/Shared/styles.scss b/ui/v2.5/src/components/Shared/styles.scss
index 10e381bd8..881018566 100644
--- a/ui/v2.5/src/components/Shared/styles.scss
+++ b/ui/v2.5/src/components/Shared/styles.scss
@@ -755,8 +755,6 @@ button.btn.favorite-button {
   }
 }
 
-$sidebar-width: 250px;
-
 .sidebar-pane {
   display: flex;
 
diff --git a/ui/v2.5/src/index.scss b/ui/v2.5/src/index.scss
index d73cd3b2a..50768d1df 100755
--- a/ui/v2.5/src/index.scss
+++ b/ui/v2.5/src/index.scss
@@ -5,6 +5,8 @@ $navbar-height: 48.75px;
 
 $sticky-detail-header-height: 50px;
 
+$sidebar-width: 250px;
+
 @import "styles/theme";
 @import "styles/range";
 @import "styles/scrollbars";

From 8012f2eb8a4ec16721dd94c8c426edb9fa5407a5 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Wed, 17 Sep 2025 15:08:47 +1000
Subject: [PATCH 042/405] Add search term input to edit filter dialog (#6082)

---
 .../src/components/List/EditFilterDialog.tsx  | 10 +++++++
 ui/v2.5/src/components/List/styles.scss       | 26 +++++++++++++++++++
 ui/v2.5/src/locales/en-GB.json                |  1 +
 3 files changed, 37 insertions(+)

diff --git a/ui/v2.5/src/components/List/EditFilterDialog.tsx b/ui/v2.5/src/components/List/EditFilterDialog.tsx
index 4b31ac31a..1ee9e8364 100644
--- a/ui/v2.5/src/components/List/EditFilterDialog.tsx
+++ b/ui/v2.5/src/components/List/EditFilterDialog.tsx
@@ -34,6 +34,7 @@ import { FilterMode } from "src/core/generated-graphql";
 import { useFocusOnce } from "src/utils/focus";
 import Mousetrap from "mousetrap";
 import ScreenUtils from "src/utils/screen";
+import { SearchTermInput } from "./ListFilter";
 
 interface ICriterionList {
   criteria: string[];
@@ -453,6 +454,15 @@ export const EditFilterDialog: React.FC<IEditFilterProps> = ({
               "criterion-selected": !!criterion,
             })}
           >
+            <div className="search-term-row">
+              <span>
+                <FormattedMessage id="search_filter.search_term" />
+              </span>
+              <SearchTermInput
+                filter={currentFilter}
+                onFilterUpdate={setCurrentFilter}
+              />
+            </div>
             <CriterionOptionList
               criteria={criteriaList}
               currentCriterion={criterion}
diff --git a/ui/v2.5/src/components/List/styles.scss b/ui/v2.5/src/components/List/styles.scss
index 199417819..723f48bbc 100644
--- a/ui/v2.5/src/components/List/styles.scss
+++ b/ui/v2.5/src/components/List/styles.scss
@@ -312,6 +312,32 @@ input[type="range"].zoom-slider {
     padding-right: 0;
   }
 
+  .search-term-row {
+    align-items: center;
+    display: flex;
+    gap: 0.5rem;
+    justify-content: space-between;
+    margin-bottom: 0.5rem;
+    margin-left: 1.5rem;
+    margin-right: 1rem;
+
+    .search-term-input {
+      flex-basis: 75%;
+    }
+
+    @include media-breakpoint-down(xs) {
+      flex-wrap: wrap;
+
+      > span {
+        width: 100%;
+      }
+
+      .search-term-input {
+        flex-basis: 100%;
+      }
+    }
+  }
+
   .filter-tags {
     border-top: 1px solid rgb(16 22 26 / 40%);
     padding: 1rem 1rem 0 1rem;
diff --git a/ui/v2.5/src/locales/en-GB.json b/ui/v2.5/src/locales/en-GB.json
index bd6308425..2faca723d 100644
--- a/ui/v2.5/src/locales/en-GB.json
+++ b/ui/v2.5/src/locales/en-GB.json
@@ -1317,6 +1317,7 @@
     "edit_filter": "Edit Filter",
     "name": "Filter",
     "saved_filters": "Saved filters",
+    "search_term": "Search term",
     "update_filter": "Update Filter",
     "more_filter_criteria": "+{count} more"
   },

From 793a5f826e6612011121df4d7e01d9513f64793e Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Thu, 18 Sep 2025 12:09:19 +1000
Subject: [PATCH 043/405] Edit filter load save (#6092)

* Add load/save buttons to edit filter dialog
* Add title to save filter dialog
* Change ExistingSavedFilterList parameters
* Add title to load/save buttons
---
 .../src/components/List/EditFilterDialog.tsx  | 112 ++++++++++++++++--
 .../src/components/List/SavedFilterList.tsx   | 103 ++++++++++++----
 ui/v2.5/src/components/List/styles.scss       |   8 ++
 ui/v2.5/src/locales/en-GB.json                |   2 +
 4 files changed, 192 insertions(+), 33 deletions(-)

diff --git a/ui/v2.5/src/components/List/EditFilterDialog.tsx b/ui/v2.5/src/components/List/EditFilterDialog.tsx
index 1ee9e8364..e914b194e 100644
--- a/ui/v2.5/src/components/List/EditFilterDialog.tsx
+++ b/ui/v2.5/src/components/List/EditFilterDialog.tsx
@@ -29,11 +29,15 @@ import {
 import { useCompare, usePrevious } from "src/hooks/state";
 import { CriterionType } from "src/models/list-filter/types";
 import { useToast } from "src/hooks/Toast";
-import { useConfigureUI } from "src/core/StashService";
-import { FilterMode } from "src/core/generated-graphql";
+import { useConfigureUI, useSaveFilter } from "src/core/StashService";
+import {
+  FilterMode,
+  SavedFilterDataFragment,
+} from "src/core/generated-graphql";
 import { useFocusOnce } from "src/utils/focus";
 import Mousetrap from "mousetrap";
 import ScreenUtils from "src/utils/screen";
+import { LoadFilterDialog, SaveFilterDialog } from "./SavedFilterList";
 import { SearchTermInput } from "./ListFilter";
 
 interface ICriterionList {
@@ -232,6 +236,13 @@ export const EditFilterDialog: React.FC<IEditFilterProps> = ({
 
   const [searchRef, setSearchFocus] = useFocusOnce(!ScreenUtils.isTouch());
 
+  const [showSaveDialog, setShowSaveDialog] = useState(false);
+  const [savingFilter, setSavingFilter] = useState(false);
+
+  const [showLoadDialog, setShowLoadDialog] = useState(false);
+
+  const saveFilter = useSaveFilter();
+
   const { criteria } = currentFilter;
 
   const criteriaList = useMemo(() => {
@@ -433,9 +444,74 @@ export const EditFilterDialog: React.FC<IEditFilterProps> = ({
     setCurrentFilter(newFilter);
   }
 
+  function onLoadFilter(f: SavedFilterDataFragment) {
+    const newFilter = filter.clone();
+
+    newFilter.currentPage = 1;
+    // #1795 - reset search term if not present in saved filter
+    newFilter.searchTerm = "";
+    newFilter.configureFromSavedFilter(f);
+    // #1507 - reset random seed when loaded
+    newFilter.randomSeed = -1;
+
+    onApply(newFilter);
+  }
+
+  async function onSaveFilter(name: string, id?: string) {
+    try {
+      setSavingFilter(true);
+      await saveFilter(filter, name, id);
+
+      Toast.success(
+        intl.formatMessage(
+          {
+            id: "toast.saved_entity",
+          },
+          {
+            entity: intl.formatMessage({ id: "filter" }).toLocaleLowerCase(),
+          }
+        )
+      );
+      setShowSaveDialog(false);
+      onApply(currentFilter);
+    } catch (err) {
+      Toast.error(err);
+    } finally {
+      setSavingFilter(false);
+    }
+  }
+
   return (
     <>
-      <Modal show onHide={() => onCancel()} className="edit-filter-dialog">
+      {showSaveDialog && (
+        <SaveFilterDialog
+          mode={filter.mode}
+          onClose={(name, id) => {
+            if (name) {
+              onSaveFilter(name, id);
+            } else {
+              setShowSaveDialog(false);
+            }
+          }}
+          isSaving={savingFilter}
+        />
+      )}
+      {showLoadDialog && (
+        <LoadFilterDialog
+          mode={filter.mode}
+          onClose={(f) => {
+            if (f) {
+              onLoadFilter(f);
+            }
+            setShowLoadDialog(false);
+          }}
+        />
+      )}
+      <Modal
+        show={!showSaveDialog && !showLoadDialog}
+        onHide={() => onCancel()}
+        className="edit-filter-dialog"
+      >
         <Modal.Header>
           <div>
             <FormattedMessage id="search_filter.edit_filter" />
@@ -487,12 +563,30 @@ export const EditFilterDialog: React.FC<IEditFilterProps> = ({
           </div>
         </Modal.Body>
         <Modal.Footer>
-          <Button variant="secondary" onClick={() => onCancel()}>
-            <FormattedMessage id="actions.cancel" />
-          </Button>
-          <Button onClick={() => onApply(currentFilter)}>
-            <FormattedMessage id="actions.apply" />
-          </Button>
+          <div>
+            <Button
+              variant="secondary"
+              onClick={() => setShowLoadDialog(true)}
+              title={intl.formatMessage({ id: "actions.load_filter" })}
+            >
+              <FormattedMessage id="actions.load" />…
+            </Button>
+            <Button
+              variant="secondary"
+              onClick={() => setShowSaveDialog(true)}
+              title={intl.formatMessage({ id: "actions.save_filter" })}
+            >
+              <FormattedMessage id="actions.save" />…
+            </Button>
+          </div>
+          <div>
+            <Button variant="secondary" onClick={() => onCancel()}>
+              <FormattedMessage id="actions.cancel" />
+            </Button>
+            <Button onClick={() => onApply(currentFilter)}>
+              <FormattedMessage id="actions.apply" />
+            </Button>
+          </div>
         </Modal.Footer>
       </Modal>
     </>
diff --git a/ui/v2.5/src/components/List/SavedFilterList.tsx b/ui/v2.5/src/components/List/SavedFilterList.tsx
index cbeeaa70a..7e03404d2 100644
--- a/ui/v2.5/src/components/List/SavedFilterList.tsx
+++ b/ui/v2.5/src/components/List/SavedFilterList.tsx
@@ -30,12 +30,14 @@ import { faBookmark, faSave, faTimes } from "@fortawesome/free-solid-svg-icons";
 import { AlertModal } from "../Shared/Alert";
 import cx from "classnames";
 import { TruncatedInlineText } from "../Shared/TruncatedText";
+import { OperationButton } from "../Shared/OperationButton";
 
 const ExistingSavedFilterList: React.FC<{
   name: string;
-  setName: (name: string) => void;
-  existing: { name: string; id: string }[];
-}> = ({ name, setName, existing }) => {
+  onSelect: (value: SavedFilterDataFragment) => void;
+  savedFilters: SavedFilterDataFragment[];
+  disabled?: boolean;
+}> = ({ name, onSelect, savedFilters: existing, disabled = false }) => {
   const filtered = useMemo(() => {
     if (!name) return existing;
 
@@ -51,7 +53,8 @@ const ExistingSavedFilterList: React.FC<{
           <Button
             className="minimal"
             variant="link"
-            onClick={() => setName(f.name)}
+            onClick={() => onSelect(f)}
+            disabled={disabled}
           >
             {f.name}
           </Button>
@@ -64,7 +67,8 @@ const ExistingSavedFilterList: React.FC<{
 export const SaveFilterDialog: React.FC<{
   mode: FilterMode;
   onClose: (name?: string, id?: string) => void;
-}> = ({ mode, onClose }) => {
+  isSaving?: boolean;
+}> = ({ mode, onClose, isSaving = false }) => {
   const intl = useIntl();
   const [filterName, setFilterName] = useState("");
 
@@ -79,6 +83,74 @@ export const SaveFilterDialog: React.FC<{
 
   return (
     <Modal show className="save-filter-dialog">
+      <Modal.Header>
+        <FormattedMessage id="actions.save_filter" />
+      </Modal.Header>
+      <Modal.Body>
+        <Form.Group>
+          <Form.Label>
+            <FormattedMessage id="filter_name" />
+          </Form.Label>
+          <FormControl
+            className="bg-secondary text-white border-secondary"
+            placeholder={`${intl.formatMessage({ id: "filter_name" })}…`}
+            value={filterName}
+            onChange={(e) => setFilterName(e.target.value)}
+            disabled={isSaving}
+          />
+        </Form.Group>
+
+        <ExistingSavedFilterList
+          name={filterName}
+          onSelect={(f) => setFilterName(f.name)}
+          savedFilters={data?.findSavedFilters ?? []}
+        />
+
+        {!!overwritingFilter && (
+          <span className="saved-filter-overwrite-warning">
+            <FormattedMessage
+              id="dialogs.overwrite_filter_warning"
+              values={{
+                entityName: overwritingFilter.name,
+              }}
+            />
+          </span>
+        )}
+      </Modal.Body>
+      <Modal.Footer>
+        <Button
+          variant="secondary"
+          onClick={() => onClose()}
+          disabled={isSaving}
+        >
+          {intl.formatMessage({ id: "actions.cancel" })}
+        </Button>
+        <OperationButton
+          loading={isSaving}
+          variant="primary"
+          onClick={() => onClose(filterName, overwritingFilter?.id)}
+        >
+          {intl.formatMessage({ id: "actions.save" })}
+        </OperationButton>
+      </Modal.Footer>
+    </Modal>
+  );
+};
+
+export const LoadFilterDialog: React.FC<{
+  mode: FilterMode;
+  onClose: (filter?: SavedFilterDataFragment) => void;
+}> = ({ mode, onClose }) => {
+  const intl = useIntl();
+  const [filterName, setFilterName] = useState("");
+
+  const { data } = useFindSavedFilters(mode);
+
+  return (
+    <Modal show className="load-filter-dialog">
+      <Modal.Header>
+        <FormattedMessage id="actions.load_filter" />
+      </Modal.Header>
       <Modal.Body>
         <Form.Group>
           <Form.Label>
@@ -94,31 +166,14 @@ export const SaveFilterDialog: React.FC<{
 
         <ExistingSavedFilterList
           name={filterName}
-          setName={setFilterName}
-          existing={data?.findSavedFilters ?? []}
+          onSelect={(f) => onClose(f)}
+          savedFilters={data?.findSavedFilters ?? []}
         />
-
-        {!!overwritingFilter && (
-          <span className="saved-filter-overwrite-warning">
-            <FormattedMessage
-              id="dialogs.overwrite_filter_warning"
-              values={{
-                entityName: overwritingFilter.name,
-              }}
-            />
-          </span>
-        )}
       </Modal.Body>
       <Modal.Footer>
         <Button variant="secondary" onClick={() => onClose()}>
           {intl.formatMessage({ id: "actions.cancel" })}
         </Button>
-        <Button
-          variant="primary"
-          onClick={() => onClose(filterName, overwritingFilter?.id)}
-        >
-          {intl.formatMessage({ id: "actions.save" })}
-        </Button>
       </Modal.Footer>
     </Modal>
   );
diff --git a/ui/v2.5/src/components/List/styles.scss b/ui/v2.5/src/components/List/styles.scss
index 723f48bbc..96a1e4c26 100644
--- a/ui/v2.5/src/components/List/styles.scss
+++ b/ui/v2.5/src/components/List/styles.scss
@@ -312,6 +312,14 @@ input[type="range"].zoom-slider {
     padding-right: 0;
   }
 
+  .modal-footer {
+    justify-content: space-between;
+
+    > div > :not(:first-child) {
+      margin-left: 0.25rem;
+    }
+  }
+
   .search-term-row {
     align-items: center;
     display: flex;
diff --git a/ui/v2.5/src/locales/en-GB.json b/ui/v2.5/src/locales/en-GB.json
index 2faca723d..a8d731b32 100644
--- a/ui/v2.5/src/locales/en-GB.json
+++ b/ui/v2.5/src/locales/en-GB.json
@@ -68,6 +68,8 @@
     "ignore": "Ignore",
     "import": "Import…",
     "import_from_file": "Import from file",
+    "load": "Load",
+    "load_filter": "Load filter",
     "logout": "Log out",
     "make_primary": "Make Primary",
     "merge": "Merge",

From 3bb771a149598d5bf17020e6bd86bf36669bd8e4 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Wed, 24 Sep 2025 10:45:09 +1000
Subject: [PATCH 044/405] Add search term filter tag to scene list filter tags
 (#6095)

* Add search term to filter tags on scene list page

Clicking on the tag selects all on the search term input. Clicking on the x erases it.

* Ensure clear criteria maintains consistent behaviour on other pages
* Hide search term tag when input is visible
---
 ui/v2.5/src/components/List/FilterTags.tsx    | 64 +++++++++++--------
 .../components/List/Filters/FilterSidebar.tsx | 13 +++-
 ui/v2.5/src/components/List/util.ts           |  9 ++-
 ui/v2.5/src/components/Scenes/SceneList.tsx   | 24 ++++++-
 ui/v2.5/src/components/Scenes/styles.scss     | 15 +++++
 ui/v2.5/src/index.scss                        |  9 ++-
 ui/v2.5/src/models/list-filter/filter.ts      | 12 +++-
 ui/v2.5/src/utils/focus.ts                    |  8 ++-
 8 files changed, 116 insertions(+), 38 deletions(-)

diff --git a/ui/v2.5/src/components/List/FilterTags.tsx b/ui/v2.5/src/components/List/FilterTags.tsx
index 8d9b24e40..6812edcf7 100644
--- a/ui/v2.5/src/components/List/FilterTags.tsx
+++ b/ui/v2.5/src/components/List/FilterTags.tsx
@@ -9,31 +9,37 @@ import { Badge, BadgeProps, Button, Overlay, Popover } from "react-bootstrap";
 import { Criterion } from "src/models/list-filter/criteria/criterion";
 import { FormattedMessage, useIntl } from "react-intl";
 import { Icon } from "../Shared/Icon";
-import { faTimes } from "@fortawesome/free-solid-svg-icons";
+import { faMagnifyingGlass, faTimes } from "@fortawesome/free-solid-svg-icons";
 import { BsPrefixProps, ReplaceProps } from "react-bootstrap/esm/helpers";
 import { CustomFieldsCriterion } from "src/models/list-filter/criteria/custom-fields";
 import { useDebounce } from "src/hooks/debounce";
+import cx from "classnames";
 
 type TagItemProps = PropsWithChildren<
   ReplaceProps<"span", BsPrefixProps<"span"> & BadgeProps>
 >;
 
 export const TagItem: React.FC<TagItemProps> = (props) => {
-  const { children } = props;
+  const { className, children, ...others } = props;
   return (
-    <Badge className="tag-item" variant="secondary" {...props}>
+    <Badge
+      className={cx("tag-item", className)}
+      variant="secondary"
+      {...others}
+    >
       {children}
     </Badge>
   );
 };
 
 export const FilterTag: React.FC<{
+  className?: string;
   label: React.ReactNode;
   onClick: React.MouseEventHandler<HTMLSpanElement>;
   onRemove: React.MouseEventHandler<HTMLElement>;
-}> = ({ label, onClick, onRemove }) => {
+}> = ({ className, label, onClick, onRemove }) => {
   return (
-    <TagItem onClick={onClick}>
+    <TagItem className={className} onClick={onClick}>
       {label}
       <Button
         variant="secondary"
@@ -96,18 +102,24 @@ const MoreFilterTags: React.FC<{
 };
 
 interface IFilterTagsProps {
+  searchTerm?: string;
   criteria: Criterion[];
+  onEditSearchTerm?: () => void;
   onEditCriterion: (c: Criterion) => void;
   onRemoveCriterion: (c: Criterion, valueIndex?: number) => void;
   onRemoveAll: () => void;
+  onRemoveSearchTerm?: () => void;
   truncateOnOverflow?: boolean;
 }
 
 export const FilterTags: React.FC<IFilterTagsProps> = ({
+  searchTerm,
   criteria,
   onEditCriterion,
   onRemoveCriterion,
   onRemoveAll,
+  onEditSearchTerm,
+  onRemoveSearchTerm,
   truncateOnOverflow = false,
 }) => {
   const intl = useIntl();
@@ -265,7 +277,7 @@ export const FilterTags: React.FC<IFilterTagsProps> = ({
     );
   }
 
-  if (criteria.length === 0) {
+  if (criteria.length === 0 && !searchTerm) {
     return null;
   }
 
@@ -273,31 +285,31 @@ export const FilterTags: React.FC<IFilterTagsProps> = ({
 
   const filterTags = criteria.map((c) => getFilterTags(c)).flat();
 
-  if (cutoff && filterTags.length > cutoff) {
-    const visibleCriteria = filterTags.slice(0, cutoff);
-    const hiddenCriteria = filterTags.slice(cutoff);
-
-    return (
-      <div className={className} ref={ref}>
-        {visibleCriteria}
-        <MoreFilterTags tags={hiddenCriteria} />
-        {criteria.length >= 3 && (
-          <Button
-            variant="minimal"
-            className="clear-all-button"
-            onClick={() => onRemoveAll()}
-          >
-            <FormattedMessage id="actions.clear" />
-          </Button>
-        )}
-      </div>
+  if (searchTerm && searchTerm.length > 0) {
+    filterTags.unshift(
+      <FilterTag
+        key="search-term"
+        className="search-term-filter-tag"
+        label={
+          <span className="search-term">
+            <Icon icon={faMagnifyingGlass} />
+            {searchTerm}
+          </span>
+        }
+        onClick={() => onEditSearchTerm?.()}
+        onRemove={() => onRemoveSearchTerm?.()}
+      />
     );
   }
 
+  const visibleCriteria = cutoff ? filterTags.slice(0, cutoff) : filterTags;
+  const hiddenCriteria = cutoff ? filterTags.slice(cutoff) : [];
+
   return (
     <div className={className} ref={ref}>
-      {filterTags}
-      {criteria.length >= 3 && (
+      {visibleCriteria}
+      <MoreFilterTags tags={hiddenCriteria} />
+      {filterTags.length >= 3 && (
         <Button
           variant="minimal"
           className="clear-all-button"
diff --git a/ui/v2.5/src/components/List/Filters/FilterSidebar.tsx b/ui/v2.5/src/components/List/Filters/FilterSidebar.tsx
index 8f76c83e2..9ad2fe152 100644
--- a/ui/v2.5/src/components/List/Filters/FilterSidebar.tsx
+++ b/ui/v2.5/src/components/List/Filters/FilterSidebar.tsx
@@ -16,8 +16,17 @@ export const FilteredSidebarHeader: React.FC<{
   filter: ListFilterModel;
   setFilter: (filter: ListFilterModel) => void;
   view?: View;
-}> = ({ sidebarOpen, showEditFilter, filter, setFilter, view }) => {
-  const focus = useFocus();
+  focus?: ReturnType<typeof useFocus>;
+}> = ({
+  sidebarOpen,
+  showEditFilter,
+  filter,
+  setFilter,
+  view,
+  focus: providedFocus,
+}) => {
+  const localFocus = useFocus();
+  const focus = providedFocus ?? localFocus;
   const [, setFocus] = focus;
 
   // Set the focus on the input field when the sidebar is opened
diff --git a/ui/v2.5/src/components/List/util.ts b/ui/v2.5/src/components/List/util.ts
index bb85145e7..717f9c289 100644
--- a/ui/v2.5/src/components/List/util.ts
+++ b/ui/v2.5/src/components/List/util.ts
@@ -196,9 +196,12 @@ export function useFilterOperations(props: {
     [setFilter]
   );
 
-  const clearAllCriteria = useCallback(() => {
-    setFilter((cv) => cv.clearCriteria());
-  }, [setFilter]);
+  const clearAllCriteria = useCallback(
+    (includeSearchTerm = false) => {
+      setFilter((cv) => cv.clearCriteria(includeSearchTerm));
+    },
+    [setFilter]
+  );
 
   return {
     setPage,
diff --git a/ui/v2.5/src/components/Scenes/SceneList.tsx b/ui/v2.5/src/components/Scenes/SceneList.tsx
index 07fc04119..8956fd730 100644
--- a/ui/v2.5/src/components/Scenes/SceneList.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneList.tsx
@@ -67,6 +67,7 @@ import {
   SortBySelect,
 } from "../List/ListFilter";
 import { Criterion } from "src/models/list-filter/criteria/criterion";
+import useFocus from "src/utils/focus";
 
 function renderMetadataByline(result: GQL.FindScenesQueryResult) {
   const duration = result?.data?.findScenes?.duration;
@@ -251,6 +252,7 @@ const SidebarContent: React.FC<{
   onClose?: () => void;
   showEditFilter: (editingCriterion?: string) => void;
   count?: number;
+  focus?: ReturnType<typeof useFocus>;
 }> = ({
   filter,
   setFilter,
@@ -260,6 +262,7 @@ const SidebarContent: React.FC<{
   sidebarOpen,
   onClose,
   count,
+  focus,
 }) => {
   const showResultsId =
     count !== undefined ? "actions.show_count_results" : "actions.show_results";
@@ -274,6 +277,7 @@ const SidebarContent: React.FC<{
         filter={filter}
         setFilter={setFilter}
         view={view}
+        focus={focus}
       />
 
       <ScenesFilterSidebarSections>
@@ -345,6 +349,8 @@ const ListToolbarContent: React.FC<{
   onEditCriterion: (c: Criterion) => void;
   onRemoveCriterion: (criterion: Criterion, valueIndex?: number) => void;
   onRemoveAllCriterion: () => void;
+  onEditSearchTerm: () => void;
+  onRemoveSearchTerm: () => void;
   onSelectAll: () => void;
   onSelectNone: () => void;
   onEdit: () => void;
@@ -361,6 +367,8 @@ const ListToolbarContent: React.FC<{
   onEditCriterion,
   onRemoveCriterion,
   onRemoveAllCriterion,
+  onEditSearchTerm,
+  onRemoveSearchTerm,
   onSelectAll,
   onSelectNone,
   onEdit,
@@ -370,7 +378,7 @@ const ListToolbarContent: React.FC<{
 }) => {
   const intl = useIntl();
 
-  const { criteria } = filter;
+  const { criteria, searchTerm } = filter;
   const hasSelection = selectedIds.size > 0;
 
   return (
@@ -387,10 +395,13 @@ const ListToolbarContent: React.FC<{
               title={intl.formatMessage({ id: "actions.sidebar.toggle" })}
             />
             <FilterTags
+              searchTerm={searchTerm}
               criteria={criteria}
               onEditCriterion={onEditCriterion}
               onRemoveCriterion={onRemoveCriterion}
               onRemoveAll={onRemoveAllCriterion}
+              onEditSearchTerm={onEditSearchTerm}
+              onRemoveSearchTerm={onRemoveSearchTerm}
               truncateOnOverflow
             />
           </div>
@@ -538,6 +549,9 @@ export const FilteredSceneList = (props: IFilteredScenes) => {
   const intl = useIntl();
   const history = useHistory();
 
+  const searchFocus = useFocus();
+  const [, setSearchFocus] = searchFocus;
+
   const { filterHook, defaultSort, view, alterQuery, fromGroupId } = props;
 
   // States
@@ -792,6 +806,7 @@ export const FilteredSceneList = (props: IFilteredScenes) => {
               sidebarOpen={showSidebar}
               onClose={() => setShowSidebar(false)}
               count={cachedResult.loading ? undefined : totalCount}
+              focus={searchFocus}
             />
           </Sidebar>
           <div>
@@ -809,7 +824,12 @@ export const FilteredSceneList = (props: IFilteredScenes) => {
                 onToggleSidebar={() => setShowSidebar(!showSidebar)}
                 onEditCriterion={(c) => showEditFilter(c.criterionOption.type)}
                 onRemoveCriterion={removeCriterion}
-                onRemoveAllCriterion={() => clearAllCriteria()}
+                onRemoveAllCriterion={() => clearAllCriteria(true)}
+                onEditSearchTerm={() => {
+                  setShowSidebar(true);
+                  setSearchFocus(true);
+                }}
+                onRemoveSearchTerm={() => setFilter(filter.clearSearchTerm())}
                 onSelectAll={() => onSelectAll()}
                 onSelectNone={() => onSelectNone()}
                 onEdit={onEdit}
diff --git a/ui/v2.5/src/components/Scenes/styles.scss b/ui/v2.5/src/components/Scenes/styles.scss
index 679cf84b5..09b8d5ea7 100644
--- a/ui/v2.5/src/components/Scenes/styles.scss
+++ b/ui/v2.5/src/components/Scenes/styles.scss
@@ -1121,6 +1121,21 @@ input[type="range"].blue-slider {
   }
 }
 
+// hide the search term tag item when the search box is visible
+@include media-breakpoint-up(lg) {
+  .scene-list-toolbar .filter-tags .search-term-filter-tag {
+    display: none;
+  }
+}
+@include media-breakpoint-down(md) {
+  .sidebar-pane:not(.hide-sidebar)
+    .scene-list-toolbar
+    .filter-tags
+    .search-term-filter-tag {
+    display: none;
+  }
+}
+
 .scene-list-header {
   flex-wrap: wrap-reverse;
   gap: 0.5rem;
diff --git a/ui/v2.5/src/index.scss b/ui/v2.5/src/index.scss
index 50768d1df..4209abc2c 100755
--- a/ui/v2.5/src/index.scss
+++ b/ui/v2.5/src/index.scss
@@ -700,8 +700,10 @@ div.dropdown-menu {
 }
 
 .tag-item {
+  align-items: center;
   background-color: $muted-gray;
   color: $dark-text;
+  display: inline-flex;
   font-size: 12px;
   font-weight: 400;
   line-height: 16px;
@@ -712,17 +714,20 @@ div.dropdown-menu {
     cursor: pointer;
   }
 
+  .search-term svg {
+    margin-left: 0;
+  }
+
   .btn {
     background: none;
     border: none;
     bottom: 2px;
     color: $dark-text;
     font-size: 12px;
-    line-height: 1rem;
+    line-height: 16px;
     margin-right: -0.5rem;
     opacity: 0.5;
     padding: 0 0.5rem;
-    position: relative;
 
     &:active,
     &:hover {
diff --git a/ui/v2.5/src/models/list-filter/filter.ts b/ui/v2.5/src/models/list-filter/filter.ts
index ac9d9de1e..2a68cd6a2 100644
--- a/ui/v2.5/src/models/list-filter/filter.ts
+++ b/ui/v2.5/src/models/list-filter/filter.ts
@@ -476,13 +476,23 @@ export class ListFilterModel {
     return this.setCriteria(criteria);
   }
 
-  public clearCriteria() {
+  public clearCriteria(clearSearchTerm = false) {
     const ret = this.clone();
+    if (clearSearchTerm) {
+      ret.searchTerm = "";
+    }
     ret.criteria = [];
     ret.currentPage = 1;
     return ret;
   }
 
+  public clearSearchTerm() {
+    const ret = this.clone();
+    ret.searchTerm = "";
+    ret.currentPage = 1; // reset to first page
+    return ret;
+  }
+
   public setCriteria(criteria: Criterion[]) {
     const ret = this.clone();
     ret.criteria = criteria;
diff --git a/ui/v2.5/src/utils/focus.ts b/ui/v2.5/src/utils/focus.ts
index f1ede47f9..cf1b20a88 100644
--- a/ui/v2.5/src/utils/focus.ts
+++ b/ui/v2.5/src/utils/focus.ts
@@ -2,10 +2,14 @@ import { useRef, useEffect, useCallback } from "react";
 
 const useFocus = () => {
   const htmlElRef = useRef<HTMLInputElement | null>(null);
-  const setFocus = useCallback(() => {
+  const setFocus = useCallback((selectAll?: boolean) => {
     const currentEl = htmlElRef.current;
     if (currentEl) {
-      currentEl.focus();
+      if (selectAll) {
+        currentEl.select();
+      } else {
+        currentEl.focus();
+      }
     }
   }, []);
 

From 823ed346c1e47673b79ee0f653cf5d74638eab0f Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Wed, 24 Sep 2025 11:27:08 +1000
Subject: [PATCH 045/405] Add separate sidebar toggle button (#6077)

* Move sidebar toggle to right. Change icon
* Show sidebar button on selection
* Fix clicking toggle cycling visibility on smaller views
* Show more tags component when cutoff == 0
* Hide filter/filter icon buttons in certain situations
* Move sidebar toggle to left on xl viewports
---
 ui/v2.5/src/components/List/FilterTags.tsx  |  7 +--
 ui/v2.5/src/components/Scenes/SceneList.tsx | 21 ++++++--
 ui/v2.5/src/components/Scenes/styles.scss   | 53 ++++++++++++++++++---
 3 files changed, 67 insertions(+), 14 deletions(-)

diff --git a/ui/v2.5/src/components/List/FilterTags.tsx b/ui/v2.5/src/components/List/FilterTags.tsx
index 6812edcf7..0e4259838 100644
--- a/ui/v2.5/src/components/List/FilterTags.tsx
+++ b/ui/v2.5/src/components/List/FilterTags.tsx
@@ -179,7 +179,7 @@ export const FilterTags: React.FC<IFilterTagsProps> = ({
         return (child as HTMLElement).classList.contains("more-tags");
       });
 
-      if (moreTags && !!cutoff) {
+      if (moreTags && cutoff !== undefined) {
         return;
       }
 
@@ -302,8 +302,9 @@ export const FilterTags: React.FC<IFilterTagsProps> = ({
     );
   }
 
-  const visibleCriteria = cutoff ? filterTags.slice(0, cutoff) : filterTags;
-  const hiddenCriteria = cutoff ? filterTags.slice(cutoff) : [];
+  const visibleCriteria =
+    cutoff !== undefined ? filterTags.slice(0, cutoff) : filterTags;
+  const hiddenCriteria = cutoff !== undefined ? filterTags.slice(cutoff) : [];
 
   return (
     <div className={className} ref={ref}>
diff --git a/ui/v2.5/src/components/Scenes/SceneList.tsx b/ui/v2.5/src/components/Scenes/SceneList.tsx
index 8956fd730..6e8832105 100644
--- a/ui/v2.5/src/components/Scenes/SceneList.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneList.tsx
@@ -23,6 +23,7 @@ import {
   faPencil,
   faPlay,
   faPlus,
+  faSliders,
   faTimes,
   faTrash,
 } from "@fortawesome/free-solid-svg-icons";
@@ -346,7 +347,7 @@ const ListToolbarContent: React.FC<{
   operations: IOperations[];
   onToggleSidebar: () => void;
   onSetFilter: (filter: ListFilterModel) => void;
-  onEditCriterion: (c: Criterion) => void;
+  onEditCriterion: (c?: Criterion) => void;
   onRemoveCriterion: (criterion: Criterion, valueIndex?: number) => void;
   onRemoveAllCriterion: () => void;
   onEditSearchTerm: () => void;
@@ -381,6 +382,17 @@ const ListToolbarContent: React.FC<{
   const { criteria, searchTerm } = filter;
   const hasSelection = selectedIds.size > 0;
 
+  const sidebarToggle = (
+    <Button
+      className="minimal sidebar-toggle-button ignore-sidebar-outside-click"
+      variant="secondary"
+      onClick={() => onToggleSidebar()}
+      title={intl.formatMessage({ id: "actions.sidebar.toggle" })}
+    >
+      <Icon icon={faSliders} />
+    </Button>
+  );
+
   return (
     <>
       {!hasSelection && (
@@ -390,9 +402,8 @@ const ListToolbarContent: React.FC<{
           </div>
           <div className="filter-section">
             <FilterButton
-              onClick={() => onToggleSidebar()}
+              onClick={() => onEditCriterion()}
               count={criteria.length}
-              title={intl.formatMessage({ id: "actions.sidebar.toggle" })}
             />
             <FilterTags
               searchTerm={searchTerm}
@@ -404,6 +415,7 @@ const ListToolbarContent: React.FC<{
               onRemoveSearchTerm={onRemoveSearchTerm}
               truncateOnOverflow
             />
+            {sidebarToggle}
           </div>
         </>
       )}
@@ -421,6 +433,7 @@ const ListToolbarContent: React.FC<{
           <Button variant="link" onClick={() => onSelectAll()}>
             <FormattedMessage id="actions.select_all" />
           </Button>
+          {sidebarToggle}
         </div>
       )}
       <div>
@@ -822,7 +835,7 @@ export const FilteredSceneList = (props: IFilteredScenes) => {
                 selectedIds={selectedIds}
                 operations={otherOperations}
                 onToggleSidebar={() => setShowSidebar(!showSidebar)}
-                onEditCriterion={(c) => showEditFilter(c.criterionOption.type)}
+                onEditCriterion={(c) => showEditFilter(c?.criterionOption.type)}
                 onRemoveCriterion={removeCriterion}
                 onRemoveAllCriterion={() => clearAllCriteria(true)}
                 onEditSearchTerm={() => {
diff --git a/ui/v2.5/src/components/Scenes/styles.scss b/ui/v2.5/src/components/Scenes/styles.scss
index 09b8d5ea7..2259eab41 100644
--- a/ui/v2.5/src/components/Scenes/styles.scss
+++ b/ui/v2.5/src/components/Scenes/styles.scss
@@ -942,11 +942,6 @@ input[type="range"].blue-slider {
   transition-property: opacity;
 }
 
-.scene-list:not(.hide-sidebar) .sidebar-toggle-button {
-  opacity: 0;
-  pointer-events: none;
-}
-
 .scene-wall,
 .marker-wall {
   .wall-item {
@@ -1063,11 +1058,17 @@ input[type="range"].blue-slider {
     }
   }
 
+  .selected-items-info,
   > div.filter-section {
     border: 1px solid $secondary;
     border-radius: 0.25rem;
     flex-grow: 1;
     overflow-x: hidden;
+  }
+
+  > div.filter-toolbar {
+    border: 1px solid $secondary;
+    border-radius: 0.25rem;
 
     .filter-button {
       border-bottom-right-radius: 0;
@@ -1075,12 +1076,16 @@ input[type="range"].blue-slider {
     }
   }
 
+  .sidebar-toggle-button {
+    margin-left: auto;
+  }
+
   .search-container {
     border-right: 1px solid $secondary;
     display: block;
     margin-right: -0.5rem;
+    min-width: calc($sidebar-width - 15px);
     padding-right: 10px;
-    width: calc($sidebar-width - 15px);
 
     .search-term-input {
       margin-right: 0;
@@ -1097,7 +1102,9 @@ input[type="range"].blue-slider {
     flex-wrap: nowrap;
     justify-content: flex-start;
     margin-bottom: 0;
-    width: calc(100% - 35px - 0.5rem);
+
+    // account for filter button, and toggle sidebar buttons with gaps
+    width: calc(100% - 70px - 1rem);
 
     @include media-breakpoint-down(xs) {
       overflow-x: auto;
@@ -1121,6 +1128,38 @@ input[type="range"].blue-slider {
   }
 }
 
+// hide Edit Filter button on larger screens
+@include media-breakpoint-up(lg) {
+  .scene-list .sidebar .edit-filter-button {
+    display: none;
+  }
+}
+
+// hide the filter icon button when sidebar is shown on smaller screens
+@include media-breakpoint-down(md) {
+  .sidebar-pane:not(.hide-sidebar) .scene-list-toolbar .filter-button {
+    display: none;
+  }
+
+  // adjust the width of the filter-tags as well
+  .sidebar-pane:not(.hide-sidebar) .scene-list-toolbar .filter-tags {
+    width: calc(100% - 35px - 0.5rem);
+  }
+}
+
+// move the sidebar toggle to the left on xl viewports
+@include media-breakpoint-up(xl) {
+  .scene-list .scene-list-toolbar .filter-section {
+    .sidebar-toggle-button {
+      margin-left: 0;
+    }
+
+    .filter-tags {
+      order: 2;
+    }
+  }
+}
+
 // hide the search term tag item when the search box is visible
 @include media-breakpoint-up(lg) {
   .scene-list-toolbar .filter-tags .search-term-filter-tag {

From acddf977715db549eb03fdd381512db3fd59c376 Mon Sep 17 00:00:00 2001
From: DogmaDragon <103123951+DogmaDragon@users.noreply.github.com>
Date: Thu, 25 Sep 2025 08:20:30 +0300
Subject: [PATCH 046/405] Refactor issue templates: replace markdown files with
 YAML configurations for bug reports, feature requests (#6102)

---
 .github/ISSUE_TEMPLATE/bug_report.md          | 40 ------------
 .github/ISSUE_TEMPLATE/bug_report.yml         | 64 +++++++++++++++++++
 .github/ISSUE_TEMPLATE/config.yml             | 11 ++++
 ...scussion---request-for-commentary--rfc-.md | 24 -------
 .github/ISSUE_TEMPLATE/feature_request.md     | 20 ------
 .github/ISSUE_TEMPLATE/feature_request.yml    | 44 +++++++++++++
 6 files changed, 119 insertions(+), 84 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE/bug_report.md
 create mode 100644 .github/ISSUE_TEMPLATE/bug_report.yml
 create mode 100644 .github/ISSUE_TEMPLATE/config.yml
 delete mode 100644 .github/ISSUE_TEMPLATE/discussion---request-for-commentary--rfc-.md
 delete mode 100644 .github/ISSUE_TEMPLATE/feature_request.md
 create mode 100644 .github/ISSUE_TEMPLATE/feature_request.yml

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index ea06d6d43..000000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,40 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: "[Bug Report] Short Form Subject (50 Chars or less)"
-labels: bug report
-assignees: ''
-
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem please ensure that your screenshots are SFW or at least appropriately censored.
-
-**Stash Version: (from Settings -> About):**
-
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
-
-**Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 22]
-
-**Additional context**
-Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 000000000..0dc6d10a8
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,64 @@
+name: Bug Report
+description: Create a report to help us fix the bug
+labels: ["bug report"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report!
+  - type: textarea
+    id: description
+    attributes:
+      label: Describe the bug
+      description: Provide a clear and concise description of what the bug is.
+    validations:
+      required: true
+  - type: textarea
+    id: reproduction
+    attributes:
+      label: Steps to reproduce
+      description: Detail the steps that would replicate this issue.
+      placeholder: |
+        1. Go to '...'
+        2. Click on '....'
+        3. Scroll down to '....'
+        4. See error
+    validations:
+      required: true
+  - type: textarea
+    id: expected
+    attributes:
+      label: Expected behaviour
+      description: Provide clear and concise description of what you expected to happen.
+    validations:
+      required: true
+  - type: textarea
+    id: context
+    attributes:
+      label: Screenshots or additional context
+      description: Provide any additional context and SFW screenshots here to help us solve this issue.
+    validations:
+      required: false
+  - type: input
+    id: stashversion
+    attributes:
+      label: Stash version
+      description: This can be found in Settings > About.
+      placeholder: (e.g. v0.28.1)
+    validations:
+      required: true
+  - type: input
+    id: devicedetails
+    attributes:
+      label: Device details
+      description: |
+        If this is an issue that occurs when using the Stash interface, please provide details of the device/browser used which presents the reported issue.
+      placeholder: (e.g. Firefox 97 (64-bit) on Windows 11)
+    validations:
+      required: false
+  - type: textarea
+    id: logs
+    attributes:
+      label: Relevant log output
+      description: Please copy and paste any relevant log output from Settings > Logs. This will be automatically formatted into code, so no need for backticks.
+      render: shell
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 000000000..028fdf8ac
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,11 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Community forum
+    url: https://discourse.stashapp.cc
+    about: Start a discussion on the community forum.
+  - name: Community Discord
+    url: https://discord.gg/Y8MNsvQBvZ
+    about: Chat with the community on Discord.
+  - name: Documentation
+    url: https://docs.stashapp.cc
+    about: Check out documentation for help and information.
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/discussion---request-for-commentary--rfc-.md b/.github/ISSUE_TEMPLATE/discussion---request-for-commentary--rfc-.md
deleted file mode 100644
index b79564f83..000000000
--- a/.github/ISSUE_TEMPLATE/discussion---request-for-commentary--rfc-.md
+++ /dev/null
@@ -1,24 +0,0 @@
----
-name: Discussion / Request for Commentary [RFC]
-about: This is for issues that will be discussed and won't necessarily result directly
-  in commits or pull requests.
-title: "[RFC] Short Form Title"
-labels: help wanted
-assignees: ''
-
----
-
-<!-- Update or delete the title if you need to delegate your title gore to something
-# Title
-
-*### Scope*
-<!-- describe the scope of your topic and your goals ideally within a single paragraph or TL;DR kind of summary so its easier for people to determine if they can contribute at a glance. -->
-
-##  Long Form
-<!-- Only required if your scope and titles can't cover everything. -->
-
-## Examples
-<!-- if you can show a picture or video examples post them here, please ensure that you respect people's time and attention and understand that people are volunteering their time, so concision is ideal and considerate. -->
-
-## Reference Reading
-<!-- if there is any reference reading or documentation, please refer to it here. -->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index db5df9d8b..000000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: "[Feature] Short Form Title (50 chars or less.)"
-labels: feature request
-assignees: ''
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
new file mode 100644
index 000000000..f139433c5
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,44 @@
+name: Feature Request
+description: Request a new feature or idea to be added to Stash
+labels: ["feature request"]
+body:
+  - type: textarea
+    id: description
+    attributes:
+      label: Describe the feature you'd like
+      description: Provide a clear description of the feature you'd like implemented
+    validations:
+      required: true
+  - type: textarea
+    id: benefits
+    attributes:
+      label: Describe the benefits this would bring to existing users
+      description: |
+        Explain the measurable benefits this feature would achieve for existing users.
+        The benefits should be described in terms of outcomes for users, not specific implementations.
+    validations:
+      required: true
+  - type: textarea
+    id: already_possible
+    attributes:
+      label: Is there an existing way to achieve this goal?
+      description: |
+        Yes/No. If Yes, describe how your proposed feature differs from or improves upon the current method
+    validations:
+      required: true
+  - type: checkboxes
+    id: confirm-search
+    attributes:
+      label: Have you searched for an existing open/closed issue?
+      description: |
+        To help us keep these issues under control, please ensure you have first [searched our issue list](https://github.com/stashapp/stash/issues?q=is%3Aissue) for any existing issues that cover the core request or benefit of your proposal.
+      options:
+        - label: I have searched for existing issues and none cover the core request of my proposal
+          required: true
+  - type: textarea
+    id: context
+    attributes:
+      label: Additional context
+      description: Add any other context or screenshots about the feature request here.
+    validations:
+      required: false
\ No newline at end of file

From 724d4387213254ad08f00f0fb7780afb30589920 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Thu, 25 Sep 2025 15:26:01 +1000
Subject: [PATCH 047/405] Wall item height fix (#6101)

* Fix scene wall item height with fewer items
* Fix for marker wall
* Fix for image wall
* Provide some allowance for items to go over height
---
 ui/v2.5/src/components/Images/ImageList.tsx   | 49 +++++++++----
 .../src/components/Images/ImageWallItem.tsx   | 28 +++-----
 .../Scenes/SceneMarkerWallPanel.tsx           | 69 +++++++++++++------
 .../src/components/Scenes/SceneWallPanel.tsx  | 69 +++++++++++++------
 4 files changed, 146 insertions(+), 69 deletions(-)

diff --git a/ui/v2.5/src/components/Images/ImageList.tsx b/ui/v2.5/src/components/Images/ImageList.tsx
index a468c2815..4149970b5 100644
--- a/ui/v2.5/src/components/Images/ImageList.tsx
+++ b/ui/v2.5/src/components/Images/ImageList.tsx
@@ -20,7 +20,7 @@ import { ImageWallItem } from "./ImageWallItem";
 import { EditImagesDialog } from "./EditImagesDialog";
 import { DeleteImagesDialog } from "./DeleteImagesDialog";
 import "flexbin/flexbin.css";
-import Gallery from "react-photo-gallery";
+import Gallery, { RenderImageProps } from "react-photo-gallery";
 import { ExportDialog } from "../Shared/ExportDialog";
 import { objectTitle } from "src/core/files";
 import { ConfigurationContext } from "src/hooks/Config";
@@ -54,6 +54,8 @@ const ImageWall: React.FC<IImageWallProps> = ({
   const { configuration } = useContext(ConfigurationContext);
   const uiConfig = configuration?.ui;
 
+  const containerRef = React.useRef<HTMLDivElement>(null);
+
   let photos: {
     src: string;
     srcSet?: string | string[] | undefined;
@@ -94,22 +96,45 @@ const ImageWall: React.FC<IImageWallProps> = ({
     return Math.round(columnCount);
   }
 
-  function targetRowHeight(containerWidth: number) {
-    let zoomHeight = 280;
-    breakpointZoomHeights.forEach((e) => {
-      if (containerWidth >= e.minWidth) {
-        zoomHeight = e.heights[zoomIndex];
-      }
-    });
-    return zoomHeight;
-  }
+  const targetRowHeight = useCallback(
+    (containerWidth: number) => {
+      let zoomHeight = 280;
+      breakpointZoomHeights.forEach((e) => {
+        if (containerWidth >= e.minWidth) {
+          zoomHeight = e.heights[zoomIndex];
+        }
+      });
+      return zoomHeight;
+    },
+    [zoomIndex]
+  );
+
+  // set the max height as a factor of the targetRowHeight
+  // this allows some images to be taller than the target row height
+  // but prevents images from becoming too tall when there is a small number of items
+  const maxHeightFactor = 1.3;
+
+  const renderImage = useCallback(
+    (props: RenderImageProps) => {
+      return (
+        <ImageWallItem
+          {...props}
+          maxHeight={
+            targetRowHeight(containerRef.current?.offsetWidth ?? 0) *
+            maxHeightFactor
+          }
+        />
+      );
+    },
+    [targetRowHeight]
+  );
 
   return (
-    <div className="gallery">
+    <div className="gallery" ref={containerRef}>
       {photos.length ? (
         <Gallery
           photos={photos}
-          renderImage={ImageWallItem}
+          renderImage={renderImage}
           onClick={showLightboxOnClick}
           margin={uiConfig?.imageWallOptions?.margin!}
           direction={uiConfig?.imageWallOptions?.direction!}
diff --git a/ui/v2.5/src/components/Images/ImageWallItem.tsx b/ui/v2.5/src/components/Images/ImageWallItem.tsx
index 8403b3a98..c4833f917 100644
--- a/ui/v2.5/src/components/Images/ImageWallItem.tsx
+++ b/ui/v2.5/src/components/Images/ImageWallItem.tsx
@@ -1,23 +1,17 @@
 import React from "react";
-import type {
-  RenderImageProps,
-  renderImageClickHandler,
-  PhotoProps,
-} from "react-photo-gallery";
+import type { RenderImageProps } from "react-photo-gallery";
 
-interface IImageWallProps {
-  margin?: string;
-  index: number;
-  photo: PhotoProps;
-  onClick: renderImageClickHandler | null;
-  direction: "row" | "column";
-  top?: number;
-  left?: number;
+interface IExtraProps {
+  maxHeight: number;
 }
 
-export const ImageWallItem: React.FC<RenderImageProps> = (
-  props: IImageWallProps
+export const ImageWallItem: React.FC<RenderImageProps & IExtraProps> = (
+  props: RenderImageProps & IExtraProps
 ) => {
+  const height = Math.min(props.maxHeight, props.photo.height);
+  const zoomFactor = height / props.photo.height;
+  const width = props.photo.width * zoomFactor;
+
   type style = Record<string, string | number | undefined>;
   var imgStyle: style = {
     margin: props.margin,
@@ -49,8 +43,8 @@ export const ImageWallItem: React.FC<RenderImageProps> = (
       key={props.photo.key}
       style={imgStyle}
       src={props.photo.src}
-      width={props.photo.width}
-      height={props.photo.height}
+      width={width}
+      height={height}
       alt={props.photo.alt}
       onClick={handleClick}
     />
diff --git a/ui/v2.5/src/components/Scenes/SceneMarkerWallPanel.tsx b/ui/v2.5/src/components/Scenes/SceneMarkerWallPanel.tsx
index 5202b94d1..a1879a027 100644
--- a/ui/v2.5/src/components/Scenes/SceneMarkerWallPanel.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneMarkerWallPanel.tsx
@@ -39,15 +39,23 @@ interface IMarkerPhoto {
   onError?: (photo: PhotoProps<IMarkerPhoto>) => void;
 }
 
-export const MarkerWallItem: React.FC<RenderImageProps<IMarkerPhoto>> = (
-  props: RenderImageProps<IMarkerPhoto>
-) => {
+interface IExtraProps {
+  maxHeight: number;
+}
+
+export const MarkerWallItem: React.FC<
+  RenderImageProps<IMarkerPhoto> & IExtraProps
+> = (props: RenderImageProps<IMarkerPhoto> & IExtraProps) => {
   const { configuration } = useContext(ConfigurationContext);
   const playSound = configuration?.interface.soundOnPreview ?? false;
   const showTitle = configuration?.interface.wallShowTitle ?? false;
 
   const [active, setActive] = useState(false);
 
+  const height = Math.min(props.maxHeight, props.photo.height);
+  const zoomFactor = height / props.photo.height;
+  const width = props.photo.width * zoomFactor;
+
   type style = Record<string, string | number | undefined>;
   var divStyle: style = {
     margin: props.margin,
@@ -79,8 +87,8 @@ export const MarkerWallItem: React.FC<RenderImageProps<IMarkerPhoto>> = (
       role="button"
       style={{
         ...divStyle,
-        width: props.photo.width,
-        height: props.photo.height,
+        width,
+        height,
       }}
     >
       <ImagePreview
@@ -90,8 +98,8 @@ export const MarkerWallItem: React.FC<RenderImageProps<IMarkerPhoto>> = (
         autoPlay={video}
         key={props.photo.key}
         src={props.photo.src}
-        width={props.photo.width}
-        height={props.photo.height}
+        width={width}
+        height={height}
         alt={props.photo.alt}
         onMouseEnter={() => setActive(true)}
         onMouseLeave={() => setActive(false)}
@@ -163,6 +171,8 @@ const breakpointZoomHeights = [
 const MarkerWall: React.FC<IMarkerWallProps> = ({ markers, zoomIndex }) => {
   const history = useHistory();
 
+  const containerRef = React.useRef<HTMLDivElement>(null);
+
   const margin = 3;
   const direction = "row";
 
@@ -208,22 +218,41 @@ const MarkerWall: React.FC<IMarkerWallProps> = ({ markers, zoomIndex }) => {
     return Math.round(columnCount);
   }
 
-  function targetRowHeight(containerWidth: number) {
-    let zoomHeight = 280;
-    breakpointZoomHeights.forEach((e) => {
-      if (containerWidth >= e.minWidth) {
-        zoomHeight = e.heights[zoomIndex];
-      }
-    });
-    return zoomHeight;
-  }
+  const targetRowHeight = useCallback(
+    (containerWidth: number) => {
+      let zoomHeight = 280;
+      breakpointZoomHeights.forEach((e) => {
+        if (containerWidth >= e.minWidth) {
+          zoomHeight = e.heights[zoomIndex];
+        }
+      });
+      return zoomHeight;
+    },
+    [zoomIndex]
+  );
 
-  const renderImage = useCallback((props: RenderImageProps<IMarkerPhoto>) => {
-    return <MarkerWallItem {...props} />;
-  }, []);
+  // set the max height as a factor of the targetRowHeight
+  // this allows some images to be taller than the target row height
+  // but prevents images from becoming too tall when there is a small number of items
+  const maxHeightFactor = 1.3;
+
+  const renderImage = useCallback(
+    (props: RenderImageProps<IMarkerPhoto>) => {
+      return (
+        <MarkerWallItem
+          {...props}
+          maxHeight={
+            targetRowHeight(containerRef.current?.offsetWidth ?? 0) *
+            maxHeightFactor
+          }
+        />
+      );
+    },
+    [targetRowHeight]
+  );
 
   return (
-    <div className="marker-wall">
+    <div className="marker-wall" ref={containerRef}>
       {photos.length ? (
         <MarkerGallery
           photos={photos}
diff --git a/ui/v2.5/src/components/Scenes/SceneWallPanel.tsx b/ui/v2.5/src/components/Scenes/SceneWallPanel.tsx
index dcc0bf734..fb99e2af4 100644
--- a/ui/v2.5/src/components/Scenes/SceneWallPanel.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneWallPanel.tsx
@@ -26,15 +26,23 @@ interface IScenePhoto {
   onError?: (photo: PhotoProps<IScenePhoto>) => void;
 }
 
-export const SceneWallItem: React.FC<RenderImageProps<IScenePhoto>> = (
-  props: RenderImageProps<IScenePhoto>
-) => {
+interface IExtraProps {
+  maxHeight: number;
+}
+
+export const SceneWallItem: React.FC<
+  RenderImageProps<IScenePhoto> & IExtraProps
+> = (props: RenderImageProps<IScenePhoto> & IExtraProps) => {
   const intl = useIntl();
 
   const { configuration } = useContext(ConfigurationContext);
   const playSound = configuration?.interface.soundOnPreview ?? false;
   const showTitle = configuration?.interface.wallShowTitle ?? false;
 
+  const height = Math.min(props.maxHeight, props.photo.height);
+  const zoomFactor = height / props.photo.height;
+  const width = props.photo.width * zoomFactor;
+
   const [active, setActive] = useState(false);
 
   type style = Record<string, string | number | undefined>;
@@ -72,8 +80,8 @@ export const SceneWallItem: React.FC<RenderImageProps<IScenePhoto>> = (
       role="button"
       style={{
         ...divStyle,
-        width: props.photo.width,
-        height: props.photo.height,
+        width,
+        height,
       }}
     >
       <ImagePreview
@@ -83,8 +91,8 @@ export const SceneWallItem: React.FC<RenderImageProps<IScenePhoto>> = (
         autoPlay={video}
         key={props.photo.key}
         src={props.photo.src}
-        width={props.photo.width}
-        height={props.photo.height}
+        width={width}
+        height={height}
         alt={props.photo.alt}
         onMouseEnter={() => setActive(true)}
         onMouseLeave={() => setActive(false)}
@@ -146,6 +154,8 @@ const SceneWall: React.FC<ISceneWallProps> = ({
 }) => {
   const history = useHistory();
 
+  const containerRef = React.useRef<HTMLDivElement>(null);
+
   const margin = 3;
   const direction = "row";
 
@@ -196,22 +206,41 @@ const SceneWall: React.FC<ISceneWallProps> = ({
     return Math.round(columnCount);
   }
 
-  function targetRowHeight(containerWidth: number) {
-    let zoomHeight = 280;
-    breakpointZoomHeights.forEach((e) => {
-      if (containerWidth >= e.minWidth) {
-        zoomHeight = e.heights[zoomIndex];
-      }
-    });
-    return zoomHeight;
-  }
+  const targetRowHeight = useCallback(
+    (containerWidth: number) => {
+      let zoomHeight = 280;
+      breakpointZoomHeights.forEach((e) => {
+        if (containerWidth >= e.minWidth) {
+          zoomHeight = e.heights[zoomIndex];
+        }
+      });
+      return zoomHeight;
+    },
+    [zoomIndex]
+  );
 
-  const renderImage = useCallback((props: RenderImageProps<IScenePhoto>) => {
-    return <SceneWallItem {...props} />;
-  }, []);
+  // set the max height as a factor of the targetRowHeight
+  // this allows some images to be taller than the target row height
+  // but prevents images from becoming too tall when there is a small number of items
+  const maxHeightFactor = 1.3;
+
+  const renderImage = useCallback(
+    (props: RenderImageProps<IScenePhoto>) => {
+      return (
+        <SceneWallItem
+          {...props}
+          maxHeight={
+            targetRowHeight(containerRef.current?.offsetWidth ?? 0) *
+            maxHeightFactor
+          }
+        />
+      );
+    },
+    [targetRowHeight]
+  );
 
   return (
-    <div className="scene-wall">
+    <div className={`scene-wall`} ref={containerRef}>
       {photos.length ? (
         <SceneGallery
           photos={photos}

From c9ca40152fe9f0584d9dd7a497952b33793f4b54 Mon Sep 17 00:00:00 2001
From: sezzim <174854242+sezzim@users.noreply.github.com>
Date: Wed, 24 Sep 2025 22:26:24 -0700
Subject: [PATCH 048/405] Show gallery cover on the edit panel (#5935)

---
 internal/api/urlbuilders/gallery.go           |  4 ++-
 .../GalleryDetails/GalleryEditPanel.tsx       | 21 ++++++++++++++
 ui/v2.5/src/components/Galleries/styles.scss  | 15 ++++++++++
 ui/v2.5/src/core/StashService.ts              | 29 ++++++++++++-------
 ui/v2.5/src/docs/en/Manual/Images.md          |  2 ++
 5 files changed, 60 insertions(+), 11 deletions(-)

diff --git a/internal/api/urlbuilders/gallery.go b/internal/api/urlbuilders/gallery.go
index 3e6c5ef08..2723781f2 100644
--- a/internal/api/urlbuilders/gallery.go
+++ b/internal/api/urlbuilders/gallery.go
@@ -9,12 +9,14 @@ import (
 type GalleryURLBuilder struct {
 	BaseURL   string
 	GalleryID string
+	UpdatedAt string
 }
 
 func NewGalleryURLBuilder(baseURL string, gallery *models.Gallery) GalleryURLBuilder {
 	return GalleryURLBuilder{
 		BaseURL:   baseURL,
 		GalleryID: strconv.Itoa(gallery.ID),
+		UpdatedAt: strconv.FormatInt(gallery.UpdatedAt.Unix(), 10),
 	}
 }
 
@@ -23,5 +25,5 @@ func (b GalleryURLBuilder) GetPreviewURL() string {
 }
 
 func (b GalleryURLBuilder) GetCoverURL() string {
-	return b.BaseURL + "/gallery/" + b.GalleryID + "/cover"
+	return b.BaseURL + "/gallery/" + b.GalleryID + "/cover?t=" + b.UpdatedAt
 }
diff --git a/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryEditPanel.tsx b/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryEditPanel.tsx
index b9eea8f5d..5b9fa9da1 100644
--- a/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryEditPanel.tsx
+++ b/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryEditPanel.tsx
@@ -162,6 +162,21 @@ export const GalleryEditPanel: React.FC<IProps> = ({
     );
   }, [scrapers]);
 
+  const cover = useMemo(() => {
+    if (gallery?.paths?.cover) {
+      return (
+        <div className="gallery-cover">
+          <img
+            src={gallery.paths.cover}
+            alt={intl.formatMessage({ id: "cover_image" })}
+          />
+        </div>
+      );
+    }
+
+    return <div></div>;
+  }, [gallery?.paths?.cover, intl]);
+
   async function onSave(input: InputValues) {
     setIsLoading(true);
     try {
@@ -463,6 +478,12 @@ export const GalleryEditPanel: React.FC<IProps> = ({
           </Col>
           <Col lg={5} xl={12}>
             {renderDetailsField()}
+            <Form.Group controlId="cover_image">
+              <Form.Label>
+                <FormattedMessage id="cover_image" />
+              </Form.Label>
+              {cover}
+            </Form.Group>
           </Col>
         </Row>
       </Form>
diff --git a/ui/v2.5/src/components/Galleries/styles.scss b/ui/v2.5/src/components/Galleries/styles.scss
index 58116e936..5e8618326 100644
--- a/ui/v2.5/src/components/Galleries/styles.scss
+++ b/ui/v2.5/src/components/Galleries/styles.scss
@@ -206,6 +206,21 @@ $galleryTabWidth: 450px;
   }
 }
 
+.gallery-cover {
+  aspect-ratio: 4 / 3;
+  display: block;
+  height: auto;
+  width: 100%;
+}
+
+.gallery-cover img {
+  height: auto;
+  max-height: 100%;
+  max-width: 100%;
+  object-fit: contain;
+  width: auto;
+}
+
 div.GalleryWall {
   display: flex;
   flex-wrap: wrap;
diff --git a/ui/v2.5/src/core/StashService.ts b/ui/v2.5/src/core/StashService.ts
index a7679a5d5..8db471792 100644
--- a/ui/v2.5/src/core/StashService.ts
+++ b/ui/v2.5/src/core/StashService.ts
@@ -1613,17 +1613,30 @@ export const mutateAddGalleryImages = (input: GQL.GalleryAddInput) =>
     },
   });
 
+function evictCover(cache: ApolloCache<GQL.Gallery>, gallery_id: string) {
+  const fields: Pick<Modifiers<GQL.Gallery>, "paths" | "cover"> = {};
+  fields.paths = (paths) => {
+    if (!("cover" in paths)) {
+      return paths;
+    }
+    const coverUrl = new URL(paths.cover);
+    coverUrl.search = "?t=" + Math.floor(Date.now() / 1000);
+    return { ...paths, cover: coverUrl.toString() };
+  };
+  fields.cover = (_value, { DELETE }) => DELETE;
+  cache.modify({
+    id: cache.identify({ __typename: "Gallery", id: gallery_id }),
+    fields,
+  });
+}
+
 export const mutateSetGalleryCover = (input: GQL.GallerySetCoverInput) =>
   client.mutate<GQL.SetGalleryCoverMutation>({
     mutation: GQL.SetGalleryCoverDocument,
     variables: input,
     update(cache, result) {
       if (!result.data?.setGalleryCover) return;
-
-      cache.evict({
-        id: cache.identify({ __typename: "Gallery", id: input.gallery_id }),
-        fieldName: "cover",
-      });
+      evictCover(cache, input.gallery_id);
     },
   });
 
@@ -1633,11 +1646,7 @@ export const mutateResetGalleryCover = (input: GQL.GalleryResetCoverInput) =>
     variables: input,
     update(cache, result) {
       if (!result.data?.resetGalleryCover) return;
-
-      cache.evict({
-        id: cache.identify({ __typename: "Gallery", id: input.gallery_id }),
-        fieldName: "cover",
-      });
+      evictCover(cache, input.gallery_id);
     },
   });
 
diff --git a/ui/v2.5/src/docs/en/Manual/Images.md b/ui/v2.5/src/docs/en/Manual/Images.md
index 7b384596b..e5733fc2e 100644
--- a/ui/v2.5/src/docs/en/Manual/Images.md
+++ b/ui/v2.5/src/docs/en/Manual/Images.md
@@ -13,6 +13,8 @@ For best results, images in zip file should be stored without compression (copy,
 
 If a filename of an image in the gallery zip file ends with `cover.jpg`, it will be treated like a cover and presented first in the gallery view page and as a gallery cover in the gallery list view. If more than one images match the name the first one found in natural sort order is selected.
 
+You can also manually select any image from a gallery as its cover. On the gallery details page, select the desired cover image, and then select **Set as Cover** in the ⋯ menu.
+
 ## Image clips/gifs
 
 Images can also be clips/gifs. These are meant to be short video loops. Right now they are not possible in zipfiles. To declare video files to be images, there are two ways:

From 15bf28d5be349407790be87d3b516f39525624eb Mon Sep 17 00:00:00 2001
From: xtc1337 <107708032+xtc1337@users.noreply.github.com>
Date: Thu, 25 Sep 2025 00:27:58 -0500
Subject: [PATCH 049/405] Adding the ability to support different Haptic
 Devices (#5856)

* refactored `Interactive` class to allow more HapticDevice devices
* simplified api hooks
* update creation of `interactive` to pass `stashConfig`
* updated UIPluginApi to mention `PluginApi.InteractiveUtils`
---
 ui/v2.5/src/components/ScenePlayer/util.ts   |  5 +-
 ui/v2.5/src/docs/en/Manual/UIPluginApi.md    | 70 +++++++++++++++++++-
 ui/v2.5/src/hooks/Interactive/context.tsx    | 54 ++++++++++++---
 ui/v2.5/src/hooks/Interactive/interactive.ts | 17 +++++
 ui/v2.5/src/hooks/Interactive/utils.ts       | 51 ++++++++++++++
 ui/v2.5/src/pluginApi.tsx                    |  4 +-
 6 files changed, 186 insertions(+), 15 deletions(-)
 create mode 100644 ui/v2.5/src/hooks/Interactive/utils.ts

diff --git a/ui/v2.5/src/components/ScenePlayer/util.ts b/ui/v2.5/src/components/ScenePlayer/util.ts
index a63ab6a2e..8c6fb8010 100644
--- a/ui/v2.5/src/components/ScenePlayer/util.ts
+++ b/ui/v2.5/src/components/ScenePlayer/util.ts
@@ -2,5 +2,6 @@ import videojs from "video.js";
 
 export const VIDEO_PLAYER_ID = "VideoJsPlayer";
 
-export const getPlayerPosition = () =>
-  videojs.getPlayer(VIDEO_PLAYER_ID)?.currentTime();
+export const getPlayer = () => videojs.getPlayer(VIDEO_PLAYER_ID);
+
+export const getPlayerPosition = () => getPlayer()?.currentTime();
diff --git a/ui/v2.5/src/docs/en/Manual/UIPluginApi.md b/ui/v2.5/src/docs/en/Manual/UIPluginApi.md
index f010deb38..23cd3fd64 100644
--- a/ui/v2.5/src/docs/en/Manual/UIPluginApi.md
+++ b/ui/v2.5/src/docs/en/Manual/UIPluginApi.md
@@ -66,7 +66,7 @@ This namespace contains all of the components available to plugins. These includ
 
 ### `utils`
 
-This namespace provides access to the `NavUtils` and `StashService` namespaces. It also provides access to the `loadComponents` method.
+This namespace provides access to the `NavUtils` , `StashService` and `InteractiveUtils` namespaces. It also provides access to the `loadComponents` method.
 
 #### `PluginApi.utils.loadComponents`
 
@@ -80,6 +80,72 @@ In general, `PluginApi.hooks.useLoadComponents` hook should be used instead.
 
 Returns a `Promise<void>` that resolves when all of the components have been loaded.
 
+#### `PluginApi.utils.InteractiveUtils`
+This namespace provides access to `interactiveClientProvider` and `getPlayer`
+ - `getPlayer` returns the current `videojs` player object
+ - `interactiveClientProvider` takes `IInteractiveClientProvider` which allows a developer to hook into the lifecycle of funscripts.
+```ts
+  export interface IDeviceSettings {
+  connectionKey: string;
+  scriptOffset: number;
+  estimatedServerTimeOffset?: number;
+  useStashHostedFunscript?: boolean;
+  [key: string]: unknown;
+}
+
+export interface IInteractiveClientProviderOptions {
+  handyKey: string;
+  scriptOffset: number;
+  defaultClientProvider?: IInteractiveClientProvider;
+  stashConfig?: GQL.ConfigDataFragment;
+}
+export interface IInteractiveClientProvider {
+  (options: IInteractiveClientProviderOptions): IInteractiveClient;
+}
+
+/**
+ * Interface that is used for InteractiveProvider
+ */
+export interface IInteractiveClient {
+  connect(): Promise<void>;
+  handyKey: string;
+  uploadScript: (funscriptPath: string, apiKey?: string) => Promise<void>;
+  sync(): Promise<number>;
+  configure(config: Partial<IDeviceSettings>): Promise<void>;
+  play(position: number): Promise<void>;
+  pause(): Promise<void>;
+  ensurePlaying(position: number): Promise<void>;
+  setLooping(looping: boolean): Promise<void>;
+  readonly connected: boolean;
+  readonly playing: boolean;
+}
+
+```
+##### Example
+For instance say I wanted to add extra logging when `IInteractiveClient.connect()` is called.
+In my plugin you would install your own client provider as seen below
+
+```ts
+InteractiveUtils.interactiveClientProvider = (
+  opts
+) => {
+  if (!opts.defaultClientProvider) {
+    throw new Error('invalid setup');
+  }
+
+  const client = opts.defaultClientProvider(opts);
+  const connect = client.connect;
+  client.connect = async () => {
+      console.log('patching connect method');
+      return connect.call(client);
+    };
+   
+  return client;
+};
+
+```
+
+
 ### `hooks`
 
 This namespace provides access to the following core utility hooks:
@@ -251,3 +317,5 @@ Allows plugins to listen for Stash's events.
 ```js
 PluginApi.Event.addEventListener("stash:location", (e) => console.log("Page Changed", e.detail.data.location.pathname))
 ```
+
+
diff --git a/ui/v2.5/src/hooks/Interactive/context.tsx b/ui/v2.5/src/hooks/Interactive/context.tsx
index a42f0aa7b..9e7194d6a 100644
--- a/ui/v2.5/src/hooks/Interactive/context.tsx
+++ b/ui/v2.5/src/hooks/Interactive/context.tsx
@@ -2,6 +2,10 @@ import React, { useCallback, useContext, useEffect, useState } from "react";
 import { ConfigurationContext } from "../Config";
 import { useLocalForage } from "../LocalForage";
 import { Interactive as InteractiveAPI } from "./interactive";
+import InteractiveUtils, {
+  IInteractiveClient,
+  IInteractiveClientProvider,
+} from "./utils";
 
 export enum ConnectionState {
   Missing,
@@ -34,7 +38,7 @@ export function connectionStateLabel(s: ConnectionState) {
 }
 
 export interface IState {
-  interactive: InteractiveAPI;
+  interactive: IInteractiveClient;
   state: ConnectionState;
   serverOffset: number;
   initialised: boolean;
@@ -69,6 +73,13 @@ interface IInteractiveState {
   lastSyncTime: number;
 }
 
+export const defaultInteractiveClientProvider: IInteractiveClientProvider = ({
+  handyKey,
+  scriptOffset,
+}): IInteractiveClient => {
+  return new InteractiveAPI(handyKey, scriptOffset);
+};
+
 export const InteractiveProvider: React.FC = ({ children }) => {
   const [{ data: config }, setConfig] = useLocalForage<IInteractiveState>(
     LOCAL_FORAGE_KEY,
@@ -85,7 +96,22 @@ export const InteractiveProvider: React.FC = ({ children }) => {
   const [scriptOffset, setScriptOffset] = useState<number>(0);
   const [useStashHostedFunscript, setUseStashHostedFunscript] =
     useState<boolean>(false);
-  const [interactive] = useState<InteractiveAPI>(new InteractiveAPI("", 0));
+
+  const resolveInteractiveClient = useCallback(() => {
+    const interactiveClientProvider =
+      InteractiveUtils.interactiveClientProvider ??
+      defaultInteractiveClientProvider;
+
+    return interactiveClientProvider({
+      handyKey: "",
+      scriptOffset: 0,
+      defaultClientProvider: defaultInteractiveClientProvider,
+      stashConfig,
+    });
+  }, [stashConfig]);
+
+  // fetch client provider from PluginApi if not found use default provider
+  const [interactive] = useState(resolveInteractiveClient);
 
   const [initialised, setInitialised] = useState(false);
   const [error, setError] = useState<string | undefined>();
@@ -104,7 +130,9 @@ export const InteractiveProvider: React.FC = ({ children }) => {
     }
 
     if (config?.serverOffset) {
-      interactive.setServerTimeOffset(config.serverOffset);
+      await interactive.configure({
+        estimatedServerTimeOffset: config.serverOffset,
+      });
       setState(ConnectionState.Connecting);
       try {
         await interactive.connect();
@@ -138,13 +166,17 @@ export const InteractiveProvider: React.FC = ({ children }) => {
 
     const oldKey = interactive.handyKey;
 
-    interactive.handyKey = handyKey ?? "";
-    interactive.scriptOffset = scriptOffset;
-    interactive.useStashHostedFunscript = useStashHostedFunscript;
-
-    if (oldKey !== interactive.handyKey && interactive.handyKey) {
-      initialise();
-    }
+    interactive
+      .configure({
+        connectionKey: handyKey ?? "",
+        offset: scriptOffset,
+        useStashHostedFunscript,
+      })
+      .then(() => {
+        if (oldKey !== interactive.handyKey && interactive.handyKey) {
+          initialise();
+        }
+      });
   }, [
     handyKey,
     scriptOffset,
@@ -171,7 +203,7 @@ export const InteractiveProvider: React.FC = ({ children }) => {
 
   const uploadScript = useCallback(
     async (funscriptPath: string) => {
-      interactive.pause();
+      await interactive.pause();
       if (
         !interactive.handyKey ||
         !funscriptPath ||
diff --git a/ui/v2.5/src/hooks/Interactive/interactive.ts b/ui/v2.5/src/hooks/Interactive/interactive.ts
index ef34bd2ef..4ca59b25b 100644
--- a/ui/v2.5/src/hooks/Interactive/interactive.ts
+++ b/ui/v2.5/src/hooks/Interactive/interactive.ts
@@ -5,6 +5,7 @@ import {
   CsvUploadResponse,
   HandyFirmwareStatus,
 } from "thehandy/lib/types";
+import { IDeviceSettings } from "./utils";
 
 interface IFunscript {
   actions: Array<IAction>;
@@ -108,6 +109,13 @@ export class Interactive {
     this._playing = false;
   }
 
+  get connected() {
+    return this._connected;
+  }
+  get playing() {
+    return this._playing;
+  }
+
   async connect() {
     const connected = await this._handy.getConnected();
     if (!connected) {
@@ -180,6 +188,15 @@ export class Interactive {
     this._handy.estimatedServerTimeOffset = offset;
   }
 
+  async configure(config: Partial<IDeviceSettings>) {
+    this._scriptOffset = config.scriptOffset ?? this._scriptOffset;
+    this.handyKey = config.connectionKey ?? this.handyKey;
+    this._handy.estimatedServerTimeOffset =
+      config.estimatedServerTimeOffset ?? this._handy.estimatedServerTimeOffset;
+    this.useStashHostedFunscript =
+      config.useStashHostedFunscript ?? this.useStashHostedFunscript;
+  }
+
   async play(position: number) {
     if (!this._connected) {
       return;
diff --git a/ui/v2.5/src/hooks/Interactive/utils.ts b/ui/v2.5/src/hooks/Interactive/utils.ts
new file mode 100644
index 000000000..c1d066e86
--- /dev/null
+++ b/ui/v2.5/src/hooks/Interactive/utils.ts
@@ -0,0 +1,51 @@
+import { getPlayer } from "src/components/ScenePlayer/util";
+import type { VideoJsPlayer } from "video.js";
+import * as GQL from "src/core/generated-graphql";
+
+export interface IDeviceSettings {
+  connectionKey: string;
+  scriptOffset: number;
+  estimatedServerTimeOffset?: number;
+  useStashHostedFunscript?: boolean;
+  [key: string]: unknown;
+}
+
+export interface IInteractiveClientProviderOptions {
+  handyKey: string;
+  scriptOffset: number;
+  defaultClientProvider?: IInteractiveClientProvider;
+  stashConfig?: GQL.ConfigDataFragment;
+}
+export interface IInteractiveClientProvider {
+  (options: IInteractiveClientProviderOptions): IInteractiveClient;
+}
+
+/**
+ * Interface that is used for InteractiveProvider
+ */
+export interface IInteractiveClient {
+  connect(): Promise<void>;
+  handyKey: string;
+  uploadScript: (funscriptPath: string, apiKey?: string) => Promise<void>;
+  sync(): Promise<number>;
+  configure(config: Partial<IDeviceSettings>): Promise<void>;
+  play(position: number): Promise<void>;
+  pause(): Promise<void>;
+  ensurePlaying(position: number): Promise<void>;
+  setLooping(looping: boolean): Promise<void>;
+  readonly connected: boolean;
+  readonly playing: boolean;
+}
+
+export interface IInteractiveUtils {
+  getPlayer: () => VideoJsPlayer | undefined;
+  interactiveClientProvider: IInteractiveClientProvider | undefined;
+}
+const InteractiveUtils = {
+  // hook to allow to customize the interactive client
+  interactiveClientProvider: undefined,
+  // returns the active player
+  getPlayer,
+};
+
+export default InteractiveUtils;
diff --git a/ui/v2.5/src/pluginApi.tsx b/ui/v2.5/src/pluginApi.tsx
index 99d4a5992..e534dddef 100644
--- a/ui/v2.5/src/pluginApi.tsx
+++ b/ui/v2.5/src/pluginApi.tsx
@@ -16,9 +16,10 @@ import * as ReactSelect from "react-select";
 import { useSpriteInfo } from "./hooks/sprite";
 import { useToast } from "./hooks/Toast";
 import Event from "./hooks/event";
-import { before, instead, after, components, RegisterComponent } from "./patch";
+import { after, before, components, instead, RegisterComponent } from "./patch";
 import { useSettings } from "./components/Settings/context";
 import { useInteractive } from "./hooks/Interactive/context";
+import InteractiveUtils from "./hooks/Interactive/utils";
 import { useLightbox, useGalleryLightbox } from "./hooks/Lightbox/hooks";
 
 // due to code splitting, some components may not have been loaded when a plugin
@@ -152,6 +153,7 @@ export const PluginApi = {
   },
   components,
   utils: {
+    InteractiveUtils,
     NavUtils,
     StashService,
     loadComponents,

From af76f4a24aacdf36694cb39016e355778a27953e Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Mon, 6 Oct 2025 07:44:59 +1100
Subject: [PATCH 050/405] Prevent input field from focusing on touch devices
 rather than mobile (#6105)

---
 ui/v2.5/src/components/List/Filters/FilterSidebar.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/v2.5/src/components/List/Filters/FilterSidebar.tsx b/ui/v2.5/src/components/List/Filters/FilterSidebar.tsx
index 9ad2fe152..1623c83d7 100644
--- a/ui/v2.5/src/components/List/Filters/FilterSidebar.tsx
+++ b/ui/v2.5/src/components/List/Filters/FilterSidebar.tsx
@@ -30,9 +30,9 @@ export const FilteredSidebarHeader: React.FC<{
   const [, setFocus] = focus;
 
   // Set the focus on the input field when the sidebar is opened
-  // Don't do this on mobile devices
+  // Don't do this on touch devices
   useEffect(() => {
-    if (sidebarOpen && !ScreenUtils.isMobile()) {
+    if (sidebarOpen && !ScreenUtils.isTouch()) {
       setFocus();
     }
   }, [sidebarOpen, setFocus]);

From c5bad48ece56378a1c3fdc0658efbb63a1c656c9 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Mon, 6 Oct 2025 07:45:36 +1100
Subject: [PATCH 051/405] Scene list cleanup (#6104)

* Generalise and cleanup list toolbar
* Generalise ListResultsHeader
* Fix padding on sub-pages
---
 .../components/List/FilteredListToolbar.tsx   |  23 +-
 ui/v2.5/src/components/List/ListFilter.tsx    |  54 ++-
 .../src/components/List/ListResultsHeader.tsx |  66 ++++
 ui/v2.5/src/components/List/ListToolbar.tsx   | 120 +++++++
 ui/v2.5/src/components/List/styles.scss       | 231 +++++++++++++
 ui/v2.5/src/components/Scenes/SceneList.tsx   | 321 ++++++------------
 ui/v2.5/src/components/Scenes/styles.scss     | 251 --------------
 ui/v2.5/src/components/Shared/Sidebar.tsx     |  69 +---
 ui/v2.5/src/components/Shared/styles.scss     |   8 +-
 9 files changed, 560 insertions(+), 583 deletions(-)
 create mode 100644 ui/v2.5/src/components/List/ListResultsHeader.tsx
 create mode 100644 ui/v2.5/src/components/List/ListToolbar.tsx

diff --git a/ui/v2.5/src/components/List/FilteredListToolbar.tsx b/ui/v2.5/src/components/List/FilteredListToolbar.tsx
index 44ce94453..656b07470 100644
--- a/ui/v2.5/src/components/List/FilteredListToolbar.tsx
+++ b/ui/v2.5/src/components/List/FilteredListToolbar.tsx
@@ -8,11 +8,9 @@ import {
   IListFilterOperation,
   ListOperationButtons,
 } from "./ListOperationButtons";
-import { Button, ButtonGroup, ButtonToolbar } from "react-bootstrap";
+import { ButtonGroup, ButtonToolbar } from "react-bootstrap";
 import { View } from "./views";
 import { IListSelect, useFilterOperations } from "./util";
-import { SidebarIcon } from "../Shared/Sidebar";
-import { useIntl } from "react-intl";
 
 export interface IItemListOperation<T extends QueryResult> {
   text: string;
@@ -43,7 +41,6 @@ export interface IFilteredListToolbar {
   onDelete?: () => void;
   operations?: IListFilterOperation[];
   zoomable?: boolean;
-  onToggleSidebar?: () => void;
 }
 
 export const FilteredListToolbar: React.FC<IFilteredListToolbar> = ({
@@ -56,9 +53,7 @@ export const FilteredListToolbar: React.FC<IFilteredListToolbar> = ({
   onDelete,
   operations,
   zoomable = false,
-  onToggleSidebar,
 }) => {
-  const intl = useIntl();
   const filterOptions = filter.options;
   const { setDisplayMode, setZoom } = useFilterOperations({
     filter,
@@ -68,21 +63,6 @@ export const FilteredListToolbar: React.FC<IFilteredListToolbar> = ({
 
   return (
     <ButtonToolbar className="filtered-list-toolbar">
-      <ButtonGroup>
-        {onToggleSidebar && (
-          <ButtonGroup>
-            <Button
-              className="sidebar-toggle-button"
-              onClick={onToggleSidebar}
-              variant="secondary"
-              title={intl.formatMessage({ id: "actions.sidebar.open" })}
-            >
-              <SidebarIcon />
-            </Button>
-          </ButtonGroup>
-        )}
-      </ButtonGroup>
-
       <ButtonGroup>
         {showEditFilter && (
           <ListFilter
@@ -90,7 +70,6 @@ export const FilteredListToolbar: React.FC<IFilteredListToolbar> = ({
             filter={filter}
             openFilterDialog={() => showEditFilter()}
             view={view}
-            withSidebar={!!onToggleSidebar}
           />
         )}
         <ListOperationButtons
diff --git a/ui/v2.5/src/components/List/ListFilter.tsx b/ui/v2.5/src/components/List/ListFilter.tsx
index 99bae365e..407a6ea62 100644
--- a/ui/v2.5/src/components/List/ListFilter.tsx
+++ b/ui/v2.5/src/components/List/ListFilter.tsx
@@ -324,7 +324,6 @@ interface IListFilterProps {
   filter: ListFilterModel;
   view?: View;
   openFilterDialog: () => void;
-  withSidebar?: boolean;
 }
 
 export const ListFilter: React.FC<IListFilterProps> = ({
@@ -332,7 +331,6 @@ export const ListFilter: React.FC<IListFilterProps> = ({
   filter,
   openFilterDialog,
   view,
-  withSidebar,
 }) => {
   const filterOptions = filter.options;
 
@@ -379,36 +377,32 @@ export const ListFilter: React.FC<IListFilterProps> = ({
   function render() {
     return (
       <>
-        {!withSidebar && (
-          <div className="d-flex">
-            <SearchTermInput filter={filter} onFilterUpdate={onFilterUpdate} />
-          </div>
-        )}
+        <div className="d-flex">
+          <SearchTermInput filter={filter} onFilterUpdate={onFilterUpdate} />
+        </div>
 
-        {!withSidebar && (
-          <ButtonGroup className="mr-2">
-            <SavedFilterDropdown
-              filter={filter}
-              onSetFilter={(f) => {
-                onFilterUpdate(f);
-              }}
-              view={view}
+        <ButtonGroup className="mr-2">
+          <SavedFilterDropdown
+            filter={filter}
+            onSetFilter={(f) => {
+              onFilterUpdate(f);
+            }}
+            view={view}
+          />
+          <OverlayTrigger
+            placement="top"
+            overlay={
+              <Tooltip id="filter-tooltip">
+                <FormattedMessage id="search_filter.name" />
+              </Tooltip>
+            }
+          >
+            <FilterButton
+              onClick={() => openFilterDialog()}
+              count={filter.count()}
             />
-            <OverlayTrigger
-              placement="top"
-              overlay={
-                <Tooltip id="filter-tooltip">
-                  <FormattedMessage id="search_filter.name" />
-                </Tooltip>
-              }
-            >
-              <FilterButton
-                onClick={() => openFilterDialog()}
-                count={filter.count()}
-              />
-            </OverlayTrigger>
-          </ButtonGroup>
-        )}
+          </OverlayTrigger>
+        </ButtonGroup>
 
         <SortBySelect
           className="mr-2"
diff --git a/ui/v2.5/src/components/List/ListResultsHeader.tsx b/ui/v2.5/src/components/List/ListResultsHeader.tsx
new file mode 100644
index 000000000..091317ec8
--- /dev/null
+++ b/ui/v2.5/src/components/List/ListResultsHeader.tsx
@@ -0,0 +1,66 @@
+import React from "react";
+import { ListFilterModel } from "src/models/list-filter/filter";
+import { PaginationIndex } from "../List/Pagination";
+import { ButtonToolbar } from "react-bootstrap";
+import { ListViewOptions } from "../List/ListViewOptions";
+import { PageSizeSelector, SortBySelect } from "../List/ListFilter";
+import cx from "classnames";
+
+export const ListResultsHeader: React.FC<{
+  className?: string;
+  loading: boolean;
+  filter: ListFilterModel;
+  totalCount: number;
+  metadataByline?: React.ReactNode;
+  onChangeFilter: (filter: ListFilterModel) => void;
+}> = ({
+  className,
+  loading,
+  filter,
+  totalCount,
+  metadataByline,
+  onChangeFilter,
+}) => {
+  return (
+    <ButtonToolbar className={cx(className, "list-results-header")}>
+      <div>
+        <PaginationIndex
+          loading={loading}
+          itemsPerPage={filter.itemsPerPage}
+          currentPage={filter.currentPage}
+          totalItems={totalCount}
+          metadataByline={metadataByline}
+        />
+      </div>
+      <div>
+        <SortBySelect
+          options={filter.options.sortByOptions}
+          sortBy={filter.sortBy}
+          sortDirection={filter.sortDirection}
+          onChangeSortBy={(s) =>
+            onChangeFilter(filter.setSortBy(s ?? undefined))
+          }
+          onChangeSortDirection={() =>
+            onChangeFilter(filter.toggleSortDirection())
+          }
+          onReshuffleRandomSort={() =>
+            onChangeFilter(filter.reshuffleRandomSort())
+          }
+        />
+        <PageSizeSelector
+          pageSize={filter.itemsPerPage}
+          setPageSize={(s) => onChangeFilter(filter.setPageSize(s))}
+        />
+        <ListViewOptions
+          displayMode={filter.displayMode}
+          zoomIndex={filter.zoomIndex}
+          displayModeOptions={filter.options.displayModeOptions}
+          onSetDisplayMode={(mode) =>
+            onChangeFilter(filter.setDisplayMode(mode))
+          }
+          onSetZoom={(zoom) => onChangeFilter(filter.setZoom(zoom))}
+        />
+      </div>
+    </ButtonToolbar>
+  );
+};
diff --git a/ui/v2.5/src/components/List/ListToolbar.tsx b/ui/v2.5/src/components/List/ListToolbar.tsx
new file mode 100644
index 000000000..31ef7f7ee
--- /dev/null
+++ b/ui/v2.5/src/components/List/ListToolbar.tsx
@@ -0,0 +1,120 @@
+import React from "react";
+import { FormattedMessage, useIntl } from "react-intl";
+import { ListFilterModel } from "src/models/list-filter/filter";
+import { faTimes } from "@fortawesome/free-solid-svg-icons";
+import { FilterTags } from "../List/FilterTags";
+import cx from "classnames";
+import { Button, ButtonToolbar } from "react-bootstrap";
+import { FilterButton } from "../List/Filters/FilterButton";
+import { Icon } from "../Shared/Icon";
+import { SearchTermInput } from "../List/ListFilter";
+import { Criterion } from "src/models/list-filter/criteria/criterion";
+import { SidebarToggleButton } from "../Shared/Sidebar";
+import { PatchComponent } from "src/patch";
+
+export const ToolbarFilterSection: React.FC<{
+  filter: ListFilterModel;
+  onToggleSidebar: () => void;
+  onSetFilter: (filter: ListFilterModel) => void;
+  onEditCriterion: (c?: Criterion) => void;
+  onRemoveCriterion: (criterion: Criterion, valueIndex?: number) => void;
+  onRemoveAllCriterion: () => void;
+  onEditSearchTerm: () => void;
+  onRemoveSearchTerm: () => void;
+}> = PatchComponent(
+  "ToolbarFilterSection",
+  ({
+    filter,
+    onToggleSidebar,
+    onSetFilter,
+    onEditCriterion,
+    onRemoveCriterion,
+    onRemoveAllCriterion,
+    onEditSearchTerm,
+    onRemoveSearchTerm,
+  }) => {
+    const { criteria, searchTerm } = filter;
+
+    return (
+      <>
+        <div className="search-container">
+          <SearchTermInput filter={filter} onFilterUpdate={onSetFilter} />
+        </div>
+        <div className="filter-section">
+          <FilterButton
+            onClick={() => onEditCriterion()}
+            count={criteria.length}
+          />
+          <FilterTags
+            searchTerm={searchTerm}
+            criteria={criteria}
+            onEditCriterion={onEditCriterion}
+            onRemoveCriterion={onRemoveCriterion}
+            onRemoveAll={onRemoveAllCriterion}
+            onEditSearchTerm={onEditSearchTerm}
+            onRemoveSearchTerm={onRemoveSearchTerm}
+            truncateOnOverflow
+          />
+          <SidebarToggleButton onClick={onToggleSidebar} />
+        </div>
+      </>
+    );
+  }
+);
+
+export const ToolbarSelectionSection: React.FC<{
+  selected: number;
+  onToggleSidebar: () => void;
+  onSelectAll: () => void;
+  onSelectNone: () => void;
+}> = PatchComponent(
+  "ToolbarSelectionSection",
+  ({ selected, onToggleSidebar, onSelectAll, onSelectNone }) => {
+    const intl = useIntl();
+
+    return (
+      <div className="selected-items-info">
+        <Button
+          variant="secondary"
+          className="minimal"
+          onClick={() => onSelectNone()}
+          title={intl.formatMessage({ id: "actions.select_none" })}
+        >
+          <Icon icon={faTimes} />
+        </Button>
+        <span>{selected} selected</span>
+        <Button variant="link" onClick={() => onSelectAll()}>
+          <FormattedMessage id="actions.select_all" />
+        </Button>
+        <SidebarToggleButton onClick={onToggleSidebar} />
+      </div>
+    );
+  }
+);
+
+// TODO - rename to FilteredListToolbar once all list components have been updated
+// TODO - and expose to plugins
+export const FilteredListToolbar2: React.FC<{
+  className?: string;
+  hasSelection: boolean;
+  filterSection: React.ReactNode;
+  selectionSection: React.ReactNode;
+  operationSection: React.ReactNode;
+}> = ({
+  className,
+  hasSelection,
+  filterSection,
+  selectionSection,
+  operationSection,
+}) => {
+  return (
+    <ButtonToolbar
+      className={cx(className, "filtered-list-toolbar", {
+        "has-selection": hasSelection,
+      })}
+    >
+      {!hasSelection ? filterSection : selectionSection}
+      <div className="filtered-list-toolbar-operations">{operationSection}</div>
+    </ButtonToolbar>
+  );
+};
diff --git a/ui/v2.5/src/components/List/styles.scss b/ui/v2.5/src/components/List/styles.scss
index 96a1e4c26..a4194a832 100644
--- a/ui/v2.5/src/components/List/styles.scss
+++ b/ui/v2.5/src/components/List/styles.scss
@@ -1046,3 +1046,234 @@ input[type="range"].zoom-slider {
     }
   }
 }
+
+// hide sidebar Edit Filter button on larger screens
+@include media-breakpoint-up(lg) {
+  .sidebar .edit-filter-button {
+    display: none;
+  }
+}
+
+// the following refers to the new FilteredListToolbar2 component
+// ensure the rules here don't conflict with the original filtered-list-toolbar above
+// TODO - replace with only .filtered-list-toolbar once all lists use the new toolbar
+.scene-list-toolbar {
+  &.filtered-list-toolbar {
+    align-items: center;
+    background-color: $body-bg;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-between;
+    row-gap: 1rem;
+
+    > div {
+      align-items: center;
+      display: flex;
+      gap: 0.5rem;
+      justify-content: flex-start;
+
+      &:last-child {
+        flex-shrink: 0;
+        justify-content: flex-end;
+      }
+    }
+  }
+
+  &.filtered-list-toolbar {
+    flex-wrap: nowrap;
+    gap: 1rem;
+    // offset the main padding
+    margin-top: -0.5rem;
+    padding-bottom: 0.5rem;
+    padding-top: 0.5rem;
+    position: sticky;
+    top: $navbar-height;
+    z-index: 10;
+
+    @include media-breakpoint-down(xs) {
+      top: 0;
+    }
+
+    .selected-items-info .btn {
+      margin-right: 0.5rem;
+    }
+
+    // hide drop down menu items for play and create new
+    // when the buttons are visible
+    @include media-breakpoint-up(sm) {
+      .scene-list-operations {
+        .play-item,
+        .create-new-item {
+          display: none;
+        }
+      }
+    }
+
+    // hide play and create new buttons on xs screens
+    // show these in the drop down menu instead
+    @include media-breakpoint-down(xs) {
+      .play-button,
+      .create-new-button {
+        display: none;
+      }
+    }
+
+    .selected-items-info,
+    div.filter-section {
+      border: 1px solid $secondary;
+      border-radius: 0.25rem;
+      flex-grow: 1;
+      overflow-x: hidden;
+    }
+
+    .sidebar-toggle-button {
+      margin-left: auto;
+    }
+
+    .search-container {
+      border-right: 1px solid $secondary;
+      display: block;
+      margin-right: -0.5rem;
+      min-width: calc($sidebar-width - 15px);
+      padding-right: 10px;
+
+      .search-term-input {
+        margin-right: 0;
+        width: 100%;
+
+        .clearable-text-field {
+          height: 100%;
+        }
+      }
+    }
+
+    .filter-tags {
+      flex-grow: 1;
+      flex-wrap: nowrap;
+      justify-content: flex-start;
+      margin-bottom: 0;
+
+      // account for filter button, and toggle sidebar buttons with gaps
+      width: calc(100% - 70px - 1rem);
+
+      @include media-breakpoint-down(xs) {
+        overflow-x: auto;
+        scrollbar-width: thin;
+      }
+
+      .tag-item {
+        white-space: nowrap;
+      }
+    }
+  }
+}
+
+@include media-breakpoint-up(xl) {
+  .sidebar-pane:not(.hide-sidebar) .filtered-list-toolbar .search-container {
+    display: none;
+  }
+}
+@include media-breakpoint-down(md) {
+  .sidebar-pane.hide-sidebar .filtered-list-toolbar .search-container {
+    display: none;
+  }
+}
+
+// hide the filter icon button when sidebar is shown on smaller screens
+@include media-breakpoint-down(md) {
+  .sidebar-pane:not(.hide-sidebar) .filtered-list-toolbar .filter-button {
+    display: none;
+  }
+
+  // adjust the width of the filter-tags as well
+  .sidebar-pane:not(.hide-sidebar) .filtered-list-toolbar .filter-tags {
+    width: calc(100% - 35px - 0.5rem);
+  }
+}
+
+// move the sidebar toggle to the left on xl viewports
+@include media-breakpoint-up(xl) {
+  .filtered-list-toolbar .filter-section {
+    .sidebar-toggle-button {
+      margin-left: 0;
+    }
+
+    .filter-tags {
+      order: 2;
+    }
+  }
+}
+
+// hide the search term tag item when the search box is visible
+@include media-breakpoint-up(lg) {
+  // TODO - remove scene-list-toolbar when all lists use the new toolbar
+  .scene-list-toolbar.filtered-list-toolbar
+    .filter-tags
+    .search-term-filter-tag {
+    display: none;
+  }
+}
+@include media-breakpoint-down(md) {
+  // TODO - remove scene-list-toolbar when all lists use the new toolbar
+  .sidebar-pane:not(.hide-sidebar)
+    .scene-list-toolbar.filtered-list-toolbar
+    .filter-tags
+    .search-term-filter-tag {
+    display: none;
+  }
+}
+
+// TODO - remove scene-list-toolbar when all lists use the new toolbar
+.detail-body .scene-list-toolbar.filtered-list-toolbar {
+  top: calc($sticky-detail-header-height + $navbar-height);
+
+  @include media-breakpoint-down(xs) {
+    top: 0;
+  }
+}
+
+#more-criteria-popover {
+  box-shadow: 0 8px 10px 2px rgb(0 0 0 / 30%);
+  max-width: 400px;
+  padding: 0.25rem;
+}
+
+.list-results-header {
+  align-items: center;
+  background-color: $body-bg;
+  display: flex;
+  justify-content: space-between;
+
+  > div {
+    align-items: center;
+    display: flex;
+    gap: 0.5rem;
+    justify-content: flex-start;
+
+    &:last-child {
+      flex-shrink: 0;
+      justify-content: flex-end;
+    }
+  }
+}
+
+.list-results-header {
+  flex-wrap: wrap-reverse;
+  gap: 0.5rem;
+  margin-bottom: 0.5rem;
+
+  .paginationIndex {
+    margin: 0;
+  }
+
+  // center the header on smaller screens
+  @include media-breakpoint-down(sm) {
+    & > div,
+    & > div:last-child {
+      flex-basis: 100%;
+      justify-content: center;
+      margin-left: auto;
+      margin-right: auto;
+    }
+  }
+}
diff --git a/ui/v2.5/src/components/Scenes/SceneList.tsx b/ui/v2.5/src/components/Scenes/SceneList.tsx
index 6e8832105..1154f384e 100644
--- a/ui/v2.5/src/components/Scenes/SceneList.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneList.tsx
@@ -23,8 +23,6 @@ import {
   faPencil,
   faPlay,
   faPlus,
-  faSliders,
-  faTimes,
   faTrash,
 } from "@fortawesome/free-solid-svg-icons";
 import { SceneMergeModal } from "./SceneMergeDialog";
@@ -39,7 +37,6 @@ import {
   OperationDropdownItem,
 } from "../List/ListOperationButtons";
 import { useFilteredItemList } from "../List/ItemList";
-import { FilterTags } from "../List/FilterTags";
 import { Sidebar, SidebarPane, useSidebarState } from "../Shared/Sidebar";
 import { SidebarPerformersFilter } from "../List/Filters/PerformersFilter";
 import { SidebarStudiosFilter } from "../List/Filters/StudiosFilter";
@@ -57,18 +54,16 @@ import {
   useFilteredSidebarKeybinds,
 } from "../List/Filters/FilterSidebar";
 import { PatchContainerComponent } from "src/patch";
-import { Pagination, PaginationIndex } from "../List/Pagination";
-import { Button, ButtonGroup, ButtonToolbar } from "react-bootstrap";
-import { FilterButton } from "../List/Filters/FilterButton";
+import { Pagination } from "../List/Pagination";
+import { Button, ButtonGroup } from "react-bootstrap";
 import { Icon } from "../Shared/Icon";
-import { ListViewOptions } from "../List/ListViewOptions";
-import {
-  PageSizeSelector,
-  SearchTermInput,
-  SortBySelect,
-} from "../List/ListFilter";
-import { Criterion } from "src/models/list-filter/criteria/criterion";
 import useFocus from "src/utils/focus";
+import {
+  FilteredListToolbar2,
+  ToolbarFilterSection,
+  ToolbarSelectionSection,
+} from "../List/ListToolbar";
+import { ListResultsHeader } from "../List/ListResultsHeader";
 
 function renderMetadataByline(result: GQL.FindScenesQueryResult) {
   const duration = result?.data?.findScenes?.duration;
@@ -340,38 +335,18 @@ interface IOperations {
   className?: string;
 }
 
-const ListToolbarContent: React.FC<{
-  filter: ListFilterModel;
-  items: GQL.SlimSceneDataFragment[];
-  selectedIds: Set<string>;
+const SceneListOperations: React.FC<{
+  items: number;
+  hasSelection: boolean;
   operations: IOperations[];
-  onToggleSidebar: () => void;
-  onSetFilter: (filter: ListFilterModel) => void;
-  onEditCriterion: (c?: Criterion) => void;
-  onRemoveCriterion: (criterion: Criterion, valueIndex?: number) => void;
-  onRemoveAllCriterion: () => void;
-  onEditSearchTerm: () => void;
-  onRemoveSearchTerm: () => void;
-  onSelectAll: () => void;
-  onSelectNone: () => void;
   onEdit: () => void;
   onDelete: () => void;
   onPlay: () => void;
   onCreateNew: () => void;
 }> = ({
-  filter,
   items,
-  selectedIds,
+  hasSelection,
   operations,
-  onToggleSidebar,
-  onSetFilter,
-  onEditCriterion,
-  onRemoveCriterion,
-  onRemoveAllCriterion,
-  onEditSearchTerm,
-  onRemoveSearchTerm,
-  onSelectAll,
-  onSelectNone,
   onEdit,
   onDelete,
   onPlay,
@@ -379,174 +354,66 @@ const ListToolbarContent: React.FC<{
 }) => {
   const intl = useIntl();
 
-  const { criteria, searchTerm } = filter;
-  const hasSelection = selectedIds.size > 0;
-
-  const sidebarToggle = (
-    <Button
-      className="minimal sidebar-toggle-button ignore-sidebar-outside-click"
-      variant="secondary"
-      onClick={() => onToggleSidebar()}
-      title={intl.formatMessage({ id: "actions.sidebar.toggle" })}
-    >
-      <Icon icon={faSliders} />
-    </Button>
-  );
-
   return (
-    <>
-      {!hasSelection && (
-        <>
-          <div className="search-container">
-            <SearchTermInput filter={filter} onFilterUpdate={onSetFilter} />
-          </div>
-          <div className="filter-section">
-            <FilterButton
-              onClick={() => onEditCriterion()}
-              count={criteria.length}
-            />
-            <FilterTags
-              searchTerm={searchTerm}
-              criteria={criteria}
-              onEditCriterion={onEditCriterion}
-              onRemoveCriterion={onRemoveCriterion}
-              onRemoveAll={onRemoveAllCriterion}
-              onEditSearchTerm={onEditSearchTerm}
-              onRemoveSearchTerm={onRemoveSearchTerm}
-              truncateOnOverflow
-            />
-            {sidebarToggle}
-          </div>
-        </>
-      )}
-      {hasSelection && (
-        <div className="selected-items-info">
+    <div>
+      <ButtonGroup>
+        {!!items && (
           <Button
+            className="play-button"
             variant="secondary"
-            className="minimal"
-            onClick={() => onSelectNone()}
-            title={intl.formatMessage({ id: "actions.select_none" })}
+            onClick={() => onPlay()}
+            title={intl.formatMessage({ id: "actions.play" })}
           >
-            <Icon icon={faTimes} />
+            <Icon icon={faPlay} />
           </Button>
-          <span>{selectedIds.size} selected</span>
-          <Button variant="link" onClick={() => onSelectAll()}>
-            <FormattedMessage id="actions.select_all" />
+        )}
+        {!hasSelection && (
+          <Button
+            className="create-new-button"
+            variant="secondary"
+            onClick={() => onCreateNew()}
+            title={intl.formatMessage(
+              { id: "actions.create_entity" },
+              { entityType: intl.formatMessage({ id: "scene" }) }
+            )}
+          >
+            <Icon icon={faPlus} />
           </Button>
-          {sidebarToggle}
-        </div>
-      )}
-      <div>
-        <ButtonGroup>
-          {!!items.length && (
-            <Button
-              className="play-button"
-              variant="secondary"
-              onClick={() => onPlay()}
-              title={intl.formatMessage({ id: "actions.play" })}
-            >
-              <Icon icon={faPlay} />
+        )}
+
+        {hasSelection && (
+          <>
+            <Button variant="secondary" onClick={() => onEdit()}>
+              <Icon icon={faPencil} />
             </Button>
-          )}
-          {!hasSelection && (
             <Button
-              className="create-new-button"
-              variant="secondary"
-              onClick={() => onCreateNew()}
-              title={intl.formatMessage(
-                { id: "actions.create_entity" },
-                { entityType: intl.formatMessage({ id: "scene" }) }
-              )}
+              variant="danger"
+              className="btn-danger-minimal"
+              onClick={() => onDelete()}
             >
-              <Icon icon={faPlus} />
+              <Icon icon={faTrash} />
             </Button>
-          )}
+          </>
+        )}
 
-          {hasSelection && (
-            <>
-              <Button variant="secondary" onClick={() => onEdit()}>
-                <Icon icon={faPencil} />
-              </Button>
-              <Button
-                variant="danger"
-                className="btn-danger-minimal"
-                onClick={() => onDelete()}
-              >
-                <Icon icon={faTrash} />
-              </Button>
-            </>
-          )}
+        <OperationDropdown className="scene-list-operations">
+          {operations.map((o) => {
+            if (o.isDisplayed && !o.isDisplayed()) {
+              return null;
+            }
 
-          <OperationDropdown className="scene-list-operations">
-            {operations.map((o) => {
-              if (o.isDisplayed && !o.isDisplayed()) {
-                return null;
-              }
-
-              return (
-                <OperationDropdownItem
-                  key={o.text}
-                  onClick={o.onClick}
-                  text={o.text}
-                  className={o.className}
-                />
-              );
-            })}
-          </OperationDropdown>
-        </ButtonGroup>
-      </div>
-    </>
-  );
-};
-
-const ListResultsHeader: React.FC<{
-  loading: boolean;
-  filter: ListFilterModel;
-  totalCount: number;
-  metadataByline?: React.ReactNode;
-  onChangeFilter: (filter: ListFilterModel) => void;
-}> = ({ loading, filter, totalCount, metadataByline, onChangeFilter }) => {
-  return (
-    <ButtonToolbar className="scene-list-header">
-      <div>
-        <PaginationIndex
-          loading={loading}
-          itemsPerPage={filter.itemsPerPage}
-          currentPage={filter.currentPage}
-          totalItems={totalCount}
-          metadataByline={metadataByline}
-        />
-      </div>
-      <div>
-        <SortBySelect
-          options={filter.options.sortByOptions}
-          sortBy={filter.sortBy}
-          sortDirection={filter.sortDirection}
-          onChangeSortBy={(s) =>
-            onChangeFilter(filter.setSortBy(s ?? undefined))
-          }
-          onChangeSortDirection={() =>
-            onChangeFilter(filter.toggleSortDirection())
-          }
-          onReshuffleRandomSort={() =>
-            onChangeFilter(filter.reshuffleRandomSort())
-          }
-        />
-        <PageSizeSelector
-          pageSize={filter.itemsPerPage}
-          setPageSize={(s) => onChangeFilter(filter.setPageSize(s))}
-        />
-        <ListViewOptions
-          displayMode={filter.displayMode}
-          zoomIndex={filter.zoomIndex}
-          displayModeOptions={filter.options.displayModeOptions}
-          onSetDisplayMode={(mode) =>
-            onChangeFilter(filter.setDisplayMode(mode))
-          }
-          onSetZoom={(zoom) => onChangeFilter(filter.setZoom(zoom))}
-        />
-      </div>
-    </ButtonToolbar>
+            return (
+              <OperationDropdownItem
+                key={o.text}
+                onClick={o.onClick}
+                text={o.text}
+                className={o.className}
+              />
+            );
+          })}
+        </OperationDropdown>
+      </ButtonGroup>
+    </div>
   );
 };
 
@@ -823,34 +690,46 @@ export const FilteredSceneList = (props: IFilteredScenes) => {
             />
           </Sidebar>
           <div>
-            <ButtonToolbar
-              className={cx("scene-list-toolbar", {
-                "has-selection": hasSelection,
-              })}
-            >
-              <ListToolbarContent
-                filter={filter}
-                onSetFilter={setFilter}
-                items={items}
-                selectedIds={selectedIds}
-                operations={otherOperations}
-                onToggleSidebar={() => setShowSidebar(!showSidebar)}
-                onEditCriterion={(c) => showEditFilter(c?.criterionOption.type)}
-                onRemoveCriterion={removeCriterion}
-                onRemoveAllCriterion={() => clearAllCriteria(true)}
-                onEditSearchTerm={() => {
-                  setShowSidebar(true);
-                  setSearchFocus(true);
-                }}
-                onRemoveSearchTerm={() => setFilter(filter.clearSearchTerm())}
-                onSelectAll={() => onSelectAll()}
-                onSelectNone={() => onSelectNone()}
-                onEdit={onEdit}
-                onDelete={onDelete}
-                onCreateNew={onCreateNew}
-                onPlay={onPlay}
-              />
-            </ButtonToolbar>
+            <FilteredListToolbar2
+              className="scene-list-toolbar"
+              hasSelection={hasSelection}
+              filterSection={
+                <ToolbarFilterSection
+                  filter={filter}
+                  onSetFilter={setFilter}
+                  onToggleSidebar={() => setShowSidebar(!showSidebar)}
+                  onEditCriterion={(c) =>
+                    showEditFilter(c?.criterionOption.type)
+                  }
+                  onRemoveCriterion={removeCriterion}
+                  onRemoveAllCriterion={() => clearAllCriteria(true)}
+                  onEditSearchTerm={() => {
+                    setShowSidebar(true);
+                    setSearchFocus(true);
+                  }}
+                  onRemoveSearchTerm={() => setFilter(filter.clearSearchTerm())}
+                />
+              }
+              selectionSection={
+                <ToolbarSelectionSection
+                  selected={selectedIds.size}
+                  onToggleSidebar={() => setShowSidebar(!showSidebar)}
+                  onSelectAll={() => onSelectAll()}
+                  onSelectNone={() => onSelectNone()}
+                />
+              }
+              operationSection={
+                <SceneListOperations
+                  items={items.length}
+                  hasSelection={hasSelection}
+                  operations={otherOperations}
+                  onEdit={onEdit}
+                  onDelete={onDelete}
+                  onPlay={onPlay}
+                  onCreateNew={onCreateNew}
+                />
+              }
+            />
 
             <ListResultsHeader
               loading={cachedResult.loading}
diff --git a/ui/v2.5/src/components/Scenes/styles.scss b/ui/v2.5/src/components/Scenes/styles.scss
index 2259eab41..e7c5af22a 100644
--- a/ui/v2.5/src/components/Scenes/styles.scss
+++ b/ui/v2.5/src/components/Scenes/styles.scss
@@ -902,46 +902,6 @@ input[type="range"].blue-slider {
   }
 }
 
-.scene-list .filtered-list-toolbar {
-  display: flex;
-  flex-wrap: wrap;
-  row-gap: 1rem;
-
-  & > div {
-    display: flex;
-    flex: 1;
-    flex-wrap: nowrap;
-
-    &:first-child {
-      justify-content: flex-start;
-    }
-
-    &:nth-child(2) {
-      justify-content: center;
-    }
-
-    &:last-child {
-      justify-content: flex-end;
-    }
-
-    @include media-breakpoint-down(xs) {
-      &:nth-child(2) {
-        justify-content: flex-end;
-      }
-
-      &:last-child {
-        display: none;
-      }
-    }
-  }
-}
-
-.scene-list.hide-sidebar .sidebar-toggle-button {
-  transition-delay: 0.1s;
-  transition-duration: 0;
-  transition-property: opacity;
-}
-
 .scene-wall,
 .marker-wall {
   .wall-item {
@@ -998,214 +958,3 @@ input[type="range"].blue-slider {
     }
   }
 }
-
-.scene-list-toolbar,
-.scene-list-header {
-  align-items: center;
-  background-color: $body-bg;
-  display: flex;
-  justify-content: space-between;
-
-  > div {
-    align-items: center;
-    display: flex;
-    gap: 0.5rem;
-    justify-content: flex-start;
-
-    &:last-child {
-      flex-shrink: 0;
-      justify-content: flex-end;
-    }
-  }
-}
-
-.scene-list-toolbar {
-  flex-wrap: nowrap;
-  gap: 1rem;
-  // offset the main padding
-  margin-top: -0.5rem;
-  padding-bottom: 0.5rem;
-  padding-top: 0.5rem;
-  position: sticky;
-  top: $navbar-height;
-  z-index: 10;
-
-  @include media-breakpoint-down(xs) {
-    top: 0;
-  }
-
-  .selected-items-info .btn {
-    margin-right: 0.5rem;
-  }
-
-  // hide drop down menu items for play and create new
-  // when the buttons are visible
-  @include media-breakpoint-up(sm) {
-    .scene-list-operations {
-      .play-item,
-      .create-new-item {
-        display: none;
-      }
-    }
-  }
-
-  // hide play and create new buttons on xs screens
-  // show these in the drop down menu instead
-  @include media-breakpoint-down(xs) {
-    .play-button,
-    .create-new-button {
-      display: none;
-    }
-  }
-
-  .selected-items-info,
-  > div.filter-section {
-    border: 1px solid $secondary;
-    border-radius: 0.25rem;
-    flex-grow: 1;
-    overflow-x: hidden;
-  }
-
-  > div.filter-toolbar {
-    border: 1px solid $secondary;
-    border-radius: 0.25rem;
-
-    .filter-button {
-      border-bottom-right-radius: 0;
-      border-top-right-radius: 0;
-    }
-  }
-
-  .sidebar-toggle-button {
-    margin-left: auto;
-  }
-
-  .search-container {
-    border-right: 1px solid $secondary;
-    display: block;
-    margin-right: -0.5rem;
-    min-width: calc($sidebar-width - 15px);
-    padding-right: 10px;
-
-    .search-term-input {
-      margin-right: 0;
-      width: 100%;
-
-      .clearable-text-field {
-        height: 100%;
-      }
-    }
-  }
-
-  .filter-tags {
-    flex-grow: 1;
-    flex-wrap: nowrap;
-    justify-content: flex-start;
-    margin-bottom: 0;
-
-    // account for filter button, and toggle sidebar buttons with gaps
-    width: calc(100% - 70px - 1rem);
-
-    @include media-breakpoint-down(xs) {
-      overflow-x: auto;
-      scrollbar-width: thin;
-    }
-
-    .tag-item {
-      white-space: nowrap;
-    }
-  }
-}
-
-@include media-breakpoint-up(xl) {
-  .sidebar-pane:not(.hide-sidebar) .scene-list-toolbar .search-container {
-    display: none;
-  }
-}
-@include media-breakpoint-down(md) {
-  .sidebar-pane.hide-sidebar .scene-list-toolbar .search-container {
-    display: none;
-  }
-}
-
-// hide Edit Filter button on larger screens
-@include media-breakpoint-up(lg) {
-  .scene-list .sidebar .edit-filter-button {
-    display: none;
-  }
-}
-
-// hide the filter icon button when sidebar is shown on smaller screens
-@include media-breakpoint-down(md) {
-  .sidebar-pane:not(.hide-sidebar) .scene-list-toolbar .filter-button {
-    display: none;
-  }
-
-  // adjust the width of the filter-tags as well
-  .sidebar-pane:not(.hide-sidebar) .scene-list-toolbar .filter-tags {
-    width: calc(100% - 35px - 0.5rem);
-  }
-}
-
-// move the sidebar toggle to the left on xl viewports
-@include media-breakpoint-up(xl) {
-  .scene-list .scene-list-toolbar .filter-section {
-    .sidebar-toggle-button {
-      margin-left: 0;
-    }
-
-    .filter-tags {
-      order: 2;
-    }
-  }
-}
-
-// hide the search term tag item when the search box is visible
-@include media-breakpoint-up(lg) {
-  .scene-list-toolbar .filter-tags .search-term-filter-tag {
-    display: none;
-  }
-}
-@include media-breakpoint-down(md) {
-  .sidebar-pane:not(.hide-sidebar)
-    .scene-list-toolbar
-    .filter-tags
-    .search-term-filter-tag {
-    display: none;
-  }
-}
-
-.scene-list-header {
-  flex-wrap: wrap-reverse;
-  gap: 0.5rem;
-  margin-bottom: 0.5rem;
-
-  .paginationIndex {
-    margin: 0;
-  }
-
-  // center the header on smaller screens
-  @include media-breakpoint-down(sm) {
-    & > div,
-    & > div:last-child {
-      flex-basis: 100%;
-      justify-content: center;
-      margin-left: auto;
-      margin-right: auto;
-    }
-  }
-}
-
-.detail-body .scene-list-toolbar {
-  top: calc($sticky-detail-header-height + $navbar-height);
-
-  @include media-breakpoint-down(xs) {
-    top: 0;
-  }
-}
-
-#more-criteria-popover {
-  box-shadow: 0 8px 10px 2px rgb(0 0 0 / 30%);
-  max-width: 400px;
-  padding: 0.25rem;
-}
diff --git a/ui/v2.5/src/components/Shared/Sidebar.tsx b/ui/v2.5/src/components/Shared/Sidebar.tsx
index cd4848dab..52f9328f0 100644
--- a/ui/v2.5/src/components/Shared/Sidebar.tsx
+++ b/ui/v2.5/src/components/Shared/Sidebar.tsx
@@ -11,8 +11,10 @@ import ScreenUtils, { useMediaQuery } from "src/utils/screen";
 import { IViewConfig, useInterfaceLocalForage } from "src/hooks/LocalForage";
 import { View } from "../List/views";
 import cx from "classnames";
-import { Button, ButtonToolbar, CollapseProps } from "react-bootstrap";
+import { Button, CollapseProps } from "react-bootstrap";
 import { useIntl } from "react-intl";
+import { Icon } from "./Icon";
+import { faSliders } from "@fortawesome/free-solid-svg-icons";
 
 const fixedSidebarMediaQuery = "only screen and (max-width: 1199px)";
 
@@ -79,62 +81,19 @@ export const SidebarSection: React.FC<
   );
 };
 
-export const SidebarIcon: React.FC = () => (
-  <>
-    {/* From: https://iconduck.com/icons/19707/sidebar
-MIT License
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE. */}
-    <svg
-      className="svg-inline--fa fa-icon"
-      xmlns="http://www.w3.org/2000/svg"
-      viewBox="0 0 24 24"
-      fill="none"
-      stroke="currentColor"
-      strokeWidth="3"
-      strokeLinecap="round"
-      strokeLinejoin="round"
-    >
-      <rect x="3" y="3" width="18" height="18" rx="2" ry="2" />
-      <line x1="9" y1="3" x2="9" y2="21" />
-    </svg>
-  </>
-);
-
-export const SidebarToolbar: React.FC<{
-  onClose?: () => void;
-}> = ({ onClose, children }) => {
+export const SidebarToggleButton: React.FC<{
+  onClick: () => void;
+}> = ({ onClick }) => {
   const intl = useIntl();
-
   return (
-    <ButtonToolbar className="sidebar-toolbar">
-      {onClose ? (
-        <Button
-          onClick={onClose}
-          className="sidebar-close-button"
-          variant="secondary"
-          title={intl.formatMessage({ id: "actions.sidebar.close" })}
-        >
-          <SidebarIcon />
-        </Button>
-      ) : null}
-      {children}
-    </ButtonToolbar>
+    <Button
+      className="minimal sidebar-toggle-button ignore-sidebar-outside-click"
+      variant="secondary"
+      onClick={onClick}
+      title={intl.formatMessage({ id: "actions.sidebar.toggle" })}
+    >
+      <Icon icon={faSliders} />
+    </Button>
   );
 };
 
diff --git a/ui/v2.5/src/components/Shared/styles.scss b/ui/v2.5/src/components/Shared/styles.scss
index 881018566..6ccef5aaf 100644
--- a/ui/v2.5/src/components/Shared/styles.scss
+++ b/ui/v2.5/src/components/Shared/styles.scss
@@ -941,11 +941,11 @@ $sticky-header-height: calc(50px + 3.3rem);
         margin-left: 0;
       }
     }
+  }
 
-    .sidebar-pane.hide-sidebar {
-      > :nth-child(2) {
-        padding-left: 15px;
-      }
+  .sidebar-pane.hide-sidebar {
+    > :nth-child(2) {
+      padding-left: 15px;
     }
   }
 }

From 2ed9e5332d7bfeb08877e38af5bd633ba0fd3a37 Mon Sep 17 00:00:00 2001
From: fancydancers <235832478+fancydancers@users.noreply.github.com>
Date: Thu, 9 Oct 2025 02:35:11 +0000
Subject: [PATCH 052/405] add content-disposition filename header to streams
 (#6119)

* add content-disposition filename header to streams
* Fix filename generation on windows
---------
Co-authored-by: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
---
 internal/manager/running_streams.go | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/internal/manager/running_streams.go b/internal/manager/running_streams.go
index c6b0c4665..18ac3b042 100644
--- a/internal/manager/running_streams.go
+++ b/internal/manager/running_streams.go
@@ -3,7 +3,9 @@ package manager
 import (
 	"context"
 	"errors"
+	"mime"
 	"net/http"
+	"path/filepath"
 
 	"github.com/stashapp/stash/internal/manager/config"
 	"github.com/stashapp/stash/internal/static"
@@ -46,14 +48,17 @@ func (s *SceneServer) StreamSceneDirect(scene *models.Scene, w http.ResponseWrit
 
 	sceneHash := scene.GetHash(config.GetInstance().GetVideoFileNamingAlgorithm())
 
-	filepath := GetInstance().Paths.Scene.GetStreamPath(scene.Path, sceneHash)
+	fp := GetInstance().Paths.Scene.GetStreamPath(scene.Path, sceneHash)
 	streamRequestCtx := ffmpeg.NewStreamRequestContext(w, r)
 
 	// #2579 - hijacking and closing the connection here causes video playback to fail in Safari
 	// We trust that the request context will be closed, so we don't need to call Cancel on the
 	// returned context here.
-	_ = GetInstance().ReadLockManager.ReadLock(streamRequestCtx, filepath)
-	http.ServeFile(w, r, filepath)
+	_ = GetInstance().ReadLockManager.ReadLock(streamRequestCtx, fp)
+	_, filename := filepath.Split(fp)
+	contentDisposition := mime.FormatMediaType("inline", map[string]string{"filename": filename})
+	w.Header().Set("Content-Disposition", contentDisposition)
+	http.ServeFile(w, r, fp)
 }
 
 func (s *SceneServer) ServeScreenshot(scene *models.Scene, w http.ResponseWriter, r *http.Request) {

From 72c9c436be4cd495b5096fa54ac44f41c4edaa01 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Mon, 13 Oct 2025 13:13:23 +1100
Subject: [PATCH 053/405] Fix groups not transferring when merging tags (#6127)

* Add test for group when merging tags
* Fix groups not reallocated when merging tags
---
 pkg/sqlite/tag.go      |  1 +
 pkg/sqlite/tag_test.go | 14 ++++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/pkg/sqlite/tag.go b/pkg/sqlite/tag.go
index 08337616e..ede1fcc2e 100644
--- a/pkg/sqlite/tag.go
+++ b/pkg/sqlite/tag.go
@@ -790,6 +790,7 @@ func (qb *TagStore) Merge(ctx context.Context, source []int, destination int) er
 		imagesTagsTable:      imageIDColumn,
 		"performers_tags":    "performer_id",
 		"studios_tags":       "studio_id",
+		groupsTagsTable:      "group_id",
 	}
 
 	args = append(args, destination)
diff --git a/pkg/sqlite/tag_test.go b/pkg/sqlite/tag_test.go
index 5359be785..770f39782 100644
--- a/pkg/sqlite/tag_test.go
+++ b/pkg/sqlite/tag_test.go
@@ -931,6 +931,8 @@ func TestTagMerge(t *testing.T) {
 			tagIdxWithGallery,
 			tagIdx1WithGallery,
 			tagIdx2WithGallery,
+			tagIdx1WithGroup,
+			tagIdx2WithGroup,
 		}
 		var srcIDs []int
 		for _, idx := range srcIdxs {
@@ -1024,6 +1026,18 @@ func TestTagMerge(t *testing.T) {
 
 		assert.Contains(studioTagIDs, destID)
 
+		// ensure group points to new tag
+		group, err := db.Group.Find(ctx, groupIDs[groupIdxWithTwoTags])
+		if err != nil {
+			return err
+		}
+		if err := group.LoadTagIDs(ctx, db.Group); err != nil {
+			return err
+		}
+		groupTagIDs := group.TagIDs.List()
+
+		assert.Contains(groupTagIDs, destID)
+
 		return nil
 	}); err != nil {
 		t.Error(err.Error())

From d3f630110135978d6568ced3e151a53d8e6498df Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Mon, 13 Oct 2025 13:13:45 +1100
Subject: [PATCH 054/405] Use natural sort for related tags (#6128)

---
 pkg/sqlite/tables.go | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkg/sqlite/tables.go b/pkg/sqlite/tables.go
index 3b0cbe094..8d798d913 100644
--- a/pkg/sqlite/tables.go
+++ b/pkg/sqlite/tables.go
@@ -76,7 +76,7 @@ var (
 		},
 		fkColumn:     imagesTagsJoinTable.Col(tagIDColumn),
 		foreignTable: tagTableMgr,
-		orderBy:      goqu.COALESCE(tagTableMgr.table.Col("sort_name"), tagTableMgr.table.Col("name")).Asc(),
+		orderBy:      tagTableSort,
 	}
 
 	imagesPerformersTableMgr = &joinTable{
@@ -116,7 +116,7 @@ var (
 		},
 		fkColumn:     galleriesTagsJoinTable.Col(tagIDColumn),
 		foreignTable: tagTableMgr,
-		orderBy:      goqu.COALESCE(tagTableMgr.table.Col("sort_name"), tagTableMgr.table.Col("name")).Asc(),
+		orderBy:      tagTableSort,
 	}
 
 	galleriesPerformersTableMgr = &joinTable{
@@ -174,7 +174,7 @@ var (
 		},
 		fkColumn:     scenesTagsJoinTable.Col(tagIDColumn),
 		foreignTable: tagTableMgr,
-		orderBy:      goqu.COALESCE(tagTableMgr.table.Col("sort_name"), tagTableMgr.table.Col("name")).Asc(),
+		orderBy:      tagTableSort,
 	}
 
 	scenesPerformersTableMgr = &joinTable{
@@ -282,7 +282,7 @@ var (
 		},
 		fkColumn:     performersTagsJoinTable.Col(tagIDColumn),
 		foreignTable: tagTableMgr,
-		orderBy:      goqu.COALESCE(tagTableMgr.table.Col("sort_name"), tagTableMgr.table.Col("name")).Asc(),
+		orderBy:      tagTableSort,
 	}
 
 	performersStashIDsTableMgr = &stashIDTable{
@@ -314,7 +314,7 @@ var (
 		},
 		fkColumn:     studiosTagsJoinTable.Col(tagIDColumn),
 		foreignTable: tagTableMgr,
-		orderBy:      goqu.COALESCE(tagTableMgr.table.Col("sort_name"), tagTableMgr.table.Col("name")).Asc(),
+		orderBy:      tagTableSort,
 	}
 
 	studiosStashIDsTableMgr = &stashIDTable{
@@ -331,6 +331,9 @@ var (
 		idColumn: goqu.T(tagTable).Col(idColumn),
 	}
 
+	// formerly: goqu.COALESCE(tagTableMgr.table.Col("sort_name"), tagTableMgr.table.Col("name")).Asc()
+	tagTableSort = goqu.L("COALESCE(tags.sort_name, tags.name) COLLATE NATURAL_CI").Asc()
+
 	tagsAliasesTableMgr = &stringTable{
 		table: table{
 			table:    tagsAliasesJoinTable,
@@ -346,7 +349,7 @@ var (
 		},
 		fkColumn:     tagRelationsJoinTable.Col(tagParentIDColumn),
 		foreignTable: tagTableMgr,
-		orderBy:      goqu.COALESCE(tagTableMgr.table.Col("sort_name"), tagTableMgr.table.Col("name")).Asc(),
+		orderBy:      tagTableSort,
 	}
 
 	tagsChildTagsTableMgr = *tagsParentTagsTableMgr.invert()
@@ -373,7 +376,7 @@ var (
 		},
 		fkColumn:     groupsTagsJoinTable.Col(tagIDColumn),
 		foreignTable: tagTableMgr,
-		orderBy:      goqu.COALESCE(tagTableMgr.table.Col("sort_name"), tagTableMgr.table.Col("name")).Asc(),
+		orderBy:      tagTableSort,
 	}
 
 	groupRelationshipTableMgr = &table{

From 6d76fe690b80f0495185e4ee7cca6c0873a6680a Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Mon, 13 Oct 2025 13:13:58 +1100
Subject: [PATCH 055/405] Add padding to tag links (#6129)

---
 ui/v2.5/src/components/Shared/TagLink.tsx | 4 ++--
 ui/v2.5/src/index.scss                    | 9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ui/v2.5/src/components/Shared/TagLink.tsx b/ui/v2.5/src/components/Shared/TagLink.tsx
index a59ac83cb..e572a76f8 100644
--- a/ui/v2.5/src/components/Shared/TagLink.tsx
+++ b/ui/v2.5/src/components/Shared/TagLink.tsx
@@ -36,7 +36,7 @@ const SortNameLinkComponent: React.FC<ISortNameLinkProps> = ({
     <Badge
       data-name={className}
       data-sort-name={sortName}
-      className={cx("tag-item", className)}
+      className={cx("tag-item tag-link", className)}
       variant="secondary"
     >
       <Link to={link}>{children}</Link>
@@ -55,7 +55,7 @@ const CommonLinkComponent: React.FC<ICommonLinkProps> = ({
   children,
 }) => {
   return (
-    <Badge className={cx("tag-item", className)} variant="secondary">
+    <Badge className={cx("tag-item tag-link", className)} variant="secondary">
       <Link to={link}>{children}</Link>
     </Badge>
   );
diff --git a/ui/v2.5/src/index.scss b/ui/v2.5/src/index.scss
index 4209abc2c..eedc84c01 100755
--- a/ui/v2.5/src/index.scss
+++ b/ui/v2.5/src/index.scss
@@ -710,6 +710,15 @@ div.dropdown-menu {
   margin: 5px;
   padding: 2px 6px;
 
+  // if link, move padding to link to make full tag clickable
+  &.tag-link {
+    padding: 0;
+
+    a {
+      padding: 2px 6px;
+    }
+  }
+
   &:hover {
     cursor: pointer;
   }

From 2e8bc3536f75dc015937eca7bb4bd6f8198123c4 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Wed, 15 Oct 2025 16:29:51 +1100
Subject: [PATCH 056/405] Null check image visual_files (#6136)

---
 ui/v2.5/src/components/Galleries/GalleryViewer.tsx | 4 ++--
 ui/v2.5/src/components/Images/ImageList.tsx        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ui/v2.5/src/components/Galleries/GalleryViewer.tsx b/ui/v2.5/src/components/Galleries/GalleryViewer.tsx
index 7ebb679fd..f570f9990 100644
--- a/ui/v2.5/src/components/Galleries/GalleryViewer.tsx
+++ b/ui/v2.5/src/components/Galleries/GalleryViewer.tsx
@@ -67,8 +67,8 @@ export const GalleryViewer: React.FC<IProps> = ({ galleryId }) => {
   images.forEach((image, index) => {
     let imageData = {
       src: image.paths.thumbnail!,
-      width: image.visual_files[0].width,
-      height: image.visual_files[0].height,
+      width: image.visual_files[0]?.width ?? 0,
+      height: image.visual_files[0]?.height ?? 0,
       tabIndex: index,
       key: image.id ?? index,
       loading: "lazy",
diff --git a/ui/v2.5/src/components/Images/ImageList.tsx b/ui/v2.5/src/components/Images/ImageList.tsx
index 4149970b5..093567613 100644
--- a/ui/v2.5/src/components/Images/ImageList.tsx
+++ b/ui/v2.5/src/components/Images/ImageList.tsx
@@ -72,8 +72,8 @@ const ImageWall: React.FC<IImageWallProps> = ({
         image.paths.preview != ""
           ? image.paths.preview!
           : image.paths.thumbnail!,
-      width: image.visual_files[0].width,
-      height: image.visual_files[0].height,
+      width: image.visual_files?.[0]?.width ?? 0,
+      height: image.visual_files?.[0]?.height ?? 0,
       tabIndex: index,
       key: image.id,
       loading: "lazy",

From 7b182ac04b997b14954e70397cd0901d620d2dec Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Wed, 15 Oct 2025 16:30:06 +1100
Subject: [PATCH 057/405] Vacuum into database directory then move file if
 backup dir different (#6137)

If the backup directory is not the same directory as the database, then vacuum into the same directory then move it to its destination. This is to prevent issues vacuuming over a network share.
---
 pkg/sqlite/database.go | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/pkg/sqlite/database.go b/pkg/sqlite/database.go
index fce8190d8..fa5d1e877 100644
--- a/pkg/sqlite/database.go
+++ b/pkg/sqlite/database.go
@@ -350,12 +350,30 @@ func (db *Database) Backup(backupPath string) (err error) {
 		defer thisDB.Close()
 	}
 
-	logger.Infof("Backing up database into: %s", backupPath)
-	_, err = thisDB.Exec(`VACUUM INTO "` + backupPath + `"`)
+	// if backup path is not in the same directory as the database,
+	// then backup to the same directory first, then move to the final location.
+	// This is to prevent errors if the backup directory is over a network share.
+	dbDir := filepath.Dir(db.dbPath)
+	moveAfter := filepath.Dir(backupPath) != dbDir
+	vacuumOut := backupPath
+	if moveAfter {
+		vacuumOut = filepath.Join(dbDir, filepath.Base(backupPath))
+	}
+
+	logger.Infof("Backing up database into: %s", vacuumOut)
+	_, err = thisDB.Exec(`VACUUM INTO "` + vacuumOut + `"`)
 	if err != nil {
 		return fmt.Errorf("vacuum failed: %w", err)
 	}
 
+	if moveAfter {
+		logger.Infof("Moving database backup to: %s", backupPath)
+		err = os.Rename(vacuumOut, backupPath)
+		if err != nil {
+			return fmt.Errorf("moving database backup failed: %w", err)
+		}
+	}
+
 	return nil
 }
 

From 05e2fb26be069ddaae98c7e4a3792b1f28a76310 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Wed, 15 Oct 2025 16:31:52 +1100
Subject: [PATCH 058/405] Fix setup wizard issues (#6138)

* Correct paths in confirm step
* Maintain paths when going back from confirm step
---
 ui/v2.5/src/components/Setup/Setup.tsx | 41 +++++++++++++++++++-------
 1 file changed, 30 insertions(+), 11 deletions(-)

diff --git a/ui/v2.5/src/components/Setup/Setup.tsx b/ui/v2.5/src/components/Setup/Setup.tsx
index 00228f9b0..ab5411fe1 100644
--- a/ui/v2.5/src/components/Setup/Setup.tsx
+++ b/ui/v2.5/src/components/Setup/Setup.tsx
@@ -511,16 +511,28 @@ const BlobsSection: React.FC<{
 };
 
 const SetPathsStep: React.FC<IWizardStep> = ({ goBack, next }) => {
-  const { configuration } = useSetupContext();
+  const { configuration, setupState } = useSetupContext();
 
   const [showStashAlert, setShowStashAlert] = useState(false);
 
-  const [stashes, setStashes] = useState<GQL.StashConfig[]>([]);
-  const [databaseFile, setDatabaseFile] = useState("");
-  const [generatedLocation, setGeneratedLocation] = useState("");
-  const [cacheLocation, setCacheLocation] = useState("");
-  const [storeBlobsInDatabase, setStoreBlobsInDatabase] = useState(false);
-  const [blobsLocation, setBlobsLocation] = useState("");
+  const [stashes, setStashes] = useState<GQL.StashConfig[]>(
+    setupState.stashes ?? []
+  );
+  const [databaseFile, setDatabaseFile] = useState(
+    setupState.databaseFile ?? ""
+  );
+  const [generatedLocation, setGeneratedLocation] = useState(
+    setupState.generatedLocation ?? ""
+  );
+  const [cacheLocation, setCacheLocation] = useState(
+    setupState.cacheLocation ?? ""
+  );
+  const [storeBlobsInDatabase, setStoreBlobsInDatabase] = useState(
+    setupState.storeBlobsInDatabase ?? false
+  );
+  const [blobsLocation, setBlobsLocation] = useState(
+    setupState.blobsLocation ?? ""
+  );
 
   const overrideDatabase = configuration?.general.databasePath;
   const overrideGenerated = configuration?.general.generatedPath;
@@ -640,12 +652,19 @@ const StashExclusions: React.FC<{ stash: GQL.StashConfig }> = ({ stash }) => {
 };
 
 const ConfirmStep: React.FC<IWizardStep> = ({ goBack, next }) => {
-  const { configuration, pathDir, pathJoin, pwd, setupState } =
-    useSetupContext();
+  const {
+    configuration,
+    pathDir,
+    pathJoin,
+    setupState,
+    homeDirPath,
+    workingDir,
+  } = useSetupContext();
 
+  // if unset, means use homeDirPath
   const cfgFile = setupState.configLocation
-    ? setupState.configLocation
-    : pathJoin(pwd, "config.yml");
+    ? pathJoin(workingDir, setupState.configLocation)
+    : pathJoin(homeDirPath, "config.yml");
   const cfgDir = pathDir(cfgFile);
   const stashes = setupState.stashes ?? [];
   const {

From eb816d2e4fa3be7fbee5b27e451c95060aba4b4d Mon Sep 17 00:00:00 2001
From: underprovisioned <234677721+underprovisioned@users.noreply.github.com>
Date: Wed, 15 Oct 2025 01:52:40 -0400
Subject: [PATCH 059/405] Sort duplicate scene groups by total filesize
 descending (#6133)

---
 .../SceneDuplicateChecker.tsx                 | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/ui/v2.5/src/components/SceneDuplicateChecker/SceneDuplicateChecker.tsx b/ui/v2.5/src/components/SceneDuplicateChecker/SceneDuplicateChecker.tsx
index 2d8114935..d396a01f4 100644
--- a/ui/v2.5/src/components/SceneDuplicateChecker/SceneDuplicateChecker.tsx
+++ b/ui/v2.5/src/components/SceneDuplicateChecker/SceneDuplicateChecker.tsx
@@ -79,7 +79,24 @@ export const SceneDuplicateChecker: React.FC = () => {
     },
   });
 
-  const scenes = data?.findDuplicateScenes ?? [];
+  const getGroupTotalSize = (group: GQL.SlimSceneDataFragment[]) => {
+    // Sum all file sizes across all scenes in the group
+    return group.reduce((groupTotal, scene) => {
+      const sceneTotal = scene.files.reduce(
+        (fileTotal, file) => fileTotal + file.size,
+        0
+      );
+      return groupTotal + sceneTotal;
+    }, 0);
+  };
+
+  const scenes = useMemo(() => {
+    const groups = data?.findDuplicateScenes ?? [];
+    // Sort by total file size descending (largest groups first)
+    return [...groups].sort((a, b) => {
+      return getGroupTotalSize(b) - getGroupTotalSize(a);
+    });
+  }, [data?.findDuplicateScenes]);
 
   const { data: missingPhash } = GQL.useFindScenesQuery({
     variables: {

From e1b3b33c24b968d09c536146a2e01b667b0df4f8 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Wed, 15 Oct 2025 16:52:54 +1100
Subject: [PATCH 060/405] Correctly load generate options when generating from
 tasks page (#6139)

---
 .../Settings/Tasks/LibraryTasks.tsx           | 49 +++++++++----------
 1 file changed, 24 insertions(+), 25 deletions(-)

diff --git a/ui/v2.5/src/components/Settings/Tasks/LibraryTasks.tsx b/ui/v2.5/src/components/Settings/Tasks/LibraryTasks.tsx
index 1cab7cfb6..cb60891fd 100644
--- a/ui/v2.5/src/components/Settings/Tasks/LibraryTasks.tsx
+++ b/ui/v2.5/src/components/Settings/Tasks/LibraryTasks.tsx
@@ -160,30 +160,6 @@ export const LibraryTasks: React.FC = () => {
         setGenerateOptions(withoutTypename(generate));
       }
 
-      if (configuration?.general) {
-        const { general } = configuration;
-        setGenerateOptions((existing) => ({
-          ...existing,
-          previewOptions: {
-            ...existing.previewOptions,
-            previewSegments:
-              general.previewSegments ??
-              existing.previewOptions?.previewSegments,
-            previewSegmentDuration:
-              general.previewSegmentDuration ??
-              existing.previewOptions?.previewSegmentDuration,
-            previewExcludeStart:
-              general.previewExcludeStart ??
-              existing.previewOptions?.previewExcludeStart,
-            previewExcludeEnd:
-              general.previewExcludeEnd ??
-              existing.previewOptions?.previewExcludeEnd,
-            previewPreset:
-              general.previewPreset ?? existing.previewOptions?.previewPreset,
-          },
-        }));
-      }
-
       setConfigRead(true);
     }
   }, [configuration, configRead, taskDefaults, loading]);
@@ -291,7 +267,30 @@ export const LibraryTasks: React.FC = () => {
 
   async function onGenerateClicked() {
     try {
-      await mutateMetadataGenerate(generateOptions);
+      // insert preview options here instead of loading them
+      const general = configuration?.general;
+
+      await mutateMetadataGenerate({
+        ...generateOptions,
+        previewOptions: {
+          ...generateOptions.previewOptions,
+          previewSegments:
+            general?.previewSegments ??
+            generateOptions.previewOptions?.previewSegments,
+          previewSegmentDuration:
+            general?.previewSegmentDuration ??
+            generateOptions.previewOptions?.previewSegmentDuration,
+          previewExcludeStart:
+            general?.previewExcludeStart ??
+            generateOptions.previewOptions?.previewExcludeStart,
+          previewExcludeEnd:
+            general?.previewExcludeEnd ??
+            generateOptions.previewOptions?.previewExcludeEnd,
+          previewPreset:
+            general?.previewPreset ??
+            generateOptions.previewOptions?.previewPreset,
+        },
+      });
       Toast.success(
         intl.formatMessage(
           { id: "config.tasks.added_job_to_queue" },

From fbba4f06a97b2cb93dc858ccf88550ebd8e460d9 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Wed, 15 Oct 2025 16:53:08 +1100
Subject: [PATCH 061/405] Correct movies to groups in default menu items
 (#6140)

Fixes unnecessary config migration artifact in new systems
---
 internal/manager/config/config.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/internal/manager/config/config.go b/internal/manager/config/config.go
index 1b627cbdd..9b3b5bf21 100644
--- a/internal/manager/config/config.go
+++ b/internal/manager/config/config.go
@@ -287,7 +287,7 @@ var (
 	defaultVideoExtensions   = []string{"m4v", "mp4", "mov", "wmv", "avi", "mpg", "mpeg", "rmvb", "rm", "flv", "asf", "mkv", "webm", "f4v"}
 	defaultImageExtensions   = []string{"png", "jpg", "jpeg", "gif", "webp"}
 	defaultGalleryExtensions = []string{"zip", "cbz"}
-	defaultMenuItems         = []string{"scenes", "images", "movies", "markers", "galleries", "performers", "studios", "tags"}
+	defaultMenuItems         = []string{"scenes", "images", "groups", "markers", "galleries", "performers", "studios", "tags"}
 )
 
 type MissingConfigError struct {

From 0c5285c949e2c7825903152f79c9ad0b69250ee1 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Wed, 15 Oct 2025 17:55:05 +1100
Subject: [PATCH 062/405] Add 0.29 changelog

---
 .../src/components/Changelog/Changelog.tsx    | 10 +++-
 ui/v2.5/src/docs/en/Changelog/v0290.md        | 54 +++++++++++++++++++
 2 files changed, 62 insertions(+), 2 deletions(-)
 create mode 100644 ui/v2.5/src/docs/en/Changelog/v0290.md

diff --git a/ui/v2.5/src/components/Changelog/Changelog.tsx b/ui/v2.5/src/components/Changelog/Changelog.tsx
index ae7937588..ea831d35a 100644
--- a/ui/v2.5/src/components/Changelog/Changelog.tsx
+++ b/ui/v2.5/src/components/Changelog/Changelog.tsx
@@ -33,6 +33,7 @@ import V0250 from "src/docs/en/Changelog/v0250.md";
 import V0260 from "src/docs/en/Changelog/v0260.md";
 import V0270 from "src/docs/en/Changelog/v0270.md";
 import V0280 from "src/docs/en/Changelog/v0280.md";
+import V0290 from "src/docs/en/Changelog/v0290.md";
 import { MarkdownPage } from "../Shared/MarkdownPage";
 
 const Changelog: React.FC = () => {
@@ -68,9 +69,9 @@ const Changelog: React.FC = () => {
   // after new release:
   // add entry to releases, using the current* fields
   // then update the current fields.
-  const currentVersion = stashVersion || "v0.28.1";
+  const currentVersion = stashVersion || "v0.29.0";
   const currentDate = buildDate;
-  const currentPage = V0280;
+  const currentPage = V0290;
 
   const releases: IStashRelease[] = [
     {
@@ -79,6 +80,11 @@ const Changelog: React.FC = () => {
       page: currentPage,
       defaultOpen: true,
     },
+    {
+      version: "v0.28.1",
+      date: "2025-03-20",
+      page: V0280,
+    },
     {
       version: "v0.27.2",
       date: "2024-10-16",
diff --git a/ui/v2.5/src/docs/en/Changelog/v0290.md b/ui/v2.5/src/docs/en/Changelog/v0290.md
new file mode 100644
index 000000000..f2c99de4a
--- /dev/null
+++ b/ui/v2.5/src/docs/en/Changelog/v0290.md
@@ -0,0 +1,54 @@
+### ✨ New Features
+* Redesigned the scenes page with filter sidebar. ([#5714](https://github.com/stashapp/stash/pull/5714))
+* Added Performers tab to Group details page. ([#5895](https://github.com/stashapp/stash/pull/5895))
+* Added configurable rate limit to stash-box connection options. ([#5764](https://github.com/stashapp/stash/pull/5764))
+
+
+### 🎨 Improvements
+* Revamped the scene and marker wall views. ([#5816](https://github.com/stashapp/stash/pull/5816))
+* Added zoom functionality to wall views. ([#6011](https://github.com/stashapp/stash/pull/6011))
+* Added search term field to the Edit Filter dialog. ([#6082](https://github.com/stashapp/stash/pull/6082))
+* Added load and save filter buttons to the Edit Filter dialog. ([#6092](https://github.com/stashapp/stash/pull/6092))
+* Restyled UI error messages. ([#5813](https://github.com/stashapp/stash/pull/5813))
+* Changed default modifier of `path` criterion to `includes` instead of `equals`. ([#5968](https://github.com/stashapp/stash/pull/5968))
+* Added internationalisation to login page. ([#5765](https://github.com/stashapp/stash/pull/5765))
+* Added Performer and Tag popovers to scene edit page. ([#5739](https://github.com/stashapp/stash/pull/5739))
+* Tags are now sorted by name in scrape and merge dialogs. ([#5752](https://github.com/stashapp/stash/pull/5752))
+* Related stash-box is now shown with IDs in tagger view. ([#5879](https://github.com/stashapp/stash/pull/5879))
+* UI now navigates to previous page when deleting an item. ([#5818](https://github.com/stashapp/stash/pull/5818))
+* All URLs will now be submitted when submitting a draft to stash-box. ([#5894](https://github.com/stashapp/stash/pull/5894))
+* Made funscript parsing more fault tolerant. ([#5978](https://github.com/stashapp/stash/pull/5978))
+* Added link to gallery in image lightbox. ([#6012](https://github.com/stashapp/stash/pull/6012))
+* Provide correct filename when downloading scene video. ([#6119](https://github.com/stashapp/stash/pull/6119))
+* Support hardware next/previous keys for scene navigation. ([#5553](https://github.com/stashapp/stash/pull/5553))
+* Duplicate checker now sorts largest file groups first. ([#6133](https://github.com/stashapp/stash/pull/6133))
+* Show gallery cover in Gallery edit panel. ([#5935](https://github.com/stashapp/stash/pull/5935))
+* Backups will now be created in the same directory as the database, then moved to the configured backup directory. This avoids potential corruption when backing up over a network share. ([#6137](https://github.com/stashapp/stash/pull/6137))
+* Added graphql playground link to tools panel. ([#5807](https://github.com/stashapp/stash/pull/5807))
+* Include IP address in login errors in log. ([#5760](https://github.com/stashapp/stash/pull/5760))
+
+### 🐛 Bug fixes
+* Fixed ordering studios by tag count returning error. ([#5776](https://github.com/stashapp/stash/pull/5776))
+* Fixed error when submitting fingerprints for scenes that have been deleted. ([#5799](https://github.com/stashapp/stash/pull/5799))
+* Fixed errors when scraping groups. ([#5793](https://github.com/stashapp/stash/pull/5793), [#5974](https://github.com/stashapp/stash/pull/5974))
+* Fixed UI crash when viewing a gallery in the Performer details page. ([#5824](https://github.com/stashapp/stash/pull/5824))
+* Fixed scraped performer stash ID being saved when cancelling scrape operation. ([#5839](https://github.com/stashapp/stash/pull/5839))
+* Fixed groups not transferring when merging tags. ([#6127](https://github.com/stashapp/stash/pull/6127))
+* Fixed empty exclusion patterns being applied when scanning and cleaning. ([#6023](https://github.com/stashapp/stash/pull/6023))
+* Fixed login page being included in browser history. ([#5747](https://github.com/stashapp/stash/pull/5747))
+* Fixed gallery card resizing while scrubbing. ([#5844](https://github.com/stashapp/stash/pull/5844))
+* Fixed incorrectly positioned scene markers in the scene player timeline. ([#5801](https://github.com/stashapp/stash/pull/5801), [#5804](https://github.com/stashapp/stash/pull/5804))
+* Fixed custom fields not being displayed in Performer page with `Compact Expanded Details` enabled. ([#5833](https://github.com/stashapp/stash/pull/5833))
+* Fixed issue in tagger where creating a parent studio would not map it to the other results. ([#5810](https://github.com/stashapp/stash/pull/5810), [#5996](https://github.com/stashapp/stash/pull/5996))
+* Fixed generation options not being respected when generating using the Tasks page. ([#6139](https://github.com/stashapp/stash/pull/6139))
+* Related tags are now ordered by name. ([#5945](https://github.com/stashapp/stash/pull/5945))
+* Fixed error message not being displayed when failing at startup. ([#5798](https://github.com/stashapp/stash/pull/5798))
+* Fixed incorrect paths in confirm step of the setup wizard. ([#6138](https://github.com/stashapp/stash/pull/6138))
+* Fixed values being lost when navigating back from the confirmation step of the setup wizard. ([#6138](https://github.com/stashapp/stash/pull/6138))
+* Fixed incorrect paths generated in HLS when using a reverse proxy prefix. ([#5791](https://github.com/stashapp/stash/pull/5791))
+* Fixed marker preview being deleted when modifying a marker with a duration. ([#5800](https://github.com/stashapp/stash/pull/5800))
+* Fixed marker end seconds not being included in import/export. ([#5777](https://github.com/stashapp/stash/pull/5777))
+* Fixed parent tags missing in export if including dependencies. ([#5780](https://github.com/stashapp/stash/pull/5780))
+* Add short hash of basename when generating export file names to prevent the same filename being generated. ([#5780](https://github.com/stashapp/stash/pull/5780))
+* Fixed invalid studio and performer links in the tagger view. ([#5876](https://github.com/stashapp/stash/pull/5876))
+* Fixed clickable area for tag links. ([#6129](https://github.com/stashapp/stash/pull/6129))
\ No newline at end of file

From ce4b86daf5e9088c3c03df16422798f41dfdccab Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Thu, 16 Oct 2025 13:15:09 +1100
Subject: [PATCH 063/405] Fix tag order on details pages (#6143)

* Fix related tag order
* Fix unit tests
---
 pkg/sqlite/gallery.go        | 2 +-
 pkg/sqlite/gallery_test.go   | 2 +-
 pkg/sqlite/group.go          | 2 +-
 pkg/sqlite/image.go          | 2 +-
 pkg/sqlite/performer.go      | 2 +-
 pkg/sqlite/performer_test.go | 6 +++---
 pkg/sqlite/scene.go          | 2 +-
 pkg/sqlite/studio.go         | 2 +-
 pkg/sqlite/tables.go         | 3 ++-
 9 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/pkg/sqlite/gallery.go b/pkg/sqlite/gallery.go
index ec9b7ae2e..9cfe38b1f 100644
--- a/pkg/sqlite/gallery.go
+++ b/pkg/sqlite/gallery.go
@@ -155,7 +155,7 @@ var (
 			},
 			fkColumn:     "tag_id",
 			foreignTable: tagTable,
-			orderBy:      "COALESCE(tags.sort_name, tags.name) ASC",
+			orderBy:      tagTableSortSQL,
 		},
 		images: joinRepository{
 			repository: repository{
diff --git a/pkg/sqlite/gallery_test.go b/pkg/sqlite/gallery_test.go
index be1edb687..06d7daf17 100644
--- a/pkg/sqlite/gallery_test.go
+++ b/pkg/sqlite/gallery_test.go
@@ -481,7 +481,7 @@ func Test_galleryQueryBuilder_UpdatePartial(t *testing.T) {
 				CreatedAt:    createdAt,
 				UpdatedAt:    updatedAt,
 				SceneIDs:     models.NewRelatedIDs([]int{sceneIDs[sceneIdxWithGallery]}),
-				TagIDs:       models.NewRelatedIDs([]int{tagIDs[tagIdx1WithGallery], tagIDs[tagIdx1WithDupName]}),
+				TagIDs:       models.NewRelatedIDs([]int{tagIDs[tagIdx1WithDupName], tagIDs[tagIdx1WithGallery]}),
 				PerformerIDs: models.NewRelatedIDs([]int{performerIDs[performerIdx1WithGallery], performerIDs[performerIdx1WithDupName]}),
 			},
 			false,
diff --git a/pkg/sqlite/group.go b/pkg/sqlite/group.go
index 7f0ff72ca..686bf4e1e 100644
--- a/pkg/sqlite/group.go
+++ b/pkg/sqlite/group.go
@@ -122,7 +122,7 @@ var (
 			},
 			fkColumn:     tagIDColumn,
 			foreignTable: tagTable,
-			orderBy:      "COALESCE(tags.sort_name, tags.name) ASC",
+			orderBy:      tagTableSortSQL,
 		},
 	}
 )
diff --git a/pkg/sqlite/image.go b/pkg/sqlite/image.go
index 840720c50..6575ebb91 100644
--- a/pkg/sqlite/image.go
+++ b/pkg/sqlite/image.go
@@ -177,7 +177,7 @@ var (
 			},
 			fkColumn:     tagIDColumn,
 			foreignTable: tagTable,
-			orderBy:      "COALESCE(tags.sort_name, tags.name) ASC",
+			orderBy:      tagTableSortSQL,
 		},
 	}
 )
diff --git a/pkg/sqlite/performer.go b/pkg/sqlite/performer.go
index bcb984ffd..1b1f103da 100644
--- a/pkg/sqlite/performer.go
+++ b/pkg/sqlite/performer.go
@@ -189,7 +189,7 @@ var (
 			},
 			fkColumn:     tagIDColumn,
 			foreignTable: tagTable,
-			orderBy:      "COALESCE(tags.sort_name, tags.name) ASC",
+			orderBy:      tagTableSortSQL,
 		},
 		stashIDs: stashIDRepository{
 			repository{
diff --git a/pkg/sqlite/performer_test.go b/pkg/sqlite/performer_test.go
index eb1dfbad2..d5d8ce2fa 100644
--- a/pkg/sqlite/performer_test.go
+++ b/pkg/sqlite/performer_test.go
@@ -282,7 +282,7 @@ func Test_PerformerStore_Update(t *testing.T) {
 					Weight:         &weight,
 					IgnoreAutoTag:  ignoreAutoTag,
 					Aliases:        models.NewRelatedStrings(aliases),
-					TagIDs:         models.NewRelatedIDs([]int{tagIDs[tagIdx1WithPerformer], tagIDs[tagIdx1WithDupName]}),
+					TagIDs:         models.NewRelatedIDs([]int{tagIDs[tagIdx1WithDupName], tagIDs[tagIdx1WithPerformer]}),
 					StashIDs: models.NewRelatedStashIDs([]models.StashID{
 						{
 							StashID:   stashID1,
@@ -516,7 +516,7 @@ func Test_PerformerStore_UpdatePartial(t *testing.T) {
 				Weight:        models.NewOptionalInt(weight),
 				IgnoreAutoTag: models.NewOptionalBool(ignoreAutoTag),
 				TagIDs: &models.UpdateIDs{
-					IDs:  []int{tagIDs[tagIdx1WithPerformer], tagIDs[tagIdx1WithDupName]},
+					IDs:  []int{tagIDs[tagIdx1WithDupName], tagIDs[tagIdx1WithPerformer]},
 					Mode: models.RelationshipUpdateModeSet,
 				},
 				StashIDs: &models.UpdateStashIDs{
@@ -563,7 +563,7 @@ func Test_PerformerStore_UpdatePartial(t *testing.T) {
 				HairColor:      hairColor,
 				Weight:         &weight,
 				IgnoreAutoTag:  ignoreAutoTag,
-				TagIDs:         models.NewRelatedIDs([]int{tagIDs[tagIdx1WithPerformer], tagIDs[tagIdx1WithDupName]}),
+				TagIDs:         models.NewRelatedIDs([]int{tagIDs[tagIdx1WithDupName], tagIDs[tagIdx1WithPerformer]}),
 				StashIDs: models.NewRelatedStashIDs([]models.StashID{
 					{
 						StashID:   stashID1,
diff --git a/pkg/sqlite/scene.go b/pkg/sqlite/scene.go
index c4a46b23c..0a7829f28 100644
--- a/pkg/sqlite/scene.go
+++ b/pkg/sqlite/scene.go
@@ -201,7 +201,7 @@ var (
 			},
 			fkColumn:     tagIDColumn,
 			foreignTable: tagTable,
-			orderBy:      "COALESCE(tags.sort_name, tags.name) ASC",
+			orderBy:      tagTableSortSQL,
 		},
 		performers: joinRepository{
 			repository: repository{
diff --git a/pkg/sqlite/studio.go b/pkg/sqlite/studio.go
index 9217fbcdb..7d93eee28 100644
--- a/pkg/sqlite/studio.go
+++ b/pkg/sqlite/studio.go
@@ -133,7 +133,7 @@ var (
 			},
 			fkColumn:     tagIDColumn,
 			foreignTable: tagTable,
-			orderBy:      "COALESCE(tags.sort_name, tags.name) ASC",
+			orderBy:      tagTableSortSQL,
 		},
 	}
 )
diff --git a/pkg/sqlite/tables.go b/pkg/sqlite/tables.go
index 8d798d913..35845d8f5 100644
--- a/pkg/sqlite/tables.go
+++ b/pkg/sqlite/tables.go
@@ -332,7 +332,8 @@ var (
 	}
 
 	// formerly: goqu.COALESCE(tagTableMgr.table.Col("sort_name"), tagTableMgr.table.Col("name")).Asc()
-	tagTableSort = goqu.L("COALESCE(tags.sort_name, tags.name) COLLATE NATURAL_CI").Asc()
+	tagTableSort    = goqu.L("COALESCE(tags.sort_name, tags.name) COLLATE NATURAL_CI").Asc()
+	tagTableSortSQL = "COALESCE(tags.sort_name, tags.name) COLLATE NATURAL_CI ASC"
 
 	tagsAliasesTableMgr = &stringTable{
 		table: table{

From 479ad49e81b585ffe486d6ba29a8c81269132c96 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Thu, 16 Oct 2025 14:45:29 +1100
Subject: [PATCH 064/405] Add 0.29 release notes (#6144)

* Add 0.29 release notes
* Add optional release notes to changelog entries
---
 ui/v2.5/src/components/Changelog/Changelog.tsx | 14 ++++++++++++++
 ui/v2.5/src/docs/en/ReleaseNotes/index.ts      |  6 ++++++
 ui/v2.5/src/docs/en/ReleaseNotes/v0290.md      |  3 +++
 3 files changed, 23 insertions(+)
 create mode 100644 ui/v2.5/src/docs/en/ReleaseNotes/v0290.md

diff --git a/ui/v2.5/src/components/Changelog/Changelog.tsx b/ui/v2.5/src/components/Changelog/Changelog.tsx
index ea831d35a..5b2732977 100644
--- a/ui/v2.5/src/components/Changelog/Changelog.tsx
+++ b/ui/v2.5/src/components/Changelog/Changelog.tsx
@@ -34,7 +34,10 @@ import V0260 from "src/docs/en/Changelog/v0260.md";
 import V0270 from "src/docs/en/Changelog/v0270.md";
 import V0280 from "src/docs/en/Changelog/v0280.md";
 import V0290 from "src/docs/en/Changelog/v0290.md";
+
+import V020ReleaseNotes from "src/docs/en/ReleaseNotes/v0290.md";
 import { MarkdownPage } from "../Shared/MarkdownPage";
+import { FormattedMessage } from "react-intl";
 
 const Changelog: React.FC = () => {
   const [{ data, loading }, setOpenState] = useChangelogStorage();
@@ -64,6 +67,7 @@ const Changelog: React.FC = () => {
     date?: string;
     page: string;
     defaultOpen?: boolean;
+    releaseNotes?: string;
   }
 
   // after new release:
@@ -79,6 +83,7 @@ const Changelog: React.FC = () => {
       date: currentDate,
       page: currentPage,
       defaultOpen: true,
+      releaseNotes: V020ReleaseNotes,
     },
     {
       version: "v0.28.1",
@@ -254,6 +259,15 @@ const Changelog: React.FC = () => {
           setOpenState={setVersionOpenState}
           defaultOpen={r.defaultOpen}
         >
+          {r.releaseNotes && (
+            <div>
+              <h3 className="mt-0">
+                <FormattedMessage id="release_notes" />
+              </h3>
+              <MarkdownPage page={r.releaseNotes} />
+              <hr />
+            </div>
+          )}
           <MarkdownPage page={r.page} />
         </Version>
       ))}
diff --git a/ui/v2.5/src/docs/en/ReleaseNotes/index.ts b/ui/v2.5/src/docs/en/ReleaseNotes/index.ts
index 8e2f503d4..78e5e4b37 100644
--- a/ui/v2.5/src/docs/en/ReleaseNotes/index.ts
+++ b/ui/v2.5/src/docs/en/ReleaseNotes/index.ts
@@ -4,6 +4,7 @@ import v0240 from "./v0240.md";
 import v0250 from "./v0250.md";
 import v0260 from "./v0260.md";
 import v0270 from "./v0270.md";
+import v0290 from "./v0290.md";
 
 export interface IReleaseNotes {
   // handle should be in the form of YYYYMMDD
@@ -13,6 +14,11 @@ export interface IReleaseNotes {
 }
 
 export const releaseNotes: IReleaseNotes[] = [
+  {
+    date: 20251026,
+    version: "v0.29.0",
+    content: v0290,
+  },
   {
     date: 20240826,
     version: "v0.27.0",
diff --git a/ui/v2.5/src/docs/en/ReleaseNotes/v0290.md b/ui/v2.5/src/docs/en/ReleaseNotes/v0290.md
new file mode 100644
index 000000000..4a816edd4
--- /dev/null
+++ b/ui/v2.5/src/docs/en/ReleaseNotes/v0290.md
@@ -0,0 +1,3 @@
+The Scenes page and related scene list views have been updated with a filter sidebar and a toolbar for filtering and other actions. This design is intended to be applied to other query pages in the following release. The design will be refined based on user feedback. 
+
+You can help steer the direction of this design by providing feedback in the [forum thread](https://discourse.stashapp.cc/t/query-page-redesign-feedback-thread-0-29/3935).
\ No newline at end of file

From 13953c2fbd048c34bc51050257a422cd0868f6ff Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Thu, 16 Oct 2025 18:31:33 +1100
Subject: [PATCH 065/405] Codeberg weblate update (#6145)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Translated using Weblate (Indonesian)

Currently translated at 44.8% (537 of 1198 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/id/

* Translated using Weblate (Norwegian Bokmål)

Currently translated at 20.6% (247 of 1198 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/nb_NO/

* Translated using Weblate (Japanese)

Currently translated at 83.9% (1006 of 1198 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/ja/

* Translated using Weblate (Turkish)

Currently translated at 92.2% (1105 of 1198 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/tr/

* Translated using Weblate (French)

Currently translated at 100.0% (1205 of 1205 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/fr/

* Translated using Weblate (Swedish)

Currently translated at 100.0% (1205 of 1205 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/sv/

* Translated using Weblate (German)

Currently translated at 99.9% (1204 of 1205 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/de/

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (1205 of 1205 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/zh_Hans/

* Translated using Weblate (Norwegian Nynorsk)

Currently translated at 15.6% (188 of 1205 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/nn/

* Translated using Weblate (Dutch)

Currently translated at 70.8% (854 of 1205 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/nl/

* Translated using Weblate (Estonian)

Currently translated at 100.0% (1205 of 1205 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/et/

* Added translation using Weblate (Urdu)

* Translated using Weblate (Czech)

Currently translated at 100.0% (1205 of 1205 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/cs/

* Translated using Weblate (Turkish)

Currently translated at 94.5% (1139 of 1205 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/tr/

* Translated using Weblate (Korean)

Currently translated at 100.0% (1205 of 1205 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/ko/

* Translated using Weblate (Catalan)

Currently translated at 37.1% (448 of 1205 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/ca/

* Translated using Weblate (Dutch)

Currently translated at 71.0% (856 of 1205 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/nl/

* Translated using Weblate (Vietnamese)

Currently translated at 22.5% (272 of 1205 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/vi/

* Translated using Weblate (English (United States))

Currently translated at 28.4% (343 of 1205 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/en_US/

* Translated using Weblate (Russian)

Currently translated at 95.9% (1156 of 1205 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/ru/

* Translated using Weblate (Japanese)

Currently translated at 84.4% (1018 of 1205 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/ja/

* Translated using Weblate (Vietnamese)

Currently translated at 34.1% (412 of 1205 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/vi/

* Translated using Weblate (Vietnamese)

Currently translated at 56.2% (678 of 1205 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/vi/

* Translated using Weblate (Urdu)

Currently translated at 0.2% (3 of 1205 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/ur/

* Translated using Weblate (French)

Currently translated at 100.0% (1205 of 1205 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/fr/

* Update translation files

Updated by "Cleanup translation files" add-on in Weblate.

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/

* Translated using Weblate (French)

Currently translated at 100.0% (1208 of 1208 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/fr/

* Translated using Weblate (Norwegian Bokmål)

Currently translated at 21.2% (257 of 1208 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/nb_NO/

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (1208 of 1208 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/zh_Hans/

* Translated using Weblate (French)

Currently translated at 100.0% (1209 of 1209 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/fr/

* Translated using Weblate (Korean)

Currently translated at 100.0% (1209 of 1209 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/ko/

* Translated using Weblate (Norwegian Bokmål)

Currently translated at 23.2% (281 of 1209 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/nb_NO/

* Translated using Weblate (Dutch)

Currently translated at 72.7% (880 of 1209 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/nl/

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (1209 of 1209 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/zh_Hans/

* Translated using Weblate (Chinese (Traditional Han script))

Currently translated at 99.1% (1199 of 1209 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/zh_Hant/

* Translated using Weblate (Norwegian Bokmål)

Currently translated at 24.3% (294 of 1209 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/nb_NO/

* Translated using Weblate (Norwegian Bokmål)

Currently translated at 24.3% (294 of 1209 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/nb_NO/

* Translated using Weblate (Latvian)

Currently translated at 11.9% (145 of 1209 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/lv/

* Translated using Weblate (Romanian)

Currently translated at 36.0% (436 of 1209 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/ro/

* Translated using Weblate (Czech)

Currently translated at 100.0% (1209 of 1209 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/cs/

* Translated using Weblate (French)

Currently translated at 100.0% (1213 of 1213 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/fr/

* Translated using Weblate (Japanese)

Currently translated at 84.3% (1023 of 1213 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/ja/

* Translated using Weblate (French)

Currently translated at 100.0% (1215 of 1215 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/fr/

* Translated using Weblate (Swedish)

Currently translated at 100.0% (1215 of 1215 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/sv/

* Translated using Weblate (Korean)

Currently translated at 100.0% (1215 of 1215 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/ko/

* Translated using Weblate (French)

Currently translated at 100.0% (1216 of 1216 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/fr/

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (1216 of 1216 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/zh_Hans/

* Translated using Weblate (Korean)

Currently translated at 100.0% (1216 of 1216 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/ko/

* Translated using Weblate (Vietnamese)

Currently translated at 59.6% (725 of 1216 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/vi/

* Translated using Weblate (Vietnamese)

Currently translated at 59.6% (725 of 1216 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/vi/

* Translated using Weblate (German)

Currently translated at 99.0% (1204 of 1216 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/de/

* Translated using Weblate (Vietnamese)

Currently translated at 60.0% (730 of 1216 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/vi/

* Translated using Weblate (Estonian)

Currently translated at 100.0% (1216 of 1216 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/et/

* Translated using Weblate (Turkish)

Currently translated at 96.0% (1168 of 1216 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/tr/

* Translated using Weblate (Polish)

Currently translated at 82.3% (1001 of 1216 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/pl/

* Translated using Weblate (Norwegian Bokmål)

Currently translated at 25.0% (304 of 1216 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/nb_NO/

* Translated using Weblate (German)

Currently translated at 100.0% (1216 of 1216 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/de/

* Translated using Weblate (Czech)

Currently translated at 100.0% (1216 of 1216 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/cs/

* Translated using Weblate (English (United States))

Currently translated at 28.0% (341 of 1216 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/en_US/

* Translated using Weblate (Russian)

Currently translated at 97.7% (1189 of 1216 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/ru/

* Translated using Weblate (Swedish)

Currently translated at 100.0% (1216 of 1216 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/sv/

* Translated using Weblate (Russian)

Currently translated at 100.0% (1216 of 1216 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/ru/

* Translated using Weblate (Persian)

Currently translated at 2.5% (31 of 1216 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/fa/

* Translated using Weblate (Dutch)

Currently translated at 75.7% (921 of 1216 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/nl/

* Translated using Weblate (Vietnamese)

Currently translated at 60.2% (733 of 1216 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/vi/

* Translated using Weblate (Japanese)

Currently translated at 84.2% (1024 of 1216 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/ja/

* Translated using Weblate (Norwegian Bokmål)

Currently translated at 94.6% (1151 of 1216 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/nb_NO/

* Translated using Weblate (Norwegian Bokmål)

Currently translated at 100.0% (1216 of 1216 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/nb_NO/

* Translated using Weblate (Chinese (Traditional Han script))

Currently translated at 100.0% (1216 of 1216 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/zh_Hant/

* Translated using Weblate (Estonian)

Currently translated at 100.0% (1219 of 1219 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/et/

* Translated using Weblate (French)

Currently translated at 100.0% (1219 of 1219 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/fr/

* Added translation using Weblate (Lithuanian)

* Translated using Weblate (Korean)

Currently translated at 100.0% (1219 of 1219 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/ko/

* Translated using Weblate (Lithuanian)

Currently translated at 8.6% (105 of 1219 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/lt/

* Translated using Weblate (German)

Currently translated at 100.0% (1219 of 1219 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/de/

* Translated using Weblate (Croatian)

Currently translated at 20.6% (252 of 1219 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/hr/

* Translated using Weblate (Czech)

Currently translated at 100.0% (1219 of 1219 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/cs/

* Translated using Weblate (Vietnamese)

Currently translated at 64.5% (787 of 1219 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/vi/

* Translated using Weblate (Indonesian)

Currently translated at 47.1% (575 of 1219 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/id/

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (1219 of 1219 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/zh_Hans/

* Translated using Weblate (Indonesian)

Currently translated at 49.6% (605 of 1219 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/id/

* Translated using Weblate (Italian)

Currently translated at 75.7% (924 of 1219 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/it/

* Translated using Weblate (Finnish)

Currently translated at 80.3% (979 of 1219 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/fi/

* Translated using Weblate (Spanish)

Currently translated at 96.8% (1180 of 1219 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/es/

* Translated using Weblate (Urdu)

Currently translated at 0.8% (10 of 1219 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/ur/

* Translated using Weblate (Czech)

Currently translated at 100.0% (1219 of 1219 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/cs/

* Translated using Weblate (Turkish)

Currently translated at 95.8% (1168 of 1219 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/tr/

* Added translation using Weblate (Bulgarian)

* Translated using Weblate (Finnish)

Currently translated at 80.5% (982 of 1219 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/fi/

* Translated using Weblate (Bulgarian)

Currently translated at 4.1% (51 of 1219 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/bg/

* Correct new locale filenames

* Update language options

* Correct error in de-DE

* Filter en-US to only different strings

---------

Co-authored-by: fafafafa <fafafafa@noreply.codeberg.org>
Co-authored-by: boy3satiable <boy3satiable@noreply.codeberg.org>
Co-authored-by: ynclt <ynclt@noreply.codeberg.org>
Co-authored-by: slickdaddy <slickdaddy@noreply.codeberg.org>
Co-authored-by: doodoo <doodoo@noreply.codeberg.org>
Co-authored-by: AlpacaSerious <alpacaserious@noreply.codeberg.org>
Co-authored-by: tzuuuss <tzuuuss@noreply.codeberg.org>
Co-authored-by: wql219 <wanqinglin219@hotmail.com>
Co-authored-by: throbbing <throbbing@noreply.codeberg.org>
Co-authored-by: youri <youri@noreply.codeberg.org>
Co-authored-by: Zesty6249 <zesty6249@noreply.codeberg.org>
Co-authored-by: Lambert99 <lambert99@noreply.codeberg.org>
Co-authored-by: NymeriaCZ <nymeriacz@noreply.codeberg.org>
Co-authored-by: yec <yec@noreply.codeberg.org>
Co-authored-by: burrisol <burrisol@noreply.codeberg.org>
Co-authored-by: Cindicent <cindicent@noreply.codeberg.org>
Co-authored-by: nitromelon <nitromelon@noreply.codeberg.org>
Co-authored-by: boxcrunch <boxcrunch@noreply.codeberg.org>
Co-authored-by: Fl0master1337 <fl0master1337@noreply.codeberg.org>
Co-authored-by: tobakumap <tobakumap@noreply.codeberg.org>
Co-authored-by: dragoncrazy2011 <dragoncrazy2011@noreply.codeberg.org>
Co-authored-by: CrypticGlycolic <crypticglycolic@noreply.codeberg.org>
Co-authored-by: Codeberg Translate <translate@codeberg.org>
Co-authored-by: bwithnewcast <bwithnewcast@noreply.codeberg.org>
Co-authored-by: COTMO <cotmo@noreply.codeberg.org>
Co-authored-by: danny60718 <danny60718@noreply.codeberg.org>
Co-authored-by: noTranslator <notranslator@noreply.codeberg.org>
Co-authored-by: ℂ𝕠𝕠𝕠𝕝 (𝕘𝕚𝕥𝕙𝕦𝕓.𝕔𝕠𝕞/ℂ𝕠𝕠𝕠𝕝) <coool@noreply.codeberg.org>
Co-authored-by: noqqyg <noqqyg@noreply.codeberg.org>
Co-authored-by: DJSweder <djsweder@noreply.codeberg.org>
Co-authored-by: m4549071758 <m4549071758@noreply.codeberg.org>
Co-authored-by: lugged9922 <lugged9922@noreply.codeberg.org>
Co-authored-by: phanh <phanh@noreply.codeberg.org>
Co-authored-by: krohnoz <krohnoz@noreply.codeberg.org>
Co-authored-by: AngryPikachu_025 <angrypikachu_025@noreply.codeberg.org>
Co-authored-by: certivian <certivian@noreply.codeberg.org>
Co-authored-by: Marly21 <marly21@noreply.codeberg.org>
Co-authored-by: OtterBotSociety <otterbotsociety@noreply.codeberg.org>
Co-authored-by: Schmitd <schmitd@noreply.codeberg.org>
Co-authored-by: mmovahedi <mmovahedi@noreply.codeberg.org>
Co-authored-by: DNArjen <dnarjen@noreply.codeberg.org>
Co-authored-by: nguyenhuy158 <nguyenhuy158@noreply.codeberg.org>
Co-authored-by: furinkazan <furinkazan@noreply.codeberg.org>
Co-authored-by: Phrotan <phrotan@noreply.codeberg.org>
Co-authored-by: TWNO1 <twno1@noreply.codeberg.org>
Co-authored-by: Troink <troink@noreply.codeberg.org>
Co-authored-by: zo3n <zo3n@noreply.codeberg.org>
Co-authored-by: manhtuanphoto <manhtuanphoto@noreply.codeberg.org>
Co-authored-by: om_Yanto <om_yanto@noreply.codeberg.org>
Co-authored-by: shanpai <shanpai@noreply.codeberg.org>
Co-authored-by: Uskonalle <uskonalle@noreply.codeberg.org>
Co-authored-by: gallegonovato <gallegonovato@noreply.codeberg.org>
Co-authored-by: jirkacapek123 <jirkacapek123@noreply.codeberg.org>
Co-authored-by: theqwertyqwert <theqwertyqwert@noreply.codeberg.org>
Co-authored-by: Ricky-Tigg <ricky-tigg@noreply.codeberg.org>
---
 .../SettingsInterfacePanel.tsx                |    5 +-
 ui/v2.5/src/locales/bg-BG.json                |   56 +
 ui/v2.5/src/locales/ca-ES.json                |    3 +-
 ui/v2.5/src/locales/cs-CZ.json                |   67 +-
 ui/v2.5/src/locales/da-DK.json                |    1 -
 ui/v2.5/src/locales/de-DE.json                |   52 +-
 ui/v2.5/src/locales/en-US.json                |   17 +-
 ui/v2.5/src/locales/es-ES.json                |    7 +-
 ui/v2.5/src/locales/et-EE.json                |   54 +-
 ui/v2.5/src/locales/fa-IR.json                |   27 +-
 ui/v2.5/src/locales/fi-FI.json                |  109 +-
 ui/v2.5/src/locales/fr-FR.json                |   43 +-
 ui/v2.5/src/locales/hr-HR.json                |  191 ++-
 ui/v2.5/src/locales/id-ID.json                |  169 ++-
 ui/v2.5/src/locales/index.ts                  |    6 +
 ui/v2.5/src/locales/it-IT.json                |    4 +-
 ui/v2.5/src/locales/ja-JP.json                |   48 +-
 ui/v2.5/src/locales/ko-KR.json                |  104 +-
 ui/v2.5/src/locales/lt-LT.json                |  112 ++
 ui/v2.5/src/locales/lv-LV.json                |   71 +-
 ui/v2.5/src/locales/nb-NO.json                | 1325 ++++++++++++++++-
 ui/v2.5/src/locales/nl-NL.json                |  181 ++-
 ui/v2.5/src/locales/nn-NO.json                |   24 +-
 ui/v2.5/src/locales/pl-PL.json                |    8 +-
 ui/v2.5/src/locales/pt-BR.json                |    1 -
 ui/v2.5/src/locales/ro-RO.json                |   52 +-
 ui/v2.5/src/locales/ru-RU.json                |  109 +-
 ui/v2.5/src/locales/sv-SE.json                |   45 +-
 ui/v2.5/src/locales/th-TH.json                |    1 -
 ui/v2.5/src/locales/tr-TR.json                |  165 +-
 ui/v2.5/src/locales/uk-UA.json                |    1 -
 ui/v2.5/src/locales/ur-PK.json                |   14 +
 ui/v2.5/src/locales/vi-VN.json                |  893 ++++++++++-
 ui/v2.5/src/locales/zh-CN.json                |   41 +-
 ui/v2.5/src/locales/zh-TW.json                |   50 +-
 35 files changed, 3739 insertions(+), 317 deletions(-)
 create mode 100644 ui/v2.5/src/locales/bg-BG.json
 create mode 100644 ui/v2.5/src/locales/lt-LT.json
 create mode 100644 ui/v2.5/src/locales/ur-PK.json

diff --git a/ui/v2.5/src/components/Settings/SettingsInterfacePanel/SettingsInterfacePanel.tsx b/ui/v2.5/src/components/Settings/SettingsInterfacePanel/SettingsInterfacePanel.tsx
index 1802fefe7..7d63f9df9 100644
--- a/ui/v2.5/src/components/Settings/SettingsInterfacePanel/SettingsInterfacePanel.tsx
+++ b/ui/v2.5/src/components/Settings/SettingsInterfacePanel/SettingsInterfacePanel.tsx
@@ -200,6 +200,7 @@ export const SettingsInterfacePanel: React.FC = PatchComponent(
             onChange={(v) => saveInterface({ language: v })}
           >
             <option value="af-ZA">Afrikaans (Preview)</option>
+            <option value="bg-BG">Bulgarian (Preview)</option>
             <option value="bn-BD">বাংলা (বাংলাদেশ) (Preview)</option>
             <option value="ca-ES">Catalan (Preview)</option>
             <option value="cs-CZ">Čeština (Česko)</option>
@@ -219,7 +220,8 @@ export const SettingsInterfacePanel: React.FC = PatchComponent(
             <option value="ja-JP">日本語 (日本)</option>
             <option value="ko-KR">한국어 (대한민국)</option>
             <option value="lv-LV">Latviešu (Preview)</option>
-            <option value="nb-NO">Norsk bokmål (Preview)</option>
+            <option value="lt-LT">Lithuanian (Preview)</option>
+            <option value="nb-NO">Norsk bokmål</option>
             <option value="nn-NO">Nynorsk (Preview)</option>
             <option value="nl-NL">Nederlands (Nederland)</option>
             <option value="pl-PL">Polski</option>
@@ -232,6 +234,7 @@ export const SettingsInterfacePanel: React.FC = PatchComponent(
             <option value="tr-TR">Türkçe (Türkiye)</option>
             <option value="th-TH">ภาษาไทย (ไทย)</option>
             <option value="uk-UA">Ukrainian (Україна)</option>
+            <option value="ur-PK">Urdu (Preview)</option>
             <option value="vi-VN">Tiếng Việt (Preview)</option>
             <option value="zh-TW">繁體中文 (台灣)</option>
             <option value="zh-CN">简体中文 (中国)</option>
diff --git a/ui/v2.5/src/locales/bg-BG.json b/ui/v2.5/src/locales/bg-BG.json
new file mode 100644
index 000000000..3f7e71f3d
--- /dev/null
+++ b/ui/v2.5/src/locales/bg-BG.json
@@ -0,0 +1,56 @@
+{
+    "actions": {
+        "add": "Добави",
+        "add_directory": "Добави Директория",
+        "add_entity": "Добави {entityType}",
+        "add_manual_date": "Добави дата ръчно",
+        "add_sub_groups": "Добави Подгрупа",
+        "add_o": "Добави О",
+        "add_play": "Добави Гледане",
+        "add_to_entity": "Добави към {entityType}",
+        "allow": "Позволи",
+        "allow_temporarily": "Позволи временно",
+        "anonymise": "Анонимизирай",
+        "apply": "Приложи",
+        "auto_tag": "Автоматично Тагване",
+        "backup": "Резервно копие",
+        "browse_for_image": "Преглеждане за картина…",
+        "cancel": "Отмяна",
+        "choose_date": "Избери дата",
+        "clean": "Изчисти",
+        "clean_generated": "Изчисти генерирани файлове",
+        "clear": "Изчисти",
+        "clear_back_image": "Изчисти задна картина",
+        "clear_date_data": "Изчисти дата на данни",
+        "clear_front_image": "Изчисти предна картина",
+        "clear_image": "Изичисти картина",
+        "close": "Затвори",
+        "confirm": "Потвърди",
+        "continue": "Продължи",
+        "copy_to_clipboard": "Копиране в буфера",
+        "create": "Създай",
+        "create_chapters": "Създай Глава",
+        "create_entity": "Създай {entityType}",
+        "create_marker": "Създай Маркер",
+        "create_parent_studio": "Създай родителско студио",
+        "created_entity": "Създаден {entity_type}: {entity_name}",
+        "customise": "Персонализирай",
+        "delete": "Изтрий",
+        "delete_entity": "Изтрий {entityType}",
+        "delete_file": "Изтрий файла",
+        "delete_file_and_funscript": "Изтрий файл (и funscript)",
+        "delete_generated_supporting_files": "Изтрий генерирани поддържащи файлове",
+        "disable": "Изключи",
+        "disallow": "Забрани",
+        "download": "Свали",
+        "download_anonymised": "Свали анонимизирана",
+        "download_backup": "Свали резевно копие",
+        "edit": "Редакция",
+        "edit_entity": "Редакция {entityType}",
+        "enable": "Активирай",
+        "encoding_image": "Кодиране на картина…",
+        "export": "Експортиране",
+        "export_all": "Експортирай всичко…",
+        "reshuffle": "Пренареди"
+    }
+}
diff --git a/ui/v2.5/src/locales/ca-ES.json b/ui/v2.5/src/locales/ca-ES.json
index 9ad457bc1..3c2452671 100644
--- a/ui/v2.5/src/locales/ca-ES.json
+++ b/ui/v2.5/src/locales/ca-ES.json
@@ -136,7 +136,8 @@
         "add_play": "Agregar reproduir",
         "add_to_entity": "Afegir a {entityType}",
         "create_entity": "Crear {entityType}",
-        "add_sub_groups": "Afegeix subgrups"
+        "add_sub_groups": "Afegeix subgrups",
+        "remove_from_containing_group": "Suprimeix del grup"
     },
     "appears_with": "Apareix amb",
     "career_length": "Durada de la carrera",
diff --git a/ui/v2.5/src/locales/cs-CZ.json b/ui/v2.5/src/locales/cs-CZ.json
index 622e57706..951c06e26 100644
--- a/ui/v2.5/src/locales/cs-CZ.json
+++ b/ui/v2.5/src/locales/cs-CZ.json
@@ -6,15 +6,15 @@
         "add_to_entity": "Přidat do {entityType}",
         "allow": "Povolit",
         "allow_temporarily": "Povolit dočasně",
-        "apply": "Potvrdit",
+        "apply": "Použít",
         "auto_tag": "Auto Tag",
         "backup": "Záloha",
         "browse_for_image": "Vybrat obrázek…",
         "cancel": "Zrušit",
         "clean": "Vyčistit",
         "clear": "Vyčistit",
-        "clear_back_image": "Vymazat zadní obrázek",
-        "clear_front_image": "Vymazat přední obrázek",
+        "clear_back_image": "Vymazat obrázek zadní strany",
+        "clear_front_image": "Vymazat obrázek přední strany",
         "clear_image": "Vymazat obrázek",
         "close": "Zavřít",
         "confirm": "Potvrdit",
@@ -106,9 +106,9 @@
         "submit_update": "Publikovat aktualizaci",
         "swap": "Prohodit",
         "tasks": {
-            "clean_confirm_message": "Jste si jistý, že chcete vyčistit databázi? Tato operace vymaže informace z databáze a generovaný obsah pro všechny scény a galerie, které se již nenacházejí v souborovém systému.",
+            "clean_confirm_message": "Chcete doopravdy provést vyčištění databáze? Tato operace vymaže informace z databáze a generovaný obsah pro všechny scény a galerie, které se již nenacházejí v souborovém systému.",
             "dry_mode_selected": "Vybrán \"Dry Mode\". Nic nebude smazáno, pouze logováno.",
-            "import_warning": "Jste si jisti, že chcete importovat? Tato operace smaže databázi a znovu importuje z Vašich exportovaných metadat."
+            "import_warning": "Chcete doopravdy provést import? Tato operace smaže databázi a znovu naimportuje Vaše exportovaná metadata."
         },
         "temp_disable": "Zakázat dočasně…",
         "temp_enable": "Povolit dočasně…",
@@ -129,9 +129,9 @@
         "assign_stashid_to_parent_studio": "Přiřaď Stash ID k existujícímu nadřazenému studiu a aktualizuj metadata",
         "choose_date": "Vyberte datum",
         "create_chapters": "Vytvořit kapitolu",
-        "clear_date_data": "Vymazat data datumu",
+        "clear_date_data": "Vymazat informace o datumech",
         "reload": "Načíst znovu",
-        "clean_generated": "Vyčistěte vygenerované soubory",
+        "clean_generated": "Vyčistit vygenerované soubory",
         "remove_date": "Odstranit datum",
         "add_manual_date": "Přidat datum ručně",
         "add_play": "Přidat přehrávání",
@@ -139,9 +139,19 @@
         "reset_cover": "Obnovit výchozí obal",
         "add_sub_groups": "Přidat podskupinu",
         "set_cover": "Nastavit jako obal",
-        "remove_from_containing_group": "Odebrat ze skupiny",
+        "remove_from_containing_group": "Odstranit ze skupiny",
         "reset_resume_time": "Obnovit čas pokračování",
-        "reset_play_duration": "Obnovit dobu přehrávání"
+        "reset_play_duration": "Obnovit dobu přehrávání",
+        "sidebar": {
+            "close": "Zavřít postranní panel",
+            "open": "Zobrazit postranní panel",
+            "toggle": "Boční panel"
+        },
+        "play": "Přehrát",
+        "show_results": "Zobrazit výsledky",
+        "show_count_results": "Zobrazit {count} výsledků",
+        "load": "Načíst",
+        "load_filter": "Načíst filtr"
     },
     "actions_name": "Akce",
     "age": "Věk",
@@ -333,7 +343,7 @@
                 "description": "Cesta ke spustitelnému souboru pythonu (nejen ke složce). Používá se pro script scrappery a pluginy. Pokud je prázdné, python bude vyřešen z prostředí",
                 "heading": "Cesta k Pythonu"
             },
-            "scraper_user_agent": "Scraper User Agent",
+            "scraper_user_agent": "User Agent Scraperu",
             "scraper_user_agent_desc": "User-Agent řetězec používaný při scrapování http požadavků",
             "scrapers_path": {
                 "description": "Adresář konfiguračních souborů scraperů",
@@ -435,7 +445,9 @@
             "endpoint": "Koncový bod",
             "graphql_endpoint": "Koncový bod GraphQL",
             "name": "Název",
-            "title": "Stash-box Endpointy"
+            "title": "Stash-box Endpointy",
+            "max_requests_per_minute": "Maximální počet dotazů za minutu",
+            "max_requests_per_minute_description": "Používá základní hodnotu {defaultValue} pokud je nastaven na 0"
         },
         "system": {
             "transcoding": "Překódování"
@@ -561,7 +573,9 @@
                 "whitespace_chars": "Whitespace znaky",
                 "whitespace_chars_desc": "Tyto znaky v názvu budou nahrazeny prázdným znakem (mezerou)"
             },
-            "scene_tools": "Nástroje pro scény"
+            "scene_tools": "Nástroje pro scény",
+            "graphql_playground": "GraphQL hřiště",
+            "heading": "Nástroje"
         },
         "ui": {
             "abbreviate_counters": {
@@ -710,7 +724,7 @@
                         "heading": "Automaticky spustit video při přehrávání vybraného"
                     },
                     "continue_playlist_default": {
-                        "description": "Přehrát následující scénu na seznamu při skončení vida",
+                        "description": "Přehrát následující scénu na seznamu při skončení videa",
                         "heading": "(Výchozí nastavení) Pokračovat v playlistu"
                     },
                     "show_scrubber": "Zobrazit Scrubber",
@@ -840,12 +854,12 @@
     "developmentVersion": "Vývojářská verze",
     "dialogs": {
         "delete_alert": "Následující {count, plural, one {{singularEntity}} other {{pluralEntity}}} budou permanentně smazány:",
-        "delete_confirm": "Jste si jisti, že chcete smazat {entityName}?",
-        "delete_entity_desc": "{count, plural, one {Jste si jisti, že checete smazat toto {singularEntity}? Pokud není soubor rovněž smazán, tato {singularEntity} bude znovu přidána při příštím skenování.} other {Jste si jisti, že chcete smazat tyto {pluralEntity}? Pokud nejsou soubory rovněž smazány, tyto {pluralEntity} budou znovu přidány při příštím skenování.}}",
+        "delete_confirm": "Chcete doopravdy smazat {entityName}?",
+        "delete_entity_desc": "{count, plural, one {Doopravdy chcete smazat {singularEntity}? Pokud nebude smazán i soubor, {singularEntity} bude znovu přidán při příštím skenování.} other {Doopravdy chcete smazat tyto {pluralEntity}? Pokud nebudou smazány i soubory, tyto {pluralEntity} budou znovu přidány při příštím skenování.}}",
         "delete_entity_title": "{count, plural, one {Smazat {singularEntity}} other {Smazat {pluralEntity}}}",
         "delete_galleries_extra": "…navíc všechny obrazové soubory, které nejsou připojeny k žádné jiné galerii.",
         "delete_gallery_files": "Smazat složku galerie/zip soubor a jakékoliv obrázky nenapojené na jinou galerii.",
-        "delete_object_desc": "Jste si jisti, že chcete smazat {count, plural, one {tuto {singularEntity}} other {tyto {pluralEntity}}}?",
+        "delete_object_desc": "Doopravdy chcete smazat {count, plural, one {{singularEntity}} other {tyto {pluralEntity}}}?",
         "delete_object_overflow": "…a {count} other {count, plural, one {{singularEntity}} other {{pluralEntity}}}.",
         "delete_object_title": "Smazat {count, plural, one {{singularEntity}} other {{pluralEntity}}}",
         "dont_show_until_updated": "Skrýt do příští aktualizace",
@@ -878,7 +892,6 @@
             "destination": "Cíl",
             "source": "Zdroj"
         },
-        "overwrite_filter_confirm": "JSte si jisti, že chcete přepsat aktuálně uložený dotaz {entityName}?",
         "scene_gen": {
             "force_transcodes": "Vynutit generování Transkódu",
             "force_transcodes_tooltip": "Ve výchozím nastavení, transkódy jsou generovány pouze tehdy, když video soubor není podporován prohlížečem. V případě aktivování, transkódy budou generovány i v ostatních případech.",
@@ -946,7 +959,9 @@
         "clear_o_history_confirm": "Opravdu chcete vymazat historii O?",
         "clear_play_history_confirm": "Opravdu chcete vymazat historii přehrávání?",
         "delete_entity_simple_desc": "{count, plural, one {Opravdu chcete smazat tuto {singularEntity}?} other {Opravdu chcete smazat tyto {pluralEntity}?}}",
-        "performers_found": "{count} nalezených účinkujících"
+        "performers_found": "{count} nalezených účinkujících",
+        "overwrite_filter_warning": "Uložený filtr \"{entityName}\" bude přepsán.",
+        "set_default_filter_confirm": "Chcete doopravdy nastavit tento filtr jako výchozí?"
     },
     "chapters": "Kapitoly",
     "circumcised": "Obřezán",
@@ -1012,7 +1027,8 @@
         "grid": "Mřížka",
         "tagger": "Tagger",
         "wall": "Stěna",
-        "unknown": "Neznámý"
+        "unknown": "Neznámý",
+        "label_current": "Mód zobrazení: {current}"
     },
     "effect_filters": {
         "aspect": "Aspekt",
@@ -1315,7 +1331,9 @@
         "saved_filters": "Uložené filtry",
         "update_filter": "Aktualizovat filtr",
         "edit_filter": "Upravit filtr",
-        "name": "Filtr"
+        "name": "Filtr",
+        "more_filter_criteria": "+{count} navíc",
+        "search_term": "Hledaný výraz"
     },
     "ethnicity": "Etnická příslušnost",
     "existing_value": "Existujicí hodnota",
@@ -1522,5 +1540,12 @@
     },
     "age_on_date": "{age} během produkce",
     "sort_name": "Seřadit jména",
-    "eta": "Přibližný čas dokončení"
+    "eta": "Přibližný čas dokončení",
+    "login": {
+        "password": "Heslo",
+        "invalid_credentials": "Neplatné uživatelské jméno nebo heslo",
+        "login": "Přihlášení",
+        "username": "Uživatelské jméno",
+        "internal_error": "Neočekávaná interní chyba. Podívej se do logu pro více detailů"
+    }
 }
diff --git a/ui/v2.5/src/locales/da-DK.json b/ui/v2.5/src/locales/da-DK.json
index 033f1896e..bdb60fe67 100644
--- a/ui/v2.5/src/locales/da-DK.json
+++ b/ui/v2.5/src/locales/da-DK.json
@@ -821,7 +821,6 @@
             "destination": "Destination",
             "source": "Kilde"
         },
-        "overwrite_filter_confirm": "Er du sikker på, at du vil overskrive eksisterende gemte forespørgsel {entityName}?",
         "scene_gen": {
             "force_transcodes": "Tving omkodningsgenerering",
             "force_transcodes_tooltip": "Som standard genereres omkoder kun, når videofilen ikke understøttes i browseren. Når det er aktiveret, genereres omkoder, selv når videofilen ser ud til at være understøttet i browseren.",
diff --git a/ui/v2.5/src/locales/de-DE.json b/ui/v2.5/src/locales/de-DE.json
index df7d089db..045cd46e3 100644
--- a/ui/v2.5/src/locales/de-DE.json
+++ b/ui/v2.5/src/locales/de-DE.json
@@ -141,7 +141,17 @@
         "remove_from_containing_group": "Von Gruppe entfernen",
         "reset_play_duration": "Spieldauer zurücksetzten",
         "reset_resume_time": "Fortschritt zurücksetzten",
-        "add_sub_groups": "Untergruppen hinzufügen"
+        "add_sub_groups": "Untergruppen hinzufügen",
+        "play": "Abspielen",
+        "sidebar": {
+            "toggle": "Seitenleiste umschalten",
+            "close": "Seitenleiste schließen",
+            "open": "Seitenleiste öffnen"
+        },
+        "show_count_results": "Zeige {count} Ergebnisse",
+        "show_results": "Ergebnisse anzeigen",
+        "load_filter": "Filter laden",
+        "load": "Laden"
     },
     "actions_name": "Aktionen",
     "age": "Alter",
@@ -446,7 +456,9 @@
             "endpoint": "Endpunkt",
             "graphql_endpoint": "GraphQL-Endpunkt",
             "name": "Name",
-            "title": "Stash-Box-Endpunkte"
+            "title": "Stash-Box-Endpunkte",
+            "max_requests_per_minute": "Max requests pro Minute",
+            "max_requests_per_minute_description": "Verwendet default Wert  {defaultValue} wenn auf 0 gesetzt"
         },
         "system": {
             "transcoding": "Transcodierung"
@@ -572,7 +584,9 @@
                 "whitespace_chars": "Zwischenraumzeichen",
                 "whitespace_chars_desc": "Diese Zeichen werden im Titel durch Zwischenraumzeichen ersetzt"
             },
-            "scene_tools": "Szenen-Tools"
+            "scene_tools": "Szenen-Tools",
+            "heading": "Werkzeuge",
+            "graphql_playground": "GraphQL-Spielplatz"
         },
         "ui": {
             "abbreviate_counters": {
@@ -737,7 +751,8 @@
                     },
                     "show_ab_loop_controls": "Die Steuerungselemente des AB-Loop-Plugins anzeigen",
                     "disable_mobile_media_auto_rotate": "Deaktiviere das automatische Drehen von Vollbildmedien auf Mobilgeräten",
-                    "enable_chromecast": "Chromecast aktivieren"
+                    "enable_chromecast": "Chromecast aktivieren",
+                    "show_range_markers": "Zeige Range der Markierungen"
                 }
             },
             "scene_wall": {
@@ -905,7 +920,6 @@
             "destination": "Ziel",
             "source": "Quelle"
         },
-        "overwrite_filter_confirm": "Möchten Sie die vorhandene gespeicherte Anfrage {entityName} wirklich überschreiben?",
         "reassign_entity_title": "{count, plural, one {Weise {singularEntity} neu zu} other {Weise {pluralEntity} neu zu}}}",
         "reassign_files": {
             "destination": "Neu zuweisen an"
@@ -958,7 +972,9 @@
         "unsaved_changes": "Nicht gespeicherte Änderungen. Bist du sicher dass du die Seite verlassen willst?",
         "clear_play_history_confirm": "Bist du sicher, dass du den Wiedergabeverlauf löschen möchtest?",
         "performers_found": "{count} Darsteller:innen gefunden",
-        "clear_o_history_confirm": "Möchten Sie wirklich den O-Verlauf löschen?"
+        "clear_o_history_confirm": "Möchten Sie wirklich den O-Verlauf löschen?",
+        "overwrite_filter_warning": "Der gespeicherte Filter \"{entityName}\" wird überschrieben.",
+        "set_default_filter_confirm": "Sind Sie sicher, dass Sie diesen Filter als Standard festlegen möchten?"
     },
     "dimensions": "Maße",
     "director": "Regisseur",
@@ -968,7 +984,8 @@
         "list": "Liste",
         "tagger": "Tagger",
         "unknown": "Unbekannt",
-        "wall": "Wand"
+        "wall": "Wand",
+        "label_current": "Anzeigemodus: {current}"
     },
     "donate": "Spenden",
     "dupe_check": {
@@ -1115,7 +1132,7 @@
         "interactive_speed": "Interaktive Geschwindigkeit",
         "performer_card": {
             "age": "{age} {years_old}",
-            "age_context": "{age} {years_old} in dieser Szene"
+            "age_context": "{age} {years_old} bei der Produktion"
         },
         "phash": "PHashwert",
         "play_count": "Anzahl Wiedergaben",
@@ -1218,7 +1235,9 @@
         "edit_filter": "Filter editieren",
         "name": "Filter",
         "saved_filters": "Gespeicherte Filter",
-        "update_filter": "Filter aktualisieren"
+        "update_filter": "Filter aktualisieren",
+        "more_filter_criteria": "+{count} mehr",
+        "search_term": "Suchbegriff"
     },
     "second": "Sekunde",
     "seconds": "Sekunden",
@@ -1484,7 +1503,9 @@
     "custom_fields": {
         "title": "Benutzerdefinierte Felder",
         "value": "Wert",
-        "field": "Feld"
+        "field": "Feld",
+        "criteria_format_string": "{criterion} (custom field) {modifierString} {valueString}",
+        "criteria_format_string_others": "{criterion} (custom field) {modifierString} {valueString} (+{others} others)"
     },
     "distance": "Distanz",
     "group_count": "Gruppenanzahl",
@@ -1517,5 +1538,14 @@
     "tag_sub_tag_tooltip": "Hat Untertags",
     "include_sub_groups": "Untergruppen einbeziehen",
     "studio_and_parent": "Studio & Mutterstudio",
-    "eta": "Edited to add"
+    "eta": "Edited to add",
+    "login": {
+        "login": "Login",
+        "internal_error": "Unvorhergesehener interner Fehler. Weitere Details in den Logs",
+        "password": "Passwort",
+        "invalid_credentials": "Ungültiger Nutzername oder Passwort",
+        "username": "Benutzername"
+    },
+    "age_on_date": "bei Produktion",
+    "sort_name": "Namen sortieren"
 }
diff --git a/ui/v2.5/src/locales/en-US.json b/ui/v2.5/src/locales/en-US.json
index 1f4f31fc5..7d730601c 100644
--- a/ui/v2.5/src/locales/en-US.json
+++ b/ui/v2.5/src/locales/en-US.json
@@ -1,13 +1,9 @@
 {
     "actions": {
+        "anonymise": "Anonymize",
+        "download_anonymised": "Download anonymized",
         "customise": "Customize",
-        "add_sub_groups": "Add Sub-Groups",
-        "add": "Add",
-        "add_directory": "Add Directory",
-        "add_entity": "Add {entityType}",
-        "add_manual_date": "Add manual date",
-        "add_o": "Add O",
-        "add_play": "Add play"
+        "optimise_database": "Optimize Database"
     },
     "config": {
         "tools": {
@@ -26,5 +22,10 @@
     "favourite": "Favorite",
     "hair_color": "Hair Color",
     "organized": "Organized",
-    "performer_favorite": "Performer Favorited"
+    "performer_favorite": "Performer Favorited",
+    "component_tagger": {
+        "config": {
+            "mark_organized_label": "Mark as Organized on save"
+        }
+    }
 }
diff --git a/ui/v2.5/src/locales/es-ES.json b/ui/v2.5/src/locales/es-ES.json
index d9585f46e..3fd9ef089 100644
--- a/ui/v2.5/src/locales/es-ES.json
+++ b/ui/v2.5/src/locales/es-ES.json
@@ -138,7 +138,11 @@
         "view_history": "Ver historial",
         "add_sub_groups": "Añadir subgrupos",
         "remove_from_containing_group": "Eliminar del grupo",
-        "reset_play_duration": "Reiniciar la duración de la reproducción"
+        "reset_play_duration": "Reiniciar la duración de la reproducción",
+        "load": "Cargar",
+        "load_filter": "Cargar el filtro",
+        "play": "Jugar",
+        "reset_resume_time": "Restablecer el tiempo de reanudación"
     },
     "actions_name": "Acciones",
     "age": "Edad",
@@ -874,7 +878,6 @@
             "destination": "Destino",
             "source": "Fuente"
         },
-        "overwrite_filter_confirm": "¿Estás seguro de sobreescribir la consulta guardada {entityName}?",
         "scene_gen": {
             "force_transcodes": "Forzar generación de transcodificación",
             "force_transcodes_tooltip": "Por defecto las transcodificaciones son solo generadas cuando el archivo de vídeo no es soportado por el navegador. Cuando están habilitadas, las transcodificaciones se generarán incluso cuando el fichero de vídeo sea soportado por el navegador.",
diff --git a/ui/v2.5/src/locales/et-EE.json b/ui/v2.5/src/locales/et-EE.json
index 0a6173691..d835e54bc 100644
--- a/ui/v2.5/src/locales/et-EE.json
+++ b/ui/v2.5/src/locales/et-EE.json
@@ -141,7 +141,17 @@
         "add_play": "Lisa mängimine",
         "clear_date_data": "Eemalda kuupäeva andmed",
         "view_history": "Vaata ajalugu",
-        "remove_from_containing_group": "Eemalda Grupist"
+        "remove_from_containing_group": "Eemalda Grupist",
+        "sidebar": {
+            "open": "Ava külgriba",
+            "close": "Sulge külgriba",
+            "toggle": "Lülita külgriba sisse/välja"
+        },
+        "play": "Esita",
+        "show_results": "Näita tulemusi",
+        "show_count_results": "Näita {count} tulemust",
+        "load": "Lae",
+        "load_filter": "Lae filter"
     },
     "actions_name": "Tegevused",
     "age": "Vanus",
@@ -441,7 +451,9 @@
             "endpoint": "Lõpp-punkt",
             "graphql_endpoint": "GraphQL lõpp-punkt",
             "name": "Nimi",
-            "title": "Stash-kasti Lõpp-punktid"
+            "title": "Stash-kasti Lõpp-punktid",
+            "max_requests_per_minute": "Maksimaalne arv päringuid minutis",
+            "max_requests_per_minute_description": "Kasutab vaikimisi väärtust {defaultValue}, kui on 0"
         },
         "system": {
             "transcoding": "Ümbertöötlemine"
@@ -567,7 +579,9 @@
                 "whitespace_chars": "Tühikumärgid",
                 "whitespace_chars_desc": "Need märgid asendatakse pealkirjas tühikutega"
             },
-            "scene_tools": "Stseeni Tööriistad"
+            "scene_tools": "Stseeni Tööriistad",
+            "graphql_playground": "GraphQL mänguplats",
+            "heading": "Tööriistad"
         },
         "ui": {
             "abbreviate_counters": {
@@ -732,7 +746,8 @@
                     "vr_tag": {
                         "description": "VR-nupp kuvatakse ainult selle sildiga stseenide puhul.",
                         "heading": "VR Silt"
-                    }
+                    },
+                    "show_range_markers": "Näita Vahemiku Märke"
                 }
             },
             "scene_wall": {
@@ -900,7 +915,6 @@
             "destination": "Sihtkoht",
             "source": "Allikas"
         },
-        "overwrite_filter_confirm": "Oled kindel, et tahad üle kirjutada juba eksisteerivat päringut {entityName}?",
         "reassign_entity_title": "{count, plural, one {Määra Ümber {singularEntity}} other {Määra Ümber {pluralEntity}-d/id}}",
         "reassign_files": {
             "destination": "Määra Ümber"
@@ -953,7 +967,9 @@
         "unsaved_changes": "Salvestamata muudatused. Kas soovid kindlasti lahkuda?",
         "performers_found": "Leiti {count} esinejat",
         "clear_o_history_confirm": "Kas oled kindel, et soovid puhastada O ajaloo?",
-        "clear_play_history_confirm": "Kas oled kindel, et soovid puhastada vaatamise ajaloo?"
+        "clear_play_history_confirm": "Kas oled kindel, et soovid puhastada vaatamise ajaloo?",
+        "set_default_filter_confirm": "Kas oled kindel, et soovid määrata seda filtrit vaikimisi valikuks?",
+        "overwrite_filter_warning": "Salvestatud filter \"{entityName}\" kirjutatakse üle."
     },
     "dimensions": "Dimensioonid",
     "director": "Režissöör",
@@ -963,7 +979,8 @@
         "list": "Nimekiri",
         "tagger": "Sildistaja",
         "unknown": "Teadmata",
-        "wall": "Sein"
+        "wall": "Sein",
+        "label_current": "Kuvarežiim: {current}"
     },
     "donate": "Anneta",
     "dupe_check": {
@@ -1047,7 +1064,7 @@
     "filters": "Filtrid",
     "folder": "Kaust",
     "framerate": "Kaadrisagedus",
-    "frames_per_second": "{value} fps",
+    "frames_per_second": "{value} kaadrit sekundis",
     "front_page": {
         "types": {
             "premade_filter": "Eelsätestatud Filter",
@@ -1110,7 +1127,7 @@
         "interactive_speed": "Interaktiivne kiirus",
         "performer_card": {
             "age": "{age} {years_old}",
-            "age_context": "{age} selles stseenis {years_old}"
+            "age_context": "{age} {years_old} filmimisel"
         },
         "phash": "PHash",
         "play_count": "Esituste Arv",
@@ -1210,7 +1227,9 @@
         "edit_filter": "Muuda Filtrit",
         "name": "Filter",
         "saved_filters": "Salvestatud filtrid",
-        "update_filter": "Uuenda Filtrit"
+        "update_filter": "Uuenda Filtrit",
+        "more_filter_criteria": "+{count} rohkem",
+        "search_term": "Otsi sõnet"
     },
     "second": "Sekund",
     "seconds": "Sekundit",
@@ -1515,7 +1534,18 @@
     "custom_fields": {
         "field": "Väli",
         "title": "Kohandatud Väli",
-        "value": "Väärtus"
+        "value": "Väärtus",
+        "criteria_format_string_others": "{criterion} (kohandatud väli) {modifierString} {valueString} (+{others} teist)",
+        "criteria_format_string": "{criterion} (kohandatud väli) {modifierString} {valueString}"
     },
-    "eta": "ETA"
+    "eta": "ETA",
+    "login": {
+        "username": "Kasutajanimi",
+        "password": "Parool",
+        "internal_error": "Ootamatu sisemine viga. Vaata logisid rohkemate detailide jaoks",
+        "invalid_credentials": "Vale kasutajanimi või parool",
+        "login": "Logi Sisse"
+    },
+    "age_on_date": "{age} filmimisel",
+    "sort_name": "Sorteeritud Nimi"
 }
diff --git a/ui/v2.5/src/locales/fa-IR.json b/ui/v2.5/src/locales/fa-IR.json
index ed9914f98..25a57a44c 100644
--- a/ui/v2.5/src/locales/fa-IR.json
+++ b/ui/v2.5/src/locales/fa-IR.json
@@ -5,6 +5,31 @@
         "add_entity": "افزودن {entityType}",
         "add_to_entity": "اضافه‌کردن به {entityType}",
         "allow": "اجازه دادن",
-        "allow_temporarily": "به طور موقت اجازه دهید"
+        "allow_temporarily": "موقتا اجازه دهید",
+        "add_sub_groups": "افزودن زیرگروه",
+        "browse_for_image": "پیدا کردن عکس…",
+        "cancel": "لغو",
+        "choose_date": "انتخاب تاریخ",
+        "clean": "پاکسازی",
+        "create_entity": "ایجاد {entityType}",
+        "add_manual_date": "افزودن دستی تاریخ",
+        "add_play": "افزودن نمایش",
+        "apply": "اعمال",
+        "backup": "پشتیبان گیری",
+        "auto_tag": "تگ زدن خودکار",
+        "clear_front_image": "پاک کردن عکس جلویی",
+        "clean_generated": "پاکسازی فایل های تولید شده",
+        "clear": "پاک کردن",
+        "clear_back_image": "پاک کردن عکس پشتی",
+        "clear_date_data": "پاک کردن دیتای تاریخ",
+        "clear_image": "پاک کردن عکس",
+        "close": "بستن",
+        "confirm": "تایید",
+        "continue": "ادامه",
+        "copy_to_clipboard": "کپی به کلیپبورد",
+        "create": "ایجاد",
+        "create_parent_studio": "ایجاد استادیو والد",
+        "anonymise": "بی نام کردن",
+        "create_chapters": "ایجاد فصل"
     }
 }
diff --git a/ui/v2.5/src/locales/fi-FI.json b/ui/v2.5/src/locales/fi-FI.json
index f90e06076..d1636230b 100644
--- a/ui/v2.5/src/locales/fi-FI.json
+++ b/ui/v2.5/src/locales/fi-FI.json
@@ -141,7 +141,17 @@
         "add_sub_groups": "Lisää aliryhmiä",
         "migrate_blobs": "Siirrä blobit",
         "migrate_scene_screenshots": "Siirrä kohtauksen kuvakaappaukset",
-        "reset_play_duration": "Nollaa toiston kesto"
+        "reset_play_duration": "Nollaa toiston kesto",
+        "load": "Ladataan",
+        "load_filter": "Lataa filtteri",
+        "play": "Toista",
+        "show_results": "Näytä tulokset",
+        "show_count_results": "Näytä {count} tulosta",
+        "sidebar": {
+            "close": "Sulje sivupalkki",
+            "open": "Avaa sivupalkki",
+            "toggle": "näytä/piilota sivupalkki"
+        }
     },
     "actions_name": "Toiminnot",
     "age": "Ikä",
@@ -367,10 +377,12 @@
                 },
                 "transcode": {
                     "output_args": {
-                        "desc": "Edistynyt: Lisäargumentit, jotka välitetään ffmpegille ennen tuloskenttää videota luotaessa."
+                        "desc": "Edistynyt: Lisäargumentit, jotka välitetään ffmpegille ennen tuloskenttää videota luotaessa.",
+                        "heading": "FFmpeg:n muunnoksen ulostuloparametrit"
                     },
                     "input_args": {
-                        "desc": "Edistynyt: Lisäargumentit, jotka välitetään ffmpegille ennen syöttökenttää videota luotaessa."
+                        "desc": "Edistynyt: Lisäargumentit, jotka välitetään ffmpegille ennen syöttökenttää videota luotaessa.",
+                        "heading": "FFmpeg:n muunnoksen syöteparametrit"
                     }
                 },
                 "ffmpeg_path": {
@@ -383,10 +395,12 @@
                 },
                 "live_transcode": {
                     "input_args": {
-                        "desc": "Edistynyt: Lisäargumentit, jotka välitetään ffmpegille ennen syöttökenttää, kun videota muutetaan livenä."
+                        "desc": "Edistynyt: Lisäargumentit, jotka välitetään ffmpegille ennen syöttökenttää, kun videota muutetaan livenä.",
+                        "heading": "FFmpeg:n live-muunnoksen syöteparametrit"
                     },
                     "output_args": {
-                        "desc": "Edistynyt: Lisäargumentit, jotka siirretään ffmpegille ennen lähtökenttää, kun videota muutetaan livenä."
+                        "desc": "Edistynyt: Lisäargumentit, jotka siirretään ffmpegille ennen lähtökenttää, kun videota muutetaan livenä.",
+                        "heading": "FFmpeg:n live-muunnoksen ulostuloparametrit"
                     }
                 }
             },
@@ -405,7 +419,8 @@
             "funscript_heatmap_draw_range_desc": "Piirrä liikealue generoidun lämpökartan y-akselille. Olemassa olevat lämpökartat on luotava uudelleen vaihtamisen jälkeen.",
             "funscript_heatmap_draw_range": "Sisällytä alue luotuihin lämpökarttoihin",
             "gallery_cover_regex_desc": "Regexp käytetään kuvaamaan gallerian kansikuvaa",
-            "gallery_cover_regex_label": "Gallerian kansikuvio"
+            "gallery_cover_regex_label": "Gallerian kansikuvio",
+            "heatmap_generation": "Funscript-lämpökarttageneraattori"
         },
         "library": {
             "exclusions": "Poisjättäminen",
@@ -435,7 +450,9 @@
             "endpoint": "Päätepiste",
             "graphql_endpoint": "GraphQL päätepiste",
             "name": "Nimi",
-            "title": "Stash-box päätepisteet"
+            "title": "Stash-box päätepisteet",
+            "max_requests_per_minute": "Enimmäispyynnöt minuutissa",
+            "max_requests_per_minute_description": "Käyttää oletusarvoa {defaultValue}, jos se on asetettu 0:ksi"
         },
         "system": {
             "transcoding": "Transkoodaus"
@@ -491,14 +508,21 @@
                 "sources": "Lähteet",
                 "strategy": "Strategia",
                 "skip_multiple_matches": "Ohita vastaavat, joilla on useampi kuin yksi tulos",
-                "skip_multiple_matches_tooltip": "Jos tämä ei ole otettu käyttöön ja palautetaan useampi kuin yksi tulos, yksi valitaan satunnaisesti vastaamaan"
+                "skip_multiple_matches_tooltip": "Jos tämä ei ole otettu käyttöön ja palautetaan useampi kuin yksi tulos, yksi valitaan satunnaisesti vastaamaan",
+                "skip_single_name_performers": "Ohita yksinimiset esiintyjät ilman tarkennusta",
+                "skip_single_name_performers_tooltip": "Jos tämä ei ole käytössä, usein geneeriset esiintyjät kuten Samantha tai Olga yhdistetään",
+                "tag_skipped_matches": "Merkitse ohitetut osumat seuraavalla",
+                "tag_skipped_matches_tooltip": "Luo tunniste, kuten 'Tunnista: Useita osumia', jota voit suodattaa Scene Tagger -näkymässä ja valita oikean osuman käsin",
+                "tag_skipped_performer_tooltip": "Luo tunniste, kuten 'Identify: Single Name Performer', jota voit suodattaa Scene Tagger -näkymässä ja valita, miten haluat käsitellä näitä esiintyjiä",
+                "tag_skipped_performers": "Merkitse ohitetut esiintyjät seuraavalla"
             },
             "import_from_exported_json": "Tuo viedystä JSON -tiedoista, jotka ovat samassa kansiossa kuin metadata. Pyyhkii olemassaolevan tietokannan.",
             "incremental_import": "Lisäävä tuonti valitusta zip -tiedostosta.",
             "job_queue": "Tehtäväjono",
             "maintenance": "Ylläpito",
             "migrate_blobs": {
-                "delete_old": "Poista vanhat tiedot"
+                "delete_old": "Poista vanhat tiedot",
+                "description": "Siirrä blobit nykyiseen blob-tallennusjärjestelmään. Tämä siirto tulisi suorittaa blob-tallennusjärjestelmän vaihdon jälkeen. Vanhojen tietojen poistaminen siirron jälkeen on valinnainen."
             },
             "migrate_hash_files": "Käytetään kun muutetaan generoitua tiedoston nimeämistiivistettä jo generoitujen tiedostojen uudelleennimeämiseen uuteen muotoon.",
             "migrations": "Migraatiot",
@@ -516,12 +540,26 @@
                 "previews_desc": "Kohtauksien esikatselut ja pienoiskuvat",
                 "blob_files": "Blob-tiedostot",
                 "description": "Poistaa luodut tiedostot ilman vastaavaa tietokantatietuetta.",
-                "image_thumbnails": "Kuvien pikkukuvat"
+                "image_thumbnails": "Kuvien pikkukuvat",
+                "image_thumbnails_desc": "Kuvien pikkukuvat ja pätkät",
+                "sprites": "Kohtauksien sprite-kuvat",
+                "transcodes": "Kohtauksien muunnokset"
             },
             "anonymising_database": "Anonymisoidaan tietokantaa",
             "anonymise_database": "Tekee kopion tietokannasta varmuuskopioiden hakemistoon anonymisoimalla kaikki arkaluontoiset tiedot. Tämä voidaan sitten tarjota muille vianmääritys- ja viankorjaustarkoituksiin. Alkuperäistä tietokantaa ei ole muokattu. Anonymisoitu tietokanta käyttää tiedostonimimuotoa {filename_format}.",
             "generate_sprites_during_scan_tooltip": "Videosoittimen alla näkyvät kuvat navigoinnin helpottamiseksi.",
-            "generate_video_covers_during_scan": "Luo kohtausten kannet"
+            "generate_video_covers_during_scan": "Luo kohtausten kannet",
+            "generate_clip_previews_during_scan": "Luo esikatselukuvat kuvaklippejä varten",
+            "generate_sprites_during_scan": "Luo pyyhkijän kuvasarjat",
+            "migrate_scene_screenshots": {
+                "delete_files": "Poista näyttötallenteiden tiedostot",
+                "description": "Siirrä kohtauksen näyttökuvat uuteen blob-tallennusjärjestelmään. Tämä siirto tulisi suorittaa olemassa olevan järjestelmän päivittämisen jälkeen versioon 0.20. Vanhojen näyttökuvien poistaminen siirron jälkeen on valinnainen.",
+                "overwrite_existing": "Korvaa olemassa olevat blobit näyttötallennetiedoilla"
+            },
+            "optimise_database": "Yritä parantaa suorituskykyä analysoimalla ja koko tietokantatiedoston uudelleen rakentamalla.",
+            "optimise_database_warning": "Varoitus: tämän tehtävän ollessa käynnissä kaikki tietokantaa muokkaavat toiminnot epäonnistuvat, ja tietokannan koosta riippuen suoritus voi kestää useita minuutteja. Tarvitset lisäksi vähintään yhtä paljon vapaata levytilaa kuin tietokantasi koko on, mutta 1,5-kertainen määrä on suositeltavaa.",
+            "rescan": "Uudelleenskannaa tiedostot",
+            "rescan_tooltip": "Uudelleenskannaa kaikki tiedostot polussa. Käytetään tiedoston metatietojen pakolliseen päivitykseen ja zip-tiedostojen uudelleenskannaukseen."
         },
         "tools": {
             "scene_duplicate_checker": "Kohtauksien kaksoiskappaleiden tarkistus",
@@ -533,9 +571,16 @@
                 "ignore_organized": "Jätä järjestellyt kohtaukset huomiotta",
                 "ignored_words": "Huomiotta jätetyt sanat",
                 "matches_with": "Täsmää seuraavan kanssa {i}",
-                "whitespace_chars_desc": "Nämä merkit korvataan välilyönnillä otsikossa"
+                "whitespace_chars_desc": "Nämä merkit korvataan välilyönnillä otsikossa",
+                "escape_chars": "Käytä \\ merkin edessä, kun haluat käsitellä merkin kirjaimellisena merkkinä",
+                "filename_pattern": "Tiedostonimen malli",
+                "select_parser_recipe": "Valitse jäsentämisen ohjeistus, joka määrittää tiedon purkamisen ja käsittelyn",
+                "title": "Kohteen tiedostonimen jäsentäjä",
+                "whitespace_chars": "välilyöntimerkit"
             },
-            "scene_tools": "Kohtauksen työkalut"
+            "scene_tools": "Kohtauksen työkalut",
+            "graphql_playground": "GraphQL-kokeiluympäristö",
+            "heading": "Työkalut"
         },
         "ui": {
             "basic_settings": "Perusasetukset",
@@ -551,7 +596,8 @@
             },
             "custom_locales": {
                 "heading": "Mukautettu lokalisointi",
-                "option_label": "Mukautettu lokalisointi käytössä"
+                "option_label": "Mukautettu lokalisointi käytössä",
+                "description": "Ylikirjoita yksittäisiä paikallisia merkkijonoja. Katso https://github.com/stashapp/stash/blob/develop/ui/v2.5/src/locales/en-GB.json master-lista. Sivun lataus on tehtävä uudelleen, jotta muutokset tulevat voimaan."
             },
             "delete_options": {
                 "description": "Oletusasetukset kun poistetaan kuvia, gallerioita ja kohtauksia.",
@@ -580,7 +626,8 @@
                         "options": {
                             "full": "Kokonainen",
                             "half": "Puolikas",
-                            "quarter": "Neljäsosa"
+                            "quarter": "Neljäsosa",
+                            "tenth": "Kymmenes"
                         }
                     },
                     "type": {
@@ -590,6 +637,9 @@
                             "stars": "Tähdet"
                         }
                     }
+                },
+                "max_options_shown": {
+                    "label": "Valintavalikoissa näytettävien kohteiden enimmäismäärä"
                 }
             },
             "funscript_offset": {
@@ -687,13 +737,33 @@
                     }
                 }
             },
-            "title": "Käyttöliittymä"
+            "title": "Käyttöliittymä",
+            "abbreviate_counters": {
+                "description": "Lyhennä lukujen esitystapaa korteissa ja yksityiskohtien näkymissä, esimerkiksi luku \"1831\" esitetään muodossa \"1,8K\".",
+                "heading": "Lukujen esitysmuodon lyhentäminen"
+            },
+            "detail": {
+                "compact_expanded_details": {
+                    "description": "Kun tämä asetus on otettu käyttöön, se näyttää laajennetut tiedot säilyttäen samalla kompaktin esityksen.",
+                    "heading": "Tiivistetyt laajennetut tiedot"
+                },
+                "enable_background_image": {
+                    "description": "Näytä taustakuva yksityiskohtasivulla.",
+                    "heading": "Ota taustakuva käyttöön"
+                },
+                "heading": "Lisätietosivu",
+                "show_all_details": {
+                    "description": "Kun tämä on otettu käyttöön, kaikki sisällön tiedot näytetään oletuksena ja jokainen tietoelementti mahtuu yhden sarakkeen alle.",
+                    "heading": "Näytä kaikki tiedot"
+                }
+            }
         },
         "advanced_mode": "Edistynyt tila",
         "plugins": {
             "installed_plugins": "Asennetut lisäosat",
             "available_plugins": "Saatavilla olevat liitännäiset",
-            "hooks": "Koukut"
+            "hooks": "Koukut",
+            "triggers_on": "Aktivoituu kun"
         }
     },
     "configuration": "Konfiguraatio",
@@ -784,7 +854,6 @@
             "destination": "Kohde",
             "source": "Lähde"
         },
-        "overwrite_filter_confirm": "Haluatko varmasti ylikirjoittaa jo olemassaolevan {entityName}?",
         "scene_gen": {
             "force_transcodes": "Pakota transkoodaus",
             "force_transcodes_tooltip": "Oletuksena transkoodaus tehdään vain, mikäli selain ei tue videotiedostoa. Jos tämä valinta on päällä, transkoodaus tehdään vaikka selain näyttäisi tukevan videotiedostoa.",
@@ -793,7 +862,7 @@
             "marker_image_previews": "Animoidut merkkien esikatselukuvat",
             "marker_image_previews_tooltip": "Animoidut merkkien WebP esikatselut, vaaditaan vain jos esikatselun tyypiksi on valittu Animoitu kuva.",
             "marker_screenshots": "Merkkien esikatselukuvat",
-            "marker_screenshots_tooltip": "Merkkien staattinen JPG -kuva, vaadittu vain jos esikatselutyypiksi on asetettu staattinen kuva.",
+            "marker_screenshots_tooltip": "Staattiset JPG-kuvat merkintöihin",
             "markers": "Merkkien esikatselut",
             "markers_tooltip": "20 sekunnin video jokaisen aikakoodin alusta.",
             "override_preview_generation_options": "Ohita Esikatselun generoinnin asetukset",
@@ -942,7 +1011,7 @@
         "interactive_speed": "Interaktiivinen nopeus",
         "performer_card": {
             "age": "{age} {years_old}",
-            "age_context": "{age} {years_old} tässä kohtauksessa"
+            "age_context": "{age} {years_old} tuotantovaiheessa"
         },
         "phash": "PHash",
         "play_count": "Toistokerrat",
diff --git a/ui/v2.5/src/locales/fr-FR.json b/ui/v2.5/src/locales/fr-FR.json
index 3e9e74648..997a672be 100644
--- a/ui/v2.5/src/locales/fr-FR.json
+++ b/ui/v2.5/src/locales/fr-FR.json
@@ -141,7 +141,17 @@
         "reset_resume_time": "Réinitialiser le temps de reprise",
         "set_cover": "Définir comme vignette",
         "remove_from_containing_group": "Supprimer du groupe",
-        "add_sub_groups": "Ajouter des groupes affiliés"
+        "add_sub_groups": "Ajouter des groupes affiliés",
+        "sidebar": {
+            "close": "Fermer la barre latérale",
+            "open": "Ouvrir la barre latérale",
+            "toggle": "Barre latérale"
+        },
+        "show_count_results": "Afficher {count} résultats",
+        "show_results": "Afficher les résultats",
+        "play": "Lecture",
+        "load": "Charger",
+        "load_filter": "Charger un filtre"
     },
     "actions_name": "Actions",
     "age": "Âge",
@@ -447,7 +457,9 @@
             "endpoint": "Point de terminaison",
             "graphql_endpoint": "Point de terminaison GraphQL",
             "name": "Nom",
-            "title": "Points de terminaison Stash-Box"
+            "title": "Points de terminaison Stash-Box",
+            "max_requests_per_minute": "Requêtes maximales par minute",
+            "max_requests_per_minute_description": "Utiliser la valeur par défaut de {defaultValue} si définie à 0"
         },
         "system": {
             "transcoding": "Transcodage"
@@ -573,7 +585,9 @@
                 "whitespace_chars": "Caractères d'espacement",
                 "whitespace_chars_desc": "Ces caractères seront remplacés par un espace dans le titre"
             },
-            "scene_tools": "Outils de scène"
+            "scene_tools": "Outils de scène",
+            "heading": "Outils",
+            "graphql_playground": "Implémentation GraphQL"
         },
         "ui": {
             "abbreviate_counters": {
@@ -907,7 +921,6 @@
             "destination": "Destination",
             "source": "Source"
         },
-        "overwrite_filter_confirm": "Êtes-vous sûr de vouloir remplacer la requête sauvegardée existante {entityName} ?",
         "performers_found": "{count} performeurs trouvés",
         "reassign_entity_title": "{count, plural, one {Réaffecté {singularEntity}} other {Réaffectés {pluralEntity}}}",
         "reassign_files": {
@@ -960,7 +973,9 @@
         "set_image_url_title": "URL de l'image",
         "unsaved_changes": "Modifications non sauvegardées. Vous êtes sûr de vouloir quitter ?",
         "clear_o_history_confirm": "Êtes-vous sûr de vouloir effacer l'historique des O ?",
-        "clear_play_history_confirm": "Êtes-vous sûr de vouloir effacer l'historique de lecture ?"
+        "clear_play_history_confirm": "Êtes-vous sûr de vouloir effacer l'historique de lecture ?",
+        "overwrite_filter_warning": "Le filtre enregistré \"{entityName}\" sera remplacé.",
+        "set_default_filter_confirm": "Êtes-vous sûr de vouloir définir ce filtre par défaut ?"
     },
     "dimensions": "Dimensions",
     "director": "Réalisateur",
@@ -970,7 +985,8 @@
         "list": "Liste",
         "tagger": "Étiqueteuse",
         "unknown": "Inconnu",
-        "wall": "Mur"
+        "wall": "Mur",
+        "label_current": "Mode d'affichage : {current}"
     },
     "donate": "Faire un don",
     "dupe_check": {
@@ -1114,7 +1130,7 @@
         "audio_codec": "Codec audio",
         "checksum": "Somme de contrôle",
         "downloaded_from": "Téléchargé depuis",
-        "hash": "Hachage",
+        "hash": "Empreinte",
         "interactive_speed": "Vitesse interactive",
         "performer_card": {
             "age": "{age} {years_old}",
@@ -1222,7 +1238,9 @@
         "edit_filter": "Modifier le filtre",
         "name": "Filtre",
         "saved_filters": "Filtres sauvegardés",
-        "update_filter": "Filtre actualisé"
+        "update_filter": "Filtre actualisé",
+        "more_filter_criteria": "+{count} de plus",
+        "search_term": "Terme recherché"
     },
     "second": "Deuxième",
     "seconds": "Secondes",
@@ -1522,5 +1540,12 @@
     },
     "eta": "TAE",
     "sort_name": "Nom de tri",
-    "age_on_date": "{age} à la production"
+    "age_on_date": "{age} à la production",
+    "login": {
+        "password": "Mot de passe",
+        "invalid_credentials": "Nom d'utilisateur ou mot de passe incorrect",
+        "internal_error": "Erreur interne inattendue. Consulter le journal pour plus de détails",
+        "login": "Identification",
+        "username": "Nom d'utilisateur"
+    }
 }
diff --git a/ui/v2.5/src/locales/hr-HR.json b/ui/v2.5/src/locales/hr-HR.json
index dbd8deab3..70a5a49fe 100644
--- a/ui/v2.5/src/locales/hr-HR.json
+++ b/ui/v2.5/src/locales/hr-HR.json
@@ -91,11 +91,198 @@
         "swap": "Zamijeni",
         "tasks": {
             "clean_confirm_message": "Jeste li sigurni da želite započeti čišćenje? Ovaj će postupak obrisati podatke iz baze podataka i sav generirani sadržaj za sve scene i galerije čije su izvorne datoteke obrisane.",
-            "dry_mode_selected": "Odabran je probni način rada. Ništa neće biti obrisano, datoteke koje više ne postoje će se samo zapisati u konzolu."
+            "dry_mode_selected": "Odabran je probni način rada. Ništa neće biti obrisano, datoteke koje više ne postoje će se samo zapisati u konzolu.",
+            "import_warning": "Da li ste sigurni da želite uvesti? Ovo će izbrisati bazu podataka i ponovno je uvesti iz vaših izvezenih metapodataka."
         },
         "temp_disable": "Privremeno isključi…",
         "temp_enable": "Privremeno uključi…",
         "use_default": "Koristi zadane vrijednosti",
-        "view_random": "Vidi nasumično"
+        "view_random": "Vidi nasumično",
+        "add_manual_date": "Dodaj ručni datum",
+        "add_sub_groups": "Dodaj podgrupu",
+        "add_o": "Dodaj O",
+        "add_play": "Dodaj reproduciranje",
+        "anonymise": "Anonimiziraj",
+        "assign_stashid_to_parent_studio": "Dodijeli Stash ID na postojeći matični studio i ažuriraj metapodatke",
+        "choose_date": "Odaberi datum",
+        "clean_generated": "Očisti generirane datoteke",
+        "clear_back_image": "Obriši stražnju sliku",
+        "clear_date_data": "Očisti podatke o datumu",
+        "clear_front_image": "Očisti prednju sliku",
+        "copy_to_clipboard": "Kopiraj u međuspremnik",
+        "create_chapters": "Stvori poglavlje",
+        "create_parent_studio": "Napravi matični studio",
+        "customise": "Prilagodi",
+        "delete_file_and_funscript": "Izbriši datoteku (i funscript)",
+        "disable": "Onemogući",
+        "download_anonymised": "Preuzmi anonimno",
+        "enable": "Omogući",
+        "encoding_image": "Kodiranje slike…",
+        "hash_migration": "migracija hash-a",
+        "load": "Učitaj",
+        "load_filter": "Učitaj filter",
+        "make_primary": "Učini Primarnim",
+        "migrate_blobs": "Spoji Blobs",
+        "migrate_scene_screenshots": "Migriraj Snimke Zaslona Scene",
+        "optimise_database": "Optimiziraj Bazu Podataka",
+        "overwrite": "Prebriši",
+        "play": "Pokreni",
+        "reassign": "Preraspodjeli",
+        "reload": "Ponovno Učitaj",
+        "reload_scrapers": "Ponovno učitaj scraper-e",
+        "remove_date": "Ukloni datum",
+        "remove_from_containing_group": "Ukloni iz Grupe",
+        "reset_play_duration": "Resetiraj duljinu reprodukcije",
+        "reset_resume_time": "Resetiraj vrijeme nastavka",
+        "reset_cover": "Vrati Zadanu Naslovnicu",
+        "reshuffle": "Promješaj",
+        "set_back_image": "Stražnja slika…",
+        "set_cover": "Postavi kao Naslovnicu",
+        "set_front_image": "Prednja slika…",
+        "show_results": "Prikaži rezultate",
+        "show_count_results": "Prikaži {count} rezultata",
+        "sidebar": {
+            "close": "Zatvori bočnu traku",
+            "open": "Otvori bočnu traku",
+            "toggle": "Uključi/Isključi bočnu traku"
+        },
+        "view_history": "Vidi povijest"
+    },
+    "actions_name": "Radnje",
+    "age": "Dob",
+    "age_on_date": "{age} u produkciji",
+    "aliases": "Pseudonimi",
+    "all": "sve",
+    "also_known_as": "Također poznat kao",
+    "appears_with": "Pojavljuje se sa",
+    "ascending": "Uzlazno",
+    "audio_codec": "Audio Kodek",
+    "average_resolution": "Prosječna Rezolucija",
+    "between_and": "i",
+    "birth_year": "Godina Rođenja",
+    "birthdate": "Datum rođenja",
+    "bitrate": "Brzina Prijenosa Podataka",
+    "blobs_storage_type": {
+        "database": "Baza podataka",
+        "filesystem": "Datotečni sustav"
+    },
+    "captions": "Natpisi",
+    "career_length": "Duljina Karijere",
+    "chapters": "Poglavlja",
+    "circumcised": "Obrezan",
+    "circumcised_types": {
+        "CUT": "Izrezan",
+        "UNCUT": "Neizrezan"
+    },
+    "component_tagger": {
+        "config": {
+            "active_instance": "Aktivna stash-box instanca:",
+            "blacklist_desc": "Stavke crne liste isključene su iz upita. Imajte na umu da su to regularni izrazi i da nisu osjetljivi na velika i mala slova. Određeni znakovi moraju se izbjeći obrnutom kosom crtom: {chars_require_escape}",
+            "blacklist_label": "Crna Lista",
+            "errors": {
+                "blacklist_duplicate": "Duplikat stavke crne liste"
+            },
+            "mark_organized_desc": "Odmah označi scenu kao Organiziranu nakon što je tipka Spremi stisnuta.",
+            "mark_organized_label": "Označi kao organizirano pri spremanju",
+            "query_mode_auto": "Automatski",
+            "query_mode_auto_desc": "Koristi metapodatke ako postoje, ili ime datoteke",
+            "query_mode_dir": "Dir",
+            "query_mode_dir_desc": "Koristi samo nadređeni direktorij video datoteke",
+            "query_mode_filename": "Ime datoteke",
+            "query_mode_filename_desc": "Koristi samo ime datoteke",
+            "query_mode_label": "Query Mod",
+            "query_mode_metadata": "Metapodaci",
+            "query_mode_metadata_desc": "Koristi samo metapodatke",
+            "query_mode_path": "Putanja",
+            "query_mode_path_desc": "Koristi cijelu putanju datoteke",
+            "set_cover_desc": "Zamijeni sliku naslovnice scene ako je pronađena.",
+            "set_cover_label": "Postavi sliku naslovnice scene",
+            "set_tag_desc": "Priložite oznake sceni, bilo prepisivanjem ili spajanjem s postojećim oznakama na sceni.",
+            "set_tag_label": "Postavi oznake",
+            "show_male_desc": "Uključi/isključi mogućnost označavanja muških izvođača.",
+            "show_male_label": "Prikaži muške izvođače",
+            "source": "Izvor"
+        },
+        "noun_query": "Upit",
+        "results": {
+            "duration_unknown": "Trajanje nepoznato",
+            "fp_matches": "Trajanje se podudara",
+            "fp_matches_multi": "Trajanje odgovara otiscima {matchCount}/{durationsLength}",
+            "hash_matches": "{hash_type} se podudara",
+            "match_failed_already_tagged": "Scena već označena",
+            "match_failed_no_result": "Nisu pronađeni rezultati",
+            "match_success": "Scena uspješno označena",
+            "unnamed": "Neimenovano"
+        },
+        "verb_matched": "Podudara se",
+        "verb_toggle_unmatched": "{toggle} neusklađene scene"
+    },
+    "config": {
+        "about": {
+            "build_hash": "Izradi hash:",
+            "build_time": "Vrijeme izrade:",
+            "check_for_new_version": "Provjeri za novu verziju",
+            "latest_version": "Zadnja Verzija",
+            "latest_version_build_hash": "Izrađen Hash Zadnje Verzije:",
+            "new_version_notice": "[NOVO]",
+            "release_date": "Datum izdanja:",
+            "stash_discord": "Pridruži se našem {url} kanalu",
+            "stash_home": "Stash početna stranica na {url}",
+            "stash_open_collective": "Podrži nas kroz {url}",
+            "stash_wiki": "Stash {url} stranica",
+            "version": "Verzija"
+        },
+        "advanced_mode": "Napredan Način",
+        "application_paths": {
+            "heading": "Putanje Aplikacije"
+        },
+        "categories": {
+            "about": "O nama",
+            "changelog": "Zapisnik promjena",
+            "interface": "Sučelje",
+            "logs": "Zapisnici",
+            "metadata_providers": "Pružatelji Metapodataka",
+            "plugins": "Dodaci",
+            "security": "Sigurnost",
+            "services": "Usluge",
+            "system": "Sistem",
+            "tasks": "Zadaci",
+            "tools": "Alati"
+        },
+        "dlna": {
+            "allow_temp_ip": "Dopusti {tempIP}",
+            "allowed_ip_addresses": "Dopuštene IP adrese",
+            "allowed_ip_temporarily": "Dopušten IP privremeno",
+            "default_ip_whitelist": "Zadana bijela lista IP adresa",
+            "default_ip_whitelist_desc": "Zadane IP adrese omogućuju pristup DLNA. Koristi {wildcard} za dopuštanje svih IP adresa.",
+            "disabled_dlna_temporarily": "Onemogućen DLNA privremeno",
+            "disallowed_ip": "Nedopušen IP",
+            "enabled_by_default": "Omogućeno prema zadanim postavkama",
+            "enabled_dlna_temporarily": "Omogućen DLNA privremeno",
+            "network_interfaces": "Sučelja",
+            "network_interfaces_desc": "Sučelja na kojima će se izložiti DLNA poslužitelj. Prazan popis rezultira pokretanjem na svim sučeljima. Zahtijeva ponovno pokretanje DLNA nakon promjene.",
+            "recent_ip_addresses": "Nedavne IP adrese",
+            "server_display_name": "Prikazni Naziv Poslužitelja",
+            "server_display_name_desc": "Prikazni naziv za DLNA poslužitelj. Zadano je {server_name} ako je prazno.",
+            "server_port": "Port Poslužitelja",
+            "server_port_desc": "Port na kojem će se pokretati DLNA poslužitelj. Zahtijeva ponovno pokretanje DLNA nakon promjene.",
+            "successfully_cancelled_temporary_behaviour": "Uspješno otkazano privremeno ponašanje",
+            "until_restart": "do ponovnog pokretanja",
+            "video_sort_order": "Zadani Redoslijed Sortiranja Videozapisa"
+        },
+        "general": {
+            "auth": {
+                "api_key": "API Ključ",
+                "api_key_desc": "API ključ za vanjske sustave. Potreban je samo kada je konfigurirano korisničko ime/lozinka. Korisničko ime mora biti spremljeno prije generiranja API ključa.",
+                "authentication": "Autentifikacija",
+                "clear_api_key": "Obriši API ključ",
+                "credentials": {
+                    "description": "Vjerodajnice za ograničavanje pristupa zalihama.",
+                    "heading": "Vjerodajnice"
+                },
+                "generate_api_key": "Generiraj API ključ",
+                "log_file": "Datoteka zapisnika"
+            }
+        }
     }
 }
diff --git a/ui/v2.5/src/locales/id-ID.json b/ui/v2.5/src/locales/id-ID.json
index a7327508a..ba0c9bca7 100644
--- a/ui/v2.5/src/locales/id-ID.json
+++ b/ui/v2.5/src/locales/id-ID.json
@@ -3,7 +3,7 @@
         "welcome_to_stash": "Selamat datang di Stash",
         "paths": {
             "where_is_your_porn_located": "Di mana lokasi porno Anda?",
-            "description": "Selanjutnya, kita perlu menentukan di mana lokasi koleksi porno Anda, dan di mana menyimpan pangkalan data Stash, berkas yang dihasilkan, dan berkas tembolok. Pengaturan ini dapat diubah nanti jika diperlukan."
+            "description": "Selanjutnya, kita perlu menentukan di mana lokasi koleksi bokep Anda, dan di mana menyimpan pangkalan data Stash, berkas yang dihasilkan, dan berkas tembolok. Pengaturan ini dapat diubah nanti jika diperlukan."
         },
         "success": {
             "thanks_for_trying_stash": "Terima kasih sudah mencoba Stash!",
@@ -29,7 +29,7 @@
         "continue": "Lanjutkan",
         "copy_to_clipboard": "Salin ke papan klip",
         "create": "Buat",
-        "create_chapters": "Buat Bab",
+        "create_chapters": "Buat Bagian",
         "create_entity": "Buat {entityType}",
         "create_marker": "Buat Tanda",
         "create_parent_studio": "Buat studio induk",
@@ -147,7 +147,23 @@
         "use_default": "Gunakan bawaan",
         "view_random": "Lihat Acak",
         "unset": "Tidak disetel",
-        "view_history": "Lihat histori"
+        "view_history": "Lihat histori",
+        "reset_cover": "Pulihkan Sampul Bawaan",
+        "set_cover": "Atur sebagai Sampul",
+        "reset_resume_time": "Atur ulang waktu lanjut",
+        "reset_play_duration": "Atur ulang durasi putar",
+        "add_sub_groups": "Tambah Subgrup",
+        "remove_from_containing_group": "Hapus dari Grup",
+        "load": "Muat",
+        "load_filter": "Muat filter",
+        "play": "Mainkan",
+        "show_results": "Lihat hasil",
+        "show_count_results": "Lihat {count} hasil",
+        "sidebar": {
+            "close": "Tutup bilah samping",
+            "open": "Buka bilah samping",
+            "toggle": "Alihkan bilah samping"
+        }
     },
     "circumcised_types": {
         "CUT": "Disunat",
@@ -216,7 +232,7 @@
             "query_mode_filename_desc": "Hanya menggunakan nama berkas",
             "query_mode_label": "Mode Kueri",
             "query_mode_metadata_desc": "Hanya menggunakan metadata",
-            "query_mode_path": "Jalur",
+            "query_mode_path": "Lokasi",
             "query_mode_path_desc": "Menggunakan seluruh jalur berkas",
             "set_cover_desc": "Ganti gambar adegan jika cover ditemukan.",
             "set_cover_label": "Tetapkan gambar cover adegan",
@@ -224,7 +240,10 @@
             "set_tag_desc": "Lampirkan tag ke adegan, baik dengan menimpa atau menggabungkan dengan tag yang sudah ada.",
             "show_male_desc": "Baeralih apakah pemain pria dapat diberi tag.",
             "show_male_label": "Tampilkan pemain pria",
-            "source": "Sumber"
+            "source": "Sumber",
+            "errors": {
+                "blacklist_duplicate": "Duplikat item daftar hitam"
+            }
         },
         "results": {
             "duration_unknown": "Durasi tidak diketahui",
@@ -280,7 +299,9 @@
             "enabled_dlna_temporarily": "DLNA yang diaktifkan sementara",
             "network_interfaces_desc": "Antarmuka untuk mengekspos server DLNA. Daftar kosong menghasilkan berjalannya di semua antarmuka. Dibutuhkan mulai ulang DLNA setelah perubahan.",
             "recent_ip_addresses": "Alamat IP terbaru",
-            "server_display_name": "Nama Tampilan Server"
+            "server_display_name": "Nama Tampilan Server",
+            "server_port_desc": "Port untuk menjalankan server DLNA. Harus memulai ulang DLNA setelah diganti.",
+            "server_port": "Port Server"
         },
         "general": {
             "logging": "Pencatatan",
@@ -322,7 +343,8 @@
             "gallery_ext_desc": "Daftar ekstensi berkas yang dibatasi koma yang akan diidentifikasi sebagai berkas zip galeri.",
             "gallery_ext_head": "Ekstensi zip galeri",
             "python_path": {
-                "heading": "Jalur Eksekusi Python"
+                "heading": "Jalur Eksekusi Python",
+                "description": "Lokasi executable Python (bukan hanya folder). Digunakan untuk skrip penggali data dan plugin. Jika kosong, Python akan diambil dari environment"
             },
             "scraper_user_agent": "Agen Pengguna Penggali",
             "db_path_head": "Jalur Pangkalan Data",
@@ -359,10 +381,72 @@
             "blobs_path": {
                 "description": "Dimana pada sistem berkas untuk menyimpan data biner. Hanya berlaku saat menggunakan jenis penyimpanan blob Sistem Berkas. PERINGATAN: mengubah ini memerlukan pemindahan data yang ada secara manual.",
                 "heading": "Jalur sistem berkas data biner"
-            }
+            },
+            "check_for_insecure_certificates": "Cek untuk sertifikat tidak aman",
+            "cache_location": "Direktori lokasi cache. Harus diisi jika streaming menggunakan HLS (seperti pada perangkat Apple) atau DASH.",
+            "calculate_md5_and_ohash_label": "Kalkulasi MD5 untuk video",
+            "cache_path_head": "Lokasi Cache",
+            "calculate_md5_and_ohash_desc": "Kalkulasi checksum MD5 untuk tambahan oshash. Jika diaktifkan akan memperlambat proses scan awal. Hash penamaan file harus diatur menjadi oshash untuk menonaktifkan kalkulasi MD5.",
+            "check_for_insecure_certificates_desc": "Beberapa situs menggunakan sertifikat ssl yang tidak aman. Jika dinonaktifkan, scraper akan mengabaikan sertifikat yang tidak aman dan akan melanjutkan scraping. Jika anda mendapatkan error saat scraping, nonaktifkan ini.",
+            "chrome_cdp_path": "Lokasi Chrome CDP",
+            "chrome_cdp_path_desc": "Lokasi file eksekutabel Chrome, atau alamat remote (dimulai dengan http:// atau https://, sebagai contoh http://localhost:9222/json/version) sebuah instansi Chrome.",
+            "ffmpeg": {
+                "live_transcode": {
+                    "output_args": {
+                        "desc": "Lanjutan: Argumen tambahan untuk ditambahkan pada ffmpeg sebelum isian output saat mentranscode video secara langsung.",
+                        "heading": "Argumen untuk Output Transcode Langsung pada FFmpeg"
+                    },
+                    "input_args": {
+                        "desc": "Lanjutan: Argumen tambahan untuk diteruskan ke ffmpeg sebelum field input saat melakukan transcoding video langsung.",
+                        "heading": "FFmpeg Live Transcode Input Args"
+                    }
+                },
+                "transcode": {
+                    "input_args": {
+                        "desc": "Lanjutan: Argumen tambahan untuk ditambahkann pada ffmpeg sebelum isian saat menghasilkan video.",
+                        "heading": "Argumen Input Transcode FFmpeg"
+                    },
+                    "output_args": {
+                        "desc": "Lanjutan: Argumen tambahan untuk ditambahkan pada ffmpeg sebelum output saat menghasilkan video.",
+                        "heading": "Argumen Output Transcode FFmpeg"
+                    }
+                },
+                "download_ffmpeg": {
+                    "description": "Mengunduh FFmpeg ke dalam direktori konfigurasi dan mengosongkan lokasi ffmpeg serta ffprobe untuk diambil dari direktori konfigurasi.",
+                    "heading": "Unduh FFmpeg"
+                },
+                "ffmpeg_path": {
+                    "description": "Lokasi ke executable ffmpeg (bukan hanya folder). Jika kosong, ffmpeg akan diambil dari environment melalui $PATH, direktori konfigurasi, atau dari $HOME/.stash",
+                    "heading": "Lokasi Executable FFmpeg"
+                },
+                "ffprobe_path": {
+                    "description": "Lokasi executable ffprobe (bukan hanya folder). Jika kosong, ffprobe akan diambil dari environment melalui $PATH, direktori konfigurasi, atau dari $HOME/.stash",
+                    "heading": "Lokasi Executable FFprobe"
+                },
+                "hardware_acceleration": {
+                    "desc": "Menggunakan perangkat keras yang tersedia untuk melakukan encoding video dalam transcoding langsung.",
+                    "heading": "Encoding perangkat keras FFmpeg"
+                }
+            },
+            "create_galleries_from_folders_label": "Buat galeri dari folder yang berisi gambar",
+            "directory_locations_to_your_content": "Lokasi direktori konten Anda",
+            "create_galleries_from_folders_desc": "Jika true, secara bawaan membuat galeri dari folder yang berisi gambar. Buat sebuah file bernama .forcegallery atau .nogallery di dalam folder untuk memaksa/mencegah hal ini.",
+            "excluded_image_gallery_patterns_desc": "Regexp file gambar dan galeri/lokasi yang akan dikecualikan dari Pemindaian dan ditambahkan ke Pembersihan",
+            "excluded_image_gallery_patterns_head": "Pola Gambar/Galeri yang Dikecualikan",
+            "excluded_video_patterns_desc": "Regexp file video/lokasi yang akan dikecualikan dari Pemindaian dan ditambahkan ke Pembersihan",
+            "excluded_video_patterns_head": "Pola Video yang Dikecualikan",
+            "generated_file_naming_hash_desc": "Gunakan MD5 atau oshash untuk penamaan file yang dihasilkan. Mengubah ini memerlukan semua adegan memiliki nilai MD5/oshash yang sesuai. Setelah mengubah nilai ini, file yang sudah dihasilkan perlu dimigrasikan atau dibuat ulang. Lihat halaman Tugas untuk migrasi.",
+            "image_ext_desc": "Daftar ekstensi file yang dipisahkan koma dan akan dikenali sebagai gambar.",
+            "plugins_path": {
+                "description": "Lokasi direktori file konfigurasi plugin",
+                "heading": "Lokasi Plugin"
+            },
+            "video_ext_desc": "Daftar ekstensi file yang dipisahkan koma dan akan dikenali sebagai video."
         },
         "library": {
-            "exclusions": "Pengecualian"
+            "exclusions": "Pengecualian",
+            "gallery_and_image_options": "Opsi Galeri dan Gambar",
+            "media_content_extensions": "Ekstensi konten media"
         },
         "tasks": {
             "identify": {
@@ -387,9 +471,11 @@
                 "markers": "Pratinjau Penanda",
                 "image_thumbnails": "Keluku Gambar",
                 "image_thumbnails_desc": "Keluku dan klip gambar",
-                "previews": "Pratinjau Adegan"
+                "previews": "Pratinjau Adegan",
+                "previews_desc": "Pratinjau adegan dan keluku"
             },
-            "added_job_to_queue": "{operation_name} ditambahkan ke antrean tugas"
+            "added_job_to_queue": "{operation_name} ditambahkan ke antrean tugas",
+            "data_management": "Manajemen data"
         },
         "ui": {
             "editing": {
@@ -456,14 +542,16 @@
             "supported_types": "Tipe yang didukung",
             "search_by_name": "Cari berdasarkan nama",
             "available_scrapers": "Penggali Tersedia",
-            "entity_scrapers": "Penggali {entityType}"
+            "entity_scrapers": "Penggali {entityType}",
+            "excluded_tag_patterns_head": "Pola Tag Terkecualikan"
         },
         "stashbox": {
             "endpoint": "Titik akhir",
             "name": "Nama",
             "graphql_endpoint": "Titik akhir GraphQL",
             "title": "Titik Akhir Stash-box",
-            "api_key": "Kunci API"
+            "api_key": "Kunci API",
+            "max_requests_per_minute": "Maks permintaan per menit"
         },
         "system": {
             "transcoding": "Transkode"
@@ -472,6 +560,13 @@
             "scene_filename_parser": {
                 "filename": "Nama berkas"
             }
+        },
+        "logs": {
+            "log_level": "Level Log"
+        },
+        "plugins": {
+            "available_plugins": "Plugin Tersedia",
+            "installed_plugins": "Plugin Terinstal"
         }
     },
     "criterion": {
@@ -499,7 +594,8 @@
             "options": "Opsi",
             "scroll_mode": {
                 "zoom": "Perbesar"
-            }
+            },
+            "page_header": "Halaman {page} / {total}"
         },
         "merge": {
             "destination": "Destinasi",
@@ -514,7 +610,9 @@
             "video_previews": "Pratinjau"
         },
         "scrape_results_existing": "Yang sudah ada",
-        "scrape_results_scraped": "Digali"
+        "scrape_results_scraped": "Digali",
+        "performers_found": "{count} pemain ditemukan",
+        "dont_show_until_updated": "Sembunyikan hingga pembaruan selanjutnya"
     },
     "effect_filters": {
         "brightness": "Kecerahan",
@@ -548,13 +646,16 @@
         "uninstall": "Copot pemasangan",
         "update": "Perbarui",
         "version": "Versi",
-        "unknown": "<tidak diketahui>"
+        "unknown": "<tidak diketahui>",
+        "installed_version": "Versi Terpasang",
+        "latest_version": "Versi Terkini"
     },
     "pagination": {
         "next": "Berikutnya",
         "previous": "Sebelumnya",
         "last": "Terakhir",
-        "first": "Pertama"
+        "first": "Pertama",
+        "current_total": "{current} dari {total}"
     },
     "performer": "Pemain",
     "performers": "Pemain",
@@ -650,7 +751,7 @@
     },
     "instagram": "Instagram",
     "interactive": "Interaktif",
-    "library": "Pustaka",
+    "library": "Koleksi",
     "loading": {
         "generic": "Memuat…"
     },
@@ -660,5 +761,35 @@
     "organized": "Terorganisir",
     "orientation": "Orientasi",
     "all": "semua",
-    "ascending": "Urut naik"
+    "ascending": "Urut naik",
+    "age_on_date": "{age} saat produksi",
+    "performer_age": "Umur Pemain",
+    "performer_count": "Jumlah Pemain",
+    "performer_favorite": "Pemain Difavorit",
+    "performer_image": "Foto Pemain",
+    "performer_tagger": {
+        "add_new_performers": "Tambah Pemain Baru"
+    },
+    "part_of": "Bagian dari {parent}",
+    "cover_image": "Foto Sampul",
+    "death_date": "Tanggal Kematian",
+    "death_year": "Tahun Kematian",
+    "last_o_at": "Terakhir Crot Pada",
+    "last_played_at": "Terakhir Dimainkan Pada",
+    "login": {
+        "username": "Nama Pengguna",
+        "password": "Kata Sandi",
+        "login": "Masuk",
+        "invalid_credentials": "Nama pengguna atau kata sandi salah"
+    },
+    "marker_count": "Jumlah Penanda",
+    "media_info": {
+        "o_count": "Jumlah Crot",
+        "performer_card": {
+            "age": "{age} {years_old}",
+            "age_context": "{age} {years_old} saat produksi"
+        },
+        "phash": "PHash"
+    },
+    "o_count": "Jumlah Crot"
 }
diff --git a/ui/v2.5/src/locales/index.ts b/ui/v2.5/src/locales/index.ts
index 86c1a607e..0e699b8f7 100644
--- a/ui/v2.5/src/locales/index.ts
+++ b/ui/v2.5/src/locales/index.ts
@@ -2,6 +2,7 @@ import Countries from "i18n-iso-countries";
 
 export const localeCountries = {
   af: () => import("i18n-iso-countries/langs/af.json"),
+  bg: () => import("i18n-iso-countries/langs/bg.json"),
   bn: () => import("i18n-iso-countries/langs/bn.json"),
   ca: () => import("i18n-iso-countries/langs/ca.json"),
   cs: () => import("i18n-iso-countries/langs/cs.json"),
@@ -20,6 +21,7 @@ export const localeCountries = {
   it: () => import("i18n-iso-countries/langs/it.json"),
   ja: () => import("i18n-iso-countries/langs/ja.json"),
   ko: () => import("i18n-iso-countries/langs/ko.json"),
+  lt: () => import("i18n-iso-countries/langs/lt.json"),
   lv: () => import("i18n-iso-countries/langs/lv.json"),
   nb: () => import("i18n-iso-countries/langs/nb.json"),
   nl: () => import("i18n-iso-countries/langs/nl.json"),
@@ -32,6 +34,7 @@ export const localeCountries = {
   sv: () => import("i18n-iso-countries/langs/sv.json"),
   th: () => import("i18n-iso-countries/langs/th.json"),
   tr: () => import("i18n-iso-countries/langs/tr.json"),
+  ur: () => import("i18n-iso-countries/langs/ur.json"),
   uk: () => import("i18n-iso-countries/langs/uk.json"),
   vi: () => import("i18n-iso-countries/langs/vi.json"),
   zh: () => import("i18n-iso-countries/langs/zh.json"),
@@ -53,6 +56,7 @@ export async function registerCountry(locale: string) {
 
 export const localeLoader = {
   afZA: () => import("./af-ZA.json"),
+  bgBG: () => import("./bg-BG.json"),
   bnBD: () => import("./bn-BD.json"),
   caES: () => import("./ca-ES.json"),
   csCZ: () => import("./cs-CZ.json"),
@@ -72,6 +76,7 @@ export const localeLoader = {
   itIT: () => import("./it-IT.json"),
   jaJP: () => import("./ja-JP.json"),
   koKR: () => import("./ko-KR.json"),
+  ltLT: () => import("./lt-LT.json"),
   lvLV: () => import("./lv-LV.json"),
   nbNO: () => import("./nb-NO.json"),
   // neNP: () => import("./ne-NP.json"),
@@ -85,6 +90,7 @@ export const localeLoader = {
   svSE: () => import("./sv-SE.json"),
   thTH: () => import("./th-TH.json"),
   trTR: () => import("./tr-TR.json"),
+  urPK: () => import("./ur-PK.json"),
   ukUA: () => import("./uk-UA.json"),
   viVN: () => import("./vi-VN.json"),
   zhCN: () => import("./zh-CN.json"),
diff --git a/ui/v2.5/src/locales/it-IT.json b/ui/v2.5/src/locales/it-IT.json
index 98269f6d8..349abaabb 100644
--- a/ui/v2.5/src/locales/it-IT.json
+++ b/ui/v2.5/src/locales/it-IT.json
@@ -135,7 +135,8 @@
         "optimise_database": "Ottimizza il Database",
         "reload": "Ricarica",
         "remove_date": "Rimuovi la data",
-        "view_history": "Visualizza cronologia"
+        "view_history": "Visualizza cronologia",
+        "add_sub_groups": "Aggiungi Sottogruppi"
     },
     "actions_name": "Azioni",
     "age": "Età",
@@ -744,7 +745,6 @@
             "destination": "Destinazione",
             "source": "Origine"
         },
-        "overwrite_filter_confirm": "Sei sicuro di voler sovrascrivere le esistenti query salvate {entityName}?",
         "reassign_entity_title": "{count, plural, one {Riassegna {singularEntity}} other {Riassegna {pluralEntity}}}",
         "reassign_files": {
             "destination": "Riassegna a"
diff --git a/ui/v2.5/src/locales/ja-JP.json b/ui/v2.5/src/locales/ja-JP.json
index c8e95e595..005083d6d 100644
--- a/ui/v2.5/src/locales/ja-JP.json
+++ b/ui/v2.5/src/locales/ja-JP.json
@@ -141,7 +141,15 @@
         "set_cover": "カバーをセット",
         "view_history": "履歴を表示する",
         "reset_resume_time": "再開時間をリセットする",
-        "reset_cover": "標準カバーに復元"
+        "reset_cover": "標準カバーに復元",
+        "sidebar": {
+            "close": "サイドバーを閉じる",
+            "open": "サイドバーを開く",
+            "toggle": "サイドバーを切り替え"
+        },
+        "play": "再生",
+        "show_results": "結果を表示",
+        "show_count_results": "{count}件の結果を表示"
     },
     "actions_name": "操作",
     "age": "年齢",
@@ -435,7 +443,8 @@
             "endpoint": "エンドポイント",
             "graphql_endpoint": "GraphQL エンドポイント",
             "name": "名前",
-            "title": "Stash-box エンドポイント"
+            "title": "Stash-box エンドポイント",
+            "max_requests_per_minute": "1分あたりの最大リクエスト数"
         },
         "system": {
             "transcoding": "トランスコード"
@@ -718,8 +727,11 @@
                     "disable_mobile_media_auto_rotate": "モバイル機器でフル画面再生時の画面回転を無効化",
                     "enable_chromecast": "クロームキャスト機能の有効化",
                     "vr_tag": {
-                        "heading": "VRタッグ"
-                    }
+                        "heading": "VRタッグ",
+                        "description": "VRボタンはこのタグがついたシーンにのみ表示されます。"
+                    },
+                    "show_ab_loop_controls": "ABループプラグインのコントロールを表示",
+                    "show_range_markers": "範囲マーカーを表示"
                 }
             },
             "scene_wall": {
@@ -862,7 +874,8 @@
                 "label": "スクロールモード",
                 "pan_y": "Yにパン",
                 "zoom": "拡大"
-            }
+            },
+            "page_header": "ページ {page} / {total}"
         },
         "merge": {
             "destination": "宛先",
@@ -873,7 +886,6 @@
             "destination": "場所",
             "source": "ソース"
         },
-        "overwrite_filter_confirm": "本当に保存されているクエリ「{entityName}」を上書きしてもよろしいですか？",
         "reassign_entity_title": "{count, plural, one {{singularEntity}を再割り当て} other {{pluralEntity}を再割り当て}}",
         "reassign_files": {
             "destination": "次に再割り当て:"
@@ -911,7 +923,10 @@
             "transcodes": "トランスコード",
             "transcodes_tooltip": "サポートされていない動画フォーマットをMP4に変換します",
             "video_previews": "プレビュー",
-            "video_previews_tooltip": "シーンにマウスカーソルを置いた時に再生されるビデオプレビュー"
+            "video_previews_tooltip": "シーンにマウスカーソルを置いた時に再生されるビデオプレビュー",
+            "clip_previews": "画像のプレビュー",
+            "covers": "シーンカバー",
+            "image_thumbnails": "サムネ画像"
         },
         "scenes_found": "{count}シーンが見つかりました",
         "scrape_entity_query": "{entity_type}スクレイプクエリ",
@@ -919,7 +934,9 @@
         "scrape_results_existing": "存在します",
         "scrape_results_scraped": "スクレイプ済み",
         "set_image_url_title": "画像URL",
-        "unsaved_changes": "変更が保存されていません。本当に移動してよろしいですか？"
+        "unsaved_changes": "変更が保存されていません。本当に移動してよろしいですか？",
+        "clear_play_history_confirm": "再生履歴を本当に削除しますか？",
+        "performers_found": "{count}人の出演者が見つかりました"
     },
     "dimensions": "寸法",
     "director": "監督",
@@ -1299,6 +1316,17 @@
     "date_format": "YYYY -MM-DD",
     "datetime_format": "YYYY-MM-DD HH:MM",
     "criterion_modifier_values": {
-        "none": "ない"
-    }
+        "none": "ない",
+        "only": "のみ"
+    },
+    "connection_monitor": {
+        "websocket_connection_failed": "WebSocket接続ができません：詳細はブラウザのコンソールを確認してください"
+    },
+    "custom_fields": {
+        "field": "フィールド",
+        "title": "カスタムフィールド",
+        "value": "値"
+    },
+    "distance": "距離",
+    "age_on_date": "撮影時の年齢 {age}歳"
 }
diff --git a/ui/v2.5/src/locales/ko-KR.json b/ui/v2.5/src/locales/ko-KR.json
index 60f942e82..f022b7790 100644
--- a/ui/v2.5/src/locales/ko-KR.json
+++ b/ui/v2.5/src/locales/ko-KR.json
@@ -51,7 +51,7 @@
         "hash_migration": "해쉬 값 마이그레이션",
         "hide": "숨기기",
         "hide_configuration": "설정 숨기기",
-        "identify": "인증",
+        "identify": "식별",
         "ignore": "무시",
         "import": "불러오기…",
         "import_from_file": "파일 불러오기",
@@ -141,7 +141,17 @@
         "reset_play_duration": "재생 시간 초기화",
         "reset_resume_time": "마지막 재생 위치 초기화",
         "add_sub_groups": "서브그룹 추가",
-        "remove_from_containing_group": "그룹에서 제거"
+        "remove_from_containing_group": "그룹에서 제거",
+        "sidebar": {
+            "close": "사이드바 닫기",
+            "open": "사이드바 열기",
+            "toggle": "사이드바 토글"
+        },
+        "play": "재생",
+        "show_results": "결과 표시",
+        "show_count_results": "{count}개 결과 표시",
+        "load": "불러오기",
+        "load_filter": "필터 불러오기"
     },
     "actions_name": "액션",
     "age": "나이",
@@ -191,7 +201,10 @@
             "show_male_label": "남성 배우 보여주기",
             "source": "출처",
             "mark_organized_desc": "저장 버튼을 클릭하면 곧바로 영상을 '정리됨' 상태로 만듭니다.",
-            "mark_organized_label": "저장 시 '정리됨' 상태로 만들기"
+            "mark_organized_label": "저장 시 '정리됨' 상태로 만들기",
+            "errors": {
+                "blacklist_duplicate": "블랙리스트 항목이 중복되었습니다"
+            }
         },
         "noun_query": "쿼리",
         "results": {
@@ -306,7 +319,7 @@
                 "heading": "바이너리 데이터 저장 타입"
             },
             "cache_location": "캐시 폴더 경로입니다. HLS(애플 기기 등)이나 DASH로 스트리밍할 때 필요합니다.",
-            "cache_path_head": "캐쉬 경로",
+            "cache_path_head": "캐시 경로",
             "calculate_md5_and_ohash_desc": "oshash 외에 MD5 체크섬도 계산합니다. 활성화하면 초기 스캔을 더 느리게 만들 것입니다. MD5 계산을 사용하지 않으려면 파일 이름 해쉬를 oshash로 설정해야 합니다.",
             "calculate_md5_and_ohash_label": "비디오 MD5 계산하기",
             "check_for_insecure_certificates": "안전하지 않은 자격증명 검사",
@@ -443,7 +456,9 @@
             "endpoint": "엔드포인트",
             "graphql_endpoint": "GraphQL 엔드포인트",
             "name": "이름",
-            "title": "Stash-box 엔드포인트"
+            "title": "Stash-box 엔드포인트",
+            "max_requests_per_minute": "분당 최대 요청 수",
+            "max_requests_per_minute_description": "0으로 설정할 경우 기본값({defaultValue})을 사용합니다"
         },
         "system": {
             "transcoding": "트랜스코딩"
@@ -569,7 +584,9 @@
                 "whitespace_chars": "공백 문자",
                 "whitespace_chars_desc": "이 문자들은 제목에서 공백으로 대체됩니다"
             },
-            "scene_tools": "영상 도구"
+            "scene_tools": "영상 도구",
+            "heading": "도구",
+            "graphql_playground": "GraphQL 플레이그라운드"
         },
         "ui": {
             "abbreviate_counters": {
@@ -726,7 +743,7 @@
                         "description": "비디오가 끝나면 대기열에 있는 다음 영상을 재생합니다",
                         "heading": "플레이리스트 이어보기"
                     },
-                    "show_scrubber": "스크러버 보이기",
+                    "show_scrubber": "스크러버 표시",
                     "track_activity": "영상 재생 기록 활성화",
                     "vr_tag": {
                         "description": "VR 버튼은 이 태그를 가진 영상에서만 보여질 것입니다.",
@@ -734,7 +751,8 @@
                     },
                     "enable_chromecast": "크롬캐스트 활성화",
                     "disable_mobile_media_auto_rotate": "모바일 환경에서 전체화면 시 자동 방향 회전 비활성화",
-                    "show_ab_loop_controls": "구간반복 기능 활성화"
+                    "show_ab_loop_controls": "구간반복 기능 활성화",
+                    "show_range_markers": "범위 마커 표시"
                 }
             },
             "scene_wall": {
@@ -834,7 +852,7 @@
         "not_null": "값 존재함",
         "format_string_excludes": "{criterion} {modifierString} {valueString} ({excludedString} 제외)",
         "format_string_excludes_depth": "{criterion} {modifierString} {valueString} ({excludedString} 제외) (+{depth, plural, =-1 {all} other {{depth}}})",
-        "format_string_depth": "{criterion} {modifierString} {valueString} (+{depth, plural, =-1 {all} other {{depth}}})"
+        "format_string_depth": "{criterion} {modifierString} {valueString} (+{depth, plural, =-1 {all} other {{depth}}}수준)"
     },
     "custom": "커스텀",
     "date": "날짜",
@@ -897,7 +915,6 @@
             "destination": "다른 태그와 합쳐질 태그",
             "source": "다른 태그로 합쳐질 태그"
         },
-        "overwrite_filter_confirm": "정말 원래 저장되어 있었던 쿼리 {entityName}을 덮어쓰시겠습니까?",
         "reassign_entity_title": "{count, plural, one {{singularEntity} 재할당} other {{pluralEntity} 재할당}}",
         "scene_gen": {
             "clip_previews": "이미지 클립 미리보기",
@@ -910,7 +927,7 @@
             "marker_image_previews": "마커 움직이는 이미지 미리보기",
             "marker_image_previews_tooltip": "애니메이션(webp) 미리보기도 생성합니다. 영상/마커 월 미리보기 유형이 '애니메이션 이미지'로 설정된 경우에만 필요합니다. '비디오 미리보기'보다 CPU를 덜 사용하지만, '비디오 미리보기'에 추가적으로 생성되기 때문에 파일 크기가 커집니다.",
             "marker_screenshots": "마커 스크린샷",
-            "marker_screenshots_tooltip": "마커 JPG 이미지. 미리보기 유형이 이미지로 설정된 경우에만 필요합니다.",
+            "marker_screenshots_tooltip": "마커 고정 JPG 이미지",
             "markers": "마커 미리보기",
             "markers_tooltip": "주어진 시간 코드에서 시작하는 20초 짜리 비디오입니다.",
             "override_preview_generation_options": "미리보기 생성 옵션 재정의",
@@ -955,7 +972,9 @@
         },
         "reassign_files": {
             "destination": "~으로 재지정"
-        }
+        },
+        "overwrite_filter_warning": "저장된 필터 \"{entityName}\"은 덮어쓰기될 것입니다.",
+        "set_default_filter_confirm": "정말로 이 필터를 기본값으로 설정하시겠습니까?"
     },
     "dimensions": "해상도",
     "director": "감독",
@@ -965,7 +984,8 @@
         "list": "목록",
         "tagger": "태거",
         "unknown": "알 수 없음",
-        "wall": "월 모드"
+        "wall": "월 모드",
+        "label_current": "디스플레이 모드: {current}"
     },
     "donate": "후원",
     "dupe_check": {
@@ -1023,7 +1043,13 @@
         "header": "오류",
         "loading_type": "{type}을(를) 로딩하는 중 오류가 발생했습니다",
         "invalid_javascript_string": "유효하지 않은 자바스크립트 코드입니다: {error}",
-        "invalid_json_string": "유효하지 않은 JSON 문자열입니다: {error}"
+        "invalid_json_string": "유효하지 않은 JSON 문자열입니다: {error}",
+        "custom_fields": {
+            "field_name_required": "항목 이름이 필요합니다",
+            "field_name_whitespace": "항목 이름의 전후에 공백이 없어야 합니다",
+            "duplicate_field": "항목 이름은 중복될 수 없습니다",
+            "field_name_length": "항목 이름의 글자 수는 65글자보다 작아야 합니다"
+        }
     },
     "ethnicity": "인종",
     "existing_value": "존재하는 값",
@@ -1092,7 +1118,8 @@
     "last_played_at": "마지막 재생 날짜",
     "library": "라이브러리",
     "loading": {
-        "generic": "로드 중…"
+        "generic": "로드 중…",
+        "plugins": "플러그인 로딩 중…"
     },
     "marker_count": "마커 개수",
     "markers": "마커",
@@ -1105,11 +1132,11 @@
         "interactive_speed": "인터랙티브 속도",
         "performer_card": {
             "age": "{age} {years_old}",
-            "age_context": "작품에서 {age} {years_old}"
+            "age_context": "제작 당시 {age} {years_old}"
         },
         "phash": "PHash",
-        "play_count": "재생 횟수",
-        "play_duration": "재생 길이",
+        "play_count": "재생된 횟수",
+        "play_duration": "재생된 길이",
         "stream": "스트림",
         "video_codec": "비디오 코덱",
         "o_count": "싼 횟수"
@@ -1163,21 +1190,21 @@
         "network_error": "네트워크 오류",
         "no_results_found": "결과가 없습니다.",
         "number_of_performers_will_be_processed": "{performer_count}명의 배우들이 처리됩니다",
-        "performer_already_tagged": "이 배우에 이미 존재하는 태그입니다",
+        "performer_already_tagged": "배우가 이미 태그되어 있음",
         "performer_names_separated_by_comma": "배우 이름 (,으로 구분)",
         "performer_selection": "배우 선택",
         "performer_successfully_tagged": "배우 태깅에 성공했습니다:",
         "query_all_performers_in_the_database": "데이터베이스의 모든 배우",
         "refresh_tagged_performers": "태그된 배우 새로고침",
-        "refreshing_will_update_the_data": "새로고침하면 Stash-box 인스턴스에 있는 태그된 배우들의 데이터가 업데이트될 것입니다.",
+        "refreshing_will_update_the_data": "'새로고침'을 통해, Stash-box 인스턴스로부터 태그된 배우들의 데이터를 업데이트합니다.",
         "status_tagging_job_queued": "상태: 태그 작업 대기열 추가됨",
         "status_tagging_performers": "상태: 배우 태그 중",
         "tag_status": "태그 상태",
         "to_use_the_performer_tagger": "배우 태거를 사용하기 위해서는 stash-box 인스턴스가 설정되어야 합니다.",
         "untagged_performers": "태그되지 않은 배우",
-        "update_performer": "배우 수정",
-        "update_performers": "배우 수정",
-        "updating_untagged_performers_description": "태그가 지정되지 않은 배우를 업데이트하면, Stash ID가 없는 배우와 비교해본 뒤 메타데이터를 업데이트할 것입니다."
+        "update_performer": "배우 업데이트",
+        "update_performers": "배우 업데이트",
+        "updating_untagged_performers_description": "'태그되지 않은 배우 업데이트'를 통해, Stash ID가 없는 배우들에 대한 데이터를 찾아보고, 가능하다면 이를 이용해 배우를 업데이트합니다."
     },
     "performer_tags": "배우 태그",
     "performers": "배우",
@@ -1208,14 +1235,16 @@
         "edit_filter": "필터 수정",
         "name": "필터",
         "saved_filters": "저장된 필터",
-        "update_filter": "필터 업데이트"
+        "update_filter": "필터 업데이트",
+        "more_filter_criteria": "외 {count} 개",
+        "search_term": "검색어"
     },
     "second": "초",
     "seconds": "초",
     "settings": "설정",
     "setup": {
         "confirm": {
-            "almost_ready": "거의 설정을 완료했습니다. 아래 설정들을 확인해주세요. 틀린 내용이 있다면 이전으로 돌아가 변경할 수 있습니다. 내용이 모두 맞다면, '확인'을 눌러 시스템을 만드세요.",
+            "almost_ready": "거의 설정을 완료했습니다. 아래 설정들을 확인해주세요. 틀린 내용이 있다면 이전으로 돌아가 변경할 수 있습니다. 내용이 모두 맞다면, '확인'을 눌러 시스템을 생성하세요.",
             "blobs_directory": "바이너리 데이터 경로",
             "cache_directory": "캐시 파일 경로",
             "configuration_file_location": "설정 파일 위치:",
@@ -1495,5 +1524,28 @@
     "include_sub_studio_content": "서브스튜디오 컨텐츠 포함",
     "include_sub_tag_content": "서브태그 컨텐츠 포함",
     "time_end": "종료 시간",
-    "include_sub_groups": "서브그룹 포함"
+    "include_sub_groups": "서브그룹 포함",
+    "custom_fields": {
+        "value": "값",
+        "field": "항목",
+        "title": "커스텀 항목",
+        "criteria_format_string": "{criterion} (커스텀 항목) {modifierString} {valueString}",
+        "criteria_format_string_others": "{criterion} (커스텀 항목) {modifierString} {valueString} (+{others} 기타)"
+    },
+    "login": {
+        "password": "비밀번호",
+        "invalid_credentials": "유효하지 않은 사용자 이름 또는 비밀번호입니다",
+        "login": "로그인",
+        "internal_error": "예상치 못한 내부 에러입니다. 로그에서 세부 사항을 확인하세요",
+        "username": "사용자 이름"
+    },
+    "age_on_date": "제작 당시 {age}살",
+    "sort_name": "이름 (sort name)",
+    "criterion_modifier_values": {
+        "none": "값 없음",
+        "only": "해당 값만 존재",
+        "any": "값 존재",
+        "any_of": "해당 값 중 일부 포함"
+    },
+    "eta": "예상 소요 시간"
 }
diff --git a/ui/v2.5/src/locales/lt-LT.json b/ui/v2.5/src/locales/lt-LT.json
new file mode 100644
index 000000000..0007adb26
--- /dev/null
+++ b/ui/v2.5/src/locales/lt-LT.json
@@ -0,0 +1,112 @@
+{
+    "actions": {
+        "add": "Pridėti",
+        "add_directory": "Pridėti katalogą",
+        "add_entity": "Pridėti {entityType}",
+        "add_manual_date": "Įvesti datą rankini būdu",
+        "add_sub_groups": "Pridėti pogrupius",
+        "add_o": "Pridėti O",
+        "add_to_entity": "Pridėti prie {entityType}",
+        "allow": "Leisti",
+        "allow_temporarily": "Leisti laikinai",
+        "anonymise": "Anonimizuoti",
+        "apply": "Taikyti",
+        "assign_stashid_to_parent_studio": "Priskirti Stash ID esamai pagrindinei studijai ir atnaujinti metaduomenis",
+        "auto_tag": "Auto žymė",
+        "browse_for_image": "Ieškoti vaizdo…",
+        "cancel": "Atšaukti",
+        "choose_date": "Pasirinkti datą",
+        "clean": "Valyti",
+        "clean_generated": "Išvalyti sugeneruotus failus",
+        "clear": "Valyti",
+        "clear_date_data": "Valyti datos duomenis",
+        "clear_front_image": "Valyti priekinį vaizdą",
+        "clear_back_image": "Valyti galinį vaizdą",
+        "clear_image": "Valyti vaizdą",
+        "close": "Uždaryti",
+        "confirm": "Patvirtinti",
+        "continue": "Tęsti",
+        "copy_to_clipboard": "Kopijuoti į iškarpinę",
+        "create": "Sukurti",
+        "create_chapters": "Sukurti skyrių",
+        "create_entity": "Sukurti {entityType}",
+        "create_marker": "Sukurti žymeklį",
+        "create_parent_studio": "Sukurti pagrindinę studiją",
+        "created_entity": "Sukurtas {entity_type}: {entity_name}",
+        "customise": "Tinkinti",
+        "delete": "Ištrinti",
+        "delete_entity": "Ištrinti {entityType}",
+        "delete_file": "Ištrinti failą",
+        "delete_file_and_funscript": "Ištrinti failą (ir funscript)",
+        "delete_generated_supporting_files": "Ištrinti sugeneruotus pagalbinius failus",
+        "disable": "Išjungti",
+        "disallow": "Neleisti",
+        "download": "Atsisiųsti",
+        "download_anonymised": "Atsisiųsti anonimizuotą",
+        "download_backup": "Atsisiųsti atsarginę kopiją",
+        "edit": "Redaguoti",
+        "edit_entity": "Redaguoti {entityType}",
+        "enable": "Įjungti",
+        "encoding_image": "Koduojamas vaizdas…",
+        "export": "Eksportuoti",
+        "export_all": "Eksportuoti visus…",
+        "find": "Rasti",
+        "finish": "Baigti",
+        "from_file": "Iš failo…",
+        "from_url": "Iš URL…",
+        "full_export": "Pilnas eksportas",
+        "full_import": "Pilnas importas",
+        "generate": "Generuoti",
+        "generate_thumb_default": "Sugeneruoti numatytąją miniatiūrą",
+        "generate_thumb_from_current": "Sugeneruoti miniatiūrą iš dabartinio",
+        "hide": "Paslėpti",
+        "hide_configuration": "Paslėpti konfiguraciją",
+        "identify": "Atpažinti",
+        "ignore": "Ignoruoti",
+        "import": "Importuoti…",
+        "import_from_file": "Importuoti iš failo",
+        "load": "Krauti",
+        "load_filter": "Užkrauti filtrą",
+        "logout": "Atsijungti",
+        "make_primary": "Padaryti pirminiu",
+        "merge": "Sulieti",
+        "merge_from": "Sulieti iš",
+        "merge_into": "Sulieti į",
+        "next_action": "Kitas",
+        "not_running": "Nevykdomas",
+        "open_in_external_player": "Atidaryti išoriniame grotuve",
+        "open_random": "Atidaryti atsitiktinį",
+        "optimise_database": "Optimizuoti duomenų bazę",
+        "overwrite": "Perrašyti",
+        "play": "Groti",
+        "play_random": "Groti atsitiktinį",
+        "play_selected": "Groti pasirinktą",
+        "preview": "Peržiūra",
+        "previous_action": "Atgal",
+        "reassign": "Priskirti iš naujo",
+        "refresh": "Atnaujinti",
+        "reload": "Perkrauti",
+        "reload_plugins": "Perkrauti papildinius",
+        "reload_scrapers": "Perkrauti skreperius",
+        "remove": "Šalinti",
+        "remove_date": "Šalinti datą",
+        "remove_from_containing_group": "Šalinti iš grupės",
+        "remove_from_gallery": "Šalinti iš galerijos",
+        "rename_gen_files": "Pervadinti sugeneruotus failus",
+        "rescan": "Pakartotinai nuskaityti",
+        "reset_play_duration": "Atstatyti grojimo trukmę",
+        "reset_resume_time": "Atstatyti tęsimo laiką",
+        "reset_cover": "Atkurti numatytąjį viršelį",
+        "reshuffle": "Permaišyti",
+        "running": "Vykdoma",
+        "save": "Išsaugoti",
+        "save_delete_settings": "Naudoti šias parinktis kaip numatytąsias trinant",
+        "save_filter": "Išsaugoti filtrą",
+        "scan": "Skenuoti",
+        "search": "Ieškoti",
+        "select_all": "Pasirinkti visus",
+        "select_entity": "Pasirinkti {entityType}",
+        "select_folders": "Pasirinkti katalogus",
+        "select_none": "Atžymėti viską"
+    }
+}
diff --git a/ui/v2.5/src/locales/lv-LV.json b/ui/v2.5/src/locales/lv-LV.json
index b90c34df2..e61f8f9ab 100644
--- a/ui/v2.5/src/locales/lv-LV.json
+++ b/ui/v2.5/src/locales/lv-LV.json
@@ -64,13 +64,13 @@
         "add_sub_groups": "Pievienot apakšgrupas",
         "from_file": "No Faila…",
         "from_url": "No URL…",
-        "disallow": "Neatļaut",
+        "disallow": "Aizliegt",
         "download": "Lejupielādēt",
         "download_anonymised": "Lejupielādēt anonīmi",
         "download_backup": "Lejupielādēt Dublējumu",
         "edit": "Rediģēt",
         "edit_entity": "Rediģēt {entityType}",
-        "enable": "Iepējot",
+        "enable": "Iespējot",
         "encoding_image": "Konstruē bildi…",
         "export_all": "Eksportēt visu…",
         "find": "Atrast",
@@ -80,7 +80,7 @@
         "hide_configuration": "Paslēpt Konfigurāciju",
         "identify": "Identificēt",
         "ignore": "Ignorēt",
-        "import": "Importēt…",
+        "import": "Ievietot…",
         "hide": "Paslēpt",
         "make_primary": "Padarīt primāro",
         "merge_from": "Apvienot no",
@@ -100,7 +100,7 @@
         "reload_plugins": "Pārlādēt spraudņus",
         "refresh": "Atsvaidzināt",
         "disable": "Atspējot",
-        "export": "Eksportēt",
+        "export": "Izgūt",
         "logout": "Izrakstīties",
         "full_export": "Pilns Eksports",
         "full_import": "Pilns Imports",
@@ -108,7 +108,17 @@
         "generate_thumb_from_current": "Ģenerēt sīktēlu no pašreizējā",
         "import_from_file": "Importēt no faila",
         "merge": "Apvienot",
-        "migrate_scene_screenshots": "Migrēt Video Ekrānšāviņus"
+        "migrate_scene_screenshots": "Migrēt Video Ekrānšāviņus",
+        "save": "Saglabāt",
+        "search": "Meklēt",
+        "skip": "Izlaist",
+        "split": "Sadalīt",
+        "stop": "Apturēt",
+        "submit": "Iesniegt",
+        "remove": "Noņemt",
+        "rescan": "Skenēt pa jaunu",
+        "scan": "Skenēt",
+        "show": "Rādīt"
     },
     "unknown_date": "Nezināms datums",
     "twitter": "Twitter",
@@ -117,5 +127,54 @@
     "zip_file_count": "Zip Failu Skaits",
     "weight_kg": "Svars (kg)",
     "weight": "Svars",
-    "years_old": "Gadus vecs"
+    "years_old": "Gadus vecs",
+    "component_tagger": {
+        "config": {
+            "query_mode_filename": "Datnes nosaukums",
+            "blacklist_label": "Melnais saraksts",
+            "query_mode_dir": "Mape",
+            "query_mode_metadata": "Metadati"
+        }
+    },
+    "actions_name": "Darbības",
+    "age": "Vecums",
+    "aliases": "Aizstājvārdi",
+    "all": "visi",
+    "ascending": "Augošā secībā",
+    "between_and": "un",
+    "birthdate": "Dzimšanas datums",
+    "blobs_storage_type": {
+        "filesystem": "Datņsistēma",
+        "database": "Datubāze"
+    },
+    "captions": "Subtitri",
+    "chapters": "Nodaļas",
+    "config": {
+        "categories": {
+            "security": "Drošība",
+            "tools": "Rīki",
+            "changelog": "Izmaiņu žurnāls",
+            "plugins": "Spraudņi"
+        },
+        "general": {
+            "plugins_path": {
+                "description": "Ceļš uz spraudņu konfigurācijas mapi",
+                "heading": "Spraudņu mape"
+            }
+        },
+        "plugins": {
+            "available_plugins": "Pieejamie spraudņi",
+            "installed_plugins": "Uzstādītie spraudņi"
+        },
+        "tasks": {
+            "cleanup_desc": "Meklēt trūkstošos failus un noņemt tos no datubāzes. Šī darbība ir neatgriezeniska."
+        },
+        "about": {
+            "check_for_new_version": "Pārbaudīt, vai pieejama jauna versija"
+        }
+    },
+    "donate": "Ziedot",
+    "package_manager": {
+        "check_for_updates": "Pārbaudīt, vai pieejami atjauninājumi"
+    }
 }
diff --git a/ui/v2.5/src/locales/nb-NO.json b/ui/v2.5/src/locales/nb-NO.json
index 883b33b34..a160a2991 100644
--- a/ui/v2.5/src/locales/nb-NO.json
+++ b/ui/v2.5/src/locales/nb-NO.json
@@ -5,7 +5,7 @@
         "confirm": "Bekreft",
         "continue": "Fortsett",
         "close": "Lukk",
-        "reset_cover": "Tilbakestill Standard Omslag",
+        "reset_cover": "Tilbakestill Standard Forsidebilde",
         "remove": "Fjern",
         "running": "kjører",
         "submit_stash_box": "Send til Stash-Box",
@@ -29,7 +29,7 @@
         "save_delete_settings": "Bruk disse alternativene som standard når du sletter",
         "save_filter": "Lagre filter",
         "scan": "Skann",
-        "scrape": "Skrape",
+        "scrape": "Skrap",
         "create": "Opprett",
         "create_chapters": "Opprett Kapittel",
         "create_marker": "Opprett Markør",
@@ -61,22 +61,22 @@
         "created_entity": "Opprettet {entity_type}: {entity_name}",
         "merge_from": "Slå sammen fra",
         "clean_generated": "Rydd opp i genererte filer",
-        "clear": "Tøm",
+        "clear": "Fjern",
         "clear_back_image": "Fjern bakbilde",
         "clear_date_data": "Fjern dato data",
         "clear_image": "Fjern Bilde",
         "create_parent_studio": "Opprett foreldre studio",
         "customise": "Tilpass",
-        "disallow": "Ikke tillat",
+        "disallow": "Forby",
         "download_anonymised": "Last ned anonymisert",
         "export_all": "Eksporter alle…",
-        "full_export": "Full eksport",
-        "full_import": "Full Import",
+        "full_export": "Eksporter alle",
+        "full_import": "Importer alle",
         "hash_migration": "hash migrering",
         "make_primary": "Gjør til Primær",
         "previous_action": "Tilbake",
         "refresh": "Oppdater",
-        "reload": "Last på nytt",
+        "reload": "Last inn på nytt",
         "not_running": "Kjører ikke",
         "open_in_external_player": "Åpne i ekstern spiller",
         "remove_date": "Fjern dato",
@@ -105,9 +105,9 @@
         "view_history": "Visningshistorikk",
         "view_random": "Vis Tilfeldig",
         "migrate_blobs": "Migrer Blobs",
-        "migrate_scene_screenshots": "Migrer Scene Skjermbilder",
-        "reassign": "Omplasser",
-        "reload_plugins": "Last inn plugins på nytt",
+        "migrate_scene_screenshots": "Flytt Scene Skjermbilder",
+        "reassign": "Tilordne på nytt",
+        "reload_plugins": "Last inn programtillegg på nytt",
         "reload_scrapers": "Last inn skrapere på nytt",
         "scrape_scene_fragment": "Skrap etter fragment",
         "set_back_image": "Baksidebilde…",
@@ -119,7 +119,7 @@
         "cancel": "Avbryt",
         "apply": "Bruk",
         "assign_stashid_to_parent_studio": "Tildel Stash ID til eksisterende foreldre studio og oppdater metadata",
-        "add_to_entity": "Legg til til {entityType}",
+        "add_to_entity": "Legg til {entityType}",
         "add_entity": "Legg til {entityType}",
         "add_manual_date": "Legg til manuell dato",
         "add_directory": "Legg til mappe",
@@ -138,10 +138,18 @@
         "play_selected": "Spill av valgte",
         "rescan": "Skann på nytt",
         "reshuffle": "Stokk om",
-        "rename_gen_files": "Gi nytt navn til genererte filer",
-        "selective_auto_tag": "Selektiv Automatisk Tagging",
+        "rename_gen_files": "Gi genererte filer nytt navn",
+        "selective_auto_tag": "Selektiv Auto Tag",
         "set_image": "Velg bilde…",
-        "selective_clean": "Selektiv Rens"
+        "selective_clean": "Selektiv Fjerning",
+        "sidebar": {
+            "close": "lukk sidebar",
+            "open": "åpne sidebar",
+            "toggle": "Endre sidepanelet"
+        },
+        "show_results": "Vis resultater",
+        "show_count_results": "Vis {count} resultater",
+        "play": "Spill av"
     },
     "component_tagger": {
         "config": {
@@ -175,8 +183,23 @@
         "noun_query": "Forespørsel",
         "results": {
             "duration_off": "Varighet avviker fra forventet verdi med minst {number}s",
-            "duration_unknown": "Ukjent varighet"
-        }
+            "duration_unknown": "Ukjent varighet",
+            "phash_matches": "{count} PHash-er stemmer overens",
+            "unnamed": "Uten navn",
+            "hash_matches": "{hash_type} stemmer overens",
+            "match_failed_already_tagged": "Scenen er allerede tagget",
+            "match_failed_no_result": "Ingen resultater funnet",
+            "fp_found": "{fpCount, plural, =0 {Ingen nye fingeravtrykksmatch funnet} other {# nye fingeravtrykksmatch funnet}}",
+            "fp_matches": "Varighet stemmer overens",
+            "fp_matches_multi": "Varighet samsvarer med {matchCount} av {durationsLength} fingeravtrykk",
+            "match_success": "Scenen ble tagget vellykket"
+        },
+        "verb_match_fp": "Match Fingeravtrykk",
+        "verb_matched": "Matchet",
+        "verb_scrape_all": "Skrap alle",
+        "verb_submit_fp": "Send inn {fpCount, plural, one{# Fingeravtrykk} andre{# Fingerprints}}",
+        "verb_toggle_config": "{toggle} {configuration}",
+        "verb_toggle_unmatched": "{toggle} vis scener uten treff"
     },
     "config": {
         "dlna": {
@@ -192,7 +215,14 @@
             "allow_temp_ip": "Tillatt {tempIP}",
             "allowed_ip_addresses": "Tillatt IP adresser",
             "server_port": "Serverport",
-            "server_display_name": "Server Visningsnavn"
+            "server_display_name": "Server Visningsnavn",
+            "server_display_name_desc": "Visningsnavn for DLNA-serveren. Standard til {server_navn} hvis tom.",
+            "server_port_desc": "Port for å kjøre DLNA-serveren på. Krever omstart av DLNA etter endring.",
+            "until_restart": "frem til omstart",
+            "network_interfaces_desc": "Grensesnitt for å eksponere DLNA-server på. En tom liste resulterer i å kjøre på alle grensesnitt. Krever omstart av DLNA etter endring.",
+            "successfully_cancelled_temporary_behaviour": "Vellykket kansellert midlertidig oppførsel",
+            "video_sort_order_desc": "Rekkefølgen som videoer sorteres etter som standard.",
+            "video_sort_order": "Standard videosortering"
         },
         "about": {
             "stash_open_collective": "Støtt oss gjennom {url}",
@@ -203,7 +233,10 @@
             "check_for_new_version": "Sjekk for ny versjon",
             "latest_version": "Siste versjon",
             "latest_version_build_hash": "Siste Versjon Build Hash:",
-            "build_time": "Kompileringstid:"
+            "build_time": "Kompileringstid:",
+            "stash_wiki": "stash {url} side",
+            "build_hash": "bygg hash:",
+            "stash_home": "Stash-startside på {url}"
         },
         "advanced_mode": "Avansert Modus",
         "categories": {
@@ -227,18 +260,533 @@
                 "log_file": "Log-fil",
                 "generate_api_key": "Generer API-nøkkel",
                 "log_to_terminal": "Log til terminal",
-                "password": "Passord"
+                "password": "Passord",
+                "log_http_desc": "Logger HTTP-tilgang til terminalen. Krever omstart.",
+                "authentication": "Autentisering",
+                "clear_api_key": "Fjern API-nøkkel",
+                "credentials": {
+                    "description": "Brukernavn og passord for å sikre tilgang til Stash.",
+                    "heading": "Påloggingsinformasjon"
+                },
+                "log_file_desc": "Sti til filen hvor logg skal lagres. La feltet stå tomt for å deaktivere fillogging. Krever omstart.",
+                "log_http": "Logg HTTP-tilgang",
+                "log_to_terminal_desc": "Logger til terminalen i tillegg til en fil. Er alltid aktivert hvis fillogging er deaktivert. Krever omstart.",
+                "maximum_session_age": "Maksimal levetid for økt",
+                "maximum_session_age_desc": "Maksimal inaktiv tid før en innloggingsøkt utløper, i sekunder. Krever omstart.",
+                "password_desc": "Passord for å få tilgang til Stash. La stå tomt for å deaktivere brukergodkjenning",
+                "stash-box_integration": "ntegrasjon med Stash-box",
+                "username_desc": "Brukernavn for å få tilgang til Stash. La stå tomt for å deaktivere brukergodkjenning",
+                "api_key_desc": "API-nøkkel for eksterne systemer. Kun nødvendig når brukernavn/passord er konfigurert. Brukernavn må lagres før API-nøkkel kan genereres."
             },
             "db_path_head": "Database filbane",
             "ffmpeg": {
                 "download_ffmpeg": {
-                    "heading": "Last ned FFmpeg"
+                    "heading": "Last ned FFmpeg",
+                    "description": "Laster ned FFmpeg til konfigurasjonsmappen og tilbakestiller ffmpeg- og ffprobe-banene til å bruke konfigurasjonsmappen i stedet."
                 },
                 "hardware_acceleration": {
-                    "heading": "FFmpeg maskinvare encoding"
+                    "heading": "Maskinvareakselerert koding med FFmpeg",
+                    "desc": "Bruker tilgjengelig maskinvare til å kode video for sanntids-transkoding."
+                },
+                "ffmpeg_path": {
+                    "description": "Bane til ffmpeg-programmet (ikke bare mappen). Hvis den er tom, vil ffmpeg bli funnet fra miljøet via $PATH, konfigurasjonsmappen eller fra $HOME/.stash",
+                    "heading": "FFmpeg kjørbar filbane"
+                },
+                "ffprobe_path": {
+                    "heading": "FFmpeg kjørbar filbane",
+                    "description": "Bane til ffprobe-kjørbar fil (ikke bare mappen). Hvis feltet er tomt, vil ffprobe bli hentet fra miljøet via $PATH, konfigurasjonsmappen eller fra $HOME/.stash"
+                },
+                "live_transcode": {
+                    "input_args": {
+                        "heading": "FFmpeg sanntids-transkoding inndata-argumenter",
+                        "desc": "Avansert: Ekstra argumenter som sendes til ffmpeg før inndatafeltet ved sanntids-transkoding av video."
+                    },
+                    "output_args": {
+                        "heading": "FFmpeg sanntids-transkoding utdata-argumenter",
+                        "desc": "Avansert: Ekstra argumenter som sendes til ffmpeg før utdatafeltet ved sanntids-transkoding av video."
+                    }
+                },
+                "transcode": {
+                    "input_args": {
+                        "desc": "Avansert: Ekstra argumenter som sendes til ffmpeg før inndatafeltet ved generering av video.",
+                        "heading": "FFmpeg transkoding inndata-argumenter"
+                    },
+                    "output_args": {
+                        "desc": "Avansert: Ekstra argumenter som sendes til ffmpeg før utdatafeltet ved generering av video.",
+                        "heading": "FFmpeg transkoding utdata-argumenter"
+                    }
                 }
             },
-            "database": "Database"
+            "database": "Database",
+            "backup_directory_path": {
+                "heading": "Sti til sikkerhetskopimappe",
+                "description": "Mappeplassering for sikkerhetskopier av SQLite-databasefilen"
+            },
+            "blobs_storage": {
+                "description": "Hvor binærdata som scenecovers, bilder av skuespillere, studioer og tagger skal lagres. Etter at denne verdien endres, må eksisterende data migreres ved hjelp av oppgaven “Migrer blobs”. Se oppgavesiden for migrering.",
+                "heading": "Lagringstype for binærdata"
+            },
+            "blobs_path": {
+                "description": "Hvor i filsystemet binærdata skal lagres. Gjelder kun når filsystem er valgt som lagringstype for blob-data. ADVARSEL: Endring av dette krever at eksisterende data flyttes manuelt.",
+                "heading": "Sti for lagring av binærdata"
+            },
+            "cache_path_head": "Sti til hurtigbuffer",
+            "chrome_cdp_path": "Sti til Chrome CDP",
+            "cache_location": "Mappeplassering for hurtigbufferen. Påkrevd ved strømming med HLS (f.eks. på Apple-enheter) eller DASH.",
+            "calculate_md5_and_ohash_desc": "Beregn MD5-sjekksum i tillegg til oshash. Å aktivere dette vil gjøre innledende skanninger tregere. Filnavn-hash må være satt til oshash for å deaktivere MD5-beregning.",
+            "calculate_md5_and_ohash_label": "Beregn MD5 for videoer",
+            "check_for_insecure_certificates": "Sjekk etter usikre sertifikater",
+            "check_for_insecure_certificates_desc": "Noen nettsteder bruker usikre SSL-sertifikater. Når dette er avhuket, hopper skraperen over kontrollen av sertifikater og tillater skraping av slike nettsteder. Hvis du får en sertifikatfeil under skraping, fjern avhukingen her.",
+            "chrome_cdp_path_desc": "Filsti til Chrome-kjørbar fil, eller en ekstern adresse (som begynner med http:// eller https://, for eksempel http://localhost:9222/json/version) til en Chrome-instans.",
+            "create_galleries_from_folders_desc": "Hvis aktivert, opprettes gallerier automatisk fra mapper som inneholder bilder. Opprett en fil kalt .forcegallery eller .nogallery i en mappe for å henholdsvis tvinge eller hindre dette.",
+            "create_galleries_from_folders_label": "Lag gallerier automatisk fra bildemapper",
+            "directory_locations_to_your_content": "Stier til innholdskataloger",
+            "excluded_image_gallery_patterns_desc": "Regexps av bilde og galleri filer/filbaner å utelukke fra Scan og legge til Clean",
+            "excluded_video_patterns_desc": "Regexps av video filer/filbaner å utelukke fra Scan og legge til Clean",
+            "excluded_image_gallery_patterns_head": "Utelukkede Bilde-/Gallerimønstre",
+            "excluded_video_patterns_head": "Utelukkede Videomønstre",
+            "image_ext_head": "Bilde-filendelser",
+            "plugins_path": {
+                "description": "Mappestedsplassering for plugin-konfigurasjonsfiler",
+                "heading": "Plugin-bane"
+            },
+            "scrapers_path": {
+                "heading": "Scraper-bane",
+                "description": "Mappestedsplassering for scraper-konfigurasjonsfiler"
+            },
+            "scraping": "Scraping",
+            "logging": "Logging",
+            "maximum_transcode_size_head": "Maksimal transkodingsstørrelse",
+            "funscript_heatmap_draw_range": "Inkluder område i genererte varmekart",
+            "funscript_heatmap_draw_range_desc": "Tegn bevegelsesområde på y-aksen i det genererte varmekartet. Eksisterende varmekart må genereres på nytt etter endring.",
+            "generated_file_naming_hash_head": "Hash for generert filnavngivning",
+            "generated_path_head": "Generert bane",
+            "maximum_streaming_transcode_size_head": "Maksimal størrelse for strømmingstranskoding",
+            "maximum_transcode_size_desc": "Maksimal størrelse for genererte transkodinger",
+            "number_of_parallel_task_for_scan_generation_head": "Antall parallelle oppgaver for skanning/generering",
+            "scraper_user_agent_desc": "User-Agent-streng som brukes under HTTP-forespørsler for scraping",
+            "gallery_cover_regex_desc": "Regexp som brukes for å identifisere et bilde som galleriomslag",
+            "include_audio_desc": "Inkluderer lydstrøm ved generering av forhåndsvisninger.",
+            "include_audio_head": "Inkluder lyd",
+            "maximum_streaming_transcode_size_desc": "Maksimal størrelse for transkodede strømmer",
+            "metadata_path": {
+                "heading": "Metadatabane",
+                "description": "Mappestedsplassering som brukes ved full eksport eller import"
+            },
+            "python_path": {
+                "description": "Bane til Python-kjørbar fil (ikke bare mappen). Brukes for skript-skapere og plugins. Hvis tomt, vil Python bli hentet fra miljøet",
+                "heading": "Python kjørbar filbane"
+            },
+            "generated_file_naming_hash_desc": "Bruk MD5 eller oshash for generert filnavngivning. Endring av dette krever at alle scener har den aktuelle MD5/oshash-verdien fylt ut. Etter å ha endret denne verdien, må eksisterende genererte filer migreres eller genereres på nytt. Se Oppgaver-siden for migrering.",
+            "heatmap_generation": "Funscript-varmekartgenerering",
+            "number_of_parallel_task_for_scan_generation_desc": "Sett til 0 for automatisk deteksjon. Advarsel: Å kjøre flere oppgaver enn nødvendig for å oppnå 100 % CPU-utnyttelse vil redusere ytelsen og kan potensielt forårsake andre problemer.",
+            "sqlite_location": "Filplassering for SQLite-databasen (krever omstart). ADVARSEL: Å lagre databasen på et annet system enn der Stash-serveren kjører (f.eks. over nettverket) støttes ikke!",
+            "image_ext_desc": "Kommaseparert liste over filendelser som vil bli identifisert som bilder.",
+            "parallel_scan_head": "Parallell skanning/generering",
+            "video_ext_desc": "Kommaseparert liste over filendelser som vil bli identifisert som videoer.",
+            "gallery_cover_regex_label": "Mønster for galleriomslag",
+            "gallery_ext_desc": "Kommaseparert liste over filendelser som vil bli identifisert som galleri-zip-filer.",
+            "gallery_ext_head": "Galleri-zip-filendelser",
+            "generated_files_location": "Mappestedsplassering for de genererte filene (scene-markører, scene-forhåndsvisninger, sprites, osv.)",
+            "hashing": "Hashing",
+            "preview_generation": "Forhåndsvisningsgenerering",
+            "scraper_user_agent": "Scraper-brukeragent",
+            "video_ext_head": "Video-filendelser",
+            "video_head": "Video"
+        },
+        "application_paths": {
+            "heading": "applikasjon baner"
+        },
+        "tasks": {
+            "plugin_tasks": "Plugin-oppgaver",
+            "generate_thumbnails_during_scan": "Generer miniatyrbilder for bilder",
+            "identify": {
+                "source": "Kilde",
+                "tag_skipped_matches": "Tagg hoppet over treff med",
+                "and_create_missing": "og skape mangler",
+                "create_missing": "Lag mangler",
+                "description": "Angi automatisk scenemetadata ved hjelp av stash-box- og scraper-kilder.",
+                "field": "Felt",
+                "identifying_scenes": "Identifisering av {num} {scene}",
+                "include_male_performers": "Inkluder mannlige utøvere",
+                "set_cover_images": "Sett forsidebilder",
+                "tag_skipped_performers": "Tagg hoppet over utøvere med",
+                "default_options": "Standardalternativer",
+                "set_organized": "Sett organisert flagg",
+                "identifying_from_paths": "Identifisere scener fra følgende stier",
+                "tag_skipped_performer_tooltip": "Opprett en tagg som «Identifiser: Enkeltnavnsutøver» som du kan filtrere etter i scenetaggervisningen, og velg hvordan du vil håndtere disse utøverne",
+                "explicit_set_description": "Følgende alternativer vil bli brukt der de ikke overstyres i de kildespesifikke alternativene.",
+                "field_behaviour": "{strategi} {felt}",
+                "field_options": "Feltalternativer",
+                "heading": "Identifisere",
+                "skip_multiple_matches": "Hopp over treff som har mer enn ett resultat",
+                "skip_multiple_matches_tooltip": "Hvis dette ikke er aktivert og mer enn ett resultat returneres, vil ett bli tilfeldig valgt for å matche",
+                "skip_single_name_performers": "Hopp over utøvere med ett enkelt navn uten entydighet",
+                "skip_single_name_performers_tooltip": "Hvis dette ikke er aktivert, vil utøvere som ofte er generiske, som Samantha eller Olga, bli matchet",
+                "source_options": "{kilde} Alternativer",
+                "sources": "Kilder",
+                "strategy": "Strategi",
+                "tag_skipped_matches_tooltip": "Opprett en tagg som «Identifiser: Flere treff» som du kan filtrere etter i Scene Tagger-visningen og velge riktig treff manuelt"
+            },
+            "rescan": "Skann filer på nytt",
+            "auto_tag": {
+                "auto_tagging_all_paths": "Automatisk tagging av alle stier",
+                "auto_tagging_paths": "Automatisk tagging av følgende stier"
+            },
+            "auto_tag_based_on_filenames": "Automatisk tagging av innhold basert på filstier.",
+            "clean_generated": {
+                "blob_files": "Blob-filer",
+                "description": "Fjerner genererte filer uten en tilhørende databaseoppføring.",
+                "image_thumbnails": "Bildeminiatyrer",
+                "markers": "Markørforhåndsvisninger",
+                "previews": "Sceneforhåndsvisninger",
+                "sprites": "Scenesprites",
+                "transcodes": "Scenetranskodinger",
+                "image_thumbnails_desc": "Bildeminiatyrer og klipp",
+                "previews_desc": "Sceneforhåndsvisninger og miniatyrbilder"
+            },
+            "dont_include_file_extension_as_part_of_the_title": "Ikke inkluder filtypen som en del av tittelen",
+            "generate_video_previews_during_scan": "Generer forhåndsvisninger",
+            "generated_content": "Generert innhold",
+            "import_from_exported_json": "Importer fra eksportert JSON i metadatakatalogen. Sletter den eksisterende databasen.",
+            "incremental_import": "Trinnvis import fra en levert eksport-zip-fil.",
+            "job_queue": "Oppgavekø",
+            "maintenance": "Vedlikehold",
+            "anonymising_database": "Anonymisering av database",
+            "backing_up_database": "Sikkerhetskopiering av database",
+            "generate_video_previews_during_scan_tooltip": "Generer forhåndsvisninger av videoer som spilles av når du holder musepekeren over en scene",
+            "added_job_to_queue": "La til {operation_name} i jobbkøen",
+            "anonymise_and_download": "Lager en anonymisert kopi av databasen og laster ned den resulterende filen.",
+            "anonymise_database": "Lager en kopi av databasen i backup-mappen, og anonymiserer all sensitiv informasjon. Denne kan deretter deles med andre for feilsøking og debugging. Den opprinnelige databasen blir ikke endret. Den anonymiserte databasen bruker filnavnformatet {filename_format}.",
+            "backup_database": "Utfører en sikkerhetskopi av databasen til backup-mappen, med filnavnformatet {filename_format}",
+            "cleanup_desc": "Sjekk etter manglende filer og fjern dem fra databasen. Dette er en destruktiv handling.",
+            "defaults_set": "Standardinnstillinger er satt og vil bli brukt når du klikker på {action}-knappen på Oppgaver-siden.",
+            "migrate_scene_screenshots": {
+                "description": "Migrer skjermbilder av scener til det nye blob-lagringssystemet. Denne migreringen bør kjøres etter at et eksisterende system er migrert til 0.20. Kan eventuelt slette de gamle skjermbildene etter migreringen.",
+                "delete_files": "Slett skjermbildefiler",
+                "overwrite_existing": "Overskriv eksisterende blobs med skjermbildedata"
+            },
+            "data_management": "Databehandling",
+            "generate_previews_during_scan_tooltip": "Generer også animerte (webp) forhåndsvisninger, som bare er nødvendig når Forhåndsvisningstype for scene/markørvegg er satt til Animert bilde. Når du surfer, bruker de mindre CPU enn videoforhåndsvisningene, men genereres i tillegg til dem og er større filer.",
+            "generate_video_covers_during_scan": "Generer sceneomslag",
+            "optimise_database_warning": "Advarsel: Mens denne oppgaven kjører, vil alle operasjoner som endrer databasen mislykkes, og avhengig av databasestørrelsen kan det ta flere minutter å fullføre. Den krever også minst like mye ledig diskplass som databasen er stor, men 1,5 ganger anbefales.",
+            "auto_tagging": "Automatisk tagging",
+            "backup_and_download": "Utfører en sikkerhetskopi av databasen og laster ned den resulterende filen.",
+            "empty_queue": "Ingen oppgaver kjører for øyeblikket.",
+            "export_to_json": "Eksporterer databaseinnholdet til JSON-format i metadata-mappen.",
+            "generate": {
+                "generating_from_paths": "Genererer for scener fra følgende stier",
+                "generating_scenes": "Genererer for {num} {scene}"
+            },
+            "generate_clip_previews_during_scan": "Generer forhåndsvisninger for bildeklipp",
+            "generate_desc": "Generer støttefiler for bilde, sprite, video, vtt og andre filer.",
+            "generate_phashes_during_scan": "perseptuelle",
+            "generate_phashes_during_scan_tooltip": "For deduplisering og sceneidentifikasjon.",
+            "generate_previews_during_scan": "Generer animerte bildeforhåndsvisninger",
+            "generate_sprites_during_scan": "Generer scrubber-sprites",
+            "generate_sprites_during_scan_tooltip": "Bildesettet som vises under videospilleren for enkel navigering.",
+            "migrate_blobs": {
+                "delete_old": "Slett gamle data",
+                "description": "Migrer blober til gjeldende blob-lagringssystem. Denne migreringen bør kjøres etter at blob-lagringssystemet er endret. Kan eventuelt slette gamle data etter migrering."
+            },
+            "migrate_hash_files": "Brukes etter endring av den genererte filnavngivningshashen for å gi eksisterende genererte filer nytt navn til det nye hashformatet.",
+            "migrations": "Migrasjoner",
+            "only_dry_run": "Utfør kun en prøvekjøring. Ikke fjern noe",
+            "optimise_database": "Forsøk å forbedre ytelsen ved å analysere og deretter gjenoppbygge hele databasefilen.",
+            "rescan_tooltip": "Skann alle filer i banen på nytt. Brukes til å tvinge frem oppdatering av filmetadata og skanne zip-filer på nytt.",
+            "scan": {
+                "scanning_all_paths": "Skanner alle stier",
+                "scanning_paths": "Skanner følgende stier"
+            },
+            "scan_for_content_desc": "Skann etter nytt innhold og legg det til i databasen.",
+            "set_name_date_details_from_metadata_if_present": "Angi navn, dato og detaljer fra innebygde filmetadata"
+        },
+        "ui": {
+            "scene_player": {
+                "options": {
+                    "vr_tag": {
+                        "heading": "VR Tag",
+                        "description": "VR-knappen vises bare for scener med denne taggen."
+                    },
+                    "always_start_from_beginning": "Start alltid videoen fra begynnelsen",
+                    "auto_start_video": "Autostart video",
+                    "auto_start_video_on_play_selected": {
+                        "description": "Start scenevideoer automatisk når du spiller av fra køen, eller spiller av valgte eller tilfeldige scener fra scenesiden",
+                        "heading": "Start video automatisk når den valgte videoen spilles av"
+                    },
+                    "continue_playlist_default": {
+                        "description": "Spill av neste scene i køen når videoen er ferdig",
+                        "heading": "Fortsett spilleliste som standard"
+                    },
+                    "disable_mobile_media_auto_rotate": "Deaktiver automatisk rotasjon av fullskjermsmedier på mobil",
+                    "enable_chromecast": "Aktiver Chromecast",
+                    "show_ab_loop_controls": "Vis AB Loop-plugin-kontroller",
+                    "show_scrubber": "Vis Scrubber",
+                    "show_range_markers": "Vis avstandsmarkører",
+                    "track_activity": "Aktiver Scene Play-logg"
+                },
+                "heading": "Scenespiller"
+            },
+            "tag_panel": {
+                "options": {
+                    "show_child_tagged_content": {
+                        "heading": "Vis subtag-innhold",
+                        "description": "I tag-visningen kan du også vise innhold fra undertaggene"
+                    }
+                },
+                "heading": "Tag-visning"
+            },
+            "editing": {
+                "heading": "Redigering",
+                "disable_dropdown_create": {
+                    "heading": "Deaktiver oppretting av rullegardinmenyen",
+                    "description": "Fjern muligheten til å opprette nye objekter fra rullegardinmenyene"
+                },
+                "max_options_shown": {
+                    "label": "Maksimalt antall elementer som skal vises i utvalgte rullegardinmenyer"
+                },
+                "rating_system": {
+                    "star_precision": {
+                        "label": "Rangeringsstjernepresisjon",
+                        "options": {
+                            "full": "Full",
+                            "half": "Halv",
+                            "quarter": "Fjerdedel",
+                            "tenth": "Tiende"
+                        }
+                    },
+                    "type": {
+                        "label": "Rangeringssystemtype",
+                        "options": {
+                            "decimal": "Desimal",
+                            "stars": "Stjerner"
+                        }
+                    }
+                }
+            },
+            "interactive_options": "Interaktive alternativer",
+            "studio_panel": {
+                "options": {
+                    "show_child_studio_content": {
+                        "heading": "Vis innhold fra understudioer",
+                        "description": "I studiovisningen kan du også vise innhold fra understudioene"
+                    }
+                },
+                "heading": "Studio utsikt"
+            },
+            "abbreviate_counters": {
+                "heading": "Forkort tellere",
+                "description": "Forkort tellere i kort- og detaljvisningssider, for eksempel vil «1831» bli formatert til «1,8K»."
+            },
+            "basic_settings": "Grunnleggende innstillinger",
+            "custom_css": {
+                "heading": "Egendefinert CSS",
+                "option_label": "Egendefinert CSS aktivert",
+                "description": "Siden må lastes inn på nytt for at endringene skal tre i kraft. Det er ingen garanti for kompatibilitet mellom tilpasset CSS og fremtidige utgivelser av Stash."
+            },
+            "custom_javascript": {
+                "description": "Siden må lastes inn på nytt for at endringene skal tre i kraft. Det er ingen garanti for kompatibilitet mellom tilpasset Javascript og fremtidige versjoner av Stash.",
+                "heading": "Egendefinert Javascript",
+                "option_label": "Egendefinert Javascript aktivert"
+            },
+            "custom_locales": {
+                "heading": "Tilpasset lokalisering",
+                "option_label": "Egendefinert lokalisering aktivert",
+                "description": "Overstyr individuelle språkstrenger. Se https://github.com/stashapp/stash/blob/develop/ui/v2.5/src/locales/en-GB.json for hovedlisten. Siden må lastes inn på nytt for at endringene skal tre i kraft."
+            },
+            "delete_options": {
+                "description": "Standardinnstillinger ved sletting av bilder, gallerier og scener.",
+                "heading": "Slett alternativer",
+                "options": {
+                    "delete_file": "Slett fil som standard",
+                    "delete_generated_supporting_files": "Slett genererte støttefiler som standard"
+                }
+            },
+            "desktop_integration": {
+                "desktop_integration": "Desktop-integrasjon",
+                "notifications_enabled": "Aktiver varsler",
+                "send_desktop_notifications_for_events": "Send skrivebordsvarsler for hendelser",
+                "skip_opening_browser": "Hopp over å åpne nettleseren",
+                "skip_opening_browser_on_startup": "Hopp over automatisk åpning av nettleser under oppstart"
+            },
+            "detail": {
+                "compact_expanded_details": {
+                    "heading": "Kompakte utvidede detaljer",
+                    "description": "Når dette alternativet er aktivert, vil det presentere utvidede detaljer samtidig som presentasjonen blir kompakt"
+                },
+                "enable_background_image": {
+                    "description": "Vis bakgrunnsbilde på detaljsiden.",
+                    "heading": "Aktiver bakgrunnsbilde"
+                },
+                "heading": "Detaljside",
+                "show_all_details": {
+                    "description": "Når den er aktivert, vises alle innholdsdetaljer som standard, og hvert detaljelement får plass under én kolonne",
+                    "heading": "Vis alle detaljer"
+                }
+            },
+            "funscript_offset": {
+                "heading": "Funksjonsskriptforskyvning (ms)",
+                "description": "Tidsforskyvning i millisekunder for avspilling av interaktive skript."
+            },
+            "handy_connection": {
+                "connect": "Koble til",
+                "server_offset": {
+                    "heading": "Serveroffset"
+                },
+                "status": {
+                    "heading": "Praktisk tilkoblingsstatus"
+                },
+                "sync": "Synkroniser"
+            },
+            "handy_connection_key": {
+                "heading": "Handy tilkoblingsnøkkel",
+                "description": "Praktisk tilkoblingsnøkkel for bruk for interaktive scener. Hvis du angir denne knappen, kan Stash dele informasjon om gjeldende scene med handyfeeling.com"
+            },
+            "image_lightbox": {
+                "heading": "Bilde lysboks"
+            },
+            "image_wall": {
+                "direction": "Retning",
+                "heading": "Bildevegg",
+                "margin": "Margin (piksler)"
+            },
+            "images": {
+                "heading": "Bilder",
+                "options": {
+                    "create_image_clips_from_videos": {
+                        "description": "Når et bibliotek har deaktivert videoer, vil videofiler (filer som slutter på videoendelsen) skannes som bildeklipp.",
+                        "heading": "Skann videoutvidelser som bildeklipp"
+                    },
+                    "write_image_thumbnails": {
+                        "heading": "Skriv miniatyrbilder",
+                        "description": "Skriv miniatyrbilder av bilder til disk når de genereres på farten"
+                    }
+                }
+            },
+            "language": {
+                "heading": "Språk"
+            },
+            "max_loop_duration": {
+                "description": "Maksimal scenevarighet der scenespilleren vil spille av videoen i loop - 0 for å deaktivere",
+                "heading": "Maksimal sløyfevarighet"
+            },
+            "menu_items": {
+                "heading": "Menyelementer",
+                "description": "Vis eller skjul ulike typer innhold på navigasjonslinjen"
+            },
+            "minimum_play_percent": {
+                "description": "Prosentandelen av tiden en scene må spilles av før avspillingstallene økes.",
+                "heading": "Minimum Spilleprosent"
+            },
+            "performers": {
+                "options": {
+                    "image_location": {
+                        "heading": "Tilpasset utøverbildebane",
+                        "description": "Tilpasset sti for standard utøverbilder. La stå tomt for å bruke innebygde standardinnstillinger"
+                    }
+                }
+            },
+            "preview_type": {
+                "heading": "Forhåndsvisningstype",
+                "options": {
+                    "animated": "Animert bilde",
+                    "static": "Statisk bilde",
+                    "video": "Video"
+                },
+                "description": "Standardalternativet er forhåndsvisninger av videoer (mp4). For mindre CPU-bruk når du surfer, kan du bruke forhåndsvisninger av animerte bilder (webp). Disse må imidlertid genereres i tillegg til forhåndsvisningene av videoer, og de er større filer."
+            },
+            "scene_list": {
+                "heading": "Rutenettvisning",
+                "options": {
+                    "show_studio_as_text": "Vis studiooverlegg som tekst"
+                }
+            },
+            "scene_wall": {
+                "heading": "Scene-/markørvegg",
+                "options": {
+                    "toggle_sound": "Aktiver lyd",
+                    "display_title": "Vis tittel og tagger"
+                }
+            },
+            "scroll_attempts_before_change": {
+                "heading": "Rullforsøk før overgang",
+                "description": "Antall forsøk på å bla før man går til neste/forrige element. Gjelder kun for Pan Y-rullemodus."
+            },
+            "show_tag_card_on_hover": {
+                "description": "Vis tagkort når du holder musepekeren over tag-merkene",
+                "heading": "Verktøytips for tagkort"
+            },
+            "slideshow_delay": {
+                "description": "Lysbildefremvisning er tilgjengelig i gallerier i veggvisningsmodus",
+                "heading": "Forsinkelse av lysbildefremvisning (sekunder)"
+            },
+            "title": "Brukergrensesnitt",
+            "use_stash_hosted_funscript": {
+                "heading": "Server funscripts direkte",
+                "description": "Når dette er aktivert, vil funscripts bli servert direkte fra Stash til Handy-enheten din uten å bruke tredjeparts Handy-serveren. Krever at Stash er tilgjengelig fra Handy-enheten din, og at en API-nøkkel genereres hvis stash har konfigurert legitimasjon."
+            }
+        },
+        "scraping": {
+            "available_scrapers": "Tilgjengelige scrapers",
+            "search_by_name": "Søk etter navn",
+            "supported_types": "Støttede typer",
+            "installed_scrapers": "Installerte scrapers",
+            "scraper": "Skraper",
+            "entity_scrapers": "{entityType} scrapers",
+            "excluded_tag_patterns_desc": "Regulære uttrykk for tag-navn som skal ekskluderes fra scraperesultater",
+            "scrapers": "Skrapere",
+            "entity_metadata": "{entityType} Metadata",
+            "excluded_tag_patterns_head": "Ekskluderte tag-mønstre",
+            "supported_urls": "URLs"
+        },
+        "plugins": {
+            "installed_plugins": "Installerte plugins",
+            "hooks": "Hooks",
+            "triggers_on": "Utløsere aktivert",
+            "available_plugins": "Tilgjengelige plugins"
+        },
+        "library": {
+            "media_content_extensions": "Filendelser for medieinnhold",
+            "gallery_and_image_options": "Galleri- og bildeinnstillinger",
+            "exclusions": "Eksklusjoner"
+        },
+        "tools": {
+            "scene_duplicate_checker": "Sceneduplikatkontrollør",
+            "scene_filename_parser": {
+                "add_field": "Legg til felt",
+                "capitalize_title": "Bruk stor bokstav i tittelen",
+                "display_fields": "Vis felt",
+                "escape_chars": "Bruk \\ for å escape-tegn",
+                "filename": "Filnavn",
+                "ignore_organized": "Ignorer organiserte scener",
+                "ignored_words": "Ignorerte ord",
+                "matches_with": "Samsvarer med {i}",
+                "select_parser_recipe": "Velg parseroppskrift",
+                "title": "Scenefilnavnparser",
+                "whitespace_chars_desc": "Disse tegnene vil bli erstattet med mellomrom i tittelen",
+                "filename_pattern": "Filnavnmønster",
+                "whitespace_chars": "Mellomromstegn"
+            },
+            "graphql_playground": "GraphQL lekeplass",
+            "heading": "Verktøy",
+            "scene_tools": "Sceneverktøy"
+        },
+        "stashbox": {
+            "endpoint": "Endepunkt",
+            "description": "Stash-box muliggjør automatisk tagging av scener og utøvere basert på fingeravtrykk og filnavn.\nEndepunkt og API-nøkkel finnes på kontosiden din på Stash-box-instansen. Navn kreves når mer enn én instans legges til.",
+            "graphql_endpoint": "GraphQL-endepunkt",
+            "name": "Navn",
+            "add_instance": "Legg til Stash-box-instans",
+            "api_key": "API-nøkkel",
+            "max_requests_per_minute": "Maks forespørsler per minutt",
+            "max_requests_per_minute_description": "Bruker standardverdi på {defaultValue} hvis satt til 0",
+            "title": "Stash-box-endepunkter"
+        },
+        "logs": {
+            "log_level": "Loggnivå"
+        },
+        "system": {
+            "transcoding": "Transkoding"
         }
     },
     "appears_with": "Opptrer med",
@@ -265,5 +813,736 @@
         "UNCUT": "Ikke omskåret"
     },
     "birth_year": "Fødselsår",
-    "all": "alle"
+    "all": "alt",
+    "media_info": {
+        "performer_card": {
+            "age": "{alder} {år_gammel}",
+            "age_context": "{age} {years_old} ved produksjon"
+        },
+        "video_codec": "Video Kodek",
+        "audio_codec": "Lydkodek",
+        "checksum": "Sjekksum",
+        "downloaded_from": "Lastet ned fra",
+        "hash": "Hash",
+        "interactive_speed": "Interaktiv hastighet",
+        "o_count": "0 Antall",
+        "phash": "PHash",
+        "play_count": "Avspilt",
+        "play_duration": "Spillevarighet",
+        "stream": "Strøm"
+    },
+    "age_on_date": "{age} ved produksjon",
+    "search_filter": {
+        "update_filter": "Oppdater Filtre",
+        "saved_filters": "Lagrede filter",
+        "edit_filter": "Rediger filter",
+        "name": "Filter",
+        "more_filter_criteria": "+{tell} flere"
+    },
+    "history": "Historie",
+    "play_count": "Antall Avspillinger",
+    "play_history": "Avspillinger",
+    "release_notes": "Utgivelsesnotater",
+    "scene": "Scene",
+    "path": "Sti",
+    "package_manager": {
+        "installed_version": "Installert versjon",
+        "required_by": "Kreves av {pakker}",
+        "add_source": "Legg til kilde",
+        "check_for_updates": "Se etter oppdateringer",
+        "confirm_delete_source": "Er du sikker på at du vil slette kilden {name} ({url})?",
+        "description": "Beskrivelse",
+        "edit_source": "Rediger Kilde",
+        "hide_unselected": "Skjul uvalgt",
+        "latest_version": "Siste versjon",
+        "no_packages": "Ingen pakker funnet",
+        "no_sources": "Ingen kilder er konfigurert",
+        "no_upgradable": "Ingen oppgraderbare pakker funnet",
+        "package": "Pakke",
+        "selected_only": "Kun valgte",
+        "show_all": "Vis alle",
+        "source": {
+            "local_path": {
+                "heading": "Lokal Sti",
+                "description": "Relativ sti til lagringspakker for denne kilden. Merk at endring av dette krever at pakkene flyttes manuelt."
+            },
+            "name": "Navn",
+            "url": "Kilde URL"
+        },
+        "uninstall": "Avinstallere",
+        "unknown": "<ukjent>",
+        "update": "Oppdatere",
+        "version": "Versjon",
+        "install": "Installere",
+        "confirm_uninstall": "Er du sikker på at du vil avinstallere {number} pakker?"
+    },
+    "rating": "Vurdering",
+    "queue": "Kø",
+    "studio_tagger": {
+        "status_tagging_job_queued": "Status: Taggejobb i kø",
+        "batch_update_studios": "Batch Oppdater Studio",
+        "failed_to_save_studio": "Kunne ikke lagre studioet «{studio}»",
+        "add_new_studios": "Legg til nye studioer",
+        "batch_add_studios": "Batch Legg Til Studio",
+        "config": {
+            "edit_excluded_fields": "Rediger ekskluderte felt",
+            "excluded_fields": "Ekskluderte felt:",
+            "no_fields_are_excluded": "Ingen felt er ekskludert",
+            "no_instances_found": "Ingen forekomster funnet",
+            "these_fields_will_not_be_changed_when_updating_studios": "Disse feltene vil ikke bli endret når du oppdaterer studioer.",
+            "active_stash-box_instance": "Aktiv stash-box-instans:",
+            "create_parent_label": "Lag foreldrestudioer",
+            "create_parent_desc": "Opprett manglende foreldrestudioer, eller tagg og oppdater data/bilde for eksisterende foreldrestudioer med nøyaktige navnesamsvar"
+        },
+        "create_or_tag_parent_studios": "Opprett manglende eller tagg eksisterende foreldrestudioer",
+        "current_page": "Gjeldende side",
+        "name_already_exists": "Navnet finnes allerede",
+        "network_error": "Nettverksfeil",
+        "no_results_found": "Ingen resultater funnet.",
+        "number_of_studios_will_be_processed": "{studio_count} studioer vil bli behandlet",
+        "query_all_studios_in_the_database": "Alle studioer i databasen",
+        "refreshing_will_update_the_data": "Oppdatering vil oppdatere dataene til alle taggede studioer fra stash-box-instansen.",
+        "studio_already_tagged": "Studio allerede merket",
+        "studio_names_separated_by_comma": "Studionavn atskilt med komma",
+        "studio_selection": "Studio utvalg",
+        "studio_successfully_tagged": "Studio er tagget",
+        "any_names_entered_will_be_queried": "Alle navn som legges inn vil bli spørt fra den eksterne Stash-Box-instansen og lagt til hvis de blir funnet. Bare eksakte treff vil bli ansett som treff.",
+        "refresh_tagged_studios": "Oppdater taggede studioer",
+        "status_tagging_studios": "Status: Merking av studioer",
+        "tag_status": "Tag status",
+        "to_use_the_studio_tagger": "For å bruke studio-taggeren må en stash-box-instans konfigureres.",
+        "untagged_studios": "Umerkede studioer",
+        "update_studio": "Oppdater Studio",
+        "update_studios": "Oppdater Studio",
+        "updating_untagged_studios_description": "Oppdatering av utaggede studioer vil prøve å matche alle studioer som mangler en stashid og oppdatere metadataene."
+    },
+    "effect_filters": {
+        "blue": "Blå",
+        "name_transforms": "Forvandles",
+        "red": "Rød",
+        "aspect": "Aspekt",
+        "blur": "Uskarphet",
+        "brightness": "Lysstyrke",
+        "contrast": "Kontrast",
+        "gamma": "Gamma",
+        "green": "Grønn",
+        "hue": "Hue",
+        "rotate": "Rotere",
+        "rotate_left_and_scale": "Roter til venstre og skaler",
+        "rotate_right_and_scale": "Roter til høyre og skaler",
+        "saturation": "Metning",
+        "scale": "Skala",
+        "warmth": "Varme",
+        "reset_filters": "Tilbakestill filtre",
+        "reset_transforms": "Tilbakestill Transforms",
+        "name": "Filtre"
+    },
+    "megabits_per_second": "{verdi} mbps",
+    "stats": {
+        "scenes_duration": "Varighet av scener",
+        "image_size": "Bildestørrelse",
+        "total_o_count": "Total O-telling",
+        "scenes_played": "Scener spilt",
+        "scenes_size": "Scenestørrelse",
+        "total_play_count": "Totale Avspillinger",
+        "total_play_duration": "Total Spilletid"
+    },
+    "studio_depth": "Nivåer (tomt for alle)",
+    "custom_fields": {
+        "title": "Egendefinerte felt",
+        "criteria_format_string": "{kriterium} (egendefinert felt) {modifierString} {valueString}",
+        "value": "Verdi",
+        "criteria_format_string_others": "{kriterium} (egendefinert felt) {modifierString} {valueString} (+{andre} andre)",
+        "field": "Felt"
+    },
+    "dialogs": {
+        "scene_gen": {
+            "marker_screenshots": "Marker skjermbilder",
+            "video_previews": "Forhåndsvisninger",
+            "video_previews_tooltip": "Videoforhåndsvisninger som spilles av når du holder musepekeren over en scene",
+            "covers": "Scenebilder",
+            "image_previews": "Forhåndsvisninger av animerte bilder",
+            "image_previews_tooltip": "Generer også animerte (webp) forhåndsvisninger, som bare er nødvendig når Forhåndsvisningstype for scene/markørvegg er satt til Animert bilde. Når du surfer, bruker de mindre CPU enn videoforhåndsvisningene, men genereres i tillegg til dem og er større filer.",
+            "image_thumbnails": "Miniatyrbilder",
+            "interactive_heatmap_speed": "Generer varmekart og hastigheter for interaktive scener",
+            "marker_image_previews": "Forhåndsvisning av animerte bilder for markører",
+            "marker_screenshots_tooltip": "Marker statiske JPG-bilder",
+            "markers": "Marker forhåndsvisning",
+            "markers_tooltip": "20 sekunders videoer som starter på den gitte tidskoden.",
+            "override_preview_generation_options": "Overstyr forhåndsvisningsgenereringsalternativer",
+            "override_preview_generation_options_desc": "Overstyr forhåndsvisningsgenereringsalternativer for denne operasjonen. Standardverdier angis i System -> Forhåndsvisningsgenerering.",
+            "overwrite": "Overskriv eksisterende filer",
+            "phash": "Perseptuelle hasher",
+            "phash_tooltip": "For deduplisering og sceneidentifikasjon",
+            "preview_exclude_end_time_head": "Ekskluder sluttid",
+            "preview_exclude_start_time_desc": "Ekskluder de første x sekundene fra sceneforhåndsvisninger. Dette kan være en verdi i sekunder, eller en prosentandel (f.eks. 2 %) av den totale scenevarigheten.",
+            "preview_exclude_start_time_head": "Ekskluder starttidspunkt",
+            "preview_generation_options": "Forhåndsvisningsgenereringsalternativer",
+            "preview_options": "Forhåndsvisningsalternativer",
+            "preview_preset_head": "Forhåndsinnstilling av koding",
+            "preview_seg_count_desc": "Antall segmenter i forhåndsvisningsfiler.",
+            "preview_seg_count_head": "Antall segmenter i forhåndsvisning",
+            "preview_seg_duration_desc": "Varigheten av hvert forhåndsvisningssegment, i sekunder.",
+            "preview_seg_duration_head": "Forhåndsvis segmentets varighet",
+            "sprites": "Scene Scrubber Sprites",
+            "sprites_tooltip": "Bildesettet som vises under videospilleren for enkel navigering.",
+            "transcodes": "Transkoder",
+            "force_transcodes": "Tving generering av transkode",
+            "marker_image_previews_tooltip": "Generer også animerte (webp) forhåndsvisninger, som bare er nødvendig når Forhåndsvisningstype for scene/markørvegg er satt til Animert bilde. Når du surfer, bruker de mindre CPU enn videoforhåndsvisningene, men genereres i tillegg til dem og er større filer.",
+            "force_transcodes_tooltip": "Som standard genereres transkoder bare når videofilen ikke støttes i nettleseren. Når dette er aktivert, genereres transkoder selv om videofilen ser ut til å være støttet i nettleseren.",
+            "preview_preset_desc": "Forhåndsinnstillingen regulerer størrelse, kvalitet og kodingstid for forhåndsvisningsgenerering. Forhåndsinnstillinger utover «treg» har avtagende avkastning og anbefales ikke.",
+            "preview_exclude_end_time_desc": "Ekskluder de siste x sekundene fra sceneforhåndsvisninger. Dette kan være en verdi i sekunder, eller en prosentandel (f.eks. 2 %) av den totale scenevarigheten.",
+            "clip_previews": "Forhåndsvisninger av bildeklipp",
+            "transcodes_tooltip": "MP4-transkoder vil bli forhåndsgenerert for alt innhold; nyttig for trege CPU-er, men krever mye mer diskplass"
+        },
+        "scenes_found": "{count} scener funnet",
+        "scrape_results_scraped": "Skrapet",
+        "set_image_url_title": "Bilde-URL",
+        "lightbox": {
+            "scroll_mode": {
+                "label": "Rullemodus",
+                "pan_y": "Pan Y",
+                "zoom": "Zoom",
+                "description": "Hold Shift-tasten nede for å midlertidig bruke en annen modus."
+            },
+            "delay": "Forsinkelse (sek)",
+            "display_mode": {
+                "fit_to_screen": "Tilpass til skjermen",
+                "label": "Visningsmodus",
+                "original": "Orginalt",
+                "fit_horizontally": "Passer horisontalt"
+            },
+            "options": "Alternativer",
+            "reset_zoom_on_nav": "Tilbakestill zoomnivå når du bytter bilde",
+            "scale_up": {
+                "description": "Skaler mindre bilder opp for å fylle skjermen",
+                "label": "Skaler opp for å passe"
+            },
+            "page_header": "Side {side} / {totalt}"
+        },
+        "merge": {
+            "empty_results": "Verdiene i destinasjonsfeltet vil forbli uendret.",
+            "destination": "Destinasjon",
+            "source": "Kilde"
+        },
+        "imagewall": {
+            "margin_desc": "Antall margpiksler rundt hvert bilde.",
+            "direction": {
+                "column": "Kolonne",
+                "description": "Kolonne- eller radbasert oppsett.",
+                "row": "Rad"
+            }
+        },
+        "delete_confirm": "Er du sikker på at du vil slette {entityName}?",
+        "clear_o_history_confirm": "Er du sikker på at du vil slette O-historikken?",
+        "clear_play_history_confirm": "Er du sikker på at du vil slette avspillingshistorikken?",
+        "create_new_entity": "Opprett ny {entity}",
+        "delete_entity_simple_desc": "{count, plural, one {Er du sikker på at du vil slette denne {singularEntity}?} other {Er du sikker på at du vil slette disse {pluralEntity}?}}",
+        "delete_entity_title": "{antall, flertall, én {Slett {entallEntitet}} annet {Slett {flertallEntitet}}}",
+        "delete_galleries_extra": "... pluss eventuelle bildefiler som ikke er knyttet til noe annet galleri.",
+        "delete_object_desc": "Er du sikker på at du vil slette {count, plural, one {this {singularEntity}} other {these {pluralEntity}}}?",
+        "delete_object_overflow": "…og {count} other {count, flertall, one {{singularEntity}} other {{pluralEntity}}}.",
+        "delete_object_title": "Slett {count, flertall, én {{singularEntity}} annen {{pluralEntity}}}",
+        "dont_show_until_updated": "Ikke vis før neste oppdatering",
+        "export_include_related_objects": "Inkluder relaterte objekter i eksporten",
+        "export_title": "Eksport",
+        "merge_tags": {
+            "destination": "Destinasjon",
+            "source": "Kilde"
+        },
+        "performers_found": "{count} utøvere funnet",
+        "reassign_entity_title": "{antall, flertall, én {Reassign {singularEntity}} annen {Reassign {pluralEntity}}}",
+        "reassign_files": {
+            "destination": "Tilordne på nytt til"
+        },
+        "scrape_entity_query": "Skrapeforespørsel fra {entity_type}",
+        "scrape_entity_title": "{entity_type} Skrape Resultater",
+        "scrape_results_existing": "Eksisterende",
+        "delete_entity_desc": "{count, plural, one {Er du sikker på at du vil slette denne {singularEntity}? Med mindre filen også slettes, vil denne {singularEntity} bli lagt til på nytt når skanningen utføres.} other {Er du sikker på at du vil slette disse {pluralEntity}? Med mindre filene også slettes, vil disse {pluralEntity} bli lagt til på nytt når skanningen utføres.}}",
+        "delete_gallery_files": "Slett gallerimappen/zip-filen og alle bilder som ikke er knyttet til noe annet galleri.",
+        "edit_entity_title": "Rediger {count, flertall, én {{singularEntity}} annen {{pluralEntity}}}",
+        "delete_alert": "Følgende {count, plural, one {{singularEntity}} other {{pluralEntity}}} vil bli slettet permanent:",
+        "overwrite_filter_warning": "Det lagrede filteret «{entityName}» vil bli overskrevet.",
+        "unsaved_changes": "Ulagrede endringer. Er du sikker på at du vil avslutte?",
+        "set_default_filter_confirm": "Er du sikker på at du vil angi dette filteret som standard?"
+    },
+    "director": "Regissør",
+    "display_mode": {
+        "unknown": "Ukjent",
+        "wall": "Vegg",
+        "tagger": "Tagger",
+        "list": "Liste",
+        "label_current": "Visningsmodus: {gjeldende}",
+        "grid": "Rutenett"
+    },
+    "distance": "Lengde",
+    "dupe_check": {
+        "only_select_matching_codecs": "Velg bare hvis alle kodeker samsvarer i duplikatgruppen",
+        "options": {
+            "exact": "Nøyaktig",
+            "high": "Høy",
+            "low": "Lav",
+            "medium": "Medium"
+        },
+        "search_accuracy_label": "Søkenøyaktighet",
+        "duration_diff": "Maksimal varighetsforskjell",
+        "duration_options": {
+            "equal": "Lik",
+            "any": "Noen"
+        },
+        "select_none": "Velg Ingen",
+        "select_oldest": "Velg den eldste filen i duplikatgruppen",
+        "select_options": "Velg Alternativer…",
+        "select_youngest": "Velg den yngste filen i duplikatgruppen",
+        "title": "Dupliserte scener",
+        "description": "Nivåer under «Nøyaktig» kan ta lengre tid å beregne. Falske positive resultater kan også returneres ved lavere nøyaktighetsnivåer.",
+        "found_sets": "{setCount, flertall, one{# sett med duplikater funnet.} other {# sett med duplikater funnet.}}",
+        "select_all_but_largest_file": "Velg alle filer i hver dupliserte gruppe, unntatt den største filen",
+        "select_all_but_largest_resolution": "Velg alle filer i hver dupliserte gruppe, unntatt filen med høyest oppløsning"
+    },
+    "duplicated_phash": "Duplisert (pHash)",
+    "errors": {
+        "invalid_javascript_string": "Ugyldig javascript-kode: {error}",
+        "custom_fields": {
+            "duplicate_field": "Feltnavnet må være unikt",
+            "field_name_length": "Feltnavnet må inneholde færre enn 65 tegn",
+            "field_name_required": "Feltnavn er obligatorisk",
+            "field_name_whitespace": "Feltnavnet kan ikke ha innledende eller etterfølgende mellomrom"
+        },
+        "header": "Feil",
+        "invalid_json_string": "Ugyldig JSON-streng: {error}",
+        "loading_type": "Feil ved lasting av {type}",
+        "something_went_wrong": "Noe gikk galt.",
+        "image_index_greater_than_zero": "Bildeindeksen må være større enn 0",
+        "lazy_component_error_help": "Hvis du nylig har oppgradert Stash, må du laste inn siden på nytt eller tømme nettleserens hurtigbuffer."
+    },
+    "file_info": "Filinformasjon",
+    "group_scene_number": "Scenenummer",
+    "groups": "Grupper",
+    "image_index": "Bilde #",
+    "last_o_at": "Siste O Kl",
+    "library": "Bibliotek",
+    "penis": "Penis",
+    "part_of": "En del av {forelder}",
+    "performer_tagger": {
+        "batch_update_performers": "Batch Oppdater Skuespillere",
+        "config": {
+            "active_stash-box_instance": "Aktiv stash-box-instans:",
+            "edit_excluded_fields": "Rediger Ekskluderte Felt",
+            "no_fields_are_excluded": "Ingen felt er ekskludert",
+            "no_instances_found": "Ingen forekomster funnet",
+            "excluded_fields": "Ekskluderte felt:",
+            "these_fields_will_not_be_changed_when_updating_performers": "Disse feltene vil ikke bli endret når skuespillerne oppdateres."
+        },
+        "network_error": "Nettverksfeil",
+        "performer_already_tagged": "Skuespilleren er allerede tagget",
+        "number_of_performers_will_be_processed": "{skuespiller_antall} skuespillere vil bli behandlet",
+        "performer_names_separated_by_comma": "Skuespillernavn atskilt med komma",
+        "batch_add_performers": "Batch Legg Til Skuespillere",
+        "current_page": "Gjeldende side",
+        "failed_to_save_performer": "Kunne ikke lagre skuespillere «{skuespiller}»",
+        "name_already_exists": "Navnet finnes allerede",
+        "no_results_found": "Ingen resultater funnet.",
+        "performer_selection": "Utvalg av skuespillere",
+        "performer_successfully_tagged": "Skuespiller er tagget:",
+        "query_all_performers_in_the_database": "Alle skuespillere i databasen",
+        "refresh_tagged_performers": "Oppdater taggede skuespillere",
+        "status_tagging_job_queued": "Status: Taggejobb i kø",
+        "status_tagging_performers": "Status: Tagger skuespillere",
+        "tag_status": "Tagging Status",
+        "to_use_the_performer_tagger": "For å bruke skuespiller-taggeren må en stash-box-instans konfigureres.",
+        "untagged_performers": "Utaggede skuespillere",
+        "update_performer": "Oppdater Skuespiller",
+        "update_performers": "Oppdater Skuespillere",
+        "add_new_performers": "Legg til ny skuespiller",
+        "updating_untagged_performers_description": "Oppdatering av utaggede skuespillere vil forsøke å matche skuespillere som mangler en stashid og oppdatere metadataene.",
+        "refreshing_will_update_the_data": "Oppdatering vil oppdatere dataene til alle taggede skuespillere fra stash-box-instansen.",
+        "any_names_entered_will_be_queried": "Alle navn som legges inn vil bli spørt fra den eksterne Stash-Box-instansen og lagt til hvis de blir funnet. Bare eksakte treff vil bli ansett som treff."
+    },
+    "setup": {
+        "welcome_specific_config": {
+            "next_step": "Når du er klar til å fortsette med å sette opp et nytt system, klikker du på Neste.",
+            "config_path": "Stash vil bruke følgende konfigurasjonsfilsti: <code>{path}</code>",
+            "unable_to_locate_specified_config": "Hvis du leser dette, fant ikke Stash konfigurasjonsfilen som er angitt på kommandolinjen eller i miljøet. Denne veiviseren vil veilede deg gjennom prosessen med å sette opp en ny konfigurasjon."
+        },
+        "paths": {
+            "set_up_your_paths": "Sett opp dine veier",
+            "database_filename_empty_for_default": "databasefilnavn (tomt for standard)",
+            "description": "Deretter må vi finne ut hvor du finner pornosamlingen din, og hvor du skal lagre Stash-databasen, genererte filer og hurtigbufferfiler. Disse innstillingene kan endres senere om nødvendig.",
+            "path_to_generated_directory_empty_for_default": "sti til generert katalog (tom som standard)",
+            "stash_alert": "Ingen bibliotekstier er valgt. Ingen medier kan skannes inn i Stash. Er du sikker?",
+            "store_blobs_in_database": "Lagre blober i databasen",
+            "where_can_stash_store_blobs": "Hvor kan Stash lagre binære databasedata?",
+            "where_can_stash_store_blobs_description_addendum": "Alternativt kan du lagre disse dataene i databasen. <strong>Merk:</strong> Dette vil øke størrelsen på databasefilen din, og det vil øke migreringstiden for databasen.",
+            "where_can_stash_store_cache_files": "Hvor kan Stash lagre hurtigbufferfiler?",
+            "where_can_stash_store_its_database_description": "Stash bruker en SQLite-database for å lagre pornometadataene dine. Som standard opprettes dette som <code>stash-go.sqlite</code> i katalogen som inneholder konfigurasjonsfilen din. Hvis du vil endre dette, må du skrive inn et absolutt eller relativt (til gjeldende arbeidskatalog) filnavn.",
+            "where_can_stash_store_its_database_warning": "ADVARSEL: lagring av databasen på et annet system enn der Stash kjøres fra (f.eks. lagring av databasen på en NAS mens Stash-serveren kjøres på en annen datamaskin) er <strong>ikke støttet</strong>! SQLite er ikke ment for bruk på tvers av et nettverk, og forsøk på å gjøre det kan lett føre til at hele databasen blir ødelagt.",
+            "where_can_stash_store_its_generated_content": "Hvor kan Stash lagre det genererte innholdet?",
+            "where_is_your_porn_located": "Hvor ligger pornoen din?",
+            "where_is_your_porn_located_description": "Legg til kataloger som inneholder pornovideoene og bildene dine. Stash vil bruke disse katalogene til å finne videoer og bilder under skanning.",
+            "path_to_blobs_directory_empty_for_default": "sti til blobs-katalogen (tom som standard)",
+            "where_can_stash_store_its_database": "Hvor kan Stash lagre databasen sin?",
+            "where_can_stash_store_cache_files_description": "For at funksjonalitet som HLS/DASH live-transkoding skal fungere, krever Stash en hurtigbufferkatalog for midlertidige filer. Som standard oppretter Stash en <code>cache</code>-katalog i katalogen som inneholder konfigurasjonsfilen din. Hvis du vil endre dette, må du angi en absolutt eller relativ (til gjeldende arbeidskatalog) sti. Stash oppretter denne katalogen hvis den ikke allerede finnes.",
+            "where_can_stash_store_its_generated_content_description": "For å kunne tilby miniatyrbilder, forhåndsvisninger og sprites genererer Stash bilder og videoer. Dette inkluderer også transkoder for filformater som ikke støttes. Som standard vil Stash opprette en <code>generert</code> katalog i katalogen som inneholder konfigurasjonsfilen din. Hvis du vil endre hvor dette genererte mediet skal lagres, må du angi en absolutt eller relativ (til gjeldende arbeidskatalog) sti. Stash vil opprette denne katalogen hvis den ikke allerede finnes.",
+            "path_to_cache_directory_empty_for_default": "sti til hurtigbufferkatalog (tom som standard)",
+            "where_can_stash_store_blobs_description": "Stash kan lagre binære data som scenecovere, utøver, studio og tag-bilder enten i databasen eller i filsystemet. Som standard lagrer den disse dataene i filsystemet i underkatalogen <code>blobs</code> i katalogen som inneholder konfigurasjonsfilen din. Hvis du vil endre dette, må du angi en absolutt eller relativ (til gjeldende arbeidskatalog) sti. Stash vil opprette denne katalogen hvis den ikke allerede finnes."
+        },
+        "creating": {
+            "creating_your_system": "Oppretter systemet ditt"
+        },
+        "errors": {
+            "something_went_wrong_while_setting_up_your_system": "Noe gikk galt under oppsettet av systemet ditt. Her er feilen vi mottok: {feil}",
+            "unable_to_retrieve_system_status": "Kan ikke hente systemstatus: {feil}",
+            "something_went_wrong": "Å nei! Noe gikk galt!",
+            "unexpected_error": "Det oppsto en uventet feil: {feil}",
+            "something_went_wrong_description": "Hvis dette ser ut som et problem med inndataene dine, kan du klikke tilbake for å fikse dem. Ellers kan du rapportere en feil på {githubLink} eller søke hjelp på {discordLink}."
+        },
+        "folder": {
+            "file_path": "Filbane",
+            "up_dir": "Opp en mappe"
+        },
+        "github_repository": "Github-depot",
+        "migrate": {
+            "migration_failed": "Migrering mislyktes",
+            "migration_irreversible_warning": "Skjemamigreringsprosessen er ikke reversibel. Når migreringen er utført, vil databasen din være inkompatibel med tidligere versjoner av stash.",
+            "migration_notes": "Migrasjonsnotater",
+            "migration_required": "Migrering kreves",
+            "perform_schema_migration": "Utfør skjemamigrering",
+            "backup_database_path_leave_empty_to_disable_backup": "Sti til sikkerhetskopieringsdatabase (la stå tomt for å deaktivere sikkerhetskopiering):",
+            "migration_failed_error": "Følgende feil oppsto under migrering av databasen:",
+            "schema_too_old": "Din nåværende stash-database er skjemaversjon <strong>{databaseSchema}</strong> og må migreres til versjon <strong>{appSchema}</strong>. Denne versjonen av Stash vil ikke fungere uten at databasen migreres. Hvis du ikke ønsker å migrere, må du nedgradere til en versjon som samsvarer med databaseskjemaet ditt.",
+            "backup_recommended": "Det anbefales at du sikkerhetskopierer den eksisterende databasen din før du migrerer. Vi kan gjøre dette for deg ved å lage en kopi av databasen din til <code>{defaultBackupPath}</code>.",
+            "migrating_database": "Migrerer database",
+            "migration_failed_help": "Gjør nødvendige rettelser og prøv på nytt. Ellers kan du melde fra om en feil på {githubLink} eller søke hjelp på {discordLink}."
+        },
+        "confirm": {
+            "almost_ready": "Vi er nesten klare til å fullføre konfigurasjonen. Vennligst bekreft følgende innstillinger. Du kan klikke tilbake for å endre noe som er feil. Hvis alt ser bra ut, klikker du på Bekreft for å opprette systemet ditt.",
+            "blobs_directory": "Binær datakatalog",
+            "blobs_use_database": "<bruker database>",
+            "cache_directory": "Cache-katalog",
+            "configuration_file_location": "konfigurasjonsfilplassering:",
+            "database_file_path": "Banen til databasefilen",
+            "generated_directory": "Generert katalog",
+            "nearly_there": "Nesten der!",
+            "stash_library_directories": "Stash bibliotekkataloger"
+        },
+        "stash_setup_wizard": "Stash Setup Wizard",
+        "success": {
+            "download_ffmpeg": "Last ned ffmpeg",
+            "getting_help": "Får hjelp",
+            "help_links": "Hvis du støter på problemer eller har spørsmål eller forslag, kan du gjerne åpne en sak i {githubLink} eller spørre fellesskapet i {discordLink}.",
+            "next_config_step_one": "Du blir deretter tatt til konfigurasjonssiden. Denne siden lar deg tilpasse hvilke filer som skal inkluderes og ekskluderes, angi et brukernavn og passord for å beskytte systemet ditt, og en hel rekke andre alternativer.",
+            "next_config_step_two": "Når du er fornøyd med disse innstillingene, kan du begynne å skanne innholdet ditt inn i Stash ved å klikke på <code>{localized_task}</code>, deretter <code>{localized_scan}</code>.",
+            "open_collective": "Sjekk ut vår {open_collective_link} for å se hvordan du kan bidra til den fortsatte utviklingen av Stash.",
+            "support_us": "Støtt oss",
+            "thanks_for_trying_stash": "Takk for at du prøvde Stash!",
+            "your_system_has_been_created": "Suksess! Systemet ditt er opprettet!",
+            "in_app_manual_explained": "Du oppfordres til å sjekke ut manualen i appen, som du finner via ikonet øverst til høyre på skjermen. Det ser slik ut: {icon}",
+            "missing_ffmpeg": "Du mangler den nødvendige <code>ffmpeg</code>-binærfilen. Du kan laste den ned automatisk til konfigurasjonskatalogen din ved å merke av i boksen nedenfor. Alternativt kan du oppgi stier til <code>ffmpeg</code>- og <code>ffprobe</code>-binærfilene i systeminnstillingene. Disse binærfilene må være tilstede for at Stash skal fungere.",
+            "welcome_contrib": "Vi tar også imot bidrag i form av kode (feilrettinger, forbedringer og nye funksjoner), testing, feilrapporter, forbedrings- og funksjonsforespørsler og brukerstøtte. Detaljer finner du i bidragsdelen i appens brukerhåndbok."
+        },
+        "welcome": {
+            "in_current_stash_directory": "I katalogen <code>{path}</code>:",
+            "in_the_current_working_directory": "I <code>{path}</code>, arbeidskatalogen, for øyeblikket:",
+            "in_the_current_working_directory_disabled": "I <code>{path}</code>, arbeidskatalogen:",
+            "next_step": "Når alt dette er avklart, og du er klar til å fortsette med å sette opp et nytt system, må du velge hvor du vil lagre konfigurasjonsfilen.",
+            "store_stash_config": "Hvor vil du lagre Stash-konfigurasjonen din?",
+            "unexpected_explained": "Hvis du får denne skjermen uventet, kan du prøve å starte Stash på nytt i riktig arbeidsmappe eller med <code>-c</code>-flagget.",
+            "in_the_current_working_directory_disabled_macos": "Støttes ikke når du kjører <code>Stash.app</code>,<br></br>kjør <code>stash-macos</code> for å sette opp i arbeidskatalogen",
+            "config_path_logic_explained": "Stash prøver først å finne konfigurasjonsfilen sin (<code>config.yml</code>) fra gjeldende arbeidsmappe, og hvis den ikke finner den der, går den tilbake til <code>{fallback_path}</code>. Du kan også få Stash til å lese fra en spesifikk konfigurasjonsfil ved å kjøre den med alternativene <code>-c '<sti til konfigurasjonsfil>'</code> eller <code>--config '<sti til konfigurasjonsfil>'</code>.",
+            "unable_to_locate_config": "Hvis du leser dette, fant ikke Stash en eksisterende konfigurasjon. Denne veiviseren vil veilede deg gjennom prosessen med å sette opp en ny konfigurasjon."
+        },
+        "welcome_to_stash": "Velkommen til Stash"
+    },
+    "stashbox": {
+        "submission_successful": "Innlevering vellykket",
+        "go_review_draft": "Gå til {endpoint_name} for å se gjennom utkastet.",
+        "selected_stash_box": "Valgt Stash-Box-endepunkt",
+        "source": "Stash-Box-kilde",
+        "submission_failed": "Innsending mislyktes",
+        "submit_update": "Finnes allerede i {endpoint_name}"
+    },
+    "performer_image": "Skuespiller Bilde",
+    "countables": {
+        "images": "{antall, flertall, ett {bilde} andre {bilder}}",
+        "files": "{antall, flertall, én {fil} andre {filer}}",
+        "galleries": "{antall, flertall, ett {galleri} andre {gallerier}}",
+        "markers": "{antall, flertall, én {markør} andre {markører}}",
+        "scenes": "{antall, flertall, én {Scene} andre {Scener}}",
+        "studios": "{antall, flertall, ett {studio} andre {studioer}}",
+        "tags": "{antall, flertall, én {Tag} andre {Tags}}",
+        "groups": "{antall, flertall, én {gruppe} andre {grupper}}",
+        "performers": "{antall, flertall, én {utøver} andre {utøvere}}"
+    },
+    "sort_name": "Sorter Navn",
+    "include_sub_studios": "Inkluder datterselskapsstudioer",
+    "include_sub_tag_content": "Inkluder innhold i undertagger",
+    "include_sub_tags": "Inkluder undertagger",
+    "include_sub_studio_content": "Inkluder innhold fra understudioer",
+    "dimensions": "Dimensjoner",
+    "criterion_modifier_values": {
+        "any_of": "noen av",
+        "none": "Ingen",
+        "only": "Bare",
+        "any": "Hvilken som helst"
+    },
+    "configuration": "Konfigurasjon",
+    "connection_monitor": {
+        "websocket_connection_failed": "Klarte ikke å opprette websocket-tilkobling: se nettleserkonsollen for detaljer",
+        "websocket_connection_reestablished": "Websocket-tilkoblingen er gjenopprettet"
+    },
+    "containing_group": "Inneholder gruppe",
+    "containing_group_count": "Inneholder gruppeantall",
+    "containing_groups": "Inneholder grupper",
+    "country": "Land",
+    "cover_image": "Forsidebilde",
+    "created_at": "Opprettet",
+    "criterion": {
+        "greater_than": "Større enn",
+        "less_than": "Mindre enn",
+        "value": "Verdi"
+    },
+    "criterion_modifier": {
+        "between": "mellom",
+        "equals": "Er",
+        "format_string": "{kriterium} {modifikatorString} {verdiString}",
+        "format_string_excludes": "{kriterium} {modifierString} {valueString} (ekskluderer {excludedString})",
+        "format_string_excludes_depth": "{kriterium} {modifierString} {valueString} (ekskluderer {excludedString}) (+{dybde, flertall, =-1 {all} andre {{dybde}}})",
+        "includes": "inkluderer",
+        "includes_all": "inkluderer alle",
+        "is_null": "er null",
+        "less_than": "er mindre enn",
+        "matches_regex": "samsvarer med regulært uttrykk",
+        "not_between": "ikke mellom",
+        "not_equals": "er ikke",
+        "greater_than": "er større enn",
+        "format_string_depth": "{kriterium} {modifierString} {valueString} (+{dybde, flertall, =-1 {all} other {{dybde}}})",
+        "excludes": "ekskluderer",
+        "not_matches_regex": "samsvarer ikke med regex",
+        "not_null": "er ikke null"
+    },
+    "custom": "Tilpasset",
+    "date": "Dato",
+    "date_format": "ÅÅÅÅ-MM-DD",
+    "datetime_format": "ÅÅÅÅ-MM-DD TT:MM",
+    "death_date": "Dødsdato",
+    "death_year": "Dødsår",
+    "descending": "Synkende",
+    "description": "Beskrivelse",
+    "detail": "Detalj",
+    "details": "Detaljer",
+    "developmentVersion": "Utviklingsversjon",
+    "disambiguation": "Presisering",
+    "duration": "Varighet",
+    "ethnicity": "Etnisitet",
+    "existing_value": "eksisterende verdi",
+    "eye_color": "Øyefarge",
+    "fake_tits": "Falske pupper",
+    "false": "Falsk",
+    "favourite": "Favoritt",
+    "file_count": "Antall filer",
+    "file_mod_time": "Filendringstid",
+    "files": "Filer",
+    "files_amount": "{value} filer",
+    "filesize": "Filstørrelse",
+    "filter": "Filter",
+    "filter_name": "Filternavn",
+    "filters": "Filtre",
+    "folder": "Mappe",
+    "framerate": "Bildefrekvens",
+    "frames_per_second": "{verdi} fps",
+    "front_page": {
+        "types": {
+            "saved_filter": "Lagrede filter",
+            "premade_filter": "Forhåndslaget filter"
+        }
+    },
+    "galleries": "Gallerier",
+    "gallery": "Galleri",
+    "gallery_count": "Antall Galleri",
+    "gender": "Kjønn",
+    "gender_types": {
+        "FEMALE": "Kvinne",
+        "INTERSEX": "Intersex",
+        "MALE": "Mann",
+        "NON_BINARY": "Ikke Binær",
+        "TRANSGENDER_MALE": "Transgender Mann",
+        "TRANSGENDER_FEMALE": "Transgender kvinne"
+    },
+    "group": "Gruppe",
+    "group_count": "Gruppetall",
+    "handy_connection_status": {
+        "connecting": "Kobler til",
+        "disconnected": "Koblet fra",
+        "missing": "Mangler",
+        "ready": "Klar",
+        "syncing": "Synkroniserer med server",
+        "uploading": "Laster opp skript",
+        "error": "Feil ved tilkobling til Handy"
+    },
+    "hasChapters": "Har Kapitler",
+    "hasMarkers": "Har Markører",
+    "height": "Høyde",
+    "height_cm": "Høyde (cm)",
+    "help": "Hjelp",
+    "ignore_auto_tag": "Ignorer Automatisk Tagging",
+    "image": "Bilde",
+    "image_count": "Antall Bilder",
+    "images": "Bilder",
+    "include_parent_tags": "Inkluder overordnede tagger",
+    "include_sub_groups": "Inkluder undergrupper",
+    "index_of_total": "{indeks} av {totalt}",
+    "instagram": "Instagram",
+    "interactive": "Interaktiv",
+    "interactive_speed": "Interaktiv hastighet",
+    "isMissing": "Mangler",
+    "last_played_at": "Sist Spilt",
+    "loading": {
+        "generic": "Laster inn …",
+        "plugins": "Laster inn plugins …"
+    },
+    "login": {
+        "login": "Logg inn",
+        "username": "Brukernavn",
+        "password": "Passord",
+        "invalid_credentials": "Ugyldig brukernavn eller passord",
+        "internal_error": "Uventet intern feil. Se loggene for mer informasjon"
+    },
+    "marker_count": "Antall markører",
+    "markers": "Markører",
+    "measurements": "Mål",
+    "metadata": "Metadata",
+    "name": "Navn",
+    "new": "Ny",
+    "none": "Ingen",
+    "o_counter": "O-Teller",
+    "o_history": "O Historie",
+    "odate_recorded_no": "Ingen O-dato registrert",
+    "operations": "Operasjoner",
+    "organized": "Organisert",
+    "orientation": "Orientering",
+    "pagination": {
+        "current_total": "{nåværende} av {totalt}",
+        "first": "Første",
+        "last": "Siste",
+        "next": "Neste",
+        "previous": "Tilbake"
+    },
+    "parent_of": "Forelder til {barn}",
+    "parent_studio": "Foreldrestudio",
+    "parent_studios": "Foreldrestudio",
+    "parent_tag_count": "Antall foreldremerker",
+    "parent_tags": "Foreldre Tagger",
+    "penis_length_cm": "Penis Lengde (cm)",
+    "perceptual_similarity": "Perseptuell Likhet (pHash)",
+    "performer": "Skuespiller",
+    "performer_age": "Skuespiller Alder",
+    "performer_count": "Skuespiller Antall",
+    "performers": "Skuespillere",
+    "photographer": "Fotograf",
+    "piercings": "Piercinger",
+    "playdate_recorded_no": "Ingen avspillningsdatodato registrert",
+    "plays": "{verdi} avspillinger",
+    "primary_file": "Primær fil",
+    "primary_tag": "Primær Tag",
+    "random": "Tilfeldig",
+    "recently_added_objects": "Nylig lagt til {objekter}",
+    "recently_released_objects": "Nylig utgitte {objekter}",
+    "resolution": "Oppløsning",
+    "resume_time": "Gjenoppta tid",
+    "sceneTagger": "Scene Tagger",
+    "scene_code": "Studio Kode",
+    "scene_count": "Antall Scener",
+    "scene_created_at": "Scene opprettet",
+    "scene_date": "Dato for scenen",
+    "scene_id": "Scene-ID",
+    "scene_tags": "Scene Tagger",
+    "scene_updated_at": "Scene Oppdatert",
+    "scenes": "Scener",
+    "scenes_updated_at": "Scener Oppdatert",
+    "second": "Sekund",
+    "seconds": "Sekunder",
+    "settings": "Innstillinger",
+    "stash_id": "Stash ID",
+    "stash_id_endpoint": "Stash ID-sluttpunkt",
+    "stash_ids": "Stash-ID-er",
+    "statistics": "Statistikk",
+    "status": "Status: {statusTekst}",
+    "studio": "Studio",
+    "studio_and_parent": "Studio og foreldre",
+    "studio_count": "Antall Studio",
+    "donate": "Donere",
+    "file": "fil",
+    "empty_server": "Legg til noen scener på serveren din for å se anbefalinger på denne siden.",
+    "penis_length": "Penis Lengde",
+    "performer_favorite": "Favoritt Skuespiller",
+    "eta": "ETA",
+    "performer_tags": "Skuespiller Tagger",
+    "play_duration": "Spillevarighet",
+    "hair_color": "Hårfarge",
+    "include_sub_group_content": "Inkluder innhold i undergrupper",
+    "o_count": "O Antall",
+    "toast": {
+        "merged_tags": "Sammenslåtte tagger",
+        "generating_screenshot": "Genererer skjermbilde …",
+        "added_generation_job_to_queue": "Lagt til genereringsjobb i køen",
+        "created_entity": "Opprettet {entity}",
+        "default_filter_set": "Standard filtersett",
+        "delete_past_tense": "Slettet {count, flertall, en {{singularEntity}} annen {{pluralEntity}}}",
+        "image_index_too_large": "Feil: Bildeindeksen er større enn antallet bilder i galleriet",
+        "merged_scenes": "Sammenslåtte scener",
+        "rescanning_entity": "Skanner på nytt {count, flertall, én {{singularEntity}} annen {{pluralEntity}}}…",
+        "saved_entity": "Lagret {entity}",
+        "started_generating": "Begynte å generere",
+        "started_importing": "Begynte å importere",
+        "updated_entity": "Oppdatert {entity}",
+        "started_auto_tagging": "Startet automatisk merking",
+        "removed_entity": "Fjernet {count, flertall, én {{singularEntity}} annen {{pluralEntity}}}",
+        "added_entity": "Lagt til {count, flertall, én {{singularEntity}} annen {{pluralEntity}}}",
+        "reassign_past_tense": "Filen er tildelt på nytt"
+    },
+    "time_end": "Sluttid",
+    "sub_tags": "Undertagger",
+    "tag_count": "Antall Tagger",
+    "total": "Total",
+    "updated_at": "Oppdatert",
+    "url": "URL",
+    "urls": "URLs",
+    "validation": {
+        "blank": "${path} må ikke være tomt",
+        "end_time_before_start_time": "Sluttiden må være større enn eller lik starttiden",
+        "required": "${path} er et obligatorisk felt",
+        "unique": "${path} må være unik",
+        "date_invalid_form": "${path} må være i formatet ÅÅÅÅ-MM-DD"
+    },
+    "video_codec": "Videokodek",
+    "videos": "Videoer",
+    "view_all": "Vis Alle",
+    "weight": "Vekt",
+    "weight_kg": "Vekt (kg)",
+    "studio_tags": "Studio Tagger",
+    "studios": "Studioer",
+    "sub_group_count": "Antall undergrupper",
+    "sub_group_of": "Undergruppe av {forelder}",
+    "sub_group_order": "Undergruppeordre",
+    "sub_groups": "Undergrupper",
+    "sub_tag_count": "Antall undertagger",
+    "sub_tag_of": "Undertagg av {parent}",
+    "subsidiary_studio_count": "Antall datterselskaper i studioer",
+    "subsidiary_studios": "Datterselskapsstudioer",
+    "synopsis": "Synopsis",
+    "tag": "Tag",
+    "tag_sub_tag_tooltip": "Har under-tagger",
+    "tags": "Tagger",
+    "tattoos": "Tatoveringer",
+    "time": "Tid",
+    "title": "Tittel",
+    "true": "Sant",
+    "twitter": "X",
+    "type": "Type",
+    "unknown_date": "Ukjent dato",
+    "years_old": "år gammel",
+    "zip_file_count": "Antall zip-filer",
+    "tag_parent_tooltip": "Har foreldretagger",
+    "sub_group": "Undergruppe"
 }
diff --git a/ui/v2.5/src/locales/nl-NL.json b/ui/v2.5/src/locales/nl-NL.json
index ceaf2ab27..56ba293b8 100644
--- a/ui/v2.5/src/locales/nl-NL.json
+++ b/ui/v2.5/src/locales/nl-NL.json
@@ -141,7 +141,15 @@
         "make_primary": "Als primair aanduiden",
         "reload": "Herladen",
         "copy_to_clipboard": "Kopiëren naar klembord",
-        "swap": "Omwisselen"
+        "swap": "Omwisselen",
+        "sidebar": {
+            "close": "Sluit zijbalk",
+            "open": "Open zijbalk",
+            "toggle": "Schakelaar Zijbalk"
+        },
+        "show_results": "Resultaat tonen",
+        "show_count_results": "{count} resultaten tonen",
+        "play": "Afspelen"
     },
     "actions_name": "Acties",
     "age": "Leeftijd",
@@ -179,7 +187,10 @@
             "show_male_label": "Mannen tonen",
             "source": "Bron",
             "mark_organized_label": "Markeren als geordend na opslaan",
-            "mark_organized_desc": "Markeer een scène als geordend na klikken op opslaan."
+            "mark_organized_desc": "Markeer een scène als geordend na klikken op opslaan.",
+            "errors": {
+                "blacklist_duplicate": "Dubbel zwarte lijst item"
+            }
         },
         "noun_query": "Zoekvraag",
         "results": {
@@ -343,12 +354,59 @@
             "database": "Database",
             "ffmpeg": {
                 "download_ffmpeg": {
-                    "heading": "Download FFmpeg"
+                    "heading": "Download FFmpeg",
+                    "description": "Downloadt FFmpeg naar de configuratiemap en wist de ffmpeg- en ffprobe-paden zodat deze uit de configuratiemap kunnen worden opgehaald."
                 },
                 "hardware_acceleration": {
-                    "heading": "FFmpeg hardwarecodering"
+                    "heading": "FFmpeg hardwarecodering",
+                    "desc": "Gebruikt beschikbare hardware om video te coderen voor live transcodering."
+                },
+                "ffmpeg_path": {
+                    "heading": "FFmpeg uitvoerbaar pad",
+                    "description": "Pad naar het uitvoerbare bestand van ffmpeg (niet alleen de map). Indien leeg, wordt ffmpeg vanuit de omgeving opgelost via $PATH, de configuratiemap of vanuit $HOME/.stash"
+                },
+                "ffprobe_path": {
+                    "heading": "FFprobe uitvoerbaar pad",
+                    "description": "Pad naar het uitvoerbare bestand ffprobe (niet alleen de map). Indien leeg, wordt ffprobe vanuit de omgeving opgelost via $PATH, de configuratiemap of vanuit $HOME/.stash"
+                },
+                "live_transcode": {
+                    "input_args": {
+                        "desc": "Geavanceerd: Extra argumenten om door te geven aan ffmpeg vóór het invoerveld bij het live transcoderen van video.",
+                        "heading": "FFmpeg Live Transcode Invoer Argumenten"
+                    },
+                    "output_args": {
+                        "desc": "Geavanceerd: Extra argumenten om door te geven aan ffmpeg vóór het uitvoerveld bij het live transcoderen van video.",
+                        "heading": "FFmpeg Live Transcode Uitvoer Argumenten"
+                    }
+                },
+                "transcode": {
+                    "input_args": {
+                        "desc": "Geavanceerd: Extra argumenten om door te geven aan ffmpeg vóór het invoerveld bij het genereren van video.",
+                        "heading": "FFmpeg Transcode Invoer Argumenten"
+                    },
+                    "output_args": {
+                        "heading": "FFmpeg Transcode Uitvoer Argumenten",
+                        "desc": "Geavanceerd: Extra argumenten die aan ffmpeg moeten worden doorgegeven vóór het uitvoerveld bij het genereren van video."
+                    }
                 }
-            }
+            },
+            "blobs_storage": {
+                "heading": "Type binaire gegevensopslag",
+                "description": "Waar binaire gegevens zoals scènecovers, performer-, studio- en tagafbeeldingen worden opgeslagen. Nadat u deze waarde hebt gewijzigd, moeten de bestaande gegevens worden gemigreerd met behulp van de taken Blobs migreren. Zie de pagina Taken voor meer informatie over migratie."
+            },
+            "blobs_path": {
+                "description": "Locatie in het bestandssysteem waar binaire gegevens worden opgeslagen. Alleen van toepassing bij gebruik van het Bestandssysteem blob-opslagtype. WAARSCHUWING: om dit te wijzigen, moeten bestaande gegevens handmatig worden verplaatst.",
+                "heading": "Pad naar binair gegevensbestandssysteem"
+            },
+            "heatmap_generation": "Funscript Heatmap Generatie",
+            "gallery_cover_regex_desc": "Regexp gebruikt om een afbeelding te identificeren als galerijomslag",
+            "plugins_path": {
+                "description": "Map locatie van plugin-configuratiebestanden",
+                "heading": "Plugin Pad"
+            },
+            "gallery_cover_regex_label": "Galerie omslagpatroon",
+            "funscript_heatmap_draw_range": "Bereik opnemen in gegenereerde heatmaps",
+            "funscript_heatmap_draw_range_desc": "Teken het bewegingsbereik op de y-as van de gegenereerde heatmap. Bestaande heatmaps moeten na wijziging opnieuw worden gegenereerd."
         },
         "library": {
             "exclusions": "Uitzonderingen",
@@ -360,7 +418,9 @@
         },
         "plugins": {
             "hooks": "Triggers",
-            "triggers_on": "Reageert op"
+            "triggers_on": "Reageert op",
+            "available_plugins": "Beschikbare Plugins",
+            "installed_plugins": "Geïnstalleerde Plugins"
         },
         "scraping": {
             "entity_metadata": "{entityType} Metadata",
@@ -371,7 +431,9 @@
             "scrapers": "Schrapers",
             "search_by_name": "Zoek op naam",
             "supported_types": "Ondersteunde types",
-            "supported_urls": "URL's"
+            "supported_urls": "URL's",
+            "installed_scrapers": "Geïnstalleerde Schrapers",
+            "available_scrapers": "Beschikbare schrapers"
         },
         "stashbox": {
             "add_instance": "Voeg stash-box instance toe",
@@ -380,7 +442,9 @@
             "endpoint": "Eindpunt",
             "graphql_endpoint": "GraphQL eindpunt",
             "name": "Naam",
-            "title": "Stash-box Eindpunten"
+            "title": "Stash-box Eindpunten",
+            "max_requests_per_minute_description": "Gebruikt de standaardwaarde van {defaultValue} als deze is ingesteld op 0",
+            "max_requests_per_minute": "Max aanvragen per minuut"
         },
         "system": {
             "transcoding": "Transcoderen"
@@ -449,7 +513,22 @@
                 "scanning_paths": "Scannen van de volgende paden"
             },
             "scan_for_content_desc": "Scan naar nieuwe inhoud en voeg deze toe aan de database.",
-            "set_name_date_details_from_metadata_if_present": "Stel de naam, datum, details in vanuit Embedded File Metadata"
+            "set_name_date_details_from_metadata_if_present": "Stel de naam, datum, details in vanuit Embedded File Metadata",
+            "clean_generated": {
+                "blob_files": "Blob bestanden",
+                "image_thumbnails_desc": "Afbeeldingsminiaturen en clips",
+                "markers": "Markeer Voorbeelden",
+                "previews": "Scene Voorbeelden",
+                "sprites": "Scène Sprites",
+                "transcodes": "Scène Transcoderingen",
+                "description": "Verwijdert gegenereerde bestanden zonder bijbehorende database-invoer.",
+                "previews_desc": "Scene voorbeelden en afbeeldingsminiaturen",
+                "image_thumbnails": "Afbeeldingsminiaturen"
+            },
+            "anonymising_database": "Anonimiseer database",
+            "anonymise_database": "Maakt een kopie van de database naar de backups-map, waarbij alle gevoelige gegevens anoniem worden gemaakt. Deze kan vervolgens aan anderen worden verstrekt voor probleemoplossing en debugging. De originele database wordt niet gewijzigd. De geanonimiseerde database gebruikt de bestandsnaamindeling {filename_format}.",
+            "anonymise_and_download": "Maakt een geanonimiseerde kopie van de database en downloadt het resulterende bestand.",
+            "generate_clip_previews_during_scan": "Genereer voorbeelden van Afbeelingsfragmenten"
         },
         "tools": {
             "scene_duplicate_checker": "Scène Duplicator Checker",
@@ -501,7 +580,7 @@
             },
             "funscript_offset": {
                 "description": "Time Offset in milliseconden voor het afspelen van interactieve scripts.",
-                "heading": "Funscript Offset (ms)"
+                "heading": ""
             },
             "handy_connection": {
                 "connect": "Connecteer",
@@ -515,7 +594,7 @@
             },
             "handy_connection_key": {
                 "description": "Handy connection key om te gebruiken voor interactieve scènes. Instellen van deze sleutel staat Stash toe om uw huidige scène-informatie met HandyFeeling.com te delen",
-                "heading": "Handy Connection Key"
+                "heading": ""
             },
             "image_lightbox": {
                 "heading": "Afbeelding Lightbox"
@@ -602,11 +681,11 @@
         "files": "{count, plural, one {Bestand} other {Bestanden}}",
         "galleries": "{count, plural, one {Galerij} other {Galerijen}}",
         "images": "{count, plural, one {Afbeelding} other {Afbeeldingen}}",
-        "markers": "{count, plural, one {Marker} other {Markers}}",
-        "performers": "{count, plural, one {Performer} other {Performers}}",
-        "scenes": "{count, plural, one {Scene} other {Scenes}}",
-        "studios": "{count, plural, one {Studio} other {Studios}}",
-        "tags": "{count, plural, one {Tag} other {Tags}}"
+        "markers": "",
+        "performers": "",
+        "scenes": "",
+        "studios": "",
+        "tags": ""
     },
     "country": "Land",
     "cover_image": "Cover afbeelding",
@@ -678,7 +757,6 @@
             "destination": "Bestemming",
             "source": "Afkomst"
         },
-        "overwrite_filter_confirm": "Weet u zeker dat u de bestaande opgeslagen zoekopdracht {entityName} wilt overschrijven?",
         "scene_gen": {
             "force_transcodes": "Genereren van transcode forceren",
             "force_transcodes_tooltip": "Standaard worden transcodes alleen gegenereerd als het videobestand niet wordt ondersteund in de browser. Indien ingeschakeld, worden transcodes gegenereerd, zelfs als het videobestand in de browser lijkt te worden ondersteund.",
@@ -707,7 +785,7 @@
             "preview_seg_count_head": "Aantal segmenten in voorbeeld",
             "preview_seg_duration_desc": "Duur van elk voorbeeldsegment, in seconden.",
             "preview_seg_duration_head": "Voorbeeld Segment Duur",
-            "sprites": "Scene Scrubber Sprites",
+            "sprites": "Scène Scrubber Sprites",
             "sprites_tooltip": "De set afbeeldingen die onder de videospeler worden weergegeven voor eenvoudige navigatie.",
             "transcodes": "Transcoderingen",
             "transcodes_tooltip": "MP4-conversies van niet-ondersteunde video-indelingen",
@@ -720,7 +798,12 @@
         "scrape_results_existing": "Bestaande",
         "scrape_results_scraped": "Geschraapt",
         "set_image_url_title": "Afbeelding URL",
-        "unsaved_changes": "Niet-opgeslagen wijzigingen gaan verloren. Weet je zeker dat je wilt vertrekken?"
+        "unsaved_changes": "Niet-opgeslagen wijzigingen gaan verloren. Weet je zeker dat je wilt vertrekken?",
+        "merge": {
+            "destination": "Bestemming",
+            "source": "Bron"
+        },
+        "performers_found": "{count} artiesten gevonden"
     },
     "dimensions": "Dimensies",
     "director": "Regisseur",
@@ -783,11 +866,11 @@
     "filter_name": "Filter Naam",
     "filters": "Filters",
     "framerate": "Frame snelheid",
-    "frames_per_second": "{value} frames per seconde",
+    "frames_per_second": "{value} fps",
     "front_page": {
         "types": {
             "premade_filter": "Vooraf gemaakte filter",
-            "saved_filter": "Opgeslagen Filter"
+            "saved_filter": "Opgeslagen filter"
         }
     },
     "galleries": "Galerijen",
@@ -798,11 +881,11 @@
         "FEMALE": "Vrouw",
         "INTERSEX": "Intersex",
         "MALE": "Man",
-        "NON_BINARY": "Non-Binar",
+        "NON_BINARY": "Non-binair",
         "TRANSGENDER_FEMALE": "Transgender Vrouw",
         "TRANSGENDER_MALE": "Transgender Man"
     },
-    "hair_color": "Haar kleur",
+    "hair_color": "Haarkleur",
     "handy_connection_status": {
         "connecting": "Verbinden",
         "disconnected": "Verbinding verbroken",
@@ -828,7 +911,8 @@
     "isMissing": "Is Missende",
     "library": "Bibliotheek",
     "loading": {
-        "generic": "Laden…"
+        "generic": "Laden…",
+        "plugins": "Plugins laden…"
     },
     "marker_count": "Marker Aantal",
     "markers": "Markeringen",
@@ -841,13 +925,13 @@
         "interactive_speed": "Interactieve snelheid",
         "performer_card": {
             "age": "{age} {years_old}",
-            "age_context": "{age} {years_old} in deze scène"
+            "age_context": "{age} {years_old} bij productie"
         },
         "phash": "PHash",
         "stream": "Stream",
         "video_codec": "Video Codec"
     },
-    "megabits_per_second": "{value} megabits per seconde",
+    "megabits_per_second": "{value} mbps",
     "metadata": "Metadata",
     "name": "Naam",
     "new": "Nieuw",
@@ -996,7 +1080,8 @@
     "stats": {
         "image_size": "Afbeelding groote",
         "scenes_duration": "Scene duur",
-        "scenes_size": "Scene groote"
+        "scenes_size": "Scene groote",
+        "scenes_played": "Scènes gespeeld"
     },
     "status": "Status: {statusText}",
     "studio": "Studio",
@@ -1048,5 +1133,47 @@
     "circumcised_types": {
         "CUT": "Ja",
         "UNCUT": "Nee"
+    },
+    "folder": "Folder",
+    "hasChapters": "Heeft hoofdstukken",
+    "image_index": "Afbeelding #",
+    "include_sub_groups": "Inclusief subgroepen",
+    "index_of_total": "{index} van {total}",
+    "orientation": "Oriëntatie",
+    "group": "Groep",
+    "group_count": "Aantal groepen",
+    "height_cm": "Lengte (cm)",
+    "history": "Geschiedenis",
+    "groups": "Groepen",
+    "file_count": "Aantal bestanden",
+    "files_amount": "{value} bestanden",
+    "include_sub_group_content": "Inclusief subgroep inhoud",
+    "login": {
+        "username": "Gebruikersnaam",
+        "password": "Wachtwoord",
+        "login": "Login",
+        "invalid_credentials": "Ongeldige gebruikersnaam of wachtwoord"
+    },
+    "group_scene_number": "Scènenummer",
+    "include_sub_studio_content": "Inclusief substudio inhoud",
+    "last_played_at": "Laatst gespeeld op",
+    "include_sub_tag_content": "Inclusief sub-tag inhoud",
+    "age_on_date": "{age} tijdens productie",
+    "studio_tagger": {
+        "query_all_studios_in_the_database": "Alle studio's in de database",
+        "current_page": "Huidige pagina",
+        "status_tagging_job_queued": "Status: Tagging-taak in de wachtrij",
+        "config": {
+            "no_instances_found": "Geen gevallen gevonden",
+            "these_fields_will_not_be_changed_when_updating_studios": "Deze velden worden niet gewijzigd bij het updaten van studio's."
+        },
+        "failed_to_save_studio": "Opslaan van studio “{studio}” mislukt",
+        "name_already_exists": "Naam bestaat reeds",
+        "network_error": "Netwerkfout",
+        "no_results_found": "Geen resultaten gevonden.",
+        "number_of_studios_will_be_processed": "{studio_count} studio's worden verwerkt",
+        "refresh_tagged_studios": "Vernieuwen getagde studio's",
+        "refreshing_will_update_the_data": "Vernieuwen zal de gegevens van alle getagde studio's van de stash-box bijwerken.",
+        "create_or_tag_parent_studios": "Maak ontbrekende of label bestaande moederstudio's"
     }
 }
diff --git a/ui/v2.5/src/locales/nn-NO.json b/ui/v2.5/src/locales/nn-NO.json
index 81d94cf8e..a55928e53 100644
--- a/ui/v2.5/src/locales/nn-NO.json
+++ b/ui/v2.5/src/locales/nn-NO.json
@@ -102,7 +102,13 @@
         "performers_found": "Fann {count} utøvarar",
         "delete_entity_title": "{count, plural, one {Slett {singularEntity}} other {Slett {pluralEntity}}}",
         "scenes_found": "Fann {count} scener",
-        "dont_show_until_updated": "Ikkje vis før neste oppdatering"
+        "dont_show_until_updated": "Ikkje vis før neste oppdatering",
+        "imagewall": {
+            "direction": {
+                "column": "Kolonne",
+                "row": "Rad"
+            }
+        }
     },
     "date": "Dato",
     "bitrate": "Bitrate",
@@ -143,6 +149,9 @@
                         }
                     }
                 }
+            },
+            "images": {
+                "heading": "Bilete"
             }
         },
         "about": {
@@ -229,5 +238,16 @@
     "sub_group": "Undergruppe",
     "sub_group_count": "Tal på undergrupper",
     "sub_group_of": "Undergruppe av {parent}",
-    "sub_group_order": "Undergruppesortert"
+    "sub_group_order": "Undergruppesortert",
+    "groups": "Grupper",
+    "performers": "Utøvarar",
+    "studios": "Studio",
+    "image": "Bilete",
+    "images": "Bilete",
+    "scene": "Scene",
+    "group": "Gruppe",
+    "galleries": "Galleri",
+    "scenes": "Scener",
+    "studio": "Studio",
+    "performer": "Utøvar"
 }
diff --git a/ui/v2.5/src/locales/pl-PL.json b/ui/v2.5/src/locales/pl-PL.json
index 794497801..4d830a6e7 100644
--- a/ui/v2.5/src/locales/pl-PL.json
+++ b/ui/v2.5/src/locales/pl-PL.json
@@ -141,7 +141,9 @@
         "remove_from_containing_group": "Usuń z grupy",
         "reset_cover": "Przywróć domyślną okładkę",
         "add_sub_groups": "Dodaj podgrupy",
-        "view_history": "Zobacz historię"
+        "view_history": "Zobacz historię",
+        "play": "Odtwarzaj",
+        "show_results": "Pokaż wyniki"
     },
     "actions_name": "Działania",
     "age": "Wiek",
@@ -346,6 +348,9 @@
                         "desc": "Zaawansowane: Dodatkowe argumenty do przekazania do FFmpeg przed polem wyjściowym podczas generowania wideo.",
                         "heading": "Argumenty wyjścia dla transkodowania z użyciem FFmpeg"
                     }
+                },
+                "download_ffmpeg": {
+                    "heading": "Pobierz FFmpeg"
                 }
             },
             "funscript_heatmap_draw_range": "Bierz pod uwagę zakres dla wygenerowanych heatmap",
@@ -832,7 +837,6 @@
             "destination": "Cel",
             "source": "Źródło"
         },
-        "overwrite_filter_confirm": "Czy na pewno chcesz nadpisać istniejące zapisane zapytanie {entityName}?",
         "reassign_entity_title": "Przypisz {count, plural, one {{singularEntity}} other {{pluralEntity}}}",
         "reassign_files": {
             "destination": "Przypisz ponownie do"
diff --git a/ui/v2.5/src/locales/pt-BR.json b/ui/v2.5/src/locales/pt-BR.json
index b759122d7..40ff46319 100644
--- a/ui/v2.5/src/locales/pt-BR.json
+++ b/ui/v2.5/src/locales/pt-BR.json
@@ -689,7 +689,6 @@
             "destination": "Destino",
             "source": "Fonte"
         },
-        "overwrite_filter_confirm": "Tem certeza de que deseja sobrescrever a consulta salva existente {entityName}?",
         "scene_gen": {
             "force_transcodes": "Forçar geração de transcodificação",
             "force_transcodes_tooltip": "Por padrão, transcodificações são geradas apenas quando o arquivo de vídeo não é suportado pelo navegador. Quando ativado, transcodificações serão geradas mesmo quando o vídeo parecer ser suportado no navegador.",
diff --git a/ui/v2.5/src/locales/ro-RO.json b/ui/v2.5/src/locales/ro-RO.json
index f3fc389ba..4e2237729 100644
--- a/ui/v2.5/src/locales/ro-RO.json
+++ b/ui/v2.5/src/locales/ro-RO.json
@@ -88,7 +88,8 @@
         "submit_update": "Trimite actualizare",
         "tasks": {
             "clean_confirm_message": "Ești sigur că vrei să cureți? Acest lucru va șterge informațiile din baza de date și conținutul generat pentru toate scenele și galeriile care nu se mai găsesc în sistemul de fișiere.",
-            "import_warning": "Ești sigur că vrei să imporți? Asta va șterge baza de date si va reimporta din metadatele tale exporatate."
+            "import_warning": "Ești sigur că vrei să imporți? Asta va șterge baza de date si va reimporta din metadatele tale exporatate.",
+            "dry_mode_selected": "\"Modul uscat\" selectat. Nu se va șterge nimic, doar se va loga."
         },
         "temp_disable": "Dezactivează temporar…",
         "temp_enable": "Activează temporar…",
@@ -131,7 +132,18 @@
         "reshuffle": "Reamestecă",
         "scrape_query": "Extrage date",
         "scrape_scene_fragment": "Extrage fragment cu fragment",
-        "scrape_with": "Extrage cu…"
+        "scrape_with": "Extrage cu…",
+        "selective_clean": "Curățare selectivă",
+        "selective_scan": "Scanare selectivă",
+        "set_cover": "Setează ca fundal",
+        "swap": "Schimbă",
+        "unset": "Nesetat",
+        "view_history": "Vezi istoric",
+        "sidebar": {
+            "close": "Închide bara laterală",
+            "open": "Deschide bara laterală"
+        },
+        "split": "Împarte"
     },
     "actions_name": "Acțiuni",
     "age": "Vârstă",
@@ -162,16 +174,27 @@
             "set_tag_label": "Setați etichete",
             "show_male_desc": "Comutați dacă interpreții de sex masculin vor fi disponibili pentru etichetare.",
             "show_male_label": "Arată interpreți de sex masculin",
-            "source": "Sursă"
+            "source": "Sursă",
+            "query_mode_metadata": "Date meta",
+            "mark_organized_label": "Marchează ca Organizat la salvare",
+            "errors": {
+                "blacklist_duplicate": "Lucru de pe lista neagră duplicat"
+            },
+            "mark_organized_desc": "Marchează scena ca Organizată imediat după ce butonul de Salvare este apăsat.",
+            "query_mode_label": "Mod de căutare",
+            "blacklist_desc": "Lucrurile din lista neagră sunt excluse din căutări. De reținut, căutările sunt expresii si diferențiază între litere mari și mici. Înaintea anumitor caractere, trebuie pus caracterul backslash: {chars_require_escape}"
         },
         "results": {
             "duration_unknown": "Durată necunoscută",
             "match_failed_already_tagged": "Scena este deja etichetată",
             "match_failed_no_result": "Nu s-au găsit rezultate",
             "match_success": "Scena a fost etichetată cu succes",
-            "unnamed": "Fără denumire"
+            "unnamed": "Fără denumire",
+            "fp_matches": "Durația este aceeași",
+            "duration_off": "Durația diferă cu cel puțin {number}s"
         },
-        "verb_toggle_config": "{toggle} {configuration}"
+        "verb_toggle_config": "{toggle} {configuration}",
+        "noun_query": "Căutare"
     },
     "config": {
         "about": {
@@ -253,7 +276,6 @@
     "created_at": "Creat La",
     "dialogs": {
         "delete_confirm": "Ești sigur ca vrei să ștergi {entityName}?",
-        "overwrite_filter_confirm": "Sunteți sigur că doriți să suprascrieți interogarea salvată existentă {entityName}?",
         "scene_gen": {
             "force_transcodes_tooltip": "În mod implicit, transcodurile sunt generate numai atunci când fișierul video nu este acceptat în browser. Atunci când este activată, transcodurile vor fi generate chiar și atunci când fișierul video pare a fi acceptat în browser.",
             "image_previews": "Imagini animate de previzualizare",
@@ -495,5 +517,21 @@
     "view_all": "Vezi Toate",
     "weight": "Greutate",
     "years_old": "ani",
-    "containing_group": "Grup aparținător"
+    "containing_group": "Grup aparținător",
+    "aliases": "Porecle",
+    "appears_with": "Apare cu",
+    "audio_codec": "Codec Audio",
+    "between_and": "și",
+    "blobs_storage_type": {
+        "database": "Bază de date",
+        "filesystem": "Sistem de fișiere"
+    },
+    "captions": "Subtitrări",
+    "chapters": "Capitole",
+    "circumcised_types": {
+        "CUT": "Circumcis",
+        "UNCUT": "Necircumcis"
+    },
+    "circumcised": "Circumcizie",
+    "age_on_date": "{age} la producție"
 }
diff --git a/ui/v2.5/src/locales/ru-RU.json b/ui/v2.5/src/locales/ru-RU.json
index b5e6d8dcf..8a3bc0473 100644
--- a/ui/v2.5/src/locales/ru-RU.json
+++ b/ui/v2.5/src/locales/ru-RU.json
@@ -128,7 +128,7 @@
         "assign_stashid_to_parent_studio": "Присвоить Stash ID для текущей родительской студии и обновить метаданные",
         "add_manual_date": "Добавить дату вручную",
         "add_o": "Добавить О",
-        "add_play": "Добавить проигрывание",
+        "add_play": "Добавить воспроизведение",
         "choose_date": "Выбрать дату",
         "clean_generated": "Очистить сгенерированные файлы",
         "clear_date_data": "Очистить информацию о дате",
@@ -139,7 +139,17 @@
         "reset_cover": "Восстановить обложку по умолчанию",
         "set_cover": "Установить как обложку",
         "add_sub_groups": "Добавить подгруппы",
-        "remove_from_containing_group": "Удалить из группы"
+        "remove_from_containing_group": "Удалить из группы",
+        "reset_play_duration": "Сбросить время воспроизведения",
+        "reset_resume_time": "Сбросить точку продолжения",
+        "show_results": "Показать результаты",
+        "sidebar": {
+            "toggle": "Показать/скрыть боковую панель",
+            "open": "Открыть панель",
+            "close": "Закрыть панель"
+        },
+        "show_count_results": "Показать {count} результат(ов)",
+        "play": "Воспроизвести"
     },
     "actions_name": "Действия",
     "age": "Возраст",
@@ -183,7 +193,10 @@
             "show_male_label": "Показывать актеров мужского пола",
             "source": "Источник",
             "mark_organized_label": "Отметить как Организованную при сохранении",
-            "mark_organized_desc": "Сразу же отметить сцену как Организованную после нажатия кнопки Сохранить."
+            "mark_organized_desc": "Сразу же отметить сцену как Организованную после нажатия кнопки Сохранить.",
+            "errors": {
+                "blacklist_duplicate": "Дублировать элемент чёрного списка"
+            }
         },
         "noun_query": "Запрос",
         "results": {
@@ -435,7 +448,9 @@
             "endpoint": "Конечная точка",
             "graphql_endpoint": "Конечная точка GraphQL",
             "name": "Имя",
-            "title": "Конечные точки Stash-box"
+            "title": "Конечные точки Stash-box",
+            "max_requests_per_minute": "Максимальное количество запросов в минуту",
+            "max_requests_per_minute_description": "Использует значение по умолчанию {defaultValue}, если задано 0"
         },
         "system": {
             "transcoding": "Транскодирование"
@@ -541,7 +556,8 @@
                 "sprites": "Спрайты Сцен",
                 "transcodes": "Транскоды Сцен"
             },
-            "rescan": "Пересканировать файлы"
+            "rescan": "Пересканировать файлы",
+            "rescan_tooltip": "Повторно просканировать все файлы в пути. Используется для обновления метаданных и сканирования ZIP-файлов."
         },
         "tools": {
             "scene_duplicate_checker": "Проверка сцен на дубликаты",
@@ -560,7 +576,9 @@
                 "whitespace_chars": "Символы пробелов",
                 "whitespace_chars_desc": "Эти символы будут заменены пробелами в названии"
             },
-            "scene_tools": "Инструменты видео"
+            "scene_tools": "Инструменты видео",
+            "graphql_playground": "Песочница GraphQL",
+            "heading": "Инструменты"
         },
         "ui": {
             "abbreviate_counters": {
@@ -694,7 +712,7 @@
                 }
             },
             "scene_list": {
-                "heading": "Сетка",
+                "heading": "Сеточный вид",
                 "options": {
                     "show_studio_as_text": "Отображать названия студии как текст"
                 }
@@ -720,7 +738,8 @@
                         "description": "Кнопка VR будет показана только для сцен с данным тегом.",
                         "heading": "Тег VR"
                     },
-                    "disable_mobile_media_auto_rotate": "Отключить автоповорот в полноэкранном режиме на мобильных устройствах"
+                    "disable_mobile_media_auto_rotate": "Отключить автоповорот в полноэкранном режиме на мобильных устройствах",
+                    "show_range_markers": "Показать маркеры диапазона"
                 }
             },
             "scene_wall": {
@@ -883,7 +902,6 @@
             "destination": "Назначение",
             "source": "Источник"
         },
-        "overwrite_filter_confirm": "Вы уверены, что хотите перезаписать существующий сохраненный запрос {entityName}?",
         "reassign_entity_title": "{count, plural, one {Переназначить {singularEntity}} other {Переназначить {pluralEntity}}}",
         "reassign_files": {
             "destination": "Переназначить на"
@@ -944,7 +962,9 @@
         },
         "clear_play_history_confirm": "Вы уверены, что хотите удалить историю просмотра?",
         "performers_found": "{count} исполнителей найдено",
-        "clear_o_history_confirm": "Вы уверены, что хотите очистить историю О?"
+        "clear_o_history_confirm": "Вы уверены, что хотите очистить историю О?",
+        "overwrite_filter_warning": "Сохранённый фильтр «{entityName}» будет перезаписан.",
+        "set_default_filter_confirm": "Вы уверены, что хотите установить этот фильтр по умолчанию?"
     },
     "dimensions": "Размер",
     "director": "Режиссер",
@@ -954,7 +974,8 @@
         "list": "Список",
         "tagger": "Теггер",
         "unknown": "Неизвестный",
-        "wall": "Стена"
+        "wall": "Стена",
+        "label_current": "Режим отображения: {current}"
     },
     "donate": "Пожертвование",
     "dupe_check": {
@@ -1070,7 +1091,8 @@
     "last_played_at": "Воспроизводился в последний раз",
     "library": "Библиотека",
     "loading": {
-        "generic": "Загрузка…"
+        "generic": "Загрузка…",
+        "plugins": "Загрузка плагинов…"
     },
     "marker_count": "Количество маркеров",
     "markers": "Маркеры",
@@ -1104,7 +1126,8 @@
         "first": "Первая",
         "last": "Последняя",
         "next": "Следующая",
-        "previous": "Предыдущий"
+        "previous": "Предыдущий",
+        "current_total": "{current} из {total}"
     },
     "parent_of": "Родитель {children}",
     "parent_studios": "Родительские студии",
@@ -1182,7 +1205,8 @@
         "name": "Фильтр",
         "saved_filters": "Сохраненные фильтры",
         "update_filter": "Обновить фильтр",
-        "edit_filter": "Изменить фильтр"
+        "edit_filter": "Изменить фильтр",
+        "more_filter_criteria": "+ещё {count}"
     },
     "seconds": "Секунды",
     "settings": "Настройки",
@@ -1204,7 +1228,9 @@
         "errors": {
             "something_went_wrong": "О, нет! Что-то пошло не так!",
             "something_went_wrong_description": "Если это похоже на проблему с вашими входными данными, нажмите «Назад», чтобы исправить их. В противном случае сообщите об ошибке на {githubLink} или обратитесь за помощью в {discordLink}.",
-            "something_went_wrong_while_setting_up_your_system": "Что-то пошло не так при настройке вашей системы. Мы получили следующую ошибку: {error}"
+            "something_went_wrong_while_setting_up_your_system": "Что-то пошло не так при настройке вашей системы. Мы получили следующую ошибку: {error}",
+            "unexpected_error": "Произошла непредвиденная ошибка: {error}",
+            "unable_to_retrieve_system_status": "Не удалось получить статус системы: {error}"
         },
         "folder": {
             "file_path": "Путь файла",
@@ -1432,7 +1458,15 @@
         "image_index_greater_than_zero": "Индекс изображения должен быть больше 0",
         "header": "Ошибка",
         "loading_type": "Ошибка загрузки {type}",
-        "something_went_wrong": "Что-то пошло по пизде."
+        "something_went_wrong": "Что-то пошло по пизде.",
+        "custom_fields": {
+            "field_name_length": "Имя поля должно содержать меньше 65 символов",
+            "field_name_required": "Имя поля обязательно",
+            "field_name_whitespace": "Имя поля не должно начинаться или заканчиваться пробелом",
+            "duplicate_field": "Имя поля должно быть уникальным"
+        },
+        "invalid_javascript_string": "Недопустимый код JavaScript: {error}",
+        "invalid_json_string": "Недопустимая JSON-строка: {error}"
     },
     "date_format": "ГГГГ-ММ-ДД",
     "datetime_format": "ГГГГ-ММ-ДД ЧЧ:ММ",
@@ -1451,7 +1485,8 @@
         "date_invalid_form": "${path} должен быть в формате ГГГГ-ММ-ДД",
         "blank": "${path} не должен быть пустым",
         "required": "${path} обязательное поле",
-        "unique": "${path} должен быть уникальным"
+        "unique": "${path} должен быть уникальным",
+        "end_time_before_start_time": "Время окончания должно быть больше или равно времени начала"
     },
     "unknown_date": "Неизвестная дата",
     "urls": "URLы",
@@ -1471,5 +1506,43 @@
     "age_on_date": "{age} на момент съемки",
     "sub_group_count": "Кол-во подгрупп",
     "sub_group": "Подгруппа",
-    "studio_tags": "Теги студии"
+    "studio_tags": "Теги студии",
+    "criterion_modifier_values": {
+        "any": "Любой",
+        "any_of": "Любой из",
+        "none": "Отсутствует",
+        "only": "Только"
+    },
+    "containing_groups": "Группы, в которые входит объект",
+    "custom_fields": {
+        "criteria_format_string": "criterion} (пользовательское поле) {modifierString} {valueString}",
+        "criteria_format_string_others": "{criterion} (пользовательское поле) {modifierString} {valueString} (и ещё {others})",
+        "field": "Поле",
+        "title": "Настраиваемые поля",
+        "value": "Значение"
+    },
+    "containing_group": "Содержащая группа",
+    "containing_group_count": "Количество содержащих групп",
+    "time_end": "Время окончания",
+    "eta": "Ожидаемое время завершения",
+    "login": {
+        "username": "Имя пользователя",
+        "password": "Пароль",
+        "login": "Логин",
+        "internal_error": "Произошла внутренняя ошибка. Подробности смотрите в логах.",
+        "invalid_credentials": "Неверное имя пользователя или пароль"
+    },
+    "groups": "Группы",
+    "include_sub_tag_content": "Учитывать содержимое вложенных тегов",
+    "sort_name": "Сортировать по имени",
+    "include_sub_group_content": "Включать содержимое подгрупп",
+    "include_sub_studio_content": "Включить данные дочерних студий",
+    "group": "Группа",
+    "group_count": "Количество групп",
+    "group_scene_number": "Номер сцены",
+    "include_sub_groups": "Включать подгруппы",
+    "studio_count": "Количество студий",
+    "sub_group_of": "Входит в группу {parent}",
+    "sub_group_order": "Сортировка подгрупп",
+    "sub_groups": "Подгруппы"
 }
diff --git a/ui/v2.5/src/locales/sv-SE.json b/ui/v2.5/src/locales/sv-SE.json
index 2180a77f2..152f137d2 100644
--- a/ui/v2.5/src/locales/sv-SE.json
+++ b/ui/v2.5/src/locales/sv-SE.json
@@ -141,7 +141,15 @@
         "add_sub_groups": "Lägg Till Undergrupper",
         "remove_from_containing_group": "Ta bort från Grupp",
         "reset_resume_time": "Återställ återupptagningstid",
-        "set_cover": "Välj som Omslag"
+        "set_cover": "Välj som Omslag",
+        "play": "Spela",
+        "show_count_results": "Visa {count} resultat",
+        "sidebar": {
+            "toggle": "Ändra sidolisten",
+            "close": "Stäng sidolisten",
+            "open": "Öppna sidolisten"
+        },
+        "show_results": "Visa resultat"
     },
     "actions_name": "Handlingar",
     "age": "Ålder",
@@ -447,7 +455,9 @@
             "endpoint": "Adress",
             "graphql_endpoint": "GraphQL-adress",
             "name": "Namn",
-            "title": "Stash-box Adresser"
+            "title": "Stash-box Adresser",
+            "max_requests_per_minute": "Högsta antal förfrågningar per minut",
+            "max_requests_per_minute_description": "Använder standardvärdet {defaultValue} om detta är 0"
         },
         "system": {
             "transcoding": "Omkodning"
@@ -573,7 +583,9 @@
                 "whitespace_chars": "Blankstegstecken",
                 "whitespace_chars_desc": "Dessa tecken kommer ersättas med blanksteg i titeln"
             },
-            "scene_tools": "Scenverktyg"
+            "scene_tools": "Scenverktyg",
+            "graphql_playground": "GraphQL lekplats",
+            "heading": "Verktyg"
         },
         "ui": {
             "abbreviate_counters": {
@@ -907,7 +919,6 @@
             "destination": "Mål",
             "source": "Källa"
         },
-        "overwrite_filter_confirm": "Är du säker på att du vill skriva över existerande sökning {entityName}?",
         "performers_found": "{count} stjärnor hittade",
         "reassign_entity_title": "{count, plural, one {Omplacera {singularEntity}} other {Omplacera {pluralEntity}}}",
         "reassign_files": {
@@ -960,7 +971,9 @@
         "set_image_url_title": "URL till bild",
         "unsaved_changes": "Osparade ändringar. Är du säker att du vill lämna?",
         "clear_o_history_confirm": "Är du säker på att du vill radera O-historiken?",
-        "clear_play_history_confirm": "Är du säker på att du vill radera uppspelningshistoriken?"
+        "clear_play_history_confirm": "Är du säker på att du vill radera uppspelningshistoriken?",
+        "overwrite_filter_warning": "Sparat filter \"{entityName}\" kommer skrivas över.",
+        "set_default_filter_confirm": "Är du säker att du vill ställa in detta filter som standard?"
     },
     "dimensions": "Mått",
     "director": "Regissör",
@@ -970,7 +983,8 @@
         "list": "Lista",
         "tagger": "Taggaren",
         "unknown": "Okänd",
-        "wall": "Vägg"
+        "wall": "Vägg",
+        "label_current": "Visningsläge: {current}"
     },
     "donate": "Donera",
     "dupe_check": {
@@ -1118,7 +1132,7 @@
         "interactive_speed": "Interaktiv Hastighet",
         "performer_card": {
             "age": "{age} {years_old}",
-            "age_context": "{age} {years_old} i den här scenen"
+            "age_context": "{age} {years_old} vid produktion"
         },
         "phash": "PHash",
         "play_count": "Visningar",
@@ -1222,7 +1236,8 @@
         "edit_filter": "Ändra Filter",
         "name": "Filter",
         "saved_filters": "Sparade filter",
-        "update_filter": "Uppdatera filter"
+        "update_filter": "Uppdatera filter",
+        "more_filter_criteria": "+{count} fler"
     },
     "second": "Sekund",
     "seconds": "Sekunder",
@@ -1516,8 +1531,18 @@
     "custom_fields": {
         "field": "Fält",
         "title": "Skäddarsydda Fält",
-        "value": "Värde"
+        "value": "Värde",
+        "criteria_format_string": "{criterion} (eget fält) {modifierString} {valueString}",
+        "criteria_format_string_others": "{criterion} (eget fält) {modifierString} {valueString} (+{others} andra)"
     },
     "eta": "Uppskattad återstående tid",
-    "sort_name": "Sorteringsnamn"
+    "sort_name": "Sorteringsnamn",
+    "login": {
+        "username": "Användarnamn",
+        "password": "Lösenord",
+        "internal_error": "Oväntad internt fel. Se loggen för mer information",
+        "login": "Inlogg",
+        "invalid_credentials": "Ogiltigt användarnamn eller lösenord"
+    },
+    "age_on_date": "{age} vid produktion"
 }
diff --git a/ui/v2.5/src/locales/th-TH.json b/ui/v2.5/src/locales/th-TH.json
index 0376e880d..e8fdf0e52 100644
--- a/ui/v2.5/src/locales/th-TH.json
+++ b/ui/v2.5/src/locales/th-TH.json
@@ -1078,7 +1078,6 @@
             "destination": "ปลายทาง",
             "source": "ต้นทาง"
         },
-        "overwrite_filter_confirm": "คุณแน่ใจว่าต้องการเขียนทับเงื่อนไขการค้นหา{entityName}ใช่หรือไม่?",
         "reassign_files": {
             "destination": "ย้ายไปที่"
         },
diff --git a/ui/v2.5/src/locales/tr-TR.json b/ui/v2.5/src/locales/tr-TR.json
index 8bd6f874c..5263d398e 100644
--- a/ui/v2.5/src/locales/tr-TR.json
+++ b/ui/v2.5/src/locales/tr-TR.json
@@ -137,11 +137,23 @@
         "assign_stashid_to_parent_studio": "Mevcut ana stüdyoya Stash ID atayın ve üstverileri güncelleyin",
         "download_anonymised": "Anonim olarak indir",
         "add_manual_date": "Elle tarih ekle",
-        "reset_resume_time": "Devam etme süresini sıfırla"
+        "reset_resume_time": "Devam etme süresini sıfırla",
+        "split": "Ayır",
+        "swap": "Değiştir",
+        "encoding_image": "Resim kodlanıyor…",
+        "sidebar": {
+            "close": "Kenar çubuğunu kapat",
+            "open": "Kenar çubuğunu aç",
+            "toggle": "Kenar çubuğunu aç/kapat"
+        },
+        "play": "Oynat",
+        "show_results": "Sonuçları göster",
+        "show_count_results": "{count} sonucu göster",
+        "load": "Yükle"
     },
     "actions_name": "Eylemler",
     "age": "Yaş",
-    "aliases": "Takma isimler",
+    "aliases": "Diğer Adlar",
     "all": "tümü",
     "also_known_as": "Diğer adıyla",
     "ascending": "Artan",
@@ -152,7 +164,7 @@
     "career_length": "Kariyer Uzunluğu",
     "component_tagger": {
         "config": {
-            "active_instance": "Aktif stash-box:",
+            "active_instance": "Aktif stash-box oturumu:",
             "blacklist_desc": "Kara listeye alınan kelimeler sorguya eklenmez. Sözkonusu kelimeler kurallı ifadelerdir (regex) ve büyük-küçük harf ayrımına duyarlı değillerdir. Belirli karakterler ters bölü işaretiyle ayrılmalıdır: {chars_require_escape}",
             "blacklist_label": "Kara liste",
             "query_mode_auto": "Otomatik",
@@ -228,7 +240,7 @@
             "system": "Sistem",
             "tasks": "Görevler",
             "tools": "Araçlar",
-            "changelog": "Sürüm Notları"
+            "changelog": "Değişiklik Günlüğü"
         },
         "dlna": {
             "allow_temp_ip": "{tempIP} IP adresine izin ver",
@@ -287,13 +299,13 @@
             "create_galleries_from_folders_desc": "Seçili ise resim içeren dizinlerden galeriler oluşturur.",
             "create_galleries_from_folders_label": "Resim içeren dizinlerden galeri oluştur",
             "db_path_head": "Veritabanı Yolu",
-            "directory_locations_to_your_content": "İçeriğiniz için dizin lokasyonları",
+            "directory_locations_to_your_content": "İçeriğiniz için dizin konumları",
             "excluded_image_gallery_patterns_desc": "Tarama ve Temizleme işlemine eklenmeyecek Resim ve Galeri dosyaları/dosya konumları için kurallı ifadeler (Regexp)",
             "excluded_image_gallery_patterns_head": "Dışta tutulan Resim/Galeri Kuralları",
             "excluded_video_patterns_desc": "Tarama ve Temizleme işlemine eklenmeyecek Video dosyaları/dosya konumları için kurallı ifadeler (Regexp)",
             "excluded_video_patterns_head": "Dışta tutulan Video Kuralları",
             "gallery_ext_desc": "Galeri ZIP dosyaları olarak tanımlanacak dosya uzantıları listesi (virgülle ayrılmış).",
-            "gallery_ext_head": "Galeri ZIP dosya Uzantıları",
+            "gallery_ext_head": "Galeri ZIP Uzantıları",
             "generated_file_naming_hash_desc": "Oluşturulacak dosya isimleri için MD5 veya oshash kullanın. Bu değeri değiştirmek, tüm sahneler için MD5/oshash hesaplaması gerektirir. Bu değeri değiştirdikten sonra mevcut tüm ek dosyalar yeniden oluşturulacak veya yer değiştirecektir. Yer değiştirme işlemleri için Görevler sayfasını ziyaret edin.",
             "generated_file_naming_hash_head": "Oluşturulan dosya adı imzası",
             "generated_files_location": "Oluşturulan ek dosyalar için dizin konumu (yer işaretleri, sahne önizlemeler, küçük resimler vb.)",
@@ -323,7 +335,7 @@
                 "heading": "Veri Toplayıcı Yolu"
             },
             "scraping": "Veri Toplama",
-            "sqlite_location": "SQLite veritabanı için dizin konumu (değiştirirseniz yeniden başlatma gerekir)",
+            "sqlite_location": "SQLite veritabanı için dosya konumu (yeniden başlatma gerektirir). UYARI: Veritabanını, Stash sunucusunun çalıştığı sistemden farklı bir sistemde (yani ağ üzerinden) depolamak desteklenmemektedir!",
             "video_ext_desc": "Video olarak işlem görecek dosya uzantı listesi (virgülle ayrılmış).",
             "video_ext_head": "Video Uzantıları",
             "video_head": "Video",
@@ -386,12 +398,14 @@
             "python_path": {
                 "heading": "Python Yürütülebilir Yolu",
                 "description": "Python yürütülebilir dosyasının yolu (yalnızca klasörün değil). Komut dosyası veri kazıyıcılar ve eklentiler için kullanılır. Boşsa, python ortamdan çözümlenecektir"
-            }
+            },
+            "heatmap_generation": "Funscript Isı Haritası Oluşturma",
+            "funscript_heatmap_draw_range_desc": "Oluşturulan ısı haritasının y ekseninde hareket aralığını çizin. Değişiklik yapıldıktan sonra mevcut ısı haritalarının yeniden oluşturulması gerekecektir."
         },
         "library": {
             "exclusions": "Dışta Tutulanlar",
             "gallery_and_image_options": "Galeri ve Resim seçenekleri",
-            "media_content_extensions": "Medya içerik uzantıları"
+            "media_content_extensions": "Medya İçeriği Uzantıları"
         },
         "logs": {
             "log_level": "Kayıt Tutma Seviyesi"
@@ -422,7 +436,9 @@
             "endpoint": "Bağlantı Noktası",
             "graphql_endpoint": "GraphQL bağlantı noktası",
             "name": "Ad",
-            "title": "Stash-box Bağlantı Noktaları"
+            "title": "Stash-box Bağlantı Noktaları",
+            "max_requests_per_minute": "Dakika başına maksimum istek",
+            "max_requests_per_minute_description": "0 olarak ayarlanırsa, varsayılan değer olan {defaultValue} kullanılır"
         },
         "system": {
             "transcoding": "Video Dönüştürme"
@@ -515,7 +531,8 @@
             "anonymise_and_download": "Veritabanının anonimleştirilmiş bir kopyasını oluşturur ve elde edilen dosyayı indirir.",
             "anonymise_database": "Tüm hassas verileri anonimleştirerek veritabanının bir kopyasını yedekler dizinine alır. Bu daha sonra sorun giderme ve hata ayıklama amacıyla başkalarına sağlanabilir. Orijinal veritabanı değiştirilmez. Anonimleştirilmiş veritabanı {filename_format} dosya adı biçimini kullanır.",
             "migrate_scene_screenshots": {
-                "delete_files": "Ekran görüntülerini sil"
+                "delete_files": "Ekran görüntülerini sil",
+                "overwrite_existing": "Mevcut blob'ları ekran görüntüsü verileriyle üzerine yaz"
             },
             "rescan_tooltip": "Yoldaki her dosyayı yeniden tarayın. Dosya üstverilerini güncellemeyi zorlamak ve zip dosyalarını yeniden taramak için kullanılır.",
             "generate_clip_previews_during_scan": "Resim klipleri için önizlemeler oluştur"
@@ -537,7 +554,9 @@
                 "whitespace_chars": "Boşluk karakterleri",
                 "whitespace_chars_desc": "Bu karakterler başlıkta boşluk karakteri ile değiştirilecektir"
             },
-            "scene_tools": "Sahne Araçları"
+            "scene_tools": "Sahne Araçları",
+            "graphql_playground": "GraphQL oyun alanı",
+            "heading": "Araçlar"
         },
         "ui": {
             "basic_settings": "Temel Seçenekler",
@@ -580,7 +599,7 @@
                             "half": "Yarım",
                             "quarter": "Çeyrek",
                             "tenth": "Onda bir",
-                            "full": "Dolu"
+                            "full": "Tam"
                         },
                         "label": "Derecelendirme Yıldızı Hassasiyeti"
                     }
@@ -605,7 +624,8 @@
                         "heading": "Resim önizlemelerini kaydet"
                     },
                     "create_image_clips_from_videos": {
-                        "heading": "Video Uzantılarını Resim Klibi Olarak Tara"
+                        "heading": "Video Uzantılarını Resim Klibi Olarak Tara",
+                        "description": "Bir kütüphanede videolar devre dışı bırakıldığında, video dosyaları (video uzantısı ile biten dosyalar) Resim Klibi olarak taranacaktır."
                     }
                 }
             },
@@ -618,7 +638,7 @@
                 "heading": "Maksimum döngü süresi"
             },
             "menu_items": {
-                "description": "Gezinti çubuğunda farklı türdeki içerikleri göster veya gizle",
+                "description": "Gezinti çubuğunda farklı içerik türlerini göster veya gizle",
                 "heading": "Menü Öğeleri"
             },
             "performers": {
@@ -645,7 +665,7 @@
                 }
             },
             "scene_player": {
-                "heading": "Sahne Oynatıcısı",
+                "heading": "Sahne Oynatıcı",
                 "options": {
                     "auto_start_video": "Videoları otomatik başlat",
                     "auto_start_video_on_play_selected": {
@@ -664,7 +684,9 @@
                     "track_activity": "Sahne Oynatma Geçmişi'ni etkinleştir",
                     "enable_chromecast": "Chromecast'i Etkinleştir",
                     "show_ab_loop_controls": "AB Loop eklenti kontrollerini göster",
-                    "show_scrubber": "Video İlerleme Çubuğunu Göster"
+                    "show_scrubber": "Video İlerleme Çubuğunu Göster",
+                    "disable_mobile_media_auto_rotate": "Mobil cihazlarda tam ekran medyanın otomatik döndürülmesini devre dışı bırak",
+                    "show_range_markers": "Zaman İşaretleyicilerini Göster"
                 }
             },
             "scene_wall": {
@@ -688,6 +710,10 @@
                 "show_all_details": {
                     "heading": "Tüm ayrıntıları göster",
                     "description": "Etkinleştirildiğinde, varsayılan olarak tüm içerik ayrıntıları gösterilecek ve her ayrıntı öğesi tek bir sütuna sığacak"
+                },
+                "compact_expanded_details": {
+                    "heading": "Kompakt genişletilmiş ayrıntılar",
+                    "description": "Bu seçenek etkinleştirildiğinde, kompakt görünüm korunurken genişletilmiş ayrıntılar gösterilir"
                 }
             },
             "custom_javascript": {
@@ -696,12 +722,12 @@
                 "description": "Değişikliklerin etkili olması için sayfanın yeniden yüklenmesi gerekir. Özel Javascript ile Stash'in gelecekteki sürümleri arasında uyumluluk garantisi yoktur."
             },
             "custom_locales": {
-                "heading": "Özel yerelleştirme",
+                "heading": "Özel Yerelleştirme",
                 "option_label": "Özel yerelleştirme etkin",
                 "description": "Bireysel yerel ayar dizelerini geçersiz kılın. Ana liste için https://github.com/stashapp/stash/blob/develop/ui/v2.5/src/locales/en-GB.json adresine bakın. Değişikliklerin etkili olması için sayfanın yeniden yüklenmesi gerekir."
             },
             "studio_panel": {
-                "heading": "Stüdyo görünümü",
+                "heading": "Stüdyo Görünümü",
                 "options": {
                     "show_child_studio_content": {
                         "heading": "Alt stüdyo içeriğini görüntüle",
@@ -716,7 +742,7 @@
                         "description": "Etiket görünümündeyken alt etiketlerdeki içeriği de görüntüleyin"
                     }
                 },
-                "heading": "Etiket görünümü"
+                "heading": "Etiket Görünümü"
             },
             "abbreviate_counters": {
                 "heading": "Sayaçları kısalt",
@@ -735,10 +761,20 @@
                 "connect": "Bağlan",
                 "status": {
                     "heading": "Handy Bağlantı Durumu"
-                }
+                },
+                "server_offset": {
+                    "heading": "Sunucu Zaman Farkı"
+                },
+                "sync": "Senkronize et"
             },
             "use_stash_hosted_funscript": {
                 "heading": "Funscript'leri doğrudan sun"
+            },
+            "show_tag_card_on_hover": {
+                "heading": "Etiket kartı araç ipuçları"
+            },
+            "scroll_attempts_before_change": {
+                "heading": "Geçiş Öncesi Kaydırma Denemeleri"
             }
         },
         "advanced_mode": "Gelişmiş Mod"
@@ -829,7 +865,6 @@
             "destination": "Hedef Noktası",
             "source": "Kaynak"
         },
-        "overwrite_filter_confirm": "Kayıtlı {entityName} sorgusunun üzerine yazmak istediğinizden emin misiniz?",
         "scene_gen": {
             "force_transcodes": "Dönüştürülmüş video oluşturmayı zorla",
             "force_transcodes_tooltip": "Varsayılan olarak, video yalnızca video dosyası tarayıcı tarafından desteklenmediğinde dönüştürülür. Etkinleştirildiğinde, video dosyası tarayıcı tarafından destekleniyorsa bile video dönüştürülür.",
@@ -839,7 +874,7 @@
             "marker_image_previews": "İşaretleyici Hareketli Resim Önizlemeleri",
             "marker_image_previews_tooltip": "Hareketli Yer İmi WebP önizlemeleri, Önizleme Türü sadece Hareketli Resim olarak seçilmişse gereklidir.",
             "marker_screenshots": "İşaretleyici Ekran Görüntüleri",
-            "marker_screenshots_tooltip": "Yer İmi hareketsiz JPG resimleri, Önizleme Türü sadece Hareketsiz Resim olarak seçilmişse gereklidir.",
+            "marker_screenshots_tooltip": "Yer İmi hareketsiz JPG resimleri",
             "markers": "İşaretleyici Önizlemeleri",
             "markers_tooltip": "Belirlenen zamandan itibaren başlayan 20 saniyelik videolar.",
             "overwrite": "Varolan oluşturulmuş dosyaların üzerine yaz",
@@ -877,7 +912,9 @@
         "unsaved_changes": "Değişiklikler kaydedilmedi. Sayfadan ayrılmak istediğinize emin misiniz?",
         "clear_play_history_confirm": "Oynatma geçmişini temizlemek istediğinize emin misiniz?",
         "merge": {
-            "source": "Kaynak"
+            "source": "Kaynak",
+            "destination": "Hedef",
+            "empty_results": "Hedef alan değerleri değişmeyecektir."
         },
         "dont_show_until_updated": "Sonraki güncellemeye kadar gösterme",
         "clear_o_history_confirm": "O geçmişini temizlemek istediğinize emin misiniz?",
@@ -894,7 +931,8 @@
         "reassign_files": {
             "destination": "Şuraya yeniden ata"
         },
-        "reassign_entity_title": "{count, plural, one {Yeniden ata {singularEntity}} other {Yeniden ata {pluralEntity}}}"
+        "reassign_entity_title": "{count, plural, one {Yeniden ata {singularEntity}} other {Yeniden ata {pluralEntity}}}",
+        "set_default_filter_confirm": "Bu filtreyi varsayılan olarak ayarlamak istediğinize emin misiniz?"
     },
     "dimensions": "Boyutlar",
     "director": "Yönetmen",
@@ -903,7 +941,8 @@
         "list": "Liste",
         "tagger": "Etiketleyici",
         "unknown": "Bilinmeyen",
-        "wall": "Duvar"
+        "wall": "Duvar",
+        "label_current": "Görüntüleme Modu: {current}"
     },
     "donate": "Bağış Yap",
     "dupe_check": {
@@ -918,7 +957,8 @@
         "search_accuracy_label": "Arama Kesinliği",
         "title": "Yinelenen Sahneler",
         "duration_options": {
-            "equal": "Eşit"
+            "equal": "Eşit",
+            "any": "Herhangi"
         },
         "duration_diff": "Maksimum Süre Farkı",
         "select_all_but_largest_file": "En büyük dosya hariç, yinelenen her gruptaki her dosyayı seç",
@@ -985,7 +1025,8 @@
     "isMissing": "Eksik",
     "library": "Kütüphane",
     "loading": {
-        "generic": "Yükleniyor…"
+        "generic": "Yükleniyor…",
+        "plugins": "Eklentiler yükleniyor…"
     },
     "marker_count": "İşaretleyici Sayısı",
     "markers": "İşaretleyiciler",
@@ -1109,7 +1150,8 @@
             "path_to_cache_directory_empty_for_default": "önbellek dizini yolu (varsayılan için boş bırakın)",
             "store_blobs_in_database": "Blob'ları veritabanında depola",
             "path_to_blobs_directory_empty_for_default": "blobs dizini yolu (varsayılan için boş bırakın)",
-            "where_can_stash_store_cache_files_description": "Stash, HLS/DASH canlı video dönüştürme gibi bazı işlevlerin çalışabilmesi için geçici dosyalara yönelik bir önbellek dizini gerektirir. Varsayılan olarak, Stash yapılandırma dosyanızı içeren dizin içinde bir <code>cache</code> dizini oluşturacaktır. Bunu değiştirmek istiyorsanız, lütfen mutlak veya göreceli (geçerli çalışma dizinine) bir yol girin. Mevcut değilse, Stash bu dizini oluşturacaktır."
+            "where_can_stash_store_cache_files_description": "Stash, HLS/DASH canlı video dönüştürme gibi bazı işlevlerin çalışabilmesi için geçici dosyalara yönelik bir önbellek dizini gerektirir. Varsayılan olarak, Stash yapılandırma dosyanızı içeren dizin içinde bir <code>cache</code> dizini oluşturacaktır. Bunu değiştirmek istiyorsanız, lütfen mutlak veya göreceli (geçerli çalışma dizinine) bir yol girin. Mevcut değilse, Stash bu dizini oluşturacaktır.",
+            "where_can_stash_store_blobs_description_addendum": "Alternatif olarak bu verileri veritabanında saklayabilirsiniz. <strong>Not:</strong>Bu işlem veritabanınızın boyutunu artıracak ve veritabanı taşıma süresini uzatacaktır."
         },
         "stash_setup_wizard": "Stash Kurulum Sihirbazı",
         "success": {
@@ -1129,11 +1171,12 @@
         "welcome": {
             "config_path_logic_explained": "Stash (<code>config.yml</code>) yapılandırma dosyasını ilk olarak mevcut dizinde bulmaya çalışır. Eğer bulamazsa, <code>$HOME/.stash/config.yml</code> dizinini (Windows işletim sistemi için <code>%USERPROFILE%\\.stash\\config.yml</code> dizini) araştırır. Öte yandan <code>-c '<path to config file>'</code> veya <code>--config '<path to config file>'</code> seçeneklerini kullanarak özelleştirilmiş bir yapılandırma dosyası da kullanabilirsiniz.",
             "in_current_stash_directory": "<code>{path}</code> yolunda:",
-            "in_the_current_working_directory": "Mevcut dizinde",
+            "in_the_current_working_directory": "",
             "next_step": "Eğer yeni bir sistem oluşturmak için hazırsanız, yapılandırma dosyasının nereye kaydedileceğini seçin ve Sonraki düğmesine basın.",
             "store_stash_config": "Stash yapılandırmasını nereye kaydetmek istiyorsunuz?",
             "unable_to_locate_config": "Eğer bunu okuyorsanız, Stash herhangi bir mevcut yapılandırma bulamamış demektir. Bu sihirbaz yeni bir yapılandırma sırasında size yol gösterecektir.",
-            "unexpected_explained": "Eğer beklenmedik bir şekilde bu ekranı gördüyseniz, Stash uygulamasını doğru dizinden başlatın veya başlatma komutuna <code>-c</code> değişkenini ekleyin."
+            "unexpected_explained": "Eğer beklenmedik bir şekilde bu ekranı gördüyseniz, Stash uygulamasını doğru dizinden başlatın veya başlatma komutuna <code>-c</code> değişkenini ekleyin.",
+            "in_the_current_working_directory_disabled": "<code>{path}</code> yolundaki çalışma dizini:"
         },
         "welcome_specific_config": {
             "config_path": "Stash, yapılandırma dosyası için bu dizini kullanacak: <code>{path}</code>",
@@ -1142,7 +1185,7 @@
         },
         "welcome_to_stash": "Stash uygulamasına hoşgeldiniz"
     },
-    "stash_id": "Stash Kimliği (ID)",
+    "stash_id": "Stash Kimliği",
     "stash_ids": "Stash Kimliği",
     "stats": {
         "image_size": "Toplam resim boyutu",
@@ -1182,7 +1225,8 @@
         "started_importing": "İçe aktarma başladı",
         "updated_entity": "{entity} güncellendi",
         "merged_scenes": "Birleştirilmiş sahneler",
-        "reassign_past_tense": "Dosya yeniden atandı"
+        "reassign_past_tense": "Dosya yeniden atandı",
+        "removed_entity": "{count, plural, one {{singularEntity}} other {{pluralEntity}}} kaldırıldı"
     },
     "total": "Toplam",
     "true": "Doğru",
@@ -1207,7 +1251,9 @@
             "edit_excluded_fields": "Hariç Tutulan Alanları Düzenle",
             "no_fields_are_excluded": "Hiçbir alan hariç tutulmadı",
             "create_parent_label": "Ana stüdyo oluştur",
-            "these_fields_will_not_be_changed_when_updating_studios": "Stüdyolar güncellenirken bu alanlar değişmeyecektir."
+            "these_fields_will_not_be_changed_when_updating_studios": "Stüdyolar güncellenirken bu alanlar değişmeyecektir.",
+            "active_stash-box_instance": "Aktif stash-box oturumu:",
+            "no_instances_found": "Oturum bulunamadı"
         },
         "batch_update_studios": "Stüdyoları Toplu Güncelle",
         "failed_to_save_studio": "Stüdyo kaydedilemedi \"{studio}\"",
@@ -1227,7 +1273,12 @@
         "tag_status": "Etiket Durumu",
         "untagged_studios": "Etiketlenmemiş stüdyolar",
         "updating_untagged_studios_description": "Etiketlenmemiş stüdyoları güncellemek, stashid'si olmayan tüm stüdyoları eşleştirmeye ve üstverileri güncellemeye çalışacaktır.",
-        "name_already_exists": "Ad zaten mevcut"
+        "name_already_exists": "Ad zaten mevcut",
+        "status_tagging_job_queued": "Durum: Etiketleme işi sıraya alındı",
+        "any_names_entered_will_be_queried": "Girilen tüm isimler karşıdaki Stash-Box oturumundan sorgulanacak ve bulunursa eklenecektir. Yalnızca tam eşleşmeler bir eşleşme olarak kabul edilecektir.",
+        "refreshing_will_update_the_data": "Yenileme işlemi stash-box oturumundaki tüm etiketli stüdyoların verilerini güncelleyecektir.",
+        "to_use_the_studio_tagger": "Stüdyo etiketleyiciyi kullanmak için bir stash-box oturumunun yapılandırılması gerekir.",
+        "studio_names_separated_by_comma": "Virgülle ayrılmış stüdyo adları"
     },
     "blobs_storage_type": {
         "database": "Veritabanı",
@@ -1261,7 +1312,8 @@
         "update": "Güncelle",
         "version": "Sürüm",
         "confirm_delete_source": "Kaynağı silmek istediğinize emin misiniz {name} ({url})?",
-        "required_by": "{packages} için gerekli"
+        "required_by": "{packages} için gerekli",
+        "confirm_uninstall": "{number} paketi kaldırmak istediğinize emin misiniz?"
     },
     "penis": "Penis",
     "penis_length": "Penis Uzunluğu",
@@ -1272,7 +1324,9 @@
             "excluded_fields": "Hariç tutulan alanlar:",
             "edit_excluded_fields": "Hariç Tutulan Alanları Düzenle",
             "no_fields_are_excluded": "Hiçbir alan hariç tutulmadı",
-            "these_fields_will_not_be_changed_when_updating_performers": "Oyuncular güncellenirken bu alanlar değiştirilmeyecektir."
+            "these_fields_will_not_be_changed_when_updating_performers": "Oyuncular güncellenirken bu alanlar değiştirilmeyecektir.",
+            "active_stash-box_instance": "Aktif stash-box oturumu:",
+            "no_instances_found": "Oturum bulunamadı"
         },
         "current_page": "Geçerli sayfa",
         "network_error": "Ağ Hatası",
@@ -1294,7 +1348,9 @@
         "updating_untagged_performers_description": "Etiketlenmemiş oyuncuları güncellemek, stashid'si olmayan tüm oyuncuları eşleştirmeye ve üstverileri güncellemeye çalışacaktır.",
         "add_new_performers": "Yeni Oyuncular Ekle",
         "refresh_tagged_performers": "Etiketlenmiş oyuncuları yenile",
-        "performer_already_tagged": "Oyuncu zaten etikelenmiş"
+        "performer_already_tagged": "Oyuncu zaten etikelenmiş",
+        "any_names_entered_will_be_queried": "Girilen tüm isimler karşıdaki Stash-Box oturumundan sorgulanacak ve bulunursa eklenecektir. Yalnızca tam eşleşmeler bir eşleşme olarak kabul edilecektir.",
+        "refreshing_will_update_the_data": "Yenileme işlemi stash-box oturumundaki tüm etiketli oyuncuların verisini güncelleyecektir."
     },
     "photographer": "Fotoğrafçı",
     "play_count": "Oynatma Sayısı",
@@ -1330,7 +1386,13 @@
         "loading_type": "{type} yüklenirken hata oluştu",
         "something_went_wrong": "Bir şeyler ters gitti.",
         "lazy_component_error_help": "Stash'i yakın zamanda güncellediyseniz, lütfen sayfayı yeniden yükleyin ya da tarayıcınızın önbelleğini temizleyin.",
-        "invalid_json_string": "Geçersiz JSON dizesi: {error}"
+        "invalid_json_string": "Geçersiz JSON dizesi: {error}",
+        "custom_fields": {
+            "duplicate_field": "Alan adı benzersiz olmalıdır",
+            "field_name_required": "Alan adı gereklidir",
+            "field_name_whitespace": "Alan adının başında veya sonunda boşluk bulunamaz",
+            "field_name_length": "Alan adı 65 karakterden az olmalıdır"
+        }
     },
     "sub_group_order": "Alt Grup Sırası",
     "validation": {
@@ -1358,7 +1420,8 @@
         "disconnected": "Bağlantı kesildi",
         "error": "Handy'e bağlanırken hata oluştu",
         "ready": "Hazır",
-        "uploading": "Komut dosyası yükleniyor"
+        "uploading": "Komut dosyası yükleniyor",
+        "syncing": "Sunucu ile senkronize ediliyor"
     },
     "o_count": "O Sayısı",
     "o_history": "O Geçmişi",
@@ -1381,7 +1444,9 @@
     "zip_file_count": "Zip Dosyası Sayısı",
     "last_played_at": "Son Oynatma Tarihi",
     "criterion_modifier_values": {
-        "only": "Sadece"
+        "only": "Sadece",
+        "none": "Hiçbiri",
+        "any_of": "Herhangi biri"
     },
     "history": "Geçmiş",
     "existing_value": "mevcut değer",
@@ -1418,6 +1483,20 @@
     "sub_group_of": "{parent} öğesinin alt grubu",
     "time_end": "Bitiş Zamanı",
     "custom_fields": {
-        "value": "Değer"
-    }
+        "value": "Değer",
+        "field": "Alan",
+        "title": "Özel Alanlar",
+        "criteria_format_string": "{criterion} (özel alan) {modifierString} {valueString}"
+    },
+    "eta": "Tahmini Kalan Süre",
+    "login": {
+        "password": "Şifre",
+        "internal_error": "Beklenmeyen dahili hata. Daha fazla ayrıntı için günlüklere bakın",
+        "login": "Giriş Yap",
+        "username": "Kullanıcı Adı",
+        "invalid_credentials": "Geçersiz kullanıcı adı veya şifre"
+    },
+    "age_on_date": "Videoda {age} yaşında",
+    "time": "Başlangıç Zamanı",
+    "disambiguation": "Ad Ayrımı"
 }
diff --git a/ui/v2.5/src/locales/uk-UA.json b/ui/v2.5/src/locales/uk-UA.json
index bbf0e426f..3f44afca1 100644
--- a/ui/v2.5/src/locales/uk-UA.json
+++ b/ui/v2.5/src/locales/uk-UA.json
@@ -1061,7 +1061,6 @@
     "synopsis": "Синопсис",
     "dialogs": {
         "delete_gallery_files": "Видалити папку галереї/zip-файл та всі зображення, які не прив'язані до жодної іншої галереї.",
-        "overwrite_filter_confirm": "Ви впевнені, що хочете перезаписати існуючий збережений запит {entityName}?",
         "scene_gen": {
             "marker_image_previews_tooltip": "Також створюйте анімовані (webp) прев’ю, які необхідні лише тоді, коли тип прев’ю для стіни сцен/маркерів встановлено на Анімоване зображення. Під час перегляду вони споживають менше ресурсів CPU, ніж відео-прев’ю, але генеруються додатково до них і займають більше місця на диску.",
             "transcodes_tooltip": "MP4-транскоди будуть попередньо згенеровані для всього контенту; корисно для повільних процесорів, але вимагає набагато більше дискового простору",
diff --git a/ui/v2.5/src/locales/ur-PK.json b/ui/v2.5/src/locales/ur-PK.json
new file mode 100644
index 000000000..9558feeaa
--- /dev/null
+++ b/ui/v2.5/src/locales/ur-PK.json
@@ -0,0 +1,14 @@
+{
+    "actions": {
+        "add": "شامل کریں",
+        "allow": "اجازت دیں",
+        "add_directory": "ڈکشنری میں شامل کریں",
+        "cancel": "منسوخ کریں",
+        "add_manual_date": "تاریخ شامل کریں",
+        "add_o": "مٹھ کی گنتئ بڑہاین",
+        "add_play": "پلۓ شامل کریں",
+        "allow_temporarily": "وقتئ اجازت دیں",
+        "anonymise": "بےنام کریں",
+        "apply": "لاگو کریں"
+    }
+}
diff --git a/ui/v2.5/src/locales/vi-VN.json b/ui/v2.5/src/locales/vi-VN.json
index 72749ca64..25da90f0e 100644
--- a/ui/v2.5/src/locales/vi-VN.json
+++ b/ui/v2.5/src/locales/vi-VN.json
@@ -134,14 +134,24 @@
             "clean_confirm_message": "Bạn có chắc chắn muốn làm sạch không? Thao tác này sẽ xóa thông tin cơ sở dữ liệu và nội dung đã tạo cho tất cả các cảnh và bộ sưu tập không còn tồn tại trong hệ thống tệp.",
             "import_warning": "Bạn có chắc chắn muốn nhập không? Thao tác này sẽ xóa cơ sở dữ liệu và nhập lại từ siêu dữ liệu đã xuất của bạn."
         },
-        "temp_disable": "Tạm thời vô hiệu hóa…",
-        "temp_enable": "Tạm thời kích hoạt…",
+        "temp_disable": "Vô hiệu hóa tạm thời…",
+        "temp_enable": "Kích hoạt tạm thời…",
         "unset": "Bỏ thiết lập",
-        "use_default": "Dùng mặc định",
+        "use_default": "Dùng thiết lập mặc định",
         "view_history": "Xem lịch sử",
         "view_random": "Xem ngẫu nhiên",
         "set_front_image": "Ảnh trước…",
-        "select_entity": "Chọn {entityType}"
+        "select_entity": "Chọn {entityType}",
+        "play": "Phát",
+        "show_results": "Hiển thị kết quả",
+        "show_count_results": "Hiển thị {count} kết quả",
+        "sidebar": {
+            "toggle": "Bật thanh bên",
+            "open": "Mở thanh bên",
+            "close": "Đóng thanh bên"
+        },
+        "load": "Nạp",
+        "load_filter": "Nạp bộ lọc"
     },
     "actions_name": "Hành động",
     "age": "Tuổi",
@@ -158,25 +168,886 @@
     "bitrate": "Bit Rate",
     "blobs_storage_type": {
         "database": "Cơ sở dữ liệu",
-        "filesystem": "Files hệ thống"
+        "filesystem": "Tập tin hệ thống"
     },
     "captions": "Tiêu đề",
     "career_length": "Tuổi nghề",
-    "chapters": "Chapters",
+    "chapters": "Chương",
     "circumcised_types": {
         "CUT": "Cắt",
         "UNCUT": "Không cắt"
     },
-    "circumcised": "Cắt bao quy đầu",
+    "circumcised": "Đã cắt bao quy đầu",
     "component_tagger": {
         "config": {
             "blacklist_desc": "Các mục trong danh sách đen sẽ bị loại trừ khỏi các truy vấn. Lưu ý rằng chúng là các biểu thức chính quy và không phân biệt chữ hoa chữ thường. Một số ký tự cần phải được thoát bằng dấu gạch chéo ngược: {chars_require_escape}",
             "blacklist_label": "Danh sách đen",
-            "mark_organized_desc": "Ngay lập tức đánh dấu cảnh là Đã tổ chức sau khi nhấn nút Lưu.",
+            "mark_organized_desc": "Ngay lập tức đánh dấu cảnh là Đã sắp xếp sau khi nhấn nút Lưu.",
             "active_instance": "Phiên bản stash-box đang hoạt động:",
-            "mark_organized_label": "Đánh dấu là Đã tổ chức khi lưu.",
+            "mark_organized_label": "Đánh dấu là Đã sắp xếp khi lưu.",
             "query_mode_auto": "Tự động",
-            "query_mode_auto_desc": "Sử dụng siêu dữ liệu nếu có, hoặc tên tệp."
+            "query_mode_auto_desc": "Sử dụng siêu dữ liệu nếu có, hoặc tên tệp",
+            "query_mode_filename": "Tên tệp tin",
+            "query_mode_filename_desc": "Chỉ dùng tên tệp tin",
+            "query_mode_label": "Chế độ truy vấn",
+            "query_mode_path": "Đường dẫn",
+            "query_mode_path_desc": "Dùng toàn bộ đường dẫn tệp tin",
+            "set_cover_desc": "Thay thế bìa nền nếu đã được tìm thấy.",
+            "set_cover_label": "Đặt ảnh bìa nền",
+            "set_tag_label": "Đặt các thẻ",
+            "query_mode_dir_desc": "Chỉ dùng thư mục chính của file video",
+            "set_tag_desc": "Đính kèm các thẻ vào cảnh, bằng cách ghi đè hoặc ghép với các thẻ có sẵn trên cảnh.",
+            "source": "Nguồn",
+            "errors": {
+                "blacklist_duplicate": "Các mục bị trùng lặp trong danh sách đen"
+            },
+            "query_mode_dir": "Danh sách",
+            "show_male_desc": "Chọn khi thẻ của nam diễn viên có sẵn để gán.",
+            "show_male_label": "Xem danh sách diễn viên nam",
+            "query_mode_metadata_desc": "Chỉ dùng dữ liệu mô tả",
+            "query_mode_metadata": "Thông tin mô tả"
+        },
+        "noun_query": "Truy vấn",
+        "results": {
+            "duration_unknown": "Thời gian không xác định",
+            "fp_matches": "Thời lượng tương ứng",
+            "fp_matches_multi": "Thời lượng khớp {matchCount}/{durationsLength} dấu vân tay",
+            "hash_matches": "Khớp với {hash_type}",
+            "match_failed_already_tagged": "Phân cảnh đã được gắn thẻ",
+            "match_failed_no_result": "Không có kết quả được tìm thấy",
+            "match_success": "Phân cảnh đã được gán thẻ thành công",
+            "phash_matches": "Khớp với {count} PHashes",
+            "duration_off": "Thời gian tắt ít nhất {number} giây",
+            "fp_found": "{fpCount, plural, =0 {Không có dấu vết trùng khớp mới được tìm thấy} other {# dấu vết trùng khớp mới đã được tìm thấy}}",
+            "unnamed": "Chưa được đặt tên"
+        },
+        "verb_match_fp": "Các dấu vân tay trùng khớp",
+        "verb_matched": "Trùng khớp",
+        "verb_scrape_all": "Loại bỏ tất cả",
+        "verb_toggle_config": "{toggle} {configuration}",
+        "verb_toggle_unmatched": "{toggle} phân cảnh không trùng khớp",
+        "verb_submit_fp": "Gửi {fpCount, plural, one{# Fingerprint} other{# Fingerprint}}"
+    },
+    "config": {
+        "about": {
+            "new_version_notice": "[MỚI]",
+            "build_hash": "Mã băm bản xây dựng:",
+            "check_for_new_version": "Kiểm tra phiên bản mới",
+            "latest_version": "Phiên bản mới nhất",
+            "latest_version_build_hash": "Mã bản dựng mới nhất:",
+            "release_date": "Ngày phát hành:",
+            "stash_discord": "Tham gia vào kênh {url} của chúng tôi",
+            "stash_open_collective": "Giúp đỡ chúng tôi qua {url}",
+            "version": "Phiên bản",
+            "build_time": "Thời điểm tạo:",
+            "stash_wiki": "Trang {url} của Stash",
+            "stash_home": "Trang chủ Stash tại {url}"
+        },
+        "application_paths": {
+            "heading": "Đường dẫn tới ứng dụng"
+        },
+        "categories": {
+            "about": "Về",
+            "changelog": "Nhật ký thay đổi",
+            "interface": "Giao diện",
+            "logs": "Tập nhật ký",
+            "plugins": "Các phần bổ trợ",
+            "security": "Bảo mật",
+            "services": "Các dịch vụ",
+            "system": "Hệ thống",
+            "tasks": "Các công việc",
+            "tools": "Các công cụ",
+            "metadata_providers": "Các bên cung cấp thông tin dữ liệu",
+            "scraping": "Đang quét dữ liệu"
+        },
+        "dlna": {
+            "allow_temp_ip": "Cho phép {tempIP}",
+            "allowed_ip_addresses": "Các địa chỉ IP được cho phép",
+            "default_ip_whitelist": "Danh sách các IP mặc định được cho phép",
+            "disabled_dlna_temporarily": "Vô hiệu DLNA tạm thời",
+            "disallowed_ip": "Các IP bị cấm",
+            "enabled_by_default": "Mặc định được kích hoạt",
+            "enabled_dlna_temporarily": "Kích hoạt DLNA tạm thời",
+            "network_interfaces": "Các giao diện",
+            "recent_ip_addresses": "Các địa chỉ IP gần đây",
+            "server_display_name": "Tên hiển thị của máy chủ",
+            "server_display_name_desc": "Tên hiển thị cho máy chủ DLNA. Mặc định là {server_name} nếu để trống.",
+            "server_port": "Cổng máy chủ",
+            "server_port_desc": "Cổng cho máy chủ DLNA dùng. Yêu cầu khởi động lại DLNA sau khi sửa đổi.",
+            "successfully_cancelled_temporary_behaviour": "Hủy bỏ hành vi tạm thời thành công",
+            "until_restart": "cho tới lúc khởi động lại",
+            "video_sort_order": "Thứ tự sắp xếp video mặc định",
+            "video_sort_order_desc": "Thứ tự sắp xếp các video mặc định.",
+            "allowed_ip_temporarily": "Các địa chỉ IP được cho phép tạm thời",
+            "default_ip_whitelist_desc": "Các địa chỉ IP mặc định được phép sử dụng DLNA. Dùng {wildcard} để cho phép tất cả các địa chỉ IP.",
+            "network_interfaces_desc": "Các giao diện để hiển thị máy chủ DLNA. Danh sách trống nghĩa là chạy trên mọi máy chủ. Yêu cần khởi động lại DLNA sau khi sửa đổi."
+        },
+        "general": {
+            "auth": {
+                "api_key": "Khóa API",
+                "authentication": "Xác thực",
+                "clear_api_key": "Xóa khóa API",
+                "credentials": {
+                    "heading": "Các thông tin xác thực",
+                    "description": "Tài khoản/mật khẩu dùng để kiểm soát quyền truy cập Stash."
+                },
+                "generate_api_key": "Tạo khóa API",
+                "log_file": "File nhật ký",
+                "log_file_desc": "Đường dẫn tới file lưu nhật ký. Để trống để vô hiệu lưu nhật ký vào file. Yêu cầu khởi động lại.",
+                "log_http": "Nhật ký truy cập HTTP",
+                "log_to_terminal": "Xuất nhật ký lên terminal",
+                "maximum_session_age": "Thời gian phiên tối đa",
+                "maximum_session_age_desc": "Thời gian chờ tối đa trước khi phiên đăng nhập hết hạn, tính bằng giây. Yêu cầu khởi động lại.",
+                "password": "Mật khẩu",
+                "password_desc": "Mật khẩu để truy cập Stash. Để trống để tắt xác thực người dùng",
+                "stash-box_integration": "Tích hợp Stash-box",
+                "username": "Tên người dùng",
+                "username_desc": "Tên người dùng để truy cập Stash. Để trống để tắt xác thực người dùng",
+                "log_http_desc": "Xuất nhật ký truy cập HTTP lên terminal. Yêu cầu khởi động lại.",
+                "api_key_desc": "Khóa API cho các hệ thống ngoài. Chỉ yêu cầu khóa khi tên người dùng / mật khẩu được thiết lập. Tên người dùng phải được lưu trước khi tạo khóa API.",
+                "log_to_terminal_desc": "Đẩy nhật ký lên terminal bên cạnh việc lưu vào file. Luôn bật nếu đang vô hiệu lưu vào file. Yêu cầu khởi động lại."
+            },
+            "backup_directory_path": {
+                "heading": "Đường dẫn tới thư mục sao lưu",
+                "description": "Vị trí thư mục để sao lưu file dữ liệu SQLite"
+            },
+            "blobs_path": {
+                "heading": "Đường dẫn tới hệ thống tập tin dữ liệu binary",
+                "description": "Chỗ nào trong hệ thống file để lưu dữ liệu binary. Chỉ áp dụng cho lựa chọn lưu trữ blob trong hệ thống tệp tin. CẢNH BÁO: thay đổi cài đặt này yêu cầu di chuyển thủ công các dữ liệu hiện tại."
+            },
+            "blobs_storage": {
+                "heading": "Loại lưu trữ dữ liệu binary",
+                "description": "Chỗ nào để lưu trữ dữ liệu binary như bìa phân cảnh, người biểu diễn, studio và các nhãn ảnh. Sau khi thay đổi giá trị này, dữ liệu hiện tại phải được chuyển đổi bằng cách sử dụng các tác vụ Chuyển Đổi Các Blob. Xem trang Các Tác Vụ để chuyển đổi."
+            },
+            "cache_location": "Vị trí thư mục cache. Yêu cầu dùng nếu đang truyền trực tiếp sử dụng HLS (như trên thiết bị Apple) hoặc DASH.",
+            "cache_path_head": "Đường dẫn cache",
+            "calculate_md5_and_ohash_desc": "Tính toán hàm băm MD5 bên cạnh oshash. Bật lên sẽ làm quá trình quét ban đầu diễn ra chậm hơn. Hàm băm tên file phải đặt về oshash để vô hiệu MD5.",
+            "calculate_md5_and_ohash_label": "Tính toán MD5 cho các video",
+            "check_for_insecure_certificates": "Kiểm tra các chứng chỉ không an toàn",
+            "check_for_insecure_certificates_desc": "Một số trang sử dụng chứng chỉ ssl không an toàn. Nếu bỏ tick, bộ thu thập sẽ bỏ qua quy trình kiểm tra tính an toàn của chứng chỉ và sẽ thu thập toàn bộ các trang đó. Nếu bạn gặp vấn đề về chứng chỉ khi thu thập dữ liệu thì hãy bỏ tick.",
+            "create_galleries_from_folders_desc": "Nếu bật, các thư mục chứa ảnh sẽ mặc định được tạo thành thư viện. Tạo một tệp có tên .forcegallery hoặc .nogallery trong thư mục để ép buộc hoặc ngăn việc tạo thư viện.",
+            "create_galleries_from_folders_label": "Tạo thư viện ảnh từ các thư mục chứa hình ảnh",
+            "database": "Cơ sở dữ liệu",
+            "db_path_head": "Vị trí tệp cơ sở dữ liệu",
+            "directory_locations_to_your_content": "Vị trí thư mục chứa nội dung của bạn",
+            "excluded_image_gallery_patterns_head": "Các mẫu tên ảnh/thư viện cần loại trừ",
+            "excluded_video_patterns_desc": "Biểu thức chính quy (regex) của các tệp video hoặc đường dẫn cần loại trừ khỏi quá trình Quét và thêm vào mục Dọn dẹp",
+            "excluded_video_patterns_head": "Các mẫu tên video cần loại trừ",
+            "ffmpeg": {
+                "download_ffmpeg": {
+                    "heading": "Tải xuống FFmpeg",
+                    "description": "Tải FFmpeg vào thư mục cấu hình và xóa đường dẫn ffmpeg và ffprobe hiện tại để sử dụng từ thư mục cấu hình."
+                },
+                "ffmpeg_path": {
+                    "heading": "Đường dẫn tệp FFmpeg",
+                    "description": "Đường dẫn đến tệp ffmpeg (không chỉ là thư mục). Nếu để trống, hệ thống sẽ tự tìm ffmpeg từ biến môi trường $PATH, thư mục cấu hình, hoặc từ $HOME/.stash"
+                },
+                "ffprobe_path": {
+                    "description": "Đường dẫn đến tệp ffprobe (không chỉ là thư mục). Nếu để trống, hệ thống sẽ tự tìm ffprobe từ biến môi trường $PATH, thư mục cấu hình hoặc từ $HOME/.stash",
+                    "heading": "Đường dẫn tệp FFprobe"
+                },
+                "hardware_acceleration": {
+                    "desc": "Sử dụng phần cứng hiện có để mã hóa video trong quá trình chuyển mã trực tiếp.",
+                    "heading": "Mã hóa phần cứng bằng FFmpeg"
+                },
+                "live_transcode": {
+                    "output_args": {
+                        "heading": "Tham số đầu ra cho chuyển mã trực tiếp bằng FFmpeg",
+                        "desc": "Nâng cao: Các tham số bổ sung sẽ được truyền vào FFmpeg trước trường đầu ra khi chuyển mã video trực tiếp."
+                    },
+                    "input_args": {
+                        "desc": "Nâng cao: Các tham số bổ sung sẽ được truyền vào FFmpeg trước trường đầu vào khi chuyển mã video trực tiếp.",
+                        "heading": "Tham số đầu vào cho chuyển mã trực tiếp bằng FFmpeg"
+                    }
+                },
+                "transcode": {
+                    "input_args": {
+                        "desc": "Nâng cao: Các tham số bổ sung sẽ được truyền vào FFmpeg trước trường đầu vào khi tạo video.",
+                        "heading": "Tham số đầu vào khi chuyển mã bằng FFmpeg"
+                    },
+                    "output_args": {
+                        "heading": "Tham số đầu ra khi chuyển mã bằng FFmpeg",
+                        "desc": "Nâng cao: Các tham số bổ sung sẽ được truyền vào FFmpeg trước trường đầu ra khi tạo video."
+                    }
+                }
+            },
+            "funscript_heatmap_draw_range": "Bao gồm khoảng giá trị trong các bản đồ nhiệt được tạo ra",
+            "gallery_cover_regex_desc": "Biểu thức chính quy dùng để nhận diện ảnh bìa của thư viện",
+            "gallery_cover_regex_label": "Mẫu tên file ảnh dùng làm bìa thư viện",
+            "gallery_ext_desc": "Danh sách phần mở rộng tệp (file extensions), phân cách bằng dấu phẩy, sẽ được nhận diện là tệp thư viện dạng nén (zip).",
+            "gallery_ext_head": "Phần mở rộng tệp thư viện nén",
+            "generated_file_naming_hash_head": "Mã băm dùng để đặt tên cho các tệp được tạo ra",
+            "generated_files_location": "Vị trí thư mục lưu trữ các tệp được tạo (dấu cảnh, ảnh xem trước cảnh, ảnh sprite, v.v.)",
+            "generated_path_head": "Thư mục lưu trữ các tệp sinh ra tự động",
+            "hashing": "Băm (tạo mã băm)",
+            "heatmap_generation": "Tạo bản đồ nhiệt từ Funscript",
+            "image_ext_desc": "Danh sách phần mở rộng tệp được nhận diện là hình ảnh, ngăn cách bằng dấu phẩy.",
+            "image_ext_head": "Đuôi file ảnh",
+            "include_audio_desc": "Bao gồm luồng âm thanh khi tạo bản xem trước.",
+            "include_audio_head": "Bao gồm âm thanh",
+            "maximum_streaming_transcode_size_head": "Kích thước tối đa cho các luồng video đã chuyển mã",
+            "maximum_transcode_size_desc": "Kích thước tối đa cho các video chuyển mã được tạo ra",
+            "maximum_transcode_size_head": "Kích thước chuyển mã tối đa",
+            "metadata_path": {
+                "heading": "Vị trí thư mục chứa siêu dữ liệu",
+                "description": "Vị trí thư mục được sử dụng khi thực hiện xuất hoặc nhập toàn bộ dữ liệu"
+            },
+            "number_of_parallel_task_for_scan_generation_head": "Số lượng tác vụ song song cho quá trình quét/tạo dữ liệu",
+            "parallel_scan_head": "Quét/Tạo dữ liệu song song",
+            "plugins_path": {
+                "description": "Vị trí thư mục chứa các tệp cấu hình plugin",
+                "heading": "Đường dẫn plugins"
+            },
+            "preview_generation": "Tạo bản xem trước",
+            "python_path": {
+                "description": "Đường dẫn đến tệp Python (không chỉ là thư mục). Được sử dụng cho các trình quét (scraper) và plugin viết bằng script. Nếu để trống, hệ thống sẽ tự tìm Python từ môi trường",
+                "heading": "Đường dẫn tệp thực thi Python"
+            },
+            "scrapers_path": {
+                "description": "Vị trí thư mục chứa các tệp cấu hình của trình quét (scraper)",
+                "heading": "Đường dẫn đến thư mục chứa các scraper"
+            },
+            "scraping": "Thu thập dữ liệu từ website",
+            "video_ext_desc": "Danh sách phần mở rộng tệp sẽ được nhận diện là video, phân cách bằng dấu phẩy.",
+            "video_ext_head": "Định dạng của video",
+            "video_head": "Video",
+            "chrome_cdp_path": "Đường dẫn giao thức CDP của Chrome",
+            "chrome_cdp_path_desc": "Đường dẫn đến tệp thực thi của Chrome, hoặc một địa chỉ từ xa (bắt đầu bằng http:// hoặc https://, ví dụ http://localhost:9222/json/version) trỏ đến một phiên bản Chrome đang chạy.",
+            "excluded_image_gallery_patterns_desc": "Biểu thức chính quy (regex) của tệp ảnh và thư mục thư viện cần loại trừ khỏi quá trình Quét và thêm vào mục Dọn dẹp",
+            "funscript_heatmap_draw_range_desc": "Vẽ phạm vi chuyển động trên trục y của bản đồ nhiệt được tạo. Các bản đồ nhiệt hiện có sẽ cần được tạo lại sau khi thay đổi tùy chọn này.",
+            "generated_file_naming_hash_desc": "Sử dụng MD5 hoặc oshash để đặt tên cho các tệp được tạo. Việc thay đổi tùy chọn này yêu cầu tất cả các cảnh (scenes) phải có giá trị MD5/oshash tương ứng. Sau khi thay đổi, các tệp đã tạo trước đó sẽ cần được di chuyển hoặc tạo lại. Vui lòng xem trang Nhiệm vụ (Tasks) để thực hiện di chuyển.",
+            "maximum_streaming_transcode_size_desc": "Kích thước tối đa cho các luồng video đã chuyển mã",
+            "number_of_parallel_task_for_scan_generation_desc": "Đặt giá trị là 0 để hệ thống tự động phát hiện. Cảnh báo: chạy nhiều tác vụ hơn mức cần thiết để sử dụng 100% CPU sẽ làm giảm hiệu suất và có thể gây ra các sự cố khác.",
+            "scraper_user_agent": "User Agent cho trình quét (scraper)",
+            "scraper_user_agent_desc": "Chuỗi User-Agent được sử dụng trong các yêu cầu HTTP khi quét dữ liệu (scrape)",
+            "sqlite_location": "Vị trí tệp cơ sở dữ liệu SQLite (cần khởi động lại). CẢNH BÁO: Lưu cơ sở dữ liệu trên một hệ thống khác với nơi chạy Stash server (ví dụ: qua mạng) là không được hỗ trợ!",
+            "logging": "Ghi nhật ký"
+        },
+        "advanced_mode": "Chế độ nâng cao",
+        "stashbox": {
+            "name": "Tên",
+            "title": "Các điểm cuối Stash-box",
+            "add_instance": "Thêm một phiên bản Stash-box",
+            "api_key": "API key",
+            "endpoint": "Điểm cuối (Endpoint)",
+            "graphql_endpoint": "Điểm cuối GraphQL",
+            "description": "Stash-box hỗ trợ gán tag tự động cho cảnh và diễn viên dựa trên dấu vân tay (fingerprints) và tên tệp.\nEndpoint và khóa API có thể được tìm thấy trong trang tài khoản của bạn trên phiên hoạt động của stash-box. Tên định danh là bắt buộc nếu bạn thêm nhiều hơn một phiên hoạt động.",
+            "max_requests_per_minute": "Số lượng yêu cầu tối đa mỗi phút",
+            "max_requests_per_minute_description": "Sử dụng giá trị mặc định là {defaultValue} nếu đặt là 0"
+        },
+        "system": {
+            "transcoding": "Chuyển đổi định dạng video"
+        },
+        "tasks": {
+            "added_job_to_queue": "Đã thêm {operation_name} vào hàng đợi công việc",
+            "anonymising_database": "Đang ẩn danh cơ sở dữ liệu",
+            "auto_tag": {
+                "auto_tagging_all_paths": "Tự động gắn tag cho tất cả các đường dẫn",
+                "auto_tagging_paths": "Đang tự động gắn tag cho các đường dẫn sau"
+            },
+            "backing_up_database": "Sao lưu dữ liệu",
+            "backup_and_download": "Thực hiện sao lưu cơ sở dữ liệu và tải xuống tệp kết quả.",
+            "backup_database": "Thực hiện sao lưu cơ sở dữ liệu vào thư mục sao lưu (backups), với định dạng tên tệp là {filename_format}",
+            "cleanup_desc": "Kiểm tra các tệp bị thiếu và xóa chúng khỏi cơ sở dữ liệu. Đây là hành động có tính phá hủy.",
+            "clean_generated": {
+                "blob_files": "Tệp nhị phân (blob)",
+                "description": "Xóa các tệp đã được tạo nhưng không còn bản ghi tương ứng trong cơ sở dữ liệu.",
+                "image_thumbnails": "Ảnh thu nhỏ",
+                "markers": "Xem trước điểm đánh dấu",
+                "previews": "Xem trước của cảnh",
+                "previews_desc": "Ảnh và đoạn xem trước cảnh",
+                "sprites": "Bản ghép khung hình của cảnh",
+                "transcodes": "Bản video đã chuyển mã của cảnh",
+                "image_thumbnails_desc": "Ảnh thu nhỏ và đoạn xem trước"
+            },
+            "data_management": "Quản lý dữ liệu",
+            "dont_include_file_extension_as_part_of_the_title": "Không bao gồm phần đuôi tệp trong tiêu đề",
+            "empty_queue": "Hiện không có tác vụ nào đang chạy.",
+            "generate": {
+                "generating_from_paths": "Đang tạo dữ liệu cho các cảnh từ những đường dẫn sau",
+                "generating_scenes": "Đang tạo dữ liệu cho {num} {scene}"
+            },
+            "generate_clip_previews_during_scan": "Tạo bản xem trước cho các đoạn ảnh clip",
+            "generate_desc": "Tạo các tệp hỗ trợ bao gồm ảnh, sprite, video, vtt và các tệp khác.",
+            "generate_phashes_during_scan": "Tạo mã băm theo đặc điểm hình ảnh",
+            "generate_previews_during_scan": "Tạo ảnh xem trước động",
+            "anonymise_and_download": "Tạo một bản sao ẩn danh của cơ sở dữ liệu và tải xuống tệp kết quả.",
+            "generate_previews_during_scan_tooltip": "Cũng tạo các ảnh xem trước động (định dạng WebP), chỉ cần thiết khi kiểu xem trước Cảnh/Dấu mốc (Scene/Marker Wall Preview Type) được đặt thành Ảnh động. Khi duyệt nội dung, ảnh WebP tiêu tốn ít CPU hơn so với video preview, nhưng sẽ được tạo thêm bên cạnh video và có kích thước tệp lớn hơn.",
+            "anonymise_database": "Tạo một bản sao của cơ sở dữ liệu trong thư mục sao lưu (backups), đồng thời ẩn danh toàn bộ dữ liệu nhạy cảm. Bản sao này có thể được cung cấp cho người khác để hỗ trợ khắc phục sự cố và gỡ lỗi. Cơ sở dữ liệu gốc sẽ không bị thay đổi. Tệp cơ sở dữ liệu ẩn danh sẽ sử dụng định dạng tên file là {filename_format}.",
+            "generate_phashes_during_scan_tooltip": "Dùng để loại bỏ trùng lặp và nhận diện Scene.",
+            "defaults_set": "Giá trị mặc định đã được thiết lập và sẽ được sử dụng khi nhấn nút {action} trên trang Tác vụ (Tasks).",
+            "export_to_json": "Xuất nội dung cơ sở dữ liệu sang định dạng JSON trong thư mục metadata.",
+            "auto_tag_based_on_filenames": "Tự động gắn tag cho nội dung dựa trên đường dẫn tệp.",
+            "auto_tagging": "Gắn tag tự động",
+            "generate_sprites_during_scan": "Tạo ảnh xem trước cho thanh tua",
+            "generate_sprites_during_scan_tooltip": "Tập hợp hình ảnh được hiển thị bên dưới trình phát video để hỗ trợ điều hướng dễ dàng.",
+            "generate_thumbnails_during_scan": "Tạo ảnh thu nhỏ cho các hình ảnh",
+            "generate_video_covers_during_scan": "Tạo ảnh bìa cho từng cảnh quay",
+            "generate_video_previews_during_scan": "Tạo đoạn xem trước video",
+            "generate_video_previews_during_scan_tooltip": "Tạo video xem trước phát tự động khi rê chuột lên cảnh quay",
+            "generated_content": "Nội dung được tạo tự động",
+            "identify": {
+                "and_create_missing": "và tạo các mục còn thiếu",
+                "create_missing": "Tạo phần bị thiếu",
+                "default_options": "Tùy Chọn Mặc Định",
+                "description": "Tự động điền thông tin cảnh quay từ stash-box và các nguồn dữ liệu quét.",
+                "heading": "Nhận diện",
+                "identifying_from_paths": "Đang nhận diện các cảnh quay từ các đường dẫn sau",
+                "identifying_scenes": "Đang nhận diện {num} {scene}",
+                "include_male_performers": "Bao gồm diễn viên nam",
+                "set_cover_images": "Thiết lập ảnh bìa",
+                "set_organized": "Đánh dấu đã sắp xếp",
+                "skip_multiple_matches_tooltip": "Nếu tùy chọn này không được bật và có nhiều kết quả được trả về, một kết quả sẽ được chọn ngẫu nhiên để khớp",
+                "skip_single_name_performers_tooltip": "Nếu tùy chọn này không được bật, các diễn viên có tên chung chung như Samantha hoặc Olga vẫn sẽ được gán khớp",
+                "source": "Nguồn",
+                "source_options": "Tùy chọn cho {source}",
+                "sources": "Các nguồn",
+                "strategy": "Chiến lược",
+                "tag_skipped_matches": "Gắn thẻ cho các kết quả bị bỏ qua bằng",
+                "tag_skipped_performer_tooltip": "Tạo một thẻ như 'Nhận diện: Diễn viên một tên' để bạn có thể lọc trong chế độ xem Scene Tagger và tự chọn cách xử lý các diễn viên này",
+                "tag_skipped_performers": "Gắn thẻ cho các diễn viên bị bỏ qua bằng",
+                "field_options": "Tùy chọn trường dữ liệu",
+                "skip_single_name_performers": "Bỏ qua các diễn viên chỉ có một tên mà không có thông tin phân biệt rõ ràng",
+                "field_behaviour": "{strategy} {field}",
+                "field": "Trường dữ liệu",
+                "tag_skipped_matches_tooltip": "Tạo một thẻ như 'Nhận diện: Nhiều kết quả khớp' để bạn có thể lọc trong chế độ xem Scene Tagger và tự chọn kết quả đúng bằng tay",
+                "explicit_set_description": "Các thiết lập dưới đây sẽ áp dụng trừ khi có thiết lập riêng từ từng nguồn.",
+                "skip_multiple_matches": "Bỏ qua nếu tìm thấy nhiều kết quả trùng khớp"
+            },
+            "incremental_import": "Chỉ nhập những dữ liệu còn thiếu từ tệp ZIP được cung cấp.",
+            "job_queue": "Hàng đợi tác vụ",
+            "maintenance": "Công cụ bảo trì hệ thống",
+            "migrate_blobs": {
+                "delete_old": "Xóa dữ liệu không còn sử dụng",
+                "description": "Di chuyển dữ liệu blob sang hệ thống lưu trữ blob hiện tại. Quá trình di chuyển này nên được thực hiện sau khi thay đổi hệ thống lưu trữ. Có thể chọn xóa dữ liệu cũ sau khi hoàn tất di chuyển."
+            },
+            "migrate_scene_screenshots": {
+                "delete_files": "Xóa các tệp ảnh chụp màn hình",
+                "overwrite_existing": "Ghi đè các blob hiện có bằng dữ liệu ảnh chụp màn hình",
+                "description": "Di chuyển ảnh chụp cảnh quay sang hệ thống lưu trữ blob mới. Quá trình này nên được thực hiện sau khi nâng cấp hệ thống hiện tại lên phiên bản 0.20. Có thể tùy chọn xóa các ảnh chụp cũ sau khi di chuyển."
+            },
+            "migrations": "Chuyển đổi dữ liệu",
+            "only_dry_run": "Chỉ thực hiện chạy thử. Không xóa bất kỳ dữ liệu nào",
+            "optimise_database": "Cố gắng cải thiện hiệu suất bằng cách phân tích và sau đó tái tạo lại toàn bộ tệp cơ sở dữ liệu.",
+            "plugin_tasks": "Các tác vụ của tiện ích mở rộng",
+            "rescan": "Quét lại tất cả các tệp",
+            "rescan_tooltip": "Quét lại mọi tệp trong đường dẫn. Dùng để buộc cập nhật metadata của tệp và quét lại các tệp ZIP.",
+            "scan": {
+                "scanning_all_paths": "Đang quét tất cả các đường dẫn",
+                "scanning_paths": "Đang quét các đường dẫn sau"
+            },
+            "scan_for_content_desc": "Quét nội dung mới và thêm vào cơ sở dữ liệu.",
+            "set_name_date_details_from_metadata_if_present": "Thiết lập tên, ngày và thông tin chi tiết từ metadata được nhúng trong tệp",
+            "migrate_hash_files": "Được sử dụng sau khi thay đổi mã hash đặt tên tệp để đổi tên các tệp đã tạo sang định dạng hash mới.",
+            "import_from_exported_json": "Nhập dữ liệu từ tệp JSON đã xuất trong thư mục metadata. Hành động này sẽ xóa toàn bộ cơ sở dữ liệu hiện tại.",
+            "optimise_database_warning": "Cảnh báo: trong khi tác vụ này đang chạy, mọi thao tác có thay đổi cơ sở dữ liệu sẽ bị lỗi. Tùy vào kích thước cơ sở dữ liệu, quá trình này có thể mất vài phút để hoàn tất. Ngoài ra, bạn cần ít nhất dung lượng ổ đĩa trống tương đương với kích thước cơ sở dữ liệu, nhưng khuyến nghị là 1.5 lần để đảm bảo an toàn."
+        },
+        "library": {
+            "exclusions": "Danh sách loại trừ",
+            "gallery_and_image_options": "Tùy chọn Thư viện và Hình ảnh",
+            "media_content_extensions": "Phần mở rộng của nội dung đa phương tiện"
+        },
+        "logs": {
+            "log_level": "Cấp độ ghi nhật ký"
+        },
+        "plugins": {
+            "available_plugins": "Plugin khả dụng",
+            "hooks": "Cơ chế kích hoạt tự động",
+            "installed_plugins": "Cài đặt plugin",
+            "triggers_on": "Kích hoạt khi"
+        },
+        "scraping": {
+            "available_scrapers": "Scraper khả dụng",
+            "entity_scrapers": "Thông tin mô tả cho {entityType}",
+            "excluded_tag_patterns_head": "Mẫu tag bị loại trừ",
+            "installed_scrapers": "Các trình quét đã cài đặt",
+            "scraper": "Trình quét dữ liệu tự động",
+            "scrapers": "Các trình quét dữ liệu",
+            "search_by_name": "Tìm kiếm theo tên",
+            "supported_types": "Các loại được hỗ trợ",
+            "supported_urls": "URLs",
+            "entity_metadata": "Siêu dữ liệu {entityType}",
+            "excluded_tag_patterns_desc": "Biểu thức chính quy của tên tag cần loại trừ khỏi kết quả quét dữ liệu"
+        },
+        "tools": {
+            "scene_duplicate_checker": "Kiểm tra cảnh quay bị trùng",
+            "scene_filename_parser": {
+                "add_field": "Thêm trường dữ liệu",
+                "capitalize_title": "Tự động viết hoa chữ cái đầu của mỗi từ trong tiêu đề",
+                "display_fields": "Hiển thị các trường dữ liệu",
+                "escape_chars": "Sử dụng \\ để thoát các ký tự đặc biệt",
+                "filename": "Tên tệp",
+                "filename_pattern": "Mẫu tên tệp",
+                "ignore_organized": "Bỏ qua các cảnh đã được sắp xếp",
+                "ignored_words": "Từ bị bỏ qua",
+                "matches_with": "Khớp với {i}",
+                "title": "Trình phân tích tên tệp cảnh quay",
+                "whitespace_chars": "Ký tự khoảng trắng",
+                "select_parser_recipe": "Chọn công thức phân tích",
+                "whitespace_chars_desc": "Các ký tự này sẽ được thay thế bằng khoảng trắng trong tiêu đề"
+            },
+            "scene_tools": "Công cụ xử lý cảnh quay",
+            "graphql_playground": "Công cụ GraphGL",
+            "heading": "Công cụ"
+        },
+        "ui": {
+            "abbreviate_counters": {
+                "description": "Rút gọn số đếm trong giao diện thẻ và trang chi tiết, ví dụ '1831' sẽ được định dạng thành '1.8K'.",
+                "heading": "Rút gọn số đếm"
+            },
+            "basic_settings": "Cài đặt cơ bản",
+            "custom_css": {
+                "heading": "CSS tùy chỉnh",
+                "option_label": "Đã bật CSS tùy chỉnh",
+                "description": "Trang cần được tải lại để các thay đổi có hiệu lực. Không có gì đảm bảo rằng CSS tùy chỉnh sẽ tương thích với các phiên bản Stash trong tương lai."
+            },
+            "custom_javascript": {
+                "description": "Hãy tải lại trang để áp dụng thay đổi. JavaScript tùy chỉnh có thể không tương thích với các bản cập nhật sau này.",
+                "option_label": "Đã bật JavaScript tùy chỉnh",
+                "heading": "JavaScript tùy chỉnh"
+            },
+            "custom_locales": {
+                "heading": "Bản địa hóa tùy chỉnh",
+                "option_label": "Đã bật bản địa hóa tùy chỉnh",
+                "description": "Ghi đè các chuỗi ngôn ngữ riêng lẻ. Xem danh sách chính tại https://github.com/stashapp/stash/blob/develop/ui/v2.5/src/locales/en-GB.json. Trang cần được tải lại để các thay đổi có hiệu lực."
+            },
+            "delete_options": {
+                "description": "Thiết lập mặc định cho thao tác xóa ảnh, gallery và cảnh.",
+                "heading": "Tùy chọn xóa",
+                "options": {
+                    "delete_file": "Xóa tệp theo mặc định",
+                    "delete_generated_supporting_files": "Xóa các tệp hỗ trợ đã tạo theo mặc định"
+                }
+            },
+            "desktop_integration": {
+                "desktop_integration": "Tích hợp Desktop",
+                "notifications_enabled": "Cho phép Thông báo",
+                "send_desktop_notifications_for_events": "Gửi thông báo trên màn hình máy tính cho các sự kiện",
+                "skip_opening_browser": "Bỏ qua việc mở trình duyệt",
+                "skip_opening_browser_on_startup": "Bỏ qua việc tự động mở trình duyệt khi khởi động"
+            },
+            "detail": {
+                "compact_expanded_details": {
+                    "description": "Khi được bật, tùy chọn này sẽ hiển thị chi tiết mở rộng trong khi vẫn duy trì giao diện gọn gàng",
+                    "heading": "Thu gọn chi tiết mở rộng"
+                },
+                "enable_background_image": {
+                    "description": "Hiển thị ảnh nền trên trang chi tiết.",
+                    "heading": "Bật ảnh nền"
+                },
+                "heading": "Trang Chi tiết",
+                "show_all_details": {
+                    "heading": "Hiển thị tất cả chi tiết",
+                    "description": "Khi được bật, tất cả các chi tiết nội dung sẽ được hiển thị theo mặc định và mỗi mục chi tiết sẽ nằm gọn trong một cột duy nhất"
+                }
+            },
+            "editing": {
+                "disable_dropdown_create": {
+                    "description": "Xóa bỏ khả năng tạo đối tượng mới từ các bộ chọn thả xuống",
+                    "heading": "Tắt chức năng tạo mới từ danh sách thả xuống"
+                },
+                "heading": "Chỉnh sửa",
+                "rating_system": {
+                    "star_precision": {
+                        "label": "Độ chính xác của sao đánh giá",
+                        "options": {
+                            "full": "Đầy",
+                            "half": "Một nữa",
+                            "quarter": "1/4",
+                            "tenth": "1/10"
+                        }
+                    },
+                    "type": {
+                        "label": "Loại Hệ thống Đánh giá",
+                        "options": {
+                            "decimal": "Thập phân",
+                            "stars": "Sao"
+                        }
+                    }
+                },
+                "max_options_shown": {
+                    "label": "Số lượng mục tối đa hiển thị trong danh sách thả xuống"
+                }
+            },
+            "funscript_offset": {
+                "description": "Độ lệch thời gian tính bằng mili giây cho việc phát lại các kịch bản tương tác.",
+                "heading": "Độ lệch Funscript (ms)"
+            },
+            "handy_connection": {
+                "connect": "Kết nối",
+                "status": {
+                    "heading": "Trạng thái Kết nối Handy"
+                },
+                "sync": "Đồng bộ hóa",
+                "server_offset": {
+                    "heading": "Độ lệch Máy chủ"
+                }
+            },
+            "handy_connection_key": {
+                "heading": "Khóa Kết nối Handy",
+                "description": "Khóa kết nối Handy để sử dụng cho các cảnh tương tác. Việc thiết lập khóa này sẽ cho phép Stash chia sẻ thông tin cảnh hiện tại của bạn với handyfeeling.com"
+            },
+            "image_lightbox": {
+                "heading": "Hộp đèn ảnh"
+            },
+            "image_wall": {
+                "direction": "Phương hướng",
+                "heading": "Tường ảnh",
+                "margin": "Khoảng lề (pixel)"
+            },
+            "images": {
+                "heading": "Hình ảnh",
+                "options": {
+                    "create_image_clips_from_videos": {
+                        "heading": "Quét các Phần mở rộng Video dưới dạng Clip hình ảnh",
+                        "description": "Khi một thư viện bị tắt Video, các Tệp video (các tệp có phần mở rộng là Video Extension) sẽ được quét dưới dạng Clip hình ảnh."
+                    },
+                    "write_image_thumbnails": {
+                        "description": "Ghi hình thu nhỏ của ảnh ra đĩa khi chúng được tạo tự động",
+                        "heading": "Ghi hình thu nhỏ của ảnh"
+                    }
+                }
+            },
+            "interactive_options": "Tùy chọn Tương tác",
+            "menu_items": {
+                "description": "Hiển thị hoặc ẩn các loại nội dung khác nhau trên thanh điều hướng",
+                "heading": "Mục Menu"
+            },
+            "minimum_play_percent": {
+                "description": "Phần trăm thời lượng cảnh phải được phát trước khi số lượt phát của nó được tăng lên.",
+                "heading": "Phần trăm Phát tối thiểu"
+            },
+            "scene_player": {
+                "options": {
+                    "enable_chromecast": "Bật Chromecast",
+                    "show_ab_loop_controls": "Hiển thị điều khiển plugin Vòng lặp AB",
+                    "show_scrubber": "Hiển thị Thanh điều khiển",
+                    "vr_tag": {
+                        "description": "Nút VR sẽ chỉ hiển thị cho các cảnh có gắn thẻ này.",
+                        "heading": "Thẻ VR"
+                    },
+                    "show_range_markers": "Hiện thị phạm vị của điểm đánh dấu",
+                    "track_activity": "Bật lịch sử phát cảnh quay",
+                    "auto_start_video_on_play_selected": {
+                        "description": "Tự động phát video cảnh quay khi phát từ hàng chờ, hoặc phát các cảnh được chọn hoặc ngẫu nhiên từ trang Cảnh Quay",
+                        "heading": "Tự động phát video khi phát các mục đã chọn"
+                    },
+                    "continue_playlist_default": {
+                        "description": "Phát cảnh tiếp theo trong hàng chờ khi video kết thúc",
+                        "heading": "Tiếp tục danh sách phát theo mặc định"
+                    },
+                    "disable_mobile_media_auto_rotate": "Tắt tự động xoay phương tiện toàn màn hình trên thiết bị Di động",
+                    "always_start_from_beginning": "Luôn phát video từ đầu",
+                    "auto_start_video": "Tự động phát video"
+                },
+                "heading": "Trình phát cảnh quay"
+            },
+            "scene_wall": {
+                "options": {
+                    "toggle_sound": "Bật âm thanh",
+                    "display_title": "Hiển thị tiêu đề và thẻ"
+                },
+                "heading": "Tường Cảnh Quay / Điểm Đánh Dấu"
+            },
+            "scroll_attempts_before_change": {
+                "heading": "Số lần thử cuộn trước khi chuyển đổi",
+                "description": "Số lần thử cuộn trước khi chuyển sang mục tiếp theo/trước đó. Chỉ áp dụng cho chế độ cuộn Pan Y."
+            },
+            "show_tag_card_on_hover": {
+                "description": "Hiển thị thẻ thông tin thẻ khi di chuột qua các huy hiệu thẻ",
+                "heading": "Chú giải công cụ thẻ thông tin"
+            },
+            "slideshow_delay": {
+                "heading": "Độ trễ Trình chiếu (giây)",
+                "description": "Trình chiếu có sẵn trong các thư viện ảnh khi ở chế độ xem dạng tường"
+            },
+            "studio_panel": {
+                "heading": "Chế độ xem Studio",
+                "options": {
+                    "show_child_studio_content": {
+                        "description": "Trong chế độ xem Studio, hãy hiển thị cả nội dung từ các studio phụ",
+                        "heading": "Hiển thị nội dung của các studio phụ"
+                    }
+                }
+            },
+            "tag_panel": {
+                "heading": "Chế độ xem Thẻ",
+                "options": {
+                    "show_child_tagged_content": {
+                        "heading": "Hiển thị nội dung của thẻ phụ",
+                        "description": "Trong chế độ xem thẻ, hãy hiển thị cả nội dung từ các thẻ phụ"
+                    }
+                }
+            },
+            "title": "Giao diện Người dùng",
+            "use_stash_hosted_funscript": {
+                "heading": "Phục vụ/Truyền funscript trực tiếp",
+                "description": "Khi được bật, funscript sẽ được phục vụ trực tiếp từ Stash đến thiết bị Handy của bạn mà không sử dụng máy chủ Handy của bên thứ ba. Yêu cầu Stash phải truy cập được từ thiết bị Handy của bạn và cần tạo khóa API nếu Stash có cấu hình thông tin xác thực."
+            },
+            "max_loop_duration": {
+                "heading": "Thời lượng lặp tối đa",
+                "description": "Thời lượng cảnh tối đa (tính bằng giây) mà trình phát cảnh sẽ lặp lại video - 0 để tắt"
+            },
+            "performers": {
+                "options": {
+                    "image_location": {
+                        "description": "Đường dẫn tùy chỉnh cho ảnh mặc định của người biểu diễn. Để trống để sử dụng các mặc định có sẵn",
+                        "heading": "Đường dẫn Ảnh Người biểu diễn Tùy chỉnh"
+                    }
+                }
+            },
+            "preview_type": {
+                "description": "Tùy chọn mặc định là xem trước video (mp4). Để giảm sử dụng CPU khi duyệt, bạn có thể dùng xem trước ảnh động (webp). Tuy nhiên, chúng phải được tạo ra ngoài các bản xem trước video và có kích thước tệp lớn hơn.",
+                "heading": "Kiểu Xem trước",
+                "options": {
+                    "animated": "Ảnh động",
+                    "static": "Ảnh tĩnh",
+                    "video": "Video"
+                }
+            },
+            "scene_list": {
+                "heading": "Chế độ xem dạng lưới",
+                "options": {
+                    "show_studio_as_text": "Hiển thị lớp phủ studio dưới dạng văn bản"
+                }
+            },
+            "language": {
+                "heading": "Ngôn ngữ"
+            }
         }
-    }
+    },
+    "age_on_date": "{age} tại thời điểm sản xuất",
+    "description": "Mô Tả",
+    "custom_fields": {
+        "title": "Tùy Chỉnh Trường (dữ liệu)",
+        "criteria_format_string": "{Tiêu chí} (trường tùy chỉnh) {Điều kiện} {Giá trị}",
+        "value": "Giá trị",
+        "criteria_format_string_others": "{Tiêu chí} (trường tùy chỉnh) {Điều kiện} {Giá trị} (+{số lượng khác} mục khác)",
+        "field": "Trường (dữ liệu)"
+    },
+    "dialogs": {
+        "delete_entity_title": "{count, plural, one {Xóa {singularEntity}} other {Xóa {pluralEntity}}}",
+        "delete_galleries_extra": "...cộng với bất kỳ tệp ảnh nào không được đính kèm vào bất kỳ thư viện ảnh nào khác.",
+        "delete_object_title": "Xóa {count, plural, one {{singularEntity}} other {{pluralEntity}}}",
+        "lightbox": {
+            "scale_up": {
+                "description": "Phóng lớn ảnh nhỏ để lấp đầy màn hình",
+                "label": "Phóng lớn để vừa"
+            },
+            "delay": "Độ Trễ (Giây)",
+            "display_mode": {
+                "fit_horizontally": "Căn chỉnh vừa theo chiều ngang",
+                "fit_to_screen": "Vừa màn hình",
+                "label": "Chế độ hiển thị",
+                "original": "Bản gốc"
+            },
+            "options": "Tùy Chọn",
+            "page_header": "Trang {page} / {total}",
+            "reset_zoom_on_nav": "Đặt lại mức thu phóng khi đổi ảnh",
+            "scroll_mode": {
+                "description": "Giữ phím Shift để tạm thời dùng chế độ khác.",
+                "pan_y": "Pan (chiều) Y",
+                "label": "Chế độ cuộn",
+                "zoom": "Phóng"
+            }
+        },
+        "clear_o_history_confirm": "Bạn có chắc chắn muốn xóa lịch sử O không?",
+        "clear_play_history_confirm": "Bạn có chắc muốn xóa lịch sử phát không?",
+        "create_new_entity": "Tạo mới {entity}",
+        "delete_entity_simple_desc": "{count, plural, one {Bạn có chắc chắn muốn xóa {singularEntity} này không?} other {Bạn có chắc chắn muốn xóa {pluralEntity} này không?}}",
+        "delete_gallery_files": "Xóa thư mục/tệp zip thư viện ảnh và bất kỳ ảnh nào không được đính kèm vào thư viện ảnh khác.",
+        "delete_object_desc": "Bạn có chắc muốn xóa {count, plural, one {{singularEntity} này} other {{pluralEntity} này} } không?",
+        "dont_show_until_updated": "Không hiển thị cho đến bản cập nhật tiếp theo",
+        "export_include_related_objects": "Bao gồm các đối tượng liên quan khi xuất",
+        "export_title": "Xuất (dữ liệu)",
+        "imagewall": {
+            "direction": {
+                "column": "Cột",
+                "description": "Bố cục dựa trên cột hoặc hàng.",
+                "row": "Hàng"
+            },
+            "margin_desc": "Số lượng pixel lề xung quanh mỗi ảnh."
+        },
+        "edit_entity_title": "Chỉnh sửa {count, plural, one {{singularEntity}} other {{pluralEntity}}}",
+        "delete_alert": "Các {count, plural, one {{singularEntity}} other {{pluralEntity}}} sau đây sẽ bị xóa vĩnh viễn:",
+        "delete_confirm": "Bạn có chắc chắn muốn xóa {entityName} không?",
+        "delete_entity_desc": "{count, plural, one {Bạn có chắc chắn muốn xóa {singularEntity} này không? Trừ khi tệp cũng bị xóa, {singularEntity} này sẽ được thêm lại khi quá trình quét được thực hiện.} other {Bạn có chắc chắn muốn xóa {pluralEntity} này không? Trừ khi các tệp cũng bị xóa, {pluralEntity} này sẽ được thêm lại khi quá trình quét được thực hiện.}}",
+        "delete_object_overflow": "...và {count} {count, plural, one {{singularEntity}} other {{pluralEntity}}} khác.",
+        "overwrite_filter_warning": "Bộ lọc đã lưu \"{entityName}\" sẽ bị ghi đè.",
+        "scene_gen": {
+            "clip_previews": "Xem trước Hình ảnh từ Clip",
+            "marker_screenshots": "Ảnh màn hình Điểm đánh dấu",
+            "marker_screenshots_tooltip": "Điểm đánh dấu ảnh tĩnh JPG",
+            "overwrite": "Ghi đè các tệp tin có sẫn",
+            "phash": "Băm (hash) nhận thức",
+            "preview_generation_options": "Lựa chọn Tạo ra Bản xem trước",
+            "covers": "Bìa cảnh quay",
+            "force_transcodes": "Ép chuyển mã",
+            "image_previews": "Xem trước Hình ảnh Động",
+            "image_thumbnails": "Hình thu nhỏ của Ảnh",
+            "interactive_heatmap_speed": "Tạo bản đồ nhiệt và tốc độ cho các cảnh tương tác",
+            "marker_image_previews": "Xem trước Điểm đánh dấu Ảnh động",
+            "marker_image_previews_tooltip": "Ngoài ra sẽ tạo nên những hình xem trước động (webp), chỉ bắt buộc khi Loại Cảnh/Dấu Tường Xem Trước được thành Ảnh Động. Khi lướt nó sử dụng ít CPU hơn video xem trước, nhưng khi tạo nên thì đi kèm với chúng và là những file lớn hơn.",
+            "markers": "Xem trước Điểm đánh dấu",
+            "markers_tooltip": "Video 20 giây bắt đầu tại điểm thời gian đã cho sẫn.",
+            "override_preview_generation_options": "Ghi đè các lựa chọn tạo ra Bản xem trước",
+            "phash_tooltip": "Cho việc khử trùng lặp và phát hiện cảnh quay",
+            "preview_exclude_end_time_desc": "Bỏ qua x giây cuối cùng từ các bản xem trước cảnh. Đây có thể là một giá trị bằng giây, hoặc phần trăm (ví dụ 2%) của tổng thời gian cảnh quay.",
+            "preview_exclude_start_time_head": "Bỏ qua thời gian bắt đầu",
+            "preview_options": "Lựa chọn Bản xem trước",
+            "preview_preset_desc": "Phần cài đặt trước điều chỉnh kích thước, chất lượng và thời gian mã hóa của bản xem trước. Các cài đặt trước vượt quá việc \"chậm\" có hiệu năng giảm dần và không được khuyến khích.",
+            "preview_preset_head": "Xem trước phần cài đặt trước cho việc mã hóa",
+            "preview_exclude_end_time_head": "Bỏ qua thời gian kết thúc",
+            "force_transcodes_tooltip": "Mặc định, việc chuyển mã sẽ được tạo ra khi file video không được hỗ trợ trong trình duyệt. Khi kích hoạt, việc chuyển mã sẽ bắt đầu kể cả khi file video có vẻ được hỗ trợ bởi trình duyệt.",
+            "image_previews_tooltip": "Ngoài ra sẽ tạo nên những hình xem trước động (webp), chỉ bắt buộc khi Loại Cảnh/Dấu Tường Xem Trước được thành Ảnh Động. Khi lướt nó sử dụng ít CPU hơn video xem trước, nhưng khi tạo nên thì đi kèm với chúng và là những file lớn hơn.",
+            "preview_exclude_start_time_desc": "Bỏ qua x giây đầu tiên từ các bản xem trước cảnh. Đây có thể là một giá trị bằng giây, hoặc phần trăm (ví dụ 2%) của tổng thời gian cảnh quay.",
+            "override_preview_generation_options_desc": "Ghi đè các lựa chọn tạo ra Bản xem trước cho hành động này. Những thiết lập mặc định được đặt trong Hệ thống -> Tạo ra Bản xem trước.",
+            "preview_seg_count_desc": "Số lượng phân đoạn trong các file bản xem trước.",
+            "preview_seg_count_head": "Số lượng phân đoạn trong bản xem trước",
+            "preview_seg_duration_desc": "Độ dài của mỗi đoạn xem trước, tính theo giây.",
+            "preview_seg_duration_head": "Độ dài đoạn xem trước",
+            "sprites": "Sprites của Phần tìm Phân cảnh",
+            "sprites_tooltip": "Danh sách ảnh hiển thị ở dưới video để dễ thao tác",
+            "transcodes": "Giải mã",
+            "video_previews": "Xem trước",
+            "transcodes_tooltip": "Mã chuyển đổi MP4 sẽ được tạo trước cho tất cả nội dung; hữu ích cho CPU chậm nhưng cần nhiều dung lượng hơn",
+            "video_previews_tooltip": "Bản xem trước video phát khi di chuột qua một cảnh"
+        },
+        "merge": {
+            "destination": "Đích đến",
+            "source": "Nguồn",
+            "empty_results": "Giá trị điền vào mục Đích đến sẽ không bị thay đổi."
+        },
+        "merge_tags": {
+            "destination": "Đích đến",
+            "source": "Nguồn"
+        },
+        "performers_found": "Đã tìm thấy {count} diễn viên",
+        "reassign_entity_title": "{count, plural, one {Chỉnh lại {singularEntity}} other {Chỉnh lại {pluralEntity}}}",
+        "reassign_files": {
+            "destination": "Chỉnh lại đến"
+        },
+        "scrape_results_existing": "Hiện có",
+        "set_default_filter_confirm": "Bạn có chắc chắn muốn đặt bộ lọc này làm mặc định không?",
+        "set_image_url_title": "URL hình ảnh",
+        "unsaved_changes": "Thay đổi chưa được lưu. Bạn có chắc chắn muốn thoát không?",
+        "scenes_found": "tìm được {count} cảnh quay"
+    },
+    "configuration": "Cấu Hình",
+    "connection_monitor": {
+        "websocket_connection_failed": "Không thể tạo kết nối websocket: xem bảng điều khiển trình duyệt để biết chi tiết",
+        "websocket_connection_reestablished": "Kết nối Websocket đã được thiết lập lại"
+    },
+    "containing_group": "Nhóm chứa",
+    "containing_groups": "Các Nhóm chứa",
+    "countables": {
+        "files": "{count, plural, one {Tệp} other {Các tệp}}",
+        "groups": "{count, plural, one {Nhóm} other {Các nhóm}}",
+        "images": "{count, plural, one {Ảnh} other {Các ảnh}}",
+        "markers": "{count, plural, one {Dấu} other {Các dấu}}",
+        "scenes": "{count, plural, one {Cảnh} other {Các cảnh}}",
+        "studios": "{count, plural, one {Studio} other {Các studio}}",
+        "tags": "{count, plural, one {Thẻ} other {Các thẻ}}",
+        "performers": "{count, plural, one {Người biểu diễn} other {Các người biểu diễn}}",
+        "galleries": "{count, plural, one {Thư viện ảnh} other {Các thư viện ảnh}}"
+    },
+    "country": "Quốc Gia",
+    "cover_image": "Ảnh Bìa",
+    "created_at": "Thời gian tạo",
+    "criterion": {
+        "greater_than": "Lớn hơn",
+        "less_than": "Nhỏ hơn",
+        "value": "Giá trị"
+    },
+    "criterion_modifier": {
+        "between": "Giữa",
+        "equals": "Là",
+        "format_string": "{criterion} {modifierString} {valueString}",
+        "format_string_excludes": "{Tiêu chí} {Điều kiện} {Giá trị} (loại trừ {Ngoại lệ})",
+        "format_string_excludes_depth": "{Tiêu chí} {Điều kiện} {Giá trị} (loại trừ {Ngoại lệ}) (+{depth, plural, =-1 {tất cả} other {{depth}}})",
+        "greater_than": "lớn hơn",
+        "includes": "Bao gồm",
+        "includes_all": "Bao gồm tất cả",
+        "is_null": "rỗng",
+        "less_than": "nhỏ hơn",
+        "matches_regex": "Khớp biểu thức chính quy",
+        "not_between": "không nằm giữa",
+        "not_equals": "không phải",
+        "not_null": "không rỗng",
+        "format_string_depth": "{criterion} {modifierString} {valueString} (+{depth, plural, =-1 {all} other {{depth}}})",
+        "not_matches_regex": "Không khớp biểu thức chính quy",
+        "excludes": "Không bao gồm"
+    },
+    "death_date": "Ngày Mất",
+    "death_year": "Năm Mất",
+    "descending": "Giảm dần",
+    "details": "Thông tin chi tiết",
+    "developmentVersion": "Phiên bản Phát triển",
+    "criterion_modifier_values": {
+        "any_of": "bất kỳ nào trong số",
+        "none": "không gì cả",
+        "only": "Duy nhất",
+        "any": "bất kỳ"
+    },
+    "custom": "Tùy chỉnh",
+    "date": "Ngày",
+    "date_format": "YYYY-MM-DD",
+    "containing_group_count": "Số lượng Nhóm chứa",
+    "detail": "Chi tiết",
+    "datetime_format": "YYYY-MM-DD HH:MM",
+    "dimensions": "Kích thước",
+    "director": "Đạo diễn",
+    "display_mode": {
+        "grid": "Lưới",
+        "list": "Danh sách",
+        "unknown": "Chưa biết",
+        "label_current": "Chế độ Hiển Thị: {current}",
+        "wall": "Tường"
+    },
+    "distance": "Khoảng cách",
+    "donate": "Ủng hộ",
+    "dupe_check": {
+        "duration_diff": "Chênh lệch thời lượng tối đa",
+        "only_select_matching_codecs": "Chỉ chọn nếu tất cả codec khớp với nhóm trùng lặp",
+        "options": {
+            "high": "Cao",
+            "low": "Thấp",
+            "medium": "Trung bình",
+            "exact": "Chính xác"
+        },
+        "search_accuracy_label": "Độ chính xác tìm kiếm",
+        "select_all_but_largest_file": "Chọn mọi tệp trong mỗi nhóm trùng lặp, ngoại trừ tệp lớn nhất",
+        "select_all_but_largest_resolution": "Chọn mọi tệp trong mỗi nhóm được sao chép, ngoại trừ tệp có độ phân giải cao nhất",
+        "select_none": "Chọn Không",
+        "select_oldest": "Chọn tệp cũ nhất trong nhóm trùng lặp",
+        "select_options": "Chọn Tùy chọn…",
+        "select_youngest": "Chọn tệp mớinhất trong nhóm trùng lặp",
+        "title": "Cảnh quay trùng lặp",
+        "duration_options": {
+            "any": "Bất kỳ",
+            "equal": "Tương đương"
+        }
+    },
+    "duplicated_phash": "Trùng lặp (pHash)",
+    "duration": "Thời lượng",
+    "effect_filters": {
+        "aspect": "Tỷ lệ",
+        "blur": "Mờ",
+        "brightness": "Độ sáng",
+        "contrast": "Tương phản",
+        "green": "Xanh lá",
+        "hue": "Sắc thái",
+        "name": "Bộ lọc",
+        "name_transforms": "Biến đổi",
+        "red": "Đỏ",
+        "reset_filters": "Đặt lại bộ lọc",
+        "reset_transforms": "Đặt lại chuyển đổi",
+        "rotate": "Xoay",
+        "rotate_left_and_scale": "Xoay trái và thay đổi tỷ lệ",
+        "rotate_right_and_scale": "Xoay phải và thay đổi tỷ lệ",
+        "saturation": "Độ bão hòa",
+        "scale": "Tỉ lệ",
+        "warmth": "Sự ấm áp"
+    },
+    "empty_server": "Thêm một số cảnh quay vào máy chủ của bạn để xem các đề xuất trên trang này."
 }
diff --git a/ui/v2.5/src/locales/zh-CN.json b/ui/v2.5/src/locales/zh-CN.json
index 6ebb8d7b6..415c17976 100644
--- a/ui/v2.5/src/locales/zh-CN.json
+++ b/ui/v2.5/src/locales/zh-CN.json
@@ -141,7 +141,17 @@
         "reset_play_duration": "重置播放时长",
         "reset_resume_time": "重置恢复时间",
         "add_sub_groups": "添加子集合",
-        "remove_from_containing_group": "从集合中移除"
+        "remove_from_containing_group": "从集合中移除",
+        "sidebar": {
+            "close": "关闭侧边栏",
+            "open": "打开侧边栏",
+            "toggle": "切换侧边栏"
+        },
+        "play": "播放",
+        "show_results": "显示结果",
+        "show_count_results": "显示{count}个结果",
+        "load": "加载",
+        "load_filter": "加载过滤器"
     },
     "actions_name": "操作",
     "age": "年龄",
@@ -446,7 +456,9 @@
             "endpoint": "入口",
             "graphql_endpoint": "GraphQL 入口",
             "name": "名称",
-            "title": "Stash-box 入口"
+            "title": "Stash-box 入口",
+            "max_requests_per_minute": "每分钟最多可发起请求数量",
+            "max_requests_per_minute_description": "使用{defaultValue}的默认数值，当其数值设置为0时"
         },
         "system": {
             "transcoding": "转码"
@@ -572,7 +584,9 @@
                 "whitespace_chars": "空白字符",
                 "whitespace_chars_desc": "这些字符在标题中会替换为空白字符"
             },
-            "scene_tools": "短片工具"
+            "scene_tools": "短片工具",
+            "heading": "工具",
+            "graphql_playground": "GraphQL试验场"
         },
         "ui": {
             "abbreviate_counters": {
@@ -906,7 +920,6 @@
             "destination": "目标",
             "source": "源"
         },
-        "overwrite_filter_confirm": "确定要覆盖现有的已保存查询 {entityName} 吗？",
         "reassign_entity_title": "{count, plural, one {Reassign {singularEntity}} 其它 {Reassign {pluralEntity}}}",
         "reassign_files": {
             "destination": "重新指定至"
@@ -959,7 +972,9 @@
         "unsaved_changes": "更改未保存，确定离开吗？",
         "performers_found": "找到{count} 个演员",
         "clear_o_history_confirm": "真的确定要清空高潮记录吗?",
-        "clear_play_history_confirm": "真的确定要清空播放历史?"
+        "clear_play_history_confirm": "真的确定要清空播放历史?",
+        "set_default_filter_confirm": "你确定要设置这个过滤器为默认吗？",
+        "overwrite_filter_warning": "已保存的过滤器 \"{entityName}\" 将被覆盖。"
     },
     "dimensions": "大小",
     "director": "导演",
@@ -969,7 +984,8 @@
         "list": "列表显示",
         "tagger": "标签工具",
         "unknown": "未知",
-        "wall": "预览墙"
+        "wall": "预览墙",
+        "label_current": "显示模式: {current}"
     },
     "donate": "赞助",
     "dupe_check": {
@@ -1216,7 +1232,9 @@
         "edit_filter": "编辑筛选器",
         "name": "过滤",
         "saved_filters": "保存过滤器",
-        "update_filter": "更新过滤器"
+        "update_filter": "更新过滤器",
+        "more_filter_criteria": "+{count}个更多",
+        "search_term": "搜索词"
     },
     "second": "秒",
     "seconds": "秒",
@@ -1522,5 +1540,12 @@
     },
     "eta": "预估剩余时间",
     "sort_name": "排序用名",
-    "age_on_date": "在制作时{age}岁"
+    "age_on_date": "在制作时{age}岁",
+    "login": {
+        "username": "用户名",
+        "password": "密码",
+        "invalid_credentials": "无效的用户名或密码",
+        "internal_error": "意外的内部错误。有关更多详细信息，请查看日志",
+        "login": "登录"
+    }
 }
diff --git a/ui/v2.5/src/locales/zh-TW.json b/ui/v2.5/src/locales/zh-TW.json
index 264973de3..90db9e296 100644
--- a/ui/v2.5/src/locales/zh-TW.json
+++ b/ui/v2.5/src/locales/zh-TW.json
@@ -141,7 +141,15 @@
         "reset_resume_time": "重置恢復時間",
         "set_cover": "設為封面",
         "remove_from_containing_group": "從群組中刪除",
-        "add_sub_groups": "新增子分類"
+        "add_sub_groups": "新增子分類",
+        "sidebar": {
+            "close": "關閉側邊攔",
+            "open": "開啟側邊攔",
+            "toggle": "切換側邊欄"
+        },
+        "show_results": "顯示結果",
+        "show_count_results": "顯示 {count} 筆結果",
+        "play": "播放"
     },
     "actions_name": "動作",
     "age": "年齡",
@@ -440,7 +448,9 @@
             "endpoint": "端點",
             "graphql_endpoint": "GraphQL 端點",
             "name": "名稱",
-            "title": "Stash-box 端點"
+            "title": "Stash-box 端點",
+            "max_requests_per_minute": "每分鐘請求上限",
+            "max_requests_per_minute_description": "當設為 0 時，會套用預設值 {defaultValue}"
         },
         "system": {
             "transcoding": "轉檔"
@@ -566,7 +576,9 @@
                 "whitespace_chars": "空白字元",
                 "whitespace_chars_desc": "這些字元將在標題中被空格取代"
             },
-            "scene_tools": "短片工具"
+            "scene_tools": "短片工具",
+            "heading": "工具",
+            "graphql_playground": "GraphQL 測試環境"
         },
         "ui": {
             "abbreviate_counters": {
@@ -726,7 +738,8 @@
                     },
                     "enable_chromecast": "啟用 Chromecast",
                     "show_ab_loop_controls": "顯示AB循環插件控件",
-                    "disable_mobile_media_auto_rotate": "停用行動裝置上全螢幕媒體的自動旋轉功能"
+                    "disable_mobile_media_auto_rotate": "停用行動裝置上全螢幕媒體的自動旋轉功能",
+                    "show_range_markers": "顯示範圍標記"
                 }
             },
             "scene_wall": {
@@ -889,7 +902,6 @@
             "destination": "目的地",
             "source": "來源"
         },
-        "overwrite_filter_confirm": "您確定要覆蓋現有的條件 {entityName} 嗎？",
         "reassign_entity_title": "{count, plural, one {重新指定{singularEntity}}}",
         "reassign_files": {
             "destination": "重新指定至"
@@ -950,7 +962,9 @@
         },
         "clear_o_history_confirm": "您確定要清除尻尻紀錄嗎？",
         "clear_play_history_confirm": "您確定要清除播放紀錄嗎？",
-        "performers_found": "找到{count} 個演員"
+        "performers_found": "找到{count} 個演員",
+        "set_default_filter_confirm": "是否確定設定這一個過濾條件為預設?",
+        "overwrite_filter_warning": "篩選器 \"{entityName}\" 已存在，將被覆蓋。"
     },
     "dimensions": "解析度",
     "director": "導演",
@@ -960,7 +974,8 @@
         "list": "條列顯示",
         "tagger": "標記工具",
         "unknown": "未知",
-        "wall": "預覽牆顯示"
+        "wall": "預覽牆顯示",
+        "label_current": "顯示模式：{current}"
     },
     "donate": "贊助",
     "dupe_check": {
@@ -1090,7 +1105,7 @@
         "interactive_speed": "互動速度",
         "performer_card": {
             "age": "{age} {years_old}",
-            "age_context": "這齣戲裡面 {age} {years_old}"
+            "age_context": "這齣戲時 {age} {years_old}"
         },
         "phash": "PHash",
         "play_count": "播放次數",
@@ -1190,7 +1205,8 @@
         "name": "篩選",
         "saved_filters": "已儲存的過濾條件",
         "update_filter": "更新篩選",
-        "edit_filter": "編輯篩選器"
+        "edit_filter": "編輯篩選器",
+        "more_filter_criteria": "+{count} 更多"
     },
     "seconds": "秒",
     "settings": "設定",
@@ -1515,6 +1531,18 @@
     "custom_fields": {
         "field": "欄位",
         "title": "自訂欄位",
-        "value": "值"
-    }
+        "value": "值",
+        "criteria_format_string_others": "{criterion} (custom field) 條件：{modifierString} {valueString} (+{others} others)",
+        "criteria_format_string": "{criterion} (custom field) 條件：{modifierString} {valueString}"
+    },
+    "login": {
+        "login": "登入",
+        "username": "使用者名稱",
+        "password": "密碼",
+        "invalid_credentials": "無效的使用者名稱或是密碼",
+        "internal_error": "系統發生未預期的內部錯誤。詳情請參考日誌"
+    },
+    "sort_name": "分類名稱",
+    "eta": "預估剩餘時間",
+    "age_on_date": "在{age}歲時製作"
 }

From de5a9129b3d01bc758a75d2f69e4279e67a23915 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Fri, 17 Oct 2025 08:17:15 +1100
Subject: [PATCH 066/405] Use SafeMove when moving backup database (#6147)

---
 pkg/sqlite/database.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/sqlite/database.go b/pkg/sqlite/database.go
index fa5d1e877..8bf0f0bda 100644
--- a/pkg/sqlite/database.go
+++ b/pkg/sqlite/database.go
@@ -368,7 +368,7 @@ func (db *Database) Backup(backupPath string) (err error) {
 
 	if moveAfter {
 		logger.Infof("Moving database backup to: %s", backupPath)
-		err = os.Rename(vacuumOut, backupPath)
+		err = fsutil.SafeMove(vacuumOut, backupPath)
 		if err != nil {
 			return fmt.Errorf("moving database backup failed: %w", err)
 		}

From 060daef0b78ea92d0295a468f9fe7d3ac2675a2d Mon Sep 17 00:00:00 2001
From: feederbox826 <me@feederbox.cc>
Date: Thu, 16 Oct 2025 20:53:43 -0400
Subject: [PATCH 067/405] add gql interceptor note to changelog #5964 (#6148)

---
 ui/v2.5/src/docs/en/ReleaseNotes/v0290.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ui/v2.5/src/docs/en/ReleaseNotes/v0290.md b/ui/v2.5/src/docs/en/ReleaseNotes/v0290.md
index 4a816edd4..6dfe0b209 100644
--- a/ui/v2.5/src/docs/en/ReleaseNotes/v0290.md
+++ b/ui/v2.5/src/docs/en/ReleaseNotes/v0290.md
@@ -1,3 +1,5 @@
 The Scenes page and related scene list views have been updated with a filter sidebar and a toolbar for filtering and other actions. This design is intended to be applied to other query pages in the following release. The design will be refined based on user feedback. 
 
-You can help steer the direction of this design by providing feedback in the [forum thread](https://discourse.stashapp.cc/t/query-page-redesign-feedback-thread-0-29/3935).
\ No newline at end of file
+You can help steer the direction of this design by providing feedback in the [forum thread](https://discourse.stashapp.cc/t/query-page-redesign-feedback-thread-0-29/3935).
+
+Old userscripts and plugins that intercept GraphQL with content-type `application/json` will stop working, as gqlenc uses the updated content-type `application/graphql-response+json`
\ No newline at end of file

From 914bbfc1642ce2bb1983d5ead89c1ae596549c03 Mon Sep 17 00:00:00 2001
From: gregpetersonanon <gregpetersonanon@proton.me>
Date: Sun, 19 Oct 2025 16:54:26 -0700
Subject: [PATCH 068/405] Prevent scanner from failing when reading file info
 (#6123)

---
 pkg/file/scan.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkg/file/scan.go b/pkg/file/scan.go
index 8b0ec956e..40f474f34 100644
--- a/pkg/file/scan.go
+++ b/pkg/file/scan.go
@@ -239,7 +239,8 @@ func (s *scanJob) queueFileFunc(ctx context.Context, f models.FS, zipFile *scanF
 
 		info, err := d.Info()
 		if err != nil {
-			return fmt.Errorf("reading info for %q: %w", path, err)
+			logger.Errorf("reading info for %q: %v", path, err)
+			return nil
 		}
 
 		if !s.acceptEntry(ctx, path, info) {

From c6bf20dd770272129a3e4daa365943e78b13a45a Mon Sep 17 00:00:00 2001
From: fancydancers <235832478+fancydancers@users.noreply.github.com>
Date: Sun, 19 Oct 2025 23:55:11 +0000
Subject: [PATCH 069/405] install python packages system-wide (#6120)

---
 docker/ci/x86_64/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/ci/x86_64/Dockerfile b/docker/ci/x86_64/Dockerfile
index 957da347c..6a9c6b76d 100644
--- a/docker/ci/x86_64/Dockerfile
+++ b/docker/ci/x86_64/Dockerfile
@@ -13,7 +13,7 @@ FROM --platform=$TARGETPLATFORM alpine:latest AS app
 COPY --from=binary /stash /usr/bin/
 
 RUN apk add --no-cache ca-certificates python3 py3-requests py3-requests-toolbelt py3-lxml py3-pip ffmpeg tzdata vips vips-tools \
-    && pip install --user --break-system-packages mechanicalsoup cloudscraper stashapp-tools
+    && pip install --break-system-packages mechanicalsoup cloudscraper stashapp-tools
 ENV STASH_CONFIG_FILE=/root/.stash/config.yml
 
 # Basic build-time metadata as defined at https://github.com/opencontainers/image-spec/blob/main/annotations.md#pre-defined-annotation-keys

From cee68ab87b8475ee821489f763fb883cc1eb89e6 Mon Sep 17 00:00:00 2001
From: smith113-p <205463041+smith113-p@users.noreply.github.com>
Date: Sun, 19 Oct 2025 21:58:26 -0400
Subject: [PATCH 070/405] Merge URLs when merging scenes (#6151)

---
 ui/v2.5/src/components/Scenes/SceneMergeDialog.tsx | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/ui/v2.5/src/components/Scenes/SceneMergeDialog.tsx b/ui/v2.5/src/components/Scenes/SceneMergeDialog.tsx
index 52b3ea67c..3731f1d6a 100644
--- a/ui/v2.5/src/components/Scenes/SceneMergeDialog.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneMergeDialog.tsx
@@ -206,13 +206,7 @@ const SceneMergeDetails: React.FC<ISceneMergeDetailsProps> = ({
     setCode(
       new ScrapeResult(dest.code, sources.find((s) => s.code)?.code, !dest.code)
     );
-    setURL(
-      new ScrapeResult(
-        dest.urls,
-        sources.find((s) => s.urls)?.urls,
-        !dest.urls?.length
-      )
-    );
+    setURL(new ScrapeResult(dest.urls, uniq(all.map((s) => s.urls).flat())));
     setDate(
       new ScrapeResult(dest.date, sources.find((s) => s.date)?.date, !dest.date)
     );

From 97ca5a28d3b47f38dff6d5b31ba1ada234119287 Mon Sep 17 00:00:00 2001
From: smith113-p <205463041+smith113-p@users.noreply.github.com>
Date: Sun, 19 Oct 2025 21:59:36 -0400
Subject: [PATCH 071/405] Use the merged stash IDs by default (#6152)

---
 ui/v2.5/src/components/Scenes/SceneMergeDialog.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ui/v2.5/src/components/Scenes/SceneMergeDialog.tsx b/ui/v2.5/src/components/Scenes/SceneMergeDialog.tsx
index 3731f1d6a..d5a18d4ac 100644
--- a/ui/v2.5/src/components/Scenes/SceneMergeDialog.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneMergeDialog.tsx
@@ -305,8 +305,7 @@ const SceneMergeDetails: React.FC<ISceneMergeDetailsProps> = ({
           .filter((s, index, a) => {
             // remove entries with duplicate endpoints
             return index === a.findIndex((ss) => ss.endpoint === s.endpoint);
-          }),
-        !dest.stash_ids.length
+          })
       )
     );
 

From cb6c53deb51c22cf6c8c2dec5babad7a5ddd7989 Mon Sep 17 00:00:00 2001
From: theqwertyqwert <theqwertyqwertporn@gmail.com>
Date: Mon, 20 Oct 2025 05:00:06 +0300
Subject: [PATCH 072/405] Update marker background color logic to use
 primaryTag name instead of title (#6141)

---
 ui/v2.5/src/components/ScenePlayer/markers.ts | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/ui/v2.5/src/components/ScenePlayer/markers.ts b/ui/v2.5/src/components/ScenePlayer/markers.ts
index 83a695c1b..6215f7f47 100644
--- a/ui/v2.5/src/components/ScenePlayer/markers.ts
+++ b/ui/v2.5/src/components/ScenePlayer/markers.ts
@@ -5,6 +5,7 @@ export interface IMarker {
   title: string;
   seconds: number;
   end_seconds?: number | null;
+  primaryTag: { name: string };
 }
 
 interface IMarkersOptions {
@@ -85,8 +86,13 @@ class MarkersPlugin extends videojs.getPlugin("plugin") {
     markerSet.dot.toggleAttribute("marker-tooltip-shown", true);
 
     // Set background color based on tag (if available)
-    if (marker.title && this.tagColors[marker.title]) {
-      markerSet.dot.style.backgroundColor = this.tagColors[marker.title];
+    if (
+      marker.primaryTag &&
+      marker.primaryTag.name &&
+      this.tagColors[marker.primaryTag.name]
+    ) {
+      markerSet.dot.style.backgroundColor =
+        this.tagColors[marker.primaryTag.name];
     }
     markerSet.dot.addEventListener("mouseenter", () => {
       this.showMarkerTooltip(marker.title);
@@ -152,8 +158,12 @@ class MarkersPlugin extends videojs.getPlugin("plugin") {
     rangeDiv.style.display = "none"; // Initially hidden
 
     // Set background color based on tag (if available)
-    if (marker.title && this.tagColors[marker.title]) {
-      rangeDiv.style.backgroundColor = this.tagColors[marker.title];
+    if (
+      marker.primaryTag &&
+      marker.primaryTag.name &&
+      this.tagColors[marker.primaryTag.name]
+    ) {
+      rangeDiv.style.backgroundColor = this.tagColors[marker.primaryTag.name];
     }
 
     markerSet.range = rangeDiv;

From c162c3843db02ab6f9268fa2fd06e309e5a7e536 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Tue, 21 Oct 2025 08:13:42 +1100
Subject: [PATCH 073/405] Add timeout to ffmpeg hardware tests (#6154)

---
 pkg/ffmpeg/codec_hardware.go | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/pkg/ffmpeg/codec_hardware.go b/pkg/ffmpeg/codec_hardware.go
index 5151e7efe..4081f015d 100644
--- a/pkg/ffmpeg/codec_hardware.go
+++ b/pkg/ffmpeg/codec_hardware.go
@@ -5,9 +5,11 @@ import (
 	"context"
 	"fmt"
 	"math"
+	"os"
 	"regexp"
 	"strconv"
 	"strings"
+	"time"
 
 	"github.com/stashapp/stash/pkg/logger"
 	"github.com/stashapp/stash/pkg/models"
@@ -64,12 +66,32 @@ func (f *FFMpeg) InitHWSupport(ctx context.Context) {
 		args = args.Format("null")
 		args = args.Output("-")
 
-		cmd := f.Command(ctx, args)
+		// #6064 - add timeout to context to prevent hangs
+		const hwTestTimeoutSecondsDefault = 1
+		hwTestTimeoutSeconds := hwTestTimeoutSecondsDefault * time.Second
+
+		// allow timeout to be overridden with environment variable
+		if timeout := os.Getenv("STASH_HW_TEST_TIMEOUT"); timeout != "" {
+			if seconds, err := strconv.Atoi(timeout); err == nil {
+				hwTestTimeoutSeconds = time.Duration(seconds) * time.Second
+			}
+		}
+
+		testCtx, cancel := context.WithTimeout(ctx, hwTestTimeoutSeconds)
+		defer cancel()
+
+		cmd := f.Command(testCtx, args)
+		logger.Tracef("[InitHWSupport] Testing codec %s: %v", codec, cmd.Args)
 
 		var stderr bytes.Buffer
 		cmd.Stderr = &stderr
 
 		if err := cmd.Run(); err != nil {
+			if testCtx.Err() != nil {
+				logger.Debugf("[InitHWSupport] Codec %s test timed out after %d seconds", codec, hwTestTimeoutSeconds)
+				continue
+			}
+
 			errOutput := stderr.String()
 
 			if len(errOutput) == 0 {

From d0283fe330957a21a378a7ad4e866d87f72a0ac2 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Tue, 21 Oct 2025 08:21:53 +1100
Subject: [PATCH 074/405] Update changelog

---
 ui/v2.5/src/docs/en/Changelog/v0290.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ui/v2.5/src/docs/en/Changelog/v0290.md b/ui/v2.5/src/docs/en/Changelog/v0290.md
index f2c99de4a..12a958d86 100644
--- a/ui/v2.5/src/docs/en/Changelog/v0290.md
+++ b/ui/v2.5/src/docs/en/Changelog/v0290.md
@@ -34,10 +34,12 @@
 * Fixed UI crash when viewing a gallery in the Performer details page. ([#5824](https://github.com/stashapp/stash/pull/5824))
 * Fixed scraped performer stash ID being saved when cancelling scrape operation. ([#5839](https://github.com/stashapp/stash/pull/5839))
 * Fixed groups not transferring when merging tags. ([#6127](https://github.com/stashapp/stash/pull/6127))
+* Fixed URLs and stash IDs not transferring during scene merge operation. ([#6151](https://github.com/stashapp/stash/pull/6151), [#6152](https://github.com/stashapp/stash/pull/6152))
 * Fixed empty exclusion patterns being applied when scanning and cleaning. ([#6023](https://github.com/stashapp/stash/pull/6023))
 * Fixed login page being included in browser history. ([#5747](https://github.com/stashapp/stash/pull/5747))
 * Fixed gallery card resizing while scrubbing. ([#5844](https://github.com/stashapp/stash/pull/5844))
 * Fixed incorrectly positioned scene markers in the scene player timeline. ([#5801](https://github.com/stashapp/stash/pull/5801), [#5804](https://github.com/stashapp/stash/pull/5804))
+* Fixed incorrect marker colours in the scene player timeline. ([#6141](https://github.com/stashapp/stash/pull/6141))
 * Fixed custom fields not being displayed in Performer page with `Compact Expanded Details` enabled. ([#5833](https://github.com/stashapp/stash/pull/5833))
 * Fixed issue in tagger where creating a parent studio would not map it to the other results. ([#5810](https://github.com/stashapp/stash/pull/5810), [#5996](https://github.com/stashapp/stash/pull/5996))
 * Fixed generation options not being respected when generating using the Tasks page. ([#6139](https://github.com/stashapp/stash/pull/6139))
@@ -51,4 +53,5 @@
 * Fixed parent tags missing in export if including dependencies. ([#5780](https://github.com/stashapp/stash/pull/5780))
 * Add short hash of basename when generating export file names to prevent the same filename being generated. ([#5780](https://github.com/stashapp/stash/pull/5780))
 * Fixed invalid studio and performer links in the tagger view. ([#5876](https://github.com/stashapp/stash/pull/5876))
-* Fixed clickable area for tag links. ([#6129](https://github.com/stashapp/stash/pull/6129))
\ No newline at end of file
+* Fixed clickable area for tag links. ([#6129](https://github.com/stashapp/stash/pull/6129))
+* ffmpeg hardware encoding checks now timeout after 1 second to prevent startup hangs. ([#6154](https://github.com/stashapp/stash/pull/6154))
\ No newline at end of file

From 415e88808f3d10ab71b4ccddb88db0d0170074fa Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Tue, 21 Oct 2025 08:43:59 +1100
Subject: [PATCH 075/405] Codeberg weblate (#6159)

* Translated using Weblate (Bulgarian)

Currently translated at 11.3% (138 of 1219 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/bg/

* Translated using Weblate (Bulgarian)

Currently translated at 22.3% (272 of 1219 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/bg/

---------

Co-authored-by: theqwertyqwert <theqwertyqwert@noreply.codeberg.org>
---
 ui/v2.5/src/locales/bg-BG.json | 265 ++++++++++++++++++++++++++++++++-
 1 file changed, 264 insertions(+), 1 deletion(-)

diff --git a/ui/v2.5/src/locales/bg-BG.json b/ui/v2.5/src/locales/bg-BG.json
index 3f7e71f3d..f639b3b6b 100644
--- a/ui/v2.5/src/locales/bg-BG.json
+++ b/ui/v2.5/src/locales/bg-BG.json
@@ -51,6 +51,269 @@
         "encoding_image": "Кодиране на картина…",
         "export": "Експортиране",
         "export_all": "Експортирай всичко…",
-        "reshuffle": "Пренареди"
+        "reshuffle": "Пренареди",
+        "assign_stashid_to_parent_studio": "Задай Stash ID към съществуващо родителско студио и опресни метаданните",
+        "find": "Намери",
+        "finish": "Приключи",
+        "from_file": "От файл…",
+        "from_url": "От URL…",
+        "full_export": "Пълен експорт",
+        "full_import": "Пълен Импорт",
+        "generate": "Генерирай",
+        "generate_thumb_default": "Генерирай тъмбнайл по подразбиране",
+        "generate_thumb_from_current": "Генерирай тъмбнайл от сегашният кадър",
+        "hash_migration": "миграция на хеш",
+        "hide": "Скрий",
+        "hide_configuration": "Скрий конфигурация",
+        "identify": "Индентифицирай",
+        "ignore": "Игнорирай",
+        "import": "Импорт…",
+        "import_from_file": "Импорт от файл",
+        "load": "Зареди",
+        "load_filter": "Зареди филтър",
+        "logout": "Изход",
+        "make_primary": "Направи Основен",
+        "merge": "Слей",
+        "merge_from": "Слей от",
+        "merge_into": "Слей към",
+        "migrate_blobs": "Мигрирай Блобове",
+        "migrate_scene_screenshots": "Мигрирай Скрийншоти от Сцени",
+        "next_action": "Следващ",
+        "not_running": "не върви",
+        "open_in_external_player": "Отвори в външет плейер",
+        "open_random": "Отвори Случайно",
+        "optimise_database": "Оптимизирай База Данни",
+        "overwrite": "Презапиши",
+        "play": "Пусни",
+        "play_random": "Пусни Случайно",
+        "play_selected": "Пусни избраните",
+        "preview": "Преглеждане",
+        "previous_action": "Назад",
+        "reassign": "Презадай",
+        "refresh": "Опресни",
+        "reload": "Презареди",
+        "reload_plugins": "Презареди плъгините",
+        "reload_scrapers": "Презареди търкачите",
+        "remove": "Премахни",
+        "remove_date": "Премахни дата",
+        "remove_from_containing_group": "Премахни от Група",
+        "remove_from_gallery": "Премахни от Галерия",
+        "rename_gen_files": "Преименувай генериран файл",
+        "rescan": "Пресканирай",
+        "reset_play_duration": "Нулирай период на пускане",
+        "reset_resume_time": "Нулирай преме за възтановяване",
+        "reset_cover": "Възтанови Първоначална Корица",
+        "running": "върви",
+        "save": "Запази",
+        "save_delete_settings": "Изполвай тези настройки по подразвиране при изтриване",
+        "save_filter": "Запази филтър",
+        "scan": "Сканирай",
+        "scrape": "Изтъркай",
+        "scrape_query": "Изтъркай със заявка",
+        "scrape_scene_fragment": "Изтъркай по частица",
+        "scrape_with": "Изтъркай чрез…",
+        "search": "Търси",
+        "select_all": "Избери Всичко",
+        "select_entity": "Избери {entityType}",
+        "select_folders": "Избери папки",
+        "select_none": "Избери Нищо",
+        "selective_auto_tag": "Избирателно Автоматично Тагване",
+        "selective_clean": "Избирателно Почистване",
+        "selective_scan": "Избирателно Сканиране",
+        "set_as_default": "Сложи по подразбиране",
+        "set_back_image": "Задна картина…",
+        "set_cover": "Сложи Като Корица",
+        "set_front_image": "Предна Картина…",
+        "set_image": "Сложи картина…",
+        "show": "Покажи",
+        "show_configuration": "Покажи Конфигурация",
+        "show_results": "Покажи резултат",
+        "show_count_results": "Покажи {count} резултати",
+        "sidebar": {
+            "close": "Затвори странично меню",
+            "open": "Отвори странично меню",
+            "toggle": "Превключи странично меню"
+        },
+        "skip": "Пропусни",
+        "split": "Раздели",
+        "stop": "Спри",
+        "submit": "Подай",
+        "submit_stash_box": "Подай към Stash-Box",
+        "submit_update": "Подай обноваване",
+        "swap": "Подмени",
+        "tasks": {
+            "clean_confirm_message": "Сигурен ли си че искаш да Изчистиш? Това ще изтрие иформацията от база данни и генерирано съдържание за всички сцени и галерий който не мога да бъдат намерени на файловата система.",
+            "dry_mode_selected": "Избрано е Сухо Пускане. Нищо няма да бъде изтрито на истина, са ще бъде записано в логовете.",
+            "import_warning": "Сигурен ли си че искаш да импортираш? Това ще изтрие базата данни и че вкара на ново твоите експортирани метаданни."
+        },
+        "temp_disable": "Спри временно…",
+        "temp_enable": "Включи временно…",
+        "unset": "",
+        "use_default": "Използвай на стойностите по подразбиране",
+        "view_history": "Виж история",
+        "view_random": "Виж Случайно"
+    },
+    "actions_name": "Действия",
+    "age": "Години",
+    "age_on_date": "{age} по време на продукция",
+    "aliases": "Псевдоними",
+    "all": "всички",
+    "also_known_as": "Също така познат/а като",
+    "appears_with": "Има Участия Със",
+    "ascending": "Възходящ",
+    "audio_codec": "Аудио Кодек",
+    "average_resolution": "Средностатистическа Резолюция",
+    "between_and": "и",
+    "birth_year": "Година на раждане",
+    "birthdate": "Дата на раждане",
+    "bitrate": "Бит Рейт",
+    "blobs_storage_type": {
+        "database": "База Данни",
+        "filesystem": "Файлова Система"
+    },
+    "captions": "Субтитри",
+    "career_length": "Подължителност на Кариера",
+    "chapters": "Глави",
+    "circumcised": "Образан",
+    "circumcised_types": {
+        "CUT": "Обрязан",
+        "UNCUT": "Необрязан"
+    },
+    "component_tagger": {
+        "config": {
+            "active_instance": "Активни инстанции на stash-box:",
+            "blacklist_desc": "Предмети от черният списък са изключени от заяки. Забележи че те са regular expressions и не гледа главни и малки букви. Някой символи трябва да пъдат escape-нати със наклонка: {chars_require_escape}",
+            "blacklist_label": "Черен списък",
+            "errors": {
+                "blacklist_duplicate": "Дубликирани предмети от черния списък"
+            },
+            "mark_organized_desc": "Веднага отбележи сцена като Организирана след като се натисне бутон Запази.",
+            "mark_organized_label": "Отбележи като Организирана на запазване",
+            "query_mode_auto": "Автоматично",
+            "query_mode_auto_desc": "Използа метаданни ако съществиват, или име на файл",
+            "query_mode_dir": "Папка",
+            "query_mode_dir_desc": "Използва само папката която съдържа видео файла",
+            "query_mode_filename": "Име на файл",
+            "query_mode_filename_desc": "Използва само име на файл",
+            "query_mode_label": "Мод на Заявки",
+            "query_mode_metadata": "Мета данни",
+            "query_mode_metadata_desc": "Използва само мета данни",
+            "query_mode_path": "Път",
+            "query_mode_path_desc": "Използва целият път на файла",
+            "set_cover_desc": "Замени корицата на сцената ако се намери такава.",
+            "set_cover_label": "Заложи картина за корица на сцена",
+            "set_tag_desc": "Закачи тагове към сцената, или чрез презаписване или чрез сливане със съществуващите тагове на сцената.",
+            "set_tag_label": "Задай тагове",
+            "show_male_desc": "Превключи дали мъжки изпълнители ще въдат предоставени за тагване.",
+            "show_male_label": "Покажи мъжки изпълнители",
+            "source": "Източник"
+        },
+        "noun_query": "Заявка",
+        "results": {
+            "duration_off": "Продължителност не съвпада с поне {number} сек.",
+            "duration_unknown": "Неизвестна продължителност",
+            "fp_matches": "Продължителността съвпада",
+            "fp_matches_multi": "Продължителността съвпада {matchCount}/{durationsLength} отпечатъци",
+            "hash_matches": "{hash_type} съвпада",
+            "match_failed_already_tagged": "Сцената вече има тагове",
+            "match_failed_no_result": "Няма намерени резултати",
+            "match_success": "Счената е успешно тагната",
+            "phash_matches": "{count} PHashes съвпадат",
+            "unnamed": "Неименуван"
+        },
+        "verb_match_fp": "Сравни Отпечатъци",
+        "verb_matched": "Сравнени",
+        "verb_scrape_all": "Изтъркай Всичко",
+        "verb_submit_fp": "Подай {fpCount, plural, one{# Отпечатък} other{# Отпечатъци}}",
+        "verb_toggle_unmatched": "{toggle} несъвпадаци сцени"
+    },
+    "config": {
+        "about": {
+            "build_hash": "Хеш на билда:",
+            "build_time": "Време на билда:",
+            "check_for_new_version": "Проверка за нова версия",
+            "latest_version": "Последна Версия",
+            "latest_version_build_hash": "Хеш на билда на Последна Версия:",
+            "new_version_notice": "[НОВО]",
+            "release_date": "Дана за издаване:",
+            "stash_discord": "Присъедини се към нашият {url} канал",
+            "stash_home": "Stash home на {url}",
+            "stash_open_collective": "Подкрепи ни чрез {url}",
+            "stash_wiki": "Stash {url} страница",
+            "version": "Версия"
+        },
+        "advanced_mode": "Мод за Напреднали",
+        "application_paths": {
+            "heading": "Пътища на Апликация"
+        },
+        "categories": {
+            "about": "Относно",
+            "changelog": "Списък на промените",
+            "interface": "Интерфейс",
+            "logs": "Дневници",
+            "metadata_providers": "Доставчици на Мета данни",
+            "plugins": "Приставки",
+            "scraping": "Търкане",
+            "security": "Сигурност",
+            "services": "Услуги",
+            "system": "Система",
+            "tasks": "Задачи",
+            "tools": "Иструменти"
+        },
+        "dlna": {
+            "allow_temp_ip": "Позволи {tempIP}",
+            "allowed_ip_addresses": "Позволени IP адреси",
+            "allowed_ip_temporarily": "Позволени IP временно",
+            "default_ip_whitelist": "Основен IP Бъл списък",
+            "default_ip_whitelist_desc": "Основени IP адреси позволени да достигат DLNA. Изполвай {wildcard} за да позволиш всички IP адреси.",
+            "disabled_dlna_temporarily": "Временно изключено DLNA",
+            "disallowed_ip": "Непозволени IP",
+            "enabled_by_default": "Включено по подразвиране",
+            "enabled_dlna_temporarily": "Временно включено DLNA",
+            "network_interfaces": "Интерфейси",
+            "network_interfaces_desc": "Интерфейси да се достъпн DLNA сървъра. Празен лист ще ползва всички интерфейси. Изисква DLNA рестрат след промяна.",
+            "recent_ip_addresses": "Скорошни IP адреси",
+            "server_display_name": "Име за Покаване на Сървъра",
+            "server_display_name_desc": "Име за покаване на DLNA сървъра. По подразбиране {server_name} ако е празно.",
+            "server_port": "Порт на Сървъра",
+            "server_port_desc": "Порт на който да върви DLNA сървъра. Изисква рестарт на DLNA след промяна.",
+            "successfully_cancelled_temporary_behaviour": "Успешно отказано временно поведение",
+            "until_restart": "до рестартиране",
+            "video_sort_order": "Ред на Видеа по подразбиране",
+            "video_sort_order_desc": "Ред по който да реди видеа по подразбиране."
+        },
+        "general": {
+            "auth": {
+                "api_key": "API ключ",
+                "api_key_desc": "API ключ за външни системи. Нужен само когато име/парола са настроени. Името трябва да бъде запазене преди генерация на API ключ.",
+                "authentication": "Идентификация",
+                "clear_api_key": "Изчисти API ключ",
+                "credentials": {
+                    "description": "Удостоверителни данни за контрол на достъпа до stash.",
+                    "heading": "Удостоверителни данни"
+                },
+                "generate_api_key": "Генерирай API ключ",
+                "log_file": "Лог файл",
+                "log_file_desc": "Път към файла за извод на лог. Празен за да спре извод на лог. Изисква рестарт.",
+                "log_http": "Логвай http достъп",
+                "log_http_desc": "Логва http достъп на терминала. Изисква рестарт.",
+                "log_to_terminal": "Лог към терминал",
+                "log_to_terminal_desc": "Логва към терминал заедно с към файл. Винаги истина ако логване към файл е изключено. Изискава рестарт.",
+                "maximum_session_age": "Максимална Продължителност на Сесия",
+                "maximum_session_age_desc": "Максимално време на бездействие, преди сесията за вход да изтече, в секунди. Изисква рестартиране.",
+                "password": "Парола",
+                "password_desc": "Парола за достъп до Stash. Остави празно за да изключи достъп чрез потребител",
+                "stash-box_integration": "Stash-box интеграция",
+                "username": "Потребителско име",
+                "username_desc": "Потребителско име за достъп до Stash. Остави празно за да изключи достъп чрез потребител"
+            },
+            "backup_directory_path": {
+                "description": "Местоположение на папка за резрвни SQLite бази данни",
+                "heading": "Път към Папка за Резервни Данни"
+            },
+            "blobs_path": {
+                "description": "Къде във файловата система да се пазят бинарни данни. Позва се само ако се ползва Файлова система за блоб пазене. ВНИМАНИЕ: промяната ще изисква ръчно местене на съществуващи данни."
+            }
+        }
     }
 }

From a6778d7d225b421cf94886be05def0c514018107 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Tue, 21 Oct 2025 10:34:02 +1100
Subject: [PATCH 076/405] Add discourse links to manual

---
 ui/v2.5/src/docs/en/Manual/Contributing.md | 2 +-
 ui/v2.5/src/docs/en/Manual/Help.md         | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ui/v2.5/src/docs/en/Manual/Contributing.md b/ui/v2.5/src/docs/en/Manual/Contributing.md
index 9e55dbd6d..2d62dde08 100644
--- a/ui/v2.5/src/docs/en/Manual/Contributing.md
+++ b/ui/v2.5/src/docs/en/Manual/Contributing.md
@@ -26,4 +26,4 @@ We welcome ideas for future improvements and features, and bug reports help ever
 
 ## Providing support
 
-Offering support for new users on [Discord](https://discord.gg/2TsNFKt) is also welcomed.
+Offering support for new users on our [Community forum](https://discourse.stashapp.cc/) and [Discord](https://discord.gg/2TsNFKt) is also welcomed.
diff --git a/ui/v2.5/src/docs/en/Manual/Help.md b/ui/v2.5/src/docs/en/Manual/Help.md
index f5d1d69e5..c9c4ab9d3 100644
--- a/ui/v2.5/src/docs/en/Manual/Help.md
+++ b/ui/v2.5/src/docs/en/Manual/Help.md
@@ -1,5 +1,7 @@
 # Where to get further help
 
+Join our [Community forum](https://discourse.stashapp.cc/).
+
 Join our [Discord](https://discord.gg/2TsNFKt).
 
 The [Stash-Docs](https://docs.stashapp.cc) covers some areas not covered in the in-app help.

From 71e407187146f5f5cafd20ec80c666506542972f Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Tue, 21 Oct 2025 19:04:44 +1100
Subject: [PATCH 077/405] Encode credentials during login (#6163)

---
 ui/login/login.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ui/login/login.html b/ui/login/login.html
index 32787fc91..62b8ffdc8 100644
--- a/ui/login/login.html
+++ b/ui/login/login.html
@@ -44,7 +44,8 @@
         xhr.onerror = function() {
             document.getElementsByClassName("login-error")[0].innerHTML = localeStrings.internal_error;
         };
-        xhr.send("username=" + username + "&password=" + password + "&returnURL=" + returnURL);
+        var body = "username=" + encodeURIComponent(username) + "&password=" + encodeURIComponent(password) + "&returnURL=" + encodeURIComponent(returnURL);
+        xhr.send(body);
     }
 </script>
 

From 947a17355c4e25e77993939ac0ba9e403c14605b Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Wed, 22 Oct 2025 11:31:42 +1100
Subject: [PATCH 078/405] Fix UI loop when sorting by random without seed
 (#6167)

---
 ui/v2.5/src/components/List/util.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/ui/v2.5/src/components/List/util.ts b/ui/v2.5/src/components/List/util.ts
index 717f9c289..c52fcc8d3 100644
--- a/ui/v2.5/src/components/List/util.ts
+++ b/ui/v2.5/src/components/List/util.ts
@@ -24,6 +24,7 @@ export function useFilterURL(
 
   const history = useHistory();
   const location = useLocation();
+  const prevLocation = usePrevious(location);
 
   // when the filter changes, update the URL
   const updateFilter = useCallback(
@@ -47,7 +48,8 @@ export function useFilterURL(
   // and updates the filter accordingly.
   useEffect(() => {
     // don't apply if active is false
-    if (!active) return;
+    // also don't apply if location is unchanged
+    if (!active || prevLocation === location) return;
 
     // re-init to load default filter on empty new query params
     if (!location.search) {
@@ -73,7 +75,8 @@ export function useFilterURL(
     });
   }, [
     active,
-    location.search,
+    prevLocation,
+    location,
     defaultFilter,
     setFilter,
     updateFilter,

From 98df51755eb2fbeafc7d940dd6ab264402050274 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Wed, 22 Oct 2025 12:21:04 +1100
Subject: [PATCH 079/405] Fix column layout image wall issues (#6168)

---
 ui/v2.5/src/components/Images/ImageList.tsx | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/ui/v2.5/src/components/Images/ImageList.tsx b/ui/v2.5/src/components/Images/ImageList.tsx
index 093567613..dc1f9b1e1 100644
--- a/ui/v2.5/src/components/Images/ImageList.tsx
+++ b/ui/v2.5/src/components/Images/ImageList.tsx
@@ -116,15 +116,13 @@ const ImageWall: React.FC<IImageWallProps> = ({
 
   const renderImage = useCallback(
     (props: RenderImageProps) => {
-      return (
-        <ImageWallItem
-          {...props}
-          maxHeight={
-            targetRowHeight(containerRef.current?.offsetWidth ?? 0) *
-            maxHeightFactor
-          }
-        />
-      );
+      // #6165 - only use targetRowHeight in row direction
+      const maxHeight =
+        props.direction === "column"
+          ? props.photo.height
+          : targetRowHeight(containerRef.current?.offsetWidth ?? 0) *
+            maxHeightFactor;
+      return <ImageWallItem {...props} maxHeight={maxHeight} />;
     },
     [targetRowHeight]
   );

From 5049d6e5c91b3528dd633db71f5b23d5b9d749b6 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Wed, 22 Oct 2025 12:48:39 +1100
Subject: [PATCH 080/405] Fix scene list table styling issues (#6169)

* Reduce z-index of table list header
* Set better max-height for scene list table
---
 ui/v2.5/src/components/List/styles.scss   | 2 +-
 ui/v2.5/src/components/Scenes/styles.scss | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ui/v2.5/src/components/List/styles.scss b/ui/v2.5/src/components/List/styles.scss
index a4194a832..7b02fd509 100644
--- a/ui/v2.5/src/components/List/styles.scss
+++ b/ui/v2.5/src/components/List/styles.scss
@@ -740,7 +740,7 @@ input[type="range"].zoom-slider {
       background-color: #202b33;
       position: sticky;
       top: 0;
-      z-index: 100;
+      z-index: 1;
     }
 
     td:first-child {
diff --git a/ui/v2.5/src/components/Scenes/styles.scss b/ui/v2.5/src/components/Scenes/styles.scss
index e7c5af22a..3b00130b1 100644
--- a/ui/v2.5/src/components/Scenes/styles.scss
+++ b/ui/v2.5/src/components/Scenes/styles.scss
@@ -958,3 +958,9 @@ input[type="range"].blue-slider {
     }
   }
 }
+
+.table-list.scene-table {
+  // Set max height to viewport height minus estimated header/footer height
+  // TODO - this will need to be rolled out to other tables
+  max-height: calc(100dvh - 210px);
+}

From 869cbd496b7f3d0eef08bb020bf91d4dd9301da9 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Wed, 22 Oct 2025 12:49:27 +1100
Subject: [PATCH 081/405] Update changelog

---
 ui/v2.5/src/docs/en/Changelog/v0290.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ui/v2.5/src/docs/en/Changelog/v0290.md b/ui/v2.5/src/docs/en/Changelog/v0290.md
index 12a958d86..c5cb78048 100644
--- a/ui/v2.5/src/docs/en/Changelog/v0290.md
+++ b/ui/v2.5/src/docs/en/Changelog/v0290.md
@@ -28,6 +28,10 @@
 * Include IP address in login errors in log. ([#5760](https://github.com/stashapp/stash/pull/5760))
 
 ### 🐛 Bug fixes
+* **[0.29.1]** Fixed password with special characters not allowing login. ([#6163](https://github.com/stashapp/stash/pull/6163))
+* **[0.29.1]** Fixed layout issues using column direction for image wall. ([#6168](https://github.com/stashapp/stash/pull/6168))
+* **[0.29.1]** Fixed layout issues for scene list table. ([#6169](https://github.com/stashapp/stash/pull/6169))
+* **[0.29.1]** Fixed UI loop when sorting by random without seed using URL. ([#6167](https://github.com/stashapp/stash/pull/6167))
 * Fixed ordering studios by tag count returning error. ([#5776](https://github.com/stashapp/stash/pull/5776))
 * Fixed error when submitting fingerprints for scenes that have been deleted. ([#5799](https://github.com/stashapp/stash/pull/5799))
 * Fixed errors when scraping groups. ([#5793](https://github.com/stashapp/stash/pull/5793), [#5974](https://github.com/stashapp/stash/pull/5974))

From fda97e7f6c207dbd4bfec277aa5269eb357ce44a Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Wed, 29 Oct 2025 11:11:21 +1100
Subject: [PATCH 082/405] Return if primary file failed to load (#6200)

---
 internal/manager/task_generate_screenshot.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/internal/manager/task_generate_screenshot.go b/internal/manager/task_generate_screenshot.go
index 77ad2be34..2f4031586 100644
--- a/internal/manager/task_generate_screenshot.go
+++ b/internal/manager/task_generate_screenshot.go
@@ -32,6 +32,7 @@ func (t *GenerateCoverTask) Start(ctx context.Context) {
 		return t.Scene.LoadPrimaryFile(ctx, r.File)
 	}); err != nil {
 		logger.Error(err)
+		return
 	}
 
 	if !required {

From 96b5a9448c123e0b346c76b3a7d33fc5b007c2b7 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Wed, 29 Oct 2025 11:11:42 +1100
Subject: [PATCH 083/405] Fix source.StashBoxEndpoint reference causing nil
 deref (#6201)

---
 internal/api/resolver_query_scraper.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/internal/api/resolver_query_scraper.go b/internal/api/resolver_query_scraper.go
index f0e89cd34..5875cd11e 100644
--- a/internal/api/resolver_query_scraper.go
+++ b/internal/api/resolver_query_scraper.go
@@ -201,7 +201,7 @@ func (r *queryResolver) ScrapeSingleScene(ctx context.Context, source scraper.So
 		}
 
 		// TODO - this should happen after any scene is scraped
-		if err := r.matchScenesRelationships(ctx, ret, *source.StashBoxEndpoint); err != nil {
+		if err := r.matchScenesRelationships(ctx, ret, b.Endpoint); err != nil {
 			return nil, err
 		}
 	default:
@@ -245,7 +245,7 @@ func (r *queryResolver) ScrapeMultiScenes(ctx context.Context, source scraper.So
 		// just flatten the slice and pass it in
 		flat := sliceutil.Flatten(ret)
 
-		if err := r.matchScenesRelationships(ctx, flat, *source.StashBoxEndpoint); err != nil {
+		if err := r.matchScenesRelationships(ctx, flat, b.Endpoint); err != nil {
 			return nil, err
 		}
 
@@ -335,7 +335,7 @@ func (r *queryResolver) ScrapeSingleStudio(ctx context.Context, source scraper.S
 		if len(ret) > 0 {
 			if err := r.withReadTxn(ctx, func(ctx context.Context) error {
 				for _, studio := range ret {
-					if err := match.ScrapedStudioHierarchy(ctx, r.repository.Studio, studio, *source.StashBoxEndpoint); err != nil {
+					if err := match.ScrapedStudioHierarchy(ctx, r.repository.Studio, studio, b.Endpoint); err != nil {
 						return err
 					}
 				}

From 648875995c252f4f548d15ff0735e35b509fa619 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Wed, 29 Oct 2025 11:12:00 +1100
Subject: [PATCH 084/405] Fix play random not using effective filter (#6202)

---
 ui/v2.5/src/components/Scenes/SceneList.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/v2.5/src/components/Scenes/SceneList.tsx b/ui/v2.5/src/components/Scenes/SceneList.tsx
index 1154f384e..982a11fed 100644
--- a/ui/v2.5/src/components/Scenes/SceneList.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneList.tsx
@@ -518,7 +518,7 @@ export const FilteredSceneList = (props: IFilteredScenes) => {
 
   const queue = useMemo(() => SceneQueue.fromListFilterModel(filter), [filter]);
 
-  const playRandom = usePlayRandom(filter, totalCount);
+  const playRandom = usePlayRandom(effectiveFilter, totalCount);
   const playSelected = usePlaySelected(selectedIds);
   const playFirst = usePlayFirst();
 

From 1dccecc39c3634ed6d7b6f7d0ca9840fa824dff2 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Wed, 29 Oct 2025 11:12:25 +1100
Subject: [PATCH 085/405] Go to list page if deleting with empty history
 (#6203)

---
 .../components/Galleries/GalleryDetails/Gallery.tsx   |  3 ++-
 ui/v2.5/src/components/Groups/GroupDetails/Group.tsx  |  3 ++-
 ui/v2.5/src/components/Images/ImageDetails/Image.tsx  |  3 ++-
 .../Performers/PerformerDetails/Performer.tsx         |  3 ++-
 ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx  |  3 ++-
 .../src/components/Studios/StudioDetails/Studio.tsx   |  3 ++-
 ui/v2.5/src/components/Tags/TagDetails/Tag.tsx        |  3 ++-
 ui/v2.5/src/utils/history.ts                          | 11 +++++++++++
 8 files changed, 25 insertions(+), 7 deletions(-)
 create mode 100644 ui/v2.5/src/utils/history.ts

diff --git a/ui/v2.5/src/components/Galleries/GalleryDetails/Gallery.tsx b/ui/v2.5/src/components/Galleries/GalleryDetails/Gallery.tsx
index 20023904b..5d7cdeb51 100644
--- a/ui/v2.5/src/components/Galleries/GalleryDetails/Gallery.tsx
+++ b/ui/v2.5/src/components/Galleries/GalleryDetails/Gallery.tsx
@@ -43,6 +43,7 @@ import cx from "classnames";
 import { useRatingKeybinds } from "src/hooks/keybinds";
 import { ConfigurationContext } from "src/hooks/Config";
 import { TruncatedText } from "src/components/Shared/TruncatedText";
+import { goBackOrReplace } from "src/utils/history";
 
 interface IProps {
   gallery: GQL.GalleryDataFragment;
@@ -167,7 +168,7 @@ export const GalleryPage: React.FC<IProps> = ({ gallery, add }) => {
   function onDeleteDialogClosed(deleted: boolean) {
     setIsDeleteAlertOpen(false);
     if (deleted) {
-      history.goBack();
+      goBackOrReplace(history, "/galleries");
     }
   }
 
diff --git a/ui/v2.5/src/components/Groups/GroupDetails/Group.tsx b/ui/v2.5/src/components/Groups/GroupDetails/Group.tsx
index bd58a6682..b48f3b98c 100644
--- a/ui/v2.5/src/components/Groups/GroupDetails/Group.tsx
+++ b/ui/v2.5/src/components/Groups/GroupDetails/Group.tsx
@@ -43,6 +43,7 @@ import { Button, Tab, Tabs } from "react-bootstrap";
 import { GroupSubGroupsPanel } from "./GroupSubGroupsPanel";
 import { GroupPerformersPanel } from "./GroupPerformersPanel";
 import { Icon } from "src/components/Shared/Icon";
+import { goBackOrReplace } from "src/utils/history";
 
 const validTabs = ["default", "scenes", "performers", "subgroups"] as const;
 type TabKey = (typeof validTabs)[number];
@@ -276,7 +277,7 @@ const GroupPage: React.FC<IProps> = ({ group, tabKey }) => {
       return;
     }
 
-    history.goBack();
+    goBackOrReplace(history, "/groups");
   }
 
   function toggleEditing(value?: boolean) {
diff --git a/ui/v2.5/src/components/Images/ImageDetails/Image.tsx b/ui/v2.5/src/components/Images/ImageDetails/Image.tsx
index 4ab6641d7..b19366032 100644
--- a/ui/v2.5/src/components/Images/ImageDetails/Image.tsx
+++ b/ui/v2.5/src/components/Images/ImageDetails/Image.tsx
@@ -34,6 +34,7 @@ import TextUtils from "src/utils/text";
 import { RatingSystem } from "src/components/Shared/Rating/RatingSystem";
 import cx from "classnames";
 import { TruncatedText } from "src/components/Shared/TruncatedText";
+import { goBackOrReplace } from "src/utils/history";
 
 interface IProps {
   image: GQL.ImageDataFragment;
@@ -156,7 +157,7 @@ const ImagePage: React.FC<IProps> = ({ image }) => {
   function onDeleteDialogClosed(deleted: boolean) {
     setIsDeleteAlertOpen(false);
     if (deleted) {
-      history.goBack();
+      goBackOrReplace(history, "/images");
     }
   }
 
diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/Performer.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/Performer.tsx
index 03530c52e..ab584e90d 100644
--- a/ui/v2.5/src/components/Performers/PerformerDetails/Performer.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerDetails/Performer.tsx
@@ -47,6 +47,7 @@ import { HeaderImage } from "src/components/Shared/DetailsPage/HeaderImage";
 import { LightboxLink } from "src/hooks/Lightbox/LightboxLink";
 import { PatchComponent } from "src/patch";
 import { ILightboxImage } from "src/hooks/Lightbox/types";
+import { goBackOrReplace } from "src/utils/history";
 
 interface IProps {
   performer: GQL.PerformerDataFragment;
@@ -330,7 +331,7 @@ const PerformerPage: React.FC<IProps> = PatchComponent(
         return;
       }
 
-      history.goBack();
+      goBackOrReplace(history, "/performers");
     }
 
     function toggleEditing(value?: boolean) {
diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx
index c4088654a..7d326b3cd 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx
@@ -51,6 +51,7 @@ import { lazyComponent } from "src/utils/lazyComponent";
 import cx from "classnames";
 import { TruncatedText } from "src/components/Shared/TruncatedText";
 import { PatchComponent, PatchContainerComponent } from "src/patch";
+import { goBackOrReplace } from "src/utils/history";
 
 const SubmitStashBoxDraft = lazyComponent(
   () => import("src/components/Dialogs/SubmitDraft")
@@ -909,7 +910,7 @@ const SceneLoader: React.FC<RouteComponentProps<ISceneParams>> = ({
     ) {
       loadScene(queueScenes[currentQueueIndex + 1].id);
     } else {
-      history.goBack();
+      goBackOrReplace(history, "/scenes");
     }
   }
 
diff --git a/ui/v2.5/src/components/Studios/StudioDetails/Studio.tsx b/ui/v2.5/src/components/Studios/StudioDetails/Studio.tsx
index 2140af340..46c10d73c 100644
--- a/ui/v2.5/src/components/Studios/StudioDetails/Studio.tsx
+++ b/ui/v2.5/src/components/Studios/StudioDetails/Studio.tsx
@@ -47,6 +47,7 @@ import { FavoriteIcon } from "src/components/Shared/FavoriteIcon";
 import { ExternalLinkButtons } from "src/components/Shared/ExternalLinksButton";
 import { AliasList } from "src/components/Shared/DetailsPage/AliasList";
 import { HeaderImage } from "src/components/Shared/DetailsPage/HeaderImage";
+import { goBackOrReplace } from "src/utils/history";
 
 interface IProps {
   studio: GQL.StudioDataFragment;
@@ -378,7 +379,7 @@ const StudioPage: React.FC<IProps> = ({ studio, tabKey }) => {
       return;
     }
 
-    history.goBack();
+    goBackOrReplace(history, "/studios");
   }
 
   function renderDeleteAlert() {
diff --git a/ui/v2.5/src/components/Tags/TagDetails/Tag.tsx b/ui/v2.5/src/components/Tags/TagDetails/Tag.tsx
index 7cded1934..6d6a4a660 100644
--- a/ui/v2.5/src/components/Tags/TagDetails/Tag.tsx
+++ b/ui/v2.5/src/components/Tags/TagDetails/Tag.tsx
@@ -49,6 +49,7 @@ import { ExpandCollapseButton } from "src/components/Shared/CollapseButton";
 import { FavoriteIcon } from "src/components/Shared/FavoriteIcon";
 import { AliasList } from "src/components/Shared/DetailsPage/AliasList";
 import { HeaderImage } from "src/components/Shared/DetailsPage/HeaderImage";
+import { goBackOrReplace } from "src/utils/history";
 
 interface IProps {
   tag: GQL.TagDataFragment;
@@ -420,7 +421,7 @@ const TagPage: React.FC<IProps> = ({ tag, tabKey }) => {
       return;
     }
 
-    history.goBack();
+    goBackOrReplace(history, "/tags");
   }
 
   function renderDeleteAlert() {
diff --git a/ui/v2.5/src/utils/history.ts b/ui/v2.5/src/utils/history.ts
new file mode 100644
index 000000000..6ae7b637f
--- /dev/null
+++ b/ui/v2.5/src/utils/history.ts
@@ -0,0 +1,11 @@
+import { useHistory } from "react-router-dom";
+
+type History = ReturnType<typeof useHistory>;
+
+export function goBackOrReplace(history: History, defaultPath: string) {
+  if (history.length > 1) {
+    history.goBack();
+  } else {
+    history.replace(defaultPath);
+  }
+}

From d70ff551d4a9cc22d84daf4b1f352bfc4f9596f9 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Wed, 29 Oct 2025 11:12:42 +1100
Subject: [PATCH 086/405] Replace "movie" with "group" in scene is missing
 criterion (#6204)

* Add support for "group" value in scene is-missing filter criterion
* Replace movie with group in scene is missing criterion
---
 pkg/sqlite/scene_filter.go                            | 2 +-
 ui/v2.5/src/models/list-filter/criteria/is-missing.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/sqlite/scene_filter.go b/pkg/sqlite/scene_filter.go
index 2e63dad97..86432a4af 100644
--- a/pkg/sqlite/scene_filter.go
+++ b/pkg/sqlite/scene_filter.go
@@ -319,7 +319,7 @@ func (qb *sceneFilterHandler) isMissingCriterionHandler(isMissing *string) crite
 				f.addWhere("galleries_join.scene_id IS NULL")
 			case "studio":
 				f.addWhere("scenes.studio_id IS NULL")
-			case "movie":
+			case "movie", "group":
 				sceneRepository.groups.join(f, "groups_join", "scenes.id")
 				f.addWhere("groups_join.scene_id IS NULL")
 			case "performers":
diff --git a/ui/v2.5/src/models/list-filter/criteria/is-missing.ts b/ui/v2.5/src/models/list-filter/criteria/is-missing.ts
index f7387e558..58e3535a6 100644
--- a/ui/v2.5/src/models/list-filter/criteria/is-missing.ts
+++ b/ui/v2.5/src/models/list-filter/criteria/is-missing.ts
@@ -32,7 +32,7 @@ export const SceneIsMissingCriterionOption = new IsMissingCriterionOption(
     "date",
     "galleries",
     "studio",
-    "movie",
+    "group",
     "performers",
     "tags",
     "stash_id",

From 9b8300e88203092e96e89e57b0187d44966fb708 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Wed, 29 Oct 2025 11:12:57 +1100
Subject: [PATCH 087/405] Only scroll edit filter dialog when clicking filter
 tag (#6205)

---
 ui/v2.5/src/components/List/EditFilterDialog.tsx | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/ui/v2.5/src/components/List/EditFilterDialog.tsx b/ui/v2.5/src/components/List/EditFilterDialog.tsx
index e914b194e..5f6d43004 100644
--- a/ui/v2.5/src/components/List/EditFilterDialog.tsx
+++ b/ui/v2.5/src/components/List/EditFilterDialog.tsx
@@ -50,6 +50,7 @@ interface ICriterionList {
   optionSelected: (o?: CriterionOption) => void;
   onRemoveCriterion: (c: string) => void;
   onTogglePin: (c: CriterionOption) => void;
+  externallySelected?: boolean;
 }
 
 const CriterionOptionList: React.FC<ICriterionList> = ({
@@ -62,6 +63,7 @@ const CriterionOptionList: React.FC<ICriterionList> = ({
   optionSelected,
   onRemoveCriterion,
   onTogglePin,
+  externallySelected = false,
 }) => {
   const prevCriterion = usePrevious(currentCriterion);
 
@@ -101,14 +103,19 @@ const CriterionOptionList: React.FC<ICriterionList> = ({
     // scrolling to the current criterion doesn't work well when the
     // dialog is already open, so limit to when we click on the
     // criterion from the external tags
-    if (!scrolled.current && type && criteriaRefs[type]?.current) {
+    if (
+      externallySelected &&
+      !scrolled.current &&
+      type &&
+      criteriaRefs[type]?.current
+    ) {
       criteriaRefs[type].current!.scrollIntoView({
         behavior: "smooth",
         block: "start",
       });
       scrolled.current = true;
     }
-  }, [currentCriterion, criteriaRefs, type]);
+  }, [externallySelected, currentCriterion, criteriaRefs, type]);
 
   function getReleventCriterion(t: CriterionType) {
     if (currentCriterion?.criterionOption.type === t) {
@@ -549,6 +556,7 @@ export const EditFilterDialog: React.FC<IEditFilterProps> = ({
               selected={criterion?.criterionOption}
               onRemoveCriterion={(c) => removeCriterionString(c)}
               onTogglePin={(c) => onTogglePinFilter(c)}
+              externallySelected={!!editingCriterion}
             />
             {criteria.length > 0 && (
               <div>

From 90baa31ee35b5fdcc2fcb1850cec51cba74efcb0 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Wed, 29 Oct 2025 11:13:13 +1100
Subject: [PATCH 088/405] Hide zoom slider in xs viewports (#6206)

The zoom slider doesn't function in this viewport so it shouldn't be shown.
---
 ui/v2.5/src/components/List/styles.scss | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/ui/v2.5/src/components/List/styles.scss b/ui/v2.5/src/components/List/styles.scss
index 7b02fd509..c42c43a56 100644
--- a/ui/v2.5/src/components/List/styles.scss
+++ b/ui/v2.5/src/components/List/styles.scss
@@ -91,6 +91,13 @@
   }
 }
 
+// hide zoom slider in xs viewport
+@include media-breakpoint-down(xs) {
+  .display-mode-menu .zoom-slider-container {
+    display: none;
+  }
+}
+
 .display-mode-popover {
   padding-left: 0;
   padding-right: 0;

From db79cf9bb130f8215879a0be030275d06d21eacb Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Wed, 29 Oct 2025 11:13:29 +1100
Subject: [PATCH 089/405] Increase number of pages in pagination dropdown to
 1000 (#6207)

---
 ui/v2.5/src/components/List/Pagination.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/v2.5/src/components/List/Pagination.tsx b/ui/v2.5/src/components/List/Pagination.tsx
index e117b532e..bfa6697ee 100644
--- a/ui/v2.5/src/components/List/Pagination.tsx
+++ b/ui/v2.5/src/components/List/Pagination.tsx
@@ -44,7 +44,7 @@ const PageCount: React.FC<{
   useStopWheelScroll(pageInput);
 
   const pageOptions = useMemo(() => {
-    const maxPagesToShow = 10;
+    const maxPagesToShow = 1000;
     const min = Math.max(1, currentPage - maxPagesToShow / 2);
     const max = Math.min(min + maxPagesToShow, totalPages);
     const pages = [];

From f04be76224abe1225f149ee8641d9520ae748273 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Wed, 29 Oct 2025 11:13:46 +1100
Subject: [PATCH 090/405] Don't trim query string from decoded URL params
 (#6211)

---
 ui/v2.5/src/models/list-filter/filter.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/v2.5/src/models/list-filter/filter.ts b/ui/v2.5/src/models/list-filter/filter.ts
index 2a68cd6a2..4780f1ab6 100644
--- a/ui/v2.5/src/models/list-filter/filter.ts
+++ b/ui/v2.5/src/models/list-filter/filter.ts
@@ -183,7 +183,7 @@ export class ListFilterModel {
       ret.disp = Number.parseInt(params.disp, 10);
     }
     if (params.q) {
-      ret.q = params.q.trim();
+      ret.q = params.q;
     }
     if (params.p) {
       ret.p = Number.parseInt(params.p, 10);

From fb7bd89834577d8601f235080a7c450615bf1b97 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Wed, 29 Oct 2025 11:33:20 +1100
Subject: [PATCH 091/405] Fix update loop in Group Sub Groups panel (#6212)

* Fix location equality testing causing update loop
* Move defaultFilter out of component
* Fix add sub groups dialog dropdown render issue
---
 .../Groups/GroupDetails/AddGroupsDialog.tsx   |  1 +
 .../GroupDetails/GroupSubGroupsPanel.tsx      | 26 +++++++++----------
 ui/v2.5/src/components/List/util.ts           |  9 ++++++-
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/ui/v2.5/src/components/Groups/GroupDetails/AddGroupsDialog.tsx b/ui/v2.5/src/components/Groups/GroupDetails/AddGroupsDialog.tsx
index b89356810..79c6075c0 100644
--- a/ui/v2.5/src/components/Groups/GroupDetails/AddGroupsDialog.tsx
+++ b/ui/v2.5/src/components/Groups/GroupDetails/AddGroupsDialog.tsx
@@ -114,6 +114,7 @@ export const AddSubGroupsDialog: React.FC<IListOperationProps> = (
           onUpdate={(input) => setEntries(input)}
           excludeIDs={excludeIDs}
           filterHook={filterHook}
+          menuPortalTarget={document.body}
         />
       </Form>
     </ModalComponent>
diff --git a/ui/v2.5/src/components/Groups/GroupDetails/GroupSubGroupsPanel.tsx b/ui/v2.5/src/components/Groups/GroupDetails/GroupSubGroupsPanel.tsx
index a2bb26e95..a02cb6108 100644
--- a/ui/v2.5/src/components/Groups/GroupDetails/GroupSubGroupsPanel.tsx
+++ b/ui/v2.5/src/components/Groups/GroupDetails/GroupSubGroupsPanel.tsx
@@ -1,4 +1,4 @@
-import React, { useMemo } from "react";
+import React from "react";
 import * as GQL from "src/core/generated-graphql";
 import { GroupList } from "../GroupList";
 import { ListFilterModel } from "src/models/list-filter/filter";
@@ -101,6 +101,18 @@ interface IGroupSubGroupsPanel {
   group: GQL.GroupDataFragment;
 }
 
+const defaultFilter = (() => {
+  const sortBy = "sub_group_order";
+  const ret = new ListFilterModel(GQL.FilterMode.Groups, undefined, {
+    defaultSortBy: sortBy,
+  });
+
+  // unset the sort by so that its not included in the URL
+  ret.sortBy = undefined;
+
+  return ret;
+})();
+
 export const GroupSubGroupsPanel: React.FC<IGroupSubGroupsPanel> = ({
   active,
   group,
@@ -114,18 +126,6 @@ export const GroupSubGroupsPanel: React.FC<IGroupSubGroupsPanel> = ({
 
   const filterHook = useContainingGroupFilterHook(group);
 
-  const defaultFilter = useMemo(() => {
-    const sortBy = "sub_group_order";
-    const ret = new ListFilterModel(GQL.FilterMode.Groups, undefined, {
-      defaultSortBy: sortBy,
-    });
-
-    // unset the sort by so that its not included in the URL
-    ret.sortBy = undefined;
-
-    return ret;
-  }, []);
-
   async function removeSubGroups(
     result: GQL.FindGroupsQueryResult,
     filter: ListFilterModel,
diff --git a/ui/v2.5/src/components/List/util.ts b/ui/v2.5/src/components/List/util.ts
index c52fcc8d3..b9cb125f4 100644
--- a/ui/v2.5/src/components/List/util.ts
+++ b/ui/v2.5/src/components/List/util.ts
@@ -12,6 +12,13 @@ import * as GQL from "src/core/generated-graphql";
 import { DisplayMode } from "src/models/list-filter/types";
 import { Criterion } from "src/models/list-filter/criteria/criterion";
 
+function locationEquals(
+  loc1: ReturnType<typeof useLocation> | undefined,
+  loc2: ReturnType<typeof useLocation>
+) {
+  return loc1 && loc1.pathname === loc2.pathname && loc1.search === loc2.search;
+}
+
 export function useFilterURL(
   filter: ListFilterModel,
   setFilter: React.Dispatch<React.SetStateAction<ListFilterModel>>,
@@ -49,7 +56,7 @@ export function useFilterURL(
   useEffect(() => {
     // don't apply if active is false
     // also don't apply if location is unchanged
-    if (!active || prevLocation === location) return;
+    if (!active || locationEquals(prevLocation, location)) return;
 
     // re-init to load default filter on empty new query params
     if (!location.search) {

From 299e1ac1f9f5226ae6788a7ddcba968be7743cbf Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Fri, 31 Oct 2025 14:29:01 +1100
Subject: [PATCH 092/405] Scene list toolbar style update (#6215)

* Add saved filter button to toolbar
* Rearrange and add portal target
* Only overlap sidebar on sm viewports
* Hide dropdown button on smaller viewports when sidebar open
* Center operations during selection
* Restyle results header
* Add classname for sidebar pane content
* Move sidebar toggle to left during scene selection
---
 .../components/List/ListOperationButtons.tsx  |  14 +-
 .../src/components/List/ListResultsHeader.tsx |  19 +--
 ui/v2.5/src/components/List/ListToolbar.tsx   |  65 +++++---
 .../src/components/List/SavedFilterList.tsx   |  18 ++-
 ui/v2.5/src/components/List/styles.scss       | 140 +++++++++++++++---
 ui/v2.5/src/components/Scenes/SceneList.tsx   |  44 ++++--
 ui/v2.5/src/components/Shared/Sidebar.tsx     |   9 +-
 ui/v2.5/src/components/Shared/styles.scss     |   8 +-
 8 files changed, 235 insertions(+), 82 deletions(-)

diff --git a/ui/v2.5/src/components/List/ListOperationButtons.tsx b/ui/v2.5/src/components/List/ListOperationButtons.tsx
index 6bb31339a..bdb87fa3f 100644
--- a/ui/v2.5/src/components/List/ListOperationButtons.tsx
+++ b/ui/v2.5/src/components/List/ListOperationButtons.tsx
@@ -16,22 +16,28 @@ import {
   faTrash,
 } from "@fortawesome/free-solid-svg-icons";
 import cx from "classnames";
+import { createPortal } from "react-dom";
 
 export const OperationDropdown: React.FC<
   PropsWithChildren<{
     className?: string;
+    menuPortalTarget?: HTMLElement;
   }>
-> = ({ className, children }) => {
+> = ({ className, menuPortalTarget, children }) => {
   if (!children) return null;
 
+  const menu = (
+    <Dropdown.Menu className="bg-secondary text-white">
+      {children}
+    </Dropdown.Menu>
+  );
+
   return (
     <Dropdown className={className} as={ButtonGroup}>
       <Dropdown.Toggle variant="secondary" id="more-menu">
         <Icon icon={faEllipsisH} />
       </Dropdown.Toggle>
-      <Dropdown.Menu className="bg-secondary text-white">
-        {children}
-      </Dropdown.Menu>
+      {menuPortalTarget ? createPortal(menu, menuPortalTarget) : menu}
     </Dropdown>
   );
 };
diff --git a/ui/v2.5/src/components/List/ListResultsHeader.tsx b/ui/v2.5/src/components/List/ListResultsHeader.tsx
index 091317ec8..a2583c2e1 100644
--- a/ui/v2.5/src/components/List/ListResultsHeader.tsx
+++ b/ui/v2.5/src/components/List/ListResultsHeader.tsx
@@ -23,15 +23,6 @@ export const ListResultsHeader: React.FC<{
 }) => {
   return (
     <ButtonToolbar className={cx(className, "list-results-header")}>
-      <div>
-        <PaginationIndex
-          loading={loading}
-          itemsPerPage={filter.itemsPerPage}
-          currentPage={filter.currentPage}
-          totalItems={totalCount}
-          metadataByline={metadataByline}
-        />
-      </div>
       <div>
         <SortBySelect
           options={filter.options.sortByOptions}
@@ -61,6 +52,16 @@ export const ListResultsHeader: React.FC<{
           onSetZoom={(zoom) => onChangeFilter(filter.setZoom(zoom))}
         />
       </div>
+      <div className="pagination-index-container">
+        <PaginationIndex
+          loading={loading}
+          itemsPerPage={filter.itemsPerPage}
+          currentPage={filter.currentPage}
+          totalItems={totalCount}
+          metadataByline={metadataByline}
+        />
+      </div>
+      <div className="empty-space"></div>
     </ButtonToolbar>
   );
 };
diff --git a/ui/v2.5/src/components/List/ListToolbar.tsx b/ui/v2.5/src/components/List/ListToolbar.tsx
index 31ef7f7ee..25ee281c0 100644
--- a/ui/v2.5/src/components/List/ListToolbar.tsx
+++ b/ui/v2.5/src/components/List/ListToolbar.tsx
@@ -4,13 +4,15 @@ import { ListFilterModel } from "src/models/list-filter/filter";
 import { faTimes } from "@fortawesome/free-solid-svg-icons";
 import { FilterTags } from "../List/FilterTags";
 import cx from "classnames";
-import { Button, ButtonToolbar } from "react-bootstrap";
+import { Button, ButtonGroup, ButtonToolbar } from "react-bootstrap";
 import { FilterButton } from "../List/Filters/FilterButton";
 import { Icon } from "../Shared/Icon";
 import { SearchTermInput } from "../List/ListFilter";
 import { Criterion } from "src/models/list-filter/criteria/criterion";
 import { SidebarToggleButton } from "../Shared/Sidebar";
 import { PatchComponent } from "src/patch";
+import { SavedFilterDropdown } from "./SavedFilterList";
+import { View } from "./views";
 
 export const ToolbarFilterSection: React.FC<{
   filter: ListFilterModel;
@@ -21,6 +23,7 @@ export const ToolbarFilterSection: React.FC<{
   onRemoveAllCriterion: () => void;
   onEditSearchTerm: () => void;
   onRemoveSearchTerm: () => void;
+  view?: View;
 }> = PatchComponent(
   "ToolbarFilterSection",
   ({
@@ -32,6 +35,7 @@ export const ToolbarFilterSection: React.FC<{
     onRemoveAllCriterion,
     onEditSearchTerm,
     onRemoveSearchTerm,
+    view,
   }) => {
     const { criteria, searchTerm } = filter;
 
@@ -41,10 +45,19 @@ export const ToolbarFilterSection: React.FC<{
           <SearchTermInput filter={filter} onFilterUpdate={onSetFilter} />
         </div>
         <div className="filter-section">
-          <FilterButton
-            onClick={() => onEditCriterion()}
-            count={criteria.length}
-          />
+          <ButtonGroup>
+            <SidebarToggleButton onClick={onToggleSidebar} />
+            <SavedFilterDropdown
+              filter={filter}
+              onSetFilter={onSetFilter}
+              view={view}
+              menuPortalTarget={document.body}
+            />
+            <FilterButton
+              onClick={() => onEditCriterion()}
+              count={criteria.length}
+            />
+          </ButtonGroup>
           <FilterTags
             searchTerm={searchTerm}
             criteria={criteria}
@@ -55,7 +68,6 @@ export const ToolbarFilterSection: React.FC<{
             onRemoveSearchTerm={onRemoveSearchTerm}
             truncateOnOverflow
           />
-          <SidebarToggleButton onClick={onToggleSidebar} />
         </div>
       </>
     );
@@ -65,28 +77,33 @@ export const ToolbarFilterSection: React.FC<{
 export const ToolbarSelectionSection: React.FC<{
   selected: number;
   onToggleSidebar: () => void;
+  operations?: React.ReactNode;
   onSelectAll: () => void;
   onSelectNone: () => void;
 }> = PatchComponent(
   "ToolbarSelectionSection",
-  ({ selected, onToggleSidebar, onSelectAll, onSelectNone }) => {
+  ({ selected, onToggleSidebar, operations, onSelectAll, onSelectNone }) => {
     const intl = useIntl();
 
     return (
-      <div className="selected-items-info">
-        <Button
-          variant="secondary"
-          className="minimal"
-          onClick={() => onSelectNone()}
-          title={intl.formatMessage({ id: "actions.select_none" })}
-        >
-          <Icon icon={faTimes} />
-        </Button>
-        <span>{selected} selected</span>
-        <Button variant="link" onClick={() => onSelectAll()}>
-          <FormattedMessage id="actions.select_all" />
-        </Button>
-        <SidebarToggleButton onClick={onToggleSidebar} />
+      <div className="toolbar-selection-section">
+        <div className="selected-items-info">
+          <SidebarToggleButton onClick={onToggleSidebar} />
+          <Button
+            variant="secondary"
+            className="minimal"
+            onClick={() => onSelectNone()}
+            title={intl.formatMessage({ id: "actions.select_none" })}
+          >
+            <Icon icon={faTimes} />
+          </Button>
+          <span>{selected} selected</span>
+          <Button variant="link" onClick={() => onSelectAll()}>
+            <FormattedMessage id="actions.select_all" />
+          </Button>
+        </div>
+        {operations}
+        <div className="empty-space" />
       </div>
     );
   }
@@ -114,7 +131,11 @@ export const FilteredListToolbar2: React.FC<{
       })}
     >
       {!hasSelection ? filterSection : selectionSection}
-      <div className="filtered-list-toolbar-operations">{operationSection}</div>
+      {!hasSelection ? (
+        <div className="filtered-list-toolbar-operations">
+          {operationSection}
+        </div>
+      ) : null}
     </ButtonToolbar>
   );
 };
diff --git a/ui/v2.5/src/components/List/SavedFilterList.tsx b/ui/v2.5/src/components/List/SavedFilterList.tsx
index 7e03404d2..83c6d8a65 100644
--- a/ui/v2.5/src/components/List/SavedFilterList.tsx
+++ b/ui/v2.5/src/components/List/SavedFilterList.tsx
@@ -31,6 +31,7 @@ import { AlertModal } from "../Shared/Alert";
 import cx from "classnames";
 import { TruncatedInlineText } from "../Shared/TruncatedText";
 import { OperationButton } from "../Shared/OperationButton";
+import { createPortal } from "react-dom";
 
 const ExistingSavedFilterList: React.FC<{
   name: string;
@@ -243,6 +244,7 @@ interface ISavedFilterListProps {
   filter: ListFilterModel;
   onSetFilter: (f: ListFilterModel) => void;
   view?: View;
+  menuPortalTarget?: Element | DocumentFragment;
 }
 
 export const SavedFilterList: React.FC<ISavedFilterListProps> = ({
@@ -841,8 +843,15 @@ export const SavedFilterDropdown: React.FC<ISavedFilterListProps> = (props) => {
   ));
   SavedFilterDropdownRef.displayName = "SavedFilterDropdown";
 
+  const menu = (
+    <Dropdown.Menu
+      as={SavedFilterDropdownRef}
+      className="saved-filter-list-menu"
+    />
+  );
+
   return (
-    <Dropdown as={ButtonGroup}>
+    <Dropdown as={ButtonGroup} className="saved-filter-dropdown">
       <OverlayTrigger
         placement="top"
         overlay={
@@ -855,10 +864,9 @@ export const SavedFilterDropdown: React.FC<ISavedFilterListProps> = (props) => {
           <Icon icon={faBookmark} />
         </Dropdown.Toggle>
       </OverlayTrigger>
-      <Dropdown.Menu
-        as={SavedFilterDropdownRef}
-        className="saved-filter-list-menu"
-      />
+      {props.menuPortalTarget
+        ? createPortal(menu, props.menuPortalTarget)
+        : menu}
     </Dropdown>
   );
 };
diff --git a/ui/v2.5/src/components/List/styles.scss b/ui/v2.5/src/components/List/styles.scss
index c42c43a56..aba1f39df 100644
--- a/ui/v2.5/src/components/List/styles.scss
+++ b/ui/v2.5/src/components/List/styles.scss
@@ -1055,7 +1055,7 @@ input[type="range"].zoom-slider {
 }
 
 // hide sidebar Edit Filter button on larger screens
-@include media-breakpoint-up(lg) {
+@include media-breakpoint-up(md) {
   .sidebar .edit-filter-button {
     display: none;
   }
@@ -1071,6 +1071,7 @@ input[type="range"].zoom-slider {
     display: flex;
     flex-wrap: wrap;
     justify-content: space-between;
+    margin-bottom: 0;
     row-gap: 1rem;
 
     > div {
@@ -1101,10 +1102,6 @@ input[type="range"].zoom-slider {
       top: 0;
     }
 
-    .selected-items-info .btn {
-      margin-right: 0.5rem;
-    }
-
     // hide drop down menu items for play and create new
     // when the buttons are visible
     @include media-breakpoint-up(sm) {
@@ -1125,7 +1122,7 @@ input[type="range"].zoom-slider {
       }
     }
 
-    .selected-items-info,
+    .toolbar-selection-section,
     div.filter-section {
       border: 1px solid $secondary;
       border-radius: 0.25rem;
@@ -1133,13 +1130,69 @@ input[type="range"].zoom-slider {
       overflow-x: hidden;
     }
 
-    .sidebar-toggle-button {
-      margin-left: auto;
+    div.toolbar-selection-section {
+      display: flex;
+      flex-direction: row;
+      flex-wrap: nowrap;
+      justify-content: center;
+
+      .sidebar-toggle-button {
+        margin-right: 0.5rem;
+      }
+
+      .selected-items-info {
+        align-items: center;
+        display: flex;
+      }
+
+      > div:first-child,
+      > div:last-child {
+        flex: 1;
+      }
+
+      > div:last-child {
+        display: flex;
+        justify-content: flex-end;
+      }
+
+      .scene-list-operations {
+        display: flex;
+      }
+
+      // on smaller viewports move the operation buttons to the right
+      @include media-breakpoint-down(md) {
+        div.scene-list-operations {
+          flex: 1;
+          justify-content: flex-end;
+          order: 3;
+        }
+
+        > div:last-child {
+          flex: 0;
+          order: 2;
+        }
+      }
+    }
+
+    // on larger viewports, move the operation buttons to the center
+    @include media-breakpoint-up(lg) {
+      div.toolbar-selection-section div.scene-list-operations {
+        justify-content: center;
+
+        > .btn-group {
+          gap: 0.5rem;
+        }
+      }
+
+      div.toolbar-selection-section .empty-space {
+        flex: 1;
+        order: 3;
+      }
     }
 
     .search-container {
       border-right: 1px solid $secondary;
-      display: block;
+      display: flex;
       margin-right: -0.5rem;
       min-width: calc($sidebar-width - 15px);
       padding-right: 10px;
@@ -1175,21 +1228,27 @@ input[type="range"].zoom-slider {
   }
 }
 
-@include media-breakpoint-up(xl) {
+// hide the search box in the toolbar when sidebar is shown on larger screens
+// larger screens don't overlap the sidebar
+@include media-breakpoint-up(md) {
   .sidebar-pane:not(.hide-sidebar) .filtered-list-toolbar .search-container {
     display: none;
   }
 }
+// hide the search box when sidebar is hidden on smaller screens
 @include media-breakpoint-down(md) {
   .sidebar-pane.hide-sidebar .filtered-list-toolbar .search-container {
     display: none;
   }
 }
 
-// hide the filter icon button when sidebar is shown on smaller screens
-@include media-breakpoint-down(md) {
-  .sidebar-pane:not(.hide-sidebar) .filtered-list-toolbar .filter-button {
-    display: none;
+// hide the filter and saved filters icon buttons when sidebar is shown on smaller screens
+@include media-breakpoint-down(sm) {
+  .sidebar-pane:not(.hide-sidebar) .filtered-list-toolbar {
+    .filter-button,
+    .saved-filter-dropdown {
+      display: none;
+    }
   }
 
   // adjust the width of the filter-tags as well
@@ -1198,8 +1257,8 @@ input[type="range"].zoom-slider {
   }
 }
 
-// move the sidebar toggle to the left on xl viewports
-@include media-breakpoint-up(xl) {
+// move the sidebar toggle to the left on larger viewports
+@include media-breakpoint-up(md) {
   .filtered-list-toolbar .filter-section {
     .sidebar-toggle-button {
       margin-left: 0;
@@ -1249,14 +1308,18 @@ input[type="range"].zoom-slider {
   align-items: center;
   background-color: $body-bg;
   display: flex;
-  justify-content: space-between;
 
   > div {
     align-items: center;
     display: flex;
+    flex: 1;
     gap: 0.5rem;
     justify-content: flex-start;
 
+    &.pagination-index-container {
+      justify-content: center;
+    }
+
     &:last-child {
       flex-shrink: 0;
       justify-content: flex-end;
@@ -1265,18 +1328,55 @@ input[type="range"].zoom-slider {
 }
 
 .list-results-header {
-  flex-wrap: wrap-reverse;
-  gap: 0.5rem;
+  gap: 0.25rem;
   margin-bottom: 0.5rem;
 
   .paginationIndex {
     margin: 0;
   }
 
+  // move pagination info to right on medium screens
+  @include media-breakpoint-down(md) {
+    & > .empty-space {
+      flex: 0;
+    }
+
+    & > div.pagination-index-container {
+      justify-content: flex-end;
+      order: 3;
+    }
+  }
+
   // center the header on smaller screens
   @include media-breakpoint-down(sm) {
     & > div,
-    & > div:last-child {
+    & > div.pagination-index-container {
+      flex-basis: 100%;
+      justify-content: center;
+      margin-left: auto;
+      margin-right: auto;
+    }
+  }
+}
+
+// sidebar visible styling
+.sidebar-pane:not(.hide-sidebar) .list-results-header {
+  // move pagination info to right on medium screens when sidebar
+  @include media-breakpoint-down(lg) {
+    & > .empty-space {
+      flex: 0;
+    }
+
+    & > div.pagination-index-container {
+      justify-content: flex-end;
+      order: 3;
+    }
+  }
+
+  // center the header on smaller screens when sidebar is visible
+  @include media-breakpoint-down(md) {
+    & > div,
+    & > div.pagination-index-container {
       flex-basis: 100%;
       justify-content: center;
       margin-left: auto;
diff --git a/ui/v2.5/src/components/Scenes/SceneList.tsx b/ui/v2.5/src/components/Scenes/SceneList.tsx
index 982a11fed..f9257c9ad 100644
--- a/ui/v2.5/src/components/Scenes/SceneList.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneList.tsx
@@ -37,7 +37,12 @@ import {
   OperationDropdownItem,
 } from "../List/ListOperationButtons";
 import { useFilteredItemList } from "../List/ItemList";
-import { Sidebar, SidebarPane, useSidebarState } from "../Shared/Sidebar";
+import {
+  Sidebar,
+  SidebarPane,
+  SidebarPaneContent,
+  useSidebarState,
+} from "../Shared/Sidebar";
 import { SidebarPerformersFilter } from "../List/Filters/PerformersFilter";
 import { SidebarStudiosFilter } from "../List/Filters/StudiosFilter";
 import { PerformersCriterionOption } from "src/models/list-filter/criteria/performers";
@@ -355,7 +360,7 @@ const SceneListOperations: React.FC<{
   const intl = useIntl();
 
   return (
-    <div>
+    <div className="scene-list-operations">
       <ButtonGroup>
         {!!items && (
           <Button
@@ -396,7 +401,10 @@ const SceneListOperations: React.FC<{
           </>
         )}
 
-        <OperationDropdown className="scene-list-operations">
+        <OperationDropdown
+          className="scene-list-operations"
+          menuPortalTarget={document.body}
+        >
           {operations.map((o) => {
             if (o.isDisplayed && !o.isDisplayed()) {
               return null;
@@ -666,6 +674,18 @@ export const FilteredSceneList = (props: IFilteredScenes) => {
   // render
   if (filterLoading || sidebarStateLoading) return null;
 
+  const operations = (
+    <SceneListOperations
+      items={items.length}
+      hasSelection={hasSelection}
+      operations={otherOperations}
+      onEdit={onEdit}
+      onDelete={onDelete}
+      onPlay={onPlay}
+      onCreateNew={onCreateNew}
+    />
+  );
+
   return (
     <TaggerContext>
       <div
@@ -689,7 +709,7 @@ export const FilteredSceneList = (props: IFilteredScenes) => {
               focus={searchFocus}
             />
           </Sidebar>
-          <div>
+          <SidebarPaneContent>
             <FilteredListToolbar2
               className="scene-list-toolbar"
               hasSelection={hasSelection}
@@ -708,6 +728,7 @@ export const FilteredSceneList = (props: IFilteredScenes) => {
                     setSearchFocus(true);
                   }}
                   onRemoveSearchTerm={() => setFilter(filter.clearSearchTerm())}
+                  view={view}
                 />
               }
               selectionSection={
@@ -716,19 +737,10 @@ export const FilteredSceneList = (props: IFilteredScenes) => {
                   onToggleSidebar={() => setShowSidebar(!showSidebar)}
                   onSelectAll={() => onSelectAll()}
                   onSelectNone={() => onSelectNone()}
+                  operations={operations}
                 />
               }
-              operationSection={
-                <SceneListOperations
-                  items={items.length}
-                  hasSelection={hasSelection}
-                  operations={otherOperations}
-                  onEdit={onEdit}
-                  onDelete={onDelete}
-                  onPlay={onPlay}
-                  onCreateNew={onCreateNew}
-                />
-              }
+              operationSection={operations}
             />
 
             <ListResultsHeader
@@ -761,7 +773,7 @@ export const FilteredSceneList = (props: IFilteredScenes) => {
                 />
               </div>
             )}
-          </div>
+          </SidebarPaneContent>
         </SidebarPane>
       </div>
     </TaggerContext>
diff --git a/ui/v2.5/src/components/Shared/Sidebar.tsx b/ui/v2.5/src/components/Shared/Sidebar.tsx
index 52f9328f0..2fe0c48af 100644
--- a/ui/v2.5/src/components/Shared/Sidebar.tsx
+++ b/ui/v2.5/src/components/Shared/Sidebar.tsx
@@ -16,7 +16,8 @@ import { useIntl } from "react-intl";
 import { Icon } from "./Icon";
 import { faSliders } from "@fortawesome/free-solid-svg-icons";
 
-const fixedSidebarMediaQuery = "only screen and (max-width: 1199px)";
+// this needs to correspond to the CSS media query that overlaps the sidebar over content
+const fixedSidebarMediaQuery = "only screen and (max-width: 767px)";
 
 export const Sidebar: React.FC<
   PropsWithChildren<{
@@ -56,6 +57,10 @@ export const SidebarPane: React.FC<
   );
 };
 
+export const SidebarPaneContent: React.FC = ({ children }) => {
+  return <div className="sidebar-pane-content">{children}</div>;
+};
+
 export const SidebarSection: React.FC<
   PropsWithChildren<{
     text: React.ReactNode;
@@ -87,7 +92,7 @@ export const SidebarToggleButton: React.FC<{
   const intl = useIntl();
   return (
     <Button
-      className="minimal sidebar-toggle-button ignore-sidebar-outside-click"
+      className="sidebar-toggle-button ignore-sidebar-outside-click"
       variant="secondary"
       onClick={onClick}
       title={intl.formatMessage({ id: "actions.sidebar.toggle" })}
diff --git a/ui/v2.5/src/components/Shared/styles.scss b/ui/v2.5/src/components/Shared/styles.scss
index 6ccef5aaf..faaa00c53 100644
--- a/ui/v2.5/src/components/Shared/styles.scss
+++ b/ui/v2.5/src/components/Shared/styles.scss
@@ -805,7 +805,7 @@ button.btn.favorite-button {
     }
   }
 
-  @include media-breakpoint-up(xl) {
+  @include media-breakpoint-up(md) {
     transition: margin-left 0.1s;
 
     &:not(.hide-sidebar) {
@@ -910,12 +910,12 @@ $sticky-header-height: calc(50px + 3.3rem);
   }
 
   // on smaller viewports we want the sidebar to overlap content
-  @include media-breakpoint-down(lg) {
+  @include media-breakpoint-down(sm) {
     .sidebar-pane:not(.hide-sidebar) .sidebar {
       margin-right: -$sidebar-width;
     }
 
-    .sidebar-pane > :nth-child(2) {
+    .sidebar-pane > .sidebar-pane-content {
       transition: none;
     }
   }
@@ -935,7 +935,7 @@ $sticky-header-height: calc(50px + 3.3rem);
       display: none;
     }
   }
-  @include media-breakpoint-up(xl) {
+  @include media-breakpoint-up(md) {
     .sidebar-pane:not(.hide-sidebar) {
       > :nth-child(2) {
         margin-left: 0;

From 336fa3b70e5836ae31b26d6ff72edea329de6c4a Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Fri, 31 Oct 2025 15:21:43 +1100
Subject: [PATCH 093/405] Save sidebar state (#6217)

* Save sidebar section open state in browser history state

This means that state is saved when going back, but not when navigating to the scenes page from elsewhere.
---
 .../components/List/Filters/BooleanFilter.tsx |   3 +
 .../components/List/Filters/FilterSidebar.tsx |   3 +
 .../List/Filters/PerformersFilter.tsx         |   5 +-
 .../components/List/Filters/RatingFilter.tsx  |   3 +
 .../List/Filters/SidebarListFilter.tsx        |   7 +-
 .../components/List/Filters/StudiosFilter.tsx |   5 +-
 .../components/List/Filters/TagsFilter.tsx    |   5 +-
 ui/v2.5/src/components/Scenes/SceneList.tsx   | 166 ++++++++++--------
 .../src/components/Shared/CollapseButton.tsx  |  17 +-
 ui/v2.5/src/components/Shared/Sidebar.tsx     |  64 ++++++-
 10 files changed, 182 insertions(+), 96 deletions(-)

diff --git a/ui/v2.5/src/components/List/Filters/BooleanFilter.tsx b/ui/v2.5/src/components/List/Filters/BooleanFilter.tsx
index 18df1b9f1..657e9ddbd 100644
--- a/ui/v2.5/src/components/List/Filters/BooleanFilter.tsx
+++ b/ui/v2.5/src/components/List/Filters/BooleanFilter.tsx
@@ -54,6 +54,7 @@ interface ISidebarFilter {
   option: CriterionOption;
   filter: ListFilterModel;
   setFilter: (f: ListFilterModel) => void;
+  sectionID?: string;
 }
 
 export const SidebarBooleanFilter: React.FC<ISidebarFilter> = ({
@@ -61,6 +62,7 @@ export const SidebarBooleanFilter: React.FC<ISidebarFilter> = ({
   option,
   filter,
   setFilter,
+  sectionID,
 }) => {
   const intl = useIntl();
 
@@ -127,6 +129,7 @@ export const SidebarBooleanFilter: React.FC<ISidebarFilter> = ({
         onUnselect={onUnselect}
         selected={selected}
         singleValue
+        sectionID={sectionID}
       />
     </>
   );
diff --git a/ui/v2.5/src/components/List/Filters/FilterSidebar.tsx b/ui/v2.5/src/components/List/Filters/FilterSidebar.tsx
index 1623c83d7..6b6503993 100644
--- a/ui/v2.5/src/components/List/Filters/FilterSidebar.tsx
+++ b/ui/v2.5/src/components/List/Filters/FilterSidebar.tsx
@@ -10,6 +10,8 @@ import ScreenUtils from "src/utils/screen";
 import Mousetrap from "mousetrap";
 import { Button } from "react-bootstrap";
 
+const savedFiltersSectionID = "saved-filters";
+
 export const FilteredSidebarHeader: React.FC<{
   sidebarOpen: boolean;
   showEditFilter: () => void;
@@ -60,6 +62,7 @@ export const FilteredSidebarHeader: React.FC<{
       <SidebarSection
         className="sidebar-saved-filters"
         text={<FormattedMessage id="search_filter.saved_filters" />}
+        sectionID={savedFiltersSectionID}
       >
         <SidebarSavedFilterList
           filter={filter}
diff --git a/ui/v2.5/src/components/List/Filters/PerformersFilter.tsx b/ui/v2.5/src/components/List/Filters/PerformersFilter.tsx
index 79ad18c1b..3df19593f 100644
--- a/ui/v2.5/src/components/List/Filters/PerformersFilter.tsx
+++ b/ui/v2.5/src/components/List/Filters/PerformersFilter.tsx
@@ -110,7 +110,8 @@ export const SidebarPerformersFilter: React.FC<{
   filter: ListFilterModel;
   setFilter: (f: ListFilterModel) => void;
   filterHook?: (f: ListFilterModel) => ListFilterModel;
-}> = ({ title, option, filter, setFilter, filterHook }) => {
+  sectionID?: string;
+}> = ({ title, option, filter, setFilter, filterHook, sectionID }) => {
   const state = useLabeledIdFilterState({
     filter,
     setFilter,
@@ -119,7 +120,7 @@ export const SidebarPerformersFilter: React.FC<{
     useQuery: usePerformerQueryFilter,
   });
 
-  return <SidebarListFilter {...state} title={title} />;
+  return <SidebarListFilter {...state} title={title} sectionID={sectionID} />;
 };
 
 export default PerformersFilter;
diff --git a/ui/v2.5/src/components/List/Filters/RatingFilter.tsx b/ui/v2.5/src/components/List/Filters/RatingFilter.tsx
index 86d6a905b..1a0f14452 100644
--- a/ui/v2.5/src/components/List/Filters/RatingFilter.tsx
+++ b/ui/v2.5/src/components/List/Filters/RatingFilter.tsx
@@ -77,6 +77,7 @@ interface ISidebarFilter {
   option: CriterionOption;
   filter: ListFilterModel;
   setFilter: (f: ListFilterModel) => void;
+  sectionID?: string;
 }
 
 const any = "any";
@@ -87,6 +88,7 @@ export const SidebarRatingFilter: React.FC<ISidebarFilter> = ({
   option,
   filter,
   setFilter,
+  sectionID,
 }) => {
   const intl = useIntl();
 
@@ -199,6 +201,7 @@ export const SidebarRatingFilter: React.FC<ISidebarFilter> = ({
         singleValue
         preCandidates={ratingValue === null ? ratingStars : undefined}
         preSelected={ratingValue !== null ? ratingStars : undefined}
+        sectionID={sectionID}
       />
       <div></div>
     </>
diff --git a/ui/v2.5/src/components/List/Filters/SidebarListFilter.tsx b/ui/v2.5/src/components/List/Filters/SidebarListFilter.tsx
index 71a56f23d..6754787db 100644
--- a/ui/v2.5/src/components/List/Filters/SidebarListFilter.tsx
+++ b/ui/v2.5/src/components/List/Filters/SidebarListFilter.tsx
@@ -275,7 +275,8 @@ export const SidebarListFilter: React.FC<{
   postSelected?: React.ReactNode;
   preCandidates?: React.ReactNode;
   postCandidates?: React.ReactNode;
-  onOpen?: () => void;
+  // used to store open/closed state in SidebarStateContext
+  sectionID?: string;
 }> = ({
   title,
   selected,
@@ -291,7 +292,7 @@ export const SidebarListFilter: React.FC<{
   postCandidates,
   preSelected,
   postSelected,
-  onOpen,
+  sectionID,
 }) => {
   // TODO - sort items?
 
@@ -325,6 +326,7 @@ export const SidebarListFilter: React.FC<{
     <SidebarSection
       className="sidebar-list-filter"
       text={title}
+      sectionID={sectionID}
       outsideCollapse={
         <>
           {preSelected ? <div className="extra">{preSelected}</div> : null}
@@ -342,7 +344,6 @@ export const SidebarListFilter: React.FC<{
           {postSelected ? <div className="extra">{postSelected}</div> : null}
         </>
       }
-      onOpen={onOpen}
     >
       {preCandidates ? <div className="extra">{preCandidates}</div> : null}
       <CandidateList
diff --git a/ui/v2.5/src/components/List/Filters/StudiosFilter.tsx b/ui/v2.5/src/components/List/Filters/StudiosFilter.tsx
index 9065f2452..e922e688a 100644
--- a/ui/v2.5/src/components/List/Filters/StudiosFilter.tsx
+++ b/ui/v2.5/src/components/List/Filters/StudiosFilter.tsx
@@ -98,7 +98,8 @@ export const SidebarStudiosFilter: React.FC<{
   filter: ListFilterModel;
   setFilter: (f: ListFilterModel) => void;
   filterHook?: (f: ListFilterModel) => ListFilterModel;
-}> = ({ title, option, filter, setFilter, filterHook }) => {
+  sectionID?: string;
+}> = ({ title, option, filter, setFilter, filterHook, sectionID }) => {
   const state = useLabeledIdFilterState({
     filter,
     setFilter,
@@ -110,7 +111,7 @@ export const SidebarStudiosFilter: React.FC<{
     includeSubMessageID: "subsidiary_studios",
   });
 
-  return <SidebarListFilter {...state} title={title} />;
+  return <SidebarListFilter {...state} title={title} sectionID={sectionID} />;
 };
 
 export default StudiosFilter;
diff --git a/ui/v2.5/src/components/List/Filters/TagsFilter.tsx b/ui/v2.5/src/components/List/Filters/TagsFilter.tsx
index e8e25db56..f4c618ffa 100644
--- a/ui/v2.5/src/components/List/Filters/TagsFilter.tsx
+++ b/ui/v2.5/src/components/List/Filters/TagsFilter.tsx
@@ -103,7 +103,8 @@ export const SidebarTagsFilter: React.FC<{
   filter: ListFilterModel;
   setFilter: (f: ListFilterModel) => void;
   filterHook?: (f: ListFilterModel) => ListFilterModel;
-}> = ({ title, option, filter, setFilter, filterHook }) => {
+  sectionID?: string;
+}> = ({ title, option, filter, setFilter, filterHook, sectionID }) => {
   const state = useLabeledIdFilterState({
     filter,
     setFilter,
@@ -114,7 +115,7 @@ export const SidebarTagsFilter: React.FC<{
     includeSubMessageID: "sub_tags",
   });
 
-  return <SidebarListFilter {...state} title={title} />;
+  return <SidebarListFilter {...state} title={title} sectionID={sectionID} />;
 };
 
 export default TagsFilter;
diff --git a/ui/v2.5/src/components/Scenes/SceneList.tsx b/ui/v2.5/src/components/Scenes/SceneList.tsx
index f9257c9ad..3936be6f2 100644
--- a/ui/v2.5/src/components/Scenes/SceneList.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneList.tsx
@@ -41,6 +41,7 @@ import {
   Sidebar,
   SidebarPane,
   SidebarPaneContent,
+  SidebarStateContext,
   useSidebarState,
 } from "../Shared/Sidebar";
 import { SidebarPerformersFilter } from "../List/Filters/PerformersFilter";
@@ -290,6 +291,7 @@ const SidebarContent: React.FC<{
             filter={filter}
             setFilter={setFilter}
             filterHook={filterHook}
+            sectionID="studios"
           />
         )}
         <SidebarPerformersFilter
@@ -299,6 +301,7 @@ const SidebarContent: React.FC<{
           filter={filter}
           setFilter={setFilter}
           filterHook={filterHook}
+          sectionID="performers"
         />
         <SidebarTagsFilter
           title={<FormattedMessage id="tags" />}
@@ -307,6 +310,7 @@ const SidebarContent: React.FC<{
           filter={filter}
           setFilter={setFilter}
           filterHook={filterHook}
+          sectionID="tags"
         />
         <SidebarRatingFilter
           title={<FormattedMessage id="rating" />}
@@ -314,6 +318,7 @@ const SidebarContent: React.FC<{
           option={RatingCriterionOption}
           filter={filter}
           setFilter={setFilter}
+          sectionID="rating"
         />
         <SidebarBooleanFilter
           title={<FormattedMessage id="organized" />}
@@ -321,6 +326,7 @@ const SidebarContent: React.FC<{
           option={OrganizedCriterionOption}
           filter={filter}
           setFilter={setFilter}
+          sectionID="organized"
         />
       </ScenesFilterSidebarSections>
 
@@ -447,6 +453,8 @@ export const FilteredSceneList = (props: IFilteredScenes) => {
     showSidebar,
     setShowSidebar,
     loading: sidebarStateLoading,
+    sectionOpen,
+    setSectionOpen,
   } = useSidebarState(view);
 
   const { filterState, queryResult, modalState, listSelect, showEditFilter } =
@@ -695,86 +703,90 @@ export const FilteredSceneList = (props: IFilteredScenes) => {
       >
         {modal}
 
-        <SidebarPane hideSidebar={!showSidebar}>
-          <Sidebar hide={!showSidebar} onHide={() => setShowSidebar(false)}>
-            <SidebarContent
-              filter={filter}
-              setFilter={setFilter}
-              filterHook={filterHook}
-              showEditFilter={showEditFilter}
-              view={view}
-              sidebarOpen={showSidebar}
-              onClose={() => setShowSidebar(false)}
-              count={cachedResult.loading ? undefined : totalCount}
-              focus={searchFocus}
-            />
-          </Sidebar>
-          <SidebarPaneContent>
-            <FilteredListToolbar2
-              className="scene-list-toolbar"
-              hasSelection={hasSelection}
-              filterSection={
-                <ToolbarFilterSection
-                  filter={filter}
-                  onSetFilter={setFilter}
-                  onToggleSidebar={() => setShowSidebar(!showSidebar)}
-                  onEditCriterion={(c) =>
-                    showEditFilter(c?.criterionOption.type)
-                  }
-                  onRemoveCriterion={removeCriterion}
-                  onRemoveAllCriterion={() => clearAllCriteria(true)}
-                  onEditSearchTerm={() => {
-                    setShowSidebar(true);
-                    setSearchFocus(true);
-                  }}
-                  onRemoveSearchTerm={() => setFilter(filter.clearSearchTerm())}
-                  view={view}
-                />
-              }
-              selectionSection={
-                <ToolbarSelectionSection
-                  selected={selectedIds.size}
-                  onToggleSidebar={() => setShowSidebar(!showSidebar)}
-                  onSelectAll={() => onSelectAll()}
-                  onSelectNone={() => onSelectNone()}
-                  operations={operations}
-                />
-              }
-              operationSection={operations}
-            />
-
-            <ListResultsHeader
-              loading={cachedResult.loading}
-              filter={filter}
-              totalCount={totalCount}
-              metadataByline={metadataByline}
-              onChangeFilter={(newFilter) => setFilter(newFilter)}
-            />
-
-            <LoadedContent loading={result.loading} error={result.error}>
-              <SceneList
-                filter={effectiveFilter}
-                scenes={items}
-                selectedIds={selectedIds}
-                onSelectChange={onSelectChange}
-                fromGroupId={fromGroupId}
+        <SidebarStateContext.Provider value={{ sectionOpen, setSectionOpen }}>
+          <SidebarPane hideSidebar={!showSidebar}>
+            <Sidebar hide={!showSidebar} onHide={() => setShowSidebar(false)}>
+              <SidebarContent
+                filter={filter}
+                setFilter={setFilter}
+                filterHook={filterHook}
+                showEditFilter={showEditFilter}
+                view={view}
+                sidebarOpen={showSidebar}
+                onClose={() => setShowSidebar(false)}
+                count={cachedResult.loading ? undefined : totalCount}
+                focus={searchFocus}
+              />
+            </Sidebar>
+            <SidebarPaneContent>
+              <FilteredListToolbar2
+                className="scene-list-toolbar"
+                hasSelection={hasSelection}
+                filterSection={
+                  <ToolbarFilterSection
+                    filter={filter}
+                    onSetFilter={setFilter}
+                    onToggleSidebar={() => setShowSidebar(!showSidebar)}
+                    onEditCriterion={(c) =>
+                      showEditFilter(c?.criterionOption.type)
+                    }
+                    onRemoveCriterion={removeCriterion}
+                    onRemoveAllCriterion={() => clearAllCriteria(true)}
+                    onEditSearchTerm={() => {
+                      setShowSidebar(true);
+                      setSearchFocus(true);
+                    }}
+                    onRemoveSearchTerm={() =>
+                      setFilter(filter.clearSearchTerm())
+                    }
+                    view={view}
+                  />
+                }
+                selectionSection={
+                  <ToolbarSelectionSection
+                    selected={selectedIds.size}
+                    onToggleSidebar={() => setShowSidebar(!showSidebar)}
+                    onSelectAll={() => onSelectAll()}
+                    onSelectNone={() => onSelectNone()}
+                    operations={operations}
+                  />
+                }
+                operationSection={operations}
               />
-            </LoadedContent>
 
-            {totalCount > filter.itemsPerPage && (
-              <div className="pagination-footer">
-                <Pagination
-                  itemsPerPage={filter.itemsPerPage}
-                  currentPage={filter.currentPage}
-                  totalItems={totalCount}
-                  metadataByline={metadataByline}
-                  onChangePage={setPage}
-                  pagePopupPlacement="top"
+              <ListResultsHeader
+                loading={cachedResult.loading}
+                filter={filter}
+                totalCount={totalCount}
+                metadataByline={metadataByline}
+                onChangeFilter={(newFilter) => setFilter(newFilter)}
+              />
+
+              <LoadedContent loading={result.loading} error={result.error}>
+                <SceneList
+                  filter={effectiveFilter}
+                  scenes={items}
+                  selectedIds={selectedIds}
+                  onSelectChange={onSelectChange}
+                  fromGroupId={fromGroupId}
                 />
-              </div>
-            )}
-          </SidebarPaneContent>
-        </SidebarPane>
+              </LoadedContent>
+
+              {totalCount > filter.itemsPerPage && (
+                <div className="pagination-footer">
+                  <Pagination
+                    itemsPerPage={filter.itemsPerPage}
+                    currentPage={filter.currentPage}
+                    totalItems={totalCount}
+                    metadataByline={metadataByline}
+                    onChangePage={setPage}
+                    pagePopupPlacement="top"
+                  />
+                </div>
+              )}
+            </SidebarPaneContent>
+          </SidebarPane>
+        </SidebarStateContext.Provider>
       </div>
     </TaggerContext>
   );
diff --git a/ui/v2.5/src/components/Shared/CollapseButton.tsx b/ui/v2.5/src/components/Shared/CollapseButton.tsx
index d0b192162..0d05f6e64 100644
--- a/ui/v2.5/src/components/Shared/CollapseButton.tsx
+++ b/ui/v2.5/src/components/Shared/CollapseButton.tsx
@@ -3,7 +3,7 @@ import {
   faChevronRight,
   faChevronUp,
 } from "@fortawesome/free-solid-svg-icons";
-import React, { useState } from "react";
+import React, { useEffect, useState } from "react";
 import { Button, Collapse, CollapseProps } from "react-bootstrap";
 import { Icon } from "./Icon";
 
@@ -12,22 +12,27 @@ interface IProps {
   text: React.ReactNode;
   collapseProps?: Partial<CollapseProps>;
   outsideCollapse?: React.ReactNode;
-  onOpen?: () => void;
+  onOpenChanged?: (o: boolean) => void;
+  open?: boolean;
 }
 
 export const CollapseButton: React.FC<React.PropsWithChildren<IProps>> = (
   props: React.PropsWithChildren<IProps>
 ) => {
-  const [open, setOpen] = useState(false);
+  const [open, setOpen] = useState(props.open ?? false);
 
   function toggleOpen() {
     const nv = !open;
     setOpen(nv);
-    if (props.onOpen && nv) {
-      props.onOpen();
-    }
+    props.onOpenChanged?.(nv);
   }
 
+  useEffect(() => {
+    if (props.open !== undefined) {
+      setOpen(props.open);
+    }
+  }, [props.open]);
+
   return (
     <div className={props.className}>
       <div className="collapse-header">
diff --git a/ui/v2.5/src/components/Shared/Sidebar.tsx b/ui/v2.5/src/components/Shared/Sidebar.tsx
index 2fe0c48af..0130fe85f 100644
--- a/ui/v2.5/src/components/Shared/Sidebar.tsx
+++ b/ui/v2.5/src/components/Shared/Sidebar.tsx
@@ -15,6 +15,9 @@ import { Button, CollapseProps } from "react-bootstrap";
 import { useIntl } from "react-intl";
 import { Icon } from "./Icon";
 import { faSliders } from "@fortawesome/free-solid-svg-icons";
+import { useHistory } from "react-router-dom";
+
+export type SidebarSectionStates = Record<string, boolean>;
 
 // this needs to correspond to the CSS media query that overlaps the sidebar over content
 const fixedSidebarMediaQuery = "only screen and (max-width: 767px)";
@@ -61,14 +64,35 @@ export const SidebarPaneContent: React.FC = ({ children }) => {
   return <div className="sidebar-pane-content">{children}</div>;
 };
 
+interface IContext {
+  sectionOpen: SidebarSectionStates;
+  setSectionOpen: (section: string, open: boolean) => void;
+}
+
+export const SidebarStateContext = React.createContext<IContext | null>(null);
+
 export const SidebarSection: React.FC<
   PropsWithChildren<{
     text: React.ReactNode;
     className?: string;
     outsideCollapse?: React.ReactNode;
-    onOpen?: () => void;
+    // used to store open/closed state in SidebarStateContext
+    sectionID?: string;
   }>
-> = ({ className = "", text, outsideCollapse, onOpen, children }) => {
+> = ({ className = "", text, outsideCollapse, sectionID = "", children }) => {
+  // this is optional
+  const contextState = React.useContext(SidebarStateContext);
+  const openState =
+    !contextState || !sectionID
+      ? undefined
+      : contextState.sectionOpen[sectionID] ?? undefined;
+
+  function onOpenInternal(open: boolean) {
+    if (contextState && sectionID) {
+      contextState.setSectionOpen(sectionID, open);
+    }
+  }
+
   const collapseProps: Partial<CollapseProps> = {
     mountOnEnter: true,
     unmountOnExit: true,
@@ -79,7 +103,8 @@ export const SidebarSection: React.FC<
       collapseProps={collapseProps}
       text={text}
       outsideCollapse={outsideCollapse}
-      onOpen={onOpen}
+      onOpenChanged={onOpenInternal}
+      open={openState}
     >
       {children}
     </CollapseButton>
@@ -110,6 +135,7 @@ export function defaultShowSidebar() {
 export function useSidebarState(view?: View) {
   const [interfaceLocalForage, setInterfaceLocalForage] =
     useInterfaceLocalForage();
+  const history = useHistory();
 
   const { data: interfaceLocalForageData, loading } = interfaceLocalForage;
 
@@ -118,6 +144,7 @@ export function useSidebarState(view?: View) {
   }, [view, interfaceLocalForageData]);
 
   const [showSidebar, setShowSidebar] = useState<boolean>();
+  const [sectionOpen, setSectionOpen] = useState<SidebarSectionStates>();
 
   // set initial state once loading is done
   useEffect(() => {
@@ -132,7 +159,17 @@ export function useSidebarState(view?: View) {
 
     // only show sidebar by default on large screens
     setShowSidebar(!!viewConfig.showSidebar && defaultShowSidebar());
-  }, [view, loading, showSidebar, viewConfig.showSidebar]);
+    setSectionOpen(
+      (history.location.state as { sectionOpen?: SidebarSectionStates })
+        ?.sectionOpen || {}
+    );
+  }, [
+    view,
+    loading,
+    showSidebar,
+    viewConfig.showSidebar,
+    history.location.state,
+  ]);
 
   const onSetShowSidebar = useCallback(
     (show: boolean | ((prevState: boolean | undefined) => boolean)) => {
@@ -154,9 +191,28 @@ export function useSidebarState(view?: View) {
     [showSidebar, setInterfaceLocalForage, view, viewConfig]
   );
 
+  const onSetSectionOpen = useCallback(
+    (section: string, open: boolean) => {
+      const newSectionOpen = { ...sectionOpen, [section]: open };
+      setSectionOpen(newSectionOpen);
+      if (view === undefined) return;
+
+      history.replace({
+        ...history.location,
+        state: {
+          ...(history.location.state as {}),
+          sectionOpen: newSectionOpen,
+        },
+      });
+    },
+    [sectionOpen, view, history]
+  );
+
   return {
     showSidebar: showSidebar ?? defaultShowSidebar(),
+    sectionOpen: sectionOpen || {},
     setShowSidebar: onSetShowSidebar,
+    setSectionOpen: onSetSectionOpen,
     loading: showSidebar === undefined,
   };
 }

From 1b2b4c52218b25f053e6818fe6f089ffdd50e34e Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Fri, 31 Oct 2025 19:54:35 +1100
Subject: [PATCH 094/405] Fix panic when scraping with unknown field (#6220)

* Fix URL in group scraper causing panic
* Return error instead of panicking on unknown field
---
 pkg/models/model_scraped_item.go |  1 +
 pkg/scraper/mapped.go            | 85 +++++++++++++++++---------------
 pkg/scraper/postprocessing.go    | 30 +++++++++++
 3 files changed, 76 insertions(+), 40 deletions(-)

diff --git a/pkg/models/model_scraped_item.go b/pkg/models/model_scraped_item.go
index 008a05c3d..f7a9d6255 100644
--- a/pkg/models/model_scraped_item.go
+++ b/pkg/models/model_scraped_item.go
@@ -462,6 +462,7 @@ type ScrapedGroup struct {
 	Date     *string        `json:"date"`
 	Rating   *string        `json:"rating"`
 	Director *string        `json:"director"`
+	URL      *string        `json:"url"` // included for backward compatibility
 	URLs     []string       `json:"urls"`
 	Synopsis *string        `json:"synopsis"`
 	Studio   *ScrapedStudio `json:"studio"`
diff --git a/pkg/scraper/mapped.go b/pkg/scraper/mapped.go
index 4b2559334..dcd1af1dd 100644
--- a/pkg/scraper/mapped.go
+++ b/pkg/scraper/mapped.go
@@ -873,50 +873,55 @@ func (r mappedResult) apply(dest interface{}) {
 
 func mapFieldValue(destVal reflect.Value, key string, value interface{}) error {
 	field := destVal.FieldByName(key)
+
+	if !field.IsValid() {
+		return fmt.Errorf("field %s does not exist on %s", key, destVal.Type().Name())
+	}
+
+	if !field.CanSet() {
+		return fmt.Errorf("field %s cannot be set on %s", key, destVal.Type().Name())
+	}
+
 	fieldType := field.Type()
 
-	if field.IsValid() && field.CanSet() {
-		switch v := value.(type) {
-		case string:
-			// if the field is a pointer to a string, then we need to convert the string to a pointer
-			// if the field is a string slice, then we need to convert the string to a slice
-			switch {
-			case fieldType.Kind() == reflect.String:
-				field.SetString(v)
-			case fieldType.Kind() == reflect.Ptr && fieldType.Elem().Kind() == reflect.String:
-				ptr := reflect.New(fieldType.Elem())
-				ptr.Elem().SetString(v)
-				field.Set(ptr)
-			case fieldType.Kind() == reflect.Slice && fieldType.Elem().Kind() == reflect.String:
-				field.Set(reflect.ValueOf([]string{v}))
-			default:
-				return fmt.Errorf("cannot convert %T to %s", value, fieldType)
-			}
-		case []string:
-			// expect the field to be a string slice
-			if fieldType.Kind() == reflect.Slice && fieldType.Elem().Kind() == reflect.String {
-				field.Set(reflect.ValueOf(v))
-			} else {
-				return fmt.Errorf("cannot convert %T to %s", value, fieldType)
-			}
+	switch v := value.(type) {
+	case string:
+		// if the field is a pointer to a string, then we need to convert the string to a pointer
+		// if the field is a string slice, then we need to convert the string to a slice
+		switch {
+		case fieldType.Kind() == reflect.String:
+			field.SetString(v)
+		case fieldType.Kind() == reflect.Ptr && fieldType.Elem().Kind() == reflect.String:
+			ptr := reflect.New(fieldType.Elem())
+			ptr.Elem().SetString(v)
+			field.Set(ptr)
+		case fieldType.Kind() == reflect.Slice && fieldType.Elem().Kind() == reflect.String:
+			field.Set(reflect.ValueOf([]string{v}))
 		default:
-			// fallback to reflection
-			reflectValue := reflect.ValueOf(value)
-			reflectValueType := reflectValue.Type()
-
-			switch {
-			case reflectValueType.ConvertibleTo(fieldType):
-				field.Set(reflectValue.Convert(fieldType))
-			case fieldType.Kind() == reflect.Pointer && reflectValueType.ConvertibleTo(fieldType.Elem()):
-				ptr := reflect.New(fieldType.Elem())
-				ptr.Elem().Set(reflectValue.Convert(fieldType.Elem()))
-				field.Set(ptr)
-			default:
-				return fmt.Errorf("cannot convert %T to %s", value, fieldType)
-			}
+			return fmt.Errorf("cannot convert %T to %s", value, fieldType)
+		}
+	case []string:
+		// expect the field to be a string slice
+		if fieldType.Kind() == reflect.Slice && fieldType.Elem().Kind() == reflect.String {
+			field.Set(reflect.ValueOf(v))
+		} else {
+			return fmt.Errorf("cannot convert %T to %s", value, fieldType)
+		}
+	default:
+		// fallback to reflection
+		reflectValue := reflect.ValueOf(value)
+		reflectValueType := reflectValue.Type()
+
+		switch {
+		case reflectValueType.ConvertibleTo(fieldType):
+			field.Set(reflectValue.Convert(fieldType))
+		case fieldType.Kind() == reflect.Pointer && reflectValueType.ConvertibleTo(fieldType.Elem()):
+			ptr := reflect.New(fieldType.Elem())
+			ptr.Elem().Set(reflectValue.Convert(fieldType.Elem()))
+			field.Set(ptr)
+		default:
+			return fmt.Errorf("cannot convert %T to %s", value, fieldType)
 		}
-	} else {
-		return fmt.Errorf("field does not exist or cannot be set")
 	}
 
 	return nil
diff --git a/pkg/scraper/postprocessing.go b/pkg/scraper/postprocessing.go
index e12c1664f..62aa53c72 100644
--- a/pkg/scraper/postprocessing.go
+++ b/pkg/scraper/postprocessing.go
@@ -143,6 +143,21 @@ func (c Cache) postScrapeMovie(ctx context.Context, m models.ScrapedMovie, exclu
 		return nil, nil, err
 	}
 
+	// populate URL/URLs
+	// if URLs are provided, only use those
+	if len(m.URLs) > 0 {
+		m.URL = &m.URLs[0]
+	} else {
+		urls := []string{}
+		if m.URL != nil {
+			urls = append(urls, *m.URL)
+		}
+
+		if len(urls) > 0 {
+			m.URLs = urls
+		}
+	}
+
 	// post-process - set the image if applicable
 	if err := setMovieFrontImage(ctx, c.client, &m, c.globalConfig); err != nil {
 		logger.Warnf("could not set front image using URL %s: %v", *m.FrontImage, err)
@@ -175,6 +190,21 @@ func (c Cache) postScrapeGroup(ctx context.Context, m models.ScrapedGroup, exclu
 		return nil, nil, err
 	}
 
+	// populate URL/URLs
+	// if URLs are provided, only use those
+	if len(m.URLs) > 0 {
+		m.URL = &m.URLs[0]
+	} else {
+		urls := []string{}
+		if m.URL != nil {
+			urls = append(urls, *m.URL)
+		}
+
+		if len(urls) > 0 {
+			m.URLs = urls
+		}
+	}
+
 	// post-process - set the image if applicable
 	if err := setGroupFrontImage(ctx, c.client, &m, c.globalConfig); err != nil {
 		logger.Warnf("could not set front image using URL %s: %v", *m.FrontImage, err)

From fa2fd31ac7c30af8f6e1600111c274a7c1264abe Mon Sep 17 00:00:00 2001
From: DogmaDragon <103123951+DogmaDragon@users.noreply.github.com>
Date: Wed, 5 Nov 2025 23:24:33 +0200
Subject: [PATCH 095/405] Update library section in Configuration.md for
 clarity (#6232)

---
 ui/v2.5/src/docs/en/Manual/Configuration.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/ui/v2.5/src/docs/en/Manual/Configuration.md b/ui/v2.5/src/docs/en/Manual/Configuration.md
index 9b0469114..d7c1b4804 100644
--- a/ui/v2.5/src/docs/en/Manual/Configuration.md
+++ b/ui/v2.5/src/docs/en/Manual/Configuration.md
@@ -2,7 +2,13 @@
 
 ## Library
 
-This section allows you to add and remove directories from your library list. Files in these directories will be included when scanning. Files that are outside of these directories will be removed when running the Clean task.
+This section enables you to add or remove directories that will be discoverable by Stash. The directories you add will be utilized for scanning new files and for updating their locations in Stash database.
+
+You can configure these directories to apply specifically to:
+
+- **Videos**
+- **Images**
+- **Both**
 
 > **⚠️ Note:** Don't forget to click `Save` after updating these directories!
 

From 6cace4ff8826db3ea6c663fb186f24ba13c3700a Mon Sep 17 00:00:00 2001
From: Gykes <24581046+Gykes@users.noreply.github.com>
Date: Wed, 5 Nov 2025 14:53:43 -0800
Subject: [PATCH 096/405] Update parser to accept groups (#6228)

---
 pkg/scraper/mapped.go | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkg/scraper/mapped.go b/pkg/scraper/mapped.go
index dcd1af1dd..f89499176 100644
--- a/pkg/scraper/mapped.go
+++ b/pkg/scraper/mapped.go
@@ -126,6 +126,7 @@ type mappedSceneScraperConfig struct {
 	Performers mappedPerformerScraperConfig `yaml:"Performers"`
 	Studio     mappedConfig                 `yaml:"Studio"`
 	Movies     mappedConfig                 `yaml:"Movies"`
+	Groups     mappedConfig                 `yaml:"Groups"`
 }
 type _mappedSceneScraperConfig mappedSceneScraperConfig
 
@@ -134,6 +135,7 @@ const (
 	mappedScraperConfigScenePerformers = "Performers"
 	mappedScraperConfigSceneStudio     = "Studio"
 	mappedScraperConfigSceneMovies     = "Movies"
+	mappedScraperConfigSceneGroups     = "Groups"
 )
 
 func (s *mappedSceneScraperConfig) UnmarshalYAML(unmarshal func(interface{}) error) error {
@@ -151,11 +153,13 @@ func (s *mappedSceneScraperConfig) UnmarshalYAML(unmarshal func(interface{}) err
 	thisMap[mappedScraperConfigScenePerformers] = parentMap[mappedScraperConfigScenePerformers]
 	thisMap[mappedScraperConfigSceneStudio] = parentMap[mappedScraperConfigSceneStudio]
 	thisMap[mappedScraperConfigSceneMovies] = parentMap[mappedScraperConfigSceneMovies]
+	thisMap[mappedScraperConfigSceneGroups] = parentMap[mappedScraperConfigSceneGroups]
 
 	delete(parentMap, mappedScraperConfigSceneTags)
 	delete(parentMap, mappedScraperConfigScenePerformers)
 	delete(parentMap, mappedScraperConfigSceneStudio)
 	delete(parentMap, mappedScraperConfigSceneMovies)
+	delete(parentMap, mappedScraperConfigSceneGroups)
 
 	// re-unmarshal the sub-fields
 	yml, err := yaml.Marshal(thisMap)
@@ -1013,6 +1017,7 @@ func (s mappedScraper) processSceneRelationships(ctx context.Context, q mappedQu
 	sceneTagsMap := sceneScraperConfig.Tags
 	sceneStudioMap := sceneScraperConfig.Studio
 	sceneMoviesMap := sceneScraperConfig.Movies
+	sceneGroupsMap := sceneScraperConfig.Groups
 
 	ret.Performers = s.processPerformers(ctx, scenePerformersMap, q)
 
@@ -1039,7 +1044,12 @@ func (s mappedScraper) processSceneRelationships(ctx context.Context, q mappedQu
 		ret.Movies = processRelationships[models.ScrapedMovie](ctx, s, sceneMoviesMap, q)
 	}
 
-	return len(ret.Performers) > 0 || len(ret.Tags) > 0 || ret.Studio != nil || len(ret.Movies) > 0
+	if sceneGroupsMap != nil {
+		logger.Debug(`Processing scene groups:`)
+		ret.Groups = processRelationships[models.ScrapedGroup](ctx, s, sceneGroupsMap, q)
+	}
+
+	return len(ret.Performers) > 0 || len(ret.Tags) > 0 || ret.Studio != nil || len(ret.Movies) > 0 || len(ret.Groups) > 0
 }
 
 func (s mappedScraper) processPerformers(ctx context.Context, performersMap mappedPerformerScraperConfig, q mappedQuery) []*models.ScrapedPerformer {

From f2a787a2bab8cc64c874f59f8cef94afcffb508a Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Thu, 6 Nov 2025 10:45:57 +1100
Subject: [PATCH 097/405] Add (hidden) pagination to list results header
 (#6234)

---
 .../src/components/List/ListResultsHeader.tsx |  8 +++++++-
 ui/v2.5/src/components/List/styles.scss       | 20 +++++++++++++++++--
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/ui/v2.5/src/components/List/ListResultsHeader.tsx b/ui/v2.5/src/components/List/ListResultsHeader.tsx
index a2583c2e1..8a1bba05e 100644
--- a/ui/v2.5/src/components/List/ListResultsHeader.tsx
+++ b/ui/v2.5/src/components/List/ListResultsHeader.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import { ListFilterModel } from "src/models/list-filter/filter";
-import { PaginationIndex } from "../List/Pagination";
+import { Pagination, PaginationIndex } from "../List/Pagination";
 import { ButtonToolbar } from "react-bootstrap";
 import { ListViewOptions } from "../List/ListViewOptions";
 import { PageSizeSelector, SortBySelect } from "../List/ListFilter";
@@ -53,6 +53,12 @@ export const ListResultsHeader: React.FC<{
         />
       </div>
       <div className="pagination-index-container">
+        <Pagination
+          currentPage={filter.currentPage}
+          itemsPerPage={filter.itemsPerPage}
+          totalItems={totalCount}
+          onChangePage={(page) => onChangeFilter(filter.changePage(page))}
+        />
         <PaginationIndex
           loading={loading}
           itemsPerPage={filter.itemsPerPage}
diff --git a/ui/v2.5/src/components/List/styles.scss b/ui/v2.5/src/components/List/styles.scss
index aba1f39df..df50430a2 100644
--- a/ui/v2.5/src/components/List/styles.scss
+++ b/ui/v2.5/src/components/List/styles.scss
@@ -1305,7 +1305,7 @@ input[type="range"].zoom-slider {
 }
 
 .list-results-header {
-  align-items: center;
+  align-items: flex-start;
   background-color: $body-bg;
   display: flex;
 
@@ -1327,6 +1327,18 @@ input[type="range"].zoom-slider {
   }
 }
 
+.list-results-header .pagination-index-container {
+  display: flex;
+  flex-direction: column;
+  gap: 0.5rem;
+
+  .pagination {
+    // hidden by default. Can be shown via css override if needed
+    display: none;
+    margin: 0;
+  }
+}
+
 .list-results-header {
   gap: 0.25rem;
   margin-bottom: 0.5rem;
@@ -1342,7 +1354,7 @@ input[type="range"].zoom-slider {
     }
 
     & > div.pagination-index-container {
-      justify-content: flex-end;
+      align-items: flex-end;
       order: 3;
     }
   }
@@ -1356,6 +1368,10 @@ input[type="range"].zoom-slider {
       margin-left: auto;
       margin-right: auto;
     }
+
+    & > div.pagination-index-container {
+      align-items: center;
+    }
   }
 }
 

From 9be0cc32100b9a64a2d4860f63ca735154c4a657 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Thu, 6 Nov 2025 10:46:37 +1100
Subject: [PATCH 098/405] Update changelog

---
 ui/v2.5/src/docs/en/Changelog/v0290.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/ui/v2.5/src/docs/en/Changelog/v0290.md b/ui/v2.5/src/docs/en/Changelog/v0290.md
index c5cb78048..f08c4aec1 100644
--- a/ui/v2.5/src/docs/en/Changelog/v0290.md
+++ b/ui/v2.5/src/docs/en/Changelog/v0290.md
@@ -5,6 +5,11 @@
 
 
 ### 🎨 Improvements
+* **[0.29.2]** Returned saved filters button to the top toolbar in the Scene list. ([#6215](https://github.com/stashapp/stash/pull/6215))
+* **[0.29.2]** Top pagination can now be optionally shown in the scene list with [custom css](https://github.com/stashapp/stash/pull/6234#issue-3593190476). ([#6234](https://github.com/stashapp/stash/pull/6234))
+* **[0.29.2]** Restyled the scene list toolbar based on user feedback. ([#6215](https://github.com/stashapp/stash/pull/6215))
+* **[0.29.2]** Sidebar section collapsed state is now saved in the browser history. ([#6217](https://github.com/stashapp/stash/pull/6217))
+* **[0.29.2]** Increased the number of pages in pagination dropdown to 1000. ([#6207](https://github.com/stashapp/stash/pull/6207))
 * Revamped the scene and marker wall views. ([#5816](https://github.com/stashapp/stash/pull/5816))
 * Added zoom functionality to wall views. ([#6011](https://github.com/stashapp/stash/pull/6011))
 * Added search term field to the Edit Filter dialog. ([#6082](https://github.com/stashapp/stash/pull/6082))
@@ -28,6 +33,15 @@
 * Include IP address in login errors in log. ([#5760](https://github.com/stashapp/stash/pull/5760))
 
 ### 🐛 Bug fixes
+* **[0.29.2]** Fixed Play Random not playing from the current filtered scenes on scene list sub-pages. ([#6202](https://github.com/stashapp/stash/pull/6202))
+* **[0.29.2]** Fixed infinite loop in Group Sub-Groups panel. ([#6212](https://github.com/stashapp/stash/pull/6212))
+* **[0.29.2]** Page no longer scrolls when selecting criterion for the first time in the Edit Filter dialog. ([#6205](https://github.com/stashapp/stash/pull/6205))
+* **[0.29.2]** Zoom slider is no longer shown on mobile devices. ([#6206](https://github.com/stashapp/stash/pull/6206)) 
+* **[0.29.2]** Fixed trailing space sometimes being trimmed from query string when querying. ([#6211](https://github.com/stashapp/stash/pull/6211))
+* **[0.29.2]** Page now redirects to list page when deleting an object in a new browser tab. ([#6203](https://github.com/stashapp/stash/pull/6203))
+* **[0.29.2]** Related groups can now be scraped when scraping a scene. ([#6228](https://github.com/stashapp/stash/pull/6228))
+* **[0.29.2]** Fixed panic when a scraper configuration contains an unknown field. ([#6220](https://github.com/stashapp/stash/pull/6220))
+* **[0.29.2]** Fixed panic when using `stash_box_index` input in scrape API calls. ([#6201](https://github.com/stashapp/stash/pull/6201))
 * **[0.29.1]** Fixed password with special characters not allowing login. ([#6163](https://github.com/stashapp/stash/pull/6163))
 * **[0.29.1]** Fixed layout issues using column direction for image wall. ([#6168](https://github.com/stashapp/stash/pull/6168))
 * **[0.29.1]** Fixed layout issues for scene list table. ([#6169](https://github.com/stashapp/stash/pull/6169))

From beee37bc38c1c1ccbaee2019e58c548f25c3fcaf Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Thu, 6 Nov 2025 11:07:15 +1100
Subject: [PATCH 099/405] Codeberg weblate (#6235)

* Translated using Weblate (Bulgarian)

Currently translated at 25.0% (305 of 1219 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/bg/

* Translated using Weblate (Dutch)

Currently translated at 77.1% (940 of 1219 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/nl/

* Translated using Weblate (Turkish)

Currently translated at 95.9% (1170 of 1219 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/tr/

---------

Co-authored-by: theqwertyqwert <theqwertyqwert@noreply.codeberg.org>
Co-authored-by: callmenoodles <callmenoodles@noreply.codeberg.org>
Co-authored-by: slickdaddy <slickdaddy@noreply.codeberg.org>
---
 ui/v2.5/src/locales/bg-BG.json | 80 ++++++++++++++++++++++++++++++++++
 ui/v2.5/src/locales/nl-NL.json | 55 ++++++++++++++++++++---
 ui/v2.5/src/locales/tr-TR.json | 12 ++---
 3 files changed, 135 insertions(+), 12 deletions(-)

diff --git a/ui/v2.5/src/locales/bg-BG.json b/ui/v2.5/src/locales/bg-BG.json
index f639b3b6b..a7fb455a0 100644
--- a/ui/v2.5/src/locales/bg-BG.json
+++ b/ui/v2.5/src/locales/bg-BG.json
@@ -314,6 +314,86 @@
             "blobs_path": {
                 "description": "Къде във файловата система да се пазят бинарни данни. Позва се само ако се ползва Файлова система за блоб пазене. ВНИМАНИЕ: промяната ще изисква ръчно местене на съществуващи данни."
             }
+        },
+        "ui": {
+            "custom_locales": {
+                "option_label": "Персонализирана локализация е активирана"
+            },
+            "delete_options": {
+                "description": "Настройки по подразбиране при триене на картини, галерий и сцени.",
+                "heading": "Изтриване на настройки",
+                "options": {
+                    "delete_file": "Изтриване на файлове по подразбиране",
+                    "delete_generated_supporting_files": "Изтриване на генерираните поддържащи файлове по подразбиране"
+                }
+            },
+            "desktop_integration": {
+                "desktop_integration": "Десктоп Интеграция",
+                "notifications_enabled": "Включване на известяването",
+                "send_desktop_notifications_for_events": "Изпащане на десктоп известявания за събития",
+                "skip_opening_browser": "Пропускане на отваряне на браузер",
+                "skip_opening_browser_on_startup": "Пропускане на автоматично отваряне на броузер по време на стартиране"
+            },
+            "detail": {
+                "compact_expanded_details": {
+                    "description": "Когато е включена, тази настройка ще предосвати разширени детайли запавайки компактна презентация",
+                    "heading": "Компактни разширени детайли"
+                },
+                "enable_background_image": {
+                    "description": "Покажи фонова картина на станицата с детайли.",
+                    "heading": "Включи фонова картина"
+                },
+                "heading": "Станица с детайли",
+                "show_all_details": {
+                    "description": "Когато е включена, всичкото съдържание ще бъде показано по подразбиране и всеки детайл ще бъде в собствена колона",
+                    "heading": "Покажи всички детайли"
+                }
+            },
+            "editing": {
+                "disable_dropdown_create": {
+                    "description": "Премахни възможноста да се създават нови обекти от падащият селектор",
+                    "heading": "Изключи падащо създаване"
+                },
+                "heading": "Редактиране",
+                "max_options_shown": {
+                    "label": "Максимален брой неща който се показват в падащ селектор"
+                },
+                "rating_system": {
+                    "star_precision": {
+                        "label": "Точност на звездния рейтинг",
+                        "options": {
+                            "full": "Цели",
+                            "half": "Половинки",
+                            "quarter": "Четвъртинки",
+                            "tenth": "Десетици"
+                        }
+                    },
+                    "type": {
+                        "label": "Тип система за рейтинг",
+                        "options": {
+                            "decimal": "Десетична",
+                            "stars": "Звезди"
+                        }
+                    }
+                }
+            },
+            "funscript_offset": {
+                "description": "Време за разминаване в милисекунди за пускане на интерактивни скриптове.",
+                "heading": "Funscript разминаване (ms)"
+            },
+            "handy_connection": {
+                "connect": "Свързване",
+                "server_offset": {
+                    "heading": "Сървърно разминаване"
+                },
+                "status": {
+                    "heading": "Статус на връзка с Handy"
+                },
+                "sync": "Синхронизиране"
+            },
+            "handy_connection_key": {
+                "description": "Handy connection key за ползване със интерактивни сцени. Слагането на този ключ ще позволи на Stash да сподели иформация за текущата сцена със handyfeeling.com"
+            }
         }
     }
 }
diff --git a/ui/v2.5/src/locales/nl-NL.json b/ui/v2.5/src/locales/nl-NL.json
index 56ba293b8..dd9b9dc05 100644
--- a/ui/v2.5/src/locales/nl-NL.json
+++ b/ui/v2.5/src/locales/nl-NL.json
@@ -149,7 +149,8 @@
         },
         "show_results": "Resultaat tonen",
         "show_count_results": "{count} resultaten tonen",
-        "play": "Afspelen"
+        "play": "Afspelen",
+        "load_filter": "Laad filter"
     },
     "actions_name": "Acties",
     "age": "Leeftijd",
@@ -498,7 +499,8 @@
                 "source": "Bron",
                 "source_options": "{source} Opties",
                 "sources": "Bronnen",
-                "strategy": "Strategie"
+                "strategy": "Strategie",
+                "skip_multiple_matches": "Sla overeenkomsten met meer dan één resultaat over"
             },
             "import_from_exported_json": "Import van geëxporteerde JSON in de map metadata. Maakt de bestaande database leeg.",
             "incremental_import": "Incrementele import uit een meegeleverde export zip-bestand.",
@@ -528,7 +530,13 @@
             "anonymising_database": "Anonimiseer database",
             "anonymise_database": "Maakt een kopie van de database naar de backups-map, waarbij alle gevoelige gegevens anoniem worden gemaakt. Deze kan vervolgens aan anderen worden verstrekt voor probleemoplossing en debugging. De originele database wordt niet gewijzigd. De geanonimiseerde database gebruikt de bestandsnaamindeling {filename_format}.",
             "anonymise_and_download": "Maakt een geanonimiseerde kopie van de database en downloadt het resulterende bestand.",
-            "generate_clip_previews_during_scan": "Genereer voorbeelden van Afbeelingsfragmenten"
+            "generate_clip_previews_during_scan": "Genereer voorbeelden van Afbeelingsfragmenten",
+            "migrate_blobs": {
+                "delete_old": "Verwijder oude gegevens"
+            },
+            "migrate_scene_screenshots": {
+                "delete_files": "Verwijder screenshotbestanden"
+            }
         },
         "tools": {
             "scene_duplicate_checker": "Scène Duplicator Checker",
@@ -547,7 +555,9 @@
                 "whitespace_chars": "WhiteSpace-tekens",
                 "whitespace_chars_desc": "Deze tekens worden vervangen door witruimte in de titel"
             },
-            "scene_tools": "Scene gereedschap"
+            "scene_tools": "Scene gereedschap",
+            "graphql_playground": "GraphQL speeltuin",
+            "heading": "Hulpmiddelen"
         },
         "ui": {
             "basic_settings": "Basis instellingen",
@@ -576,7 +586,15 @@
                     "description": "Verwijder de mogelijkheid om nieuwe objecten te maken uit de dropdown menu",
                     "heading": "Schakel het maken van dropdowns uit"
                 },
-                "heading": "Aanpassen"
+                "heading": "Aanpassen",
+                "rating_system": {
+                    "type": {
+                        "options": {
+                            "decimal": "Decimaal",
+                            "stars": "Sterren"
+                        }
+                    }
+                }
             },
             "funscript_offset": {
                 "description": "Time Offset in milliseconden voor het afspelen van interactieve scripts.",
@@ -654,7 +672,9 @@
                     "continue_playlist_default": {
                         "description": "Speel de volgende scène in de wachtrij wanneer video is voltooid",
                         "heading": "Ga Standaard door met de afspeellijst"
-                    }
+                    },
+                    "always_start_from_beginning": "Start video altijd vanaf het begin",
+                    "enable_chromecast": "Chromecast inschakelen"
                 }
             },
             "scene_wall": {
@@ -672,7 +692,28 @@
                 "description": "Diavoorstelling is beschikbaar in galerijen in de muurweergavemodus",
                 "heading": "Diavoorstellingsvertraging (in seconden)"
             },
-            "title": "Gebruikers interface"
+            "title": "Gebruikers interface",
+            "custom_javascript": {
+                "heading": "Aangepaste JavaScript",
+                "option_label": "Aangepaste JavaScript ingeschakeld"
+            },
+            "custom_locales": {
+                "heading": "Aangepaste lokalisatie",
+                "option_label": "Aangepaste lokalisatie ingeschakeld"
+            },
+            "detail": {
+                "enable_background_image": {
+                    "description": "Achtergrondfoto op detailscherm weergeven.",
+                    "heading": "Achtergrondfoto inschakelen"
+                },
+                "heading": "Detailscherm",
+                "show_all_details": {
+                    "heading": "Alle details weergeven"
+                }
+            },
+            "image_wall": {
+                "margin": "Marge (pixels)"
+            }
         },
         "advanced_mode": "Geavanceerde modus"
     },
diff --git a/ui/v2.5/src/locales/tr-TR.json b/ui/v2.5/src/locales/tr-TR.json
index 5263d398e..672212dc8 100644
--- a/ui/v2.5/src/locales/tr-TR.json
+++ b/ui/v2.5/src/locales/tr-TR.json
@@ -149,7 +149,8 @@
         "play": "Oynat",
         "show_results": "Sonuçları göster",
         "show_count_results": "{count} sonucu göster",
-        "load": "Yükle"
+        "load": "Yükle",
+        "load_filter": "Filtre yükle"
     },
     "actions_name": "Eylemler",
     "age": "Yaş",
@@ -1021,7 +1022,7 @@
     "include_sub_tags": "Alt etiketleri dahil et",
     "instagram": "Instagram",
     "interactive": "Etkileşimli",
-    "interactive_speed": "Etkileşim hızı",
+    "interactive_speed": "Etkileşimli Hız",
     "isMissing": "Eksik",
     "library": "Kütüphane",
     "loading": {
@@ -1036,7 +1037,7 @@
         "checksum": "Sağlama Toplamı (checksum)",
         "downloaded_from": "İndirildiği Yer",
         "hash": "Dosya İmzası (Hash)",
-        "interactive_speed": "Etkileşim hızı",
+        "interactive_speed": "Etkileşimli Hız",
         "performer_card": {
             "age": "{age} {years_old}",
             "age_context": "Bu sahnede {age} {years_old}"
@@ -1090,7 +1091,8 @@
         "name": "Filtre",
         "saved_filters": "Kaydedilmiş filtreler",
         "update_filter": "Filtreyi Güncelle",
-        "edit_filter": "Filtreyi Düzenle"
+        "edit_filter": "Filtreyi Düzenle",
+        "search_term": "Arama terimi"
     },
     "seconds": "Saniye",
     "settings": "Ayarlar",
@@ -1135,7 +1137,7 @@
         },
         "paths": {
             "database_filename_empty_for_default": "veritabanı adı (varsayılan için boş bırakın)",
-            "description": "Sırada porno koleksiyonunuzun hangi dizinde olduğunun, stash veritabanının ve oluşturulan ek dosyaların nereye kaydedileceğinin belirlenmesi var. Bu ayarları sonradan değiştirebilirsiniz.",
+            "description": "Sırada, porno koleksiyonunuzun nerede bulunacağını ve Stash veritabanının, oluşturulan dosyaların ve önbellek dosyalarının nerede depolanacağını belirlememiz gerekiyor. Bu ayarlar daha sonra gerekirse değiştirilebilir.",
             "path_to_generated_directory_empty_for_default": "oluşturulan ek dosyalar için dizin konumu (varsayılan için boş bırakın)",
             "set_up_your_paths": "Yollarınızı ayarlayın",
             "stash_alert": "Herhangi bir kütüphane konumu seçilmedi. Hiçbir medya Stash'e taranamayacak. Emin misiniz?",

From 2a2a730296de2c453986a32db1daed1969ec546f Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Thu, 6 Nov 2025 15:59:55 +1100
Subject: [PATCH 100/405] Add interface for bulk update studio (#6208)

---
 graphql/schema/schema.graphql            |  1 +
 graphql/schema/types/studio.graphql      | 12 ++++
 internal/api/resolver_mutation_studio.go | 71 ++++++++++++++++++++++++
 3 files changed, 84 insertions(+)

diff --git a/graphql/schema/schema.graphql b/graphql/schema/schema.graphql
index 7d0a761da..c50fd1864 100644
--- a/graphql/schema/schema.graphql
+++ b/graphql/schema/schema.graphql
@@ -371,6 +371,7 @@ type Mutation {
   studioUpdate(input: StudioUpdateInput!): Studio
   studioDestroy(input: StudioDestroyInput!): Boolean!
   studiosDestroy(ids: [ID!]!): Boolean!
+  bulkStudioUpdate(input: BulkStudioUpdateInput!): [Studio!]
 
   movieCreate(input: MovieCreateInput!): Movie
     @deprecated(reason: "Use groupCreate instead")
diff --git a/graphql/schema/types/studio.graphql b/graphql/schema/types/studio.graphql
index 7823bf0c4..f7e2fcb24 100644
--- a/graphql/schema/types/studio.graphql
+++ b/graphql/schema/types/studio.graphql
@@ -59,6 +59,18 @@ input StudioUpdateInput {
   ignore_auto_tag: Boolean
 }
 
+input BulkStudioUpdateInput {
+  ids: [ID!]!
+  url: String
+  parent_id: ID
+  # rating expressed as 1-100
+  rating100: Int
+  favorite: Boolean
+  details: String
+  tag_ids: BulkUpdateIds
+  ignore_auto_tag: Boolean
+}
+
 input StudioDestroyInput {
   id: ID!
 }
diff --git a/internal/api/resolver_mutation_studio.go b/internal/api/resolver_mutation_studio.go
index 727951755..caecf39b9 100644
--- a/internal/api/resolver_mutation_studio.go
+++ b/internal/api/resolver_mutation_studio.go
@@ -163,6 +163,77 @@ func (r *mutationResolver) StudioUpdate(ctx context.Context, input models.Studio
 	return r.getStudio(ctx, studioID)
 }
 
+func (r *mutationResolver) BulkStudioUpdate(ctx context.Context, input BulkStudioUpdateInput) ([]*models.Studio, error) {
+	ids, err := stringslice.StringSliceToIntSlice(input.Ids)
+	if err != nil {
+		return nil, fmt.Errorf("converting ids: %w", err)
+	}
+
+	translator := changesetTranslator{
+		inputMap: getUpdateInputMap(ctx),
+	}
+
+	// Populate performer from the input
+	partial := models.NewStudioPartial()
+
+	partial.ParentID, err = translator.optionalIntFromString(input.ParentID, "parent_id")
+	if err != nil {
+		return nil, fmt.Errorf("converting parent id: %w", err)
+	}
+
+	partial.URL = translator.optionalString(input.URL, "url")
+	partial.Favorite = translator.optionalBool(input.Favorite, "favorite")
+	partial.Rating = translator.optionalInt(input.Rating100, "rating100")
+	partial.Details = translator.optionalString(input.Details, "details")
+	partial.IgnoreAutoTag = translator.optionalBool(input.IgnoreAutoTag, "ignore_auto_tag")
+
+	partial.TagIDs, err = translator.updateIdsBulk(input.TagIds, "tag_ids")
+	if err != nil {
+		return nil, fmt.Errorf("converting tag ids: %w", err)
+	}
+
+	ret := []*models.Studio{}
+
+	// Start the transaction and save the performers
+	if err := r.withTxn(ctx, func(ctx context.Context) error {
+		qb := r.repository.Studio
+
+		for _, id := range ids {
+			local := partial
+			local.ID = id
+			if err := studio.ValidateModify(ctx, local, qb); err != nil {
+				return err
+			}
+
+			updated, err := qb.UpdatePartial(ctx, local)
+			if err != nil {
+				return err
+			}
+
+			ret = append(ret, updated)
+		}
+
+		return nil
+	}); err != nil {
+		return nil, err
+	}
+
+	// execute post hooks outside of txn
+	var newRet []*models.Studio
+	for _, studio := range ret {
+		r.hookExecutor.ExecutePostHooks(ctx, studio.ID, hook.StudioUpdatePost, input, translator.getFields())
+
+		studio, err = r.getStudio(ctx, studio.ID)
+		if err != nil {
+			return nil, err
+		}
+
+		newRet = append(newRet, studio)
+	}
+
+	return newRet, nil
+}
+
 func (r *mutationResolver) StudioDestroy(ctx context.Context, input StudioDestroyInput) (bool, error) {
 	id, err := strconv.Atoi(input.ID)
 	if err != nil {

From 8c4b607454e0806a051c3cd6531e2a57c646b811 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Thu, 6 Nov 2025 16:01:24 +1100
Subject: [PATCH 101/405] Add bulk update markers interface (#6210)

---
 graphql/schema/schema.graphql             |   1 +
 graphql/schema/types/scene-marker.graphql |   7 ++
 internal/api/resolver_mutation_scene.go   | 117 ++++++++++++++++++++++
 pkg/models/model_scene_marker.go          |   1 +
 pkg/sqlite/scene_marker.go                |  16 ++-
 pkg/sqlite/tables.go                      |  12 +++
 6 files changed, 151 insertions(+), 3 deletions(-)

diff --git a/graphql/schema/schema.graphql b/graphql/schema/schema.graphql
index c50fd1864..2a9d067ae 100644
--- a/graphql/schema/schema.graphql
+++ b/graphql/schema/schema.graphql
@@ -328,6 +328,7 @@ type Mutation {
 
   sceneMarkerCreate(input: SceneMarkerCreateInput!): SceneMarker
   sceneMarkerUpdate(input: SceneMarkerUpdateInput!): SceneMarker
+  bulkSceneMarkerUpdate(input: BulkSceneMarkerUpdateInput!): [SceneMarker!]
   sceneMarkerDestroy(id: ID!): Boolean!
   sceneMarkersDestroy(ids: [ID!]!): Boolean!
 
diff --git a/graphql/schema/types/scene-marker.graphql b/graphql/schema/types/scene-marker.graphql
index 6d1441213..9312c5aa3 100644
--- a/graphql/schema/types/scene-marker.graphql
+++ b/graphql/schema/types/scene-marker.graphql
@@ -42,6 +42,13 @@ input SceneMarkerUpdateInput {
   tag_ids: [ID!]
 }
 
+input BulkSceneMarkerUpdateInput {
+  ids: [ID!]
+  title: String
+  primary_tag_id: ID
+  tag_ids: BulkUpdateIds
+}
+
 type FindSceneMarkersResultType {
   count: Int!
   scene_markers: [SceneMarker!]!
diff --git a/internal/api/resolver_mutation_scene.go b/internal/api/resolver_mutation_scene.go
index b740955d0..b81ac0974 100644
--- a/internal/api/resolver_mutation_scene.go
+++ b/internal/api/resolver_mutation_scene.go
@@ -820,6 +820,123 @@ func (r *mutationResolver) SceneMarkerUpdate(ctx context.Context, input SceneMar
 	return r.getSceneMarker(ctx, markerID)
 }
 
+func (r *mutationResolver) BulkSceneMarkerUpdate(ctx context.Context, input BulkSceneMarkerUpdateInput) ([]*models.SceneMarker, error) {
+	ids, err := stringslice.StringSliceToIntSlice(input.Ids)
+	if err != nil {
+		return nil, fmt.Errorf("converting ids: %w", err)
+	}
+
+	translator := changesetTranslator{
+		inputMap: getUpdateInputMap(ctx),
+	}
+
+	// Populate performer from the input
+	partial := models.NewSceneMarkerPartial()
+
+	partial.Title = translator.optionalString(input.Title, "title")
+
+	partial.PrimaryTagID, err = translator.optionalIntFromString(input.PrimaryTagID, "primary_tag_id")
+	if err != nil {
+		return nil, fmt.Errorf("converting primary tag id: %w", err)
+	}
+
+	partial.TagIDs, err = translator.updateIdsBulk(input.TagIds, "tag_ids")
+	if err != nil {
+		return nil, fmt.Errorf("converting tag ids: %w", err)
+	}
+
+	ret := []*models.SceneMarker{}
+
+	// Start the transaction and save the performers
+	if err := r.withTxn(ctx, func(ctx context.Context) error {
+		qb := r.repository.SceneMarker
+
+		for _, id := range ids {
+			l := partial
+
+			if err := adjustMarkerPartialForTagExclusion(ctx, r.repository.SceneMarker, id, &l); err != nil {
+				return err
+			}
+
+			updated, err := qb.UpdatePartial(ctx, id, l)
+			if err != nil {
+				return err
+			}
+
+			ret = append(ret, updated)
+		}
+
+		return nil
+	}); err != nil {
+		return nil, err
+	}
+
+	// execute post hooks outside of txn
+	var newRet []*models.SceneMarker
+	for _, m := range ret {
+		r.hookExecutor.ExecutePostHooks(ctx, m.ID, hook.SceneMarkerUpdatePost, input, translator.getFields())
+
+		m, err = r.getSceneMarker(ctx, m.ID)
+		if err != nil {
+			return nil, err
+		}
+
+		newRet = append(newRet, m)
+	}
+
+	return newRet, nil
+}
+
+// adjustMarkerPartialForTagExclusion adjusts the SceneMarkerPartial to exclude the primary tag from tag updates.
+func adjustMarkerPartialForTagExclusion(ctx context.Context, r models.SceneMarkerReader, id int, partial *models.SceneMarkerPartial) error {
+	if partial.TagIDs == nil && !partial.PrimaryTagID.Set {
+		return nil
+	}
+
+	// exclude primary tag from tag updates
+	var primaryTagID int
+	if partial.PrimaryTagID.Set {
+		primaryTagID = partial.PrimaryTagID.Value
+	} else {
+		existing, err := r.Find(ctx, id)
+		if err != nil {
+			return fmt.Errorf("finding existing primary tag id: %w", err)
+		}
+
+		primaryTagID = existing.PrimaryTagID
+	}
+
+	existingTagIDs, err := r.GetTagIDs(ctx, id)
+	if err != nil {
+		return fmt.Errorf("getting existing tag ids: %w", err)
+	}
+
+	tagIDAttr := partial.TagIDs
+
+	if tagIDAttr == nil {
+		tagIDAttr = &models.UpdateIDs{
+			IDs:  existingTagIDs,
+			Mode: models.RelationshipUpdateModeSet,
+		}
+	}
+
+	newTagIDs := tagIDAttr.Apply(existingTagIDs)
+	// Remove primary tag from newTagIDs if present
+	newTagIDs = sliceutil.Exclude(newTagIDs, []int{primaryTagID})
+
+	if len(existingTagIDs) != len(newTagIDs) {
+		partial.TagIDs = &models.UpdateIDs{
+			IDs:  newTagIDs,
+			Mode: models.RelationshipUpdateModeSet,
+		}
+	} else {
+		// no change to tags required
+		partial.TagIDs = nil
+	}
+
+	return nil
+}
+
 func (r *mutationResolver) SceneMarkerDestroy(ctx context.Context, id string) (bool, error) {
 	return r.SceneMarkersDestroy(ctx, []string{id})
 }
diff --git a/pkg/models/model_scene_marker.go b/pkg/models/model_scene_marker.go
index 778603315..8d723b391 100644
--- a/pkg/models/model_scene_marker.go
+++ b/pkg/models/model_scene_marker.go
@@ -30,6 +30,7 @@ type SceneMarkerPartial struct {
 	Seconds      OptionalFloat64
 	EndSeconds   OptionalFloat64
 	PrimaryTagID OptionalInt
+	TagIDs       *UpdateIDs
 	SceneID      OptionalInt
 	CreatedAt    OptionalTime
 	UpdatedAt    OptionalTime
diff --git a/pkg/sqlite/scene_marker.go b/pkg/sqlite/scene_marker.go
index ed98d0ef7..59a4137e1 100644
--- a/pkg/sqlite/scene_marker.go
+++ b/pkg/sqlite/scene_marker.go
@@ -15,7 +15,11 @@ import (
 	"github.com/stashapp/stash/pkg/models"
 )
 
-const sceneMarkerTable = "scene_markers"
+const (
+	sceneMarkerTable      = "scene_markers"
+	sceneMarkersTagsTable = "scene_markers_tags"
+	sceneMarkerIDColumn   = "scene_marker_id"
+)
 
 const countSceneMarkersForTagQuery = `
 SELECT scene_markers.id FROM scene_markers
@@ -101,8 +105,8 @@ var (
 		},
 		tags: joinRepository{
 			repository: repository{
-				tableName: "scene_markers_tags",
-				idColumn:  "scene_marker_id",
+				tableName: sceneMarkersTagsTable,
+				idColumn:  sceneMarkerIDColumn,
 			},
 			fkColumn: tagIDColumn,
 		},
@@ -157,6 +161,12 @@ func (qb *SceneMarkerStore) UpdatePartial(ctx context.Context, id int, partial m
 		}
 	}
 
+	if partial.TagIDs != nil {
+		if err := sceneMarkersTagsTableMgr.modifyJoins(ctx, id, partial.TagIDs.IDs, partial.TagIDs.Mode); err != nil {
+			return nil, fmt.Errorf("modifying scene marker tags: %w", err)
+		}
+	}
+
 	return qb.find(ctx, id)
 }
 
diff --git a/pkg/sqlite/tables.go b/pkg/sqlite/tables.go
index 35845d8f5..0188cfebc 100644
--- a/pkg/sqlite/tables.go
+++ b/pkg/sqlite/tables.go
@@ -28,6 +28,8 @@ var (
 	scenesGroupsJoinTable     = goqu.T(groupsScenesTable)
 	scenesURLsJoinTable       = goqu.T(scenesURLsTable)
 
+	sceneMarkersTagsJoinTable = goqu.T(sceneMarkersTagsTable)
+
 	performersAliasesJoinTable  = goqu.T(performersAliasesTable)
 	performersURLsJoinTable     = goqu.T(performerURLsTable)
 	performersTagsJoinTable     = goqu.T(performersTagsTable)
@@ -160,6 +162,16 @@ var (
 		idColumn: goqu.T(sceneMarkerTable).Col(idColumn),
 	}
 
+	sceneMarkersTagsTableMgr = &joinTable{
+		table: table{
+			table:    sceneMarkersTagsJoinTable,
+			idColumn: sceneMarkersTagsJoinTable.Col(sceneMarkerIDColumn),
+		},
+		fkColumn:     sceneMarkersTagsJoinTable.Col(tagIDColumn),
+		foreignTable: tagTableMgr,
+		orderBy:      tagTableSort,
+	}
+
 	scenesFilesTableMgr = &relatedFilesTable{
 		table: table{
 			table:    scenesFilesJoinTable,

From 1b864f28f65af30a9ebc271e369329a26316e355 Mon Sep 17 00:00:00 2001
From: Ian McKenzie <13459320+ikmckenz@users.noreply.github.com>
Date: Wed, 5 Nov 2025 21:09:33 -0800
Subject: [PATCH 102/405] Remove custom ffmpeg compile step from OpenBSD dev
 instructions (#6219)

ffmpeg has been compiled with webp support since 7.7, so all
these extra steps are no longer needed
---
 docs/DEVELOPMENT.md | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/docs/DEVELOPMENT.md b/docs/DEVELOPMENT.md
index 4a1cf30df..68bb34f99 100644
--- a/docs/DEVELOPMENT.md
+++ b/docs/DEVELOPMENT.md
@@ -36,18 +36,8 @@ NOTE: The `make` command in Windows will be `mingw32-make` with MinGW. For examp
 
 ### OpenBSD
 
-1. Install dependencies `doas pkg_add gmake go git yarn node cmake`
-2. Compile a custom ffmpeg from ports. The default ffmpeg in OpenBSD's packages is not compiled with WebP support, which is required by Stash.
-   - If you've already installed ffmpeg, uninstall it: `doas pkg_delete ffmpeg`
-   - If you haven't already, [fetch the ports tree and verify](https://www.openbsd.org/faq/ports/ports.html#PortsFetch).
-   - Find the ffmpeg port in `/usr/ports/graphics/ffmpeg`, and patch the Makefile to include libwebp
-     - Add `webp` to `WANTLIB`
-     - Add `graphics/libwebp` to the list in `LIB_DEPENDS`
-     - Add `-lwebp -lwebpdecoder -lwebpdemux -lwebpmux` to `LIBavcodec_EXTRALIBS`
-     - Add `--enable-libweb` to the list in `CONFIGURE_ARGS`
-     - If you've already built ffmpeg from ports before, you may need to also increment `REVISION`
-     - Run `doas make install`
-   - Follow the instructions below to build a release, but replace the final step `make build-release` with `gmake flags-release stash`, to [avoid the PIE buildmode](https://github.com/golang/go/issues/59866).
+1. Install dependencies `doas pkg_add gmake go git yarn node cmake ffmpeg`
+2. Follow the instructions below to build a release, but replace the final step `make build-release` with `gmake flags-release stash`, to [avoid the PIE buildmode](https://github.com/golang/go/issues/59866).
 
 NOTE: The `make` command in OpenBSD will be `gmake`. For example, `make pre-ui` will be `gmake pre-ui`.
 

From d831e4573ca35955e40e3494c2cd3bbe181de2c3 Mon Sep 17 00:00:00 2001
From: smith113-p <205463041+smith113-p@users.noreply.github.com>
Date: Thu, 6 Nov 2025 00:20:17 -0500
Subject: [PATCH 103/405] Remember the selected stash box in scene tagger
 (#6192)

* Remember the selected stash box in scene tagger

This stores the selected stash box in the config, the same way that
studio and performer tagger do (it uses the same setting).

If a non-stashbox source (scraper) is selected, this is not remembered.
---
 ui/v2.5/src/components/Tagger/context.tsx | 27 +++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/ui/v2.5/src/components/Tagger/context.tsx b/ui/v2.5/src/components/Tagger/context.tsx
index 434a47cce..7db84a11a 100644
--- a/ui/v2.5/src/components/Tagger/context.tsx
+++ b/ui/v2.5/src/components/Tagger/context.tsx
@@ -174,14 +174,33 @@ export const TaggerContext: React.FC = ({ children }) => {
   }, [Scrapers.data, stashConfig]);
 
   useEffect(() => {
-    if (sources.length && !currentSource) {
-      setCurrentSource(sources[0]);
+    if (!sources.length || currentSource) {
+      return;
     }
-  }, [sources, currentSource]);
+    // First, see if we have a saved endpoint.
+    if (config.selectedEndpoint) {
+      let source = sources.find(
+        (s) => s.sourceInput.stash_box_endpoint == config.selectedEndpoint
+      );
+      if (source) {
+        setCurrentSource(source);
+        return;
+      }
+    }
+    // Otherwise, just use the first source.
+    setCurrentSource(sources[0]);
+  }, [sources, currentSource, config]);
 
   useEffect(() => {
     setSearchResults({});
-  }, [currentSource]);
+    const selectedEndpoint = currentSource?.sourceInput.stash_box_endpoint;
+    if (selectedEndpoint && selectedEndpoint !== config.selectedEndpoint) {
+      setConfig({
+        ...config,
+        selectedEndpoint,
+      });
+    }
+  }, [currentSource, config, setConfig]);
 
   function getPendingFingerprints() {
     const endpoint = currentSource?.sourceInput.stash_box_endpoint;

From 2925325e68d9fba64ca9952569b1010415898fb0 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Thu, 6 Nov 2025 16:54:53 +1100
Subject: [PATCH 104/405] Fix contents not loading in filter sidebar (#6240)

---
 .../List/Filters/SidebarListFilter.tsx           |  3 +++
 ui/v2.5/src/components/Shared/Sidebar.tsx        | 16 +++++++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/ui/v2.5/src/components/List/Filters/SidebarListFilter.tsx b/ui/v2.5/src/components/List/Filters/SidebarListFilter.tsx
index 6754787db..fe9b7987c 100644
--- a/ui/v2.5/src/components/List/Filters/SidebarListFilter.tsx
+++ b/ui/v2.5/src/components/List/Filters/SidebarListFilter.tsx
@@ -275,6 +275,7 @@ export const SidebarListFilter: React.FC<{
   postSelected?: React.ReactNode;
   preCandidates?: React.ReactNode;
   postCandidates?: React.ReactNode;
+  onOpen?: () => void;
   // used to store open/closed state in SidebarStateContext
   sectionID?: string;
 }> = ({
@@ -292,6 +293,7 @@ export const SidebarListFilter: React.FC<{
   postCandidates,
   preSelected,
   postSelected,
+  onOpen,
   sectionID,
 }) => {
   // TODO - sort items?
@@ -344,6 +346,7 @@ export const SidebarListFilter: React.FC<{
           {postSelected ? <div className="extra">{postSelected}</div> : null}
         </>
       }
+      onOpen={onOpen}
     >
       {preCandidates ? <div className="extra">{preCandidates}</div> : null}
       <CandidateList
diff --git a/ui/v2.5/src/components/Shared/Sidebar.tsx b/ui/v2.5/src/components/Shared/Sidebar.tsx
index 0130fe85f..bf19f5842 100644
--- a/ui/v2.5/src/components/Shared/Sidebar.tsx
+++ b/ui/v2.5/src/components/Shared/Sidebar.tsx
@@ -76,10 +76,18 @@ export const SidebarSection: React.FC<
     text: React.ReactNode;
     className?: string;
     outsideCollapse?: React.ReactNode;
+    onOpen?: () => void;
     // used to store open/closed state in SidebarStateContext
     sectionID?: string;
   }>
-> = ({ className = "", text, outsideCollapse, sectionID = "", children }) => {
+> = ({
+  className = "",
+  text,
+  outsideCollapse,
+  onOpen,
+  sectionID = "",
+  children,
+}) => {
   // this is optional
   const contextState = React.useContext(SidebarStateContext);
   const openState =
@@ -93,6 +101,12 @@ export const SidebarSection: React.FC<
     }
   }
 
+  useEffect(() => {
+    if (openState && onOpen) {
+      onOpen();
+    }
+  }, [openState, onOpen]);
+
   const collapseProps: Partial<CollapseProps> = {
     mountOnEnter: true,
     unmountOnExit: true,

From 7716c4dd874512e7937c59ee52d034e452ba2026 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Thu, 6 Nov 2025 16:55:40 +1100
Subject: [PATCH 105/405] Update changelog

---
 ui/v2.5/src/docs/en/Changelog/v0290.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui/v2.5/src/docs/en/Changelog/v0290.md b/ui/v2.5/src/docs/en/Changelog/v0290.md
index f08c4aec1..51ca93e5d 100644
--- a/ui/v2.5/src/docs/en/Changelog/v0290.md
+++ b/ui/v2.5/src/docs/en/Changelog/v0290.md
@@ -33,6 +33,7 @@
 * Include IP address in login errors in log. ([#5760](https://github.com/stashapp/stash/pull/5760))
 
 ### 🐛 Bug fixes
+* **[0.29.3]** Fixed sidebar filter contents not loading. ([#6240](https://github.com/stashapp/stash/pull/6240))
 * **[0.29.2]** Fixed Play Random not playing from the current filtered scenes on scene list sub-pages. ([#6202](https://github.com/stashapp/stash/pull/6202))
 * **[0.29.2]** Fixed infinite loop in Group Sub-Groups panel. ([#6212](https://github.com/stashapp/stash/pull/6212))
 * **[0.29.2]** Page no longer scrolls when selecting criterion for the first time in the Edit Filter dialog. ([#6205](https://github.com/stashapp/stash/pull/6205))

From a50a0d428916d61bfa12202b8ee68bb18899ca85 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Thu, 6 Nov 2025 17:25:59 +1100
Subject: [PATCH 106/405] Related files/folder filter for
 scenes/images/galleries (#6158)

* Add related files filter to scene filter
* Add files_filter to gallery filter
* Add files_filter to image filter
* Add gallery related folder filter
---
 graphql/schema/types/filters.graphql |  8 +++++++
 pkg/models/gallery.go                |  4 ++++
 pkg/models/image.go                  |  2 ++
 pkg/models/scene.go                  |  2 ++
 pkg/sqlite/criterion_handlers.go     | 15 ++++++++----
 pkg/sqlite/file.go                   |  2 +-
 pkg/sqlite/file_filter.go            | 10 ++++++--
 pkg/sqlite/folder_filter.go          | 36 ++++++++++++++++++----------
 pkg/sqlite/gallery_filter.go         | 30 +++++++++++++++++++++++
 pkg/sqlite/image_filter.go           | 15 ++++++++++++
 pkg/sqlite/scene_filter.go           | 15 ++++++++++++
 pkg/sqlite/sql.go                    | 10 ++++++++
 12 files changed, 129 insertions(+), 20 deletions(-)

diff --git a/graphql/schema/types/filters.graphql b/graphql/schema/types/filters.graphql
index 23ec4ca48..da309bead 100644
--- a/graphql/schema/types/filters.graphql
+++ b/graphql/schema/types/filters.graphql
@@ -330,6 +330,8 @@ input SceneFilterType {
   groups_filter: GroupFilterType
   "Filter by related markers that meet this criteria"
   markers_filter: SceneMarkerFilterType
+  "Filter by related files that meet this criteria"
+  files_filter: FileFilterType
 }
 
 input MovieFilterType {
@@ -534,6 +536,10 @@ input GalleryFilterType {
   studios_filter: StudioFilterType
   "Filter by related tags that meet this criteria"
   tags_filter: TagFilterType
+  "Filter by related files that meet this criteria"
+  files_filter: FileFilterType
+  "Filter by related folders that meet this criteria"
+  folders_filter: FolderFilterType
 }
 
 input TagFilterType {
@@ -679,6 +685,8 @@ input ImageFilterType {
   studios_filter: StudioFilterType
   "Filter by related tags that meet this criteria"
   tags_filter: TagFilterType
+  "Filter by related files that meet this criteria"
+  files_filter: FileFilterType
 }
 
 input FileFilterType {
diff --git a/pkg/models/gallery.go b/pkg/models/gallery.go
index 73fa287d2..5b75febc5 100644
--- a/pkg/models/gallery.go
+++ b/pkg/models/gallery.go
@@ -59,6 +59,10 @@ type GalleryFilterType struct {
 	StudiosFilter *StudioFilterType `json:"studios_filter"`
 	// Filter by related tags that meet this criteria
 	TagsFilter *TagFilterType `json:"tags_filter"`
+	// Filter by related files that meet this criteria
+	FilesFilter *FileFilterType `json:"files_filter"`
+	// Filter by related folders that meet this criteria
+	FoldersFilter *FolderFilterType `json:"folders_filter"`
 	// Filter by created at
 	CreatedAt *TimestampCriterionInput `json:"created_at"`
 	// Filter by updated at
diff --git a/pkg/models/image.go b/pkg/models/image.go
index 9d2c6f016..4ab10eabf 100644
--- a/pkg/models/image.go
+++ b/pkg/models/image.go
@@ -57,6 +57,8 @@ type ImageFilterType struct {
 	StudiosFilter *StudioFilterType `json:"studios_filter"`
 	// Filter by related tags that meet this criteria
 	TagsFilter *TagFilterType `json:"tags_filter"`
+	// Filter by related files that meet this criteria
+	FilesFilter *FileFilterType `json:"files_filter"`
 	// Filter by created at
 	CreatedAt *TimestampCriterionInput `json:"created_at"`
 	// Filter by updated at
diff --git a/pkg/models/scene.go b/pkg/models/scene.go
index 9f28d40ba..f0a863bf7 100644
--- a/pkg/models/scene.go
+++ b/pkg/models/scene.go
@@ -111,6 +111,8 @@ type SceneFilterType struct {
 	MoviesFilter *GroupFilterType `json:"movies_filter"`
 	// Filter by related markers that meet this criteria
 	MarkersFilter *SceneMarkerFilterType `json:"markers_filter"`
+	// Filter by related files that meet this criteria
+	FilesFilter *FileFilterType `json:"files_filter"`
 	// Filter by created at
 	CreatedAt *TimestampCriterionInput `json:"created_at"`
 	// Filter by updated at
diff --git a/pkg/sqlite/criterion_handlers.go b/pkg/sqlite/criterion_handlers.go
index 82b9cfc65..fe6d1fcb5 100644
--- a/pkg/sqlite/criterion_handlers.go
+++ b/pkg/sqlite/criterion_handlers.go
@@ -1041,6 +1041,7 @@ type relatedFilterHandler struct {
 	relatedRepo    repository
 	relatedHandler criterionHandler
 	joinFn         func(f *filterBuilder)
+	directJoin     bool
 }
 
 func (h *relatedFilterHandler) handle(ctx context.Context, f *filterBuilder) {
@@ -1054,6 +1055,16 @@ func (h *relatedFilterHandler) handle(ctx context.Context, f *filterBuilder) {
 		return
 	}
 
+	if h.joinFn != nil {
+		h.joinFn(f)
+	}
+
+	if h.directJoin {
+		// rerun handler using existing filter builder
+		h.relatedHandler.handle(ctx, f)
+		return
+	}
+
 	subQuery := h.relatedRepo.newQuery()
 	selectIDs(&subQuery, subQuery.repository.tableName)
 	if err := subQuery.addFilter(ff); err != nil {
@@ -1061,9 +1072,5 @@ func (h *relatedFilterHandler) handle(ctx context.Context, f *filterBuilder) {
 		return
 	}
 
-	if h.joinFn != nil {
-		h.joinFn(f)
-	}
-
 	f.addWhere(fmt.Sprintf("%s IN ("+subQuery.toSQL(false)+")", h.relatedIDCol), subQuery.args...)
 }
diff --git a/pkg/sqlite/file.go b/pkg/sqlite/file.go
index ad3442ff7..2144356c5 100644
--- a/pkg/sqlite/file.go
+++ b/pkg/sqlite/file.go
@@ -285,7 +285,7 @@ type fileRepositoryType struct {
 var (
 	fileRepository = fileRepositoryType{
 		repository: repository{
-			tableName: sceneTable,
+			tableName: fileTable,
 			idColumn:  idColumn,
 		},
 		scenes: joinRepository{
diff --git a/pkg/sqlite/file_filter.go b/pkg/sqlite/file_filter.go
index 60ca01648..12c7ba3d5 100644
--- a/pkg/sqlite/file_filter.go
+++ b/pkg/sqlite/file_filter.go
@@ -10,6 +10,8 @@ import (
 
 type fileFilterHandler struct {
 	fileFilter *models.FileFilterType
+	// if true, don't allow use of related filters
+	isRelated bool
 }
 
 func (qb *fileFilterHandler) validate() error {
@@ -22,8 +24,12 @@ func (qb *fileFilterHandler) validate() error {
 		return err
 	}
 
+	if qb.isRelated && (fileFilter.ScenesFilter != nil || fileFilter.ImagesFilter != nil || fileFilter.GalleriesFilter != nil) {
+		return fmt.Errorf("cannot use related filters inside a related filter")
+	}
+
 	if subFilter := fileFilter.SubFilter(); subFilter != nil {
-		sqb := &fileFilterHandler{fileFilter: subFilter}
+		sqb := &fileFilterHandler{fileFilter: subFilter, isRelated: qb.isRelated}
 		if err := sqb.validate(); err != nil {
 			return err
 		}
@@ -45,7 +51,7 @@ func (qb *fileFilterHandler) handle(ctx context.Context, f *filterBuilder) {
 
 	sf := fileFilter.SubFilter()
 	if sf != nil {
-		sub := &fileFilterHandler{sf}
+		sub := &fileFilterHandler{sf, qb.isRelated}
 		handleSubFilter(ctx, sub, f, fileFilter.OperatorFilter)
 	}
 
diff --git a/pkg/sqlite/folder_filter.go b/pkg/sqlite/folder_filter.go
index 2fda0d1e3..6b2bd96e9 100644
--- a/pkg/sqlite/folder_filter.go
+++ b/pkg/sqlite/folder_filter.go
@@ -9,6 +9,8 @@ import (
 
 type folderFilterHandler struct {
 	folderFilter *models.FolderFilterType
+	table        sqlTable
+	isRelated    bool
 }
 
 func (qb *folderFilterHandler) validate() error {
@@ -21,8 +23,12 @@ func (qb *folderFilterHandler) validate() error {
 		return err
 	}
 
+	if qb.isRelated && (folderFilter.GalleriesFilter != nil) {
+		return fmt.Errorf("cannot use related filters inside a related filter")
+	}
+
 	if subFilter := folderFilter.SubFilter(); subFilter != nil {
-		sqb := &folderFilterHandler{folderFilter: subFilter}
+		sqb := &folderFilterHandler{folderFilter: subFilter, isRelated: qb.isRelated}
 		if err := sqb.validate(); err != nil {
 			return err
 		}
@@ -44,7 +50,7 @@ func (qb *folderFilterHandler) handle(ctx context.Context, f *filterBuilder) {
 
 	sf := folderFilter.SubFilter()
 	if sf != nil {
-		sub := &folderFilterHandler{sf}
+		sub := &folderFilterHandler{folderFilter: sf, table: qb.table}
 		handleSubFilter(ctx, sub, f, folderFilter.OperatorFilter)
 	}
 
@@ -52,25 +58,29 @@ func (qb *folderFilterHandler) handle(ctx context.Context, f *filterBuilder) {
 }
 
 func (qb *folderFilterHandler) criterionHandler() criterionHandler {
+	if qb.table == "" {
+		qb.table = folderTable
+	}
+
 	folderFilter := qb.folderFilter
 	return compoundHandler{
-		stringCriterionHandler(folderFilter.Path, "folders.path"),
-		&timestampCriterionHandler{folderFilter.ModTime, "folders.mod_time", nil},
+		stringCriterionHandler(folderFilter.Path, qb.table.Col("path")),
+		&timestampCriterionHandler{folderFilter.ModTime, qb.table.Col("mod_time"), nil},
 
 		qb.parentFolderCriterionHandler(folderFilter.ParentFolder),
 		qb.zipFileCriterionHandler(folderFilter.ZipFile),
 
 		qb.galleryCountCriterionHandler(folderFilter.GalleryCount),
 
-		&timestampCriterionHandler{folderFilter.CreatedAt, "folders.created_at", nil},
-		&timestampCriterionHandler{folderFilter.UpdatedAt, "folders.updated_at", nil},
+		&timestampCriterionHandler{folderFilter.CreatedAt, qb.table.Col("created_at"), nil},
+		&timestampCriterionHandler{folderFilter.UpdatedAt, qb.table.Col("updated_at"), nil},
 
 		&relatedFilterHandler{
-			relatedIDCol:   "galleries.id",
+			relatedIDCol:   qb.table.Col("id"),
 			relatedRepo:    galleryRepository.repository,
 			relatedHandler: &galleryFilterHandler{folderFilter.GalleriesFilter},
 			joinFn: func(f *filterBuilder) {
-				folderRepository.galleries.innerJoin(f, "", "folders.id")
+				folderRepository.galleries.innerJoin(f, "", qb.table.Col("id"))
 			},
 		},
 	}
@@ -85,7 +95,7 @@ func (qb *folderFilterHandler) zipFileCriterionHandler(criterion *models.MultiCr
 					notClause = "NOT"
 				}
 
-				f.addWhere(fmt.Sprintf("folders.zip_file_id IS %s NULL", notClause))
+				f.addWhere(fmt.Sprintf("%s.zip_file_id IS %s NULL", qb.table.Name(), notClause))
 				return
 			}
 
@@ -102,9 +112,9 @@ func (qb *folderFilterHandler) zipFileCriterionHandler(criterion *models.MultiCr
 			havingClause := ""
 			switch criterion.Modifier {
 			case models.CriterionModifierIncludes:
-				whereClause = "folders.zip_file_id IN " + getInBinding(len(criterion.Value))
+				whereClause = fmt.Sprintf("%s.zip_file_id IN %s", qb.table.Name(), getInBinding(len(criterion.Value)))
 			case models.CriterionModifierExcludes:
-				whereClause = "folders.zip_file_id NOT IN " + getInBinding(len(criterion.Value))
+				whereClause = fmt.Sprintf("%s.zip_file_id NOT IN %s", qb.table.Name(), getInBinding(len(criterion.Value)))
 			}
 
 			f.addWhere(whereClause, args...)
@@ -128,8 +138,8 @@ func (qb *folderFilterHandler) parentFolderCriterionHandler(folder *models.Hiera
 		}
 
 		hh := hierarchicalMultiCriterionHandlerBuilder{
-			primaryTable: folderTable,
-			foreignTable: folderTable,
+			primaryTable: qb.table.Name(),
+			foreignTable: qb.table.Name(),
 			foreignFK:    "parent_folder_id",
 			parentFK:     "parent_folder_id",
 		}
diff --git a/pkg/sqlite/gallery_filter.go b/pkg/sqlite/gallery_filter.go
index 18718c511..f05ff7b81 100644
--- a/pkg/sqlite/gallery_filter.go
+++ b/pkg/sqlite/gallery_filter.go
@@ -146,6 +146,36 @@ func (qb *galleryFilterHandler) criterionHandler() criterionHandler {
 				galleryRepository.tags.innerJoin(f, "gallery_tag", "galleries.id")
 			},
 		},
+
+		&relatedFilterHandler{
+			relatedIDCol: "files.id",
+			relatedRepo:  fileRepository.repository,
+			relatedHandler: &fileFilterHandler{
+				fileFilter: filter.FilesFilter,
+				isRelated:  true,
+			},
+			joinFn: func(f *filterBuilder) {
+				galleryRepository.addFilesTable(f)
+				galleryRepository.addFoldersTable(f)
+			},
+			// don't use a subquery; join directly
+			directJoin: true,
+		},
+
+		&relatedFilterHandler{
+			relatedIDCol: "gallery_folder.id",
+			relatedRepo:  folderRepository.repository,
+			relatedHandler: &folderFilterHandler{
+				folderFilter: filter.FoldersFilter,
+				table:        "gallery_folder",
+				isRelated:    true,
+			},
+			joinFn: func(f *filterBuilder) {
+				f.addLeftJoin(folderTable, "gallery_folder", "galleries.folder_id = gallery_folder.id")
+			},
+			// don't use a subquery; join directly
+			directJoin: true,
+		},
 	}
 }
 
diff --git a/pkg/sqlite/image_filter.go b/pkg/sqlite/image_filter.go
index 8f2d5d6b9..1d119bfde 100644
--- a/pkg/sqlite/image_filter.go
+++ b/pkg/sqlite/image_filter.go
@@ -123,6 +123,21 @@ func (qb *imageFilterHandler) criterionHandler() criterionHandler {
 				imageRepository.tags.innerJoin(f, "image_tag", "images.id")
 			},
 		},
+
+		&relatedFilterHandler{
+			relatedIDCol: "files.id",
+			relatedRepo:  fileRepository.repository,
+			relatedHandler: &fileFilterHandler{
+				fileFilter: imageFilter.FilesFilter,
+				isRelated:  true,
+			},
+			joinFn: func(f *filterBuilder) {
+				imageRepository.addFilesTable(f)
+				imageRepository.addFoldersTable(f)
+			},
+			// don't use a subquery; join directly
+			directJoin: true,
+		},
 	}
 }
 
diff --git a/pkg/sqlite/scene_filter.go b/pkg/sqlite/scene_filter.go
index 86432a4af..fad300248 100644
--- a/pkg/sqlite/scene_filter.go
+++ b/pkg/sqlite/scene_filter.go
@@ -202,6 +202,21 @@ func (qb *sceneFilterHandler) criterionHandler() criterionHandler {
 			},
 		},
 
+		&relatedFilterHandler{
+			relatedIDCol: "files.id",
+			relatedRepo:  fileRepository.repository,
+			relatedHandler: &fileFilterHandler{
+				fileFilter: sceneFilter.FilesFilter,
+				isRelated:  true,
+			},
+			joinFn: func(f *filterBuilder) {
+				qb.addFilesTable(f)
+				qb.addFoldersTable(f)
+			},
+			// don't use a subquery; join directly
+			directJoin: true,
+		},
+
 		&relatedFilterHandler{
 			relatedIDCol:   "scene_markers.id",
 			relatedRepo:    sceneMarkerRepository.repository,
diff --git a/pkg/sqlite/sql.go b/pkg/sqlite/sql.go
index 780d2e988..2d5922555 100644
--- a/pkg/sqlite/sql.go
+++ b/pkg/sqlite/sql.go
@@ -362,3 +362,13 @@ func coalesce(column string) string {
 func like(v string) string {
 	return "%" + v + "%"
 }
+
+type sqlTable string
+
+func (t sqlTable) Name() string {
+	return string(t)
+}
+
+func (t sqlTable) Col(n string) string {
+	return fmt.Sprintf("%s.%s", string(t), n)
+}

From 42f76ca34f5af60a9ffe3739f946e4ab5b1c4735 Mon Sep 17 00:00:00 2001
From: Gykes <24581046+Gykes@users.noreply.github.com>
Date: Wed, 5 Nov 2025 22:26:30 -0800
Subject: [PATCH 107/405] Filter by Studio (#6155)

---
 pkg/sqlite/scene.go                      | 4 ++++
 ui/v2.5/src/models/list-filter/scenes.ts | 1 +
 2 files changed, 5 insertions(+)

diff --git a/pkg/sqlite/scene.go b/pkg/sqlite/scene.go
index 0a7829f28..ccabbbcf6 100644
--- a/pkg/sqlite/scene.go
+++ b/pkg/sqlite/scene.go
@@ -1096,6 +1096,7 @@ var sceneSortOptions = sortOptions{
 	"perceptual_similarity",
 	"random",
 	"rating",
+	"studio",
 	"tag_count",
 	"title",
 	"updated_at",
@@ -1208,6 +1209,9 @@ func (qb *SceneStore) setSceneSort(query *queryBuilder, findFilter *models.FindF
 		query.sortAndPagination += fmt.Sprintf(" ORDER BY (SELECT MAX(o_date) FROM %s AS sort WHERE sort.%s = %s.id) %s", scenesODatesTable, sceneIDColumn, sceneTable, getSortDirection(direction))
 	case "o_counter":
 		query.sortAndPagination += getCountSort(sceneTable, scenesODatesTable, sceneIDColumn, direction)
+	case "studio":
+		query.join(studioTable, "", "scenes.studio_id = studios.id")
+		query.sortAndPagination += getSort("name", direction, studioTable)
 	default:
 		query.sortAndPagination += getSort(sort, direction, "scenes")
 	}
diff --git a/ui/v2.5/src/models/list-filter/scenes.ts b/ui/v2.5/src/models/list-filter/scenes.ts
index 592b8b6fe..d59f87d99 100644
--- a/ui/v2.5/src/models/list-filter/scenes.ts
+++ b/ui/v2.5/src/models/list-filter/scenes.ts
@@ -53,6 +53,7 @@ const sortByOptions = [
   "interactive",
   "interactive_speed",
   "perceptual_similarity",
+  "studio",
   ...MediaSortByOptions,
 ]
   .map(ListFilterOptions.createSortBy)

From 095e5d50ab1edfe95452cd2347b5378632041d78 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 6 Nov 2025 17:33:35 +1100
Subject: [PATCH 108/405] Bump github.com/go-viper/mapstructure/v2 from 2.2.1
 to 2.4.0 (#6061)

Bumps [github.com/go-viper/mapstructure/v2](https://github.com/go-viper/mapstructure) from 2.2.1 to 2.4.0.
- [Release notes](https://github.com/go-viper/mapstructure/releases)
- [Changelog](https://github.com/go-viper/mapstructure/blob/main/CHANGELOG.md)
- [Commits](https://github.com/go-viper/mapstructure/compare/v2.2.1...v2.4.0)

---
updated-dependencies:
- dependency-name: github.com/go-viper/mapstructure/v2
  dependency-version: 2.4.0
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index 268276841..81fb65315 100644
--- a/go.mod
+++ b/go.mod
@@ -74,7 +74,7 @@ require (
 	github.com/dlclark/regexp2 v1.7.0 // indirect
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
 	github.com/go-sourcemap/sourcemap v2.1.3+incompatible // indirect
-	github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
+	github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
 	github.com/gobwas/httphead v0.1.0 // indirect
 	github.com/gobwas/pool v0.2.1 // indirect
 	github.com/gobwas/ws v1.3.0 // indirect
diff --git a/go.sum b/go.sum
index bbb38befb..c4529c489 100644
--- a/go.sum
+++ b/go.sum
@@ -236,8 +236,8 @@ github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/me
 github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
 github.com/go-toast/toast v0.0.0-20190211030409-01e6764cf0a4 h1:qZNfIGkIANxGv/OqtnntR4DfOY2+BgwR60cAcu/i3SE=
 github.com/go-toast/toast v0.0.0-20190211030409-01e6764cf0a4/go.mod h1:kW3HQ4UdaAyrUCSSDR4xUzBKW6O2iA4uHhk7AtyYp10=
-github.com/go-viper/mapstructure/v2 v2.2.1 h1:ZAaOCxANMuZx5RCeg0mBdEZk7DZasvvZIxtHqx8aGss=
-github.com/go-viper/mapstructure/v2 v2.2.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
+github.com/go-viper/mapstructure/v2 v2.4.0 h1:EBsztssimR/CONLSZZ04E8qAkxNYq4Qp9LvH92wZUgs=
+github.com/go-viper/mapstructure/v2 v2.4.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
 github.com/gobwas/httphead v0.1.0 h1:exrUm0f4YX0L7EBwZHuCF4GDp8aJfVeBrlLQrs6NqWU=
 github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM=
 github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og=

From 20fa5d3146788dc57ad326e1eb2dc31d066c6c82 Mon Sep 17 00:00:00 2001
From: Colin Alexander Duffy <63363428+AngelaDMerkel@users.noreply.github.com>
Date: Thu, 6 Nov 2025 02:09:40 -0500
Subject: [PATCH 109/405] Add JXL (#6184)

---
 pkg/file/image/scan.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/file/image/scan.go b/pkg/file/image/scan.go
index a1d63f649..635f421e4 100644
--- a/pkg/file/image/scan.go
+++ b/pkg/file/image/scan.go
@@ -50,7 +50,7 @@ func (d *Decorator) Decorate(ctx context.Context, fs models.FS, f models.File) (
 
 	isClip := true
 	// This list is derived from ffmpegImageThumbnail in pkg/image/thumbnail. If one gets updated, the other should be as well
-	for _, item := range []string{"png", "mjpeg", "webp", "bmp"} {
+	for _, item := range []string{"png", "mjpeg", "webp", "bmp", "jpegxl"} {
 		if item == probe.VideoCodec {
 			isClip = false
 		}

From 96a7e087f2fbb84eb11a27949df24c3aef069de0 Mon Sep 17 00:00:00 2001
From: stashcoder42 <92344712+stashcoder42@users.noreply.github.com>
Date: Thu, 6 Nov 2025 02:20:52 -0500
Subject: [PATCH 110/405] Upgrade to koanf 2.2.1 (#5985)

---
 go.mod                            |  12 +++-
 go.sum                            | 107 +++++-------------------------
 internal/manager/config/config.go |   2 +-
 internal/manager/config/init.go   |   2 +-
 4 files changed, 29 insertions(+), 94 deletions(-)

diff --git a/go.mod b/go.mod
index 81fb65315..1fc666b4f 100644
--- a/go.mod
+++ b/go.mod
@@ -32,7 +32,11 @@ require (
 	github.com/json-iterator/go v1.1.12
 	github.com/kermieisinthehouse/gosx-notifier v0.1.2
 	github.com/kermieisinthehouse/systray v1.2.4
-	github.com/knadh/koanf v1.5.0
+	github.com/knadh/koanf/parsers/yaml v1.1.0
+	github.com/knadh/koanf/providers/env v1.1.0
+	github.com/knadh/koanf/providers/file v1.2.0
+	github.com/knadh/koanf/providers/posflag v1.0.1
+	github.com/knadh/koanf/v2 v2.2.1
 	github.com/lucasb-eyer/go-colorful v1.2.0
 	github.com/mattn/go-sqlite3 v1.14.22
 	github.com/mitchellh/mapstructure v1.5.0
@@ -42,7 +46,7 @@ require (
 	github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd
 	github.com/sirupsen/logrus v1.9.3
 	github.com/spf13/cast v1.6.0
-	github.com/spf13/pflag v1.0.5
+	github.com/spf13/pflag v1.0.6
 	github.com/stretchr/testify v1.10.0
 	github.com/tidwall/gjson v1.16.0
 	github.com/vearutop/statigz v1.4.0
@@ -72,7 +76,7 @@ require (
 	github.com/cpuguy83/go-md2man/v2 v2.0.7 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dlclark/regexp2 v1.7.0 // indirect
-	github.com/fsnotify/fsnotify v1.6.0 // indirect
+	github.com/fsnotify/fsnotify v1.9.0 // indirect
 	github.com/go-sourcemap/sourcemap v2.1.3+incompatible // indirect
 	github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
 	github.com/gobwas/httphead v0.1.0 // indirect
@@ -86,6 +90,7 @@ require (
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
+	github.com/knadh/koanf/maps v0.1.2 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-colorable v0.1.14 // indirect
@@ -114,6 +119,7 @@ require (
 	github.com/urfave/cli/v2 v2.27.6 // indirect
 	github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
 	go.uber.org/atomic v1.11.0 // indirect
+	go.yaml.in/yaml/v3 v3.0.3 // indirect
 	golang.org/x/mod v0.24.0 // indirect
 	golang.org/x/sync v0.14.0 // indirect
 	golang.org/x/tools v0.33.0 // indirect
diff --git a/go.sum b/go.sum
index c4529c489..2ce973b4a 100644
--- a/go.sum
+++ b/go.sum
@@ -72,7 +72,6 @@ github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuy
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
-github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
 github.com/anacrolix/dms v1.2.2 h1:0mk2/DXNqa5KDDbaLgFPf3oMV6VCGdFNh3d/gt4oafM=
 github.com/anacrolix/dms v1.2.2/go.mod h1:msPKAoppoNRfrYplJqx63FZ+VipDZ4Xsj3KzIQxyU7k=
 github.com/anacrolix/envpprof v0.0.0-20180404065416-323002cec2fa/go.mod h1:KgHhUaQMc8cC0+cEflSgCFNFbKwi5h54gqtVn8yhP7c=
@@ -104,16 +103,6 @@ github.com/asticode/go-astisub v0.25.1 h1:RZMGfZPp7CXOkI6g+zCU7DRLuciGPGup921uKZ
 github.com/asticode/go-astisub v0.25.1/go.mod h1:WTkuSzFB+Bp7wezuSf2Oxulj5A8zu2zLRVFf6bIFQK8=
 github.com/asticode/go-astits v1.8.0 h1:rf6aiiGn/QhlFjNON1n5plqF3Fs025XLUwiQ0NB6oZg=
 github.com/asticode/go-astits v1.8.0/go.mod h1:DkOWmBNQpnr9mv24KfZjq4JawCFX1FCqjLVGvO0DygQ=
-github.com/aws/aws-sdk-go-v2 v1.9.2/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4=
-github.com/aws/aws-sdk-go-v2/config v1.8.3/go.mod h1:4AEiLtAb8kLs7vgw2ZV3p2VZ1+hBavOc84hqxVNpCyw=
-github.com/aws/aws-sdk-go-v2/credentials v1.4.3/go.mod h1:FNNC6nQZQUuyhq5aE5c7ata8o9e4ECGmS4lAXC7o1mQ=
-github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.6.0/go.mod h1:gqlclDEZp4aqJOancXK6TN24aKhT0W0Ae9MHk3wzTMM=
-github.com/aws/aws-sdk-go-v2/internal/ini v1.2.4/go.mod h1:ZcBrrI3zBKlhGFNYWvju0I3TR93I7YIgAfy82Fh4lcQ=
-github.com/aws/aws-sdk-go-v2/service/appconfig v1.4.2/go.mod h1:FZ3HkCe+b10uFZZkFdvf98LHW21k49W8o8J366lqVKY=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.3.2/go.mod h1:72HRZDLMtmVQiLG2tLfQcaWLCssELvGl+Zf2WVxMmR8=
-github.com/aws/aws-sdk-go-v2/service/sso v1.4.2/go.mod h1:NBvT9R1MEF+Ud6ApJKM0G+IkPchKS7p7c2YPKwHmBOk=
-github.com/aws/aws-sdk-go-v2/service/sts v1.7.2/go.mod h1:8EzeIqfWt2wWT4rJVu3f21TfrhJ8AEMzVybRNSb/b4g=
-github.com/aws/smithy-go v1.8.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
@@ -185,7 +174,6 @@ github.com/dop251/goja_nodejs v0.0.0-20211022123610-8dd9abb0616d/go.mod h1:DngW8
 github.com/doug-martin/goqu/v9 v9.18.0 h1:/6bcuEtAe6nsSMVK/M+fOiXUNfyFF3yYtE07DBPFMYY=
 github.com/doug-martin/goqu/v9 v9.18.0/go.mod h1:nf0Wc2/hV3gYK9LiyqIrzBEVGlI8qW3GuDCEobC4wBQ=
 github.com/dustin/go-humanize v0.0.0-20180421182945-02af3965c54e/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
-github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
@@ -200,13 +188,11 @@ github.com/envoyproxy/protoc-gen-validate v0.6.2/go.mod h1:2t7qjJNvHPx8IjnBOzl9E
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
 github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
-github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
 github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
 github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
-github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU=
-github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
-github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
+github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
+github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/glycerine/go-unsnap-stream v0.0.0-20180323001048-9f0cb55181dd/go.mod h1:/20jfyN9Y5QPEAprSgKAUr+glWDY39ZiUEAYOEv5dsE=
 github.com/glycerine/goconvey v0.0.0-20180728074245-46e3a41ad493/go.mod h1:Ogl1Tioa0aV7gstGFO7KhffUsb9M4ydbEbbxpcEDc24=
@@ -222,18 +208,14 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
-github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
-github.com/go-ldap/ldap v3.0.2+incompatible/go.mod h1:qfd9rJvER9Q0/D/Sqn1DfHRoBp40uXYvFoEVrNEPqRc=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
-github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
 github.com/go-sourcemap/sourcemap v2.1.3+incompatible h1:W1iEw64niKVGogNgBN3ePyLFfuisuzeidWPMPWmECqU=
 github.com/go-sourcemap/sourcemap v2.1.3+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg=
 github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y=
 github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
-github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
 github.com/go-toast/toast v0.0.0-20190211030409-01e6764cf0a4 h1:qZNfIGkIANxGv/OqtnntR4DfOY2+BgwR60cAcu/i3SE=
 github.com/go-toast/toast v0.0.0-20190211030409-01e6764cf0a4/go.mod h1:kW3HQ4UdaAyrUCSSDR4xUzBKW6O2iA4uHhk7AtyYp10=
 github.com/go-viper/mapstructure/v2 v2.4.0 h1:EBsztssimR/CONLSZZ04E8qAkxNYq4Qp9LvH92wZUgs=
@@ -288,7 +270,6 @@ github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaS
 github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM=
 github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/btree v0.0.0-20180124185431-e89373fe6b4a/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
@@ -305,7 +286,6 @@ github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
 github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
@@ -346,11 +326,9 @@ github.com/gorilla/sessions v1.2.1 h1:DHd3rPN5lE3Ts3D8rKkQ8x/0kqfeNmBAaiSi+o7Fsg
 github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM=
 github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
 github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
 github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
 github.com/hashicorp/consul/api v1.11.0/go.mod h1:XjsvQN+RJGWI2TWy1/kqaE16HrR2J/FWgkYjdZQsX9M=
 github.com/hashicorp/consul/api v1.12.0/go.mod h1:6pVBMo0ebnYdt2S3H87XhekM/HHrUoTD2XXb/VrZVy0=
-github.com/hashicorp/consul/api v1.13.0/go.mod h1:ZlVrynguJKcYr54zGaDbaL3fOvKC9m72FhPvA8T35KQ=
 github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
@@ -358,8 +336,6 @@ github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brv
 github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
 github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
 github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
-github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod h1:9bjs9uLqI8l75knNv3lV1kA55veR+WUPSiKIWcQHudI=
-github.com/hashicorp/go-hclog v0.8.0/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ=
 github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
 github.com/hashicorp/go-hclog v1.0.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
 github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
@@ -369,17 +345,12 @@ github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHh
 github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA=
 github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
 github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
-github.com/hashicorp/go-plugin v1.0.1/go.mod h1:++UyYGoz3o5w9ZzAdZxtQKrWWP+iqPBn3cQptSMzBuY=
 github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs=
-github.com/hashicorp/go-retryablehttp v0.5.4/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs=
-github.com/hashicorp/go-rootcerts v1.0.1/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8=
 github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8=
 github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU=
-github.com/hashicorp/go-sockaddr v1.0.2/go.mod h1:rB4wwRAUzs07qva3c5SdrY/NEtAUjGlgmH/UkBUC97A=
 github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4=
 github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
 github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
-github.com/hashicorp/go-version v1.1.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
@@ -394,14 +365,8 @@ github.com/hashicorp/memberlist v0.2.2/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOn
 github.com/hashicorp/memberlist v0.3.0/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE=
 github.com/hashicorp/serf v0.9.5/go.mod h1:UWDWwZeL5cuWDJdl0C6wrvrUwEqtQ4ZKBKKENpqIUyk=
 github.com/hashicorp/serf v0.9.6/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4=
-github.com/hashicorp/vault/api v1.0.4/go.mod h1:gDcqh3WGcR1cpF5AJz/B1UFheUEneMoIospckxBxk6Q=
-github.com/hashicorp/vault/sdk v0.1.13/go.mod h1:B+hVj7TpuQY1Y/GPbCpffmgd+tSEwvhkWnjtSYCaS2M=
-github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=
-github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=
 github.com/hasura/go-graphql-client v0.13.1 h1:kKbjhxhpwz58usVl+Xvgah/TDha5K2akNTRQdsEHN6U=
 github.com/hasura/go-graphql-client v0.13.1/go.mod h1:k7FF7h53C+hSNFRG3++DdVZWIuHdCaTbI7siTJ//zGQ=
-github.com/hjson/hjson-go/v4 v4.0.0 h1:wlm6IYYqHjOdXH1gHev4VoXCaW20HdQAGCxdOEEg2cs=
-github.com/hjson/hjson-go/v4 v4.0.0/go.mod h1:KaYt3bTw3zhBjYqnXkYywcYctk0A2nxeEFTse3rH13E=
 github.com/huandu/xstrings v1.0.0/go.mod h1:4qWG/gcEcfX4z/mBDHJ++3ReCw9ibxbsNJbcucJdbSo=
 github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
@@ -412,18 +377,12 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/jinzhu/copier v0.4.0 h1:w3ciUoD19shMCRargcpm0cm91ytaBhDvuRpz1ODO/U8=
 github.com/jinzhu/copier v0.4.0/go.mod h1:DfbEm0FYsaqBcKcFuvmOZb218JkPGtvSHsKg8S8hyyg=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
 github.com/jmoiron/sqlx v1.4.0 h1:1PLqN7S1UYp5t4SrVVnt4nUVNemrDAtxlulVe+Qgm3o=
 github.com/jmoiron/sqlx v1.4.0/go.mod h1:ZrZ7UsYB/weZdl2Bxg6jCRO9c3YHl8r3ahlKmRT4JLY=
-github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc=
-github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
 github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
-github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
@@ -431,17 +390,25 @@ github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
 github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
-github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
 github.com/kermieisinthehouse/gosx-notifier v0.1.2 h1:KV0KBeKK2B24kIHY7iK0jgS64Q05f4oB+hUZmsPodxQ=
 github.com/kermieisinthehouse/gosx-notifier v0.1.2/go.mod h1:xyWT07azFtUOcHl96qMVvKhvKzsMcS7rKTHQyv8WTho=
 github.com/kermieisinthehouse/systray v1.2.4 h1:pdH5vnl+KKjRrVCRU4g/2W1/0HVzuuJ6WXHlPPHYY6s=
 github.com/kermieisinthehouse/systray v1.2.4/go.mod h1:axh6C/jNuSyC0QGtidZJURc9h+h41HNoMySoLVrhVR4=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/knadh/koanf v1.5.0 h1:q2TSd/3Pyc/5yP9ldIrSdIz26MCcyNQzW0pEAugLPNs=
-github.com/knadh/koanf v1.5.0/go.mod h1:Hgyjp4y8v44hpZtPzs7JZfRAW5AhN7KfZcwv1RYggDs=
+github.com/knadh/koanf/maps v0.1.2 h1:RBfmAW5CnZT+PJ1CVc1QSJKf4Xu9kxfQgYVQSu8hpbo=
+github.com/knadh/koanf/maps v0.1.2/go.mod h1:npD/QZY3V6ghQDdcQzl1W4ICNVTkohC8E73eI2xW4yI=
+github.com/knadh/koanf/parsers/yaml v1.1.0 h1:3ltfm9ljprAHt4jxgeYLlFPmUaunuCgu1yILuTXRdM4=
+github.com/knadh/koanf/parsers/yaml v1.1.0/go.mod h1:HHmcHXUrp9cOPcuC+2wrr44GTUB0EC+PyfN3HZD9tFg=
+github.com/knadh/koanf/providers/env v1.1.0 h1:U2VXPY0f+CsNDkvdsG8GcsnK4ah85WwWyJgef9oQMSc=
+github.com/knadh/koanf/providers/env v1.1.0/go.mod h1:QhHHHZ87h9JxJAn2czdEl6pdkNnDh/JS1Vtsyt65hTY=
+github.com/knadh/koanf/providers/file v1.2.0 h1:hrUJ6Y9YOA49aNu/RSYzOTFlqzXSCpmYIDXI7OJU6+U=
+github.com/knadh/koanf/providers/file v1.2.0/go.mod h1:bp1PM5f83Q+TOUu10J/0ApLBd9uIzg+n9UgthfY+nRA=
+github.com/knadh/koanf/providers/posflag v1.0.1 h1:EnMxHSrPkYCFnKgBUl5KBgrjed8gVFrcXDzaW4l/C6Y=
+github.com/knadh/koanf/providers/posflag v1.0.1/go.mod h1:3Wn3+YG3f4ljzRyCUgIwH7G0sZ1pMjCOsNBovrbKmAk=
+github.com/knadh/koanf/v2 v2.2.1 h1:jaleChtw85y3UdBnI0wCqcg1sj1gPoz6D3caGNHtrNE=
+github.com/knadh/koanf/v2 v2.2.1/go.mod h1:PSFru3ufQgTsI7IF+95rf9s8XA1+aHxKuO/W+dPoHEY=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
@@ -492,22 +459,17 @@ github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5
 github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
 github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso=
 github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI=
-github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
 github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI=
-github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw=
 github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw=
 github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s=
 github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
-github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
 github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
-github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
 github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
-github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
 github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
 github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -519,26 +481,20 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae/go.mod h1:qAyveg+e4CE+eKJXWVjKXM4ck2QobLqTDytGJbLLhJg=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
-github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/natefinch/pie v0.0.0-20170715172608-9a0d72014007 h1:Ohgj9L0EYOgXxkDp+bczlMBiulwmqYzQpvQNUdtt3oc=
 github.com/natefinch/pie v0.0.0-20170715172608-9a0d72014007/go.mod h1:wKCOWMb6iNlvKiOToY2cNuaovSXvIiv1zDi9QDR7aGQ=
 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ=
 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
-github.com/npillmayer/nestext v0.1.3/go.mod h1:h2lrijH8jpicr25dFY+oAJLyzlya6jhnuG+zWp9L0Uk=
 github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d h1:VhgPp6v9qf9Agr/56bj7Y/xa04UccTW04VP0Qed4vnQ=
 github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d/go.mod h1:YUTz3bUH2ZwIWBy3CJBeOBEugqcmXREj14T+iG/4k4U=
-github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
 github.com/orisano/pixelmatch v0.0.0-20220722002657-fb0b55479cde h1:x0TT0RDC7UhAVbbWWBzr41ElhJx5tXPWkIHA2HWPRuw=
 github.com/orisano/pixelmatch v0.0.0-20220722002657-fb0b55479cde/go.mod h1:nZgzbfBr3hhjoZnS66nKrHmduYNpc34ny7RK4z5/HM0=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
-github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE=
-github.com/pelletier/go-toml v1.9.4 h1:tjENF6MfZAg8e4ZmZTeWaWiT2vXtsoO6+iuOjFhECwM=
 github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
 github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4=
 github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc=
 github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU=
-github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
 github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 h1:KoWmjvw+nsYOo29YJK9vDA65RGE3NrOnUtO7a+RF9HU=
 github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -555,24 +511,17 @@ github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSg
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
 github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU=
-github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
-github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4=
-github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
-github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
-github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
-github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
 github.com/remeh/sizedwaitgroup v1.0.0 h1:VNGGFwNo/R5+MJBf6yrsr110p0m4/OX4S3DCy7Kyl5E=
 github.com/remeh/sizedwaitgroup v1.0.0/go.mod h1:3j2R4OIe/SeS6YDhICBy22RWjJC5eNCJ1V+9+NVNYlo=
-github.com/rhnvrm/simples3 v0.6.1/go.mod h1:Y+3vYm2V7Y4VijFoJHHTrja6OgPrJ2cBti8dPGkC3sA=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
@@ -590,8 +539,6 @@ github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQD
 github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd h1:CmH9+J6ZSsIjUK3dcGsnCnO41eRBOnY12zwkn5qVwgc=
 github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd/go.mod h1:hPqNNc0+uJM6H+SuU8sEs5K5IQeKccPqeSjfgcKGgPk=
 github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
-github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
-github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc=
 github.com/ryszard/goskiplist v0.0.0-20150312221310-2dfbae5fcf46/go.mod h1:uAQ5PCi+MFsC7HjREoAz1BU+Mq60+05gifQSsHSDG/8=
 github.com/sagikazarmark/crypt v0.3.0/go.mod h1:uD/D+6UF4SrIR1uGEv7bBNkNqLGqUr43MRiaGWX1Nig=
 github.com/sagikazarmark/crypt v0.4.0/go.mod h1:ALv2SRj7GxYV4HO9elxH9nS6M9gW+xDNxqmyJ6RfDFM=
@@ -600,7 +547,6 @@ github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8=
 github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
-github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
@@ -621,8 +567,9 @@ github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I=
 github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0=
 github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk=
 github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
-github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
+github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/spf13/viper v1.10.0/go.mod h1:SoyBPwAtKDzypXNDFKN5kzH7ppppbGZtls1UpIy5AsM=
 github.com/spf13/viper v1.10.1/go.mod h1:IGlFPqhNAPKRxohIzWpI5QEy4kuI7tcl5WvR+8qy1rU=
 github.com/spf13/viper v1.16.0 h1:rGGH0XDZhdUOryiDWjmIvUSWpbNqisK8Wk0Vyefw8hc=
@@ -683,11 +630,8 @@ github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5t
 github.com/zencoder/go-dash/v3 v3.0.2 h1:oP1+dOh+Gp57PkvdCyMfbHtrHaxfl3w4kR3KBBbuqQE=
 github.com/zencoder/go-dash/v3 v3.0.2/go.mod h1:30R5bKy1aUYY45yesjtZ9l8trNc2TwNqbS17WVQmCzk=
 go.etcd.io/etcd/api/v3 v3.5.1/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs=
-go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A=
 go.etcd.io/etcd/client/pkg/v3 v3.5.1/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g=
-go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g=
 go.etcd.io/etcd/client/v2 v2.305.1/go.mod h1:pMEacxZW7o8pg4CrFE7pquyCJJzZvkvdD2RibOCCCGs=
-go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
 go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
@@ -701,6 +645,8 @@ go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=
 go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
 go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
 go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo=
+go.yaml.in/yaml/v3 v3.0.3 h1:bXOww4E/J3f66rav3pX3m8w6jDE4knZjGOw8b5Y6iNE=
+go.yaml.in/yaml/v3 v3.0.3/go.mod h1:tBHosrYAkRZjRAOREWbDnBXUf08JOwYq++0QNwQiWzI=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
@@ -850,11 +796,9 @@ golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190415145633-3fd5a3612ccd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -866,12 +810,10 @@ golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -886,8 +828,6 @@ golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -895,7 +835,6 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -908,7 +847,6 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -931,7 +869,6 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -945,7 +882,6 @@ golang.org/x/term v0.32.0/go.mod h1:uZG1FhGx848Sqfsq4/DlJr3xGGsYMu/L5GW4abiaEPQ=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@@ -1068,7 +1004,6 @@ google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
@@ -1132,11 +1067,9 @@ google.golang.org/genproto v0.0.0-20211129164237-f09f9a12af12/go.mod h1:5CzLGKJ6
 google.golang.org/genproto v0.0.0-20211203200212-54befc351ae9/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
 google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
 google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
 google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
-google.golang.org/grpc v1.22.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
 google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
@@ -1177,7 +1110,6 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
-gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -1190,14 +1122,12 @@ gopkg.in/ini.v1 v1.66.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/ini.v1 v1.66.3/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
 gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
-gopkg.in/square/go-jose.v2 v2.3.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
@@ -1214,4 +1144,3 @@ honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
-sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
diff --git a/internal/manager/config/config.go b/internal/manager/config/config.go
index 9b3b5bf21..65e1bad51 100644
--- a/internal/manager/config/config.go
+++ b/internal/manager/config/config.go
@@ -16,9 +16,9 @@ import (
 
 	"golang.org/x/crypto/bcrypt"
 
-	"github.com/knadh/koanf"
 	"github.com/knadh/koanf/parsers/yaml"
 	"github.com/knadh/koanf/providers/file"
+	"github.com/knadh/koanf/v2"
 
 	"github.com/stashapp/stash/internal/identify"
 	"github.com/stashapp/stash/pkg/fsutil"
diff --git a/internal/manager/config/init.go b/internal/manager/config/init.go
index 09f1c18bc..840b50b70 100644
--- a/internal/manager/config/init.go
+++ b/internal/manager/config/init.go
@@ -8,9 +8,9 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/knadh/koanf"
 	"github.com/knadh/koanf/providers/env"
 	"github.com/knadh/koanf/providers/posflag"
+	"github.com/knadh/koanf/v2"
 	"github.com/spf13/pflag"
 
 	"github.com/stashapp/stash/pkg/fsutil"

From d52b6afd4ac9931158c8682d829f21005b283af4 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Fri, 7 Nov 2025 15:11:17 +1100
Subject: [PATCH 111/405] Separate search clear effect from config saving
 (#6247)

Fixes Scrape results cache eviction in tagger view
---
 ui/v2.5/src/components/Tagger/context.tsx | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ui/v2.5/src/components/Tagger/context.tsx b/ui/v2.5/src/components/Tagger/context.tsx
index 7db84a11a..0db1fba1e 100644
--- a/ui/v2.5/src/components/Tagger/context.tsx
+++ b/ui/v2.5/src/components/Tagger/context.tsx
@@ -173,6 +173,7 @@ export const TaggerContext: React.FC = ({ children }) => {
     setSources(stashboxSources.concat(scraperSources));
   }, [Scrapers.data, stashConfig]);
 
+  // set the current source on load
   useEffect(() => {
     if (!sources.length || currentSource) {
       return;
@@ -191,8 +192,13 @@ export const TaggerContext: React.FC = ({ children }) => {
     setCurrentSource(sources[0]);
   }, [sources, currentSource, config]);
 
+  // clear the search results when the source changes
   useEffect(() => {
     setSearchResults({});
+  }, [currentSource]);
+
+  // keep selected endpoint in config in sync with current source
+  useEffect(() => {
     const selectedEndpoint = currentSource?.sourceInput.stash_box_endpoint;
     if (selectedEndpoint && selectedEndpoint !== config.selectedEndpoint) {
       setConfig({

From 600cb15102cd321682728683b3379eec09d92941 Mon Sep 17 00:00:00 2001
From: feederbox826 <me@feederbox.cc>
Date: Sun, 9 Nov 2025 17:17:25 -0500
Subject: [PATCH 112/405] [packaging] switch to pnpm (#6186)

* [packaging] switch to pnpm
* Bump compiler version
* Change pnpm store in docker build
---------

Co-authored-by: feederbox826 <feederbox826@users.noreply.github.com>
Co-authored-by: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
---
 .github/workflows/build.yml                   |     8 +-
 .github/workflows/golangci-lint.yml           |     2 +-
 Makefile                                      |    34 +-
 docker/build/x86_64/Dockerfile                |     6 +-
 docker/build/x86_64/Dockerfile-CUDA           |     4 +-
 docker/compiler/Dockerfile                    |    11 +-
 docker/compiler/Makefile                      |     2 +-
 docs/DEVELOPMENT.md                           |    11 +-
 pkg/plugin/examples/react-component/README.md |     4 +-
 .../examples/react-component/package.json     |     8 +-
 .../examples/react-component/pnpm-lock.yaml   |  1578 +++
 pkg/plugin/examples/react-component/yarn.lock |  1282 --
 ui/v2.5/.prettierignore                       |     4 +-
 ui/v2.5/README.md                             |    12 +-
 ui/v2.5/package.json                          |     7 +-
 ui/v2.5/pnpm-lock.yaml                        | 11148 ++++++++++++++++
 ui/v2.5/pnpm-workspace.yaml                   |     4 +
 ui/v2.5/src/core/StashService.ts              |     2 +-
 ui/v2.5/yarn.lock                             |  8344 ------------
 19 files changed, 12797 insertions(+), 9674 deletions(-)
 create mode 100644 pkg/plugin/examples/react-component/pnpm-lock.yaml
 delete mode 100644 pkg/plugin/examples/react-component/yarn.lock
 create mode 100644 ui/v2.5/pnpm-lock.yaml
 create mode 100644 ui/v2.5/pnpm-workspace.yaml
 delete mode 100644 ui/v2.5/yarn.lock

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 92c98effc..8d455a7d7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -12,7 +12,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  COMPILER_IMAGE: stashapp/compiler:11
+  COMPILER_IMAGE: stashapp/compiler:12
 
 jobs:
   build:
@@ -37,7 +37,7 @@ jobs:
         cache-name: cache-node_modules
       with:
         path: ui/v2.5/node_modules
-        key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('ui/v2.5/yarn.lock') }}
+        key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('ui/v2.5/pnpm-lock.yaml') }}
 
     - name: Cache UI build
       uses: actions/cache@v3
@@ -46,7 +46,7 @@ jobs:
         cache-name: cache-ui
       with:
         path: ui/v2.5/build
-        key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('ui/v2.5/yarn.lock', 'ui/v2.5/public/**', 'ui/v2.5/src/**', 'graphql/**/*.graphql') }}
+        key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('ui/v2.5/pnpm-lock.yaml', 'ui/v2.5/public/**', 'ui/v2.5/src/**', 'graphql/**/*.graphql') }}
 
     - name: Cache go build
       uses: actions/cache@v3
@@ -65,7 +65,7 @@ jobs:
         docker run -d --name build --mount type=bind,source="$(pwd)",target=/stash,consistency=delegated --mount type=bind,source="$(pwd)/.go-cache",target=/root/.cache/go-build,consistency=delegated --env OFFICIAL_BUILD=${{ env.official-build }} -w /stash $COMPILER_IMAGE tail -f /dev/null
 
     - name: Pre-install
-      run: docker exec -t build /bin/bash -c "make pre-ui"
+      run: docker exec -t build /bin/bash -c "make CI=1 pre-ui"
 
     - name: Generate
       run: docker exec -t build /bin/bash -c "make generate"
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
index 1b7838b62..cd5b7d61c 100644
--- a/.github/workflows/golangci-lint.yml
+++ b/.github/workflows/golangci-lint.yml
@@ -9,7 +9,7 @@ on:
   pull_request:
 
 env:
-  COMPILER_IMAGE: stashapp/compiler:11
+  COMPILER_IMAGE: stashapp/compiler:12
 
 jobs:
   golangci:
diff --git a/Makefile b/Makefile
index b6d0a9e28..7e19063a3 100644
--- a/Makefile
+++ b/Makefile
@@ -275,7 +275,7 @@ generate: generate-backend generate-ui
 
 .PHONY: generate-ui
 generate-ui:
-	cd ui/v2.5 && yarn run gqlgen
+	cd ui/v2.5 && npm run gqlgen
 
 .PHONY: generate-backend
 generate-backend: touch-ui
@@ -338,9 +338,19 @@ server-clean:
 
 # installs UI dependencies. Run when first cloning repository, or if UI
 # dependencies have changed
+# If CI is set, configures pnpm to use a local store to avoid
+# putting .pnpm-store in /stash
+# NOTE: to run in the docker build container, using the existing
+# node_modules folder, rename the .modules.yaml to .modules.yaml.bak
+# and a new one will be generated. This will need to be reversed after
+# building.
 .PHONY: pre-ui
 pre-ui:
-	cd ui/v2.5 && yarn install --frozen-lockfile
+ifdef CI
+	cd ui/v2.5 && pnpm config set store-dir ~/.pnpm-store && pnpm install --frozen-lockfile
+else
+	cd ui/v2.5 && pnpm install --frozen-lockfile
+endif
 
 .PHONY: ui-env
 ui-env: build-info
@@ -359,7 +369,7 @@ ui: ui-only generate-login-locale
 
 .PHONY: ui-only
 ui-only: ui-env
-	cd ui/v2.5 && yarn build
+	cd ui/v2.5 && npm run build
 
 .PHONY: zip-ui
 zip-ui:
@@ -368,20 +378,24 @@ zip-ui:
 
 .PHONY: ui-start
 ui-start: ui-env
-	cd ui/v2.5 && yarn start --host
+	cd ui/v2.5 && npm run start -- --host
 
 .PHONY: fmt-ui
 fmt-ui:
-	cd ui/v2.5 && yarn format
+	cd ui/v2.5 && npm run format
 
 # runs all of the frontend PR-acceptance steps
 .PHONY: validate-ui
 validate-ui:
-	cd ui/v2.5 && yarn run validate
+	cd ui/v2.5 && npm run validate
 
 # these targets run the same steps as fmt-ui and validate-ui, but only on files that have changed
 fmt-ui-quick:
-	cd ui/v2.5 && yarn run prettier --write $$(git diff --name-only --relative --diff-filter d . ../../graphql)
+	cd ui/v2.5 && \
+	files=$$(git diff --name-only --relative --diff-filter d . ../../graphql); \
+	if [ -n "$$files" ]; then \
+	  npm run prettier -- --write $$files; \
+	fi
 
 # does not run tsc checks, as they are slow
 validate-ui-quick:
@@ -389,9 +403,9 @@ validate-ui-quick:
 	tsfiles=$$(git diff --name-only --relative --diff-filter d src | grep -e "\.tsx\?\$$"); \
 	scssfiles=$$(git diff --name-only --relative --diff-filter d src | grep "\.scss"); \
 	prettyfiles=$$(git diff --name-only --relative --diff-filter d . ../../graphql); \
-	if [ -n "$$tsfiles" ]; then yarn run eslint $$tsfiles; fi && \
-	if [ -n "$$scssfiles" ]; then yarn run stylelint $$scssfiles; fi && \
-	if [ -n "$$prettyfiles" ]; then yarn run prettier --check $$prettyfiles; fi
+	if [ -n "$$tsfiles" ]; then npm run eslint -- $$tsfiles; fi && \
+	if [ -n "$$scssfiles" ]; then npm run stylelint -- $$scssfiles; fi && \
+	if [ -n "$$prettyfiles" ]; then npm run prettier -- --check $$prettyfiles; fi
 
 # runs all of the backend PR-acceptance steps
 .PHONY: validate-backend
diff --git a/docker/build/x86_64/Dockerfile b/docker/build/x86_64/Dockerfile
index 4d153e8bc..163bd64b2 100644
--- a/docker/build/x86_64/Dockerfile
+++ b/docker/build/x86_64/Dockerfile
@@ -1,14 +1,16 @@
 # This dockerfile should be built with `make docker-build` from the stash root.
 
 # Build Frontend
-FROM node:20-alpine AS frontend
+FROM node:24-alpine AS frontend
 RUN apk add --no-cache make git
 ## cache node_modules separately
-COPY ./ui/v2.5/package.json ./ui/v2.5/yarn.lock /stash/ui/v2.5/
+COPY ./ui/v2.5/package.json ./ui/v2.5/pnpm-lock.yaml /stash/ui/v2.5/
 WORKDIR /stash
 COPY Makefile /stash/
 COPY ./graphql /stash/graphql/
 COPY ./ui /stash/ui/
+# pnpm install with npm
+RUN npm install -g pnpm
 RUN make pre-ui
 RUN make generate-ui
 ARG GITHASH
diff --git a/docker/build/x86_64/Dockerfile-CUDA b/docker/build/x86_64/Dockerfile-CUDA
index 4cab3f6c1..8a0b02e10 100644
--- a/docker/build/x86_64/Dockerfile-CUDA
+++ b/docker/build/x86_64/Dockerfile-CUDA
@@ -5,11 +5,13 @@ ARG CUDA_VERSION=12.8.0
 FROM node:20-alpine AS frontend
 RUN apk add --no-cache make git
 ## cache node_modules separately
-COPY ./ui/v2.5/package.json ./ui/v2.5/yarn.lock /stash/ui/v2.5/
+COPY ./ui/v2.5/package.json ./ui/v2.5/pnpm-lock.yaml /stash/ui/v2.5/
 WORKDIR /stash
 COPY Makefile /stash/
 COPY ./graphql /stash/graphql/
 COPY ./ui /stash/ui/
+# pnpm install with npm
+RUN npm install -g pnpm
 RUN make pre-ui
 RUN make generate-ui
 ARG GITHASH
diff --git a/docker/compiler/Dockerfile b/docker/compiler/Dockerfile
index 40b92c180..0154d7e61 100644
--- a/docker/compiler/Dockerfile
+++ b/docker/compiler/Dockerfile
@@ -8,15 +8,11 @@ RUN mkdir -p /etc/apt/keyrings
 
 ADD https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key nodesource.gpg.key
 RUN cat nodesource.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && rm nodesource.gpg.key
-RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
-
-ADD https://dl.yarnpkg.com/debian/pubkey.gpg yarn.gpg
-RUN cat yarn.gpg | gpg --dearmor -o /etc/apt/keyrings/yarn.gpg && rm yarn.gpg
-RUN echo "deb [signed-by=/etc/apt/keyrings/yarn.gpg] https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
+RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_24.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
-        git make tar bash nodejs yarn zip \
+        git make tar bash nodejs zip \
         clang llvm-dev cmake patch libxml2-dev uuid-dev libssl-dev xz-utils \
         bzip2 gzip sed cpio libbz2-dev zlib1g-dev \
         gcc-mingw-w64 \
@@ -24,6 +20,9 @@ RUN apt-get update && \
         gcc-aarch64-linux-gnu libc-dev-arm64-cross && \
     rm -rf /var/lib/apt/lists/*;
 
+# pnpm install with npm
+RUN npm install -g pnpm
+
 # FreeBSD cross-compilation setup
 # https://github.com/smartmontools/docker-build/blob/6b8c92560d17d325310ba02d9f5a4b250cb0764a/Dockerfile#L66
 ENV FREEBSD_VERSION       13.4
diff --git a/docker/compiler/Makefile b/docker/compiler/Makefile
index 275466640..ed6a9a285 100644
--- a/docker/compiler/Makefile
+++ b/docker/compiler/Makefile
@@ -1,6 +1,6 @@
 user=stashapp
 repo=compiler
-version=11
+version=12
 
 latest:
 	docker build -t ${user}/${repo}:latest .
diff --git a/docs/DEVELOPMENT.md b/docs/DEVELOPMENT.md
index 68bb34f99..85c2f6f23 100644
--- a/docs/DEVELOPMENT.md
+++ b/docs/DEVELOPMENT.md
@@ -5,7 +5,8 @@
 * [Go](https://golang.org/dl/)
 * [GolangCI](https://golangci-lint.run/) - A meta-linter which runs several linters in parallel
   * To install, follow the [local installation instructions](https://golangci-lint.run/welcome/install/#local-installation)
-* [Yarn](https://yarnpkg.com/en/docs/install) - Yarn package manager
+* [nodejs](https://nodejs.org/en/download) - nodejs runtime
+  * corepack/[pnpm](https://pnpm.io/installation) - nodejs package manager (included with nodejs)
 
 ## Environment
 
@@ -22,21 +23,21 @@ NOTE: The `make` command in Windows will be `mingw32-make` with MinGW. For examp
 ### macOS
 
 1. If you don't have it already, install the [Homebrew package manager](https://brew.sh).
-2. Install dependencies: `brew install go git yarn gcc make node ffmpeg`
+2. Install dependencies: `brew install go git gcc make node ffmpeg`
 
 ### Linux
 
 #### Arch Linux
 
-1. Install dependencies: `sudo pacman -S go git yarn gcc make nodejs ffmpeg --needed`
+1. Install dependencies: `sudo pacman -S go git gcc make nodejs ffmpeg --needed`
 
 #### Ubuntu
 
-1. Install dependencies: `sudo apt-get install golang git yarnpkg gcc nodejs ffmpeg -y`
+1. Install dependencies: `sudo apt-get install golang git gcc nodejs ffmpeg -y`
 
 ### OpenBSD
 
-1. Install dependencies `doas pkg_add gmake go git yarn node cmake ffmpeg`
+1. Install dependencies `doas pkg_add gmake go git node cmake ffmpeg`
 2. Follow the instructions below to build a release, but replace the final step `make build-release` with `gmake flags-release stash`, to [avoid the PIE buildmode](https://github.com/golang/go/issues/59866).
 
 NOTE: The `make` command in OpenBSD will be `gmake`. For example, `make pre-ui` will be `gmake pre-ui`.
diff --git a/pkg/plugin/examples/react-component/README.md b/pkg/plugin/examples/react-component/README.md
index 5a42a3749..383b47235 100644
--- a/pkg/plugin/examples/react-component/README.md
+++ b/pkg/plugin/examples/react-component/README.md
@@ -1,7 +1,7 @@
 This is a reference React component plugin. It replaces the `details` part of scene cards with a list of performers and tags.
 
 To build:
-- run `yarn install --frozen-lockfile`
-- run `yarn run build`
+- run `pnpm install --frozen-lockfile`
+- run `npm run build`
 
 This will copy the plugin files into the `dist` directory. These files can be copied to a `plugins` directory. 
diff --git a/pkg/plugin/examples/react-component/package.json b/pkg/plugin/examples/react-component/package.json
index b37205d9c..1c07e5774 100644
--- a/pkg/plugin/examples/react-component/package.json
+++ b/pkg/plugin/examples/react-component/package.json
@@ -5,11 +5,11 @@
   "author": "WithoutPants",
   "license": "AGPL-3.0",
   "scripts": {
-    "compile:ts": "yarn tsc",
-    "compile:sass": "yarn sass src/testReact.scss dist/testReact.css",
+    "compile:ts": "npm run tsc",
+    "compile:sass": "npm run sass src/testReact.scss dist/testReact.css",
     "copy:yml": "cpx \"src/testReact.yml\" \"dist\"",
-    "compile": "yarn run compile:ts && yarn run compile:sass",
-    "build": "yarn run compile && yarn run copy:yml"
+    "compile": "npm run compile:ts && npm run compile:sass",
+    "build": "npm run compile && npm run copy:yml"
   },
   "devDependencies": {
     "@types/react": "^18.2.31",
diff --git a/pkg/plugin/examples/react-component/pnpm-lock.yaml b/pkg/plugin/examples/react-component/pnpm-lock.yaml
new file mode 100644
index 000000000..d19c17347
--- /dev/null
+++ b/pkg/plugin/examples/react-component/pnpm-lock.yaml
@@ -0,0 +1,1578 @@
+lockfileVersion: '9.0'
+
+settings:
+  autoInstallPeers: true
+  excludeLinksFromLockfile: false
+
+importers:
+
+  .:
+    devDependencies:
+      '@types/react':
+        specifier: ^18.2.31
+        version: 18.3.26
+      '@types/react-dom':
+        specifier: ^18.2.14
+        version: 18.3.7(@types/react@18.3.26)
+      cpx:
+        specifier: ^1.5.0
+        version: 1.5.0
+      sass:
+        specifier: ^1.69.4
+        version: 1.93.2
+      typescript:
+        specifier: ^5.2.2
+        version: 5.9.3
+
+packages:
+
+  '@parcel/watcher-android-arm64@2.5.1':
+    resolution: {integrity: sha512-KF8+j9nNbUN8vzOFDpRMsaKBHZ/mcjEjMToVMJOhTozkDonQFFrRcfdLWn6yWKCmJKmdVxSgHiYvTCef4/qcBA==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [arm64]
+    os: [android]
+
+  '@parcel/watcher-darwin-arm64@2.5.1':
+    resolution: {integrity: sha512-eAzPv5osDmZyBhou8PoF4i6RQXAfeKL9tjb3QzYuccXFMQU0ruIc/POh30ePnaOyD1UXdlKguHBmsTs53tVoPw==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@parcel/watcher-darwin-x64@2.5.1':
+    resolution: {integrity: sha512-1ZXDthrnNmwv10A0/3AJNZ9JGlzrF82i3gNQcWOzd7nJ8aj+ILyW1MTxVk35Db0u91oD5Nlk9MBiujMlwmeXZg==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [x64]
+    os: [darwin]
+
+  '@parcel/watcher-freebsd-x64@2.5.1':
+    resolution: {integrity: sha512-SI4eljM7Flp9yPuKi8W0ird8TI/JK6CSxju3NojVI6BjHsTyK7zxA9urjVjEKJ5MBYC+bLmMcbAWlZ+rFkLpJQ==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [x64]
+    os: [freebsd]
+
+  '@parcel/watcher-linux-arm-glibc@2.5.1':
+    resolution: {integrity: sha512-RCdZlEyTs8geyBkkcnPWvtXLY44BCeZKmGYRtSgtwwnHR4dxfHRG3gR99XdMEdQ7KeiDdasJwwvNSF5jKtDwdA==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [arm]
+    os: [linux]
+
+  '@parcel/watcher-linux-arm-musl@2.5.1':
+    resolution: {integrity: sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [arm]
+    os: [linux]
+
+  '@parcel/watcher-linux-arm64-glibc@2.5.1':
+    resolution: {integrity: sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@parcel/watcher-linux-arm64-musl@2.5.1':
+    resolution: {integrity: sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@parcel/watcher-linux-x64-glibc@2.5.1':
+    resolution: {integrity: sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [x64]
+    os: [linux]
+
+  '@parcel/watcher-linux-x64-musl@2.5.1':
+    resolution: {integrity: sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [x64]
+    os: [linux]
+
+  '@parcel/watcher-win32-arm64@2.5.1':
+    resolution: {integrity: sha512-RFzklRvmc3PkjKjry3hLF9wD7ppR4AKcWNzH7kXR7GUe0Igb3Nz8fyPwtZCSquGrhU5HhUNDr/mKBqj7tqA2Vw==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [arm64]
+    os: [win32]
+
+  '@parcel/watcher-win32-ia32@2.5.1':
+    resolution: {integrity: sha512-c2KkcVN+NJmuA7CGlaGD1qJh1cLfDnQsHjE89E60vUEMlqduHGCdCLJCID5geFVM0dOtA3ZiIO8BoEQmzQVfpQ==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [ia32]
+    os: [win32]
+
+  '@parcel/watcher-win32-x64@2.5.1':
+    resolution: {integrity: sha512-9lHBdJITeNR++EvSQVUcaZoWupyHfXe1jZvGZ06O/5MflPcuPLtEphScIBL+AiCWBO46tDSHzWyD0uDmmZqsgA==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [x64]
+    os: [win32]
+
+  '@parcel/watcher@2.5.1':
+    resolution: {integrity: sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg==}
+    engines: {node: '>= 10.0.0'}
+
+  '@types/prop-types@15.7.15':
+    resolution: {integrity: sha512-F6bEyamV9jKGAFBEmlQnesRPGOQqS2+Uwi0Em15xenOxHaf2hv6L8YCVn3rPdPJOiJfPiCnLIRyvwVaqMY3MIw==}
+
+  '@types/react-dom@18.3.7':
+    resolution: {integrity: sha512-MEe3UeoENYVFXzoXEWsvcpg6ZvlrFNlOQ7EOsvhI3CfAXwzPfO8Qwuxd40nepsYKqyyVQnTdEfv68q91yLcKrQ==}
+    peerDependencies:
+      '@types/react': ^18.0.0
+
+  '@types/react@18.3.26':
+    resolution: {integrity: sha512-RFA/bURkcKzx/X9oumPG9Vp3D3JUgus/d0b67KB0t5S/raciymilkOa66olh78MUI92QLbEJevO7rvqU/kjwKA==}
+
+  anymatch@1.3.2:
+    resolution: {integrity: sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==}
+
+  arr-diff@2.0.0:
+    resolution: {integrity: sha512-dtXTVMkh6VkEEA7OhXnN1Ecb8aAGFdZ1LFxtOCoqj4qkyOJMt7+qs6Ahdy6p/NQCPYsRSXXivhSB/J5E9jmYKA==}
+    engines: {node: '>=0.10.0'}
+
+  arr-diff@4.0.0:
+    resolution: {integrity: sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==}
+    engines: {node: '>=0.10.0'}
+
+  arr-flatten@1.1.0:
+    resolution: {integrity: sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==}
+    engines: {node: '>=0.10.0'}
+
+  arr-union@3.1.0:
+    resolution: {integrity: sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==}
+    engines: {node: '>=0.10.0'}
+
+  array-unique@0.2.1:
+    resolution: {integrity: sha512-G2n5bG5fSUCpnsXz4+8FUkYsGPkNfLn9YvS66U5qbTIXI2Ynnlo4Bi42bWv+omKUCqz+ejzfClwne0alJWJPhg==}
+    engines: {node: '>=0.10.0'}
+
+  array-unique@0.3.2:
+    resolution: {integrity: sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==}
+    engines: {node: '>=0.10.0'}
+
+  assign-symbols@1.0.0:
+    resolution: {integrity: sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==}
+    engines: {node: '>=0.10.0'}
+
+  async-each@1.0.6:
+    resolution: {integrity: sha512-c646jH1avxr+aVpndVMeAfYw7wAa6idufrlN3LPA4PmKS0QEGp6PIC9nwz0WQkkvBGAMEki3pFdtxaF39J9vvg==}
+
+  atob@2.1.2:
+    resolution: {integrity: sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==}
+    engines: {node: '>= 4.5.0'}
+    hasBin: true
+
+  babel-runtime@6.26.0:
+    resolution: {integrity: sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g==}
+
+  balanced-match@1.0.2:
+    resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
+
+  base@0.11.2:
+    resolution: {integrity: sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==}
+    engines: {node: '>=0.10.0'}
+
+  binary-extensions@1.13.1:
+    resolution: {integrity: sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==}
+    engines: {node: '>=0.10.0'}
+
+  bindings@1.5.0:
+    resolution: {integrity: sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==}
+
+  brace-expansion@1.1.12:
+    resolution: {integrity: sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==}
+
+  braces@1.8.5:
+    resolution: {integrity: sha512-xU7bpz2ytJl1bH9cgIurjpg/n8Gohy9GTw81heDYLJQ4RU60dlyJsa+atVF2pI0yMMvKxI9HkKwjePCj5XI1hw==}
+    engines: {node: '>=0.10.0'}
+
+  braces@2.3.2:
+    resolution: {integrity: sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==}
+    engines: {node: '>=0.10.0'}
+
+  braces@3.0.3:
+    resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==}
+    engines: {node: '>=8'}
+
+  cache-base@1.0.1:
+    resolution: {integrity: sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==}
+    engines: {node: '>=0.10.0'}
+
+  chokidar@1.7.0:
+    resolution: {integrity: sha512-mk8fAWcRUOxY7btlLtitj3A45jOwSAxH4tOFOoEGbVsl6cL6pPMWUy7dwZ/canfj3QEdP6FHSnf/l1c6/WkzVg==}
+
+  chokidar@4.0.3:
+    resolution: {integrity: sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==}
+    engines: {node: '>= 14.16.0'}
+
+  class-utils@0.3.6:
+    resolution: {integrity: sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==}
+    engines: {node: '>=0.10.0'}
+
+  collection-visit@1.0.0:
+    resolution: {integrity: sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw==}
+    engines: {node: '>=0.10.0'}
+
+  component-emitter@1.3.1:
+    resolution: {integrity: sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ==}
+
+  concat-map@0.0.1:
+    resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==}
+
+  copy-descriptor@0.1.1:
+    resolution: {integrity: sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==}
+    engines: {node: '>=0.10.0'}
+
+  core-js@2.6.12:
+    resolution: {integrity: sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==}
+    deprecated: core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.
+
+  core-util-is@1.0.3:
+    resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==}
+
+  cpx@1.5.0:
+    resolution: {integrity: sha512-jHTjZhsbg9xWgsP2vuNW2jnnzBX+p4T+vNI9Lbjzs1n4KhOfa22bQppiFYLsWQKd8TzmL5aSP/Me3yfsCwXbDA==}
+    hasBin: true
+
+  csstype@3.1.3:
+    resolution: {integrity: sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==}
+
+  debug@2.6.9:
+    resolution: {integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
+
+  decode-uri-component@0.2.2:
+    resolution: {integrity: sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==}
+    engines: {node: '>=0.10'}
+
+  define-property@0.2.5:
+    resolution: {integrity: sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==}
+    engines: {node: '>=0.10.0'}
+
+  define-property@1.0.0:
+    resolution: {integrity: sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==}
+    engines: {node: '>=0.10.0'}
+
+  define-property@2.0.2:
+    resolution: {integrity: sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==}
+    engines: {node: '>=0.10.0'}
+
+  detect-libc@1.0.3:
+    resolution: {integrity: sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==}
+    engines: {node: '>=0.10'}
+    hasBin: true
+
+  duplexer@0.1.2:
+    resolution: {integrity: sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==}
+
+  expand-brackets@0.1.5:
+    resolution: {integrity: sha512-hxx03P2dJxss6ceIeri9cmYOT4SRs3Zk3afZwWpOsRqLqprhTR8u++SlC+sFGsQr7WGFPdMF7Gjc1njDLDK6UA==}
+    engines: {node: '>=0.10.0'}
+
+  expand-brackets@2.1.4:
+    resolution: {integrity: sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==}
+    engines: {node: '>=0.10.0'}
+
+  expand-range@1.8.2:
+    resolution: {integrity: sha512-AFASGfIlnIbkKPQwX1yHaDjFvh/1gyKJODme52V6IORh69uEYgZp0o9C+qsIGNVEiuuhQU0CSSl++Rlegg1qvA==}
+    engines: {node: '>=0.10.0'}
+
+  extend-shallow@2.0.1:
+    resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
+    engines: {node: '>=0.10.0'}
+
+  extend-shallow@3.0.2:
+    resolution: {integrity: sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==}
+    engines: {node: '>=0.10.0'}
+
+  extglob@0.3.2:
+    resolution: {integrity: sha512-1FOj1LOwn42TMrruOHGt18HemVnbwAmAak7krWk+wa93KXxGbK+2jpezm+ytJYDaBX0/SPLZFHKM7m+tKobWGg==}
+    engines: {node: '>=0.10.0'}
+
+  extglob@2.0.4:
+    resolution: {integrity: sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==}
+    engines: {node: '>=0.10.0'}
+
+  file-uri-to-path@1.0.0:
+    resolution: {integrity: sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==}
+
+  filename-regex@2.0.1:
+    resolution: {integrity: sha512-BTCqyBaWBTsauvnHiE8i562+EdJj+oUpkqWp2R1iCoR8f6oo8STRu3of7WJJ0TqWtxN50a5YFpzYK4Jj9esYfQ==}
+    engines: {node: '>=0.10.0'}
+
+  fill-range@2.2.4:
+    resolution: {integrity: sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==}
+    engines: {node: '>=0.10.0'}
+
+  fill-range@4.0.0:
+    resolution: {integrity: sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==}
+    engines: {node: '>=0.10.0'}
+
+  fill-range@7.1.1:
+    resolution: {integrity: sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==}
+    engines: {node: '>=8'}
+
+  find-index@0.1.1:
+    resolution: {integrity: sha512-uJ5vWrfBKMcE6y2Z8834dwEZj9mNGxYa3t3I53OwFeuZ8D9oc2E5zcsrkuhX6h4iYrjhiv0T3szQmxlAV9uxDg==}
+
+  for-in@1.0.2:
+    resolution: {integrity: sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==}
+    engines: {node: '>=0.10.0'}
+
+  for-own@0.1.5:
+    resolution: {integrity: sha512-SKmowqGTJoPzLO1T0BBJpkfp3EMacCMOuH40hOUbrbzElVktk4DioXVM99QkLCyKoiuOmyjgcWMpVz2xjE7LZw==}
+    engines: {node: '>=0.10.0'}
+
+  fragment-cache@0.2.1:
+    resolution: {integrity: sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA==}
+    engines: {node: '>=0.10.0'}
+
+  fs.realpath@1.0.0:
+    resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
+
+  fsevents@1.2.13:
+    resolution: {integrity: sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==}
+    engines: {node: '>= 4.0'}
+    os: [darwin]
+    deprecated: Upgrade to fsevents v2 to mitigate potential security issues
+
+  function-bind@1.1.2:
+    resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==}
+
+  get-value@2.0.6:
+    resolution: {integrity: sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==}
+    engines: {node: '>=0.10.0'}
+
+  glob-base@0.3.0:
+    resolution: {integrity: sha512-ab1S1g1EbO7YzauaJLkgLp7DZVAqj9M/dvKlTt8DkXA2tiOIcSMrlVI2J1RZyB5iJVccEscjGn+kpOG9788MHA==}
+    engines: {node: '>=0.10.0'}
+
+  glob-parent@2.0.0:
+    resolution: {integrity: sha512-JDYOvfxio/t42HKdxkAYaCiBN7oYiuxykOxKxdaUW5Qn0zaYN3gRQWolrwdnf0shM9/EP0ebuuTmyoXNr1cC5w==}
+
+  glob2base@0.0.12:
+    resolution: {integrity: sha512-ZyqlgowMbfj2NPjxaZZ/EtsXlOch28FRXgMd64vqZWk1bT9+wvSRLYD1om9M7QfQru51zJPAT17qXm4/zd+9QA==}
+    engines: {node: '>= 0.10'}
+
+  glob@7.2.3:
+    resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==}
+    deprecated: Glob versions prior to v9 are no longer supported
+
+  graceful-fs@4.2.11:
+    resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==}
+
+  has-value@0.3.1:
+    resolution: {integrity: sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==}
+    engines: {node: '>=0.10.0'}
+
+  has-value@1.0.0:
+    resolution: {integrity: sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw==}
+    engines: {node: '>=0.10.0'}
+
+  has-values@0.1.4:
+    resolution: {integrity: sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==}
+    engines: {node: '>=0.10.0'}
+
+  has-values@1.0.0:
+    resolution: {integrity: sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ==}
+    engines: {node: '>=0.10.0'}
+
+  hasown@2.0.2:
+    resolution: {integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==}
+    engines: {node: '>= 0.4'}
+
+  immutable@5.1.4:
+    resolution: {integrity: sha512-p6u1bG3YSnINT5RQmx/yRZBpenIl30kVxkTLDyHLIMk0gict704Q9n+thfDI7lTRm9vXdDYutVzXhzcThxTnXA==}
+
+  inflight@1.0.6:
+    resolution: {integrity: sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==}
+    deprecated: This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.
+
+  inherits@2.0.4:
+    resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==}
+
+  is-accessor-descriptor@1.0.1:
+    resolution: {integrity: sha512-YBUanLI8Yoihw923YeFUS5fs0fF2f5TSFTNiYAAzhhDscDa3lEqYuz1pDOEP5KvX94I9ey3vsqjJcLVFVU+3QA==}
+    engines: {node: '>= 0.10'}
+
+  is-binary-path@1.0.1:
+    resolution: {integrity: sha512-9fRVlXc0uCxEDj1nQzaWONSpbTfx0FmJfzHF7pwlI8DkWGoHBBea4Pg5Ky0ojwwxQmnSifgbKkI06Qv0Ljgj+Q==}
+    engines: {node: '>=0.10.0'}
+
+  is-buffer@1.1.6:
+    resolution: {integrity: sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==}
+
+  is-core-module@2.16.1:
+    resolution: {integrity: sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==}
+    engines: {node: '>= 0.4'}
+
+  is-data-descriptor@1.0.1:
+    resolution: {integrity: sha512-bc4NlCDiCr28U4aEsQ3Qs2491gVq4V8G7MQyws968ImqjKuYtTJXrl7Vq7jsN7Ly/C3xj5KWFrY7sHNeDkAzXw==}
+    engines: {node: '>= 0.4'}
+
+  is-descriptor@0.1.7:
+    resolution: {integrity: sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==}
+    engines: {node: '>= 0.4'}
+
+  is-descriptor@1.0.3:
+    resolution: {integrity: sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==}
+    engines: {node: '>= 0.4'}
+
+  is-dotfile@1.0.3:
+    resolution: {integrity: sha512-9YclgOGtN/f8zx0Pr4FQYMdibBiTaH3sn52vjYip4ZSf6C4/6RfTEZ+MR4GvKhCxdPh21Bg42/WL55f6KSnKpg==}
+    engines: {node: '>=0.10.0'}
+
+  is-equal-shallow@0.1.3:
+    resolution: {integrity: sha512-0EygVC5qPvIyb+gSz7zdD5/AAoS6Qrx1e//6N4yv4oNm30kqvdmG66oZFWVlQHUWe5OjP08FuTw2IdT0EOTcYA==}
+    engines: {node: '>=0.10.0'}
+
+  is-extendable@0.1.1:
+    resolution: {integrity: sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==}
+    engines: {node: '>=0.10.0'}
+
+  is-extendable@1.0.1:
+    resolution: {integrity: sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==}
+    engines: {node: '>=0.10.0'}
+
+  is-extglob@1.0.0:
+    resolution: {integrity: sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww==}
+    engines: {node: '>=0.10.0'}
+
+  is-extglob@2.1.1:
+    resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==}
+    engines: {node: '>=0.10.0'}
+
+  is-glob@2.0.1:
+    resolution: {integrity: sha512-a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg==}
+    engines: {node: '>=0.10.0'}
+
+  is-glob@4.0.3:
+    resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==}
+    engines: {node: '>=0.10.0'}
+
+  is-number@2.1.0:
+    resolution: {integrity: sha512-QUzH43Gfb9+5yckcrSA0VBDwEtDUchrk4F6tfJZQuNzDJbEDB9cZNzSfXGQ1jqmdDY/kl41lUOWM9syA8z8jlg==}
+    engines: {node: '>=0.10.0'}
+
+  is-number@3.0.0:
+    resolution: {integrity: sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==}
+    engines: {node: '>=0.10.0'}
+
+  is-number@4.0.0:
+    resolution: {integrity: sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==}
+    engines: {node: '>=0.10.0'}
+
+  is-number@7.0.0:
+    resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==}
+    engines: {node: '>=0.12.0'}
+
+  is-plain-object@2.0.4:
+    resolution: {integrity: sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==}
+    engines: {node: '>=0.10.0'}
+
+  is-posix-bracket@0.1.1:
+    resolution: {integrity: sha512-Yu68oeXJ7LeWNmZ3Zov/xg/oDBnBK2RNxwYY1ilNJX+tKKZqgPK+qOn/Gs9jEu66KDY9Netf5XLKNGzas/vPfQ==}
+    engines: {node: '>=0.10.0'}
+
+  is-primitive@2.0.0:
+    resolution: {integrity: sha512-N3w1tFaRfk3UrPfqeRyD+GYDASU3W5VinKhlORy8EWVf/sIdDL9GAcew85XmktCfH+ngG7SRXEVDoO18WMdB/Q==}
+    engines: {node: '>=0.10.0'}
+
+  is-windows@1.0.2:
+    resolution: {integrity: sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==}
+    engines: {node: '>=0.10.0'}
+
+  isarray@1.0.0:
+    resolution: {integrity: sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==}
+
+  isobject@2.1.0:
+    resolution: {integrity: sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==}
+    engines: {node: '>=0.10.0'}
+
+  isobject@3.0.1:
+    resolution: {integrity: sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==}
+    engines: {node: '>=0.10.0'}
+
+  kind-of@3.2.2:
+    resolution: {integrity: sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==}
+    engines: {node: '>=0.10.0'}
+
+  kind-of@4.0.0:
+    resolution: {integrity: sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==}
+    engines: {node: '>=0.10.0'}
+
+  kind-of@6.0.3:
+    resolution: {integrity: sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==}
+    engines: {node: '>=0.10.0'}
+
+  map-cache@0.2.2:
+    resolution: {integrity: sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==}
+    engines: {node: '>=0.10.0'}
+
+  map-visit@1.0.0:
+    resolution: {integrity: sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==}
+    engines: {node: '>=0.10.0'}
+
+  math-random@1.0.4:
+    resolution: {integrity: sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==}
+
+  micromatch@2.3.11:
+    resolution: {integrity: sha512-LnU2XFEk9xxSJ6rfgAry/ty5qwUTyHYOBU0g4R6tIw5ljwgGIBmiKhRWLw5NpMOnrgUNcDJ4WMp8rl3sYVHLNA==}
+    engines: {node: '>=0.10.0'}
+
+  micromatch@3.1.10:
+    resolution: {integrity: sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==}
+    engines: {node: '>=0.10.0'}
+
+  micromatch@4.0.8:
+    resolution: {integrity: sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==}
+    engines: {node: '>=8.6'}
+
+  minimatch@3.1.2:
+    resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==}
+
+  minimist@1.2.8:
+    resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==}
+
+  mixin-deep@1.3.2:
+    resolution: {integrity: sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==}
+    engines: {node: '>=0.10.0'}
+
+  mkdirp@0.5.6:
+    resolution: {integrity: sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==}
+    hasBin: true
+
+  ms@2.0.0:
+    resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==}
+
+  nan@2.23.0:
+    resolution: {integrity: sha512-1UxuyYGdoQHcGg87Lkqm3FzefucTa0NAiOcuRsDmysep3c1LVCRK2krrUDafMWtjSG04htvAmvg96+SDknOmgQ==}
+
+  nanomatch@1.2.13:
+    resolution: {integrity: sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==}
+    engines: {node: '>=0.10.0'}
+
+  node-addon-api@7.1.1:
+    resolution: {integrity: sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==}
+
+  normalize-path@2.1.1:
+    resolution: {integrity: sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==}
+    engines: {node: '>=0.10.0'}
+
+  object-copy@0.1.0:
+    resolution: {integrity: sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==}
+    engines: {node: '>=0.10.0'}
+
+  object-visit@1.0.1:
+    resolution: {integrity: sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==}
+    engines: {node: '>=0.10.0'}
+
+  object.omit@2.0.1:
+    resolution: {integrity: sha512-UiAM5mhmIuKLsOvrL+B0U2d1hXHF3bFYWIuH1LMpuV2EJEHG1Ntz06PgLEHjm6VFd87NpH8rastvPoyv6UW2fA==}
+    engines: {node: '>=0.10.0'}
+
+  object.pick@1.3.0:
+    resolution: {integrity: sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==}
+    engines: {node: '>=0.10.0'}
+
+  once@1.4.0:
+    resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==}
+
+  parse-glob@3.0.4:
+    resolution: {integrity: sha512-FC5TeK0AwXzq3tUBFtH74naWkPQCEWs4K+xMxWZBlKDWu0bVHXGZa+KKqxKidd7xwhdZ19ZNuF2uO1M/r196HA==}
+    engines: {node: '>=0.10.0'}
+
+  pascalcase@0.1.1:
+    resolution: {integrity: sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==}
+    engines: {node: '>=0.10.0'}
+
+  path-is-absolute@1.0.1:
+    resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==}
+    engines: {node: '>=0.10.0'}
+
+  path-parse@1.0.7:
+    resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==}
+
+  picomatch@2.3.1:
+    resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==}
+    engines: {node: '>=8.6'}
+
+  posix-character-classes@0.1.1:
+    resolution: {integrity: sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==}
+    engines: {node: '>=0.10.0'}
+
+  preserve@0.2.0:
+    resolution: {integrity: sha512-s/46sYeylUfHNjI+sA/78FAHlmIuKqI9wNnzEOGehAlUUYeObv5C2mOinXBjyUyWmJ2SfcS2/ydApH4hTF4WXQ==}
+    engines: {node: '>=0.10.0'}
+
+  process-nextick-args@2.0.1:
+    resolution: {integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==}
+
+  randomatic@3.1.1:
+    resolution: {integrity: sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw==}
+    engines: {node: '>= 0.10.0'}
+
+  readable-stream@2.3.8:
+    resolution: {integrity: sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==}
+
+  readdirp@2.2.1:
+    resolution: {integrity: sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==}
+    engines: {node: '>=0.10'}
+
+  readdirp@4.1.2:
+    resolution: {integrity: sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==}
+    engines: {node: '>= 14.18.0'}
+
+  regenerator-runtime@0.11.1:
+    resolution: {integrity: sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==}
+
+  regex-cache@0.4.4:
+    resolution: {integrity: sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==}
+    engines: {node: '>=0.10.0'}
+
+  regex-not@1.0.2:
+    resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
+    engines: {node: '>=0.10.0'}
+
+  remove-trailing-separator@1.1.0:
+    resolution: {integrity: sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==}
+
+  repeat-element@1.1.4:
+    resolution: {integrity: sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==}
+    engines: {node: '>=0.10.0'}
+
+  repeat-string@1.6.1:
+    resolution: {integrity: sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==}
+    engines: {node: '>=0.10'}
+
+  resolve-url@0.2.1:
+    resolution: {integrity: sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==}
+    deprecated: https://github.com/lydell/resolve-url#deprecated
+
+  resolve@1.22.11:
+    resolution: {integrity: sha512-RfqAvLnMl313r7c9oclB1HhUEAezcpLjz95wFH4LVuhk9JF/r22qmVP9AMmOU4vMX7Q8pN8jwNg/CSpdFnMjTQ==}
+    engines: {node: '>= 0.4'}
+    hasBin: true
+
+  ret@0.1.15:
+    resolution: {integrity: sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==}
+    engines: {node: '>=0.12'}
+
+  safe-buffer@5.1.2:
+    resolution: {integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==}
+
+  safe-buffer@5.2.1:
+    resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==}
+
+  safe-regex@1.1.0:
+    resolution: {integrity: sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==}
+
+  sass@1.93.2:
+    resolution: {integrity: sha512-t+YPtOQHpGW1QWsh1CHQ5cPIr9lbbGZLZnbihP/D/qZj/yuV68m8qarcV17nvkOX81BCrvzAlq2klCQFZghyTg==}
+    engines: {node: '>=14.0.0'}
+    hasBin: true
+
+  set-value@2.0.1:
+    resolution: {integrity: sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==}
+    engines: {node: '>=0.10.0'}
+
+  shell-quote@1.8.3:
+    resolution: {integrity: sha512-ObmnIF4hXNg1BqhnHmgbDETF8dLPCggZWBjkQfhZpbszZnYur5DUljTcCHii5LC3J5E0yeO/1LIMyH+UvHQgyw==}
+    engines: {node: '>= 0.4'}
+
+  snapdragon-node@2.1.1:
+    resolution: {integrity: sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==}
+    engines: {node: '>=0.10.0'}
+
+  snapdragon-util@3.0.1:
+    resolution: {integrity: sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==}
+    engines: {node: '>=0.10.0'}
+
+  snapdragon@0.8.2:
+    resolution: {integrity: sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==}
+    engines: {node: '>=0.10.0'}
+
+  source-map-js@1.2.1:
+    resolution: {integrity: sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==}
+    engines: {node: '>=0.10.0'}
+
+  source-map-resolve@0.5.3:
+    resolution: {integrity: sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==}
+    deprecated: See https://github.com/lydell/source-map-resolve#deprecated
+
+  source-map-url@0.4.1:
+    resolution: {integrity: sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==}
+    deprecated: See https://github.com/lydell/source-map-url#deprecated
+
+  source-map@0.5.7:
+    resolution: {integrity: sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==}
+    engines: {node: '>=0.10.0'}
+
+  split-string@3.1.0:
+    resolution: {integrity: sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==}
+    engines: {node: '>=0.10.0'}
+
+  static-extend@0.1.2:
+    resolution: {integrity: sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==}
+    engines: {node: '>=0.10.0'}
+
+  string_decoder@1.1.1:
+    resolution: {integrity: sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==}
+
+  subarg@1.0.0:
+    resolution: {integrity: sha512-RIrIdRY0X1xojthNcVtgT9sjpOGagEUKpZdgBUi054OEPFo282yg+zE+t1Rj3+RqKq2xStL7uUHhY+AjbC4BXg==}
+
+  supports-preserve-symlinks-flag@1.0.0:
+    resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==}
+    engines: {node: '>= 0.4'}
+
+  to-object-path@0.3.0:
+    resolution: {integrity: sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==}
+    engines: {node: '>=0.10.0'}
+
+  to-regex-range@2.1.1:
+    resolution: {integrity: sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==}
+    engines: {node: '>=0.10.0'}
+
+  to-regex-range@5.0.1:
+    resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==}
+    engines: {node: '>=8.0'}
+
+  to-regex@3.0.2:
+    resolution: {integrity: sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==}
+    engines: {node: '>=0.10.0'}
+
+  typescript@5.9.3:
+    resolution: {integrity: sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==}
+    engines: {node: '>=14.17'}
+    hasBin: true
+
+  union-value@1.0.1:
+    resolution: {integrity: sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==}
+    engines: {node: '>=0.10.0'}
+
+  unset-value@1.0.0:
+    resolution: {integrity: sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==}
+    engines: {node: '>=0.10.0'}
+
+  urix@0.1.0:
+    resolution: {integrity: sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==}
+    deprecated: Please see https://github.com/lydell/urix#deprecated
+
+  use@3.1.1:
+    resolution: {integrity: sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==}
+    engines: {node: '>=0.10.0'}
+
+  util-deprecate@1.0.2:
+    resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==}
+
+  wrappy@1.0.2:
+    resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==}
+
+snapshots:
+
+  '@parcel/watcher-android-arm64@2.5.1':
+    optional: true
+
+  '@parcel/watcher-darwin-arm64@2.5.1':
+    optional: true
+
+  '@parcel/watcher-darwin-x64@2.5.1':
+    optional: true
+
+  '@parcel/watcher-freebsd-x64@2.5.1':
+    optional: true
+
+  '@parcel/watcher-linux-arm-glibc@2.5.1':
+    optional: true
+
+  '@parcel/watcher-linux-arm-musl@2.5.1':
+    optional: true
+
+  '@parcel/watcher-linux-arm64-glibc@2.5.1':
+    optional: true
+
+  '@parcel/watcher-linux-arm64-musl@2.5.1':
+    optional: true
+
+  '@parcel/watcher-linux-x64-glibc@2.5.1':
+    optional: true
+
+  '@parcel/watcher-linux-x64-musl@2.5.1':
+    optional: true
+
+  '@parcel/watcher-win32-arm64@2.5.1':
+    optional: true
+
+  '@parcel/watcher-win32-ia32@2.5.1':
+    optional: true
+
+  '@parcel/watcher-win32-x64@2.5.1':
+    optional: true
+
+  '@parcel/watcher@2.5.1':
+    dependencies:
+      detect-libc: 1.0.3
+      is-glob: 4.0.3
+      micromatch: 4.0.8
+      node-addon-api: 7.1.1
+    optionalDependencies:
+      '@parcel/watcher-android-arm64': 2.5.1
+      '@parcel/watcher-darwin-arm64': 2.5.1
+      '@parcel/watcher-darwin-x64': 2.5.1
+      '@parcel/watcher-freebsd-x64': 2.5.1
+      '@parcel/watcher-linux-arm-glibc': 2.5.1
+      '@parcel/watcher-linux-arm-musl': 2.5.1
+      '@parcel/watcher-linux-arm64-glibc': 2.5.1
+      '@parcel/watcher-linux-arm64-musl': 2.5.1
+      '@parcel/watcher-linux-x64-glibc': 2.5.1
+      '@parcel/watcher-linux-x64-musl': 2.5.1
+      '@parcel/watcher-win32-arm64': 2.5.1
+      '@parcel/watcher-win32-ia32': 2.5.1
+      '@parcel/watcher-win32-x64': 2.5.1
+    optional: true
+
+  '@types/prop-types@15.7.15': {}
+
+  '@types/react-dom@18.3.7(@types/react@18.3.26)':
+    dependencies:
+      '@types/react': 18.3.26
+
+  '@types/react@18.3.26':
+    dependencies:
+      '@types/prop-types': 15.7.15
+      csstype: 3.1.3
+
+  anymatch@1.3.2:
+    dependencies:
+      micromatch: 2.3.11
+      normalize-path: 2.1.1
+
+  arr-diff@2.0.0:
+    dependencies:
+      arr-flatten: 1.1.0
+
+  arr-diff@4.0.0: {}
+
+  arr-flatten@1.1.0: {}
+
+  arr-union@3.1.0: {}
+
+  array-unique@0.2.1: {}
+
+  array-unique@0.3.2: {}
+
+  assign-symbols@1.0.0: {}
+
+  async-each@1.0.6: {}
+
+  atob@2.1.2: {}
+
+  babel-runtime@6.26.0:
+    dependencies:
+      core-js: 2.6.12
+      regenerator-runtime: 0.11.1
+
+  balanced-match@1.0.2: {}
+
+  base@0.11.2:
+    dependencies:
+      cache-base: 1.0.1
+      class-utils: 0.3.6
+      component-emitter: 1.3.1
+      define-property: 1.0.0
+      isobject: 3.0.1
+      mixin-deep: 1.3.2
+      pascalcase: 0.1.1
+
+  binary-extensions@1.13.1: {}
+
+  bindings@1.5.0:
+    dependencies:
+      file-uri-to-path: 1.0.0
+    optional: true
+
+  brace-expansion@1.1.12:
+    dependencies:
+      balanced-match: 1.0.2
+      concat-map: 0.0.1
+
+  braces@1.8.5:
+    dependencies:
+      expand-range: 1.8.2
+      preserve: 0.2.0
+      repeat-element: 1.1.4
+
+  braces@2.3.2:
+    dependencies:
+      arr-flatten: 1.1.0
+      array-unique: 0.3.2
+      extend-shallow: 2.0.1
+      fill-range: 4.0.0
+      isobject: 3.0.1
+      repeat-element: 1.1.4
+      snapdragon: 0.8.2
+      snapdragon-node: 2.1.1
+      split-string: 3.1.0
+      to-regex: 3.0.2
+    transitivePeerDependencies:
+      - supports-color
+
+  braces@3.0.3:
+    dependencies:
+      fill-range: 7.1.1
+    optional: true
+
+  cache-base@1.0.1:
+    dependencies:
+      collection-visit: 1.0.0
+      component-emitter: 1.3.1
+      get-value: 2.0.6
+      has-value: 1.0.0
+      isobject: 3.0.1
+      set-value: 2.0.1
+      to-object-path: 0.3.0
+      union-value: 1.0.1
+      unset-value: 1.0.0
+
+  chokidar@1.7.0:
+    dependencies:
+      anymatch: 1.3.2
+      async-each: 1.0.6
+      glob-parent: 2.0.0
+      inherits: 2.0.4
+      is-binary-path: 1.0.1
+      is-glob: 2.0.1
+      path-is-absolute: 1.0.1
+      readdirp: 2.2.1
+    optionalDependencies:
+      fsevents: 1.2.13
+    transitivePeerDependencies:
+      - supports-color
+
+  chokidar@4.0.3:
+    dependencies:
+      readdirp: 4.1.2
+
+  class-utils@0.3.6:
+    dependencies:
+      arr-union: 3.1.0
+      define-property: 0.2.5
+      isobject: 3.0.1
+      static-extend: 0.1.2
+
+  collection-visit@1.0.0:
+    dependencies:
+      map-visit: 1.0.0
+      object-visit: 1.0.1
+
+  component-emitter@1.3.1: {}
+
+  concat-map@0.0.1: {}
+
+  copy-descriptor@0.1.1: {}
+
+  core-js@2.6.12: {}
+
+  core-util-is@1.0.3: {}
+
+  cpx@1.5.0:
+    dependencies:
+      babel-runtime: 6.26.0
+      chokidar: 1.7.0
+      duplexer: 0.1.2
+      glob: 7.2.3
+      glob2base: 0.0.12
+      minimatch: 3.1.2
+      mkdirp: 0.5.6
+      resolve: 1.22.11
+      safe-buffer: 5.2.1
+      shell-quote: 1.8.3
+      subarg: 1.0.0
+    transitivePeerDependencies:
+      - supports-color
+
+  csstype@3.1.3: {}
+
+  debug@2.6.9:
+    dependencies:
+      ms: 2.0.0
+
+  decode-uri-component@0.2.2: {}
+
+  define-property@0.2.5:
+    dependencies:
+      is-descriptor: 0.1.7
+
+  define-property@1.0.0:
+    dependencies:
+      is-descriptor: 1.0.3
+
+  define-property@2.0.2:
+    dependencies:
+      is-descriptor: 1.0.3
+      isobject: 3.0.1
+
+  detect-libc@1.0.3:
+    optional: true
+
+  duplexer@0.1.2: {}
+
+  expand-brackets@0.1.5:
+    dependencies:
+      is-posix-bracket: 0.1.1
+
+  expand-brackets@2.1.4:
+    dependencies:
+      debug: 2.6.9
+      define-property: 0.2.5
+      extend-shallow: 2.0.1
+      posix-character-classes: 0.1.1
+      regex-not: 1.0.2
+      snapdragon: 0.8.2
+      to-regex: 3.0.2
+    transitivePeerDependencies:
+      - supports-color
+
+  expand-range@1.8.2:
+    dependencies:
+      fill-range: 2.2.4
+
+  extend-shallow@2.0.1:
+    dependencies:
+      is-extendable: 0.1.1
+
+  extend-shallow@3.0.2:
+    dependencies:
+      assign-symbols: 1.0.0
+      is-extendable: 1.0.1
+
+  extglob@0.3.2:
+    dependencies:
+      is-extglob: 1.0.0
+
+  extglob@2.0.4:
+    dependencies:
+      array-unique: 0.3.2
+      define-property: 1.0.0
+      expand-brackets: 2.1.4
+      extend-shallow: 2.0.1
+      fragment-cache: 0.2.1
+      regex-not: 1.0.2
+      snapdragon: 0.8.2
+      to-regex: 3.0.2
+    transitivePeerDependencies:
+      - supports-color
+
+  file-uri-to-path@1.0.0:
+    optional: true
+
+  filename-regex@2.0.1: {}
+
+  fill-range@2.2.4:
+    dependencies:
+      is-number: 2.1.0
+      isobject: 2.1.0
+      randomatic: 3.1.1
+      repeat-element: 1.1.4
+      repeat-string: 1.6.1
+
+  fill-range@4.0.0:
+    dependencies:
+      extend-shallow: 2.0.1
+      is-number: 3.0.0
+      repeat-string: 1.6.1
+      to-regex-range: 2.1.1
+
+  fill-range@7.1.1:
+    dependencies:
+      to-regex-range: 5.0.1
+    optional: true
+
+  find-index@0.1.1: {}
+
+  for-in@1.0.2: {}
+
+  for-own@0.1.5:
+    dependencies:
+      for-in: 1.0.2
+
+  fragment-cache@0.2.1:
+    dependencies:
+      map-cache: 0.2.2
+
+  fs.realpath@1.0.0: {}
+
+  fsevents@1.2.13:
+    dependencies:
+      bindings: 1.5.0
+      nan: 2.23.0
+    optional: true
+
+  function-bind@1.1.2: {}
+
+  get-value@2.0.6: {}
+
+  glob-base@0.3.0:
+    dependencies:
+      glob-parent: 2.0.0
+      is-glob: 2.0.1
+
+  glob-parent@2.0.0:
+    dependencies:
+      is-glob: 2.0.1
+
+  glob2base@0.0.12:
+    dependencies:
+      find-index: 0.1.1
+
+  glob@7.2.3:
+    dependencies:
+      fs.realpath: 1.0.0
+      inflight: 1.0.6
+      inherits: 2.0.4
+      minimatch: 3.1.2
+      once: 1.4.0
+      path-is-absolute: 1.0.1
+
+  graceful-fs@4.2.11: {}
+
+  has-value@0.3.1:
+    dependencies:
+      get-value: 2.0.6
+      has-values: 0.1.4
+      isobject: 2.1.0
+
+  has-value@1.0.0:
+    dependencies:
+      get-value: 2.0.6
+      has-values: 1.0.0
+      isobject: 3.0.1
+
+  has-values@0.1.4: {}
+
+  has-values@1.0.0:
+    dependencies:
+      is-number: 3.0.0
+      kind-of: 4.0.0
+
+  hasown@2.0.2:
+    dependencies:
+      function-bind: 1.1.2
+
+  immutable@5.1.4: {}
+
+  inflight@1.0.6:
+    dependencies:
+      once: 1.4.0
+      wrappy: 1.0.2
+
+  inherits@2.0.4: {}
+
+  is-accessor-descriptor@1.0.1:
+    dependencies:
+      hasown: 2.0.2
+
+  is-binary-path@1.0.1:
+    dependencies:
+      binary-extensions: 1.13.1
+
+  is-buffer@1.1.6: {}
+
+  is-core-module@2.16.1:
+    dependencies:
+      hasown: 2.0.2
+
+  is-data-descriptor@1.0.1:
+    dependencies:
+      hasown: 2.0.2
+
+  is-descriptor@0.1.7:
+    dependencies:
+      is-accessor-descriptor: 1.0.1
+      is-data-descriptor: 1.0.1
+
+  is-descriptor@1.0.3:
+    dependencies:
+      is-accessor-descriptor: 1.0.1
+      is-data-descriptor: 1.0.1
+
+  is-dotfile@1.0.3: {}
+
+  is-equal-shallow@0.1.3:
+    dependencies:
+      is-primitive: 2.0.0
+
+  is-extendable@0.1.1: {}
+
+  is-extendable@1.0.1:
+    dependencies:
+      is-plain-object: 2.0.4
+
+  is-extglob@1.0.0: {}
+
+  is-extglob@2.1.1:
+    optional: true
+
+  is-glob@2.0.1:
+    dependencies:
+      is-extglob: 1.0.0
+
+  is-glob@4.0.3:
+    dependencies:
+      is-extglob: 2.1.1
+    optional: true
+
+  is-number@2.1.0:
+    dependencies:
+      kind-of: 3.2.2
+
+  is-number@3.0.0:
+    dependencies:
+      kind-of: 3.2.2
+
+  is-number@4.0.0: {}
+
+  is-number@7.0.0:
+    optional: true
+
+  is-plain-object@2.0.4:
+    dependencies:
+      isobject: 3.0.1
+
+  is-posix-bracket@0.1.1: {}
+
+  is-primitive@2.0.0: {}
+
+  is-windows@1.0.2: {}
+
+  isarray@1.0.0: {}
+
+  isobject@2.1.0:
+    dependencies:
+      isarray: 1.0.0
+
+  isobject@3.0.1: {}
+
+  kind-of@3.2.2:
+    dependencies:
+      is-buffer: 1.1.6
+
+  kind-of@4.0.0:
+    dependencies:
+      is-buffer: 1.1.6
+
+  kind-of@6.0.3: {}
+
+  map-cache@0.2.2: {}
+
+  map-visit@1.0.0:
+    dependencies:
+      object-visit: 1.0.1
+
+  math-random@1.0.4: {}
+
+  micromatch@2.3.11:
+    dependencies:
+      arr-diff: 2.0.0
+      array-unique: 0.2.1
+      braces: 1.8.5
+      expand-brackets: 0.1.5
+      extglob: 0.3.2
+      filename-regex: 2.0.1
+      is-extglob: 1.0.0
+      is-glob: 2.0.1
+      kind-of: 3.2.2
+      normalize-path: 2.1.1
+      object.omit: 2.0.1
+      parse-glob: 3.0.4
+      regex-cache: 0.4.4
+
+  micromatch@3.1.10:
+    dependencies:
+      arr-diff: 4.0.0
+      array-unique: 0.3.2
+      braces: 2.3.2
+      define-property: 2.0.2
+      extend-shallow: 3.0.2
+      extglob: 2.0.4
+      fragment-cache: 0.2.1
+      kind-of: 6.0.3
+      nanomatch: 1.2.13
+      object.pick: 1.3.0
+      regex-not: 1.0.2
+      snapdragon: 0.8.2
+      to-regex: 3.0.2
+    transitivePeerDependencies:
+      - supports-color
+
+  micromatch@4.0.8:
+    dependencies:
+      braces: 3.0.3
+      picomatch: 2.3.1
+    optional: true
+
+  minimatch@3.1.2:
+    dependencies:
+      brace-expansion: 1.1.12
+
+  minimist@1.2.8: {}
+
+  mixin-deep@1.3.2:
+    dependencies:
+      for-in: 1.0.2
+      is-extendable: 1.0.1
+
+  mkdirp@0.5.6:
+    dependencies:
+      minimist: 1.2.8
+
+  ms@2.0.0: {}
+
+  nan@2.23.0:
+    optional: true
+
+  nanomatch@1.2.13:
+    dependencies:
+      arr-diff: 4.0.0
+      array-unique: 0.3.2
+      define-property: 2.0.2
+      extend-shallow: 3.0.2
+      fragment-cache: 0.2.1
+      is-windows: 1.0.2
+      kind-of: 6.0.3
+      object.pick: 1.3.0
+      regex-not: 1.0.2
+      snapdragon: 0.8.2
+      to-regex: 3.0.2
+    transitivePeerDependencies:
+      - supports-color
+
+  node-addon-api@7.1.1:
+    optional: true
+
+  normalize-path@2.1.1:
+    dependencies:
+      remove-trailing-separator: 1.1.0
+
+  object-copy@0.1.0:
+    dependencies:
+      copy-descriptor: 0.1.1
+      define-property: 0.2.5
+      kind-of: 3.2.2
+
+  object-visit@1.0.1:
+    dependencies:
+      isobject: 3.0.1
+
+  object.omit@2.0.1:
+    dependencies:
+      for-own: 0.1.5
+      is-extendable: 0.1.1
+
+  object.pick@1.3.0:
+    dependencies:
+      isobject: 3.0.1
+
+  once@1.4.0:
+    dependencies:
+      wrappy: 1.0.2
+
+  parse-glob@3.0.4:
+    dependencies:
+      glob-base: 0.3.0
+      is-dotfile: 1.0.3
+      is-extglob: 1.0.0
+      is-glob: 2.0.1
+
+  pascalcase@0.1.1: {}
+
+  path-is-absolute@1.0.1: {}
+
+  path-parse@1.0.7: {}
+
+  picomatch@2.3.1:
+    optional: true
+
+  posix-character-classes@0.1.1: {}
+
+  preserve@0.2.0: {}
+
+  process-nextick-args@2.0.1: {}
+
+  randomatic@3.1.1:
+    dependencies:
+      is-number: 4.0.0
+      kind-of: 6.0.3
+      math-random: 1.0.4
+
+  readable-stream@2.3.8:
+    dependencies:
+      core-util-is: 1.0.3
+      inherits: 2.0.4
+      isarray: 1.0.0
+      process-nextick-args: 2.0.1
+      safe-buffer: 5.1.2
+      string_decoder: 1.1.1
+      util-deprecate: 1.0.2
+
+  readdirp@2.2.1:
+    dependencies:
+      graceful-fs: 4.2.11
+      micromatch: 3.1.10
+      readable-stream: 2.3.8
+    transitivePeerDependencies:
+      - supports-color
+
+  readdirp@4.1.2: {}
+
+  regenerator-runtime@0.11.1: {}
+
+  regex-cache@0.4.4:
+    dependencies:
+      is-equal-shallow: 0.1.3
+
+  regex-not@1.0.2:
+    dependencies:
+      extend-shallow: 3.0.2
+      safe-regex: 1.1.0
+
+  remove-trailing-separator@1.1.0: {}
+
+  repeat-element@1.1.4: {}
+
+  repeat-string@1.6.1: {}
+
+  resolve-url@0.2.1: {}
+
+  resolve@1.22.11:
+    dependencies:
+      is-core-module: 2.16.1
+      path-parse: 1.0.7
+      supports-preserve-symlinks-flag: 1.0.0
+
+  ret@0.1.15: {}
+
+  safe-buffer@5.1.2: {}
+
+  safe-buffer@5.2.1: {}
+
+  safe-regex@1.1.0:
+    dependencies:
+      ret: 0.1.15
+
+  sass@1.93.2:
+    dependencies:
+      chokidar: 4.0.3
+      immutable: 5.1.4
+      source-map-js: 1.2.1
+    optionalDependencies:
+      '@parcel/watcher': 2.5.1
+
+  set-value@2.0.1:
+    dependencies:
+      extend-shallow: 2.0.1
+      is-extendable: 0.1.1
+      is-plain-object: 2.0.4
+      split-string: 3.1.0
+
+  shell-quote@1.8.3: {}
+
+  snapdragon-node@2.1.1:
+    dependencies:
+      define-property: 1.0.0
+      isobject: 3.0.1
+      snapdragon-util: 3.0.1
+
+  snapdragon-util@3.0.1:
+    dependencies:
+      kind-of: 3.2.2
+
+  snapdragon@0.8.2:
+    dependencies:
+      base: 0.11.2
+      debug: 2.6.9
+      define-property: 0.2.5
+      extend-shallow: 2.0.1
+      map-cache: 0.2.2
+      source-map: 0.5.7
+      source-map-resolve: 0.5.3
+      use: 3.1.1
+    transitivePeerDependencies:
+      - supports-color
+
+  source-map-js@1.2.1: {}
+
+  source-map-resolve@0.5.3:
+    dependencies:
+      atob: 2.1.2
+      decode-uri-component: 0.2.2
+      resolve-url: 0.2.1
+      source-map-url: 0.4.1
+      urix: 0.1.0
+
+  source-map-url@0.4.1: {}
+
+  source-map@0.5.7: {}
+
+  split-string@3.1.0:
+    dependencies:
+      extend-shallow: 3.0.2
+
+  static-extend@0.1.2:
+    dependencies:
+      define-property: 0.2.5
+      object-copy: 0.1.0
+
+  string_decoder@1.1.1:
+    dependencies:
+      safe-buffer: 5.1.2
+
+  subarg@1.0.0:
+    dependencies:
+      minimist: 1.2.8
+
+  supports-preserve-symlinks-flag@1.0.0: {}
+
+  to-object-path@0.3.0:
+    dependencies:
+      kind-of: 3.2.2
+
+  to-regex-range@2.1.1:
+    dependencies:
+      is-number: 3.0.0
+      repeat-string: 1.6.1
+
+  to-regex-range@5.0.1:
+    dependencies:
+      is-number: 7.0.0
+    optional: true
+
+  to-regex@3.0.2:
+    dependencies:
+      define-property: 2.0.2
+      extend-shallow: 3.0.2
+      regex-not: 1.0.2
+      safe-regex: 1.1.0
+
+  typescript@5.9.3: {}
+
+  union-value@1.0.1:
+    dependencies:
+      arr-union: 3.1.0
+      get-value: 2.0.6
+      is-extendable: 0.1.1
+      set-value: 2.0.1
+
+  unset-value@1.0.0:
+    dependencies:
+      has-value: 0.3.1
+      isobject: 3.0.1
+
+  urix@0.1.0: {}
+
+  use@3.1.1: {}
+
+  util-deprecate@1.0.2: {}
+
+  wrappy@1.0.2: {}
diff --git a/pkg/plugin/examples/react-component/yarn.lock b/pkg/plugin/examples/react-component/yarn.lock
deleted file mode 100644
index 809986c5d..000000000
--- a/pkg/plugin/examples/react-component/yarn.lock
+++ /dev/null
@@ -1,1282 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@types/prop-types@*":
-  version "15.7.9"
-  resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.9.tgz#b6f785caa7ea1fe4414d9df42ee0ab67f23d8a6d"
-  integrity sha512-n1yyPsugYNSmHgxDFjicaI2+gCNjsBck8UX9kuofAKlc0h1bL+20oSF72KeNaW2DUlesbEVCFgyV2dPGTiY42g==
-
-"@types/react-dom@^18.2.14":
-  version "18.2.14"
-  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.2.14.tgz#c01ba40e5bb57fc1dc41569bb3ccdb19eab1c539"
-  integrity sha512-V835xgdSVmyQmI1KLV2BEIUgqEuinxp9O4G6g3FqO/SqLac049E53aysv0oEFD2kHfejeKU+ZqL2bcFWj9gLAQ==
-  dependencies:
-    "@types/react" "*"
-
-"@types/react@*", "@types/react@^18.2.31":
-  version "18.2.31"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.31.tgz#74ae2630e4aa9af599584157abd3b95d96fb9b40"
-  integrity sha512-c2UnPv548q+5DFh03y8lEDeMfDwBn9G3dRwfkrxQMo/dOtRHUUO57k6pHvBIfH/VF4Nh+98mZ5aaSe+2echD5g==
-  dependencies:
-    "@types/prop-types" "*"
-    "@types/scheduler" "*"
-    csstype "^3.0.2"
-
-"@types/scheduler@*":
-  version "0.16.5"
-  resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.5.tgz#4751153abbf8d6199babb345a52e1eb4167d64af"
-  integrity sha512-s/FPdYRmZR8SjLWGMCuax7r3qCWQw9QKHzXVukAuuIJkXkDRwp+Pu5LMIVFi0Fxbav35WURicYr8u1QsoybnQw==
-
-anymatch@^1.3.0:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a"
-  integrity sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==
-  dependencies:
-    micromatch "^2.1.5"
-    normalize-path "^2.0.0"
-
-anymatch@~3.1.2:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e"
-  integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==
-  dependencies:
-    normalize-path "^3.0.0"
-    picomatch "^2.0.4"
-
-arr-diff@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
-  integrity sha512-dtXTVMkh6VkEEA7OhXnN1Ecb8aAGFdZ1LFxtOCoqj4qkyOJMt7+qs6Ahdy6p/NQCPYsRSXXivhSB/J5E9jmYKA==
-  dependencies:
-    arr-flatten "^1.0.1"
-
-arr-diff@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
-  integrity sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==
-
-arr-flatten@^1.0.1, arr-flatten@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
-  integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
-
-arr-union@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
-  integrity sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==
-
-array-unique@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
-  integrity sha512-G2n5bG5fSUCpnsXz4+8FUkYsGPkNfLn9YvS66U5qbTIXI2Ynnlo4Bi42bWv+omKUCqz+ejzfClwne0alJWJPhg==
-
-array-unique@^0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
-  integrity sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==
-
-assign-symbols@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
-  integrity sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==
-
-async-each@^1.0.0:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.6.tgz#52f1d9403818c179b7561e11a5d1b77eb2160e77"
-  integrity sha512-c646jH1avxr+aVpndVMeAfYw7wAa6idufrlN3LPA4PmKS0QEGp6PIC9nwz0WQkkvBGAMEki3pFdtxaF39J9vvg==
-
-atob@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
-  integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
-
-babel-runtime@^6.9.2:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
-  integrity sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g==
-  dependencies:
-    core-js "^2.4.0"
-    regenerator-runtime "^0.11.0"
-
-balanced-match@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
-  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
-
-base@^0.11.1:
-  version "0.11.2"
-  resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
-  integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==
-  dependencies:
-    cache-base "^1.0.1"
-    class-utils "^0.3.5"
-    component-emitter "^1.2.1"
-    define-property "^1.0.0"
-    isobject "^3.0.1"
-    mixin-deep "^1.2.0"
-    pascalcase "^0.1.1"
-
-binary-extensions@^1.0.0:
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65"
-  integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==
-
-binary-extensions@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
-  integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
-
-bindings@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df"
-  integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==
-  dependencies:
-    file-uri-to-path "1.0.0"
-
-brace-expansion@^1.1.7:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
-  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
-  dependencies:
-    balanced-match "^1.0.0"
-    concat-map "0.0.1"
-
-braces@^1.8.2:
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
-  integrity sha512-xU7bpz2ytJl1bH9cgIurjpg/n8Gohy9GTw81heDYLJQ4RU60dlyJsa+atVF2pI0yMMvKxI9HkKwjePCj5XI1hw==
-  dependencies:
-    expand-range "^1.8.1"
-    preserve "^0.2.0"
-    repeat-element "^1.1.2"
-
-braces@^2.3.1:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
-  integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==
-  dependencies:
-    arr-flatten "^1.1.0"
-    array-unique "^0.3.2"
-    extend-shallow "^2.0.1"
-    fill-range "^4.0.0"
-    isobject "^3.0.1"
-    repeat-element "^1.1.2"
-    snapdragon "^0.8.1"
-    snapdragon-node "^2.0.1"
-    split-string "^3.0.2"
-    to-regex "^3.0.1"
-
-braces@~3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
-  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
-  dependencies:
-    fill-range "^7.0.1"
-
-cache-base@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
-  integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==
-  dependencies:
-    collection-visit "^1.0.0"
-    component-emitter "^1.2.1"
-    get-value "^2.0.6"
-    has-value "^1.0.0"
-    isobject "^3.0.1"
-    set-value "^2.0.0"
-    to-object-path "^0.3.0"
-    union-value "^1.0.0"
-    unset-value "^1.0.0"
-
-"chokidar@>=3.0.0 <4.0.0":
-  version "3.5.3"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
-  integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
-  dependencies:
-    anymatch "~3.1.2"
-    braces "~3.0.2"
-    glob-parent "~5.1.2"
-    is-binary-path "~2.1.0"
-    is-glob "~4.0.1"
-    normalize-path "~3.0.0"
-    readdirp "~3.6.0"
-  optionalDependencies:
-    fsevents "~2.3.2"
-
-chokidar@^1.6.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
-  integrity sha512-mk8fAWcRUOxY7btlLtitj3A45jOwSAxH4tOFOoEGbVsl6cL6pPMWUy7dwZ/canfj3QEdP6FHSnf/l1c6/WkzVg==
-  dependencies:
-    anymatch "^1.3.0"
-    async-each "^1.0.0"
-    glob-parent "^2.0.0"
-    inherits "^2.0.1"
-    is-binary-path "^1.0.0"
-    is-glob "^2.0.0"
-    path-is-absolute "^1.0.0"
-    readdirp "^2.0.0"
-  optionalDependencies:
-    fsevents "^1.0.0"
-
-class-utils@^0.3.5:
-  version "0.3.6"
-  resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
-  integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==
-  dependencies:
-    arr-union "^3.1.0"
-    define-property "^0.2.5"
-    isobject "^3.0.0"
-    static-extend "^0.1.1"
-
-collection-visit@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
-  integrity sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw==
-  dependencies:
-    map-visit "^1.0.0"
-    object-visit "^1.0.0"
-
-component-emitter@^1.2.1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
-  integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
-
-concat-map@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-  integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
-
-copy-descriptor@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
-  integrity sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==
-
-core-js@^2.4.0:
-  version "2.6.12"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
-  integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
-
-core-util-is@~1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
-  integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
-
-cpx@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/cpx/-/cpx-1.5.0.tgz#185be018511d87270dedccc293171e37655ab88f"
-  integrity sha512-jHTjZhsbg9xWgsP2vuNW2jnnzBX+p4T+vNI9Lbjzs1n4KhOfa22bQppiFYLsWQKd8TzmL5aSP/Me3yfsCwXbDA==
-  dependencies:
-    babel-runtime "^6.9.2"
-    chokidar "^1.6.0"
-    duplexer "^0.1.1"
-    glob "^7.0.5"
-    glob2base "^0.0.12"
-    minimatch "^3.0.2"
-    mkdirp "^0.5.1"
-    resolve "^1.1.7"
-    safe-buffer "^5.0.1"
-    shell-quote "^1.6.1"
-    subarg "^1.0.0"
-
-csstype@^3.0.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.2.tgz#1d4bf9d572f11c14031f0436e1c10bc1f571f50b"
-  integrity sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==
-
-debug@^2.2.0, debug@^2.3.3:
-  version "2.6.9"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
-  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
-  dependencies:
-    ms "2.0.0"
-
-decode-uri-component@^0.2.0:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9"
-  integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==
-
-define-property@^0.2.5:
-  version "0.2.5"
-  resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
-  integrity sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==
-  dependencies:
-    is-descriptor "^0.1.0"
-
-define-property@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
-  integrity sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==
-  dependencies:
-    is-descriptor "^1.0.0"
-
-define-property@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
-  integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==
-  dependencies:
-    is-descriptor "^1.0.2"
-    isobject "^3.0.1"
-
-duplexer@^0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6"
-  integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==
-
-expand-brackets@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
-  integrity sha512-hxx03P2dJxss6ceIeri9cmYOT4SRs3Zk3afZwWpOsRqLqprhTR8u++SlC+sFGsQr7WGFPdMF7Gjc1njDLDK6UA==
-  dependencies:
-    is-posix-bracket "^0.1.0"
-
-expand-brackets@^2.1.4:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
-  integrity sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==
-  dependencies:
-    debug "^2.3.3"
-    define-property "^0.2.5"
-    extend-shallow "^2.0.1"
-    posix-character-classes "^0.1.0"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.1"
-
-expand-range@^1.8.1:
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
-  integrity sha512-AFASGfIlnIbkKPQwX1yHaDjFvh/1gyKJODme52V6IORh69uEYgZp0o9C+qsIGNVEiuuhQU0CSSl++Rlegg1qvA==
-  dependencies:
-    fill-range "^2.1.0"
-
-extend-shallow@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
-  integrity sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==
-  dependencies:
-    is-extendable "^0.1.0"
-
-extend-shallow@^3.0.0, extend-shallow@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
-  integrity sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==
-  dependencies:
-    assign-symbols "^1.0.0"
-    is-extendable "^1.0.1"
-
-extglob@^0.3.1:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
-  integrity sha512-1FOj1LOwn42TMrruOHGt18HemVnbwAmAak7krWk+wa93KXxGbK+2jpezm+ytJYDaBX0/SPLZFHKM7m+tKobWGg==
-  dependencies:
-    is-extglob "^1.0.0"
-
-extglob@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
-  integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==
-  dependencies:
-    array-unique "^0.3.2"
-    define-property "^1.0.0"
-    expand-brackets "^2.1.4"
-    extend-shallow "^2.0.1"
-    fragment-cache "^0.2.1"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.1"
-
-file-uri-to-path@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
-  integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
-
-filename-regex@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
-  integrity sha512-BTCqyBaWBTsauvnHiE8i562+EdJj+oUpkqWp2R1iCoR8f6oo8STRu3of7WJJ0TqWtxN50a5YFpzYK4Jj9esYfQ==
-
-fill-range@^2.1.0:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.4.tgz#eb1e773abb056dcd8df2bfdf6af59b8b3a936565"
-  integrity sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==
-  dependencies:
-    is-number "^2.1.0"
-    isobject "^2.0.0"
-    randomatic "^3.0.0"
-    repeat-element "^1.1.2"
-    repeat-string "^1.5.2"
-
-fill-range@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
-  integrity sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==
-  dependencies:
-    extend-shallow "^2.0.1"
-    is-number "^3.0.0"
-    repeat-string "^1.6.1"
-    to-regex-range "^2.1.0"
-
-fill-range@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
-  dependencies:
-    to-regex-range "^5.0.1"
-
-find-index@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/find-index/-/find-index-0.1.1.tgz#675d358b2ca3892d795a1ab47232f8b6e2e0dde4"
-  integrity sha512-uJ5vWrfBKMcE6y2Z8834dwEZj9mNGxYa3t3I53OwFeuZ8D9oc2E5zcsrkuhX6h4iYrjhiv0T3szQmxlAV9uxDg==
-
-for-in@^1.0.1, for-in@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
-  integrity sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==
-
-for-own@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
-  integrity sha512-SKmowqGTJoPzLO1T0BBJpkfp3EMacCMOuH40hOUbrbzElVktk4DioXVM99QkLCyKoiuOmyjgcWMpVz2xjE7LZw==
-  dependencies:
-    for-in "^1.0.1"
-
-fragment-cache@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
-  integrity sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA==
-  dependencies:
-    map-cache "^0.2.2"
-
-fs.realpath@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
-
-fsevents@^1.0.0:
-  version "1.2.13"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz#f325cb0455592428bcf11b383370ef70e3bfcc38"
-  integrity sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==
-  dependencies:
-    bindings "^1.5.0"
-    nan "^2.12.1"
-
-fsevents@~2.3.2:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
-  integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
-
-get-value@^2.0.3, get-value@^2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
-  integrity sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==
-
-glob-base@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
-  integrity sha512-ab1S1g1EbO7YzauaJLkgLp7DZVAqj9M/dvKlTt8DkXA2tiOIcSMrlVI2J1RZyB5iJVccEscjGn+kpOG9788MHA==
-  dependencies:
-    glob-parent "^2.0.0"
-    is-glob "^2.0.0"
-
-glob-parent@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28"
-  integrity sha512-JDYOvfxio/t42HKdxkAYaCiBN7oYiuxykOxKxdaUW5Qn0zaYN3gRQWolrwdnf0shM9/EP0ebuuTmyoXNr1cC5w==
-  dependencies:
-    is-glob "^2.0.0"
-
-glob-parent@~5.1.2:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
-  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
-  dependencies:
-    is-glob "^4.0.1"
-
-glob2base@^0.0.12:
-  version "0.0.12"
-  resolved "https://registry.yarnpkg.com/glob2base/-/glob2base-0.0.12.tgz#9d419b3e28f12e83a362164a277055922c9c0d56"
-  integrity sha512-ZyqlgowMbfj2NPjxaZZ/EtsXlOch28FRXgMd64vqZWk1bT9+wvSRLYD1om9M7QfQru51zJPAT17qXm4/zd+9QA==
-  dependencies:
-    find-index "^0.1.1"
-
-glob@^7.0.5:
-  version "7.2.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
-  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.1.1"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-graceful-fs@^4.1.11:
-  version "4.2.11"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
-  integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
-
-has-value@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
-  integrity sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==
-  dependencies:
-    get-value "^2.0.3"
-    has-values "^0.1.4"
-    isobject "^2.0.0"
-
-has-value@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
-  integrity sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw==
-  dependencies:
-    get-value "^2.0.6"
-    has-values "^1.0.0"
-    isobject "^3.0.0"
-
-has-values@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
-  integrity sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==
-
-has-values@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
-  integrity sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ==
-  dependencies:
-    is-number "^3.0.0"
-    kind-of "^4.0.0"
-
-has@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/has/-/has-1.0.4.tgz#2eb2860e000011dae4f1406a86fe80e530fb2ec6"
-  integrity sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ==
-
-immutable@^4.0.0:
-  version "4.3.4"
-  resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.3.4.tgz#2e07b33837b4bb7662f288c244d1ced1ef65a78f"
-  integrity sha512-fsXeu4J4i6WNWSikpI88v/PcVflZz+6kMhUfIwc5SY+poQRPnaf5V7qds6SUyUN3cVxEzuCab7QIoLOQ+DQ1wA==
-
-inflight@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
-  dependencies:
-    once "^1.3.0"
-    wrappy "1"
-
-inherits@2, inherits@^2.0.1, inherits@~2.0.3:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
-  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
-
-is-accessor-descriptor@^0.1.6:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
-  integrity sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==
-  dependencies:
-    kind-of "^3.0.2"
-
-is-accessor-descriptor@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
-  integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==
-  dependencies:
-    kind-of "^6.0.0"
-
-is-binary-path@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
-  integrity sha512-9fRVlXc0uCxEDj1nQzaWONSpbTfx0FmJfzHF7pwlI8DkWGoHBBea4Pg5Ky0ojwwxQmnSifgbKkI06Qv0Ljgj+Q==
-  dependencies:
-    binary-extensions "^1.0.0"
-
-is-binary-path@~2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
-  integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
-  dependencies:
-    binary-extensions "^2.0.0"
-
-is-buffer@^1.1.5:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
-  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
-
-is-core-module@^2.13.0:
-  version "2.13.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.0.tgz#bb52aa6e2cbd49a30c2ba68c42bf3435ba6072db"
-  integrity sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==
-  dependencies:
-    has "^1.0.3"
-
-is-data-descriptor@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
-  integrity sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==
-  dependencies:
-    kind-of "^3.0.2"
-
-is-data-descriptor@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
-  integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==
-  dependencies:
-    kind-of "^6.0.0"
-
-is-descriptor@^0.1.0:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
-  integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==
-  dependencies:
-    is-accessor-descriptor "^0.1.6"
-    is-data-descriptor "^0.1.4"
-    kind-of "^5.0.0"
-
-is-descriptor@^1.0.0, is-descriptor@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
-  integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==
-  dependencies:
-    is-accessor-descriptor "^1.0.0"
-    is-data-descriptor "^1.0.0"
-    kind-of "^6.0.2"
-
-is-dotfile@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"
-  integrity sha512-9YclgOGtN/f8zx0Pr4FQYMdibBiTaH3sn52vjYip4ZSf6C4/6RfTEZ+MR4GvKhCxdPh21Bg42/WL55f6KSnKpg==
-
-is-equal-shallow@^0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534"
-  integrity sha512-0EygVC5qPvIyb+gSz7zdD5/AAoS6Qrx1e//6N4yv4oNm30kqvdmG66oZFWVlQHUWe5OjP08FuTw2IdT0EOTcYA==
-  dependencies:
-    is-primitive "^2.0.0"
-
-is-extendable@^0.1.0, is-extendable@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
-  integrity sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==
-
-is-extendable@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
-  integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==
-  dependencies:
-    is-plain-object "^2.0.4"
-
-is-extglob@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
-  integrity sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww==
-
-is-extglob@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
-  integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
-
-is-glob@^2.0.0, is-glob@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
-  integrity sha512-a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg==
-  dependencies:
-    is-extglob "^1.0.0"
-
-is-glob@^4.0.1, is-glob@~4.0.1:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
-  integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
-  dependencies:
-    is-extglob "^2.1.1"
-
-is-number@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
-  integrity sha512-QUzH43Gfb9+5yckcrSA0VBDwEtDUchrk4F6tfJZQuNzDJbEDB9cZNzSfXGQ1jqmdDY/kl41lUOWM9syA8z8jlg==
-  dependencies:
-    kind-of "^3.0.2"
-
-is-number@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
-  integrity sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==
-  dependencies:
-    kind-of "^3.0.2"
-
-is-number@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
-  integrity sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==
-
-is-number@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
-  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
-
-is-plain-object@^2.0.3, is-plain-object@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
-  integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
-  dependencies:
-    isobject "^3.0.1"
-
-is-posix-bracket@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
-  integrity sha512-Yu68oeXJ7LeWNmZ3Zov/xg/oDBnBK2RNxwYY1ilNJX+tKKZqgPK+qOn/Gs9jEu66KDY9Netf5XLKNGzas/vPfQ==
-
-is-primitive@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
-  integrity sha512-N3w1tFaRfk3UrPfqeRyD+GYDASU3W5VinKhlORy8EWVf/sIdDL9GAcew85XmktCfH+ngG7SRXEVDoO18WMdB/Q==
-
-is-windows@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
-  integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
-
-isarray@1.0.0, isarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-  integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==
-
-isobject@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
-  integrity sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==
-  dependencies:
-    isarray "1.0.0"
-
-isobject@^3.0.0, isobject@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
-  integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==
-
-kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
-  integrity sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==
-  dependencies:
-    is-buffer "^1.1.5"
-
-kind-of@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
-  integrity sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==
-  dependencies:
-    is-buffer "^1.1.5"
-
-kind-of@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
-  integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
-
-kind-of@^6.0.0, kind-of@^6.0.2:
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
-  integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
-
-map-cache@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
-  integrity sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==
-
-map-visit@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
-  integrity sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==
-  dependencies:
-    object-visit "^1.0.0"
-
-math-random@^1.0.1:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c"
-  integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==
-
-micromatch@^2.1.5:
-  version "2.3.11"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
-  integrity sha512-LnU2XFEk9xxSJ6rfgAry/ty5qwUTyHYOBU0g4R6tIw5ljwgGIBmiKhRWLw5NpMOnrgUNcDJ4WMp8rl3sYVHLNA==
-  dependencies:
-    arr-diff "^2.0.0"
-    array-unique "^0.2.1"
-    braces "^1.8.2"
-    expand-brackets "^0.1.4"
-    extglob "^0.3.1"
-    filename-regex "^2.0.0"
-    is-extglob "^1.0.0"
-    is-glob "^2.0.1"
-    kind-of "^3.0.2"
-    normalize-path "^2.0.1"
-    object.omit "^2.0.0"
-    parse-glob "^3.0.4"
-    regex-cache "^0.4.2"
-
-micromatch@^3.1.10:
-  version "3.1.10"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
-  integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
-  dependencies:
-    arr-diff "^4.0.0"
-    array-unique "^0.3.2"
-    braces "^2.3.1"
-    define-property "^2.0.2"
-    extend-shallow "^3.0.2"
-    extglob "^2.0.4"
-    fragment-cache "^0.2.1"
-    kind-of "^6.0.2"
-    nanomatch "^1.2.9"
-    object.pick "^1.3.0"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.2"
-
-minimatch@^3.0.2, minimatch@^3.1.1:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
-  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
-  dependencies:
-    brace-expansion "^1.1.7"
-
-minimist@^1.1.0, minimist@^1.2.6:
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
-  integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
-
-mixin-deep@^1.2.0:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"
-  integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==
-  dependencies:
-    for-in "^1.0.2"
-    is-extendable "^1.0.1"
-
-mkdirp@^0.5.1:
-  version "0.5.6"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"
-  integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==
-  dependencies:
-    minimist "^1.2.6"
-
-ms@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-  integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==
-
-nan@^2.12.1:
-  version "2.18.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.18.0.tgz#26a6faae7ffbeb293a39660e88a76b82e30b7554"
-  integrity sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w==
-
-nanomatch@^1.2.9:
-  version "1.2.13"
-  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
-  integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==
-  dependencies:
-    arr-diff "^4.0.0"
-    array-unique "^0.3.2"
-    define-property "^2.0.2"
-    extend-shallow "^3.0.2"
-    fragment-cache "^0.2.1"
-    is-windows "^1.0.2"
-    kind-of "^6.0.2"
-    object.pick "^1.3.0"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.1"
-
-normalize-path@^2.0.0, normalize-path@^2.0.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
-  integrity sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==
-  dependencies:
-    remove-trailing-separator "^1.0.1"
-
-normalize-path@^3.0.0, normalize-path@~3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
-  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
-
-object-copy@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
-  integrity sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==
-  dependencies:
-    copy-descriptor "^0.1.0"
-    define-property "^0.2.5"
-    kind-of "^3.0.3"
-
-object-visit@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
-  integrity sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==
-  dependencies:
-    isobject "^3.0.0"
-
-object.omit@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
-  integrity sha512-UiAM5mhmIuKLsOvrL+B0U2d1hXHF3bFYWIuH1LMpuV2EJEHG1Ntz06PgLEHjm6VFd87NpH8rastvPoyv6UW2fA==
-  dependencies:
-    for-own "^0.1.4"
-    is-extendable "^0.1.1"
-
-object.pick@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
-  integrity sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==
-  dependencies:
-    isobject "^3.0.1"
-
-once@^1.3.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
-  dependencies:
-    wrappy "1"
-
-parse-glob@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
-  integrity sha512-FC5TeK0AwXzq3tUBFtH74naWkPQCEWs4K+xMxWZBlKDWu0bVHXGZa+KKqxKidd7xwhdZ19ZNuF2uO1M/r196HA==
-  dependencies:
-    glob-base "^0.3.0"
-    is-dotfile "^1.0.0"
-    is-extglob "^1.0.0"
-    is-glob "^2.0.0"
-
-pascalcase@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
-  integrity sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==
-
-path-is-absolute@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
-
-path-parse@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
-  integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
-
-picomatch@^2.0.4, picomatch@^2.2.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
-  integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
-
-posix-character-classes@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
-  integrity sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==
-
-preserve@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
-  integrity sha512-s/46sYeylUfHNjI+sA/78FAHlmIuKqI9wNnzEOGehAlUUYeObv5C2mOinXBjyUyWmJ2SfcS2/ydApH4hTF4WXQ==
-
-process-nextick-args@~2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
-  integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
-
-randomatic@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.1.1.tgz#b776efc59375984e36c537b2f51a1f0aff0da1ed"
-  integrity sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw==
-  dependencies:
-    is-number "^4.0.0"
-    kind-of "^6.0.0"
-    math-random "^1.0.1"
-
-readable-stream@^2.0.2:
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b"
-  integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.3"
-    isarray "~1.0.0"
-    process-nextick-args "~2.0.0"
-    safe-buffer "~5.1.1"
-    string_decoder "~1.1.1"
-    util-deprecate "~1.0.1"
-
-readdirp@^2.0.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
-  integrity sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==
-  dependencies:
-    graceful-fs "^4.1.11"
-    micromatch "^3.1.10"
-    readable-stream "^2.0.2"
-
-readdirp@~3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
-  integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==
-  dependencies:
-    picomatch "^2.2.1"
-
-regenerator-runtime@^0.11.0:
-  version "0.11.1"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
-  integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
-
-regex-cache@^0.4.2:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd"
-  integrity sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==
-  dependencies:
-    is-equal-shallow "^0.1.3"
-
-regex-not@^1.0.0, regex-not@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
-  integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==
-  dependencies:
-    extend-shallow "^3.0.2"
-    safe-regex "^1.1.0"
-
-remove-trailing-separator@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
-  integrity sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==
-
-repeat-element@^1.1.2:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz#be681520847ab58c7568ac75fbfad28ed42d39e9"
-  integrity sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==
-
-repeat-string@^1.5.2, repeat-string@^1.6.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
-  integrity sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==
-
-resolve-url@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
-  integrity sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==
-
-resolve@^1.1.7:
-  version "1.22.8"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d"
-  integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==
-  dependencies:
-    is-core-module "^2.13.0"
-    path-parse "^1.0.7"
-    supports-preserve-symlinks-flag "^1.0.0"
-
-ret@~0.1.10:
-  version "0.1.15"
-  resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
-  integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
-
-safe-buffer@^5.0.1:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
-  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
-
-safe-buffer@~5.1.0, safe-buffer@~5.1.1:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
-  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
-
-safe-regex@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
-  integrity sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==
-  dependencies:
-    ret "~0.1.10"
-
-sass@^1.69.4:
-  version "1.69.4"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.69.4.tgz#10c735f55e3ea0b7742c6efa940bce30e07fbca2"
-  integrity sha512-+qEreVhqAy8o++aQfCJwp0sklr2xyEzkm9Pp/Igu9wNPoe7EZEQ8X/MBvvXggI2ql607cxKg/RKOwDj6pp2XDA==
-  dependencies:
-    chokidar ">=3.0.0 <4.0.0"
-    immutable "^4.0.0"
-    source-map-js ">=0.6.2 <2.0.0"
-
-set-value@^2.0.0, set-value@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b"
-  integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==
-  dependencies:
-    extend-shallow "^2.0.1"
-    is-extendable "^0.1.1"
-    is-plain-object "^2.0.3"
-    split-string "^3.0.1"
-
-shell-quote@^1.6.1:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.1.tgz#6dbf4db75515ad5bac63b4f1894c3a154c766680"
-  integrity sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==
-
-snapdragon-node@^2.0.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
-  integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==
-  dependencies:
-    define-property "^1.0.0"
-    isobject "^3.0.0"
-    snapdragon-util "^3.0.1"
-
-snapdragon-util@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
-  integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==
-  dependencies:
-    kind-of "^3.2.0"
-
-snapdragon@^0.8.1:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
-  integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==
-  dependencies:
-    base "^0.11.1"
-    debug "^2.2.0"
-    define-property "^0.2.5"
-    extend-shallow "^2.0.1"
-    map-cache "^0.2.2"
-    source-map "^0.5.6"
-    source-map-resolve "^0.5.0"
-    use "^3.1.0"
-
-"source-map-js@>=0.6.2 <2.0.0":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
-  integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
-
-source-map-resolve@^0.5.0:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"
-  integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==
-  dependencies:
-    atob "^2.1.2"
-    decode-uri-component "^0.2.0"
-    resolve-url "^0.2.1"
-    source-map-url "^0.4.0"
-    urix "^0.1.0"
-
-source-map-url@^0.4.0:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56"
-  integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==
-
-source-map@^0.5.6:
-  version "0.5.7"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
-  integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==
-
-split-string@^3.0.1, split-string@^3.0.2:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
-  integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==
-  dependencies:
-    extend-shallow "^3.0.0"
-
-static-extend@^0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
-  integrity sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==
-  dependencies:
-    define-property "^0.2.5"
-    object-copy "^0.1.0"
-
-string_decoder@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
-  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
-  dependencies:
-    safe-buffer "~5.1.0"
-
-subarg@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/subarg/-/subarg-1.0.0.tgz#f62cf17581e996b48fc965699f54c06ae268b8d2"
-  integrity sha512-RIrIdRY0X1xojthNcVtgT9sjpOGagEUKpZdgBUi054OEPFo282yg+zE+t1Rj3+RqKq2xStL7uUHhY+AjbC4BXg==
-  dependencies:
-    minimist "^1.1.0"
-
-supports-preserve-symlinks-flag@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
-  integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
-
-to-object-path@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
-  integrity sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==
-  dependencies:
-    kind-of "^3.0.2"
-
-to-regex-range@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
-  integrity sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==
-  dependencies:
-    is-number "^3.0.0"
-    repeat-string "^1.6.1"
-
-to-regex-range@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
-  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
-  dependencies:
-    is-number "^7.0.0"
-
-to-regex@^3.0.1, to-regex@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
-  integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==
-  dependencies:
-    define-property "^2.0.2"
-    extend-shallow "^3.0.2"
-    regex-not "^1.0.2"
-    safe-regex "^1.1.0"
-
-typescript@^5.2.2:
-  version "5.2.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.2.2.tgz#5ebb5e5a5b75f085f22bc3f8460fba308310fa78"
-  integrity sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==
-
-union-value@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847"
-  integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==
-  dependencies:
-    arr-union "^3.1.0"
-    get-value "^2.0.6"
-    is-extendable "^0.1.1"
-    set-value "^2.0.1"
-
-unset-value@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
-  integrity sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==
-  dependencies:
-    has-value "^0.3.1"
-    isobject "^3.0.0"
-
-urix@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
-  integrity sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==
-
-use@^3.1.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
-  integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
-
-util-deprecate@~1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-  integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
-
-wrappy@1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
diff --git a/ui/v2.5/.prettierignore b/ui/v2.5/.prettierignore
index 5ef8feb04..003d319d2 100644
--- a/ui/v2.5/.prettierignore
+++ b/ui/v2.5/.prettierignore
@@ -2,8 +2,8 @@
 
 # dependencies
 /node_modules
-/.pnp
-.pnp.js
+pnpm-lock.yaml
+pnpm-workspace.yaml
 
 # locales
 src/locales/**/*.json
diff --git a/ui/v2.5/README.md b/ui/v2.5/README.md
index bb215a23c..ece6502bf 100755
--- a/ui/v2.5/README.md
+++ b/ui/v2.5/README.md
@@ -4,7 +4,7 @@ This project was bootstrapped with [Create React App](https://github.com/faceboo
 
 In the project directory, you can run:
 
-### `yarn start`
+### `npm run start`
 
 Runs the app in the development mode.<br />
 Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
@@ -12,12 +12,12 @@ Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
 The page will reload if you make edits.<br />
 You will also see any lint errors in the console.
 
-### `yarn test`
+### `npm run test`
 
 Launches the test runner in the interactive watch mode.<br />
 See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
 
-### `yarn build`
+### `npm run build`
 
 Builds the app for production to the `build` folder.<br />
 It correctly bundles React in production mode and optimizes the build for the best performance.
@@ -27,13 +27,13 @@ Your app is ready to be deployed!
 
 See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
 
-### `yarn format`
+### `npm run format`
 
 Formats the whitespace of all typescript and scss code with prettier, to ease editing and ensure a common code style.
 
 Should ideally be run before all frontend PRs.
 
-### `yarn eject`
+### `npm run eject`
 
 **Note: this is a one-way operation. Once you `eject`, you can’t go back!**
 
@@ -69,6 +69,6 @@ This section has moved here: https://facebook.github.io/create-react-app/docs/ad
 
 This section has moved here: https://facebook.github.io/create-react-app/docs/deployment
 
-### `yarn build` fails to minify
+### `npm run build` fails to minify
 
 This section has moved here: https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify
diff --git a/ui/v2.5/package.json b/ui/v2.5/package.json
index c129b6f5c..433424258 100644
--- a/ui/v2.5/package.json
+++ b/ui/v2.5/package.json
@@ -6,9 +6,9 @@
   "scripts": {
     "start": "vite",
     "build": "vite build",
-    "build-ci": "yarn run validate && yarn run build",
-    "validate": "yarn run lint && yarn run check && yarn run format-check",
-    "lint": "yarn run lint:js && yarn run lint:css",
+    "build-ci": "npm run validate && npm run build",
+    "validate": "npm run lint && npm run check && npm run format-check",
+    "lint": "npm run lint:js && npm run lint:css",
     "lint:css": "stylelint --cache \"src/**/*.scss\"",
     "lint:js": "eslint --cache src/",
     "check": "tsc --noEmit",
@@ -35,6 +35,7 @@
     "@react-hook/resize-observer": "^1.2.6",
     "@silvermine/videojs-airplay": "^1.2.0",
     "@silvermine/videojs-chromecast": "^1.4.1",
+    "@types/react-router-dom": "^5.3.3",
     "apollo-upload-client": "^18.0.1",
     "base64-blob": "^1.4.1",
     "bootstrap": "^4.6.2",
diff --git a/ui/v2.5/pnpm-lock.yaml b/ui/v2.5/pnpm-lock.yaml
new file mode 100644
index 000000000..99339ee55
--- /dev/null
+++ b/ui/v2.5/pnpm-lock.yaml
@@ -0,0 +1,11148 @@
+lockfileVersion: '9.0'
+
+settings:
+  autoInstallPeers: true
+  excludeLinksFromLockfile: false
+
+importers:
+
+  .:
+    dependencies:
+      '@ant-design/react-slick':
+        specifier: ^1.0.0
+        version: 1.1.2(react@17.0.2)
+      '@apollo/client':
+        specifier: ^3.8.10
+        version: 3.14.0(@types/react@17.0.89)(graphql-ws@5.16.2(graphql@16.11.0))(graphql@16.11.0)(react-dom@17.0.2(react@17.0.2))(react@17.0.2)
+      '@formatjs/intl-getcanonicallocales':
+        specifier: ^2.0.5
+        version: 2.5.6
+      '@formatjs/intl-locale':
+        specifier: ^3.0.11
+        version: 3.4.6
+      '@formatjs/intl-numberformat':
+        specifier: ^8.3.3
+        version: 8.15.6
+      '@formatjs/intl-pluralrules':
+        specifier: ^5.1.8
+        version: 5.4.6
+      '@fortawesome/fontawesome-svg-core':
+        specifier: ^6.3.0
+        version: 6.7.2
+      '@fortawesome/free-brands-svg-icons':
+        specifier: ^6.3.0
+        version: 6.7.2
+      '@fortawesome/free-regular-svg-icons':
+        specifier: ^6.3.0
+        version: 6.7.2
+      '@fortawesome/free-solid-svg-icons':
+        specifier: ^6.3.0
+        version: 6.7.2
+      '@fortawesome/react-fontawesome':
+        specifier: ^0.2.0
+        version: 0.2.6(@fortawesome/fontawesome-svg-core@6.7.2)(react@17.0.2)
+      '@react-hook/resize-observer':
+        specifier: ^1.2.6
+        version: 1.2.6(react@17.0.2)
+      '@silvermine/videojs-airplay':
+        specifier: ^1.2.0
+        version: 1.3.0(video.js@7.21.7)
+      '@silvermine/videojs-chromecast':
+        specifier: ^1.4.1
+        version: 1.5.0(video.js@7.21.7)
+      '@types/react-router-dom':
+        specifier: ^5.3.3
+        version: 5.3.3
+      apollo-upload-client:
+        specifier: ^18.0.1
+        version: 18.0.1(@apollo/client@3.14.0(@types/react@17.0.89)(graphql-ws@5.16.2(graphql@16.11.0))(graphql@16.11.0)(react-dom@17.0.2(react@17.0.2))(react@17.0.2))(graphql@16.11.0)
+      base64-blob:
+        specifier: ^1.4.1
+        version: 1.4.1
+      bootstrap:
+        specifier: ^4.6.2
+        version: 4.6.2(jquery@3.7.1)(popper.js@1.16.1)
+      classnames:
+        specifier: ^2.3.2
+        version: 2.5.1
+      crypto-js:
+        specifier: ^4.2.0
+        version: 4.2.0
+      event-target-polyfill:
+        specifier: ^0.0.4
+        version: 0.0.4
+      flag-icons:
+        specifier: ^6.6.6
+        version: 6.15.0
+      flexbin:
+        specifier: ^0.2.0
+        version: 0.2.0
+      formik:
+        specifier: ^2.4.5
+        version: 2.4.6(@types/react@17.0.89)(react@17.0.2)
+      graphql:
+        specifier: ^16.8.1
+        version: 16.11.0
+      graphql-tag:
+        specifier: ^2.12.6
+        version: 2.12.6(graphql@16.11.0)
+      graphql-ws:
+        specifier: ^5.14.3
+        version: 5.16.2(graphql@16.11.0)
+      i18n-iso-countries:
+        specifier: ^7.5.0
+        version: 7.14.0
+      intersection-observer:
+        specifier: ^0.12.2
+        version: 0.12.2
+      localforage:
+        specifier: ^1.10.0
+        version: 1.10.0
+      lodash-es:
+        specifier: ^4.17.21
+        version: 4.17.21
+      moment:
+        specifier: ^2.30.1
+        version: 2.30.1
+      mousetrap:
+        specifier: ^1.6.5
+        version: 1.6.5
+      mousetrap-pause:
+        specifier: ^1.0.0
+        version: 1.0.0
+      normalize-url:
+        specifier: ^4.5.1
+        version: 4.5.1
+      react:
+        specifier: ^17.0.2
+        version: 17.0.2
+      react-bootstrap:
+        specifier: ^1.6.6
+        version: 1.6.8(react-dom@17.0.2(react@17.0.2))(react@17.0.2)
+      react-datepicker:
+        specifier: ^4.10.0
+        version: 4.25.0(react-dom@17.0.2(react@17.0.2))(react@17.0.2)
+      react-dom:
+        specifier: ^17.0.2
+        version: 17.0.2(react@17.0.2)
+      react-helmet:
+        specifier: ^6.1.0
+        version: 6.1.0(react@17.0.2)
+      react-intl:
+        specifier: ^6.2.8
+        version: 6.8.9(react@17.0.2)(typescript@4.8.4)
+      react-photo-gallery:
+        specifier: ^8.0.0
+        version: 8.0.0(react-dom@17.0.2(react@17.0.2))(react@17.0.2)
+      react-remark:
+        specifier: ^2.1.0
+        version: 2.1.0(react@17.0.2)
+      react-router-bootstrap:
+        specifier: ^0.25.0
+        version: 0.25.0(react-router-dom@5.3.4(react@17.0.2))(react@17.0.2)
+      react-router-dom:
+        specifier: ^5.3.4
+        version: 5.3.4(react@17.0.2)
+      react-router-hash-link:
+        specifier: ^2.4.3
+        version: 2.4.3(react-router-dom@5.3.4(react@17.0.2))(react@17.0.2)
+      react-select:
+        specifier: ^5.7.0
+        version: 5.10.2(@types/react@17.0.89)(react-dom@17.0.2(react@17.0.2))(react@17.0.2)
+      remark-gfm:
+        specifier: ^1.0.0
+        version: 1.0.0
+      resize-observer-polyfill:
+        specifier: ^1.5.1
+        version: 1.5.1
+      slick-carousel:
+        specifier: ^1.8.1
+        version: 1.8.1(jquery@3.7.1)
+      string.prototype.replaceall:
+        specifier: ^1.0.7
+        version: 1.0.11
+      thehandy:
+        specifier: ^1.0.3
+        version: 1.1.0
+      ua-parser-js:
+        specifier: ^1.0.34
+        version: 1.0.41
+      universal-cookie:
+        specifier: ^4.0.4
+        version: 4.0.4
+      video.js:
+        specifier: ^7.21.3
+        version: 7.21.7
+      videojs-abloop:
+        specifier: ^1.2.0
+        version: 1.2.0
+      videojs-contrib-dash:
+        specifier: ^5.1.1
+        version: 5.1.1
+      videojs-mobile-ui:
+        specifier: ^0.8.0
+        version: 0.8.0(video.js@7.21.7)
+      videojs-seek-buttons:
+        specifier: ^3.0.1
+        version: 3.0.1(video.js@7.21.7)
+      videojs-vr:
+        specifier: 1.8.0
+        version: 1.8.0
+      videojs-vtt.js:
+        specifier: ^0.15.4
+        version: 0.15.5
+      yup:
+        specifier: ^1.3.2
+        version: 1.7.1
+    devDependencies:
+      '@babel/core':
+        specifier: ^7.20.12
+        version: 7.28.4
+      '@graphql-codegen/cli':
+        specifier: ^5.0.0
+        version: 5.0.7(@parcel/watcher@2.5.1)(@types/node@18.19.130)(graphql@16.11.0)(typescript@4.8.4)
+      '@graphql-codegen/time':
+        specifier: ^5.0.0
+        version: 5.0.1(graphql@16.11.0)
+      '@graphql-codegen/typescript':
+        specifier: ^4.0.1
+        version: 4.1.6(graphql@16.11.0)
+      '@graphql-codegen/typescript-operations':
+        specifier: ^4.0.1
+        version: 4.6.1(graphql@16.11.0)
+      '@graphql-codegen/typescript-react-apollo':
+        specifier: ^4.1.0
+        version: 4.3.3(graphql@16.11.0)
+      '@types/apollo-upload-client':
+        specifier: ^18.0.0
+        version: 18.0.1(@types/react@17.0.89)(graphql-ws@5.16.2(graphql@16.11.0))(react-dom@17.0.2(react@17.0.2))(react@17.0.2)
+      '@types/crypto-js':
+        specifier: ^4.2.2
+        version: 4.2.2
+      '@types/lodash-es':
+        specifier: ^4.17.6
+        version: 4.17.12
+      '@types/mousetrap':
+        specifier: ^1.6.11
+        version: 1.6.15
+      '@types/node':
+        specifier: ^18.13.0
+        version: 18.19.130
+      '@types/react':
+        specifier: ^17.0.53
+        version: 17.0.89
+      '@types/react-datepicker':
+        specifier: ^4.10.0
+        version: 4.19.6(react-dom@17.0.2(react@17.0.2))(react@17.0.2)
+      '@types/react-dom':
+        specifier: ^17.0.19
+        version: 17.0.26(@types/react@17.0.89)
+      '@types/react-helmet':
+        specifier: ^6.1.6
+        version: 6.1.11
+      '@types/react-router-bootstrap':
+        specifier: ^0.24.5
+        version: 0.24.5
+      '@types/react-router-hash-link':
+        specifier: ^2.4.5
+        version: 2.4.9
+      '@types/three':
+        specifier: ^0.154.0
+        version: 0.154.0
+      '@types/ua-parser-js':
+        specifier: ^0.7.36
+        version: 0.7.39
+      '@types/video.js':
+        specifier: ^7.3.51
+        version: 7.3.58
+      '@types/videojs-mobile-ui':
+        specifier: ^0.8.0
+        version: 0.8.3
+      '@types/videojs-seek-buttons':
+        specifier: ^2.1.0
+        version: 2.1.3
+      '@typescript-eslint/eslint-plugin':
+        specifier: ^5.52.0
+        version: 5.62.0(@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@4.8.4))(eslint@8.57.1)(typescript@4.8.4)
+      '@typescript-eslint/parser':
+        specifier: ^5.52.0
+        version: 5.62.0(eslint@8.57.1)(typescript@4.8.4)
+      '@vitejs/plugin-legacy':
+        specifier: ^4.0.1
+        version: 4.1.1(terser@5.44.0)(vite@4.5.14(@types/node@18.19.130)(sass@1.93.2)(terser@5.44.0))
+      '@vitejs/plugin-react':
+        specifier: ^3.1.0
+        version: 3.1.0(vite@4.5.14(@types/node@18.19.130)(sass@1.93.2)(terser@5.44.0))
+      eslint:
+        specifier: ^8.34.0
+        version: 8.57.1
+      eslint-config-airbnb:
+        specifier: ^19.0.4
+        version: 19.0.4(eslint-plugin-import@2.32.0(@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@4.8.4))(eslint@8.57.1))(eslint-plugin-jsx-a11y@6.10.2(eslint@8.57.1))(eslint-plugin-react-hooks@4.6.2(eslint@8.57.1))(eslint-plugin-react@7.37.5(eslint@8.57.1))(eslint@8.57.1)
+      eslint-config-airbnb-typescript:
+        specifier: ^17.0.0
+        version: 17.1.0(@typescript-eslint/eslint-plugin@5.62.0(@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@4.8.4))(eslint@8.57.1)(typescript@4.8.4))(@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@4.8.4))(eslint-plugin-import@2.32.0(@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@4.8.4))(eslint@8.57.1))(eslint@8.57.1)
+      eslint-config-prettier:
+        specifier: ^8.6.0
+        version: 8.10.2(eslint@8.57.1)
+      eslint-plugin-import:
+        specifier: ^2.27.5
+        version: 2.32.0(@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@4.8.4))(eslint@8.57.1)
+      eslint-plugin-jsx-a11y:
+        specifier: ^6.7.1
+        version: 6.10.2(eslint@8.57.1)
+      eslint-plugin-react:
+        specifier: ^7.32.2
+        version: 7.37.5(eslint@8.57.1)
+      eslint-plugin-react-hooks:
+        specifier: ^4.6.0
+        version: 4.6.2(eslint@8.57.1)
+      extract-react-intl-messages:
+        specifier: ^4.1.1
+        version: 4.1.1
+      postcss:
+        specifier: ^8.4.31
+        version: 8.5.6
+      postcss-scss:
+        specifier: ^4.0.6
+        version: 4.0.9(postcss@8.5.6)
+      prettier:
+        specifier: ^2.8.4
+        version: 2.8.8
+      sass:
+        specifier: ^1.58.1
+        version: 1.93.2
+      stylelint:
+        specifier: ^15.10.1
+        version: 15.11.0(typescript@4.8.4)
+      stylelint-order:
+        specifier: ^6.0.2
+        version: 6.0.4(stylelint@15.11.0(typescript@4.8.4))
+      terser:
+        specifier: ^5.9.0
+        version: 5.44.0
+      ts-node:
+        specifier: ^10.9.1
+        version: 10.9.2(@types/node@18.19.130)(typescript@4.8.4)
+      typescript:
+        specifier: ~4.8.4
+        version: 4.8.4
+      vite:
+        specifier: ^4.5.14
+        version: 4.5.14(@types/node@18.19.130)(sass@1.93.2)(terser@5.44.0)
+      vite-plugin-compression:
+        specifier: ^0.5.1
+        version: 0.5.1(vite@4.5.14(@types/node@18.19.130)(sass@1.93.2)(terser@5.44.0))
+      vite-tsconfig-paths:
+        specifier: ^4.0.5
+        version: 4.3.2(typescript@4.8.4)(vite@4.5.14(@types/node@18.19.130)(sass@1.93.2)(terser@5.44.0))
+
+packages:
+
+  '@ant-design/react-slick@1.1.2':
+    resolution: {integrity: sha512-EzlvzE6xQUBrZuuhSAFTdsr4P2bBBHGZwKFemEfq8gIGyIQCxalYfZW/T2ORbtQx5rU69o+WycP3exY/7T1hGA==}
+    peerDependencies:
+      react: '>=16.9.0'
+
+  '@apollo/client@3.14.0':
+    resolution: {integrity: sha512-0YQKKRIxiMlIou+SekQqdCo0ZTHxOcES+K8vKB53cIDpwABNR0P0yRzPgsbgcj3zRJniD93S/ontsnZsCLZrxQ==}
+    peerDependencies:
+      graphql: ^15.0.0 || ^16.0.0
+      graphql-ws: ^5.5.5 || ^6.0.3
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || >=19.0.0-rc
+      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || >=19.0.0-rc
+      subscriptions-transport-ws: ^0.9.0 || ^0.11.0
+    peerDependenciesMeta:
+      graphql-ws:
+        optional: true
+      react:
+        optional: true
+      react-dom:
+        optional: true
+      subscriptions-transport-ws:
+        optional: true
+
+  '@ardatan/relay-compiler@12.0.0':
+    resolution: {integrity: sha512-9anThAaj1dQr6IGmzBMcfzOQKTa5artjuPmw8NYK/fiGEMjADbSguBY2FMDykt+QhilR3wc9VA/3yVju7JHg7Q==}
+    hasBin: true
+    peerDependencies:
+      graphql: '*'
+
+  '@ardatan/relay-compiler@12.0.3':
+    resolution: {integrity: sha512-mBDFOGvAoVlWaWqs3hm1AciGHSQE1rqFc/liZTyYz/Oek9yZdT5H26pH2zAFuEiTiBVPPyMuqf5VjOFPI2DGsQ==}
+    hasBin: true
+    peerDependencies:
+      graphql: '*'
+
+  '@babel/code-frame@7.27.1':
+    resolution: {integrity: sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/compat-data@7.28.4':
+    resolution: {integrity: sha512-YsmSKC29MJwf0gF8Rjjrg5LQCmyh+j/nD8/eP7f+BeoQTKYqs9RoWbjGOdy0+1Ekr68RJZMUOPVQaQisnIo4Rw==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/core@7.28.4':
+    resolution: {integrity: sha512-2BCOP7TN8M+gVDj7/ht3hsaO/B/n5oDbiAyyvnRlNOs+u1o+JWNYTQrmpuNp1/Wq2gcFrI01JAW+paEKDMx/CA==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/generator@7.28.3':
+    resolution: {integrity: sha512-3lSpxGgvnmZznmBkCRnVREPUFJv2wrv9iAoFDvADJc0ypmdOxdUtcLeBgBJ6zE0PMeTKnxeQzyk0xTBq4Ep7zw==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-annotate-as-pure@7.27.3':
+    resolution: {integrity: sha512-fXSwMQqitTGeHLBC08Eq5yXz2m37E4pJX1qAU1+2cNedz/ifv/bVXft90VeSav5nFO61EcNgwr0aJxbyPaWBPg==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-compilation-targets@7.27.2':
+    resolution: {integrity: sha512-2+1thGUUWWjLTYTHZWK1n8Yga0ijBz1XAhUXcKy81rd5g6yh7hGqMp45v7cadSbEHc9G3OTv45SyneRN3ps4DQ==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-create-class-features-plugin@7.28.3':
+    resolution: {integrity: sha512-V9f6ZFIYSLNEbuGA/92uOvYsGCJNsuA8ESZ4ldc09bWk/j8H8TKiPw8Mk1eG6olpnO0ALHJmYfZvF4MEE4gajg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/helper-create-regexp-features-plugin@7.27.1':
+    resolution: {integrity: sha512-uVDC72XVf8UbrH5qQTc18Agb8emwjTiZrQE11Nv3CuBEZmVvTwwE9CBUEvHku06gQCAyYf8Nv6ja1IN+6LMbxQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/helper-define-polyfill-provider@0.6.5':
+    resolution: {integrity: sha512-uJnGFcPsWQK8fvjgGP5LZUZZsYGIoPeRjSF5PGwrelYgq7Q15/Ft9NGFp1zglwgIv//W0uG4BevRuSJRyylZPg==}
+    peerDependencies:
+      '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
+
+  '@babel/helper-globals@7.28.0':
+    resolution: {integrity: sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-member-expression-to-functions@7.27.1':
+    resolution: {integrity: sha512-E5chM8eWjTp/aNoVpcbfM7mLxu9XGLWYise2eBKGQomAk/Mb4XoxyqXTZbuTohbsl8EKqdlMhnDI2CCLfcs9wA==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-module-imports@7.27.1':
+    resolution: {integrity: sha512-0gSFWUPNXNopqtIPQvlD5WgXYI5GY2kP2cCvoT8kczjbfcfuIljTbcWrulD1CIPIX2gt1wghbDy08yE1p+/r3w==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-module-transforms@7.28.3':
+    resolution: {integrity: sha512-gytXUbs8k2sXS9PnQptz5o0QnpLL51SwASIORY6XaBKF88nsOT0Zw9szLqlSGQDP/4TljBAD5y98p2U1fqkdsw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/helper-optimise-call-expression@7.27.1':
+    resolution: {integrity: sha512-URMGH08NzYFhubNSGJrpUEphGKQwMQYBySzat5cAByY1/YgIRkULnIy3tAMeszlL/so2HbeilYloUmSpd7GdVw==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-plugin-utils@7.27.1':
+    resolution: {integrity: sha512-1gn1Up5YXka3YYAHGKpbideQ5Yjf1tDa9qYcgysz+cNCXukyLl6DjPXhD3VRwSb8c0J9tA4b2+rHEZtc6R0tlw==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-remap-async-to-generator@7.27.1':
+    resolution: {integrity: sha512-7fiA521aVw8lSPeI4ZOD3vRFkoqkJcS+z4hFo82bFSH/2tNd6eJ5qCVMS5OzDmZh/kaHQeBaeyxK6wljcPtveA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/helper-replace-supers@7.27.1':
+    resolution: {integrity: sha512-7EHz6qDZc8RYS5ElPoShMheWvEgERonFCs7IAonWLLUTXW59DP14bCZt89/GKyreYn8g3S83m21FelHKbeDCKA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/helper-skip-transparent-expression-wrappers@7.27.1':
+    resolution: {integrity: sha512-Tub4ZKEXqbPjXgWLl2+3JpQAYBJ8+ikpQ2Ocj/q/r0LwE3UhENh7EUabyHjz2kCEsrRY83ew2DQdHluuiDQFzg==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-string-parser@7.27.1':
+    resolution: {integrity: sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-validator-identifier@7.27.1':
+    resolution: {integrity: sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-validator-option@7.27.1':
+    resolution: {integrity: sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-wrap-function@7.28.3':
+    resolution: {integrity: sha512-zdf983tNfLZFletc0RRXYrHrucBEg95NIFMkn6K9dbeMYnsgHaSBGcQqdsCSStG2PYwRre0Qc2NNSCXbG+xc6g==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helpers@7.28.4':
+    resolution: {integrity: sha512-HFN59MmQXGHVyYadKLVumYsA9dBFun/ldYxipEjzA4196jpLZd8UjEEBLkbEkvfYreDqJhZxYAWFPtrfhNpj4w==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/parser@7.28.4':
+    resolution: {integrity: sha512-yZbBqeM6TkpP9du/I2pUZnJsRMGGvOuIrhjzC1AwHwW+6he4mni6Bp/m8ijn0iOuZuPI2BfkCoSRunpyjnrQKg==}
+    engines: {node: '>=6.0.0'}
+    hasBin: true
+
+  '@babel/plugin-bugfix-firefox-class-in-computed-class-key@7.27.1':
+    resolution: {integrity: sha512-QPG3C9cCVRQLxAVwmefEmwdTanECuUBMQZ/ym5kiw3XKCGA7qkuQLcjWWHcrD/GKbn/WmJwaezfuuAOcyKlRPA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/plugin-bugfix-safari-class-field-initializer-scope@7.27.1':
+    resolution: {integrity: sha512-qNeq3bCKnGgLkEXUuFry6dPlGfCdQNZbn7yUAPCInwAJHMU7THJfrBSozkcWq5sNM6RcF3S8XyQL2A52KNR9IA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.27.1':
+    resolution: {integrity: sha512-g4L7OYun04N1WyqMNjldFwlfPCLVkgB54A/YCXICZYBsvJJE3kByKv9c9+R/nAfmIfjl2rKYLNyMHboYbZaWaA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.27.1':
+    resolution: {integrity: sha512-oO02gcONcD5O1iTLi/6frMJBIwWEHceWGSGqrpCmEL8nogiS6J9PBlE48CaK20/Jx1LuRml9aDftLgdjXT8+Cw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.13.0
+
+  '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@7.28.3':
+    resolution: {integrity: sha512-b6YTX108evsvE4YgWyQ921ZAFFQm3Bn+CA3+ZXlNVnPhx+UfsVURoPjfGAPCjBgrqo30yX/C2nZGX96DxvR9Iw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/plugin-proposal-class-properties@7.18.6':
+    resolution: {integrity: sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==}
+    engines: {node: '>=6.9.0'}
+    deprecated: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-class-properties instead.
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-proposal-object-rest-spread@7.20.7':
+    resolution: {integrity: sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==}
+    engines: {node: '>=6.9.0'}
+    deprecated: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-object-rest-spread instead.
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2':
+    resolution: {integrity: sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-class-properties@7.12.13':
+    resolution: {integrity: sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-flow@7.27.1':
+    resolution: {integrity: sha512-p9OkPbZ5G7UT1MofwYFigGebnrzGJacoBSQM0/6bi/PUMVE+qlWDD/OalvQKbwgQzU6dl0xAv6r4X7Jme0RYxA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-import-assertions@7.27.1':
+    resolution: {integrity: sha512-UT/Jrhw57xg4ILHLFnzFpPDlMbcdEicaAtjPQpbj9wa8T4r5KVWCimHcL/460g8Ht0DMxDyjsLgiWSkVjnwPFg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-import-attributes@7.27.1':
+    resolution: {integrity: sha512-oFT0FrKHgF53f4vOsZGi2Hh3I35PfSmVs4IBFLFj4dnafP+hIWDLg3VyKmUHfLoLHlyxY4C7DGtmHuJgn+IGww==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-jsx@7.27.1':
+    resolution: {integrity: sha512-y8YTNIeKoyhGd9O0Jiyzyyqk8gdjnumGTQPsz0xOZOQ2RmkVJeZ1vmmfIvFEKqucBG6axJGBZDE/7iI5suUI/w==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-object-rest-spread@7.8.3':
+    resolution: {integrity: sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-unicode-sets-regex@7.18.6':
+    resolution: {integrity: sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/plugin-transform-arrow-functions@7.27.1':
+    resolution: {integrity: sha512-8Z4TGic6xW70FKThA5HYEKKyBpOOsucTOD1DjU3fZxDg+K3zBJcXMFnt/4yQiZnf5+MiOMSXQ9PaEK/Ilh1DeA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-async-generator-functions@7.28.0':
+    resolution: {integrity: sha512-BEOdvX4+M765icNPZeidyADIvQ1m1gmunXufXxvRESy/jNNyfovIqUyE7MVgGBjWktCoJlzvFA1To2O4ymIO3Q==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-async-to-generator@7.27.1':
+    resolution: {integrity: sha512-NREkZsZVJS4xmTr8qzE5y8AfIPqsdQfRuUiLRTEzb7Qii8iFWCyDKaUV2c0rCuh4ljDZ98ALHP/PetiBV2nddA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-block-scoped-functions@7.27.1':
+    resolution: {integrity: sha512-cnqkuOtZLapWYZUYM5rVIdv1nXYuFVIltZ6ZJ7nIj585QsjKM5dhL2Fu/lICXZ1OyIAFc7Qy+bvDAtTXqGrlhg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-block-scoping@7.28.4':
+    resolution: {integrity: sha512-1yxmvN0MJHOhPVmAsmoW5liWwoILobu/d/ShymZmj867bAdxGbehIrew1DuLpw2Ukv+qDSSPQdYW1dLNE7t11A==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-class-properties@7.27.1':
+    resolution: {integrity: sha512-D0VcalChDMtuRvJIu3U/fwWjf8ZMykz5iZsg77Nuj821vCKI3zCyRLwRdWbsuJ/uRwZhZ002QtCqIkwC/ZkvbA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-class-static-block@7.28.3':
+    resolution: {integrity: sha512-LtPXlBbRoc4Njl/oh1CeD/3jC+atytbnf/UqLoqTDcEYGUPj022+rvfkbDYieUrSj3CaV4yHDByPE+T2HwfsJg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.12.0
+
+  '@babel/plugin-transform-classes@7.28.4':
+    resolution: {integrity: sha512-cFOlhIYPBv/iBoc+KS3M6et2XPtbT2HiCRfBXWtfpc9OAyostldxIf9YAYB6ypURBBbx+Qv6nyrLzASfJe+hBA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-computed-properties@7.27.1':
+    resolution: {integrity: sha512-lj9PGWvMTVksbWiDT2tW68zGS/cyo4AkZ/QTp0sQT0mjPopCmrSkzxeXkznjqBxzDI6TclZhOJbBmbBLjuOZUw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-destructuring@7.28.0':
+    resolution: {integrity: sha512-v1nrSMBiKcodhsyJ4Gf+Z0U/yawmJDBOTpEB3mcQY52r9RIyPneGyAS/yM6seP/8I+mWI3elOMtT5dB8GJVs+A==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-dotall-regex@7.27.1':
+    resolution: {integrity: sha512-gEbkDVGRvjj7+T1ivxrfgygpT7GUd4vmODtYpbs0gZATdkX8/iSnOtZSxiZnsgm1YjTgjI6VKBGSJJevkrclzw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-duplicate-keys@7.27.1':
+    resolution: {integrity: sha512-MTyJk98sHvSs+cvZ4nOauwTTG1JeonDjSGvGGUNHreGQns+Mpt6WX/dVzWBHgg+dYZhkC4X+zTDfkTU+Vy9y7Q==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-duplicate-named-capturing-groups-regex@7.27.1':
+    resolution: {integrity: sha512-hkGcueTEzuhB30B3eJCbCYeCaaEQOmQR0AdvzpD4LoN0GXMWzzGSuRrxR2xTnCrvNbVwK9N6/jQ92GSLfiZWoQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/plugin-transform-dynamic-import@7.27.1':
+    resolution: {integrity: sha512-MHzkWQcEmjzzVW9j2q8LGjwGWpG2mjwaaB0BNQwst3FIjqsg8Ct/mIZlvSPJvfi9y2AC8mi/ktxbFVL9pZ1I4A==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-explicit-resource-management@7.28.0':
+    resolution: {integrity: sha512-K8nhUcn3f6iB+P3gwCv/no7OdzOZQcKchW6N389V6PD8NUWKZHzndOd9sPDVbMoBsbmjMqlB4L9fm+fEFNVlwQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-exponentiation-operator@7.27.1':
+    resolution: {integrity: sha512-uspvXnhHvGKf2r4VVtBpeFnuDWsJLQ6MF6lGJLC89jBR1uoVeqM416AZtTuhTezOfgHicpJQmoD5YUakO/YmXQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-export-namespace-from@7.27.1':
+    resolution: {integrity: sha512-tQvHWSZ3/jH2xuq/vZDy0jNn+ZdXJeM8gHvX4lnJmsc3+50yPlWdZXIc5ay+umX+2/tJIqHqiEqcJvxlmIvRvQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-flow-strip-types@7.27.1':
+    resolution: {integrity: sha512-G5eDKsu50udECw7DL2AcsysXiQyB7Nfg521t2OAJ4tbfTJ27doHLeF/vlI1NZGlLdbb/v+ibvtL1YBQqYOwJGg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-for-of@7.27.1':
+    resolution: {integrity: sha512-BfbWFFEJFQzLCQ5N8VocnCtA8J1CLkNTe2Ms2wocj75dd6VpiqS5Z5quTYcUoo4Yq+DN0rtikODccuv7RU81sw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-function-name@7.27.1':
+    resolution: {integrity: sha512-1bQeydJF9Nr1eBCMMbC+hdwmRlsv5XYOMu03YSWFwNs0HsAmtSxxF1fyuYPqemVldVyFmlCU7w8UE14LupUSZQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-json-strings@7.27.1':
+    resolution: {integrity: sha512-6WVLVJiTjqcQauBhn1LkICsR2H+zm62I3h9faTDKt1qP4jn2o72tSvqMwtGFKGTpojce0gJs+76eZ2uCHRZh0Q==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-literals@7.27.1':
+    resolution: {integrity: sha512-0HCFSepIpLTkLcsi86GG3mTUzxV5jpmbv97hTETW3yzrAij8aqlD36toB1D0daVFJM8NK6GvKO0gslVQmm+zZA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-logical-assignment-operators@7.27.1':
+    resolution: {integrity: sha512-SJvDs5dXxiae4FbSL1aBJlG4wvl594N6YEVVn9e3JGulwioy6z3oPjx/sQBO3Y4NwUu5HNix6KJ3wBZoewcdbw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-member-expression-literals@7.27.1':
+    resolution: {integrity: sha512-hqoBX4dcZ1I33jCSWcXrP+1Ku7kdqXf1oeah7ooKOIiAdKQ+uqftgCFNOSzA5AMS2XIHEYeGFg4cKRCdpxzVOQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-modules-amd@7.27.1':
+    resolution: {integrity: sha512-iCsytMg/N9/oFq6n+gFTvUYDZQOMK5kEdeYxmxt91fcJGycfxVP9CnrxoliM0oumFERba2i8ZtwRUCMhvP1LnA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-modules-commonjs@7.27.1':
+    resolution: {integrity: sha512-OJguuwlTYlN0gBZFRPqwOGNWssZjfIUdS7HMYtN8c1KmwpwHFBwTeFZrg9XZa+DFTitWOW5iTAG7tyCUPsCCyw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-modules-systemjs@7.27.1':
+    resolution: {integrity: sha512-w5N1XzsRbc0PQStASMksmUeqECuzKuTJer7kFagK8AXgpCMkeDMO5S+aaFb7A51ZYDF7XI34qsTX+fkHiIm5yA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-modules-umd@7.27.1':
+    resolution: {integrity: sha512-iQBE/xC5BV1OxJbp6WG7jq9IWiD+xxlZhLrdwpPkTX3ydmXdvoCpyfJN7acaIBZaOqTfr76pgzqBJflNbeRK+w==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-named-capturing-groups-regex@7.27.1':
+    resolution: {integrity: sha512-SstR5JYy8ddZvD6MhV0tM/j16Qds4mIpJTOd1Yu9J9pJjH93bxHECF7pgtc28XvkzTD6Pxcm/0Z73Hvk7kb3Ng==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/plugin-transform-new-target@7.27.1':
+    resolution: {integrity: sha512-f6PiYeqXQ05lYq3TIfIDu/MtliKUbNwkGApPUvyo6+tc7uaR4cPjPe7DFPr15Uyycg2lZU6btZ575CuQoYh7MQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-nullish-coalescing-operator@7.27.1':
+    resolution: {integrity: sha512-aGZh6xMo6q9vq1JGcw58lZ1Z0+i0xB2x0XaauNIUXd6O1xXc3RwoWEBlsTQrY4KQ9Jf0s5rgD6SiNkaUdJegTA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-numeric-separator@7.27.1':
+    resolution: {integrity: sha512-fdPKAcujuvEChxDBJ5c+0BTaS6revLV7CJL08e4m3de8qJfNIuCc2nc7XJYOjBoTMJeqSmwXJ0ypE14RCjLwaw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-object-rest-spread@7.28.4':
+    resolution: {integrity: sha512-373KA2HQzKhQCYiRVIRr+3MjpCObqzDlyrM6u4I201wL8Mp2wHf7uB8GhDwis03k2ti8Zr65Zyyqs1xOxUF/Ew==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-object-super@7.27.1':
+    resolution: {integrity: sha512-SFy8S9plRPbIcxlJ8A6mT/CxFdJx/c04JEctz4jf8YZaVS2px34j7NXRrlGlHkN/M2gnpL37ZpGRGVFLd3l8Ng==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-optional-catch-binding@7.27.1':
+    resolution: {integrity: sha512-txEAEKzYrHEX4xSZN4kJ+OfKXFVSWKB2ZxM9dpcE3wT7smwkNmXo5ORRlVzMVdJbD+Q8ILTgSD7959uj+3Dm3Q==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-optional-chaining@7.27.1':
+    resolution: {integrity: sha512-BQmKPPIuc8EkZgNKsv0X4bPmOoayeu4F1YCwx2/CfmDSXDbp7GnzlUH+/ul5VGfRg1AoFPsrIThlEBj2xb4CAg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-parameters@7.27.7':
+    resolution: {integrity: sha512-qBkYTYCb76RRxUM6CcZA5KRu8K4SM8ajzVeUgVdMVO9NN9uI/GaVmBg/WKJJGnNokV9SY8FxNOVWGXzqzUidBg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-private-methods@7.27.1':
+    resolution: {integrity: sha512-10FVt+X55AjRAYI9BrdISN9/AQWHqldOeZDUoLyif1Kn05a56xVBXb8ZouL8pZ9jem8QpXaOt8TS7RHUIS+GPA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-private-property-in-object@7.27.1':
+    resolution: {integrity: sha512-5J+IhqTi1XPa0DXF83jYOaARrX+41gOewWbkPyjMNRDqgOCqdffGh8L3f/Ek5utaEBZExjSAzcyjmV9SSAWObQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-property-literals@7.27.1':
+    resolution: {integrity: sha512-oThy3BCuCha8kDZ8ZkgOg2exvPYUlprMukKQXI1r1pJ47NCvxfkEy8vK+r/hT9nF0Aa4H1WUPZZjHTFtAhGfmQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-react-display-name@7.28.0':
+    resolution: {integrity: sha512-D6Eujc2zMxKjfa4Zxl4GHMsmhKKZ9VpcqIchJLvwTxad9zWIYulwYItBovpDOoNLISpcZSXoDJ5gaGbQUDqViA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-react-jsx-self@7.27.1':
+    resolution: {integrity: sha512-6UzkCs+ejGdZ5mFFC/OCUrv028ab2fp1znZmCZjAOBKiBK2jXD1O+BPSfX8X2qjJ75fZBMSnQn3Rq2mrBJK2mw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-react-jsx-source@7.27.1':
+    resolution: {integrity: sha512-zbwoTsBruTeKB9hSq73ha66iFeJHuaFkUbwvqElnygoNbj/jHRsSeokowZFN3CZ64IvEqcmmkVe89OPXc7ldAw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-react-jsx@7.27.1':
+    resolution: {integrity: sha512-2KH4LWGSrJIkVf5tSiBFYuXDAoWRq2MMwgivCf+93dd0GQi8RXLjKA/0EvRnVV5G0hrHczsquXuD01L8s6dmBw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-regenerator@7.28.4':
+    resolution: {integrity: sha512-+ZEdQlBoRg9m2NnzvEeLgtvBMO4tkFBw5SQIUgLICgTrumLoU7lr+Oghi6km2PFj+dbUt2u1oby2w3BDO9YQnA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-regexp-modifiers@7.27.1':
+    resolution: {integrity: sha512-TtEciroaiODtXvLZv4rmfMhkCv8jx3wgKpL68PuiPh2M4fvz5jhsA7697N1gMvkvr/JTF13DrFYyEbY9U7cVPA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/plugin-transform-reserved-words@7.27.1':
+    resolution: {integrity: sha512-V2ABPHIJX4kC7HegLkYoDpfg9PVmuWy/i6vUM5eGK22bx4YVFD3M5F0QQnWQoDs6AGsUWTVOopBiMFQgHaSkVw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-shorthand-properties@7.27.1':
+    resolution: {integrity: sha512-N/wH1vcn4oYawbJ13Y/FxcQrWk63jhfNa7jef0ih7PHSIHX2LB7GWE1rkPrOnka9kwMxb6hMl19p7lidA+EHmQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-spread@7.27.1':
+    resolution: {integrity: sha512-kpb3HUqaILBJcRFVhFUs6Trdd4mkrzcGXss+6/mxUd273PfbWqSDHRzMT2234gIg2QYfAjvXLSquP1xECSg09Q==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-sticky-regex@7.27.1':
+    resolution: {integrity: sha512-lhInBO5bi/Kowe2/aLdBAawijx+q1pQzicSgnkB6dUPc1+RC8QmJHKf2OjvU+NZWitguJHEaEmbV6VWEouT58g==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-template-literals@7.27.1':
+    resolution: {integrity: sha512-fBJKiV7F2DxZUkg5EtHKXQdbsbURW3DZKQUWphDum0uRP6eHGGa/He9mc0mypL680pb+e/lDIthRohlv8NCHkg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-typeof-symbol@7.27.1':
+    resolution: {integrity: sha512-RiSILC+nRJM7FY5srIyc4/fGIwUhyDuuBSdWn4y6yT6gm652DpCHZjIipgn6B7MQ1ITOUnAKWixEUjQRIBIcLw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-unicode-escapes@7.27.1':
+    resolution: {integrity: sha512-Ysg4v6AmF26k9vpfFuTZg8HRfVWzsh1kVfowA23y9j/Gu6dOuahdUVhkLqpObp3JIv27MLSii6noRnuKN8H0Mg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-unicode-property-regex@7.27.1':
+    resolution: {integrity: sha512-uW20S39PnaTImxp39O5qFlHLS9LJEmANjMG7SxIhap8rCHqu0Ik+tLEPX5DKmHn6CsWQ7j3lix2tFOa5YtL12Q==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-unicode-regex@7.27.1':
+    resolution: {integrity: sha512-xvINq24TRojDuyt6JGtHmkVkrfVV3FPT16uytxImLeBZqW3/H52yN+kM1MGuyPkIQxrzKwPHs5U/MP3qKyzkGw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-unicode-sets-regex@7.27.1':
+    resolution: {integrity: sha512-EtkOujbc4cgvb0mlpQefi4NTPBzhSIevblFevACNLUspmrALgmEBdL/XfnyyITfd8fKBZrZys92zOWcik7j9Tw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/preset-env@7.28.3':
+    resolution: {integrity: sha512-ROiDcM+GbYVPYBOeCR6uBXKkQpBExLl8k9HO1ygXEyds39j+vCCsjmj7S8GOniZQlEs81QlkdJZe76IpLSiqpg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/preset-modules@0.1.6-no-external-plugins':
+    resolution: {integrity: sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0 || ^8.0.0-0 <8.0.0
+
+  '@babel/runtime@7.28.4':
+    resolution: {integrity: sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/template@7.27.2':
+    resolution: {integrity: sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/traverse@7.28.4':
+    resolution: {integrity: sha512-YEzuboP2qvQavAcjgQNVgsvHIDv6ZpwXvcvjmyySP2DIMuByS/6ioU5G9pYrWHM6T2YDfc7xga9iNzYOs12CFQ==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/types@7.28.4':
+    resolution: {integrity: sha512-bkFqkLhh3pMBUQQkpVgWDWq/lqzc2678eUyDlTBhRqhCHFguYYGM0Efga7tYk4TogG/3x0EEl66/OQ+WGbWB/Q==}
+    engines: {node: '>=6.9.0'}
+
+  '@cspotcode/source-map-support@0.8.1':
+    resolution: {integrity: sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==}
+    engines: {node: '>=12'}
+
+  '@csstools/css-parser-algorithms@2.7.1':
+    resolution: {integrity: sha512-2SJS42gxmACHgikc1WGesXLIT8d/q2l0UFM7TaEeIzdFCE/FPMtTiizcPGGJtlPo2xuQzY09OhrLTzRxqJqwGw==}
+    engines: {node: ^14 || ^16 || >=18}
+    peerDependencies:
+      '@csstools/css-tokenizer': ^2.4.1
+
+  '@csstools/css-tokenizer@2.4.1':
+    resolution: {integrity: sha512-eQ9DIktFJBhGjioABJRtUucoWR2mwllurfnM8LuNGAqX3ViZXaUchqk+1s7jjtkFiT9ySdACsFEA3etErkALUg==}
+    engines: {node: ^14 || ^16 || >=18}
+
+  '@csstools/media-query-list-parser@2.1.13':
+    resolution: {integrity: sha512-XaHr+16KRU9Gf8XLi3q8kDlI18d5vzKSKCY510Vrtc9iNR0NJzbY9hhTmwhzYZj/ZwGL4VmB3TA9hJW0Um2qFA==}
+    engines: {node: ^14 || ^16 || >=18}
+    peerDependencies:
+      '@csstools/css-parser-algorithms': ^2.7.1
+      '@csstools/css-tokenizer': ^2.4.1
+
+  '@csstools/selector-specificity@3.1.1':
+    resolution: {integrity: sha512-a7cxGcJ2wIlMFLlh8z2ONm+715QkPHiyJcxwQlKOz/03GPw1COpfhcmC9wm4xlZfp//jWHNNMwzjtqHXVWU9KA==}
+    engines: {node: ^14 || ^16 || >=18}
+    peerDependencies:
+      postcss-selector-parser: ^6.0.13
+
+  '@emotion/babel-plugin@11.13.5':
+    resolution: {integrity: sha512-pxHCpT2ex+0q+HH91/zsdHkw/lXd468DIN2zvfvLtPKLLMo6gQj7oLObq8PhkrxOZb/gGCq03S3Z7PDhS8pduQ==}
+
+  '@emotion/cache@11.14.0':
+    resolution: {integrity: sha512-L/B1lc/TViYk4DcpGxtAVbx0ZyiKM5ktoIyafGkH6zg/tj+mA+NE//aPYKG0k8kCHSHVJrpLpcAlOBEXQ3SavA==}
+
+  '@emotion/hash@0.9.2':
+    resolution: {integrity: sha512-MyqliTZGuOm3+5ZRSaaBGP3USLw6+EGykkwZns2EPC5g8jJ4z9OrdZY9apkl3+UP9+sdz76YYkwCKP5gh8iY3g==}
+
+  '@emotion/memoize@0.9.0':
+    resolution: {integrity: sha512-30FAj7/EoJ5mwVPOWhAyCX+FPfMDrVecJAM+Iw9NRoSl4BBAQeqj4cApHHUXOVvIPgLVDsCFoz/hGD+5QQD1GQ==}
+
+  '@emotion/react@11.14.0':
+    resolution: {integrity: sha512-O000MLDBDdk/EohJPFUqvnp4qnHeYkVP5B0xEG0D/L7cOKP9kefu2DXn8dj74cQfsEzUqh+sr1RzFqiL1o+PpA==}
+    peerDependencies:
+      '@types/react': '*'
+      react: '>=16.8.0'
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  '@emotion/serialize@1.3.3':
+    resolution: {integrity: sha512-EISGqt7sSNWHGI76hC7x1CksiXPahbxEOrC5RjmFRJTqLyEK9/9hZvBbiYn70dw4wuwMKiEMCUlR6ZXTSWQqxA==}
+
+  '@emotion/sheet@1.4.0':
+    resolution: {integrity: sha512-fTBW9/8r2w3dXWYM4HCB1Rdp8NLibOw2+XELH5m5+AkWiL/KqYX6dc0kKYlaYyKjrQ6ds33MCdMPEwgs2z1rqg==}
+
+  '@emotion/unitless@0.10.0':
+    resolution: {integrity: sha512-dFoMUuQA20zvtVTuxZww6OHoJYgrzfKM1t52mVySDJnMSEa08ruEvdYQbhvyu6soU+NeLVd3yKfTfT0NeV6qGg==}
+
+  '@emotion/use-insertion-effect-with-fallbacks@1.2.0':
+    resolution: {integrity: sha512-yJMtVdH59sxi/aVJBpk9FQq+OR8ll5GT8oWd57UpeaKEVGab41JWaCFA7FRLoMLloOZF/c/wsPoe+bfGmRKgDg==}
+    peerDependencies:
+      react: '>=16.8.0'
+
+  '@emotion/utils@1.4.2':
+    resolution: {integrity: sha512-3vLclRofFziIa3J2wDh9jjbkUz9qk5Vi3IZ/FSTKViB0k+ef0fPV7dYrUIugbgupYDx7v9ud/SjrtEP8Y4xLoA==}
+
+  '@emotion/weak-memoize@0.4.0':
+    resolution: {integrity: sha512-snKqtPW01tN0ui7yu9rGv69aJXr/a/Ywvl11sUjNtEcRc+ng/mQriFL0wLXMef74iHa/EkftbDzU9F8iFbH+zg==}
+
+  '@envelop/core@5.3.2':
+    resolution: {integrity: sha512-06Mu7fmyKzk09P2i2kHpGfItqLLgCq7uO5/nX4fc/iHMplWPNuAx4iYR+WXUQoFHDnP6EUbceQNQ5iyeMz9f3g==}
+    engines: {node: '>=18.0.0'}
+
+  '@envelop/instrumentation@1.0.0':
+    resolution: {integrity: sha512-cxgkB66RQB95H3X27jlnxCRNTmPuSTgmBAq6/4n2Dtv4hsk4yz8FadA1ggmd0uZzvKqWD6CR+WFgTjhDqg7eyw==}
+    engines: {node: '>=18.0.0'}
+
+  '@envelop/types@5.2.1':
+    resolution: {integrity: sha512-CsFmA3u3c2QoLDTfEpGr4t25fjMU31nyvse7IzWTvb0ZycuPjMjb0fjlheh+PbhBYb9YLugnT2uY6Mwcg1o+Zg==}
+    engines: {node: '>=18.0.0'}
+
+  '@esbuild/android-arm64@0.18.20':
+    resolution: {integrity: sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [android]
+
+  '@esbuild/android-arm@0.18.20':
+    resolution: {integrity: sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==}
+    engines: {node: '>=12'}
+    cpu: [arm]
+    os: [android]
+
+  '@esbuild/android-x64@0.18.20':
+    resolution: {integrity: sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [android]
+
+  '@esbuild/darwin-arm64@0.18.20':
+    resolution: {integrity: sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@esbuild/darwin-x64@0.18.20':
+    resolution: {integrity: sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [darwin]
+
+  '@esbuild/freebsd-arm64@0.18.20':
+    resolution: {integrity: sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [freebsd]
+
+  '@esbuild/freebsd-x64@0.18.20':
+    resolution: {integrity: sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [freebsd]
+
+  '@esbuild/linux-arm64@0.18.20':
+    resolution: {integrity: sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@esbuild/linux-arm@0.18.20':
+    resolution: {integrity: sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==}
+    engines: {node: '>=12'}
+    cpu: [arm]
+    os: [linux]
+
+  '@esbuild/linux-ia32@0.18.20':
+    resolution: {integrity: sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==}
+    engines: {node: '>=12'}
+    cpu: [ia32]
+    os: [linux]
+
+  '@esbuild/linux-loong64@0.18.20':
+    resolution: {integrity: sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==}
+    engines: {node: '>=12'}
+    cpu: [loong64]
+    os: [linux]
+
+  '@esbuild/linux-mips64el@0.18.20':
+    resolution: {integrity: sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==}
+    engines: {node: '>=12'}
+    cpu: [mips64el]
+    os: [linux]
+
+  '@esbuild/linux-ppc64@0.18.20':
+    resolution: {integrity: sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==}
+    engines: {node: '>=12'}
+    cpu: [ppc64]
+    os: [linux]
+
+  '@esbuild/linux-riscv64@0.18.20':
+    resolution: {integrity: sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==}
+    engines: {node: '>=12'}
+    cpu: [riscv64]
+    os: [linux]
+
+  '@esbuild/linux-s390x@0.18.20':
+    resolution: {integrity: sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==}
+    engines: {node: '>=12'}
+    cpu: [s390x]
+    os: [linux]
+
+  '@esbuild/linux-x64@0.18.20':
+    resolution: {integrity: sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [linux]
+
+  '@esbuild/netbsd-x64@0.18.20':
+    resolution: {integrity: sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [netbsd]
+
+  '@esbuild/openbsd-x64@0.18.20':
+    resolution: {integrity: sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [openbsd]
+
+  '@esbuild/sunos-x64@0.18.20':
+    resolution: {integrity: sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [sunos]
+
+  '@esbuild/win32-arm64@0.18.20':
+    resolution: {integrity: sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [win32]
+
+  '@esbuild/win32-ia32@0.18.20':
+    resolution: {integrity: sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==}
+    engines: {node: '>=12'}
+    cpu: [ia32]
+    os: [win32]
+
+  '@esbuild/win32-x64@0.18.20':
+    resolution: {integrity: sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [win32]
+
+  '@eslint-community/eslint-utils@4.9.0':
+    resolution: {integrity: sha512-ayVFHdtZ+hsq1t2Dy24wCmGXGe4q9Gu3smhLYALJrr473ZH27MsnSL+LKUlimp4BWJqMDMLmPpx/Q9R3OAlL4g==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
+
+  '@eslint-community/regexpp@4.12.1':
+    resolution: {integrity: sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==}
+    engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
+
+  '@eslint/eslintrc@2.1.4':
+    resolution: {integrity: sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+
+  '@eslint/js@8.57.1':
+    resolution: {integrity: sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+
+  '@fastify/busboy@3.2.0':
+    resolution: {integrity: sha512-m9FVDXU3GT2ITSe0UaMA5rU3QkfC/UXtCU8y0gSN/GugTqtVldOBWIB5V6V3sbmenVZUIpU6f+mPEO2+m5iTaA==}
+
+  '@floating-ui/core@1.7.3':
+    resolution: {integrity: sha512-sGnvb5dmrJaKEZ+LDIpguvdX3bDlEllmv4/ClQ9awcmCZrlx5jQyyMWFM5kBI+EyNOCDDiKk8il0zeuX3Zlg/w==}
+
+  '@floating-ui/dom@1.7.4':
+    resolution: {integrity: sha512-OOchDgh4F2CchOX94cRVqhvy7b3AFb+/rQXyswmzmGakRfkMgoWVjfnLWkRirfLEfuD4ysVW16eXzwt3jHIzKA==}
+
+  '@floating-ui/utils@0.2.10':
+    resolution: {integrity: sha512-aGTxbpbg8/b5JfU1HXSrbH3wXZuLPJcNEcZQFMxLs3oSzgtVu6nFPkbbGGUvBcUjKV2YyB9Wxxabo+HEH9tcRQ==}
+
+  '@formatjs/ecma402-abstract@1.18.3':
+    resolution: {integrity: sha512-J961RbhyjHWeCIv+iOceNxpoZ/qomJOs5lH+rUJCeKNa59gME4KC0LJVMeWODjHsnv/hTH8Hvd6sevzcAzjuaQ==}
+
+  '@formatjs/ecma402-abstract@1.4.0':
+    resolution: {integrity: sha512-Mv027hcLFjE45K8UJ8PjRpdDGfR0aManEFj1KzoN8zXNveHGEygpZGfFf/FTTMl+QEVSrPAUlyxaCApvmv47AQ==}
+
+  '@formatjs/ecma402-abstract@1.5.0':
+    resolution: {integrity: sha512-wXv36yo+mfWllweN0Fq7sUs7PUiNopn7I0JpLTe3hGu6ZMR4CV7LqK1llhB18pndwpKoafQKb1et2DCJAOW20Q==}
+
+  '@formatjs/ecma402-abstract@2.2.4':
+    resolution: {integrity: sha512-lFyiQDVvSbQOpU+WFd//ILolGj4UgA/qXrKeZxdV14uKiAUiPAtX6XAn7WBCRi7Mx6I7EybM9E5yYn4BIpZWYg==}
+
+  '@formatjs/ecma402-abstract@2.3.6':
+    resolution: {integrity: sha512-HJnTFeRM2kVFVr5gr5kH1XP6K0JcJtE7Lzvtr3FS/so5f1kpsqqqxy5JF+FRaO6H2qmcMfAUIox7AJteieRtVw==}
+
+  '@formatjs/fast-memoize@2.2.3':
+    resolution: {integrity: sha512-3jeJ+HyOfu8osl3GNSL4vVHUuWFXR03Iz9jjgI7RwjG6ysu/Ymdr0JRCPHfF5yGbTE6JCrd63EpvX1/WybYRbA==}
+
+  '@formatjs/fast-memoize@2.2.7':
+    resolution: {integrity: sha512-Yabmi9nSvyOMrlSeGGWDiH7rf3a7sIwplbvo/dlz9WCIjzIQAfy1RMf4S0X3yG724n5Ghu2GmEl5NJIV6O9sZQ==}
+
+  '@formatjs/icu-messageformat-parser@2.9.4':
+    resolution: {integrity: sha512-Tbvp5a9IWuxUcpWNIW6GlMQYEc4rwNHR259uUFoKWNN1jM9obf9Ul0e+7r7MvFOBNcN+13K7NuKCKqQiAn1QEg==}
+
+  '@formatjs/icu-skeleton-parser@1.8.8':
+    resolution: {integrity: sha512-vHwK3piXwamFcx5YQdCdJxUQ1WdTl6ANclt5xba5zLGDv5Bsur7qz8AD7BevaKxITwpgDeU0u8My3AIibW9ywA==}
+
+  '@formatjs/intl-displaynames@6.8.5':
+    resolution: {integrity: sha512-85b+GdAKCsleS6cqVxf/Aw/uBd+20EM0wDpgaxzHo3RIR3bxF4xCJqH/Grbzx8CXurTgDDZHPdPdwJC+May41w==}
+
+  '@formatjs/intl-enumerator@1.4.6':
+    resolution: {integrity: sha512-O2YMcE3SuBy4jL8r6YNq/8hvFrQ92QGLawdmzFbOi8D1r3VOfEMr8ifnOMp3zt8XemfTLrma+aF6yRCVeEbVLw==}
+
+  '@formatjs/intl-getcanonicallocales@2.3.0':
+    resolution: {integrity: sha512-BOXbLwqQ7nKua/l7tKqDLRN84WupDXFDhGJQMFvsMVA2dKuOdRaWTxWpL3cJ7qPkoNw11Jf+Xpj4OSPBBvW0eQ==}
+
+  '@formatjs/intl-getcanonicallocales@2.5.6':
+    resolution: {integrity: sha512-CnBbc4St61RL06gDXlCZG08Gt41uiySgsdZNBExh8/c0FBONJCrAlQ9FsyalUdq9ze0nCeknJtMmO8JnB9xHgQ==}
+
+  '@formatjs/intl-listformat@7.7.5':
+    resolution: {integrity: sha512-Wzes10SMNeYgnxYiKsda4rnHP3Q3II4XT2tZyOgnH5fWuHDtIkceuWlRQNsvrI3uiwP4hLqp2XdQTCsfkhXulg==}
+
+  '@formatjs/intl-locale@3.4.6':
+    resolution: {integrity: sha512-2TI0sBmIBhtM/BI/ePWuQhoqmMWveeKF4bUphs9YLHmFf4XmmlpWKzbPV8jR/fTK/KFidEuZsF+IgbOAL/OVGQ==}
+
+  '@formatjs/intl-localematcher@0.5.4':
+    resolution: {integrity: sha512-zTwEpWOzZ2CiKcB93BLngUX59hQkuZjT2+SAQEscSm52peDW/getsawMcWF1rGRpMCX6D7nSJA3CzJ8gn13N/g==}
+
+  '@formatjs/intl-localematcher@0.5.8':
+    resolution: {integrity: sha512-I+WDNWWJFZie+jkfkiK5Mp4hEDyRSEvmyfYadflOno/mmKJKcB17fEpEH0oJu/OWhhCJ8kJBDz2YMd/6cDl7Mg==}
+
+  '@formatjs/intl-localematcher@0.6.2':
+    resolution: {integrity: sha512-XOMO2Hupl0wdd172Y06h6kLpBz6Dv+J4okPLl4LPtzbr8f66WbIoy4ev98EBuZ6ZK4h5ydTN6XneT4QVpD7cdA==}
+
+  '@formatjs/intl-numberformat@5.7.6':
+    resolution: {integrity: sha512-ZlZfYtvbVHYZY5OG3RXizoCwxKxEKOrzEe2YOw9wbzoxF3PmFn0SAgojCFGLyNXkkR6xVxlylhbuOPf1dkIVNg==}
+
+  '@formatjs/intl-numberformat@8.15.6':
+    resolution: {integrity: sha512-htynTNKm5WOnbR521tNSMkWzX3yO6Z77qjOxvRujh5/A/UBKeoNElyuKCJltizdx3X33QNWQZC4aWjLKcccyeQ==}
+
+  '@formatjs/intl-pluralrules@5.4.6':
+    resolution: {integrity: sha512-2HlOq+c7KsSps829SJ3B5987coX5mzKx9NbPcNwQ07eq8FBHgB3HfMoxt5HvLsdk4oQwCjAEnocbtd+wVwZ2Kg==}
+
+  '@formatjs/intl@2.10.15':
+    resolution: {integrity: sha512-i6+xVqT+6KCz7nBfk4ybMXmbKO36tKvbMKtgFz9KV+8idYFyFbfwKooYk8kGjyA5+T5f1kEPQM5IDLXucTAQ9g==}
+    peerDependencies:
+      typescript: ^4.7 || 5
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  '@formatjs/ts-transformer@2.13.0':
+    resolution: {integrity: sha512-mu7sHXZk1NWZrQ3eUqugpSYo8x5/tXkrI4uIbFqCEC0eNgQaIcoKgVeDFgDAcgG+cEme2atAUYSFF+DFWC4org==}
+    peerDependencies:
+      ts-jest: ^26.4.0
+    peerDependenciesMeta:
+      ts-jest:
+        optional: true
+
+  '@fortawesome/fontawesome-common-types@6.7.2':
+    resolution: {integrity: sha512-Zs+YeHUC5fkt7Mg1l6XTniei3k4bwG/yo3iFUtZWd/pMx9g3fdvkSK9E0FOC+++phXOka78uJcYb8JaFkW52Xg==}
+    engines: {node: '>=6'}
+
+  '@fortawesome/fontawesome-svg-core@6.7.2':
+    resolution: {integrity: sha512-yxtOBWDrdi5DD5o1pmVdq3WMCvnobT0LU6R8RyyVXPvFRd2o79/0NCuQoCjNTeZz9EzA9xS3JxNWfv54RIHFEA==}
+    engines: {node: '>=6'}
+
+  '@fortawesome/free-brands-svg-icons@6.7.2':
+    resolution: {integrity: sha512-zu0evbcRTgjKfrr77/2XX+bU+kuGfjm0LbajJHVIgBWNIDzrhpRxiCPNT8DW5AdmSsq7Mcf9D1bH0aSeSUSM+Q==}
+    engines: {node: '>=6'}
+
+  '@fortawesome/free-regular-svg-icons@6.7.2':
+    resolution: {integrity: sha512-7Z/ur0gvCMW8G93dXIQOkQqHo2M5HLhYrRVC0//fakJXxcF1VmMPsxnG6Ee8qEylA8b8Q3peQXWMNZ62lYF28g==}
+    engines: {node: '>=6'}
+
+  '@fortawesome/free-solid-svg-icons@6.7.2':
+    resolution: {integrity: sha512-GsBrnOzU8uj0LECDfD5zomZJIjrPhIlWU82AHwa2s40FKH+kcxQaBvBo3Z4TxyZHIyX8XTDxsyA33/Vx9eFuQA==}
+    engines: {node: '>=6'}
+
+  '@fortawesome/react-fontawesome@0.2.6':
+    resolution: {integrity: sha512-mtBFIi1UsYQo7rYonYFkjgYKGoL8T+fEH6NGUpvuqtY3ytMsAoDaPo5rk25KuMtKDipY4bGYM/CkmCHA1N3FUg==}
+    peerDependencies:
+      '@fortawesome/fontawesome-svg-core': ~1 || ~6 || ~7
+      react: ^16.3 || ^17.0.0 || ^18.0.0 || ^19.0.0
+
+  '@graphql-codegen/add@5.0.3':
+    resolution: {integrity: sha512-SxXPmramkth8XtBlAHu4H4jYcYXM/o3p01+psU+0NADQowA8jtYkK6MW5rV6T+CxkEaNZItfSmZRPgIuypcqnA==}
+    peerDependencies:
+      graphql: ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0
+
+  '@graphql-codegen/cli@5.0.7':
+    resolution: {integrity: sha512-h/sxYvSaWtxZxo8GtaA8SvcHTyViaaPd7dweF/hmRDpaQU1o3iU3EZxlcJ+oLTunU0tSMFsnrIXm/mhXxI11Cw==}
+    engines: {node: '>=16'}
+    hasBin: true
+    peerDependencies:
+      '@parcel/watcher': ^2.1.0
+      graphql: ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0
+    peerDependenciesMeta:
+      '@parcel/watcher':
+        optional: true
+
+  '@graphql-codegen/client-preset@4.8.3':
+    resolution: {integrity: sha512-QpEsPSO9fnRxA6Z66AmBuGcwHjZ6dYSxYo5ycMlYgSPzAbyG8gn/kWljofjJfWqSY+T/lRn+r8IXTH14ml24vQ==}
+    engines: {node: '>=16'}
+    peerDependencies:
+      graphql: ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0
+      graphql-sock: ^1.0.0
+    peerDependenciesMeta:
+      graphql-sock:
+        optional: true
+
+  '@graphql-codegen/core@4.0.2':
+    resolution: {integrity: sha512-IZbpkhwVqgizcjNiaVzNAzm/xbWT6YnGgeOLwVjm4KbJn3V2jchVtuzHH09G5/WkkLSk2wgbXNdwjM41JxO6Eg==}
+    peerDependencies:
+      graphql: ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0
+
+  '@graphql-codegen/gql-tag-operations@4.0.17':
+    resolution: {integrity: sha512-2pnvPdIG6W9OuxkrEZ6hvZd142+O3B13lvhrZ48yyEBh2ujtmKokw0eTwDHtlXUqjVS0I3q7+HB2y12G/m69CA==}
+    engines: {node: '>=16'}
+    peerDependencies:
+      graphql: ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0
+
+  '@graphql-codegen/plugin-helpers@3.1.2':
+    resolution: {integrity: sha512-emOQiHyIliVOIjKVKdsI5MXj312zmRDwmHpyUTZMjfpvxq/UVAHUJIVdVf+lnjjrI+LXBTgMlTWTgHQfmICxjg==}
+    peerDependencies:
+      graphql: ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0
+
+  '@graphql-codegen/plugin-helpers@5.1.1':
+    resolution: {integrity: sha512-28GHODK2HY1NhdyRcPP3sCz0Kqxyfiz7boIZ8qIxFYmpLYnlDgiYok5fhFLVSZihyOpCs4Fa37gVHf/Q4I2FEg==}
+    engines: {node: '>=16'}
+    peerDependencies:
+      graphql: ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0
+
+  '@graphql-codegen/schema-ast@4.1.0':
+    resolution: {integrity: sha512-kZVn0z+th9SvqxfKYgztA6PM7mhnSZaj4fiuBWvMTqA+QqQ9BBed6Pz41KuD/jr0gJtnlr2A4++/0VlpVbCTmQ==}
+    peerDependencies:
+      graphql: ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0
+
+  '@graphql-codegen/time@5.0.1':
+    resolution: {integrity: sha512-iHgS8+CmRofse8NRzKAkFKYVUzlZ5qYPpzjOA1Y+Fi8u4p90gOA5KjMqvMbAEcX1AWtR5cVtN2CJ2aENc36q8w==}
+    peerDependencies:
+      graphql: ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0
+
+  '@graphql-codegen/typed-document-node@5.1.2':
+    resolution: {integrity: sha512-jaxfViDqFRbNQmfKwUY8hDyjnLTw2Z7DhGutxoOiiAI0gE/LfPe0LYaVFKVmVOOD7M3bWxoWfu4slrkbWbUbEw==}
+    engines: {node: '>=16'}
+    peerDependencies:
+      graphql: ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0
+
+  '@graphql-codegen/typescript-operations@4.6.1':
+    resolution: {integrity: sha512-k92laxhih7s0WZ8j5WMIbgKwhe64C0As6x+PdcvgZFMudDJ7rPJ/hFqJ9DCRxNjXoHmSjnr6VUuQZq4lT1RzCA==}
+    engines: {node: '>=16'}
+    peerDependencies:
+      graphql: ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0
+      graphql-sock: ^1.0.0
+    peerDependenciesMeta:
+      graphql-sock:
+        optional: true
+
+  '@graphql-codegen/typescript-react-apollo@4.3.3':
+    resolution: {integrity: sha512-ecuzzqoZEHCtlxaEXL1LQTrfzVYwNNtbVUBHc/KQDfkJIQZon+dG5ZXOoJ4BpbRA2L99yTx+TZc2VkpOVfSypw==}
+    engines: {node: '>= 16.0.0'}
+    peerDependencies:
+      graphql: ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0
+
+  '@graphql-codegen/typescript@4.1.6':
+    resolution: {integrity: sha512-vpw3sfwf9A7S+kIUjyFxuvrywGxd4lmwmyYnnDVjVE4kSQ6Td3DpqaPTy8aNQ6O96vFoi/bxbZS2BW49PwSUUA==}
+    engines: {node: '>=16'}
+    peerDependencies:
+      graphql: ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0
+
+  '@graphql-codegen/visitor-plugin-common@2.13.8':
+    resolution: {integrity: sha512-IQWu99YV4wt8hGxIbBQPtqRuaWZhkQRG2IZKbMoSvh0vGeWb3dB0n0hSgKaOOxDY+tljtOf9MTcUYvJslQucMQ==}
+    peerDependencies:
+      graphql: ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0
+
+  '@graphql-codegen/visitor-plugin-common@5.8.0':
+    resolution: {integrity: sha512-lC1E1Kmuzi3WZUlYlqB4fP6+CvbKH9J+haU1iWmgsBx5/sO2ROeXJG4Dmt8gP03bI2BwjiwV5WxCEMlyeuzLnA==}
+    engines: {node: '>=16'}
+    peerDependencies:
+      graphql: ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0
+
+  '@graphql-hive/signal@1.0.0':
+    resolution: {integrity: sha512-RiwLMc89lTjvyLEivZ/qxAC5nBHoS2CtsWFSOsN35sxG9zoo5Z+JsFHM8MlvmO9yt+MJNIyC5MLE1rsbOphlag==}
+    engines: {node: '>=18.0.0'}
+
+  '@graphql-tools/apollo-engine-loader@8.0.22':
+    resolution: {integrity: sha512-ssD2wNxeOTRcUEkuGcp0KfZAGstL9YLTe/y3erTDZtOs2wL1TJESw8NVAp+3oUHPeHKBZQB4Z6RFEbPgMdT2wA==}
+    engines: {node: '>=16.0.0'}
+    peerDependencies:
+      graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
+
+  '@graphql-tools/batch-execute@9.0.19':
+    resolution: {integrity: sha512-VGamgY4PLzSx48IHPoblRw0oTaBa7S26RpZXt0Y4NN90ytoE0LutlpB2484RbkfcTjv9wa64QD474+YP1kEgGA==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
+
+  '@graphql-tools/code-file-loader@8.1.22':
+    resolution: {integrity: sha512-FSka29kqFkfFmw36CwoQ+4iyhchxfEzPbXOi37lCEjWLHudGaPkXc3RyB9LdmBxx3g3GHEu43a5n5W8gfcrMdA==}
+    engines: {node: '>=16.0.0'}
+    peerDependencies:
+      graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
+
+  '@graphql-tools/delegate@10.2.23':
+    resolution: {integrity: sha512-xrPtl7f1LxS+B6o+W7ueuQh67CwRkfl+UKJncaslnqYdkxKmNBB4wnzVcW8ZsRdwbsla/v43PtwAvSlzxCzq2w==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
+
+  '@graphql-tools/documents@1.0.1':
+    resolution: {integrity: sha512-aweoMH15wNJ8g7b2r4C4WRuJxZ0ca8HtNO54rkye/3duxTkW4fGBEutCx03jCIr5+a1l+4vFJNP859QnAVBVCA==}
+    engines: {node: '>=16.0.0'}
+    peerDependencies:
+      graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
+
+  '@graphql-tools/executor-common@0.0.4':
+    resolution: {integrity: sha512-SEH/OWR+sHbknqZyROCFHcRrbZeUAyjCsgpVWCRjqjqRbiJiXq6TxNIIOmpXgkrXWW/2Ev4Wms6YSGJXjdCs6Q==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
+
+  '@graphql-tools/executor-common@0.0.6':
+    resolution: {integrity: sha512-JAH/R1zf77CSkpYATIJw+eOJwsbWocdDjY+avY7G+P5HCXxwQjAjWVkJI1QJBQYjPQDVxwf1fmTZlIN3VOadow==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
+
+  '@graphql-tools/executor-graphql-ws@2.0.7':
+    resolution: {integrity: sha512-J27za7sKF6RjhmvSOwOQFeNhNHyP4f4niqPnerJmq73OtLx9Y2PGOhkXOEB0PjhvPJceuttkD2O1yMgEkTGs3Q==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
+
+  '@graphql-tools/executor-http@1.3.3':
+    resolution: {integrity: sha512-LIy+l08/Ivl8f8sMiHW2ebyck59JzyzO/yF9SFS4NH6MJZUezA1xThUXCDIKhHiD56h/gPojbkpcFvM2CbNE7A==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
+
+  '@graphql-tools/executor-legacy-ws@1.1.19':
+    resolution: {integrity: sha512-bEbv/SlEdhWQD0WZLUX1kOenEdVZk1yYtilrAWjRUgfHRZoEkY9s+oiqOxnth3z68wC2MWYx7ykkS5hhDamixg==}
+    engines: {node: '>=16.0.0'}
+    peerDependencies:
+      graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
+
+  '@graphql-tools/executor@1.4.9':
+    resolution: {integrity: sha512-SAUlDT70JAvXeqV87gGzvDzUGofn39nvaVcVhNf12Dt+GfWHtNNO/RCn/Ea4VJaSLGzraUd41ObnN3i80EBU7w==}
+    engines: {node: '>=16.0.0'}
+    peerDependencies:
+      graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
+
+  '@graphql-tools/git-loader@8.0.26':
+    resolution: {integrity: sha512-0g+9eng8DaT4ZmZvUmPgjLTgesUa6M8xrDjNBltRldZkB055rOeUgJiKmL6u8PjzI5VxkkVsn0wtAHXhDI2UXQ==}
+    engines: {node: '>=16.0.0'}
+    peerDependencies:
+      graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
+
+  '@graphql-tools/github-loader@8.0.22':
+    resolution: {integrity: sha512-uQ4JNcNPsyMkTIgzeSbsoT9hogLjYrZooLUYd173l5eUGUi49EAcsGdiBCKaKfEjanv410FE8hjaHr7fjSRkJw==}
+    engines: {node: '>=16.0.0'}
+    peerDependencies:
+      graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
+
+  '@graphql-tools/graphql-file-loader@8.1.2':
+    resolution: {integrity: sha512-VB6ttpwkqCu0KsA1/Wmev4qsu05Qfw49kgVSKkPjuyDQfVaqtr9ewEQRkX5CqnqHGEeLl6sOlNGEMM5fCVMWGQ==}
+    engines: {node: '>=16.0.0'}
+    peerDependencies:
+      graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
+
+  '@graphql-tools/graphql-tag-pluck@8.3.21':
+    resolution: {integrity: sha512-TJhELNvR1tmghXMi6HVKp/Swxbx1rcSp/zdkuJZT0DCM3vOY11FXY6NW3aoxumcuYDNN3jqXcCPKstYGFPi5GQ==}
+    engines: {node: '>=16.0.0'}
+    peerDependencies:
+      graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
+
+  '@graphql-tools/import@7.1.2':
+    resolution: {integrity: sha512-+tlNQbLEqAA4LdWoLwM1tckx95lo8WIKd8vhj99b9rLwN/KfLwHWzdS3jnUFK7+99vmHmN1oE5v5zmqJz0MTKw==}
+    engines: {node: '>=16.0.0'}
+    peerDependencies:
+      graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
+
+  '@graphql-tools/json-file-loader@8.0.20':
+    resolution: {integrity: sha512-5v6W+ZLBBML5SgntuBDLsYoqUvwfNboAwL6BwPHi3z/hH1f8BS9/0+MCW9OGY712g7E4pc3y9KqS67mWF753eA==}
+    engines: {node: '>=16.0.0'}
+    peerDependencies:
+      graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
+
+  '@graphql-tools/load@8.1.2':
+    resolution: {integrity: sha512-WhDPv25/jRND+0uripofMX0IEwo6mrv+tJg6HifRmDu8USCD7nZhufT0PP7lIcuutqjIQFyogqT70BQsy6wOgw==}
+    engines: {node: '>=16.0.0'}
+    peerDependencies:
+      graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
+
+  '@graphql-tools/merge@9.1.1':
+    resolution: {integrity: sha512-BJ5/7Y7GOhTuvzzO5tSBFL4NGr7PVqTJY3KeIDlVTT8YLcTXtBR+hlrC3uyEym7Ragn+zyWdHeJ9ev+nRX1X2w==}
+    engines: {node: '>=16.0.0'}
+    peerDependencies:
+      graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
+
+  '@graphql-tools/optimize@1.4.0':
+    resolution: {integrity: sha512-dJs/2XvZp+wgHH8T5J2TqptT9/6uVzIYvA6uFACha+ufvdMBedkfR4b4GbT8jAKLRARiqRTxy3dctnwkTM2tdw==}
+    peerDependencies:
+      graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
+
+  '@graphql-tools/optimize@2.0.0':
+    resolution: {integrity: sha512-nhdT+CRGDZ+bk68ic+Jw1OZ99YCDIKYA5AlVAnBHJvMawSx9YQqQAIj4refNc1/LRieGiuWvhbG3jvPVYho0Dg==}
+    engines: {node: '>=16.0.0'}
+    peerDependencies:
+      graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
+
+  '@graphql-tools/prisma-loader@8.0.17':
+    resolution: {integrity: sha512-fnuTLeQhqRbA156pAyzJYN0KxCjKYRU5bz1q/SKOwElSnAU4k7/G1kyVsWLh7fneY78LoMNH5n+KlFV8iQlnyg==}
+    engines: {node: '>=16.0.0'}
+    deprecated: 'This package was intended to be used with an older versions of Prisma.\nThe newer versions of Prisma has a different approach to GraphQL integration.\nTherefore, this package is no longer needed and has been deprecated and removed.\nLearn more: https://www.prisma.io/graphql'
+    peerDependencies:
+      graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
+
+  '@graphql-tools/relay-operation-optimizer@6.5.18':
+    resolution: {integrity: sha512-mc5VPyTeV+LwiM+DNvoDQfPqwQYhPV/cl5jOBjTgSniyaq8/86aODfMkrE2OduhQ5E00hqrkuL2Fdrgk0w1QJg==}
+    peerDependencies:
+      graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
+
+  '@graphql-tools/relay-operation-optimizer@7.0.21':
+    resolution: {integrity: sha512-vMdU0+XfeBh9RCwPqRsr3A05hPA3MsahFn/7OAwXzMySA5EVnSH5R4poWNs3h1a0yT0tDPLhxORhK7qJdSWj2A==}
+    engines: {node: '>=16.0.0'}
+    peerDependencies:
+      graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
+
+  '@graphql-tools/schema@10.0.25':
+    resolution: {integrity: sha512-/PqE8US8kdQ7lB9M5+jlW8AyVjRGCKU7TSktuW3WNKSKmDO0MK1wakvb5gGdyT49MjAIb4a3LWxIpwo5VygZuw==}
+    engines: {node: '>=16.0.0'}
+    peerDependencies:
+      graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
+
+  '@graphql-tools/url-loader@8.0.33':
+    resolution: {integrity: sha512-Fu626qcNHcqAj8uYd7QRarcJn5XZ863kmxsg1sm0fyjyfBJnsvC7ddFt6Hayz5kxVKfsnjxiDfPMXanvsQVBKw==}
+    engines: {node: '>=16.0.0'}
+    peerDependencies:
+      graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
+
+  '@graphql-tools/utils@10.9.1':
+    resolution: {integrity: sha512-B1wwkXk9UvU7LCBkPs8513WxOQ2H8Fo5p8HR1+Id9WmYE5+bd51vqN+MbrqvWczHCH2gwkREgHJN88tE0n1FCw==}
+    engines: {node: '>=16.0.0'}
+    peerDependencies:
+      graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
+
+  '@graphql-tools/utils@9.2.1':
+    resolution: {integrity: sha512-WUw506Ql6xzmOORlriNrD6Ugx+HjVgYxt9KCXD9mHAak+eaXSwuGGPyE60hy9xaDEoXKBsG7SkG69ybitaVl6A==}
+    peerDependencies:
+      graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
+
+  '@graphql-tools/wrap@10.1.4':
+    resolution: {integrity: sha512-7pyNKqXProRjlSdqOtrbnFRMQAVamCmEREilOXtZujxY6kYit3tvWWSjUrcIOheltTffoRh7EQSjpy2JDCzasg==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
+
+  '@graphql-typed-document-node/core@3.2.0':
+    resolution: {integrity: sha512-mB9oAsNCm9aM3/SOv4YtBMqZbYj10R7dkq8byBqxGY/ncFwhf2oQzMV+LCRlWoDSEBJ3COiR1yeDvMtsoOsuFQ==}
+    peerDependencies:
+      graphql: ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
+
+  '@humanwhocodes/config-array@0.13.0':
+    resolution: {integrity: sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==}
+    engines: {node: '>=10.10.0'}
+    deprecated: Use @eslint/config-array instead
+
+  '@humanwhocodes/module-importer@1.0.1':
+    resolution: {integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==}
+    engines: {node: '>=12.22'}
+
+  '@humanwhocodes/object-schema@2.0.3':
+    resolution: {integrity: sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==}
+    deprecated: Use @eslint/object-schema instead
+
+  '@inquirer/external-editor@1.0.2':
+    resolution: {integrity: sha512-yy9cOoBnx58TlsPrIxauKIFQTiyH+0MK4e97y4sV9ERbI+zDxw7i2hxHLCIEGIE/8PPvDxGhgzIOTSOWcs6/MQ==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      '@types/node': '>=18'
+    peerDependenciesMeta:
+      '@types/node':
+        optional: true
+
+  '@jridgewell/gen-mapping@0.3.13':
+    resolution: {integrity: sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==}
+
+  '@jridgewell/remapping@2.3.5':
+    resolution: {integrity: sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==}
+
+  '@jridgewell/resolve-uri@3.1.2':
+    resolution: {integrity: sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==}
+    engines: {node: '>=6.0.0'}
+
+  '@jridgewell/source-map@0.3.11':
+    resolution: {integrity: sha512-ZMp1V8ZFcPG5dIWnQLr3NSI1MiCU7UETdS/A0G8V/XWHvJv3ZsFqutJn1Y5RPmAPX6F3BiE397OqveU/9NCuIA==}
+
+  '@jridgewell/sourcemap-codec@1.5.5':
+    resolution: {integrity: sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==}
+
+  '@jridgewell/trace-mapping@0.3.31':
+    resolution: {integrity: sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==}
+
+  '@jridgewell/trace-mapping@0.3.9':
+    resolution: {integrity: sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==}
+
+  '@juggle/resize-observer@3.4.0':
+    resolution: {integrity: sha512-dfLbk+PwWvFzSxwk3n5ySL0hfBog779o8h68wK/7/APo/7cgyWp5jcXockbxdk5kFRkbeXWm4Fbi9FrdN381sA==}
+
+  '@mapbox/hast-util-table-cell-style@0.2.1':
+    resolution: {integrity: sha512-LyQz4XJIdCdY/+temIhD/Ed0x/p4GAOUycpFSEK2Ads1CPKZy6b7V/2ROEtQiLLQ8soIs0xe/QAoR6kwpyW/yw==}
+    engines: {node: '>=12'}
+
+  '@nodelib/fs.scandir@2.1.5':
+    resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==}
+    engines: {node: '>= 8'}
+
+  '@nodelib/fs.stat@2.0.5':
+    resolution: {integrity: sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==}
+    engines: {node: '>= 8'}
+
+  '@nodelib/fs.walk@1.2.8':
+    resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==}
+    engines: {node: '>= 8'}
+
+  '@parcel/watcher-android-arm64@2.5.1':
+    resolution: {integrity: sha512-KF8+j9nNbUN8vzOFDpRMsaKBHZ/mcjEjMToVMJOhTozkDonQFFrRcfdLWn6yWKCmJKmdVxSgHiYvTCef4/qcBA==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [arm64]
+    os: [android]
+
+  '@parcel/watcher-darwin-arm64@2.5.1':
+    resolution: {integrity: sha512-eAzPv5osDmZyBhou8PoF4i6RQXAfeKL9tjb3QzYuccXFMQU0ruIc/POh30ePnaOyD1UXdlKguHBmsTs53tVoPw==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@parcel/watcher-darwin-x64@2.5.1':
+    resolution: {integrity: sha512-1ZXDthrnNmwv10A0/3AJNZ9JGlzrF82i3gNQcWOzd7nJ8aj+ILyW1MTxVk35Db0u91oD5Nlk9MBiujMlwmeXZg==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [x64]
+    os: [darwin]
+
+  '@parcel/watcher-freebsd-x64@2.5.1':
+    resolution: {integrity: sha512-SI4eljM7Flp9yPuKi8W0ird8TI/JK6CSxju3NojVI6BjHsTyK7zxA9urjVjEKJ5MBYC+bLmMcbAWlZ+rFkLpJQ==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [x64]
+    os: [freebsd]
+
+  '@parcel/watcher-linux-arm-glibc@2.5.1':
+    resolution: {integrity: sha512-RCdZlEyTs8geyBkkcnPWvtXLY44BCeZKmGYRtSgtwwnHR4dxfHRG3gR99XdMEdQ7KeiDdasJwwvNSF5jKtDwdA==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [arm]
+    os: [linux]
+
+  '@parcel/watcher-linux-arm-musl@2.5.1':
+    resolution: {integrity: sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [arm]
+    os: [linux]
+
+  '@parcel/watcher-linux-arm64-glibc@2.5.1':
+    resolution: {integrity: sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@parcel/watcher-linux-arm64-musl@2.5.1':
+    resolution: {integrity: sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@parcel/watcher-linux-x64-glibc@2.5.1':
+    resolution: {integrity: sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [x64]
+    os: [linux]
+
+  '@parcel/watcher-linux-x64-musl@2.5.1':
+    resolution: {integrity: sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [x64]
+    os: [linux]
+
+  '@parcel/watcher-win32-arm64@2.5.1':
+    resolution: {integrity: sha512-RFzklRvmc3PkjKjry3hLF9wD7ppR4AKcWNzH7kXR7GUe0Igb3Nz8fyPwtZCSquGrhU5HhUNDr/mKBqj7tqA2Vw==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [arm64]
+    os: [win32]
+
+  '@parcel/watcher-win32-ia32@2.5.1':
+    resolution: {integrity: sha512-c2KkcVN+NJmuA7CGlaGD1qJh1cLfDnQsHjE89E60vUEMlqduHGCdCLJCID5geFVM0dOtA3ZiIO8BoEQmzQVfpQ==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [ia32]
+    os: [win32]
+
+  '@parcel/watcher-win32-x64@2.5.1':
+    resolution: {integrity: sha512-9lHBdJITeNR++EvSQVUcaZoWupyHfXe1jZvGZ06O/5MflPcuPLtEphScIBL+AiCWBO46tDSHzWyD0uDmmZqsgA==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [x64]
+    os: [win32]
+
+  '@parcel/watcher@2.5.1':
+    resolution: {integrity: sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg==}
+    engines: {node: '>= 10.0.0'}
+
+  '@popperjs/core@2.11.8':
+    resolution: {integrity: sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==}
+
+  '@react-hook/latest@1.0.3':
+    resolution: {integrity: sha512-dy6duzl+JnAZcDbNTfmaP3xHiKtbXYOaz3G51MGVljh548Y8MWzTr+PHLOfvpypEVW9zwvl+VyKjbWKEVbV1Rg==}
+    peerDependencies:
+      react: '>=16.8'
+
+  '@react-hook/passive-layout-effect@1.2.1':
+    resolution: {integrity: sha512-IwEphTD75liO8g+6taS+4oqz+nnroocNfWVHWz7j+N+ZO2vYrc6PV1q7GQhuahL0IOR7JccFTsFKQ/mb6iZWAg==}
+    peerDependencies:
+      react: '>=16.8'
+
+  '@react-hook/resize-observer@1.2.6':
+    resolution: {integrity: sha512-DlBXtLSW0DqYYTW3Ft1/GQFZlTdKY5VAFIC4+km6IK5NiPPDFchGbEJm1j6pSgMqPRHbUQgHJX7RaR76ic1LWA==}
+    peerDependencies:
+      react: '>=16.8'
+
+  '@repeaterjs/repeater@3.0.6':
+    resolution: {integrity: sha512-Javneu5lsuhwNCryN+pXH93VPQ8g0dBX7wItHFgYiwQmzE1sVdg5tWHiOgHywzL2W21XQopa7IwIEnNbmeUJYA==}
+
+  '@restart/context@2.1.4':
+    resolution: {integrity: sha512-INJYZQJP7g+IoDUh/475NlGiTeMfwTXUEr3tmRneckHIxNolGOW9CTq83S8cxq0CgJwwcMzMJFchxvlwe7Rk8Q==}
+    peerDependencies:
+      react: '>=16.3.2'
+
+  '@restart/hooks@0.4.16':
+    resolution: {integrity: sha512-f7aCv7c+nU/3mF7NWLtVVr0Ra80RqsO89hO72r+Y/nvQr5+q0UFGkocElTH6MJApvReVh6JHUFYn2cw1WdHF3w==}
+    peerDependencies:
+      react: '>=16.8.0'
+
+  '@rtsao/scc@1.1.0':
+    resolution: {integrity: sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==}
+
+  '@silvermine/videojs-airplay@1.3.0':
+    resolution: {integrity: sha512-Oxq31DIEuKVt0qLj8/n5aaC9RRAc0hryarPVD9SFxPwCQ3A9Ef7bkRkGJz2i7XQxpIhPQ4SkM9BudUj6oHsPzA==}
+    peerDependencies:
+      video.js: '>= 6.0.0'
+
+  '@silvermine/videojs-chromecast@1.5.0':
+    resolution: {integrity: sha512-oDWu0WT6NORWqpUHf5xg+GoLlxA/YV7guNDOGsDV51gOqYiKb2HoPXodDfhdzwHczUmPFmbyPwfSC1E+etAOmQ==}
+    peerDependencies:
+      video.js: '>= 6 < 9'
+
+  '@theguild/federation-composition@0.20.1':
+    resolution: {integrity: sha512-lwYYKCeHmstOtbMtzxC0BQKWsUPYbEVRVdJ3EqR4jSpcF4gvNf3MOJv6yuvq6QsKqgYZURKRBszmg7VEDoi5Aw==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      graphql: ^16.0.0
+
+  '@tsconfig/node10@1.0.11':
+    resolution: {integrity: sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==}
+
+  '@tsconfig/node12@1.0.11':
+    resolution: {integrity: sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==}
+
+  '@tsconfig/node14@1.0.3':
+    resolution: {integrity: sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==}
+
+  '@tsconfig/node16@1.0.4':
+    resolution: {integrity: sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==}
+
+  '@tweenjs/tween.js@18.6.4':
+    resolution: {integrity: sha512-lB9lMjuqjtuJrx7/kOkqQBtllspPIN+96OvTCeJ2j5FEzinoAXTdAMFnDAQT1KVPRlnYfBrqxtqP66vDM40xxQ==}
+
+  '@types/apollo-upload-client@18.0.1':
+    resolution: {integrity: sha512-qumgUkhs9pqJAxlDtzmn3WTrJ9oAHBb6i9A7aR1HQyjLpX9+LRL5V84aErv5ZwcCSR2zEgG8cFsuBVYfZHFSRA==}
+
+  '@types/babel__core@7.20.5':
+    resolution: {integrity: sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==}
+
+  '@types/babel__generator@7.27.0':
+    resolution: {integrity: sha512-ufFd2Xi92OAVPYsy+P4n7/U7e68fex0+Ee8gSG9KX7eo084CWiQ4sdxktvdl0bOPupXtVJPY19zk6EwWqUQ8lg==}
+
+  '@types/babel__template@7.4.4':
+    resolution: {integrity: sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==}
+
+  '@types/babel__traverse@7.28.0':
+    resolution: {integrity: sha512-8PvcXf70gTDZBgt9ptxJ8elBeBjcLOAcOtoO/mPJjtji1+CdGbHgm77om1GrsPxsiE+uXIpNSK64UYaIwQXd4Q==}
+
+  '@types/cookie@0.3.3':
+    resolution: {integrity: sha512-LKVP3cgXBT9RYj+t+9FDKwS5tdI+rPBXaNSkma7hvqy35lc7mAokC2zsqWJH0LaqIt3B962nuYI77hsJoT1gow==}
+
+  '@types/crypto-js@4.2.2':
+    resolution: {integrity: sha512-sDOLlVbHhXpAUAL0YHDUUwDZf3iN4Bwi4W6a0W0b+QcAezUbRtH4FVb+9J4h+XFPW7l/gQ9F8qC7P+Ec4k8QVQ==}
+
+  '@types/extract-files@13.0.2':
+    resolution: {integrity: sha512-4sd7uDB0OVZmwH2wD6w7Qlpr2P5Pn8C9IGwnaq9aiiBDD3Lou7CwFjjkJTDYCDsEvk9zxAtmv9TaMg1lt/YJfA==}
+
+  '@types/fs-extra@9.0.13':
+    resolution: {integrity: sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA==}
+
+  '@types/history@4.7.11':
+    resolution: {integrity: sha512-qjDJRrmvBMiTx+jyLxvLfJU7UznFuokDv4f3WRuriHKERccVpFU+8XMQUAbDzoiJCsmexxRExQeMwwCdamSKDA==}
+
+  '@types/hoist-non-react-statics@3.3.7':
+    resolution: {integrity: sha512-PQTyIulDkIDro8P+IHbKCsw7U2xxBYflVzW/FgWdCAePD9xGSidgA76/GeJ6lBKoblyhf9pBY763gbrN+1dI8g==}
+    peerDependencies:
+      '@types/react': '*'
+
+  '@types/invariant@2.2.37':
+    resolution: {integrity: sha512-IwpIMieE55oGWiXkQPSBY1nw1nFs6bsKXTFskNY8sdS17K24vyEBRQZEwlRS7ZmXCWnJcQtbxWzly+cODWGs2A==}
+
+  '@types/js-yaml@4.0.9':
+    resolution: {integrity: sha512-k4MGaQl5TGo/iipqb2UDG2UwjXziSWkh0uysQelTlJpX1qGlpUZYm8PnO4DxG1qBomtJUdYJ6qR6xdIah10JLg==}
+
+  '@types/json-schema@7.0.15':
+    resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==}
+
+  '@types/json5@0.0.29':
+    resolution: {integrity: sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==}
+
+  '@types/lodash-es@4.17.12':
+    resolution: {integrity: sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ==}
+
+  '@types/lodash@4.17.20':
+    resolution: {integrity: sha512-H3MHACvFUEiujabxhaI/ImO6gUrd8oOurg7LQtS7mbwIXA/cUqWrvBsaeJ23aZEPk1TAYkurjfMbSELfoCXlGA==}
+
+  '@types/mdast@3.0.15':
+    resolution: {integrity: sha512-LnwD+mUEfxWMa1QpDraczIn6k0Ee3SMicuYSSzS6ZYl2gKS09EClnJYGd8Du6rfc5r/GZEk5o1mRb8TaTj03sQ==}
+
+  '@types/minimist@1.2.5':
+    resolution: {integrity: sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag==}
+
+  '@types/mousetrap@1.6.15':
+    resolution: {integrity: sha512-qL0hyIMNPow317QWW/63RvL1x5MVMV+Ru3NaY9f/CuEpCqrmb7WeuK2071ZY5hczOnm38qExWM2i2WtkXLSqFw==}
+
+  '@types/node@18.19.130':
+    resolution: {integrity: sha512-GRaXQx6jGfL8sKfaIDD6OupbIHBr9jv7Jnaml9tB7l4v068PAOXqfcujMMo5PhbIs6ggR1XODELqahT2R8v0fg==}
+
+  '@types/normalize-package-data@2.4.4':
+    resolution: {integrity: sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==}
+
+  '@types/parse-json@4.0.2':
+    resolution: {integrity: sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==}
+
+  '@types/prop-types@15.7.15':
+    resolution: {integrity: sha512-F6bEyamV9jKGAFBEmlQnesRPGOQqS2+Uwi0Em15xenOxHaf2hv6L8YCVn3rPdPJOiJfPiCnLIRyvwVaqMY3MIw==}
+
+  '@types/react-datepicker@4.19.6':
+    resolution: {integrity: sha512-uH5fzxt9eXxnc+hDCy/iRSFqU2+9lR/q2lAmaG4WILMai1o3IOdpcV+VSypzBFJLTEC2jrfeDXcdol0CJVMq4g==}
+
+  '@types/react-dom@17.0.26':
+    resolution: {integrity: sha512-Z+2VcYXJwOqQ79HreLU/1fyQ88eXSSFh6I3JdrEHQIfYSI0kCQpTGvOrbE6jFGGYXKsHuwY9tBa/w5Uo6KzrEg==}
+    peerDependencies:
+      '@types/react': ^17.0.0
+
+  '@types/react-helmet@6.1.11':
+    resolution: {integrity: sha512-0QcdGLddTERotCXo3VFlUSWO3ztraw8nZ6e3zJSgG7apwV5xt+pJUS8ewPBqT4NYB1optGLprNQzFleIY84u/g==}
+
+  '@types/react-router-bootstrap@0.24.5':
+    resolution: {integrity: sha512-GRx/8xF/skw4/Pmm6d+xbExi8gobCLOe8Eoz9kXPQGbYo7p5Wbi61tjpOF5AbfJ5XMN+fIzweToTi56odj/LOQ==}
+
+  '@types/react-router-dom@5.3.3':
+    resolution: {integrity: sha512-kpqnYK4wcdm5UaWI3fLcELopqLrHgLqNsdpHauzlQktfkHL3npOSwtj1Uz9oKBAzs7lFtVkV8j83voAz2D8fhw==}
+
+  '@types/react-router-hash-link@2.4.9':
+    resolution: {integrity: sha512-zl/VMj+lfJZhvjOAQXIlBVPNKSK+/fRG8AUHhlP9++LhlA2ziLeTmbRxIMJI3PCiCTS+W/FosEoDRoNOGH0OzA==}
+
+  '@types/react-router@5.1.20':
+    resolution: {integrity: sha512-jGjmu/ZqS7FjSH6owMcD5qpq19+1RS9DeVRqfl1FeBMxTDQAGwlMWOcs52NDoXaNKyG3d1cYQFMs9rCrb88o9Q==}
+
+  '@types/react-transition-group@4.4.12':
+    resolution: {integrity: sha512-8TV6R3h2j7a91c+1DXdJi3Syo69zzIZbz7Lg5tORM5LEJG7X/E6a1V3drRyBRZq7/utz7A+c4OgYLiLcYGHG6w==}
+    peerDependencies:
+      '@types/react': '*'
+
+  '@types/react@17.0.89':
+    resolution: {integrity: sha512-I98SaDCar5lvEYl80ClRIUztH/hyWHR+I2f+5yTVp/MQ205HgYkA2b5mVdry/+nsEIrf8I65KA5V/PASx68MsQ==}
+
+  '@types/scheduler@0.16.8':
+    resolution: {integrity: sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A==}
+
+  '@types/schema-utils@2.4.0':
+    resolution: {integrity: sha512-454hrj5gz/FXcUE20ygfEiN4DxZ1sprUo0V1gqIqkNZ/CzoEzAZEll2uxMsuyz6BYjiQan4Aa65xbTemfzW9hQ==}
+    deprecated: This is a stub types definition. schema-utils provides its own type definitions, so you do not need this installed.
+
+  '@types/semver@7.7.1':
+    resolution: {integrity: sha512-FmgJfu+MOcQ370SD0ev7EI8TlCAfKYU+B4m5T3yXc1CiRN94g/SZPtsCkk506aUDtlMnFZvasDwHHUcZUEaYuA==}
+
+  '@types/stats.js@0.17.4':
+    resolution: {integrity: sha512-jIBvWWShCvlBqBNIZt0KAshWpvSjhkwkEu4ZUcASoAvhmrgAUI2t1dXrjSL4xXVLB4FznPrIsX3nKXFl/Dt4vA==}
+
+  '@types/three@0.154.0':
+    resolution: {integrity: sha512-IioqpGhch6FdLDh4zazRn3rXHj6Vn2nVOziJdXVbJFi9CaI65LtP9qqUtpzbsHK2Ezlox8NtsLNHSw3AQzucjA==}
+
+  '@types/ua-parser-js@0.7.39':
+    resolution: {integrity: sha512-P/oDfpofrdtF5xw433SPALpdSchtJmY7nsJItf8h3KXqOslkbySh8zq4dSWXH2oTjRvJ5PczVEoCZPow6GicLg==}
+
+  '@types/unist@2.0.11':
+    resolution: {integrity: sha512-CmBKiL6NNo/OqgmMn95Fk9Whlp2mtvIv+KNpQKN2F4SjvrEesubTRWGYSg+BnWZOnlCaSTU1sMpsBOzgbYhnsA==}
+
+  '@types/video.js@7.3.58':
+    resolution: {integrity: sha512-1CQjuSrgbv1/dhmcfQ83eVyYbvGyqhTvb2Opxr0QCV+iJ4J6/J+XWQ3Om59WiwCd1MN3rDUHasx5XRrpUtewYQ==}
+
+  '@types/videojs-mobile-ui@0.8.3':
+    resolution: {integrity: sha512-0PqZblRCggDP6GRMkQA707ZKWi3qFbw5jeLEF6FxqtAQGFrRJOCj1Tuk70n7dnA/CMKy7gwZfskqvCOvgnFzZQ==}
+
+  '@types/videojs-seek-buttons@2.1.3':
+    resolution: {integrity: sha512-zDCTkvkwpGtD3ZechuQn8MhvLBRMsSCkhnftbVFg9xKtHUSPBQ1lCPpGasav3m8P4+9cXZRhi8aw+Dsk2syKIQ==}
+
+  '@types/warning@3.0.3':
+    resolution: {integrity: sha512-D1XC7WK8K+zZEveUPY+cf4+kgauk8N4eHr/XIHXGlGYkHLud6hK9lYfZk1ry1TNh798cZUCgb6MqGEG8DkJt6Q==}
+
+  '@types/webxr@0.5.24':
+    resolution: {integrity: sha512-h8fgEd/DpoS9CBrjEQXR+dIDraopAEfu4wYVNY2tEPwk60stPWhvZMf4Foo5FakuQ7HFZoa8WceaWFervK2Ovg==}
+
+  '@types/ws@8.18.1':
+    resolution: {integrity: sha512-ThVF6DCVhA8kUGy+aazFQ4kXQ7E1Ty7A3ypFOe0IcJV8O/M511G99AW24irKrW56Wt44yG9+ij8FaqoBGkuBXg==}
+
+  '@typescript-eslint/eslint-plugin@5.62.0':
+    resolution: {integrity: sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      '@typescript-eslint/parser': ^5.0.0
+      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  '@typescript-eslint/parser@5.62.0':
+    resolution: {integrity: sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  '@typescript-eslint/scope-manager@5.62.0':
+    resolution: {integrity: sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+
+  '@typescript-eslint/type-utils@5.62.0':
+    resolution: {integrity: sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: '*'
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  '@typescript-eslint/types@5.62.0':
+    resolution: {integrity: sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+
+  '@typescript-eslint/typescript-estree@5.62.0':
+    resolution: {integrity: sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  '@typescript-eslint/utils@5.62.0':
+    resolution: {integrity: sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+
+  '@typescript-eslint/visitor-keys@5.62.0':
+    resolution: {integrity: sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+
+  '@ungap/structured-clone@1.3.0':
+    resolution: {integrity: sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==}
+
+  '@videojs/http-streaming@2.16.3':
+    resolution: {integrity: sha512-91CJv5PnFBzNBvyEjt+9cPzTK/xoVixARj2g7ZAvItA+5bx8VKdk5RxCz/PP2kdzz9W+NiDUMPkdmTsosmy69Q==}
+    engines: {node: '>=8', npm: '>=5'}
+    peerDependencies:
+      video.js: ^6 || ^7
+
+  '@videojs/vhs-utils@3.0.5':
+    resolution: {integrity: sha512-PKVgdo8/GReqdx512F+ombhS+Bzogiofy1LgAj4tN8PfdBx3HSS7V5WfJotKTqtOWGwVfSWsrYN/t09/DSryrw==}
+    engines: {node: '>=8', npm: '>=5'}
+
+  '@videojs/xhr@2.6.0':
+    resolution: {integrity: sha512-7J361GiN1tXpm+gd0xz2QWr3xNWBE+rytvo8J3KuggFaLg+U37gZQ2BuPLcnkfGffy2e+ozY70RHC8jt7zjA6Q==}
+
+  '@vitejs/plugin-legacy@4.1.1':
+    resolution: {integrity: sha512-um3gbVouD2Q/g19C0qpDfHwveXDCAHzs8OC3e9g6aXpKoD1H14himgs7wkMnhAynBJy7QqUoZNAXDuqN8zLR2g==}
+    engines: {node: ^14.18.0 || >=16.0.0}
+    peerDependencies:
+      terser: ^5.4.0
+      vite: ^4.0.0
+
+  '@vitejs/plugin-react@3.1.0':
+    resolution: {integrity: sha512-AfgcRL8ZBhAlc3BFdigClmTUMISmmzHn7sB2h9U1odvc5U/MjWXsAaz18b/WoppUTDBzxOJwo2VdClfUcItu9g==}
+    engines: {node: ^14.18.0 || >=16.0.0}
+    peerDependencies:
+      vite: ^4.1.0-beta.0
+
+  '@whatwg-node/disposablestack@0.0.6':
+    resolution: {integrity: sha512-LOtTn+JgJvX8WfBVJtF08TGrdjuFzGJc4mkP8EdDI8ADbvO7kiexYep1o8dwnt0okb0jYclCDXF13xU7Ge4zSw==}
+    engines: {node: '>=18.0.0'}
+
+  '@whatwg-node/fetch@0.10.11':
+    resolution: {integrity: sha512-eR8SYtf9Nem1Tnl0IWrY33qJ5wCtIWlt3Fs3c6V4aAaTFLtkEQErXu3SSZg/XCHrj9hXSJ8/8t+CdMk5Qec/ZA==}
+    engines: {node: '>=18.0.0'}
+
+  '@whatwg-node/node-fetch@0.8.1':
+    resolution: {integrity: sha512-cQmQEo7IsI0EPX9VrwygXVzrVlX43Jb7/DBZSmpnC7xH4xkyOnn/HykHpTaQk7TUs7zh59A5uTGqx3p2Ouzffw==}
+    engines: {node: '>=18.0.0'}
+
+  '@whatwg-node/promise-helpers@1.3.2':
+    resolution: {integrity: sha512-Nst5JdK47VIl9UcGwtv2Rcgyn5lWtZ0/mhRQ4G8NN2isxpq2TO30iqHzmwoJycjWuyUfg3GFXqP/gFHXeV57IA==}
+    engines: {node: '>=16.0.0'}
+
+  '@wry/caches@1.0.1':
+    resolution: {integrity: sha512-bXuaUNLVVkD20wcGBWRyo7j9N3TxePEWFZj2Y+r9OoUzfqmavM84+mFykRicNsBqatba5JLay1t48wxaXaWnlA==}
+    engines: {node: '>=8'}
+
+  '@wry/context@0.7.4':
+    resolution: {integrity: sha512-jmT7Sb4ZQWI5iyu3lobQxICu2nC/vbUhP0vIdd6tHC9PTfenmRmuIFqktc6GH9cgi+ZHnsLWPvfSvc4DrYmKiQ==}
+    engines: {node: '>=8'}
+
+  '@wry/equality@0.5.7':
+    resolution: {integrity: sha512-BRFORjsTuQv5gxcXsuDXx6oGRhuVsEGwZy6LOzRRfgu+eSfxbhUQ9L9YtSEIuIjY/o7g3iWFjrc5eSY1GXP2Dw==}
+    engines: {node: '>=8'}
+
+  '@wry/trie@0.5.0':
+    resolution: {integrity: sha512-FNoYzHawTMk/6KMQoEG5O4PuioX19UbwdQKF44yw0nLfOypfQdjtfZzo/UIJWAJ23sNIFbD1Ug9lbaDGMwbqQA==}
+    engines: {node: '>=8'}
+
+  '@xmldom/xmldom@0.8.11':
+    resolution: {integrity: sha512-cQzWCtO6C8TQiYl1ruKNn2U6Ao4o4WBBcbL61yJl84x+j5sOWWFU9X7DpND8XZG3daDppSsigMdfAIl2upQBRw==}
+    engines: {node: '>=10.0.0'}
+
+  acorn-jsx@5.3.2:
+    resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
+    peerDependencies:
+      acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
+
+  acorn-walk@8.3.4:
+    resolution: {integrity: sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==}
+    engines: {node: '>=0.4.0'}
+
+  acorn@8.15.0:
+    resolution: {integrity: sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==}
+    engines: {node: '>=0.4.0'}
+    hasBin: true
+
+  aes-decrypter@3.1.3:
+    resolution: {integrity: sha512-VkG9g4BbhMBy+N5/XodDeV6F02chEk9IpgRTq/0bS80y4dzy79VH2Gtms02VXomf3HmyRe3yyJYkJ990ns+d6A==}
+
+  agent-base@7.1.4:
+    resolution: {integrity: sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==}
+    engines: {node: '>= 14'}
+
+  aggregate-error@3.1.0:
+    resolution: {integrity: sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==}
+    engines: {node: '>=8'}
+
+  ajv-keywords@3.5.2:
+    resolution: {integrity: sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==}
+    peerDependencies:
+      ajv: ^6.9.1
+
+  ajv@6.12.6:
+    resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==}
+
+  ajv@8.17.1:
+    resolution: {integrity: sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==}
+
+  ansi-escapes@4.3.2:
+    resolution: {integrity: sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==}
+    engines: {node: '>=8'}
+
+  ansi-regex@5.0.1:
+    resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==}
+    engines: {node: '>=8'}
+
+  ansi-styles@4.3.0:
+    resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==}
+    engines: {node: '>=8'}
+
+  apollo-upload-client@18.0.1:
+    resolution: {integrity: sha512-OQvZg1rK05VNI79D658FUmMdoI2oB/KJKb6QGMa2Si25QXOaAvLMBFUEwJct7wf+19U8vk9ILhidBOU1ZWv6QA==}
+    engines: {node: ^18.15.0 || >=20.4.0}
+    peerDependencies:
+      '@apollo/client': ^3.8.0
+      graphql: 14 - 16
+
+  arg@4.1.3:
+    resolution: {integrity: sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==}
+
+  argparse@1.0.10:
+    resolution: {integrity: sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==}
+
+  argparse@2.0.1:
+    resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==}
+
+  aria-query@5.3.2:
+    resolution: {integrity: sha512-COROpnaoap1E2F000S62r6A60uHZnmlvomhfyT2DlTcrY1OrBKn2UhH7qn5wTC9zMvD0AY7csdPSNwKP+7WiQw==}
+    engines: {node: '>= 0.4'}
+
+  array-buffer-byte-length@1.0.2:
+    resolution: {integrity: sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==}
+    engines: {node: '>= 0.4'}
+
+  array-includes@3.1.9:
+    resolution: {integrity: sha512-FmeCCAenzH0KH381SPT5FZmiA/TmpndpcaShhfgEN9eCVjnFBqq3l1xrI42y8+PPLI6hypzou4GXw00WHmPBLQ==}
+    engines: {node: '>= 0.4'}
+
+  array-union@2.1.0:
+    resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==}
+    engines: {node: '>=8'}
+
+  array.prototype.findlast@1.2.5:
+    resolution: {integrity: sha512-CVvd6FHg1Z3POpBLxO6E6zr+rSKEQ9L6rZHAaY7lLfhKsWYUBBOuMs0e9o24oopj6H+geRCX0YJ+TJLBK2eHyQ==}
+    engines: {node: '>= 0.4'}
+
+  array.prototype.findlastindex@1.2.6:
+    resolution: {integrity: sha512-F/TKATkzseUExPlfvmwQKGITM3DGTK+vkAsCZoDc5daVygbJBnjEUCbgkAvVFsgfXfX4YIqZ/27G3k3tdXrTxQ==}
+    engines: {node: '>= 0.4'}
+
+  array.prototype.flat@1.3.3:
+    resolution: {integrity: sha512-rwG/ja1neyLqCuGZ5YYrznA62D4mZXg0i1cIskIUKSiqF3Cje9/wXAls9B9s1Wa2fomMsIv8czB8jZcPmxCXFg==}
+    engines: {node: '>= 0.4'}
+
+  array.prototype.flatmap@1.3.3:
+    resolution: {integrity: sha512-Y7Wt51eKJSyi80hFrJCePGGNo5ktJCslFuboqJsbf57CCPcm5zztluPlc4/aD8sWsKvlwatezpV4U1efk8kpjg==}
+    engines: {node: '>= 0.4'}
+
+  array.prototype.tosorted@1.1.4:
+    resolution: {integrity: sha512-p6Fx8B7b7ZhL/gmUsAy0D15WhvDccw3mnGNbZpi3pmeJdxtWsj2jEaI4Y6oo3XiHfzuSgPwKc04MYt6KgvC/wA==}
+    engines: {node: '>= 0.4'}
+
+  arraybuffer.prototype.slice@1.0.4:
+    resolution: {integrity: sha512-BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ==}
+    engines: {node: '>= 0.4'}
+
+  arrify@1.0.1:
+    resolution: {integrity: sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==}
+    engines: {node: '>=0.10.0'}
+
+  asap@2.0.6:
+    resolution: {integrity: sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==}
+
+  ast-types-flow@0.0.8:
+    resolution: {integrity: sha512-OH/2E5Fg20h2aPrbe+QL8JZQFko0YZaF+j4mnQ7BGhfavO7OpSLa8a0y9sBwomHdSbkhTS8TQNayBfnW5DwbvQ==}
+
+  astral-regex@2.0.0:
+    resolution: {integrity: sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==}
+    engines: {node: '>=8'}
+
+  async-function@1.0.0:
+    resolution: {integrity: sha512-hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==}
+    engines: {node: '>= 0.4'}
+
+  at-least-node@1.0.0:
+    resolution: {integrity: sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==}
+    engines: {node: '>= 4.0.0'}
+
+  auto-bind@4.0.0:
+    resolution: {integrity: sha512-Hdw8qdNiqdJ8LqT0iK0sVzkFbzg6fhnQqqfWhBDxcHZvU75+B+ayzTy8x+k5Ix0Y92XOhOUlx74ps+bA6BeYMQ==}
+    engines: {node: '>=8'}
+
+  available-typed-arrays@1.0.7:
+    resolution: {integrity: sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==}
+    engines: {node: '>= 0.4'}
+
+  axe-core@4.11.0:
+    resolution: {integrity: sha512-ilYanEU8vxxBexpJd8cWM4ElSQq4QctCLKih0TSfjIfCQTeyH/6zVrmIJfLPrKTKJRbiG+cfnZbQIjAlJmF1jQ==}
+    engines: {node: '>=4'}
+
+  axobject-query@4.1.0:
+    resolution: {integrity: sha512-qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ==}
+    engines: {node: '>= 0.4'}
+
+  b64-to-blob@1.2.19:
+    resolution: {integrity: sha512-L3nSu8GgF4iEyNYakCQSfL2F5GI5aCXcot9mNTf+4N0/BMhpxqqHyOb6jIR24iq2xLjQZLG8FOt3gnUcV+9NVg==}
+
+  babel-plugin-macros@3.1.0:
+    resolution: {integrity: sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==}
+    engines: {node: '>=10', npm: '>=6'}
+
+  babel-plugin-polyfill-corejs2@0.4.14:
+    resolution: {integrity: sha512-Co2Y9wX854ts6U8gAAPXfn0GmAyctHuK8n0Yhfjd6t30g7yvKjspvvOo9yG+z52PZRgFErt7Ka2pYnXCjLKEpg==}
+    peerDependencies:
+      '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
+
+  babel-plugin-polyfill-corejs3@0.13.0:
+    resolution: {integrity: sha512-U+GNwMdSFgzVmfhNm8GJUX88AadB3uo9KpJqS3FaqNIPKgySuvMb+bHPsOmmuWyIcuqZj/pzt1RUIUZns4y2+A==}
+    peerDependencies:
+      '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
+
+  babel-plugin-polyfill-regenerator@0.6.5:
+    resolution: {integrity: sha512-ISqQ2frbiNU9vIJkzg7dlPpznPZ4jOiUQ1uSmB0fEHeowtN3COYRsXr/xexn64NpU13P06jc/L5TgiJXOgrbEg==}
+    peerDependencies:
+      '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
+
+  babel-plugin-react-intl@7.9.4:
+    resolution: {integrity: sha512-cMKrHEXrw43yT4M89Wbgq8A8N8lffSquj1Piwov/HVukR7jwOw8gf9btXNsQhT27ccyqEwy+M286JQYy0jby2g==}
+    deprecated: this package has been renamed to babel-plugin-formatjs
+
+  babel-plugin-syntax-trailing-function-commas@7.0.0-beta.0:
+    resolution: {integrity: sha512-Xj9XuRuz3nTSbaTXWv3itLOcxyF4oPD8douBBmj7U9BBC6nEBYfyOJYQMf/8PJAFotC62UY5dFfIGEPr7WswzQ==}
+
+  babel-preset-fbjs@3.4.0:
+    resolution: {integrity: sha512-9ywCsCvo1ojrw0b+XYk7aFvTH6D9064t0RIL1rtMf3nsa02Xw41MS7sZw216Im35xj/UY0PDBQsa1brUDDF1Ow==}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  bail@1.0.5:
+    resolution: {integrity: sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ==}
+
+  balanced-match@1.0.2:
+    resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
+
+  balanced-match@2.0.0:
+    resolution: {integrity: sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==}
+
+  base64-blob@1.4.1:
+    resolution: {integrity: sha512-n5Ov4cPTbLBTX1PiFbaB5AmK7LMigO9HWh5Lzx+Kcx/yx1MppeeLYtAH8aLv1m++WNoHQnr+xbGSqcZinopwlw==}
+
+  base64-js@1.5.1:
+    resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
+
+  baseline-browser-mapping@2.8.19:
+    resolution: {integrity: sha512-zoKGUdu6vb2jd3YOq0nnhEDQVbPcHhco3UImJrv5dSkvxTc2pl2WjOPsjZXDwPDSl5eghIMuY3R6J9NDKF3KcQ==}
+    hasBin: true
+
+  bcp-47-match@1.0.3:
+    resolution: {integrity: sha512-LggQ4YTdjWQSKELZF5JwchnBa1u0pIQSZf5lSdOHEdbVP55h0qICA/FUp3+W99q0xqxYa1ZQizTUH87gecII5w==}
+
+  bcp-47-normalize@1.1.1:
+    resolution: {integrity: sha512-jWZ1Jdu3cs0EZdfCkS0UE9Gg01PtxnChjEBySeB+Zo6nkqtFfnvtoQQgP1qU1Oo4qgJgxhTI6Sf9y/pZIhPs0A==}
+
+  bcp-47@1.0.8:
+    resolution: {integrity: sha512-Y9y1QNBBtYtv7hcmoX0tR+tUNSFZGZ6OL6vKPObq8BbOhkCoyayF6ogfLTgAli/KuAEbsYHYUNq2AQuY6IuLag==}
+
+  bl@4.1.0:
+    resolution: {integrity: sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==}
+
+  bootstrap@4.6.2:
+    resolution: {integrity: sha512-51Bbp/Uxr9aTuy6ca/8FbFloBUJZLHwnhTcnjIeRn2suQWsWzcuJhGjKDB5eppVte/8oCdOL3VuwxvZDUggwGQ==}
+    peerDependencies:
+      jquery: 1.9.1 - 3
+      popper.js: ^1.16.1
+
+  brace-expansion@1.1.12:
+    resolution: {integrity: sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==}
+
+  brace-expansion@2.0.2:
+    resolution: {integrity: sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==}
+
+  braces@3.0.3:
+    resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==}
+    engines: {node: '>=8'}
+
+  browserslist@4.26.3:
+    resolution: {integrity: sha512-lAUU+02RFBuCKQPj/P6NgjlbCnLBMp4UtgTx7vNHd3XSIJF87s9a5rA3aH2yw3GS9DqZAUbOtZdCCiZeVRqt0w==}
+    engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
+    hasBin: true
+
+  bser@2.1.1:
+    resolution: {integrity: sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==}
+
+  buffer-from@1.1.2:
+    resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==}
+
+  buffer@5.7.1:
+    resolution: {integrity: sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==}
+
+  call-bind-apply-helpers@1.0.2:
+    resolution: {integrity: sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==}
+    engines: {node: '>= 0.4'}
+
+  call-bind@1.0.8:
+    resolution: {integrity: sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==}
+    engines: {node: '>= 0.4'}
+
+  call-bound@1.0.4:
+    resolution: {integrity: sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==}
+    engines: {node: '>= 0.4'}
+
+  callsites@3.1.0:
+    resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==}
+    engines: {node: '>=6'}
+
+  camel-case@4.1.2:
+    resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
+
+  camelcase-keys@6.2.2:
+    resolution: {integrity: sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==}
+    engines: {node: '>=8'}
+
+  camelcase-keys@7.0.2:
+    resolution: {integrity: sha512-Rjs1H+A9R+Ig+4E/9oyB66UC5Mj9Xq3N//vcLf2WzgdTi/3gUu3Z9KoqmlrEG4VuuLK8wJHofxzdQXz/knhiYg==}
+    engines: {node: '>=12'}
+
+  camelcase@5.3.1:
+    resolution: {integrity: sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==}
+    engines: {node: '>=6'}
+
+  camelcase@6.3.0:
+    resolution: {integrity: sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==}
+    engines: {node: '>=10'}
+
+  caniuse-lite@1.0.30001751:
+    resolution: {integrity: sha512-A0QJhug0Ly64Ii3eIqHu5X51ebln3k4yTUkY1j8drqpWHVreg/VLijN48cZ1bYPiqOQuqpkIKnzr/Ul8V+p6Cw==}
+
+  capital-case@1.0.4:
+    resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
+
+  cardboard-vr-display@1.0.19:
+    resolution: {integrity: sha512-+MjcnWKAkb95p68elqZLDPzoiF/dGncQilLGvPBM5ZorABp/ao3lCs7nnRcYBckmuNkg1V/5rdGDKoUaCVsHzQ==}
+
+  ccount@1.1.0:
+    resolution: {integrity: sha512-vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg==}
+
+  chalk@4.1.2:
+    resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==}
+    engines: {node: '>=10'}
+
+  change-case-all@1.0.15:
+    resolution: {integrity: sha512-3+GIFhk3sNuvFAJKU46o26OdzudQlPNBCu1ZQi3cMeMHhty1bhDxu2WrEilVNYaGvqUtR1VSigFcJOiS13dRhQ==}
+
+  change-case@4.1.2:
+    resolution: {integrity: sha512-bSxY2ws9OtviILG1EiY5K7NNxkqg/JnRnFxLtKQ96JaviiIxi7djMrSd0ECT9AC+lttClmYwKw53BWpOMblo7A==}
+
+  character-entities-legacy@1.1.4:
+    resolution: {integrity: sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA==}
+
+  character-entities@1.2.4:
+    resolution: {integrity: sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw==}
+
+  character-reference-invalid@1.1.4:
+    resolution: {integrity: sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==}
+
+  chardet@2.1.0:
+    resolution: {integrity: sha512-bNFETTG/pM5ryzQ9Ad0lJOTa6HWD/YsScAR3EnCPZRPlQh77JocYktSHOUHelyhm8IARL+o4c4F1bP5KVOjiRA==}
+
+  chokidar@4.0.3:
+    resolution: {integrity: sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==}
+    engines: {node: '>= 14.16.0'}
+
+  classnames@2.5.1:
+    resolution: {integrity: sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==}
+
+  clean-stack@2.2.0:
+    resolution: {integrity: sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==}
+    engines: {node: '>=6'}
+
+  cli-cursor@3.1.0:
+    resolution: {integrity: sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==}
+    engines: {node: '>=8'}
+
+  cli-spinners@2.9.2:
+    resolution: {integrity: sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==}
+    engines: {node: '>=6'}
+
+  cli-truncate@2.1.0:
+    resolution: {integrity: sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==}
+    engines: {node: '>=8'}
+
+  cli-width@3.0.0:
+    resolution: {integrity: sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==}
+    engines: {node: '>= 10'}
+
+  cliui@6.0.0:
+    resolution: {integrity: sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==}
+
+  cliui@8.0.1:
+    resolution: {integrity: sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==}
+    engines: {node: '>=12'}
+
+  clone@1.0.4:
+    resolution: {integrity: sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==}
+    engines: {node: '>=0.8'}
+
+  codem-isoboxer@0.3.9:
+    resolution: {integrity: sha512-4XOTqEzBWrGOZaMd+sTED2hLpzfBbiQCf1W6OBGkIHqk1D8uwy8WFLazVbdQwfDpQ+vf39lqTGPa9IhWW0roTA==}
+
+  color-convert@2.0.1:
+    resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==}
+    engines: {node: '>=7.0.0'}
+
+  color-name@1.1.4:
+    resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==}
+
+  colord@2.9.3:
+    resolution: {integrity: sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==}
+
+  colorette@2.0.20:
+    resolution: {integrity: sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==}
+
+  comma-separated-tokens@1.0.8:
+    resolution: {integrity: sha512-GHuDRO12Sypu2cV70d1dkA2EUmXHgntrzbpvOB+Qy+49ypNfGgFQIC2fhhXbnyrJRynDCAARsT7Ou0M6hirpfw==}
+
+  commander@2.20.3:
+    resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==}
+
+  common-tags@1.8.2:
+    resolution: {integrity: sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==}
+    engines: {node: '>=4.0.0'}
+
+  concat-map@0.0.1:
+    resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==}
+
+  confusing-browser-globals@1.0.11:
+    resolution: {integrity: sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==}
+
+  constant-case@3.0.4:
+    resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
+
+  convert-source-map@1.9.0:
+    resolution: {integrity: sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==}
+
+  convert-source-map@2.0.0:
+    resolution: {integrity: sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==}
+
+  cookie@0.4.2:
+    resolution: {integrity: sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==}
+    engines: {node: '>= 0.6'}
+
+  core-js-compat@3.46.0:
+    resolution: {integrity: sha512-p9hObIIEENxSV8xIu+V68JjSeARg6UVMG5mR+JEUguG3sI6MsiS1njz2jHmyJDvA+8jX/sytkBHup6kxhM9law==}
+
+  core-js@3.46.0:
+    resolution: {integrity: sha512-vDMm9B0xnqqZ8uSBpZ8sNtRtOdmfShrvT6h2TuQGLs0Is+cR0DYbj/KWP6ALVNbWPpqA/qPLoOuppJN07humpA==}
+
+  cosmiconfig@7.1.0:
+    resolution: {integrity: sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==}
+    engines: {node: '>=10'}
+
+  cosmiconfig@8.3.6:
+    resolution: {integrity: sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      typescript: '>=4.9.5'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  create-require@1.1.1:
+    resolution: {integrity: sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==}
+
+  cross-fetch@3.2.0:
+    resolution: {integrity: sha512-Q+xVJLoGOeIMXZmbUK4HYk+69cQH6LudR0Vu/pRm2YlU/hDV9CiS0gKUMaWY5f2NeUH9C1nV3bsTlCo0FsTV1Q==}
+
+  cross-inspect@1.0.1:
+    resolution: {integrity: sha512-Pcw1JTvZLSJH83iiGWt6fRcT+BjZlCDRVwYLbUcHzv/CRpB7r0MlSrGbIyQvVSNyGnbt7G4AXuyCiDR3POvZ1A==}
+    engines: {node: '>=16.0.0'}
+
+  cross-spawn@7.0.6:
+    resolution: {integrity: sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==}
+    engines: {node: '>= 8'}
+
+  crypto-js@4.2.0:
+    resolution: {integrity: sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==}
+
+  css-functions-list@3.2.3:
+    resolution: {integrity: sha512-IQOkD3hbR5KrN93MtcYuad6YPuTSUhntLHDuLEbFWE+ff2/XSZNdZG+LcbbIW5AXKg/WFIfYItIzVoHngHXZzA==}
+    engines: {node: '>=12 || >=16'}
+
+  css-tree@2.3.1:
+    resolution: {integrity: sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==}
+    engines: {node: ^10 || ^12.20.0 || ^14.13.0 || >=15.0.0}
+
+  cssesc@3.0.0:
+    resolution: {integrity: sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==}
+    engines: {node: '>=4'}
+    hasBin: true
+
+  csstype@3.1.3:
+    resolution: {integrity: sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==}
+
+  damerau-levenshtein@1.0.8:
+    resolution: {integrity: sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==}
+
+  dashjs@4.7.4:
+    resolution: {integrity: sha512-+hldo25QPP3H/NOwqUrvt4uKdMse60/Gsz9AUAnoYfhga8qHWq4nWiojUosOiigbigkDTCAn9ORcvUaKCvmfCA==}
+
+  data-uri-to-buffer@4.0.1:
+    resolution: {integrity: sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==}
+    engines: {node: '>= 12'}
+
+  data-view-buffer@1.0.2:
+    resolution: {integrity: sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==}
+    engines: {node: '>= 0.4'}
+
+  data-view-byte-length@1.0.2:
+    resolution: {integrity: sha512-tuhGbE6CfTM9+5ANGf+oQb72Ky/0+s3xKUpHvShfiz2RxMFgFPjsXuRLBVMtvMs15awe45SRb83D6wH4ew6wlQ==}
+    engines: {node: '>= 0.4'}
+
+  data-view-byte-offset@1.0.1:
+    resolution: {integrity: sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==}
+    engines: {node: '>= 0.4'}
+
+  dataloader@2.2.3:
+    resolution: {integrity: sha512-y2krtASINtPFS1rSDjacrFgn1dcUuoREVabwlOGOe4SdxenREqwjwjElAdwvbGM7kgZz9a3KVicWR7vcz8rnzA==}
+
+  date-fns@2.30.0:
+    resolution: {integrity: sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==}
+    engines: {node: '>=0.11'}
+
+  debounce@1.2.1:
+    resolution: {integrity: sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==}
+
+  debug@3.2.7:
+    resolution: {integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
+
+  debug@4.4.1:
+    resolution: {integrity: sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==}
+    engines: {node: '>=6.0'}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
+
+  debug@4.4.3:
+    resolution: {integrity: sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==}
+    engines: {node: '>=6.0'}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
+
+  decamelize-keys@1.1.1:
+    resolution: {integrity: sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==}
+    engines: {node: '>=0.10.0'}
+
+  decamelize@1.2.0:
+    resolution: {integrity: sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==}
+    engines: {node: '>=0.10.0'}
+
+  decamelize@5.0.1:
+    resolution: {integrity: sha512-VfxadyCECXgQlkoEAjeghAr5gY3Hf+IKjKb+X8tGVDtveCjN+USwprd2q3QXBR9T1+x2DG0XZF5/w+7HAtSaXA==}
+    engines: {node: '>=10'}
+
+  decimal.js@10.6.0:
+    resolution: {integrity: sha512-YpgQiITW3JXGntzdUmyUR1V812Hn8T1YVXhCu+wO3OpS4eU9l4YdD3qjyiKdV6mvV29zapkMeD390UVEf2lkUg==}
+
+  deep-is@0.1.4:
+    resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}
+
+  deepmerge@2.2.1:
+    resolution: {integrity: sha512-R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA==}
+    engines: {node: '>=0.10.0'}
+
+  defaults@1.0.4:
+    resolution: {integrity: sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==}
+
+  define-data-property@1.1.4:
+    resolution: {integrity: sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==}
+    engines: {node: '>= 0.4'}
+
+  define-properties@1.2.1:
+    resolution: {integrity: sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==}
+    engines: {node: '>= 0.4'}
+
+  dependency-graph@0.11.0:
+    resolution: {integrity: sha512-JeMq7fEshyepOWDfcfHK06N3MhyPhz++vtqWhMT5O9A3K42rdsEDpfdVqjaqaAhsw6a+ZqeDvQVtD0hFHQWrzg==}
+    engines: {node: '>= 0.6.0'}
+
+  dequal@2.0.3:
+    resolution: {integrity: sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==}
+    engines: {node: '>=6'}
+
+  detect-indent@6.1.0:
+    resolution: {integrity: sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==}
+    engines: {node: '>=8'}
+
+  detect-libc@1.0.3:
+    resolution: {integrity: sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==}
+    engines: {node: '>=0.10'}
+    hasBin: true
+
+  diacritics@1.3.0:
+    resolution: {integrity: sha512-wlwEkqcsaxvPJML+rDh/2iS824jbREk6DUMUKkEaSlxdYHeS43cClJtsWglvw2RfeXGm6ohKDqsXteJ5sP5enA==}
+
+  diff@4.0.2:
+    resolution: {integrity: sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==}
+    engines: {node: '>=0.3.1'}
+
+  dir-glob@3.0.1:
+    resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==}
+    engines: {node: '>=8'}
+
+  doctrine@2.1.0:
+    resolution: {integrity: sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==}
+    engines: {node: '>=0.10.0'}
+
+  doctrine@3.0.0:
+    resolution: {integrity: sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==}
+    engines: {node: '>=6.0.0'}
+
+  dom-helpers@5.2.1:
+    resolution: {integrity: sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==}
+
+  dom-walk@0.1.2:
+    resolution: {integrity: sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==}
+
+  dot-case@3.0.4:
+    resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
+
+  dotenv@16.6.1:
+    resolution: {integrity: sha512-uBq4egWHTcTt33a72vpSG0z3HnPuIl6NqYcTrKEg2azoEyl2hpW0zqlxysq2pK9HlDIHyHyakeYaYnSAwd8bow==}
+    engines: {node: '>=12'}
+
+  dset@3.1.4:
+    resolution: {integrity: sha512-2QF/g9/zTaPDc3BjNcVTGoBbXBgYfMTTceLaYcFJ/W9kggFUkhxD/hMEeuLKbugyef9SqAx8cpgwlIP/jinUTA==}
+    engines: {node: '>=4'}
+
+  dunder-proto@1.0.1:
+    resolution: {integrity: sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==}
+    engines: {node: '>= 0.4'}
+
+  electron-to-chromium@1.5.238:
+    resolution: {integrity: sha512-khBdc+w/Gv+cS8e/Pbnaw/FXcBUeKrRVik9IxfXtgREOWyJhR4tj43n3amkVogJ/yeQUqzkrZcFhtIxIdqmmcQ==}
+
+  emoji-regex@8.0.0:
+    resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==}
+
+  emoji-regex@9.2.2:
+    resolution: {integrity: sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==}
+
+  error-ex@1.3.4:
+    resolution: {integrity: sha512-sqQamAnR14VgCr1A618A3sGrygcpK+HEbenA/HiEAkkUwcZIIB/tgWqHFxWgOyDh4nB4JCRimh79dR5Ywc9MDQ==}
+
+  es-abstract@1.24.0:
+    resolution: {integrity: sha512-WSzPgsdLtTcQwm4CROfS5ju2Wa1QQcVeT37jFjYzdFz1r9ahadC8B8/a4qxJxM+09F18iumCdRmlr96ZYkQvEg==}
+    engines: {node: '>= 0.4'}
+
+  es-define-property@1.0.1:
+    resolution: {integrity: sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==}
+    engines: {node: '>= 0.4'}
+
+  es-errors@1.3.0:
+    resolution: {integrity: sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==}
+    engines: {node: '>= 0.4'}
+
+  es-iterator-helpers@1.2.1:
+    resolution: {integrity: sha512-uDn+FE1yrDzyC0pCo961B2IHbdM8y/ACZsKD4dG6WqrjV53BADjwa7D+1aom2rsNVfLyDgU/eigvlJGJ08OQ4w==}
+    engines: {node: '>= 0.4'}
+
+  es-object-atoms@1.1.1:
+    resolution: {integrity: sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==}
+    engines: {node: '>= 0.4'}
+
+  es-set-tostringtag@2.1.0:
+    resolution: {integrity: sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==}
+    engines: {node: '>= 0.4'}
+
+  es-shim-unscopables@1.1.0:
+    resolution: {integrity: sha512-d9T8ucsEhh8Bi1woXCf+TIKDIROLG5WCkxg8geBCbvk22kzwC5G2OnXVMO6FUsvQlgUUXQ2itephWDLqDzbeCw==}
+    engines: {node: '>= 0.4'}
+
+  es-to-primitive@1.3.0:
+    resolution: {integrity: sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==}
+    engines: {node: '>= 0.4'}
+
+  es6-promise@4.2.8:
+    resolution: {integrity: sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==}
+
+  esbuild@0.18.20:
+    resolution: {integrity: sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==}
+    engines: {node: '>=12'}
+    hasBin: true
+
+  escalade@3.2.0:
+    resolution: {integrity: sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==}
+    engines: {node: '>=6'}
+
+  escape-string-regexp@1.0.5:
+    resolution: {integrity: sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==}
+    engines: {node: '>=0.8.0'}
+
+  escape-string-regexp@4.0.0:
+    resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==}
+    engines: {node: '>=10'}
+
+  eslint-config-airbnb-base@15.0.0:
+    resolution: {integrity: sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==}
+    engines: {node: ^10.12.0 || >=12.0.0}
+    peerDependencies:
+      eslint: ^7.32.0 || ^8.2.0
+      eslint-plugin-import: ^2.25.2
+
+  eslint-config-airbnb-typescript@17.1.0:
+    resolution: {integrity: sha512-GPxI5URre6dDpJ0CtcthSZVBAfI+Uw7un5OYNVxP2EYi3H81Jw701yFP7AU+/vCE7xBtFmjge7kfhhk4+RAiig==}
+    peerDependencies:
+      '@typescript-eslint/eslint-plugin': ^5.13.0 || ^6.0.0
+      '@typescript-eslint/parser': ^5.0.0 || ^6.0.0
+      eslint: ^7.32.0 || ^8.2.0
+      eslint-plugin-import: ^2.25.3
+
+  eslint-config-airbnb@19.0.4:
+    resolution: {integrity: sha512-T75QYQVQX57jiNgpF9r1KegMICE94VYwoFQyMGhrvc+lB8YF2E/M/PYDaQe1AJcWaEgqLE+ErXV1Og/+6Vyzew==}
+    engines: {node: ^10.12.0 || ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: ^7.32.0 || ^8.2.0
+      eslint-plugin-import: ^2.25.3
+      eslint-plugin-jsx-a11y: ^6.5.1
+      eslint-plugin-react: ^7.28.0
+      eslint-plugin-react-hooks: ^4.3.0
+
+  eslint-config-prettier@8.10.2:
+    resolution: {integrity: sha512-/IGJ6+Dka158JnP5n5YFMOszjDWrXggGz1LaK/guZq9vZTmniaKlHcsscvkAhn9y4U+BU3JuUdYvtAMcv30y4A==}
+    hasBin: true
+    peerDependencies:
+      eslint: '>=7.0.0'
+
+  eslint-import-resolver-node@0.3.9:
+    resolution: {integrity: sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==}
+
+  eslint-module-utils@2.12.1:
+    resolution: {integrity: sha512-L8jSWTze7K2mTg0vos/RuLRS5soomksDPoJLXIslC7c8Wmut3bx7CPpJijDcBZtxQ5lrbUdM+s0OlNbz0DCDNw==}
+    engines: {node: '>=4'}
+    peerDependencies:
+      '@typescript-eslint/parser': '*'
+      eslint: '*'
+      eslint-import-resolver-node: '*'
+      eslint-import-resolver-typescript: '*'
+      eslint-import-resolver-webpack: '*'
+    peerDependenciesMeta:
+      '@typescript-eslint/parser':
+        optional: true
+      eslint:
+        optional: true
+      eslint-import-resolver-node:
+        optional: true
+      eslint-import-resolver-typescript:
+        optional: true
+      eslint-import-resolver-webpack:
+        optional: true
+
+  eslint-plugin-import@2.32.0:
+    resolution: {integrity: sha512-whOE1HFo/qJDyX4SnXzP4N6zOWn79WhnCUY/iDR0mPfQZO8wcYE4JClzI2oZrhBnnMUCBCHZhO6VQyoBU95mZA==}
+    engines: {node: '>=4'}
+    peerDependencies:
+      '@typescript-eslint/parser': '*'
+      eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 || ^9
+    peerDependenciesMeta:
+      '@typescript-eslint/parser':
+        optional: true
+
+  eslint-plugin-jsx-a11y@6.10.2:
+    resolution: {integrity: sha512-scB3nz4WmG75pV8+3eRUQOHZlNSUhFNq37xnpgRkCCELU3XMvXAxLk1eqWWyE22Ki4Q01Fnsw9BA3cJHDPgn2Q==}
+    engines: {node: '>=4.0'}
+    peerDependencies:
+      eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9
+
+  eslint-plugin-react-hooks@4.6.2:
+    resolution: {integrity: sha512-QzliNJq4GinDBcD8gPB5v0wh6g8q3SUi6EFF0x8N/BL9PoVs0atuGc47ozMRyOWAKdwaZ5OnbOEa3WR+dSGKuQ==}
+    engines: {node: '>=10'}
+    peerDependencies:
+      eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0
+
+  eslint-plugin-react@7.37.5:
+    resolution: {integrity: sha512-Qteup0SqU15kdocexFNAJMvCJEfa2xUKNV4CC1xsVMrIIqEy3SQ/rqyxCWNzfrd3/ldy6HMlD2e0JDVpDg2qIA==}
+    engines: {node: '>=4'}
+    peerDependencies:
+      eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9.7
+
+  eslint-scope@5.1.1:
+    resolution: {integrity: sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==}
+    engines: {node: '>=8.0.0'}
+
+  eslint-scope@7.2.2:
+    resolution: {integrity: sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+
+  eslint-visitor-keys@3.4.3:
+    resolution: {integrity: sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+
+  eslint@8.57.1:
+    resolution: {integrity: sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    deprecated: This version is no longer supported. Please see https://eslint.org/version-support for other options.
+    hasBin: true
+
+  espree@9.6.1:
+    resolution: {integrity: sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+
+  esprima@4.0.1:
+    resolution: {integrity: sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==}
+    engines: {node: '>=4'}
+    hasBin: true
+
+  esquery@1.6.0:
+    resolution: {integrity: sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==}
+    engines: {node: '>=0.10'}
+
+  esrecurse@4.3.0:
+    resolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==}
+    engines: {node: '>=4.0'}
+
+  estraverse@4.3.0:
+    resolution: {integrity: sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==}
+    engines: {node: '>=4.0'}
+
+  estraverse@5.3.0:
+    resolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==}
+    engines: {node: '>=4.0'}
+
+  esutils@2.0.3:
+    resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==}
+    engines: {node: '>=0.10.0'}
+
+  event-target-polyfill@0.0.4:
+    resolution: {integrity: sha512-Gs6RLjzlLRdT8X9ZipJdIZI/Y6/HhRLyq9RdDlCsnpxr/+Nn6bU2EFGuC94GjxqhM+Nmij2Vcq98yoHrU8uNFQ==}
+
+  extend@3.0.2:
+    resolution: {integrity: sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==}
+
+  extract-files@13.0.0:
+    resolution: {integrity: sha512-FXD+2Tsr8Iqtm3QZy1Zmwscca7Jx3mMC5Crr+sEP1I303Jy1CYMuYCm7hRTplFNg3XdUavErkxnTzpaqdSoi6g==}
+    engines: {node: ^14.17.0 || ^16.0.0 || >= 18.0.0}
+
+  extract-react-intl-messages@4.1.1:
+    resolution: {integrity: sha512-dPogci5X7HVtV7VbUxajH/1YgfNRaW2VtEiVidZ/31Tq8314uzOtzVMNo0IrAPD2E+H1wHoPiu/j565TZsyIZg==}
+    engines: {node: '>=10'}
+    hasBin: true
+
+  fast-deep-equal@2.0.1:
+    resolution: {integrity: sha512-bCK/2Z4zLidyB4ReuIsvALH6w31YfAQDmXMqMx6FyfHqvBxtjC0eRumeSu4Bs3XtXwpyIywtSTrVT99BxY1f9w==}
+
+  fast-deep-equal@3.1.3:
+    resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==}
+
+  fast-glob@3.3.3:
+    resolution: {integrity: sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==}
+    engines: {node: '>=8.6.0'}
+
+  fast-json-stable-stringify@2.1.0:
+    resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==}
+
+  fast-levenshtein@2.0.6:
+    resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==}
+
+  fast-uri@3.1.0:
+    resolution: {integrity: sha512-iPeeDKJSWf4IEOasVVrknXpaBV0IApz/gp7S2bb7Z4Lljbl2MGJRqInZiUrQwV16cpzw/D3S5j5Julj/gT52AA==}
+
+  fastest-levenshtein@1.0.16:
+    resolution: {integrity: sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==}
+    engines: {node: '>= 4.9.1'}
+
+  fastq@1.19.1:
+    resolution: {integrity: sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==}
+
+  fb-watchman@2.0.2:
+    resolution: {integrity: sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==}
+
+  fbjs-css-vars@1.0.2:
+    resolution: {integrity: sha512-b2XGFAFdWZWg0phtAWLHCk836A1Xann+I+Dgd3Gk64MHKZO44FfoD1KxyvbSh0qZsIoXQGGlVztIY+oitJPpRQ==}
+
+  fbjs@3.0.5:
+    resolution: {integrity: sha512-ztsSx77JBtkuMrEypfhgc3cI0+0h+svqeie7xHbh1k/IKdcydnvadp/mUaGgjAOXQmQSxsqgaRhS3q9fy+1kxg==}
+
+  fetch-blob@3.2.0:
+    resolution: {integrity: sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==}
+    engines: {node: ^12.20 || >= 14.13}
+
+  fflate@0.6.10:
+    resolution: {integrity: sha512-IQrh3lEPM93wVCEczc9SaAOvkmcoQn/G8Bo1e8ZPlY3X3bnAxWaBdvTdvM1hP62iZp0BXWDy4vTAy4fF0+Dlpg==}
+
+  figures@3.2.0:
+    resolution: {integrity: sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==}
+    engines: {node: '>=8'}
+
+  file-entry-cache@6.0.1:
+    resolution: {integrity: sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==}
+    engines: {node: ^10.12.0 || >=12.0.0}
+
+  file-entry-cache@7.0.2:
+    resolution: {integrity: sha512-TfW7/1iI4Cy7Y8L6iqNdZQVvdXn0f8B4QcIXmkIbtTIe/Okm/nSlHb4IwGzRVOd3WfSieCgvf5cMzEfySAIl0g==}
+    engines: {node: '>=12.0.0'}
+
+  fill-range@7.1.1:
+    resolution: {integrity: sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==}
+    engines: {node: '>=8'}
+
+  find-root@1.1.0:
+    resolution: {integrity: sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==}
+
+  find-up@4.1.0:
+    resolution: {integrity: sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==}
+    engines: {node: '>=8'}
+
+  find-up@5.0.0:
+    resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==}
+    engines: {node: '>=10'}
+
+  flag-icons@6.15.0:
+    resolution: {integrity: sha512-ARo9Q+aATZEjyjveeec9e+orx+xLWUBdOX9baOKoGqDzMbvZ65ghPhaHbVt5T7ZB+Q4OFsB4Hr+eQnpV8Q+dLA==}
+
+  flat-cache@3.2.0:
+    resolution: {integrity: sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==}
+    engines: {node: ^10.12.0 || >=12.0.0}
+
+  flat@5.0.2:
+    resolution: {integrity: sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==}
+    hasBin: true
+
+  flatted@3.3.3:
+    resolution: {integrity: sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==}
+
+  flexbin@0.2.0:
+    resolution: {integrity: sha512-dgCeT6/oVljr0eao0f7Eg2VXutK/+rp02J6Nkw22uTTFE4HSC7zfYRzjuy2/r0dhr/sUBRMJM2tMyOCi+HeU+A==}
+
+  for-each@0.3.5:
+    resolution: {integrity: sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==}
+    engines: {node: '>= 0.4'}
+
+  formdata-polyfill@4.0.10:
+    resolution: {integrity: sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==}
+    engines: {node: '>=12.20.0'}
+
+  formik@2.4.6:
+    resolution: {integrity: sha512-A+2EI7U7aG296q2TLGvNapDNTZp1khVt5Vk0Q/fyfSROss0V/V6+txt2aJnwEos44IxTCW/LYAi/zgWzlevj+g==}
+    peerDependencies:
+      react: '>=16.8.0'
+
+  fs-extra@10.1.0:
+    resolution: {integrity: sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==}
+    engines: {node: '>=12'}
+
+  fs-extra@9.1.0:
+    resolution: {integrity: sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==}
+    engines: {node: '>=10'}
+
+  fs.realpath@1.0.0:
+    resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
+
+  fsevents@2.3.3:
+    resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==}
+    engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
+    os: [darwin]
+
+  function-bind@1.1.2:
+    resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==}
+
+  function.prototype.name@1.1.8:
+    resolution: {integrity: sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==}
+    engines: {node: '>= 0.4'}
+
+  functions-have-names@1.2.3:
+    resolution: {integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==}
+
+  generator-function@2.0.1:
+    resolution: {integrity: sha512-SFdFmIJi+ybC0vjlHN0ZGVGHc3lgE0DxPAT0djjVg+kjOnSqclqmj0KQ7ykTOLP6YxoqOvuAODGdcHJn+43q3g==}
+    engines: {node: '>= 0.4'}
+
+  gensync@1.0.0-beta.2:
+    resolution: {integrity: sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==}
+    engines: {node: '>=6.9.0'}
+
+  get-caller-file@2.0.5:
+    resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==}
+    engines: {node: 6.* || 8.* || >= 10.*}
+
+  get-intrinsic@1.3.0:
+    resolution: {integrity: sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==}
+    engines: {node: '>= 0.4'}
+
+  get-proto@1.0.1:
+    resolution: {integrity: sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==}
+    engines: {node: '>= 0.4'}
+
+  get-symbol-description@1.1.0:
+    resolution: {integrity: sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==}
+    engines: {node: '>= 0.4'}
+
+  gl-preserve-state@1.0.0:
+    resolution: {integrity: sha512-zQZ25l3haD4hvgJZ6C9+s0ebdkW9y+7U2qxvGu1uWOJh8a4RU+jURIKEQhf8elIlFpMH6CrAY2tH0mYrRjet3Q==}
+
+  glob-parent@5.1.2:
+    resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==}
+    engines: {node: '>= 6'}
+
+  glob-parent@6.0.2:
+    resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==}
+    engines: {node: '>=10.13.0'}
+
+  glob@7.2.3:
+    resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==}
+    deprecated: Glob versions prior to v9 are no longer supported
+
+  global-modules@2.0.0:
+    resolution: {integrity: sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==}
+    engines: {node: '>=6'}
+
+  global-prefix@3.0.0:
+    resolution: {integrity: sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==}
+    engines: {node: '>=6'}
+
+  global@4.4.0:
+    resolution: {integrity: sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==}
+
+  globals@13.24.0:
+    resolution: {integrity: sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==}
+    engines: {node: '>=8'}
+
+  globalthis@1.0.4:
+    resolution: {integrity: sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==}
+    engines: {node: '>= 0.4'}
+
+  globby@11.1.0:
+    resolution: {integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==}
+    engines: {node: '>=10'}
+
+  globjoin@0.1.4:
+    resolution: {integrity: sha512-xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg==}
+
+  globrex@0.1.2:
+    resolution: {integrity: sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==}
+
+  gopd@1.2.0:
+    resolution: {integrity: sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==}
+    engines: {node: '>= 0.4'}
+
+  graceful-fs@4.2.11:
+    resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==}
+
+  graphemer@1.4.0:
+    resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==}
+
+  graphql-config@5.1.5:
+    resolution: {integrity: sha512-mG2LL1HccpU8qg5ajLROgdsBzx/o2M6kgI3uAmoaXiSH9PCUbtIyLomLqUtCFaAeG2YCFsl0M5cfQ9rKmDoMVA==}
+    engines: {node: '>= 16.0.0'}
+    peerDependencies:
+      cosmiconfig-toml-loader: ^1.0.0
+      graphql: ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0
+    peerDependenciesMeta:
+      cosmiconfig-toml-loader:
+        optional: true
+
+  graphql-request@6.1.0:
+    resolution: {integrity: sha512-p+XPfS4q7aIpKVcgmnZKhMNqhltk20hfXtkaIkTfjjmiKMJ5xrt5c743cL03y/K7y1rg3WrIC49xGiEQ4mxdNw==}
+    peerDependencies:
+      graphql: 14 - 16
+
+  graphql-tag@2.12.6:
+    resolution: {integrity: sha512-FdSNcu2QQcWnM2VNvSCCDCVS5PpPqpzgFT8+GXzqJuoDd0CBncxCY278u4mhRO7tMgo2JjgJA5aZ+nWSQ/Z+xg==}
+    engines: {node: '>=10'}
+    peerDependencies:
+      graphql: ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0
+
+  graphql-ws@5.16.2:
+    resolution: {integrity: sha512-E1uccsZxt/96jH/OwmLPuXMACILs76pKF2i3W861LpKBCYtGIyPQGtWLuBLkND4ox1KHns70e83PS4te50nvPQ==}
+    engines: {node: '>=10'}
+    peerDependencies:
+      graphql: '>=0.11 <=16'
+
+  graphql-ws@6.0.6:
+    resolution: {integrity: sha512-zgfER9s+ftkGKUZgc0xbx8T7/HMO4AV5/YuYiFc+AtgcO5T0v8AxYYNQ+ltzuzDZgNkYJaFspm5MMYLjQzrkmw==}
+    engines: {node: '>=20'}
+    peerDependencies:
+      '@fastify/websocket': ^10 || ^11
+      crossws: ~0.3
+      graphql: ^15.10.1 || ^16
+      uWebSockets.js: ^20
+      ws: ^8
+    peerDependenciesMeta:
+      '@fastify/websocket':
+        optional: true
+      crossws:
+        optional: true
+      uWebSockets.js:
+        optional: true
+      ws:
+        optional: true
+
+  graphql@16.11.0:
+    resolution: {integrity: sha512-mS1lbMsxgQj6hge1XZ6p7GPhbrtFwUFYi3wRzXAC/FmYnyXMTvvI3td3rjmQ2u8ewXueaSvRPWaEcgVVOT9Jnw==}
+    engines: {node: ^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0}
+
+  hard-rejection@2.1.0:
+    resolution: {integrity: sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==}
+    engines: {node: '>=6'}
+
+  has-bigints@1.1.0:
+    resolution: {integrity: sha512-R3pbpkcIqv2Pm3dUwgjclDRVmWpTJW2DcMzcIhEXEx1oh/CEMObMm3KLmRJOdvhM7o4uQBnwr8pzRK2sJWIqfg==}
+    engines: {node: '>= 0.4'}
+
+  has-flag@4.0.0:
+    resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==}
+    engines: {node: '>=8'}
+
+  has-property-descriptors@1.0.2:
+    resolution: {integrity: sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==}
+
+  has-proto@1.2.0:
+    resolution: {integrity: sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==}
+    engines: {node: '>= 0.4'}
+
+  has-symbols@1.1.0:
+    resolution: {integrity: sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==}
+    engines: {node: '>= 0.4'}
+
+  has-tostringtag@1.0.2:
+    resolution: {integrity: sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==}
+    engines: {node: '>= 0.4'}
+
+  hasown@2.0.2:
+    resolution: {integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==}
+    engines: {node: '>= 0.4'}
+
+  hast-to-hyperscript@9.0.1:
+    resolution: {integrity: sha512-zQgLKqF+O2F72S1aa4y2ivxzSlko3MAvxkwG8ehGmNiqd98BIN3JM1rAJPmplEyLmGLO2QZYJtIneOSZ2YbJuA==}
+
+  header-case@2.0.4:
+    resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
+
+  history@4.10.1:
+    resolution: {integrity: sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew==}
+
+  hoist-non-react-statics@3.3.2:
+    resolution: {integrity: sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==}
+
+  hosted-git-info@2.8.9:
+    resolution: {integrity: sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==}
+
+  hosted-git-info@4.1.0:
+    resolution: {integrity: sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==}
+    engines: {node: '>=10'}
+
+  html-entities@1.4.0:
+    resolution: {integrity: sha512-8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA==}
+
+  html-tags@3.3.1:
+    resolution: {integrity: sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ==}
+    engines: {node: '>=8'}
+
+  http-proxy-agent@7.0.2:
+    resolution: {integrity: sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==}
+    engines: {node: '>= 14'}
+
+  https-proxy-agent@7.0.6:
+    resolution: {integrity: sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==}
+    engines: {node: '>= 14'}
+
+  i18n-iso-countries@7.14.0:
+    resolution: {integrity: sha512-nXHJZYtNrfsi1UQbyRqm3Gou431elgLjKl//CYlnBGt5aTWdRPH1PiS2T/p/n8Q8LnqYqzQJik3Q7mkwvLokeg==}
+    engines: {node: '>= 12'}
+
+  iconv-lite@0.7.0:
+    resolution: {integrity: sha512-cf6L2Ds3h57VVmkZe+Pn+5APsT7FpqJtEhhieDCvrE2MK5Qk9MyffgQyuxQTm6BChfeZNtcOLHp9IcWRVcIcBQ==}
+    engines: {node: '>=0.10.0'}
+
+  ieee754@1.2.1:
+    resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==}
+
+  ignore@5.3.2:
+    resolution: {integrity: sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==}
+    engines: {node: '>= 4'}
+
+  immediate@3.0.6:
+    resolution: {integrity: sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==}
+
+  immutable@3.7.6:
+    resolution: {integrity: sha512-AizQPcaofEtO11RZhPPHBOJRdo/20MKQF9mBLnVkBoyHi1/zXK8fzVdnEpSV9gxqtnh6Qomfp3F0xT5qP/vThw==}
+    engines: {node: '>=0.8.0'}
+
+  immutable@5.1.4:
+    resolution: {integrity: sha512-p6u1bG3YSnINT5RQmx/yRZBpenIl30kVxkTLDyHLIMk0gict704Q9n+thfDI7lTRm9vXdDYutVzXhzcThxTnXA==}
+
+  import-fresh@3.3.1:
+    resolution: {integrity: sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==}
+    engines: {node: '>=6'}
+
+  import-from@4.0.0:
+    resolution: {integrity: sha512-P9J71vT5nLlDeV8FHs5nNxaLbrpfAV5cF5srvbZfpwpcJoM/xZR3hiv+q+SAnuSmuGbXMWud063iIMx/V/EWZQ==}
+    engines: {node: '>=12.2'}
+
+  import-lazy@4.0.0:
+    resolution: {integrity: sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==}
+    engines: {node: '>=8'}
+
+  imsc@1.1.5:
+    resolution: {integrity: sha512-V8je+CGkcvGhgl2C1GlhqFFiUOIEdwXbXLiu1Fcubvvbo+g9inauqT3l0pNYXGoLPBj3jxtZz9t+wCopMkwadQ==}
+
+  imurmurhash@0.1.4:
+    resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==}
+    engines: {node: '>=0.8.19'}
+
+  indent-string@4.0.0:
+    resolution: {integrity: sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==}
+    engines: {node: '>=8'}
+
+  indent-string@5.0.0:
+    resolution: {integrity: sha512-m6FAo/spmsW2Ab2fU35JTYwtOKa2yAwXSwgjSv1TJzh4Mh7mC3lzAOVLBprb72XsTrgkEIsl7YrFNAiDiRhIGg==}
+    engines: {node: '>=12'}
+
+  individual@2.0.0:
+    resolution: {integrity: sha512-pWt8hBCqJsUWI/HtcfWod7+N9SgAqyPEaF7JQjwzjn5vGrpg6aQ5qeAFQ7dx//UH4J1O+7xqew+gCeeFt6xN/g==}
+
+  inflight@1.0.6:
+    resolution: {integrity: sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==}
+    deprecated: This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.
+
+  inherits@2.0.4:
+    resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==}
+
+  ini@1.3.8:
+    resolution: {integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==}
+
+  inline-style-parser@0.1.1:
+    resolution: {integrity: sha512-7NXolsK4CAS5+xvdj5OMMbI962hU/wvwoxk+LWR9Ek9bVtyuuYScDN6eS0rUm6TxApFpw7CX1o4uJzcd4AyD3Q==}
+
+  inquirer@8.2.7:
+    resolution: {integrity: sha512-UjOaSel/iddGZJ5xP/Eixh6dY1XghiBw4XK13rCCIJcJfyhhoul/7KhLLUGtebEj6GDYM6Vnx/mVsjx2L/mFIA==}
+    engines: {node: '>=12.0.0'}
+
+  internal-slot@1.1.0:
+    resolution: {integrity: sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==}
+    engines: {node: '>= 0.4'}
+
+  intersection-observer@0.12.2:
+    resolution: {integrity: sha512-7m1vEcPCxXYI8HqnL8CKI6siDyD+eIWSwgB3DZA+ZTogxk9I4CDnj4wilt9x/+/QbHI4YG5YZNmC6458/e9Ktg==}
+    deprecated: The Intersection Observer polyfill is no longer needed and can safely be removed. Intersection Observer has been Baseline since 2019.
+
+  intl-messageformat-parser@5.5.1:
+    resolution: {integrity: sha512-TvB3LqF2VtP6yI6HXlRT5TxX98HKha6hCcrg9dwlPwNaedVNuQA9KgBdtWKgiyakyCTYHQ+KJeFEstNKfZr64w==}
+    deprecated: We've written a new parser that's 6x faster and is backwards compatible. Please use @formatjs/icu-messageformat-parser
+
+  intl-messageformat-parser@6.1.2:
+    resolution: {integrity: sha512-4GQDEPhl/ZMNDKwMsLqyw1LG2IAWjmLJXdmnRcHKeLQzpgtNYZI6lVw1279pqIkRk2MfKb9aDsVFzm565azK5A==}
+    deprecated: We've written a new parser that's 6x faster and is backwards compatible. Please use @formatjs/icu-messageformat-parser
+
+  intl-messageformat@10.7.7:
+    resolution: {integrity: sha512-F134jIoeYMro/3I0h08D0Yt4N9o9pjddU/4IIxMMURqbAtI2wu70X8hvG1V48W49zXHXv3RKSF/po+0fDfsGjA==}
+
+  invariant@2.2.4:
+    resolution: {integrity: sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==}
+
+  is-absolute@1.0.0:
+    resolution: {integrity: sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==}
+    engines: {node: '>=0.10.0'}
+
+  is-alphabetical@1.0.4:
+    resolution: {integrity: sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==}
+
+  is-alphanumerical@1.0.4:
+    resolution: {integrity: sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A==}
+
+  is-array-buffer@3.0.5:
+    resolution: {integrity: sha512-DDfANUiiG2wC1qawP66qlTugJeL5HyzMpfr8lLK+jMQirGzNod0B12cFB/9q838Ru27sBwfw78/rdoU7RERz6A==}
+    engines: {node: '>= 0.4'}
+
+  is-arrayish@0.2.1:
+    resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==}
+
+  is-async-function@2.1.1:
+    resolution: {integrity: sha512-9dgM/cZBnNvjzaMYHVoxxfPj2QXt22Ev7SuuPrs+xav0ukGB0S6d4ydZdEiM48kLx5kDV+QBPrpVnFyefL8kkQ==}
+    engines: {node: '>= 0.4'}
+
+  is-bigint@1.1.0:
+    resolution: {integrity: sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==}
+    engines: {node: '>= 0.4'}
+
+  is-boolean-object@1.2.2:
+    resolution: {integrity: sha512-wa56o2/ElJMYqjCjGkXri7it5FbebW5usLw/nPmCMs5DeZ7eziSYZhSmPRn0txqeW4LnAmQQU7FgqLpsEFKM4A==}
+    engines: {node: '>= 0.4'}
+
+  is-buffer@2.0.5:
+    resolution: {integrity: sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==}
+    engines: {node: '>=4'}
+
+  is-callable@1.2.7:
+    resolution: {integrity: sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==}
+    engines: {node: '>= 0.4'}
+
+  is-core-module@2.16.1:
+    resolution: {integrity: sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==}
+    engines: {node: '>= 0.4'}
+
+  is-data-view@1.0.2:
+    resolution: {integrity: sha512-RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw==}
+    engines: {node: '>= 0.4'}
+
+  is-date-object@1.1.0:
+    resolution: {integrity: sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==}
+    engines: {node: '>= 0.4'}
+
+  is-decimal@1.0.4:
+    resolution: {integrity: sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==}
+
+  is-extglob@2.1.1:
+    resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==}
+    engines: {node: '>=0.10.0'}
+
+  is-finalizationregistry@1.1.1:
+    resolution: {integrity: sha512-1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg==}
+    engines: {node: '>= 0.4'}
+
+  is-fullwidth-code-point@3.0.0:
+    resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==}
+    engines: {node: '>=8'}
+
+  is-function@1.0.2:
+    resolution: {integrity: sha512-lw7DUp0aWXYg+CBCN+JKkcE0Q2RayZnSvnZBlwgxHBQhqt5pZNVy4Ri7H9GmmXkdu7LUthszM+Tor1u/2iBcpQ==}
+
+  is-generator-function@1.1.2:
+    resolution: {integrity: sha512-upqt1SkGkODW9tsGNG5mtXTXtECizwtS2kA161M+gJPc1xdb/Ax629af6YrTwcOeQHbewrPNlE5Dx7kzvXTizA==}
+    engines: {node: '>= 0.4'}
+
+  is-glob@4.0.3:
+    resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==}
+    engines: {node: '>=0.10.0'}
+
+  is-hexadecimal@1.0.4:
+    resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
+
+  is-interactive@1.0.0:
+    resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
+    engines: {node: '>=8'}
+
+  is-lower-case@2.0.2:
+    resolution: {integrity: sha512-bVcMJy4X5Og6VZfdOZstSexlEy20Sr0k/p/b2IlQJlfdKAQuMpiv5w2Ccxb8sKdRUNAG1PnHVHjFSdRDVS6NlQ==}
+
+  is-map@2.0.3:
+    resolution: {integrity: sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==}
+    engines: {node: '>= 0.4'}
+
+  is-negative-zero@2.0.3:
+    resolution: {integrity: sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==}
+    engines: {node: '>= 0.4'}
+
+  is-number-object@1.1.1:
+    resolution: {integrity: sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==}
+    engines: {node: '>= 0.4'}
+
+  is-number@7.0.0:
+    resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==}
+    engines: {node: '>=0.12.0'}
+
+  is-path-inside@3.0.3:
+    resolution: {integrity: sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==}
+    engines: {node: '>=8'}
+
+  is-plain-obj@1.1.0:
+    resolution: {integrity: sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==}
+    engines: {node: '>=0.10.0'}
+
+  is-plain-obj@2.1.0:
+    resolution: {integrity: sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==}
+    engines: {node: '>=8'}
+
+  is-plain-obj@4.1.0:
+    resolution: {integrity: sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==}
+    engines: {node: '>=12'}
+
+  is-plain-object@5.0.0:
+    resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
+    engines: {node: '>=0.10.0'}
+
+  is-regex@1.2.1:
+    resolution: {integrity: sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==}
+    engines: {node: '>= 0.4'}
+
+  is-relative@1.0.0:
+    resolution: {integrity: sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==}
+    engines: {node: '>=0.10.0'}
+
+  is-set@2.0.3:
+    resolution: {integrity: sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==}
+    engines: {node: '>= 0.4'}
+
+  is-shared-array-buffer@1.0.4:
+    resolution: {integrity: sha512-ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A==}
+    engines: {node: '>= 0.4'}
+
+  is-string@1.1.1:
+    resolution: {integrity: sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==}
+    engines: {node: '>= 0.4'}
+
+  is-symbol@1.1.1:
+    resolution: {integrity: sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w==}
+    engines: {node: '>= 0.4'}
+
+  is-typed-array@1.1.15:
+    resolution: {integrity: sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==}
+    engines: {node: '>= 0.4'}
+
+  is-typedarray@1.0.0:
+    resolution: {integrity: sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==}
+
+  is-unc-path@1.0.0:
+    resolution: {integrity: sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==}
+    engines: {node: '>=0.10.0'}
+
+  is-unicode-supported@0.1.0:
+    resolution: {integrity: sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==}
+    engines: {node: '>=10'}
+
+  is-upper-case@2.0.2:
+    resolution: {integrity: sha512-44pxmxAvnnAOwBg4tHPnkfvgjPwbc5QIsSstNU+YcJ1ovxVzCWpSGosPJOZh/a1tdl81fbgnLc9LLv+x2ywbPQ==}
+
+  is-weakmap@2.0.2:
+    resolution: {integrity: sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==}
+    engines: {node: '>= 0.4'}
+
+  is-weakref@1.1.1:
+    resolution: {integrity: sha512-6i9mGWSlqzNMEqpCp93KwRS1uUOodk2OJ6b+sq7ZPDSy2WuI5NFIxp/254TytR8ftefexkWn5xNiHUNpPOfSew==}
+    engines: {node: '>= 0.4'}
+
+  is-weakset@2.0.4:
+    resolution: {integrity: sha512-mfcwb6IzQyOKTs84CQMrOwW4gQcaTOAWJ0zzJCl2WSPDrWk/OzDaImWFH3djXhb24g4eudZfLRozAvPGw4d9hQ==}
+    engines: {node: '>= 0.4'}
+
+  is-windows@1.0.2:
+    resolution: {integrity: sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==}
+    engines: {node: '>=0.10.0'}
+
+  isarray@0.0.1:
+    resolution: {integrity: sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==}
+
+  isarray@2.0.5:
+    resolution: {integrity: sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==}
+
+  isexe@2.0.0:
+    resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==}
+
+  isomorphic-ws@5.0.0:
+    resolution: {integrity: sha512-muId7Zzn9ywDsyXgTIafTry2sV3nySZeUDe6YedVd1Hvuuep5AsIlqK+XefWpYTyJG5e503F2xIuT2lcU6rCSw==}
+    peerDependencies:
+      ws: '*'
+
+  iterator.prototype@1.1.5:
+    resolution: {integrity: sha512-H0dkQoCa3b2VEeKQBOxFph+JAbcrQdE7KC0UkqwpLmv2EC4P41QXP+rqo9wYodACiG5/WM5s9oDApTU8utwj9g==}
+    engines: {node: '>= 0.4'}
+
+  jiti@1.21.7:
+    resolution: {integrity: sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==}
+    hasBin: true
+
+  jiti@2.6.1:
+    resolution: {integrity: sha512-ekilCSN1jwRvIbgeg/57YFh8qQDNbwDb9xT/qu2DAHbFFZUicIl4ygVaAvzveMhMVr3LnpSKTNnwt8PoOfmKhQ==}
+    hasBin: true
+
+  jose@5.10.0:
+    resolution: {integrity: sha512-s+3Al/p9g32Iq+oqXxkW//7jk2Vig6FF1CFqzVXoTUXt2qz89YWbL+OwS17NFYEvxC35n0FKeGO2LGYSxeM2Gg==}
+
+  jquery@3.7.1:
+    resolution: {integrity: sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==}
+
+  js-tokens@4.0.0:
+    resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
+
+  js-yaml@3.14.1:
+    resolution: {integrity: sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==}
+    hasBin: true
+
+  js-yaml@4.1.0:
+    resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==}
+    hasBin: true
+
+  jsesc@3.1.0:
+    resolution: {integrity: sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==}
+    engines: {node: '>=6'}
+    hasBin: true
+
+  json-buffer@3.0.1:
+    resolution: {integrity: sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==}
+
+  json-parse-even-better-errors@2.3.1:
+    resolution: {integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==}
+
+  json-schema-traverse@0.4.1:
+    resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==}
+
+  json-schema-traverse@1.0.0:
+    resolution: {integrity: sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==}
+
+  json-stable-stringify-without-jsonify@1.0.1:
+    resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==}
+
+  json-to-pretty-yaml@1.2.2:
+    resolution: {integrity: sha512-rvm6hunfCcqegwYaG5T4yKJWxc9FXFgBVrcTZ4XfSVRwa5HA/Xs+vB/Eo9treYYHCeNM0nrSUr82V/M31Urc7A==}
+    engines: {node: '>= 0.2.0'}
+
+  json2mq@0.2.0:
+    resolution: {integrity: sha512-SzoRg7ux5DWTII9J2qkrZrqV1gt+rTaoufMxEzXbS26Uid0NwaJd123HcoB80TgubEppxxIGdNxCx50fEoEWQA==}
+
+  json5@1.0.2:
+    resolution: {integrity: sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==}
+    hasBin: true
+
+  json5@2.2.3:
+    resolution: {integrity: sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==}
+    engines: {node: '>=6'}
+    hasBin: true
+
+  jsonfile@6.2.0:
+    resolution: {integrity: sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==}
+
+  jsx-ast-utils@3.3.5:
+    resolution: {integrity: sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==}
+    engines: {node: '>=4.0'}
+
+  keycode@2.2.1:
+    resolution: {integrity: sha512-Rdgz9Hl9Iv4QKi8b0OlCRQEzp4AgVxyCtz5S/+VIHezDmrDhkp2N2TqBWOLz0/gbeREXOOiI9/4b8BY9uw2vFg==}
+
+  keyv@4.5.4:
+    resolution: {integrity: sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==}
+
+  kind-of@6.0.3:
+    resolution: {integrity: sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==}
+    engines: {node: '>=0.10.0'}
+
+  known-css-properties@0.29.0:
+    resolution: {integrity: sha512-Ne7wqW7/9Cz54PDt4I3tcV+hAyat8ypyOGzYRJQfdxnnjeWsTxt1cy8pjvvKeI5kfXuyvULyeeAvwvvtAX3ayQ==}
+
+  language-subtag-registry@0.3.23:
+    resolution: {integrity: sha512-0K65Lea881pHotoGEa5gDlMxt3pctLi2RplBb7Ezh4rRdLEOtgi7n4EwK9lamnUCkKBqaeKRVebTq6BAxSkpXQ==}
+
+  language-tags@1.0.9:
+    resolution: {integrity: sha512-MbjN408fEndfiQXbFQ1vnd+1NoLDsnQW41410oQBXiyXDMYH5z505juWa4KUE1LqxRC7DgOgZDbKLxHIwm27hA==}
+    engines: {node: '>=0.10'}
+
+  levn@0.4.1:
+    resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}
+    engines: {node: '>= 0.8.0'}
+
+  lie@3.1.1:
+    resolution: {integrity: sha512-RiNhHysUjhrDQntfYSfY4MU24coXXdEOgw9WGcKHNeEwffDYbF//u87M1EWaMGzuFoSbqW0C9C6lEEhDOAswfw==}
+
+  lil-gui@0.17.0:
+    resolution: {integrity: sha512-MVBHmgY+uEbmJNApAaPbtvNh1RCAeMnKym82SBjtp5rODTYKWtM+MXHCifLe2H2Ti1HuBGBtK/5SyG4ShQ3pUQ==}
+
+  lines-and-columns@1.2.4:
+    resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==}
+
+  listr2@4.0.5:
+    resolution: {integrity: sha512-juGHV1doQdpNT3GSTs9IUN43QJb7KHdF9uqg7Vufs/tG9VTzpFphqF4pm/ICdAABGQxsyNn9CiYA3StkI6jpwA==}
+    engines: {node: '>=12'}
+    peerDependencies:
+      enquirer: '>= 2.3.0 < 3'
+    peerDependenciesMeta:
+      enquirer:
+        optional: true
+
+  load-json-file@6.2.0:
+    resolution: {integrity: sha512-gUD/epcRms75Cw8RT1pUdHugZYM5ce64ucs2GEISABwkRsOQr0q2wm/MV2TKThycIe5e0ytRweW2RZxclogCdQ==}
+    engines: {node: '>=8'}
+
+  localforage@1.10.0:
+    resolution: {integrity: sha512-14/H1aX7hzBBmmh7sGPd+AOMkkIrHM3Z1PAyGgZigA1H1p5O5ANnMyWzvpAETtG68/dC4pC0ncy3+PPGzXZHPg==}
+
+  locate-path@5.0.0:
+    resolution: {integrity: sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==}
+    engines: {node: '>=8'}
+
+  locate-path@6.0.0:
+    resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==}
+    engines: {node: '>=10'}
+
+  lodash-es@4.17.21:
+    resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
+
+  lodash.debounce@4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+
+  lodash.merge@4.6.2:
+    resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
+
+  lodash.mergewith@4.6.2:
+    resolution: {integrity: sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==}
+
+  lodash.pick@4.4.0:
+    resolution: {integrity: sha512-hXt6Ul/5yWjfklSGvLQl8vM//l3FtyHZeuelpzK6mm99pNvN9yTDruNZPEJZD1oWrqo+izBmB7oUfWgcCX7s4Q==}
+    deprecated: This package is deprecated. Use destructuring assignment syntax instead.
+
+  lodash.sortby@4.7.0:
+    resolution: {integrity: sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==}
+
+  lodash.truncate@4.4.2:
+    resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
+
+  lodash@4.17.21:
+    resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==}
+
+  log-symbols@4.1.0:
+    resolution: {integrity: sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==}
+    engines: {node: '>=10'}
+
+  log-update@4.0.0:
+    resolution: {integrity: sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==}
+    engines: {node: '>=10'}
+
+  longest-streak@2.0.4:
+    resolution: {integrity: sha512-vM6rUVCVUJJt33bnmHiZEvr7wPT78ztX7rojL+LW51bHtLh6HTjx84LA5W4+oa6aKEJA7jJu5LR6vQRBpA5DVg==}
+
+  loose-envify@1.4.0:
+    resolution: {integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==}
+    hasBin: true
+
+  lower-case-first@2.0.2:
+    resolution: {integrity: sha512-EVm/rR94FJTZi3zefZ82fLWab+GX14LJN4HrWBcuo6Evmsl9hEfnqxgcHCKb9q+mNf6EVdsjx/qucYFIIB84pg==}
+
+  lower-case@2.0.2:
+    resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
+
+  lru-cache@5.1.1:
+    resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==}
+
+  lru-cache@6.0.0:
+    resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==}
+    engines: {node: '>=10'}
+
+  m3u8-parser@4.8.0:
+    resolution: {integrity: sha512-UqA2a/Pw3liR6Df3gwxrqghCP17OpPlQj6RBPLYygf/ZSQ4MoSgvdvhvt35qV+3NaaA0FSZx93Ix+2brT1U7cA==}
+
+  magic-string@0.27.0:
+    resolution: {integrity: sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==}
+    engines: {node: '>=12'}
+
+  magic-string@0.30.19:
+    resolution: {integrity: sha512-2N21sPY9Ws53PZvsEpVtNuSW+ScYbQdp4b9qUaL+9QkHUrGFKo56Lg9Emg5s9V/qrtNBmiR01sYhUOwu3H+VOw==}
+
+  make-dir@3.1.0:
+    resolution: {integrity: sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==}
+    engines: {node: '>=8'}
+
+  make-error@1.3.6:
+    resolution: {integrity: sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==}
+
+  map-cache@0.2.2:
+    resolution: {integrity: sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==}
+    engines: {node: '>=0.10.0'}
+
+  map-obj@1.0.1:
+    resolution: {integrity: sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==}
+    engines: {node: '>=0.10.0'}
+
+  map-obj@4.3.0:
+    resolution: {integrity: sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==}
+    engines: {node: '>=8'}
+
+  markdown-table@2.0.0:
+    resolution: {integrity: sha512-Ezda85ToJUBhM6WGaG6veasyym+Tbs3cMAw/ZhOPqXiYsr0jgocBV3j3nx+4lk47plLlIqjwuTm/ywVI+zjJ/A==}
+
+  math-intrinsics@1.1.0:
+    resolution: {integrity: sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==}
+    engines: {node: '>= 0.4'}
+
+  mathml-tag-names@2.1.3:
+    resolution: {integrity: sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==}
+
+  mdast-util-definitions@4.0.0:
+    resolution: {integrity: sha512-k8AJ6aNnUkB7IE+5azR9h81O5EQ/cTDXtWdMq9Kk5KcEW/8ritU5CeLg/9HhOC++nALHBlaogJ5jz0Ybk3kPMQ==}
+
+  mdast-util-find-and-replace@1.1.1:
+    resolution: {integrity: sha512-9cKl33Y21lyckGzpSmEQnIDjEfeeWelN5s1kUW1LwdB0Fkuq2u+4GdqcGEygYxJE8GVqCl0741bYXHgamfWAZA==}
+
+  mdast-util-from-markdown@0.8.5:
+    resolution: {integrity: sha512-2hkTXtYYnr+NubD/g6KGBS/0mFmBcifAsI0yIWRiRo0PjVs6SSOSOdtzbp6kSGnShDN6G5aWZpKQ2lWRy27mWQ==}
+
+  mdast-util-gfm-autolink-literal@0.1.3:
+    resolution: {integrity: sha512-GjmLjWrXg1wqMIO9+ZsRik/s7PLwTaeCHVB7vRxUwLntZc8mzmTsLVr6HW1yLokcnhfURsn5zmSVdi3/xWWu1A==}
+
+  mdast-util-gfm-strikethrough@0.2.3:
+    resolution: {integrity: sha512-5OQLXpt6qdbttcDG/UxYY7Yjj3e8P7X16LzvpX8pIQPYJ/C2Z1qFGMmcw+1PZMUM3Z8wt8NRfYTvCni93mgsgA==}
+
+  mdast-util-gfm-table@0.1.6:
+    resolution: {integrity: sha512-j4yDxQ66AJSBwGkbpFEp9uG/LS1tZV3P33fN1gkyRB2LoRL+RR3f76m0HPHaby6F4Z5xr9Fv1URmATlRRUIpRQ==}
+
+  mdast-util-gfm-task-list-item@0.1.6:
+    resolution: {integrity: sha512-/d51FFIfPsSmCIRNp7E6pozM9z1GYPIkSy1urQ8s/o4TC22BZ7DqfHFWiqBD23bc7J3vV1Fc9O4QIHBlfuit8A==}
+
+  mdast-util-gfm@0.1.2:
+    resolution: {integrity: sha512-NNkhDx/qYcuOWB7xHUGWZYVXvjPFFd6afg6/e2g+SV4r9q5XUcCbV4Wfa3DLYIiD+xAEZc6K4MGaE/m0KDcPwQ==}
+
+  mdast-util-to-hast@10.2.0:
+    resolution: {integrity: sha512-JoPBfJ3gBnHZ18icCwHR50orC9kNH81tiR1gs01D8Q5YpV6adHNO9nKNuFBCJQ941/32PT1a63UF/DitmS3amQ==}
+
+  mdast-util-to-markdown@0.6.5:
+    resolution: {integrity: sha512-XeV9sDE7ZlOQvs45C9UKMtfTcctcaj/pGwH8YLbMHoMOXNNCn2LsqVQOqrF1+/NU8lKDAqozme9SCXWyo9oAcQ==}
+
+  mdast-util-to-string@2.0.0:
+    resolution: {integrity: sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w==}
+
+  mdn-data@2.0.30:
+    resolution: {integrity: sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==}
+
+  mdurl@1.0.1:
+    resolution: {integrity: sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==}
+
+  memoize-one@6.0.0:
+    resolution: {integrity: sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw==}
+
+  meow@10.1.5:
+    resolution: {integrity: sha512-/d+PQ4GKmGvM9Bee/DPa8z3mXs/pkvJE2KEThngVNOqtmljC6K7NMPxtc2JeZYTmpWb9k/TmxjeL18ez3h7vCw==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+
+  meow@6.1.1:
+    resolution: {integrity: sha512-3YffViIt2QWgTy6Pale5QpopX/IvU3LPL03jOTqp6pGj3VjesdO/U8CuHMKpnQr4shCNCM5fd5XFFvIIl6JBHg==}
+    engines: {node: '>=8'}
+
+  merge2@1.4.1:
+    resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==}
+    engines: {node: '>= 8'}
+
+  meros@1.3.2:
+    resolution: {integrity: sha512-Q3mobPbvEx7XbwhnC1J1r60+5H6EZyNccdzSz0eGexJRwouUtTZxPVRGdqKtxlpD84ScK4+tIGldkqDtCKdI0A==}
+    engines: {node: '>=13'}
+    peerDependencies:
+      '@types/node': '>=13'
+    peerDependenciesMeta:
+      '@types/node':
+        optional: true
+
+  meshoptimizer@0.18.1:
+    resolution: {integrity: sha512-ZhoIoL7TNV4s5B6+rx5mC//fw8/POGyNxS/DZyCJeiZ12ScLfVwRE/GfsxwiTkMYYD5DmK2/JXnEVXqL4rF+Sw==}
+
+  micromark-extension-gfm-autolink-literal@0.5.7:
+    resolution: {integrity: sha512-ePiDGH0/lhcngCe8FtH4ARFoxKTUelMp4L7Gg2pujYD5CSMb9PbblnyL+AAMud/SNMyusbS2XDSiPIRcQoNFAw==}
+
+  micromark-extension-gfm-strikethrough@0.6.5:
+    resolution: {integrity: sha512-PpOKlgokpQRwUesRwWEp+fHjGGkZEejj83k9gU5iXCbDG+XBA92BqnRKYJdfqfkrRcZRgGuPuXb7DaK/DmxOhw==}
+
+  micromark-extension-gfm-table@0.4.3:
+    resolution: {integrity: sha512-hVGvESPq0fk6ALWtomcwmgLvH8ZSVpcPjzi0AjPclB9FsVRgMtGZkUcpE0zgjOCFAznKepF4z3hX8z6e3HODdA==}
+
+  micromark-extension-gfm-tagfilter@0.3.0:
+    resolution: {integrity: sha512-9GU0xBatryXifL//FJH+tAZ6i240xQuFrSL7mYi8f4oZSbc+NvXjkrHemeYP0+L4ZUT+Ptz3b95zhUZnMtoi/Q==}
+
+  micromark-extension-gfm-task-list-item@0.3.3:
+    resolution: {integrity: sha512-0zvM5iSLKrc/NQl84pZSjGo66aTGd57C1idmlWmE87lkMcXrTxg1uXa/nXomxJytoje9trP0NDLvw4bZ/Z/XCQ==}
+
+  micromark-extension-gfm@0.3.3:
+    resolution: {integrity: sha512-oVN4zv5/tAIA+l3GbMi7lWeYpJ14oQyJ3uEim20ktYFAcfX1x3LNlFGGlmrZHt7u9YlKExmyJdDGaTt6cMSR/A==}
+
+  micromark@2.11.4:
+    resolution: {integrity: sha512-+WoovN/ppKolQOFIAajxi7Lu9kInbPxFuTBVEavFcL8eAfVstoc5MocPmqBeAdBOJV00uaVjegzH4+MA0DN/uA==}
+
+  micromatch@4.0.8:
+    resolution: {integrity: sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==}
+    engines: {node: '>=8.6'}
+
+  mimic-fn@2.1.0:
+    resolution: {integrity: sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==}
+    engines: {node: '>=6'}
+
+  min-document@2.19.0:
+    resolution: {integrity: sha512-9Wy1B3m3f66bPPmU5hdA4DR4PB2OfDU/+GS3yAB7IQozE3tqXaVv2zOjgla7MEGSRv95+ILmOuvhLkOK6wJtCQ==}
+
+  min-indent@1.0.1:
+    resolution: {integrity: sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==}
+    engines: {node: '>=4'}
+
+  minimatch@3.1.2:
+    resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==}
+
+  minimatch@9.0.5:
+    resolution: {integrity: sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==}
+    engines: {node: '>=16 || 14 >=14.17'}
+
+  minimist-options@4.1.0:
+    resolution: {integrity: sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==}
+    engines: {node: '>= 6'}
+
+  minimist@1.2.8:
+    resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==}
+
+  mkdirp@1.0.4:
+    resolution: {integrity: sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==}
+    engines: {node: '>=10'}
+    hasBin: true
+
+  moment@2.30.1:
+    resolution: {integrity: sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==}
+
+  mousetrap-pause@1.0.0:
+    resolution: {integrity: sha512-/92qasq/TIkogCZKRYZdX+XAiPOD8dBDIipaar+caXSdKrfhYQIe6UmweiXO9yQeETjhNAUWdopwLsU6po/IPw==}
+
+  mousetrap@1.6.5:
+    resolution: {integrity: sha512-QNo4kEepaIBwiT8CDhP98umTetp+JNfQYBWvC1pc6/OAibuXtRcxZ58Qz8skvEHYvURne/7R8T5VoOI7rDsEUA==}
+
+  mpd-parser@0.22.1:
+    resolution: {integrity: sha512-fwBebvpyPUU8bOzvhX0VQZgSohncbgYwUyJJoTSNpmy7ccD2ryiCvM7oRkn/xQH5cv73/xU7rJSNCLjdGFor0Q==}
+    hasBin: true
+
+  ms@2.1.3:
+    resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==}
+
+  mute-stream@0.0.8:
+    resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
+
+  mux.js@6.0.1:
+    resolution: {integrity: sha512-22CHb59rH8pWGcPGW5Og7JngJ9s+z4XuSlYvnxhLuc58cA1WqGDQPzuG8I+sPm1/p0CdgpzVTaKW408k5DNn8w==}
+    engines: {node: '>=8', npm: '>=5'}
+    hasBin: true
+
+  nanoid@3.3.11:
+    resolution: {integrity: sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==}
+    engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
+    hasBin: true
+
+  natural-compare-lite@1.4.0:
+    resolution: {integrity: sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==}
+
+  natural-compare@1.4.0:
+    resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==}
+
+  no-case@3.0.4:
+    resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
+
+  node-addon-api@7.1.1:
+    resolution: {integrity: sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==}
+
+  node-domexception@1.0.0:
+    resolution: {integrity: sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==}
+    engines: {node: '>=10.5.0'}
+    deprecated: Use your platform's native DOMException instead
+
+  node-fetch@2.7.0:
+    resolution: {integrity: sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==}
+    engines: {node: 4.x || >=6.0.0}
+    peerDependencies:
+      encoding: ^0.1.0
+    peerDependenciesMeta:
+      encoding:
+        optional: true
+
+  node-fetch@3.3.2:
+    resolution: {integrity: sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+
+  node-int64@0.4.0:
+    resolution: {integrity: sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==}
+
+  node-releases@2.0.26:
+    resolution: {integrity: sha512-S2M9YimhSjBSvYnlr5/+umAnPHE++ODwt5e2Ij6FoX45HA/s4vHdkDx1eax2pAPeAOqu4s9b7ppahsyEFdVqQA==}
+
+  normalize-package-data@2.5.0:
+    resolution: {integrity: sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==}
+
+  normalize-package-data@3.0.3:
+    resolution: {integrity: sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==}
+    engines: {node: '>=10'}
+
+  normalize-path@2.1.1:
+    resolution: {integrity: sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==}
+    engines: {node: '>=0.10.0'}
+
+  normalize-path@3.0.0:
+    resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==}
+    engines: {node: '>=0.10.0'}
+
+  normalize-url@4.5.1:
+    resolution: {integrity: sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==}
+    engines: {node: '>=8'}
+
+  nosleep.js@0.7.0:
+    resolution: {integrity: sha512-Z4B1HgvzR+en62ghwZf6BwAR6x4/pjezsiMcbF9KMLh7xoscpoYhaSXfY3lLkqC68AtW+/qLJ1lzvBIj0FGaTA==}
+
+  nullthrows@1.1.1:
+    resolution: {integrity: sha512-2vPPEi+Z7WqML2jZYddDIfy5Dqb0r2fze2zTxNNknZaFpVHU3mFB3R+DWeJWGVx0ecvttSGlJTI+WG+8Z4cDWw==}
+
+  object-assign@4.1.1:
+    resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==}
+    engines: {node: '>=0.10.0'}
+
+  object-inspect@1.13.4:
+    resolution: {integrity: sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==}
+    engines: {node: '>= 0.4'}
+
+  object-keys@1.1.1:
+    resolution: {integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==}
+    engines: {node: '>= 0.4'}
+
+  object.assign@4.1.7:
+    resolution: {integrity: sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==}
+    engines: {node: '>= 0.4'}
+
+  object.entries@1.1.9:
+    resolution: {integrity: sha512-8u/hfXFRBD1O0hPUjioLhoWFHRmt6tKA4/vZPyckBr18l1KE9uHrFaFaUi8MDRTpi4uak2goyPTSNJLXX2k2Hw==}
+    engines: {node: '>= 0.4'}
+
+  object.fromentries@2.0.8:
+    resolution: {integrity: sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==}
+    engines: {node: '>= 0.4'}
+
+  object.groupby@1.0.3:
+    resolution: {integrity: sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==}
+    engines: {node: '>= 0.4'}
+
+  object.values@1.2.1:
+    resolution: {integrity: sha512-gXah6aZrcUxjWg2zR2MwouP2eHlCBzdV4pygudehaKXSGW4v2AsRQUK+lwwXhii6KFZcunEnmSUoYp5CXibxtA==}
+    engines: {node: '>= 0.4'}
+
+  once@1.4.0:
+    resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==}
+
+  onetime@5.1.2:
+    resolution: {integrity: sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==}
+    engines: {node: '>=6'}
+
+  optimism@0.18.1:
+    resolution: {integrity: sha512-mLXNwWPa9dgFyDqkNi54sjDyNJ9/fTI6WGBLgnXku1vdKY/jovHfZT5r+aiVeFFLOz+foPNOm5YJ4mqgld2GBQ==}
+
+  optionator@0.9.4:
+    resolution: {integrity: sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==}
+    engines: {node: '>= 0.8.0'}
+
+  ora@5.4.1:
+    resolution: {integrity: sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==}
+    engines: {node: '>=10'}
+
+  own-keys@1.0.1:
+    resolution: {integrity: sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==}
+    engines: {node: '>= 0.4'}
+
+  p-limit@2.3.0:
+    resolution: {integrity: sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==}
+    engines: {node: '>=6'}
+
+  p-limit@3.1.0:
+    resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==}
+    engines: {node: '>=10'}
+
+  p-locate@4.1.0:
+    resolution: {integrity: sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==}
+    engines: {node: '>=8'}
+
+  p-locate@5.0.0:
+    resolution: {integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==}
+    engines: {node: '>=10'}
+
+  p-map@4.0.0:
+    resolution: {integrity: sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==}
+    engines: {node: '>=10'}
+
+  p-try@2.2.0:
+    resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==}
+    engines: {node: '>=6'}
+
+  param-case@3.0.4:
+    resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
+
+  parent-module@1.0.1:
+    resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==}
+    engines: {node: '>=6'}
+
+  parse-entities@2.0.0:
+    resolution: {integrity: sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==}
+
+  parse-filepath@1.0.2:
+    resolution: {integrity: sha512-FwdRXKCohSVeXqwtYonZTXtbGJKrn+HNyWDYVcp5yuJlesTwNH4rsmRZ+GrKAPJ5bLpRxESMeS+Rl0VCHRvB2Q==}
+    engines: {node: '>=0.8'}
+
+  parse-json@5.2.0:
+    resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==}
+    engines: {node: '>=8'}
+
+  pascal-case@3.1.2:
+    resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
+
+  path-browserify@1.0.1:
+    resolution: {integrity: sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==}
+
+  path-case@3.0.4:
+    resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
+
+  path-exists@4.0.0:
+    resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==}
+    engines: {node: '>=8'}
+
+  path-is-absolute@1.0.1:
+    resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==}
+    engines: {node: '>=0.10.0'}
+
+  path-key@3.1.1:
+    resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==}
+    engines: {node: '>=8'}
+
+  path-parse@1.0.7:
+    resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==}
+
+  path-root-regex@0.1.2:
+    resolution: {integrity: sha512-4GlJ6rZDhQZFE0DPVKh0e9jmZ5egZfxTkp7bcRDuPlJXbAwhxcl2dINPUAsjLdejqaLsCeg8axcLjIbvBjN4pQ==}
+    engines: {node: '>=0.10.0'}
+
+  path-root@0.1.1:
+    resolution: {integrity: sha512-QLcPegTHF11axjfojBIoDygmS2E3Lf+8+jI6wOVmNVenrKSo3mFdSGiIgdSHenczw3wPtlVMQaFVwGmM7BJdtg==}
+    engines: {node: '>=0.10.0'}
+
+  path-to-regexp@1.9.0:
+    resolution: {integrity: sha512-xIp7/apCFJuUHdDLWe8O1HIkb0kQrOMb/0u6FXQjemHn/ii5LrIzU6bdECnsiTF/GjZkMEKg1xdiZwNqDYlZ6g==}
+
+  path-type@4.0.0:
+    resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==}
+    engines: {node: '>=8'}
+
+  picocolors@1.1.1:
+    resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==}
+
+  picomatch@2.3.1:
+    resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==}
+    engines: {node: '>=8.6'}
+
+  pify@5.0.0:
+    resolution: {integrity: sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA==}
+    engines: {node: '>=10'}
+
+  pkcs7@1.0.4:
+    resolution: {integrity: sha512-afRERtHn54AlwaF2/+LFszyAANTCggGilmcmILUzEjvs3XgFZT+xE6+QWQcAGmu4xajy+Xtj7acLOPdx5/eXWQ==}
+    hasBin: true
+
+  popper.js@1.16.1:
+    resolution: {integrity: sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==}
+    deprecated: You can find the new Popper v2 at @popperjs/core, this package is dedicated to the legacy v1
+
+  possible-typed-array-names@1.1.0:
+    resolution: {integrity: sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==}
+    engines: {node: '>= 0.4'}
+
+  postcss-resolve-nested-selector@0.1.6:
+    resolution: {integrity: sha512-0sglIs9Wmkzbr8lQwEyIzlDOOC9bGmfVKcJTaxv3vMmd3uo4o4DerC3En0bnmgceeql9BfC8hRkp7cg0fjdVqw==}
+
+  postcss-safe-parser@6.0.0:
+    resolution: {integrity: sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==}
+    engines: {node: '>=12.0'}
+    peerDependencies:
+      postcss: ^8.3.3
+
+  postcss-scss@4.0.9:
+    resolution: {integrity: sha512-AjKOeiwAitL/MXxQW2DliT28EKukvvbEWx3LBmJIRN8KfBGZbRTxNYW0kSqi1COiTZ57nZ9NW06S6ux//N1c9A==}
+    engines: {node: '>=12.0'}
+    peerDependencies:
+      postcss: ^8.4.29
+
+  postcss-selector-parser@6.1.2:
+    resolution: {integrity: sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==}
+    engines: {node: '>=4'}
+
+  postcss-sorting@8.0.2:
+    resolution: {integrity: sha512-M9dkSrmU00t/jK7rF6BZSZauA5MAaBW4i5EnJXspMwt4iqTh/L9j6fgMnbElEOfyRyfLfVbIHj/R52zHzAPe1Q==}
+    peerDependencies:
+      postcss: ^8.4.20
+
+  postcss-value-parser@4.2.0:
+    resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==}
+
+  postcss@8.5.6:
+    resolution: {integrity: sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==}
+    engines: {node: ^10 || ^12 || >=14}
+
+  prelude-ls@1.2.1:
+    resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
+    engines: {node: '>= 0.8.0'}
+
+  prettier@2.8.8:
+    resolution: {integrity: sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==}
+    engines: {node: '>=10.13.0'}
+    hasBin: true
+
+  process@0.11.10:
+    resolution: {integrity: sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==}
+    engines: {node: '>= 0.6.0'}
+
+  promise@7.3.1:
+    resolution: {integrity: sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==}
+
+  prop-types-extra@1.1.1:
+    resolution: {integrity: sha512-59+AHNnHYCdiC+vMwY52WmvP5dM3QLeoumYuEyceQDi9aEhtwN9zIQ2ZNo25sMyXnbh32h+P1ezDsUpUH3JAew==}
+    peerDependencies:
+      react: '>=0.14.0'
+
+  prop-types@15.7.2:
+    resolution: {integrity: sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==}
+
+  prop-types@15.8.1:
+    resolution: {integrity: sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==}
+
+  property-expr@2.0.6:
+    resolution: {integrity: sha512-SVtmxhRE/CGkn3eZY1T6pC8Nln6Fr/lu1mKSgRud0eC73whjGfoAogbn78LkD8aFL0zz3bAFerKSnOl7NlErBA==}
+
+  property-information@5.6.0:
+    resolution: {integrity: sha512-YUHSPk+A30YPv+0Qf8i9Mbfe/C0hdPXk1s1jPVToV8pk8BQtpw10ct89Eo7OWkutrwqvT0eicAxlOg3dOAu8JA==}
+
+  punycode@2.3.1:
+    resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==}
+    engines: {node: '>=6'}
+
+  queue-microtask@1.2.3:
+    resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==}
+
+  quick-lru@4.0.1:
+    resolution: {integrity: sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==}
+    engines: {node: '>=8'}
+
+  quick-lru@5.1.1:
+    resolution: {integrity: sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==}
+    engines: {node: '>=10'}
+
+  react-bootstrap@1.6.8:
+    resolution: {integrity: sha512-yD6uN78XlFOkETQp6GRuVe0s5509x3XYx8PfPbirwFTYCj5/RfmSs9YZGCwkUrhZNFzj7tZPdpb+3k50mK1E4g==}
+    peerDependencies:
+      react: '>=16.8.0'
+      react-dom: '>=16.8.0'
+
+  react-datepicker@4.25.0:
+    resolution: {integrity: sha512-zB7CSi44SJ0sqo8hUQ3BF1saE/knn7u25qEMTO1CQGofY1VAKahO8k9drZtp0cfW1DMfoYLR3uSY1/uMvbEzbg==}
+    peerDependencies:
+      react: ^16.9.0 || ^17 || ^18
+      react-dom: ^16.9.0 || ^17 || ^18
+
+  react-dom@17.0.2:
+    resolution: {integrity: sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==}
+    peerDependencies:
+      react: 17.0.2
+
+  react-fast-compare@2.0.4:
+    resolution: {integrity: sha512-suNP+J1VU1MWFKcyt7RtjiSWUjvidmQSlqu+eHslq+342xCbGTYmC0mEhPCOHxlW0CywylOC1u2DFAT+bv4dBw==}
+
+  react-fast-compare@3.2.2:
+    resolution: {integrity: sha512-nsO+KSNgo1SbJqJEYRE9ERzo7YtYbou/OqjSQKxV7jcKox7+usiUVZOAC+XnDOABXggQTno0Y1CpVnuWEc1boQ==}
+
+  react-helmet@6.1.0:
+    resolution: {integrity: sha512-4uMzEY9nlDlgxr61NL3XbKRy1hEkXmKNXhjbAIOVw5vcFrsdYbH2FEwcNyWvWinl103nXgzYNlns9ca+8kFiWw==}
+    peerDependencies:
+      react: '>=16.3.0'
+
+  react-intl@6.8.9:
+    resolution: {integrity: sha512-TUfj5E7lyUDvz/GtovC9OMh441kBr08rtIbgh3p0R8iF3hVY+V2W9Am7rb8BpJ/29BH1utJOqOOhmvEVh3GfZg==}
+    peerDependencies:
+      react: ^16.6.0 || 17 || 18
+      typescript: ^4.7 || 5
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  react-is@16.13.1:
+    resolution: {integrity: sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==}
+
+  react-lifecycles-compat@3.0.4:
+    resolution: {integrity: sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==}
+
+  react-onclickoutside@6.13.2:
+    resolution: {integrity: sha512-h6Hbf1c8b7tIYY4u90mDdBLY4+AGQVMFtIE89HgC0DtVCh/JfKl477gYqUtGLmjZBKK3MJxomP/lFiLbz4sq9A==}
+    peerDependencies:
+      react: ^15.5.x || ^16.x || ^17.x || ^18.x
+      react-dom: ^15.5.x || ^16.x || ^17.x || ^18.x
+
+  react-overlays@5.2.1:
+    resolution: {integrity: sha512-GLLSOLWr21CqtJn8geSwQfoJufdt3mfdsnIiQswouuQ2MMPns+ihZklxvsTDKD3cR2tF8ELbi5xUsvqVhR6WvA==}
+    peerDependencies:
+      react: '>=16.3.0'
+      react-dom: '>=16.3.0'
+
+  react-photo-gallery@8.0.0:
+    resolution: {integrity: sha512-Y9458yygEB9cIZAWlBWuenlR+ghin1RopmmU3Vice8BeJl0Se7hzfxGDq8W1armB/ic/kphGg+G1jq5fOEd0sw==}
+    peerDependencies:
+      react: ^16.8.0
+      react-dom: ^16.8.0
+
+  react-popper@2.3.0:
+    resolution: {integrity: sha512-e1hj8lL3uM+sgSR4Lxzn5h1GxBlpa4CQz0XLF8kx4MDrDRWY0Ena4c97PUeSX9i5W3UAfDP0z0FXCTQkoXUl3Q==}
+    peerDependencies:
+      '@popperjs/core': ^2.0.0
+      react: ^16.8.0 || ^17 || ^18
+      react-dom: ^16.8.0 || ^17 || ^18
+
+  react-refresh@0.14.2:
+    resolution: {integrity: sha512-jCvmsr+1IUSMUyzOkRcvnVbX3ZYC6g9TDrDbFuFmRDq7PD4yaGbLKNQL6k2jnArV8hjYxh7hVhAZB6s9HDGpZA==}
+    engines: {node: '>=0.10.0'}
+
+  react-remark@2.1.0:
+    resolution: {integrity: sha512-7dEPxRGQ23sOdvteuRGaQAs9cEOH/BOeCN4CqsJdk3laUDIDYRCWnM6a3z92PzXHUuxIRLXQNZx7SiO0ijUcbw==}
+    engines: {node: '>=10'}
+    peerDependencies:
+      react: '>=16.8'
+
+  react-router-bootstrap@0.25.0:
+    resolution: {integrity: sha512-/22eqxjn6Zv5fvY2rZHn57SKmjmJfK7xzJ6/G1OgxAjLtKVfWgV5sn41W2yiqzbtV5eE4/i4LeDLBGYTqx7jbA==}
+    peerDependencies:
+      react: '>=0.14.0'
+      react-router-dom: '>=4.0.0'
+
+  react-router-dom@5.3.4:
+    resolution: {integrity: sha512-m4EqFMHv/Ih4kpcBCONHbkT68KoAeHN4p3lAGoNryfHi0dMy0kCzEZakiKRsvg5wHZ/JLrLW8o8KomWiz/qbYQ==}
+    peerDependencies:
+      react: '>=15'
+
+  react-router-hash-link@2.4.3:
+    resolution: {integrity: sha512-NU7GWc265m92xh/aYD79Vr1W+zAIXDWp3L2YZOYP4rCqPnJ6LI6vh3+rKgkidtYijozHclaEQTAHaAaMWPVI4A==}
+    peerDependencies:
+      react: '>=15'
+      react-router-dom: '>=4'
+
+  react-router@5.3.4:
+    resolution: {integrity: sha512-Ys9K+ppnJah3QuaRiLxk+jDWOR1MekYQrlytiXxC1RyfbdsZkS5pvKAzCCr031xHixZwpnsYNT5xysdFHQaYsA==}
+    peerDependencies:
+      react: '>=15'
+
+  react-select@5.10.2:
+    resolution: {integrity: sha512-Z33nHdEFWq9tfnfVXaiM12rbJmk+QjFEztWLtmXqQhz6Al4UZZ9xc0wiatmGtUOCCnHN0WizL3tCMYRENX4rVQ==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+
+  react-side-effect@2.1.2:
+    resolution: {integrity: sha512-PVjOcvVOyIILrYoyGEpDN3vmYNLdy1CajSFNt4TDsVQC5KpTijDvWVoR+/7Rz2xT978D8/ZtFceXxzsPwZEDvw==}
+    peerDependencies:
+      react: ^16.3.0 || ^17.0.0 || ^18.0.0
+
+  react-transition-group@4.4.5:
+    resolution: {integrity: sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==}
+    peerDependencies:
+      react: '>=16.6.0'
+      react-dom: '>=16.6.0'
+
+  react@17.0.2:
+    resolution: {integrity: sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==}
+    engines: {node: '>=0.10.0'}
+
+  read-babelrc-up@1.1.0:
+    resolution: {integrity: sha512-fcl0JeI85Ss3//kfC3z2rsG2VxSiHl1bJgpjQWrne2YuQEewZpAgAjb17A6q/Q3ozWeZsUSroiIBVsnjmOU8vw==}
+    engines: {node: '>=10'}
+
+  read-pkg-up@7.0.1:
+    resolution: {integrity: sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==}
+    engines: {node: '>=8'}
+
+  read-pkg-up@8.0.0:
+    resolution: {integrity: sha512-snVCqPczksT0HS2EC+SxUndvSzn6LRCwpfSvLrIfR5BKDQQZMaI6jPRC9dYvYFDRAuFEAnkwww8kBBNE/3VvzQ==}
+    engines: {node: '>=12'}
+
+  read-pkg@5.2.0:
+    resolution: {integrity: sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==}
+    engines: {node: '>=8'}
+
+  read-pkg@6.0.0:
+    resolution: {integrity: sha512-X1Fu3dPuk/8ZLsMhEj5f4wFAF0DWoK7qhGJvgaijocXxBmSToKfbFtqbxMO7bVjNA1dmE5huAzjXj/ey86iw9Q==}
+    engines: {node: '>=12'}
+
+  readable-stream@3.6.2:
+    resolution: {integrity: sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==}
+    engines: {node: '>= 6'}
+
+  readdirp@4.1.2:
+    resolution: {integrity: sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==}
+    engines: {node: '>= 14.18.0'}
+
+  redent@3.0.0:
+    resolution: {integrity: sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==}
+    engines: {node: '>=8'}
+
+  redent@4.0.0:
+    resolution: {integrity: sha512-tYkDkVVtYkSVhuQ4zBgfvciymHaeuel+zFKXShfDnFP5SyVEP7qo70Rf1jTOTCx3vGNAbnEi/xFkcfQVMIBWag==}
+    engines: {node: '>=12'}
+
+  reflect.getprototypeof@1.0.10:
+    resolution: {integrity: sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw==}
+    engines: {node: '>= 0.4'}
+
+  regenerate-unicode-properties@10.2.2:
+    resolution: {integrity: sha512-m03P+zhBeQd1RGnYxrGyDAPpWX/epKirLrp8e3qevZdVkKtnCrjjWczIbYc8+xd6vcTStVlqfycTx1KR4LOr0g==}
+    engines: {node: '>=4'}
+
+  regenerate@1.4.2:
+    resolution: {integrity: sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==}
+
+  regenerator-runtime@0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+
+  regexp.prototype.flags@1.5.4:
+    resolution: {integrity: sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==}
+    engines: {node: '>= 0.4'}
+
+  regexpu-core@6.4.0:
+    resolution: {integrity: sha512-0ghuzq67LI9bLXpOX/ISfve/Mq33a4aFRzoQYhnnok1JOFpmE/A2TBGkNVenOGEeSBCjIiWcc6MVOG5HEQv0sA==}
+    engines: {node: '>=4'}
+
+  regjsgen@0.8.0:
+    resolution: {integrity: sha512-RvwtGe3d7LvWiDQXeQw8p5asZUmfU1G/l6WbUXeHta7Y2PEIvBTwH6E2EfmYUK8pxcxEdEmaomqyp0vZZ7C+3Q==}
+
+  regjsparser@0.13.0:
+    resolution: {integrity: sha512-NZQZdC5wOE/H3UT28fVGL+ikOZcEzfMGk/c3iN9UGxzWHMa1op7274oyiUVrAG4B2EuFhus8SvkaYnhvW92p9Q==}
+    hasBin: true
+
+  rehackt@0.1.0:
+    resolution: {integrity: sha512-7kRDOuLHB87D/JESKxQoRwv4DzbIdwkAGQ7p6QKGdVlY1IZheUnVhlk/4UZlNUVxdAXpyxikE3URsG067ybVzw==}
+    peerDependencies:
+      '@types/react': '*'
+      react: '*'
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      react:
+        optional: true
+
+  rehype-react@6.2.1:
+    resolution: {integrity: sha512-f9KIrjktvLvmbGc7si25HepocOg4z0MuNOtweigKzBcDjiGSTGhyz6VSgaV5K421Cq1O+z4/oxRJ5G9owo0KVg==}
+
+  relay-runtime@12.0.0:
+    resolution: {integrity: sha512-QU6JKr1tMsry22DXNy9Whsq5rmvwr3LSZiiWV/9+DFpuTWvp+WFhobWMc8TC4OjKFfNhEZy7mOiqUAn5atQtug==}
+
+  remark-gfm@1.0.0:
+    resolution: {integrity: sha512-KfexHJCiqvrdBZVbQ6RopMZGwaXz6wFJEfByIuEwGf0arvITHjiKKZ1dpXujjH9KZdm1//XJQwgfnJ3lmXaDPA==}
+
+  remark-parse@9.0.0:
+    resolution: {integrity: sha512-geKatMwSzEXKHuzBNU1z676sGcDcFoChMK38TgdHJNAYfFtsfHDQG7MoJAjs6sgYMqyLduCYWDIWZIxiPeafEw==}
+
+  remark-rehype@8.1.0:
+    resolution: {integrity: sha512-EbCu9kHgAxKmW1yEYjx3QafMyGY3q8noUbNUI5xyKbaFP89wbhDrKxyIQNukNYthzjNHZu6J7hwFg7hRm1svYA==}
+
+  remedial@1.0.8:
+    resolution: {integrity: sha512-/62tYiOe6DzS5BqVsNpH/nkGlX45C/Sp6V+NtiN6JQNS1Viay7cWkazmRkrQrdFj2eshDe96SIQNIoMxqhzBOg==}
+
+  remove-trailing-separator@1.1.0:
+    resolution: {integrity: sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==}
+
+  remove-trailing-spaces@1.0.9:
+    resolution: {integrity: sha512-xzG7w5IRijvIkHIjDk65URsJJ7k4J95wmcArY5PRcmjldIOl7oTvG8+X2Ag690R7SfwiOcHrWZKVc1Pp5WIOzA==}
+
+  repeat-string@1.6.1:
+    resolution: {integrity: sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==}
+    engines: {node: '>=0.10'}
+
+  require-directory@2.1.1:
+    resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==}
+    engines: {node: '>=0.10.0'}
+
+  require-from-string@2.0.2:
+    resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==}
+    engines: {node: '>=0.10.0'}
+
+  require-main-filename@2.0.0:
+    resolution: {integrity: sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==}
+
+  resize-observer-polyfill@1.5.1:
+    resolution: {integrity: sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==}
+
+  resolve-from@4.0.0:
+    resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==}
+    engines: {node: '>=4'}
+
+  resolve-from@5.0.0:
+    resolution: {integrity: sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==}
+    engines: {node: '>=8'}
+
+  resolve-pathname@3.0.0:
+    resolution: {integrity: sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng==}
+
+  resolve@1.22.11:
+    resolution: {integrity: sha512-RfqAvLnMl313r7c9oclB1HhUEAezcpLjz95wFH4LVuhk9JF/r22qmVP9AMmOU4vMX7Q8pN8jwNg/CSpdFnMjTQ==}
+    engines: {node: '>= 0.4'}
+    hasBin: true
+
+  resolve@2.0.0-next.5:
+    resolution: {integrity: sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==}
+    hasBin: true
+
+  restore-cursor@3.1.0:
+    resolution: {integrity: sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==}
+    engines: {node: '>=8'}
+
+  reusify@1.1.0:
+    resolution: {integrity: sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==}
+    engines: {iojs: '>=1.0.0', node: '>=0.10.0'}
+
+  rfdc@1.4.1:
+    resolution: {integrity: sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==}
+
+  rimraf@3.0.2:
+    resolution: {integrity: sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==}
+    deprecated: Rimraf versions prior to v4 are no longer supported
+    hasBin: true
+
+  rollup@3.29.5:
+    resolution: {integrity: sha512-GVsDdsbJzzy4S/v3dqWPJ7EfvZJfCHiDqe80IyrF59LYuP+e6U1LJoUqeuqRbwAWoMNoXivMNeNAOf5E22VA1w==}
+    engines: {node: '>=14.18.0', npm: '>=8.0.0'}
+    hasBin: true
+
+  run-async@2.4.1:
+    resolution: {integrity: sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==}
+    engines: {node: '>=0.12.0'}
+
+  run-parallel@1.2.0:
+    resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==}
+
+  rust-result@1.0.0:
+    resolution: {integrity: sha512-6cJzSBU+J/RJCF063onnQf0cDUOHs9uZI1oroSGnHOph+CQTIJ5Pp2hK5kEQq1+7yE/EEWfulSNXAQ2jikPthA==}
+
+  rxjs@7.8.2:
+    resolution: {integrity: sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA==}
+
+  safe-array-concat@1.1.3:
+    resolution: {integrity: sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==}
+    engines: {node: '>=0.4'}
+
+  safe-buffer@5.2.1:
+    resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==}
+
+  safe-json-parse@4.0.0:
+    resolution: {integrity: sha512-RjZPPHugjK0TOzFrLZ8inw44s9bKox99/0AZW9o/BEQVrJfhI+fIHMErnPyRa89/yRXUUr93q+tiN6zhoVV4wQ==}
+
+  safe-push-apply@1.0.0:
+    resolution: {integrity: sha512-iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA==}
+    engines: {node: '>= 0.4'}
+
+  safe-regex-test@1.1.0:
+    resolution: {integrity: sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==}
+    engines: {node: '>= 0.4'}
+
+  safer-buffer@2.1.2:
+    resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==}
+
+  sass@1.93.2:
+    resolution: {integrity: sha512-t+YPtOQHpGW1QWsh1CHQ5cPIr9lbbGZLZnbihP/D/qZj/yuV68m8qarcV17nvkOX81BCrvzAlq2klCQFZghyTg==}
+    engines: {node: '>=14.0.0'}
+    hasBin: true
+
+  sax@1.2.1:
+    resolution: {integrity: sha512-8I2a3LovHTOpm7NV5yOyO8IHqgVsfK4+UuySrXU8YXkSRX7k6hCV9b3HrkKCr3nMpgj+0bmocaJJWpvp1oc7ZA==}
+
+  scheduler@0.20.2:
+    resolution: {integrity: sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==}
+
+  schema-utils@2.7.1:
+    resolution: {integrity: sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==}
+    engines: {node: '>= 8.9.0'}
+
+  scuid@1.1.0:
+    resolution: {integrity: sha512-MuCAyrGZcTLfQoH2XoBlQ8C6bzwN88XT/0slOGz0pn8+gIP85BOAfYa44ZXQUTOwRwPU0QvgU+V+OSajl/59Xg==}
+
+  semver@5.7.2:
+    resolution: {integrity: sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==}
+    hasBin: true
+
+  semver@6.3.1:
+    resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==}
+    hasBin: true
+
+  semver@7.7.3:
+    resolution: {integrity: sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==}
+    engines: {node: '>=10'}
+    hasBin: true
+
+  sentence-case@3.0.4:
+    resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
+
+  set-blocking@2.0.0:
+    resolution: {integrity: sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==}
+
+  set-function-length@1.2.2:
+    resolution: {integrity: sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==}
+    engines: {node: '>= 0.4'}
+
+  set-function-name@2.0.2:
+    resolution: {integrity: sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==}
+    engines: {node: '>= 0.4'}
+
+  set-proto@1.0.0:
+    resolution: {integrity: sha512-RJRdvCo6IAnPdsvP/7m6bsQqNnn1FCBX5ZNtFL98MmFF/4xAIJTIg1YbHW5DC2W5SKZanrC6i4HsJqlajw/dZw==}
+    engines: {node: '>= 0.4'}
+
+  setimmediate@1.0.5:
+    resolution: {integrity: sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==}
+
+  shebang-command@2.0.0:
+    resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==}
+    engines: {node: '>=8'}
+
+  shebang-regex@3.0.0:
+    resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==}
+    engines: {node: '>=8'}
+
+  shell-quote@1.8.3:
+    resolution: {integrity: sha512-ObmnIF4hXNg1BqhnHmgbDETF8dLPCggZWBjkQfhZpbszZnYur5DUljTcCHii5LC3J5E0yeO/1LIMyH+UvHQgyw==}
+    engines: {node: '>= 0.4'}
+
+  side-channel-list@1.0.0:
+    resolution: {integrity: sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==}
+    engines: {node: '>= 0.4'}
+
+  side-channel-map@1.0.1:
+    resolution: {integrity: sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==}
+    engines: {node: '>= 0.4'}
+
+  side-channel-weakmap@1.0.2:
+    resolution: {integrity: sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==}
+    engines: {node: '>= 0.4'}
+
+  side-channel@1.1.0:
+    resolution: {integrity: sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==}
+    engines: {node: '>= 0.4'}
+
+  signal-exit@3.0.7:
+    resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==}
+
+  signal-exit@4.1.0:
+    resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==}
+    engines: {node: '>=14'}
+
+  signedsource@1.0.0:
+    resolution: {integrity: sha512-6+eerH9fEnNmi/hyM1DXcRK3pWdoMQtlkQ+ns0ntzunjKqp5i3sKCc80ym8Fib3iaYhdJUOPdhlJWj1tvge2Ww==}
+
+  slash@3.0.0:
+    resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==}
+    engines: {node: '>=8'}
+
+  slice-ansi@3.0.0:
+    resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
+    engines: {node: '>=8'}
+
+  slice-ansi@4.0.0:
+    resolution: {integrity: sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==}
+    engines: {node: '>=10'}
+
+  slick-carousel@1.8.1:
+    resolution: {integrity: sha512-XB9Ftrf2EEKfzoQXt3Nitrt/IPbT+f1fgqBdoxO3W/+JYvtEOW6EgxnWfr9GH6nmULv7Y2tPmEX3koxThVmebA==}
+    peerDependencies:
+      jquery: '>=1.8.0'
+
+  snake-case@3.0.4:
+    resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
+
+  sort-keys@4.2.0:
+    resolution: {integrity: sha512-aUYIEU/UviqPgc8mHR6IW1EGxkAXpeRETYcrzg8cLAvUPZcpAlleSXHV2mY7G12GphSH6Gzv+4MMVSSkbdteHg==}
+    engines: {node: '>=8'}
+
+  source-map-js@1.2.1:
+    resolution: {integrity: sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==}
+    engines: {node: '>=0.10.0'}
+
+  source-map-support@0.5.21:
+    resolution: {integrity: sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==}
+
+  source-map@0.5.7:
+    resolution: {integrity: sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==}
+    engines: {node: '>=0.10.0'}
+
+  source-map@0.6.1:
+    resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==}
+    engines: {node: '>=0.10.0'}
+
+  space-separated-tokens@1.1.5:
+    resolution: {integrity: sha512-q/JSVd1Lptzhf5bkYm4ob4iWPjx0KiRe3sRFBNrVqbJkFaBm5vbbowy1mymoPNLRa52+oadOhJ+K49wsSeSjTA==}
+
+  spdx-correct@3.2.0:
+    resolution: {integrity: sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==}
+
+  spdx-exceptions@2.5.0:
+    resolution: {integrity: sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==}
+
+  spdx-expression-parse@3.0.1:
+    resolution: {integrity: sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==}
+
+  spdx-license-ids@3.0.22:
+    resolution: {integrity: sha512-4PRT4nh1EImPbt2jASOKHX7PB7I+e4IWNLvkKFDxNhJlfjbYlleYQh285Z/3mPTHSAK/AvdMmw5BNNuYH8ShgQ==}
+
+  sponge-case@1.0.1:
+    resolution: {integrity: sha512-dblb9Et4DAtiZ5YSUZHLl4XhH4uK80GhAZrVXdN4O2P4gQ40Wa5UIOPUHlA/nFd2PLblBZWUioLMMAVrgpoYcA==}
+
+  sprintf-js@1.0.3:
+    resolution: {integrity: sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==}
+
+  stop-iteration-iterator@1.1.0:
+    resolution: {integrity: sha512-eLoXW/DHyl62zxY4SCaIgnRhuMr6ri4juEYARS8E6sCEqzKpOiE521Ucofdx+KnDZl5xmvGYaaKCk5FEOxJCoQ==}
+    engines: {node: '>= 0.4'}
+
+  string-convert@0.2.1:
+    resolution: {integrity: sha512-u/1tdPl4yQnPBjnVrmdLo9gtuLvELKsAoRapekWggdiQNvvvum+jYF329d84NAa660KQw7pB2n36KrIKVoXa3A==}
+
+  string-env-interpolation@1.0.1:
+    resolution: {integrity: sha512-78lwMoCcn0nNu8LszbP1UA7g55OeE4v7rCeWnM5B453rnNr4aq+5it3FEYtZrSEiMvHZOZ9Jlqb0OD0M2VInqg==}
+
+  string-width@4.2.3:
+    resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==}
+    engines: {node: '>=8'}
+
+  string.prototype.includes@2.0.1:
+    resolution: {integrity: sha512-o7+c9bW6zpAdJHTtujeePODAhkuicdAryFsfVKwA+wGw89wJ4GTY484WTucM9hLtDEOpOvI+aHnzqnC5lHp4Rg==}
+    engines: {node: '>= 0.4'}
+
+  string.prototype.matchall@4.0.12:
+    resolution: {integrity: sha512-6CC9uyBL+/48dYizRf7H7VAYCMCNTBeM78x/VTUe9bFEaxBepPJDa1Ow99LqI/1yF7kuy7Q3cQsYMrcjGUcskA==}
+    engines: {node: '>= 0.4'}
+
+  string.prototype.repeat@1.0.0:
+    resolution: {integrity: sha512-0u/TldDbKD8bFCQ/4f5+mNRrXwZ8hg2w7ZR8wa16e8z9XpePWl3eGEcUD0OXpEH/VJH/2G3gjUtR3ZOiBe2S/w==}
+
+  string.prototype.replaceall@1.0.11:
+    resolution: {integrity: sha512-MtmYTo9i6i3Jpc0xuGVYd5GraPTml7vlZh4030YXRiBktXwYKYU7IDGJeMi008Dk8QKlgJUi/Q+oNnGKB++/fQ==}
+    engines: {node: '>= 0.4'}
+
+  string.prototype.trim@1.2.10:
+    resolution: {integrity: sha512-Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA==}
+    engines: {node: '>= 0.4'}
+
+  string.prototype.trimend@1.0.9:
+    resolution: {integrity: sha512-G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ==}
+    engines: {node: '>= 0.4'}
+
+  string.prototype.trimstart@1.0.8:
+    resolution: {integrity: sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==}
+    engines: {node: '>= 0.4'}
+
+  string_decoder@1.3.0:
+    resolution: {integrity: sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==}
+
+  strip-ansi@6.0.1:
+    resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==}
+    engines: {node: '>=8'}
+
+  strip-bom@3.0.0:
+    resolution: {integrity: sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==}
+    engines: {node: '>=4'}
+
+  strip-bom@4.0.0:
+    resolution: {integrity: sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==}
+    engines: {node: '>=8'}
+
+  strip-indent@3.0.0:
+    resolution: {integrity: sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==}
+    engines: {node: '>=8'}
+
+  strip-indent@4.1.1:
+    resolution: {integrity: sha512-SlyRoSkdh1dYP0PzclLE7r0M9sgbFKKMFXpFRUMNuKhQSbC6VQIGzq3E0qsfvGJaUFJPGv6Ws1NZ/haTAjfbMA==}
+    engines: {node: '>=12'}
+
+  strip-json-comments@3.1.1:
+    resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==}
+    engines: {node: '>=8'}
+
+  style-search@0.1.0:
+    resolution: {integrity: sha512-Dj1Okke1C3uKKwQcetra4jSuk0DqbzbYtXipzFlFMZtowbF1x7BKJwB9AayVMyFARvU8EDrZdcax4At/452cAg==}
+
+  style-to-object@0.3.0:
+    resolution: {integrity: sha512-CzFnRRXhzWIdItT3OmF8SQfWyahHhjq3HwcMNCNLn+N7klOOqPjMeG/4JSu77D7ypZdGvSzvkrbyeTMizz2VrA==}
+
+  stylelint-order@6.0.4:
+    resolution: {integrity: sha512-0UuKo4+s1hgQ/uAxlYU4h0o0HS4NiQDud0NAUNI0aa8FJdmYHA5ZZTFHiV5FpmE3071e9pZx5j0QpVJW5zOCUA==}
+    peerDependencies:
+      stylelint: ^14.0.0 || ^15.0.0 || ^16.0.1
+
+  stylelint@15.11.0:
+    resolution: {integrity: sha512-78O4c6IswZ9TzpcIiQJIN49K3qNoXTM8zEJzhaTE/xRTCZswaovSEVIa/uwbOltZrk16X4jAxjaOhzz/hTm1Kw==}
+    engines: {node: ^14.13.1 || >=16.0.0}
+    hasBin: true
+
+  stylis@4.2.0:
+    resolution: {integrity: sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw==}
+
+  supports-color@7.2.0:
+    resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==}
+    engines: {node: '>=8'}
+
+  supports-hyperlinks@3.2.0:
+    resolution: {integrity: sha512-zFObLMyZeEwzAoKCyu1B91U79K2t7ApXuQfo8OuxwXLDgcKxuwM+YvcbIhm6QWqz7mHUH1TVytR1PwVVjEuMig==}
+    engines: {node: '>=14.18'}
+
+  supports-preserve-symlinks-flag@1.0.0:
+    resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==}
+    engines: {node: '>= 0.4'}
+
+  svg-tags@1.0.0:
+    resolution: {integrity: sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==}
+
+  swap-case@2.0.2:
+    resolution: {integrity: sha512-kc6S2YS/2yXbtkSMunBtKdah4VFETZ8Oh6ONSmSd9bRxhqTrtARUCBUiWXH3xVPpvR7tz2CSnkuXVE42EcGnMw==}
+
+  symbol-observable@4.0.0:
+    resolution: {integrity: sha512-b19dMThMV4HVFynSAM1++gBHAbk2Tc/osgLIBZMKsyqh34jb2e8Os7T6ZW/Bt3pJFdBTd2JwAnAAEQV7rSNvcQ==}
+    engines: {node: '>=0.10'}
+
+  sync-fetch@0.6.0-2:
+    resolution: {integrity: sha512-c7AfkZ9udatCuAy9RSfiGPpeOKKUAUK5e1cXadLOGUjasdxqYqAK0jTNkM/FSEyJ3a5Ra27j/tw/PS0qLmaF/A==}
+    engines: {node: '>=18'}
+
+  systemjs@6.15.1:
+    resolution: {integrity: sha512-Nk8c4lXvMB98MtbmjX7JwJRgJOL8fluecYCfCeYBznwmpOs8Bf15hLM6z4z71EDAhQVrQrI+wt1aLWSXZq+hXA==}
+
+  table@6.9.0:
+    resolution: {integrity: sha512-9kY+CygyYM6j02t5YFHbNz2FN5QmYGv9zAjVp4lCDjlCw7amdckXlEt/bjMhUIfj4ThGRE4gCUH5+yGnNuPo5A==}
+    engines: {node: '>=10.0.0'}
+
+  terser@5.44.0:
+    resolution: {integrity: sha512-nIVck8DK+GM/0Frwd+nIhZ84pR/BX7rmXMfYwyg+Sri5oGVE99/E3KvXqpC2xHFxyqXyGHTKBSioxxplrO4I4w==}
+    engines: {node: '>=10'}
+    hasBin: true
+
+  text-table@0.2.0:
+    resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==}
+
+  thehandy@1.1.0:
+    resolution: {integrity: sha512-ZifUw47kq6cKNiKLNgrnVPkBFbG+yR6tScgWy2INDnGT4XePhjRaQNni67rWn52nAOkotq9VyaK20OZoorHqTA==}
+
+  three@0.93.0:
+    resolution: {integrity: sha512-Ys9+UBBsd6FxTZZl4BH7B4b2F+B2uR0cOwY7OQ/aCzU/VgO4Wmmr1LbWPH1fsTvSVik9KAuwxwOHlSC4IMGOLA==}
+
+  throttle-debounce@5.0.2:
+    resolution: {integrity: sha512-B71/4oyj61iNH0KeCamLuE2rmKuTO5byTOSVwECM5FA7TiAiAW+UqTKZ9ERueC4qvgSttUhdmq1mXC3kJqGX7A==}
+    engines: {node: '>=12.22'}
+
+  through@2.3.8:
+    resolution: {integrity: sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==}
+
+  timeout-signal@2.0.0:
+    resolution: {integrity: sha512-YBGpG4bWsHoPvofT6y/5iqulfXIiIErl5B0LdtHT1mGXDFTAhhRrbUpTvBgYbovr+3cKblya2WAOcpoy90XguA==}
+    engines: {node: '>=16'}
+
+  tiny-case@1.0.3:
+    resolution: {integrity: sha512-Eet/eeMhkO6TX8mnUteS9zgPbUMQa4I6Kkp5ORiBD5476/m+PIRiumP5tmh5ioJpH7k51Kehawy2UDfsnxxY8Q==}
+
+  tiny-invariant@1.3.3:
+    resolution: {integrity: sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==}
+
+  tiny-warning@1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+
+  title-case@3.0.3:
+    resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
+
+  to-regex-range@5.0.1:
+    resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==}
+    engines: {node: '>=8.0'}
+
+  toposort@2.0.2:
+    resolution: {integrity: sha512-0a5EOkAUp8D4moMi2W8ZF8jcga7BgZd91O/yabJCFY8az+XSzeGyTKs0Aoo897iV1Nj6guFq8orWDS96z91oGg==}
+
+  tr46@0.0.3:
+    resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==}
+
+  trim-newlines@3.0.1:
+    resolution: {integrity: sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==}
+    engines: {node: '>=8'}
+
+  trim-newlines@4.1.1:
+    resolution: {integrity: sha512-jRKj0n0jXWo6kh62nA5TEh3+4igKDXLvzBJcPpiizP7oOolUrYIxmVBG9TOtHYFHoddUk6YvAkGeGoSVTXfQXQ==}
+    engines: {node: '>=12'}
+
+  trough@1.0.5:
+    resolution: {integrity: sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==}
+
+  ts-invariant@0.10.3:
+    resolution: {integrity: sha512-uivwYcQaxAucv1CzRp2n/QdYPo4ILf9VXgH19zEIjFx2EJufV16P0JtJVpYHy89DItG6Kwj2oIUjrcK5au+4tQ==}
+    engines: {node: '>=8'}
+
+  ts-log@2.2.7:
+    resolution: {integrity: sha512-320x5Ggei84AxzlXp91QkIGSw5wgaLT6GeAH0KsqDmRZdVWW2OiSeVvElVoatk3f7nicwXlElXsoFkARiGE2yg==}
+
+  ts-node@10.9.2:
+    resolution: {integrity: sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==}
+    hasBin: true
+    peerDependencies:
+      '@swc/core': '>=1.2.50'
+      '@swc/wasm': '>=1.2.50'
+      '@types/node': '*'
+      typescript: '>=2.7'
+    peerDependenciesMeta:
+      '@swc/core':
+        optional: true
+      '@swc/wasm':
+        optional: true
+
+  tsconfck@3.1.6:
+    resolution: {integrity: sha512-ks6Vjr/jEw0P1gmOVwutM3B7fWxoWBL2KRDb1JfqGVawBmO5UsvmWOQFGHBPl5yxYz4eERr19E6L7NMv+Fej4w==}
+    engines: {node: ^18 || >=20}
+    hasBin: true
+    peerDependencies:
+      typescript: ^5.0.0
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  tsconfig-paths@3.15.0:
+    resolution: {integrity: sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==}
+
+  tslib@1.14.1:
+    resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
+
+  tslib@2.4.1:
+    resolution: {integrity: sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==}
+
+  tslib@2.6.3:
+    resolution: {integrity: sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==}
+
+  tslib@2.8.1:
+    resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==}
+
+  tsutils@3.21.0:
+    resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
+    engines: {node: '>= 6'}
+    peerDependencies:
+      typescript: '>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta'
+
+  type-check@0.4.0:
+    resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==}
+    engines: {node: '>= 0.8.0'}
+
+  type-fest@0.13.1:
+    resolution: {integrity: sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==}
+    engines: {node: '>=10'}
+
+  type-fest@0.20.2:
+    resolution: {integrity: sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==}
+    engines: {node: '>=10'}
+
+  type-fest@0.21.3:
+    resolution: {integrity: sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==}
+    engines: {node: '>=10'}
+
+  type-fest@0.6.0:
+    resolution: {integrity: sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==}
+    engines: {node: '>=8'}
+
+  type-fest@0.8.1:
+    resolution: {integrity: sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==}
+    engines: {node: '>=8'}
+
+  type-fest@1.4.0:
+    resolution: {integrity: sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==}
+    engines: {node: '>=10'}
+
+  type-fest@2.19.0:
+    resolution: {integrity: sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==}
+    engines: {node: '>=12.20'}
+
+  typed-array-buffer@1.0.3:
+    resolution: {integrity: sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==}
+    engines: {node: '>= 0.4'}
+
+  typed-array-byte-length@1.0.3:
+    resolution: {integrity: sha512-BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg==}
+    engines: {node: '>= 0.4'}
+
+  typed-array-byte-offset@1.0.4:
+    resolution: {integrity: sha512-bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ==}
+    engines: {node: '>= 0.4'}
+
+  typed-array-length@1.0.7:
+    resolution: {integrity: sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==}
+    engines: {node: '>= 0.4'}
+
+  typedarray-to-buffer@3.1.5:
+    resolution: {integrity: sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==}
+
+  typescript@4.8.4:
+    resolution: {integrity: sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==}
+    engines: {node: '>=4.2.0'}
+    hasBin: true
+
+  ua-parser-js@1.0.41:
+    resolution: {integrity: sha512-LbBDqdIC5s8iROCUjMbW1f5dJQTEFB1+KO9ogbvlb3nm9n4YHa5p4KTvFPWvh2Hs8gZMBuiB1/8+pdfe/tDPug==}
+    hasBin: true
+
+  unbox-primitive@1.1.0:
+    resolution: {integrity: sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==}
+    engines: {node: '>= 0.4'}
+
+  unc-path-regex@0.1.2:
+    resolution: {integrity: sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==}
+    engines: {node: '>=0.10.0'}
+
+  uncontrollable@7.2.1:
+    resolution: {integrity: sha512-svtcfoTADIB0nT9nltgjujTi7BzVmwjZClOmskKu/E8FW9BXzg9os8OLr4f8Dlnk0rYWJIWr4wv9eKUXiQvQwQ==}
+    peerDependencies:
+      react: '>=15.0.0'
+
+  undici-types@5.26.5:
+    resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==}
+
+  unicode-canonical-property-names-ecmascript@2.0.1:
+    resolution: {integrity: sha512-dA8WbNeb2a6oQzAQ55YlT5vQAWGV9WXOsi3SskE3bcCdM0P4SDd+24zS/OCacdRq5BkdsRj9q3Pg6YyQoxIGqg==}
+    engines: {node: '>=4'}
+
+  unicode-match-property-ecmascript@2.0.0:
+    resolution: {integrity: sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==}
+    engines: {node: '>=4'}
+
+  unicode-match-property-value-ecmascript@2.2.1:
+    resolution: {integrity: sha512-JQ84qTuMg4nVkx8ga4A16a1epI9H6uTXAknqxkGF/aFfRLw1xC/Bp24HNLaZhHSkWd3+84t8iXnp1J0kYcZHhg==}
+    engines: {node: '>=4'}
+
+  unicode-property-aliases-ecmascript@2.2.0:
+    resolution: {integrity: sha512-hpbDzxUY9BFwX+UeBnxv3Sh1q7HFxj48DTmXchNgRa46lO8uj3/1iEn3MiNUYTg1g9ctIqXCCERn8gYZhHC5lQ==}
+    engines: {node: '>=4'}
+
+  unified@9.2.2:
+    resolution: {integrity: sha512-Sg7j110mtefBD+qunSLO1lqOEKdrwBFBrR6Qd8f4uwkhWNlbkaqwHse6e7QvD3AP/MNoJdEDLaf8OxYyoWgorQ==}
+
+  unist-builder@2.0.3:
+    resolution: {integrity: sha512-f98yt5pnlMWlzP539tPc4grGMsFaQQlP/vM396b00jngsiINumNmsY8rkXjfoi1c6QaM8nQ3vaGDuoKWbe/1Uw==}
+
+  unist-util-generated@1.1.6:
+    resolution: {integrity: sha512-cln2Mm1/CZzN5ttGK7vkoGw+RZ8VcUH6BtGbq98DDtRGquAAOXig1mrBQYelOwMXYS8rK+vZDyyojSjp7JX+Lg==}
+
+  unist-util-is@3.0.0:
+    resolution: {integrity: sha512-sVZZX3+kspVNmLWBPAB6r+7D9ZgAFPNWm66f7YNb420RlQSbn+n8rG8dGZSkrER7ZIXGQYNm5pqC3v3HopH24A==}
+
+  unist-util-is@4.1.0:
+    resolution: {integrity: sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg==}
+
+  unist-util-position@3.1.0:
+    resolution: {integrity: sha512-w+PkwCbYSFw8vpgWD0v7zRCl1FpY3fjDSQ3/N/wNd9Ffa4gPi8+4keqt99N3XW6F99t/mUzp2xAhNmfKWp95QA==}
+
+  unist-util-stringify-position@2.0.3:
+    resolution: {integrity: sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==}
+
+  unist-util-visit-parents@2.1.2:
+    resolution: {integrity: sha512-DyN5vD4NE3aSeB+PXYNKxzGsfocxp6asDc2XXE3b0ekO2BaRUpBicbbUygfSvYfUz1IkmjFR1YF7dPklraMZ2g==}
+
+  unist-util-visit-parents@3.1.1:
+    resolution: {integrity: sha512-1KROIZWo6bcMrZEwiH2UrXDyalAa0uqzWCxCJj6lPOvTve2WkfgCytoDTPaMnodXh1WrXOq0haVYHj99ynJlsg==}
+
+  unist-util-visit@1.4.1:
+    resolution: {integrity: sha512-AvGNk7Bb//EmJZyhtRUnNMEpId/AZ5Ph/KUpTI09WHQuDZHKovQ1oEv3mfmKpWKtoMzyMC4GLBm1Zy5k12fjIw==}
+
+  unist-util-visit@2.0.3:
+    resolution: {integrity: sha512-iJ4/RczbJMkD0712mGktuGpm/U4By4FfDonL7N/9tATGIF4imikjOuagyMY53tnZq3NP6BcmlrHhEKAfGWjh7Q==}
+
+  universal-cookie@4.0.4:
+    resolution: {integrity: sha512-lbRVHoOMtItjWbM7TwDLdl8wug7izB0tq3/YVKhT/ahB4VDvWMyvnADfnJI8y6fSvsjh51Ix7lTGC6Tn4rMPhw==}
+
+  universalify@2.0.1:
+    resolution: {integrity: sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==}
+    engines: {node: '>= 10.0.0'}
+
+  unixify@1.0.0:
+    resolution: {integrity: sha512-6bc58dPYhCMHHuwxldQxO3RRNZ4eCogZ/st++0+fcC1nr0jiGUtAdBJ2qzmLQWSxbtz42pWt4QQMiZ9HvZf5cg==}
+    engines: {node: '>=0.10.0'}
+
+  update-browserslist-db@1.1.3:
+    resolution: {integrity: sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==}
+    hasBin: true
+    peerDependencies:
+      browserslist: '>= 4.21.0'
+
+  upper-case-first@2.0.2:
+    resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
+
+  upper-case@2.0.2:
+    resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
+
+  uri-js@4.4.1:
+    resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==}
+
+  url-toolkit@2.2.5:
+    resolution: {integrity: sha512-mtN6xk+Nac+oyJ/PrI7tzfmomRVNFIWKUbG8jdYFt52hxbiReFAXIjYskvu64/dvuW71IcB7lV8l0HvZMac6Jg==}
+
+  urlpattern-polyfill@10.1.0:
+    resolution: {integrity: sha512-IGjKp/o0NL3Bso1PymYURCJxMPNAf/ILOpendP9f5B6e1rTJgdgiOvgfoT8VxCAdY+Wisb9uhGaJJf3yZ2V9nw==}
+
+  use-isomorphic-layout-effect@1.2.1:
+    resolution: {integrity: sha512-tpZZ+EX0gaghDAiFR37hj5MgY6ZN55kLiPkJsKxBMZ6GZdOSPJXiOzPM984oPYZ5AnehYx5WQp1+ME8I/P/pRA==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  util-deprecate@1.0.2:
+    resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==}
+
+  v8-compile-cache-lib@3.0.1:
+    resolution: {integrity: sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==}
+
+  validate-npm-package-license@3.0.4:
+    resolution: {integrity: sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==}
+
+  value-equal@1.0.1:
+    resolution: {integrity: sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw==}
+
+  vfile-message@2.0.4:
+    resolution: {integrity: sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==}
+
+  vfile@4.2.1:
+    resolution: {integrity: sha512-O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA==}
+
+  video.js@7.21.7:
+    resolution: {integrity: sha512-T2s3WFAht7Zjr2OSJamND9x9Dn2O+Z5WuHGdh8jI5SYh5mkMdVTQ7vSRmA5PYpjXJ2ycch6jpMjkJEIEU2xxqw==}
+
+  videojs-abloop@1.2.0:
+    resolution: {integrity: sha512-6/hvtB5gNQUr5FJ969UhXVg5H+3wxhOzh9AVftlezOXlhzzaWfNfiOJYqNKo01Gc/eSQOvfttrOX7jH+aHpwrw==}
+
+  videojs-contrib-dash@5.1.1:
+    resolution: {integrity: sha512-MI0kPHuQ3KH9Mc2mLVLqvFKCoEyTfXzHc02fm8pqMk8v7LXrJKnIv9xfugBccRF7vZHDZISftedD/CmEJfvvrA==}
+
+  videojs-font@3.2.0:
+    resolution: {integrity: sha512-g8vHMKK2/JGorSfqAZQUmYYNnXmfec4MLhwtEFS+mMs2IDY398GLysy6BH6K+aS1KMNu/xWZ8Sue/X/mdQPliA==}
+
+  videojs-mobile-ui@0.8.0:
+    resolution: {integrity: sha512-Jd+u/ctjUkbZlT1cAA0umTu0LQwSZSFG+02cJxShuwq27B6rfrRALETK/gsuTc7U27lB9fbwcF7HBMaNxW62nA==}
+    engines: {node: '>=14', npm: '>=6'}
+    peerDependencies:
+      video.js: ^6 || ^7
+
+  videojs-seek-buttons@3.0.1:
+    resolution: {integrity: sha512-scVWOqCMqHajlbwYZIzJ5nBYkDXTAhEpWjfcdCu8ykksA1barrKnEKdQvS84TtDWOx6UXDD/e/x0acYEZCDMEQ==}
+    engines: {node: '>=14', npm: '>=6'}
+    peerDependencies:
+      video.js: ^6 || ^7
+
+  videojs-vr@1.8.0:
+    resolution: {integrity: sha512-776gXqt8g6/rLeV56nn/aUcO0sRy+mgFITCw8cIqzTzl93SE1PEK/QE3YNqtppUfU5igayrx7WKsWhDOpsXMpw==}
+
+  videojs-vtt.js@0.15.5:
+    resolution: {integrity: sha512-yZbBxvA7QMYn15Lr/ZfhhLPrNpI/RmCSCqgIff57GC2gIrV5YfyzLfLyZMj0NnZSAz8syB4N0nHXpZg9MyrMOQ==}
+
+  vite-plugin-compression@0.5.1:
+    resolution: {integrity: sha512-5QJKBDc+gNYVqL/skgFAP81Yuzo9R+EAf19d+EtsMF/i8kFUpNi3J/H01QD3Oo8zBQn+NzoCIFkpPLynoOzaJg==}
+    peerDependencies:
+      vite: '>=2.0.0'
+
+  vite-tsconfig-paths@4.3.2:
+    resolution: {integrity: sha512-0Vd/a6po6Q+86rPlntHye7F31zA2URZMbH8M3saAZ/xR9QoGN/L21bxEGfXdWmFdNkqPpRdxFT7nmNe12e9/uA==}
+    peerDependencies:
+      vite: '*'
+    peerDependenciesMeta:
+      vite:
+        optional: true
+
+  vite@4.5.14:
+    resolution: {integrity: sha512-+v57oAaoYNnO3hIu5Z/tJRZjq5aHM2zDve9YZ8HngVHbhk66RStobhb1sqPMIPEleV6cNKYK4eGrAbE9Ulbl2g==}
+    engines: {node: ^14.18.0 || >=16.0.0}
+    hasBin: true
+    peerDependencies:
+      '@types/node': '>= 14'
+      less: '*'
+      lightningcss: ^1.21.0
+      sass: '*'
+      stylus: '*'
+      sugarss: '*'
+      terser: ^5.4.0
+    peerDependenciesMeta:
+      '@types/node':
+        optional: true
+      less:
+        optional: true
+      lightningcss:
+        optional: true
+      sass:
+        optional: true
+      stylus:
+        optional: true
+      sugarss:
+        optional: true
+      terser:
+        optional: true
+
+  warning@4.0.3:
+    resolution: {integrity: sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==}
+
+  wcwidth@1.0.1:
+    resolution: {integrity: sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==}
+
+  web-namespaces@1.1.4:
+    resolution: {integrity: sha512-wYxSGajtmoP4WxfejAPIr4l0fVh+jeMXZb08wNc0tMg6xsfZXj3cECqIK0G7ZAqUq0PP8WlMDtaOGVBTAWztNw==}
+
+  web-streams-polyfill@3.3.3:
+    resolution: {integrity: sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw==}
+    engines: {node: '>= 8'}
+
+  webcomponents.js@https://codeload.github.com/webcomponents/webcomponentsjs/tar.gz/8a2e40557b177e2cca0def2553f84c8269c8f93e:
+    resolution: {tarball: https://codeload.github.com/webcomponents/webcomponentsjs/tar.gz/8a2e40557b177e2cca0def2553f84c8269c8f93e}
+    version: 0.7.24
+
+  webidl-conversions@3.0.1:
+    resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==}
+
+  webvr-polyfill-dpdb@1.0.18:
+    resolution: {integrity: sha512-O0S1ZGEWyPvyZEkS2VbyV7mtir/NM9MNK3EuhbHPoJ8EHTky2pTXehjIl+IiDPr+Lldgx129QGt3NGly7rwRPw==}
+
+  webvr-polyfill@0.10.12:
+    resolution: {integrity: sha512-trDJEVUQnRIVAnmImjEQ0BlL1NfuWl8+eaEdu+bs4g59c7OtETi/5tFkgEFDRaWEYwHntXs/uFF3OXZuutNGGA==}
+
+  whatwg-mimetype@4.0.0:
+    resolution: {integrity: sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==}
+    engines: {node: '>=18'}
+
+  whatwg-url@5.0.0:
+    resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==}
+
+  which-boxed-primitive@1.1.1:
+    resolution: {integrity: sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==}
+    engines: {node: '>= 0.4'}
+
+  which-builtin-type@1.2.1:
+    resolution: {integrity: sha512-6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q==}
+    engines: {node: '>= 0.4'}
+
+  which-collection@1.0.2:
+    resolution: {integrity: sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==}
+    engines: {node: '>= 0.4'}
+
+  which-module@2.0.1:
+    resolution: {integrity: sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==}
+
+  which-typed-array@1.1.19:
+    resolution: {integrity: sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==}
+    engines: {node: '>= 0.4'}
+
+  which@1.3.1:
+    resolution: {integrity: sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==}
+    hasBin: true
+
+  which@2.0.2:
+    resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==}
+    engines: {node: '>= 8'}
+    hasBin: true
+
+  word-wrap@1.2.5:
+    resolution: {integrity: sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==}
+    engines: {node: '>=0.10.0'}
+
+  wrap-ansi@6.2.0:
+    resolution: {integrity: sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==}
+    engines: {node: '>=8'}
+
+  wrap-ansi@7.0.0:
+    resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==}
+    engines: {node: '>=10'}
+
+  wrappy@1.0.2:
+    resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==}
+
+  write-file-atomic@3.0.3:
+    resolution: {integrity: sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==}
+
+  write-file-atomic@5.0.1:
+    resolution: {integrity: sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==}
+    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
+
+  write-json-file@4.3.0:
+    resolution: {integrity: sha512-PxiShnxf0IlnQuMYOPPhPkhExoCQuTUNPOa/2JWCYTmBquU9njyyDuwRKN26IZBlp4yn1nt+Agh2HOOBl+55HQ==}
+    engines: {node: '>=8.3'}
+
+  ws@8.18.3:
+    resolution: {integrity: sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==}
+    engines: {node: '>=10.0.0'}
+    peerDependencies:
+      bufferutil: ^4.0.1
+      utf-8-validate: '>=5.0.2'
+    peerDependenciesMeta:
+      bufferutil:
+        optional: true
+      utf-8-validate:
+        optional: true
+
+  xtend@4.0.2:
+    resolution: {integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==}
+    engines: {node: '>=0.4'}
+
+  y18n@4.0.3:
+    resolution: {integrity: sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==}
+
+  y18n@5.0.8:
+    resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==}
+    engines: {node: '>=10'}
+
+  yallist@3.1.1:
+    resolution: {integrity: sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==}
+
+  yallist@4.0.0:
+    resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==}
+
+  yaml-ast-parser@0.0.43:
+    resolution: {integrity: sha512-2PTINUwsRqSd+s8XxKaJWQlUuEMHJQyEuh2edBbW8KNJz0SJPwUSD2zRWqezFEdN7IzAgeuYHFUCF7o8zRdZ0A==}
+
+  yaml@1.10.2:
+    resolution: {integrity: sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==}
+    engines: {node: '>= 6'}
+
+  yaml@2.8.1:
+    resolution: {integrity: sha512-lcYcMxX2PO9XMGvAJkJ3OsNMw+/7FKes7/hgerGUYWIoWu5j/+YQqcZr5JnPZWzOsEBgMbSbiSTn/dv/69Mkpw==}
+    engines: {node: '>= 14.6'}
+    hasBin: true
+
+  yargs-parser@18.1.3:
+    resolution: {integrity: sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==}
+    engines: {node: '>=6'}
+
+  yargs-parser@20.2.9:
+    resolution: {integrity: sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==}
+    engines: {node: '>=10'}
+
+  yargs-parser@21.1.1:
+    resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==}
+    engines: {node: '>=12'}
+
+  yargs@15.4.1:
+    resolution: {integrity: sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==}
+    engines: {node: '>=8'}
+
+  yargs@17.7.2:
+    resolution: {integrity: sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==}
+    engines: {node: '>=12'}
+
+  yn@3.1.1:
+    resolution: {integrity: sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==}
+    engines: {node: '>=6'}
+
+  yocto-queue@0.1.0:
+    resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
+    engines: {node: '>=10'}
+
+  yup@1.7.1:
+    resolution: {integrity: sha512-GKHFX2nXul2/4Dtfxhozv701jLQHdf6J34YDh2cEkpqoo8le5Mg6/LrdseVLrFarmFygZTlfIhHx/QKfb/QWXw==}
+
+  zen-observable-ts@1.2.5:
+    resolution: {integrity: sha512-QZWQekv6iB72Naeake9hS1KxHlotfRpe+WGNbNx5/ta+R3DNjVO2bswf63gXlWDcs+EMd7XY8HfVQyP1X6T4Zg==}
+
+  zen-observable@0.8.15:
+    resolution: {integrity: sha512-PQ2PC7R9rslx84ndNBZB/Dkv8V8fZEpk83RLgXtYd0fwUgEjseMn1Dgajh2x6S8QbZAFa9p2qVCEuYZNgve0dQ==}
+
+  zwitch@1.0.5:
+    resolution: {integrity: sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==}
+
+snapshots:
+
+  '@ant-design/react-slick@1.1.2(react@17.0.2)':
+    dependencies:
+      '@babel/runtime': 7.28.4
+      classnames: 2.5.1
+      json2mq: 0.2.0
+      react: 17.0.2
+      resize-observer-polyfill: 1.5.1
+      throttle-debounce: 5.0.2
+
+  '@apollo/client@3.14.0(@types/react@17.0.89)(graphql-ws@5.16.2(graphql@16.11.0))(graphql@16.11.0)(react-dom@17.0.2(react@17.0.2))(react@17.0.2)':
+    dependencies:
+      '@graphql-typed-document-node/core': 3.2.0(graphql@16.11.0)
+      '@wry/caches': 1.0.1
+      '@wry/equality': 0.5.7
+      '@wry/trie': 0.5.0
+      graphql: 16.11.0
+      graphql-tag: 2.12.6(graphql@16.11.0)
+      hoist-non-react-statics: 3.3.2
+      optimism: 0.18.1
+      prop-types: 15.8.1
+      rehackt: 0.1.0(@types/react@17.0.89)(react@17.0.2)
+      symbol-observable: 4.0.0
+      ts-invariant: 0.10.3
+      tslib: 2.8.1
+      zen-observable-ts: 1.2.5
+    optionalDependencies:
+      graphql-ws: 5.16.2(graphql@16.11.0)
+      react: 17.0.2
+      react-dom: 17.0.2(react@17.0.2)
+    transitivePeerDependencies:
+      - '@types/react'
+
+  '@ardatan/relay-compiler@12.0.0(graphql@16.11.0)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/generator': 7.28.3
+      '@babel/parser': 7.28.4
+      '@babel/runtime': 7.28.4
+      '@babel/traverse': 7.28.4
+      '@babel/types': 7.28.4
+      babel-preset-fbjs: 3.4.0(@babel/core@7.28.4)
+      chalk: 4.1.2
+      fb-watchman: 2.0.2
+      fbjs: 3.0.5
+      glob: 7.2.3
+      graphql: 16.11.0
+      immutable: 3.7.6
+      invariant: 2.2.4
+      nullthrows: 1.1.1
+      relay-runtime: 12.0.0
+      signedsource: 1.0.0
+      yargs: 15.4.1
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
+
+  '@ardatan/relay-compiler@12.0.3(graphql@16.11.0)':
+    dependencies:
+      '@babel/generator': 7.28.3
+      '@babel/parser': 7.28.4
+      '@babel/runtime': 7.28.4
+      chalk: 4.1.2
+      fb-watchman: 2.0.2
+      graphql: 16.11.0
+      immutable: 3.7.6
+      invariant: 2.2.4
+      nullthrows: 1.1.1
+      relay-runtime: 12.0.0
+      signedsource: 1.0.0
+    transitivePeerDependencies:
+      - encoding
+
+  '@babel/code-frame@7.27.1':
+    dependencies:
+      '@babel/helper-validator-identifier': 7.27.1
+      js-tokens: 4.0.0
+      picocolors: 1.1.1
+
+  '@babel/compat-data@7.28.4': {}
+
+  '@babel/core@7.28.4':
+    dependencies:
+      '@babel/code-frame': 7.27.1
+      '@babel/generator': 7.28.3
+      '@babel/helper-compilation-targets': 7.27.2
+      '@babel/helper-module-transforms': 7.28.3(@babel/core@7.28.4)
+      '@babel/helpers': 7.28.4
+      '@babel/parser': 7.28.4
+      '@babel/template': 7.27.2
+      '@babel/traverse': 7.28.4
+      '@babel/types': 7.28.4
+      '@jridgewell/remapping': 2.3.5
+      convert-source-map: 2.0.0
+      debug: 4.4.3
+      gensync: 1.0.0-beta.2
+      json5: 2.2.3
+      semver: 6.3.1
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/generator@7.28.3':
+    dependencies:
+      '@babel/parser': 7.28.4
+      '@babel/types': 7.28.4
+      '@jridgewell/gen-mapping': 0.3.13
+      '@jridgewell/trace-mapping': 0.3.31
+      jsesc: 3.1.0
+
+  '@babel/helper-annotate-as-pure@7.27.3':
+    dependencies:
+      '@babel/types': 7.28.4
+
+  '@babel/helper-compilation-targets@7.27.2':
+    dependencies:
+      '@babel/compat-data': 7.28.4
+      '@babel/helper-validator-option': 7.27.1
+      browserslist: 4.26.3
+      lru-cache: 5.1.1
+      semver: 6.3.1
+
+  '@babel/helper-create-class-features-plugin@7.28.3(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-annotate-as-pure': 7.27.3
+      '@babel/helper-member-expression-to-functions': 7.27.1
+      '@babel/helper-optimise-call-expression': 7.27.1
+      '@babel/helper-replace-supers': 7.27.1(@babel/core@7.28.4)
+      '@babel/helper-skip-transparent-expression-wrappers': 7.27.1
+      '@babel/traverse': 7.28.4
+      semver: 6.3.1
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/helper-create-regexp-features-plugin@7.27.1(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-annotate-as-pure': 7.27.3
+      regexpu-core: 6.4.0
+      semver: 6.3.1
+
+  '@babel/helper-define-polyfill-provider@0.6.5(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-compilation-targets': 7.27.2
+      '@babel/helper-plugin-utils': 7.27.1
+      debug: 4.4.3
+      lodash.debounce: 4.0.8
+      resolve: 1.22.11
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/helper-globals@7.28.0': {}
+
+  '@babel/helper-member-expression-to-functions@7.27.1':
+    dependencies:
+      '@babel/traverse': 7.28.4
+      '@babel/types': 7.28.4
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/helper-module-imports@7.27.1':
+    dependencies:
+      '@babel/traverse': 7.28.4
+      '@babel/types': 7.28.4
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/helper-module-transforms@7.28.3(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-module-imports': 7.27.1
+      '@babel/helper-validator-identifier': 7.27.1
+      '@babel/traverse': 7.28.4
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/helper-optimise-call-expression@7.27.1':
+    dependencies:
+      '@babel/types': 7.28.4
+
+  '@babel/helper-plugin-utils@7.27.1': {}
+
+  '@babel/helper-remap-async-to-generator@7.27.1(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-annotate-as-pure': 7.27.3
+      '@babel/helper-wrap-function': 7.28.3
+      '@babel/traverse': 7.28.4
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/helper-replace-supers@7.27.1(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-member-expression-to-functions': 7.27.1
+      '@babel/helper-optimise-call-expression': 7.27.1
+      '@babel/traverse': 7.28.4
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/helper-skip-transparent-expression-wrappers@7.27.1':
+    dependencies:
+      '@babel/traverse': 7.28.4
+      '@babel/types': 7.28.4
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/helper-string-parser@7.27.1': {}
+
+  '@babel/helper-validator-identifier@7.27.1': {}
+
+  '@babel/helper-validator-option@7.27.1': {}
+
+  '@babel/helper-wrap-function@7.28.3':
+    dependencies:
+      '@babel/template': 7.27.2
+      '@babel/traverse': 7.28.4
+      '@babel/types': 7.28.4
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/helpers@7.28.4':
+    dependencies:
+      '@babel/template': 7.27.2
+      '@babel/types': 7.28.4
+
+  '@babel/parser@7.28.4':
+    dependencies:
+      '@babel/types': 7.28.4
+
+  '@babel/plugin-bugfix-firefox-class-in-computed-class-key@7.27.1(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/traverse': 7.28.4
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-bugfix-safari-class-field-initializer-scope@7.27.1(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-plugin-utils': 7.27.1
+
+  '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.27.1(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-plugin-utils': 7.27.1
+
+  '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.27.1(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/helper-skip-transparent-expression-wrappers': 7.27.1
+      '@babel/plugin-transform-optional-chaining': 7.27.1(@babel/core@7.28.4)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@7.28.3(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/traverse': 7.28.4
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-proposal-class-properties@7.18.6(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-create-class-features-plugin': 7.28.3(@babel/core@7.28.4)
+      '@babel/helper-plugin-utils': 7.27.1
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-proposal-object-rest-spread@7.20.7(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/compat-data': 7.28.4
+      '@babel/core': 7.28.4
+      '@babel/helper-compilation-targets': 7.27.2
+      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.28.4)
+      '@babel/plugin-transform-parameters': 7.27.7(@babel/core@7.28.4)
+
+  '@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+
+  '@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-plugin-utils': 7.27.1
+
+  '@babel/plugin-syntax-flow@7.27.1(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-plugin-utils': 7.27.1
+
+  '@babel/plugin-syntax-import-assertions@7.27.1(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-plugin-utils': 7.27.1
+
+  '@babel/plugin-syntax-import-attributes@7.27.1(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-plugin-utils': 7.27.1
+
+  '@babel/plugin-syntax-jsx@7.27.1(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-plugin-utils': 7.27.1
+
+  '@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-plugin-utils': 7.27.1
+
+  '@babel/plugin-syntax-unicode-sets-regex@7.18.6(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-create-regexp-features-plugin': 7.27.1(@babel/core@7.28.4)
+      '@babel/helper-plugin-utils': 7.27.1
+
+  '@babel/plugin-transform-arrow-functions@7.27.1(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-plugin-utils': 7.27.1
+
+  '@babel/plugin-transform-async-generator-functions@7.28.0(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/helper-remap-async-to-generator': 7.27.1(@babel/core@7.28.4)
+      '@babel/traverse': 7.28.4
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-async-to-generator@7.27.1(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-module-imports': 7.27.1
+      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/helper-remap-async-to-generator': 7.27.1(@babel/core@7.28.4)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-block-scoped-functions@7.27.1(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-plugin-utils': 7.27.1
+
+  '@babel/plugin-transform-block-scoping@7.28.4(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-plugin-utils': 7.27.1
+
+  '@babel/plugin-transform-class-properties@7.27.1(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-create-class-features-plugin': 7.28.3(@babel/core@7.28.4)
+      '@babel/helper-plugin-utils': 7.27.1
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-class-static-block@7.28.3(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-create-class-features-plugin': 7.28.3(@babel/core@7.28.4)
+      '@babel/helper-plugin-utils': 7.27.1
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-classes@7.28.4(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-annotate-as-pure': 7.27.3
+      '@babel/helper-compilation-targets': 7.27.2
+      '@babel/helper-globals': 7.28.0
+      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/helper-replace-supers': 7.27.1(@babel/core@7.28.4)
+      '@babel/traverse': 7.28.4
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-computed-properties@7.27.1(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/template': 7.27.2
+
+  '@babel/plugin-transform-destructuring@7.28.0(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/traverse': 7.28.4
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-dotall-regex@7.27.1(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-create-regexp-features-plugin': 7.27.1(@babel/core@7.28.4)
+      '@babel/helper-plugin-utils': 7.27.1
+
+  '@babel/plugin-transform-duplicate-keys@7.27.1(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-plugin-utils': 7.27.1
+
+  '@babel/plugin-transform-duplicate-named-capturing-groups-regex@7.27.1(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-create-regexp-features-plugin': 7.27.1(@babel/core@7.28.4)
+      '@babel/helper-plugin-utils': 7.27.1
+
+  '@babel/plugin-transform-dynamic-import@7.27.1(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-plugin-utils': 7.27.1
+
+  '@babel/plugin-transform-explicit-resource-management@7.28.0(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/plugin-transform-destructuring': 7.28.0(@babel/core@7.28.4)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-exponentiation-operator@7.27.1(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-plugin-utils': 7.27.1
+
+  '@babel/plugin-transform-export-namespace-from@7.27.1(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-plugin-utils': 7.27.1
+
+  '@babel/plugin-transform-flow-strip-types@7.27.1(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/plugin-syntax-flow': 7.27.1(@babel/core@7.28.4)
+
+  '@babel/plugin-transform-for-of@7.27.1(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/helper-skip-transparent-expression-wrappers': 7.27.1
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-function-name@7.27.1(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-compilation-targets': 7.27.2
+      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/traverse': 7.28.4
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-json-strings@7.27.1(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-plugin-utils': 7.27.1
+
+  '@babel/plugin-transform-literals@7.27.1(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-plugin-utils': 7.27.1
+
+  '@babel/plugin-transform-logical-assignment-operators@7.27.1(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-plugin-utils': 7.27.1
+
+  '@babel/plugin-transform-member-expression-literals@7.27.1(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-plugin-utils': 7.27.1
+
+  '@babel/plugin-transform-modules-amd@7.27.1(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-module-transforms': 7.28.3(@babel/core@7.28.4)
+      '@babel/helper-plugin-utils': 7.27.1
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-modules-commonjs@7.27.1(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-module-transforms': 7.28.3(@babel/core@7.28.4)
+      '@babel/helper-plugin-utils': 7.27.1
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-modules-systemjs@7.27.1(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-module-transforms': 7.28.3(@babel/core@7.28.4)
+      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/helper-validator-identifier': 7.27.1
+      '@babel/traverse': 7.28.4
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-modules-umd@7.27.1(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-module-transforms': 7.28.3(@babel/core@7.28.4)
+      '@babel/helper-plugin-utils': 7.27.1
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-named-capturing-groups-regex@7.27.1(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-create-regexp-features-plugin': 7.27.1(@babel/core@7.28.4)
+      '@babel/helper-plugin-utils': 7.27.1
+
+  '@babel/plugin-transform-new-target@7.27.1(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-plugin-utils': 7.27.1
+
+  '@babel/plugin-transform-nullish-coalescing-operator@7.27.1(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-plugin-utils': 7.27.1
+
+  '@babel/plugin-transform-numeric-separator@7.27.1(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-plugin-utils': 7.27.1
+
+  '@babel/plugin-transform-object-rest-spread@7.28.4(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-compilation-targets': 7.27.2
+      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/plugin-transform-destructuring': 7.28.0(@babel/core@7.28.4)
+      '@babel/plugin-transform-parameters': 7.27.7(@babel/core@7.28.4)
+      '@babel/traverse': 7.28.4
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-object-super@7.27.1(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/helper-replace-supers': 7.27.1(@babel/core@7.28.4)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-optional-catch-binding@7.27.1(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-plugin-utils': 7.27.1
+
+  '@babel/plugin-transform-optional-chaining@7.27.1(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/helper-skip-transparent-expression-wrappers': 7.27.1
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-parameters@7.27.7(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-plugin-utils': 7.27.1
+
+  '@babel/plugin-transform-private-methods@7.27.1(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-create-class-features-plugin': 7.28.3(@babel/core@7.28.4)
+      '@babel/helper-plugin-utils': 7.27.1
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-private-property-in-object@7.27.1(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-annotate-as-pure': 7.27.3
+      '@babel/helper-create-class-features-plugin': 7.28.3(@babel/core@7.28.4)
+      '@babel/helper-plugin-utils': 7.27.1
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-property-literals@7.27.1(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-plugin-utils': 7.27.1
+
+  '@babel/plugin-transform-react-display-name@7.28.0(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-plugin-utils': 7.27.1
+
+  '@babel/plugin-transform-react-jsx-self@7.27.1(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-plugin-utils': 7.27.1
+
+  '@babel/plugin-transform-react-jsx-source@7.27.1(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-plugin-utils': 7.27.1
+
+  '@babel/plugin-transform-react-jsx@7.27.1(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-annotate-as-pure': 7.27.3
+      '@babel/helper-module-imports': 7.27.1
+      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/plugin-syntax-jsx': 7.27.1(@babel/core@7.28.4)
+      '@babel/types': 7.28.4
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-regenerator@7.28.4(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-plugin-utils': 7.27.1
+
+  '@babel/plugin-transform-regexp-modifiers@7.27.1(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-create-regexp-features-plugin': 7.27.1(@babel/core@7.28.4)
+      '@babel/helper-plugin-utils': 7.27.1
+
+  '@babel/plugin-transform-reserved-words@7.27.1(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-plugin-utils': 7.27.1
+
+  '@babel/plugin-transform-shorthand-properties@7.27.1(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-plugin-utils': 7.27.1
+
+  '@babel/plugin-transform-spread@7.27.1(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/helper-skip-transparent-expression-wrappers': 7.27.1
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-sticky-regex@7.27.1(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-plugin-utils': 7.27.1
+
+  '@babel/plugin-transform-template-literals@7.27.1(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-plugin-utils': 7.27.1
+
+  '@babel/plugin-transform-typeof-symbol@7.27.1(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-plugin-utils': 7.27.1
+
+  '@babel/plugin-transform-unicode-escapes@7.27.1(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-plugin-utils': 7.27.1
+
+  '@babel/plugin-transform-unicode-property-regex@7.27.1(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-create-regexp-features-plugin': 7.27.1(@babel/core@7.28.4)
+      '@babel/helper-plugin-utils': 7.27.1
+
+  '@babel/plugin-transform-unicode-regex@7.27.1(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-create-regexp-features-plugin': 7.27.1(@babel/core@7.28.4)
+      '@babel/helper-plugin-utils': 7.27.1
+
+  '@babel/plugin-transform-unicode-sets-regex@7.27.1(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-create-regexp-features-plugin': 7.27.1(@babel/core@7.28.4)
+      '@babel/helper-plugin-utils': 7.27.1
+
+  '@babel/preset-env@7.28.3(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/compat-data': 7.28.4
+      '@babel/core': 7.28.4
+      '@babel/helper-compilation-targets': 7.27.2
+      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/helper-validator-option': 7.27.1
+      '@babel/plugin-bugfix-firefox-class-in-computed-class-key': 7.27.1(@babel/core@7.28.4)
+      '@babel/plugin-bugfix-safari-class-field-initializer-scope': 7.27.1(@babel/core@7.28.4)
+      '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression': 7.27.1(@babel/core@7.28.4)
+      '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.27.1(@babel/core@7.28.4)
+      '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly': 7.28.3(@babel/core@7.28.4)
+      '@babel/plugin-proposal-private-property-in-object': 7.21.0-placeholder-for-preset-env.2(@babel/core@7.28.4)
+      '@babel/plugin-syntax-import-assertions': 7.27.1(@babel/core@7.28.4)
+      '@babel/plugin-syntax-import-attributes': 7.27.1(@babel/core@7.28.4)
+      '@babel/plugin-syntax-unicode-sets-regex': 7.18.6(@babel/core@7.28.4)
+      '@babel/plugin-transform-arrow-functions': 7.27.1(@babel/core@7.28.4)
+      '@babel/plugin-transform-async-generator-functions': 7.28.0(@babel/core@7.28.4)
+      '@babel/plugin-transform-async-to-generator': 7.27.1(@babel/core@7.28.4)
+      '@babel/plugin-transform-block-scoped-functions': 7.27.1(@babel/core@7.28.4)
+      '@babel/plugin-transform-block-scoping': 7.28.4(@babel/core@7.28.4)
+      '@babel/plugin-transform-class-properties': 7.27.1(@babel/core@7.28.4)
+      '@babel/plugin-transform-class-static-block': 7.28.3(@babel/core@7.28.4)
+      '@babel/plugin-transform-classes': 7.28.4(@babel/core@7.28.4)
+      '@babel/plugin-transform-computed-properties': 7.27.1(@babel/core@7.28.4)
+      '@babel/plugin-transform-destructuring': 7.28.0(@babel/core@7.28.4)
+      '@babel/plugin-transform-dotall-regex': 7.27.1(@babel/core@7.28.4)
+      '@babel/plugin-transform-duplicate-keys': 7.27.1(@babel/core@7.28.4)
+      '@babel/plugin-transform-duplicate-named-capturing-groups-regex': 7.27.1(@babel/core@7.28.4)
+      '@babel/plugin-transform-dynamic-import': 7.27.1(@babel/core@7.28.4)
+      '@babel/plugin-transform-explicit-resource-management': 7.28.0(@babel/core@7.28.4)
+      '@babel/plugin-transform-exponentiation-operator': 7.27.1(@babel/core@7.28.4)
+      '@babel/plugin-transform-export-namespace-from': 7.27.1(@babel/core@7.28.4)
+      '@babel/plugin-transform-for-of': 7.27.1(@babel/core@7.28.4)
+      '@babel/plugin-transform-function-name': 7.27.1(@babel/core@7.28.4)
+      '@babel/plugin-transform-json-strings': 7.27.1(@babel/core@7.28.4)
+      '@babel/plugin-transform-literals': 7.27.1(@babel/core@7.28.4)
+      '@babel/plugin-transform-logical-assignment-operators': 7.27.1(@babel/core@7.28.4)
+      '@babel/plugin-transform-member-expression-literals': 7.27.1(@babel/core@7.28.4)
+      '@babel/plugin-transform-modules-amd': 7.27.1(@babel/core@7.28.4)
+      '@babel/plugin-transform-modules-commonjs': 7.27.1(@babel/core@7.28.4)
+      '@babel/plugin-transform-modules-systemjs': 7.27.1(@babel/core@7.28.4)
+      '@babel/plugin-transform-modules-umd': 7.27.1(@babel/core@7.28.4)
+      '@babel/plugin-transform-named-capturing-groups-regex': 7.27.1(@babel/core@7.28.4)
+      '@babel/plugin-transform-new-target': 7.27.1(@babel/core@7.28.4)
+      '@babel/plugin-transform-nullish-coalescing-operator': 7.27.1(@babel/core@7.28.4)
+      '@babel/plugin-transform-numeric-separator': 7.27.1(@babel/core@7.28.4)
+      '@babel/plugin-transform-object-rest-spread': 7.28.4(@babel/core@7.28.4)
+      '@babel/plugin-transform-object-super': 7.27.1(@babel/core@7.28.4)
+      '@babel/plugin-transform-optional-catch-binding': 7.27.1(@babel/core@7.28.4)
+      '@babel/plugin-transform-optional-chaining': 7.27.1(@babel/core@7.28.4)
+      '@babel/plugin-transform-parameters': 7.27.7(@babel/core@7.28.4)
+      '@babel/plugin-transform-private-methods': 7.27.1(@babel/core@7.28.4)
+      '@babel/plugin-transform-private-property-in-object': 7.27.1(@babel/core@7.28.4)
+      '@babel/plugin-transform-property-literals': 7.27.1(@babel/core@7.28.4)
+      '@babel/plugin-transform-regenerator': 7.28.4(@babel/core@7.28.4)
+      '@babel/plugin-transform-regexp-modifiers': 7.27.1(@babel/core@7.28.4)
+      '@babel/plugin-transform-reserved-words': 7.27.1(@babel/core@7.28.4)
+      '@babel/plugin-transform-shorthand-properties': 7.27.1(@babel/core@7.28.4)
+      '@babel/plugin-transform-spread': 7.27.1(@babel/core@7.28.4)
+      '@babel/plugin-transform-sticky-regex': 7.27.1(@babel/core@7.28.4)
+      '@babel/plugin-transform-template-literals': 7.27.1(@babel/core@7.28.4)
+      '@babel/plugin-transform-typeof-symbol': 7.27.1(@babel/core@7.28.4)
+      '@babel/plugin-transform-unicode-escapes': 7.27.1(@babel/core@7.28.4)
+      '@babel/plugin-transform-unicode-property-regex': 7.27.1(@babel/core@7.28.4)
+      '@babel/plugin-transform-unicode-regex': 7.27.1(@babel/core@7.28.4)
+      '@babel/plugin-transform-unicode-sets-regex': 7.27.1(@babel/core@7.28.4)
+      '@babel/preset-modules': 0.1.6-no-external-plugins(@babel/core@7.28.4)
+      babel-plugin-polyfill-corejs2: 0.4.14(@babel/core@7.28.4)
+      babel-plugin-polyfill-corejs3: 0.13.0(@babel/core@7.28.4)
+      babel-plugin-polyfill-regenerator: 0.6.5(@babel/core@7.28.4)
+      core-js-compat: 3.46.0
+      semver: 6.3.1
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/preset-modules@0.1.6-no-external-plugins(@babel/core@7.28.4)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/types': 7.28.4
+      esutils: 2.0.3
+
+  '@babel/runtime@7.28.4': {}
+
+  '@babel/template@7.27.2':
+    dependencies:
+      '@babel/code-frame': 7.27.1
+      '@babel/parser': 7.28.4
+      '@babel/types': 7.28.4
+
+  '@babel/traverse@7.28.4':
+    dependencies:
+      '@babel/code-frame': 7.27.1
+      '@babel/generator': 7.28.3
+      '@babel/helper-globals': 7.28.0
+      '@babel/parser': 7.28.4
+      '@babel/template': 7.27.2
+      '@babel/types': 7.28.4
+      debug: 4.4.3
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/types@7.28.4':
+    dependencies:
+      '@babel/helper-string-parser': 7.27.1
+      '@babel/helper-validator-identifier': 7.27.1
+
+  '@cspotcode/source-map-support@0.8.1':
+    dependencies:
+      '@jridgewell/trace-mapping': 0.3.9
+
+  '@csstools/css-parser-algorithms@2.7.1(@csstools/css-tokenizer@2.4.1)':
+    dependencies:
+      '@csstools/css-tokenizer': 2.4.1
+
+  '@csstools/css-tokenizer@2.4.1': {}
+
+  '@csstools/media-query-list-parser@2.1.13(@csstools/css-parser-algorithms@2.7.1(@csstools/css-tokenizer@2.4.1))(@csstools/css-tokenizer@2.4.1)':
+    dependencies:
+      '@csstools/css-parser-algorithms': 2.7.1(@csstools/css-tokenizer@2.4.1)
+      '@csstools/css-tokenizer': 2.4.1
+
+  '@csstools/selector-specificity@3.1.1(postcss-selector-parser@6.1.2)':
+    dependencies:
+      postcss-selector-parser: 6.1.2
+
+  '@emotion/babel-plugin@11.13.5':
+    dependencies:
+      '@babel/helper-module-imports': 7.27.1
+      '@babel/runtime': 7.28.4
+      '@emotion/hash': 0.9.2
+      '@emotion/memoize': 0.9.0
+      '@emotion/serialize': 1.3.3
+      babel-plugin-macros: 3.1.0
+      convert-source-map: 1.9.0
+      escape-string-regexp: 4.0.0
+      find-root: 1.1.0
+      source-map: 0.5.7
+      stylis: 4.2.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@emotion/cache@11.14.0':
+    dependencies:
+      '@emotion/memoize': 0.9.0
+      '@emotion/sheet': 1.4.0
+      '@emotion/utils': 1.4.2
+      '@emotion/weak-memoize': 0.4.0
+      stylis: 4.2.0
+
+  '@emotion/hash@0.9.2': {}
+
+  '@emotion/memoize@0.9.0': {}
+
+  '@emotion/react@11.14.0(@types/react@17.0.89)(react@17.0.2)':
+    dependencies:
+      '@babel/runtime': 7.28.4
+      '@emotion/babel-plugin': 11.13.5
+      '@emotion/cache': 11.14.0
+      '@emotion/serialize': 1.3.3
+      '@emotion/use-insertion-effect-with-fallbacks': 1.2.0(react@17.0.2)
+      '@emotion/utils': 1.4.2
+      '@emotion/weak-memoize': 0.4.0
+      hoist-non-react-statics: 3.3.2
+      react: 17.0.2
+    optionalDependencies:
+      '@types/react': 17.0.89
+    transitivePeerDependencies:
+      - supports-color
+
+  '@emotion/serialize@1.3.3':
+    dependencies:
+      '@emotion/hash': 0.9.2
+      '@emotion/memoize': 0.9.0
+      '@emotion/unitless': 0.10.0
+      '@emotion/utils': 1.4.2
+      csstype: 3.1.3
+
+  '@emotion/sheet@1.4.0': {}
+
+  '@emotion/unitless@0.10.0': {}
+
+  '@emotion/use-insertion-effect-with-fallbacks@1.2.0(react@17.0.2)':
+    dependencies:
+      react: 17.0.2
+
+  '@emotion/utils@1.4.2': {}
+
+  '@emotion/weak-memoize@0.4.0': {}
+
+  '@envelop/core@5.3.2':
+    dependencies:
+      '@envelop/instrumentation': 1.0.0
+      '@envelop/types': 5.2.1
+      '@whatwg-node/promise-helpers': 1.3.2
+      tslib: 2.8.1
+
+  '@envelop/instrumentation@1.0.0':
+    dependencies:
+      '@whatwg-node/promise-helpers': 1.3.2
+      tslib: 2.8.1
+
+  '@envelop/types@5.2.1':
+    dependencies:
+      '@whatwg-node/promise-helpers': 1.3.2
+      tslib: 2.8.1
+
+  '@esbuild/android-arm64@0.18.20':
+    optional: true
+
+  '@esbuild/android-arm@0.18.20':
+    optional: true
+
+  '@esbuild/android-x64@0.18.20':
+    optional: true
+
+  '@esbuild/darwin-arm64@0.18.20':
+    optional: true
+
+  '@esbuild/darwin-x64@0.18.20':
+    optional: true
+
+  '@esbuild/freebsd-arm64@0.18.20':
+    optional: true
+
+  '@esbuild/freebsd-x64@0.18.20':
+    optional: true
+
+  '@esbuild/linux-arm64@0.18.20':
+    optional: true
+
+  '@esbuild/linux-arm@0.18.20':
+    optional: true
+
+  '@esbuild/linux-ia32@0.18.20':
+    optional: true
+
+  '@esbuild/linux-loong64@0.18.20':
+    optional: true
+
+  '@esbuild/linux-mips64el@0.18.20':
+    optional: true
+
+  '@esbuild/linux-ppc64@0.18.20':
+    optional: true
+
+  '@esbuild/linux-riscv64@0.18.20':
+    optional: true
+
+  '@esbuild/linux-s390x@0.18.20':
+    optional: true
+
+  '@esbuild/linux-x64@0.18.20':
+    optional: true
+
+  '@esbuild/netbsd-x64@0.18.20':
+    optional: true
+
+  '@esbuild/openbsd-x64@0.18.20':
+    optional: true
+
+  '@esbuild/sunos-x64@0.18.20':
+    optional: true
+
+  '@esbuild/win32-arm64@0.18.20':
+    optional: true
+
+  '@esbuild/win32-ia32@0.18.20':
+    optional: true
+
+  '@esbuild/win32-x64@0.18.20':
+    optional: true
+
+  '@eslint-community/eslint-utils@4.9.0(eslint@8.57.1)':
+    dependencies:
+      eslint: 8.57.1
+      eslint-visitor-keys: 3.4.3
+
+  '@eslint-community/regexpp@4.12.1': {}
+
+  '@eslint/eslintrc@2.1.4':
+    dependencies:
+      ajv: 6.12.6
+      debug: 4.4.3
+      espree: 9.6.1
+      globals: 13.24.0
+      ignore: 5.3.2
+      import-fresh: 3.3.1
+      js-yaml: 4.1.0
+      minimatch: 3.1.2
+      strip-json-comments: 3.1.1
+    transitivePeerDependencies:
+      - supports-color
+
+  '@eslint/js@8.57.1': {}
+
+  '@fastify/busboy@3.2.0': {}
+
+  '@floating-ui/core@1.7.3':
+    dependencies:
+      '@floating-ui/utils': 0.2.10
+
+  '@floating-ui/dom@1.7.4':
+    dependencies:
+      '@floating-ui/core': 1.7.3
+      '@floating-ui/utils': 0.2.10
+
+  '@floating-ui/utils@0.2.10': {}
+
+  '@formatjs/ecma402-abstract@1.18.3':
+    dependencies:
+      '@formatjs/intl-localematcher': 0.5.4
+      tslib: 2.8.1
+
+  '@formatjs/ecma402-abstract@1.4.0':
+    dependencies:
+      tslib: 2.8.1
+
+  '@formatjs/ecma402-abstract@1.5.0':
+    dependencies:
+      tslib: 2.8.1
+
+  '@formatjs/ecma402-abstract@2.2.4':
+    dependencies:
+      '@formatjs/fast-memoize': 2.2.3
+      '@formatjs/intl-localematcher': 0.5.8
+      tslib: 2.8.1
+
+  '@formatjs/ecma402-abstract@2.3.6':
+    dependencies:
+      '@formatjs/fast-memoize': 2.2.7
+      '@formatjs/intl-localematcher': 0.6.2
+      decimal.js: 10.6.0
+      tslib: 2.8.1
+
+  '@formatjs/fast-memoize@2.2.3':
+    dependencies:
+      tslib: 2.8.1
+
+  '@formatjs/fast-memoize@2.2.7':
+    dependencies:
+      tslib: 2.8.1
+
+  '@formatjs/icu-messageformat-parser@2.9.4':
+    dependencies:
+      '@formatjs/ecma402-abstract': 2.2.4
+      '@formatjs/icu-skeleton-parser': 1.8.8
+      tslib: 2.8.1
+
+  '@formatjs/icu-skeleton-parser@1.8.8':
+    dependencies:
+      '@formatjs/ecma402-abstract': 2.2.4
+      tslib: 2.8.1
+
+  '@formatjs/intl-displaynames@6.8.5':
+    dependencies:
+      '@formatjs/ecma402-abstract': 2.2.4
+      '@formatjs/intl-localematcher': 0.5.8
+      tslib: 2.8.1
+
+  '@formatjs/intl-enumerator@1.4.6':
+    dependencies:
+      tslib: 2.8.1
+
+  '@formatjs/intl-getcanonicallocales@2.3.0':
+    dependencies:
+      tslib: 2.8.1
+
+  '@formatjs/intl-getcanonicallocales@2.5.6':
+    dependencies:
+      tslib: 2.8.1
+
+  '@formatjs/intl-listformat@7.7.5':
+    dependencies:
+      '@formatjs/ecma402-abstract': 2.2.4
+      '@formatjs/intl-localematcher': 0.5.8
+      tslib: 2.8.1
+
+  '@formatjs/intl-locale@3.4.6':
+    dependencies:
+      '@formatjs/ecma402-abstract': 1.18.3
+      '@formatjs/intl-enumerator': 1.4.6
+      '@formatjs/intl-getcanonicallocales': 2.3.0
+      tslib: 2.8.1
+
+  '@formatjs/intl-localematcher@0.5.4':
+    dependencies:
+      tslib: 2.8.1
+
+  '@formatjs/intl-localematcher@0.5.8':
+    dependencies:
+      tslib: 2.8.1
+
+  '@formatjs/intl-localematcher@0.6.2':
+    dependencies:
+      tslib: 2.8.1
+
+  '@formatjs/intl-numberformat@5.7.6':
+    dependencies:
+      '@formatjs/ecma402-abstract': 1.4.0
+      tslib: 2.8.1
+
+  '@formatjs/intl-numberformat@8.15.6':
+    dependencies:
+      '@formatjs/ecma402-abstract': 2.3.6
+      '@formatjs/intl-localematcher': 0.6.2
+      decimal.js: 10.6.0
+      tslib: 2.8.1
+
+  '@formatjs/intl-pluralrules@5.4.6':
+    dependencies:
+      '@formatjs/ecma402-abstract': 2.3.6
+      '@formatjs/intl-localematcher': 0.6.2
+      decimal.js: 10.6.0
+      tslib: 2.8.1
+
+  '@formatjs/intl@2.10.15(typescript@4.8.4)':
+    dependencies:
+      '@formatjs/ecma402-abstract': 2.2.4
+      '@formatjs/fast-memoize': 2.2.3
+      '@formatjs/icu-messageformat-parser': 2.9.4
+      '@formatjs/intl-displaynames': 6.8.5
+      '@formatjs/intl-listformat': 7.7.5
+      intl-messageformat: 10.7.7
+      tslib: 2.8.1
+    optionalDependencies:
+      typescript: 4.8.4
+
+  '@formatjs/ts-transformer@2.13.0':
+    dependencies:
+      intl-messageformat-parser: 6.1.2
+      tslib: 2.8.1
+      typescript: 4.8.4
+
+  '@fortawesome/fontawesome-common-types@6.7.2': {}
+
+  '@fortawesome/fontawesome-svg-core@6.7.2':
+    dependencies:
+      '@fortawesome/fontawesome-common-types': 6.7.2
+
+  '@fortawesome/free-brands-svg-icons@6.7.2':
+    dependencies:
+      '@fortawesome/fontawesome-common-types': 6.7.2
+
+  '@fortawesome/free-regular-svg-icons@6.7.2':
+    dependencies:
+      '@fortawesome/fontawesome-common-types': 6.7.2
+
+  '@fortawesome/free-solid-svg-icons@6.7.2':
+    dependencies:
+      '@fortawesome/fontawesome-common-types': 6.7.2
+
+  '@fortawesome/react-fontawesome@0.2.6(@fortawesome/fontawesome-svg-core@6.7.2)(react@17.0.2)':
+    dependencies:
+      '@fortawesome/fontawesome-svg-core': 6.7.2
+      prop-types: 15.8.1
+      react: 17.0.2
+
+  '@graphql-codegen/add@5.0.3(graphql@16.11.0)':
+    dependencies:
+      '@graphql-codegen/plugin-helpers': 5.1.1(graphql@16.11.0)
+      graphql: 16.11.0
+      tslib: 2.6.3
+
+  '@graphql-codegen/cli@5.0.7(@parcel/watcher@2.5.1)(@types/node@18.19.130)(graphql@16.11.0)(typescript@4.8.4)':
+    dependencies:
+      '@babel/generator': 7.28.3
+      '@babel/template': 7.27.2
+      '@babel/types': 7.28.4
+      '@graphql-codegen/client-preset': 4.8.3(graphql@16.11.0)
+      '@graphql-codegen/core': 4.0.2(graphql@16.11.0)
+      '@graphql-codegen/plugin-helpers': 5.1.1(graphql@16.11.0)
+      '@graphql-tools/apollo-engine-loader': 8.0.22(graphql@16.11.0)
+      '@graphql-tools/code-file-loader': 8.1.22(graphql@16.11.0)
+      '@graphql-tools/git-loader': 8.0.26(graphql@16.11.0)
+      '@graphql-tools/github-loader': 8.0.22(@types/node@18.19.130)(graphql@16.11.0)
+      '@graphql-tools/graphql-file-loader': 8.1.2(graphql@16.11.0)
+      '@graphql-tools/json-file-loader': 8.0.20(graphql@16.11.0)
+      '@graphql-tools/load': 8.1.2(graphql@16.11.0)
+      '@graphql-tools/prisma-loader': 8.0.17(@types/node@18.19.130)(graphql@16.11.0)
+      '@graphql-tools/url-loader': 8.0.33(@types/node@18.19.130)(graphql@16.11.0)
+      '@graphql-tools/utils': 10.9.1(graphql@16.11.0)
+      '@whatwg-node/fetch': 0.10.11
+      chalk: 4.1.2
+      cosmiconfig: 8.3.6(typescript@4.8.4)
+      debounce: 1.2.1
+      detect-indent: 6.1.0
+      graphql: 16.11.0
+      graphql-config: 5.1.5(@types/node@18.19.130)(graphql@16.11.0)(typescript@4.8.4)
+      inquirer: 8.2.7(@types/node@18.19.130)
+      is-glob: 4.0.3
+      jiti: 1.21.7
+      json-to-pretty-yaml: 1.2.2
+      listr2: 4.0.5
+      log-symbols: 4.1.0
+      micromatch: 4.0.8
+      shell-quote: 1.8.3
+      string-env-interpolation: 1.0.1
+      ts-log: 2.2.7
+      tslib: 2.8.1
+      yaml: 2.8.1
+      yargs: 17.7.2
+    optionalDependencies:
+      '@parcel/watcher': 2.5.1
+    transitivePeerDependencies:
+      - '@fastify/websocket'
+      - '@types/node'
+      - bufferutil
+      - cosmiconfig-toml-loader
+      - crossws
+      - encoding
+      - enquirer
+      - graphql-sock
+      - supports-color
+      - typescript
+      - uWebSockets.js
+      - utf-8-validate
+
+  '@graphql-codegen/client-preset@4.8.3(graphql@16.11.0)':
+    dependencies:
+      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/template': 7.27.2
+      '@graphql-codegen/add': 5.0.3(graphql@16.11.0)
+      '@graphql-codegen/gql-tag-operations': 4.0.17(graphql@16.11.0)
+      '@graphql-codegen/plugin-helpers': 5.1.1(graphql@16.11.0)
+      '@graphql-codegen/typed-document-node': 5.1.2(graphql@16.11.0)
+      '@graphql-codegen/typescript': 4.1.6(graphql@16.11.0)
+      '@graphql-codegen/typescript-operations': 4.6.1(graphql@16.11.0)
+      '@graphql-codegen/visitor-plugin-common': 5.8.0(graphql@16.11.0)
+      '@graphql-tools/documents': 1.0.1(graphql@16.11.0)
+      '@graphql-tools/utils': 10.9.1(graphql@16.11.0)
+      '@graphql-typed-document-node/core': 3.2.0(graphql@16.11.0)
+      graphql: 16.11.0
+      tslib: 2.6.3
+    transitivePeerDependencies:
+      - encoding
+
+  '@graphql-codegen/core@4.0.2(graphql@16.11.0)':
+    dependencies:
+      '@graphql-codegen/plugin-helpers': 5.1.1(graphql@16.11.0)
+      '@graphql-tools/schema': 10.0.25(graphql@16.11.0)
+      '@graphql-tools/utils': 10.9.1(graphql@16.11.0)
+      graphql: 16.11.0
+      tslib: 2.6.3
+
+  '@graphql-codegen/gql-tag-operations@4.0.17(graphql@16.11.0)':
+    dependencies:
+      '@graphql-codegen/plugin-helpers': 5.1.1(graphql@16.11.0)
+      '@graphql-codegen/visitor-plugin-common': 5.8.0(graphql@16.11.0)
+      '@graphql-tools/utils': 10.9.1(graphql@16.11.0)
+      auto-bind: 4.0.0
+      graphql: 16.11.0
+      tslib: 2.6.3
+    transitivePeerDependencies:
+      - encoding
+
+  '@graphql-codegen/plugin-helpers@3.1.2(graphql@16.11.0)':
+    dependencies:
+      '@graphql-tools/utils': 9.2.1(graphql@16.11.0)
+      change-case-all: 1.0.15
+      common-tags: 1.8.2
+      graphql: 16.11.0
+      import-from: 4.0.0
+      lodash: 4.17.21
+      tslib: 2.4.1
+
+  '@graphql-codegen/plugin-helpers@5.1.1(graphql@16.11.0)':
+    dependencies:
+      '@graphql-tools/utils': 10.9.1(graphql@16.11.0)
+      change-case-all: 1.0.15
+      common-tags: 1.8.2
+      graphql: 16.11.0
+      import-from: 4.0.0
+      lodash: 4.17.21
+      tslib: 2.6.3
+
+  '@graphql-codegen/schema-ast@4.1.0(graphql@16.11.0)':
+    dependencies:
+      '@graphql-codegen/plugin-helpers': 5.1.1(graphql@16.11.0)
+      '@graphql-tools/utils': 10.9.1(graphql@16.11.0)
+      graphql: 16.11.0
+      tslib: 2.6.3
+
+  '@graphql-codegen/time@5.0.1(graphql@16.11.0)':
+    dependencies:
+      '@graphql-codegen/plugin-helpers': 5.1.1(graphql@16.11.0)
+      graphql: 16.11.0
+      moment: 2.30.1
+
+  '@graphql-codegen/typed-document-node@5.1.2(graphql@16.11.0)':
+    dependencies:
+      '@graphql-codegen/plugin-helpers': 5.1.1(graphql@16.11.0)
+      '@graphql-codegen/visitor-plugin-common': 5.8.0(graphql@16.11.0)
+      auto-bind: 4.0.0
+      change-case-all: 1.0.15
+      graphql: 16.11.0
+      tslib: 2.6.3
+    transitivePeerDependencies:
+      - encoding
+
+  '@graphql-codegen/typescript-operations@4.6.1(graphql@16.11.0)':
+    dependencies:
+      '@graphql-codegen/plugin-helpers': 5.1.1(graphql@16.11.0)
+      '@graphql-codegen/typescript': 4.1.6(graphql@16.11.0)
+      '@graphql-codegen/visitor-plugin-common': 5.8.0(graphql@16.11.0)
+      auto-bind: 4.0.0
+      graphql: 16.11.0
+      tslib: 2.6.3
+    transitivePeerDependencies:
+      - encoding
+
+  '@graphql-codegen/typescript-react-apollo@4.3.3(graphql@16.11.0)':
+    dependencies:
+      '@graphql-codegen/plugin-helpers': 3.1.2(graphql@16.11.0)
+      '@graphql-codegen/visitor-plugin-common': 2.13.8(graphql@16.11.0)
+      auto-bind: 4.0.0
+      change-case-all: 1.0.15
+      graphql: 16.11.0
+      tslib: 2.8.1
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
+
+  '@graphql-codegen/typescript@4.1.6(graphql@16.11.0)':
+    dependencies:
+      '@graphql-codegen/plugin-helpers': 5.1.1(graphql@16.11.0)
+      '@graphql-codegen/schema-ast': 4.1.0(graphql@16.11.0)
+      '@graphql-codegen/visitor-plugin-common': 5.8.0(graphql@16.11.0)
+      auto-bind: 4.0.0
+      graphql: 16.11.0
+      tslib: 2.6.3
+    transitivePeerDependencies:
+      - encoding
+
+  '@graphql-codegen/visitor-plugin-common@2.13.8(graphql@16.11.0)':
+    dependencies:
+      '@graphql-codegen/plugin-helpers': 3.1.2(graphql@16.11.0)
+      '@graphql-tools/optimize': 1.4.0(graphql@16.11.0)
+      '@graphql-tools/relay-operation-optimizer': 6.5.18(graphql@16.11.0)
+      '@graphql-tools/utils': 9.2.1(graphql@16.11.0)
+      auto-bind: 4.0.0
+      change-case-all: 1.0.15
+      dependency-graph: 0.11.0
+      graphql: 16.11.0
+      graphql-tag: 2.12.6(graphql@16.11.0)
+      parse-filepath: 1.0.2
+      tslib: 2.4.1
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
+
+  '@graphql-codegen/visitor-plugin-common@5.8.0(graphql@16.11.0)':
+    dependencies:
+      '@graphql-codegen/plugin-helpers': 5.1.1(graphql@16.11.0)
+      '@graphql-tools/optimize': 2.0.0(graphql@16.11.0)
+      '@graphql-tools/relay-operation-optimizer': 7.0.21(graphql@16.11.0)
+      '@graphql-tools/utils': 10.9.1(graphql@16.11.0)
+      auto-bind: 4.0.0
+      change-case-all: 1.0.15
+      dependency-graph: 0.11.0
+      graphql: 16.11.0
+      graphql-tag: 2.12.6(graphql@16.11.0)
+      parse-filepath: 1.0.2
+      tslib: 2.6.3
+    transitivePeerDependencies:
+      - encoding
+
+  '@graphql-hive/signal@1.0.0': {}
+
+  '@graphql-tools/apollo-engine-loader@8.0.22(graphql@16.11.0)':
+    dependencies:
+      '@graphql-tools/utils': 10.9.1(graphql@16.11.0)
+      '@whatwg-node/fetch': 0.10.11
+      graphql: 16.11.0
+      sync-fetch: 0.6.0-2
+      tslib: 2.8.1
+
+  '@graphql-tools/batch-execute@9.0.19(graphql@16.11.0)':
+    dependencies:
+      '@graphql-tools/utils': 10.9.1(graphql@16.11.0)
+      '@whatwg-node/promise-helpers': 1.3.2
+      dataloader: 2.2.3
+      graphql: 16.11.0
+      tslib: 2.8.1
+
+  '@graphql-tools/code-file-loader@8.1.22(graphql@16.11.0)':
+    dependencies:
+      '@graphql-tools/graphql-tag-pluck': 8.3.21(graphql@16.11.0)
+      '@graphql-tools/utils': 10.9.1(graphql@16.11.0)
+      globby: 11.1.0
+      graphql: 16.11.0
+      tslib: 2.8.1
+      unixify: 1.0.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@graphql-tools/delegate@10.2.23(graphql@16.11.0)':
+    dependencies:
+      '@graphql-tools/batch-execute': 9.0.19(graphql@16.11.0)
+      '@graphql-tools/executor': 1.4.9(graphql@16.11.0)
+      '@graphql-tools/schema': 10.0.25(graphql@16.11.0)
+      '@graphql-tools/utils': 10.9.1(graphql@16.11.0)
+      '@repeaterjs/repeater': 3.0.6
+      '@whatwg-node/promise-helpers': 1.3.2
+      dataloader: 2.2.3
+      dset: 3.1.4
+      graphql: 16.11.0
+      tslib: 2.8.1
+
+  '@graphql-tools/documents@1.0.1(graphql@16.11.0)':
+    dependencies:
+      graphql: 16.11.0
+      lodash.sortby: 4.7.0
+      tslib: 2.8.1
+
+  '@graphql-tools/executor-common@0.0.4(graphql@16.11.0)':
+    dependencies:
+      '@envelop/core': 5.3.2
+      '@graphql-tools/utils': 10.9.1(graphql@16.11.0)
+      graphql: 16.11.0
+
+  '@graphql-tools/executor-common@0.0.6(graphql@16.11.0)':
+    dependencies:
+      '@envelop/core': 5.3.2
+      '@graphql-tools/utils': 10.9.1(graphql@16.11.0)
+      graphql: 16.11.0
+
+  '@graphql-tools/executor-graphql-ws@2.0.7(graphql@16.11.0)':
+    dependencies:
+      '@graphql-tools/executor-common': 0.0.6(graphql@16.11.0)
+      '@graphql-tools/utils': 10.9.1(graphql@16.11.0)
+      '@whatwg-node/disposablestack': 0.0.6
+      graphql: 16.11.0
+      graphql-ws: 6.0.6(graphql@16.11.0)(ws@8.18.3)
+      isomorphic-ws: 5.0.0(ws@8.18.3)
+      tslib: 2.8.1
+      ws: 8.18.3
+    transitivePeerDependencies:
+      - '@fastify/websocket'
+      - bufferutil
+      - crossws
+      - uWebSockets.js
+      - utf-8-validate
+
+  '@graphql-tools/executor-http@1.3.3(@types/node@18.19.130)(graphql@16.11.0)':
+    dependencies:
+      '@graphql-hive/signal': 1.0.0
+      '@graphql-tools/executor-common': 0.0.4(graphql@16.11.0)
+      '@graphql-tools/utils': 10.9.1(graphql@16.11.0)
+      '@repeaterjs/repeater': 3.0.6
+      '@whatwg-node/disposablestack': 0.0.6
+      '@whatwg-node/fetch': 0.10.11
+      '@whatwg-node/promise-helpers': 1.3.2
+      graphql: 16.11.0
+      meros: 1.3.2(@types/node@18.19.130)
+      tslib: 2.8.1
+    transitivePeerDependencies:
+      - '@types/node'
+
+  '@graphql-tools/executor-legacy-ws@1.1.19(graphql@16.11.0)':
+    dependencies:
+      '@graphql-tools/utils': 10.9.1(graphql@16.11.0)
+      '@types/ws': 8.18.1
+      graphql: 16.11.0
+      isomorphic-ws: 5.0.0(ws@8.18.3)
+      tslib: 2.8.1
+      ws: 8.18.3
+    transitivePeerDependencies:
+      - bufferutil
+      - utf-8-validate
+
+  '@graphql-tools/executor@1.4.9(graphql@16.11.0)':
+    dependencies:
+      '@graphql-tools/utils': 10.9.1(graphql@16.11.0)
+      '@graphql-typed-document-node/core': 3.2.0(graphql@16.11.0)
+      '@repeaterjs/repeater': 3.0.6
+      '@whatwg-node/disposablestack': 0.0.6
+      '@whatwg-node/promise-helpers': 1.3.2
+      graphql: 16.11.0
+      tslib: 2.8.1
+
+  '@graphql-tools/git-loader@8.0.26(graphql@16.11.0)':
+    dependencies:
+      '@graphql-tools/graphql-tag-pluck': 8.3.21(graphql@16.11.0)
+      '@graphql-tools/utils': 10.9.1(graphql@16.11.0)
+      graphql: 16.11.0
+      is-glob: 4.0.3
+      micromatch: 4.0.8
+      tslib: 2.8.1
+      unixify: 1.0.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@graphql-tools/github-loader@8.0.22(@types/node@18.19.130)(graphql@16.11.0)':
+    dependencies:
+      '@graphql-tools/executor-http': 1.3.3(@types/node@18.19.130)(graphql@16.11.0)
+      '@graphql-tools/graphql-tag-pluck': 8.3.21(graphql@16.11.0)
+      '@graphql-tools/utils': 10.9.1(graphql@16.11.0)
+      '@whatwg-node/fetch': 0.10.11
+      '@whatwg-node/promise-helpers': 1.3.2
+      graphql: 16.11.0
+      sync-fetch: 0.6.0-2
+      tslib: 2.8.1
+    transitivePeerDependencies:
+      - '@types/node'
+      - supports-color
+
+  '@graphql-tools/graphql-file-loader@8.1.2(graphql@16.11.0)':
+    dependencies:
+      '@graphql-tools/import': 7.1.2(graphql@16.11.0)
+      '@graphql-tools/utils': 10.9.1(graphql@16.11.0)
+      globby: 11.1.0
+      graphql: 16.11.0
+      tslib: 2.8.1
+      unixify: 1.0.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@graphql-tools/graphql-tag-pluck@8.3.21(graphql@16.11.0)':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/parser': 7.28.4
+      '@babel/plugin-syntax-import-assertions': 7.27.1(@babel/core@7.28.4)
+      '@babel/traverse': 7.28.4
+      '@babel/types': 7.28.4
+      '@graphql-tools/utils': 10.9.1(graphql@16.11.0)
+      graphql: 16.11.0
+      tslib: 2.8.1
+    transitivePeerDependencies:
+      - supports-color
+
+  '@graphql-tools/import@7.1.2(graphql@16.11.0)':
+    dependencies:
+      '@graphql-tools/utils': 10.9.1(graphql@16.11.0)
+      '@theguild/federation-composition': 0.20.1(graphql@16.11.0)
+      graphql: 16.11.0
+      resolve-from: 5.0.0
+      tslib: 2.8.1
+    transitivePeerDependencies:
+      - supports-color
+
+  '@graphql-tools/json-file-loader@8.0.20(graphql@16.11.0)':
+    dependencies:
+      '@graphql-tools/utils': 10.9.1(graphql@16.11.0)
+      globby: 11.1.0
+      graphql: 16.11.0
+      tslib: 2.8.1
+      unixify: 1.0.0
+
+  '@graphql-tools/load@8.1.2(graphql@16.11.0)':
+    dependencies:
+      '@graphql-tools/schema': 10.0.25(graphql@16.11.0)
+      '@graphql-tools/utils': 10.9.1(graphql@16.11.0)
+      graphql: 16.11.0
+      p-limit: 3.1.0
+      tslib: 2.8.1
+
+  '@graphql-tools/merge@9.1.1(graphql@16.11.0)':
+    dependencies:
+      '@graphql-tools/utils': 10.9.1(graphql@16.11.0)
+      graphql: 16.11.0
+      tslib: 2.8.1
+
+  '@graphql-tools/optimize@1.4.0(graphql@16.11.0)':
+    dependencies:
+      graphql: 16.11.0
+      tslib: 2.8.1
+
+  '@graphql-tools/optimize@2.0.0(graphql@16.11.0)':
+    dependencies:
+      graphql: 16.11.0
+      tslib: 2.6.3
+
+  '@graphql-tools/prisma-loader@8.0.17(@types/node@18.19.130)(graphql@16.11.0)':
+    dependencies:
+      '@graphql-tools/url-loader': 8.0.33(@types/node@18.19.130)(graphql@16.11.0)
+      '@graphql-tools/utils': 10.9.1(graphql@16.11.0)
+      '@types/js-yaml': 4.0.9
+      '@whatwg-node/fetch': 0.10.11
+      chalk: 4.1.2
+      debug: 4.4.3
+      dotenv: 16.6.1
+      graphql: 16.11.0
+      graphql-request: 6.1.0(graphql@16.11.0)
+      http-proxy-agent: 7.0.2
+      https-proxy-agent: 7.0.6
+      jose: 5.10.0
+      js-yaml: 4.1.0
+      lodash: 4.17.21
+      scuid: 1.1.0
+      tslib: 2.8.1
+      yaml-ast-parser: 0.0.43
+    transitivePeerDependencies:
+      - '@fastify/websocket'
+      - '@types/node'
+      - bufferutil
+      - crossws
+      - encoding
+      - supports-color
+      - uWebSockets.js
+      - utf-8-validate
+
+  '@graphql-tools/relay-operation-optimizer@6.5.18(graphql@16.11.0)':
+    dependencies:
+      '@ardatan/relay-compiler': 12.0.0(graphql@16.11.0)
+      '@graphql-tools/utils': 9.2.1(graphql@16.11.0)
+      graphql: 16.11.0
+      tslib: 2.8.1
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
+
+  '@graphql-tools/relay-operation-optimizer@7.0.21(graphql@16.11.0)':
+    dependencies:
+      '@ardatan/relay-compiler': 12.0.3(graphql@16.11.0)
+      '@graphql-tools/utils': 10.9.1(graphql@16.11.0)
+      graphql: 16.11.0
+      tslib: 2.6.3
+    transitivePeerDependencies:
+      - encoding
+
+  '@graphql-tools/schema@10.0.25(graphql@16.11.0)':
+    dependencies:
+      '@graphql-tools/merge': 9.1.1(graphql@16.11.0)
+      '@graphql-tools/utils': 10.9.1(graphql@16.11.0)
+      graphql: 16.11.0
+      tslib: 2.8.1
+
+  '@graphql-tools/url-loader@8.0.33(@types/node@18.19.130)(graphql@16.11.0)':
+    dependencies:
+      '@graphql-tools/executor-graphql-ws': 2.0.7(graphql@16.11.0)
+      '@graphql-tools/executor-http': 1.3.3(@types/node@18.19.130)(graphql@16.11.0)
+      '@graphql-tools/executor-legacy-ws': 1.1.19(graphql@16.11.0)
+      '@graphql-tools/utils': 10.9.1(graphql@16.11.0)
+      '@graphql-tools/wrap': 10.1.4(graphql@16.11.0)
+      '@types/ws': 8.18.1
+      '@whatwg-node/fetch': 0.10.11
+      '@whatwg-node/promise-helpers': 1.3.2
+      graphql: 16.11.0
+      isomorphic-ws: 5.0.0(ws@8.18.3)
+      sync-fetch: 0.6.0-2
+      tslib: 2.8.1
+      ws: 8.18.3
+    transitivePeerDependencies:
+      - '@fastify/websocket'
+      - '@types/node'
+      - bufferutil
+      - crossws
+      - uWebSockets.js
+      - utf-8-validate
+
+  '@graphql-tools/utils@10.9.1(graphql@16.11.0)':
+    dependencies:
+      '@graphql-typed-document-node/core': 3.2.0(graphql@16.11.0)
+      '@whatwg-node/promise-helpers': 1.3.2
+      cross-inspect: 1.0.1
+      dset: 3.1.4
+      graphql: 16.11.0
+      tslib: 2.8.1
+
+  '@graphql-tools/utils@9.2.1(graphql@16.11.0)':
+    dependencies:
+      '@graphql-typed-document-node/core': 3.2.0(graphql@16.11.0)
+      graphql: 16.11.0
+      tslib: 2.8.1
+
+  '@graphql-tools/wrap@10.1.4(graphql@16.11.0)':
+    dependencies:
+      '@graphql-tools/delegate': 10.2.23(graphql@16.11.0)
+      '@graphql-tools/schema': 10.0.25(graphql@16.11.0)
+      '@graphql-tools/utils': 10.9.1(graphql@16.11.0)
+      '@whatwg-node/promise-helpers': 1.3.2
+      graphql: 16.11.0
+      tslib: 2.8.1
+
+  '@graphql-typed-document-node/core@3.2.0(graphql@16.11.0)':
+    dependencies:
+      graphql: 16.11.0
+
+  '@humanwhocodes/config-array@0.13.0':
+    dependencies:
+      '@humanwhocodes/object-schema': 2.0.3
+      debug: 4.4.3
+      minimatch: 3.1.2
+    transitivePeerDependencies:
+      - supports-color
+
+  '@humanwhocodes/module-importer@1.0.1': {}
+
+  '@humanwhocodes/object-schema@2.0.3': {}
+
+  '@inquirer/external-editor@1.0.2(@types/node@18.19.130)':
+    dependencies:
+      chardet: 2.1.0
+      iconv-lite: 0.7.0
+    optionalDependencies:
+      '@types/node': 18.19.130
+
+  '@jridgewell/gen-mapping@0.3.13':
+    dependencies:
+      '@jridgewell/sourcemap-codec': 1.5.5
+      '@jridgewell/trace-mapping': 0.3.31
+
+  '@jridgewell/remapping@2.3.5':
+    dependencies:
+      '@jridgewell/gen-mapping': 0.3.13
+      '@jridgewell/trace-mapping': 0.3.31
+
+  '@jridgewell/resolve-uri@3.1.2': {}
+
+  '@jridgewell/source-map@0.3.11':
+    dependencies:
+      '@jridgewell/gen-mapping': 0.3.13
+      '@jridgewell/trace-mapping': 0.3.31
+
+  '@jridgewell/sourcemap-codec@1.5.5': {}
+
+  '@jridgewell/trace-mapping@0.3.31':
+    dependencies:
+      '@jridgewell/resolve-uri': 3.1.2
+      '@jridgewell/sourcemap-codec': 1.5.5
+
+  '@jridgewell/trace-mapping@0.3.9':
+    dependencies:
+      '@jridgewell/resolve-uri': 3.1.2
+      '@jridgewell/sourcemap-codec': 1.5.5
+
+  '@juggle/resize-observer@3.4.0': {}
+
+  '@mapbox/hast-util-table-cell-style@0.2.1':
+    dependencies:
+      unist-util-visit: 1.4.1
+
+  '@nodelib/fs.scandir@2.1.5':
+    dependencies:
+      '@nodelib/fs.stat': 2.0.5
+      run-parallel: 1.2.0
+
+  '@nodelib/fs.stat@2.0.5': {}
+
+  '@nodelib/fs.walk@1.2.8':
+    dependencies:
+      '@nodelib/fs.scandir': 2.1.5
+      fastq: 1.19.1
+
+  '@parcel/watcher-android-arm64@2.5.1':
+    optional: true
+
+  '@parcel/watcher-darwin-arm64@2.5.1':
+    optional: true
+
+  '@parcel/watcher-darwin-x64@2.5.1':
+    optional: true
+
+  '@parcel/watcher-freebsd-x64@2.5.1':
+    optional: true
+
+  '@parcel/watcher-linux-arm-glibc@2.5.1':
+    optional: true
+
+  '@parcel/watcher-linux-arm-musl@2.5.1':
+    optional: true
+
+  '@parcel/watcher-linux-arm64-glibc@2.5.1':
+    optional: true
+
+  '@parcel/watcher-linux-arm64-musl@2.5.1':
+    optional: true
+
+  '@parcel/watcher-linux-x64-glibc@2.5.1':
+    optional: true
+
+  '@parcel/watcher-linux-x64-musl@2.5.1':
+    optional: true
+
+  '@parcel/watcher-win32-arm64@2.5.1':
+    optional: true
+
+  '@parcel/watcher-win32-ia32@2.5.1':
+    optional: true
+
+  '@parcel/watcher-win32-x64@2.5.1':
+    optional: true
+
+  '@parcel/watcher@2.5.1':
+    dependencies:
+      detect-libc: 1.0.3
+      is-glob: 4.0.3
+      micromatch: 4.0.8
+      node-addon-api: 7.1.1
+    optionalDependencies:
+      '@parcel/watcher-android-arm64': 2.5.1
+      '@parcel/watcher-darwin-arm64': 2.5.1
+      '@parcel/watcher-darwin-x64': 2.5.1
+      '@parcel/watcher-freebsd-x64': 2.5.1
+      '@parcel/watcher-linux-arm-glibc': 2.5.1
+      '@parcel/watcher-linux-arm-musl': 2.5.1
+      '@parcel/watcher-linux-arm64-glibc': 2.5.1
+      '@parcel/watcher-linux-arm64-musl': 2.5.1
+      '@parcel/watcher-linux-x64-glibc': 2.5.1
+      '@parcel/watcher-linux-x64-musl': 2.5.1
+      '@parcel/watcher-win32-arm64': 2.5.1
+      '@parcel/watcher-win32-ia32': 2.5.1
+      '@parcel/watcher-win32-x64': 2.5.1
+    optional: true
+
+  '@popperjs/core@2.11.8': {}
+
+  '@react-hook/latest@1.0.3(react@17.0.2)':
+    dependencies:
+      react: 17.0.2
+
+  '@react-hook/passive-layout-effect@1.2.1(react@17.0.2)':
+    dependencies:
+      react: 17.0.2
+
+  '@react-hook/resize-observer@1.2.6(react@17.0.2)':
+    dependencies:
+      '@juggle/resize-observer': 3.4.0
+      '@react-hook/latest': 1.0.3(react@17.0.2)
+      '@react-hook/passive-layout-effect': 1.2.1(react@17.0.2)
+      react: 17.0.2
+
+  '@repeaterjs/repeater@3.0.6': {}
+
+  '@restart/context@2.1.4(react@17.0.2)':
+    dependencies:
+      react: 17.0.2
+
+  '@restart/hooks@0.4.16(react@17.0.2)':
+    dependencies:
+      dequal: 2.0.3
+      react: 17.0.2
+
+  '@rtsao/scc@1.1.0': {}
+
+  '@silvermine/videojs-airplay@1.3.0(video.js@7.21.7)':
+    dependencies:
+      video.js: 7.21.7
+
+  '@silvermine/videojs-chromecast@1.5.0(video.js@7.21.7)':
+    dependencies:
+      video.js: 7.21.7
+      webcomponents.js: https://codeload.github.com/webcomponents/webcomponentsjs/tar.gz/8a2e40557b177e2cca0def2553f84c8269c8f93e
+
+  '@theguild/federation-composition@0.20.1(graphql@16.11.0)':
+    dependencies:
+      constant-case: 3.0.4
+      debug: 4.4.1
+      graphql: 16.11.0
+      json5: 2.2.3
+      lodash.sortby: 4.7.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@tsconfig/node10@1.0.11': {}
+
+  '@tsconfig/node12@1.0.11': {}
+
+  '@tsconfig/node14@1.0.3': {}
+
+  '@tsconfig/node16@1.0.4': {}
+
+  '@tweenjs/tween.js@18.6.4': {}
+
+  '@types/apollo-upload-client@18.0.1(@types/react@17.0.89)(graphql-ws@5.16.2(graphql@16.11.0))(react-dom@17.0.2(react@17.0.2))(react@17.0.2)':
+    dependencies:
+      '@apollo/client': 3.14.0(@types/react@17.0.89)(graphql-ws@5.16.2(graphql@16.11.0))(graphql@16.11.0)(react-dom@17.0.2(react@17.0.2))(react@17.0.2)
+      '@types/extract-files': 13.0.2
+      graphql: 16.11.0
+    transitivePeerDependencies:
+      - '@types/react'
+      - graphql-ws
+      - react
+      - react-dom
+      - subscriptions-transport-ws
+
+  '@types/babel__core@7.20.5':
+    dependencies:
+      '@babel/parser': 7.28.4
+      '@babel/types': 7.28.4
+      '@types/babel__generator': 7.27.0
+      '@types/babel__template': 7.4.4
+      '@types/babel__traverse': 7.28.0
+
+  '@types/babel__generator@7.27.0':
+    dependencies:
+      '@babel/types': 7.28.4
+
+  '@types/babel__template@7.4.4':
+    dependencies:
+      '@babel/parser': 7.28.4
+      '@babel/types': 7.28.4
+
+  '@types/babel__traverse@7.28.0':
+    dependencies:
+      '@babel/types': 7.28.4
+
+  '@types/cookie@0.3.3': {}
+
+  '@types/crypto-js@4.2.2': {}
+
+  '@types/extract-files@13.0.2': {}
+
+  '@types/fs-extra@9.0.13':
+    dependencies:
+      '@types/node': 18.19.130
+
+  '@types/history@4.7.11': {}
+
+  '@types/hoist-non-react-statics@3.3.7(@types/react@17.0.89)':
+    dependencies:
+      '@types/react': 17.0.89
+      hoist-non-react-statics: 3.3.2
+
+  '@types/invariant@2.2.37': {}
+
+  '@types/js-yaml@4.0.9': {}
+
+  '@types/json-schema@7.0.15': {}
+
+  '@types/json5@0.0.29': {}
+
+  '@types/lodash-es@4.17.12':
+    dependencies:
+      '@types/lodash': 4.17.20
+
+  '@types/lodash@4.17.20': {}
+
+  '@types/mdast@3.0.15':
+    dependencies:
+      '@types/unist': 2.0.11
+
+  '@types/minimist@1.2.5': {}
+
+  '@types/mousetrap@1.6.15': {}
+
+  '@types/node@18.19.130':
+    dependencies:
+      undici-types: 5.26.5
+
+  '@types/normalize-package-data@2.4.4': {}
+
+  '@types/parse-json@4.0.2': {}
+
+  '@types/prop-types@15.7.15': {}
+
+  '@types/react-datepicker@4.19.6(react-dom@17.0.2(react@17.0.2))(react@17.0.2)':
+    dependencies:
+      '@popperjs/core': 2.11.8
+      '@types/react': 17.0.89
+      date-fns: 2.30.0
+      react-popper: 2.3.0(@popperjs/core@2.11.8)(react-dom@17.0.2(react@17.0.2))(react@17.0.2)
+    transitivePeerDependencies:
+      - react
+      - react-dom
+
+  '@types/react-dom@17.0.26(@types/react@17.0.89)':
+    dependencies:
+      '@types/react': 17.0.89
+
+  '@types/react-helmet@6.1.11':
+    dependencies:
+      '@types/react': 17.0.89
+
+  '@types/react-router-bootstrap@0.24.5':
+    dependencies:
+      '@types/react': 17.0.89
+      '@types/react-router-dom': 5.3.3
+
+  '@types/react-router-dom@5.3.3':
+    dependencies:
+      '@types/history': 4.7.11
+      '@types/react': 17.0.89
+      '@types/react-router': 5.1.20
+
+  '@types/react-router-hash-link@2.4.9':
+    dependencies:
+      '@types/history': 4.7.11
+      '@types/react': 17.0.89
+      '@types/react-router-dom': 5.3.3
+
+  '@types/react-router@5.1.20':
+    dependencies:
+      '@types/history': 4.7.11
+      '@types/react': 17.0.89
+
+  '@types/react-transition-group@4.4.12(@types/react@17.0.89)':
+    dependencies:
+      '@types/react': 17.0.89
+
+  '@types/react@17.0.89':
+    dependencies:
+      '@types/prop-types': 15.7.15
+      '@types/scheduler': 0.16.8
+      csstype: 3.1.3
+
+  '@types/scheduler@0.16.8': {}
+
+  '@types/schema-utils@2.4.0':
+    dependencies:
+      schema-utils: 2.7.1
+
+  '@types/semver@7.7.1': {}
+
+  '@types/stats.js@0.17.4': {}
+
+  '@types/three@0.154.0':
+    dependencies:
+      '@tweenjs/tween.js': 18.6.4
+      '@types/stats.js': 0.17.4
+      '@types/webxr': 0.5.24
+      fflate: 0.6.10
+      lil-gui: 0.17.0
+      meshoptimizer: 0.18.1
+
+  '@types/ua-parser-js@0.7.39': {}
+
+  '@types/unist@2.0.11': {}
+
+  '@types/video.js@7.3.58': {}
+
+  '@types/videojs-mobile-ui@0.8.3':
+    dependencies:
+      '@types/video.js': 7.3.58
+
+  '@types/videojs-seek-buttons@2.1.3':
+    dependencies:
+      '@types/video.js': 7.3.58
+
+  '@types/warning@3.0.3': {}
+
+  '@types/webxr@0.5.24': {}
+
+  '@types/ws@8.18.1':
+    dependencies:
+      '@types/node': 18.19.130
+
+  '@typescript-eslint/eslint-plugin@5.62.0(@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@4.8.4))(eslint@8.57.1)(typescript@4.8.4)':
+    dependencies:
+      '@eslint-community/regexpp': 4.12.1
+      '@typescript-eslint/parser': 5.62.0(eslint@8.57.1)(typescript@4.8.4)
+      '@typescript-eslint/scope-manager': 5.62.0
+      '@typescript-eslint/type-utils': 5.62.0(eslint@8.57.1)(typescript@4.8.4)
+      '@typescript-eslint/utils': 5.62.0(eslint@8.57.1)(typescript@4.8.4)
+      debug: 4.4.3
+      eslint: 8.57.1
+      graphemer: 1.4.0
+      ignore: 5.3.2
+      natural-compare-lite: 1.4.0
+      semver: 7.7.3
+      tsutils: 3.21.0(typescript@4.8.4)
+    optionalDependencies:
+      typescript: 4.8.4
+    transitivePeerDependencies:
+      - supports-color
+
+  '@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@4.8.4)':
+    dependencies:
+      '@typescript-eslint/scope-manager': 5.62.0
+      '@typescript-eslint/types': 5.62.0
+      '@typescript-eslint/typescript-estree': 5.62.0(typescript@4.8.4)
+      debug: 4.4.3
+      eslint: 8.57.1
+    optionalDependencies:
+      typescript: 4.8.4
+    transitivePeerDependencies:
+      - supports-color
+
+  '@typescript-eslint/scope-manager@5.62.0':
+    dependencies:
+      '@typescript-eslint/types': 5.62.0
+      '@typescript-eslint/visitor-keys': 5.62.0
+
+  '@typescript-eslint/type-utils@5.62.0(eslint@8.57.1)(typescript@4.8.4)':
+    dependencies:
+      '@typescript-eslint/typescript-estree': 5.62.0(typescript@4.8.4)
+      '@typescript-eslint/utils': 5.62.0(eslint@8.57.1)(typescript@4.8.4)
+      debug: 4.4.3
+      eslint: 8.57.1
+      tsutils: 3.21.0(typescript@4.8.4)
+    optionalDependencies:
+      typescript: 4.8.4
+    transitivePeerDependencies:
+      - supports-color
+
+  '@typescript-eslint/types@5.62.0': {}
+
+  '@typescript-eslint/typescript-estree@5.62.0(typescript@4.8.4)':
+    dependencies:
+      '@typescript-eslint/types': 5.62.0
+      '@typescript-eslint/visitor-keys': 5.62.0
+      debug: 4.4.3
+      globby: 11.1.0
+      is-glob: 4.0.3
+      semver: 7.7.3
+      tsutils: 3.21.0(typescript@4.8.4)
+    optionalDependencies:
+      typescript: 4.8.4
+    transitivePeerDependencies:
+      - supports-color
+
+  '@typescript-eslint/utils@5.62.0(eslint@8.57.1)(typescript@4.8.4)':
+    dependencies:
+      '@eslint-community/eslint-utils': 4.9.0(eslint@8.57.1)
+      '@types/json-schema': 7.0.15
+      '@types/semver': 7.7.1
+      '@typescript-eslint/scope-manager': 5.62.0
+      '@typescript-eslint/types': 5.62.0
+      '@typescript-eslint/typescript-estree': 5.62.0(typescript@4.8.4)
+      eslint: 8.57.1
+      eslint-scope: 5.1.1
+      semver: 7.7.3
+    transitivePeerDependencies:
+      - supports-color
+      - typescript
+
+  '@typescript-eslint/visitor-keys@5.62.0':
+    dependencies:
+      '@typescript-eslint/types': 5.62.0
+      eslint-visitor-keys: 3.4.3
+
+  '@ungap/structured-clone@1.3.0': {}
+
+  '@videojs/http-streaming@2.16.3(video.js@7.21.7)':
+    dependencies:
+      '@babel/runtime': 7.28.4
+      '@videojs/vhs-utils': 3.0.5
+      aes-decrypter: 3.1.3
+      global: 4.4.0
+      m3u8-parser: 4.8.0
+      mpd-parser: 0.22.1
+      mux.js: 6.0.1
+      video.js: 7.21.7
+
+  '@videojs/vhs-utils@3.0.5':
+    dependencies:
+      '@babel/runtime': 7.28.4
+      global: 4.4.0
+      url-toolkit: 2.2.5
+
+  '@videojs/xhr@2.6.0':
+    dependencies:
+      '@babel/runtime': 7.28.4
+      global: 4.4.0
+      is-function: 1.0.2
+
+  '@vitejs/plugin-legacy@4.1.1(terser@5.44.0)(vite@4.5.14(@types/node@18.19.130)(sass@1.93.2)(terser@5.44.0))':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/preset-env': 7.28.3(@babel/core@7.28.4)
+      browserslist: 4.26.3
+      core-js: 3.46.0
+      magic-string: 0.30.19
+      regenerator-runtime: 0.13.11
+      systemjs: 6.15.1
+      terser: 5.44.0
+      vite: 4.5.14(@types/node@18.19.130)(sass@1.93.2)(terser@5.44.0)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@vitejs/plugin-react@3.1.0(vite@4.5.14(@types/node@18.19.130)(sass@1.93.2)(terser@5.44.0))':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/plugin-transform-react-jsx-self': 7.27.1(@babel/core@7.28.4)
+      '@babel/plugin-transform-react-jsx-source': 7.27.1(@babel/core@7.28.4)
+      magic-string: 0.27.0
+      react-refresh: 0.14.2
+      vite: 4.5.14(@types/node@18.19.130)(sass@1.93.2)(terser@5.44.0)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@whatwg-node/disposablestack@0.0.6':
+    dependencies:
+      '@whatwg-node/promise-helpers': 1.3.2
+      tslib: 2.8.1
+
+  '@whatwg-node/fetch@0.10.11':
+    dependencies:
+      '@whatwg-node/node-fetch': 0.8.1
+      urlpattern-polyfill: 10.1.0
+
+  '@whatwg-node/node-fetch@0.8.1':
+    dependencies:
+      '@fastify/busboy': 3.2.0
+      '@whatwg-node/disposablestack': 0.0.6
+      '@whatwg-node/promise-helpers': 1.3.2
+      tslib: 2.8.1
+
+  '@whatwg-node/promise-helpers@1.3.2':
+    dependencies:
+      tslib: 2.8.1
+
+  '@wry/caches@1.0.1':
+    dependencies:
+      tslib: 2.8.1
+
+  '@wry/context@0.7.4':
+    dependencies:
+      tslib: 2.8.1
+
+  '@wry/equality@0.5.7':
+    dependencies:
+      tslib: 2.8.1
+
+  '@wry/trie@0.5.0':
+    dependencies:
+      tslib: 2.8.1
+
+  '@xmldom/xmldom@0.8.11': {}
+
+  acorn-jsx@5.3.2(acorn@8.15.0):
+    dependencies:
+      acorn: 8.15.0
+
+  acorn-walk@8.3.4:
+    dependencies:
+      acorn: 8.15.0
+
+  acorn@8.15.0: {}
+
+  aes-decrypter@3.1.3:
+    dependencies:
+      '@babel/runtime': 7.28.4
+      '@videojs/vhs-utils': 3.0.5
+      global: 4.4.0
+      pkcs7: 1.0.4
+
+  agent-base@7.1.4: {}
+
+  aggregate-error@3.1.0:
+    dependencies:
+      clean-stack: 2.2.0
+      indent-string: 4.0.0
+
+  ajv-keywords@3.5.2(ajv@6.12.6):
+    dependencies:
+      ajv: 6.12.6
+
+  ajv@6.12.6:
+    dependencies:
+      fast-deep-equal: 3.1.3
+      fast-json-stable-stringify: 2.1.0
+      json-schema-traverse: 0.4.1
+      uri-js: 4.4.1
+
+  ajv@8.17.1:
+    dependencies:
+      fast-deep-equal: 3.1.3
+      fast-uri: 3.1.0
+      json-schema-traverse: 1.0.0
+      require-from-string: 2.0.2
+
+  ansi-escapes@4.3.2:
+    dependencies:
+      type-fest: 0.21.3
+
+  ansi-regex@5.0.1: {}
+
+  ansi-styles@4.3.0:
+    dependencies:
+      color-convert: 2.0.1
+
+  apollo-upload-client@18.0.1(@apollo/client@3.14.0(@types/react@17.0.89)(graphql-ws@5.16.2(graphql@16.11.0))(graphql@16.11.0)(react-dom@17.0.2(react@17.0.2))(react@17.0.2))(graphql@16.11.0):
+    dependencies:
+      '@apollo/client': 3.14.0(@types/react@17.0.89)(graphql-ws@5.16.2(graphql@16.11.0))(graphql@16.11.0)(react-dom@17.0.2(react@17.0.2))(react@17.0.2)
+      extract-files: 13.0.0
+      graphql: 16.11.0
+
+  arg@4.1.3: {}
+
+  argparse@1.0.10:
+    dependencies:
+      sprintf-js: 1.0.3
+
+  argparse@2.0.1: {}
+
+  aria-query@5.3.2: {}
+
+  array-buffer-byte-length@1.0.2:
+    dependencies:
+      call-bound: 1.0.4
+      is-array-buffer: 3.0.5
+
+  array-includes@3.1.9:
+    dependencies:
+      call-bind: 1.0.8
+      call-bound: 1.0.4
+      define-properties: 1.2.1
+      es-abstract: 1.24.0
+      es-object-atoms: 1.1.1
+      get-intrinsic: 1.3.0
+      is-string: 1.1.1
+      math-intrinsics: 1.1.0
+
+  array-union@2.1.0: {}
+
+  array.prototype.findlast@1.2.5:
+    dependencies:
+      call-bind: 1.0.8
+      define-properties: 1.2.1
+      es-abstract: 1.24.0
+      es-errors: 1.3.0
+      es-object-atoms: 1.1.1
+      es-shim-unscopables: 1.1.0
+
+  array.prototype.findlastindex@1.2.6:
+    dependencies:
+      call-bind: 1.0.8
+      call-bound: 1.0.4
+      define-properties: 1.2.1
+      es-abstract: 1.24.0
+      es-errors: 1.3.0
+      es-object-atoms: 1.1.1
+      es-shim-unscopables: 1.1.0
+
+  array.prototype.flat@1.3.3:
+    dependencies:
+      call-bind: 1.0.8
+      define-properties: 1.2.1
+      es-abstract: 1.24.0
+      es-shim-unscopables: 1.1.0
+
+  array.prototype.flatmap@1.3.3:
+    dependencies:
+      call-bind: 1.0.8
+      define-properties: 1.2.1
+      es-abstract: 1.24.0
+      es-shim-unscopables: 1.1.0
+
+  array.prototype.tosorted@1.1.4:
+    dependencies:
+      call-bind: 1.0.8
+      define-properties: 1.2.1
+      es-abstract: 1.24.0
+      es-errors: 1.3.0
+      es-shim-unscopables: 1.1.0
+
+  arraybuffer.prototype.slice@1.0.4:
+    dependencies:
+      array-buffer-byte-length: 1.0.2
+      call-bind: 1.0.8
+      define-properties: 1.2.1
+      es-abstract: 1.24.0
+      es-errors: 1.3.0
+      get-intrinsic: 1.3.0
+      is-array-buffer: 3.0.5
+
+  arrify@1.0.1: {}
+
+  asap@2.0.6: {}
+
+  ast-types-flow@0.0.8: {}
+
+  astral-regex@2.0.0: {}
+
+  async-function@1.0.0: {}
+
+  at-least-node@1.0.0: {}
+
+  auto-bind@4.0.0: {}
+
+  available-typed-arrays@1.0.7:
+    dependencies:
+      possible-typed-array-names: 1.1.0
+
+  axe-core@4.11.0: {}
+
+  axobject-query@4.1.0: {}
+
+  b64-to-blob@1.2.19: {}
+
+  babel-plugin-macros@3.1.0:
+    dependencies:
+      '@babel/runtime': 7.28.4
+      cosmiconfig: 7.1.0
+      resolve: 1.22.11
+
+  babel-plugin-polyfill-corejs2@0.4.14(@babel/core@7.28.4):
+    dependencies:
+      '@babel/compat-data': 7.28.4
+      '@babel/core': 7.28.4
+      '@babel/helper-define-polyfill-provider': 0.6.5(@babel/core@7.28.4)
+      semver: 6.3.1
+    transitivePeerDependencies:
+      - supports-color
+
+  babel-plugin-polyfill-corejs3@0.13.0(@babel/core@7.28.4):
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-define-polyfill-provider': 0.6.5(@babel/core@7.28.4)
+      core-js-compat: 3.46.0
+    transitivePeerDependencies:
+      - supports-color
+
+  babel-plugin-polyfill-regenerator@0.6.5(@babel/core@7.28.4):
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-define-polyfill-provider': 0.6.5(@babel/core@7.28.4)
+    transitivePeerDependencies:
+      - supports-color
+
+  babel-plugin-react-intl@7.9.4:
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/types': 7.28.4
+      '@formatjs/ts-transformer': 2.13.0
+      '@types/babel__core': 7.20.5
+      '@types/fs-extra': 9.0.13
+      '@types/schema-utils': 2.4.0
+      fs-extra: 9.1.0
+      intl-messageformat-parser: 5.5.1
+      schema-utils: 2.7.1
+    transitivePeerDependencies:
+      - supports-color
+      - ts-jest
+
+  babel-plugin-syntax-trailing-function-commas@7.0.0-beta.0: {}
+
+  babel-preset-fbjs@3.4.0(@babel/core@7.28.4):
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/plugin-proposal-class-properties': 7.18.6(@babel/core@7.28.4)
+      '@babel/plugin-proposal-object-rest-spread': 7.20.7(@babel/core@7.28.4)
+      '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.28.4)
+      '@babel/plugin-syntax-flow': 7.27.1(@babel/core@7.28.4)
+      '@babel/plugin-syntax-jsx': 7.27.1(@babel/core@7.28.4)
+      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.28.4)
+      '@babel/plugin-transform-arrow-functions': 7.27.1(@babel/core@7.28.4)
+      '@babel/plugin-transform-block-scoped-functions': 7.27.1(@babel/core@7.28.4)
+      '@babel/plugin-transform-block-scoping': 7.28.4(@babel/core@7.28.4)
+      '@babel/plugin-transform-classes': 7.28.4(@babel/core@7.28.4)
+      '@babel/plugin-transform-computed-properties': 7.27.1(@babel/core@7.28.4)
+      '@babel/plugin-transform-destructuring': 7.28.0(@babel/core@7.28.4)
+      '@babel/plugin-transform-flow-strip-types': 7.27.1(@babel/core@7.28.4)
+      '@babel/plugin-transform-for-of': 7.27.1(@babel/core@7.28.4)
+      '@babel/plugin-transform-function-name': 7.27.1(@babel/core@7.28.4)
+      '@babel/plugin-transform-literals': 7.27.1(@babel/core@7.28.4)
+      '@babel/plugin-transform-member-expression-literals': 7.27.1(@babel/core@7.28.4)
+      '@babel/plugin-transform-modules-commonjs': 7.27.1(@babel/core@7.28.4)
+      '@babel/plugin-transform-object-super': 7.27.1(@babel/core@7.28.4)
+      '@babel/plugin-transform-parameters': 7.27.7(@babel/core@7.28.4)
+      '@babel/plugin-transform-property-literals': 7.27.1(@babel/core@7.28.4)
+      '@babel/plugin-transform-react-display-name': 7.28.0(@babel/core@7.28.4)
+      '@babel/plugin-transform-react-jsx': 7.27.1(@babel/core@7.28.4)
+      '@babel/plugin-transform-shorthand-properties': 7.27.1(@babel/core@7.28.4)
+      '@babel/plugin-transform-spread': 7.27.1(@babel/core@7.28.4)
+      '@babel/plugin-transform-template-literals': 7.27.1(@babel/core@7.28.4)
+      babel-plugin-syntax-trailing-function-commas: 7.0.0-beta.0
+    transitivePeerDependencies:
+      - supports-color
+
+  bail@1.0.5: {}
+
+  balanced-match@1.0.2: {}
+
+  balanced-match@2.0.0: {}
+
+  base64-blob@1.4.1:
+    dependencies:
+      b64-to-blob: 1.2.19
+
+  base64-js@1.5.1: {}
+
+  baseline-browser-mapping@2.8.19: {}
+
+  bcp-47-match@1.0.3: {}
+
+  bcp-47-normalize@1.1.1:
+    dependencies:
+      bcp-47: 1.0.8
+      bcp-47-match: 1.0.3
+
+  bcp-47@1.0.8:
+    dependencies:
+      is-alphabetical: 1.0.4
+      is-alphanumerical: 1.0.4
+      is-decimal: 1.0.4
+
+  bl@4.1.0:
+    dependencies:
+      buffer: 5.7.1
+      inherits: 2.0.4
+      readable-stream: 3.6.2
+
+  bootstrap@4.6.2(jquery@3.7.1)(popper.js@1.16.1):
+    dependencies:
+      jquery: 3.7.1
+      popper.js: 1.16.1
+
+  brace-expansion@1.1.12:
+    dependencies:
+      balanced-match: 1.0.2
+      concat-map: 0.0.1
+
+  brace-expansion@2.0.2:
+    dependencies:
+      balanced-match: 1.0.2
+
+  braces@3.0.3:
+    dependencies:
+      fill-range: 7.1.1
+
+  browserslist@4.26.3:
+    dependencies:
+      baseline-browser-mapping: 2.8.19
+      caniuse-lite: 1.0.30001751
+      electron-to-chromium: 1.5.238
+      node-releases: 2.0.26
+      update-browserslist-db: 1.1.3(browserslist@4.26.3)
+
+  bser@2.1.1:
+    dependencies:
+      node-int64: 0.4.0
+
+  buffer-from@1.1.2: {}
+
+  buffer@5.7.1:
+    dependencies:
+      base64-js: 1.5.1
+      ieee754: 1.2.1
+
+  call-bind-apply-helpers@1.0.2:
+    dependencies:
+      es-errors: 1.3.0
+      function-bind: 1.1.2
+
+  call-bind@1.0.8:
+    dependencies:
+      call-bind-apply-helpers: 1.0.2
+      es-define-property: 1.0.1
+      get-intrinsic: 1.3.0
+      set-function-length: 1.2.2
+
+  call-bound@1.0.4:
+    dependencies:
+      call-bind-apply-helpers: 1.0.2
+      get-intrinsic: 1.3.0
+
+  callsites@3.1.0: {}
+
+  camel-case@4.1.2:
+    dependencies:
+      pascal-case: 3.1.2
+      tslib: 2.8.1
+
+  camelcase-keys@6.2.2:
+    dependencies:
+      camelcase: 5.3.1
+      map-obj: 4.3.0
+      quick-lru: 4.0.1
+
+  camelcase-keys@7.0.2:
+    dependencies:
+      camelcase: 6.3.0
+      map-obj: 4.3.0
+      quick-lru: 5.1.1
+      type-fest: 1.4.0
+
+  camelcase@5.3.1: {}
+
+  camelcase@6.3.0: {}
+
+  caniuse-lite@1.0.30001751: {}
+
+  capital-case@1.0.4:
+    dependencies:
+      no-case: 3.0.4
+      tslib: 2.8.1
+      upper-case-first: 2.0.2
+
+  cardboard-vr-display@1.0.19:
+    dependencies:
+      gl-preserve-state: 1.0.0
+      nosleep.js: 0.7.0
+      webvr-polyfill-dpdb: 1.0.18
+
+  ccount@1.1.0: {}
+
+  chalk@4.1.2:
+    dependencies:
+      ansi-styles: 4.3.0
+      supports-color: 7.2.0
+
+  change-case-all@1.0.15:
+    dependencies:
+      change-case: 4.1.2
+      is-lower-case: 2.0.2
+      is-upper-case: 2.0.2
+      lower-case: 2.0.2
+      lower-case-first: 2.0.2
+      sponge-case: 1.0.1
+      swap-case: 2.0.2
+      title-case: 3.0.3
+      upper-case: 2.0.2
+      upper-case-first: 2.0.2
+
+  change-case@4.1.2:
+    dependencies:
+      camel-case: 4.1.2
+      capital-case: 1.0.4
+      constant-case: 3.0.4
+      dot-case: 3.0.4
+      header-case: 2.0.4
+      no-case: 3.0.4
+      param-case: 3.0.4
+      pascal-case: 3.1.2
+      path-case: 3.0.4
+      sentence-case: 3.0.4
+      snake-case: 3.0.4
+      tslib: 2.8.1
+
+  character-entities-legacy@1.1.4: {}
+
+  character-entities@1.2.4: {}
+
+  character-reference-invalid@1.1.4: {}
+
+  chardet@2.1.0: {}
+
+  chokidar@4.0.3:
+    dependencies:
+      readdirp: 4.1.2
+
+  classnames@2.5.1: {}
+
+  clean-stack@2.2.0: {}
+
+  cli-cursor@3.1.0:
+    dependencies:
+      restore-cursor: 3.1.0
+
+  cli-spinners@2.9.2: {}
+
+  cli-truncate@2.1.0:
+    dependencies:
+      slice-ansi: 3.0.0
+      string-width: 4.2.3
+
+  cli-width@3.0.0: {}
+
+  cliui@6.0.0:
+    dependencies:
+      string-width: 4.2.3
+      strip-ansi: 6.0.1
+      wrap-ansi: 6.2.0
+
+  cliui@8.0.1:
+    dependencies:
+      string-width: 4.2.3
+      strip-ansi: 6.0.1
+      wrap-ansi: 7.0.0
+
+  clone@1.0.4: {}
+
+  codem-isoboxer@0.3.9: {}
+
+  color-convert@2.0.1:
+    dependencies:
+      color-name: 1.1.4
+
+  color-name@1.1.4: {}
+
+  colord@2.9.3: {}
+
+  colorette@2.0.20: {}
+
+  comma-separated-tokens@1.0.8: {}
+
+  commander@2.20.3: {}
+
+  common-tags@1.8.2: {}
+
+  concat-map@0.0.1: {}
+
+  confusing-browser-globals@1.0.11: {}
+
+  constant-case@3.0.4:
+    dependencies:
+      no-case: 3.0.4
+      tslib: 2.8.1
+      upper-case: 2.0.2
+
+  convert-source-map@1.9.0: {}
+
+  convert-source-map@2.0.0: {}
+
+  cookie@0.4.2: {}
+
+  core-js-compat@3.46.0:
+    dependencies:
+      browserslist: 4.26.3
+
+  core-js@3.46.0: {}
+
+  cosmiconfig@7.1.0:
+    dependencies:
+      '@types/parse-json': 4.0.2
+      import-fresh: 3.3.1
+      parse-json: 5.2.0
+      path-type: 4.0.0
+      yaml: 1.10.2
+
+  cosmiconfig@8.3.6(typescript@4.8.4):
+    dependencies:
+      import-fresh: 3.3.1
+      js-yaml: 4.1.0
+      parse-json: 5.2.0
+      path-type: 4.0.0
+    optionalDependencies:
+      typescript: 4.8.4
+
+  create-require@1.1.1: {}
+
+  cross-fetch@3.2.0:
+    dependencies:
+      node-fetch: 2.7.0
+    transitivePeerDependencies:
+      - encoding
+
+  cross-inspect@1.0.1:
+    dependencies:
+      tslib: 2.8.1
+
+  cross-spawn@7.0.6:
+    dependencies:
+      path-key: 3.1.1
+      shebang-command: 2.0.0
+      which: 2.0.2
+
+  crypto-js@4.2.0: {}
+
+  css-functions-list@3.2.3: {}
+
+  css-tree@2.3.1:
+    dependencies:
+      mdn-data: 2.0.30
+      source-map-js: 1.2.1
+
+  cssesc@3.0.0: {}
+
+  csstype@3.1.3: {}
+
+  damerau-levenshtein@1.0.8: {}
+
+  dashjs@4.7.4:
+    dependencies:
+      bcp-47-match: 1.0.3
+      bcp-47-normalize: 1.1.1
+      codem-isoboxer: 0.3.9
+      es6-promise: 4.2.8
+      fast-deep-equal: 2.0.1
+      html-entities: 1.4.0
+      imsc: 1.1.5
+      localforage: 1.10.0
+      path-browserify: 1.0.1
+      ua-parser-js: 1.0.41
+
+  data-uri-to-buffer@4.0.1: {}
+
+  data-view-buffer@1.0.2:
+    dependencies:
+      call-bound: 1.0.4
+      es-errors: 1.3.0
+      is-data-view: 1.0.2
+
+  data-view-byte-length@1.0.2:
+    dependencies:
+      call-bound: 1.0.4
+      es-errors: 1.3.0
+      is-data-view: 1.0.2
+
+  data-view-byte-offset@1.0.1:
+    dependencies:
+      call-bound: 1.0.4
+      es-errors: 1.3.0
+      is-data-view: 1.0.2
+
+  dataloader@2.2.3: {}
+
+  date-fns@2.30.0:
+    dependencies:
+      '@babel/runtime': 7.28.4
+
+  debounce@1.2.1: {}
+
+  debug@3.2.7:
+    dependencies:
+      ms: 2.1.3
+
+  debug@4.4.1:
+    dependencies:
+      ms: 2.1.3
+
+  debug@4.4.3:
+    dependencies:
+      ms: 2.1.3
+
+  decamelize-keys@1.1.1:
+    dependencies:
+      decamelize: 1.2.0
+      map-obj: 1.0.1
+
+  decamelize@1.2.0: {}
+
+  decamelize@5.0.1: {}
+
+  decimal.js@10.6.0: {}
+
+  deep-is@0.1.4: {}
+
+  deepmerge@2.2.1: {}
+
+  defaults@1.0.4:
+    dependencies:
+      clone: 1.0.4
+
+  define-data-property@1.1.4:
+    dependencies:
+      es-define-property: 1.0.1
+      es-errors: 1.3.0
+      gopd: 1.2.0
+
+  define-properties@1.2.1:
+    dependencies:
+      define-data-property: 1.1.4
+      has-property-descriptors: 1.0.2
+      object-keys: 1.1.1
+
+  dependency-graph@0.11.0: {}
+
+  dequal@2.0.3: {}
+
+  detect-indent@6.1.0: {}
+
+  detect-libc@1.0.3:
+    optional: true
+
+  diacritics@1.3.0: {}
+
+  diff@4.0.2: {}
+
+  dir-glob@3.0.1:
+    dependencies:
+      path-type: 4.0.0
+
+  doctrine@2.1.0:
+    dependencies:
+      esutils: 2.0.3
+
+  doctrine@3.0.0:
+    dependencies:
+      esutils: 2.0.3
+
+  dom-helpers@5.2.1:
+    dependencies:
+      '@babel/runtime': 7.28.4
+      csstype: 3.1.3
+
+  dom-walk@0.1.2: {}
+
+  dot-case@3.0.4:
+    dependencies:
+      no-case: 3.0.4
+      tslib: 2.8.1
+
+  dotenv@16.6.1: {}
+
+  dset@3.1.4: {}
+
+  dunder-proto@1.0.1:
+    dependencies:
+      call-bind-apply-helpers: 1.0.2
+      es-errors: 1.3.0
+      gopd: 1.2.0
+
+  electron-to-chromium@1.5.238: {}
+
+  emoji-regex@8.0.0: {}
+
+  emoji-regex@9.2.2: {}
+
+  error-ex@1.3.4:
+    dependencies:
+      is-arrayish: 0.2.1
+
+  es-abstract@1.24.0:
+    dependencies:
+      array-buffer-byte-length: 1.0.2
+      arraybuffer.prototype.slice: 1.0.4
+      available-typed-arrays: 1.0.7
+      call-bind: 1.0.8
+      call-bound: 1.0.4
+      data-view-buffer: 1.0.2
+      data-view-byte-length: 1.0.2
+      data-view-byte-offset: 1.0.1
+      es-define-property: 1.0.1
+      es-errors: 1.3.0
+      es-object-atoms: 1.1.1
+      es-set-tostringtag: 2.1.0
+      es-to-primitive: 1.3.0
+      function.prototype.name: 1.1.8
+      get-intrinsic: 1.3.0
+      get-proto: 1.0.1
+      get-symbol-description: 1.1.0
+      globalthis: 1.0.4
+      gopd: 1.2.0
+      has-property-descriptors: 1.0.2
+      has-proto: 1.2.0
+      has-symbols: 1.1.0
+      hasown: 2.0.2
+      internal-slot: 1.1.0
+      is-array-buffer: 3.0.5
+      is-callable: 1.2.7
+      is-data-view: 1.0.2
+      is-negative-zero: 2.0.3
+      is-regex: 1.2.1
+      is-set: 2.0.3
+      is-shared-array-buffer: 1.0.4
+      is-string: 1.1.1
+      is-typed-array: 1.1.15
+      is-weakref: 1.1.1
+      math-intrinsics: 1.1.0
+      object-inspect: 1.13.4
+      object-keys: 1.1.1
+      object.assign: 4.1.7
+      own-keys: 1.0.1
+      regexp.prototype.flags: 1.5.4
+      safe-array-concat: 1.1.3
+      safe-push-apply: 1.0.0
+      safe-regex-test: 1.1.0
+      set-proto: 1.0.0
+      stop-iteration-iterator: 1.1.0
+      string.prototype.trim: 1.2.10
+      string.prototype.trimend: 1.0.9
+      string.prototype.trimstart: 1.0.8
+      typed-array-buffer: 1.0.3
+      typed-array-byte-length: 1.0.3
+      typed-array-byte-offset: 1.0.4
+      typed-array-length: 1.0.7
+      unbox-primitive: 1.1.0
+      which-typed-array: 1.1.19
+
+  es-define-property@1.0.1: {}
+
+  es-errors@1.3.0: {}
+
+  es-iterator-helpers@1.2.1:
+    dependencies:
+      call-bind: 1.0.8
+      call-bound: 1.0.4
+      define-properties: 1.2.1
+      es-abstract: 1.24.0
+      es-errors: 1.3.0
+      es-set-tostringtag: 2.1.0
+      function-bind: 1.1.2
+      get-intrinsic: 1.3.0
+      globalthis: 1.0.4
+      gopd: 1.2.0
+      has-property-descriptors: 1.0.2
+      has-proto: 1.2.0
+      has-symbols: 1.1.0
+      internal-slot: 1.1.0
+      iterator.prototype: 1.1.5
+      safe-array-concat: 1.1.3
+
+  es-object-atoms@1.1.1:
+    dependencies:
+      es-errors: 1.3.0
+
+  es-set-tostringtag@2.1.0:
+    dependencies:
+      es-errors: 1.3.0
+      get-intrinsic: 1.3.0
+      has-tostringtag: 1.0.2
+      hasown: 2.0.2
+
+  es-shim-unscopables@1.1.0:
+    dependencies:
+      hasown: 2.0.2
+
+  es-to-primitive@1.3.0:
+    dependencies:
+      is-callable: 1.2.7
+      is-date-object: 1.1.0
+      is-symbol: 1.1.1
+
+  es6-promise@4.2.8: {}
+
+  esbuild@0.18.20:
+    optionalDependencies:
+      '@esbuild/android-arm': 0.18.20
+      '@esbuild/android-arm64': 0.18.20
+      '@esbuild/android-x64': 0.18.20
+      '@esbuild/darwin-arm64': 0.18.20
+      '@esbuild/darwin-x64': 0.18.20
+      '@esbuild/freebsd-arm64': 0.18.20
+      '@esbuild/freebsd-x64': 0.18.20
+      '@esbuild/linux-arm': 0.18.20
+      '@esbuild/linux-arm64': 0.18.20
+      '@esbuild/linux-ia32': 0.18.20
+      '@esbuild/linux-loong64': 0.18.20
+      '@esbuild/linux-mips64el': 0.18.20
+      '@esbuild/linux-ppc64': 0.18.20
+      '@esbuild/linux-riscv64': 0.18.20
+      '@esbuild/linux-s390x': 0.18.20
+      '@esbuild/linux-x64': 0.18.20
+      '@esbuild/netbsd-x64': 0.18.20
+      '@esbuild/openbsd-x64': 0.18.20
+      '@esbuild/sunos-x64': 0.18.20
+      '@esbuild/win32-arm64': 0.18.20
+      '@esbuild/win32-ia32': 0.18.20
+      '@esbuild/win32-x64': 0.18.20
+
+  escalade@3.2.0: {}
+
+  escape-string-regexp@1.0.5: {}
+
+  escape-string-regexp@4.0.0: {}
+
+  eslint-config-airbnb-base@15.0.0(eslint-plugin-import@2.32.0(@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@4.8.4))(eslint@8.57.1))(eslint@8.57.1):
+    dependencies:
+      confusing-browser-globals: 1.0.11
+      eslint: 8.57.1
+      eslint-plugin-import: 2.32.0(@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@4.8.4))(eslint@8.57.1)
+      object.assign: 4.1.7
+      object.entries: 1.1.9
+      semver: 6.3.1
+
+  eslint-config-airbnb-typescript@17.1.0(@typescript-eslint/eslint-plugin@5.62.0(@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@4.8.4))(eslint@8.57.1)(typescript@4.8.4))(@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@4.8.4))(eslint-plugin-import@2.32.0(@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@4.8.4))(eslint@8.57.1))(eslint@8.57.1):
+    dependencies:
+      '@typescript-eslint/eslint-plugin': 5.62.0(@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@4.8.4))(eslint@8.57.1)(typescript@4.8.4)
+      '@typescript-eslint/parser': 5.62.0(eslint@8.57.1)(typescript@4.8.4)
+      eslint: 8.57.1
+      eslint-config-airbnb-base: 15.0.0(eslint-plugin-import@2.32.0(@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@4.8.4))(eslint@8.57.1))(eslint@8.57.1)
+      eslint-plugin-import: 2.32.0(@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@4.8.4))(eslint@8.57.1)
+
+  eslint-config-airbnb@19.0.4(eslint-plugin-import@2.32.0(@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@4.8.4))(eslint@8.57.1))(eslint-plugin-jsx-a11y@6.10.2(eslint@8.57.1))(eslint-plugin-react-hooks@4.6.2(eslint@8.57.1))(eslint-plugin-react@7.37.5(eslint@8.57.1))(eslint@8.57.1):
+    dependencies:
+      eslint: 8.57.1
+      eslint-config-airbnb-base: 15.0.0(eslint-plugin-import@2.32.0(@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@4.8.4))(eslint@8.57.1))(eslint@8.57.1)
+      eslint-plugin-import: 2.32.0(@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@4.8.4))(eslint@8.57.1)
+      eslint-plugin-jsx-a11y: 6.10.2(eslint@8.57.1)
+      eslint-plugin-react: 7.37.5(eslint@8.57.1)
+      eslint-plugin-react-hooks: 4.6.2(eslint@8.57.1)
+      object.assign: 4.1.7
+      object.entries: 1.1.9
+
+  eslint-config-prettier@8.10.2(eslint@8.57.1):
+    dependencies:
+      eslint: 8.57.1
+
+  eslint-import-resolver-node@0.3.9:
+    dependencies:
+      debug: 3.2.7
+      is-core-module: 2.16.1
+      resolve: 1.22.11
+    transitivePeerDependencies:
+      - supports-color
+
+  eslint-module-utils@2.12.1(@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@4.8.4))(eslint-import-resolver-node@0.3.9)(eslint@8.57.1):
+    dependencies:
+      debug: 3.2.7
+    optionalDependencies:
+      '@typescript-eslint/parser': 5.62.0(eslint@8.57.1)(typescript@4.8.4)
+      eslint: 8.57.1
+      eslint-import-resolver-node: 0.3.9
+    transitivePeerDependencies:
+      - supports-color
+
+  eslint-plugin-import@2.32.0(@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@4.8.4))(eslint@8.57.1):
+    dependencies:
+      '@rtsao/scc': 1.1.0
+      array-includes: 3.1.9
+      array.prototype.findlastindex: 1.2.6
+      array.prototype.flat: 1.3.3
+      array.prototype.flatmap: 1.3.3
+      debug: 3.2.7
+      doctrine: 2.1.0
+      eslint: 8.57.1
+      eslint-import-resolver-node: 0.3.9
+      eslint-module-utils: 2.12.1(@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@4.8.4))(eslint-import-resolver-node@0.3.9)(eslint@8.57.1)
+      hasown: 2.0.2
+      is-core-module: 2.16.1
+      is-glob: 4.0.3
+      minimatch: 3.1.2
+      object.fromentries: 2.0.8
+      object.groupby: 1.0.3
+      object.values: 1.2.1
+      semver: 6.3.1
+      string.prototype.trimend: 1.0.9
+      tsconfig-paths: 3.15.0
+    optionalDependencies:
+      '@typescript-eslint/parser': 5.62.0(eslint@8.57.1)(typescript@4.8.4)
+    transitivePeerDependencies:
+      - eslint-import-resolver-typescript
+      - eslint-import-resolver-webpack
+      - supports-color
+
+  eslint-plugin-jsx-a11y@6.10.2(eslint@8.57.1):
+    dependencies:
+      aria-query: 5.3.2
+      array-includes: 3.1.9
+      array.prototype.flatmap: 1.3.3
+      ast-types-flow: 0.0.8
+      axe-core: 4.11.0
+      axobject-query: 4.1.0
+      damerau-levenshtein: 1.0.8
+      emoji-regex: 9.2.2
+      eslint: 8.57.1
+      hasown: 2.0.2
+      jsx-ast-utils: 3.3.5
+      language-tags: 1.0.9
+      minimatch: 3.1.2
+      object.fromentries: 2.0.8
+      safe-regex-test: 1.1.0
+      string.prototype.includes: 2.0.1
+
+  eslint-plugin-react-hooks@4.6.2(eslint@8.57.1):
+    dependencies:
+      eslint: 8.57.1
+
+  eslint-plugin-react@7.37.5(eslint@8.57.1):
+    dependencies:
+      array-includes: 3.1.9
+      array.prototype.findlast: 1.2.5
+      array.prototype.flatmap: 1.3.3
+      array.prototype.tosorted: 1.1.4
+      doctrine: 2.1.0
+      es-iterator-helpers: 1.2.1
+      eslint: 8.57.1
+      estraverse: 5.3.0
+      hasown: 2.0.2
+      jsx-ast-utils: 3.3.5
+      minimatch: 3.1.2
+      object.entries: 1.1.9
+      object.fromentries: 2.0.8
+      object.values: 1.2.1
+      prop-types: 15.8.1
+      resolve: 2.0.0-next.5
+      semver: 6.3.1
+      string.prototype.matchall: 4.0.12
+      string.prototype.repeat: 1.0.0
+
+  eslint-scope@5.1.1:
+    dependencies:
+      esrecurse: 4.3.0
+      estraverse: 4.3.0
+
+  eslint-scope@7.2.2:
+    dependencies:
+      esrecurse: 4.3.0
+      estraverse: 5.3.0
+
+  eslint-visitor-keys@3.4.3: {}
+
+  eslint@8.57.1:
+    dependencies:
+      '@eslint-community/eslint-utils': 4.9.0(eslint@8.57.1)
+      '@eslint-community/regexpp': 4.12.1
+      '@eslint/eslintrc': 2.1.4
+      '@eslint/js': 8.57.1
+      '@humanwhocodes/config-array': 0.13.0
+      '@humanwhocodes/module-importer': 1.0.1
+      '@nodelib/fs.walk': 1.2.8
+      '@ungap/structured-clone': 1.3.0
+      ajv: 6.12.6
+      chalk: 4.1.2
+      cross-spawn: 7.0.6
+      debug: 4.4.3
+      doctrine: 3.0.0
+      escape-string-regexp: 4.0.0
+      eslint-scope: 7.2.2
+      eslint-visitor-keys: 3.4.3
+      espree: 9.6.1
+      esquery: 1.6.0
+      esutils: 2.0.3
+      fast-deep-equal: 3.1.3
+      file-entry-cache: 6.0.1
+      find-up: 5.0.0
+      glob-parent: 6.0.2
+      globals: 13.24.0
+      graphemer: 1.4.0
+      ignore: 5.3.2
+      imurmurhash: 0.1.4
+      is-glob: 4.0.3
+      is-path-inside: 3.0.3
+      js-yaml: 4.1.0
+      json-stable-stringify-without-jsonify: 1.0.1
+      levn: 0.4.1
+      lodash.merge: 4.6.2
+      minimatch: 3.1.2
+      natural-compare: 1.4.0
+      optionator: 0.9.4
+      strip-ansi: 6.0.1
+      text-table: 0.2.0
+    transitivePeerDependencies:
+      - supports-color
+
+  espree@9.6.1:
+    dependencies:
+      acorn: 8.15.0
+      acorn-jsx: 5.3.2(acorn@8.15.0)
+      eslint-visitor-keys: 3.4.3
+
+  esprima@4.0.1: {}
+
+  esquery@1.6.0:
+    dependencies:
+      estraverse: 5.3.0
+
+  esrecurse@4.3.0:
+    dependencies:
+      estraverse: 5.3.0
+
+  estraverse@4.3.0: {}
+
+  estraverse@5.3.0: {}
+
+  esutils@2.0.3: {}
+
+  event-target-polyfill@0.0.4: {}
+
+  extend@3.0.2: {}
+
+  extract-files@13.0.0:
+    dependencies:
+      is-plain-obj: 4.1.0
+
+  extract-react-intl-messages@4.1.1:
+    dependencies:
+      '@babel/core': 7.28.4
+      babel-plugin-react-intl: 7.9.4
+      flat: 5.0.2
+      glob: 7.2.3
+      js-yaml: 3.14.1
+      load-json-file: 6.2.0
+      lodash.merge: 4.6.2
+      lodash.mergewith: 4.6.2
+      lodash.pick: 4.4.0
+      meow: 6.1.1
+      mkdirp: 1.0.4
+      pify: 5.0.0
+      read-babelrc-up: 1.1.0
+      sort-keys: 4.2.0
+      write-json-file: 4.3.0
+    transitivePeerDependencies:
+      - supports-color
+      - ts-jest
+
+  fast-deep-equal@2.0.1: {}
+
+  fast-deep-equal@3.1.3: {}
+
+  fast-glob@3.3.3:
+    dependencies:
+      '@nodelib/fs.stat': 2.0.5
+      '@nodelib/fs.walk': 1.2.8
+      glob-parent: 5.1.2
+      merge2: 1.4.1
+      micromatch: 4.0.8
+
+  fast-json-stable-stringify@2.1.0: {}
+
+  fast-levenshtein@2.0.6: {}
+
+  fast-uri@3.1.0: {}
+
+  fastest-levenshtein@1.0.16: {}
+
+  fastq@1.19.1:
+    dependencies:
+      reusify: 1.1.0
+
+  fb-watchman@2.0.2:
+    dependencies:
+      bser: 2.1.1
+
+  fbjs-css-vars@1.0.2: {}
+
+  fbjs@3.0.5:
+    dependencies:
+      cross-fetch: 3.2.0
+      fbjs-css-vars: 1.0.2
+      loose-envify: 1.4.0
+      object-assign: 4.1.1
+      promise: 7.3.1
+      setimmediate: 1.0.5
+      ua-parser-js: 1.0.41
+    transitivePeerDependencies:
+      - encoding
+
+  fetch-blob@3.2.0:
+    dependencies:
+      node-domexception: 1.0.0
+      web-streams-polyfill: 3.3.3
+
+  fflate@0.6.10: {}
+
+  figures@3.2.0:
+    dependencies:
+      escape-string-regexp: 1.0.5
+
+  file-entry-cache@6.0.1:
+    dependencies:
+      flat-cache: 3.2.0
+
+  file-entry-cache@7.0.2:
+    dependencies:
+      flat-cache: 3.2.0
+
+  fill-range@7.1.1:
+    dependencies:
+      to-regex-range: 5.0.1
+
+  find-root@1.1.0: {}
+
+  find-up@4.1.0:
+    dependencies:
+      locate-path: 5.0.0
+      path-exists: 4.0.0
+
+  find-up@5.0.0:
+    dependencies:
+      locate-path: 6.0.0
+      path-exists: 4.0.0
+
+  flag-icons@6.15.0: {}
+
+  flat-cache@3.2.0:
+    dependencies:
+      flatted: 3.3.3
+      keyv: 4.5.4
+      rimraf: 3.0.2
+
+  flat@5.0.2: {}
+
+  flatted@3.3.3: {}
+
+  flexbin@0.2.0: {}
+
+  for-each@0.3.5:
+    dependencies:
+      is-callable: 1.2.7
+
+  formdata-polyfill@4.0.10:
+    dependencies:
+      fetch-blob: 3.2.0
+
+  formik@2.4.6(@types/react@17.0.89)(react@17.0.2):
+    dependencies:
+      '@types/hoist-non-react-statics': 3.3.7(@types/react@17.0.89)
+      deepmerge: 2.2.1
+      hoist-non-react-statics: 3.3.2
+      lodash: 4.17.21
+      lodash-es: 4.17.21
+      react: 17.0.2
+      react-fast-compare: 2.0.4
+      tiny-warning: 1.0.3
+      tslib: 2.8.1
+    transitivePeerDependencies:
+      - '@types/react'
+
+  fs-extra@10.1.0:
+    dependencies:
+      graceful-fs: 4.2.11
+      jsonfile: 6.2.0
+      universalify: 2.0.1
+
+  fs-extra@9.1.0:
+    dependencies:
+      at-least-node: 1.0.0
+      graceful-fs: 4.2.11
+      jsonfile: 6.2.0
+      universalify: 2.0.1
+
+  fs.realpath@1.0.0: {}
+
+  fsevents@2.3.3:
+    optional: true
+
+  function-bind@1.1.2: {}
+
+  function.prototype.name@1.1.8:
+    dependencies:
+      call-bind: 1.0.8
+      call-bound: 1.0.4
+      define-properties: 1.2.1
+      functions-have-names: 1.2.3
+      hasown: 2.0.2
+      is-callable: 1.2.7
+
+  functions-have-names@1.2.3: {}
+
+  generator-function@2.0.1: {}
+
+  gensync@1.0.0-beta.2: {}
+
+  get-caller-file@2.0.5: {}
+
+  get-intrinsic@1.3.0:
+    dependencies:
+      call-bind-apply-helpers: 1.0.2
+      es-define-property: 1.0.1
+      es-errors: 1.3.0
+      es-object-atoms: 1.1.1
+      function-bind: 1.1.2
+      get-proto: 1.0.1
+      gopd: 1.2.0
+      has-symbols: 1.1.0
+      hasown: 2.0.2
+      math-intrinsics: 1.1.0
+
+  get-proto@1.0.1:
+    dependencies:
+      dunder-proto: 1.0.1
+      es-object-atoms: 1.1.1
+
+  get-symbol-description@1.1.0:
+    dependencies:
+      call-bound: 1.0.4
+      es-errors: 1.3.0
+      get-intrinsic: 1.3.0
+
+  gl-preserve-state@1.0.0: {}
+
+  glob-parent@5.1.2:
+    dependencies:
+      is-glob: 4.0.3
+
+  glob-parent@6.0.2:
+    dependencies:
+      is-glob: 4.0.3
+
+  glob@7.2.3:
+    dependencies:
+      fs.realpath: 1.0.0
+      inflight: 1.0.6
+      inherits: 2.0.4
+      minimatch: 3.1.2
+      once: 1.4.0
+      path-is-absolute: 1.0.1
+
+  global-modules@2.0.0:
+    dependencies:
+      global-prefix: 3.0.0
+
+  global-prefix@3.0.0:
+    dependencies:
+      ini: 1.3.8
+      kind-of: 6.0.3
+      which: 1.3.1
+
+  global@4.4.0:
+    dependencies:
+      min-document: 2.19.0
+      process: 0.11.10
+
+  globals@13.24.0:
+    dependencies:
+      type-fest: 0.20.2
+
+  globalthis@1.0.4:
+    dependencies:
+      define-properties: 1.2.1
+      gopd: 1.2.0
+
+  globby@11.1.0:
+    dependencies:
+      array-union: 2.1.0
+      dir-glob: 3.0.1
+      fast-glob: 3.3.3
+      ignore: 5.3.2
+      merge2: 1.4.1
+      slash: 3.0.0
+
+  globjoin@0.1.4: {}
+
+  globrex@0.1.2: {}
+
+  gopd@1.2.0: {}
+
+  graceful-fs@4.2.11: {}
+
+  graphemer@1.4.0: {}
+
+  graphql-config@5.1.5(@types/node@18.19.130)(graphql@16.11.0)(typescript@4.8.4):
+    dependencies:
+      '@graphql-tools/graphql-file-loader': 8.1.2(graphql@16.11.0)
+      '@graphql-tools/json-file-loader': 8.0.20(graphql@16.11.0)
+      '@graphql-tools/load': 8.1.2(graphql@16.11.0)
+      '@graphql-tools/merge': 9.1.1(graphql@16.11.0)
+      '@graphql-tools/url-loader': 8.0.33(@types/node@18.19.130)(graphql@16.11.0)
+      '@graphql-tools/utils': 10.9.1(graphql@16.11.0)
+      cosmiconfig: 8.3.6(typescript@4.8.4)
+      graphql: 16.11.0
+      jiti: 2.6.1
+      minimatch: 9.0.5
+      string-env-interpolation: 1.0.1
+      tslib: 2.8.1
+    transitivePeerDependencies:
+      - '@fastify/websocket'
+      - '@types/node'
+      - bufferutil
+      - crossws
+      - supports-color
+      - typescript
+      - uWebSockets.js
+      - utf-8-validate
+
+  graphql-request@6.1.0(graphql@16.11.0):
+    dependencies:
+      '@graphql-typed-document-node/core': 3.2.0(graphql@16.11.0)
+      cross-fetch: 3.2.0
+      graphql: 16.11.0
+    transitivePeerDependencies:
+      - encoding
+
+  graphql-tag@2.12.6(graphql@16.11.0):
+    dependencies:
+      graphql: 16.11.0
+      tslib: 2.8.1
+
+  graphql-ws@5.16.2(graphql@16.11.0):
+    dependencies:
+      graphql: 16.11.0
+
+  graphql-ws@6.0.6(graphql@16.11.0)(ws@8.18.3):
+    dependencies:
+      graphql: 16.11.0
+    optionalDependencies:
+      ws: 8.18.3
+
+  graphql@16.11.0: {}
+
+  hard-rejection@2.1.0: {}
+
+  has-bigints@1.1.0: {}
+
+  has-flag@4.0.0: {}
+
+  has-property-descriptors@1.0.2:
+    dependencies:
+      es-define-property: 1.0.1
+
+  has-proto@1.2.0:
+    dependencies:
+      dunder-proto: 1.0.1
+
+  has-symbols@1.1.0: {}
+
+  has-tostringtag@1.0.2:
+    dependencies:
+      has-symbols: 1.1.0
+
+  hasown@2.0.2:
+    dependencies:
+      function-bind: 1.1.2
+
+  hast-to-hyperscript@9.0.1:
+    dependencies:
+      '@types/unist': 2.0.11
+      comma-separated-tokens: 1.0.8
+      property-information: 5.6.0
+      space-separated-tokens: 1.1.5
+      style-to-object: 0.3.0
+      unist-util-is: 4.1.0
+      web-namespaces: 1.1.4
+
+  header-case@2.0.4:
+    dependencies:
+      capital-case: 1.0.4
+      tslib: 2.8.1
+
+  history@4.10.1:
+    dependencies:
+      '@babel/runtime': 7.28.4
+      loose-envify: 1.4.0
+      resolve-pathname: 3.0.0
+      tiny-invariant: 1.3.3
+      tiny-warning: 1.0.3
+      value-equal: 1.0.1
+
+  hoist-non-react-statics@3.3.2:
+    dependencies:
+      react-is: 16.13.1
+
+  hosted-git-info@2.8.9: {}
+
+  hosted-git-info@4.1.0:
+    dependencies:
+      lru-cache: 6.0.0
+
+  html-entities@1.4.0: {}
+
+  html-tags@3.3.1: {}
+
+  http-proxy-agent@7.0.2:
+    dependencies:
+      agent-base: 7.1.4
+      debug: 4.4.3
+    transitivePeerDependencies:
+      - supports-color
+
+  https-proxy-agent@7.0.6:
+    dependencies:
+      agent-base: 7.1.4
+      debug: 4.4.3
+    transitivePeerDependencies:
+      - supports-color
+
+  i18n-iso-countries@7.14.0:
+    dependencies:
+      diacritics: 1.3.0
+
+  iconv-lite@0.7.0:
+    dependencies:
+      safer-buffer: 2.1.2
+
+  ieee754@1.2.1: {}
+
+  ignore@5.3.2: {}
+
+  immediate@3.0.6: {}
+
+  immutable@3.7.6: {}
+
+  immutable@5.1.4: {}
+
+  import-fresh@3.3.1:
+    dependencies:
+      parent-module: 1.0.1
+      resolve-from: 4.0.0
+
+  import-from@4.0.0: {}
+
+  import-lazy@4.0.0: {}
+
+  imsc@1.1.5:
+    dependencies:
+      sax: 1.2.1
+
+  imurmurhash@0.1.4: {}
+
+  indent-string@4.0.0: {}
+
+  indent-string@5.0.0: {}
+
+  individual@2.0.0: {}
+
+  inflight@1.0.6:
+    dependencies:
+      once: 1.4.0
+      wrappy: 1.0.2
+
+  inherits@2.0.4: {}
+
+  ini@1.3.8: {}
+
+  inline-style-parser@0.1.1: {}
+
+  inquirer@8.2.7(@types/node@18.19.130):
+    dependencies:
+      '@inquirer/external-editor': 1.0.2(@types/node@18.19.130)
+      ansi-escapes: 4.3.2
+      chalk: 4.1.2
+      cli-cursor: 3.1.0
+      cli-width: 3.0.0
+      figures: 3.2.0
+      lodash: 4.17.21
+      mute-stream: 0.0.8
+      ora: 5.4.1
+      run-async: 2.4.1
+      rxjs: 7.8.2
+      string-width: 4.2.3
+      strip-ansi: 6.0.1
+      through: 2.3.8
+      wrap-ansi: 6.2.0
+    transitivePeerDependencies:
+      - '@types/node'
+
+  internal-slot@1.1.0:
+    dependencies:
+      es-errors: 1.3.0
+      hasown: 2.0.2
+      side-channel: 1.1.0
+
+  intersection-observer@0.12.2: {}
+
+  intl-messageformat-parser@5.5.1:
+    dependencies:
+      '@formatjs/intl-numberformat': 5.7.6
+
+  intl-messageformat-parser@6.1.2:
+    dependencies:
+      '@formatjs/ecma402-abstract': 1.5.0
+      tslib: 2.8.1
+
+  intl-messageformat@10.7.7:
+    dependencies:
+      '@formatjs/ecma402-abstract': 2.2.4
+      '@formatjs/fast-memoize': 2.2.3
+      '@formatjs/icu-messageformat-parser': 2.9.4
+      tslib: 2.8.1
+
+  invariant@2.2.4:
+    dependencies:
+      loose-envify: 1.4.0
+
+  is-absolute@1.0.0:
+    dependencies:
+      is-relative: 1.0.0
+      is-windows: 1.0.2
+
+  is-alphabetical@1.0.4: {}
+
+  is-alphanumerical@1.0.4:
+    dependencies:
+      is-alphabetical: 1.0.4
+      is-decimal: 1.0.4
+
+  is-array-buffer@3.0.5:
+    dependencies:
+      call-bind: 1.0.8
+      call-bound: 1.0.4
+      get-intrinsic: 1.3.0
+
+  is-arrayish@0.2.1: {}
+
+  is-async-function@2.1.1:
+    dependencies:
+      async-function: 1.0.0
+      call-bound: 1.0.4
+      get-proto: 1.0.1
+      has-tostringtag: 1.0.2
+      safe-regex-test: 1.1.0
+
+  is-bigint@1.1.0:
+    dependencies:
+      has-bigints: 1.1.0
+
+  is-boolean-object@1.2.2:
+    dependencies:
+      call-bound: 1.0.4
+      has-tostringtag: 1.0.2
+
+  is-buffer@2.0.5: {}
+
+  is-callable@1.2.7: {}
+
+  is-core-module@2.16.1:
+    dependencies:
+      hasown: 2.0.2
+
+  is-data-view@1.0.2:
+    dependencies:
+      call-bound: 1.0.4
+      get-intrinsic: 1.3.0
+      is-typed-array: 1.1.15
+
+  is-date-object@1.1.0:
+    dependencies:
+      call-bound: 1.0.4
+      has-tostringtag: 1.0.2
+
+  is-decimal@1.0.4: {}
+
+  is-extglob@2.1.1: {}
+
+  is-finalizationregistry@1.1.1:
+    dependencies:
+      call-bound: 1.0.4
+
+  is-fullwidth-code-point@3.0.0: {}
+
+  is-function@1.0.2: {}
+
+  is-generator-function@1.1.2:
+    dependencies:
+      call-bound: 1.0.4
+      generator-function: 2.0.1
+      get-proto: 1.0.1
+      has-tostringtag: 1.0.2
+      safe-regex-test: 1.1.0
+
+  is-glob@4.0.3:
+    dependencies:
+      is-extglob: 2.1.1
+
+  is-hexadecimal@1.0.4: {}
+
+  is-interactive@1.0.0: {}
+
+  is-lower-case@2.0.2:
+    dependencies:
+      tslib: 2.8.1
+
+  is-map@2.0.3: {}
+
+  is-negative-zero@2.0.3: {}
+
+  is-number-object@1.1.1:
+    dependencies:
+      call-bound: 1.0.4
+      has-tostringtag: 1.0.2
+
+  is-number@7.0.0: {}
+
+  is-path-inside@3.0.3: {}
+
+  is-plain-obj@1.1.0: {}
+
+  is-plain-obj@2.1.0: {}
+
+  is-plain-obj@4.1.0: {}
+
+  is-plain-object@5.0.0: {}
+
+  is-regex@1.2.1:
+    dependencies:
+      call-bound: 1.0.4
+      gopd: 1.2.0
+      has-tostringtag: 1.0.2
+      hasown: 2.0.2
+
+  is-relative@1.0.0:
+    dependencies:
+      is-unc-path: 1.0.0
+
+  is-set@2.0.3: {}
+
+  is-shared-array-buffer@1.0.4:
+    dependencies:
+      call-bound: 1.0.4
+
+  is-string@1.1.1:
+    dependencies:
+      call-bound: 1.0.4
+      has-tostringtag: 1.0.2
+
+  is-symbol@1.1.1:
+    dependencies:
+      call-bound: 1.0.4
+      has-symbols: 1.1.0
+      safe-regex-test: 1.1.0
+
+  is-typed-array@1.1.15:
+    dependencies:
+      which-typed-array: 1.1.19
+
+  is-typedarray@1.0.0: {}
+
+  is-unc-path@1.0.0:
+    dependencies:
+      unc-path-regex: 0.1.2
+
+  is-unicode-supported@0.1.0: {}
+
+  is-upper-case@2.0.2:
+    dependencies:
+      tslib: 2.8.1
+
+  is-weakmap@2.0.2: {}
+
+  is-weakref@1.1.1:
+    dependencies:
+      call-bound: 1.0.4
+
+  is-weakset@2.0.4:
+    dependencies:
+      call-bound: 1.0.4
+      get-intrinsic: 1.3.0
+
+  is-windows@1.0.2: {}
+
+  isarray@0.0.1: {}
+
+  isarray@2.0.5: {}
+
+  isexe@2.0.0: {}
+
+  isomorphic-ws@5.0.0(ws@8.18.3):
+    dependencies:
+      ws: 8.18.3
+
+  iterator.prototype@1.1.5:
+    dependencies:
+      define-data-property: 1.1.4
+      es-object-atoms: 1.1.1
+      get-intrinsic: 1.3.0
+      get-proto: 1.0.1
+      has-symbols: 1.1.0
+      set-function-name: 2.0.2
+
+  jiti@1.21.7: {}
+
+  jiti@2.6.1: {}
+
+  jose@5.10.0: {}
+
+  jquery@3.7.1: {}
+
+  js-tokens@4.0.0: {}
+
+  js-yaml@3.14.1:
+    dependencies:
+      argparse: 1.0.10
+      esprima: 4.0.1
+
+  js-yaml@4.1.0:
+    dependencies:
+      argparse: 2.0.1
+
+  jsesc@3.1.0: {}
+
+  json-buffer@3.0.1: {}
+
+  json-parse-even-better-errors@2.3.1: {}
+
+  json-schema-traverse@0.4.1: {}
+
+  json-schema-traverse@1.0.0: {}
+
+  json-stable-stringify-without-jsonify@1.0.1: {}
+
+  json-to-pretty-yaml@1.2.2:
+    dependencies:
+      remedial: 1.0.8
+      remove-trailing-spaces: 1.0.9
+
+  json2mq@0.2.0:
+    dependencies:
+      string-convert: 0.2.1
+
+  json5@1.0.2:
+    dependencies:
+      minimist: 1.2.8
+
+  json5@2.2.3: {}
+
+  jsonfile@6.2.0:
+    dependencies:
+      universalify: 2.0.1
+    optionalDependencies:
+      graceful-fs: 4.2.11
+
+  jsx-ast-utils@3.3.5:
+    dependencies:
+      array-includes: 3.1.9
+      array.prototype.flat: 1.3.3
+      object.assign: 4.1.7
+      object.values: 1.2.1
+
+  keycode@2.2.1: {}
+
+  keyv@4.5.4:
+    dependencies:
+      json-buffer: 3.0.1
+
+  kind-of@6.0.3: {}
+
+  known-css-properties@0.29.0: {}
+
+  language-subtag-registry@0.3.23: {}
+
+  language-tags@1.0.9:
+    dependencies:
+      language-subtag-registry: 0.3.23
+
+  levn@0.4.1:
+    dependencies:
+      prelude-ls: 1.2.1
+      type-check: 0.4.0
+
+  lie@3.1.1:
+    dependencies:
+      immediate: 3.0.6
+
+  lil-gui@0.17.0: {}
+
+  lines-and-columns@1.2.4: {}
+
+  listr2@4.0.5:
+    dependencies:
+      cli-truncate: 2.1.0
+      colorette: 2.0.20
+      log-update: 4.0.0
+      p-map: 4.0.0
+      rfdc: 1.4.1
+      rxjs: 7.8.2
+      through: 2.3.8
+      wrap-ansi: 7.0.0
+
+  load-json-file@6.2.0:
+    dependencies:
+      graceful-fs: 4.2.11
+      parse-json: 5.2.0
+      strip-bom: 4.0.0
+      type-fest: 0.6.0
+
+  localforage@1.10.0:
+    dependencies:
+      lie: 3.1.1
+
+  locate-path@5.0.0:
+    dependencies:
+      p-locate: 4.1.0
+
+  locate-path@6.0.0:
+    dependencies:
+      p-locate: 5.0.0
+
+  lodash-es@4.17.21: {}
+
+  lodash.debounce@4.0.8: {}
+
+  lodash.merge@4.6.2: {}
+
+  lodash.mergewith@4.6.2: {}
+
+  lodash.pick@4.4.0: {}
+
+  lodash.sortby@4.7.0: {}
+
+  lodash.truncate@4.4.2: {}
+
+  lodash@4.17.21: {}
+
+  log-symbols@4.1.0:
+    dependencies:
+      chalk: 4.1.2
+      is-unicode-supported: 0.1.0
+
+  log-update@4.0.0:
+    dependencies:
+      ansi-escapes: 4.3.2
+      cli-cursor: 3.1.0
+      slice-ansi: 4.0.0
+      wrap-ansi: 6.2.0
+
+  longest-streak@2.0.4: {}
+
+  loose-envify@1.4.0:
+    dependencies:
+      js-tokens: 4.0.0
+
+  lower-case-first@2.0.2:
+    dependencies:
+      tslib: 2.8.1
+
+  lower-case@2.0.2:
+    dependencies:
+      tslib: 2.8.1
+
+  lru-cache@5.1.1:
+    dependencies:
+      yallist: 3.1.1
+
+  lru-cache@6.0.0:
+    dependencies:
+      yallist: 4.0.0
+
+  m3u8-parser@4.8.0:
+    dependencies:
+      '@babel/runtime': 7.28.4
+      '@videojs/vhs-utils': 3.0.5
+      global: 4.4.0
+
+  magic-string@0.27.0:
+    dependencies:
+      '@jridgewell/sourcemap-codec': 1.5.5
+
+  magic-string@0.30.19:
+    dependencies:
+      '@jridgewell/sourcemap-codec': 1.5.5
+
+  make-dir@3.1.0:
+    dependencies:
+      semver: 6.3.1
+
+  make-error@1.3.6: {}
+
+  map-cache@0.2.2: {}
+
+  map-obj@1.0.1: {}
+
+  map-obj@4.3.0: {}
+
+  markdown-table@2.0.0:
+    dependencies:
+      repeat-string: 1.6.1
+
+  math-intrinsics@1.1.0: {}
+
+  mathml-tag-names@2.1.3: {}
+
+  mdast-util-definitions@4.0.0:
+    dependencies:
+      unist-util-visit: 2.0.3
+
+  mdast-util-find-and-replace@1.1.1:
+    dependencies:
+      escape-string-regexp: 4.0.0
+      unist-util-is: 4.1.0
+      unist-util-visit-parents: 3.1.1
+
+  mdast-util-from-markdown@0.8.5:
+    dependencies:
+      '@types/mdast': 3.0.15
+      mdast-util-to-string: 2.0.0
+      micromark: 2.11.4
+      parse-entities: 2.0.0
+      unist-util-stringify-position: 2.0.3
+    transitivePeerDependencies:
+      - supports-color
+
+  mdast-util-gfm-autolink-literal@0.1.3:
+    dependencies:
+      ccount: 1.1.0
+      mdast-util-find-and-replace: 1.1.1
+      micromark: 2.11.4
+    transitivePeerDependencies:
+      - supports-color
+
+  mdast-util-gfm-strikethrough@0.2.3:
+    dependencies:
+      mdast-util-to-markdown: 0.6.5
+
+  mdast-util-gfm-table@0.1.6:
+    dependencies:
+      markdown-table: 2.0.0
+      mdast-util-to-markdown: 0.6.5
+
+  mdast-util-gfm-task-list-item@0.1.6:
+    dependencies:
+      mdast-util-to-markdown: 0.6.5
+
+  mdast-util-gfm@0.1.2:
+    dependencies:
+      mdast-util-gfm-autolink-literal: 0.1.3
+      mdast-util-gfm-strikethrough: 0.2.3
+      mdast-util-gfm-table: 0.1.6
+      mdast-util-gfm-task-list-item: 0.1.6
+      mdast-util-to-markdown: 0.6.5
+    transitivePeerDependencies:
+      - supports-color
+
+  mdast-util-to-hast@10.2.0:
+    dependencies:
+      '@types/mdast': 3.0.15
+      '@types/unist': 2.0.11
+      mdast-util-definitions: 4.0.0
+      mdurl: 1.0.1
+      unist-builder: 2.0.3
+      unist-util-generated: 1.1.6
+      unist-util-position: 3.1.0
+      unist-util-visit: 2.0.3
+
+  mdast-util-to-markdown@0.6.5:
+    dependencies:
+      '@types/unist': 2.0.11
+      longest-streak: 2.0.4
+      mdast-util-to-string: 2.0.0
+      parse-entities: 2.0.0
+      repeat-string: 1.6.1
+      zwitch: 1.0.5
+
+  mdast-util-to-string@2.0.0: {}
+
+  mdn-data@2.0.30: {}
+
+  mdurl@1.0.1: {}
+
+  memoize-one@6.0.0: {}
+
+  meow@10.1.5:
+    dependencies:
+      '@types/minimist': 1.2.5
+      camelcase-keys: 7.0.2
+      decamelize: 5.0.1
+      decamelize-keys: 1.1.1
+      hard-rejection: 2.1.0
+      minimist-options: 4.1.0
+      normalize-package-data: 3.0.3
+      read-pkg-up: 8.0.0
+      redent: 4.0.0
+      trim-newlines: 4.1.1
+      type-fest: 1.4.0
+      yargs-parser: 20.2.9
+
+  meow@6.1.1:
+    dependencies:
+      '@types/minimist': 1.2.5
+      camelcase-keys: 6.2.2
+      decamelize-keys: 1.1.1
+      hard-rejection: 2.1.0
+      minimist-options: 4.1.0
+      normalize-package-data: 2.5.0
+      read-pkg-up: 7.0.1
+      redent: 3.0.0
+      trim-newlines: 3.0.1
+      type-fest: 0.13.1
+      yargs-parser: 18.1.3
+
+  merge2@1.4.1: {}
+
+  meros@1.3.2(@types/node@18.19.130):
+    optionalDependencies:
+      '@types/node': 18.19.130
+
+  meshoptimizer@0.18.1: {}
+
+  micromark-extension-gfm-autolink-literal@0.5.7:
+    dependencies:
+      micromark: 2.11.4
+    transitivePeerDependencies:
+      - supports-color
+
+  micromark-extension-gfm-strikethrough@0.6.5:
+    dependencies:
+      micromark: 2.11.4
+    transitivePeerDependencies:
+      - supports-color
+
+  micromark-extension-gfm-table@0.4.3:
+    dependencies:
+      micromark: 2.11.4
+    transitivePeerDependencies:
+      - supports-color
+
+  micromark-extension-gfm-tagfilter@0.3.0: {}
+
+  micromark-extension-gfm-task-list-item@0.3.3:
+    dependencies:
+      micromark: 2.11.4
+    transitivePeerDependencies:
+      - supports-color
+
+  micromark-extension-gfm@0.3.3:
+    dependencies:
+      micromark: 2.11.4
+      micromark-extension-gfm-autolink-literal: 0.5.7
+      micromark-extension-gfm-strikethrough: 0.6.5
+      micromark-extension-gfm-table: 0.4.3
+      micromark-extension-gfm-tagfilter: 0.3.0
+      micromark-extension-gfm-task-list-item: 0.3.3
+    transitivePeerDependencies:
+      - supports-color
+
+  micromark@2.11.4:
+    dependencies:
+      debug: 4.4.3
+      parse-entities: 2.0.0
+    transitivePeerDependencies:
+      - supports-color
+
+  micromatch@4.0.8:
+    dependencies:
+      braces: 3.0.3
+      picomatch: 2.3.1
+
+  mimic-fn@2.1.0: {}
+
+  min-document@2.19.0:
+    dependencies:
+      dom-walk: 0.1.2
+
+  min-indent@1.0.1: {}
+
+  minimatch@3.1.2:
+    dependencies:
+      brace-expansion: 1.1.12
+
+  minimatch@9.0.5:
+    dependencies:
+      brace-expansion: 2.0.2
+
+  minimist-options@4.1.0:
+    dependencies:
+      arrify: 1.0.1
+      is-plain-obj: 1.1.0
+      kind-of: 6.0.3
+
+  minimist@1.2.8: {}
+
+  mkdirp@1.0.4: {}
+
+  moment@2.30.1: {}
+
+  mousetrap-pause@1.0.0: {}
+
+  mousetrap@1.6.5: {}
+
+  mpd-parser@0.22.1:
+    dependencies:
+      '@babel/runtime': 7.28.4
+      '@videojs/vhs-utils': 3.0.5
+      '@xmldom/xmldom': 0.8.11
+      global: 4.4.0
+
+  ms@2.1.3: {}
+
+  mute-stream@0.0.8: {}
+
+  mux.js@6.0.1:
+    dependencies:
+      '@babel/runtime': 7.28.4
+      global: 4.4.0
+
+  nanoid@3.3.11: {}
+
+  natural-compare-lite@1.4.0: {}
+
+  natural-compare@1.4.0: {}
+
+  no-case@3.0.4:
+    dependencies:
+      lower-case: 2.0.2
+      tslib: 2.8.1
+
+  node-addon-api@7.1.1:
+    optional: true
+
+  node-domexception@1.0.0: {}
+
+  node-fetch@2.7.0:
+    dependencies:
+      whatwg-url: 5.0.0
+
+  node-fetch@3.3.2:
+    dependencies:
+      data-uri-to-buffer: 4.0.1
+      fetch-blob: 3.2.0
+      formdata-polyfill: 4.0.10
+
+  node-int64@0.4.0: {}
+
+  node-releases@2.0.26: {}
+
+  normalize-package-data@2.5.0:
+    dependencies:
+      hosted-git-info: 2.8.9
+      resolve: 1.22.11
+      semver: 5.7.2
+      validate-npm-package-license: 3.0.4
+
+  normalize-package-data@3.0.3:
+    dependencies:
+      hosted-git-info: 4.1.0
+      is-core-module: 2.16.1
+      semver: 7.7.3
+      validate-npm-package-license: 3.0.4
+
+  normalize-path@2.1.1:
+    dependencies:
+      remove-trailing-separator: 1.1.0
+
+  normalize-path@3.0.0: {}
+
+  normalize-url@4.5.1: {}
+
+  nosleep.js@0.7.0: {}
+
+  nullthrows@1.1.1: {}
+
+  object-assign@4.1.1: {}
+
+  object-inspect@1.13.4: {}
+
+  object-keys@1.1.1: {}
+
+  object.assign@4.1.7:
+    dependencies:
+      call-bind: 1.0.8
+      call-bound: 1.0.4
+      define-properties: 1.2.1
+      es-object-atoms: 1.1.1
+      has-symbols: 1.1.0
+      object-keys: 1.1.1
+
+  object.entries@1.1.9:
+    dependencies:
+      call-bind: 1.0.8
+      call-bound: 1.0.4
+      define-properties: 1.2.1
+      es-object-atoms: 1.1.1
+
+  object.fromentries@2.0.8:
+    dependencies:
+      call-bind: 1.0.8
+      define-properties: 1.2.1
+      es-abstract: 1.24.0
+      es-object-atoms: 1.1.1
+
+  object.groupby@1.0.3:
+    dependencies:
+      call-bind: 1.0.8
+      define-properties: 1.2.1
+      es-abstract: 1.24.0
+
+  object.values@1.2.1:
+    dependencies:
+      call-bind: 1.0.8
+      call-bound: 1.0.4
+      define-properties: 1.2.1
+      es-object-atoms: 1.1.1
+
+  once@1.4.0:
+    dependencies:
+      wrappy: 1.0.2
+
+  onetime@5.1.2:
+    dependencies:
+      mimic-fn: 2.1.0
+
+  optimism@0.18.1:
+    dependencies:
+      '@wry/caches': 1.0.1
+      '@wry/context': 0.7.4
+      '@wry/trie': 0.5.0
+      tslib: 2.8.1
+
+  optionator@0.9.4:
+    dependencies:
+      deep-is: 0.1.4
+      fast-levenshtein: 2.0.6
+      levn: 0.4.1
+      prelude-ls: 1.2.1
+      type-check: 0.4.0
+      word-wrap: 1.2.5
+
+  ora@5.4.1:
+    dependencies:
+      bl: 4.1.0
+      chalk: 4.1.2
+      cli-cursor: 3.1.0
+      cli-spinners: 2.9.2
+      is-interactive: 1.0.0
+      is-unicode-supported: 0.1.0
+      log-symbols: 4.1.0
+      strip-ansi: 6.0.1
+      wcwidth: 1.0.1
+
+  own-keys@1.0.1:
+    dependencies:
+      get-intrinsic: 1.3.0
+      object-keys: 1.1.1
+      safe-push-apply: 1.0.0
+
+  p-limit@2.3.0:
+    dependencies:
+      p-try: 2.2.0
+
+  p-limit@3.1.0:
+    dependencies:
+      yocto-queue: 0.1.0
+
+  p-locate@4.1.0:
+    dependencies:
+      p-limit: 2.3.0
+
+  p-locate@5.0.0:
+    dependencies:
+      p-limit: 3.1.0
+
+  p-map@4.0.0:
+    dependencies:
+      aggregate-error: 3.1.0
+
+  p-try@2.2.0: {}
+
+  param-case@3.0.4:
+    dependencies:
+      dot-case: 3.0.4
+      tslib: 2.8.1
+
+  parent-module@1.0.1:
+    dependencies:
+      callsites: 3.1.0
+
+  parse-entities@2.0.0:
+    dependencies:
+      character-entities: 1.2.4
+      character-entities-legacy: 1.1.4
+      character-reference-invalid: 1.1.4
+      is-alphanumerical: 1.0.4
+      is-decimal: 1.0.4
+      is-hexadecimal: 1.0.4
+
+  parse-filepath@1.0.2:
+    dependencies:
+      is-absolute: 1.0.0
+      map-cache: 0.2.2
+      path-root: 0.1.1
+
+  parse-json@5.2.0:
+    dependencies:
+      '@babel/code-frame': 7.27.1
+      error-ex: 1.3.4
+      json-parse-even-better-errors: 2.3.1
+      lines-and-columns: 1.2.4
+
+  pascal-case@3.1.2:
+    dependencies:
+      no-case: 3.0.4
+      tslib: 2.8.1
+
+  path-browserify@1.0.1: {}
+
+  path-case@3.0.4:
+    dependencies:
+      dot-case: 3.0.4
+      tslib: 2.8.1
+
+  path-exists@4.0.0: {}
+
+  path-is-absolute@1.0.1: {}
+
+  path-key@3.1.1: {}
+
+  path-parse@1.0.7: {}
+
+  path-root-regex@0.1.2: {}
+
+  path-root@0.1.1:
+    dependencies:
+      path-root-regex: 0.1.2
+
+  path-to-regexp@1.9.0:
+    dependencies:
+      isarray: 0.0.1
+
+  path-type@4.0.0: {}
+
+  picocolors@1.1.1: {}
+
+  picomatch@2.3.1: {}
+
+  pify@5.0.0: {}
+
+  pkcs7@1.0.4:
+    dependencies:
+      '@babel/runtime': 7.28.4
+
+  popper.js@1.16.1: {}
+
+  possible-typed-array-names@1.1.0: {}
+
+  postcss-resolve-nested-selector@0.1.6: {}
+
+  postcss-safe-parser@6.0.0(postcss@8.5.6):
+    dependencies:
+      postcss: 8.5.6
+
+  postcss-scss@4.0.9(postcss@8.5.6):
+    dependencies:
+      postcss: 8.5.6
+
+  postcss-selector-parser@6.1.2:
+    dependencies:
+      cssesc: 3.0.0
+      util-deprecate: 1.0.2
+
+  postcss-sorting@8.0.2(postcss@8.5.6):
+    dependencies:
+      postcss: 8.5.6
+
+  postcss-value-parser@4.2.0: {}
+
+  postcss@8.5.6:
+    dependencies:
+      nanoid: 3.3.11
+      picocolors: 1.1.1
+      source-map-js: 1.2.1
+
+  prelude-ls@1.2.1: {}
+
+  prettier@2.8.8: {}
+
+  process@0.11.10: {}
+
+  promise@7.3.1:
+    dependencies:
+      asap: 2.0.6
+
+  prop-types-extra@1.1.1(react@17.0.2):
+    dependencies:
+      react: 17.0.2
+      react-is: 16.13.1
+      warning: 4.0.3
+
+  prop-types@15.7.2:
+    dependencies:
+      loose-envify: 1.4.0
+      object-assign: 4.1.1
+      react-is: 16.13.1
+
+  prop-types@15.8.1:
+    dependencies:
+      loose-envify: 1.4.0
+      object-assign: 4.1.1
+      react-is: 16.13.1
+
+  property-expr@2.0.6: {}
+
+  property-information@5.6.0:
+    dependencies:
+      xtend: 4.0.2
+
+  punycode@2.3.1: {}
+
+  queue-microtask@1.2.3: {}
+
+  quick-lru@4.0.1: {}
+
+  quick-lru@5.1.1: {}
+
+  react-bootstrap@1.6.8(react-dom@17.0.2(react@17.0.2))(react@17.0.2):
+    dependencies:
+      '@babel/runtime': 7.28.4
+      '@restart/context': 2.1.4(react@17.0.2)
+      '@restart/hooks': 0.4.16(react@17.0.2)
+      '@types/invariant': 2.2.37
+      '@types/prop-types': 15.7.15
+      '@types/react': 17.0.89
+      '@types/react-transition-group': 4.4.12(@types/react@17.0.89)
+      '@types/warning': 3.0.3
+      classnames: 2.5.1
+      dom-helpers: 5.2.1
+      invariant: 2.2.4
+      prop-types: 15.8.1
+      prop-types-extra: 1.1.1(react@17.0.2)
+      react: 17.0.2
+      react-dom: 17.0.2(react@17.0.2)
+      react-overlays: 5.2.1(react-dom@17.0.2(react@17.0.2))(react@17.0.2)
+      react-transition-group: 4.4.5(react-dom@17.0.2(react@17.0.2))(react@17.0.2)
+      uncontrollable: 7.2.1(react@17.0.2)
+      warning: 4.0.3
+
+  react-datepicker@4.25.0(react-dom@17.0.2(react@17.0.2))(react@17.0.2):
+    dependencies:
+      '@popperjs/core': 2.11.8
+      classnames: 2.5.1
+      date-fns: 2.30.0
+      prop-types: 15.8.1
+      react: 17.0.2
+      react-dom: 17.0.2(react@17.0.2)
+      react-onclickoutside: 6.13.2(react-dom@17.0.2(react@17.0.2))(react@17.0.2)
+      react-popper: 2.3.0(@popperjs/core@2.11.8)(react-dom@17.0.2(react@17.0.2))(react@17.0.2)
+
+  react-dom@17.0.2(react@17.0.2):
+    dependencies:
+      loose-envify: 1.4.0
+      object-assign: 4.1.1
+      react: 17.0.2
+      scheduler: 0.20.2
+
+  react-fast-compare@2.0.4: {}
+
+  react-fast-compare@3.2.2: {}
+
+  react-helmet@6.1.0(react@17.0.2):
+    dependencies:
+      object-assign: 4.1.1
+      prop-types: 15.8.1
+      react: 17.0.2
+      react-fast-compare: 3.2.2
+      react-side-effect: 2.1.2(react@17.0.2)
+
+  react-intl@6.8.9(react@17.0.2)(typescript@4.8.4):
+    dependencies:
+      '@formatjs/ecma402-abstract': 2.2.4
+      '@formatjs/icu-messageformat-parser': 2.9.4
+      '@formatjs/intl': 2.10.15(typescript@4.8.4)
+      '@formatjs/intl-displaynames': 6.8.5
+      '@formatjs/intl-listformat': 7.7.5
+      '@types/hoist-non-react-statics': 3.3.7(@types/react@17.0.89)
+      '@types/react': 17.0.89
+      hoist-non-react-statics: 3.3.2
+      intl-messageformat: 10.7.7
+      react: 17.0.2
+      tslib: 2.8.1
+    optionalDependencies:
+      typescript: 4.8.4
+
+  react-is@16.13.1: {}
+
+  react-lifecycles-compat@3.0.4: {}
+
+  react-onclickoutside@6.13.2(react-dom@17.0.2(react@17.0.2))(react@17.0.2):
+    dependencies:
+      react: 17.0.2
+      react-dom: 17.0.2(react@17.0.2)
+
+  react-overlays@5.2.1(react-dom@17.0.2(react@17.0.2))(react@17.0.2):
+    dependencies:
+      '@babel/runtime': 7.28.4
+      '@popperjs/core': 2.11.8
+      '@restart/hooks': 0.4.16(react@17.0.2)
+      '@types/warning': 3.0.3
+      dom-helpers: 5.2.1
+      prop-types: 15.8.1
+      react: 17.0.2
+      react-dom: 17.0.2(react@17.0.2)
+      uncontrollable: 7.2.1(react@17.0.2)
+      warning: 4.0.3
+
+  react-photo-gallery@8.0.0(react-dom@17.0.2(react@17.0.2))(react@17.0.2):
+    dependencies:
+      prop-types: 15.7.2
+      react: 17.0.2
+      react-dom: 17.0.2(react@17.0.2)
+      resize-observer-polyfill: 1.5.1
+
+  react-popper@2.3.0(@popperjs/core@2.11.8)(react-dom@17.0.2(react@17.0.2))(react@17.0.2):
+    dependencies:
+      '@popperjs/core': 2.11.8
+      react: 17.0.2
+      react-dom: 17.0.2(react@17.0.2)
+      react-fast-compare: 3.2.2
+      warning: 4.0.3
+
+  react-refresh@0.14.2: {}
+
+  react-remark@2.1.0(react@17.0.2):
+    dependencies:
+      react: 17.0.2
+      rehype-react: 6.2.1
+      remark-parse: 9.0.0
+      remark-rehype: 8.1.0
+      unified: 9.2.2
+    transitivePeerDependencies:
+      - supports-color
+
+  react-router-bootstrap@0.25.0(react-router-dom@5.3.4(react@17.0.2))(react@17.0.2):
+    dependencies:
+      prop-types: 15.8.1
+      react: 17.0.2
+      react-router-dom: 5.3.4(react@17.0.2)
+
+  react-router-dom@5.3.4(react@17.0.2):
+    dependencies:
+      '@babel/runtime': 7.28.4
+      history: 4.10.1
+      loose-envify: 1.4.0
+      prop-types: 15.8.1
+      react: 17.0.2
+      react-router: 5.3.4(react@17.0.2)
+      tiny-invariant: 1.3.3
+      tiny-warning: 1.0.3
+
+  react-router-hash-link@2.4.3(react-router-dom@5.3.4(react@17.0.2))(react@17.0.2):
+    dependencies:
+      prop-types: 15.8.1
+      react: 17.0.2
+      react-router-dom: 5.3.4(react@17.0.2)
+
+  react-router@5.3.4(react@17.0.2):
+    dependencies:
+      '@babel/runtime': 7.28.4
+      history: 4.10.1
+      hoist-non-react-statics: 3.3.2
+      loose-envify: 1.4.0
+      path-to-regexp: 1.9.0
+      prop-types: 15.8.1
+      react: 17.0.2
+      react-is: 16.13.1
+      tiny-invariant: 1.3.3
+      tiny-warning: 1.0.3
+
+  react-select@5.10.2(@types/react@17.0.89)(react-dom@17.0.2(react@17.0.2))(react@17.0.2):
+    dependencies:
+      '@babel/runtime': 7.28.4
+      '@emotion/cache': 11.14.0
+      '@emotion/react': 11.14.0(@types/react@17.0.89)(react@17.0.2)
+      '@floating-ui/dom': 1.7.4
+      '@types/react-transition-group': 4.4.12(@types/react@17.0.89)
+      memoize-one: 6.0.0
+      prop-types: 15.8.1
+      react: 17.0.2
+      react-dom: 17.0.2(react@17.0.2)
+      react-transition-group: 4.4.5(react-dom@17.0.2(react@17.0.2))(react@17.0.2)
+      use-isomorphic-layout-effect: 1.2.1(@types/react@17.0.89)(react@17.0.2)
+    transitivePeerDependencies:
+      - '@types/react'
+      - supports-color
+
+  react-side-effect@2.1.2(react@17.0.2):
+    dependencies:
+      react: 17.0.2
+
+  react-transition-group@4.4.5(react-dom@17.0.2(react@17.0.2))(react@17.0.2):
+    dependencies:
+      '@babel/runtime': 7.28.4
+      dom-helpers: 5.2.1
+      loose-envify: 1.4.0
+      prop-types: 15.8.1
+      react: 17.0.2
+      react-dom: 17.0.2(react@17.0.2)
+
+  react@17.0.2:
+    dependencies:
+      loose-envify: 1.4.0
+      object-assign: 4.1.1
+
+  read-babelrc-up@1.1.0:
+    dependencies:
+      find-up: 4.1.0
+      json5: 2.2.3
+
+  read-pkg-up@7.0.1:
+    dependencies:
+      find-up: 4.1.0
+      read-pkg: 5.2.0
+      type-fest: 0.8.1
+
+  read-pkg-up@8.0.0:
+    dependencies:
+      find-up: 5.0.0
+      read-pkg: 6.0.0
+      type-fest: 1.4.0
+
+  read-pkg@5.2.0:
+    dependencies:
+      '@types/normalize-package-data': 2.4.4
+      normalize-package-data: 2.5.0
+      parse-json: 5.2.0
+      type-fest: 0.6.0
+
+  read-pkg@6.0.0:
+    dependencies:
+      '@types/normalize-package-data': 2.4.4
+      normalize-package-data: 3.0.3
+      parse-json: 5.2.0
+      type-fest: 1.4.0
+
+  readable-stream@3.6.2:
+    dependencies:
+      inherits: 2.0.4
+      string_decoder: 1.3.0
+      util-deprecate: 1.0.2
+
+  readdirp@4.1.2: {}
+
+  redent@3.0.0:
+    dependencies:
+      indent-string: 4.0.0
+      strip-indent: 3.0.0
+
+  redent@4.0.0:
+    dependencies:
+      indent-string: 5.0.0
+      strip-indent: 4.1.1
+
+  reflect.getprototypeof@1.0.10:
+    dependencies:
+      call-bind: 1.0.8
+      define-properties: 1.2.1
+      es-abstract: 1.24.0
+      es-errors: 1.3.0
+      es-object-atoms: 1.1.1
+      get-intrinsic: 1.3.0
+      get-proto: 1.0.1
+      which-builtin-type: 1.2.1
+
+  regenerate-unicode-properties@10.2.2:
+    dependencies:
+      regenerate: 1.4.2
+
+  regenerate@1.4.2: {}
+
+  regenerator-runtime@0.13.11: {}
+
+  regexp.prototype.flags@1.5.4:
+    dependencies:
+      call-bind: 1.0.8
+      define-properties: 1.2.1
+      es-errors: 1.3.0
+      get-proto: 1.0.1
+      gopd: 1.2.0
+      set-function-name: 2.0.2
+
+  regexpu-core@6.4.0:
+    dependencies:
+      regenerate: 1.4.2
+      regenerate-unicode-properties: 10.2.2
+      regjsgen: 0.8.0
+      regjsparser: 0.13.0
+      unicode-match-property-ecmascript: 2.0.0
+      unicode-match-property-value-ecmascript: 2.2.1
+
+  regjsgen@0.8.0: {}
+
+  regjsparser@0.13.0:
+    dependencies:
+      jsesc: 3.1.0
+
+  rehackt@0.1.0(@types/react@17.0.89)(react@17.0.2):
+    optionalDependencies:
+      '@types/react': 17.0.89
+      react: 17.0.2
+
+  rehype-react@6.2.1:
+    dependencies:
+      '@mapbox/hast-util-table-cell-style': 0.2.1
+      hast-to-hyperscript: 9.0.1
+
+  relay-runtime@12.0.0:
+    dependencies:
+      '@babel/runtime': 7.28.4
+      fbjs: 3.0.5
+      invariant: 2.2.4
+    transitivePeerDependencies:
+      - encoding
+
+  remark-gfm@1.0.0:
+    dependencies:
+      mdast-util-gfm: 0.1.2
+      micromark-extension-gfm: 0.3.3
+    transitivePeerDependencies:
+      - supports-color
+
+  remark-parse@9.0.0:
+    dependencies:
+      mdast-util-from-markdown: 0.8.5
+    transitivePeerDependencies:
+      - supports-color
+
+  remark-rehype@8.1.0:
+    dependencies:
+      mdast-util-to-hast: 10.2.0
+
+  remedial@1.0.8: {}
+
+  remove-trailing-separator@1.1.0: {}
+
+  remove-trailing-spaces@1.0.9: {}
+
+  repeat-string@1.6.1: {}
+
+  require-directory@2.1.1: {}
+
+  require-from-string@2.0.2: {}
+
+  require-main-filename@2.0.0: {}
+
+  resize-observer-polyfill@1.5.1: {}
+
+  resolve-from@4.0.0: {}
+
+  resolve-from@5.0.0: {}
+
+  resolve-pathname@3.0.0: {}
+
+  resolve@1.22.11:
+    dependencies:
+      is-core-module: 2.16.1
+      path-parse: 1.0.7
+      supports-preserve-symlinks-flag: 1.0.0
+
+  resolve@2.0.0-next.5:
+    dependencies:
+      is-core-module: 2.16.1
+      path-parse: 1.0.7
+      supports-preserve-symlinks-flag: 1.0.0
+
+  restore-cursor@3.1.0:
+    dependencies:
+      onetime: 5.1.2
+      signal-exit: 3.0.7
+
+  reusify@1.1.0: {}
+
+  rfdc@1.4.1: {}
+
+  rimraf@3.0.2:
+    dependencies:
+      glob: 7.2.3
+
+  rollup@3.29.5:
+    optionalDependencies:
+      fsevents: 2.3.3
+
+  run-async@2.4.1: {}
+
+  run-parallel@1.2.0:
+    dependencies:
+      queue-microtask: 1.2.3
+
+  rust-result@1.0.0:
+    dependencies:
+      individual: 2.0.0
+
+  rxjs@7.8.2:
+    dependencies:
+      tslib: 2.8.1
+
+  safe-array-concat@1.1.3:
+    dependencies:
+      call-bind: 1.0.8
+      call-bound: 1.0.4
+      get-intrinsic: 1.3.0
+      has-symbols: 1.1.0
+      isarray: 2.0.5
+
+  safe-buffer@5.2.1: {}
+
+  safe-json-parse@4.0.0:
+    dependencies:
+      rust-result: 1.0.0
+
+  safe-push-apply@1.0.0:
+    dependencies:
+      es-errors: 1.3.0
+      isarray: 2.0.5
+
+  safe-regex-test@1.1.0:
+    dependencies:
+      call-bound: 1.0.4
+      es-errors: 1.3.0
+      is-regex: 1.2.1
+
+  safer-buffer@2.1.2: {}
+
+  sass@1.93.2:
+    dependencies:
+      chokidar: 4.0.3
+      immutable: 5.1.4
+      source-map-js: 1.2.1
+    optionalDependencies:
+      '@parcel/watcher': 2.5.1
+
+  sax@1.2.1: {}
+
+  scheduler@0.20.2:
+    dependencies:
+      loose-envify: 1.4.0
+      object-assign: 4.1.1
+
+  schema-utils@2.7.1:
+    dependencies:
+      '@types/json-schema': 7.0.15
+      ajv: 6.12.6
+      ajv-keywords: 3.5.2(ajv@6.12.6)
+
+  scuid@1.1.0: {}
+
+  semver@5.7.2: {}
+
+  semver@6.3.1: {}
+
+  semver@7.7.3: {}
+
+  sentence-case@3.0.4:
+    dependencies:
+      no-case: 3.0.4
+      tslib: 2.8.1
+      upper-case-first: 2.0.2
+
+  set-blocking@2.0.0: {}
+
+  set-function-length@1.2.2:
+    dependencies:
+      define-data-property: 1.1.4
+      es-errors: 1.3.0
+      function-bind: 1.1.2
+      get-intrinsic: 1.3.0
+      gopd: 1.2.0
+      has-property-descriptors: 1.0.2
+
+  set-function-name@2.0.2:
+    dependencies:
+      define-data-property: 1.1.4
+      es-errors: 1.3.0
+      functions-have-names: 1.2.3
+      has-property-descriptors: 1.0.2
+
+  set-proto@1.0.0:
+    dependencies:
+      dunder-proto: 1.0.1
+      es-errors: 1.3.0
+      es-object-atoms: 1.1.1
+
+  setimmediate@1.0.5: {}
+
+  shebang-command@2.0.0:
+    dependencies:
+      shebang-regex: 3.0.0
+
+  shebang-regex@3.0.0: {}
+
+  shell-quote@1.8.3: {}
+
+  side-channel-list@1.0.0:
+    dependencies:
+      es-errors: 1.3.0
+      object-inspect: 1.13.4
+
+  side-channel-map@1.0.1:
+    dependencies:
+      call-bound: 1.0.4
+      es-errors: 1.3.0
+      get-intrinsic: 1.3.0
+      object-inspect: 1.13.4
+
+  side-channel-weakmap@1.0.2:
+    dependencies:
+      call-bound: 1.0.4
+      es-errors: 1.3.0
+      get-intrinsic: 1.3.0
+      object-inspect: 1.13.4
+      side-channel-map: 1.0.1
+
+  side-channel@1.1.0:
+    dependencies:
+      es-errors: 1.3.0
+      object-inspect: 1.13.4
+      side-channel-list: 1.0.0
+      side-channel-map: 1.0.1
+      side-channel-weakmap: 1.0.2
+
+  signal-exit@3.0.7: {}
+
+  signal-exit@4.1.0: {}
+
+  signedsource@1.0.0: {}
+
+  slash@3.0.0: {}
+
+  slice-ansi@3.0.0:
+    dependencies:
+      ansi-styles: 4.3.0
+      astral-regex: 2.0.0
+      is-fullwidth-code-point: 3.0.0
+
+  slice-ansi@4.0.0:
+    dependencies:
+      ansi-styles: 4.3.0
+      astral-regex: 2.0.0
+      is-fullwidth-code-point: 3.0.0
+
+  slick-carousel@1.8.1(jquery@3.7.1):
+    dependencies:
+      jquery: 3.7.1
+
+  snake-case@3.0.4:
+    dependencies:
+      dot-case: 3.0.4
+      tslib: 2.8.1
+
+  sort-keys@4.2.0:
+    dependencies:
+      is-plain-obj: 2.1.0
+
+  source-map-js@1.2.1: {}
+
+  source-map-support@0.5.21:
+    dependencies:
+      buffer-from: 1.1.2
+      source-map: 0.6.1
+
+  source-map@0.5.7: {}
+
+  source-map@0.6.1: {}
+
+  space-separated-tokens@1.1.5: {}
+
+  spdx-correct@3.2.0:
+    dependencies:
+      spdx-expression-parse: 3.0.1
+      spdx-license-ids: 3.0.22
+
+  spdx-exceptions@2.5.0: {}
+
+  spdx-expression-parse@3.0.1:
+    dependencies:
+      spdx-exceptions: 2.5.0
+      spdx-license-ids: 3.0.22
+
+  spdx-license-ids@3.0.22: {}
+
+  sponge-case@1.0.1:
+    dependencies:
+      tslib: 2.8.1
+
+  sprintf-js@1.0.3: {}
+
+  stop-iteration-iterator@1.1.0:
+    dependencies:
+      es-errors: 1.3.0
+      internal-slot: 1.1.0
+
+  string-convert@0.2.1: {}
+
+  string-env-interpolation@1.0.1: {}
+
+  string-width@4.2.3:
+    dependencies:
+      emoji-regex: 8.0.0
+      is-fullwidth-code-point: 3.0.0
+      strip-ansi: 6.0.1
+
+  string.prototype.includes@2.0.1:
+    dependencies:
+      call-bind: 1.0.8
+      define-properties: 1.2.1
+      es-abstract: 1.24.0
+
+  string.prototype.matchall@4.0.12:
+    dependencies:
+      call-bind: 1.0.8
+      call-bound: 1.0.4
+      define-properties: 1.2.1
+      es-abstract: 1.24.0
+      es-errors: 1.3.0
+      es-object-atoms: 1.1.1
+      get-intrinsic: 1.3.0
+      gopd: 1.2.0
+      has-symbols: 1.1.0
+      internal-slot: 1.1.0
+      regexp.prototype.flags: 1.5.4
+      set-function-name: 2.0.2
+      side-channel: 1.1.0
+
+  string.prototype.repeat@1.0.0:
+    dependencies:
+      define-properties: 1.2.1
+      es-abstract: 1.24.0
+
+  string.prototype.replaceall@1.0.11:
+    dependencies:
+      call-bind: 1.0.8
+      define-properties: 1.2.1
+      es-abstract: 1.24.0
+      es-errors: 1.3.0
+      es-object-atoms: 1.1.1
+      get-intrinsic: 1.3.0
+      has-symbols: 1.1.0
+      is-regex: 1.2.1
+
+  string.prototype.trim@1.2.10:
+    dependencies:
+      call-bind: 1.0.8
+      call-bound: 1.0.4
+      define-data-property: 1.1.4
+      define-properties: 1.2.1
+      es-abstract: 1.24.0
+      es-object-atoms: 1.1.1
+      has-property-descriptors: 1.0.2
+
+  string.prototype.trimend@1.0.9:
+    dependencies:
+      call-bind: 1.0.8
+      call-bound: 1.0.4
+      define-properties: 1.2.1
+      es-object-atoms: 1.1.1
+
+  string.prototype.trimstart@1.0.8:
+    dependencies:
+      call-bind: 1.0.8
+      define-properties: 1.2.1
+      es-object-atoms: 1.1.1
+
+  string_decoder@1.3.0:
+    dependencies:
+      safe-buffer: 5.2.1
+
+  strip-ansi@6.0.1:
+    dependencies:
+      ansi-regex: 5.0.1
+
+  strip-bom@3.0.0: {}
+
+  strip-bom@4.0.0: {}
+
+  strip-indent@3.0.0:
+    dependencies:
+      min-indent: 1.0.1
+
+  strip-indent@4.1.1: {}
+
+  strip-json-comments@3.1.1: {}
+
+  style-search@0.1.0: {}
+
+  style-to-object@0.3.0:
+    dependencies:
+      inline-style-parser: 0.1.1
+
+  stylelint-order@6.0.4(stylelint@15.11.0(typescript@4.8.4)):
+    dependencies:
+      postcss: 8.5.6
+      postcss-sorting: 8.0.2(postcss@8.5.6)
+      stylelint: 15.11.0(typescript@4.8.4)
+
+  stylelint@15.11.0(typescript@4.8.4):
+    dependencies:
+      '@csstools/css-parser-algorithms': 2.7.1(@csstools/css-tokenizer@2.4.1)
+      '@csstools/css-tokenizer': 2.4.1
+      '@csstools/media-query-list-parser': 2.1.13(@csstools/css-parser-algorithms@2.7.1(@csstools/css-tokenizer@2.4.1))(@csstools/css-tokenizer@2.4.1)
+      '@csstools/selector-specificity': 3.1.1(postcss-selector-parser@6.1.2)
+      balanced-match: 2.0.0
+      colord: 2.9.3
+      cosmiconfig: 8.3.6(typescript@4.8.4)
+      css-functions-list: 3.2.3
+      css-tree: 2.3.1
+      debug: 4.4.3
+      fast-glob: 3.3.3
+      fastest-levenshtein: 1.0.16
+      file-entry-cache: 7.0.2
+      global-modules: 2.0.0
+      globby: 11.1.0
+      globjoin: 0.1.4
+      html-tags: 3.3.1
+      ignore: 5.3.2
+      import-lazy: 4.0.0
+      imurmurhash: 0.1.4
+      is-plain-object: 5.0.0
+      known-css-properties: 0.29.0
+      mathml-tag-names: 2.1.3
+      meow: 10.1.5
+      micromatch: 4.0.8
+      normalize-path: 3.0.0
+      picocolors: 1.1.1
+      postcss: 8.5.6
+      postcss-resolve-nested-selector: 0.1.6
+      postcss-safe-parser: 6.0.0(postcss@8.5.6)
+      postcss-selector-parser: 6.1.2
+      postcss-value-parser: 4.2.0
+      resolve-from: 5.0.0
+      string-width: 4.2.3
+      strip-ansi: 6.0.1
+      style-search: 0.1.0
+      supports-hyperlinks: 3.2.0
+      svg-tags: 1.0.0
+      table: 6.9.0
+      write-file-atomic: 5.0.1
+    transitivePeerDependencies:
+      - supports-color
+      - typescript
+
+  stylis@4.2.0: {}
+
+  supports-color@7.2.0:
+    dependencies:
+      has-flag: 4.0.0
+
+  supports-hyperlinks@3.2.0:
+    dependencies:
+      has-flag: 4.0.0
+      supports-color: 7.2.0
+
+  supports-preserve-symlinks-flag@1.0.0: {}
+
+  svg-tags@1.0.0: {}
+
+  swap-case@2.0.2:
+    dependencies:
+      tslib: 2.8.1
+
+  symbol-observable@4.0.0: {}
+
+  sync-fetch@0.6.0-2:
+    dependencies:
+      node-fetch: 3.3.2
+      timeout-signal: 2.0.0
+      whatwg-mimetype: 4.0.0
+
+  systemjs@6.15.1: {}
+
+  table@6.9.0:
+    dependencies:
+      ajv: 8.17.1
+      lodash.truncate: 4.4.2
+      slice-ansi: 4.0.0
+      string-width: 4.2.3
+      strip-ansi: 6.0.1
+
+  terser@5.44.0:
+    dependencies:
+      '@jridgewell/source-map': 0.3.11
+      acorn: 8.15.0
+      commander: 2.20.3
+      source-map-support: 0.5.21
+
+  text-table@0.2.0: {}
+
+  thehandy@1.1.0: {}
+
+  three@0.93.0: {}
+
+  throttle-debounce@5.0.2: {}
+
+  through@2.3.8: {}
+
+  timeout-signal@2.0.0: {}
+
+  tiny-case@1.0.3: {}
+
+  tiny-invariant@1.3.3: {}
+
+  tiny-warning@1.0.3: {}
+
+  title-case@3.0.3:
+    dependencies:
+      tslib: 2.8.1
+
+  to-regex-range@5.0.1:
+    dependencies:
+      is-number: 7.0.0
+
+  toposort@2.0.2: {}
+
+  tr46@0.0.3: {}
+
+  trim-newlines@3.0.1: {}
+
+  trim-newlines@4.1.1: {}
+
+  trough@1.0.5: {}
+
+  ts-invariant@0.10.3:
+    dependencies:
+      tslib: 2.8.1
+
+  ts-log@2.2.7: {}
+
+  ts-node@10.9.2(@types/node@18.19.130)(typescript@4.8.4):
+    dependencies:
+      '@cspotcode/source-map-support': 0.8.1
+      '@tsconfig/node10': 1.0.11
+      '@tsconfig/node12': 1.0.11
+      '@tsconfig/node14': 1.0.3
+      '@tsconfig/node16': 1.0.4
+      '@types/node': 18.19.130
+      acorn: 8.15.0
+      acorn-walk: 8.3.4
+      arg: 4.1.3
+      create-require: 1.1.1
+      diff: 4.0.2
+      make-error: 1.3.6
+      typescript: 4.8.4
+      v8-compile-cache-lib: 3.0.1
+      yn: 3.1.1
+
+  tsconfck@3.1.6(typescript@4.8.4):
+    optionalDependencies:
+      typescript: 4.8.4
+
+  tsconfig-paths@3.15.0:
+    dependencies:
+      '@types/json5': 0.0.29
+      json5: 1.0.2
+      minimist: 1.2.8
+      strip-bom: 3.0.0
+
+  tslib@1.14.1: {}
+
+  tslib@2.4.1: {}
+
+  tslib@2.6.3: {}
+
+  tslib@2.8.1: {}
+
+  tsutils@3.21.0(typescript@4.8.4):
+    dependencies:
+      tslib: 1.14.1
+      typescript: 4.8.4
+
+  type-check@0.4.0:
+    dependencies:
+      prelude-ls: 1.2.1
+
+  type-fest@0.13.1: {}
+
+  type-fest@0.20.2: {}
+
+  type-fest@0.21.3: {}
+
+  type-fest@0.6.0: {}
+
+  type-fest@0.8.1: {}
+
+  type-fest@1.4.0: {}
+
+  type-fest@2.19.0: {}
+
+  typed-array-buffer@1.0.3:
+    dependencies:
+      call-bound: 1.0.4
+      es-errors: 1.3.0
+      is-typed-array: 1.1.15
+
+  typed-array-byte-length@1.0.3:
+    dependencies:
+      call-bind: 1.0.8
+      for-each: 0.3.5
+      gopd: 1.2.0
+      has-proto: 1.2.0
+      is-typed-array: 1.1.15
+
+  typed-array-byte-offset@1.0.4:
+    dependencies:
+      available-typed-arrays: 1.0.7
+      call-bind: 1.0.8
+      for-each: 0.3.5
+      gopd: 1.2.0
+      has-proto: 1.2.0
+      is-typed-array: 1.1.15
+      reflect.getprototypeof: 1.0.10
+
+  typed-array-length@1.0.7:
+    dependencies:
+      call-bind: 1.0.8
+      for-each: 0.3.5
+      gopd: 1.2.0
+      is-typed-array: 1.1.15
+      possible-typed-array-names: 1.1.0
+      reflect.getprototypeof: 1.0.10
+
+  typedarray-to-buffer@3.1.5:
+    dependencies:
+      is-typedarray: 1.0.0
+
+  typescript@4.8.4: {}
+
+  ua-parser-js@1.0.41: {}
+
+  unbox-primitive@1.1.0:
+    dependencies:
+      call-bound: 1.0.4
+      has-bigints: 1.1.0
+      has-symbols: 1.1.0
+      which-boxed-primitive: 1.1.1
+
+  unc-path-regex@0.1.2: {}
+
+  uncontrollable@7.2.1(react@17.0.2):
+    dependencies:
+      '@babel/runtime': 7.28.4
+      '@types/react': 17.0.89
+      invariant: 2.2.4
+      react: 17.0.2
+      react-lifecycles-compat: 3.0.4
+
+  undici-types@5.26.5: {}
+
+  unicode-canonical-property-names-ecmascript@2.0.1: {}
+
+  unicode-match-property-ecmascript@2.0.0:
+    dependencies:
+      unicode-canonical-property-names-ecmascript: 2.0.1
+      unicode-property-aliases-ecmascript: 2.2.0
+
+  unicode-match-property-value-ecmascript@2.2.1: {}
+
+  unicode-property-aliases-ecmascript@2.2.0: {}
+
+  unified@9.2.2:
+    dependencies:
+      '@types/unist': 2.0.11
+      bail: 1.0.5
+      extend: 3.0.2
+      is-buffer: 2.0.5
+      is-plain-obj: 2.1.0
+      trough: 1.0.5
+      vfile: 4.2.1
+
+  unist-builder@2.0.3: {}
+
+  unist-util-generated@1.1.6: {}
+
+  unist-util-is@3.0.0: {}
+
+  unist-util-is@4.1.0: {}
+
+  unist-util-position@3.1.0: {}
+
+  unist-util-stringify-position@2.0.3:
+    dependencies:
+      '@types/unist': 2.0.11
+
+  unist-util-visit-parents@2.1.2:
+    dependencies:
+      unist-util-is: 3.0.0
+
+  unist-util-visit-parents@3.1.1:
+    dependencies:
+      '@types/unist': 2.0.11
+      unist-util-is: 4.1.0
+
+  unist-util-visit@1.4.1:
+    dependencies:
+      unist-util-visit-parents: 2.1.2
+
+  unist-util-visit@2.0.3:
+    dependencies:
+      '@types/unist': 2.0.11
+      unist-util-is: 4.1.0
+      unist-util-visit-parents: 3.1.1
+
+  universal-cookie@4.0.4:
+    dependencies:
+      '@types/cookie': 0.3.3
+      cookie: 0.4.2
+
+  universalify@2.0.1: {}
+
+  unixify@1.0.0:
+    dependencies:
+      normalize-path: 2.1.1
+
+  update-browserslist-db@1.1.3(browserslist@4.26.3):
+    dependencies:
+      browserslist: 4.26.3
+      escalade: 3.2.0
+      picocolors: 1.1.1
+
+  upper-case-first@2.0.2:
+    dependencies:
+      tslib: 2.8.1
+
+  upper-case@2.0.2:
+    dependencies:
+      tslib: 2.8.1
+
+  uri-js@4.4.1:
+    dependencies:
+      punycode: 2.3.1
+
+  url-toolkit@2.2.5: {}
+
+  urlpattern-polyfill@10.1.0: {}
+
+  use-isomorphic-layout-effect@1.2.1(@types/react@17.0.89)(react@17.0.2):
+    dependencies:
+      react: 17.0.2
+    optionalDependencies:
+      '@types/react': 17.0.89
+
+  util-deprecate@1.0.2: {}
+
+  v8-compile-cache-lib@3.0.1: {}
+
+  validate-npm-package-license@3.0.4:
+    dependencies:
+      spdx-correct: 3.2.0
+      spdx-expression-parse: 3.0.1
+
+  value-equal@1.0.1: {}
+
+  vfile-message@2.0.4:
+    dependencies:
+      '@types/unist': 2.0.11
+      unist-util-stringify-position: 2.0.3
+
+  vfile@4.2.1:
+    dependencies:
+      '@types/unist': 2.0.11
+      is-buffer: 2.0.5
+      unist-util-stringify-position: 2.0.3
+      vfile-message: 2.0.4
+
+  video.js@7.21.7:
+    dependencies:
+      '@babel/runtime': 7.28.4
+      '@videojs/http-streaming': 2.16.3(video.js@7.21.7)
+      '@videojs/vhs-utils': 3.0.5
+      '@videojs/xhr': 2.6.0
+      aes-decrypter: 3.1.3
+      global: 4.4.0
+      keycode: 2.2.1
+      m3u8-parser: 4.8.0
+      mpd-parser: 0.22.1
+      mux.js: 6.0.1
+      safe-json-parse: 4.0.0
+      videojs-font: 3.2.0
+      videojs-vtt.js: 0.15.5
+
+  videojs-abloop@1.2.0: {}
+
+  videojs-contrib-dash@5.1.1:
+    dependencies:
+      dashjs: 4.7.4
+      global: 4.4.0
+      video.js: 7.21.7
+
+  videojs-font@3.2.0: {}
+
+  videojs-mobile-ui@0.8.0(video.js@7.21.7):
+    dependencies:
+      global: 4.4.0
+      video.js: 7.21.7
+
+  videojs-seek-buttons@3.0.1(video.js@7.21.7):
+    dependencies:
+      global: 4.4.0
+      video.js: 7.21.7
+
+  videojs-vr@1.8.0:
+    dependencies:
+      '@babel/runtime': 7.28.4
+      global: 4.4.0
+      three: 0.93.0
+      video.js: 7.21.7
+      webvr-polyfill: 0.10.12
+
+  videojs-vtt.js@0.15.5:
+    dependencies:
+      global: 4.4.0
+
+  vite-plugin-compression@0.5.1(vite@4.5.14(@types/node@18.19.130)(sass@1.93.2)(terser@5.44.0)):
+    dependencies:
+      chalk: 4.1.2
+      debug: 4.4.3
+      fs-extra: 10.1.0
+      vite: 4.5.14(@types/node@18.19.130)(sass@1.93.2)(terser@5.44.0)
+    transitivePeerDependencies:
+      - supports-color
+
+  vite-tsconfig-paths@4.3.2(typescript@4.8.4)(vite@4.5.14(@types/node@18.19.130)(sass@1.93.2)(terser@5.44.0)):
+    dependencies:
+      debug: 4.4.3
+      globrex: 0.1.2
+      tsconfck: 3.1.6(typescript@4.8.4)
+    optionalDependencies:
+      vite: 4.5.14(@types/node@18.19.130)(sass@1.93.2)(terser@5.44.0)
+    transitivePeerDependencies:
+      - supports-color
+      - typescript
+
+  vite@4.5.14(@types/node@18.19.130)(sass@1.93.2)(terser@5.44.0):
+    dependencies:
+      esbuild: 0.18.20
+      postcss: 8.5.6
+      rollup: 3.29.5
+    optionalDependencies:
+      '@types/node': 18.19.130
+      fsevents: 2.3.3
+      sass: 1.93.2
+      terser: 5.44.0
+
+  warning@4.0.3:
+    dependencies:
+      loose-envify: 1.4.0
+
+  wcwidth@1.0.1:
+    dependencies:
+      defaults: 1.0.4
+
+  web-namespaces@1.1.4: {}
+
+  web-streams-polyfill@3.3.3: {}
+
+  webcomponents.js@https://codeload.github.com/webcomponents/webcomponentsjs/tar.gz/8a2e40557b177e2cca0def2553f84c8269c8f93e: {}
+
+  webidl-conversions@3.0.1: {}
+
+  webvr-polyfill-dpdb@1.0.18: {}
+
+  webvr-polyfill@0.10.12:
+    dependencies:
+      cardboard-vr-display: 1.0.19
+
+  whatwg-mimetype@4.0.0: {}
+
+  whatwg-url@5.0.0:
+    dependencies:
+      tr46: 0.0.3
+      webidl-conversions: 3.0.1
+
+  which-boxed-primitive@1.1.1:
+    dependencies:
+      is-bigint: 1.1.0
+      is-boolean-object: 1.2.2
+      is-number-object: 1.1.1
+      is-string: 1.1.1
+      is-symbol: 1.1.1
+
+  which-builtin-type@1.2.1:
+    dependencies:
+      call-bound: 1.0.4
+      function.prototype.name: 1.1.8
+      has-tostringtag: 1.0.2
+      is-async-function: 2.1.1
+      is-date-object: 1.1.0
+      is-finalizationregistry: 1.1.1
+      is-generator-function: 1.1.2
+      is-regex: 1.2.1
+      is-weakref: 1.1.1
+      isarray: 2.0.5
+      which-boxed-primitive: 1.1.1
+      which-collection: 1.0.2
+      which-typed-array: 1.1.19
+
+  which-collection@1.0.2:
+    dependencies:
+      is-map: 2.0.3
+      is-set: 2.0.3
+      is-weakmap: 2.0.2
+      is-weakset: 2.0.4
+
+  which-module@2.0.1: {}
+
+  which-typed-array@1.1.19:
+    dependencies:
+      available-typed-arrays: 1.0.7
+      call-bind: 1.0.8
+      call-bound: 1.0.4
+      for-each: 0.3.5
+      get-proto: 1.0.1
+      gopd: 1.2.0
+      has-tostringtag: 1.0.2
+
+  which@1.3.1:
+    dependencies:
+      isexe: 2.0.0
+
+  which@2.0.2:
+    dependencies:
+      isexe: 2.0.0
+
+  word-wrap@1.2.5: {}
+
+  wrap-ansi@6.2.0:
+    dependencies:
+      ansi-styles: 4.3.0
+      string-width: 4.2.3
+      strip-ansi: 6.0.1
+
+  wrap-ansi@7.0.0:
+    dependencies:
+      ansi-styles: 4.3.0
+      string-width: 4.2.3
+      strip-ansi: 6.0.1
+
+  wrappy@1.0.2: {}
+
+  write-file-atomic@3.0.3:
+    dependencies:
+      imurmurhash: 0.1.4
+      is-typedarray: 1.0.0
+      signal-exit: 3.0.7
+      typedarray-to-buffer: 3.1.5
+
+  write-file-atomic@5.0.1:
+    dependencies:
+      imurmurhash: 0.1.4
+      signal-exit: 4.1.0
+
+  write-json-file@4.3.0:
+    dependencies:
+      detect-indent: 6.1.0
+      graceful-fs: 4.2.11
+      is-plain-obj: 2.1.0
+      make-dir: 3.1.0
+      sort-keys: 4.2.0
+      write-file-atomic: 3.0.3
+
+  ws@8.18.3: {}
+
+  xtend@4.0.2: {}
+
+  y18n@4.0.3: {}
+
+  y18n@5.0.8: {}
+
+  yallist@3.1.1: {}
+
+  yallist@4.0.0: {}
+
+  yaml-ast-parser@0.0.43: {}
+
+  yaml@1.10.2: {}
+
+  yaml@2.8.1: {}
+
+  yargs-parser@18.1.3:
+    dependencies:
+      camelcase: 5.3.1
+      decamelize: 1.2.0
+
+  yargs-parser@20.2.9: {}
+
+  yargs-parser@21.1.1: {}
+
+  yargs@15.4.1:
+    dependencies:
+      cliui: 6.0.0
+      decamelize: 1.2.0
+      find-up: 4.1.0
+      get-caller-file: 2.0.5
+      require-directory: 2.1.1
+      require-main-filename: 2.0.0
+      set-blocking: 2.0.0
+      string-width: 4.2.3
+      which-module: 2.0.1
+      y18n: 4.0.3
+      yargs-parser: 18.1.3
+
+  yargs@17.7.2:
+    dependencies:
+      cliui: 8.0.1
+      escalade: 3.2.0
+      get-caller-file: 2.0.5
+      require-directory: 2.1.1
+      string-width: 4.2.3
+      y18n: 5.0.8
+      yargs-parser: 21.1.1
+
+  yn@3.1.1: {}
+
+  yocto-queue@0.1.0: {}
+
+  yup@1.7.1:
+    dependencies:
+      property-expr: 2.0.6
+      tiny-case: 1.0.3
+      toposort: 2.0.2
+      type-fest: 2.19.0
+
+  zen-observable-ts@1.2.5:
+    dependencies:
+      zen-observable: 0.8.15
+
+  zen-observable@0.8.15: {}
+
+  zwitch@1.0.5: {}
diff --git a/ui/v2.5/pnpm-workspace.yaml b/ui/v2.5/pnpm-workspace.yaml
new file mode 100644
index 000000000..2b12183a9
--- /dev/null
+++ b/ui/v2.5/pnpm-workspace.yaml
@@ -0,0 +1,4 @@
+onlyBuiltDependencies:
+  - '@parcel/watcher'
+  - core-js
+  - esbuild
diff --git a/ui/v2.5/src/core/StashService.ts b/ui/v2.5/src/core/StashService.ts
index 8db471792..51cdd3ca5 100644
--- a/ui/v2.5/src/core/StashService.ts
+++ b/ui/v2.5/src/core/StashService.ts
@@ -1614,7 +1614,7 @@ export const mutateAddGalleryImages = (input: GQL.GalleryAddInput) =>
   });
 
 function evictCover(cache: ApolloCache<GQL.Gallery>, gallery_id: string) {
-  const fields: Pick<Modifiers<GQL.Gallery>, "paths" | "cover"> = {};
+  const fields: Partial<Pick<Modifiers<GQL.Gallery>, "paths" | "cover">> = {};
   fields.paths = (paths) => {
     if (!("cover" in paths)) {
       return paths;
diff --git a/ui/v2.5/yarn.lock b/ui/v2.5/yarn.lock
deleted file mode 100644
index 76a398f9f..000000000
--- a/ui/v2.5/yarn.lock
+++ /dev/null
@@ -1,8344 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@ampproject/remapping@^2.2.0":
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.1.tgz#99e8e11851128b8702cd57c33684f1d0f260b630"
-  integrity sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==
-  dependencies:
-    "@jridgewell/gen-mapping" "^0.3.0"
-    "@jridgewell/trace-mapping" "^0.3.9"
-
-"@ant-design/react-slick@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@ant-design/react-slick/-/react-slick-1.0.0.tgz#4696eecaa2dea0429e47ae24c267015cfd6df35c"
-  integrity sha512-OKxZsn8TAf8fYxP79rDXgLs9zvKMTslK6dJ4iLhDXOujUqC5zJPBRszyrcEHXcMPOm1Sgk40JgyF3yiL/Swd7w==
-  dependencies:
-    "@babel/runtime" "^7.10.4"
-    classnames "^2.2.5"
-    json2mq "^0.2.0"
-    resize-observer-polyfill "^1.5.1"
-    throttle-debounce "^5.0.0"
-
-"@apollo/client@^3.8.0", "@apollo/client@^3.8.10":
-  version "3.8.10"
-  resolved "https://registry.yarnpkg.com/@apollo/client/-/client-3.8.10.tgz#db6ee4378212d93c1f22b90a2aa474f6e9664b68"
-  integrity sha512-p/22RZ8ehHyvySnC20EHPPe0gdu8Xp6ZCiXOfdEe1ZORw5cUteD/TLc66tfKv8qu8NLIfbiWoa+6s70XnKvxqg==
-  dependencies:
-    "@graphql-typed-document-node/core" "^3.1.1"
-    "@wry/equality" "^0.5.6"
-    "@wry/trie" "^0.5.0"
-    graphql-tag "^2.12.6"
-    hoist-non-react-statics "^3.3.2"
-    optimism "^0.18.0"
-    prop-types "^15.7.2"
-    response-iterator "^0.2.6"
-    symbol-observable "^4.0.0"
-    ts-invariant "^0.10.3"
-    tslib "^2.3.0"
-    zen-observable-ts "^1.2.5"
-
-"@ardatan/relay-compiler@12.0.0":
-  version "12.0.0"
-  resolved "https://registry.yarnpkg.com/@ardatan/relay-compiler/-/relay-compiler-12.0.0.tgz#2e4cca43088e807adc63450e8cab037020e91106"
-  integrity sha512-9anThAaj1dQr6IGmzBMcfzOQKTa5artjuPmw8NYK/fiGEMjADbSguBY2FMDykt+QhilR3wc9VA/3yVju7JHg7Q==
-  dependencies:
-    "@babel/core" "^7.14.0"
-    "@babel/generator" "^7.14.0"
-    "@babel/parser" "^7.14.0"
-    "@babel/runtime" "^7.0.0"
-    "@babel/traverse" "^7.14.0"
-    "@babel/types" "^7.0.0"
-    babel-preset-fbjs "^3.4.0"
-    chalk "^4.0.0"
-    fb-watchman "^2.0.0"
-    fbjs "^3.0.0"
-    glob "^7.1.1"
-    immutable "~3.7.6"
-    invariant "^2.2.4"
-    nullthrows "^1.1.1"
-    relay-runtime "12.0.0"
-    signedsource "^1.0.0"
-    yargs "^15.3.1"
-
-"@ardatan/sync-fetch@^0.0.1":
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/@ardatan/sync-fetch/-/sync-fetch-0.0.1.tgz#3385d3feedceb60a896518a1db857ec1e945348f"
-  integrity sha512-xhlTqH0m31mnsG0tIP4ETgfSB6gXDaYYsUWTrlUV93fFQPI9dd8hE0Ot6MHLCtqgB32hwJAC3YZMWlXZw7AleA==
-  dependencies:
-    node-fetch "^2.6.1"
-
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.23.5":
-  version "7.23.5"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.23.5.tgz#9009b69a8c602293476ad598ff53e4562e15c244"
-  integrity sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==
-  dependencies:
-    "@babel/highlight" "^7.23.4"
-    chalk "^2.4.2"
-
-"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.20.1", "@babel/compat-data@^7.20.5", "@babel/compat-data@^7.23.5":
-  version "7.23.5"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.23.5.tgz#ffb878728bb6bdcb6f4510aa51b1be9afb8cfd98"
-  integrity sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==
-
-"@babel/core@^7.14.0", "@babel/core@^7.20.12", "@babel/core@^7.22.9", "@babel/core@^7.9.0":
-  version "7.23.9"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.23.9.tgz#b028820718000f267870822fec434820e9b1e4d1"
-  integrity sha512-5q0175NOjddqpvvzU+kDiSOAk4PfdO6FvwCWoQ6RO7rTzEe8vlo+4HVfcnAREhD4npMs0e9uZypjTwzZPCf/cw==
-  dependencies:
-    "@ampproject/remapping" "^2.2.0"
-    "@babel/code-frame" "^7.23.5"
-    "@babel/generator" "^7.23.6"
-    "@babel/helper-compilation-targets" "^7.23.6"
-    "@babel/helper-module-transforms" "^7.23.3"
-    "@babel/helpers" "^7.23.9"
-    "@babel/parser" "^7.23.9"
-    "@babel/template" "^7.23.9"
-    "@babel/traverse" "^7.23.9"
-    "@babel/types" "^7.23.9"
-    convert-source-map "^2.0.0"
-    debug "^4.1.0"
-    gensync "^1.0.0-beta.2"
-    json5 "^2.2.3"
-    semver "^6.3.1"
-
-"@babel/generator@^7.14.0", "@babel/generator@^7.18.13", "@babel/generator@^7.23.6":
-  version "7.23.6"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.6.tgz#9e1fca4811c77a10580d17d26b57b036133f3c2e"
-  integrity sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==
-  dependencies:
-    "@babel/types" "^7.23.6"
-    "@jridgewell/gen-mapping" "^0.3.2"
-    "@jridgewell/trace-mapping" "^0.3.17"
-    jsesc "^2.5.1"
-
-"@babel/helper-annotate-as-pure@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz#eaa49f6f80d5a33f9a5dd2276e6d6e451be0a6bb"
-  integrity sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==
-  dependencies:
-    "@babel/types" "^7.18.6"
-
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.18.6":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz#acd4edfd7a566d1d51ea975dff38fd52906981bb"
-  integrity sha512-yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw==
-  dependencies:
-    "@babel/helper-explode-assignable-expression" "^7.18.6"
-    "@babel/types" "^7.18.9"
-
-"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9", "@babel/helper-compilation-targets@^7.20.0", "@babel/helper-compilation-targets@^7.20.7", "@babel/helper-compilation-targets@^7.23.6":
-  version "7.23.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz#4d79069b16cbcf1461289eccfbbd81501ae39991"
-  integrity sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==
-  dependencies:
-    "@babel/compat-data" "^7.23.5"
-    "@babel/helper-validator-option" "^7.23.5"
-    browserslist "^4.22.2"
-    lru-cache "^5.1.1"
-    semver "^6.3.1"
-
-"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.21.0":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.21.0.tgz#64f49ecb0020532f19b1d014b03bccaa1ab85fb9"
-  integrity sha512-Q8wNiMIdwsv5la5SPxNYzzkPnjgC0Sy0i7jLkVOCdllu/xcVNkr3TeZzbHBJrj+XXRqzX5uCyCoV9eu6xUG7KQ==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.18.6"
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-function-name" "^7.21.0"
-    "@babel/helper-member-expression-to-functions" "^7.21.0"
-    "@babel/helper-optimise-call-expression" "^7.18.6"
-    "@babel/helper-replace-supers" "^7.20.7"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0"
-    "@babel/helper-split-export-declaration" "^7.18.6"
-
-"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.20.5":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.21.0.tgz#53ff78472e5ce10a52664272a239787107603ebb"
-  integrity sha512-N+LaFW/auRSWdx7SHD/HiARwXQju1vXTW4fKr4u5SgBUTm51OKEjKgj+cs00ggW3kEvNqwErnlwuq7Y3xBe4eg==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.18.6"
-    regexpu-core "^5.3.1"
-
-"@babel/helper-define-polyfill-provider@^0.3.3":
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz#8612e55be5d51f0cd1f36b4a5a83924e89884b7a"
-  integrity sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==
-  dependencies:
-    "@babel/helper-compilation-targets" "^7.17.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
-    debug "^4.1.1"
-    lodash.debounce "^4.0.8"
-    resolve "^1.14.2"
-    semver "^6.1.2"
-
-"@babel/helper-environment-visitor@^7.18.9", "@babel/helper-environment-visitor@^7.22.20":
-  version "7.22.20"
-  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz#96159db61d34a29dba454c959f5ae4a649ba9167"
-  integrity sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==
-
-"@babel/helper-explode-assignable-expression@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz#41f8228ef0a6f1a036b8dfdfec7ce94f9a6bc096"
-  integrity sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg==
-  dependencies:
-    "@babel/types" "^7.18.6"
-
-"@babel/helper-function-name@^7.18.9", "@babel/helper-function-name@^7.19.0", "@babel/helper-function-name@^7.21.0", "@babel/helper-function-name@^7.23.0":
-  version "7.23.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz#1f9a3cdbd5b2698a670c30d2735f9af95ed52759"
-  integrity sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==
-  dependencies:
-    "@babel/template" "^7.22.15"
-    "@babel/types" "^7.23.0"
-
-"@babel/helper-hoist-variables@^7.18.6", "@babel/helper-hoist-variables@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz#c01a007dac05c085914e8fb652b339db50d823bb"
-  integrity sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==
-  dependencies:
-    "@babel/types" "^7.22.5"
-
-"@babel/helper-member-expression-to-functions@^7.20.7", "@babel/helper-member-expression-to-functions@^7.21.0":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.21.0.tgz#319c6a940431a133897148515877d2f3269c3ba5"
-  integrity sha512-Muu8cdZwNN6mRRNG6lAYErJ5X3bRevgYR2O8wN0yn7jJSnGDu6eG59RfT29JHxGUovyfrh6Pj0XzmR7drNVL3Q==
-  dependencies:
-    "@babel/types" "^7.21.0"
-
-"@babel/helper-module-imports@^7.16.7", "@babel/helper-module-imports@^7.18.6", "@babel/helper-module-imports@^7.22.15":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz#16146307acdc40cc00c3b2c647713076464bdbf0"
-  integrity sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==
-  dependencies:
-    "@babel/types" "^7.22.15"
-
-"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.20.11", "@babel/helper-module-transforms@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz#d7d12c3c5d30af5b3c0fcab2a6d5217773e2d0f1"
-  integrity sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==
-  dependencies:
-    "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-module-imports" "^7.22.15"
-    "@babel/helper-simple-access" "^7.22.5"
-    "@babel/helper-split-export-declaration" "^7.22.6"
-    "@babel/helper-validator-identifier" "^7.22.20"
-
-"@babel/helper-optimise-call-expression@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz#9369aa943ee7da47edab2cb4e838acf09d290ffe"
-  integrity sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==
-  dependencies:
-    "@babel/types" "^7.18.6"
-
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.19.0", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
-  version "7.20.2"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz#d1b9000752b18d0877cff85a5c376ce5c3121629"
-  integrity sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==
-
-"@babel/helper-remap-async-to-generator@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz#997458a0e3357080e54e1d79ec347f8a8cd28519"
-  integrity sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.18.6"
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-wrap-function" "^7.18.9"
-    "@babel/types" "^7.18.9"
-
-"@babel/helper-replace-supers@^7.18.6", "@babel/helper-replace-supers@^7.20.7":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.20.7.tgz#243ecd2724d2071532b2c8ad2f0f9f083bcae331"
-  integrity sha512-vujDMtB6LVfNW13jhlCrp48QNslK6JXi7lQG736HVbHz/mbf4Dc7tIRh1Xf5C0rF7BP8iiSxGMCmY6Ci1ven3A==
-  dependencies:
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-member-expression-to-functions" "^7.20.7"
-    "@babel/helper-optimise-call-expression" "^7.18.6"
-    "@babel/template" "^7.20.7"
-    "@babel/traverse" "^7.20.7"
-    "@babel/types" "^7.20.7"
-
-"@babel/helper-simple-access@^7.20.2", "@babel/helper-simple-access@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz#4938357dc7d782b80ed6dbb03a0fba3d22b1d5de"
-  integrity sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==
-  dependencies:
-    "@babel/types" "^7.22.5"
-
-"@babel/helper-skip-transparent-expression-wrappers@^7.20.0":
-  version "7.20.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz#fbe4c52f60518cab8140d77101f0e63a8a230684"
-  integrity sha512-5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg==
-  dependencies:
-    "@babel/types" "^7.20.0"
-
-"@babel/helper-split-export-declaration@^7.18.6", "@babel/helper-split-export-declaration@^7.22.6":
-  version "7.22.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c"
-  integrity sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==
-  dependencies:
-    "@babel/types" "^7.22.5"
-
-"@babel/helper-string-parser@^7.23.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz#9478c707febcbbe1ddb38a3d91a2e054ae622d83"
-  integrity sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==
-
-"@babel/helper-validator-identifier@^7.19.1", "@babel/helper-validator-identifier@^7.22.20":
-  version "7.22.20"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0"
-  integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==
-
-"@babel/helper-validator-option@^7.18.6", "@babel/helper-validator-option@^7.23.5":
-  version "7.23.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz#907a3fbd4523426285365d1206c423c4c5520307"
-  integrity sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==
-
-"@babel/helper-wrap-function@^7.18.9":
-  version "7.20.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.20.5.tgz#75e2d84d499a0ab3b31c33bcfe59d6b8a45f62e3"
-  integrity sha512-bYMxIWK5mh+TgXGVqAtnu5Yn1un+v8DDZtqyzKRLUzrh70Eal2O3aZ7aPYiMADO4uKlkzOiRiZ6GX5q3qxvW9Q==
-  dependencies:
-    "@babel/helper-function-name" "^7.19.0"
-    "@babel/template" "^7.18.10"
-    "@babel/traverse" "^7.20.5"
-    "@babel/types" "^7.20.5"
-
-"@babel/helpers@^7.23.9":
-  version "7.23.9"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.23.9.tgz#c3e20bbe7f7a7e10cb9b178384b4affdf5995c7d"
-  integrity sha512-87ICKgU5t5SzOT7sBMfCOZQ2rHjRU+Pcb9BoILMYz600W6DkVRLFBPwQ18gwUVvggqXivaUakpnxWQGbpywbBQ==
-  dependencies:
-    "@babel/template" "^7.23.9"
-    "@babel/traverse" "^7.23.9"
-    "@babel/types" "^7.23.9"
-
-"@babel/highlight@^7.23.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.23.4.tgz#edaadf4d8232e1a961432db785091207ead0621b"
-  integrity sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.22.20"
-    chalk "^2.4.2"
-    js-tokens "^4.0.0"
-
-"@babel/parser@^7.1.0", "@babel/parser@^7.14.0", "@babel/parser@^7.16.8", "@babel/parser@^7.20.7", "@babel/parser@^7.23.9":
-  version "7.23.9"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.9.tgz#7b903b6149b0f8fa7ad564af646c4c38a77fc44b"
-  integrity sha512-9tcKgqKbs3xGJ+NtKF2ndOBBLVwPjl1SHxPQkd36r3Dlirw3xWUeGaTbqr7uGZcTaxkVNwc+03SVP7aCdWrTlA==
-
-"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz#da5b8f9a580acdfbe53494dba45ea389fb09a4d2"
-  integrity sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-
-"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.18.9":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.20.7.tgz#d9c85589258539a22a901033853101a6198d4ef1"
-  integrity sha512-sbr9+wNE5aXMBBFBICk01tt7sBf2Oc9ikRFEcem/ZORup9IMUdNhW7/wVLEbbtlWOsEubJet46mHAL2C8+2jKQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0"
-    "@babel/plugin-proposal-optional-chaining" "^7.20.7"
-
-"@babel/plugin-proposal-async-generator-functions@^7.20.1":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.7.tgz#bfb7276d2d573cb67ba379984a2334e262ba5326"
-  integrity sha512-xMbiLsn/8RK7Wq7VeVytytS2L6qE69bXPB10YCmMdDZbKF4okCqY74pI/jJQ/8U0b/F6NrT2+14b8/P9/3AMGA==
-  dependencies:
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-remap-async-to-generator" "^7.18.9"
-    "@babel/plugin-syntax-async-generators" "^7.8.4"
-
-"@babel/plugin-proposal-class-properties@^7.0.0", "@babel/plugin-proposal-class-properties@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz#b110f59741895f7ec21a6fff696ec46265c446a3"
-  integrity sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
-
-"@babel/plugin-proposal-class-static-block@^7.18.6":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.21.0.tgz#77bdd66fb7b605f3a61302d224bdfacf5547977d"
-  integrity sha512-XP5G9MWNUskFuP30IfFSEFB0Z6HzLIUcjYM4bYOPHXl7eiJ9HFv8tWj6TXTN5QODiEhDZAeI4hLok2iHFFV4hw==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.21.0"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/plugin-syntax-class-static-block" "^7.14.5"
-
-"@babel/plugin-proposal-dynamic-import@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz#72bcf8d408799f547d759298c3c27c7e7faa4d94"
-  integrity sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
-
-"@babel/plugin-proposal-export-namespace-from@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz#5f7313ab348cdb19d590145f9247540e94761203"
-  integrity sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
-    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
-
-"@babel/plugin-proposal-json-strings@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz#7e8788c1811c393aff762817e7dbf1ebd0c05f0b"
-  integrity sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-    "@babel/plugin-syntax-json-strings" "^7.8.3"
-
-"@babel/plugin-proposal-logical-assignment-operators@^7.18.9":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.20.7.tgz#dfbcaa8f7b4d37b51e8bfb46d94a5aea2bb89d83"
-  integrity sha512-y7C7cZgpMIjWlKE5T7eJwp+tnRYM89HmRvWM5EQuB5BoHEONjmQ8lSNmBUwOyy/GFRsohJED51YBF79hE1djug==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
-
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz#fdd940a99a740e577d6c753ab6fbb43fdb9467e1"
-  integrity sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
-
-"@babel/plugin-proposal-numeric-separator@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz#899b14fbafe87f053d2c5ff05b36029c62e13c75"
-  integrity sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
-
-"@babel/plugin-proposal-object-rest-spread@^7.0.0", "@babel/plugin-proposal-object-rest-spread@^7.20.2":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz#aa662940ef425779c75534a5c41e9d936edc390a"
-  integrity sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==
-  dependencies:
-    "@babel/compat-data" "^7.20.5"
-    "@babel/helper-compilation-targets" "^7.20.7"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
-    "@babel/plugin-transform-parameters" "^7.20.7"
-
-"@babel/plugin-proposal-optional-catch-binding@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz#f9400d0e6a3ea93ba9ef70b09e72dd6da638a2cb"
-  integrity sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
-
-"@babel/plugin-proposal-optional-chaining@^7.18.9", "@babel/plugin-proposal-optional-chaining@^7.20.7":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz#886f5c8978deb7d30f678b2e24346b287234d3ea"
-  integrity sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0"
-    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
-
-"@babel/plugin-proposal-private-methods@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz#5209de7d213457548a98436fa2882f52f4be6bea"
-  integrity sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
-
-"@babel/plugin-proposal-private-property-in-object@^7.18.6":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0.tgz#19496bd9883dd83c23c7d7fc45dcd9ad02dfa1dc"
-  integrity sha512-ha4zfehbJjc5MmXBlHec1igel5TJXXLDDRbuJ4+XT2TJcyD9/V1919BA8gMvsdHcNMBy4WBUBiRb3nw/EQUtBw==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.18.6"
-    "@babel/helper-create-class-features-plugin" "^7.21.0"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
-
-"@babel/plugin-proposal-unicode-property-regex@^7.18.6", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz#af613d2cd5e643643b65cded64207b15c85cb78e"
-  integrity sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
-
-"@babel/plugin-syntax-async-generators@^7.8.4":
-  version "7.8.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"
-  integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
-
-"@babel/plugin-syntax-class-properties@^7.0.0", "@babel/plugin-syntax-class-properties@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10"
-  integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-syntax-class-static-block@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz#195df89b146b4b78b3bf897fd7a257c84659d406"
-  integrity sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
-
-"@babel/plugin-syntax-dynamic-import@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3"
-  integrity sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
-
-"@babel/plugin-syntax-export-namespace-from@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz#028964a9ba80dbc094c915c487ad7c4e7a66465a"
-  integrity sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-
-"@babel/plugin-syntax-flow@^7.0.0", "@babel/plugin-syntax-flow@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.18.6.tgz#774d825256f2379d06139be0c723c4dd444f3ca1"
-  integrity sha512-LUbR+KNTBWCUAqRG9ex5Gnzu2IOkt8jRJbHHXFT9q+L9zm7M/QQbEqXyw1n1pohYvOyWC8CjeyjrSaIwiYjK7A==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-
-"@babel/plugin-syntax-import-assertions@^7.20.0":
-  version "7.20.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.20.0.tgz#bb50e0d4bea0957235390641209394e87bdb9cc4"
-  integrity sha512-IUh1vakzNoWalR8ch/areW7qFopR2AEw03JlG7BbrDqmQ4X3q9uuipQwSGrUn7oGiemKjtSLDhNtQHzMHr1JdQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.19.0"
-
-"@babel/plugin-syntax-json-strings@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a"
-  integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
-
-"@babel/plugin-syntax-jsx@^7.0.0", "@babel/plugin-syntax-jsx@^7.17.12", "@babel/plugin-syntax-jsx@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.18.6.tgz#a8feef63b010150abd97f1649ec296e849943ca0"
-  integrity sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-
-"@babel/plugin-syntax-logical-assignment-operators@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699"
-  integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
-"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9"
-  integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
-
-"@babel/plugin-syntax-numeric-separator@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97"
-  integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
-"@babel/plugin-syntax-object-rest-spread@^7.0.0", "@babel/plugin-syntax-object-rest-spread@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871"
-  integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
-
-"@babel/plugin-syntax-optional-catch-binding@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1"
-  integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
-
-"@babel/plugin-syntax-optional-chaining@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a"
-  integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
-
-"@babel/plugin-syntax-private-property-in-object@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz#0dc6671ec0ea22b6e94a1114f857970cd39de1ad"
-  integrity sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
-
-"@babel/plugin-syntax-top-level-await@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c"
-  integrity sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
-
-"@babel/plugin-transform-arrow-functions@^7.0.0", "@babel/plugin-transform-arrow-functions@^7.18.6":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.20.7.tgz#bea332b0e8b2dab3dafe55a163d8227531ab0551"
-  integrity sha512-3poA5E7dzDomxj9WXWwuD6A5F3kc7VXwIJO+E+J8qtDtS+pXPAhrgEyh+9GBwBgPq1Z+bB+/JD60lp5jsN7JPQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
-
-"@babel/plugin-transform-async-to-generator@^7.18.6":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.20.7.tgz#dfee18623c8cb31deb796aa3ca84dda9cea94354"
-  integrity sha512-Uo5gwHPT9vgnSXQxqGtpdufUiWp96gk7yiP4Mp5bm1QMkEmLXBO7PAGYbKoJ6DhAwiNkcHFBol/x5zZZkL/t0Q==
-  dependencies:
-    "@babel/helper-module-imports" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-remap-async-to-generator" "^7.18.9"
-
-"@babel/plugin-transform-block-scoped-functions@^7.0.0", "@babel/plugin-transform-block-scoped-functions@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz#9187bf4ba302635b9d70d986ad70f038726216a8"
-  integrity sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-
-"@babel/plugin-transform-block-scoping@^7.0.0", "@babel/plugin-transform-block-scoping@^7.20.2":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.21.0.tgz#e737b91037e5186ee16b76e7ae093358a5634f02"
-  integrity sha512-Mdrbunoh9SxwFZapeHVrwFmri16+oYotcZysSzhNIVDwIAb1UV+kvnxULSYq9J3/q5MDG+4X6w8QVgD1zhBXNQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
-
-"@babel/plugin-transform-classes@^7.0.0", "@babel/plugin-transform-classes@^7.20.2":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.21.0.tgz#f469d0b07a4c5a7dbb21afad9e27e57b47031665"
-  integrity sha512-RZhbYTCEUAe6ntPehC4hlslPWosNHDox+vAs4On/mCLRLfoDVHf6hVEd7kuxr1RnHwJmxFfUM3cZiZRmPxJPXQ==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.18.6"
-    "@babel/helper-compilation-targets" "^7.20.7"
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-function-name" "^7.21.0"
-    "@babel/helper-optimise-call-expression" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-replace-supers" "^7.20.7"
-    "@babel/helper-split-export-declaration" "^7.18.6"
-    globals "^11.1.0"
-
-"@babel/plugin-transform-computed-properties@^7.0.0", "@babel/plugin-transform-computed-properties@^7.18.9":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.20.7.tgz#704cc2fd155d1c996551db8276d55b9d46e4d0aa"
-  integrity sha512-Lz7MvBK6DTjElHAmfu6bfANzKcxpyNPeYBGEafyA6E5HtRpjpZwU+u7Qrgz/2OR0z+5TvKYbPdphfSaAcZBrYQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/template" "^7.20.7"
-
-"@babel/plugin-transform-destructuring@^7.0.0", "@babel/plugin-transform-destructuring@^7.20.2":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.20.7.tgz#8bda578f71620c7de7c93af590154ba331415454"
-  integrity sha512-Xwg403sRrZb81IVB79ZPqNQME23yhugYVqgTxAhT99h485F4f+GMELFhhOsscDUB7HCswepKeCKLn/GZvUKoBA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
-
-"@babel/plugin-transform-dotall-regex@^7.18.6", "@babel/plugin-transform-dotall-regex@^7.4.4":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz#b286b3e7aae6c7b861e45bed0a2fafd6b1a4fef8"
-  integrity sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
-
-"@babel/plugin-transform-duplicate-keys@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz#687f15ee3cdad6d85191eb2a372c4528eaa0ae0e"
-  integrity sha512-d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
-
-"@babel/plugin-transform-exponentiation-operator@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz#421c705f4521888c65e91fdd1af951bfefd4dacd"
-  integrity sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw==
-  dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
-
-"@babel/plugin-transform-flow-strip-types@^7.0.0":
-  version "7.19.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.19.0.tgz#e9e8606633287488216028719638cbbb2f2dde8f"
-  integrity sha512-sgeMlNaQVbCSpgLSKP4ZZKfsJVnFnNQlUSk6gPYzR/q7tzCgQF2t8RBKAP6cKJeZdveei7Q7Jm527xepI8lNLg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.19.0"
-    "@babel/plugin-syntax-flow" "^7.18.6"
-
-"@babel/plugin-transform-for-of@^7.0.0", "@babel/plugin-transform-for-of@^7.18.8":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.21.0.tgz#964108c9988de1a60b4be2354a7d7e245f36e86e"
-  integrity sha512-LlUYlydgDkKpIY7mcBWvyPPmMcOphEyYA27Ef4xpbh1IiDNLr0kZsos2nf92vz3IccvJI25QUwp86Eo5s6HmBQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
-
-"@babel/plugin-transform-function-name@^7.0.0", "@babel/plugin-transform-function-name@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz#cc354f8234e62968946c61a46d6365440fc764e0"
-  integrity sha512-WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ==
-  dependencies:
-    "@babel/helper-compilation-targets" "^7.18.9"
-    "@babel/helper-function-name" "^7.18.9"
-    "@babel/helper-plugin-utils" "^7.18.9"
-
-"@babel/plugin-transform-literals@^7.0.0", "@babel/plugin-transform-literals@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz#72796fdbef80e56fba3c6a699d54f0de557444bc"
-  integrity sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
-
-"@babel/plugin-transform-member-expression-literals@^7.0.0", "@babel/plugin-transform-member-expression-literals@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz#ac9fdc1a118620ac49b7e7a5d2dc177a1bfee88e"
-  integrity sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-
-"@babel/plugin-transform-modules-amd@^7.19.6":
-  version "7.20.11"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.20.11.tgz#3daccca8e4cc309f03c3a0c4b41dc4b26f55214a"
-  integrity sha512-NuzCt5IIYOW0O30UvqktzHYR2ud5bOWbY0yaxWZ6G+aFzOMJvrs5YHNikrbdaT15+KNO31nPOy5Fim3ku6Zb5g==
-  dependencies:
-    "@babel/helper-module-transforms" "^7.20.11"
-    "@babel/helper-plugin-utils" "^7.20.2"
-
-"@babel/plugin-transform-modules-commonjs@^7.0.0", "@babel/plugin-transform-modules-commonjs@^7.19.6":
-  version "7.20.11"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.20.11.tgz#8cb23010869bf7669fd4b3098598b6b2be6dc607"
-  integrity sha512-S8e1f7WQ7cimJQ51JkAaDrEtohVEitXjgCGAS2N8S31Y42E+kWwfSz83LYz57QdBm7q9diARVqanIaH2oVgQnw==
-  dependencies:
-    "@babel/helper-module-transforms" "^7.20.11"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-simple-access" "^7.20.2"
-
-"@babel/plugin-transform-modules-systemjs@^7.19.6":
-  version "7.20.11"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.20.11.tgz#467ec6bba6b6a50634eea61c9c232654d8a4696e"
-  integrity sha512-vVu5g9BPQKSFEmvt2TA4Da5N+QVS66EX21d8uoOihC+OCpUoGvzVsXeqFdtAEfVa5BILAeFt+U7yVmLbQnAJmw==
-  dependencies:
-    "@babel/helper-hoist-variables" "^7.18.6"
-    "@babel/helper-module-transforms" "^7.20.11"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-validator-identifier" "^7.19.1"
-
-"@babel/plugin-transform-modules-umd@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz#81d3832d6034b75b54e62821ba58f28ed0aab4b9"
-  integrity sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ==
-  dependencies:
-    "@babel/helper-module-transforms" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
-
-"@babel/plugin-transform-named-capturing-groups-regex@^7.19.1":
-  version "7.20.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.20.5.tgz#626298dd62ea51d452c3be58b285d23195ba69a8"
-  integrity sha512-mOW4tTzi5iTLnw+78iEq3gr8Aoq4WNRGpmSlrogqaiCBoR1HFhpU4JkpQFOHfeYx3ReVIFWOQJS4aZBRvuZ6mA==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.20.5"
-    "@babel/helper-plugin-utils" "^7.20.2"
-
-"@babel/plugin-transform-new-target@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz#d128f376ae200477f37c4ddfcc722a8a1b3246a8"
-  integrity sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-
-"@babel/plugin-transform-object-super@^7.0.0", "@babel/plugin-transform-object-super@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz#fb3c6ccdd15939b6ff7939944b51971ddc35912c"
-  integrity sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-    "@babel/helper-replace-supers" "^7.18.6"
-
-"@babel/plugin-transform-parameters@^7.0.0", "@babel/plugin-transform-parameters@^7.20.1", "@babel/plugin-transform-parameters@^7.20.7":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.20.7.tgz#0ee349e9d1bc96e78e3b37a7af423a4078a7083f"
-  integrity sha512-WiWBIkeHKVOSYPO0pWkxGPfKeWrCJyD3NJ53+Lrp/QMSZbsVPovrVl2aWZ19D/LTVnaDv5Ap7GJ/B2CTOZdrfA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
-
-"@babel/plugin-transform-property-literals@^7.0.0", "@babel/plugin-transform-property-literals@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz#e22498903a483448e94e032e9bbb9c5ccbfc93a3"
-  integrity sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-
-"@babel/plugin-transform-react-display-name@^7.0.0":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.18.6.tgz#8b1125f919ef36ebdfff061d664e266c666b9415"
-  integrity sha512-TV4sQ+T013n61uMoygyMRm+xf04Bd5oqFpv2jAEQwSZ8NwQA7zeRPg1LMVg2PWi3zWBz+CLKD+v5bcpZ/BS0aA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-
-"@babel/plugin-transform-react-jsx-self@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.18.6.tgz#3849401bab7ae8ffa1e3e5687c94a753fc75bda7"
-  integrity sha512-A0LQGx4+4Jv7u/tWzoJF7alZwnBDQd6cGLh9P+Ttk4dpiL+J5p7NSNv/9tlEFFJDq3kjxOavWmbm6t0Gk+A3Ig==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-
-"@babel/plugin-transform-react-jsx-source@^7.19.6":
-  version "7.19.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.19.6.tgz#88578ae8331e5887e8ce28e4c9dc83fb29da0b86"
-  integrity sha512-RpAi004QyMNisst/pvSanoRdJ4q+jMCWyk9zdw/CyLB9j8RXEahodR6l2GyttDRyEVWZtbN+TpLiHJ3t34LbsQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.19.0"
-
-"@babel/plugin-transform-react-jsx@^7.0.0":
-  version "7.20.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.20.13.tgz#f950f0b0c36377503d29a712f16287cedf886cbb"
-  integrity sha512-MmTZx/bkUrfJhhYAYt3Urjm+h8DQGrPrnKQ94jLo7NLuOU+T89a7IByhKmrb8SKhrIYIQ0FN0CHMbnFRen4qNw==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.18.6"
-    "@babel/helper-module-imports" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/plugin-syntax-jsx" "^7.18.6"
-    "@babel/types" "^7.20.7"
-
-"@babel/plugin-transform-regenerator@^7.18.6":
-  version "7.20.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.20.5.tgz#57cda588c7ffb7f4f8483cc83bdcea02a907f04d"
-  integrity sha512-kW/oO7HPBtntbsahzQ0qSE3tFvkFwnbozz3NWFhLGqH75vLEg+sCGngLlhVkePlCs3Jv0dBBHDzCHxNiFAQKCQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
-    regenerator-transform "^0.15.1"
-
-"@babel/plugin-transform-reserved-words@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz#b1abd8ebf8edaa5f7fe6bbb8d2133d23b6a6f76a"
-  integrity sha512-oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-
-"@babel/plugin-transform-shorthand-properties@^7.0.0", "@babel/plugin-transform-shorthand-properties@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz#6d6df7983d67b195289be24909e3f12a8f664dc9"
-  integrity sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-
-"@babel/plugin-transform-spread@^7.0.0", "@babel/plugin-transform-spread@^7.19.0":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.20.7.tgz#c2d83e0b99d3bf83e07b11995ee24bf7ca09401e"
-  integrity sha512-ewBbHQ+1U/VnH1fxltbJqDeWBU1oNLG8Dj11uIv3xVf7nrQu0bPGe5Rf716r7K5Qz+SqtAOVswoVunoiBtGhxw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0"
-
-"@babel/plugin-transform-sticky-regex@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz#c6706eb2b1524028e317720339583ad0f444adcc"
-  integrity sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-
-"@babel/plugin-transform-template-literals@^7.0.0", "@babel/plugin-transform-template-literals@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz#04ec6f10acdaa81846689d63fae117dd9c243a5e"
-  integrity sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
-
-"@babel/plugin-transform-typeof-symbol@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz#c8cea68263e45addcd6afc9091429f80925762c0"
-  integrity sha512-SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
-
-"@babel/plugin-transform-unicode-escapes@^7.18.10":
-  version "7.18.10"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz#1ecfb0eda83d09bbcb77c09970c2dd55832aa246"
-  integrity sha512-kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
-
-"@babel/plugin-transform-unicode-regex@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz#194317225d8c201bbae103364ffe9e2cea36cdca"
-  integrity sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
-
-"@babel/preset-env@^7.20.2":
-  version "7.20.2"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.20.2.tgz#9b1642aa47bb9f43a86f9630011780dab7f86506"
-  integrity sha512-1G0efQEWR1EHkKvKHqbG+IN/QdgwfByUpM5V5QroDzGV2t3S/WXNQd693cHiHTlCFMpr9B6FkPFXDA2lQcKoDg==
-  dependencies:
-    "@babel/compat-data" "^7.20.1"
-    "@babel/helper-compilation-targets" "^7.20.0"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-validator-option" "^7.18.6"
-    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.18.6"
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.18.9"
-    "@babel/plugin-proposal-async-generator-functions" "^7.20.1"
-    "@babel/plugin-proposal-class-properties" "^7.18.6"
-    "@babel/plugin-proposal-class-static-block" "^7.18.6"
-    "@babel/plugin-proposal-dynamic-import" "^7.18.6"
-    "@babel/plugin-proposal-export-namespace-from" "^7.18.9"
-    "@babel/plugin-proposal-json-strings" "^7.18.6"
-    "@babel/plugin-proposal-logical-assignment-operators" "^7.18.9"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.18.6"
-    "@babel/plugin-proposal-numeric-separator" "^7.18.6"
-    "@babel/plugin-proposal-object-rest-spread" "^7.20.2"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.18.6"
-    "@babel/plugin-proposal-optional-chaining" "^7.18.9"
-    "@babel/plugin-proposal-private-methods" "^7.18.6"
-    "@babel/plugin-proposal-private-property-in-object" "^7.18.6"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.18.6"
-    "@babel/plugin-syntax-async-generators" "^7.8.4"
-    "@babel/plugin-syntax-class-properties" "^7.12.13"
-    "@babel/plugin-syntax-class-static-block" "^7.14.5"
-    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
-    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
-    "@babel/plugin-syntax-import-assertions" "^7.20.0"
-    "@babel/plugin-syntax-json-strings" "^7.8.3"
-    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
-    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
-    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
-    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
-    "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
-    "@babel/plugin-syntax-top-level-await" "^7.14.5"
-    "@babel/plugin-transform-arrow-functions" "^7.18.6"
-    "@babel/plugin-transform-async-to-generator" "^7.18.6"
-    "@babel/plugin-transform-block-scoped-functions" "^7.18.6"
-    "@babel/plugin-transform-block-scoping" "^7.20.2"
-    "@babel/plugin-transform-classes" "^7.20.2"
-    "@babel/plugin-transform-computed-properties" "^7.18.9"
-    "@babel/plugin-transform-destructuring" "^7.20.2"
-    "@babel/plugin-transform-dotall-regex" "^7.18.6"
-    "@babel/plugin-transform-duplicate-keys" "^7.18.9"
-    "@babel/plugin-transform-exponentiation-operator" "^7.18.6"
-    "@babel/plugin-transform-for-of" "^7.18.8"
-    "@babel/plugin-transform-function-name" "^7.18.9"
-    "@babel/plugin-transform-literals" "^7.18.9"
-    "@babel/plugin-transform-member-expression-literals" "^7.18.6"
-    "@babel/plugin-transform-modules-amd" "^7.19.6"
-    "@babel/plugin-transform-modules-commonjs" "^7.19.6"
-    "@babel/plugin-transform-modules-systemjs" "^7.19.6"
-    "@babel/plugin-transform-modules-umd" "^7.18.6"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.19.1"
-    "@babel/plugin-transform-new-target" "^7.18.6"
-    "@babel/plugin-transform-object-super" "^7.18.6"
-    "@babel/plugin-transform-parameters" "^7.20.1"
-    "@babel/plugin-transform-property-literals" "^7.18.6"
-    "@babel/plugin-transform-regenerator" "^7.18.6"
-    "@babel/plugin-transform-reserved-words" "^7.18.6"
-    "@babel/plugin-transform-shorthand-properties" "^7.18.6"
-    "@babel/plugin-transform-spread" "^7.19.0"
-    "@babel/plugin-transform-sticky-regex" "^7.18.6"
-    "@babel/plugin-transform-template-literals" "^7.18.9"
-    "@babel/plugin-transform-typeof-symbol" "^7.18.9"
-    "@babel/plugin-transform-unicode-escapes" "^7.18.10"
-    "@babel/plugin-transform-unicode-regex" "^7.18.6"
-    "@babel/preset-modules" "^0.1.5"
-    "@babel/types" "^7.20.2"
-    babel-plugin-polyfill-corejs2 "^0.3.3"
-    babel-plugin-polyfill-corejs3 "^0.6.0"
-    babel-plugin-polyfill-regenerator "^0.4.1"
-    core-js-compat "^3.25.1"
-    semver "^6.3.0"
-
-"@babel/preset-modules@^0.1.5":
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.5.tgz#ef939d6e7f268827e1841638dc6ff95515e115d9"
-  integrity sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.4.4"
-    "@babel/plugin-transform-dotall-regex" "^7.4.4"
-    "@babel/types" "^7.4.4"
-    esutils "^2.0.2"
-
-"@babel/regjsgen@^0.8.0":
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310"
-  integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==
-
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.4", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.8", "@babel/runtime@^7.14.0", "@babel/runtime@^7.14.5", "@babel/runtime@^7.18.3", "@babel/runtime@^7.20.7", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7":
-  version "7.27.0"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.27.0.tgz#fbee7cf97c709518ecc1f590984481d5460d4762"
-  integrity sha512-VtPOkrdPHZsKc/clNqyi9WUA8TINkZ4cGk63UUE3u4pmB2k+ZMQRDuIOagv8UVd6j7k0T3+RRIb7beKTebNbcw==
-  dependencies:
-    regenerator-runtime "^0.14.0"
-
-"@babel/template@^7.18.10", "@babel/template@^7.20.7", "@babel/template@^7.22.15", "@babel/template@^7.23.9":
-  version "7.23.9"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.23.9.tgz#f881d0487cba2828d3259dcb9ef5005a9731011a"
-  integrity sha512-+xrD2BWLpvHKNmX2QbpdpsBaWnRxahMwJjO+KZk2JOElj5nSmKezyS1B4u+QbHMTX69t4ukm6hh9lsYQ7GHCKA==
-  dependencies:
-    "@babel/code-frame" "^7.23.5"
-    "@babel/parser" "^7.23.9"
-    "@babel/types" "^7.23.9"
-
-"@babel/traverse@^7.14.0", "@babel/traverse@^7.16.8", "@babel/traverse@^7.20.5", "@babel/traverse@^7.20.7", "@babel/traverse@^7.23.9":
-  version "7.23.9"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.9.tgz#2f9d6aead6b564669394c5ce0f9302bb65b9d950"
-  integrity sha512-I/4UJ9vs90OkBtY6iiiTORVMyIhJ4kAVmsKo9KFc8UOxMeUfi2hvtIBsET5u9GizXE6/GFSuKCTNfgCswuEjRg==
-  dependencies:
-    "@babel/code-frame" "^7.23.5"
-    "@babel/generator" "^7.23.6"
-    "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-function-name" "^7.23.0"
-    "@babel/helper-hoist-variables" "^7.22.5"
-    "@babel/helper-split-export-declaration" "^7.22.6"
-    "@babel/parser" "^7.23.9"
-    "@babel/types" "^7.23.9"
-    debug "^4.3.1"
-    globals "^11.1.0"
-
-"@babel/types@^7.0.0", "@babel/types@^7.16.8", "@babel/types@^7.18.13", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.20.0", "@babel/types@^7.20.2", "@babel/types@^7.20.5", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.22.15", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.23.6", "@babel/types@^7.23.9", "@babel/types@^7.3.0", "@babel/types@^7.4.4", "@babel/types@^7.9.5":
-  version "7.23.9"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.9.tgz#1dd7b59a9a2b5c87f8b41e52770b5ecbf492e002"
-  integrity sha512-dQjSq/7HaSjRM43FFGnv5keM2HsxpmyV1PfaSVm0nzzjwwTmjOe6J4bC8e3+pTEIgHaHj+1ZlLThRJ2auc/w1Q==
-  dependencies:
-    "@babel/helper-string-parser" "^7.23.4"
-    "@babel/helper-validator-identifier" "^7.22.20"
-    to-fast-properties "^2.0.0"
-
-"@cspotcode/source-map-support@^0.8.0":
-  version "0.8.1"
-  resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz#00629c35a688e05a88b1cda684fb9d5e73f000a1"
-  integrity sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==
-  dependencies:
-    "@jridgewell/trace-mapping" "0.3.9"
-
-"@csstools/css-parser-algorithms@^2.3.0":
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/@csstools/css-parser-algorithms/-/css-parser-algorithms-2.3.0.tgz#0cc3a656dc2d638370ecf6f98358973bfbd00141"
-  integrity sha512-dTKSIHHWc0zPvcS5cqGP+/TPFUJB0ekJ9dGKvMAFoNuBFhDPBt9OMGNZiIA5vTiNdGHHBeScYPXIGBMnVOahsA==
-
-"@csstools/css-tokenizer@^2.1.1":
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/@csstools/css-tokenizer/-/css-tokenizer-2.1.1.tgz#07ae11a0a06365d7ec686549db7b729bc036528e"
-  integrity sha512-GbrTj2Z8MCTUv+52GE0RbFGM527xuXZ0Xa5g0Z+YN573uveS4G0qi6WNOMyz3yrFM/jaILTTwJ0+umx81EzqfA==
-
-"@csstools/media-query-list-parser@^2.1.2":
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/@csstools/media-query-list-parser/-/media-query-list-parser-2.1.2.tgz#6ef642b728d30c1009bfbba3211c7e4c11302728"
-  integrity sha512-M8cFGGwl866o6++vIY7j1AKuq9v57cf+dGepScwCcbut9ypJNr4Cj+LLTWligYUZ0uyhEoJDKt5lvyBfh2L3ZQ==
-
-"@csstools/selector-specificity@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@csstools/selector-specificity/-/selector-specificity-3.0.0.tgz#798622546b63847e82389e473fd67f2707d82247"
-  integrity sha512-hBI9tfBtuPIi885ZsZ32IMEU/5nlZH/KOVYJCOh7gyMxaVLGmLedYqFN6Ui1LXkI8JlC8IsuC0rF0btcRZKd5g==
-
-"@emotion/babel-plugin@^11.10.5":
-  version "11.10.5"
-  resolved "https://registry.yarnpkg.com/@emotion/babel-plugin/-/babel-plugin-11.10.5.tgz#65fa6e1790ddc9e23cc22658a4c5dea423c55c3c"
-  integrity sha512-xE7/hyLHJac7D2Ve9dKroBBZqBT7WuPQmWcq7HSGb84sUuP4mlOWoB8dvVfD9yk5DHkU1m6RW7xSoDtnQHNQeA==
-  dependencies:
-    "@babel/helper-module-imports" "^7.16.7"
-    "@babel/plugin-syntax-jsx" "^7.17.12"
-    "@babel/runtime" "^7.18.3"
-    "@emotion/hash" "^0.9.0"
-    "@emotion/memoize" "^0.8.0"
-    "@emotion/serialize" "^1.1.1"
-    babel-plugin-macros "^3.1.0"
-    convert-source-map "^1.5.0"
-    escape-string-regexp "^4.0.0"
-    find-root "^1.1.0"
-    source-map "^0.5.7"
-    stylis "4.1.3"
-
-"@emotion/cache@^11.10.5", "@emotion/cache@^11.4.0":
-  version "11.10.5"
-  resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.10.5.tgz#c142da9351f94e47527ed458f7bbbbe40bb13c12"
-  integrity sha512-dGYHWyzTdmK+f2+EnIGBpkz1lKc4Zbj2KHd4cX3Wi8/OWr5pKslNjc3yABKH4adRGCvSX4VDC0i04mrrq0aiRA==
-  dependencies:
-    "@emotion/memoize" "^0.8.0"
-    "@emotion/sheet" "^1.2.1"
-    "@emotion/utils" "^1.2.0"
-    "@emotion/weak-memoize" "^0.3.0"
-    stylis "4.1.3"
-
-"@emotion/hash@^0.9.0":
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.9.0.tgz#c5153d50401ee3c027a57a177bc269b16d889cb7"
-  integrity sha512-14FtKiHhy2QoPIzdTcvh//8OyBlknNs2nXRwIhG904opCby3l+9Xaf/wuPvICBF0rc1ZCNBd3nKe9cd2mecVkQ==
-
-"@emotion/memoize@^0.8.0":
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.8.0.tgz#f580f9beb67176fa57aae70b08ed510e1b18980f"
-  integrity sha512-G/YwXTkv7Den9mXDO7AhLWkE3q+I92B+VqAE+dYG4NGPaHZGvt3G8Q0p9vmE+sq7rTGphUbAvmQ9YpbfMQGGlA==
-
-"@emotion/react@^11.8.1":
-  version "11.10.5"
-  resolved "https://registry.yarnpkg.com/@emotion/react/-/react-11.10.5.tgz#95fff612a5de1efa9c0d535384d3cfa115fe175d"
-  integrity sha512-TZs6235tCJ/7iF6/rvTaOH4oxQg2gMAcdHemjwLKIjKz4rRuYe1HJ2TQJKnAcRAfOUDdU8XoDadCe1rl72iv8A==
-  dependencies:
-    "@babel/runtime" "^7.18.3"
-    "@emotion/babel-plugin" "^11.10.5"
-    "@emotion/cache" "^11.10.5"
-    "@emotion/serialize" "^1.1.1"
-    "@emotion/use-insertion-effect-with-fallbacks" "^1.0.0"
-    "@emotion/utils" "^1.2.0"
-    "@emotion/weak-memoize" "^0.3.0"
-    hoist-non-react-statics "^3.3.1"
-
-"@emotion/serialize@^1.1.1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-1.1.1.tgz#0595701b1902feded8a96d293b26be3f5c1a5cf0"
-  integrity sha512-Zl/0LFggN7+L1liljxXdsVSVlg6E/Z/olVWpfxUTxOAmi8NU7YoeWeLfi1RmnB2TATHoaWwIBRoL+FvAJiTUQA==
-  dependencies:
-    "@emotion/hash" "^0.9.0"
-    "@emotion/memoize" "^0.8.0"
-    "@emotion/unitless" "^0.8.0"
-    "@emotion/utils" "^1.2.0"
-    csstype "^3.0.2"
-
-"@emotion/sheet@^1.2.1":
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.2.1.tgz#0767e0305230e894897cadb6c8df2c51e61a6c2c"
-  integrity sha512-zxRBwl93sHMsOj4zs+OslQKg/uhF38MB+OMKoCrVuS0nyTkqnau+BM3WGEoOptg9Oz45T/aIGs1qbVAsEFo3nA==
-
-"@emotion/unitless@^0.8.0":
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.8.0.tgz#a4a36e9cbdc6903737cd20d38033241e1b8833db"
-  integrity sha512-VINS5vEYAscRl2ZUDiT3uMPlrFQupiKgHz5AA4bCH1miKBg4qtwkim1qPmJj/4WG6TreYMY111rEFsjupcOKHw==
-
-"@emotion/use-insertion-effect-with-fallbacks@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.0.0.tgz#ffadaec35dbb7885bd54de3fa267ab2f860294df"
-  integrity sha512-1eEgUGmkaljiBnRMTdksDV1W4kUnmwgp7X9G8B++9GYwl1lUdqSndSriIrTJ0N7LQaoauY9JJ2yhiOYK5+NI4A==
-
-"@emotion/utils@^1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-1.2.0.tgz#9716eaccbc6b5ded2ea5a90d65562609aab0f561"
-  integrity sha512-sn3WH53Kzpw8oQ5mgMmIzzyAaH2ZqFEbozVVBSYp538E06OSE6ytOp7pRAjNQR+Q/orwqdQYJSe2m3hCOeznkw==
-
-"@emotion/weak-memoize@^0.3.0":
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.3.0.tgz#ea89004119dc42db2e1dba0f97d553f7372f6fcb"
-  integrity sha512-AHPmaAx+RYfZz0eYu6Gviiagpmiyw98ySSlQvCUhVGDRtDFe4DBS0x1bSjdF3gqUDYOczB+yYvBTtEylYSdRhg==
-
-"@esbuild/android-arm64@0.18.20":
-  version "0.18.20"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz#984b4f9c8d0377443cc2dfcef266d02244593622"
-  integrity sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==
-
-"@esbuild/android-arm@0.18.20":
-  version "0.18.20"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.18.20.tgz#fedb265bc3a589c84cc11f810804f234947c3682"
-  integrity sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==
-
-"@esbuild/android-x64@0.18.20":
-  version "0.18.20"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.18.20.tgz#35cf419c4cfc8babe8893d296cd990e9e9f756f2"
-  integrity sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==
-
-"@esbuild/darwin-arm64@0.18.20":
-  version "0.18.20"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz#08172cbeccf95fbc383399a7f39cfbddaeb0d7c1"
-  integrity sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==
-
-"@esbuild/darwin-x64@0.18.20":
-  version "0.18.20"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz#d70d5790d8bf475556b67d0f8b7c5bdff053d85d"
-  integrity sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==
-
-"@esbuild/freebsd-arm64@0.18.20":
-  version "0.18.20"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz#98755cd12707f93f210e2494d6a4b51b96977f54"
-  integrity sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==
-
-"@esbuild/freebsd-x64@0.18.20":
-  version "0.18.20"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz#c1eb2bff03915f87c29cece4c1a7fa1f423b066e"
-  integrity sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==
-
-"@esbuild/linux-arm64@0.18.20":
-  version "0.18.20"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz#bad4238bd8f4fc25b5a021280c770ab5fc3a02a0"
-  integrity sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==
-
-"@esbuild/linux-arm@0.18.20":
-  version "0.18.20"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz#3e617c61f33508a27150ee417543c8ab5acc73b0"
-  integrity sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==
-
-"@esbuild/linux-ia32@0.18.20":
-  version "0.18.20"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz#699391cccba9aee6019b7f9892eb99219f1570a7"
-  integrity sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==
-
-"@esbuild/linux-loong64@0.18.20":
-  version "0.18.20"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz#e6fccb7aac178dd2ffb9860465ac89d7f23b977d"
-  integrity sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==
-
-"@esbuild/linux-mips64el@0.18.20":
-  version "0.18.20"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz#eeff3a937de9c2310de30622a957ad1bd9183231"
-  integrity sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==
-
-"@esbuild/linux-ppc64@0.18.20":
-  version "0.18.20"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz#2f7156bde20b01527993e6881435ad79ba9599fb"
-  integrity sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==
-
-"@esbuild/linux-riscv64@0.18.20":
-  version "0.18.20"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz#6628389f210123d8b4743045af8caa7d4ddfc7a6"
-  integrity sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==
-
-"@esbuild/linux-s390x@0.18.20":
-  version "0.18.20"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz#255e81fb289b101026131858ab99fba63dcf0071"
-  integrity sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==
-
-"@esbuild/linux-x64@0.18.20":
-  version "0.18.20"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz#c7690b3417af318a9b6f96df3031a8865176d338"
-  integrity sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==
-
-"@esbuild/netbsd-x64@0.18.20":
-  version "0.18.20"
-  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz#30e8cd8a3dded63975e2df2438ca109601ebe0d1"
-  integrity sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==
-
-"@esbuild/openbsd-x64@0.18.20":
-  version "0.18.20"
-  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz#7812af31b205055874c8082ea9cf9ab0da6217ae"
-  integrity sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==
-
-"@esbuild/sunos-x64@0.18.20":
-  version "0.18.20"
-  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz#d5c275c3b4e73c9b0ecd38d1ca62c020f887ab9d"
-  integrity sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==
-
-"@esbuild/win32-arm64@0.18.20":
-  version "0.18.20"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz#73bc7f5a9f8a77805f357fab97f290d0e4820ac9"
-  integrity sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==
-
-"@esbuild/win32-ia32@0.18.20":
-  version "0.18.20"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz#ec93cbf0ef1085cc12e71e0d661d20569ff42102"
-  integrity sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==
-
-"@esbuild/win32-x64@0.18.20":
-  version "0.18.20"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz#786c5f41f043b07afb1af37683d7c33668858f6d"
-  integrity sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==
-
-"@eslint/eslintrc@^1.4.1":
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.4.1.tgz#af58772019a2d271b7e2d4c23ff4ddcba3ccfb3e"
-  integrity sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA==
-  dependencies:
-    ajv "^6.12.4"
-    debug "^4.3.2"
-    espree "^9.4.0"
-    globals "^13.19.0"
-    ignore "^5.2.0"
-    import-fresh "^3.2.1"
-    js-yaml "^4.1.0"
-    minimatch "^3.1.2"
-    strip-json-comments "^3.1.1"
-
-"@floating-ui/core@^1.2.1":
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@floating-ui/core/-/core-1.2.1.tgz#074182a1d277f94569c50a6b456e62585d463c8e"
-  integrity sha512-LSqwPZkK3rYfD7GKoIeExXOyYx6Q1O4iqZWwIehDNuv3Dv425FIAE8PRwtAx1imEolFTHgBEcoFHm9MDnYgPCg==
-
-"@floating-ui/dom@^1.0.1":
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-1.2.1.tgz#8f93906e1a3b9f606ce78afb058e874344dcbe07"
-  integrity sha512-Rt45SmRiV8eU+xXSB9t0uMYiQ/ZWGE/jumse2o3i5RGlyvcbqOF4q+1qBnzLE2kZ5JGhq0iMkcGXUKbFe7MpTA==
-  dependencies:
-    "@floating-ui/core" "^1.2.1"
-
-"@formatjs/ecma402-abstract@1.14.3":
-  version "1.14.3"
-  resolved "https://registry.yarnpkg.com/@formatjs/ecma402-abstract/-/ecma402-abstract-1.14.3.tgz#6428f243538a11126180d121ce8d4b2f17465738"
-  integrity sha512-SlsbRC/RX+/zg4AApWIFNDdkLtFbkq3LNoZWXZCE/nHVKqoIJyaoQyge/I0Y38vLxowUn9KTtXgusLD91+orbg==
-  dependencies:
-    "@formatjs/intl-localematcher" "0.2.32"
-    tslib "^2.4.0"
-
-"@formatjs/ecma402-abstract@1.4.0":
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/@formatjs/ecma402-abstract/-/ecma402-abstract-1.4.0.tgz#ac6c17a8fffac43c6d68c849a7b732626d32654c"
-  integrity sha512-Mv027hcLFjE45K8UJ8PjRpdDGfR0aManEFj1KzoN8zXNveHGEygpZGfFf/FTTMl+QEVSrPAUlyxaCApvmv47AQ==
-  dependencies:
-    tslib "^2.0.1"
-
-"@formatjs/ecma402-abstract@1.5.0":
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/@formatjs/ecma402-abstract/-/ecma402-abstract-1.5.0.tgz#759c8f11ff45e96f8fb58741e7fbdb41096d5ddd"
-  integrity sha512-wXv36yo+mfWllweN0Fq7sUs7PUiNopn7I0JpLTe3hGu6ZMR4CV7LqK1llhB18pndwpKoafQKb1et2DCJAOW20Q==
-  dependencies:
-    tslib "^2.0.1"
-
-"@formatjs/fast-memoize@1.2.8":
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/@formatjs/fast-memoize/-/fast-memoize-1.2.8.tgz#425a69f783005f69e11f9e38a7f87f8822d330c6"
-  integrity sha512-PemNUObyoIZcqdQ1ixTPugzAzhEj7j6AHIyrq/qR6x5BFTvOQeXHYsVZUqBEFduAIscUaDfou+U+xTqOiunJ3Q==
-  dependencies:
-    tslib "^2.4.0"
-
-"@formatjs/icu-messageformat-parser@2.2.0":
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.2.0.tgz#9221f7f4dbaf634a84e459a49017a872e708dcfa"
-  integrity sha512-NT/jKI9nvqNIsosTm+Cxv3BHutB1RIDFa4rAa2b664Od4sBnXtK7afXvAqNa3XDFxljKTij9Cp+kRMJbXozUww==
-  dependencies:
-    "@formatjs/ecma402-abstract" "1.14.3"
-    "@formatjs/icu-skeleton-parser" "1.3.18"
-    tslib "^2.4.0"
-
-"@formatjs/icu-skeleton-parser@1.3.18":
-  version "1.3.18"
-  resolved "https://registry.yarnpkg.com/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.3.18.tgz#7aed3d60e718c8ad6b0e64820be44daa1e29eeeb"
-  integrity sha512-ND1ZkZfmLPcHjAH1sVpkpQxA+QYfOX3py3SjKWMUVGDow18gZ0WPqz3F+pJLYQMpS2LnnQ5zYR2jPVYTbRwMpg==
-  dependencies:
-    "@formatjs/ecma402-abstract" "1.14.3"
-    tslib "^2.4.0"
-
-"@formatjs/intl-displaynames@6.2.4":
-  version "6.2.4"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl-displaynames/-/intl-displaynames-6.2.4.tgz#e2cc5f5828074f3263e44247491f2698fa4c22dd"
-  integrity sha512-CmTbSjnmAZHNGuA9vBkWoDHvrcrRauDb0OWc6nk2dAPtesQdadr49Q9N18fr8IV7n3rblgKiYaFVjg68UkRxNg==
-  dependencies:
-    "@formatjs/ecma402-abstract" "1.14.3"
-    "@formatjs/intl-localematcher" "0.2.32"
-    tslib "^2.4.0"
-
-"@formatjs/intl-getcanonicallocales@2.0.5", "@formatjs/intl-getcanonicallocales@^2.0.5":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl-getcanonicallocales/-/intl-getcanonicallocales-2.0.5.tgz#d405cf5221f49531e62ecfde50acdfb62fcc4854"
-  integrity sha512-YOk+Fa5gpPq5bdpm8JDAY5bkfCkR+NENZKQbLHeqhm8JchHcclPwZ9FU48gYGg3CW6Wi/cTCOvmOrzsIhlkr0w==
-  dependencies:
-    tslib "^2.4.0"
-
-"@formatjs/intl-listformat@7.1.7":
-  version "7.1.7"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl-listformat/-/intl-listformat-7.1.7.tgz#b46fec1038ef9ca062d1e7b9b3412c2a14dca18f"
-  integrity sha512-Zzf5ruPpfJnrAA2hGgf/6pMgQ3tx9oJVhpqycFDavHl3eEzrwdHddGqGdSNwhd0bB4NAFttZNQdmKDldc5iDZw==
-  dependencies:
-    "@formatjs/ecma402-abstract" "1.14.3"
-    "@formatjs/intl-localematcher" "0.2.32"
-    tslib "^2.4.0"
-
-"@formatjs/intl-locale@^3.0.11":
-  version "3.0.11"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl-locale/-/intl-locale-3.0.11.tgz#6b3bee5692fab3c70a0ce9c642c2a2bec3700aa4"
-  integrity sha512-gLEX9kzebBjIVCkXMMN+VFMUV2aj0vhmrP+nke2muxUSJ3fLs/DJjlkv+s59rAL3nNaGdvphqKLhQsul0mmhAw==
-  dependencies:
-    "@formatjs/ecma402-abstract" "1.14.3"
-    "@formatjs/intl-getcanonicallocales" "2.0.5"
-    tslib "^2.4.0"
-
-"@formatjs/intl-localematcher@0.2.32":
-  version "0.2.32"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl-localematcher/-/intl-localematcher-0.2.32.tgz#00d4d307cd7d514b298e15a11a369b86c8933ec1"
-  integrity sha512-k/MEBstff4sttohyEpXxCmC3MqbUn9VvHGlZ8fauLzkbwXmVrEeyzS+4uhrvAk9DWU9/7otYWxyDox4nT/KVLQ==
-  dependencies:
-    tslib "^2.4.0"
-
-"@formatjs/intl-numberformat@^5.5.2":
-  version "5.7.6"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl-numberformat/-/intl-numberformat-5.7.6.tgz#630206bb0acefd2d508ccf4f82367c6875cad611"
-  integrity sha512-ZlZfYtvbVHYZY5OG3RXizoCwxKxEKOrzEe2YOw9wbzoxF3PmFn0SAgojCFGLyNXkkR6xVxlylhbuOPf1dkIVNg==
-  dependencies:
-    "@formatjs/ecma402-abstract" "1.4.0"
-    tslib "^2.0.1"
-
-"@formatjs/intl-numberformat@^8.3.3":
-  version "8.3.3"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl-numberformat/-/intl-numberformat-8.3.3.tgz#bfba1a90a22a28479dae4cf8cc16fb81ff659a36"
-  integrity sha512-11mSFZb5RsCVZMVaHbRcDYNxQ+tsstReL62AJcTCBZdvAZMqECOEsDkJODZ90nf/ClKqp0/KxwVlshxprn22Nw==
-  dependencies:
-    "@formatjs/ecma402-abstract" "1.14.3"
-    "@formatjs/intl-localematcher" "0.2.32"
-    tslib "^2.4.0"
-
-"@formatjs/intl-pluralrules@^5.1.8":
-  version "5.1.8"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl-pluralrules/-/intl-pluralrules-5.1.8.tgz#11eeca3cde088fd68d258a09b0791b327a8eb019"
-  integrity sha512-uevO916EWoeuueqeNzHjnUzpfWZzXFJibC/sEvPR/ZiZH5btWuOLeJLdb1To4nMH8ZJQlmAf8SDpFf+eWvz5lQ==
-  dependencies:
-    "@formatjs/ecma402-abstract" "1.14.3"
-    "@formatjs/intl-localematcher" "0.2.32"
-    tslib "^2.4.0"
-
-"@formatjs/intl@2.6.5":
-  version "2.6.5"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl/-/intl-2.6.5.tgz#349dc624a06978b143135201dcf63d40ba3cd816"
-  integrity sha512-kNH221hsdbTAMdsF6JAxSFV4N/9p5azXZvCLQBxl10Q4D2caPODLtne98gRhinIJ8Hv3djBabPdJG32OQaHuMA==
-  dependencies:
-    "@formatjs/ecma402-abstract" "1.14.3"
-    "@formatjs/fast-memoize" "1.2.8"
-    "@formatjs/icu-messageformat-parser" "2.2.0"
-    "@formatjs/intl-displaynames" "6.2.4"
-    "@formatjs/intl-listformat" "7.1.7"
-    intl-messageformat "10.3.0"
-    tslib "^2.4.0"
-
-"@formatjs/ts-transformer@^2.6.0":
-  version "2.13.0"
-  resolved "https://registry.yarnpkg.com/@formatjs/ts-transformer/-/ts-transformer-2.13.0.tgz#df47b35cdd209269d282a411f1646e0498aa8fdc"
-  integrity sha512-mu7sHXZk1NWZrQ3eUqugpSYo8x5/tXkrI4uIbFqCEC0eNgQaIcoKgVeDFgDAcgG+cEme2atAUYSFF+DFWC4org==
-  dependencies:
-    intl-messageformat-parser "6.1.2"
-    tslib "^2.0.1"
-    typescript "^4.0"
-
-"@fortawesome/fontawesome-common-types@6.3.0":
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.3.0.tgz#51f734e64511dbc3674cd347044d02f4dd26e86b"
-  integrity sha512-4BC1NMoacEBzSXRwKjZ/X/gmnbp/HU5Qqat7E8xqorUtBFZS+bwfGH5/wqOC2K6GV0rgEobp3OjGRMa5fK9pFg==
-
-"@fortawesome/fontawesome-svg-core@^6.3.0":
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.3.0.tgz#b6a17d48d231ac1fad93e43fca7271676bf316cf"
-  integrity sha512-uz9YifyKlixV6AcKlOX8WNdtF7l6nakGyLYxYaCa823bEBqyj/U2ssqtctO38itNEwXb8/lMzjdoJ+aaJuOdrw==
-  dependencies:
-    "@fortawesome/fontawesome-common-types" "6.3.0"
-
-"@fortawesome/free-brands-svg-icons@^6.3.0":
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-6.3.0.tgz#436e5fcba4f4f0902edcceaec5c4ff887ba7328f"
-  integrity sha512-xI0c+a8xnKItAXCN8rZgCNCJQiVAd2Y7p9e2ND6zN3J3ekneu96qrePieJ7yA7073C1JxxoM3vH1RU7rYsaj8w==
-  dependencies:
-    "@fortawesome/fontawesome-common-types" "6.3.0"
-
-"@fortawesome/free-regular-svg-icons@^6.3.0":
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-6.3.0.tgz#286f87f777e6c96af59151e86647c81083029ee2"
-  integrity sha512-cZnwiVHZ51SVzWHOaNCIA+u9wevZjCuAGSvSYpNlm6A4H4Vhwh8481Bf/5rwheIC3fFKlgXxLKaw8Xeroz8Ntg==
-  dependencies:
-    "@fortawesome/fontawesome-common-types" "6.3.0"
-
-"@fortawesome/free-solid-svg-icons@^6.3.0":
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.3.0.tgz#d3bd33ae18bb15fdfc3ca136e2fea05f32768a65"
-  integrity sha512-x5tMwzF2lTH8pyv8yeZRodItP2IVlzzmBuD1M7BjawWgg9XAvktqJJ91Qjgoaf8qJpHQ8FEU9VxRfOkLhh86QA==
-  dependencies:
-    "@fortawesome/fontawesome-common-types" "6.3.0"
-
-"@fortawesome/react-fontawesome@^0.2.0":
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/@fortawesome/react-fontawesome/-/react-fontawesome-0.2.0.tgz#d90dd8a9211830b4e3c08e94b63a0ba7291ddcf4"
-  integrity sha512-uHg75Rb/XORTtVt7OS9WoK8uM276Ufi7gCzshVWkUJbHhh3svsUUeqXerrM96Wm7fRiDzfKRwSoahhMIkGAYHw==
-  dependencies:
-    prop-types "^15.8.1"
-
-"@graphql-codegen/cli@^5.0.0":
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/cli/-/cli-5.0.0.tgz#761dcf08cfee88bbdd9cdf8097b2343445ec6f0a"
-  integrity sha512-A7J7+be/a6e+/ul2KI5sfJlpoqeqwX8EzktaKCeduyVKgOLA6W5t+NUGf6QumBDXU8PEOqXk3o3F+RAwCWOiqA==
-  dependencies:
-    "@babel/generator" "^7.18.13"
-    "@babel/template" "^7.18.10"
-    "@babel/types" "^7.18.13"
-    "@graphql-codegen/core" "^4.0.0"
-    "@graphql-codegen/plugin-helpers" "^5.0.1"
-    "@graphql-tools/apollo-engine-loader" "^8.0.0"
-    "@graphql-tools/code-file-loader" "^8.0.0"
-    "@graphql-tools/git-loader" "^8.0.0"
-    "@graphql-tools/github-loader" "^8.0.0"
-    "@graphql-tools/graphql-file-loader" "^8.0.0"
-    "@graphql-tools/json-file-loader" "^8.0.0"
-    "@graphql-tools/load" "^8.0.0"
-    "@graphql-tools/prisma-loader" "^8.0.0"
-    "@graphql-tools/url-loader" "^8.0.0"
-    "@graphql-tools/utils" "^10.0.0"
-    "@whatwg-node/fetch" "^0.8.0"
-    chalk "^4.1.0"
-    cosmiconfig "^8.1.3"
-    debounce "^1.2.0"
-    detect-indent "^6.0.0"
-    graphql-config "^5.0.2"
-    inquirer "^8.0.0"
-    is-glob "^4.0.1"
-    jiti "^1.17.1"
-    json-to-pretty-yaml "^1.2.2"
-    listr2 "^4.0.5"
-    log-symbols "^4.0.0"
-    micromatch "^4.0.5"
-    shell-quote "^1.7.3"
-    string-env-interpolation "^1.0.1"
-    ts-log "^2.2.3"
-    tslib "^2.4.0"
-    yaml "^2.3.1"
-    yargs "^17.0.0"
-
-"@graphql-codegen/core@^4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/core/-/core-4.0.0.tgz#b29c911746a532a675e33720acb4eb2119823e01"
-  integrity sha512-JAGRn49lEtSsZVxeIlFVIRxts2lWObR+OQo7V2LHDJ7ohYYw3ilv7nJ8pf8P4GTg/w6ptcYdSdVVdkI8kUHB/Q==
-  dependencies:
-    "@graphql-codegen/plugin-helpers" "^5.0.0"
-    "@graphql-tools/schema" "^10.0.0"
-    "@graphql-tools/utils" "^10.0.0"
-    tslib "~2.5.0"
-
-"@graphql-codegen/plugin-helpers@^2.7.2":
-  version "2.7.2"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/plugin-helpers/-/plugin-helpers-2.7.2.tgz#6544f739d725441c826a8af6a49519f588ff9bed"
-  integrity sha512-kln2AZ12uii6U59OQXdjLk5nOlh1pHis1R98cDZGFnfaiAbX9V3fxcZ1MMJkB7qFUymTALzyjZoXXdyVmPMfRg==
-  dependencies:
-    "@graphql-tools/utils" "^8.8.0"
-    change-case-all "1.0.14"
-    common-tags "1.8.2"
-    import-from "4.0.0"
-    lodash "~4.17.0"
-    tslib "~2.4.0"
-
-"@graphql-codegen/plugin-helpers@^3.0.0":
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/plugin-helpers/-/plugin-helpers-3.1.2.tgz#69a2e91178f478ea6849846ade0a59a844d34389"
-  integrity sha512-emOQiHyIliVOIjKVKdsI5MXj312zmRDwmHpyUTZMjfpvxq/UVAHUJIVdVf+lnjjrI+LXBTgMlTWTgHQfmICxjg==
-  dependencies:
-    "@graphql-tools/utils" "^9.0.0"
-    change-case-all "1.0.15"
-    common-tags "1.8.2"
-    import-from "4.0.0"
-    lodash "~4.17.0"
-    tslib "~2.4.0"
-
-"@graphql-codegen/plugin-helpers@^5.0.0", "@graphql-codegen/plugin-helpers@^5.0.1":
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/plugin-helpers/-/plugin-helpers-5.0.1.tgz#e2429fcfba3f078d5aa18aa062d46c922bbb0d55"
-  integrity sha512-6L5sb9D8wptZhnhLLBcheSPU7Tg//DGWgc5tQBWX46KYTOTQHGqDpv50FxAJJOyFVJrveN9otWk9UT9/yfY4ww==
-  dependencies:
-    "@graphql-tools/utils" "^10.0.0"
-    change-case-all "1.0.15"
-    common-tags "1.8.2"
-    import-from "4.0.0"
-    lodash "~4.17.0"
-    tslib "~2.5.0"
-
-"@graphql-codegen/schema-ast@^4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/schema-ast/-/schema-ast-4.0.0.tgz#5d60996c87b64f81847da8fcb2d8ef50ede89755"
-  integrity sha512-WIzkJFa9Gz28FITAPILbt+7A8+yzOyd1NxgwFh7ie+EmO9a5zQK6UQ3U/BviirguXCYnn+AR4dXsoDrSrtRA1g==
-  dependencies:
-    "@graphql-codegen/plugin-helpers" "^5.0.0"
-    "@graphql-tools/utils" "^10.0.0"
-    tslib "~2.5.0"
-
-"@graphql-codegen/time@^5.0.0":
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/time/-/time-5.0.0.tgz#832754bcc3dfa62a5e9c612fc3c8a0fe852ea533"
-  integrity sha512-RI9b3Wm2kci046atAqYfldHtVETi8/mewtfaRJyQn/xBCWwvTEJUL3gr/IxQbEgHRmZEadsWKtIyn7p/OOYQmg==
-  dependencies:
-    "@graphql-codegen/plugin-helpers" "^5.0.0"
-    moment "~2.29.1"
-
-"@graphql-codegen/typescript-operations@^4.0.1":
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/typescript-operations/-/typescript-operations-4.0.1.tgz#930af3e2d2ae8ff06de696291be28fe7046a2fef"
-  integrity sha512-GpUWWdBVUec/Zqo23aFLBMrXYxN2irypHqDcKjN78JclDPdreasAEPcIpMfqf4MClvpmvDLy4ql+djVAwmkjbw==
-  dependencies:
-    "@graphql-codegen/plugin-helpers" "^5.0.0"
-    "@graphql-codegen/typescript" "^4.0.1"
-    "@graphql-codegen/visitor-plugin-common" "4.0.1"
-    auto-bind "~4.0.0"
-    tslib "~2.5.0"
-
-"@graphql-codegen/typescript-react-apollo@^4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/typescript-react-apollo/-/typescript-react-apollo-4.1.0.tgz#d900c5d6c259f9b986f917ee280d6bd539f7ecc4"
-  integrity sha512-G7l4ECoilGnW1zJeqgsFQEVup9ME3w3811ZxHP5yvTra3ZNsbZO4WbYBOPKyS5uc4swsTAxj70a28hNF7kdVcw==
-  dependencies:
-    "@graphql-codegen/plugin-helpers" "^3.0.0"
-    "@graphql-codegen/visitor-plugin-common" "2.13.1"
-    auto-bind "~4.0.0"
-    change-case-all "1.0.15"
-    tslib "~2.6.0"
-
-"@graphql-codegen/typescript@^4.0.1":
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/typescript/-/typescript-4.0.1.tgz#7481d68f59bea802dd10e278dce73c8a1552b2a4"
-  integrity sha512-3YziQ21dCVdnHb+Us1uDb3pA6eG5Chjv0uTK+bt9dXeMlwYBU8MbtzvQTo4qvzWVC1AxSOKj0rgfNu1xCXqJyA==
-  dependencies:
-    "@graphql-codegen/plugin-helpers" "^5.0.0"
-    "@graphql-codegen/schema-ast" "^4.0.0"
-    "@graphql-codegen/visitor-plugin-common" "4.0.1"
-    auto-bind "~4.0.0"
-    tslib "~2.5.0"
-
-"@graphql-codegen/visitor-plugin-common@2.13.1":
-  version "2.13.1"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/visitor-plugin-common/-/visitor-plugin-common-2.13.1.tgz#2228660f6692bcdb96b1f6d91a0661624266b76b"
-  integrity sha512-mD9ufZhDGhyrSaWQGrU1Q1c5f01TeWtSWy/cDwXYjJcHIj1Y/DG2x0tOflEfCvh5WcnmHNIw4lzDsg1W7iFJEg==
-  dependencies:
-    "@graphql-codegen/plugin-helpers" "^2.7.2"
-    "@graphql-tools/optimize" "^1.3.0"
-    "@graphql-tools/relay-operation-optimizer" "^6.5.0"
-    "@graphql-tools/utils" "^8.8.0"
-    auto-bind "~4.0.0"
-    change-case-all "1.0.14"
-    dependency-graph "^0.11.0"
-    graphql-tag "^2.11.0"
-    parse-filepath "^1.0.2"
-    tslib "~2.4.0"
-
-"@graphql-codegen/visitor-plugin-common@4.0.1":
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/visitor-plugin-common/-/visitor-plugin-common-4.0.1.tgz#64e293728b3c186f6767141e41fcdb310e50d367"
-  integrity sha512-Bi/1z0nHg4QMsAqAJhds+ForyLtk7A3HQOlkrZNm3xEkY7lcBzPtiOTLBtvziwopBsXUxqeSwVjOOFPLS5Yw1Q==
-  dependencies:
-    "@graphql-codegen/plugin-helpers" "^5.0.0"
-    "@graphql-tools/optimize" "^2.0.0"
-    "@graphql-tools/relay-operation-optimizer" "^7.0.0"
-    "@graphql-tools/utils" "^10.0.0"
-    auto-bind "~4.0.0"
-    change-case-all "1.0.15"
-    dependency-graph "^0.11.0"
-    graphql-tag "^2.11.0"
-    parse-filepath "^1.0.2"
-    tslib "~2.5.0"
-
-"@graphql-tools/apollo-engine-loader@^8.0.0":
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/apollo-engine-loader/-/apollo-engine-loader-8.0.0.tgz#ac1f351cbe41508411784f25757f5557b0f27489"
-  integrity sha512-axQTbN5+Yxs1rJ6cWQBOfw3AEeC+fvIuZSfJLPLLvFJLj4pUm9fhxey/g6oQZAAQJqKPfw+tLDUQvnfvRK8Kmg==
-  dependencies:
-    "@ardatan/sync-fetch" "^0.0.1"
-    "@graphql-tools/utils" "^10.0.0"
-    "@whatwg-node/fetch" "^0.9.0"
-    tslib "^2.4.0"
-
-"@graphql-tools/batch-execute@^9.0.1":
-  version "9.0.2"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/batch-execute/-/batch-execute-9.0.2.tgz#5ac3257501e7941fad40661bb5e1110d6312f58b"
-  integrity sha512-Y2uwdZI6ZnatopD/SYfZ1eGuQFI7OU2KGZ2/B/7G9ISmgMl5K+ZZWz/PfIEXeiHirIDhyk54s4uka5rj2xwKqQ==
-  dependencies:
-    "@graphql-tools/utils" "^10.0.5"
-    dataloader "^2.2.2"
-    tslib "^2.4.0"
-    value-or-promise "^1.0.12"
-
-"@graphql-tools/code-file-loader@^8.0.0":
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/code-file-loader/-/code-file-loader-8.1.0.tgz#1092594f02f2c54fc1dd8b997921ccb8db642272"
-  integrity sha512-HKWW/B2z15ves8N9+xnVbGmFEVGyHEK80a4ghrjeTa6nwNZaKDVfq5CoYFfF0xpfjtH6gOVUExo2XCOEz4B8mQ==
-  dependencies:
-    "@graphql-tools/graphql-tag-pluck" "8.2.0"
-    "@graphql-tools/utils" "^10.0.13"
-    globby "^11.0.3"
-    tslib "^2.4.0"
-    unixify "^1.0.0"
-
-"@graphql-tools/delegate@^10.0.0", "@graphql-tools/delegate@^10.0.3":
-  version "10.0.3"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/delegate/-/delegate-10.0.3.tgz#2d0e133da94ca92c24e0c7360414e5592321cf2d"
-  integrity sha512-Jor9oazZ07zuWkykD3OOhT/2XD74Zm6Ar0ENZMk75MDD51wB2UWUIMljtHxbJhV5A6UBC2v8x6iY0xdCGiIlyw==
-  dependencies:
-    "@graphql-tools/batch-execute" "^9.0.1"
-    "@graphql-tools/executor" "^1.0.0"
-    "@graphql-tools/schema" "^10.0.0"
-    "@graphql-tools/utils" "^10.0.5"
-    dataloader "^2.2.2"
-    tslib "^2.5.0"
-
-"@graphql-tools/executor-graphql-ws@^1.0.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/executor-graphql-ws/-/executor-graphql-ws-1.1.0.tgz#7727159ebaa9df4dc793d0d02e74dd1ca4a7cc60"
-  integrity sha512-yM67SzwE8rYRpm4z4AuGtABlOp9mXXVy6sxXnTJRoYIdZrmDbKVfIY+CpZUJCqS0FX3xf2+GoHlsj7Qswaxgcg==
-  dependencies:
-    "@graphql-tools/utils" "^10.0.2"
-    "@types/ws" "^8.0.0"
-    graphql-ws "^5.14.0"
-    isomorphic-ws "^5.0.0"
-    tslib "^2.4.0"
-    ws "^8.13.0"
-
-"@graphql-tools/executor-http@^1.0.0", "@graphql-tools/executor-http@^1.0.5":
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/executor-http/-/executor-http-1.0.7.tgz#c358f91d4f88e49b9be7408a517f77a3079b2d91"
-  integrity sha512-/MoRYzQS50Tz5mxRfq3ZmeZ2SOins9wGZAGetsJ55F3PxL0PmHdSGlCq12KzffZDbwHV5YMlwigBsSGWq4y9Iw==
-  dependencies:
-    "@graphql-tools/utils" "^10.0.2"
-    "@repeaterjs/repeater" "^3.0.4"
-    "@whatwg-node/fetch" "^0.9.0"
-    extract-files "^11.0.0"
-    meros "^1.2.1"
-    tslib "^2.4.0"
-    value-or-promise "^1.0.12"
-
-"@graphql-tools/executor-legacy-ws@^1.0.0":
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/executor-legacy-ws/-/executor-legacy-ws-1.0.5.tgz#07de9d6e0e49febbcb87d6558bbeebf3940ff25a"
-  integrity sha512-w54AZ7zkNuvpyV09FH+eGHnnAmaxhBVHg4Yh2ICcsMfRg0brkLt77PlbjBuxZ4HY8XZnKJaYWf+tKazQZtkQtg==
-  dependencies:
-    "@graphql-tools/utils" "^10.0.0"
-    "@types/ws" "^8.0.0"
-    isomorphic-ws "^5.0.0"
-    tslib "^2.4.0"
-    ws "^8.15.0"
-
-"@graphql-tools/executor@^1.0.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/executor/-/executor-1.2.0.tgz#6c45f4add765769d9820c4c4405b76957ba39c79"
-  integrity sha512-SKlIcMA71Dha5JnEWlw4XxcaJ+YupuXg0QCZgl2TOLFz4SkGCwU/geAsJvUJFwK2RbVLpQv/UMq67lOaBuwDtg==
-  dependencies:
-    "@graphql-tools/utils" "^10.0.0"
-    "@graphql-typed-document-node/core" "3.2.0"
-    "@repeaterjs/repeater" "^3.0.4"
-    tslib "^2.4.0"
-    value-or-promise "^1.0.12"
-
-"@graphql-tools/git-loader@^8.0.0":
-  version "8.0.4"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/git-loader/-/git-loader-8.0.4.tgz#663a42e28f1705ba29c0e41ac2f89e7436751608"
-  integrity sha512-fBmKtnOVqzMT2N8L6nggM4skPq3y2t0eBITZJXCOuxeIlIRAeCOdjNLPKgyGb0rezIyGsn55DKMua5101VN0Sg==
-  dependencies:
-    "@graphql-tools/graphql-tag-pluck" "8.2.0"
-    "@graphql-tools/utils" "^10.0.13"
-    is-glob "4.0.3"
-    micromatch "^4.0.4"
-    tslib "^2.4.0"
-    unixify "^1.0.0"
-
-"@graphql-tools/github-loader@^8.0.0":
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/github-loader/-/github-loader-8.0.0.tgz#683195800618364701cfea9bc6f88674486f053b"
-  integrity sha512-VuroArWKcG4yaOWzV0r19ElVIV6iH6UKDQn1MXemND0xu5TzrFme0kf3U9o0YwNo0kUYEk9CyFM0BYg4he17FA==
-  dependencies:
-    "@ardatan/sync-fetch" "^0.0.1"
-    "@graphql-tools/executor-http" "^1.0.0"
-    "@graphql-tools/graphql-tag-pluck" "^8.0.0"
-    "@graphql-tools/utils" "^10.0.0"
-    "@whatwg-node/fetch" "^0.9.0"
-    tslib "^2.4.0"
-    value-or-promise "^1.0.12"
-
-"@graphql-tools/graphql-file-loader@^8.0.0":
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/graphql-file-loader/-/graphql-file-loader-8.0.0.tgz#a2026405bce86d974000455647511bf65df4f211"
-  integrity sha512-wRXj9Z1IFL3+zJG1HWEY0S4TXal7+s1vVhbZva96MSp0kbb/3JBF7j0cnJ44Eq0ClccMgGCDFqPFXty4JlpaPg==
-  dependencies:
-    "@graphql-tools/import" "7.0.0"
-    "@graphql-tools/utils" "^10.0.0"
-    globby "^11.0.3"
-    tslib "^2.4.0"
-    unixify "^1.0.0"
-
-"@graphql-tools/graphql-tag-pluck@8.2.0", "@graphql-tools/graphql-tag-pluck@^8.0.0":
-  version "8.2.0"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/graphql-tag-pluck/-/graphql-tag-pluck-8.2.0.tgz#958e07d3bdd94c2a7ac958364b7383c17d009ce2"
-  integrity sha512-aGIuHxyrJB+LlUfXrH73NVlQTA6LkFbLKQzHojFuwXZJpf7wPkxceN2yp7VjMedARkLJg589IoXgZeMb1EztGQ==
-  dependencies:
-    "@babel/core" "^7.22.9"
-    "@babel/parser" "^7.16.8"
-    "@babel/plugin-syntax-import-assertions" "^7.20.0"
-    "@babel/traverse" "^7.16.8"
-    "@babel/types" "^7.16.8"
-    "@graphql-tools/utils" "^10.0.13"
-    tslib "^2.4.0"
-
-"@graphql-tools/import@7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/import/-/import-7.0.0.tgz#a6a91a90a707d5f46bad0fd3fde2f407b548b2be"
-  integrity sha512-NVZiTO8o1GZs6OXzNfjB+5CtQtqsZZpQOq+Uu0w57kdUkT4RlQKlwhT8T81arEsbV55KpzkpFsOZP7J1wdmhBw==
-  dependencies:
-    "@graphql-tools/utils" "^10.0.0"
-    resolve-from "5.0.0"
-    tslib "^2.4.0"
-
-"@graphql-tools/json-file-loader@^8.0.0":
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/json-file-loader/-/json-file-loader-8.0.0.tgz#9b1b62902f766ef3f1c9cd1c192813ea4f48109c"
-  integrity sha512-ki6EF/mobBWJjAAC84xNrFMhNfnUFD6Y0rQMGXekrUgY0NdeYXHU0ZUgHzC9O5+55FslqUmAUHABePDHTyZsLg==
-  dependencies:
-    "@graphql-tools/utils" "^10.0.0"
-    globby "^11.0.3"
-    tslib "^2.4.0"
-    unixify "^1.0.0"
-
-"@graphql-tools/load@^8.0.0":
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/load/-/load-8.0.1.tgz#498f2230448601cb87894b8a93df7867daef69ea"
-  integrity sha512-qSMsKngJhDqRbuWyo3NvakEFqFL6+eSjy8ooJ1o5qYD26N7dqXkKzIMycQsX7rBK19hOuINAUSaRcVWH6hTccw==
-  dependencies:
-    "@graphql-tools/schema" "^10.0.0"
-    "@graphql-tools/utils" "^10.0.11"
-    p-limit "3.1.0"
-    tslib "^2.4.0"
-
-"@graphql-tools/merge@^9.0.0", "@graphql-tools/merge@^9.0.1":
-  version "9.0.1"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/merge/-/merge-9.0.1.tgz#693f15da152339284469b1ce5c6827e3ae350a29"
-  integrity sha512-hIEExWO9fjA6vzsVjJ3s0cCQ+Q/BEeMVJZtMXd7nbaVefVy0YDyYlEkeoYYNV3NVVvu1G9lr6DM1Qd0DGo9Caw==
-  dependencies:
-    "@graphql-tools/utils" "^10.0.10"
-    tslib "^2.4.0"
-
-"@graphql-tools/optimize@^1.3.0":
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/optimize/-/optimize-1.3.1.tgz#29407991478dbbedc3e7deb8c44f46acb4e9278b"
-  integrity sha512-5j5CZSRGWVobt4bgRRg7zhjPiSimk+/zIuColih8E8DxuFOaJ+t0qu7eZS5KXWBkjcd4BPNuhUPpNlEmHPqVRQ==
-  dependencies:
-    tslib "^2.4.0"
-
-"@graphql-tools/optimize@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/optimize/-/optimize-2.0.0.tgz#7a9779d180824511248a50c5a241eff6e7a2d906"
-  integrity sha512-nhdT+CRGDZ+bk68ic+Jw1OZ99YCDIKYA5AlVAnBHJvMawSx9YQqQAIj4refNc1/LRieGiuWvhbG3jvPVYho0Dg==
-  dependencies:
-    tslib "^2.4.0"
-
-"@graphql-tools/prisma-loader@^8.0.0":
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/prisma-loader/-/prisma-loader-8.0.2.tgz#3a7126ec2389a7aa7846bd0e441629ac5a1934fc"
-  integrity sha512-8d28bIB0bZ9Bj0UOz9sHagVPW+6AHeqvGljjERtwCnWl8OCQw2c2pNboYXISLYUG5ub76r4lDciLLTU+Ks7Q0w==
-  dependencies:
-    "@graphql-tools/url-loader" "^8.0.0"
-    "@graphql-tools/utils" "^10.0.8"
-    "@types/js-yaml" "^4.0.0"
-    "@types/json-stable-stringify" "^1.0.32"
-    "@whatwg-node/fetch" "^0.9.0"
-    chalk "^4.1.0"
-    debug "^4.3.1"
-    dotenv "^16.0.0"
-    graphql-request "^6.0.0"
-    http-proxy-agent "^7.0.0"
-    https-proxy-agent "^7.0.0"
-    jose "^5.0.0"
-    js-yaml "^4.0.0"
-    json-stable-stringify "^1.0.1"
-    lodash "^4.17.20"
-    scuid "^1.1.0"
-    tslib "^2.4.0"
-    yaml-ast-parser "^0.0.43"
-
-"@graphql-tools/relay-operation-optimizer@^6.5.0":
-  version "6.5.17"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/relay-operation-optimizer/-/relay-operation-optimizer-6.5.17.tgz#4e4e2675d696a2a31f106b09ed436c43f7976f37"
-  integrity sha512-hHPEX6ccRF3+9kfVz0A3In//Dej7QrHOLGZEokBmPDMDqn9CS7qUjpjyGzclbOX0tRBtLfuFUZ68ABSac3P1nA==
-  dependencies:
-    "@ardatan/relay-compiler" "12.0.0"
-    "@graphql-tools/utils" "9.2.1"
-    tslib "^2.4.0"
-
-"@graphql-tools/relay-operation-optimizer@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/relay-operation-optimizer/-/relay-operation-optimizer-7.0.0.tgz#24367666af87bc5a81748de5e8e9b3c523fd4207"
-  integrity sha512-UNlJi5y3JylhVWU4MBpL0Hun4Q7IoJwv9xYtmAz+CgRa066szzY7dcuPfxrA7cIGgG/Q6TVsKsYaiF4OHPs1Fw==
-  dependencies:
-    "@ardatan/relay-compiler" "12.0.0"
-    "@graphql-tools/utils" "^10.0.0"
-    tslib "^2.4.0"
-
-"@graphql-tools/schema@^10.0.0":
-  version "10.0.2"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/schema/-/schema-10.0.2.tgz#21bc2ee25a65fb4890d2e5f9f22ef1f733aa81da"
-  integrity sha512-TbPsIZnWyDCLhgPGnDjt4hosiNU2mF/rNtSk5BVaXWnZqvKJ6gzJV4fcHcvhRIwtscDMW2/YTnK6dLVnk8pc4w==
-  dependencies:
-    "@graphql-tools/merge" "^9.0.1"
-    "@graphql-tools/utils" "^10.0.10"
-    tslib "^2.4.0"
-    value-or-promise "^1.0.12"
-
-"@graphql-tools/url-loader@^8.0.0":
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/url-loader/-/url-loader-8.0.1.tgz#91247247d253c538c4c28376ca74d944fa8cfb82"
-  integrity sha512-B2k8KQEkEQmfV1zhurT5GLoXo8jbXP+YQHUayhCSxKYlRV7j/1Fhp1b21PDM8LXIDGlDRXaZ0FbWKOs7eYXDuQ==
-  dependencies:
-    "@ardatan/sync-fetch" "^0.0.1"
-    "@graphql-tools/delegate" "^10.0.0"
-    "@graphql-tools/executor-graphql-ws" "^1.0.0"
-    "@graphql-tools/executor-http" "^1.0.5"
-    "@graphql-tools/executor-legacy-ws" "^1.0.0"
-    "@graphql-tools/utils" "^10.0.0"
-    "@graphql-tools/wrap" "^10.0.0"
-    "@types/ws" "^8.0.0"
-    "@whatwg-node/fetch" "^0.9.0"
-    isomorphic-ws "^5.0.0"
-    tslib "^2.4.0"
-    value-or-promise "^1.0.11"
-    ws "^8.12.0"
-
-"@graphql-tools/utils@9.2.1", "@graphql-tools/utils@^9.0.0":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/utils/-/utils-9.2.1.tgz#1b3df0ef166cfa3eae706e3518b17d5922721c57"
-  integrity sha512-WUw506Ql6xzmOORlriNrD6Ugx+HjVgYxt9KCXD9mHAak+eaXSwuGGPyE60hy9xaDEoXKBsG7SkG69ybitaVl6A==
-  dependencies:
-    "@graphql-typed-document-node/core" "^3.1.1"
-    tslib "^2.4.0"
-
-"@graphql-tools/utils@^10.0.0", "@graphql-tools/utils@^10.0.10", "@graphql-tools/utils@^10.0.11", "@graphql-tools/utils@^10.0.13", "@graphql-tools/utils@^10.0.2", "@graphql-tools/utils@^10.0.5", "@graphql-tools/utils@^10.0.8":
-  version "10.0.13"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/utils/-/utils-10.0.13.tgz#d0ab7a4dd02a8405f5ef62dd140b7579ba69f8cb"
-  integrity sha512-fMILwGr5Dm2zefNItjQ6C2rauigklv69LIwppccICuGTnGaOp3DspLt/6Lxj72cbg5d9z60Sr+Egco3CJKLsNg==
-  dependencies:
-    "@graphql-typed-document-node/core" "^3.1.1"
-    cross-inspect "1.0.0"
-    dset "^3.1.2"
-    tslib "^2.4.0"
-
-"@graphql-tools/utils@^8.8.0":
-  version "8.13.1"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/utils/-/utils-8.13.1.tgz#b247607e400365c2cd87ff54654d4ad25a7ac491"
-  integrity sha512-qIh9yYpdUFmctVqovwMdheVNJqFh+DQNWIhX87FJStfXYnmweBUDATok9fWPleKeFwxnW8IapKmY8m8toJEkAw==
-  dependencies:
-    tslib "^2.4.0"
-
-"@graphql-tools/wrap@^10.0.0":
-  version "10.0.1"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/wrap/-/wrap-10.0.1.tgz#9e3d27d2723962c26c4377d5d7ab0d3038bf728c"
-  integrity sha512-Cw6hVrKGM2OKBXeuAGltgy4tzuqQE0Nt7t/uAqnuokSXZhMHXJUb124Bnvxc2gPZn5chfJSDafDe4Cp8ZAVJgg==
-  dependencies:
-    "@graphql-tools/delegate" "^10.0.3"
-    "@graphql-tools/schema" "^10.0.0"
-    "@graphql-tools/utils" "^10.0.0"
-    tslib "^2.4.0"
-    value-or-promise "^1.0.12"
-
-"@graphql-typed-document-node/core@3.2.0", "@graphql-typed-document-node/core@^3.1.1", "@graphql-typed-document-node/core@^3.2.0":
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/@graphql-typed-document-node/core/-/core-3.2.0.tgz#5f3d96ec6b2354ad6d8a28bf216a1d97b5426861"
-  integrity sha512-mB9oAsNCm9aM3/SOv4YtBMqZbYj10R7dkq8byBqxGY/ncFwhf2oQzMV+LCRlWoDSEBJ3COiR1yeDvMtsoOsuFQ==
-
-"@humanwhocodes/config-array@^0.11.8":
-  version "0.11.8"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.8.tgz#03595ac2075a4dc0f191cc2131de14fbd7d410b9"
-  integrity sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==
-  dependencies:
-    "@humanwhocodes/object-schema" "^1.2.1"
-    debug "^4.1.1"
-    minimatch "^3.0.5"
-
-"@humanwhocodes/module-importer@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
-  integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
-
-"@humanwhocodes/object-schema@^1.2.1":
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
-  integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
-
-"@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2":
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9"
-  integrity sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==
-  dependencies:
-    "@jridgewell/set-array" "^1.0.1"
-    "@jridgewell/sourcemap-codec" "^1.4.10"
-    "@jridgewell/trace-mapping" "^0.3.9"
-
-"@jridgewell/resolve-uri@3.1.0", "@jridgewell/resolve-uri@^3.0.3":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78"
-  integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==
-
-"@jridgewell/set-array@^1.0.1":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72"
-  integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==
-
-"@jridgewell/source-map@^0.3.2":
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.2.tgz#f45351aaed4527a298512ec72f81040c998580fb"
-  integrity sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==
-  dependencies:
-    "@jridgewell/gen-mapping" "^0.3.0"
-    "@jridgewell/trace-mapping" "^0.3.9"
-
-"@jridgewell/sourcemap-codec@1.4.14", "@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.13":
-  version "1.4.14"
-  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24"
-  integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
-
-"@jridgewell/trace-mapping@0.3.9":
-  version "0.3.9"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz#6534fd5933a53ba7cbf3a17615e273a0d1273ff9"
-  integrity sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==
-  dependencies:
-    "@jridgewell/resolve-uri" "^3.0.3"
-    "@jridgewell/sourcemap-codec" "^1.4.10"
-
-"@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.9":
-  version "0.3.17"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz#793041277af9073b0951a7fe0f0d8c4c98c36985"
-  integrity sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==
-  dependencies:
-    "@jridgewell/resolve-uri" "3.1.0"
-    "@jridgewell/sourcemap-codec" "1.4.14"
-
-"@juggle/resize-observer@^3.3.1":
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/@juggle/resize-observer/-/resize-observer-3.4.0.tgz#08d6c5e20cf7e4cc02fd181c4b0c225cd31dbb60"
-  integrity sha512-dfLbk+PwWvFzSxwk3n5ySL0hfBog779o8h68wK/7/APo/7cgyWp5jcXockbxdk5kFRkbeXWm4Fbi9FrdN381sA==
-
-"@kamilkisiela/fast-url-parser@^1.1.4":
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/@kamilkisiela/fast-url-parser/-/fast-url-parser-1.1.4.tgz#9d68877a489107411b953c54ea65d0658b515809"
-  integrity sha512-gbkePEBupNydxCelHCESvFSFM8XPh1Zs/OAVRW/rKpEqPAl5PbOM90Si8mv9bvnR53uPD2s/FiRxdvSejpRJew==
-
-"@mapbox/hast-util-table-cell-style@^0.2.0":
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/@mapbox/hast-util-table-cell-style/-/hast-util-table-cell-style-0.2.0.tgz#1003f59d54fae6f638cb5646f52110fb3da95b4d"
-  integrity sha512-gqaTIGC8My3LVSnU38IwjHVKJC94HSonjvFHDk8/aSrApL8v4uWgm8zJkK7MJIIbHuNOr/+Mv2KkQKcxs6LEZA==
-  dependencies:
-    unist-util-visit "^1.4.1"
-
-"@nodelib/fs.scandir@2.1.5":
-  version "2.1.5"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
-  integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==
-  dependencies:
-    "@nodelib/fs.stat" "2.0.5"
-    run-parallel "^1.1.9"
-
-"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b"
-  integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
-
-"@nodelib/fs.walk@^1.2.3", "@nodelib/fs.walk@^1.2.8":
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a"
-  integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==
-  dependencies:
-    "@nodelib/fs.scandir" "2.1.5"
-    fastq "^1.6.0"
-
-"@peculiar/asn1-schema@^2.1.6", "@peculiar/asn1-schema@^2.3.0":
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/@peculiar/asn1-schema/-/asn1-schema-2.3.3.tgz#21418e1f3819e0b353ceff0c2dad8ccb61acd777"
-  integrity sha512-6GptMYDMyWBHTUKndHaDsRZUO/XMSgIns2krxcm2L7SEExRHwawFvSwNBhqNPR9HJwv3MruAiF1bhN0we6j6GQ==
-  dependencies:
-    asn1js "^3.0.5"
-    pvtsutils "^1.3.2"
-    tslib "^2.4.0"
-
-"@peculiar/json-schema@^1.1.12":
-  version "1.1.12"
-  resolved "https://registry.yarnpkg.com/@peculiar/json-schema/-/json-schema-1.1.12.tgz#fe61e85259e3b5ba5ad566cb62ca75b3d3cd5339"
-  integrity sha512-coUfuoMeIB7B8/NMekxaDzLhaYmp0HZNPEjYRm9goRou8UZIC3z21s0sL9AWoCw4EG876QyO3kYrc61WNF9B/w==
-  dependencies:
-    tslib "^2.0.0"
-
-"@peculiar/webcrypto@^1.4.0":
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/@peculiar/webcrypto/-/webcrypto-1.4.1.tgz#821493bd5ad0f05939bd5f53b28536f68158360a"
-  integrity sha512-eK4C6WTNYxoI7JOabMoZICiyqRRtJB220bh0Mbj5RwRycleZf9BPyZoxsTvpP0FpmVS2aS13NKOuh5/tN3sIRw==
-  dependencies:
-    "@peculiar/asn1-schema" "^2.3.0"
-    "@peculiar/json-schema" "^1.1.12"
-    pvtsutils "^1.3.2"
-    tslib "^2.4.1"
-    webcrypto-core "^1.7.4"
-
-"@popperjs/core@^2.11.6", "@popperjs/core@^2.9.2":
-  version "2.11.6"
-  resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.6.tgz#cee20bd55e68a1720bdab363ecf0c821ded4cd45"
-  integrity sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw==
-
-"@react-hook/latest@^1.0.2":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@react-hook/latest/-/latest-1.0.3.tgz#c2d1d0b0af8b69ec6e2b3a2412ba0768ac82db80"
-  integrity sha512-dy6duzl+JnAZcDbNTfmaP3xHiKtbXYOaz3G51MGVljh548Y8MWzTr+PHLOfvpypEVW9zwvl+VyKjbWKEVbV1Rg==
-
-"@react-hook/passive-layout-effect@^1.2.0":
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@react-hook/passive-layout-effect/-/passive-layout-effect-1.2.1.tgz#c06dac2d011f36d61259aa1c6df4f0d5e28bc55e"
-  integrity sha512-IwEphTD75liO8g+6taS+4oqz+nnroocNfWVHWz7j+N+ZO2vYrc6PV1q7GQhuahL0IOR7JccFTsFKQ/mb6iZWAg==
-
-"@react-hook/resize-observer@^1.2.6":
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/@react-hook/resize-observer/-/resize-observer-1.2.6.tgz#9a8cf4c5abb09becd60d1d65f6bf10eec211e291"
-  integrity sha512-DlBXtLSW0DqYYTW3Ft1/GQFZlTdKY5VAFIC4+km6IK5NiPPDFchGbEJm1j6pSgMqPRHbUQgHJX7RaR76ic1LWA==
-  dependencies:
-    "@juggle/resize-observer" "^3.3.1"
-    "@react-hook/latest" "^1.0.2"
-    "@react-hook/passive-layout-effect" "^1.2.0"
-
-"@repeaterjs/repeater@^3.0.4":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@repeaterjs/repeater/-/repeater-3.0.4.tgz#a04d63f4d1bf5540a41b01a921c9a7fddc3bd1ca"
-  integrity sha512-AW8PKd6iX3vAZ0vA43nOUOnbq/X5ihgU+mSXXqunMkeQADGiqw/PY0JNeYtD5sr0PAy51YPgAPbDoeapv9r8WA==
-
-"@restart/context@^2.1.4":
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/@restart/context/-/context-2.1.4.tgz#a99d87c299a34c28bd85bb489cb07bfd23149c02"
-  integrity sha512-INJYZQJP7g+IoDUh/475NlGiTeMfwTXUEr3tmRneckHIxNolGOW9CTq83S8cxq0CgJwwcMzMJFchxvlwe7Rk8Q==
-
-"@restart/hooks@^0.4.7":
-  version "0.4.9"
-  resolved "https://registry.yarnpkg.com/@restart/hooks/-/hooks-0.4.9.tgz#ad858fb39d99e252cccce19416adc18fc3f18fcb"
-  integrity sha512-3BekqcwB6Umeya+16XPooARn4qEPW6vNvwYnlofIYe6h9qG1/VeD7UvShCWx11eFz5ELYmwIEshz+MkPX3wjcQ==
-  dependencies:
-    dequal "^2.0.2"
-
-"@silvermine/videojs-airplay@^1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@silvermine/videojs-airplay/-/videojs-airplay-1.2.0.tgz#3ca6464c8e94c97bb9f35c2926f59a5aa662cebd"
-  integrity sha512-4KzHoM/wJaq3au8IBLxnz8+btAB/M/2AdMoAoOdZRpp9DGG8SGU/UPw2w+CRMknvfbGtvlhlNrNiiXVWA6Cn0A==
-
-"@silvermine/videojs-chromecast@^1.4.1":
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/@silvermine/videojs-chromecast/-/videojs-chromecast-1.4.1.tgz#a5763eb85dfd4bc8f47a1b8b150d5dadbb8ea658"
-  integrity sha512-tXeikkWoNC3WIl2WSkIag1CLMbGsgn+26LM4LoB4qx0TQ8mkg7pgpldCTkvXxLVaDluQ/uEm2uxrgrMmjOc6sw==
-  dependencies:
-    webcomponents.js "git+https://git@github.com/webcomponents/webcomponentsjs.git#v0.7.24"
-
-"@tsconfig/node10@^1.0.7":
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.9.tgz#df4907fc07a886922637b15e02d4cebc4c0021b2"
-  integrity sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==
-
-"@tsconfig/node12@^1.0.7":
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/@tsconfig/node12/-/node12-1.0.11.tgz#ee3def1f27d9ed66dac6e46a295cffb0152e058d"
-  integrity sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==
-
-"@tsconfig/node14@^1.0.0":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@tsconfig/node14/-/node14-1.0.3.tgz#e4386316284f00b98435bf40f72f75a09dabf6c1"
-  integrity sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==
-
-"@tsconfig/node16@^1.0.2":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.3.tgz#472eaab5f15c1ffdd7f8628bd4c4f753995ec79e"
-  integrity sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==
-
-"@tweenjs/tween.js@~18.6.4":
-  version "18.6.4"
-  resolved "https://registry.yarnpkg.com/@tweenjs/tween.js/-/tween.js-18.6.4.tgz#40a3d0a93647124872dec8e0fd1bd5926695b6ca"
-  integrity sha512-lB9lMjuqjtuJrx7/kOkqQBtllspPIN+96OvTCeJ2j5FEzinoAXTdAMFnDAQT1KVPRlnYfBrqxtqP66vDM40xxQ==
-
-"@types/apollo-upload-client@^18.0.0":
-  version "18.0.0"
-  resolved "https://registry.yarnpkg.com/@types/apollo-upload-client/-/apollo-upload-client-18.0.0.tgz#1f7e2ff0c0e6508bc1bd19b2340339c7abd117c3"
-  integrity sha512-cMgITNemktxasqvp6jiPj15dv84n3FTMvMoYBP1+xonDS+0l6JygIJrj2LJh85rShRzTOOkrElrAsCXXARa3KA==
-  dependencies:
-    "@apollo/client" "^3.8.0"
-    "@types/extract-files" "*"
-    graphql "14 - 16"
-
-"@types/babel__core@^7.1.7":
-  version "7.20.0"
-  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.20.0.tgz#61bc5a4cae505ce98e1e36c5445e4bee060d8891"
-  integrity sha512-+n8dL/9GWblDO0iU6eZAwEIJVr5DWigtle+Q6HLOrh/pdbXOhOtqzq8VPPE2zvNJzSKY4vH/z3iT3tn0A3ypiQ==
-  dependencies:
-    "@babel/parser" "^7.20.7"
-    "@babel/types" "^7.20.7"
-    "@types/babel__generator" "*"
-    "@types/babel__template" "*"
-    "@types/babel__traverse" "*"
-
-"@types/babel__generator@*":
-  version "7.6.4"
-  resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.4.tgz#1f20ce4c5b1990b37900b63f050182d28c2439b7"
-  integrity sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==
-  dependencies:
-    "@babel/types" "^7.0.0"
-
-"@types/babel__template@*":
-  version "7.4.1"
-  resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.1.tgz#3d1a48fd9d6c0edfd56f2ff578daed48f36c8969"
-  integrity sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==
-  dependencies:
-    "@babel/parser" "^7.1.0"
-    "@babel/types" "^7.0.0"
-
-"@types/babel__traverse@*":
-  version "7.18.3"
-  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.18.3.tgz#dfc508a85781e5698d5b33443416b6268c4b3e8d"
-  integrity sha512-1kbcJ40lLB7MHsj39U4Sh1uTd2E7rLEa79kmDpI6cy+XiXsteB3POdQomoq4FxszMrO3ZYchkhYJw7A2862b3w==
-  dependencies:
-    "@babel/types" "^7.3.0"
-
-"@types/cookie@^0.3.3":
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/@types/cookie/-/cookie-0.3.3.tgz#85bc74ba782fb7aa3a514d11767832b0e3bc6803"
-  integrity sha512-LKVP3cgXBT9RYj+t+9FDKwS5tdI+rPBXaNSkma7hvqy35lc7mAokC2zsqWJH0LaqIt3B962nuYI77hsJoT1gow==
-
-"@types/crypto-js@^4.2.2":
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/@types/crypto-js/-/crypto-js-4.2.2.tgz#771c4a768d94eb5922cc202a3009558204df0cea"
-  integrity sha512-sDOLlVbHhXpAUAL0YHDUUwDZf3iN4Bwi4W6a0W0b+QcAezUbRtH4FVb+9J4h+XFPW7l/gQ9F8qC7P+Ec4k8QVQ==
-
-"@types/extract-files@*":
-  version "13.0.1"
-  resolved "https://registry.yarnpkg.com/@types/extract-files/-/extract-files-13.0.1.tgz#3ec057a3fa25f778245a76a17271d23b71ee31d7"
-  integrity sha512-/fRbzc2lAd7jDJSSnxWiUyXWjdUZZ4HbISLJzVgt1AvrdOa7U49YRPcvuCUywkmURZ7uwJOheDjx19itbQ5KvA==
-
-"@types/fs-extra@^9.0.1":
-  version "9.0.13"
-  resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.13.tgz#7594fbae04fe7f1918ce8b3d213f74ff44ac1f45"
-  integrity sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA==
-  dependencies:
-    "@types/node" "*"
-
-"@types/history@^4.7.11":
-  version "4.7.11"
-  resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.11.tgz#56588b17ae8f50c53983a524fc3cc47437969d64"
-  integrity sha512-qjDJRrmvBMiTx+jyLxvLfJU7UznFuokDv4f3WRuriHKERccVpFU+8XMQUAbDzoiJCsmexxRExQeMwwCdamSKDA==
-
-"@types/hoist-non-react-statics@^3.3.1":
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz#1124aafe5118cb591977aeb1ceaaed1070eb039f"
-  integrity sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==
-  dependencies:
-    "@types/react" "*"
-    hoist-non-react-statics "^3.3.0"
-
-"@types/invariant@^2.2.33":
-  version "2.2.35"
-  resolved "https://registry.yarnpkg.com/@types/invariant/-/invariant-2.2.35.tgz#cd3ebf581a6557452735688d8daba6cf0bd5a3be"
-  integrity sha512-DxX1V9P8zdJPYQat1gHyY0xj3efl8gnMVjiM9iCY6y27lj+PoQWkgjt8jDqmovPqULkKVpKRg8J36iQiA+EtEg==
-
-"@types/js-yaml@^4.0.0":
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-4.0.5.tgz#738dd390a6ecc5442f35e7f03fa1431353f7e138"
-  integrity sha512-FhpRzf927MNQdRZP0J5DLIdTXhjLYzeUTmLAu69mnVksLH9CJY3IuSeEgbKUki7GQZm0WqDkGzyxju2EZGD2wA==
-
-"@types/json-schema@^7.0.5", "@types/json-schema@^7.0.9":
-  version "7.0.11"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3"
-  integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==
-
-"@types/json-stable-stringify@^1.0.32":
-  version "1.0.34"
-  resolved "https://registry.yarnpkg.com/@types/json-stable-stringify/-/json-stable-stringify-1.0.34.tgz#c0fb25e4d957e0ee2e497c1f553d7f8bb668fd75"
-  integrity sha512-s2cfwagOQAS8o06TcwKfr9Wx11dNGbH2E9vJz1cqV+a/LOyhWNLUNd6JSRYNzvB4d29UuJX2M0Dj9vE1T8fRXw==
-
-"@types/json5@^0.0.29":
-  version "0.0.29"
-  resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
-  integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==
-
-"@types/lodash-es@^4.17.6":
-  version "4.17.6"
-  resolved "https://registry.yarnpkg.com/@types/lodash-es/-/lodash-es-4.17.6.tgz#c2ed4c8320ffa6f11b43eb89e9eaeec65966a0a0"
-  integrity sha512-R+zTeVUKDdfoRxpAryaQNRKk3105Rrgx2CFRClIgRGaqDTdjsm8h6IYA8ir584W3ePzkZfst5xIgDwYrlh9HLg==
-  dependencies:
-    "@types/lodash" "*"
-
-"@types/lodash@*":
-  version "4.14.191"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.191.tgz#09511e7f7cba275acd8b419ddac8da9a6a79e2fa"
-  integrity sha512-BdZ5BCCvho3EIXw6wUCXHe7rS53AIDPLE+JzwgT+OsJk53oBfbSmZZ7CX4VaRoN78N+TJpFi9QPlfIVNmJYWxQ==
-
-"@types/mdast@^3.0.0":
-  version "3.0.10"
-  resolved "https://registry.yarnpkg.com/@types/mdast/-/mdast-3.0.10.tgz#4724244a82a4598884cbbe9bcfd73dff927ee8af"
-  integrity sha512-W864tg/Osz1+9f4lrGTZpCSO5/z4608eUp19tbozkq2HJK6i3z1kT0H9tlADXuYIb1YYOBByU4Jsqkk75q48qA==
-  dependencies:
-    "@types/unist" "*"
-
-"@types/minimist@^1.2.0", "@types/minimist@^1.2.2":
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c"
-  integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==
-
-"@types/mousetrap@^1.6.11":
-  version "1.6.11"
-  resolved "https://registry.yarnpkg.com/@types/mousetrap/-/mousetrap-1.6.11.tgz#ef9620160fdcefcb85bccda8aaa3e84d7429376d"
-  integrity sha512-F0oAily9Q9QQpv9JKxKn0zMKfOo36KHCW7myYsmUyf2t0g+sBTbG3UleTPoguHdE1z3GLFr3p7/wiOio52QFjQ==
-
-"@types/node@*", "@types/node@^18.13.0":
-  version "18.13.0"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.13.0.tgz#0400d1e6ce87e9d3032c19eb6c58205b0d3f7850"
-  integrity sha512-gC3TazRzGoOnoKAhUx+Q0t8S9Tzs74z7m0ipwGpSqQrleP14hKxP4/JUeEQcD3W1/aIpnWl8pHowI7WokuZpXg==
-
-"@types/normalize-package-data@^2.4.0":
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301"
-  integrity sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==
-
-"@types/parse-json@^4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
-  integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==
-
-"@types/prop-types@*", "@types/prop-types@^15.7.3":
-  version "15.7.5"
-  resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.5.tgz#5f19d2b85a98e9558036f6a3cacc8819420f05cf"
-  integrity sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==
-
-"@types/react-datepicker@^4.10.0":
-  version "4.10.0"
-  resolved "https://registry.yarnpkg.com/@types/react-datepicker/-/react-datepicker-4.10.0.tgz#fcb0e6a7787491bf2f37fbda2b537062608a0056"
-  integrity sha512-Cq+ks20vBIU6XN67TbkCHu8M7V46Y6vJrKE2n+8q/GfueJyWWTIKeC3Z7cz/d+qxGDq/VCrqA929R0U4lNuztg==
-  dependencies:
-    "@popperjs/core" "^2.9.2"
-    "@types/react" "*"
-    date-fns "^2.0.1"
-    react-popper "^2.2.5"
-
-"@types/react-dom@^17.0.19":
-  version "17.0.19"
-  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.19.tgz#36feef3aa35d045cacd5ed60fe0eef5272f19492"
-  integrity sha512-PiYG40pnQRdPHnlf7tZnp0aQ6q9tspYr72vD61saO6zFCybLfMqwUCN0va1/P+86DXn18ZWeW30Bk7xlC5eEAQ==
-  dependencies:
-    "@types/react" "^17"
-
-"@types/react-helmet@^6.1.6":
-  version "6.1.6"
-  resolved "https://registry.yarnpkg.com/@types/react-helmet/-/react-helmet-6.1.6.tgz#7d1afd8cbf099616894e8240e9ef70e3c6d7506d"
-  integrity sha512-ZKcoOdW/Tg+kiUbkFCBtvDw0k3nD4HJ/h/B9yWxN4uDO8OkRksWTO+EL+z/Qu3aHTeTll3Ro0Cc/8UhwBCMG5A==
-  dependencies:
-    "@types/react" "*"
-
-"@types/react-router-bootstrap@^0.24.5":
-  version "0.24.5"
-  resolved "https://registry.yarnpkg.com/@types/react-router-bootstrap/-/react-router-bootstrap-0.24.5.tgz#9257ba3dfb01cda201aac9fa05cde3eb09ea5b27"
-  integrity sha512-GRx/8xF/skw4/Pmm6d+xbExi8gobCLOe8Eoz9kXPQGbYo7p5Wbi61tjpOF5AbfJ5XMN+fIzweToTi56odj/LOQ==
-  dependencies:
-    "@types/react" "*"
-    "@types/react-router-dom" "*"
-
-"@types/react-router-dom@*":
-  version "5.3.3"
-  resolved "https://registry.yarnpkg.com/@types/react-router-dom/-/react-router-dom-5.3.3.tgz#e9d6b4a66fcdbd651a5f106c2656a30088cc1e83"
-  integrity sha512-kpqnYK4wcdm5UaWI3fLcELopqLrHgLqNsdpHauzlQktfkHL3npOSwtj1Uz9oKBAzs7lFtVkV8j83voAz2D8fhw==
-  dependencies:
-    "@types/history" "^4.7.11"
-    "@types/react" "*"
-    "@types/react-router" "*"
-
-"@types/react-router-hash-link@^2.4.5":
-  version "2.4.5"
-  resolved "https://registry.yarnpkg.com/@types/react-router-hash-link/-/react-router-hash-link-2.4.5.tgz#41dcb55279351fedc9062115bb35db921d1d69f6"
-  integrity sha512-YsiD8xCWtRBebzPqG6kXjDQCI35LCN9MhV/MbgYF8y0trOp7VSUNmSj8HdIGyH99WCfSOLZB2pIwUMN/IwIDQg==
-  dependencies:
-    "@types/history" "^4.7.11"
-    "@types/react" "*"
-    "@types/react-router-dom" "*"
-
-"@types/react-router@*":
-  version "5.1.20"
-  resolved "https://registry.yarnpkg.com/@types/react-router/-/react-router-5.1.20.tgz#88eccaa122a82405ef3efbcaaa5dcdd9f021387c"
-  integrity sha512-jGjmu/ZqS7FjSH6owMcD5qpq19+1RS9DeVRqfl1FeBMxTDQAGwlMWOcs52NDoXaNKyG3d1cYQFMs9rCrb88o9Q==
-  dependencies:
-    "@types/history" "^4.7.11"
-    "@types/react" "*"
-
-"@types/react-transition-group@^4.4.0", "@types/react-transition-group@^4.4.1":
-  version "4.4.5"
-  resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.5.tgz#aae20dcf773c5aa275d5b9f7cdbca638abc5e416"
-  integrity sha512-juKD/eiSM3/xZYzjuzH6ZwpP+/lejltmiS3QEzV/vmb/Q8+HfDmxu+Baga8UEMGBqV88Nbg4l2hY/K2DkyaLLA==
-  dependencies:
-    "@types/react" "*"
-
-"@types/react@*", "@types/react@16 || 17 || 18", "@types/react@>=16.14.8", "@types/react@>=16.9.11", "@types/react@^17", "@types/react@^17.0.53":
-  version "17.0.53"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.53.tgz#10d4d5999b8af3d6bc6a9369d7eb953da82442ab"
-  integrity sha512-1yIpQR2zdYu1Z/dc1OxC+MA6GR240u3gcnP4l6mvj/PJiVaqHsQPmWttsvHsfnhfPbU2FuGmo0wSITPygjBmsw==
-  dependencies:
-    "@types/prop-types" "*"
-    "@types/scheduler" "*"
-    csstype "^3.0.2"
-
-"@types/scheduler@*":
-  version "0.16.2"
-  resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39"
-  integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==
-
-"@types/schema-utils@^2.4.0":
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/@types/schema-utils/-/schema-utils-2.4.0.tgz#9983012045d541dcee053e685a27c9c87c840fcd"
-  integrity sha512-454hrj5gz/FXcUE20ygfEiN4DxZ1sprUo0V1gqIqkNZ/CzoEzAZEll2uxMsuyz6BYjiQan4Aa65xbTemfzW9hQ==
-  dependencies:
-    schema-utils "*"
-
-"@types/semver@^7.3.12":
-  version "7.3.13"
-  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.13.tgz#da4bfd73f49bd541d28920ab0e2bf0ee80f71c91"
-  integrity sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==
-
-"@types/stats.js@*":
-  version "0.17.0"
-  resolved "https://registry.yarnpkg.com/@types/stats.js/-/stats.js-0.17.0.tgz#0ed81d48e03b590c24da85540c1d952077a9fe20"
-  integrity sha512-9w+a7bR8PeB0dCT/HBULU2fMqf6BAzvKbxFboYhmDtDkKPiyXYbjoe2auwsXlEFI7CFNMF1dCv3dFH5Poy9R1w==
-
-"@types/three@^0.154.0":
-  version "0.154.0"
-  resolved "https://registry.yarnpkg.com/@types/three/-/three-0.154.0.tgz#91f4384930ed050a14d7f13c09d5785cc167a064"
-  integrity sha512-IioqpGhch6FdLDh4zazRn3rXHj6Vn2nVOziJdXVbJFi9CaI65LtP9qqUtpzbsHK2Ezlox8NtsLNHSw3AQzucjA==
-  dependencies:
-    "@tweenjs/tween.js" "~18.6.4"
-    "@types/stats.js" "*"
-    "@types/webxr" "*"
-    fflate "~0.6.9"
-    lil-gui "~0.17.0"
-    meshoptimizer "~0.18.1"
-
-"@types/ua-parser-js@^0.7.36":
-  version "0.7.36"
-  resolved "https://registry.npmjs.org/@types/ua-parser-js/-/ua-parser-js-0.7.36.tgz"
-  integrity sha512-N1rW+njavs70y2cApeIw1vLMYXRwfBy+7trgavGuuTfOd7j1Yh7QTRc/yqsPl6ncokt72ZXuxEU0PiCp9bSwNQ==
-
-"@types/unist@*", "@types/unist@^2.0.0", "@types/unist@^2.0.2", "@types/unist@^2.0.3":
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.6.tgz#250a7b16c3b91f672a24552ec64678eeb1d3a08d"
-  integrity sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==
-
-"@types/video.js@*", "@types/video.js@^7.3.51":
-  version "7.3.51"
-  resolved "https://registry.yarnpkg.com/@types/video.js/-/video.js-7.3.51.tgz#ce69e02681ed6ed8abe61bb3802dd032a74d63e8"
-  integrity sha512-xLlt/ZfCuWYBvG2MRn018RvaEplcK6dI63aOiVUeeAWFyjx3Br1hL749ndFgbrvNdY4m9FoHG1FQ/PB6IpfSAQ==
-
-"@types/videojs-mobile-ui@^0.8.0":
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/@types/videojs-mobile-ui/-/videojs-mobile-ui-0.8.0.tgz#0fb82810155f3dee9620ea411c8b9bd17e1ac645"
-  integrity sha512-Q8p7ezQLZzf8pnvYd8GZ/6tcg2oX0269Q94dDoqNnq2QMmqWp1sj8npU3gGnTaLkYvvdrO8UjBOIzX68RkQLew==
-  dependencies:
-    "@types/video.js" "*"
-
-"@types/videojs-seek-buttons@^2.1.0":
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/@types/videojs-seek-buttons/-/videojs-seek-buttons-2.1.0.tgz#2c59007ad6f4d6f86df810b6e84daeb8c2e62fc4"
-  integrity sha512-vaTCELmPea/cgkf82P8RaeFBBZnd4nnuOiMaciSeMKiWzbflSvcvjnHfvKcBmJEi3hnSQ12bVXlmUvvOrgmpjQ==
-  dependencies:
-    "@types/video.js" "*"
-
-"@types/warning@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@types/warning/-/warning-3.0.0.tgz#0d2501268ad8f9962b740d387c4654f5f8e23e52"
-  integrity sha512-t/Tvs5qR47OLOr+4E9ckN8AmP2Tf16gWq+/qA4iUGS/OOyHVO8wv2vjJuX8SNOUTJyWb+2t7wJm6cXILFnOROA==
-
-"@types/webxr@*":
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/@types/webxr/-/webxr-0.5.2.tgz#5d9627b0ffe223aa3b166de7112ac8a9460dc54f"
-  integrity sha512-szL74BnIcok9m7QwYtVmQ+EdIKwbjPANudfuvDrAF8Cljg9MKUlIoc1w5tjj9PMpeSH3U1Xnx//czQybJ0EfSw==
-
-"@types/ws@^8.0.0":
-  version "8.5.4"
-  resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.4.tgz#bb10e36116d6e570dd943735f86c933c1587b8a5"
-  integrity sha512-zdQDHKUgcX/zBc4GrwsE/7dVdAD8JR4EuiAXiiUhhfyIJXXb2+PrGshFyeXWQPMmmZ2XxgaqclgpIC7eTXc1mg==
-  dependencies:
-    "@types/node" "*"
-
-"@typescript-eslint/eslint-plugin@^5.52.0":
-  version "5.52.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.52.0.tgz#5fb0d43574c2411f16ea80f5fc335b8eaa7b28a8"
-  integrity sha512-lHazYdvYVsBokwCdKOppvYJKaJ4S41CgKBcPvyd0xjZNbvQdhn/pnJlGtQksQ/NhInzdaeaSarlBjDXHuclEbg==
-  dependencies:
-    "@typescript-eslint/scope-manager" "5.52.0"
-    "@typescript-eslint/type-utils" "5.52.0"
-    "@typescript-eslint/utils" "5.52.0"
-    debug "^4.3.4"
-    grapheme-splitter "^1.0.4"
-    ignore "^5.2.0"
-    natural-compare-lite "^1.4.0"
-    regexpp "^3.2.0"
-    semver "^7.3.7"
-    tsutils "^3.21.0"
-
-"@typescript-eslint/parser@^5.52.0":
-  version "5.52.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.52.0.tgz#73c136df6c0133f1d7870de7131ccf356f5be5a4"
-  integrity sha512-e2KiLQOZRo4Y0D/b+3y08i3jsekoSkOYStROYmPUnGMEoA0h+k2qOH5H6tcjIc68WDvGwH+PaOrP1XRzLJ6QlA==
-  dependencies:
-    "@typescript-eslint/scope-manager" "5.52.0"
-    "@typescript-eslint/types" "5.52.0"
-    "@typescript-eslint/typescript-estree" "5.52.0"
-    debug "^4.3.4"
-
-"@typescript-eslint/scope-manager@5.52.0":
-  version "5.52.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.52.0.tgz#a993d89a0556ea16811db48eabd7c5b72dcb83d1"
-  integrity sha512-AR7sxxfBKiNV0FWBSARxM8DmNxrwgnYMPwmpkC1Pl1n+eT8/I2NAUPuwDy/FmDcC6F8pBfmOcaxcxRHspgOBMw==
-  dependencies:
-    "@typescript-eslint/types" "5.52.0"
-    "@typescript-eslint/visitor-keys" "5.52.0"
-
-"@typescript-eslint/type-utils@5.52.0":
-  version "5.52.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.52.0.tgz#9fd28cd02e6f21f5109e35496df41893f33167aa"
-  integrity sha512-tEKuUHfDOv852QGlpPtB3lHOoig5pyFQN/cUiZtpw99D93nEBjexRLre5sQZlkMoHry/lZr8qDAt2oAHLKA6Jw==
-  dependencies:
-    "@typescript-eslint/typescript-estree" "5.52.0"
-    "@typescript-eslint/utils" "5.52.0"
-    debug "^4.3.4"
-    tsutils "^3.21.0"
-
-"@typescript-eslint/types@5.52.0":
-  version "5.52.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.52.0.tgz#19e9abc6afb5bd37a1a9bea877a1a836c0b3241b"
-  integrity sha512-oV7XU4CHYfBhk78fS7tkum+/Dpgsfi91IIDy7fjCyq2k6KB63M6gMC0YIvy+iABzmXThCRI6xpCEyVObBdWSDQ==
-
-"@typescript-eslint/typescript-estree@5.52.0":
-  version "5.52.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.52.0.tgz#6408cb3c2ccc01c03c278cb201cf07e73347dfca"
-  integrity sha512-WeWnjanyEwt6+fVrSR0MYgEpUAuROxuAH516WPjUblIrClzYJj0kBbjdnbQXLpgAN8qbEuGywiQsXUVDiAoEuQ==
-  dependencies:
-    "@typescript-eslint/types" "5.52.0"
-    "@typescript-eslint/visitor-keys" "5.52.0"
-    debug "^4.3.4"
-    globby "^11.1.0"
-    is-glob "^4.0.3"
-    semver "^7.3.7"
-    tsutils "^3.21.0"
-
-"@typescript-eslint/utils@5.52.0":
-  version "5.52.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.52.0.tgz#b260bb5a8f6b00a0ed51db66bdba4ed5e4845a72"
-  integrity sha512-As3lChhrbwWQLNk2HC8Ree96hldKIqk98EYvypd3It8Q1f8d5zWyIoaZEp2va5667M4ZyE7X8UUR+azXrFl+NA==
-  dependencies:
-    "@types/json-schema" "^7.0.9"
-    "@types/semver" "^7.3.12"
-    "@typescript-eslint/scope-manager" "5.52.0"
-    "@typescript-eslint/types" "5.52.0"
-    "@typescript-eslint/typescript-estree" "5.52.0"
-    eslint-scope "^5.1.1"
-    eslint-utils "^3.0.0"
-    semver "^7.3.7"
-
-"@typescript-eslint/visitor-keys@5.52.0":
-  version "5.52.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.52.0.tgz#e38c971259f44f80cfe49d97dbffa38e3e75030f"
-  integrity sha512-qMwpw6SU5VHCPr99y274xhbm+PRViK/NATY6qzt+Et7+mThGuFSl/ompj2/hrBlRP/kq+BFdgagnOSgw9TB0eA==
-  dependencies:
-    "@typescript-eslint/types" "5.52.0"
-    eslint-visitor-keys "^3.3.0"
-
-"@videojs/http-streaming@2.16.2":
-  version "2.16.2"
-  resolved "https://registry.yarnpkg.com/@videojs/http-streaming/-/http-streaming-2.16.2.tgz#a9be925b4e368a41dbd67d49c4f566715169b84b"
-  integrity sha512-etPTUdCFu7gUWc+1XcbiPr+lrhOcBu3rV5OL1M+3PDW89zskScAkkcdqYzP4pFodBPye/ydamQoTDScOnElw5A==
-  dependencies:
-    "@babel/runtime" "^7.12.5"
-    "@videojs/vhs-utils" "3.0.5"
-    aes-decrypter "3.1.3"
-    global "^4.4.0"
-    m3u8-parser "4.8.0"
-    mpd-parser "^0.22.1"
-    mux.js "6.0.1"
-    video.js "^6 || ^7"
-
-"@videojs/vhs-utils@3.0.5", "@videojs/vhs-utils@^3.0.4", "@videojs/vhs-utils@^3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@videojs/vhs-utils/-/vhs-utils-3.0.5.tgz#665ba70d78258ba1ab977364e2fe9f4d4799c46c"
-  integrity sha512-PKVgdo8/GReqdx512F+ombhS+Bzogiofy1LgAj4tN8PfdBx3HSS7V5WfJotKTqtOWGwVfSWsrYN/t09/DSryrw==
-  dependencies:
-    "@babel/runtime" "^7.12.5"
-    global "^4.4.0"
-    url-toolkit "^2.2.1"
-
-"@videojs/xhr@2.6.0":
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/@videojs/xhr/-/xhr-2.6.0.tgz#cd897e0ad54faf497961bcce3fa16dc15a26bb80"
-  integrity sha512-7J361GiN1tXpm+gd0xz2QWr3xNWBE+rytvo8J3KuggFaLg+U37gZQ2BuPLcnkfGffy2e+ozY70RHC8jt7zjA6Q==
-  dependencies:
-    "@babel/runtime" "^7.5.5"
-    global "~4.4.0"
-    is-function "^1.0.1"
-
-"@vitejs/plugin-legacy@^4.0.1":
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/@vitejs/plugin-legacy/-/plugin-legacy-4.0.1.tgz#122e334ac0b8dba2cbd44cc15209e67c9a014463"
-  integrity sha512-/ZV63NagI1c9TB5E4ijGmycY//fNm/2L02nsnXXxACwYaF9W+/OyVlgIW24jYUIS+g0yQRtn+N5hzBc8RLNhGA==
-  dependencies:
-    "@babel/core" "^7.20.12"
-    "@babel/preset-env" "^7.20.2"
-    browserslist "^4.21.4"
-    core-js "^3.27.2"
-    magic-string "^0.27.0"
-    regenerator-runtime "^0.13.11"
-    systemjs "^6.13.0"
-
-"@vitejs/plugin-react@^3.1.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@vitejs/plugin-react/-/plugin-react-3.1.0.tgz#d1091f535eab8b83d6e74034d01e27d73c773240"
-  integrity sha512-AfgcRL8ZBhAlc3BFdigClmTUMISmmzHn7sB2h9U1odvc5U/MjWXsAaz18b/WoppUTDBzxOJwo2VdClfUcItu9g==
-  dependencies:
-    "@babel/core" "^7.20.12"
-    "@babel/plugin-transform-react-jsx-self" "^7.18.6"
-    "@babel/plugin-transform-react-jsx-source" "^7.19.6"
-    magic-string "^0.27.0"
-    react-refresh "^0.14.0"
-
-"@whatwg-node/events@^0.0.2":
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/@whatwg-node/events/-/events-0.0.2.tgz#7b7107268d2982fc7b7aff5ee6803c64018f84dd"
-  integrity sha512-WKj/lI4QjnLuPrim0cfO7i+HsDSXHxNv1y0CrJhdntuO3hxWZmnXCwNDnwOvry11OjRin6cgWNF+j/9Pn8TN4w==
-
-"@whatwg-node/events@^0.1.0":
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/@whatwg-node/events/-/events-0.1.1.tgz#0ca718508249419587e130da26d40e29d99b5356"
-  integrity sha512-AyQEn5hIPV7Ze+xFoXVU3QTHXVbWPrzaOkxtENMPMuNL6VVHrp4hHfDt9nrQpjO7BgvuM95dMtkycX5M/DZR3w==
-
-"@whatwg-node/fetch@^0.8.0":
-  version "0.8.1"
-  resolved "https://registry.yarnpkg.com/@whatwg-node/fetch/-/fetch-0.8.1.tgz#ee3c94746132f217e17f78f9e073bb342043d630"
-  integrity sha512-Fkd1qQHK2tAWxKlC85h9L86Lgbq3BzxMnHSnTsnzNZMMzn6Xi+HlN8/LJ90LxorhSqD54td+Q864LgwUaYDj1Q==
-  dependencies:
-    "@peculiar/webcrypto" "^1.4.0"
-    "@whatwg-node/node-fetch" "^0.3.0"
-    busboy "^1.6.0"
-    urlpattern-polyfill "^6.0.2"
-    web-streams-polyfill "^3.2.1"
-
-"@whatwg-node/fetch@^0.9.0":
-  version "0.9.16"
-  resolved "https://registry.yarnpkg.com/@whatwg-node/fetch/-/fetch-0.9.16.tgz#c833eb714f41f5d2caf1a345bed7a05f56db7b16"
-  integrity sha512-mqasZiUNquRe3ea9+aCAuo81BR6vq5opUKprPilIHTnrg8a21Z1T1OrI+KiMFX8OmwO5HUJe/vro47lpj2JPWQ==
-  dependencies:
-    "@whatwg-node/node-fetch" "^0.5.5"
-    urlpattern-polyfill "^10.0.0"
-
-"@whatwg-node/node-fetch@^0.3.0":
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/@whatwg-node/node-fetch/-/node-fetch-0.3.0.tgz#7c7e90d03fa09d0ddebff29add6f16d923327d58"
-  integrity sha512-mPM8WnuHiI/3kFxDeE0SQQXAElbz4onqmm64fEGCwYEcBes2UsvIDI8HwQIqaXCH42A9ajJUPv4WsYoN/9oG6w==
-  dependencies:
-    "@whatwg-node/events" "^0.0.2"
-    busboy "^1.6.0"
-    fast-querystring "^1.1.1"
-    fast-url-parser "^1.1.3"
-    tslib "^2.3.1"
-
-"@whatwg-node/node-fetch@^0.5.5":
-  version "0.5.5"
-  resolved "https://registry.yarnpkg.com/@whatwg-node/node-fetch/-/node-fetch-0.5.5.tgz#40c45e5f5f4185fa3391ff75f619287e0f225c7f"
-  integrity sha512-LhE0Oo95+dOrrzrJncrpCaR3VHSjJ5Gvkl5g9WVfkPKSKkxCbMeOsRQ+v9LrU9lRvXBJn8JicXqSufKFEpyRbQ==
-  dependencies:
-    "@kamilkisiela/fast-url-parser" "^1.1.4"
-    "@whatwg-node/events" "^0.1.0"
-    busboy "^1.6.0"
-    fast-querystring "^1.1.1"
-    tslib "^2.3.1"
-
-"@wry/caches@^1.0.0":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@wry/caches/-/caches-1.0.1.tgz#8641fd3b6e09230b86ce8b93558d44cf1ece7e52"
-  integrity sha512-bXuaUNLVVkD20wcGBWRyo7j9N3TxePEWFZj2Y+r9OoUzfqmavM84+mFykRicNsBqatba5JLay1t48wxaXaWnlA==
-  dependencies:
-    tslib "^2.3.0"
-
-"@wry/context@^0.7.0":
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/@wry/context/-/context-0.7.0.tgz#be88e22c0ddf62aeb0ae9f95c3d90932c619a5c8"
-  integrity sha512-LcDAiYWRtwAoSOArfk7cuYvFXytxfVrdX7yxoUmK7pPITLk5jYh2F8knCwS7LjgYL8u1eidPlKKV6Ikqq0ODqQ==
-  dependencies:
-    tslib "^2.3.0"
-
-"@wry/equality@^0.5.6":
-  version "0.5.7"
-  resolved "https://registry.yarnpkg.com/@wry/equality/-/equality-0.5.7.tgz#72ec1a73760943d439d56b7b1e9985aec5d497bb"
-  integrity sha512-BRFORjsTuQv5gxcXsuDXx6oGRhuVsEGwZy6LOzRRfgu+eSfxbhUQ9L9YtSEIuIjY/o7g3iWFjrc5eSY1GXP2Dw==
-  dependencies:
-    tslib "^2.3.0"
-
-"@wry/trie@^0.4.3":
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/@wry/trie/-/trie-0.4.3.tgz#077d52c22365871bf3ffcbab8e95cb8bc5689af4"
-  integrity sha512-I6bHwH0fSf6RqQcnnXLJKhkSXG45MFral3GxPaY4uAl0LYDZM+YDVDAiU9bYwjTuysy1S0IeecWtmq1SZA3M1w==
-  dependencies:
-    tslib "^2.3.0"
-
-"@wry/trie@^0.5.0":
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/@wry/trie/-/trie-0.5.0.tgz#11e783f3a53f6e4cd1d42d2d1323f5bc3fa99c94"
-  integrity sha512-FNoYzHawTMk/6KMQoEG5O4PuioX19UbwdQKF44yw0nLfOypfQdjtfZzo/UIJWAJ23sNIFbD1Ug9lbaDGMwbqQA==
-  dependencies:
-    tslib "^2.3.0"
-
-"@xmldom/xmldom@^0.8.3":
-  version "0.8.6"
-  resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.8.6.tgz#8a1524eb5bd5e965c1e3735476f0262469f71440"
-  integrity sha512-uRjjusqpoqfmRkTaNuLJ2VohVr67Q5YwDATW3VU7PfzTj6IRaihGrYI7zckGZjxQPBIp63nfvJbM+Yu5ICh0Bg==
-
-acorn-jsx@^5.3.2:
-  version "5.3.2"
-  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
-  integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
-
-acorn-walk@^8.1.1:
-  version "8.2.0"
-  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
-  integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
-
-acorn@^8.4.1, acorn@^8.5.0, acorn@^8.8.0:
-  version "8.8.2"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz#1b2f25db02af965399b9776b0c2c391276d37c4a"
-  integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==
-
-aes-decrypter@3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/aes-decrypter/-/aes-decrypter-3.1.3.tgz#65ff5f2175324d80c41083b0e135d1464b12ac35"
-  integrity sha512-VkG9g4BbhMBy+N5/XodDeV6F02chEk9IpgRTq/0bS80y4dzy79VH2Gtms02VXomf3HmyRe3yyJYkJ990ns+d6A==
-  dependencies:
-    "@babel/runtime" "^7.12.5"
-    "@videojs/vhs-utils" "^3.0.5"
-    global "^4.4.0"
-    pkcs7 "^1.0.4"
-
-agent-base@^7.0.2, agent-base@^7.1.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.0.tgz#536802b76bc0b34aa50195eb2442276d613e3434"
-  integrity sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==
-  dependencies:
-    debug "^4.3.4"
-
-aggregate-error@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
-  integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==
-  dependencies:
-    clean-stack "^2.0.0"
-    indent-string "^4.0.0"
-
-ajv-formats@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520"
-  integrity sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==
-  dependencies:
-    ajv "^8.0.0"
-
-ajv-keywords@^3.5.2:
-  version "3.5.2"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
-  integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
-
-ajv-keywords@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-5.1.0.tgz#69d4d385a4733cdbeab44964a1170a88f87f0e16"
-  integrity sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==
-  dependencies:
-    fast-deep-equal "^3.1.3"
-
-ajv@^6.10.0, ajv@^6.12.4:
-  version "6.12.6"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
-  integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
-  dependencies:
-    fast-deep-equal "^3.1.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
-    uri-js "^4.2.2"
-
-ajv@^8.0.0, ajv@^8.0.1, ajv@^8.8.0:
-  version "8.12.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1"
-  integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==
-  dependencies:
-    fast-deep-equal "^3.1.1"
-    json-schema-traverse "^1.0.0"
-    require-from-string "^2.0.2"
-    uri-js "^4.2.2"
-
-ansi-escapes@^4.2.1, ansi-escapes@^4.3.0:
-  version "4.3.2"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"
-  integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==
-  dependencies:
-    type-fest "^0.21.3"
-
-ansi-regex@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
-  integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
-
-ansi-styles@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
-  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
-  dependencies:
-    color-convert "^1.9.0"
-
-ansi-styles@^4.0.0, ansi-styles@^4.1.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
-  integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
-  dependencies:
-    color-convert "^2.0.1"
-
-anymatch@~3.1.2:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e"
-  integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==
-  dependencies:
-    normalize-path "^3.0.0"
-    picomatch "^2.0.4"
-
-apollo-upload-client@^18.0.1:
-  version "18.0.1"
-  resolved "https://registry.yarnpkg.com/apollo-upload-client/-/apollo-upload-client-18.0.1.tgz#e3811f2f5a36bffef23954f796daf331be748dcb"
-  integrity sha512-OQvZg1rK05VNI79D658FUmMdoI2oB/KJKb6QGMa2Si25QXOaAvLMBFUEwJct7wf+19U8vk9ILhidBOU1ZWv6QA==
-  dependencies:
-    extract-files "^13.0.0"
-
-arg@^4.1.0:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
-  integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==
-
-argparse@^1.0.7:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
-  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
-  dependencies:
-    sprintf-js "~1.0.2"
-
-argparse@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
-  integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
-
-aria-query@^5.1.3:
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-5.1.3.tgz#19db27cd101152773631396f7a95a3b58c22c35e"
-  integrity sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==
-  dependencies:
-    deep-equal "^2.0.5"
-
-array-includes@^3.1.5, array-includes@^3.1.6:
-  version "3.1.6"
-  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.6.tgz#9e9e720e194f198266ba9e18c29e6a9b0e4b225f"
-  integrity sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
-    get-intrinsic "^1.1.3"
-    is-string "^1.0.7"
-
-array-union@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
-  integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
-
-array.prototype.flat@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz#ffc6576a7ca3efc2f46a143b9d1dda9b4b3cf5e2"
-  integrity sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
-    es-shim-unscopables "^1.0.0"
-
-array.prototype.flatmap@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz#1aae7903c2100433cb8261cd4ed310aab5c4a183"
-  integrity sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
-    es-shim-unscopables "^1.0.0"
-
-array.prototype.tosorted@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/array.prototype.tosorted/-/array.prototype.tosorted-1.1.1.tgz#ccf44738aa2b5ac56578ffda97c03fd3e23dd532"
-  integrity sha512-pZYPXPRl2PqWcsUs6LOMn+1f1532nEoPTYowBtqLwAW+W8vSVhkIGnmOX1t/UQjD6YGI0vcD2B1U7ZFGQH9jnQ==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
-    es-shim-unscopables "^1.0.0"
-    get-intrinsic "^1.1.3"
-
-arrify@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
-  integrity sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==
-
-asap@~2.0.3:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
-  integrity sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==
-
-asn1js@^3.0.1, asn1js@^3.0.5:
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/asn1js/-/asn1js-3.0.5.tgz#5ea36820443dbefb51cc7f88a2ebb5b462114f38"
-  integrity sha512-FVnvrKJwpt9LP2lAMl8qZswRNm3T4q9CON+bxldk2iwk3FFpuwhx2FfinyitizWHsVYyaY+y5JzDR0rCMV5yTQ==
-  dependencies:
-    pvtsutils "^1.3.2"
-    pvutils "^1.1.3"
-    tslib "^2.4.0"
-
-ast-types-flow@^0.0.7:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.7.tgz#f70b735c6bca1a5c9c22d982c3e39e7feba3bdad"
-  integrity sha512-eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag==
-
-astral-regex@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
-  integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
-
-at-least-node@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
-  integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
-
-auto-bind@~4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/auto-bind/-/auto-bind-4.0.0.tgz#e3589fc6c2da8f7ca43ba9f84fa52a744fc997fb"
-  integrity sha512-Hdw8qdNiqdJ8LqT0iK0sVzkFbzg6fhnQqqfWhBDxcHZvU75+B+ayzTy8x+k5Ix0Y92XOhOUlx74ps+bA6BeYMQ==
-
-available-typed-arrays@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7"
-  integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==
-
-axe-core@^4.6.2:
-  version "4.6.3"
-  resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.6.3.tgz#fc0db6fdb65cc7a80ccf85286d91d64ababa3ece"
-  integrity sha512-/BQzOX780JhsxDnPpH4ZiyrJAzcd8AfzFPkv+89veFSr1rcMjuq2JDCwypKaPeB6ljHp9KjXhPpjgCvQlWYuqg==
-
-axobject-query@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-3.1.1.tgz#3b6e5c6d4e43ca7ba51c5babf99d22a9c68485e1"
-  integrity sha512-goKlv8DZrK9hUh975fnHzhNIO4jUnFCfv/dszV5VwUGDFjI6vQ2VwoyjYjYNEbBE8AH87TduWP5uyDR1D+Iteg==
-  dependencies:
-    deep-equal "^2.0.5"
-
-b64-to-blob@^1.2.19:
-  version "1.2.19"
-  resolved "https://registry.yarnpkg.com/b64-to-blob/-/b64-to-blob-1.2.19.tgz#157d85fdc8811665b9a35d29ffbc6a522ba28fbe"
-  integrity sha512-L3nSu8GgF4iEyNYakCQSfL2F5GI5aCXcot9mNTf+4N0/BMhpxqqHyOb6jIR24iq2xLjQZLG8FOt3gnUcV+9NVg==
-
-babel-plugin-macros@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz#9ef6dc74deb934b4db344dc973ee851d148c50c1"
-  integrity sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==
-  dependencies:
-    "@babel/runtime" "^7.12.5"
-    cosmiconfig "^7.0.0"
-    resolve "^1.19.0"
-
-babel-plugin-polyfill-corejs2@^0.3.3:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz#5d1bd3836d0a19e1b84bbf2d9640ccb6f951c122"
-  integrity sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==
-  dependencies:
-    "@babel/compat-data" "^7.17.7"
-    "@babel/helper-define-polyfill-provider" "^0.3.3"
-    semver "^6.1.1"
-
-babel-plugin-polyfill-corejs3@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz#56ad88237137eade485a71b52f72dbed57c6230a"
-  integrity sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA==
-  dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.3.3"
-    core-js-compat "^3.25.1"
-
-babel-plugin-polyfill-regenerator@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz#390f91c38d90473592ed43351e801a9d3e0fd747"
-  integrity sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==
-  dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.3.3"
-
-babel-plugin-react-intl@^7.0.0:
-  version "7.9.4"
-  resolved "https://registry.yarnpkg.com/babel-plugin-react-intl/-/babel-plugin-react-intl-7.9.4.tgz#1fc9ab50470d41b934df50d8f436578ee1732cb0"
-  integrity sha512-cMKrHEXrw43yT4M89Wbgq8A8N8lffSquj1Piwov/HVukR7jwOw8gf9btXNsQhT27ccyqEwy+M286JQYy0jby2g==
-  dependencies:
-    "@babel/core" "^7.9.0"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/types" "^7.9.5"
-    "@formatjs/ts-transformer" "^2.6.0"
-    "@types/babel__core" "^7.1.7"
-    "@types/fs-extra" "^9.0.1"
-    "@types/schema-utils" "^2.4.0"
-    fs-extra "^9.0.0"
-    intl-messageformat-parser "^5.3.7"
-    schema-utils "^2.6.6"
-
-babel-plugin-syntax-trailing-function-commas@^7.0.0-beta.0:
-  version "7.0.0-beta.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-7.0.0-beta.0.tgz#aa213c1435e2bffeb6fca842287ef534ad05d5cf"
-  integrity sha512-Xj9XuRuz3nTSbaTXWv3itLOcxyF4oPD8douBBmj7U9BBC6nEBYfyOJYQMf/8PJAFotC62UY5dFfIGEPr7WswzQ==
-
-babel-preset-fbjs@^3.4.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-fbjs/-/babel-preset-fbjs-3.4.0.tgz#38a14e5a7a3b285a3f3a86552d650dca5cf6111c"
-  integrity sha512-9ywCsCvo1ojrw0b+XYk7aFvTH6D9064t0RIL1rtMf3nsa02Xw41MS7sZw216Im35xj/UY0PDBQsa1brUDDF1Ow==
-  dependencies:
-    "@babel/plugin-proposal-class-properties" "^7.0.0"
-    "@babel/plugin-proposal-object-rest-spread" "^7.0.0"
-    "@babel/plugin-syntax-class-properties" "^7.0.0"
-    "@babel/plugin-syntax-flow" "^7.0.0"
-    "@babel/plugin-syntax-jsx" "^7.0.0"
-    "@babel/plugin-syntax-object-rest-spread" "^7.0.0"
-    "@babel/plugin-transform-arrow-functions" "^7.0.0"
-    "@babel/plugin-transform-block-scoped-functions" "^7.0.0"
-    "@babel/plugin-transform-block-scoping" "^7.0.0"
-    "@babel/plugin-transform-classes" "^7.0.0"
-    "@babel/plugin-transform-computed-properties" "^7.0.0"
-    "@babel/plugin-transform-destructuring" "^7.0.0"
-    "@babel/plugin-transform-flow-strip-types" "^7.0.0"
-    "@babel/plugin-transform-for-of" "^7.0.0"
-    "@babel/plugin-transform-function-name" "^7.0.0"
-    "@babel/plugin-transform-literals" "^7.0.0"
-    "@babel/plugin-transform-member-expression-literals" "^7.0.0"
-    "@babel/plugin-transform-modules-commonjs" "^7.0.0"
-    "@babel/plugin-transform-object-super" "^7.0.0"
-    "@babel/plugin-transform-parameters" "^7.0.0"
-    "@babel/plugin-transform-property-literals" "^7.0.0"
-    "@babel/plugin-transform-react-display-name" "^7.0.0"
-    "@babel/plugin-transform-react-jsx" "^7.0.0"
-    "@babel/plugin-transform-shorthand-properties" "^7.0.0"
-    "@babel/plugin-transform-spread" "^7.0.0"
-    "@babel/plugin-transform-template-literals" "^7.0.0"
-    babel-plugin-syntax-trailing-function-commas "^7.0.0-beta.0"
-
-bail@^1.0.0:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/bail/-/bail-1.0.5.tgz#b6fa133404a392cbc1f8c4bf63f5953351e7a776"
-  integrity sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ==
-
-balanced-match@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
-  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
-
-balanced-match@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-2.0.0.tgz#dc70f920d78db8b858535795867bf48f820633d9"
-  integrity sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==
-
-base64-blob@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/base64-blob/-/base64-blob-1.4.1.tgz#f8dfc16c22b24ee499e2782719bcce800132c18a"
-  integrity sha512-n5Ov4cPTbLBTX1PiFbaB5AmK7LMigO9HWh5Lzx+Kcx/yx1MppeeLYtAH8aLv1m++WNoHQnr+xbGSqcZinopwlw==
-  dependencies:
-    b64-to-blob "^1.2.19"
-
-base64-js@^1.3.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
-  integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
-
-bcp-47-match@^1.0.0, bcp-47-match@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/bcp-47-match/-/bcp-47-match-1.0.3.tgz#cb8d03071389a10aff2062b862d6575ffd7cd7ef"
-  integrity sha512-LggQ4YTdjWQSKELZF5JwchnBa1u0pIQSZf5lSdOHEdbVP55h0qICA/FUp3+W99q0xqxYa1ZQizTUH87gecII5w==
-
-bcp-47-normalize@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/bcp-47-normalize/-/bcp-47-normalize-1.1.1.tgz#d2c76218d132f223c44e4a06a7224be3030f8ec3"
-  integrity sha512-jWZ1Jdu3cs0EZdfCkS0UE9Gg01PtxnChjEBySeB+Zo6nkqtFfnvtoQQgP1qU1Oo4qgJgxhTI6Sf9y/pZIhPs0A==
-  dependencies:
-    bcp-47 "^1.0.0"
-    bcp-47-match "^1.0.0"
-
-bcp-47@^1.0.0:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/bcp-47/-/bcp-47-1.0.8.tgz#bf63ae4269faabe7c100deac0811121a48b6a561"
-  integrity sha512-Y9y1QNBBtYtv7hcmoX0tR+tUNSFZGZ6OL6vKPObq8BbOhkCoyayF6ogfLTgAli/KuAEbsYHYUNq2AQuY6IuLag==
-  dependencies:
-    is-alphabetical "^1.0.0"
-    is-alphanumerical "^1.0.0"
-    is-decimal "^1.0.0"
-
-binary-extensions@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
-  integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
-
-bl@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a"
-  integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==
-  dependencies:
-    buffer "^5.5.0"
-    inherits "^2.0.4"
-    readable-stream "^3.4.0"
-
-bootstrap@^4.6.2:
-  version "4.6.2"
-  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.6.2.tgz#8e0cd61611728a5bf65a3a2b8d6ff6c77d5d7479"
-  integrity sha512-51Bbp/Uxr9aTuy6ca/8FbFloBUJZLHwnhTcnjIeRn2suQWsWzcuJhGjKDB5eppVte/8oCdOL3VuwxvZDUggwGQ==
-
-brace-expansion@^1.1.7:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
-  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
-  dependencies:
-    balanced-match "^1.0.0"
-    concat-map "0.0.1"
-
-braces@^3.0.2, braces@^3.0.3, braces@~3.0.2:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
-  integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
-  dependencies:
-    fill-range "^7.1.1"
-
-browserslist@^4.21.4, browserslist@^4.21.5, browserslist@^4.22.2:
-  version "4.22.3"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.22.3.tgz#299d11b7e947a6b843981392721169e27d60c5a6"
-  integrity sha512-UAp55yfwNv0klWNapjs/ktHoguxuQNGnOzxYmfnXIS+8AsRDZkSDxg7R1AX3GKzn078SBI5dzwzj/Yx0Or0e3A==
-  dependencies:
-    caniuse-lite "^1.0.30001580"
-    electron-to-chromium "^1.4.648"
-    node-releases "^2.0.14"
-    update-browserslist-db "^1.0.13"
-
-bser@2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05"
-  integrity sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==
-  dependencies:
-    node-int64 "^0.4.0"
-
-buffer-from@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
-  integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
-
-buffer@^5.5.0:
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
-  integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
-  dependencies:
-    base64-js "^1.3.1"
-    ieee754 "^1.1.13"
-
-busboy@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/busboy/-/busboy-1.6.0.tgz#966ea36a9502e43cdb9146962523b92f531f6893"
-  integrity sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==
-  dependencies:
-    streamsearch "^1.1.0"
-
-call-bind@^1.0.0, call-bind@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
-  integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==
-  dependencies:
-    function-bind "^1.1.1"
-    get-intrinsic "^1.0.2"
-
-callsites@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
-  integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
-
-camel-case@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-4.1.2.tgz#9728072a954f805228225a6deea6b38461e1bd5a"
-  integrity sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==
-  dependencies:
-    pascal-case "^3.1.2"
-    tslib "^2.0.3"
-
-camelcase-keys@^6.2.2:
-  version "6.2.2"
-  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-6.2.2.tgz#5e755d6ba51aa223ec7d3d52f25778210f9dc3c0"
-  integrity sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==
-  dependencies:
-    camelcase "^5.3.1"
-    map-obj "^4.0.0"
-    quick-lru "^4.0.1"
-
-camelcase-keys@^7.0.0:
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-7.0.2.tgz#d048d8c69448745bb0de6fc4c1c52a30dfbe7252"
-  integrity sha512-Rjs1H+A9R+Ig+4E/9oyB66UC5Mj9Xq3N//vcLf2WzgdTi/3gUu3Z9KoqmlrEG4VuuLK8wJHofxzdQXz/knhiYg==
-  dependencies:
-    camelcase "^6.3.0"
-    map-obj "^4.1.0"
-    quick-lru "^5.1.1"
-    type-fest "^1.2.1"
-
-camelcase@^5.0.0, camelcase@^5.3.1:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
-  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
-
-camelcase@^6.3.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a"
-  integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
-
-caniuse-lite@^1.0.30001580:
-  version "1.0.30001580"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001580.tgz#e3c76bc6fe020d9007647044278954ff8cd17d1e"
-  integrity sha512-mtj5ur2FFPZcCEpXFy8ADXbDACuNFXg6mxVDqp7tqooX6l3zwm+d8EPoeOSIFRDvHs8qu7/SLFOGniULkcH2iA==
-
-capital-case@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/capital-case/-/capital-case-1.0.4.tgz#9d130292353c9249f6b00fa5852bee38a717e669"
-  integrity sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==
-  dependencies:
-    no-case "^3.0.4"
-    tslib "^2.0.3"
-    upper-case-first "^2.0.2"
-
-cardboard-vr-display@^1.0.19:
-  version "1.0.19"
-  resolved "https://registry.yarnpkg.com/cardboard-vr-display/-/cardboard-vr-display-1.0.19.tgz#81dcde1804b329b8228b757ac00e1fd2afa9d748"
-  integrity sha512-+MjcnWKAkb95p68elqZLDPzoiF/dGncQilLGvPBM5ZorABp/ao3lCs7nnRcYBckmuNkg1V/5rdGDKoUaCVsHzQ==
-  dependencies:
-    gl-preserve-state "^1.0.0"
-    nosleep.js "^0.7.0"
-    webvr-polyfill-dpdb "^1.0.17"
-
-ccount@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/ccount/-/ccount-1.1.0.tgz#246687debb6014735131be8abab2d93898f8d043"
-  integrity sha512-vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg==
-
-chalk@^2.4.2:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
-  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
-  dependencies:
-    ansi-styles "^3.2.1"
-    escape-string-regexp "^1.0.5"
-    supports-color "^5.3.0"
-
-chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
-  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
-  dependencies:
-    ansi-styles "^4.1.0"
-    supports-color "^7.1.0"
-
-change-case-all@1.0.14:
-  version "1.0.14"
-  resolved "https://registry.yarnpkg.com/change-case-all/-/change-case-all-1.0.14.tgz#bac04da08ad143278d0ac3dda7eccd39280bfba1"
-  integrity sha512-CWVm2uT7dmSHdO/z1CXT/n47mWonyypzBbuCy5tN7uMg22BsfkhwT6oHmFCAk+gL1LOOxhdbB9SZz3J1KTY3gA==
-  dependencies:
-    change-case "^4.1.2"
-    is-lower-case "^2.0.2"
-    is-upper-case "^2.0.2"
-    lower-case "^2.0.2"
-    lower-case-first "^2.0.2"
-    sponge-case "^1.0.1"
-    swap-case "^2.0.2"
-    title-case "^3.0.3"
-    upper-case "^2.0.2"
-    upper-case-first "^2.0.2"
-
-change-case-all@1.0.15:
-  version "1.0.15"
-  resolved "https://registry.yarnpkg.com/change-case-all/-/change-case-all-1.0.15.tgz#de29393167fc101d646cd76b0ef23e27d09756ad"
-  integrity sha512-3+GIFhk3sNuvFAJKU46o26OdzudQlPNBCu1ZQi3cMeMHhty1bhDxu2WrEilVNYaGvqUtR1VSigFcJOiS13dRhQ==
-  dependencies:
-    change-case "^4.1.2"
-    is-lower-case "^2.0.2"
-    is-upper-case "^2.0.2"
-    lower-case "^2.0.2"
-    lower-case-first "^2.0.2"
-    sponge-case "^1.0.1"
-    swap-case "^2.0.2"
-    title-case "^3.0.3"
-    upper-case "^2.0.2"
-    upper-case-first "^2.0.2"
-
-change-case@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/change-case/-/change-case-4.1.2.tgz#fedfc5f136045e2398c0410ee441f95704641e12"
-  integrity sha512-bSxY2ws9OtviILG1EiY5K7NNxkqg/JnRnFxLtKQ96JaviiIxi7djMrSd0ECT9AC+lttClmYwKw53BWpOMblo7A==
-  dependencies:
-    camel-case "^4.1.2"
-    capital-case "^1.0.4"
-    constant-case "^3.0.4"
-    dot-case "^3.0.4"
-    header-case "^2.0.4"
-    no-case "^3.0.4"
-    param-case "^3.0.4"
-    pascal-case "^3.1.2"
-    path-case "^3.0.4"
-    sentence-case "^3.0.4"
-    snake-case "^3.0.4"
-    tslib "^2.0.3"
-
-character-entities-legacy@^1.0.0:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz#94bc1845dce70a5bb9d2ecc748725661293d8fc1"
-  integrity sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA==
-
-character-entities@^1.0.0:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/character-entities/-/character-entities-1.2.4.tgz#e12c3939b7eaf4e5b15e7ad4c5e28e1d48c5b16b"
-  integrity sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw==
-
-character-reference-invalid@^1.0.0:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz#083329cda0eae272ab3dbbf37e9a382c13af1560"
-  integrity sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==
-
-chardet@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
-  integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
-
-"chokidar@>=3.0.0 <4.0.0":
-  version "3.5.3"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
-  integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
-  dependencies:
-    anymatch "~3.1.2"
-    braces "~3.0.2"
-    glob-parent "~5.1.2"
-    is-binary-path "~2.1.0"
-    is-glob "~4.0.1"
-    normalize-path "~3.0.0"
-    readdirp "~3.6.0"
-  optionalDependencies:
-    fsevents "~2.3.2"
-
-classnames@^2.2.5, classnames@^2.2.6, classnames@^2.3.1, classnames@^2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.2.tgz#351d813bf0137fcc6a76a16b88208d2560a0d924"
-  integrity sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw==
-
-clean-stack@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
-  integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
-
-cli-cursor@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
-  integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==
-  dependencies:
-    restore-cursor "^3.1.0"
-
-cli-spinners@^2.5.0:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.7.0.tgz#f815fd30b5f9eaac02db604c7a231ed7cb2f797a"
-  integrity sha512-qu3pN8Y3qHNgE2AFweciB1IfMnmZ/fsNTEE+NOFjmGB2F/7rLhnhzppvpCnN4FovtP26k8lHyy9ptEbNwWFLzw==
-
-cli-truncate@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz#c39e28bf05edcde5be3b98992a22deed5a2b93c7"
-  integrity sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==
-  dependencies:
-    slice-ansi "^3.0.0"
-    string-width "^4.2.0"
-
-cli-width@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6"
-  integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==
-
-cliui@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1"
-  integrity sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==
-  dependencies:
-    string-width "^4.2.0"
-    strip-ansi "^6.0.0"
-    wrap-ansi "^6.2.0"
-
-cliui@^8.0.1:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa"
-  integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==
-  dependencies:
-    string-width "^4.2.0"
-    strip-ansi "^6.0.1"
-    wrap-ansi "^7.0.0"
-
-clone@^1.0.2:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
-  integrity sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==
-
-codem-isoboxer@0.3.6:
-  version "0.3.6"
-  resolved "https://registry.yarnpkg.com/codem-isoboxer/-/codem-isoboxer-0.3.6.tgz#867f670459b881d44f39168d5ff2a8f14c16151d"
-  integrity sha512-LuO8/7LW6XuR5ERn1yavXAfodGRhuY2yP60JTZIw5yNYMCE5lUVbk3NFUCJxjnphQH+Xemp5hOGb1LgUXm00Xw==
-
-color-convert@^1.9.0:
-  version "1.9.3"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
-  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
-  dependencies:
-    color-name "1.1.3"
-
-color-convert@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
-  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
-  dependencies:
-    color-name "~1.1.4"
-
-color-name@1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
-  integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
-
-color-name@~1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
-  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
-
-colord@^2.9.3:
-  version "2.9.3"
-  resolved "https://registry.yarnpkg.com/colord/-/colord-2.9.3.tgz#4f8ce919de456f1d5c1c368c307fe20f3e59fb43"
-  integrity sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==
-
-colorette@^2.0.16:
-  version "2.0.19"
-  resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.19.tgz#cdf044f47ad41a0f4b56b3a0d5b4e6e1a2d5a798"
-  integrity sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==
-
-comma-separated-tokens@^1.0.0:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/comma-separated-tokens/-/comma-separated-tokens-1.0.8.tgz#632b80b6117867a158f1080ad498b2fbe7e3f5ea"
-  integrity sha512-GHuDRO12Sypu2cV70d1dkA2EUmXHgntrzbpvOB+Qy+49ypNfGgFQIC2fhhXbnyrJRynDCAARsT7Ou0M6hirpfw==
-
-commander@^2.20.0:
-  version "2.20.3"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
-  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
-
-common-tags@1.8.2:
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.2.tgz#94ebb3c076d26032745fd54face7f688ef5ac9c6"
-  integrity sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==
-
-concat-map@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-  integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
-
-confusing-browser-globals@^1.0.10:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz#ae40e9b57cdd3915408a2805ebd3a5585608dc81"
-  integrity sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==
-
-constant-case@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/constant-case/-/constant-case-3.0.4.tgz#3b84a9aeaf4cf31ec45e6bf5de91bdfb0589faf1"
-  integrity sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==
-  dependencies:
-    no-case "^3.0.4"
-    tslib "^2.0.3"
-    upper-case "^2.0.2"
-
-convert-source-map@^1.5.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f"
-  integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==
-
-convert-source-map@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a"
-  integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==
-
-cookie@^0.4.0:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.2.tgz#0e41f24de5ecf317947c82fc789e06a884824432"
-  integrity sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==
-
-core-js-compat@^3.25.1:
-  version "3.28.0"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.28.0.tgz#c08456d854608a7264530a2afa281fadf20ecee6"
-  integrity sha512-myzPgE7QodMg4nnd3K1TDoES/nADRStM8Gpz0D6nhkwbmwEnE0ZGJgoWsvQ722FR8D7xS0n0LV556RcEicjTyg==
-  dependencies:
-    browserslist "^4.21.5"
-
-core-js@^3.27.2:
-  version "3.28.0"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.28.0.tgz#ed8b9e99c273879fdfff0edfc77ee709a5800e4a"
-  integrity sha512-GiZn9D4Z/rSYvTeg1ljAIsEqFm0LaN9gVtwDCrKL80zHtS31p9BAjmTxVqTQDMpwlMolJZOFntUG2uwyj7DAqw==
-
-cosmiconfig@^7.0.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.1.0.tgz#1443b9afa596b670082ea46cbd8f6a62b84635f6"
-  integrity sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==
-  dependencies:
-    "@types/parse-json" "^4.0.0"
-    import-fresh "^3.2.1"
-    parse-json "^5.0.0"
-    path-type "^4.0.0"
-    yaml "^1.10.0"
-
-cosmiconfig@^8.1.0, cosmiconfig@^8.1.3, cosmiconfig@^8.2.0:
-  version "8.3.6"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-8.3.6.tgz#060a2b871d66dba6c8538ea1118ba1ac16f5fae3"
-  integrity sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==
-  dependencies:
-    import-fresh "^3.3.0"
-    js-yaml "^4.1.0"
-    parse-json "^5.2.0"
-    path-type "^4.0.0"
-
-create-require@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
-  integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
-
-cross-fetch@^3.1.5:
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.5.tgz#e1389f44d9e7ba767907f7af8454787952ab534f"
-  integrity sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==
-  dependencies:
-    node-fetch "2.6.7"
-
-cross-inspect@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/cross-inspect/-/cross-inspect-1.0.0.tgz#5fda1af759a148594d2d58394a9e21364f6849af"
-  integrity sha512-4PFfn4b5ZN6FMNGSZlyb7wUhuN8wvj8t/VQHZdM4JsDcruGJ8L2kf9zao98QIrBPFCpdk27qst/AGTl7pL3ypQ==
-  dependencies:
-    tslib "^2.4.0"
-
-cross-spawn@^7.0.2:
-  version "7.0.6"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
-  integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
-  dependencies:
-    path-key "^3.1.0"
-    shebang-command "^2.0.0"
-    which "^2.0.1"
-
-crypto-js@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-4.2.0.tgz#4d931639ecdfd12ff80e8186dba6af2c2e856631"
-  integrity sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==
-
-css-functions-list@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/css-functions-list/-/css-functions-list-3.1.0.tgz#cf5b09f835ad91a00e5959bcfc627cd498e1321b"
-  integrity sha512-/9lCvYZaUbBGvYUgYGFJ4dcYiyqdhSjG7IPVluoV8A1ILjkF7ilmhp1OGUz8n+nmBcu0RNrQAzgD8B6FJbrt2w==
-
-css-tree@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-2.3.1.tgz#10264ce1e5442e8572fc82fbe490644ff54b5c20"
-  integrity sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==
-  dependencies:
-    mdn-data "2.0.30"
-    source-map-js "^1.0.1"
-
-cssesc@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
-  integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
-
-csstype@^3.0.2:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.1.tgz#841b532c45c758ee546a11d5bd7b7b473c8c30b9"
-  integrity sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==
-
-damerau-levenshtein@^1.0.8:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz#b43d286ccbd36bc5b2f7ed41caf2d0aba1f8a6e7"
-  integrity sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==
-
-dashjs@^4.2.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/dashjs/-/dashjs-4.6.0.tgz#124c8371e192f1218746ce60b6aa0f175d4dcda4"
-  integrity sha512-0PDoSBM9PXb+Io0pRnw2CmO7aV9W8FC/BqBRNhLxzM3/e5Kfj7BLy0OWkkSB58ULg6Md6r+6jkGOTUhut/35rg==
-  dependencies:
-    bcp-47-match "^1.0.3"
-    bcp-47-normalize "^1.1.1"
-    codem-isoboxer "0.3.6"
-    es6-promise "^4.2.8"
-    fast-deep-equal "2.0.1"
-    html-entities "^1.2.1"
-    imsc "^1.0.2"
-    localforage "^1.7.1"
-    path-browserify "^1.0.1"
-    ua-parser-js "^1.0.2"
-
-dataloader@^2.2.2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/dataloader/-/dataloader-2.2.2.tgz#216dc509b5abe39d43a9b9d97e6e5e473dfbe3e0"
-  integrity sha512-8YnDaaf7N3k/q5HnTJVuzSyLETjoZjVmHc4AeKAzOvKHEFQKcn64OKBfzHYtE9zGjctNM7V9I0MfnUVLpi7M5g==
-
-date-fns@^2.0.1, date-fns@^2.24.0:
-  version "2.29.3"
-  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.29.3.tgz#27402d2fc67eb442b511b70bbdf98e6411cd68a8"
-  integrity sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA==
-
-debounce@^1.2.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/debounce/-/debounce-1.2.1.tgz#38881d8f4166a5c5848020c11827b834bcb3e0a5"
-  integrity sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==
-
-debug@4, debug@^4.0.0, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4:
-  version "4.3.4"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
-  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
-  dependencies:
-    ms "2.1.2"
-
-debug@^3.2.7:
-  version "3.2.7"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
-  integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
-  dependencies:
-    ms "^2.1.1"
-
-decamelize-keys@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.1.tgz#04a2d523b2f18d80d0158a43b895d56dff8d19d8"
-  integrity sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==
-  dependencies:
-    decamelize "^1.1.0"
-    map-obj "^1.0.0"
-
-decamelize@^1.1.0, decamelize@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
-  integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==
-
-decamelize@^5.0.0:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-5.0.1.tgz#db11a92e58c741ef339fb0a2868d8a06a9a7b1e9"
-  integrity sha512-VfxadyCECXgQlkoEAjeghAr5gY3Hf+IKjKb+X8tGVDtveCjN+USwprd2q3QXBR9T1+x2DG0XZF5/w+7HAtSaXA==
-
-deep-equal@^2.0.5:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-2.2.0.tgz#5caeace9c781028b9ff459f33b779346637c43e6"
-  integrity sha512-RdpzE0Hv4lhowpIUKKMJfeH6C1pXdtT1/it80ubgWqwI3qpuxUBpC1S4hnHg+zjnuOoDkzUtUCEEkG+XG5l3Mw==
-  dependencies:
-    call-bind "^1.0.2"
-    es-get-iterator "^1.1.2"
-    get-intrinsic "^1.1.3"
-    is-arguments "^1.1.1"
-    is-array-buffer "^3.0.1"
-    is-date-object "^1.0.5"
-    is-regex "^1.1.4"
-    is-shared-array-buffer "^1.0.2"
-    isarray "^2.0.5"
-    object-is "^1.1.5"
-    object-keys "^1.1.1"
-    object.assign "^4.1.4"
-    regexp.prototype.flags "^1.4.3"
-    side-channel "^1.0.4"
-    which-boxed-primitive "^1.0.2"
-    which-collection "^1.0.1"
-    which-typed-array "^1.1.9"
-
-deep-is@^0.1.3:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
-  integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
-
-deepmerge@^2.1.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-2.2.1.tgz#5d3ff22a01c00f645405a2fbc17d0778a1801170"
-  integrity sha512-R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA==
-
-defaults@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.4.tgz#b0b02062c1e2aa62ff5d9528f0f98baa90978d7a"
-  integrity sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==
-  dependencies:
-    clone "^1.0.2"
-
-define-properties@^1.1.3, define-properties@^1.1.4:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.0.tgz#52988570670c9eacedd8064f4a990f2405849bd5"
-  integrity sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==
-  dependencies:
-    has-property-descriptors "^1.0.0"
-    object-keys "^1.1.1"
-
-dependency-graph@^0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/dependency-graph/-/dependency-graph-0.11.0.tgz#ac0ce7ed68a54da22165a85e97a01d53f5eb2e27"
-  integrity sha512-JeMq7fEshyepOWDfcfHK06N3MhyPhz++vtqWhMT5O9A3K42rdsEDpfdVqjaqaAhsw6a+ZqeDvQVtD0hFHQWrzg==
-
-dequal@^2.0.2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/dequal/-/dequal-2.0.3.tgz#2644214f1997d39ed0ee0ece72335490a7ac67be"
-  integrity sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==
-
-detect-indent@^6.0.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-6.1.0.tgz#592485ebbbf6b3b1ab2be175c8393d04ca0d57e6"
-  integrity sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==
-
-diacritics@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/diacritics/-/diacritics-1.3.0.tgz#3efa87323ebb863e6696cebb0082d48ff3d6f7a1"
-  integrity sha512-wlwEkqcsaxvPJML+rDh/2iS824jbREk6DUMUKkEaSlxdYHeS43cClJtsWglvw2RfeXGm6ohKDqsXteJ5sP5enA==
-
-diff@^4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
-  integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
-
-dir-glob@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
-  integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==
-  dependencies:
-    path-type "^4.0.0"
-
-doctrine@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
-  integrity sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==
-  dependencies:
-    esutils "^2.0.2"
-
-doctrine@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
-  integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==
-  dependencies:
-    esutils "^2.0.2"
-
-dom-helpers@^5.0.1, dom-helpers@^5.2.0, dom-helpers@^5.2.1:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.2.1.tgz#d9400536b2bf8225ad98fe052e029451ac40e902"
-  integrity sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==
-  dependencies:
-    "@babel/runtime" "^7.8.7"
-    csstype "^3.0.2"
-
-dom-walk@^0.1.0:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.2.tgz#0c548bef048f4d1f2a97249002236060daa3fd84"
-  integrity sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==
-
-dot-case@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.4.tgz#9b2b670d00a431667a8a75ba29cd1b98809ce751"
-  integrity sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==
-  dependencies:
-    no-case "^3.0.4"
-    tslib "^2.0.3"
-
-dotenv@^16.0.0:
-  version "16.0.3"
-  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.0.3.tgz#115aec42bac5053db3c456db30cc243a5a836a07"
-  integrity sha512-7GO6HghkA5fYG9TYnNxi14/7K9f5occMlp3zXAuSxn7CKCxt9xbNWG7yF8hTCSUchlfWSe3uLmlPfigevRItzQ==
-
-dset@^3.1.2:
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/dset/-/dset-3.1.4.tgz#f8eaf5f023f068a036d08cd07dc9ffb7d0065248"
-  integrity sha512-2QF/g9/zTaPDc3BjNcVTGoBbXBgYfMTTceLaYcFJ/W9kggFUkhxD/hMEeuLKbugyef9SqAx8cpgwlIP/jinUTA==
-
-electron-to-chromium@^1.4.648:
-  version "1.4.648"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.648.tgz#c7b46c9010752c37bb4322739d6d2dd82354fbe4"
-  integrity sha512-EmFMarXeqJp9cUKu/QEciEApn0S/xRcpZWuAm32U7NgoZCimjsilKXHRO9saeEW55eHZagIDg6XTUOv32w9pjg==
-
-emoji-regex@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
-  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
-
-emoji-regex@^9.2.2:
-  version "9.2.2"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72"
-  integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==
-
-error-ex@^1.3.1:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
-  integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
-  dependencies:
-    is-arrayish "^0.2.1"
-
-es-abstract@^1.19.0, es-abstract@^1.20.4:
-  version "1.21.1"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.21.1.tgz#e6105a099967c08377830a0c9cb589d570dd86c6"
-  integrity sha512-QudMsPOz86xYz/1dG1OuGBKOELjCh99IIWHLzy5znUB6j8xG2yMA7bfTV86VSqKF+Y/H08vQPR+9jyXpuC6hfg==
-  dependencies:
-    available-typed-arrays "^1.0.5"
-    call-bind "^1.0.2"
-    es-set-tostringtag "^2.0.1"
-    es-to-primitive "^1.2.1"
-    function-bind "^1.1.1"
-    function.prototype.name "^1.1.5"
-    get-intrinsic "^1.1.3"
-    get-symbol-description "^1.0.0"
-    globalthis "^1.0.3"
-    gopd "^1.0.1"
-    has "^1.0.3"
-    has-property-descriptors "^1.0.0"
-    has-proto "^1.0.1"
-    has-symbols "^1.0.3"
-    internal-slot "^1.0.4"
-    is-array-buffer "^3.0.1"
-    is-callable "^1.2.7"
-    is-negative-zero "^2.0.2"
-    is-regex "^1.1.4"
-    is-shared-array-buffer "^1.0.2"
-    is-string "^1.0.7"
-    is-typed-array "^1.1.10"
-    is-weakref "^1.0.2"
-    object-inspect "^1.12.2"
-    object-keys "^1.1.1"
-    object.assign "^4.1.4"
-    regexp.prototype.flags "^1.4.3"
-    safe-regex-test "^1.0.0"
-    string.prototype.trimend "^1.0.6"
-    string.prototype.trimstart "^1.0.6"
-    typed-array-length "^1.0.4"
-    unbox-primitive "^1.0.2"
-    which-typed-array "^1.1.9"
-
-es-get-iterator@^1.1.2:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/es-get-iterator/-/es-get-iterator-1.1.3.tgz#3ef87523c5d464d41084b2c3c9c214f1199763d6"
-  integrity sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==
-  dependencies:
-    call-bind "^1.0.2"
-    get-intrinsic "^1.1.3"
-    has-symbols "^1.0.3"
-    is-arguments "^1.1.1"
-    is-map "^2.0.2"
-    is-set "^2.0.2"
-    is-string "^1.0.7"
-    isarray "^2.0.5"
-    stop-iteration-iterator "^1.0.0"
-
-es-set-tostringtag@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz#338d502f6f674301d710b80c8592de8a15f09cd8"
-  integrity sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==
-  dependencies:
-    get-intrinsic "^1.1.3"
-    has "^1.0.3"
-    has-tostringtag "^1.0.0"
-
-es-shim-unscopables@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz#702e632193201e3edf8713635d083d378e510241"
-  integrity sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==
-  dependencies:
-    has "^1.0.3"
-
-es-to-primitive@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
-  integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==
-  dependencies:
-    is-callable "^1.1.4"
-    is-date-object "^1.0.1"
-    is-symbol "^1.0.2"
-
-es6-promise@^4.2.8:
-  version "4.2.8"
-  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a"
-  integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==
-
-esbuild@^0.18.10:
-  version "0.18.20"
-  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.18.20.tgz#4709f5a34801b43b799ab7d6d82f7284a9b7a7a6"
-  integrity sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==
-  optionalDependencies:
-    "@esbuild/android-arm" "0.18.20"
-    "@esbuild/android-arm64" "0.18.20"
-    "@esbuild/android-x64" "0.18.20"
-    "@esbuild/darwin-arm64" "0.18.20"
-    "@esbuild/darwin-x64" "0.18.20"
-    "@esbuild/freebsd-arm64" "0.18.20"
-    "@esbuild/freebsd-x64" "0.18.20"
-    "@esbuild/linux-arm" "0.18.20"
-    "@esbuild/linux-arm64" "0.18.20"
-    "@esbuild/linux-ia32" "0.18.20"
-    "@esbuild/linux-loong64" "0.18.20"
-    "@esbuild/linux-mips64el" "0.18.20"
-    "@esbuild/linux-ppc64" "0.18.20"
-    "@esbuild/linux-riscv64" "0.18.20"
-    "@esbuild/linux-s390x" "0.18.20"
-    "@esbuild/linux-x64" "0.18.20"
-    "@esbuild/netbsd-x64" "0.18.20"
-    "@esbuild/openbsd-x64" "0.18.20"
-    "@esbuild/sunos-x64" "0.18.20"
-    "@esbuild/win32-arm64" "0.18.20"
-    "@esbuild/win32-ia32" "0.18.20"
-    "@esbuild/win32-x64" "0.18.20"
-
-escalade@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
-  integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
-
-escape-string-regexp@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-  integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
-
-escape-string-regexp@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
-  integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
-
-eslint-config-airbnb-base@^15.0.0:
-  version "15.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz#6b09add90ac79c2f8d723a2580e07f3925afd236"
-  integrity sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==
-  dependencies:
-    confusing-browser-globals "^1.0.10"
-    object.assign "^4.1.2"
-    object.entries "^1.1.5"
-    semver "^6.3.0"
-
-eslint-config-airbnb-typescript@^17.0.0:
-  version "17.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-airbnb-typescript/-/eslint-config-airbnb-typescript-17.0.0.tgz#360dbcf810b26bbcf2ff716198465775f1c49a07"
-  integrity sha512-elNiuzD0kPAPTXjFWg+lE24nMdHMtuxgYoD30OyMD6yrW1AhFZPAg27VX7d3tzOErw+dgJTNWfRSDqEcXb4V0g==
-  dependencies:
-    eslint-config-airbnb-base "^15.0.0"
-
-eslint-config-airbnb@^19.0.4:
-  version "19.0.4"
-  resolved "https://registry.yarnpkg.com/eslint-config-airbnb/-/eslint-config-airbnb-19.0.4.tgz#84d4c3490ad70a0ffa571138ebcdea6ab085fdc3"
-  integrity sha512-T75QYQVQX57jiNgpF9r1KegMICE94VYwoFQyMGhrvc+lB8YF2E/M/PYDaQe1AJcWaEgqLE+ErXV1Og/+6Vyzew==
-  dependencies:
-    eslint-config-airbnb-base "^15.0.0"
-    object.assign "^4.1.2"
-    object.entries "^1.1.5"
-
-eslint-config-prettier@^8.6.0:
-  version "8.6.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.6.0.tgz#dec1d29ab728f4fa63061774e1672ac4e363d207"
-  integrity sha512-bAF0eLpLVqP5oEVUFKpMA+NnRFICwn9X8B5jrR9FcqnYBuPbqWEjTEspPWMj5ye6czoSLDweCzSo3Ko7gGrZaA==
-
-eslint-import-resolver-node@^0.3.7:
-  version "0.3.7"
-  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz#83b375187d412324a1963d84fa664377a23eb4d7"
-  integrity sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==
-  dependencies:
-    debug "^3.2.7"
-    is-core-module "^2.11.0"
-    resolve "^1.22.1"
-
-eslint-module-utils@^2.7.4:
-  version "2.7.4"
-  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz#4f3e41116aaf13a20792261e61d3a2e7e0583974"
-  integrity sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==
-  dependencies:
-    debug "^3.2.7"
-
-eslint-plugin-import@^2.27.5:
-  version "2.27.5"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz#876a6d03f52608a3e5bb439c2550588e51dd6c65"
-  integrity sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==
-  dependencies:
-    array-includes "^3.1.6"
-    array.prototype.flat "^1.3.1"
-    array.prototype.flatmap "^1.3.1"
-    debug "^3.2.7"
-    doctrine "^2.1.0"
-    eslint-import-resolver-node "^0.3.7"
-    eslint-module-utils "^2.7.4"
-    has "^1.0.3"
-    is-core-module "^2.11.0"
-    is-glob "^4.0.3"
-    minimatch "^3.1.2"
-    object.values "^1.1.6"
-    resolve "^1.22.1"
-    semver "^6.3.0"
-    tsconfig-paths "^3.14.1"
-
-eslint-plugin-jsx-a11y@^6.7.1:
-  version "6.7.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.7.1.tgz#fca5e02d115f48c9a597a6894d5bcec2f7a76976"
-  integrity sha512-63Bog4iIethyo8smBklORknVjB0T2dwB8Mr/hIC+fBS0uyHdYYpzM/Ed+YC8VxTjlXHEWFOdmgwcDn1U2L9VCA==
-  dependencies:
-    "@babel/runtime" "^7.20.7"
-    aria-query "^5.1.3"
-    array-includes "^3.1.6"
-    array.prototype.flatmap "^1.3.1"
-    ast-types-flow "^0.0.7"
-    axe-core "^4.6.2"
-    axobject-query "^3.1.1"
-    damerau-levenshtein "^1.0.8"
-    emoji-regex "^9.2.2"
-    has "^1.0.3"
-    jsx-ast-utils "^3.3.3"
-    language-tags "=1.0.5"
-    minimatch "^3.1.2"
-    object.entries "^1.1.6"
-    object.fromentries "^2.0.6"
-    semver "^6.3.0"
-
-eslint-plugin-react-hooks@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz#4c3e697ad95b77e93f8646aaa1630c1ba607edd3"
-  integrity sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==
-
-eslint-plugin-react@^7.32.2:
-  version "7.32.2"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.32.2.tgz#e71f21c7c265ebce01bcbc9d0955170c55571f10"
-  integrity sha512-t2fBMa+XzonrrNkyVirzKlvn5RXzzPwRHtMvLAtVZrt8oxgnTQaYbU6SXTOO1mwQgp1y5+toMSKInnzGr0Knqg==
-  dependencies:
-    array-includes "^3.1.6"
-    array.prototype.flatmap "^1.3.1"
-    array.prototype.tosorted "^1.1.1"
-    doctrine "^2.1.0"
-    estraverse "^5.3.0"
-    jsx-ast-utils "^2.4.1 || ^3.0.0"
-    minimatch "^3.1.2"
-    object.entries "^1.1.6"
-    object.fromentries "^2.0.6"
-    object.hasown "^1.1.2"
-    object.values "^1.1.6"
-    prop-types "^15.8.1"
-    resolve "^2.0.0-next.4"
-    semver "^6.3.0"
-    string.prototype.matchall "^4.0.8"
-
-eslint-scope@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
-  integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
-  dependencies:
-    esrecurse "^4.3.0"
-    estraverse "^4.1.1"
-
-eslint-scope@^7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.1.1.tgz#fff34894c2f65e5226d3041ac480b4513a163642"
-  integrity sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==
-  dependencies:
-    esrecurse "^4.3.0"
-    estraverse "^5.2.0"
-
-eslint-utils@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz#8aebaface7345bb33559db0a1f13a1d2d48c3672"
-  integrity sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==
-  dependencies:
-    eslint-visitor-keys "^2.0.0"
-
-eslint-visitor-keys@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
-  integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
-
-eslint-visitor-keys@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826"
-  integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
-
-eslint@^8.34.0:
-  version "8.34.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.34.0.tgz#fe0ab0ef478104c1f9ebc5537e303d25a8fb22d6"
-  integrity sha512-1Z8iFsucw+7kSqXNZVslXS8Ioa4u2KM7GPwuKtkTFAqZ/cHMcEaR+1+Br0wLlot49cNxIiZk5wp8EAbPcYZxTg==
-  dependencies:
-    "@eslint/eslintrc" "^1.4.1"
-    "@humanwhocodes/config-array" "^0.11.8"
-    "@humanwhocodes/module-importer" "^1.0.1"
-    "@nodelib/fs.walk" "^1.2.8"
-    ajv "^6.10.0"
-    chalk "^4.0.0"
-    cross-spawn "^7.0.2"
-    debug "^4.3.2"
-    doctrine "^3.0.0"
-    escape-string-regexp "^4.0.0"
-    eslint-scope "^7.1.1"
-    eslint-utils "^3.0.0"
-    eslint-visitor-keys "^3.3.0"
-    espree "^9.4.0"
-    esquery "^1.4.0"
-    esutils "^2.0.2"
-    fast-deep-equal "^3.1.3"
-    file-entry-cache "^6.0.1"
-    find-up "^5.0.0"
-    glob-parent "^6.0.2"
-    globals "^13.19.0"
-    grapheme-splitter "^1.0.4"
-    ignore "^5.2.0"
-    import-fresh "^3.0.0"
-    imurmurhash "^0.1.4"
-    is-glob "^4.0.0"
-    is-path-inside "^3.0.3"
-    js-sdsl "^4.1.4"
-    js-yaml "^4.1.0"
-    json-stable-stringify-without-jsonify "^1.0.1"
-    levn "^0.4.1"
-    lodash.merge "^4.6.2"
-    minimatch "^3.1.2"
-    natural-compare "^1.4.0"
-    optionator "^0.9.1"
-    regexpp "^3.2.0"
-    strip-ansi "^6.0.1"
-    strip-json-comments "^3.1.0"
-    text-table "^0.2.0"
-
-espree@^9.4.0:
-  version "9.4.1"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-9.4.1.tgz#51d6092615567a2c2cff7833445e37c28c0065bd"
-  integrity sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==
-  dependencies:
-    acorn "^8.8.0"
-    acorn-jsx "^5.3.2"
-    eslint-visitor-keys "^3.3.0"
-
-esprima@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
-  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
-
-esquery@^1.4.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.1.tgz#ddb8e1e2666750113b78c15f59e977564f52b116"
-  integrity sha512-3ZggxvMv5EEY1ssUVyHSVt0oPreyBfbUi1XikJVfjFiBeBDLdrb0IWoDiEwqT/2sUQi0TGaWtFhOGDD8RTpXgQ==
-  dependencies:
-    estraverse "^5.1.0"
-
-esrecurse@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
-  integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==
-  dependencies:
-    estraverse "^5.2.0"
-
-estraverse@^4.1.1:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
-  integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
-
-estraverse@^5.1.0, estraverse@^5.2.0, estraverse@^5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
-  integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
-
-esutils@^2.0.2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
-  integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
-
-event-target-polyfill@^0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/event-target-polyfill/-/event-target-polyfill-0.0.4.tgz#060ee66e85aaedc76b6fa66079782dcc11cba496"
-  integrity sha512-Gs6RLjzlLRdT8X9ZipJdIZI/Y6/HhRLyq9RdDlCsnpxr/+Nn6bU2EFGuC94GjxqhM+Nmij2Vcq98yoHrU8uNFQ==
-
-extend@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
-  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
-
-external-editor@^3.0.3:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495"
-  integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==
-  dependencies:
-    chardet "^0.7.0"
-    iconv-lite "^0.4.24"
-    tmp "^0.0.33"
-
-extract-files@^11.0.0:
-  version "11.0.0"
-  resolved "https://registry.yarnpkg.com/extract-files/-/extract-files-11.0.0.tgz#b72d428712f787eef1f5193aff8ab5351ca8469a"
-  integrity sha512-FuoE1qtbJ4bBVvv94CC7s0oTnKUGvQs+Rjf1L2SJFfS+HTVVjhPFtehPdQ0JiGPqVNfSSZvL5yzHHQq2Z4WNhQ==
-
-extract-files@^13.0.0:
-  version "13.0.0"
-  resolved "https://registry.yarnpkg.com/extract-files/-/extract-files-13.0.0.tgz#9065073dedbcfb5e2ae8a90988cf609834b217ec"
-  integrity sha512-FXD+2Tsr8Iqtm3QZy1Zmwscca7Jx3mMC5Crr+sEP1I303Jy1CYMuYCm7hRTplFNg3XdUavErkxnTzpaqdSoi6g==
-  dependencies:
-    is-plain-obj "^4.1.0"
-
-extract-react-intl-messages@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/extract-react-intl-messages/-/extract-react-intl-messages-4.1.1.tgz#cd01d99053bb053ecc8410ccdccb9ac56daae91c"
-  integrity sha512-dPogci5X7HVtV7VbUxajH/1YgfNRaW2VtEiVidZ/31Tq8314uzOtzVMNo0IrAPD2E+H1wHoPiu/j565TZsyIZg==
-  dependencies:
-    "@babel/core" "^7.9.0"
-    babel-plugin-react-intl "^7.0.0"
-    flat "^5.0.0"
-    glob "^7.1.6"
-    js-yaml "^3.13.1"
-    load-json-file "^6.2.0"
-    lodash.merge "^4.6.2"
-    lodash.mergewith "^4.6.2"
-    lodash.pick "^4.4.0"
-    meow "^6.1.0"
-    mkdirp "^1.0.3"
-    pify "^5.0.0"
-    read-babelrc-up "^1.1.0"
-    sort-keys "^4.0.0"
-    write-json-file "^4.3.0"
-
-fast-decode-uri-component@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/fast-decode-uri-component/-/fast-decode-uri-component-1.0.1.tgz#46f8b6c22b30ff7a81357d4f59abfae938202543"
-  integrity sha512-WKgKWg5eUxvRZGwW8FvfbaH7AXSh2cL+3j5fMGzUMCxWBJ3dV3a7Wz8y2f/uQ0e3B6WmodD3oS54jTQ9HVTIIg==
-
-fast-deep-equal@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
-  integrity sha512-bCK/2Z4zLidyB4ReuIsvALH6w31YfAQDmXMqMx6FyfHqvBxtjC0eRumeSu4Bs3XtXwpyIywtSTrVT99BxY1f9w==
-
-fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
-  integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
-
-fast-glob@^3.2.9, fast-glob@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.0.tgz#7c40cb491e1e2ed5664749e87bfb516dbe8727c0"
-  integrity sha512-ChDuvbOypPuNjO8yIDf36x7BlZX1smcUMTTcyoIjycexOxd6DFsKsg21qVBzEmr3G7fUKIRy2/psii+CIUt7FA==
-  dependencies:
-    "@nodelib/fs.stat" "^2.0.2"
-    "@nodelib/fs.walk" "^1.2.3"
-    glob-parent "^5.1.2"
-    merge2 "^1.3.0"
-    micromatch "^4.0.4"
-
-fast-json-stable-stringify@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
-  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
-
-fast-levenshtein@^2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
-  integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
-
-fast-querystring@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/fast-querystring/-/fast-querystring-1.1.1.tgz#f4c56ef56b1a954880cfd8c01b83f9e1a3d3fda2"
-  integrity sha512-qR2r+e3HvhEFmpdHMv//U8FnFlnYjaC6QKDuaXALDkw2kvHO8WDjxH+f/rHGR4Me4pnk8p9JAkRNTjYHAKRn2Q==
-  dependencies:
-    fast-decode-uri-component "^1.0.1"
-
-fast-url-parser@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/fast-url-parser/-/fast-url-parser-1.1.3.tgz#f4af3ea9f34d8a271cf58ad2b3759f431f0b318d"
-  integrity sha512-5jOCVXADYNuRkKFzNJ0dCCewsZiYo0dz8QNYljkOpFC6r2U4OBmKtvm/Tsuh4w1YYdDqDb31a8TVhBJ2OJKdqQ==
-  dependencies:
-    punycode "^1.3.2"
-
-fastest-levenshtein@^1.0.16:
-  version "1.0.16"
-  resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz#210e61b6ff181de91ea9b3d1b84fdedd47e034e5"
-  integrity sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==
-
-fastq@^1.6.0:
-  version "1.15.0"
-  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.15.0.tgz#d04d07c6a2a68fe4599fea8d2e103a937fae6b3a"
-  integrity sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==
-  dependencies:
-    reusify "^1.0.4"
-
-fb-watchman@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.2.tgz#e9524ee6b5c77e9e5001af0f85f3adbb8623255c"
-  integrity sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==
-  dependencies:
-    bser "2.1.1"
-
-fbjs-css-vars@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/fbjs-css-vars/-/fbjs-css-vars-1.0.2.tgz#216551136ae02fe255932c3ec8775f18e2c078b8"
-  integrity sha512-b2XGFAFdWZWg0phtAWLHCk836A1Xann+I+Dgd3Gk64MHKZO44FfoD1KxyvbSh0qZsIoXQGGlVztIY+oitJPpRQ==
-
-fbjs@^3.0.0:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-3.0.4.tgz#e1871c6bd3083bac71ff2da868ad5067d37716c6"
-  integrity sha512-ucV0tDODnGV3JCnnkmoszb5lf4bNpzjv80K41wd4k798Etq+UYD0y0TIfalLjZoKgjive6/adkRnszwapiDgBQ==
-  dependencies:
-    cross-fetch "^3.1.5"
-    fbjs-css-vars "^1.0.0"
-    loose-envify "^1.0.0"
-    object-assign "^4.1.0"
-    promise "^7.1.1"
-    setimmediate "^1.0.5"
-    ua-parser-js "^0.7.30"
-
-fflate@~0.6.9:
-  version "0.6.10"
-  resolved "https://registry.yarnpkg.com/fflate/-/fflate-0.6.10.tgz#5f40f9659205936a2d18abf88b2e7781662b6d43"
-  integrity sha512-IQrh3lEPM93wVCEczc9SaAOvkmcoQn/G8Bo1e8ZPlY3X3bnAxWaBdvTdvM1hP62iZp0BXWDy4vTAy4fF0+Dlpg==
-
-figures@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
-  integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==
-  dependencies:
-    escape-string-regexp "^1.0.5"
-
-file-entry-cache@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
-  integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==
-  dependencies:
-    flat-cache "^3.0.4"
-
-fill-range@^7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
-  integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
-  dependencies:
-    to-regex-range "^5.0.1"
-
-find-root@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4"
-  integrity sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==
-
-find-up@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
-  integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
-  dependencies:
-    locate-path "^5.0.0"
-    path-exists "^4.0.0"
-
-find-up@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
-  integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
-  dependencies:
-    locate-path "^6.0.0"
-    path-exists "^4.0.0"
-
-flag-icons@^6.6.6:
-  version "6.6.6"
-  resolved "https://registry.yarnpkg.com/flag-icons/-/flag-icons-6.6.6.tgz#9ddff81e1126778ca6a5a1e0e2cfac2e865f2cb7"
-  integrity sha512-4lHDKxldnQ7q617pf9Dx9nAetT+9zcMpUexbRrc9kjLw9KJgZ83zA5Dky3Vv7ZDzUjAiZ46x/cy5P0HnEnqA2A==
-
-flat-cache@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11"
-  integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==
-  dependencies:
-    flatted "^3.1.0"
-    rimraf "^3.0.2"
-
-flat@^5.0.0:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241"
-  integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==
-
-flatted@^3.1.0:
-  version "3.2.7"
-  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.7.tgz#609f39207cb614b89d0765b477cb2d437fbf9787"
-  integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==
-
-flexbin@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/flexbin/-/flexbin-0.2.0.tgz#0126306d3d595fcb7dfcb87149b9c9599ff8f4e9"
-  integrity sha512-dgCeT6/oVljr0eao0f7Eg2VXutK/+rp02J6Nkw22uTTFE4HSC7zfYRzjuy2/r0dhr/sUBRMJM2tMyOCi+HeU+A==
-
-for-each@^0.3.3:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e"
-  integrity sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==
-  dependencies:
-    is-callable "^1.1.3"
-
-formik@^2.4.5:
-  version "2.4.5"
-  resolved "https://registry.yarnpkg.com/formik/-/formik-2.4.5.tgz#f899b5b7a6f103a8fabb679823e8fafc7e0ee1b4"
-  integrity sha512-Gxlht0TD3vVdzMDHwkiNZqJ7Mvg77xQNfmBRrNtvzcHZs72TJppSTDKHpImCMJZwcWPBJ8jSQQ95GJzXFf1nAQ==
-  dependencies:
-    "@types/hoist-non-react-statics" "^3.3.1"
-    deepmerge "^2.1.1"
-    hoist-non-react-statics "^3.3.0"
-    lodash "^4.17.21"
-    lodash-es "^4.17.21"
-    react-fast-compare "^2.0.1"
-    tiny-warning "^1.0.2"
-    tslib "^2.0.0"
-
-fs-extra@^10.0.0:
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf"
-  integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==
-  dependencies:
-    graceful-fs "^4.2.0"
-    jsonfile "^6.0.1"
-    universalify "^2.0.0"
-
-fs-extra@^9.0.0:
-  version "9.1.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d"
-  integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==
-  dependencies:
-    at-least-node "^1.0.0"
-    graceful-fs "^4.2.0"
-    jsonfile "^6.0.1"
-    universalify "^2.0.0"
-
-fs.realpath@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
-
-fsevents@~2.3.2:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
-  integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
-
-function-bind@^1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
-  integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
-
-function.prototype.name@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.5.tgz#cce0505fe1ffb80503e6f9e46cc64e46a12a9621"
-  integrity sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.0"
-    functions-have-names "^1.2.2"
-
-functions-have-names@^1.2.2:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
-  integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
-
-gensync@^1.0.0-beta.2:
-  version "1.0.0-beta.2"
-  resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
-  integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
-
-get-caller-file@^2.0.1, get-caller-file@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
-  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
-
-get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.0.tgz#7ad1dc0535f3a2904bba075772763e5051f6d05f"
-  integrity sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==
-  dependencies:
-    function-bind "^1.1.1"
-    has "^1.0.3"
-    has-symbols "^1.0.3"
-
-get-symbol-description@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6"
-  integrity sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==
-  dependencies:
-    call-bind "^1.0.2"
-    get-intrinsic "^1.1.1"
-
-gl-preserve-state@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/gl-preserve-state/-/gl-preserve-state-1.0.0.tgz#4ef710d62873f1470ed015c6546c37dacddd4198"
-  integrity sha512-zQZ25l3haD4hvgJZ6C9+s0ebdkW9y+7U2qxvGu1uWOJh8a4RU+jURIKEQhf8elIlFpMH6CrAY2tH0mYrRjet3Q==
-
-glob-parent@^5.1.2, glob-parent@~5.1.2:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
-  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
-  dependencies:
-    is-glob "^4.0.1"
-
-glob-parent@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
-  integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
-  dependencies:
-    is-glob "^4.0.3"
-
-glob@^7.1.1, glob@^7.1.3, glob@^7.1.6:
-  version "7.2.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
-  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.1.1"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-global-modules@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780"
-  integrity sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==
-  dependencies:
-    global-prefix "^3.0.0"
-
-global-prefix@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-3.0.0.tgz#fc85f73064df69f50421f47f883fe5b913ba9b97"
-  integrity sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==
-  dependencies:
-    ini "^1.3.5"
-    kind-of "^6.0.2"
-    which "^1.3.1"
-
-global@^4.3.1, global@^4.3.2, global@^4.4.0, global@~4.4.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/global/-/global-4.4.0.tgz#3e7b105179006a323ed71aafca3e9c57a5cc6406"
-  integrity sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==
-  dependencies:
-    min-document "^2.19.0"
-    process "^0.11.10"
-
-globals@^11.1.0:
-  version "11.12.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
-  integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
-
-globals@^13.19.0:
-  version "13.20.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-13.20.0.tgz#ea276a1e508ffd4f1612888f9d1bad1e2717bf82"
-  integrity sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==
-  dependencies:
-    type-fest "^0.20.2"
-
-globalthis@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.3.tgz#5852882a52b80dc301b0660273e1ed082f0b6ccf"
-  integrity sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==
-  dependencies:
-    define-properties "^1.1.3"
-
-globby@^11.0.3, globby@^11.1.0:
-  version "11.1.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"
-  integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==
-  dependencies:
-    array-union "^2.1.0"
-    dir-glob "^3.0.1"
-    fast-glob "^3.2.9"
-    ignore "^5.2.0"
-    merge2 "^1.4.1"
-    slash "^3.0.0"
-
-globjoin@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/globjoin/-/globjoin-0.1.4.tgz#2f4494ac8919e3767c5cbb691e9f463324285d43"
-  integrity sha512-xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg==
-
-globrex@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/globrex/-/globrex-0.1.2.tgz#dd5d9ec826232730cd6793a5e33a9302985e6098"
-  integrity sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==
-
-gopd@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c"
-  integrity sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==
-  dependencies:
-    get-intrinsic "^1.1.3"
-
-graceful-fs@^4.1.15, graceful-fs@^4.1.6, graceful-fs@^4.2.0:
-  version "4.2.10"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
-  integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
-
-grapheme-splitter@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e"
-  integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==
-
-graphql-config@^5.0.2:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/graphql-config/-/graphql-config-5.0.3.tgz#d9aa2954cf47a927f9cb83cdc4e42ae55d0b321e"
-  integrity sha512-BNGZaoxIBkv9yy6Y7omvsaBUHOzfFcII3UN++tpH8MGOKFPFkCPZuwx09ggANMt8FgyWP1Od8SWPmrUEZca4NQ==
-  dependencies:
-    "@graphql-tools/graphql-file-loader" "^8.0.0"
-    "@graphql-tools/json-file-loader" "^8.0.0"
-    "@graphql-tools/load" "^8.0.0"
-    "@graphql-tools/merge" "^9.0.0"
-    "@graphql-tools/url-loader" "^8.0.0"
-    "@graphql-tools/utils" "^10.0.0"
-    cosmiconfig "^8.1.0"
-    jiti "^1.18.2"
-    minimatch "^4.2.3"
-    string-env-interpolation "^1.0.1"
-    tslib "^2.4.0"
-
-graphql-request@^6.0.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/graphql-request/-/graphql-request-6.1.0.tgz#f4eb2107967af3c7a5907eb3131c671eac89be4f"
-  integrity sha512-p+XPfS4q7aIpKVcgmnZKhMNqhltk20hfXtkaIkTfjjmiKMJ5xrt5c743cL03y/K7y1rg3WrIC49xGiEQ4mxdNw==
-  dependencies:
-    "@graphql-typed-document-node/core" "^3.2.0"
-    cross-fetch "^3.1.5"
-
-graphql-tag@^2.11.0, graphql-tag@^2.12.6:
-  version "2.12.6"
-  resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.12.6.tgz#d441a569c1d2537ef10ca3d1633b48725329b5f1"
-  integrity sha512-FdSNcu2QQcWnM2VNvSCCDCVS5PpPqpzgFT8+GXzqJuoDd0CBncxCY278u4mhRO7tMgo2JjgJA5aZ+nWSQ/Z+xg==
-  dependencies:
-    tslib "^2.1.0"
-
-graphql-ws@^5.14.0, graphql-ws@^5.14.3:
-  version "5.14.3"
-  resolved "https://registry.yarnpkg.com/graphql-ws/-/graphql-ws-5.14.3.tgz#fb1fba011a0ae9c4e86d831cae2ec27955168b9a"
-  integrity sha512-F/i2xNIVbaEF2xWggID0X/UZQa2V8kqKDPO8hwmu53bVOcTL7uNkxnexeEgSCVxYBQUTUNEI8+e4LO1FOhKPKQ==
-
-"graphql@14 - 16", graphql@^16.8.1:
-  version "16.8.1"
-  resolved "https://registry.yarnpkg.com/graphql/-/graphql-16.8.1.tgz#1930a965bef1170603702acdb68aedd3f3cf6f07"
-  integrity sha512-59LZHPdGZVh695Ud9lRzPBVTtlX9ZCV150Er2W43ro37wVof0ctenSaskPPjN7lVTIN8mSZt8PHUNKZuNQUuxw==
-
-hard-rejection@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/hard-rejection/-/hard-rejection-2.1.0.tgz#1c6eda5c1685c63942766d79bb40ae773cecd883"
-  integrity sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==
-
-has-bigints@^1.0.1, has-bigints@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa"
-  integrity sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==
-
-has-flag@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
-  integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==
-
-has-flag@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
-  integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
-
-has-property-descriptors@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz#610708600606d36961ed04c196193b6a607fa861"
-  integrity sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==
-  dependencies:
-    get-intrinsic "^1.1.1"
-
-has-proto@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.1.tgz#1885c1305538958aff469fef37937c22795408e0"
-  integrity sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==
-
-has-symbols@^1.0.2, has-symbols@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
-  integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==
-
-has-tostringtag@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25"
-  integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==
-  dependencies:
-    has-symbols "^1.0.2"
-
-has@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/has/-/has-1.0.4.tgz#2eb2860e000011dae4f1406a86fe80e530fb2ec6"
-  integrity sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ==
-
-hast-to-hyperscript@^9.0.0:
-  version "9.0.1"
-  resolved "https://registry.yarnpkg.com/hast-to-hyperscript/-/hast-to-hyperscript-9.0.1.tgz#9b67fd188e4c81e8ad66f803855334173920218d"
-  integrity sha512-zQgLKqF+O2F72S1aa4y2ivxzSlko3MAvxkwG8ehGmNiqd98BIN3JM1rAJPmplEyLmGLO2QZYJtIneOSZ2YbJuA==
-  dependencies:
-    "@types/unist" "^2.0.3"
-    comma-separated-tokens "^1.0.0"
-    property-information "^5.3.0"
-    space-separated-tokens "^1.0.0"
-    style-to-object "^0.3.0"
-    unist-util-is "^4.0.0"
-    web-namespaces "^1.0.0"
-
-header-case@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/header-case/-/header-case-2.0.4.tgz#5a42e63b55177349cf405beb8d775acabb92c063"
-  integrity sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==
-  dependencies:
-    capital-case "^1.0.4"
-    tslib "^2.0.3"
-
-history@^4.9.0:
-  version "4.10.1"
-  resolved "https://registry.yarnpkg.com/history/-/history-4.10.1.tgz#33371a65e3a83b267434e2b3f3b1b4c58aad4cf3"
-  integrity sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew==
-  dependencies:
-    "@babel/runtime" "^7.1.2"
-    loose-envify "^1.2.0"
-    resolve-pathname "^3.0.0"
-    tiny-invariant "^1.0.2"
-    tiny-warning "^1.0.0"
-    value-equal "^1.0.1"
-
-hoist-non-react-statics@^3.1.0, hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.1, hoist-non-react-statics@^3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45"
-  integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==
-  dependencies:
-    react-is "^16.7.0"
-
-hosted-git-info@^2.1.4:
-  version "2.8.9"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
-  integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
-
-hosted-git-info@^4.0.1:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz#827b82867e9ff1c8d0c4d9d53880397d2c86d224"
-  integrity sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==
-  dependencies:
-    lru-cache "^6.0.0"
-
-html-entities@^1.2.1:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.4.0.tgz#cfbd1b01d2afaf9adca1b10ae7dffab98c71d2dc"
-  integrity sha512-8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA==
-
-html-tags@^3.3.1:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-3.3.1.tgz#a04026a18c882e4bba8a01a3d39cfe465d40b5ce"
-  integrity sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ==
-
-http-proxy-agent@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-7.0.0.tgz#e9096c5afd071a3fce56e6252bb321583c124673"
-  integrity sha512-+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ==
-  dependencies:
-    agent-base "^7.1.0"
-    debug "^4.3.4"
-
-https-proxy-agent@^7.0.0:
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.2.tgz#e2645b846b90e96c6e6f347fb5b2e41f1590b09b"
-  integrity sha512-NmLNjm6ucYwtcUmL7JQC1ZQ57LmHP4lT15FQ8D61nak1rO6DH+fz5qNK2Ap5UN4ZapYICE3/0KodcLYSPsPbaA==
-  dependencies:
-    agent-base "^7.0.2"
-    debug "4"
-
-i18n-iso-countries@^7.5.0:
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/i18n-iso-countries/-/i18n-iso-countries-7.5.0.tgz#74fedd72619526a195cfb2e768fe1d82eed2123f"
-  integrity sha512-PtfKJNWLVhhU0KBX/8asmywjAcuyQk07mmmMwxFJcddTNBJJ1yvpY2qxVmyxbtVF+9+6eg9phgpv83XPUKU5CA==
-  dependencies:
-    diacritics "1.3.0"
-
-iconv-lite@^0.4.24:
-  version "0.4.24"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
-  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
-  dependencies:
-    safer-buffer ">= 2.1.2 < 3"
-
-ieee754@^1.1.13:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
-  integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
-
-ignore@^5.2.0, ignore@^5.2.4:
-  version "5.2.4"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324"
-  integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==
-
-immediate@~3.0.5:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
-  integrity sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==
-
-immutable@^4.0.0:
-  version "4.2.4"
-  resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.2.4.tgz#83260d50889526b4b531a5e293709a77f7c55a2a"
-  integrity sha512-WDxL3Hheb1JkRN3sQkyujNlL/xRjAo3rJtaU5xeufUauG66JdMr32bLj4gF+vWl84DIA3Zxw7tiAjneYzRRw+w==
-
-immutable@~3.7.6:
-  version "3.7.6"
-  resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.7.6.tgz#13b4d3cb12befa15482a26fe1b2ebae640071e4b"
-  integrity sha512-AizQPcaofEtO11RZhPPHBOJRdo/20MKQF9mBLnVkBoyHi1/zXK8fzVdnEpSV9gxqtnh6Qomfp3F0xT5qP/vThw==
-
-import-fresh@^3.0.0, import-fresh@^3.2.1, import-fresh@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
-  integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
-  dependencies:
-    parent-module "^1.0.0"
-    resolve-from "^4.0.0"
-
-import-from@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/import-from/-/import-from-4.0.0.tgz#2710b8d66817d232e16f4166e319248d3d5492e2"
-  integrity sha512-P9J71vT5nLlDeV8FHs5nNxaLbrpfAV5cF5srvbZfpwpcJoM/xZR3hiv+q+SAnuSmuGbXMWud063iIMx/V/EWZQ==
-
-import-lazy@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-4.0.0.tgz#e8eb627483a0a43da3c03f3e35548be5cb0cc153"
-  integrity sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==
-
-imsc@^1.0.2:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/imsc/-/imsc-1.1.3.tgz#e96a60a50d4000dd7b44097272768b9fd6a4891d"
-  integrity sha512-IY0hMkVTNoqoYwKEp5UvNNKp/A5jeJUOrIO7judgOyhHT+xC6PA4VBOMAOhdtAYbMRHx9DTgI8p6Z6jhYQPFDA==
-  dependencies:
-    sax "1.2.1"
-
-imurmurhash@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
-  integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==
-
-indent-string@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
-  integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
-
-indent-string@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-5.0.0.tgz#4fd2980fccaf8622d14c64d694f4cf33c81951a5"
-  integrity sha512-m6FAo/spmsW2Ab2fU35JTYwtOKa2yAwXSwgjSv1TJzh4Mh7mC3lzAOVLBprb72XsTrgkEIsl7YrFNAiDiRhIGg==
-
-individual@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/individual/-/individual-2.0.0.tgz#833b097dad23294e76117a98fb38e0d9ad61bb97"
-  integrity sha512-pWt8hBCqJsUWI/HtcfWod7+N9SgAqyPEaF7JQjwzjn5vGrpg6aQ5qeAFQ7dx//UH4J1O+7xqew+gCeeFt6xN/g==
-
-inflight@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
-  dependencies:
-    once "^1.3.0"
-    wrappy "1"
-
-inherits@2, inherits@^2.0.3, inherits@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
-  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
-
-ini@^1.3.5:
-  version "1.3.8"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
-  integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
-
-inline-style-parser@0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/inline-style-parser/-/inline-style-parser-0.1.1.tgz#ec8a3b429274e9c0a1f1c4ffa9453a7fef72cea1"
-  integrity sha512-7NXolsK4CAS5+xvdj5OMMbI962hU/wvwoxk+LWR9Ek9bVtyuuYScDN6eS0rUm6TxApFpw7CX1o4uJzcd4AyD3Q==
-
-inquirer@^8.0.0:
-  version "8.2.5"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-8.2.5.tgz#d8654a7542c35a9b9e069d27e2df4858784d54f8"
-  integrity sha512-QAgPDQMEgrDssk1XiwwHoOGYF9BAbUcc1+j+FhEvaOt8/cKRqyLn0U5qA6F74fGhTMGxf92pOvPBeh29jQJDTQ==
-  dependencies:
-    ansi-escapes "^4.2.1"
-    chalk "^4.1.1"
-    cli-cursor "^3.1.0"
-    cli-width "^3.0.0"
-    external-editor "^3.0.3"
-    figures "^3.0.0"
-    lodash "^4.17.21"
-    mute-stream "0.0.8"
-    ora "^5.4.1"
-    run-async "^2.4.0"
-    rxjs "^7.5.5"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-    through "^2.3.6"
-    wrap-ansi "^7.0.0"
-
-internal-slot@^1.0.3, internal-slot@^1.0.4:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.5.tgz#f2a2ee21f668f8627a4667f309dc0f4fb6674986"
-  integrity sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==
-  dependencies:
-    get-intrinsic "^1.2.0"
-    has "^1.0.3"
-    side-channel "^1.0.4"
-
-intersection-observer@^0.12.2:
-  version "0.12.2"
-  resolved "https://registry.yarnpkg.com/intersection-observer/-/intersection-observer-0.12.2.tgz#4a45349cc0cd91916682b1f44c28d7ec737dc375"
-  integrity sha512-7m1vEcPCxXYI8HqnL8CKI6siDyD+eIWSwgB3DZA+ZTogxk9I4CDnj4wilt9x/+/QbHI4YG5YZNmC6458/e9Ktg==
-
-intl-messageformat-parser@6.1.2:
-  version "6.1.2"
-  resolved "https://registry.yarnpkg.com/intl-messageformat-parser/-/intl-messageformat-parser-6.1.2.tgz#28c65f3689f538e66c7cf628881548d6a82ff3c2"
-  integrity sha512-4GQDEPhl/ZMNDKwMsLqyw1LG2IAWjmLJXdmnRcHKeLQzpgtNYZI6lVw1279pqIkRk2MfKb9aDsVFzm565azK5A==
-  dependencies:
-    "@formatjs/ecma402-abstract" "1.5.0"
-    tslib "^2.0.1"
-
-intl-messageformat-parser@^5.3.7:
-  version "5.5.1"
-  resolved "https://registry.yarnpkg.com/intl-messageformat-parser/-/intl-messageformat-parser-5.5.1.tgz#f09a692755813e6220081e3374df3fb1698bd0c6"
-  integrity sha512-TvB3LqF2VtP6yI6HXlRT5TxX98HKha6hCcrg9dwlPwNaedVNuQA9KgBdtWKgiyakyCTYHQ+KJeFEstNKfZr64w==
-  dependencies:
-    "@formatjs/intl-numberformat" "^5.5.2"
-
-intl-messageformat@10.3.0:
-  version "10.3.0"
-  resolved "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-10.3.0.tgz#6a3a30882bf94dfa7014cc642c66abdafd942c0e"
-  integrity sha512-FKeBZKH9T2Ue4RUXCuwY/hEaRHU8cgICevlGKog0qSBuz/amtRKNBLetBLmRxiHeEkF7JBBckC+56GIwshlRwA==
-  dependencies:
-    "@formatjs/ecma402-abstract" "1.14.3"
-    "@formatjs/fast-memoize" "1.2.8"
-    "@formatjs/icu-messageformat-parser" "2.2.0"
-    tslib "^2.4.0"
-
-invariant@^2.2.4:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
-  integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==
-  dependencies:
-    loose-envify "^1.0.0"
-
-is-absolute@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz#395e1ae84b11f26ad1795e73c17378e48a301576"
-  integrity sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==
-  dependencies:
-    is-relative "^1.0.0"
-    is-windows "^1.0.1"
-
-is-alphabetical@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-1.0.4.tgz#9e7d6b94916be22153745d184c298cbf986a686d"
-  integrity sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==
-
-is-alphanumerical@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz#7eb9a2431f855f6b1ef1a78e326df515696c4dbf"
-  integrity sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A==
-  dependencies:
-    is-alphabetical "^1.0.0"
-    is-decimal "^1.0.0"
-
-is-arguments@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b"
-  integrity sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==
-  dependencies:
-    call-bind "^1.0.2"
-    has-tostringtag "^1.0.0"
-
-is-array-buffer@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.1.tgz#deb1db4fcae48308d54ef2442706c0393997052a"
-  integrity sha512-ASfLknmY8Xa2XtB4wmbz13Wu202baeA18cJBCeCy0wXUHZF0IPyVEXqKEcd+t2fNSLLL1vC6k7lxZEojNbISXQ==
-  dependencies:
-    call-bind "^1.0.2"
-    get-intrinsic "^1.1.3"
-    is-typed-array "^1.1.10"
-
-is-arrayish@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
-  integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==
-
-is-bigint@^1.0.1:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3"
-  integrity sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==
-  dependencies:
-    has-bigints "^1.0.1"
-
-is-binary-path@~2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
-  integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
-  dependencies:
-    binary-extensions "^2.0.0"
-
-is-boolean-object@^1.1.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719"
-  integrity sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==
-  dependencies:
-    call-bind "^1.0.2"
-    has-tostringtag "^1.0.0"
-
-is-buffer@^2.0.0:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191"
-  integrity sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==
-
-is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.7:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
-  integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
-
-is-core-module@^2.11.0, is-core-module@^2.13.0, is-core-module@^2.5.0, is-core-module@^2.9.0:
-  version "2.13.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.0.tgz#bb52aa6e2cbd49a30c2ba68c42bf3435ba6072db"
-  integrity sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==
-  dependencies:
-    has "^1.0.3"
-
-is-date-object@^1.0.1, is-date-object@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f"
-  integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==
-  dependencies:
-    has-tostringtag "^1.0.0"
-
-is-decimal@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-decimal/-/is-decimal-1.0.4.tgz#65a3a5958a1c5b63a706e1b333d7cd9f630d3fa5"
-  integrity sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==
-
-is-extglob@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
-  integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
-
-is-fullwidth-code-point@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
-  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
-
-is-function@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-function/-/is-function-1.0.2.tgz#4f097f30abf6efadac9833b17ca5dc03f8144e08"
-  integrity sha512-lw7DUp0aWXYg+CBCN+JKkcE0Q2RayZnSvnZBlwgxHBQhqt5pZNVy4Ri7H9GmmXkdu7LUthszM+Tor1u/2iBcpQ==
-
-is-glob@4.0.3, is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
-  integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
-  dependencies:
-    is-extglob "^2.1.1"
-
-is-hexadecimal@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz#cc35c97588da4bd49a8eedd6bc4082d44dcb23a7"
-  integrity sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==
-
-is-interactive@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz#cea6e6ae5c870a7b0a0004070b7b587e0252912e"
-  integrity sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==
-
-is-lower-case@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/is-lower-case/-/is-lower-case-2.0.2.tgz#1c0884d3012c841556243483aa5d522f47396d2a"
-  integrity sha512-bVcMJy4X5Og6VZfdOZstSexlEy20Sr0k/p/b2IlQJlfdKAQuMpiv5w2Ccxb8sKdRUNAG1PnHVHjFSdRDVS6NlQ==
-  dependencies:
-    tslib "^2.0.3"
-
-is-map@^2.0.1, is-map@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.2.tgz#00922db8c9bf73e81b7a335827bc2a43f2b91127"
-  integrity sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==
-
-is-negative-zero@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150"
-  integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==
-
-is-number-object@^1.0.4:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.7.tgz#59d50ada4c45251784e9904f5246c742f07a42fc"
-  integrity sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==
-  dependencies:
-    has-tostringtag "^1.0.0"
-
-is-number@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
-  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
-
-is-path-inside@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
-  integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
-
-is-plain-obj@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
-  integrity sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==
-
-is-plain-obj@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287"
-  integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==
-
-is-plain-obj@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-4.1.0.tgz#d65025edec3657ce032fd7db63c97883eaed71f0"
-  integrity sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==
-
-is-plain-object@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344"
-  integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==
-
-is-regex@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958"
-  integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==
-  dependencies:
-    call-bind "^1.0.2"
-    has-tostringtag "^1.0.0"
-
-is-relative@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz#a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d"
-  integrity sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==
-  dependencies:
-    is-unc-path "^1.0.0"
-
-is-set@^2.0.1, is-set@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.2.tgz#90755fa4c2562dc1c5d4024760d6119b94ca18ec"
-  integrity sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==
-
-is-shared-array-buffer@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79"
-  integrity sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==
-  dependencies:
-    call-bind "^1.0.2"
-
-is-string@^1.0.5, is-string@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd"
-  integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==
-  dependencies:
-    has-tostringtag "^1.0.0"
-
-is-symbol@^1.0.2, is-symbol@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c"
-  integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==
-  dependencies:
-    has-symbols "^1.0.2"
-
-is-typed-array@^1.1.10, is-typed-array@^1.1.9:
-  version "1.1.10"
-  resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.10.tgz#36a5b5cb4189b575d1a3e4b08536bfb485801e3f"
-  integrity sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==
-  dependencies:
-    available-typed-arrays "^1.0.5"
-    call-bind "^1.0.2"
-    for-each "^0.3.3"
-    gopd "^1.0.1"
-    has-tostringtag "^1.0.0"
-
-is-typedarray@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
-  integrity sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==
-
-is-unc-path@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz#d731e8898ed090a12c352ad2eaed5095ad322c9d"
-  integrity sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==
-  dependencies:
-    unc-path-regex "^0.1.2"
-
-is-unicode-supported@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7"
-  integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==
-
-is-upper-case@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/is-upper-case/-/is-upper-case-2.0.2.tgz#f1105ced1fe4de906a5f39553e7d3803fd804649"
-  integrity sha512-44pxmxAvnnAOwBg4tHPnkfvgjPwbc5QIsSstNU+YcJ1ovxVzCWpSGosPJOZh/a1tdl81fbgnLc9LLv+x2ywbPQ==
-  dependencies:
-    tslib "^2.0.3"
-
-is-weakmap@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.1.tgz#5008b59bdc43b698201d18f62b37b2ca243e8cf2"
-  integrity sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==
-
-is-weakref@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2"
-  integrity sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==
-  dependencies:
-    call-bind "^1.0.2"
-
-is-weakset@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/is-weakset/-/is-weakset-2.0.2.tgz#4569d67a747a1ce5a994dfd4ef6dcea76e7c0a1d"
-  integrity sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==
-  dependencies:
-    call-bind "^1.0.2"
-    get-intrinsic "^1.1.1"
-
-is-windows@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
-  integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
-
-isarray@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
-  integrity sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==
-
-isarray@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723"
-  integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==
-
-isexe@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-  integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
-
-isomorphic-ws@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/isomorphic-ws/-/isomorphic-ws-5.0.0.tgz#e5529148912ecb9b451b46ed44d53dae1ce04bbf"
-  integrity sha512-muId7Zzn9ywDsyXgTIafTry2sV3nySZeUDe6YedVd1Hvuuep5AsIlqK+XefWpYTyJG5e503F2xIuT2lcU6rCSw==
-
-jiti@^1.17.1, jiti@^1.18.2:
-  version "1.21.0"
-  resolved "https://registry.yarnpkg.com/jiti/-/jiti-1.21.0.tgz#7c97f8fe045724e136a397f7340475244156105d"
-  integrity sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q==
-
-jose@^5.0.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/jose/-/jose-5.2.0.tgz#d0ffd7f7e31253f633eefb190a930cd14a916995"
-  integrity sha512-oW3PCnvyrcm1HMvGTzqjxxfnEs9EoFOFWi2HsEGhlFVOXxTE3K9GKWVMFoFw06yPUqwpvEWic1BmtUZBI/tIjw==
-
-js-sdsl@^4.1.4:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.3.0.tgz#aeefe32a451f7af88425b11fdb5f58c90ae1d711"
-  integrity sha512-mifzlm2+5nZ+lEcLJMoBK0/IH/bDg8XnJfd/Wq6IP+xoCjLZsTOnV2QpxlVbX9bMnkl5PdEjNtBJ9Cj1NjifhQ==
-
-"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
-  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
-
-js-yaml@^3.13.1:
-  version "3.14.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
-  integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
-
-js-yaml@^4.0.0, js-yaml@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
-  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
-  dependencies:
-    argparse "^2.0.1"
-
-jsesc@^2.5.1:
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
-  integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
-
-jsesc@~0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
-  integrity sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==
-
-json-parse-even-better-errors@^2.3.0:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
-  integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
-
-json-schema-traverse@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
-  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
-
-json-schema-traverse@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"
-  integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==
-
-json-stable-stringify-without-jsonify@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
-  integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==
-
-json-stable-stringify@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.2.tgz#e06f23128e0bbe342dc996ed5a19e28b57b580e0"
-  integrity sha512-eunSSaEnxV12z+Z73y/j5N37/In40GK4GmsSy+tEHJMxknvqnA7/djeYtAgW0GsWHUfg+847WJjKaEylk2y09g==
-  dependencies:
-    jsonify "^0.0.1"
-
-json-to-pretty-yaml@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/json-to-pretty-yaml/-/json-to-pretty-yaml-1.2.2.tgz#f4cd0bd0a5e8fe1df25aaf5ba118b099fd992d5b"
-  integrity sha512-rvm6hunfCcqegwYaG5T4yKJWxc9FXFgBVrcTZ4XfSVRwa5HA/Xs+vB/Eo9treYYHCeNM0nrSUr82V/M31Urc7A==
-  dependencies:
-    remedial "^1.0.7"
-    remove-trailing-spaces "^1.0.6"
-
-json2mq@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/json2mq/-/json2mq-0.2.0.tgz#b637bd3ba9eabe122c83e9720483aeb10d2c904a"
-  integrity sha512-SzoRg7ux5DWTII9J2qkrZrqV1gt+rTaoufMxEzXbS26Uid0NwaJd123HcoB80TgubEppxxIGdNxCx50fEoEWQA==
-  dependencies:
-    string-convert "^0.2.0"
-
-json5@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593"
-  integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==
-  dependencies:
-    minimist "^1.2.0"
-
-json5@^2.1.2, json5@^2.2.3:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
-  integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
-
-jsonfile@^6.0.1:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
-  integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==
-  dependencies:
-    universalify "^2.0.0"
-  optionalDependencies:
-    graceful-fs "^4.1.6"
-
-jsonify@^0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.1.tgz#2aa3111dae3d34a0f151c63f3a45d995d9420978"
-  integrity sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==
-
-"jsx-ast-utils@^2.4.1 || ^3.0.0", jsx-ast-utils@^3.3.3:
-  version "3.3.3"
-  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.3.3.tgz#76b3e6e6cece5c69d49a5792c3d01bd1a0cdc7ea"
-  integrity sha512-fYQHZTZ8jSfmWZ0iyzfwiU4WDX4HpHbMCZ3gPlWYiCl3BoeOTsqKBqnTVfH2rYT7eP5c3sVbeSPHnnJOaTrWiw==
-  dependencies:
-    array-includes "^3.1.5"
-    object.assign "^4.1.3"
-
-keycode@^2.2.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/keycode/-/keycode-2.2.1.tgz#09c23b2be0611d26117ea2501c2c391a01f39eff"
-  integrity sha512-Rdgz9Hl9Iv4QKi8b0OlCRQEzp4AgVxyCtz5S/+VIHezDmrDhkp2N2TqBWOLz0/gbeREXOOiI9/4b8BY9uw2vFg==
-
-kind-of@^6.0.2, kind-of@^6.0.3:
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
-  integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
-
-known-css-properties@^0.27.0:
-  version "0.27.0"
-  resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.27.0.tgz#82a9358dda5fe7f7bd12b5e7142c0a205393c0c5"
-  integrity sha512-uMCj6+hZYDoffuvAJjFAPz56E9uoowFHmTkqRtRq5WyC5Q6Cu/fTZKNQpX/RbzChBYLLl3lo8CjFZBAZXq9qFg==
-
-language-subtag-registry@~0.3.2:
-  version "0.3.22"
-  resolved "https://registry.yarnpkg.com/language-subtag-registry/-/language-subtag-registry-0.3.22.tgz#2e1500861b2e457eba7e7ae86877cbd08fa1fd1d"
-  integrity sha512-tN0MCzyWnoz/4nHS6uxdlFWoUZT7ABptwKPQ52Ea7URk6vll88bWBVhodtnlfEuCcKWNGoc+uGbw1cwa9IKh/w==
-
-language-tags@=1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/language-tags/-/language-tags-1.0.5.tgz#d321dbc4da30ba8bf3024e040fa5c14661f9193a"
-  integrity sha512-qJhlO9cGXi6hBGKoxEG/sKZDAHD5Hnu9Hs4WbOY3pCWXDhw0N8x1NenNzm2EnNLkLkk7J2SdxAkDSbb6ftT+UQ==
-  dependencies:
-    language-subtag-registry "~0.3.2"
-
-levn@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"
-  integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==
-  dependencies:
-    prelude-ls "^1.2.1"
-    type-check "~0.4.0"
-
-lie@3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/lie/-/lie-3.1.1.tgz#9a436b2cc7746ca59de7a41fa469b3efb76bd87e"
-  integrity sha512-RiNhHysUjhrDQntfYSfY4MU24coXXdEOgw9WGcKHNeEwffDYbF//u87M1EWaMGzuFoSbqW0C9C6lEEhDOAswfw==
-  dependencies:
-    immediate "~3.0.5"
-
-lil-gui@~0.17.0:
-  version "0.17.0"
-  resolved "https://registry.yarnpkg.com/lil-gui/-/lil-gui-0.17.0.tgz#b41ae55d0023fcd9185f7395a218db0f58189663"
-  integrity sha512-MVBHmgY+uEbmJNApAaPbtvNh1RCAeMnKym82SBjtp5rODTYKWtM+MXHCifLe2H2Ti1HuBGBtK/5SyG4ShQ3pUQ==
-
-lines-and-columns@^1.1.6:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
-  integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
-
-listr2@^4.0.5:
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/listr2/-/listr2-4.0.5.tgz#9dcc50221583e8b4c71c43f9c7dfd0ef546b75d5"
-  integrity sha512-juGHV1doQdpNT3GSTs9IUN43QJb7KHdF9uqg7Vufs/tG9VTzpFphqF4pm/ICdAABGQxsyNn9CiYA3StkI6jpwA==
-  dependencies:
-    cli-truncate "^2.1.0"
-    colorette "^2.0.16"
-    log-update "^4.0.0"
-    p-map "^4.0.0"
-    rfdc "^1.3.0"
-    rxjs "^7.5.5"
-    through "^2.3.8"
-    wrap-ansi "^7.0.0"
-
-load-json-file@^6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-6.2.0.tgz#5c7770b42cafa97074ca2848707c61662f4251a1"
-  integrity sha512-gUD/epcRms75Cw8RT1pUdHugZYM5ce64ucs2GEISABwkRsOQr0q2wm/MV2TKThycIe5e0ytRweW2RZxclogCdQ==
-  dependencies:
-    graceful-fs "^4.1.15"
-    parse-json "^5.0.0"
-    strip-bom "^4.0.0"
-    type-fest "^0.6.0"
-
-localforage@^1.10.0, localforage@^1.7.1:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/localforage/-/localforage-1.10.0.tgz#5c465dc5f62b2807c3a84c0c6a1b1b3212781dd4"
-  integrity sha512-14/H1aX7hzBBmmh7sGPd+AOMkkIrHM3Z1PAyGgZigA1H1p5O5ANnMyWzvpAETtG68/dC4pC0ncy3+PPGzXZHPg==
-  dependencies:
-    lie "3.1.1"
-
-locate-path@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
-  integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==
-  dependencies:
-    p-locate "^4.1.0"
-
-locate-path@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286"
-  integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==
-  dependencies:
-    p-locate "^5.0.0"
-
-lodash-es@^4.17.21:
-  version "4.17.21"
-  resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee"
-  integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==
-
-lodash.debounce@^4.0.8:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
-  integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==
-
-lodash.merge@^4.6.2:
-  version "4.6.2"
-  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
-  integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
-
-lodash.mergewith@^4.6.2:
-  version "4.6.2"
-  resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz#617121f89ac55f59047c7aec1ccd6654c6590f55"
-  integrity sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==
-
-lodash.pick@^4.4.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3"
-  integrity sha512-hXt6Ul/5yWjfklSGvLQl8vM//l3FtyHZeuelpzK6mm99pNvN9yTDruNZPEJZD1oWrqo+izBmB7oUfWgcCX7s4Q==
-
-lodash.truncate@^4.4.2:
-  version "4.4.2"
-  resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193"
-  integrity sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==
-
-lodash@^4.17.20, lodash@^4.17.21, lodash@~4.17.0:
-  version "4.17.21"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
-  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
-
-log-symbols@^4.0.0, log-symbols@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503"
-  integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==
-  dependencies:
-    chalk "^4.1.0"
-    is-unicode-supported "^0.1.0"
-
-log-update@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/log-update/-/log-update-4.0.0.tgz#589ecd352471f2a1c0c570287543a64dfd20e0a1"
-  integrity sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==
-  dependencies:
-    ansi-escapes "^4.3.0"
-    cli-cursor "^3.1.0"
-    slice-ansi "^4.0.0"
-    wrap-ansi "^6.2.0"
-
-longest-streak@^2.0.0:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-2.0.4.tgz#b8599957da5b5dab64dee3fe316fa774597d90e4"
-  integrity sha512-vM6rUVCVUJJt33bnmHiZEvr7wPT78ztX7rojL+LW51bHtLh6HTjx84LA5W4+oa6aKEJA7jJu5LR6vQRBpA5DVg==
-
-loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.1, loose-envify@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
-  integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
-  dependencies:
-    js-tokens "^3.0.0 || ^4.0.0"
-
-lower-case-first@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/lower-case-first/-/lower-case-first-2.0.2.tgz#64c2324a2250bf7c37c5901e76a5b5309301160b"
-  integrity sha512-EVm/rR94FJTZi3zefZ82fLWab+GX14LJN4HrWBcuo6Evmsl9hEfnqxgcHCKb9q+mNf6EVdsjx/qucYFIIB84pg==
-  dependencies:
-    tslib "^2.0.3"
-
-lower-case@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.2.tgz#6fa237c63dbdc4a82ca0fd882e4722dc5e634e28"
-  integrity sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==
-  dependencies:
-    tslib "^2.0.3"
-
-lru-cache@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
-  integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==
-  dependencies:
-    yallist "^3.0.2"
-
-lru-cache@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
-  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
-  dependencies:
-    yallist "^4.0.0"
-
-m3u8-parser@4.8.0:
-  version "4.8.0"
-  resolved "https://registry.yarnpkg.com/m3u8-parser/-/m3u8-parser-4.8.0.tgz#4a2d591fdf6f2579d12a327081198df8af83083d"
-  integrity sha512-UqA2a/Pw3liR6Df3gwxrqghCP17OpPlQj6RBPLYygf/ZSQ4MoSgvdvhvt35qV+3NaaA0FSZx93Ix+2brT1U7cA==
-  dependencies:
-    "@babel/runtime" "^7.12.5"
-    "@videojs/vhs-utils" "^3.0.5"
-    global "^4.4.0"
-
-magic-string@^0.27.0:
-  version "0.27.0"
-  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.27.0.tgz#e4a3413b4bab6d98d2becffd48b4a257effdbbf3"
-  integrity sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==
-  dependencies:
-    "@jridgewell/sourcemap-codec" "^1.4.13"
-
-make-dir@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
-  integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
-  dependencies:
-    semver "^6.0.0"
-
-make-error@^1.1.1:
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
-  integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
-
-map-cache@^0.2.0:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
-  integrity sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==
-
-map-obj@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
-  integrity sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==
-
-map-obj@^4.0.0, map-obj@^4.1.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.3.0.tgz#9304f906e93faae70880da102a9f1df0ea8bb05a"
-  integrity sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==
-
-markdown-table@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/markdown-table/-/markdown-table-2.0.0.tgz#194a90ced26d31fe753d8b9434430214c011865b"
-  integrity sha512-Ezda85ToJUBhM6WGaG6veasyym+Tbs3cMAw/ZhOPqXiYsr0jgocBV3j3nx+4lk47plLlIqjwuTm/ywVI+zjJ/A==
-  dependencies:
-    repeat-string "^1.0.0"
-
-mathml-tag-names@^2.1.3:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
-  integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
-
-mdast-util-definitions@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/mdast-util-definitions/-/mdast-util-definitions-4.0.0.tgz#c5c1a84db799173b4dcf7643cda999e440c24db2"
-  integrity sha512-k8AJ6aNnUkB7IE+5azR9h81O5EQ/cTDXtWdMq9Kk5KcEW/8ritU5CeLg/9HhOC++nALHBlaogJ5jz0Ybk3kPMQ==
-  dependencies:
-    unist-util-visit "^2.0.0"
-
-mdast-util-find-and-replace@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/mdast-util-find-and-replace/-/mdast-util-find-and-replace-1.1.1.tgz#b7db1e873f96f66588c321f1363069abf607d1b5"
-  integrity sha512-9cKl33Y21lyckGzpSmEQnIDjEfeeWelN5s1kUW1LwdB0Fkuq2u+4GdqcGEygYxJE8GVqCl0741bYXHgamfWAZA==
-  dependencies:
-    escape-string-regexp "^4.0.0"
-    unist-util-is "^4.0.0"
-    unist-util-visit-parents "^3.0.0"
-
-mdast-util-from-markdown@^0.8.0:
-  version "0.8.5"
-  resolved "https://registry.yarnpkg.com/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.5.tgz#d1ef2ca42bc377ecb0463a987910dae89bd9a28c"
-  integrity sha512-2hkTXtYYnr+NubD/g6KGBS/0mFmBcifAsI0yIWRiRo0PjVs6SSOSOdtzbp6kSGnShDN6G5aWZpKQ2lWRy27mWQ==
-  dependencies:
-    "@types/mdast" "^3.0.0"
-    mdast-util-to-string "^2.0.0"
-    micromark "~2.11.0"
-    parse-entities "^2.0.0"
-    unist-util-stringify-position "^2.0.0"
-
-mdast-util-gfm-autolink-literal@^0.1.0:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/mdast-util-gfm-autolink-literal/-/mdast-util-gfm-autolink-literal-0.1.3.tgz#9c4ff399c5ddd2ece40bd3b13e5447d84e385fb7"
-  integrity sha512-GjmLjWrXg1wqMIO9+ZsRik/s7PLwTaeCHVB7vRxUwLntZc8mzmTsLVr6HW1yLokcnhfURsn5zmSVdi3/xWWu1A==
-  dependencies:
-    ccount "^1.0.0"
-    mdast-util-find-and-replace "^1.1.0"
-    micromark "^2.11.3"
-
-mdast-util-gfm-strikethrough@^0.2.0:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/mdast-util-gfm-strikethrough/-/mdast-util-gfm-strikethrough-0.2.3.tgz#45eea337b7fff0755a291844fbea79996c322890"
-  integrity sha512-5OQLXpt6qdbttcDG/UxYY7Yjj3e8P7X16LzvpX8pIQPYJ/C2Z1qFGMmcw+1PZMUM3Z8wt8NRfYTvCni93mgsgA==
-  dependencies:
-    mdast-util-to-markdown "^0.6.0"
-
-mdast-util-gfm-table@^0.1.0:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/mdast-util-gfm-table/-/mdast-util-gfm-table-0.1.6.tgz#af05aeadc8e5ee004eeddfb324b2ad8c029b6ecf"
-  integrity sha512-j4yDxQ66AJSBwGkbpFEp9uG/LS1tZV3P33fN1gkyRB2LoRL+RR3f76m0HPHaby6F4Z5xr9Fv1URmATlRRUIpRQ==
-  dependencies:
-    markdown-table "^2.0.0"
-    mdast-util-to-markdown "~0.6.0"
-
-mdast-util-gfm-task-list-item@^0.1.0:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/mdast-util-gfm-task-list-item/-/mdast-util-gfm-task-list-item-0.1.6.tgz#70c885e6b9f543ddd7e6b41f9703ee55b084af10"
-  integrity sha512-/d51FFIfPsSmCIRNp7E6pozM9z1GYPIkSy1urQ8s/o4TC22BZ7DqfHFWiqBD23bc7J3vV1Fc9O4QIHBlfuit8A==
-  dependencies:
-    mdast-util-to-markdown "~0.6.0"
-
-mdast-util-gfm@^0.1.0:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/mdast-util-gfm/-/mdast-util-gfm-0.1.2.tgz#8ecddafe57d266540f6881f5c57ff19725bd351c"
-  integrity sha512-NNkhDx/qYcuOWB7xHUGWZYVXvjPFFd6afg6/e2g+SV4r9q5XUcCbV4Wfa3DLYIiD+xAEZc6K4MGaE/m0KDcPwQ==
-  dependencies:
-    mdast-util-gfm-autolink-literal "^0.1.0"
-    mdast-util-gfm-strikethrough "^0.2.0"
-    mdast-util-gfm-table "^0.1.0"
-    mdast-util-gfm-task-list-item "^0.1.0"
-    mdast-util-to-markdown "^0.6.1"
-
-mdast-util-to-hast@^10.2.0:
-  version "10.2.0"
-  resolved "https://registry.yarnpkg.com/mdast-util-to-hast/-/mdast-util-to-hast-10.2.0.tgz#61875526a017d8857b71abc9333942700b2d3604"
-  integrity sha512-JoPBfJ3gBnHZ18icCwHR50orC9kNH81tiR1gs01D8Q5YpV6adHNO9nKNuFBCJQ941/32PT1a63UF/DitmS3amQ==
-  dependencies:
-    "@types/mdast" "^3.0.0"
-    "@types/unist" "^2.0.0"
-    mdast-util-definitions "^4.0.0"
-    mdurl "^1.0.0"
-    unist-builder "^2.0.0"
-    unist-util-generated "^1.0.0"
-    unist-util-position "^3.0.0"
-    unist-util-visit "^2.0.0"
-
-mdast-util-to-markdown@^0.6.0, mdast-util-to-markdown@^0.6.1, mdast-util-to-markdown@~0.6.0:
-  version "0.6.5"
-  resolved "https://registry.yarnpkg.com/mdast-util-to-markdown/-/mdast-util-to-markdown-0.6.5.tgz#b33f67ca820d69e6cc527a93d4039249b504bebe"
-  integrity sha512-XeV9sDE7ZlOQvs45C9UKMtfTcctcaj/pGwH8YLbMHoMOXNNCn2LsqVQOqrF1+/NU8lKDAqozme9SCXWyo9oAcQ==
-  dependencies:
-    "@types/unist" "^2.0.0"
-    longest-streak "^2.0.0"
-    mdast-util-to-string "^2.0.0"
-    parse-entities "^2.0.0"
-    repeat-string "^1.0.0"
-    zwitch "^1.0.0"
-
-mdast-util-to-string@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz#b8cfe6a713e1091cb5b728fc48885a4767f8b97b"
-  integrity sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w==
-
-mdn-data@2.0.30:
-  version "2.0.30"
-  resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.30.tgz#ce4df6f80af6cfbe218ecd5c552ba13c4dfa08cc"
-  integrity sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==
-
-mdurl@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
-  integrity sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==
-
-memoize-one@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-6.0.0.tgz#b2591b871ed82948aee4727dc6abceeeac8c1045"
-  integrity sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw==
-
-meow@^10.1.5:
-  version "10.1.5"
-  resolved "https://registry.yarnpkg.com/meow/-/meow-10.1.5.tgz#be52a1d87b5f5698602b0f32875ee5940904aa7f"
-  integrity sha512-/d+PQ4GKmGvM9Bee/DPa8z3mXs/pkvJE2KEThngVNOqtmljC6K7NMPxtc2JeZYTmpWb9k/TmxjeL18ez3h7vCw==
-  dependencies:
-    "@types/minimist" "^1.2.2"
-    camelcase-keys "^7.0.0"
-    decamelize "^5.0.0"
-    decamelize-keys "^1.1.0"
-    hard-rejection "^2.1.0"
-    minimist-options "4.1.0"
-    normalize-package-data "^3.0.2"
-    read-pkg-up "^8.0.0"
-    redent "^4.0.0"
-    trim-newlines "^4.0.2"
-    type-fest "^1.2.2"
-    yargs-parser "^20.2.9"
-
-meow@^6.1.0:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/meow/-/meow-6.1.1.tgz#1ad64c4b76b2a24dfb2f635fddcadf320d251467"
-  integrity sha512-3YffViIt2QWgTy6Pale5QpopX/IvU3LPL03jOTqp6pGj3VjesdO/U8CuHMKpnQr4shCNCM5fd5XFFvIIl6JBHg==
-  dependencies:
-    "@types/minimist" "^1.2.0"
-    camelcase-keys "^6.2.2"
-    decamelize-keys "^1.1.0"
-    hard-rejection "^2.1.0"
-    minimist-options "^4.0.2"
-    normalize-package-data "^2.5.0"
-    read-pkg-up "^7.0.1"
-    redent "^3.0.0"
-    trim-newlines "^3.0.0"
-    type-fest "^0.13.1"
-    yargs-parser "^18.1.3"
-
-merge2@^1.3.0, merge2@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
-  integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
-
-meros@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/meros/-/meros-1.2.1.tgz#056f7a76e8571d0aaf3c7afcbe7eb6407ff7329e"
-  integrity sha512-R2f/jxYqCAGI19KhAvaxSOxALBMkaXWH2a7rOyqQw+ZmizX5bKkEYWLzdhC+U82ZVVPVp6MCXe3EkVligh+12g==
-
-meshoptimizer@~0.18.1:
-  version "0.18.1"
-  resolved "https://registry.yarnpkg.com/meshoptimizer/-/meshoptimizer-0.18.1.tgz#cdb90907f30a7b5b1190facd3b7ee6b7087797d8"
-  integrity sha512-ZhoIoL7TNV4s5B6+rx5mC//fw8/POGyNxS/DZyCJeiZ12ScLfVwRE/GfsxwiTkMYYD5DmK2/JXnEVXqL4rF+Sw==
-
-micromark-extension-gfm-autolink-literal@~0.5.0:
-  version "0.5.7"
-  resolved "https://registry.yarnpkg.com/micromark-extension-gfm-autolink-literal/-/micromark-extension-gfm-autolink-literal-0.5.7.tgz#53866c1f0c7ef940ae7ca1f72c6faef8fed9f204"
-  integrity sha512-ePiDGH0/lhcngCe8FtH4ARFoxKTUelMp4L7Gg2pujYD5CSMb9PbblnyL+AAMud/SNMyusbS2XDSiPIRcQoNFAw==
-  dependencies:
-    micromark "~2.11.3"
-
-micromark-extension-gfm-strikethrough@~0.6.5:
-  version "0.6.5"
-  resolved "https://registry.yarnpkg.com/micromark-extension-gfm-strikethrough/-/micromark-extension-gfm-strikethrough-0.6.5.tgz#96cb83356ff87bf31670eefb7ad7bba73e6514d1"
-  integrity sha512-PpOKlgokpQRwUesRwWEp+fHjGGkZEejj83k9gU5iXCbDG+XBA92BqnRKYJdfqfkrRcZRgGuPuXb7DaK/DmxOhw==
-  dependencies:
-    micromark "~2.11.0"
-
-micromark-extension-gfm-table@~0.4.0:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/micromark-extension-gfm-table/-/micromark-extension-gfm-table-0.4.3.tgz#4d49f1ce0ca84996c853880b9446698947f1802b"
-  integrity sha512-hVGvESPq0fk6ALWtomcwmgLvH8ZSVpcPjzi0AjPclB9FsVRgMtGZkUcpE0zgjOCFAznKepF4z3hX8z6e3HODdA==
-  dependencies:
-    micromark "~2.11.0"
-
-micromark-extension-gfm-tagfilter@~0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/micromark-extension-gfm-tagfilter/-/micromark-extension-gfm-tagfilter-0.3.0.tgz#d9f26a65adee984c9ccdd7e182220493562841ad"
-  integrity sha512-9GU0xBatryXifL//FJH+tAZ6i240xQuFrSL7mYi8f4oZSbc+NvXjkrHemeYP0+L4ZUT+Ptz3b95zhUZnMtoi/Q==
-
-micromark-extension-gfm-task-list-item@~0.3.0:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/micromark-extension-gfm-task-list-item/-/micromark-extension-gfm-task-list-item-0.3.3.tgz#d90c755f2533ed55a718129cee11257f136283b8"
-  integrity sha512-0zvM5iSLKrc/NQl84pZSjGo66aTGd57C1idmlWmE87lkMcXrTxg1uXa/nXomxJytoje9trP0NDLvw4bZ/Z/XCQ==
-  dependencies:
-    micromark "~2.11.0"
-
-micromark-extension-gfm@^0.3.0:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/micromark-extension-gfm/-/micromark-extension-gfm-0.3.3.tgz#36d1a4c089ca8bdfd978c9bd2bf1a0cb24e2acfe"
-  integrity sha512-oVN4zv5/tAIA+l3GbMi7lWeYpJ14oQyJ3uEim20ktYFAcfX1x3LNlFGGlmrZHt7u9YlKExmyJdDGaTt6cMSR/A==
-  dependencies:
-    micromark "~2.11.0"
-    micromark-extension-gfm-autolink-literal "~0.5.0"
-    micromark-extension-gfm-strikethrough "~0.6.5"
-    micromark-extension-gfm-table "~0.4.0"
-    micromark-extension-gfm-tagfilter "~0.3.0"
-    micromark-extension-gfm-task-list-item "~0.3.0"
-
-micromark@^2.11.3, micromark@~2.11.0, micromark@~2.11.3:
-  version "2.11.4"
-  resolved "https://registry.yarnpkg.com/micromark/-/micromark-2.11.4.tgz#d13436138eea826383e822449c9a5c50ee44665a"
-  integrity sha512-+WoovN/ppKolQOFIAajxi7Lu9kInbPxFuTBVEavFcL8eAfVstoc5MocPmqBeAdBOJV00uaVjegzH4+MA0DN/uA==
-  dependencies:
-    debug "^4.0.0"
-    parse-entities "^2.0.0"
-
-micromatch@^4.0.4, micromatch@^4.0.5:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
-  integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
-  dependencies:
-    braces "^3.0.3"
-    picomatch "^2.3.1"
-
-mimic-fn@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
-  integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
-
-min-document@^2.19.0:
-  version "2.19.0"
-  resolved "https://registry.yarnpkg.com/min-document/-/min-document-2.19.0.tgz#7bd282e3f5842ed295bb748cdd9f1ffa2c824685"
-  integrity sha512-9Wy1B3m3f66bPPmU5hdA4DR4PB2OfDU/+GS3yAB7IQozE3tqXaVv2zOjgla7MEGSRv95+ILmOuvhLkOK6wJtCQ==
-  dependencies:
-    dom-walk "^0.1.0"
-
-min-indent@^1.0.0, min-indent@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
-  integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==
-
-minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
-  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
-  dependencies:
-    brace-expansion "^1.1.7"
-
-minimatch@^4.2.3:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-4.2.3.tgz#b4dcece1d674dee104bb0fb833ebb85a78cbbca6"
-  integrity sha512-lIUdtK5hdofgCTu3aT0sOaHsYR37viUuIc0rwnnDXImbwFRcumyLMeZaM0t0I/fgxS6s6JMfu0rLD1Wz9pv1ng==
-  dependencies:
-    brace-expansion "^1.1.7"
-
-minimist-options@4.1.0, minimist-options@^4.0.2:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619"
-  integrity sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==
-  dependencies:
-    arrify "^1.0.1"
-    is-plain-obj "^1.1.0"
-    kind-of "^6.0.3"
-
-minimist@^1.2.0, minimist@^1.2.6:
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
-  integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
-
-mkdirp@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
-  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
-
-moment@^2.30.1:
-  version "2.30.1"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.30.1.tgz#f8c91c07b7a786e30c59926df530b4eac96974ae"
-  integrity sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==
-
-moment@~2.29.1:
-  version "2.29.4"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108"
-  integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==
-
-mousetrap-pause@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/mousetrap-pause/-/mousetrap-pause-1.0.0.tgz#91c429f2f5f9ad71508fa0561bb53be3fdf9a9d0"
-  integrity sha512-/92qasq/TIkogCZKRYZdX+XAiPOD8dBDIipaar+caXSdKrfhYQIe6UmweiXO9yQeETjhNAUWdopwLsU6po/IPw==
-
-mousetrap@^1.6.5:
-  version "1.6.5"
-  resolved "https://registry.yarnpkg.com/mousetrap/-/mousetrap-1.6.5.tgz#8a766d8c272b08393d5f56074e0b5ec183485bf9"
-  integrity sha512-QNo4kEepaIBwiT8CDhP98umTetp+JNfQYBWvC1pc6/OAibuXtRcxZ58Qz8skvEHYvURne/7R8T5VoOI7rDsEUA==
-
-mpd-parser@0.22.1, mpd-parser@^0.22.1:
-  version "0.22.1"
-  resolved "https://registry.yarnpkg.com/mpd-parser/-/mpd-parser-0.22.1.tgz#bc2bf7d3e56368e4b0121035b055675401871521"
-  integrity sha512-fwBebvpyPUU8bOzvhX0VQZgSohncbgYwUyJJoTSNpmy7ccD2ryiCvM7oRkn/xQH5cv73/xU7rJSNCLjdGFor0Q==
-  dependencies:
-    "@babel/runtime" "^7.12.5"
-    "@videojs/vhs-utils" "^3.0.5"
-    "@xmldom/xmldom" "^0.8.3"
-    global "^4.4.0"
-
-ms@2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
-  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
-
-ms@^2.1.1:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
-  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
-
-mute-stream@0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
-  integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
-
-mux.js@6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/mux.js/-/mux.js-6.0.1.tgz#65ce0f7a961d56c006829d024d772902d28c7755"
-  integrity sha512-22CHb59rH8pWGcPGW5Og7JngJ9s+z4XuSlYvnxhLuc58cA1WqGDQPzuG8I+sPm1/p0CdgpzVTaKW408k5DNn8w==
-  dependencies:
-    "@babel/runtime" "^7.11.2"
-    global "^4.4.0"
-
-nanoid@^3.3.6:
-  version "3.3.8"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.8.tgz#b1be3030bee36aaff18bacb375e5cce521684baf"
-  integrity sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==
-
-natural-compare-lite@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz#17b09581988979fddafe0201e931ba933c96cbb4"
-  integrity sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==
-
-natural-compare@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
-  integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
-
-no-case@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/no-case/-/no-case-3.0.4.tgz#d361fd5c9800f558551a8369fc0dcd4662b6124d"
-  integrity sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==
-  dependencies:
-    lower-case "^2.0.2"
-    tslib "^2.0.3"
-
-node-fetch@2.6.7:
-  version "2.6.7"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
-  integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
-  dependencies:
-    whatwg-url "^5.0.0"
-
-node-fetch@^2.6.1:
-  version "2.6.9"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.9.tgz#7c7f744b5cc6eb5fd404e0c7a9fec630a55657e6"
-  integrity sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg==
-  dependencies:
-    whatwg-url "^5.0.0"
-
-node-int64@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
-  integrity sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==
-
-node-releases@^2.0.14:
-  version "2.0.14"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.14.tgz#2ffb053bceb8b2be8495ece1ab6ce600c4461b0b"
-  integrity sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==
-
-normalize-package-data@^2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
-  integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
-  dependencies:
-    hosted-git-info "^2.1.4"
-    resolve "^1.10.0"
-    semver "2 || 3 || 4 || 5"
-    validate-npm-package-license "^3.0.1"
-
-normalize-package-data@^3.0.2:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.3.tgz#dbcc3e2da59509a0983422884cd172eefdfa525e"
-  integrity sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==
-  dependencies:
-    hosted-git-info "^4.0.1"
-    is-core-module "^2.5.0"
-    semver "^7.3.4"
-    validate-npm-package-license "^3.0.1"
-
-normalize-path@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
-  integrity sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==
-  dependencies:
-    remove-trailing-separator "^1.0.1"
-
-normalize-path@^3.0.0, normalize-path@~3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
-  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
-
-normalize-url@^4.5.1:
-  version "4.5.1"
-  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a"
-  integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==
-
-nosleep.js@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/nosleep.js/-/nosleep.js-0.7.0.tgz#cfd919c25523ca0d0f4a69fb3305c083adaee289"
-  integrity sha512-Z4B1HgvzR+en62ghwZf6BwAR6x4/pjezsiMcbF9KMLh7xoscpoYhaSXfY3lLkqC68AtW+/qLJ1lzvBIj0FGaTA==
-
-nullthrows@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/nullthrows/-/nullthrows-1.1.1.tgz#7818258843856ae971eae4208ad7d7eb19a431b1"
-  integrity sha512-2vPPEi+Z7WqML2jZYddDIfy5Dqb0r2fze2zTxNNknZaFpVHU3mFB3R+DWeJWGVx0ecvttSGlJTI+WG+8Z4cDWw==
-
-object-assign@^4.1.0, object-assign@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
-  integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
-
-object-inspect@^1.12.2, object-inspect@^1.9.0:
-  version "1.12.3"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.3.tgz#ba62dffd67ee256c8c086dfae69e016cd1f198b9"
-  integrity sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==
-
-object-is@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac"
-  integrity sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-
-object-keys@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
-  integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
-
-object.assign@^4.1.2, object.assign@^4.1.3, object.assign@^4.1.4:
-  version "4.1.4"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f"
-  integrity sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    has-symbols "^1.0.3"
-    object-keys "^1.1.1"
-
-object.entries@^1.1.5, object.entries@^1.1.6:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.6.tgz#9737d0e5b8291edd340a3e3264bb8a3b00d5fa23"
-  integrity sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
-
-object.fromentries@^2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.6.tgz#cdb04da08c539cffa912dcd368b886e0904bfa73"
-  integrity sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
-
-object.hasown@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/object.hasown/-/object.hasown-1.1.2.tgz#f919e21fad4eb38a57bc6345b3afd496515c3f92"
-  integrity sha512-B5UIT3J1W+WuWIU55h0mjlwaqxiE5vYENJXIXZ4VFe05pNYrkKuK0U/6aFcb0pKywYJh7IhfoqUfKVmrJJHZHw==
-  dependencies:
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
-
-object.values@^1.1.6:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.6.tgz#4abbaa71eba47d63589d402856f908243eea9b1d"
-  integrity sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
-
-once@^1.3.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
-  dependencies:
-    wrappy "1"
-
-onetime@^5.1.0:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
-  integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
-  dependencies:
-    mimic-fn "^2.1.0"
-
-optimism@^0.18.0:
-  version "0.18.0"
-  resolved "https://registry.yarnpkg.com/optimism/-/optimism-0.18.0.tgz#e7bb38b24715f3fdad8a9a7fc18e999144bbfa63"
-  integrity sha512-tGn8+REwLRNFnb9WmcY5IfpOqeX2kpaYJ1s6Ae3mn12AeydLkR3j+jSCmVQFoXqU8D41PAJ1RG1rCRNWmNZVmQ==
-  dependencies:
-    "@wry/caches" "^1.0.0"
-    "@wry/context" "^0.7.0"
-    "@wry/trie" "^0.4.3"
-    tslib "^2.3.0"
-
-optionator@^0.9.1:
-  version "0.9.1"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499"
-  integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==
-  dependencies:
-    deep-is "^0.1.3"
-    fast-levenshtein "^2.0.6"
-    levn "^0.4.1"
-    prelude-ls "^1.2.1"
-    type-check "^0.4.0"
-    word-wrap "^1.2.3"
-
-ora@^5.4.1:
-  version "5.4.1"
-  resolved "https://registry.yarnpkg.com/ora/-/ora-5.4.1.tgz#1b2678426af4ac4a509008e5e4ac9e9959db9e18"
-  integrity sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==
-  dependencies:
-    bl "^4.1.0"
-    chalk "^4.1.0"
-    cli-cursor "^3.1.0"
-    cli-spinners "^2.5.0"
-    is-interactive "^1.0.0"
-    is-unicode-supported "^0.1.0"
-    log-symbols "^4.1.0"
-    strip-ansi "^6.0.0"
-    wcwidth "^1.0.1"
-
-os-tmpdir@~1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
-  integrity sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==
-
-p-limit@3.1.0, p-limit@^3.0.2:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
-  integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
-  dependencies:
-    yocto-queue "^0.1.0"
-
-p-limit@^2.2.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
-  integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
-  dependencies:
-    p-try "^2.0.0"
-
-p-locate@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
-  integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
-  dependencies:
-    p-limit "^2.2.0"
-
-p-locate@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834"
-  integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==
-  dependencies:
-    p-limit "^3.0.2"
-
-p-map@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"
-  integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==
-  dependencies:
-    aggregate-error "^3.0.0"
-
-p-try@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
-  integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
-
-param-case@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/param-case/-/param-case-3.0.4.tgz#7d17fe4aa12bde34d4a77d91acfb6219caad01c5"
-  integrity sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==
-  dependencies:
-    dot-case "^3.0.4"
-    tslib "^2.0.3"
-
-parent-module@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
-  integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==
-  dependencies:
-    callsites "^3.0.0"
-
-parse-entities@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/parse-entities/-/parse-entities-2.0.0.tgz#53c6eb5b9314a1f4ec99fa0fdf7ce01ecda0cbe8"
-  integrity sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==
-  dependencies:
-    character-entities "^1.0.0"
-    character-entities-legacy "^1.0.0"
-    character-reference-invalid "^1.0.0"
-    is-alphanumerical "^1.0.0"
-    is-decimal "^1.0.0"
-    is-hexadecimal "^1.0.0"
-
-parse-filepath@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.2.tgz#a632127f53aaf3d15876f5872f3ffac763d6c891"
-  integrity sha512-FwdRXKCohSVeXqwtYonZTXtbGJKrn+HNyWDYVcp5yuJlesTwNH4rsmRZ+GrKAPJ5bLpRxESMeS+Rl0VCHRvB2Q==
-  dependencies:
-    is-absolute "^1.0.0"
-    map-cache "^0.2.0"
-    path-root "^0.1.1"
-
-parse-json@^5.0.0, parse-json@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
-  integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    error-ex "^1.3.1"
-    json-parse-even-better-errors "^2.3.0"
-    lines-and-columns "^1.1.6"
-
-pascal-case@^3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/pascal-case/-/pascal-case-3.1.2.tgz#b48e0ef2b98e205e7c1dae747d0b1508237660eb"
-  integrity sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==
-  dependencies:
-    no-case "^3.0.4"
-    tslib "^2.0.3"
-
-path-browserify@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-1.0.1.tgz#d98454a9c3753d5790860f16f68867b9e46be1fd"
-  integrity sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==
-
-path-case@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/path-case/-/path-case-3.0.4.tgz#9168645334eb942658375c56f80b4c0cb5f82c6f"
-  integrity sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==
-  dependencies:
-    dot-case "^3.0.4"
-    tslib "^2.0.3"
-
-path-exists@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
-  integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
-
-path-is-absolute@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
-
-path-key@^3.1.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
-  integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
-
-path-parse@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
-  integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
-
-path-root-regex@^0.1.0:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/path-root-regex/-/path-root-regex-0.1.2.tgz#bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d"
-  integrity sha512-4GlJ6rZDhQZFE0DPVKh0e9jmZ5egZfxTkp7bcRDuPlJXbAwhxcl2dINPUAsjLdejqaLsCeg8axcLjIbvBjN4pQ==
-
-path-root@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/path-root/-/path-root-0.1.1.tgz#9a4a6814cac1c0cd73360a95f32083c8ea4745b7"
-  integrity sha512-QLcPegTHF11axjfojBIoDygmS2E3Lf+8+jI6wOVmNVenrKSo3mFdSGiIgdSHenczw3wPtlVMQaFVwGmM7BJdtg==
-  dependencies:
-    path-root-regex "^0.1.0"
-
-path-to-regexp@^1.7.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.9.0.tgz#5dc0753acbf8521ca2e0f137b4578b917b10cf24"
-  integrity sha512-xIp7/apCFJuUHdDLWe8O1HIkb0kQrOMb/0u6FXQjemHn/ii5LrIzU6bdECnsiTF/GjZkMEKg1xdiZwNqDYlZ6g==
-  dependencies:
-    isarray "0.0.1"
-
-path-type@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
-  integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
-
-picocolors@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
-  integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
-
-picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
-  integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
-
-pify@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-5.0.0.tgz#1f5eca3f5e87ebec28cc6d54a0e4aaf00acc127f"
-  integrity sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA==
-
-pkcs7@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/pkcs7/-/pkcs7-1.0.4.tgz#6090b9e71160dabf69209d719cbafa538b00a1cb"
-  integrity sha512-afRERtHn54AlwaF2/+LFszyAANTCggGilmcmILUzEjvs3XgFZT+xE6+QWQcAGmu4xajy+Xtj7acLOPdx5/eXWQ==
-  dependencies:
-    "@babel/runtime" "^7.5.5"
-
-postcss-resolve-nested-selector@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz#29ccbc7c37dedfac304e9fff0bf1596b3f6a0e4e"
-  integrity sha512-HvExULSwLqHLgUy1rl3ANIqCsvMS0WHss2UOsXhXnQaZ9VCc2oBvIpXrl00IUFT5ZDITME0o6oiXeiHr2SAIfw==
-
-postcss-safe-parser@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz#bb4c29894171a94bc5c996b9a30317ef402adaa1"
-  integrity sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==
-
-postcss-scss@^4.0.6:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-4.0.6.tgz#5d62a574b950a6ae12f2aa89b60d63d9e4432bfd"
-  integrity sha512-rLDPhJY4z/i4nVFZ27j9GqLxj1pwxE80eAzUNRMXtcpipFYIeowerzBgG3yJhMtObGEXidtIgbUpQ3eLDsf5OQ==
-
-postcss-selector-parser@^6.0.13:
-  version "6.0.13"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz#d05d8d76b1e8e173257ef9d60b706a8e5e99bf1b"
-  integrity sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==
-  dependencies:
-    cssesc "^3.0.0"
-    util-deprecate "^1.0.2"
-
-postcss-sorting@^8.0.1:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-sorting/-/postcss-sorting-8.0.1.tgz#d03852914979ac0a1ef3ca6e517bf4b53c045f35"
-  integrity sha512-go9Zoxx7KQH+uLrJ9xa5wRErFeXu01ydA6O8m7koPXkmAN7Ts//eRcIqjo0stBR4+Nir2gMYDOWAOx7O5EPUZA==
-
-postcss-value-parser@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514"
-  integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
-
-postcss@^8.4.21, postcss@^8.4.24, postcss@^8.4.27, postcss@^8.4.31:
-  version "8.4.31"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.31.tgz#92b451050a9f914da6755af352bdc0192508656d"
-  integrity sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==
-  dependencies:
-    nanoid "^3.3.6"
-    picocolors "^1.0.0"
-    source-map-js "^1.0.2"
-
-prelude-ls@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
-  integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
-
-prettier@^2.8.4:
-  version "2.8.4"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.4.tgz#34dd2595629bfbb79d344ac4a91ff948694463c3"
-  integrity sha512-vIS4Rlc2FNh0BySk3Wkd6xmwxB0FpOndW5fisM5H8hsZSxU2VWVB5CWIkIjWvrHjIhxk2g3bfMKM87zNTrZddw==
-
-process@^0.11.10:
-  version "0.11.10"
-  resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
-  integrity sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==
-
-promise@^7.1.1:
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
-  integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==
-  dependencies:
-    asap "~2.0.3"
-
-prop-types-extra@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/prop-types-extra/-/prop-types-extra-1.1.1.tgz#58c3b74cbfbb95d304625975aa2f0848329a010b"
-  integrity sha512-59+AHNnHYCdiC+vMwY52WmvP5dM3QLeoumYuEyceQDi9aEhtwN9zIQ2ZNo25sMyXnbh32h+P1ezDsUpUH3JAew==
-  dependencies:
-    react-is "^16.3.2"
-    warning "^4.0.0"
-
-prop-types@^15.5.10, prop-types@^15.6.0, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1:
-  version "15.8.1"
-  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5"
-  integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==
-  dependencies:
-    loose-envify "^1.4.0"
-    object-assign "^4.1.1"
-    react-is "^16.13.1"
-
-prop-types@~15.7.2:
-  version "15.7.2"
-  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
-  integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==
-  dependencies:
-    loose-envify "^1.4.0"
-    object-assign "^4.1.1"
-    react-is "^16.8.1"
-
-property-expr@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/property-expr/-/property-expr-2.0.5.tgz#278bdb15308ae16af3e3b9640024524f4dc02cb4"
-  integrity sha512-IJUkICM5dP5znhCckHSv30Q4b5/JA5enCtkRHYaOVOAocnH/1BQEYTC5NMfT3AVl/iXKdr3aqQbQn9DxyWknwA==
-
-property-information@^5.3.0:
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/property-information/-/property-information-5.6.0.tgz#61675545fb23002f245c6540ec46077d4da3ed69"
-  integrity sha512-YUHSPk+A30YPv+0Qf8i9Mbfe/C0hdPXk1s1jPVToV8pk8BQtpw10ct89Eo7OWkutrwqvT0eicAxlOg3dOAu8JA==
-  dependencies:
-    xtend "^4.0.0"
-
-punycode@^1.3.2:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
-  integrity sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==
-
-punycode@^2.1.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f"
-  integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==
-
-pvtsutils@^1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/pvtsutils/-/pvtsutils-1.3.2.tgz#9f8570d132cdd3c27ab7d51a2799239bf8d8d5de"
-  integrity sha512-+Ipe2iNUyrZz+8K/2IOo+kKikdtfhRKzNpQbruF2URmqPtoqAs8g3xS7TJvFF2GcPXjh7DkqMnpVveRFq4PgEQ==
-  dependencies:
-    tslib "^2.4.0"
-
-pvutils@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/pvutils/-/pvutils-1.1.3.tgz#f35fc1d27e7cd3dfbd39c0826d173e806a03f5a3"
-  integrity sha512-pMpnA0qRdFp32b1sJl1wOJNxZLQ2cbQx+k6tjNtZ8CpvVhNqEPRgivZ2WOUev2YMajecdH7ctUPDvEe87nariQ==
-
-queue-microtask@^1.2.2:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
-  integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
-
-quick-lru@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f"
-  integrity sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==
-
-quick-lru@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932"
-  integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==
-
-react-bootstrap@^1.6.6:
-  version "1.6.6"
-  resolved "https://registry.yarnpkg.com/react-bootstrap/-/react-bootstrap-1.6.6.tgz#3f3b274f8923b9886008a0e61485b5ac9a2b3073"
-  integrity sha512-pSzYyJT5u4rc8+5myM8Vid2JG52L8AmYSkpznReH/GM4+FhLqEnxUa0+6HRTaGwjdEixQNGchwY+b3xCdYWrDA==
-  dependencies:
-    "@babel/runtime" "^7.14.0"
-    "@restart/context" "^2.1.4"
-    "@restart/hooks" "^0.4.7"
-    "@types/invariant" "^2.2.33"
-    "@types/prop-types" "^15.7.3"
-    "@types/react" ">=16.14.8"
-    "@types/react-transition-group" "^4.4.1"
-    "@types/warning" "^3.0.0"
-    classnames "^2.3.1"
-    dom-helpers "^5.2.1"
-    invariant "^2.2.4"
-    prop-types "^15.7.2"
-    prop-types-extra "^1.1.0"
-    react-overlays "^5.1.2"
-    react-transition-group "^4.4.1"
-    uncontrollable "^7.2.1"
-    warning "^4.0.3"
-
-react-datepicker@^4.10.0:
-  version "4.10.0"
-  resolved "https://registry.yarnpkg.com/react-datepicker/-/react-datepicker-4.10.0.tgz#3f386ac5873dac5ea56544e51cdc01109938796c"
-  integrity sha512-6IfBCZyWj54ZZGLmEZJ9c4Yph0s9MVfEGDC2evOvf9AmVz+RRcfP2Czqad88Ff9wREbcbqa4dk7IFYeXF1d3Ag==
-  dependencies:
-    "@popperjs/core" "^2.9.2"
-    classnames "^2.2.6"
-    date-fns "^2.24.0"
-    prop-types "^15.7.2"
-    react-onclickoutside "^6.12.2"
-    react-popper "^2.3.0"
-
-react-dom@^17.0.2:
-  version "17.0.2"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.2.tgz#ecffb6845e3ad8dbfcdc498f0d0a939736502c23"
-  integrity sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==
-  dependencies:
-    loose-envify "^1.1.0"
-    object-assign "^4.1.1"
-    scheduler "^0.20.2"
-
-react-fast-compare@^2.0.1:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-2.0.4.tgz#e84b4d455b0fec113e0402c329352715196f81f9"
-  integrity sha512-suNP+J1VU1MWFKcyt7RtjiSWUjvidmQSlqu+eHslq+342xCbGTYmC0mEhPCOHxlW0CywylOC1u2DFAT+bv4dBw==
-
-react-fast-compare@^3.0.1, react-fast-compare@^3.1.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-3.2.1.tgz#53933d9e14f364281d6cba24bfed7a4afb808b5f"
-  integrity sha512-xTYf9zFim2pEif/Fw16dBiXpe0hoy5PxcD8+OwBnTtNLfIm3g6WxhKNurY+6OmdH1u6Ta/W/Vl6vjbYP1MFnDg==
-
-react-helmet@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/react-helmet/-/react-helmet-6.1.0.tgz#a750d5165cb13cf213e44747502652e794468726"
-  integrity sha512-4uMzEY9nlDlgxr61NL3XbKRy1hEkXmKNXhjbAIOVw5vcFrsdYbH2FEwcNyWvWinl103nXgzYNlns9ca+8kFiWw==
-  dependencies:
-    object-assign "^4.1.1"
-    prop-types "^15.7.2"
-    react-fast-compare "^3.1.1"
-    react-side-effect "^2.1.0"
-
-react-intl@^6.2.8:
-  version "6.2.8"
-  resolved "https://registry.yarnpkg.com/react-intl/-/react-intl-6.2.8.tgz#f61fffc14e69490607d3be9253704ac5afc49d56"
-  integrity sha512-Njzmbmk58rBx6i0bGQbBLYj+KbR9IXbFfbK2u0AFayjDx+VJW30MdJV6aNL9EiPaXfcOcAYm31R777e/UHWeEw==
-  dependencies:
-    "@formatjs/ecma402-abstract" "1.14.3"
-    "@formatjs/icu-messageformat-parser" "2.2.0"
-    "@formatjs/intl" "2.6.5"
-    "@formatjs/intl-displaynames" "6.2.4"
-    "@formatjs/intl-listformat" "7.1.7"
-    "@types/hoist-non-react-statics" "^3.3.1"
-    "@types/react" "16 || 17 || 18"
-    hoist-non-react-statics "^3.3.2"
-    intl-messageformat "10.3.0"
-    tslib "^2.4.0"
-
-react-is@^16.13.1, react-is@^16.3.2, react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1:
-  version "16.13.1"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
-  integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
-
-react-lifecycles-compat@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
-  integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==
-
-react-onclickoutside@^6.12.2:
-  version "6.12.2"
-  resolved "https://registry.yarnpkg.com/react-onclickoutside/-/react-onclickoutside-6.12.2.tgz#8e6cf80c7d17a79f2c908399918158a7b02dda01"
-  integrity sha512-NMXGa223OnsrGVp5dJHkuKxQ4czdLmXSp5jSV9OqiCky9LOpPATn3vLldc+q5fK3gKbEHvr7J1u0yhBh/xYkpA==
-
-react-overlays@^5.1.2:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/react-overlays/-/react-overlays-5.2.1.tgz#49dc007321adb6784e1f212403f0fb37a74ab86b"
-  integrity sha512-GLLSOLWr21CqtJn8geSwQfoJufdt3mfdsnIiQswouuQ2MMPns+ihZklxvsTDKD3cR2tF8ELbi5xUsvqVhR6WvA==
-  dependencies:
-    "@babel/runtime" "^7.13.8"
-    "@popperjs/core" "^2.11.6"
-    "@restart/hooks" "^0.4.7"
-    "@types/warning" "^3.0.0"
-    dom-helpers "^5.2.0"
-    prop-types "^15.7.2"
-    uncontrollable "^7.2.1"
-    warning "^4.0.3"
-
-react-photo-gallery@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/react-photo-gallery/-/react-photo-gallery-8.0.0.tgz#04ff9f902a2342660e63e6817b4f010488db02b8"
-  integrity sha512-Y9458yygEB9cIZAWlBWuenlR+ghin1RopmmU3Vice8BeJl0Se7hzfxGDq8W1armB/ic/kphGg+G1jq5fOEd0sw==
-  dependencies:
-    prop-types "~15.7.2"
-    resize-observer-polyfill "^1.5.0"
-
-react-popper@^2.2.5, react-popper@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-2.3.0.tgz#17891c620e1320dce318bad9fede46a5f71c70ba"
-  integrity sha512-e1hj8lL3uM+sgSR4Lxzn5h1GxBlpa4CQz0XLF8kx4MDrDRWY0Ena4c97PUeSX9i5W3UAfDP0z0FXCTQkoXUl3Q==
-  dependencies:
-    react-fast-compare "^3.0.1"
-    warning "^4.0.2"
-
-react-refresh@^0.14.0:
-  version "0.14.0"
-  resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.14.0.tgz#4e02825378a5f227079554d4284889354e5f553e"
-  integrity sha512-wViHqhAd8OHeLS/IRMJjTSDHF3U9eWi62F/MledQGPdJGDhodXJ9PBLNGr6WWL7qlH12Mt3TyTpbS+hGXMjCzQ==
-
-react-remark@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/react-remark/-/react-remark-2.1.0.tgz#dd68a32ab2d022e598b27dbfb754400e8f68555c"
-  integrity sha512-7dEPxRGQ23sOdvteuRGaQAs9cEOH/BOeCN4CqsJdk3laUDIDYRCWnM6a3z92PzXHUuxIRLXQNZx7SiO0ijUcbw==
-  dependencies:
-    rehype-react "^6.0.0"
-    remark-parse "^9.0.0"
-    remark-rehype "^8.0.0"
-    unified "^9.0.0"
-
-react-router-bootstrap@^0.25.0:
-  version "0.25.0"
-  resolved "https://registry.yarnpkg.com/react-router-bootstrap/-/react-router-bootstrap-0.25.0.tgz#5d1a99b5b8a2016c011fc46019d2397e563ce0df"
-  integrity sha512-/22eqxjn6Zv5fvY2rZHn57SKmjmJfK7xzJ6/G1OgxAjLtKVfWgV5sn41W2yiqzbtV5eE4/i4LeDLBGYTqx7jbA==
-  dependencies:
-    prop-types "^15.5.10"
-
-react-router-dom@^5.3.4:
-  version "5.3.4"
-  resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.3.4.tgz#2ed62ffd88cae6db134445f4a0c0ae8b91d2e5e6"
-  integrity sha512-m4EqFMHv/Ih4kpcBCONHbkT68KoAeHN4p3lAGoNryfHi0dMy0kCzEZakiKRsvg5wHZ/JLrLW8o8KomWiz/qbYQ==
-  dependencies:
-    "@babel/runtime" "^7.12.13"
-    history "^4.9.0"
-    loose-envify "^1.3.1"
-    prop-types "^15.6.2"
-    react-router "5.3.4"
-    tiny-invariant "^1.0.2"
-    tiny-warning "^1.0.0"
-
-react-router-hash-link@^2.4.3:
-  version "2.4.3"
-  resolved "https://registry.yarnpkg.com/react-router-hash-link/-/react-router-hash-link-2.4.3.tgz#570824d53d6c35ce94d73a46c8e98673a127bf08"
-  integrity sha512-NU7GWc265m92xh/aYD79Vr1W+zAIXDWp3L2YZOYP4rCqPnJ6LI6vh3+rKgkidtYijozHclaEQTAHaAaMWPVI4A==
-  dependencies:
-    prop-types "^15.7.2"
-
-react-router@5.3.4:
-  version "5.3.4"
-  resolved "https://registry.yarnpkg.com/react-router/-/react-router-5.3.4.tgz#8ca252d70fcc37841e31473c7a151cf777887bb5"
-  integrity sha512-Ys9K+ppnJah3QuaRiLxk+jDWOR1MekYQrlytiXxC1RyfbdsZkS5pvKAzCCr031xHixZwpnsYNT5xysdFHQaYsA==
-  dependencies:
-    "@babel/runtime" "^7.12.13"
-    history "^4.9.0"
-    hoist-non-react-statics "^3.1.0"
-    loose-envify "^1.3.1"
-    path-to-regexp "^1.7.0"
-    prop-types "^15.6.2"
-    react-is "^16.6.0"
-    tiny-invariant "^1.0.2"
-    tiny-warning "^1.0.0"
-
-react-select@^5.7.0:
-  version "5.7.0"
-  resolved "https://registry.yarnpkg.com/react-select/-/react-select-5.7.0.tgz#82921b38f1fcf1471a0b62304da01f2896cd8ce6"
-  integrity sha512-lJGiMxCa3cqnUr2Jjtg9YHsaytiZqeNOKeibv6WF5zbK/fPegZ1hg3y/9P1RZVLhqBTs0PfqQLKuAACednYGhQ==
-  dependencies:
-    "@babel/runtime" "^7.12.0"
-    "@emotion/cache" "^11.4.0"
-    "@emotion/react" "^11.8.1"
-    "@floating-ui/dom" "^1.0.1"
-    "@types/react-transition-group" "^4.4.0"
-    memoize-one "^6.0.0"
-    prop-types "^15.6.0"
-    react-transition-group "^4.3.0"
-    use-isomorphic-layout-effect "^1.1.2"
-
-react-side-effect@^2.1.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/react-side-effect/-/react-side-effect-2.1.2.tgz#dc6345b9e8f9906dc2eeb68700b615e0b4fe752a"
-  integrity sha512-PVjOcvVOyIILrYoyGEpDN3vmYNLdy1CajSFNt4TDsVQC5KpTijDvWVoR+/7Rz2xT978D8/ZtFceXxzsPwZEDvw==
-
-react-transition-group@^4.3.0, react-transition-group@^4.4.1:
-  version "4.4.5"
-  resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.5.tgz#e53d4e3f3344da8521489fbef8f2581d42becdd1"
-  integrity sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==
-  dependencies:
-    "@babel/runtime" "^7.5.5"
-    dom-helpers "^5.0.1"
-    loose-envify "^1.4.0"
-    prop-types "^15.6.2"
-
-react@^17.0.2:
-  version "17.0.2"
-  resolved "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037"
-  integrity sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==
-  dependencies:
-    loose-envify "^1.1.0"
-    object-assign "^4.1.1"
-
-read-babelrc-up@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/read-babelrc-up/-/read-babelrc-up-1.1.0.tgz#10fd5baaf6ca03eaba6748fa65ddae25bca61e70"
-  integrity sha512-fcl0JeI85Ss3//kfC3z2rsG2VxSiHl1bJgpjQWrne2YuQEewZpAgAjb17A6q/Q3ozWeZsUSroiIBVsnjmOU8vw==
-  dependencies:
-    find-up "^4.1.0"
-    json5 "^2.1.2"
-
-read-pkg-up@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz#f3a6135758459733ae2b95638056e1854e7ef507"
-  integrity sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==
-  dependencies:
-    find-up "^4.1.0"
-    read-pkg "^5.2.0"
-    type-fest "^0.8.1"
-
-read-pkg-up@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-8.0.0.tgz#72f595b65e66110f43b052dd9af4de6b10534670"
-  integrity sha512-snVCqPczksT0HS2EC+SxUndvSzn6LRCwpfSvLrIfR5BKDQQZMaI6jPRC9dYvYFDRAuFEAnkwww8kBBNE/3VvzQ==
-  dependencies:
-    find-up "^5.0.0"
-    read-pkg "^6.0.0"
-    type-fest "^1.0.1"
-
-read-pkg@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc"
-  integrity sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==
-  dependencies:
-    "@types/normalize-package-data" "^2.4.0"
-    normalize-package-data "^2.5.0"
-    parse-json "^5.0.0"
-    type-fest "^0.6.0"
-
-read-pkg@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-6.0.0.tgz#a67a7d6a1c2b0c3cd6aa2ea521f40c458a4a504c"
-  integrity sha512-X1Fu3dPuk/8ZLsMhEj5f4wFAF0DWoK7qhGJvgaijocXxBmSToKfbFtqbxMO7bVjNA1dmE5huAzjXj/ey86iw9Q==
-  dependencies:
-    "@types/normalize-package-data" "^2.4.0"
-    normalize-package-data "^3.0.2"
-    parse-json "^5.2.0"
-    type-fest "^1.0.1"
-
-readable-stream@^3.4.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
-  integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
-  dependencies:
-    inherits "^2.0.3"
-    string_decoder "^1.1.1"
-    util-deprecate "^1.0.1"
-
-readdirp@~3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
-  integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==
-  dependencies:
-    picomatch "^2.2.1"
-
-redent@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f"
-  integrity sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==
-  dependencies:
-    indent-string "^4.0.0"
-    strip-indent "^3.0.0"
-
-redent@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/redent/-/redent-4.0.0.tgz#0c0ba7caabb24257ab3bb7a4fd95dd1d5c5681f9"
-  integrity sha512-tYkDkVVtYkSVhuQ4zBgfvciymHaeuel+zFKXShfDnFP5SyVEP7qo70Rf1jTOTCx3vGNAbnEi/xFkcfQVMIBWag==
-  dependencies:
-    indent-string "^5.0.0"
-    strip-indent "^4.0.0"
-
-regenerate-unicode-properties@^10.1.0:
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz#7c3192cab6dd24e21cb4461e5ddd7dd24fa8374c"
-  integrity sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==
-  dependencies:
-    regenerate "^1.4.2"
-
-regenerate@^1.4.2:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a"
-  integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==
-
-regenerator-runtime@^0.13.11:
-  version "0.13.11"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9"
-  integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==
-
-regenerator-runtime@^0.14.0:
-  version "0.14.1"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz#356ade10263f685dda125100cd862c1db895327f"
-  integrity sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==
-
-regenerator-transform@^0.15.1:
-  version "0.15.1"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.1.tgz#f6c4e99fc1b4591f780db2586328e4d9a9d8dc56"
-  integrity sha512-knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg==
-  dependencies:
-    "@babel/runtime" "^7.8.4"
-
-regexp.prototype.flags@^1.4.3:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz#87cab30f80f66660181a3bb7bf5981a872b367ac"
-  integrity sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    functions-have-names "^1.2.2"
-
-regexpp@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
-  integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
-
-regexpu-core@^5.3.1:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.3.1.tgz#66900860f88def39a5cb79ebd9490e84f17bcdfb"
-  integrity sha512-nCOzW2V/X15XpLsK2rlgdwrysrBq+AauCn+omItIz4R1pIcmeot5zvjdmOBRLzEH/CkC6IxMJVmxDe3QcMuNVQ==
-  dependencies:
-    "@babel/regjsgen" "^0.8.0"
-    regenerate "^1.4.2"
-    regenerate-unicode-properties "^10.1.0"
-    regjsparser "^0.9.1"
-    unicode-match-property-ecmascript "^2.0.0"
-    unicode-match-property-value-ecmascript "^2.1.0"
-
-regjsparser@^0.9.1:
-  version "0.9.1"
-  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.9.1.tgz#272d05aa10c7c1f67095b1ff0addae8442fc5709"
-  integrity sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==
-  dependencies:
-    jsesc "~0.5.0"
-
-rehype-react@^6.0.0:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/rehype-react/-/rehype-react-6.2.1.tgz#9b9bf188451ad6f63796b784fe1f51165c67b73a"
-  integrity sha512-f9KIrjktvLvmbGc7si25HepocOg4z0MuNOtweigKzBcDjiGSTGhyz6VSgaV5K421Cq1O+z4/oxRJ5G9owo0KVg==
-  dependencies:
-    "@mapbox/hast-util-table-cell-style" "^0.2.0"
-    hast-to-hyperscript "^9.0.0"
-
-relay-runtime@12.0.0:
-  version "12.0.0"
-  resolved "https://registry.yarnpkg.com/relay-runtime/-/relay-runtime-12.0.0.tgz#1e039282bdb5e0c1b9a7dc7f6b9a09d4f4ff8237"
-  integrity sha512-QU6JKr1tMsry22DXNy9Whsq5rmvwr3LSZiiWV/9+DFpuTWvp+WFhobWMc8TC4OjKFfNhEZy7mOiqUAn5atQtug==
-  dependencies:
-    "@babel/runtime" "^7.0.0"
-    fbjs "^3.0.0"
-    invariant "^2.2.4"
-
-remark-gfm@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/remark-gfm/-/remark-gfm-1.0.0.tgz#9213643001be3f277da6256464d56fd28c3b3c0d"
-  integrity sha512-KfexHJCiqvrdBZVbQ6RopMZGwaXz6wFJEfByIuEwGf0arvITHjiKKZ1dpXujjH9KZdm1//XJQwgfnJ3lmXaDPA==
-  dependencies:
-    mdast-util-gfm "^0.1.0"
-    micromark-extension-gfm "^0.3.0"
-
-remark-parse@^9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-9.0.0.tgz#4d20a299665880e4f4af5d90b7c7b8a935853640"
-  integrity sha512-geKatMwSzEXKHuzBNU1z676sGcDcFoChMK38TgdHJNAYfFtsfHDQG7MoJAjs6sgYMqyLduCYWDIWZIxiPeafEw==
-  dependencies:
-    mdast-util-from-markdown "^0.8.0"
-
-remark-rehype@^8.0.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/remark-rehype/-/remark-rehype-8.1.0.tgz#610509a043484c1e697437fa5eb3fd992617c945"
-  integrity sha512-EbCu9kHgAxKmW1yEYjx3QafMyGY3q8noUbNUI5xyKbaFP89wbhDrKxyIQNukNYthzjNHZu6J7hwFg7hRm1svYA==
-  dependencies:
-    mdast-util-to-hast "^10.2.0"
-
-remedial@^1.0.7:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/remedial/-/remedial-1.0.8.tgz#a5e4fd52a0e4956adbaf62da63a5a46a78c578a0"
-  integrity sha512-/62tYiOe6DzS5BqVsNpH/nkGlX45C/Sp6V+NtiN6JQNS1Viay7cWkazmRkrQrdFj2eshDe96SIQNIoMxqhzBOg==
-
-remove-trailing-separator@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
-  integrity sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==
-
-remove-trailing-spaces@^1.0.6:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/remove-trailing-spaces/-/remove-trailing-spaces-1.0.8.tgz#4354d22f3236374702f58ee373168f6d6887ada7"
-  integrity sha512-O3vsMYfWighyFbTd8hk8VaSj9UAGENxAtX+//ugIst2RMk5e03h6RoIS+0ylsFxY1gvmPuAY/PO4It+gPEeySA==
-
-repeat-string@^1.0.0:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
-  integrity sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==
-
-require-directory@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
-  integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==
-
-require-from-string@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
-  integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
-
-require-main-filename@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
-  integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
-
-resize-observer-polyfill@^1.5.0, resize-observer-polyfill@^1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464"
-  integrity sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==
-
-resolve-from@5.0.0, resolve-from@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
-  integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
-
-resolve-from@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
-  integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
-
-resolve-pathname@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-3.0.0.tgz#99d02224d3cf263689becbb393bc560313025dcd"
-  integrity sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng==
-
-resolve@^1.10.0, resolve@^1.14.2, resolve@^1.19.0, resolve@^1.22.1:
-  version "1.22.8"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d"
-  integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==
-  dependencies:
-    is-core-module "^2.13.0"
-    path-parse "^1.0.7"
-    supports-preserve-symlinks-flag "^1.0.0"
-
-resolve@^2.0.0-next.4:
-  version "2.0.0-next.4"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.4.tgz#3d37a113d6429f496ec4752d2a2e58efb1fd4660"
-  integrity sha512-iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ==
-  dependencies:
-    is-core-module "^2.9.0"
-    path-parse "^1.0.7"
-    supports-preserve-symlinks-flag "^1.0.0"
-
-response-iterator@^0.2.6:
-  version "0.2.6"
-  resolved "https://registry.yarnpkg.com/response-iterator/-/response-iterator-0.2.6.tgz#249005fb14d2e4eeb478a3f735a28fd8b4c9f3da"
-  integrity sha512-pVzEEzrsg23Sh053rmDUvLSkGXluZio0qu8VT6ukrYuvtjVfCbDZH9d6PGXb8HZfzdNZt8feXv/jvUzlhRgLnw==
-
-restore-cursor@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
-  integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==
-  dependencies:
-    onetime "^5.1.0"
-    signal-exit "^3.0.2"
-
-reusify@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
-  integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
-
-rfdc@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.0.tgz#d0b7c441ab2720d05dc4cf26e01c89631d9da08b"
-  integrity sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==
-
-rimraf@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
-  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
-  dependencies:
-    glob "^7.1.3"
-
-rollup@^3.27.1:
-  version "3.29.5"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.29.5.tgz#8a2e477a758b520fb78daf04bca4c522c1da8a54"
-  integrity sha512-GVsDdsbJzzy4S/v3dqWPJ7EfvZJfCHiDqe80IyrF59LYuP+e6U1LJoUqeuqRbwAWoMNoXivMNeNAOf5E22VA1w==
-  optionalDependencies:
-    fsevents "~2.3.2"
-
-run-async@^2.4.0:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
-  integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==
-
-run-parallel@^1.1.9:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"
-  integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==
-  dependencies:
-    queue-microtask "^1.2.2"
-
-rust-result@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/rust-result/-/rust-result-1.0.0.tgz#34c75b2e6dc39fe5875e5bdec85b5e0f91536f72"
-  integrity sha512-6cJzSBU+J/RJCF063onnQf0cDUOHs9uZI1oroSGnHOph+CQTIJ5Pp2hK5kEQq1+7yE/EEWfulSNXAQ2jikPthA==
-  dependencies:
-    individual "^2.0.0"
-
-rxjs@^7.5.5:
-  version "7.8.0"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.0.tgz#90a938862a82888ff4c7359811a595e14e1e09a4"
-  integrity sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg==
-  dependencies:
-    tslib "^2.1.0"
-
-safe-buffer@~5.2.0:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
-  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
-
-safe-json-parse@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/safe-json-parse/-/safe-json-parse-4.0.0.tgz#7c0f578cfccd12d33a71c0e05413e2eca171eaac"
-  integrity sha512-RjZPPHugjK0TOzFrLZ8inw44s9bKox99/0AZW9o/BEQVrJfhI+fIHMErnPyRa89/yRXUUr93q+tiN6zhoVV4wQ==
-  dependencies:
-    rust-result "^1.0.0"
-
-safe-regex-test@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.0.tgz#793b874d524eb3640d1873aad03596db2d4f2295"
-  integrity sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==
-  dependencies:
-    call-bind "^1.0.2"
-    get-intrinsic "^1.1.3"
-    is-regex "^1.1.4"
-
-"safer-buffer@>= 2.1.2 < 3":
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
-  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
-
-sass@^1.58.1:
-  version "1.58.1"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.58.1.tgz#17ab0390076a50578ed0733f1cc45429e03405f6"
-  integrity sha512-bnINi6nPXbP1XNRaranMFEBZWUfdW/AF16Ql5+ypRxfTvCRTTKrLsMIakyDcayUt2t/RZotmL4kgJwNH5xO+bg==
-  dependencies:
-    chokidar ">=3.0.0 <4.0.0"
-    immutable "^4.0.0"
-    source-map-js ">=0.6.2 <2.0.0"
-
-sax@1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.1.tgz#7b8e656190b228e81a66aea748480d828cd2d37a"
-  integrity sha512-8I2a3LovHTOpm7NV5yOyO8IHqgVsfK4+UuySrXU8YXkSRX7k6hCV9b3HrkKCr3nMpgj+0bmocaJJWpvp1oc7ZA==
-
-scheduler@^0.20.2:
-  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.2.tgz#4baee39436e34aa93b4874bddcbf0fe8b8b50e91"
-  integrity sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==
-  dependencies:
-    loose-envify "^1.1.0"
-    object-assign "^4.1.1"
-
-schema-utils@*:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.0.0.tgz#60331e9e3ae78ec5d16353c467c34b3a0a1d3df7"
-  integrity sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==
-  dependencies:
-    "@types/json-schema" "^7.0.9"
-    ajv "^8.8.0"
-    ajv-formats "^2.1.1"
-    ajv-keywords "^5.0.0"
-
-schema-utils@^2.6.6:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7"
-  integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==
-  dependencies:
-    "@types/json-schema" "^7.0.5"
-    ajv "^6.12.4"
-    ajv-keywords "^3.5.2"
-
-scuid@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/scuid/-/scuid-1.1.0.tgz#d3f9f920956e737a60f72d0e4ad280bf324d5dab"
-  integrity sha512-MuCAyrGZcTLfQoH2XoBlQ8C6bzwN88XT/0slOGz0pn8+gIP85BOAfYa44ZXQUTOwRwPU0QvgU+V+OSajl/59Xg==
-
-"semver@2 || 3 || 4 || 5":
-  version "5.7.2"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
-  integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
-
-semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0, semver@^6.3.1:
-  version "6.3.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
-  integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
-
-semver@^7.3.4, semver@^7.3.7:
-  version "7.5.4"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
-  integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
-  dependencies:
-    lru-cache "^6.0.0"
-
-sentence-case@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/sentence-case/-/sentence-case-3.0.4.tgz#3645a7b8c117c787fde8702056225bb62a45131f"
-  integrity sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==
-  dependencies:
-    no-case "^3.0.4"
-    tslib "^2.0.3"
-    upper-case-first "^2.0.2"
-
-set-blocking@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
-  integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==
-
-setimmediate@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
-  integrity sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==
-
-shebang-command@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
-  integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
-  dependencies:
-    shebang-regex "^3.0.0"
-
-shebang-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
-  integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
-
-shell-quote@^1.7.3:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.0.tgz#20d078d0eaf71d54f43bd2ba14a1b5b9bfa5c8ba"
-  integrity sha512-QHsz8GgQIGKlRi24yFc6a6lN69Idnx634w49ay6+jA5yFh7a1UY+4Rp6HPx/L/1zcEDPEij8cIsiqR6bQsE5VQ==
-
-side-channel@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
-  integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==
-  dependencies:
-    call-bind "^1.0.0"
-    get-intrinsic "^1.0.2"
-    object-inspect "^1.9.0"
-
-signal-exit@^3.0.2:
-  version "3.0.7"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
-  integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
-
-signal-exit@^4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.0.2.tgz#ff55bb1d9ff2114c13b400688fa544ac63c36967"
-  integrity sha512-MY2/qGx4enyjprQnFaZsHib3Yadh3IXyV2C321GY0pjGfVBu4un0uDJkwgdxqO+Rdx8JMT8IfJIRwbYVz3Ob3Q==
-
-signedsource@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/signedsource/-/signedsource-1.0.0.tgz#1ddace4981798f93bd833973803d80d52e93ad6a"
-  integrity sha512-6+eerH9fEnNmi/hyM1DXcRK3pWdoMQtlkQ+ns0ntzunjKqp5i3sKCc80ym8Fib3iaYhdJUOPdhlJWj1tvge2Ww==
-
-slash@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
-  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
-
-slice-ansi@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz#31ddc10930a1b7e0b67b08c96c2f49b77a789787"
-  integrity sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==
-  dependencies:
-    ansi-styles "^4.0.0"
-    astral-regex "^2.0.0"
-    is-fullwidth-code-point "^3.0.0"
-
-slice-ansi@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b"
-  integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==
-  dependencies:
-    ansi-styles "^4.0.0"
-    astral-regex "^2.0.0"
-    is-fullwidth-code-point "^3.0.0"
-
-slick-carousel@^1.8.1:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/slick-carousel/-/slick-carousel-1.8.1.tgz#a4bfb29014887bb66ce528b90bd0cda262cc8f8d"
-  integrity sha512-XB9Ftrf2EEKfzoQXt3Nitrt/IPbT+f1fgqBdoxO3W/+JYvtEOW6EgxnWfr9GH6nmULv7Y2tPmEX3koxThVmebA==
-
-snake-case@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/snake-case/-/snake-case-3.0.4.tgz#4f2bbd568e9935abdfd593f34c691dadb49c452c"
-  integrity sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==
-  dependencies:
-    dot-case "^3.0.4"
-    tslib "^2.0.3"
-
-sort-keys@^4.0.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-4.2.0.tgz#6b7638cee42c506fff8c1cecde7376d21315be18"
-  integrity sha512-aUYIEU/UviqPgc8mHR6IW1EGxkAXpeRETYcrzg8cLAvUPZcpAlleSXHV2mY7G12GphSH6Gzv+4MMVSSkbdteHg==
-  dependencies:
-    is-plain-obj "^2.0.0"
-
-"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.1, source-map-js@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
-  integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
-
-source-map-support@~0.5.20:
-  version "0.5.21"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
-  integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==
-  dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
-
-source-map@^0.5.7:
-  version "0.5.7"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
-  integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==
-
-source-map@^0.6.0:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
-  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
-
-space-separated-tokens@^1.0.0:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/space-separated-tokens/-/space-separated-tokens-1.1.5.tgz#85f32c3d10d9682007e917414ddc5c26d1aa6899"
-  integrity sha512-q/JSVd1Lptzhf5bkYm4ob4iWPjx0KiRe3sRFBNrVqbJkFaBm5vbbowy1mymoPNLRa52+oadOhJ+K49wsSeSjTA==
-
-spdx-correct@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"
-  integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==
-  dependencies:
-    spdx-expression-parse "^3.0.0"
-    spdx-license-ids "^3.0.0"
-
-spdx-exceptions@^2.1.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d"
-  integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==
-
-spdx-expression-parse@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679"
-  integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==
-  dependencies:
-    spdx-exceptions "^2.1.0"
-    spdx-license-ids "^3.0.0"
-
-spdx-license-ids@^3.0.0:
-  version "3.0.12"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.12.tgz#69077835abe2710b65f03969898b6637b505a779"
-  integrity sha512-rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA==
-
-sponge-case@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/sponge-case/-/sponge-case-1.0.1.tgz#260833b86453883d974f84854cdb63aecc5aef4c"
-  integrity sha512-dblb9Et4DAtiZ5YSUZHLl4XhH4uK80GhAZrVXdN4O2P4gQ40Wa5UIOPUHlA/nFd2PLblBZWUioLMMAVrgpoYcA==
-  dependencies:
-    tslib "^2.0.3"
-
-sprintf-js@~1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
-  integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
-
-stop-iteration-iterator@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz#6a60be0b4ee757d1ed5254858ec66b10c49285e4"
-  integrity sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ==
-  dependencies:
-    internal-slot "^1.0.4"
-
-streamsearch@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-1.1.0.tgz#404dd1e2247ca94af554e841a8ef0eaa238da764"
-  integrity sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==
-
-string-convert@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/string-convert/-/string-convert-0.2.1.tgz#6982cc3049fbb4cd85f8b24568b9d9bf39eeff97"
-  integrity sha512-u/1tdPl4yQnPBjnVrmdLo9gtuLvELKsAoRapekWggdiQNvvvum+jYF329d84NAa660KQw7pB2n36KrIKVoXa3A==
-
-string-env-interpolation@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/string-env-interpolation/-/string-env-interpolation-1.0.1.tgz#ad4397ae4ac53fe6c91d1402ad6f6a52862c7152"
-  integrity sha512-78lwMoCcn0nNu8LszbP1UA7g55OeE4v7rCeWnM5B453rnNr4aq+5it3FEYtZrSEiMvHZOZ9Jlqb0OD0M2VInqg==
-
-string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
-  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.1"
-
-string.prototype.matchall@^4.0.8:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz#3bf85722021816dcd1bf38bb714915887ca79fd3"
-  integrity sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
-    get-intrinsic "^1.1.3"
-    has-symbols "^1.0.3"
-    internal-slot "^1.0.3"
-    regexp.prototype.flags "^1.4.3"
-    side-channel "^1.0.4"
-
-string.prototype.replaceall@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/string.prototype.replaceall/-/string.prototype.replaceall-1.0.7.tgz#6cf36b20bcb12d55653e1119ddf5bc1d6363103d"
-  integrity sha512-xB2WV2GlSCSJT5dMGdhdH1noMPiAB91guiepwTYyWY9/0Vq/TZ7RPmnOSUGAEvry08QIK7EMr28aAii+9jC6kw==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
-    get-intrinsic "^1.1.3"
-    has-symbols "^1.0.3"
-    is-regex "^1.1.4"
-
-string.prototype.trimend@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz#c4a27fa026d979d79c04f17397f250a462944533"
-  integrity sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
-
-string.prototype.trimstart@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz#e90ab66aa8e4007d92ef591bbf3cd422c56bdcf4"
-  integrity sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
-
-string_decoder@^1.1.1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
-  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
-  dependencies:
-    safe-buffer "~5.2.0"
-
-strip-ansi@^6.0.0, strip-ansi@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
-  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
-  dependencies:
-    ansi-regex "^5.0.1"
-
-strip-bom@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
-  integrity sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==
-
-strip-bom@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz#9c3505c1db45bcedca3d9cf7a16f5c5aa3901878"
-  integrity sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==
-
-strip-indent@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-3.0.0.tgz#c32e1cee940b6b3432c771bc2c54bcce73cd3001"
-  integrity sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==
-  dependencies:
-    min-indent "^1.0.0"
-
-strip-indent@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-4.0.0.tgz#b41379433dd06f5eae805e21d631e07ee670d853"
-  integrity sha512-mnVSV2l+Zv6BLpSD/8V87CW/y9EmmbYzGCIavsnsI6/nwn26DwffM/yztm30Z/I2DY9wdS3vXVCMnHDgZaVNoA==
-  dependencies:
-    min-indent "^1.0.1"
-
-strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
-  integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
-
-style-search@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/style-search/-/style-search-0.1.0.tgz#7958c793e47e32e07d2b5cafe5c0bf8e12e77902"
-  integrity sha512-Dj1Okke1C3uKKwQcetra4jSuk0DqbzbYtXipzFlFMZtowbF1x7BKJwB9AayVMyFARvU8EDrZdcax4At/452cAg==
-
-style-to-object@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/style-to-object/-/style-to-object-0.3.0.tgz#b1b790d205991cc783801967214979ee19a76e46"
-  integrity sha512-CzFnRRXhzWIdItT3OmF8SQfWyahHhjq3HwcMNCNLn+N7klOOqPjMeG/4JSu77D7ypZdGvSzvkrbyeTMizz2VrA==
-  dependencies:
-    inline-style-parser "0.1.1"
-
-stylelint-order@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/stylelint-order/-/stylelint-order-6.0.2.tgz#df54d3ed9aa5a45d4563ada0375e670140a798c2"
-  integrity sha512-yuac0BE6toHd27wUPvYVVQicAJthKFIv1HPQFH3Q0dExiO3Z6Uam7geoO0tUd5Z9ddsATYK++1qWNDX4RxMH5Q==
-  dependencies:
-    postcss "^8.4.21"
-    postcss-sorting "^8.0.1"
-
-stylelint@^15.10.1:
-  version "15.10.1"
-  resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-15.10.1.tgz#93f189958687e330c106b010cbec0c41dcae506d"
-  integrity sha512-CYkzYrCFfA/gnOR+u9kJ1PpzwG10WLVnoxHDuBA/JiwGqdM9+yx9+ou6SE/y9YHtfv1mcLo06fdadHTOx4gBZQ==
-  dependencies:
-    "@csstools/css-parser-algorithms" "^2.3.0"
-    "@csstools/css-tokenizer" "^2.1.1"
-    "@csstools/media-query-list-parser" "^2.1.2"
-    "@csstools/selector-specificity" "^3.0.0"
-    balanced-match "^2.0.0"
-    colord "^2.9.3"
-    cosmiconfig "^8.2.0"
-    css-functions-list "^3.1.0"
-    css-tree "^2.3.1"
-    debug "^4.3.4"
-    fast-glob "^3.3.0"
-    fastest-levenshtein "^1.0.16"
-    file-entry-cache "^6.0.1"
-    global-modules "^2.0.0"
-    globby "^11.1.0"
-    globjoin "^0.1.4"
-    html-tags "^3.3.1"
-    ignore "^5.2.4"
-    import-lazy "^4.0.0"
-    imurmurhash "^0.1.4"
-    is-plain-object "^5.0.0"
-    known-css-properties "^0.27.0"
-    mathml-tag-names "^2.1.3"
-    meow "^10.1.5"
-    micromatch "^4.0.5"
-    normalize-path "^3.0.0"
-    picocolors "^1.0.0"
-    postcss "^8.4.24"
-    postcss-resolve-nested-selector "^0.1.1"
-    postcss-safe-parser "^6.0.0"
-    postcss-selector-parser "^6.0.13"
-    postcss-value-parser "^4.2.0"
-    resolve-from "^5.0.0"
-    string-width "^4.2.3"
-    strip-ansi "^6.0.1"
-    style-search "^0.1.0"
-    supports-hyperlinks "^3.0.0"
-    svg-tags "^1.0.0"
-    table "^6.8.1"
-    write-file-atomic "^5.0.1"
-
-stylis@4.1.3:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.1.3.tgz#fd2fbe79f5fed17c55269e16ed8da14c84d069f7"
-  integrity sha512-GP6WDNWf+o403jrEp9c5jibKavrtLW+/qYGhFxFrG8maXhwTBI7gLLhiBb0o7uFccWN+EOS9aMO6cGHWAO07OA==
-
-supports-color@^5.3.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
-  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
-  dependencies:
-    has-flag "^3.0.0"
-
-supports-color@^7.0.0, supports-color@^7.1.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
-  integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
-  dependencies:
-    has-flag "^4.0.0"
-
-supports-hyperlinks@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-3.0.0.tgz#c711352a5c89070779b4dad54c05a2f14b15c94b"
-  integrity sha512-QBDPHyPQDRTy9ku4URNGY5Lah8PAaXs6tAAwp55sL5WCsSW7GIfdf6W5ixfziW+t7wh3GVvHyHHyQ1ESsoRvaA==
-  dependencies:
-    has-flag "^4.0.0"
-    supports-color "^7.0.0"
-
-supports-preserve-symlinks-flag@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
-  integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
-
-svg-tags@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/svg-tags/-/svg-tags-1.0.0.tgz#58f71cee3bd519b59d4b2a843b6c7de64ac04764"
-  integrity sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==
-
-swap-case@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/swap-case/-/swap-case-2.0.2.tgz#671aedb3c9c137e2985ef51c51f9e98445bf70d9"
-  integrity sha512-kc6S2YS/2yXbtkSMunBtKdah4VFETZ8Oh6ONSmSd9bRxhqTrtARUCBUiWXH3xVPpvR7tz2CSnkuXVE42EcGnMw==
-  dependencies:
-    tslib "^2.0.3"
-
-symbol-observable@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-4.0.0.tgz#5b425f192279e87f2f9b937ac8540d1984b39205"
-  integrity sha512-b19dMThMV4HVFynSAM1++gBHAbk2Tc/osgLIBZMKsyqh34jb2e8Os7T6ZW/Bt3pJFdBTd2JwAnAAEQV7rSNvcQ==
-
-systemjs@^6.13.0:
-  version "6.13.0"
-  resolved "https://registry.yarnpkg.com/systemjs/-/systemjs-6.13.0.tgz#7b28e74b44352e1650e8652499f42de724c3fc7f"
-  integrity sha512-P3cgh2bpaPvAO2NE3uRp/n6hmk4xPX4DQf+UzTlCAycssKdqhp6hjw+ENWe+aUS7TogKRFtptMosTSFeC6R55g==
-
-table@^6.8.1:
-  version "6.8.1"
-  resolved "https://registry.yarnpkg.com/table/-/table-6.8.1.tgz#ea2b71359fe03b017a5fbc296204471158080bdf"
-  integrity sha512-Y4X9zqrCftUhMeH2EptSSERdVKt/nEdijTOacGD/97EKjhQ/Qs8RTlEGABSJNNN8lac9kheH+af7yAkEWlgneA==
-  dependencies:
-    ajv "^8.0.1"
-    lodash.truncate "^4.4.2"
-    slice-ansi "^4.0.0"
-    string-width "^4.2.3"
-    strip-ansi "^6.0.1"
-
-terser@^5.9.0:
-  version "5.16.4"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.16.4.tgz#51284b440b93242291a98f2a9903c024cfb70e6e"
-  integrity sha512-5yEGuZ3DZradbogeYQ1NaGz7rXVBDWujWlx1PT8efXO6Txn+eWbfKqB2bTDVmFXmePFkoLU6XI8UektMIEA0ug==
-  dependencies:
-    "@jridgewell/source-map" "^0.3.2"
-    acorn "^8.5.0"
-    commander "^2.20.0"
-    source-map-support "~0.5.20"
-
-text-table@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
-  integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==
-
-thehandy@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/thehandy/-/thehandy-1.0.3.tgz#51c5e9bae5932a6e5c563203711d78610b99d402"
-  integrity sha512-zuuyWKBx/jqku9+MZkdkoK2oLM2mS8byWVR/vkQYq/ygAT6gPAXwiT94rfGuqv+1BLmsyJxm69nhVIzOZjfyIg==
-
-three@0.93.0:
-  version "0.93.0"
-  resolved "https://registry.yarnpkg.com/three/-/three-0.93.0.tgz#3fd6c367ef4554abbb6e16ad69936283e895c123"
-  integrity sha512-Ys9+UBBsd6FxTZZl4BH7B4b2F+B2uR0cOwY7OQ/aCzU/VgO4Wmmr1LbWPH1fsTvSVik9KAuwxwOHlSC4IMGOLA==
-
-throttle-debounce@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/throttle-debounce/-/throttle-debounce-5.0.0.tgz#a17a4039e82a2ed38a5e7268e4132d6960d41933"
-  integrity sha512-2iQTSgkkc1Zyk0MeVrt/3BvuOXYPl/R8Z0U2xxo9rjwNciaHDG3R+Lm6dh4EeUci49DanvBnuqI6jshoQQRGEg==
-
-through@^2.3.6, through@^2.3.8:
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
-  integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==
-
-tiny-case@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/tiny-case/-/tiny-case-1.0.3.tgz#d980d66bc72b5d5a9ca86fb7c9ffdb9c898ddd03"
-  integrity sha512-Eet/eeMhkO6TX8mnUteS9zgPbUMQa4I6Kkp5ORiBD5476/m+PIRiumP5tmh5ioJpH7k51Kehawy2UDfsnxxY8Q==
-
-tiny-invariant@^1.0.2:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.3.1.tgz#8560808c916ef02ecfd55e66090df23a4b7aa642"
-  integrity sha512-AD5ih2NlSssTCwsMznbvwMZpJ1cbhkGd2uueNxzv2jDlEeZdU04JQfRnggJQ8DrcVBGjAsCKwFBbDlVNtEMlzw==
-
-tiny-warning@^1.0.0, tiny-warning@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754"
-  integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==
-
-title-case@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/title-case/-/title-case-3.0.3.tgz#bc689b46f02e411f1d1e1d081f7c3deca0489982"
-  integrity sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==
-  dependencies:
-    tslib "^2.0.3"
-
-tmp@^0.0.33:
-  version "0.0.33"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
-  integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
-  dependencies:
-    os-tmpdir "~1.0.2"
-
-to-fast-properties@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
-  integrity sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==
-
-to-regex-range@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
-  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
-  dependencies:
-    is-number "^7.0.0"
-
-toposort@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/toposort/-/toposort-2.0.2.tgz#ae21768175d1559d48bef35420b2f4962f09c330"
-  integrity sha512-0a5EOkAUp8D4moMi2W8ZF8jcga7BgZd91O/yabJCFY8az+XSzeGyTKs0Aoo897iV1Nj6guFq8orWDS96z91oGg==
-
-tr46@~0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
-  integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==
-
-trim-newlines@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144"
-  integrity sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==
-
-trim-newlines@^4.0.2:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-4.1.1.tgz#28c88deb50ed10c7ba6dc2474421904a00139125"
-  integrity sha512-jRKj0n0jXWo6kh62nA5TEh3+4igKDXLvzBJcPpiizP7oOolUrYIxmVBG9TOtHYFHoddUk6YvAkGeGoSVTXfQXQ==
-
-trough@^1.0.0:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.5.tgz#b8b639cefad7d0bb2abd37d433ff8293efa5f406"
-  integrity sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==
-
-ts-invariant@^0.10.3:
-  version "0.10.3"
-  resolved "https://registry.yarnpkg.com/ts-invariant/-/ts-invariant-0.10.3.tgz#3e048ff96e91459ffca01304dbc7f61c1f642f6c"
-  integrity sha512-uivwYcQaxAucv1CzRp2n/QdYPo4ILf9VXgH19zEIjFx2EJufV16P0JtJVpYHy89DItG6Kwj2oIUjrcK5au+4tQ==
-  dependencies:
-    tslib "^2.1.0"
-
-ts-log@^2.2.3:
-  version "2.2.5"
-  resolved "https://registry.yarnpkg.com/ts-log/-/ts-log-2.2.5.tgz#aef3252f1143d11047e2cb6f7cfaac7408d96623"
-  integrity sha512-PGcnJoTBnVGy6yYNFxWVNkdcAuAMstvutN9MgDJIV6L0oG8fB+ZNNy1T+wJzah8RPGor1mZuPQkVfXNDpy9eHA==
-
-ts-node@^10.9.1:
-  version "10.9.1"
-  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.1.tgz#e73de9102958af9e1f0b168a6ff320e25adcff4b"
-  integrity sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==
-  dependencies:
-    "@cspotcode/source-map-support" "^0.8.0"
-    "@tsconfig/node10" "^1.0.7"
-    "@tsconfig/node12" "^1.0.7"
-    "@tsconfig/node14" "^1.0.0"
-    "@tsconfig/node16" "^1.0.2"
-    acorn "^8.4.1"
-    acorn-walk "^8.1.1"
-    arg "^4.1.0"
-    create-require "^1.1.0"
-    diff "^4.0.1"
-    make-error "^1.1.1"
-    v8-compile-cache-lib "^3.0.1"
-    yn "3.1.1"
-
-tsconfck@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/tsconfck/-/tsconfck-2.0.2.tgz#860a488f9acd024a85b2db458888410009b5383d"
-  integrity sha512-H3DWlwKpow+GpVLm/2cpmok72pwRr1YFROV3YzAmvzfGFiC1zEM/mc9b7+1XnrxuXtEbhJ7xUSIqjPFbedp7aQ==
-
-tsconfig-paths@^3.14.1:
-  version "3.14.1"
-  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz#ba0734599e8ea36c862798e920bcf163277b137a"
-  integrity sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==
-  dependencies:
-    "@types/json5" "^0.0.29"
-    json5 "^1.0.1"
-    minimist "^1.2.6"
-    strip-bom "^3.0.0"
-
-tslib@^1.8.1:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
-  integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
-
-tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.0, tslib@^2.3.1, tslib@^2.4.0, tslib@^2.4.1, tslib@^2.5.0, tslib@~2.6.0:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
-  integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==
-
-tslib@~2.4.0:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.1.tgz#0d0bfbaac2880b91e22df0768e55be9753a5b17e"
-  integrity sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==
-
-tslib@~2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf"
-  integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==
-
-tsutils@^3.21.0:
-  version "3.21.0"
-  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623"
-  integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==
-  dependencies:
-    tslib "^1.8.1"
-
-type-check@^0.4.0, type-check@~0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
-  integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==
-  dependencies:
-    prelude-ls "^1.2.1"
-
-type-fest@^0.13.1:
-  version "0.13.1"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz#0172cb5bce80b0bd542ea348db50c7e21834d934"
-  integrity sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==
-
-type-fest@^0.20.2:
-  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
-  integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
-
-type-fest@^0.21.3:
-  version "0.21.3"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"
-  integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==
-
-type-fest@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b"
-  integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==
-
-type-fest@^0.8.1:
-  version "0.8.1"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
-  integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
-
-type-fest@^1.0.1, type-fest@^1.2.1, type-fest@^1.2.2:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-1.4.0.tgz#e9fb813fe3bf1744ec359d55d1affefa76f14be1"
-  integrity sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==
-
-type-fest@^2.19.0:
-  version "2.19.0"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-2.19.0.tgz#88068015bb33036a598b952e55e9311a60fd3a9b"
-  integrity sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==
-
-typed-array-length@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.4.tgz#89d83785e5c4098bec72e08b319651f0eac9c1bb"
-  integrity sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==
-  dependencies:
-    call-bind "^1.0.2"
-    for-each "^0.3.3"
-    is-typed-array "^1.1.9"
-
-typedarray-to-buffer@^3.1.5:
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"
-  integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==
-  dependencies:
-    is-typedarray "^1.0.0"
-
-typescript@^4.0, typescript@~4.8.4:
-  version "4.8.4"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.4.tgz#c464abca159669597be5f96b8943500b238e60e6"
-  integrity sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==
-
-ua-parser-js@^0.7.30:
-  version "0.7.33"
-  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.33.tgz#1d04acb4ccef9293df6f70f2c3d22f3030d8b532"
-  integrity sha512-s8ax/CeZdK9R/56Sui0WM6y9OFREJarMRHqLB2EwkovemBxNQ+Bqu8GAsUnVcXKgphb++ghr/B2BZx4mahujPw==
-
-ua-parser-js@^1.0.2, ua-parser-js@^1.0.34:
-  version "1.0.34"
-  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-1.0.34.tgz#b33f41c415325839f354005d25a2f588be296976"
-  integrity sha512-K9mwJm/DaB6mRLZfw6q8IMXipcrmuT6yfhYmwhAkuh+81sChuYstYA+znlgaflUPaYUa3odxKPKGw6Vw/lANew==
-
-unbox-primitive@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz#29032021057d5e6cdbd08c5129c226dff8ed6f9e"
-  integrity sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==
-  dependencies:
-    call-bind "^1.0.2"
-    has-bigints "^1.0.2"
-    has-symbols "^1.0.3"
-    which-boxed-primitive "^1.0.2"
-
-unc-path-regex@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
-  integrity sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==
-
-uncontrollable@^7.2.1:
-  version "7.2.1"
-  resolved "https://registry.yarnpkg.com/uncontrollable/-/uncontrollable-7.2.1.tgz#1fa70ba0c57a14d5f78905d533cf63916dc75738"
-  integrity sha512-svtcfoTADIB0nT9nltgjujTi7BzVmwjZClOmskKu/E8FW9BXzg9os8OLr4f8Dlnk0rYWJIWr4wv9eKUXiQvQwQ==
-  dependencies:
-    "@babel/runtime" "^7.6.3"
-    "@types/react" ">=16.9.11"
-    invariant "^2.2.4"
-    react-lifecycles-compat "^3.0.4"
-
-unicode-canonical-property-names-ecmascript@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc"
-  integrity sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==
-
-unicode-match-property-ecmascript@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz#54fd16e0ecb167cf04cf1f756bdcc92eba7976c3"
-  integrity sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==
-  dependencies:
-    unicode-canonical-property-names-ecmascript "^2.0.0"
-    unicode-property-aliases-ecmascript "^2.0.0"
-
-unicode-match-property-value-ecmascript@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz#cb5fffdcd16a05124f5a4b0bf7c3770208acbbe0"
-  integrity sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==
-
-unicode-property-aliases-ecmascript@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz#43d41e3be698bd493ef911077c9b131f827e8ccd"
-  integrity sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==
-
-unified@^9.0.0:
-  version "9.2.2"
-  resolved "https://registry.yarnpkg.com/unified/-/unified-9.2.2.tgz#67649a1abfc3ab85d2969502902775eb03146975"
-  integrity sha512-Sg7j110mtefBD+qunSLO1lqOEKdrwBFBrR6Qd8f4uwkhWNlbkaqwHse6e7QvD3AP/MNoJdEDLaf8OxYyoWgorQ==
-  dependencies:
-    bail "^1.0.0"
-    extend "^3.0.0"
-    is-buffer "^2.0.0"
-    is-plain-obj "^2.0.0"
-    trough "^1.0.0"
-    vfile "^4.0.0"
-
-unist-builder@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/unist-builder/-/unist-builder-2.0.3.tgz#77648711b5d86af0942f334397a33c5e91516436"
-  integrity sha512-f98yt5pnlMWlzP539tPc4grGMsFaQQlP/vM396b00jngsiINumNmsY8rkXjfoi1c6QaM8nQ3vaGDuoKWbe/1Uw==
-
-unist-util-generated@^1.0.0:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/unist-util-generated/-/unist-util-generated-1.1.6.tgz#5ab51f689e2992a472beb1b35f2ce7ff2f324d4b"
-  integrity sha512-cln2Mm1/CZzN5ttGK7vkoGw+RZ8VcUH6BtGbq98DDtRGquAAOXig1mrBQYelOwMXYS8rK+vZDyyojSjp7JX+Lg==
-
-unist-util-is@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-3.0.0.tgz#d9e84381c2468e82629e4a5be9d7d05a2dd324cd"
-  integrity sha512-sVZZX3+kspVNmLWBPAB6r+7D9ZgAFPNWm66f7YNb420RlQSbn+n8rG8dGZSkrER7ZIXGQYNm5pqC3v3HopH24A==
-
-unist-util-is@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-4.1.0.tgz#976e5f462a7a5de73d94b706bac1b90671b57797"
-  integrity sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg==
-
-unist-util-position@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/unist-util-position/-/unist-util-position-3.1.0.tgz#1c42ee6301f8d52f47d14f62bbdb796571fa2d47"
-  integrity sha512-w+PkwCbYSFw8vpgWD0v7zRCl1FpY3fjDSQ3/N/wNd9Ffa4gPi8+4keqt99N3XW6F99t/mUzp2xAhNmfKWp95QA==
-
-unist-util-stringify-position@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz#cce3bfa1cdf85ba7375d1d5b17bdc4cada9bd9da"
-  integrity sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==
-  dependencies:
-    "@types/unist" "^2.0.2"
-
-unist-util-visit-parents@^2.0.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-2.1.2.tgz#25e43e55312166f3348cae6743588781d112c1e9"
-  integrity sha512-DyN5vD4NE3aSeB+PXYNKxzGsfocxp6asDc2XXE3b0ekO2BaRUpBicbbUygfSvYfUz1IkmjFR1YF7dPklraMZ2g==
-  dependencies:
-    unist-util-is "^3.0.0"
-
-unist-util-visit-parents@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-3.1.1.tgz#65a6ce698f78a6b0f56aa0e88f13801886cdaef6"
-  integrity sha512-1KROIZWo6bcMrZEwiH2UrXDyalAa0uqzWCxCJj6lPOvTve2WkfgCytoDTPaMnodXh1WrXOq0haVYHj99ynJlsg==
-  dependencies:
-    "@types/unist" "^2.0.0"
-    unist-util-is "^4.0.0"
-
-unist-util-visit@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-1.4.1.tgz#4724aaa8486e6ee6e26d7ff3c8685960d560b1e3"
-  integrity sha512-AvGNk7Bb//EmJZyhtRUnNMEpId/AZ5Ph/KUpTI09WHQuDZHKovQ1oEv3mfmKpWKtoMzyMC4GLBm1Zy5k12fjIw==
-  dependencies:
-    unist-util-visit-parents "^2.0.0"
-
-unist-util-visit@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-2.0.3.tgz#c3703893146df47203bb8a9795af47d7b971208c"
-  integrity sha512-iJ4/RczbJMkD0712mGktuGpm/U4By4FfDonL7N/9tATGIF4imikjOuagyMY53tnZq3NP6BcmlrHhEKAfGWjh7Q==
-  dependencies:
-    "@types/unist" "^2.0.0"
-    unist-util-is "^4.0.0"
-    unist-util-visit-parents "^3.0.0"
-
-universal-cookie@^4.0.4:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/universal-cookie/-/universal-cookie-4.0.4.tgz#06e8b3625bf9af049569ef97109b4bb226ad798d"
-  integrity sha512-lbRVHoOMtItjWbM7TwDLdl8wug7izB0tq3/YVKhT/ahB4VDvWMyvnADfnJI8y6fSvsjh51Ix7lTGC6Tn4rMPhw==
-  dependencies:
-    "@types/cookie" "^0.3.3"
-    cookie "^0.4.0"
-
-universalify@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
-  integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
-
-unixify@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/unixify/-/unixify-1.0.0.tgz#3a641c8c2ffbce4da683a5c70f03a462940c2090"
-  integrity sha512-6bc58dPYhCMHHuwxldQxO3RRNZ4eCogZ/st++0+fcC1nr0jiGUtAdBJ2qzmLQWSxbtz42pWt4QQMiZ9HvZf5cg==
-  dependencies:
-    normalize-path "^2.1.1"
-
-update-browserslist-db@^1.0.13:
-  version "1.0.13"
-  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz#3c5e4f5c083661bd38ef64b6328c26ed6c8248c4"
-  integrity sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==
-  dependencies:
-    escalade "^3.1.1"
-    picocolors "^1.0.0"
-
-upper-case-first@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/upper-case-first/-/upper-case-first-2.0.2.tgz#992c3273f882abd19d1e02894cc147117f844324"
-  integrity sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==
-  dependencies:
-    tslib "^2.0.3"
-
-upper-case@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-2.0.2.tgz#d89810823faab1df1549b7d97a76f8662bae6f7a"
-  integrity sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==
-  dependencies:
-    tslib "^2.0.3"
-
-uri-js@^4.2.2:
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
-  integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
-  dependencies:
-    punycode "^2.1.0"
-
-url-toolkit@^2.2.1:
-  version "2.2.5"
-  resolved "https://registry.yarnpkg.com/url-toolkit/-/url-toolkit-2.2.5.tgz#58406b18e12c58803e14624df5e374f638b0f607"
-  integrity sha512-mtN6xk+Nac+oyJ/PrI7tzfmomRVNFIWKUbG8jdYFt52hxbiReFAXIjYskvu64/dvuW71IcB7lV8l0HvZMac6Jg==
-
-urlpattern-polyfill@^10.0.0:
-  version "10.0.0"
-  resolved "https://registry.yarnpkg.com/urlpattern-polyfill/-/urlpattern-polyfill-10.0.0.tgz#f0a03a97bfb03cdf33553e5e79a2aadd22cac8ec"
-  integrity sha512-H/A06tKD7sS1O1X2SshBVeA5FLycRpjqiBeqGKmBwBDBy28EnRjORxTNe269KSSr5un5qyWi1iL61wLxpd+ZOg==
-
-urlpattern-polyfill@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/urlpattern-polyfill/-/urlpattern-polyfill-6.0.2.tgz#a193fe773459865a2a5c93b246bb794b13d07256"
-  integrity sha512-5vZjFlH9ofROmuWmXM9yj2wljYKgWstGwe8YTyiqM7hVum/g9LyCizPZtb3UqsuppVwety9QJmfc42VggLpTgg==
-  dependencies:
-    braces "^3.0.2"
-
-use-isomorphic-layout-effect@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.2.tgz#497cefb13d863d687b08477d9e5a164ad8c1a6fb"
-  integrity sha512-49L8yCO3iGT/ZF9QttjwLF/ZD9Iwto5LnH5LmEdk/6cFmXddqi2ulF0edxTwjj+7mqvpVVGQWvbXZdn32wRSHA==
-
-util-deprecate@^1.0.1, util-deprecate@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-  integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
-
-v8-compile-cache-lib@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf"
-  integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==
-
-validate-npm-package-license@^3.0.1:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
-  integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
-  dependencies:
-    spdx-correct "^3.0.0"
-    spdx-expression-parse "^3.0.0"
-
-value-equal@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/value-equal/-/value-equal-1.0.1.tgz#1e0b794c734c5c0cade179c437d356d931a34d6c"
-  integrity sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw==
-
-value-or-promise@^1.0.11, value-or-promise@^1.0.12:
-  version "1.0.12"
-  resolved "https://registry.yarnpkg.com/value-or-promise/-/value-or-promise-1.0.12.tgz#0e5abfeec70148c78460a849f6b003ea7986f15c"
-  integrity sha512-Z6Uz+TYwEqE7ZN50gwn+1LCVo9ZVrpxRPOhOLnncYkY1ZzOYtrX8Fwf/rFktZ8R5mJms6EZf5TqNOMeZmnPq9Q==
-
-vfile-message@^2.0.0:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-2.0.4.tgz#5b43b88171d409eae58477d13f23dd41d52c371a"
-  integrity sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==
-  dependencies:
-    "@types/unist" "^2.0.0"
-    unist-util-stringify-position "^2.0.0"
-
-vfile@^4.0.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/vfile/-/vfile-4.2.1.tgz#03f1dce28fc625c625bc6514350fbdb00fa9e624"
-  integrity sha512-O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA==
-  dependencies:
-    "@types/unist" "^2.0.0"
-    is-buffer "^2.0.0"
-    unist-util-stringify-position "^2.0.0"
-    vfile-message "^2.0.0"
-
-"video.js@^5.18.0 || ^6 || ^7", "video.js@^6 || ^7", video.js@^7.21.3:
-  version "7.21.3"
-  resolved "https://registry.yarnpkg.com/video.js/-/video.js-7.21.3.tgz#1a5f6379e713de3f5dc036ecdef02efb80765bdd"
-  integrity sha512-fIboXbSDCT3P8eVzIEC3hnLDKC/y+6QftcHdFGUVGn5a7qmH62Mh0Bt/SrBAgdmKDQM1qdZXfXAxPg5+IaiIXQ==
-  dependencies:
-    "@babel/runtime" "^7.12.5"
-    "@videojs/http-streaming" "2.16.2"
-    "@videojs/vhs-utils" "^3.0.4"
-    "@videojs/xhr" "2.6.0"
-    aes-decrypter "3.1.3"
-    global "^4.4.0"
-    keycode "^2.2.0"
-    m3u8-parser "4.8.0"
-    mpd-parser "0.22.1"
-    mux.js "6.0.1"
-    safe-json-parse "4.0.0"
-    videojs-font "3.2.0"
-    videojs-vtt.js "^0.15.4"
-
-videojs-abloop@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/videojs-abloop/-/videojs-abloop-1.2.0.tgz#ead4054400e6107d6512553ddff2a97260decf3e"
-  integrity sha512-6/hvtB5gNQUr5FJ969UhXVg5H+3wxhOzh9AVftlezOXlhzzaWfNfiOJYqNKo01Gc/eSQOvfttrOX7jH+aHpwrw==
-
-videojs-contrib-dash@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/videojs-contrib-dash/-/videojs-contrib-dash-5.1.1.tgz#9f50191677815a7d816c500977811a926aee0643"
-  integrity sha512-MI0kPHuQ3KH9Mc2mLVLqvFKCoEyTfXzHc02fm8pqMk8v7LXrJKnIv9xfugBccRF7vZHDZISftedD/CmEJfvvrA==
-  dependencies:
-    dashjs "^4.2.0"
-    global "^4.3.2"
-    video.js "^5.18.0 || ^6 || ^7"
-
-videojs-font@3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/videojs-font/-/videojs-font-3.2.0.tgz#212c9d3f4e4ec3fa7345167d64316add35e92232"
-  integrity sha512-g8vHMKK2/JGorSfqAZQUmYYNnXmfec4MLhwtEFS+mMs2IDY398GLysy6BH6K+aS1KMNu/xWZ8Sue/X/mdQPliA==
-
-videojs-mobile-ui@^0.8.0:
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/videojs-mobile-ui/-/videojs-mobile-ui-0.8.0.tgz#40a1c6f9302071b9bbe95937c934114600916ac5"
-  integrity sha512-Jd+u/ctjUkbZlT1cAA0umTu0LQwSZSFG+02cJxShuwq27B6rfrRALETK/gsuTc7U27lB9fbwcF7HBMaNxW62nA==
-  dependencies:
-    global "^4.4.0"
-
-videojs-seek-buttons@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/videojs-seek-buttons/-/videojs-seek-buttons-3.0.1.tgz#cc2adc23a6372e8aa6c2e9fd0fe7e7831a46747f"
-  integrity sha512-scVWOqCMqHajlbwYZIzJ5nBYkDXTAhEpWjfcdCu8ykksA1barrKnEKdQvS84TtDWOx6UXDD/e/x0acYEZCDMEQ==
-  dependencies:
-    global "^4.4.0"
-
-videojs-vr@1.8.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/videojs-vr/-/videojs-vr-1.8.0.tgz#7f2f07f760d8a329c615acd316e49da6ee8edd34"
-  integrity sha512-776gXqt8g6/rLeV56nn/aUcO0sRy+mgFITCw8cIqzTzl93SE1PEK/QE3YNqtppUfU5igayrx7WKsWhDOpsXMpw==
-  dependencies:
-    "@babel/runtime" "^7.14.5"
-    global "^4.4.0"
-    three "0.93.0"
-    video.js "^6 || ^7"
-    webvr-polyfill "0.10.12"
-
-videojs-vtt.js@^0.15.4:
-  version "0.15.4"
-  resolved "https://registry.yarnpkg.com/videojs-vtt.js/-/videojs-vtt.js-0.15.4.tgz#5dc5aabcd82ba40c5595469bd855ea8230ca152c"
-  integrity sha512-r6IhM325fcLb1D6pgsMkTQT1PpFdUdYZa1iqk7wJEu+QlibBwATPfPc9Bg8Jiym0GE5yP1AG2rMLu+QMVWkYtA==
-  dependencies:
-    global "^4.3.1"
-
-vite-plugin-compression@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/vite-plugin-compression/-/vite-plugin-compression-0.5.1.tgz#a75b0d8f48357ebb377b65016da9f20885ef39b6"
-  integrity sha512-5QJKBDc+gNYVqL/skgFAP81Yuzo9R+EAf19d+EtsMF/i8kFUpNi3J/H01QD3Oo8zBQn+NzoCIFkpPLynoOzaJg==
-  dependencies:
-    chalk "^4.1.2"
-    debug "^4.3.3"
-    fs-extra "^10.0.0"
-
-vite-tsconfig-paths@^4.0.5:
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/vite-tsconfig-paths/-/vite-tsconfig-paths-4.0.5.tgz#c7c54e2cf7ccc5e600db565cecd7b368a1fa8889"
-  integrity sha512-/L/eHwySFYjwxoYt1WRJniuK/jPv+WGwgRGBYx3leciR5wBeqntQpUE6Js6+TJemChc+ter7fDBKieyEWDx4yQ==
-  dependencies:
-    debug "^4.1.1"
-    globrex "^0.1.2"
-    tsconfck "^2.0.1"
-
-vite@^4.5.14:
-  version "4.5.14"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-4.5.14.tgz#2e652bc1d898265d987d6543ce866ecd65fa4086"
-  integrity sha512-+v57oAaoYNnO3hIu5Z/tJRZjq5aHM2zDve9YZ8HngVHbhk66RStobhb1sqPMIPEleV6cNKYK4eGrAbE9Ulbl2g==
-  dependencies:
-    esbuild "^0.18.10"
-    postcss "^8.4.27"
-    rollup "^3.27.1"
-  optionalDependencies:
-    fsevents "~2.3.2"
-
-warning@^4.0.0, warning@^4.0.2, warning@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/warning/-/warning-4.0.3.tgz#16e9e077eb8a86d6af7d64aa1e05fd85b4678ca3"
-  integrity sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==
-  dependencies:
-    loose-envify "^1.0.0"
-
-wcwidth@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"
-  integrity sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==
-  dependencies:
-    defaults "^1.0.3"
-
-web-namespaces@^1.0.0:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/web-namespaces/-/web-namespaces-1.1.4.tgz#bc98a3de60dadd7faefc403d1076d529f5e030ec"
-  integrity sha512-wYxSGajtmoP4WxfejAPIr4l0fVh+jeMXZb08wNc0tMg6xsfZXj3cECqIK0G7ZAqUq0PP8WlMDtaOGVBTAWztNw==
-
-web-streams-polyfill@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/web-streams-polyfill/-/web-streams-polyfill-3.2.1.tgz#71c2718c52b45fd49dbeee88634b3a60ceab42a6"
-  integrity sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q==
-
-"webcomponents.js@git+https://git@github.com/webcomponents/webcomponentsjs.git#v0.7.24":
-  version "0.7.24"
-  resolved "git+https://git@github.com/webcomponents/webcomponentsjs.git#8a2e40557b177e2cca0def2553f84c8269c8f93e"
-
-webcrypto-core@^1.7.4:
-  version "1.7.6"
-  resolved "https://registry.yarnpkg.com/webcrypto-core/-/webcrypto-core-1.7.6.tgz#e32c4a12a13de4251f8f9ef336a6cba7cdec9b55"
-  integrity sha512-TBPiewB4Buw+HI3EQW+Bexm19/W4cP/qZG/02QJCXN+iN+T5sl074vZ3rJcle/ZtDBQSgjkbsQO/1eFcxnSBUA==
-  dependencies:
-    "@peculiar/asn1-schema" "^2.1.6"
-    "@peculiar/json-schema" "^1.1.12"
-    asn1js "^3.0.1"
-    pvtsutils "^1.3.2"
-    tslib "^2.4.0"
-
-webidl-conversions@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
-  integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==
-
-webvr-polyfill-dpdb@^1.0.17:
-  version "1.0.18"
-  resolved "https://registry.yarnpkg.com/webvr-polyfill-dpdb/-/webvr-polyfill-dpdb-1.0.18.tgz#258484ce06b057bf18898acc911bd173847bce11"
-  integrity sha512-O0S1ZGEWyPvyZEkS2VbyV7mtir/NM9MNK3EuhbHPoJ8EHTky2pTXehjIl+IiDPr+Lldgx129QGt3NGly7rwRPw==
-
-webvr-polyfill@0.10.12:
-  version "0.10.12"
-  resolved "https://registry.yarnpkg.com/webvr-polyfill/-/webvr-polyfill-0.10.12.tgz#47ea0b0d558f09e089bc49fa7b47a4ee7e4b8148"
-  integrity sha512-trDJEVUQnRIVAnmImjEQ0BlL1NfuWl8+eaEdu+bs4g59c7OtETi/5tFkgEFDRaWEYwHntXs/uFF3OXZuutNGGA==
-  dependencies:
-    cardboard-vr-display "^1.0.19"
-
-whatwg-url@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
-  integrity sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==
-  dependencies:
-    tr46 "~0.0.3"
-    webidl-conversions "^3.0.0"
-
-which-boxed-primitive@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6"
-  integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==
-  dependencies:
-    is-bigint "^1.0.1"
-    is-boolean-object "^1.1.0"
-    is-number-object "^1.0.4"
-    is-string "^1.0.5"
-    is-symbol "^1.0.3"
-
-which-collection@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/which-collection/-/which-collection-1.0.1.tgz#70eab71ebbbd2aefaf32f917082fc62cdcb70906"
-  integrity sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==
-  dependencies:
-    is-map "^2.0.1"
-    is-set "^2.0.1"
-    is-weakmap "^2.0.1"
-    is-weakset "^2.0.1"
-
-which-module@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
-  integrity sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q==
-
-which-typed-array@^1.1.9:
-  version "1.1.9"
-  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.9.tgz#307cf898025848cf995e795e8423c7f337efbde6"
-  integrity sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==
-  dependencies:
-    available-typed-arrays "^1.0.5"
-    call-bind "^1.0.2"
-    for-each "^0.3.3"
-    gopd "^1.0.1"
-    has-tostringtag "^1.0.0"
-    is-typed-array "^1.1.10"
-
-which@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
-  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
-  dependencies:
-    isexe "^2.0.0"
-
-which@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
-  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
-  dependencies:
-    isexe "^2.0.0"
-
-word-wrap@^1.2.3:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.4.tgz#cb4b50ec9aca570abd1f52f33cd45b6c61739a9f"
-  integrity sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==
-
-wrap-ansi@^6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"
-  integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==
-  dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-
-wrap-ansi@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
-  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
-  dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-
-wrappy@1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
-
-write-file-atomic@^3.0.0:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8"
-  integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==
-  dependencies:
-    imurmurhash "^0.1.4"
-    is-typedarray "^1.0.0"
-    signal-exit "^3.0.2"
-    typedarray-to-buffer "^3.1.5"
-
-write-file-atomic@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-5.0.1.tgz#68df4717c55c6fa4281a7860b4c2ba0a6d2b11e7"
-  integrity sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==
-  dependencies:
-    imurmurhash "^0.1.4"
-    signal-exit "^4.0.1"
-
-write-json-file@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/write-json-file/-/write-json-file-4.3.0.tgz#908493d6fd23225344af324016e4ca8f702dd12d"
-  integrity sha512-PxiShnxf0IlnQuMYOPPhPkhExoCQuTUNPOa/2JWCYTmBquU9njyyDuwRKN26IZBlp4yn1nt+Agh2HOOBl+55HQ==
-  dependencies:
-    detect-indent "^6.0.0"
-    graceful-fs "^4.1.15"
-    is-plain-obj "^2.0.0"
-    make-dir "^3.0.0"
-    sort-keys "^4.0.0"
-    write-file-atomic "^3.0.0"
-
-ws@^8.12.0, ws@^8.13.0, ws@^8.15.0:
-  version "8.17.1"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.17.1.tgz#9293da530bb548febc95371d90f9c878727d919b"
-  integrity sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==
-
-xtend@^4.0.0:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
-  integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
-
-y18n@^4.0.0:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf"
-  integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==
-
-y18n@^5.0.5:
-  version "5.0.8"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
-  integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
-
-yallist@^3.0.2:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
-  integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
-
-yallist@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
-  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
-
-yaml-ast-parser@^0.0.43:
-  version "0.0.43"
-  resolved "https://registry.yarnpkg.com/yaml-ast-parser/-/yaml-ast-parser-0.0.43.tgz#e8a23e6fb4c38076ab92995c5dca33f3d3d7c9bb"
-  integrity sha512-2PTINUwsRqSd+s8XxKaJWQlUuEMHJQyEuh2edBbW8KNJz0SJPwUSD2zRWqezFEdN7IzAgeuYHFUCF7o8zRdZ0A==
-
-yaml@^1.10.0:
-  version "1.10.2"
-  resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
-  integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
-
-yaml@^2.3.1:
-  version "2.3.4"
-  resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.3.4.tgz#53fc1d514be80aabf386dc6001eb29bf3b7523b2"
-  integrity sha512-8aAvwVUSHpfEqTQ4w/KMlf3HcRdt50E5ODIQJBw1fQ5RL34xabzxtUlzTXVqc4rkZsPbvrXKWnABCD7kWSmocA==
-
-yargs-parser@^18.1.2, yargs-parser@^18.1.3:
-  version "18.1.3"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
-  integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==
-  dependencies:
-    camelcase "^5.0.0"
-    decamelize "^1.2.0"
-
-yargs-parser@^20.2.9:
-  version "20.2.9"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
-  integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
-
-yargs-parser@^21.1.1:
-  version "21.1.1"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
-  integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
-
-yargs@^15.3.1:
-  version "15.4.1"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8"
-  integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==
-  dependencies:
-    cliui "^6.0.0"
-    decamelize "^1.2.0"
-    find-up "^4.1.0"
-    get-caller-file "^2.0.1"
-    require-directory "^2.1.1"
-    require-main-filename "^2.0.0"
-    set-blocking "^2.0.0"
-    string-width "^4.2.0"
-    which-module "^2.0.0"
-    y18n "^4.0.0"
-    yargs-parser "^18.1.2"
-
-yargs@^17.0.0:
-  version "17.6.2"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.6.2.tgz#2e23f2944e976339a1ee00f18c77fedee8332541"
-  integrity sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw==
-  dependencies:
-    cliui "^8.0.1"
-    escalade "^3.1.1"
-    get-caller-file "^2.0.5"
-    require-directory "^2.1.1"
-    string-width "^4.2.3"
-    y18n "^5.0.5"
-    yargs-parser "^21.1.1"
-
-yn@3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"
-  integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==
-
-yocto-queue@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
-  integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
-
-yup@^1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/yup/-/yup-1.3.2.tgz#afffc458f1513ed386e6aaf4bcaa4e67a9e270dc"
-  integrity sha512-6KCM971iQtJ+/KUaHdrhVr2LDkfhBtFPRnsG1P8F4q3uUVQ2RfEM9xekpha9aA4GXWJevjM10eDcPQ1FfWlmaQ==
-  dependencies:
-    property-expr "^2.0.5"
-    tiny-case "^1.0.3"
-    toposort "^2.0.2"
-    type-fest "^2.19.0"
-
-zen-observable-ts@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-1.2.5.tgz#6c6d9ea3d3a842812c6e9519209365a122ba8b58"
-  integrity sha512-QZWQekv6iB72Naeake9hS1KxHlotfRpe+WGNbNx5/ta+R3DNjVO2bswf63gXlWDcs+EMd7XY8HfVQyP1X6T4Zg==
-  dependencies:
-    zen-observable "0.8.15"
-
-zen-observable@0.8.15:
-  version "0.8.15"
-  resolved "https://registry.yarnpkg.com/zen-observable/-/zen-observable-0.8.15.tgz#96415c512d8e3ffd920afd3889604e30b9eaac15"
-  integrity sha512-PQ2PC7R9rslx84ndNBZB/Dkv8V8fZEpk83RLgXtYd0fwUgEjseMn1Dgajh2x6S8QbZAFa9p2qVCEuYZNgve0dQ==
-
-zwitch@^1.0.0:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/zwitch/-/zwitch-1.0.5.tgz#d11d7381ffed16b742f6af7b3f223d5cd9fe9920"
-  integrity sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==

From b4d148bdb079f631337c0b8af554839786927b68 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Mon, 10 Nov 2025 09:20:48 +1100
Subject: [PATCH 113/405] Delete temp file before running backup (#6248)

---
 internal/manager/manager.go | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/internal/manager/manager.go b/internal/manager/manager.go
index 4827a3e3d..ca70b1c13 100644
--- a/internal/manager/manager.go
+++ b/internal/manager/manager.go
@@ -322,6 +322,11 @@ func (s *Manager) BackupDatabase(download bool) (string, string, error) {
 		backupPath = f.Name()
 		backupName = s.Database.DatabaseBackupPath("")
 		f.Close()
+
+		// delete the temp file so that the backup operation can create it
+		if err := os.Remove(backupPath); err != nil {
+			return "", "", fmt.Errorf("could not remove temporary backup file %v: %w", backupPath, err)
+		}
 	} else {
 		backupDir := s.Config.GetBackupDirectoryPathOrDefault()
 		if backupDir != "" {

From 289b69859831b7a534cc785eaa23e820c6cff32b Mon Sep 17 00:00:00 2001
From: ayaya <62456287+a15355447898a@users.noreply.github.com>
Date: Mon, 10 Nov 2025 06:55:12 +0800
Subject: [PATCH 114/405] Add hardware codec support for rkmpp (#6182)

---
 pkg/ffmpeg/codec_hardware.go | 43 ++++++++++++++++++++++++++++++++++--
 1 file changed, 41 insertions(+), 2 deletions(-)

diff --git a/pkg/ffmpeg/codec_hardware.go b/pkg/ffmpeg/codec_hardware.go
index 4081f015d..bbbdbda6e 100644
--- a/pkg/ffmpeg/codec_hardware.go
+++ b/pkg/ffmpeg/codec_hardware.go
@@ -29,6 +29,7 @@ var (
 	VideoCodecIVP9  = makeVideoCodec("VP9 Intel Quick Sync Video (QSV)", "vp9_qsv")
 	VideoCodecVVP9  = makeVideoCodec("VP9 VAAPI", "vp9_vaapi")
 	VideoCodecVVPX  = makeVideoCodec("VP8 VAAPI", "vp8_vaapi")
+	VideoCodecRK264 = makeVideoCodec("H264 Rockchip MPP (rkmpp)", "h264_rkmpp")
 )
 
 const minHeight int = 480
@@ -45,6 +46,7 @@ func (f *FFMpeg) InitHWSupport(ctx context.Context) {
 		VideoCodecI264C,
 		VideoCodecV264,
 		VideoCodecR264,
+		VideoCodecRK264,
 		VideoCodecIVP9,
 		VideoCodecVVP9,
 		VideoCodecM264,
@@ -201,6 +203,19 @@ func (f *FFMpeg) hwDeviceInit(args Args, toCodec VideoCodec, fullhw bool) Args {
 			args = append(args, "-init_hw_device")
 			args = append(args, "videotoolbox=vt")
 		}
+	case VideoCodecRK264:
+		// Rockchip: always create rkmpp device and make it the filter device, so
+		// scale_rkrga and subsequent hwupload/hwmap operate in the right context.
+		args = append(args, "-init_hw_device")
+		args = append(args, "rkmpp=rk")
+		args = append(args, "-filter_hw_device")
+		args = append(args, "rk")
+		if fullhw {
+			args = append(args, "-hwaccel")
+			args = append(args, "rkmpp")
+			args = append(args, "-hwaccel_output_format")
+			args = append(args, "drm_prime")
+		}
 	}
 
 	return args
@@ -233,6 +248,14 @@ func (f *FFMpeg) hwFilterInit(toCodec VideoCodec, fullhw bool) VideoFilter {
 			videoFilter = videoFilter.Append("format=nv12")
 			videoFilter = videoFilter.Append("hwupload")
 		}
+	case VideoCodecRK264:
+		// For Rockchip full-hw, do NOT pre-map to rkrga here. scale_rkrga can
+		// consume DRM_PRIME frames directly when filter_hw_device is set.
+		// For non-fullhw, keep a sane software format.
+		if !fullhw {
+			videoFilter = videoFilter.Append("format=nv12")
+			videoFilter = videoFilter.Append("hwupload")
+		}
 	}
 
 	return videoFilter
@@ -310,6 +333,9 @@ func (f *FFMpeg) hwApplyFullHWFilter(args VideoFilter, codec VideoCodec, fullhw
 		if fullhw && f.version.Gteq(Version{major: 3, minor: 3}) { // Added in FFMpeg 3.3
 			args = args.Append("scale_qsv=format=nv12")
 		}
+	case VideoCodecRK264:
+		// For Rockchip, no extra mapping here. If there is no scale filter,
+		// leave frames in DRM_PRIME for the encoder.
 	}
 
 	return args
@@ -337,6 +363,14 @@ func (f *FFMpeg) hwApplyScaleTemplate(sargs string, codec VideoCodec, match []in
 		}
 	case VideoCodecM264:
 		template = "scale_vt=$value"
+	case VideoCodecRK264:
+		// The original filter chain is a fallback for maximum compatibility:
+		// "scale_rkrga=$value:format=nv12,hwdownload,format=nv12,hwupload"
+		// It avoids hwmap(rkrga→rkmpp) failures (-38/-12) seen on some builds
+		// by downloading the scaled frame to system RAM and re-uploading it.
+		// The filter chain below uses a zero-copy approach, passing the hardware-scaled
+		// frame directly to the encoder. This is more efficient but may be less stable.
+		template = "scale_rkrga=$value"
 	default:
 		return VideoFilter(sargs)
 	}
@@ -345,12 +379,15 @@ func (f *FFMpeg) hwApplyScaleTemplate(sargs string, codec VideoCodec, match []in
 	isIntel := codec == VideoCodecI264 || codec == VideoCodecI264C || codec == VideoCodecIVP9
 	// BUG: scale_vt doesn't call ff_scale_adjust_dimensions, thus cant accept negative size values
 	isApple := codec == VideoCodecM264
+	// Rockchip's scale_rkrga supports -1/-2; don't apply minus-one hack here.
 	return VideoFilter(templateReplaceScale(sargs, template, match, vf, isIntel || isApple))
 }
 
 // Returns the max resolution for a given codec, or a default
 func (f *FFMpeg) hwCodecMaxRes(codec VideoCodec) (int, int) {
 	switch codec {
+	case VideoCodecRK264:
+		return 8192, 8192
 	case VideoCodecN264,
 		VideoCodecN264H,
 		VideoCodecI264,
@@ -382,7 +419,8 @@ func (f *FFMpeg) hwCodecHLSCompatible() *VideoCodec {
 			VideoCodecI264C,
 			VideoCodecV264,
 			VideoCodecR264,
-			VideoCodecM264: // Note that the Apple encoder sucks at startup, thus HLS quality is crap
+			VideoCodecM264, // Note that the Apple encoder sucks at startup, thus HLS quality is crap
+			VideoCodecRK264:
 			return &element
 		}
 	}
@@ -397,7 +435,8 @@ func (f *FFMpeg) hwCodecMP4Compatible() *VideoCodec {
 			VideoCodecN264H,
 			VideoCodecI264,
 			VideoCodecI264C,
-			VideoCodecM264:
+			VideoCodecM264,
+			VideoCodecRK264:
 			return &element
 		}
 	}

From 53655e51c40db1cb3c2b00b1b9502f5205cfef8d Mon Sep 17 00:00:00 2001
From: Gykes <24581046+Gykes@users.noreply.github.com>
Date: Sun, 9 Nov 2025 15:45:36 -0800
Subject: [PATCH 115/405] Feature: Filter by Total Scene Duration (#6172)

---
 pkg/sqlite/performer.go                      | 25 ++++++++++++++++++++
 pkg/sqlite/studio.go                         | 13 ++++++++++
 pkg/sqlite/tag.go                            | 14 +++++++++++
 ui/v2.5/src/locales/en-GB.json               |  1 +
 ui/v2.5/src/models/list-filter/performers.ts |  1 +
 ui/v2.5/src/models/list-filter/studios.ts    |  8 ++++++-
 ui/v2.5/src/models/list-filter/tags.ts       |  2 +-
 7 files changed, 62 insertions(+), 2 deletions(-)

diff --git a/pkg/sqlite/performer.go b/pkg/sqlite/performer.go
index 1b1f103da..c5943b182 100644
--- a/pkg/sqlite/performer.go
+++ b/pkg/sqlite/performer.go
@@ -726,6 +726,28 @@ func (qb *PerformerStore) sortByLastPlayedAt(direction string) string {
 	return " ORDER BY (" + selectPerformerLastPlayedAtSQL + ") " + direction
 }
 
+// used for sorting by total scene duration
+var selectPerformerScenesDurationSQL = utils.StrFormat(
+	"SELECT COALESCE(SUM(video_files.duration), 0) FROM {performers_scenes} s "+
+		"LEFT JOIN {scenes} ON {scenes}.id = s.{scene_id} "+
+		"LEFT JOIN {scenes_files} ON {scenes_files}.{scene_id} = {scenes}.id "+
+		"LEFT JOIN video_files ON video_files.file_id = {scenes_files}.file_id "+
+		"WHERE s.{performer_id} = {performers}.id",
+	map[string]interface{}{
+		"performer_id":      performerIDColumn,
+		"performers":        performerTable,
+		"performers_scenes": performersScenesTable,
+		"scenes":            sceneTable,
+		"scene_id":          sceneIDColumn,
+		"scenes_files":      scenesFilesTable,
+	},
+)
+
+func (qb *PerformerStore) sortByScenesDuration(direction string) string {
+	// need to sum duration from all scenes for this performer
+	return " ORDER BY (" + selectPerformerScenesDurationSQL + ") " + direction
+}
+
 var performerSortOptions = sortOptions{
 	"birthdate",
 	"career_length",
@@ -744,6 +766,7 @@ var performerSortOptions = sortOptions{
 	"random",
 	"rating",
 	"scenes_count",
+	"scenes_duration",
 	"tag_count",
 	"updated_at",
 	"weight",
@@ -771,6 +794,8 @@ func (qb *PerformerStore) getPerformerSort(findFilter *models.FindFilterType) (s
 		sortQuery += getCountSort(performerTable, performersTagsTable, performerIDColumn, direction)
 	case "scenes_count":
 		sortQuery += getCountSort(performerTable, performersScenesTable, performerIDColumn, direction)
+	case "scenes_duration":
+		sortQuery += qb.sortByScenesDuration(direction)
 	case "images_count":
 		sortQuery += getCountSort(performerTable, performersImagesTable, performerIDColumn, direction)
 	case "galleries_count":
diff --git a/pkg/sqlite/studio.go b/pkg/sqlite/studio.go
index 7d93eee28..5affb73d6 100644
--- a/pkg/sqlite/studio.go
+++ b/pkg/sqlite/studio.go
@@ -576,6 +576,16 @@ func (qb *StudioStore) QueryCount(ctx context.Context, studioFilter *models.Stud
 	return query.executeCount(ctx)
 }
 
+func (qb *StudioStore) sortByScenesDuration(direction string) string {
+	return fmt.Sprintf(` ORDER BY (
+		SELECT COALESCE(SUM(video_files.duration), 0)
+		FROM %s
+		LEFT JOIN %s ON %s.%s = %s.id
+		LEFT JOIN video_files ON video_files.file_id = %s.file_id
+		WHERE %s.%s = %s.id
+	) %s`, sceneTable, scenesFilesTable, scenesFilesTable, sceneIDColumn, sceneTable, scenesFilesTable, sceneTable, studioIDColumn, studioTable, getSortDirection(direction))
+}
+
 var studioSortOptions = sortOptions{
 	"child_count",
 	"created_at",
@@ -584,6 +594,7 @@ var studioSortOptions = sortOptions{
 	"images_count",
 	"name",
 	"scenes_count",
+	"scenes_duration",
 	"random",
 	"rating",
 	"tag_count",
@@ -612,6 +623,8 @@ func (qb *StudioStore) getStudioSort(findFilter *models.FindFilterType) (string,
 		sortQuery += getCountSort(studioTable, studiosTagsTable, studioIDColumn, direction)
 	case "scenes_count":
 		sortQuery += getCountSort(studioTable, sceneTable, studioIDColumn, direction)
+	case "scenes_duration":
+		sortQuery += qb.sortByScenesDuration(direction)
 	case "images_count":
 		sortQuery += getCountSort(studioTable, imageTable, studioIDColumn, direction)
 	case "galleries_count":
diff --git a/pkg/sqlite/tag.go b/pkg/sqlite/tag.go
index ede1fcc2e..87ec01f5d 100644
--- a/pkg/sqlite/tag.go
+++ b/pkg/sqlite/tag.go
@@ -651,9 +651,21 @@ var tagSortOptions = sortOptions{
 	"random",
 	"scene_markers_count",
 	"scenes_count",
+	"scenes_duration",
 	"updated_at",
 }
 
+func (qb *TagStore) sortByScenesDuration(direction string) string {
+	return fmt.Sprintf(` ORDER BY (
+		SELECT COALESCE(SUM(video_files.duration), 0)
+		FROM %s
+		LEFT JOIN %s ON %s.id = %s.%s
+		LEFT JOIN %s ON %s.%s = %s.id
+		LEFT JOIN video_files ON video_files.file_id = %s.file_id
+		WHERE %s.%s = %s.id
+	) %s`, scenesTagsTable, sceneTable, sceneTable, scenesTagsTable, sceneIDColumn, scenesFilesTable, scenesFilesTable, sceneIDColumn, sceneTable, scenesFilesTable, scenesTagsTable, tagIDColumn, tagTable, getSortDirection(direction))
+}
+
 func (qb *TagStore) getDefaultTagSort() string {
 	return getSort("name", "ASC", "tags")
 }
@@ -680,6 +692,8 @@ func (qb *TagStore) getTagSort(query *queryBuilder, findFilter *models.FindFilte
 		sortQuery += fmt.Sprintf(" ORDER BY COALESCE(tags.sort_name, tags.name) COLLATE NATURAL_CI %s", getSortDirection(direction))
 	case "scenes_count":
 		sortQuery += getCountSort(tagTable, scenesTagsTable, tagIDColumn, direction)
+	case "scenes_duration":
+		sortQuery += qb.sortByScenesDuration(direction)
 	case "scene_markers_count":
 		sortQuery += fmt.Sprintf(" ORDER BY (SELECT COUNT(*) FROM scene_markers_tags WHERE tags.id = scene_markers_tags.tag_id)+(SELECT COUNT(*) FROM scene_markers WHERE tags.id = scene_markers.primary_tag_id) %s", getSortDirection(direction))
 	case "images_count":
diff --git a/ui/v2.5/src/locales/en-GB.json b/ui/v2.5/src/locales/en-GB.json
index a8d731b32..48cf2f6d3 100644
--- a/ui/v2.5/src/locales/en-GB.json
+++ b/ui/v2.5/src/locales/en-GB.json
@@ -1308,6 +1308,7 @@
   "sceneTagger": "Scene Tagger",
   "scene_code": "Studio Code",
   "scene_count": "Scene Count",
+  "scenes_duration": "Scene Duration",
   "scene_created_at": "Scene Created At",
   "scene_date": "Date of Scene",
   "scene_id": "Scene ID",
diff --git a/ui/v2.5/src/models/list-filter/performers.ts b/ui/v2.5/src/models/list-filter/performers.ts
index a8d3c9096..2cb3ef216 100644
--- a/ui/v2.5/src/models/list-filter/performers.ts
+++ b/ui/v2.5/src/models/list-filter/performers.ts
@@ -35,6 +35,7 @@ const sortByOptions = [
   "career_length",
   "weight",
   "measurements",
+  "scenes_duration",
 ]
   .map(ListFilterOptions.createSortBy)
   .concat([
diff --git a/ui/v2.5/src/models/list-filter/studios.ts b/ui/v2.5/src/models/list-filter/studios.ts
index a25fd9e22..02dfae2f6 100644
--- a/ui/v2.5/src/models/list-filter/studios.ts
+++ b/ui/v2.5/src/models/list-filter/studios.ts
@@ -15,7 +15,13 @@ import { ListFilterOptions } from "./filter-options";
 import { DisplayMode } from "./types";
 
 const defaultSortBy = "name";
-const sortByOptions = ["name", "tag_count", "random", "rating"]
+const sortByOptions = [
+  "name",
+  "tag_count",
+  "random",
+  "rating",
+  "scenes_duration",
+]
   .map(ListFilterOptions.createSortBy)
   .concat([
     {
diff --git a/ui/v2.5/src/models/list-filter/tags.ts b/ui/v2.5/src/models/list-filter/tags.ts
index db3a84666..c664f218e 100644
--- a/ui/v2.5/src/models/list-filter/tags.ts
+++ b/ui/v2.5/src/models/list-filter/tags.ts
@@ -16,7 +16,7 @@ import {
 import { FavoriteTagCriterionOption } from "./criteria/favorite";
 
 const defaultSortBy = "name";
-const sortByOptions = ["name", "random"]
+const sortByOptions = ["name", "random", "scenes_duration"]
   .map(ListFilterOptions.createSortBy)
   .concat([
     {

From 638ebfc319b796ec050a83f5d9629aad02057366 Mon Sep 17 00:00:00 2001
From: damontecres <154766448+damontecres@users.noreply.github.com>
Date: Sun, 9 Nov 2025 18:48:59 -0500
Subject: [PATCH 116/405] Support markers on the front page (#6065)

---
 ui/v2.5/src/components/FrontPage/Control.tsx  |  9 +++
 .../components/FrontPage/FrontPageConfig.tsx  |  6 +-
 .../Scenes/SceneMarkerRecommendationRow.tsx   | 59 +++++++++++++++++++
 ui/v2.5/src/core/config.ts                    |  1 +
 4 files changed, 70 insertions(+), 5 deletions(-)
 create mode 100644 ui/v2.5/src/components/Scenes/SceneMarkerRecommendationRow.tsx

diff --git a/ui/v2.5/src/components/FrontPage/Control.tsx b/ui/v2.5/src/components/FrontPage/Control.tsx
index 7ce32cb44..7ff31bbac 100644
--- a/ui/v2.5/src/components/FrontPage/Control.tsx
+++ b/ui/v2.5/src/components/FrontPage/Control.tsx
@@ -12,6 +12,7 @@ import { PerformerRecommendationRow } from "../Performers/PerformerRecommendatio
 import { SceneRecommendationRow } from "../Scenes/SceneRecommendationRow";
 import { StudioRecommendationRow } from "../Studios/StudioRecommendationRow";
 import { TagRecommendationRow } from "../Tags/TagRecommendationRow";
+import { SceneMarkerRecommendationRow } from "../Scenes/SceneMarkerRecommendationRow";
 
 interface IFilter {
   mode: GQL.FilterMode;
@@ -84,6 +85,14 @@ const RecommendationRow: React.FC<IFilter> = ({ mode, filter, header }) => {
           header={header}
         />
       );
+    case GQL.FilterMode.SceneMarkers:
+      return (
+        <SceneMarkerRecommendationRow
+          isTouch={isTouch}
+          filter={filter}
+          header={header}
+        />
+      );
     default:
       return <></>;
   }
diff --git a/ui/v2.5/src/components/FrontPage/FrontPageConfig.tsx b/ui/v2.5/src/components/FrontPage/FrontPageConfig.tsx
index f175a060e..2f72d0740 100644
--- a/ui/v2.5/src/components/FrontPage/FrontPageConfig.tsx
+++ b/ui/v2.5/src/components/FrontPage/FrontPageConfig.tsx
@@ -93,11 +93,7 @@ const AddContentModal: React.FC<IAddSavedFilterModalProps> = ({
     ].concat(
       candidates.findSavedFilters
         .filter((f) => {
-          // markers not currently supported
-          return (
-            f.mode !== GQL.FilterMode.SceneMarkers &&
-            !existingSavedFilterIDs.includes(f.id)
-          );
+          return !existingSavedFilterIDs.includes(f.id);
         })
         .map((f) => {
           return {
diff --git a/ui/v2.5/src/components/Scenes/SceneMarkerRecommendationRow.tsx b/ui/v2.5/src/components/Scenes/SceneMarkerRecommendationRow.tsx
new file mode 100644
index 000000000..7559d609a
--- /dev/null
+++ b/ui/v2.5/src/components/Scenes/SceneMarkerRecommendationRow.tsx
@@ -0,0 +1,59 @@
+import React from "react";
+import { Link } from "react-router-dom";
+import { useFindSceneMarkers } from "src/core/StashService";
+import Slider from "@ant-design/react-slick";
+import { ListFilterModel } from "src/models/list-filter/filter";
+import { getSlickSliderSettings } from "src/core/recommendations";
+import { RecommendationRow } from "../FrontPage/RecommendationRow";
+import { FormattedMessage } from "react-intl";
+import { SceneMarkerCard } from "./SceneMarkerCard";
+
+interface IProps {
+  isTouch: boolean;
+  filter: ListFilterModel;
+  header: string;
+}
+
+export const SceneMarkerRecommendationRow: React.FC<IProps> = (props) => {
+  const result = useFindSceneMarkers(props.filter);
+  const cardCount = result.data?.findSceneMarkers.count;
+
+  if (!result.loading && !cardCount) {
+    return null;
+  }
+
+  return (
+    <RecommendationRow
+      className="scene-marker-recommendations"
+      header={props.header}
+      link={
+        <Link to={`/scenes/markers?${props.filter.makeQueryParameters()}`}>
+          <FormattedMessage id="view_all" />
+        </Link>
+      }
+    >
+      <Slider
+        {...getSlickSliderSettings(
+          cardCount ? cardCount : props.filter.itemsPerPage,
+          props.isTouch
+        )}
+      >
+        {result.loading
+          ? [...Array(props.filter.itemsPerPage)].map((i) => (
+              <div
+                key={`_${i}`}
+                className="scene-marker-skeleton skeleton-card"
+              ></div>
+            ))
+          : result.data?.findSceneMarkers.scene_markers.map((marker, index) => (
+              <SceneMarkerCard
+                key={marker.id}
+                marker={marker}
+                index={index}
+                zoomIndex={1}
+              />
+            ))}
+      </Slider>
+    </RecommendationRow>
+  );
+};
diff --git a/ui/v2.5/src/core/config.ts b/ui/v2.5/src/core/config.ts
index c1aa404f2..fcef8fef5 100644
--- a/ui/v2.5/src/core/config.ts
+++ b/ui/v2.5/src/core/config.ts
@@ -165,5 +165,6 @@ export function generatePremadeFrontPageContent(intl: IntlShape) {
     recentlyAdded(intl, FilterMode.Groups, "groups"),
     recentlyAdded(intl, FilterMode.Studios, "studios"),
     recentlyAdded(intl, FilterMode.Performers, "performers"),
+    recentlyAdded(intl, FilterMode.SceneMarkers, "markers"),
   ];
 }

From 1a9a62eae939e25bb71634d246216983ea535492 Mon Sep 17 00:00:00 2001
From: BigBangClock2 <220599702+BigBangClock2@users.noreply.github.com>
Date: Sun, 9 Nov 2025 23:49:40 +0000
Subject: [PATCH 117/405] Add sorting by performer age (#6009)

---
 pkg/sqlite/scene.go                      | 24 ++++++++++++++++++++++++
 pkg/sqlite/scene_test.go                 |  7 +++++++
 ui/v2.5/src/models/list-filter/scenes.ts |  1 +
 3 files changed, 32 insertions(+)

diff --git a/pkg/sqlite/scene.go b/pkg/sqlite/scene.go
index ccabbbcf6..6cc5aa339 100644
--- a/pkg/sqlite/scene.go
+++ b/pkg/sqlite/scene.go
@@ -1100,6 +1100,7 @@ var sceneSortOptions = sortOptions{
 	"tag_count",
 	"title",
 	"updated_at",
+	"performer_age",
 }
 
 func (qb *SceneStore) setSceneSort(query *queryBuilder, findFilter *models.FindFilterType) error {
@@ -1209,6 +1210,29 @@ func (qb *SceneStore) setSceneSort(query *queryBuilder, findFilter *models.FindF
 		query.sortAndPagination += fmt.Sprintf(" ORDER BY (SELECT MAX(o_date) FROM %s AS sort WHERE sort.%s = %s.id) %s", scenesODatesTable, sceneIDColumn, sceneTable, getSortDirection(direction))
 	case "o_counter":
 		query.sortAndPagination += getCountSort(sceneTable, scenesODatesTable, sceneIDColumn, direction)
+	case "performer_age":
+		// Looking at the youngest performer by default
+		aggregation := "MIN"
+		if direction == "DESC" {
+			// When sorting by performer_'s age DESC, I should consider the oldest performer instead
+			aggregation = "MAX"
+		}
+		fallback := "NULL"
+		if direction == "ASC" {
+			// When sorting ascending, NULLs are first by default. Coalescing to the MAX int value supported by sqlite
+			fallback = "9223372036854775807"
+		}
+		query.sortAndPagination += fmt.Sprintf(
+			" ORDER BY (SELECT COALESCE(%s(JulianDay(scenes.date) - JulianDay(performers.birthdate)), %s) FROM %s as performers INNER JOIN %s AS aggregation WHERE performers.id = aggregation.%s AND aggregation.%s = %s.id) %s",
+			aggregation,
+			fallback,
+			performerTable,
+			performersScenesTable,
+			performerIDColumn,
+			sceneIDColumn,
+			sceneTable,
+			getSortDirection(direction),
+		)
 	case "studio":
 		query.join(studioTable, "", "scenes.studio_id = studios.id")
 		query.sortAndPagination += getSort("name", direction, studioTable)
diff --git a/pkg/sqlite/scene_test.go b/pkg/sqlite/scene_test.go
index 410819a34..b39b47129 100644
--- a/pkg/sqlite/scene_test.go
+++ b/pkg/sqlite/scene_test.go
@@ -4131,6 +4131,13 @@ func TestSceneQuerySorting(t *testing.T) {
 			sceneIDs[sceneIdx1WithPerformer],
 			-1,
 		},
+		{
+			"performer_age",
+			"performer_age",
+			models.SortDirectionEnumDesc,
+			-1,
+			-1,
+		},
 	}
 
 	qb := db.Scene
diff --git a/ui/v2.5/src/models/list-filter/scenes.ts b/ui/v2.5/src/models/list-filter/scenes.ts
index d59f87d99..8bd3918f9 100644
--- a/ui/v2.5/src/models/list-filter/scenes.ts
+++ b/ui/v2.5/src/models/list-filter/scenes.ts
@@ -53,6 +53,7 @@ const sortByOptions = [
   "interactive",
   "interactive_speed",
   "perceptual_similarity",
+  "performer_age",
   "studio",
   ...MediaSortByOptions,
 ]

From a76e515112012ad8f60a784f77448500b938b68f Mon Sep 17 00:00:00 2001
From: Ian McKenzie <13459320+ikmckenz@users.noreply.github.com>
Date: Sun, 9 Nov 2025 16:11:53 -0800
Subject: [PATCH 118/405] Bump vite from 4.5.14 to 5.4.21 in /ui/v2.5 (#6229)

* Bump vite from 4.5.14 to 5.4.21 in /ui/v2.5

Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 4.5.14 to 5.4.21.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/v5.4.21/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v5.4.21/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-version: 5.4.21
  dependency-type: direct:development
- dependency-name: @vitejs/plugin-legacy
  dependency-version: 5.4.3
  dependency-type: direct:development
- dependency-name: @vitejs/plugin-react
  dependency-version: 5.1.0
  dependency-type: direct:development
...

* Update lock file

* Remove intersection-observer

Apparently not necessary any more. Resolves deprecation message

* Remove version from package file

---------

Co-authored-by: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
---
 ui/v2.5/package.json                          |   9 +-
 ui/v2.5/pnpm-lock.yaml                        | 530 +++++++++++++-----
 ui/v2.5/src/components/Groups/GroupSelect.tsx |   2 +-
 .../components/Performers/PerformerSelect.tsx |   2 +-
 .../src/components/Studios/StudioSelect.tsx   |   2 +-
 ui/v2.5/src/components/Tags/TagSelect.tsx     |   3 +-
 ui/v2.5/src/polyfills.ts                      |   6 -
 7 files changed, 386 insertions(+), 168 deletions(-)

diff --git a/ui/v2.5/package.json b/ui/v2.5/package.json
index 433424258..0971dbc3a 100644
--- a/ui/v2.5/package.json
+++ b/ui/v2.5/package.json
@@ -1,8 +1,8 @@
 {
   "name": "stash",
-  "version": "0.1.0",
   "private": true,
   "homepage": "./",
+  "type": "module",
   "scripts": {
     "start": "vite",
     "build": "vite build",
@@ -49,7 +49,6 @@
     "graphql-tag": "^2.12.6",
     "graphql-ws": "^5.14.3",
     "i18n-iso-countries": "^7.5.0",
-    "intersection-observer": "^0.12.2",
     "localforage": "^1.10.0",
     "lodash-es": "^4.17.21",
     "moment": "^2.30.1",
@@ -109,8 +108,8 @@
     "@types/videojs-seek-buttons": "^2.1.0",
     "@typescript-eslint/eslint-plugin": "^5.52.0",
     "@typescript-eslint/parser": "^5.52.0",
-    "@vitejs/plugin-legacy": "^4.0.1",
-    "@vitejs/plugin-react": "^3.1.0",
+    "@vitejs/plugin-legacy": "^5.4.3",
+    "@vitejs/plugin-react": "^5.1.0",
     "eslint": "^8.34.0",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-config-airbnb-typescript": "^17.0.0",
@@ -129,7 +128,7 @@
     "terser": "^5.9.0",
     "ts-node": "^10.9.1",
     "typescript": "~4.8.4",
-    "vite": "^4.5.14",
+    "vite": "^5.4.21",
     "vite-plugin-compression": "^0.5.1",
     "vite-tsconfig-paths": "^4.0.5"
   }
diff --git a/ui/v2.5/pnpm-lock.yaml b/ui/v2.5/pnpm-lock.yaml
index 99339ee55..2791682ef 100644
--- a/ui/v2.5/pnpm-lock.yaml
+++ b/ui/v2.5/pnpm-lock.yaml
@@ -92,9 +92,6 @@ importers:
       i18n-iso-countries:
         specifier: ^7.5.0
         version: 7.14.0
-      intersection-observer:
-        specifier: ^0.12.2
-        version: 0.12.2
       localforage:
         specifier: ^1.10.0
         version: 1.10.0
@@ -268,11 +265,11 @@ importers:
         specifier: ^5.52.0
         version: 5.62.0(eslint@8.57.1)(typescript@4.8.4)
       '@vitejs/plugin-legacy':
-        specifier: ^4.0.1
-        version: 4.1.1(terser@5.44.0)(vite@4.5.14(@types/node@18.19.130)(sass@1.93.2)(terser@5.44.0))
+        specifier: ^5.4.3
+        version: 5.4.3(terser@5.44.0)(vite@5.4.21(@types/node@18.19.130)(sass@1.93.2)(terser@5.44.0))
       '@vitejs/plugin-react':
-        specifier: ^3.1.0
-        version: 3.1.0(vite@4.5.14(@types/node@18.19.130)(sass@1.93.2)(terser@5.44.0))
+        specifier: ^5.1.0
+        version: 5.1.0(vite@5.4.21(@types/node@18.19.130)(sass@1.93.2)(terser@5.44.0))
       eslint:
         specifier: ^8.34.0
         version: 8.57.1
@@ -328,14 +325,14 @@ importers:
         specifier: ~4.8.4
         version: 4.8.4
       vite:
-        specifier: ^4.5.14
-        version: 4.5.14(@types/node@18.19.130)(sass@1.93.2)(terser@5.44.0)
+        specifier: ^5.4.21
+        version: 5.4.21(@types/node@18.19.130)(sass@1.93.2)(terser@5.44.0)
       vite-plugin-compression:
         specifier: ^0.5.1
-        version: 0.5.1(vite@4.5.14(@types/node@18.19.130)(sass@1.93.2)(terser@5.44.0))
+        version: 0.5.1(vite@5.4.21(@types/node@18.19.130)(sass@1.93.2)(terser@5.44.0))
       vite-tsconfig-paths:
         specifier: ^4.0.5
-        version: 4.3.2(typescript@4.8.4)(vite@4.5.14(@types/node@18.19.130)(sass@1.93.2)(terser@5.44.0))
+        version: 4.3.2(typescript@4.8.4)(vite@5.4.21(@types/node@18.19.130)(sass@1.93.2)(terser@5.44.0))
 
 packages:
 
@@ -1015,134 +1012,140 @@ packages:
     resolution: {integrity: sha512-CsFmA3u3c2QoLDTfEpGr4t25fjMU31nyvse7IzWTvb0ZycuPjMjb0fjlheh+PbhBYb9YLugnT2uY6Mwcg1o+Zg==}
     engines: {node: '>=18.0.0'}
 
-  '@esbuild/android-arm64@0.18.20':
-    resolution: {integrity: sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==}
+  '@esbuild/aix-ppc64@0.21.5':
+    resolution: {integrity: sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==}
+    engines: {node: '>=12'}
+    cpu: [ppc64]
+    os: [aix]
+
+  '@esbuild/android-arm64@0.21.5':
+    resolution: {integrity: sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [android]
 
-  '@esbuild/android-arm@0.18.20':
-    resolution: {integrity: sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==}
+  '@esbuild/android-arm@0.21.5':
+    resolution: {integrity: sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==}
     engines: {node: '>=12'}
     cpu: [arm]
     os: [android]
 
-  '@esbuild/android-x64@0.18.20':
-    resolution: {integrity: sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==}
+  '@esbuild/android-x64@0.21.5':
+    resolution: {integrity: sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [android]
 
-  '@esbuild/darwin-arm64@0.18.20':
-    resolution: {integrity: sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==}
+  '@esbuild/darwin-arm64@0.21.5':
+    resolution: {integrity: sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [darwin]
 
-  '@esbuild/darwin-x64@0.18.20':
-    resolution: {integrity: sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==}
+  '@esbuild/darwin-x64@0.21.5':
+    resolution: {integrity: sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [darwin]
 
-  '@esbuild/freebsd-arm64@0.18.20':
-    resolution: {integrity: sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==}
+  '@esbuild/freebsd-arm64@0.21.5':
+    resolution: {integrity: sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [freebsd]
 
-  '@esbuild/freebsd-x64@0.18.20':
-    resolution: {integrity: sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==}
+  '@esbuild/freebsd-x64@0.21.5':
+    resolution: {integrity: sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [freebsd]
 
-  '@esbuild/linux-arm64@0.18.20':
-    resolution: {integrity: sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==}
+  '@esbuild/linux-arm64@0.21.5':
+    resolution: {integrity: sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [linux]
 
-  '@esbuild/linux-arm@0.18.20':
-    resolution: {integrity: sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==}
+  '@esbuild/linux-arm@0.21.5':
+    resolution: {integrity: sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==}
     engines: {node: '>=12'}
     cpu: [arm]
     os: [linux]
 
-  '@esbuild/linux-ia32@0.18.20':
-    resolution: {integrity: sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==}
+  '@esbuild/linux-ia32@0.21.5':
+    resolution: {integrity: sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==}
     engines: {node: '>=12'}
     cpu: [ia32]
     os: [linux]
 
-  '@esbuild/linux-loong64@0.18.20':
-    resolution: {integrity: sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==}
+  '@esbuild/linux-loong64@0.21.5':
+    resolution: {integrity: sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==}
     engines: {node: '>=12'}
     cpu: [loong64]
     os: [linux]
 
-  '@esbuild/linux-mips64el@0.18.20':
-    resolution: {integrity: sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==}
+  '@esbuild/linux-mips64el@0.21.5':
+    resolution: {integrity: sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==}
     engines: {node: '>=12'}
     cpu: [mips64el]
     os: [linux]
 
-  '@esbuild/linux-ppc64@0.18.20':
-    resolution: {integrity: sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==}
+  '@esbuild/linux-ppc64@0.21.5':
+    resolution: {integrity: sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==}
     engines: {node: '>=12'}
     cpu: [ppc64]
     os: [linux]
 
-  '@esbuild/linux-riscv64@0.18.20':
-    resolution: {integrity: sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==}
+  '@esbuild/linux-riscv64@0.21.5':
+    resolution: {integrity: sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==}
     engines: {node: '>=12'}
     cpu: [riscv64]
     os: [linux]
 
-  '@esbuild/linux-s390x@0.18.20':
-    resolution: {integrity: sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==}
+  '@esbuild/linux-s390x@0.21.5':
+    resolution: {integrity: sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==}
     engines: {node: '>=12'}
     cpu: [s390x]
     os: [linux]
 
-  '@esbuild/linux-x64@0.18.20':
-    resolution: {integrity: sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==}
+  '@esbuild/linux-x64@0.21.5':
+    resolution: {integrity: sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [linux]
 
-  '@esbuild/netbsd-x64@0.18.20':
-    resolution: {integrity: sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==}
+  '@esbuild/netbsd-x64@0.21.5':
+    resolution: {integrity: sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [netbsd]
 
-  '@esbuild/openbsd-x64@0.18.20':
-    resolution: {integrity: sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==}
+  '@esbuild/openbsd-x64@0.21.5':
+    resolution: {integrity: sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [openbsd]
 
-  '@esbuild/sunos-x64@0.18.20':
-    resolution: {integrity: sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==}
+  '@esbuild/sunos-x64@0.21.5':
+    resolution: {integrity: sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [sunos]
 
-  '@esbuild/win32-arm64@0.18.20':
-    resolution: {integrity: sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==}
+  '@esbuild/win32-arm64@0.21.5':
+    resolution: {integrity: sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [win32]
 
-  '@esbuild/win32-ia32@0.18.20':
-    resolution: {integrity: sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==}
+  '@esbuild/win32-ia32@0.21.5':
+    resolution: {integrity: sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==}
     engines: {node: '>=12'}
     cpu: [ia32]
     os: [win32]
 
-  '@esbuild/win32-x64@0.18.20':
-    resolution: {integrity: sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==}
+  '@esbuild/win32-x64@0.21.5':
+    resolution: {integrity: sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [win32]
@@ -1736,6 +1739,119 @@ packages:
     peerDependencies:
       react: '>=16.8.0'
 
+  '@rolldown/pluginutils@1.0.0-beta.43':
+    resolution: {integrity: sha512-5Uxg7fQUCmfhax7FJke2+8B6cqgeUJUD9o2uXIKXhD+mG0mL6NObmVoi9wXEU1tY89mZKgAYA6fTbftx3q2ZPQ==}
+
+  '@rollup/rollup-android-arm-eabi@4.53.1':
+    resolution: {integrity: sha512-bxZtughE4VNVJlL1RdoSE545kc4JxL7op57KKoi59/gwuU5rV6jLWFXXc8jwgFoT6vtj+ZjO+Z2C5nrY0Cl6wA==}
+    cpu: [arm]
+    os: [android]
+
+  '@rollup/rollup-android-arm64@4.53.1':
+    resolution: {integrity: sha512-44a1hreb02cAAfAKmZfXVercPFaDjqXCK+iKeVOlJ9ltvnO6QqsBHgKVPTu+MJHSLLeMEUbeG2qiDYgbFPU48g==}
+    cpu: [arm64]
+    os: [android]
+
+  '@rollup/rollup-darwin-arm64@4.53.1':
+    resolution: {integrity: sha512-usmzIgD0rf1syoOZ2WZvy8YpXK5G1V3btm3QZddoGSa6mOgfXWkkv+642bfUUldomgrbiLQGrPryb7DXLovPWQ==}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@rollup/rollup-darwin-x64@4.53.1':
+    resolution: {integrity: sha512-is3r/k4vig2Gt8mKtTlzzyaSQ+hd87kDxiN3uDSDwggJLUV56Umli6OoL+/YZa/KvtdrdyNfMKHzL/P4siOOmg==}
+    cpu: [x64]
+    os: [darwin]
+
+  '@rollup/rollup-freebsd-arm64@4.53.1':
+    resolution: {integrity: sha512-QJ1ksgp/bDJkZB4daldVmHaEQkG4r8PUXitCOC2WRmRaSaHx5RwPoI3DHVfXKwDkB+Sk6auFI/+JHacTekPRSw==}
+    cpu: [arm64]
+    os: [freebsd]
+
+  '@rollup/rollup-freebsd-x64@4.53.1':
+    resolution: {integrity: sha512-J6ma5xgAzvqsnU6a0+jgGX/gvoGokqpkx6zY4cWizRrm0ffhHDpJKQgC8dtDb3+MqfZDIqs64REbfHDMzxLMqQ==}
+    cpu: [x64]
+    os: [freebsd]
+
+  '@rollup/rollup-linux-arm-gnueabihf@4.53.1':
+    resolution: {integrity: sha512-JzWRR41o2U3/KMNKRuZNsDUAcAVUYhsPuMlx5RUldw0E4lvSIXFUwejtYz1HJXohUmqs/M6BBJAUBzKXZVddbg==}
+    cpu: [arm]
+    os: [linux]
+
+  '@rollup/rollup-linux-arm-musleabihf@4.53.1':
+    resolution: {integrity: sha512-L8kRIrnfMrEoHLHtHn+4uYA52fiLDEDyezgxZtGUTiII/yb04Krq+vk3P2Try+Vya9LeCE9ZHU8CXD6J9EhzHQ==}
+    cpu: [arm]
+    os: [linux]
+
+  '@rollup/rollup-linux-arm64-gnu@4.53.1':
+    resolution: {integrity: sha512-ysAc0MFRV+WtQ8li8hi3EoFi7us6d1UzaS/+Dp7FYZfg3NdDljGMoVyiIp6Ucz7uhlYDBZ/zt6XI0YEZbUO11Q==}
+    cpu: [arm64]
+    os: [linux]
+
+  '@rollup/rollup-linux-arm64-musl@4.53.1':
+    resolution: {integrity: sha512-UV6l9MJpDbDZZ/fJvqNcvO1PcivGEf1AvKuTcHoLjVZVFeAMygnamCTDikCVMRnA+qJe+B3pSbgX2+lBMqgBhA==}
+    cpu: [arm64]
+    os: [linux]
+
+  '@rollup/rollup-linux-loong64-gnu@4.53.1':
+    resolution: {integrity: sha512-UDUtelEprkA85g95Q+nj3Xf0M4hHa4DiJ+3P3h4BuGliY4NReYYqwlc0Y8ICLjN4+uIgCEvaygYlpf0hUj90Yg==}
+    cpu: [loong64]
+    os: [linux]
+
+  '@rollup/rollup-linux-ppc64-gnu@4.53.1':
+    resolution: {integrity: sha512-vrRn+BYhEtNOte/zbc2wAUQReJXxEx2URfTol6OEfY2zFEUK92pkFBSXRylDM7aHi+YqEPJt9/ABYzmcrS4SgQ==}
+    cpu: [ppc64]
+    os: [linux]
+
+  '@rollup/rollup-linux-riscv64-gnu@4.53.1':
+    resolution: {integrity: sha512-gto/1CxHyi4A7YqZZNznQYrVlPSaodOBPKM+6xcDSCMVZN/Fzb4K+AIkNz/1yAYz9h3Ng+e2fY9H6bgawVq17w==}
+    cpu: [riscv64]
+    os: [linux]
+
+  '@rollup/rollup-linux-riscv64-musl@4.53.1':
+    resolution: {integrity: sha512-KZ6Vx7jAw3aLNjFR8eYVcQVdFa/cvBzDNRFM3z7XhNNunWjA03eUrEwJYPk0G8V7Gs08IThFKcAPS4WY/ybIrQ==}
+    cpu: [riscv64]
+    os: [linux]
+
+  '@rollup/rollup-linux-s390x-gnu@4.53.1':
+    resolution: {integrity: sha512-HvEixy2s/rWNgpwyKpXJcHmE7om1M89hxBTBi9Fs6zVuLU4gOrEMQNbNsN/tBVIMbLyysz/iwNiGtMOpLAOlvA==}
+    cpu: [s390x]
+    os: [linux]
+
+  '@rollup/rollup-linux-x64-gnu@4.53.1':
+    resolution: {integrity: sha512-E/n8x2MSjAQgjj9IixO4UeEUeqXLtiA7pyoXCFYLuXpBA/t2hnbIdxHfA7kK9BFsYAoNU4st1rHYdldl8dTqGA==}
+    cpu: [x64]
+    os: [linux]
+
+  '@rollup/rollup-linux-x64-musl@4.53.1':
+    resolution: {integrity: sha512-IhJ087PbLOQXCN6Ui/3FUkI9pWNZe/Z7rEIVOzMsOs1/HSAECCvSZ7PkIbkNqL/AZn6WbZvnoVZw/qwqYMo4/w==}
+    cpu: [x64]
+    os: [linux]
+
+  '@rollup/rollup-openharmony-arm64@4.53.1':
+    resolution: {integrity: sha512-0++oPNgLJHBblreu0SFM7b3mAsBJBTY0Ksrmu9N6ZVrPiTkRgda52mWR7TKhHAsUb9noCjFvAw9l6ZO1yzaVbA==}
+    cpu: [arm64]
+    os: [openharmony]
+
+  '@rollup/rollup-win32-arm64-msvc@4.53.1':
+    resolution: {integrity: sha512-VJXivz61c5uVdbmitLkDlbcTk9Or43YC2QVLRkqp86QoeFSqI81bNgjhttqhKNMKnQMWnecOCm7lZz4s+WLGpQ==}
+    cpu: [arm64]
+    os: [win32]
+
+  '@rollup/rollup-win32-ia32-msvc@4.53.1':
+    resolution: {integrity: sha512-NmZPVTUOitCXUH6erJDzTQ/jotYw4CnkMDjCYRxNHVD9bNyfrGoIse684F9okwzKCV4AIHRbUkeTBc9F2OOH5Q==}
+    cpu: [ia32]
+    os: [win32]
+
+  '@rollup/rollup-win32-x64-gnu@4.53.1':
+    resolution: {integrity: sha512-2SNj7COIdAf6yliSpLdLG8BEsp5lgzRehgfkP0Av8zKfQFKku6JcvbobvHASPJu4f3BFxej5g+HuQPvqPhHvpQ==}
+    cpu: [x64]
+    os: [win32]
+
+  '@rollup/rollup-win32-x64-msvc@4.53.1':
+    resolution: {integrity: sha512-rLarc1Ofcs3DHtgSzFO31pZsCh8g05R2azN1q3fF+H423Co87My0R+tazOEvYVKXSLh8C4LerMK41/K7wlklcg==}
+    cpu: [x64]
+    os: [win32]
+
   '@rtsao/scc@1.1.0':
     resolution: {integrity: sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==}
 
@@ -1791,6 +1907,9 @@ packages:
   '@types/crypto-js@4.2.2':
     resolution: {integrity: sha512-sDOLlVbHhXpAUAL0YHDUUwDZf3iN4Bwi4W6a0W0b+QcAezUbRtH4FVb+9J4h+XFPW7l/gQ9F8qC7P+Ec4k8QVQ==}
 
+  '@types/estree@1.0.8':
+    resolution: {integrity: sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==}
+
   '@types/extract-files@13.0.2':
     resolution: {integrity: sha512-4sd7uDB0OVZmwH2wD6w7Qlpr2P5Pn8C9IGwnaq9aiiBDD3Lou7CwFjjkJTDYCDsEvk9zxAtmv9TaMg1lt/YJfA==}
 
@@ -1989,18 +2108,18 @@ packages:
   '@videojs/xhr@2.6.0':
     resolution: {integrity: sha512-7J361GiN1tXpm+gd0xz2QWr3xNWBE+rytvo8J3KuggFaLg+U37gZQ2BuPLcnkfGffy2e+ozY70RHC8jt7zjA6Q==}
 
-  '@vitejs/plugin-legacy@4.1.1':
-    resolution: {integrity: sha512-um3gbVouD2Q/g19C0qpDfHwveXDCAHzs8OC3e9g6aXpKoD1H14himgs7wkMnhAynBJy7QqUoZNAXDuqN8zLR2g==}
-    engines: {node: ^14.18.0 || >=16.0.0}
+  '@vitejs/plugin-legacy@5.4.3':
+    resolution: {integrity: sha512-wsyXK9mascyplcqvww1gA1xYiy29iRHfyciw+a0t7qRNdzX6PdfSWmOoCi74epr87DujM+5J+rnnSv+4PazqVg==}
+    engines: {node: ^18.0.0 || >=20.0.0}
     peerDependencies:
       terser: ^5.4.0
-      vite: ^4.0.0
+      vite: ^5.0.0
 
-  '@vitejs/plugin-react@3.1.0':
-    resolution: {integrity: sha512-AfgcRL8ZBhAlc3BFdigClmTUMISmmzHn7sB2h9U1odvc5U/MjWXsAaz18b/WoppUTDBzxOJwo2VdClfUcItu9g==}
-    engines: {node: ^14.18.0 || >=16.0.0}
+  '@vitejs/plugin-react@5.1.0':
+    resolution: {integrity: sha512-4LuWrg7EKWgQaMJfnN+wcmbAW+VSsCmqGohftWjuct47bv8uE4n/nPpq4XjJPsxgq00GGG5J8dvBczp8uxScew==}
+    engines: {node: ^20.19.0 || >=22.12.0}
     peerDependencies:
-      vite: ^4.1.0-beta.0
+      vite: ^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0
 
   '@whatwg-node/disposablestack@0.0.6':
     resolution: {integrity: sha512-LOtTn+JgJvX8WfBVJtF08TGrdjuFzGJc4mkP8EdDI8ADbvO7kiexYep1o8dwnt0okb0jYclCDXF13xU7Ge4zSw==}
@@ -2261,6 +2380,13 @@ packages:
     resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==}
     engines: {node: '>=8'}
 
+  browserslist-to-esbuild@2.1.1:
+    resolution: {integrity: sha512-KN+mty6C3e9AN8Z5dI1xeN15ExcRNeISoC3g7V0Kax/MMF9MSoYA2G7lkTTcVUFntiEjkpI0HNgqJC1NjdyNUw==}
+    engines: {node: '>=18'}
+    hasBin: true
+    peerDependencies:
+      browserslist: '*'
+
   browserslist@4.26.3:
     resolution: {integrity: sha512-lAUU+02RFBuCKQPj/P6NgjlbCnLBMp4UtgTx7vNHd3XSIJF87s9a5rA3aH2yw3GS9DqZAUbOtZdCCiZeVRqt0w==}
     engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
@@ -2674,8 +2800,8 @@ packages:
   es6-promise@4.2.8:
     resolution: {integrity: sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==}
 
-  esbuild@0.18.20:
-    resolution: {integrity: sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==}
+  esbuild@0.21.5:
+    resolution: {integrity: sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==}
     engines: {node: '>=12'}
     hasBin: true
 
@@ -3230,10 +3356,6 @@ packages:
     resolution: {integrity: sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==}
     engines: {node: '>= 0.4'}
 
-  intersection-observer@0.12.2:
-    resolution: {integrity: sha512-7m1vEcPCxXYI8HqnL8CKI6siDyD+eIWSwgB3DZA+ZTogxk9I4CDnj4wilt9x/+/QbHI4YG5YZNmC6458/e9Ktg==}
-    deprecated: The Intersection Observer polyfill is no longer needed and can safely be removed. Intersection Observer has been Baseline since 2019.
-
   intl-messageformat-parser@5.5.1:
     resolution: {integrity: sha512-TvB3LqF2VtP6yI6HXlRT5TxX98HKha6hCcrg9dwlPwNaedVNuQA9KgBdtWKgiyakyCTYHQ+KJeFEstNKfZr64w==}
     deprecated: We've written a new parser that's 6x faster and is backwards compatible. Please use @formatjs/icu-messageformat-parser
@@ -3626,10 +3748,6 @@ packages:
   m3u8-parser@4.8.0:
     resolution: {integrity: sha512-UqA2a/Pw3liR6Df3gwxrqghCP17OpPlQj6RBPLYygf/ZSQ4MoSgvdvhvt35qV+3NaaA0FSZx93Ix+2brT1U7cA==}
 
-  magic-string@0.27.0:
-    resolution: {integrity: sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==}
-    engines: {node: '>=12'}
-
   magic-string@0.30.19:
     resolution: {integrity: sha512-2N21sPY9Ws53PZvsEpVtNuSW+ScYbQdp4b9qUaL+9QkHUrGFKo56Lg9Emg5s9V/qrtNBmiR01sYhUOwu3H+VOw==}
 
@@ -3708,6 +3826,10 @@ packages:
     resolution: {integrity: sha512-/d+PQ4GKmGvM9Bee/DPa8z3mXs/pkvJE2KEThngVNOqtmljC6K7NMPxtc2JeZYTmpWb9k/TmxjeL18ez3h7vCw==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
 
+  meow@13.2.0:
+    resolution: {integrity: sha512-pxQJQzB6djGPXh08dacEloMFopsOqGVRKFPYvPOt9XDZ1HasbgDZA74CJGreSU4G3Ak7EFJGoiH2auq+yXISgA==}
+    engines: {node: '>=18'}
+
   meow@6.1.1:
     resolution: {integrity: sha512-3YffViIt2QWgTy6Pale5QpopX/IvU3LPL03jOTqp6pGj3VjesdO/U8CuHMKpnQr4shCNCM5fd5XFFvIIl6JBHg==}
     engines: {node: '>=8'}
@@ -4178,8 +4300,8 @@ packages:
       react: ^16.8.0 || ^17 || ^18
       react-dom: ^16.8.0 || ^17 || ^18
 
-  react-refresh@0.14.2:
-    resolution: {integrity: sha512-jCvmsr+1IUSMUyzOkRcvnVbX3ZYC6g9TDrDbFuFmRDq7PD4yaGbLKNQL6k2jnArV8hjYxh7hVhAZB6s9HDGpZA==}
+  react-refresh@0.18.0:
+    resolution: {integrity: sha512-QgT5//D3jfjJb6Gsjxv0Slpj23ip+HtOpnNgnb2S5zU3CB26G/IDPGoy4RJB42wzFE46DRsstbW6tKHoKbhAxw==}
     engines: {node: '>=0.10.0'}
 
   react-remark@2.1.0:
@@ -4278,8 +4400,8 @@ packages:
   regenerate@1.4.2:
     resolution: {integrity: sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==}
 
-  regenerator-runtime@0.13.11:
-    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+  regenerator-runtime@0.14.1:
+    resolution: {integrity: sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==}
 
   regexp.prototype.flags@1.5.4:
     resolution: {integrity: sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==}
@@ -4385,9 +4507,9 @@ packages:
     deprecated: Rimraf versions prior to v4 are no longer supported
     hasBin: true
 
-  rollup@3.29.5:
-    resolution: {integrity: sha512-GVsDdsbJzzy4S/v3dqWPJ7EfvZJfCHiDqe80IyrF59LYuP+e6U1LJoUqeuqRbwAWoMNoXivMNeNAOf5E22VA1w==}
-    engines: {node: '>=14.18.0', npm: '>=8.0.0'}
+  rollup@4.53.1:
+    resolution: {integrity: sha512-n2I0V0lN3E9cxxMqBCT3opWOiQBzRN7UG60z/WDKqdX2zHUS/39lezBcsckZFsV6fUTSnfqI7kHf60jDAPGKug==}
+    engines: {node: '>=18.0.0', npm: '>=8.0.0'}
     hasBin: true
 
   run-async@2.4.1:
@@ -5031,15 +5153,16 @@ packages:
       vite:
         optional: true
 
-  vite@4.5.14:
-    resolution: {integrity: sha512-+v57oAaoYNnO3hIu5Z/tJRZjq5aHM2zDve9YZ8HngVHbhk66RStobhb1sqPMIPEleV6cNKYK4eGrAbE9Ulbl2g==}
-    engines: {node: ^14.18.0 || >=16.0.0}
+  vite@5.4.21:
+    resolution: {integrity: sha512-o5a9xKjbtuhY6Bi5S3+HvbRERmouabWbyUcpXXUA1u+GNUKoROi9byOJ8M0nHbHYHkYICiMlqxkg1KkYmm25Sw==}
+    engines: {node: ^18.0.0 || >=20.0.0}
     hasBin: true
     peerDependencies:
-      '@types/node': '>= 14'
+      '@types/node': ^18.0.0 || >=20.0.0
       less: '*'
       lightningcss: ^1.21.0
       sass: '*'
+      sass-embedded: '*'
       stylus: '*'
       sugarss: '*'
       terser: ^5.4.0
@@ -5052,6 +5175,8 @@ packages:
         optional: true
       sass:
         optional: true
+      sass-embedded:
+        optional: true
       stylus:
         optional: true
       sugarss:
@@ -6124,70 +6249,73 @@ snapshots:
       '@whatwg-node/promise-helpers': 1.3.2
       tslib: 2.8.1
 
-  '@esbuild/android-arm64@0.18.20':
+  '@esbuild/aix-ppc64@0.21.5':
     optional: true
 
-  '@esbuild/android-arm@0.18.20':
+  '@esbuild/android-arm64@0.21.5':
     optional: true
 
-  '@esbuild/android-x64@0.18.20':
+  '@esbuild/android-arm@0.21.5':
     optional: true
 
-  '@esbuild/darwin-arm64@0.18.20':
+  '@esbuild/android-x64@0.21.5':
     optional: true
 
-  '@esbuild/darwin-x64@0.18.20':
+  '@esbuild/darwin-arm64@0.21.5':
     optional: true
 
-  '@esbuild/freebsd-arm64@0.18.20':
+  '@esbuild/darwin-x64@0.21.5':
     optional: true
 
-  '@esbuild/freebsd-x64@0.18.20':
+  '@esbuild/freebsd-arm64@0.21.5':
     optional: true
 
-  '@esbuild/linux-arm64@0.18.20':
+  '@esbuild/freebsd-x64@0.21.5':
     optional: true
 
-  '@esbuild/linux-arm@0.18.20':
+  '@esbuild/linux-arm64@0.21.5':
     optional: true
 
-  '@esbuild/linux-ia32@0.18.20':
+  '@esbuild/linux-arm@0.21.5':
     optional: true
 
-  '@esbuild/linux-loong64@0.18.20':
+  '@esbuild/linux-ia32@0.21.5':
     optional: true
 
-  '@esbuild/linux-mips64el@0.18.20':
+  '@esbuild/linux-loong64@0.21.5':
     optional: true
 
-  '@esbuild/linux-ppc64@0.18.20':
+  '@esbuild/linux-mips64el@0.21.5':
     optional: true
 
-  '@esbuild/linux-riscv64@0.18.20':
+  '@esbuild/linux-ppc64@0.21.5':
     optional: true
 
-  '@esbuild/linux-s390x@0.18.20':
+  '@esbuild/linux-riscv64@0.21.5':
     optional: true
 
-  '@esbuild/linux-x64@0.18.20':
+  '@esbuild/linux-s390x@0.21.5':
     optional: true
 
-  '@esbuild/netbsd-x64@0.18.20':
+  '@esbuild/linux-x64@0.21.5':
     optional: true
 
-  '@esbuild/openbsd-x64@0.18.20':
+  '@esbuild/netbsd-x64@0.21.5':
     optional: true
 
-  '@esbuild/sunos-x64@0.18.20':
+  '@esbuild/openbsd-x64@0.21.5':
     optional: true
 
-  '@esbuild/win32-arm64@0.18.20':
+  '@esbuild/sunos-x64@0.21.5':
     optional: true
 
-  '@esbuild/win32-ia32@0.18.20':
+  '@esbuild/win32-arm64@0.21.5':
     optional: true
 
-  '@esbuild/win32-x64@0.18.20':
+  '@esbuild/win32-ia32@0.21.5':
+    optional: true
+
+  '@esbuild/win32-x64@0.21.5':
     optional: true
 
   '@eslint-community/eslint-utils@4.9.0(eslint@8.57.1)':
@@ -7051,6 +7179,74 @@ snapshots:
       dequal: 2.0.3
       react: 17.0.2
 
+  '@rolldown/pluginutils@1.0.0-beta.43': {}
+
+  '@rollup/rollup-android-arm-eabi@4.53.1':
+    optional: true
+
+  '@rollup/rollup-android-arm64@4.53.1':
+    optional: true
+
+  '@rollup/rollup-darwin-arm64@4.53.1':
+    optional: true
+
+  '@rollup/rollup-darwin-x64@4.53.1':
+    optional: true
+
+  '@rollup/rollup-freebsd-arm64@4.53.1':
+    optional: true
+
+  '@rollup/rollup-freebsd-x64@4.53.1':
+    optional: true
+
+  '@rollup/rollup-linux-arm-gnueabihf@4.53.1':
+    optional: true
+
+  '@rollup/rollup-linux-arm-musleabihf@4.53.1':
+    optional: true
+
+  '@rollup/rollup-linux-arm64-gnu@4.53.1':
+    optional: true
+
+  '@rollup/rollup-linux-arm64-musl@4.53.1':
+    optional: true
+
+  '@rollup/rollup-linux-loong64-gnu@4.53.1':
+    optional: true
+
+  '@rollup/rollup-linux-ppc64-gnu@4.53.1':
+    optional: true
+
+  '@rollup/rollup-linux-riscv64-gnu@4.53.1':
+    optional: true
+
+  '@rollup/rollup-linux-riscv64-musl@4.53.1':
+    optional: true
+
+  '@rollup/rollup-linux-s390x-gnu@4.53.1':
+    optional: true
+
+  '@rollup/rollup-linux-x64-gnu@4.53.1':
+    optional: true
+
+  '@rollup/rollup-linux-x64-musl@4.53.1':
+    optional: true
+
+  '@rollup/rollup-openharmony-arm64@4.53.1':
+    optional: true
+
+  '@rollup/rollup-win32-arm64-msvc@4.53.1':
+    optional: true
+
+  '@rollup/rollup-win32-ia32-msvc@4.53.1':
+    optional: true
+
+  '@rollup/rollup-win32-x64-gnu@4.53.1':
+    optional: true
+
+  '@rollup/rollup-win32-x64-msvc@4.53.1':
+    optional: true
+
   '@rtsao/scc@1.1.0': {}
 
   '@silvermine/videojs-airplay@1.3.0(video.js@7.21.7)':
@@ -7119,6 +7315,8 @@ snapshots:
 
   '@types/crypto-js@4.2.2': {}
 
+  '@types/estree@1.0.8': {}
+
   '@types/extract-files@13.0.2': {}
 
   '@types/fs-extra@9.0.13':
@@ -7364,28 +7562,30 @@ snapshots:
       global: 4.4.0
       is-function: 1.0.2
 
-  '@vitejs/plugin-legacy@4.1.1(terser@5.44.0)(vite@4.5.14(@types/node@18.19.130)(sass@1.93.2)(terser@5.44.0))':
+  '@vitejs/plugin-legacy@5.4.3(terser@5.44.0)(vite@5.4.21(@types/node@18.19.130)(sass@1.93.2)(terser@5.44.0))':
     dependencies:
       '@babel/core': 7.28.4
       '@babel/preset-env': 7.28.3(@babel/core@7.28.4)
       browserslist: 4.26.3
+      browserslist-to-esbuild: 2.1.1(browserslist@4.26.3)
       core-js: 3.46.0
       magic-string: 0.30.19
-      regenerator-runtime: 0.13.11
+      regenerator-runtime: 0.14.1
       systemjs: 6.15.1
       terser: 5.44.0
-      vite: 4.5.14(@types/node@18.19.130)(sass@1.93.2)(terser@5.44.0)
+      vite: 5.4.21(@types/node@18.19.130)(sass@1.93.2)(terser@5.44.0)
     transitivePeerDependencies:
       - supports-color
 
-  '@vitejs/plugin-react@3.1.0(vite@4.5.14(@types/node@18.19.130)(sass@1.93.2)(terser@5.44.0))':
+  '@vitejs/plugin-react@5.1.0(vite@5.4.21(@types/node@18.19.130)(sass@1.93.2)(terser@5.44.0))':
     dependencies:
       '@babel/core': 7.28.4
       '@babel/plugin-transform-react-jsx-self': 7.27.1(@babel/core@7.28.4)
       '@babel/plugin-transform-react-jsx-source': 7.27.1(@babel/core@7.28.4)
-      magic-string: 0.27.0
-      react-refresh: 0.14.2
-      vite: 4.5.14(@types/node@18.19.130)(sass@1.93.2)(terser@5.44.0)
+      '@rolldown/pluginutils': 1.0.0-beta.43
+      '@types/babel__core': 7.20.5
+      react-refresh: 0.18.0
+      vite: 5.4.21(@types/node@18.19.130)(sass@1.93.2)(terser@5.44.0)
     transitivePeerDependencies:
       - supports-color
 
@@ -7721,6 +7921,11 @@ snapshots:
     dependencies:
       fill-range: 7.1.1
 
+  browserslist-to-esbuild@2.1.1(browserslist@4.26.3):
+    dependencies:
+      browserslist: 4.26.3
+      meow: 13.2.0
+
   browserslist@4.26.3:
     dependencies:
       baseline-browser-mapping: 2.8.19
@@ -8207,30 +8412,31 @@ snapshots:
 
   es6-promise@4.2.8: {}
 
-  esbuild@0.18.20:
+  esbuild@0.21.5:
     optionalDependencies:
-      '@esbuild/android-arm': 0.18.20
-      '@esbuild/android-arm64': 0.18.20
-      '@esbuild/android-x64': 0.18.20
-      '@esbuild/darwin-arm64': 0.18.20
-      '@esbuild/darwin-x64': 0.18.20
-      '@esbuild/freebsd-arm64': 0.18.20
-      '@esbuild/freebsd-x64': 0.18.20
-      '@esbuild/linux-arm': 0.18.20
-      '@esbuild/linux-arm64': 0.18.20
-      '@esbuild/linux-ia32': 0.18.20
-      '@esbuild/linux-loong64': 0.18.20
-      '@esbuild/linux-mips64el': 0.18.20
-      '@esbuild/linux-ppc64': 0.18.20
-      '@esbuild/linux-riscv64': 0.18.20
-      '@esbuild/linux-s390x': 0.18.20
-      '@esbuild/linux-x64': 0.18.20
-      '@esbuild/netbsd-x64': 0.18.20
-      '@esbuild/openbsd-x64': 0.18.20
-      '@esbuild/sunos-x64': 0.18.20
-      '@esbuild/win32-arm64': 0.18.20
-      '@esbuild/win32-ia32': 0.18.20
-      '@esbuild/win32-x64': 0.18.20
+      '@esbuild/aix-ppc64': 0.21.5
+      '@esbuild/android-arm': 0.21.5
+      '@esbuild/android-arm64': 0.21.5
+      '@esbuild/android-x64': 0.21.5
+      '@esbuild/darwin-arm64': 0.21.5
+      '@esbuild/darwin-x64': 0.21.5
+      '@esbuild/freebsd-arm64': 0.21.5
+      '@esbuild/freebsd-x64': 0.21.5
+      '@esbuild/linux-arm': 0.21.5
+      '@esbuild/linux-arm64': 0.21.5
+      '@esbuild/linux-ia32': 0.21.5
+      '@esbuild/linux-loong64': 0.21.5
+      '@esbuild/linux-mips64el': 0.21.5
+      '@esbuild/linux-ppc64': 0.21.5
+      '@esbuild/linux-riscv64': 0.21.5
+      '@esbuild/linux-s390x': 0.21.5
+      '@esbuild/linux-x64': 0.21.5
+      '@esbuild/netbsd-x64': 0.21.5
+      '@esbuild/openbsd-x64': 0.21.5
+      '@esbuild/sunos-x64': 0.21.5
+      '@esbuild/win32-arm64': 0.21.5
+      '@esbuild/win32-ia32': 0.21.5
+      '@esbuild/win32-x64': 0.21.5
 
   escalade@3.2.0: {}
 
@@ -8905,8 +9111,6 @@ snapshots:
       hasown: 2.0.2
       side-channel: 1.1.0
 
-  intersection-observer@0.12.2: {}
-
   intl-messageformat-parser@5.5.1:
     dependencies:
       '@formatjs/intl-numberformat': 5.7.6
@@ -9286,10 +9490,6 @@ snapshots:
       '@videojs/vhs-utils': 3.0.5
       global: 4.4.0
 
-  magic-string@0.27.0:
-    dependencies:
-      '@jridgewell/sourcemap-codec': 1.5.5
-
   magic-string@0.30.19:
     dependencies:
       '@jridgewell/sourcemap-codec': 1.5.5
@@ -9408,6 +9608,8 @@ snapshots:
       type-fest: 1.4.0
       yargs-parser: 20.2.9
 
+  meow@13.2.0: {}
+
   meow@6.1.1:
     dependencies:
       '@types/minimist': 1.2.5
@@ -9940,7 +10142,7 @@ snapshots:
       react-fast-compare: 3.2.2
       warning: 4.0.3
 
-  react-refresh@0.14.2: {}
+  react-refresh@0.18.0: {}
 
   react-remark@2.1.0(react@17.0.2):
     dependencies:
@@ -10089,7 +10291,7 @@ snapshots:
 
   regenerate@1.4.2: {}
 
-  regenerator-runtime@0.13.11: {}
+  regenerator-runtime@0.14.1: {}
 
   regexp.prototype.flags@1.5.4:
     dependencies:
@@ -10197,8 +10399,32 @@ snapshots:
     dependencies:
       glob: 7.2.3
 
-  rollup@3.29.5:
+  rollup@4.53.1:
+    dependencies:
+      '@types/estree': 1.0.8
     optionalDependencies:
+      '@rollup/rollup-android-arm-eabi': 4.53.1
+      '@rollup/rollup-android-arm64': 4.53.1
+      '@rollup/rollup-darwin-arm64': 4.53.1
+      '@rollup/rollup-darwin-x64': 4.53.1
+      '@rollup/rollup-freebsd-arm64': 4.53.1
+      '@rollup/rollup-freebsd-x64': 4.53.1
+      '@rollup/rollup-linux-arm-gnueabihf': 4.53.1
+      '@rollup/rollup-linux-arm-musleabihf': 4.53.1
+      '@rollup/rollup-linux-arm64-gnu': 4.53.1
+      '@rollup/rollup-linux-arm64-musl': 4.53.1
+      '@rollup/rollup-linux-loong64-gnu': 4.53.1
+      '@rollup/rollup-linux-ppc64-gnu': 4.53.1
+      '@rollup/rollup-linux-riscv64-gnu': 4.53.1
+      '@rollup/rollup-linux-riscv64-musl': 4.53.1
+      '@rollup/rollup-linux-s390x-gnu': 4.53.1
+      '@rollup/rollup-linux-x64-gnu': 4.53.1
+      '@rollup/rollup-linux-x64-musl': 4.53.1
+      '@rollup/rollup-openharmony-arm64': 4.53.1
+      '@rollup/rollup-win32-arm64-msvc': 4.53.1
+      '@rollup/rollup-win32-ia32-msvc': 4.53.1
+      '@rollup/rollup-win32-x64-gnu': 4.53.1
+      '@rollup/rollup-win32-x64-msvc': 4.53.1
       fsevents: 2.3.3
 
   run-async@2.4.1: {}
@@ -10929,31 +11155,31 @@ snapshots:
     dependencies:
       global: 4.4.0
 
-  vite-plugin-compression@0.5.1(vite@4.5.14(@types/node@18.19.130)(sass@1.93.2)(terser@5.44.0)):
+  vite-plugin-compression@0.5.1(vite@5.4.21(@types/node@18.19.130)(sass@1.93.2)(terser@5.44.0)):
     dependencies:
       chalk: 4.1.2
       debug: 4.4.3
       fs-extra: 10.1.0
-      vite: 4.5.14(@types/node@18.19.130)(sass@1.93.2)(terser@5.44.0)
+      vite: 5.4.21(@types/node@18.19.130)(sass@1.93.2)(terser@5.44.0)
     transitivePeerDependencies:
       - supports-color
 
-  vite-tsconfig-paths@4.3.2(typescript@4.8.4)(vite@4.5.14(@types/node@18.19.130)(sass@1.93.2)(terser@5.44.0)):
+  vite-tsconfig-paths@4.3.2(typescript@4.8.4)(vite@5.4.21(@types/node@18.19.130)(sass@1.93.2)(terser@5.44.0)):
     dependencies:
       debug: 4.4.3
       globrex: 0.1.2
       tsconfck: 3.1.6(typescript@4.8.4)
     optionalDependencies:
-      vite: 4.5.14(@types/node@18.19.130)(sass@1.93.2)(terser@5.44.0)
+      vite: 5.4.21(@types/node@18.19.130)(sass@1.93.2)(terser@5.44.0)
     transitivePeerDependencies:
       - supports-color
       - typescript
 
-  vite@4.5.14(@types/node@18.19.130)(sass@1.93.2)(terser@5.44.0):
+  vite@5.4.21(@types/node@18.19.130)(sass@1.93.2)(terser@5.44.0):
     dependencies:
-      esbuild: 0.18.20
+      esbuild: 0.21.5
       postcss: 8.5.6
-      rollup: 3.29.5
+      rollup: 4.53.1
     optionalDependencies:
       '@types/node': 18.19.130
       fsevents: 2.3.3
diff --git a/ui/v2.5/src/components/Groups/GroupSelect.tsx b/ui/v2.5/src/components/Groups/GroupSelect.tsx
index dd16088e9..8ee9dc1a0 100644
--- a/ui/v2.5/src/components/Groups/GroupSelect.tsx
+++ b/ui/v2.5/src/components/Groups/GroupSelect.tsx
@@ -71,7 +71,7 @@ export const GroupSelect: React.FC<
   const maxOptionsShown =
     configuration?.ui.maxOptionsShown ?? defaultMaxOptionsShown;
   const defaultCreatable =
-    !configuration?.interface.disableDropdownCreate.movie ?? true;
+    !configuration?.interface.disableDropdownCreate.movie;
 
   const exclude = useMemo(() => props.excludeIds ?? [], [props.excludeIds]);
 
diff --git a/ui/v2.5/src/components/Performers/PerformerSelect.tsx b/ui/v2.5/src/components/Performers/PerformerSelect.tsx
index d31dc3ec7..ed7b7b303 100644
--- a/ui/v2.5/src/components/Performers/PerformerSelect.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerSelect.tsx
@@ -87,7 +87,7 @@ const _PerformerSelect: React.FC<
   const maxOptionsShown =
     configuration?.ui.maxOptionsShown ?? defaultMaxOptionsShown;
   const defaultCreatable =
-    !configuration?.interface.disableDropdownCreate.performer ?? true;
+    !configuration?.interface.disableDropdownCreate.performer;
 
   async function loadPerformers(input: string): Promise<Option[]> {
     const filter = new ListFilterModel(GQL.FilterMode.Performers);
diff --git a/ui/v2.5/src/components/Studios/StudioSelect.tsx b/ui/v2.5/src/components/Studios/StudioSelect.tsx
index 7b22b7f22..c62d25675 100644
--- a/ui/v2.5/src/components/Studios/StudioSelect.tsx
+++ b/ui/v2.5/src/components/Studios/StudioSelect.tsx
@@ -70,7 +70,7 @@ const _StudioSelect: React.FC<
   const maxOptionsShown =
     (configuration?.ui as IUIConfig).maxOptionsShown ?? defaultMaxOptionsShown;
   const defaultCreatable =
-    !configuration?.interface.disableDropdownCreate.studio ?? true;
+    !configuration?.interface.disableDropdownCreate.studio;
 
   const exclude = useMemo(() => props.excludeIds ?? [], [props.excludeIds]);
 
diff --git a/ui/v2.5/src/components/Tags/TagSelect.tsx b/ui/v2.5/src/components/Tags/TagSelect.tsx
index 2f6fb9a3e..9fdc57eaf 100644
--- a/ui/v2.5/src/components/Tags/TagSelect.tsx
+++ b/ui/v2.5/src/components/Tags/TagSelect.tsx
@@ -71,8 +71,7 @@ const _TagSelect: React.FC<TagSelectProps> = (props) => {
   const intl = useIntl();
   const maxOptionsShown =
     configuration?.ui.maxOptionsShown ?? defaultMaxOptionsShown;
-  const defaultCreatable =
-    !configuration?.interface.disableDropdownCreate.tag ?? true;
+  const defaultCreatable = !configuration?.interface.disableDropdownCreate.tag;
 
   const exclude = useMemo(() => props.excludeIds ?? [], [props.excludeIds]);
 
diff --git a/ui/v2.5/src/polyfills.ts b/ui/v2.5/src/polyfills.ts
index 55914e1d9..ca5620e81 100644
--- a/ui/v2.5/src/polyfills.ts
+++ b/ui/v2.5/src/polyfills.ts
@@ -3,7 +3,6 @@ import { shouldPolyfill as shouldPolyfillCanonicalLocales } from "@formatjs/intl
 import { shouldPolyfill as shouldPolyfillLocale } from "@formatjs/intl-locale/should-polyfill";
 import { shouldPolyfill as shouldPolyfillNumberformat } from "@formatjs/intl-numberformat/should-polyfill";
 import { shouldPolyfill as shouldPolyfillPluralRules } from "@formatjs/intl-pluralrules/should-polyfill";
-import "intersection-observer";
 
 // needed for older safari versions
 import "event-target-polyfill";
@@ -27,11 +26,6 @@ async function checkPolyfills() {
     await import("@formatjs/intl-pluralrules/polyfill");
     await import("@formatjs/intl-pluralrules/locale-data/en");
   }
-
-  if (!("ResizeObserver" in window)) {
-    const ResizeObserver = await import("resize-observer-polyfill");
-    window.ResizeObserver = ResizeObserver.default;
-  }
 }
 
 export const initPolyfills = async () => {

From 1cc983fb5ba10a16351b0d55a484d19c8ee12acf Mon Sep 17 00:00:00 2001
From: melon-scientist <149206247+melon-scientist@users.noreply.github.com>
Date: Sun, 9 Nov 2025 17:33:15 -0700
Subject: [PATCH 119/405] Add O-Count to performer page (#6171)

---
 .../Performers/PerformerDetails/Performer.tsx | 23 ++++++++++++++-----
 ui/v2.5/src/components/Performers/styles.scss | 21 +++++++++++++++++
 .../components/Shared/Rating/RatingStars.tsx  | 13 ++++-------
 3 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/Performer.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/Performer.tsx
index ab584e90d..0a1535068 100644
--- a/ui/v2.5/src/components/Performers/PerformerDetails/Performer.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerDetails/Performer.tsx
@@ -42,6 +42,7 @@ import {
 import { DetailTitle } from "src/components/Shared/DetailsPage/DetailTitle";
 import { ExpandCollapseButton } from "src/components/Shared/CollapseButton";
 import { FavoriteIcon } from "src/components/Shared/FavoriteIcon";
+import { SweatDrops } from "src/components/Shared/SweatDrops";
 import { AliasList } from "src/components/Shared/DetailsPage/AliasList";
 import { HeaderImage } from "src/components/Shared/DetailsPage/HeaderImage";
 import { LightboxLink } from "src/hooks/Lightbox/LightboxLink";
@@ -423,12 +424,22 @@ const PerformerPage: React.FC<IProps> = PatchComponent(
                   </span>
                 </DetailTitle>
                 <AliasList aliases={performer.alias_list} />
-                <RatingSystem
-                  value={performer.rating100}
-                  onSetRating={(value) => setRating(value)}
-                  clickToRate
-                  withoutContext
-                />
+                <div className="quality-group">
+                  <RatingSystem
+                    value={performer.rating100}
+                    onSetRating={(value) => setRating(value)}
+                    clickToRate
+                    withoutContext
+                  />
+                  {!!performer.o_counter && (
+                    <span className="o-counter">
+                      <span className="fa-icon">
+                        <SweatDrops />
+                      </span>
+                      <span>{performer.o_counter}</span>
+                    </span>
+                  )}
+                </div>
                 {!isEditing && (
                   <PerformerDetailsPanel
                     performer={performer}
diff --git a/ui/v2.5/src/components/Performers/styles.scss b/ui/v2.5/src/components/Performers/styles.scss
index f76816f05..3769bc44b 100644
--- a/ui/v2.5/src/components/Performers/styles.scss
+++ b/ui/v2.5/src/components/Performers/styles.scss
@@ -35,12 +35,33 @@
     .rating-number .form-control {
       width: inherit;
     }
+
+    // The following min-width declarations prevent
+    // the performer's O-Count from moving around
+    // when hovering over rating stars
+    .rating-stars-precision-full .star-rating-number {
+      min-width: 0.75rem;
+    }
+
+    .rating-stars-precision-half .star-rating-number,
+    .rating-stars-precision-tenth .star-rating-number {
+      min-width: 1.45rem;
+    }
+
+    .rating-stars-precision-quarter .star-rating-number {
+      min-width: 2rem;
+    }
   }
 
   .alias {
     font-weight: bold;
   }
 
+  .quality-group {
+    display: inline-flex;
+    margin-top: 0.25rem;
+  }
+
   // the detail element ids are the same as field type name
   // which don't follow the correct convention
   /* stylelint-disable selector-class-pattern */
diff --git a/ui/v2.5/src/components/Shared/Rating/RatingStars.tsx b/ui/v2.5/src/components/Shared/Rating/RatingStars.tsx
index 5339044a1..f83c556fc 100644
--- a/ui/v2.5/src/components/Shared/Rating/RatingStars.tsx
+++ b/ui/v2.5/src/components/Shared/Rating/RatingStars.tsx
@@ -228,21 +228,16 @@ export const RatingStars = PatchComponent(
       );
     };
 
-    const maybeRenderStarRatingNumber = () => {
+    const maybeGetStarRatingNumber = () => {
       const ratingFraction = getCurrentSelectedRating();
       if (
         !ratingFraction ||
         (ratingFraction.rating == 0 && ratingFraction.fraction == 0)
       ) {
-        return;
+        return "";
       }
 
-      return (
-        <span className="star-rating-number">
-          {ratingFraction.rating + ratingFraction.fraction}
-          {suffix}
-        </span>
-      );
+      return ratingFraction.rating + ratingFraction.fraction + suffix;
     };
 
     const precisionClassName = `rating-stars-precision-${props.precision}`;
@@ -252,7 +247,7 @@ export const RatingStars = PatchComponent(
         {Array.from(Array(max)).map((value, index) =>
           renderRatingButton(index + 1)
         )}
-        {maybeRenderStarRatingNumber()}
+        <span className="star-rating-number">{maybeGetStarRatingNumber()}</span>
       </div>
     );
   }

From 2e766952ddc11a9b016e740e9de8b1d5ebcf9683 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 10 Nov 2025 11:43:04 +1100
Subject: [PATCH 120/405] Bump github.com/go-chi/chi/v5 from 5.0.12 to 5.2.2
 (#5948)

Bumps [github.com/go-chi/chi/v5](https://github.com/go-chi/chi) from 5.0.12 to 5.2.2.
- [Release notes](https://github.com/go-chi/chi/releases)
- [Changelog](https://github.com/go-chi/chi/blob/master/CHANGELOG.md)
- [Commits](https://github.com/go-chi/chi/compare/v5.0.12...v5.2.2)

---
updated-dependencies:
- dependency-name: github.com/go-chi/chi/v5
  dependency-version: 5.2.2
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index 1fc666b4f..bf2eb0f6e 100644
--- a/go.mod
+++ b/go.mod
@@ -15,7 +15,7 @@ require (
 	github.com/disintegration/imaging v1.6.2
 	github.com/dop251/goja v0.0.0-20231027120936-b396bb4c349d
 	github.com/doug-martin/goqu/v9 v9.18.0
-	github.com/go-chi/chi/v5 v5.0.12
+	github.com/go-chi/chi/v5 v5.2.2
 	github.com/go-chi/cors v1.2.1
 	github.com/go-chi/httplog v0.3.1
 	github.com/go-toast/toast v0.0.0-20190211030409-01e6764cf0a4
diff --git a/go.sum b/go.sum
index 2ce973b4a..dced0768f 100644
--- a/go.sum
+++ b/go.sum
@@ -197,8 +197,8 @@ github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeME
 github.com/glycerine/go-unsnap-stream v0.0.0-20180323001048-9f0cb55181dd/go.mod h1:/20jfyN9Y5QPEAprSgKAUr+glWDY39ZiUEAYOEv5dsE=
 github.com/glycerine/goconvey v0.0.0-20180728074245-46e3a41ad493/go.mod h1:Ogl1Tioa0aV7gstGFO7KhffUsb9M4ydbEbbxpcEDc24=
 github.com/go-chi/chi/v5 v5.0.7/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
-github.com/go-chi/chi/v5 v5.0.12 h1:9euLV5sTrTNTRUU9POmDUvfxyj6LAABLUcEWO+JJb4s=
-github.com/go-chi/chi/v5 v5.0.12/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
+github.com/go-chi/chi/v5 v5.2.2 h1:CMwsvRVTbXVytCk1Wd72Zy1LAsAh9GxMmSNWLHCG618=
+github.com/go-chi/chi/v5 v5.2.2/go.mod h1:L2yAIGWB3H+phAw1NxKwWM+7eUH/lU8pOMm5hHcoops=
 github.com/go-chi/cors v1.2.1 h1:xEC8UT3Rlp2QuWNEr4Fs/c2EAGVKBwy/1vHx3bppil4=
 github.com/go-chi/cors v1.2.1/go.mod h1:sSbTewc+6wYHBBCW7ytsFSn836hqM7JxpglAy2Vzc58=
 github.com/go-chi/httplog v0.3.1 h1:uC3IUWCZagtbCinb3ypFh36SEcgd6StWw2Bu0XSXRtg=

From d5b10462670db85d6f8b2c112114b9fc558b8fb7 Mon Sep 17 00:00:00 2001
From: EventHoriizon <78643361+EventHoriizon@users.noreply.github.com>
Date: Mon, 10 Nov 2025 00:53:53 +0000
Subject: [PATCH 121/405] Group O-Counter Filter/Sort (#6122)

---
 graphql/schema/types/filters.graphql        |  2 ++
 graphql/schema/types/group.graphql          |  1 +
 internal/api/resolver_model_movie.go        | 11 +++++++
 pkg/models/group.go                         |  2 ++
 pkg/models/mocks/SceneReaderWriter.go       | 21 ++++++++++++
 pkg/models/repository_scene.go              |  1 +
 pkg/sqlite/group.go                         |  8 +++++
 pkg/sqlite/group_filter.go                  | 36 +++++++++++++++++++++
 pkg/sqlite/scene.go                         | 23 +++++++++++++
 ui/v2.5/graphql/data/group.graphql          |  1 +
 ui/v2.5/src/components/Groups/GroupCard.tsx | 17 ++++++++++
 ui/v2.5/src/models/list-filter/groups.ts    |  5 +++
 12 files changed, 128 insertions(+)

diff --git a/graphql/schema/types/filters.graphql b/graphql/schema/types/filters.graphql
index da309bead..4eb91aa77 100644
--- a/graphql/schema/types/filters.graphql
+++ b/graphql/schema/types/filters.graphql
@@ -403,6 +403,8 @@ input GroupFilterType {
   created_at: TimestampCriterionInput
   "Filter by last update time"
   updated_at: TimestampCriterionInput
+  "Filter by o-counter"
+  o_counter: IntCriterionInput
 
   "Filter by containing groups"
   containing_groups: HierarchicalMultiCriterionInput
diff --git a/graphql/schema/types/group.graphql b/graphql/schema/types/group.graphql
index 35fc17a68..a46932054 100644
--- a/graphql/schema/types/group.graphql
+++ b/graphql/schema/types/group.graphql
@@ -30,6 +30,7 @@ type Group {
   performer_count(depth: Int): Int! # Resolver
   sub_group_count(depth: Int): Int! # Resolver
   scenes: [Scene!]!
+  o_counter: Int # Resolver
 }
 
 input GroupDescriptionInput {
diff --git a/internal/api/resolver_model_movie.go b/internal/api/resolver_model_movie.go
index e3fba57c0..317123c6e 100644
--- a/internal/api/resolver_model_movie.go
+++ b/internal/api/resolver_model_movie.go
@@ -204,3 +204,14 @@ func (r *groupResolver) Scenes(ctx context.Context, obj *models.Group) (ret []*m
 
 	return ret, nil
 }
+
+func (r *groupResolver) OCounter(ctx context.Context, obj *models.Group) (ret *int, err error) {
+	var count int
+	if err := r.withReadTxn(ctx, func(ctx context.Context) error {
+		count, err = r.repository.Scene.OCountByGroupID(ctx, obj.ID)
+		return err
+	}); err != nil {
+		return nil, err
+	}
+	return &count, nil
+}
diff --git a/pkg/models/group.go b/pkg/models/group.go
index 6afda3f48..6943b1055 100644
--- a/pkg/models/group.go
+++ b/pkg/models/group.go
@@ -23,6 +23,8 @@ type GroupFilterType struct {
 	TagCount *IntCriterionInput `json:"tag_count"`
 	// Filter by date
 	Date *DateCriterionInput `json:"date"`
+	// Filter by O counter
+	OCounter *IntCriterionInput `json:"o_counter"`
 	// Filter by containing groups
 	ContainingGroups *HierarchicalMultiCriterionInput `json:"containing_groups"`
 	// Filter by sub groups
diff --git a/pkg/models/mocks/SceneReaderWriter.go b/pkg/models/mocks/SceneReaderWriter.go
index 8e4e5ae5a..bec31b6f2 100644
--- a/pkg/models/mocks/SceneReaderWriter.go
+++ b/pkg/models/mocks/SceneReaderWriter.go
@@ -1141,6 +1141,27 @@ func (_m *SceneReaderWriter) HasCover(ctx context.Context, sceneID int) (bool, e
 	return r0, r1
 }
 
+// OCountByGroupID provides a mock function with given fields: ctx, groupID
+func (_m *SceneReaderWriter) OCountByGroupID(ctx context.Context, groupID int) (int, error) {
+	ret := _m.Called(ctx, groupID)
+
+	var r0 int
+	if rf, ok := ret.Get(0).(func(context.Context, int) int); ok {
+		r0 = rf(ctx, groupID)
+	} else {
+		r0 = ret.Get(0).(int)
+	}
+
+	var r1 error
+	if rf, ok := ret.Get(1).(func(context.Context, int) error); ok {
+		r1 = rf(ctx, groupID)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
 // OCountByPerformerID provides a mock function with given fields: ctx, performerID
 func (_m *SceneReaderWriter) OCountByPerformerID(ctx context.Context, performerID int) (int, error) {
 	ret := _m.Called(ctx, performerID)
diff --git a/pkg/models/repository_scene.go b/pkg/models/repository_scene.go
index f0fff4ac7..fe0f473fb 100644
--- a/pkg/models/repository_scene.go
+++ b/pkg/models/repository_scene.go
@@ -44,6 +44,7 @@ type SceneCounter interface {
 	CountMissingChecksum(ctx context.Context) (int, error)
 	CountMissingOSHash(ctx context.Context) (int, error)
 	OCountByPerformerID(ctx context.Context, performerID int) (int, error)
+	OCountByGroupID(ctx context.Context, groupID int) (int, error)
 }
 
 // SceneCreator provides methods to create scenes.
diff --git a/pkg/sqlite/group.go b/pkg/sqlite/group.go
index 686bf4e1e..f0f8d6b40 100644
--- a/pkg/sqlite/group.go
+++ b/pkg/sqlite/group.go
@@ -488,6 +488,7 @@ var groupSortOptions = sortOptions{
 	"random",
 	"rating",
 	"scenes_count",
+	"o_counter",
 	"sub_group_order",
 	"tag_count",
 	"updated_at",
@@ -524,6 +525,8 @@ func (qb *GroupStore) setGroupSort(query *queryBuilder, findFilter *models.FindF
 		query.sortAndPagination += getCountSort(groupTable, groupsTagsTable, groupIDColumn, direction)
 	case "scenes_count": // generic getSort won't work for this
 		query.sortAndPagination += getCountSort(groupTable, groupsScenesTable, groupIDColumn, direction)
+	case "o_counter":
+		query.sortAndPagination += qb.sortByOCounter(direction)
 	default:
 		query.sortAndPagination += getSort(sort, direction, "groups")
 	}
@@ -701,3 +704,8 @@ func (qb *GroupStore) FindInAncestors(ctx context.Context, ascestorIDs []int, id
 
 	return ret, nil
 }
+
+func (qb *GroupStore) sortByOCounter(direction string) string {
+	// need to sum the o_counter from scenes and images
+	return " ORDER BY (" + selectGroupOCountSQL + ") " + direction
+}
diff --git a/pkg/sqlite/group_filter.go b/pkg/sqlite/group_filter.go
index dcb7bcdfc..f29023785 100644
--- a/pkg/sqlite/group_filter.go
+++ b/pkg/sqlite/group_filter.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 
 	"github.com/stashapp/stash/pkg/models"
+	"github.com/stashapp/stash/pkg/utils"
 )
 
 type groupFilterHandler struct {
@@ -73,6 +74,7 @@ func (qb *groupFilterHandler) criterionHandler() criterionHandler {
 		qb.performersCriterionHandler(groupFilter.Performers),
 		qb.tagsCriterionHandler(groupFilter.Tags),
 		qb.tagCountCriterionHandler(groupFilter.TagCount),
+		qb.groupOCounterCriterionHandler(groupFilter.OCounter),
 		&dateCriterionHandler{groupFilter.Date, "groups.date", nil},
 		groupHierarchyHandler.ParentsCriterionHandler(groupFilter.ContainingGroups),
 		groupHierarchyHandler.ChildrenCriterionHandler(groupFilter.SubGroups),
@@ -201,3 +203,37 @@ func (qb *groupFilterHandler) tagCountCriterionHandler(count *models.IntCriterio
 
 	return h.handler(count)
 }
+
+// used for sorting and filtering on group o-count
+var selectGroupOCountSQL = utils.StrFormat(
+	"SELECT SUM(o_counter) "+
+		"FROM ("+
+		"SELECT COUNT({scenes_o_dates}.{o_date}) as o_counter from {groups_scenes} s "+
+		"LEFT JOIN {scenes} ON {scenes}.id = s.{scene_id} "+
+		"LEFT JOIN {scenes_o_dates} ON {scenes_o_dates}.{scene_id} = {scenes}.id "+
+		"WHERE s.{group_id} = {group}.id "+
+		")",
+	map[string]interface{}{
+		"group":          groupTable,
+		"group_id":       groupIDColumn,
+		"groups_scenes":  groupsScenesTable,
+		"scenes":         sceneTable,
+		"scene_id":       sceneIDColumn,
+		"scenes_o_dates": scenesODatesTable,
+		"o_date":         sceneODateColumn,
+	},
+)
+
+func (qb *groupFilterHandler) groupOCounterCriterionHandler(count *models.IntCriterionInput) criterionHandlerFunc {
+	return func(ctx context.Context, f *filterBuilder) {
+		if count == nil {
+			return
+		}
+
+		lhs := "(" + selectGroupOCountSQL + ")"
+		clause, args := getIntCriterionWhereClause(lhs, *count)
+
+		f.addWhere(clause, args...)
+	}
+
+}
diff --git a/pkg/sqlite/scene.go b/pkg/sqlite/scene.go
index 6cc5aa339..23f5ef482 100644
--- a/pkg/sqlite/scene.go
+++ b/pkg/sqlite/scene.go
@@ -795,6 +795,29 @@ func (qb *SceneStore) OCountByPerformerID(ctx context.Context, performerID int)
 	return ret, nil
 }
 
+func (qb *SceneStore) OCountByGroupID(ctx context.Context, groupID int) (int, error) {
+	table := qb.table()
+	joinTable := scenesGroupsJoinTable
+	oHistoryTable := goqu.T(scenesODatesTable)
+
+	q := dialect.Select(goqu.COUNT("*")).From(table).InnerJoin(
+		oHistoryTable,
+		goqu.On(table.Col(idColumn).Eq(oHistoryTable.Col(sceneIDColumn))),
+	).InnerJoin(
+		joinTable,
+		goqu.On(
+			table.Col(idColumn).Eq(joinTable.Col(sceneIDColumn)),
+		),
+	).Where(joinTable.Col(groupIDColumn).Eq(groupID))
+
+	var ret int
+	if err := querySimple(ctx, q, &ret); err != nil {
+		return 0, err
+	}
+
+	return ret, nil
+}
+
 func (qb *SceneStore) FindByGroupID(ctx context.Context, groupID int) ([]*models.Scene, error) {
 	sq := dialect.From(scenesGroupsJoinTable).Select(scenesGroupsJoinTable.Col(sceneIDColumn)).Where(
 		scenesGroupsJoinTable.Col(groupIDColumn).Eq(groupID),
diff --git a/ui/v2.5/graphql/data/group.graphql b/ui/v2.5/graphql/data/group.graphql
index 41114f5aa..5251bed89 100644
--- a/ui/v2.5/graphql/data/group.graphql
+++ b/ui/v2.5/graphql/data/group.graphql
@@ -32,6 +32,7 @@ fragment GroupData on Group {
   performer_count_all: performer_count(depth: -1)
   sub_group_count
   sub_group_count_all: sub_group_count(depth: -1)
+  o_counter
 
   scenes {
     id
diff --git a/ui/v2.5/src/components/Groups/GroupCard.tsx b/ui/v2.5/src/components/Groups/GroupCard.tsx
index f1d6089d0..87a594446 100644
--- a/ui/v2.5/src/components/Groups/GroupCard.tsx
+++ b/ui/v2.5/src/components/Groups/GroupCard.tsx
@@ -10,6 +10,7 @@ import { FormattedMessage } from "react-intl";
 import { RatingBanner } from "../Shared/RatingBanner";
 import { faPlayCircle, faTag } from "@fortawesome/free-solid-svg-icons";
 import { RelatedGroupPopoverButton } from "./RelatedGroupPopover";
+import { SweatDrops } from "../Shared/SweatDrops";
 
 const Description: React.FC<{
   sceneNumber?: number;
@@ -107,6 +108,21 @@ export const GroupCard: React.FC<IProps> = ({
     );
   }
 
+  function maybeRenderOCounter() {
+    if (!group.o_counter) return;
+
+    return (
+      <div className="o-counter">
+        <Button className="minimal">
+          <span className="fa-icon">
+            <SweatDrops />
+          </span>
+          <span>{group.o_counter}</span>
+        </Button>
+      </div>
+    );
+  }
+
   function maybeRenderPopoverButtonGroup() {
     if (
       sceneNumber ||
@@ -130,6 +146,7 @@ export const GroupCard: React.FC<IProps> = ({
               group.containing_groups.length > 0) && (
               <RelatedGroupPopoverButton group={group} />
             )}
+            {maybeRenderOCounter()}
           </ButtonGroup>
         </>
       );
diff --git a/ui/v2.5/src/models/list-filter/groups.ts b/ui/v2.5/src/models/list-filter/groups.ts
index c96fd8dc6..6aed48fdc 100644
--- a/ui/v2.5/src/models/list-filter/groups.ts
+++ b/ui/v2.5/src/models/list-filter/groups.ts
@@ -35,6 +35,10 @@ const sortByOptions = [
       messageID: "scene_count",
       value: "scenes_count",
     },
+    {
+      messageID: "o_count",
+      value: "o_counter",
+    },
   ]);
 const displayModeOptions = [DisplayMode.Grid];
 const criterionOptions = [
@@ -49,6 +53,7 @@ const criterionOptions = [
   RatingCriterionOption,
   PerformersCriterionOption,
   createDateCriterionOption("date"),
+  createMandatoryNumberCriterionOption("o_counter", "o_count"),
   ContainingGroupsCriterionOption,
   SubGroupsCriterionOption,
   createMandatoryNumberCriterionOption("containing_group_count"),

From 34becdf4364a353fe9823f2f97068478f4822b37 Mon Sep 17 00:00:00 2001
From: theqwertyqwert <theqwertyqwertporn@gmail.com>
Date: Mon, 10 Nov 2025 02:54:44 +0200
Subject: [PATCH 122/405] Add external links display option for performer
 thumbnails (#6153)

* Add external links display option for performer thumbnails

- Introduced a new setting to show links on performer thumbnails.
- Updated PerformerCard to conditionally render social media links (Twitter, Instagram) and other external links.
- Enhanced ExternalLinksButton to open single links directly if specified.
- Updated configuration and localization files to support the new feature.
---
 .../components/Performers/PerformerCard.tsx   | 65 ++++++++++++++++++-
 ui/v2.5/src/components/Performers/styles.scss |  4 ++
 .../SettingsInterfacePanel.tsx                | 10 +++
 .../components/Shared/ExternalLinksButton.tsx | 30 ++++++---
 ui/v2.5/src/core/config.ts                    |  1 +
 ui/v2.5/src/locales/en-GB.json                |  8 +++
 6 files changed, 109 insertions(+), 9 deletions(-)

diff --git a/ui/v2.5/src/components/Performers/PerformerCard.tsx b/ui/v2.5/src/components/Performers/PerformerCard.tsx
index 02e2a68fd..02c304547 100644
--- a/ui/v2.5/src/components/Performers/PerformerCard.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerCard.tsx
@@ -17,12 +17,15 @@ import {
 } from "src/models/list-filter/criteria/criterion";
 import { PopoverCountButton } from "../Shared/PopoverCountButton";
 import GenderIcon from "./GenderIcon";
-import { faTag } from "@fortawesome/free-solid-svg-icons";
+import { faLink, faTag } from "@fortawesome/free-solid-svg-icons";
+import { faInstagram, faTwitter } from "@fortawesome/free-brands-svg-icons";
 import { RatingBanner } from "../Shared/RatingBanner";
 import { usePerformerUpdate } from "src/core/StashService";
 import { ILabeledId } from "src/models/list-filter/types";
 import { FavoriteIcon } from "../Shared/FavoriteIcon";
 import { PatchComponent } from "src/patch";
+import { ExternalLinksButton } from "../Shared/ExternalLinksButton";
+import { ConfigurationContext } from "src/hooks/Config";
 
 export interface IPerformerCardExtraCriteria {
   scenes?: ModifierCriterion<CriterionValue>[];
@@ -176,6 +179,8 @@ const PerformerCardPopovers: React.FC<IPerformerCardProps> = PatchComponent(
 const PerformerCardOverlays: React.FC<IPerformerCardProps> = PatchComponent(
   "PerformerCard.Overlays",
   ({ performer }) => {
+    const { configuration } = React.useContext(ConfigurationContext);
+    const uiConfig = configuration?.ui;
     const [updatePerformer] = usePerformerUpdate();
 
     function onToggleFavorite(v: boolean) {
@@ -215,6 +220,63 @@ const PerformerCardOverlays: React.FC<IPerformerCardProps> = PatchComponent(
       }
     }
 
+    function maybeRenderLinks() {
+      if (!uiConfig?.showLinksOnPerformerCard) {
+        return;
+      }
+
+      if (performer.urls && performer.urls.length > 0) {
+        const twitter = performer.urls.filter((u) =>
+          u.match(/https?:\/\/(?:www\.)?(?:twitter|x).com\//)
+        );
+        const instagram = performer.urls.filter((u) =>
+          u.match(/https?:\/\/(?:www\.)?instagram.com\//)
+        );
+        const others = performer.urls.filter(
+          (u) => !twitter.includes(u) && !instagram.includes(u)
+        );
+
+        return (
+          <div
+            className="performer-card__links"
+            style={{
+              position: "absolute",
+              left: "0",
+              bottom: "0",
+              display: "flex",
+              gap: "0.5rem",
+              flexDirection: "column-reverse",
+            }}
+          >
+            {twitter.length > 0 && (
+              <ExternalLinksButton
+                className="performer-card__link twitter"
+                urls={twitter}
+                icon={faTwitter}
+                openIfSingle={true}
+              ></ExternalLinksButton>
+            )}
+            {instagram.length > 0 && (
+              <ExternalLinksButton
+                className="performer-card__link instagram"
+                urls={instagram}
+                icon={faInstagram}
+                openIfSingle={true}
+              ></ExternalLinksButton>
+            )}
+            {others.length > 0 && (
+              <ExternalLinksButton
+                className="performer-card__link"
+                icon={faLink}
+                urls={others}
+                openIfSingle={true}
+              />
+            )}
+          </div>
+        );
+      }
+    }
+
     return (
       <>
         <FavoriteIcon
@@ -224,6 +286,7 @@ const PerformerCardOverlays: React.FC<IPerformerCardProps> = PatchComponent(
           className="hide-not-favorite"
         />
         {maybeRenderRatingBanner()}
+        {maybeRenderLinks()}
         {maybeRenderFlag()}
       </>
     );
diff --git a/ui/v2.5/src/components/Performers/styles.scss b/ui/v2.5/src/components/Performers/styles.scss
index 3769bc44b..1840ad960 100644
--- a/ui/v2.5/src/components/Performers/styles.scss
+++ b/ui/v2.5/src/components/Performers/styles.scss
@@ -107,6 +107,10 @@
 
   .thumbnail-section {
     position: relative;
+
+    .instagram {
+      color: pink;
+    }
   }
 
   &-image {
diff --git a/ui/v2.5/src/components/Settings/SettingsInterfacePanel/SettingsInterfacePanel.tsx b/ui/v2.5/src/components/Settings/SettingsInterfacePanel/SettingsInterfacePanel.tsx
index 7d63f9df9..e0c538cd0 100644
--- a/ui/v2.5/src/components/Settings/SettingsInterfacePanel/SettingsInterfacePanel.tsx
+++ b/ui/v2.5/src/components/Settings/SettingsInterfacePanel/SettingsInterfacePanel.tsx
@@ -470,6 +470,7 @@ export const SettingsInterfacePanel: React.FC = PatchComponent(
             onChange={(v) => saveUI({ showChildTagContent: v })}
           />
         </SettingSection>
+
         <SettingSection headingID="config.ui.studio_panel.heading">
           <BooleanSetting
             id="show-child-studio-content"
@@ -480,6 +481,15 @@ export const SettingsInterfacePanel: React.FC = PatchComponent(
           />
         </SettingSection>
 
+        <SettingSection headingID="config.ui.performer_list.heading">
+          <BooleanSetting
+            id="show-links-on-grid-card"
+            headingID="config.ui.performer_list.options.show_links_on_grid_card.heading"
+            checked={ui.showLinksOnPerformerCard ?? undefined}
+            onChange={(v) => saveUI({ showLinksOnPerformerCard: v })}
+          />
+        </SettingSection>
+
         <SettingSection headingID="config.ui.image_wall.heading">
           <NumberSetting
             headingID="config.ui.image_wall.margin"
diff --git a/ui/v2.5/src/components/Shared/ExternalLinksButton.tsx b/ui/v2.5/src/components/Shared/ExternalLinksButton.tsx
index 7d8072d07..e35a1a992 100644
--- a/ui/v2.5/src/components/Shared/ExternalLinksButton.tsx
+++ b/ui/v2.5/src/components/Shared/ExternalLinksButton.tsx
@@ -12,9 +12,10 @@ export const ExternalLinksButton: React.FC<{
   icon?: IconDefinition;
   urls: string[];
   className?: string;
+  openIfSingle?: boolean;
 }> = PatchComponent(
   "ExternalLinksButton",
-  ({ urls, icon = faLink, className = "" }) => {
+  ({ urls, icon = faLink, className = "", openIfSingle = false }) => {
     if (!urls.length) {
       return null;
     }
@@ -36,14 +37,27 @@ export const ExternalLinksButton: React.FC<{
         document.body
       );
 
-    return (
-      <Dropdown className="external-links-button">
-        <Dropdown.Toggle as={Button} className={`minimal link ${className}`}>
+    if (openIfSingle && urls.length === 1) {
+      return (
+        <ExternalLink
+          className={`external-links-button-link minimal btn link ${className}`}
+          href={TextUtils.sanitiseURL(urls[0])}
+          target="_blank"
+          rel="noopener noreferrer"
+        >
           <Icon icon={icon} />
-        </Dropdown.Toggle>
-        <Menu />
-      </Dropdown>
-    );
+        </ExternalLink>
+      );
+    } else {
+      return (
+        <Dropdown className="external-links-button">
+          <Dropdown.Toggle as={Button} className={`minimal link ${className}`}>
+            <Icon icon={icon} />
+          </Dropdown.Toggle>
+          <Menu />
+        </Dropdown>
+      );
+    }
   }
 );
 
diff --git a/ui/v2.5/src/core/config.ts b/ui/v2.5/src/core/config.ts
index fcef8fef5..36d915eeb 100644
--- a/ui/v2.5/src/core/config.ts
+++ b/ui/v2.5/src/core/config.ts
@@ -45,6 +45,7 @@ export interface IUIConfig {
 
   showChildTagContent?: boolean;
   showChildStudioContent?: boolean;
+  showLinksOnPerformerCard?: boolean;
   showTagCardOnHover?: boolean;
 
   abbreviateCounters?: boolean;
diff --git a/ui/v2.5/src/locales/en-GB.json b/ui/v2.5/src/locales/en-GB.json
index 48cf2f6d3..f0fe87f61 100644
--- a/ui/v2.5/src/locales/en-GB.json
+++ b/ui/v2.5/src/locales/en-GB.json
@@ -801,6 +801,14 @@
           }
         }
       },
+      "performer_list": {
+        "heading": "Performer list",
+        "options": {
+          "show_links_on_grid_card": {
+            "heading": "Display links on performer grid cards"
+          }
+        }
+      },
       "tag_panel": {
         "heading": "Tag view",
         "options": {

From 12a9a0b5f6ce9aff167ac530e81ac6b6ee8c8812 Mon Sep 17 00:00:00 2001
From: n0ld069 <218682028+n0ld069@users.noreply.github.com>
Date: Sun, 9 Nov 2025 19:11:37 -0600
Subject: [PATCH 123/405] Add keyboard shortcuts for Scene Cover generation
 (#5984)

* Add keyboard shortcuts for screenshot generation

- Add 'c c' shortcut to generate screenshot at current time
- Add 'c d' shortcut to generate default screenshot
- Update keyboard shortcuts documentation
---
 ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx | 8 ++++++++
 ui/v2.5/src/docs/en/Manual/KeyboardShortcuts.md      | 3 +++
 2 files changed, 11 insertions(+)

diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx
index 7d326b3cd..f7e844392 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx
@@ -248,6 +248,12 @@ const ScenePage: React.FC<IProps> = PatchComponent("ScenePage", (props) => {
     Mousetrap.bind("p p", () => onQueuePrevious());
     Mousetrap.bind("p r", () => onQueueRandom());
     Mousetrap.bind(",", () => setCollapsed(!collapsed));
+    Mousetrap.bind("c c", () => {
+      onGenerateScreenshot(getPlayerPosition());
+    });
+    Mousetrap.bind("c d", () => {
+      onGenerateScreenshot();
+    });
 
     return () => {
       Mousetrap.unbind("a");
@@ -261,6 +267,8 @@ const ScenePage: React.FC<IProps> = PatchComponent("ScenePage", (props) => {
       Mousetrap.unbind("p p");
       Mousetrap.unbind("p r");
       Mousetrap.unbind(",");
+      Mousetrap.unbind("c c");
+      Mousetrap.unbind("c d");
     };
   });
 
diff --git a/ui/v2.5/src/docs/en/Manual/KeyboardShortcuts.md b/ui/v2.5/src/docs/en/Manual/KeyboardShortcuts.md
index 870de61b5..55b52bdf4 100644
--- a/ui/v2.5/src/docs/en/Manual/KeyboardShortcuts.md
+++ b/ui/v2.5/src/docs/en/Manual/KeyboardShortcuts.md
@@ -67,6 +67,9 @@
 | `r 0` | Unset rating (stars) |
 | `r {0-9} {0-9}` | Set rating (decimal - `00` for `10.0`) |
 | ``r ` `` | Unset rating (decimal) |
+| Cover generation ||
+| `c c` | Generate screenshot at current time |
+| `c d` | Generate default screenshot |
 | Playback ||
 | `p n` | Play next scene in queue |
 | `p p` | Play previous scene in queue |

From f434c1f529c3a40a921d512625454d439d9b27d2 Mon Sep 17 00:00:00 2001
From: Gykes <24581046+Gykes@users.noreply.github.com>
Date: Sun, 9 Nov 2025 19:34:21 -0800
Subject: [PATCH 124/405] Feature: Support Multiple URLs in Studios (#6223)

* Backend support for studio URLs
* FrontEnd addition
* Support URLs in BulkStudioUpdate
* Update tagger modal for URLs
---------
Co-authored-by: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
---
 .idea/go.iml                                  |  3 +-
 graphql/schema/types/scraper.graphql          |  3 +-
 graphql/schema/types/studio.graphql           | 12 +++--
 internal/api/resolver_model_studio.go         | 29 +++++++++++
 internal/api/resolver_mutation_studio.go      | 52 +++++++++++++++++--
 pkg/models/jsonschema/studio.go               |  5 +-
 pkg/models/mocks/StudioReaderWriter.go        | 23 ++++++++
 pkg/models/model_scraped_item.go              | 40 ++++++++++++--
 pkg/models/model_scraped_item_test.go         | 32 ++++++++++--
 pkg/models/model_studio.go                    | 10 +++-
 pkg/models/repository_studio.go               |  1 +
 pkg/models/studio.go                          | 16 +++---
 pkg/performer/import.go                       |  2 +-
 pkg/sqlite/anonymise.go                       |  8 +--
 pkg/sqlite/database.go                        |  2 +-
 pkg/sqlite/migrations/73_studio_urls.up.sql   | 24 +++++++++
 pkg/sqlite/migrations/README.md               |  7 +++
 pkg/sqlite/scene_test.go                      | 15 ++++++
 pkg/sqlite/setup_test.go                      | 20 ++++++-
 pkg/sqlite/studio.go                          | 37 ++++++++++---
 pkg/sqlite/studio_filter.go                   | 19 ++++++-
 pkg/sqlite/studio_test.go                     | 31 +++++++++--
 pkg/sqlite/tables.go                          |  9 ++++
 pkg/stashbox/studio.go                        |  5 +-
 pkg/studio/export.go                          |  7 ++-
 pkg/studio/export_test.go                     |  6 ++-
 pkg/studio/import.go                          | 14 ++++-
 ui/v2.5/graphql/data/scrapers.graphql         | 10 ++--
 ui/v2.5/graphql/data/studio.graphql           |  2 +
 .../Studios/StudioDetails/Studio.tsx          |  7 +--
 .../StudioDetails/StudioDetailsPanel.tsx      | 19 +++++++
 .../Studios/StudioDetails/StudioEditPanel.tsx |  6 +--
 .../components/Tagger/scenes/StudioModal.tsx  | 44 ++++++++++++++--
 33 files changed, 451 insertions(+), 69 deletions(-)
 create mode 100644 pkg/sqlite/migrations/73_studio_urls.up.sql
 create mode 100644 pkg/sqlite/migrations/README.md

diff --git a/.idea/go.iml b/.idea/go.iml
index eddfcc6c3..86461b085 100644
--- a/.idea/go.iml
+++ b/.idea/go.iml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="WEB_MODULE" version="4">
+  <component name="Go" enabled="true" />
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/certs" />
@@ -10,4 +11,4 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
-</module>
+</module>
\ No newline at end of file
diff --git a/graphql/schema/types/scraper.graphql b/graphql/schema/types/scraper.graphql
index 8d430be5f..a8e1fccb0 100644
--- a/graphql/schema/types/scraper.graphql
+++ b/graphql/schema/types/scraper.graphql
@@ -55,7 +55,8 @@ type ScrapedStudio {
   "Set if studio matched"
   stored_id: ID
   name: String!
-  url: String
+  url: String @deprecated(reason: "use urls")
+  urls: [String!]
   parent: ScrapedStudio
   image: String
 
diff --git a/graphql/schema/types/studio.graphql b/graphql/schema/types/studio.graphql
index f7e2fcb24..097f04eb3 100644
--- a/graphql/schema/types/studio.graphql
+++ b/graphql/schema/types/studio.graphql
@@ -1,7 +1,8 @@
 type Studio {
   id: ID!
   name: String!
-  url: String
+  url: String @deprecated(reason: "Use urls")
+  urls: [String!]!
   parent_studio: Studio
   child_studios: [Studio!]!
   aliases: [String!]!
@@ -28,7 +29,8 @@ type Studio {
 
 input StudioCreateInput {
   name: String!
-  url: String
+  url: String @deprecated(reason: "Use urls")
+  urls: [String!]
   parent_id: ID
   "This should be a URL or a base64 encoded data URL"
   image: String
@@ -45,7 +47,8 @@ input StudioCreateInput {
 input StudioUpdateInput {
   id: ID!
   name: String
-  url: String
+  url: String @deprecated(reason: "Use urls")
+  urls: [String!]
   parent_id: ID
   "This should be a URL or a base64 encoded data URL"
   image: String
@@ -61,7 +64,8 @@ input StudioUpdateInput {
 
 input BulkStudioUpdateInput {
   ids: [ID!]!
-  url: String
+  url: String @deprecated(reason: "Use urls")
+  urls: BulkUpdateStrings
   parent_id: ID
   # rating expressed as 1-100
   rating100: Int
diff --git a/internal/api/resolver_model_studio.go b/internal/api/resolver_model_studio.go
index 2111039c8..850d42b54 100644
--- a/internal/api/resolver_model_studio.go
+++ b/internal/api/resolver_model_studio.go
@@ -40,6 +40,35 @@ func (r *studioResolver) Aliases(ctx context.Context, obj *models.Studio) ([]str
 	return obj.Aliases.List(), nil
 }
 
+func (r *studioResolver) URL(ctx context.Context, obj *models.Studio) (*string, error) {
+	if !obj.URLs.Loaded() {
+		if err := r.withReadTxn(ctx, func(ctx context.Context) error {
+			return obj.LoadURLs(ctx, r.repository.Studio)
+		}); err != nil {
+			return nil, err
+		}
+	}
+
+	urls := obj.URLs.List()
+	if len(urls) == 0 {
+		return nil, nil
+	}
+
+	return &urls[0], nil
+}
+
+func (r *studioResolver) Urls(ctx context.Context, obj *models.Studio) ([]string, error) {
+	if !obj.URLs.Loaded() {
+		if err := r.withReadTxn(ctx, func(ctx context.Context) error {
+			return obj.LoadURLs(ctx, r.repository.Studio)
+		}); err != nil {
+			return nil, err
+		}
+	}
+
+	return obj.URLs.List(), nil
+}
+
 func (r *studioResolver) Tags(ctx context.Context, obj *models.Studio) (ret []*models.Tag, err error) {
 	if !obj.TagIDs.Loaded() {
 		if err := r.withReadTxn(ctx, func(ctx context.Context) error {
diff --git a/internal/api/resolver_mutation_studio.go b/internal/api/resolver_mutation_studio.go
index caecf39b9..03c13d85f 100644
--- a/internal/api/resolver_mutation_studio.go
+++ b/internal/api/resolver_mutation_studio.go
@@ -33,7 +33,6 @@ func (r *mutationResolver) StudioCreate(ctx context.Context, input models.Studio
 	newStudio := models.NewStudio()
 
 	newStudio.Name = input.Name
-	newStudio.URL = translator.string(input.URL)
 	newStudio.Rating = input.Rating100
 	newStudio.Favorite = translator.bool(input.Favorite)
 	newStudio.Details = translator.string(input.Details)
@@ -43,6 +42,15 @@ func (r *mutationResolver) StudioCreate(ctx context.Context, input models.Studio
 
 	var err error
 
+	newStudio.URLs = models.NewRelatedStrings([]string{})
+	if input.URL != nil {
+		newStudio.URLs.Add(*input.URL)
+	}
+
+	if input.Urls != nil {
+		newStudio.URLs.Add(input.Urls...)
+	}
+
 	newStudio.ParentID, err = translator.intPtrFromString(input.ParentID)
 	if err != nil {
 		return nil, fmt.Errorf("converting parent id: %w", err)
@@ -106,7 +114,6 @@ func (r *mutationResolver) StudioUpdate(ctx context.Context, input models.Studio
 
 	updatedStudio.ID = studioID
 	updatedStudio.Name = translator.optionalString(input.Name, "name")
-	updatedStudio.URL = translator.optionalString(input.URL, "url")
 	updatedStudio.Details = translator.optionalString(input.Details, "details")
 	updatedStudio.Rating = translator.optionalInt(input.Rating100, "rating100")
 	updatedStudio.Favorite = translator.optionalBool(input.Favorite, "favorite")
@@ -124,6 +131,26 @@ func (r *mutationResolver) StudioUpdate(ctx context.Context, input models.Studio
 		return nil, fmt.Errorf("converting tag ids: %w", err)
 	}
 
+	if translator.hasField("urls") {
+		// ensure url not included in the input
+		if err := r.validateNoLegacyURLs(translator); err != nil {
+			return nil, err
+		}
+
+		updatedStudio.URLs = translator.updateStrings(input.Urls, "urls")
+	} else if translator.hasField("url") {
+		// handle legacy url field
+		legacyURLs := []string{}
+		if input.URL != nil {
+			legacyURLs = append(legacyURLs, *input.URL)
+		}
+
+		updatedStudio.URLs = &models.UpdateStrings{
+			Mode:   models.RelationshipUpdateModeSet,
+			Values: legacyURLs,
+		}
+	}
+
 	// Process the base 64 encoded image string
 	var imageData []byte
 	imageIncluded := translator.hasField("image")
@@ -181,7 +208,26 @@ func (r *mutationResolver) BulkStudioUpdate(ctx context.Context, input BulkStudi
 		return nil, fmt.Errorf("converting parent id: %w", err)
 	}
 
-	partial.URL = translator.optionalString(input.URL, "url")
+	if translator.hasField("urls") {
+		// ensure url/twitter/instagram are not included in the input
+		if err := r.validateNoLegacyURLs(translator); err != nil {
+			return nil, err
+		}
+
+		partial.URLs = translator.updateStringsBulk(input.Urls, "urls")
+	} else if translator.hasField("url") {
+		// handle legacy url field
+		legacyURLs := []string{}
+		if input.URL != nil {
+			legacyURLs = append(legacyURLs, *input.URL)
+		}
+
+		partial.URLs = &models.UpdateStrings{
+			Mode:   models.RelationshipUpdateModeSet,
+			Values: legacyURLs,
+		}
+	}
+
 	partial.Favorite = translator.optionalBool(input.Favorite, "favorite")
 	partial.Rating = translator.optionalInt(input.Rating100, "rating100")
 	partial.Details = translator.optionalString(input.Details, "details")
diff --git a/pkg/models/jsonschema/studio.go b/pkg/models/jsonschema/studio.go
index 80ed97d92..a3706df66 100644
--- a/pkg/models/jsonschema/studio.go
+++ b/pkg/models/jsonschema/studio.go
@@ -12,7 +12,7 @@ import (
 
 type Studio struct {
 	Name          string           `json:"name,omitempty"`
-	URL           string           `json:"url,omitempty"`
+	URLs          []string         `json:"urls,omitempty"`
 	ParentStudio  string           `json:"parent_studio,omitempty"`
 	Image         string           `json:"image,omitempty"`
 	CreatedAt     json.JSONTime    `json:"created_at,omitempty"`
@@ -24,6 +24,9 @@ type Studio struct {
 	StashIDs      []models.StashID `json:"stash_ids,omitempty"`
 	Tags          []string         `json:"tags,omitempty"`
 	IgnoreAutoTag bool             `json:"ignore_auto_tag,omitempty"`
+
+	// deprecated - for import only
+	URL string `json:"url,omitempty"`
 }
 
 func (s Studio) Filename() string {
diff --git a/pkg/models/mocks/StudioReaderWriter.go b/pkg/models/mocks/StudioReaderWriter.go
index d4932ca71..481565d6f 100644
--- a/pkg/models/mocks/StudioReaderWriter.go
+++ b/pkg/models/mocks/StudioReaderWriter.go
@@ -360,6 +360,29 @@ func (_m *StudioReaderWriter) GetTagIDs(ctx context.Context, relatedID int) ([]i
 	return r0, r1
 }
 
+// GetURLs provides a mock function with given fields: ctx, relatedID
+func (_m *StudioReaderWriter) GetURLs(ctx context.Context, relatedID int) ([]string, error) {
+	ret := _m.Called(ctx, relatedID)
+
+	var r0 []string
+	if rf, ok := ret.Get(0).(func(context.Context, int) []string); ok {
+		r0 = rf(ctx, relatedID)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).([]string)
+		}
+	}
+
+	var r1 error
+	if rf, ok := ret.Get(1).(func(context.Context, int) error); ok {
+		r1 = rf(ctx, relatedID)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
 // HasImage provides a mock function with given fields: ctx, studioID
 func (_m *StudioReaderWriter) HasImage(ctx context.Context, studioID int) (bool, error) {
 	ret := _m.Called(ctx, studioID)
diff --git a/pkg/models/model_scraped_item.go b/pkg/models/model_scraped_item.go
index f7a9d6255..a06463134 100644
--- a/pkg/models/model_scraped_item.go
+++ b/pkg/models/model_scraped_item.go
@@ -14,7 +14,8 @@ type ScrapedStudio struct {
 	// Set if studio matched
 	StoredID     *string        `json:"stored_id"`
 	Name         string         `json:"name"`
-	URL          *string        `json:"url"`
+	URL          *string        `json:"url"` // deprecated
+	URLs         []string       `json:"urls"`
 	Parent       *ScrapedStudio `json:"parent"`
 	Image        *string        `json:"image"`
 	Images       []string       `json:"images"`
@@ -38,8 +39,20 @@ func (s *ScrapedStudio) ToStudio(endpoint string, excluded map[string]bool) *Stu
 		})
 	}
 
-	if s.URL != nil && !excluded["url"] {
-		ret.URL = *s.URL
+	// if URLs are provided, only use those
+	if len(s.URLs) > 0 {
+		if !excluded["urls"] {
+			ret.URLs = NewRelatedStrings(s.URLs)
+		}
+	} else {
+		urls := []string{}
+		if s.URL != nil && !excluded["url"] {
+			urls = append(urls, *s.URL)
+		}
+
+		if len(urls) > 0 {
+			ret.URLs = NewRelatedStrings(urls)
+		}
 	}
 
 	if s.Parent != nil && s.Parent.StoredID != nil && !excluded["parent"] && !excluded["parent_studio"] {
@@ -74,8 +87,25 @@ func (s *ScrapedStudio) ToPartial(id string, endpoint string, excluded map[strin
 		ret.Name = NewOptionalString(s.Name)
 	}
 
-	if s.URL != nil && !excluded["url"] {
-		ret.URL = NewOptionalString(*s.URL)
+	if len(s.URLs) > 0 {
+		if !excluded["urls"] {
+			ret.URLs = &UpdateStrings{
+				Values: s.URLs,
+				Mode:   RelationshipUpdateModeSet,
+			}
+		}
+	} else {
+		urls := []string{}
+		if s.URL != nil && !excluded["url"] {
+			urls = append(urls, *s.URL)
+		}
+
+		if len(urls) > 0 {
+			ret.URLs = &UpdateStrings{
+				Values: urls,
+				Mode:   RelationshipUpdateModeSet,
+			}
+		}
 	}
 
 	if s.Parent != nil && !excluded["parent"] {
diff --git a/pkg/models/model_scraped_item_test.go b/pkg/models/model_scraped_item_test.go
index 1e8edccb4..b6b44025f 100644
--- a/pkg/models/model_scraped_item_test.go
+++ b/pkg/models/model_scraped_item_test.go
@@ -11,6 +11,7 @@ import (
 func Test_scrapedToStudioInput(t *testing.T) {
 	const name = "name"
 	url := "url"
+	url2 := "url2"
 	emptyEndpoint := ""
 	endpoint := "endpoint"
 	remoteSiteID := "remoteSiteID"
@@ -25,13 +26,33 @@ func Test_scrapedToStudioInput(t *testing.T) {
 			"set all",
 			&ScrapedStudio{
 				Name:         name,
+				URLs:         []string{url, url2},
 				URL:          &url,
 				RemoteSiteID: &remoteSiteID,
 			},
 			endpoint,
 			&Studio{
 				Name: name,
-				URL:  url,
+				URLs: NewRelatedStrings([]string{url, url2}),
+				StashIDs: NewRelatedStashIDs([]StashID{
+					{
+						Endpoint: endpoint,
+						StashID:  remoteSiteID,
+					},
+				}),
+			},
+		},
+		{
+			"set url instead of urls",
+			&ScrapedStudio{
+				Name:         name,
+				URL:          &url,
+				RemoteSiteID: &remoteSiteID,
+			},
+			endpoint,
+			&Studio{
+				Name: name,
+				URLs: NewRelatedStrings([]string{url}),
 				StashIDs: NewRelatedStashIDs([]StashID{
 					{
 						Endpoint: endpoint,
@@ -321,9 +342,12 @@ func TestScrapedStudio_ToPartial(t *testing.T) {
 			fullStudio,
 			stdArgs,
 			StudioPartial{
-				ID:       id,
-				Name:     NewOptionalString(name),
-				URL:      NewOptionalString(url),
+				ID:   id,
+				Name: NewOptionalString(name),
+				URLs: &UpdateStrings{
+					Values: []string{url},
+					Mode:   RelationshipUpdateModeSet,
+				},
 				ParentID: NewOptionalInt(parentStoredID),
 				StashIDs: &UpdateStashIDs{
 					StashIDs: append(existingStashIDs, StashID{
diff --git a/pkg/models/model_studio.go b/pkg/models/model_studio.go
index 0f4a09bc2..8c7a687af 100644
--- a/pkg/models/model_studio.go
+++ b/pkg/models/model_studio.go
@@ -8,7 +8,6 @@ import (
 type Studio struct {
 	ID        int       `json:"id"`
 	Name      string    `json:"name"`
-	URL       string    `json:"url"`
 	ParentID  *int      `json:"parent_id"`
 	CreatedAt time.Time `json:"created_at"`
 	UpdatedAt time.Time `json:"updated_at"`
@@ -19,6 +18,7 @@ type Studio struct {
 	IgnoreAutoTag bool   `json:"ignore_auto_tag"`
 
 	Aliases  RelatedStrings  `json:"aliases"`
+	URLs     RelatedStrings  `json:"urls"`
 	TagIDs   RelatedIDs      `json:"tag_ids"`
 	StashIDs RelatedStashIDs `json:"stash_ids"`
 }
@@ -35,7 +35,6 @@ func NewStudio() Studio {
 type StudioPartial struct {
 	ID       int
 	Name     OptionalString
-	URL      OptionalString
 	ParentID OptionalInt
 	// Rating expressed in 1-100 scale
 	Rating        OptionalInt
@@ -46,6 +45,7 @@ type StudioPartial struct {
 	IgnoreAutoTag OptionalBool
 
 	Aliases  *UpdateStrings
+	URLs     *UpdateStrings
 	TagIDs   *UpdateIDs
 	StashIDs *UpdateStashIDs
 }
@@ -63,6 +63,12 @@ func (s *Studio) LoadAliases(ctx context.Context, l AliasLoader) error {
 	})
 }
 
+func (s *Studio) LoadURLs(ctx context.Context, l URLLoader) error {
+	return s.URLs.load(func() ([]string, error) {
+		return l.GetURLs(ctx, s.ID)
+	})
+}
+
 func (s *Studio) LoadTagIDs(ctx context.Context, l TagIDLoader) error {
 	return s.TagIDs.load(func() ([]int, error) {
 		return l.GetTagIDs(ctx, s.ID)
diff --git a/pkg/models/repository_studio.go b/pkg/models/repository_studio.go
index a2b9202f3..99f98bffc 100644
--- a/pkg/models/repository_studio.go
+++ b/pkg/models/repository_studio.go
@@ -77,6 +77,7 @@ type StudioReader interface {
 	AliasLoader
 	StashIDLoader
 	TagIDLoader
+	URLLoader
 
 	All(ctx context.Context) ([]*Studio, error)
 	GetImage(ctx context.Context, studioID int) ([]byte, error)
diff --git a/pkg/models/studio.go b/pkg/models/studio.go
index 03ea8a84d..171168129 100644
--- a/pkg/models/studio.go
+++ b/pkg/models/studio.go
@@ -47,9 +47,10 @@ type StudioFilterType struct {
 }
 
 type StudioCreateInput struct {
-	Name     string  `json:"name"`
-	URL      *string `json:"url"`
-	ParentID *string `json:"parent_id"`
+	Name     string   `json:"name"`
+	URL      *string  `json:"url"` // deprecated
+	Urls     []string `json:"urls"`
+	ParentID *string  `json:"parent_id"`
 	// This should be a URL or a base64 encoded data URL
 	Image         *string        `json:"image"`
 	StashIds      []StashIDInput `json:"stash_ids"`
@@ -62,10 +63,11 @@ type StudioCreateInput struct {
 }
 
 type StudioUpdateInput struct {
-	ID       string  `json:"id"`
-	Name     *string `json:"name"`
-	URL      *string `json:"url"`
-	ParentID *string `json:"parent_id"`
+	ID       string   `json:"id"`
+	Name     *string  `json:"name"`
+	URL      *string  `json:"url"` // deprecated
+	Urls     []string `json:"urls"`
+	ParentID *string  `json:"parent_id"`
 	// This should be a URL or a base64 encoded data URL
 	Image         *string        `json:"image"`
 	StashIds      []StashIDInput `json:"stash_ids"`
diff --git a/pkg/performer/import.go b/pkg/performer/import.go
index 3aaacdb8b..622af2b1a 100644
--- a/pkg/performer/import.go
+++ b/pkg/performer/import.go
@@ -233,7 +233,7 @@ func performerJSONToPerformer(performerJSON jsonschema.Performer) models.Perform
 		}
 
 		if len(urls) > 0 {
-			newPerformer.URLs = models.NewRelatedStrings([]string{performerJSON.URL})
+			newPerformer.URLs = models.NewRelatedStrings(urls)
 		}
 	}
 
diff --git a/pkg/sqlite/anonymise.go b/pkg/sqlite/anonymise.go
index 20926ed25..ba376d785 100644
--- a/pkg/sqlite/anonymise.go
+++ b/pkg/sqlite/anonymise.go
@@ -619,7 +619,6 @@ func (db *Anonymiser) anonymiseStudios(ctx context.Context) error {
 			query := dialect.From(table).Select(
 				table.Col(idColumn),
 				table.Col("name"),
-				table.Col("url"),
 				table.Col("details"),
 			).Where(table.Col(idColumn).Gt(lastID)).Limit(1000)
 
@@ -630,14 +629,12 @@ func (db *Anonymiser) anonymiseStudios(ctx context.Context) error {
 				var (
 					id      int
 					name    sql.NullString
-					url     sql.NullString
 					details sql.NullString
 				)
 
 				if err := rows.Scan(
 					&id,
 					&name,
-					&url,
 					&details,
 				); err != nil {
 					return err
@@ -645,7 +642,6 @@ func (db *Anonymiser) anonymiseStudios(ctx context.Context) error {
 
 				set := goqu.Record{}
 				db.obfuscateNullString(set, "name", name)
-				db.obfuscateNullString(set, "url", url)
 				db.obfuscateNullString(set, "details", details)
 
 				if len(set) > 0 {
@@ -677,6 +673,10 @@ func (db *Anonymiser) anonymiseStudios(ctx context.Context) error {
 		return err
 	}
 
+	if err := db.anonymiseURLs(ctx, goqu.T(studioURLsTable), "studio_id"); err != nil {
+		return err
+	}
+
 	return nil
 }
 
diff --git a/pkg/sqlite/database.go b/pkg/sqlite/database.go
index 8bf0f0bda..b846efaf4 100644
--- a/pkg/sqlite/database.go
+++ b/pkg/sqlite/database.go
@@ -34,7 +34,7 @@ const (
 	cacheSizeEnv = "STASH_SQLITE_CACHE_SIZE"
 )
 
-var appSchemaVersion uint = 72
+var appSchemaVersion uint = 73
 
 //go:embed migrations/*.sql
 var migrationsBox embed.FS
diff --git a/pkg/sqlite/migrations/73_studio_urls.up.sql b/pkg/sqlite/migrations/73_studio_urls.up.sql
new file mode 100644
index 000000000..c356713c0
--- /dev/null
+++ b/pkg/sqlite/migrations/73_studio_urls.up.sql
@@ -0,0 +1,24 @@
+CREATE TABLE `studio_urls` (
+  `studio_id` integer NOT NULL,
+  `position` integer NOT NULL,
+  `url` varchar(255) NOT NULL,
+  foreign key(`studio_id`) references `studios`(`id`) on delete CASCADE,
+  PRIMARY KEY(`studio_id`, `position`, `url`)
+);
+
+CREATE INDEX `studio_urls_url` on `studio_urls` (`url`);
+
+INSERT INTO `studio_urls`
+  (
+    `studio_id`,
+    `position`,
+    `url`
+  )
+  SELECT 
+    `id`,
+    '0',
+    `url`
+  FROM `studios`
+  WHERE `studios`.`url` IS NOT NULL AND `studios`.`url` != '';
+
+ALTER TABLE `studios` DROP COLUMN `url`;
diff --git a/pkg/sqlite/migrations/README.md b/pkg/sqlite/migrations/README.md
new file mode 100644
index 000000000..f0abb9bc0
--- /dev/null
+++ b/pkg/sqlite/migrations/README.md
@@ -0,0 +1,7 @@
+# Creating a migration
+
+1. Create new migration file in the migrations directory with the format `NN_description.up.sql`, where `NN` is the next sequential number.
+
+2. Update `pkg/sqlite/database.go` to update the `appSchemaVersion` value to the new migration number.
+
+For migrations requiring complex logic or config file changes, see existing custom migrations for examples.
\ No newline at end of file
diff --git a/pkg/sqlite/scene_test.go b/pkg/sqlite/scene_test.go
index b39b47129..1efc4d705 100644
--- a/pkg/sqlite/scene_test.go
+++ b/pkg/sqlite/scene_test.go
@@ -2659,6 +2659,21 @@ func verifyString(t *testing.T, value string, criterion models.StringCriterionIn
 	}
 }
 
+func verifyStringList(t *testing.T, values []string, criterion models.StringCriterionInput) {
+	t.Helper()
+	assert := assert.New(t)
+	switch criterion.Modifier {
+	case models.CriterionModifierIsNull:
+		assert.Empty(values)
+	case models.CriterionModifierNotNull:
+		assert.NotEmpty(values)
+	default:
+		for _, v := range values {
+			verifyString(t, v, criterion)
+		}
+	}
+}
+
 func TestSceneQueryRating100(t *testing.T) {
 	const rating = 60
 	ratingCriterion := models.IntCriterionInput{
diff --git a/pkg/sqlite/setup_test.go b/pkg/sqlite/setup_test.go
index a1df897ca..704dde8a2 100644
--- a/pkg/sqlite/setup_test.go
+++ b/pkg/sqlite/setup_test.go
@@ -1770,6 +1770,24 @@ func getStudioBoolValue(index int) bool {
 	return index == 1
 }
 
+func getStudioEmptyString(index int, field string) string {
+	v := getPrefixedNullStringValue("studio", index, field)
+	if !v.Valid {
+		return ""
+	}
+
+	return v.String
+}
+
+func getStudioStringList(index int, field string) []string {
+	v := getStudioEmptyString(index, field)
+	if v == "" {
+		return []string{}
+	}
+
+	return []string{v}
+}
+
 // createStudios creates n studios with plain Name and o studios with camel cased NaMe included
 func createStudios(ctx context.Context, n int, o int) error {
 	sqb := db.Studio
@@ -1790,7 +1808,7 @@ func createStudios(ctx context.Context, n int, o int) error {
 		tids := indexesToIDs(tagIDs, studioTags[i])
 		studio := models.Studio{
 			Name:          name,
-			URL:           getStudioStringValue(index, urlField),
+			URLs:          models.NewRelatedStrings(getStudioStringList(i, urlField)),
 			Favorite:      getStudioBoolValue(index),
 			IgnoreAutoTag: getIgnoreAutoTag(i),
 			TagIDs:        models.NewRelatedIDs(tids),
diff --git a/pkg/sqlite/studio.go b/pkg/sqlite/studio.go
index 5affb73d6..bddc17c12 100644
--- a/pkg/sqlite/studio.go
+++ b/pkg/sqlite/studio.go
@@ -18,8 +18,12 @@ import (
 )
 
 const (
-	studioTable           = "studios"
-	studioIDColumn        = "studio_id"
+	studioTable    = "studios"
+	studioIDColumn = "studio_id"
+
+	studioURLsTable = "studio_urls"
+	studioURLColumn = "url"
+
 	studioAliasesTable    = "studio_aliases"
 	studioAliasColumn     = "alias"
 	studioParentIDColumn  = "parent_id"
@@ -31,7 +35,6 @@ const (
 type studioRow struct {
 	ID        int         `db:"id" goqu:"skipinsert"`
 	Name      zero.String `db:"name"`
-	URL       zero.String `db:"url"`
 	ParentID  null.Int    `db:"parent_id,omitempty"`
 	CreatedAt Timestamp   `db:"created_at"`
 	UpdatedAt Timestamp   `db:"updated_at"`
@@ -48,7 +51,6 @@ type studioRow struct {
 func (r *studioRow) fromStudio(o models.Studio) {
 	r.ID = o.ID
 	r.Name = zero.StringFrom(o.Name)
-	r.URL = zero.StringFrom(o.URL)
 	r.ParentID = intFromPtr(o.ParentID)
 	r.CreatedAt = Timestamp{Timestamp: o.CreatedAt}
 	r.UpdatedAt = Timestamp{Timestamp: o.UpdatedAt}
@@ -62,7 +64,6 @@ func (r *studioRow) resolve() *models.Studio {
 	ret := &models.Studio{
 		ID:            r.ID,
 		Name:          r.Name.String,
-		URL:           r.URL.String,
 		ParentID:      nullIntPtr(r.ParentID),
 		CreatedAt:     r.CreatedAt.Timestamp,
 		UpdatedAt:     r.UpdatedAt.Timestamp,
@@ -81,7 +82,6 @@ type studioRowRecord struct {
 
 func (r *studioRowRecord) fromPartial(o models.StudioPartial) {
 	r.setNullString("name", o.Name)
-	r.setNullString("url", o.URL)
 	r.setNullInt("parent_id", o.ParentID)
 	r.setTimestamp("created_at", o.CreatedAt)
 	r.setTimestamp("updated_at", o.UpdatedAt)
@@ -190,6 +190,13 @@ func (qb *StudioStore) Create(ctx context.Context, newObject *models.Studio) err
 		}
 	}
 
+	if newObject.URLs.Loaded() {
+		const startPos = 0
+		if err := studiosURLsTableMgr.insertJoins(ctx, id, startPos, newObject.URLs.List()); err != nil {
+			return err
+		}
+	}
+
 	if err := qb.tagRelationshipStore.createRelationships(ctx, id, newObject.TagIDs); err != nil {
 		return err
 	}
@@ -234,6 +241,12 @@ func (qb *StudioStore) UpdatePartial(ctx context.Context, input models.StudioPar
 		}
 	}
 
+	if input.URLs != nil {
+		if err := studiosURLsTableMgr.modifyJoins(ctx, input.ID, input.URLs.Values, input.URLs.Mode); err != nil {
+			return nil, err
+		}
+	}
+
 	if err := qb.tagRelationshipStore.modifyRelationships(ctx, input.ID, input.TagIDs); err != nil {
 		return nil, err
 	}
@@ -262,6 +275,12 @@ func (qb *StudioStore) Update(ctx context.Context, updatedObject *models.Studio)
 		}
 	}
 
+	if updatedObject.URLs.Loaded() {
+		if err := studiosURLsTableMgr.replaceJoins(ctx, updatedObject.ID, updatedObject.URLs.List()); err != nil {
+			return err
+		}
+	}
+
 	if err := qb.tagRelationshipStore.replaceRelationships(ctx, updatedObject.ID, updatedObject.TagIDs); err != nil {
 		return err
 	}
@@ -507,7 +526,7 @@ func (qb *StudioStore) QueryForAutoTag(ctx context.Context, words []string) ([]*
 	ret, err := qb.findBySubquery(ctx, sq)
 
 	if err != nil {
-		return nil, fmt.Errorf("getting performers for autotag: %w", err)
+		return nil, fmt.Errorf("getting studios for autotag: %w", err)
 	}
 
 	return ret, nil
@@ -663,3 +682,7 @@ func (qb *StudioStore) GetStashIDs(ctx context.Context, studioID int) ([]models.
 func (qb *StudioStore) GetAliases(ctx context.Context, studioID int) ([]string, error) {
 	return studiosAliasesTableMgr.get(ctx, studioID)
 }
+
+func (qb *StudioStore) GetURLs(ctx context.Context, studioID int) ([]string, error) {
+	return studiosURLsTableMgr.get(ctx, studioID)
+}
diff --git a/pkg/sqlite/studio_filter.go b/pkg/sqlite/studio_filter.go
index c514364c4..6ff7fcced 100644
--- a/pkg/sqlite/studio_filter.go
+++ b/pkg/sqlite/studio_filter.go
@@ -55,7 +55,7 @@ func (qb *studioFilterHandler) criterionHandler() criterionHandler {
 	return compoundHandler{
 		stringCriterionHandler(studioFilter.Name, studioTable+".name"),
 		stringCriterionHandler(studioFilter.Details, studioTable+".details"),
-		stringCriterionHandler(studioFilter.URL, studioTable+".url"),
+		qb.urlsCriterionHandler(studioFilter.URL),
 		intCriterionHandler(studioFilter.Rating100, studioTable+".rating", nil),
 		boolCriterionHandler(studioFilter.Favorite, studioTable+".favorite", nil),
 		boolCriterionHandler(studioFilter.IgnoreAutoTag, studioTable+".ignore_auto_tag", nil),
@@ -118,6 +118,9 @@ func (qb *studioFilterHandler) isMissingCriterionHandler(isMissing *string) crit
 	return func(ctx context.Context, f *filterBuilder) {
 		if isMissing != nil && *isMissing != "" {
 			switch *isMissing {
+			case "url":
+				studiosURLsTableMgr.join(f, "", "studios.id")
+				f.addWhere("studio_urls.url IS NULL")
 			case "image":
 				f.addWhere("studios.image_blob IS NULL")
 			case "stash_id":
@@ -202,6 +205,20 @@ func (qb *studioFilterHandler) aliasCriterionHandler(alias *models.StringCriteri
 	return h.handler(alias)
 }
 
+func (qb *studioFilterHandler) urlsCriterionHandler(url *models.StringCriterionInput) criterionHandlerFunc {
+	h := stringListCriterionHandlerBuilder{
+		primaryTable: studioTable,
+		primaryFK:    studioIDColumn,
+		joinTable:    studioURLsTable,
+		stringColumn: studioURLColumn,
+		addJoinTable: func(f *filterBuilder) {
+			studiosURLsTableMgr.join(f, "", "studios.id")
+		},
+	}
+
+	return h.handler(url)
+}
+
 func (qb *studioFilterHandler) childCountCriterionHandler(childCount *models.IntCriterionInput) criterionHandlerFunc {
 	return func(ctx context.Context, f *filterBuilder) {
 		if childCount != nil {
diff --git a/pkg/sqlite/studio_test.go b/pkg/sqlite/studio_test.go
index c327a6316..003877c77 100644
--- a/pkg/sqlite/studio_test.go
+++ b/pkg/sqlite/studio_test.go
@@ -82,6 +82,14 @@ func TestStudioQueryNameOr(t *testing.T) {
 	})
 }
 
+func loadStudioRelationships(ctx context.Context, t *testing.T, s *models.Studio) error {
+	if err := s.LoadURLs(ctx, db.Studio); err != nil {
+		return err
+	}
+
+	return nil
+}
+
 func TestStudioQueryNameAndUrl(t *testing.T) {
 	const studioIdx = 1
 	studioName := getStudioStringValue(studioIdx, "Name")
@@ -107,9 +115,16 @@ func TestStudioQueryNameAndUrl(t *testing.T) {
 
 		studios := queryStudio(ctx, t, sqb, &studioFilter, nil)
 
-		assert.Len(t, studios, 1)
+		if !assert.Len(t, studios, 1) {
+			return nil
+		}
+
+		if err := studios[0].LoadURLs(ctx, db.Studio); err != nil {
+			t.Errorf("Error loading studio relationships: %v", err)
+		}
+
 		assert.Equal(t, studioName, studios[0].Name)
-		assert.Equal(t, studioUrl, studios[0].URL)
+		assert.Equal(t, []string{studioUrl}, studios[0].URLs.List())
 
 		return nil
 	})
@@ -145,9 +160,13 @@ func TestStudioQueryNameNotUrl(t *testing.T) {
 		studios := queryStudio(ctx, t, sqb, &studioFilter, nil)
 
 		for _, studio := range studios {
+			if err := studio.LoadURLs(ctx, db.Studio); err != nil {
+				t.Errorf("Error loading studio relationships: %v", err)
+			}
+
 			verifyString(t, studio.Name, nameCriterion)
 			urlCriterion.Modifier = models.CriterionModifierNotEquals
-			verifyString(t, studio.URL, urlCriterion)
+			verifyStringList(t, studio.URLs.List(), urlCriterion)
 		}
 
 		return nil
@@ -659,7 +678,11 @@ func TestStudioQueryURL(t *testing.T) {
 
 	verifyFn := func(ctx context.Context, g *models.Studio) {
 		t.Helper()
-		verifyString(t, g.URL, urlCriterion)
+		if err := g.LoadURLs(ctx, db.Studio); err != nil {
+			t.Errorf("Error loading studio relationships: %v", err)
+			return
+		}
+		verifyStringList(t, g.URLs.List(), urlCriterion)
 	}
 
 	verifyStudioQuery(t, filter, verifyFn)
diff --git a/pkg/sqlite/tables.go b/pkg/sqlite/tables.go
index 0188cfebc..b28dd777c 100644
--- a/pkg/sqlite/tables.go
+++ b/pkg/sqlite/tables.go
@@ -37,6 +37,7 @@ var (
 	performersCustomFieldsTable = goqu.T("performer_custom_fields")
 
 	studiosAliasesJoinTable  = goqu.T(studioAliasesTable)
+	studiosURLsJoinTable     = goqu.T(studioURLsTable)
 	studiosTagsJoinTable     = goqu.T(studiosTagsTable)
 	studiosStashIDsJoinTable = goqu.T("studio_stash_ids")
 
@@ -319,6 +320,14 @@ var (
 		stringColumn: studiosAliasesJoinTable.Col(studioAliasColumn),
 	}
 
+	studiosURLsTableMgr = &orderedValueTable[string]{
+		table: table{
+			table:    studiosURLsJoinTable,
+			idColumn: studiosURLsJoinTable.Col(studioIDColumn),
+		},
+		valueColumn: studiosURLsJoinTable.Col(studioURLColumn),
+	}
+
 	studiosTagsTableMgr = &joinTable{
 		table: table{
 			table:    studiosTagsJoinTable,
diff --git a/pkg/stashbox/studio.go b/pkg/stashbox/studio.go
index b424ac6fa..a0e9a6ea6 100644
--- a/pkg/stashbox/studio.go
+++ b/pkg/stashbox/studio.go
@@ -65,11 +65,14 @@ func studioFragmentToScrapedStudio(s graphql.StudioFragment) *models.ScrapedStud
 
 	st := &models.ScrapedStudio{
 		Name:         s.Name,
-		URL:          findURL(s.Urls, "HOME"),
 		Images:       images,
 		RemoteSiteID: &s.ID,
 	}
 
+	for _, u := range s.Urls {
+		st.URLs = append(st.URLs, u.URL)
+	}
+
 	if len(st.Images) > 0 {
 		st.Image = &st.Images[0]
 	}
diff --git a/pkg/studio/export.go b/pkg/studio/export.go
index 483058c10..1440c3cdd 100644
--- a/pkg/studio/export.go
+++ b/pkg/studio/export.go
@@ -14,6 +14,7 @@ import (
 type FinderImageStashIDGetter interface {
 	models.StudioGetter
 	models.AliasLoader
+	models.URLLoader
 	models.StashIDLoader
 	GetImage(ctx context.Context, studioID int) ([]byte, error)
 }
@@ -22,7 +23,6 @@ type FinderImageStashIDGetter interface {
 func ToJSON(ctx context.Context, reader FinderImageStashIDGetter, studio *models.Studio) (*jsonschema.Studio, error) {
 	newStudioJSON := jsonschema.Studio{
 		Name:          studio.Name,
-		URL:           studio.URL,
 		Details:       studio.Details,
 		Favorite:      studio.Favorite,
 		IgnoreAutoTag: studio.IgnoreAutoTag,
@@ -50,6 +50,11 @@ func ToJSON(ctx context.Context, reader FinderImageStashIDGetter, studio *models
 	}
 	newStudioJSON.Aliases = studio.Aliases.List()
 
+	if err := studio.LoadURLs(ctx, reader); err != nil {
+		return nil, fmt.Errorf("loading studio URLs: %w", err)
+	}
+	newStudioJSON.URLs = studio.URLs.List()
+
 	if err := studio.LoadStashIDs(ctx, reader); err != nil {
 		return nil, fmt.Errorf("loading studio stash ids: %w", err)
 	}
diff --git a/pkg/studio/export_test.go b/pkg/studio/export_test.go
index 0e42141ec..c333c0ad5 100644
--- a/pkg/studio/export_test.go
+++ b/pkg/studio/export_test.go
@@ -60,7 +60,7 @@ func createFullStudio(id int, parentID int) models.Studio {
 	ret := models.Studio{
 		ID:            id,
 		Name:          studioName,
-		URL:           url,
+		URLs:          models.NewRelatedStrings([]string{url}),
 		Details:       details,
 		Favorite:      true,
 		CreatedAt:     createTime,
@@ -84,6 +84,7 @@ func createEmptyStudio(id int) models.Studio {
 		ID:        id,
 		CreatedAt: createTime,
 		UpdatedAt: updateTime,
+		URLs:      models.NewRelatedStrings([]string{}),
 		Aliases:   models.NewRelatedStrings([]string{}),
 		TagIDs:    models.NewRelatedIDs([]int{}),
 		StashIDs:  models.NewRelatedStashIDs([]models.StashID{}),
@@ -93,7 +94,7 @@ func createEmptyStudio(id int) models.Studio {
 func createFullJSONStudio(parentStudio, image string, aliases []string) *jsonschema.Studio {
 	return &jsonschema.Studio{
 		Name:     studioName,
-		URL:      url,
+		URLs:     []string{url},
 		Details:  details,
 		Favorite: true,
 		CreatedAt: json.JSONTime{
@@ -120,6 +121,7 @@ func createEmptyJSONStudio() *jsonschema.Studio {
 			Time: updateTime,
 		},
 		Aliases:  []string{},
+		URLs:     []string{},
 		StashIDs: []models.StashID{},
 	}
 }
diff --git a/pkg/studio/import.go b/pkg/studio/import.go
index 3aaceb093..405852e53 100644
--- a/pkg/studio/import.go
+++ b/pkg/studio/import.go
@@ -217,7 +217,6 @@ func (i *Importer) Update(ctx context.Context, id int) error {
 func studioJSONtoStudio(studioJSON jsonschema.Studio) models.Studio {
 	newStudio := models.Studio{
 		Name:          studioJSON.Name,
-		URL:           studioJSON.URL,
 		Aliases:       models.NewRelatedStrings(studioJSON.Aliases),
 		Details:       studioJSON.Details,
 		Favorite:      studioJSON.Favorite,
@@ -229,6 +228,19 @@ func studioJSONtoStudio(studioJSON jsonschema.Studio) models.Studio {
 		StashIDs: models.NewRelatedStashIDs(studioJSON.StashIDs),
 	}
 
+	if len(studioJSON.URLs) > 0 {
+		newStudio.URLs = models.NewRelatedStrings(studioJSON.URLs)
+	} else {
+		urls := []string{}
+		if studioJSON.URL != "" {
+			urls = append(urls, studioJSON.URL)
+		}
+
+		if len(urls) > 0 {
+			newStudio.URLs = models.NewRelatedStrings(urls)
+		}
+	}
+
 	if studioJSON.Rating != 0 {
 		newStudio.Rating = &studioJSON.Rating
 	}
diff --git a/ui/v2.5/graphql/data/scrapers.graphql b/ui/v2.5/graphql/data/scrapers.graphql
index b2fe0603a..8150c1ba7 100644
--- a/ui/v2.5/graphql/data/scrapers.graphql
+++ b/ui/v2.5/graphql/data/scrapers.graphql
@@ -1,11 +1,11 @@
 fragment ScrapedStudioData on ScrapedStudio {
   stored_id
   name
-  url
+  urls
   parent {
     stored_id
     name
-    url
+    urls
     image
     remote_site_id
   }
@@ -76,7 +76,7 @@ fragment ScrapedScenePerformerData on ScrapedPerformer {
 fragment ScrapedGroupStudioData on ScrapedStudio {
   stored_id
   name
-  url
+  urls
 }
 
 fragment ScrapedGroupData on ScrapedGroup {
@@ -123,11 +123,11 @@ fragment ScrapedSceneGroupData on ScrapedGroup {
 fragment ScrapedSceneStudioData on ScrapedStudio {
   stored_id
   name
-  url
+  urls
   parent {
     stored_id
     name
-    url
+    urls
     image
     remote_site_id
   }
diff --git a/ui/v2.5/graphql/data/studio.graphql b/ui/v2.5/graphql/data/studio.graphql
index 25e776755..d4ba79887 100644
--- a/ui/v2.5/graphql/data/studio.graphql
+++ b/ui/v2.5/graphql/data/studio.graphql
@@ -2,10 +2,12 @@ fragment StudioData on Studio {
   id
   name
   url
+  urls
   parent_studio {
     id
     name
     url
+    urls
     image_path
   }
   child_studios {
diff --git a/ui/v2.5/src/components/Studios/StudioDetails/Studio.tsx b/ui/v2.5/src/components/Studios/StudioDetails/Studio.tsx
index 46c10d73c..fc416320f 100644
--- a/ui/v2.5/src/components/Studios/StudioDetails/Studio.tsx
+++ b/ui/v2.5/src/components/Studios/StudioDetails/Studio.tsx
@@ -287,11 +287,6 @@ const StudioPage: React.FC<IProps> = ({ studio, tabKey }) => {
 
   const showAllCounts = uiConfig?.showChildStudioContent;
 
-  // make array of url so that it doesn't re-render on every change
-  const urls = useMemo(() => {
-    return studio?.url ? [studio.url] : [];
-  }, [studio.url]);
-
   const studioImage = useMemo(() => {
     const existingPath = studio.image_path;
     if (isEditing) {
@@ -471,7 +466,7 @@ const StudioPage: React.FC<IProps> = ({ studio, tabKey }) => {
                     favorite={studio.favorite}
                     onToggleFavorite={(v) => setFavorite(v)}
                   />
-                  <ExternalLinkButtons urls={urls} />
+                  <ExternalLinkButtons urls={studio.urls} />
                 </span>
               </DetailTitle>
 
diff --git a/ui/v2.5/src/components/Studios/StudioDetails/StudioDetailsPanel.tsx b/ui/v2.5/src/components/Studios/StudioDetails/StudioDetailsPanel.tsx
index 81e389765..4d5af043f 100644
--- a/ui/v2.5/src/components/Studios/StudioDetails/StudioDetailsPanel.tsx
+++ b/ui/v2.5/src/components/Studios/StudioDetails/StudioDetailsPanel.tsx
@@ -46,9 +46,28 @@ export const StudioDetailsPanel: React.FC<IStudioDetailsPanel> = ({
     );
   }
 
+  function renderURLs() {
+    if (!studio.urls?.length) {
+      return;
+    }
+
+    return (
+      <ul className="pl-0">
+        {studio.urls.map((url) => (
+          <li key={url}>
+            <a href={url} target="_blank" rel="noreferrer">
+              {url}
+            </a>
+          </li>
+        ))}
+      </ul>
+    );
+  }
+
   return (
     <div className="detail-group">
       <DetailItem id="details" value={studio.details} fullWidth={fullWidth} />
+      <DetailItem id="urls" value={renderURLs()} fullWidth={fullWidth} />
       <DetailItem
         id="parent_studios"
         value={
diff --git a/ui/v2.5/src/components/Studios/StudioDetails/StudioEditPanel.tsx b/ui/v2.5/src/components/Studios/StudioDetails/StudioEditPanel.tsx
index 1089e5ffe..264afdc7c 100644
--- a/ui/v2.5/src/components/Studios/StudioDetails/StudioEditPanel.tsx
+++ b/ui/v2.5/src/components/Studios/StudioDetails/StudioEditPanel.tsx
@@ -47,7 +47,7 @@ export const StudioEditPanel: React.FC<IStudioEditPanel> = ({
 
   const schema = yup.object({
     name: yup.string().required(),
-    url: yup.string().ensure(),
+    urls: yup.array(yup.string().required()).defined(),
     details: yup.string().ensure(),
     parent_id: yup.string().required().nullable(),
     aliases: yupUniqueAliases(intl, "name"),
@@ -60,7 +60,7 @@ export const StudioEditPanel: React.FC<IStudioEditPanel> = ({
   const initialValues = {
     id: studio.id,
     name: studio.name ?? "",
-    url: studio.url ?? "",
+    urls: studio.urls ?? [],
     details: studio.details ?? "",
     parent_id: studio.parent_studio?.id ?? null,
     aliases: studio.aliases ?? [],
@@ -187,7 +187,7 @@ export const StudioEditPanel: React.FC<IStudioEditPanel> = ({
       <Form noValidate onSubmit={formik.handleSubmit} id="studio-edit">
         {renderInputField("name")}
         {renderStringListField("aliases")}
-        {renderInputField("url")}
+        {renderStringListField("urls")}
         {renderInputField("details", "textarea")}
         {renderParentStudioField()}
         {renderTagsField()}
diff --git a/ui/v2.5/src/components/Tagger/scenes/StudioModal.tsx b/ui/v2.5/src/components/Tagger/scenes/StudioModal.tsx
index 249e34e74..1242adbc5 100644
--- a/ui/v2.5/src/components/Tagger/scenes/StudioModal.tsx
+++ b/ui/v2.5/src/components/Tagger/scenes/StudioModal.tsx
@@ -84,6 +84,44 @@ const StudioDetails: React.FC<IStudioDetailsProps> = ({
     );
   }
 
+  function maybeRenderURLListField(
+    name: string,
+    text: string[] | null | undefined,
+    truncate: boolean = true
+  ) {
+    if (!text) return;
+
+    return (
+      <div className="row no-gutters">
+        <div className="col-5 studio-create-modal-field" key={name}>
+          {!isNew && (
+            <Button
+              onClick={() => toggleField(name)}
+              variant="secondary"
+              className={excluded[name] ? "text-muted" : "text-success"}
+            >
+              <Icon icon={excluded[name] ? faTimes : faCheck} />
+            </Button>
+          )}
+          <strong>
+            <FormattedMessage id={name} />:
+          </strong>
+        </div>
+        <div className="col-7 studio-create-modal-value">
+          <ul>
+            {text.map((t, i) => (
+              <li key={i}>
+                <ExternalLink href={t}>
+                  {truncate ? <TruncatedText text={t} /> : t}
+                </ExternalLink>
+              </li>
+            ))}
+          </ul>
+        </div>
+      </div>
+    );
+  }
+
   function maybeRenderStashBoxLink() {
     if (!link) return;
 
@@ -103,7 +141,7 @@ const StudioDetails: React.FC<IStudioDetailsProps> = ({
       <div className="row">
         <div className="col-12">
           {maybeRenderField("name", studio.name, !isNew)}
-          {maybeRenderField("url", studio.url)}
+          {maybeRenderURLListField("urls", studio.urls)}
           {maybeRenderField("parent_studio", studio.parent?.name, false)}
           {maybeRenderStashBoxLink()}
         </div>
@@ -191,7 +229,7 @@ const StudioModal: React.FC<IStudioModalProps> = ({
 
     const studioData: GQL.StudioCreateInput = {
       name: studio.name,
-      url: studio.url,
+      urls: studio.urls,
       image: studio.image,
       parent_id: studio.parent?.stored_id,
     };
@@ -221,7 +259,7 @@ const StudioModal: React.FC<IStudioModalProps> = ({
 
       parentData = {
         name: studio.parent?.name,
-        url: studio.parent?.url,
+        urls: studio.parent?.urls,
         image: studio.parent?.image,
       };
 

From 678b3de7c83f72a998ed1399ae340ad6c285adb6 Mon Sep 17 00:00:00 2001
From: Gykes <24581046+Gykes@users.noreply.github.com>
Date: Sun, 9 Nov 2025 20:00:47 -0800
Subject: [PATCH 125/405] Feature: Support inputURL and inputHostname in
 scrapers (#6250)

---
 pkg/scraper/json.go                           | 22 +++++---
 pkg/scraper/mapped.go                         | 26 +++++++++-
 pkg/scraper/xpath.go                          | 22 +++++---
 .../src/docs/en/Manual/ScraperDevelopment.md  | 50 ++++++++++++++++++-
 4 files changed, 102 insertions(+), 18 deletions(-)

diff --git a/pkg/scraper/json.go b/pkg/scraper/json.go
index fc7eb17a2..9f479f1c2 100644
--- a/pkg/scraper/json.go
+++ b/pkg/scraper/json.go
@@ -80,7 +80,7 @@ func (s *jsonScraper) scrapeByURL(ctx context.Context, url string, ty ScrapeCont
 		return nil, err
 	}
 
-	q := s.getJsonQuery(doc)
+	q := s.getJsonQuery(doc, u)
 	// if these just return the return values from scraper.scrape* functions then
 	// it ends up returning ScrapedContent(nil) rather than nil
 	switch ty {
@@ -140,7 +140,7 @@ func (s *jsonScraper) scrapeByName(ctx context.Context, name string, ty ScrapeCo
 		return nil, err
 	}
 
-	q := s.getJsonQuery(doc)
+	q := s.getJsonQuery(doc, url)
 	q.setType(SearchQuery)
 
 	var content []ScrapedContent
@@ -192,7 +192,7 @@ func (s *jsonScraper) scrapeSceneByScene(ctx context.Context, scene *models.Scen
 		return nil, err
 	}
 
-	q := s.getJsonQuery(doc)
+	q := s.getJsonQuery(doc, url)
 	return scraper.scrapeScene(ctx, q)
 }
 
@@ -227,7 +227,7 @@ func (s *jsonScraper) scrapeByFragment(ctx context.Context, input Input) (Scrape
 		return nil, err
 	}
 
-	q := s.getJsonQuery(doc)
+	q := s.getJsonQuery(doc, url)
 	return scraper.scrapeScene(ctx, q)
 }
 
@@ -251,7 +251,7 @@ func (s *jsonScraper) scrapeImageByImage(ctx context.Context, image *models.Imag
 		return nil, err
 	}
 
-	q := s.getJsonQuery(doc)
+	q := s.getJsonQuery(doc, url)
 	return scraper.scrapeImage(ctx, q)
 }
 
@@ -275,14 +275,15 @@ func (s *jsonScraper) scrapeGalleryByGallery(ctx context.Context, gallery *model
 		return nil, err
 	}
 
-	q := s.getJsonQuery(doc)
+	q := s.getJsonQuery(doc, url)
 	return scraper.scrapeGallery(ctx, q)
 }
 
-func (s *jsonScraper) getJsonQuery(doc string) *jsonQuery {
+func (s *jsonScraper) getJsonQuery(doc string, url string) *jsonQuery {
 	return &jsonQuery{
 		doc:     doc,
 		scraper: s,
+		url:     url,
 	}
 }
 
@@ -290,6 +291,7 @@ type jsonQuery struct {
 	doc       string
 	scraper   *jsonScraper
 	queryType QueryType
+	url       string
 }
 
 func (q *jsonQuery) getType() QueryType {
@@ -300,6 +302,10 @@ func (q *jsonQuery) setType(t QueryType) {
 	q.queryType = t
 }
 
+func (q *jsonQuery) getURL() string {
+	return q.url
+}
+
 func (q *jsonQuery) runQuery(selector string) ([]string, error) {
 	value := gjson.Get(q.doc, selector)
 
@@ -331,5 +337,5 @@ func (q *jsonQuery) subScrape(ctx context.Context, value string) mappedQuery {
 		return nil
 	}
 
-	return q.scraper.getJsonQuery(doc)
+	return q.scraper.getJsonQuery(doc, value)
 }
diff --git a/pkg/scraper/mapped.go b/pkg/scraper/mapped.go
index f89499176..3fac22ec3 100644
--- a/pkg/scraper/mapped.go
+++ b/pkg/scraper/mapped.go
@@ -5,6 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"math"
+	"net/url"
 	"reflect"
 	"regexp"
 	"strconv"
@@ -24,6 +25,7 @@ type mappedQuery interface {
 	getType() QueryType
 	setType(QueryType)
 	subScrape(ctx context.Context, value string) mappedQuery
+	getURL() string
 }
 
 type commonMappedConfig map[string]string
@@ -43,6 +45,22 @@ func (s mappedConfig) applyCommon(c commonMappedConfig, src string) string {
 	return ret
 }
 
+// extractHostname parses a URL string and returns the hostname.
+// Returns empty string if the URL cannot be parsed.
+func extractHostname(urlStr string) string {
+	if urlStr == "" {
+		return ""
+	}
+
+	u, err := url.Parse(urlStr)
+	if err != nil {
+		logger.Warnf("Error parsing URL '%s': %s", urlStr, err.Error())
+		return ""
+	}
+
+	return u.Hostname()
+}
+
 type isMultiFunc func(key string) bool
 
 func (s mappedConfig) process(ctx context.Context, q mappedQuery, common commonMappedConfig, isMulti isMultiFunc) mappedResults {
@@ -53,10 +71,16 @@ func (s mappedConfig) process(ctx context.Context, q mappedQuery, common commonM
 		if attrConfig.Fixed != "" {
 			// TODO - not sure if this needs to set _all_ indexes for the key
 			const i = 0
-			ret = ret.setSingleValue(i, k, attrConfig.Fixed)
+			// Support {inputURL} and {inputHostname} placeholders in fixed values
+			value := strings.ReplaceAll(attrConfig.Fixed, "{inputURL}", q.getURL())
+			value = strings.ReplaceAll(value, "{inputHostname}", extractHostname(q.getURL()))
+			ret = ret.setSingleValue(i, k, value)
 		} else {
 			selector := attrConfig.Selector
 			selector = s.applyCommon(common, selector)
+			// Support {inputURL} and {inputHostname} placeholders in selectors
+			selector = strings.ReplaceAll(selector, "{inputURL}", q.getURL())
+			selector = strings.ReplaceAll(selector, "{inputHostname}", extractHostname(q.getURL()))
 
 			found, err := q.runQuery(selector)
 			if err != nil {
diff --git a/pkg/scraper/xpath.go b/pkg/scraper/xpath.go
index 9993aa3ff..e042c861a 100644
--- a/pkg/scraper/xpath.go
+++ b/pkg/scraper/xpath.go
@@ -61,7 +61,7 @@ func (s *xpathScraper) scrapeByURL(ctx context.Context, url string, ty ScrapeCon
 		return nil, err
 	}
 
-	q := s.getXPathQuery(doc)
+	q := s.getXPathQuery(doc, u)
 	// if these just return the return values from scraper.scrape* functions then
 	// it ends up returning ScrapedContent(nil) rather than nil
 	switch ty {
@@ -121,7 +121,7 @@ func (s *xpathScraper) scrapeByName(ctx context.Context, name string, ty ScrapeC
 		return nil, err
 	}
 
-	q := s.getXPathQuery(doc)
+	q := s.getXPathQuery(doc, url)
 	q.setType(SearchQuery)
 
 	var content []ScrapedContent
@@ -171,7 +171,7 @@ func (s *xpathScraper) scrapeSceneByScene(ctx context.Context, scene *models.Sce
 		return nil, err
 	}
 
-	q := s.getXPathQuery(doc)
+	q := s.getXPathQuery(doc, url)
 	return scraper.scrapeScene(ctx, q)
 }
 
@@ -206,7 +206,7 @@ func (s *xpathScraper) scrapeByFragment(ctx context.Context, input Input) (Scrap
 		return nil, err
 	}
 
-	q := s.getXPathQuery(doc)
+	q := s.getXPathQuery(doc, url)
 	return scraper.scrapeScene(ctx, q)
 }
 
@@ -230,7 +230,7 @@ func (s *xpathScraper) scrapeGalleryByGallery(ctx context.Context, gallery *mode
 		return nil, err
 	}
 
-	q := s.getXPathQuery(doc)
+	q := s.getXPathQuery(doc, url)
 	return scraper.scrapeGallery(ctx, q)
 }
 
@@ -254,7 +254,7 @@ func (s *xpathScraper) scrapeImageByImage(ctx context.Context, image *models.Ima
 		return nil, err
 	}
 
-	q := s.getXPathQuery(doc)
+	q := s.getXPathQuery(doc, url)
 	return scraper.scrapeImage(ctx, q)
 }
 
@@ -277,10 +277,11 @@ func (s *xpathScraper) loadURL(ctx context.Context, url string) (*html.Node, err
 	return ret, err
 }
 
-func (s *xpathScraper) getXPathQuery(doc *html.Node) *xpathQuery {
+func (s *xpathScraper) getXPathQuery(doc *html.Node, url string) *xpathQuery {
 	return &xpathQuery{
 		doc:     doc,
 		scraper: s,
+		url:     url,
 	}
 }
 
@@ -288,6 +289,7 @@ type xpathQuery struct {
 	doc       *html.Node
 	scraper   *xpathScraper
 	queryType QueryType
+	url       string
 }
 
 func (q *xpathQuery) getType() QueryType {
@@ -298,6 +300,10 @@ func (q *xpathQuery) setType(t QueryType) {
 	q.queryType = t
 }
 
+func (q *xpathQuery) getURL() string {
+	return q.url
+}
+
 func (q *xpathQuery) runQuery(selector string) ([]string, error) {
 	found, err := htmlquery.QueryAll(q.doc, selector)
 	if err != nil {
@@ -346,5 +352,5 @@ func (q *xpathQuery) subScrape(ctx context.Context, value string) mappedQuery {
 		return nil
 	}
 
-	return q.scraper.getXPathQuery(doc)
+	return q.scraper.getXPathQuery(doc, value)
 }
diff --git a/ui/v2.5/src/docs/en/Manual/ScraperDevelopment.md b/ui/v2.5/src/docs/en/Manual/ScraperDevelopment.md
index 0ee1c0880..bd87d71ab 100644
--- a/ui/v2.5/src/docs/en/Manual/ScraperDevelopment.md
+++ b/ui/v2.5/src/docs/en/Manual/ScraperDevelopment.md
@@ -325,10 +325,58 @@ Alternatively, an attribute value may be set to a fixed value, rather than scrap
 
 ```yaml
 performer:
-  Gender: 
+  Gender:
     fixed: Female
 ```
 
+### Input URL placeholders
+
+The `{inputURL}` and `{inputHostname}` placeholders can be used in both `fixed` values and `selector` expressions to access information about the original URL that was used to scrape the content.
+
+#### {inputURL}
+
+The `{inputURL}` placeholder provides access to the full URL. This is useful when you want to return or reference the source URL as part of the scraped data.
+
+For example:
+
+```yaml
+scene:
+  URL:
+    fixed: "{inputURL}"
+  Title:
+    selector: //h1[@class="title"]
+```
+
+When scraping from `https://example.com/scene/12345`, the `{inputURL}` placeholder will be replaced with `https://example.com/scene/12345`.
+
+#### {inputHostname}
+
+The `{inputHostname}` placeholder extracts just the hostname from the URL. This is useful when you need to reference the domain without manually parsing the URL.
+
+For example:
+
+```yaml
+scene:
+  Studio:
+    fixed: "{inputHostname}"
+  Details:
+    selector: //div[@data-domain="{inputHostname}"]//p[@class="description"]
+```
+
+When scraping from `https://example.com/scene/12345`, the `{inputHostname}` placeholder will be replaced with `example.com`.
+
+These placeholders can also be used within selectors for more advanced use cases:
+
+```yaml
+scene:
+  Details:
+    selector: //div[@data-url="{inputURL}"]//p[@class="description"]
+  Site:
+    selector: //div[@data-host="{inputHostname}"]//span[@class="site-name"]
+```
+
+> **Note:** These placeholders represent the actual URL used to fetch the content, after any URL replacements have been applied.
+
 ### Common fragments
 
 The `common` field is used to configure selector fragments that can be referenced in the selector strings. These are key-value pairs where the key is the string to reference the fragment, and the value is the string that the fragment will be replaced with. For example:

From 5e34df7b7bba5d96802344986935c2dadc111560 Mon Sep 17 00:00:00 2001
From: feederbox826 <me@feederbox.cc>
Date: Tue, 11 Nov 2025 22:09:14 -0500
Subject: [PATCH 126/405] [ui] add playsInline to every image/video elem
 (#6259)

---
 ui/v2.5/src/components/Images/ImageCard.tsx            | 1 +
 ui/v2.5/src/components/Images/ImageDetails/Image.tsx   | 1 +
 ui/v2.5/src/components/Images/ImageWallItem.tsx        | 1 +
 ui/v2.5/src/components/Scenes/SceneMarkerWallPanel.tsx | 1 +
 ui/v2.5/src/components/Scenes/SceneWallPanel.tsx       | 1 +
 ui/v2.5/src/hooks/Lightbox/Lightbox.tsx                | 1 +
 6 files changed, 6 insertions(+)

diff --git a/ui/v2.5/src/components/Images/ImageCard.tsx b/ui/v2.5/src/components/Images/ImageCard.tsx
index d530b253e..9a8c86a10 100644
--- a/ui/v2.5/src/components/Images/ImageCard.tsx
+++ b/ui/v2.5/src/components/Images/ImageCard.tsx
@@ -169,6 +169,7 @@ export const ImageCard: React.FC<IImageCardProps> = (
             <ImagePreview
               loop={video}
               autoPlay={video}
+              playsInline={video}
               className="image-card-preview-image"
               alt={props.image.title ?? ""}
               src={source}
diff --git a/ui/v2.5/src/components/Images/ImageDetails/Image.tsx b/ui/v2.5/src/components/Images/ImageDetails/Image.tsx
index b19366032..3b77d2eef 100644
--- a/ui/v2.5/src/components/Images/ImageDetails/Image.tsx
+++ b/ui/v2.5/src/components/Images/ImageDetails/Image.tsx
@@ -370,6 +370,7 @@ const ImagePage: React.FC<IProps> = ({ image }) => {
           <ImageView
             loop={image.visual_files[0].__typename == "VideoFile"}
             autoPlay={image.visual_files[0].__typename == "VideoFile"}
+            playsInline={image.visual_files[0].__typename == "VideoFile"}
             controls={image.visual_files[0].__typename == "VideoFile"}
             className="m-sm-auto no-gutter image-image"
             style={
diff --git a/ui/v2.5/src/components/Images/ImageWallItem.tsx b/ui/v2.5/src/components/Images/ImageWallItem.tsx
index c4833f917..901295192 100644
--- a/ui/v2.5/src/components/Images/ImageWallItem.tsx
+++ b/ui/v2.5/src/components/Images/ImageWallItem.tsx
@@ -39,6 +39,7 @@ export const ImageWallItem: React.FC<RenderImageProps & IExtraProps> = (
     <ImagePreview
       loop={video}
       muted={video}
+      playsInline={video}
       autoPlay={video}
       key={props.photo.key}
       style={imgStyle}
diff --git a/ui/v2.5/src/components/Scenes/SceneMarkerWallPanel.tsx b/ui/v2.5/src/components/Scenes/SceneMarkerWallPanel.tsx
index a1879a027..9c507730b 100644
--- a/ui/v2.5/src/components/Scenes/SceneMarkerWallPanel.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneMarkerWallPanel.tsx
@@ -96,6 +96,7 @@ export const MarkerWallItem: React.FC<
         loop={video}
         muted={!video || !playSound || !active}
         autoPlay={video}
+        playsInline={video}
         key={props.photo.key}
         src={props.photo.src}
         width={width}
diff --git a/ui/v2.5/src/components/Scenes/SceneWallPanel.tsx b/ui/v2.5/src/components/Scenes/SceneWallPanel.tsx
index fb99e2af4..6f98cdaab 100644
--- a/ui/v2.5/src/components/Scenes/SceneWallPanel.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneWallPanel.tsx
@@ -89,6 +89,7 @@ export const SceneWallItem: React.FC<
         loop={video}
         muted={!video || !playSound || !active}
         autoPlay={video}
+        playsInline={video}
         key={props.photo.key}
         src={props.photo.src}
         width={width}
diff --git a/ui/v2.5/src/hooks/Lightbox/Lightbox.tsx b/ui/v2.5/src/hooks/Lightbox/Lightbox.tsx
index 6e4eb856a..5619275ff 100644
--- a/ui/v2.5/src/hooks/Lightbox/Lightbox.tsx
+++ b/ui/v2.5/src/hooks/Lightbox/Lightbox.tsx
@@ -455,6 +455,7 @@ export const LightboxComponent: React.FC<IProps> = ({
     React.createElement(image.paths.preview != "" ? "video" : "img", {
       loop: image.paths.preview != "",
       autoPlay: image.paths.preview != "",
+      playsInline: image.paths.preview != "",
       src:
         image.paths.preview != ""
           ? image.paths.preview ?? ""

From b2c8f0958509603b89e88e6de933cad890024df3 Mon Sep 17 00:00:00 2001
From: Gykes <24581046+Gykes@users.noreply.github.com>
Date: Tue, 11 Nov 2025 21:58:30 -0800
Subject: [PATCH 127/405] add tagger shortcut (#6261)

---
 ui/v2.5/src/components/List/ListViewOptions.tsx | 6 ++++++
 ui/v2.5/src/docs/en/Manual/KeyboardShortcuts.md | 1 +
 2 files changed, 7 insertions(+)

diff --git a/ui/v2.5/src/components/List/ListViewOptions.tsx b/ui/v2.5/src/components/List/ListViewOptions.tsx
index 1ea928983..04adcaa74 100644
--- a/ui/v2.5/src/components/List/ListViewOptions.tsx
+++ b/ui/v2.5/src/components/List/ListViewOptions.tsx
@@ -84,11 +84,17 @@ export const ListViewOptions: React.FC<IListViewOptionsProps> = ({
         onSetDisplayMode(DisplayMode.Wall);
       }
     });
+    Mousetrap.bind("v t", () => {
+      if (displayModeOptions.includes(DisplayMode.Tagger)) {
+        onSetDisplayMode(DisplayMode.Tagger);
+      }
+    });
 
     return () => {
       Mousetrap.unbind("v g");
       Mousetrap.unbind("v l");
       Mousetrap.unbind("v w");
+      Mousetrap.unbind("v t");
     };
   });
 
diff --git a/ui/v2.5/src/docs/en/Manual/KeyboardShortcuts.md b/ui/v2.5/src/docs/en/Manual/KeyboardShortcuts.md
index 55b52bdf4..69006d429 100644
--- a/ui/v2.5/src/docs/en/Manual/KeyboardShortcuts.md
+++ b/ui/v2.5/src/docs/en/Manual/KeyboardShortcuts.md
@@ -30,6 +30,7 @@
 | `v g` | Set view to grid |
 | `v l` | Set view to list |
 | `v w` | Set view to wall |
+| `v t` | Set view to tagger |
 | `+` | Increase zoom slider |
 | `-` | Decrease zoom slider |
 | `←` | Previous page of results |

From a08d2e258a7346af70e4328101faff27d4e65878 Mon Sep 17 00:00:00 2001
From: Gykes <24581046+Gykes@users.noreply.github.com>
Date: Wed, 12 Nov 2025 15:14:04 -0800
Subject: [PATCH 128/405] Feature: Add Various Scraper Fields (#6249)

* Support aliases in stashbox studio query
---------
Co-authored-by: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
---
 graphql/schema/types/scraper.graphql          |  4 ++++
 graphql/stash-box/query.graphql               |  1 +
 pkg/models/model_scraped_item.go              | 22 ++++++++++++++++++
 pkg/stashbox/graphql/generated_client.go      | 23 +++++++++++++++----
 pkg/stashbox/studio.go                        |  4 ++++
 ui/v2.5/graphql/data/scrapers.graphql         | 20 ++++++++++++++++
 .../Shared/ScrapeDialog/ScrapedObjectsRow.tsx |  7 ++++--
 .../components/Tagger/scenes/StudioModal.tsx  | 13 +++++++++++
 .../src/docs/en/Manual/ScraperDevelopment.md  | 19 ++++++++++++++-
 9 files changed, 105 insertions(+), 8 deletions(-)

diff --git a/graphql/schema/types/scraper.graphql b/graphql/schema/types/scraper.graphql
index a8e1fccb0..84b8b5c85 100644
--- a/graphql/schema/types/scraper.graphql
+++ b/graphql/schema/types/scraper.graphql
@@ -59,6 +59,10 @@ type ScrapedStudio {
   urls: [String!]
   parent: ScrapedStudio
   image: String
+  details: String
+  "Aliases must be comma-delimited to be parsed correctly"
+  aliases: String
+  tags: [ScrapedTag!]
 
   remote_site_id: String
 }
diff --git a/graphql/stash-box/query.graphql b/graphql/stash-box/query.graphql
index f7528e728..4fa023070 100644
--- a/graphql/stash-box/query.graphql
+++ b/graphql/stash-box/query.graphql
@@ -13,6 +13,7 @@ fragment ImageFragment on Image {
 fragment StudioFragment on Studio {
   name
   id
+  aliases
   urls {
     ...URLFragment
   }
diff --git a/pkg/models/model_scraped_item.go b/pkg/models/model_scraped_item.go
index a06463134..dc400ce4e 100644
--- a/pkg/models/model_scraped_item.go
+++ b/pkg/models/model_scraped_item.go
@@ -19,6 +19,9 @@ type ScrapedStudio struct {
 	Parent       *ScrapedStudio `json:"parent"`
 	Image        *string        `json:"image"`
 	Images       []string       `json:"images"`
+	Details      *string        `json:"details"`
+	Aliases      *string        `json:"aliases"`
+	Tags         []*ScrapedTag  `json:"tags"`
 	RemoteSiteID *string        `json:"remote_site_id"`
 }
 
@@ -55,6 +58,14 @@ func (s *ScrapedStudio) ToStudio(endpoint string, excluded map[string]bool) *Stu
 		}
 	}
 
+	if s.Details != nil && !excluded["details"] {
+		ret.Details = *s.Details
+	}
+
+	if s.Aliases != nil && !excluded["aliases"] {
+		ret.Aliases = NewRelatedStrings(stringslice.FromString(*s.Aliases, ","))
+	}
+
 	if s.Parent != nil && s.Parent.StoredID != nil && !excluded["parent"] && !excluded["parent_studio"] {
 		parentId, _ := strconv.Atoi(*s.Parent.StoredID)
 		ret.ParentID = &parentId
@@ -108,6 +119,17 @@ func (s *ScrapedStudio) ToPartial(id string, endpoint string, excluded map[strin
 		}
 	}
 
+	if s.Details != nil && !excluded["details"] {
+		ret.Details = NewOptionalString(*s.Details)
+	}
+
+	if s.Aliases != nil && !excluded["aliases"] {
+		ret.Aliases = &UpdateStrings{
+			Values: stringslice.FromString(*s.Aliases, ","),
+			Mode:   RelationshipUpdateModeSet,
+		}
+	}
+
 	if s.Parent != nil && !excluded["parent"] {
 		if s.Parent.StoredID != nil {
 			parentID, _ := strconv.Atoi(*s.Parent.StoredID)
diff --git a/pkg/stashbox/graphql/generated_client.go b/pkg/stashbox/graphql/generated_client.go
index f0224900f..90553b14a 100644
--- a/pkg/stashbox/graphql/generated_client.go
+++ b/pkg/stashbox/graphql/generated_client.go
@@ -82,11 +82,12 @@ func (t *ImageFragment) GetHeight() int {
 }
 
 type StudioFragment struct {
-	Name   string                 "json:\"name\" graphql:\"name\""
-	ID     string                 "json:\"id\" graphql:\"id\""
-	Urls   []*URLFragment         "json:\"urls\" graphql:\"urls\""
-	Parent *StudioFragment_Parent "json:\"parent,omitempty\" graphql:\"parent\""
-	Images []*ImageFragment       "json:\"images\" graphql:\"images\""
+	Name    string                 "json:\"name\" graphql:\"name\""
+	ID      string                 "json:\"id\" graphql:\"id\""
+	Aliases []string               "json:\"aliases\" graphql:\"aliases\""
+	Urls    []*URLFragment         "json:\"urls\" graphql:\"urls\""
+	Parent  *StudioFragment_Parent "json:\"parent,omitempty\" graphql:\"parent\""
+	Images  []*ImageFragment       "json:\"images\" graphql:\"images\""
 }
 
 func (t *StudioFragment) GetName() string {
@@ -101,6 +102,12 @@ func (t *StudioFragment) GetID() string {
 	}
 	return t.ID
 }
+func (t *StudioFragment) GetAliases() []string {
+	if t == nil {
+		t = &StudioFragment{}
+	}
+	return t.Aliases
+}
 func (t *StudioFragment) GetUrls() []*URLFragment {
 	if t == nil {
 		t = &StudioFragment{}
@@ -845,6 +852,7 @@ fragment ImageFragment on Image {
 fragment StudioFragment on Studio {
 	name
 	id
+	aliases
 	urls {
 		... URLFragment
 	}
@@ -980,6 +988,7 @@ fragment ImageFragment on Image {
 fragment StudioFragment on Studio {
 	name
 	id
+	aliases
 	urls {
 		... URLFragment
 	}
@@ -1115,6 +1124,7 @@ fragment ImageFragment on Image {
 fragment StudioFragment on Studio {
 	name
 	id
+	aliases
 	urls {
 		... URLFragment
 	}
@@ -1250,6 +1260,7 @@ fragment ImageFragment on Image {
 fragment StudioFragment on Studio {
 	name
 	id
+	aliases
 	urls {
 		... URLFragment
 	}
@@ -1543,6 +1554,7 @@ fragment ImageFragment on Image {
 fragment StudioFragment on Studio {
 	name
 	id
+	aliases
 	urls {
 		... URLFragment
 	}
@@ -1641,6 +1653,7 @@ const FindStudioDocument = `query FindStudio ($id: ID, $name: String) {
 fragment StudioFragment on Studio {
 	name
 	id
+	aliases
 	urls {
 		... URLFragment
 	}
diff --git a/pkg/stashbox/studio.go b/pkg/stashbox/studio.go
index a0e9a6ea6..8934972f2 100644
--- a/pkg/stashbox/studio.go
+++ b/pkg/stashbox/studio.go
@@ -2,6 +2,7 @@ package stashbox
 
 import (
 	"context"
+	"strings"
 
 	"github.com/google/uuid"
 	"github.com/stashapp/stash/pkg/models"
@@ -63,8 +64,11 @@ func studioFragmentToScrapedStudio(s graphql.StudioFragment) *models.ScrapedStud
 		images = append(images, image.URL)
 	}
 
+	aliases := strings.Join(s.Aliases, ", ")
+
 	st := &models.ScrapedStudio{
 		Name:         s.Name,
+		Aliases:      &aliases,
 		Images:       images,
 		RemoteSiteID: &s.ID,
 	}
diff --git a/ui/v2.5/graphql/data/scrapers.graphql b/ui/v2.5/graphql/data/scrapers.graphql
index 8150c1ba7..25c1036d8 100644
--- a/ui/v2.5/graphql/data/scrapers.graphql
+++ b/ui/v2.5/graphql/data/scrapers.graphql
@@ -7,9 +7,19 @@ fragment ScrapedStudioData on ScrapedStudio {
     name
     urls
     image
+    details
+    aliases
+    tags {
+      ...ScrapedSceneTagData
+    }
     remote_site_id
   }
   image
+  details
+  aliases
+  tags {
+    ...ScrapedSceneTagData
+  }
   remote_site_id
 }
 
@@ -129,9 +139,19 @@ fragment ScrapedSceneStudioData on ScrapedStudio {
     name
     urls
     image
+    details
+    aliases
+    tags {
+      ...ScrapedSceneTagData
+    }
     remote_site_id
   }
   image
+  details
+  aliases
+  tags {
+    ...ScrapedSceneTagData
+  }
   remote_site_id
 }
 
diff --git a/ui/v2.5/src/components/Shared/ScrapeDialog/ScrapedObjectsRow.tsx b/ui/v2.5/src/components/Shared/ScrapeDialog/ScrapedObjectsRow.tsx
index 3d7bbe4ad..f3cff8d4e 100644
--- a/ui/v2.5/src/components/Shared/ScrapeDialog/ScrapedObjectsRow.tsx
+++ b/ui/v2.5/src/components/Shared/ScrapeDialog/ScrapedObjectsRow.tsx
@@ -41,7 +41,9 @@ export const ScrapedStudioRow: React.FC<IScrapedStudioRow> = ({
     const value = resultValue ? [resultValue] : [];
 
     const selectValue = value.map((p) => {
-      const aliases: string[] = [];
+      const aliases: string[] = p.aliases
+        ? p.aliases.split(",").map((a) => a.trim())
+        : [];
       return {
         id: p.stored_id ?? "",
         name: p.name ?? "",
@@ -55,10 +57,11 @@ export const ScrapedStudioRow: React.FC<IScrapedStudioRow> = ({
         isDisabled={!isNew}
         onSelect={(items) => {
           if (onChangeFn) {
-            const { id, ...data } = items[0];
+            const { id, aliases, ...data } = items[0];
             onChangeFn({
               ...data,
               stored_id: id,
+              aliases: aliases?.join(", "),
             });
           }
         }}
diff --git a/ui/v2.5/src/components/Tagger/scenes/StudioModal.tsx b/ui/v2.5/src/components/Tagger/scenes/StudioModal.tsx
index 1242adbc5..e01c40881 100644
--- a/ui/v2.5/src/components/Tagger/scenes/StudioModal.tsx
+++ b/ui/v2.5/src/components/Tagger/scenes/StudioModal.tsx
@@ -142,6 +142,9 @@ const StudioDetails: React.FC<IStudioDetailsProps> = ({
         <div className="col-12">
           {maybeRenderField("name", studio.name, !isNew)}
           {maybeRenderURLListField("urls", studio.urls)}
+          {maybeRenderField("details", studio.details)}
+          {maybeRenderField("aliases", studio.aliases)}
+          {maybeRenderField("tags", studio.tags?.map((t) => t.name).join(", "))}
           {maybeRenderField("parent_studio", studio.parent?.name, false)}
           {maybeRenderStashBoxLink()}
         </div>
@@ -232,6 +235,11 @@ const StudioModal: React.FC<IStudioModalProps> = ({
       urls: studio.urls,
       image: studio.image,
       parent_id: studio.parent?.stored_id,
+      details: studio.details,
+      aliases: studio.aliases?.split(",").map((a) => a.trim()),
+      tag_ids: studio.tags?.map((t) => t.stored_id).filter((id) => id) as
+        | string[]
+        | undefined,
     };
 
     // stashid handling code
@@ -261,6 +269,11 @@ const StudioModal: React.FC<IStudioModalProps> = ({
         name: studio.parent?.name,
         urls: studio.parent?.urls,
         image: studio.parent?.image,
+        details: studio.parent?.details,
+        aliases: studio.parent?.aliases?.split(",").map((a) => a.trim()),
+        tag_ids: studio.parent?.tags
+          ?.map((t) => t.stored_id)
+          .filter((id) => id) as string[] | undefined,
       };
 
       // stashid handling code
diff --git a/ui/v2.5/src/docs/en/Manual/ScraperDevelopment.md b/ui/v2.5/src/docs/en/Manual/ScraperDevelopment.md
index bd87d71ab..1f52028f8 100644
--- a/ui/v2.5/src/docs/en/Manual/ScraperDevelopment.md
+++ b/ui/v2.5/src/docs/en/Manual/ScraperDevelopment.md
@@ -739,7 +739,11 @@ xPathScrapers:
         URL: $performer/@href
       Studio:
         Name: $studio
-        URL: $studio/@href    
+        URL: $studio/@href
+        Details: //div[@class="studioDescription"]
+        Aliases: //div[@class="studioAliases"]/span
+        Tags:
+          Name: //div[@class="studioTags"]/a    
 ```
 
 See also [#333](https://github.com/stashapp/stash/pull/333) for more examples.
@@ -822,6 +826,11 @@ jsonScrapers:
         Name: data.performers.#.name
       Studio:
         Name: data.site.name
+        URL: data.site.url
+        Details: data.site.description
+        Aliases: data.site.aliases
+        Tags:
+          Name: data.site.tags.#.name
       Tags:
         Name: data.tags.#.tag
 
@@ -839,6 +848,11 @@ jsonScrapers:
         Name: $data.performers.#.name
       Studio:
         Name: $data.site.name
+        URL: $data.site.url
+        Details: $data.site.description
+        Aliases: $data.site.aliases
+        Tags:
+          Name: $data.site.tags.#.name
       Tags:
         Name: $data.tags.#.tag
 driver:
@@ -955,7 +969,10 @@ URLs
 ### Studio
 
 ```
+Aliases
+Details
 Name
+Tags (see Tag fields)
 URL
 ```
 

From c99825a453c240ed0d9c45e420f8db78e3604b91 Mon Sep 17 00:00:00 2001
From: Gykes <24581046+Gykes@users.noreply.github.com>
Date: Wed, 12 Nov 2025 19:24:09 -0800
Subject: [PATCH 129/405] Feature: Tag StashID support (#6255)

---
 graphql/schema/types/scraper.graphql          |  2 +
 graphql/schema/types/tag.graphql              |  3 +
 internal/api/resolver_model_tag.go            | 10 +++
 internal/api/resolver_mutation_stash_box.go   |  8 +++
 internal/api/resolver_mutation_tag.go         | 16 +++++
 internal/identify/scene.go                    |  7 +-
 pkg/match/scraped.go                          | 22 ++++++-
 pkg/models/jsonschema/tag.go                  | 22 ++++---
 pkg/models/mocks/TagReaderWriter.go           | 46 +++++++++++++
 pkg/models/model_scraped_item.go              | 23 ++++++-
 pkg/models/model_tag.go                       | 14 +++-
 pkg/models/repository_tag.go                  |  2 +
 pkg/scraper/tag.go                            |  3 +-
 pkg/sqlite/anonymise.go                       |  1 +
 pkg/sqlite/database.go                        |  2 +-
 pkg/sqlite/migrations/74_tag_stash_ids.up.sql |  7 ++
 pkg/sqlite/stash_id_test.go                   |  5 +-
 pkg/sqlite/tables.go                          |  8 +++
 pkg/sqlite/tag.go                             | 66 ++++++++++++++++++-
 pkg/sqlite/tag_test.go                        | 60 +++++++++++++++++
 pkg/stashbox/scene.go                         | 20 ++++--
 pkg/tag/export.go                             | 10 +++
 pkg/tag/export_test.go                        |  7 ++
 pkg/tag/import.go                             |  1 +
 ui/v2.5/graphql/data/scrapers.graphql         |  1 +
 ui/v2.5/graphql/data/tag.graphql              |  5 ++
 ui/v2.5/src/components/Shared/StashID.tsx     |  2 +-
 .../Tagger/scenes/StashSearchResult.tsx       | 12 ++++
 .../Tags/TagDetails/TagDetailsPanel.tsx       | 22 +++++++
 .../Tags/TagDetails/TagEditPanel.tsx          | 14 ++--
 30 files changed, 387 insertions(+), 34 deletions(-)
 create mode 100644 pkg/sqlite/migrations/74_tag_stash_ids.up.sql

diff --git a/graphql/schema/types/scraper.graphql b/graphql/schema/types/scraper.graphql
index 84b8b5c85..2c13872f3 100644
--- a/graphql/schema/types/scraper.graphql
+++ b/graphql/schema/types/scraper.graphql
@@ -71,6 +71,8 @@ type ScrapedTag {
   "Set if tag matched"
   stored_id: ID
   name: String!
+  "Remote site ID, if applicable"
+  remote_site_id: String
 }
 
 type ScrapedScene {
diff --git a/graphql/schema/types/tag.graphql b/graphql/schema/types/tag.graphql
index 504f23e3d..8424ab92a 100644
--- a/graphql/schema/types/tag.graphql
+++ b/graphql/schema/types/tag.graphql
@@ -9,6 +9,7 @@ type Tag {
   created_at: Time!
   updated_at: Time!
   favorite: Boolean!
+  stash_ids: [StashID!]!
   image_path: String # Resolver
   scene_count(depth: Int): Int! # Resolver
   scene_marker_count(depth: Int): Int! # Resolver
@@ -35,6 +36,7 @@ input TagCreateInput {
   favorite: Boolean
   "This should be a URL or a base64 encoded data URL"
   image: String
+  stash_ids: [StashIDInput!]
 
   parent_ids: [ID!]
   child_ids: [ID!]
@@ -51,6 +53,7 @@ input TagUpdateInput {
   favorite: Boolean
   "This should be a URL or a base64 encoded data URL"
   image: String
+  stash_ids: [StashIDInput!]
 
   parent_ids: [ID!]
   child_ids: [ID!]
diff --git a/internal/api/resolver_model_tag.go b/internal/api/resolver_model_tag.go
index 14237d2fe..deae41f21 100644
--- a/internal/api/resolver_model_tag.go
+++ b/internal/api/resolver_model_tag.go
@@ -54,6 +54,16 @@ func (r *tagResolver) Aliases(ctx context.Context, obj *models.Tag) (ret []strin
 	return obj.Aliases.List(), nil
 }
 
+func (r *tagResolver) StashIds(ctx context.Context, obj *models.Tag) ([]*models.StashID, error) {
+	if err := r.withReadTxn(ctx, func(ctx context.Context) error {
+		return obj.LoadStashIDs(ctx, r.repository.Tag)
+	}); err != nil {
+		return nil, err
+	}
+
+	return stashIDsSliceToPtrSlice(obj.StashIDs.List()), nil
+}
+
 func (r *tagResolver) SceneCount(ctx context.Context, obj *models.Tag, depth *int) (ret int, err error) {
 	if err := r.withReadTxn(ctx, func(ctx context.Context) error {
 		ret, err = scene.CountByTagID(ctx, r.repository.Scene, obj.ID, depth)
diff --git a/internal/api/resolver_mutation_stash_box.go b/internal/api/resolver_mutation_stash_box.go
index bbfe8b854..4026667eb 100644
--- a/internal/api/resolver_mutation_stash_box.go
+++ b/internal/api/resolver_mutation_stash_box.go
@@ -153,6 +153,14 @@ func (r *mutationResolver) makeSceneDraft(ctx context.Context, s *models.Scene,
 		return nil, err
 	}
 
+	// Load StashIDs for tags
+	tqb := r.repository.Tag
+	for _, t := range draft.Tags {
+		if err := t.LoadStashIDs(ctx, tqb); err != nil {
+			return nil, err
+		}
+	}
+
 	draft.Cover = cover
 
 	return draft, nil
diff --git a/internal/api/resolver_mutation_tag.go b/internal/api/resolver_mutation_tag.go
index 1e8b6066a..05d756acf 100644
--- a/internal/api/resolver_mutation_tag.go
+++ b/internal/api/resolver_mutation_tag.go
@@ -39,6 +39,14 @@ func (r *mutationResolver) TagCreate(ctx context.Context, input TagCreateInput)
 	newTag.Description = translator.string(input.Description)
 	newTag.IgnoreAutoTag = translator.bool(input.IgnoreAutoTag)
 
+	var stashIDInputs models.StashIDInputs
+	for _, sid := range input.StashIds {
+		if sid != nil {
+			stashIDInputs = append(stashIDInputs, *sid)
+		}
+	}
+	newTag.StashIDs = models.NewRelatedStashIDs(stashIDInputs.ToStashIDs())
+
 	var err error
 
 	newTag.ParentIDs, err = translator.relatedIds(input.ParentIds)
@@ -110,6 +118,14 @@ func (r *mutationResolver) TagUpdate(ctx context.Context, input TagUpdateInput)
 
 	updatedTag.Aliases = translator.updateStrings(input.Aliases, "aliases")
 
+	var updateStashIDInputs models.StashIDInputs
+	for _, sid := range input.StashIds {
+		if sid != nil {
+			updateStashIDInputs = append(updateStashIDInputs, *sid)
+		}
+	}
+	updatedTag.StashIDs = translator.updateStashIDs(updateStashIDInputs, "stash_ids")
+
 	updatedTag.ParentIDs, err = translator.updateIds(input.ParentIds, "parent_ids")
 	if err != nil {
 		return nil, fmt.Errorf("converting parent tag ids: %w", err)
diff --git a/internal/identify/scene.go b/internal/identify/scene.go
index 847a140c5..789674693 100644
--- a/internal/identify/scene.go
+++ b/internal/identify/scene.go
@@ -153,6 +153,8 @@ func (g sceneRelationships) tags(ctx context.Context) ([]int, error) {
 		tagIDs = originalTagIDs
 	}
 
+	endpoint := g.result.source.RemoteSite
+
 	for _, t := range scraped {
 		if t.StoredID != nil {
 			// existing tag, just add it
@@ -163,10 +165,9 @@ func (g sceneRelationships) tags(ctx context.Context) ([]int, error) {
 
 			tagIDs = sliceutil.AppendUnique(tagIDs, int(tagID))
 		} else if createMissing {
-			newTag := models.NewTag()
-			newTag.Name = t.Name
+			newTag := t.ToTag(endpoint, nil)
 
-			err := g.tagCreator.Create(ctx, &newTag)
+			err := g.tagCreator.Create(ctx, newTag)
 			if err != nil {
 				return nil, fmt.Errorf("error creating tag: %w", err)
 			}
diff --git a/pkg/match/scraped.go b/pkg/match/scraped.go
index b66f39a35..d3039f4c6 100644
--- a/pkg/match/scraped.go
+++ b/pkg/match/scraped.go
@@ -45,7 +45,7 @@ func (r SceneRelationships) MatchRelationships(ctx context.Context, s *models.Sc
 	}
 
 	for _, t := range s.Tags {
-		err := ScrapedTag(ctx, r.TagFinder, t)
+		err := ScrapedTag(ctx, r.TagFinder, t, endpoint)
 		if err != nil {
 			return err
 		}
@@ -190,11 +190,29 @@ func ScrapedGroup(ctx context.Context, qb GroupNamesFinder, storedID *string, na
 
 // ScrapedTag matches the provided tag with the tags
 // in the database and sets the ID field if one is found.
-func ScrapedTag(ctx context.Context, qb models.TagQueryer, s *models.ScrapedTag) error {
+func ScrapedTag(ctx context.Context, qb models.TagQueryer, s *models.ScrapedTag, stashBoxEndpoint string) error {
 	if s.StoredID != nil {
 		return nil
 	}
 
+	// Check if a tag with the StashID already exists
+	if stashBoxEndpoint != "" && s.RemoteSiteID != nil {
+		if finder, ok := qb.(models.TagFinder); ok {
+			tags, err := finder.FindByStashID(ctx, models.StashID{
+				StashID:  *s.RemoteSiteID,
+				Endpoint: stashBoxEndpoint,
+			})
+			if err != nil {
+				return err
+			}
+			if len(tags) > 0 {
+				id := strconv.Itoa(tags[0].ID)
+				s.StoredID = &id
+				return nil
+			}
+		}
+	}
+
 	t, err := tag.ByName(ctx, qb, s.Name)
 
 	if err != nil {
diff --git a/pkg/models/jsonschema/tag.go b/pkg/models/jsonschema/tag.go
index ed2bc1c9c..faab1bfb2 100644
--- a/pkg/models/jsonschema/tag.go
+++ b/pkg/models/jsonschema/tag.go
@@ -6,20 +6,22 @@ import (
 
 	jsoniter "github.com/json-iterator/go"
 	"github.com/stashapp/stash/pkg/fsutil"
+	"github.com/stashapp/stash/pkg/models"
 	"github.com/stashapp/stash/pkg/models/json"
 )
 
 type Tag struct {
-	Name          string        `json:"name,omitempty"`
-	SortName      string        `json:"sort_name,omitempty"`
-	Description   string        `json:"description,omitempty"`
-	Favorite      bool          `json:"favorite,omitempty"`
-	Aliases       []string      `json:"aliases,omitempty"`
-	Image         string        `json:"image,omitempty"`
-	Parents       []string      `json:"parents,omitempty"`
-	IgnoreAutoTag bool          `json:"ignore_auto_tag,omitempty"`
-	CreatedAt     json.JSONTime `json:"created_at,omitempty"`
-	UpdatedAt     json.JSONTime `json:"updated_at,omitempty"`
+	Name          string           `json:"name,omitempty"`
+	SortName      string           `json:"sort_name,omitempty"`
+	Description   string           `json:"description,omitempty"`
+	Favorite      bool             `json:"favorite,omitempty"`
+	Aliases       []string         `json:"aliases,omitempty"`
+	Image         string           `json:"image,omitempty"`
+	Parents       []string         `json:"parents,omitempty"`
+	IgnoreAutoTag bool             `json:"ignore_auto_tag,omitempty"`
+	StashIDs      []models.StashID `json:"stash_ids,omitempty"`
+	CreatedAt     json.JSONTime    `json:"created_at,omitempty"`
+	UpdatedAt     json.JSONTime    `json:"updated_at,omitempty"`
 }
 
 func (s Tag) Filename() string {
diff --git a/pkg/models/mocks/TagReaderWriter.go b/pkg/models/mocks/TagReaderWriter.go
index a285b97bf..ac6b10584 100644
--- a/pkg/models/mocks/TagReaderWriter.go
+++ b/pkg/models/mocks/TagReaderWriter.go
@@ -427,6 +427,29 @@ func (_m *TagReaderWriter) FindBySceneMarkerID(ctx context.Context, sceneMarkerI
 	return r0, r1
 }
 
+// FindByStashID provides a mock function with given fields: ctx, stashID
+func (_m *TagReaderWriter) FindByStashID(ctx context.Context, stashID models.StashID) ([]*models.Tag, error) {
+	ret := _m.Called(ctx, stashID)
+
+	var r0 []*models.Tag
+	if rf, ok := ret.Get(0).(func(context.Context, models.StashID) []*models.Tag); ok {
+		r0 = rf(ctx, stashID)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).([]*models.Tag)
+		}
+	}
+
+	var r1 error
+	if rf, ok := ret.Get(1).(func(context.Context, models.StashID) error); ok {
+		r1 = rf(ctx, stashID)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
 // FindByStudioID provides a mock function with given fields: ctx, studioID
 func (_m *TagReaderWriter) FindByStudioID(ctx context.Context, studioID int) ([]*models.Tag, error) {
 	ret := _m.Called(ctx, studioID)
@@ -565,6 +588,29 @@ func (_m *TagReaderWriter) GetParentIDs(ctx context.Context, relatedID int) ([]i
 	return r0, r1
 }
 
+// GetStashIDs provides a mock function with given fields: ctx, relatedID
+func (_m *TagReaderWriter) GetStashIDs(ctx context.Context, relatedID int) ([]models.StashID, error) {
+	ret := _m.Called(ctx, relatedID)
+
+	var r0 []models.StashID
+	if rf, ok := ret.Get(0).(func(context.Context, int) []models.StashID); ok {
+		r0 = rf(ctx, relatedID)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).([]models.StashID)
+		}
+	}
+
+	var r1 error
+	if rf, ok := ret.Get(1).(func(context.Context, int) error); ok {
+		r1 = rf(ctx, relatedID)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
 // HasImage provides a mock function with given fields: ctx, tagID
 func (_m *TagReaderWriter) HasImage(ctx context.Context, tagID int) (bool, error) {
 	ret := _m.Called(ctx, tagID)
diff --git a/pkg/models/model_scraped_item.go b/pkg/models/model_scraped_item.go
index dc400ce4e..131f08be1 100644
--- a/pkg/models/model_scraped_item.go
+++ b/pkg/models/model_scraped_item.go
@@ -447,12 +447,31 @@ func (p *ScrapedPerformer) ToPartial(endpoint string, excluded map[string]bool,
 
 type ScrapedTag struct {
 	// Set if tag matched
-	StoredID *string `json:"stored_id"`
-	Name     string  `json:"name"`
+	StoredID     *string `json:"stored_id"`
+	Name         string  `json:"name"`
+	RemoteSiteID *string `json:"remote_site_id"`
 }
 
 func (ScrapedTag) IsScrapedContent() {}
 
+func (t *ScrapedTag) ToTag(endpoint string, excluded map[string]bool) *Tag {
+	currentTime := time.Now()
+	ret := NewTag()
+	ret.Name = t.Name
+
+	if t.RemoteSiteID != nil && endpoint != "" {
+		ret.StashIDs = NewRelatedStashIDs([]StashID{
+			{
+				Endpoint:  endpoint,
+				StashID:   *t.RemoteSiteID,
+				UpdatedAt: currentTime,
+			},
+		})
+	}
+
+	return &ret
+}
+
 func ScrapedTagSortFunction(a, b *ScrapedTag) int {
 	return strings.Compare(strings.ToLower(a.Name), strings.ToLower(b.Name))
 }
diff --git a/pkg/models/model_tag.go b/pkg/models/model_tag.go
index 0d845750f..4cd038f7e 100644
--- a/pkg/models/model_tag.go
+++ b/pkg/models/model_tag.go
@@ -15,9 +15,10 @@ type Tag struct {
 	CreatedAt     time.Time `json:"created_at"`
 	UpdatedAt     time.Time `json:"updated_at"`
 
-	Aliases   RelatedStrings `json:"aliases"`
-	ParentIDs RelatedIDs     `json:"parent_ids"`
-	ChildIDs  RelatedIDs     `json:"tag_ids"`
+	Aliases   RelatedStrings  `json:"aliases"`
+	ParentIDs RelatedIDs      `json:"parent_ids"`
+	ChildIDs  RelatedIDs      `json:"tag_ids"`
+	StashIDs  RelatedStashIDs `json:"stash_ids"`
 }
 
 func NewTag() Tag {
@@ -46,6 +47,12 @@ func (s *Tag) LoadChildIDs(ctx context.Context, l TagRelationLoader) error {
 	})
 }
 
+func (s *Tag) LoadStashIDs(ctx context.Context, l StashIDLoader) error {
+	return s.StashIDs.load(func() ([]StashID, error) {
+		return l.GetStashIDs(ctx, s.ID)
+	})
+}
+
 type TagPartial struct {
 	Name          OptionalString
 	SortName      OptionalString
@@ -58,6 +65,7 @@ type TagPartial struct {
 	Aliases   *UpdateStrings
 	ParentIDs *UpdateIDs
 	ChildIDs  *UpdateIDs
+	StashIDs  *UpdateStashIDs
 }
 
 func NewTagPartial() TagPartial {
diff --git a/pkg/models/repository_tag.go b/pkg/models/repository_tag.go
index 2b073cae0..a7f828f0b 100644
--- a/pkg/models/repository_tag.go
+++ b/pkg/models/repository_tag.go
@@ -25,6 +25,7 @@ type TagFinder interface {
 	FindByStudioID(ctx context.Context, studioID int) ([]*Tag, error)
 	FindByName(ctx context.Context, name string, nocase bool) (*Tag, error)
 	FindByNames(ctx context.Context, names []string, nocase bool) ([]*Tag, error)
+	FindByStashID(ctx context.Context, stashID StashID) ([]*Tag, error)
 }
 
 // TagQueryer provides methods to query tags.
@@ -87,6 +88,7 @@ type TagReader interface {
 
 	AliasLoader
 	TagRelationLoader
+	StashIDLoader
 
 	All(ctx context.Context) ([]*Tag, error)
 	GetImage(ctx context.Context, tagID int) ([]byte, error)
diff --git a/pkg/scraper/tag.go b/pkg/scraper/tag.go
index c26aa855e..14f02e397 100644
--- a/pkg/scraper/tag.go
+++ b/pkg/scraper/tag.go
@@ -15,7 +15,8 @@ func postProcessTags(ctx context.Context, tqb models.TagQueryer, scrapedTags []*
 	ret = make([]*models.ScrapedTag, 0, len(scrapedTags))
 
 	for _, t := range scrapedTags {
-		err := match.ScrapedTag(ctx, tqb, t)
+		// Pass empty string for endpoint since this is used by general scrapers, not just stash-box
+		err := match.ScrapedTag(ctx, tqb, t, "")
 		if err != nil {
 			return nil, err
 		}
diff --git a/pkg/sqlite/anonymise.go b/pkg/sqlite/anonymise.go
index ba376d785..764f569c0 100644
--- a/pkg/sqlite/anonymise.go
+++ b/pkg/sqlite/anonymise.go
@@ -102,6 +102,7 @@ func (db *Anonymiser) deleteStashIDs() error {
 		func() error { return db.truncateTable("scene_stash_ids") },
 		func() error { return db.truncateTable("studio_stash_ids") },
 		func() error { return db.truncateTable("performer_stash_ids") },
+		func() error { return db.truncateTable("tag_stash_ids") },
 	})
 }
 
diff --git a/pkg/sqlite/database.go b/pkg/sqlite/database.go
index b846efaf4..29e39270d 100644
--- a/pkg/sqlite/database.go
+++ b/pkg/sqlite/database.go
@@ -34,7 +34,7 @@ const (
 	cacheSizeEnv = "STASH_SQLITE_CACHE_SIZE"
 )
 
-var appSchemaVersion uint = 73
+var appSchemaVersion uint = 74
 
 //go:embed migrations/*.sql
 var migrationsBox embed.FS
diff --git a/pkg/sqlite/migrations/74_tag_stash_ids.up.sql b/pkg/sqlite/migrations/74_tag_stash_ids.up.sql
new file mode 100644
index 000000000..c281149c7
--- /dev/null
+++ b/pkg/sqlite/migrations/74_tag_stash_ids.up.sql
@@ -0,0 +1,7 @@
+CREATE TABLE `tag_stash_ids` (
+  `tag_id` integer,
+  `endpoint` varchar(255),
+  `stash_id` varchar(36),
+  `updated_at` datetime not null default '1970-01-01T00:00:00Z',
+  foreign key(`tag_id`) references `tags`(`id`) on delete CASCADE
+);
\ No newline at end of file
diff --git a/pkg/sqlite/stash_id_test.go b/pkg/sqlite/stash_id_test.go
index 10949b475..a273c7960 100644
--- a/pkg/sqlite/stash_id_test.go
+++ b/pkg/sqlite/stash_id_test.go
@@ -27,8 +27,9 @@ func testStashIDReaderWriter(ctx context.Context, t *testing.T, r stashIDReaderW
 	const stashIDStr = "stashID"
 	const endpoint = "endpoint"
 	stashID := models.StashID{
-		StashID:  stashIDStr,
-		Endpoint: endpoint,
+		StashID:   stashIDStr,
+		Endpoint:  endpoint,
+		UpdatedAt: epochTime,
 	}
 
 	// update stash ids and ensure was updated
diff --git a/pkg/sqlite/tables.go b/pkg/sqlite/tables.go
index b28dd777c..7cddf25cc 100644
--- a/pkg/sqlite/tables.go
+++ b/pkg/sqlite/tables.go
@@ -47,6 +47,7 @@ var (
 
 	tagsAliasesJoinTable  = goqu.T(tagAliasesTable)
 	tagRelationsJoinTable = goqu.T(tagRelationsTable)
+	tagsStashIDsJoinTable = goqu.T("tag_stash_ids")
 )
 
 var (
@@ -375,6 +376,13 @@ var (
 	}
 
 	tagsChildTagsTableMgr = *tagsParentTagsTableMgr.invert()
+
+	tagsStashIDsTableMgr = &stashIDTable{
+		table: table{
+			table:    tagsStashIDsJoinTable,
+			idColumn: tagsStashIDsJoinTable.Col(tagIDColumn),
+		},
+	}
 )
 
 var (
diff --git a/pkg/sqlite/tag.go b/pkg/sqlite/tag.go
index 87ec01f5d..977ac0433 100644
--- a/pkg/sqlite/tag.go
+++ b/pkg/sqlite/tag.go
@@ -101,7 +101,8 @@ func (r *tagRowRecord) fromPartial(o models.TagPartial) {
 type tagRepositoryType struct {
 	repository
 
-	aliases stringRepository
+	aliases  stringRepository
+	stashIDs stashIDRepository
 
 	scenes    joinRepository
 	images    joinRepository
@@ -121,6 +122,12 @@ var (
 			},
 			stringColumn: tagAliasColumn,
 		},
+		stashIDs: stashIDRepository{
+			repository{
+				tableName: "tag_stash_ids",
+				idColumn:  tagIDColumn,
+			},
+		},
 		scenes: joinRepository{
 			repository: repository{
 				tableName: scenesTagsTable,
@@ -199,6 +206,12 @@ func (qb *TagStore) Create(ctx context.Context, newObject *models.Tag) error {
 		}
 	}
 
+	if newObject.StashIDs.Loaded() {
+		if err := tagsStashIDsTableMgr.insertJoins(ctx, id, newObject.StashIDs.List()); err != nil {
+			return err
+		}
+	}
+
 	updated, err := qb.find(ctx, id)
 	if err != nil {
 		return fmt.Errorf("finding after create: %w", err)
@@ -242,6 +255,12 @@ func (qb *TagStore) UpdatePartial(ctx context.Context, id int, partial models.Ta
 		}
 	}
 
+	if partial.StashIDs != nil {
+		if err := tagsStashIDsTableMgr.modifyJoins(ctx, id, partial.StashIDs.StashIDs, partial.StashIDs.Mode); err != nil {
+			return nil, err
+		}
+	}
+
 	return qb.find(ctx, id)
 }
 
@@ -271,6 +290,12 @@ func (qb *TagStore) Update(ctx context.Context, updatedObject *models.Tag) error
 		}
 	}
 
+	if updatedObject.StashIDs.Loaded() {
+		if err := tagsStashIDsTableMgr.replaceJoins(ctx, updatedObject.ID, updatedObject.StashIDs.List()); err != nil {
+			return err
+		}
+	}
+
 	return nil
 }
 
@@ -509,6 +534,24 @@ func (qb *TagStore) FindByNames(ctx context.Context, names []string, nocase bool
 	return ret, nil
 }
 
+func (qb *TagStore) FindByStashID(ctx context.Context, stashID models.StashID) ([]*models.Tag, error) {
+	sq := dialect.From(tagsStashIDsJoinTable).Select(tagsStashIDsJoinTable.Col(tagIDColumn)).Where(
+		tagsStashIDsJoinTable.Col("stash_id").Eq(stashID.StashID),
+		tagsStashIDsJoinTable.Col("endpoint").Eq(stashID.Endpoint),
+	)
+
+	idsQuery := qb.selectDataset().Where(
+		qb.table().Col(idColumn).In(sq),
+	)
+
+	ret, err := qb.getMany(ctx, idsQuery)
+	if err != nil {
+		return nil, fmt.Errorf("getting tags for stash ID %s: %w", stashID.StashID, err)
+	}
+
+	return ret, nil
+}
+
 func (qb *TagStore) GetParentIDs(ctx context.Context, relatedID int) ([]int, error) {
 	return tagsParentTagsTableMgr.get(ctx, relatedID)
 }
@@ -779,6 +822,14 @@ func (qb *TagStore) UpdateAliases(ctx context.Context, tagID int, aliases []stri
 	return tagRepository.aliases.replace(ctx, tagID, aliases)
 }
 
+func (qb *TagStore) GetStashIDs(ctx context.Context, tagID int) ([]models.StashID, error) {
+	return tagsStashIDsTableMgr.get(ctx, tagID)
+}
+
+func (qb *TagStore) UpdateStashIDs(ctx context.Context, tagID int, stashIDs []models.StashID) error {
+	return tagsStashIDsTableMgr.replaceJoins(ctx, tagID, stashIDs)
+}
+
 func (qb *TagStore) Merge(ctx context.Context, source []int, destination int) error {
 	if len(source) == 0 {
 		return nil
@@ -840,6 +891,19 @@ AND NOT EXISTS(SELECT 1 FROM `+table+` o WHERE o.`+idColumn+` = `+table+`.`+idCo
 		return err
 	}
 
+	// Merge StashIDs - move all source StashIDs to destination (ignoring duplicates)
+	_, err = dbWrapper.Exec(ctx, `UPDATE OR IGNORE `+"tag_stash_ids"+`
+SET tag_id = ?
+WHERE tag_id IN `+inBinding, args...)
+	if err != nil {
+		return err
+	}
+
+	// Delete remaining source StashIDs that couldn't be moved (duplicates)
+	if _, err := dbWrapper.Exec(ctx, `DELETE FROM tag_stash_ids WHERE tag_id IN `+inBinding, srcArgs...); err != nil {
+		return err
+	}
+
 	for _, id := range source {
 		err = qb.Destroy(ctx, id)
 		if err != nil {
diff --git a/pkg/sqlite/tag_test.go b/pkg/sqlite/tag_test.go
index 770f39782..7d7d1bb09 100644
--- a/pkg/sqlite/tag_test.go
+++ b/pkg/sqlite/tag_test.go
@@ -900,6 +900,66 @@ func TestTagUpdateAlias(t *testing.T) {
 	}
 }
 
+func TestTagStashIDs(t *testing.T) {
+	if err := withTxn(func(ctx context.Context) error {
+		qb := db.Tag
+
+		// create tag to test against
+		const name = "TestTagStashIDs"
+		tag := models.Tag{
+			Name: name,
+		}
+		err := qb.Create(ctx, &tag)
+		if err != nil {
+			return fmt.Errorf("Error creating tag: %s", err.Error())
+		}
+
+		testStashIDReaderWriter(ctx, t, qb, tag.ID)
+
+		return nil
+	}); err != nil {
+		t.Error(err.Error())
+	}
+}
+
+func TestTagFindByStashID(t *testing.T) {
+	withTxn(func(ctx context.Context) error {
+		qb := db.Tag
+
+		// create tag to test against
+		const name = "TestTagFindByStashID"
+		const stashID = "stashid"
+		const endpoint = "endpoint"
+		tag := models.Tag{
+			Name:     name,
+			StashIDs: models.NewRelatedStashIDs([]models.StashID{{StashID: stashID, Endpoint: endpoint}}),
+		}
+		err := qb.Create(ctx, &tag)
+		if err != nil {
+			return fmt.Errorf("Error creating tag: %s", err.Error())
+		}
+
+		// find by stash ID
+		tags, err := qb.FindByStashID(ctx, models.StashID{StashID: stashID, Endpoint: endpoint})
+		if err != nil {
+			return fmt.Errorf("Error finding by stash ID: %s", err.Error())
+		}
+
+		assert.Len(t, tags, 1)
+		assert.Equal(t, tag.ID, tags[0].ID)
+
+		// find by non-existent stash ID
+		tags, err = qb.FindByStashID(ctx, models.StashID{StashID: "nonexistent", Endpoint: endpoint})
+		if err != nil {
+			return fmt.Errorf("Error finding by stash ID: %s", err.Error())
+		}
+
+		assert.Len(t, tags, 0)
+
+		return nil
+	})
+}
+
 func TestTagMerge(t *testing.T) {
 	assert := assert.New(t)
 
diff --git a/pkg/stashbox/scene.go b/pkg/stashbox/scene.go
index 33d427091..64c4defa2 100644
--- a/pkg/stashbox/scene.go
+++ b/pkg/stashbox/scene.go
@@ -205,7 +205,8 @@ func (c Client) sceneFragmentToScrapedScene(ctx context.Context, s *graphql.Scen
 
 	for _, t := range s.Tags {
 		st := &models.ScrapedTag{
-			Name: t.Name,
+			Name:         t.Name,
+			RemoteSiteID: &t.ID,
 		}
 		ss.Tags = append(ss.Tags, st)
 	}
@@ -242,8 +243,9 @@ type SceneDraft struct {
 	Performers []*models.Performer
 	// StashIDs must be loaded
 	Studio *models.Studio
-	Tags   []*models.Tag
-	Cover  []byte
+	// StashIDs must be loaded
+	Tags  []*models.Tag
+	Cover []byte
 }
 
 func (c Client) SubmitSceneDraft(ctx context.Context, d SceneDraft) (*string, error) {
@@ -347,7 +349,17 @@ func newSceneDraftInput(d SceneDraft, endpoint string) graphql.SceneDraftInput {
 	var tags []*graphql.DraftEntityInput
 	sceneTags := d.Tags
 	for _, tag := range sceneTags {
-		tags = append(tags, &graphql.DraftEntityInput{Name: tag.Name})
+		tagDraft := graphql.DraftEntityInput{Name: tag.Name}
+
+		stashIDs := tag.StashIDs.List()
+		for _, stashID := range stashIDs {
+			if stashID.Endpoint == endpoint {
+				tagDraft.ID = &stashID.StashID
+				break
+			}
+		}
+
+		tags = append(tags, &tagDraft)
 	}
 	draft.Tags = tags
 
diff --git a/pkg/tag/export.go b/pkg/tag/export.go
index bd1573341..b07418667 100644
--- a/pkg/tag/export.go
+++ b/pkg/tag/export.go
@@ -16,6 +16,7 @@ type FinderAliasImageGetter interface {
 	GetAliases(ctx context.Context, studioID int) ([]string, error)
 	GetImage(ctx context.Context, tagID int) ([]byte, error)
 	FindByChildTagID(ctx context.Context, childID int) ([]*models.Tag, error)
+	models.StashIDLoader
 }
 
 // ToJSON converts a Tag object into its JSON equivalent.
@@ -37,6 +38,15 @@ func ToJSON(ctx context.Context, reader FinderAliasImageGetter, tag *models.Tag)
 
 	newTagJSON.Aliases = aliases
 
+	if err := tag.LoadStashIDs(ctx, reader); err != nil {
+		return nil, fmt.Errorf("loading tag stash ids: %w", err)
+	}
+
+	stashIDs := tag.StashIDs.List()
+	if len(stashIDs) > 0 {
+		newTagJSON.StashIDs = stashIDs
+	}
+
 	image, err := reader.GetImage(ctx, tag.ID)
 	if err != nil {
 		logger.Errorf("Error getting tag image: %v", err)
diff --git a/pkg/tag/export_test.go b/pkg/tag/export_test.go
index 6c008c170..84e082f30 100644
--- a/pkg/tag/export_test.go
+++ b/pkg/tag/export_test.go
@@ -126,6 +126,13 @@ func TestToJSON(t *testing.T) {
 	db.Tag.On("GetAliases", testCtx, withParentsID).Return(nil, nil).Once()
 	db.Tag.On("GetAliases", testCtx, errParentsID).Return(nil, nil).Once()
 
+	db.Tag.On("GetStashIDs", testCtx, tagID).Return(nil, nil).Once()
+	db.Tag.On("GetStashIDs", testCtx, noImageID).Return(nil, nil).Once()
+	db.Tag.On("GetStashIDs", testCtx, errImageID).Return(nil, nil).Once()
+	// errAliasID test fails before GetStashIDs is called, so no mock needed
+	db.Tag.On("GetStashIDs", testCtx, withParentsID).Return(nil, nil).Once()
+	db.Tag.On("GetStashIDs", testCtx, errParentsID).Return(nil, nil).Once()
+
 	db.Tag.On("GetImage", testCtx, tagID).Return(imageBytes, nil).Once()
 	db.Tag.On("GetImage", testCtx, noImageID).Return(nil, nil).Once()
 	db.Tag.On("GetImage", testCtx, errImageID).Return(nil, imageErr).Once()
diff --git a/pkg/tag/import.go b/pkg/tag/import.go
index 21203afb0..53b741886 100644
--- a/pkg/tag/import.go
+++ b/pkg/tag/import.go
@@ -42,6 +42,7 @@ func (i *Importer) PreImport(ctx context.Context) error {
 		Description:   i.Input.Description,
 		Favorite:      i.Input.Favorite,
 		IgnoreAutoTag: i.Input.IgnoreAutoTag,
+		StashIDs:      models.NewRelatedStashIDs(i.Input.StashIDs),
 		CreatedAt:     i.Input.CreatedAt.GetTime(),
 		UpdatedAt:     i.Input.UpdatedAt.GetTime(),
 	}
diff --git a/ui/v2.5/graphql/data/scrapers.graphql b/ui/v2.5/graphql/data/scrapers.graphql
index 25c1036d8..4a0f588a4 100644
--- a/ui/v2.5/graphql/data/scrapers.graphql
+++ b/ui/v2.5/graphql/data/scrapers.graphql
@@ -158,6 +158,7 @@ fragment ScrapedSceneStudioData on ScrapedStudio {
 fragment ScrapedSceneTagData on ScrapedTag {
   stored_id
   name
+  remote_site_id
 }
 
 fragment ScrapedSceneData on ScrapedScene {
diff --git a/ui/v2.5/graphql/data/tag.graphql b/ui/v2.5/graphql/data/tag.graphql
index 5eae173ea..2395f48bd 100644
--- a/ui/v2.5/graphql/data/tag.graphql
+++ b/ui/v2.5/graphql/data/tag.graphql
@@ -6,6 +6,11 @@ fragment TagData on Tag {
   aliases
   ignore_auto_tag
   favorite
+  stash_ids {
+    endpoint
+    stash_id
+    updated_at
+  }
   image_path
   scene_count
   scene_count_all: scene_count(depth: -1)
diff --git a/ui/v2.5/src/components/Shared/StashID.tsx b/ui/v2.5/src/components/Shared/StashID.tsx
index 00bddf58e..8e1fecef2 100644
--- a/ui/v2.5/src/components/Shared/StashID.tsx
+++ b/ui/v2.5/src/components/Shared/StashID.tsx
@@ -4,7 +4,7 @@ import { ConfigurationContext } from "src/hooks/Config";
 import { getStashboxBase } from "src/utils/stashbox";
 import { ExternalLink } from "./ExternalLink";
 
-export type LinkType = "performers" | "scenes" | "studios";
+export type LinkType = "performers" | "scenes" | "studios" | "tags";
 
 export const StashIDPill: React.FC<{
   stashID: Pick<StashId, "endpoint" | "stash_id">;
diff --git a/ui/v2.5/src/components/Tagger/scenes/StashSearchResult.tsx b/ui/v2.5/src/components/Tagger/scenes/StashSearchResult.tsx
index f76369387..a3429be9a 100755
--- a/ui/v2.5/src/components/Tagger/scenes/StashSearchResult.tsx
+++ b/ui/v2.5/src/components/Tagger/scenes/StashSearchResult.tsx
@@ -715,6 +715,18 @@ const StashSearchResult: React.FC<IStashSearchResultProps> = ({
 
   async function onCreateTag(t: GQL.ScrapedTag) {
     const toCreate: GQL.TagCreateInput = { name: t.name };
+
+    // If the tag has a remote_site_id and we have an endpoint, include the stash_id
+    const endpoint = currentSource?.sourceInput.stash_box_endpoint;
+    if (t.remote_site_id && endpoint) {
+      toCreate.stash_ids = [
+        {
+          endpoint: endpoint,
+          stash_id: t.remote_site_id,
+        },
+      ];
+    }
+
     const newTagID = await createNewTag(t, toCreate);
     if (newTagID !== undefined) {
       setTagIDs([...tagIDs, newTagID]);
diff --git a/ui/v2.5/src/components/Tags/TagDetails/TagDetailsPanel.tsx b/ui/v2.5/src/components/Tags/TagDetails/TagDetailsPanel.tsx
index 9e368aa8b..92c92d072 100644
--- a/ui/v2.5/src/components/Tags/TagDetails/TagDetailsPanel.tsx
+++ b/ui/v2.5/src/components/Tags/TagDetails/TagDetailsPanel.tsx
@@ -1,6 +1,7 @@
 import React from "react";
 import { TagLink } from "src/components/Shared/TagLink";
 import { DetailItem } from "src/components/Shared/DetailItem";
+import { StashIDPill } from "src/components/Shared/StashID";
 import * as GQL from "src/core/generated-graphql";
 
 interface ITagDetails {
@@ -51,6 +52,22 @@ export const TagDetailsPanel: React.FC<ITagDetails> = ({ tag, fullWidth }) => {
     );
   }
 
+  function renderStashIDs() {
+    if (!tag.stash_ids?.length) {
+      return;
+    }
+
+    return (
+      <ul className="pl-0">
+        {tag.stash_ids.map((stashID) => (
+          <li key={stashID.stash_id} className="row no-gutters">
+            <StashIDPill stashID={stashID} linkType="tags" />
+          </li>
+        ))}
+      </ul>
+    );
+  }
+
   return (
     <div className="detail-group">
       <DetailItem
@@ -68,6 +85,11 @@ export const TagDetailsPanel: React.FC<ITagDetails> = ({ tag, fullWidth }) => {
         value={renderChildrenField()}
         fullWidth={fullWidth}
       />
+      <DetailItem
+        id="stash_ids"
+        value={renderStashIDs()}
+        fullWidth={fullWidth}
+      />
     </div>
   );
 };
diff --git a/ui/v2.5/src/components/Tags/TagDetails/TagEditPanel.tsx b/ui/v2.5/src/components/Tags/TagDetails/TagEditPanel.tsx
index da79b6c4e..41756953b 100644
--- a/ui/v2.5/src/components/Tags/TagDetails/TagEditPanel.tsx
+++ b/ui/v2.5/src/components/Tags/TagDetails/TagEditPanel.tsx
@@ -14,6 +14,7 @@ import { useToast } from "src/hooks/Toast";
 import { handleUnsavedChanges } from "src/utils/navigation";
 import { formikUtils } from "src/utils/form";
 import { yupFormikValidate, yupUniqueAliases } from "src/utils/yup";
+import { getStashIDs } from "src/utils/stashIds";
 import { Tag, TagSelect } from "../TagSelect";
 
 interface ITagEditPanel {
@@ -52,6 +53,7 @@ export const TagEditPanel: React.FC<ITagEditPanel> = ({
     parent_ids: yup.array(yup.string().required()).defined(),
     child_ids: yup.array(yup.string().required()).defined(),
     ignore_auto_tag: yup.boolean().defined(),
+    stash_ids: yup.mixed<GQL.StashIdInput[]>().defined(),
     image: yup.string().nullable().optional(),
   });
 
@@ -63,6 +65,7 @@ export const TagEditPanel: React.FC<ITagEditPanel> = ({
     parent_ids: (tag?.parents ?? []).map((t) => t.id),
     child_ids: (tag?.children ?? []).map((t) => t.id),
     ignore_auto_tag: tag?.ignore_auto_tag ?? false,
+    stash_ids: getStashIDs(tag?.stash_ids),
   };
 
   type InputValues = yup.InferType<typeof schema>;
@@ -140,10 +143,12 @@ export const TagEditPanel: React.FC<ITagEditPanel> = ({
     ImageUtils.onImageChange(event, onImageLoad);
   }
 
-  const { renderField, renderInputField, renderStringListField } = formikUtils(
-    intl,
-    formik
-  );
+  const {
+    renderField,
+    renderInputField,
+    renderStringListField,
+    renderStashIDsField,
+  } = formikUtils(intl, formik);
 
   function renderParentTagsField() {
     const title = intl.formatMessage({ id: "parent_tags" });
@@ -210,6 +215,7 @@ export const TagEditPanel: React.FC<ITagEditPanel> = ({
         {renderInputField("description", "textarea")}
         {renderParentTagsField()}
         {renderSubTagsField()}
+        {renderStashIDsField("stash_ids", "tags")}
         <hr />
         {renderInputField("ignore_auto_tag", "checkbox")}
       </Form>

From e3b3fbbf630dbafd1f26325e1943af280e1e7335 Mon Sep 17 00:00:00 2001
From: Gykes <24581046+Gykes@users.noreply.github.com>
Date: Thu, 13 Nov 2025 14:12:06 -0800
Subject: [PATCH 130/405] FR: Add Duration Slider to Sidebar Filters (#6264)

---------
Co-authored-by: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
---
 .../List/Filters/SidebarDurationFilter.tsx    | 360 ++++++++++++++++++
 ui/v2.5/src/components/List/styles.scss       |  30 ++
 ui/v2.5/src/components/Scenes/SceneList.tsx   |   9 +
 .../components/Shared/DoubleRangeInput.tsx    |  61 +++
 ui/v2.5/src/components/Shared/styles.scss     |  97 +++++
 ui/v2.5/src/models/list-filter/scenes.ts      |   5 +-
 6 files changed, 561 insertions(+), 1 deletion(-)
 create mode 100644 ui/v2.5/src/components/List/Filters/SidebarDurationFilter.tsx
 create mode 100644 ui/v2.5/src/components/Shared/DoubleRangeInput.tsx

diff --git a/ui/v2.5/src/components/List/Filters/SidebarDurationFilter.tsx b/ui/v2.5/src/components/List/Filters/SidebarDurationFilter.tsx
new file mode 100644
index 000000000..ff4b780af
--- /dev/null
+++ b/ui/v2.5/src/components/List/Filters/SidebarDurationFilter.tsx
@@ -0,0 +1,360 @@
+import React, { useEffect, useMemo, useState } from "react";
+import { CriterionModifier } from "../../../core/generated-graphql";
+import { CriterionOption } from "../../../models/list-filter/criteria/criterion";
+import { DurationCriterion } from "src/models/list-filter/criteria/criterion";
+import { ListFilterModel } from "src/models/list-filter/filter";
+import { Option, SidebarListFilter } from "./SidebarListFilter";
+import TextUtils from "src/utils/text";
+import { DoubleRangeInput } from "src/components/Shared/DoubleRangeInput";
+import { useDebounce } from "src/hooks/debounce";
+
+interface ISidebarFilter {
+  title?: React.ReactNode;
+  option: CriterionOption;
+  filter: ListFilterModel;
+  setFilter: (f: ListFilterModel) => void;
+  sectionID?: string;
+}
+
+// Duration presets in seconds
+const DURATION_PRESETS = [
+  { id: "0-5", label: "0-5 min", min: 0, max: 300 },
+  { id: "5-10", label: "5-10 min", min: 300, max: 600 },
+  { id: "10-20", label: "10-20 min", min: 600, max: 1200 },
+  { id: "20-40", label: "20-40 min", min: 1200, max: 2400 },
+  { id: "40+", label: "40+ min", min: 2400, max: null },
+];
+
+const MAX_DURATION = 7200; // 2 hours in seconds for the slider
+const MAX_LABEL = "2+ hrs"; // Display label for maximum duration
+
+// Custom step values: 0, 2min (120s), 5min (300s), then 5 minute intervals
+const DURATION_STEPS = [
+  0, 120, 300, 600, 900, 1200, 1500, 1800, 2100, 2400, 2700, 3000, 3300, 3600,
+  3900, 4200, 4500, 4800, 5100, 5400, 5700, 6000, 6300, 6600, 6900, 7200,
+];
+
+// Snap a value to the nearest valid step
+function snapToStep(value: number): number {
+  if (value <= 0) return 0;
+  if (value >= MAX_DURATION) return MAX_DURATION;
+
+  // Find the closest step
+  let closest = DURATION_STEPS[0];
+  let minDiff = Math.abs(value - closest);
+
+  for (const step of DURATION_STEPS) {
+    const diff = Math.abs(value - step);
+    if (diff < minDiff) {
+      minDiff = diff;
+      closest = step;
+    }
+  }
+
+  return closest;
+}
+
+export const SidebarDurationFilter: React.FC<ISidebarFilter> = ({
+  title,
+  option,
+  filter,
+  setFilter,
+  sectionID,
+}) => {
+  const criteria = filter.criteriaFor(option.type) as DurationCriterion[];
+  const criterion = criteria.length > 0 ? criteria[0] : null;
+
+  // Get current values from criterion
+  const currentMin = criterion?.value?.value ?? 0;
+  const currentMax = criterion?.value?.value2 ?? MAX_DURATION;
+
+  const [sliderMin, setSliderMin] = useState(currentMin);
+  const [sliderMax, setSliderMax] = useState(currentMax);
+  const [minInput, setMinInput] = useState(
+    currentMin === 0 ? "0m" : TextUtils.secondsAsTimeString(currentMin)
+  );
+  const [maxInput, setMaxInput] = useState(
+    currentMax >= MAX_DURATION
+      ? MAX_LABEL
+      : TextUtils.secondsAsTimeString(currentMax)
+  );
+
+  // Reset slider when criterion is removed externally (via filter tag X)
+  useEffect(() => {
+    if (!criterion) {
+      setSliderMin(0);
+      setSliderMax(MAX_DURATION);
+      setMinInput("0m");
+      setMaxInput(MAX_LABEL);
+    }
+  }, [criterion]);
+
+  // Determine which preset is selected
+  const selectedPreset = useMemo(() => {
+    if (!criterion) return null;
+
+    // Check if current values match any preset
+    for (const preset of DURATION_PRESETS) {
+      if (preset.max === null) {
+        // For "40+ min" preset
+        if (
+          criterion.modifier === CriterionModifier.GreaterThan &&
+          criterion.value.value === preset.min
+        ) {
+          return preset.id;
+        }
+      } else {
+        // For range presets
+        if (
+          criterion.modifier === CriterionModifier.Between &&
+          criterion.value.value === preset.min &&
+          criterion.value.value2 === preset.max
+        ) {
+          return preset.id;
+        }
+      }
+    }
+
+    // Check if it's a custom range or custom GreaterThan
+    if (
+      criterion.modifier === CriterionModifier.Between ||
+      criterion.modifier === CriterionModifier.GreaterThan
+    ) {
+      return "custom";
+    }
+
+    return null;
+  }, [criterion]);
+
+  const options: Option[] = useMemo(() => {
+    return DURATION_PRESETS.map((preset) => ({
+      id: preset.id,
+      label: preset.label,
+      className: "duration-preset",
+    }));
+  }, []);
+
+  const selected: Option[] = useMemo(() => {
+    if (!selectedPreset) return [];
+    if (selectedPreset === "custom") return [];
+
+    const preset = DURATION_PRESETS.find((p) => p.id === selectedPreset);
+    if (preset) {
+      return [
+        {
+          id: preset.id,
+          label: preset.label,
+          className: "duration-preset",
+        },
+      ];
+    }
+    return [];
+  }, [selectedPreset]);
+
+  function onSelectPreset(item: Option) {
+    const preset = DURATION_PRESETS.find((p) => p.id === item.id);
+    if (!preset) return;
+
+    const newCriterion = criterion ? criterion.clone() : option.makeCriterion();
+
+    if (preset.max === null) {
+      // "40+ min" - use GreaterThan
+      newCriterion.modifier = CriterionModifier.GreaterThan;
+      newCriterion.value.value = preset.min;
+      newCriterion.value.value2 = undefined;
+    } else {
+      // Range preset - use Between
+      newCriterion.modifier = CriterionModifier.Between;
+      newCriterion.value.value = preset.min;
+      newCriterion.value.value2 = preset.max;
+    }
+
+    setSliderMin(preset.min);
+    setSliderMax(preset.max ?? MAX_DURATION);
+    setMinInput(
+      preset.min === 0 ? "0m" : TextUtils.secondsAsTimeString(preset.min)
+    );
+    setMaxInput(
+      preset.max === null
+        ? MAX_LABEL
+        : TextUtils.secondsAsTimeString(preset.max)
+    );
+    setFilter(filter.replaceCriteria(option.type, [newCriterion]));
+  }
+
+  function onUnselectPreset() {
+    setFilter(filter.removeCriterion(option.type));
+    setSliderMin(0);
+    setSliderMax(MAX_DURATION);
+    setMinInput("0m");
+    setMaxInput(MAX_LABEL);
+  }
+
+  // Parse time input (supports formats like "10", "1:30", "1:30:00", "2+ hrs")
+  function parseTimeInput(input: string): number | null {
+    const trimmed = input.trim().toLowerCase();
+
+    if (trimmed === "max" || trimmed === MAX_LABEL.toLowerCase()) {
+      return MAX_DURATION;
+    }
+
+    // Try to parse as pure number (minutes)
+    const minutesOnly = parseFloat(trimmed);
+    if (!isNaN(minutesOnly) && trimmed.indexOf(":") === -1) {
+      return Math.round(minutesOnly * 60);
+    }
+
+    // Parse HH:MM:SS or MM:SS format
+    const parts = trimmed.split(":").map((p) => parseInt(p));
+    if (parts.some(isNaN)) {
+      return null;
+    }
+
+    if (parts.length === 2) {
+      // MM:SS
+      return parts[0] * 60 + parts[1];
+    } else if (parts.length === 3) {
+      // HH:MM:SS
+      return parts[0] * 3600 + parts[1] * 60 + parts[2];
+    }
+
+    return null;
+  }
+
+  // Debounced filter update
+  function updateFilter(min: number, max: number) {
+    // If slider is at full range (0 to max), remove the filter entirely
+    if (min === 0 && max >= MAX_DURATION) {
+      setFilter(filter.removeCriterion(option.type));
+      return;
+    }
+
+    const newCriterion = criterion ? criterion.clone() : option.makeCriterion();
+
+    // If max is at MAX_DURATION (but min > 0), use GreaterThan
+    if (max >= MAX_DURATION) {
+      newCriterion.modifier = CriterionModifier.GreaterThan;
+      newCriterion.value.value = min;
+      newCriterion.value.value2 = undefined;
+    } else {
+      newCriterion.modifier = CriterionModifier.Between;
+      newCriterion.value.value = min;
+      newCriterion.value.value2 = max;
+    }
+
+    setFilter(filter.replaceCriteria(option.type, [newCriterion]));
+  }
+
+  const updateFilterDebounceMS = 300;
+  const debounceUpdateFilter = useDebounce(
+    updateFilter,
+    updateFilterDebounceMS
+  );
+
+  function handleSliderChange(min: number, max: number) {
+    if (min < 0 || max > MAX_DURATION || min >= max) {
+      return;
+    }
+
+    setSliderMin(min);
+    setSliderMax(max);
+    setMinInput(min === 0 ? "0m" : TextUtils.secondsAsTimeString(min));
+    setMaxInput(
+      max >= MAX_DURATION ? MAX_LABEL : TextUtils.secondsAsTimeString(max)
+    );
+
+    debounceUpdateFilter(min, max);
+  }
+
+  function handleMinInputChange(value: string) {
+    setMinInput(value);
+  }
+
+  function handleMaxInputChange(value: string) {
+    setMaxInput(value);
+  }
+
+  function handleMinInputBlur() {
+    const parsed = parseTimeInput(minInput);
+    if (parsed !== null && parsed >= 0 && parsed < sliderMax) {
+      handleSliderChange(parsed, sliderMax);
+    } else {
+      // Reset to current value if invalid
+      setMinInput(
+        sliderMin === 0 ? "0m" : TextUtils.secondsAsTimeString(sliderMin)
+      );
+    }
+  }
+
+  function handleMaxInputBlur() {
+    const parsed = parseTimeInput(maxInput);
+    if (parsed !== null && parsed > sliderMin && parsed <= MAX_DURATION) {
+      handleSliderChange(sliderMin, parsed);
+    } else {
+      // Reset to current value if invalid
+      setMaxInput(
+        sliderMax >= MAX_DURATION
+          ? MAX_LABEL
+          : TextUtils.secondsAsTimeString(sliderMax)
+      );
+    }
+  }
+
+  const customSlider = (
+    <DoubleRangeInput
+      className="duration-slider"
+      minInput={
+        <input
+          type="text"
+          className="duration-label-input"
+          value={minInput}
+          onChange={(e) => handleMinInputChange(e.target.value)}
+          onBlur={handleMinInputBlur}
+          onKeyDown={(e) => {
+            if (e.key === "Enter") {
+              e.currentTarget.blur();
+            }
+          }}
+          placeholder="0:00"
+        />
+      }
+      maxInput={
+        <input
+          type="text"
+          className="duration-label-input"
+          value={maxInput}
+          onChange={(e) => handleMaxInputChange(e.target.value)}
+          onBlur={handleMaxInputBlur}
+          onKeyDown={(e) => {
+            if (e.key === "Enter") {
+              e.currentTarget.blur();
+            }
+          }}
+          placeholder={MAX_LABEL}
+        />
+      }
+      min={0}
+      max={MAX_DURATION}
+      value={[sliderMin, sliderMax]}
+      onChange={(vals) => {
+        handleSliderChange(snapToStep(vals[0]), snapToStep(vals[1]));
+      }}
+    />
+  );
+
+  return (
+    <SidebarListFilter
+      title={title}
+      candidates={options}
+      onSelect={onSelectPreset}
+      onUnselect={onUnselectPreset}
+      selected={selected}
+      singleValue
+      preCandidates={selectedPreset === null ? customSlider : undefined}
+      preSelected={
+        selectedPreset === "custom" || selectedPreset ? customSlider : undefined
+      }
+      sectionID={sectionID}
+    />
+  );
+};
diff --git a/ui/v2.5/src/components/List/styles.scss b/ui/v2.5/src/components/List/styles.scss
index df50430a2..1b5b4c6e1 100644
--- a/ui/v2.5/src/components/List/styles.scss
+++ b/ui/v2.5/src/components/List/styles.scss
@@ -1400,3 +1400,33 @@ input[type="range"].zoom-slider {
     }
   }
 }
+
+// Duration slider styles
+.duration-slider {
+  padding: 0.5rem 0 1rem;
+  width: 100%;
+}
+
+.duration-label-input {
+  background: transparent;
+  border: 1px solid transparent;
+  border-radius: 0.25rem;
+  color: $text-color;
+  font-size: 0.875rem;
+  font-weight: 500;
+  padding: 0.125rem 0.25rem;
+  width: 4rem;
+
+  &:hover {
+    border-color: $secondary;
+  }
+
+  &:focus {
+    border-color: $primary;
+    outline: none;
+  }
+}
+
+.duration-preset {
+  cursor: pointer;
+}
diff --git a/ui/v2.5/src/components/Scenes/SceneList.tsx b/ui/v2.5/src/components/Scenes/SceneList.tsx
index 3936be6f2..14baf7188 100644
--- a/ui/v2.5/src/components/Scenes/SceneList.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneList.tsx
@@ -55,6 +55,8 @@ import { RatingCriterionOption } from "src/models/list-filter/criteria/rating";
 import { SidebarRatingFilter } from "../List/Filters/RatingFilter";
 import { OrganizedCriterionOption } from "src/models/list-filter/criteria/organized";
 import { SidebarBooleanFilter } from "../List/Filters/BooleanFilter";
+import { DurationCriterionOption } from "src/models/list-filter/scenes";
+import { SidebarDurationFilter } from "../List/Filters/SidebarDurationFilter";
 import {
   FilteredSidebarHeader,
   useFilteredSidebarKeybinds,
@@ -320,6 +322,13 @@ const SidebarContent: React.FC<{
           setFilter={setFilter}
           sectionID="rating"
         />
+        <SidebarDurationFilter
+          title={<FormattedMessage id="duration" />}
+          option={DurationCriterionOption}
+          filter={filter}
+          setFilter={setFilter}
+          sectionID="duration"
+        />
         <SidebarBooleanFilter
           title={<FormattedMessage id="organized" />}
           data-type={OrganizedCriterionOption.type}
diff --git a/ui/v2.5/src/components/Shared/DoubleRangeInput.tsx b/ui/v2.5/src/components/Shared/DoubleRangeInput.tsx
new file mode 100644
index 000000000..1d8e7fbfe
--- /dev/null
+++ b/ui/v2.5/src/components/Shared/DoubleRangeInput.tsx
@@ -0,0 +1,61 @@
+import React from "react";
+
+export const DoubleRangeInput: React.FC<{
+  className?: string;
+  minInput: React.ReactNode;
+  maxInput: React.ReactNode;
+  min?: number;
+  max: number;
+  value: [number, number];
+  onChange(value: [number, number]): void;
+}> = ({
+  className = "",
+  minInput,
+  maxInput,
+  min = 0,
+  max,
+  value,
+  onChange,
+}) => {
+  const minValue = value[0];
+  const maxValue = value[1];
+
+  return (
+    <div className={`double-range-input ${className}`}>
+      <div className="double-range-input-labels">
+        {minInput}
+        {maxInput}
+      </div>
+      <div className="double-range-sliders">
+        <input
+          type="range"
+          min={min}
+          max={max}
+          step={1}
+          value={minValue}
+          onChange={(e) => {
+            const rawValue = parseInt(e.target.value);
+            if (rawValue < maxValue) {
+              onChange([rawValue, maxValue]);
+            }
+          }}
+          className="double-range-slider double-range-slider-min"
+        />
+        <input
+          type="range"
+          min={min}
+          max={max}
+          step={1}
+          value={maxValue}
+          onChange={(e) => {
+            const rawValue = parseInt(e.target.value);
+            if (rawValue > minValue) {
+              onChange([minValue, rawValue]);
+            }
+          }}
+          className="double-range-slider double-range-slider-max"
+        />
+      </div>
+    </div>
+  );
+};
diff --git a/ui/v2.5/src/components/Shared/styles.scss b/ui/v2.5/src/components/Shared/styles.scss
index faaa00c53..8eaa3b90a 100644
--- a/ui/v2.5/src/components/Shared/styles.scss
+++ b/ui/v2.5/src/components/Shared/styles.scss
@@ -949,3 +949,100 @@ $sticky-header-height: calc(50px + 3.3rem);
     }
   }
 }
+
+// Duration slider styles
+.duration-slider-container {
+  padding: 0.5rem 0 1rem;
+  width: 100%;
+}
+
+.double-range-input-labels {
+  color: $text-color;
+  display: flex;
+  font-size: 0.875rem;
+  font-weight: 500;
+  justify-content: space-between;
+  margin-bottom: 0.5rem;
+  padding: 0 0.25rem;
+
+  .duration-label-input {
+    &:first-child {
+      text-align: left;
+    }
+
+    &:last-child {
+      text-align: right;
+    }
+  }
+}
+
+.double-range-sliders {
+  height: 22px;
+  position: relative;
+}
+
+.double-range-slider {
+  pointer-events: none;
+  position: absolute;
+  width: 100%;
+
+  &::-webkit-slider-thumb {
+    appearance: none;
+    background-color: $primary;
+    border: 2px solid $primary;
+    border-radius: 50%;
+    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.3);
+    cursor: pointer;
+    height: 18px;
+    pointer-events: all;
+    position: relative;
+    width: 18px;
+  }
+
+  &::-moz-range-thumb {
+    appearance: none;
+    background-color: $primary;
+    border: 2px solid $primary;
+    border-radius: 50%;
+    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.3);
+    cursor: pointer;
+    height: 18px;
+    pointer-events: all;
+    position: relative;
+    width: 18px;
+  }
+
+  &::-ms-thumb {
+    appearance: none;
+    background-color: $primary;
+    border: 2px solid $primary;
+    border-radius: 50%;
+    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.3);
+    cursor: pointer;
+    height: 18px;
+    pointer-events: all;
+    position: relative;
+    width: 18px;
+  }
+}
+
+.double-range-slider-min {
+  z-index: 1;
+}
+
+input[type="range"].double-range-slider-max {
+  z-index: 2;
+
+  // combining these into one rule doesn't work for some reason
+  &::-webkit-slider-runnable-track {
+    background: transparent;
+  }
+
+  &::-moz-range-track {
+    background: transparent;
+  }
+
+  &::-ms-track {
+    background: transparent;
+  }
+}
diff --git a/ui/v2.5/src/models/list-filter/scenes.ts b/ui/v2.5/src/models/list-filter/scenes.ts
index 8bd3918f9..09c60e483 100644
--- a/ui/v2.5/src/models/list-filter/scenes.ts
+++ b/ui/v2.5/src/models/list-filter/scenes.ts
@@ -79,6 +79,9 @@ const displayModeOptions = [
   DisplayMode.Tagger,
 ];
 
+export const DurationCriterionOption =
+  createDurationCriterionOption("duration");
+
 const criterionOptions = [
   createStringCriterionOption("title"),
   createStringCriterionOption("code", "scene_code"),
@@ -98,7 +101,7 @@ const criterionOptions = [
   createMandatoryNumberCriterionOption("bitrate"),
   createStringCriterionOption("video_codec"),
   createStringCriterionOption("audio_codec"),
-  createDurationCriterionOption("duration"),
+  DurationCriterionOption,
   createDurationCriterionOption("resume_time"),
   createDurationCriterionOption("play_duration"),
   createMandatoryNumberCriterionOption("play_count"),

From 957c4fe1b5617ccf6f208a35a3a40d3eb9c72a55 Mon Sep 17 00:00:00 2001
From: Gykes <24581046+Gykes@users.noreply.github.com>
Date: Thu, 13 Nov 2025 16:49:26 -0800
Subject: [PATCH 131/405] Bugfix: Fix empty Aliases Being Created for Studios
 (#6273)

* Filter out empty alias strings in studio modal create
* Reject empty alias strings in backend
* Remove invalid ValidateAliases call from UpdatePartial

This was calling using the values which are not necessarily the final values.
---------

Co-authored-by: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
---
 pkg/sqlite/studio.go                                 |  6 +-----
 pkg/studio/validate.go                               | 12 ++++++++----
 ui/v2.5/src/components/Tagger/scenes/StudioModal.tsx | 10 ++++++++--
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/pkg/sqlite/studio.go b/pkg/sqlite/studio.go
index bddc17c12..1a05be6f3 100644
--- a/pkg/sqlite/studio.go
+++ b/pkg/sqlite/studio.go
@@ -181,7 +181,7 @@ func (qb *StudioStore) Create(ctx context.Context, newObject *models.Studio) err
 	}
 
 	if newObject.Aliases.Loaded() {
-		if err := studio.EnsureAliasesUnique(ctx, id, newObject.Aliases.List(), qb); err != nil {
+		if err := studio.ValidateAliases(ctx, id, newObject.Aliases.List(), qb); err != nil {
 			return err
 		}
 
@@ -232,10 +232,6 @@ func (qb *StudioStore) UpdatePartial(ctx context.Context, input models.StudioPar
 	}
 
 	if input.Aliases != nil {
-		if err := studio.EnsureAliasesUnique(ctx, input.ID, input.Aliases.Values, qb); err != nil {
-			return nil, err
-		}
-
 		if err := studiosAliasesTableMgr.modifyJoins(ctx, input.ID, input.Aliases.Values, input.Aliases.Mode); err != nil {
 			return nil, err
 		}
diff --git a/pkg/studio/validate.go b/pkg/studio/validate.go
index 8a8676351..4e2f51c84 100644
--- a/pkg/studio/validate.go
+++ b/pkg/studio/validate.go
@@ -10,6 +10,7 @@ import (
 
 var (
 	ErrNameMissing       = errors.New("studio name must not be blank")
+	ErrEmptyAlias        = errors.New("studio alias must not be an empty string")
 	ErrStudioOwnAncestor = errors.New("studio cannot be an ancestor of itself")
 )
 
@@ -61,9 +62,12 @@ func EnsureStudioNameUnique(ctx context.Context, id int, name string, qb models.
 	return nil
 }
 
-func EnsureAliasesUnique(ctx context.Context, id int, aliases []string, qb models.StudioQueryer) error {
+func ValidateAliases(ctx context.Context, id int, aliases []string, qb models.StudioQueryer) error {
 	for _, a := range aliases {
-		if err := EnsureStudioNameUnique(ctx, id, a, qb); err != nil {
+		if err := validateName(ctx, id, a, qb); err != nil {
+			if errors.Is(err, ErrNameMissing) {
+				return ErrEmptyAlias
+			}
 			return err
 		}
 	}
@@ -77,7 +81,7 @@ func ValidateCreate(ctx context.Context, studio models.Studio, qb models.StudioQ
 	}
 
 	if studio.Aliases.Loaded() && len(studio.Aliases.List()) > 0 {
-		if err := EnsureAliasesUnique(ctx, 0, studio.Aliases.List(), qb); err != nil {
+		if err := ValidateAliases(ctx, 0, studio.Aliases.List(), qb); err != nil {
 			return err
 		}
 	}
@@ -131,7 +135,7 @@ func ValidateModify(ctx context.Context, s models.StudioPartial, qb ValidateModi
 		}
 
 		effectiveAliases := s.Aliases.Apply(existing.Aliases.List())
-		if err := EnsureAliasesUnique(ctx, s.ID, effectiveAliases, qb); err != nil {
+		if err := ValidateAliases(ctx, s.ID, effectiveAliases, qb); err != nil {
 			return err
 		}
 	}
diff --git a/ui/v2.5/src/components/Tagger/scenes/StudioModal.tsx b/ui/v2.5/src/components/Tagger/scenes/StudioModal.tsx
index e01c40881..a77025d57 100644
--- a/ui/v2.5/src/components/Tagger/scenes/StudioModal.tsx
+++ b/ui/v2.5/src/components/Tagger/scenes/StudioModal.tsx
@@ -236,7 +236,10 @@ const StudioModal: React.FC<IStudioModalProps> = ({
       image: studio.image,
       parent_id: studio.parent?.stored_id,
       details: studio.details,
-      aliases: studio.aliases?.split(",").map((a) => a.trim()),
+      aliases: studio.aliases
+        ?.split(",")
+        .map((a) => a.trim())
+        .filter((a) => a),
       tag_ids: studio.tags?.map((t) => t.stored_id).filter((id) => id) as
         | string[]
         | undefined,
@@ -270,7 +273,10 @@ const StudioModal: React.FC<IStudioModalProps> = ({
         urls: studio.parent?.urls,
         image: studio.parent?.image,
         details: studio.parent?.details,
-        aliases: studio.parent?.aliases?.split(",").map((a) => a.trim()),
+        aliases: studio.parent?.aliases
+          ?.split(",")
+          .map((a) => a.trim())
+          .filter((a) => a),
         tag_ids: studio.parent?.tags
           ?.map((t) => t.stored_id)
           .filter((id) => id) as string[] | undefined,

From d743787bb38a16520a0d96e8acdb310a90250ce5 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Fri, 14 Nov 2025 12:57:34 +1100
Subject: [PATCH 132/405] Include stash-ids when creating objects from scrape
 dialog (#6269)

* Filter out empty aliases
---
 .../Scenes/SceneDetails/SceneScrapeDialog.tsx |  6 ++-
 .../Shared/ScrapeDialog/createObjects.ts      | 46 ++++++++++++++++---
 .../Shared/ScrapeDialog/scrapedTags.tsx       |  4 +-
 ui/v2.5/src/core/performers.ts                | 19 +++++++-
 4 files changed, 65 insertions(+), 10 deletions(-)

diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/SceneScrapeDialog.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/SceneScrapeDialog.tsx
index d6acfabfb..6a89caf85 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/SceneScrapeDialog.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/SceneScrapeDialog.tsx
@@ -133,7 +133,8 @@ export const SceneScrapeDialog: React.FC<ISceneScrapeDialogProps> = ({
 
   const { tags, newTags, scrapedTagsRow } = useScrapedTags(
     sceneTags,
-    scraped.tags
+    scraped.tags,
+    endpoint
   );
 
   const [details, setDetails] = useState<ScrapeResult<string>>(
@@ -148,6 +149,7 @@ export const SceneScrapeDialog: React.FC<ISceneScrapeDialogProps> = ({
     scrapeResult: studio,
     setScrapeResult: setStudio,
     setNewObject: setNewStudio,
+    endpoint,
   });
 
   const createNewPerformer = useCreateScrapedPerformer({
@@ -155,6 +157,7 @@ export const SceneScrapeDialog: React.FC<ISceneScrapeDialogProps> = ({
     setScrapeResult: setPerformers,
     newObjects: newPerformers,
     setNewObjects: setNewPerformers,
+    endpoint,
   });
 
   const createNewGroup = useCreateScrapedGroup({
@@ -162,6 +165,7 @@ export const SceneScrapeDialog: React.FC<ISceneScrapeDialogProps> = ({
     setScrapeResult: setGroups,
     newObjects: newGroups,
     setNewObjects: setNewGroups,
+    endpoint,
   });
 
   const intl = useIntl();
diff --git a/ui/v2.5/src/components/Shared/ScrapeDialog/createObjects.ts b/ui/v2.5/src/components/Shared/ScrapeDialog/createObjects.ts
index c4ba3a3e7..e2d09294a 100644
--- a/ui/v2.5/src/components/Shared/ScrapeDialog/createObjects.ts
+++ b/ui/v2.5/src/components/Shared/ScrapeDialog/createObjects.ts
@@ -46,6 +46,7 @@ interface IUseCreateNewStudioProps {
     scrapeResult: ObjectScrapeResult<GQL.ScrapedStudio>
   ) => void;
   setNewObject: (newObject: GQL.ScrapedStudio | undefined) => void;
+  endpoint?: string;
 }
 
 export function useCreateScrapedStudio(props: IUseCreateNewStudioProps) {
@@ -54,12 +55,33 @@ export function useCreateScrapedStudio(props: IUseCreateNewStudioProps) {
   const { scrapeResult, setScrapeResult, setNewObject } = props;
 
   async function createNewStudio(toCreate: GQL.ScrapedStudio) {
+    const input: GQL.StudioCreateInput = {
+      name: toCreate.name,
+      urls: toCreate.urls,
+      aliases:
+        toCreate.aliases
+          ?.split(",")
+          .map((a) => a.trim())
+          .filter((a) => a) || [],
+      details: toCreate.details,
+      image: toCreate.image,
+      tag_ids: (toCreate.tags ?? [])
+        .filter((t) => t.stored_id)
+        .map((t) => t.stored_id!),
+    };
+
+    if (props.endpoint && toCreate.remote_site_id) {
+      input.stash_ids = [
+        {
+          endpoint: props.endpoint,
+          stash_id: toCreate.remote_site_id,
+        },
+      ];
+    }
+
     const result = await createStudio({
       variables: {
-        input: {
-          name: toCreate.name,
-          url: toCreate.url,
-        },
+        input,
       },
     });
 
@@ -81,6 +103,7 @@ interface IUseCreateNewObjectProps<T> {
   setScrapeResult: (scrapeResult: ScrapeResult<T[]>) => void;
   newObjects: T[];
   setNewObjects: (newObject: T[]) => void;
+  endpoint?: string;
 }
 
 export function useCreateScrapedPerformer(
@@ -91,7 +114,7 @@ export function useCreateScrapedPerformer(
   const { scrapeResult, setScrapeResult, newObjects, setNewObjects } = props;
 
   async function createNewPerformer(toCreate: GQL.ScrapedPerformer) {
-    const input = scrapedPerformerToCreateInput(toCreate);
+    const input = scrapedPerformerToCreateInput(toCreate, props.endpoint);
 
     const result = await createPerformer({
       variables: { input },
@@ -168,7 +191,18 @@ export function useCreateScrapedTag(
   const { scrapeResult, setScrapeResult, newObjects, setNewObjects } = props;
 
   async function createNewTag(toCreate: GQL.ScrapedTag) {
-    const input: GQL.TagCreateInput = { name: toCreate.name ?? "" };
+    const input: GQL.TagCreateInput = {
+      name: toCreate.name ?? "",
+    };
+
+    if (props.endpoint && toCreate.remote_site_id) {
+      input.stash_ids = [
+        {
+          endpoint: props.endpoint,
+          stash_id: toCreate.remote_site_id,
+        },
+      ];
+    }
 
     const result = await createTag({
       variables: { input },
diff --git a/ui/v2.5/src/components/Shared/ScrapeDialog/scrapedTags.tsx b/ui/v2.5/src/components/Shared/ScrapeDialog/scrapedTags.tsx
index 5527138d1..ca3658391 100644
--- a/ui/v2.5/src/components/Shared/ScrapeDialog/scrapedTags.tsx
+++ b/ui/v2.5/src/components/Shared/ScrapeDialog/scrapedTags.tsx
@@ -9,7 +9,8 @@ import { ScrapedTagsRow } from "./ScrapedObjectsRow";
 
 export function useScrapedTags(
   existingTags: Tag[],
-  scrapedTags?: GQL.Maybe<GQL.ScrapedTag[]>
+  scrapedTags?: GQL.Maybe<GQL.ScrapedTag[]>,
+  endpoint?: string
 ) {
   const intl = useIntl();
   const [tags, setTags] = useState<ObjectListScrapeResult<GQL.ScrapedTag>>(
@@ -33,6 +34,7 @@ export function useScrapedTags(
     setScrapeResult: setTags,
     newObjects: newTags,
     setNewObjects: setNewTags,
+    endpoint,
   });
 
   const scrapedTagsRow = (
diff --git a/ui/v2.5/src/core/performers.ts b/ui/v2.5/src/core/performers.ts
index 455ada9f9..9712c9824 100644
--- a/ui/v2.5/src/core/performers.ts
+++ b/ui/v2.5/src/core/performers.ts
@@ -84,9 +84,14 @@ export function sortPerformers<T extends IPerformerFragment>(performers: T[]) {
 }
 
 export const scrapedPerformerToCreateInput = (
-  toCreate: GQL.ScrapedPerformer
+  toCreate: GQL.ScrapedPerformer,
+  endpoint?: string
 ) => {
-  const aliases = toCreate.aliases?.split(",").map((a) => a.trim());
+  const aliases =
+    toCreate.aliases
+      ?.split(",")
+      .map((a) => a.trim())
+      .filter((a) => a) || [];
 
   const input: GQL.PerformerCreateInput = {
     name: toCreate.name ?? "",
@@ -118,5 +123,15 @@ export const scrapedPerformerToCreateInput = (
       : undefined,
     circumcised: stringToCircumcised(toCreate.circumcised),
   };
+
+  if (endpoint && toCreate.remote_site_id) {
+    input.stash_ids = [
+      {
+        endpoint,
+        stash_id: toCreate.remote_site_id,
+      },
+    ];
+  }
+
   return input;
 };

From bc91ca0a2574e155c209743bebaf0bc99e416daa Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Fri, 14 Nov 2025 12:59:29 +1100
Subject: [PATCH 133/405] Fix inconsistency when scraping performer with
 multiple stash ids from same endpoint (#6260)

---
 .../PerformerDetails/PerformerScrapeDialog.tsx   | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerScrapeDialog.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerScrapeDialog.tsx
index eb5f26a83..0398f1eec 100644
--- a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerScrapeDialog.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerScrapeDialog.tsx
@@ -146,6 +146,22 @@ export const PerformerScrapeDialog: React.FC<IPerformerScrapeDialogProps> = (
       return;
     }
 
+    // #6257 - it is possible (though unsupported) to have multiple stash IDs for the same
+    // endpoint; in that case, we should prefer the one matching the scraped remote site ID
+    // if it exists
+    const stashIDs = (props.performer.stash_ids ?? []).filter(
+      (s) => s.endpoint === endpoint
+    );
+    if (stashIDs.length > 1 && props.scraped.remote_site_id) {
+      const matchingID = stashIDs.find(
+        (s) => s.stash_id === props.scraped.remote_site_id
+      );
+      if (matchingID) {
+        return matchingID.stash_id;
+      }
+    }
+
+    // otherwise, return the first stash ID for the endpoint
     return props.performer.stash_ids?.find((s) => s.endpoint === endpoint)
       ?.stash_id;
   }

From 892858a80351f7fbe32c94e4ba87b1e172cbbf11 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Fri, 14 Nov 2025 13:08:12 +1100
Subject: [PATCH 134/405] Trigger build when release branch pushed

---
 .github/workflows/build.yml         | 5 ++++-
 .github/workflows/golangci-lint.yml | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8d455a7d7..1e46ecd69 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -2,7 +2,10 @@ name: Build
 
 on:
   push:
-    branches: [ develop, master ]
+    branches: 
+      - develop
+      - master
+      - 'releases/**'
   pull_request:
   release:
     types: [ published ]
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
index cd5b7d61c..71c743ced 100644
--- a/.github/workflows/golangci-lint.yml
+++ b/.github/workflows/golangci-lint.yml
@@ -6,6 +6,7 @@ on:
     branches:
       - master
       - develop
+      - 'releases/**'
   pull_request:
 
 env:

From 15db2da3618625a8e988c0b457146fb822f9cb77 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Fri, 14 Nov 2025 13:41:29 +1100
Subject: [PATCH 135/405] Add v0.30.0 changelog

---
 .../src/components/Changelog/Changelog.tsx    | 15 ++++++++----
 ui/v2.5/src/docs/en/Changelog/v0300.md        | 23 +++++++++++++++++++
 2 files changed, 34 insertions(+), 4 deletions(-)
 create mode 100644 ui/v2.5/src/docs/en/Changelog/v0300.md

diff --git a/ui/v2.5/src/components/Changelog/Changelog.tsx b/ui/v2.5/src/components/Changelog/Changelog.tsx
index 5b2732977..97175e1c2 100644
--- a/ui/v2.5/src/components/Changelog/Changelog.tsx
+++ b/ui/v2.5/src/components/Changelog/Changelog.tsx
@@ -34,8 +34,10 @@ import V0260 from "src/docs/en/Changelog/v0260.md";
 import V0270 from "src/docs/en/Changelog/v0270.md";
 import V0280 from "src/docs/en/Changelog/v0280.md";
 import V0290 from "src/docs/en/Changelog/v0290.md";
+import V0300 from "src/docs/en/Changelog/v0300.md";
+
+import V0290ReleaseNotes from "src/docs/en/ReleaseNotes/v0290.md";
 
-import V020ReleaseNotes from "src/docs/en/ReleaseNotes/v0290.md";
 import { MarkdownPage } from "../Shared/MarkdownPage";
 import { FormattedMessage } from "react-intl";
 
@@ -73,9 +75,9 @@ const Changelog: React.FC = () => {
   // after new release:
   // add entry to releases, using the current* fields
   // then update the current fields.
-  const currentVersion = stashVersion || "v0.29.0";
+  const currentVersion = stashVersion || "v0.30.0";
   const currentDate = buildDate;
-  const currentPage = V0290;
+  const currentPage = V0300;
 
   const releases: IStashRelease[] = [
     {
@@ -83,7 +85,12 @@ const Changelog: React.FC = () => {
       date: currentDate,
       page: currentPage,
       defaultOpen: true,
-      releaseNotes: V020ReleaseNotes,
+    },
+    {
+      version: "v0.29.3",
+      date: "2025-11-06",
+      page: V0290,
+      releaseNotes: V0290ReleaseNotes,
     },
     {
       version: "v0.28.1",
diff --git a/ui/v2.5/src/docs/en/Changelog/v0300.md b/ui/v2.5/src/docs/en/Changelog/v0300.md
new file mode 100644
index 000000000..aaf07c234
--- /dev/null
+++ b/ui/v2.5/src/docs/en/Changelog/v0300.md
@@ -0,0 +1,23 @@
+### ✨ New Features
+* Added stash-ids to Tags. ([#6255](https://github.com/stashapp/stash/pull/6255))
+* Added support for multiple Studio URLs. ([#6223](https://github.com/stashapp/stash/pull/6223))
+* Added option to add markers to front page. ([#6065](https://github.com/stashapp/stash/pull/6065))
+* Added duration filter to scene list sidebar. ([#6264](https://github.com/stashapp/stash/pull/6264))
+* Added experimental support for JPEG XL images. ([#6184](https://github.com/stashapp/stash/pull/6184))
+
+### 🎨 Improvements
+* Selected stash-box is now remembered in the scene tagger view. ([#6192](https://github.com/stashapp/stash/pull/6192))
+* Added hardware encoding support for Rockchip RKMPP devices. ([#6182](https://github.com/stashapp/stash/pull/6182))
+* Added `inputURL` and `inputHostname` fields to scraper specs. ([#6250](https://github.com/stashapp/stash/pull/6250))
+* Added extra studio fields to scraper specs. ([#6249](https://github.com/stashapp/stash/pull/6249))
+* Added o-count to group cards. ([#6122](https://github.com/stashapp/stash/pull/6122))
+* Added options to filter and sort groups by o-count. ([#6122](https://github.com/stashapp/stash/pull/6122))
+* Added o-count to performer details page. ([#6171](https://github.com/stashapp/stash/pull/6171))
+* Added option to sort by total scene direction for performers, studios and tags. ([#6172](https://github.com/stashapp/stash/pull/6172))
+* Added option to sort scenes by Performer age. ([#6009](https://github.com/stashapp/stash/pull/6009))
+* Added option to sort scenes by Studio. ([#6155](https://github.com/stashapp/stash/pull/6155))
+* Added option to show external links on Performer cards. ([#6153](https://github.com/stashapp/stash/pull/6153))
+* Added keyboard shortcuts to generate scene screenshot at current time (`c c`) and to regenerate default screenshot (`c d`). ([#5984](https://github.com/stashapp/stash/pull/5984))
+
+### 🐛 Bug fixes
+* stash-ids are now set when creating new objects from the scrape dialog. ([#6269](https://github.com/stashapp/stash/pull/6269))
\ No newline at end of file

From 1ec8d4afe5162339ecf95d55d7f7ca1cb6b34c1d Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Mon, 17 Nov 2025 10:12:50 +1100
Subject: [PATCH 136/405] Add edit studios dialog (#6238)

---
 ui/v2.5/graphql/mutations/studio.graphql      |   6 +
 .../components/Shared/BulkUpdateTextInput.tsx |   2 +
 .../components/Studios/EditStudiosDialog.tsx  | 245 ++++++++++++++++++
 ui/v2.5/src/components/Studios/StudioList.tsx |   9 +
 ui/v2.5/src/core/StashService.ts              |  10 +
 5 files changed, 272 insertions(+)
 create mode 100644 ui/v2.5/src/components/Studios/EditStudiosDialog.tsx

diff --git a/ui/v2.5/graphql/mutations/studio.graphql b/ui/v2.5/graphql/mutations/studio.graphql
index 6d1944dc1..679d75f6d 100644
--- a/ui/v2.5/graphql/mutations/studio.graphql
+++ b/ui/v2.5/graphql/mutations/studio.graphql
@@ -10,6 +10,12 @@ mutation StudioUpdate($input: StudioUpdateInput!) {
   }
 }
 
+mutation BulkStudioUpdate($input: BulkStudioUpdateInput!) {
+  bulkStudioUpdate(input: $input) {
+    ...StudioData
+  }
+}
+
 mutation StudioDestroy($id: ID!) {
   studioDestroy(input: { id: $id })
 }
diff --git a/ui/v2.5/src/components/Shared/BulkUpdateTextInput.tsx b/ui/v2.5/src/components/Shared/BulkUpdateTextInput.tsx
index 542ab5b3b..cf78798e1 100644
--- a/ui/v2.5/src/components/Shared/BulkUpdateTextInput.tsx
+++ b/ui/v2.5/src/components/Shared/BulkUpdateTextInput.tsx
@@ -7,6 +7,7 @@ import { Icon } from "./Icon";
 interface IBulkUpdateTextInputProps extends FormControlProps {
   valueChanged: (value: string | undefined) => void;
   unsetDisabled?: boolean;
+  as?: React.ElementType;
 }
 
 export const BulkUpdateTextInput: React.FC<IBulkUpdateTextInputProps> = ({
@@ -24,6 +25,7 @@ export const BulkUpdateTextInput: React.FC<IBulkUpdateTextInputProps> = ({
         {...props}
         className="input-control"
         type="text"
+        as={props.as}
         value={props.value ?? ""}
         placeholder={
           props.value === undefined
diff --git a/ui/v2.5/src/components/Studios/EditStudiosDialog.tsx b/ui/v2.5/src/components/Studios/EditStudiosDialog.tsx
new file mode 100644
index 000000000..293a8dfb3
--- /dev/null
+++ b/ui/v2.5/src/components/Studios/EditStudiosDialog.tsx
@@ -0,0 +1,245 @@
+import React, { useEffect, useMemo, useState } from "react";
+import { Col, Form, Row } from "react-bootstrap";
+import { FormattedMessage, useIntl } from "react-intl";
+import { useBulkStudioUpdate } from "src/core/StashService";
+import * as GQL from "src/core/generated-graphql";
+import { ModalComponent } from "../Shared/Modal";
+import { useToast } from "src/hooks/Toast";
+import { MultiSet } from "../Shared/MultiSet";
+import { RatingSystem } from "../Shared/Rating/RatingSystem";
+import {
+  getAggregateInputValue,
+  getAggregateState,
+  getAggregateStateObject,
+} from "src/utils/bulkUpdate";
+import { IndeterminateCheckbox } from "../Shared/IndeterminateCheckbox";
+import { BulkUpdateTextInput } from "../Shared/BulkUpdateTextInput";
+import { faPencilAlt } from "@fortawesome/free-solid-svg-icons";
+import * as FormUtils from "src/utils/form";
+import { StudioSelect } from "../Shared/Select";
+
+interface IListOperationProps {
+  selected: GQL.SlimStudioDataFragment[];
+  onClose: (applied: boolean) => void;
+}
+
+const studioFields = ["favorite", "rating100", "details", "ignore_auto_tag"];
+
+export const EditStudiosDialog: React.FC<IListOperationProps> = (
+  props: IListOperationProps
+) => {
+  const intl = useIntl();
+  const Toast = useToast();
+
+  const [updateInput, setUpdateInput] = useState<GQL.BulkStudioUpdateInput>({
+    ids: props.selected.map((studio) => {
+      return studio.id;
+    }),
+  });
+
+  const [tagIds, setTagIds] = useState<GQL.BulkUpdateIds>({
+    mode: GQL.BulkUpdateIdMode.Add,
+  });
+
+  const [updateStudios] = useBulkStudioUpdate();
+
+  // Network state
+  const [isUpdating, setIsUpdating] = useState(false);
+
+  const aggregateState = useMemo(() => {
+    const updateState: Partial<GQL.BulkStudioUpdateInput> = {};
+    const state = props.selected;
+    let updateTagIds: string[] = [];
+    let first = true;
+
+    state.forEach((studio: GQL.SlimStudioDataFragment) => {
+      getAggregateStateObject(updateState, studio, studioFields, first);
+
+      // studio data fragment doesn't have parent_id, so handle separately
+      updateState.parent_id = getAggregateState(
+        updateState.parent_id,
+        studio.parent_studio?.id,
+        first
+      );
+
+      const studioTagIDs = (studio.tags ?? []).map((p) => p.id).sort();
+
+      updateTagIds = getAggregateState(updateTagIds, studioTagIDs, first) ?? [];
+
+      first = false;
+    });
+
+    return { state: updateState, tagIds: updateTagIds };
+  }, [props.selected]);
+
+  // update initial state from aggregate
+  useEffect(() => {
+    setUpdateInput((current) => ({ ...current, ...aggregateState.state }));
+  }, [aggregateState]);
+
+  function setUpdateField(input: Partial<GQL.BulkStudioUpdateInput>) {
+    setUpdateInput((current) => ({ ...current, ...input }));
+  }
+
+  function getStudioInput(): GQL.BulkStudioUpdateInput {
+    const studioInput: GQL.BulkStudioUpdateInput = {
+      ...updateInput,
+      tag_ids: tagIds,
+    };
+
+    // we don't have unset functionality for the rating star control
+    // so need to determine if we are setting a rating or not
+    studioInput.rating100 = getAggregateInputValue(
+      updateInput.rating100,
+      aggregateState.state.rating100
+    );
+
+    return studioInput;
+  }
+
+  async function onSave() {
+    setIsUpdating(true);
+    try {
+      await updateStudios({
+        variables: {
+          input: getStudioInput(),
+        },
+      });
+      Toast.success(
+        intl.formatMessage(
+          { id: "toast.updated_entity" },
+          {
+            entity: intl.formatMessage({ id: "studios" }).toLocaleLowerCase(),
+          }
+        )
+      );
+      props.onClose(true);
+    } catch (e) {
+      Toast.error(e);
+    }
+    setIsUpdating(false);
+  }
+
+  function renderTextField(
+    name: string,
+    value: string | undefined | null,
+    setter: (newValue: string | undefined) => void,
+    area: boolean = false
+  ) {
+    return (
+      <Form.Group controlId={name}>
+        <Form.Label>
+          <FormattedMessage id={name} />
+        </Form.Label>
+        <BulkUpdateTextInput
+          value={value === null ? "" : value ?? undefined}
+          valueChanged={(newValue) => setter(newValue)}
+          unsetDisabled={props.selected.length < 2}
+          as={area ? "textarea" : undefined}
+        />
+      </Form.Group>
+    );
+  }
+
+  function render() {
+    return (
+      <ModalComponent
+        dialogClassName="edit-studios-dialog"
+        show
+        icon={faPencilAlt}
+        header={intl.formatMessage(
+          { id: "actions.edit_entity" },
+          { entityType: intl.formatMessage({ id: "studios" }) }
+        )}
+        accept={{
+          onClick: onSave,
+          text: intl.formatMessage({ id: "actions.apply" }),
+        }}
+        cancel={{
+          onClick: () => props.onClose(false),
+          text: intl.formatMessage({ id: "actions.cancel" }),
+          variant: "secondary",
+        }}
+        isRunning={isUpdating}
+      >
+        <Form.Group controlId="parent-studio" as={Row}>
+          {FormUtils.renderLabel({
+            title: intl.formatMessage({ id: "parent_studio" }),
+          })}
+          <Col xs={9}>
+            <StudioSelect
+              onSelect={(items) =>
+                setUpdateField({
+                  parent_id: items.length > 0 ? items[0]?.id : undefined,
+                })
+              }
+              ids={updateInput.parent_id ? [updateInput.parent_id] : []}
+              isDisabled={isUpdating}
+              menuPortalTarget={document.body}
+            />
+          </Col>
+        </Form.Group>
+        <Form.Group controlId="rating" as={Row}>
+          {FormUtils.renderLabel({
+            title: intl.formatMessage({ id: "rating" }),
+          })}
+          <Col xs={9}>
+            <RatingSystem
+              value={updateInput.rating100}
+              onSetRating={(value) =>
+                setUpdateField({ rating100: value ?? undefined })
+              }
+              disabled={isUpdating}
+            />
+          </Col>
+        </Form.Group>
+        <Form>
+          <Form.Group controlId="favorite">
+            <IndeterminateCheckbox
+              setChecked={(checked) => setUpdateField({ favorite: checked })}
+              checked={updateInput.favorite ?? undefined}
+              label={intl.formatMessage({ id: "favourite" })}
+            />
+          </Form.Group>
+
+          <Form.Group controlId="tags">
+            <Form.Label>
+              <FormattedMessage id="tags" />
+            </Form.Label>
+            <MultiSet
+              type="tags"
+              disabled={isUpdating}
+              onUpdate={(itemIDs) => setTagIds((v) => ({ ...v, ids: itemIDs }))}
+              onSetMode={(newMode) =>
+                setTagIds((v) => ({ ...v, mode: newMode }))
+              }
+              existingIds={aggregateState.tagIds ?? []}
+              ids={tagIds.ids ?? []}
+              mode={tagIds.mode}
+              menuPortalTarget={document.body}
+            />
+          </Form.Group>
+
+          {renderTextField(
+            "details",
+            updateInput.details,
+            (newValue) => setUpdateField({ details: newValue }),
+            true
+          )}
+
+          <Form.Group controlId="ignore-auto-tags">
+            <IndeterminateCheckbox
+              label={intl.formatMessage({ id: "ignore_auto_tag" })}
+              setChecked={(checked) =>
+                setUpdateField({ ignore_auto_tag: checked })
+              }
+              checked={updateInput.ignore_auto_tag ?? undefined}
+            />
+          </Form.Group>
+        </Form>
+      </ModalComponent>
+    );
+  }
+
+  return render();
+};
diff --git a/ui/v2.5/src/components/Studios/StudioList.tsx b/ui/v2.5/src/components/Studios/StudioList.tsx
index dd67f560b..423cd1587 100644
--- a/ui/v2.5/src/components/Studios/StudioList.tsx
+++ b/ui/v2.5/src/components/Studios/StudioList.tsx
@@ -17,6 +17,7 @@ import { DeleteEntityDialog } from "../Shared/DeleteEntityDialog";
 import { StudioTagger } from "../Tagger/studios/StudioTagger";
 import { StudioCardGrid } from "./StudioCardGrid";
 import { View } from "../List/views";
+import { EditStudiosDialog } from "./EditStudiosDialog";
 
 function getItems(result: GQL.FindStudiosQueryResult) {
   return result?.data?.findStudios?.studios ?? [];
@@ -161,6 +162,13 @@ export const StudioList: React.FC<IStudioList> = ({
     );
   }
 
+  function renderEditDialog(
+    selectedStudios: GQL.SlimStudioDataFragment[],
+    onClose: (applied: boolean) => void
+  ) {
+    return <EditStudiosDialog selected={selectedStudios} onClose={onClose} />;
+  }
+
   function renderDeleteDialog(
     selectedStudios: GQL.SlimStudioDataFragment[],
     onClose: (confirmed: boolean) => void
@@ -193,6 +201,7 @@ export const StudioList: React.FC<IStudioList> = ({
         otherOperations={otherOperations}
         addKeybinds={addKeybinds}
         renderContent={renderContent}
+        renderEditDialog={renderEditDialog}
         renderDeleteDialog={renderDeleteDialog}
       />
     </ItemListContext>
diff --git a/ui/v2.5/src/core/StashService.ts b/ui/v2.5/src/core/StashService.ts
index 51cdd3ca5..be5fb4dbe 100644
--- a/ui/v2.5/src/core/StashService.ts
+++ b/ui/v2.5/src/core/StashService.ts
@@ -1907,6 +1907,16 @@ export const useStudioUpdate = () =>
     },
   });
 
+export const useBulkStudioUpdate = () =>
+  GQL.useBulkStudioUpdateMutation({
+    update(cache, result) {
+      if (!result.data?.bulkStudioUpdate) return;
+
+      evictTypeFields(cache, studioMutationImpactedTypeFields);
+      evictQueries(cache, studioMutationImpactedQueries);
+    },
+  });
+
 export const useStudioDestroy = (input: GQL.StudioDestroyInput) =>
   GQL.useStudioDestroyMutation({
     variables: input,

From 9ef216905575badf6e166825d633dec6c14172f6 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Mon, 17 Nov 2025 10:13:34 +1100
Subject: [PATCH 137/405] Add edit scene markers dialog (#6239)

---
 .../graphql/mutations/scene-marker.graphql    |   6 +
 .../Scenes/EditSceneMarkersDialog.tsx         | 200 ++++++++++++++++++
 .../src/components/Scenes/SceneMarkerList.tsx |  11 +
 ui/v2.5/src/core/StashService.ts              |  10 +
 4 files changed, 227 insertions(+)
 create mode 100644 ui/v2.5/src/components/Scenes/EditSceneMarkersDialog.tsx

diff --git a/ui/v2.5/graphql/mutations/scene-marker.graphql b/ui/v2.5/graphql/mutations/scene-marker.graphql
index 766e318fc..a2162f799 100644
--- a/ui/v2.5/graphql/mutations/scene-marker.graphql
+++ b/ui/v2.5/graphql/mutations/scene-marker.graphql
@@ -44,6 +44,12 @@ mutation SceneMarkerUpdate(
   }
 }
 
+mutation BulkSceneMarkerUpdate($input: BulkSceneMarkerUpdateInput!) {
+  bulkSceneMarkerUpdate(input: $input) {
+    ...SceneMarkerData
+  }
+}
+
 mutation SceneMarkerDestroy($id: ID!) {
   sceneMarkerDestroy(id: $id)
 }
diff --git a/ui/v2.5/src/components/Scenes/EditSceneMarkersDialog.tsx b/ui/v2.5/src/components/Scenes/EditSceneMarkersDialog.tsx
new file mode 100644
index 000000000..bb1d8067b
--- /dev/null
+++ b/ui/v2.5/src/components/Scenes/EditSceneMarkersDialog.tsx
@@ -0,0 +1,200 @@
+import React, { useEffect, useMemo, useState } from "react";
+import { Form } from "react-bootstrap";
+import { FormattedMessage, useIntl } from "react-intl";
+import { useBulkSceneMarkerUpdate } from "src/core/StashService";
+import * as GQL from "src/core/generated-graphql";
+import { ModalComponent } from "../Shared/Modal";
+import { useToast } from "src/hooks/Toast";
+import { MultiSet } from "../Shared/MultiSet";
+import {
+  getAggregateState,
+  getAggregateStateObject,
+} from "src/utils/bulkUpdate";
+import { BulkUpdateTextInput } from "../Shared/BulkUpdateTextInput";
+import { faPencilAlt } from "@fortawesome/free-solid-svg-icons";
+import { TagSelect } from "../Shared/Select";
+
+interface IListOperationProps {
+  selected: GQL.SceneMarkerDataFragment[];
+  onClose: (applied: boolean) => void;
+}
+
+const scenemarkerFields = ["title"];
+
+export const EditSceneMarkersDialog: React.FC<IListOperationProps> = (
+  props: IListOperationProps
+) => {
+  const intl = useIntl();
+  const Toast = useToast();
+
+  const [updateInput, setUpdateInput] =
+    useState<GQL.BulkSceneMarkerUpdateInput>({
+      ids: props.selected.map((scenemarker) => {
+        return scenemarker.id;
+      }),
+    });
+
+  const [tagIds, setTagIds] = useState<GQL.BulkUpdateIds>({
+    mode: GQL.BulkUpdateIdMode.Add,
+  });
+
+  const [updateSceneMarkers] = useBulkSceneMarkerUpdate();
+
+  // Network state
+  const [isUpdating, setIsUpdating] = useState(false);
+
+  const aggregateState = useMemo(() => {
+    const updateState: Partial<GQL.BulkSceneMarkerUpdateInput> = {};
+    const state = props.selected;
+    let updateTagIds: string[] = [];
+    let first = true;
+
+    state.forEach((scenemarker: GQL.SceneMarkerDataFragment) => {
+      getAggregateStateObject(
+        updateState,
+        scenemarker,
+        scenemarkerFields,
+        first
+      );
+
+      // sceneMarker data fragment doesn't have primary_tag_id, so handle separately
+      updateState.primary_tag_id = getAggregateState(
+        updateState.primary_tag_id,
+        scenemarker.primary_tag.id,
+        first
+      );
+
+      const thisTagIDs = (scenemarker.tags ?? []).map((p) => p.id).sort();
+
+      updateTagIds = getAggregateState(updateTagIds, thisTagIDs, first) ?? [];
+
+      first = false;
+    });
+
+    return { state: updateState, tagIds: updateTagIds };
+  }, [props.selected]);
+
+  // update initial state from aggregate
+  useEffect(() => {
+    setUpdateInput((current) => ({ ...current, ...aggregateState.state }));
+  }, [aggregateState]);
+
+  function setUpdateField(input: Partial<GQL.BulkSceneMarkerUpdateInput>) {
+    setUpdateInput((current) => ({ ...current, ...input }));
+  }
+
+  function getSceneMarkerInput(): GQL.BulkSceneMarkerUpdateInput {
+    const sceneMarkerInput: GQL.BulkSceneMarkerUpdateInput = {
+      ...updateInput,
+      tag_ids: tagIds,
+    };
+
+    return sceneMarkerInput;
+  }
+
+  async function onSave() {
+    setIsUpdating(true);
+    try {
+      await updateSceneMarkers({
+        variables: {
+          input: getSceneMarkerInput(),
+        },
+      });
+      Toast.success(
+        intl.formatMessage(
+          { id: "toast.updated_entity" },
+          {
+            entity: intl.formatMessage({ id: "markers" }).toLocaleLowerCase(),
+          }
+        )
+      );
+      props.onClose(true);
+    } catch (e) {
+      Toast.error(e);
+    }
+    setIsUpdating(false);
+  }
+
+  function renderTextField(
+    name: string,
+    value: string | undefined | null,
+    setter: (newValue: string | undefined) => void,
+    area: boolean = false
+  ) {
+    return (
+      <Form.Group controlId={name}>
+        <Form.Label>
+          <FormattedMessage id={name} />
+        </Form.Label>
+        <BulkUpdateTextInput
+          value={value === null ? "" : value ?? undefined}
+          valueChanged={(newValue) => setter(newValue)}
+          unsetDisabled={props.selected.length < 2}
+          as={area ? "textarea" : undefined}
+        />
+      </Form.Group>
+    );
+  }
+
+  function render() {
+    return (
+      <ModalComponent
+        dialogClassName="edit-scenemarkers-dialog"
+        show
+        icon={faPencilAlt}
+        header={intl.formatMessage(
+          { id: "actions.edit_entity" },
+          { entityType: intl.formatMessage({ id: "markers" }) }
+        )}
+        accept={{
+          onClick: onSave,
+          text: intl.formatMessage({ id: "actions.apply" }),
+        }}
+        cancel={{
+          onClick: () => props.onClose(false),
+          text: intl.formatMessage({ id: "actions.cancel" }),
+          variant: "secondary",
+        }}
+        isRunning={isUpdating}
+      >
+        <Form>
+          {renderTextField("title", updateInput.title, (newValue) =>
+            setUpdateField({ title: newValue })
+          )}
+
+          <Form.Group controlId="primary-tag">
+            <Form.Label>
+              <FormattedMessage id="primary_tag" />
+            </Form.Label>
+            <TagSelect
+              onSelect={(t) => setUpdateField({ primary_tag_id: t[0]?.id })}
+              ids={
+                updateInput.primary_tag_id ? [updateInput.primary_tag_id] : []
+              }
+            />
+          </Form.Group>
+
+          <Form.Group controlId="tags">
+            <Form.Label>
+              <FormattedMessage id="tags" />
+            </Form.Label>
+            <MultiSet
+              type="tags"
+              disabled={isUpdating}
+              onUpdate={(itemIDs) => setTagIds((v) => ({ ...v, ids: itemIDs }))}
+              onSetMode={(newMode) =>
+                setTagIds((v) => ({ ...v, mode: newMode }))
+              }
+              existingIds={aggregateState.tagIds ?? []}
+              ids={tagIds.ids ?? []}
+              mode={tagIds.mode}
+              menuPortalTarget={document.body}
+            />
+          </Form.Group>
+        </Form>
+      </ModalComponent>
+    );
+  }
+
+  return render();
+};
diff --git a/ui/v2.5/src/components/Scenes/SceneMarkerList.tsx b/ui/v2.5/src/components/Scenes/SceneMarkerList.tsx
index 94eb6e133..dbe6e2e23 100644
--- a/ui/v2.5/src/components/Scenes/SceneMarkerList.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneMarkerList.tsx
@@ -16,6 +16,7 @@ import { MarkerWallPanel } from "./SceneMarkerWallPanel";
 import { View } from "../List/views";
 import { SceneMarkerCardsGrid } from "./SceneMarkerCardsGrid";
 import { DeleteSceneMarkersDialog } from "./DeleteSceneMarkersDialog";
+import { EditSceneMarkersDialog } from "./EditSceneMarkersDialog";
 
 function getItems(result: GQL.FindSceneMarkersQueryResult) {
   return result?.data?.findSceneMarkers?.scene_markers ?? [];
@@ -114,6 +115,15 @@ export const SceneMarkerList: React.FC<ISceneMarkerList> = ({
     }
   }
 
+  function renderEditDialog(
+    selectedMarkers: GQL.SceneMarkerDataFragment[],
+    onClose: (applied: boolean) => void
+  ) {
+    return (
+      <EditSceneMarkersDialog selected={selectedMarkers} onClose={onClose} />
+    );
+  }
+
   function renderDeleteDialog(
     selectedSceneMarkers: GQL.SceneMarkerDataFragment[],
     onClose: (confirmed: boolean) => void
@@ -143,6 +153,7 @@ export const SceneMarkerList: React.FC<ISceneMarkerList> = ({
         otherOperations={otherOperations}
         addKeybinds={addKeybinds}
         renderContent={renderContent}
+        renderEditDialog={renderEditDialog}
         renderDeleteDialog={renderDeleteDialog}
       />
     </ItemListContext>
diff --git a/ui/v2.5/src/core/StashService.ts b/ui/v2.5/src/core/StashService.ts
index be5fb4dbe..100f25199 100644
--- a/ui/v2.5/src/core/StashService.ts
+++ b/ui/v2.5/src/core/StashService.ts
@@ -1486,6 +1486,16 @@ export const useSceneMarkerUpdate = () =>
     },
   });
 
+export const useBulkSceneMarkerUpdate = () =>
+  GQL.useBulkSceneMarkerUpdateMutation({
+    update(cache, result) {
+      if (!result.data?.bulkSceneMarkerUpdate) return;
+
+      evictTypeFields(cache, sceneMarkerMutationImpactedTypeFields);
+      evictQueries(cache, sceneMarkerMutationImpactedQueries);
+    },
+  });
+
 export const useSceneMarkerDestroy = () =>
   GQL.useSceneMarkerDestroyMutation({
     update(cache, result, { variables }) {

From 0a05a0b45b513754a9d75ec48801769642f06468 Mon Sep 17 00:00:00 2001
From: DogmaDragon <103123951+DogmaDragon@users.noreply.github.com>
Date: Mon, 17 Nov 2025 01:29:09 +0200
Subject: [PATCH 138/405] i18n: Change 'Has Chapters' to 'Chapters' (#6279)

---
 ui/v2.5/src/locales/en-GB.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/v2.5/src/locales/en-GB.json b/ui/v2.5/src/locales/en-GB.json
index f0fe87f61..a780269f1 100644
--- a/ui/v2.5/src/locales/en-GB.json
+++ b/ui/v2.5/src/locales/en-GB.json
@@ -1134,7 +1134,7 @@
     "syncing": "Syncing with server",
     "uploading": "Uploading script"
   },
-  "hasChapters": "Has Chapters",
+  "hasChapters": "Chapters",
   "hasMarkers": "Has Markers",
   "height": "Height",
   "height_cm": "Height (cm)",

From a590caa3d3016e8ac3960ec9f1e5dfefd4720ee4 Mon Sep 17 00:00:00 2001
From: Gykes <24581046+Gykes@users.noreply.github.com>
Date: Sun, 16 Nov 2025 16:20:38 -0800
Subject: [PATCH 139/405] FR: Performer Age Slider (#6267)

- Add SidebarAgeFilter component with age presets (18-25, 25-35, 35-45, 45-60, 60+)
---------
Co-authored-by: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
---
 .../List/Filters/SidebarAgeFilter.tsx         | 310 ++++++++++++++++++
 ui/v2.5/src/components/List/styles.scss       |   6 +-
 ui/v2.5/src/components/Scenes/SceneList.tsx   |  13 +-
 ui/v2.5/src/components/Shared/styles.scss     |   2 +-
 ui/v2.5/src/models/list-filter/scenes.ts      |   5 +-
 5 files changed, 331 insertions(+), 5 deletions(-)
 create mode 100644 ui/v2.5/src/components/List/Filters/SidebarAgeFilter.tsx

diff --git a/ui/v2.5/src/components/List/Filters/SidebarAgeFilter.tsx b/ui/v2.5/src/components/List/Filters/SidebarAgeFilter.tsx
new file mode 100644
index 000000000..3a6449ab6
--- /dev/null
+++ b/ui/v2.5/src/components/List/Filters/SidebarAgeFilter.tsx
@@ -0,0 +1,310 @@
+import React, { useEffect, useMemo, useState } from "react";
+import { CriterionModifier } from "../../../core/generated-graphql";
+import { CriterionOption } from "../../../models/list-filter/criteria/criterion";
+import { NumberCriterion } from "src/models/list-filter/criteria/criterion";
+import { ListFilterModel } from "src/models/list-filter/filter";
+import { Option, SidebarListFilter } from "./SidebarListFilter";
+import { DoubleRangeInput } from "src/components/Shared/DoubleRangeInput";
+import { useDebounce } from "src/hooks/debounce";
+
+interface ISidebarFilter {
+  title?: React.ReactNode;
+  option: CriterionOption;
+  filter: ListFilterModel;
+  setFilter: (f: ListFilterModel) => void;
+  sectionID?: string;
+}
+
+// Age presets
+const AGE_PRESETS = [
+  { id: "18-25", label: "18-25", min: 18, max: 25 },
+  { id: "25-35", label: "25-35", min: 25, max: 35 },
+  { id: "35-45", label: "35-45", min: 35, max: 45 },
+  { id: "45-60", label: "45-60", min: 45, max: 60 },
+  { id: "60+", label: "60+", min: 60, max: null },
+];
+
+const MAX_AGE = 60; // Maximum age for the slider
+const MAX_LABEL = "60+"; // Display label for maximum age
+
+export const SidebarAgeFilter: React.FC<ISidebarFilter> = ({
+  title,
+  option,
+  filter,
+  setFilter,
+  sectionID,
+}) => {
+  const criteria = filter.criteriaFor(option.type) as NumberCriterion[];
+  const criterion = criteria.length > 0 ? criteria[0] : null;
+
+  // Get current values from criterion
+  const currentMin = criterion?.value?.value ?? 18;
+  const currentMax = criterion?.value?.value2 ?? MAX_AGE;
+
+  const [sliderMin, setSliderMin] = useState(currentMin);
+  const [sliderMax, setSliderMax] = useState(currentMax);
+  const [minInput, setMinInput] = useState(currentMin.toString());
+  const [maxInput, setMaxInput] = useState(
+    currentMax >= MAX_AGE ? MAX_LABEL : currentMax.toString()
+  );
+
+  // Reset slider when criterion is removed externally (via filter tag X)
+  useEffect(() => {
+    if (!criterion) {
+      setSliderMin(18);
+      setSliderMax(MAX_AGE);
+      setMinInput("18");
+      setMaxInput(MAX_LABEL);
+    }
+  }, [criterion]);
+
+  // Determine which preset is selected
+  const selectedPreset = useMemo(() => {
+    if (!criterion) return null;
+
+    // Check if current values match any preset
+    for (const preset of AGE_PRESETS) {
+      if (preset.max === null) {
+        // For "60+" preset
+        if (
+          criterion.modifier === CriterionModifier.GreaterThan &&
+          criterion.value.value === preset.min
+        ) {
+          return preset.id;
+        }
+      } else {
+        // For range presets
+        if (
+          criterion.modifier === CriterionModifier.Between &&
+          criterion.value.value === preset.min &&
+          criterion.value.value2 === preset.max
+        ) {
+          return preset.id;
+        }
+      }
+    }
+
+    // Check if it's a custom range or custom GreaterThan
+    if (
+      criterion.modifier === CriterionModifier.Between ||
+      criterion.modifier === CriterionModifier.GreaterThan
+    ) {
+      return "custom";
+    }
+
+    return null;
+  }, [criterion]);
+
+  const options: Option[] = useMemo(() => {
+    return AGE_PRESETS.map((preset) => ({
+      id: preset.id,
+      label: preset.label,
+      className: "age-preset",
+    }));
+  }, []);
+
+  const selected: Option[] = useMemo(() => {
+    if (!selectedPreset) return [];
+    if (selectedPreset === "custom") return [];
+
+    const preset = AGE_PRESETS.find((p) => p.id === selectedPreset);
+    if (preset) {
+      return [
+        {
+          id: preset.id,
+          label: preset.label,
+          className: "age-preset",
+        },
+      ];
+    }
+    return [];
+  }, [selectedPreset]);
+
+  function onSelectPreset(item: Option) {
+    const preset = AGE_PRESETS.find((p) => p.id === item.id);
+    if (!preset) return;
+
+    setSliderMin(preset.min);
+    setSliderMax(preset.max ?? MAX_AGE);
+    setMinInput(preset.min.toString());
+    setMaxInput(preset.max === null ? MAX_LABEL : preset.max.toString());
+
+    const currentCriteria = filter.criteriaFor(
+      option.type
+    ) as NumberCriterion[];
+    const currentCriterion =
+      currentCriteria.length > 0 ? currentCriteria[0] : null;
+    const newCriterion = currentCriterion
+      ? currentCriterion.clone()
+      : option.makeCriterion();
+
+    if (preset.max === null) {
+      // "60+" - use GreaterThan
+      newCriterion.modifier = CriterionModifier.GreaterThan;
+      newCriterion.value.value = preset.min;
+      newCriterion.value.value2 = undefined;
+    } else {
+      // Range preset - use Between
+      newCriterion.modifier = CriterionModifier.Between;
+      newCriterion.value.value = preset.min;
+      newCriterion.value.value2 = preset.max;
+    }
+
+    setFilter(filter.replaceCriteria(option.type, [newCriterion]));
+  }
+
+  function onUnselectPreset() {
+    setSliderMin(18);
+    setSliderMax(MAX_AGE);
+    setMinInput("18");
+    setMaxInput(MAX_LABEL);
+    setFilter(filter.removeCriterion(option.type));
+  }
+
+  // Parse age input (supports formats like "25", "100+")
+  function parseAgeInput(input: string): number | null {
+    const trimmed = input.trim().toLowerCase();
+
+    if (trimmed === "max" || trimmed === MAX_LABEL.toLowerCase()) {
+      return MAX_AGE;
+    }
+
+    const age = parseInt(trimmed);
+    if (isNaN(age) || age < 18 || age > MAX_AGE) {
+      return null;
+    }
+
+    return age;
+  }
+
+  // Filter update
+  function updateFilter(min: number, max: number) {
+    // If slider is at full range (18 to max), remove the filter entirely
+    if (min === 18 && max >= MAX_AGE) {
+      setFilter(filter.removeCriterion(option.type));
+      return;
+    }
+
+    const currentCriteria = filter.criteriaFor(
+      option.type
+    ) as NumberCriterion[];
+    const currentCriterion =
+      currentCriteria.length > 0 ? currentCriteria[0] : null;
+    const newCriterion = currentCriterion
+      ? currentCriterion.clone()
+      : option.makeCriterion();
+
+    // If max is at MAX_AGE (but min > 18), use GreaterThan
+    if (max >= MAX_AGE) {
+      newCriterion.modifier = CriterionModifier.GreaterThan;
+      newCriterion.value.value = min;
+      newCriterion.value.value2 = undefined;
+    } else {
+      newCriterion.modifier = CriterionModifier.Between;
+      newCriterion.value.value = min;
+      newCriterion.value.value2 = max;
+    }
+
+    setFilter(filter.replaceCriteria(option.type, [newCriterion]));
+  }
+
+  const updateFilterDebounceMS = 300;
+  const debounceUpdateFilter = useDebounce(
+    updateFilter,
+    updateFilterDebounceMS
+  );
+
+  function handleSliderChange(min: number, max: number) {
+    setSliderMin(min);
+    setSliderMax(max);
+    setMinInput(min.toString());
+    setMaxInput(max >= MAX_AGE ? MAX_LABEL : max.toString());
+
+    debounceUpdateFilter(min, max);
+  }
+
+  function handleMinInputChange(value: string) {
+    setMinInput(value);
+  }
+
+  function handleMaxInputChange(value: string) {
+    setMaxInput(value);
+  }
+
+  function handleMinInputBlur() {
+    const parsed = parseAgeInput(minInput);
+    if (parsed !== null && parsed >= 18 && parsed < sliderMax) {
+      handleSliderChange(parsed, sliderMax);
+    } else {
+      // Reset to current value if invalid
+      setMinInput(sliderMin.toString());
+    }
+  }
+
+  function handleMaxInputBlur() {
+    const parsed = parseAgeInput(maxInput);
+    if (parsed !== null && parsed > sliderMin && parsed <= MAX_AGE) {
+      handleSliderChange(sliderMin, parsed);
+    } else {
+      // Reset to current value if invalid
+      setMaxInput(sliderMax >= MAX_AGE ? MAX_LABEL : sliderMax.toString());
+    }
+  }
+
+  const customSlider = (
+    <div className="age-slider-container">
+      <DoubleRangeInput
+        min={18}
+        max={MAX_AGE}
+        value={[sliderMin, sliderMax]}
+        onChange={([min, max]) => handleSliderChange(min, max)}
+        minInput={
+          <input
+            type="text"
+            className="age-label-input"
+            value={minInput}
+            onChange={(e) => handleMinInputChange(e.target.value)}
+            onBlur={handleMinInputBlur}
+            onKeyDown={(e) => {
+              if (e.key === "Enter") {
+                e.currentTarget.blur();
+              }
+            }}
+            placeholder="18"
+          />
+        }
+        maxInput={
+          <input
+            type="text"
+            className="age-label-input"
+            value={maxInput}
+            onChange={(e) => handleMaxInputChange(e.target.value)}
+            onBlur={handleMaxInputBlur}
+            onKeyDown={(e) => {
+              if (e.key === "Enter") {
+                e.currentTarget.blur();
+              }
+            }}
+            placeholder={MAX_LABEL}
+          />
+        }
+      />
+    </div>
+  );
+
+  return (
+    <SidebarListFilter
+      title={title}
+      candidates={options}
+      onSelect={onSelectPreset}
+      onUnselect={onUnselectPreset}
+      selected={selected}
+      singleValue
+      preCandidates={selectedPreset === null ? customSlider : undefined}
+      preSelected={
+        selectedPreset === "custom" || selectedPreset ? customSlider : undefined
+      }
+      sectionID={sectionID}
+    />
+  );
+};
diff --git a/ui/v2.5/src/components/List/styles.scss b/ui/v2.5/src/components/List/styles.scss
index 1b5b4c6e1..e1397a48e 100644
--- a/ui/v2.5/src/components/List/styles.scss
+++ b/ui/v2.5/src/components/List/styles.scss
@@ -1402,12 +1402,14 @@ input[type="range"].zoom-slider {
 }
 
 // Duration slider styles
-.duration-slider {
+.duration-slider,
+.age-slider-container {
   padding: 0.5rem 0 1rem;
   width: 100%;
 }
 
-.duration-label-input {
+.duration-label-input,
+.age-label-input {
   background: transparent;
   border: 1px solid transparent;
   border-radius: 0.25rem;
diff --git a/ui/v2.5/src/components/Scenes/SceneList.tsx b/ui/v2.5/src/components/Scenes/SceneList.tsx
index 14baf7188..729cea05a 100644
--- a/ui/v2.5/src/components/Scenes/SceneList.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneList.tsx
@@ -55,7 +55,11 @@ import { RatingCriterionOption } from "src/models/list-filter/criteria/rating";
 import { SidebarRatingFilter } from "../List/Filters/RatingFilter";
 import { OrganizedCriterionOption } from "src/models/list-filter/criteria/organized";
 import { SidebarBooleanFilter } from "../List/Filters/BooleanFilter";
-import { DurationCriterionOption } from "src/models/list-filter/scenes";
+import {
+  DurationCriterionOption,
+  PerformerAgeCriterionOption,
+} from "src/models/list-filter/scenes";
+import { SidebarAgeFilter } from "../List/Filters/SidebarAgeFilter";
 import { SidebarDurationFilter } from "../List/Filters/SidebarDurationFilter";
 import {
   FilteredSidebarHeader,
@@ -337,6 +341,13 @@ const SidebarContent: React.FC<{
           setFilter={setFilter}
           sectionID="organized"
         />
+        <SidebarAgeFilter
+          title={<FormattedMessage id="performer_age" />}
+          option={PerformerAgeCriterionOption}
+          filter={filter}
+          setFilter={setFilter}
+          sectionID="performer_age"
+        />
       </ScenesFilterSidebarSections>
 
       <div className="sidebar-footer">
diff --git a/ui/v2.5/src/components/Shared/styles.scss b/ui/v2.5/src/components/Shared/styles.scss
index 8eaa3b90a..2da24774b 100644
--- a/ui/v2.5/src/components/Shared/styles.scss
+++ b/ui/v2.5/src/components/Shared/styles.scss
@@ -965,7 +965,7 @@ $sticky-header-height: calc(50px + 3.3rem);
   margin-bottom: 0.5rem;
   padding: 0 0.25rem;
 
-  .duration-label-input {
+  input[type="text"] {
     &:first-child {
       text-align: left;
     }
diff --git a/ui/v2.5/src/models/list-filter/scenes.ts b/ui/v2.5/src/models/list-filter/scenes.ts
index 09c60e483..b8dd6515a 100644
--- a/ui/v2.5/src/models/list-filter/scenes.ts
+++ b/ui/v2.5/src/models/list-filter/scenes.ts
@@ -79,6 +79,9 @@ const displayModeOptions = [
   DisplayMode.Tagger,
 ];
 
+export const PerformerAgeCriterionOption =
+  createMandatoryNumberCriterionOption("performer_age");
+
 export const DurationCriterionOption =
   createDurationCriterionOption("duration");
 
@@ -113,7 +116,7 @@ const criterionOptions = [
   PerformerTagsCriterionOption,
   PerformersCriterionOption,
   createMandatoryNumberCriterionOption("performer_count"),
-  createMandatoryNumberCriterionOption("performer_age"),
+  PerformerAgeCriterionOption,
   PerformerFavoriteCriterionOption,
   // StudioTagsCriterionOption,
   StudiosCriterionOption,

From bb56b619f594ec493dd99f1ba442c0ceb7be9a22 Mon Sep 17 00:00:00 2001
From: Gykes <24581046+Gykes@users.noreply.github.com>
Date: Sun, 16 Nov 2025 17:13:13 -0800
Subject: [PATCH 140/405] Add Markers Filter (#6270)

---
 ui/v2.5/src/components/Scenes/SceneList.tsx | 9 +++++++++
 ui/v2.5/src/locales/en-GB.json              | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/ui/v2.5/src/components/Scenes/SceneList.tsx b/ui/v2.5/src/components/Scenes/SceneList.tsx
index 729cea05a..72f10bb47 100644
--- a/ui/v2.5/src/components/Scenes/SceneList.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneList.tsx
@@ -54,6 +54,7 @@ import cx from "classnames";
 import { RatingCriterionOption } from "src/models/list-filter/criteria/rating";
 import { SidebarRatingFilter } from "../List/Filters/RatingFilter";
 import { OrganizedCriterionOption } from "src/models/list-filter/criteria/organized";
+import { HasMarkersCriterionOption } from "src/models/list-filter/criteria/has-markers";
 import { SidebarBooleanFilter } from "../List/Filters/BooleanFilter";
 import {
   DurationCriterionOption,
@@ -333,6 +334,14 @@ const SidebarContent: React.FC<{
           setFilter={setFilter}
           sectionID="duration"
         />
+        <SidebarBooleanFilter
+          title={<FormattedMessage id="hasMarkers" />}
+          data-type={HasMarkersCriterionOption.type}
+          option={HasMarkersCriterionOption}
+          filter={filter}
+          setFilter={setFilter}
+          sectionID="hasMarkers"
+        />
         <SidebarBooleanFilter
           title={<FormattedMessage id="organized" />}
           data-type={OrganizedCriterionOption.type}
diff --git a/ui/v2.5/src/locales/en-GB.json b/ui/v2.5/src/locales/en-GB.json
index a780269f1..08297727a 100644
--- a/ui/v2.5/src/locales/en-GB.json
+++ b/ui/v2.5/src/locales/en-GB.json
@@ -1135,7 +1135,7 @@
     "uploading": "Uploading script"
   },
   "hasChapters": "Chapters",
-  "hasMarkers": "Has Markers",
+  "hasMarkers": "Markers",
   "height": "Height",
   "height_cm": "Height (cm)",
   "help": "Help",

From 51999135be14687527750ba12a05abc46fef487a Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Tue, 18 Nov 2025 11:13:35 +1100
Subject: [PATCH 141/405] Add SFW content mode option (#6262)

* Use more neutral language for content
* Add sfw mode setting
* Make configuration context mandatory
* Add sfw class when sfw mode active
* Hide nsfw performer fields in sfw mode
* Hide nsfw sort options
* Hide nsfw filter/sort options in sfw mode
* Replace o-count with like counter in sfw mode
* Use sfw label for o-counter filter in sfw mode
* Use likes instead of o-count in sfw mode in other places
* Rename sfw mode to sfw content mode
* Use sfw image for default performers in sfw mode
* Document SFW content mode
* Add SFW mode setting to setup
* Clarify README
* Change wording of sfw mode description
* Handle configuration loading error correctly
* Hide age in performer cards
---
 README.md                                     |   2 +-
 graphql/schema/types/config.graphql           |   8 +
 internal/api/images.go                        |   6 +-
 internal/api/resolver_mutation_configure.go   |   2 +
 internal/api/resolver_query_configuration.go  |   1 +
 internal/api/routes_performer.go              |   7 +-
 internal/api/server.go                        |   1 +
 internal/manager/config/config.go             |  13 +-
 internal/manager/manager.go                   |   4 +
 internal/manager/models.go                    |   1 +
 internal/static/embed.go                      |   7 +-
 internal/static/performer_sfw/performer.svg   |   7 +
 ui/v2.5/graphql/data/config.graphql           |   1 +
 ui/v2.5/src/App.tsx                           |  54 ++++---
 .../src/components/Dialogs/GenerateDialog.tsx |   4 +-
 ui/v2.5/src/components/FrontPage/Control.tsx  |   8 +-
 .../src/components/FrontPage/FrontPage.tsx    |   6 +-
 .../components/FrontPage/FrontPageConfig.tsx  |   8 +-
 .../Galleries/DeleteGalleriesDialog.tsx       |   4 +-
 .../Galleries/GalleryDetails/Gallery.tsx      |   6 +-
 .../GalleryDetails/GalleryScrapeDialog.tsx    |   8 +
 .../components/Galleries/GallerySelect.tsx    |   4 +-
 ui/v2.5/src/components/Groups/GroupCard.tsx   |  13 +-
 .../components/Groups/GroupDetails/Group.tsx  |   4 +-
 .../Groups/GroupDetails/GroupScrapeDialog.tsx |  10 ++
 ui/v2.5/src/components/Groups/GroupSelect.tsx |   4 +-
 .../components/Images/DeleteImagesDialog.tsx  |   4 +-
 ui/v2.5/src/components/Images/ImageCard.tsx   |  13 +-
 .../components/Images/ImageDetails/Image.tsx  |   6 +-
 .../Images/ImageDetails/ImageScrapeDialog.tsx |   8 +
 ui/v2.5/src/components/Images/ImageList.tsx   |  12 +-
 .../src/components/List/EditFilterDialog.tsx  |  36 +++--
 ui/v2.5/src/components/List/FilterTags.tsx    |   6 +-
 .../components/List/Filters/PathFilter.tsx    |   4 +-
 .../components/List/Filters/RatingFilter.tsx  |   4 +-
 ui/v2.5/src/components/List/ItemList.tsx      |  14 +-
 ui/v2.5/src/components/List/ListFilter.tsx    |  18 ++-
 ui/v2.5/src/components/List/util.ts           |  14 +-
 ui/v2.5/src/components/MainNavbar.tsx         |  60 ++++----
 .../Performers/EditPerformersDialog.tsx       |  18 ++-
 .../components/Performers/PerformerCard.tsx   |  17 +--
 .../Performers/PerformerDetails/Performer.tsx |  13 +-
 .../PerformerDetails/PerformerEditPanel.tsx   |   4 +-
 .../PerformerScrapeDialog.tsx                 |  23 +++
 .../Performers/PerformerPopover.tsx           |   4 +-
 .../components/Performers/PerformerSelect.tsx |   4 +-
 .../components/ScenePlayer/ScenePlayer.tsx    |   5 +-
 .../components/Scenes/DeleteScenesDialog.tsx  |   4 +-
 ui/v2.5/src/components/Scenes/SceneCard.tsx   |  19 +--
 .../Scenes/SceneDetails/OCounterButton.tsx    |  13 +-
 .../components/Scenes/SceneDetails/Scene.tsx  |   7 +-
 .../Scenes/SceneDetails/SceneEditPanel.tsx    |   4 +-
 .../Scenes/SceneDetails/SceneHistoryPanel.tsx |  18 ++-
 .../Scenes/SceneDetails/SceneScrapeDialog.tsx |  11 ++
 ui/v2.5/src/components/Scenes/SceneList.tsx   |  10 +-
 .../src/components/Scenes/SceneMarkerCard.tsx |   6 +-
 .../Scenes/SceneMarkerWallPanel.tsx           |  12 +-
 .../components/Scenes/SceneMergeDialog.tsx    |  17 +++
 ui/v2.5/src/components/Scenes/SceneSelect.tsx |   4 +-
 .../src/components/Scenes/SceneWallPanel.tsx  |  12 +-
 .../SettingsInterfacePanel.tsx                |   8 +
 .../Settings/Tasks/DataManagementTasks.tsx    |   4 +-
 .../Tasks/DirectorySelectionDialog.tsx        |   4 +-
 .../Settings/Tasks/LibraryTasks.tsx           |   4 +-
 ui/v2.5/src/components/Setup/Setup.tsx        |  30 +++-
 ui/v2.5/src/components/Shared/CountButton.tsx |  13 +-
 ui/v2.5/src/components/Shared/DetailItem.tsx  |   4 +-
 .../Shared/GridCard/StudioOverlay.tsx         |   4 +-
 .../components/Shared/PopoverCountButton.tsx  |   4 +-
 .../components/Shared/Rating/RatingSystem.tsx |   5 +-
 .../src/components/Shared/RatingBanner.tsx    |   6 +-
 .../Shared/ScrapeDialog/ScrapeDialog.tsx      |  29 +++-
 .../Shared/ScrapeDialog/ScrapedObjectsRow.tsx |  23 ++-
 .../Shared/ScrapeDialog/scrapedTags.tsx       |   1 +
 ui/v2.5/src/components/Shared/Select.tsx      |  17 ++-
 ui/v2.5/src/components/Shared/StashID.tsx     |   4 +-
 .../Studios/StudioDetails/Studio.tsx          |   4 +-
 .../src/components/Studios/StudioSelect.tsx   |   4 +-
 ui/v2.5/src/components/Tagger/config.ts       |   6 +-
 ui/v2.5/src/components/Tagger/context.tsx     |   4 +-
 .../components/Tagger/performers/Config.tsx   |   4 +-
 .../Tagger/performers/PerformerTagger.tsx     |   4 +-
 .../components/Tagger/scenes/SceneTagger.tsx  |   4 +-
 .../components/Tagger/scenes/TaggerScene.tsx  |   4 +-
 .../src/components/Tagger/studios/Config.tsx  |   4 +-
 .../Tagger/studios/StudioTagger.tsx           |   4 +-
 .../src/components/Tags/TagDetails/Tag.tsx    |   4 +-
 ui/v2.5/src/components/Tags/TagPopover.tsx    |   4 +-
 ui/v2.5/src/components/Tags/TagSelect.tsx     |   4 +-
 ui/v2.5/src/components/Wall/WallItem.tsx      |   4 +-
 ui/v2.5/src/docs/en/Manual/Interface.md       |   9 ++
 ui/v2.5/src/hooks/Config.tsx                  |  23 ++-
 ui/v2.5/src/hooks/Interactive/context.tsx     |   4 +-
 ui/v2.5/src/hooks/Lightbox/Lightbox.tsx       |   4 +-
 ui/v2.5/src/hooks/useTableColumns.ts          |   5 +-
 ui/v2.5/src/index.scss                        |   1 +
 ui/v2.5/src/locales/en-GB.json                |  21 ++-
 .../models/list-filter/criteria/criterion.ts  |  44 ++++--
 .../src/models/list-filter/filter-options.ts  |   3 +-
 ui/v2.5/src/models/list-filter/groups.ts      |   5 +-
 ui/v2.5/src/models/list-filter/images.ts      |   5 +-
 ui/v2.5/src/models/list-filter/performers.ts  |  11 +-
 ui/v2.5/src/models/list-filter/scenes.ts      |  11 +-
 ui/v2.5/src/sfw-mode.scss                     |  91 +++++++++++
 ui/v2.5/src/utils/form.tsx                    | 141 ++++++++++++++----
 105 files changed, 843 insertions(+), 370 deletions(-)
 create mode 100644 internal/static/performer_sfw/performer.svg
 create mode 100644 ui/v2.5/src/sfw-mode.scss

diff --git a/README.md b/README.md
index c54d94528..e47363395 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@
 [![GitHub release (latest by date)](https://img.shields.io/github/v/release/stashapp/stash?logo=github)](https://github.com/stashapp/stash/releases/latest)
 [![GitHub issues by-label](https://img.shields.io/github/issues-raw/stashapp/stash/bounty)](https://github.com/stashapp/stash/labels/bounty)
 
-### **Stash is a self-hosted webapp written in Go which organizes and serves your porn.**
+### **Stash is a self-hosted webapp written in Go which organizes and serves your diverse content collection, catering to both your SFW and NSFW needs.**
 ![demo image](docs/readme_assets/demo_image.png)
 
 * Stash gathers information about videos in your collection from the internet, and is extensible through the use of community-built plugins for a large number of content producers and sites.
diff --git a/graphql/schema/types/config.graphql b/graphql/schema/types/config.graphql
index 4d6d2080b..63ce3ea1c 100644
--- a/graphql/schema/types/config.graphql
+++ b/graphql/schema/types/config.graphql
@@ -2,6 +2,8 @@ input SetupInput {
   "Empty to indicate $HOME/.stash/config.yml default"
   configLocation: String!
   stashes: [StashConfigInput!]!
+  "True if SFW content mode is enabled"
+  sfwContentMode: Boolean
   "Empty to indicate default"
   databaseFile: String!
   "Empty to indicate default"
@@ -341,6 +343,9 @@ type ConfigImageLightboxResult {
 }
 
 input ConfigInterfaceInput {
+  "True if SFW content mode is enabled"
+  sfwContentMode: Boolean
+
   "Ordered list of items that should be shown in the menu"
   menuItems: [String!]
 
@@ -407,6 +412,9 @@ type ConfigDisableDropdownCreate {
 }
 
 type ConfigInterfaceResult {
+  "True if SFW content mode is enabled"
+  sfwContentMode: Boolean!
+
   "Ordered list of items that should be shown in the menu"
   menuItems: [String!]
 
diff --git a/internal/api/images.go b/internal/api/images.go
index 89a8e87b0..9e16fc0df 100644
--- a/internal/api/images.go
+++ b/internal/api/images.go
@@ -101,7 +101,7 @@ func initCustomPerformerImages(customPath string) {
 	}
 }
 
-func getDefaultPerformerImage(name string, gender *models.GenderEnum) []byte {
+func getDefaultPerformerImage(name string, gender *models.GenderEnum, sfwMode bool) []byte {
 	// try the custom box first if we have one
 	if performerBoxCustom != nil {
 		ret, err := performerBoxCustom.GetRandomImageByName(name)
@@ -111,6 +111,10 @@ func getDefaultPerformerImage(name string, gender *models.GenderEnum) []byte {
 		logger.Warnf("error loading custom default performer image: %v", err)
 	}
 
+	if sfwMode {
+		return static.ReadAll(static.DefaultSFWPerformerImage)
+	}
+
 	var g models.GenderEnum
 	if gender != nil {
 		g = *gender
diff --git a/internal/api/resolver_mutation_configure.go b/internal/api/resolver_mutation_configure.go
index d9c71b09f..ba46a115a 100644
--- a/internal/api/resolver_mutation_configure.go
+++ b/internal/api/resolver_mutation_configure.go
@@ -445,6 +445,8 @@ func (r *mutationResolver) ConfigureGeneral(ctx context.Context, input ConfigGen
 func (r *mutationResolver) ConfigureInterface(ctx context.Context, input ConfigInterfaceInput) (*ConfigInterfaceResult, error) {
 	c := config.GetInstance()
 
+	r.setConfigBool(config.SFWContentMode, input.SfwContentMode)
+
 	if input.MenuItems != nil {
 		c.SetInterface(config.MenuItems, input.MenuItems)
 	}
diff --git a/internal/api/resolver_query_configuration.go b/internal/api/resolver_query_configuration.go
index cfa22720b..5952dd41e 100644
--- a/internal/api/resolver_query_configuration.go
+++ b/internal/api/resolver_query_configuration.go
@@ -162,6 +162,7 @@ func makeConfigInterfaceResult() *ConfigInterfaceResult {
 	disableDropdownCreate := config.GetDisableDropdownCreate()
 
 	return &ConfigInterfaceResult{
+		SfwContentMode:               config.GetSFWContentMode(),
 		MenuItems:                    menuItems,
 		SoundOnPreview:               &soundOnPreview,
 		WallShowTitle:                &wallShowTitle,
diff --git a/internal/api/routes_performer.go b/internal/api/routes_performer.go
index b27fdbd6c..8d5463d63 100644
--- a/internal/api/routes_performer.go
+++ b/internal/api/routes_performer.go
@@ -18,9 +18,14 @@ type PerformerFinder interface {
 	GetImage(ctx context.Context, performerID int) ([]byte, error)
 }
 
+type sfwConfig interface {
+	GetSFWContentMode() bool
+}
+
 type performerRoutes struct {
 	routes
 	performerFinder PerformerFinder
+	sfwConfig       sfwConfig
 }
 
 func (rs performerRoutes) Routes() chi.Router {
@@ -54,7 +59,7 @@ func (rs performerRoutes) Image(w http.ResponseWriter, r *http.Request) {
 	}
 
 	if len(image) == 0 {
-		image = getDefaultPerformerImage(performer.Name, performer.Gender)
+		image = getDefaultPerformerImage(performer.Name, performer.Gender, rs.sfwConfig.GetSFWContentMode())
 	}
 
 	utils.ServeImage(w, r, image)
diff --git a/internal/api/server.go b/internal/api/server.go
index 5059e9a2a..9290c6512 100644
--- a/internal/api/server.go
+++ b/internal/api/server.go
@@ -322,6 +322,7 @@ func (s *Server) getPerformerRoutes() chi.Router {
 	return performerRoutes{
 		routes:          routes{txnManager: repo.TxnManager},
 		performerFinder: repo.Performer,
+		sfwConfig:       s.manager.Config,
 	}.Routes()
 }
 
diff --git a/internal/manager/config/config.go b/internal/manager/config/config.go
index 65e1bad51..a351cc872 100644
--- a/internal/manager/config/config.go
+++ b/internal/manager/config/config.go
@@ -43,6 +43,9 @@ const (
 	Password            = "password"
 	MaxSessionAge       = "max_session_age"
 
+	// SFWContentMode mode config key
+	SFWContentMode = "sfw_content_mode"
+
 	FFMpegPath  = "ffmpeg_path"
 	FFProbePath = "ffprobe_path"
 
@@ -628,7 +631,15 @@ func (i *Config) getStringMapString(key string) map[string]string {
 	return ret
 }
 
-// GetStathPaths returns the configured stash library paths.
+// GetSFW returns true if SFW mode is enabled.
+// Default performer images are changed to more agnostic images when enabled.
+func (i *Config) GetSFWContentMode() bool {
+	i.RLock()
+	defer i.RUnlock()
+	return i.getBool(SFWContentMode)
+}
+
+// GetStashPaths returns the configured stash library paths.
 // Works opposite to the usual case - it will return the override
 // value only if the main value is not set.
 func (i *Config) GetStashPaths() StashConfigs {
diff --git a/internal/manager/manager.go b/internal/manager/manager.go
index ca70b1c13..2d47fd907 100644
--- a/internal/manager/manager.go
+++ b/internal/manager/manager.go
@@ -262,6 +262,10 @@ func (s *Manager) Setup(ctx context.Context, input SetupInput) error {
 		cfg.SetString(config.Cache, input.CacheLocation)
 	}
 
+	if input.SFWContentMode {
+		cfg.SetBool(config.SFWContentMode, true)
+	}
+
 	if input.StoreBlobsInDatabase {
 		cfg.SetInterface(config.BlobsStorage, config.BlobStorageTypeDatabase)
 	} else {
diff --git a/internal/manager/models.go b/internal/manager/models.go
index 3e96e6182..b7c7232c5 100644
--- a/internal/manager/models.go
+++ b/internal/manager/models.go
@@ -21,6 +21,7 @@ type SetupInput struct {
 	// Empty to indicate $HOME/.stash/config.yml default
 	ConfigLocation string                     `json:"configLocation"`
 	Stashes        []*config.StashConfigInput `json:"stashes"`
+	SFWContentMode bool                       `json:"sfwContentMode"`
 	// Empty to indicate default
 	DatabaseFile string `json:"databaseFile"`
 	// Empty to indicate default
diff --git a/internal/static/embed.go b/internal/static/embed.go
index 91437a81f..665c5a892 100644
--- a/internal/static/embed.go
+++ b/internal/static/embed.go
@@ -8,12 +8,13 @@ import (
 	"io/fs"
 )
 
-//go:embed performer performer_male scene image gallery tag studio group
+//go:embed performer performer_male performer_sfw scene image gallery tag studio group
 var data embed.FS
 
 const (
-	Performer     = "performer"
-	PerformerMale = "performer_male"
+	Performer                = "performer"
+	PerformerMale            = "performer_male"
+	DefaultSFWPerformerImage = "performer_sfw/performer.svg"
 
 	Scene             = "scene"
 	DefaultSceneImage = "scene/scene.svg"
diff --git a/internal/static/performer_sfw/performer.svg b/internal/static/performer_sfw/performer.svg
new file mode 100644
index 000000000..24b444171
--- /dev/null
+++ b/internal/static/performer_sfw/performer.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="-136 -284 720 1080">
+<!--! 
+Font Awesome Free 6.7.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) Copyright 2024 Fonticons, Inc.
+Original from https://github.com/FortAwesome/Font-Awesome/blob/6.x/svgs/solid/user.svg
+Modified to change color and viewbox
+-->
+<path d="M224 256A128 128 0 1 0 224 0a128 128 0 1 0 0 256zm-45.7 48C79.8 304 0 383.8 0 482.3C0 498.7 13.3 512 29.7 512l388.6 0c16.4 0 29.7-13.3 29.7-29.7C448 383.8 368.2 304 269.7 304l-91.4 0z" style="fill:#ffffff;fill-opacity:1" /></svg>
\ No newline at end of file
diff --git a/ui/v2.5/graphql/data/config.graphql b/ui/v2.5/graphql/data/config.graphql
index c0bcda821..95d55864f 100644
--- a/ui/v2.5/graphql/data/config.graphql
+++ b/ui/v2.5/graphql/data/config.graphql
@@ -71,6 +71,7 @@ fragment ConfigGeneralData on ConfigGeneralResult {
 }
 
 fragment ConfigInterfaceData on ConfigInterfaceResult {
+  sfwContentMode
   menuItems
   soundOnPreview
   wallShowTitle
diff --git a/ui/v2.5/src/App.tsx b/ui/v2.5/src/App.tsx
index 005d101aa..a8b92ecc3 100644
--- a/ui/v2.5/src/App.tsx
+++ b/ui/v2.5/src/App.tsx
@@ -31,7 +31,10 @@ import * as GQL from "./core/generated-graphql";
 import { makeTitleProps } from "./hooks/title";
 import { LoadingIndicator } from "./components/Shared/LoadingIndicator";
 
-import { ConfigurationProvider } from "./hooks/Config";
+import {
+  ConfigurationProvider,
+  useConfigurationContextOptional,
+} from "./hooks/Config";
 import { ManualProvider } from "./components/Help/context";
 import { InteractiveProvider } from "./hooks/Interactive/context";
 import { ReleaseNotesDialog } from "./components/Dialogs/ReleaseNotesDialog";
@@ -50,6 +53,7 @@ import { PatchFunction } from "./patch";
 
 import moment from "moment/min/moment-with-locales";
 import { ErrorMessage } from "./components/Shared/ErrorMessage";
+import cx from "classnames";
 
 const Performers = lazyComponent(
   () => import("./components/Performers/Performers")
@@ -104,8 +108,17 @@ const AppContainer: React.FC<React.PropsWithChildren<{}>> = PatchFunction(
 ) as React.FC;
 
 const MainContainer: React.FC = ({ children }) => {
+  // use optional here because the configuration may have be loading or errored
+  const { configuration } = useConfigurationContextOptional() || {};
+  const { sfwContentMode } = configuration?.interface || {};
+
   return (
-    <div className={`main container-fluid ${appleRendering ? "apple" : ""}`}>
+    <div
+      className={cx("main container-fluid", {
+        apple: appleRendering,
+        "sfw-content-mode": sfwContentMode,
+      })}
+    >
       {children}
     </div>
   );
@@ -300,28 +313,36 @@ export const App: React.FC = () => {
     return null;
   }
 
-  if (config.error) {
+  function renderSimple(content: React.ReactNode) {
     return (
       <IntlProvider
         locale={intlLanguage}
         messages={messages}
         formats={intlFormats}
       >
-        <MainContainer>
-          <ErrorMessage
-            message={
-              <FormattedMessage
-                id="errors.loading_type"
-                values={{ type: "configuration" }}
-              />
-            }
-            error={config.error.message}
-          />
-        </MainContainer>
+        <MainContainer>{content}</MainContainer>
       </IntlProvider>
     );
   }
 
+  if (config.loading) {
+    return renderSimple(<LoadingIndicator />);
+  }
+
+  if (config.error) {
+    return renderSimple(
+      <ErrorMessage
+        message={
+          <FormattedMessage
+            id="errors.loading_type"
+            values={{ type: "configuration" }}
+          />
+        }
+        error={config.error.message}
+      />
+    );
+  }
+
   return (
     <ErrorBoundary>
       <IntlProvider
@@ -332,10 +353,7 @@ export const App: React.FC = () => {
         <ToastProvider>
           <PluginsLoader>
             <AppContainer>
-              <ConfigurationProvider
-                configuration={config.data?.configuration}
-                loading={config.loading}
-              >
+              <ConfigurationProvider configuration={config.data!.configuration}>
                 {maybeRenderReleaseNotes()}
                 <ConnectionMonitor />
                 <Suspense fallback={<LoadingIndicator />}>
diff --git a/ui/v2.5/src/components/Dialogs/GenerateDialog.tsx b/ui/v2.5/src/components/Dialogs/GenerateDialog.tsx
index 669bc8aa4..5afdb0b8e 100644
--- a/ui/v2.5/src/components/Dialogs/GenerateDialog.tsx
+++ b/ui/v2.5/src/components/Dialogs/GenerateDialog.tsx
@@ -6,7 +6,7 @@ import { Icon } from "src/components/Shared/Icon";
 import { useToast } from "src/hooks/Toast";
 import * as GQL from "src/core/generated-graphql";
 import { FormattedMessage, useIntl } from "react-intl";
-import { ConfigurationContext } from "src/hooks/Config";
+import { useConfigurationContext } from "src/hooks/Config";
 import { Manual } from "../Help/Manual";
 import { withoutTypename } from "src/utils/data";
 import { GenerateOptions } from "../Settings/Tasks/GenerateOptions";
@@ -25,7 +25,7 @@ export const GenerateDialog: React.FC<ISceneGenerateDialog> = ({
   onClose,
   type,
 }) => {
-  const { configuration } = React.useContext(ConfigurationContext);
+  const { configuration } = useConfigurationContext();
 
   function getDefaultOptions(): GQL.GenerateMetadataInput {
     return {
diff --git a/ui/v2.5/src/components/FrontPage/Control.tsx b/ui/v2.5/src/components/FrontPage/Control.tsx
index 7ff31bbac..72f84516f 100644
--- a/ui/v2.5/src/components/FrontPage/Control.tsx
+++ b/ui/v2.5/src/components/FrontPage/Control.tsx
@@ -1,9 +1,9 @@
-import React, { useContext, useMemo } from "react";
+import React, { useMemo } from "react";
 import { useIntl } from "react-intl";
 import { FrontPageContent, ICustomFilter } from "src/core/config";
 import * as GQL from "src/core/generated-graphql";
 import { useFindSavedFilter } from "src/core/StashService";
-import { ConfigurationContext } from "src/hooks/Config";
+import { useConfigurationContext } from "src/hooks/Config";
 import { ListFilterModel } from "src/models/list-filter/filter";
 import { GalleryRecommendationRow } from "../Galleries/GalleryRecommendationRow";
 import { ImageRecommendationRow } from "../Images/ImageRecommendationRow";
@@ -105,7 +105,7 @@ interface ISavedFilterResults {
 const SavedFilterResults: React.FC<ISavedFilterResults> = ({
   savedFilterID,
 }) => {
-  const { configuration: config } = useContext(ConfigurationContext);
+  const { configuration: config } = useConfigurationContext();
   const { loading, data } = useFindSavedFilter(savedFilterID.toString());
 
   const filter = useMemo(() => {
@@ -136,7 +136,7 @@ interface ICustomFilterProps {
 const CustomFilterResults: React.FC<ICustomFilterProps> = ({
   customFilter,
 }) => {
-  const { configuration: config } = useContext(ConfigurationContext);
+  const { configuration: config } = useConfigurationContext();
   const intl = useIntl();
 
   const filter = useMemo(() => {
diff --git a/ui/v2.5/src/components/FrontPage/FrontPage.tsx b/ui/v2.5/src/components/FrontPage/FrontPage.tsx
index 89b4db468..12e56f6ab 100644
--- a/ui/v2.5/src/components/FrontPage/FrontPage.tsx
+++ b/ui/v2.5/src/components/FrontPage/FrontPage.tsx
@@ -6,7 +6,7 @@ import { Button } from "react-bootstrap";
 import { FrontPageConfig } from "./FrontPageConfig";
 import { useToast } from "src/hooks/Toast";
 import { Control } from "./Control";
-import { ConfigurationContext } from "src/hooks/Config";
+import { useConfigurationContext } from "src/hooks/Config";
 import {
   FrontPageContent,
   generateDefaultFrontPageContent,
@@ -24,7 +24,7 @@ const FrontPage: React.FC = PatchComponent("FrontPage", () => {
 
   const [saveUI] = useConfigureUI();
 
-  const { configuration, loading } = React.useContext(ConfigurationContext);
+  const { configuration } = useConfigurationContext();
 
   useScrollToTopOnMount();
 
@@ -51,7 +51,7 @@ const FrontPage: React.FC = PatchComponent("FrontPage", () => {
     setSaving(false);
   }
 
-  if (loading || saving) {
+  if (saving) {
     return <LoadingIndicator />;
   }
 
diff --git a/ui/v2.5/src/components/FrontPage/FrontPageConfig.tsx b/ui/v2.5/src/components/FrontPage/FrontPageConfig.tsx
index 2f72d0740..33e6c066a 100644
--- a/ui/v2.5/src/components/FrontPage/FrontPageConfig.tsx
+++ b/ui/v2.5/src/components/FrontPage/FrontPageConfig.tsx
@@ -4,7 +4,7 @@ import { useFindSavedFilters } from "src/core/StashService";
 import { LoadingIndicator } from "../Shared/LoadingIndicator";
 import { Button, Form, Modal } from "react-bootstrap";
 import * as GQL from "src/core/generated-graphql";
-import { ConfigurationContext } from "src/hooks/Config";
+import { useConfigurationContext } from "src/hooks/Config";
 import {
   ISavedFilterRow,
   ICustomFilter,
@@ -277,11 +277,11 @@ interface IFrontPageConfigProps {
 export const FrontPageConfig: React.FC<IFrontPageConfigProps> = ({
   onClose,
 }) => {
-  const { configuration, loading } = React.useContext(ConfigurationContext);
+  const { configuration } = useConfigurationContext();
 
   const ui = configuration?.ui;
 
-  const { data: allFilters, loading: loading2 } = useFindSavedFilters();
+  const { data: allFilters, loading } = useFindSavedFilters();
 
   const [isAdd, setIsAdd] = useState(false);
   const [currentContent, setCurrentContent] = useState<FrontPageContent[]>([]);
@@ -338,7 +338,7 @@ export const FrontPageConfig: React.FC<IFrontPageConfigProps> = ({
     setDragIndex(undefined);
   }
 
-  if (loading || loading2) {
+  if (loading) {
     return <LoadingIndicator />;
   }
 
diff --git a/ui/v2.5/src/components/Galleries/DeleteGalleriesDialog.tsx b/ui/v2.5/src/components/Galleries/DeleteGalleriesDialog.tsx
index 2feaa0f1e..0e50c16b8 100644
--- a/ui/v2.5/src/components/Galleries/DeleteGalleriesDialog.tsx
+++ b/ui/v2.5/src/components/Galleries/DeleteGalleriesDialog.tsx
@@ -4,7 +4,7 @@ import { useGalleryDestroy } from "src/core/StashService";
 import * as GQL from "src/core/generated-graphql";
 import { ModalComponent } from "../Shared/Modal";
 import { useToast } from "src/hooks/Toast";
-import { ConfigurationContext } from "src/hooks/Config";
+import { useConfigurationContext } from "src/hooks/Config";
 import { FormattedMessage, useIntl } from "react-intl";
 import { faTrashAlt } from "@fortawesome/free-solid-svg-icons";
 
@@ -33,7 +33,7 @@ export const DeleteGalleriesDialog: React.FC<IDeleteGalleryDialogProps> = (
     { count: props.selected.length, singularEntity, pluralEntity }
   );
 
-  const { configuration: config } = React.useContext(ConfigurationContext);
+  const { configuration: config } = useConfigurationContext();
 
   const [deleteFile, setDeleteFile] = useState<boolean>(
     config?.defaults.deleteFile ?? false
diff --git a/ui/v2.5/src/components/Galleries/GalleryDetails/Gallery.tsx b/ui/v2.5/src/components/Galleries/GalleryDetails/Gallery.tsx
index 5d7cdeb51..9cee2d1e2 100644
--- a/ui/v2.5/src/components/Galleries/GalleryDetails/Gallery.tsx
+++ b/ui/v2.5/src/components/Galleries/GalleryDetails/Gallery.tsx
@@ -1,5 +1,5 @@
 import { Button, Tab, Nav, Dropdown } from "react-bootstrap";
-import React, { useContext, useEffect, useMemo, useState } from "react";
+import React, { useEffect, useMemo, useState } from "react";
 import {
   useHistory,
   Link,
@@ -41,7 +41,7 @@ import { useScrollToTopOnMount } from "src/hooks/scrollToTop";
 import { RatingSystem } from "src/components/Shared/Rating/RatingSystem";
 import cx from "classnames";
 import { useRatingKeybinds } from "src/hooks/keybinds";
-import { ConfigurationContext } from "src/hooks/Config";
+import { useConfigurationContext } from "src/hooks/Config";
 import { TruncatedText } from "src/components/Shared/TruncatedText";
 import { goBackOrReplace } from "src/utils/history";
 
@@ -59,7 +59,7 @@ export const GalleryPage: React.FC<IProps> = ({ gallery, add }) => {
   const history = useHistory();
   const Toast = useToast();
   const intl = useIntl();
-  const { configuration } = useContext(ConfigurationContext);
+  const { configuration } = useConfigurationContext();
   const showLightbox = useGalleryLightbox(gallery.id, gallery.chapters);
 
   const [collapsed, setCollapsed] = useState(false);
diff --git a/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryScrapeDialog.tsx b/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryScrapeDialog.tsx
index 5fe20b7b0..fbfde9f97 100644
--- a/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryScrapeDialog.tsx
+++ b/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryScrapeDialog.tsx
@@ -161,32 +161,38 @@ export const GalleryScrapeDialog: React.FC<IGalleryScrapeDialogProps> = ({
     return (
       <>
         <ScrapedInputGroupRow
+          field="title"
           title={intl.formatMessage({ id: "title" })}
           result={title}
           onChange={(value) => setTitle(value)}
         />
         <ScrapedInputGroupRow
+          field="code"
           title={intl.formatMessage({ id: "scene_code" })}
           result={code}
           onChange={(value) => setCode(value)}
         />
         <ScrapedStringListRow
+          field="urls"
           title={intl.formatMessage({ id: "urls" })}
           result={urls}
           onChange={(value) => setURLs(value)}
         />
         <ScrapedInputGroupRow
+          field="date"
           title={intl.formatMessage({ id: "date" })}
           placeholder="YYYY-MM-DD"
           result={date}
           onChange={(value) => setDate(value)}
         />
         <ScrapedInputGroupRow
+          field="photographer"
           title={intl.formatMessage({ id: "photographer" })}
           result={photographer}
           onChange={(value) => setPhotographer(value)}
         />
         <ScrapedStudioRow
+          field="studio"
           title={intl.formatMessage({ id: "studios" })}
           result={studio}
           onChange={(value) => setStudio(value)}
@@ -194,6 +200,7 @@ export const GalleryScrapeDialog: React.FC<IGalleryScrapeDialogProps> = ({
           onCreateNew={createNewStudio}
         />
         <ScrapedPerformersRow
+          field="performers"
           title={intl.formatMessage({ id: "performers" })}
           result={performers}
           onChange={(value) => setPerformers(value)}
@@ -203,6 +210,7 @@ export const GalleryScrapeDialog: React.FC<IGalleryScrapeDialogProps> = ({
         />
         {scrapedTagsRow}
         <ScrapedTextAreaRow
+          field="details"
           title={intl.formatMessage({ id: "details" })}
           result={details}
           onChange={(value) => setDetails(value)}
diff --git a/ui/v2.5/src/components/Galleries/GallerySelect.tsx b/ui/v2.5/src/components/Galleries/GallerySelect.tsx
index 4cd8825bb..c76266cf7 100644
--- a/ui/v2.5/src/components/Galleries/GallerySelect.tsx
+++ b/ui/v2.5/src/components/Galleries/GallerySelect.tsx
@@ -12,7 +12,7 @@ import {
   queryFindGalleriesForSelect,
   queryFindGalleriesByIDForSelect,
 } from "src/core/StashService";
-import { ConfigurationContext } from "src/hooks/Config";
+import { useConfigurationContext } from "src/hooks/Config";
 import { useIntl } from "react-intl";
 import { defaultMaxOptionsShown } from "src/core/config";
 import { ListFilterModel } from "src/models/list-filter/filter";
@@ -70,7 +70,7 @@ const gallerySelectSort = PatchFunction(
 const _GallerySelect: React.FC<
   IFilterProps & IFilterValueProps<Gallery> & ExtraGalleryProps
 > = (props) => {
-  const { configuration } = React.useContext(ConfigurationContext);
+  const { configuration } = useConfigurationContext();
   const intl = useIntl();
   const maxOptionsShown =
     configuration?.ui.maxOptionsShown ?? defaultMaxOptionsShown;
diff --git a/ui/v2.5/src/components/Groups/GroupCard.tsx b/ui/v2.5/src/components/Groups/GroupCard.tsx
index 87a594446..7412c986a 100644
--- a/ui/v2.5/src/components/Groups/GroupCard.tsx
+++ b/ui/v2.5/src/components/Groups/GroupCard.tsx
@@ -10,7 +10,7 @@ import { FormattedMessage } from "react-intl";
 import { RatingBanner } from "../Shared/RatingBanner";
 import { faPlayCircle, faTag } from "@fortawesome/free-solid-svg-icons";
 import { RelatedGroupPopoverButton } from "./RelatedGroupPopover";
-import { SweatDrops } from "../Shared/SweatDrops";
+import { OCounterButton } from "../Shared/CountButton";
 
 const Description: React.FC<{
   sceneNumber?: number;
@@ -111,16 +111,7 @@ export const GroupCard: React.FC<IProps> = ({
   function maybeRenderOCounter() {
     if (!group.o_counter) return;
 
-    return (
-      <div className="o-counter">
-        <Button className="minimal">
-          <span className="fa-icon">
-            <SweatDrops />
-          </span>
-          <span>{group.o_counter}</span>
-        </Button>
-      </div>
-    );
+    return <OCounterButton value={group.o_counter} />;
   }
 
   function maybeRenderPopoverButtonGroup() {
diff --git a/ui/v2.5/src/components/Groups/GroupDetails/Group.tsx b/ui/v2.5/src/components/Groups/GroupDetails/Group.tsx
index b48f3b98c..b2b3d8176 100644
--- a/ui/v2.5/src/components/Groups/GroupDetails/Group.tsx
+++ b/ui/v2.5/src/components/Groups/GroupDetails/Group.tsx
@@ -23,7 +23,7 @@ import {
 import { GroupEditPanel } from "./GroupEditPanel";
 import { faRefresh, faTrashAlt } from "@fortawesome/free-solid-svg-icons";
 import { RatingSystem } from "src/components/Shared/Rating/RatingSystem";
-import { ConfigurationContext } from "src/hooks/Config";
+import { useConfigurationContext } from "src/hooks/Config";
 import { DetailImage } from "src/components/Shared/DetailImage";
 import { useRatingKeybinds } from "src/hooks/keybinds";
 import { useLoadStickyHeader } from "src/hooks/detailsPanel";
@@ -146,7 +146,7 @@ const GroupPage: React.FC<IProps> = ({ group, tabKey }) => {
   const Toast = useToast();
 
   // Configuration settings
-  const { configuration } = React.useContext(ConfigurationContext);
+  const { configuration } = useConfigurationContext();
   const uiConfig = configuration?.ui;
   const enableBackgroundImage = uiConfig?.enableMovieBackgroundImage ?? false;
   const compactExpandedDetails = uiConfig?.compactExpandedDetails ?? false;
diff --git a/ui/v2.5/src/components/Groups/GroupDetails/GroupScrapeDialog.tsx b/ui/v2.5/src/components/Groups/GroupDetails/GroupScrapeDialog.tsx
index bdb5d6ad5..d37210c43 100644
--- a/ui/v2.5/src/components/Groups/GroupDetails/GroupScrapeDialog.tsx
+++ b/ui/v2.5/src/components/Groups/GroupDetails/GroupScrapeDialog.tsx
@@ -149,37 +149,44 @@ export const GroupScrapeDialog: React.FC<IGroupScrapeDialogProps> = ({
     return (
       <>
         <ScrapedInputGroupRow
+          field="name"
           title={intl.formatMessage({ id: "name" })}
           result={name}
           onChange={(value) => setName(value)}
         />
         <ScrapedInputGroupRow
+          field="aliases"
           title={intl.formatMessage({ id: "aliases" })}
           result={aliases}
           onChange={(value) => setAliases(value)}
         />
         <ScrapedInputGroupRow
+          field="duration"
           title={intl.formatMessage({ id: "duration" })}
           result={duration}
           onChange={(value) => setDuration(value)}
         />
         <ScrapedInputGroupRow
+          field="date"
           title={intl.formatMessage({ id: "date" })}
           placeholder="YYYY-MM-DD"
           result={date}
           onChange={(value) => setDate(value)}
         />
         <ScrapedInputGroupRow
+          field="director"
           title={intl.formatMessage({ id: "director" })}
           result={director}
           onChange={(value) => setDirector(value)}
         />
         <ScrapedTextAreaRow
+          field="synopsis"
           title={intl.formatMessage({ id: "synopsis" })}
           result={synopsis}
           onChange={(value) => setSynopsis(value)}
         />
         <ScrapedStudioRow
+          field="studio"
           title={intl.formatMessage({ id: "studios" })}
           result={studio}
           onChange={(value) => setStudio(value)}
@@ -187,18 +194,21 @@ export const GroupScrapeDialog: React.FC<IGroupScrapeDialogProps> = ({
           onCreateNew={createNewStudio}
         />
         <ScrapedStringListRow
+          field="urls"
           title={intl.formatMessage({ id: "urls" })}
           result={urls}
           onChange={(value) => setURLs(value)}
         />
         {scrapedTagsRow}
         <ScrapedImageRow
+          field="front_image"
           title="Front Image"
           className="group-image"
           result={frontImage}
           onChange={(value) => setFrontImage(value)}
         />
         <ScrapedImageRow
+          field="back_image"
           title="Back Image"
           className="group-image"
           result={backImage}
diff --git a/ui/v2.5/src/components/Groups/GroupSelect.tsx b/ui/v2.5/src/components/Groups/GroupSelect.tsx
index 8ee9dc1a0..a904e2223 100644
--- a/ui/v2.5/src/components/Groups/GroupSelect.tsx
+++ b/ui/v2.5/src/components/Groups/GroupSelect.tsx
@@ -13,7 +13,7 @@ import {
   queryFindGroupsByIDForSelect,
   useGroupCreate,
 } from "src/core/StashService";
-import { ConfigurationContext } from "src/hooks/Config";
+import { useConfigurationContext } from "src/hooks/Config";
 import { useIntl } from "react-intl";
 import { defaultMaxOptionsShown } from "src/core/config";
 import { ListFilterModel } from "src/models/list-filter/filter";
@@ -66,7 +66,7 @@ export const GroupSelect: React.FC<
 > = PatchComponent("GroupSelect", (props) => {
   const [createGroup] = useGroupCreate();
 
-  const { configuration } = React.useContext(ConfigurationContext);
+  const { configuration } = useConfigurationContext();
   const intl = useIntl();
   const maxOptionsShown =
     configuration?.ui.maxOptionsShown ?? defaultMaxOptionsShown;
diff --git a/ui/v2.5/src/components/Images/DeleteImagesDialog.tsx b/ui/v2.5/src/components/Images/DeleteImagesDialog.tsx
index 36a3ead3c..ec442a5ca 100644
--- a/ui/v2.5/src/components/Images/DeleteImagesDialog.tsx
+++ b/ui/v2.5/src/components/Images/DeleteImagesDialog.tsx
@@ -4,7 +4,7 @@ import { useImagesDestroy } from "src/core/StashService";
 import * as GQL from "src/core/generated-graphql";
 import { ModalComponent } from "src/components/Shared/Modal";
 import { useToast } from "src/hooks/Toast";
-import { ConfigurationContext } from "src/hooks/Config";
+import { useConfigurationContext } from "src/hooks/Config";
 import { FormattedMessage, useIntl } from "react-intl";
 import { faTrashAlt } from "@fortawesome/free-solid-svg-icons";
 
@@ -33,7 +33,7 @@ export const DeleteImagesDialog: React.FC<IDeleteImageDialogProps> = (
     { count: props.selected.length, singularEntity, pluralEntity }
   );
 
-  const { configuration: config } = React.useContext(ConfigurationContext);
+  const { configuration: config } = useConfigurationContext();
 
   const [deleteFile, setDeleteFile] = useState<boolean>(
     config?.defaults.deleteFile ?? false
diff --git a/ui/v2.5/src/components/Images/ImageCard.tsx b/ui/v2.5/src/components/Images/ImageCard.tsx
index 9a8c86a10..a22e48139 100644
--- a/ui/v2.5/src/components/Images/ImageCard.tsx
+++ b/ui/v2.5/src/components/Images/ImageCard.tsx
@@ -5,7 +5,6 @@ import * as GQL from "src/core/generated-graphql";
 import { Icon } from "src/components/Shared/Icon";
 import { GalleryLink, TagLink } from "src/components/Shared/TagLink";
 import { HoverPopover } from "src/components/Shared/HoverPopover";
-import { SweatDrops } from "src/components/Shared/SweatDrops";
 import { PerformerPopoverButton } from "src/components/Shared/PerformerPopoverButton";
 import { GridCard } from "src/components/Shared/GridCard/GridCard";
 import { RatingBanner } from "src/components/Shared/RatingBanner";
@@ -18,6 +17,7 @@ import {
 import { imageTitle } from "src/core/files";
 import { TruncatedText } from "../Shared/TruncatedText";
 import { StudioOverlay } from "../Shared/GridCard/StudioOverlay";
+import { OCounterButton } from "../Shared/CountButton";
 
 interface IImageCardProps {
   image: GQL.SlimImageDataFragment;
@@ -74,16 +74,7 @@ export const ImageCard: React.FC<IImageCardProps> = (
 
   function maybeRenderOCounter() {
     if (props.image.o_counter) {
-      return (
-        <div className="o-count">
-          <Button className="minimal">
-            <span className="fa-icon">
-              <SweatDrops />
-            </span>
-            <span>{props.image.o_counter}</span>
-          </Button>
-        </div>
-      );
+      return <OCounterButton value={props.image.o_counter} />;
     }
   }
 
diff --git a/ui/v2.5/src/components/Images/ImageDetails/Image.tsx b/ui/v2.5/src/components/Images/ImageDetails/Image.tsx
index 3b77d2eef..699d3d4e4 100644
--- a/ui/v2.5/src/components/Images/ImageDetails/Image.tsx
+++ b/ui/v2.5/src/components/Images/ImageDetails/Image.tsx
@@ -1,5 +1,5 @@
 import { Tab, Nav, Dropdown } from "react-bootstrap";
-import React, { useContext, useEffect, useMemo, useState } from "react";
+import React, { useEffect, useMemo, useState } from "react";
 import { FormattedDate, FormattedMessage, useIntl } from "react-intl";
 import { useHistory, Link, RouteComponentProps } from "react-router-dom";
 import { Helmet } from "react-helmet";
@@ -29,7 +29,7 @@ import { imagePath, imageTitle } from "src/core/files";
 import { isVideo } from "src/utils/visualFile";
 import { useScrollToTopOnMount } from "src/hooks/scrollToTop";
 import { useRatingKeybinds } from "src/hooks/keybinds";
-import { ConfigurationContext } from "src/hooks/Config";
+import { useConfigurationContext } from "src/hooks/Config";
 import TextUtils from "src/utils/text";
 import { RatingSystem } from "src/components/Shared/Rating/RatingSystem";
 import cx from "classnames";
@@ -48,7 +48,7 @@ const ImagePage: React.FC<IProps> = ({ image }) => {
   const history = useHistory();
   const Toast = useToast();
   const intl = useIntl();
-  const { configuration } = useContext(ConfigurationContext);
+  const { configuration } = useConfigurationContext();
 
   const [incrementO] = useImageIncrementO(image.id);
   const [decrementO] = useImageDecrementO(image.id);
diff --git a/ui/v2.5/src/components/Images/ImageDetails/ImageScrapeDialog.tsx b/ui/v2.5/src/components/Images/ImageDetails/ImageScrapeDialog.tsx
index cc7dffe66..44b112078 100644
--- a/ui/v2.5/src/components/Images/ImageDetails/ImageScrapeDialog.tsx
+++ b/ui/v2.5/src/components/Images/ImageDetails/ImageScrapeDialog.tsx
@@ -163,32 +163,38 @@ export const ImageScrapeDialog: React.FC<IImageScrapeDialogProps> = ({
     return (
       <>
         <ScrapedInputGroupRow
+          field="title"
           title={intl.formatMessage({ id: "title" })}
           result={title}
           onChange={(value) => setTitle(value)}
         />
         <ScrapedInputGroupRow
+          field="code"
           title={intl.formatMessage({ id: "scene_code" })}
           result={code}
           onChange={(value) => setCode(value)}
         />
         <ScrapedStringListRow
+          field="urls"
           title={intl.formatMessage({ id: "urls" })}
           result={urls}
           onChange={(value) => setURLs(value)}
         />
         <ScrapedInputGroupRow
+          field="date"
           title={intl.formatMessage({ id: "date" })}
           placeholder="YYYY-MM-DD"
           result={date}
           onChange={(value) => setDate(value)}
         />
         <ScrapedInputGroupRow
+          field="photographer"
           title={intl.formatMessage({ id: "photographer" })}
           result={photographer}
           onChange={(value) => setPhotographer(value)}
         />
         <ScrapedStudioRow
+          field="studio"
           title={intl.formatMessage({ id: "studios" })}
           result={studio}
           onChange={(value) => setStudio(value)}
@@ -196,6 +202,7 @@ export const ImageScrapeDialog: React.FC<IImageScrapeDialogProps> = ({
           onCreateNew={createNewStudio}
         />
         <ScrapedPerformersRow
+          field="performers"
           title={intl.formatMessage({ id: "performers" })}
           result={performers}
           onChange={(value) => setPerformers(value)}
@@ -204,6 +211,7 @@ export const ImageScrapeDialog: React.FC<IImageScrapeDialogProps> = ({
         />
         {scrapedTagsRow}
         <ScrapedTextAreaRow
+          field="details"
           title={intl.formatMessage({ id: "details" })}
           result={details}
           onChange={(value) => setDetails(value)}
diff --git a/ui/v2.5/src/components/Images/ImageList.tsx b/ui/v2.5/src/components/Images/ImageList.tsx
index dc1f9b1e1..df10ff4b5 100644
--- a/ui/v2.5/src/components/Images/ImageList.tsx
+++ b/ui/v2.5/src/components/Images/ImageList.tsx
@@ -1,10 +1,4 @@
-import React, {
-  useCallback,
-  useState,
-  useMemo,
-  MouseEvent,
-  useContext,
-} from "react";
+import React, { useCallback, useState, useMemo, MouseEvent } from "react";
 import { FormattedNumber, useIntl } from "react-intl";
 import cloneDeep from "lodash-es/cloneDeep";
 import { useHistory } from "react-router-dom";
@@ -23,7 +17,7 @@ import "flexbin/flexbin.css";
 import Gallery, { RenderImageProps } from "react-photo-gallery";
 import { ExportDialog } from "../Shared/ExportDialog";
 import { objectTitle } from "src/core/files";
-import { ConfigurationContext } from "src/hooks/Config";
+import { useConfigurationContext } from "src/hooks/Config";
 import { ImageGridCard } from "./ImageGridCard";
 import { View } from "../List/views";
 import { IItemListOperation } from "../List/FilteredListToolbar";
@@ -51,7 +45,7 @@ const ImageWall: React.FC<IImageWallProps> = ({
   zoomIndex,
   handleImageOpen,
 }) => {
-  const { configuration } = useContext(ConfigurationContext);
+  const { configuration } = useConfigurationContext();
   const uiConfig = configuration?.ui;
 
   const containerRef = React.useRef<HTMLDivElement>(null);
diff --git a/ui/v2.5/src/components/List/EditFilterDialog.tsx b/ui/v2.5/src/components/List/EditFilterDialog.tsx
index 5f6d43004..3f0f486b8 100644
--- a/ui/v2.5/src/components/List/EditFilterDialog.tsx
+++ b/ui/v2.5/src/components/List/EditFilterDialog.tsx
@@ -1,7 +1,6 @@
 import cloneDeep from "lodash-es/cloneDeep";
 import React, {
   useCallback,
-  useContext,
   useEffect,
   useMemo,
   useRef,
@@ -14,7 +13,7 @@ import {
   CriterionOption,
 } from "src/models/list-filter/criteria/criterion";
 import { FormattedMessage, useIntl } from "react-intl";
-import { ConfigurationContext } from "src/hooks/Config";
+import { useConfigurationContext } from "src/hooks/Config";
 import { ListFilterModel } from "src/models/list-filter/filter";
 import { getFilterOptions } from "src/models/list-filter/factory";
 import { FilterTags } from "./FilterTags";
@@ -65,6 +64,9 @@ const CriterionOptionList: React.FC<ICriterionList> = ({
   onTogglePin,
   externallySelected = false,
 }) => {
+  const { configuration } = useConfigurationContext();
+  const { sfwContentMode } = configuration.interface;
+
   const prevCriterion = usePrevious(currentCriterion);
 
   const scrolled = useRef(false);
@@ -148,7 +150,9 @@ const CriterionOptionList: React.FC<ICriterionList> = ({
               className="collapse-icon fa-fw"
               icon={type === c.type ? faChevronDown : faChevronRight}
             />
-            <FormattedMessage id={c.messageID} />
+            <FormattedMessage
+              id={!sfwContentMode ? c.messageID : c.sfwMessageID ?? c.messageID}
+            />
           </span>
           {criteria.some((cc) => c.type === cc) && (
             <Button
@@ -233,7 +237,8 @@ export const EditFilterDialog: React.FC<IEditFilterProps> = ({
   const Toast = useToast();
   const intl = useIntl();
 
-  const { configuration } = useContext(ConfigurationContext);
+  const { configuration } = useConfigurationContext();
+  const { sfwContentMode } = configuration.interface;
 
   const [searchValue, setSearchValue] = useState("");
   const [currentFilter, setCurrentFilter] = useState<ListFilterModel>(
@@ -265,10 +270,16 @@ export const EditFilterDialog: React.FC<IEditFilterProps> = ({
       .filter((c) => !c.hidden)
       .sort((a, b) => {
         return intl
-          .formatMessage({ id: a.messageID })
-          .localeCompare(intl.formatMessage({ id: b.messageID }));
+          .formatMessage({
+            id: !sfwContentMode ? a.messageID : a.sfwMessageID ?? a.messageID,
+          })
+          .localeCompare(
+            intl.formatMessage({
+              id: !sfwContentMode ? b.messageID : b.sfwMessageID ?? b.messageID,
+            })
+          );
       });
-  }, [intl, filterOptions.criterionOptions]);
+  }, [intl, sfwContentMode, filterOptions.criterionOptions]);
 
   const optionSelected = useCallback(
     (option?: CriterionOption) => {
@@ -302,11 +313,13 @@ export const EditFilterDialog: React.FC<IEditFilterProps> = ({
 
     return criterionOptions.filter((c) => {
       return intl
-        .formatMessage({ id: c.messageID })
+        .formatMessage({
+          id: !sfwContentMode ? c.messageID : c.sfwMessageID ?? c.messageID,
+        })
         .toLowerCase()
         .includes(trimmedSearch);
     });
-  }, [intl, searchValue, criterionOptions]);
+  }, [intl, sfwContentMode, searchValue, criterionOptions]);
 
   const pinnedFilters = useMemo(
     () => ui.pinnedFilters?.[filterModeToConfigKey(currentFilter.mode)] ?? [],
@@ -517,7 +530,10 @@ export const EditFilterDialog: React.FC<IEditFilterProps> = ({
       <Modal
         show={!showSaveDialog && !showLoadDialog}
         onHide={() => onCancel()}
-        className="edit-filter-dialog"
+        // need sfw mode class because dialog is outside body
+        className={cx("edit-filter-dialog", {
+          "sfw-content-mode": sfwContentMode,
+        })}
       >
         <Modal.Header>
           <div>
diff --git a/ui/v2.5/src/components/List/FilterTags.tsx b/ui/v2.5/src/components/List/FilterTags.tsx
index 0e4259838..5597cae79 100644
--- a/ui/v2.5/src/components/List/FilterTags.tsx
+++ b/ui/v2.5/src/components/List/FilterTags.tsx
@@ -14,6 +14,7 @@ import { BsPrefixProps, ReplaceProps } from "react-bootstrap/esm/helpers";
 import { CustomFieldsCriterion } from "src/models/list-filter/criteria/custom-fields";
 import { useDebounce } from "src/hooks/debounce";
 import cx from "classnames";
+import { useConfigurationContext } from "src/hooks/Config";
 
 type TagItemProps = PropsWithChildren<
   ReplaceProps<"span", BsPrefixProps<"span"> & BadgeProps>
@@ -125,6 +126,9 @@ export const FilterTags: React.FC<IFilterTagsProps> = ({
   const intl = useIntl();
   const ref = useRef<HTMLDivElement>(null);
 
+  const { configuration } = useConfigurationContext();
+  const { sfwContentMode } = configuration.interface;
+
   const [cutoff, setCutoff] = React.useState<number | undefined>();
   const elementGap = 10; // Adjust this value based on your CSS gap or margin
   const moreTagWidth = 80; // reserve space for the "more" tag
@@ -270,7 +274,7 @@ export const FilterTags: React.FC<IFilterTagsProps> = ({
     return (
       <FilterTag
         key={criterion.getId()}
-        label={criterion.getLabel(intl)}
+        label={criterion.getLabel(intl, sfwContentMode)}
         onClick={() => onClickCriterionTag(criterion)}
         onRemove={($event) => onRemoveCriterionTag(criterion, $event)}
       />
diff --git a/ui/v2.5/src/components/List/Filters/PathFilter.tsx b/ui/v2.5/src/components/List/Filters/PathFilter.tsx
index 97711ebef..ac44302c5 100644
--- a/ui/v2.5/src/components/List/Filters/PathFilter.tsx
+++ b/ui/v2.5/src/components/List/Filters/PathFilter.tsx
@@ -2,7 +2,7 @@ import React from "react";
 import { Form } from "react-bootstrap";
 import { FolderSelect } from "src/components/Shared/FolderSelect/FolderSelect";
 import { CriterionModifier } from "src/core/generated-graphql";
-import { ConfigurationContext } from "src/hooks/Config";
+import { useConfigurationContext } from "src/hooks/Config";
 import {
   ModifierCriterion,
   CriterionValue,
@@ -17,7 +17,7 @@ export const PathFilter: React.FC<IInputFilterProps> = ({
   criterion,
   onValueChanged,
 }) => {
-  const { configuration } = React.useContext(ConfigurationContext);
+  const { configuration } = useConfigurationContext();
   const libraryPaths = configuration?.general.stashes.map((s) => s.path);
 
   // don't show folder select for regex
diff --git a/ui/v2.5/src/components/List/Filters/RatingFilter.tsx b/ui/v2.5/src/components/List/Filters/RatingFilter.tsx
index 1a0f14452..9f5c8f8c9 100644
--- a/ui/v2.5/src/components/List/Filters/RatingFilter.tsx
+++ b/ui/v2.5/src/components/List/Filters/RatingFilter.tsx
@@ -12,7 +12,7 @@ import {
   defaultRatingStarPrecision,
   defaultRatingSystemOptions,
 } from "src/utils/rating";
-import { ConfigurationContext } from "src/hooks/Config";
+import { useConfigurationContext } from "src/hooks/Config";
 import { RatingCriterion } from "src/models/list-filter/criteria/rating";
 import { ListFilterModel } from "src/models/list-filter/filter";
 import { Option, SidebarListFilter } from "./SidebarListFilter";
@@ -117,7 +117,7 @@ export const SidebarRatingFilter: React.FC<ISidebarFilter> = ({
     [noneLabel]
   );
 
-  const { configuration: config } = React.useContext(ConfigurationContext);
+  const { configuration: config } = useConfigurationContext();
   const ratingSystemOptions =
     config?.ui.ratingSystemOptions ?? defaultRatingSystemOptions;
 
diff --git a/ui/v2.5/src/components/List/ItemList.tsx b/ui/v2.5/src/components/List/ItemList.tsx
index 4ffeff766..f1d811ff2 100644
--- a/ui/v2.5/src/components/List/ItemList.tsx
+++ b/ui/v2.5/src/components/List/ItemList.tsx
@@ -1,7 +1,6 @@
 import React, {
   PropsWithChildren,
   useCallback,
-  useContext,
   useEffect,
   useMemo,
   useState,
@@ -43,7 +42,7 @@ import {
   IItemListOperation,
 } from "./FilteredListToolbar";
 import { PagedList } from "./PagedList";
-import { ConfigurationContext } from "src/hooks/Config";
+import { useConfigurationContext } from "src/hooks/Config";
 
 interface IFilteredItemList<T extends QueryResult, E extends IHasID = IHasID> {
   filterStateProps: IFilterStateHook;
@@ -55,7 +54,7 @@ export function useFilteredItemList<
   T extends QueryResult,
   E extends IHasID = IHasID
 >(props: IFilteredItemList<T, E>) {
-  const { configuration: config } = useContext(ConfigurationContext);
+  const { configuration: config } = useConfigurationContext();
 
   // States
   const filterState = useFilterState({
@@ -393,7 +392,7 @@ export const ItemListContext = <T extends QueryResult, E extends IHasID>(
     children,
   } = props;
 
-  const { configuration: config } = useContext(ConfigurationContext);
+  const { configuration: config } = useConfigurationContext();
 
   const emptyFilter = useMemo(
     () =>
@@ -409,12 +408,7 @@ export const ItemListContext = <T extends QueryResult, E extends IHasID>(
       new ListFilterModel(filterMode, config, { defaultSortBy: defaultSort })
   );
 
-  const { defaultFilter, loading: defaultFilterLoading } = useDefaultFilter(
-    emptyFilter,
-    view
-  );
-
-  if (defaultFilterLoading) return null;
+  const { defaultFilter } = useDefaultFilter(emptyFilter, view);
 
   return (
     <FilterContext filter={filter} setFilter={setFilterState}>
diff --git a/ui/v2.5/src/components/List/ListFilter.tsx b/ui/v2.5/src/components/List/ListFilter.tsx
index 407a6ea62..b40951081 100644
--- a/ui/v2.5/src/components/List/ListFilter.tsx
+++ b/ui/v2.5/src/components/List/ListFilter.tsx
@@ -37,6 +37,7 @@ import { View } from "./views";
 import { ClearableInput } from "../Shared/ClearableInput";
 import { useStopWheelScroll } from "src/utils/form";
 import { ISortByOption } from "src/models/list-filter/filter-options";
+import { useConfigurationContext } from "src/hooks/Config";
 
 export function useDebouncedSearchInput(
   filter: ListFilterModel,
@@ -249,14 +250,24 @@ export const SortBySelect: React.FC<{
   onReshuffleRandomSort,
 }) => {
   const intl = useIntl();
+  const { configuration } = useConfigurationContext();
+  const { sfwContentMode } = configuration.interface;
 
   const currentSortBy = options.find((o) => o.value === sortBy);
+  const currentSortByMessageID = currentSortBy
+    ? !sfwContentMode
+      ? currentSortBy.messageID
+      : currentSortBy.sfwMessageID ?? currentSortBy.messageID
+    : "";
 
   function renderSortByOptions() {
     return options
       .map((o) => {
+        const messageID = !sfwContentMode
+          ? o.messageID
+          : o.sfwMessageID ?? o.messageID;
         return {
-          message: intl.formatMessage({ id: o.messageID }),
+          message: intl.formatMessage({ id: messageID }),
           value: o.value,
         };
       })
@@ -267,6 +278,7 @@ export const SortBySelect: React.FC<{
           key={option.value}
           className="bg-secondary text-white"
           eventKey={option.value}
+          data-value={option.value}
         >
           {option.message}
         </Dropdown.Item>
@@ -274,11 +286,11 @@ export const SortBySelect: React.FC<{
   }
 
   return (
-    <Dropdown as={ButtonGroup} className={className}>
+    <Dropdown as={ButtonGroup} className={`${className ?? ""} sort-by-select`}>
       <InputGroup.Prepend>
         <Dropdown.Toggle variant="secondary">
           {currentSortBy
-            ? intl.formatMessage({ id: currentSortBy.messageID })
+            ? intl.formatMessage({ id: currentSortByMessageID })
             : ""}
         </Dropdown.Toggle>
       </InputGroup.Prepend>
diff --git a/ui/v2.5/src/components/List/util.ts b/ui/v2.5/src/components/List/util.ts
index b9cb125f4..c15c3335a 100644
--- a/ui/v2.5/src/components/List/util.ts
+++ b/ui/v2.5/src/components/List/util.ts
@@ -1,11 +1,11 @@
-import { useCallback, useContext, useEffect, useMemo, useState } from "react";
+import { useCallback, useEffect, useMemo, useState } from "react";
 import Mousetrap from "mousetrap";
 import { ListFilterModel } from "src/models/list-filter/filter";
 import { useHistory, useLocation } from "react-router-dom";
 import { isEqual, isFunction } from "lodash-es";
 import { QueryResult } from "@apollo/client";
 import { IHasID } from "src/utils/data";
-import { ConfigurationContext } from "src/hooks/Config";
+import { useConfigurationContext } from "src/hooks/Config";
 import { View } from "./views";
 import { usePrevious } from "src/hooks/state";
 import * as GQL from "src/core/generated-graphql";
@@ -94,7 +94,7 @@ export function useFilterURL(
 }
 
 export function useDefaultFilter(emptyFilter: ListFilterModel, view?: View) {
-  const { configuration: config, loading } = useContext(ConfigurationContext);
+  const { configuration: config } = useConfigurationContext();
 
   const defaultFilter = useMemo(() => {
     if (view && config?.ui.defaultFilters?.[view]) {
@@ -114,9 +114,9 @@ export function useDefaultFilter(emptyFilter: ListFilterModel, view?: View) {
     }
   }, [view, config?.ui.defaultFilters, emptyFilter]);
 
-  const retFilter = loading ? undefined : defaultFilter ?? emptyFilter;
+  const retFilter = defaultFilter ?? emptyFilter;
 
-  return { defaultFilter: retFilter, loading };
+  return { defaultFilter: retFilter };
 }
 
 function useEmptyFilter(props: {
@@ -158,14 +158,14 @@ export function useFilterState(
 
   const emptyFilter = useEmptyFilter({ filterMode, defaultSort, config });
 
-  const { defaultFilter, loading } = useDefaultFilter(emptyFilter, view);
+  const { defaultFilter } = useDefaultFilter(emptyFilter, view);
 
   const { setFilter } = useFilterURL(filter, setFilterState, {
     defaultFilter,
     active: useURL,
   });
 
-  return { loading, filter, setFilter };
+  return { filter, setFilter };
 }
 
 export function useFilterOperations(props: {
diff --git a/ui/v2.5/src/components/MainNavbar.tsx b/ui/v2.5/src/components/MainNavbar.tsx
index 59f8e51aa..caee46f0c 100644
--- a/ui/v2.5/src/components/MainNavbar.tsx
+++ b/ui/v2.5/src/components/MainNavbar.tsx
@@ -11,7 +11,7 @@ import {
   MessageDescriptor,
   useIntl,
 } from "react-intl";
-import { Nav, Navbar, Button, Fade } from "react-bootstrap";
+import { Nav, Navbar, Button } from "react-bootstrap";
 import { IconDefinition } from "@fortawesome/fontawesome-svg-core";
 import { LinkContainer } from "react-router-bootstrap";
 import { Link, NavLink, useLocation, useHistory } from "react-router-dom";
@@ -19,7 +19,7 @@ import Mousetrap from "mousetrap";
 
 import SessionUtils from "src/utils/session";
 import { Icon } from "src/components/Shared/Icon";
-import { ConfigurationContext } from "src/hooks/Config";
+import { useConfigurationContext } from "src/hooks/Config";
 import { ManualStateContext } from "./Help/context";
 import { SettingsButton } from "./SettingsButton";
 import {
@@ -181,7 +181,7 @@ const MainNavbarUtilityItems = PatchComponent(
 export const MainNavbar: React.FC = () => {
   const history = useHistory();
   const location = useLocation();
-  const { configuration, loading } = React.useContext(ConfigurationContext);
+  const { configuration } = useConfigurationContext();
   const { openManual } = React.useContext(ManualStateContext);
 
   const [expanded, setExpanded] = useState(false);
@@ -359,35 +359,31 @@ export const MainNavbar: React.FC = () => {
         ref={navbarRef}
       >
         <Navbar.Collapse className="bg-dark order-sm-1">
-          <Fade in={!loading}>
-            <>
-              <MainNavbarMenuItems>
-                {menuItems.map(({ href, icon, message }) => (
-                  <Nav.Link
-                    eventKey={href}
-                    as="div"
-                    key={href}
-                    className="col-4 col-sm-3 col-md-2 col-lg-auto"
-                  >
-                    <LinkContainer activeClassName="active" exact to={href}>
-                      <Button className="minimal p-4 p-xl-2 d-flex d-xl-inline-block flex-column justify-content-between align-items-center">
-                        <Icon
-                          {...{ icon }}
-                          className="nav-menu-icon d-block d-xl-inline mb-2 mb-xl-0"
-                        />
-                        <span>{intl.formatMessage(message)}</span>
-                      </Button>
-                    </LinkContainer>
-                  </Nav.Link>
-                ))}
-              </MainNavbarMenuItems>
-              <Nav>
-                <MainNavbarUtilityItems>
-                  {renderUtilityButtons()}
-                </MainNavbarUtilityItems>
-              </Nav>
-            </>
-          </Fade>
+          <MainNavbarMenuItems>
+            {menuItems.map(({ href, icon, message }) => (
+              <Nav.Link
+                eventKey={href}
+                as="div"
+                key={href}
+                className="col-4 col-sm-3 col-md-2 col-lg-auto"
+              >
+                <LinkContainer activeClassName="active" exact to={href}>
+                  <Button className="minimal p-4 p-xl-2 d-flex d-xl-inline-block flex-column justify-content-between align-items-center">
+                    <Icon
+                      {...{ icon }}
+                      className="nav-menu-icon d-block d-xl-inline mb-2 mb-xl-0"
+                    />
+                    <span>{intl.formatMessage(message)}</span>
+                  </Button>
+                </LinkContainer>
+              </Nav.Link>
+            ))}
+          </MainNavbarMenuItems>
+          <Nav>
+            <MainNavbarUtilityItems>
+              {renderUtilityButtons()}
+            </MainNavbarUtilityItems>
+          </Nav>
         </Navbar.Collapse>
 
         <Navbar.Brand as="div" onClick={handleDismiss}>
diff --git a/ui/v2.5/src/components/Performers/EditPerformersDialog.tsx b/ui/v2.5/src/components/Performers/EditPerformersDialog.tsx
index 71fcbedd9..677ac3aa1 100644
--- a/ui/v2.5/src/components/Performers/EditPerformersDialog.tsx
+++ b/ui/v2.5/src/components/Performers/EditPerformersDialog.tsx
@@ -27,6 +27,8 @@ import { BulkUpdateTextInput } from "../Shared/BulkUpdateTextInput";
 import { faPencilAlt } from "@fortawesome/free-solid-svg-icons";
 import * as FormUtils from "src/utils/form";
 import { CountrySelect } from "../Shared/CountrySelect";
+import { useConfigurationContext } from "src/hooks/Config";
+import cx from "classnames";
 
 interface IListOperationProps {
   selected: GQL.SlimPerformerDataFragment[];
@@ -61,6 +63,10 @@ export const EditPerformersDialog: React.FC<IListOperationProps> = (
 ) => {
   const intl = useIntl();
   const Toast = useToast();
+
+  const { configuration } = useConfigurationContext();
+  const { sfwContentMode } = configuration.interface;
+
   const [tagIds, setTagIds] = useState<GQL.BulkUpdateIds>({
     mode: GQL.BulkUpdateIdMode.Add,
   });
@@ -204,7 +210,7 @@ export const EditPerformersDialog: React.FC<IListOperationProps> = (
     setter: (newValue: string | undefined) => void
   ) {
     return (
-      <Form.Group controlId={name}>
+      <Form.Group controlId={name} data-field={name}>
         <Form.Label>
           <FormattedMessage id={name} />
         </Form.Label>
@@ -218,9 +224,13 @@ export const EditPerformersDialog: React.FC<IListOperationProps> = (
   }
 
   function render() {
+    // sfw class needs to be set because it is outside body
+
     return (
       <ModalComponent
-        dialogClassName="edit-performers-dialog"
+        dialogClassName={cx("edit-performers-dialog", {
+          "sfw-content-mode": sfwContentMode,
+        })}
         show
         icon={faPencilAlt}
         header={intl.formatMessage(
@@ -238,7 +248,7 @@ export const EditPerformersDialog: React.FC<IListOperationProps> = (
         }}
         isRunning={isUpdating}
       >
-        <Form.Group controlId="rating" as={Row}>
+        <Form.Group controlId="rating" as={Row} data-field={name}>
           {FormUtils.renderLabel({
             title: intl.formatMessage({ id: "rating" }),
           })}
@@ -322,7 +332,7 @@ export const EditPerformersDialog: React.FC<IListOperationProps> = (
             setPenisLength(v)
           )}
 
-          <Form.Group>
+          <Form.Group data-field="circumcised">
             <Form.Label>
               <FormattedMessage id="circumcised" />
             </Form.Label>
diff --git a/ui/v2.5/src/components/Performers/PerformerCard.tsx b/ui/v2.5/src/components/Performers/PerformerCard.tsx
index 02c304547..5f7a26d42 100644
--- a/ui/v2.5/src/components/Performers/PerformerCard.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerCard.tsx
@@ -6,7 +6,6 @@ import NavUtils from "src/utils/navigation";
 import TextUtils from "src/utils/text";
 import { GridCard } from "../Shared/GridCard/GridCard";
 import { CountryFlag } from "../Shared/CountryFlag";
-import { SweatDrops } from "../Shared/SweatDrops";
 import { HoverPopover } from "../Shared/HoverPopover";
 import { Icon } from "../Shared/Icon";
 import { TagLink } from "../Shared/TagLink";
@@ -25,7 +24,8 @@ import { ILabeledId } from "src/models/list-filter/types";
 import { FavoriteIcon } from "../Shared/FavoriteIcon";
 import { PatchComponent } from "src/patch";
 import { ExternalLinksButton } from "../Shared/ExternalLinksButton";
-import { ConfigurationContext } from "src/hooks/Config";
+import { useConfigurationContext } from "src/hooks/Config";
+import { OCounterButton } from "../Shared/CountButton";
 
 export interface IPerformerCardExtraCriteria {
   scenes?: ModifierCriterion<CriterionValue>[];
@@ -103,16 +103,7 @@ const PerformerCardPopovers: React.FC<IPerformerCardProps> = PatchComponent(
     function maybeRenderOCounter() {
       if (!performer.o_counter) return;
 
-      return (
-        <div className="o-counter">
-          <Button className="minimal">
-            <span className="fa-icon">
-              <SweatDrops />
-            </span>
-            <span>{performer.o_counter}</span>
-          </Button>
-        </div>
-      );
+      return <OCounterButton value={performer.o_counter} />;
     }
 
     function maybeRenderTagPopoverButton() {
@@ -179,7 +170,7 @@ const PerformerCardPopovers: React.FC<IPerformerCardProps> = PatchComponent(
 const PerformerCardOverlays: React.FC<IPerformerCardProps> = PatchComponent(
   "PerformerCard.Overlays",
   ({ performer }) => {
-    const { configuration } = React.useContext(ConfigurationContext);
+    const { configuration } = useConfigurationContext();
     const uiConfig = configuration?.ui;
     const [updatePerformer] = usePerformerUpdate();
 
diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/Performer.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/Performer.tsx
index 0a1535068..dd72d0025 100644
--- a/ui/v2.5/src/components/Performers/PerformerDetails/Performer.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerDetails/Performer.tsx
@@ -16,7 +16,7 @@ import { DetailsEditNavbar } from "src/components/Shared/DetailsEditNavbar";
 import { ErrorMessage } from "src/components/Shared/ErrorMessage";
 import { LoadingIndicator } from "src/components/Shared/LoadingIndicator";
 import { useToast } from "src/hooks/Toast";
-import { ConfigurationContext } from "src/hooks/Config";
+import { useConfigurationContext } from "src/hooks/Config";
 import { RatingSystem } from "src/components/Shared/Rating/RatingSystem";
 import {
   CompressedPerformerDetailsPanel,
@@ -42,13 +42,13 @@ import {
 import { DetailTitle } from "src/components/Shared/DetailsPage/DetailTitle";
 import { ExpandCollapseButton } from "src/components/Shared/CollapseButton";
 import { FavoriteIcon } from "src/components/Shared/FavoriteIcon";
-import { SweatDrops } from "src/components/Shared/SweatDrops";
 import { AliasList } from "src/components/Shared/DetailsPage/AliasList";
 import { HeaderImage } from "src/components/Shared/DetailsPage/HeaderImage";
 import { LightboxLink } from "src/hooks/Lightbox/LightboxLink";
 import { PatchComponent } from "src/patch";
 import { ILightboxImage } from "src/hooks/Lightbox/types";
 import { goBackOrReplace } from "src/utils/history";
+import { OCounterButton } from "src/components/Shared/CountButton";
 
 interface IProps {
   performer: GQL.PerformerDataFragment;
@@ -240,7 +240,7 @@ const PerformerPage: React.FC<IProps> = PatchComponent(
     const intl = useIntl();
 
     // Configuration settings
-    const { configuration } = React.useContext(ConfigurationContext);
+    const { configuration } = useConfigurationContext();
     const uiConfig = configuration?.ui;
     const abbreviateCounter = uiConfig?.abbreviateCounters ?? false;
     const enableBackgroundImage =
@@ -432,12 +432,7 @@ const PerformerPage: React.FC<IProps> = PatchComponent(
                     withoutContext
                   />
                   {!!performer.o_counter && (
-                    <span className="o-counter">
-                      <span className="fa-icon">
-                        <SweatDrops />
-                      </span>
-                      <span>{performer.o_counter}</span>
-                    </span>
+                    <OCounterButton value={performer.o_counter} />
                   )}
                 </div>
                 {!isEditing && (
diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
index a3f128fee..597cbad1c 100644
--- a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
@@ -30,7 +30,7 @@ import {
   stringCircumMap,
   stringToCircumcised,
 } from "src/utils/circumcised";
-import { ConfigurationContext } from "src/hooks/Config";
+import { useConfigurationContext } from "src/hooks/Config";
 import { PerformerScrapeDialog } from "./PerformerScrapeDialog";
 import PerformerScrapeModal from "./PerformerScrapeModal";
 import PerformerStashBoxModal, { IStashBox } from "./PerformerStashBoxModal";
@@ -97,7 +97,7 @@ export const PerformerEditPanel: React.FC<IPerformerDetails> = ({
 
   const [scrapedPerformer, setScrapedPerformer] =
     useState<GQL.ScrapedPerformer>();
-  const { configuration: stashConfig } = React.useContext(ConfigurationContext);
+  const { configuration: stashConfig } = useConfigurationContext();
 
   const intl = useIntl();
 
diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerScrapeDialog.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerScrapeDialog.tsx
index 0398f1eec..ad7e44d6d 100644
--- a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerScrapeDialog.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerScrapeDialog.tsx
@@ -63,6 +63,7 @@ function renderScrapedGenderRow(
 ) {
   return (
     <ScrapeDialogRow
+      field="gender"
       title={title}
       result={result}
       renderOriginalField={() => renderScrapedGender(result)}
@@ -113,6 +114,7 @@ function renderScrapedCircumcisedRow(
   return (
     <ScrapeDialogRow
       title={title}
+      field="circumcised"
       result={result}
       renderOriginalField={() => renderScrapedCircumcised(result)}
       renderNewField={() =>
@@ -401,16 +403,19 @@ export const PerformerScrapeDialog: React.FC<IPerformerScrapeDialogProps> = (
     return (
       <>
         <ScrapedInputGroupRow
+          field="name"
           title={intl.formatMessage({ id: "name" })}
           result={name}
           onChange={(value) => setName(value)}
         />
         <ScrapedInputGroupRow
+          field="disambiguation"
           title={intl.formatMessage({ id: "disambiguation" })}
           result={disambiguation}
           onChange={(value) => setDisambiguation(value)}
         />
         <ScrapedTextAreaRow
+          field="aliases"
           title={intl.formatMessage({ id: "aliases" })}
           result={aliases}
           onChange={(value) => setAliases(value)}
@@ -421,46 +426,55 @@ export const PerformerScrapeDialog: React.FC<IPerformerScrapeDialogProps> = (
           (value) => setGender(value)
         )}
         <ScrapedInputGroupRow
+          field="birthdate"
           title={intl.formatMessage({ id: "birthdate" })}
           result={birthdate}
           onChange={(value) => setBirthdate(value)}
         />
         <ScrapedInputGroupRow
+          field="death_date"
           title={intl.formatMessage({ id: "death_date" })}
           result={deathDate}
           onChange={(value) => setDeathDate(value)}
         />
         <ScrapedInputGroupRow
+          field="ethnicity"
           title={intl.formatMessage({ id: "ethnicity" })}
           result={ethnicity}
           onChange={(value) => setEthnicity(value)}
         />
         <ScrapedCountryRow
+          field="country"
           title={intl.formatMessage({ id: "country" })}
           result={country}
           onChange={(value) => setCountry(value)}
         />
         <ScrapedInputGroupRow
+          field="hair_color"
           title={intl.formatMessage({ id: "hair_color" })}
           result={hairColor}
           onChange={(value) => setHairColor(value)}
         />
         <ScrapedInputGroupRow
+          field="eye_color"
           title={intl.formatMessage({ id: "eye_color" })}
           result={eyeColor}
           onChange={(value) => setEyeColor(value)}
         />
         <ScrapedInputGroupRow
+          field="weight"
           title={intl.formatMessage({ id: "weight" })}
           result={weight}
           onChange={(value) => setWeight(value)}
         />
         <ScrapedInputGroupRow
+          field="height"
           title={intl.formatMessage({ id: "height" })}
           result={height}
           onChange={(value) => setHeight(value)}
         />
         <ScrapedInputGroupRow
+          field="penis_length"
           title={intl.formatMessage({ id: "penis_length" })}
           result={penisLength}
           onChange={(value) => setPenisLength(value)}
@@ -471,42 +485,50 @@ export const PerformerScrapeDialog: React.FC<IPerformerScrapeDialogProps> = (
           (value) => setCircumcised(value)
         )}
         <ScrapedInputGroupRow
+          field="measurements"
           title={intl.formatMessage({ id: "measurements" })}
           result={measurements}
           onChange={(value) => setMeasurements(value)}
         />
         <ScrapedInputGroupRow
+          field="fake_tits"
           title={intl.formatMessage({ id: "fake_tits" })}
           result={fakeTits}
           onChange={(value) => setFakeTits(value)}
         />
         <ScrapedInputGroupRow
+          field="career_length"
           title={intl.formatMessage({ id: "career_length" })}
           result={careerLength}
           onChange={(value) => setCareerLength(value)}
         />
         <ScrapedTextAreaRow
+          field="tattoos"
           title={intl.formatMessage({ id: "tattoos" })}
           result={tattoos}
           onChange={(value) => setTattoos(value)}
         />
         <ScrapedTextAreaRow
+          field="piercings"
           title={intl.formatMessage({ id: "piercings" })}
           result={piercings}
           onChange={(value) => setPiercings(value)}
         />
         <ScrapedStringListRow
+          field="urls"
           title={intl.formatMessage({ id: "urls" })}
           result={urls}
           onChange={(value) => setURLs(value)}
         />
         <ScrapedTextAreaRow
+          field="details"
           title={intl.formatMessage({ id: "details" })}
           result={details}
           onChange={(value) => setDetails(value)}
         />
         {scrapedTagsRow}
         <ScrapedImagesRow
+          field="image"
           title={intl.formatMessage({ id: "performer_image" })}
           className="performer-image"
           result={image}
@@ -514,6 +536,7 @@ export const PerformerScrapeDialog: React.FC<IPerformerScrapeDialogProps> = (
           onChange={(value) => setImage(value)}
         />
         <ScrapedInputGroupRow
+          field="remote_site_id"
           title={intl.formatMessage({ id: "stash_id" })}
           result={remoteSiteID}
           locked
diff --git a/ui/v2.5/src/components/Performers/PerformerPopover.tsx b/ui/v2.5/src/components/Performers/PerformerPopover.tsx
index fa5b60e69..04cbf8e87 100644
--- a/ui/v2.5/src/components/Performers/PerformerPopover.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerPopover.tsx
@@ -4,7 +4,7 @@ import { LoadingIndicator } from "../Shared/LoadingIndicator";
 import { HoverPopover } from "../Shared/HoverPopover";
 import { useFindPerformer } from "../../core/StashService";
 import { PerformerCard } from "./PerformerCard";
-import { ConfigurationContext } from "../../hooks/Config";
+import { useConfigurationContext } from "../../hooks/Config";
 import { Placement } from "react-bootstrap/esm/Overlay";
 
 interface IPeromerPopoverCardProps {
@@ -49,7 +49,7 @@ export const PerformerPopover: React.FC<IPeroformerPopoverProps> = ({
   placement = "top",
   target,
 }) => {
-  const { configuration: config } = React.useContext(ConfigurationContext);
+  const { configuration: config } = useConfigurationContext();
 
   const showPerformerCardOnHover = config?.ui.showTagCardOnHover ?? true;
 
diff --git a/ui/v2.5/src/components/Performers/PerformerSelect.tsx b/ui/v2.5/src/components/Performers/PerformerSelect.tsx
index ed7b7b303..f10519897 100644
--- a/ui/v2.5/src/components/Performers/PerformerSelect.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerSelect.tsx
@@ -13,7 +13,7 @@ import {
   queryFindPerformersByIDForSelect,
   queryFindPerformersForSelect,
 } from "src/core/StashService";
-import { ConfigurationContext } from "src/hooks/Config";
+import { useConfigurationContext } from "src/hooks/Config";
 import { useIntl } from "react-intl";
 import { defaultMaxOptionsShown } from "src/core/config";
 import { ListFilterModel } from "src/models/list-filter/filter";
@@ -82,7 +82,7 @@ const _PerformerSelect: React.FC<
 > = (props) => {
   const [createPerformer] = usePerformerCreate();
 
-  const { configuration } = React.useContext(ConfigurationContext);
+  const { configuration } = useConfigurationContext();
   const intl = useIntl();
   const maxOptionsShown =
     configuration?.ui.maxOptionsShown ?? defaultMaxOptionsShown;
diff --git a/ui/v2.5/src/components/ScenePlayer/ScenePlayer.tsx b/ui/v2.5/src/components/ScenePlayer/ScenePlayer.tsx
index 4440f80df..e07c0091d 100644
--- a/ui/v2.5/src/components/ScenePlayer/ScenePlayer.tsx
+++ b/ui/v2.5/src/components/ScenePlayer/ScenePlayer.tsx
@@ -1,7 +1,6 @@
 import React, {
   KeyboardEvent,
   useCallback,
-  useContext,
   useEffect,
   useMemo,
   useRef,
@@ -31,7 +30,7 @@ import {
 
 import * as GQL from "src/core/generated-graphql";
 import { ScenePlayerScrubber } from "./ScenePlayerScrubber";
-import { ConfigurationContext } from "src/hooks/Config";
+import { useConfigurationContext } from "src/hooks/Config";
 import {
   ConnectionState,
   InteractiveContext,
@@ -240,7 +239,7 @@ export const ScenePlayer: React.FC<IScenePlayerProps> = PatchComponent(
     onNext,
     onPrevious,
   }) => {
-    const { configuration } = useContext(ConfigurationContext);
+    const { configuration } = useConfigurationContext();
     const interfaceConfig = configuration?.interface;
     const uiConfig = configuration?.ui;
     const videoRef = useRef<HTMLDivElement>(null);
diff --git a/ui/v2.5/src/components/Scenes/DeleteScenesDialog.tsx b/ui/v2.5/src/components/Scenes/DeleteScenesDialog.tsx
index 88f133a80..3cf9b7ecf 100644
--- a/ui/v2.5/src/components/Scenes/DeleteScenesDialog.tsx
+++ b/ui/v2.5/src/components/Scenes/DeleteScenesDialog.tsx
@@ -4,7 +4,7 @@ import { useScenesDestroy } from "src/core/StashService";
 import * as GQL from "src/core/generated-graphql";
 import { ModalComponent } from "src/components/Shared/Modal";
 import { useToast } from "src/hooks/Toast";
-import { ConfigurationContext } from "src/hooks/Config";
+import { useConfigurationContext } from "src/hooks/Config";
 import { FormattedMessage, useIntl } from "react-intl";
 import { faTrashAlt } from "@fortawesome/free-solid-svg-icons";
 import { objectPath } from "src/core/files";
@@ -34,7 +34,7 @@ export const DeleteScenesDialog: React.FC<IDeleteSceneDialogProps> = (
     { count: props.selected.length, singularEntity, pluralEntity }
   );
 
-  const { configuration: config } = React.useContext(ConfigurationContext);
+  const { configuration: config } = useConfigurationContext();
 
   const [deleteFile, setDeleteFile] = useState<boolean>(
     config?.defaults.deleteFile ?? false
diff --git a/ui/v2.5/src/components/Scenes/SceneCard.tsx b/ui/v2.5/src/components/Scenes/SceneCard.tsx
index 99b910f67..2cb4a9af3 100644
--- a/ui/v2.5/src/components/Scenes/SceneCard.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneCard.tsx
@@ -6,12 +6,11 @@ import * as GQL from "src/core/generated-graphql";
 import { Icon } from "../Shared/Icon";
 import { GalleryLink, TagLink, SceneMarkerLink } from "../Shared/TagLink";
 import { HoverPopover } from "../Shared/HoverPopover";
-import { SweatDrops } from "../Shared/SweatDrops";
 import { TruncatedText } from "../Shared/TruncatedText";
 import NavUtils from "src/utils/navigation";
 import TextUtils from "src/utils/text";
 import { SceneQueue } from "src/models/sceneQueue";
-import { ConfigurationContext } from "src/hooks/Config";
+import { useConfigurationContext } from "src/hooks/Config";
 import { PerformerPopoverButton } from "../Shared/PerformerPopoverButton";
 import { GridCard } from "../Shared/GridCard/GridCard";
 import { RatingBanner } from "../Shared/RatingBanner";
@@ -30,6 +29,7 @@ import { PatchComponent } from "src/patch";
 import { StudioOverlay } from "../Shared/GridCard/StudioOverlay";
 import { GroupTag } from "../Groups/GroupTag";
 import { FileSize } from "../Shared/FileSize";
+import { OCounterButton } from "../Shared/CountButton";
 
 interface IScenePreviewProps {
   isPortrait: boolean;
@@ -218,16 +218,7 @@ const SceneCardPopovers = PatchComponent(
 
     function maybeRenderOCounter() {
       if (props.scene.o_counter) {
-        return (
-          <div className="o-count">
-            <Button className="minimal">
-              <span className="fa-icon">
-                <SweatDrops />
-              </span>
-              <span>{props.scene.o_counter}</span>
-            </Button>
-          </div>
-        );
+        return <OCounterButton value={props.scene.o_counter} />;
       }
     }
 
@@ -353,7 +344,7 @@ const SceneCardImage = PatchComponent(
   "SceneCard.Image",
   (props: ISceneCardProps) => {
     const history = useHistory();
-    const { configuration } = React.useContext(ConfigurationContext);
+    const { configuration } = useConfigurationContext();
     const cont = configuration?.interface.continuePlaylistDefault ?? false;
 
     const file = useMemo(
@@ -437,7 +428,7 @@ const SceneCardImage = PatchComponent(
 export const SceneCard = PatchComponent(
   "SceneCard",
   (props: ISceneCardProps) => {
-    const { configuration } = React.useContext(ConfigurationContext);
+    const { configuration } = useConfigurationContext();
 
     const file = useMemo(
       () => (props.scene.files.length > 0 ? props.scene.files[0] : undefined),
diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/OCounterButton.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/OCounterButton.tsx
index 8fdb7dfd7..d8963df4d 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/OCounterButton.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/OCounterButton.tsx
@@ -1,10 +1,11 @@
-import { faBan, faMinus } from "@fortawesome/free-solid-svg-icons";
+import { faBan, faMinus, faThumbsUp } from "@fortawesome/free-solid-svg-icons";
 import React, { useState } from "react";
 import { Button, ButtonGroup, Dropdown, DropdownButton } from "react-bootstrap";
 import { useIntl } from "react-intl";
 import { Icon } from "src/components/Shared/Icon";
 import { LoadingIndicator } from "src/components/Shared/LoadingIndicator";
 import { SweatDrops } from "src/components/Shared/SweatDrops";
+import { useConfigurationContext } from "src/hooks/Config";
 
 export interface IOCounterButtonProps {
   value: number;
@@ -17,6 +18,12 @@ export const OCounterButton: React.FC<IOCounterButtonProps> = (
   props: IOCounterButtonProps
 ) => {
   const intl = useIntl();
+  const { configuration } = useConfigurationContext();
+  const { sfwContentMode } = configuration.interface;
+
+  const icon = !sfwContentMode ? <SweatDrops /> : <Icon icon={faThumbsUp} />;
+  const messageID = !sfwContentMode ? "o_count" : "o_count_sfw";
+
   const [loading, setLoading] = useState(false);
 
   async function increment() {
@@ -44,9 +51,9 @@ export const OCounterButton: React.FC<IOCounterButtonProps> = (
       className="minimal pr-1"
       onClick={increment}
       variant="secondary"
-      title={intl.formatMessage({ id: "o_counter" })}
+      title={intl.formatMessage({ id: messageID })}
     >
-      <SweatDrops />
+      {icon}
       <span className="ml-2">{props.value}</span>
     </Button>
   );
diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx
index f7e844392..aee6ab344 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx
@@ -3,7 +3,6 @@ import React, {
   useEffect,
   useState,
   useMemo,
-  useContext,
   useRef,
   useLayoutEffect,
 } from "react";
@@ -32,7 +31,7 @@ import SceneQueue, { QueuedScene } from "src/models/sceneQueue";
 import { ListFilterModel } from "src/models/list-filter/filter";
 import Mousetrap from "mousetrap";
 import { OrganizedButton } from "./OrganizedButton";
-import { ConfigurationContext } from "src/hooks/Config";
+import { useConfigurationContext } from "src/hooks/Config";
 import { getPlayerPosition } from "src/components/ScenePlayer/util";
 import {
   faEllipsisV,
@@ -184,7 +183,7 @@ const ScenePage: React.FC<IProps> = PatchComponent("ScenePage", (props) => {
   const intl = useIntl();
   const [updateScene] = useSceneUpdate();
   const [generateScreenshot] = useSceneGenerateScreenshot();
-  const { configuration } = useContext(ConfigurationContext);
+  const { configuration } = useConfigurationContext();
 
   const [showDraftModal, setShowDraftModal] = useState(false);
   const boxes = configuration?.general?.stashBoxes ?? [];
@@ -689,7 +688,7 @@ const SceneLoader: React.FC<RouteComponentProps<ISceneParams>> = ({
   match,
 }) => {
   const { id } = match.params;
-  const { configuration } = useContext(ConfigurationContext);
+  const { configuration } = useConfigurationContext();
   const { data, loading, error } = useFindScene(id);
 
   const [scene, setScene] = useState<GQL.SceneDataFragment>();
diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/SceneEditPanel.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/SceneEditPanel.tsx
index 69b378787..e56ea265b 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/SceneEditPanel.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/SceneEditPanel.tsx
@@ -19,7 +19,7 @@ import ImageUtils from "src/utils/image";
 import { getStashIDs } from "src/utils/stashIds";
 import { useFormik } from "formik";
 import { Prompt } from "react-router-dom";
-import { ConfigurationContext } from "src/hooks/Config";
+import { useConfigurationContext } from "src/hooks/Config";
 import { IGroupEntry, SceneGroupTable } from "./SceneGroupTable";
 import { faSearch } from "@fortawesome/free-solid-svg-icons";
 import { objectTitle } from "src/core/files";
@@ -103,7 +103,7 @@ export const SceneEditPanel: React.FC<IProps> = ({
     setStudio(scene.studio ?? null);
   }, [scene.studio]);
 
-  const { configuration: stashConfig } = React.useContext(ConfigurationContext);
+  const { configuration: stashConfig } = useConfigurationContext();
 
   // Network state
   const [isLoading, setIsLoading] = useState(false);
diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/SceneHistoryPanel.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/SceneHistoryPanel.tsx
index 1ac9dd5a2..2ba587a2b 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/SceneHistoryPanel.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/SceneHistoryPanel.tsx
@@ -21,6 +21,7 @@ import {
   useSceneResetActivity,
 } from "src/core/StashService";
 import * as GQL from "src/core/generated-graphql";
+import { useConfigurationContext } from "src/hooks/Config";
 import { useToast } from "src/hooks/Toast";
 import { TextField } from "src/utils/field";
 import TextUtils from "src/utils/text";
@@ -172,6 +173,9 @@ export const SceneHistoryPanel: React.FC<ISceneHistoryProps> = ({ scene }) => {
   const intl = useIntl();
   const Toast = useToast();
 
+  const { configuration } = useConfigurationContext();
+  const { sfwContentMode } = configuration.interface;
+
   const [dialogs, setDialogs] = React.useState({
     playHistory: false,
     oHistory: false,
@@ -299,6 +303,9 @@ export const SceneHistoryPanel: React.FC<ISceneHistoryProps> = ({ scene }) => {
   }
 
   function maybeRenderDialogs() {
+    const clearHistoryMessageID = sfwContentMode
+      ? "dialogs.clear_o_history_confirm_sfw"
+      : "dialogs.clear_play_history_confirm";
     return (
       <>
         <AlertModal
@@ -312,7 +319,7 @@ export const SceneHistoryPanel: React.FC<ISceneHistoryProps> = ({ scene }) => {
         />
         <AlertModal
           show={dialogs.oHistory}
-          text={intl.formatMessage({ id: "dialogs.clear_o_history_confirm" })}
+          text={intl.formatMessage({ id: clearHistoryMessageID })}
           confirmButtonText={intl.formatMessage({ id: "actions.clear" })}
           onConfirm={() => handleClearODates()}
           onCancel={() => setDialogPartial({ oHistory: false })}
@@ -351,6 +358,11 @@ export const SceneHistoryPanel: React.FC<ISceneHistoryProps> = ({ scene }) => {
   ) as string[];
   const oHistory = (scene.o_history ?? []).filter((h) => h != null) as string[];
 
+  const oHistoryMessageID = sfwContentMode ? "o_history_sfw" : "o_history";
+  const noneMessageID = sfwContentMode
+    ? "odate_recorded_no_sfw"
+    : "odate_recorded_no";
+
   return (
     <div>
       {maybeRenderDialogs()}
@@ -401,7 +413,7 @@ export const SceneHistoryPanel: React.FC<ISceneHistoryProps> = ({ scene }) => {
         <div className="history-header">
           <h5>
             <span>
-              <FormattedMessage id="o_history" />
+              <FormattedMessage id={oHistoryMessageID} />
               <Counter count={oHistory.length} hideZero />
             </span>
             <span>
@@ -427,7 +439,7 @@ export const SceneHistoryPanel: React.FC<ISceneHistoryProps> = ({ scene }) => {
         </div>
         <History
           history={oHistory}
-          noneID="odate_recorded_no"
+          noneID={noneMessageID}
           unknownDate={scene.created_at}
           onRemove={(t) => handleDeleteODate(t)}
         />
diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/SceneScrapeDialog.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/SceneScrapeDialog.tsx
index 6a89caf85..7be291bd2 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/SceneScrapeDialog.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/SceneScrapeDialog.tsx
@@ -218,32 +218,38 @@ export const SceneScrapeDialog: React.FC<ISceneScrapeDialogProps> = ({
     return (
       <>
         <ScrapedInputGroupRow
+          field="title"
           title={intl.formatMessage({ id: "title" })}
           result={title}
           onChange={(value) => setTitle(value)}
         />
         <ScrapedInputGroupRow
+          field="code"
           title={intl.formatMessage({ id: "scene_code" })}
           result={code}
           onChange={(value) => setCode(value)}
         />
         <ScrapedStringListRow
+          field="urls"
           title={intl.formatMessage({ id: "urls" })}
           result={urls}
           onChange={(value) => setURLs(value)}
         />
         <ScrapedInputGroupRow
+          field="date"
           title={intl.formatMessage({ id: "date" })}
           placeholder="YYYY-MM-DD"
           result={date}
           onChange={(value) => setDate(value)}
         />
         <ScrapedInputGroupRow
+          field="director"
           title={intl.formatMessage({ id: "director" })}
           result={director}
           onChange={(value) => setDirector(value)}
         />
         <ScrapedStudioRow
+          field="studio"
           title={intl.formatMessage({ id: "studios" })}
           result={studio}
           onChange={(value) => setStudio(value)}
@@ -251,6 +257,7 @@ export const SceneScrapeDialog: React.FC<ISceneScrapeDialogProps> = ({
           onCreateNew={createNewStudio}
         />
         <ScrapedPerformersRow
+          field="performers"
           title={intl.formatMessage({ id: "performers" })}
           result={performers}
           onChange={(value) => setPerformers(value)}
@@ -259,6 +266,7 @@ export const SceneScrapeDialog: React.FC<ISceneScrapeDialogProps> = ({
           ageFromDate={date.useNewValue ? date.newValue : date.originalValue}
         />
         <ScrapedGroupsRow
+          field="groups"
           title={intl.formatMessage({ id: "groups" })}
           result={groups}
           onChange={(value) => setGroups(value)}
@@ -267,17 +275,20 @@ export const SceneScrapeDialog: React.FC<ISceneScrapeDialogProps> = ({
         />
         {scrapedTagsRow}
         <ScrapedTextAreaRow
+          field="details"
           title={intl.formatMessage({ id: "details" })}
           result={details}
           onChange={(value) => setDetails(value)}
         />
         <ScrapedInputGroupRow
+          field="stash_ids"
           title={intl.formatMessage({ id: "stash_id" })}
           result={stashID}
           locked
           onChange={(value) => setStashID(value)}
         />
         <ScrapedImageRow
+          field="cover_image"
           title={intl.formatMessage({ id: "cover_image" })}
           className="scene-cover"
           result={image}
diff --git a/ui/v2.5/src/components/Scenes/SceneList.tsx b/ui/v2.5/src/components/Scenes/SceneList.tsx
index 72f10bb47..73198c2d1 100644
--- a/ui/v2.5/src/components/Scenes/SceneList.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneList.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useContext, useEffect, useMemo } from "react";
+import React, { useCallback, useEffect, useMemo } from "react";
 import cloneDeep from "lodash-es/cloneDeep";
 import { FormattedMessage, useIntl } from "react-intl";
 import { useHistory } from "react-router-dom";
@@ -18,7 +18,7 @@ import { ExportDialog } from "../Shared/ExportDialog";
 import { SceneCardsGrid } from "./SceneCardsGrid";
 import { TaggerContext } from "../Tagger/context";
 import { IdentifyDialog } from "../Dialogs/IdentifyDialog/IdentifyDialog";
-import { ConfigurationContext } from "src/hooks/Config";
+import { useConfigurationContext } from "src/hooks/Config";
 import {
   faPencil,
   faPlay,
@@ -110,7 +110,7 @@ function renderMetadataByline(result: GQL.FindScenesQueryResult) {
 function usePlayScene() {
   const history = useHistory();
 
-  const { configuration: config } = useContext(ConfigurationContext);
+  const { configuration: config } = useConfigurationContext();
   const cont = config?.interface.continuePlaylistDefault ?? false;
   const autoPlay = config?.interface.autostartVideoOnPlaySelected ?? false;
 
@@ -502,7 +502,7 @@ export const FilteredSceneList = (props: IFilteredScenes) => {
       },
     });
 
-  const { filter, setFilter, loading: filterLoading } = filterState;
+  const { filter, setFilter } = filterState;
 
   const { effectiveFilter, result, cachedResult, items, totalCount } =
     queryResult;
@@ -709,7 +709,7 @@ export const FilteredSceneList = (props: IFilteredScenes) => {
   ];
 
   // render
-  if (filterLoading || sidebarStateLoading) return null;
+  if (sidebarStateLoading) return null;
 
   const operations = (
     <SceneListOperations
diff --git a/ui/v2.5/src/components/Scenes/SceneMarkerCard.tsx b/ui/v2.5/src/components/Scenes/SceneMarkerCard.tsx
index 644decf42..e76beda0a 100644
--- a/ui/v2.5/src/components/Scenes/SceneMarkerCard.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneMarkerCard.tsx
@@ -1,4 +1,4 @@
-import React, { useMemo } from "react";
+import { useMemo } from "react";
 import { Button, ButtonGroup } from "react-bootstrap";
 import * as GQL from "src/core/generated-graphql";
 import { Icon } from "../Shared/Icon";
@@ -6,7 +6,7 @@ import { TagLink } from "../Shared/TagLink";
 import { HoverPopover } from "../Shared/HoverPopover";
 import NavUtils from "src/utils/navigation";
 import TextUtils from "src/utils/text";
-import { ConfigurationContext } from "src/hooks/Config";
+import { useConfigurationContext } from "src/hooks/Config";
 import { GridCard } from "../Shared/GridCard/GridCard";
 import { faTag } from "@fortawesome/free-solid-svg-icons";
 import { markerTitle } from "src/core/markers";
@@ -109,7 +109,7 @@ const SceneMarkerCardDetails = (props: ISceneMarkerCardProps) => {
 };
 
 const SceneMarkerCardImage = (props: ISceneMarkerCardProps) => {
-  const { configuration } = React.useContext(ConfigurationContext);
+  const { configuration } = useConfigurationContext();
 
   const file = useMemo(
     () =>
diff --git a/ui/v2.5/src/components/Scenes/SceneMarkerWallPanel.tsx b/ui/v2.5/src/components/Scenes/SceneMarkerWallPanel.tsx
index 9c507730b..0349fae0f 100644
--- a/ui/v2.5/src/components/Scenes/SceneMarkerWallPanel.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneMarkerWallPanel.tsx
@@ -1,17 +1,11 @@
-import React, {
-  useCallback,
-  useContext,
-  useEffect,
-  useMemo,
-  useState,
-} from "react";
+import React, { useCallback, useEffect, useMemo, useState } from "react";
 import * as GQL from "src/core/generated-graphql";
 import Gallery, {
   GalleryI,
   PhotoProps,
   RenderImageProps,
 } from "react-photo-gallery";
-import { ConfigurationContext } from "src/hooks/Config";
+import { useConfigurationContext } from "src/hooks/Config";
 import { objectTitle } from "src/core/files";
 import { Link, useHistory } from "react-router-dom";
 import { TruncatedText } from "../Shared/TruncatedText";
@@ -46,7 +40,7 @@ interface IExtraProps {
 export const MarkerWallItem: React.FC<
   RenderImageProps<IMarkerPhoto> & IExtraProps
 > = (props: RenderImageProps<IMarkerPhoto> & IExtraProps) => {
-  const { configuration } = useContext(ConfigurationContext);
+  const { configuration } = useConfigurationContext();
   const playSound = configuration?.interface.soundOnPreview ?? false;
   const showTitle = configuration?.interface.wallShowTitle ?? false;
 
diff --git a/ui/v2.5/src/components/Scenes/SceneMergeDialog.tsx b/ui/v2.5/src/components/Scenes/SceneMergeDialog.tsx
index d5a18d4ac..511ca2351 100644
--- a/ui/v2.5/src/components/Scenes/SceneMergeDialog.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneMergeDialog.tsx
@@ -372,27 +372,32 @@ const SceneMergeDetails: React.FC<ISceneMergeDetailsProps> = ({
     return (
       <>
         <ScrapedInputGroupRow
+          field="title"
           title={intl.formatMessage({ id: "title" })}
           result={title}
           onChange={(value) => setTitle(value)}
         />
         <ScrapedInputGroupRow
+          field="code"
           title={intl.formatMessage({ id: "scene_code" })}
           result={code}
           onChange={(value) => setCode(value)}
         />
         <ScrapedStringListRow
+          field="urls"
           title={intl.formatMessage({ id: "urls" })}
           result={url}
           onChange={(value) => setURL(value)}
         />
         <ScrapedInputGroupRow
+          field="date"
           title={intl.formatMessage({ id: "date" })}
           placeholder="YYYY-MM-DD"
           result={date}
           onChange={(value) => setDate(value)}
         />
         <ScrapeDialogRow
+          field="rating"
           title={intl.formatMessage({ id: "rating" })}
           result={rating}
           renderOriginalField={() => (
@@ -404,6 +409,7 @@ const SceneMergeDetails: React.FC<ISceneMergeDetailsProps> = ({
           onChange={(value) => setRating(value)}
         />
         <ScrapeDialogRow
+          field="o_count"
           title={intl.formatMessage({ id: "o_count" })}
           result={oCounter}
           renderOriginalField={() => (
@@ -425,6 +431,7 @@ const SceneMergeDetails: React.FC<ISceneMergeDetailsProps> = ({
           onChange={(value) => setOCounter(value)}
         />
         <ScrapeDialogRow
+          field="play_count"
           title={intl.formatMessage({ id: "play_count" })}
           result={playCount}
           renderOriginalField={() => (
@@ -446,6 +453,7 @@ const SceneMergeDetails: React.FC<ISceneMergeDetailsProps> = ({
           onChange={(value) => setPlayCount(value)}
         />
         <ScrapeDialogRow
+          field="play_duration"
           title={intl.formatMessage({ id: "play_duration" })}
           result={playDuration}
           renderOriginalField={() => (
@@ -469,6 +477,7 @@ const SceneMergeDetails: React.FC<ISceneMergeDetailsProps> = ({
           onChange={(value) => setPlayDuration(value)}
         />
         <ScrapeDialogRow
+          field="galleries"
           title={intl.formatMessage({ id: "galleries" })}
           result={galleries}
           renderOriginalField={() => (
@@ -492,32 +501,38 @@ const SceneMergeDetails: React.FC<ISceneMergeDetailsProps> = ({
           onChange={(value) => setGalleries(value)}
         />
         <ScrapedStudioRow
+          field="studio"
           title={intl.formatMessage({ id: "studios" })}
           result={studio}
           onChange={(value) => setStudio(value)}
         />
         <ScrapedPerformersRow
+          field="performers"
           title={intl.formatMessage({ id: "performers" })}
           result={performers}
           onChange={(value) => setPerformers(value)}
           ageFromDate={date.useNewValue ? date.newValue : date.originalValue}
         />
         <ScrapedGroupsRow
+          field="groups"
           title={intl.formatMessage({ id: "groups" })}
           result={groups}
           onChange={(value) => setGroups(value)}
         />
         <ScrapedTagsRow
+          field="tags"
           title={intl.formatMessage({ id: "tags" })}
           result={tags}
           onChange={(value) => setTags(value)}
         />
         <ScrapedTextAreaRow
+          field="details"
           title={intl.formatMessage({ id: "details" })}
           result={details}
           onChange={(value) => setDetails(value)}
         />
         <ScrapeDialogRow
+          field="organized"
           title={intl.formatMessage({ id: "organized" })}
           result={organized}
           renderOriginalField={() => (
@@ -539,6 +554,7 @@ const SceneMergeDetails: React.FC<ISceneMergeDetailsProps> = ({
           onChange={(value) => setOrganized(value)}
         />
         <ScrapeDialogRow
+          field="stash_ids"
           title={intl.formatMessage({ id: "stash_id" })}
           result={stashIDs}
           renderOriginalField={() => (
@@ -550,6 +566,7 @@ const SceneMergeDetails: React.FC<ISceneMergeDetailsProps> = ({
           onChange={(value) => setStashIDs(value)}
         />
         <ScrapedImageRow
+          field="cover_image"
           title={intl.formatMessage({ id: "cover_image" })}
           className="scene-cover"
           result={image}
diff --git a/ui/v2.5/src/components/Scenes/SceneSelect.tsx b/ui/v2.5/src/components/Scenes/SceneSelect.tsx
index 7871bc43e..8ab32b753 100644
--- a/ui/v2.5/src/components/Scenes/SceneSelect.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneSelect.tsx
@@ -12,7 +12,7 @@ import {
   queryFindScenesForSelect,
   queryFindScenesByIDForSelect,
 } from "src/core/StashService";
-import { ConfigurationContext } from "src/hooks/Config";
+import { useConfigurationContext } from "src/hooks/Config";
 import { useIntl } from "react-intl";
 import { defaultMaxOptionsShown } from "src/core/config";
 import { ListFilterModel } from "src/models/list-filter/filter";
@@ -66,7 +66,7 @@ const sceneSelectSort = PatchFunction(
 const _SceneSelect: React.FC<
   IFilterProps & IFilterValueProps<Scene> & ExtraSceneProps
 > = (props) => {
-  const { configuration } = React.useContext(ConfigurationContext);
+  const { configuration } = useConfigurationContext();
   const intl = useIntl();
   const maxOptionsShown =
     configuration?.ui.maxOptionsShown ?? defaultMaxOptionsShown;
diff --git a/ui/v2.5/src/components/Scenes/SceneWallPanel.tsx b/ui/v2.5/src/components/Scenes/SceneWallPanel.tsx
index 6f98cdaab..3f5020793 100644
--- a/ui/v2.5/src/components/Scenes/SceneWallPanel.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneWallPanel.tsx
@@ -1,10 +1,4 @@
-import React, {
-  useCallback,
-  useContext,
-  useEffect,
-  useMemo,
-  useState,
-} from "react";
+import React, { useCallback, useEffect, useMemo, useState } from "react";
 import * as GQL from "src/core/generated-graphql";
 import { SceneQueue } from "src/models/sceneQueue";
 import Gallery, {
@@ -12,7 +6,7 @@ import Gallery, {
   PhotoProps,
   RenderImageProps,
 } from "react-photo-gallery";
-import { ConfigurationContext } from "src/hooks/Config";
+import { useConfigurationContext } from "src/hooks/Config";
 import { objectTitle } from "src/core/files";
 import { Link, useHistory } from "react-router-dom";
 import { TruncatedText } from "../Shared/TruncatedText";
@@ -35,7 +29,7 @@ export const SceneWallItem: React.FC<
 > = (props: RenderImageProps<IScenePhoto> & IExtraProps) => {
   const intl = useIntl();
 
-  const { configuration } = useContext(ConfigurationContext);
+  const { configuration } = useConfigurationContext();
   const playSound = configuration?.interface.soundOnPreview ?? false;
   const showTitle = configuration?.interface.wallShowTitle ?? false;
 
diff --git a/ui/v2.5/src/components/Settings/SettingsInterfacePanel/SettingsInterfacePanel.tsx b/ui/v2.5/src/components/Settings/SettingsInterfacePanel/SettingsInterfacePanel.tsx
index e0c538cd0..ba93385b5 100644
--- a/ui/v2.5/src/components/Settings/SettingsInterfacePanel/SettingsInterfacePanel.tsx
+++ b/ui/v2.5/src/components/Settings/SettingsInterfacePanel/SettingsInterfacePanel.tsx
@@ -240,6 +240,14 @@ export const SettingsInterfacePanel: React.FC = PatchComponent(
             <option value="zh-CN">简体中文 (中国)</option>
           </SelectSetting>
 
+          <BooleanSetting
+            id="sfw-content-mode"
+            headingID="config.ui.sfw_mode.heading"
+            subHeadingID="config.ui.sfw_mode.description"
+            checked={iface.sfwContentMode ?? undefined}
+            onChange={(v) => saveInterface({ sfwContentMode: v })}
+          />
+
           <div className="setting-group">
             <div className="setting">
               <div>
diff --git a/ui/v2.5/src/components/Settings/Tasks/DataManagementTasks.tsx b/ui/v2.5/src/components/Settings/Tasks/DataManagementTasks.tsx
index e093dc60a..c36e076f4 100644
--- a/ui/v2.5/src/components/Settings/Tasks/DataManagementTasks.tsx
+++ b/ui/v2.5/src/components/Settings/Tasks/DataManagementTasks.tsx
@@ -22,7 +22,7 @@ import { SettingSection } from "../SettingSection";
 import { BooleanSetting, Setting } from "../Inputs";
 import { ManualLink } from "src/components/Help/context";
 import { Icon } from "src/components/Shared/Icon";
-import { ConfigurationContext } from "src/hooks/Config";
+import { useConfigurationContext } from "src/hooks/Config";
 import { FolderSelect } from "src/components/Shared/FolderSelect/FolderSelect";
 import {
   faMinus,
@@ -44,7 +44,7 @@ const CleanDialog: React.FC<ICleanDialog> = ({
   onClose,
 }) => {
   const intl = useIntl();
-  const { configuration } = React.useContext(ConfigurationContext);
+  const { configuration } = useConfigurationContext();
 
   const libraryPaths = configuration?.general.stashes.map((s) => s.path);
 
diff --git a/ui/v2.5/src/components/Settings/Tasks/DirectorySelectionDialog.tsx b/ui/v2.5/src/components/Settings/Tasks/DirectorySelectionDialog.tsx
index 9fdaf09f4..87a58f292 100644
--- a/ui/v2.5/src/components/Settings/Tasks/DirectorySelectionDialog.tsx
+++ b/ui/v2.5/src/components/Settings/Tasks/DirectorySelectionDialog.tsx
@@ -9,7 +9,7 @@ import { useIntl } from "react-intl";
 import { Icon } from "src/components/Shared/Icon";
 import { ModalComponent } from "src/components/Shared/Modal";
 import { FolderSelect } from "src/components/Shared/FolderSelect/FolderSelect";
-import { ConfigurationContext } from "src/hooks/Config";
+import { useConfigurationContext } from "src/hooks/Config";
 
 interface IDirectorySelectionDialogProps {
   animation?: boolean;
@@ -22,7 +22,7 @@ export const DirectorySelectionDialog: React.FC<
   IDirectorySelectionDialogProps
 > = ({ animation, allowEmpty = false, initialPaths = [], onClose }) => {
   const intl = useIntl();
-  const { configuration } = React.useContext(ConfigurationContext);
+  const { configuration } = useConfigurationContext();
 
   const libraryPaths = configuration?.general.stashes.map((s) => s.path);
 
diff --git a/ui/v2.5/src/components/Settings/Tasks/LibraryTasks.tsx b/ui/v2.5/src/components/Settings/Tasks/LibraryTasks.tsx
index cb60891fd..605e37933 100644
--- a/ui/v2.5/src/components/Settings/Tasks/LibraryTasks.tsx
+++ b/ui/v2.5/src/components/Settings/Tasks/LibraryTasks.tsx
@@ -7,7 +7,7 @@ import {
   mutateMetadataGenerate,
 } from "src/core/StashService";
 import { withoutTypename } from "src/utils/data";
-import { ConfigurationContext } from "src/hooks/Config";
+import { useConfigurationContext } from "src/hooks/Config";
 import { IdentifyDialog } from "../../Dialogs/IdentifyDialog/IdentifyDialog";
 import * as GQL from "src/core/generated-graphql";
 import { DirectorySelectionDialog } from "./DirectorySelectionDialog";
@@ -123,7 +123,7 @@ export const LibraryTasks: React.FC = () => {
 
   type DialogOpenState = typeof dialogOpen;
 
-  const { configuration } = React.useContext(ConfigurationContext);
+  const { configuration } = useConfigurationContext();
   const [configRead, setConfigRead] = useState(false);
 
   useEffect(() => {
diff --git a/ui/v2.5/src/components/Setup/Setup.tsx b/ui/v2.5/src/components/Setup/Setup.tsx
index ab5411fe1..27f9b4e58 100644
--- a/ui/v2.5/src/components/Setup/Setup.tsx
+++ b/ui/v2.5/src/components/Setup/Setup.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useContext, useCallback } from "react";
+import React, { useState, useCallback } from "react";
 import { FormattedMessage, useIntl } from "react-intl";
 import {
   Alert,
@@ -15,7 +15,7 @@ import {
   useSystemStatus,
 } from "src/core/StashService";
 import { useHistory } from "react-router-dom";
-import { ConfigurationContext } from "src/hooks/Config";
+import { useConfigurationContext } from "src/hooks/Config";
 import StashConfiguration from "../Settings/StashConfiguration";
 import { Icon } from "../Shared/Icon";
 import { LoadingIndicator } from "../Shared/LoadingIndicator";
@@ -518,6 +518,10 @@ const SetPathsStep: React.FC<IWizardStep> = ({ goBack, next }) => {
   const [stashes, setStashes] = useState<GQL.StashConfig[]>(
     setupState.stashes ?? []
   );
+  const [sfwContentMode, setSfwContentMode] = useState(
+    setupState.sfwContentMode ?? false
+  );
+
   const [databaseFile, setDatabaseFile] = useState(
     setupState.databaseFile ?? ""
   );
@@ -555,6 +559,7 @@ const SetPathsStep: React.FC<IWizardStep> = ({ goBack, next }) => {
       cacheLocation,
       blobsLocation: storeBlobsInDatabase ? "" : blobsLocation,
       storeBlobsInDatabase,
+      sfwContentMode,
     };
     next(input);
   }
@@ -594,6 +599,22 @@ const SetPathsStep: React.FC<IWizardStep> = ({ goBack, next }) => {
             />
           </Card>
         </Form.Group>
+        <Form.Group id="sfw_content">
+          <h3>
+            <FormattedMessage id="setup.paths.sfw_content_settings" />
+          </h3>
+          <p>
+            <FormattedMessage id="setup.paths.sfw_content_settings_description" />
+          </p>
+          <Card>
+            <Form.Check
+              id="use-sfw-content-mode"
+              checked={sfwContentMode}
+              label={<FormattedMessage id="setup.paths.use_sfw_content_mode" />}
+              onChange={() => setSfwContentMode(!sfwContentMode)}
+            />
+          </Card>
+        </Form.Group>
         {overrideDatabase ? null : (
           <DatabaseSection
             databaseFile={databaseFile}
@@ -952,8 +973,7 @@ const FinishStep: React.FC<IWizardStep> = ({ goBack }) => {
 
 export const Setup: React.FC = () => {
   const intl = useIntl();
-  const { configuration, loading: configLoading } =
-    useContext(ConfigurationContext);
+  const { configuration } = useConfigurationContext();
 
   const [saveUI] = useConfigureUI();
 
@@ -1024,7 +1044,7 @@ export const Setup: React.FC = () => {
     }
   }
 
-  if (configLoading || statusLoading) {
+  if (statusLoading) {
     return <LoadingIndicator />;
   }
 
diff --git a/ui/v2.5/src/components/Shared/CountButton.tsx b/ui/v2.5/src/components/Shared/CountButton.tsx
index 1519c104b..ad099c2f5 100644
--- a/ui/v2.5/src/components/Shared/CountButton.tsx
+++ b/ui/v2.5/src/components/Shared/CountButton.tsx
@@ -1,10 +1,11 @@
-import { faEye } from "@fortawesome/free-solid-svg-icons";
+import { faEye, faThumbsUp } from "@fortawesome/free-solid-svg-icons";
 import React from "react";
 import { Button, ButtonGroup } from "react-bootstrap";
 import { Icon } from "src/components/Shared/Icon";
 import { SweatDrops } from "./SweatDrops";
 import cx from "classnames";
 import { useIntl } from "react-intl";
+import { useConfigurationContext } from "src/hooks/Config";
 
 interface ICountButtonProps {
   value: number;
@@ -63,11 +64,17 @@ export const ViewCountButton: React.FC<CountButtonPropsNoIcon> = (props) => {
 
 export const OCounterButton: React.FC<CountButtonPropsNoIcon> = (props) => {
   const intl = useIntl();
+  const { configuration } = useConfigurationContext();
+  const { sfwContentMode } = configuration.interface;
+
+  const icon = !sfwContentMode ? <SweatDrops /> : <Icon icon={faThumbsUp} />;
+  const messageID = !sfwContentMode ? "o_count" : "o_count_sfw";
+
   return (
     <CountButton
       {...props}
-      icon={<SweatDrops />}
-      title={intl.formatMessage({ id: "o_count" })}
+      icon={icon}
+      title={intl.formatMessage({ id: messageID })}
       countTitle={intl.formatMessage({ id: "actions.view_history" })}
     />
   );
diff --git a/ui/v2.5/src/components/Shared/DetailItem.tsx b/ui/v2.5/src/components/Shared/DetailItem.tsx
index a92f75868..76b595127 100644
--- a/ui/v2.5/src/components/Shared/DetailItem.tsx
+++ b/ui/v2.5/src/components/Shared/DetailItem.tsx
@@ -3,6 +3,7 @@ import { FormattedMessage } from "react-intl";
 
 interface IDetailItem {
   id?: string | null;
+  className?: string;
   label?: React.ReactNode;
   value?: React.ReactNode;
   labelTitle?: string;
@@ -13,6 +14,7 @@ interface IDetailItem {
 
 export const DetailItem: React.FC<IDetailItem> = ({
   id,
+  className = "",
   label,
   value,
   labelTitle,
@@ -30,7 +32,7 @@ export const DetailItem: React.FC<IDetailItem> = ({
   const sanitisedID = id.replace(/_/g, "-");
 
   return (
-    <div className={`detail-item ${id}`}>
+    <div className={`detail-item ${id} ${className}`}>
       <span className={`detail-item-title ${sanitisedID}`} title={labelTitle}>
         {message}
         {fullWidth ? ":" : ""}
diff --git a/ui/v2.5/src/components/Shared/GridCard/StudioOverlay.tsx b/ui/v2.5/src/components/Shared/GridCard/StudioOverlay.tsx
index 875b122d8..9bfd25071 100644
--- a/ui/v2.5/src/components/Shared/GridCard/StudioOverlay.tsx
+++ b/ui/v2.5/src/components/Shared/GridCard/StudioOverlay.tsx
@@ -1,6 +1,6 @@
 import React, { useMemo } from "react";
 import { Link } from "react-router-dom";
-import { ConfigurationContext } from "src/hooks/Config";
+import { useConfigurationContext } from "src/hooks/Config";
 
 interface IStudio {
   id: string;
@@ -11,7 +11,7 @@ interface IStudio {
 export const StudioOverlay: React.FC<{
   studio: IStudio | null | undefined;
 }> = ({ studio }) => {
-  const { configuration } = React.useContext(ConfigurationContext);
+  const { configuration } = useConfigurationContext();
 
   const configValue = configuration?.interface.showStudioAsText;
 
diff --git a/ui/v2.5/src/components/Shared/PopoverCountButton.tsx b/ui/v2.5/src/components/Shared/PopoverCountButton.tsx
index 79a36bd9d..d652ff6ad 100644
--- a/ui/v2.5/src/components/Shared/PopoverCountButton.tsx
+++ b/ui/v2.5/src/components/Shared/PopoverCountButton.tsx
@@ -11,14 +11,14 @@ import React from "react";
 import { Button, OverlayTrigger, Tooltip } from "react-bootstrap";
 import { FormattedNumber, useIntl } from "react-intl";
 import { Link } from "react-router-dom";
-import { ConfigurationContext } from "src/hooks/Config";
+import { useConfigurationContext } from "src/hooks/Config";
 import TextUtils from "src/utils/text";
 import { Icon } from "./Icon";
 
 export const Count: React.FC<{
   count: number;
 }> = ({ count }) => {
-  const { configuration } = React.useContext(ConfigurationContext);
+  const { configuration } = useConfigurationContext();
   const abbreviateCounter = configuration?.ui.abbreviateCounters ?? false;
 
   if (!abbreviateCounter) {
diff --git a/ui/v2.5/src/components/Shared/Rating/RatingSystem.tsx b/ui/v2.5/src/components/Shared/Rating/RatingSystem.tsx
index a0a11c363..11103acf8 100644
--- a/ui/v2.5/src/components/Shared/Rating/RatingSystem.tsx
+++ b/ui/v2.5/src/components/Shared/Rating/RatingSystem.tsx
@@ -1,5 +1,4 @@
-import React from "react";
-import { ConfigurationContext } from "src/hooks/Config";
+import { useConfigurationContext } from "src/hooks/Config";
 import {
   defaultRatingStarPrecision,
   defaultRatingSystemOptions,
@@ -23,7 +22,7 @@ export interface IRatingSystemProps {
 export const RatingSystem = PatchComponent(
   "RatingSystem",
   (props: IRatingSystemProps) => {
-    const { configuration: config } = React.useContext(ConfigurationContext);
+    const { configuration: config } = useConfigurationContext();
     const ratingSystemOptions =
       config?.ui.ratingSystemOptions ?? defaultRatingSystemOptions;
 
diff --git a/ui/v2.5/src/components/Shared/RatingBanner.tsx b/ui/v2.5/src/components/Shared/RatingBanner.tsx
index d152b8b52..d94b26433 100644
--- a/ui/v2.5/src/components/Shared/RatingBanner.tsx
+++ b/ui/v2.5/src/components/Shared/RatingBanner.tsx
@@ -1,4 +1,4 @@
-import React, { useContext } from "react";
+import React from "react";
 import { FormattedMessage } from "react-intl";
 import {
   convertToRatingFormat,
@@ -6,14 +6,14 @@ import {
   RatingStarPrecision,
   RatingSystemType,
 } from "src/utils/rating";
-import { ConfigurationContext } from "src/hooks/Config";
+import { useConfigurationContext } from "src/hooks/Config";
 
 interface IProps {
   rating?: number | null;
 }
 
 export const RatingBanner: React.FC<IProps> = ({ rating }) => {
-  const { configuration: config } = useContext(ConfigurationContext);
+  const { configuration: config } = useConfigurationContext();
   const ratingSystemOptions =
     config?.ui.ratingSystemOptions ?? defaultRatingSystemOptions;
   const isLegacy =
diff --git a/ui/v2.5/src/components/Shared/ScrapeDialog/ScrapeDialog.tsx b/ui/v2.5/src/components/Shared/ScrapeDialog/ScrapeDialog.tsx
index 59d5f3985..b67c55f41 100644
--- a/ui/v2.5/src/components/Shared/ScrapeDialog/ScrapeDialog.tsx
+++ b/ui/v2.5/src/components/Shared/ScrapeDialog/ScrapeDialog.tsx
@@ -24,6 +24,7 @@ import { CountrySelect } from "../CountrySelect";
 import { StringListInput } from "../StringListInput";
 import { ImageSelector } from "../ImageSelector";
 import { ScrapeResult } from "./scrapeResult";
+import { useConfigurationContext } from "src/hooks/Config";
 
 interface IScrapedFieldProps<T> {
   result: ScrapeResult<T>;
@@ -31,6 +32,7 @@ interface IScrapedFieldProps<T> {
 
 interface IScrapedRowProps<T, V> extends IScrapedFieldProps<T> {
   className?: string;
+  field: string;
   title: string;
   renderOriginalField: (result: ScrapeResult<T>) => JSX.Element | undefined;
   renderNewField: (result: ScrapeResult<T>) => JSX.Element | undefined;
@@ -105,7 +107,10 @@ export const ScrapeDialogRow = <T, V>(props: IScrapedRowProps<T, V>) => {
   }
 
   return (
-    <Row className={`px-3 pt-3 ${props.className ?? ""}`}>
+    <Row
+      className={`px-3 pt-3 ${props.className ?? ""}`}
+      data-field={props.field}
+    >
       <Form.Label column lg="3">
         {props.title}
       </Form.Label>
@@ -175,6 +180,8 @@ function getNameString(value: string) {
 
 interface IScrapedInputGroupRowProps {
   title: string;
+  field: string;
+  className?: string;
   placeholder?: string;
   result: ScrapeResult<string>;
   locked?: boolean;
@@ -187,6 +194,8 @@ export const ScrapedInputGroupRow: React.FC<IScrapedInputGroupRowProps> = (
   return (
     <ScrapeDialogRow
       title={props.title}
+      field={props.field}
+      className={props.className}
       result={props.result}
       renderOriginalField={() => (
         <ScrapedInputGroup
@@ -240,6 +249,7 @@ const ScrapedStringList: React.FC<IScrapedStringListProps> = (props) => {
 
 interface IScrapedStringListRowProps {
   title: string;
+  field: string;
   placeholder?: string;
   result: ScrapeResult<string[]>;
   locked?: boolean;
@@ -253,6 +263,7 @@ export const ScrapedStringListRow: React.FC<IScrapedStringListRowProps> = (
     <ScrapeDialogRow
       className="string-list-row"
       title={props.title}
+      field={props.field}
       result={props.result}
       renderOriginalField={() => (
         <ScrapedStringList
@@ -300,6 +311,7 @@ export const ScrapedTextAreaRow: React.FC<IScrapedInputGroupRowProps> = (
   return (
     <ScrapeDialogRow
       title={props.title}
+      field={props.field}
       result={props.result}
       renderOriginalField={() => (
         <ScrapedTextArea
@@ -346,6 +358,7 @@ const ScrapedImage: React.FC<IScrapedImageProps> = (props) => {
 
 interface IScrapedImageRowProps {
   title: string;
+  field: string;
   className?: string;
   result: ScrapeResult<string>;
   onChange: (value: ScrapeResult<string>) => void;
@@ -355,6 +368,7 @@ export const ScrapedImageRow: React.FC<IScrapedImageRowProps> = (props) => {
   return (
     <ScrapeDialogRow
       title={props.title}
+      field={props.field}
       result={props.result}
       renderOriginalField={() => (
         <ScrapedImage
@@ -379,6 +393,7 @@ export const ScrapedImageRow: React.FC<IScrapedImageRowProps> = (props) => {
 
 interface IScrapedImagesRowProps {
   title: string;
+  field: string;
   className?: string;
   result: ScrapeResult<string>;
   images: string[];
@@ -397,6 +412,7 @@ export const ScrapedImagesRow: React.FC<IScrapedImagesRowProps> = (props) => {
   return (
     <ScrapeDialogRow
       title={props.title}
+      field={props.field}
       result={props.result}
       renderOriginalField={() => (
         <ScrapedImage
@@ -433,6 +449,9 @@ export const ScrapeDialog: React.FC<IScrapeDialogProps> = (
   props: IScrapeDialogProps
 ) => {
   const intl = useIntl();
+  const { configuration } = useConfigurationContext();
+  const { sfwContentMode } = configuration.interface;
+
   return (
     <ModalComponent
       show
@@ -449,7 +468,10 @@ export const ScrapeDialog: React.FC<IScrapeDialogProps> = (
         text: intl.formatMessage({ id: "actions.cancel" }),
         variant: "secondary",
       }}
-      modalProps={{ size: "lg", dialogClassName: "scrape-dialog" }}
+      modalProps={{
+        size: "lg",
+        dialogClassName: `scrape-dialog ${sfwContentMode ? "sfw-mode" : ""}`,
+      }}
     >
       <div className="dialog-container">
         <Form>
@@ -479,6 +501,7 @@ export const ScrapeDialog: React.FC<IScrapeDialogProps> = (
 
 interface IScrapedCountryRowProps {
   title: string;
+  field: string;
   result: ScrapeResult<string>;
   onChange: (value: ScrapeResult<string>) => void;
   locked?: boolean;
@@ -487,6 +510,7 @@ interface IScrapedCountryRowProps {
 
 export const ScrapedCountryRow: React.FC<IScrapedCountryRowProps> = ({
   title,
+  field,
   result,
   onChange,
   locked,
@@ -494,6 +518,7 @@ export const ScrapedCountryRow: React.FC<IScrapedCountryRowProps> = ({
 }) => (
   <ScrapeDialogRow
     title={title}
+    field={field}
     result={result}
     renderOriginalField={() => (
       <FormControl
diff --git a/ui/v2.5/src/components/Shared/ScrapeDialog/ScrapedObjectsRow.tsx b/ui/v2.5/src/components/Shared/ScrapeDialog/ScrapedObjectsRow.tsx
index f3cff8d4e..6aa985796 100644
--- a/ui/v2.5/src/components/Shared/ScrapeDialog/ScrapedObjectsRow.tsx
+++ b/ui/v2.5/src/components/Shared/ScrapeDialog/ScrapedObjectsRow.tsx
@@ -13,6 +13,7 @@ import { uniq } from "lodash-es";
 
 interface IScrapedStudioRow {
   title: string;
+  field: string;
   result: ObjectScrapeResult<GQL.ScrapedStudio>;
   onChange: (value: ObjectScrapeResult<GQL.ScrapedStudio>) => void;
   newStudio?: GQL.ScrapedStudio;
@@ -25,6 +26,7 @@ function getObjectName<T extends { name: string }>(value: T) {
 
 export const ScrapedStudioRow: React.FC<IScrapedStudioRow> = ({
   title,
+  field,
   result,
   onChange,
   newStudio,
@@ -73,6 +75,7 @@ export const ScrapedStudioRow: React.FC<IScrapedStudioRow> = ({
   return (
     <ScrapeDialogRow
       title={title}
+      field={field}
       result={result}
       renderOriginalField={() => renderScrapedStudio(result)}
       renderNewField={() =>
@@ -92,6 +95,7 @@ export const ScrapedStudioRow: React.FC<IScrapedStudioRow> = ({
 
 interface IScrapedObjectsRow<T> {
   title: string;
+  field: string;
   result: ScrapeResult<T[]>;
   onChange: (value: ScrapeResult<T[]>) => void;
   newObjects?: T[];
@@ -107,6 +111,7 @@ interface IScrapedObjectsRow<T> {
 export const ScrapedObjectsRow = <T,>(props: IScrapedObjectsRow<T>) => {
   const {
     title,
+    field,
     result,
     onChange,
     newObjects,
@@ -118,6 +123,7 @@ export const ScrapedObjectsRow = <T,>(props: IScrapedObjectsRow<T>) => {
   return (
     <ScrapeDialogRow
       title={title}
+      field={field}
       result={result}
       renderOriginalField={() => renderObjects(result)}
       renderNewField={() =>
@@ -142,7 +148,15 @@ type IScrapedObjectRowImpl<T> = Omit<
 
 export const ScrapedPerformersRow: React.FC<
   IScrapedObjectRowImpl<GQL.ScrapedPerformer> & { ageFromDate?: string | null }
-> = ({ title, result, onChange, newObjects, onCreateNew, ageFromDate }) => {
+> = ({
+  title,
+  field,
+  result,
+  onChange,
+  newObjects,
+  onCreateNew,
+  ageFromDate,
+}) => {
   const performersCopy = useMemo(() => {
     return (
       newObjects?.map((p) => {
@@ -191,6 +205,7 @@ export const ScrapedPerformersRow: React.FC<
   return (
     <ScrapedObjectsRow<GQL.ScrapedPerformer>
       title={title}
+      field={field}
       result={result}
       renderObjects={renderScrapedPerformers}
       onChange={onChange}
@@ -203,7 +218,7 @@ export const ScrapedPerformersRow: React.FC<
 
 export const ScrapedGroupsRow: React.FC<
   IScrapedObjectRowImpl<GQL.ScrapedGroup>
-> = ({ title, result, onChange, newObjects, onCreateNew }) => {
+> = ({ title, field, result, onChange, newObjects, onCreateNew }) => {
   const groupsCopy = useMemo(() => {
     return (
       newObjects?.map((p) => {
@@ -251,6 +266,7 @@ export const ScrapedGroupsRow: React.FC<
   return (
     <ScrapedObjectsRow<GQL.ScrapedGroup>
       title={title}
+      field={field}
       result={result}
       renderObjects={renderScrapedGroups}
       onChange={onChange}
@@ -263,7 +279,7 @@ export const ScrapedGroupsRow: React.FC<
 
 export const ScrapedTagsRow: React.FC<
   IScrapedObjectRowImpl<GQL.ScrapedTag>
-> = ({ title, result, onChange, newObjects, onCreateNew }) => {
+> = ({ title, field, result, onChange, newObjects, onCreateNew }) => {
   function renderScrapedTags(
     scrapeResult: ScrapeResult<GQL.ScrapedTag[]>,
     isNew?: boolean,
@@ -297,6 +313,7 @@ export const ScrapedTagsRow: React.FC<
   return (
     <ScrapedObjectsRow<GQL.ScrapedTag>
       title={title}
+      field={field}
       result={result}
       renderObjects={renderScrapedTags}
       onChange={onChange}
diff --git a/ui/v2.5/src/components/Shared/ScrapeDialog/scrapedTags.tsx b/ui/v2.5/src/components/Shared/ScrapeDialog/scrapedTags.tsx
index ca3658391..f298a6eeb 100644
--- a/ui/v2.5/src/components/Shared/ScrapeDialog/scrapedTags.tsx
+++ b/ui/v2.5/src/components/Shared/ScrapeDialog/scrapedTags.tsx
@@ -39,6 +39,7 @@ export function useScrapedTags(
 
   const scrapedTagsRow = (
     <ScrapedTagsRow
+      field="tags"
       title={intl.formatMessage({ id: "tags" })}
       result={tags}
       onChange={(value) => setTags(value)}
diff --git a/ui/v2.5/src/components/Shared/Select.tsx b/ui/v2.5/src/components/Shared/Select.tsx
index 4ae547cfe..4eea52a38 100644
--- a/ui/v2.5/src/components/Shared/Select.tsx
+++ b/ui/v2.5/src/components/Shared/Select.tsx
@@ -15,7 +15,7 @@ import CreatableSelect from "react-select/creatable";
 import * as GQL from "src/core/generated-graphql";
 import { useMarkerStrings } from "src/core/StashService";
 import { SelectComponents } from "react-select/dist/declarations/src/components";
-import { ConfigurationContext } from "src/hooks/Config";
+import { useConfigurationContext } from "src/hooks/Config";
 import { objectTitle } from "src/core/files";
 import { defaultMaxOptionsShown } from "src/core/config";
 import { useDebounce } from "src/hooks/debounce";
@@ -108,7 +108,7 @@ const getSelectedItems = (selectedItems: OnChangeValue<Option, boolean>) => {
 const LimitedSelectMenu = <T extends boolean>(
   props: MenuListProps<Option, T, GroupBase<Option>>
 ) => {
-  const { configuration } = React.useContext(ConfigurationContext);
+  const { configuration } = useConfigurationContext();
   const maxOptionsShown =
     configuration?.ui.maxOptionsShown ?? defaultMaxOptionsShown;
 
@@ -496,6 +496,7 @@ export const ListSelect = <T extends {}>(props: IListSelect<T>) => {
 
 type DisableOption = Option & {
   isDisabled?: boolean;
+  className?: string;
 };
 
 interface ICheckBoxSelectProps {
@@ -510,7 +511,17 @@ export const CheckBoxSelect: React.FC<ICheckBoxSelectProps> = ({
   onChange,
 }) => {
   const Option = (props: OptionProps<DisableOption, true>) => (
-    <reactSelectComponents.Option {...props}>
+    <reactSelectComponents.Option
+      {...props}
+      className={`${props.className || ""} ${props.data.className || ""}`}
+      // data values don't seem to be included in props.innerProps by default
+      innerProps={
+        { "data-value": props.data.value } as React.DetailedHTMLProps<
+          React.HTMLAttributes<HTMLDivElement>,
+          HTMLDivElement
+        >
+      }
+    >
       <input
         type="checkbox"
         disabled={props.isDisabled}
diff --git a/ui/v2.5/src/components/Shared/StashID.tsx b/ui/v2.5/src/components/Shared/StashID.tsx
index 8e1fecef2..847dd7ab2 100644
--- a/ui/v2.5/src/components/Shared/StashID.tsx
+++ b/ui/v2.5/src/components/Shared/StashID.tsx
@@ -1,6 +1,6 @@
 import React, { useMemo } from "react";
 import { StashId } from "src/core/generated-graphql";
-import { ConfigurationContext } from "src/hooks/Config";
+import { useConfigurationContext } from "src/hooks/Config";
 import { getStashboxBase } from "src/utils/stashbox";
 import { ExternalLink } from "./ExternalLink";
 
@@ -10,7 +10,7 @@ export const StashIDPill: React.FC<{
   stashID: Pick<StashId, "endpoint" | "stash_id">;
   linkType: LinkType;
 }> = ({ stashID, linkType }) => {
-  const { configuration } = React.useContext(ConfigurationContext);
+  const { configuration } = useConfigurationContext();
 
   const { endpoint, stash_id } = stashID;
 
diff --git a/ui/v2.5/src/components/Studios/StudioDetails/Studio.tsx b/ui/v2.5/src/components/Studios/StudioDetails/Studio.tsx
index fc416320f..c26ed0c73 100644
--- a/ui/v2.5/src/components/Studios/StudioDetails/Studio.tsx
+++ b/ui/v2.5/src/components/Studios/StudioDetails/Studio.tsx
@@ -18,7 +18,7 @@ import { ModalComponent } from "src/components/Shared/Modal";
 import { LoadingIndicator } from "src/components/Shared/LoadingIndicator";
 import { ErrorMessage } from "src/components/Shared/ErrorMessage";
 import { useToast } from "src/hooks/Toast";
-import { ConfigurationContext } from "src/hooks/Config";
+import { useConfigurationContext } from "src/hooks/Config";
 import { StudioScenesPanel } from "./StudioScenesPanel";
 import { StudioGalleriesPanel } from "./StudioGalleriesPanel";
 import { StudioImagesPanel } from "./StudioImagesPanel";
@@ -264,7 +264,7 @@ const StudioPage: React.FC<IProps> = ({ studio, tabKey }) => {
   const intl = useIntl();
 
   // Configuration settings
-  const { configuration } = React.useContext(ConfigurationContext);
+  const { configuration } = useConfigurationContext();
   const uiConfig = configuration?.ui;
   const abbreviateCounter = uiConfig?.abbreviateCounters ?? false;
   const enableBackgroundImage = uiConfig?.enableStudioBackgroundImage ?? false;
diff --git a/ui/v2.5/src/components/Studios/StudioSelect.tsx b/ui/v2.5/src/components/Studios/StudioSelect.tsx
index c62d25675..7305aa60d 100644
--- a/ui/v2.5/src/components/Studios/StudioSelect.tsx
+++ b/ui/v2.5/src/components/Studios/StudioSelect.tsx
@@ -13,7 +13,7 @@ import {
   queryFindStudiosByIDForSelect,
   queryFindStudiosForSelect,
 } from "src/core/StashService";
-import { ConfigurationContext } from "src/hooks/Config";
+import { useConfigurationContext } from "src/hooks/Config";
 import { useIntl } from "react-intl";
 import { defaultMaxOptionsShown, IUIConfig } from "src/core/config";
 import { ListFilterModel } from "src/models/list-filter/filter";
@@ -65,7 +65,7 @@ const _StudioSelect: React.FC<
 > = (props) => {
   const [createStudio] = useStudioCreate();
 
-  const { configuration } = React.useContext(ConfigurationContext);
+  const { configuration } = useConfigurationContext();
   const intl = useIntl();
   const maxOptionsShown =
     (configuration?.ui as IUIConfig).maxOptionsShown ?? defaultMaxOptionsShown;
diff --git a/ui/v2.5/src/components/Tagger/config.ts b/ui/v2.5/src/components/Tagger/config.ts
index 78515f550..c30db7da2 100644
--- a/ui/v2.5/src/components/Tagger/config.ts
+++ b/ui/v2.5/src/components/Tagger/config.ts
@@ -1,10 +1,10 @@
-import { useCallback, useContext } from "react";
-import { ConfigurationContext } from "src/hooks/Config";
+import { useCallback } from "react";
+import { useConfigurationContext } from "src/hooks/Config";
 import { initialConfig, ITaggerConfig } from "./constants";
 import { useConfigureUISetting } from "src/core/StashService";
 
 export function useTaggerConfig() {
-  const { configuration: stashConfig } = useContext(ConfigurationContext);
+  const { configuration: stashConfig } = useConfigurationContext();
   const [saveUISetting] = useConfigureUISetting();
 
   const config = stashConfig?.ui.taggerConfig ?? initialConfig;
diff --git a/ui/v2.5/src/components/Tagger/context.tsx b/ui/v2.5/src/components/Tagger/context.tsx
index 0db1fba1e..028e83ed0 100644
--- a/ui/v2.5/src/components/Tagger/context.tsx
+++ b/ui/v2.5/src/components/Tagger/context.tsx
@@ -17,7 +17,7 @@ import {
   useTagCreate,
 } from "src/core/StashService";
 import { useToast } from "src/hooks/Toast";
-import { ConfigurationContext } from "src/hooks/Config";
+import { useConfigurationContext } from "src/hooks/Config";
 import { ITaggerSource, SCRAPER_PREFIX, STASH_BOX_PREFIX } from "./constants";
 import { errorToString } from "src/utils";
 import { mergeStudioStashIDs } from "./utils";
@@ -117,7 +117,7 @@ export const TaggerContext: React.FC = ({ children }) => {
 
   const stopping = useRef(false);
 
-  const { configuration: stashConfig } = React.useContext(ConfigurationContext);
+  const { configuration: stashConfig } = useConfigurationContext();
   const { config, setConfig } = useTaggerConfig();
 
   const Scrapers = useListSceneScrapers();
diff --git a/ui/v2.5/src/components/Tagger/performers/Config.tsx b/ui/v2.5/src/components/Tagger/performers/Config.tsx
index a839e1ae6..0d5316735 100644
--- a/ui/v2.5/src/components/Tagger/performers/Config.tsx
+++ b/ui/v2.5/src/components/Tagger/performers/Config.tsx
@@ -1,7 +1,7 @@
 import React, { Dispatch, useState } from "react";
 import { Badge, Button, Card, Collapse, Form } from "react-bootstrap";
 import { FormattedMessage } from "react-intl";
-import { ConfigurationContext } from "src/hooks/Config";
+import { useConfigurationContext } from "src/hooks/Config";
 
 import { ITaggerConfig } from "../constants";
 import PerformerFieldSelector from "../PerformerFieldSelector";
@@ -13,7 +13,7 @@ interface IConfigProps {
 }
 
 const Config: React.FC<IConfigProps> = ({ show, config, setConfig }) => {
-  const { configuration: stashConfig } = React.useContext(ConfigurationContext);
+  const { configuration: stashConfig } = useConfigurationContext();
   const [showExclusionModal, setShowExclusionModal] = useState(false);
 
   const excludedFields = config.excludedPerformerFields ?? [];
diff --git a/ui/v2.5/src/components/Tagger/performers/PerformerTagger.tsx b/ui/v2.5/src/components/Tagger/performers/PerformerTagger.tsx
index f0c87ff57..a6e2bcd1c 100755
--- a/ui/v2.5/src/components/Tagger/performers/PerformerTagger.tsx
+++ b/ui/v2.5/src/components/Tagger/performers/PerformerTagger.tsx
@@ -16,7 +16,7 @@ import {
   performerMutationImpactedQueries,
 } from "src/core/StashService";
 import { Manual } from "src/components/Help/Manual";
-import { ConfigurationContext } from "src/hooks/Config";
+import { useConfigurationContext } from "src/hooks/Config";
 
 import StashSearchResult from "./StashSearchResult";
 import PerformerConfig from "./Config";
@@ -620,7 +620,7 @@ interface ITaggerProps {
 export const PerformerTagger: React.FC<ITaggerProps> = ({ performers }) => {
   const jobsSubscribe = useJobsSubscribe();
   const intl = useIntl();
-  const { configuration: stashConfig } = React.useContext(ConfigurationContext);
+  const { configuration: stashConfig } = useConfigurationContext();
   const { config, setConfig } = useTaggerConfig();
   const [showConfig, setShowConfig] = useState(false);
   const [showManual, setShowManual] = useState(false);
diff --git a/ui/v2.5/src/components/Tagger/scenes/SceneTagger.tsx b/ui/v2.5/src/components/Tagger/scenes/SceneTagger.tsx
index 922ecc473..695ed2817 100755
--- a/ui/v2.5/src/components/Tagger/scenes/SceneTagger.tsx
+++ b/ui/v2.5/src/components/Tagger/scenes/SceneTagger.tsx
@@ -12,7 +12,7 @@ import Config from "./Config";
 import { TaggerScene } from "./TaggerScene";
 import { SceneTaggerModals } from "./sceneTaggerModals";
 import { SceneSearchResults } from "./StashSearchResult";
-import { ConfigurationContext } from "src/hooks/Config";
+import { useConfigurationContext } from "src/hooks/Config";
 import { faCog } from "@fortawesome/free-solid-svg-icons";
 import { useLightbox } from "src/hooks/Lightbox/hooks";
 
@@ -26,7 +26,7 @@ const Scene: React.FC<{
   const intl = useIntl();
   const { currentSource, doSceneQuery, doSceneFragmentScrape, loading } =
     useContext(TaggerStateContext);
-  const { configuration } = React.useContext(ConfigurationContext);
+  const { configuration } = useConfigurationContext();
 
   const cont = configuration?.interface.continuePlaylistDefault ?? false;
 
diff --git a/ui/v2.5/src/components/Tagger/scenes/TaggerScene.tsx b/ui/v2.5/src/components/Tagger/scenes/TaggerScene.tsx
index db36bf404..4825ebcfd 100644
--- a/ui/v2.5/src/components/Tagger/scenes/TaggerScene.tsx
+++ b/ui/v2.5/src/components/Tagger/scenes/TaggerScene.tsx
@@ -19,7 +19,7 @@ import {
   faImage,
 } from "@fortawesome/free-solid-svg-icons";
 import { objectPath, objectTitle } from "src/core/files";
-import { ConfigurationContext } from "src/hooks/Config";
+import { useConfigurationContext } from "src/hooks/Config";
 import { SceneQueue } from "src/models/sceneQueue";
 
 interface ITaggerSceneDetails {
@@ -154,7 +154,7 @@ export const TaggerScene: React.FC<PropsWithChildren<ITaggerScene>> = ({
 
   const history = useHistory();
 
-  const { configuration } = React.useContext(ConfigurationContext);
+  const { configuration } = useConfigurationContext();
   const cont = configuration?.interface.continuePlaylistDefault ?? false;
 
   async function query() {
diff --git a/ui/v2.5/src/components/Tagger/studios/Config.tsx b/ui/v2.5/src/components/Tagger/studios/Config.tsx
index 9dd9f6856..ddfd17b1e 100644
--- a/ui/v2.5/src/components/Tagger/studios/Config.tsx
+++ b/ui/v2.5/src/components/Tagger/studios/Config.tsx
@@ -1,7 +1,7 @@
 import React, { Dispatch, useState } from "react";
 import { Badge, Button, Card, Collapse, Form } from "react-bootstrap";
 import { FormattedMessage } from "react-intl";
-import { ConfigurationContext } from "src/hooks/Config";
+import { useConfigurationContext } from "src/hooks/Config";
 
 import { ITaggerConfig } from "../constants";
 import StudioFieldSelector from "./StudioFieldSelector";
@@ -13,7 +13,7 @@ interface IConfigProps {
 }
 
 const Config: React.FC<IConfigProps> = ({ show, config, setConfig }) => {
-  const { configuration: stashConfig } = React.useContext(ConfigurationContext);
+  const { configuration: stashConfig } = useConfigurationContext();
   const [showExclusionModal, setShowExclusionModal] = useState(false);
 
   const excludedFields = config.excludedStudioFields ?? [];
diff --git a/ui/v2.5/src/components/Tagger/studios/StudioTagger.tsx b/ui/v2.5/src/components/Tagger/studios/StudioTagger.tsx
index b8fbefdb5..78553e518 100644
--- a/ui/v2.5/src/components/Tagger/studios/StudioTagger.tsx
+++ b/ui/v2.5/src/components/Tagger/studios/StudioTagger.tsx
@@ -17,7 +17,7 @@ import {
   evictQueries,
 } from "src/core/StashService";
 import { Manual } from "src/components/Help/Manual";
-import { ConfigurationContext } from "src/hooks/Config";
+import { useConfigurationContext } from "src/hooks/Config";
 
 import StashSearchResult from "./StashSearchResult";
 import StudioConfig from "./Config";
@@ -669,7 +669,7 @@ interface ITaggerProps {
 export const StudioTagger: React.FC<ITaggerProps> = ({ studios }) => {
   const jobsSubscribe = useJobsSubscribe();
   const intl = useIntl();
-  const { configuration: stashConfig } = React.useContext(ConfigurationContext);
+  const { configuration: stashConfig } = useConfigurationContext();
   const { config, setConfig } = useTaggerConfig();
   const [showConfig, setShowConfig] = useState(false);
   const [showManual, setShowManual] = useState(false);
diff --git a/ui/v2.5/src/components/Tags/TagDetails/Tag.tsx b/ui/v2.5/src/components/Tags/TagDetails/Tag.tsx
index 6d6a4a660..e0bc11e37 100644
--- a/ui/v2.5/src/components/Tags/TagDetails/Tag.tsx
+++ b/ui/v2.5/src/components/Tags/TagDetails/Tag.tsx
@@ -19,7 +19,7 @@ import { ModalComponent } from "src/components/Shared/Modal";
 import { LoadingIndicator } from "src/components/Shared/LoadingIndicator";
 import { Icon } from "src/components/Shared/Icon";
 import { useToast } from "src/hooks/Toast";
-import { ConfigurationContext } from "src/hooks/Config";
+import { useConfigurationContext } from "src/hooks/Config";
 import { tagRelationHook } from "src/core/tags";
 import { TagScenesPanel } from "./TagScenesPanel";
 import { TagMarkersPanel } from "./TagMarkersPanel";
@@ -293,7 +293,7 @@ const TagPage: React.FC<IProps> = ({ tag, tabKey }) => {
   const intl = useIntl();
 
   // Configuration settings
-  const { configuration } = React.useContext(ConfigurationContext);
+  const { configuration } = useConfigurationContext();
   const uiConfig = configuration?.ui;
   const abbreviateCounter = uiConfig?.abbreviateCounters ?? false;
   const enableBackgroundImage = uiConfig?.enableTagBackgroundImage ?? false;
diff --git a/ui/v2.5/src/components/Tags/TagPopover.tsx b/ui/v2.5/src/components/Tags/TagPopover.tsx
index 9e3f0d80b..ef3aa950a 100644
--- a/ui/v2.5/src/components/Tags/TagPopover.tsx
+++ b/ui/v2.5/src/components/Tags/TagPopover.tsx
@@ -4,7 +4,7 @@ import { LoadingIndicator } from "../Shared/LoadingIndicator";
 import { HoverPopover } from "../Shared/HoverPopover";
 import { useFindTag } from "../../core/StashService";
 import { TagCard } from "./TagCard";
-import { ConfigurationContext } from "../../hooks/Config";
+import { useConfigurationContext } from "../../hooks/Config";
 import { Placement } from "react-bootstrap/esm/Overlay";
 
 interface ITagPopoverCardProps {
@@ -47,7 +47,7 @@ export const TagPopover: React.FC<ITagPopoverProps> = ({
   placement = "top",
   target,
 }) => {
-  const { configuration: config } = React.useContext(ConfigurationContext);
+  const { configuration: config } = useConfigurationContext();
 
   const showTagCardOnHover = config?.ui.showTagCardOnHover ?? true;
 
diff --git a/ui/v2.5/src/components/Tags/TagSelect.tsx b/ui/v2.5/src/components/Tags/TagSelect.tsx
index 9fdc57eaf..5b8da7a6d 100644
--- a/ui/v2.5/src/components/Tags/TagSelect.tsx
+++ b/ui/v2.5/src/components/Tags/TagSelect.tsx
@@ -13,7 +13,7 @@ import {
   queryFindTagsByIDForSelect,
   queryFindTagsForSelect,
 } from "src/core/StashService";
-import { ConfigurationContext } from "src/hooks/Config";
+import { useConfigurationContext } from "src/hooks/Config";
 import { useIntl } from "react-intl";
 import { defaultMaxOptionsShown } from "src/core/config";
 import { ListFilterModel } from "src/models/list-filter/filter";
@@ -67,7 +67,7 @@ export type TagSelectProps = IFilterProps &
 const _TagSelect: React.FC<TagSelectProps> = (props) => {
   const [createTag] = useTagCreate();
 
-  const { configuration } = React.useContext(ConfigurationContext);
+  const { configuration } = useConfigurationContext();
   const intl = useIntl();
   const maxOptionsShown =
     configuration?.ui.maxOptionsShown ?? defaultMaxOptionsShown;
diff --git a/ui/v2.5/src/components/Wall/WallItem.tsx b/ui/v2.5/src/components/Wall/WallItem.tsx
index 5811b7543..959ac1617 100644
--- a/ui/v2.5/src/components/Wall/WallItem.tsx
+++ b/ui/v2.5/src/components/Wall/WallItem.tsx
@@ -12,7 +12,7 @@ import TextUtils from "src/utils/text";
 import NavUtils from "src/utils/navigation";
 import cx from "classnames";
 import { SceneQueue } from "src/models/sceneQueue";
-import { ConfigurationContext } from "src/hooks/Config";
+import { useConfigurationContext } from "src/hooks/Config";
 import { markerTitle } from "src/core/markers";
 import { objectTitle } from "src/core/files";
 
@@ -128,7 +128,7 @@ export const WallItem = <T extends WallItemType>({
 }: IWallItemProps<T>) => {
   const [active, setActive] = useState(false);
   const itemEl = useRef<HTMLDivElement>(null);
-  const { configuration: config } = React.useContext(ConfigurationContext);
+  const { configuration: config } = useConfigurationContext();
 
   const showTextContainer = config?.interface.wallShowTitle ?? true;
 
diff --git a/ui/v2.5/src/docs/en/Manual/Interface.md b/ui/v2.5/src/docs/en/Manual/Interface.md
index 31c7e25d4..cf5911405 100644
--- a/ui/v2.5/src/docs/en/Manual/Interface.md
+++ b/ui/v2.5/src/docs/en/Manual/Interface.md
@@ -4,6 +4,15 @@
 
 Setting the language affects the formatting of numbers and dates.
 
+## SFW Content Mode
+
+SFW Content Mode is used to indicate that the content being managed is _not_ adult content. 
+
+When SFW Content Mode is enabled, the following changes are made to the UI:
+- default performer images are changed to less adult-oriented images
+- certain adult-specific metadata fields are hidden (e.g. performer genital fields)
+- `O`-Counter is replaced with `Like`-counter
+
 ## Scene/Marker Wall Preview Type
 
 The Scene Wall and Marker pages display scene preview videos (mp4) by default. This can be changed to animated image (webp) or static image. 
diff --git a/ui/v2.5/src/hooks/Config.tsx b/ui/v2.5/src/hooks/Config.tsx
index 0b00d0dc5..65ad7122a 100644
--- a/ui/v2.5/src/hooks/Config.tsx
+++ b/ui/v2.5/src/hooks/Config.tsx
@@ -2,14 +2,28 @@ import React from "react";
 import * as GQL from "src/core/generated-graphql";
 
 export interface IContext {
-  configuration?: GQL.ConfigDataFragment;
-  loading?: boolean;
+  configuration: GQL.ConfigDataFragment;
 }
 
-export const ConfigurationContext = React.createContext<IContext>({});
+export const ConfigurationContext = React.createContext<IContext | null>(null);
+
+export const useConfigurationContext = () => {
+  const context = React.useContext(ConfigurationContext);
+
+  if (context === null) {
+    throw new Error(
+      "useConfigurationContext must be used within a ConfigurationProvider"
+    );
+  }
+
+  return context;
+};
+
+export const useConfigurationContextOptional = () => {
+  return React.useContext(ConfigurationContext);
+};
 
 export const ConfigurationProvider: React.FC<IContext> = ({
-  loading,
   configuration,
   children,
 }) => {
@@ -17,7 +31,6 @@ export const ConfigurationProvider: React.FC<IContext> = ({
     <ConfigurationContext.Provider
       value={{
         configuration,
-        loading,
       }}
     >
       {children}
diff --git a/ui/v2.5/src/hooks/Interactive/context.tsx b/ui/v2.5/src/hooks/Interactive/context.tsx
index 9e7194d6a..ccdc948b4 100644
--- a/ui/v2.5/src/hooks/Interactive/context.tsx
+++ b/ui/v2.5/src/hooks/Interactive/context.tsx
@@ -1,5 +1,5 @@
 import React, { useCallback, useContext, useEffect, useState } from "react";
-import { ConfigurationContext } from "../Config";
+import { useConfigurationContext } from "../Config";
 import { useLocalForage } from "../LocalForage";
 import { Interactive as InteractiveAPI } from "./interactive";
 import InteractiveUtils, {
@@ -86,7 +86,7 @@ export const InteractiveProvider: React.FC = ({ children }) => {
     { serverOffset: 0, lastSyncTime: 0 }
   );
 
-  const { configuration: stashConfig } = React.useContext(ConfigurationContext);
+  const { configuration: stashConfig } = useConfigurationContext();
 
   const [state, setState] = useState<ConnectionState>(ConnectionState.Missing);
   const [handyKey, setHandyKey] = useState<string | undefined>(undefined);
diff --git a/ui/v2.5/src/hooks/Lightbox/Lightbox.tsx b/ui/v2.5/src/hooks/Lightbox/Lightbox.tsx
index 5619275ff..f0f057d86 100644
--- a/ui/v2.5/src/hooks/Lightbox/Lightbox.tsx
+++ b/ui/v2.5/src/hooks/Lightbox/Lightbox.tsx
@@ -19,7 +19,7 @@ import usePageVisibility from "../PageVisibility";
 import { useToast } from "../Toast";
 import { FormattedMessage, useIntl } from "react-intl";
 import { LightboxImage } from "./LightboxImage";
-import { ConfigurationContext } from "../Config";
+import { useConfigurationContext } from "../Config";
 import { Link } from "react-router-dom";
 import { OCounterButton } from "src/components/Scenes/SceneDetails/OCounterButton";
 import {
@@ -154,7 +154,7 @@ export const LightboxComponent: React.FC<IProps> = ({
 
   const Toast = useToast();
   const intl = useIntl();
-  const { configuration: config } = React.useContext(ConfigurationContext);
+  const { configuration: config } = useConfigurationContext();
   const [interfaceLocalForage, setInterfaceLocalForage] =
     useInterfaceLocalForage();
 
diff --git a/ui/v2.5/src/hooks/useTableColumns.ts b/ui/v2.5/src/hooks/useTableColumns.ts
index 09d5357d2..ed6380bdb 100644
--- a/ui/v2.5/src/hooks/useTableColumns.ts
+++ b/ui/v2.5/src/hooks/useTableColumns.ts
@@ -1,6 +1,5 @@
-import { useContext } from "react";
 import { useConfigureUI } from "src/core/StashService";
-import { ConfigurationContext } from "src/hooks/Config";
+import { useConfigurationContext } from "src/hooks/Config";
 import { useToast } from "./Toast";
 
 export const useTableColumns = (
@@ -9,7 +8,7 @@ export const useTableColumns = (
 ) => {
   const Toast = useToast();
 
-  const { configuration } = useContext(ConfigurationContext);
+  const { configuration } = useConfigurationContext();
   const [saveUI] = useConfigureUI();
 
   const ui = configuration?.ui;
diff --git a/ui/v2.5/src/index.scss b/ui/v2.5/src/index.scss
index eedc84c01..74599eb34 100755
--- a/ui/v2.5/src/index.scss
+++ b/ui/v2.5/src/index.scss
@@ -10,6 +10,7 @@ $sidebar-width: 250px;
 @import "styles/theme";
 @import "styles/range";
 @import "styles/scrollbars";
+@import "sfw-mode.scss";
 @import "src/components/Changelog/styles.scss";
 @import "src/components/Galleries/styles.scss";
 @import "src/components/Help/styles.scss";
diff --git a/ui/v2.5/src/locales/en-GB.json b/ui/v2.5/src/locales/en-GB.json
index 08297727a..1adcd7671 100644
--- a/ui/v2.5/src/locales/en-GB.json
+++ b/ui/v2.5/src/locales/en-GB.json
@@ -784,6 +784,10 @@
         "description": "Number of times to attempt to scroll before moving to the next/previous item. Only applies for Pan Y scroll mode.",
         "heading": "Scroll attempts before transition"
       },
+      "sfw_mode": {
+        "description": "Enable if using stash to store SFW content. Hides or changes some adult-content-related aspects of the UI.",
+        "heading": "SFW Content Mode"
+      },
       "show_tag_card_on_hover": {
         "description": "Show tag card when hovering tag badges",
         "heading": "Tag card tooltips"
@@ -897,6 +901,7 @@
   "developmentVersion": "Development Version",
   "dialogs": {
     "clear_o_history_confirm": "Are you sure you want to clear the O history?",
+    "clear_o_history_confirm_sfw": "Are you sure you want to clear the like history?",
     "clear_play_history_confirm": "Are you sure you want to clear the play history?",
     "create_new_entity": "Create new {entity}",
     "delete_alert": "The following {count, plural, one {{singularEntity}} other {{pluralEntity}}} will be deleted permanently:",
@@ -1158,6 +1163,7 @@
   "interactive_speed": "Interactive Speed",
   "isMissing": "Is Missing",
   "last_o_at": "Last O At",
+  "last_o_at_sfw": "Last Like At",
   "last_played_at": "Last Played At",
   "library": "Library",
   "loading": {
@@ -1198,9 +1204,11 @@
   "new": "New",
   "none": "None",
   "o_count": "O Count",
-  "o_counter": "O-Counter",
+  "o_count_sfw": "Likes",
   "o_history": "O History",
+  "o_history_sfw": "Like History",
   "odate_recorded_no": "No O Date Recorded",
+  "odate_recorded_no_sfw": "No Like Date Recorded",
   "operations": "Operations",
   "organized": "Organised",
   "orientation": "Orientation",
@@ -1377,25 +1385,28 @@
     },
     "paths": {
       "database_filename_empty_for_default": "database filename (empty for default)",
-      "description": "Next up, we need to determine where to find your porn collection, and where to store the Stash database, generated files and cache files. These settings can be changed later if needed.",
+      "description": "Next up, we need to determine where to find your content, and where to store the Stash database, generated files and cache files. These settings can be changed later if needed.",
       "path_to_blobs_directory_empty_for_default": "path to blobs directory (empty for default)",
       "path_to_cache_directory_empty_for_default": "path to cache directory (empty for default)",
       "path_to_generated_directory_empty_for_default": "path to generated directory (empty for default)",
       "set_up_your_paths": "Set up your paths",
+      "sfw_content_settings": "Using stash for SFW content?",
+      "sfw_content_settings_description": "stash can be used to manage SFW content such as photography, art, comics, and more. Enabling this option will adjust some UI behaviour to be more appropriate for SFW content.",
       "stash_alert": "No library paths have been selected. No media will be able to be scanned into Stash. Are you sure?",
       "store_blobs_in_database": "Store blobs in database",
+      "use_sfw_content_mode": "Use SFW content mode",
       "where_can_stash_store_blobs": "Where can Stash store database binary data?",
       "where_can_stash_store_blobs_description": "Stash can store binary data such as scene covers, performer, studio and tag images either in the database or in the filesystem. By default, it will store this data in the filesystem in the subdirectory <code>blobs</code> within the directory containing your config file. If you want to change this, please enter an absolute or relative (to the current working directory) path. Stash will create this directory if it does not already exist.",
       "where_can_stash_store_blobs_description_addendum": "Alternatively, you can store this data in the database. <strong>Note:</strong> This will increase the size of your database file, and will increase database migration times.",
       "where_can_stash_store_cache_files": "Where can Stash store cache files?",
       "where_can_stash_store_cache_files_description": "In order for some functionality like HLS/DASH live transcoding to function, Stash requires a cache directory for temporary files. By default, Stash will create a <code>cache</code> directory within the directory containing your config file. If you want to change this, please enter an absolute or relative (to the current working directory) path. Stash will create this directory if it does not already exist.",
       "where_can_stash_store_its_database": "Where can Stash store its database?",
-      "where_can_stash_store_its_database_description": "Stash uses an SQLite database to store your porn metadata. By default, this will be created as <code>stash-go.sqlite</code> in the directory containing your config file. If you want to change this, please enter an absolute or relative (to the current working directory) filename.",
+      "where_can_stash_store_its_database_description": "Stash uses an SQLite database to store your content metadata. By default, this will be created as <code>stash-go.sqlite</code> in the directory containing your config file. If you want to change this, please enter an absolute or relative (to the current working directory) filename.",
       "where_can_stash_store_its_database_warning": "WARNING: storing the database on a different system to where Stash is run from (e.g. storing the database on a NAS while running the Stash server on another computer) is <strong>unsupported</strong>! SQLite is not intended for use across a network, and attempting to do so can very easily cause your entire database to become corrupted.",
       "where_can_stash_store_its_generated_content": "Where can Stash store its generated content?",
       "where_can_stash_store_its_generated_content_description": "In order to provide thumbnails, previews and sprites, Stash generates images and videos. This also includes transcodes for unsupported file formats. By default, Stash will create a <code>generated</code> directory within the directory containing your config file. If you want to change where this generated media will be stored, please enter an absolute or relative (to the current working directory) path. Stash will create this directory if it does not already exist.",
-      "where_is_your_porn_located": "Where is your porn located?",
-      "where_is_your_porn_located_description": "Add directories containing your porn videos and images. Stash will use these directories to find videos and images during scanning."
+      "where_is_your_porn_located": "Where is your content located?",
+      "where_is_your_porn_located_description": "Add directories containing your videos and images. Stash will use these directories to find videos and images during scanning."
     },
     "stash_setup_wizard": "Stash Setup Wizard",
     "success": {
diff --git a/ui/v2.5/src/models/list-filter/criteria/criterion.ts b/ui/v2.5/src/models/list-filter/criteria/criterion.ts
index a4d3a145c..8f30e5d17 100644
--- a/ui/v2.5/src/models/list-filter/criteria/criterion.ts
+++ b/ui/v2.5/src/models/list-filter/criteria/criterion.ts
@@ -78,7 +78,7 @@ export abstract class Criterion {
 
   protected cloneValues() {}
 
-  public abstract getLabel(intl: IntlShape): string;
+  public abstract getLabel(intl: IntlShape, sfwContentMode?: boolean): string;
 
   public getId(): string {
     return `${this.criterionOption.type}`;
@@ -148,7 +148,7 @@ export abstract class ModifierCriterion<
       : "";
   }
 
-  public getLabel(intl: IntlShape): string {
+  public getLabel(intl: IntlShape, sfwContentMode: boolean = false): string {
     const modifierString = ModifierCriterion.getModifierLabel(
       intl,
       this.modifier
@@ -162,10 +162,14 @@ export abstract class ModifierCriterion<
       valueString = this.getLabelValue(intl);
     }
 
+    const messageID = !sfwContentMode
+      ? this.criterionOption.messageID
+      : this.criterionOption.sfwMessageID ?? this.criterionOption.messageID;
+
     return intl.formatMessage(
       { id: "criterion_modifier.format_string" },
       {
-        criterion: intl.formatMessage({ id: this.criterionOption.messageID }),
+        criterion: intl.formatMessage({ id: messageID }),
         modifierString,
         valueString,
       }
@@ -257,12 +261,14 @@ interface ICriterionOptionParams {
   type: CriterionType;
   makeCriterion: MakeCriterionFn;
   hidden?: boolean;
+  sfwMessageID?: string;
 }
 
 export class CriterionOption {
   public readonly type: CriterionType;
   public readonly messageID: string;
   public readonly makeCriterionFn: MakeCriterionFn;
+  public readonly sfwMessageID?: string;
 
   // used for legacy criteria that are not shown in the UI
   public readonly hidden: boolean = false;
@@ -272,6 +278,7 @@ export class CriterionOption {
     this.messageID = options.messageID;
     this.makeCriterionFn = options.makeCriterion;
     this.hidden = options.hidden ?? false;
+    this.sfwMessageID = options.sfwMessageID;
   }
 
   public makeCriterion(config?: ConfigDataFragment) {
@@ -478,7 +485,7 @@ export class IHierarchicalLabeledIdCriterion extends ModifierCriterion<IHierarch
     );
   }
 
-  public getLabel(intl: IntlShape): string {
+  public getLabel(intl: IntlShape, sfwContentMode?: boolean): string {
     let id = "criterion_modifier.format_string";
     let modifierString = ModifierCriterion.getModifierLabel(
       intl,
@@ -511,10 +518,14 @@ export class IHierarchicalLabeledIdCriterion extends ModifierCriterion<IHierarch
       }
     }
 
+    const messageID = !sfwContentMode
+      ? this.criterionOption.messageID
+      : this.criterionOption.sfwMessageID ?? this.criterionOption.messageID;
+
     return intl.formatMessage(
       { id },
       {
-        criterion: intl.formatMessage({ id: this.criterionOption.messageID }),
+        criterion: intl.formatMessage({ id: messageID }),
         modifierString,
         valueString,
         excludedString,
@@ -552,9 +563,14 @@ export class StringCriterionOption extends ModifierCriterionOption {
 
 export function createStringCriterionOption(
   type: CriterionType,
-  messageID?: string
+  messageID?: string,
+  options?: { nsfw?: boolean }
 ) {
-  return new StringCriterionOption({ messageID: messageID ?? type, type });
+  return new StringCriterionOption({
+    messageID: messageID ?? type,
+    type,
+    ...options,
+  });
 }
 
 export class MandatoryStringCriterionOption extends ModifierCriterionOption {
@@ -755,7 +771,8 @@ export class MandatoryNumberCriterionOption extends ModifierCriterionOption {
   constructor(
     messageID: string,
     value: CriterionType,
-    makeCriterion?: () => ModifierCriterion<CriterionValue>
+    makeCriterion?: () => ModifierCriterion<CriterionValue>,
+    options?: { sfwMessageID?: string }
   ) {
     super({
       messageID,
@@ -773,15 +790,22 @@ export class MandatoryNumberCriterionOption extends ModifierCriterionOption {
       makeCriterion: makeCriterion
         ? makeCriterion
         : () => new NumberCriterion(this),
+      ...options,
     });
   }
 }
 
 export function createMandatoryNumberCriterionOption(
   value: CriterionType,
-  messageID?: string
+  messageID?: string,
+  options?: { sfwMessageID?: string }
 ) {
-  return new MandatoryNumberCriterionOption(messageID ?? value, value);
+  return new MandatoryNumberCriterionOption(
+    messageID ?? value,
+    value,
+    undefined,
+    options
+  );
 }
 
 export function encodeRangeValue<V>(
diff --git a/ui/v2.5/src/models/list-filter/filter-options.ts b/ui/v2.5/src/models/list-filter/filter-options.ts
index 32b86e786..a63394f35 100644
--- a/ui/v2.5/src/models/list-filter/filter-options.ts
+++ b/ui/v2.5/src/models/list-filter/filter-options.ts
@@ -4,6 +4,7 @@ import { DisplayMode } from "./types";
 export interface ISortByOption {
   messageID: string;
   value: string;
+  sfwMessageID?: string;
 }
 
 export const MediaSortByOptions = [
@@ -22,7 +23,7 @@ export class ListFilterOptions {
   public readonly displayModeOptions: DisplayMode[] = [];
   public readonly criterionOptions: CriterionOption[] = [];
 
-  public static createSortBy(value: string) {
+  public static createSortBy(value: string): ISortByOption {
     return {
       messageID: value,
       value,
diff --git a/ui/v2.5/src/models/list-filter/groups.ts b/ui/v2.5/src/models/list-filter/groups.ts
index 6aed48fdc..5a263b272 100644
--- a/ui/v2.5/src/models/list-filter/groups.ts
+++ b/ui/v2.5/src/models/list-filter/groups.ts
@@ -38,6 +38,7 @@ const sortByOptions = [
     {
       messageID: "o_count",
       value: "o_counter",
+      sfwMessageID: "o_count_sfw",
     },
   ]);
 const displayModeOptions = [DisplayMode.Grid];
@@ -53,7 +54,9 @@ const criterionOptions = [
   RatingCriterionOption,
   PerformersCriterionOption,
   createDateCriterionOption("date"),
-  createMandatoryNumberCriterionOption("o_counter", "o_count"),
+  createMandatoryNumberCriterionOption("o_counter", "o_count", {
+    sfwMessageID: "o_count_sfw",
+  }),
   ContainingGroupsCriterionOption,
   SubGroupsCriterionOption,
   createMandatoryNumberCriterionOption("containing_group_count"),
diff --git a/ui/v2.5/src/models/list-filter/images.ts b/ui/v2.5/src/models/list-filter/images.ts
index d8619112d..4d5630b1c 100644
--- a/ui/v2.5/src/models/list-filter/images.ts
+++ b/ui/v2.5/src/models/list-filter/images.ts
@@ -31,6 +31,7 @@ const sortByOptions = ["filesize", "file_count", "date", ...MediaSortByOptions]
     {
       messageID: "o_count",
       value: "o_counter",
+      sfwMessageID: "o_count_sfw",
     },
   ]);
 const displayModeOptions = [DisplayMode.Grid, DisplayMode.Wall];
@@ -43,7 +44,9 @@ const criterionOptions = [
   PathCriterionOption,
   GalleriesCriterionOption,
   OrganizedCriterionOption,
-  createMandatoryNumberCriterionOption("o_counter", "o_count"),
+  createMandatoryNumberCriterionOption("o_counter", "o_count", {
+    sfwMessageID: "o_count_sfw",
+  }),
   ResolutionCriterionOption,
   OrientationCriterionOption,
   ImageIsMissingCriterionOption,
diff --git a/ui/v2.5/src/models/list-filter/performers.ts b/ui/v2.5/src/models/list-filter/performers.ts
index 2cb3ef216..fcc152d01 100644
--- a/ui/v2.5/src/models/list-filter/performers.ts
+++ b/ui/v2.5/src/models/list-filter/performers.ts
@@ -31,7 +31,6 @@ const sortByOptions = [
   "penis_length",
   "play_count",
   "last_played_at",
-  "last_o_at",
   "career_length",
   "weight",
   "measurements",
@@ -54,6 +53,12 @@ const sortByOptions = [
     {
       messageID: "o_count",
       value: "o_counter",
+      sfwMessageID: "o_count_sfw",
+    },
+    {
+      messageID: "last_o_at",
+      value: "last_o_at",
+      sfwMessageID: "last_o_at_sfw",
     },
   ]);
 
@@ -102,7 +107,9 @@ const criterionOptions = [
   createMandatoryNumberCriterionOption("image_count"),
   createMandatoryNumberCriterionOption("gallery_count"),
   createMandatoryNumberCriterionOption("play_count"),
-  createMandatoryNumberCriterionOption("o_counter", "o_count"),
+  createMandatoryNumberCriterionOption("o_counter", "o_count", {
+    sfwMessageID: "o_count_sfw",
+  }),
   createBooleanCriterionOption("ignore_auto_tag"),
   CountryCriterionOption,
   createNumberCriterionOption("height_cm", "height"),
diff --git a/ui/v2.5/src/models/list-filter/scenes.ts b/ui/v2.5/src/models/list-filter/scenes.ts
index b8dd6515a..cf2791567 100644
--- a/ui/v2.5/src/models/list-filter/scenes.ts
+++ b/ui/v2.5/src/models/list-filter/scenes.ts
@@ -46,7 +46,6 @@ const sortByOptions = [
   "framerate",
   "bitrate",
   "last_played_at",
-  "last_o_at",
   "resume_time",
   "play_duration",
   "play_count",
@@ -62,6 +61,12 @@ const sortByOptions = [
     {
       messageID: "o_count",
       value: "o_counter",
+      sfwMessageID: "o_count_sfw",
+    },
+    {
+      messageID: "last_o_at",
+      value: "last_o_at",
+      sfwMessageID: "last_o_at_sfw",
     },
     {
       messageID: "group_scene_number",
@@ -97,7 +102,9 @@ const criterionOptions = [
   DuplicatedCriterionOption,
   OrganizedCriterionOption,
   RatingCriterionOption,
-  createMandatoryNumberCriterionOption("o_counter", "o_count"),
+  createMandatoryNumberCriterionOption("o_counter", "o_count", {
+    sfwMessageID: "o_count_sfw",
+  }),
   ResolutionCriterionOption,
   OrientationCriterionOption,
   createMandatoryNumberCriterionOption("framerate"),
diff --git a/ui/v2.5/src/sfw-mode.scss b/ui/v2.5/src/sfw-mode.scss
new file mode 100644
index 000000000..9883afb4b
--- /dev/null
+++ b/ui/v2.5/src/sfw-mode.scss
@@ -0,0 +1,91 @@
+// hide nsfw elements when in sfw-content mode
+// stylelint-disable selector-class-pattern
+.sfw-content-mode {
+  // hide adult-oriented performer fields in sort by select
+  .sort-by-select,
+  .performer-table {
+    [data-value="ethnicity"],
+    [data-value="hair_color"],
+    [data-value="eye_color"],
+    [data-value="measurements"],
+    [data-value="weight"],
+    [data-value="weight_kg"],
+    [data-value="penis_length"],
+    [data-value="penis_length_cm"],
+    [data-value="circumcised"],
+    [data-value="fake_tits"] {
+      display: none;
+    }
+  }
+
+  .performer-table {
+    td,
+    th {
+      &.ethnicity,
+      &.hair_color,
+      &.eye_color,
+      &.height,
+      &.measurements,
+      &.weight_kg,
+      &.penis_length_cm,
+      &.circumcised,
+      &.fake_tits {
+        &-head,
+        &-data {
+          display: none;
+        }
+      }
+    }
+  }
+
+  #performer-edit,
+  &.scrape-dialog {
+    [data-field="ethnicity"],
+    [data-field="hair_color"],
+    [data-field="eye_color"],
+    [data-field="measurements"],
+    [data-field="weight"],
+    [data-field="penis_length"],
+    [data-field="circumcised"],
+    [data-field="fake_tits"],
+    [data-field="tattoos"],
+    [data-field="piercings"] {
+      display: none;
+    }
+  }
+
+  &.edit-filter-dialog {
+    [data-type="ethnicity"],
+    [data-type="hair_color"],
+    [data-type="eye_color"],
+    [data-type="measurements"],
+    [data-type="weight"],
+    [data-type="penis_length"],
+    [data-type="circumcised"],
+    [data-type="fake_tits"],
+    [data-type="tattoos"],
+    [data-type="piercings"] {
+      display: none;
+    }
+  }
+
+  #performer-page {
+    .detail-item.ethnicity,
+    .detail-item.hair_color,
+    .detail-item.eye_color,
+    .detail-item.measurements,
+    .detail-item.weight,
+    .detail-item.penis_length,
+    .detail-item.circumcised,
+    .detail-item.fake_tits,
+    .detail-item.tattoos,
+    .detail-item.piercings {
+      display: none;
+    }
+  }
+
+  // hide performer age on performer cards
+  .performer-card__age {
+    display: none;
+  }
+}
diff --git a/ui/v2.5/src/utils/form.tsx b/ui/v2.5/src/utils/form.tsx
index f518d5700..e11d885f8 100644
--- a/ui/v2.5/src/utils/form.tsx
+++ b/ui/v2.5/src/utils/form.tsx
@@ -103,10 +103,14 @@ export function formikUtils<V extends FormikValues>(
     },
   }: IProps = {}
 ) {
-  type Field = keyof V & string;
+  type FieldName = keyof V & string;
   type ErrorMessage = string | undefined;
 
-  function renderFormControl(field: Field, type: string, placeholder: string) {
+  function renderFormControl(
+    field: FieldName,
+    type: string,
+    placeholder: string
+  ) {
     const formikProps = formik.getFieldProps({ name: field, type: type });
     const error = formik.errors[field] as ErrorMessage;
 
@@ -168,38 +172,90 @@ export function formikUtils<V extends FormikValues>(
     );
   }
 
-  function renderField(
-    field: Field,
-    title: string,
-    control: React.ReactNode,
-    props?: IProps
-  ) {
+  const FieldGroup: React.FC<{
+    field: FieldName;
+    title: string;
+    control: React.ReactNode;
+    props?: IProps;
+    className?: string;
+  }> = ({ field, title, control, props, className }) => {
     return (
-      <Form.Group controlId={field} as={Row}>
+      <Form.Group
+        controlId={field}
+        as={Row}
+        className={className ?? ""}
+        data-field={field}
+      >
         <Form.Label {...(props?.labelProps ?? labelProps)}>{title}</Form.Label>
         <Col {...(props?.fieldProps ?? fieldProps)}>{control}</Col>
       </Form.Group>
     );
+  };
+
+  function renderField(
+    field: FieldName,
+    title: string,
+    control: React.ReactNode,
+    props?: IProps,
+    className?: string
+  ) {
+    return (
+      <FieldGroup
+        field={field}
+        title={title}
+        control={control}
+        props={props}
+        className={className}
+      />
+    );
   }
 
-  function renderInputField(
-    field: Field,
-    type: string = "text",
-    messageID: string = field,
-    props?: IProps
-  ) {
+  const InputFieldGroup: React.FC<{
+    field: FieldName;
+    type?: string;
+    messageID?: string;
+    props?: IProps;
+    className?: string;
+  }> = ({ field, type = "text", messageID = field, props, className }) => {
     const title = intl.formatMessage({ id: messageID });
     const control = renderFormControl(field, type, title);
 
-    return renderField(field, title, control, props);
+    return (
+      <FieldGroup
+        field={field}
+        title={title}
+        control={control}
+        props={props}
+        className={className}
+      />
+    );
+  };
+
+  function renderInputField(
+    field: FieldName,
+    type: string = "text",
+    messageID: string = field,
+    props?: IProps,
+    className?: string
+  ) {
+    return (
+      <InputFieldGroup
+        field={field}
+        type={type}
+        messageID={messageID}
+        props={props}
+        className={className}
+      />
+    );
   }
 
-  function renderSelectField(
-    field: Field,
-    entries: Map<string, string>,
-    messageID: string = field,
-    props?: IProps
-  ) {
+  const SelectFieldGroup: React.FC<{
+    field: FieldName;
+    className?: string;
+    entries: Map<string, string>;
+    messageID?: string;
+    props?: IProps;
+  }> = ({ field, className, entries, messageID = field, props }) => {
     const formikProps = formik.getFieldProps(field);
 
     let { value } = formikProps;
@@ -224,11 +280,35 @@ export function formikUtils<V extends FormikValues>(
       </Form.Control>
     );
 
-    return renderField(field, title, control, props);
+    return (
+      <FieldGroup
+        className={className}
+        field={field}
+        title={title}
+        control={control}
+        props={props}
+      />
+    );
+  };
+
+  function renderSelectField(
+    field: FieldName,
+    entries: Map<string, string>,
+    messageID: string = field,
+    props?: IProps
+  ) {
+    return (
+      <SelectFieldGroup
+        field={field}
+        entries={entries}
+        messageID={messageID}
+        props={props}
+      />
+    );
   }
 
   function renderDateField(
-    field: Field,
+    field: FieldName,
     messageID: string = field,
     props?: IProps
   ) {
@@ -248,7 +328,7 @@ export function formikUtils<V extends FormikValues>(
   }
 
   function renderDurationField(
-    field: Field,
+    field: FieldName,
     messageID: string = field,
     props?: IProps
   ) {
@@ -268,7 +348,7 @@ export function formikUtils<V extends FormikValues>(
   }
 
   function renderRatingField(
-    field: Field,
+    field: FieldName,
     messageID: string = field,
     props?: IProps
   ) {
@@ -309,7 +389,7 @@ export function formikUtils<V extends FormikValues>(
   }
 
   function renderStringListField(
-    field: Field,
+    field: FieldName,
     messageID: string = field,
     props?: IProps
   ) {
@@ -332,7 +412,7 @@ export function formikUtils<V extends FormikValues>(
   }
 
   function renderURLListField(
-    field: Field,
+    field: FieldName,
     onScrapeClick?: (url: string) => void,
     urlScrapable?: (url: string) => boolean,
     messageID: string = field,
@@ -359,7 +439,7 @@ export function formikUtils<V extends FormikValues>(
   }
 
   function renderStashIDsField(
-    field: Field,
+    field: FieldName,
     linkType: LinkType,
     messageID: string = field,
     props?: IProps
@@ -405,8 +485,11 @@ export function formikUtils<V extends FormikValues>(
   return {
     renderFormControl,
     renderField,
+    FieldGroup,
     renderInputField,
+    InputFieldGroup,
     renderSelectField,
+    SelectFieldGroup,
     renderDateField,
     renderDurationField,
     renderRatingField,

From 2f65a1da3e67fa8fa860348ca1972961cd31f060 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Tue, 18 Nov 2025 13:45:37 +1100
Subject: [PATCH 142/405] Revert form changes from #6262

Removes the components inside the formikUtils function, which was causing incorrect re-renders.

Adds data-field to renderField instead, which is a far more simple change.
---
 ui/v2.5/src/utils/form.tsx | 141 ++++++++-----------------------------
 1 file changed, 29 insertions(+), 112 deletions(-)

diff --git a/ui/v2.5/src/utils/form.tsx b/ui/v2.5/src/utils/form.tsx
index e11d885f8..1fef74cf2 100644
--- a/ui/v2.5/src/utils/form.tsx
+++ b/ui/v2.5/src/utils/form.tsx
@@ -103,14 +103,10 @@ export function formikUtils<V extends FormikValues>(
     },
   }: IProps = {}
 ) {
-  type FieldName = keyof V & string;
+  type Field = keyof V & string;
   type ErrorMessage = string | undefined;
 
-  function renderFormControl(
-    field: FieldName,
-    type: string,
-    placeholder: string
-  ) {
+  function renderFormControl(field: Field, type: string, placeholder: string) {
     const formikProps = formik.getFieldProps({ name: field, type: type });
     const error = formik.errors[field] as ErrorMessage;
 
@@ -172,90 +168,38 @@ export function formikUtils<V extends FormikValues>(
     );
   }
 
-  const FieldGroup: React.FC<{
-    field: FieldName;
-    title: string;
-    control: React.ReactNode;
-    props?: IProps;
-    className?: string;
-  }> = ({ field, title, control, props, className }) => {
+  function renderField(
+    field: Field,
+    title: string,
+    control: React.ReactNode,
+    props?: IProps
+  ) {
     return (
-      <Form.Group
-        controlId={field}
-        as={Row}
-        className={className ?? ""}
-        data-field={field}
-      >
+      <Form.Group controlId={field} as={Row} data-field={field}>
         <Form.Label {...(props?.labelProps ?? labelProps)}>{title}</Form.Label>
         <Col {...(props?.fieldProps ?? fieldProps)}>{control}</Col>
       </Form.Group>
     );
-  };
-
-  function renderField(
-    field: FieldName,
-    title: string,
-    control: React.ReactNode,
-    props?: IProps,
-    className?: string
-  ) {
-    return (
-      <FieldGroup
-        field={field}
-        title={title}
-        control={control}
-        props={props}
-        className={className}
-      />
-    );
   }
 
-  const InputFieldGroup: React.FC<{
-    field: FieldName;
-    type?: string;
-    messageID?: string;
-    props?: IProps;
-    className?: string;
-  }> = ({ field, type = "text", messageID = field, props, className }) => {
+  function renderInputField(
+    field: Field,
+    type: string = "text",
+    messageID: string = field,
+    props?: IProps
+  ) {
     const title = intl.formatMessage({ id: messageID });
     const control = renderFormControl(field, type, title);
 
-    return (
-      <FieldGroup
-        field={field}
-        title={title}
-        control={control}
-        props={props}
-        className={className}
-      />
-    );
-  };
-
-  function renderInputField(
-    field: FieldName,
-    type: string = "text",
-    messageID: string = field,
-    props?: IProps,
-    className?: string
-  ) {
-    return (
-      <InputFieldGroup
-        field={field}
-        type={type}
-        messageID={messageID}
-        props={props}
-        className={className}
-      />
-    );
+    return renderField(field, title, control, props);
   }
 
-  const SelectFieldGroup: React.FC<{
-    field: FieldName;
-    className?: string;
-    entries: Map<string, string>;
-    messageID?: string;
-    props?: IProps;
-  }> = ({ field, className, entries, messageID = field, props }) => {
+  function renderSelectField(
+    field: Field,
+    entries: Map<string, string>,
+    messageID: string = field,
+    props?: IProps
+  ) {
     const formikProps = formik.getFieldProps(field);
 
     let { value } = formikProps;
@@ -280,35 +224,11 @@ export function formikUtils<V extends FormikValues>(
       </Form.Control>
     );
 
-    return (
-      <FieldGroup
-        className={className}
-        field={field}
-        title={title}
-        control={control}
-        props={props}
-      />
-    );
-  };
-
-  function renderSelectField(
-    field: FieldName,
-    entries: Map<string, string>,
-    messageID: string = field,
-    props?: IProps
-  ) {
-    return (
-      <SelectFieldGroup
-        field={field}
-        entries={entries}
-        messageID={messageID}
-        props={props}
-      />
-    );
+    return renderField(field, title, control, props);
   }
 
   function renderDateField(
-    field: FieldName,
+    field: Field,
     messageID: string = field,
     props?: IProps
   ) {
@@ -328,7 +248,7 @@ export function formikUtils<V extends FormikValues>(
   }
 
   function renderDurationField(
-    field: FieldName,
+    field: Field,
     messageID: string = field,
     props?: IProps
   ) {
@@ -348,7 +268,7 @@ export function formikUtils<V extends FormikValues>(
   }
 
   function renderRatingField(
-    field: FieldName,
+    field: Field,
     messageID: string = field,
     props?: IProps
   ) {
@@ -389,7 +309,7 @@ export function formikUtils<V extends FormikValues>(
   }
 
   function renderStringListField(
-    field: FieldName,
+    field: Field,
     messageID: string = field,
     props?: IProps
   ) {
@@ -412,7 +332,7 @@ export function formikUtils<V extends FormikValues>(
   }
 
   function renderURLListField(
-    field: FieldName,
+    field: Field,
     onScrapeClick?: (url: string) => void,
     urlScrapable?: (url: string) => boolean,
     messageID: string = field,
@@ -439,7 +359,7 @@ export function formikUtils<V extends FormikValues>(
   }
 
   function renderStashIDsField(
-    field: FieldName,
+    field: Field,
     linkType: LinkType,
     messageID: string = field,
     props?: IProps
@@ -485,11 +405,8 @@ export function formikUtils<V extends FormikValues>(
   return {
     renderFormControl,
     renderField,
-    FieldGroup,
     renderInputField,
-    InputFieldGroup,
     renderSelectField,
-    SelectFieldGroup,
     renderDateField,
     renderDurationField,
     renderRatingField,

From 78aeb06f20f719f73e6ce905a99908accc0f98b8 Mon Sep 17 00:00:00 2001
From: feederbox826 <me@feederbox.cc>
Date: Mon, 17 Nov 2025 22:04:22 -0500
Subject: [PATCH 143/405] add lumberjack log rotation (#5696)

* [logging] add UI and graphql for maximum log size
* [logger] set default size to 0MB and don't rotate
---
 cmd/stash/main.go                             |  4 +--
 go.mod                                        |  1 +
 go.sum                                        |  2 ++
 graphql/schema/types/config.graphql           |  4 +++
 internal/api/resolver_mutation_configure.go   |  4 +++
 internal/api/resolver_query_configuration.go  |  1 +
 internal/log/logger.go                        | 30 ++++++++++++-------
 internal/manager/config/config.go             | 26 +++++++++++-----
 ui/v2.5/graphql/data/config.graphql           |  1 +
 .../Settings/SettingsSystemPanel.tsx          |  8 +++++
 ui/v2.5/src/locales/en-GB.json                |  2 ++
 11 files changed, 64 insertions(+), 19 deletions(-)

diff --git a/cmd/stash/main.go b/cmd/stash/main.go
index 86edd6276..e3a54f020 100644
--- a/cmd/stash/main.go
+++ b/cmd/stash/main.go
@@ -110,7 +110,7 @@ func main() {
 // Logs only error level message to stderr.
 func initLogTemp() *log.Logger {
 	l := log.NewLogger()
-	l.Init("", true, "Error")
+	l.Init("", true, "Error", 0)
 	logger.Logger = l
 
 	return l
@@ -118,7 +118,7 @@ func initLogTemp() *log.Logger {
 
 func initLog(cfg *config.Config) *log.Logger {
 	l := log.NewLogger()
-	l.Init(cfg.GetLogFile(), cfg.GetLogOut(), cfg.GetLogLevel())
+	l.Init(cfg.GetLogFile(), cfg.GetLogOut(), cfg.GetLogLevel(), cfg.GetLogFileMaxSize())
 	logger.Logger = l
 
 	return l
diff --git a/go.mod b/go.mod
index bf2eb0f6e..4d6b78dc6 100644
--- a/go.mod
+++ b/go.mod
@@ -63,6 +63,7 @@ require (
 	golang.org/x/text v0.25.0
 	golang.org/x/time v0.10.0
 	gopkg.in/guregu/null.v4 v4.0.0
+	gopkg.in/natefinch/lumberjack.v2 v2.2.1
 	gopkg.in/yaml.v2 v2.4.0
 )
 
diff --git a/go.sum b/go.sum
index dced0768f..bc84b1f23 100644
--- a/go.sum
+++ b/go.sum
@@ -1122,6 +1122,8 @@ gopkg.in/ini.v1 v1.66.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/ini.v1 v1.66.3/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
 gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
+gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc=
+gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/graphql/schema/types/config.graphql b/graphql/schema/types/config.graphql
index 63ce3ea1c..6a1ac72be 100644
--- a/graphql/schema/types/config.graphql
+++ b/graphql/schema/types/config.graphql
@@ -155,6 +155,8 @@ input ConfigGeneralInput {
   logLevel: String
   "Whether to log http access"
   logAccess: Boolean
+  "Maximum log size"
+  logFileMaxSize: Int
   "True if galleries should be created from folders with images"
   createGalleriesFromFolders: Boolean
   "Regex used to identify images as gallery covers"
@@ -279,6 +281,8 @@ type ConfigGeneralResult {
   logLevel: String!
   "Whether to log http access"
   logAccess: Boolean!
+  "Maximum log size"
+  logFileMaxSize: Int!
   "Array of video file extensions"
   videoExtensions: [String!]!
   "Array of image file extensions"
diff --git a/internal/api/resolver_mutation_configure.go b/internal/api/resolver_mutation_configure.go
index ba46a115a..3299c01a8 100644
--- a/internal/api/resolver_mutation_configure.go
+++ b/internal/api/resolver_mutation_configure.go
@@ -334,6 +334,10 @@ func (r *mutationResolver) ConfigureGeneral(ctx context.Context, input ConfigGen
 		logger.SetLogLevel(*input.LogLevel)
 	}
 
+	if input.LogFileMaxSize != nil && *input.LogFileMaxSize != c.GetLogFileMaxSize() {
+		c.SetInt(config.LogFileMaxSize, *input.LogFileMaxSize)
+	}
+
 	if input.Excludes != nil {
 		for _, r := range input.Excludes {
 			_, err := regexp.Compile(r)
diff --git a/internal/api/resolver_query_configuration.go b/internal/api/resolver_query_configuration.go
index 5952dd41e..7213f8447 100644
--- a/internal/api/resolver_query_configuration.go
+++ b/internal/api/resolver_query_configuration.go
@@ -115,6 +115,7 @@ func makeConfigGeneralResult() *ConfigGeneralResult {
 		LogOut:                        config.GetLogOut(),
 		LogLevel:                      config.GetLogLevel(),
 		LogAccess:                     config.GetLogAccess(),
+		LogFileMaxSize:                config.GetLogFileMaxSize(),
 		VideoExtensions:               config.GetVideoExtensions(),
 		ImageExtensions:               config.GetImageExtensions(),
 		GalleryExtensions:             config.GetGalleryExtensions(),
diff --git a/internal/log/logger.go b/internal/log/logger.go
index 5f686d32d..cb07121a5 100644
--- a/internal/log/logger.go
+++ b/internal/log/logger.go
@@ -3,12 +3,14 @@ package log
 
 import (
 	"fmt"
+	"io"
 	"os"
 	"strings"
 	"sync"
 	"time"
 
 	"github.com/sirupsen/logrus"
+	lumberjack "gopkg.in/natefinch/lumberjack.v2"
 )
 
 type LogItem struct {
@@ -41,8 +43,8 @@ func NewLogger() *Logger {
 }
 
 // Init initialises the logger based on a logging configuration
-func (log *Logger) Init(logFile string, logOut bool, logLevel string) {
-	var file *os.File
+func (log *Logger) Init(logFile string, logOut bool, logLevel string, logFileMaxSize int) {
+	var logger io.WriteCloser
 	customFormatter := new(logrus.TextFormatter)
 	customFormatter.TimestampFormat = "2006-01-02 15:04:05"
 	customFormatter.ForceColors = true
@@ -57,30 +59,38 @@ func (log *Logger) Init(logFile string, logOut bool, logLevel string) {
 	// the access log colouring not being applied
 	_, _ = customFormatter.Format(logrus.NewEntry(log.logger))
 
+	// if size is 0, disable rotation
 	if logFile != "" {
-		var err error
-		file, err = os.OpenFile(logFile, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0644)
-
-		if err != nil {
-			fmt.Printf("Could not open '%s' for log output due to error: %s\n", logFile, err.Error())
+		if logFileMaxSize == 0 {
+			var err error
+			logger, err = os.OpenFile(logFile, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0644)
+			if err != nil {
+				fmt.Fprintf(os.Stderr, "unable to open log file %s: %v\n", logFile, err)
+			}
+		} else {
+			logger = &lumberjack.Logger{
+				Filename: logFile,
+				MaxSize:  logFileMaxSize, // Megabytes
+				Compress: true,
+			}
 		}
 	}
 
-	if file != nil {
+	if logger != nil {
 		if logOut {
 			// log to file separately disabling colours
 			fileFormatter := new(logrus.TextFormatter)
 			fileFormatter.TimestampFormat = customFormatter.TimestampFormat
 			fileFormatter.FullTimestamp = customFormatter.FullTimestamp
 			log.logger.AddHook(&fileLogHook{
-				Writer:    file,
+				Writer:    logger,
 				Formatter: fileFormatter,
 			})
 		} else {
 			// logging to file only
 			// turn off the colouring for the file
 			customFormatter.ForceColors = false
-			log.logger.Out = file
+			log.logger.Out = logger
 		}
 	}
 
diff --git a/internal/manager/config/config.go b/internal/manager/config/config.go
index a351cc872..eda863663 100644
--- a/internal/manager/config/config.go
+++ b/internal/manager/config/config.go
@@ -252,13 +252,15 @@ const (
 	DLNAPortDefault = 1338
 
 	// Logging options
-	LogFile          = "logfile"
-	LogOut           = "logout"
-	defaultLogOut    = true
-	LogLevel         = "loglevel"
-	defaultLogLevel  = "Info"
-	LogAccess        = "logaccess"
-	defaultLogAccess = true
+	LogFile               = "logfile"
+	LogOut                = "logout"
+	defaultLogOut         = true
+	LogLevel              = "loglevel"
+	defaultLogLevel       = "Info"
+	LogAccess             = "logaccess"
+	defaultLogAccess      = true
+	LogFileMaxSize        = "logfile_max_size"
+	defaultLogFileMaxSize = 0 // megabytes, default disabled
 
 	// Default settings
 	DefaultScanSettings     = "defaults.scan_task"
@@ -1636,6 +1638,16 @@ func (i *Config) GetLogAccess() bool {
 	return i.getBoolDefault(LogAccess, defaultLogAccess)
 }
 
+// GetLogFileMaxSize returns the maximum size of the log file in megabytes for lumberjack to rotate
+func (i *Config) GetLogFileMaxSize() int {
+	value := i.getInt(LogFileMaxSize)
+	if value < 0 {
+		value = defaultLogFileMaxSize
+	}
+
+	return value
+}
+
 // Max allowed graphql upload size in megabytes
 func (i *Config) GetMaxUploadSize() int64 {
 	i.RLock()
diff --git a/ui/v2.5/graphql/data/config.graphql b/ui/v2.5/graphql/data/config.graphql
index 95d55864f..192fb8053 100644
--- a/ui/v2.5/graphql/data/config.graphql
+++ b/ui/v2.5/graphql/data/config.graphql
@@ -37,6 +37,7 @@ fragment ConfigGeneralData on ConfigGeneralResult {
   logOut
   logLevel
   logAccess
+  logFileMaxSize
   createGalleriesFromFolders
   galleryCoverRegex
   videoExtensions
diff --git a/ui/v2.5/src/components/Settings/SettingsSystemPanel.tsx b/ui/v2.5/src/components/Settings/SettingsSystemPanel.tsx
index a3ab150db..3baeca1e2 100644
--- a/ui/v2.5/src/components/Settings/SettingsSystemPanel.tsx
+++ b/ui/v2.5/src/components/Settings/SettingsSystemPanel.tsx
@@ -465,6 +465,14 @@ export const SettingsConfigurationPanel: React.FC = () => {
           checked={general.logAccess ?? false}
           onChange={(v) => saveGeneral({ logAccess: v })}
         />
+
+        <NumberSetting
+          id="log-file-max-size"
+          headingID="config.general.auth.log_file_max_size"
+          subHeadingID="config.general.auth.log_file_max_size_desc"
+          value={general.logFileMaxSize ?? 10}
+          onChange={(v) => saveGeneral({ logFileMaxSize: v })}
+        />
       </SettingSection>
     </>
   );
diff --git a/ui/v2.5/src/locales/en-GB.json b/ui/v2.5/src/locales/en-GB.json
index 1adcd7671..6a230736a 100644
--- a/ui/v2.5/src/locales/en-GB.json
+++ b/ui/v2.5/src/locales/en-GB.json
@@ -301,6 +301,8 @@
         "log_http_desc": "Logs http access to the terminal. Requires restart.",
         "log_to_terminal": "Log to terminal",
         "log_to_terminal_desc": "Logs to the terminal in addition to a file. Always true if file logging is disabled. Requires restart.",
+        "log_file_max_size": "Maximum log size",
+        "log_file_max_size_desc": "Maximum size in megabytes of the log file before it is compressed. 0MB is disabled. Requires restart.",
         "maximum_session_age": "Maximum Session Age",
         "maximum_session_age_desc": "Maximum idle time before a login session is expired, in seconds. Requires restart.",
         "password": "Password",

From a31df336f874c1d340487f11457f992862db6fb8 Mon Sep 17 00:00:00 2001
From: Gykes <24581046+Gykes@users.noreply.github.com>
Date: Mon, 17 Nov 2025 20:05:55 -0800
Subject: [PATCH 144/405] Remove style for Studio URLs (#6291)

---
 ui/v2.5/src/components/Studios/styles.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ui/v2.5/src/components/Studios/styles.scss b/ui/v2.5/src/components/Studios/styles.scss
index eaab21d10..772f42db1 100644
--- a/ui/v2.5/src/components/Studios/styles.scss
+++ b/ui/v2.5/src/components/Studios/styles.scss
@@ -49,5 +49,9 @@
       display: none;
     }
   }
+
+  .detail-item.urls ul {
+    list-style-type: none;
+  }
   /* stylelint-enable selector-class-pattern */
 }

From 367b96df0f003e1e75db44e4f859bee7541d7007 Mon Sep 17 00:00:00 2001
From: Gykes <24581046+Gykes@users.noreply.github.com>
Date: Mon, 17 Nov 2025 20:06:25 -0800
Subject: [PATCH 145/405] Bug Fix: Update Macos Version Check (#6289)

---
 internal/api/check_version.go | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/internal/api/check_version.go b/internal/api/check_version.go
index 6279997d7..f4c2950f1 100644
--- a/internal/api/check_version.go
+++ b/internal/api/check_version.go
@@ -7,8 +7,10 @@ import (
 	"fmt"
 	"io"
 	"net/http"
+	"os"
 	"regexp"
 	"runtime"
+	"strings"
 	"time"
 
 	"golang.org/x/sys/cpu"
@@ -36,6 +38,24 @@ var stashReleases = func() map[string]string {
 	}
 }
 
+// isMacOSBundle checks if the application is running from within a macOS .app bundle
+func isMacOSBundle() bool {
+	exec, err := os.Executable()
+	return err == nil && strings.Contains(exec, "Stash.app/")
+}
+
+// getWantedRelease determines which release variant to download based on platform and bundle type
+func getWantedRelease(platform string) string {
+	release := stashReleases()[platform]
+
+	// On macOS, check if running from .app bundle
+	if runtime.GOOS == "darwin" && isMacOSBundle() {
+		return "Stash.app.zip"
+	}
+
+	return release
+}
+
 type githubReleasesResponse struct {
 	Url              string
 	Assets_url       string
@@ -168,7 +188,7 @@ func GetLatestRelease(ctx context.Context) (*LatestRelease, error) {
 	}
 
 	platform := fmt.Sprintf("%s/%s", runtime.GOOS, arch)
-	wantedRelease := stashReleases()[platform]
+	wantedRelease := getWantedRelease(platform)
 
 	url := apiReleases
 	if build.IsDevelop() {

From 33b59e02afcad97727acae5219cfabffa40244af Mon Sep 17 00:00:00 2001
From: feederbox826 <me@feederbox.cc>
Date: Mon, 17 Nov 2025 23:07:08 -0500
Subject: [PATCH 146/405] [markers] ignore generating markers past end (#6290)

---
 internal/manager/task_generate_markers.go | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/internal/manager/task_generate_markers.go b/internal/manager/task_generate_markers.go
index f37c7aed1..cfe17926c 100644
--- a/internal/manager/task_generate_markers.go
+++ b/internal/manager/task_generate_markers.go
@@ -107,6 +107,12 @@ func (t *GenerateMarkersTask) generateMarker(videoFile *models.VideoFile, scene
 	sceneHash := scene.GetHash(t.fileNamingAlgorithm)
 	seconds := float64(sceneMarker.Seconds)
 
+	// check if marker past duration
+	if seconds > float64(videoFile.Duration) {
+		logger.Warnf("[generator] scene marker at %.2f seconds exceeds video duration of %.2f seconds, skipping", seconds, float64(videoFile.Duration))
+		return
+	}
+
 	g := t.generator
 
 	if err := g.MarkerPreviewVideo(context.TODO(), videoFile.Path, sceneHash, seconds, sceneMarker.EndSeconds, instance.Config.GetPreviewAudio()); err != nil {

From 2332401dbfbcdbb943dac09e89e8f9ed87856a02 Mon Sep 17 00:00:00 2001
From: NodudeWasTaken <75137537+NodudeWasTaken@users.noreply.github.com>
Date: Tue, 18 Nov 2025 23:10:00 +0100
Subject: [PATCH 147/405] Fix missing saved filter overwrite translation
 (#6294)

This translation was renamed from _confirm to _warning.
---
 ui/v2.5/src/components/List/SavedFilterList.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/v2.5/src/components/List/SavedFilterList.tsx b/ui/v2.5/src/components/List/SavedFilterList.tsx
index 83c6d8a65..df1d6136a 100644
--- a/ui/v2.5/src/components/List/SavedFilterList.tsx
+++ b/ui/v2.5/src/components/List/SavedFilterList.tsx
@@ -222,7 +222,7 @@ const OverwriteAlert: React.FC<{
     <Modal show>
       <Modal.Body>
         <FormattedMessage
-          id="dialogs.overwrite_filter_confirm"
+          id="dialogs.overwrite_filter_warning"
           values={{
             entityName: overwritingFilter.name,
           }}

From 68ebeda5c8a1580ba9d30f4734819412c48d9d59 Mon Sep 17 00:00:00 2001
From: feederbox826 <me@feederbox.cc>
Date: Tue, 18 Nov 2025 21:28:20 -0500
Subject: [PATCH 148/405] Sanitise intent URL (#6297)

---
 .../src/components/Scenes/SceneDetails/ExternalPlayerButton.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/ExternalPlayerButton.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/ExternalPlayerButton.tsx
index b17dfb6bb..3701f4138 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/ExternalPlayerButton.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/ExternalPlayerButton.tsx
@@ -29,7 +29,7 @@ export const ExternalPlayerButton: React.FC<IExternalPlayerButtonProps> = ({
   const streamURL = new URL(stream);
   if (isAndroid) {
     const scheme = streamURL.protocol.slice(0, -1);
-    streamURL.hash = `Intent;action=android.intent.action.VIEW;scheme=${scheme};type=video/mp4;S.title=${encodeURI(
+    streamURL.hash = `Intent;action=android.intent.action.VIEW;scheme=${scheme};type=video/mp4;S.title=${encodeURIComponent(
       title
     )};end`;
 

From 58b68333800cda4e7a7e7678ba2d9e9a6ab62d27 Mon Sep 17 00:00:00 2001
From: feederbox826 <me@feederbox.cc>
Date: Tue, 18 Nov 2025 21:29:15 -0500
Subject: [PATCH 149/405] make airplay follow chromecast enable (#6296)

---
 ui/v2.5/src/components/ScenePlayer/ScenePlayer.tsx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ui/v2.5/src/components/ScenePlayer/ScenePlayer.tsx b/ui/v2.5/src/components/ScenePlayer/ScenePlayer.tsx
index e07c0091d..cab5f22a8 100644
--- a/ui/v2.5/src/components/ScenePlayer/ScenePlayer.tsx
+++ b/ui/v2.5/src/components/ScenePlayer/ScenePlayer.tsx
@@ -369,7 +369,9 @@ export const ScenePlayer: React.FC<IScenePlayerProps> = PatchComponent(
           },
         },
         plugins: {
-          airPlay: {},
+          airPlay: {
+            addButtonToControlBar: uiConfig?.enableChromecast ?? false,
+          },
           chromecast: {},
           vttThumbnails: {
             showTimestamp: true,
@@ -428,7 +430,7 @@ export const ScenePlayer: React.FC<IScenePlayerProps> = PatchComponent(
       };
       // empty deps - only init once
       // showAbLoopControls is necessary to re-init the player when the config changes
-    }, [uiConfig?.showAbLoopControls]);
+    }, [uiConfig?.showAbLoopControls, uiConfig?.enableChromecast]);
 
     useEffect(() => {
       const player = getPlayer();

From 2cac7d5b20b5729d76ad6381ec4e066a8a59ccea Mon Sep 17 00:00:00 2001
From: Gykes <24581046+Gykes@users.noreply.github.com>
Date: Mon, 24 Nov 2025 13:17:51 -0800
Subject: [PATCH 150/405] Bugfix: Add extra date formats. (#6305)

---
 pkg/utils/date.go      | 12 +++++++
 pkg/utils/date_test.go | 80 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 92 insertions(+)
 create mode 100644 pkg/utils/date_test.go

diff --git a/pkg/utils/date.go b/pkg/utils/date.go
index de5566e4d..511cf8a4f 100644
--- a/pkg/utils/date.go
+++ b/pkg/utils/date.go
@@ -23,5 +23,17 @@ func ParseDateStringAsTime(dateString string) (time.Time, error) {
 		return t, nil
 	}
 
+	// Support partial dates: year-month format
+	t, e = time.Parse("2006-01", dateString)
+	if e == nil {
+		return t, nil
+	}
+
+	// Support partial dates: year only format
+	t, e = time.Parse("2006", dateString)
+	if e == nil {
+		return t, nil
+	}
+
 	return time.Time{}, fmt.Errorf("ParseDateStringAsTime failed: dateString <%s>", dateString)
 }
diff --git a/pkg/utils/date_test.go b/pkg/utils/date_test.go
new file mode 100644
index 000000000..f3622ca40
--- /dev/null
+++ b/pkg/utils/date_test.go
@@ -0,0 +1,80 @@
+package utils
+
+import (
+	"testing"
+	"time"
+)
+
+func TestParseDateStringAsTime(t *testing.T) {
+	tests := []struct {
+		name        string
+		input       string
+		expectError bool
+	}{
+		// Full date formats (existing support)
+		{"RFC3339", "2014-01-02T15:04:05Z", false},
+		{"Date only", "2014-01-02", false},
+		{"Date with time", "2014-01-02 15:04:05", false},
+
+		// Partial date formats (new support)
+		{"Year-Month", "2006-08", false},
+		{"Year only", "2014", false},
+
+		// Invalid formats
+		{"Invalid format", "not-a-date", true},
+		{"Empty string", "", true},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result, err := ParseDateStringAsTime(tt.input)
+
+			if tt.expectError {
+				if err == nil {
+					t.Errorf("Expected error for input %q, but got none", tt.input)
+				}
+			} else {
+				if err != nil {
+					t.Errorf("Unexpected error for input %q: %v", tt.input, err)
+				}
+				if result.IsZero() {
+					t.Errorf("Expected non-zero time for input %q", tt.input)
+				}
+			}
+		})
+	}
+}
+
+func TestParseDateStringAsTime_YearOnly(t *testing.T) {
+	result, err := ParseDateStringAsTime("2014")
+	if err != nil {
+		t.Fatalf("Failed to parse year-only date: %v", err)
+	}
+
+	if result.Year() != 2014 {
+		t.Errorf("Expected year 2014, got %d", result.Year())
+	}
+	if result.Month() != time.January {
+		t.Errorf("Expected month January, got %s", result.Month())
+	}
+	if result.Day() != 1 {
+		t.Errorf("Expected day 1, got %d", result.Day())
+	}
+}
+
+func TestParseDateStringAsTime_YearMonth(t *testing.T) {
+	result, err := ParseDateStringAsTime("2006-08")
+	if err != nil {
+		t.Fatalf("Failed to parse year-month date: %v", err)
+	}
+
+	if result.Year() != 2006 {
+		t.Errorf("Expected year 2006, got %d", result.Year())
+	}
+	if result.Month() != time.August {
+		t.Errorf("Expected month August, got %s", result.Month())
+	}
+	if result.Day() != 1 {
+		t.Errorf("Expected day 1, got %d", result.Day())
+	}
+}

From e176cf5f7114083333e1f019a0bd18928956eab6 Mon Sep 17 00:00:00 2001
From: DogmaDragon <103123951+DogmaDragon@users.noreply.github.com>
Date: Mon, 24 Nov 2025 23:35:05 +0200
Subject: [PATCH 151/405] Document "# requires" in the plugin config (#6306)

* Document "# requires" in the plugin config
* Add missing line breaks in UIPluginApi documentation
---
 ui/v2.5/src/docs/en/Manual/Plugins.md     | 9 +++++++--
 ui/v2.5/src/docs/en/Manual/UIPluginApi.md | 2 ++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ui/v2.5/src/docs/en/Manual/Plugins.md b/ui/v2.5/src/docs/en/Manual/Plugins.md
index f7517aa2c..cd24e0d4a 100644
--- a/ui/v2.5/src/docs/en/Manual/Plugins.md
+++ b/ui/v2.5/src/docs/en/Manual/Plugins.md
@@ -65,8 +65,11 @@ Plugins provide tasks which can be run from the Tasks page.
 
 The basic structure of a plugin configuration file is as follows:
 
-```
-name: <plugin name>
+```yaml
+name: <plugin name> 
+# optional list of dependencies to be included
+# "#" is is part of the config - do not remove
+# requires: <plugin ID>
 description: <optional description of the plugin>
 version: <optional version tag>
 url: <optional url>
@@ -121,6 +124,8 @@ tasks:
 
 The `name`, `description`, `version` and `url` fields are displayed on the plugins page.
 
+`# requires` will make the plugin manager select plugins matching the specified IDs to be automatically installed as dependencies. Only works with plugins within the same index.
+
 The `exec`, `interface`, `errLog` and `tasks` fields are used only for plugins with tasks.
 
 The `settings` field is used to display plugin settings on the plugins page. Plugin settings can also be set using the graphql mutation `configurePlugin` - the settings set this way do _not_ need to be specified in the `settings` field unless they are to be displayed in the stock plugin settings UI.
diff --git a/ui/v2.5/src/docs/en/Manual/UIPluginApi.md b/ui/v2.5/src/docs/en/Manual/UIPluginApi.md
index 23cd3fd64..67d837ed7 100644
--- a/ui/v2.5/src/docs/en/Manual/UIPluginApi.md
+++ b/ui/v2.5/src/docs/en/Manual/UIPluginApi.md
@@ -23,6 +23,7 @@ This namespace contains the generated graphql client interface. This is a low-le
 ### `libraries`
 
 `libraries` provides access to the following UI libraries:
+
 - `ReactRouterDOM`
 - `Bootstrap`
 - `Apollo`
@@ -149,6 +150,7 @@ InteractiveUtils.interactiveClientProvider = (
 ### `hooks`
 
 This namespace provides access to the following core utility hooks:
+
 - `useGalleryLightbox`
 - `useLightbox`
 - `useSpriteInfo`

From 5d02f916c21a41be74141eed3ed9d36dc94f740c Mon Sep 17 00:00:00 2001
From: Gykes <24581046+Gykes@users.noreply.github.com>
Date: Mon, 24 Nov 2025 13:58:57 -0800
Subject: [PATCH 152/405] Check for dupe IDs against boxes (#6309)

---
 pkg/models/stash_ids.go | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/pkg/models/stash_ids.go b/pkg/models/stash_ids.go
index 7751c2ef0..d761e959f 100644
--- a/pkg/models/stash_ids.go
+++ b/pkg/models/stash_ids.go
@@ -79,10 +79,23 @@ func (s StashIDInputs) ToStashIDs() StashIDs {
 		return nil
 	}
 
-	ret := make(StashIDs, len(s))
-	for i, v := range s {
-		ret[i] = v.ToStashID()
+	// #2800 - deduplicate StashIDs based on endpoint and stash_id
+	ret := make(StashIDs, 0, len(s))
+	seen := make(map[string]map[string]bool)
+
+	for _, v := range s {
+		stashID := v.ToStashID()
+
+		if seen[stashID.Endpoint] == nil {
+			seen[stashID.Endpoint] = make(map[string]bool)
+		}
+
+		if !seen[stashID.Endpoint][stashID.StashID] {
+			seen[stashID.Endpoint][stashID.StashID] = true
+			ret = append(ret, stashID)
+		}
 	}
+
 	return ret
 }
 

From ca8ee6bc2a8dc4ca46785b4c16baec1746d93ac0 Mon Sep 17 00:00:00 2001
From: feederbox826 <me@feederbox.cc>
Date: Mon, 24 Nov 2025 17:12:23 -0500
Subject: [PATCH 153/405] add MediaSession plugin (#6298)

---
 .../components/ScenePlayer/ScenePlayer.tsx    | 17 +++++
 .../components/ScenePlayer/media-session.ts   | 71 +++++++++++++++++++
 2 files changed, 88 insertions(+)
 create mode 100644 ui/v2.5/src/components/ScenePlayer/media-session.ts

diff --git a/ui/v2.5/src/components/ScenePlayer/ScenePlayer.tsx b/ui/v2.5/src/components/ScenePlayer/ScenePlayer.tsx
index cab5f22a8..c566eb1b3 100644
--- a/ui/v2.5/src/components/ScenePlayer/ScenePlayer.tsx
+++ b/ui/v2.5/src/components/ScenePlayer/ScenePlayer.tsx
@@ -22,6 +22,7 @@ import "./vtt-thumbnails";
 import "./big-buttons";
 import "./track-activity";
 import "./vrmode";
+import "./media-session";
 import cx from "classnames";
 import {
   useSceneSaveActivity,
@@ -397,6 +398,7 @@ export const ScenePlayer: React.FC<IScenePlayerProps> = PatchComponent(
             pauseBeforeLooping: false,
             createButtons: uiConfig?.showAbLoopControls ?? false,
           },
+          mediaSession: {},
         },
       };
 
@@ -874,6 +876,21 @@ export const ScenePlayer: React.FC<IScenePlayerProps> = PatchComponent(
       return () => player.off("ended");
     }, [getPlayer, onComplete]);
 
+    // set up mediaSession plugin
+    useEffect(() => {
+      const player = getPlayer();
+      if (!player) return;
+
+      // set up mediasession plugin
+      player
+        .mediaSession()
+        .setMetadata(
+          scene?.title ?? "Stash",
+          scene?.studio?.name ?? "Stash",
+          scene.paths.screenshot || ""
+        );
+    }, [getPlayer, scene]);
+
     function onScrubberScroll() {
       if (started.current) {
         getPlayer()?.pause();
diff --git a/ui/v2.5/src/components/ScenePlayer/media-session.ts b/ui/v2.5/src/components/ScenePlayer/media-session.ts
new file mode 100644
index 000000000..7be1d0d4e
--- /dev/null
+++ b/ui/v2.5/src/components/ScenePlayer/media-session.ts
@@ -0,0 +1,71 @@
+import videojs, { VideoJsPlayer } from "video.js";
+
+class MediaSessionPlugin extends videojs.getPlugin("plugin") {
+  constructor(player: VideoJsPlayer) {
+    super(player);
+
+    player.ready(() => {
+      player.addClass("vjs-media-session");
+      this.setActionHandlers();
+    });
+
+    player.on("play", () => {
+      this.updatePlaybackState();
+    });
+
+    player.on("pause", () => {
+      this.updatePlaybackState();
+    });
+    this.updatePlaybackState();
+  }
+
+  // manually set poster since it's only set on useEffect
+  public setMetadata(title: string, studioName: string, poster: string): void {
+    if ("mediaSession" in navigator) {
+      navigator.mediaSession.metadata = new MediaMetadata({
+        title,
+        artist: studioName,
+        artwork: [
+          {
+            src: poster || this.player.poster() || "",
+            type: "image/jpeg",
+          },
+        ],
+      });
+    }
+  }
+
+  private updatePlaybackState(): void {
+    if ("mediaSession" in navigator) {
+      const playbackState = this.player.paused() ? "paused" : "playing";
+      navigator.mediaSession.playbackState = playbackState;
+    }
+  }
+
+  private setActionHandlers(): void {
+    // method initialization
+    navigator.mediaSession.setActionHandler("play", () => {
+      this.player.play();
+    });
+    navigator.mediaSession.setActionHandler("pause", () => {
+      this.player.pause();
+    });
+    navigator.mediaSession.setActionHandler("nexttrack", () => {
+      this.player.skipButtons()?.handleForward();
+    });
+    navigator.mediaSession.setActionHandler("previoustrack", () => {
+      this.player.skipButtons()?.handleBackward();
+    });
+  }
+}
+
+videojs.registerPlugin("mediaSession", MediaSessionPlugin);
+
+/* eslint-disable @typescript-eslint/naming-convention */
+declare module "video.js" {
+  interface VideoJsPlayer {
+    mediaSession: () => MediaSessionPlugin;
+  }
+}
+
+export default MediaSessionPlugin;

From ecd9c6ec5bdce26aeece0b80f159dcf4cc11e58f Mon Sep 17 00:00:00 2001
From: Slick Daddy <129640104+slick-daddy@users.noreply.github.com>
Date: Tue, 25 Nov 2025 02:06:36 +0300
Subject: [PATCH 154/405] Show O Counter in Studio card (#5982)

Co-authored-by: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
---
 graphql/schema/types/studio.graphql           |  1 +
 internal/api/resolver_model_studio.go         | 18 ++++++++++++++++
 pkg/models/mocks/ImageReaderWriter.go         | 21 +++++++++++++++++++
 pkg/models/mocks/SceneReaderWriter.go         | 21 +++++++++++++++++++
 pkg/models/repository_image.go                |  1 +
 pkg/models/repository_scene.go                |  1 +
 pkg/sqlite/image.go                           | 14 +++++++++++++
 pkg/sqlite/scene.go                           | 17 +++++++++++++++
 ui/v2.5/graphql/data/studio-slim.graphql      |  1 +
 ui/v2.5/graphql/data/studio.graphql           |  1 +
 ui/v2.5/src/components/Studios/StudioCard.tsx |  9 ++++++++
 .../Studios/StudioDetails/Studio.tsx          | 18 ++++++++++------
 ui/v2.5/src/components/Studios/styles.scss    | 21 +++++++++++++++++++
 13 files changed, 138 insertions(+), 6 deletions(-)

diff --git a/graphql/schema/types/studio.graphql b/graphql/schema/types/studio.graphql
index 097f04eb3..4c5778c5b 100644
--- a/graphql/schema/types/studio.graphql
+++ b/graphql/schema/types/studio.graphql
@@ -25,6 +25,7 @@ type Studio {
   updated_at: Time!
   groups: [Group!]!
   movies: [Movie!]! @deprecated(reason: "use groups instead")
+  o_counter: Int
 }
 
 input StudioCreateInput {
diff --git a/internal/api/resolver_model_studio.go b/internal/api/resolver_model_studio.go
index 850d42b54..fabcf38bd 100644
--- a/internal/api/resolver_model_studio.go
+++ b/internal/api/resolver_model_studio.go
@@ -143,6 +143,24 @@ func (r *studioResolver) MovieCount(ctx context.Context, obj *models.Studio, dep
 	return r.GroupCount(ctx, obj, depth)
 }
 
+func (r *studioResolver) OCounter(ctx context.Context, obj *models.Studio) (ret *int, err error) {
+	var res_scene int
+	var res_image int
+	var res int
+	if err := r.withReadTxn(ctx, func(ctx context.Context) error {
+		res_scene, err = r.repository.Scene.OCountByStudioID(ctx, obj.ID)
+		if err != nil {
+			return err
+		}
+		res_image, err = r.repository.Image.OCountByStudioID(ctx, obj.ID)
+		return err
+	}); err != nil {
+		return nil, err
+	}
+	res = res_scene + res_image
+	return &res, nil
+}
+
 func (r *studioResolver) ParentStudio(ctx context.Context, obj *models.Studio) (ret *models.Studio, err error) {
 	if obj.ParentID == nil {
 		return nil, nil
diff --git a/pkg/models/mocks/ImageReaderWriter.go b/pkg/models/mocks/ImageReaderWriter.go
index 2bbf4ceeb..afc5efdb7 100644
--- a/pkg/models/mocks/ImageReaderWriter.go
+++ b/pkg/models/mocks/ImageReaderWriter.go
@@ -594,6 +594,27 @@ func (_m *ImageReaderWriter) OCountByPerformerID(ctx context.Context, performerI
 	return r0, r1
 }
 
+// OCountByStudioID provides a mock function with given fields: ctx, studioID
+func (_m *ImageReaderWriter) OCountByStudioID(ctx context.Context, studioID int) (int, error) {
+	ret := _m.Called(ctx, studioID)
+
+	var r0 int
+	if rf, ok := ret.Get(0).(func(context.Context, int) int); ok {
+		r0 = rf(ctx, studioID)
+	} else {
+		r0 = ret.Get(0).(int)
+	}
+
+	var r1 error
+	if rf, ok := ret.Get(1).(func(context.Context, int) error); ok {
+		r1 = rf(ctx, studioID)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
 // Query provides a mock function with given fields: ctx, options
 func (_m *ImageReaderWriter) Query(ctx context.Context, options models.ImageQueryOptions) (*models.ImageQueryResult, error) {
 	ret := _m.Called(ctx, options)
diff --git a/pkg/models/mocks/SceneReaderWriter.go b/pkg/models/mocks/SceneReaderWriter.go
index bec31b6f2..ef10c890d 100644
--- a/pkg/models/mocks/SceneReaderWriter.go
+++ b/pkg/models/mocks/SceneReaderWriter.go
@@ -1183,6 +1183,27 @@ func (_m *SceneReaderWriter) OCountByPerformerID(ctx context.Context, performerI
 	return r0, r1
 }
 
+// OCountByStudioID provides a mock function with given fields: ctx, studioID
+func (_m *SceneReaderWriter) OCountByStudioID(ctx context.Context, studioID int) (int, error) {
+	ret := _m.Called(ctx, studioID)
+
+	var r0 int
+	if rf, ok := ret.Get(0).(func(context.Context, int) int); ok {
+		r0 = rf(ctx, studioID)
+	} else {
+		r0 = ret.Get(0).(int)
+	}
+
+	var r1 error
+	if rf, ok := ret.Get(1).(func(context.Context, int) error); ok {
+		r1 = rf(ctx, studioID)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
 // PlayDuration provides a mock function with given fields: ctx
 func (_m *SceneReaderWriter) PlayDuration(ctx context.Context) (float64, error) {
 	ret := _m.Called(ctx)
diff --git a/pkg/models/repository_image.go b/pkg/models/repository_image.go
index 1455d7762..672ecd063 100644
--- a/pkg/models/repository_image.go
+++ b/pkg/models/repository_image.go
@@ -38,6 +38,7 @@ type ImageCounter interface {
 	CountByGalleryID(ctx context.Context, galleryID int) (int, error)
 	OCount(ctx context.Context) (int, error)
 	OCountByPerformerID(ctx context.Context, performerID int) (int, error)
+	OCountByStudioID(ctx context.Context, studioID int) (int, error)
 }
 
 // ImageCreator provides methods to create images.
diff --git a/pkg/models/repository_scene.go b/pkg/models/repository_scene.go
index fe0f473fb..8c2833470 100644
--- a/pkg/models/repository_scene.go
+++ b/pkg/models/repository_scene.go
@@ -45,6 +45,7 @@ type SceneCounter interface {
 	CountMissingOSHash(ctx context.Context) (int, error)
 	OCountByPerformerID(ctx context.Context, performerID int) (int, error)
 	OCountByGroupID(ctx context.Context, groupID int) (int, error)
+	OCountByStudioID(ctx context.Context, studioID int) (int, error)
 }
 
 // SceneCreator provides methods to create scenes.
diff --git a/pkg/sqlite/image.go b/pkg/sqlite/image.go
index 6575ebb91..1588fa415 100644
--- a/pkg/sqlite/image.go
+++ b/pkg/sqlite/image.go
@@ -682,6 +682,20 @@ func (qb *ImageStore) OCountByPerformerID(ctx context.Context, performerID int)
 	return ret, nil
 }
 
+func (qb *ImageStore) OCountByStudioID(ctx context.Context, studioID int) (int, error) {
+	table := qb.table()
+	q := dialect.Select(goqu.COALESCE(goqu.SUM("o_counter"), 0)).From(table).Where(
+		table.Col(studioIDColumn).Eq(studioID),
+	)
+
+	var ret int
+	if err := querySimple(ctx, q, &ret); err != nil {
+		return 0, err
+	}
+
+	return ret, nil
+}
+
 func (qb *ImageStore) OCount(ctx context.Context) (int, error) {
 	table := qb.table()
 
diff --git a/pkg/sqlite/scene.go b/pkg/sqlite/scene.go
index 23f5ef482..40feb5847 100644
--- a/pkg/sqlite/scene.go
+++ b/pkg/sqlite/scene.go
@@ -818,6 +818,23 @@ func (qb *SceneStore) OCountByGroupID(ctx context.Context, groupID int) (int, er
 	return ret, nil
 }
 
+func (qb *SceneStore) OCountByStudioID(ctx context.Context, studioID int) (int, error) {
+	table := qb.table()
+	oHistoryTable := goqu.T(scenesODatesTable)
+
+	q := dialect.Select(goqu.COUNT("*")).From(table).InnerJoin(
+		oHistoryTable,
+		goqu.On(table.Col(idColumn).Eq(oHistoryTable.Col(sceneIDColumn))),
+	).Where(table.Col(studioIDColumn).Eq(studioID))
+
+	var ret int
+	if err := querySimple(ctx, q, &ret); err != nil {
+		return 0, err
+	}
+
+	return ret, nil
+}
+
 func (qb *SceneStore) FindByGroupID(ctx context.Context, groupID int) ([]*models.Scene, error) {
 	sq := dialect.From(scenesGroupsJoinTable).Select(scenesGroupsJoinTable.Col(sceneIDColumn)).Where(
 		scenesGroupsJoinTable.Col(groupIDColumn).Eq(groupID),
diff --git a/ui/v2.5/graphql/data/studio-slim.graphql b/ui/v2.5/graphql/data/studio-slim.graphql
index cf101bd04..c48f7d93e 100644
--- a/ui/v2.5/graphql/data/studio-slim.graphql
+++ b/ui/v2.5/graphql/data/studio-slim.graphql
@@ -17,4 +17,5 @@ fragment SlimStudioData on Studio {
     id
     name
   }
+  o_counter
 }
diff --git a/ui/v2.5/graphql/data/studio.graphql b/ui/v2.5/graphql/data/studio.graphql
index d4ba79887..aabec7a9b 100644
--- a/ui/v2.5/graphql/data/studio.graphql
+++ b/ui/v2.5/graphql/data/studio.graphql
@@ -39,6 +39,7 @@ fragment StudioData on Studio {
   tags {
     ...SlimTagData
   }
+  o_counter
 }
 
 fragment SelectStudioData on Studio {
diff --git a/ui/v2.5/src/components/Studios/StudioCard.tsx b/ui/v2.5/src/components/Studios/StudioCard.tsx
index 5cd1cc209..01b2b5c5a 100644
--- a/ui/v2.5/src/components/Studios/StudioCard.tsx
+++ b/ui/v2.5/src/components/Studios/StudioCard.tsx
@@ -13,6 +13,7 @@ import { RatingBanner } from "../Shared/RatingBanner";
 import { FavoriteIcon } from "../Shared/FavoriteIcon";
 import { useStudioUpdate } from "src/core/StashService";
 import { faTag } from "@fortawesome/free-solid-svg-icons";
+import { OCounterButton } from "../Shared/CountButton";
 
 interface IProps {
   studio: GQL.StudioDataFragment;
@@ -175,6 +176,12 @@ export const StudioCard: React.FC<IProps> = ({
     );
   }
 
+  function maybeRenderOCounter() {
+    if (!studio.o_counter) return;
+
+    return <OCounterButton value={studio.o_counter} />;
+  }
+
   function maybeRenderPopoverButtonGroup() {
     if (
       studio.scene_count ||
@@ -182,6 +189,7 @@ export const StudioCard: React.FC<IProps> = ({
       studio.gallery_count ||
       studio.group_count ||
       studio.performer_count ||
+      studio.o_counter ||
       studio.tags.length > 0
     ) {
       return (
@@ -194,6 +202,7 @@ export const StudioCard: React.FC<IProps> = ({
             {maybeRenderGalleriesPopoverButton()}
             {maybeRenderPerformersPopoverButton()}
             {maybeRenderTagPopoverButton()}
+            {maybeRenderOCounter()}
           </ButtonGroup>
         </>
       );
diff --git a/ui/v2.5/src/components/Studios/StudioDetails/Studio.tsx b/ui/v2.5/src/components/Studios/StudioDetails/Studio.tsx
index c26ed0c73..2edc53fe1 100644
--- a/ui/v2.5/src/components/Studios/StudioDetails/Studio.tsx
+++ b/ui/v2.5/src/components/Studios/StudioDetails/Studio.tsx
@@ -48,6 +48,7 @@ import { ExternalLinkButtons } from "src/components/Shared/ExternalLinksButton";
 import { AliasList } from "src/components/Shared/DetailsPage/AliasList";
 import { HeaderImage } from "src/components/Shared/DetailsPage/HeaderImage";
 import { goBackOrReplace } from "src/utils/history";
+import { OCounterButton } from "src/components/Shared/CountButton";
 
 interface IProps {
   studio: GQL.StudioDataFragment;
@@ -471,12 +472,17 @@ const StudioPage: React.FC<IProps> = ({ studio, tabKey }) => {
               </DetailTitle>
 
               <AliasList aliases={studio.aliases} />
-              <RatingSystem
-                value={studio.rating100}
-                onSetRating={(value) => setRating(value)}
-                clickToRate
-                withoutContext
-              />
+              <div className="quality-group">
+                <RatingSystem
+                  value={studio.rating100}
+                  onSetRating={(value) => setRating(value)}
+                  clickToRate
+                  withoutContext
+                />
+                {!!studio.o_counter && (
+                  <OCounterButton value={studio.o_counter} />
+                )}
+              </div>
               {!isEditing && (
                 <StudioDetailsPanel
                   studio={studio}
diff --git a/ui/v2.5/src/components/Studios/styles.scss b/ui/v2.5/src/components/Studios/styles.scss
index 772f42db1..0526902b7 100644
--- a/ui/v2.5/src/components/Studios/styles.scss
+++ b/ui/v2.5/src/components/Studios/styles.scss
@@ -41,6 +41,27 @@
     width: auto;
   }
 
+  .quality-group {
+    display: inline-flex;
+    margin-top: 0.25rem;
+  }
+
+  // The following min-width declarations prevent
+  // the O-Count from moving around
+  // when hovering over rating stars
+  .rating-stars-precision-full .star-rating-number {
+    min-width: 0.75rem;
+  }
+
+  .rating-stars-precision-half .star-rating-number,
+  .rating-stars-precision-tenth .star-rating-number {
+    min-width: 1.45rem;
+  }
+
+  .rating-stars-precision-quarter .star-rating-number {
+    min-width: 2rem;
+  }
+
   // the detail element ids are the same as field type name
   // which don't follow the correct convention
   /* stylelint-disable selector-class-pattern */

From dc520e2b2fe91631afd1ccac199e90beadec8927 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Tue, 25 Nov 2025 10:11:39 +1100
Subject: [PATCH 155/405] Ignore empty studio alias in ScrapedStudio (#6313)

---
 pkg/models/model_scraped_item.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/models/model_scraped_item.go b/pkg/models/model_scraped_item.go
index 131f08be1..417564db5 100644
--- a/pkg/models/model_scraped_item.go
+++ b/pkg/models/model_scraped_item.go
@@ -62,7 +62,7 @@ func (s *ScrapedStudio) ToStudio(endpoint string, excluded map[string]bool) *Stu
 		ret.Details = *s.Details
 	}
 
-	if s.Aliases != nil && !excluded["aliases"] {
+	if s.Aliases != nil && *s.Aliases != "" && !excluded["aliases"] {
 		ret.Aliases = NewRelatedStrings(stringslice.FromString(*s.Aliases, ","))
 	}
 

From 50ad3c0778a5027340c7f9049f47b6ad851bca93 Mon Sep 17 00:00:00 2001
From: feederbox826 <me@feederbox.cc>
Date: Mon, 24 Nov 2025 22:41:01 -0500
Subject: [PATCH 156/405] [MediaSession] fall back to performers if studio not
 available (#6315)

---
 ui/v2.5/src/components/ScenePlayer/ScenePlayer.tsx  | 4 +++-
 ui/v2.5/src/components/ScenePlayer/media-session.ts | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ui/v2.5/src/components/ScenePlayer/ScenePlayer.tsx b/ui/v2.5/src/components/ScenePlayer/ScenePlayer.tsx
index c566eb1b3..77c0d2b19 100644
--- a/ui/v2.5/src/components/ScenePlayer/ScenePlayer.tsx
+++ b/ui/v2.5/src/components/ScenePlayer/ScenePlayer.tsx
@@ -882,11 +882,13 @@ export const ScenePlayer: React.FC<IScenePlayerProps> = PatchComponent(
       if (!player) return;
 
       // set up mediasession plugin
+      // get performer names as array
+      const performers = scene?.performers.map((p) => p.name).join(", ");
       player
         .mediaSession()
         .setMetadata(
           scene?.title ?? "Stash",
-          scene?.studio?.name ?? "Stash",
+          scene?.studio?.name ?? performers ?? "Stash",
           scene.paths.screenshot || ""
         );
     }, [getPlayer, scene]);
diff --git a/ui/v2.5/src/components/ScenePlayer/media-session.ts b/ui/v2.5/src/components/ScenePlayer/media-session.ts
index 7be1d0d4e..b3ce2d0ea 100644
--- a/ui/v2.5/src/components/ScenePlayer/media-session.ts
+++ b/ui/v2.5/src/components/ScenePlayer/media-session.ts
@@ -20,11 +20,11 @@ class MediaSessionPlugin extends videojs.getPlugin("plugin") {
   }
 
   // manually set poster since it's only set on useEffect
-  public setMetadata(title: string, studioName: string, poster: string): void {
+  public setMetadata(title: string, artist: string, poster: string): void {
     if ("mediaSession" in navigator) {
       navigator.mediaSession.metadata = new MediaMetadata({
         title,
-        artist: studioName,
+        artist,
         artwork: [
           {
             src: poster || this.player.poster() || "",

From d6a29533719459d05addd0f5b2dc04775edaa76b Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Tue, 25 Nov 2025 17:36:13 +1100
Subject: [PATCH 157/405] Refactor filtered list toolbar (#6317)

* Refactor list operation buttons into a single button group
* Refactor ListFilter into FilteredListToolbar and restyle
* Move zoom keybinds out of zoom control
* Use button group for display mode select
* Hide zoom slider on xs devices
---
 .../src/components/Galleries/GalleryList.tsx  |   1 -
 ui/v2.5/src/components/Groups/GroupList.tsx   |   1 -
 ui/v2.5/src/components/Images/ImageList.tsx   |   1 -
 .../components/List/FilteredListToolbar.tsx   |  69 ++++++----
 ui/v2.5/src/components/List/ItemList.tsx      |  13 +-
 ui/v2.5/src/components/List/ListFilter.tsx    | 112 +---------------
 .../components/List/ListOperationButtons.tsx  | 126 +++++++++---------
 .../src/components/List/ListViewOptions.tsx   |  74 ++++++++--
 ui/v2.5/src/components/List/ZoomSlider.tsx    |  29 ++--
 ui/v2.5/src/components/List/styles.scss       |  15 ++-
 .../components/Performers/PerformerList.tsx   |   1 -
 ui/v2.5/src/components/Scenes/SceneList.tsx   |   5 +
 .../src/components/Scenes/SceneMarkerList.tsx |   1 -
 ui/v2.5/src/components/Studios/StudioList.tsx |   1 -
 ui/v2.5/src/components/Tags/TagList.tsx       |   1 -
 15 files changed, 208 insertions(+), 242 deletions(-)

diff --git a/ui/v2.5/src/components/Galleries/GalleryList.tsx b/ui/v2.5/src/components/Galleries/GalleryList.tsx
index a0930b927..105557175 100644
--- a/ui/v2.5/src/components/Galleries/GalleryList.tsx
+++ b/ui/v2.5/src/components/Galleries/GalleryList.tsx
@@ -195,7 +195,6 @@ export const GalleryList: React.FC<IGalleryList> = ({
       selectable
     >
       <ItemList
-        zoomable
         view={view}
         otherOperations={otherOperations}
         addKeybinds={addKeybinds}
diff --git a/ui/v2.5/src/components/Groups/GroupList.tsx b/ui/v2.5/src/components/Groups/GroupList.tsx
index 707b6fa4b..aade245b0 100644
--- a/ui/v2.5/src/components/Groups/GroupList.tsx
+++ b/ui/v2.5/src/components/Groups/GroupList.tsx
@@ -226,7 +226,6 @@ export const GroupList: React.FC<IGroupList> = ({
       selectable={selectable}
     >
       <ItemList
-        zoomable
         view={view}
         otherOperations={otherOperations}
         addKeybinds={addKeybinds}
diff --git a/ui/v2.5/src/components/Images/ImageList.tsx b/ui/v2.5/src/components/Images/ImageList.tsx
index df10ff4b5..0e3753480 100644
--- a/ui/v2.5/src/components/Images/ImageList.tsx
+++ b/ui/v2.5/src/components/Images/ImageList.tsx
@@ -458,7 +458,6 @@ export const ImageList: React.FC<IImageList> = ({
       selectable
     >
       <ItemList
-        zoomable
         view={view}
         otherOperations={otherOperations}
         addKeybinds={addKeybinds}
diff --git a/ui/v2.5/src/components/List/FilteredListToolbar.tsx b/ui/v2.5/src/components/List/FilteredListToolbar.tsx
index 656b07470..24ef7b539 100644
--- a/ui/v2.5/src/components/List/FilteredListToolbar.tsx
+++ b/ui/v2.5/src/components/List/FilteredListToolbar.tsx
@@ -2,8 +2,8 @@ import React from "react";
 import { QueryResult } from "@apollo/client";
 import { ListFilterModel } from "src/models/list-filter/filter";
 import { IconDefinition } from "@fortawesome/fontawesome-svg-core";
-import { ListFilter } from "./ListFilter";
-import { ListViewOptions } from "./ListViewOptions";
+import { PageSizeSelector, SearchTermInput, SortBySelect } from "./ListFilter";
+import { ListViewButtonGroup } from "./ListViewOptions";
 import {
   IListFilterOperation,
   ListOperationButtons,
@@ -11,6 +11,8 @@ import {
 import { ButtonGroup, ButtonToolbar } from "react-bootstrap";
 import { View } from "./views";
 import { IListSelect, useFilterOperations } from "./util";
+import { SavedFilterDropdown } from "./SavedFilterList";
+import { FilterButton } from "./Filters/FilterButton";
 
 export interface IItemListOperation<T extends QueryResult> {
   text: string;
@@ -63,34 +65,47 @@ export const FilteredListToolbar: React.FC<IFilteredListToolbar> = ({
 
   return (
     <ButtonToolbar className="filtered-list-toolbar">
+      <SearchTermInput filter={filter} onFilterUpdate={setFilter} />
+
       <ButtonGroup>
-        {showEditFilter && (
-          <ListFilter
-            onFilterUpdate={setFilter}
-            filter={filter}
-            openFilterDialog={() => showEditFilter()}
-            view={view}
-          />
-        )}
-        <ListOperationButtons
-          onSelectAll={onSelectAll}
-          onSelectNone={onSelectNone}
-          otherOperations={operations}
-          itemsSelected={selectedIds.size > 0}
-          onEdit={onEdit}
-          onDelete={onDelete}
+        <SavedFilterDropdown
+          filter={filter}
+          onSetFilter={setFilter}
+          view={view}
         />
-        <ButtonGroup>
-          <ListViewOptions
-            displayMode={filter.displayMode}
-            displayModeOptions={filterOptions.displayModeOptions}
-            onSetDisplayMode={setDisplayMode}
-            zoomIndex={zoomable ? filter.zoomIndex : undefined}
-            onSetZoom={zoomable ? setZoom : undefined}
-          />
-        </ButtonGroup>
+        <FilterButton onClick={() => showEditFilter()} count={filter.count()} />
       </ButtonGroup>
-      <ButtonGroup></ButtonGroup>
+
+      <SortBySelect
+        sortBy={filter.sortBy}
+        sortDirection={filter.sortDirection}
+        options={filterOptions.sortByOptions}
+        onChangeSortBy={(e) => setFilter(filter.setSortBy(e ?? undefined))}
+        onChangeSortDirection={() => setFilter(filter.toggleSortDirection())}
+        onReshuffleRandomSort={() => setFilter(filter.reshuffleRandomSort())}
+      />
+
+      <PageSizeSelector
+        pageSize={filter.itemsPerPage}
+        setPageSize={(size) => setFilter(filter.setPageSize(size))}
+      />
+
+      <ListOperationButtons
+        onSelectAll={onSelectAll}
+        onSelectNone={onSelectNone}
+        otherOperations={operations}
+        itemsSelected={selectedIds.size > 0}
+        onEdit={onEdit}
+        onDelete={onDelete}
+      />
+
+      <ListViewButtonGroup
+        displayMode={filter.displayMode}
+        displayModeOptions={filterOptions.displayModeOptions}
+        onSetDisplayMode={setDisplayMode}
+        zoomIndex={zoomable ? filter.zoomIndex : undefined}
+        onSetZoom={zoomable ? setZoom : undefined}
+      />
     </ButtonToolbar>
   );
 };
diff --git a/ui/v2.5/src/components/List/ItemList.tsx b/ui/v2.5/src/components/List/ItemList.tsx
index f1d811ff2..b68077b55 100644
--- a/ui/v2.5/src/components/List/ItemList.tsx
+++ b/ui/v2.5/src/components/List/ItemList.tsx
@@ -43,6 +43,8 @@ import {
 } from "./FilteredListToolbar";
 import { PagedList } from "./PagedList";
 import { useConfigurationContext } from "src/hooks/Config";
+import { useZoomKeybinds } from "./ZoomSlider";
+import { DisplayMode } from "src/models/list-filter/types";
 
 interface IFilteredItemList<T extends QueryResult, E extends IHasID = IHasID> {
   filterStateProps: IFilterStateHook;
@@ -112,7 +114,6 @@ export function useFilteredItemList<
 
 interface IItemListProps<T extends QueryResult, E extends IHasID> {
   view?: View;
-  zoomable?: boolean;
   otherOperations?: IItemListOperation<T>[];
   renderContent: (
     result: T,
@@ -144,7 +145,6 @@ export const ItemList = <T extends QueryResult, E extends IHasID>(
 ) => {
   const {
     view,
-    zoomable,
     otherOperations,
     renderContent,
     renderEditDialog,
@@ -216,6 +216,15 @@ export const ItemList = <T extends QueryResult, E extends IHasID>(
     showEditFilter,
   });
 
+  const zoomable =
+    filter.displayMode === DisplayMode.Grid ||
+    filter.displayMode === DisplayMode.Wall;
+
+  useZoomKeybinds({
+    zoomIndex: zoomable ? filter.zoomIndex : undefined,
+    onChangeZoom: (zoom) => updateFilter(filter.setZoom(zoom)),
+  });
+
   useEffect(() => {
     if (addKeybinds) {
       const unbindExtras = addKeybinds(result, effectiveFilter, selectedIds);
diff --git a/ui/v2.5/src/components/List/ListFilter.tsx b/ui/v2.5/src/components/List/ListFilter.tsx
index b40951081..ff3be0360 100644
--- a/ui/v2.5/src/components/List/ListFilter.tsx
+++ b/ui/v2.5/src/components/List/ListFilter.tsx
@@ -1,4 +1,3 @@
-import cloneDeep from "lodash-es/cloneDeep";
 import React, {
   useCallback,
   useEffect,
@@ -23,17 +22,14 @@ import {
 import { Icon } from "../Shared/Icon";
 import { ListFilterModel } from "src/models/list-filter/filter";
 import useFocus from "src/utils/focus";
-import { FormattedMessage, useIntl } from "react-intl";
-import { SavedFilterDropdown } from "./SavedFilterList";
+import { useIntl } from "react-intl";
 import {
   faCaretDown,
   faCaretUp,
   faCheck,
   faRandom,
 } from "@fortawesome/free-solid-svg-icons";
-import { FilterButton } from "./Filters/FilterButton";
 import { useDebounce } from "src/hooks/debounce";
-import { View } from "./views";
 import { ClearableInput } from "../Shared/ClearableInput";
 import { useStopWheelScroll } from "src/utils/form";
 import { ISortByOption } from "src/models/list-filter/filter-options";
@@ -330,109 +326,3 @@ export const SortBySelect: React.FC<{
     </Dropdown>
   );
 };
-
-interface IListFilterProps {
-  onFilterUpdate: (newFilter: ListFilterModel) => void;
-  filter: ListFilterModel;
-  view?: View;
-  openFilterDialog: () => void;
-}
-
-export const ListFilter: React.FC<IListFilterProps> = ({
-  onFilterUpdate,
-  filter,
-  openFilterDialog,
-  view,
-}) => {
-  const filterOptions = filter.options;
-
-  useEffect(() => {
-    Mousetrap.bind("r", () => onReshuffleRandomSort());
-
-    return () => {
-      Mousetrap.unbind("r");
-    };
-  });
-
-  function onChangePageSize(pp: number) {
-    const newFilter = cloneDeep(filter);
-    newFilter.itemsPerPage = pp;
-    newFilter.currentPage = 1;
-    onFilterUpdate(newFilter);
-  }
-
-  function onChangeSortDirection() {
-    const newFilter = cloneDeep(filter);
-    if (filter.sortDirection === SortDirectionEnum.Asc) {
-      newFilter.sortDirection = SortDirectionEnum.Desc;
-    } else {
-      newFilter.sortDirection = SortDirectionEnum.Asc;
-    }
-
-    onFilterUpdate(newFilter);
-  }
-
-  function onChangeSortBy(eventKey: string | null) {
-    const newFilter = cloneDeep(filter);
-    newFilter.sortBy = eventKey ?? undefined;
-    newFilter.currentPage = 1;
-    onFilterUpdate(newFilter);
-  }
-
-  function onReshuffleRandomSort() {
-    const newFilter = cloneDeep(filter);
-    newFilter.currentPage = 1;
-    newFilter.randomSeed = -1;
-    onFilterUpdate(newFilter);
-  }
-
-  function render() {
-    return (
-      <>
-        <div className="d-flex">
-          <SearchTermInput filter={filter} onFilterUpdate={onFilterUpdate} />
-        </div>
-
-        <ButtonGroup className="mr-2">
-          <SavedFilterDropdown
-            filter={filter}
-            onSetFilter={(f) => {
-              onFilterUpdate(f);
-            }}
-            view={view}
-          />
-          <OverlayTrigger
-            placement="top"
-            overlay={
-              <Tooltip id="filter-tooltip">
-                <FormattedMessage id="search_filter.name" />
-              </Tooltip>
-            }
-          >
-            <FilterButton
-              onClick={() => openFilterDialog()}
-              count={filter.count()}
-            />
-          </OverlayTrigger>
-        </ButtonGroup>
-
-        <SortBySelect
-          className="mr-2"
-          sortBy={filter.sortBy}
-          sortDirection={filter.sortDirection}
-          options={filterOptions.sortByOptions}
-          onChangeSortBy={onChangeSortBy}
-          onChangeSortDirection={onChangeSortDirection}
-          onReshuffleRandomSort={onReshuffleRandomSort}
-        />
-
-        <PageSizeSelector
-          pageSize={filter.itemsPerPage}
-          setPageSize={onChangePageSize}
-        />
-      </>
-    );
-  }
-
-  return render();
-};
diff --git a/ui/v2.5/src/components/List/ListOperationButtons.tsx b/ui/v2.5/src/components/List/ListOperationButtons.tsx
index bdb87fa3f..2d8e83039 100644
--- a/ui/v2.5/src/components/List/ListOperationButtons.tsx
+++ b/ui/v2.5/src/components/List/ListOperationButtons.tsx
@@ -1,11 +1,5 @@
-import React, { PropsWithChildren, useEffect } from "react";
-import {
-  Button,
-  ButtonGroup,
-  Dropdown,
-  OverlayTrigger,
-  Tooltip,
-} from "react-bootstrap";
+import React, { PropsWithChildren, useEffect, useMemo } from "react";
+import { Button, ButtonGroup, Dropdown } from "react-bootstrap";
 import Mousetrap from "mousetrap";
 import { FormattedMessage, useIntl } from "react-intl";
 import { IconDefinition } from "@fortawesome/fontawesome-svg-core";
@@ -108,8 +102,8 @@ export const ListOperationButtons: React.FC<IListOperationButtonsProps> = ({
     };
   });
 
-  function maybeRenderButtons() {
-    const buttons = (otherOperations ?? []).filter((o) => {
+  const buttons = useMemo(() => {
+    const ret = (otherOperations ?? []).filter((o) => {
       if (!o.icon) {
         return false;
       }
@@ -120,16 +114,17 @@ export const ListOperationButtons: React.FC<IListOperationButtonsProps> = ({
 
       return o.isDisplayed();
     });
+
     if (itemsSelected) {
       if (onEdit) {
-        buttons.push({
+        ret.push({
           icon: faPencilAlt,
           text: intl.formatMessage({ id: "actions.edit" }),
           onClick: onEdit,
         });
       }
       if (onDelete) {
-        buttons.push({
+        ret.push({
           icon: faTrash,
           text: intl.formatMessage({ id: "actions.delete" }),
           onClick: onDelete,
@@ -138,58 +133,57 @@ export const ListOperationButtons: React.FC<IListOperationButtonsProps> = ({
       }
     }
 
-    if (buttons.length > 0) {
-      return (
-        <ButtonGroup className="ml-2">
-          {buttons.map((button) => {
-            return (
-              <OverlayTrigger
-                overlay={<Tooltip id="edit">{button.text}</Tooltip>}
-                key={button.text}
-              >
-                <Button
-                  variant={button.buttonVariant ?? "secondary"}
-                  onClick={button.onClick}
-                >
-                  {button.icon ? <Icon icon={button.icon} /> : undefined}
-                </Button>
-              </OverlayTrigger>
-            );
-          })}
-        </ButtonGroup>
-      );
-    }
-  }
+    return ret;
+  }, [otherOperations, itemsSelected, onEdit, onDelete, intl]);
 
-  function renderSelectAll() {
-    if (onSelectAll) {
-      return (
-        <Dropdown.Item
-          key="select-all"
-          className="bg-secondary text-white"
-          onClick={() => onSelectAll?.()}
-        >
-          <FormattedMessage id="actions.select_all" />
-        </Dropdown.Item>
-      );
-    }
-  }
+  const operationButtons = useMemo(() => {
+    return (
+      <>
+        {buttons.map((button) => {
+          return (
+            <Button
+              key={button.text}
+              variant={button.buttonVariant ?? "secondary"}
+              onClick={button.onClick}
+              title={button.text}
+            >
+              <Icon icon={button.icon!} />
+            </Button>
+          );
+        })}
+      </>
+    );
+  }, [buttons]);
 
-  function renderSelectNone() {
-    if (onSelectNone) {
-      return (
-        <Dropdown.Item
-          key="select-none"
-          className="bg-secondary text-white"
-          onClick={() => onSelectNone?.()}
-        >
-          <FormattedMessage id="actions.select_none" />
-        </Dropdown.Item>
-      );
+  const moreDropdown = useMemo(() => {
+    function renderSelectAll() {
+      if (onSelectAll) {
+        return (
+          <Dropdown.Item
+            key="select-all"
+            className="bg-secondary text-white"
+            onClick={() => onSelectAll?.()}
+          >
+            <FormattedMessage id="actions.select_all" />
+          </Dropdown.Item>
+        );
+      }
+    }
+
+    function renderSelectNone() {
+      if (onSelectNone) {
+        return (
+          <Dropdown.Item
+            key="select-none"
+            className="bg-secondary text-white"
+            onClick={() => onSelectNone?.()}
+          >
+            <FormattedMessage id="actions.select_none" />
+          </Dropdown.Item>
+        );
+      }
     }
-  }
 
-  function renderMore() {
     const options = [renderSelectAll(), renderSelectNone()].filter((o) => o);
 
     if (otherOperations) {
@@ -224,13 +218,19 @@ export const ListOperationButtons: React.FC<IListOperationButtonsProps> = ({
         {options.length > 0 ? options : undefined}
       </OperationDropdown>
     );
+  }, [otherOperations, onSelectAll, onSelectNone]);
+
+  // don't render anything if there are no buttons or operations
+  if (buttons.length === 0 && !moreDropdown) {
+    return null;
   }
 
   return (
     <>
-      {maybeRenderButtons()}
-
-      <ButtonGroup className="ml-2">{renderMore()}</ButtonGroup>
+      <ButtonGroup>
+        {operationButtons}
+        {moreDropdown}
+      </ButtonGroup>
     </>
   );
 };
diff --git a/ui/v2.5/src/components/List/ListViewOptions.tsx b/ui/v2.5/src/components/List/ListViewOptions.tsx
index 04adcaa74..b681e086d 100644
--- a/ui/v2.5/src/components/List/ListViewOptions.tsx
+++ b/ui/v2.5/src/components/List/ListViewOptions.tsx
@@ -1,8 +1,16 @@
 import React, { useEffect, useRef, useState } from "react";
 import Mousetrap from "mousetrap";
-import { Button, Dropdown, Overlay, Popover } from "react-bootstrap";
+import {
+  Button,
+  ButtonGroup,
+  Dropdown,
+  Overlay,
+  OverlayTrigger,
+  Popover,
+  Tooltip,
+} from "react-bootstrap";
 import { DisplayMode } from "src/models/list-filter/types";
-import { useIntl } from "react-intl";
+import { IntlShape, useIntl } from "react-intl";
 import { Icon } from "../Shared/Icon";
 import {
   faChevronDown,
@@ -53,6 +61,10 @@ function getLabelId(option: DisplayMode) {
   return `display_mode.${displayModeId}`;
 }
 
+function getLabel(intl: IntlShape, option: DisplayMode) {
+  return intl.formatMessage({ id: getLabelId(option) });
+}
+
 export const ListViewOptions: React.FC<IListViewOptionsProps> = ({
   zoomIndex,
   onSetZoom,
@@ -60,9 +72,6 @@ export const ListViewOptions: React.FC<IListViewOptionsProps> = ({
   onSetDisplayMode,
   displayModeOptions,
 }) => {
-  const minZoom = 0;
-  const maxZoom = 3;
-
   const intl = useIntl();
 
   const overlayTarget = useRef(null);
@@ -98,10 +107,6 @@ export const ListViewOptions: React.FC<IListViewOptionsProps> = ({
     };
   });
 
-  function getLabel(option: DisplayMode) {
-    return intl.formatMessage({ id: getLabelId(option) });
-  }
-
   function onChangeZoom(v: number) {
     if (onSetZoom) {
       onSetZoom(v);
@@ -116,7 +121,7 @@ export const ListViewOptions: React.FC<IListViewOptionsProps> = ({
         variant="secondary"
         title={intl.formatMessage(
           { id: "display_mode.label_current" },
-          { current: getLabel(displayMode) }
+          { current: getLabel(intl, displayMode) }
         )}
         onClick={() => setShowOptions(!showOptions)}
       >
@@ -140,8 +145,6 @@ export const ListViewOptions: React.FC<IListViewOptionsProps> = ({
                   displayMode === DisplayMode.Wall) ? (
                   <div className="zoom-slider-container">
                     <ZoomSelect
-                      minZoom={minZoom}
-                      maxZoom={maxZoom}
                       zoomIndex={zoomIndex}
                       onChangeZoom={onChangeZoom}
                     />
@@ -156,7 +159,7 @@ export const ListViewOptions: React.FC<IListViewOptionsProps> = ({
                       onSetDisplayMode(option);
                     }}
                   >
-                    <Icon icon={getIcon(option)} /> {getLabel(option)}
+                    <Icon icon={getIcon(option)} /> {getLabel(intl, option)}
                   </Dropdown.Item>
                 ))}
               </div>
@@ -167,3 +170,48 @@ export const ListViewOptions: React.FC<IListViewOptionsProps> = ({
     </>
   );
 };
+
+export const ListViewButtonGroup: React.FC<IListViewOptionsProps> = ({
+  zoomIndex,
+  onSetZoom,
+  displayMode,
+  onSetDisplayMode,
+  displayModeOptions,
+}) => {
+  const intl = useIntl();
+
+  return (
+    <>
+      {displayModeOptions.length > 1 && (
+        <ButtonGroup>
+          {displayModeOptions.map((option) => (
+            <OverlayTrigger
+              key={option}
+              overlay={
+                <Tooltip id="display-mode-tooltip">
+                  {getLabel(intl, option)}
+                </Tooltip>
+              }
+            >
+              <Button
+                variant="secondary"
+                active={displayMode === option}
+                onClick={() => onSetDisplayMode(option)}
+              >
+                <Icon icon={getIcon(option)} />
+              </Button>
+            </OverlayTrigger>
+          ))}
+        </ButtonGroup>
+      )}
+      <div className="zoom-slider-container">
+        {onSetZoom &&
+        zoomIndex !== undefined &&
+        (displayMode === DisplayMode.Grid ||
+          displayMode === DisplayMode.Wall) ? (
+          <ZoomSelect zoomIndex={zoomIndex} onChangeZoom={onSetZoom} />
+        ) : null}
+      </div>
+    </>
+  );
+};
diff --git a/ui/v2.5/src/components/List/ZoomSlider.tsx b/ui/v2.5/src/components/List/ZoomSlider.tsx
index dff8e4f57..093b5ec7a 100644
--- a/ui/v2.5/src/components/List/ZoomSlider.tsx
+++ b/ui/v2.5/src/components/List/ZoomSlider.tsx
@@ -2,19 +2,14 @@ import React, { useEffect } from "react";
 import Mousetrap from "mousetrap";
 import { Form } from "react-bootstrap";
 
-export interface IZoomSelectProps {
-  minZoom: number;
-  maxZoom: number;
-  zoomIndex: number;
-  onChangeZoom: (v: number) => void;
-}
+const minZoom = 0;
+const maxZoom = 3;
 
-export const ZoomSelect: React.FC<IZoomSelectProps> = ({
-  minZoom,
-  maxZoom,
-  zoomIndex,
-  onChangeZoom,
-}) => {
+export function useZoomKeybinds(props: {
+  zoomIndex: number | undefined;
+  onChangeZoom: (v: number) => void;
+}) {
+  const { zoomIndex, onChangeZoom } = props;
   useEffect(() => {
     Mousetrap.bind("+", () => {
       if (zoomIndex !== undefined && zoomIndex < maxZoom) {
@@ -32,7 +27,17 @@ export const ZoomSelect: React.FC<IZoomSelectProps> = ({
       Mousetrap.unbind("-");
     };
   });
+}
 
+export interface IZoomSelectProps {
+  zoomIndex: number;
+  onChangeZoom: (v: number) => void;
+}
+
+export const ZoomSelect: React.FC<IZoomSelectProps> = ({
+  zoomIndex,
+  onChangeZoom,
+}) => {
   return (
     <Form.Control
       className="zoom-slider"
diff --git a/ui/v2.5/src/components/List/styles.scss b/ui/v2.5/src/components/List/styles.scss
index e1397a48e..7ab99cfbb 100644
--- a/ui/v2.5/src/components/List/styles.scss
+++ b/ui/v2.5/src/components/List/styles.scss
@@ -93,7 +93,8 @@
 
 // hide zoom slider in xs viewport
 @include media-breakpoint-down(xs) {
-  .display-mode-menu .zoom-slider-container {
+  .display-mode-menu .zoom-slider-container,
+  .zoom-slider-container {
     display: none;
   }
 }
@@ -916,6 +917,8 @@ input[type="range"].zoom-slider {
 }
 
 .filtered-list-toolbar {
+  align-items: center;
+  gap: 0.5rem;
   justify-content: center;
   margin-bottom: 0.5rem;
 
@@ -933,8 +936,10 @@ input[type="range"].zoom-slider {
     }
   }
 
-  .btn.display-mode-select {
-    margin-left: 0.5rem;
+  // set the width of the zoom-slider-container to prevent buttons moving when
+  // the slider appears/disappears
+  .zoom-slider-container {
+    min-width: 60px;
   }
 }
 
@@ -946,10 +951,6 @@ input[type="range"].zoom-slider {
   }
 }
 
-.search-term-input {
-  margin-right: 0.5rem;
-}
-
 .custom-field-filter {
   align-items: center;
   display: flex;
diff --git a/ui/v2.5/src/components/Performers/PerformerList.tsx b/ui/v2.5/src/components/Performers/PerformerList.tsx
index d11de6d96..68733d3b8 100644
--- a/ui/v2.5/src/components/Performers/PerformerList.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerList.tsx
@@ -329,7 +329,6 @@ export const PerformerList: React.FC<IPerformerList> = ({
       selectable
     >
       <ItemList
-        zoomable
         view={view}
         otherOperations={otherOperations}
         addKeybinds={addKeybinds}
diff --git a/ui/v2.5/src/components/Scenes/SceneList.tsx b/ui/v2.5/src/components/Scenes/SceneList.tsx
index 73198c2d1..91c07d484 100644
--- a/ui/v2.5/src/components/Scenes/SceneList.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneList.tsx
@@ -77,6 +77,7 @@ import {
   ToolbarSelectionSection,
 } from "../List/ListToolbar";
 import { ListResultsHeader } from "../List/ListResultsHeader";
+import { useZoomKeybinds } from "../List/ZoomSlider";
 
 function renderMetadataByline(result: GQL.FindScenesQueryResult) {
   const duration = result?.data?.findScenes?.duration;
@@ -548,6 +549,10 @@ export const FilteredSceneList = (props: IFilteredScenes) => {
       Mousetrap.unbind("d d");
     };
   });
+  useZoomKeybinds({
+    zoomIndex: filter.zoomIndex,
+    onChangeZoom: (zoom) => setFilter(filter.setZoom(zoom)),
+  });
 
   const onCloseEditDelete = useCloseEditDelete({
     closeModal,
diff --git a/ui/v2.5/src/components/Scenes/SceneMarkerList.tsx b/ui/v2.5/src/components/Scenes/SceneMarkerList.tsx
index dbe6e2e23..3ae595b7c 100644
--- a/ui/v2.5/src/components/Scenes/SceneMarkerList.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneMarkerList.tsx
@@ -148,7 +148,6 @@ export const SceneMarkerList: React.FC<ISceneMarkerList> = ({
       selectable
     >
       <ItemList
-        zoomable
         view={view}
         otherOperations={otherOperations}
         addKeybinds={addKeybinds}
diff --git a/ui/v2.5/src/components/Studios/StudioList.tsx b/ui/v2.5/src/components/Studios/StudioList.tsx
index 423cd1587..e548467a1 100644
--- a/ui/v2.5/src/components/Studios/StudioList.tsx
+++ b/ui/v2.5/src/components/Studios/StudioList.tsx
@@ -196,7 +196,6 @@ export const StudioList: React.FC<IStudioList> = ({
       selectable
     >
       <ItemList
-        zoomable
         view={view}
         otherOperations={otherOperations}
         addKeybinds={addKeybinds}
diff --git a/ui/v2.5/src/components/Tags/TagList.tsx b/ui/v2.5/src/components/Tags/TagList.tsx
index cbde60a5c..ca866bbb9 100644
--- a/ui/v2.5/src/components/Tags/TagList.tsx
+++ b/ui/v2.5/src/components/Tags/TagList.tsx
@@ -367,7 +367,6 @@ export const TagList: React.FC<ITagList> = ({ filterHook, alterQuery }) => {
     >
       <ItemList
         view={view}
-        zoomable
         otherOperations={otherOperations}
         addKeybinds={addKeybinds}
         renderContent={renderContent}

From 6892c7151c6d79640b5b3dedb21f1ad4f55bcda9 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Tue, 25 Nov 2025 17:28:12 +1100
Subject: [PATCH 158/405] Update changelog

---
 ui/v2.5/src/docs/en/Changelog/v0300.md | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/ui/v2.5/src/docs/en/Changelog/v0300.md b/ui/v2.5/src/docs/en/Changelog/v0300.md
index aaf07c234..128be4cf7 100644
--- a/ui/v2.5/src/docs/en/Changelog/v0300.md
+++ b/ui/v2.5/src/docs/en/Changelog/v0300.md
@@ -1,15 +1,23 @@
 ### ✨ New Features
+* Added SFW content mode option to settings and setup wizard. ([#6262](https://github.com/stashapp/stash/pull/6262))
 * Added stash-ids to Tags. ([#6255](https://github.com/stashapp/stash/pull/6255))
+* Logs can now be compressed after reaching a configurable size. ([#5696](https://github.com/stashapp/stash/pull/5696))
+* Added ability to edit multiple studios at once. ([#6238](https://github.com/stashapp/stash/pull/6238))
+* Added ability to edit multiple scene markers at once. ([#6239](https://github.com/stashapp/stash/pull/6239))
 * Added support for multiple Studio URLs. ([#6223](https://github.com/stashapp/stash/pull/6223))
 * Added option to add markers to front page. ([#6065](https://github.com/stashapp/stash/pull/6065))
 * Added duration filter to scene list sidebar. ([#6264](https://github.com/stashapp/stash/pull/6264))
 * Added experimental support for JPEG XL images. ([#6184](https://github.com/stashapp/stash/pull/6184))
 
 ### 🎨 Improvements
+* Added performer age slider to scene filter sidebar. ([#6267](https://github.com/stashapp/stash/pull/6267))
+* Added markers option to scene filter sidebar. ([#6270](https://github.com/stashapp/stash/pull/6270))
 * Selected stash-box is now remembered in the scene tagger view. ([#6192](https://github.com/stashapp/stash/pull/6192))
 * Added hardware encoding support for Rockchip RKMPP devices. ([#6182](https://github.com/stashapp/stash/pull/6182))
+* stash now uses the Media Session API when playing scenes. ([#6298](https://github.com/stashapp/stash/pull/6298))
 * Added `inputURL` and `inputHostname` fields to scraper specs. ([#6250](https://github.com/stashapp/stash/pull/6250))
 * Added extra studio fields to scraper specs. ([#6249](https://github.com/stashapp/stash/pull/6249))
+* Added o-count to studio cards and details page. ([#5982](https://github.com/stashapp/stash/pull/5982))
 * Added o-count to group cards. ([#6122](https://github.com/stashapp/stash/pull/6122))
 * Added options to filter and sort groups by o-count. ([#6122](https://github.com/stashapp/stash/pull/6122))
 * Added o-count to performer details page. ([#6171](https://github.com/stashapp/stash/pull/6171))
@@ -20,4 +28,8 @@
 * Added keyboard shortcuts to generate scene screenshot at current time (`c c`) and to regenerate default screenshot (`c d`). ([#5984](https://github.com/stashapp/stash/pull/5984))
 
 ### 🐛 Bug fixes
-* stash-ids are now set when creating new objects from the scrape dialog. ([#6269](https://github.com/stashapp/stash/pull/6269))
\ No newline at end of file
+* stash-ids are now set when creating new objects from the scrape dialog. ([#6269](https://github.com/stashapp/stash/pull/6269))
+* partial dates are now correctly handled when scraping scenes. ([#6305](https://github.com/stashapp/stash/pull/6305))
+* Fixed external player not loading on Android when a scene title has special characters. ([#6297](https://github.com/stashapp/stash/pull/6297))
+* Fixed Macos version check pointing to incorrect location. ([#6289](https://github.com/stashapp/stash/pull/6289))
+* stash will no longer try to generate marker previews where a marker start is set after the end of a scene's duration. ([#6290](https://github.com/stashapp/stash/pull/6290))
\ No newline at end of file

From ca357b9eb364bc6cde6d3b8ec6c0bf0272fa0c69 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Tue, 25 Nov 2025 17:46:23 +1100
Subject: [PATCH 159/405] Codeberg weblate (#6318)

* Translated using Weblate (Russian)

Currently translated at 100.0% (1219 of 1219 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/ru/

* Translated using Weblate (Korean)

Currently translated at 100.0% (1222 of 1222 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/ko/

* Translated using Weblate (Korean)

Currently translated at 100.0% (1222 of 1222 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/ko/

* Translated using Weblate (German)

Currently translated at 100.0% (1222 of 1222 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/de/

* Translated using Weblate (French)

Currently translated at 100.0% (1222 of 1222 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/fr/

* Translated using Weblate (Japanese)

Currently translated at 83.9% (1026 of 1222 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/ja/

* Translated using Weblate (Korean)

Currently translated at 100.0% (1222 of 1222 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/ko/

* Translated using Weblate (Estonian)

Currently translated at 100.0% (1222 of 1222 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/et/

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (1222 of 1222 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/zh_Hans/

* Translated using Weblate (Spanish)

Currently translated at 96.7% (1182 of 1222 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/es/

* Translated using Weblate (Chinese (Traditional Han script))

Currently translated at 100.0% (1222 of 1222 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/zh_Hant/

* Translated using Weblate (French)

Currently translated at 100.0% (1222 of 1222 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/fr/

* Translated using Weblate (Korean)

Currently translated at 100.0% (1222 of 1222 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/ko/

* Translated using Weblate (Swedish)

Currently translated at 100.0% (1222 of 1222 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/sv/

* Translated using Weblate (Ukrainian)

Currently translated at 87.4% (1069 of 1222 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/uk/

* Update translation files

Updated by "Cleanup translation files" add-on in Weblate.

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/

* Translated using Weblate (Estonian)

Currently translated at 98.7% (1217 of 1233 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/et/

* Translated using Weblate (French)

Currently translated at 100.0% (1233 of 1233 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/fr/

* Translated using Weblate (Czech)

Currently translated at 98.4% (1214 of 1233 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/cs/

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 99.6% (1229 of 1233 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/zh_Hans/

* Translated using Weblate (Czech)

Currently translated at 100.0% (1233 of 1233 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/cs/

* Translated using Weblate (Chinese (Traditional Han script))

Currently translated at 99.0% (1221 of 1233 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/zh_Hant/

* Translated using Weblate (Spanish)

Currently translated at 96.8% (1194 of 1233 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/es/

* Translated using Weblate (Japanese)

Currently translated at 82.7% (1020 of 1233 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/ja/

* Translated using Weblate (German)

Currently translated at 99.3% (1225 of 1233 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/de/

* Translated using Weblate (Spanish)

Currently translated at 97.2% (1199 of 1233 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/es/

* Translated using Weblate (Dutch)

Currently translated at 79.1% (976 of 1233 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/nl/

* Translated using Weblate (Bulgarian)

Currently translated at 25.1% (310 of 1233 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/bg/

* Translated using Weblate (Spanish)

Currently translated at 100.0% (1233 of 1233 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/es/

* Translated using Weblate (Estonian)

Currently translated at 100.0% (1233 of 1233 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/et/

---------

Co-authored-by: direnyx <direnyx@noreply.codeberg.org>
Co-authored-by: lugged9922 <lugged9922@noreply.codeberg.org>
Co-authored-by: yec <yec@noreply.codeberg.org>
Co-authored-by: Marly21 <marly21@noreply.codeberg.org>
Co-authored-by: doodoo <doodoo@noreply.codeberg.org>
Co-authored-by: tobakumap <tobakumap@noreply.codeberg.org>
Co-authored-by: Zesty6249 <zesty6249@noreply.codeberg.org>
Co-authored-by: wql219 <wql219@noreply.codeberg.org>
Co-authored-by: donlothario <donlothario@noreply.codeberg.org>
Co-authored-by: danny60718 <danny60718@noreply.codeberg.org>
Co-authored-by: AlpacaSerious <alpacaserious@noreply.codeberg.org>
Co-authored-by: ves10023 <ves10023@noreply.codeberg.org>
Co-authored-by: Codeberg Translate <translate@codeberg.org>
Co-authored-by: NymeriaCZ <nymeriacz@noreply.codeberg.org>
Co-authored-by: 2307777 <2307777@noreply.codeberg.org>
Co-authored-by: hirokazuk <hirokazuk@noreply.codeberg.org>
Co-authored-by: PhilipWaldman <philipwaldman@noreply.codeberg.org>
Co-authored-by: Gundir <gundir@noreply.codeberg.org>
---
 ui/v2.5/src/locales/bg-BG.json |  11 +--
 ui/v2.5/src/locales/cs-CZ.json |  44 +++++++++---
 ui/v2.5/src/locales/da-DK.json |   1 -
 ui/v2.5/src/locales/de-DE.json |  30 ++++++--
 ui/v2.5/src/locales/es-ES.json | 127 +++++++++++++++++++++++++--------
 ui/v2.5/src/locales/et-EE.json |  44 +++++++++---
 ui/v2.5/src/locales/fi-FI.json |   1 -
 ui/v2.5/src/locales/fr-FR.json |  46 ++++++++----
 ui/v2.5/src/locales/hu-HU.json |   1 -
 ui/v2.5/src/locales/id-ID.json |   1 -
 ui/v2.5/src/locales/it-IT.json |   1 -
 ui/v2.5/src/locales/ja-JP.json |   9 ++-
 ui/v2.5/src/locales/ko-KR.json |  62 +++++++++-------
 ui/v2.5/src/locales/nb-NO.json |   1 -
 ui/v2.5/src/locales/nl-NL.json |  84 ++++++++++++++++++----
 ui/v2.5/src/locales/nn-NO.json |   1 -
 ui/v2.5/src/locales/pl-PL.json |   1 -
 ui/v2.5/src/locales/pt-BR.json |   1 -
 ui/v2.5/src/locales/ro-RO.json |   1 -
 ui/v2.5/src/locales/ru-RU.json |   8 ++-
 ui/v2.5/src/locales/sv-SE.json |  23 ++++--
 ui/v2.5/src/locales/th-TH.json |   1 -
 ui/v2.5/src/locales/tr-TR.json |   1 -
 ui/v2.5/src/locales/uk-UA.json |  55 +++++++++++---
 ui/v2.5/src/locales/zh-CN.json |  44 +++++++++---
 ui/v2.5/src/locales/zh-TW.json |  31 +++++---
 26 files changed, 459 insertions(+), 171 deletions(-)

diff --git a/ui/v2.5/src/locales/bg-BG.json b/ui/v2.5/src/locales/bg-BG.json
index a7fb455a0..65f57dee2 100644
--- a/ui/v2.5/src/locales/bg-BG.json
+++ b/ui/v2.5/src/locales/bg-BG.json
@@ -52,7 +52,7 @@
         "export": "Експортиране",
         "export_all": "Експортирай всичко…",
         "reshuffle": "Пренареди",
-        "assign_stashid_to_parent_studio": "Задай Stash ID към съществуващо родителско студио и опресни метаданните",
+        "assign_stashid_to_parent_studio": "Присвояване на Stash ID към съществуващо родителско студио и актуализиране на метаданните",
         "find": "Намери",
         "finish": "Приключи",
         "from_file": "От файл…",
@@ -148,7 +148,7 @@
         },
         "temp_disable": "Спри временно…",
         "temp_enable": "Включи временно…",
-        "unset": "",
+        "unset": "Премахни",
         "use_default": "Използвай на стойностите по подразбиране",
         "view_history": "Виж история",
         "view_random": "Виж Случайно"
@@ -305,14 +305,17 @@
                 "password_desc": "Парола за достъп до Stash. Остави празно за да изключи достъп чрез потребител",
                 "stash-box_integration": "Stash-box интеграция",
                 "username": "Потребителско име",
-                "username_desc": "Потребителско име за достъп до Stash. Остави празно за да изключи достъп чрез потребител"
+                "username_desc": "Потребителско име за достъп до Stash. Остави празно за да изключи достъп чрез потребител",
+                "log_file_max_size": "Максимален размер на файла",
+                "log_file_max_size_desc": "Максимален размер в мегабайти на лог файла преди компресиране. 0 MB означава деактивирано. Изисква рестартиране."
             },
             "backup_directory_path": {
                 "description": "Местоположение на папка за резрвни SQLite бази данни",
                 "heading": "Път към Папка за Резервни Данни"
             },
             "blobs_path": {
-                "description": "Къде във файловата система да се пазят бинарни данни. Позва се само ако се ползва Файлова система за блоб пазене. ВНИМАНИЕ: промяната ще изисква ръчно местене на съществуващи данни."
+                "description": "Къде във файловата система да се пазят бинарни данни. Позва се само ако се ползва Файлова система за блоб пазене. ВНИМАНИЕ: промяната ще изисква ръчно местене на съществуващи данни.",
+                "heading": "Път до файловата система за двоични данни"
             }
         },
         "ui": {
diff --git a/ui/v2.5/src/locales/cs-CZ.json b/ui/v2.5/src/locales/cs-CZ.json
index 951c06e26..a518e1d4d 100644
--- a/ui/v2.5/src/locales/cs-CZ.json
+++ b/ui/v2.5/src/locales/cs-CZ.json
@@ -293,7 +293,9 @@
                 "password_desc": "Heslo pro přístup do aplikace. Ponechte prázdné pro vypnutí autentizace",
                 "stash-box_integration": "Stash-box integrace",
                 "username": "Přihlašovací jméno",
-                "username_desc": "Přihlašovací jméno pro přístup do aplikace. Ponechte prázdné pro vypnutí autentizace"
+                "username_desc": "Přihlašovací jméno pro přístup do aplikace. Ponechte prázdné pro vypnutí autentizace",
+                "log_file_max_size": "Maximální velikost logu",
+                "log_file_max_size_desc": "Maximální velikost logu v megabytech před kompresí. 0MB pro deaktivaci. Vyžaduje restart."
             },
             "backup_directory_path": {
                 "description": "Adresář umístění záloh databáze SQLite",
@@ -800,6 +802,18 @@
             "use_stash_hosted_funscript": {
                 "description": "Je-li povoleno, budou funscripty poskytovány přímo ze Stash do vašeho zařízení Handy bez použití serveru Handy třetí strany. Vyžaduje, aby byl Stash dostupný z vašeho zařízení Handy a vygenerovaný API klíč, pokud má stash nakonfigurované údaje.",
                 "heading": "Funscripty podávejte přímo"
+            },
+            "sfw_mode": {
+                "description": "Zapněte zda použáváte stash k ukládání SFW obsahu. Schová nebo změní některé aspekty uživatelského rozhraní související s obsahem pro dospělé.",
+                "heading": "Režim obsahu SFW"
+            },
+            "performer_list": {
+                "heading": "List účinkujicích",
+                "options": {
+                    "show_links_on_grid_card": {
+                        "heading": "Zobrazit odkazy na mřížce karet účinkujicích"
+                    }
+                }
             }
         },
         "advanced_mode": "Pokročilý mód"
@@ -961,7 +975,8 @@
         "delete_entity_simple_desc": "{count, plural, one {Opravdu chcete smazat tuto {singularEntity}?} other {Opravdu chcete smazat tyto {pluralEntity}?}}",
         "performers_found": "{count} nalezených účinkujících",
         "overwrite_filter_warning": "Uložený filtr \"{entityName}\" bude přepsán.",
-        "set_default_filter_confirm": "Chcete doopravdy nastavit tento filtr jako výchozí?"
+        "set_default_filter_confirm": "Chcete doopravdy nastavit tento filtr jako výchozí?",
+        "clear_o_history_confirm_sfw": "Opravdu chcete vymazat historii lajků?"
     },
     "chapters": "Kapitoly",
     "circumcised": "Obřezán",
@@ -1148,7 +1163,7 @@
     "setup": {
         "paths": {
             "where_can_stash_store_its_generated_content_description": "Aby Stash mohl poskytovat miniatury, náhledy a sprity generuje Stash obrázky a videa. To zahrnuje také transkódování pro nepodporované formáty souborů. Ve výchozím nastavení Stash vytvoří <code>generated</code> adresář v adresáři obsahujícím váš konfigurační soubor. Pokud chcete změnit, kam se budou tato generovaná media ukládat, zadejte prosím absolutní nebo relativní (k aktuálnímu pracovnímu adresáři) cestu. Stash vytvoří tento adresář, pokud ještě neexistuje.",
-            "where_is_your_porn_located_description": "Přidejte adresáře obsahující vaše porno videa a obrázky. Stash použije tyto adresáře k vyhledání videí a obrázků během skenování.",
+            "where_is_your_porn_located_description": "Přidejte adresáře obsahující váše videa a obrázky. Stash použije tyto adresáře k vyhledání videí a obrázků během skenování.",
             "where_can_stash_store_blobs_description": "Kam může Stash ukládat binární data jako jsou obaly scén, účinkující, studia a obrázky tagů, buď v databázi nebo v souborovém systému. Ve výchozím nastavení bude tato data ukládat do souborového systému v podadresáři <code>blobs</code> v adresáři obsahujícím váš konfigurační soubor. Pokud to chcete změnit, zadejte prosím absolutní nebo relativní (k aktuálnímu pracovnímu adresáři) cestu. Stash vytvoří tento adresář, pokud ještě neexistuje.",
             "path_to_cache_directory_empty_for_default": "cesta k adresáři mezipaměti (ve výchozím nastavení prázdné)",
             "path_to_generated_directory_empty_for_default": "cesta k adresáři vygenerovaných souborů (ve výchozím nastavení prázdné)",
@@ -1157,16 +1172,19 @@
             "where_can_stash_store_its_generated_content": "Kam může Stash ukládat svůj vygenerovaný obsah?",
             "where_can_stash_store_its_database_warning": "VAROVÁNÍ: Uložení databáze na jiný systém, než ze kterého se spouští Stash (např. uložení databáze na NAS při spuštění serveru Stash na jiném počítači), <strong>nepodporováno</strong>! SQLite není určen pro použití v síti a pokus o to může velmi snadno způsobit poškození celé vaší databáze.",
             "database_filename_empty_for_default": "název souboru databáze (ve výchozím nastavení prázdné)",
-            "description": "Dále musíme určit, kde najdeme vaši sbírku porna a kam uložit databázi Stash, vygenerované soubory a soubory mezipaměti. Tato nastavení lze v případě potřeby později změnit.",
+            "description": "Dále musíme určit, kde najdeme vaši sbírku obsahu a kam uložit databázi Stash, vygenerované soubory a soubory mezipaměti. Tato nastavení lze v případě potřeby později změnit.",
             "path_to_blobs_directory_empty_for_default": "cesta k adresáři blobů (ve výchozím nastavení prázdné)",
             "stash_alert": "Nebyla vybrána žádná cesta knihovny. Žádné médium nebude možné naskenovat do Stash. Jste si jisti?",
-            "where_is_your_porn_located": "Kde se nachází vaše porno?",
+            "where_is_your_porn_located": "Kde se nachází váš obsah?",
             "where_can_stash_store_cache_files_description": "Aby některé funkce, jako je živé transkódování HLS/DASH, fungovaly, vyžaduje Stash adresář mezipaměti pro dočasné soubory. Ve výchozím nastavení Stash vytvoří adresář <code>mezipaměť</code> v adresáři obsahujícím váš konfigurační soubor. Pokud to chcete změnit, zadejte prosím absolutní nebo relativní (k aktuálnímu pracovnímu adresáři) cestu. Stash vytvoří tento adresář, pokud ještě neexistuje.",
             "where_can_stash_store_its_database": "Kde může Stash uložit svou databázi?",
             "where_can_stash_store_blobs": "Kde může Stash ukládat binární data databáze?",
             "where_can_stash_store_blobs_description_addendum": "Případně můžete tato data uložit do databáze. <strong>Poznámka:</strong> Tím se zvětší velikost souboru databáze a prodlouží se doba migrace databáze.",
-            "where_can_stash_store_its_database_description": "Stash používá databázi SQLite k ukládání metadat porna. Ve výchozím nastavení bude tento soubor vytvořen jako <code>stash-go.sqlite</code> v adresáři obsahujícím váš konfigurační soubor. Pokud to chcete změnit, zadejte prosím absolutní nebo relativní (k aktuálnímu pracovnímu adresáři) název souboru.",
-            "store_blobs_in_database": "Uložte bloby do databáze"
+            "where_can_stash_store_its_database_description": "Stash používá databázi SQLite k ukládání metadat obsahu. Ve výchozím nastavení bude tento soubor vytvořen jako <code>stash-go.sqlite</code> v adresáři obsahujícím váš konfigurační soubor. Pokud to chcete změnit, zadejte prosím absolutní nebo relativní (k aktuálnímu pracovnímu adresáři) název souboru.",
+            "store_blobs_in_database": "Uložte bloby do databáze",
+            "sfw_content_settings": "Používáte stash k SFW obsahu?",
+            "sfw_content_settings_description": "Stash lze použít ke správě SFW obsahu, jako jsou fotografie, umění, komiksy a další. Povolení této možnosti upraví některé vlastnosti uživatelského rozhraní tak, aby byly vhodnější pro SFW obsah.",
+            "use_sfw_content_mode": "Použít režim obsahu SFW"
         },
         "stash_setup_wizard": "Průvodce nastavením Stash",
         "success": {
@@ -1277,7 +1295,7 @@
         "syncing": "Probíhá synchronizace se serverem",
         "uploading": "Nahrávání skriptu"
     },
-    "hasMarkers": "Má značky",
+    "hasMarkers": "Značky",
     "height_cm": "Výška (cm)",
     "include_sub_studios": "Zahrnout dceřiná studia",
     "interactive": "Interaktivní",
@@ -1310,7 +1328,6 @@
         "o_count": "Počet O"
     },
     "megabits_per_second": "{value} mbps",
-    "o_counter": "O-Počítadlo",
     "none": "Žádný",
     "pagination": {
         "last": "Poslední",
@@ -1354,7 +1371,7 @@
     },
     "hair_color": "Barva vlasů",
     "help": "Pomoc",
-    "hasChapters": "Má kapitoly",
+    "hasChapters": "Kapitoly",
     "height": "Výška",
     "ignore_auto_tag": "Ignoruj automatické tagování",
     "instagram": "Instragram",
@@ -1547,5 +1564,10 @@
         "login": "Přihlášení",
         "username": "Uživatelské jméno",
         "internal_error": "Neočekávaná interní chyba. Podívej se do logu pro více detailů"
-    }
+    },
+    "last_o_at_sfw": "Poslední lajk",
+    "o_count_sfw": "Lajky",
+    "o_history_sfw": "Historie lajků",
+    "odate_recorded_no_sfw": "Žádný datum lajku nebyl zaznamenán",
+    "scenes_duration": "Trvání scény"
 }
diff --git a/ui/v2.5/src/locales/da-DK.json b/ui/v2.5/src/locales/da-DK.json
index bdb60fe67..54cc89938 100644
--- a/ui/v2.5/src/locales/da-DK.json
+++ b/ui/v2.5/src/locales/da-DK.json
@@ -1032,7 +1032,6 @@
     "name": "Navn",
     "new": "Ny",
     "none": "Ingen",
-    "o_counter": "O-tæller",
     "operations": "Operationer",
     "organized": "Organiseret",
     "pagination": {
diff --git a/ui/v2.5/src/locales/de-DE.json b/ui/v2.5/src/locales/de-DE.json
index 045cd46e3..3354d4085 100644
--- a/ui/v2.5/src/locales/de-DE.json
+++ b/ui/v2.5/src/locales/de-DE.json
@@ -304,7 +304,9 @@
                 "password_desc": "Passwort für den Zugriff auf Stash. Feld leer lassen, um Benutzerauthentifizierung zu deaktivieren",
                 "stash-box_integration": "Stash-box Einbindung",
                 "username": "Benutzername",
-                "username_desc": "Benutzername für den Zugriff auf Stash. Feld leer lassen, um Benutzerauthentifizierung zu deaktivieren"
+                "username_desc": "Benutzername für den Zugriff auf Stash. Feld leer lassen, um Benutzerauthentifizierung zu deaktivieren",
+                "log_file_max_size": "Maximale Log Größe",
+                "log_file_max_size_desc": "Maximale Größe, in Megabytes, von den Log Files bevor es komprimiert wird. 0MB ist deaktiviert. Benötigt Neustart."
             },
             "backup_directory_path": {
                 "description": "Verzeichnisspeicherort für SQLite-Datenbankdateisicherungen",
@@ -811,6 +813,18 @@
             "use_stash_hosted_funscript": {
                 "description": "Wenn aktiviert, werden Funscripts direkt von Stash an dein Handy-Gerät gesendet, ohne Handy-Server von Drittanbietern zu verwenden. Erfordert, dass Stash von deinem Handy-Gerät aus zugänglich ist und ein API-Schlüssel generiert wurde, falls Stash mit Zugangsdaten konfiguriert ist.",
                 "heading": "Funscripts direkt bereitstellen"
+            },
+            "performer_list": {
+                "options": {
+                    "show_links_on_grid_card": {
+                        "heading": "Zeige den Link auf der Darsteller Gitterkarte"
+                    }
+                },
+                "heading": "Darsteller Liste"
+            },
+            "sfw_mode": {
+                "description": "Aktivieren wenn man Stash für das speichern von SFW content benutzt. Versteckt oder Ändernt ein paar NFSW eigenschaften des UI.",
+                "heading": "SFW Content Modus"
             }
         },
         "advanced_mode": "Fortgeschrittener Modus"
@@ -974,7 +988,8 @@
         "performers_found": "{count} Darsteller:innen gefunden",
         "clear_o_history_confirm": "Möchten Sie wirklich den O-Verlauf löschen?",
         "overwrite_filter_warning": "Der gespeicherte Filter \"{entityName}\" wird überschrieben.",
-        "set_default_filter_confirm": "Sind Sie sicher, dass Sie diesen Filter als Standard festlegen möchten?"
+        "set_default_filter_confirm": "Sind Sie sicher, dass Sie diesen Filter als Standard festlegen möchten?",
+        "clear_o_history_confirm_sfw": "Bist du dir sicher das du den Verlauf löschen willst?"
     },
     "dimensions": "Maße",
     "director": "Regisseur",
@@ -1146,7 +1161,6 @@
     "name": "Name",
     "new": "Neu",
     "none": "Keiner",
-    "o_counter": "O-Zähler",
     "operations": "Operationen",
     "organized": "Organisiert",
     "pagination": {
@@ -1302,7 +1316,8 @@
             "where_is_your_porn_located": "Wo finden wir deine Porno-Kollektion?",
             "where_is_your_porn_located_description": "Füge Ordner hinzu in denen sich deine Porno-Videos und -Bilder befinden. Stash wird diese Ordner nutzen, um Videos und Bilder in das System einzupflegen.",
             "path_to_blobs_directory_empty_for_default": "Pfad zum Verzeichnis der blobs (standardmäßig leer)",
-            "store_blobs_in_database": "blobs in der Datenbank speichern"
+            "store_blobs_in_database": "blobs in der Datenbank speichern",
+            "sfw_content_settings": "Benutzt du stash auch für SFW Inhalte?"
         },
         "stash_setup_wizard": "Einrichtungshelfer für Stash",
         "success": {
@@ -1547,5 +1562,10 @@
         "username": "Benutzername"
     },
     "age_on_date": "bei Produktion",
-    "sort_name": "Namen sortieren"
+    "sort_name": "Namen sortieren",
+    "scenes_duration": "Szenen Dauer",
+    "last_o_at_sfw": "Letztes mal ein Gefällt mir gegeben am",
+    "o_count_sfw": "Gefällt mir",
+    "o_history_sfw": "Gefällt mir Verlauf",
+    "odate_recorded_no_sfw": "Kein Gefällt mir Datum vermerkt"
 }
diff --git a/ui/v2.5/src/locales/es-ES.json b/ui/v2.5/src/locales/es-ES.json
index 3fd9ef089..ce3a38b0a 100644
--- a/ui/v2.5/src/locales/es-ES.json
+++ b/ui/v2.5/src/locales/es-ES.json
@@ -141,8 +141,17 @@
         "reset_play_duration": "Reiniciar la duración de la reproducción",
         "load": "Cargar",
         "load_filter": "Cargar el filtro",
-        "play": "Jugar",
-        "reset_resume_time": "Restablecer el tiempo de reanudación"
+        "play": "Reproducir",
+        "reset_resume_time": "Restablecer el tiempo de reanudación",
+        "reset_cover": "Restaurar portada por defecto",
+        "set_cover": "Establecer como portada",
+        "show_results": "Mostrar resultados",
+        "show_count_results": "Mostrar {count} resultados",
+        "sidebar": {
+            "close": "Cerrar barra lateral",
+            "open": "Abrir barra lateral",
+            "toggle": "Alternar barra lateral"
+        }
     },
     "actions_name": "Acciones",
     "age": "Edad",
@@ -186,7 +195,10 @@
             "show_male_label": "Mostrar actores",
             "source": "Fuente",
             "mark_organized_desc": "Marcar la escena como organizada tras pulsar el botón de Guardar.",
-            "mark_organized_label": "Marcar como organizado al guardar"
+            "mark_organized_label": "Marcar como organizado al guardar",
+            "errors": {
+                "blacklist_duplicate": "Elemento duplicado en la lista negra"
+            }
         },
         "noun_query": "Consulta",
         "results": {
@@ -286,7 +298,9 @@
                 "password_desc": "Contraseña para acceder a Stash. Dejar en blanco para deshabilitar la exigencia de identificación para acceder a la aplicación",
                 "stash-box_integration": "Integración Stash-box",
                 "username": "Usuario",
-                "username_desc": "Usuario para acceder a Stash. Dejar en blanco para deshabilitar la exigencia de identificación para acceder a la aplicación"
+                "username_desc": "Usuario para acceder a Stash. Dejar en blanco para deshabilitar la exigencia de identificación para acceder a la aplicación",
+                "log_file_max_size": "Tamaño máximo del registro",
+                "log_file_max_size_desc": "Tamaño máximo en megabytes del archivo de registro antes de comprimirlo. 0 MB está desactivado. Requiere reiniciar."
             },
             "backup_directory_path": {
                 "description": "Ubicación del directorio para copias de seguridad de archivos de bases de datos SQLite",
@@ -438,7 +452,9 @@
             "endpoint": "Terminal de red",
             "graphql_endpoint": "Terminal de red GraphQL",
             "name": "Nombre",
-            "title": "Terminal de red Stash-box"
+            "title": "Terminal de red Stash-box",
+            "max_requests_per_minute": "Máximas peticiones por minuto",
+            "max_requests_per_minute_description": "Utiliza el valor predeterminado {defaultValue} si se establece en 0"
         },
         "system": {
             "transcoding": "Transcodificación"
@@ -490,7 +506,7 @@
                 "heading": "Identificar",
                 "identifying_from_paths": "Identificación de las escenas que se encuentren en las siguientes rutas",
                 "identifying_scenes": "Identificando {num} {scene}",
-                "include_male_performers": "Incluir actores (varones)",
+                "include_male_performers": "Incluir actores varones",
                 "set_cover_images": "Selección automática de carátula de escena",
                 "set_organized": "Marcar escena como \"clasificada\"",
                 "source": "Fuente",
@@ -564,7 +580,9 @@
                 "whitespace_chars": "Espacios en blanco",
                 "whitespace_chars_desc": "Estos caracteres se reemplazarán en el título por espacios en blanco"
             },
-            "scene_tools": "Herramientas de escenas"
+            "scene_tools": "Herramientas de escenas",
+            "graphql_playground": "Entorno de pruebas de GraphQL",
+            "heading": "Herramientas"
         },
         "ui": {
             "abbreviate_counters": {
@@ -729,7 +747,8 @@
                         "heading": "Etiqueta de VR"
                     },
                     "enable_chromecast": "Habilitar Chromecast",
-                    "show_ab_loop_controls": "Mostrar controles del plugin de bucle AB"
+                    "show_ab_loop_controls": "Mostrar controles del plugin de bucle AB",
+                    "show_range_markers": "Mostrar marcadores de rango"
                 }
             },
             "scene_wall": {
@@ -788,6 +807,18 @@
                         "heading": "Mostrar contenido de subetiquetas"
                     }
                 }
+            },
+            "sfw_mode": {
+                "heading": "Modo de contenido SFW",
+                "description": "Actívelo si utiliza Stash para almacenar contenido SFW. Oculta o modifica algunos aspectos de la interfaz de usuario relacionados con contenido para adultos."
+            },
+            "performer_list": {
+                "heading": "Lista de actores",
+                "options": {
+                    "show_links_on_grid_card": {
+                        "heading": "Mostrar enlaces en las tarjetas de la cuadrícula de actores"
+                    }
+                }
             }
         },
         "advanced_mode": "Modo avanzado"
@@ -887,7 +918,7 @@
             "marker_image_previews": "Vistas previas de marcadores en formato de imagen animada",
             "marker_image_previews_tooltip": "Generar también vistas previas animadas (webp), solo requeridas cuando el tipo de vista previa de la pared de escenas/marcadores está configurado como Imagen Animada. Al navegar, consumen menos CPU que las vistas previas de video, pero se generan además de ellas y son archivos más grandes.",
             "marker_screenshots": "Capturas de pantalla de marcadores",
-            "marker_screenshots_tooltip": "Imágenes estáticas JPG de marcadores, solo requeridas si el tipo de vista previa seleccionada por defecto es \"Imagen estática\".",
+            "marker_screenshots_tooltip": "Imágenes estáticas JPG de marcadores",
             "markers": "Vistas previas de marcadores",
             "markers_tooltip": "Vídeos de 20 segundos de duración que comienzan a partir del tiempo seleccionado.",
             "override_preview_generation_options": "Sobrescribir opciones para la generación de vistas previas",
@@ -946,7 +977,10 @@
             "destination": "Reasignar a"
         },
         "delete_entity_simple_desc": "{count, plural, one {¿Estás seguro de que quieres eliminar esta {singularEntity}?} other {¿Estás seguro de que quieres eliminar estas {pluralEntity}?}}",
-        "reassign_entity_title": "{count, plural, one {Reasignar {singularEntity}} other {Reasignar {pluralEntity}}}"
+        "reassign_entity_title": "{count, plural, one {Reasignar {singularEntity}} other {Reasignar {pluralEntity}}}",
+        "clear_o_history_confirm_sfw": "¿Estás seguro de que quieres borrar el historial de «Me gusta»?",
+        "overwrite_filter_warning": "El filtro guardado \"{entityName}\" se sobrescribirá.",
+        "set_default_filter_confirm": "¿Estás seguro de que deseas establecer este filtro como predeterminado?"
     },
     "dimensions": "Dimensiones",
     "director": "Director",
@@ -955,7 +989,8 @@
         "list": "Lista",
         "tagger": "Etiquetadora",
         "unknown": "Desconocido/a",
-        "wall": "Muro"
+        "wall": "Muro",
+        "label_current": "Modo de visualización: {current}"
     },
     "donate": "Donar",
     "dupe_check": {
@@ -1043,7 +1078,7 @@
         "uploading": "Subiendo script",
         "error": "Error al conectar con Handy"
     },
-    "hasMarkers": "Tiene marcadores",
+    "hasMarkers": "Marcadores",
     "height": "Estatura",
     "help": "Ayuda",
     "ignore_auto_tag": "Ignorar Etiquetado Automático",
@@ -1073,21 +1108,20 @@
         "interactive_speed": "Velocidad interactiva",
         "performer_card": {
             "age": "{age} {years_old}",
-            "age_context": "{age} {years_old} en esta escena"
+            "age_context": "{age} {years_old} durante la producción"
         },
         "phash": "Función de hash perceptual",
         "stream": "Transmisión",
         "video_codec": "Códec de vídeo",
         "play_count": "Contador de reproducciones",
         "play_duration": "Tiempo de reproducción",
-        "o_count": "Contador de pajas"
+        "o_count": "Contador de orgasmos"
     },
     "megabits_per_second": "{value} megabits por segundo (mbps)",
     "metadata": "Metadatos",
     "name": "Nombre",
     "new": "Añadir",
     "none": "Ninguno/a",
-    "o_counter": "Contador “P”",
     "operations": "Acciones",
     "organized": "Clasificadas",
     "pagination": {
@@ -1162,7 +1196,9 @@
         "name": "Filtro",
         "saved_filters": "Filtros guardados",
         "update_filter": "Actualizar filtro",
-        "edit_filter": "Editar filtro"
+        "edit_filter": "Editar filtro",
+        "search_term": "Término de búsqueda",
+        "more_filter_criteria": "+{count} más"
     },
     "seconds": "Segundos",
     "settings": "Preferencias",
@@ -1184,7 +1220,9 @@
         "errors": {
             "something_went_wrong": "¡OH NO! ¡Algo ha ido mal!",
             "something_went_wrong_description": "Si sospechas que puede haber un error con los datos aportados, por favor, haz clic en volver para arreglarlos. De lo contrario, abre una incidencia en {githubLink} o busca ayuda en {discordLink}.",
-            "something_went_wrong_while_setting_up_your_system": "Algo ha salido mal mientras configurábamos tu entorno. Éste es el mensaje de error recibido: {error}"
+            "something_went_wrong_while_setting_up_your_system": "Algo ha salido mal mientras configurábamos tu entorno. Éste es el mensaje de error recibido: {error}",
+            "unable_to_retrieve_system_status": "No se puede recuperar el estado del sistema: {error}",
+            "unexpected_error": "Se ha producido un error inesperado: {error}"
         },
         "folder": {
             "file_path": "Ruta relativa del fichero",
@@ -1206,7 +1244,7 @@
         },
         "paths": {
             "database_filename_empty_for_default": "nombre para el archivo de la base de datos (en blanco para usar opción por defecto)",
-            "description": "A continuación necesitamos saber dónde se encuentra tu colección de porno, y dónde guardar la base de datos de Stash y los ficheros multimedia de soporte generados. Estos ajustes se pueden modificar posteriormente.",
+            "description": "A continuación necesitamos saber dónde se encuentra tu contenido, y dónde guardar la base de datos de Stash y los ficheros multimedia de soporte generados. Estos ajustes se pueden modificar posteriormente.",
             "path_to_generated_directory_empty_for_default": "ruta al directorio de ficheros multimedia generados (dejar en blanco para usar opción por defecto)",
             "set_up_your_paths": "Selecciona tus rutas",
             "stash_alert": "No se han seleccionado rutas para tu biblioteca. Ningún fichero multimedia podrá ser seleccionado para su inclusión en Stash. ¿Estás seguro?",
@@ -1214,8 +1252,8 @@
             "where_can_stash_store_its_database_description": "Stash emplea una base de datos SQLite para almacenar los metadatos de tu colección. Por defecto será creada como <code>stash-go.sqlite</code> en el directorio en el que se encuentra tu archivo de configuración. Si quieres cambiar esto, por favor, introduce un nombre de archivo con ruta absoluta o relativa al directorio de trabajo actual.",
             "where_can_stash_store_its_generated_content": "¿Dónde guarda Stash los ficheros multimedia de soporte generados?",
             "where_can_stash_store_its_generated_content_description": "Para poder ofrecerte miniaturas, vistas previas y conjuntos de imágenes animadas, Stash genera imágenes y vídeos. Esto incluye también transcodificaciones para formatos de vídeo no soportados. Por defecto, Stash creará el directorio <code>generated</code> en el directorio que contiene tu archivo de configuración. Si quieres cambiar dónde se almacenarán estos archivos generados, por favor, introduce una ruta absoluta o relativa (al directorio de trabajo actual). Stash creará este directorio si no existe.",
-            "where_is_your_porn_located": "¿Dónde guardas el porno?",
-            "where_is_your_porn_located_description": "Añade los directorios que contienen tus imágenes y vídeos porno. Stash usará estos directorios para buscar imágenes y vídeos durante el escaneo.",
+            "where_is_your_porn_located": "¿Dónde guardas tu contenido?",
+            "where_is_your_porn_located_description": "Añade los directorios que contienen tus imágenes y vídeos. Stash usará estos directorios para buscar imágenes y vídeos durante el escaneo.",
             "path_to_cache_directory_empty_for_default": "ruta al directorio de la caché (dejar en blanco para usar el directorio por defecto)",
             "store_blobs_in_database": "Almacenar blobs en la base de datos",
             "path_to_blobs_directory_empty_for_default": "ruta al directorio con los blobs (dejar en blanco para el valor por defecto)",
@@ -1224,7 +1262,10 @@
             "where_can_stash_store_its_database_warning": "ADVERTENCIA: ¡almacenar la base de datos en un sistema diferente al que Stash se ejecuta (por ejemplo, almacenar la base de datos en un NAS mientras se ejecuta el servidor Stash en otro equipo) no es <strong>compatible</strong>! SQLite no está diseñado para su uso a través de una red e intentar hacerlo puede corromper fácilmente toda tu base de datos.",
             "where_can_stash_store_blobs": "¿Dónde puede Stash guardar los datos binarios de la base de datos?",
             "where_can_stash_store_blobs_description": "Stash puede almacenar datos binarios como portadas de escenas, imágenes de intérpretes, estudios y etiquetas ya sea en la base de datos o en el sistema de archivos. Por defecto, almacenará estos datos en el sistema de archivos en el subdirectorio <code>blobs</code> dentro del directorio que contiene tu archivo de configuración. Si deseas cambiar esto, por favor ingresa una ruta absoluta o relativa (respecto al directorio de trabajo actual). Stash creará este directorio si aún no existe.",
-            "where_can_stash_store_cache_files_description": "Para que algunas funciones como la transcodificación en vivo de HLS/DASH funcionen, Stash requiere un directorio de caché para archivos temporales. Por defecto, Stash creará un directorio <code>cache</code> dentro del directorio que contiene tu archivo de configuración. Si deseas cambiar esto, por favor ingresa una ruta absoluta o relativa (respecto al directorio de trabajo actual). Stash creará este directorio si aún no existe."
+            "where_can_stash_store_cache_files_description": "Para que algunas funciones como la transcodificación en vivo de HLS/DASH funcionen, Stash requiere un directorio de caché para archivos temporales. Por defecto, Stash creará un directorio <code>cache</code> dentro del directorio que contiene tu archivo de configuración. Si deseas cambiar esto, por favor ingresa una ruta absoluta o relativa (respecto al directorio de trabajo actual). Stash creará este directorio si aún no existe.",
+            "sfw_content_settings": "¿Usar Stash para contenido SFW?",
+            "sfw_content_settings_description": "Stash se puede utilizar para gestionar contenido SFW, como fotografía, arte, cómics y mucho más. Al habilitar esta opción, se ajustará el comportamiento de la interfaz de usuario para que sea más adecuado para el contenido SFW.",
+            "use_sfw_content_mode": "Utilizar el modo de contenido SFW"
         },
         "stash_setup_wizard": "Asistente de configuración de Stash",
         "success": {
@@ -1274,7 +1315,7 @@
         "scenes_duration": "Duración de las escenas",
         "scenes_size": "Tamaño de las escenas",
         "total_play_count": "Contador total de reproducciones",
-        "total_o_count": "Total de pajas",
+        "total_o_count": "Total de orgasmos",
         "total_play_duration": "Tiempo total de reproducciones",
         "scenes_played": "Escenas reproducidas"
     },
@@ -1345,7 +1386,7 @@
         }
     },
     "file_count": "Conteo de archivos",
-    "hasChapters": "Tiene capítulos",
+    "hasChapters": "Capítulos",
     "index_of_total": "{index} de {total}",
     "last_played_at": "Última reproducción el",
     "package_manager": {
@@ -1385,8 +1426,8 @@
     "date_format": "YYYY-MM-DD",
     "datetime_format": "YYYY-MM-DD HH:MM",
     "disambiguation": "Disambiguación",
-    "o_count": "Contador de pajas",
-    "o_history": "Historial de pajas",
+    "o_count": "Contador de orgasmos",
+    "o_history": "Historial de orgasmos",
     "orientation": "Orientación",
     "penis_length_cm": "Longitud del pene (cm)",
     "play_count": "Contador de reproducciones",
@@ -1437,7 +1478,7 @@
             "saved_filter": "Filtro guardado"
         }
     },
-    "last_o_at": "Última paja a las",
+    "last_o_at": "Último orgasmo a las",
     "parent_studio": "Estudio principal",
     "primary_file": "Archivo principal",
     "recently_added_objects": "{objects} añadidas recientemente",
@@ -1468,14 +1509,15 @@
         "blank": "${path} no puede estar vacío",
         "date_invalid_form": "${path} tiene que tener el formato YYYY-MM-DD",
         "required": "${path} es un campo requerido",
-        "unique": "${path} tiene que ser único"
+        "unique": "${path} tiene que ser único",
+        "end_time_before_start_time": "El tiempo de finalización debe ser mayor o igual que el tiempo de inicio"
     },
     "subsidiary_studio_count": "Número de estudios secundarios",
     "tag_parent_tooltip": "Tiene etiquetas primarias",
     "tag_sub_tag_tooltip": "Tiene sub-etiquetas",
     "time": "Hora",
     "type": "Tipo",
-    "odate_recorded_no": "No hay registro de pajas grabado",
+    "odate_recorded_no": "No hay registro de orgasmos grabado",
     "urls": "URLs",
     "zip_file_count": "Números de archivos zip",
     "unknown_date": "Fecha desconocida",
@@ -1490,7 +1532,9 @@
     "custom_fields": {
         "field": "Campo",
         "value": "Valor",
-        "title": "Campos personalizados"
+        "title": "Campos personalizados",
+        "criteria_format_string": "{criterion} (custom field) {modifierString} {valueString}",
+        "criteria_format_string_others": "{criterion} (custom field) {modifierString} {valueString} (+{others} others)"
     },
     "sub_group_count": "Recuento de subgrupos",
     "sub_group_of": "Subgrupo de {parent}",
@@ -1500,9 +1544,30 @@
         "any": "Cualquiera",
         "any_of": "Cualquiera de",
         "none": "Ninguno",
-        "only": "Solamente"
+        "only": "Solo"
     },
     "include_sub_group_content": "Incluir contenido de subgrupos",
     "include_sub_groups": "Incluir subgrupos",
-    "eta": "Tiempo estimado"
+    "eta": "Tiempo estimado",
+    "containing_group": "Grupo contenedor",
+    "containing_group_count": "Contador del grupo contenedor",
+    "containing_groups": "Grupo de contenedores",
+    "login": {
+        "username": "Nombre de usuario",
+        "password": "Contraseña",
+        "invalid_credentials": "Nombre de usuario o contraseña incorrecto",
+        "login": "Iniciar sesión",
+        "internal_error": "Error interno inesperado. Consulte los registros para obtener más detalles"
+    },
+    "age_on_date": "{age} durante la producción",
+    "include_sub_studio_content": "Incluir contenido de subestudios",
+    "include_sub_tag_content": "Incluir contenido de subetiquetas",
+    "last_o_at_sfw": "Último «Me gusta» en",
+    "sort_name": "Ordenar por nombre",
+    "o_count_sfw": "Me gusta",
+    "o_history_sfw": "Historial de Me gusta",
+    "odate_recorded_no_sfw": "Sin fecha de Me gusta registrada",
+    "scenes_duration": "Duración de la escena",
+    "sub_group_order": "Orden de subgrupo",
+    "time_end": "Hora de finalización"
 }
diff --git a/ui/v2.5/src/locales/et-EE.json b/ui/v2.5/src/locales/et-EE.json
index d835e54bc..ec377065e 100644
--- a/ui/v2.5/src/locales/et-EE.json
+++ b/ui/v2.5/src/locales/et-EE.json
@@ -299,7 +299,9 @@
                 "password_desc": "Parool Stashi pääsemiseks. Jäta tühjaks, kui soovid sisselogimise keelata",
                 "stash-box_integration": "Stash-kasti integratsioon",
                 "username": "Kasutajanimi",
-                "username_desc": "Kasutajanimi Stashi pääsemiseks. Jäta tühjaks, kui soovid sisselogimise keelata"
+                "username_desc": "Kasutajanimi Stashi pääsemiseks. Jäta tühjaks, kui soovid sisselogimise keelata",
+                "log_file_max_size": "Maksimaalne logi suurus",
+                "log_file_max_size_desc": "Maksimaalne logifaili suurus megabaitides enne tihendamist. 0MB on väljalülitatud. Nõuab taaskäivitust."
             },
             "backup_directory_path": {
                 "description": "Failitee SQLite andmebaasi varundusfailide jaoks",
@@ -806,6 +808,18 @@
                     "heading": "Kompaktselt laiendatud detailid"
                 },
                 "heading": "Detailide Leht"
+            },
+            "performer_list": {
+                "heading": "Näitlejate nimekiri",
+                "options": {
+                    "show_links_on_grid_card": {
+                        "heading": "Kuva linke näitlejate ruudustiku kaartidel"
+                    }
+                }
+            },
+            "sfw_mode": {
+                "description": "Luba, kui kasutad stashi SFW sisu jaoks. Peidab või muudab kasutajaliidese mõningaid täiskasvanutele mõeldud sisuga seotud aspekte.",
+                "heading": "SFW Sisu Režiim"
             }
         },
         "advanced_mode": "Täpsem Režiim"
@@ -969,7 +983,8 @@
         "clear_o_history_confirm": "Kas oled kindel, et soovid puhastada O ajaloo?",
         "clear_play_history_confirm": "Kas oled kindel, et soovid puhastada vaatamise ajaloo?",
         "set_default_filter_confirm": "Kas oled kindel, et soovid määrata seda filtrit vaikimisi valikuks?",
-        "overwrite_filter_warning": "Salvestatud filter \"{entityName}\" kirjutatakse üle."
+        "overwrite_filter_warning": "Salvestatud filter \"{entityName}\" kirjutatakse üle.",
+        "clear_o_history_confirm_sfw": "Kas oled kindel, et tahad meeldimiste ajalugu tühjendada?"
     },
     "dimensions": "Dimensioonid",
     "director": "Režissöör",
@@ -1093,8 +1108,8 @@
         "syncing": "Serveriga sünkroniseerimine",
         "uploading": "Skripti üleslaadimine"
     },
-    "hasChapters": "Sisaldab Episoode",
-    "hasMarkers": "On Markereid",
+    "hasChapters": "Peatükid",
+    "hasMarkers": "Markerid",
     "height": "Pikkus",
     "height_cm": "Pikkus (cm)",
     "help": "Abi",
@@ -1141,7 +1156,6 @@
     "name": "Nimi",
     "new": "Uus",
     "none": "Puudub",
-    "o_counter": "O-Loendur",
     "operations": "Operatsioonid",
     "organized": "Organiseeritud",
     "pagination": {
@@ -1276,7 +1290,7 @@
         },
         "paths": {
             "database_filename_empty_for_default": "andmebaasi failinimi (vaikimisi tühi)",
-            "description": "Järgmisena peame kindlaks määrama, kust leida su pornokogu ja kuhu salvestada stashi andmebaas, genereeritud failid ja cache. Neid sätteid saab hiljem vajadusel muuta.",
+            "description": "Järgmisena peame kindlaks määrama, kust leida su sisu ja kuhu salvestada stashi andmebaas, genereeritud failid ja cache. Neid sätteid saab hiljem vajadusel muuta.",
             "path_to_cache_directory_empty_for_default": "tee cache kaustani (tühi vaikeseadeks)",
             "path_to_generated_directory_empty_for_default": "genereeritud kataloogi tee (vaikimisi tühi)",
             "set_up_your_paths": "Seadista oma failiteed",
@@ -1287,14 +1301,17 @@
             "where_can_stash_store_cache_files": "Kus saab Stash hoida cache faile?",
             "where_can_stash_store_cache_files_description": "Mõne funktsionaalsuse, nagu HLS/DASH reaalas transkodeerimine, töötamiseks vajab Stash cache kausta ajutiste failide jaoks. Vaikimisi loob Stash <code>cache</code> kausta mis asub konfiguratsioonifailiga samas kaustas. Kui tahad seda muuta, palun sisesta absoluutne või relatiivne (töökaustaga) tee. Stash loob selle kausta kui seda juba ei eksisteeri.",
             "where_can_stash_store_its_database": "Kuhu saab Stash oma andmebaasi salvestada?",
-            "where_can_stash_store_its_database_description": "Stash kasutab su porno metaandmete salvestamiseks SQLite'i andmebaasi. Vaikimisi luuakse see konfiguratsioonifaili sisaldavasse kataloogi kui <code>stash-go.sqlite</code>. Kui soovid seda muuta, sisesta absoluutne või suhteline failinimi (praeguse töökataloogi suhtes).",
+            "where_can_stash_store_its_database_description": "Stash kasutab su sisu metaandmete salvestamiseks SQLite'i andmebaasi. Vaikimisi luuakse see konfiguratsioonifaili sisaldavasse kataloogi kui <code>stash-go.sqlite</code>. Kui soovid seda muuta, sisesta absoluutne või suhteline failinimi (praeguse töökataloogi suhtes).",
             "where_can_stash_store_its_database_warning": "HOIATUS: hoides andmebaasi erineval süsteemil kui millel Stash jookseb (nt hoides andmebaasi NASil kui Stash jookseb teisel arvutil) on <strong>mitte toetatud</strong>! SQLite ei ole mõeldud kasutamiseks üle võrgu ja selle proovimine võib väga kergesti viia andmebaasi korrupeerumiseni.",
             "where_can_stash_store_its_generated_content": "Kus saab Stash oma genereeritud sisu salvestada?",
             "where_can_stash_store_its_generated_content_description": "Pisipiltide, eelvaadete ja spraitide pakkumiseks loob Stash pilte ja videoid. See hõlmab ka toetamata failivormingute ümbertöötlemist. Vaikimisi loob Stash konfiguratsioonifaili sisaldavas kaustas <code>genereeritud</code> kausta. Kui soovid muuta seda, kus see loodud meedium salvestatakse, sisesta absoluutne või suhteline failitee (praeguse töökataloogi suhtes). Stash loob selle kausta, kui seda veel pole.",
-            "where_is_your_porn_located": "Kus su porno asub?",
-            "where_is_your_porn_located_description": "Lisage oma pornovideoid ja pilte sisaldavad kataloogid. Stash kasutab neid katalooge skanimise ajal videote ja piltide otsimiseks.",
+            "where_is_your_porn_located": "Kus su sisu asub?",
+            "where_is_your_porn_located_description": "Lisage oma videoid ja pilte sisaldavad kataloogid. Stash kasutab neid katalooge skanimise ajal videote ja piltide otsimiseks.",
             "path_to_blobs_directory_empty_for_default": "blobsi kataloogi tee (vaikimisi tühi)",
-            "store_blobs_in_database": "Salvesta blobid andmebaasi"
+            "store_blobs_in_database": "Salvesta blobid andmebaasi",
+            "sfw_content_settings": "Kasutad stashi SFW sisu jaoks?",
+            "sfw_content_settings_description": "stashi saab kasutada SFW-sisu, näiteks fotograafia, kunsti, koomiksite ja muu haldamiseks. Selle valiku lubamine muudab kasutajaliidese käitumist SFW-sisu jaoks sobivamaks.",
+            "use_sfw_content_mode": "Kasuta SFW sisu režiimi"
         },
         "stash_setup_wizard": "Stashi Ülessättimise Viisard",
         "success": {
@@ -1547,5 +1564,10 @@
         "login": "Logi Sisse"
     },
     "age_on_date": "{age} filmimisel",
-    "sort_name": "Sorteeritud Nimi"
+    "sort_name": "Sorteeritud Nimi",
+    "scenes_duration": "Stseeni Pikkus",
+    "last_o_at_sfw": "Viimane Meeldimine",
+    "o_count_sfw": "Meeldimisi",
+    "o_history_sfw": "Meeldimiste Ajalugu",
+    "odate_recorded_no_sfw": "Meeldimise Kuupäeva Pole Salvestatud"
 }
diff --git a/ui/v2.5/src/locales/fi-FI.json b/ui/v2.5/src/locales/fi-FI.json
index d1636230b..2256d8e5d 100644
--- a/ui/v2.5/src/locales/fi-FI.json
+++ b/ui/v2.5/src/locales/fi-FI.json
@@ -1024,7 +1024,6 @@
     "name": "Nimi",
     "new": "Uusi",
     "none": "Ei mitään",
-    "o_counter": "O-Laskuri",
     "operations": "Operaatiot",
     "organized": "Järjestelty",
     "pagination": {
diff --git a/ui/v2.5/src/locales/fr-FR.json b/ui/v2.5/src/locales/fr-FR.json
index 997a672be..94780b647 100644
--- a/ui/v2.5/src/locales/fr-FR.json
+++ b/ui/v2.5/src/locales/fr-FR.json
@@ -305,7 +305,9 @@
                 "password_desc": "Mot de passe pour accéder à Stash. Laisser vide pour désactiver l'authentification utilisateur",
                 "stash-box_integration": "Intégration de Stash-Box",
                 "username": "Nom d'utilisateur",
-                "username_desc": "Nom d'utilisateur pour accéder à Stash. Laisser vide pour désactiver l'authentification utilisateur"
+                "username_desc": "Nom d'utilisateur pour accéder à Stash. Laisser vide pour désactiver l'authentification utilisateur",
+                "log_file_max_size": "Taille maximale du journal",
+                "log_file_max_size_desc": "Taille maximale en mégaoctets du fichier journal avant compression. 0 Mo est désactivé. Nécessite un redémarrage."
             },
             "backup_directory_path": {
                 "description": "Emplacement de sauvegarde des bases de données SQLite",
@@ -812,6 +814,18 @@
             "use_stash_hosted_funscript": {
                 "description": "Activée, les scripts interactifs sont transmis directement de Stash à votre dispositif Handy sans recourir au serveur Handy de tierce partie. Nécessite que Stash soit accessible depuis votre dispositif Handy, et qu'une clé API soit générée si Stash a des informations d'identification configurées.",
                 "heading": "Transmettre directement les funscripts"
+            },
+            "performer_list": {
+                "heading": "Liste de performeurs",
+                "options": {
+                    "show_links_on_grid_card": {
+                        "heading": "Afficher les liens sur les fiches des performeurs"
+                    }
+                }
+            },
+            "sfw_mode": {
+                "description": "Activez cette option si vous utilisez Stash pour stocker du contenu SFW. Masque ou modifie certains aspects de l'interface utilisateur liés au contenu pour adultes.",
+                "heading": "Mode contenu SFW"
             }
         },
         "advanced_mode": "Mode avancé"
@@ -975,7 +989,8 @@
         "clear_o_history_confirm": "Êtes-vous sûr de vouloir effacer l'historique des O ?",
         "clear_play_history_confirm": "Êtes-vous sûr de vouloir effacer l'historique de lecture ?",
         "overwrite_filter_warning": "Le filtre enregistré \"{entityName}\" sera remplacé.",
-        "set_default_filter_confirm": "Êtes-vous sûr de vouloir définir ce filtre par défaut ?"
+        "set_default_filter_confirm": "Êtes-vous sûr de vouloir définir ce filtre par défaut ?",
+        "clear_o_history_confirm_sfw": "Êtes-vous sûr de vouloir effacer l'historique des \"J'aime\" ?"
     },
     "dimensions": "Dimensions",
     "director": "Réalisateur",
@@ -1099,8 +1114,8 @@
         "syncing": "Synchronisation avec le serveur",
         "uploading": "Script de chargement"
     },
-    "hasChapters": "A des chapitres",
-    "hasMarkers": "Dispose de marqueurs",
+    "hasChapters": "Chapitres",
+    "hasMarkers": "Marqueurs",
     "height": "Taille",
     "height_cm": "Taille (cm)",
     "help": "Aide",
@@ -1148,7 +1163,6 @@
     "name": "Nom",
     "new": "Nouveau",
     "none": "Aucun",
-    "o_counter": "O-Compteur",
     "operations": "Opérations",
     "organized": "Organisé",
     "pagination": {
@@ -1287,7 +1301,7 @@
         },
         "paths": {
             "database_filename_empty_for_default": "Nom de fichier de la base de données (vide par défaut)",
-            "description": "Ensuite, nous devons déterminer où trouver votre collection pornographique, et où stocker la base de données Stash, les fichiers générés et les fichiers cache. Ces paramètres peuvent être modifiés ultérieurement si nécessaire.",
+            "description": "Ensuite, nous devons déterminer où trouver votre contenu, et où stocker la base de données Stash, les fichiers générés et les fichiers cache. Ces paramètres peuvent être modifiés ultérieurement si nécessaire.",
             "path_to_blobs_directory_empty_for_default": "chemin vers le répertoire des blobs (vide par défaut)",
             "path_to_cache_directory_empty_for_default": "chemin du répertoire du cache (vide par défaut)",
             "path_to_generated_directory_empty_for_default": "Chemin vers le répertoire généré (vide par défaut)",
@@ -1300,12 +1314,15 @@
             "where_can_stash_store_cache_files": "Où Stash peut-il stocker les fichiers cache ?",
             "where_can_stash_store_cache_files_description": "Pour que certaines fonctionnalités telles que le transcodage en temps réel HLS/DASH puissent fonctionner, Stash a besoin d'un répertoire de cache pour les fichiers temporaires. Par défaut, Stash créera un sous-répertoire <code>cache</code> dans le répertoire contenant votre fichier de configuration. Si vous souhaitez le modifier, merci de saisir un chemin absolu ou relatif (par rapport au répertoire de travail actuel). Stash créera ce sous-répertoire s'il n'existe pas déjà.",
             "where_can_stash_store_its_database": "Où Stash peut-il stocker sa base de données ?",
-            "where_can_stash_store_its_database_description": "Stash utilise une base de données SQLite pour stocker vos métadonnées pornographiques. Par défaut, cette base sera créée en tant que <code>stash-go.sqlite</code> dans le répertoire contenant votre fichier de configuration. Si vous souhaitez modifier cela, saisissez un nom de fichier absolu ou relatif ( vers le répertoire de travail actuel).",
+            "where_can_stash_store_its_database_description": "Stash utilise une base de données SQLite pour stocker vos métadonnées de contenu. Par défaut, cette base sera créée en tant que <code>stash-go.sqlite</code> dans le répertoire contenant votre fichier de configuration. Si vous souhaitez modifier cela, saisissez un nom de fichier absolu ou relatif ( vers le répertoire de travail actuel).",
             "where_can_stash_store_its_database_warning": "AVERTISSEMENT : Le stockage de la base de données sur un système différent de celui à partir duquel Stash est exécuté (par exemple, le stockage de la base de données sur un NAS tout en exécutant le serveur Stash sur un autre ordinateur) est <strong>non pris en charge</strong> ! SQLite n'est pas conçu pour être utilisé sur un réseau, et toute tentative de le faire peut très facilement entraîner la corruption de l'ensemble de votre base de données.",
             "where_can_stash_store_its_generated_content": "Où Stash peut-il stocker son contenu généré ?",
             "where_can_stash_store_its_generated_content_description": "Afin de produire les vignettes, aperçus et sprites, Stash génère des images et des vidéos. Cela inclut également les transcodes pour les formats de fichiers non pris en charge. Par défaut, Stash crée un répertoire <code>generated</code> dans le répertoire contenant votre fichier de configuration. Si vous souhaitez modifier l'emplacement où seront stockés les médias générés, veuillez saisir un chemin absolu ou relatif ( vers le répertoire de travail actuel). Stash créera ce répertoire s'il n'existe pas déjà.",
-            "where_is_your_porn_located": "Où se trouve votre porno ?",
-            "where_is_your_porn_located_description": "Ajoutez des répertoires contenant vos vidéos et images pornographiques. Stash utilisera ces répertoires pour rechercher les vidéos et les images lors de l'analyse."
+            "where_is_your_porn_located": "Où se trouve votre contenu ?",
+            "where_is_your_porn_located_description": "Ajoutez des répertoires contenant vos vidéos et images. Stash utilisera ces répertoires pour rechercher les vidéos et les images lors de l'analyse.",
+            "sfw_content_settings": "Utiliser Stash pour du contenu SFW ?",
+            "sfw_content_settings_description": "Stash peut être utilisé pour gérer du contenu SFW tel que des photographies, des illustrations, des bandes dessinées, et plus. L'activation de cette option modifiera certains comportements de l'interface utilisateur pour les rendre plus appropriés au contenu SFW.",
+            "use_sfw_content_mode": "Utiliser le mode de contenu SFW"
         },
         "stash_setup_wizard": "Assistant de configuration de Stash",
         "success": {
@@ -1496,13 +1513,13 @@
     "last_o_at": "Dernier O le",
     "o_count": "Nombre d'O",
     "o_history": "Historique d'O",
-    "odate_recorded_no": "Aucune date d'O enregistrée",
+    "odate_recorded_no": "Aucun O daté enregistré",
     "subsidiary_studio_count": "Nombre de studios affiliés",
     "tag_sub_tag_tooltip": "A des étiquettes affiliées",
     "time": "Temps",
     "photographer": "Photographe",
     "play_history": "Historique de Lecture",
-    "playdate_recorded_no": "Aucune date de lecture enregistrée",
+    "playdate_recorded_no": "Aucune lecture datée enregistrée",
     "plays": "{value} lectures",
     "unknown_date": "Date inconnue",
     "history": "Historique",
@@ -1547,5 +1564,10 @@
         "internal_error": "Erreur interne inattendue. Consulter le journal pour plus de détails",
         "login": "Identification",
         "username": "Nom d'utilisateur"
-    }
+    },
+    "scenes_duration": "Durée de la scène",
+    "last_o_at_sfw": "Dernier J'aime",
+    "o_count_sfw": "J'aime",
+    "odate_recorded_no_sfw": "Aucun “J’aime” daté enregistré",
+    "o_history_sfw": "Historique des \"J’aime\""
 }
diff --git a/ui/v2.5/src/locales/hu-HU.json b/ui/v2.5/src/locales/hu-HU.json
index be47f77a9..b35e4579e 100644
--- a/ui/v2.5/src/locales/hu-HU.json
+++ b/ui/v2.5/src/locales/hu-HU.json
@@ -503,7 +503,6 @@
     "name": "Név",
     "new": "Új",
     "none": "Nincs",
-    "o_counter": "O-Számláló",
     "operations": "Műveletek",
     "organized": "Rendezve",
     "pagination": {
diff --git a/ui/v2.5/src/locales/id-ID.json b/ui/v2.5/src/locales/id-ID.json
index ba0c9bca7..a1b4f43f2 100644
--- a/ui/v2.5/src/locales/id-ID.json
+++ b/ui/v2.5/src/locales/id-ID.json
@@ -756,7 +756,6 @@
         "generic": "Memuat…"
     },
     "tag": "Tag",
-    "o_counter": "Penghitung Crot",
     "operations": "Operasi",
     "organized": "Terorganisir",
     "orientation": "Orientasi",
diff --git a/ui/v2.5/src/locales/it-IT.json b/ui/v2.5/src/locales/it-IT.json
index 349abaabb..0735540d6 100644
--- a/ui/v2.5/src/locales/it-IT.json
+++ b/ui/v2.5/src/locales/it-IT.json
@@ -937,7 +937,6 @@
     "name": "Nome",
     "new": "Nuovo",
     "none": "Nessuno/a",
-    "o_counter": "Contatore-O",
     "operations": "Operazioni",
     "organized": "Ordinato",
     "pagination": {
diff --git a/ui/v2.5/src/locales/ja-JP.json b/ui/v2.5/src/locales/ja-JP.json
index 005083d6d..0c5a8ef89 100644
--- a/ui/v2.5/src/locales/ja-JP.json
+++ b/ui/v2.5/src/locales/ja-JP.json
@@ -791,6 +791,9 @@
                 "direction": "方向",
                 "heading": "画像ウォール",
                 "margin": "マージン (px単位)"
+            },
+            "performer_list": {
+                "heading": "AV女優・男優リスト"
             }
         },
         "advanced_mode": "高度なモード"
@@ -808,7 +811,7 @@
     },
     "country": "国",
     "cover_image": "カバー画像",
-    "created_at": "作成者：",
+    "created_at": "作成日",
     "criterion": {
         "greater_than": "より大きい",
         "less_than": "より小さい",
@@ -1076,7 +1079,6 @@
     "name": "名前",
     "new": "新規作成",
     "none": "なし",
-    "o_counter": "発射カウンター",
     "operations": "オペレーション",
     "organized": "分類済み",
     "pagination": {
@@ -1328,5 +1330,6 @@
         "value": "値"
     },
     "distance": "距離",
-    "age_on_date": "撮影時の年齢 {age}歳"
+    "age_on_date": "撮影時の年齢 {age}歳",
+    "containing_group": "含まれるグループ"
 }
diff --git a/ui/v2.5/src/locales/ko-KR.json b/ui/v2.5/src/locales/ko-KR.json
index f022b7790..15d285434 100644
--- a/ui/v2.5/src/locales/ko-KR.json
+++ b/ui/v2.5/src/locales/ko-KR.json
@@ -45,9 +45,9 @@
         "from_url": "URL로 불러오기…",
         "full_export": "전부 내보내기",
         "full_import": "전부 불러오기",
-        "generate": "만들기",
-        "generate_thumb_default": "기본 썸네일 만들기",
-        "generate_thumb_from_current": "현재 화면으로 썸네일 만들기",
+        "generate": "생성",
+        "generate_thumb_default": "기본 썸네일 생성",
+        "generate_thumb_from_current": "현재 화면으로 썸네일 생성",
         "hash_migration": "해쉬 값 마이그레이션",
         "hide": "숨기기",
         "hide_configuration": "설정 숨기기",
@@ -65,7 +65,7 @@
         "next_action": "다음",
         "not_running": "실행 중이 아님",
         "open_in_external_player": "외부 플레이어에서 열기",
-        "open_random": "랜덤 배우 정보 열기",
+        "open_random": "랜덤 열기",
         "overwrite": "덮어쓰기",
         "play_random": "랜덤 영상 재생",
         "play_selected": "선택된 영상 재생",
@@ -104,7 +104,7 @@
         "show": "보여주기",
         "show_configuration": "설정 보여주기",
         "skip": "건너뛰기",
-        "split": "나누기",
+        "split": "분할",
         "stop": "정지",
         "submit": "제출",
         "submit_stash_box": "Stash-Box에 제출하기",
@@ -214,7 +214,7 @@
             "fp_matches": "영상 길이가 일치함",
             "fp_matches_multi": "영상 길이가 {durationsLength}개 중 {matchCount}개의 식별값과 일치합니다",
             "hash_matches": "{hash_type}이 일치함",
-            "match_failed_already_tagged": "이미 태깅된 영상",
+            "match_failed_already_tagged": "이미 태그된 영상",
             "match_failed_no_result": "결과 없음",
             "match_success": "영상 태깅 성공",
             "phash_matches": "{count}개의 PHash가 일치함",
@@ -432,7 +432,7 @@
         },
         "plugins": {
             "hooks": "후크",
-            "triggers_on": "트리거 켜기",
+            "triggers_on": "작동 조건",
             "available_plugins": "사용 가능한 플러그인",
             "installed_plugins": "설치된 플러그인"
         },
@@ -487,9 +487,9 @@
                 "generating_from_paths": "다음 경로에서 영상 생성 중",
                 "generating_scenes": "{num}개의 {scene} 생성 중"
             },
-            "generate_clip_previews_during_scan": "이미지 클립 미리보기 생성하기",
+            "generate_clip_previews_during_scan": "이미지 클립 미리보기 생성",
             "generate_desc": "이미지, 스프라이트, 비디오, vtt 등 파일을 생성합니다.",
-            "generate_phashes_during_scan": "컨텐츠 해시 값 생성",
+            "generate_phashes_during_scan": "해쉬 값 생성",
             "generate_phashes_during_scan_tooltip": "중복된 파일 확인과 영상 식별에 사용됩니다.",
             "generate_previews_during_scan": "움직이는 이미지 미리보기 생성",
             "generate_previews_during_scan_tooltip": "애니메이션(webp) 미리보기 또한 생성합니다. 영상/마커 월의 미리보기 유형이 '애니메이션 이미지'로 설정된 경우에만 필요합니다. '애니메이션 미리보기'는 '비디오 미리보기'보다 CPU를 덜 사용하지만, '비디오 미리보기'에 추가적으로 '애니메이션 미리보기'가 생성되기 때문에 파일 크기가 커집니다.",
@@ -626,12 +626,12 @@
             },
             "editing": {
                 "disable_dropdown_create": {
-                    "description": "드랍다운 메뉴에서 새로운 오브젝트를 추가할 수 없도록 합니다",
-                    "heading": "드랍다운 메뉴 비활성화"
+                    "description": "선택창에서 새로운 오브젝트를 추가할 수 없도록 합니다",
+                    "heading": "선택창 비활성화"
                 },
                 "heading": "수정하기",
                 "max_options_shown": {
-                    "label": "Dropdown에 표시되는 최대 개수"
+                    "label": "선택창에 표시되는 최대 개수"
                 },
                 "rating_system": {
                     "star_precision": {
@@ -811,6 +811,14 @@
                     "description": "활성화되면, 모든 컨텐츠 세부사항이 기본값으로 보여지게 되고, 각각의 세부사항들이 하나의 열에 위아래로 정렬됩니다",
                     "heading": "모든 세부사항 보여주기"
                 }
+            },
+            "performer_list": {
+                "heading": "배우 목록",
+                "options": {
+                    "show_links_on_grid_card": {
+                        "heading": "배우 그리드 카드에 링크 표시"
+                    }
+                }
             }
         },
         "advanced_mode": "고급 설정 모드"
@@ -838,7 +846,7 @@
     "criterion_modifier": {
         "between": "구간",
         "equals": "=",
-        "excludes": "포함하지 않음",
+        "excludes": "제외",
         "format_string": "{criterion} {modifierString} {valueString}",
         "greater_than": ">",
         "includes": "포함",
@@ -933,7 +941,7 @@
             "override_preview_generation_options": "미리보기 생성 옵션 재정의",
             "override_preview_generation_options_desc": "이 작업에 대한 미리보기 생성 옵션을 재정의합니다. 기본값은 '시스템' -> '미리보기 생성'에서 설정됩니다.",
             "overwrite": "기존 파일들 덮어쓰기",
-            "phash": "해시",
+            "phash": "해쉬",
             "preview_exclude_end_time_desc": "영상 미리보기에서 마지막 x 초를 제외합니다. 초 단위, 혹은 전체 영상 재생 길이 중 비율(예: 2%)로 나타낼 수 있습니다.",
             "preview_exclude_end_time_head": "마지막 영상 부분 제외",
             "preview_exclude_start_time_desc": "영상 미리보기에서 처음 x 초를 제외합니다. 초 단위, 혹은 전체 영상 재생 길이 중 비율(예: 2%)로 나타낼 수 있습니다.",
@@ -990,7 +998,7 @@
     "donate": "후원",
     "dupe_check": {
         "description": "'정확' 이하의 수준에서는 계산이 오래 걸릴 수 있습니다. 낮은 정밀도 수준에서는 부정확한 결과가 함께 나올 수 있습니다.",
-        "duration_diff": "최대 영상 재생 시간 차이",
+        "duration_diff": "최대 영상 길이 차이",
         "duration_options": {
             "any": "상관 없음",
             "equal": "같음"
@@ -1037,7 +1045,7 @@
     },
     "empty_server": "이 페이지에서 추천 영상들을 확인하려면 영상을 추가하세요.",
     "errors": {
-        "image_index_greater_than_zero": "이미지 인덱스는 0보다 커야 합니다",
+        "image_index_greater_than_zero": "이미지 번호는 0보다 커야 합니다",
         "lazy_component_error_help": "만약 최근에 Stash를 업그레이드했다면, 웹페이지를 새로고침하거나 브라우저 캐시를 삭제해주세요.",
         "something_went_wrong": "오류가 발생했습니다.",
         "header": "오류",
@@ -1098,8 +1106,8 @@
         "syncing": "서버와 동기화 중",
         "uploading": "스크립트 업로드 중"
     },
-    "hasChapters": "챕터 유무",
-    "hasMarkers": "마커 유무",
+    "hasChapters": "챕터",
+    "hasMarkers": "마커",
     "height": "키",
     "height_cm": "키 (cm)",
     "help": "도움말",
@@ -1146,7 +1154,6 @@
     "name": "이름",
     "new": "새로 만들기",
     "none": "없음",
-    "o_counter": "싼 횟수",
     "operations": "작업",
     "organized": "정리됨",
     "pagination": {
@@ -1374,20 +1381,20 @@
     "title": "제목",
     "toast": {
         "added_entity": "{singularEntity}을(를) 추가했습니다",
-        "added_generation_job_to_queue": "생성 작업을 대기열에 추가했습니다",
+        "added_generation_job_to_queue": "컨텐츠 생성 작업을 대기열에 추가했습니다",
         "created_entity": "{entity}를 생성했습니다",
         "default_filter_set": "기본 필터가 설정되었습니다",
         "delete_past_tense": "{count, plural, one {{singularEntity}} other {{pluralEntity}}}이(가) 삭제되었습니다",
         "generating_screenshot": "스크린샷을 생성하는 중…",
         "image_index_too_large": "오류: 이미지 번호가 갤러리의 이미지 개수보다 큽니다",
-        "merged_scenes": "영상들을 합쳤습니다",
-        "merged_tags": "병합된 태그",
-        "reassign_past_tense": "재할당된 파일",
+        "merged_scenes": "영상이 병합되었습니다",
+        "merged_tags": "태그가 병합되었습니다",
+        "reassign_past_tense": "파일이 재할당되었습니다",
         "removed_entity": "{singularEntity}을(를) 제거했습니다",
         "rescanning_entity": "{count, plural, one {{singularEntity}} other {{pluralEntity}}} 다시 스캔하는 중…",
         "saved_entity": "{entity}를 저장했습니다",
         "started_auto_tagging": "자동 태깅을 시작했습니다",
-        "started_generating": "생성을 시작했습니다",
+        "started_generating": "컨텐츠 생성을 시작했습니다",
         "started_importing": "불러오기를 시작했습니다",
         "updated_entity": "{entity}를 수정했습니다"
     },
@@ -1402,7 +1409,7 @@
         "required": "${path}는 필수 항목입니다",
         "unique": "${path}은(는) 유일해야 합니다",
         "blank": "${path}를 빈 칸으로 둘 수 없습니다",
-        "end_time_before_start_time": "종료 시간은 시작 시간보다 크거나 같아야 합니다"
+        "end_time_before_start_time": "종료 시간은 시작 시간 이후여야 합니다"
     },
     "videos": "비디오",
     "view_all": "모두 보기",
@@ -1488,7 +1495,7 @@
         "show_all": "모두 보여주기",
         "update": "업데이트",
         "selected_only": "선택된 것만",
-        "required_by": "{packages}로 인해 요구됨"
+        "required_by": "{packages}가 정상 동작하기 위해 설치되어야 함"
     },
     "o_count": "싼 횟수",
     "orientation": "방향",
@@ -1547,5 +1554,6 @@
         "any": "값 존재",
         "any_of": "해당 값 중 일부 포함"
     },
-    "eta": "예상 소요 시간"
+    "eta": "예상 소요 시간",
+    "scenes_duration": "영상 길이"
 }
diff --git a/ui/v2.5/src/locales/nb-NO.json b/ui/v2.5/src/locales/nb-NO.json
index a160a2991..1eff0a044 100644
--- a/ui/v2.5/src/locales/nb-NO.json
+++ b/ui/v2.5/src/locales/nb-NO.json
@@ -1415,7 +1415,6 @@
     "name": "Navn",
     "new": "Ny",
     "none": "Ingen",
-    "o_counter": "O-Teller",
     "o_history": "O Historie",
     "odate_recorded_no": "Ingen O-dato registrert",
     "operations": "Operasjoner",
diff --git a/ui/v2.5/src/locales/nl-NL.json b/ui/v2.5/src/locales/nl-NL.json
index dd9b9dc05..fea685a1e 100644
--- a/ui/v2.5/src/locales/nl-NL.json
+++ b/ui/v2.5/src/locales/nl-NL.json
@@ -150,7 +150,8 @@
         "show_results": "Resultaat tonen",
         "show_count_results": "{count} resultaten tonen",
         "play": "Afspelen",
-        "load_filter": "Laad filter"
+        "load_filter": "Laad filter",
+        "load": "Laden"
     },
     "actions_name": "Acties",
     "age": "Leeftijd",
@@ -291,7 +292,9 @@
                 "password_desc": "Wachtwoord om je verzameling te openen. Laat leeg om inloggen uit te schakelen",
                 "stash-box_integration": "Stash-boxintegratie",
                 "username": "Gebruikersnaam",
-                "username_desc": "Gebruikersnaam om je verzameling te openen. Laat leeg om inloggen uit te schakelen"
+                "username_desc": "Gebruikersnaam om je verzameling te openen. Laat leeg om inloggen uit te schakelen",
+                "log_file_max_size": "Maximale loggrootte",
+                "log_file_max_size_desc": "Maximale grootte in megabytes van het logbestand voordat het wordt gecomprimeerd. 0 MB is uitgeschakeld. Vereist herstart."
             },
             "cache_location": "Locatie van de cachemap. Vereist als je streamt via HLS (zoals op Apple apparaten) of DASH.",
             "cache_path_head": "Cache pad",
@@ -355,7 +358,7 @@
             "database": "Database",
             "ffmpeg": {
                 "download_ffmpeg": {
-                    "heading": "Download FFmpeg",
+                    "heading": "FFmpeg downloaden",
                     "description": "Downloadt FFmpeg naar de configuratiemap en wist de ffmpeg- en ffprobe-paden zodat deze uit de configuratiemap kunnen worden opgehaald."
                 },
                 "hardware_acceleration": {
@@ -536,7 +539,9 @@
             },
             "migrate_scene_screenshots": {
                 "delete_files": "Verwijder screenshotbestanden"
-            }
+            },
+            "generate_sprites_during_scan_tooltip": "De set afbeeldingen die onder de videospeler worden weergegeven voor eenvoudige navigatie.",
+            "generate_video_covers_during_scan": "Scène-covers genereren"
         },
         "tools": {
             "scene_duplicate_checker": "Scène Duplicator Checker",
@@ -593,6 +598,14 @@
                             "decimal": "Decimaal",
                             "stars": "Sterren"
                         }
+                    },
+                    "star_precision": {
+                        "options": {
+                            "full": "Vol",
+                            "half": "Half",
+                            "quarter": "Kwart",
+                            "tenth": "Tiende"
+                        }
                     }
                 }
             },
@@ -712,7 +725,8 @@
                 }
             },
             "image_wall": {
-                "margin": "Marge (pixels)"
+                "margin": "Marge (pixels)",
+                "direction": "Richting"
             }
         },
         "advanced_mode": "Geavanceerde modus"
@@ -831,7 +845,9 @@
             "transcodes": "Transcoderingen",
             "transcodes_tooltip": "MP4-conversies van niet-ondersteunde video-indelingen",
             "video_previews": "Voorbeelden",
-            "video_previews_tooltip": "Videovoorbeelden die worden afgespeeld wanneer u over een scène beweegt"
+            "video_previews_tooltip": "Videovoorbeelden die worden afgespeeld wanneer u over een scène beweegt",
+            "covers": "Scène-covers",
+            "image_thumbnails": "Afbeeldingsminiaturen"
         },
         "scenes_found": "{count} scenes gevonden",
         "scrape_entity_query": "{entity_type} Schraper Query",
@@ -844,7 +860,13 @@
             "destination": "Bestemming",
             "source": "Bron"
         },
-        "performers_found": "{count} artiesten gevonden"
+        "performers_found": "{count} artiesten gevonden",
+        "imagewall": {
+            "direction": {
+                "column": "Kolom",
+                "row": "Rij"
+            }
+        }
     },
     "dimensions": "Dimensies",
     "director": "Regisseur",
@@ -866,7 +888,11 @@
             "medium": "Medium"
         },
         "search_accuracy_label": "Zoek accuraatheid",
-        "title": "Dubbele Scènes"
+        "title": "Dubbele Scènes",
+        "duration_options": {
+            "equal": "Gelijk"
+        },
+        "select_none": "Niets selecteren"
     },
     "duplicated_phash": "Gedupliceerd (phash)",
     "duration": "Looptijd",
@@ -936,7 +962,7 @@
         "syncing": "Synchroniseren met server",
         "uploading": "Script uploaden"
     },
-    "hasMarkers": "Heeft Markeringen",
+    "hasMarkers": "Markeringen",
     "height": "Hoogte",
     "help": "Help",
     "ignore_auto_tag": "Negeer automatische tag",
@@ -977,7 +1003,6 @@
     "name": "Naam",
     "new": "Nieuw",
     "none": "Geen",
-    "o_counter": "O-Teller",
     "operations": "Operaties",
     "organized": "Georganiseerd",
     "pagination": {
@@ -1075,7 +1100,7 @@
         },
         "paths": {
             "database_filename_empty_for_default": "database bestandsnaam (leeg als standaard)",
-            "description": "Vervolgens moeten we bepalen waar we je pornocollectie kunnen vinden, waar we de stash-database en gegenereerde bestanden kunnen opslaan. Deze instellingen kunnen indien nodig later worden gewijzigd.",
+            "description": "Vervolgens moeten we bepalen waar we je collectie kunnen vinden, waar we de stash-database en gegenereerde bestanden kunnen opslaan. Deze instellingen kunnen indien nodig later worden gewijzigd.",
             "path_to_generated_directory_empty_for_default": "pad naar gegenereerde map (standaard leeg)",
             "set_up_your_paths": "Stel je paden in",
             "stash_alert": "Er zijn geen bibliotheekpaden geselecteerd. Er kan dan geen media worden gescand in Stash. Weet je zeker dat?",
@@ -1084,7 +1109,7 @@
             "where_can_stash_store_its_generated_content": "Waar kan Stash de gegenereerde inhoud opslaan?",
             "where_can_stash_store_its_generated_content_description": "Om thumbnails, previews en sprites aan te bieden, genereert Stash afbeeldingen en video's. Dit omvat ook transcodes voor niet-ondersteunde bestandsindelingen. Standaard zal Stash een <code>generated</code> directory aanmaken in de directory die uw configuratiebestand bevat. Als u wilt wijzigen waar deze gegenereerde media wordt opgeslagen, voert u een absoluut of relatief (ten opzichte van de huidige werkmap) pad in. Stash maakt deze map aan als deze nog niet bestaat.",
             "where_is_your_porn_located": "Waar staat je porno?",
-            "where_is_your_porn_located_description": "Voeg mappen toe die uw pornovideo's en afbeeldingen bevatten. Stash gebruikt deze mappen om video's en afbeeldingen te vinden tijdens het scannen."
+            "where_is_your_porn_located_description": "Voeg mappen toe die uw video's en afbeeldingen bevatten. Stash gebruikt deze mappen om video's en afbeeldingen te vinden tijdens het scannen."
         },
         "stash_setup_wizard": "Stash-installatiewizard",
         "success": {
@@ -1176,7 +1201,7 @@
         "UNCUT": "Nee"
     },
     "folder": "Folder",
-    "hasChapters": "Heeft hoofdstukken",
+    "hasChapters": "Hoofdstukken",
     "image_index": "Afbeelding #",
     "include_sub_groups": "Inclusief subgroepen",
     "index_of_total": "{index} van {total}",
@@ -1216,5 +1241,36 @@
         "refresh_tagged_studios": "Vernieuwen getagde studio's",
         "refreshing_will_update_the_data": "Vernieuwen zal de gegevens van alle getagde studio's van de stash-box bijwerken.",
         "create_or_tag_parent_studios": "Maak ontbrekende of label bestaande moederstudio's"
-    }
+    },
+    "zip_file_count": "Aantal Zipbestanden",
+    "unknown_date": "Onbekende datum",
+    "urls": "URL's",
+    "date_format": "JJJJ-MM-DD",
+    "description": "Omschrijving",
+    "distance": "Afstand",
+    "package_manager": {
+        "description": "Omschrijving",
+        "install": "Installeer",
+        "package": "Pakket",
+        "source": {
+            "name": "Naam"
+        },
+        "uninstall": "Verwijderen",
+        "unknown": "<onbekend>",
+        "update": "Updaten",
+        "version": "Versie"
+    },
+    "penis": "Penis",
+    "photographer": "Fotograaf",
+    "second": "Seconde",
+    "statistics": "Statistieken",
+    "time": "Tijd",
+    "criterion_modifier_values": {
+        "none": "Geen"
+    },
+    "custom_fields": {
+        "field": "Veld",
+        "value": "Waarde"
+    },
+    "datetime_format": "YYYY-MM-DD HH:MM"
 }
diff --git a/ui/v2.5/src/locales/nn-NO.json b/ui/v2.5/src/locales/nn-NO.json
index a55928e53..995336e58 100644
--- a/ui/v2.5/src/locales/nn-NO.json
+++ b/ui/v2.5/src/locales/nn-NO.json
@@ -208,7 +208,6 @@
         "last": "Siste"
     },
     "o_count": "Tal på O",
-    "o_counter": "O-teljar",
     "organized": "Organisert",
     "playdate_recorded_no": "Ingen avspelingsdato er registrert",
     "play_duration": "Avspelingslengd",
diff --git a/ui/v2.5/src/locales/pl-PL.json b/ui/v2.5/src/locales/pl-PL.json
index 4d830a6e7..413460800 100644
--- a/ui/v2.5/src/locales/pl-PL.json
+++ b/ui/v2.5/src/locales/pl-PL.json
@@ -1036,7 +1036,6 @@
     "name": "Nazwa",
     "new": "Dodaj",
     "none": "Brak",
-    "o_counter": "O-Licznik",
     "operations": "Operacje",
     "organized": "Uporządkowany",
     "pagination": {
diff --git a/ui/v2.5/src/locales/pt-BR.json b/ui/v2.5/src/locales/pt-BR.json
index 40ff46319..eb183b234 100644
--- a/ui/v2.5/src/locales/pt-BR.json
+++ b/ui/v2.5/src/locales/pt-BR.json
@@ -864,7 +864,6 @@
     "name": "Nome",
     "new": "Novo",
     "none": "Nenhum",
-    "o_counter": "O-contador",
     "operations": "Operações",
     "organized": "Organizado",
     "pagination": {
diff --git a/ui/v2.5/src/locales/ro-RO.json b/ui/v2.5/src/locales/ro-RO.json
index 4e2237729..1b4375207 100644
--- a/ui/v2.5/src/locales/ro-RO.json
+++ b/ui/v2.5/src/locales/ro-RO.json
@@ -394,7 +394,6 @@
     "metadata": "Metadate",
     "name": "Nume",
     "new": "Nou",
-    "o_counter": "O-Contor",
     "operations": "Operațiuni",
     "organized": "Organizat",
     "pagination": {
diff --git a/ui/v2.5/src/locales/ru-RU.json b/ui/v2.5/src/locales/ru-RU.json
index 8a3bc0473..9b1d790d2 100644
--- a/ui/v2.5/src/locales/ru-RU.json
+++ b/ui/v2.5/src/locales/ru-RU.json
@@ -149,7 +149,9 @@
             "close": "Закрыть панель"
         },
         "show_count_results": "Показать {count} результат(ов)",
-        "play": "Воспроизвести"
+        "play": "Воспроизвести",
+        "load": "Загрузить",
+        "load_filter": "Загрузить фильтр"
     },
     "actions_name": "Действия",
     "age": "Возраст",
@@ -1119,7 +1121,6 @@
     "name": "Имя",
     "new": "Новый",
     "none": "Отсутствует",
-    "o_counter": "О-Счетчик",
     "operations": "Операции",
     "organized": "Организован",
     "pagination": {
@@ -1206,7 +1207,8 @@
         "saved_filters": "Сохраненные фильтры",
         "update_filter": "Обновить фильтр",
         "edit_filter": "Изменить фильтр",
-        "more_filter_criteria": "+ещё {count}"
+        "more_filter_criteria": "+ещё {count}",
+        "search_term": "Поисковый запрос"
     },
     "seconds": "Секунды",
     "settings": "Настройки",
diff --git a/ui/v2.5/src/locales/sv-SE.json b/ui/v2.5/src/locales/sv-SE.json
index 152f137d2..71ba3e99f 100644
--- a/ui/v2.5/src/locales/sv-SE.json
+++ b/ui/v2.5/src/locales/sv-SE.json
@@ -149,7 +149,9 @@
             "close": "Stäng sidolisten",
             "open": "Öppna sidolisten"
         },
-        "show_results": "Visa resultat"
+        "show_results": "Visa resultat",
+        "load": "Ladda",
+        "load_filter": "Ladda filter"
     },
     "actions_name": "Handlingar",
     "age": "Ålder",
@@ -810,6 +812,14 @@
             "use_stash_hosted_funscript": {
                 "description": "När aktiverat kommer funscripts att skickas direkt från Stash till din Handy-enhet utan att använda tredjeparts Handy-servern. Kräver att Stash kan nås från din Handy-enhet och att en API-nyckel är genererad om stash har lösenord aktiverat.",
                 "heading": "Skicka funscripts direkt"
+            },
+            "performer_list": {
+                "heading": "Lista av stjärnor",
+                "options": {
+                    "show_links_on_grid_card": {
+                        "heading": "Visa länkar på stjärnors kort"
+                    }
+                }
             }
         },
         "advanced_mode": "Avancerat Läge"
@@ -1097,8 +1107,8 @@
         "syncing": "Synkar med server",
         "uploading": "Laddar upp skript"
     },
-    "hasChapters": "Har Kapitel",
-    "hasMarkers": "Har Markörer",
+    "hasChapters": "Kapitel",
+    "hasMarkers": "Markörer",
     "height": "Längd",
     "height_cm": "Längd (cm)",
     "help": "Hjälp",
@@ -1146,7 +1156,6 @@
     "name": "Namn",
     "new": "Ny",
     "none": "Ingen",
-    "o_counter": "O-räknare",
     "operations": "Operationer",
     "organized": "Organiserad",
     "pagination": {
@@ -1237,7 +1246,8 @@
         "name": "Filter",
         "saved_filters": "Sparade filter",
         "update_filter": "Uppdatera filter",
-        "more_filter_criteria": "+{count} fler"
+        "more_filter_criteria": "+{count} fler",
+        "search_term": "Sökterm"
     },
     "second": "Sekund",
     "seconds": "Sekunder",
@@ -1544,5 +1554,6 @@
         "login": "Inlogg",
         "invalid_credentials": "Ogiltigt användarnamn eller lösenord"
     },
-    "age_on_date": "{age} vid produktion"
+    "age_on_date": "{age} vid produktion",
+    "scenes_duration": "Scen Speltid"
 }
diff --git a/ui/v2.5/src/locales/th-TH.json b/ui/v2.5/src/locales/th-TH.json
index e8fdf0e52..9467a0832 100644
--- a/ui/v2.5/src/locales/th-TH.json
+++ b/ui/v2.5/src/locales/th-TH.json
@@ -1302,7 +1302,6 @@
     "name": "ชื่อเรื่อง",
     "new": "เพิ่ม",
     "none": "ไม่มี",
-    "o_counter": "O-Counter",
     "o_history": "ประวัติ O",
     "organized": "จัดระเบียบแล้ว",
     "disambiguation": "แก้ความกำกวม",
diff --git a/ui/v2.5/src/locales/tr-TR.json b/ui/v2.5/src/locales/tr-TR.json
index 672212dc8..d220e4f6e 100644
--- a/ui/v2.5/src/locales/tr-TR.json
+++ b/ui/v2.5/src/locales/tr-TR.json
@@ -1054,7 +1054,6 @@
     "name": "Ad",
     "new": "Yeni",
     "none": "Hiçbiri",
-    "o_counter": "O-Sayacı",
     "operations": "İşlemler",
     "organized": "Düzenlendi",
     "pagination": {
diff --git a/ui/v2.5/src/locales/uk-UA.json b/ui/v2.5/src/locales/uk-UA.json
index 3f44afca1..3ecac7c2e 100644
--- a/ui/v2.5/src/locales/uk-UA.json
+++ b/ui/v2.5/src/locales/uk-UA.json
@@ -141,7 +141,17 @@
         "copy_to_clipboard": "Копіювати до буфера обміну",
         "set_back_image": "Зворотне зображення…",
         "set_front_image": "Переднє зображення…",
-        "unset": "Скинути"
+        "unset": "Скинути",
+        "load": "Завантажити",
+        "load_filter": "Завантажити фільтр",
+        "play": "Відтворити",
+        "show_results": "Висвітити вислід",
+        "show_count_results": "Висвітити {count} висліди",
+        "sidebar": {
+            "close": "Сховати бічну панель",
+            "open": "Розгорнути бічну панель",
+            "toggle": "Перемикнути бічну панель"
+        }
     },
     "actions_name": "Дії",
     "age": "Вік",
@@ -520,7 +530,9 @@
                 "title": "Парсер Імені Файлу Сцени"
             },
             "scene_tools": "Інструменти Сцени",
-            "scene_duplicate_checker": "Перевірка сцен на дублікати"
+            "scene_duplicate_checker": "Перевірка сцен на дублікати",
+            "graphql_playground": "GraphQL ігровий майданчик",
+            "heading": "Начиння"
         },
         "ui": {
             "scene_player": {
@@ -543,7 +555,8 @@
                     "enable_chromecast": "Увімкнути Chromecast",
                     "show_scrubber": "Показати скруббер",
                     "track_activity": "Увімкнути історію відтворення сцен",
-                    "auto_start_video": "Автозапуск відео"
+                    "auto_start_video": "Автозапуск відео",
+                    "show_range_markers": "Виявити Позначки Охоплення"
                 },
                 "heading": "Плеєр сцени"
             },
@@ -697,7 +710,8 @@
                 "description": "За замовчуванням використовуються відео-прев’ю (mp4). Для меншого навантаження на CPU під час перегляду можна використовувати анімовані зображення (webp) як прев’ю. Однак їх потрібно генерувати додатково до відео-прев’ю, і вони займають більше місця на диску.",
                 "options": {
                     "animated": "Анімоване зображення",
-                    "static": "Статичне зображення"
+                    "static": "Статичне зображення",
+                    "video": "Відео"
                 },
                 "heading": "Тип попереднього перегляду"
             },
@@ -743,7 +757,15 @@
                     "toggle_sound": "Увімкнути звук"
                 }
             },
-            "title": "Користувацький інтерфейс"
+            "title": "Користувацький інтерфейс",
+            "performer_list": {
+                "heading": "Перелік виконавців",
+                "options": {
+                    "show_links_on_grid_card": {
+                        "heading": "Відображати посилання на картки виконавців"
+                    }
+                }
+            }
         },
         "plugins": {
             "hooks": "Хуки",
@@ -774,7 +796,9 @@
             "endpoint": "Кінцева точка",
             "name": "Назва",
             "graphql_endpoint": "Кінцева точка GraphQL",
-            "api_key": "API ключ"
+            "api_key": "API ключ",
+            "max_requests_per_minute": "Макс запитів у хвилину",
+            "max_requests_per_minute_description": "Викорситовує значення за замовчуванням {defaultValue} якщо встановлено в 0"
         },
         "system": {
             "transcoding": "Транскодування"
@@ -992,7 +1016,6 @@
         "generic": "Завантаження…",
         "plugins": "Завантаження плагінів…"
     },
-    "o_counter": "O-Лічильник",
     "performer_tagger": {
         "status_tagging_job_queued": "Статус: Задача проставлення міток в черзі",
         "number_of_performers_will_be_processed": "Будуть оброблені {performer_count} виконавців",
@@ -1274,7 +1297,12 @@
         "not_equals": "не є",
         "greater_than": "більше ніж",
         "includes_all": "включає все",
-        "is_null": "є null"
+        "is_null": "є null",
+        "between": "поміж",
+        "excludes": "виключення",
+        "format_string_excludes": "{criterion} {modifierString} {valueString} (за виключенням {excludedString})",
+        "format_string_excludes_depth": "{criterion} {modifierString} {valueString} (за виключенням {excludedString}) (+{глибина, множина, =-1 {all} інші {{depth}}})",
+        "includes": "включно"
     },
     "toast": {
         "rescanning_entity": "Повторне сканування {count, plural, one {{singularEntity}} other {{pluralEntity}}}…",
@@ -1321,7 +1349,8 @@
     "created_at": "Створено",
     "criterion": {
         "greater_than": "Більше ніж",
-        "less_than": "Менше ніж"
+        "less_than": "Менше ніж",
+        "value": "Значення"
     },
     "containing_group": "Група, що містить",
     "cover_image": "Обкладинка зображення",
@@ -1329,7 +1358,8 @@
     "custom_fields": {
         "title": "Користувацькі поля",
         "field": "Поле",
-        "value": "Значення"
+        "value": "Значення",
+        "criteria_format_string": "{criterion} (своє поле) {modifierString} {valueString}"
     },
     "death_date": "Дата смерті",
     "developmentVersion": "Розробницька версія",
@@ -1416,5 +1446,8 @@
     "plays": "{value} відтворень",
     "subsidiary_studios": "Дочірні студії",
     "subsidiary_studio_count": "Кількість дочірніх студій",
-    "age_on_date": "{age} років під час зйомок"
+    "age_on_date": "{age} років під час зйомок",
+    "configuration": "Обрис",
+    "country": "Країна",
+    "custom": "Свій"
 }
diff --git a/ui/v2.5/src/locales/zh-CN.json b/ui/v2.5/src/locales/zh-CN.json
index 415c17976..5e0751171 100644
--- a/ui/v2.5/src/locales/zh-CN.json
+++ b/ui/v2.5/src/locales/zh-CN.json
@@ -304,7 +304,9 @@
                 "password_desc": "登录 Stash 时所需的密码.留空表示关闭身份验证",
                 "stash-box_integration": "整合 Stash-box",
                 "username": "用户名",
-                "username_desc": "登录 Stash 时所需的用户名.留空表示关闭身份验证"
+                "username_desc": "登录 Stash 时所需的用户名.留空表示关闭身份验证",
+                "log_file_max_size": "最大日志尺寸",
+                "log_file_max_size_desc": "日志文件压缩前的最大大小（以兆字节为单位）。0MB 表示禁用此功能。需要重启。"
             },
             "backup_directory_path": {
                 "description": "备份SQLite 数据库文件的目录路径",
@@ -811,6 +813,18 @@
             "use_stash_hosted_funscript": {
                 "description": "启用后，funscript将直接从Stash提供到您的Handy设备，而无需使用第三方Handy服务器。要求可以从您的Handy设备访问Stash，并且如果stash配置了凭据，则会生成API密钥。",
                 "heading": "直接提供funscripts服务"
+            },
+            "performer_list": {
+                "heading": "演员列表",
+                "options": {
+                    "show_links_on_grid_card": {
+                        "heading": "在演员网格卡片上显示链接"
+                    }
+                }
+            },
+            "sfw_mode": {
+                "description": "如果使用 stash 存储SFW(工作场合安全)内容，请启用。它隐藏或更改了 UI 中与成人内容相关的某些方面。",
+                "heading": "SFW(工作场合安全)内容模式"
             }
         },
         "advanced_mode": "高级模式"
@@ -974,7 +988,8 @@
         "clear_o_history_confirm": "真的确定要清空高潮记录吗?",
         "clear_play_history_confirm": "真的确定要清空播放历史?",
         "set_default_filter_confirm": "你确定要设置这个过滤器为默认吗？",
-        "overwrite_filter_warning": "已保存的过滤器 \"{entityName}\" 将被覆盖。"
+        "overwrite_filter_warning": "已保存的过滤器 \"{entityName}\" 将被覆盖。",
+        "clear_o_history_confirm_sfw": "你确定要清除点赞的历史?"
     },
     "dimensions": "大小",
     "director": "导演",
@@ -1098,8 +1113,8 @@
         "syncing": "正在和服务器同步",
         "uploading": "上传脚本中"
     },
-    "hasChapters": "已有章节",
-    "hasMarkers": "含有章节标记",
+    "hasChapters": "章节",
+    "hasMarkers": "章节标记",
     "height": "身高",
     "height_cm": "高(cm)",
     "help": "说明",
@@ -1146,7 +1161,6 @@
     "name": "名称",
     "new": "新增",
     "none": "空",
-    "o_counter": "高潮次数",
     "operations": "操作",
     "organized": "是否已经整理",
     "pagination": {
@@ -1281,7 +1295,7 @@
         },
         "paths": {
             "database_filename_empty_for_default": "数据库文件名 (留空则用默认名)",
-            "description": "接下来，我们需要决定哪里找到你的收藏，哪里存放 stash 数据库和产生资料文件。如果需要，这些设定可在以后再修改。",
+            "description": "接下来，我们需要决定哪里找到你的内容，哪里存放 stash 数据库和产生资料文件。如果需要，这些设定可在以后再修改。",
             "path_to_cache_directory_empty_for_default": "缓存目录的路径（默认为空）",
             "path_to_generated_directory_empty_for_default": "生成资料的文件夹路径 (留空则使用默认路径)",
             "set_up_your_paths": "设立你的路径",
@@ -1292,14 +1306,17 @@
             "where_can_stash_store_cache_files": "Stash可以在哪里存储缓存文件？",
             "where_can_stash_store_cache_files_description": "为了使HLS/DASH实时转码等功能正常运行，Stash需要一个临时文件的缓存目录。默认情况下，Stash将在包含您的配置文件的目录中创建一个<code>cache</code>目录。如果您想更改此设置，请输入绝对或相对（与当前工作目录）路径。如果Stash不存在，它将创建此目录。",
             "where_can_stash_store_its_database": "在哪里可以储存Stash的数据库？",
-            "where_can_stash_store_its_database_description": "Stash 使用 sqlite 数据库来存放你的收藏的元数据。默认情况下，会建立<code>stash-go.sqlite</code>在包含有你配置文件的目录里。如果你想改动，请输入一个绝对，或者相对（对于当前目录）的文件名。",
+            "where_can_stash_store_its_database_description": "Stash 使用 sqlite 数据库来存放你的内容的元数据。默认情况下，会建立<code>stash-go.sqlite</code>在包含有你配置文件的目录里。如果你想改动，请输入一个绝对，或者相对（对于当前目录）的文件名。",
             "where_can_stash_store_its_database_warning": "警告：<strong>不支持</strong>将数据库存储在运行 Stash 的不同系统上（例如，在另一台计算机上运行 Stash 服务器时将数据库存储到 NAS 上）！SQLite 不适合在网络上使用，尝试这样做很容易导致整个数据库损坏。",
             "where_can_stash_store_its_generated_content": "哪里可以存放Stash产生的资料？",
             "where_can_stash_store_its_generated_content_description": "为了可以提供缩图，预览和浏览图，Stash生成图片和视频。同时也包括将不支持的文件转码后的视频。默认情况下，Stash会建立一个<code>generated</code>文件夹在含有你配置文件的目录中。如果你要修改生成媒体的地方，请输入一个绝对，或者相对(对于当前工作目录)的路径。如果此目录不存在，Stash会自动建立它。",
-            "where_is_your_porn_located": "你的收藏在哪里？",
-            "where_is_your_porn_located_description": "添加含有你收藏的视频和图片的目录。Stash会在扫描时使用这些目录去寻找视频和图片。",
+            "where_is_your_porn_located": "你的内容存放在哪里？",
+            "where_is_your_porn_located_description": "添加含有你的视频和图片的目录。Stash会在扫描时使用这些目录去寻找视频和图片。",
             "path_to_blobs_directory_empty_for_default": "blobs目录的路径（默认为空）",
-            "store_blobs_in_database": "将 blobs存储到数据库"
+            "store_blobs_in_database": "将 blobs存储到数据库",
+            "sfw_content_settings": "为了SFW(工作场合安全)内容使用stash?",
+            "sfw_content_settings_description": "stash能被用来管理SFW(工作场合安全)内容，例如摄影、艺术、漫画等。启用此选项将调整部分界面行为，使其更适合SFW内容。",
+            "use_sfw_content_mode": "使用SFW(工作场合安全)模式"
         },
         "stash_setup_wizard": "Stash 设定向导",
         "success": {
@@ -1547,5 +1564,10 @@
         "invalid_credentials": "无效的用户名或密码",
         "internal_error": "意外的内部错误。有关更多详细信息，请查看日志",
         "login": "登录"
-    }
+    },
+    "scenes_duration": "场景持续时间",
+    "last_o_at_sfw": "最近一次点赞在",
+    "o_count_sfw": "点赞",
+    "o_history_sfw": "点赞历史",
+    "odate_recorded_no_sfw": "没有已记录的点赞日期"
 }
diff --git a/ui/v2.5/src/locales/zh-TW.json b/ui/v2.5/src/locales/zh-TW.json
index 90db9e296..a3fe67cb8 100644
--- a/ui/v2.5/src/locales/zh-TW.json
+++ b/ui/v2.5/src/locales/zh-TW.json
@@ -149,7 +149,9 @@
         },
         "show_results": "顯示結果",
         "show_count_results": "顯示 {count} 筆結果",
-        "play": "播放"
+        "play": "播放",
+        "load": "載入",
+        "load_filter": "載入篩選結果"
     },
     "actions_name": "動作",
     "age": "年齡",
@@ -803,6 +805,14 @@
             "use_stash_hosted_funscript": {
                 "description": "啟用後，funscript 將直接從 Stash 傳送至您的 Handy 裝置，而無需使用第三方 Handy 伺服器。要求可從您的 Handy 裝置存取 Stash，且如果 stash 已設定憑證，則會產生 API 金鑰。",
                 "heading": "直接為 funscript 服務"
+            },
+            "performer_list": {
+                "options": {
+                    "show_links_on_grid_card": {
+                        "heading": "在表演者卡片上顯示連結"
+                    }
+                },
+                "heading": "表演者清單"
             }
         },
         "advanced_mode": "進階模式"
@@ -1073,7 +1083,7 @@
         "syncing": "與伺服器同步中",
         "uploading": "上傳腳本中"
     },
-    "hasMarkers": "含有章節標記",
+    "hasMarkers": "章節標記",
     "height": "身高",
     "height_cm": "高度 (cm)",
     "help": "說明",
@@ -1119,7 +1129,6 @@
     "name": "名稱",
     "new": "新增",
     "none": "無",
-    "o_counter": "尻尻計數",
     "operations": "動作",
     "organized": "是否已整理",
     "pagination": {
@@ -1206,7 +1215,8 @@
         "saved_filters": "已儲存的過濾條件",
         "update_filter": "更新篩選",
         "edit_filter": "編輯篩選器",
-        "more_filter_criteria": "+{count} 更多"
+        "more_filter_criteria": "+{count} 更多",
+        "search_term": "搜尋詞組"
     },
     "seconds": "秒",
     "settings": "設定",
@@ -1252,16 +1262,16 @@
         },
         "paths": {
             "database_filename_empty_for_default": "資料庫檔案名稱（留空以使用預設）",
-            "description": "接下來，我們需要確定可以在哪裡找到你的片片，在哪裡儲存資料庫及其生成檔案等等。如果需要，您稍後可以再更改這些設定。",
+            "description": "接下來，我們需要確定可以在哪裡找到你的內容，在哪裡儲存資料庫及其生成檔案等等。如果需要，您稍後可以再更改這些設定。",
             "path_to_generated_directory_empty_for_default": "生成媒體資料夾路徑（留空以使用預設）",
             "set_up_your_paths": "設定你的路徑",
             "stash_alert": "您尚未選取任何路徑，Stash 將無法掃描你的檔案。你確定要繼續嗎？",
             "where_can_stash_store_its_database": "Stash 可以在哪裡儲存資料庫？",
-            "where_can_stash_store_its_database_description": "Stash 使用 SQLite 資料庫來儲存您片片的資料。預設情況下，Stash 將在您的設定檔路徑下以 <code>stash-go.sqlite</code> 這個檔案來儲存此資料庫內容。如果您想要更改此設定，請在此輸入您所想要的絕對或相對路徑（相對於目前工作目錄）。",
+            "where_can_stash_store_its_database_description": "Stash 使用 SQLite 資料庫來儲存您內容的資料。預設情況下，Stash 將在您的設定檔路徑下以 <code>stash-go.sqlite</code> 這個檔案來儲存此資料庫內容。如果您想要更改此設定，請在此輸入您所想要的絕對或相對路徑（相對於目前工作目錄）。",
             "where_can_stash_store_its_generated_content": "Stash 可以在哪裡儲存其生成內容？",
             "where_can_stash_store_its_generated_content_description": "為提供縮圖、預覽和其他預覽資料，Stash 將自動生成圖片和影片資訊。這包括不支援的檔案格式之轉檔。預設情況下，Stash 將在包含您設定檔案的資料夾中建立一個新的 <code>generated</code> 資料夾。如果要更改此生成媒體的儲存位置，請在此輸入絕對或相對路徑（相對於目前工作目錄）。如果該資料夾不存在，Stash 將自動建立此目錄。",
-            "where_is_your_porn_located": "你的片片都藏哪？",
-            "where_is_your_porn_located_description": "在此選擇你A片及圖片的資料夾，Stash 將在掃描影片及圖片時使用這些路徑。",
+            "where_is_your_porn_located": "你的內容都藏哪？",
+            "where_is_your_porn_located_description": "在此選擇你視訊及圖片的資料夾，Stash 將在掃描影片及圖片時使用這些路徑。",
             "path_to_blobs_directory_empty_for_default": "blobs 目錄的路徑 (預設為空)",
             "path_to_cache_directory_empty_for_default": "快取目錄的路徑 (預設為空)",
             "store_blobs_in_database": "將 blobs 儲存到資料庫",
@@ -1404,7 +1414,7 @@
     "group_count": "群組計數",
     "group_scene_number": "短片編號",
     "groups": "群組",
-    "hasChapters": "擁有章節",
+    "hasChapters": "章節",
     "history": "歷史紀錄",
     "image_index": "圖片#",
     "index_of_total": "第{index}個，共 {total}個",
@@ -1544,5 +1554,6 @@
     },
     "sort_name": "分類名稱",
     "eta": "預估剩餘時間",
-    "age_on_date": "在{age}歲時製作"
+    "age_on_date": "在{age}歲時製作",
+    "scenes_duration": "場景持續時間"
 }

From d14053b570110fb560d49c934d8004185377788d Mon Sep 17 00:00:00 2001
From: Gykes <24581046+Gykes@users.noreply.github.com>
Date: Tue, 25 Nov 2025 17:06:13 -0800
Subject: [PATCH 160/405] Bugfix: Tagger Ignoing Disambiguation When Linking
 Performer (#6308)

---
 ui/v2.5/src/components/Tagger/context.tsx | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ui/v2.5/src/components/Tagger/context.tsx b/ui/v2.5/src/components/Tagger/context.tsx
index 028e83ed0..8557cc94a 100644
--- a/ui/v2.5/src/components/Tagger/context.tsx
+++ b/ui/v2.5/src/components/Tagger/context.tsx
@@ -593,7 +593,12 @@ export const TaggerContext: React.FC = ({ children }) => {
         return {
           ...r,
           performers: r.performers.map((p) => {
-            if (p.name === performer.name) {
+            // Match by remote_site_id if available, otherwise fall back to name
+            const matches = performer.remote_site_id
+              ? p.remote_site_id === performer.remote_site_id
+              : p.name === performer.name;
+
+            if (matches) {
               return {
                 ...p,
                 stored_id: performerID,

From d10995302d99bb2f40894059f91ec56688484859 Mon Sep 17 00:00:00 2001
From: Gykes <24581046+Gykes@users.noreply.github.com>
Date: Tue, 25 Nov 2025 20:38:19 -0600
Subject: [PATCH 161/405] Feature: Add trash support (#6237)

---
 graphql/schema/types/config.graphql           |  4 +
 internal/api/resolver_mutation_configure.go   |  9 ++
 internal/api/resolver_mutation_file.go        |  4 +-
 internal/api/resolver_mutation_gallery.go     |  4 +-
 internal/api/resolver_mutation_image.go       |  8 +-
 internal/api/resolver_mutation_scene.go       | 15 ++-
 internal/api/resolver_query_configuration.go  |  1 +
 internal/manager/config/config.go             | 11 +++
 internal/manager/manager_tasks.go             |  1 +
 pkg/file/clean.go                             |  7 +-
 pkg/file/delete.go                            | 97 ++++++++++++++++---
 pkg/fsutil/trash.go                           | 43 ++++++++
 pkg/image/delete.go                           |  3 +-
 pkg/scene/delete.go                           |  8 +-
 ui/v2.5/graphql/data/config.graphql           |  1 +
 .../Galleries/DeleteGalleriesDialog.tsx       |  7 +-
 .../components/Images/DeleteImagesDialog.tsx  |  7 +-
 .../components/Scenes/DeleteScenesDialog.tsx  |  7 +-
 .../Settings/SettingsSystemPanel.tsx          |  8 ++
 .../components/Shared/DeleteFilesDialog.tsx   | 11 ++-
 ui/v2.5/src/locales/en-GB.json                |  5 +
 21 files changed, 226 insertions(+), 35 deletions(-)
 create mode 100644 pkg/fsutil/trash.go

diff --git a/graphql/schema/types/config.graphql b/graphql/schema/types/config.graphql
index 6a1ac72be..732296572 100644
--- a/graphql/schema/types/config.graphql
+++ b/graphql/schema/types/config.graphql
@@ -69,6 +69,8 @@ input ConfigGeneralInput {
   databasePath: String
   "Path to backup directory"
   backupDirectoryPath: String
+  "Path to trash directory - if set, deleted files will be moved here instead of being permanently deleted"
+  deleteTrashPath: String
   "Path to generated files"
   generatedPath: String
   "Path to import/export files"
@@ -191,6 +193,8 @@ type ConfigGeneralResult {
   databasePath: String!
   "Path to backup directory"
   backupDirectoryPath: String!
+  "Path to trash directory - if set, deleted files will be moved here instead of being permanently deleted"
+  deleteTrashPath: String!
   "Path to generated files"
   generatedPath: String!
   "Path to import/export files"
diff --git a/internal/api/resolver_mutation_configure.go b/internal/api/resolver_mutation_configure.go
index 3299c01a8..d49105916 100644
--- a/internal/api/resolver_mutation_configure.go
+++ b/internal/api/resolver_mutation_configure.go
@@ -150,6 +150,15 @@ func (r *mutationResolver) ConfigureGeneral(ctx context.Context, input ConfigGen
 		c.SetString(config.BackupDirectoryPath, *input.BackupDirectoryPath)
 	}
 
+	existingDeleteTrashPath := c.GetDeleteTrashPath()
+	if input.DeleteTrashPath != nil && existingDeleteTrashPath != *input.DeleteTrashPath {
+		if err := validateDir(config.DeleteTrashPath, *input.DeleteTrashPath, true); err != nil {
+			return makeConfigGeneralResult(), err
+		}
+
+		c.SetString(config.DeleteTrashPath, *input.DeleteTrashPath)
+	}
+
 	existingGeneratedPath := c.GetGeneratedPath()
 	if input.GeneratedPath != nil && existingGeneratedPath != *input.GeneratedPath {
 		if err := validateDir(config.Generated, *input.GeneratedPath, false); err != nil {
diff --git a/internal/api/resolver_mutation_file.go b/internal/api/resolver_mutation_file.go
index c303446e1..c5e5e3530 100644
--- a/internal/api/resolver_mutation_file.go
+++ b/internal/api/resolver_mutation_file.go
@@ -149,7 +149,9 @@ func (r *mutationResolver) DeleteFiles(ctx context.Context, ids []string) (ret b
 		return false, fmt.Errorf("converting ids: %w", err)
 	}
 
-	fileDeleter := file.NewDeleter()
+	trashPath := manager.GetInstance().Config.GetDeleteTrashPath()
+
+	fileDeleter := file.NewDeleterWithTrash(trashPath)
 	destroyer := &file.ZipDestroyer{
 		FileDestroyer:   r.repository.File,
 		FolderDestroyer: r.repository.Folder,
diff --git a/internal/api/resolver_mutation_gallery.go b/internal/api/resolver_mutation_gallery.go
index 5d5cd4b37..db6862274 100644
--- a/internal/api/resolver_mutation_gallery.go
+++ b/internal/api/resolver_mutation_gallery.go
@@ -333,10 +333,12 @@ func (r *mutationResolver) GalleryDestroy(ctx context.Context, input models.Gall
 		return false, fmt.Errorf("converting ids: %w", err)
 	}
 
+	trashPath := manager.GetInstance().Config.GetDeleteTrashPath()
+
 	var galleries []*models.Gallery
 	var imgsDestroyed []*models.Image
 	fileDeleter := &image.FileDeleter{
-		Deleter: file.NewDeleter(),
+		Deleter: file.NewDeleterWithTrash(trashPath),
 		Paths:   manager.GetInstance().Paths,
 	}
 
diff --git a/internal/api/resolver_mutation_image.go b/internal/api/resolver_mutation_image.go
index 721598634..82d9be4cd 100644
--- a/internal/api/resolver_mutation_image.go
+++ b/internal/api/resolver_mutation_image.go
@@ -308,9 +308,11 @@ func (r *mutationResolver) ImageDestroy(ctx context.Context, input models.ImageD
 		return false, fmt.Errorf("converting id: %w", err)
 	}
 
+	trashPath := manager.GetInstance().Config.GetDeleteTrashPath()
+
 	var i *models.Image
 	fileDeleter := &image.FileDeleter{
-		Deleter: file.NewDeleter(),
+		Deleter: file.NewDeleterWithTrash(trashPath),
 		Paths:   manager.GetInstance().Paths,
 	}
 	if err := r.withTxn(ctx, func(ctx context.Context) error {
@@ -348,9 +350,11 @@ func (r *mutationResolver) ImagesDestroy(ctx context.Context, input models.Image
 		return false, fmt.Errorf("converting ids: %w", err)
 	}
 
+	trashPath := manager.GetInstance().Config.GetDeleteTrashPath()
+
 	var images []*models.Image
 	fileDeleter := &image.FileDeleter{
-		Deleter: file.NewDeleter(),
+		Deleter: file.NewDeleterWithTrash(trashPath),
 		Paths:   manager.GetInstance().Paths,
 	}
 	if err := r.withTxn(ctx, func(ctx context.Context) error {
diff --git a/internal/api/resolver_mutation_scene.go b/internal/api/resolver_mutation_scene.go
index b81ac0974..ae5903112 100644
--- a/internal/api/resolver_mutation_scene.go
+++ b/internal/api/resolver_mutation_scene.go
@@ -428,10 +428,11 @@ func (r *mutationResolver) SceneDestroy(ctx context.Context, input models.SceneD
 	}
 
 	fileNamingAlgo := manager.GetInstance().Config.GetVideoFileNamingAlgorithm()
+	trashPath := manager.GetInstance().Config.GetDeleteTrashPath()
 
 	var s *models.Scene
 	fileDeleter := &scene.FileDeleter{
-		Deleter:        file.NewDeleter(),
+		Deleter:        file.NewDeleterWithTrash(trashPath),
 		FileNamingAlgo: fileNamingAlgo,
 		Paths:          manager.GetInstance().Paths,
 	}
@@ -482,9 +483,10 @@ func (r *mutationResolver) ScenesDestroy(ctx context.Context, input models.Scene
 
 	var scenes []*models.Scene
 	fileNamingAlgo := manager.GetInstance().Config.GetVideoFileNamingAlgorithm()
+	trashPath := manager.GetInstance().Config.GetDeleteTrashPath()
 
 	fileDeleter := &scene.FileDeleter{
-		Deleter:        file.NewDeleter(),
+		Deleter:        file.NewDeleterWithTrash(trashPath),
 		FileNamingAlgo: fileNamingAlgo,
 		Paths:          manager.GetInstance().Paths,
 	}
@@ -593,8 +595,9 @@ func (r *mutationResolver) SceneMerge(ctx context.Context, input SceneMergeInput
 	}
 
 	mgr := manager.GetInstance()
+	trashPath := mgr.Config.GetDeleteTrashPath()
 	fileDeleter := &scene.FileDeleter{
-		Deleter:        file.NewDeleter(),
+		Deleter:        file.NewDeleterWithTrash(trashPath),
 		FileNamingAlgo: mgr.Config.GetVideoFileNamingAlgorithm(),
 		Paths:          mgr.Paths,
 	}
@@ -736,9 +739,10 @@ func (r *mutationResolver) SceneMarkerUpdate(ctx context.Context, input SceneMar
 	}
 
 	mgr := manager.GetInstance()
+	trashPath := mgr.Config.GetDeleteTrashPath()
 
 	fileDeleter := &scene.FileDeleter{
-		Deleter:        file.NewDeleter(),
+		Deleter:        file.NewDeleterWithTrash(trashPath),
 		FileNamingAlgo: mgr.Config.GetVideoFileNamingAlgorithm(),
 		Paths:          mgr.Paths,
 	}
@@ -949,9 +953,10 @@ func (r *mutationResolver) SceneMarkersDestroy(ctx context.Context, markerIDs []
 
 	var markers []*models.SceneMarker
 	fileNamingAlgo := manager.GetInstance().Config.GetVideoFileNamingAlgorithm()
+	trashPath := manager.GetInstance().Config.GetDeleteTrashPath()
 
 	fileDeleter := &scene.FileDeleter{
-		Deleter:        file.NewDeleter(),
+		Deleter:        file.NewDeleterWithTrash(trashPath),
 		FileNamingAlgo: fileNamingAlgo,
 		Paths:          manager.GetInstance().Paths,
 	}
diff --git a/internal/api/resolver_query_configuration.go b/internal/api/resolver_query_configuration.go
index 7213f8447..8a20fcad1 100644
--- a/internal/api/resolver_query_configuration.go
+++ b/internal/api/resolver_query_configuration.go
@@ -82,6 +82,7 @@ func makeConfigGeneralResult() *ConfigGeneralResult {
 		Stashes:                       config.GetStashPaths(),
 		DatabasePath:                  config.GetDatabasePath(),
 		BackupDirectoryPath:           config.GetBackupDirectoryPath(),
+		DeleteTrashPath:               config.GetDeleteTrashPath(),
 		GeneratedPath:                 config.GetGeneratedPath(),
 		MetadataPath:                  config.GetMetadataPath(),
 		ConfigFilePath:                config.GetConfigFile(),
diff --git a/internal/manager/config/config.go b/internal/manager/config/config.go
index eda863663..c7b1c1fdf 100644
--- a/internal/manager/config/config.go
+++ b/internal/manager/config/config.go
@@ -272,6 +272,9 @@ const (
 	DeleteGeneratedDefault        = "defaults.delete_generated"
 	deleteGeneratedDefaultDefault = true
 
+	// Trash/Recycle Bin options
+	DeleteTrashPath = "delete_trash_path"
+
 	// Desktop Integration Options
 	NoBrowser                           = "nobrowser"
 	NoBrowserDefault                    = false
@@ -1469,6 +1472,14 @@ func (i *Config) GetDeleteGeneratedDefault() bool {
 	return i.getBoolDefault(DeleteGeneratedDefault, deleteGeneratedDefaultDefault)
 }
 
+func (i *Config) GetDeleteTrashPath() string {
+	return i.getString(DeleteTrashPath)
+}
+
+func (i *Config) SetDeleteTrashPath(value string) {
+	i.SetString(DeleteTrashPath, value)
+}
+
 // GetDefaultIdentifySettings returns the default Identify task settings.
 // Returns nil if the settings could not be unmarshalled, or if it
 // has not been set.
diff --git a/internal/manager/manager_tasks.go b/internal/manager/manager_tasks.go
index b85a4c2cf..085c4459e 100644
--- a/internal/manager/manager_tasks.go
+++ b/internal/manager/manager_tasks.go
@@ -294,6 +294,7 @@ func (s *Manager) Clean(ctx context.Context, input CleanMetadataInput) int {
 		Handlers: []file.CleanHandler{
 			&cleanHandler{},
 		},
+		TrashPath: s.Config.GetDeleteTrashPath(),
 	}
 
 	j := cleanJob{
diff --git a/pkg/file/clean.go b/pkg/file/clean.go
index 8c54fd0e0..53b2e0612 100644
--- a/pkg/file/clean.go
+++ b/pkg/file/clean.go
@@ -18,7 +18,8 @@ type Cleaner struct {
 	FS         models.FS
 	Repository Repository
 
-	Handlers []CleanHandler
+	Handlers  []CleanHandler
+	TrashPath string
 }
 
 type cleanJob struct {
@@ -392,7 +393,7 @@ func (j *cleanJob) shouldCleanFolder(ctx context.Context, f *models.Folder) bool
 
 func (j *cleanJob) deleteFile(ctx context.Context, fileID models.FileID, fn string) {
 	// delete associated objects
-	fileDeleter := NewDeleter()
+	fileDeleter := NewDeleterWithTrash(j.TrashPath)
 	r := j.Repository
 	if err := r.WithTxn(ctx, func(ctx context.Context) error {
 		fileDeleter.RegisterHooks(ctx)
@@ -410,7 +411,7 @@ func (j *cleanJob) deleteFile(ctx context.Context, fileID models.FileID, fn stri
 
 func (j *cleanJob) deleteFolder(ctx context.Context, folderID models.FolderID, fn string) {
 	// delete associated objects
-	fileDeleter := NewDeleter()
+	fileDeleter := NewDeleterWithTrash(j.TrashPath)
 	r := j.Repository
 	if err := r.WithTxn(ctx, func(ctx context.Context) error {
 		fileDeleter.RegisterHooks(ctx)
diff --git a/pkg/file/delete.go b/pkg/file/delete.go
index 88eb5169e..c36068faa 100644
--- a/pkg/file/delete.go
+++ b/pkg/file/delete.go
@@ -58,20 +58,33 @@ func newRenamerRemoverImpl() renamerRemoverImpl {
 
 // Deleter is used to safely delete files and directories from the filesystem.
 // During a transaction, files and directories are marked for deletion using
-// the Files and Dirs methods. This will rename the files/directories to be
-// deleted. If the transaction is rolled back, then the files/directories can
-// be restored to their original state with the Abort method. If the
-// transaction is committed, the marked files are then deleted from the
-// filesystem using the Complete method.
+// the Files and Dirs methods. If TrashPath is set, files are moved to trash
+// immediately. Otherwise, they are renamed with a .delete suffix. If the
+// transaction is rolled back, then the files/directories can be restored to
+// their original state with the Rollback method. If the transaction is
+// committed, the marked files are then deleted from the filesystem using the
+// Commit method.
 type Deleter struct {
 	RenamerRemover RenamerRemover
 	files          []string
 	dirs           []string
+	TrashPath      string            // if set, files will be moved to this directory instead of being permanently deleted
+	trashedPaths   map[string]string // map of original path -> trash path (only used when TrashPath is set)
 }
 
 func NewDeleter() *Deleter {
 	return &Deleter{
 		RenamerRemover: newRenamerRemoverImpl(),
+		TrashPath:      "",
+		trashedPaths:   make(map[string]string),
+	}
+}
+
+func NewDeleterWithTrash(trashPath string) *Deleter {
+	return &Deleter{
+		RenamerRemover: newRenamerRemoverImpl(),
+		TrashPath:      trashPath,
+		trashedPaths:   make(map[string]string),
 	}
 }
 
@@ -92,6 +105,17 @@ func (d *Deleter) RegisterHooks(ctx context.Context) {
 // Abort should be called to restore marked files if this function returns an
 // error.
 func (d *Deleter) Files(paths []string) error {
+	return d.filesInternal(paths, false)
+}
+
+// FilesWithoutTrash designates files to be deleted, bypassing the trash directory.
+// Files will be permanently deleted even if TrashPath is configured.
+// This is useful for deleting generated files that can be easily recreated.
+func (d *Deleter) FilesWithoutTrash(paths []string) error {
+	return d.filesInternal(paths, true)
+}
+
+func (d *Deleter) filesInternal(paths []string, bypassTrash bool) error {
 	for _, p := range paths {
 		// fail silently if the file does not exist
 		if _, err := d.RenamerRemover.Stat(p); err != nil {
@@ -103,7 +127,7 @@ func (d *Deleter) Files(paths []string) error {
 			return fmt.Errorf("check file %q exists: %w", p, err)
 		}
 
-		if err := d.renameForDelete(p); err != nil {
+		if err := d.renameForDelete(p, bypassTrash); err != nil {
 			return fmt.Errorf("marking file %q for deletion: %w", p, err)
 		}
 		d.files = append(d.files, p)
@@ -118,6 +142,17 @@ func (d *Deleter) Files(paths []string) error {
 // Abort should be called to restore marked files/directories if this function returns an
 // error.
 func (d *Deleter) Dirs(paths []string) error {
+	return d.dirsInternal(paths, false)
+}
+
+// DirsWithoutTrash designates directories to be deleted, bypassing the trash directory.
+// Directories will be permanently deleted even if TrashPath is configured.
+// This is useful for deleting generated directories that can be easily recreated.
+func (d *Deleter) DirsWithoutTrash(paths []string) error {
+	return d.dirsInternal(paths, true)
+}
+
+func (d *Deleter) dirsInternal(paths []string, bypassTrash bool) error {
 	for _, p := range paths {
 		// fail silently if the file does not exist
 		if _, err := d.RenamerRemover.Stat(p); err != nil {
@@ -129,7 +164,7 @@ func (d *Deleter) Dirs(paths []string) error {
 			return fmt.Errorf("check directory %q exists: %w", p, err)
 		}
 
-		if err := d.renameForDelete(p); err != nil {
+		if err := d.renameForDelete(p, bypassTrash); err != nil {
 			return fmt.Errorf("marking directory %q for deletion: %w", p, err)
 		}
 		d.dirs = append(d.dirs, p)
@@ -150,33 +185,65 @@ func (d *Deleter) Rollback() {
 
 	d.files = nil
 	d.dirs = nil
+	d.trashedPaths = make(map[string]string)
 }
 
 // Commit deletes all files marked for deletion and clears the marked list.
+// When using trash, files have already been moved during renameForDelete, so
+// this just clears the tracking. Otherwise, permanently delete the .delete files.
 // Any errors encountered are logged. All files will be attempted, regardless
 // of the errors encountered.
 func (d *Deleter) Commit() {
-	for _, f := range d.files {
-		if err := d.RenamerRemover.Remove(f + deleteFileSuffix); err != nil {
-			logger.Warnf("Error deleting file %q: %v", f+deleteFileSuffix, err)
+	if d.TrashPath != "" {
+		// Files were already moved to trash during renameForDelete, just clear tracking
+		logger.Debugf("Commit: %d files and %d directories already in trash, clearing tracking", len(d.files), len(d.dirs))
+	} else {
+		// Permanently delete files and directories marked with .delete suffix
+		for _, f := range d.files {
+			if err := d.RenamerRemover.Remove(f + deleteFileSuffix); err != nil {
+				logger.Warnf("Error deleting file %q: %v", f+deleteFileSuffix, err)
+			}
 		}
-	}
 
-	for _, f := range d.dirs {
-		if err := d.RenamerRemover.RemoveAll(f + deleteFileSuffix); err != nil {
-			logger.Warnf("Error deleting directory %q: %v", f+deleteFileSuffix, err)
+		for _, f := range d.dirs {
+			if err := d.RenamerRemover.RemoveAll(f + deleteFileSuffix); err != nil {
+				logger.Warnf("Error deleting directory %q: %v", f+deleteFileSuffix, err)
+			}
 		}
 	}
 
 	d.files = nil
 	d.dirs = nil
+	d.trashedPaths = make(map[string]string)
 }
 
-func (d *Deleter) renameForDelete(path string) error {
+func (d *Deleter) renameForDelete(path string, bypassTrash bool) error {
+	if d.TrashPath != "" && !bypassTrash {
+		// Move file to trash immediately
+		trashDest, err := fsutil.MoveToTrash(path, d.TrashPath)
+		if err != nil {
+			return err
+		}
+		d.trashedPaths[path] = trashDest
+		logger.Infof("Moved %q to trash at %s", path, trashDest)
+		return nil
+	}
+
+	// Standard behavior: rename with .delete suffix (or when bypassing trash)
 	return d.RenamerRemover.Rename(path, path+deleteFileSuffix)
 }
 
 func (d *Deleter) renameForRestore(path string) error {
+	if d.TrashPath != "" {
+		// Restore file from trash
+		trashPath, ok := d.trashedPaths[path]
+		if !ok {
+			return fmt.Errorf("no trash path found for %q", path)
+		}
+		return d.RenamerRemover.Rename(trashPath, path)
+	}
+
+	// Standard behavior: restore from .delete suffix
 	return d.RenamerRemover.Rename(path+deleteFileSuffix, path)
 }
 
diff --git a/pkg/fsutil/trash.go b/pkg/fsutil/trash.go
new file mode 100644
index 000000000..9a3bed835
--- /dev/null
+++ b/pkg/fsutil/trash.go
@@ -0,0 +1,43 @@
+package fsutil
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+	"time"
+)
+
+// MoveToTrash moves a file or directory to a custom trash directory.
+// If a file with the same name already exists in the trash, a timestamp is appended.
+// Returns the destination path where the file was moved to.
+func MoveToTrash(sourcePath string, trashPath string) (string, error) {
+	// Get absolute path for the source
+	absSourcePath, err := filepath.Abs(sourcePath)
+	if err != nil {
+		return "", fmt.Errorf("failed to get absolute path: %w", err)
+	}
+
+	// Ensure trash directory exists
+	if err := os.MkdirAll(trashPath, 0755); err != nil {
+		return "", fmt.Errorf("failed to create trash directory: %w", err)
+	}
+
+	// Get the base name of the file/directory
+	baseName := filepath.Base(absSourcePath)
+	destPath := filepath.Join(trashPath, baseName)
+
+	// If a file with the same name already exists in trash, append timestamp
+	if _, err := os.Stat(destPath); err == nil {
+		ext := filepath.Ext(baseName)
+		nameWithoutExt := baseName[:len(baseName)-len(ext)]
+		timestamp := time.Now().Format("20060102-150405")
+		destPath = filepath.Join(trashPath, fmt.Sprintf("%s_%s%s", nameWithoutExt, timestamp, ext))
+	}
+
+	// Move the file to trash using SafeMove to support cross-filesystem moves
+	if err := SafeMove(absSourcePath, destPath); err != nil {
+		return "", fmt.Errorf("failed to move to trash: %w", err)
+	}
+
+	return destPath, nil
+}
diff --git a/pkg/image/delete.go b/pkg/image/delete.go
index 69fba9bd6..aa3a9c1c8 100644
--- a/pkg/image/delete.go
+++ b/pkg/image/delete.go
@@ -19,6 +19,7 @@ type FileDeleter struct {
 }
 
 // MarkGeneratedFiles marks for deletion the generated files for the provided image.
+// Generated files bypass trash and are permanently deleted since they can be regenerated.
 func (d *FileDeleter) MarkGeneratedFiles(image *models.Image) error {
 	var files []string
 	thumbPath := d.Paths.Generated.GetThumbnailPath(image.Checksum, models.DefaultGthumbWidth)
@@ -32,7 +33,7 @@ func (d *FileDeleter) MarkGeneratedFiles(image *models.Image) error {
 		files = append(files, prevPath)
 	}
 
-	return d.Files(files)
+	return d.FilesWithoutTrash(files)
 }
 
 // Destroy destroys an image, optionally marking the file and generated files for deletion.
diff --git a/pkg/scene/delete.go b/pkg/scene/delete.go
index 7426c390b..c34bbdf14 100644
--- a/pkg/scene/delete.go
+++ b/pkg/scene/delete.go
@@ -21,6 +21,7 @@ type FileDeleter struct {
 }
 
 // MarkGeneratedFiles marks for deletion the generated files for the provided scene.
+// Generated files bypass trash and are permanently deleted since they can be regenerated.
 func (d *FileDeleter) MarkGeneratedFiles(scene *models.Scene) error {
 	sceneHash := scene.GetHash(d.FileNamingAlgo)
 
@@ -32,7 +33,7 @@ func (d *FileDeleter) MarkGeneratedFiles(scene *models.Scene) error {
 
 	exists, _ := fsutil.FileExists(markersFolder)
 	if exists {
-		if err := d.Dirs([]string{markersFolder}); err != nil {
+		if err := d.DirsWithoutTrash([]string{markersFolder}); err != nil {
 			return err
 		}
 	}
@@ -75,11 +76,12 @@ func (d *FileDeleter) MarkGeneratedFiles(scene *models.Scene) error {
 		files = append(files, heatmapPath)
 	}
 
-	return d.Files(files)
+	return d.FilesWithoutTrash(files)
 }
 
 // MarkMarkerFiles deletes generated files for a scene marker with the
 // provided scene and timestamp.
+// Generated files bypass trash and are permanently deleted since they can be regenerated.
 func (d *FileDeleter) MarkMarkerFiles(scene *models.Scene, seconds int) error {
 	videoPath := d.Paths.SceneMarkers.GetVideoPreviewPath(scene.GetHash(d.FileNamingAlgo), seconds)
 	imagePath := d.Paths.SceneMarkers.GetWebpPreviewPath(scene.GetHash(d.FileNamingAlgo), seconds)
@@ -102,7 +104,7 @@ func (d *FileDeleter) MarkMarkerFiles(scene *models.Scene, seconds int) error {
 		files = append(files, screenshotPath)
 	}
 
-	return d.Files(files)
+	return d.FilesWithoutTrash(files)
 }
 
 // Destroy deletes a scene and its associated relationships from the
diff --git a/ui/v2.5/graphql/data/config.graphql b/ui/v2.5/graphql/data/config.graphql
index 192fb8053..ac3656efb 100644
--- a/ui/v2.5/graphql/data/config.graphql
+++ b/ui/v2.5/graphql/data/config.graphql
@@ -6,6 +6,7 @@ fragment ConfigGeneralData on ConfigGeneralResult {
   }
   databasePath
   backupDirectoryPath
+  deleteTrashPath
   generatedPath
   metadataPath
   scrapersPath
diff --git a/ui/v2.5/src/components/Galleries/DeleteGalleriesDialog.tsx b/ui/v2.5/src/components/Galleries/DeleteGalleriesDialog.tsx
index 0e50c16b8..35aaea797 100644
--- a/ui/v2.5/src/components/Galleries/DeleteGalleriesDialog.tsx
+++ b/ui/v2.5/src/components/Galleries/DeleteGalleriesDialog.tsx
@@ -84,6 +84,11 @@ export const DeleteGalleriesDialog: React.FC<IDeleteGalleryDialogProps> = (
       return;
     }
 
+    const deleteTrashPath = config?.general.deleteTrashPath;
+    const deleteAlertId = deleteTrashPath
+      ? "dialogs.delete_alert_to_trash"
+      : "dialogs.delete_alert";
+
     return (
       <div className="delete-dialog alert alert-danger text-break">
         <p className="font-weight-bold">
@@ -93,7 +98,7 @@ export const DeleteGalleriesDialog: React.FC<IDeleteGalleryDialogProps> = (
               singularEntity: intl.formatMessage({ id: "file" }),
               pluralEntity: intl.formatMessage({ id: "files" }),
             }}
-            id="dialogs.delete_alert"
+            id={deleteAlertId}
           />
         </p>
         <ul>
diff --git a/ui/v2.5/src/components/Images/DeleteImagesDialog.tsx b/ui/v2.5/src/components/Images/DeleteImagesDialog.tsx
index ec442a5ca..d57c60ab4 100644
--- a/ui/v2.5/src/components/Images/DeleteImagesDialog.tsx
+++ b/ui/v2.5/src/components/Images/DeleteImagesDialog.tsx
@@ -80,6 +80,11 @@ export const DeleteImagesDialog: React.FC<IDeleteImageDialogProps> = (
       deletedFiles.push(...paths);
     });
 
+    const deleteTrashPath = config?.general.deleteTrashPath;
+    const deleteAlertId = deleteTrashPath
+      ? "dialogs.delete_alert_to_trash"
+      : "dialogs.delete_alert";
+
     return (
       <div className="delete-dialog alert alert-danger text-break">
         <p className="font-weight-bold">
@@ -89,7 +94,7 @@ export const DeleteImagesDialog: React.FC<IDeleteImageDialogProps> = (
               singularEntity: intl.formatMessage({ id: "file" }),
               pluralEntity: intl.formatMessage({ id: "files" }),
             }}
-            id="dialogs.delete_alert"
+            id={deleteAlertId}
           />
         </p>
         <ul>
diff --git a/ui/v2.5/src/components/Scenes/DeleteScenesDialog.tsx b/ui/v2.5/src/components/Scenes/DeleteScenesDialog.tsx
index 3cf9b7ecf..56cbd69b0 100644
--- a/ui/v2.5/src/components/Scenes/DeleteScenesDialog.tsx
+++ b/ui/v2.5/src/components/Scenes/DeleteScenesDialog.tsx
@@ -94,6 +94,11 @@ export const DeleteScenesDialog: React.FC<IDeleteSceneDialogProps> = (
       }
     });
 
+    const deleteTrashPath = config?.general.deleteTrashPath;
+    const deleteAlertId = deleteTrashPath
+      ? "dialogs.delete_alert_to_trash"
+      : "dialogs.delete_alert";
+
     return (
       <div className="delete-dialog alert alert-danger text-break">
         <p className="font-weight-bold">
@@ -103,7 +108,7 @@ export const DeleteScenesDialog: React.FC<IDeleteSceneDialogProps> = (
               singularEntity: intl.formatMessage({ id: "file" }),
               pluralEntity: intl.formatMessage({ id: "files" }),
             }}
-            id="dialogs.delete_alert"
+            id={deleteAlertId}
           />
         </p>
         <ul>
diff --git a/ui/v2.5/src/components/Settings/SettingsSystemPanel.tsx b/ui/v2.5/src/components/Settings/SettingsSystemPanel.tsx
index 3baeca1e2..34fb634b2 100644
--- a/ui/v2.5/src/components/Settings/SettingsSystemPanel.tsx
+++ b/ui/v2.5/src/components/Settings/SettingsSystemPanel.tsx
@@ -222,6 +222,14 @@ export const SettingsConfigurationPanel: React.FC = () => {
           value={general.backupDirectoryPath ?? undefined}
           onChange={(v) => saveGeneral({ backupDirectoryPath: v })}
         />
+
+        <StringSetting
+          id="delete-trash-path"
+          headingID="config.general.delete_trash_path.heading"
+          subHeadingID="config.general.delete_trash_path.description"
+          value={general.deleteTrashPath ?? undefined}
+          onChange={(v) => saveGeneral({ deleteTrashPath: v })}
+        />
       </SettingSection>
 
       <SettingSection headingID="config.general.database">
diff --git a/ui/v2.5/src/components/Shared/DeleteFilesDialog.tsx b/ui/v2.5/src/components/Shared/DeleteFilesDialog.tsx
index e7d5af9ac..7d790539b 100644
--- a/ui/v2.5/src/components/Shared/DeleteFilesDialog.tsx
+++ b/ui/v2.5/src/components/Shared/DeleteFilesDialog.tsx
@@ -2,6 +2,7 @@ import React, { useState } from "react";
 import { mutateDeleteFiles } from "src/core/StashService";
 import { ModalComponent } from "./Modal";
 import { useToast } from "src/hooks/Toast";
+import { ConfigurationContext } from "src/hooks/Config";
 import { FormattedMessage, useIntl } from "react-intl";
 import { faTrashAlt } from "@fortawesome/free-solid-svg-icons";
 
@@ -40,6 +41,9 @@ export const DeleteFilesDialog: React.FC<IDeleteSceneDialogProps> = (
   // Network state
   const [isDeleting, setIsDeleting] = useState(false);
 
+  const context = React.useContext(ConfigurationContext);
+  const config = context?.configuration;
+
   async function onDelete() {
     setIsDeleting(true);
     try {
@@ -56,6 +60,11 @@ export const DeleteFilesDialog: React.FC<IDeleteSceneDialogProps> = (
   function renderDeleteFileAlert() {
     const deletedFiles = props.selected.map((f) => f.path);
 
+    const deleteTrashPath = config?.general.deleteTrashPath;
+    const deleteAlertId = deleteTrashPath
+      ? "dialogs.delete_alert_to_trash"
+      : "dialogs.delete_alert";
+
     return (
       <div className="delete-dialog alert alert-danger text-break">
         <p className="font-weight-bold">
@@ -65,7 +74,7 @@ export const DeleteFilesDialog: React.FC<IDeleteSceneDialogProps> = (
               singularEntity: intl.formatMessage({ id: "file" }),
               pluralEntity: intl.formatMessage({ id: "files" }),
             }}
-            id="dialogs.delete_alert"
+            id={deleteAlertId}
           />
         </p>
         <ul>
diff --git a/ui/v2.5/src/locales/en-GB.json b/ui/v2.5/src/locales/en-GB.json
index 6a230736a..28d16e486 100644
--- a/ui/v2.5/src/locales/en-GB.json
+++ b/ui/v2.5/src/locales/en-GB.json
@@ -315,6 +315,10 @@
         "description": "Directory location for SQLite database file backups",
         "heading": "Backup Directory Path"
       },
+      "delete_trash_path": {
+        "description": "Path where deleted files will be moved to instead of being permanently deleted. Leave empty to permanently delete files.",
+        "heading": "Trash Path"
+      },
       "blobs_path": {
         "description": "Where in the filesystem to store binary data. Applicable only when using the Filesystem blob storage type. WARNING: changing this requires manually moving existing data.",
         "heading": "Binary data filesystem path"
@@ -907,6 +911,7 @@
     "clear_play_history_confirm": "Are you sure you want to clear the play history?",
     "create_new_entity": "Create new {entity}",
     "delete_alert": "The following {count, plural, one {{singularEntity}} other {{pluralEntity}}} will be deleted permanently:",
+    "delete_alert_to_trash": "The following {count, plural, one {{singularEntity}} other {{pluralEntity}}} will be moved to trash:",
     "delete_confirm": "Are you sure you want to delete {entityName}?",
     "delete_entity_desc": "{count, plural, one {Are you sure you want to delete this {singularEntity}? Unless the file is also deleted, this {singularEntity} will be re-added when scan is performed.} other {Are you sure you want to delete these {pluralEntity}? Unless the files are also deleted, these {pluralEntity} will be re-added when scan is performed.}}",
     "delete_entity_simple_desc": "{count, plural, one {Are you sure you want to delete this {singularEntity}?} other {Are you sure you want to delete these {pluralEntity}?}}",

From a8bb9ae4d3b84f4dc0cd331a9be8fb14b0a993eb Mon Sep 17 00:00:00 2001
From: Gykes <24581046+Gykes@users.noreply.github.com>
Date: Tue, 25 Nov 2025 20:57:15 -0600
Subject: [PATCH 162/405] Show fingerprints when 0 scens (#6316)

---
 ui/v2.5/src/components/Scenes/SceneList.tsx          | 2 +-
 ui/v2.5/src/components/Tagger/scenes/SceneTagger.tsx | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ui/v2.5/src/components/Scenes/SceneList.tsx b/ui/v2.5/src/components/Scenes/SceneList.tsx
index 91c07d484..dc3ea76c6 100644
--- a/ui/v2.5/src/components/Scenes/SceneList.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneList.tsx
@@ -207,7 +207,7 @@ const SceneList: React.FC<{
 }> = ({ scenes, filter, selectedIds, onSelectChange, fromGroupId }) => {
   const queue = useMemo(() => SceneQueue.fromListFilterModel(filter), [filter]);
 
-  if (scenes.length === 0) {
+  if (scenes.length === 0 && filter.displayMode !== DisplayMode.Tagger) {
     return null;
   }
 
diff --git a/ui/v2.5/src/components/Tagger/scenes/SceneTagger.tsx b/ui/v2.5/src/components/Tagger/scenes/SceneTagger.tsx
index 695ed2817..34c86e57c 100755
--- a/ui/v2.5/src/components/Tagger/scenes/SceneTagger.tsx
+++ b/ui/v2.5/src/components/Tagger/scenes/SceneTagger.tsx
@@ -211,6 +211,10 @@ export const Tagger: React.FC<ITaggerProps> = ({ scenes, queue }) => {
       return;
     }
 
+    if (scenes.length === 0) {
+      return;
+    }
+
     if (loadingMulti) {
       return (
         <Button

From 0bd78f4b625f3df018ee4fcfb499f8baef2a59bd Mon Sep 17 00:00:00 2001
From: Gykes <24581046+Gykes@users.noreply.github.com>
Date: Wed, 26 Nov 2025 14:48:56 -0600
Subject: [PATCH 163/405] Bugfix: Add Trimspace to New Objects (#6226)

---
 internal/api/changeset_translator.go          | 27 +++++++++++++++----
 internal/api/resolver_mutation_gallery.go     |  7 ++---
 internal/api/resolver_mutation_group.go       |  5 ++--
 internal/api/resolver_mutation_movie.go       |  7 ++---
 internal/api/resolver_mutation_performer.go   | 13 ++++-----
 .../api/resolver_mutation_saved_filter.go     |  2 +-
 internal/api/resolver_mutation_scene.go       |  7 ++---
 internal/api/resolver_mutation_studio.go      |  9 ++++---
 internal/api/resolver_mutation_tag.go         |  5 ++--
 pkg/models/model_scraped_item.go              | 23 +++++++++-------
 .../stringslice/string_collections.go         |  8 ++++++
 11 files changed, 75 insertions(+), 38 deletions(-)

diff --git a/internal/api/changeset_translator.go b/internal/api/changeset_translator.go
index 5c81c12cb..45285bdde 100644
--- a/internal/api/changeset_translator.go
+++ b/internal/api/changeset_translator.go
@@ -98,7 +98,7 @@ func (t changesetTranslator) string(value *string) string {
 		return ""
 	}
 
-	return *value
+	return strings.TrimSpace(*value)
 }
 
 func (t changesetTranslator) optionalString(value *string, field string) models.OptionalString {
@@ -106,7 +106,12 @@ func (t changesetTranslator) optionalString(value *string, field string) models.
 		return models.OptionalString{}
 	}
 
-	return models.NewOptionalStringPtr(value)
+	if value == nil {
+		return models.NewOptionalStringPtr(nil)
+	}
+
+	trimmed := strings.TrimSpace(*value)
+	return models.NewOptionalString(trimmed)
 }
 
 func (t changesetTranslator) optionalDate(value *string, field string) (models.OptionalDate, error) {
@@ -318,8 +323,14 @@ func (t changesetTranslator) updateStrings(value []string, field string) *models
 		return nil
 	}
 
+	// Trim whitespace from each string
+	trimmedValues := make([]string, len(value))
+	for i, v := range value {
+		trimmedValues[i] = strings.TrimSpace(v)
+	}
+
 	return &models.UpdateStrings{
-		Values: value,
+		Values: trimmedValues,
 		Mode:   models.RelationshipUpdateModeSet,
 	}
 }
@@ -329,8 +340,14 @@ func (t changesetTranslator) updateStringsBulk(value *BulkUpdateStrings, field s
 		return nil
 	}
 
+	// Trim whitespace from each string
+	trimmedValues := make([]string, len(value.Values))
+	for i, v := range value.Values {
+		trimmedValues[i] = strings.TrimSpace(v)
+	}
+
 	return &models.UpdateStrings{
-		Values: value.Values,
+		Values: trimmedValues,
 		Mode:   value.Mode,
 	}
 }
@@ -448,7 +465,7 @@ func groupsDescriptionsFromGroupInput(input []*GroupDescriptionInput) ([]models.
 			GroupID: gID,
 		}
 		if v.Description != nil {
-			ret[i].Description = *v.Description
+			ret[i].Description = strings.TrimSpace(*v.Description)
 		}
 	}
 
diff --git a/internal/api/resolver_mutation_gallery.go b/internal/api/resolver_mutation_gallery.go
index db6862274..2ff9e8eb5 100644
--- a/internal/api/resolver_mutation_gallery.go
+++ b/internal/api/resolver_mutation_gallery.go
@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"os"
 	"strconv"
+	"strings"
 
 	"github.com/stashapp/stash/internal/manager"
 	"github.com/stashapp/stash/pkg/file"
@@ -43,7 +44,7 @@ func (r *mutationResolver) GalleryCreate(ctx context.Context, input GalleryCreat
 	// Populate a new gallery from the input
 	newGallery := models.NewGallery()
 
-	newGallery.Title = input.Title
+	newGallery.Title = strings.TrimSpace(input.Title)
 	newGallery.Code = translator.string(input.Code)
 	newGallery.Details = translator.string(input.Details)
 	newGallery.Photographer = translator.string(input.Photographer)
@@ -74,9 +75,9 @@ func (r *mutationResolver) GalleryCreate(ctx context.Context, input GalleryCreat
 	}
 
 	if input.Urls != nil {
-		newGallery.URLs = models.NewRelatedStrings(input.Urls)
+		newGallery.URLs = models.NewRelatedStrings(stringslice.TrimSpace(input.Urls))
 	} else if input.URL != nil {
-		newGallery.URLs = models.NewRelatedStrings([]string{*input.URL})
+		newGallery.URLs = models.NewRelatedStrings([]string{strings.TrimSpace(*input.URL)})
 	}
 
 	// Start the transaction and save the gallery
diff --git a/internal/api/resolver_mutation_group.go b/internal/api/resolver_mutation_group.go
index d75994d14..14dc817b9 100644
--- a/internal/api/resolver_mutation_group.go
+++ b/internal/api/resolver_mutation_group.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"strconv"
+	"strings"
 
 	"github.com/stashapp/stash/internal/static"
 	"github.com/stashapp/stash/pkg/group"
@@ -21,7 +22,7 @@ func groupFromGroupCreateInput(ctx context.Context, input GroupCreateInput) (*mo
 	// Populate a new group from the input
 	newGroup := models.NewGroup()
 
-	newGroup.Name = input.Name
+	newGroup.Name = strings.TrimSpace(input.Name)
 	newGroup.Aliases = translator.string(input.Aliases)
 	newGroup.Duration = input.Duration
 	newGroup.Rating = input.Rating100
@@ -55,7 +56,7 @@ func groupFromGroupCreateInput(ctx context.Context, input GroupCreateInput) (*mo
 	}
 
 	if input.Urls != nil {
-		newGroup.URLs = models.NewRelatedStrings(input.Urls)
+		newGroup.URLs = models.NewRelatedStrings(stringslice.TrimSpace(input.Urls))
 	}
 
 	return &newGroup, nil
diff --git a/internal/api/resolver_mutation_movie.go b/internal/api/resolver_mutation_movie.go
index 2e1011083..cb19e540f 100644
--- a/internal/api/resolver_mutation_movie.go
+++ b/internal/api/resolver_mutation_movie.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"strconv"
+	"strings"
 
 	"github.com/stashapp/stash/internal/static"
 	"github.com/stashapp/stash/pkg/models"
@@ -32,7 +33,7 @@ func (r *mutationResolver) MovieCreate(ctx context.Context, input MovieCreateInp
 	// Populate a new group from the input
 	newGroup := models.NewGroup()
 
-	newGroup.Name = input.Name
+	newGroup.Name = strings.TrimSpace(input.Name)
 	newGroup.Aliases = translator.string(input.Aliases)
 	newGroup.Duration = input.Duration
 	newGroup.Rating = input.Rating100
@@ -56,9 +57,9 @@ func (r *mutationResolver) MovieCreate(ctx context.Context, input MovieCreateInp
 	}
 
 	if input.Urls != nil {
-		newGroup.URLs = models.NewRelatedStrings(input.Urls)
+		newGroup.URLs = models.NewRelatedStrings(stringslice.TrimSpace(input.Urls))
 	} else if input.URL != nil {
-		newGroup.URLs = models.NewRelatedStrings([]string{*input.URL})
+		newGroup.URLs = models.NewRelatedStrings([]string{strings.TrimSpace(*input.URL)})
 	}
 
 	// Process the base 64 encoded image string
diff --git a/internal/api/resolver_mutation_performer.go b/internal/api/resolver_mutation_performer.go
index 47b02147d..15fb5056a 100644
--- a/internal/api/resolver_mutation_performer.go
+++ b/internal/api/resolver_mutation_performer.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"strconv"
+	"strings"
 
 	"github.com/stashapp/stash/pkg/models"
 	"github.com/stashapp/stash/pkg/performer"
@@ -37,9 +38,9 @@ func (r *mutationResolver) PerformerCreate(ctx context.Context, input models.Per
 	// Populate a new performer from the input
 	newPerformer := models.NewPerformer()
 
-	newPerformer.Name = input.Name
+	newPerformer.Name = strings.TrimSpace(input.Name)
 	newPerformer.Disambiguation = translator.string(input.Disambiguation)
-	newPerformer.Aliases = models.NewRelatedStrings(input.AliasList)
+	newPerformer.Aliases = models.NewRelatedStrings(stringslice.TrimSpace(input.AliasList))
 	newPerformer.Gender = input.Gender
 	newPerformer.Ethnicity = translator.string(input.Ethnicity)
 	newPerformer.Country = translator.string(input.Country)
@@ -62,17 +63,17 @@ func (r *mutationResolver) PerformerCreate(ctx context.Context, input models.Per
 
 	newPerformer.URLs = models.NewRelatedStrings([]string{})
 	if input.URL != nil {
-		newPerformer.URLs.Add(*input.URL)
+		newPerformer.URLs.Add(strings.TrimSpace(*input.URL))
 	}
 	if input.Twitter != nil {
-		newPerformer.URLs.Add(utils.URLFromHandle(*input.Twitter, twitterURL))
+		newPerformer.URLs.Add(utils.URLFromHandle(strings.TrimSpace(*input.Twitter), twitterURL))
 	}
 	if input.Instagram != nil {
-		newPerformer.URLs.Add(utils.URLFromHandle(*input.Instagram, instagramURL))
+		newPerformer.URLs.Add(utils.URLFromHandle(strings.TrimSpace(*input.Instagram), instagramURL))
 	}
 
 	if input.Urls != nil {
-		newPerformer.URLs.Add(input.Urls...)
+		newPerformer.URLs.Add(stringslice.TrimSpace(input.Urls)...)
 	}
 
 	var err error
diff --git a/internal/api/resolver_mutation_saved_filter.go b/internal/api/resolver_mutation_saved_filter.go
index e49c1214c..6e825e3d5 100644
--- a/internal/api/resolver_mutation_saved_filter.go
+++ b/internal/api/resolver_mutation_saved_filter.go
@@ -32,7 +32,7 @@ func (r *mutationResolver) SaveFilter(ctx context.Context, input SaveFilterInput
 
 		f := models.SavedFilter{
 			Mode:         input.Mode,
-			Name:         input.Name,
+			Name:         strings.TrimSpace(input.Name),
 			FindFilter:   input.FindFilter,
 			ObjectFilter: input.ObjectFilter,
 			UIOptions:    input.UIOptions,
diff --git a/internal/api/resolver_mutation_scene.go b/internal/api/resolver_mutation_scene.go
index ae5903112..c08184add 100644
--- a/internal/api/resolver_mutation_scene.go
+++ b/internal/api/resolver_mutation_scene.go
@@ -5,6 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"strconv"
+	"strings"
 	"time"
 
 	"github.com/stashapp/stash/internal/manager"
@@ -62,9 +63,9 @@ func (r *mutationResolver) SceneCreate(ctx context.Context, input models.SceneCr
 	}
 
 	if input.Urls != nil {
-		newScene.URLs = models.NewRelatedStrings(input.Urls)
+		newScene.URLs = models.NewRelatedStrings(stringslice.TrimSpace(input.Urls))
 	} else if input.URL != nil {
-		newScene.URLs = models.NewRelatedStrings([]string{*input.URL})
+		newScene.URLs = models.NewRelatedStrings([]string{strings.TrimSpace(*input.URL)})
 	}
 
 	newScene.PerformerIDs, err = translator.relatedIds(input.PerformerIds)
@@ -653,7 +654,7 @@ func (r *mutationResolver) SceneMarkerCreate(ctx context.Context, input SceneMar
 	// Populate a new scene marker from the input
 	newMarker := models.NewSceneMarker()
 
-	newMarker.Title = input.Title
+	newMarker.Title = strings.TrimSpace(input.Title)
 	newMarker.Seconds = input.Seconds
 	newMarker.PrimaryTagID = primaryTagID
 	newMarker.SceneID = sceneID
diff --git a/internal/api/resolver_mutation_studio.go b/internal/api/resolver_mutation_studio.go
index 03c13d85f..4b3316111 100644
--- a/internal/api/resolver_mutation_studio.go
+++ b/internal/api/resolver_mutation_studio.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"strconv"
+	"strings"
 
 	"github.com/stashapp/stash/pkg/models"
 	"github.com/stashapp/stash/pkg/plugin/hook"
@@ -32,23 +33,23 @@ func (r *mutationResolver) StudioCreate(ctx context.Context, input models.Studio
 	// Populate a new studio from the input
 	newStudio := models.NewStudio()
 
-	newStudio.Name = input.Name
+	newStudio.Name = strings.TrimSpace(input.Name)
 	newStudio.Rating = input.Rating100
 	newStudio.Favorite = translator.bool(input.Favorite)
 	newStudio.Details = translator.string(input.Details)
 	newStudio.IgnoreAutoTag = translator.bool(input.IgnoreAutoTag)
-	newStudio.Aliases = models.NewRelatedStrings(input.Aliases)
+	newStudio.Aliases = models.NewRelatedStrings(stringslice.TrimSpace(input.Aliases))
 	newStudio.StashIDs = models.NewRelatedStashIDs(models.StashIDInputs(input.StashIds).ToStashIDs())
 
 	var err error
 
 	newStudio.URLs = models.NewRelatedStrings([]string{})
 	if input.URL != nil {
-		newStudio.URLs.Add(*input.URL)
+		newStudio.URLs.Add(strings.TrimSpace(*input.URL))
 	}
 
 	if input.Urls != nil {
-		newStudio.URLs.Add(input.Urls...)
+		newStudio.URLs.Add(stringslice.TrimSpace(input.Urls)...)
 	}
 
 	newStudio.ParentID, err = translator.intPtrFromString(input.ParentID)
diff --git a/internal/api/resolver_mutation_tag.go b/internal/api/resolver_mutation_tag.go
index 05d756acf..f8d4943be 100644
--- a/internal/api/resolver_mutation_tag.go
+++ b/internal/api/resolver_mutation_tag.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"strconv"
+	"strings"
 
 	"github.com/stashapp/stash/pkg/logger"
 	"github.com/stashapp/stash/pkg/models"
@@ -32,9 +33,9 @@ func (r *mutationResolver) TagCreate(ctx context.Context, input TagCreateInput)
 	// Populate a new tag from the input
 	newTag := models.NewTag()
 
-	newTag.Name = input.Name
+	newTag.Name = strings.TrimSpace(input.Name)
 	newTag.SortName = translator.string(input.SortName)
-	newTag.Aliases = models.NewRelatedStrings(input.Aliases)
+	newTag.Aliases = models.NewRelatedStrings(stringslice.TrimSpace(input.Aliases))
 	newTag.Favorite = translator.bool(input.Favorite)
 	newTag.Description = translator.string(input.Description)
 	newTag.IgnoreAutoTag = translator.bool(input.IgnoreAutoTag)
diff --git a/pkg/models/model_scraped_item.go b/pkg/models/model_scraped_item.go
index 417564db5..d4e849e11 100644
--- a/pkg/models/model_scraped_item.go
+++ b/pkg/models/model_scraped_item.go
@@ -30,7 +30,7 @@ func (ScrapedStudio) IsScrapedContent() {}
 func (s *ScrapedStudio) ToStudio(endpoint string, excluded map[string]bool) *Studio {
 	// Populate a new studio from the input
 	ret := NewStudio()
-	ret.Name = s.Name
+	ret.Name = strings.TrimSpace(s.Name)
 
 	if s.RemoteSiteID != nil && endpoint != "" {
 		ret.StashIDs = NewRelatedStashIDs([]StashID{
@@ -95,37 +95,38 @@ func (s *ScrapedStudio) ToPartial(id string, endpoint string, excluded map[strin
 	currentTime := time.Now()
 
 	if s.Name != "" && !excluded["name"] {
-		ret.Name = NewOptionalString(s.Name)
+		ret.Name = NewOptionalString(strings.TrimSpace(s.Name))
 	}
 
 	if len(s.URLs) > 0 {
 		if !excluded["urls"] {
+
 			ret.URLs = &UpdateStrings{
-				Values: s.URLs,
+				Values: stringslice.TrimSpace(s.URLs),
 				Mode:   RelationshipUpdateModeSet,
 			}
 		}
 	} else {
 		urls := []string{}
 		if s.URL != nil && !excluded["url"] {
-			urls = append(urls, *s.URL)
+			urls = append(urls, strings.TrimSpace(*s.URL))
 		}
 
 		if len(urls) > 0 {
 			ret.URLs = &UpdateStrings{
-				Values: urls,
+				Values: stringslice.TrimSpace(urls),
 				Mode:   RelationshipUpdateModeSet,
 			}
 		}
 	}
 
 	if s.Details != nil && !excluded["details"] {
-		ret.Details = NewOptionalString(*s.Details)
+		ret.Details = NewOptionalString(strings.TrimSpace(*s.Details))
 	}
 
 	if s.Aliases != nil && !excluded["aliases"] {
 		ret.Aliases = &UpdateStrings{
-			Values: stringslice.FromString(*s.Aliases, ","),
+			Values: stringslice.TrimSpace(stringslice.FromString(*s.Aliases, ",")),
 			Mode:   RelationshipUpdateModeSet,
 		}
 	}
@@ -197,10 +198,14 @@ func (ScrapedPerformer) IsScrapedContent() {}
 func (p *ScrapedPerformer) ToPerformer(endpoint string, excluded map[string]bool) *Performer {
 	ret := NewPerformer()
 	currentTime := time.Now()
-	ret.Name = *p.Name
+	ret.Name = strings.TrimSpace(*p.Name)
 
 	if p.Aliases != nil && !excluded["aliases"] {
-		ret.Aliases = NewRelatedStrings(stringslice.FromString(*p.Aliases, ","))
+		aliases := stringslice.FromString(*p.Aliases, ",")
+		for i, alias := range aliases {
+			aliases[i] = strings.TrimSpace(alias)
+		}
+		ret.Aliases = NewRelatedStrings(aliases)
 	}
 	if p.Birthdate != nil && !excluded["birthdate"] {
 		date, err := ParseDate(*p.Birthdate)
diff --git a/pkg/sliceutil/stringslice/string_collections.go b/pkg/sliceutil/stringslice/string_collections.go
index f6ea1361c..f5251de5f 100644
--- a/pkg/sliceutil/stringslice/string_collections.go
+++ b/pkg/sliceutil/stringslice/string_collections.go
@@ -44,3 +44,11 @@ func UniqueFold(s []string) []string {
 	}
 	return ret
 }
+
+// TrimSpace trims whitespace from each string in a slice.
+func TrimSpace(s []string) []string {
+	for i, v := range s {
+		s[i] = strings.TrimSpace(v)
+	}
+	return s
+}

From f8115900215661e7284a51a3c23dda42a7e6b3e3 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Thu, 27 Nov 2025 14:04:06 +1100
Subject: [PATCH 164/405] Debug log stderr when thumbnail generation fails

---
 internal/manager/task_generate_image_thumbnail.go | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/internal/manager/task_generate_image_thumbnail.go b/internal/manager/task_generate_image_thumbnail.go
index 2d32e2d60..14518d2bb 100644
--- a/internal/manager/task_generate_image_thumbnail.go
+++ b/internal/manager/task_generate_image_thumbnail.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"os/exec"
 
 	"github.com/stashapp/stash/pkg/fsutil"
 	"github.com/stashapp/stash/pkg/image"
@@ -20,6 +21,13 @@ func (t *GenerateImageThumbnailTask) GetDescription() string {
 	return fmt.Sprintf("Generating Thumbnail for image %s", t.Image.Path)
 }
 
+func (t *GenerateImageThumbnailTask) logStderr(err error) {
+	var exitErr *exec.ExitError
+	if errors.As(err, &exitErr) {
+		logger.Debugf("[generator] error output: %s", exitErr.Stderr)
+	}
+}
+
 func (t *GenerateImageThumbnailTask) Start(ctx context.Context) {
 	if !t.required() {
 		return
@@ -46,14 +54,15 @@ func (t *GenerateImageThumbnailTask) Start(ctx context.Context) {
 	if err != nil {
 		// don't log for animated images
 		if !errors.Is(err, image.ErrNotSupportedForThumbnail) {
-			logger.Errorf("[generator] getting thumbnail for image %s: %w", path, err)
+			logger.Errorf("[generator] getting thumbnail for image %s: %s", path, err.Error())
+			t.logStderr(err)
 		}
 		return
 	}
 
 	err = fsutil.WriteFile(thumbPath, data)
 	if err != nil {
-		logger.Errorf("[generator] writing thumbnail for image %s: %w", path, err)
+		logger.Errorf("[generator] writing thumbnail for image %s: %s", path, err.Error())
 		return
 	}
 }

From 4ef3a605dd0d0355236f2dc1bc96d2b04b7cb0c4 Mon Sep 17 00:00:00 2001
From: Gykes <24581046+Gykes@users.noreply.github.com>
Date: Wed, 26 Nov 2025 21:57:57 -0600
Subject: [PATCH 165/405] Bugfix: Update Markers to % Base Calc (#6323)

* update to % base calc
* add min-width
---
 ui/v2.5/src/components/ScenePlayer/markers.ts | 25 +++++++++++--------
 .../src/components/ScenePlayer/styles.scss    |  1 +
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/ui/v2.5/src/components/ScenePlayer/markers.ts b/ui/v2.5/src/components/ScenePlayer/markers.ts
index 6215f7f47..55e0c7cd2 100644
--- a/ui/v2.5/src/components/ScenePlayer/markers.ts
+++ b/ui/v2.5/src/components/ScenePlayer/markers.ts
@@ -142,18 +142,23 @@ class MarkersPlugin extends videojs.getPlugin("plugin") {
     const rangeDiv = videojs.dom.createEl("div") as HTMLDivElement;
     rangeDiv.className = "vjs-marker-range";
 
-    // start/end percent is relative to the parent element, which is the vjs-progress-control
-    // vjs-progress-control has 15px margins on each side
-    const left = seekBar.clientWidth * (marker.seconds / duration) + 15;
+    // Use percentage-based positioning for proper scaling in fullscreen mode
+    // The range marker is inside vjs-progress-control, but needs to align with
+    // vjs-progress-holder which has 15px margins on each side.
+    // We use calc() to combine percentage positioning with the fixed margin offset.
+    const startPercent = (marker.seconds / duration) * 100;
+    const widthPercent =
+      ((marker.end_seconds - marker.seconds) / duration) * 100;
 
-    // minimum width of 8px
-    const width = Math.max(
-      seekBar.clientWidth * ((marker.end_seconds - marker.seconds) / duration),
-      8
-    );
+    // left: 15px margin + percentage of the progress holder width
+    // Since progress-holder has margin: 0 15px, we need calc(15px + X% of remaining width)
+    // The progress-holder width is (100% - 30px), so the actual left position is:
+    // 15px + startPercent% * (100% - 30px) = 15px + startPercent% * 100% - startPercent% * 30px
+    rangeDiv.style.left = `calc(15px + ${startPercent}% - ${
+      startPercent * 0.3
+    }px)`;
 
-    rangeDiv.style.left = `${left}px`;
-    rangeDiv.style.width = `${width}px`;
+    rangeDiv.style.width = `calc(${widthPercent}% - ${widthPercent * 0.3}px)`;
     rangeDiv.style.bottom = `${layer * this.layerHeight}px`; // Adjust height based on layer
     rangeDiv.style.display = "none"; // Initially hidden
 
diff --git a/ui/v2.5/src/components/ScenePlayer/styles.scss b/ui/v2.5/src/components/ScenePlayer/styles.scss
index 95b1df8c7..0e8041071 100644
--- a/ui/v2.5/src/components/ScenePlayer/styles.scss
+++ b/ui/v2.5/src/components/ScenePlayer/styles.scss
@@ -271,6 +271,7 @@ $sceneTabWidth: 450px;
     border-radius: 2px;
     box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
     height: 8px;
+    min-width: 8px;
     position: absolute;
     transform: translateY(-28px);
     transition: none;

From 90d1b2df2da2d818606573be1e0031b01d2e4af8 Mon Sep 17 00:00:00 2001
From: Gykes <24581046+Gykes@users.noreply.github.com>
Date: Thu, 27 Nov 2025 14:19:32 -0600
Subject: [PATCH 166/405] Feature: AVIF support (#6288)

---
 internal/api/images.go               |  1 +
 internal/dlna/cms.go                 |  2 +-
 internal/manager/config/config.go    |  2 +-
 pkg/file/image/scan.go               |  7 +++++
 pkg/image/thumbnail.go               | 40 +++++++++++++++++++++-------
 ui/v2.5/src/docs/en/Manual/Images.md |  2 ++
 6 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/internal/api/images.go b/internal/api/images.go
index 9e16fc0df..e0f11416a 100644
--- a/internal/api/images.go
+++ b/internal/api/images.go
@@ -26,6 +26,7 @@ var imageBoxExts = []string{
 	".gif",
 	".svg",
 	".webp",
+	".avif",
 }
 
 func newImageBox(box fs.FS) (*imageBox, error) {
diff --git a/internal/dlna/cms.go b/internal/dlna/cms.go
index e4a560462..daf43b382 100644
--- a/internal/dlna/cms.go
+++ b/internal/dlna/cms.go
@@ -27,7 +27,7 @@ import (
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-const defaultProtocolInfo = "http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*"
+const defaultProtocolInfo = "http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*,http-get:*:image/avif:*"
 
 type connectionManagerService struct {
 	*Server
diff --git a/internal/manager/config/config.go b/internal/manager/config/config.go
index c7b1c1fdf..3b3b2c054 100644
--- a/internal/manager/config/config.go
+++ b/internal/manager/config/config.go
@@ -293,7 +293,7 @@ const (
 // slice default values
 var (
 	defaultVideoExtensions   = []string{"m4v", "mp4", "mov", "wmv", "avi", "mpg", "mpeg", "rmvb", "rm", "flv", "asf", "mkv", "webm", "f4v"}
-	defaultImageExtensions   = []string{"png", "jpg", "jpeg", "gif", "webp"}
+	defaultImageExtensions   = []string{"png", "jpg", "jpeg", "gif", "webp", "avif"}
 	defaultGalleryExtensions = []string{"zip", "cbz"}
 	defaultMenuItems         = []string{"scenes", "images", "groups", "markers", "galleries", "performers", "studios", "tags"}
 )
diff --git a/pkg/file/image/scan.go b/pkg/file/image/scan.go
index 635f421e4..1e09ce023 100644
--- a/pkg/file/image/scan.go
+++ b/pkg/file/image/scan.go
@@ -4,6 +4,8 @@ import (
 	"context"
 	"fmt"
 	"image"
+	"path/filepath"
+	"strings"
 
 	_ "image/gif"
 	_ "image/jpeg"
@@ -28,6 +30,11 @@ func (d *Decorator) Decorate(ctx context.Context, fs models.FS, f models.File) (
 	// ignore clips in non-OsFS filesystems as ffprobe cannot read them
 	// TODO - copy to temp file if not an OsFS
 	if _, isOs := fs.(*file.OsFS); !isOs {
+		// AVIF images inside zip files are not supported
+		if strings.ToLower(filepath.Ext(base.Path)) == ".avif" {
+			logger.Warnf("Skipping AVIF image in zip file: %s", base.Path)
+			return f, nil
+		}
 		logger.Debugf("assuming ImageFile for non-OsFS file %q", base.Path)
 		return decorateFallback(fs, f)
 	}
diff --git a/pkg/image/thumbnail.go b/pkg/image/thumbnail.go
index c65cfc77e..e63ada41b 100644
--- a/pkg/image/thumbnail.go
+++ b/pkg/image/thumbnail.go
@@ -22,12 +22,8 @@ const ffmpegImageQuality = 5
 var vipsPath string
 var once sync.Once
 
-var (
-	ErrUnsupportedImageFormat = errors.New("unsupported image format")
-
-	// ErrNotSupportedForThumbnail is returned if the image format is not supported for thumbnail generation
-	ErrNotSupportedForThumbnail = errors.New("unsupported image format for thumbnail")
-)
+// ErrNotSupportedForThumbnail is returned if the image format is not supported for thumbnail generation
+var ErrNotSupportedForThumbnail = errors.New("unsupported image format for thumbnail")
 
 type ThumbnailEncoder struct {
 	FFMpeg             *ffmpeg.FFMpeg
@@ -83,8 +79,9 @@ func (e *ThumbnailEncoder) GetThumbnail(f models.File, maxSize int) ([]byte, err
 
 	data := buf.Bytes()
 
+	format := ""
 	if imageFile, ok := f.(*models.ImageFile); ok {
-		format := imageFile.Format
+		format = imageFile.Format
 		animated := imageFile.Format == formatGif
 
 		// #2266 - if image is webp, then determine if it is animated
@@ -96,6 +93,15 @@ func (e *ThumbnailEncoder) GetThumbnail(f models.File, maxSize int) ([]byte, err
 		if animated {
 			return nil, fmt.Errorf("%w: %s", ErrNotSupportedForThumbnail, format)
 		}
+
+		// AVIF cannot be read from stdin, must use file path
+		// AVIF in zip files is not supported
+		if format == "avif" {
+			if f.Base().ZipFileID != nil {
+				return nil, fmt.Errorf("%w: AVIF in zip file", ErrNotSupportedForThumbnail)
+			}
+			return e.ffmpegImageThumbnailPath(f.Base().Path, maxSize)
+		}
 	}
 
 	// Videofiles can only be thumbnailed with ffmpeg
@@ -130,16 +136,32 @@ func (e *ThumbnailEncoder) GetPreview(inPath string, outPath string, maxSize int
 }
 
 func (e *ThumbnailEncoder) ffmpegImageThumbnail(image *bytes.Buffer, maxSize int) ([]byte, error) {
-	args := transcoder.ImageThumbnail("-", transcoder.ImageThumbnailOptions{
+	options := transcoder.ImageThumbnailOptions{
 		OutputFormat:  ffmpeg.ImageFormatJpeg,
 		OutputPath:    "-",
 		MaxDimensions: maxSize,
 		Quality:       ffmpegImageQuality,
-	})
+	}
+
+	args := transcoder.ImageThumbnail("-", options)
 
 	return e.FFMpeg.GenerateOutput(context.TODO(), args, image)
 }
 
+// ffmpegImageThumbnailPath generates a thumbnail from a file path (used for AVIF which can't be piped)
+func (e *ThumbnailEncoder) ffmpegImageThumbnailPath(inputPath string, maxSize int) ([]byte, error) {
+	options := transcoder.ImageThumbnailOptions{
+		OutputFormat:  ffmpeg.ImageFormatJpeg,
+		OutputPath:    "-",
+		MaxDimensions: maxSize,
+		Quality:       ffmpegImageQuality,
+	}
+
+	args := transcoder.ImageThumbnail(inputPath, options)
+
+	return e.FFMpeg.GenerateOutput(context.TODO(), args, nil)
+}
+
 func (e *ThumbnailEncoder) getClipPreview(inPath string, outPath string, maxSize int, clipDuration float64, frameRate float64) error {
 	var thumbFilter ffmpeg.VideoFilter
 	thumbFilter = thumbFilter.ScaleMaxSize(maxSize)
diff --git a/ui/v2.5/src/docs/en/Manual/Images.md b/ui/v2.5/src/docs/en/Manual/Images.md
index e5733fc2e..ede9b3457 100644
--- a/ui/v2.5/src/docs/en/Manual/Images.md
+++ b/ui/v2.5/src/docs/en/Manual/Images.md
@@ -11,6 +11,8 @@ You can add images to every gallery manually in the gallery detail page. Deletin
 
 For best results, images in zip file should be stored without compression (copy, store or no compression options depending on the software you use. Eg on linux: `zip -0 -r gallery.zip foldertozip/`). This impacts **heavily** on the zip read performance.
 
+> **:warning: Note:** AVIF files in ZIP archives are currently unsupported.
+
 If a filename of an image in the gallery zip file ends with `cover.jpg`, it will be treated like a cover and presented first in the gallery view page and as a gallery cover in the gallery list view. If more than one images match the name the first one found in natural sort order is selected.
 
 You can also manually select any image from a gallery as its cover. On the gallery details page, select the desired cover image, and then select **Set as Cover** in the ⋯ menu.

From e0c1d4c51dba0c136838addc2ddf196f545a7e84 Mon Sep 17 00:00:00 2001
From: Gykes <24581046+Gykes@users.noreply.github.com>
Date: Thu, 27 Nov 2025 14:32:29 -0600
Subject: [PATCH 167/405] Manually Search Stash ID - Edit Page (#6284)

---
 .../PerformerDetails/PerformerEditPanel.tsx   |  54 ++-
 .../Shared/StashBoxIDSearchModal.tsx          | 315 ++++++++++++++++++
 ui/v2.5/src/components/Shared/styles.scss     |  41 +++
 ui/v2.5/src/core/StashService.ts              |  16 +
 ui/v2.5/src/locales/en-GB.json                |   8 +
 ui/v2.5/src/utils/form.tsx                    |  51 +--
 6 files changed, 459 insertions(+), 26 deletions(-)
 create mode 100644 ui/v2.5/src/components/Shared/StashBoxIDSearchModal.tsx

diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
index 597cbad1c..55bd20910 100644
--- a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
@@ -34,8 +34,9 @@ import { useConfigurationContext } from "src/hooks/Config";
 import { PerformerScrapeDialog } from "./PerformerScrapeDialog";
 import PerformerScrapeModal from "./PerformerScrapeModal";
 import PerformerStashBoxModal, { IStashBox } from "./PerformerStashBoxModal";
+import StashBoxIDSearchModal from "src/components/Shared/StashBoxIDSearchModal";
 import cx from "classnames";
-import { faSyncAlt } from "@fortawesome/free-solid-svg-icons";
+import { faSyncAlt, faPlus } from "@fortawesome/free-solid-svg-icons";
 import isEqual from "lodash-es/isEqual";
 import { formikUtils } from "src/utils/form";
 import {
@@ -88,6 +89,8 @@ export const PerformerEditPanel: React.FC<IPerformerDetails> = ({
   // Editing state
   const [scraper, setScraper] = useState<GQL.Scraper | IStashBox>();
   const [isScraperModalOpen, setIsScraperModalOpen] = useState<boolean>(false);
+  const [isStashIDSearchOpen, setIsStashIDSearchOpen] =
+    useState<boolean>(false);
 
   // Network state
   const [isLoading, setIsLoading] = useState(false);
@@ -569,6 +572,27 @@ export const PerformerEditPanel: React.FC<IPerformerDetails> = ({
     setScraper(undefined);
   }
 
+  function onStashIDSelected(item?: GQL.StashIdInput) {
+    if (!item) return;
+
+    // Check if StashID with this endpoint already exists
+    const existingIndex = formik.values.stash_ids.findIndex(
+      (s) => s.endpoint === item.endpoint
+    );
+
+    let newStashIDs;
+    if (existingIndex >= 0) {
+      // Replace existing StashID
+      newStashIDs = [...formik.values.stash_ids];
+      newStashIDs[existingIndex] = item;
+    } else {
+      // Add new StashID
+      newStashIDs = [...formik.values.stash_ids, item];
+    }
+
+    formik.setFieldValue("stash_ids", newStashIDs);
+  }
+
   function renderButtons(classNames: string) {
     return (
       <div className={cx("details-edit", "col-xl-9", classNames)}>
@@ -659,6 +683,18 @@ export const PerformerEditPanel: React.FC<IPerformerDetails> = ({
     <>
       {renderScrapeModal()}
       {maybeRenderScrapeDialog()}
+      {isStashIDSearchOpen && (
+        <StashBoxIDSearchModal
+          stashBoxes={stashConfig?.general.stashBoxes ?? []}
+          excludedStashBoxEndpoints={formik.values.stash_ids.map(
+            (s) => s.endpoint
+          )}
+          onSelectItem={(item) => {
+            onStashIDSelected(item);
+            setIsStashIDSearchOpen(false);
+          }}
+        />
+      )}
 
       <Prompt
         when={formik.dirty}
@@ -701,7 +737,21 @@ export const PerformerEditPanel: React.FC<IPerformerDetails> = ({
         {renderInputField("details", "textarea")}
         {renderTagsField()}
 
-        {renderStashIDsField("stash_ids", "performers")}
+        {renderStashIDsField(
+          "stash_ids",
+          "performers",
+          "stash_ids",
+          undefined,
+          <Button
+            variant="success"
+            className="mr-2 py-0"
+            onClick={() => setIsStashIDSearchOpen(true)}
+            disabled={!stashConfig?.general.stashBoxes?.length}
+            title={intl.formatMessage({ id: "actions.add_stash_id" })}
+          >
+            <Icon icon={faPlus} />
+          </Button>
+        )}
 
         <hr />
 
diff --git a/ui/v2.5/src/components/Shared/StashBoxIDSearchModal.tsx b/ui/v2.5/src/components/Shared/StashBoxIDSearchModal.tsx
new file mode 100644
index 000000000..0b11a6d25
--- /dev/null
+++ b/ui/v2.5/src/components/Shared/StashBoxIDSearchModal.tsx
@@ -0,0 +1,315 @@
+import React, { useCallback, useEffect, useRef, useState } from "react";
+import { Form, Button, Row, Col, Badge, InputGroup } from "react-bootstrap";
+import { FormattedMessage, useIntl } from "react-intl";
+import { faSearch } from "@fortawesome/free-solid-svg-icons";
+import * as GQL from "src/core/generated-graphql";
+import { ModalComponent } from "src/components/Shared/Modal";
+import { LoadingIndicator } from "src/components/Shared/LoadingIndicator";
+import { stashboxDisplayName } from "src/utils/stashbox";
+import { TruncatedText } from "src/components/Shared/TruncatedText";
+import TextUtils from "src/utils/text";
+import GenderIcon from "src/components/Performers/GenderIcon";
+import { CountryFlag } from "src/components/Shared/CountryFlag";
+import { Icon } from "src/components/Shared/Icon";
+import { stashBoxPerformerQuery } from "src/core/StashService";
+import { useToast } from "src/hooks/Toast";
+import { stringToGender } from "src/utils/gender";
+
+interface IProps {
+  stashBoxes: GQL.StashBox[];
+  excludedStashBoxEndpoints?: string[];
+  onSelectItem: (item?: GQL.StashIdInput) => void;
+}
+
+const CLASSNAME = "StashBoxIDSearchModal";
+const CLASSNAME_LIST = `${CLASSNAME}-list`;
+const CLASSNAME_LIST_CONTAINER = `${CLASSNAME_LIST}-container`;
+
+interface IHasRemoteSiteID {
+  remote_site_id?: string | null;
+}
+
+// Shared component for rendering images
+const SearchResultImage: React.FC<{ imageUrl?: string | null }> = ({
+  imageUrl,
+}) => {
+  if (!imageUrl) return null;
+
+  return (
+    <div className="scene-image-container">
+      <img src={imageUrl} alt="" className="align-self-center scene-image" />
+    </div>
+  );
+};
+
+// Shared component for rendering tags
+const SearchResultTags: React.FC<{
+  tags?: GQL.ScrapedTag[] | null;
+}> = ({ tags }) => {
+  if (!tags || tags.length === 0) return null;
+
+  return (
+    <Row>
+      <Col>
+        {tags.map((tag) => (
+          <Badge className="tag-item" variant="secondary" key={tag.stored_id}>
+            {tag.name}
+          </Badge>
+        ))}
+      </Col>
+    </Row>
+  );
+};
+
+// Performer Result Component
+interface IPerformerResultProps {
+  performer: GQL.ScrapedPerformerDataFragment;
+}
+
+const PerformerSearchResultDetails: React.FC<IPerformerResultProps> = ({
+  performer,
+}) => {
+  const age = performer?.birthdate
+    ? TextUtils.age(performer.birthdate, performer.death_date)
+    : undefined;
+
+  return (
+    <div className="performer-result">
+      <Row>
+        <SearchResultImage imageUrl={performer.images?.[0]} />
+        <div className="col flex-column">
+          <h4 className="performer-name">
+            <span>{performer.name}</span>
+            {performer.disambiguation && (
+              <span className="performer-disambiguation">
+                {` (${performer.disambiguation})`}
+              </span>
+            )}
+          </h4>
+          <h5 className="performer-details">
+            {performer.gender && (
+              <span>
+                <GenderIcon
+                  className="gender-icon"
+                  gender={stringToGender(performer.gender, true)}
+                />
+              </span>
+            )}
+            {age && (
+              <span>
+                {`${age} `}
+                <FormattedMessage id="years_old" />
+              </span>
+            )}
+          </h5>
+          {performer.country && (
+            <span>
+              <CountryFlag
+                className="performer-result__country-flag"
+                country={performer.country}
+              />
+            </span>
+          )}
+        </div>
+      </Row>
+      <Row>
+        <Col>
+          <TruncatedText text={performer.details ?? ""} lineCount={3} />
+        </Col>
+      </Row>
+      <SearchResultTags tags={performer.tags} />
+    </div>
+  );
+};
+
+export const PerformerSearchResult: React.FC<IPerformerResultProps> = ({
+  performer,
+}) => {
+  return (
+    <div className="mt-3 search-item" style={{ cursor: "pointer" }}>
+      <PerformerSearchResultDetails performer={performer} />
+    </div>
+  );
+};
+
+// Main Modal Component
+export const StashBoxIDSearchModal: React.FC<IProps> = ({
+  stashBoxes,
+  excludedStashBoxEndpoints = [],
+  onSelectItem,
+}) => {
+  const intl = useIntl();
+  const Toast = useToast();
+  const inputRef = useRef<HTMLInputElement>(null);
+
+  const [selectedStashBox, setSelectedStashBox] = useState<GQL.StashBox | null>(
+    null
+  );
+  const [query, setQuery] = useState<string>("");
+  const [results, setResults] = useState<
+    GQL.ScrapedPerformerDataFragment[] | undefined
+  >(undefined);
+  const [loading, setLoading] = useState(false);
+
+  useEffect(() => {
+    if (stashBoxes.length > 0) {
+      setSelectedStashBox(stashBoxes[0]);
+    }
+  }, [stashBoxes]);
+
+  useEffect(() => inputRef.current?.focus(), []);
+
+  const doSearch = useCallback(async () => {
+    if (!selectedStashBox || !query) {
+      return;
+    }
+
+    setLoading(true);
+    setResults([]);
+
+    try {
+      const queryData = await stashBoxPerformerQuery(
+        query,
+        selectedStashBox.endpoint
+      );
+      setResults(queryData.data?.scrapeSinglePerformer ?? []);
+    } catch (error) {
+      Toast.error(error);
+    } finally {
+      setLoading(false);
+    }
+  }, [query, selectedStashBox, Toast]);
+
+  function handleItemClick(item: IHasRemoteSiteID) {
+    if (selectedStashBox && item.remote_site_id) {
+      onSelectItem({
+        endpoint: selectedStashBox.endpoint,
+        stash_id: item.remote_site_id,
+      });
+    } else {
+      onSelectItem(undefined);
+    }
+  }
+
+  function handleClose() {
+    onSelectItem(undefined);
+  }
+
+  function renderResults() {
+    if (!results || results.length === 0) {
+      return null;
+    }
+
+    return (
+      <div className={CLASSNAME_LIST_CONTAINER}>
+        <div className="mt-1 mb-2">
+          <FormattedMessage
+            id="dialogs.performers_found"
+            values={{ count: results.length }}
+          />
+        </div>
+        <ul className={CLASSNAME_LIST} style={{ listStyleType: "none" }}>
+          {results.map((item, i) => (
+            <li key={i} onClick={() => handleItemClick(item)}>
+              <PerformerSearchResult performer={item} />
+            </li>
+          ))}
+        </ul>
+      </div>
+    );
+  }
+
+  return (
+    <ModalComponent
+      show
+      onHide={handleClose}
+      header={intl.formatMessage(
+        { id: "stashbox_search.header" },
+        { entityType: "Performer" }
+      )}
+      accept={{
+        text: intl.formatMessage({ id: "actions.cancel" }),
+        onClick: handleClose,
+        variant: "secondary",
+      }}
+    >
+      <div className={CLASSNAME}>
+        <Form.Group className="d-flex align-items-center mb-3">
+          <Form.Label className="mb-0 mr-2" style={{ flexShrink: 0 }}>
+            <FormattedMessage id="stashbox.source" />
+          </Form.Label>
+          <Form.Control
+            as="select"
+            className="input-control"
+            style={{ flex: "0 1 auto" }}
+            value={selectedStashBox?.endpoint ?? ""}
+            onChange={(e) => {
+              const box = stashBoxes.find(
+                (b) => b.endpoint === e.currentTarget.value
+              );
+              if (box) {
+                setSelectedStashBox(box);
+              }
+            }}
+          >
+            {stashBoxes.map((box, index) => (
+              <option key={box.endpoint} value={box.endpoint}>
+                {stashboxDisplayName(box.name, index)}
+              </option>
+            ))}
+          </Form.Control>
+        </Form.Group>
+
+        {selectedStashBox &&
+          excludedStashBoxEndpoints.includes(selectedStashBox.endpoint) && (
+            <span className="saved-filter-overwrite-warning mb-3 d-block">
+              <FormattedMessage id="dialogs.stashid_exists_warning" />
+            </span>
+          )}
+
+        <InputGroup>
+          <Form.Control
+            onChange={(e) => setQuery(e.currentTarget.value)}
+            value={query}
+            placeholder={intl.formatMessage(
+              { id: "stashbox_search.placeholder_name_or_id" },
+              { entityType: "Performer" }
+            )}
+            className="text-input"
+            ref={inputRef}
+            onKeyPress={(e: React.KeyboardEvent<HTMLInputElement>) =>
+              e.key === "Enter" && doSearch()
+            }
+          />
+          <InputGroup.Append>
+            <Button
+              onClick={doSearch}
+              variant="primary"
+              disabled={!selectedStashBox}
+              title={intl.formatMessage({ id: "actions.search" })}
+            >
+              <Icon icon={faSearch} />
+            </Button>
+          </InputGroup.Append>
+        </InputGroup>
+
+        {loading ? (
+          <div className="m-4 text-center">
+            <LoadingIndicator inline />
+          </div>
+        ) : results && results.length > 0 ? (
+          renderResults()
+        ) : (
+          results !== undefined &&
+          results.length === 0 && (
+            <h5 className="text-center mt-4">
+              <FormattedMessage id="stashbox_search.no_results" />
+            </h5>
+          )
+        )}
+      </div>
+    </ModalComponent>
+  );
+};
+
+export default StashBoxIDSearchModal;
diff --git a/ui/v2.5/src/components/Shared/styles.scss b/ui/v2.5/src/components/Shared/styles.scss
index 2da24774b..9985138e0 100644
--- a/ui/v2.5/src/components/Shared/styles.scss
+++ b/ui/v2.5/src/components/Shared/styles.scss
@@ -1046,3 +1046,44 @@ input[type="range"].double-range-slider-max {
     background: transparent;
   }
 }
+
+// Label offset for buttons that need to align with form fields
+.ml-label {
+  @include media-breakpoint-up(sm) {
+    // sm: label is 3 of 12 columns = 25%, plus partial gutter
+    margin-left: calc(25% + 7.5px);
+  }
+  @include media-breakpoint-up(xl) {
+    // xl: label is 2 of 12 columns = 16.667%, plus partial gutter
+    margin-left: calc(16.667% + 7.5px);
+  }
+}
+
+// StashBox Search Modal
+.StashBoxSearchModal {
+  &-list {
+    list-style: none;
+    padding: 0;
+
+    li {
+      border-radius: 0.25rem;
+      cursor: pointer;
+      margin-bottom: 0.5rem;
+      padding: 0.5rem;
+      transition: background-color 0.2s;
+
+      &:hover {
+        background-color: rgba(138, 155, 168, 0.1);
+      }
+
+      &.selected {
+        background-color: #e7f3ff;
+      }
+    }
+  }
+
+  &-list-container {
+    max-height: 60vh;
+    overflow-y: auto;
+  }
+}
diff --git a/ui/v2.5/src/core/StashService.ts b/ui/v2.5/src/core/StashService.ts
index 100f25199..e69d988bf 100644
--- a/ui/v2.5/src/core/StashService.ts
+++ b/ui/v2.5/src/core/StashService.ts
@@ -2313,6 +2313,22 @@ export const stashBoxStudioQuery = (
     fetchPolicy: "network-only",
   });
 
+export const stashBoxSceneQuery = (query: string, stashBoxEndpoint: string) =>
+  client.query<GQL.ScrapeSingleSceneQuery, GQL.ScrapeSingleSceneQueryVariables>(
+    {
+      query: GQL.ScrapeSingleSceneDocument,
+      variables: {
+        source: {
+          stash_box_endpoint: stashBoxEndpoint,
+        },
+        input: {
+          query: query,
+        },
+      },
+      fetchPolicy: "network-only",
+    }
+  );
+
 export const mutateStashBoxBatchPerformerTag = (
   input: GQL.StashBoxBatchTagInput
 ) =>
diff --git a/ui/v2.5/src/locales/en-GB.json b/ui/v2.5/src/locales/en-GB.json
index 28d16e486..e0f49aa3c 100644
--- a/ui/v2.5/src/locales/en-GB.json
+++ b/ui/v2.5/src/locales/en-GB.json
@@ -7,6 +7,7 @@
     "add_sub_groups": "Add Sub-Groups",
     "add_o": "Add O",
     "add_play": "Add play",
+    "add_stash_id": "Add Stash ID",
     "add_to_entity": "Add to {entityType}",
     "allow": "Allow",
     "allow_temporarily": "Allow temporarily",
@@ -967,6 +968,7 @@
     "overwrite_filter_warning": "Saved filter \"{entityName}\" will be overwritten.",
     "performers_found": "{count} performers found",
     "reassign_entity_title": "{count, plural, one {Reassign {singularEntity}} other {Reassign {pluralEntity}}}",
+    "stashid_exists_warning": "The existing stash id for this stash-box will be replaced.",
     "reassign_files": {
       "destination": "Reassign to"
     },
@@ -1451,6 +1453,12 @@
   "stash_id": "Stash ID",
   "stash_id_endpoint": "Stash ID Endpoint",
   "stash_ids": "Stash IDs",
+  "stashbox_search": {
+    "header": "Search {entityType} from StashBox",
+    "no_results": "No results found.",
+    "placeholder_name_or_id": "{entityType} name or StashID...",
+    "select_stashbox": "Select StashBox..."
+  },
   "stashbox": {
     "go_review_draft": "Go to {endpoint_name} to review draft.",
     "selected_stash_box": "Selected Stash-Box endpoint",
diff --git a/ui/v2.5/src/utils/form.tsx b/ui/v2.5/src/utils/form.tsx
index 1fef74cf2..9798efd19 100644
--- a/ui/v2.5/src/utils/form.tsx
+++ b/ui/v2.5/src/utils/form.tsx
@@ -362,12 +362,10 @@ export function formikUtils<V extends FormikValues>(
     field: Field,
     linkType: LinkType,
     messageID: string = field,
-    props?: IProps
+    props?: IProps,
+    addButton?: React.ReactNode
   ) {
     const values = formik.values[field] as GQL.StashIdInput[];
-    if (!values.length) {
-      return;
-    }
 
     const title = intl.formatMessage({ id: messageID });
 
@@ -377,26 +375,31 @@ export function formikUtils<V extends FormikValues>(
     };
 
     const control = (
-      <ul className="pl-0 mb-0">
-        {values.map((stashID) => {
-          return (
-            <Row as="li" key={stashID.stash_id} noGutters>
-              <Button
-                variant="danger"
-                className="mr-2 py-0"
-                title={intl.formatMessage(
-                  { id: "actions.delete_entity" },
-                  { entityType: intl.formatMessage({ id: "stash_id" }) }
-                )}
-                onClick={() => removeStashID(stashID)}
-              >
-                <Icon icon={faTrashAlt} />
-              </Button>
-              <StashIDPill stashID={stashID} linkType={linkType} />
-            </Row>
-          );
-        })}
-      </ul>
+      <>
+        {values.length > 0 && (
+          <ul className="pl-0 mb-2">
+            {values.map((stashID) => {
+              return (
+                <Row as="li" key={stashID.stash_id} noGutters>
+                  <Button
+                    variant="danger"
+                    className="mr-2 py-0"
+                    title={intl.formatMessage(
+                      { id: "actions.delete_entity" },
+                      { entityType: intl.formatMessage({ id: "stash_id" }) }
+                    )}
+                    onClick={() => removeStashID(stashID)}
+                  >
+                    <Icon icon={faTrashAlt} />
+                  </Button>
+                  <StashIDPill stashID={stashID} linkType={linkType} />
+                </Row>
+              );
+            })}
+          </ul>
+        )}
+        {addButton}
+      </>
     );
 
     return renderField(field, title, control, props);

From b3da730a05f09603061899a991fcb8959f539b8e Mon Sep 17 00:00:00 2001
From: DogmaDragon <103123951+DogmaDragon@users.noreply.github.com>
Date: Fri, 28 Nov 2025 00:24:06 +0200
Subject: [PATCH 168/405] docs: Improve README clarity and formatting

---
 README.md | 75 +++++++++++++++++++++++++++++++------------------------
 1 file changed, 42 insertions(+), 33 deletions(-)

diff --git a/README.md b/README.md
index e47363395..5ccefe4bc 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,8 @@
 [![GitHub issues by-label](https://img.shields.io/github/issues-raw/stashapp/stash/bounty)](https://github.com/stashapp/stash/labels/bounty)
 
 ### **Stash is a self-hosted webapp written in Go which organizes and serves your diverse content collection, catering to both your SFW and NSFW needs.**
-![demo image](docs/readme_assets/demo_image.png)
+
+![Screenshot of Stash web application interface](docs/readme_assets/demo_image.png)
 
 * Stash gathers information about videos in your collection from the internet, and is extensible through the use of community-built plugins for a large number of content producers and sites.
 * Stash supports a wide variety of both video and image formats.
@@ -19,80 +20,88 @@
 
 You can [watch a SFW demo video](https://vimeo.com/545323354) to see it in action.
 
-For further information you can consult the [documentation](https://docs.stashapp.cc) or [read the in-app manual](ui/v2.5/src/docs/en).
+For further information you can consult the [documentation](https://docs.stashapp.cc) or access the in-app manual from within the application (also available at [docs.stashapp.cc/in-app-manual](https://docs.stashapp.cc/in-app-manual)).
 
 # Installing Stash
 
+Step-by-step instructions are available at [docs.stashapp.cc/installation](https://docs.stashapp.cc/installation/).
+
 #### Windows Users:
 
-As of version 0.27.0, Stash doesn't support anymore _Windows 7, 8, Server 2008 and Server 2012._  
-Windows 10 or Server 2016 are at least required.
+As of version 0.27.0, Stash no longer supports _Windows 7, 8, Server 2008 and Server 2012._  
+At least Windows 10 or Server 2016 is required.
 
 #### Mac Users:
 
-As of version 0.29.0, Stash requires at least _macOS 11 Big Sur._  
-Stash can still be ran through docker on older versions of macOS
+As of version 0.29.0, Stash requires _macOS 11 Big Sur_ or later.  
+Stash can still be run through docker on older versions of macOS.
 
 <img src="docs/readme_assets/windows_logo.svg" width="100%" height="75"> Windows | <img src="docs/readme_assets/mac_logo.svg" width="100%" height="75"> macOS | <img src="docs/readme_assets/linux_logo.svg" width="100%" height="75"> Linux | <img src="docs/readme_assets/docker_logo.svg" width="100%" height="75"> Docker
 :---:|:---:|:---:|:---:
 [Latest Release](https://github.com/stashapp/stash/releases/latest/download/stash-win.exe) <br /> <sup><sub>[Development Preview](https://github.com/stashapp/stash/releases/download/latest_develop/stash-win.exe)</sub></sup> | [Latest Release](https://github.com/stashapp/stash/releases/latest/download/Stash.app.zip) <br /> <sup><sub>[Development Preview](https://github.com/stashapp/stash/releases/download/latest_develop/Stash.app.zip)</sub></sup> | [Latest Release (amd64)](https://github.com/stashapp/stash/releases/latest/download/stash-linux) <br /> <sup><sub>[Development Preview (amd64)](https://github.com/stashapp/stash/releases/download/latest_develop/stash-linux)</sub></sup> <br /> [More Architectures...](https://github.com/stashapp/stash/releases/latest) | [Instructions](docker/production/README.md) <br /> <sup><sub>[Sample docker-compose.yml](docker/production/docker-compose.yml)</sub></sup>
 
-Download links for other platforms and architectures are available on the [Releases page](https://github.com/stashapp/stash/releases).
+Download links for other platforms and architectures are available on the [Releases](https://github.com/stashapp/stash/releases) page.
 
 ## First Run
 
 #### Windows/macOS Users: Security Prompt
 
-On Windows or macOS, running the app might present a security prompt since the binary isn't yet signed. 
+On Windows or macOS, running the app might present a security prompt since the application binary isn't yet signed. 
 
-On Windows, bypass this by clicking "more info" and then the "run anyway" button. On macOS, Control+Click the app, click "Open", and then "Open" again.
+- On Windows, bypass this by clicking "more info" and then the "run anyway" button.
+- On macOS, Control+Click the app, click "Open", and then "Open" again.
 
-#### FFmpeg
-Stash requires FFmpeg. If you don't have it installed, Stash will download a copy for you. It is recommended that Linux users install `ffmpeg` from their distro's package manager.
+#### ffmpeg
+
+Stash requires FFmpeg. If you don't have it installed, Stash will prompt you to download a copy during setup. It is recommended that Linux users install `ffmpeg` from their distro's package manager.
 
 # Usage
 
 ## Quickstart Guide
-Stash is a web-based application. Once the application is running, the interface is available (by default) from http://localhost:9999.
+
+Stash is a web-based application. Once the application is running, the interface is available (by default) from `http://localhost:9999`.
 
 On first run, Stash will prompt you for some configuration options and media directories to index, called "Scanning" in Stash. After scanning, your media will be available for browsing, curating, editing, and tagging.
 
 Stash can pull metadata (performers, tags, descriptions, studios, and more) directly from many sites through the use of [scrapers](https://github.com/stashapp/stash/blob/develop/ui/v2.5/src/docs/en/Manual/Scraping.md), which integrate directly into Stash. Identifying an entire collection will typically require a mix of multiple sources:
-- The project maintains [StashDB](https://stashdb.org/), a crowd-sourced repository of scene, studio, and performer information. Connecting it to Stash will allow you to automatically identify much of a typical media collection. It runs on our stash-box software and is primarily focused on mainstream digital scenes and studios. Instructions, invite codes, and more can be found in this guide to [Accessing StashDB](https://guidelines.stashdb.org/docs/faq_getting-started/stashdb/accessing-stashdb/).
+- The stashapp team maintains [StashDB](https://stashdb.org/), a crowd-sourced repository of scene, studio, and performer information. Connecting it to Stash will allow you to automatically identify much of a typical media collection. It runs on our stash-box software and is primarily focused on mainstream digital scenes and studios. Instructions, invite codes, and more can be found in this guide to [Accessing StashDB](https://guidelines.stashdb.org/docs/faq_getting-started/stashdb/accessing-stashdb/).
 - Several community-managed stash-box databases can also be connected to Stash in a similar manner. Each one serves a slightly different niche and follows their own methodology. A rundown of each stash-box, their differences, and the information you need to sign up can be found in this guide to [Accessing Stash-Boxes](https://guidelines.stashdb.org/docs/faq_getting-started/stashdb/accessing-stash-boxes/).
-- Many community-maintained scrapers can also be downloaded, installed, and updated from within Stash, allowing you to pull data from a wide range of other websites and databases. They can be found by navigating to Settings -> Metadata Providers -> Available Scrapers -> Community (stable). These can be trickier to use than a stash-box because every scraper works a little differently. For more information, please visit the [CommunityScrapers repository](https://github.com/stashapp/CommunityScrapers).
+- Many community-maintained scrapers can also be downloaded, installed, and updated from within Stash, allowing you to pull data from a wide range of other websites and databases. They can be found by navigating to `Settings → Metadata Providers → Available Scrapers → Community (stable)`. These can be trickier to use than a stash-box because every scraper works a little differently. For more information, please visit the [CommunityScrapers repository](https://github.com/stashapp/CommunityScrapers).
 - All of the above methods of scraping data into Stash are also covered in more detail in our [Guide to Scraping](https://docs.stashapp.cc/beginner-guides/guide-to-scraping/).
 
 <sub>[StashDB](http://stashdb.org) is the canonical instance of our open source metadata API, [stash-box](https://github.com/stashapp/stash-box).</sub>
 
 # Translation
+
 [![Translate](https://translate.codeberg.org/widget/stash/stash/svg-badge.svg)](https://translate.codeberg.org/engage/stash/)
 
-Stash is available in 32 languages (so far!) and it could be in your language too. We use Weblate to coordinate community translations. If you want to help us translate Stash into your language, you can make an account at [Codeberg's Weblate](https://translate.codeberg.org/projects/stash/stash/) to get started contributing new languages or improving existing ones. Thanks!
+Stash is available in 32 languages (so far!) and it could be in your language too. We use Weblate to coordinate community translations. If you want to help us translate Stash, you can make an account at [Codeberg's Weblate](https://translate.codeberg.org/projects/stash/stash/) to contribute to new or existing languages. Thanks!
+
+The badge below shows the current translation status of Stash across all supported languages:
 
 [![Translation status](https://translate.codeberg.org/widget/stash/stash/multi-auto.svg)](https://translate.codeberg.org/engage/stash/)
 
-## Join Our Community
+# Support & Resources
 
-We are excited to announce that we have a new home for support, feature requests, and discussions related to Stash and its associated projects. Join our community on the [Discourse forum](https://discourse.stashapp.cc) to connect with other users, share your ideas, and get help from fellow enthusiasts.
+Need help or want to get involved? Start with the documentation, then reach out to the community if you need further assistance.
 
-# Support (FAQ)
+- Documentation
+  - Official docs: https://docs.stashapp.cc - official guides guides and troubleshooting.
+  - In-app manual: press <kbd>Shift</kbd> + <kbd>?</kbd> in the app or view the manual online: https://docs.stashapp.cc/in-app-manual.
+  - FAQ: https://discourse.stashapp.cc/c/support/faq/28 - common questions and answers.
+  - Community wiki: https://discourse.stashapp.cc/tags/c/community-wiki/22/stash - guides, how-to’s and tips.
+  
+- Community & discussion
+  - Community forum: https://discourse.stashapp.cc - community support, feature requests and discussions.
+  - Discord: https://discord.gg/2TsNFKt - real-time chat and community support.
+  - GitHub discussions: https://github.com/stashapp/stash/discussions - community support and feature discussions.
+  - Lemmy community: https://discuss.online/c/stashapp - Reddit-style community space.
 
-Check out our documentation on [Stash-Docs](https://docs.stashapp.cc) for information about the software, questions, guides, add-ons and more. 
-
-For more help you can:
-* Check the in-app documentation, in the top right corner of the app (it's also mirrored on [Stash-Docs](https://docs.stashapp.cc/in-app-manual))
-* Join our [community forum](https://discourse.stashapp.cc)
-* Join the [Discord server](https://discord.gg/2TsNFKt)
-* Start a [discussion on GitHub](https://github.com/stashapp/stash/discussions)
-
-# Customization
-
-## Themes and CSS Customization
-
-There is a [directory of community-created themes](https://docs.stashapp.cc/themes/list) on Stash-Docs.
-
-You can also change the Stash interface to fit your desired style with various snippets from [Custom CSS snippets](https://docs.stashapp.cc/themes/custom-css-snippets).
+- Community scrapers & plugins
+  - Metadata sources: https://docs.stashapp.cc/metadata-sources/
+  - Plugins: https://docs.stashapp.cc/plugins/
+  - Themes: https://docs.stashapp.cc/themes/
+  - Other projects: https://docs.stashapp.cc/other-projects/
 
 # For Developers
 

From a3ed3819014d11a097ce860a8123c6a43f900ce8 Mon Sep 17 00:00:00 2001
From: feederbox826 <me@feederbox.cc>
Date: Thu, 27 Nov 2025 19:47:34 -0500
Subject: [PATCH 169/405] [hwaccel] increase timeout, fix formatting (#6328)

Thanks to @Gykes for helping find the formatting error
---
 pkg/ffmpeg/codec_hardware.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/ffmpeg/codec_hardware.go b/pkg/ffmpeg/codec_hardware.go
index bbbdbda6e..530f4dc59 100644
--- a/pkg/ffmpeg/codec_hardware.go
+++ b/pkg/ffmpeg/codec_hardware.go
@@ -69,7 +69,7 @@ func (f *FFMpeg) InitHWSupport(ctx context.Context) {
 		args = args.Output("-")
 
 		// #6064 - add timeout to context to prevent hangs
-		const hwTestTimeoutSecondsDefault = 1
+		const hwTestTimeoutSecondsDefault = 10
 		hwTestTimeoutSeconds := hwTestTimeoutSecondsDefault * time.Second
 
 		// allow timeout to be overridden with environment variable
@@ -90,7 +90,7 @@ func (f *FFMpeg) InitHWSupport(ctx context.Context) {
 
 		if err := cmd.Run(); err != nil {
 			if testCtx.Err() != nil {
-				logger.Debugf("[InitHWSupport] Codec %s test timed out after %d seconds", codec, hwTestTimeoutSeconds)
+				logger.Debugf("[InitHWSupport] Codec %s test timed out after %s", codec, hwTestTimeoutSeconds)
 				continue
 			}
 

From 97c01c70b3904560363a3848433bf5889c3313a8 Mon Sep 17 00:00:00 2001
From: Gykes <24581046+Gykes@users.noreply.github.com>
Date: Thu, 27 Nov 2025 18:48:23 -0600
Subject: [PATCH 170/405] update mac notification (#6329)

---
 internal/desktop/systray_nonlinux.go | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/internal/desktop/systray_nonlinux.go b/internal/desktop/systray_nonlinux.go
index 450e503ea..dab6d4dc2 100644
--- a/internal/desktop/systray_nonlinux.go
+++ b/internal/desktop/systray_nonlinux.go
@@ -3,6 +3,7 @@
 package desktop
 
 import (
+	"runtime"
 	"strings"
 
 	"github.com/kermieisinthehouse/systray"
@@ -20,7 +21,12 @@ func startSystray(exit chan int, faviconProvider FaviconProvider) {
 	// system is started from a non-terminal method, e.g. double-clicking an icon.
 	c := config.GetInstance()
 	if c.GetShowOneTimeMovedNotification() {
-		SendNotification("Stash has moved!", "Stash now runs in your tray, instead of a terminal window.")
+		// Use platform-appropriate terminology
+		location := "tray"
+		if runtime.GOOS == "darwin" {
+			location = "menu bar"
+		}
+		SendNotification("Stash has moved!", "Stash now runs in your "+location+", instead of a terminal window.")
 		c.SetBool(config.ShowOneTimeMovedNotification, false)
 		if err := c.Write(); err != nil {
 			logger.Errorf("Error while writing configuration file: %v", err)

From 88747b962aa54876087e0081ecb1641f8d35f8d7 Mon Sep 17 00:00:00 2001
From: Gykes <24581046+Gykes@users.noreply.github.com>
Date: Thu, 27 Nov 2025 18:55:18 -0600
Subject: [PATCH 171/405] allow partial dates (#6333)

---
 ui/v2.5/src/locales/en-GB.json |  2 +-
 ui/v2.5/src/utils/yup.ts       | 18 ++++++++++++++++--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/ui/v2.5/src/locales/en-GB.json b/ui/v2.5/src/locales/en-GB.json
index e0f49aa3c..89ec4984c 100644
--- a/ui/v2.5/src/locales/en-GB.json
+++ b/ui/v2.5/src/locales/en-GB.json
@@ -1571,7 +1571,7 @@
   "urls": "URLs",
   "validation": {
     "blank": "${path} must not be blank",
-    "date_invalid_form": "${path} must be in YYYY-MM-DD form",
+    "date_invalid_form": "${path} must be in YYYY, YYYY-MM, or YYYY-MM-DD form",
     "end_time_before_start_time": "End time must be greater than or equal to start time",
     "required": "${path} is a required field",
     "unique": "${path} must be unique"
diff --git a/ui/v2.5/src/utils/yup.ts b/ui/v2.5/src/utils/yup.ts
index e2c4987a8..5ae8123df 100644
--- a/ui/v2.5/src/utils/yup.ts
+++ b/ui/v2.5/src/utils/yup.ts
@@ -139,8 +139,22 @@ export function yupDateString(intl: IntlShape) {
       name: "date",
       test(value) {
         if (!value) return true;
-        if (!value.match(/^\d{4}-\d{2}-\d{2}$/)) return false;
-        if (Number.isNaN(Date.parse(value))) return false;
+        // Allow YYYY, YYYY-MM, or YYYY-MM-DD formats
+        if (!value.match(/^\d{4}(-\d{2}(-\d{2})?)?$/)) return false;
+        // Validate the date components
+        const parts = value.split("-");
+        const year = parseInt(parts[0], 10);
+        if (year < 1 || year > 9999) return false;
+        if (parts.length >= 2) {
+          const month = parseInt(parts[1], 10);
+          if (month < 1 || month > 12) return false;
+        }
+        if (parts.length === 3) {
+          const day = parseInt(parts[2], 10);
+          if (day < 1 || day > 31) return false;
+          // Full date - validate it parses correctly
+          if (Number.isNaN(Date.parse(value))) return false;
+        }
         return true;
       },
       message: intl.formatMessage({ id: "validation.date_invalid_form" }),

From 7e66ce8a49cba644945e0e7394c6937c34fc367e Mon Sep 17 00:00:00 2001
From: feederbox826 <me@feederbox.cc>
Date: Thu, 27 Nov 2025 19:56:54 -0500
Subject: [PATCH 172/405] trigger play count on player ended (#6334)

---
 ui/v2.5/src/components/ScenePlayer/track-activity.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ui/v2.5/src/components/ScenePlayer/track-activity.ts b/ui/v2.5/src/components/ScenePlayer/track-activity.ts
index a3846dc87..4e7c1ce76 100644
--- a/ui/v2.5/src/components/ScenePlayer/track-activity.ts
+++ b/ui/v2.5/src/components/ScenePlayer/track-activity.ts
@@ -44,6 +44,10 @@ class TrackActivityPlugin extends videojs.getPlugin("plugin") {
     player.on("dispose", () => {
       this.stop();
     });
+
+    player.on("ended", () => {
+      this.stop();
+    });
   }
 
   private start() {

From e052a431d1fe597eed5953e9ae123d0b639e9235 Mon Sep 17 00:00:00 2001
From: Gykes <24581046+Gykes@users.noreply.github.com>
Date: Thu, 27 Nov 2025 20:19:14 -0600
Subject: [PATCH 173/405] Feature Request: Bulk Add by StashID and Name (#6310)

---
 graphql/schema/types/scraper.graphql          |  18 +-
 internal/api/resolver_mutation_stash_box.go   |   4 +-
 internal/manager/manager_tasks.go             | 462 ++++++++++--------
 internal/manager/task_stash_box_tag.go        | 186 ++++---
 .../Tagger/performers/PerformerTagger.tsx     |  12 +-
 .../Tagger/studios/StudioTagger.tsx           |  12 +-
 ui/v2.5/src/locales/en-GB.json                |   4 +-
 ui/v2.5/src/utils/stashIds.ts                 |  26 +
 8 files changed, 409 insertions(+), 315 deletions(-)

diff --git a/graphql/schema/types/scraper.graphql b/graphql/schema/types/scraper.graphql
index 2c13872f3..cb193f47d 100644
--- a/graphql/schema/types/scraper.graphql
+++ b/graphql/schema/types/scraper.graphql
@@ -281,7 +281,10 @@ type StashBoxFingerprint {
   duration: Int!
 }
 
-"If neither ids nor names are set, tag all items"
+"""
+Accepts either ids, or a combination of names and stash_ids.
+If none are set, then all existing items will be tagged.
+"""
 input StashBoxBatchTagInput {
   "Stash endpoint to use for the tagging"
   endpoint: Int @deprecated(reason: "use stash_box_endpoint")
@@ -293,12 +296,17 @@ input StashBoxBatchTagInput {
   refresh: Boolean!
   "If batch adding studios, should their parent studios also be created?"
   createParent: Boolean!
-  "If set, only tag these ids"
+  """
+  IDs in stash of the items to update.
+  If set, names and stash_ids fields will be ignored.
+  """
   ids: [ID!]
-  "If set, only tag these names"
+  "Names of the items in the stash-box instance to search for and create"
   names: [String!]
-  "If set, only tag these performer ids"
+  "Stash IDs of the items in the stash-box instance to search for and create"
+  stash_ids: [String!]
+  "IDs in stash of the performers to update"
   performer_ids: [ID!] @deprecated(reason: "use ids")
-  "If set, only tag these performer names"
+  "Names of the performers in the stash-box instance to search for and create"
   performer_names: [String!] @deprecated(reason: "use names")
 }
diff --git a/internal/api/resolver_mutation_stash_box.go b/internal/api/resolver_mutation_stash_box.go
index 4026667eb..436937511 100644
--- a/internal/api/resolver_mutation_stash_box.go
+++ b/internal/api/resolver_mutation_stash_box.go
@@ -39,7 +39,7 @@ func (r *mutationResolver) SubmitStashBoxFingerprints(ctx context.Context, input
 }
 
 func (r *mutationResolver) StashBoxBatchPerformerTag(ctx context.Context, input manager.StashBoxBatchTagInput) (string, error) {
-	b, err := resolveStashBoxBatchTagInput(input.Endpoint, input.StashBoxEndpoint)
+	b, err := resolveStashBoxBatchTagInput(input.Endpoint, input.StashBoxEndpoint) //nolint:staticcheck
 	if err != nil {
 		return "", err
 	}
@@ -49,7 +49,7 @@ func (r *mutationResolver) StashBoxBatchPerformerTag(ctx context.Context, input
 }
 
 func (r *mutationResolver) StashBoxBatchStudioTag(ctx context.Context, input manager.StashBoxBatchTagInput) (string, error) {
-	b, err := resolveStashBoxBatchTagInput(input.Endpoint, input.StashBoxEndpoint)
+	b, err := resolveStashBoxBatchTagInput(input.Endpoint, input.StashBoxEndpoint) //nolint:staticcheck
 	if err != nil {
 		return "", err
 	}
diff --git a/internal/manager/manager_tasks.go b/internal/manager/manager_tasks.go
index 085c4459e..1e66433be 100644
--- a/internal/manager/manager_tasks.go
+++ b/internal/manager/manager_tasks.go
@@ -365,9 +365,37 @@ func (s *Manager) MigrateHash(ctx context.Context) int {
 	return s.JobManager.Add(ctx, "Migrating scene hashes...", j)
 }
 
-// If neither ids nor names are set, tag all items
+// batchTagType indicates which batch tagging mode to use
+type batchTagType int
+
+const (
+	batchTagByIds batchTagType = iota
+	batchTagByNamesOrStashIds
+	batchTagAll
+)
+
+// getBatchTagType determines the batch tag mode based on the input
+func (input StashBoxBatchTagInput) getBatchTagType(hasPerformerFields bool) batchTagType {
+	switch {
+	case len(input.Ids) > 0:
+		return batchTagByIds
+	case hasPerformerFields && len(input.PerformerIds) > 0:
+		return batchTagByIds
+	case len(input.StashIDs) > 0 || len(input.Names) > 0:
+		return batchTagByNamesOrStashIds
+	case hasPerformerFields && len(input.PerformerNames) > 0:
+		return batchTagByNamesOrStashIds
+	default:
+		return batchTagAll
+	}
+}
+
+// Accepts either ids, or a combination of names and stash_ids.
+// If none are set, then all existing items will be tagged.
 type StashBoxBatchTagInput struct {
-	// Stash endpoint to use for the tagging - deprecated - use StashBoxEndpoint
+	// Stash endpoint to use for the tagging
+	//
+	// Deprecated: use StashBoxEndpoint
 	Endpoint         *int    `json:"endpoint"`
 	StashBoxEndpoint *string `json:"stash_box_endpoint"`
 	// Fields to exclude when executing the tagging
@@ -376,128 +404,143 @@ type StashBoxBatchTagInput struct {
 	Refresh bool `json:"refresh"`
 	// If batch adding studios, should their parent studios also be created?
 	CreateParent bool `json:"createParent"`
-	// If set, only tag these ids
+	// IDs in stash of the items to update.
+	// If set, names and stash_ids fields will be ignored.
 	Ids []string `json:"ids"`
-	// If set, only tag these names
+	// Names of the items in the stash-box instance to search for and create
 	Names []string `json:"names"`
-	// If set, only tag these performer ids
+	// Stash IDs of the items in the stash-box instance to search for and create
+	StashIDs []string `json:"stash_ids"`
+	// IDs in stash of the performers to update
 	//
-	// Deprecated: please use Ids
+	// Deprecated: use Ids
 	PerformerIds []string `json:"performer_ids"`
-	// If set, only tag these performer names
+	// Names of the performers in the stash-box instance to search for and create
 	//
-	// Deprecated: please use Names
+	// Deprecated: use Names
 	PerformerNames []string `json:"performer_names"`
 }
 
+func (s *Manager) batchTagPerformersByIds(ctx context.Context, input StashBoxBatchTagInput, box *models.StashBox) ([]Task, error) {
+	var tasks []Task
+
+	err := s.Repository.WithTxn(ctx, func(ctx context.Context) error {
+		performerQuery := s.Repository.Performer
+
+		ids := input.Ids
+		if len(ids) == 0 {
+			ids = input.PerformerIds //nolint:staticcheck
+		}
+
+		for _, performerID := range ids {
+			if id, err := strconv.Atoi(performerID); err == nil {
+				performer, err := performerQuery.Find(ctx, id)
+				if err != nil {
+					return err
+				}
+
+				if err := performer.LoadStashIDs(ctx, performerQuery); err != nil {
+					return fmt.Errorf("loading performer stash ids: %w", err)
+				}
+
+				hasStashID := performer.StashIDs.ForEndpoint(box.Endpoint) != nil
+				if (input.Refresh && hasStashID) || (!input.Refresh && !hasStashID) {
+					tasks = append(tasks, &stashBoxBatchPerformerTagTask{
+						performer:      performer,
+						box:            box,
+						excludedFields: input.ExcludeFields,
+					})
+				}
+			}
+		}
+		return nil
+	})
+
+	return tasks, err
+}
+
+func (s *Manager) batchTagPerformersByNamesOrStashIds(input StashBoxBatchTagInput, box *models.StashBox) []Task {
+	var tasks []Task
+
+	for i := range input.StashIDs {
+		stashID := input.StashIDs[i]
+		if len(stashID) > 0 {
+			tasks = append(tasks, &stashBoxBatchPerformerTagTask{
+				stashID:        &stashID,
+				box:            box,
+				excludedFields: input.ExcludeFields,
+			})
+		}
+	}
+
+	names := input.Names
+	if len(names) == 0 {
+		names = input.PerformerNames //nolint:staticcheck
+	}
+
+	for i := range names {
+		name := names[i]
+		if len(name) > 0 {
+			tasks = append(tasks, &stashBoxBatchPerformerTagTask{
+				name:           &name,
+				box:            box,
+				excludedFields: input.ExcludeFields,
+			})
+		}
+	}
+
+	return tasks
+}
+
+func (s *Manager) batchTagAllPerformers(ctx context.Context, input StashBoxBatchTagInput, box *models.StashBox) ([]Task, error) {
+	var tasks []Task
+
+	err := s.Repository.WithTxn(ctx, func(ctx context.Context) error {
+		performerQuery := s.Repository.Performer
+		var performers []*models.Performer
+		var err error
+
+		performers, err = performerQuery.FindByStashIDStatus(ctx, input.Refresh, box.Endpoint)
+
+		if err != nil {
+			return fmt.Errorf("error querying performers: %v", err)
+		}
+
+		for _, performer := range performers {
+			if err := performer.LoadStashIDs(ctx, performerQuery); err != nil {
+				return fmt.Errorf("error loading stash ids for performer %s: %v", performer.Name, err)
+			}
+
+			tasks = append(tasks, &stashBoxBatchPerformerTagTask{
+				performer:      performer,
+				box:            box,
+				excludedFields: input.ExcludeFields,
+			})
+		}
+		return nil
+	})
+
+	return tasks, err
+}
+
 func (s *Manager) StashBoxBatchPerformerTag(ctx context.Context, box *models.StashBox, input StashBoxBatchTagInput) int {
 	j := job.MakeJobExec(func(ctx context.Context, progress *job.Progress) error {
 		logger.Infof("Initiating stash-box batch performer tag")
 
-		var tasks []StashBoxBatchTagTask
+		var tasks []Task
+		var err error
 
-		// The gocritic linter wants to turn this ifElseChain into a switch.
-		// however, such a switch would contain quite large blocks for each section
-		// and would arguably be hard to read.
-		//
-		// This is why we mark this section nolint. In principle, we should look to
-		// rewrite the section at some point, to avoid the linter warning.
-		if len(input.Ids) > 0 || len(input.PerformerIds) > 0 { //nolint:gocritic
-			// The user has chosen only to tag the items on the current page
-			if err := s.Repository.WithTxn(ctx, func(ctx context.Context) error {
-				performerQuery := s.Repository.Performer
+		switch input.getBatchTagType(true) {
+		case batchTagByIds:
+			tasks, err = s.batchTagPerformersByIds(ctx, input, box)
+		case batchTagByNamesOrStashIds:
+			tasks = s.batchTagPerformersByNamesOrStashIds(input, box)
+		case batchTagAll:
+			tasks, err = s.batchTagAllPerformers(ctx, input, box)
+		}
 
-				idsToUse := input.PerformerIds
-				if len(input.Ids) > 0 {
-					idsToUse = input.Ids
-				}
-
-				for _, performerID := range idsToUse {
-					if id, err := strconv.Atoi(performerID); err == nil {
-						performer, err := performerQuery.Find(ctx, id)
-						if err == nil {
-							if err := performer.LoadStashIDs(ctx, performerQuery); err != nil {
-								return fmt.Errorf("loading performer stash ids: %w", err)
-							}
-
-							// Check if the user wants to refresh existing or new items
-							hasStashID := performer.StashIDs.ForEndpoint(box.Endpoint) != nil
-							if (input.Refresh && hasStashID) || (!input.Refresh && !hasStashID) {
-								tasks = append(tasks, StashBoxBatchTagTask{
-									performer:      performer,
-									refresh:        input.Refresh,
-									box:            box,
-									excludedFields: input.ExcludeFields,
-									taskType:       Performer,
-								})
-							}
-						} else {
-							return err
-						}
-					}
-				}
-				return nil
-			}); err != nil {
-				return err
-			}
-		} else if len(input.Names) > 0 || len(input.PerformerNames) > 0 {
-			// The user is batch adding performers
-			namesToUse := input.PerformerNames
-			if len(input.Names) > 0 {
-				namesToUse = input.Names
-			}
-
-			for i := range namesToUse {
-				name := namesToUse[i]
-				if len(name) > 0 {
-					tasks = append(tasks, StashBoxBatchTagTask{
-						name:           &name,
-						refresh:        false,
-						box:            box,
-						excludedFields: input.ExcludeFields,
-						taskType:       Performer,
-					})
-				}
-			}
-		} else { //nolint:gocritic
-			// The gocritic linter wants to fold this if-block into the else on the line above.
-			// However, this doesn't really help with readability of the current section. Mark it
-			// as nolint for now. In the future we'd like to rewrite this code by factoring some of
-			// this into separate functions.
-
-			// The user has chosen to tag every item in their database
-			if err := s.Repository.WithTxn(ctx, func(ctx context.Context) error {
-				performerQuery := s.Repository.Performer
-				var performers []*models.Performer
-				var err error
-
-				if input.Refresh {
-					performers, err = performerQuery.FindByStashIDStatus(ctx, true, box.Endpoint)
-				} else {
-					performers, err = performerQuery.FindByStashIDStatus(ctx, false, box.Endpoint)
-				}
-
-				if err != nil {
-					return fmt.Errorf("error querying performers: %v", err)
-				}
-
-				for _, performer := range performers {
-					if err := performer.LoadStashIDs(ctx, performerQuery); err != nil {
-						return fmt.Errorf("error loading stash ids for performer %s: %v", performer.Name, err)
-					}
-
-					tasks = append(tasks, StashBoxBatchTagTask{
-						performer:      performer,
-						refresh:        input.Refresh,
-						box:            box,
-						excludedFields: input.ExcludeFields,
-						taskType:       Performer,
-					})
-				}
-				return nil
-			}); err != nil {
-				return err
-			}
+		if err != nil {
+			return err
 		}
 
 		if len(tasks) == 0 {
@@ -509,7 +552,7 @@ func (s *Manager) StashBoxBatchPerformerTag(ctx context.Context, box *models.Sta
 		logger.Infof("Starting stash-box batch operation for %d performers", len(tasks))
 
 		for _, task := range tasks {
-			progress.ExecuteTask(task.Description(), func() {
+			progress.ExecuteTask(task.GetDescription(), func() {
 				task.Start(ctx)
 			})
 
@@ -522,103 +565,116 @@ func (s *Manager) StashBoxBatchPerformerTag(ctx context.Context, box *models.Sta
 	return s.JobManager.Add(ctx, "Batch stash-box performer tag...", j)
 }
 
+func (s *Manager) batchTagStudiosByIds(ctx context.Context, input StashBoxBatchTagInput, box *models.StashBox) ([]Task, error) {
+	var tasks []Task
+
+	err := s.Repository.WithTxn(ctx, func(ctx context.Context) error {
+		studioQuery := s.Repository.Studio
+
+		for _, studioID := range input.Ids {
+			if id, err := strconv.Atoi(studioID); err == nil {
+				studio, err := studioQuery.Find(ctx, id)
+				if err != nil {
+					return err
+				}
+
+				if err := studio.LoadStashIDs(ctx, studioQuery); err != nil {
+					return fmt.Errorf("loading studio stash ids: %w", err)
+				}
+
+				hasStashID := studio.StashIDs.ForEndpoint(box.Endpoint) != nil
+				if (input.Refresh && hasStashID) || (!input.Refresh && !hasStashID) {
+					tasks = append(tasks, &stashBoxBatchStudioTagTask{
+						studio:         studio,
+						createParent:   input.CreateParent,
+						box:            box,
+						excludedFields: input.ExcludeFields,
+					})
+				}
+			}
+		}
+		return nil
+	})
+
+	return tasks, err
+}
+
+func (s *Manager) batchTagStudiosByNamesOrStashIds(input StashBoxBatchTagInput, box *models.StashBox) []Task {
+	var tasks []Task
+
+	for i := range input.StashIDs {
+		stashID := input.StashIDs[i]
+		if len(stashID) > 0 {
+			tasks = append(tasks, &stashBoxBatchStudioTagTask{
+				stashID:        &stashID,
+				createParent:   input.CreateParent,
+				box:            box,
+				excludedFields: input.ExcludeFields,
+			})
+		}
+	}
+
+	for i := range input.Names {
+		name := input.Names[i]
+		if len(name) > 0 {
+			tasks = append(tasks, &stashBoxBatchStudioTagTask{
+				name:           &name,
+				createParent:   input.CreateParent,
+				box:            box,
+				excludedFields: input.ExcludeFields,
+			})
+		}
+	}
+
+	return tasks
+}
+
+func (s *Manager) batchTagAllStudios(ctx context.Context, input StashBoxBatchTagInput, box *models.StashBox) ([]Task, error) {
+	var tasks []Task
+
+	err := s.Repository.WithTxn(ctx, func(ctx context.Context) error {
+		studioQuery := s.Repository.Studio
+		var studios []*models.Studio
+		var err error
+
+		studios, err = studioQuery.FindByStashIDStatus(ctx, input.Refresh, box.Endpoint)
+
+		if err != nil {
+			return fmt.Errorf("error querying studios: %v", err)
+		}
+
+		for _, studio := range studios {
+			tasks = append(tasks, &stashBoxBatchStudioTagTask{
+				studio:         studio,
+				createParent:   input.CreateParent,
+				box:            box,
+				excludedFields: input.ExcludeFields,
+			})
+		}
+		return nil
+	})
+
+	return tasks, err
+}
+
 func (s *Manager) StashBoxBatchStudioTag(ctx context.Context, box *models.StashBox, input StashBoxBatchTagInput) int {
 	j := job.MakeJobExec(func(ctx context.Context, progress *job.Progress) error {
 		logger.Infof("Initiating stash-box batch studio tag")
 
-		var tasks []StashBoxBatchTagTask
+		var tasks []Task
+		var err error
 
-		// The gocritic linter wants to turn this ifElseChain into a switch.
-		// however, such a switch would contain quite large blocks for each section
-		// and would arguably be hard to read.
-		//
-		// This is why we mark this section nolint. In principle, we should look to
-		// rewrite the section at some point, to avoid the linter warning.
-		if len(input.Ids) > 0 { //nolint:gocritic
-			// The user has chosen only to tag the items on the current page
-			if err := s.Repository.WithTxn(ctx, func(ctx context.Context) error {
-				studioQuery := s.Repository.Studio
+		switch input.getBatchTagType(false) {
+		case batchTagByIds:
+			tasks, err = s.batchTagStudiosByIds(ctx, input, box)
+		case batchTagByNamesOrStashIds:
+			tasks = s.batchTagStudiosByNamesOrStashIds(input, box)
+		case batchTagAll:
+			tasks, err = s.batchTagAllStudios(ctx, input, box)
+		}
 
-				for _, studioID := range input.Ids {
-					if id, err := strconv.Atoi(studioID); err == nil {
-						studio, err := studioQuery.Find(ctx, id)
-						if err == nil {
-							if err := studio.LoadStashIDs(ctx, studioQuery); err != nil {
-								return fmt.Errorf("loading studio stash ids: %w", err)
-							}
-
-							// Check if the user wants to refresh existing or new items
-							hasStashID := studio.StashIDs.ForEndpoint(box.Endpoint) != nil
-							if (input.Refresh && hasStashID) || (!input.Refresh && !hasStashID) {
-								tasks = append(tasks, StashBoxBatchTagTask{
-									studio:         studio,
-									refresh:        input.Refresh,
-									createParent:   input.CreateParent,
-									box:            box,
-									excludedFields: input.ExcludeFields,
-									taskType:       Studio,
-								})
-							}
-						} else {
-							return err
-						}
-					}
-				}
-				return nil
-			}); err != nil {
-				logger.Error(err.Error())
-			}
-		} else if len(input.Names) > 0 {
-			// The user is batch adding studios
-			for i := range input.Names {
-				name := input.Names[i]
-				if len(name) > 0 {
-					tasks = append(tasks, StashBoxBatchTagTask{
-						name:           &name,
-						refresh:        false,
-						createParent:   input.CreateParent,
-						box:            box,
-						excludedFields: input.ExcludeFields,
-						taskType:       Studio,
-					})
-				}
-			}
-		} else { //nolint:gocritic
-			// The gocritic linter wants to fold this if-block into the else on the line above.
-			// However, this doesn't really help with readability of the current section. Mark it
-			// as nolint for now. In the future we'd like to rewrite this code by factoring some of
-			// this into separate functions.
-
-			// The user has chosen to tag every item in their database
-			if err := s.Repository.WithTxn(ctx, func(ctx context.Context) error {
-				studioQuery := s.Repository.Studio
-				var studios []*models.Studio
-				var err error
-
-				if input.Refresh {
-					studios, err = studioQuery.FindByStashIDStatus(ctx, true, box.Endpoint)
-				} else {
-					studios, err = studioQuery.FindByStashIDStatus(ctx, false, box.Endpoint)
-				}
-
-				if err != nil {
-					return fmt.Errorf("error querying studios: %v", err)
-				}
-
-				for _, studio := range studios {
-					tasks = append(tasks, StashBoxBatchTagTask{
-						studio:         studio,
-						refresh:        input.Refresh,
-						createParent:   input.CreateParent,
-						box:            box,
-						excludedFields: input.ExcludeFields,
-						taskType:       Studio,
-					})
-				}
-				return nil
-			}); err != nil {
-				return err
-			}
+		if err != nil {
+			return err
 		}
 
 		if len(tasks) == 0 {
@@ -630,7 +686,7 @@ func (s *Manager) StashBoxBatchStudioTag(ctx context.Context, box *models.StashB
 		logger.Infof("Starting stash-box batch operation for %d studios", len(tasks))
 
 		for _, task := range tasks {
-			progress.ExecuteTask(task.Description(), func() {
+			progress.ExecuteTask(task.GetDescription(), func() {
 				task.Start(ctx)
 			})
 
diff --git a/internal/manager/task_stash_box_tag.go b/internal/manager/task_stash_box_tag.go
index d20b71f06..d7d987a6d 100644
--- a/internal/manager/task_stash_box_tag.go
+++ b/internal/manager/task_stash_box_tag.go
@@ -14,57 +14,33 @@ import (
 	"github.com/stashapp/stash/pkg/studio"
 )
 
-type StashBoxTagTaskType int
-
-const (
-	Performer StashBoxTagTaskType = iota
-	Studio
-)
-
-type StashBoxBatchTagTask struct {
+// stashBoxBatchPerformerTagTask is used to tag or create performers from stash-box.
+//
+// Two modes of operation:
+//   - Update existing performer: set performer to update from stash-box data
+//   - Create new performer: set name or stashID to search stash-box and create locally
+type stashBoxBatchPerformerTagTask struct {
 	box            *models.StashBox
 	name           *string
+	stashID        *string
 	performer      *models.Performer
-	studio         *models.Studio
-	refresh        bool
-	createParent   bool
 	excludedFields []string
-	taskType       StashBoxTagTaskType
 }
 
-func (t *StashBoxBatchTagTask) Start(ctx context.Context) {
-	switch t.taskType {
-	case Performer:
-		t.stashBoxPerformerTag(ctx)
-	case Studio:
-		t.stashBoxStudioTag(ctx)
+func (t *stashBoxBatchPerformerTagTask) getName() string {
+	switch {
+	case t.name != nil:
+		return *t.name
+	case t.stashID != nil:
+		return *t.stashID
+	case t.performer != nil:
+		return t.performer.Name
 	default:
-		logger.Errorf("Error starting batch task, unknown task_type %d", t.taskType)
+		return ""
 	}
 }
 
-func (t *StashBoxBatchTagTask) Description() string {
-	if t.taskType == Performer {
-		var name string
-		if t.name != nil {
-			name = *t.name
-		} else {
-			name = t.performer.Name
-		}
-		return fmt.Sprintf("Tagging performer %s from stash-box", name)
-	} else if t.taskType == Studio {
-		var name string
-		if t.name != nil {
-			name = *t.name
-		} else {
-			name = t.studio.Name
-		}
-		return fmt.Sprintf("Tagging studio %s from stash-box", name)
-	}
-	return fmt.Sprintf("Unknown tagging task type %d from stash-box", t.taskType)
-}
-
-func (t *StashBoxBatchTagTask) stashBoxPerformerTag(ctx context.Context) {
+func (t *stashBoxBatchPerformerTagTask) Start(ctx context.Context) {
 	performer, err := t.findStashBoxPerformer(ctx)
 	if err != nil {
 		logger.Errorf("Error fetching performer data from stash-box: %v", err)
@@ -76,21 +52,18 @@ func (t *StashBoxBatchTagTask) stashBoxPerformerTag(ctx context.Context) {
 		excluded[field] = true
 	}
 
-	// performer will have a value if pulling from Stash-box by Stash ID or name was successful
 	if performer != nil {
 		t.processMatchedPerformer(ctx, performer, excluded)
 	} else {
-		var name string
-		if t.name != nil {
-			name = *t.name
-		} else if t.performer != nil {
-			name = t.performer.Name
-		}
-		logger.Infof("No match found for %s", name)
+		logger.Infof("No match found for %s", t.getName())
 	}
 }
 
-func (t *StashBoxBatchTagTask) findStashBoxPerformer(ctx context.Context) (*models.ScrapedPerformer, error) {
+func (t *stashBoxBatchPerformerTagTask) GetDescription() string {
+	return fmt.Sprintf("Tagging performer %s from stash-box", t.getName())
+}
+
+func (t *stashBoxBatchPerformerTagTask) findStashBoxPerformer(ctx context.Context) (*models.ScrapedPerformer, error) {
 	var performer *models.ScrapedPerformer
 	var err error
 
@@ -98,7 +71,24 @@ func (t *StashBoxBatchTagTask) findStashBoxPerformer(ctx context.Context) (*mode
 
 	client := stashbox.NewClient(*t.box, stashbox.ExcludeTagPatterns(instance.Config.GetScraperExcludeTagPatterns()))
 
-	if t.refresh {
+	switch {
+	case t.name != nil:
+		performer, err = client.FindPerformerByName(ctx, *t.name)
+	case t.stashID != nil:
+		performer, err = client.FindPerformerByID(ctx, *t.stashID)
+
+		if performer != nil && performer.RemoteMergedIntoId != nil {
+			mergedPerformer, err := t.handleMergedPerformer(ctx, performer, client)
+			if err != nil {
+				return nil, err
+			}
+
+			if mergedPerformer != nil {
+				logger.Infof("Performer id %s merged into %s, updating local performer", *t.stashID, *performer.RemoteMergedIntoId)
+				performer = mergedPerformer
+			}
+		}
+	case t.performer != nil:
 		var remoteID string
 		if err := r.WithReadTxn(ctx, func(ctx context.Context) error {
 			qb := r.Performer
@@ -118,6 +108,7 @@ func (t *StashBoxBatchTagTask) findStashBoxPerformer(ctx context.Context) (*mode
 		}); err != nil {
 			return nil, err
 		}
+
 		if remoteID != "" {
 			performer, err = client.FindPerformerByID(ctx, remoteID)
 
@@ -133,14 +124,6 @@ func (t *StashBoxBatchTagTask) findStashBoxPerformer(ctx context.Context) (*mode
 				}
 			}
 		}
-	} else {
-		var name string
-		if t.name != nil {
-			name = *t.name
-		} else {
-			name = t.performer.Name
-		}
-		performer, err = client.FindPerformerByName(ctx, name)
 	}
 
 	if performer != nil {
@@ -154,7 +137,7 @@ func (t *StashBoxBatchTagTask) findStashBoxPerformer(ctx context.Context) (*mode
 	return performer, err
 }
 
-func (t *StashBoxBatchTagTask) handleMergedPerformer(ctx context.Context, performer *models.ScrapedPerformer, client *stashbox.Client) (mergedPerformer *models.ScrapedPerformer, err error) {
+func (t *stashBoxBatchPerformerTagTask) handleMergedPerformer(ctx context.Context, performer *models.ScrapedPerformer, client *stashbox.Client) (mergedPerformer *models.ScrapedPerformer, err error) {
 	mergedPerformer, err = client.FindPerformerByID(ctx, *performer.RemoteMergedIntoId)
 	if err != nil {
 		return nil, fmt.Errorf("loading merged performer %s from stashbox", *performer.RemoteMergedIntoId)
@@ -169,8 +152,7 @@ func (t *StashBoxBatchTagTask) handleMergedPerformer(ctx context.Context, perfor
 	return mergedPerformer, nil
 }
 
-func (t *StashBoxBatchTagTask) processMatchedPerformer(ctx context.Context, p *models.ScrapedPerformer, excluded map[string]bool) {
-	// Refreshing an existing performer
+func (t *stashBoxBatchPerformerTagTask) processMatchedPerformer(ctx context.Context, p *models.ScrapedPerformer, excluded map[string]bool) {
 	if t.performer != nil {
 		storedID, _ := strconv.Atoi(*p.StoredID)
 
@@ -180,7 +162,6 @@ func (t *StashBoxBatchTagTask) processMatchedPerformer(ctx context.Context, p *m
 			return
 		}
 
-		// Start the transaction and update the performer
 		r := instance.Repository
 		err = r.WithTxn(ctx, func(ctx context.Context) error {
 			qb := r.Performer
@@ -226,8 +207,8 @@ func (t *StashBoxBatchTagTask) processMatchedPerformer(ctx context.Context, p *m
 		} else {
 			logger.Infof("Updated performer %s", *p.Name)
 		}
-	} else if t.name != nil && p.Name != nil {
-		// Creating a new performer
+	} else {
+		// no existing performer, create a new one
 		newPerformer := p.ToPerformer(t.box.Endpoint, excluded)
 		image, err := p.GetImage(ctx, excluded)
 		if err != nil {
@@ -263,7 +244,34 @@ func (t *StashBoxBatchTagTask) processMatchedPerformer(ctx context.Context, p *m
 	}
 }
 
-func (t *StashBoxBatchTagTask) stashBoxStudioTag(ctx context.Context) {
+// stashBoxBatchStudioTagTask is used to tag or create studios from stash-box.
+//
+// Two modes of operation:
+//   - Update existing studio: set studio to update from stash-box data
+//   - Create new studio: set name or stashID to search stash-box and create locally
+type stashBoxBatchStudioTagTask struct {
+	box            *models.StashBox
+	name           *string
+	stashID        *string
+	studio         *models.Studio
+	createParent   bool
+	excludedFields []string
+}
+
+func (t *stashBoxBatchStudioTagTask) getName() string {
+	switch {
+	case t.name != nil:
+		return *t.name
+	case t.stashID != nil:
+		return *t.stashID
+	case t.studio != nil:
+		return t.studio.Name
+	default:
+		return ""
+	}
+}
+
+func (t *stashBoxBatchStudioTagTask) Start(ctx context.Context) {
 	studio, err := t.findStashBoxStudio(ctx)
 	if err != nil {
 		logger.Errorf("Error fetching studio data from stash-box: %v", err)
@@ -275,21 +283,18 @@ func (t *StashBoxBatchTagTask) stashBoxStudioTag(ctx context.Context) {
 		excluded[field] = true
 	}
 
-	// studio will have a value if pulling from Stash-box by Stash ID or name was successful
 	if studio != nil {
 		t.processMatchedStudio(ctx, studio, excluded)
 	} else {
-		var name string
-		if t.name != nil {
-			name = *t.name
-		} else if t.studio != nil {
-			name = t.studio.Name
-		}
-		logger.Infof("No match found for %s", name)
+		logger.Infof("No match found for %s", t.getName())
 	}
 }
 
-func (t *StashBoxBatchTagTask) findStashBoxStudio(ctx context.Context) (*models.ScrapedStudio, error) {
+func (t *stashBoxBatchStudioTagTask) GetDescription() string {
+	return fmt.Sprintf("Tagging studio %s from stash-box", t.getName())
+}
+
+func (t *stashBoxBatchStudioTagTask) findStashBoxStudio(ctx context.Context) (*models.ScrapedStudio, error) {
 	var studio *models.ScrapedStudio
 	var err error
 
@@ -297,7 +302,12 @@ func (t *StashBoxBatchTagTask) findStashBoxStudio(ctx context.Context) (*models.
 
 	client := stashbox.NewClient(*t.box, stashbox.ExcludeTagPatterns(instance.Config.GetScraperExcludeTagPatterns()))
 
-	if t.refresh {
+	switch {
+	case t.name != nil:
+		studio, err = client.FindStudio(ctx, *t.name)
+	case t.stashID != nil:
+		studio, err = client.FindStudio(ctx, *t.stashID)
+	case t.studio != nil:
 		var remoteID string
 		if err := r.WithReadTxn(ctx, func(ctx context.Context) error {
 			if !t.studio.StashIDs.Loaded() {
@@ -315,17 +325,10 @@ func (t *StashBoxBatchTagTask) findStashBoxStudio(ctx context.Context) (*models.
 		}); err != nil {
 			return nil, err
 		}
+
 		if remoteID != "" {
 			studio, err = client.FindStudio(ctx, remoteID)
 		}
-	} else {
-		var name string
-		if t.name != nil {
-			name = *t.name
-		} else {
-			name = t.studio.Name
-		}
-		studio, err = client.FindStudio(ctx, name)
 	}
 
 	if err := r.WithReadTxn(ctx, func(ctx context.Context) error {
@@ -343,8 +346,7 @@ func (t *StashBoxBatchTagTask) findStashBoxStudio(ctx context.Context) (*models.
 	return studio, err
 }
 
-func (t *StashBoxBatchTagTask) processMatchedStudio(ctx context.Context, s *models.ScrapedStudio, excluded map[string]bool) {
-	// Refreshing an existing studio
+func (t *stashBoxBatchStudioTagTask) processMatchedStudio(ctx context.Context, s *models.ScrapedStudio, excluded map[string]bool) {
 	if t.studio != nil {
 		storedID, _ := strconv.Atoi(*s.StoredID)
 
@@ -361,7 +363,6 @@ func (t *StashBoxBatchTagTask) processMatchedStudio(ctx context.Context, s *mode
 			return
 		}
 
-		// Start the transaction and update the studio
 		r := instance.Repository
 		err = r.WithTxn(ctx, func(ctx context.Context) error {
 			qb := r.Studio
@@ -394,8 +395,8 @@ func (t *StashBoxBatchTagTask) processMatchedStudio(ctx context.Context, s *mode
 		} else {
 			logger.Infof("Updated studio %s", s.Name)
 		}
-	} else if t.name != nil && s.Name != "" {
-		// Creating a new studio
+	} else if s.Name != "" {
+		// no existing studio, create a new one
 		if s.Parent != nil && t.createParent {
 			err := t.processParentStudio(ctx, s.Parent, excluded)
 			if err != nil {
@@ -410,7 +411,6 @@ func (t *StashBoxBatchTagTask) processMatchedStudio(ctx context.Context, s *mode
 			return
 		}
 
-		// Start the transaction and save the studio
 		r := instance.Repository
 		err = r.WithTxn(ctx, func(ctx context.Context) error {
 			qb := r.Studio
@@ -439,9 +439,8 @@ func (t *StashBoxBatchTagTask) processMatchedStudio(ctx context.Context, s *mode
 	}
 }
 
-func (t *StashBoxBatchTagTask) processParentStudio(ctx context.Context, parent *models.ScrapedStudio, excluded map[string]bool) error {
+func (t *stashBoxBatchStudioTagTask) processParentStudio(ctx context.Context, parent *models.ScrapedStudio, excluded map[string]bool) error {
 	if parent.StoredID == nil {
-		// The parent needs to be created
 		newParentStudio := parent.ToStudio(t.box.Endpoint, excluded)
 
 		image, err := parent.GetImage(ctx, excluded)
@@ -450,7 +449,6 @@ func (t *StashBoxBatchTagTask) processParentStudio(ctx context.Context, parent *
 			return err
 		}
 
-		// Start the transaction and save the studio
 		r := instance.Repository
 		err = r.WithTxn(ctx, func(ctx context.Context) error {
 			qb := r.Studio
@@ -476,7 +474,6 @@ func (t *StashBoxBatchTagTask) processParentStudio(ctx context.Context, parent *
 		}
 		return err
 	} else {
-		// The parent studio matched an existing one and the user has chosen in the UI to link and/or update it
 		storedID, _ := strconv.Atoi(*parent.StoredID)
 
 		image, err := parent.GetImage(ctx, excluded)
@@ -485,7 +482,6 @@ func (t *StashBoxBatchTagTask) processParentStudio(ctx context.Context, parent *
 			return err
 		}
 
-		// Start the transaction and update the studio
 		r := instance.Repository
 		err = r.WithTxn(ctx, func(ctx context.Context) error {
 			qb := r.Studio
diff --git a/ui/v2.5/src/components/Tagger/performers/PerformerTagger.tsx b/ui/v2.5/src/components/Tagger/performers/PerformerTagger.tsx
index a6e2bcd1c..bb934a241 100755
--- a/ui/v2.5/src/components/Tagger/performers/PerformerTagger.tsx
+++ b/ui/v2.5/src/components/Tagger/performers/PerformerTagger.tsx
@@ -25,6 +25,7 @@ import PerformerModal from "../PerformerModal";
 import { useUpdatePerformer } from "../queries";
 import { faStar, faTags } from "@fortawesome/free-solid-svg-icons";
 import { mergeStashIDs } from "src/utils/stashbox";
+import { separateNamesAndStashIds } from "src/utils/stashIds";
 import { ExternalLink } from "src/components/Shared/ExternalLink";
 import { useTaggerConfig } from "../config";
 
@@ -222,7 +223,7 @@ const PerformerBatchAddModal: React.FC<IPerformerBatchAddModal> = ({
         as="textarea"
         ref={performerInput}
         placeholder={intl.formatMessage({
-          id: "performer_tagger.performer_names_separated_by_comma",
+          id: "performer_tagger.performer_names_or_stashids_separated_by_comma",
         })}
         rows={6}
       />
@@ -666,14 +667,17 @@ export const PerformerTagger: React.FC<ITaggerProps> = ({ performers }) => {
 
   async function batchAdd(performerInput: string) {
     if (performerInput && selectedEndpoint) {
-      const names = performerInput
+      const inputs = performerInput
         .split(",")
         .map((n) => n.trim())
         .filter((n) => n.length > 0);
 
-      if (names.length > 0) {
+      const { names, stashIds } = separateNamesAndStashIds(inputs);
+
+      if (names.length > 0 || stashIds.length > 0) {
         const ret = await mutateStashBoxBatchPerformerTag({
-          names: names,
+          names: names.length > 0 ? names : undefined,
+          stash_ids: stashIds.length > 0 ? stashIds : undefined,
           endpoint: selectedEndpointIndex,
           refresh: false,
           createParent: false,
diff --git a/ui/v2.5/src/components/Tagger/studios/StudioTagger.tsx b/ui/v2.5/src/components/Tagger/studios/StudioTagger.tsx
index 78553e518..ed9570431 100644
--- a/ui/v2.5/src/components/Tagger/studios/StudioTagger.tsx
+++ b/ui/v2.5/src/components/Tagger/studios/StudioTagger.tsx
@@ -28,6 +28,7 @@ import { apolloError } from "src/utils";
 import { faStar, faTags } from "@fortawesome/free-solid-svg-icons";
 import { ExternalLink } from "src/components/Shared/ExternalLink";
 import { mergeStudioStashIDs } from "../utils";
+import { separateNamesAndStashIds } from "src/utils/stashIds";
 import { useTaggerConfig } from "../config";
 
 type JobFragment = Pick<
@@ -242,7 +243,7 @@ const StudioBatchAddModal: React.FC<IStudioBatchAddModal> = ({
         as="textarea"
         ref={studioInput}
         placeholder={intl.formatMessage({
-          id: "studio_tagger.studio_names_separated_by_comma",
+          id: "studio_tagger.studio_names_or_stashids_separated_by_comma",
         })}
         rows={6}
       />
@@ -715,14 +716,17 @@ export const StudioTagger: React.FC<ITaggerProps> = ({ studios }) => {
 
   async function batchAdd(studioInput: string, createParent: boolean) {
     if (studioInput && selectedEndpoint) {
-      const names = studioInput
+      const inputs = studioInput
         .split(",")
         .map((n) => n.trim())
         .filter((n) => n.length > 0);
 
-      if (names.length > 0) {
+      const { names, stashIds } = separateNamesAndStashIds(inputs);
+
+      if (names.length > 0 || stashIds.length > 0) {
         const ret = await mutateStashBoxBatchStudioTag({
-          names: names,
+          names: names.length > 0 ? names : undefined,
+          stash_ids: stashIds.length > 0 ? stashIds : undefined,
           endpoint: selectedEndpointIndex,
           refresh: false,
           exclude_fields: config?.excludedStudioFields ?? [],
diff --git a/ui/v2.5/src/locales/en-GB.json b/ui/v2.5/src/locales/en-GB.json
index 89ec4984c..be50fc8da 100644
--- a/ui/v2.5/src/locales/en-GB.json
+++ b/ui/v2.5/src/locales/en-GB.json
@@ -1295,7 +1295,7 @@
     "no_results_found": "No results found.",
     "number_of_performers_will_be_processed": "{performer_count} performers will be processed",
     "performer_already_tagged": "Performer already tagged",
-    "performer_names_separated_by_comma": "Performer names separated by comma",
+    "performer_names_or_stashids_separated_by_comma": "Performer names or StashIDs separated by comma",
     "performer_selection": "Performer selection",
     "performer_successfully_tagged": "Performer successfully tagged:",
     "query_all_performers_in_the_database": "All performers in the database",
@@ -1510,7 +1510,7 @@
     "status_tagging_job_queued": "Status: Tagging job queued",
     "status_tagging_studios": "Status: Tagging studios",
     "studio_already_tagged": "Studio already tagged",
-    "studio_names_separated_by_comma": "Studio names separated by comma",
+    "studio_names_or_stashids_separated_by_comma": "Studio names or StashIDs separated by comma",
     "studio_selection": "Studio selection",
     "studio_successfully_tagged": "Studio successfully tagged",
     "tag_status": "Tag Status",
diff --git a/ui/v2.5/src/utils/stashIds.ts b/ui/v2.5/src/utils/stashIds.ts
index 289ce9c9d..f44b182ab 100644
--- a/ui/v2.5/src/utils/stashIds.ts
+++ b/ui/v2.5/src/utils/stashIds.ts
@@ -6,3 +6,29 @@ export const getStashIDs = (
     endpoint,
     updated_at,
   }));
+
+// UUID regex pattern to detect StashIDs (supports v4 and v7)
+const UUID_PATTERN =
+  /^[0-9a-f]{8}-[0-9a-f]{4}-[47][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
+
+/**
+ * Separates a list of inputs into names and StashIDs based on UUID pattern matching
+ * @param inputs - Array of strings that could be either names or StashIDs
+ * @returns Object containing separate arrays for names and stashIds
+ */
+export const separateNamesAndStashIds = (
+  inputs: string[]
+): { names: string[]; stashIds: string[] } => {
+  const names: string[] = [];
+  const stashIds: string[] = [];
+
+  inputs.forEach((input) => {
+    if (UUID_PATTERN.test(input)) {
+      stashIds.push(input);
+    } else {
+      names.push(input);
+    }
+  });
+
+  return { names, stashIds };
+};

From d1ee64d36f8373b47d96f4473592123331eeaecb Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Fri, 28 Nov 2025 13:51:20 +1100
Subject: [PATCH 174/405] Change show male performers option into list of
 gender checkboxes (#6321)

---
 ui/v2.5/src/components/Tagger/constants.ts    |  5 +--
 .../src/components/Tagger/scenes/Config.tsx   | 42 ++++++++++++++-----
 .../Tagger/scenes/StashSearchResult.tsx       | 14 +++----
 ui/v2.5/src/locales/en-GB.json                |  6 ++-
 ui/v2.5/src/utils/gender.ts                   | 11 ++++-
 5 files changed, 53 insertions(+), 25 deletions(-)

diff --git a/ui/v2.5/src/components/Tagger/constants.ts b/ui/v2.5/src/components/Tagger/constants.ts
index e519fb884..d499062aa 100644
--- a/ui/v2.5/src/components/Tagger/constants.ts
+++ b/ui/v2.5/src/components/Tagger/constants.ts
@@ -1,4 +1,4 @@
-import { ScraperSourceInput } from "src/core/generated-graphql";
+import { GenderEnum, ScraperSourceInput } from "src/core/generated-graphql";
 
 export const STASH_BOX_PREFIX = "stashbox:";
 export const SCRAPER_PREFIX = "scraper:";
@@ -27,7 +27,6 @@ export const DEFAULT_EXCLUDED_STUDIO_FIELDS = ["name"];
 
 export const initialConfig: ITaggerConfig = {
   blacklist: DEFAULT_BLACKLIST,
-  showMales: true,
   mode: "auto",
   setCoverImage: true,
   setTags: true,
@@ -43,7 +42,7 @@ export type ParseMode = "auto" | "filename" | "dir" | "path" | "metadata";
 export type TagOperation = "merge" | "overwrite";
 export interface ITaggerConfig {
   blacklist: string[];
-  showMales: boolean;
+  performerGenders?: GenderEnum[];
   mode: ParseMode;
   setCoverImage: boolean;
   setTags: boolean;
diff --git a/ui/v2.5/src/components/Tagger/scenes/Config.tsx b/ui/v2.5/src/components/Tagger/scenes/Config.tsx
index f15fbd250..5dd0e29d4 100644
--- a/ui/v2.5/src/components/Tagger/scenes/Config.tsx
+++ b/ui/v2.5/src/components/Tagger/scenes/Config.tsx
@@ -13,6 +13,8 @@ import { FormattedMessage, useIntl } from "react-intl";
 import { Icon } from "src/components/Shared/Icon";
 import { ParseMode, TagOperation } from "../constants";
 import { TaggerStateContext } from "../context";
+import { GenderEnum } from "src/core/generated-graphql";
+import { genderList } from "src/utils/gender";
 
 const Blacklist: React.FC<{
   list: string[];
@@ -118,6 +120,26 @@ const Config: React.FC<IConfigProps> = ({ show }) => {
   const { config, setConfig } = useContext(TaggerStateContext);
   const intl = useIntl();
 
+  function renderGenderCheckbox(gender: GenderEnum) {
+    const performerGenders = config.performerGenders || genderList.slice();
+    return (
+      <Form.Check
+        key={gender}
+        label={<FormattedMessage id={`gender_types.${gender}`} />}
+        checked={performerGenders.includes(gender)}
+        onChange={(e) => {
+          const isChecked = e.currentTarget.checked;
+          setConfig({
+            ...config,
+            performerGenders: isChecked
+              ? [...performerGenders, gender]
+              : performerGenders.filter((g) => g !== gender),
+          });
+        }}
+      />
+    );
+  }
+
   return (
     <Collapse in={show}>
       <Card>
@@ -127,18 +149,16 @@ const Config: React.FC<IConfigProps> = ({ show }) => {
           </h4>
           <hr className="w-100" />
           <Form className="col-md-6">
-            <Form.Group controlId="tag-males" className="align-items-center">
-              <Form.Check
-                label={
-                  <FormattedMessage id="component_tagger.config.show_male_label" />
-                }
-                checked={config.showMales}
-                onChange={(e) =>
-                  setConfig({ ...config, showMales: e.currentTarget.checked })
-                }
-              />
+            <Form.Group
+              controlId="performer-genders"
+              className="align-items-center"
+            >
+              <Form.Label>
+                <FormattedMessage id="component_tagger.config.performer_genders.heading" />
+              </Form.Label>
+              {genderList.map(renderGenderCheckbox)}
               <Form.Text>
-                <FormattedMessage id="component_tagger.config.show_male_desc" />
+                <FormattedMessage id="component_tagger.config.performer_genders.description" />
               </Form.Text>
             </Form.Group>
             <Form.Group controlId="set-cover" className="align-items-center">
diff --git a/ui/v2.5/src/components/Tagger/scenes/StashSearchResult.tsx b/ui/v2.5/src/components/Tagger/scenes/StashSearchResult.tsx
index a3429be9a..d9f05b875 100755
--- a/ui/v2.5/src/components/Tagger/scenes/StashSearchResult.tsx
+++ b/ui/v2.5/src/components/Tagger/scenes/StashSearchResult.tsx
@@ -21,7 +21,7 @@ import { TagSelect } from "src/components/Shared/Select";
 import { TruncatedText } from "src/components/Shared/TruncatedText";
 import { OperationButton } from "src/components/Shared/OperationButton";
 import * as FormUtils from "src/utils/form";
-import { stringToGender } from "src/utils/gender";
+import { genderList, stringToGender } from "src/utils/gender";
 import { IScrapedScene, TaggerStateContext } from "../context";
 import { OptionalField } from "../IncludeButton";
 import { SceneTaggerModalsState } from "./sceneTaggerModals";
@@ -237,17 +237,15 @@ const StashSearchResult: React.FC<IStashSearchResultProps> = ({
     saveScene,
   } = React.useContext(TaggerStateContext);
 
+  const performerGenders = config.performerGenders || genderList;
+
   const performers = useMemo(
     () =>
       scene.performers?.filter((p) => {
-        if (!config.showMales) {
-          return (
-            !p.gender || stringToGender(p.gender, true) !== GQL.GenderEnum.Male
-          );
-        }
-        return true;
+        const gender = p.gender ? stringToGender(p.gender, true) : undefined;
+        return !gender || performerGenders.includes(gender);
       }) ?? [],
-    [config, scene]
+    [scene, performerGenders]
   );
 
   const { createPerformerModal, createStudioModal } = React.useContext(
diff --git a/ui/v2.5/src/locales/en-GB.json b/ui/v2.5/src/locales/en-GB.json
index be50fc8da..37ef0d12b 100644
--- a/ui/v2.5/src/locales/en-GB.json
+++ b/ui/v2.5/src/locales/en-GB.json
@@ -190,6 +190,10 @@
       },
       "mark_organized_desc": "Immediately mark the scene as Organized after the Save button is clicked.",
       "mark_organized_label": "Mark as Organized on save",
+      "performer_genders": {
+        "heading": "Performer genders",
+        "description": "Performers with these genders will be shown when tagging scenes."
+      },
       "query_mode_auto": "Auto",
       "query_mode_auto_desc": "Uses metadata if present, or filename",
       "query_mode_dir": "Dir",
@@ -205,8 +209,6 @@
       "set_cover_label": "Set scene cover image",
       "set_tag_desc": "Attach tags to scene, either by overwriting or merging with existing tags on scene.",
       "set_tag_label": "Set tags",
-      "show_male_desc": "Toggle whether male performers will be available to tag.",
-      "show_male_label": "Show male performers",
       "source": "Source"
     },
     "noun_query": "Query",
diff --git a/ui/v2.5/src/utils/gender.ts b/ui/v2.5/src/utils/gender.ts
index 29502695c..09d3eddec 100644
--- a/ui/v2.5/src/utils/gender.ts
+++ b/ui/v2.5/src/utils/gender.ts
@@ -1,14 +1,23 @@
 import * as GQL from "../core/generated-graphql";
 
 export const stringGenderMap = new Map<string, GQL.GenderEnum>([
-  ["Male", GQL.GenderEnum.Male],
   ["Female", GQL.GenderEnum.Female],
+  ["Male", GQL.GenderEnum.Male],
   ["Transgender Male", GQL.GenderEnum.TransgenderMale],
   ["Transgender Female", GQL.GenderEnum.TransgenderFemale],
   ["Intersex", GQL.GenderEnum.Intersex],
   ["Non-Binary", GQL.GenderEnum.NonBinary],
 ]);
 
+export const genderList = [
+  GQL.GenderEnum.Female,
+  GQL.GenderEnum.Male,
+  GQL.GenderEnum.TransgenderFemale,
+  GQL.GenderEnum.TransgenderMale,
+  GQL.GenderEnum.Intersex,
+  GQL.GenderEnum.NonBinary,
+];
+
 export const genderToString = (value?: GQL.GenderEnum | string | null) => {
   if (!value) {
     return undefined;

From 1bc32a3099bb374d91316b89b2efaabef4609100 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Fri, 28 Nov 2025 13:52:30 +1100
Subject: [PATCH 175/405] Add sticky selection toolbar (#6320)

---
 .../components/List/FilteredListToolbar.tsx   | 101 ++++++++++++++----
 ui/v2.5/src/components/List/styles.scss       |  52 +++++++--
 2 files changed, 121 insertions(+), 32 deletions(-)

diff --git a/ui/v2.5/src/components/List/FilteredListToolbar.tsx b/ui/v2.5/src/components/List/FilteredListToolbar.tsx
index 24ef7b539..b3c0883a6 100644
--- a/ui/v2.5/src/components/List/FilteredListToolbar.tsx
+++ b/ui/v2.5/src/components/List/FilteredListToolbar.tsx
@@ -8,11 +8,47 @@ import {
   IListFilterOperation,
   ListOperationButtons,
 } from "./ListOperationButtons";
-import { ButtonGroup, ButtonToolbar } from "react-bootstrap";
+import { Button, ButtonGroup, ButtonToolbar } from "react-bootstrap";
 import { View } from "./views";
 import { IListSelect, useFilterOperations } from "./util";
 import { SavedFilterDropdown } from "./SavedFilterList";
 import { FilterButton } from "./Filters/FilterButton";
+import { Icon } from "../Shared/Icon";
+import { faTimes } from "@fortawesome/free-solid-svg-icons";
+import { faSquareCheck } from "@fortawesome/free-regular-svg-icons";
+import { useIntl } from "react-intl";
+import cx from "classnames";
+
+const SelectionSection: React.FC<{
+  filter: ListFilterModel;
+  selected: number;
+  onSelectAll: () => void;
+  onSelectNone: () => void;
+}> = ({ selected, onSelectAll, onSelectNone }) => {
+  const intl = useIntl();
+
+  return (
+    <div className="selected-items-info">
+      <Button
+        variant="secondary"
+        className="minimal"
+        onClick={() => onSelectNone()}
+        title={intl.formatMessage({ id: "actions.select_none" })}
+      >
+        <Icon icon={faTimes} />
+      </Button>
+      <span className="selected-count">{selected}</span>
+      <Button
+        variant="secondary"
+        className="minimal"
+        onClick={() => onSelectAll()}
+        title={intl.formatMessage({ id: "actions.select_all" })}
+      >
+        <Icon icon={faSquareCheck} />
+      </Button>
+    </div>
+  );
+};
 
 export interface IItemListOperation<T extends QueryResult> {
   text: string;
@@ -62,33 +98,54 @@ export const FilteredListToolbar: React.FC<IFilteredListToolbar> = ({
     setFilter,
   });
   const { selectedIds, onSelectAll, onSelectNone } = listSelect;
+  const hasSelection = selectedIds.size > 0;
 
   return (
-    <ButtonToolbar className="filtered-list-toolbar">
-      <SearchTermInput filter={filter} onFilterUpdate={setFilter} />
-
-      <ButtonGroup>
-        <SavedFilterDropdown
+    <ButtonToolbar
+      className={cx("filtered-list-toolbar", { "has-selection": hasSelection })}
+    >
+      {hasSelection ? (
+        <SelectionSection
           filter={filter}
-          onSetFilter={setFilter}
-          view={view}
+          selected={selectedIds.size}
+          onSelectAll={onSelectAll}
+          onSelectNone={onSelectNone}
         />
-        <FilterButton onClick={() => showEditFilter()} count={filter.count()} />
-      </ButtonGroup>
+      ) : (
+        <>
+          <SearchTermInput filter={filter} onFilterUpdate={setFilter} />
 
-      <SortBySelect
-        sortBy={filter.sortBy}
-        sortDirection={filter.sortDirection}
-        options={filterOptions.sortByOptions}
-        onChangeSortBy={(e) => setFilter(filter.setSortBy(e ?? undefined))}
-        onChangeSortDirection={() => setFilter(filter.toggleSortDirection())}
-        onReshuffleRandomSort={() => setFilter(filter.reshuffleRandomSort())}
-      />
+          <ButtonGroup>
+            <SavedFilterDropdown
+              filter={filter}
+              onSetFilter={setFilter}
+              view={view}
+            />
+            <FilterButton
+              onClick={() => showEditFilter()}
+              count={filter.count()}
+            />
+          </ButtonGroup>
 
-      <PageSizeSelector
-        pageSize={filter.itemsPerPage}
-        setPageSize={(size) => setFilter(filter.setPageSize(size))}
-      />
+          <SortBySelect
+            sortBy={filter.sortBy}
+            sortDirection={filter.sortDirection}
+            options={filterOptions.sortByOptions}
+            onChangeSortBy={(e) => setFilter(filter.setSortBy(e ?? undefined))}
+            onChangeSortDirection={() =>
+              setFilter(filter.toggleSortDirection())
+            }
+            onReshuffleRandomSort={() =>
+              setFilter(filter.reshuffleRandomSort())
+            }
+          />
+
+          <PageSizeSelector
+            pageSize={filter.itemsPerPage}
+            setPageSize={(size) => setFilter(filter.setPageSize(size))}
+          />
+        </>
+      )}
 
       <ListOperationButtons
         onSelectAll={onSelectAll}
diff --git a/ui/v2.5/src/components/List/styles.scss b/ui/v2.5/src/components/List/styles.scss
index 7ab99cfbb..60cf0c52f 100644
--- a/ui/v2.5/src/components/List/styles.scss
+++ b/ui/v2.5/src/components/List/styles.scss
@@ -918,9 +918,14 @@ input[type="range"].zoom-slider {
 
 .filtered-list-toolbar {
   align-items: center;
+  background-color: $body-bg;
   gap: 0.5rem;
   justify-content: center;
-  margin-bottom: 0.5rem;
+
+  // offset the main padding
+  margin-top: -0.5rem;
+  padding-bottom: 0.5rem;
+  padding-top: 0.5rem;
 
   & > .btn-group {
     flex-wrap: wrap;
@@ -1091,10 +1096,6 @@ input[type="range"].zoom-slider {
   &.filtered-list-toolbar {
     flex-wrap: nowrap;
     gap: 1rem;
-    // offset the main padding
-    margin-top: -0.5rem;
-    padding-bottom: 0.5rem;
-    padding-top: 0.5rem;
     position: sticky;
     top: $navbar-height;
     z-index: 10;
@@ -1141,11 +1142,6 @@ input[type="range"].zoom-slider {
         margin-right: 0.5rem;
       }
 
-      .selected-items-info {
-        align-items: center;
-        display: flex;
-      }
-
       > div:first-child,
       > div:last-child {
         flex: 1;
@@ -1433,3 +1429,39 @@ input[type="range"].zoom-slider {
 .duration-preset {
   cursor: pointer;
 }
+
+.selected-items-info {
+  align-items: center;
+  border: 1px solid $secondary;
+  display: flex;
+  gap: 0.25rem;
+  justify-content: flex-end;
+}
+
+.scene-list-toolbar .selected-items-info {
+  justify-content: flex-start;
+}
+
+.item-list-container > .filtered-list-toolbar.has-selection {
+  border-radius: 0.5rem;
+  margin-left: auto;
+  margin-right: auto;
+  padding-left: 0.5rem;
+  padding-right: 0.5rem;
+  position: sticky;
+  top: $navbar-height;
+  width: fit-content;
+  z-index: 10;
+
+  @include media-breakpoint-down(xs) {
+    top: 0;
+  }
+}
+
+.detail-body .filtered-list-toolbar.has-selection {
+  top: calc($sticky-detail-header-height + $navbar-height);
+
+  @include media-breakpoint-down(xs) {
+    top: 0;
+  }
+}

From 0ca416f75af847a24b5de154323d89a1587368ea Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Fri, 28 Nov 2025 13:54:21 +1100
Subject: [PATCH 176/405] Ignore empty alias in studio partial (#6338)

---
 pkg/models/model_scraped_item.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/models/model_scraped_item.go b/pkg/models/model_scraped_item.go
index d4e849e11..570f6034b 100644
--- a/pkg/models/model_scraped_item.go
+++ b/pkg/models/model_scraped_item.go
@@ -124,7 +124,7 @@ func (s *ScrapedStudio) ToPartial(id string, endpoint string, excluded map[strin
 		ret.Details = NewOptionalString(strings.TrimSpace(*s.Details))
 	}
 
-	if s.Aliases != nil && !excluded["aliases"] {
+	if s.Aliases != nil && *s.Aliases != "" && !excluded["aliases"] {
 		ret.Aliases = &UpdateStrings{
 			Values: stringslice.TrimSpace(stringslice.FromString(*s.Aliases, ",")),
 			Mode:   RelationshipUpdateModeSet,

From de8139cf1b2f818320dcbd3c3156ec0ed8bd82e6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Nov 2025 14:05:19 +1100
Subject: [PATCH 177/405] Bump golang.org/x/crypto from 0.38.0 to 0.45.0
 (#6300)

Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.38.0 to 0.45.0.
- [Commits](https://github.com/golang/crypto/compare/v0.38.0...v0.45.0)

---
updated-dependencies:
- dependency-name: golang.org/x/crypto
  dependency-version: 0.45.0
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 go.mod | 16 ++++++++--------
 go.sum | 32 ++++++++++++++++----------------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/go.mod b/go.mod
index 4d6b78dc6..0cf02fa0d 100644
--- a/go.mod
+++ b/go.mod
@@ -55,12 +55,12 @@ require (
 	github.com/vektra/mockery/v2 v2.10.0
 	github.com/xWTF/chardet v0.0.0-20230208095535-c780f2ac244e
 	github.com/zencoder/go-dash/v3 v3.0.2
-	golang.org/x/crypto v0.38.0
+	golang.org/x/crypto v0.45.0
 	golang.org/x/image v0.18.0
-	golang.org/x/net v0.40.0
-	golang.org/x/sys v0.33.0
-	golang.org/x/term v0.32.0
-	golang.org/x/text v0.25.0
+	golang.org/x/net v0.47.0
+	golang.org/x/sys v0.38.0
+	golang.org/x/term v0.37.0
+	golang.org/x/text v0.31.0
 	golang.org/x/time v0.10.0
 	gopkg.in/guregu/null.v4 v4.0.0
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1
@@ -121,9 +121,9 @@ require (
 	github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
 	go.uber.org/atomic v1.11.0 // indirect
 	go.yaml.in/yaml/v3 v3.0.3 // indirect
-	golang.org/x/mod v0.24.0 // indirect
-	golang.org/x/sync v0.14.0 // indirect
-	golang.org/x/tools v0.33.0 // indirect
+	golang.org/x/mod v0.29.0 // indirect
+	golang.org/x/sync v0.18.0 // indirect
+	golang.org/x/tools v0.38.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
diff --git a/go.sum b/go.sum
index bc84b1f23..fc731b705 100644
--- a/go.sum
+++ b/go.sum
@@ -664,8 +664,8 @@ golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5y
 golang.org/x/crypto v0.0.0-20211215165025-cf75a172585e/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=
 golang.org/x/crypto v0.0.0-20220112180741-5e0467b6c7ce/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.38.0 h1:jt+WWG8IZlBnVbomuhg2Mdq0+BBQaHbtqHEFEigjUV8=
-golang.org/x/crypto v0.38.0/go.mod h1:MvrbAqul58NNYPKnOra203SB9vpuZW0e+RRZV+Ggqjw=
+golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q=
+golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -707,8 +707,8 @@ golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
 golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU=
-golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
+golang.org/x/mod v0.29.0 h1:HV8lRxZC4l2cr3Zq1LvtOsi/ThTgWnUk/y64QSs8GwA=
+golang.org/x/mod v0.29.0/go.mod h1:NyhrlYXJ2H4eJiRy/WDBO6HMqZQ6q9nk4JzS3NuCK+w=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -758,8 +758,8 @@ golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qx
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws=
-golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY=
-golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds=
+golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY=
+golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -789,8 +789,8 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.14.0 h1:woo0S4Yywslg6hp4eUFjTVOyKt0RookbpAHG4c1HmhQ=
-golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
+golang.org/x/sync v0.18.0 h1:kr88TuHDroi+UVf+0hZnirlk8o8T+4MrK6mr60WkH/I=
+golang.org/x/sync v0.18.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -872,13 +872,13 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
-golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
+golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ=
-golang.org/x/term v0.32.0 h1:DR4lr0TjUs3epypdhTOkMmuF5CDFJ/8pOnbzMZPQ7bg=
-golang.org/x/term v0.32.0/go.mod h1:uZG1FhGx848Sqfsq4/DlJr3xGGsYMu/L5GW4abiaEPQ=
+golang.org/x/term v0.37.0 h1:8EGAD0qCmHYZg6J17DvsMy9/wJ7/D/4pV/wfnld5lTU=
+golang.org/x/term v0.37.0/go.mod h1:5pB4lxRNYYVZuTLmy8oR2BH8dflOR+IbTYFD8fi3254=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -890,8 +890,8 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
-golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
+golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
+golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -956,8 +956,8 @@ golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo=
 golang.org/x/tools v0.1.8/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.33.0 h1:4qz2S3zmRxbGIhDIAgjxvFutSvH5EfnsYrRBj0UI0bc=
-golang.org/x/tools v0.33.0/go.mod h1:CIJMaWEY88juyUfo7UbgPqbC8rU2OqfAV1h2Qp0oMYI=
+golang.org/x/tools v0.38.0 h1:Hx2Xv8hISq8Lm16jvBZ2VQf+RLmbd7wVUsALibYI/IQ=
+golang.org/x/tools v0.38.0/go.mod h1:yEsQ/d/YK8cjh0L6rZlY8tgtlKiBNTL14pGDJPJpYQs=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

From c6ae43c1d696b048350edbf7442f9c7c7c855d02 Mon Sep 17 00:00:00 2001
From: Gykes <24581046+Gykes@users.noreply.github.com>
Date: Thu, 27 Nov 2025 22:00:23 -0600
Subject: [PATCH 178/405] Feature Request: Vips  AVIF Support (#6337)

---
 pkg/image/thumbnail.go | 16 ++++++++++++----
 pkg/image/vips.go      | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/pkg/image/thumbnail.go b/pkg/image/thumbnail.go
index e63ada41b..d0fba0f60 100644
--- a/pkg/image/thumbnail.go
+++ b/pkg/image/thumbnail.go
@@ -96,10 +96,14 @@ func (e *ThumbnailEncoder) GetThumbnail(f models.File, maxSize int) ([]byte, err
 
 		// AVIF cannot be read from stdin, must use file path
 		// AVIF in zip files is not supported
+		// Note: No Windows check needed here since we use file path, not stdin
 		if format == "avif" {
 			if f.Base().ZipFileID != nil {
 				return nil, fmt.Errorf("%w: AVIF in zip file", ErrNotSupportedForThumbnail)
 			}
+			if e.vips != nil {
+				return e.vips.ImageThumbnailPath(f.Base().Path, maxSize)
+			}
 			return e.ffmpegImageThumbnailPath(f.Base().Path, maxSize)
 		}
 	}
@@ -110,11 +114,15 @@ func (e *ThumbnailEncoder) GetThumbnail(f models.File, maxSize int) ([]byte, err
 	}
 
 	// vips has issues loading files from stdin on Windows
-	if e.vips != nil && runtime.GOOS != "windows" {
-		return e.vips.ImageThumbnail(buf, maxSize)
-	} else {
-		return e.ffmpegImageThumbnail(buf, maxSize)
+	if e.vips != nil {
+		if runtime.GOOS == "windows" && f.Base().ZipFileID == nil {
+			return e.vips.ImageThumbnailPath(f.Base().Path, maxSize)
+		}
+		if runtime.GOOS != "windows" {
+			return e.vips.ImageThumbnail(buf, maxSize)
+		}
 	}
+	return e.ffmpegImageThumbnail(buf, maxSize)
 }
 
 // GetPreview returns the preview clip of the provided image clip resized to
diff --git a/pkg/image/vips.go b/pkg/image/vips.go
index 39809dc18..0a0350aa8 100644
--- a/pkg/image/vips.go
+++ b/pkg/image/vips.go
@@ -24,6 +24,38 @@ func (e *vipsEncoder) ImageThumbnail(image *bytes.Buffer, maxSize int) ([]byte,
 	return []byte(data), err
 }
 
+// ImageThumbnailPath generates a thumbnail from a file path instead of stdin.
+// This is required for formats like AVIF that need random file access (seeking)
+// which stdin cannot provide.
+func (e *vipsEncoder) ImageThumbnailPath(path string, maxSize int) ([]byte, error) {
+	// vips thumbnail syntax: thumbnail input output width [options]
+	// Using .jpg[Q=70,strip] as output writes to stdout
+	args := []string{
+		"thumbnail",
+		path,
+		".jpg[Q=70,strip]",
+		fmt.Sprint(maxSize),
+		"--size", "down",
+	}
+
+	cmd := exec.Command(string(*e), args...)
+
+	var stdout, stderr bytes.Buffer
+	cmd.Stdout = &stdout
+	cmd.Stderr = &stderr
+
+	if err := cmd.Start(); err != nil {
+		return nil, err
+	}
+
+	if err := cmd.Wait(); err != nil {
+		logger.Errorf("image encoder error when running command <%s>: %s", strings.Join(cmd.Args, " "), stderr.String())
+		return nil, err
+	}
+
+	return stdout.Bytes(), nil
+}
+
 func (e *vipsEncoder) run(args []string, stdin *bytes.Buffer) (string, error) {
 	cmd := exec.Command(string(*e), args...)
 

From 84e24eb6124623620749feb5f309095c815864a7 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Tue, 2 Dec 2025 12:49:44 +1100
Subject: [PATCH 179/405] Refactor scraping to include related object fields
 (#6266)

* Refactor scraper post-processing and process related objects consistently
* Refactor image processing
* Scrape related studio fields consistently
* Don't set image on related objects
---
 pkg/scraper/cache.go          |  25 +-
 pkg/scraper/image.go          |  81 ++---
 pkg/scraper/postprocessing.go | 593 +++++++++++++++++++---------------
 3 files changed, 362 insertions(+), 337 deletions(-)

diff --git a/pkg/scraper/cache.go b/pkg/scraper/cache.go
index d2c3bd5d9..5cc51ac54 100644
--- a/pkg/scraper/cache.go
+++ b/pkg/scraper/cache.go
@@ -16,7 +16,6 @@ import (
 	"github.com/stashapp/stash/pkg/logger"
 	"github.com/stashapp/stash/pkg/match"
 	"github.com/stashapp/stash/pkg/models"
-	"github.com/stashapp/stash/pkg/sliceutil"
 	"github.com/stashapp/stash/pkg/txn"
 )
 
@@ -262,19 +261,23 @@ func (c Cache) ScrapeName(ctx context.Context, id, query string, ty ScrapeConten
 		return nil, fmt.Errorf("error while name scraping with scraper %s: %w", id, err)
 	}
 
-	ignoredRegex := c.compileExcludeTagPatterns()
-
-	var ignoredTags []string
-	for i, cc := range content {
-		var thisIgnoredTags []string
-		content[i], thisIgnoredTags, err = c.postScrape(ctx, cc, ignoredRegex)
-		if err != nil {
-			return nil, fmt.Errorf("error while post-scraping with scraper %s: %w", id, err)
+	pp := postScraper{
+		Cache:        c,
+		excludeTagRE: c.compileExcludeTagPatterns(),
+	}
+	if err := c.repository.WithReadTxn(ctx, func(ctx context.Context) error {
+		for i, cc := range content {
+			content[i], err = pp.postScrape(ctx, cc)
+			if err != nil {
+				return fmt.Errorf("error while post-scraping with scraper %s: %w", id, err)
+			}
 		}
-		ignoredTags = sliceutil.AppendUniques(ignoredTags, thisIgnoredTags)
+		return nil
+	}); err != nil {
+		return nil, err
 	}
 
-	LogIgnoredTags(ignoredTags)
+	LogIgnoredTags(pp.ignoredTags)
 
 	return content, nil
 }
diff --git a/pkg/scraper/image.go b/pkg/scraper/image.go
index 93ed7a037..87f114668 100644
--- a/pkg/scraper/image.go
+++ b/pkg/scraper/image.go
@@ -37,88 +37,43 @@ func setPerformerImage(ctx context.Context, client *http.Client, p *models.Scrap
 	return nil
 }
 
-func setSceneImage(ctx context.Context, client *http.Client, s *models.ScrapedScene, globalConfig GlobalConfig) error {
-	// don't try to get the image if it doesn't appear to be a URL
-	if s.Image == nil || !strings.HasPrefix(*s.Image, "http") {
+func setStudioImage(ctx context.Context, client *http.Client, p *models.ScrapedStudio, globalConfig GlobalConfig) error {
+	// backwards compatibility: we fetch the image if it's a URL and set it to the first image
+	// Image is deprecated, so only do this if Images is unset
+	if p.Image == nil || len(p.Images) > 0 {
 		// nothing to do
 		return nil
 	}
 
-	img, err := getImage(ctx, *s.Image, client, globalConfig)
+	// don't try to get the image if it doesn't appear to be a URL
+	if !strings.HasPrefix(*p.Image, "http") {
+		p.Images = []string{*p.Image}
+		return nil
+	}
+
+	img, err := getImage(ctx, *p.Image, client, globalConfig)
 	if err != nil {
 		return err
 	}
 
-	s.Image = img
+	p.Image = img
+	// Image is deprecated. Use images instead
+	p.Images = []string{*img}
 
 	return nil
 }
 
-func setMovieFrontImage(ctx context.Context, client *http.Client, m *models.ScrapedMovie, globalConfig GlobalConfig) error {
-	// don't try to get the image if it doesn't appear to be a URL
-	if m.FrontImage == nil || !strings.HasPrefix(*m.FrontImage, "http") {
-		// nothing to do
+func processImageField(ctx context.Context, imageField *string, client *http.Client, globalConfig GlobalConfig) error {
+	if imageField == nil {
 		return nil
 	}
 
-	img, err := getImage(ctx, *m.FrontImage, client, globalConfig)
+	img, err := getImage(ctx, *imageField, client, globalConfig)
 	if err != nil {
 		return err
 	}
 
-	m.FrontImage = img
-
-	return nil
-}
-
-func setMovieBackImage(ctx context.Context, client *http.Client, m *models.ScrapedMovie, globalConfig GlobalConfig) error {
-	// don't try to get the image if it doesn't appear to be a URL
-	if m.BackImage == nil || !strings.HasPrefix(*m.BackImage, "http") {
-		// nothing to do
-		return nil
-	}
-
-	img, err := getImage(ctx, *m.BackImage, client, globalConfig)
-	if err != nil {
-		return err
-	}
-
-	m.BackImage = img
-
-	return nil
-}
-
-func setGroupFrontImage(ctx context.Context, client *http.Client, m *models.ScrapedGroup, globalConfig GlobalConfig) error {
-	// don't try to get the image if it doesn't appear to be a URL
-	if m.FrontImage == nil || !strings.HasPrefix(*m.FrontImage, "http") {
-		// nothing to do
-		return nil
-	}
-
-	img, err := getImage(ctx, *m.FrontImage, client, globalConfig)
-	if err != nil {
-		return err
-	}
-
-	m.FrontImage = img
-
-	return nil
-}
-
-func setGroupBackImage(ctx context.Context, client *http.Client, m *models.ScrapedGroup, globalConfig GlobalConfig) error {
-	// don't try to get the image if it doesn't appear to be a URL
-	if m.BackImage == nil || !strings.HasPrefix(*m.BackImage, "http") {
-		// nothing to do
-		return nil
-	}
-
-	img, err := getImage(ctx, *m.BackImage, client, globalConfig)
-	if err != nil {
-		return err
-	}
-
-	m.BackImage = img
-
+	*imageField = *img
 	return nil
 }
 
diff --git a/pkg/scraper/postprocessing.go b/pkg/scraper/postprocessing.go
index 62aa53c72..c2653743a 100644
--- a/pkg/scraper/postprocessing.go
+++ b/pkg/scraper/postprocessing.go
@@ -11,85 +11,91 @@ import (
 	"github.com/stashapp/stash/pkg/utils"
 )
 
+type postScraper struct {
+	Cache
+	excludeTagRE []*regexp.Regexp
+
+	// ignoredTags is a list of tags that were ignored during post-processing
+	ignoredTags []string
+}
+
 // postScrape handles post-processing of scraped content. If the content
 // requires post-processing, this function fans out to the given content
 // type and post-processes it.
-func (c Cache) postScrape(ctx context.Context, content ScrapedContent, excludeTagRE []*regexp.Regexp) (_ ScrapedContent, ignoredTags []string, err error) {
+// Assumes called within a read transaction.
+func (c *postScraper) postScrape(ctx context.Context, content ScrapedContent) (_ ScrapedContent, err error) {
+	const related = false
+
 	// Analyze the concrete type, call the right post-processing function
 	switch v := content.(type) {
 	case *models.ScrapedPerformer:
 		if v != nil {
-			return c.postScrapePerformer(ctx, *v, excludeTagRE)
+			return c.postScrapePerformer(ctx, *v, related)
 		}
 	case models.ScrapedPerformer:
-		return c.postScrapePerformer(ctx, v, excludeTagRE)
+		return c.postScrapePerformer(ctx, v, related)
 	case *models.ScrapedScene:
 		if v != nil {
-			return c.postScrapeScene(ctx, *v, excludeTagRE)
+			return c.postScrapeScene(ctx, *v)
 		}
 	case models.ScrapedScene:
-		return c.postScrapeScene(ctx, v, excludeTagRE)
+		return c.postScrapeScene(ctx, v)
 	case *models.ScrapedGallery:
 		if v != nil {
-			return c.postScrapeGallery(ctx, *v, excludeTagRE)
+			return c.postScrapeGallery(ctx, *v)
 		}
 	case models.ScrapedGallery:
-		return c.postScrapeGallery(ctx, v, excludeTagRE)
+		return c.postScrapeGallery(ctx, v)
 	case *models.ScrapedImage:
 		if v != nil {
-			return c.postScrapeImage(ctx, *v, excludeTagRE)
+			return c.postScrapeImage(ctx, *v)
 		}
 	case models.ScrapedImage:
-		return c.postScrapeImage(ctx, v, excludeTagRE)
+		return c.postScrapeImage(ctx, v)
 	case *models.ScrapedMovie:
 		if v != nil {
-			return c.postScrapeMovie(ctx, *v, excludeTagRE)
+			return c.postScrapeMovie(ctx, *v, related)
 		}
 	case models.ScrapedMovie:
-		return c.postScrapeMovie(ctx, v, excludeTagRE)
+		return c.postScrapeMovie(ctx, v, related)
 	case *models.ScrapedGroup:
 		if v != nil {
-			return c.postScrapeGroup(ctx, *v, excludeTagRE)
+			return c.postScrapeGroup(ctx, *v, related)
 		}
 	case models.ScrapedGroup:
-		return c.postScrapeGroup(ctx, v, excludeTagRE)
+		return c.postScrapeGroup(ctx, v, related)
 	}
 
 	// If nothing matches, pass the content through
-	return content, nil, nil
+	return content, nil
 }
 
-// postScrapeSingle handles post-processing of a single scraped content item.
-// This is a convenience function that includes logging the ignored tags, as opposed to logging them in the caller.
-func (c Cache) postScrapeSingle(ctx context.Context, content ScrapedContent) (ScrapedContent, error) {
-	ret, ignoredTags, err := c.postScrape(ctx, content, c.compileExcludeTagPatterns())
+func (c *postScraper) filterTags(tags []*models.ScrapedTag) []*models.ScrapedTag {
+	var ret []*models.ScrapedTag
+	var thisIgnoredTags []string
+	ret, thisIgnoredTags = FilterTags(c.excludeTagRE, tags)
+	c.ignoredTags = sliceutil.AppendUniques(c.ignoredTags, thisIgnoredTags)
+
+	return ret
+}
+
+func (c *postScraper) postScrapePerformer(ctx context.Context, p models.ScrapedPerformer, related bool) (_ ScrapedContent, err error) {
+	r := c.repository
+	tqb := r.TagFinder
+
+	tags, err := postProcessTags(ctx, tqb, p.Tags)
 	if err != nil {
 		return nil, err
 	}
 
-	LogIgnoredTags(ignoredTags)
-	return ret, nil
-}
-
-func (c Cache) postScrapePerformer(ctx context.Context, p models.ScrapedPerformer, excludeTagRE []*regexp.Regexp) (_ ScrapedContent, ignoredTags []string, err error) {
-	r := c.repository
-	if err := r.WithReadTxn(ctx, func(ctx context.Context) error {
-		tqb := r.TagFinder
-
-		tags, err := postProcessTags(ctx, tqb, p.Tags)
-		if err != nil {
-			return err
-		}
-		p.Tags, ignoredTags = FilterTags(excludeTagRE, tags)
-
-		return nil
-	}); err != nil {
-		return nil, nil, err
-	}
+	p.Tags = c.filterTags(tags)
 
 	// post-process - set the image if applicable
-	if err := setPerformerImage(ctx, c.client, &p, c.globalConfig); err != nil {
-		logger.Warnf("Could not set image using URL %s: %s", *p.Image, err.Error())
+	// don't set image for related performers to avoid excessive network calls
+	if !related {
+		if err := setPerformerImage(ctx, c.client, &p, c.globalConfig); err != nil {
+			logger.Warnf("Could not set image using URL %s: %s", *p.Image, err.Error())
+		}
 	}
 
 	p.Country = resolveCountryName(p.Country)
@@ -119,119 +125,224 @@ func (c Cache) postScrapePerformer(ctx context.Context, p models.ScrapedPerforme
 		}
 	}
 
-	return p, ignoredTags, nil
+	return p, nil
 }
 
-func (c Cache) postScrapeMovie(ctx context.Context, m models.ScrapedMovie, excludeTagRE []*regexp.Regexp) (_ ScrapedContent, ignoredTags []string, err error) {
+func (c *postScraper) postScrapeMovie(ctx context.Context, m models.ScrapedMovie, related bool) (_ ScrapedContent, err error) {
 	r := c.repository
-	if err := r.WithReadTxn(ctx, func(ctx context.Context) error {
-		tqb := r.TagFinder
-		tags, err := postProcessTags(ctx, tqb, m.Tags)
-		if err != nil {
-			return err
-		}
-		m.Tags, ignoredTags = FilterTags(excludeTagRE, tags)
-
-		if m.Studio != nil {
-			if err := match.ScrapedStudio(ctx, r.StudioFinder, m.Studio, ""); err != nil {
-				return err
-			}
-		}
-
-		return nil
-	}); err != nil {
-		return nil, nil, err
-	}
-
-	// populate URL/URLs
-	// if URLs are provided, only use those
-	if len(m.URLs) > 0 {
-		m.URL = &m.URLs[0]
-	} else {
-		urls := []string{}
-		if m.URL != nil {
-			urls = append(urls, *m.URL)
-		}
-
-		if len(urls) > 0 {
-			m.URLs = urls
-		}
-	}
-
-	// post-process - set the image if applicable
-	if err := setMovieFrontImage(ctx, c.client, &m, c.globalConfig); err != nil {
-		logger.Warnf("could not set front image using URL %s: %v", *m.FrontImage, err)
-	}
-	if err := setMovieBackImage(ctx, c.client, &m, c.globalConfig); err != nil {
-		logger.Warnf("could not set back image using URL %s: %v", *m.BackImage, err)
-	}
-
-	return m, ignoredTags, nil
-}
-
-func (c Cache) postScrapeGroup(ctx context.Context, m models.ScrapedGroup, excludeTagRE []*regexp.Regexp) (_ ScrapedContent, ignoredTags []string, err error) {
-	r := c.repository
-	if err := r.WithReadTxn(ctx, func(ctx context.Context) error {
-		tqb := r.TagFinder
-		tags, err := postProcessTags(ctx, tqb, m.Tags)
-		if err != nil {
-			return err
-		}
-		m.Tags, ignoredTags = FilterTags(excludeTagRE, tags)
-
-		if m.Studio != nil {
-			if err := match.ScrapedStudio(ctx, r.StudioFinder, m.Studio, ""); err != nil {
-				return err
-			}
-		}
-
-		return nil
-	}); err != nil {
-		return nil, nil, err
-	}
-
-	// populate URL/URLs
-	// if URLs are provided, only use those
-	if len(m.URLs) > 0 {
-		m.URL = &m.URLs[0]
-	} else {
-		urls := []string{}
-		if m.URL != nil {
-			urls = append(urls, *m.URL)
-		}
-
-		if len(urls) > 0 {
-			m.URLs = urls
-		}
-	}
-
-	// post-process - set the image if applicable
-	if err := setGroupFrontImage(ctx, c.client, &m, c.globalConfig); err != nil {
-		logger.Warnf("could not set front image using URL %s: %v", *m.FrontImage, err)
-	}
-	if err := setGroupBackImage(ctx, c.client, &m, c.globalConfig); err != nil {
-		logger.Warnf("could not set back image using URL %s: %v", *m.BackImage, err)
-	}
-
-	return m, ignoredTags, nil
-}
-
-func (c Cache) postScrapeScenePerformer(ctx context.Context, p models.ScrapedPerformer, excludeTagRE []*regexp.Regexp) (ignoredTags []string, err error) {
-	tqb := c.repository.TagFinder
-
-	tags, err := postProcessTags(ctx, tqb, p.Tags)
+	tqb := r.TagFinder
+	tags, err := postProcessTags(ctx, tqb, m.Tags)
 	if err != nil {
 		return nil, err
 	}
-	p.Tags = tags
-	p.Tags, ignoredTags = FilterTags(excludeTagRE, tags)
+	m.Tags = c.filterTags(tags)
 
-	p.Country = resolveCountryName(p.Country)
+	if m.Studio != nil {
+		if err := match.ScrapedStudio(ctx, r.StudioFinder, m.Studio, ""); err != nil {
+			return nil, err
+		}
+	}
 
-	return ignoredTags, nil
+	// populate URL/URLs
+	// if URLs are provided, only use those
+	if len(m.URLs) > 0 {
+		m.URL = &m.URLs[0]
+	} else {
+		urls := []string{}
+		if m.URL != nil {
+			urls = append(urls, *m.URL)
+		}
+
+		if len(urls) > 0 {
+			m.URLs = urls
+		}
+	}
+
+	// post-process - set the image if applicable
+	// don't set images for related movies to avoid excessive network calls
+	if !related {
+		if err := processImageField(ctx, m.FrontImage, c.client, c.globalConfig); err != nil {
+			logger.Warnf("could not set front image using URL %s: %v", *m.FrontImage, err)
+		}
+		if err := processImageField(ctx, m.BackImage, c.client, c.globalConfig); err != nil {
+			logger.Warnf("could not set back image using URL %s: %v", *m.BackImage, err)
+		}
+	}
+
+	return m, nil
 }
 
-func (c Cache) postScrapeScene(ctx context.Context, scene models.ScrapedScene, excludeTagRE []*regexp.Regexp) (_ ScrapedContent, ignoredTags []string, err error) {
+func (c *postScraper) postScrapeGroup(ctx context.Context, m models.ScrapedGroup, related bool) (_ ScrapedContent, err error) {
+	r := c.repository
+	tqb := r.TagFinder
+	tags, err := postProcessTags(ctx, tqb, m.Tags)
+	if err != nil {
+		return nil, err
+	}
+	m.Tags = c.filterTags(tags)
+
+	if m.Studio != nil {
+		if err := match.ScrapedStudio(ctx, r.StudioFinder, m.Studio, ""); err != nil {
+			return nil, err
+		}
+	}
+
+	// populate URL/URLs
+	// if URLs are provided, only use those
+	if len(m.URLs) > 0 {
+		m.URL = &m.URLs[0]
+	} else {
+		urls := []string{}
+		if m.URL != nil {
+			urls = append(urls, *m.URL)
+		}
+
+		if len(urls) > 0 {
+			m.URLs = urls
+		}
+	}
+
+	// post-process - set the image if applicable
+	// don't set images for related groups to avoid excessive network calls
+	if !related {
+		if err := processImageField(ctx, m.FrontImage, c.client, c.globalConfig); err != nil {
+			logger.Warnf("could not set front image using URL %s: %v", *m.FrontImage, err)
+		}
+		if err := processImageField(ctx, m.BackImage, c.client, c.globalConfig); err != nil {
+			logger.Warnf("could not set back image using URL %s: %v", *m.BackImage, err)
+		}
+	}
+
+	return m, nil
+}
+
+// postScrapeRelatedPerformers post-processes a list of performers.
+// It modifies the performers in place.
+func (c *postScraper) postScrapeRelatedPerformers(ctx context.Context, items []*models.ScrapedPerformer) error {
+	for _, p := range items {
+		if p == nil {
+			continue
+		}
+
+		const related = true
+		sc, err := c.postScrapePerformer(ctx, *p, related)
+		if err != nil {
+			return err
+		}
+		newP := sc.(models.ScrapedPerformer)
+		*p = newP
+
+		if err := match.ScrapedPerformer(ctx, c.repository.PerformerFinder, p, ""); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func (c *postScraper) postScrapeRelatedMovies(ctx context.Context, items []*models.ScrapedMovie) error {
+	for _, p := range items {
+		const related = true
+		sc, err := c.postScrapeMovie(ctx, *p, related)
+		if err != nil {
+			return err
+		}
+		newP := sc.(models.ScrapedMovie)
+		*p = newP
+
+		matchedID, err := match.ScrapedGroup(ctx, c.repository.GroupFinder, p.StoredID, p.Name)
+		if err != nil {
+			return err
+		}
+
+		if matchedID != nil {
+			p.StoredID = matchedID
+		}
+	}
+
+	return nil
+}
+
+func (c *postScraper) postScrapeRelatedGroups(ctx context.Context, items []*models.ScrapedGroup) error {
+	for _, p := range items {
+		const related = true
+		sc, err := c.postScrapeGroup(ctx, *p, related)
+		if err != nil {
+			return err
+		}
+		newP := sc.(models.ScrapedGroup)
+		*p = newP
+
+		matchedID, err := match.ScrapedGroup(ctx, c.repository.GroupFinder, p.StoredID, p.Name)
+		if err != nil {
+			return err
+		}
+
+		if matchedID != nil {
+			p.StoredID = matchedID
+		}
+	}
+
+	return nil
+}
+
+func (c *postScraper) postScrapeStudio(ctx context.Context, s models.ScrapedStudio, related bool) (_ ScrapedContent, err error) {
+	r := c.repository
+	tqb := r.TagFinder
+
+	tags, err := postProcessTags(ctx, tqb, s.Tags)
+	if err != nil {
+		return nil, err
+	}
+
+	s.Tags = c.filterTags(tags)
+
+	// post-process - set the image if applicable
+	// don't set image for related studios to avoid excessive network calls
+	if !related {
+		if err := setStudioImage(ctx, c.client, &s, c.globalConfig); err != nil {
+			logger.Warnf("Could not set image using URL %s: %s", *s.Image, err.Error())
+		}
+	}
+
+	// populate URL/URLs
+	// if URLs are provided, only use those
+	if len(s.URLs) > 0 {
+		s.URL = &s.URLs[0]
+	} else {
+		urls := []string{}
+		if s.URL != nil {
+			urls = append(urls, *s.URL)
+		}
+
+		if len(urls) > 0 {
+			s.URLs = urls
+		}
+	}
+
+	return s, nil
+}
+
+func (c *postScraper) postScrapeRelatedStudio(ctx context.Context, s *models.ScrapedStudio) error {
+	if s == nil {
+		return nil
+	}
+
+	const related = true
+	sc, err := c.postScrapeStudio(ctx, *s, related)
+	if err != nil {
+		return err
+	}
+	newS := sc.(models.ScrapedStudio)
+	*s = newS
+
+	if err = match.ScrapedStudio(ctx, c.repository.StudioFinder, s, ""); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (c *postScraper) postScrapeScene(ctx context.Context, scene models.ScrapedScene) (_ ScrapedContent, err error) {
 	// set the URL/URLs field
 	if scene.URL == nil && len(scene.URLs) > 0 {
 		scene.URL = &scene.URLs[0]
@@ -241,92 +352,53 @@ func (c Cache) postScrapeScene(ctx context.Context, scene models.ScrapedScene, e
 	}
 
 	r := c.repository
-	if err := r.WithReadTxn(ctx, func(ctx context.Context) error {
-		pqb := r.PerformerFinder
-		gqb := r.GroupFinder
-		tqb := r.TagFinder
-		sqb := r.StudioFinder
+	tqb := r.TagFinder
 
-		for _, p := range scene.Performers {
-			if p == nil {
-				continue
-			}
+	if err = c.postScrapeRelatedPerformers(ctx, scene.Performers); err != nil {
+		return nil, err
+	}
 
-			thisIgnoredTags, err := c.postScrapeScenePerformer(ctx, *p, excludeTagRE)
-			if err != nil {
-				return err
-			}
+	if err = c.postScrapeRelatedMovies(ctx, scene.Movies); err != nil {
+		return nil, err
+	}
 
-			if err := match.ScrapedPerformer(ctx, pqb, p, ""); err != nil {
-				return err
-			}
+	if err = c.postScrapeRelatedGroups(ctx, scene.Groups); err != nil {
+		return nil, err
+	}
 
-			ignoredTags = sliceutil.AppendUniques(ignoredTags, thisIgnoredTags)
+	// HACK - if movies was returned but not groups, add the groups from the movies
+	// if groups was returned but not movies, add the movies from the groups for backward compatibility
+	if len(scene.Movies) > 0 && len(scene.Groups) == 0 {
+		for _, m := range scene.Movies {
+			g := m.ScrapedGroup()
+			scene.Groups = append(scene.Groups, &g)
 		}
-
-		for _, p := range scene.Movies {
-			matchedID, err := match.ScrapedGroup(ctx, gqb, p.StoredID, p.Name)
-			if err != nil {
-				return err
-			}
-
-			if matchedID != nil {
-				p.StoredID = matchedID
-			}
+	} else if len(scene.Groups) > 0 && len(scene.Movies) == 0 {
+		for _, g := range scene.Groups {
+			m := g.ScrapedMovie()
+			scene.Movies = append(scene.Movies, &m)
 		}
+	}
 
-		for _, p := range scene.Groups {
-			matchedID, err := match.ScrapedGroup(ctx, gqb, p.StoredID, p.Name)
-			if err != nil {
-				return err
-			}
+	tags, err := postProcessTags(ctx, tqb, scene.Tags)
+	if err != nil {
+		return nil, err
+	}
+	scene.Tags = c.filterTags(tags)
 
-			if matchedID != nil {
-				p.StoredID = matchedID
-			}
-		}
-
-		// HACK - if movies was returned but not groups, add the groups from the movies
-		// if groups was returned but not movies, add the movies from the groups for backward compatibility
-		if len(scene.Movies) > 0 && len(scene.Groups) == 0 {
-			for _, m := range scene.Movies {
-				g := m.ScrapedGroup()
-				scene.Groups = append(scene.Groups, &g)
-			}
-		} else if len(scene.Groups) > 0 && len(scene.Movies) == 0 {
-			for _, g := range scene.Groups {
-				m := g.ScrapedMovie()
-				scene.Movies = append(scene.Movies, &m)
-			}
-		}
-
-		tags, err := postProcessTags(ctx, tqb, scene.Tags)
-		if err != nil {
-			return err
-		}
-		scene.Tags, ignoredTags = FilterTags(excludeTagRE, tags)
-
-		if scene.Studio != nil {
-			err := match.ScrapedStudio(ctx, sqb, scene.Studio, "")
-			if err != nil {
-				return err
-			}
-		}
-
-		return nil
-	}); err != nil {
-		return nil, nil, err
+	if err := c.postScrapeRelatedStudio(ctx, scene.Studio); err != nil {
+		return nil, err
 	}
 
 	// post-process - set the image if applicable
-	if err := setSceneImage(ctx, c.client, &scene, c.globalConfig); err != nil {
+	if err := processImageField(ctx, scene.Image, c.client, c.globalConfig); err != nil {
 		logger.Warnf("Could not set image using URL %s: %v", *scene.Image, err)
 	}
 
-	return scene, ignoredTags, nil
+	return scene, nil
 }
 
-func (c Cache) postScrapeGallery(ctx context.Context, g models.ScrapedGallery, excludeTagRE []*regexp.Regexp) (_ ScrapedContent, ignoredTags []string, err error) {
+func (c *postScraper) postScrapeGallery(ctx context.Context, g models.ScrapedGallery) (_ ScrapedContent, err error) {
 	// set the URL/URLs field
 	if g.URL == nil && len(g.URLs) > 0 {
 		g.URL = &g.URLs[0]
@@ -336,70 +408,65 @@ func (c Cache) postScrapeGallery(ctx context.Context, g models.ScrapedGallery, e
 	}
 
 	r := c.repository
-	if err := r.WithReadTxn(ctx, func(ctx context.Context) error {
-		pqb := r.PerformerFinder
-		tqb := r.TagFinder
-		sqb := r.StudioFinder
+	tqb := r.TagFinder
 
-		for _, p := range g.Performers {
-			err := match.ScrapedPerformer(ctx, pqb, p, "")
-			if err != nil {
-				return err
-			}
-		}
-
-		tags, err := postProcessTags(ctx, tqb, g.Tags)
-		if err != nil {
-			return err
-		}
-		g.Tags, ignoredTags = FilterTags(excludeTagRE, tags)
-
-		if g.Studio != nil {
-			err := match.ScrapedStudio(ctx, sqb, g.Studio, "")
-			if err != nil {
-				return err
-			}
-		}
-
-		return nil
-	}); err != nil {
-		return nil, nil, err
+	if err = c.postScrapeRelatedPerformers(ctx, g.Performers); err != nil {
+		return nil, err
 	}
 
-	return g, ignoredTags, nil
+	tags, err := postProcessTags(ctx, tqb, g.Tags)
+	if err != nil {
+		return nil, err
+	}
+	g.Tags = c.filterTags(tags)
+
+	if err := c.postScrapeRelatedStudio(ctx, g.Studio); err != nil {
+		return nil, err
+	}
+
+	return g, nil
 }
 
-func (c Cache) postScrapeImage(ctx context.Context, image models.ScrapedImage, excludeTagRE []*regexp.Regexp) (_ ScrapedContent, ignoredTags []string, err error) {
+func (c *postScraper) postScrapeImage(ctx context.Context, image models.ScrapedImage) (_ ScrapedContent, err error) {
 	r := c.repository
-	if err := r.WithReadTxn(ctx, func(ctx context.Context) error {
-		pqb := r.PerformerFinder
-		tqb := r.TagFinder
-		sqb := r.StudioFinder
+	tqb := r.TagFinder
 
-		for _, p := range image.Performers {
-			if err := match.ScrapedPerformer(ctx, pqb, p, ""); err != nil {
-				return err
-			}
-		}
+	if err = c.postScrapeRelatedPerformers(ctx, image.Performers); err != nil {
+		return nil, err
+	}
 
-		tags, err := postProcessTags(ctx, tqb, image.Tags)
+	tags, err := postProcessTags(ctx, tqb, image.Tags)
+	if err != nil {
+		return nil, err
+	}
+
+	image.Tags = c.filterTags(tags)
+
+	if err := c.postScrapeRelatedStudio(ctx, image.Studio); err != nil {
+		return nil, err
+	}
+
+	return image, nil
+}
+
+// postScrapeSingle handles post-processing of a single scraped content item.
+// This is a convenience function that includes logging the ignored tags, as opposed to logging them in the caller.
+func (c Cache) postScrapeSingle(ctx context.Context, content ScrapedContent) (ret ScrapedContent, err error) {
+	pp := postScraper{
+		Cache:        c,
+		excludeTagRE: c.compileExcludeTagPatterns(),
+	}
+
+	if err := c.repository.WithReadTxn(ctx, func(ctx context.Context) error {
+		ret, err = pp.postScrape(ctx, content)
 		if err != nil {
 			return err
 		}
-
-		image.Tags, ignoredTags = FilterTags(excludeTagRE, tags)
-
-		if image.Studio != nil {
-			err := match.ScrapedStudio(ctx, sqb, image.Studio, "")
-			if err != nil {
-				return err
-			}
-		}
-
 		return nil
 	}); err != nil {
-		return nil, nil, err
+		return nil, err
 	}
 
-	return image, ignoredTags, nil
+	LogIgnoredTags(pp.ignoredTags)
+	return ret, nil
 }

From 49fd47562e4b953a91980eca5e69ea3373f1d12a Mon Sep 17 00:00:00 2001
From: Gykes <24581046+Gykes@users.noreply.github.com>
Date: Mon, 1 Dec 2025 19:52:16 -0600
Subject: [PATCH 180/405] Bugfix: Fix New Tagger Gender Setting Select (#6351)

---
 ui/v2.5/src/components/Tagger/scenes/Config.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui/v2.5/src/components/Tagger/scenes/Config.tsx b/ui/v2.5/src/components/Tagger/scenes/Config.tsx
index 5dd0e29d4..8b0b9ea1f 100644
--- a/ui/v2.5/src/components/Tagger/scenes/Config.tsx
+++ b/ui/v2.5/src/components/Tagger/scenes/Config.tsx
@@ -124,6 +124,7 @@ const Config: React.FC<IConfigProps> = ({ show }) => {
     const performerGenders = config.performerGenders || genderList.slice();
     return (
       <Form.Check
+        id={`gender-${gender}`}
         key={gender}
         label={<FormattedMessage id={`gender_types.${gender}`} />}
         checked={performerGenders.includes(gender)}

From 4017c42fe2fefb0f39db7cbc8efcfdc09754119a Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Tue, 2 Dec 2025 12:53:37 +1100
Subject: [PATCH 181/405] Handle modified files where the case of the filename
 changed on case-insensitive filesystems (#6327)

* Find existing files with case insensitivity if filesystem is case insensitive
* Handle case change in folders
* Optimise to only test file system case sensitivity if the first query found nothing

This limits the overhead to new paths, and adds an extra query for new paths to windows installs
---
 internal/api/resolver_query_find_file.go   |  2 +-
 internal/api/resolver_query_find_folder.go |  2 +-
 internal/autotag/integration_test.go       |  2 +-
 pkg/file/folder.go                         |  4 +-
 pkg/file/import.go                         |  6 +--
 pkg/file/scan.go                           | 59 ++++++++++++++++++++--
 pkg/file/video/caption.go                  |  2 +-
 pkg/gallery/import.go                      |  4 +-
 pkg/image/import.go                        |  2 +-
 pkg/models/mocks/FileReaderWriter.go       | 28 +++++-----
 pkg/models/mocks/FolderReaderWriter.go     | 14 ++---
 pkg/models/repository_file.go              |  4 +-
 pkg/models/repository_folder.go            |  2 +-
 pkg/scene/import.go                        |  2 +-
 pkg/sqlite/file.go                         |  8 +--
 pkg/sqlite/file_test.go                    |  2 +-
 pkg/sqlite/folder.go                       | 12 ++++-
 pkg/sqlite/folder_test.go                  |  6 +--
 18 files changed, 110 insertions(+), 51 deletions(-)

diff --git a/internal/api/resolver_query_find_file.go b/internal/api/resolver_query_find_file.go
index ae53a89b4..01c14b1ed 100644
--- a/internal/api/resolver_query_find_file.go
+++ b/internal/api/resolver_query_find_file.go
@@ -29,7 +29,7 @@ func (r *queryResolver) FindFile(ctx context.Context, id *string, path *string)
 				ret = files[0]
 			}
 		case path != nil:
-			ret, err = qb.FindByPath(ctx, *path)
+			ret, err = qb.FindByPath(ctx, *path, true)
 			if err == nil && ret == nil {
 				return errors.New("file not found")
 			}
diff --git a/internal/api/resolver_query_find_folder.go b/internal/api/resolver_query_find_folder.go
index a7a798dd1..d6832b7c9 100644
--- a/internal/api/resolver_query_find_folder.go
+++ b/internal/api/resolver_query_find_folder.go
@@ -25,7 +25,7 @@ func (r *queryResolver) FindFolder(ctx context.Context, id *string, path *string
 				return err
 			}
 		case path != nil:
-			ret, err = qb.FindByPath(ctx, *path)
+			ret, err = qb.FindByPath(ctx, *path, true)
 			if err == nil && ret == nil {
 				return errors.New("folder not found")
 			}
diff --git a/internal/autotag/integration_test.go b/internal/autotag/integration_test.go
index 565d73853..fc83df848 100644
--- a/internal/autotag/integration_test.go
+++ b/internal/autotag/integration_test.go
@@ -225,7 +225,7 @@ func createSceneFile(ctx context.Context, name string, folderStore models.Folder
 }
 
 func getOrCreateFolder(ctx context.Context, folderStore models.FolderFinderCreator, folderPath string) (*models.Folder, error) {
-	f, err := folderStore.FindByPath(ctx, folderPath)
+	f, err := folderStore.FindByPath(ctx, folderPath, true)
 	if err != nil {
 		return nil, fmt.Errorf("getting folder by path: %w", err)
 	}
diff --git a/pkg/file/folder.go b/pkg/file/folder.go
index 451bb1d93..fe260c155 100644
--- a/pkg/file/folder.go
+++ b/pkg/file/folder.go
@@ -15,7 +15,9 @@ import (
 // Does not create any folders in the file system
 func GetOrCreateFolderHierarchy(ctx context.Context, fc models.FolderFinderCreator, path string) (*models.Folder, error) {
 	// get or create folder hierarchy
-	folder, err := fc.FindByPath(ctx, path)
+	// assume case sensitive when searching for the folder
+	const caseSensitive = true
+	folder, err := fc.FindByPath(ctx, path, caseSensitive)
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/file/import.go b/pkg/file/import.go
index 7c28197b8..8ca7487cb 100644
--- a/pkg/file/import.go
+++ b/pkg/file/import.go
@@ -120,7 +120,7 @@ func (i *Importer) baseFileJSONToBaseFile(ctx context.Context, baseJSON *jsonsch
 func (i *Importer) populateZipFileID(ctx context.Context, f *models.DirEntry) error {
 	zipFilePath := i.Input.DirEntry().ZipFile
 	if zipFilePath != "" {
-		zf, err := i.ReaderWriter.FindByPath(ctx, zipFilePath)
+		zf, err := i.ReaderWriter.FindByPath(ctx, zipFilePath, true)
 		if err != nil {
 			return fmt.Errorf("error finding file by path %q: %v", zipFilePath, err)
 		}
@@ -146,7 +146,7 @@ func (i *Importer) Name() string {
 
 func (i *Importer) FindExistingID(ctx context.Context) (*int, error) {
 	path := i.Input.DirEntry().Path
-	existing, err := i.ReaderWriter.FindByPath(ctx, path)
+	existing, err := i.ReaderWriter.FindByPath(ctx, path, true)
 	if err != nil {
 		return nil, err
 	}
@@ -176,7 +176,7 @@ func (i *Importer) createFolderHierarchy(ctx context.Context, p string) (*models
 }
 
 func (i *Importer) getOrCreateFolder(ctx context.Context, path string, parent *models.Folder) (*models.Folder, error) {
-	folder, err := i.FolderStore.FindByPath(ctx, path)
+	folder, err := i.FolderStore.FindByPath(ctx, path, true)
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/file/scan.go b/pkg/file/scan.go
index 40f474f34..7d5a79713 100644
--- a/pkg/file/scan.go
+++ b/pkg/file/scan.go
@@ -443,7 +443,10 @@ func (s *scanJob) getFolderID(ctx context.Context, path string) (*models.FolderI
 		return &v, nil
 	}
 
-	ret, err := s.Repository.Folder.FindByPath(ctx, path)
+	// assume case sensitive when searching for the folder
+	const caseSensitive = true
+
+	ret, err := s.Repository.Folder.FindByPath(ctx, path, caseSensitive)
 	if err != nil {
 		return nil, err
 	}
@@ -473,7 +476,10 @@ func (s *scanJob) getZipFileID(ctx context.Context, zipFile *scanFile) (*models.
 		return &v, nil
 	}
 
-	ret, err := s.Repository.File.FindByPath(ctx, path)
+	// assume case sensitive when searching for the zip file
+	const caseSensitive = true
+
+	ret, err := s.Repository.File.FindByPath(ctx, path, caseSensitive)
 	if err != nil {
 		return nil, fmt.Errorf("getting zip file ID for %q: %w", path, err)
 	}
@@ -493,11 +499,26 @@ func (s *scanJob) handleFolder(ctx context.Context, file scanFile) error {
 		defer s.incrementProgress(file)
 
 		// determine if folder already exists in data store (by path)
-		f, err := s.Repository.Folder.FindByPath(ctx, path)
+		// assume case sensitive by default
+		f, err := s.Repository.Folder.FindByPath(ctx, path, true)
 		if err != nil {
 			return fmt.Errorf("checking for existing folder %q: %w", path, err)
 		}
 
+		// #1426 / #6326 - if folder is in a case-insensitive filesystem, then try
+		// case insensitive searching
+		// assume case sensitive if in zip
+		if f == nil && file.ZipFileID == nil {
+			caseSensitive, _ := file.fs.IsPathCaseSensitive(file.Path)
+
+			if !caseSensitive {
+				f, err = s.Repository.Folder.FindByPath(ctx, path, false)
+				if err != nil {
+					return fmt.Errorf("checking for existing folder %q: %w", path, err)
+				}
+			}
+		}
+
 		// if folder not exists, create it
 		if f == nil {
 			f, err = s.onNewFolder(ctx, file)
@@ -611,10 +632,18 @@ func (s *scanJob) onExistingFolder(ctx context.Context, f scanFile, existing *mo
 	// update if mod time is changed
 	entryModTime := f.ModTime
 	if !entryModTime.Equal(existing.ModTime) {
+		existing.Path = f.Path
 		existing.ModTime = entryModTime
 		update = true
 	}
 
+	// #6326 - update if path has changed - should only happen if case is
+	// changed and filesystem is case insensitive
+	if existing.Path != f.Path {
+		existing.Path = f.Path
+		update = true
+	}
+
 	// update if zip file ID has changed
 	fZfID := f.ZipFileID
 	existingZfID := existing.ZipFileID
@@ -647,15 +676,31 @@ func (s *scanJob) handleFile(ctx context.Context, f scanFile) error {
 	defer s.incrementProgress(f)
 
 	var ff models.File
+
 	// don't use a transaction to check if new or existing
 	if err := s.withDB(ctx, func(ctx context.Context) error {
 		// determine if file already exists in data store
+		// assume case sensitive when searching for the file to begin with
 		var err error
-		ff, err = s.Repository.File.FindByPath(ctx, f.Path)
+		ff, err = s.Repository.File.FindByPath(ctx, f.Path, true)
 		if err != nil {
 			return fmt.Errorf("checking for existing file %q: %w", f.Path, err)
 		}
 
+		// #1426 / #6326 - if file is in a case-insensitive filesystem, then try
+		// case insensitive search
+		// assume case sensitive if in zip
+		if ff == nil && f.ZipFileID != nil {
+			caseSensitive, _ := f.fs.IsPathCaseSensitive(f.Path)
+
+			if !caseSensitive {
+				ff, err = s.Repository.File.FindByPath(ctx, f.Path, false)
+				if err != nil {
+					return fmt.Errorf("checking for existing file %q: %w", f.Path, err)
+				}
+			}
+		}
+
 		if ff == nil {
 			// returns a file only if it is actually new
 			ff, err = s.onNewFile(ctx, f)
@@ -879,6 +924,7 @@ func (s *scanJob) handleRename(ctx context.Context, f models.File, fp []models.F
 			// #1426 - if file exists but is a case-insensitive match for the
 			// original filename, and the filesystem is case-insensitive
 			// then treat it as a move
+			// #6326 - this should now be handled earlier, and this shouldn't be necessary
 			if caseSensitive, _ := fs.IsPathCaseSensitive(other.Base().Path); !caseSensitive {
 				// treat as a move
 				missing = append(missing, other)
@@ -1026,7 +1072,8 @@ func (s *scanJob) onExistingFile(ctx context.Context, f scanFile, existing model
 	path := base.Path
 
 	fileModTime := f.ModTime
-	updated := !fileModTime.Equal(base.ModTime)
+	// #6326 - also force a rescan if the basename changed
+	updated := !fileModTime.Equal(base.ModTime) || base.Basename != f.Basename
 	forceRescan := s.options.Rescan
 
 	if !updated && !forceRescan {
@@ -1041,6 +1088,8 @@ func (s *scanJob) onExistingFile(ctx context.Context, f scanFile, existing model
 		logger.Infof("%s has been updated: rescanning", path)
 	}
 
+	// #6326 - update basename in case it changed
+	base.Basename = f.Basename
 	base.ModTime = fileModTime
 	base.Size = f.Size
 	base.UpdatedAt = time.Now()
diff --git a/pkg/file/video/caption.go b/pkg/file/video/caption.go
index bec3db6fd..43723864f 100644
--- a/pkg/file/video/caption.go
+++ b/pkg/file/video/caption.go
@@ -97,7 +97,7 @@ func AssociateCaptions(ctx context.Context, captionPath string, txnMgr txn.Manag
 	captionPrefix := getCaptionPrefix(captionPath)
 	if err := txn.WithTxn(ctx, txnMgr, func(ctx context.Context) error {
 		var err error
-		files, er := fqb.FindAllByPath(ctx, captionPrefix+"*")
+		files, er := fqb.FindAllByPath(ctx, captionPrefix+"*", true)
 
 		if er != nil {
 			return fmt.Errorf("searching for scene %s: %w", captionPrefix, er)
diff --git a/pkg/gallery/import.go b/pkg/gallery/import.go
index 7cdf53691..0068b3f1c 100644
--- a/pkg/gallery/import.go
+++ b/pkg/gallery/import.go
@@ -265,7 +265,7 @@ func (i *Importer) populateFilesFolder(ctx context.Context) error {
 
 	for _, ref := range i.Input.ZipFiles {
 		path := ref
-		f, err := i.FileFinder.FindByPath(ctx, path)
+		f, err := i.FileFinder.FindByPath(ctx, path, true)
 		if err != nil {
 			return fmt.Errorf("error finding file: %w", err)
 		}
@@ -281,7 +281,7 @@ func (i *Importer) populateFilesFolder(ctx context.Context) error {
 
 	if i.Input.FolderPath != "" {
 		path := i.Input.FolderPath
-		f, err := i.FolderFinder.FindByPath(ctx, path)
+		f, err := i.FolderFinder.FindByPath(ctx, path, true)
 		if err != nil {
 			return fmt.Errorf("error finding folder: %w", err)
 		}
diff --git a/pkg/image/import.go b/pkg/image/import.go
index ec200af04..bf92a6ae8 100644
--- a/pkg/image/import.go
+++ b/pkg/image/import.go
@@ -110,7 +110,7 @@ func (i *Importer) populateFiles(ctx context.Context) error {
 
 	for _, ref := range i.Input.Files {
 		path := ref
-		f, err := i.FileFinder.FindByPath(ctx, path)
+		f, err := i.FileFinder.FindByPath(ctx, path, true)
 		if err != nil {
 			return fmt.Errorf("error finding file: %w", err)
 		}
diff --git a/pkg/models/mocks/FileReaderWriter.go b/pkg/models/mocks/FileReaderWriter.go
index 12a1b3075..97a0136e6 100644
--- a/pkg/models/mocks/FileReaderWriter.go
+++ b/pkg/models/mocks/FileReaderWriter.go
@@ -130,13 +130,13 @@ func (_m *FileReaderWriter) Find(ctx context.Context, id ...models.FileID) ([]mo
 	return r0, r1
 }
 
-// FindAllByPath provides a mock function with given fields: ctx, path
-func (_m *FileReaderWriter) FindAllByPath(ctx context.Context, path string) ([]models.File, error) {
-	ret := _m.Called(ctx, path)
+// FindAllByPath provides a mock function with given fields: ctx, path, caseSensitive
+func (_m *FileReaderWriter) FindAllByPath(ctx context.Context, path string, caseSensitive bool) ([]models.File, error) {
+	ret := _m.Called(ctx, path, caseSensitive)
 
 	var r0 []models.File
-	if rf, ok := ret.Get(0).(func(context.Context, string) []models.File); ok {
-		r0 = rf(ctx, path)
+	if rf, ok := ret.Get(0).(func(context.Context, string, bool) []models.File); ok {
+		r0 = rf(ctx, path, caseSensitive)
 	} else {
 		if ret.Get(0) != nil {
 			r0 = ret.Get(0).([]models.File)
@@ -144,8 +144,8 @@ func (_m *FileReaderWriter) FindAllByPath(ctx context.Context, path string) ([]m
 	}
 
 	var r1 error
-	if rf, ok := ret.Get(1).(func(context.Context, string) error); ok {
-		r1 = rf(ctx, path)
+	if rf, ok := ret.Get(1).(func(context.Context, string, bool) error); ok {
+		r1 = rf(ctx, path, caseSensitive)
 	} else {
 		r1 = ret.Error(1)
 	}
@@ -222,13 +222,13 @@ func (_m *FileReaderWriter) FindByFingerprint(ctx context.Context, fp models.Fin
 	return r0, r1
 }
 
-// FindByPath provides a mock function with given fields: ctx, path
-func (_m *FileReaderWriter) FindByPath(ctx context.Context, path string) (models.File, error) {
-	ret := _m.Called(ctx, path)
+// FindByPath provides a mock function with given fields: ctx, path, caseSensitive
+func (_m *FileReaderWriter) FindByPath(ctx context.Context, path string, caseSensitive bool) (models.File, error) {
+	ret := _m.Called(ctx, path, caseSensitive)
 
 	var r0 models.File
-	if rf, ok := ret.Get(0).(func(context.Context, string) models.File); ok {
-		r0 = rf(ctx, path)
+	if rf, ok := ret.Get(0).(func(context.Context, string, bool) models.File); ok {
+		r0 = rf(ctx, path, caseSensitive)
 	} else {
 		if ret.Get(0) != nil {
 			r0 = ret.Get(0).(models.File)
@@ -236,8 +236,8 @@ func (_m *FileReaderWriter) FindByPath(ctx context.Context, path string) (models
 	}
 
 	var r1 error
-	if rf, ok := ret.Get(1).(func(context.Context, string) error); ok {
-		r1 = rf(ctx, path)
+	if rf, ok := ret.Get(1).(func(context.Context, string, bool) error); ok {
+		r1 = rf(ctx, path, caseSensitive)
 	} else {
 		r1 = ret.Error(1)
 	}
diff --git a/pkg/models/mocks/FolderReaderWriter.go b/pkg/models/mocks/FolderReaderWriter.go
index 512925fd6..7bca013fe 100644
--- a/pkg/models/mocks/FolderReaderWriter.go
+++ b/pkg/models/mocks/FolderReaderWriter.go
@@ -132,13 +132,13 @@ func (_m *FolderReaderWriter) FindByParentFolderID(ctx context.Context, parentFo
 	return r0, r1
 }
 
-// FindByPath provides a mock function with given fields: ctx, path
-func (_m *FolderReaderWriter) FindByPath(ctx context.Context, path string) (*models.Folder, error) {
-	ret := _m.Called(ctx, path)
+// FindByPath provides a mock function with given fields: ctx, path, caseSensitive
+func (_m *FolderReaderWriter) FindByPath(ctx context.Context, path string, caseSensitive bool) (*models.Folder, error) {
+	ret := _m.Called(ctx, path, caseSensitive)
 
 	var r0 *models.Folder
-	if rf, ok := ret.Get(0).(func(context.Context, string) *models.Folder); ok {
-		r0 = rf(ctx, path)
+	if rf, ok := ret.Get(0).(func(context.Context, string, bool) *models.Folder); ok {
+		r0 = rf(ctx, path, caseSensitive)
 	} else {
 		if ret.Get(0) != nil {
 			r0 = ret.Get(0).(*models.Folder)
@@ -146,8 +146,8 @@ func (_m *FolderReaderWriter) FindByPath(ctx context.Context, path string) (*mod
 	}
 
 	var r1 error
-	if rf, ok := ret.Get(1).(func(context.Context, string) error); ok {
-		r1 = rf(ctx, path)
+	if rf, ok := ret.Get(1).(func(context.Context, string, bool) error); ok {
+		r1 = rf(ctx, path, caseSensitive)
 	} else {
 		r1 = ret.Error(1)
 	}
diff --git a/pkg/models/repository_file.go b/pkg/models/repository_file.go
index 0819b25a5..c851ce08c 100644
--- a/pkg/models/repository_file.go
+++ b/pkg/models/repository_file.go
@@ -13,9 +13,9 @@ type FileGetter interface {
 // FileFinder provides methods to find files.
 type FileFinder interface {
 	FileGetter
-	FindAllByPath(ctx context.Context, path string) ([]File, error)
+	FindAllByPath(ctx context.Context, path string, caseSensitive bool) ([]File, error)
 	FindAllInPaths(ctx context.Context, p []string, limit, offset int) ([]File, error)
-	FindByPath(ctx context.Context, path string) (File, error)
+	FindByPath(ctx context.Context, path string, caseSensitive bool) (File, error)
 	FindByFingerprint(ctx context.Context, fp Fingerprint) ([]File, error)
 	FindByZipFileID(ctx context.Context, zipFileID FileID) ([]File, error)
 	FindByFileInfo(ctx context.Context, info fs.FileInfo, size int64) ([]File, error)
diff --git a/pkg/models/repository_folder.go b/pkg/models/repository_folder.go
index 671e8780d..3d0fdb822 100644
--- a/pkg/models/repository_folder.go
+++ b/pkg/models/repository_folder.go
@@ -12,7 +12,7 @@ type FolderGetter interface {
 type FolderFinder interface {
 	FolderGetter
 	FindAllInPaths(ctx context.Context, p []string, limit, offset int) ([]*Folder, error)
-	FindByPath(ctx context.Context, path string) (*Folder, error)
+	FindByPath(ctx context.Context, path string, caseSensitive bool) (*Folder, error)
 	FindByZipFileID(ctx context.Context, zipFileID FileID) ([]*Folder, error)
 	FindByParentFolderID(ctx context.Context, parentFolderID FolderID) ([]*Folder, error)
 }
diff --git a/pkg/scene/import.go b/pkg/scene/import.go
index e1248a77c..efffd380d 100644
--- a/pkg/scene/import.go
+++ b/pkg/scene/import.go
@@ -164,7 +164,7 @@ func (i *Importer) populateFiles(ctx context.Context) error {
 
 	for _, ref := range i.Input.Files {
 		path := ref
-		f, err := i.FileFinder.FindByPath(ctx, path)
+		f, err := i.FileFinder.FindByPath(ctx, path, true)
 		if err != nil {
 			return fmt.Errorf("error finding file: %w", err)
 		}
diff --git a/pkg/sqlite/file.go b/pkg/sqlite/file.go
index 2144356c5..1be5648b4 100644
--- a/pkg/sqlite/file.go
+++ b/pkg/sqlite/file.go
@@ -625,9 +625,9 @@ func (qb *FileStore) find(ctx context.Context, id models.FileID) (models.File, e
 }
 
 // FindByPath returns the first file that matches the given path. Wildcard characters are supported.
-func (qb *FileStore) FindByPath(ctx context.Context, p string) (models.File, error) {
+func (qb *FileStore) FindByPath(ctx context.Context, p string, caseSensitive bool) (models.File, error) {
 
-	ret, err := qb.FindAllByPath(ctx, p)
+	ret, err := qb.FindAllByPath(ctx, p, caseSensitive)
 
 	if err != nil {
 		return nil, err
@@ -642,7 +642,7 @@ func (qb *FileStore) FindByPath(ctx context.Context, p string) (models.File, err
 
 // FindAllByPath returns all the files that match the given path.
 // Wildcard characters are supported.
-func (qb *FileStore) FindAllByPath(ctx context.Context, p string) ([]models.File, error) {
+func (qb *FileStore) FindAllByPath(ctx context.Context, p string, caseSensitive bool) ([]models.File, error) {
 	// separate basename from path
 	basename := filepath.Base(p)
 	dirName := filepath.Dir(p)
@@ -657,7 +657,7 @@ func (qb *FileStore) FindAllByPath(ctx context.Context, p string) ([]models.File
 	// like uses case-insensitive matching. Only use like if wildcards are used
 	q := qb.selectDataset().Prepared(true)
 
-	if strings.Contains(basename, "%") || strings.Contains(dirName, "%") {
+	if strings.Contains(basename, "%") || strings.Contains(dirName, "%") || !caseSensitive {
 		q = q.Where(
 			folderTable.Col("path").Like(dirName),
 			table.Col("basename").Like(basename),
diff --git a/pkg/sqlite/file_test.go b/pkg/sqlite/file_test.go
index 766ffcc70..8422390c0 100644
--- a/pkg/sqlite/file_test.go
+++ b/pkg/sqlite/file_test.go
@@ -551,7 +551,7 @@ func Test_FileStore_FindByPath(t *testing.T) {
 	for _, tt := range tests {
 		runWithRollbackTxn(t, tt.name, func(t *testing.T, ctx context.Context) {
 			assert := assert.New(t)
-			got, err := qb.FindByPath(ctx, tt.path)
+			got, err := qb.FindByPath(ctx, tt.path, true)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("FileStore.FindByPath() error = %v, wantErr %v", err, tt.wantErr)
 				return
diff --git a/pkg/sqlite/folder.go b/pkg/sqlite/folder.go
index 3ac962b8b..f250f7861 100644
--- a/pkg/sqlite/folder.go
+++ b/pkg/sqlite/folder.go
@@ -292,8 +292,16 @@ func (qb *FolderStore) FindMany(ctx context.Context, ids []models.FolderID) ([]*
 	return folders, nil
 }
 
-func (qb *FolderStore) FindByPath(ctx context.Context, p string) (*models.Folder, error) {
-	q := qb.selectDataset().Prepared(true).Where(qb.table().Col("path").Eq(p))
+func (qb *FolderStore) FindByPath(ctx context.Context, p string, caseSensitive bool) (*models.Folder, error) {
+	// use like for case insensitive search
+	var criterion exp.BooleanExpression
+	if caseSensitive {
+		criterion = qb.table().Col("path").Eq(p)
+	} else {
+		criterion = qb.table().Col("path").ILike(p)
+	}
+
+	q := qb.selectDataset().Prepared(true).Where(criterion)
 
 	ret, err := qb.get(ctx, q)
 	if err != nil && !errors.Is(err, sql.ErrNoRows) {
diff --git a/pkg/sqlite/folder_test.go b/pkg/sqlite/folder_test.go
index 1d948d063..15b2b96b8 100644
--- a/pkg/sqlite/folder_test.go
+++ b/pkg/sqlite/folder_test.go
@@ -89,7 +89,7 @@ func Test_FolderStore_Create(t *testing.T) {
 			assert.Equal(copy, s)
 
 			// ensure can find the folder
-			found, err := qb.FindByPath(ctx, path)
+			found, err := qb.FindByPath(ctx, path, true)
 			if err != nil {
 				t.Errorf("FolderStore.Find() error = %v", err)
 			}
@@ -180,7 +180,7 @@ func Test_FolderStore_Update(t *testing.T) {
 				return
 			}
 
-			s, err := qb.FindByPath(ctx, path)
+			s, err := qb.FindByPath(ctx, path, true)
 			if err != nil {
 				t.Errorf("FolderStore.Find() error = %v", err)
 			}
@@ -228,7 +228,7 @@ func Test_FolderStore_FindByPath(t *testing.T) {
 
 	for _, tt := range tests {
 		runWithRollbackTxn(t, tt.name, func(t *testing.T, ctx context.Context) {
-			got, err := qb.FindByPath(ctx, tt.path)
+			got, err := qb.FindByPath(ctx, tt.path, true)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("FolderStore.FindByPath() error = %v, wantErr %v", err, tt.wantErr)
 				return

From 90dd0b58d83b37c08c72d22cc0c945a4d0df4847 Mon Sep 17 00:00:00 2001
From: feederbox826 <me@feederbox.cc>
Date: Mon, 1 Dec 2025 20:57:54 -0500
Subject: [PATCH 182/405] add WakeLockSentinel (#6331)

* add WakeLockSentinel

prevents screen from sleeping ONLY in secure contexts (localhost, https)

closes #2884

* format, add types

* [wake-sentinel] add more releases, comments

release wakelock on dispose and end, call out secure contexts in error message
---
 ui/v2.5/package.json                          |  1 +
 ui/v2.5/pnpm-lock.yaml                        |  8 +++
 .../components/ScenePlayer/ScenePlayer.tsx    |  2 +
 .../components/ScenePlayer/wake-sentinel.ts   | 65 +++++++++++++++++++
 ui/v2.5/tsconfig.json                         |  2 +-
 5 files changed, 77 insertions(+), 1 deletion(-)
 create mode 100644 ui/v2.5/src/components/ScenePlayer/wake-sentinel.ts

diff --git a/ui/v2.5/package.json b/ui/v2.5/package.json
index 0971dbc3a..5913540db 100644
--- a/ui/v2.5/package.json
+++ b/ui/v2.5/package.json
@@ -92,6 +92,7 @@
     "@graphql-codegen/typescript-react-apollo": "^4.1.0",
     "@types/apollo-upload-client": "^18.0.0",
     "@types/crypto-js": "^4.2.2",
+    "@types/dom-screen-wake-lock": "^1.0.3",
     "@types/lodash-es": "^4.17.6",
     "@types/mousetrap": "^1.6.11",
     "@types/node": "^18.13.0",
diff --git a/ui/v2.5/pnpm-lock.yaml b/ui/v2.5/pnpm-lock.yaml
index 2791682ef..16fef0a19 100644
--- a/ui/v2.5/pnpm-lock.yaml
+++ b/ui/v2.5/pnpm-lock.yaml
@@ -216,6 +216,9 @@ importers:
       '@types/crypto-js':
         specifier: ^4.2.2
         version: 4.2.2
+      '@types/dom-screen-wake-lock':
+        specifier: ^1.0.3
+        version: 1.0.3
       '@types/lodash-es':
         specifier: ^4.17.6
         version: 4.17.12
@@ -1907,6 +1910,9 @@ packages:
   '@types/crypto-js@4.2.2':
     resolution: {integrity: sha512-sDOLlVbHhXpAUAL0YHDUUwDZf3iN4Bwi4W6a0W0b+QcAezUbRtH4FVb+9J4h+XFPW7l/gQ9F8qC7P+Ec4k8QVQ==}
 
+  '@types/dom-screen-wake-lock@1.0.3':
+    resolution: {integrity: sha512-3Iten7X3Zgwvk6kh6/NRdwN7WbZ760YgFCsF5AxDifltUQzW1RaW+WRmcVtgwFzLjaNu64H+0MPJ13yRa8g3Dw==}
+
   '@types/estree@1.0.8':
     resolution: {integrity: sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==}
 
@@ -7315,6 +7321,8 @@ snapshots:
 
   '@types/crypto-js@4.2.2': {}
 
+  '@types/dom-screen-wake-lock@1.0.3': {}
+
   '@types/estree@1.0.8': {}
 
   '@types/extract-files@13.0.2': {}
diff --git a/ui/v2.5/src/components/ScenePlayer/ScenePlayer.tsx b/ui/v2.5/src/components/ScenePlayer/ScenePlayer.tsx
index 77c0d2b19..5aeb56e96 100644
--- a/ui/v2.5/src/components/ScenePlayer/ScenePlayer.tsx
+++ b/ui/v2.5/src/components/ScenePlayer/ScenePlayer.tsx
@@ -23,6 +23,7 @@ import "./big-buttons";
 import "./track-activity";
 import "./vrmode";
 import "./media-session";
+import "./wake-sentinel";
 import cx from "classnames";
 import {
   useSceneSaveActivity,
@@ -399,6 +400,7 @@ export const ScenePlayer: React.FC<IScenePlayerProps> = PatchComponent(
             createButtons: uiConfig?.showAbLoopControls ?? false,
           },
           mediaSession: {},
+          wakeSentinel: {},
         },
       };
 
diff --git a/ui/v2.5/src/components/ScenePlayer/wake-sentinel.ts b/ui/v2.5/src/components/ScenePlayer/wake-sentinel.ts
new file mode 100644
index 000000000..a51c050f5
--- /dev/null
+++ b/ui/v2.5/src/components/ScenePlayer/wake-sentinel.ts
@@ -0,0 +1,65 @@
+import videojs, { VideoJsPlayer } from "video.js";
+
+class WakeSentinelPlugin extends videojs.getPlugin("plugin") {
+  public wakeLock: WakeLockSentinel | null = null;
+  public wakeLockFail: boolean = false;
+  constructor(player: VideoJsPlayer) {
+    super(player);
+
+    // listen for visibility change events
+    document.addEventListener("visibilitychange", async () => {
+      if (document.visibilityState === "visible") {
+        // reacquire the wake lock when the page becomes visible
+        await this.acquireWakeLock();
+      }
+    });
+
+    // acquire wake lock on ready and play
+    player.ready(async () => {
+      player.addClass("vjs-wake-sentinel");
+      await this.acquireWakeLock(true);
+    });
+    player.on("play", () => this.acquireWakeLock());
+
+    // release wake lock on pause, dispose and end
+    player.on("pause", () => this.releaseWakeLock());
+    player.on("dispose", () => this.releaseWakeLock());
+    player.on("ended", () => this.releaseWakeLock());
+  }
+
+  private async releaseWakeLock(): Promise<void> {
+    this.wakeLock?.release().then(() => (this.wakeLock = null));
+  }
+
+  private async acquireWakeLock(log = false): Promise<void> {
+    // if wake lock failed, don't even try
+    if (this.wakeLockFail) return;
+    // check for wake lock on startup
+    if ("wakeLock" in navigator) {
+      try {
+        this.wakeLock = await navigator.wakeLock.request("screen");
+      } catch (err) {
+        if (log) console.error("Failed to obtain Screen Wake Lock:", err);
+        this.wakeLockFail = true;
+      }
+    } else {
+      if (log) {
+        console.warn(
+          "Screen Wake Lock API not supported. Secure context (https or localhost) and modern browser required."
+        );
+      }
+      this.wakeLockFail = true;
+    }
+  }
+}
+
+videojs.registerPlugin("wakeSentinel", WakeSentinelPlugin);
+
+/* eslint-disable @typescript-eslint/naming-convention */
+declare module "video.js" {
+  interface VideoJsPlayer {
+    wakeSentinel: () => WakeSentinelPlugin;
+  }
+}
+
+export default WakeSentinelPlugin;
diff --git a/ui/v2.5/tsconfig.json b/ui/v2.5/tsconfig.json
index 93c8c0b5a..4b68980fd 100644
--- a/ui/v2.5/tsconfig.json
+++ b/ui/v2.5/tsconfig.json
@@ -19,7 +19,7 @@
     "isolatedModules": true,
     "noFallthroughCasesInSwitch": true,
     "useDefineForClassFields": true,
-    "types": ["vite/client"]
+    "types": ["vite/client", "dom-screen-wake-lock"]
   },
   "include": ["src"]
 }

From 5f16547e58c10a240a48d20c6d3a6411cab1505f Mon Sep 17 00:00:00 2001
From: Otter Bot Society <76196097+OtterBotSociety@users.noreply.github.com>
Date: Mon, 1 Dec 2025 19:14:42 -0800
Subject: [PATCH 183/405] Add fallback for 0-dimension images (webp animations)
 (#6342)

---
 pkg/file/image/scan.go | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/pkg/file/image/scan.go b/pkg/file/image/scan.go
index 1e09ce023..ac5c04162 100644
--- a/pkg/file/image/scan.go
+++ b/pkg/file/image/scan.go
@@ -74,6 +74,25 @@ func (d *Decorator) Decorate(ctx context.Context, fs models.FS, f models.File) (
 		Height:   probe.Height,
 	}
 
+	// FFprobe has a known bug where it returns 0x0 dimensions for some animated WebP files
+	// Fall back to image.DecodeConfig in this case.
+	// See: https://trac.ffmpeg.org/ticket/4907
+	if ret.Width == 0 || ret.Height == 0 {
+		logger.Warnf("FFprobe returned invalid dimensions (%dx%d) for %q, trying fallback decoder", ret.Width, ret.Height, base.Path)
+		c, format, err := decodeConfig(fs, base.Path)
+		if err != nil {
+			logger.Warnf("Fallback decoder failed for %q: %s. Proceeding with original FFprobe result", base.Path, err)
+		} else {
+			ret.Width = c.Width
+			ret.Height = c.Height
+			// Update format if it differs (fallback decoder may be more accurate)
+			if format != "" && format != ret.Format {
+				logger.Debugf("Updating format from %q to %q for %q", ret.Format, format, base.Path)
+				ret.Format = format
+			}
+		}
+	}
+
 	adjustForOrientation(fs, base.Path, ret)
 
 	return ret, nil

From 69fd073d5dade353be18ddeda4d951018ab62ee1 Mon Sep 17 00:00:00 2001
From: hckrman101 <hckrman101@sent.com>
Date: Mon, 1 Dec 2025 22:25:46 -0500
Subject: [PATCH 184/405] Add option for instant transitions in lightbox
 (#6354)

---
 graphql/schema/types/config.graphql           |  2 ++
 internal/api/resolver_mutation_configure.go   |  2 ++
 internal/manager/config/config.go             |  5 +++++
 internal/manager/config/ui.go                 |  1 +
 ui/v2.5/graphql/data/config.graphql           |  1 +
 .../SettingsInterfacePanel.tsx                |  7 ++++++
 ui/v2.5/src/hooks/Lightbox/Lightbox.tsx       | 22 ++++++++++++++++++-
 ui/v2.5/src/locales/en-GB.json                |  1 +
 8 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/graphql/schema/types/config.graphql b/graphql/schema/types/config.graphql
index 732296572..e82ea93e2 100644
--- a/graphql/schema/types/config.graphql
+++ b/graphql/schema/types/config.graphql
@@ -339,6 +339,7 @@ input ConfigImageLightboxInput {
   resetZoomOnNav: Boolean
   scrollMode: ImageLightboxScrollMode
   scrollAttemptsBeforeChange: Int
+  disableAnimation: Boolean
 }
 
 type ConfigImageLightboxResult {
@@ -348,6 +349,7 @@ type ConfigImageLightboxResult {
   resetZoomOnNav: Boolean
   scrollMode: ImageLightboxScrollMode
   scrollAttemptsBeforeChange: Int!
+  disableAnimation: Boolean
 }
 
 input ConfigInterfaceInput {
diff --git a/internal/api/resolver_mutation_configure.go b/internal/api/resolver_mutation_configure.go
index d49105916..b39cf373a 100644
--- a/internal/api/resolver_mutation_configure.go
+++ b/internal/api/resolver_mutation_configure.go
@@ -493,6 +493,8 @@ func (r *mutationResolver) ConfigureInterface(ctx context.Context, input ConfigI
 		r.setConfigString(config.ImageLightboxScrollModeKey, (*string)(options.ScrollMode))
 
 		r.setConfigInt(config.ImageLightboxScrollAttemptsBeforeChange, options.ScrollAttemptsBeforeChange)
+
+		r.setConfigBool(config.ImageLightboxDisableAnimation, options.DisableAnimation)
 	}
 
 	if input.CSS != nil {
diff --git a/internal/manager/config/config.go b/internal/manager/config/config.go
index 3b3b2c054..73b9de3ab 100644
--- a/internal/manager/config/config.go
+++ b/internal/manager/config/config.go
@@ -209,6 +209,7 @@ const (
 	ImageLightboxResetZoomOnNav             = "image_lightbox.reset_zoom_on_nav"
 	ImageLightboxScrollModeKey              = "image_lightbox.scroll_mode"
 	ImageLightboxScrollAttemptsBeforeChange = "image_lightbox.scroll_attempts_before_change"
+	ImageLightboxDisableAnimation           = "image_lightbox.disable_animation"
 
 	UI = "ui"
 
@@ -1296,6 +1297,10 @@ func (i *Config) GetImageLightboxOptions() ConfigImageLightboxResult {
 	if v := i.with(ImageLightboxScrollAttemptsBeforeChange); v != nil {
 		ret.ScrollAttemptsBeforeChange = v.Int(ImageLightboxScrollAttemptsBeforeChange)
 	}
+	if v := i.with(ImageLightboxDisableAnimation); v != nil {
+		value := v.Bool(ImageLightboxDisableAnimation)
+		ret.DisableAnimation = &value
+	}
 
 	return ret
 }
diff --git a/internal/manager/config/ui.go b/internal/manager/config/ui.go
index 699091154..b7033f193 100644
--- a/internal/manager/config/ui.go
+++ b/internal/manager/config/ui.go
@@ -13,6 +13,7 @@ type ConfigImageLightboxResult struct {
 	ResetZoomOnNav             *bool                     `json:"resetZoomOnNav"`
 	ScrollMode                 *ImageLightboxScrollMode  `json:"scrollMode"`
 	ScrollAttemptsBeforeChange int                       `json:"scrollAttemptsBeforeChange"`
+	DisableAnimation           *bool                     `json:"disableAnimation"`
 }
 
 type ImageLightboxDisplayMode string
diff --git a/ui/v2.5/graphql/data/config.graphql b/ui/v2.5/graphql/data/config.graphql
index ac3656efb..1c3e9dc1b 100644
--- a/ui/v2.5/graphql/data/config.graphql
+++ b/ui/v2.5/graphql/data/config.graphql
@@ -100,6 +100,7 @@ fragment ConfigInterfaceData on ConfigInterfaceResult {
     resetZoomOnNav
     scrollMode
     scrollAttemptsBeforeChange
+    disableAnimation
   }
   disableDropdownCreate {
     performer
diff --git a/ui/v2.5/src/components/Settings/SettingsInterfacePanel/SettingsInterfacePanel.tsx b/ui/v2.5/src/components/Settings/SettingsInterfacePanel/SettingsInterfacePanel.tsx
index ba93385b5..bbc334a96 100644
--- a/ui/v2.5/src/components/Settings/SettingsInterfacePanel/SettingsInterfacePanel.tsx
+++ b/ui/v2.5/src/components/Settings/SettingsInterfacePanel/SettingsInterfacePanel.tsx
@@ -599,6 +599,13 @@ export const SettingsInterfacePanel: React.FC = PatchComponent(
               saveLightboxSettings({ scrollAttemptsBeforeChange: v })
             }
           />
+
+          <BooleanSetting
+            id="lightbox_disable_animation"
+            headingID="dialogs.lightbox.disable_animation"
+            checked={iface.imageLightbox?.disableAnimation ?? false}
+            onChange={(v) => saveLightboxSettings({ disableAnimation: v })}
+          />
         </SettingSection>
 
         <SettingSection headingID="config.ui.detail.heading">
diff --git a/ui/v2.5/src/hooks/Lightbox/Lightbox.tsx b/ui/v2.5/src/hooks/Lightbox/Lightbox.tsx
index f0f057d86..65c15024c 100644
--- a/ui/v2.5/src/hooks/Lightbox/Lightbox.tsx
+++ b/ui/v2.5/src/hooks/Lightbox/Lightbox.tsx
@@ -200,6 +200,8 @@ export const LightboxComponent: React.FC<IProps> = ({
     config?.interface.imageLightbox.scrollAttemptsBeforeChange ?? 0
   );
 
+  const disableAnimation = config?.interface.imageLightbox.disableAnimation;
+
   function setSlideshowDelay(v: number) {
     setLightboxSettings({ slideshowDelay: v });
   }
@@ -340,6 +342,10 @@ export const LightboxComponent: React.FC<IProps> = ({
     (isUserAction = true) => {
       if (isSwitchingPage || index === -1) return;
 
+      if (disableAnimation) {
+        setInstant();
+      }
+
       setShowChapters(false);
       setMovingLeft(true);
 
@@ -357,13 +363,25 @@ export const LightboxComponent: React.FC<IProps> = ({
         resetIntervalCallback.current();
       }
     },
-    [images, pageCallback, isSwitchingPage, resetIntervalCallback, index]
+    [
+      images,
+      pageCallback,
+      isSwitchingPage,
+      resetIntervalCallback,
+      index,
+      disableAnimation,
+      setInstant,
+    ]
   );
 
   const handleRight = useCallback(
     (isUserAction = true) => {
       if (isSwitchingPage) return;
 
+      if (disableAnimation) {
+        setInstant();
+      }
+
       setMovingLeft(false);
       setShowChapters(false);
 
@@ -388,6 +406,8 @@ export const LightboxComponent: React.FC<IProps> = ({
       isSwitchingPage,
       resetIntervalCallback,
       index,
+      disableAnimation,
+      setInstant,
     ]
   );
 
diff --git a/ui/v2.5/src/locales/en-GB.json b/ui/v2.5/src/locales/en-GB.json
index 37ef0d12b..e4c8b6a7c 100644
--- a/ui/v2.5/src/locales/en-GB.json
+++ b/ui/v2.5/src/locales/en-GB.json
@@ -938,6 +938,7 @@
     },
     "lightbox": {
       "delay": "Delay (Sec)",
+      "disable_animation": "Disable transition animation between images",
       "display_mode": {
         "fit_horizontally": "Fit horizontally",
         "fit_to_screen": "Fit to screen",

From e213fde0cc766971b9ee19ad0f9c9bd275312e7b Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Tue, 2 Dec 2025 14:27:29 +1100
Subject: [PATCH 185/405] Return error when scanning avif in zip (#6356)

---
 pkg/file/image/scan.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkg/file/image/scan.go b/pkg/file/image/scan.go
index ac5c04162..7ac69480c 100644
--- a/pkg/file/image/scan.go
+++ b/pkg/file/image/scan.go
@@ -2,6 +2,7 @@ package image
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"image"
 	"path/filepath"
@@ -19,6 +20,8 @@ import (
 	_ "golang.org/x/image/webp"
 )
 
+var ErrUnsupportedAVIFInZip = errors.New("AVIF images in zip files is unsupported")
+
 // Decorator adds image specific fields to a File.
 type Decorator struct {
 	FFProbe *ffmpeg.FFProbe
@@ -32,8 +35,7 @@ func (d *Decorator) Decorate(ctx context.Context, fs models.FS, f models.File) (
 	if _, isOs := fs.(*file.OsFS); !isOs {
 		// AVIF images inside zip files are not supported
 		if strings.ToLower(filepath.Ext(base.Path)) == ".avif" {
-			logger.Warnf("Skipping AVIF image in zip file: %s", base.Path)
-			return f, nil
+			return nil, fmt.Errorf("%w: %s", ErrUnsupportedAVIFInZip, base.Path)
 		}
 		logger.Debugf("assuming ImageFile for non-OsFS file %q", base.Path)
 		return decorateFallback(fs, f)

From 730e877e736ff50258bec480c1afa9a02f771d31 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Wed, 3 Dec 2025 14:59:15 +1100
Subject: [PATCH 186/405] [RFC] Refactor scene list toolbar (#6322)

* Revert scene list toolbar to use common filtered list toolbar
* Add unobtrusive sidebar toggle button
* Revert small device sidebar changes
* Minor styling fixes
---
 .../components/List/FilteredListToolbar.tsx   |  22 +-
 .../components/List/ListOperationButtons.tsx  |   5 +-
 .../src/components/List/ListResultsHeader.tsx |  73 ----
 ui/v2.5/src/components/List/ListToolbar.tsx   | 141 -------
 ui/v2.5/src/components/List/styles.scss       | 382 ++----------------
 ui/v2.5/src/components/Scenes/SceneList.tsx   | 106 +++--
 ui/v2.5/src/components/Scenes/styles.scss     |  22 +
 ui/v2.5/src/components/Shared/Sidebar.tsx     |  46 ++-
 ui/v2.5/src/components/Shared/styles.scss     |  67 +--
 9 files changed, 197 insertions(+), 667 deletions(-)
 delete mode 100644 ui/v2.5/src/components/List/ListResultsHeader.tsx
 delete mode 100644 ui/v2.5/src/components/List/ListToolbar.tsx

diff --git a/ui/v2.5/src/components/List/FilteredListToolbar.tsx b/ui/v2.5/src/components/List/FilteredListToolbar.tsx
index b3c0883a6..4e101ee4b 100644
--- a/ui/v2.5/src/components/List/FilteredListToolbar.tsx
+++ b/ui/v2.5/src/components/List/FilteredListToolbar.tsx
@@ -78,6 +78,7 @@ export interface IFilteredListToolbar {
   onEdit?: () => void;
   onDelete?: () => void;
   operations?: IListFilterOperation[];
+  operationComponent?: React.ReactNode;
   zoomable?: boolean;
 }
 
@@ -90,6 +91,7 @@ export const FilteredListToolbar: React.FC<IFilteredListToolbar> = ({
   onEdit,
   onDelete,
   operations,
+  operationComponent,
   zoomable = false,
 }) => {
   const filterOptions = filter.options;
@@ -100,6 +102,17 @@ export const FilteredListToolbar: React.FC<IFilteredListToolbar> = ({
   const { selectedIds, onSelectAll, onSelectNone } = listSelect;
   const hasSelection = selectedIds.size > 0;
 
+  const renderOperations = operationComponent ?? (
+    <ListOperationButtons
+      onSelectAll={onSelectAll}
+      onSelectNone={onSelectNone}
+      otherOperations={operations}
+      itemsSelected={selectedIds.size > 0}
+      onEdit={onEdit}
+      onDelete={onDelete}
+    />
+  );
+
   return (
     <ButtonToolbar
       className={cx("filtered-list-toolbar", { "has-selection": hasSelection })}
@@ -147,14 +160,7 @@ export const FilteredListToolbar: React.FC<IFilteredListToolbar> = ({
         </>
       )}
 
-      <ListOperationButtons
-        onSelectAll={onSelectAll}
-        onSelectNone={onSelectNone}
-        otherOperations={operations}
-        itemsSelected={selectedIds.size > 0}
-        onEdit={onEdit}
-        onDelete={onDelete}
-      />
+      {renderOperations}
 
       <ListViewButtonGroup
         displayMode={filter.displayMode}
diff --git a/ui/v2.5/src/components/List/ListOperationButtons.tsx b/ui/v2.5/src/components/List/ListOperationButtons.tsx
index 2d8e83039..66f4b46f3 100644
--- a/ui/v2.5/src/components/List/ListOperationButtons.tsx
+++ b/ui/v2.5/src/components/List/ListOperationButtons.tsx
@@ -16,12 +16,13 @@ export const OperationDropdown: React.FC<
   PropsWithChildren<{
     className?: string;
     menuPortalTarget?: HTMLElement;
+    menuClassName?: string;
   }>
-> = ({ className, menuPortalTarget, children }) => {
+> = ({ className, menuPortalTarget, menuClassName, children }) => {
   if (!children) return null;
 
   const menu = (
-    <Dropdown.Menu className="bg-secondary text-white">
+    <Dropdown.Menu className={cx("bg-secondary text-white", menuClassName)}>
       {children}
     </Dropdown.Menu>
   );
diff --git a/ui/v2.5/src/components/List/ListResultsHeader.tsx b/ui/v2.5/src/components/List/ListResultsHeader.tsx
deleted file mode 100644
index 8a1bba05e..000000000
--- a/ui/v2.5/src/components/List/ListResultsHeader.tsx
+++ /dev/null
@@ -1,73 +0,0 @@
-import React from "react";
-import { ListFilterModel } from "src/models/list-filter/filter";
-import { Pagination, PaginationIndex } from "../List/Pagination";
-import { ButtonToolbar } from "react-bootstrap";
-import { ListViewOptions } from "../List/ListViewOptions";
-import { PageSizeSelector, SortBySelect } from "../List/ListFilter";
-import cx from "classnames";
-
-export const ListResultsHeader: React.FC<{
-  className?: string;
-  loading: boolean;
-  filter: ListFilterModel;
-  totalCount: number;
-  metadataByline?: React.ReactNode;
-  onChangeFilter: (filter: ListFilterModel) => void;
-}> = ({
-  className,
-  loading,
-  filter,
-  totalCount,
-  metadataByline,
-  onChangeFilter,
-}) => {
-  return (
-    <ButtonToolbar className={cx(className, "list-results-header")}>
-      <div>
-        <SortBySelect
-          options={filter.options.sortByOptions}
-          sortBy={filter.sortBy}
-          sortDirection={filter.sortDirection}
-          onChangeSortBy={(s) =>
-            onChangeFilter(filter.setSortBy(s ?? undefined))
-          }
-          onChangeSortDirection={() =>
-            onChangeFilter(filter.toggleSortDirection())
-          }
-          onReshuffleRandomSort={() =>
-            onChangeFilter(filter.reshuffleRandomSort())
-          }
-        />
-        <PageSizeSelector
-          pageSize={filter.itemsPerPage}
-          setPageSize={(s) => onChangeFilter(filter.setPageSize(s))}
-        />
-        <ListViewOptions
-          displayMode={filter.displayMode}
-          zoomIndex={filter.zoomIndex}
-          displayModeOptions={filter.options.displayModeOptions}
-          onSetDisplayMode={(mode) =>
-            onChangeFilter(filter.setDisplayMode(mode))
-          }
-          onSetZoom={(zoom) => onChangeFilter(filter.setZoom(zoom))}
-        />
-      </div>
-      <div className="pagination-index-container">
-        <Pagination
-          currentPage={filter.currentPage}
-          itemsPerPage={filter.itemsPerPage}
-          totalItems={totalCount}
-          onChangePage={(page) => onChangeFilter(filter.changePage(page))}
-        />
-        <PaginationIndex
-          loading={loading}
-          itemsPerPage={filter.itemsPerPage}
-          currentPage={filter.currentPage}
-          totalItems={totalCount}
-          metadataByline={metadataByline}
-        />
-      </div>
-      <div className="empty-space"></div>
-    </ButtonToolbar>
-  );
-};
diff --git a/ui/v2.5/src/components/List/ListToolbar.tsx b/ui/v2.5/src/components/List/ListToolbar.tsx
deleted file mode 100644
index 25ee281c0..000000000
--- a/ui/v2.5/src/components/List/ListToolbar.tsx
+++ /dev/null
@@ -1,141 +0,0 @@
-import React from "react";
-import { FormattedMessage, useIntl } from "react-intl";
-import { ListFilterModel } from "src/models/list-filter/filter";
-import { faTimes } from "@fortawesome/free-solid-svg-icons";
-import { FilterTags } from "../List/FilterTags";
-import cx from "classnames";
-import { Button, ButtonGroup, ButtonToolbar } from "react-bootstrap";
-import { FilterButton } from "../List/Filters/FilterButton";
-import { Icon } from "../Shared/Icon";
-import { SearchTermInput } from "../List/ListFilter";
-import { Criterion } from "src/models/list-filter/criteria/criterion";
-import { SidebarToggleButton } from "../Shared/Sidebar";
-import { PatchComponent } from "src/patch";
-import { SavedFilterDropdown } from "./SavedFilterList";
-import { View } from "./views";
-
-export const ToolbarFilterSection: React.FC<{
-  filter: ListFilterModel;
-  onToggleSidebar: () => void;
-  onSetFilter: (filter: ListFilterModel) => void;
-  onEditCriterion: (c?: Criterion) => void;
-  onRemoveCriterion: (criterion: Criterion, valueIndex?: number) => void;
-  onRemoveAllCriterion: () => void;
-  onEditSearchTerm: () => void;
-  onRemoveSearchTerm: () => void;
-  view?: View;
-}> = PatchComponent(
-  "ToolbarFilterSection",
-  ({
-    filter,
-    onToggleSidebar,
-    onSetFilter,
-    onEditCriterion,
-    onRemoveCriterion,
-    onRemoveAllCriterion,
-    onEditSearchTerm,
-    onRemoveSearchTerm,
-    view,
-  }) => {
-    const { criteria, searchTerm } = filter;
-
-    return (
-      <>
-        <div className="search-container">
-          <SearchTermInput filter={filter} onFilterUpdate={onSetFilter} />
-        </div>
-        <div className="filter-section">
-          <ButtonGroup>
-            <SidebarToggleButton onClick={onToggleSidebar} />
-            <SavedFilterDropdown
-              filter={filter}
-              onSetFilter={onSetFilter}
-              view={view}
-              menuPortalTarget={document.body}
-            />
-            <FilterButton
-              onClick={() => onEditCriterion()}
-              count={criteria.length}
-            />
-          </ButtonGroup>
-          <FilterTags
-            searchTerm={searchTerm}
-            criteria={criteria}
-            onEditCriterion={onEditCriterion}
-            onRemoveCriterion={onRemoveCriterion}
-            onRemoveAll={onRemoveAllCriterion}
-            onEditSearchTerm={onEditSearchTerm}
-            onRemoveSearchTerm={onRemoveSearchTerm}
-            truncateOnOverflow
-          />
-        </div>
-      </>
-    );
-  }
-);
-
-export const ToolbarSelectionSection: React.FC<{
-  selected: number;
-  onToggleSidebar: () => void;
-  operations?: React.ReactNode;
-  onSelectAll: () => void;
-  onSelectNone: () => void;
-}> = PatchComponent(
-  "ToolbarSelectionSection",
-  ({ selected, onToggleSidebar, operations, onSelectAll, onSelectNone }) => {
-    const intl = useIntl();
-
-    return (
-      <div className="toolbar-selection-section">
-        <div className="selected-items-info">
-          <SidebarToggleButton onClick={onToggleSidebar} />
-          <Button
-            variant="secondary"
-            className="minimal"
-            onClick={() => onSelectNone()}
-            title={intl.formatMessage({ id: "actions.select_none" })}
-          >
-            <Icon icon={faTimes} />
-          </Button>
-          <span>{selected} selected</span>
-          <Button variant="link" onClick={() => onSelectAll()}>
-            <FormattedMessage id="actions.select_all" />
-          </Button>
-        </div>
-        {operations}
-        <div className="empty-space" />
-      </div>
-    );
-  }
-);
-
-// TODO - rename to FilteredListToolbar once all list components have been updated
-// TODO - and expose to plugins
-export const FilteredListToolbar2: React.FC<{
-  className?: string;
-  hasSelection: boolean;
-  filterSection: React.ReactNode;
-  selectionSection: React.ReactNode;
-  operationSection: React.ReactNode;
-}> = ({
-  className,
-  hasSelection,
-  filterSection,
-  selectionSection,
-  operationSection,
-}) => {
-  return (
-    <ButtonToolbar
-      className={cx(className, "filtered-list-toolbar", {
-        "has-selection": hasSelection,
-      })}
-    >
-      {!hasSelection ? filterSection : selectionSection}
-      {!hasSelection ? (
-        <div className="filtered-list-toolbar-operations">
-          {operationSection}
-        </div>
-      ) : null}
-    </ButtonToolbar>
-  );
-};
diff --git a/ui/v2.5/src/components/List/styles.scss b/ui/v2.5/src/components/List/styles.scss
index 60cf0c52f..5f1b4da2a 100644
--- a/ui/v2.5/src/components/List/styles.scss
+++ b/ui/v2.5/src/components/List/styles.scss
@@ -948,14 +948,6 @@ input[type="range"].zoom-slider {
   }
 }
 
-.sidebar-pane .filtered-list-toolbar {
-  flex-wrap: nowrap;
-
-  & > .btn-group {
-    align-items: baseline;
-  }
-}
-
 .custom-field-filter {
   align-items: center;
   display: flex;
@@ -987,14 +979,6 @@ input[type="range"].zoom-slider {
 }
 
 .sidebar {
-  // make controls slightly larger on mobile
-  @include media-breakpoint-down(xs) {
-    .btn,
-    .form-control {
-      font-size: 1.25rem;
-    }
-  }
-
   .sidebar-search-container {
     display: flex;
     margin-bottom: 0.5rem;
@@ -1033,18 +1017,22 @@ input[type="range"].zoom-slider {
   }
 }
 
-.pagination-footer {
+.pagination-footer-container {
   background-color: transparent;
   bottom: $navbar-height;
-  margin: auto;
-  padding: 0.5rem 1rem 0.75rem;
   position: sticky;
-  width: fit-content;
   z-index: 10;
 
   @include media-breakpoint-up(sm) {
     bottom: 0;
   }
+}
+
+.pagination-footer {
+  margin: auto;
+  padding: 0.5rem 1rem 0.75rem;
+
+  width: fit-content;
 
   .pagination.btn-group {
     box-shadow: 0 8px 10px 2px rgb(0 0 0 / 30%);
@@ -1060,6 +1048,18 @@ input[type="range"].zoom-slider {
   }
 }
 
+// on very large screens, offset the margins to center the pagination controls
+@media (min-width: 1800px) {
+  .sidebar-pane:not(.hide-sidebar) {
+    .filter-tags,
+    .pagination-index-container,
+    .pagination-footer-container {
+      margin-left: -$sidebar-width;
+      margin-right: 0;
+    }
+  }
+}
+
 // hide sidebar Edit Filter button on larger screens
 @include media-breakpoint-up(md) {
   .sidebar .edit-filter-button {
@@ -1067,233 +1067,12 @@ input[type="range"].zoom-slider {
   }
 }
 
-// the following refers to the new FilteredListToolbar2 component
-// ensure the rules here don't conflict with the original filtered-list-toolbar above
-// TODO - replace with only .filtered-list-toolbar once all lists use the new toolbar
-.scene-list-toolbar {
-  &.filtered-list-toolbar {
-    align-items: center;
-    background-color: $body-bg;
-    display: flex;
-    flex-wrap: wrap;
-    justify-content: space-between;
-    margin-bottom: 0;
-    row-gap: 1rem;
-
-    > div {
-      align-items: center;
-      display: flex;
-      gap: 0.5rem;
-      justify-content: flex-start;
-
-      &:last-child {
-        flex-shrink: 0;
-        justify-content: flex-end;
-      }
-    }
-  }
-
-  &.filtered-list-toolbar {
-    flex-wrap: nowrap;
-    gap: 1rem;
-    position: sticky;
-    top: $navbar-height;
-    z-index: 10;
-
-    @include media-breakpoint-down(xs) {
-      top: 0;
-    }
-
-    // hide drop down menu items for play and create new
-    // when the buttons are visible
-    @include media-breakpoint-up(sm) {
-      .scene-list-operations {
-        .play-item,
-        .create-new-item {
-          display: none;
-        }
-      }
-    }
-
-    // hide play and create new buttons on xs screens
-    // show these in the drop down menu instead
-    @include media-breakpoint-down(xs) {
-      .play-button,
-      .create-new-button {
-        display: none;
-      }
-    }
-
-    .toolbar-selection-section,
-    div.filter-section {
-      border: 1px solid $secondary;
-      border-radius: 0.25rem;
-      flex-grow: 1;
-      overflow-x: hidden;
-    }
-
-    div.toolbar-selection-section {
-      display: flex;
-      flex-direction: row;
-      flex-wrap: nowrap;
-      justify-content: center;
-
-      .sidebar-toggle-button {
-        margin-right: 0.5rem;
-      }
-
-      > div:first-child,
-      > div:last-child {
-        flex: 1;
-      }
-
-      > div:last-child {
-        display: flex;
-        justify-content: flex-end;
-      }
-
-      .scene-list-operations {
-        display: flex;
-      }
-
-      // on smaller viewports move the operation buttons to the right
-      @include media-breakpoint-down(md) {
-        div.scene-list-operations {
-          flex: 1;
-          justify-content: flex-end;
-          order: 3;
-        }
-
-        > div:last-child {
-          flex: 0;
-          order: 2;
-        }
-      }
-    }
-
-    // on larger viewports, move the operation buttons to the center
-    @include media-breakpoint-up(lg) {
-      div.toolbar-selection-section div.scene-list-operations {
-        justify-content: center;
-
-        > .btn-group {
-          gap: 0.5rem;
-        }
-      }
-
-      div.toolbar-selection-section .empty-space {
-        flex: 1;
-        order: 3;
-      }
-    }
-
-    .search-container {
-      border-right: 1px solid $secondary;
-      display: flex;
-      margin-right: -0.5rem;
-      min-width: calc($sidebar-width - 15px);
-      padding-right: 10px;
-
-      .search-term-input {
-        margin-right: 0;
-        width: 100%;
-
-        .clearable-text-field {
-          height: 100%;
-        }
-      }
-    }
-
-    .filter-tags {
-      flex-grow: 1;
-      flex-wrap: nowrap;
-      justify-content: flex-start;
-      margin-bottom: 0;
-
-      // account for filter button, and toggle sidebar buttons with gaps
-      width: calc(100% - 70px - 1rem);
-
-      @include media-breakpoint-down(xs) {
-        overflow-x: auto;
-        scrollbar-width: thin;
-      }
-
-      .tag-item {
-        white-space: nowrap;
-      }
-    }
-  }
-}
-
-// hide the search box in the toolbar when sidebar is shown on larger screens
-// larger screens don't overlap the sidebar
-@include media-breakpoint-up(md) {
-  .sidebar-pane:not(.hide-sidebar) .filtered-list-toolbar .search-container {
+// hide the search input field if the sidebar is open on smaller screens
+@media (min-width: 576px) and (max-width: 1400px) {
+  .sidebar-pane:not(.hide-sidebar) .filtered-list-toolbar .search-term-input {
     display: none;
   }
 }
-// hide the search box when sidebar is hidden on smaller screens
-@include media-breakpoint-down(md) {
-  .sidebar-pane.hide-sidebar .filtered-list-toolbar .search-container {
-    display: none;
-  }
-}
-
-// hide the filter and saved filters icon buttons when sidebar is shown on smaller screens
-@include media-breakpoint-down(sm) {
-  .sidebar-pane:not(.hide-sidebar) .filtered-list-toolbar {
-    .filter-button,
-    .saved-filter-dropdown {
-      display: none;
-    }
-  }
-
-  // adjust the width of the filter-tags as well
-  .sidebar-pane:not(.hide-sidebar) .filtered-list-toolbar .filter-tags {
-    width: calc(100% - 35px - 0.5rem);
-  }
-}
-
-// move the sidebar toggle to the left on larger viewports
-@include media-breakpoint-up(md) {
-  .filtered-list-toolbar .filter-section {
-    .sidebar-toggle-button {
-      margin-left: 0;
-    }
-
-    .filter-tags {
-      order: 2;
-    }
-  }
-}
-
-// hide the search term tag item when the search box is visible
-@include media-breakpoint-up(lg) {
-  // TODO - remove scene-list-toolbar when all lists use the new toolbar
-  .scene-list-toolbar.filtered-list-toolbar
-    .filter-tags
-    .search-term-filter-tag {
-    display: none;
-  }
-}
-@include media-breakpoint-down(md) {
-  // TODO - remove scene-list-toolbar when all lists use the new toolbar
-  .sidebar-pane:not(.hide-sidebar)
-    .scene-list-toolbar.filtered-list-toolbar
-    .filter-tags
-    .search-term-filter-tag {
-    display: none;
-  }
-}
-
-// TODO - remove scene-list-toolbar when all lists use the new toolbar
-.detail-body .scene-list-toolbar.filtered-list-toolbar {
-  top: calc($sticky-detail-header-height + $navbar-height);
-
-  @include media-breakpoint-down(xs) {
-    top: 0;
-  }
-}
 
 #more-criteria-popover {
   box-shadow: 0 8px 10px 2px rgb(0 0 0 / 30%);
@@ -1301,103 +1080,6 @@ input[type="range"].zoom-slider {
   padding: 0.25rem;
 }
 
-.list-results-header {
-  align-items: flex-start;
-  background-color: $body-bg;
-  display: flex;
-
-  > div {
-    align-items: center;
-    display: flex;
-    flex: 1;
-    gap: 0.5rem;
-    justify-content: flex-start;
-
-    &.pagination-index-container {
-      justify-content: center;
-    }
-
-    &:last-child {
-      flex-shrink: 0;
-      justify-content: flex-end;
-    }
-  }
-}
-
-.list-results-header .pagination-index-container {
-  display: flex;
-  flex-direction: column;
-  gap: 0.5rem;
-
-  .pagination {
-    // hidden by default. Can be shown via css override if needed
-    display: none;
-    margin: 0;
-  }
-}
-
-.list-results-header {
-  gap: 0.25rem;
-  margin-bottom: 0.5rem;
-
-  .paginationIndex {
-    margin: 0;
-  }
-
-  // move pagination info to right on medium screens
-  @include media-breakpoint-down(md) {
-    & > .empty-space {
-      flex: 0;
-    }
-
-    & > div.pagination-index-container {
-      align-items: flex-end;
-      order: 3;
-    }
-  }
-
-  // center the header on smaller screens
-  @include media-breakpoint-down(sm) {
-    & > div,
-    & > div.pagination-index-container {
-      flex-basis: 100%;
-      justify-content: center;
-      margin-left: auto;
-      margin-right: auto;
-    }
-
-    & > div.pagination-index-container {
-      align-items: center;
-    }
-  }
-}
-
-// sidebar visible styling
-.sidebar-pane:not(.hide-sidebar) .list-results-header {
-  // move pagination info to right on medium screens when sidebar
-  @include media-breakpoint-down(lg) {
-    & > .empty-space {
-      flex: 0;
-    }
-
-    & > div.pagination-index-container {
-      justify-content: flex-end;
-      order: 3;
-    }
-  }
-
-  // center the header on smaller screens when sidebar is visible
-  @include media-breakpoint-down(md) {
-    & > div,
-    & > div.pagination-index-container {
-      flex-basis: 100%;
-      justify-content: center;
-      margin-left: auto;
-      margin-right: auto;
-    }
-  }
-}
-
 // Duration slider styles
 .duration-slider,
 .age-slider-container {
@@ -1442,7 +1124,23 @@ input[type="range"].zoom-slider {
   justify-content: flex-start;
 }
 
-.item-list-container > .filtered-list-toolbar.has-selection {
+// modify margins for toolbar within sidebar pane to accommodate toggle button
+.sidebar-pane .filtered-list-toolbar {
+  margin-left: 40px;
+  margin-right: 40px;
+}
+
+// on very large screens, offset the margins to center the toolbar
+@media (min-width: 1800px) {
+  .sidebar-pane:not(.hide-sidebar) {
+    .filtered-list-toolbar {
+      margin-left: -$sidebar-width;
+      margin-right: 0;
+    }
+  }
+}
+
+.item-list-container .filtered-list-toolbar.has-selection {
   border-radius: 0.5rem;
   margin-left: auto;
   margin-right: auto;
diff --git a/ui/v2.5/src/components/Scenes/SceneList.tsx b/ui/v2.5/src/components/Scenes/SceneList.tsx
index dc3ea76c6..fa390d187 100644
--- a/ui/v2.5/src/components/Scenes/SceneList.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneList.tsx
@@ -67,17 +67,13 @@ import {
   useFilteredSidebarKeybinds,
 } from "../List/Filters/FilterSidebar";
 import { PatchContainerComponent } from "src/patch";
-import { Pagination } from "../List/Pagination";
+import { Pagination, PaginationIndex } from "../List/Pagination";
 import { Button, ButtonGroup } from "react-bootstrap";
 import { Icon } from "../Shared/Icon";
 import useFocus from "src/utils/focus";
-import {
-  FilteredListToolbar2,
-  ToolbarFilterSection,
-  ToolbarSelectionSection,
-} from "../List/ListToolbar";
-import { ListResultsHeader } from "../List/ListResultsHeader";
 import { useZoomKeybinds } from "../List/ZoomSlider";
+import { FilteredListToolbar } from "../List/FilteredListToolbar";
+import { FilterTags } from "../List/FilterTags";
 
 function renderMetadataByline(result: GQL.FindScenesQueryResult) {
   const duration = result?.data?.findScenes?.duration;
@@ -439,6 +435,7 @@ const SceneListOperations: React.FC<{
 
         <OperationDropdown
           className="scene-list-operations"
+          menuClassName="scene-list-operations-dropdown"
           menuPortalTarget={document.body}
         >
           {operations.map((o) => {
@@ -474,7 +471,6 @@ export const FilteredSceneList = (props: IFilteredScenes) => {
   const history = useHistory();
 
   const searchFocus = useFocus();
-  const [, setSearchFocus] = searchFocus;
 
   const { filterHook, defaultSort, view, alterQuery, fromGroupId } = props;
 
@@ -752,50 +748,44 @@ export const FilteredSceneList = (props: IFilteredScenes) => {
                 focus={searchFocus}
               />
             </Sidebar>
-            <SidebarPaneContent>
-              <FilteredListToolbar2
-                className="scene-list-toolbar"
-                hasSelection={hasSelection}
-                filterSection={
-                  <ToolbarFilterSection
-                    filter={filter}
-                    onSetFilter={setFilter}
-                    onToggleSidebar={() => setShowSidebar(!showSidebar)}
-                    onEditCriterion={(c) =>
-                      showEditFilter(c?.criterionOption.type)
-                    }
-                    onRemoveCriterion={removeCriterion}
-                    onRemoveAllCriterion={() => clearAllCriteria(true)}
-                    onEditSearchTerm={() => {
-                      setShowSidebar(true);
-                      setSearchFocus(true);
-                    }}
-                    onRemoveSearchTerm={() =>
-                      setFilter(filter.clearSearchTerm())
-                    }
-                    view={view}
-                  />
-                }
-                selectionSection={
-                  <ToolbarSelectionSection
-                    selected={selectedIds.size}
-                    onToggleSidebar={() => setShowSidebar(!showSidebar)}
-                    onSelectAll={() => onSelectAll()}
-                    onSelectNone={() => onSelectNone()}
-                    operations={operations}
-                  />
-                }
-                operationSection={operations}
+            <SidebarPaneContent
+              onSidebarToggle={() => setShowSidebar(!showSidebar)}
+            >
+              <FilteredListToolbar
+                filter={filter}
+                listSelect={listSelect}
+                setFilter={setFilter}
+                showEditFilter={showEditFilter}
+                onDelete={onDelete}
+                onEdit={onEdit}
+                operationComponent={operations}
+                view={view}
+                zoomable
               />
 
-              <ListResultsHeader
-                loading={cachedResult.loading}
-                filter={filter}
-                totalCount={totalCount}
-                metadataByline={metadataByline}
-                onChangeFilter={(newFilter) => setFilter(newFilter)}
+              <FilterTags
+                criteria={filter.criteria}
+                onEditCriterion={(c) => showEditFilter(c.criterionOption.type)}
+                onRemoveCriterion={removeCriterion}
+                onRemoveAll={clearAllCriteria}
               />
 
+              <div className="pagination-index-container">
+                <Pagination
+                  currentPage={filter.currentPage}
+                  itemsPerPage={filter.itemsPerPage}
+                  totalItems={totalCount}
+                  onChangePage={(page) => setFilter(filter.changePage(page))}
+                />
+                <PaginationIndex
+                  loading={cachedResult.loading}
+                  itemsPerPage={filter.itemsPerPage}
+                  currentPage={filter.currentPage}
+                  totalItems={totalCount}
+                  metadataByline={metadataByline}
+                />
+              </div>
+
               <LoadedContent loading={result.loading} error={result.error}>
                 <SceneList
                   filter={effectiveFilter}
@@ -807,15 +797,17 @@ export const FilteredSceneList = (props: IFilteredScenes) => {
               </LoadedContent>
 
               {totalCount > filter.itemsPerPage && (
-                <div className="pagination-footer">
-                  <Pagination
-                    itemsPerPage={filter.itemsPerPage}
-                    currentPage={filter.currentPage}
-                    totalItems={totalCount}
-                    metadataByline={metadataByline}
-                    onChangePage={setPage}
-                    pagePopupPlacement="top"
-                  />
+                <div className="pagination-footer-container">
+                  <div className="pagination-footer">
+                    <Pagination
+                      itemsPerPage={filter.itemsPerPage}
+                      currentPage={filter.currentPage}
+                      totalItems={totalCount}
+                      metadataByline={metadataByline}
+                      onChangePage={setPage}
+                      pagePopupPlacement="top"
+                    />
+                  </div>
                 </div>
               )}
             </SidebarPaneContent>
diff --git a/ui/v2.5/src/components/Scenes/styles.scss b/ui/v2.5/src/components/Scenes/styles.scss
index 3b00130b1..92c13d648 100644
--- a/ui/v2.5/src/components/Scenes/styles.scss
+++ b/ui/v2.5/src/components/Scenes/styles.scss
@@ -964,3 +964,25 @@ input[type="range"].blue-slider {
   // TODO - this will need to be rolled out to other tables
   max-height: calc(100dvh - 210px);
 }
+
+.scene-list .filtered-list-toolbar {
+  // hide play and create new buttons on xs screens
+  // show these in the drop down menu instead
+  @include media-breakpoint-down(xs) {
+    .play-button,
+    .create-new-button {
+      display: none;
+    }
+  }
+}
+
+// hide drop down menu items for play and create new
+// when the buttons are visible
+@include media-breakpoint-up(sm) {
+  .scene-list-operations-dropdown {
+    .dropdown-item.play-item,
+    .dropdown-item.create-new-item {
+      display: none;
+    }
+  }
+}
diff --git a/ui/v2.5/src/components/Shared/Sidebar.tsx b/ui/v2.5/src/components/Shared/Sidebar.tsx
index bf19f5842..10dbaaaba 100644
--- a/ui/v2.5/src/components/Shared/Sidebar.tsx
+++ b/ui/v2.5/src/components/Shared/Sidebar.tsx
@@ -60,8 +60,34 @@ export const SidebarPane: React.FC<
   );
 };
 
-export const SidebarPaneContent: React.FC = ({ children }) => {
-  return <div className="sidebar-pane-content">{children}</div>;
+export const SidebarToggleButton: React.FC<{
+  onClick: () => void;
+}> = ({ onClick }) => {
+  const intl = useIntl();
+  return (
+    <div className="sidebar-toggle-button-container">
+      <Button
+        className="sidebar-toggle-button ignore-sidebar-outside-click minimal"
+        variant="secondary"
+        onClick={onClick}
+        title={intl.formatMessage({ id: "actions.sidebar.toggle" })}
+      >
+        <Icon icon={faSliders} />
+      </Button>
+    </div>
+  );
+};
+
+export const SidebarPaneContent: React.FC<{ onSidebarToggle: () => void }> = ({
+  onSidebarToggle,
+  children,
+}) => {
+  return (
+    <div className="sidebar-pane-content">
+      <SidebarToggleButton onClick={onSidebarToggle} />
+      {children}
+    </div>
+  );
 };
 
 interface IContext {
@@ -125,22 +151,6 @@ export const SidebarSection: React.FC<
   );
 };
 
-export const SidebarToggleButton: React.FC<{
-  onClick: () => void;
-}> = ({ onClick }) => {
-  const intl = useIntl();
-  return (
-    <Button
-      className="sidebar-toggle-button ignore-sidebar-outside-click"
-      variant="secondary"
-      onClick={onClick}
-      title={intl.formatMessage({ id: "actions.sidebar.toggle" })}
-    >
-      <Icon icon={faSliders} />
-    </Button>
-  );
-};
-
 // show sidebar by default if not on mobile
 export function defaultShowSidebar() {
   return !ScreenUtils.matchesMediaQuery(fixedSidebarMediaQuery);
diff --git a/ui/v2.5/src/components/Shared/styles.scss b/ui/v2.5/src/components/Shared/styles.scss
index 9985138e0..f7ad76e9d 100644
--- a/ui/v2.5/src/components/Shared/styles.scss
+++ b/ui/v2.5/src/components/Shared/styles.scss
@@ -815,21 +815,6 @@ button.btn.favorite-button {
     }
   }
   @include media-breakpoint-down(xs) {
-    .sidebar {
-      width: 100%;
-    }
-
-    &.hide-sidebar .sidebar {
-      margin-left: -100%;
-    }
-
-    &.hide-sidebar > :nth-child(2) {
-      width: 100%;
-    }
-  }
-  @include media-breakpoint-down(xs) {
-    display: block;
-
     .sidebar {
       margin-bottom: $navbar-height;
       margin-top: 0;
@@ -837,6 +822,36 @@ button.btn.favorite-button {
   }
 }
 
+.sidebar-toggle-button-container {
+  height: 100%;
+  position: absolute;
+
+  .sidebar-toggle-button {
+    border-bottom: 1px solid $secondary;
+    border-bottom-left-radius: 0;
+    border-bottom-right-radius: 10px;
+    border-right: 1px solid $secondary;
+    border-top: 1px solid $secondary;
+    border-top-left-radius: 0;
+    border-top-right-radius: 10px;
+    margin-left: -15px;
+    opacity: 0.5;
+    position: sticky;
+    top: calc($navbar-height + 0.5rem);
+    z-index: 10;
+
+    @include media-breakpoint-down(sm) {
+      top: 0.5rem;
+    }
+  }
+}
+
+.sidebar-pane:not(.hide-sidebar) .sidebar-toggle-button-container {
+  .sidebar-toggle-button {
+    margin-left: -0.5rem;
+  }
+}
+
 .sidebar-toolbar {
   // TODO - use different colours for sidebar and toolbar
   background-color: $body-bg;
@@ -884,6 +899,14 @@ button.btn.favorite-button {
 $sticky-header-height: calc(50px + 3.3rem);
 
 // special case for sidebar in details view
+.detail-body .sidebar-toggle-button-container .sidebar-toggle-button {
+  top: calc($sticky-header-height + 0.5rem);
+
+  @include media-breakpoint-down(sm) {
+    top: 0.5rem;
+  }
+}
+
 .detail-body {
   .sidebar {
     // required for sticky to work
@@ -921,19 +944,11 @@ $sticky-header-height: calc(50px + 3.3rem);
   }
   @include media-breakpoint-down(xs) {
     .sidebar {
-      flex: 100% 0 0;
-      height: calc(100vh - 4rem);
-      max-height: calc(100vh - 4rem);
+      // flex: 100% 0 0;
+      height: calc(100vh - $navbar-height);
+      max-height: calc(100vh - $navbar-height);
       top: 0;
     }
-
-    .sidebar-pane:not(.hide-sidebar) .sidebar {
-      margin-right: -100%;
-    }
-
-    .sidebar-pane.hide-sidebar .sidebar {
-      display: none;
-    }
   }
   @include media-breakpoint-up(md) {
     .sidebar-pane:not(.hide-sidebar) {

From 41f061202526295ddaeeef5e4e5e1dd63f0a24ef Mon Sep 17 00:00:00 2001
From: Shadesbird <github.shadesbird@phoenix-iv.de>
Date: Wed, 3 Dec 2025 21:26:23 +0100
Subject: [PATCH 187/405] Update Identify.md - Add advanced settings hint
 (#6372)

Did not find this feature by myself. Had to have a forum discussion to realise this feature exists and is hidden in the advanced settings.

Added hint that this is an advanced setting.
---
 ui/v2.5/src/docs/en/Manual/Identify.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ui/v2.5/src/docs/en/Manual/Identify.md b/ui/v2.5/src/docs/en/Manual/Identify.md
index cacd27923..c5c12d79d 100644
--- a/ui/v2.5/src/docs/en/Manual/Identify.md
+++ b/ui/v2.5/src/docs/en/Manual/Identify.md
@@ -1,5 +1,7 @@
 # Identify
 
+This task is part of the advanced settings mode.
+
 This task iterates through your Scenes and attempts to identify the scene using a selection of scraping sources.
 
 This task accepts one or more scraper sources. Valid scraper sources for the Identify task are stash-box instances, and scene scrapers which support scraping via Scene Fragment. The order of the sources may be rearranged.

From e02ef436a517603571860b99dfaee10d953928a6 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Thu, 4 Dec 2025 07:26:41 +1100
Subject: [PATCH 188/405] Fix batch tag update when studio/performer has no
 stash id (#6369)

* Handle batch tagging where stash id not set

Should search by name for these

* Don't set empty stash ids
---
 internal/manager/task_stash_box_tag.go |  8 +++++++-
 pkg/models/model_scraped_item.go       | 10 +++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/internal/manager/task_stash_box_tag.go b/internal/manager/task_stash_box_tag.go
index d7d987a6d..37859ba61 100644
--- a/internal/manager/task_stash_box_tag.go
+++ b/internal/manager/task_stash_box_tag.go
@@ -88,7 +88,7 @@ func (t *stashBoxBatchPerformerTagTask) findStashBoxPerformer(ctx context.Contex
 				performer = mergedPerformer
 			}
 		}
-	case t.performer != nil:
+	case t.performer != nil: // tagging or updating existing performer
 		var remoteID string
 		if err := r.WithReadTxn(ctx, func(ctx context.Context) error {
 			qb := r.Performer
@@ -123,6 +123,9 @@ func (t *stashBoxBatchPerformerTagTask) findStashBoxPerformer(ctx context.Contex
 					performer = mergedPerformer
 				}
 			}
+		} else {
+			// find by performer name instead
+			performer, err = client.FindPerformerByName(ctx, t.performer.Name)
 		}
 	}
 
@@ -328,6 +331,9 @@ func (t *stashBoxBatchStudioTagTask) findStashBoxStudio(ctx context.Context) (*m
 
 		if remoteID != "" {
 			studio, err = client.FindStudio(ctx, remoteID)
+		} else {
+			// find by studio name instead
+			studio, err = client.FindStudio(ctx, t.studio.Name)
 		}
 	}
 
diff --git a/pkg/models/model_scraped_item.go b/pkg/models/model_scraped_item.go
index 570f6034b..4254a9876 100644
--- a/pkg/models/model_scraped_item.go
+++ b/pkg/models/model_scraped_item.go
@@ -32,7 +32,7 @@ func (s *ScrapedStudio) ToStudio(endpoint string, excluded map[string]bool) *Stu
 	ret := NewStudio()
 	ret.Name = strings.TrimSpace(s.Name)
 
-	if s.RemoteSiteID != nil && endpoint != "" {
+	if s.RemoteSiteID != nil && endpoint != "" && *s.RemoteSiteID != "" {
 		ret.StashIDs = NewRelatedStashIDs([]StashID{
 			{
 				Endpoint:  endpoint,
@@ -141,7 +141,7 @@ func (s *ScrapedStudio) ToPartial(id string, endpoint string, excluded map[strin
 		}
 	}
 
-	if s.RemoteSiteID != nil && endpoint != "" {
+	if s.RemoteSiteID != nil && endpoint != "" && *s.RemoteSiteID != "" {
 		ret.StashIDs = &UpdateStashIDs{
 			StashIDs: existingStashIDs,
 			Mode:     RelationshipUpdateModeSet,
@@ -306,7 +306,7 @@ func (p *ScrapedPerformer) ToPerformer(endpoint string, excluded map[string]bool
 		}
 	}
 
-	if p.RemoteSiteID != nil && endpoint != "" {
+	if p.RemoteSiteID != nil && endpoint != "" && *p.RemoteSiteID != "" {
 		ret.StashIDs = NewRelatedStashIDs([]StashID{
 			{
 				Endpoint:  endpoint,
@@ -435,7 +435,7 @@ func (p *ScrapedPerformer) ToPartial(endpoint string, excluded map[string]bool,
 		}
 	}
 
-	if p.RemoteSiteID != nil && endpoint != "" {
+	if p.RemoteSiteID != nil && endpoint != "" && *p.RemoteSiteID != "" {
 		ret.StashIDs = &UpdateStashIDs{
 			StashIDs: existingStashIDs,
 			Mode:     RelationshipUpdateModeSet,
@@ -464,7 +464,7 @@ func (t *ScrapedTag) ToTag(endpoint string, excluded map[string]bool) *Tag {
 	ret := NewTag()
 	ret.Name = t.Name
 
-	if t.RemoteSiteID != nil && endpoint != "" {
+	if t.RemoteSiteID != nil && endpoint != "" && *t.RemoteSiteID != "" {
 		ret.StashIDs = NewRelatedStashIDs([]StashID{
 			{
 				Endpoint:  endpoint,

From ee61fc879bc4edf1ed2e70d3f3767bd320b818f4 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Thu, 4 Dec 2025 07:27:47 +1100
Subject: [PATCH 189/405] Add nil check for scraped measurements (#6367)

---
 pkg/stashbox/performer.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkg/stashbox/performer.go b/pkg/stashbox/performer.go
index 56d7b109e..38824eba1 100644
--- a/pkg/stashbox/performer.go
+++ b/pkg/stashbox/performer.go
@@ -125,8 +125,8 @@ func translateGender(gender *graphql.GenderEnum) *string {
 	return nil
 }
 
-func formatMeasurements(m graphql.MeasurementsFragment) *string {
-	if m.BandSize != nil && m.CupSize != nil && m.Hip != nil && m.Waist != nil {
+func formatMeasurements(m *graphql.MeasurementsFragment) *string {
+	if m != nil && m.BandSize != nil && m.CupSize != nil && m.Hip != nil && m.Waist != nil {
 		ret := fmt.Sprintf("%d%s-%d-%d", *m.BandSize, *m.CupSize, *m.Waist, *m.Hip)
 		return &ret
 	}
@@ -209,7 +209,7 @@ func performerFragmentToScrapedPerformer(p graphql.PerformerFragment) *models.Sc
 		Name:               &p.Name,
 		Disambiguation:     p.Disambiguation,
 		Country:            p.Country,
-		Measurements:       formatMeasurements(*p.Measurements),
+		Measurements:       formatMeasurements(p.Measurements),
 		CareerLength:       formatCareerLength(p.CareerStartYear, p.CareerEndYear),
 		Tattoos:            formatBodyModifications(p.Tattoos),
 		Piercings:          formatBodyModifications(p.Piercings),

From 0bc4faef2aab3dae5a97621cf527359191dd7261 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Thu, 4 Dec 2025 07:28:06 +1100
Subject: [PATCH 190/405] Add support for removing custom field keys (#6362)

---
 graphql/schema/types/metadata.graphql       |  2 +
 internal/api/custom_fields.go               | 12 ++++++
 internal/api/resolver_mutation_performer.go |  9 ++--
 pkg/models/custom_fields.go                 |  2 +
 pkg/sqlite/custom_fields.go                 | 46 ++++++++++++++++++---
 pkg/sqlite/custom_fields_test.go            | 38 ++++++++++++++++-
 6 files changed, 98 insertions(+), 11 deletions(-)
 create mode 100644 internal/api/custom_fields.go

diff --git a/graphql/schema/types/metadata.graphql b/graphql/schema/types/metadata.graphql
index 923c25b4c..c01858f64 100644
--- a/graphql/schema/types/metadata.graphql
+++ b/graphql/schema/types/metadata.graphql
@@ -344,4 +344,6 @@ input CustomFieldsInput {
   full: Map
   "If populated, only the keys in this map will be updated"
   partial: Map
+  "Remove any keys in this list"
+  remove: [String!]
 }
diff --git a/internal/api/custom_fields.go b/internal/api/custom_fields.go
new file mode 100644
index 000000000..5eaa6f67a
--- /dev/null
+++ b/internal/api/custom_fields.go
@@ -0,0 +1,12 @@
+package api
+
+import "github.com/stashapp/stash/pkg/models"
+
+func handleUpdateCustomFields(input models.CustomFieldsInput) models.CustomFieldsInput {
+	ret := input
+	// convert json.Numbers to int/float
+	ret.Full = convertMapJSONNumbers(ret.Full)
+	ret.Partial = convertMapJSONNumbers(ret.Partial)
+
+	return ret
+}
diff --git a/internal/api/resolver_mutation_performer.go b/internal/api/resolver_mutation_performer.go
index 15fb5056a..c54e3ca93 100644
--- a/internal/api/resolver_mutation_performer.go
+++ b/internal/api/resolver_mutation_performer.go
@@ -297,10 +297,7 @@ func (r *mutationResolver) PerformerUpdate(ctx context.Context, input models.Per
 		return nil, fmt.Errorf("converting tag ids: %w", err)
 	}
 
-	updatedPerformer.CustomFields = input.CustomFields
-	// convert json.Numbers to int/float
-	updatedPerformer.CustomFields.Full = convertMapJSONNumbers(updatedPerformer.CustomFields.Full)
-	updatedPerformer.CustomFields.Partial = convertMapJSONNumbers(updatedPerformer.CustomFields.Partial)
+	updatedPerformer.CustomFields = handleUpdateCustomFields(input.CustomFields)
 
 	var imageData []byte
 	imageIncluded := translator.hasField("image")
@@ -417,6 +414,10 @@ func (r *mutationResolver) BulkPerformerUpdate(ctx context.Context, input BulkPe
 		return nil, fmt.Errorf("converting tag ids: %w", err)
 	}
 
+	if input.CustomFields != nil {
+		updatedPerformer.CustomFields = handleUpdateCustomFields(*input.CustomFields)
+	}
+
 	ret := []*models.Performer{}
 
 	// Start the transaction and save the performers
diff --git a/pkg/models/custom_fields.go b/pkg/models/custom_fields.go
index 977c2fe89..5c3acd18b 100644
--- a/pkg/models/custom_fields.go
+++ b/pkg/models/custom_fields.go
@@ -9,6 +9,8 @@ type CustomFieldsInput struct {
 	Full map[string]interface{} `json:"full"`
 	// If populated, only the keys in this map will be updated
 	Partial map[string]interface{} `json:"partial"`
+	// Remove any keys in this list
+	Remove []string `json:"remove"`
 }
 
 type CustomFieldsReader interface {
diff --git a/pkg/sqlite/custom_fields.go b/pkg/sqlite/custom_fields.go
index bac6ae5e1..63f85b250 100644
--- a/pkg/sqlite/custom_fields.go
+++ b/pkg/sqlite/custom_fields.go
@@ -41,18 +41,31 @@ func (s *customFieldsStore) SetCustomFields(ctx context.Context, id int, values
 	case values.Partial != nil:
 		partial = true
 		valMap = values.Partial
-	default:
-		return nil
 	}
 
-	if err := s.validateCustomFields(valMap); err != nil {
+	if valMap != nil {
+		if err := s.validateCustomFields(valMap, values.Remove); err != nil {
+			return err
+		}
+
+		if err := s.setCustomFields(ctx, id, valMap, partial); err != nil {
+			return err
+		}
+	}
+
+	if err := s.deleteCustomFields(ctx, id, values.Remove); err != nil {
 		return err
 	}
 
-	return s.setCustomFields(ctx, id, valMap, partial)
+	return nil
 }
 
-func (s *customFieldsStore) validateCustomFields(values map[string]interface{}) error {
+func (s *customFieldsStore) validateCustomFields(values map[string]interface{}, deleteKeys []string) error {
+	// if values is nil, nothing to validate
+	if values == nil {
+		return nil
+	}
+
 	// ensure that custom field names are valid
 	// no leading or trailing whitespace, no empty strings
 	for k := range values {
@@ -61,6 +74,13 @@ func (s *customFieldsStore) validateCustomFields(values map[string]interface{})
 		}
 	}
 
+	// ensure delete keys are not also in values
+	for _, k := range deleteKeys {
+		if _, ok := values[k]; ok {
+			return fmt.Errorf("custom field name %q cannot be in both values and delete keys", k)
+		}
+	}
+
 	return nil
 }
 
@@ -130,6 +150,22 @@ func (s *customFieldsStore) setCustomFields(ctx context.Context, id int, values
 	return nil
 }
 
+func (s *customFieldsStore) deleteCustomFields(ctx context.Context, id int, keys []string) error {
+	if len(keys) == 0 {
+		return nil
+	}
+
+	q := dialect.Delete(s.table).
+		Where(s.fk.Eq(id)).
+		Where(goqu.I("field").In(keys))
+
+	if _, err := exec(ctx, q); err != nil {
+		return fmt.Errorf("deleting custom fields: %w", err)
+	}
+
+	return nil
+}
+
 func (s *customFieldsStore) GetCustomFields(ctx context.Context, id int) (map[string]interface{}, error) {
 	q := dialect.Select("field", "value").From(s.table).Where(s.fk.Eq(id))
 
diff --git a/pkg/sqlite/custom_fields_test.go b/pkg/sqlite/custom_fields_test.go
index ce5c77487..8ee154aec 100644
--- a/pkg/sqlite/custom_fields_test.go
+++ b/pkg/sqlite/custom_fields_test.go
@@ -64,6 +64,18 @@ func TestSetCustomFields(t *testing.T) {
 			}),
 			false,
 		},
+		{
+			"valid remove",
+			models.CustomFieldsInput{
+				Remove: []string{"real"},
+			},
+			func() map[string]interface{} {
+				m := getPerformerCustomFields(performerIdx)
+				delete(m, "real")
+				return m
+			}(),
+			false,
+		},
 		{
 			"leading space full",
 			models.CustomFieldsInput{
@@ -144,16 +156,38 @@ func TestSetCustomFields(t *testing.T) {
 			nil,
 			true,
 		},
+		{
+			"invalid remove full",
+			models.CustomFieldsInput{
+				Full: map[string]interface{}{
+					"key": "value",
+				},
+				Remove: []string{"key"},
+			},
+			nil,
+			true,
+		},
+		{
+			"invalid remove partial",
+			models.CustomFieldsInput{
+				Partial: map[string]interface{}{
+					"real": float64(4.56),
+				},
+				Remove: []string{"real"},
+			},
+			nil,
+			true,
+		},
 	}
 
 	// use performer custom fields store
 	store := db.Performer
 	id := performerIDs[performerIdx]
 
-	assert := assert.New(t)
-
 	for _, tt := range tests {
 		runWithRollbackTxn(t, tt.name, func(t *testing.T, ctx context.Context) {
+			assert := assert.New(t)
+
 			err := store.SetCustomFields(ctx, id, tt.input)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("SetCustomFields() error = %v, wantErr %v", err, tt.wantErr)

From 63e8830db47afb7656a167c389b49fff0fb61492 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Thu, 4 Dec 2025 07:28:30 +1100
Subject: [PATCH 191/405] Truncate custom field display to 5 lines (#6361)

---
 ui/v2.5/src/components/Shared/CustomFields.tsx |  3 ++-
 ui/v2.5/src/components/Shared/styles.scss      | 12 ++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/ui/v2.5/src/components/Shared/CustomFields.tsx b/ui/v2.5/src/components/Shared/CustomFields.tsx
index a522961a8..e7355df66 100644
--- a/ui/v2.5/src/components/Shared/CustomFields.tsx
+++ b/ui/v2.5/src/components/Shared/CustomFields.tsx
@@ -8,6 +8,7 @@ import { Icon } from "./Icon";
 import { faMinus, faPlus } from "@fortawesome/free-solid-svg-icons";
 import cx from "classnames";
 import { PatchComponent } from "src/patch";
+import { TruncatedText } from "./TruncatedText";
 
 const maxFieldNameLength = 64;
 
@@ -47,7 +48,7 @@ const CustomField: React.FC<{ field: string; value: unknown }> = ({
       id={id}
       label={field}
       labelTitle={field}
-      value={valueStr}
+      value={<TruncatedText lineCount={5} text={<>{valueStr}</>} />}
       fullWidth={true}
       showEmpty
     />
diff --git a/ui/v2.5/src/components/Shared/styles.scss b/ui/v2.5/src/components/Shared/styles.scss
index f7ad76e9d..55dff9d0f 100644
--- a/ui/v2.5/src/components/Shared/styles.scss
+++ b/ui/v2.5/src/components/Shared/styles.scss
@@ -712,6 +712,10 @@ button.btn.favorite-button {
 
 .custom-fields {
   width: 100%;
+
+  .detail-item {
+    max-width: 100%;
+  }
 }
 
 .custom-fields .detail-item .detail-item-title {
@@ -721,6 +725,14 @@ button.btn.favorite-button {
   white-space: nowrap;
 }
 
+.custom-fields .detail-item .detail-item-value {
+  word-break: break-word;
+
+  .TruncatedText {
+    white-space: pre-line;
+  }
+}
+
 .custom-fields-input > .collapse-button {
   font-weight: 700;
 }

From 3d044896ad21c72a661a45e51616dfd9be7beb34 Mon Sep 17 00:00:00 2001
From: DogmaDragon <103123951+DogmaDragon@users.noreply.github.com>
Date: Wed, 3 Dec 2025 22:48:36 +0200
Subject: [PATCH 192/405] Update Auto Tag/Identify documentation (#6371)

* Update Auto Tag documentation
* Update Identify documentation
---
 ui/v2.5/src/docs/en/Manual/AutoTagging.md | 52 ++++++++++++++++++-----
 ui/v2.5/src/docs/en/Manual/Identify.md    | 39 +++++++++++------
 2 files changed, 67 insertions(+), 24 deletions(-)

diff --git a/ui/v2.5/src/docs/en/Manual/AutoTagging.md b/ui/v2.5/src/docs/en/Manual/AutoTagging.md
index c311bed7a..4b1cbb813 100644
--- a/ui/v2.5/src/docs/en/Manual/AutoTagging.md
+++ b/ui/v2.5/src/docs/en/Manual/AutoTagging.md
@@ -1,18 +1,48 @@
-# Auto Tagging
+# Auto Tag
 
-When media filepaths or filenames contain a Performer, Studio, or Tag name, it is assigned those Performers, Studios, and Tags. It will **only** tag based on Performer, Studio, and Tag names that exist in your database.
+Auto Tag automatically assigns Performers, Studios, and Tags to your media based on their names found in file paths or filenames. This task works for scenes, images, and galleries.
 
-When the Performer/Studio/Tag name has multiple words, the search will include paths/filenames where the Performer/Studio/Tag name is separated with `.`, `-`, `_`, and whitespace characters.
+This task is part of the advanced settings mode.
 
-For example, auto tagging for performer `Jane Doe` will match the following filenames:
+## Rules
 
-* `Jane.Doe.1.mp4`
-* `Jane_Doe.2.mp4`
-* `Jane-Doe.3.mp4`
-* `Jane Doe.4.mp4`
+> **Important:** Auto Tag only works for names that already exist in your Stash database. It does not create new Performers, Studios, or Tags.
 
-Matching is case insensitive, and should only match exact wording within word boundaries. For example, the tag `Jane Doe` will not match `Maryjane-Doe` or `Jane-Doen`, but will match `Mary-Jane-Doe`, `Jane-Doe_n`, and `[OF]jane doe`.
+ - Multi-word names are matched when words appear in order and are separated by any of these characters: `.`, `-`, `_`, or whitespace. These separators are treated as word boundaries.
+ - Matching is case-insensitive but requires complete words within word boundaries. Partial words or misspelled words will not match.
+ - Auto Tag does not match performer aliases. Aliases will not be considered during matching.
 
-Auto tagging for specific Performers, Studios, and Tags can be performed from the individual Performer/Studio/Tag page.
+### Examples (performer "Jane Doe")
 
-> **Note:** Performer autotagging does not currently match on performer aliases.
\ No newline at end of file
+**Matches:**
+
+| Example | Explanation |
+|---|---|
+| `Jane.Doe.1.mp4` | Dot as separator. |
+| `Jane_Doe.2.mp4` | Underscore as separator. |
+| `Jane-Doe.3.mp4` | Hyphen as separator. |
+| `Jane Doe.4.mp4` | Whitespace as separator. |
+| `Mary-Jane-Doe` | Extra characters around word boundaries are allowed. |
+| `Jane-Doe_n` | Extra characters around word boundaries are allowed. |
+| `[OF]jane doe` | Extra characters around word boundaries are allowed. |
+
+**Does not match:**
+
+| Example | Explanation |
+|---|---|
+| `Maryjane-Doe` | Combined words without separator. |
+| `Jane-Doen` | Spelling mismatch. |
+
+### Organized flag
+
+Scenes, images, and galleries that have the Organized flag added to them will not be modified by Auto Tag. You can also use Organized flag status as a filter.
+
+### Ignore Auto Tag flag
+
+Performers or Tags that have Ignore Auto Tag flag added to them will be skipped by the Auto Tag task.
+
+## Running task
+
+- **Auto Tag:** You can run the Auto Tag task on your entire library from the Tasks page.
+- **Selective Auto Tag:** You can run the Auto Tag task on specific directories from the Tasks page.
+- **Individual pages:** You can run Auto Tag tasks for specific Performers, Studios, and Tags from their respective pages.
diff --git a/ui/v2.5/src/docs/en/Manual/Identify.md b/ui/v2.5/src/docs/en/Manual/Identify.md
index c5c12d79d..724a392a3 100644
--- a/ui/v2.5/src/docs/en/Manual/Identify.md
+++ b/ui/v2.5/src/docs/en/Manual/Identify.md
@@ -1,37 +1,50 @@
 # Identify
 
+The Identify task iterates through your Scenes and attempts to identify them using a selection of scraping sources. If a result is found in a source, the Scene is updated, and no further sources are checked for that scene.
+
 This task is part of the advanced settings mode.
 
-This task iterates through your Scenes and attempts to identify the scene using a selection of scraping sources.
+## Rules
 
-This task accepts one or more scraper sources. Valid scraper sources for the Identify task are stash-box instances, and scene scrapers which support scraping via Scene Fragment. The order of the sources may be rearranged.
+- The task accepts one or more scraper sources, including stash-box instances and scene scrapers that support scraping via Scene Fragment. The order of the sources can be rearranged.
+- The task iterates through the scraper sources in the provided order.
+- If a result is found in a source, the Scene is updated, and further sources are not checked for that scene.
 
-For each Scene, the Identify task iterates through the scraper sources, in the order provided, and tries to identify the scene using each source. If a result is found in a source, then the Scene is updated, and no further sources are checked for that scene.
+### Organized flag
+
+Scenes that have the Organized flag added to them will not be modified by Identify. You can also use Organized flag status as a filter.
 
 ## Options
 
-The following options can be set:
+The following options can be configured:
 
 | Option | Description |
 |--------|-------------|
-| Include male performers | If false, then male performers will not be created or set on scenes. |
-| Set cover images | If false, then scene cover images will not be modified. |
-| Set organised flag | If true, the organised flag is set to true when a scene is organised. |
+| Include male performers | If false, male performers will not be created or set on scenes. |
+| Set cover images | If false, scene cover images will not be modified. |
+| Set organized flag | If true, the organized flag is set to true when a scene is organized. |
 | Skip matches that have more than one result | If this is not enabled and more than one result is returned, one will be randomly chosen to match |
 | Tag skipped matches with | If the above option is set and a scene is skipped, this will add the tag so that you can filter for it in the Scene Tagger view and choose the correct match by hand |
 | Skip single name performers with no disambiguation | If this is not enabled, performers that are often generic like Samantha or Olga will be matched |
-| Tag skipped performers with | If the above options is set and a performer is skipped, this will add the tag so that you can filter for in it the Scene Tagger view and choose how you want to handle those performers |
+| Tag skipped performers with | If the above option is set and a performer is skipped, this will add the tag so that you can filter for it in the Scene Tagger view and choose how you want to handle those performers |
 
-Field specific options may be set as well. Each field may have a Strategy. The behaviour for each strategy value is as follows:
+### Field specific options
+
+Each field may have a strategy. The behavior for each strategy is as follows:
 
 | Strategy | Description |
 |----------|-------------|
-| Ignore | Not set. |
-| Overwrite | Overwrite existing value. |
+| Ignore | The field is not set. |
+| Overwrite | Existing values are overwritten. |
 | Merge (*default*) | For multi-value fields, adds to existing values. For single-value fields, only sets if not already set. |
 
-For Studio, Performers and Tags, an option is also available to Create Missing objects. This is enabled by default. When true, if a Studio/Performer/Tag is included during the identification process and does not exist in the system, then it will be created.
+For Studio, Performers, and Tags, an option is available to **Create Missing Objects**. This is enabled by default. When true, if a Studio/Performer/Tag is included during the identification process and does not exist in the system, it will be created.
 
-Default Options are applied to all sources unless overridden in specific source options. 
+## Running task
+
+- **Identify...:** Run the Identify task on your entire library from the Tasks page.
+- **Selective Identify:** Configure and run the Identify task on specific directories from Tasks > Identify... page. At the top of the page click folder icon to select directories.
+
+## Logs
 
 The result of the identification process for each scene is output to the log.

From 877491e62bb6efd405345dbdb9acf6a8a4473717 Mon Sep 17 00:00:00 2001
From: Gykes <24581046+Gykes@users.noreply.github.com>
Date: Wed, 3 Dec 2025 16:09:49 -0600
Subject: [PATCH 193/405] Manually Search Stash ID - Edit Page - Scenes,
 Studios (#6340)

---
 internal/api/resolver_query_scraper.go        |   2 +-
 pkg/stashbox/graphql/generated_client.go      |  42 ++++
 .../PerformerDetails/PerformerEditPanel.tsx   |  22 +-
 .../Scenes/SceneDetails/SceneEditPanel.tsx    |  39 +++-
 .../Shared/StashBoxIDSearchModal.tsx          | 197 ++++++++++++++++--
 .../Studios/StudioDetails/StudioEditPanel.tsx |  50 ++++-
 ui/v2.5/src/locales/en-GB.json                |   1 +
 ui/v2.5/src/utils/stashIds.ts                 |  24 +++
 8 files changed, 339 insertions(+), 38 deletions(-)

diff --git a/internal/api/resolver_query_scraper.go b/internal/api/resolver_query_scraper.go
index 5875cd11e..4d77f227d 100644
--- a/internal/api/resolver_query_scraper.go
+++ b/internal/api/resolver_query_scraper.go
@@ -350,7 +350,7 @@ func (r *queryResolver) ScrapeSingleStudio(ctx context.Context, source scraper.S
 		return nil, nil
 	}
 
-	return nil, errors.New("stash_box_index must be set")
+	return nil, errors.New("stash_box_endpoint must be set")
 }
 
 func (r *queryResolver) ScrapeSinglePerformer(ctx context.Context, source scraper.Source, input ScrapeSinglePerformerInput) ([]*models.ScrapedPerformer, error) {
diff --git a/pkg/stashbox/graphql/generated_client.go b/pkg/stashbox/graphql/generated_client.go
index 90553b14a..e2a18352e 100644
--- a/pkg/stashbox/graphql/generated_client.go
+++ b/pkg/stashbox/graphql/generated_client.go
@@ -17,6 +17,7 @@ type StashBoxGraphQLClient interface {
 	FindPerformerByID(ctx context.Context, id string, interceptors ...clientv2.RequestInterceptor) (*FindPerformerByID, error)
 	FindSceneByID(ctx context.Context, id string, interceptors ...clientv2.RequestInterceptor) (*FindSceneByID, error)
 	FindStudio(ctx context.Context, id *string, name *string, interceptors ...clientv2.RequestInterceptor) (*FindStudio, error)
+	FindTag(ctx context.Context, id *string, name *string, interceptors ...clientv2.RequestInterceptor) (*FindTag, error)
 	SubmitFingerprint(ctx context.Context, input FingerprintSubmission, interceptors ...clientv2.RequestInterceptor) (*SubmitFingerprint, error)
 	Me(ctx context.Context, interceptors ...clientv2.RequestInterceptor) (*Me, error)
 	SubmitSceneDraft(ctx context.Context, input SceneDraftInput, interceptors ...clientv2.RequestInterceptor) (*SubmitSceneDraft, error)
@@ -763,6 +764,17 @@ func (t *FindStudio) GetFindStudio() *StudioFragment {
 	return t.FindStudio
 }
 
+type FindTag struct {
+	FindTag *TagFragment "json:\"findTag,omitempty\" graphql:\"findTag\""
+}
+
+func (t *FindTag) GetFindTag() *TagFragment {
+	if t == nil {
+		t = &FindTag{}
+	}
+	return t.FindTag
+}
+
 type SubmitFingerprint struct {
 	SubmitFingerprint bool "json:\"submitFingerprint\" graphql:\"submitFingerprint\""
 }
@@ -1695,6 +1707,35 @@ func (c *Client) FindStudio(ctx context.Context, id *string, name *string, inter
 	return &res, nil
 }
 
+const FindTagDocument = `query FindTag ($id: ID, $name: String) {
+	findTag(id: $id, name: $name) {
+		... TagFragment
+	}
+}
+fragment TagFragment on Tag {
+	name
+	id
+}
+`
+
+func (c *Client) FindTag(ctx context.Context, id *string, name *string, interceptors ...clientv2.RequestInterceptor) (*FindTag, error) {
+	vars := map[string]any{
+		"id":   id,
+		"name": name,
+	}
+
+	var res FindTag
+	if err := c.Client.Post(ctx, "FindTag", FindTagDocument, &res, vars, interceptors...); err != nil {
+		if c.Client.ParseDataWhenErrors {
+			return &res, err
+		}
+
+		return nil, err
+	}
+
+	return &res, nil
+}
+
 const SubmitFingerprintDocument = `mutation SubmitFingerprint ($input: FingerprintSubmission!) {
 	submitFingerprint(input: $input)
 }
@@ -1796,6 +1837,7 @@ var DocumentOperationNames = map[string]string{
 	FindPerformerByIDDocument:             "FindPerformerByID",
 	FindSceneByIDDocument:                 "FindSceneByID",
 	FindStudioDocument:                    "FindStudio",
+	FindTagDocument:                       "FindTag",
 	SubmitFingerprintDocument:             "SubmitFingerprint",
 	MeDocument:                            "Me",
 	SubmitSceneDraftDocument:              "SubmitSceneDraft",
diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
index 55bd20910..8d1352da0 100644
--- a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
@@ -15,7 +15,7 @@ import { ImageInput } from "src/components/Shared/ImageInput";
 import { LoadingIndicator } from "src/components/Shared/LoadingIndicator";
 import { CountrySelect } from "src/components/Shared/CountrySelect";
 import ImageUtils from "src/utils/image";
-import { getStashIDs } from "src/utils/stashIds";
+import { addUpdateStashID, getStashIDs } from "src/utils/stashIds";
 import { stashboxDisplayName } from "src/utils/stashbox";
 import { useToast } from "src/hooks/Toast";
 import { Prompt } from "react-router-dom";
@@ -574,23 +574,10 @@ export const PerformerEditPanel: React.FC<IPerformerDetails> = ({
 
   function onStashIDSelected(item?: GQL.StashIdInput) {
     if (!item) return;
-
-    // Check if StashID with this endpoint already exists
-    const existingIndex = formik.values.stash_ids.findIndex(
-      (s) => s.endpoint === item.endpoint
+    formik.setFieldValue(
+      "stash_ids",
+      addUpdateStashID(formik.values.stash_ids, item)
     );
-
-    let newStashIDs;
-    if (existingIndex >= 0) {
-      // Replace existing StashID
-      newStashIDs = [...formik.values.stash_ids];
-      newStashIDs[existingIndex] = item;
-    } else {
-      // Add new StashID
-      newStashIDs = [...formik.values.stash_ids, item];
-    }
-
-    formik.setFieldValue("stash_ids", newStashIDs);
   }
 
   function renderButtons(classNames: string) {
@@ -685,6 +672,7 @@ export const PerformerEditPanel: React.FC<IPerformerDetails> = ({
       {maybeRenderScrapeDialog()}
       {isStashIDSearchOpen && (
         <StashBoxIDSearchModal
+          entityType="performer"
           stashBoxes={stashConfig?.general.stashBoxes ?? []}
           excludedStashBoxEndpoints={formik.values.stash_ids.map(
             (s) => s.endpoint
diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/SceneEditPanel.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/SceneEditPanel.tsx
index e56ea265b..11575ea7b 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/SceneEditPanel.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/SceneEditPanel.tsx
@@ -16,12 +16,12 @@ import { LoadingIndicator } from "src/components/Shared/LoadingIndicator";
 import { ImageInput } from "src/components/Shared/ImageInput";
 import { useToast } from "src/hooks/Toast";
 import ImageUtils from "src/utils/image";
-import { getStashIDs } from "src/utils/stashIds";
+import { addUpdateStashID, getStashIDs } from "src/utils/stashIds";
 import { useFormik } from "formik";
 import { Prompt } from "react-router-dom";
 import { useConfigurationContext } from "src/hooks/Config";
 import { IGroupEntry, SceneGroupTable } from "./SceneGroupTable";
-import { faSearch } from "@fortawesome/free-solid-svg-icons";
+import { faSearch, faPlus } from "@fortawesome/free-solid-svg-icons";
 import { objectTitle } from "src/core/files";
 import { galleryTitle } from "src/core/galleries";
 import { lazyComponent } from "src/utils/lazyComponent";
@@ -41,6 +41,7 @@ import { Gallery, GallerySelect } from "src/components/Galleries/GallerySelect";
 import { Group } from "src/components/Groups/GroupSelect";
 import { useTagsEdit } from "src/hooks/tagsEdit";
 import { ScraperMenu } from "src/components/Shared/ScraperMenu";
+import StashBoxIDSearchModal from "src/components/Shared/StashBoxIDSearchModal";
 
 const SceneScrapeDialog = lazyComponent(() => import("./SceneScrapeDialog"));
 const SceneQueryModal = lazyComponent(() => import("./SceneQueryModal"));
@@ -77,6 +78,8 @@ export const SceneEditPanel: React.FC<IProps> = ({
   const [scraper, setScraper] = useState<GQL.ScraperSourceInput>();
   const [isScraperQueryModalOpen, setIsScraperQueryModalOpen] =
     useState<boolean>(false);
+  const [isStashIDSearchOpen, setIsStashIDSearchOpen] =
+    useState<boolean>(false);
   const [scrapedScene, setScrapedScene] = useState<GQL.ScrapedScene | null>();
   const [endpoint, setEndpoint] = useState<string>();
 
@@ -547,6 +550,14 @@ export const SceneEditPanel: React.FC<IProps> = ({
     }
   }
 
+  function onStashIDSelected(item?: GQL.StashIdInput) {
+    if (!item) return;
+    formik.setFieldValue(
+      "stash_ids",
+      addUpdateStashID(formik.values.stash_ids, item)
+    );
+  }
+
   const image = useMemo(() => {
     if (encodingImage) {
       return (
@@ -696,6 +707,19 @@ export const SceneEditPanel: React.FC<IProps> = ({
 
       {renderScrapeQueryModal()}
       {maybeRenderScrapeDialog()}
+      {isStashIDSearchOpen && (
+        <StashBoxIDSearchModal
+          entityType="scene"
+          stashBoxes={stashConfig?.general.stashBoxes ?? []}
+          excludedStashBoxEndpoints={formik.values.stash_ids.map(
+            (s) => s.endpoint
+          )}
+          onSelectItem={(item) => {
+            onStashIDSelected(item);
+            setIsStashIDSearchOpen(false);
+          }}
+        />
+      )}
       <Form noValidate onSubmit={formik.handleSubmit}>
         <Row className="form-container edit-buttons-container px-3 pt-3">
           <div className="edit-buttons mb-3 pl-0">
@@ -761,7 +785,16 @@ export const SceneEditPanel: React.FC<IProps> = ({
               "stash_ids",
               "scenes",
               "stash_ids",
-              fullWidthProps
+              fullWidthProps,
+              <Button
+                variant="success"
+                className="mr-2 py-0"
+                onClick={() => setIsStashIDSearchOpen(true)}
+                disabled={!stashConfig?.general.stashBoxes?.length}
+                title={intl.formatMessage({ id: "actions.add_stash_id" })}
+              >
+                <Icon icon={faPlus} />
+              </Button>
             )}
           </Col>
           <Col lg={5} xl={12}>
diff --git a/ui/v2.5/src/components/Shared/StashBoxIDSearchModal.tsx b/ui/v2.5/src/components/Shared/StashBoxIDSearchModal.tsx
index 0b11a6d25..790e6aed9 100644
--- a/ui/v2.5/src/components/Shared/StashBoxIDSearchModal.tsx
+++ b/ui/v2.5/src/components/Shared/StashBoxIDSearchModal.tsx
@@ -11,11 +11,23 @@ import TextUtils from "src/utils/text";
 import GenderIcon from "src/components/Performers/GenderIcon";
 import { CountryFlag } from "src/components/Shared/CountryFlag";
 import { Icon } from "src/components/Shared/Icon";
-import { stashBoxPerformerQuery } from "src/core/StashService";
+import {
+  stashBoxPerformerQuery,
+  stashBoxSceneQuery,
+  stashBoxStudioQuery,
+} from "src/core/StashService";
 import { useToast } from "src/hooks/Toast";
 import { stringToGender } from "src/utils/gender";
 
+type SearchResultItem =
+  | GQL.ScrapedPerformerDataFragment
+  | GQL.ScrapedSceneDataFragment
+  | GQL.ScrapedStudioDataFragment;
+
+export type StashBoxEntityType = "performer" | "scene" | "studio";
+
 interface IProps {
+  entityType: StashBoxEntityType;
   stashBoxes: GQL.StashBox[];
   excludedStashBoxEndpoints?: string[];
   onSelectItem: (item?: GQL.StashIdInput) => void;
@@ -132,8 +144,121 @@ export const PerformerSearchResult: React.FC<IPerformerResultProps> = ({
   );
 };
 
+// Scene Result Component
+interface ISceneResultProps {
+  scene: GQL.ScrapedSceneDataFragment;
+}
+
+const SceneSearchResultDetails: React.FC<ISceneResultProps> = ({ scene }) => {
+  return (
+    <div className="scene-result">
+      <Row>
+        <SearchResultImage imageUrl={scene.image} />
+        <div className="col flex-column">
+          <h4 className="scene-title">
+            <span>{scene.title}</span>
+            {scene.code && (
+              <span className="scene-code">{` (${scene.code})`}</span>
+            )}
+          </h4>
+          <h5 className="scene-details">
+            {scene.studio?.name && <span>{scene.studio.name}</span>}
+            {scene.date && (
+              <span className="scene-date">{` • ${scene.date}`}</span>
+            )}
+          </h5>
+          {scene.performers && scene.performers.length > 0 && (
+            <div className="scene-performers">
+              {scene.performers.map((p) => p.name).join(", ")}
+            </div>
+          )}
+        </div>
+      </Row>
+      <Row>
+        <Col>
+          <TruncatedText text={scene.details ?? ""} lineCount={3} />
+        </Col>
+      </Row>
+      <SearchResultTags tags={scene.tags} />
+    </div>
+  );
+};
+
+export const SceneSearchResult: React.FC<ISceneResultProps> = ({ scene }) => {
+  return (
+    <div className="mt-3 search-item" style={{ cursor: "pointer" }}>
+      <SceneSearchResultDetails scene={scene} />
+    </div>
+  );
+};
+
+// Studio Result Component
+interface IStudioResultProps {
+  studio: GQL.ScrapedStudioDataFragment;
+}
+
+const StudioSearchResultDetails: React.FC<IStudioResultProps> = ({
+  studio,
+}) => {
+  return (
+    <div className="studio-result">
+      <Row>
+        <SearchResultImage imageUrl={studio.image} />
+        <div className="col flex-column">
+          <h4 className="studio-name">
+            <span>{studio.name}</span>
+          </h4>
+          {studio.parent?.name && (
+            <h5 className="studio-parent">
+              <span>{studio.parent.name}</span>
+            </h5>
+          )}
+          {studio.urls && studio.urls.length > 0 && (
+            <div className="studio-url text-muted small">{studio.urls[0]}</div>
+          )}
+        </div>
+      </Row>
+    </div>
+  );
+};
+
+export const StudioSearchResult: React.FC<IStudioResultProps> = ({
+  studio,
+}) => {
+  return (
+    <div className="mt-3 search-item" style={{ cursor: "pointer" }}>
+      <StudioSearchResultDetails studio={studio} />
+    </div>
+  );
+};
+
+// Helper to get entity type message id for i18n
+function getEntityTypeMessageId(entityType: StashBoxEntityType): string {
+  switch (entityType) {
+    case "performer":
+      return "performer";
+    case "scene":
+      return "scene";
+    case "studio":
+      return "studio";
+  }
+}
+
+// Helper to get the "found" message id based on entity type
+function getFoundMessageId(entityType: StashBoxEntityType): string {
+  switch (entityType) {
+    case "performer":
+      return "dialogs.performers_found";
+    case "scene":
+      return "dialogs.scenes_found";
+    case "studio":
+      return "dialogs.studios_found";
+  }
+}
+
 // Main Modal Component
 export const StashBoxIDSearchModal: React.FC<IProps> = ({
+  entityType,
   stashBoxes,
   excludedStashBoxEndpoints = [],
   onSelectItem,
@@ -146,9 +271,9 @@ export const StashBoxIDSearchModal: React.FC<IProps> = ({
     null
   );
   const [query, setQuery] = useState<string>("");
-  const [results, setResults] = useState<
-    GQL.ScrapedPerformerDataFragment[] | undefined
-  >(undefined);
+  const [results, setResults] = useState<SearchResultItem[] | undefined>(
+    undefined
+  );
   const [loading, setLoading] = useState(false);
 
   useEffect(() => {
@@ -168,17 +293,38 @@ export const StashBoxIDSearchModal: React.FC<IProps> = ({
     setResults([]);
 
     try {
-      const queryData = await stashBoxPerformerQuery(
-        query,
-        selectedStashBox.endpoint
-      );
-      setResults(queryData.data?.scrapeSinglePerformer ?? []);
+      switch (entityType) {
+        case "performer": {
+          const queryData = await stashBoxPerformerQuery(
+            query,
+            selectedStashBox.endpoint
+          );
+          setResults(queryData.data?.scrapeSinglePerformer ?? []);
+          break;
+        }
+        case "scene": {
+          const queryData = await stashBoxSceneQuery(
+            query,
+            selectedStashBox.endpoint
+          );
+          setResults(queryData.data?.scrapeSingleScene ?? []);
+          break;
+        }
+        case "studio": {
+          const queryData = await stashBoxStudioQuery(
+            query,
+            selectedStashBox.endpoint
+          );
+          setResults(queryData.data?.scrapeSingleStudio ?? []);
+          break;
+        }
+      }
     } catch (error) {
       Toast.error(error);
     } finally {
       setLoading(false);
     }
-  }, [query, selectedStashBox, Toast]);
+  }, [query, selectedStashBox, Toast, entityType]);
 
   function handleItemClick(item: IHasRemoteSiteID) {
     if (selectedStashBox && item.remote_site_id) {
@@ -195,6 +341,25 @@ export const StashBoxIDSearchModal: React.FC<IProps> = ({
     onSelectItem(undefined);
   }
 
+  function renderResultItem(item: SearchResultItem) {
+    switch (entityType) {
+      case "performer":
+        return (
+          <PerformerSearchResult
+            performer={item as GQL.ScrapedPerformerDataFragment}
+          />
+        );
+      case "scene":
+        return (
+          <SceneSearchResult scene={item as GQL.ScrapedSceneDataFragment} />
+        );
+      case "studio":
+        return (
+          <StudioSearchResult studio={item as GQL.ScrapedStudioDataFragment} />
+        );
+    }
+  }
+
   function renderResults() {
     if (!results || results.length === 0) {
       return null;
@@ -204,14 +369,14 @@ export const StashBoxIDSearchModal: React.FC<IProps> = ({
       <div className={CLASSNAME_LIST_CONTAINER}>
         <div className="mt-1 mb-2">
           <FormattedMessage
-            id="dialogs.performers_found"
+            id={getFoundMessageId(entityType)}
             values={{ count: results.length }}
           />
         </div>
         <ul className={CLASSNAME_LIST} style={{ listStyleType: "none" }}>
           {results.map((item, i) => (
             <li key={i} onClick={() => handleItemClick(item)}>
-              <PerformerSearchResult performer={item} />
+              {renderResultItem(item)}
             </li>
           ))}
         </ul>
@@ -219,13 +384,17 @@ export const StashBoxIDSearchModal: React.FC<IProps> = ({
     );
   }
 
+  const entityTypeDisplayName = intl.formatMessage({
+    id: getEntityTypeMessageId(entityType),
+  });
+
   return (
     <ModalComponent
       show
       onHide={handleClose}
       header={intl.formatMessage(
         { id: "stashbox_search.header" },
-        { entityType: "Performer" }
+        { entityType: entityTypeDisplayName }
       )}
       accept={{
         text: intl.formatMessage({ id: "actions.cancel" }),
@@ -273,7 +442,7 @@ export const StashBoxIDSearchModal: React.FC<IProps> = ({
             value={query}
             placeholder={intl.formatMessage(
               { id: "stashbox_search.placeholder_name_or_id" },
-              { entityType: "Performer" }
+              { entityType: entityTypeDisplayName }
             )}
             className="text-input"
             ref={inputRef}
diff --git a/ui/v2.5/src/components/Studios/StudioDetails/StudioEditPanel.tsx b/ui/v2.5/src/components/Studios/StudioDetails/StudioEditPanel.tsx
index 264afdc7c..c8cfd3a3e 100644
--- a/ui/v2.5/src/components/Studios/StudioDetails/StudioEditPanel.tsx
+++ b/ui/v2.5/src/components/Studios/StudioDetails/StudioEditPanel.tsx
@@ -5,18 +5,22 @@ import * as yup from "yup";
 import Mousetrap from "mousetrap";
 import { LoadingIndicator } from "src/components/Shared/LoadingIndicator";
 import { DetailsEditNavbar } from "src/components/Shared/DetailsEditNavbar";
-import { Form } from "react-bootstrap";
+import { Button, Form } from "react-bootstrap";
+import { faPlus } from "@fortawesome/free-solid-svg-icons";
 import ImageUtils from "src/utils/image";
-import { getStashIDs } from "src/utils/stashIds";
+import { addUpdateStashID, getStashIDs } from "src/utils/stashIds";
 import { useFormik } from "formik";
 import { Prompt } from "react-router-dom";
 import isEqual from "lodash-es/isEqual";
 import { useToast } from "src/hooks/Toast";
+import { useConfigurationContext } from "src/hooks/Config";
 import { handleUnsavedChanges } from "src/utils/navigation";
 import { formikUtils } from "src/utils/form";
 import { yupFormikValidate, yupUniqueAliases } from "src/utils/yup";
 import { Studio, StudioSelect } from "../StudioSelect";
 import { useTagsEdit } from "src/hooks/tagsEdit";
+import { Icon } from "src/components/Shared/Icon";
+import StashBoxIDSearchModal from "src/components/Shared/StashBoxIDSearchModal";
 
 interface IStudioEditPanel {
   studio: Partial<GQL.StudioDataFragment>;
@@ -37,9 +41,13 @@ export const StudioEditPanel: React.FC<IStudioEditPanel> = ({
 }) => {
   const intl = useIntl();
   const Toast = useToast();
+  const { configuration: stashConfig } = useConfigurationContext();
 
   const isNew = studio.id === undefined;
 
+  // Editing state
+  const [isStashIDSearchOpen, setIsStashIDSearchOpen] = useState(false);
+
   // Network state
   const [isLoading, setIsLoading] = useState(false);
 
@@ -143,6 +151,14 @@ export const StudioEditPanel: React.FC<IStudioEditPanel> = ({
     ImageUtils.onImageChange(event, onImageLoad);
   }
 
+  function onStashIDSelected(item?: GQL.StashIdInput) {
+    if (!item) return;
+    formik.setFieldValue(
+      "stash_ids",
+      addUpdateStashID(formik.values.stash_ids, item)
+    );
+  }
+
   const {
     renderField,
     renderInputField,
@@ -173,6 +189,20 @@ export const StudioEditPanel: React.FC<IStudioEditPanel> = ({
 
   return (
     <>
+      {isStashIDSearchOpen && (
+        <StashBoxIDSearchModal
+          entityType="studio"
+          stashBoxes={stashConfig?.general.stashBoxes ?? []}
+          excludedStashBoxEndpoints={formik.values.stash_ids.map(
+            (s) => s.endpoint
+          )}
+          onSelectItem={(item) => {
+            onStashIDSelected(item);
+            setIsStashIDSearchOpen(false);
+          }}
+        />
+      )}
+
       <Prompt
         when={formik.dirty}
         message={(location, action) => {
@@ -191,7 +221,21 @@ export const StudioEditPanel: React.FC<IStudioEditPanel> = ({
         {renderInputField("details", "textarea")}
         {renderParentStudioField()}
         {renderTagsField()}
-        {renderStashIDsField("stash_ids", "studios")}
+        {renderStashIDsField(
+          "stash_ids",
+          "studios",
+          "stash_ids",
+          undefined,
+          <Button
+            variant="success"
+            className="mr-2 py-0"
+            onClick={() => setIsStashIDSearchOpen(true)}
+            disabled={!stashConfig?.general.stashBoxes?.length}
+            title={intl.formatMessage({ id: "actions.add_stash_id" })}
+          >
+            <Icon icon={faPlus} />
+          </Button>
+        )}
         <hr />
         {renderInputField("ignore_auto_tag", "checkbox")}
       </Form>
diff --git a/ui/v2.5/src/locales/en-GB.json b/ui/v2.5/src/locales/en-GB.json
index e4c8b6a7c..c2b9b4247 100644
--- a/ui/v2.5/src/locales/en-GB.json
+++ b/ui/v2.5/src/locales/en-GB.json
@@ -1015,6 +1015,7 @@
       "video_previews_tooltip": "Video previews which play when hovering over a scene"
     },
     "scenes_found": "{count} scenes found",
+    "studios_found": "{count} studios found",
     "scrape_entity_query": "{entity_type} Scrape Query",
     "scrape_entity_title": "{entity_type} Scrape Results",
     "scrape_results_existing": "Existing",
diff --git a/ui/v2.5/src/utils/stashIds.ts b/ui/v2.5/src/utils/stashIds.ts
index f44b182ab..92a4eaf1e 100644
--- a/ui/v2.5/src/utils/stashIds.ts
+++ b/ui/v2.5/src/utils/stashIds.ts
@@ -1,3 +1,5 @@
+import * as GQL from "src/core/generated-graphql";
+
 export const getStashIDs = (
   ids?: { stash_id: string; endpoint: string; updated_at: string }[]
 ) =>
@@ -32,3 +34,25 @@ export const separateNamesAndStashIds = (
 
   return { names, stashIds };
 };
+
+/**
+ * Utility to add or update a StashID in an array.
+ * If a StashID with the same endpoint exists, it will be replaced.
+ * Otherwise, the new StashID will be appended.
+ */
+export const addUpdateStashID = (
+  existingStashIDs: GQL.StashIdInput[],
+  newItem: GQL.StashIdInput
+): GQL.StashIdInput[] => {
+  const existingIndex = existingStashIDs.findIndex(
+    (s) => s.endpoint === newItem.endpoint
+  );
+
+  if (existingIndex >= 0) {
+    const newStashIDs = [...existingStashIDs];
+    newStashIDs[existingIndex] = newItem;
+    return newStashIDs;
+  }
+
+  return [...existingStashIDs, newItem];
+};

From 39fd8a65502fc63bc6807bbb05673422619f58aa Mon Sep 17 00:00:00 2001
From: Gykes <24581046+Gykes@users.noreply.github.com>
Date: Wed, 3 Dec 2025 18:20:29 -0600
Subject: [PATCH 194/405] Feature: Manual StashId Search - Tags (#6374)

---
 graphql/schema/schema.graphql                 |   6 +
 graphql/schema/types/scraper.graphql          |   7 +
 graphql/stash-box/query.graphql               |  15 ++
 internal/api/resolver_query_scraper.go        |  39 +++++
 pkg/stashbox/graphql/generated_client.go      |  62 ++++++++
 pkg/stashbox/tag.go                           |  67 ++++++++
 .../graphql/queries/scrapers/scrapers.graphql |   9 ++
 .../Shared/StashBoxIDSearchModal.tsx          |  43 +++++-
 .../Tags/TagDetails/TagEditPanel.tsx          | 144 ++++++++++++------
 ui/v2.5/src/core/StashService.ts              |  17 +++
 ui/v2.5/src/locales/en-GB.json                |   1 +
 11 files changed, 360 insertions(+), 50 deletions(-)
 create mode 100644 pkg/stashbox/tag.go

diff --git a/graphql/schema/schema.graphql b/graphql/schema/schema.graphql
index 2a9d067ae..8936b8a34 100644
--- a/graphql/schema/schema.graphql
+++ b/graphql/schema/schema.graphql
@@ -165,6 +165,12 @@ type Query {
     input: ScrapeSingleStudioInput!
   ): [ScrapedStudio!]!
 
+  "Scrape for a single tag"
+  scrapeSingleTag(
+    source: ScraperSourceInput!
+    input: ScrapeSingleTagInput!
+  ): [ScrapedTag!]!
+
   "Scrape for a single performer"
   scrapeSinglePerformer(
     source: ScraperSourceInput!
diff --git a/graphql/schema/types/scraper.graphql b/graphql/schema/types/scraper.graphql
index cb193f47d..9c0e33fdf 100644
--- a/graphql/schema/types/scraper.graphql
+++ b/graphql/schema/types/scraper.graphql
@@ -198,6 +198,13 @@ input ScrapeSingleStudioInput {
   query: String
 }
 
+input ScrapeSingleTagInput {
+  """
+  Query can be either a name or a Stash ID
+  """
+  query: String
+}
+
 input ScrapeSinglePerformerInput {
   "Instructs to query by string"
   query: String
diff --git a/graphql/stash-box/query.graphql b/graphql/stash-box/query.graphql
index 4fa023070..2367e85cf 100644
--- a/graphql/stash-box/query.graphql
+++ b/graphql/stash-box/query.graphql
@@ -170,6 +170,21 @@ query FindStudio($id: ID, $name: String) {
   }
 }
 
+query FindTag($id: ID, $name: String) {
+  findTag(id: $id, name: $name) {
+    ...TagFragment
+  }
+}
+
+query QueryTags($input: TagQueryInput!) {
+  queryTags(input: $input) {
+    count
+    tags {
+      ...TagFragment
+    }
+  }
+}
+
 mutation SubmitFingerprint($input: FingerprintSubmission!) {
   submitFingerprint(input: $input)
 }
diff --git a/internal/api/resolver_query_scraper.go b/internal/api/resolver_query_scraper.go
index 4d77f227d..86d449921 100644
--- a/internal/api/resolver_query_scraper.go
+++ b/internal/api/resolver_query_scraper.go
@@ -353,6 +353,45 @@ func (r *queryResolver) ScrapeSingleStudio(ctx context.Context, source scraper.S
 	return nil, errors.New("stash_box_endpoint must be set")
 }
 
+func (r *queryResolver) ScrapeSingleTag(ctx context.Context, source scraper.Source, input ScrapeSingleTagInput) ([]*models.ScrapedTag, error) {
+	if source.StashBoxIndex != nil || source.StashBoxEndpoint != nil {
+		b, err := resolveStashBox(source.StashBoxIndex, source.StashBoxEndpoint)
+		if err != nil {
+			return nil, err
+		}
+
+		client := r.newStashBoxClient(*b)
+
+		var ret []*models.ScrapedTag
+		out, err := client.QueryTag(ctx, *input.Query)
+
+		if err != nil {
+			return nil, err
+		} else if out != nil {
+			ret = append(ret, out...)
+		}
+
+		if len(ret) > 0 {
+			if err := r.withReadTxn(ctx, func(ctx context.Context) error {
+				for _, tag := range ret {
+					if err := match.ScrapedTag(ctx, r.repository.Tag, tag, b.Endpoint); err != nil {
+						return err
+					}
+				}
+
+				return nil
+			}); err != nil {
+				return nil, err
+			}
+			return ret, nil
+		}
+
+		return nil, nil
+	}
+
+	return nil, errors.New("stash_box_endpoint must be set")
+}
+
 func (r *queryResolver) ScrapeSinglePerformer(ctx context.Context, source scraper.Source, input ScrapeSinglePerformerInput) ([]*models.ScrapedPerformer, error) {
 	var ret []*models.ScrapedPerformer
 	switch {
diff --git a/pkg/stashbox/graphql/generated_client.go b/pkg/stashbox/graphql/generated_client.go
index e2a18352e..640a1c893 100644
--- a/pkg/stashbox/graphql/generated_client.go
+++ b/pkg/stashbox/graphql/generated_client.go
@@ -18,6 +18,7 @@ type StashBoxGraphQLClient interface {
 	FindSceneByID(ctx context.Context, id string, interceptors ...clientv2.RequestInterceptor) (*FindSceneByID, error)
 	FindStudio(ctx context.Context, id *string, name *string, interceptors ...clientv2.RequestInterceptor) (*FindStudio, error)
 	FindTag(ctx context.Context, id *string, name *string, interceptors ...clientv2.RequestInterceptor) (*FindTag, error)
+	QueryTags(ctx context.Context, input TagQueryInput, interceptors ...clientv2.RequestInterceptor) (*QueryTags, error)
 	SubmitFingerprint(ctx context.Context, input FingerprintSubmission, interceptors ...clientv2.RequestInterceptor) (*SubmitFingerprint, error)
 	Me(ctx context.Context, interceptors ...clientv2.RequestInterceptor) (*Me, error)
 	SubmitSceneDraft(ctx context.Context, input SceneDraftInput, interceptors ...clientv2.RequestInterceptor) (*SubmitSceneDraft, error)
@@ -643,6 +644,24 @@ func (t *FindStudio_FindStudio_StudioFragment_Parent) GetName() string {
 	return t.Name
 }
 
+type QueryTags_QueryTags struct {
+	Count int            "json:\"count\" graphql:\"count\""
+	Tags  []*TagFragment "json:\"tags\" graphql:\"tags\""
+}
+
+func (t *QueryTags_QueryTags) GetCount() int {
+	if t == nil {
+		t = &QueryTags_QueryTags{}
+	}
+	return t.Count
+}
+func (t *QueryTags_QueryTags) GetTags() []*TagFragment {
+	if t == nil {
+		t = &QueryTags_QueryTags{}
+	}
+	return t.Tags
+}
+
 type Me_Me struct {
 	Name string "json:\"name\" graphql:\"name\""
 }
@@ -775,6 +794,17 @@ func (t *FindTag) GetFindTag() *TagFragment {
 	return t.FindTag
 }
 
+type QueryTags struct {
+	QueryTags QueryTags_QueryTags "json:\"queryTags\" graphql:\"queryTags\""
+}
+
+func (t *QueryTags) GetQueryTags() *QueryTags_QueryTags {
+	if t == nil {
+		t = &QueryTags{}
+	}
+	return &t.QueryTags
+}
+
 type SubmitFingerprint struct {
 	SubmitFingerprint bool "json:\"submitFingerprint\" graphql:\"submitFingerprint\""
 }
@@ -1736,6 +1766,37 @@ func (c *Client) FindTag(ctx context.Context, id *string, name *string, intercep
 	return &res, nil
 }
 
+const QueryTagsDocument = `query QueryTags ($input: TagQueryInput!) {
+	queryTags(input: $input) {
+		count
+		tags {
+			... TagFragment
+		}
+	}
+}
+fragment TagFragment on Tag {
+	name
+	id
+}
+`
+
+func (c *Client) QueryTags(ctx context.Context, input TagQueryInput, interceptors ...clientv2.RequestInterceptor) (*QueryTags, error) {
+	vars := map[string]any{
+		"input": input,
+	}
+
+	var res QueryTags
+	if err := c.Client.Post(ctx, "QueryTags", QueryTagsDocument, &res, vars, interceptors...); err != nil {
+		if c.Client.ParseDataWhenErrors {
+			return &res, err
+		}
+
+		return nil, err
+	}
+
+	return &res, nil
+}
+
 const SubmitFingerprintDocument = `mutation SubmitFingerprint ($input: FingerprintSubmission!) {
 	submitFingerprint(input: $input)
 }
@@ -1838,6 +1899,7 @@ var DocumentOperationNames = map[string]string{
 	FindSceneByIDDocument:                 "FindSceneByID",
 	FindStudioDocument:                    "FindStudio",
 	FindTagDocument:                       "FindTag",
+	QueryTagsDocument:                     "QueryTags",
 	SubmitFingerprintDocument:             "SubmitFingerprint",
 	MeDocument:                            "Me",
 	SubmitSceneDraftDocument:              "SubmitSceneDraft",
diff --git a/pkg/stashbox/tag.go b/pkg/stashbox/tag.go
new file mode 100644
index 000000000..df2ecbcc0
--- /dev/null
+++ b/pkg/stashbox/tag.go
@@ -0,0 +1,67 @@
+package stashbox
+
+import (
+	"context"
+
+	"github.com/google/uuid"
+	"github.com/stashapp/stash/pkg/models"
+	"github.com/stashapp/stash/pkg/stashbox/graphql"
+)
+
+// QueryTag searches for tags by name or ID.
+// If query is a valid UUID, it searches by ID (returns single result).
+// Otherwise, it searches by name (returns multiple results).
+func (c Client) QueryTag(ctx context.Context, query string) ([]*models.ScrapedTag, error) {
+	_, err := uuid.Parse(query)
+	if err == nil {
+		// Query is a UUID, use findTag for exact match
+		return c.findTagByID(ctx, query)
+	}
+	// Otherwise search by name
+	return c.queryTagsByName(ctx, query)
+}
+
+func (c Client) findTagByID(ctx context.Context, id string) ([]*models.ScrapedTag, error) {
+	tag, err := c.client.FindTag(ctx, &id, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	if tag.FindTag == nil {
+		return nil, nil
+	}
+
+	return []*models.ScrapedTag{{
+		Name:         tag.FindTag.Name,
+		RemoteSiteID: &tag.FindTag.ID,
+	}}, nil
+}
+
+func (c Client) queryTagsByName(ctx context.Context, name string) ([]*models.ScrapedTag, error) {
+	input := graphql.TagQueryInput{
+		Name:      &name,
+		Page:      1,
+		PerPage:   25,
+		Direction: graphql.SortDirectionEnumAsc,
+		Sort:      graphql.TagSortEnumName,
+	}
+
+	result, err := c.client.QueryTags(ctx, input)
+	if err != nil {
+		return nil, err
+	}
+
+	if result.QueryTags.Tags == nil {
+		return nil, nil
+	}
+
+	var ret []*models.ScrapedTag
+	for _, t := range result.QueryTags.Tags {
+		ret = append(ret, &models.ScrapedTag{
+			Name:         t.Name,
+			RemoteSiteID: &t.ID,
+		})
+	}
+
+	return ret, nil
+}
diff --git a/ui/v2.5/graphql/queries/scrapers/scrapers.graphql b/ui/v2.5/graphql/queries/scrapers/scrapers.graphql
index 8137fe054..4ddfbd91b 100644
--- a/ui/v2.5/graphql/queries/scrapers/scrapers.graphql
+++ b/ui/v2.5/graphql/queries/scrapers/scrapers.graphql
@@ -62,6 +62,15 @@ query ScrapeSingleStudio(
   }
 }
 
+query ScrapeSingleTag(
+  $source: ScraperSourceInput!
+  $input: ScrapeSingleTagInput!
+) {
+  scrapeSingleTag(source: $source, input: $input) {
+    ...ScrapedSceneTagData
+  }
+}
+
 query ScrapeSinglePerformer(
   $source: ScraperSourceInput!
   $input: ScrapeSinglePerformerInput!
diff --git a/ui/v2.5/src/components/Shared/StashBoxIDSearchModal.tsx b/ui/v2.5/src/components/Shared/StashBoxIDSearchModal.tsx
index 790e6aed9..4674db08a 100644
--- a/ui/v2.5/src/components/Shared/StashBoxIDSearchModal.tsx
+++ b/ui/v2.5/src/components/Shared/StashBoxIDSearchModal.tsx
@@ -15,6 +15,7 @@ import {
   stashBoxPerformerQuery,
   stashBoxSceneQuery,
   stashBoxStudioQuery,
+  stashBoxTagQuery,
 } from "src/core/StashService";
 import { useToast } from "src/hooks/Toast";
 import { stringToGender } from "src/utils/gender";
@@ -22,9 +23,10 @@ import { stringToGender } from "src/utils/gender";
 type SearchResultItem =
   | GQL.ScrapedPerformerDataFragment
   | GQL.ScrapedSceneDataFragment
-  | GQL.ScrapedStudioDataFragment;
+  | GQL.ScrapedStudioDataFragment
+  | GQL.ScrapedSceneTagDataFragment;
 
-export type StashBoxEntityType = "performer" | "scene" | "studio";
+export type StashBoxEntityType = "performer" | "scene" | "studio" | "tag";
 
 interface IProps {
   entityType: StashBoxEntityType;
@@ -232,6 +234,27 @@ export const StudioSearchResult: React.FC<IStudioResultProps> = ({
   );
 };
 
+// Tag Result Component
+interface ITagResultProps {
+  tag: GQL.ScrapedSceneTagDataFragment;
+}
+
+export const TagSearchResult: React.FC<ITagResultProps> = ({ tag }) => {
+  return (
+    <div className="mt-3 search-item" style={{ cursor: "pointer" }}>
+      <div className="tag-result">
+        <Row>
+          <div className="col flex-column">
+            <h4 className="tag-name">
+              <span>{tag.name}</span>
+            </h4>
+          </div>
+        </Row>
+      </div>
+    </div>
+  );
+};
+
 // Helper to get entity type message id for i18n
 function getEntityTypeMessageId(entityType: StashBoxEntityType): string {
   switch (entityType) {
@@ -241,6 +264,8 @@ function getEntityTypeMessageId(entityType: StashBoxEntityType): string {
       return "scene";
     case "studio":
       return "studio";
+    case "tag":
+      return "tag";
   }
 }
 
@@ -253,6 +278,8 @@ function getFoundMessageId(entityType: StashBoxEntityType): string {
       return "dialogs.scenes_found";
     case "studio":
       return "dialogs.studios_found";
+    case "tag":
+      return "dialogs.tags_found";
   }
 }
 
@@ -318,6 +345,14 @@ export const StashBoxIDSearchModal: React.FC<IProps> = ({
           setResults(queryData.data?.scrapeSingleStudio ?? []);
           break;
         }
+        case "tag": {
+          const queryData = await stashBoxTagQuery(
+            query,
+            selectedStashBox.endpoint
+          );
+          setResults(queryData.data?.scrapeSingleTag ?? []);
+          break;
+        }
       }
     } catch (error) {
       Toast.error(error);
@@ -357,6 +392,10 @@ export const StashBoxIDSearchModal: React.FC<IProps> = ({
         return (
           <StudioSearchResult studio={item as GQL.ScrapedStudioDataFragment} />
         );
+      case "tag":
+        return (
+          <TagSearchResult tag={item as GQL.ScrapedSceneTagDataFragment} />
+        );
     }
   }
 
diff --git a/ui/v2.5/src/components/Tags/TagDetails/TagEditPanel.tsx b/ui/v2.5/src/components/Tags/TagDetails/TagEditPanel.tsx
index 41756953b..35733394a 100644
--- a/ui/v2.5/src/components/Tags/TagDetails/TagEditPanel.tsx
+++ b/ui/v2.5/src/components/Tags/TagDetails/TagEditPanel.tsx
@@ -3,7 +3,8 @@ import { FormattedMessage, useIntl } from "react-intl";
 import * as GQL from "src/core/generated-graphql";
 import * as yup from "yup";
 import { DetailsEditNavbar } from "src/components/Shared/DetailsEditNavbar";
-import { Form } from "react-bootstrap";
+import { Button, Form } from "react-bootstrap";
+import { faPlus } from "@fortawesome/free-solid-svg-icons";
 import ImageUtils from "src/utils/image";
 import { useFormik } from "formik";
 import { Prompt } from "react-router-dom";
@@ -11,11 +12,14 @@ import Mousetrap from "mousetrap";
 import { LoadingIndicator } from "src/components/Shared/LoadingIndicator";
 import isEqual from "lodash-es/isEqual";
 import { useToast } from "src/hooks/Toast";
+import { useConfigurationContext } from "src/hooks/Config";
 import { handleUnsavedChanges } from "src/utils/navigation";
 import { formikUtils } from "src/utils/form";
 import { yupFormikValidate, yupUniqueAliases } from "src/utils/yup";
-import { getStashIDs } from "src/utils/stashIds";
+import { addUpdateStashID, getStashIDs } from "src/utils/stashIds";
 import { Tag, TagSelect } from "../TagSelect";
+import { Icon } from "src/components/Shared/Icon";
+import StashBoxIDSearchModal from "src/components/Shared/StashBoxIDSearchModal";
 
 interface ITagEditPanel {
   tag: Partial<GQL.TagDataFragment>;
@@ -36,9 +40,13 @@ export const TagEditPanel: React.FC<ITagEditPanel> = ({
 }) => {
   const intl = useIntl();
   const Toast = useToast();
+  const { configuration: stashConfig } = useConfigurationContext();
 
   const isNew = tag.id === undefined;
 
+  // Editing state
+  const [isStashIDSearchOpen, setIsStashIDSearchOpen] = useState(false);
+
   // Network state
   const [isLoading, setIsLoading] = useState(false);
 
@@ -143,6 +151,14 @@ export const TagEditPanel: React.FC<ITagEditPanel> = ({
     ImageUtils.onImageChange(event, onImageLoad);
   }
 
+  function onStashIDSelected(item?: GQL.StashIdInput) {
+    if (!item) return;
+    formik.setFieldValue(
+      "stash_ids",
+      addUpdateStashID(formik.values.stash_ids, item)
+    );
+  }
+
   const {
     renderField,
     renderInputField,
@@ -186,54 +202,86 @@ export const TagEditPanel: React.FC<ITagEditPanel> = ({
 
   // TODO: CSS class
   return (
-    <div>
-      {isNew && (
-        <h2>
-          <FormattedMessage
-            id="actions.add_entity"
-            values={{ entityType: intl.formatMessage({ id: "tag" }) }}
-          />
-        </h2>
+    <>
+      {isStashIDSearchOpen && (
+        <StashBoxIDSearchModal
+          entityType="tag"
+          stashBoxes={stashConfig?.general.stashBoxes ?? []}
+          excludedStashBoxEndpoints={formik.values.stash_ids.map(
+            (s) => s.endpoint
+          )}
+          onSelectItem={(item) => {
+            onStashIDSelected(item);
+            setIsStashIDSearchOpen(false);
+          }}
+        />
       )}
 
-      <Prompt
-        when={formik.dirty}
-        message={(location, action) => {
-          // Check if it's a redirect after tag creation
-          if (action === "PUSH" && location.pathname.startsWith("/tags/")) {
-            return true;
+      <div>
+        {isNew && (
+          <h2>
+            <FormattedMessage
+              id="actions.add_entity"
+              values={{ entityType: intl.formatMessage({ id: "tag" }) }}
+            />
+          </h2>
+        )}
+
+        <Prompt
+          when={formik.dirty}
+          message={(location, action) => {
+            // Check if it's a redirect after tag creation
+            if (action === "PUSH" && location.pathname.startsWith("/tags/")) {
+              return true;
+            }
+
+            return handleUnsavedChanges(intl, "tags", tag.id)(location);
+          }}
+        />
+
+        <Form noValidate onSubmit={formik.handleSubmit} id="tag-edit">
+          {renderInputField("name")}
+          {renderInputField("sort_name", "text")}
+          {renderStringListField("aliases")}
+          {renderInputField("description", "textarea")}
+          {renderParentTagsField()}
+          {renderSubTagsField()}
+          {renderStashIDsField(
+            "stash_ids",
+            "tags",
+            "stash_ids",
+            undefined,
+            <Button
+              variant="success"
+              className="mr-2 py-0"
+              onClick={() => setIsStashIDSearchOpen(true)}
+              disabled={!stashConfig?.general.stashBoxes?.length}
+              title={intl.formatMessage({ id: "actions.add_stash_id" })}
+            >
+              <Icon icon={faPlus} />
+            </Button>
+          )}
+          <hr />
+          {renderInputField("ignore_auto_tag", "checkbox")}
+        </Form>
+
+        <DetailsEditNavbar
+          objectName={tag?.name ?? intl.formatMessage({ id: "tag" })}
+          classNames="col-xl-9 mt-3"
+          isNew={isNew}
+          isEditing
+          onToggleEdit={onCancel}
+          onSave={formik.handleSubmit}
+          saveDisabled={
+            (!isNew && !formik.dirty) || !isEqual(formik.errors, {})
           }
-
-          return handleUnsavedChanges(intl, "tags", tag.id)(location);
-        }}
-      />
-
-      <Form noValidate onSubmit={formik.handleSubmit} id="tag-edit">
-        {renderInputField("name")}
-        {renderInputField("sort_name", "text")}
-        {renderStringListField("aliases")}
-        {renderInputField("description", "textarea")}
-        {renderParentTagsField()}
-        {renderSubTagsField()}
-        {renderStashIDsField("stash_ids", "tags")}
-        <hr />
-        {renderInputField("ignore_auto_tag", "checkbox")}
-      </Form>
-
-      <DetailsEditNavbar
-        objectName={tag?.name ?? intl.formatMessage({ id: "tag" })}
-        classNames="col-xl-9 mt-3"
-        isNew={isNew}
-        isEditing
-        onToggleEdit={onCancel}
-        onSave={formik.handleSubmit}
-        saveDisabled={(!isNew && !formik.dirty) || !isEqual(formik.errors, {})}
-        onImageChange={onImageChange}
-        onImageChangeURL={onImageLoad}
-        onClearImage={() => onImageLoad(null)}
-        onDelete={onDelete}
-        acceptSVG
-      />
-    </div>
+          onImageChange={onImageChange}
+          onImageChangeURL={onImageLoad}
+          onClearImage={() => onImageLoad(null)}
+          onDelete={onDelete}
+          acceptSVG
+        />
+      </div>
+    </>
   );
 };
diff --git a/ui/v2.5/src/core/StashService.ts b/ui/v2.5/src/core/StashService.ts
index e69d988bf..d43d87097 100644
--- a/ui/v2.5/src/core/StashService.ts
+++ b/ui/v2.5/src/core/StashService.ts
@@ -2329,6 +2329,23 @@ export const stashBoxSceneQuery = (query: string, stashBoxEndpoint: string) =>
     }
   );
 
+export const stashBoxTagQuery = (
+  query: string | null,
+  stashBoxEndpoint: string
+) =>
+  client.query<GQL.ScrapeSingleTagQuery, GQL.ScrapeSingleTagQueryVariables>({
+    query: GQL.ScrapeSingleTagDocument,
+    variables: {
+      source: {
+        stash_box_endpoint: stashBoxEndpoint,
+      },
+      input: {
+        query: query,
+      },
+    },
+    fetchPolicy: "network-only",
+  });
+
 export const mutateStashBoxBatchPerformerTag = (
   input: GQL.StashBoxBatchTagInput
 ) =>
diff --git a/ui/v2.5/src/locales/en-GB.json b/ui/v2.5/src/locales/en-GB.json
index c2b9b4247..54982b932 100644
--- a/ui/v2.5/src/locales/en-GB.json
+++ b/ui/v2.5/src/locales/en-GB.json
@@ -1016,6 +1016,7 @@
     },
     "scenes_found": "{count} scenes found",
     "studios_found": "{count} studios found",
+    "tags_found": "{count} tags found",
     "scrape_entity_query": "{entity_type} Scrape Query",
     "scrape_entity_title": "{entity_type} Scrape Results",
     "scrape_results_existing": "Existing",

From d994df290055f863b4b45ff482e0ff9686142f85 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Fri, 5 Dec 2025 08:46:31 +1100
Subject: [PATCH 195/405] Don't convert config file location to absolute during
 setup (#6373)

This was originally done for #3304. The ffmpeg code has been redone since and this is no longer necessary. It was also resulting in the scraper and plugin paths being absolute, despite all the others being relative to the provided config path.
---
 internal/manager/manager.go | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/internal/manager/manager.go b/internal/manager/manager.go
index 2d47fd907..f4f3fa636 100644
--- a/internal/manager/manager.go
+++ b/internal/manager/manager.go
@@ -219,8 +219,11 @@ func (s *Manager) Setup(ctx context.Context, input SetupInput) error {
 		// paths since they must not be relative. The config file property is
 		// resolved to an absolute path when stash is run normally, so convert
 		// relative paths to absolute paths during setup.
-		configFile, _ := filepath.Abs(input.ConfigLocation)
-
+		// #6287 - this should no longer be necessary since the ffmpeg code
+		// converts to absolute paths. Converting the config location to
+		// absolute means that scraper and plugin paths default to absolute
+		// which we don't want.
+		configFile := input.ConfigLocation
 		configDir := filepath.Dir(configFile)
 
 		if exists, _ := fsutil.DirExists(configDir); !exists {

From 88a149c085f32ab8b747aac30904477149b7eeac Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Fri, 5 Dec 2025 09:04:16 +1100
Subject: [PATCH 196/405] Correct sidebar styling on details pages (#6377)

* Remove margin-bottom on xs to fix styling weirdness
* Only set sidebar height when sidebar visible
---
 ui/v2.5/src/components/Shared/styles.scss | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/ui/v2.5/src/components/Shared/styles.scss b/ui/v2.5/src/components/Shared/styles.scss
index 55dff9d0f..947dd22d7 100644
--- a/ui/v2.5/src/components/Shared/styles.scss
+++ b/ui/v2.5/src/components/Shared/styles.scss
@@ -828,7 +828,6 @@ button.btn.favorite-button {
   }
   @include media-breakpoint-down(xs) {
     .sidebar {
-      margin-bottom: $navbar-height;
       margin-top: 0;
     }
   }
@@ -920,12 +919,16 @@ $sticky-header-height: calc(50px + 3.3rem);
 }
 
 .detail-body {
+  .sidebar-pane {
+    position: sticky;
+    top: calc($sticky-detail-header-height + $navbar-height);
+  }
+
   .sidebar {
     // required for sticky to work
     align-self: flex-start;
 
     // take a further 15px padding to match the detail body
-    height: calc(100vh - $sticky-header-height - 15px);
     margin-top: -15px;
     max-height: calc(100vh - $sticky-header-height - 15px);
     overflow-y: auto;
@@ -939,6 +942,10 @@ $sticky-header-height: calc(50px + 3.3rem);
     }
   }
 
+  .sidebar-pane:not(.hide-sidebar) .sidebar {
+    height: calc(100vh - $sticky-header-height - 15px);
+  }
+
   .sidebar-pane.hide-sidebar .sidebar {
     left: -$sidebar-width;
     margin-left: calc(-15px - $sidebar-width);
@@ -955,6 +962,10 @@ $sticky-header-height: calc(50px + 3.3rem);
     }
   }
   @include media-breakpoint-down(xs) {
+    .sidebar-pane {
+      top: 0;
+    }
+
     .sidebar {
       // flex: 100% 0 0;
       height: calc(100vh - $navbar-height);

From 061d21dede815f7835f6007419e9791533817fda Mon Sep 17 00:00:00 2001
From: Gykes <24581046+Gykes@users.noreply.github.com>
Date: Thu, 4 Dec 2025 21:05:46 -0600
Subject: [PATCH 197/405] Feature Request: Sort All Urls Alphabetically (#6352)

---
 .../Galleries/GalleryDetails/GalleryEditPanel.tsx  |  3 ++-
 .../Groups/GroupDetails/GroupEditPanel.tsx         |  3 ++-
 .../Images/ImageDetails/ImageEditPanel.tsx         |  3 ++-
 .../PerformerDetails/PerformerEditPanel.tsx        |  3 ++-
 .../Scenes/SceneDetails/SceneEditPanel.tsx         |  3 ++-
 .../src/components/Shared/ExternalLinksButton.tsx  |  7 +++++--
 .../Studios/StudioDetails/StudioDetailsPanel.tsx   |  9 ++++++---
 .../Studios/StudioDetails/StudioEditPanel.tsx      |  3 ++-
 ui/v2.5/src/utils/url.ts                           | 14 ++++++++++++++
 9 files changed, 37 insertions(+), 11 deletions(-)
 create mode 100644 ui/v2.5/src/utils/url.ts

diff --git a/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryEditPanel.tsx b/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryEditPanel.tsx
index 5b9fa9da1..05385aaa4 100644
--- a/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryEditPanel.tsx
+++ b/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryEditPanel.tsx
@@ -31,6 +31,7 @@ import { Studio, StudioSelect } from "src/components/Studios/StudioSelect";
 import { Scene, SceneSelect } from "src/components/Scenes/SceneSelect";
 import { useTagsEdit } from "src/hooks/tagsEdit";
 import { ScraperMenu } from "src/components/Shared/ScraperMenu";
+import { sortURLs } from "src/utils/url";
 
 interface IProps {
   gallery: Partial<GQL.GalleryDataFragment>;
@@ -81,7 +82,7 @@ export const GalleryEditPanel: React.FC<IProps> = ({
   const initialValues = {
     title: gallery?.title ?? "",
     code: gallery?.code ?? "",
-    urls: gallery?.urls ?? [],
+    urls: sortURLs(gallery?.urls ?? []),
     date: gallery?.date ?? "",
     photographer: gallery?.photographer ?? "",
     studio_id: gallery?.studio?.id ?? null,
diff --git a/ui/v2.5/src/components/Groups/GroupDetails/GroupEditPanel.tsx b/ui/v2.5/src/components/Groups/GroupDetails/GroupEditPanel.tsx
index 0b94baf27..6f548027f 100644
--- a/ui/v2.5/src/components/Groups/GroupDetails/GroupEditPanel.tsx
+++ b/ui/v2.5/src/components/Groups/GroupDetails/GroupEditPanel.tsx
@@ -28,6 +28,7 @@ import { Studio, StudioSelect } from "src/components/Studios/StudioSelect";
 import { useTagsEdit } from "src/hooks/tagsEdit";
 import { Group } from "src/components/Groups/GroupSelect";
 import { RelatedGroupTable, IRelatedGroupEntry } from "./RelatedGroupTable";
+import { sortURLs } from "src/utils/url";
 
 interface IGroupEditPanel {
   group: Partial<GQL.GroupDataFragment>;
@@ -97,7 +98,7 @@ export const GroupEditPanel: React.FC<IGroupEditPanel> = ({
       return { group_id: m.group.id, description: m.description ?? "" };
     }),
     director: group?.director ?? "",
-    urls: group?.urls ?? [],
+    urls: sortURLs(group?.urls ?? []),
     synopsis: group?.synopsis ?? "",
   };
 
diff --git a/ui/v2.5/src/components/Images/ImageDetails/ImageEditPanel.tsx b/ui/v2.5/src/components/Images/ImageDetails/ImageEditPanel.tsx
index f2771f542..83fc0343c 100644
--- a/ui/v2.5/src/components/Images/ImageDetails/ImageEditPanel.tsx
+++ b/ui/v2.5/src/components/Images/ImageDetails/ImageEditPanel.tsx
@@ -35,6 +35,7 @@ import {
 } from "src/components/Galleries/GallerySelect";
 import { useTagsEdit } from "src/hooks/tagsEdit";
 import { ScraperMenu } from "src/components/Shared/ScraperMenu";
+import { sortURLs } from "src/utils/url";
 
 interface IProps {
   image: GQL.ImageDataFragment;
@@ -91,7 +92,7 @@ export const ImageEditPanel: React.FC<IProps> = ({
   const initialValues = {
     title: image.title ?? "",
     code: image.code ?? "",
-    urls: image?.urls ?? [],
+    urls: sortURLs(image?.urls ?? []),
     date: image?.date ?? "",
     details: image.details ?? "",
     photographer: image.photographer ?? "",
diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
index 8d1352da0..969af6633 100644
--- a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
@@ -48,6 +48,7 @@ import {
   yupUniqueStringList,
 } from "src/utils/yup";
 import { useTagsEdit } from "src/hooks/tagsEdit";
+import { sortURLs } from "src/utils/url";
 import { CustomFieldsInput } from "src/components/Shared/CustomFields";
 import { cloneDeep } from "@apollo/client/utilities";
 
@@ -153,7 +154,7 @@ export const PerformerEditPanel: React.FC<IPerformerDetails> = ({
     tattoos: performer.tattoos ?? "",
     piercings: performer.piercings ?? "",
     career_length: performer.career_length ?? "",
-    urls: performer.urls ?? [],
+    urls: sortURLs(performer.urls ?? []),
     details: performer.details ?? "",
     tag_ids: (performer.tags ?? []).map((t) => t.id),
     ignore_auto_tag: performer.ignore_auto_tag ?? false,
diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/SceneEditPanel.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/SceneEditPanel.tsx
index 11575ea7b..87968c009 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/SceneEditPanel.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/SceneEditPanel.tsx
@@ -42,6 +42,7 @@ import { Group } from "src/components/Groups/GroupSelect";
 import { useTagsEdit } from "src/hooks/tagsEdit";
 import { ScraperMenu } from "src/components/Shared/ScraperMenu";
 import StashBoxIDSearchModal from "src/components/Shared/StashBoxIDSearchModal";
+import { sortURLs } from "src/utils/url";
 
 const SceneScrapeDialog = lazyComponent(() => import("./SceneScrapeDialog"));
 const SceneQueryModal = lazyComponent(() => import("./SceneQueryModal"));
@@ -138,7 +139,7 @@ export const SceneEditPanel: React.FC<IProps> = ({
     () => ({
       title: scene.title ?? "",
       code: scene.code ?? "",
-      urls: scene.urls ?? [],
+      urls: sortURLs(scene.urls ?? []),
       date: scene.date ?? "",
       director: scene.director ?? "",
       gallery_ids: (scene.galleries ?? []).map((g) => g.id),
diff --git a/ui/v2.5/src/components/Shared/ExternalLinksButton.tsx b/ui/v2.5/src/components/Shared/ExternalLinksButton.tsx
index e35a1a992..e71419514 100644
--- a/ui/v2.5/src/components/Shared/ExternalLinksButton.tsx
+++ b/ui/v2.5/src/components/Shared/ExternalLinksButton.tsx
@@ -7,6 +7,7 @@ import { useMemo } from "react";
 import { faInstagram, faTwitter } from "@fortawesome/free-brands-svg-icons";
 import ReactDOM from "react-dom";
 import { PatchComponent } from "src/patch";
+import { sortURLs } from "src/utils/url";
 
 export const ExternalLinksButton: React.FC<{
   icon?: IconDefinition;
@@ -16,14 +17,16 @@ export const ExternalLinksButton: React.FC<{
 }> = PatchComponent(
   "ExternalLinksButton",
   ({ urls, icon = faLink, className = "", openIfSingle = false }) => {
-    if (!urls.length) {
+    const sortedUrls = useMemo(() => sortURLs(urls), [urls]);
+
+    if (!sortedUrls.length) {
       return null;
     }
 
     const Menu = () =>
       ReactDOM.createPortal(
         <Dropdown.Menu>
-          {urls.map((url) => (
+          {sortedUrls.map((url) => (
             <Dropdown.Item
               key={url}
               as={ExternalLink}
diff --git a/ui/v2.5/src/components/Studios/StudioDetails/StudioDetailsPanel.tsx b/ui/v2.5/src/components/Studios/StudioDetails/StudioDetailsPanel.tsx
index 4d5af043f..1c59f50a9 100644
--- a/ui/v2.5/src/components/Studios/StudioDetails/StudioDetailsPanel.tsx
+++ b/ui/v2.5/src/components/Studios/StudioDetails/StudioDetailsPanel.tsx
@@ -1,9 +1,10 @@
-import React from "react";
+import React, { useMemo } from "react";
 import { TagLink } from "src/components/Shared/TagLink";
 import * as GQL from "src/core/generated-graphql";
 import { DetailItem } from "src/components/Shared/DetailItem";
 import { StashIDPill } from "src/components/Shared/StashID";
 import { Link } from "react-router-dom";
+import { sortURLs } from "src/utils/url";
 
 interface IStudioDetailsPanel {
   studio: GQL.StudioDataFragment;
@@ -46,14 +47,16 @@ export const StudioDetailsPanel: React.FC<IStudioDetailsPanel> = ({
     );
   }
 
+  const sortedURLs = useMemo(() => sortURLs(studio.urls ?? []), [studio.urls]);
+
   function renderURLs() {
-    if (!studio.urls?.length) {
+    if (!sortedURLs.length) {
       return;
     }
 
     return (
       <ul className="pl-0">
-        {studio.urls.map((url) => (
+        {sortedURLs.map((url) => (
           <li key={url}>
             <a href={url} target="_blank" rel="noreferrer">
               {url}
diff --git a/ui/v2.5/src/components/Studios/StudioDetails/StudioEditPanel.tsx b/ui/v2.5/src/components/Studios/StudioDetails/StudioEditPanel.tsx
index c8cfd3a3e..e351e3819 100644
--- a/ui/v2.5/src/components/Studios/StudioDetails/StudioEditPanel.tsx
+++ b/ui/v2.5/src/components/Studios/StudioDetails/StudioEditPanel.tsx
@@ -21,6 +21,7 @@ import { Studio, StudioSelect } from "../StudioSelect";
 import { useTagsEdit } from "src/hooks/tagsEdit";
 import { Icon } from "src/components/Shared/Icon";
 import StashBoxIDSearchModal from "src/components/Shared/StashBoxIDSearchModal";
+import { sortURLs } from "src/utils/url";
 
 interface IStudioEditPanel {
   studio: Partial<GQL.StudioDataFragment>;
@@ -68,7 +69,7 @@ export const StudioEditPanel: React.FC<IStudioEditPanel> = ({
   const initialValues = {
     id: studio.id,
     name: studio.name ?? "",
-    urls: studio.urls ?? [],
+    urls: sortURLs(studio.urls ?? []),
     details: studio.details ?? "",
     parent_id: studio.parent_studio?.id ?? null,
     aliases: studio.aliases ?? [],
diff --git a/ui/v2.5/src/utils/url.ts b/ui/v2.5/src/utils/url.ts
new file mode 100644
index 000000000..ee6c0dd36
--- /dev/null
+++ b/ui/v2.5/src/utils/url.ts
@@ -0,0 +1,14 @@
+/**
+ * Extracts the sortable portion of a URL by removing the protocol and www. prefix
+ */
+const urlSortKey = (url: string): string =>
+  url.toLowerCase().replace(/^(https?:\/\/)?(www\.)?/, "");
+
+/**
+ * Sorts a list of URLs alphabetically by their base URL,
+ * excluding the protocol (http/https) and www. prefix.
+ * Returns a new sorted array without mutating the original.
+ */
+export function sortURLs(urls: string[]): string[] {
+  return [...urls].sort((a, b) => urlSortKey(a).localeCompare(urlSortKey(b)));
+}

From e2dff05081c656c0dce83b0d253857225ed39a26 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Mon, 8 Dec 2025 07:59:42 +1100
Subject: [PATCH 198/405] Replace ValueOnlyContext with context.WithoutCancel
 (#6379)

---
 pkg/file/scan.go     |  3 +--
 pkg/job/manager.go   |  4 ++--
 pkg/utils/context.go | 22 ----------------------
 3 files changed, 3 insertions(+), 26 deletions(-)
 delete mode 100644 pkg/utils/context.go

diff --git a/pkg/file/scan.go b/pkg/file/scan.go
index 7d5a79713..4018913b0 100644
--- a/pkg/file/scan.go
+++ b/pkg/file/scan.go
@@ -15,7 +15,6 @@ import (
 	"github.com/stashapp/stash/pkg/logger"
 	"github.com/stashapp/stash/pkg/models"
 	"github.com/stashapp/stash/pkg/txn"
-	"github.com/stashapp/stash/pkg/utils"
 )
 
 const (
@@ -719,7 +718,7 @@ func (s *scanJob) handleFile(ctx context.Context, f scanFile) error {
 		// scan zip files with a different context that is not cancellable
 		// cancelling while scanning zip file contents results in the scan
 		// contents being partially completed
-		zipCtx := utils.ValueOnlyContext{Context: ctx}
+		zipCtx := context.WithoutCancel(ctx)
 
 		if err := s.scanZipFile(zipCtx, f); err != nil {
 			logger.Errorf("Error scanning zip file %q: %v", f.Path, err)
diff --git a/pkg/job/manager.go b/pkg/job/manager.go
index 983d88cc0..3e47d842b 100644
--- a/pkg/job/manager.go
+++ b/pkg/job/manager.go
@@ -7,7 +7,6 @@ import (
 	"time"
 
 	"github.com/stashapp/stash/pkg/logger"
-	"github.com/stashapp/stash/pkg/utils"
 )
 
 const maxGraveyardSize = 10
@@ -179,7 +178,8 @@ func (m *Manager) dispatch(ctx context.Context, j *Job) (done chan struct{}) {
 	j.StartTime = &t
 	j.Status = StatusRunning
 
-	ctx, cancelFunc := context.WithCancel(utils.ValueOnlyContext{Context: ctx})
+	// create a cancellable context for the job that is not canceled by the outer context
+	ctx, cancelFunc := context.WithCancel(context.WithoutCancel(ctx))
 	j.cancelFunc = cancelFunc
 
 	done = make(chan struct{})
diff --git a/pkg/utils/context.go b/pkg/utils/context.go
deleted file mode 100644
index 2a3862b5d..000000000
--- a/pkg/utils/context.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package utils
-
-import (
-	"context"
-	"time"
-)
-
-type ValueOnlyContext struct {
-	context.Context
-}
-
-func (ValueOnlyContext) Deadline() (deadline time.Time, ok bool) {
-	return
-}
-
-func (ValueOnlyContext) Done() <-chan struct{} {
-	return nil
-}
-
-func (ValueOnlyContext) Err() error {
-	return nil
-}

From 0fd7a2ac20f9bac221369a095953c2a265e77709 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Mon, 8 Dec 2025 08:08:31 +1100
Subject: [PATCH 199/405] SQL performance improvements (#6378)

* Change queryStruct to use tx.Get instead of queryFunc

Using queryFunc meant that the performance logging was inaccurate due to the query actually being executed during the call to Scan.

* Only add join args if join was added

* Omit joins that are only used for sorting when skipping sorting

Should provide some marginal improvement on systems with a lot of items.

* Make all calls to the database pass context.

This means that long queries can be cancelled by navigating to another page. Previously the query would continue to run, impacting on future queries.
---
 pkg/sqlite/filter.go       | 42 +++++++++++++++++++++++++++-----------
 pkg/sqlite/gallery.go      |  4 ++++
 pkg/sqlite/group.go        |  2 +-
 pkg/sqlite/image.go        |  3 +++
 pkg/sqlite/query.go        | 29 +++++++++++++++++++-------
 pkg/sqlite/repository.go   | 13 ++++++------
 pkg/sqlite/scene.go        | 11 +++++++---
 pkg/sqlite/scene_marker.go |  4 ++--
 pkg/sqlite/tx.go           | 25 ++++++++---------------
 9 files changed, 84 insertions(+), 49 deletions(-)

diff --git a/pkg/sqlite/filter.go b/pkg/sqlite/filter.go
index 143487af2..fa6759ae6 100644
--- a/pkg/sqlite/filter.go
+++ b/pkg/sqlite/filter.go
@@ -96,6 +96,9 @@ type join struct {
 	onClause string
 	joinType string
 	args     []interface{}
+
+	// if true, indicates this is required for sorting only
+	sort bool
 }
 
 // equals returns true if the other join alias/table is equal to this one
@@ -127,30 +130,45 @@ func (j join) toSQL() string {
 
 type joins []join
 
+// addUnique only adds if not already present
+// returns true if added
+func (j *joins) addUnique(newJoin join) bool {
+	found := false
+	for i, jj := range *j {
+		if jj.equals(newJoin) {
+			found = true
+			// if sort is false on the new join, but true on the existing, set the false
+			if !newJoin.sort && jj.sort {
+				(*j)[i].sort = false
+			}
+			break
+		}
+	}
+
+	if !found {
+		*j = append(*j, newJoin)
+	}
+	return !found
+}
+
 func (j *joins) add(newJoins ...join) {
 	// only add if not already joined
 	for _, newJoin := range newJoins {
-		found := false
-		for _, jj := range *j {
-			if jj.equals(newJoin) {
-				found = true
-				break
-			}
-		}
-
-		if !found {
-			*j = append(*j, newJoin)
-		}
+		j.addUnique(newJoin)
 	}
 }
 
-func (j *joins) toSQL() string {
+func (j *joins) toSQL(includeSortPagination bool) string {
 	if len(*j) == 0 {
 		return ""
 	}
 
 	var ret []string
 	for _, jj := range *j {
+		// skip sort-only joins if not including sort/pagination
+		if !includeSortPagination && jj.sort {
+			continue
+		}
 		ret = append(ret, jj.toSQL())
 	}
 
diff --git a/pkg/sqlite/gallery.go b/pkg/sqlite/gallery.go
index 9cfe38b1f..a63e84214 100644
--- a/pkg/sqlite/gallery.go
+++ b/pkg/sqlite/gallery.go
@@ -800,10 +800,12 @@ func (qb *GalleryStore) setGallerySort(query *queryBuilder, findFilter *models.F
 	addFileTable := func() {
 		query.addJoins(
 			join{
+				sort:     true,
 				table:    galleriesFilesTable,
 				onClause: "galleries_files.gallery_id = galleries.id",
 			},
 			join{
+				sort:     true,
 				table:    fileTable,
 				onClause: "galleries_files.file_id = files.id",
 			},
@@ -813,10 +815,12 @@ func (qb *GalleryStore) setGallerySort(query *queryBuilder, findFilter *models.F
 	addFolderTable := func() {
 		query.addJoins(
 			join{
+				sort:     true,
 				table:    folderTable,
 				onClause: "folders.id = galleries.folder_id",
 			},
 			join{
+				sort:     true,
 				table:    folderTable,
 				as:       "file_folder",
 				onClause: "files.parent_folder_id = file_folder.id",
diff --git a/pkg/sqlite/group.go b/pkg/sqlite/group.go
index f0f8d6b40..9d0527752 100644
--- a/pkg/sqlite/group.go
+++ b/pkg/sqlite/group.go
@@ -518,7 +518,7 @@ func (qb *GroupStore) setGroupSort(query *queryBuilder, findFilter *models.FindF
 		} else {
 			// this will give unexpected results if the query is not filtered by a parent group and
 			// the group has multiple parents and order indexes
-			query.join(groupRelationsTable, "", "groups.id = groups_relations.sub_id")
+			query.joinSort(groupRelationsTable, "", "groups.id = groups_relations.sub_id")
 			query.sortAndPagination += getSort("order_index", direction, groupRelationsTable)
 		}
 	case "tag_count":
diff --git a/pkg/sqlite/image.go b/pkg/sqlite/image.go
index 1588fa415..a903a62fd 100644
--- a/pkg/sqlite/image.go
+++ b/pkg/sqlite/image.go
@@ -965,10 +965,12 @@ func (qb *ImageStore) setImageSortAndPagination(q *queryBuilder, findFilter *mod
 		addFilesJoin := func() {
 			q.addJoins(
 				join{
+					sort:     true,
 					table:    imagesFilesTable,
 					onClause: "images_files.image_id = images.id",
 				},
 				join{
+					sort:     true,
 					table:    fileTable,
 					onClause: "images_files.file_id = files.id",
 				},
@@ -977,6 +979,7 @@ func (qb *ImageStore) setImageSortAndPagination(q *queryBuilder, findFilter *mod
 
 		addFolderJoin := func() {
 			q.addJoins(join{
+				sort:     true,
 				table:    folderTable,
 				onClause: "files.parent_folder_id = folders.id",
 			})
diff --git a/pkg/sqlite/query.go b/pkg/sqlite/query.go
index 4f4c0c8db..99c1f4e5f 100644
--- a/pkg/sqlite/query.go
+++ b/pkg/sqlite/query.go
@@ -24,8 +24,8 @@ type queryBuilder struct {
 	sortAndPagination string
 }
 
-func (qb queryBuilder) body() string {
-	return fmt.Sprintf("SELECT %s FROM %s%s", strings.Join(qb.columns, ", "), qb.from, qb.joins.toSQL())
+func (qb queryBuilder) body(includeSortPagination bool) string {
+	return fmt.Sprintf("SELECT %s FROM %s%s", strings.Join(qb.columns, ", "), qb.from, qb.joins.toSQL(includeSortPagination))
 }
 
 func (qb *queryBuilder) addColumn(column string) {
@@ -33,7 +33,7 @@ func (qb *queryBuilder) addColumn(column string) {
 }
 
 func (qb queryBuilder) toSQL(includeSortPagination bool) string {
-	body := qb.body()
+	body := qb.body(includeSortPagination)
 
 	withClause := ""
 	if len(qb.withClauses) > 0 {
@@ -59,12 +59,14 @@ func (qb queryBuilder) findIDs(ctx context.Context) ([]int, error) {
 }
 
 func (qb queryBuilder) executeFind(ctx context.Context) ([]int, int, error) {
-	body := qb.body()
+	const includeSortPagination = true
+	body := qb.body(includeSortPagination)
 	return qb.repository.executeFindQuery(ctx, body, qb.args, qb.sortAndPagination, qb.whereClauses, qb.havingClauses, qb.withClauses, qb.recursiveWith)
 }
 
 func (qb queryBuilder) executeCount(ctx context.Context) (int, error) {
-	body := qb.body()
+	const includeSortPagination = false
+	body := qb.body(includeSortPagination)
 
 	withClause := ""
 	if len(qb.withClauses) > 0 {
@@ -131,10 +133,23 @@ func (qb *queryBuilder) join(table, as, onClause string) {
 	qb.joins.add(newJoin)
 }
 
+func (qb *queryBuilder) joinSort(table, as, onClause string) {
+	newJoin := join{
+		sort:     true,
+		table:    table,
+		as:       as,
+		onClause: onClause,
+		joinType: "LEFT",
+	}
+
+	qb.joins.add(newJoin)
+}
+
 func (qb *queryBuilder) addJoins(joins ...join) {
-	qb.joins.add(joins...)
 	for _, j := range joins {
-		qb.args = append(qb.args, j.args...)
+		if qb.joins.addUnique(j) {
+			qb.args = append(qb.args, j.args...)
+		}
 	}
 }
 
diff --git a/pkg/sqlite/repository.go b/pkg/sqlite/repository.go
index ac2954cfb..18d501e3a 100644
--- a/pkg/sqlite/repository.go
+++ b/pkg/sqlite/repository.go
@@ -96,7 +96,7 @@ func (r *repository) runIdsQuery(ctx context.Context, query string, args []inter
 }
 
 func (r *repository) queryFunc(ctx context.Context, query string, args []interface{}, single bool, f func(rows *sqlx.Rows) error) error {
-	rows, err := dbWrapper.Queryx(ctx, query, args...)
+	rows, err := dbWrapper.QueryxContext(ctx, query, args...)
 
 	if err != nil && !errors.Is(err, sql.ErrNoRows) {
 		return err
@@ -119,13 +119,12 @@ func (r *repository) queryFunc(ctx context.Context, query string, args []interfa
 	return nil
 }
 
+// queryStruct executes a query and scans the result into the provided struct.
+// Unlike the other query methods, this will return an error if no rows are found.
 func (r *repository) queryStruct(ctx context.Context, query string, args []interface{}, out interface{}) error {
-	if err := r.queryFunc(ctx, query, args, true, func(rows *sqlx.Rows) error {
-		if err := rows.StructScan(out); err != nil {
-			return err
-		}
-		return nil
-	}); err != nil {
+	// changed from queryFunc, since it was not logging the performance correctly,
+	// since the query doesn't actually execute until Scan is called
+	if err := dbWrapper.Get(ctx, out, query, args...); err != nil {
 		return fmt.Errorf("executing query: %s [%v]: %w", query, args, err)
 	}
 
diff --git a/pkg/sqlite/scene.go b/pkg/sqlite/scene.go
index 40feb5847..955a98419 100644
--- a/pkg/sqlite/scene.go
+++ b/pkg/sqlite/scene.go
@@ -1157,10 +1157,12 @@ func (qb *SceneStore) setSceneSort(query *queryBuilder, findFilter *models.FindF
 	addFileTable := func() {
 		query.addJoins(
 			join{
+				sort:     true,
 				table:    scenesFilesTable,
 				onClause: "scenes_files.scene_id = scenes.id",
 			},
 			join{
+				sort:     true,
 				table:    fileTable,
 				onClause: "scenes_files.file_id = files.id",
 			},
@@ -1171,6 +1173,7 @@ func (qb *SceneStore) setSceneSort(query *queryBuilder, findFilter *models.FindF
 		addFileTable()
 		query.addJoins(
 			join{
+				sort:     true,
 				table:    videoFileTable,
 				onClause: "video_files.file_id = scenes_files.file_id",
 			},
@@ -1180,6 +1183,7 @@ func (qb *SceneStore) setSceneSort(query *queryBuilder, findFilter *models.FindF
 	addFolderTable := func() {
 		query.addJoins(
 			join{
+				sort:     true,
 				table:    folderTable,
 				onClause: "files.parent_folder_id = folders.id",
 			},
@@ -1189,10 +1193,10 @@ func (qb *SceneStore) setSceneSort(query *queryBuilder, findFilter *models.FindF
 	direction := findFilter.GetDirection()
 	switch sort {
 	case "movie_scene_number":
-		query.join(groupsScenesTable, "", "scenes.id = groups_scenes.scene_id")
+		query.joinSort(groupsScenesTable, "", "scenes.id = groups_scenes.scene_id")
 		query.sortAndPagination += getSort("scene_index", direction, groupsScenesTable)
 	case "group_scene_number":
-		query.join(groupsScenesTable, "scene_group", "scenes.id = scene_group.scene_id")
+		query.joinSort(groupsScenesTable, "scene_group", "scenes.id = scene_group.scene_id")
 		query.sortAndPagination += getSort("scene_index", direction, "scene_group")
 	case "tag_count":
 		query.sortAndPagination += getCountSort(sceneTable, scenesTagsTable, sceneIDColumn, direction)
@@ -1210,6 +1214,7 @@ func (qb *SceneStore) setSceneSort(query *queryBuilder, findFilter *models.FindF
 		addFileTable()
 		query.addJoins(
 			join{
+				sort:     true,
 				table:    fingerprintTable,
 				as:       "fingerprints_phash",
 				onClause: "scenes_files.file_id = fingerprints_phash.file_id AND fingerprints_phash.type = 'phash'",
@@ -1274,7 +1279,7 @@ func (qb *SceneStore) setSceneSort(query *queryBuilder, findFilter *models.FindF
 			getSortDirection(direction),
 		)
 	case "studio":
-		query.join(studioTable, "", "scenes.studio_id = studios.id")
+		query.joinSort(studioTable, "", "scenes.studio_id = studios.id")
 		query.sortAndPagination += getSort("name", direction, studioTable)
 	default:
 		query.sortAndPagination += getSort(sort, direction, "scenes")
diff --git a/pkg/sqlite/scene_marker.go b/pkg/sqlite/scene_marker.go
index 59a4137e1..d47df0e0f 100644
--- a/pkg/sqlite/scene_marker.go
+++ b/pkg/sqlite/scene_marker.go
@@ -392,10 +392,10 @@ func (qb *SceneMarkerStore) setSceneMarkerSort(query *queryBuilder, findFilter *
 	switch sort {
 	case "scenes_updated_at":
 		sort = "updated_at"
-		query.join(sceneTable, "", "scenes.id = scene_markers.scene_id")
+		query.joinSort(sceneTable, "", "scenes.id = scene_markers.scene_id")
 		query.sortAndPagination += getSort(sort, direction, sceneTable)
 	case "title":
-		query.join(tagTable, "", "scene_markers.primary_tag_id = tags.id")
+		query.joinSort(tagTable, "", "scene_markers.primary_tag_id = tags.id")
 		query.sortAndPagination += " ORDER BY COALESCE(NULLIF(scene_markers.title,''), tags.name) COLLATE NATURAL_CI " + direction
 	case "duration":
 		sort = "(scene_markers.end_seconds - scene_markers.seconds)"
diff --git a/pkg/sqlite/tx.go b/pkg/sqlite/tx.go
index a2e272aa9..b6701dc81 100644
--- a/pkg/sqlite/tx.go
+++ b/pkg/sqlite/tx.go
@@ -16,8 +16,8 @@ const (
 
 type dbReader interface {
 	Get(dest interface{}, query string, args ...interface{}) error
-	Select(dest interface{}, query string, args ...interface{}) error
-	Queryx(query string, args ...interface{}) (*sqlx.Rows, error)
+	GetContext(ctx context.Context, dest interface{}, query string, args ...interface{}) error
+	SelectContext(ctx context.Context, dest interface{}, query string, args ...interface{}) error
 	QueryxContext(ctx context.Context, query string, args ...interface{}) (*sqlx.Rows, error)
 }
 
@@ -54,7 +54,7 @@ func (*dbWrapperType) Get(ctx context.Context, dest interface{}, query string, a
 	}
 
 	start := time.Now()
-	err = tx.Get(dest, query, args...)
+	err = tx.GetContext(ctx, dest, query, args...)
 	logSQL(start, query, args...)
 
 	return sqlError(err, query, args...)
@@ -67,7 +67,7 @@ func (*dbWrapperType) Select(ctx context.Context, dest interface{}, query string
 	}
 
 	start := time.Now()
-	err = tx.Select(dest, query, args...)
+	err = tx.SelectContext(ctx, dest, query, args...)
 	logSQL(start, query, args...)
 
 	return sqlError(err, query, args...)
@@ -80,23 +80,14 @@ func (*dbWrapperType) Queryx(ctx context.Context, query string, args ...interfac
 	}
 
 	start := time.Now()
-	ret, err := tx.Queryx(query, args...)
+	ret, err := tx.QueryxContext(ctx, query, args...)
 	logSQL(start, query, args...)
 
 	return ret, sqlError(err, query, args...)
 }
 
 func (*dbWrapperType) QueryxContext(ctx context.Context, query string, args ...interface{}) (*sqlx.Rows, error) {
-	tx, err := getDBReader(ctx)
-	if err != nil {
-		return nil, sqlError(err, query, args...)
-	}
-
-	start := time.Now()
-	ret, err := tx.QueryxContext(ctx, query, args...)
-	logSQL(start, query, args...)
-
-	return ret, sqlError(err, query, args...)
+	return dbWrapper.Queryx(ctx, query, args...)
 }
 
 func (*dbWrapperType) NamedExec(ctx context.Context, query string, arg interface{}) (sql.Result, error) {
@@ -106,7 +97,7 @@ func (*dbWrapperType) NamedExec(ctx context.Context, query string, arg interface
 	}
 
 	start := time.Now()
-	ret, err := tx.NamedExec(query, arg)
+	ret, err := tx.NamedExecContext(ctx, query, arg)
 	logSQL(start, query, arg)
 
 	return ret, sqlError(err, query, arg)
@@ -119,7 +110,7 @@ func (*dbWrapperType) Exec(ctx context.Context, query string, args ...interface{
 	}
 
 	start := time.Now()
-	ret, err := tx.Exec(query, args...)
+	ret, err := tx.ExecContext(ctx, query, args...)
 	logSQL(start, query, args...)
 
 	return ret, sqlError(err, query, args...)

From eb9d0705bcd586ac4bccb52523a6b6515b966114 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Mon, 8 Dec 2025 08:47:35 +1100
Subject: [PATCH 200/405] Query for image query result metadata separately
 (#6370)

* Make a separate query for loading image query metadata
---
 ui/v2.5/graphql/queries/image.graphql        | 17 +++++++-
 ui/v2.5/src/components/Images/ImageList.tsx  | 21 ++++++++--
 ui/v2.5/src/components/List/ItemList.tsx     | 33 ++++++++++-----
 ui/v2.5/src/components/List/ListProvider.tsx | 43 +++++++++++++++-----
 ui/v2.5/src/core/StashService.ts             |  9 ++++
 ui/v2.5/src/models/list-filter/filter.ts     | 14 +++++++
 6 files changed, 109 insertions(+), 28 deletions(-)

diff --git a/ui/v2.5/graphql/queries/image.graphql b/ui/v2.5/graphql/queries/image.graphql
index ee96d00d2..d2c6cdac8 100644
--- a/ui/v2.5/graphql/queries/image.graphql
+++ b/ui/v2.5/graphql/queries/image.graphql
@@ -9,14 +9,27 @@ query FindImages(
     image_ids: $image_ids
   ) {
     count
-    megapixels
-    filesize
     images {
       ...SlimImageData
     }
   }
 }
 
+query FindImagesMetadata(
+  $filter: FindFilterType
+  $image_filter: ImageFilterType
+  $image_ids: [Int!]
+) {
+  findImages(
+    filter: $filter
+    image_filter: $image_filter
+    image_ids: $image_ids
+  ) {
+    megapixels
+    filesize
+  }
+}
+
 query FindImage($id: ID!, $checksum: String) {
   findImage(id: $id, checksum: $checksum) {
     ...ImageData
diff --git a/ui/v2.5/src/components/Images/ImageList.tsx b/ui/v2.5/src/components/Images/ImageList.tsx
index 0e3753480..23e93a94c 100644
--- a/ui/v2.5/src/components/Images/ImageList.tsx
+++ b/ui/v2.5/src/components/Images/ImageList.tsx
@@ -4,7 +4,11 @@ import cloneDeep from "lodash-es/cloneDeep";
 import { useHistory } from "react-router-dom";
 import Mousetrap from "mousetrap";
 import * as GQL from "src/core/generated-graphql";
-import { queryFindImages, useFindImages } from "src/core/StashService";
+import {
+  queryFindImages,
+  useFindImages,
+  useFindImagesMetadata,
+} from "src/core/StashService";
 import { ItemList, ItemListContext, showWhenSelected } from "../List/ItemList";
 import { useLightbox } from "src/hooks/Lightbox/hooks";
 import { ListFilterModel } from "src/models/list-filter/filter";
@@ -269,9 +273,17 @@ function getCount(result: GQL.FindImagesQueryResult) {
   return result?.data?.findImages?.count ?? 0;
 }
 
-function renderMetadataByline(result: GQL.FindImagesQueryResult) {
-  const megapixels = result?.data?.findImages?.megapixels;
-  const size = result?.data?.findImages?.filesize;
+function renderMetadataByline(
+  result: GQL.FindImagesQueryResult,
+  metadataInfo?: GQL.FindImagesMetadataQueryResult
+) {
+  const megapixels = metadataInfo?.data?.findImages?.megapixels;
+  const size = metadataInfo?.data?.findImages?.filesize;
+
+  if (metadataInfo?.loading) {
+    // return ellipsis
+    return <span className="images-stats">&nbsp;(...)</span>;
+  }
 
   if (!megapixels && !size) {
     return;
@@ -450,6 +462,7 @@ export const ImageList: React.FC<IImageList> = ({
     <ItemListContext
       filterMode={filterMode}
       useResult={useFindImages}
+      useMetadataInfo={useFindImagesMetadata}
       getItems={getItems}
       getCount={getCount}
       alterQuery={alterQuery}
diff --git a/ui/v2.5/src/components/List/ItemList.tsx b/ui/v2.5/src/components/List/ItemList.tsx
index b68077b55..4c360ecc9 100644
--- a/ui/v2.5/src/components/List/ItemList.tsx
+++ b/ui/v2.5/src/components/List/ItemList.tsx
@@ -112,7 +112,7 @@ export function useFilteredItemList<
   };
 }
 
-interface IItemListProps<T extends QueryResult, E extends IHasID> {
+interface IItemListProps<T extends QueryResult, E extends IHasID, M = unknown> {
   view?: View;
   otherOperations?: IItemListOperation<T>[];
   renderContent: (
@@ -123,7 +123,7 @@ interface IItemListProps<T extends QueryResult, E extends IHasID> {
     onChangePage: (page: number) => void,
     pageCount: number
   ) => React.ReactNode;
-  renderMetadataByline?: (data: T) => React.ReactNode;
+  renderMetadataByline?: (data: T, metadataInfo?: M) => React.ReactNode;
   renderEditDialog?: (
     selected: E[],
     onClose: (applied: boolean) => void
@@ -140,8 +140,8 @@ interface IItemListProps<T extends QueryResult, E extends IHasID> {
   renderToolbar?: (props: IFilteredListToolbar) => React.ReactNode;
 }
 
-export const ItemList = <T extends QueryResult, E extends IHasID>(
-  props: IItemListProps<T, E>
+export const ItemList = <T extends QueryResult, E extends IHasID, M = unknown>(
+  props: IItemListProps<T, E, M>
 ) => {
   const {
     view,
@@ -155,8 +155,8 @@ export const ItemList = <T extends QueryResult, E extends IHasID>(
   } = props;
 
   const { filter, setFilter: updateFilter } = useFilter();
-  const { effectiveFilter, result, cachedResult, totalCount } =
-    useQueryResultContext<T, E>();
+  const { effectiveFilter, result, metadataInfo, cachedResult, totalCount } =
+    useQueryResultContext<T, E, M>();
   const listSelect = useListContext<E>();
   const {
     selectedIds,
@@ -174,8 +174,8 @@ export const ItemList = <T extends QueryResult, E extends IHasID>(
   const metadataByline = useMemo(() => {
     if (cachedResult.loading) return "";
 
-    return renderMetadataByline?.(cachedResult) ?? "";
-  }, [renderMetadataByline, cachedResult]);
+    return renderMetadataByline?.(cachedResult, metadataInfo) ?? "";
+  }, [renderMetadataByline, cachedResult, metadataInfo]);
 
   const pages = Math.ceil(totalCount / filter.itemsPerPage);
 
@@ -369,11 +369,16 @@ export const ItemList = <T extends QueryResult, E extends IHasID>(
   );
 };
 
-interface IItemListContextProps<T extends QueryResult, E extends IHasID> {
+interface IItemListContextProps<
+  T extends QueryResult,
+  E extends IHasID,
+  M = unknown
+> {
   filterMode: GQL.FilterMode;
   defaultSort?: string;
   defaultFilter?: ListFilterModel;
   useResult: (filter: ListFilterModel) => T;
+  useMetadataInfo?: (filter: ListFilterModel) => M;
   getCount: (data: T) => number;
   getItems: (data: T) => E[];
   filterHook?: (filter: ListFilterModel) => ListFilterModel;
@@ -384,14 +389,19 @@ interface IItemListContextProps<T extends QueryResult, E extends IHasID> {
 
 // Provides the contexts for the ItemList component. Includes functionality to scroll
 // to top on page change.
-export const ItemListContext = <T extends QueryResult, E extends IHasID>(
-  props: PropsWithChildren<IItemListContextProps<T, E>>
+export const ItemListContext = <
+  T extends QueryResult,
+  E extends IHasID,
+  M = unknown
+>(
+  props: PropsWithChildren<IItemListContextProps<T, E, M>>
 ) => {
   const {
     filterMode,
     defaultSort,
     defaultFilter: providedDefaultFilter,
     useResult,
+    useMetadataInfo,
     getCount,
     getItems,
     view,
@@ -425,6 +435,7 @@ export const ItemListContext = <T extends QueryResult, E extends IHasID>(
         <QueryResultContext
           filterHook={filterHook}
           useResult={useResult}
+          useMetadataInfo={useMetadataInfo}
           getCount={getCount}
           getItems={getItems}
         >
diff --git a/ui/v2.5/src/components/List/ListProvider.tsx b/ui/v2.5/src/components/List/ListProvider.tsx
index 2e8854586..0584a61c6 100644
--- a/ui/v2.5/src/components/List/ListProvider.tsx
+++ b/ui/v2.5/src/components/List/ListProvider.tsx
@@ -80,21 +80,25 @@ export function useListContextOptional<T extends IHasID = IHasID>() {
 
 interface IQueryResultContextOptions<
   T extends QueryResult,
-  E extends IHasID = IHasID
+  E extends IHasID = IHasID,
+  M = unknown
 > {
   filterHook?: (filter: ListFilterModel) => ListFilterModel;
   useResult: (filter: ListFilterModel) => T;
+  useMetadataInfo?: (filter: ListFilterModel) => M;
   getCount: (data: T) => number;
   getItems: (data: T) => E[];
 }
 
 export interface IQueryResultContextState<
   T extends QueryResult = QueryResult,
-  E extends IHasID = IHasID
+  E extends IHasID = IHasID,
+  M = unknown
 > {
   effectiveFilter: ListFilterModel;
   result: T;
   cachedResult: T;
+  metadataInfo?: M;
   items: E[];
   totalCount: number;
 }
@@ -104,15 +108,23 @@ export const QueryResultStateContext =
 
 export const QueryResultContext = <
   T extends QueryResult,
-  E extends IHasID = IHasID
+  E extends IHasID = IHasID,
+  M = unknown
 >(
-  props: IQueryResultContextOptions<T, E> & {
+  props: IQueryResultContextOptions<T, E, M> & {
     children?:
-      | ((props: IQueryResultContextState<T, E>) => React.ReactNode)
+      | ((props: IQueryResultContextState<T, E, M>) => React.ReactNode)
       | React.ReactNode;
   }
 ) => {
-  const { filterHook, useResult, getItems, getCount, children } = props;
+  const {
+    filterHook,
+    useResult,
+    useMetadataInfo,
+    getItems,
+    getCount,
+    children,
+  } = props;
 
   const { filter } = useFilter();
   const effectiveFilter = useMemo(() => {
@@ -122,9 +134,16 @@ export const QueryResultContext = <
     return filter;
   }, [filter, filterHook]);
 
-  const result = useResult(effectiveFilter);
+  // metadata filter is the effective filter with the sort, page size and page number removed
+  const metadataFilter = useMemo(
+    () => effectiveFilter.metadataInfo(),
+    [effectiveFilter]
+  );
 
-  // use cached query result for pagination and metadata rendering
+  const result = useResult(effectiveFilter);
+  const metadataInfo = useMetadataInfo?.(metadataFilter);
+
+  // use cached query result for pagination
   const cachedResult = useCachedQueryResult(effectiveFilter, result);
 
   const items = useMemo(() => getItems(result), [getItems, result]);
@@ -133,12 +152,13 @@ export const QueryResultContext = <
     [getCount, cachedResult]
   );
 
-  const state: IQueryResultContextState<T, E> = {
+  const state: IQueryResultContextState<T, E, M> = {
     effectiveFilter,
     result,
     cachedResult,
     items,
     totalCount,
+    metadataInfo,
   };
 
   return (
@@ -154,7 +174,8 @@ export const QueryResultContext = <
 
 export function useQueryResultContext<
   T extends QueryResult,
-  E extends IHasID = IHasID
+  E extends IHasID = IHasID,
+  M = unknown
 >() {
   const context = React.useContext(QueryResultStateContext);
 
@@ -164,5 +185,5 @@ export function useQueryResultContext<
     );
   }
 
-  return context as IQueryResultContextState<T, E>;
+  return context as IQueryResultContextState<T, E, M>;
 }
diff --git a/ui/v2.5/src/core/StashService.ts b/ui/v2.5/src/core/StashService.ts
index d43d87097..424301fe1 100644
--- a/ui/v2.5/src/core/StashService.ts
+++ b/ui/v2.5/src/core/StashService.ts
@@ -201,6 +201,15 @@ export const useFindImages = (filter?: ListFilterModel) =>
     },
   });
 
+export const useFindImagesMetadata = (filter?: ListFilterModel) =>
+  GQL.useFindImagesMetadataQuery({
+    skip: filter === undefined,
+    variables: {
+      filter: filter?.makeFindFilter(),
+      image_filter: filter?.makeFilter(),
+    },
+  });
+
 export const queryFindImages = (filter: ListFilterModel) =>
   client.query<GQL.FindImagesQuery>({
     query: GQL.FindImagesDocument,
diff --git a/ui/v2.5/src/models/list-filter/filter.ts b/ui/v2.5/src/models/list-filter/filter.ts
index 4780f1ab6..d28107a12 100644
--- a/ui/v2.5/src/models/list-filter/filter.ts
+++ b/ui/v2.5/src/models/list-filter/filter.ts
@@ -103,6 +103,20 @@ export class ListFilterModel {
     });
   }
 
+  // returns a clone of the filter for metadata fetching
+  // this removes the sort, page size and page number and zoom index
+  public metadataInfo() {
+    const clone = this.clone();
+    clone.sortBy = undefined;
+    clone.randomSeed = -1;
+    clone.currentPage = 1;
+    clone.sortDirection = DEFAULT_PARAMS.sortDirection;
+    clone.itemsPerPage = 0;
+    clone.zoomIndex = 1;
+    clone.displayMode = DEFAULT_PARAMS.displayMode;
+    return clone;
+  }
+
   // returns the number of filters applied
   public count() {
     // don't include search term

From 7db394bbeaa3bc581502115a19ab0e5bee749430 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Mon, 8 Dec 2025 09:11:40 +1100
Subject: [PATCH 201/405] Date precision (#6359)

* Remove month/year only formats from ParseDateStringAsTime
* Add precision field to Date and handle parsing year/month-only dates
* Add date precision columns for date columns
* Adjust UI to account for fuzzy dates
---
 pkg/models/date.go                            | 44 +++++++++++--
 pkg/models/date_test.go                       | 50 +++++++++++++++
 pkg/sqlite/database.go                        |  2 +-
 pkg/sqlite/date.go                            | 13 +++-
 pkg/sqlite/gallery.go                         | 18 +++---
 pkg/sqlite/group.go                           | 16 ++---
 pkg/sqlite/image.go                           | 24 +++----
 .../migrations/75_date_precision.up.sql       | 13 ++++
 pkg/sqlite/performer.go                       | 62 ++++++++++---------
 pkg/sqlite/record.go                          |  3 +-
 pkg/sqlite/scene.go                           | 18 +++---
 pkg/utils/date.go                             | 12 ----
 pkg/utils/date_test.go                        | 41 +-----------
 .../Galleries/GalleryDetails/Gallery.tsx      |  9 +--
 .../components/Galleries/GalleryWallCard.tsx  |  2 +-
 .../Groups/GroupDetails/GroupDetailsPanel.tsx |  2 +-
 .../components/Images/ImageDetails/Image.tsx  | 11 +---
 .../PerformerDetailsPanel.tsx                 |  7 ++-
 .../Performers/PerformerListTable.tsx         |  2 +-
 .../components/Scenes/SceneDetails/Scene.tsx  | 11 +---
 .../src/components/Scenes/SceneWallPanel.tsx  |  4 +-
 ui/v2.5/src/components/Shared/Date.tsx        | 36 +++++++++++
 ui/v2.5/src/utils/text.ts                     | 39 +++++++++++-
 23 files changed, 285 insertions(+), 154 deletions(-)
 create mode 100644 pkg/models/date_test.go
 create mode 100644 pkg/sqlite/migrations/75_date_precision.up.sql
 create mode 100644 ui/v2.5/src/components/Shared/Date.tsx

diff --git a/pkg/models/date.go b/pkg/models/date.go
index 151e32c1d..dbd5c4ec6 100644
--- a/pkg/models/date.go
+++ b/pkg/models/date.go
@@ -1,31 +1,63 @@
 package models
 
 import (
+	"fmt"
 	"time"
 
 	"github.com/stashapp/stash/pkg/utils"
 )
 
+type DatePrecision int
+
+const (
+	// default precision is day
+	DatePrecisionDay DatePrecision = iota
+	DatePrecisionMonth
+	DatePrecisionYear
+)
+
 // Date wraps a time.Time with a format of "YYYY-MM-DD"
 type Date struct {
 	time.Time
+	Precision DatePrecision
 }
 
-const dateFormat = "2006-01-02"
+var dateFormatPrecision = []string{
+	"2006-01-02",
+	"2006-01",
+	"2006",
+}
 
 func (d Date) String() string {
-	return d.Format(dateFormat)
+	return d.Format(dateFormatPrecision[d.Precision])
 }
 
 func (d Date) After(o Date) bool {
 	return d.Time.After(o.Time)
 }
 
-// ParseDate uses utils.ParseDateStringAsTime to parse a string into a date.
+// ParseDate tries to parse the input string into a date using utils.ParseDateStringAsTime.
+// If that fails, it attempts to parse the string with decreasing precision (month, then year).
+// It returns a Date struct with the appropriate precision set, or an error if all parsing attempts fail.
 func ParseDate(s string) (Date, error) {
+	var errs []error
+
+	// default parse to day precision
 	ret, err := utils.ParseDateStringAsTime(s)
-	if err != nil {
-		return Date{}, err
+	if err == nil {
+		return Date{Time: ret, Precision: DatePrecisionDay}, nil
 	}
-	return Date{Time: ret}, nil
+
+	errs = append(errs, err)
+
+	// try month and year precision
+	for i, format := range dateFormatPrecision[1:] {
+		ret, err := time.Parse(format, s)
+		if err == nil {
+			return Date{Time: ret, Precision: DatePrecision(i + 1)}, nil
+		}
+		errs = append(errs, err)
+	}
+
+	return Date{}, fmt.Errorf("failed to parse date %q: %v", s, errs)
 }
diff --git a/pkg/models/date_test.go b/pkg/models/date_test.go
new file mode 100644
index 000000000..b6cca9ee1
--- /dev/null
+++ b/pkg/models/date_test.go
@@ -0,0 +1,50 @@
+package models
+
+import (
+	"testing"
+	"time"
+)
+
+func TestParseDateStringAsTime(t *testing.T) {
+	tests := []struct {
+		name        string
+		input       string
+		output      Date
+		expectError bool
+	}{
+		// Full date formats (existing support)
+		{"RFC3339", "2014-01-02T15:04:05Z", Date{Time: time.Date(2014, 1, 2, 15, 4, 5, 0, time.UTC), Precision: DatePrecisionDay}, false},
+		{"Date only", "2014-01-02", Date{Time: time.Date(2014, 1, 2, 0, 0, 0, 0, time.UTC), Precision: DatePrecisionDay}, false},
+		{"Date with time", "2014-01-02 15:04:05", Date{Time: time.Date(2014, 1, 2, 15, 4, 5, 0, time.UTC), Precision: DatePrecisionDay}, false},
+
+		// Partial date formats (new support)
+		{"Year-Month", "2006-08", Date{Time: time.Date(2006, 8, 1, 0, 0, 0, 0, time.UTC), Precision: DatePrecisionMonth}, false},
+		{"Year only", "2014", Date{Time: time.Date(2014, 1, 1, 0, 0, 0, 0, time.UTC), Precision: DatePrecisionYear}, false},
+
+		// Invalid formats
+		{"Invalid format", "not-a-date", Date{}, true},
+		{"Empty string", "", Date{}, true},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result, err := ParseDate(tt.input)
+
+			if tt.expectError {
+				if err == nil {
+					t.Errorf("Expected error for input %q, but got none", tt.input)
+				}
+				return
+			}
+
+			if err != nil {
+				t.Errorf("Unexpected error for input %q: %v", tt.input, err)
+				return
+			}
+
+			if !result.Time.Equal(tt.output.Time) || result.Precision != tt.output.Precision {
+				t.Errorf("For input %q, expected output %+v, got %+v", tt.input, tt.output, result)
+			}
+		})
+	}
+}
diff --git a/pkg/sqlite/database.go b/pkg/sqlite/database.go
index 29e39270d..0ea3d7170 100644
--- a/pkg/sqlite/database.go
+++ b/pkg/sqlite/database.go
@@ -34,7 +34,7 @@ const (
 	cacheSizeEnv = "STASH_SQLITE_CACHE_SIZE"
 )
 
-var appSchemaVersion uint = 74
+var appSchemaVersion uint = 75
 
 //go:embed migrations/*.sql
 var migrationsBox embed.FS
diff --git a/pkg/sqlite/date.go b/pkg/sqlite/date.go
index ec41b612c..522fe7cb0 100644
--- a/pkg/sqlite/date.go
+++ b/pkg/sqlite/date.go
@@ -5,6 +5,7 @@ import (
 	"time"
 
 	"github.com/stashapp/stash/pkg/models"
+	"gopkg.in/guregu/null.v4"
 )
 
 const sqliteDateLayout = "2006-01-02"
@@ -54,12 +55,12 @@ func (d NullDate) Value() (driver.Value, error) {
 	return d.Date.Format(sqliteDateLayout), nil
 }
 
-func (d *NullDate) DatePtr() *models.Date {
+func (d *NullDate) DatePtr(precision null.Int) *models.Date {
 	if d == nil || !d.Valid {
 		return nil
 	}
 
-	return &models.Date{Time: d.Date}
+	return &models.Date{Time: d.Date, Precision: models.DatePrecision(precision.Int64)}
 }
 
 func NullDateFromDatePtr(d *models.Date) NullDate {
@@ -68,3 +69,11 @@ func NullDateFromDatePtr(d *models.Date) NullDate {
 	}
 	return NullDate{Date: d.Time, Valid: true}
 }
+
+func datePrecisionFromDatePtr(d *models.Date) null.Int {
+	if d == nil {
+		// default to day precision
+		return null.Int{}
+	}
+	return null.IntFrom(int64(d.Precision))
+}
diff --git a/pkg/sqlite/gallery.go b/pkg/sqlite/gallery.go
index a63e84214..41729057b 100644
--- a/pkg/sqlite/gallery.go
+++ b/pkg/sqlite/gallery.go
@@ -30,12 +30,13 @@ const (
 )
 
 type galleryRow struct {
-	ID           int         `db:"id" goqu:"skipinsert"`
-	Title        zero.String `db:"title"`
-	Code         zero.String `db:"code"`
-	Date         NullDate    `db:"date"`
-	Details      zero.String `db:"details"`
-	Photographer zero.String `db:"photographer"`
+	ID            int         `db:"id" goqu:"skipinsert"`
+	Title         zero.String `db:"title"`
+	Code          zero.String `db:"code"`
+	Date          NullDate    `db:"date"`
+	DatePrecision null.Int    `db:"date_precision"`
+	Details       zero.String `db:"details"`
+	Photographer  zero.String `db:"photographer"`
 	// expressed as 1-100
 	Rating    null.Int  `db:"rating"`
 	Organized bool      `db:"organized"`
@@ -50,6 +51,7 @@ func (r *galleryRow) fromGallery(o models.Gallery) {
 	r.Title = zero.StringFrom(o.Title)
 	r.Code = zero.StringFrom(o.Code)
 	r.Date = NullDateFromDatePtr(o.Date)
+	r.DatePrecision = datePrecisionFromDatePtr(o.Date)
 	r.Details = zero.StringFrom(o.Details)
 	r.Photographer = zero.StringFrom(o.Photographer)
 	r.Rating = intFromPtr(o.Rating)
@@ -74,7 +76,7 @@ func (r *galleryQueryRow) resolve() *models.Gallery {
 		ID:            r.ID,
 		Title:         r.Title.String,
 		Code:          r.Code.String,
-		Date:          r.Date.DatePtr(),
+		Date:          r.Date.DatePtr(r.DatePrecision),
 		Details:       r.Details.String,
 		Photographer:  r.Photographer.String,
 		Rating:        nullIntPtr(r.Rating),
@@ -102,7 +104,7 @@ type galleryRowRecord struct {
 func (r *galleryRowRecord) fromPartial(o models.GalleryPartial) {
 	r.setNullString("title", o.Title)
 	r.setNullString("code", o.Code)
-	r.setNullDate("date", o.Date)
+	r.setNullDate("date", "date_precision", o.Date)
 	r.setNullString("details", o.Details)
 	r.setNullString("photographer", o.Photographer)
 	r.setNullInt("rating", o.Rating)
diff --git a/pkg/sqlite/group.go b/pkg/sqlite/group.go
index 9d0527752..b216335b8 100644
--- a/pkg/sqlite/group.go
+++ b/pkg/sqlite/group.go
@@ -32,11 +32,12 @@ const (
 )
 
 type groupRow struct {
-	ID       int         `db:"id" goqu:"skipinsert"`
-	Name     zero.String `db:"name"`
-	Aliases  zero.String `db:"aliases"`
-	Duration null.Int    `db:"duration"`
-	Date     NullDate    `db:"date"`
+	ID            int         `db:"id" goqu:"skipinsert"`
+	Name          zero.String `db:"name"`
+	Aliases       zero.String `db:"aliases"`
+	Duration      null.Int    `db:"duration"`
+	Date          NullDate    `db:"date"`
+	DatePrecision null.Int    `db:"date_precision"`
 	// expressed as 1-100
 	Rating      null.Int    `db:"rating"`
 	StudioID    null.Int    `db:"studio_id,omitempty"`
@@ -56,6 +57,7 @@ func (r *groupRow) fromGroup(o models.Group) {
 	r.Aliases = zero.StringFrom(o.Aliases)
 	r.Duration = intFromPtr(o.Duration)
 	r.Date = NullDateFromDatePtr(o.Date)
+	r.DatePrecision = datePrecisionFromDatePtr(o.Date)
 	r.Rating = intFromPtr(o.Rating)
 	r.StudioID = intFromPtr(o.StudioID)
 	r.Director = zero.StringFrom(o.Director)
@@ -70,7 +72,7 @@ func (r *groupRow) resolve() *models.Group {
 		Name:      r.Name.String,
 		Aliases:   r.Aliases.String,
 		Duration:  nullIntPtr(r.Duration),
-		Date:      r.Date.DatePtr(),
+		Date:      r.Date.DatePtr(r.DatePrecision),
 		Rating:    nullIntPtr(r.Rating),
 		StudioID:  nullIntPtr(r.StudioID),
 		Director:  r.Director.String,
@@ -90,7 +92,7 @@ func (r *groupRowRecord) fromPartial(o models.GroupPartial) {
 	r.setNullString("name", o.Name)
 	r.setNullString("aliases", o.Aliases)
 	r.setNullInt("duration", o.Duration)
-	r.setNullDate("date", o.Date)
+	r.setNullDate("date", "date_precision", o.Date)
 	r.setNullInt("rating", o.Rating)
 	r.setNullInt("studio_id", o.StudioID)
 	r.setNullString("director", o.Director)
diff --git a/pkg/sqlite/image.go b/pkg/sqlite/image.go
index a903a62fd..ccccc90aa 100644
--- a/pkg/sqlite/image.go
+++ b/pkg/sqlite/image.go
@@ -34,15 +34,16 @@ type imageRow struct {
 	Title zero.String `db:"title"`
 	Code  zero.String `db:"code"`
 	// expressed as 1-100
-	Rating       null.Int    `db:"rating"`
-	Date         NullDate    `db:"date"`
-	Details      zero.String `db:"details"`
-	Photographer zero.String `db:"photographer"`
-	Organized    bool        `db:"organized"`
-	OCounter     int         `db:"o_counter"`
-	StudioID     null.Int    `db:"studio_id,omitempty"`
-	CreatedAt    Timestamp   `db:"created_at"`
-	UpdatedAt    Timestamp   `db:"updated_at"`
+	Rating        null.Int    `db:"rating"`
+	Date          NullDate    `db:"date"`
+	DatePrecision null.Int    `db:"date_precision"`
+	Details       zero.String `db:"details"`
+	Photographer  zero.String `db:"photographer"`
+	Organized     bool        `db:"organized"`
+	OCounter      int         `db:"o_counter"`
+	StudioID      null.Int    `db:"studio_id,omitempty"`
+	CreatedAt     Timestamp   `db:"created_at"`
+	UpdatedAt     Timestamp   `db:"updated_at"`
 }
 
 func (r *imageRow) fromImage(i models.Image) {
@@ -51,6 +52,7 @@ func (r *imageRow) fromImage(i models.Image) {
 	r.Code = zero.StringFrom(i.Code)
 	r.Rating = intFromPtr(i.Rating)
 	r.Date = NullDateFromDatePtr(i.Date)
+	r.DatePrecision = datePrecisionFromDatePtr(i.Date)
 	r.Details = zero.StringFrom(i.Details)
 	r.Photographer = zero.StringFrom(i.Photographer)
 	r.Organized = i.Organized
@@ -74,7 +76,7 @@ func (r *imageQueryRow) resolve() *models.Image {
 		Title:        r.Title.String,
 		Code:         r.Code.String,
 		Rating:       nullIntPtr(r.Rating),
-		Date:         r.Date.DatePtr(),
+		Date:         r.Date.DatePtr(r.DatePrecision),
 		Details:      r.Details.String,
 		Photographer: r.Photographer.String,
 		Organized:    r.Organized,
@@ -103,7 +105,7 @@ func (r *imageRowRecord) fromPartial(i models.ImagePartial) {
 	r.setNullString("title", i.Title)
 	r.setNullString("code", i.Code)
 	r.setNullInt("rating", i.Rating)
-	r.setNullDate("date", i.Date)
+	r.setNullDate("date", "date_precision", i.Date)
 	r.setNullString("details", i.Details)
 	r.setNullString("photographer", i.Photographer)
 	r.setBool("organized", i.Organized)
diff --git a/pkg/sqlite/migrations/75_date_precision.up.sql b/pkg/sqlite/migrations/75_date_precision.up.sql
new file mode 100644
index 000000000..ce35bf170
--- /dev/null
+++ b/pkg/sqlite/migrations/75_date_precision.up.sql
@@ -0,0 +1,13 @@
+ALTER TABLE "scenes" ADD COLUMN "date_precision" TINYINT;
+ALTER TABLE "images" ADD COLUMN "date_precision" TINYINT;
+ALTER TABLE "galleries" ADD COLUMN "date_precision" TINYINT;
+ALTER TABLE "groups" ADD COLUMN "date_precision" TINYINT;
+ALTER TABLE "performers" ADD COLUMN "birthdate_precision" TINYINT;
+ALTER TABLE "performers" ADD COLUMN "death_date_precision" TINYINT;
+
+UPDATE "scenes" SET "date_precision" = 0 WHERE "date" IS NOT NULL;
+UPDATE "images" SET "date_precision" = 0 WHERE "date" IS NOT NULL;
+UPDATE "galleries" SET "date_precision" = 0 WHERE "date" IS NOT NULL;
+UPDATE "groups" SET "date_precision" = 0 WHERE "date" IS NOT NULL;
+UPDATE "performers" SET "birthdate_precision" = 0 WHERE "birthdate" IS NOT NULL;
+UPDATE "performers" SET "death_date_precision" = 0 WHERE "death_date" IS NOT NULL;  
diff --git a/pkg/sqlite/performer.go b/pkg/sqlite/performer.go
index c5943b182..bf6b780b2 100644
--- a/pkg/sqlite/performer.go
+++ b/pkg/sqlite/performer.go
@@ -30,32 +30,34 @@ const (
 )
 
 type performerRow struct {
-	ID            int         `db:"id" goqu:"skipinsert"`
-	Name          null.String `db:"name"` // TODO: make schema non-nullable
-	Disambigation zero.String `db:"disambiguation"`
-	Gender        zero.String `db:"gender"`
-	Birthdate     NullDate    `db:"birthdate"`
-	Ethnicity     zero.String `db:"ethnicity"`
-	Country       zero.String `db:"country"`
-	EyeColor      zero.String `db:"eye_color"`
-	Height        null.Int    `db:"height"`
-	Measurements  zero.String `db:"measurements"`
-	FakeTits      zero.String `db:"fake_tits"`
-	PenisLength   null.Float  `db:"penis_length"`
-	Circumcised   zero.String `db:"circumcised"`
-	CareerLength  zero.String `db:"career_length"`
-	Tattoos       zero.String `db:"tattoos"`
-	Piercings     zero.String `db:"piercings"`
-	Favorite      bool        `db:"favorite"`
-	CreatedAt     Timestamp   `db:"created_at"`
-	UpdatedAt     Timestamp   `db:"updated_at"`
+	ID                 int         `db:"id" goqu:"skipinsert"`
+	Name               null.String `db:"name"` // TODO: make schema non-nullable
+	Disambigation      zero.String `db:"disambiguation"`
+	Gender             zero.String `db:"gender"`
+	Birthdate          NullDate    `db:"birthdate"`
+	BirthdatePrecision null.Int    `db:"birthdate_precision"`
+	Ethnicity          zero.String `db:"ethnicity"`
+	Country            zero.String `db:"country"`
+	EyeColor           zero.String `db:"eye_color"`
+	Height             null.Int    `db:"height"`
+	Measurements       zero.String `db:"measurements"`
+	FakeTits           zero.String `db:"fake_tits"`
+	PenisLength        null.Float  `db:"penis_length"`
+	Circumcised        zero.String `db:"circumcised"`
+	CareerLength       zero.String `db:"career_length"`
+	Tattoos            zero.String `db:"tattoos"`
+	Piercings          zero.String `db:"piercings"`
+	Favorite           bool        `db:"favorite"`
+	CreatedAt          Timestamp   `db:"created_at"`
+	UpdatedAt          Timestamp   `db:"updated_at"`
 	// expressed as 1-100
-	Rating        null.Int    `db:"rating"`
-	Details       zero.String `db:"details"`
-	DeathDate     NullDate    `db:"death_date"`
-	HairColor     zero.String `db:"hair_color"`
-	Weight        null.Int    `db:"weight"`
-	IgnoreAutoTag bool        `db:"ignore_auto_tag"`
+	Rating             null.Int    `db:"rating"`
+	Details            zero.String `db:"details"`
+	DeathDate          NullDate    `db:"death_date"`
+	DeathDatePrecision null.Int    `db:"death_date_precision"`
+	HairColor          zero.String `db:"hair_color"`
+	Weight             null.Int    `db:"weight"`
+	IgnoreAutoTag      bool        `db:"ignore_auto_tag"`
 
 	// not used in resolution or updates
 	ImageBlob zero.String `db:"image_blob"`
@@ -69,6 +71,7 @@ func (r *performerRow) fromPerformer(o models.Performer) {
 		r.Gender = zero.StringFrom(o.Gender.String())
 	}
 	r.Birthdate = NullDateFromDatePtr(o.Birthdate)
+	r.BirthdatePrecision = datePrecisionFromDatePtr(o.Birthdate)
 	r.Ethnicity = zero.StringFrom(o.Ethnicity)
 	r.Country = zero.StringFrom(o.Country)
 	r.EyeColor = zero.StringFrom(o.EyeColor)
@@ -88,6 +91,7 @@ func (r *performerRow) fromPerformer(o models.Performer) {
 	r.Rating = intFromPtr(o.Rating)
 	r.Details = zero.StringFrom(o.Details)
 	r.DeathDate = NullDateFromDatePtr(o.DeathDate)
+	r.DeathDatePrecision = datePrecisionFromDatePtr(o.DeathDate)
 	r.HairColor = zero.StringFrom(o.HairColor)
 	r.Weight = intFromPtr(o.Weight)
 	r.IgnoreAutoTag = o.IgnoreAutoTag
@@ -98,7 +102,7 @@ func (r *performerRow) resolve() *models.Performer {
 		ID:             r.ID,
 		Name:           r.Name.String,
 		Disambiguation: r.Disambigation.String,
-		Birthdate:      r.Birthdate.DatePtr(),
+		Birthdate:      r.Birthdate.DatePtr(r.BirthdatePrecision),
 		Ethnicity:      r.Ethnicity.String,
 		Country:        r.Country.String,
 		EyeColor:       r.EyeColor.String,
@@ -115,7 +119,7 @@ func (r *performerRow) resolve() *models.Performer {
 		// expressed as 1-100
 		Rating:        nullIntPtr(r.Rating),
 		Details:       r.Details.String,
-		DeathDate:     r.DeathDate.DatePtr(),
+		DeathDate:     r.DeathDate.DatePtr(r.DeathDatePrecision),
 		HairColor:     r.HairColor.String,
 		Weight:        nullIntPtr(r.Weight),
 		IgnoreAutoTag: r.IgnoreAutoTag,
@@ -142,7 +146,7 @@ func (r *performerRowRecord) fromPartial(o models.PerformerPartial) {
 	r.setString("name", o.Name)
 	r.setNullString("disambiguation", o.Disambiguation)
 	r.setNullString("gender", o.Gender)
-	r.setNullDate("birthdate", o.Birthdate)
+	r.setNullDate("birthdate", "birthdate_precision", o.Birthdate)
 	r.setNullString("ethnicity", o.Ethnicity)
 	r.setNullString("country", o.Country)
 	r.setNullString("eye_color", o.EyeColor)
@@ -159,7 +163,7 @@ func (r *performerRowRecord) fromPartial(o models.PerformerPartial) {
 	r.setTimestamp("updated_at", o.UpdatedAt)
 	r.setNullInt("rating", o.Rating)
 	r.setNullString("details", o.Details)
-	r.setNullDate("death_date", o.DeathDate)
+	r.setNullDate("death_date", "death_date_precision", o.DeathDate)
 	r.setNullString("hair_color", o.HairColor)
 	r.setNullInt("weight", o.Weight)
 	r.setBool("ignore_auto_tag", o.IgnoreAutoTag)
diff --git a/pkg/sqlite/record.go b/pkg/sqlite/record.go
index e60cdc4f7..71622dc60 100644
--- a/pkg/sqlite/record.go
+++ b/pkg/sqlite/record.go
@@ -100,8 +100,9 @@ func (r *updateRecord) setNullTimestamp(destField string, v models.OptionalTime)
 	}
 }
 
-func (r *updateRecord) setNullDate(destField string, v models.OptionalDate) {
+func (r *updateRecord) setNullDate(destField string, precisionField string, v models.OptionalDate) {
 	if v.Set {
 		r.set(destField, NullDateFromDatePtr(v.Ptr()))
+		r.set(precisionField, datePrecisionFromDatePtr(v.Ptr()))
 	}
 }
diff --git a/pkg/sqlite/scene.go b/pkg/sqlite/scene.go
index 955a98419..0c2d11345 100644
--- a/pkg/sqlite/scene.go
+++ b/pkg/sqlite/scene.go
@@ -76,12 +76,13 @@ ORDER BY files.size DESC;
 `
 
 type sceneRow struct {
-	ID       int         `db:"id" goqu:"skipinsert"`
-	Title    zero.String `db:"title"`
-	Code     zero.String `db:"code"`
-	Details  zero.String `db:"details"`
-	Director zero.String `db:"director"`
-	Date     NullDate    `db:"date"`
+	ID            int         `db:"id" goqu:"skipinsert"`
+	Title         zero.String `db:"title"`
+	Code          zero.String `db:"code"`
+	Details       zero.String `db:"details"`
+	Director      zero.String `db:"director"`
+	Date          NullDate    `db:"date"`
+	DatePrecision null.Int    `db:"date_precision"`
 	// expressed as 1-100
 	Rating       null.Int  `db:"rating"`
 	Organized    bool      `db:"organized"`
@@ -102,6 +103,7 @@ func (r *sceneRow) fromScene(o models.Scene) {
 	r.Details = zero.StringFrom(o.Details)
 	r.Director = zero.StringFrom(o.Director)
 	r.Date = NullDateFromDatePtr(o.Date)
+	r.DatePrecision = datePrecisionFromDatePtr(o.Date)
 	r.Rating = intFromPtr(o.Rating)
 	r.Organized = o.Organized
 	r.StudioID = intFromPtr(o.StudioID)
@@ -127,7 +129,7 @@ func (r *sceneQueryRow) resolve() *models.Scene {
 		Code:      r.Code.String,
 		Details:   r.Details.String,
 		Director:  r.Director.String,
-		Date:      r.Date.DatePtr(),
+		Date:      r.Date.DatePtr(r.DatePrecision),
 		Rating:    nullIntPtr(r.Rating),
 		Organized: r.Organized,
 		StudioID:  nullIntPtr(r.StudioID),
@@ -159,7 +161,7 @@ func (r *sceneRowRecord) fromPartial(o models.ScenePartial) {
 	r.setNullString("code", o.Code)
 	r.setNullString("details", o.Details)
 	r.setNullString("director", o.Director)
-	r.setNullDate("date", o.Date)
+	r.setNullDate("date", "date_precision", o.Date)
 	r.setNullInt("rating", o.Rating)
 	r.setBool("organized", o.Organized)
 	r.setNullInt("studio_id", o.StudioID)
diff --git a/pkg/utils/date.go b/pkg/utils/date.go
index 511cf8a4f..de5566e4d 100644
--- a/pkg/utils/date.go
+++ b/pkg/utils/date.go
@@ -23,17 +23,5 @@ func ParseDateStringAsTime(dateString string) (time.Time, error) {
 		return t, nil
 	}
 
-	// Support partial dates: year-month format
-	t, e = time.Parse("2006-01", dateString)
-	if e == nil {
-		return t, nil
-	}
-
-	// Support partial dates: year only format
-	t, e = time.Parse("2006", dateString)
-	if e == nil {
-		return t, nil
-	}
-
 	return time.Time{}, fmt.Errorf("ParseDateStringAsTime failed: dateString <%s>", dateString)
 }
diff --git a/pkg/utils/date_test.go b/pkg/utils/date_test.go
index f3622ca40..ae077c21e 100644
--- a/pkg/utils/date_test.go
+++ b/pkg/utils/date_test.go
@@ -2,7 +2,6 @@ package utils
 
 import (
 	"testing"
-	"time"
 )
 
 func TestParseDateStringAsTime(t *testing.T) {
@@ -16,13 +15,11 @@ func TestParseDateStringAsTime(t *testing.T) {
 		{"Date only", "2014-01-02", false},
 		{"Date with time", "2014-01-02 15:04:05", false},
 
-		// Partial date formats (new support)
-		{"Year-Month", "2006-08", false},
-		{"Year only", "2014", false},
-
 		// Invalid formats
 		{"Invalid format", "not-a-date", true},
 		{"Empty string", "", true},
+		{"Year-Month", "2006-08", true},
+		{"Year only", "2014", true},
 	}
 
 	for _, tt := range tests {
@@ -44,37 +41,3 @@ func TestParseDateStringAsTime(t *testing.T) {
 		})
 	}
 }
-
-func TestParseDateStringAsTime_YearOnly(t *testing.T) {
-	result, err := ParseDateStringAsTime("2014")
-	if err != nil {
-		t.Fatalf("Failed to parse year-only date: %v", err)
-	}
-
-	if result.Year() != 2014 {
-		t.Errorf("Expected year 2014, got %d", result.Year())
-	}
-	if result.Month() != time.January {
-		t.Errorf("Expected month January, got %s", result.Month())
-	}
-	if result.Day() != 1 {
-		t.Errorf("Expected day 1, got %d", result.Day())
-	}
-}
-
-func TestParseDateStringAsTime_YearMonth(t *testing.T) {
-	result, err := ParseDateStringAsTime("2006-08")
-	if err != nil {
-		t.Fatalf("Failed to parse year-month date: %v", err)
-	}
-
-	if result.Year() != 2006 {
-		t.Errorf("Expected year 2006, got %d", result.Year())
-	}
-	if result.Month() != time.August {
-		t.Errorf("Expected month August, got %s", result.Month())
-	}
-	if result.Day() != 1 {
-		t.Errorf("Expected day 1, got %d", result.Day())
-	}
-}
diff --git a/ui/v2.5/src/components/Galleries/GalleryDetails/Gallery.tsx b/ui/v2.5/src/components/Galleries/GalleryDetails/Gallery.tsx
index 9cee2d1e2..195766e03 100644
--- a/ui/v2.5/src/components/Galleries/GalleryDetails/Gallery.tsx
+++ b/ui/v2.5/src/components/Galleries/GalleryDetails/Gallery.tsx
@@ -6,7 +6,7 @@ import {
   RouteComponentProps,
   Redirect,
 } from "react-router-dom";
-import { FormattedDate, FormattedMessage, useIntl } from "react-intl";
+import { FormattedMessage, useIntl } from "react-intl";
 import { Helmet } from "react-helmet";
 import * as GQL from "src/core/generated-graphql";
 import {
@@ -44,6 +44,7 @@ import { useRatingKeybinds } from "src/hooks/keybinds";
 import { useConfigurationContext } from "src/hooks/Config";
 import { TruncatedText } from "src/components/Shared/TruncatedText";
 import { goBackOrReplace } from "src/utils/history";
+import { FormattedDate } from "src/components/Shared/Date";
 
 interface IProps {
   gallery: GQL.GalleryDataFragment;
@@ -410,11 +411,7 @@ export const GalleryPage: React.FC<IProps> = ({ gallery, add }) => {
           <div className="gallery-subheader">
             {!!gallery.date && (
               <span className="date" data-value={gallery.date}>
-                <FormattedDate
-                  value={gallery.date}
-                  format="long"
-                  timeZone="utc"
-                />
+                <FormattedDate value={gallery.date} />
               </span>
             )}
           </div>
diff --git a/ui/v2.5/src/components/Galleries/GalleryWallCard.tsx b/ui/v2.5/src/components/Galleries/GalleryWallCard.tsx
index c794ddc14..c57bf45ad 100644
--- a/ui/v2.5/src/components/Galleries/GalleryWallCard.tsx
+++ b/ui/v2.5/src/components/Galleries/GalleryWallCard.tsx
@@ -102,7 +102,7 @@ const GalleryWallCard: React.FC<IProps> = ({ gallery }) => {
               )}
               <TruncatedText text={performers.join(", ")} />
               <div>
-                {gallery.date && TextUtils.formatDate(intl, gallery.date)}
+                {gallery.date && TextUtils.formatFuzzyDate(intl, gallery.date)}
               </div>
             </Link>
           </footer>
diff --git a/ui/v2.5/src/components/Groups/GroupDetails/GroupDetailsPanel.tsx b/ui/v2.5/src/components/Groups/GroupDetails/GroupDetailsPanel.tsx
index d93b06466..b8e39ffe6 100644
--- a/ui/v2.5/src/components/Groups/GroupDetails/GroupDetailsPanel.tsx
+++ b/ui/v2.5/src/components/Groups/GroupDetails/GroupDetailsPanel.tsx
@@ -65,7 +65,7 @@ export const GroupDetailsPanel: React.FC<IGroupDetailsPanel> = ({
       />
       <DetailItem
         id="date"
-        value={group.date ? TextUtils.formatDate(intl, group.date) : ""}
+        value={group.date ? TextUtils.formatFuzzyDate(intl, group.date) : ""}
         fullWidth={fullWidth}
       />
       <DetailItem
diff --git a/ui/v2.5/src/components/Images/ImageDetails/Image.tsx b/ui/v2.5/src/components/Images/ImageDetails/Image.tsx
index 699d3d4e4..47de3971e 100644
--- a/ui/v2.5/src/components/Images/ImageDetails/Image.tsx
+++ b/ui/v2.5/src/components/Images/ImageDetails/Image.tsx
@@ -1,6 +1,6 @@
 import { Tab, Nav, Dropdown } from "react-bootstrap";
 import React, { useEffect, useMemo, useState } from "react";
-import { FormattedDate, FormattedMessage, useIntl } from "react-intl";
+import { FormattedMessage, useIntl } from "react-intl";
 import { useHistory, Link, RouteComponentProps } from "react-router-dom";
 import { Helmet } from "react-helmet";
 import {
@@ -35,6 +35,7 @@ import { RatingSystem } from "src/components/Shared/Rating/RatingSystem";
 import cx from "classnames";
 import { TruncatedText } from "src/components/Shared/TruncatedText";
 import { goBackOrReplace } from "src/utils/history";
+import { FormattedDate } from "src/components/Shared/Date";
 
 interface IProps {
   image: GQL.ImageDataFragment;
@@ -319,13 +320,7 @@ const ImagePage: React.FC<IProps> = ({ image }) => {
 
           <div className="image-subheader">
             <span className="date" data-value={image.date}>
-              {!!image.date && (
-                <FormattedDate
-                  value={image.date}
-                  format="long"
-                  timeZone="utc"
-                />
-              )}
+              {!!image.date && <FormattedDate value={image.date} />}
             </span>
             {resolution ? (
               <span className="resolution" data-value={resolution}>
diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerDetailsPanel.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerDetailsPanel.tsx
index d01709287..95e03ff8b 100644
--- a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerDetailsPanel.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerDetailsPanel.tsx
@@ -89,7 +89,10 @@ export const PerformerDetailsPanel: React.FC<IPerformerDetails> =
           }
           title={
             !fullWidth
-              ? TextUtils.formatDate(intl, performer.birthdate ?? undefined)
+              ? TextUtils.formatFuzzyDate(
+                  intl,
+                  performer.birthdate ?? undefined
+                )
               : ""
           }
           fullWidth={fullWidth}
@@ -218,7 +221,7 @@ export const CompressedPerformerDetailsPanel: React.FC<IPerformerDetails> =
               <span className="detail-divider">/</span>
               <span
                 className="performer-age"
-                title={TextUtils.formatDate(
+                title={TextUtils.formatFuzzyDate(
                   intl,
                   performer.birthdate ?? undefined
                 )}
diff --git a/ui/v2.5/src/components/Performers/PerformerListTable.tsx b/ui/v2.5/src/components/Performers/PerformerListTable.tsx
index 6a3818824..58538e7e2 100644
--- a/ui/v2.5/src/components/Performers/PerformerListTable.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerListTable.tsx
@@ -116,7 +116,7 @@ export const PerformerListTable: React.FC<IPerformerListTableProps> = (
     <span
       title={
         performer.birthdate
-          ? TextUtils.formatDate(intl, performer.birthdate ?? undefined)
+          ? TextUtils.formatFuzzyDate(intl, performer.birthdate ?? undefined)
           : ""
       }
     >
diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx
index aee6ab344..3615f1327 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx
@@ -6,7 +6,7 @@ import React, {
   useRef,
   useLayoutEffect,
 } from "react";
-import { FormattedDate, FormattedMessage, useIntl } from "react-intl";
+import { FormattedMessage, useIntl } from "react-intl";
 import { Link, RouteComponentProps } from "react-router-dom";
 import { Helmet } from "react-helmet";
 import * as GQL from "src/core/generated-graphql";
@@ -51,6 +51,7 @@ import cx from "classnames";
 import { TruncatedText } from "src/components/Shared/TruncatedText";
 import { PatchComponent, PatchContainerComponent } from "src/patch";
 import { goBackOrReplace } from "src/utils/history";
+import { FormattedDate } from "src/components/Shared/Date";
 
 const SubmitStashBoxDraft = lazyComponent(
   () => import("src/components/Dialogs/SubmitDraft")
@@ -613,13 +614,7 @@ const ScenePage: React.FC<IProps> = PatchComponent("ScenePage", (props) => {
 
           <div className="scene-subheader">
             <span className="date" data-value={scene.date}>
-              {!!scene.date && (
-                <FormattedDate
-                  value={scene.date}
-                  format="long"
-                  timeZone="utc"
-                />
-              )}
+              {!!scene.date && <FormattedDate value={scene.date} />}
             </span>
             <VideoFrameRateResolution
               width={file?.width}
diff --git a/ui/v2.5/src/components/Scenes/SceneWallPanel.tsx b/ui/v2.5/src/components/Scenes/SceneWallPanel.tsx
index 3f5020793..92aa21f59 100644
--- a/ui/v2.5/src/components/Scenes/SceneWallPanel.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneWallPanel.tsx
@@ -107,7 +107,9 @@ export const SceneWallItem: React.FC<
               />
             )}
             <TruncatedText text={performers.join(", ")} />
-            <div>{scene.date && TextUtils.formatDate(intl, scene.date)}</div>
+            <div>
+              {scene.date && TextUtils.formatFuzzyDate(intl, scene.date)}
+            </div>
           </Link>
         </footer>
       </div>
diff --git a/ui/v2.5/src/components/Shared/Date.tsx b/ui/v2.5/src/components/Shared/Date.tsx
new file mode 100644
index 000000000..78dd23afa
--- /dev/null
+++ b/ui/v2.5/src/components/Shared/Date.tsx
@@ -0,0 +1,36 @@
+import React from "react";
+import { FormattedDate as IntlDate } from "react-intl";
+import { PatchComponent } from "src/patch";
+
+// wraps FormattedDate to handle year or year/month dates
+export const FormattedDate: React.FC<{
+  value: string | number | Date | undefined;
+}> = PatchComponent("Date", ({ value }) => {
+  if (typeof value === "string") {
+    // try parsing as year or year/month
+    const yearMatch = value.match(/^(\d{4})$/);
+    if (yearMatch) {
+      const year = parseInt(yearMatch[1], 10);
+      return (
+        <IntlDate value={Date.UTC(year, 0)} year="numeric" timeZone="utc" />
+      );
+    }
+
+    const yearMonthMatch = value.match(/^(\d{4})-(\d{2})$/);
+    if (yearMonthMatch) {
+      const year = parseInt(yearMonthMatch[1], 10);
+      const month = parseInt(yearMonthMatch[2], 10) - 1;
+
+      return (
+        <IntlDate
+          value={Date.UTC(year, month)}
+          year="numeric"
+          month="long"
+          timeZone="utc"
+        />
+      );
+    }
+  }
+
+  return <IntlDate value={value} format="long" timeZone="utc" />;
+});
diff --git a/ui/v2.5/src/utils/text.ts b/ui/v2.5/src/utils/text.ts
index dc654ae18..2c5bb4648 100644
--- a/ui/v2.5/src/utils/text.ts
+++ b/ui/v2.5/src/utils/text.ts
@@ -336,8 +336,10 @@ function dateTimeToString(date: Date) {
 const getAge = (dateString?: string | null, fromDateString?: string | null) => {
   if (!dateString) return 0;
 
-  const birthdate = stringToDate(dateString);
-  const fromDate = fromDateString ? stringToDate(fromDateString) : new Date();
+  const birthdate = stringToFuzzyDate(dateString);
+  const fromDate = fromDateString
+    ? stringToFuzzyDate(fromDateString)
+    : new Date();
 
   if (!birthdate || !fromDate) return 0;
 
@@ -459,6 +461,38 @@ const formatDate = (intl: IntlShape, date?: string, utc = true) => {
   });
 };
 
+const formatFuzzyDate = (intl: IntlShape, date?: string, utc = true) => {
+  if (!date) {
+    return "";
+  }
+
+  // handle year or year/month dates
+  const yearMatch = date.match(/^(\d{4})$/);
+  if (yearMatch) {
+    const year = parseInt(yearMatch[1], 10);
+    return intl.formatDate(Date.UTC(year, 0), {
+      year: "numeric",
+      timeZone: utc ? "utc" : undefined,
+    });
+  }
+
+  const yearMonthMatch = date.match(/^(\d{4})-(\d{2})$/);
+  if (yearMonthMatch) {
+    const year = parseInt(yearMonthMatch[1], 10);
+    const month = parseInt(yearMonthMatch[2], 10) - 1;
+    return intl.formatDate(Date.UTC(year, month), {
+      year: "numeric",
+      month: "long",
+      timeZone: utc ? "utc" : undefined,
+    });
+  }
+
+  return intl.formatDate(date, {
+    format: "long",
+    timeZone: utc ? "utc" : undefined,
+  });
+};
+
 const formatDateTime = (intl: IntlShape, dateTime?: string, utc = false) =>
   `${formatDate(intl, dateTime, utc)} ${intl.formatTime(dateTime, {
     timeZone: utc ? "utc" : undefined,
@@ -519,6 +553,7 @@ const TextUtils = {
   sanitiseURL,
   domainFromURL,
   formatDate,
+  formatFuzzyDate,
   formatDateTime,
   secondsAsTimeString,
   abbreviateCounter,

From 945d679158552a73eba5433dd7d500624c11c3a9 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Tue, 9 Dec 2025 07:29:41 +1100
Subject: [PATCH 202/405] Refactor and restyle scrape dialog on smaller
 viewports (#6387)

* Improve string-list-input styling
* Rename ScrapedDialog file
* Move ScrapeDialog into separate file
* Refactor scrape dialog row inputs
* Refactor new value handling
* Add context for labels
* Refactor scrape dialog to accept children
* Add existing/scraped labels for smaller viewports
---
 .../GalleryDetails/GalleryScrapeDialog.tsx    |   9 +-
 .../Groups/GroupDetails/GroupScrapeDialog.tsx |   9 +-
 .../Images/ImageDetails/ImageScrapeDialog.tsx |   9 +-
 .../PerformerScrapeDialog.tsx                 |  29 +-
 .../Scenes/SceneDetails/SceneScrapeDialog.tsx |   9 +-
 .../components/Scenes/SceneMergeDialog.tsx    |  65 +-
 .../Shared/ScrapeDialog/ScrapeDialog.tsx      | 567 ++----------------
 .../Shared/ScrapeDialog/ScrapeDialogRow.tsx   | 433 +++++++++++++
 .../Shared/ScrapeDialog/ScrapedObjectsRow.tsx | 102 +++-
 ui/v2.5/src/components/Shared/styles.scss     |  23 +-
 ui/v2.5/src/locales/en-GB.json                |   1 +
 11 files changed, 658 insertions(+), 598 deletions(-)
 create mode 100644 ui/v2.5/src/components/Shared/ScrapeDialog/ScrapeDialogRow.tsx

diff --git a/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryScrapeDialog.tsx b/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryScrapeDialog.tsx
index fbfde9f97..6bc67b9bc 100644
--- a/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryScrapeDialog.tsx
+++ b/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryScrapeDialog.tsx
@@ -2,11 +2,11 @@ import React, { useState } from "react";
 import { useIntl } from "react-intl";
 import * as GQL from "src/core/generated-graphql";
 import {
-  ScrapeDialog,
   ScrapedInputGroupRow,
   ScrapedStringListRow,
   ScrapedTextAreaRow,
-} from "src/components/Shared/ScrapeDialog/ScrapeDialog";
+} from "src/components/Shared/ScrapeDialog/ScrapeDialogRow";
+import { ScrapeDialog } from "src/components/Shared/ScrapeDialog/ScrapeDialog";
 import {
   ObjectListScrapeResult,
   ObjectScrapeResult,
@@ -225,10 +225,11 @@ export const GalleryScrapeDialog: React.FC<IGalleryScrapeDialogProps> = ({
         { id: "dialogs.scrape_entity_title" },
         { entity_type: intl.formatMessage({ id: "gallery" }) }
       )}
-      renderScrapeRows={renderScrapeRows}
       onClose={(apply) => {
         onClose(apply ? makeNewScrapedItem() : undefined);
       }}
-    />
+    >
+      {renderScrapeRows()}
+    </ScrapeDialog>
   );
 };
diff --git a/ui/v2.5/src/components/Groups/GroupDetails/GroupScrapeDialog.tsx b/ui/v2.5/src/components/Groups/GroupDetails/GroupScrapeDialog.tsx
index d37210c43..c9cbaf74e 100644
--- a/ui/v2.5/src/components/Groups/GroupDetails/GroupScrapeDialog.tsx
+++ b/ui/v2.5/src/components/Groups/GroupDetails/GroupScrapeDialog.tsx
@@ -2,12 +2,12 @@ import React, { useState } from "react";
 import { useIntl } from "react-intl";
 import * as GQL from "src/core/generated-graphql";
 import {
-  ScrapeDialog,
   ScrapedInputGroupRow,
   ScrapedImageRow,
   ScrapedTextAreaRow,
   ScrapedStringListRow,
-} from "src/components/Shared/ScrapeDialog/ScrapeDialog";
+} from "src/components/Shared/ScrapeDialog/ScrapeDialogRow";
+import { ScrapeDialog } from "src/components/Shared/ScrapeDialog/ScrapeDialog";
 import TextUtils from "src/utils/text";
 import {
   ObjectScrapeResult,
@@ -224,10 +224,11 @@ export const GroupScrapeDialog: React.FC<IGroupScrapeDialogProps> = ({
         { id: "dialogs.scrape_entity_title" },
         { entity_type: intl.formatMessage({ id: "group" }) }
       )}
-      renderScrapeRows={renderScrapeRows}
       onClose={(apply) => {
         onClose(apply ? makeNewScrapedItem() : undefined);
       }}
-    />
+    >
+      {renderScrapeRows()}
+    </ScrapeDialog>
   );
 };
diff --git a/ui/v2.5/src/components/Images/ImageDetails/ImageScrapeDialog.tsx b/ui/v2.5/src/components/Images/ImageDetails/ImageScrapeDialog.tsx
index 44b112078..ed95cb674 100644
--- a/ui/v2.5/src/components/Images/ImageDetails/ImageScrapeDialog.tsx
+++ b/ui/v2.5/src/components/Images/ImageDetails/ImageScrapeDialog.tsx
@@ -2,11 +2,11 @@ import React, { useState } from "react";
 import { useIntl } from "react-intl";
 import * as GQL from "src/core/generated-graphql";
 import {
-  ScrapeDialog,
   ScrapedInputGroupRow,
   ScrapedStringListRow,
   ScrapedTextAreaRow,
-} from "src/components/Shared/ScrapeDialog/ScrapeDialog";
+} from "src/components/Shared/ScrapeDialog/ScrapeDialogRow";
+import { ScrapeDialog } from "src/components/Shared/ScrapeDialog/ScrapeDialog";
 import {
   ObjectListScrapeResult,
   ObjectScrapeResult,
@@ -226,10 +226,11 @@ export const ImageScrapeDialog: React.FC<IImageScrapeDialogProps> = ({
         { id: "dialogs.scrape_entity_title" },
         { entity_type: intl.formatMessage({ id: "image" }) }
       )}
-      renderScrapeRows={renderScrapeRows}
       onClose={(apply) => {
         onClose(apply ? makeNewScrapedItem() : undefined);
       }}
-    />
+    >
+      {renderScrapeRows()}
+    </ScrapeDialog>
   );
 };
diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerScrapeDialog.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerScrapeDialog.tsx
index ad7e44d6d..98c858037 100644
--- a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerScrapeDialog.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerScrapeDialog.tsx
@@ -2,14 +2,14 @@ import React, { useState } from "react";
 import { useIntl } from "react-intl";
 import * as GQL from "src/core/generated-graphql";
 import {
-  ScrapeDialog,
   ScrapedInputGroupRow,
   ScrapedImagesRow,
   ScrapeDialogRow,
   ScrapedTextAreaRow,
   ScrapedCountryRow,
   ScrapedStringListRow,
-} from "src/components/Shared/ScrapeDialog/ScrapeDialog";
+} from "src/components/Shared/ScrapeDialog/ScrapeDialogRow";
+import { ScrapeDialog } from "src/components/Shared/ScrapeDialog/ScrapeDialog";
 import { Form } from "react-bootstrap";
 import {
   genderStrings,
@@ -66,12 +66,10 @@ function renderScrapedGenderRow(
       field="gender"
       title={title}
       result={result}
-      renderOriginalField={() => renderScrapedGender(result)}
-      renderNewField={() =>
-        renderScrapedGender(result, true, (value) =>
-          onChange(result.cloneWithValue(value))
-        )
-      }
+      originalField={renderScrapedGender(result)}
+      newField={renderScrapedGender(result, true, (value) =>
+        onChange(result.cloneWithValue(value))
+      )}
       onChange={onChange}
     />
   );
@@ -116,12 +114,10 @@ function renderScrapedCircumcisedRow(
       title={title}
       field="circumcised"
       result={result}
-      renderOriginalField={() => renderScrapedCircumcised(result)}
-      renderNewField={() =>
-        renderScrapedCircumcised(result, true, (value) =>
-          onChange(result.cloneWithValue(value))
-        )
-      }
+      originalField={renderScrapedCircumcised(result)}
+      newField={renderScrapedCircumcised(result, true, (value) =>
+        onChange(result.cloneWithValue(value))
+      )}
       onChange={onChange}
     />
   );
@@ -552,10 +548,11 @@ export const PerformerScrapeDialog: React.FC<IPerformerScrapeDialogProps> = (
         { id: "dialogs.scrape_entity_title" },
         { entity_type: intl.formatMessage({ id: "performer" }) }
       )}
-      renderScrapeRows={renderScrapeRows}
       onClose={(apply) => {
         props.onClose(apply ? makeNewScrapedItem() : undefined);
       }}
-    />
+    >
+      {renderScrapeRows()}
+    </ScrapeDialog>
   );
 };
diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/SceneScrapeDialog.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/SceneScrapeDialog.tsx
index 7be291bd2..98939786d 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/SceneScrapeDialog.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/SceneScrapeDialog.tsx
@@ -1,12 +1,12 @@
 import React, { useState } from "react";
 import * as GQL from "src/core/generated-graphql";
 import {
-  ScrapeDialog,
   ScrapedInputGroupRow,
   ScrapedTextAreaRow,
   ScrapedImageRow,
   ScrapedStringListRow,
-} from "src/components/Shared/ScrapeDialog/ScrapeDialog";
+} from "src/components/Shared/ScrapeDialog/ScrapeDialogRow";
+import { ScrapeDialog } from "src/components/Shared/ScrapeDialog/ScrapeDialog";
 import { useIntl } from "react-intl";
 import { uniq } from "lodash-es";
 import { Performer } from "src/components/Performers/PerformerSelect";
@@ -304,11 +304,12 @@ export const SceneScrapeDialog: React.FC<ISceneScrapeDialogProps> = ({
         { id: "dialogs.scrape_entity_title" },
         { entity_type: intl.formatMessage({ id: "scene" }) }
       )}
-      renderScrapeRows={renderScrapeRows}
       onClose={(apply) => {
         onClose(apply ? makeNewScrapedItem() : undefined);
       }}
-    />
+    >
+      {renderScrapeRows()}
+    </ScrapeDialog>
   );
 };
 
diff --git a/ui/v2.5/src/components/Scenes/SceneMergeDialog.tsx b/ui/v2.5/src/components/Scenes/SceneMergeDialog.tsx
index 511ca2351..983978a27 100644
--- a/ui/v2.5/src/components/Scenes/SceneMergeDialog.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneMergeDialog.tsx
@@ -12,13 +12,13 @@ import { FormattedMessage, useIntl } from "react-intl";
 import { useToast } from "src/hooks/Toast";
 import { faExchangeAlt, faSignInAlt } from "@fortawesome/free-solid-svg-icons";
 import {
-  ScrapeDialog,
   ScrapeDialogRow,
   ScrapedImageRow,
   ScrapedInputGroupRow,
   ScrapedStringListRow,
   ScrapedTextAreaRow,
-} from "../Shared/ScrapeDialog/ScrapeDialog";
+} from "../Shared/ScrapeDialog/ScrapeDialogRow";
+import { ScrapeDialog } from "../Shared/ScrapeDialog/ScrapeDialog";
 import { clone, uniq } from "lodash-es";
 import { RatingSystem } from "src/components/Shared/Rating/RatingSystem";
 import { ModalComponent } from "../Shared/Modal";
@@ -400,63 +400,59 @@ const SceneMergeDetails: React.FC<ISceneMergeDetailsProps> = ({
           field="rating"
           title={intl.formatMessage({ id: "rating" })}
           result={rating}
-          renderOriginalField={() => (
-            <RatingSystem value={rating.originalValue} disabled />
-          )}
-          renderNewField={() => (
-            <RatingSystem value={rating.newValue} disabled />
-          )}
+          originalField={<RatingSystem value={rating.originalValue} disabled />}
+          newField={<RatingSystem value={rating.newValue} disabled />}
           onChange={(value) => setRating(value)}
         />
         <ScrapeDialogRow
           field="o_count"
           title={intl.formatMessage({ id: "o_count" })}
           result={oCounter}
-          renderOriginalField={() => (
+          originalField={
             <FormControl
               value={oCounter.originalValue ?? 0}
               readOnly
               onChange={() => {}}
               className="bg-secondary text-white border-secondary"
             />
-          )}
-          renderNewField={() => (
+          }
+          newField={
             <FormControl
               value={oCounter.newValue ?? 0}
               readOnly
               onChange={() => {}}
               className="bg-secondary text-white border-secondary"
             />
-          )}
+          }
           onChange={(value) => setOCounter(value)}
         />
         <ScrapeDialogRow
           field="play_count"
           title={intl.formatMessage({ id: "play_count" })}
           result={playCount}
-          renderOriginalField={() => (
+          originalField={
             <FormControl
               value={playCount.originalValue ?? 0}
               readOnly
               onChange={() => {}}
               className="bg-secondary text-white border-secondary"
             />
-          )}
-          renderNewField={() => (
+          }
+          newField={
             <FormControl
               value={playCount.newValue ?? 0}
               readOnly
               onChange={() => {}}
               className="bg-secondary text-white border-secondary"
             />
-          )}
+          }
           onChange={(value) => setPlayCount(value)}
         />
         <ScrapeDialogRow
           field="play_duration"
           title={intl.formatMessage({ id: "play_duration" })}
           result={playDuration}
-          renderOriginalField={() => (
+          originalField={
             <FormControl
               value={TextUtils.secondsToTimestamp(
                 playDuration.originalValue ?? 0
@@ -465,22 +461,22 @@ const SceneMergeDetails: React.FC<ISceneMergeDetailsProps> = ({
               onChange={() => {}}
               className="bg-secondary text-white border-secondary"
             />
-          )}
-          renderNewField={() => (
+          }
+          newField={
             <FormControl
               value={TextUtils.secondsToTimestamp(playDuration.newValue ?? 0)}
               readOnly
               onChange={() => {}}
               className="bg-secondary text-white border-secondary"
             />
-          )}
+          }
           onChange={(value) => setPlayDuration(value)}
         />
         <ScrapeDialogRow
           field="galleries"
           title={intl.formatMessage({ id: "galleries" })}
           result={galleries}
-          renderOriginalField={() => (
+          originalField={
             <GallerySelect
               className="form-control react-select"
               ids={galleries.originalValue ?? []}
@@ -488,8 +484,8 @@ const SceneMergeDetails: React.FC<ISceneMergeDetailsProps> = ({
               isMulti
               isDisabled
             />
-          )}
-          renderNewField={() => (
+          }
+          newField={
             <GallerySelect
               className="form-control react-select"
               ids={galleries.newValue ?? []}
@@ -497,7 +493,7 @@ const SceneMergeDetails: React.FC<ISceneMergeDetailsProps> = ({
               isMulti
               isDisabled
             />
-          )}
+          }
           onChange={(value) => setGalleries(value)}
         />
         <ScrapedStudioRow
@@ -535,34 +531,32 @@ const SceneMergeDetails: React.FC<ISceneMergeDetailsProps> = ({
           field="organized"
           title={intl.formatMessage({ id: "organized" })}
           result={organized}
-          renderOriginalField={() => (
+          originalField={
             <FormControl
               value={organized.originalValue ? trueString : falseString}
               readOnly
               onChange={() => {}}
               className="bg-secondary text-white border-secondary"
             />
-          )}
-          renderNewField={() => (
+          }
+          newField={
             <FormControl
               value={organized.newValue ? trueString : falseString}
               readOnly
               onChange={() => {}}
               className="bg-secondary text-white border-secondary"
             />
-          )}
+          }
           onChange={(value) => setOrganized(value)}
         />
         <ScrapeDialogRow
           field="stash_ids"
           title={intl.formatMessage({ id: "stash_id" })}
           result={stashIDs}
-          renderOriginalField={() => (
+          originalField={
             <StashIDsField values={stashIDs?.originalValue ?? []} />
-          )}
-          renderNewField={() => (
-            <StashIDsField values={stashIDs?.newValue ?? []} />
-          )}
+          }
+          newField={<StashIDsField values={stashIDs?.newValue ?? []} />}
           onChange={(value) => setStashIDs(value)}
         />
         <ScrapedImageRow
@@ -634,7 +628,6 @@ const SceneMergeDetails: React.FC<ISceneMergeDetailsProps> = ({
       title={dialogTitle}
       existingLabel={destinationLabel}
       scrapedLabel={sourceLabel}
-      renderScrapeRows={renderScrapeRows}
       onClose={(apply) => {
         if (!apply) {
           onClose();
@@ -642,7 +635,9 @@ const SceneMergeDetails: React.FC<ISceneMergeDetailsProps> = ({
           onClose(createValues());
         }
       }}
-    />
+    >
+      {renderScrapeRows()}
+    </ScrapeDialog>
   );
 };
 
diff --git a/ui/v2.5/src/components/Shared/ScrapeDialog/ScrapeDialog.tsx b/ui/v2.5/src/components/Shared/ScrapeDialog/ScrapeDialog.tsx
index b67c55f41..98699cbb6 100644
--- a/ui/v2.5/src/components/Shared/ScrapeDialog/ScrapeDialog.tsx
+++ b/ui/v2.5/src/components/Shared/ScrapeDialog/ScrapeDialog.tsx
@@ -1,457 +1,55 @@
-import React, { useState } from "react";
-import {
-  Form,
-  Col,
-  Row,
-  InputGroup,
-  Button,
-  FormControl,
-  Badge,
-} from "react-bootstrap";
-import { CollapseButton } from "../CollapseButton";
-import { Icon } from "../Icon";
+import React, { useMemo } from "react";
+import { Form, Col, Row } from "react-bootstrap";
 import { ModalComponent } from "../Modal";
-import clone from "lodash-es/clone";
 import { FormattedMessage, useIntl } from "react-intl";
-import {
-  faCheck,
-  faPencilAlt,
-  faPlus,
-  faTimes,
-} from "@fortawesome/free-solid-svg-icons";
-import { getCountryByISO } from "src/utils/country";
-import { CountrySelect } from "../CountrySelect";
-import { StringListInput } from "../StringListInput";
-import { ImageSelector } from "../ImageSelector";
-import { ScrapeResult } from "./scrapeResult";
+import { faPencilAlt } from "@fortawesome/free-solid-svg-icons";
 import { useConfigurationContext } from "src/hooks/Config";
 
-interface IScrapedFieldProps<T> {
-  result: ScrapeResult<T>;
+export interface IScrapeDialogContextState {
+  existingLabel?: React.ReactNode;
+  scrapedLabel?: React.ReactNode;
 }
 
-interface IScrapedRowProps<T, V> extends IScrapedFieldProps<T> {
-  className?: string;
-  field: string;
-  title: string;
-  renderOriginalField: (result: ScrapeResult<T>) => JSX.Element | undefined;
-  renderNewField: (result: ScrapeResult<T>) => JSX.Element | undefined;
-  onChange: (value: ScrapeResult<T>) => void;
-  newValues?: V[];
-  onCreateNew?: (index: number) => void;
-  getName?: (value: V) => string;
-}
-
-function renderButtonIcon(selected: boolean) {
-  const className = selected ? "text-success" : "text-muted";
-
-  return (
-    <Icon
-      className={`fa-fw ${className}`}
-      icon={selected ? faCheck : faTimes}
-    />
-  );
-}
-
-export const ScrapeDialogRow = <T, V>(props: IScrapedRowProps<T, V>) => {
-  const { getName = () => "" } = props;
-
-  function handleSelectClick(isNew: boolean) {
-    const ret = clone(props.result);
-    ret.useNewValue = isNew;
-    props.onChange(ret);
-  }
-
-  function hasNewValues() {
-    return props.newValues && props.newValues.length > 0 && props.onCreateNew;
-  }
-
-  if (!props.result.scraped && !hasNewValues()) {
-    return <></>;
-  }
-
-  function renderNewValues() {
-    if (!hasNewValues()) {
-      return;
-    }
-
-    const ret = (
-      <>
-        {props.newValues!.map((t, i) => (
-          <Badge
-            className="tag-item"
-            variant="secondary"
-            key={getName(t)}
-            onClick={() => props.onCreateNew!(i)}
-          >
-            {getName(t)}
-            <Button className="minimal ml-2">
-              <Icon className="fa-fw" icon={faPlus} />
-            </Button>
-          </Badge>
-        ))}
-      </>
-    );
-
-    const minCollapseLength = 10;
-
-    if (props.newValues!.length >= minCollapseLength) {
-      return (
-        <CollapseButton text={`Missing (${props.newValues!.length})`}>
-          {ret}
-        </CollapseButton>
-      );
-    }
-
-    return ret;
-  }
-
-  return (
-    <Row
-      className={`px-3 pt-3 ${props.className ?? ""}`}
-      data-field={props.field}
-    >
-      <Form.Label column lg="3">
-        {props.title}
-      </Form.Label>
-
-      <Col lg="9">
-        <Row>
-          <Col xs="6">
-            <InputGroup>
-              <InputGroup.Prepend className="bg-secondary text-white border-secondary">
-                <Button
-                  variant="secondary"
-                  onClick={() => handleSelectClick(false)}
-                >
-                  {renderButtonIcon(!props.result.useNewValue)}
-                </Button>
-              </InputGroup.Prepend>
-              {props.renderOriginalField(props.result)}
-            </InputGroup>
-          </Col>
-          <Col xs="6">
-            <InputGroup>
-              <InputGroup.Prepend>
-                <Button
-                  variant="secondary"
-                  onClick={() => handleSelectClick(true)}
-                >
-                  {renderButtonIcon(props.result.useNewValue)}
-                </Button>
-              </InputGroup.Prepend>
-              {props.renderNewField(props.result)}
-            </InputGroup>
-            {renderNewValues()}
-          </Col>
-        </Row>
-      </Col>
-    </Row>
-  );
-};
-
-interface IScrapedInputGroupProps {
-  isNew?: boolean;
-  placeholder?: string;
-  locked?: boolean;
-  result: ScrapeResult<string>;
-  onChange?: (value: string) => void;
-}
-
-const ScrapedInputGroup: React.FC<IScrapedInputGroupProps> = (props) => {
-  return (
-    <FormControl
-      placeholder={props.placeholder}
-      value={props.isNew ? props.result.newValue : props.result.originalValue}
-      readOnly={!props.isNew || props.locked}
-      onChange={(e) => {
-        if (props.isNew && props.onChange) {
-          props.onChange(e.target.value);
-        }
-      }}
-      className="bg-secondary text-white border-secondary"
-    />
-  );
-};
-
-function getNameString(value: string) {
-  return value;
-}
-
-interface IScrapedInputGroupRowProps {
-  title: string;
-  field: string;
-  className?: string;
-  placeholder?: string;
-  result: ScrapeResult<string>;
-  locked?: boolean;
-  onChange: (value: ScrapeResult<string>) => void;
-}
-
-export const ScrapedInputGroupRow: React.FC<IScrapedInputGroupRowProps> = (
-  props
-) => {
-  return (
-    <ScrapeDialogRow
-      title={props.title}
-      field={props.field}
-      className={props.className}
-      result={props.result}
-      renderOriginalField={() => (
-        <ScrapedInputGroup
-          placeholder={props.placeholder || props.title}
-          result={props.result}
-        />
-      )}
-      renderNewField={() => (
-        <ScrapedInputGroup
-          placeholder={props.placeholder || props.title}
-          result={props.result}
-          isNew
-          locked={props.locked}
-          onChange={(value) =>
-            props.onChange(props.result.cloneWithValue(value))
-          }
-        />
-      )}
-      onChange={props.onChange}
-      getName={getNameString}
-    />
-  );
-};
-
-interface IScrapedStringListProps {
-  isNew?: boolean;
-  placeholder?: string;
-  locked?: boolean;
-  result: ScrapeResult<string[]>;
-  onChange?: (value: string[]) => void;
-}
-
-const ScrapedStringList: React.FC<IScrapedStringListProps> = (props) => {
-  const value = props.isNew
-    ? props.result.newValue
-    : props.result.originalValue;
-
-  return (
-    <StringListInput
-      value={value ?? []}
-      setValue={(v) => {
-        if (props.isNew && props.onChange) {
-          props.onChange(v);
-        }
-      }}
-      placeholder={props.placeholder}
-      readOnly={!props.isNew || props.locked}
-    />
-  );
-};
-
-interface IScrapedStringListRowProps {
-  title: string;
-  field: string;
-  placeholder?: string;
-  result: ScrapeResult<string[]>;
-  locked?: boolean;
-  onChange: (value: ScrapeResult<string[]>) => void;
-}
-
-export const ScrapedStringListRow: React.FC<IScrapedStringListRowProps> = (
-  props
-) => {
-  return (
-    <ScrapeDialogRow
-      className="string-list-row"
-      title={props.title}
-      field={props.field}
-      result={props.result}
-      renderOriginalField={() => (
-        <ScrapedStringList
-          placeholder={props.placeholder || props.title}
-          result={props.result}
-        />
-      )}
-      renderNewField={() => (
-        <ScrapedStringList
-          placeholder={props.placeholder || props.title}
-          result={props.result}
-          isNew
-          locked={props.locked}
-          onChange={(value) =>
-            props.onChange(props.result.cloneWithValue(value))
-          }
-        />
-      )}
-      onChange={props.onChange}
-      getName={getNameString}
-    />
-  );
-};
-
-const ScrapedTextArea: React.FC<IScrapedInputGroupProps> = (props) => {
-  return (
-    <FormControl
-      as="textarea"
-      placeholder={props.placeholder}
-      value={props.isNew ? props.result.newValue : props.result.originalValue}
-      readOnly={!props.isNew}
-      onChange={(e) => {
-        if (props.isNew && props.onChange) {
-          props.onChange(e.target.value);
-        }
-      }}
-      className="bg-secondary text-white border-secondary scene-description"
-    />
-  );
-};
-
-export const ScrapedTextAreaRow: React.FC<IScrapedInputGroupRowProps> = (
-  props
-) => {
-  return (
-    <ScrapeDialogRow
-      title={props.title}
-      field={props.field}
-      result={props.result}
-      renderOriginalField={() => (
-        <ScrapedTextArea
-          placeholder={props.placeholder || props.title}
-          result={props.result}
-        />
-      )}
-      renderNewField={() => (
-        <ScrapedTextArea
-          placeholder={props.placeholder || props.title}
-          result={props.result}
-          isNew
-          onChange={(value) =>
-            props.onChange(props.result.cloneWithValue(value))
-          }
-        />
-      )}
-      onChange={props.onChange}
-      getName={getNameString}
-    />
-  );
-};
-
-interface IScrapedImageProps {
-  isNew?: boolean;
-  className?: string;
-  placeholder?: string;
-  result: ScrapeResult<string>;
-}
-
-const ScrapedImage: React.FC<IScrapedImageProps> = (props) => {
-  const value = props.isNew
-    ? props.result.newValue
-    : props.result.originalValue;
-
-  if (!value) {
-    return <></>;
-  }
-
-  return (
-    <img className={props.className} src={value} alt={props.placeholder} />
-  );
-};
-
-interface IScrapedImageRowProps {
-  title: string;
-  field: string;
-  className?: string;
-  result: ScrapeResult<string>;
-  onChange: (value: ScrapeResult<string>) => void;
-}
-
-export const ScrapedImageRow: React.FC<IScrapedImageRowProps> = (props) => {
-  return (
-    <ScrapeDialogRow
-      title={props.title}
-      field={props.field}
-      result={props.result}
-      renderOriginalField={() => (
-        <ScrapedImage
-          result={props.result}
-          className={props.className}
-          placeholder={props.title}
-        />
-      )}
-      renderNewField={() => (
-        <ScrapedImage
-          result={props.result}
-          className={props.className}
-          placeholder={props.title}
-          isNew
-        />
-      )}
-      onChange={props.onChange}
-      getName={getNameString}
-    />
-  );
-};
-
-interface IScrapedImagesRowProps {
-  title: string;
-  field: string;
-  className?: string;
-  result: ScrapeResult<string>;
-  images: string[];
-  onChange: (value: ScrapeResult<string>) => void;
-}
-
-export const ScrapedImagesRow: React.FC<IScrapedImagesRowProps> = (props) => {
-  const [imageIndex, setImageIndex] = useState(0);
-
-  function onSetImageIndex(newIdx: number) {
-    const ret = props.result.cloneWithValue(props.images[newIdx]);
-    props.onChange(ret);
-    setImageIndex(newIdx);
-  }
-
-  return (
-    <ScrapeDialogRow
-      title={props.title}
-      field={props.field}
-      result={props.result}
-      renderOriginalField={() => (
-        <ScrapedImage
-          result={props.result}
-          className={props.className}
-          placeholder={props.title}
-        />
-      )}
-      renderNewField={() => (
-        <div className="image-selection-parent">
-          <ImageSelector
-            imageClassName={props.className}
-            images={props.images}
-            imageIndex={imageIndex}
-            setImageIndex={onSetImageIndex}
-          />
-        </div>
-      )}
-      onChange={props.onChange}
-      getName={getNameString}
-    />
-  );
-};
+export const ScrapeDialogContext =
+  React.createContext<IScrapeDialogContextState>({});
 
 interface IScrapeDialogProps {
   title: string;
-  existingLabel?: string;
-  scrapedLabel?: string;
-  renderScrapeRows: () => JSX.Element;
+  existingLabel?: React.ReactNode;
+  scrapedLabel?: React.ReactNode;
   onClose: (apply?: boolean) => void;
 }
 
-export const ScrapeDialog: React.FC<IScrapeDialogProps> = (
-  props: IScrapeDialogProps
-) => {
+export const ScrapeDialog: React.FC<
+  React.PropsWithChildren<IScrapeDialogProps>
+> = (props: React.PropsWithChildren<IScrapeDialogProps>) => {
   const intl = useIntl();
   const { configuration } = useConfigurationContext();
   const { sfwContentMode } = configuration.interface;
 
+  const existingLabel = useMemo(
+    () =>
+      props.existingLabel ?? (
+        <FormattedMessage id="dialogs.scrape_results_existing" />
+      ),
+    [props.existingLabel]
+  );
+  const scrapedLabel = useMemo(
+    () =>
+      props.scrapedLabel ?? (
+        <FormattedMessage id="dialogs.scrape_results_scraped" />
+      ),
+    [props.scrapedLabel]
+  );
+
+  const contextState = useMemo(
+    () => ({
+      existingLabel: existingLabel,
+      scrapedLabel: scrapedLabel,
+    }),
+    [existingLabel, scrapedLabel]
+  );
+
   return (
     <ModalComponent
       show
@@ -474,76 +72,33 @@ export const ScrapeDialog: React.FC<IScrapeDialogProps> = (
       }}
     >
       <div className="dialog-container">
-        <Form>
-          <Row className="px-3 pt-3">
-            <Col lg={{ span: 9, offset: 3 }}>
-              <Row>
-                <Form.Label column xs="6">
-                  {props.existingLabel ?? (
-                    <FormattedMessage id="dialogs.scrape_results_existing" />
-                  )}
-                </Form.Label>
-                <Form.Label column xs="6">
-                  {props.scrapedLabel ?? (
-                    <FormattedMessage id="dialogs.scrape_results_scraped" />
-                  )}
-                </Form.Label>
-              </Row>
-            </Col>
-          </Row>
+        <ScrapeDialogContext.Provider value={contextState}>
+          <Form>
+            <Row className="px-3 pt-3">
+              <Col lg={{ span: 9, offset: 3 }}>
+                <Row>
+                  <Form.Label
+                    column
+                    lg="6"
+                    className="d-lg-block d-none column-label"
+                  >
+                    {existingLabel}
+                  </Form.Label>
+                  <Form.Label
+                    column
+                    lg="6"
+                    className="d-lg-block d-none column-label"
+                  >
+                    {scrapedLabel}
+                  </Form.Label>
+                </Row>
+              </Col>
+            </Row>
 
-          {props.renderScrapeRows()}
-        </Form>
+            {props.children}
+          </Form>
+        </ScrapeDialogContext.Provider>
       </div>
     </ModalComponent>
   );
 };
-
-interface IScrapedCountryRowProps {
-  title: string;
-  field: string;
-  result: ScrapeResult<string>;
-  onChange: (value: ScrapeResult<string>) => void;
-  locked?: boolean;
-  locale?: string;
-}
-
-export const ScrapedCountryRow: React.FC<IScrapedCountryRowProps> = ({
-  title,
-  field,
-  result,
-  onChange,
-  locked,
-  locale,
-}) => (
-  <ScrapeDialogRow
-    title={title}
-    field={field}
-    result={result}
-    renderOriginalField={() => (
-      <FormControl
-        value={
-          getCountryByISO(result.originalValue, locale) ?? result.originalValue
-        }
-        readOnly
-        className="bg-secondary text-white border-secondary"
-      />
-    )}
-    renderNewField={() => (
-      <CountrySelect
-        value={result.newValue}
-        disabled={locked}
-        onChange={(value) => {
-          if (onChange) {
-            onChange(result.cloneWithValue(value));
-          }
-        }}
-        showFlag={false}
-        isClearable={false}
-        className="flex-grow-1"
-      />
-    )}
-    onChange={onChange}
-    getName={getNameString}
-  />
-);
diff --git a/ui/v2.5/src/components/Shared/ScrapeDialog/ScrapeDialogRow.tsx b/ui/v2.5/src/components/Shared/ScrapeDialog/ScrapeDialogRow.tsx
new file mode 100644
index 000000000..88b79d87d
--- /dev/null
+++ b/ui/v2.5/src/components/Shared/ScrapeDialog/ScrapeDialogRow.tsx
@@ -0,0 +1,433 @@
+import React, { useContext, useState } from "react";
+import {
+  Form,
+  Col,
+  Row,
+  InputGroup,
+  Button,
+  FormControl,
+} from "react-bootstrap";
+import { Icon } from "../Icon";
+import clone from "lodash-es/clone";
+import { faCheck, faTimes } from "@fortawesome/free-solid-svg-icons";
+import { getCountryByISO } from "src/utils/country";
+import { CountrySelect } from "../CountrySelect";
+import { StringListInput } from "../StringListInput";
+import { ImageSelector } from "../ImageSelector";
+import { ScrapeResult } from "./scrapeResult";
+import { ScrapeDialogContext } from "./ScrapeDialog";
+
+function renderButtonIcon(selected: boolean) {
+  const className = selected ? "text-success" : "text-muted";
+
+  return (
+    <Icon
+      className={`fa-fw ${className}`}
+      icon={selected ? faCheck : faTimes}
+    />
+  );
+}
+
+interface IScrapedFieldProps<T> {
+  result: ScrapeResult<T>;
+}
+
+interface IScrapedRowProps<T> extends IScrapedFieldProps<T> {
+  className?: string;
+  field: string;
+  title: string;
+  originalField: React.ReactNode;
+  newField: React.ReactNode;
+  onChange: (value: ScrapeResult<T>) => void;
+  newValues?: React.ReactNode;
+}
+
+export const ScrapeDialogRow = <T,>(props: IScrapedRowProps<T>) => {
+  const { existingLabel, scrapedLabel } = useContext(ScrapeDialogContext);
+
+  function handleSelectClick(isNew: boolean) {
+    const ret = clone(props.result);
+    ret.useNewValue = isNew;
+    props.onChange(ret);
+  }
+
+  if (!props.result.scraped && !props.newValues) {
+    return <></>;
+  }
+
+  return (
+    <Row
+      className={`px-3 pt-3 ${props.className ?? ""}`}
+      data-field={props.field}
+    >
+      <Form.Label column lg="3">
+        {props.title}
+      </Form.Label>
+
+      <Col lg="9">
+        <Row>
+          <Form.Label column className="d-lg-none column-label">
+            {existingLabel}
+          </Form.Label>
+          <Col lg="6">
+            <InputGroup>
+              <InputGroup.Prepend className="bg-secondary text-white border-secondary">
+                <Button
+                  variant="secondary"
+                  onClick={() => handleSelectClick(false)}
+                >
+                  {renderButtonIcon(!props.result.useNewValue)}
+                </Button>
+              </InputGroup.Prepend>
+              {props.originalField}
+            </InputGroup>
+          </Col>
+
+          <Form.Label column className="d-lg-none column-label">
+            {scrapedLabel}
+          </Form.Label>
+          <Col lg="6">
+            <InputGroup>
+              <InputGroup.Prepend>
+                <Button
+                  variant="secondary"
+                  onClick={() => handleSelectClick(true)}
+                >
+                  {renderButtonIcon(props.result.useNewValue)}
+                </Button>
+              </InputGroup.Prepend>
+              {props.newField}
+            </InputGroup>
+            {props.newValues}
+          </Col>
+        </Row>
+      </Col>
+    </Row>
+  );
+};
+
+interface IScrapedInputGroupProps {
+  isNew?: boolean;
+  placeholder?: string;
+  locked?: boolean;
+  result: ScrapeResult<string>;
+  onChange?: (value: string) => void;
+}
+
+const ScrapedInputGroup: React.FC<IScrapedInputGroupProps> = (props) => {
+  return (
+    <FormControl
+      placeholder={props.placeholder}
+      value={props.isNew ? props.result.newValue : props.result.originalValue}
+      readOnly={!props.isNew || props.locked}
+      onChange={(e) => {
+        if (props.isNew && props.onChange) {
+          props.onChange(e.target.value);
+        }
+      }}
+      className="bg-secondary text-white border-secondary"
+    />
+  );
+};
+
+interface IScrapedInputGroupRowProps {
+  title: string;
+  field: string;
+  className?: string;
+  placeholder?: string;
+  result: ScrapeResult<string>;
+  locked?: boolean;
+  onChange: (value: ScrapeResult<string>) => void;
+}
+
+export const ScrapedInputGroupRow: React.FC<IScrapedInputGroupRowProps> = (
+  props
+) => {
+  return (
+    <ScrapeDialogRow
+      title={props.title}
+      field={props.field}
+      className={props.className}
+      result={props.result}
+      originalField={
+        <ScrapedInputGroup
+          placeholder={props.placeholder || props.title}
+          result={props.result}
+        />
+      }
+      newField={
+        <ScrapedInputGroup
+          placeholder={props.placeholder || props.title}
+          result={props.result}
+          isNew
+          locked={props.locked}
+          onChange={(value) =>
+            props.onChange(props.result.cloneWithValue(value))
+          }
+        />
+      }
+      onChange={props.onChange}
+    />
+  );
+};
+
+interface IScrapedStringListProps {
+  isNew?: boolean;
+  placeholder?: string;
+  locked?: boolean;
+  result: ScrapeResult<string[]>;
+  onChange?: (value: string[]) => void;
+}
+
+const ScrapedStringList: React.FC<IScrapedStringListProps> = (props) => {
+  const value = props.isNew
+    ? props.result.newValue
+    : props.result.originalValue;
+
+  return (
+    <StringListInput
+      value={value ?? []}
+      setValue={(v) => {
+        if (props.isNew && props.onChange) {
+          props.onChange(v);
+        }
+      }}
+      placeholder={props.placeholder}
+      readOnly={!props.isNew || props.locked}
+    />
+  );
+};
+
+interface IScrapedStringListRowProps {
+  title: string;
+  field: string;
+  placeholder?: string;
+  result: ScrapeResult<string[]>;
+  locked?: boolean;
+  onChange: (value: ScrapeResult<string[]>) => void;
+}
+
+export const ScrapedStringListRow: React.FC<IScrapedStringListRowProps> = (
+  props
+) => {
+  return (
+    <ScrapeDialogRow
+      className="string-list-row"
+      title={props.title}
+      field={props.field}
+      result={props.result}
+      originalField={
+        <ScrapedStringList
+          placeholder={props.placeholder || props.title}
+          result={props.result}
+        />
+      }
+      newField={
+        <ScrapedStringList
+          placeholder={props.placeholder || props.title}
+          result={props.result}
+          isNew
+          locked={props.locked}
+          onChange={(value) =>
+            props.onChange(props.result.cloneWithValue(value))
+          }
+        />
+      }
+      onChange={props.onChange}
+    />
+  );
+};
+
+const ScrapedTextArea: React.FC<IScrapedInputGroupProps> = (props) => {
+  return (
+    <FormControl
+      as="textarea"
+      placeholder={props.placeholder}
+      value={props.isNew ? props.result.newValue : props.result.originalValue}
+      readOnly={!props.isNew}
+      onChange={(e) => {
+        if (props.isNew && props.onChange) {
+          props.onChange(e.target.value);
+        }
+      }}
+      className="bg-secondary text-white border-secondary scene-description"
+    />
+  );
+};
+
+export const ScrapedTextAreaRow: React.FC<IScrapedInputGroupRowProps> = (
+  props
+) => {
+  return (
+    <ScrapeDialogRow
+      title={props.title}
+      field={props.field}
+      result={props.result}
+      originalField={
+        <ScrapedTextArea
+          placeholder={props.placeholder || props.title}
+          result={props.result}
+        />
+      }
+      newField={
+        <ScrapedTextArea
+          placeholder={props.placeholder || props.title}
+          result={props.result}
+          isNew
+          onChange={(value) =>
+            props.onChange(props.result.cloneWithValue(value))
+          }
+        />
+      }
+      onChange={props.onChange}
+    />
+  );
+};
+
+interface IScrapedImageProps {
+  isNew?: boolean;
+  className?: string;
+  placeholder?: string;
+  result: ScrapeResult<string>;
+}
+
+const ScrapedImage: React.FC<IScrapedImageProps> = (props) => {
+  const value = props.isNew
+    ? props.result.newValue
+    : props.result.originalValue;
+
+  if (!value) {
+    return <></>;
+  }
+
+  return (
+    <img className={props.className} src={value} alt={props.placeholder} />
+  );
+};
+
+interface IScrapedImageRowProps {
+  title: string;
+  field: string;
+  className?: string;
+  result: ScrapeResult<string>;
+  onChange: (value: ScrapeResult<string>) => void;
+}
+
+export const ScrapedImageRow: React.FC<IScrapedImageRowProps> = (props) => {
+  return (
+    <ScrapeDialogRow
+      title={props.title}
+      field={props.field}
+      result={props.result}
+      originalField={
+        <ScrapedImage
+          result={props.result}
+          className={props.className}
+          placeholder={props.title}
+        />
+      }
+      newField={
+        <ScrapedImage
+          result={props.result}
+          className={props.className}
+          placeholder={props.title}
+          isNew
+        />
+      }
+      onChange={props.onChange}
+    />
+  );
+};
+
+interface IScrapedImagesRowProps {
+  title: string;
+  field: string;
+  className?: string;
+  result: ScrapeResult<string>;
+  images: string[];
+  onChange: (value: ScrapeResult<string>) => void;
+}
+
+export const ScrapedImagesRow: React.FC<IScrapedImagesRowProps> = (props) => {
+  const [imageIndex, setImageIndex] = useState(0);
+
+  function onSetImageIndex(newIdx: number) {
+    const ret = props.result.cloneWithValue(props.images[newIdx]);
+    props.onChange(ret);
+    setImageIndex(newIdx);
+  }
+
+  return (
+    <ScrapeDialogRow
+      title={props.title}
+      field={props.field}
+      result={props.result}
+      originalField={
+        <ScrapedImage
+          result={props.result}
+          className={props.className}
+          placeholder={props.title}
+        />
+      }
+      newField={
+        <div className="image-selection-parent">
+          <ImageSelector
+            imageClassName={props.className}
+            images={props.images}
+            imageIndex={imageIndex}
+            setImageIndex={onSetImageIndex}
+          />
+        </div>
+      }
+      onChange={props.onChange}
+    />
+  );
+};
+
+interface IScrapedCountryRowProps {
+  title: string;
+  field: string;
+  result: ScrapeResult<string>;
+  onChange: (value: ScrapeResult<string>) => void;
+  locked?: boolean;
+  locale?: string;
+}
+
+export const ScrapedCountryRow: React.FC<IScrapedCountryRowProps> = ({
+  title,
+  field,
+  result,
+  onChange,
+  locked,
+  locale,
+}) => (
+  <ScrapeDialogRow
+    title={title}
+    field={field}
+    result={result}
+    originalField={
+      <FormControl
+        value={
+          getCountryByISO(result.originalValue, locale) ?? result.originalValue
+        }
+        readOnly
+        className="bg-secondary text-white border-secondary"
+      />
+    }
+    newField={
+      <CountrySelect
+        value={result.newValue}
+        disabled={locked}
+        onChange={(value) => {
+          if (onChange) {
+            onChange(result.cloneWithValue(value));
+          }
+        }}
+        showFlag={false}
+        isClearable={false}
+        className="flex-grow-1"
+      />
+    }
+    onChange={onChange}
+  />
+);
diff --git a/ui/v2.5/src/components/Shared/ScrapeDialog/ScrapedObjectsRow.tsx b/ui/v2.5/src/components/Shared/ScrapeDialog/ScrapedObjectsRow.tsx
index 6aa985796..1588b8829 100644
--- a/ui/v2.5/src/components/Shared/ScrapeDialog/ScrapedObjectsRow.tsx
+++ b/ui/v2.5/src/components/Shared/ScrapeDialog/ScrapedObjectsRow.tsx
@@ -1,6 +1,6 @@
 import React, { useMemo } from "react";
 import * as GQL from "src/core/generated-graphql";
-import { ScrapeDialogRow } from "src/components/Shared/ScrapeDialog/ScrapeDialog";
+import { ScrapeDialogRow } from "src/components/Shared/ScrapeDialog/ScrapeDialogRow";
 import { PerformerSelect } from "src/components/Performers/PerformerSelect";
 import {
   ObjectScrapeResult,
@@ -10,6 +10,58 @@ import { TagIDSelect } from "src/components/Tags/TagSelect";
 import { StudioSelect } from "src/components/Studios/StudioSelect";
 import { GroupSelect } from "src/components/Groups/GroupSelect";
 import { uniq } from "lodash-es";
+import { CollapseButton } from "../CollapseButton";
+import { Badge, Button } from "react-bootstrap";
+import { Icon } from "../Icon";
+import { faPlus } from "@fortawesome/free-solid-svg-icons";
+import { useIntl } from "react-intl";
+
+interface INewScrapedObjects<T> {
+  newValues: T[];
+  onCreateNew: (value: T) => void;
+  getName: (value: T) => string;
+}
+
+export const NewScrapedObjects = <T,>(props: INewScrapedObjects<T>) => {
+  const intl = useIntl();
+
+  if (props.newValues.length === 0) {
+    return null;
+  }
+
+  const ret = (
+    <>
+      {props.newValues.map((t) => (
+        <Badge
+          className="tag-item"
+          variant="secondary"
+          key={props.getName(t)}
+          onClick={() => props.onCreateNew(t)}
+        >
+          {props.getName(t)}
+          <Button className="minimal ml-2">
+            <Icon className="fa-fw" icon={faPlus} />
+          </Button>
+        </Badge>
+      ))}
+    </>
+  );
+
+  const minCollapseLength = 10;
+
+  if (props.newValues!.length >= minCollapseLength) {
+    const missingText = intl.formatMessage({
+      id: "dialogs.scrape_results_missing",
+    });
+    return (
+      <CollapseButton text={`${missingText} (${props.newValues!.length})`}>
+        {ret}
+      </CollapseButton>
+    );
+  }
+
+  return ret;
+};
 
 interface IScrapedStudioRow {
   title: string;
@@ -77,18 +129,20 @@ export const ScrapedStudioRow: React.FC<IScrapedStudioRow> = ({
       title={title}
       field={field}
       result={result}
-      renderOriginalField={() => renderScrapedStudio(result)}
-      renderNewField={() =>
-        renderScrapedStudio(result, true, (value) =>
-          onChange(result.cloneWithValue(value))
-        )
-      }
+      originalField={renderScrapedStudio(result)}
+      newField={renderScrapedStudio(result, true, (value) =>
+        onChange(result.cloneWithValue(value))
+      )}
       onChange={onChange}
-      newValues={newStudio ? [newStudio] : undefined}
-      onCreateNew={() => {
-        if (onCreateNew && newStudio) onCreateNew(newStudio);
-      }}
-      getName={getObjectName}
+      newValues={
+        newStudio && onCreateNew ? (
+          <NewScrapedObjects
+            newValues={[newStudio]}
+            onCreateNew={onCreateNew}
+            getName={getObjectName}
+          />
+        ) : undefined
+      }
     />
   );
 };
@@ -125,18 +179,20 @@ export const ScrapedObjectsRow = <T,>(props: IScrapedObjectsRow<T>) => {
       title={title}
       field={field}
       result={result}
-      renderOriginalField={() => renderObjects(result)}
-      renderNewField={() =>
-        renderObjects(result, true, (value) =>
-          onChange(result.cloneWithValue(value))
-        )
-      }
+      originalField={renderObjects(result)}
+      newField={renderObjects(result, true, (value) =>
+        onChange(result.cloneWithValue(value))
+      )}
       onChange={onChange}
-      newValues={newObjects}
-      onCreateNew={(i) => {
-        if (onCreateNew) onCreateNew(newObjects![i]);
-      }}
-      getName={getName}
+      newValues={
+        onCreateNew ? (
+          <NewScrapedObjects
+            newValues={newObjects ?? []}
+            onCreateNew={onCreateNew}
+            getName={getName}
+          />
+        ) : undefined
+      }
     />
   );
 };
diff --git a/ui/v2.5/src/components/Shared/styles.scss b/ui/v2.5/src/components/Shared/styles.scss
index 947dd22d7..ce8454b89 100644
--- a/ui/v2.5/src/components/Shared/styles.scss
+++ b/ui/v2.5/src/components/Shared/styles.scss
@@ -155,6 +155,15 @@
 }
 
 .scrape-dialog {
+  .column-label {
+    color: $muted-gray;
+    font-size: 0.85em;
+  }
+
+  .string-list-input {
+    width: 100%;
+  }
+
   .modal-content .dialog-container {
     max-height: calc(100vh - 14rem);
     overflow-y: auto;
@@ -391,8 +400,18 @@ button.collapse-button {
   opacity: 0.5;
 }
 
-.string-list-input .input-group {
-  margin-bottom: 0.35rem;
+.string-list-input {
+  .form-group {
+    margin-bottom: 0;
+  }
+
+  .input-group {
+    margin-bottom: 0.35rem;
+
+    &:last-child {
+      margin-bottom: 0;
+    }
+  }
 }
 
 .bulk-update-text-input {
diff --git a/ui/v2.5/src/locales/en-GB.json b/ui/v2.5/src/locales/en-GB.json
index 54982b932..a78ca55ec 100644
--- a/ui/v2.5/src/locales/en-GB.json
+++ b/ui/v2.5/src/locales/en-GB.json
@@ -1020,6 +1020,7 @@
     "scrape_entity_query": "{entity_type} Scrape Query",
     "scrape_entity_title": "{entity_type} Scrape Results",
     "scrape_results_existing": "Existing",
+    "scrape_results_missing": "Missing",
     "scrape_results_scraped": "Scraped",
     "set_default_filter_confirm": "Are you sure you want to set this filter as the default?",
     "set_image_url_title": "Image URL",

From 7fded66bfa1029a5fe87ef89cd9d14817111aa0d Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Tue, 9 Dec 2025 13:55:11 +1100
Subject: [PATCH 203/405] Improve tag stash-id handling in tagger and scraper
 dialogs (#6389)

* Change link button icon and separate into component
* Add create/link tag dialog
* Add titles to buttons
* Add ability to link existing tags in scrape dialogs
* Move create link dialog
* Allow tags to have multiple stash-ids from the same endpoint
---
 .../GalleryDetails/GalleryScrapeDialog.tsx    |   6 +-
 .../Groups/GroupDetails/GroupScrapeDialog.tsx |   6 +-
 .../Images/ImageDetails/ImageScrapeDialog.tsx |   6 +-
 .../PerformerScrapeDialog.tsx                 |   9 +-
 .../Scenes/SceneDetails/SceneScrapeDialog.tsx |   6 +-
 .../ScrapeDialog/CreateLinkTagDialog.tsx      | 132 ++++++++++++++++++
 .../Shared/ScrapeDialog/ScrapedObjectsRow.tsx |  44 +++++-
 .../Shared/ScrapeDialog/createObjects.ts      |  55 +++++---
 .../Shared/ScrapeDialog/scrapedTags.tsx       |  83 ++++++++++-
 ui/v2.5/src/components/Tagger/LinkButton.tsx  |  25 ++++
 ui/v2.5/src/components/Tagger/context.tsx     |  50 +++++++
 .../Tagger/scenes/PerformerResult.tsx         |  23 +--
 .../Tagger/scenes/StashSearchResult.tsx       |  85 +++++++----
 .../components/Tagger/scenes/StudioResult.tsx |  23 +--
 .../Tagger/scenes/sceneTaggerModals.tsx       |  42 +++++-
 .../Tags/TagDetails/TagEditPanel.tsx          |   7 +-
 ui/v2.5/src/hooks/Toast.tsx                   |  18 +++
 ui/v2.5/src/locales/en-GB.json                |   4 +
 ui/v2.5/src/utils/stashIds.ts                 |  15 +-
 19 files changed, 540 insertions(+), 99 deletions(-)
 create mode 100644 ui/v2.5/src/components/Shared/ScrapeDialog/CreateLinkTagDialog.tsx
 create mode 100644 ui/v2.5/src/components/Tagger/LinkButton.tsx

diff --git a/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryScrapeDialog.tsx b/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryScrapeDialog.tsx
index 6bc67b9bc..3ceec4aa1 100644
--- a/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryScrapeDialog.tsx
+++ b/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryScrapeDialog.tsx
@@ -98,7 +98,7 @@ export const GalleryScrapeDialog: React.FC<IGalleryScrapeDialogProps> = ({
     scraped.performers?.filter((t) => !t.stored_id) ?? []
   );
 
-  const { tags, newTags, scrapedTagsRow } = useScrapedTags(
+  const { tags, newTags, scrapedTagsRow, linkDialog } = useScrapedTags(
     galleryTags,
     scraped.tags
   );
@@ -219,6 +219,10 @@ export const GalleryScrapeDialog: React.FC<IGalleryScrapeDialogProps> = ({
     );
   }
 
+  if (linkDialog) {
+    return linkDialog;
+  }
+
   return (
     <ScrapeDialog
       title={intl.formatMessage(
diff --git a/ui/v2.5/src/components/Groups/GroupDetails/GroupScrapeDialog.tsx b/ui/v2.5/src/components/Groups/GroupDetails/GroupScrapeDialog.tsx
index c9cbaf74e..21fc3282f 100644
--- a/ui/v2.5/src/components/Groups/GroupDetails/GroupScrapeDialog.tsx
+++ b/ui/v2.5/src/components/Groups/GroupDetails/GroupScrapeDialog.tsx
@@ -98,7 +98,7 @@ export const GroupScrapeDialog: React.FC<IGroupScrapeDialogProps> = ({
     setNewObject: setNewStudio,
   });
 
-  const { tags, newTags, scrapedTagsRow } = useScrapedTags(
+  const { tags, newTags, scrapedTagsRow, linkDialog } = useScrapedTags(
     groupTags,
     scraped.tags
   );
@@ -218,6 +218,10 @@ export const GroupScrapeDialog: React.FC<IGroupScrapeDialogProps> = ({
     );
   }
 
+  if (linkDialog) {
+    return linkDialog;
+  }
+
   return (
     <ScrapeDialog
       title={intl.formatMessage(
diff --git a/ui/v2.5/src/components/Images/ImageDetails/ImageScrapeDialog.tsx b/ui/v2.5/src/components/Images/ImageDetails/ImageScrapeDialog.tsx
index ed95cb674..aa1b4633c 100644
--- a/ui/v2.5/src/components/Images/ImageDetails/ImageScrapeDialog.tsx
+++ b/ui/v2.5/src/components/Images/ImageDetails/ImageScrapeDialog.tsx
@@ -100,7 +100,7 @@ export const ImageScrapeDialog: React.FC<IImageScrapeDialogProps> = ({
     scraped.performers?.filter((t) => !t.stored_id) ?? []
   );
 
-  const { tags, newTags, scrapedTagsRow } = useScrapedTags(
+  const { tags, newTags, scrapedTagsRow, linkDialog } = useScrapedTags(
     imageTags,
     scraped.tags
   );
@@ -220,6 +220,10 @@ export const ImageScrapeDialog: React.FC<IImageScrapeDialogProps> = ({
     );
   }
 
+  if (linkDialog) {
+    return linkDialog;
+  }
+
   return (
     <ScrapeDialog
       title={intl.formatMessage(
diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerScrapeDialog.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerScrapeDialog.tsx
index 98c858037..b3ec4bff6 100644
--- a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerScrapeDialog.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerScrapeDialog.tsx
@@ -314,9 +314,10 @@ export const PerformerScrapeDialog: React.FC<IPerformerScrapeDialogProps> = (
     )
   );
 
-  const { tags, newTags, scrapedTagsRow } = useScrapedTags(
+  const { tags, newTags, scrapedTagsRow, linkDialog } = useScrapedTags(
     props.performerTags,
-    props.scraped.tags
+    props.scraped.tags,
+    endpoint
   );
 
   const [image, setImage] = useState<ScrapeResult<string>>(
@@ -542,6 +543,10 @@ export const PerformerScrapeDialog: React.FC<IPerformerScrapeDialogProps> = (
     );
   }
 
+  if (linkDialog) {
+    return linkDialog;
+  }
+
   return (
     <ScrapeDialog
       title={intl.formatMessage(
diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/SceneScrapeDialog.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/SceneScrapeDialog.tsx
index 98939786d..9b9a6bc40 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/SceneScrapeDialog.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/SceneScrapeDialog.tsx
@@ -131,7 +131,7 @@ export const SceneScrapeDialog: React.FC<ISceneScrapeDialogProps> = ({
     scraped.groups?.filter((t) => !t.stored_id) ?? []
   );
 
-  const { tags, newTags, scrapedTagsRow } = useScrapedTags(
+  const { tags, newTags, scrapedTagsRow, linkDialog } = useScrapedTags(
     sceneTags,
     scraped.tags,
     endpoint
@@ -298,6 +298,10 @@ export const SceneScrapeDialog: React.FC<ISceneScrapeDialogProps> = ({
     );
   }
 
+  if (linkDialog) {
+    return linkDialog;
+  }
+
   return (
     <ScrapeDialog
       title={intl.formatMessage(
diff --git a/ui/v2.5/src/components/Shared/ScrapeDialog/CreateLinkTagDialog.tsx b/ui/v2.5/src/components/Shared/ScrapeDialog/CreateLinkTagDialog.tsx
new file mode 100644
index 000000000..73ba53dde
--- /dev/null
+++ b/ui/v2.5/src/components/Shared/ScrapeDialog/CreateLinkTagDialog.tsx
@@ -0,0 +1,132 @@
+import React, { useEffect, useState } from "react";
+import { FormattedMessage, useIntl } from "react-intl";
+
+import * as GQL from "src/core/generated-graphql";
+import { ModalComponent } from "src/components/Shared/Modal";
+import { faLink } from "@fortawesome/free-solid-svg-icons";
+import { Form } from "react-bootstrap";
+import { Tag, TagSelect } from "../../Tags/TagSelect";
+
+export const CreateLinkTagDialog: React.FC<{
+  tag: GQL.ScrapedTag;
+  onClose: (result: {
+    create?: GQL.TagCreateInput;
+    update?: GQL.TagUpdateInput;
+  }) => void;
+  endpoint?: string;
+}> = ({ tag, onClose, endpoint }) => {
+  const intl = useIntl();
+
+  const [createNew, setCreateNew] = useState(false);
+  const [name, setName] = useState(tag.name);
+  const [existingTag, setExistingTag] = useState<Tag | null>(null);
+  const [addAsAlias, setAddAsAlias] = useState(false);
+
+  const canAddAlias = (createNew && name !== tag.name) || !createNew;
+
+  useEffect(() => {
+    setAddAsAlias(canAddAlias);
+  }, [canAddAlias]);
+
+  function handleTagSave() {
+    if (createNew) {
+      const createInput: GQL.TagCreateInput = {
+        name: name,
+        aliases: addAsAlias ? [tag.name] : [],
+        stash_ids:
+          endpoint && tag.remote_site_id
+            ? [{ endpoint: endpoint!, stash_id: tag.remote_site_id }]
+            : undefined,
+      };
+      onClose({ create: createInput });
+    } else if (existingTag) {
+      const updateInput: GQL.TagUpdateInput = {
+        id: existingTag.id,
+        aliases: addAsAlias
+          ? [...(existingTag.aliases || []), tag.name]
+          : undefined,
+        stash_ids:
+          endpoint && tag.remote_site_id
+            ? [{ endpoint: endpoint!, stash_id: tag.remote_site_id }]
+            : undefined,
+      };
+      onClose({ update: updateInput });
+    }
+  }
+
+  return (
+    <ModalComponent
+      show={true}
+      accept={{
+        text: intl.formatMessage({ id: "actions.save" }),
+        onClick: () => handleTagSave(),
+      }}
+      disabled={createNew ? name.trim() === "" : existingTag === null}
+      cancel={{
+        text: intl.formatMessage({ id: "actions.cancel" }),
+        onClick: () => {
+          onClose({});
+        },
+      }}
+      dialogClassName="create-link-tag-modal"
+      icon={faLink}
+      header={intl.formatMessage({ id: "component_tagger.verb_match_tag" })}
+    >
+      <Form>
+        <Form.Check
+          type="radio"
+          id="create-new"
+          label={intl.formatMessage({ id: "actions.create_new" })}
+          checked={createNew}
+          onChange={() => setCreateNew(true)}
+        />
+
+        <Form.Group className="ml-3 mt-2">
+          <Form.Label>
+            <FormattedMessage id="name" />
+          </Form.Label>
+          <Form.Control
+            className="input-control"
+            type="text"
+            value={name}
+            onChange={(e) => setName(e.target.value)}
+            disabled={!createNew}
+          />
+        </Form.Group>
+
+        <Form.Check
+          type="radio"
+          id="link-existing"
+          label={intl.formatMessage({
+            id: "component_tagger.verb_link_existing",
+          })}
+          checked={!createNew}
+          onChange={() => setCreateNew(false)}
+        />
+
+        <Form.Group className="ml-3 mt-2">
+          <TagSelect
+            isMulti={false}
+            values={existingTag ? [existingTag] : []}
+            onSelect={(t) => setExistingTag(t.length > 0 ? t[0] : null)}
+            isDisabled={createNew}
+            menuPortalTarget={document.body}
+          />
+        </Form.Group>
+
+        <Form.Group className="mt-3">
+          <Form.Check
+            type="checkbox"
+            id="add-as-alias"
+            label={intl.formatMessage({
+              id: "component_tagger.verb_add_as_alias",
+            })}
+            checked={addAsAlias}
+            onChange={() => setAddAsAlias(!addAsAlias)}
+            disabled={!canAddAlias}
+          />
+        </Form.Group>
+      </Form>
+    </ModalComponent>
+  );
+};
diff --git a/ui/v2.5/src/components/Shared/ScrapeDialog/ScrapedObjectsRow.tsx b/ui/v2.5/src/components/Shared/ScrapeDialog/ScrapedObjectsRow.tsx
index 1588b8829..fea2fd541 100644
--- a/ui/v2.5/src/components/Shared/ScrapeDialog/ScrapedObjectsRow.tsx
+++ b/ui/v2.5/src/components/Shared/ScrapeDialog/ScrapedObjectsRow.tsx
@@ -13,12 +13,13 @@ import { uniq } from "lodash-es";
 import { CollapseButton } from "../CollapseButton";
 import { Badge, Button } from "react-bootstrap";
 import { Icon } from "../Icon";
-import { faPlus } from "@fortawesome/free-solid-svg-icons";
+import { faLink, faPlus } from "@fortawesome/free-solid-svg-icons";
 import { useIntl } from "react-intl";
 
 interface INewScrapedObjects<T> {
   newValues: T[];
   onCreateNew: (value: T) => void;
+  onLinkExisting?: (value: T) => void;
   getName: (value: T) => string;
 }
 
@@ -42,6 +43,17 @@ export const NewScrapedObjects = <T,>(props: INewScrapedObjects<T>) => {
           <Button className="minimal ml-2">
             <Icon className="fa-fw" icon={faPlus} />
           </Button>
+          {props.onLinkExisting ? (
+            <Button
+              className="minimal"
+              onClick={(e) => {
+                props.onLinkExisting?.(t);
+                e.stopPropagation();
+              }}
+            >
+              <Icon className="fa-fw" icon={faLink} />
+            </Button>
+          ) : null}
         </Badge>
       ))}
     </>
@@ -70,6 +82,7 @@ interface IScrapedStudioRow {
   onChange: (value: ObjectScrapeResult<GQL.ScrapedStudio>) => void;
   newStudio?: GQL.ScrapedStudio;
   onCreateNew?: (value: GQL.ScrapedStudio) => void;
+  onLinkExisting?: (value: GQL.ScrapedStudio) => void;
 }
 
 function getObjectName<T extends { name: string }>(value: T) {
@@ -83,6 +96,7 @@ export const ScrapedStudioRow: React.FC<IScrapedStudioRow> = ({
   onChange,
   newStudio,
   onCreateNew,
+  onLinkExisting,
 }) => {
   function renderScrapedStudio(
     scrapeResult: ObjectScrapeResult<GQL.ScrapedStudio>,
@@ -140,6 +154,7 @@ export const ScrapedStudioRow: React.FC<IScrapedStudioRow> = ({
             newValues={[newStudio]}
             onCreateNew={onCreateNew}
             getName={getObjectName}
+            onLinkExisting={onLinkExisting}
           />
         ) : undefined
       }
@@ -154,6 +169,7 @@ interface IScrapedObjectsRow<T> {
   onChange: (value: ScrapeResult<T[]>) => void;
   newObjects?: T[];
   onCreateNew?: (value: T) => void;
+  onLinkExisting?: (value: T) => void;
   renderObjects: (
     result: ScrapeResult<T[]>,
     isNew?: boolean,
@@ -170,6 +186,7 @@ export const ScrapedObjectsRow = <T,>(props: IScrapedObjectsRow<T>) => {
     onChange,
     newObjects,
     onCreateNew,
+    onLinkExisting,
     renderObjects,
     getName,
   } = props;
@@ -189,6 +206,7 @@ export const ScrapedObjectsRow = <T,>(props: IScrapedObjectsRow<T>) => {
           <NewScrapedObjects
             newValues={newObjects ?? []}
             onCreateNew={onCreateNew}
+            onLinkExisting={onLinkExisting}
             getName={getName}
           />
         ) : undefined
@@ -212,6 +230,7 @@ export const ScrapedPerformersRow: React.FC<
   newObjects,
   onCreateNew,
   ageFromDate,
+  onLinkExisting,
 }) => {
   const performersCopy = useMemo(() => {
     return (
@@ -268,13 +287,22 @@ export const ScrapedPerformersRow: React.FC<
       newObjects={performersCopy}
       onCreateNew={onCreateNew}
       getName={(value) => value.name ?? ""}
+      onLinkExisting={onLinkExisting}
     />
   );
 };
 
 export const ScrapedGroupsRow: React.FC<
   IScrapedObjectRowImpl<GQL.ScrapedGroup>
-> = ({ title, field, result, onChange, newObjects, onCreateNew }) => {
+> = ({
+  title,
+  field,
+  result,
+  onChange,
+  newObjects,
+  onCreateNew,
+  onLinkExisting,
+}) => {
   const groupsCopy = useMemo(() => {
     return (
       newObjects?.map((p) => {
@@ -329,13 +357,22 @@ export const ScrapedGroupsRow: React.FC<
       newObjects={groupsCopy}
       onCreateNew={onCreateNew}
       getName={(value) => value.name ?? ""}
+      onLinkExisting={onLinkExisting}
     />
   );
 };
 
 export const ScrapedTagsRow: React.FC<
   IScrapedObjectRowImpl<GQL.ScrapedTag>
-> = ({ title, field, result, onChange, newObjects, onCreateNew }) => {
+> = ({
+  title,
+  field,
+  result,
+  onChange,
+  newObjects,
+  onCreateNew,
+  onLinkExisting,
+}) => {
   function renderScrapedTags(
     scrapeResult: ScrapeResult<GQL.ScrapedTag[]>,
     isNew?: boolean,
@@ -375,6 +412,7 @@ export const ScrapedTagsRow: React.FC<
       onChange={onChange}
       newObjects={newObjects}
       onCreateNew={onCreateNew}
+      onLinkExisting={onLinkExisting}
       getName={getObjectName}
     />
   );
diff --git a/ui/v2.5/src/components/Shared/ScrapeDialog/createObjects.ts b/ui/v2.5/src/components/Shared/ScrapeDialog/createObjects.ts
index e2d09294a..f16ecf2f2 100644
--- a/ui/v2.5/src/components/Shared/ScrapeDialog/createObjects.ts
+++ b/ui/v2.5/src/components/Shared/ScrapeDialog/createObjects.ts
@@ -183,12 +183,40 @@ export function useCreateScrapedGroup(
   return useCreateObject("group", createNewGroup);
 }
 
+export function useLinkScrapedTag(
+  props: IUseCreateNewObjectProps<GQL.ScrapedTag>
+) {
+  const { scrapeResult, setScrapeResult, newObjects, setNewObjects } = props;
+
+  function linkTag(id: string, matchedName: string, scrapedName: string) {
+    const newValue = [...(scrapeResult.newValue ?? [])];
+    newValue.push({
+      stored_id: id,
+      name: matchedName,
+    });
+
+    // add the new tag to the new tags value
+    const tagClone = scrapeResult.cloneWithValue(newValue);
+    setScrapeResult(tagClone);
+
+    // remove the tag from the list
+    const newTagsClone = newObjects.concat();
+    const pIndex = newTagsClone.findIndex((p) => p.name === scrapedName);
+    if (pIndex === -1) throw new Error("Could not find tag to remove");
+
+    newTagsClone.splice(pIndex, 1);
+
+    setNewObjects(newTagsClone);
+  }
+
+  return linkTag;
+}
+
 export function useCreateScrapedTag(
   props: IUseCreateNewObjectProps<GQL.ScrapedTag>
 ) {
   const [createTag] = useTagCreate();
-
-  const { scrapeResult, setScrapeResult, newObjects, setNewObjects } = props;
+  const linkTag = useLinkScrapedTag(props);
 
   async function createNewTag(toCreate: GQL.ScrapedTag) {
     const input: GQL.TagCreateInput = {
@@ -208,25 +236,12 @@ export function useCreateScrapedTag(
       variables: { input },
     });
 
-    const newValue = [...(scrapeResult.newValue ?? [])];
     if (result.data?.tagCreate)
-      newValue.push({
-        stored_id: result.data.tagCreate.id,
-        name: result.data.tagCreate.name,
-      });
-
-    // add the new tag to the new tags value
-    const tagClone = scrapeResult.cloneWithValue(newValue);
-    setScrapeResult(tagClone);
-
-    // remove the tag from the list
-    const newTagsClone = newObjects.concat();
-    const pIndex = newTagsClone.findIndex((p) => p.name === toCreate.name);
-    if (pIndex === -1) throw new Error("Could not find tag to remove");
-
-    newTagsClone.splice(pIndex, 1);
-
-    setNewObjects(newTagsClone);
+      linkTag(
+        result.data.tagCreate.id,
+        result.data.tagCreate.name,
+        toCreate.name ?? ""
+      );
   }
 
   return useCreateObject("tag", createNewTag);
diff --git a/ui/v2.5/src/components/Shared/ScrapeDialog/scrapedTags.tsx b/ui/v2.5/src/components/Shared/ScrapeDialog/scrapedTags.tsx
index f298a6eeb..8ab88878d 100644
--- a/ui/v2.5/src/components/Shared/ScrapeDialog/scrapedTags.tsx
+++ b/ui/v2.5/src/components/Shared/ScrapeDialog/scrapedTags.tsx
@@ -4,8 +4,11 @@ import * as GQL from "src/core/generated-graphql";
 import { ObjectListScrapeResult } from "./scrapeResult";
 import { sortStoredIdObjects } from "src/utils/data";
 import { Tag } from "src/components/Tags/TagSelect";
-import { useCreateScrapedTag } from "./createObjects";
+import { useCreateScrapedTag, useLinkScrapedTag } from "./createObjects";
 import { ScrapedTagsRow } from "./ScrapedObjectsRow";
+import { CreateLinkTagDialog } from "src/components/Shared/ScrapeDialog/CreateLinkTagDialog";
+import { useTagCreate, useTagUpdate } from "src/core/StashService";
+import { toastOperation, useToast } from "src/hooks/Toast";
 
 export function useScrapedTags(
   existingTags: Tag[],
@@ -13,6 +16,8 @@ export function useScrapedTags(
   endpoint?: string
 ) {
   const intl = useIntl();
+  const Toast = useToast();
+
   const [tags, setTags] = useState<ObjectListScrapeResult<GQL.ScrapedTag>>(
     new ObjectListScrapeResult<GQL.ScrapedTag>(
       sortStoredIdObjects(
@@ -28,6 +33,7 @@ export function useScrapedTags(
   const [newTags, setNewTags] = useState<GQL.ScrapedTag[]>(
     scrapedTags?.filter((t) => !t.stored_id) ?? []
   );
+  const [linkedTag, setLinkedTag] = useState<GQL.ScrapedTag | null>(null);
 
   const createNewTag = useCreateScrapedTag({
     scrapeResult: tags,
@@ -37,6 +43,79 @@ export function useScrapedTags(
     endpoint,
   });
 
+  const [createTag] = useTagCreate();
+  const [updateTag] = useTagUpdate();
+
+  const linkScrapedTag = useLinkScrapedTag({
+    scrapeResult: tags,
+    setScrapeResult: setTags,
+    newObjects: newTags,
+    setNewObjects: setNewTags,
+  });
+
+  async function handleLinkTagResult(tag: {
+    create?: GQL.TagCreateInput;
+    update?: GQL.TagUpdateInput;
+  }) {
+    if (tag.create) {
+      await toastOperation(
+        Toast,
+        async () => {
+          // create the new tag
+          const result = await createTag({ variables: { input: tag.create! } });
+
+          // adjust scrape result
+          if (result.data?.tagCreate) {
+            linkScrapedTag(
+              result.data.tagCreate.id,
+              result.data.tagCreate.name,
+              linkedTag?.name ?? ""
+            );
+          }
+        },
+        intl.formatMessage(
+          { id: "toast.created_entity" },
+          {
+            entity: intl.formatMessage({ id: "tag" }).toLocaleLowerCase(),
+          }
+        )
+      )();
+    } else if (tag.update) {
+      // link existing tag
+      await toastOperation(
+        Toast,
+        async () => {
+          const result = await updateTag({ variables: { input: tag.update! } });
+
+          // adjust scrape result
+          if (result.data?.tagUpdate) {
+            linkScrapedTag(
+              result.data.tagUpdate.id,
+              result.data.tagUpdate.name,
+              linkedTag?.name ?? ""
+            );
+          }
+        },
+        intl.formatMessage(
+          { id: "toast.updated_entity" },
+          {
+            entity: intl.formatMessage({ id: "tag" }).toLocaleLowerCase(),
+          }
+        )
+      )();
+    }
+
+    setLinkedTag(null);
+  }
+
+  const linkDialog = linkedTag ? (
+    <CreateLinkTagDialog
+      tag={linkedTag}
+      onClose={handleLinkTagResult}
+      endpoint={endpoint}
+    />
+  ) : null;
+
   const scrapedTagsRow = (
     <ScrapedTagsRow
       field="tags"
@@ -45,12 +124,14 @@ export function useScrapedTags(
       onChange={(value) => setTags(value)}
       newObjects={newTags}
       onCreateNew={createNewTag}
+      onLinkExisting={(l) => setLinkedTag(l)}
     />
   );
 
   return {
     tags,
     newTags,
+    linkDialog,
     scrapedTagsRow,
   };
 }
diff --git a/ui/v2.5/src/components/Tagger/LinkButton.tsx b/ui/v2.5/src/components/Tagger/LinkButton.tsx
new file mode 100644
index 000000000..c2c544e71
--- /dev/null
+++ b/ui/v2.5/src/components/Tagger/LinkButton.tsx
@@ -0,0 +1,25 @@
+import React from "react";
+import { useIntl } from "react-intl";
+import { faLink } from "@fortawesome/free-solid-svg-icons";
+
+import { OperationButton } from "../Shared/OperationButton";
+import { Icon } from "../Shared/Icon";
+
+export const LinkButton: React.FC<{
+  disabled: boolean;
+  onLink: () => Promise<void>;
+}> = ({ disabled, onLink }) => {
+  const intl = useIntl();
+
+  return (
+    <OperationButton
+      variant="secondary"
+      disabled={disabled}
+      operation={onLink}
+      hideChildrenWhenLoading
+      title={intl.formatMessage({ id: "component_tagger.verb_link_existing" })}
+    >
+      <Icon icon={faLink} />
+    </OperationButton>
+  );
+};
diff --git a/ui/v2.5/src/components/Tagger/context.tsx b/ui/v2.5/src/components/Tagger/context.tsx
index 8557cc94a..fbf20ee40 100644
--- a/ui/v2.5/src/components/Tagger/context.tsx
+++ b/ui/v2.5/src/components/Tagger/context.tsx
@@ -15,6 +15,7 @@ import {
   useStudioCreate,
   useStudioUpdate,
   useTagCreate,
+  useTagUpdate,
 } from "src/core/StashService";
 import { useToast } from "src/hooks/Toast";
 import { useConfigurationContext } from "src/hooks/Config";
@@ -55,6 +56,10 @@ export interface ITaggerContextState {
   ) => Promise<string | undefined>;
   updateStudio: (studio: GQL.StudioUpdateInput) => Promise<void>;
   linkStudio: (studio: GQL.ScrapedStudio, studioID: string) => Promise<void>;
+  updateTag: (
+    tag: GQL.ScrapedTag,
+    updateInput: GQL.TagUpdateInput
+  ) => Promise<void>;
   resolveScene: (
     sceneID: string,
     index: number,
@@ -92,6 +97,7 @@ export const TaggerStateContext = React.createContext<ITaggerContextState>({
   createNewStudio: dummyValFn,
   updateStudio: dummyFn,
   linkStudio: dummyFn,
+  updateTag: dummyFn,
   resolveScene: dummyFn,
   submitFingerprints: dummyFn,
   pendingFingerprints: [],
@@ -129,6 +135,7 @@ export const TaggerContext: React.FC = ({ children }) => {
   const [createStudio] = useStudioCreate();
   const [updateStudio] = useStudioUpdate();
   const [updateScene] = useSceneUpdate();
+  const [updateTag] = useTagUpdate();
 
   useEffect(() => {
     if (!stashConfig || !Scrapers.data) {
@@ -860,6 +867,48 @@ export const TaggerContext: React.FC = ({ children }) => {
     }
   }
 
+  async function updateExistingTag(
+    tag: GQL.ScrapedTag,
+    updateInput: GQL.TagUpdateInput
+  ) {
+    if (!tag.remote_site_id || !currentSource?.sourceInput.stash_box_endpoint)
+      return;
+
+    try {
+      await updateTag({
+        variables: {
+          input: updateInput,
+        },
+      });
+
+      const newSearchResults = mapResults((r) => {
+        if (!r.tags) {
+          return r;
+        }
+
+        return {
+          ...r,
+          tags: r.tags.map((t) => {
+            if (t.remote_site_id === tag.remote_site_id) {
+              return {
+                ...t,
+                stored_id: updateInput.id,
+              };
+            }
+
+            return t;
+          }),
+        };
+      });
+
+      setSearchResults(newSearchResults);
+
+      Toast.success(<span>Updated tag</span>);
+    } catch (e) {
+      Toast.error(e);
+    }
+  }
+
   return (
     <TaggerStateContext.Provider
       value={{
@@ -884,6 +933,7 @@ export const TaggerContext: React.FC = ({ children }) => {
         createNewStudio,
         updateStudio: updateExistingStudio,
         linkStudio,
+        updateTag: updateExistingTag,
         resolveScene,
         saveScene,
         submitFingerprints,
diff --git a/ui/v2.5/src/components/Tagger/scenes/PerformerResult.tsx b/ui/v2.5/src/components/Tagger/scenes/PerformerResult.tsx
index 55e7f7f25..53caba2ff 100755
--- a/ui/v2.5/src/components/Tagger/scenes/PerformerResult.tsx
+++ b/ui/v2.5/src/components/Tagger/scenes/PerformerResult.tsx
@@ -3,10 +3,7 @@ import { Button, ButtonGroup } from "react-bootstrap";
 import { FormattedMessage } from "react-intl";
 
 import * as GQL from "src/core/generated-graphql";
-import { Icon } from "src/components/Shared/Icon";
-import { OperationButton } from "src/components/Shared/OperationButton";
 import { OptionalField } from "../IncludeButton";
-import { faSave } from "@fortawesome/free-solid-svg-icons";
 import {
   Performer,
   PerformerSelect,
@@ -14,6 +11,7 @@ import {
 import { getStashboxBase } from "src/utils/stashbox";
 import { ExternalLink } from "src/components/Shared/ExternalLink";
 import { Link } from "react-router-dom";
+import { LinkButton } from "../LinkButton";
 
 const PerformerLink: React.FC<{
   performer: GQL.ScrapedPerformer | Performer;
@@ -148,21 +146,6 @@ const PerformerResult: React.FC<IPerformerResultProps> = ({
     );
   }
 
-  function maybeRenderLinkButton() {
-    if (endpoint && onLink) {
-      return (
-        <OperationButton
-          variant="secondary"
-          disabled={selectedID === undefined}
-          operation={onLink}
-          hideChildrenWhenLoading
-        >
-          <Icon icon={faSave} />
-        </OperationButton>
-      );
-    }
-  }
-
   const selectedSource = !selectedID ? "skip" : "existing";
 
   const safeBuildPerformerScraperLink = (id: string | null | undefined) => {
@@ -199,7 +182,9 @@ const PerformerResult: React.FC<IPerformerResultProps> = ({
           isClearable={false}
           ageFromDate={ageFromDate}
         />
-        {maybeRenderLinkButton()}
+        {endpoint && onLink && (
+          <LinkButton disabled={selectedID === undefined} onLink={onLink} />
+        )}
       </ButtonGroup>
     </div>
   );
diff --git a/ui/v2.5/src/components/Tagger/scenes/StashSearchResult.tsx b/ui/v2.5/src/components/Tagger/scenes/StashSearchResult.tsx
index d9f05b875..01ce23643 100755
--- a/ui/v2.5/src/components/Tagger/scenes/StashSearchResult.tsx
+++ b/ui/v2.5/src/components/Tagger/scenes/StashSearchResult.tsx
@@ -7,6 +7,7 @@ import { blobToBase64 } from "base64-blob";
 import { distance } from "src/utils/hamming";
 import { faCheckCircle } from "@fortawesome/free-regular-svg-icons";
 import {
+  faLink,
   faPlus,
   faTriangleExclamation,
   faXmark,
@@ -232,6 +233,7 @@ const StashSearchResult: React.FC<IStashSearchResultProps> = ({
     createNewStudio,
     updateStudio,
     linkStudio,
+    updateTag,
     resolveScene,
     currentSource,
     saveScene,
@@ -248,9 +250,8 @@ const StashSearchResult: React.FC<IStashSearchResultProps> = ({
     [scene, performerGenders]
   );
 
-  const { createPerformerModal, createStudioModal } = React.useContext(
-    SceneTaggerModalsState
-  );
+  const { createPerformerModal, createStudioModal, createTagModal } =
+    React.useContext(SceneTaggerModalsState);
 
   const getInitialTags = useCallback(() => {
     const stashSceneTags = stashScene.tags.map((t) => t.id);
@@ -439,6 +440,47 @@ const StashSearchResult: React.FC<IStashSearchResultProps> = ({
     });
   }
 
+  async function onCreateTag(
+    t: GQL.ScrapedTag,
+    createInput?: GQL.TagCreateInput
+  ) {
+    const toCreate: GQL.TagCreateInput = createInput ?? { name: t.name };
+
+    // If the tag has a remote_site_id and we have an endpoint, include the stash_id
+    const endpoint = currentSource?.sourceInput.stash_box_endpoint;
+    if (!createInput && t.remote_site_id && endpoint) {
+      toCreate.stash_ids = [
+        {
+          endpoint: endpoint,
+          stash_id: t.remote_site_id,
+        },
+      ];
+    }
+
+    const newTagID = await createNewTag(t, toCreate);
+    if (newTagID !== undefined) {
+      setTagIDs([...tagIDs, newTagID]);
+    }
+  }
+
+  async function onUpdateTag(
+    t: GQL.ScrapedTag,
+    updateInput: GQL.TagUpdateInput
+  ) {
+    await updateTag(t, updateInput);
+    setTagIDs([...tagIDs, updateInput.id]);
+  }
+
+  function showTagModal(t: GQL.ScrapedTag) {
+    createTagModal(t, (result) => {
+      if (result.create) {
+        onCreateTag(t, result.create);
+      } else if (result.update) {
+        onUpdateTag(t, result.update);
+      }
+    });
+  }
+
   async function studioModalCallback(
     studio: GQL.ScrapedStudio,
     toCreate?: GQL.StudioCreateInput,
@@ -711,26 +753,6 @@ const StashSearchResult: React.FC<IStashSearchResultProps> = ({
     </div>
   );
 
-  async function onCreateTag(t: GQL.ScrapedTag) {
-    const toCreate: GQL.TagCreateInput = { name: t.name };
-
-    // If the tag has a remote_site_id and we have an endpoint, include the stash_id
-    const endpoint = currentSource?.sourceInput.stash_box_endpoint;
-    if (t.remote_site_id && endpoint) {
-      toCreate.stash_ids = [
-        {
-          endpoint: endpoint,
-          stash_id: t.remote_site_id,
-        },
-      ];
-    }
-
-    const newTagID = await createNewTag(t, toCreate);
-    if (newTagID !== undefined) {
-      setTagIDs([...tagIDs, newTagID]);
-    }
-  }
-
   function maybeRenderTagsField() {
     if (!config.setTags) return;
 
@@ -764,9 +786,24 @@ const StashSearchResult: React.FC<IStashSearchResultProps> = ({
             }}
           >
             {t.name}
-            <Button className="minimal ml-2">
+            <Button
+              className="minimal ml-2"
+              title={intl.formatMessage({ id: "actions.create" })}
+            >
               <Icon className="fa-fw" icon={faPlus} />
             </Button>
+            <Button
+              className="minimal"
+              onClick={(e) => {
+                showTagModal(t);
+                e.stopPropagation();
+              }}
+              title={intl.formatMessage({
+                id: "component_tagger.verb_link_existing",
+              })}
+            >
+              <Icon className="fa-fw" icon={faLink} />
+            </Button>
           </Badge>
         ))}
       </div>
diff --git a/ui/v2.5/src/components/Tagger/scenes/StudioResult.tsx b/ui/v2.5/src/components/Tagger/scenes/StudioResult.tsx
index 410ce2d19..c37df2258 100755
--- a/ui/v2.5/src/components/Tagger/scenes/StudioResult.tsx
+++ b/ui/v2.5/src/components/Tagger/scenes/StudioResult.tsx
@@ -3,16 +3,14 @@ import { Button, ButtonGroup } from "react-bootstrap";
 import { FormattedMessage } from "react-intl";
 import cx from "classnames";
 
-import { Icon } from "src/components/Shared/Icon";
-import { OperationButton } from "src/components/Shared/OperationButton";
 import { StudioSelect, SelectObject } from "src/components/Shared/Select";
 import * as GQL from "src/core/generated-graphql";
 
 import { OptionalField } from "../IncludeButton";
-import { faSave } from "@fortawesome/free-solid-svg-icons";
 import { getStashboxBase } from "src/utils/stashbox";
 import { ExternalLink } from "src/components/Shared/ExternalLink";
 import { Link } from "react-router-dom";
+import { LinkButton } from "../LinkButton";
 
 const StudioLink: React.FC<{
   studio: GQL.ScrapedStudio | GQL.SlimStudioDataFragment;
@@ -117,21 +115,6 @@ const StudioResult: React.FC<IStudioResultProps> = ({
     );
   }
 
-  function maybeRenderLinkButton() {
-    if (endpoint && onLink) {
-      return (
-        <OperationButton
-          variant="secondary"
-          disabled={selectedID === undefined}
-          operation={onLink}
-          hideChildrenWhenLoading
-        >
-          <Icon icon={faSave} />
-        </OperationButton>
-      );
-    }
-  }
-
   const selectedSource = !selectedID ? "skip" : "existing";
 
   const safeBuildStudioScraperLink = (id: string | null | undefined) => {
@@ -169,7 +152,9 @@ const StudioResult: React.FC<IStudioResultProps> = ({
           })}
           isClearable={false}
         />
-        {maybeRenderLinkButton()}
+        {endpoint && onLink && (
+          <LinkButton disabled={selectedID === undefined} onLink={onLink} />
+        )}
       </ButtonGroup>
     </div>
   );
diff --git a/ui/v2.5/src/components/Tagger/scenes/sceneTaggerModals.tsx b/ui/v2.5/src/components/Tagger/scenes/sceneTaggerModals.tsx
index 816e4e294..29339a9fc 100644
--- a/ui/v2.5/src/components/Tagger/scenes/sceneTaggerModals.tsx
+++ b/ui/v2.5/src/components/Tagger/scenes/sceneTaggerModals.tsx
@@ -6,12 +6,17 @@ import PerformerModal from "../PerformerModal";
 import { TaggerStateContext } from "../context";
 import { useIntl } from "react-intl";
 import { faTags } from "@fortawesome/free-solid-svg-icons";
+import { CreateLinkTagDialog } from "src/components/Shared/ScrapeDialog/CreateLinkTagDialog";
 
 type PerformerModalCallback = (toCreate?: GQL.PerformerCreateInput) => void;
 type StudioModalCallback = (
   toCreate?: GQL.StudioCreateInput,
   parentInput?: GQL.StudioCreateInput
 ) => void;
+type TagModalCallback = (result: {
+  create?: GQL.TagCreateInput;
+  update?: GQL.TagUpdateInput;
+}) => void;
 
 export interface ISceneTaggerModalsContextState {
   createPerformerModal: (
@@ -22,12 +27,14 @@ export interface ISceneTaggerModalsContextState {
     studio: GQL.ScrapedSceneStudioDataFragment,
     callback: StudioModalCallback
   ) => void;
+  createTagModal: (tag: GQL.ScrapedTag, callback: TagModalCallback) => void;
 }
 
 export const SceneTaggerModalsState =
   React.createContext<ISceneTaggerModalsContextState>({
     createPerformerModal: () => {},
     createStudioModal: () => {},
+    createTagModal: () => {},
   });
 
 export const SceneTaggerModals: React.FC = ({ children }) => {
@@ -47,6 +54,15 @@ export const SceneTaggerModals: React.FC = ({ children }) => {
     StudioModalCallback | undefined
   >();
 
+  const [tagToCreate, setTagToCreate] = useState<GQL.ScrapedTag | undefined>();
+  const [tagCallback, setTagCallback] = useState<
+    | ((result: {
+        create?: GQL.TagCreateInput;
+        update?: GQL.TagUpdateInput;
+      }) => void)
+    | undefined
+  >();
+
   const intl = useIntl();
 
   function handlePerformerSave(toCreate: GQL.PerformerCreateInput) {
@@ -106,11 +122,28 @@ export const SceneTaggerModals: React.FC = ({ children }) => {
     setStudioCallback(() => callback);
   }
 
+  function handleTagSave(result: {
+    create?: GQL.TagCreateInput;
+    update?: GQL.TagUpdateInput;
+  }) {
+    if (tagCallback) {
+      tagCallback(result);
+    }
+
+    setTagToCreate(undefined);
+    setTagCallback(undefined);
+  }
+
+  function createTagModal(tag: GQL.ScrapedTag, callback: TagModalCallback) {
+    setTagToCreate(tag);
+    setTagCallback(() => callback);
+  }
+
   const endpoint = currentSource?.sourceInput.stash_box_endpoint ?? undefined;
 
   return (
     <SceneTaggerModalsState.Provider
-      value={{ createPerformerModal, createStudioModal }}
+      value={{ createPerformerModal, createStudioModal, createTagModal }}
     >
       {performerToCreate && (
         <PerformerModal
@@ -141,6 +174,13 @@ export const SceneTaggerModals: React.FC = ({ children }) => {
           endpoint={endpoint}
         />
       )}
+      {tagToCreate && (
+        <CreateLinkTagDialog
+          tag={tagToCreate}
+          onClose={handleTagSave}
+          endpoint={endpoint}
+        />
+      )}
       {children}
     </SceneTaggerModalsState.Provider>
   );
diff --git a/ui/v2.5/src/components/Tags/TagDetails/TagEditPanel.tsx b/ui/v2.5/src/components/Tags/TagDetails/TagEditPanel.tsx
index 35733394a..e734de846 100644
--- a/ui/v2.5/src/components/Tags/TagDetails/TagEditPanel.tsx
+++ b/ui/v2.5/src/components/Tags/TagDetails/TagEditPanel.tsx
@@ -153,9 +153,10 @@ export const TagEditPanel: React.FC<ITagEditPanel> = ({
 
   function onStashIDSelected(item?: GQL.StashIdInput) {
     if (!item) return;
+    const allowMultiple = true;
     formik.setFieldValue(
       "stash_ids",
-      addUpdateStashID(formik.values.stash_ids, item)
+      addUpdateStashID(formik.values.stash_ids, item, allowMultiple)
     );
   }
 
@@ -203,13 +204,11 @@ export const TagEditPanel: React.FC<ITagEditPanel> = ({
   // TODO: CSS class
   return (
     <>
+      {/* allow many stash-ids from the same stash box */}
       {isStashIDSearchOpen && (
         <StashBoxIDSearchModal
           entityType="tag"
           stashBoxes={stashConfig?.general.stashBoxes ?? []}
-          excludedStashBoxEndpoints={formik.values.stash_ids.map(
-            (s) => s.endpoint
-          )}
           onSelectItem={(item) => {
             onStashIDSelected(item);
             setIsStashIDSearchOpen(false);
diff --git a/ui/v2.5/src/hooks/Toast.tsx b/ui/v2.5/src/hooks/Toast.tsx
index 9be27e928..3590e0efb 100644
--- a/ui/v2.5/src/hooks/Toast.tsx
+++ b/ui/v2.5/src/hooks/Toast.tsx
@@ -150,3 +150,21 @@ export const useToast = () => {
     [addToast]
   );
 };
+
+export function toastOperation(
+  toast: ReturnType<typeof useToast>,
+  o: () => Promise<void>,
+  successMessage: string
+) {
+  async function operation() {
+    try {
+      await o();
+
+      toast.success(successMessage);
+    } catch (e) {
+      toast.error(e);
+    }
+  }
+
+  return operation;
+}
diff --git a/ui/v2.5/src/locales/en-GB.json b/ui/v2.5/src/locales/en-GB.json
index a78ca55ec..2911ccb6e 100644
--- a/ui/v2.5/src/locales/en-GB.json
+++ b/ui/v2.5/src/locales/en-GB.json
@@ -34,6 +34,7 @@
     "create_chapters": "Create Chapter",
     "create_entity": "Create {entityType}",
     "create_marker": "Create Marker",
+    "create_new": "Create new",
     "create_parent_studio": "Create parent studio",
     "created_entity": "Created {entity_type}: {entity_name}",
     "customise": "Customise",
@@ -225,7 +226,10 @@
       "phash_matches": "{count} PHashes match",
       "unnamed": "Unnamed"
     },
+    "verb_add_as_alias": "Add scraped name as alias",
+    "verb_link_existing": "Link to existing",
     "verb_match_fp": "Match Fingerprints",
+    "verb_match_tag": "Match Tag",
     "verb_matched": "Matched",
     "verb_scrape_all": "Scrape All",
     "verb_submit_fp": "Submit {fpCount, plural, one{# Fingerprint} other{# Fingerprints}}",
diff --git a/ui/v2.5/src/utils/stashIds.ts b/ui/v2.5/src/utils/stashIds.ts
index 92a4eaf1e..10e3835b8 100644
--- a/ui/v2.5/src/utils/stashIds.ts
+++ b/ui/v2.5/src/utils/stashIds.ts
@@ -42,17 +42,28 @@ export const separateNamesAndStashIds = (
  */
 export const addUpdateStashID = (
   existingStashIDs: GQL.StashIdInput[],
-  newItem: GQL.StashIdInput
+  newItem: GQL.StashIdInput,
+  allowMultiple: boolean = false
 ): GQL.StashIdInput[] => {
   const existingIndex = existingStashIDs.findIndex(
     (s) => s.endpoint === newItem.endpoint
   );
 
-  if (existingIndex >= 0) {
+  if (!allowMultiple && existingIndex >= 0) {
     const newStashIDs = [...existingStashIDs];
     newStashIDs[existingIndex] = newItem;
     return newStashIDs;
   }
 
+  // ensure we don't add duplicates if allowMultiple is true
+  if (
+    allowMultiple &&
+    existingStashIDs.some(
+      (s) => s.endpoint === newItem.endpoint && s.stash_id === newItem.stash_id
+    )
+  ) {
+    return existingStashIDs;
+  }
+
   return [...existingStashIDs, newItem];
 };

From fe41561dfec0f7944f3fa9fea73e2afad1785bbf Mon Sep 17 00:00:00 2001
From: CJ <72030708+cj12312021@users.noreply.github.com>
Date: Wed, 10 Dec 2025 15:01:38 -0600
Subject: [PATCH 204/405] add autostart button to videoplayer (#6368)

---
 .../components/ScenePlayer/ScenePlayer.tsx    |  47 ++++++-
 .../ScenePlayer/autostart-button.ts           | 126 ++++++++++++++++++
 .../src/components/ScenePlayer/styles.scss    |  60 ++++++++-
 3 files changed, 227 insertions(+), 6 deletions(-)
 create mode 100644 ui/v2.5/src/components/ScenePlayer/autostart-button.ts

diff --git a/ui/v2.5/src/components/ScenePlayer/ScenePlayer.tsx b/ui/v2.5/src/components/ScenePlayer/ScenePlayer.tsx
index 5aeb56e96..31e3e79be 100644
--- a/ui/v2.5/src/components/ScenePlayer/ScenePlayer.tsx
+++ b/ui/v2.5/src/components/ScenePlayer/ScenePlayer.tsx
@@ -16,6 +16,7 @@ import "./live";
 import "./PlaylistButtons";
 import "./source-selector";
 import "./persist-volume";
+import "./autostart-button";
 import MarkersPlugin, { type IMarker } from "./markers";
 void MarkersPlugin;
 import "./vtt-thumbnails";
@@ -28,6 +29,7 @@ import cx from "classnames";
 import {
   useSceneSaveActivity,
   useSceneIncrementPlayCount,
+  useConfigureInterface,
 } from "src/core/StashService";
 
 import * as GQL from "src/core/generated-graphql";
@@ -249,6 +251,7 @@ export const ScenePlayer: React.FC<IScenePlayerProps> = PatchComponent(
     const sceneId = useRef<string>();
     const [sceneSaveActivity] = useSceneSaveActivity();
     const [sceneIncrementPlayCount] = useSceneIncrementPlayCount();
+    const [updateInterfaceConfig] = useConfigureInterface();
 
     const [time, setTime] = useState(0);
     const [ready, setReady] = useState(false);
@@ -389,6 +392,9 @@ export const ScenePlayer: React.FC<IScenePlayerProps> = PatchComponent(
           skipButtons: {},
           trackActivity: {},
           vrMenu: {},
+          autostartButton: {
+            enabled: interfaceConfig?.autostartVideo ?? false,
+          },
           abLoopPlugin: {
             start: 0,
             end: false,
@@ -434,6 +440,9 @@ export const ScenePlayer: React.FC<IScenePlayerProps> = PatchComponent(
       };
       // empty deps - only init once
       // showAbLoopControls is necessary to re-init the player when the config changes
+      // Note: interfaceConfig?.autostartVideo is intentionally excluded to prevent
+      // player re-initialization when toggling autostart (which would interrupt playback)
+      // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [uiConfig?.showAbLoopControls, uiConfig?.enableChromecast]);
 
     useEffect(() => {
@@ -675,11 +684,6 @@ export const ScenePlayer: React.FC<IScenePlayerProps> = PatchComponent(
         }
       }
 
-      auto.current =
-        autoplay ||
-        (interfaceConfig?.autostartVideo ?? false) ||
-        _initialTimestamp > 0;
-
       const alwaysStartFromBeginning =
         uiConfig?.alwaysStartFromBeginning ?? false;
       const resumeTime = scene.resume_time ?? 0;
@@ -698,6 +702,15 @@ export const ScenePlayer: React.FC<IScenePlayerProps> = PatchComponent(
       player.load();
       player.focus();
 
+      // Check the autostart button plugin for user preference
+      const autostartButton = player.autostartButton();
+      const buttonEnabled = autostartButton.getEnabled();
+      auto.current =
+        autoplay ||
+        buttonEnabled ||
+        (interfaceConfig?.autostartVideo ?? false) ||
+        _initialTimestamp > 0;
+
       player.ready(() => {
         player.vttThumbnails().src(scene.paths.vtt ?? null);
 
@@ -841,6 +854,30 @@ export const ScenePlayer: React.FC<IScenePlayerProps> = PatchComponent(
       sceneSaveActivity,
     ]);
 
+    // Sync autostart button with config changes
+    useEffect(() => {
+      const player = getPlayer();
+      if (!player) return;
+
+      async function updateAutoStart(enabled: boolean) {
+        await updateInterfaceConfig({
+          variables: {
+            input: {
+              autostartVideo: enabled,
+            },
+          },
+        });
+      }
+
+      const autostartButton = player.autostartButton();
+      if (autostartButton) {
+        autostartButton.syncWithConfig(
+          interfaceConfig?.autostartVideo ?? false
+        );
+        autostartButton.updateAutoStart = updateAutoStart;
+      }
+    }, [getPlayer, updateInterfaceConfig, interfaceConfig?.autostartVideo]);
+
     useEffect(() => {
       const player = getPlayer();
       if (!player) return;
diff --git a/ui/v2.5/src/components/ScenePlayer/autostart-button.ts b/ui/v2.5/src/components/ScenePlayer/autostart-button.ts
new file mode 100644
index 000000000..f5a35a63f
--- /dev/null
+++ b/ui/v2.5/src/components/ScenePlayer/autostart-button.ts
@@ -0,0 +1,126 @@
+/* eslint-disable @typescript-eslint/naming-convention */
+import videojs, { VideoJsPlayer } from "video.js";
+
+interface IAutostartButtonOptions {
+  enabled?: boolean;
+}
+
+interface AutostartButtonOptions extends videojs.ComponentOptions {
+  autostartEnabled: boolean;
+}
+
+class AutostartButton extends videojs.getComponent("Button") {
+  private autostartEnabled: boolean;
+
+  constructor(player: VideoJsPlayer, options: AutostartButtonOptions) {
+    super(player, options);
+    this.autostartEnabled = options.autostartEnabled;
+    this.updateIcon();
+  }
+
+  buildCSSClass() {
+    return `vjs-autostart-button ${super.buildCSSClass()}`;
+  }
+
+  private updateIcon() {
+    this.removeClass("vjs-icon-play-circle");
+    this.removeClass("vjs-icon-cancel");
+
+    if (this.autostartEnabled) {
+      this.addClass("vjs-icon-play-circle");
+      this.controlText(this.localize("Auto-start enabled (click to disable)"));
+    } else {
+      this.addClass("vjs-icon-cancel");
+      this.controlText(this.localize("Auto-start disabled (click to enable)"));
+    }
+  }
+
+  handleClick(event: Event) {
+    // Prevent the click from bubbling up and affecting the video player
+    event.stopPropagation();
+
+    this.autostartEnabled = !this.autostartEnabled;
+    this.updateIcon();
+    this.trigger("autostartchanged", { enabled: this.autostartEnabled });
+  }
+
+  public setEnabled(enabled: boolean) {
+    this.autostartEnabled = enabled;
+    this.updateIcon();
+  }
+}
+
+class AutostartButtonPlugin extends videojs.getPlugin("plugin") {
+  private button: AutostartButton;
+  private autostartEnabled: boolean;
+  updateAutoStart: (enabled: boolean) => Promise<void> = () => {
+    return Promise.resolve();
+  };
+
+  constructor(player: VideoJsPlayer, options?: IAutostartButtonOptions) {
+    super(player, options);
+
+    this.autostartEnabled = options?.enabled ?? false;
+
+    this.button = new AutostartButton(player, {
+      autostartEnabled: this.autostartEnabled,
+    });
+
+    player.ready(() => {
+      this.ready();
+    });
+  }
+
+  private ready() {
+    // Add button to control bar, before the fullscreen button
+    const { controlBar } = this.player;
+    const fullscreenToggle = controlBar.getChild("fullscreenToggle");
+    if (fullscreenToggle) {
+      controlBar.addChild(this.button);
+      controlBar.el().insertBefore(this.button.el(), fullscreenToggle.el());
+    } else {
+      controlBar.addChild(this.button);
+    }
+
+    // Listen for changes
+    this.button.on("autostartchanged", (_, data: { enabled: boolean }) => {
+      this.autostartEnabled = data.enabled;
+      this.updateAutoStart(this.autostartEnabled);
+    });
+  }
+
+  public isEnabled(): boolean {
+    return this.autostartEnabled;
+  }
+
+  public getEnabled(): boolean {
+    return this.autostartEnabled;
+  }
+
+  public setEnabled(enabled: boolean) {
+    this.autostartEnabled = enabled;
+    this.button.setEnabled(enabled);
+  }
+
+  public syncWithConfig(configEnabled: boolean) {
+    // Sync button state with external config changes
+    if (this.autostartEnabled !== configEnabled) {
+      this.setEnabled(configEnabled);
+    }
+  }
+}
+
+// Register the plugin with video.js.
+videojs.registerComponent("AutostartButton", AutostartButton);
+videojs.registerPlugin("autostartButton", AutostartButtonPlugin);
+
+declare module "video.js" {
+  interface VideoJsPlayer {
+    autostartButton: () => AutostartButtonPlugin;
+  }
+  interface VideoJsPlayerPluginOptions {
+    autostartButton?: IAutostartButtonOptions;
+  }
+}
+
+export default AutostartButtonPlugin;
diff --git a/ui/v2.5/src/components/ScenePlayer/styles.scss b/ui/v2.5/src/components/ScenePlayer/styles.scss
index 0e8041071..fc143a873 100644
--- a/ui/v2.5/src/components/ScenePlayer/styles.scss
+++ b/ui/v2.5/src/components/ScenePlayer/styles.scss
@@ -100,6 +100,57 @@ $sceneTabWidth: 450px;
     width: 1.6em;
   }
 
+  .vjs-autostart-button {
+    cursor: pointer;
+
+    &.vjs-icon-play-circle::before {
+      align-items: center;
+      background-color: rgba(255, 255, 255, 0.9);
+      border-radius: 50%;
+      color: rgba(80, 80, 80, 0.9);
+      content: "\f101";
+      font-size: 1em;
+      line-height: 1;
+      margin-left: 1rem;
+      padding: 0.3em;
+      position: relative;
+      z-index: 2;
+    }
+
+    &.vjs-icon-cancel::before {
+      align-items: center;
+      background-color: rgba(80, 80, 80, 0.9);
+      border-radius: 50%;
+      color: #fff;
+      content: "\f103";
+      font-size: 1em;
+      line-height: 1;
+      margin-right: 1rem;
+      padding: 0.3em;
+      position: relative;
+      z-index: 2;
+    }
+
+    &.vjs-icon-play-circle::after,
+    &.vjs-icon-cancel::after {
+      background-color: rgb(255 255 255 / 70%);
+      border-radius: 8px;
+      content: "";
+      height: 2.5rem;
+      left: 50%;
+      opacity: 0.7;
+      position: absolute;
+      top: 50%;
+      transform: translate(-50%, -50%) rotate(90deg);
+      width: 1rem;
+      z-index: 1;
+    }
+
+    &:hover {
+      text-shadow: 0 0 1em rgba(255, 255, 255, 0.75);
+    }
+  }
+
   .vjs-touch-overlay .vjs-play-control {
     z-index: 1;
   }
@@ -344,9 +395,16 @@ $sceneTabWidth: 450px;
       }
     }
   }
+  @media (max-width: 576px) {
+    .vjs-control-bar {
+      .vjs-autostart-button {
+        display: none;
+      }
+    }
+  }
 
   // make controls a little more compact on smaller screens
-  @media (max-width: 576px) {
+  @media (max-width: 768px) {
     .vjs-control-bar {
       .vjs-control {
         width: 2.5em;

From ba0102f2a651bf3e8cd55d35cdd7f07f126475c7 Mon Sep 17 00:00:00 2001
From: Gykes <24581046+Gykes@users.noreply.github.com>
Date: Wed, 10 Dec 2025 15:07:16 -0600
Subject: [PATCH 205/405] use initialstate for scene performers in tagger
 (#6391)

---
 .../src/components/Tagger/scenes/StashSearchResult.tsx   | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/ui/v2.5/src/components/Tagger/scenes/StashSearchResult.tsx b/ui/v2.5/src/components/Tagger/scenes/StashSearchResult.tsx
index 01ce23643..f37754b37 100755
--- a/ui/v2.5/src/components/Tagger/scenes/StashSearchResult.tsx
+++ b/ui/v2.5/src/components/Tagger/scenes/StashSearchResult.tsx
@@ -291,9 +291,8 @@ const StashSearchResult: React.FC<IStashSearchResultProps> = ({
   );
 
   // map of original performer to id
-  const [performerIDs, setPerformerIDs] = useState<(string | undefined)[]>(
-    getInitialPerformers()
-  );
+  const [performerIDs, setPerformerIDs, setInitialPerformerIDs] =
+    useInitialState<(string | undefined)[]>(getInitialPerformers());
 
   const [studioID, setStudioID] = useState<string | undefined>(
     getInitialStudio()
@@ -304,8 +303,8 @@ const StashSearchResult: React.FC<IStashSearchResultProps> = ({
   }, [getInitialTags, setInitialTagIDs]);
 
   useEffect(() => {
-    setPerformerIDs(getInitialPerformers());
-  }, [getInitialPerformers]);
+    setInitialPerformerIDs(getInitialPerformers());
+  }, [getInitialPerformers, setInitialPerformerIDs]);
 
   useEffect(() => {
     setStudioID(getInitialStudio());

From a4816b4cc95c72c9adcc4bd9613511d1213e0aea Mon Sep 17 00:00:00 2001
From: ghuds540 <ghuds540@gmail.com>
Date: Wed, 10 Dec 2025 16:22:29 -0500
Subject: [PATCH 206/405] Respect user preference for type-to-create in
 image/scene multi-select form (#6376)

---
 graphql/schema/types/config.graphql           |  2 +
 internal/api/resolver_mutation_configure.go   |  1 +
 internal/manager/config/config.go             |  2 +
 internal/manager/config/ui.go                 |  1 +
 ui/v2.5/graphql/data/config.graphql           |  1 +
 .../components/Galleries/GallerySelect.tsx    | 45 +++++++++
 .../SettingsInterfacePanel.tsx                | 13 +++
 ui/v2.5/src/components/Shared/MultiSet.tsx    | 99 ++++++++++++++-----
 ui/v2.5/src/components/Shared/Select.tsx      |  2 +-
 9 files changed, 140 insertions(+), 26 deletions(-)

diff --git a/graphql/schema/types/config.graphql b/graphql/schema/types/config.graphql
index e82ea93e2..b6f52091b 100644
--- a/graphql/schema/types/config.graphql
+++ b/graphql/schema/types/config.graphql
@@ -319,6 +319,7 @@ input ConfigDisableDropdownCreateInput {
   tag: Boolean
   studio: Boolean
   movie: Boolean
+  gallery: Boolean
 }
 
 enum ImageLightboxDisplayMode {
@@ -419,6 +420,7 @@ type ConfigDisableDropdownCreate {
   tag: Boolean!
   studio: Boolean!
   movie: Boolean!
+  gallery: Boolean!
 }
 
 type ConfigInterfaceResult {
diff --git a/internal/api/resolver_mutation_configure.go b/internal/api/resolver_mutation_configure.go
index b39cf373a..daed0b5b7 100644
--- a/internal/api/resolver_mutation_configure.go
+++ b/internal/api/resolver_mutation_configure.go
@@ -521,6 +521,7 @@ func (r *mutationResolver) ConfigureInterface(ctx context.Context, input ConfigI
 		r.setConfigBool(config.DisableDropdownCreateStudio, ddc.Studio)
 		r.setConfigBool(config.DisableDropdownCreateTag, ddc.Tag)
 		r.setConfigBool(config.DisableDropdownCreateMovie, ddc.Movie)
+		r.setConfigBool(config.DisableDropdownCreateGallery, ddc.Gallery)
 	}
 
 	r.setConfigString(config.HandyKey, input.HandyKey)
diff --git a/internal/manager/config/config.go b/internal/manager/config/config.go
index 73b9de3ab..2cc3994f4 100644
--- a/internal/manager/config/config.go
+++ b/internal/manager/config/config.go
@@ -219,6 +219,7 @@ const (
 	DisableDropdownCreateStudio    = "disable_dropdown_create.studio"
 	DisableDropdownCreateTag       = "disable_dropdown_create.tag"
 	DisableDropdownCreateMovie     = "disable_dropdown_create.movie"
+	DisableDropdownCreateGallery   = "disable_dropdown_create.gallery"
 
 	HandyKey                       = "handy_key"
 	FunscriptOffset                = "funscript_offset"
@@ -1311,6 +1312,7 @@ func (i *Config) GetDisableDropdownCreate() *ConfigDisableDropdownCreate {
 		Studio:    i.getBool(DisableDropdownCreateStudio),
 		Tag:       i.getBool(DisableDropdownCreateTag),
 		Movie:     i.getBool(DisableDropdownCreateMovie),
+		Gallery:   i.getBool(DisableDropdownCreateGallery),
 	}
 }
 
diff --git a/internal/manager/config/ui.go b/internal/manager/config/ui.go
index b7033f193..de769304f 100644
--- a/internal/manager/config/ui.go
+++ b/internal/manager/config/ui.go
@@ -105,4 +105,5 @@ type ConfigDisableDropdownCreate struct {
 	Tag       bool `json:"tag"`
 	Studio    bool `json:"studio"`
 	Movie     bool `json:"movie"`
+	Gallery   bool `json:"gallery"`
 }
diff --git a/ui/v2.5/graphql/data/config.graphql b/ui/v2.5/graphql/data/config.graphql
index 1c3e9dc1b..b65ba21cc 100644
--- a/ui/v2.5/graphql/data/config.graphql
+++ b/ui/v2.5/graphql/data/config.graphql
@@ -107,6 +107,7 @@ fragment ConfigInterfaceData on ConfigInterfaceResult {
     tag
     studio
     movie
+    gallery
   }
   handyKey
   funscriptOffset
diff --git a/ui/v2.5/src/components/Galleries/GallerySelect.tsx b/ui/v2.5/src/components/Galleries/GallerySelect.tsx
index c76266cf7..0e02b8cb3 100644
--- a/ui/v2.5/src/components/Galleries/GallerySelect.tsx
+++ b/ui/v2.5/src/components/Galleries/GallerySelect.tsx
@@ -11,6 +11,7 @@ import * as GQL from "src/core/generated-graphql";
 import {
   queryFindGalleriesForSelect,
   queryFindGalleriesByIDForSelect,
+  useGalleryCreate,
 } from "src/core/StashService";
 import { useConfigurationContext } from "src/hooks/Config";
 import { useIntl } from "react-intl";
@@ -70,10 +71,14 @@ const gallerySelectSort = PatchFunction(
 const _GallerySelect: React.FC<
   IFilterProps & IFilterValueProps<Gallery> & ExtraGalleryProps
 > = (props) => {
+  const [createGallery] = useGalleryCreate();
+
   const { configuration } = useConfigurationContext();
   const intl = useIntl();
   const maxOptionsShown =
     configuration?.ui.maxOptionsShown ?? defaultMaxOptionsShown;
+  const defaultCreatable =
+    !configuration?.interface.disableDropdownCreate.gallery;
 
   const exclude = useMemo(() => props.excludeIds ?? [], [props.excludeIds]);
 
@@ -203,6 +208,42 @@ const _GallerySelect: React.FC<
     return <reactSelectComponents.SingleValue {...thisOptionProps} />;
   };
 
+  const onCreate = async (name: string) => {
+    const result = await createGallery({
+      variables: { input: { title: name } },
+    });
+    return {
+      value: result.data!.galleryCreate!.id,
+      item: result.data!.galleryCreate!,
+      message: "Created gallery",
+    };
+  };
+
+  const getNamedObject = (id: string, name: string): Gallery => {
+    return {
+      id,
+      title: name,
+      files: [],
+      folder: null,
+    };
+  };
+
+  const isValidNewOption = (inputValue: string, options: Gallery[]) => {
+    if (!inputValue) {
+      return false;
+    }
+
+    if (
+      options.some((o) => {
+        return galleryTitle(o).toLowerCase() === inputValue.toLowerCase();
+      })
+    ) {
+      return false;
+    }
+
+    return true;
+  };
+
   return (
     <FilterSelectComponent<Gallery, boolean>
       {...props}
@@ -214,12 +255,16 @@ const _GallerySelect: React.FC<
         props.className
       )}
       loadOptions={loadGalleries}
+      getNamedObject={getNamedObject}
+      isValidNewOption={isValidNewOption}
       components={{
         Option: GalleryOption,
         MultiValueLabel: GalleryMultiValueLabel,
         SingleValue: GalleryValueLabel,
       }}
       isMulti={props.isMulti ?? false}
+      creatable={props.creatable ?? defaultCreatable}
+      onCreate={onCreate}
       placeholder={
         props.noSelectionString ??
         intl.formatMessage(
diff --git a/ui/v2.5/src/components/Settings/SettingsInterfacePanel/SettingsInterfacePanel.tsx b/ui/v2.5/src/components/Settings/SettingsInterfacePanel/SettingsInterfacePanel.tsx
index bbc334a96..7b3f936d3 100644
--- a/ui/v2.5/src/components/Settings/SettingsInterfacePanel/SettingsInterfacePanel.tsx
+++ b/ui/v2.5/src/components/Settings/SettingsInterfacePanel/SettingsInterfacePanel.tsx
@@ -735,6 +735,19 @@ export const SettingsInterfacePanel: React.FC = PatchComponent(
                 })
               }
             />
+            <BooleanSetting
+              id="disableDropdownCreate_gallery"
+              headingID="gallery"
+              checked={iface.disableDropdownCreate?.gallery ?? undefined}
+              onChange={(v) =>
+                saveInterface({
+                  disableDropdownCreate: {
+                    ...iface.disableDropdownCreate,
+                    gallery: v,
+                  },
+                })
+              }
+            />
           </div>
           <NumberSetting
             id="max_options_shown"
diff --git a/ui/v2.5/src/components/Shared/MultiSet.tsx b/ui/v2.5/src/components/Shared/MultiSet.tsx
index b18c4087a..6be85b8b3 100644
--- a/ui/v2.5/src/components/Shared/MultiSet.tsx
+++ b/ui/v2.5/src/components/Shared/MultiSet.tsx
@@ -8,6 +8,10 @@ import {
   GalleryIDSelect,
   excludeFileBasedGalleries,
 } from "../Galleries/GallerySelect";
+import { PerformerIDSelect } from "../Performers/PerformerSelect";
+import { StudioIDSelect } from "../Studios/StudioSelect";
+import { TagIDSelect } from "../Tags/TagSelect";
+import { GroupIDSelect } from "../Groups/GroupSelect";
 
 interface IMultiSetProps {
   type: "performers" | "studios" | "tags" | "groups" | "galleries";
@@ -27,32 +31,77 @@ const Select: React.FC<IMultiSetProps> = (props) => {
     props.onUpdate(items.map((i) => i.id));
   }
 
-  if (type === "galleries") {
-    return (
-      <GalleryIDSelect
-        isDisabled={disabled}
-        isMulti
-        isClearable={false}
-        onSelect={onUpdate}
-        ids={props.ids ?? []}
-        // exclude file-based galleries when setting galleries
-        extraCriteria={excludeFileBasedGalleries}
-        menuPortalTarget={props.menuPortalTarget}
-      />
-    );
+  switch (type) {
+    case "performers":
+      return (
+        <PerformerIDSelect
+          isDisabled={disabled}
+          isMulti
+          isClearable={false}
+          onSelect={onUpdate}
+          ids={props.ids ?? []}
+          menuPortalTarget={props.menuPortalTarget}
+        />
+      );
+    case "studios":
+      return (
+        <StudioIDSelect
+          isDisabled={disabled}
+          isMulti
+          isClearable={false}
+          onSelect={onUpdate}
+          ids={props.ids ?? []}
+          menuPortalTarget={props.menuPortalTarget}
+        />
+      );
+    case "tags":
+      return (
+        <TagIDSelect
+          isDisabled={disabled}
+          isMulti
+          isClearable={false}
+          onSelect={onUpdate}
+          ids={props.ids ?? []}
+          menuPortalTarget={props.menuPortalTarget}
+        />
+      );
+    case "groups":
+      return (
+        <GroupIDSelect
+          isDisabled={disabled}
+          isMulti
+          isClearable={false}
+          onSelect={onUpdate}
+          ids={props.ids ?? []}
+          menuPortalTarget={props.menuPortalTarget}
+        />
+      );
+    case "galleries":
+      return (
+        <GalleryIDSelect
+          isDisabled={disabled}
+          isMulti
+          isClearable={false}
+          onSelect={onUpdate}
+          ids={props.ids ?? []}
+          // exclude file-based galleries when setting galleries
+          extraCriteria={excludeFileBasedGalleries}
+          menuPortalTarget={props.menuPortalTarget}
+        />
+      );
+    default:
+      return (
+        <FilterSelect
+          type={type}
+          isDisabled={disabled}
+          isMulti
+          isClearable={false}
+          onSelect={onUpdate}
+          ids={props.ids ?? []}
+          menuPortalTarget={props.menuPortalTarget}
+        />
+      );
   }
-
-  return (
-    <FilterSelect
-      type={type}
-      isDisabled={disabled}
-      isMulti
-      isClearable={false}
-      onSelect={onUpdate}
-      ids={props.ids ?? []}
-      menuPortalTarget={props.menuPortalTarget}
-    />
-  );
 };
 
 function getModeText(intl: IntlShape, mode: GQL.BulkUpdateIdMode) {
diff --git a/ui/v2.5/src/components/Shared/Select.tsx b/ui/v2.5/src/components/Shared/Select.tsx
index 4eea52a38..ec0fb4ea9 100644
--- a/ui/v2.5/src/components/Shared/Select.tsx
+++ b/ui/v2.5/src/components/Shared/Select.tsx
@@ -385,7 +385,7 @@ export const FilterSelect: React.FC<IFilterProps & ITypeProps> = (props) => {
     case "groups":
       return <GroupSelect {...props} creatable={false} />;
     case "galleries":
-      return <GallerySelect {...props} />;
+      return <GallerySelect {...props} creatable={false} />;
     default:
       return <TagSelect {...props} creatable={false} />;
   }

From 5f0d4e811d137d5ce27cf2825b06a641d722d7a5 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Thu, 11 Dec 2025 11:38:20 +1100
Subject: [PATCH 207/405] Revert "Feature Request: Sort All Urls Alphabetically
 (#6352)" (#6396)

This reverts commit 061d21dede815f7835f6007419e9791533817fda.
---
 .../Galleries/GalleryDetails/GalleryEditPanel.tsx  |  3 +--
 .../Groups/GroupDetails/GroupEditPanel.tsx         |  3 +--
 .../Images/ImageDetails/ImageEditPanel.tsx         |  3 +--
 .../PerformerDetails/PerformerEditPanel.tsx        |  3 +--
 .../Scenes/SceneDetails/SceneEditPanel.tsx         |  3 +--
 .../src/components/Shared/ExternalLinksButton.tsx  |  7 ++-----
 .../Studios/StudioDetails/StudioDetailsPanel.tsx   |  9 +++------
 .../Studios/StudioDetails/StudioEditPanel.tsx      |  3 +--
 ui/v2.5/src/utils/url.ts                           | 14 --------------
 9 files changed, 11 insertions(+), 37 deletions(-)
 delete mode 100644 ui/v2.5/src/utils/url.ts

diff --git a/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryEditPanel.tsx b/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryEditPanel.tsx
index 05385aaa4..5b9fa9da1 100644
--- a/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryEditPanel.tsx
+++ b/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryEditPanel.tsx
@@ -31,7 +31,6 @@ import { Studio, StudioSelect } from "src/components/Studios/StudioSelect";
 import { Scene, SceneSelect } from "src/components/Scenes/SceneSelect";
 import { useTagsEdit } from "src/hooks/tagsEdit";
 import { ScraperMenu } from "src/components/Shared/ScraperMenu";
-import { sortURLs } from "src/utils/url";
 
 interface IProps {
   gallery: Partial<GQL.GalleryDataFragment>;
@@ -82,7 +81,7 @@ export const GalleryEditPanel: React.FC<IProps> = ({
   const initialValues = {
     title: gallery?.title ?? "",
     code: gallery?.code ?? "",
-    urls: sortURLs(gallery?.urls ?? []),
+    urls: gallery?.urls ?? [],
     date: gallery?.date ?? "",
     photographer: gallery?.photographer ?? "",
     studio_id: gallery?.studio?.id ?? null,
diff --git a/ui/v2.5/src/components/Groups/GroupDetails/GroupEditPanel.tsx b/ui/v2.5/src/components/Groups/GroupDetails/GroupEditPanel.tsx
index 6f548027f..0b94baf27 100644
--- a/ui/v2.5/src/components/Groups/GroupDetails/GroupEditPanel.tsx
+++ b/ui/v2.5/src/components/Groups/GroupDetails/GroupEditPanel.tsx
@@ -28,7 +28,6 @@ import { Studio, StudioSelect } from "src/components/Studios/StudioSelect";
 import { useTagsEdit } from "src/hooks/tagsEdit";
 import { Group } from "src/components/Groups/GroupSelect";
 import { RelatedGroupTable, IRelatedGroupEntry } from "./RelatedGroupTable";
-import { sortURLs } from "src/utils/url";
 
 interface IGroupEditPanel {
   group: Partial<GQL.GroupDataFragment>;
@@ -98,7 +97,7 @@ export const GroupEditPanel: React.FC<IGroupEditPanel> = ({
       return { group_id: m.group.id, description: m.description ?? "" };
     }),
     director: group?.director ?? "",
-    urls: sortURLs(group?.urls ?? []),
+    urls: group?.urls ?? [],
     synopsis: group?.synopsis ?? "",
   };
 
diff --git a/ui/v2.5/src/components/Images/ImageDetails/ImageEditPanel.tsx b/ui/v2.5/src/components/Images/ImageDetails/ImageEditPanel.tsx
index 83fc0343c..f2771f542 100644
--- a/ui/v2.5/src/components/Images/ImageDetails/ImageEditPanel.tsx
+++ b/ui/v2.5/src/components/Images/ImageDetails/ImageEditPanel.tsx
@@ -35,7 +35,6 @@ import {
 } from "src/components/Galleries/GallerySelect";
 import { useTagsEdit } from "src/hooks/tagsEdit";
 import { ScraperMenu } from "src/components/Shared/ScraperMenu";
-import { sortURLs } from "src/utils/url";
 
 interface IProps {
   image: GQL.ImageDataFragment;
@@ -92,7 +91,7 @@ export const ImageEditPanel: React.FC<IProps> = ({
   const initialValues = {
     title: image.title ?? "",
     code: image.code ?? "",
-    urls: sortURLs(image?.urls ?? []),
+    urls: image?.urls ?? [],
     date: image?.date ?? "",
     details: image.details ?? "",
     photographer: image.photographer ?? "",
diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
index 969af6633..8d1352da0 100644
--- a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
@@ -48,7 +48,6 @@ import {
   yupUniqueStringList,
 } from "src/utils/yup";
 import { useTagsEdit } from "src/hooks/tagsEdit";
-import { sortURLs } from "src/utils/url";
 import { CustomFieldsInput } from "src/components/Shared/CustomFields";
 import { cloneDeep } from "@apollo/client/utilities";
 
@@ -154,7 +153,7 @@ export const PerformerEditPanel: React.FC<IPerformerDetails> = ({
     tattoos: performer.tattoos ?? "",
     piercings: performer.piercings ?? "",
     career_length: performer.career_length ?? "",
-    urls: sortURLs(performer.urls ?? []),
+    urls: performer.urls ?? [],
     details: performer.details ?? "",
     tag_ids: (performer.tags ?? []).map((t) => t.id),
     ignore_auto_tag: performer.ignore_auto_tag ?? false,
diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/SceneEditPanel.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/SceneEditPanel.tsx
index 87968c009..11575ea7b 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/SceneEditPanel.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/SceneEditPanel.tsx
@@ -42,7 +42,6 @@ import { Group } from "src/components/Groups/GroupSelect";
 import { useTagsEdit } from "src/hooks/tagsEdit";
 import { ScraperMenu } from "src/components/Shared/ScraperMenu";
 import StashBoxIDSearchModal from "src/components/Shared/StashBoxIDSearchModal";
-import { sortURLs } from "src/utils/url";
 
 const SceneScrapeDialog = lazyComponent(() => import("./SceneScrapeDialog"));
 const SceneQueryModal = lazyComponent(() => import("./SceneQueryModal"));
@@ -139,7 +138,7 @@ export const SceneEditPanel: React.FC<IProps> = ({
     () => ({
       title: scene.title ?? "",
       code: scene.code ?? "",
-      urls: sortURLs(scene.urls ?? []),
+      urls: scene.urls ?? [],
       date: scene.date ?? "",
       director: scene.director ?? "",
       gallery_ids: (scene.galleries ?? []).map((g) => g.id),
diff --git a/ui/v2.5/src/components/Shared/ExternalLinksButton.tsx b/ui/v2.5/src/components/Shared/ExternalLinksButton.tsx
index e71419514..e35a1a992 100644
--- a/ui/v2.5/src/components/Shared/ExternalLinksButton.tsx
+++ b/ui/v2.5/src/components/Shared/ExternalLinksButton.tsx
@@ -7,7 +7,6 @@ import { useMemo } from "react";
 import { faInstagram, faTwitter } from "@fortawesome/free-brands-svg-icons";
 import ReactDOM from "react-dom";
 import { PatchComponent } from "src/patch";
-import { sortURLs } from "src/utils/url";
 
 export const ExternalLinksButton: React.FC<{
   icon?: IconDefinition;
@@ -17,16 +16,14 @@ export const ExternalLinksButton: React.FC<{
 }> = PatchComponent(
   "ExternalLinksButton",
   ({ urls, icon = faLink, className = "", openIfSingle = false }) => {
-    const sortedUrls = useMemo(() => sortURLs(urls), [urls]);
-
-    if (!sortedUrls.length) {
+    if (!urls.length) {
       return null;
     }
 
     const Menu = () =>
       ReactDOM.createPortal(
         <Dropdown.Menu>
-          {sortedUrls.map((url) => (
+          {urls.map((url) => (
             <Dropdown.Item
               key={url}
               as={ExternalLink}
diff --git a/ui/v2.5/src/components/Studios/StudioDetails/StudioDetailsPanel.tsx b/ui/v2.5/src/components/Studios/StudioDetails/StudioDetailsPanel.tsx
index 1c59f50a9..4d5af043f 100644
--- a/ui/v2.5/src/components/Studios/StudioDetails/StudioDetailsPanel.tsx
+++ b/ui/v2.5/src/components/Studios/StudioDetails/StudioDetailsPanel.tsx
@@ -1,10 +1,9 @@
-import React, { useMemo } from "react";
+import React from "react";
 import { TagLink } from "src/components/Shared/TagLink";
 import * as GQL from "src/core/generated-graphql";
 import { DetailItem } from "src/components/Shared/DetailItem";
 import { StashIDPill } from "src/components/Shared/StashID";
 import { Link } from "react-router-dom";
-import { sortURLs } from "src/utils/url";
 
 interface IStudioDetailsPanel {
   studio: GQL.StudioDataFragment;
@@ -47,16 +46,14 @@ export const StudioDetailsPanel: React.FC<IStudioDetailsPanel> = ({
     );
   }
 
-  const sortedURLs = useMemo(() => sortURLs(studio.urls ?? []), [studio.urls]);
-
   function renderURLs() {
-    if (!sortedURLs.length) {
+    if (!studio.urls?.length) {
       return;
     }
 
     return (
       <ul className="pl-0">
-        {sortedURLs.map((url) => (
+        {studio.urls.map((url) => (
           <li key={url}>
             <a href={url} target="_blank" rel="noreferrer">
               {url}
diff --git a/ui/v2.5/src/components/Studios/StudioDetails/StudioEditPanel.tsx b/ui/v2.5/src/components/Studios/StudioDetails/StudioEditPanel.tsx
index e351e3819..c8cfd3a3e 100644
--- a/ui/v2.5/src/components/Studios/StudioDetails/StudioEditPanel.tsx
+++ b/ui/v2.5/src/components/Studios/StudioDetails/StudioEditPanel.tsx
@@ -21,7 +21,6 @@ import { Studio, StudioSelect } from "../StudioSelect";
 import { useTagsEdit } from "src/hooks/tagsEdit";
 import { Icon } from "src/components/Shared/Icon";
 import StashBoxIDSearchModal from "src/components/Shared/StashBoxIDSearchModal";
-import { sortURLs } from "src/utils/url";
 
 interface IStudioEditPanel {
   studio: Partial<GQL.StudioDataFragment>;
@@ -69,7 +68,7 @@ export const StudioEditPanel: React.FC<IStudioEditPanel> = ({
   const initialValues = {
     id: studio.id,
     name: studio.name ?? "",
-    urls: sortURLs(studio.urls ?? []),
+    urls: studio.urls ?? [],
     details: studio.details ?? "",
     parent_id: studio.parent_studio?.id ?? null,
     aliases: studio.aliases ?? [],
diff --git a/ui/v2.5/src/utils/url.ts b/ui/v2.5/src/utils/url.ts
deleted file mode 100644
index ee6c0dd36..000000000
--- a/ui/v2.5/src/utils/url.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * Extracts the sortable portion of a URL by removing the protocol and www. prefix
- */
-const urlSortKey = (url: string): string =>
-  url.toLowerCase().replace(/^(https?:\/\/)?(www\.)?/, "");
-
-/**
- * Sorts a list of URLs alphabetically by their base URL,
- * excluding the protocol (http/https) and www. prefix.
- * Returns a new sorted array without mutating the original.
- */
-export function sortURLs(urls: string[]): string[] {
-  return [...urls].sort((a, b) => urlSortKey(a).localeCompare(urlSortKey(b)));
-}

From 0980daa99e9d81bcdd37aa5268b623fd894c30c5 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Thu, 11 Dec 2025 11:45:56 +1100
Subject: [PATCH 208/405] Fix issues linking a tag that already exists in the
 tag list (#6395)

* Add stash-id to existing when linking tag
* Validate id list for duplicates in find queries
* Filter out duplicate ids after linking tag
---
 internal/api/input.go                         | 35 +++++++++++++++++++
 internal/api/resolver_query_find_folder.go    |  3 +-
 internal/api/resolver_query_find_gallery.go   |  3 +-
 internal/api/resolver_query_find_group.go     |  3 +-
 internal/api/resolver_query_find_image.go     |  3 +-
 internal/api/resolver_query_find_movie.go     |  3 +-
 internal/api/resolver_query_find_performer.go |  3 +-
 internal/api/resolver_query_find_scene.go     |  3 +-
 .../api/resolver_query_find_scene_marker.go   |  3 +-
 internal/api/resolver_query_find_studio.go    |  3 +-
 internal/api/resolver_query_find_tag.go       |  3 +-
 ui/v2.5/graphql/data/tag-slim.graphql         |  6 ++++
 ui/v2.5/graphql/data/tag.graphql              |  6 ++++
 .../Scenes/SceneDetails/SceneMarkerForm.tsx   |  5 ++-
 .../ScrapeDialog/CreateLinkTagDialog.tsx      |  6 +++-
 .../Tagger/scenes/StashSearchResult.tsx       |  2 +-
 ui/v2.5/src/components/Tags/TagSelect.tsx     |  3 +-
 ui/v2.5/src/hooks/tagsEdit.tsx                |  2 ++
 18 files changed, 71 insertions(+), 24 deletions(-)
 create mode 100644 internal/api/input.go

diff --git a/internal/api/input.go b/internal/api/input.go
new file mode 100644
index 000000000..1a720e965
--- /dev/null
+++ b/internal/api/input.go
@@ -0,0 +1,35 @@
+package api
+
+import (
+	"fmt"
+
+	"github.com/stashapp/stash/pkg/sliceutil/stringslice"
+)
+
+// TODO - apply handleIDs to other resolvers that accept ID lists
+
+// handleIDList validates and converts a list of string IDs to integers
+func handleIDList(idList []string, field string) ([]int, error) {
+	if err := validateIDList(idList); err != nil {
+		return nil, fmt.Errorf("validating %s: %w", field, err)
+	}
+
+	ids, err := stringslice.StringSliceToIntSlice(idList)
+	if err != nil {
+		return nil, fmt.Errorf("converting %s: %w", field, err)
+	}
+
+	return ids, nil
+}
+
+// validateIDList returns an error if there are any duplicate ids in the list
+func validateIDList(ids []string) error {
+	seen := make(map[string]struct{})
+	for _, id := range ids {
+		if _, exists := seen[id]; exists {
+			return fmt.Errorf("duplicate id found: %s", id)
+		}
+		seen[id] = struct{}{}
+	}
+	return nil
+}
diff --git a/internal/api/resolver_query_find_folder.go b/internal/api/resolver_query_find_folder.go
index d6832b7c9..60088e2a3 100644
--- a/internal/api/resolver_query_find_folder.go
+++ b/internal/api/resolver_query_find_folder.go
@@ -6,7 +6,6 @@ import (
 	"strconv"
 
 	"github.com/stashapp/stash/pkg/models"
-	"github.com/stashapp/stash/pkg/sliceutil/stringslice"
 )
 
 func (r *queryResolver) FindFolder(ctx context.Context, id *string, path *string) (*models.Folder, error) {
@@ -49,7 +48,7 @@ func (r *queryResolver) FindFolders(
 ) (ret *FindFoldersResultType, err error) {
 	var folderIDs []models.FolderID
 	if len(ids) > 0 {
-		folderIDsInt, err := stringslice.StringSliceToIntSlice(ids)
+		folderIDsInt, err := handleIDList(ids, "ids")
 		if err != nil {
 			return nil, err
 		}
diff --git a/internal/api/resolver_query_find_gallery.go b/internal/api/resolver_query_find_gallery.go
index 724a48b12..09c0387cd 100644
--- a/internal/api/resolver_query_find_gallery.go
+++ b/internal/api/resolver_query_find_gallery.go
@@ -5,7 +5,6 @@ import (
 	"strconv"
 
 	"github.com/stashapp/stash/pkg/models"
-	"github.com/stashapp/stash/pkg/sliceutil/stringslice"
 )
 
 func (r *queryResolver) FindGallery(ctx context.Context, id string) (ret *models.Gallery, err error) {
@@ -25,7 +24,7 @@ func (r *queryResolver) FindGallery(ctx context.Context, id string) (ret *models
 }
 
 func (r *queryResolver) FindGalleries(ctx context.Context, galleryFilter *models.GalleryFilterType, filter *models.FindFilterType, ids []string) (ret *FindGalleriesResultType, err error) {
-	idInts, err := stringslice.StringSliceToIntSlice(ids)
+	idInts, err := handleIDList(ids, "ids")
 	if err != nil {
 		return nil, err
 	}
diff --git a/internal/api/resolver_query_find_group.go b/internal/api/resolver_query_find_group.go
index 6f8a6c6ba..14d282379 100644
--- a/internal/api/resolver_query_find_group.go
+++ b/internal/api/resolver_query_find_group.go
@@ -5,7 +5,6 @@ import (
 	"strconv"
 
 	"github.com/stashapp/stash/pkg/models"
-	"github.com/stashapp/stash/pkg/sliceutil/stringslice"
 )
 
 func (r *queryResolver) FindGroup(ctx context.Context, id string) (ret *models.Group, err error) {
@@ -25,7 +24,7 @@ func (r *queryResolver) FindGroup(ctx context.Context, id string) (ret *models.G
 }
 
 func (r *queryResolver) FindGroups(ctx context.Context, groupFilter *models.GroupFilterType, filter *models.FindFilterType, ids []string) (ret *FindGroupsResultType, err error) {
-	idInts, err := stringslice.StringSliceToIntSlice(ids)
+	idInts, err := handleIDList(ids, "ids")
 	if err != nil {
 		return nil, err
 	}
diff --git a/internal/api/resolver_query_find_image.go b/internal/api/resolver_query_find_image.go
index 48b926345..90eaf33c0 100644
--- a/internal/api/resolver_query_find_image.go
+++ b/internal/api/resolver_query_find_image.go
@@ -7,7 +7,6 @@ import (
 
 	"github.com/99designs/gqlgen/graphql"
 	"github.com/stashapp/stash/pkg/models"
-	"github.com/stashapp/stash/pkg/sliceutil/stringslice"
 )
 
 func (r *queryResolver) FindImage(ctx context.Context, id *string, checksum *string) (*models.Image, error) {
@@ -55,7 +54,7 @@ func (r *queryResolver) FindImages(
 	filter *models.FindFilterType,
 ) (ret *FindImagesResultType, err error) {
 	if len(ids) > 0 {
-		imageIds, err = stringslice.StringSliceToIntSlice(ids)
+		imageIds, err = handleIDList(ids, "ids")
 		if err != nil {
 			return nil, err
 		}
diff --git a/internal/api/resolver_query_find_movie.go b/internal/api/resolver_query_find_movie.go
index 2f80d6f59..c9dd3f846 100644
--- a/internal/api/resolver_query_find_movie.go
+++ b/internal/api/resolver_query_find_movie.go
@@ -5,7 +5,6 @@ import (
 	"strconv"
 
 	"github.com/stashapp/stash/pkg/models"
-	"github.com/stashapp/stash/pkg/sliceutil/stringslice"
 )
 
 func (r *queryResolver) FindMovie(ctx context.Context, id string) (ret *models.Group, err error) {
@@ -25,7 +24,7 @@ func (r *queryResolver) FindMovie(ctx context.Context, id string) (ret *models.G
 }
 
 func (r *queryResolver) FindMovies(ctx context.Context, movieFilter *models.GroupFilterType, filter *models.FindFilterType, ids []string) (ret *FindMoviesResultType, err error) {
-	idInts, err := stringslice.StringSliceToIntSlice(ids)
+	idInts, err := handleIDList(ids, "ids")
 	if err != nil {
 		return nil, err
 	}
diff --git a/internal/api/resolver_query_find_performer.go b/internal/api/resolver_query_find_performer.go
index 150c99d20..7ea1f90c8 100644
--- a/internal/api/resolver_query_find_performer.go
+++ b/internal/api/resolver_query_find_performer.go
@@ -5,7 +5,6 @@ import (
 	"strconv"
 
 	"github.com/stashapp/stash/pkg/models"
-	"github.com/stashapp/stash/pkg/sliceutil/stringslice"
 )
 
 func (r *queryResolver) FindPerformer(ctx context.Context, id string) (ret *models.Performer, err error) {
@@ -26,7 +25,7 @@ func (r *queryResolver) FindPerformer(ctx context.Context, id string) (ret *mode
 
 func (r *queryResolver) FindPerformers(ctx context.Context, performerFilter *models.PerformerFilterType, filter *models.FindFilterType, performerIDs []int, ids []string) (ret *FindPerformersResultType, err error) {
 	if len(ids) > 0 {
-		performerIDs, err = stringslice.StringSliceToIntSlice(ids)
+		performerIDs, err = handleIDList(ids, "ids")
 		if err != nil {
 			return nil, err
 		}
diff --git a/internal/api/resolver_query_find_scene.go b/internal/api/resolver_query_find_scene.go
index 44b5cfd5e..135ec43b7 100644
--- a/internal/api/resolver_query_find_scene.go
+++ b/internal/api/resolver_query_find_scene.go
@@ -9,7 +9,6 @@ import (
 
 	"github.com/stashapp/stash/pkg/models"
 	"github.com/stashapp/stash/pkg/scene"
-	"github.com/stashapp/stash/pkg/sliceutil/stringslice"
 )
 
 func (r *queryResolver) FindScene(ctx context.Context, id *string, checksum *string) (*models.Scene, error) {
@@ -83,7 +82,7 @@ func (r *queryResolver) FindScenes(
 	filter *models.FindFilterType,
 ) (ret *FindScenesResultType, err error) {
 	if len(ids) > 0 {
-		sceneIDs, err = stringslice.StringSliceToIntSlice(ids)
+		sceneIDs, err = handleIDList(ids, "ids")
 		if err != nil {
 			return nil, err
 		}
diff --git a/internal/api/resolver_query_find_scene_marker.go b/internal/api/resolver_query_find_scene_marker.go
index d3e47ce8d..e244bafef 100644
--- a/internal/api/resolver_query_find_scene_marker.go
+++ b/internal/api/resolver_query_find_scene_marker.go
@@ -4,11 +4,10 @@ import (
 	"context"
 
 	"github.com/stashapp/stash/pkg/models"
-	"github.com/stashapp/stash/pkg/sliceutil/stringslice"
 )
 
 func (r *queryResolver) FindSceneMarkers(ctx context.Context, sceneMarkerFilter *models.SceneMarkerFilterType, filter *models.FindFilterType, ids []string) (ret *FindSceneMarkersResultType, err error) {
-	idInts, err := stringslice.StringSliceToIntSlice(ids)
+	idInts, err := handleIDList(ids, "ids")
 	if err != nil {
 		return nil, err
 	}
diff --git a/internal/api/resolver_query_find_studio.go b/internal/api/resolver_query_find_studio.go
index 843592953..636772fe8 100644
--- a/internal/api/resolver_query_find_studio.go
+++ b/internal/api/resolver_query_find_studio.go
@@ -5,7 +5,6 @@ import (
 	"strconv"
 
 	"github.com/stashapp/stash/pkg/models"
-	"github.com/stashapp/stash/pkg/sliceutil/stringslice"
 )
 
 func (r *queryResolver) FindStudio(ctx context.Context, id string) (ret *models.Studio, err error) {
@@ -26,7 +25,7 @@ func (r *queryResolver) FindStudio(ctx context.Context, id string) (ret *models.
 }
 
 func (r *queryResolver) FindStudios(ctx context.Context, studioFilter *models.StudioFilterType, filter *models.FindFilterType, ids []string) (ret *FindStudiosResultType, err error) {
-	idInts, err := stringslice.StringSliceToIntSlice(ids)
+	idInts, err := handleIDList(ids, "ids")
 	if err != nil {
 		return nil, err
 	}
diff --git a/internal/api/resolver_query_find_tag.go b/internal/api/resolver_query_find_tag.go
index f0e1d8b97..7dca0b481 100644
--- a/internal/api/resolver_query_find_tag.go
+++ b/internal/api/resolver_query_find_tag.go
@@ -5,7 +5,6 @@ import (
 	"strconv"
 
 	"github.com/stashapp/stash/pkg/models"
-	"github.com/stashapp/stash/pkg/sliceutil/stringslice"
 )
 
 func (r *queryResolver) FindTag(ctx context.Context, id string) (ret *models.Tag, err error) {
@@ -25,7 +24,7 @@ func (r *queryResolver) FindTag(ctx context.Context, id string) (ret *models.Tag
 }
 
 func (r *queryResolver) FindTags(ctx context.Context, tagFilter *models.TagFilterType, filter *models.FindFilterType, ids []string) (ret *FindTagsResultType, err error) {
-	idInts, err := stringslice.StringSliceToIntSlice(ids)
+	idInts, err := handleIDList(ids, "ids")
 	if err != nil {
 		return nil, err
 	}
diff --git a/ui/v2.5/graphql/data/tag-slim.graphql b/ui/v2.5/graphql/data/tag-slim.graphql
index 3c498539b..3aca74f16 100644
--- a/ui/v2.5/graphql/data/tag-slim.graphql
+++ b/ui/v2.5/graphql/data/tag-slim.graphql
@@ -6,4 +6,10 @@ fragment SlimTagData on Tag {
   image_path
   parent_count
   child_count
+
+  stash_ids {
+    endpoint
+    stash_id
+    updated_at
+  }
 }
diff --git a/ui/v2.5/graphql/data/tag.graphql b/ui/v2.5/graphql/data/tag.graphql
index 2395f48bd..e0f432b67 100644
--- a/ui/v2.5/graphql/data/tag.graphql
+++ b/ui/v2.5/graphql/data/tag.graphql
@@ -50,4 +50,10 @@ fragment SelectTagData on Tag {
     name
     sort_name
   }
+
+  stash_ids {
+    endpoint
+    stash_id
+    updated_at
+  }
 }
diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/SceneMarkerForm.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/SceneMarkerForm.tsx
index 1670bcc7b..ef1a2e7e1 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/SceneMarkerForm.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/SceneMarkerForm.tsx
@@ -96,7 +96,9 @@ export const SceneMarkerForm: React.FC<ISceneMarkerForm> = ({
 
   useEffect(() => {
     setPrimaryTag(
-      marker?.primary_tag ? { ...marker.primary_tag, aliases: [] } : undefined
+      marker?.primary_tag
+        ? { ...marker.primary_tag, aliases: [], stash_ids: [] }
+        : undefined
     );
   }, [marker?.primary_tag]);
 
@@ -105,6 +107,7 @@ export const SceneMarkerForm: React.FC<ISceneMarkerForm> = ({
       marker?.tags.map((t) => ({
         ...t,
         aliases: [],
+        stash_ids: [],
       })) ?? []
     );
   }, [marker?.tags]);
diff --git a/ui/v2.5/src/components/Shared/ScrapeDialog/CreateLinkTagDialog.tsx b/ui/v2.5/src/components/Shared/ScrapeDialog/CreateLinkTagDialog.tsx
index 73ba53dde..b5b19d913 100644
--- a/ui/v2.5/src/components/Shared/ScrapeDialog/CreateLinkTagDialog.tsx
+++ b/ui/v2.5/src/components/Shared/ScrapeDialog/CreateLinkTagDialog.tsx
@@ -45,9 +45,13 @@ export const CreateLinkTagDialog: React.FC<{
         aliases: addAsAlias
           ? [...(existingTag.aliases || []), tag.name]
           : undefined,
+        // add stash id if applicable
         stash_ids:
           endpoint && tag.remote_site_id
-            ? [{ endpoint: endpoint!, stash_id: tag.remote_site_id }]
+            ? [
+                ...(existingTag.stash_ids || []),
+                { endpoint: endpoint!, stash_id: tag.remote_site_id },
+              ]
             : undefined,
       };
       onClose({ update: updateInput });
diff --git a/ui/v2.5/src/components/Tagger/scenes/StashSearchResult.tsx b/ui/v2.5/src/components/Tagger/scenes/StashSearchResult.tsx
index f37754b37..4e7184fd6 100755
--- a/ui/v2.5/src/components/Tagger/scenes/StashSearchResult.tsx
+++ b/ui/v2.5/src/components/Tagger/scenes/StashSearchResult.tsx
@@ -467,7 +467,7 @@ const StashSearchResult: React.FC<IStashSearchResultProps> = ({
     updateInput: GQL.TagUpdateInput
   ) {
     await updateTag(t, updateInput);
-    setTagIDs([...tagIDs, updateInput.id]);
+    setTagIDs(uniq([...tagIDs, updateInput.id]));
   }
 
   function showTagModal(t: GQL.ScrapedTag) {
diff --git a/ui/v2.5/src/components/Tags/TagSelect.tsx b/ui/v2.5/src/components/Tags/TagSelect.tsx
index 5b8da7a6d..c9ed83fea 100644
--- a/ui/v2.5/src/components/Tags/TagSelect.tsx
+++ b/ui/v2.5/src/components/Tags/TagSelect.tsx
@@ -38,7 +38,7 @@ export type SelectObject = {
 
 export type Tag = Pick<
   GQL.Tag,
-  "id" | "name" | "sort_name" | "aliases" | "image_path"
+  "id" | "name" | "sort_name" | "aliases" | "image_path" | "stash_ids"
 >;
 type Option = SelectOption<Tag>;
 
@@ -198,6 +198,7 @@ const _TagSelect: React.FC<TagSelectProps> = (props) => {
       id,
       name,
       aliases: [],
+      stash_ids: [],
     };
   };
 
diff --git a/ui/v2.5/src/hooks/tagsEdit.tsx b/ui/v2.5/src/hooks/tagsEdit.tsx
index 7654081cf..ebd831feb 100644
--- a/ui/v2.5/src/hooks/tagsEdit.tsx
+++ b/ui/v2.5/src/hooks/tagsEdit.tsx
@@ -50,6 +50,7 @@ export function useTagsEdit(
             id: result.data.tagCreate.id,
             name: toCreate.name ?? "",
             aliases: [],
+            stash_ids: result.data.tagCreate.stash_ids,
           },
         ])
       );
@@ -93,6 +94,7 @@ export function useTagsEdit(
           id: p.stored_id!,
           name: p.name ?? "",
           aliases: [],
+          stash_ids: [],
         };
       })
     );

From 11417590ee439a3137f875b5b440a9183ed0c603 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Thu, 11 Dec 2025 13:07:05 +1100
Subject: [PATCH 209/405] Allow string list input to be orderable (#6397)

* Allow string list input to be orderable
* Make alias fields not orderable
* Adjust styling for URL list controls
---
 .../GalleryDetails/GalleryEditPanel.tsx       | 21 ++++++-
 ui/v2.5/src/components/Galleries/styles.scss  |  4 ++
 .../Images/ImageDetails/ImageEditPanel.tsx    | 21 ++++++-
 ui/v2.5/src/components/Images/styles.scss     |  4 ++
 .../PerformerDetails/PerformerEditPanel.tsx   |  2 +-
 .../Scenes/SceneDetails/SceneEditPanel.tsx    | 21 ++++++-
 ui/v2.5/src/components/Scenes/styles.scss     |  4 ++
 .../src/components/Shared/StringListInput.tsx | 58 ++++++++++++++++++-
 ui/v2.5/src/components/Shared/styles.scss     | 19 ++++++
 .../Tags/TagDetails/TagEditPanel.tsx          |  2 +-
 ui/v2.5/src/utils/form.tsx                    |  8 ++-
 11 files changed, 155 insertions(+), 9 deletions(-)

diff --git a/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryEditPanel.tsx b/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryEditPanel.tsx
index 5b9fa9da1..fe7959c55 100644
--- a/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryEditPanel.tsx
+++ b/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryEditPanel.tsx
@@ -350,6 +350,19 @@ export const GalleryEditPanel: React.FC<IProps> = ({
       xl: 12,
     },
   };
+  const urlProps = isNew
+    ? splitProps
+    : {
+        labelProps: {
+          column: true,
+          md: 3,
+          lg: 12,
+        },
+        fieldProps: {
+          md: 9,
+          lg: 12,
+        },
+      };
   const { renderField, renderInputField, renderDateField, renderURLListField } =
     formikUtils(intl, formik, splitProps);
 
@@ -466,7 +479,13 @@ export const GalleryEditPanel: React.FC<IProps> = ({
             {renderInputField("title")}
             {renderInputField("code", "text", "scene_code")}
 
-            {renderURLListField("urls", onScrapeGalleryURL, urlScrapable)}
+            {renderURLListField(
+              "urls",
+              onScrapeGalleryURL,
+              urlScrapable,
+              "urls",
+              urlProps
+            )}
 
             {renderDateField("date")}
             {renderInputField("photographer")}
diff --git a/ui/v2.5/src/components/Galleries/styles.scss b/ui/v2.5/src/components/Galleries/styles.scss
index 5e8618326..9890e887b 100644
--- a/ui/v2.5/src/components/Galleries/styles.scss
+++ b/ui/v2.5/src/components/Galleries/styles.scss
@@ -204,6 +204,10 @@ $galleryTabWidth: 450px;
     font-size: 1.3em;
     height: calc(1.5em + 0.75rem + 2px);
   }
+
+  .form-group[data-field="urls"] .string-list-input input.form-control {
+    font-size: 0.85em;
+  }
 }
 
 .gallery-cover {
diff --git a/ui/v2.5/src/components/Images/ImageDetails/ImageEditPanel.tsx b/ui/v2.5/src/components/Images/ImageDetails/ImageEditPanel.tsx
index f2771f542..58b809d41 100644
--- a/ui/v2.5/src/components/Images/ImageDetails/ImageEditPanel.tsx
+++ b/ui/v2.5/src/components/Images/ImageDetails/ImageEditPanel.tsx
@@ -320,6 +320,19 @@ export const ImageEditPanel: React.FC<IProps> = ({
       xl: 12,
     },
   };
+  const urlProps = isNew
+    ? splitProps
+    : {
+        labelProps: {
+          column: true,
+          md: 3,
+          lg: 12,
+        },
+        fieldProps: {
+          md: 9,
+          lg: 12,
+        },
+      };
   const { renderField, renderInputField, renderDateField, renderURLListField } =
     formikUtils(intl, formik, splitProps);
 
@@ -461,7 +474,13 @@ export const ImageEditPanel: React.FC<IProps> = ({
             {renderInputField("title")}
             {renderInputField("code", "text", "scene_code")}
 
-            {renderURLListField("urls", onScrapeImageURL, urlScrapable)}
+            {renderURLListField(
+              "urls",
+              onScrapeImageURL,
+              urlScrapable,
+              "urls",
+              urlProps
+            )}
 
             {renderDateField("date")}
             {renderInputField("photographer")}
diff --git a/ui/v2.5/src/components/Images/styles.scss b/ui/v2.5/src/components/Images/styles.scss
index 936947bc3..8bc736aae 100644
--- a/ui/v2.5/src/components/Images/styles.scss
+++ b/ui/v2.5/src/components/Images/styles.scss
@@ -175,6 +175,10 @@ $imageTabWidth: 450px;
     font-size: 1.3em;
     height: calc(1.5em + 0.75rem + 2px);
   }
+
+  .form-group[data-field="urls"] .string-list-input input.form-control {
+    font-size: 0.85em;
+  }
 }
 
 .image-file-card.card {
diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
index 8d1352da0..f2d825e07 100644
--- a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
@@ -694,7 +694,7 @@ export const PerformerEditPanel: React.FC<IPerformerDetails> = ({
         {renderInputField("name")}
         {renderInputField("disambiguation")}
 
-        {renderStringListField("alias_list", "aliases")}
+        {renderStringListField("alias_list", "aliases", { orderable: false })}
 
         {renderSelectField("gender", stringGenderMap)}
 
diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/SceneEditPanel.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/SceneEditPanel.tsx
index 11575ea7b..9ba5059de 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/SceneEditPanel.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/SceneEditPanel.tsx
@@ -602,6 +602,19 @@ export const SceneEditPanel: React.FC<IProps> = ({
       xl: 12,
     },
   };
+  const urlProps = isNew
+    ? splitProps
+    : {
+        labelProps: {
+          column: true,
+          md: 3,
+          lg: 12,
+        },
+        fieldProps: {
+          md: 9,
+          lg: 12,
+        },
+      };
   const {
     renderField,
     renderInputField,
@@ -770,7 +783,13 @@ export const SceneEditPanel: React.FC<IProps> = ({
             {renderInputField("title")}
             {renderInputField("code", "text", "scene_code")}
 
-            {renderURLListField("urls", onScrapeSceneURL, urlScrapable)}
+            {renderURLListField(
+              "urls",
+              onScrapeSceneURL,
+              urlScrapable,
+              "urls",
+              urlProps
+            )}
 
             {renderDateField("date")}
             {renderInputField("director")}
diff --git a/ui/v2.5/src/components/Scenes/styles.scss b/ui/v2.5/src/components/Scenes/styles.scss
index 92c13d648..78644b4c9 100644
--- a/ui/v2.5/src/components/Scenes/styles.scss
+++ b/ui/v2.5/src/components/Scenes/styles.scss
@@ -558,6 +558,10 @@ input[type="range"].blue-slider {
       top: 3rem;
     }
   }
+
+  .form-group[data-field="urls"] .string-list-input input.form-control {
+    font-size: 0.85em;
+  }
 }
 
 .scene-markers-panel {
diff --git a/ui/v2.5/src/components/Shared/StringListInput.tsx b/ui/v2.5/src/components/Shared/StringListInput.tsx
index 768f282a0..89401884c 100644
--- a/ui/v2.5/src/components/Shared/StringListInput.tsx
+++ b/ui/v2.5/src/components/Shared/StringListInput.tsx
@@ -1,5 +1,5 @@
-import { faMinus } from "@fortawesome/free-solid-svg-icons";
-import React, { ComponentType } from "react";
+import { faGripVertical, faMinus } from "@fortawesome/free-solid-svg-icons";
+import React, { ComponentType, useState } from "react";
 import { Button, Form, InputGroup } from "react-bootstrap";
 import { Icon } from "./Icon";
 
@@ -25,6 +25,8 @@ export interface IStringListInputProps {
   errors?: string;
   errorIdx?: number[];
   readOnly?: boolean;
+  // defaults to true if not set
+  orderable?: boolean;
 }
 
 export const StringInput: React.FC<IListInputComponentProps> = ({
@@ -51,6 +53,9 @@ export const StringListInput: React.FC<IStringListInputProps> = (props) => {
   const Input = props.inputComponent ?? StringInput;
   const AppendComponent = props.appendComponent;
   const values = props.value.concat("");
+  const [draggedIdx, setDraggedIdx] = useState<number | null>(null);
+
+  const { orderable = true } = props;
 
   function valueChanged(idx: number, value: string) {
     const newValues = props.value.slice();
@@ -70,12 +75,46 @@ export const StringListInput: React.FC<IStringListInputProps> = (props) => {
     props.setValue(newValues);
   }
 
+  function handleDragStart(event: React.DragEvent<HTMLElement>, idx: number) {
+    event.dataTransfer.dropEffect = "move";
+    setDraggedIdx(idx);
+  }
+
+  function handleDragOver(e: React.DragEvent, idx: number) {
+    e.dataTransfer.dropEffect = "move";
+    e.preventDefault();
+
+    if (
+      draggedIdx === null ||
+      draggedIdx === idx ||
+      idx === values.length - 1
+    ) {
+      return;
+    }
+
+    const newValues = [...props.value];
+    const draggedValue = newValues[draggedIdx];
+    newValues.splice(draggedIdx, 1);
+    newValues.splice(idx, 0, draggedValue);
+
+    props.setValue(newValues);
+    setDraggedIdx(idx);
+  }
+
+  function handleDragEnd() {
+    setDraggedIdx(null);
+  }
+
   return (
     <>
       <div className={`string-list-input ${props.errors ? "is-invalid" : ""}`}>
         <Form.Group>
           {values.map((v, i) => (
-            <InputGroup className={props.className} key={i}>
+            <InputGroup
+              className={props.className}
+              key={i}
+              onDragOver={(e) => handleDragOver(e, i)}
+            >
               <Input
                 value={v}
                 setValue={(value) => valueChanged(i, value)}
@@ -85,11 +124,24 @@ export const StringListInput: React.FC<IStringListInputProps> = (props) => {
               />
               <InputGroup.Append>
                 {AppendComponent && <AppendComponent value={v} />}
+                {!props.readOnly && values.length > 2 && orderable && (
+                  <Button
+                    variant="secondary"
+                    className="drag-handle minimal"
+                    draggable={i !== values.length - 1}
+                    disabled={i === values.length - 1}
+                    onDragStart={(e) => handleDragStart(e, i)}
+                    onDragEnd={handleDragEnd}
+                  >
+                    <Icon icon={faGripVertical} />
+                  </Button>
+                )}
                 {!props.readOnly && (
                   <Button
                     variant="danger"
                     onClick={() => removeValue(i)}
                     disabled={i === values.length - 1}
+                    size="sm"
                   >
                     <Icon icon={faMinus} />
                   </Button>
diff --git a/ui/v2.5/src/components/Shared/styles.scss b/ui/v2.5/src/components/Shared/styles.scss
index ce8454b89..aed03cef9 100644
--- a/ui/v2.5/src/components/Shared/styles.scss
+++ b/ui/v2.5/src/components/Shared/styles.scss
@@ -412,6 +412,25 @@ button.collapse-button {
       margin-bottom: 0;
     }
   }
+
+  .btn.drag-handle {
+    display: inline-block;
+    margin: -0.25em 0.25em -0.25em -0.25em;
+    padding: 0.25em 0.5em 0.25em;
+
+    &:not(:disabled):not(.disabled) {
+      cursor: move;
+    }
+
+    &:hover,
+    &:active,
+    &:focus,
+    &:focus:active {
+      background-color: initial;
+      border-color: initial;
+      box-shadow: initial;
+    }
+  }
 }
 
 .bulk-update-text-input {
diff --git a/ui/v2.5/src/components/Tags/TagDetails/TagEditPanel.tsx b/ui/v2.5/src/components/Tags/TagDetails/TagEditPanel.tsx
index e734de846..a067470a9 100644
--- a/ui/v2.5/src/components/Tags/TagDetails/TagEditPanel.tsx
+++ b/ui/v2.5/src/components/Tags/TagDetails/TagEditPanel.tsx
@@ -241,7 +241,7 @@ export const TagEditPanel: React.FC<ITagEditPanel> = ({
         <Form noValidate onSubmit={formik.handleSubmit} id="tag-edit">
           {renderInputField("name")}
           {renderInputField("sort_name", "text")}
-          {renderStringListField("aliases")}
+          {renderStringListField("aliases", "aliases", { orderable: false })}
           {renderInputField("description", "textarea")}
           {renderParentTagsField()}
           {renderSubTagsField()}
diff --git a/ui/v2.5/src/utils/form.tsx b/ui/v2.5/src/utils/form.tsx
index 9798efd19..fbf239a9b 100644
--- a/ui/v2.5/src/utils/form.tsx
+++ b/ui/v2.5/src/utils/form.tsx
@@ -308,10 +308,15 @@ export function formikUtils<V extends FormikValues>(
     }
   }
 
+  interface IStringListProps extends IProps {
+    // defaults to true if not provided
+    orderable?: boolean;
+  }
+
   function renderStringListField(
     field: Field,
     messageID: string = field,
-    props?: IProps
+    props?: IStringListProps
   ) {
     const value = formik.values[field] as string[];
     const error = formik.errors[field] as ErrorMessage[] | ErrorMessage;
@@ -325,6 +330,7 @@ export function formikUtils<V extends FormikValues>(
         setValue={(v) => formik.setFieldValue(field, v)}
         errors={errorMsg}
         errorIdx={errorIdx}
+        orderable={props?.orderable}
       />
     );
 

From ebfe5c4b5c883a83f49e833e168405bd5959b854 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Thu, 11 Dec 2025 13:47:28 +1100
Subject: [PATCH 210/405] Update changelog

---
 ui/v2.5/src/docs/en/Changelog/v0300.md | 39 +++++++++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/ui/v2.5/src/docs/en/Changelog/v0300.md b/ui/v2.5/src/docs/en/Changelog/v0300.md
index 128be4cf7..5569aa147 100644
--- a/ui/v2.5/src/docs/en/Changelog/v0300.md
+++ b/ui/v2.5/src/docs/en/Changelog/v0300.md
@@ -1,20 +1,37 @@
 ### ✨ New Features
 * Added SFW content mode option to settings and setup wizard. ([#6262](https://github.com/stashapp/stash/pull/6262))
 * Added stash-ids to Tags. ([#6255](https://github.com/stashapp/stash/pull/6255))
+* Added support for manually adding stash-ids to scenes, performers, studio and tags. ([#6374](https://github.com/stashapp/stash/pull/6374))
+* Added option to link a scraped tag to an existing tag in the tagger and scrape dialog. ([#6389](https://github.com/stashapp/stash/pull/6389))
+* Partial dates (year only or month/year) are now supported for all date fields. ([#6359](https://github.com/stashapp/stash/pull/6359))
+* Added support for specifying a trash location where deleted files will be moved instead of being permanently deleted. ([#6237](https://github.com/stashapp/stash/pull/6237))
 * Logs can now be compressed after reaching a configurable size. ([#5696](https://github.com/stashapp/stash/pull/5696))
 * Added ability to edit multiple studios at once. ([#6238](https://github.com/stashapp/stash/pull/6238))
 * Added ability to edit multiple scene markers at once. ([#6239](https://github.com/stashapp/stash/pull/6239))
 * Added support for multiple Studio URLs. ([#6223](https://github.com/stashapp/stash/pull/6223))
 * Added option to add markers to front page. ([#6065](https://github.com/stashapp/stash/pull/6065))
+* Added option for instant transitions in the image lightbox. ([#6354](https://github.com/stashapp/stash/pull/6354))
 * Added duration filter to scene list sidebar. ([#6264](https://github.com/stashapp/stash/pull/6264))
+* Added support for avif images. ([#6288](https://github.com/stashapp/stash/pull/6288), [#6337](https://github.com/stashapp/stash/pull/6337))
 * Added experimental support for JPEG XL images. ([#6184](https://github.com/stashapp/stash/pull/6184))
 
 ### 🎨 Improvements
+* Reverted scene toolbar to previous layout, consistent with other query pages. ([#6322](https://github.com/stashapp/stash/pull/6322))
+* Restored display mode button group to list pages. ([#6317](https://github.com/stashapp/stash/pull/6317))
+* Added sticky selection toolbar to all list views. ([#6320](https://github.com/stashapp/stash/pull/6320))
 * Added performer age slider to scene filter sidebar. ([#6267](https://github.com/stashapp/stash/pull/6267))
 * Added markers option to scene filter sidebar. ([#6270](https://github.com/stashapp/stash/pull/6270))
 * Selected stash-box is now remembered in the scene tagger view. ([#6192](https://github.com/stashapp/stash/pull/6192))
+* Replaced `Show male performers` tagger option with a list of genders to include. ([#6321](https://github.com/stashapp/stash/pull/6321))
+* Galleries can now be created using the gallery select control. ([#6376](https://github.com/stashapp/stash/pull/6376))
+* String list inputs can now be re-ordered. ([#6397](https://github.com/stashapp/stash/pull/6397))
+* Added auto-start button to scene player. ([#6368](https://github.com/stashapp/stash/pull/6368))
+* Bulk add tasks now accept stash ids in addition to names. ([#6310](https://github.com/stashapp/stash/pull/6310))
+* Image query metadata (total file size and megapixels) is now performed as a separate query to the main query to improve performance. ([#6370](https://github.com/stashapp/stash/pull/6370))
 * Added hardware encoding support for Rockchip RKMPP devices. ([#6182](https://github.com/stashapp/stash/pull/6182))
 * stash now uses the Media Session API when playing scenes. ([#6298](https://github.com/stashapp/stash/pull/6298))
+* Screen sleeping is now prevented when playing scenes (only in secure contexts: `localhost` or https). ([#6331](https://github.com/stashapp/stash/pull/6331))
+* Whitespace is now trimmed from the start and end of text fields. ([#6226](https://github.com/stashapp/stash/pull/6226))
 * Added `inputURL` and `inputHostname` fields to scraper specs. ([#6250](https://github.com/stashapp/stash/pull/6250))
 * Added extra studio fields to scraper specs. ([#6249](https://github.com/stashapp/stash/pull/6249))
 * Added o-count to studio cards and details page. ([#5982](https://github.com/stashapp/stash/pull/5982))
@@ -25,11 +42,31 @@
 * Added option to sort scenes by Performer age. ([#6009](https://github.com/stashapp/stash/pull/6009))
 * Added option to sort scenes by Studio. ([#6155](https://github.com/stashapp/stash/pull/6155))
 * Added option to show external links on Performer cards. ([#6153](https://github.com/stashapp/stash/pull/6153))
+* Improved dimension detection for webp files. ([#6342](https://github.com/stashapp/stash/pull/6342))
 * Added keyboard shortcuts to generate scene screenshot at current time (`c c`) and to regenerate default screenshot (`c d`). ([#5984](https://github.com/stashapp/stash/pull/5984))
+* Added keyboard shortcut for tagger view (`v t`). ([#6261](https://github.com/stashapp/stash/pull/6261))
+* Custom field values are now displayed truncated to 5 lines. ([#6361](https://github.com/stashapp/stash/pull/6361))
 
 ### 🐛 Bug fixes
 * stash-ids are now set when creating new objects from the scrape dialog. ([#6269](https://github.com/stashapp/stash/pull/6269))
 * partial dates are now correctly handled when scraping scenes. ([#6305](https://github.com/stashapp/stash/pull/6305))
+* Fixed zoom keyboard shortcuts not working. ([#6317](https://github.com/stashapp/stash/pull/6317))
+* Fixed inline videos showing as full-screen on iPhone devices. ([#6259](https://github.com/stashapp/stash/pull/6259))
 * Fixed external player not loading on Android when a scene title has special characters. ([#6297](https://github.com/stashapp/stash/pull/6297))
+* Play activity will now be recorded correctly when reaching the end of a video. ([#6334](https://github.com/stashapp/stash/pull/6334))
+* Fixed markers appearing in the wrong location when player is in fullscreen mode. ([#6323](https://github.com/stashapp/stash/pull/6323))
+* Fixed selected performer being reset when saving a scene in the tagger view. ([#6391](https://github.com/stashapp/stash/pull/6391))
+* Fixed performer becoming unmatched when creating a new performer with the same name is created. ([#6308](https://github.com/stashapp/stash/pull/6308))
+* Fixed tagger options and buttons not being visible when there are no scenes in the result list. ([#6316](https://github.com/stashapp/stash/pull/6316))
+* Fixed error when scraping a studio if the alias field was empty. ([#6313](https://github.com/stashapp/stash/pull/6313))
+* Fixed existing match stash ID sometimes not being displayed in the performer scrape dialog. ([#6257](https://github.com/stashapp/stash/pull/6257))
+* Fixed download backup function not working when generated directory is on a different filesystem. ([#6244](https://github.com/stashapp/stash/pull/6244))
+* Fixed issue where duplicate file entries would be created if a file was modified and renamed with a different case on case-insensitive filesystems. ([#6327](https://github.com/stashapp/stash/pull/6327))
+* Fixed scraper and plugin locations being converted to absolute paths during setup. ([#6373](https://github.com/stashapp/stash/pull/6373))
 * Fixed Macos version check pointing to incorrect location. ([#6289](https://github.com/stashapp/stash/pull/6289))
-* stash will no longer try to generate marker previews where a marker start is set after the end of a scene's duration. ([#6290](https://github.com/stashapp/stash/pull/6290))
\ No newline at end of file
+* stash will no longer try to generate marker previews where a marker start is set after the end of a scene's duration. ([#6290](https://github.com/stashapp/stash/pull/6290))
+* Fixed panic when scraping a performer with no measurement value. ([#6367](https://github.com/stashapp/stash/pull/6367))
+
+### Api Changes
+
+* added `remove` field to `CustomFieldsInput` to allow removing specific custom fields when updating objects. ([#6362](https://github.com/stashapp/stash/pull/6362))
\ No newline at end of file

From f1e54bfc732991cd422291fe5a441dfe2ac76a39 Mon Sep 17 00:00:00 2001
From: CJ <72030708+cj12312021@users.noreply.github.com>
Date: Wed, 10 Dec 2025 20:59:19 -0600
Subject: [PATCH 211/405] Optimize Tag List Page Performance (#6398)

---
 ui/v2.5/graphql/data/tag.graphql              | 28 +++++++++++++++++++
 ui/v2.5/graphql/queries/tag.graphql           | 10 +++++++
 .../src/components/Tags/EditTagsDialog.tsx    |  4 +--
 ui/v2.5/src/components/Tags/TagCard.tsx       |  2 +-
 ui/v2.5/src/components/Tags/TagCardGrid.tsx   |  2 +-
 ui/v2.5/src/components/Tags/TagList.tsx       | 28 +++++++++----------
 ui/v2.5/src/core/StashService.ts              | 20 +++++++++++++
 ui/v2.5/src/core/tags.ts                      |  2 +-
 8 files changed, 77 insertions(+), 19 deletions(-)

diff --git a/ui/v2.5/graphql/data/tag.graphql b/ui/v2.5/graphql/data/tag.graphql
index e0f432b67..4b0c0aef9 100644
--- a/ui/v2.5/graphql/data/tag.graphql
+++ b/ui/v2.5/graphql/data/tag.graphql
@@ -57,3 +57,31 @@ fragment SelectTagData on Tag {
     updated_at
   }
 }
+
+# Optimized fragment for tag list page - excludes expensive recursive *_count_all fields
+fragment TagListData on Tag {
+  id
+  name
+  sort_name
+  description
+  aliases
+  ignore_auto_tag
+  favorite
+  image_path
+  # Direct counts only - no recursive depth queries
+  scene_count
+  scene_marker_count
+  image_count
+  gallery_count
+  performer_count
+  studio_count
+  group_count
+
+  parents {
+    ...SlimTagData
+  }
+
+  children {
+    ...SlimTagData
+  }
+}
diff --git a/ui/v2.5/graphql/queries/tag.graphql b/ui/v2.5/graphql/queries/tag.graphql
index ab1fc62f8..e0b20ee02 100644
--- a/ui/v2.5/graphql/queries/tag.graphql
+++ b/ui/v2.5/graphql/queries/tag.graphql
@@ -25,3 +25,13 @@ query FindTagsForSelect(
     }
   }
 }
+
+# Optimized query for tag list page - uses TagListData fragment without recursive counts
+query FindTagsForList($filter: FindFilterType, $tag_filter: TagFilterType) {
+  findTags(filter: $filter, tag_filter: $tag_filter) {
+    count
+    tags {
+      ...TagListData
+    }
+  }
+}
diff --git a/ui/v2.5/src/components/Tags/EditTagsDialog.tsx b/ui/v2.5/src/components/Tags/EditTagsDialog.tsx
index 6780a8ce8..896016098 100644
--- a/ui/v2.5/src/components/Tags/EditTagsDialog.tsx
+++ b/ui/v2.5/src/components/Tags/EditTagsDialog.tsx
@@ -55,7 +55,7 @@ function Tags(props: {
 }
 
 interface IListOperationProps {
-  selected: GQL.TagDataFragment[];
+  selected: (GQL.TagDataFragment | GQL.TagListDataFragment)[];
   onClose: (applied: boolean) => void;
 }
 
@@ -134,7 +134,7 @@ export const EditTagsDialog: React.FC<IListOperationProps> = (
     let updateChildTagIds: string[] = [];
     let first = true;
 
-    state.forEach((tag: GQL.TagDataFragment) => {
+    state.forEach((tag: GQL.TagDataFragment | GQL.TagListDataFragment) => {
       getAggregateStateObject(updateState, tag, tagFields, first);
 
       const thisParents = (tag.parents ?? []).map((t) => t.id).sort();
diff --git a/ui/v2.5/src/components/Tags/TagCard.tsx b/ui/v2.5/src/components/Tags/TagCard.tsx
index 48c11b12b..9e2019287 100644
--- a/ui/v2.5/src/components/Tags/TagCard.tsx
+++ b/ui/v2.5/src/components/Tags/TagCard.tsx
@@ -14,7 +14,7 @@ import cx from "classnames";
 import { useTagUpdate } from "src/core/StashService";
 
 interface IProps {
-  tag: GQL.TagDataFragment;
+  tag: GQL.TagDataFragment | GQL.TagListDataFragment;
   cardWidth?: number;
   zoomIndex: number;
   selecting?: boolean;
diff --git a/ui/v2.5/src/components/Tags/TagCardGrid.tsx b/ui/v2.5/src/components/Tags/TagCardGrid.tsx
index f75a83cdf..ac3bf0317 100644
--- a/ui/v2.5/src/components/Tags/TagCardGrid.tsx
+++ b/ui/v2.5/src/components/Tags/TagCardGrid.tsx
@@ -7,7 +7,7 @@ import {
 import { TagCard } from "./TagCard";
 
 interface ITagCardGrid {
-  tags: GQL.TagDataFragment[];
+  tags: (GQL.TagDataFragment | GQL.TagListDataFragment)[];
   selectedIds: Set<string>;
   zoomIndex: number;
   onSelectChange: (id: string, selected: boolean, shiftKey: boolean) => void;
diff --git a/ui/v2.5/src/components/Tags/TagList.tsx b/ui/v2.5/src/components/Tags/TagList.tsx
index ca866bbb9..8373fa836 100644
--- a/ui/v2.5/src/components/Tags/TagList.tsx
+++ b/ui/v2.5/src/components/Tags/TagList.tsx
@@ -8,9 +8,9 @@ import { Button } from "react-bootstrap";
 import { Link, useHistory } from "react-router-dom";
 import * as GQL from "src/core/generated-graphql";
 import {
-  queryFindTags,
+  queryFindTagsForList,
   mutateMetadataAutoTag,
-  useFindTags,
+  useFindTagsForList,
   useTagDestroy,
   useTagsDestroy,
 } from "src/core/StashService";
@@ -27,11 +27,11 @@ import { TagCardGrid } from "./TagCardGrid";
 import { EditTagsDialog } from "./EditTagsDialog";
 import { View } from "../List/views";
 
-function getItems(result: GQL.FindTagsQueryResult) {
+function getItems(result: GQL.FindTagsForListQueryResult) {
   return result?.data?.findTags?.tags ?? [];
 }
 
-function getCount(result: GQL.FindTagsQueryResult) {
+function getCount(result: GQL.FindTagsForListQueryResult) {
   return result?.data?.findTags?.count ?? 0;
 }
 
@@ -43,7 +43,7 @@ interface ITagList {
 export const TagList: React.FC<ITagList> = ({ filterHook, alterQuery }) => {
   const Toast = useToast();
   const [deletingTag, setDeletingTag] =
-    useState<Partial<GQL.TagDataFragment> | null>(null);
+    useState<Partial<GQL.TagListDataFragment> | null>(null);
 
   const filterMode = GQL.FilterMode.Tags;
   const view = View.Tags;
@@ -79,7 +79,7 @@ export const TagList: React.FC<ITagList> = ({ filterHook, alterQuery }) => {
   ];
 
   function addKeybinds(
-    result: GQL.FindTagsQueryResult,
+    result: GQL.FindTagsForListQueryResult,
     filter: ListFilterModel
   ) {
     Mousetrap.bind("p r", () => {
@@ -92,7 +92,7 @@ export const TagList: React.FC<ITagList> = ({ filterHook, alterQuery }) => {
   }
 
   async function viewRandom(
-    result: GQL.FindTagsQueryResult,
+    result: GQL.FindTagsForListQueryResult,
     filter: ListFilterModel
   ) {
     // query for a random tag
@@ -103,7 +103,7 @@ export const TagList: React.FC<ITagList> = ({ filterHook, alterQuery }) => {
       const filterCopy = cloneDeep(filter);
       filterCopy.itemsPerPage = 1;
       filterCopy.currentPage = index + 1;
-      const singleResult = await queryFindTags(filterCopy);
+      const singleResult = await queryFindTagsForList(filterCopy);
       if (singleResult.data.findTags.tags.length === 1) {
         const { id } = singleResult.data.findTags.tags[0];
         // navigate to the tag page
@@ -122,7 +122,7 @@ export const TagList: React.FC<ITagList> = ({ filterHook, alterQuery }) => {
     setIsExportDialogOpen(true);
   }
 
-  async function onAutoTag(tag: GQL.TagDataFragment) {
+  async function onAutoTag(tag: GQL.TagListDataFragment) {
     if (!tag) return;
     try {
       await mutateMetadataAutoTag({ tags: [tag.id] });
@@ -139,7 +139,7 @@ export const TagList: React.FC<ITagList> = ({ filterHook, alterQuery }) => {
         children: deletingTag?.children ?? [],
       };
       await deleteTag();
-      tagRelationHook(deletingTag as GQL.TagDataFragment, oldRelations, {
+      tagRelationHook(deletingTag as GQL.TagListDataFragment, oldRelations, {
         parents: [],
         children: [],
       });
@@ -160,7 +160,7 @@ export const TagList: React.FC<ITagList> = ({ filterHook, alterQuery }) => {
   }
 
   function renderContent(
-    result: GQL.FindTagsQueryResult,
+    result: GQL.FindTagsForListQueryResult,
     filter: ListFilterModel,
     selectedIds: Set<string>,
     onSelectChange: (id: string, selected: boolean, shiftKey: boolean) => void
@@ -324,14 +324,14 @@ export const TagList: React.FC<ITagList> = ({ filterHook, alterQuery }) => {
   }
 
   function renderEditDialog(
-    selectedTags: GQL.TagDataFragment[],
+    selectedTags: GQL.TagListDataFragment[],
     onClose: (confirmed: boolean) => void
   ) {
     return <EditTagsDialog selected={selectedTags} onClose={onClose} />;
   }
 
   function renderDeleteDialog(
-    selectedTags: GQL.TagDataFragment[],
+    selectedTags: GQL.TagListDataFragment[],
     onClose: (confirmed: boolean) => void
   ) {
     return (
@@ -357,7 +357,7 @@ export const TagList: React.FC<ITagList> = ({ filterHook, alterQuery }) => {
   return (
     <ItemListContext
       filterMode={filterMode}
-      useResult={useFindTags}
+      useResult={useFindTagsForList}
       getItems={getItems}
       getCount={getCount}
       alterQuery={alterQuery}
diff --git a/ui/v2.5/src/core/StashService.ts b/ui/v2.5/src/core/StashService.ts
index 424301fe1..c4f3d4732 100644
--- a/ui/v2.5/src/core/StashService.ts
+++ b/ui/v2.5/src/core/StashService.ts
@@ -429,6 +429,16 @@ export const useFindTags = (filter?: ListFilterModel) =>
     },
   });
 
+// Optimized query for tag list page - excludes expensive recursive *_count_all fields
+export const useFindTagsForList = (filter?: ListFilterModel) =>
+  GQL.useFindTagsForListQuery({
+    skip: filter === undefined,
+    variables: {
+      filter: filter?.makeFindFilter(),
+      tag_filter: filter?.makeFilter(),
+    },
+  });
+
 export const queryFindTags = (filter: ListFilterModel) =>
   client.query<GQL.FindTagsQuery>({
     query: GQL.FindTagsDocument,
@@ -438,6 +448,16 @@ export const queryFindTags = (filter: ListFilterModel) =>
     },
   });
 
+// Optimized query for tag list page
+export const queryFindTagsForList = (filter: ListFilterModel) =>
+  client.query<GQL.FindTagsForListQuery>({
+    query: GQL.FindTagsForListDocument,
+    variables: {
+      filter: filter.makeFindFilter(),
+      tag_filter: filter.makeFilter(),
+    },
+  });
+
 export const queryFindTagsByIDForSelect = (tagIDs: string[]) =>
   client.query<GQL.FindTagsForSelectQuery>({
     query: GQL.FindTagsForSelectDocument,
diff --git a/ui/v2.5/src/core/tags.ts b/ui/v2.5/src/core/tags.ts
index b62e69547..4740397e7 100644
--- a/ui/v2.5/src/core/tags.ts
+++ b/ui/v2.5/src/core/tags.ts
@@ -58,7 +58,7 @@ interface ITagRelationTuple {
 }
 
 export const tagRelationHook = (
-  tag: GQL.SlimTagDataFragment | GQL.TagDataFragment,
+  tag: GQL.SlimTagDataFragment | GQL.TagDataFragment | GQL.TagListDataFragment,
   old: ITagRelationTuple,
   updated: ITagRelationTuple
 ) => {

From badebfd8f93e90f00f908b21dfe5a9874f2b5950 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Thu, 11 Dec 2025 14:12:07 +1100
Subject: [PATCH 212/405] Codeberg weblate (#6399)

* Translated using Weblate (Swedish)

Currently translated at 100.0% (1233 of 1233 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/sv/

* Translated using Weblate (French)

Currently translated at 100.0% (1236 of 1236 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/fr/

* Translated using Weblate (French)

Currently translated at 100.0% (1236 of 1236 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/fr/

* Update translation files

Updated by "Cleanup translation files" add-on in Weblate.

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/

* Update translation files

Updated by "Cleanup translation files" add-on in Weblate.

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/

* Translated using Weblate (French)

Currently translated at 100.0% (1242 of 1242 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/fr/

* Translated using Weblate (Spanish)

Currently translated at 100.0% (1242 of 1242 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/es/

* Translated using Weblate (Estonian)

Currently translated at 100.0% (1242 of 1242 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/et/

* Translated using Weblate (Korean)

Currently translated at 100.0% (1242 of 1242 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/ko/

* Translated using Weblate (Korean)

Currently translated at 100.0% (1243 of 1243 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/ko/

* Translated using Weblate (Dutch)

Currently translated at 78.6% (978 of 1243 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/nl/

* Translated using Weblate (Swedish)

Currently translated at 100.0% (1243 of 1243 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/sv/

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (1243 of 1243 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/zh_Hans/

* Translated using Weblate (French)

Currently translated at 100.0% (1243 of 1243 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/fr/

* Translated using Weblate (French)

Currently translated at 100.0% (1245 of 1245 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/fr/

* Translated using Weblate (Hindi)

Currently translated at 5.3% (67 of 1245 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/hi/

* Translated using Weblate (Korean)

Currently translated at 100.0% (1245 of 1245 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/ko/

* Translated using Weblate (German)

Currently translated at 98.0% (1221 of 1245 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/de/

* Translated using Weblate (Spanish)

Currently translated at 100.0% (1245 of 1245 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/es/

* Translated using Weblate (Estonian)

Currently translated at 100.0% (1250 of 1250 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/et/

* Translated using Weblate (French)

Currently translated at 100.0% (1250 of 1250 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/fr/

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 99.9% (1249 of 1250 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/zh_Hans/

---------

Co-authored-by: AlpacaSerious <alpacaserious@noreply.codeberg.org>
Co-authored-by: doodoo <doodoo@noreply.codeberg.org>
Co-authored-by: Codeberg Translate <translate@codeberg.org>
Co-authored-by: donlothario <donlothario@noreply.codeberg.org>
Co-authored-by: Zesty6249 <zesty6249@noreply.codeberg.org>
Co-authored-by: yec <yec@noreply.codeberg.org>
Co-authored-by: PhilipWaldman <philipwaldman@noreply.codeberg.org>
Co-authored-by: wql219 <wql219@noreply.codeberg.org>
Co-authored-by: asasin235 <asasin235@noreply.codeberg.org>
Co-authored-by: lugged9922 <lugged9922@noreply.codeberg.org>
Co-authored-by: upstairs <upstairs@noreply.codeberg.org>
---
 ui/v2.5/src/locales/bg-BG.json |  2 -
 ui/v2.5/src/locales/bn-BD.json |  2 -
 ui/v2.5/src/locales/ca-ES.json |  2 -
 ui/v2.5/src/locales/cs-CZ.json |  4 --
 ui/v2.5/src/locales/da-DK.json |  3 --
 ui/v2.5/src/locales/de-DE.json |  7 +---
 ui/v2.5/src/locales/es-ES.json | 40 +++++++++++++------
 ui/v2.5/src/locales/et-EE.json | 47 +++++++++++++++++------
 ui/v2.5/src/locales/fi-FI.json |  4 --
 ui/v2.5/src/locales/fr-FR.json | 51 ++++++++++++++++++-------
 ui/v2.5/src/locales/hi-IN.json |  8 ++++
 ui/v2.5/src/locales/hr-HR.json |  2 -
 ui/v2.5/src/locales/hu-HU.json |  1 -
 ui/v2.5/src/locales/id-ID.json |  2 -
 ui/v2.5/src/locales/it-IT.json |  3 --
 ui/v2.5/src/locales/ja-JP.json |  3 --
 ui/v2.5/src/locales/ko-KR.json | 70 +++++++++++++++++++++++++---------
 ui/v2.5/src/locales/nb-NO.json |  6 +--
 ui/v2.5/src/locales/nl-NL.json | 12 +++---
 ui/v2.5/src/locales/pl-PL.json |  3 --
 ui/v2.5/src/locales/pt-BR.json |  3 --
 ui/v2.5/src/locales/ro-RO.json |  2 -
 ui/v2.5/src/locales/ru-RU.json |  4 --
 ui/v2.5/src/locales/sv-SE.json | 62 ++++++++++++++++++++++--------
 ui/v2.5/src/locales/th-TH.json |  4 --
 ui/v2.5/src/locales/tr-TR.json |  5 +--
 ui/v2.5/src/locales/uk-UA.json |  4 --
 ui/v2.5/src/locales/vi-VN.json |  2 -
 ui/v2.5/src/locales/zh-CN.json | 46 ++++++++++++++++------
 ui/v2.5/src/locales/zh-TW.json |  4 --
 30 files changed, 251 insertions(+), 157 deletions(-)

diff --git a/ui/v2.5/src/locales/bg-BG.json b/ui/v2.5/src/locales/bg-BG.json
index 65f57dee2..5c933c9ce 100644
--- a/ui/v2.5/src/locales/bg-BG.json
+++ b/ui/v2.5/src/locales/bg-BG.json
@@ -204,8 +204,6 @@
             "set_cover_label": "Заложи картина за корица на сцена",
             "set_tag_desc": "Закачи тагове към сцената, или чрез презаписване или чрез сливане със съществуващите тагове на сцената.",
             "set_tag_label": "Задай тагове",
-            "show_male_desc": "Превключи дали мъжки изпълнители ще въдат предоставени за тагване.",
-            "show_male_label": "Покажи мъжки изпълнители",
             "source": "Източник"
         },
         "noun_query": "Заявка",
diff --git a/ui/v2.5/src/locales/bn-BD.json b/ui/v2.5/src/locales/bn-BD.json
index f90b61a39..687dcdaa9 100644
--- a/ui/v2.5/src/locales/bn-BD.json
+++ b/ui/v2.5/src/locales/bn-BD.json
@@ -163,8 +163,6 @@
             "set_cover_label": "দৃশ্যের কভার ইমেজ সেট করুন",
             "set_tag_desc": "দৃশ্যে ট্যাগ লাগান, হয় পুনরায় লিখে নয় দৃশ্যে থাকা ট্যাগ ছেটে।",
             "set_tag_label": "ট্যাগ সেট করুন",
-            "show_male_desc": "যেকোনোটি নাড়ান পুরুষ প্রদর্শনকারী ট্যাগ এ উপস্থিত হবে।",
-            "show_male_label": "পুরুষ প্রদর্শনকারী দেখান",
             "source": "উৎস"
         },
         "noun_query": "কুয়েরি",
diff --git a/ui/v2.5/src/locales/ca-ES.json b/ui/v2.5/src/locales/ca-ES.json
index 3c2452671..dd9cdb7f6 100644
--- a/ui/v2.5/src/locales/ca-ES.json
+++ b/ui/v2.5/src/locales/ca-ES.json
@@ -146,7 +146,6 @@
             "blacklist_desc": "Els elements de la llista negra estan exclosos de les consultes. Tingueu en compte que són expressions regulars i també insensibles a majúscules i minúscules. Alguns caràcters s'han d'escapar amb una barra inversa: {chars_require_escape}",
             "set_cover_desc": "Reemplaça la portada de l'escena si se'n troba una.",
             "set_tag_label": "Estableix les etiquetes",
-            "show_male_desc": "Estableix si els intèrprets masculins estaran disponibles per etiquetar.",
             "active_instance": "Instància activa de Stash-Box:",
             "blacklist_label": "Llista negra",
             "mark_organized_desc": "Marqueu immediatament l'escena com a Organitzada després de fer clic al botó Desa.",
@@ -164,7 +163,6 @@
             "query_mode_path_desc": "Utilitza el camí complet del fitxer",
             "set_cover_label": "Estableix la imatge de la portada de l'escena",
             "set_tag_desc": "Adjunta etiquetes a l'escena, ja sigui sobreescrivint o fusionant amb etiquetes existents a l'escena.",
-            "show_male_label": "Mostra els intèrprets masculins",
             "source": "Font"
         },
         "results": {
diff --git a/ui/v2.5/src/locales/cs-CZ.json b/ui/v2.5/src/locales/cs-CZ.json
index a518e1d4d..1b9c4c576 100644
--- a/ui/v2.5/src/locales/cs-CZ.json
+++ b/ui/v2.5/src/locales/cs-CZ.json
@@ -186,8 +186,6 @@
             "set_cover_label": "Nastavit obrázek obalu scény",
             "set_tag_desc": "Přidat tagy ke scéně, buď přepsáním nebo sloučením existujících tagů na scéně.",
             "set_tag_label": "Nastavit tagy",
-            "show_male_desc": "Zapnout / vypnout, zda mají být mužští umělci tagováni.",
-            "show_male_label": "Ukázat mužské účinkující",
             "source": "Zdroj",
             "mark_organized_desc": "Po kliknutí na tlačítko Uložit okamžitě označte scénu jako Uspořádanou.",
             "mark_organized_label": "Označit jako Uspořádané při uložení",
@@ -1152,7 +1150,6 @@
         "failed_to_save_performer": "Nepodařilo se uložit umělce „{performer}“",
         "network_error": "Chyba sítě",
         "performer_already_tagged": "Účinkujicí již byl označen",
-        "performer_names_separated_by_comma": "Jména účinkujících oddělená čárkou",
         "refreshing_will_update_the_data": "Obnovení aktualizuje data všech označených účinkujících z instance stash-boxu.",
         "status_tagging_job_queued": "Stav: Úloha tagování ve frontě",
         "name_already_exists": "Název již existuje",
@@ -1479,7 +1476,6 @@
         "status_tagging_job_queued": "Status: Úloha označování zařazena do fronty",
         "status_tagging_studios": "Status: Označování studií",
         "studio_already_tagged": "Studio již označeno",
-        "studio_names_separated_by_comma": "Názvy studií oddělené čárkou",
         "tag_status": "Status označení",
         "network_error": "Chyba sítě",
         "studio_selection": "Výběr studia",
diff --git a/ui/v2.5/src/locales/da-DK.json b/ui/v2.5/src/locales/da-DK.json
index 54cc89938..ab89ec69a 100644
--- a/ui/v2.5/src/locales/da-DK.json
+++ b/ui/v2.5/src/locales/da-DK.json
@@ -174,8 +174,6 @@
             "set_cover_label": "Vælg scene cover billede",
             "set_tag_desc": "Vedhæft tags til scenen, enten ved at overskrive eller flette med eksisterende tags.",
             "set_tag_label": "Sæt tags",
-            "show_male_desc": "Skift, om mandlige kunstnere vil være tilgængelige til at tagge.",
-            "show_male_label": "Vis mandlige kunstnere",
             "source": "Kilde",
             "mark_organized_desc": "Sæt scene som Organiseret efter klik på Save knappen.",
             "mark_organized_label": "Marker som Organiseret ved gem"
@@ -1072,7 +1070,6 @@
         "no_results_found": "Ingen resultater fundet.",
         "number_of_performers_will_be_processed": "{performer_count} kunstnere vil blive behandlet",
         "performer_already_tagged": "Kunstner allerede tagget",
-        "performer_names_separated_by_comma": "Artistnavne adskilt af komma",
         "performer_selection": "Valg af kunstner",
         "performer_successfully_tagged": "Kunstner tagget med succes:",
         "query_all_performers_in_the_database": "Alle kunstnere i databasen",
diff --git a/ui/v2.5/src/locales/de-DE.json b/ui/v2.5/src/locales/de-DE.json
index 3354d4085..af20a8151 100644
--- a/ui/v2.5/src/locales/de-DE.json
+++ b/ui/v2.5/src/locales/de-DE.json
@@ -197,8 +197,6 @@
             "set_cover_label": "Setze Cover-Bild",
             "set_tag_desc": "Hänge Tags der Szene an, entweder durch Überschreiben oder Zusammenführen mit bereits angehängten Tags.",
             "set_tag_label": "Tags anhängen",
-            "show_male_desc": "Auswahl ob männliche Darsteller der Szene hinzugefügt werden können.",
-            "show_male_label": "Männliche Darsteller anzeigen",
             "source": "Quelle",
             "mark_organized_label": "Beim speichern als organisiert markieren",
             "mark_organized_desc": "Markiere die Szene nach dem klicken auf Speichern als organisiert.",
@@ -989,7 +987,8 @@
         "clear_o_history_confirm": "Möchten Sie wirklich den O-Verlauf löschen?",
         "overwrite_filter_warning": "Der gespeicherte Filter \"{entityName}\" wird überschrieben.",
         "set_default_filter_confirm": "Sind Sie sicher, dass Sie diesen Filter als Standard festlegen möchten?",
-        "clear_o_history_confirm_sfw": "Bist du dir sicher das du den Verlauf löschen willst?"
+        "clear_o_history_confirm_sfw": "Bist du dir sicher das du den Verlauf löschen willst?",
+        "tags_found": "{count} Tags gefunden"
     },
     "dimensions": "Maße",
     "director": "Regisseur",
@@ -1205,7 +1204,6 @@
         "no_results_found": "Keine Ergebnisse gefunden.",
         "number_of_performers_will_be_processed": "{performer_count} Darsteller werden verarbeitet",
         "performer_already_tagged": "Darsteller bereits getagged",
-        "performer_names_separated_by_comma": "Darstellernamen, mit Komma getrennt",
         "performer_selection": "Darstellerauswahl",
         "performer_successfully_tagged": "Darsteller erfolgreich getagged:",
         "query_all_performers_in_the_database": "Alle Darsteller in der Datenbank",
@@ -1454,7 +1452,6 @@
         "failed_to_save_studio": "Speichern des Studios \"{studio}\" Fehlgeschlagen",
         "status_tagging_job_queued": "Status: Tagging Job in der Warteschlange",
         "studio_already_tagged": "Studio schon getaggt",
-        "studio_names_separated_by_comma": "Studionamen mit Komma trennen",
         "studio_selection": "Ausgewählte Studios",
         "to_use_the_studio_tagger": "Um den Studiotagger zu benutzen, muss eine stash-box Instanz konfiguriert werden.",
         "untagged_studios": "Nicht getaggte Studios",
diff --git a/ui/v2.5/src/locales/es-ES.json b/ui/v2.5/src/locales/es-ES.json
index ce3a38b0a..42df6f91c 100644
--- a/ui/v2.5/src/locales/es-ES.json
+++ b/ui/v2.5/src/locales/es-ES.json
@@ -151,7 +151,8 @@
             "close": "Cerrar barra lateral",
             "open": "Abrir barra lateral",
             "toggle": "Alternar barra lateral"
-        }
+        },
+        "add_stash_id": "Añadir ID de Stash"
     },
     "actions_name": "Acciones",
     "age": "Edad",
@@ -191,13 +192,15 @@
             "set_cover_label": "Seleccionar carátula de la escena",
             "set_tag_desc": "Adjuntar etiquetas a la escena, ya sea sobreescribiéndolas (elimina las que existieran previamente) o fusionando las nuevas con las que ya existían previamente.",
             "set_tag_label": "Seleccionar etiquetas",
-            "show_male_desc": "Marcar esta opción hará que los actores masculinos estén disponibles para su etiquetado.",
-            "show_male_label": "Mostrar actores",
             "source": "Fuente",
             "mark_organized_desc": "Marcar la escena como organizada tras pulsar el botón de Guardar.",
             "mark_organized_label": "Marcar como organizado al guardar",
             "errors": {
                 "blacklist_duplicate": "Elemento duplicado en la lista negra"
+            },
+            "performer_genders": {
+                "heading": "Géneros de los actores",
+                "description": "Los actores con estos géneros se mostrarán al etiquetar escenas."
             }
         },
         "noun_query": "Consulta",
@@ -416,6 +419,10 @@
             "plugins_path": {
                 "description": "Ubicación del directorio de los archivos de configuración de complementos",
                 "heading": "Ruta de complementos"
+            },
+            "delete_trash_path": {
+                "description": "Ruta a la que se moverán los archivos eliminados en lugar de eliminarlos permanentemente. Déjela vacía para eliminar los archivos de forma permanente.",
+                "heading": "Ruta de la papelera"
             }
         },
         "library": {
@@ -903,7 +910,8 @@
                 "pan_y": "Panorámica eje Y",
                 "zoom": "Zoom"
             },
-            "page_header": "Página {page} / {total}"
+            "page_header": "Página {page} / {total}",
+            "disable_animation": "Desactivar la animación de transición entre imágenes"
         },
         "merge_tags": {
             "destination": "Destino",
@@ -980,7 +988,11 @@
         "reassign_entity_title": "{count, plural, one {Reasignar {singularEntity}} other {Reasignar {pluralEntity}}}",
         "clear_o_history_confirm_sfw": "¿Estás seguro de que quieres borrar el historial de «Me gusta»?",
         "overwrite_filter_warning": "El filtro guardado \"{entityName}\" se sobrescribirá.",
-        "set_default_filter_confirm": "¿Estás seguro de que deseas establecer este filtro como predeterminado?"
+        "set_default_filter_confirm": "¿Estás seguro de que deseas establecer este filtro como predeterminado?",
+        "delete_alert_to_trash": "Los siguientes {count, plural, one {{singularEntity}} other {{pluralEntity}}} se moverán a la papelera:",
+        "stashid_exists_warning": "Se sustituirá el identificador de stash existente para este stash-box.",
+        "studios_found": "{count} estudios encontrados",
+        "tags_found": "{count} etiquetas encontradas"
     },
     "dimensions": "Dimensiones",
     "director": "Director",
@@ -1163,7 +1175,6 @@
         "no_results_found": "No se han encontrado resultados.",
         "number_of_performers_will_be_processed": "{performer_count} actrices/actores serán procesados",
         "performer_already_tagged": "Actriz/actor ya etiquetada/o",
-        "performer_names_separated_by_comma": "Nombres de actrices/actores separados por comas",
         "performer_selection": "Selección de actriz/actor",
         "performer_successfully_tagged": "Actriz/actor etiquetada/o correctamente:",
         "query_all_performers_in_the_database": "Todas las actrices/actores en la base de datos",
@@ -1176,7 +1187,8 @@
         "untagged_performers": "Actrices/actores no etiquetadas/os",
         "update_performer": "Actualizar actriz/actor",
         "update_performers": "Actualizar actrices/actores",
-        "updating_untagged_performers_description": "Actualizar las actrices/actores no etiquetados intentará seleccionar cualquier actriz/actor que carecen de un StashID y actualizará los metadatos."
+        "updating_untagged_performers_description": "Actualizar las actrices/actores no etiquetados intentará seleccionar cualquier actriz/actor que carecen de un StashID y actualizará los metadatos.",
+        "performer_names_or_stashids_separated_by_comma": "Nombres de actores o StashIDs separados por comas"
     },
     "performer_tags": "Etiquetas de actriz/actor",
     "performers": "Actrices/Actores",
@@ -1458,7 +1470,6 @@
         "status_tagging_studios": "Estado: etiquetando estudios",
         "studio_already_tagged": "Estudio ya etiquetado",
         "untagged_studios": "Estudios no etiquetados",
-        "studio_names_separated_by_comma": "Nombres de estudios separados por coma",
         "studio_successfully_tagged": "Estudio etiquetado correctamente",
         "tag_status": "Estado de etiquetado",
         "to_use_the_studio_tagger": "Para usar el etiquetador de estudios una instancia de stash-box debe ser configurada.",
@@ -1468,7 +1479,8 @@
         "refresh_tagged_studios": "Recargar estudios etiquetados",
         "studio_selection": "Selección de estudio",
         "batch_update_studios": "Actualizar estudios en lote",
-        "network_error": "Error de red"
+        "network_error": "Error de red",
+        "studio_names_or_stashids_separated_by_comma": "Nombres de estudio o StashID separados por comas"
     },
     "weight_kg": "Peso (kg)",
     "penis_length": "Longitud del pene",
@@ -1507,7 +1519,7 @@
     "second": "Segundo",
     "validation": {
         "blank": "${path} no puede estar vacío",
-        "date_invalid_form": "${path} tiene que tener el formato YYYY-MM-DD",
+        "date_invalid_form": "${path} debe estar en formato AAAA, AAAA-MM o AAAA-MM-DD.",
         "required": "${path} es un campo requerido",
         "unique": "${path} tiene que ser único",
         "end_time_before_start_time": "El tiempo de finalización debe ser mayor o igual que el tiempo de inicio"
@@ -1569,5 +1581,11 @@
     "odate_recorded_no_sfw": "Sin fecha de Me gusta registrada",
     "scenes_duration": "Duración de la escena",
     "sub_group_order": "Orden de subgrupo",
-    "time_end": "Hora de finalización"
+    "time_end": "Hora de finalización",
+    "stashbox_search": {
+        "header": "Buscar {entityType} en StashBox",
+        "no_results": "No se han encontrado resultados.",
+        "placeholder_name_or_id": "Nombre de {entityType} o StashID...",
+        "select_stashbox": "Seleccionar StashBox..."
+    }
 }
diff --git a/ui/v2.5/src/locales/et-EE.json b/ui/v2.5/src/locales/et-EE.json
index ec377065e..92b16a7ff 100644
--- a/ui/v2.5/src/locales/et-EE.json
+++ b/ui/v2.5/src/locales/et-EE.json
@@ -151,7 +151,9 @@
         "show_results": "Näita tulemusi",
         "show_count_results": "Näita {count} tulemust",
         "load": "Lae",
-        "load_filter": "Lae filter"
+        "load_filter": "Lae filter",
+        "add_stash_id": "Lisa Stash ID",
+        "create_new": "Loo uus"
     },
     "actions_name": "Tegevused",
     "age": "Vanus",
@@ -192,13 +194,15 @@
             "set_cover_label": "Määra stseeni kaanepilt",
             "set_tag_desc": "Ühenda stseenile külge silte, kas olemasolevate siltide ülekirjutamise või liitmise kaudu.",
             "set_tag_label": "Määra sildid",
-            "show_male_desc": "Vali, kas meesnäitlejad on määramiseks saadaval.",
-            "show_male_label": "Näita meesnäitlejaid",
             "source": "Allikas",
             "mark_organized_desc": "Märgi stseen koheselt Orgainiseerituks peale Salvesta nupu vajutamist.",
             "mark_organized_label": "Märgi salvestamisel Organiseerituks",
             "errors": {
                 "blacklist_duplicate": "Dubleeritud musta nimekirja ese"
+            },
+            "performer_genders": {
+                "heading": "Näitlejate sood",
+                "description": "Tähe märgistades näidatakse nendest lugudest näitlejaid."
             }
         },
         "noun_query": "Päring",
@@ -220,7 +224,10 @@
         "verb_scrape_all": "Kraabi Kõikjalt",
         "verb_submit_fp": "Esita {fpCount, plural, one{# Sõrmejälg} other{# Sõrmejälge}}",
         "verb_toggle_config": "{toggle} {configuration}",
-        "verb_toggle_unmatched": "{toggle} kokkusobitamata stseenid"
+        "verb_toggle_unmatched": "{toggle} kokkusobitamata stseenid",
+        "verb_add_as_alias": "Lisa nimi alisena",
+        "verb_link_existing": "Ühenda eksisteerivaga",
+        "verb_match_tag": "Sobita Silt"
     },
     "config": {
         "about": {
@@ -417,6 +424,10 @@
             "plugins_path": {
                 "description": "Plugina konfiguratsioonifailide asukoht kataloogis",
                 "heading": "Pluginate Tee"
+            },
+            "delete_trash_path": {
+                "description": "Tee, kuhu liigutatakse kustutatud failide lõpliku kustutamise asemel. Jäta tühjaks, et alati faile lõplikult kustutada.",
+                "heading": "Prügi Tee"
             }
         },
         "library": {
@@ -918,7 +929,8 @@
                 "label": "Kerimisrežiim",
                 "pan_y": "Liiguta Y",
                 "zoom": "Suum"
-            }
+            },
+            "disable_animation": "Lülita piltide vahetamise animatsioon välja"
         },
         "merge": {
             "destination": "Siihtkoht",
@@ -984,7 +996,12 @@
         "clear_play_history_confirm": "Kas oled kindel, et soovid puhastada vaatamise ajaloo?",
         "set_default_filter_confirm": "Kas oled kindel, et soovid määrata seda filtrit vaikimisi valikuks?",
         "overwrite_filter_warning": "Salvestatud filter \"{entityName}\" kirjutatakse üle.",
-        "clear_o_history_confirm_sfw": "Kas oled kindel, et tahad meeldimiste ajalugu tühjendada?"
+        "clear_o_history_confirm_sfw": "Kas oled kindel, et tahad meeldimiste ajalugu tühjendada?",
+        "delete_alert_to_trash": "{count, plural, one {{singularEntity}} other {{pluralEntity}}} liigutatakse prügilasse:",
+        "stashid_exists_warning": "Olemasolev stash id asendatakse selle stash-kasti jaoks.",
+        "studios_found": "{count} stuudiot leitud",
+        "tags_found": "{count} silti leitud",
+        "scrape_results_missing": "Puudub"
     },
     "dimensions": "Dimensioonid",
     "director": "Režissöör",
@@ -1197,7 +1214,6 @@
         "no_results_found": "Tulemusi ei leitud.",
         "number_of_performers_will_be_processed": "{performer_count} näitlejat töödeldakse",
         "performer_already_tagged": "Näitleja juba märgitud",
-        "performer_names_separated_by_comma": "Esinejate nimed on eraldatud komaga",
         "performer_selection": "Näitlejate valik",
         "performer_successfully_tagged": "Näitleja edukalt märgitud:",
         "query_all_performers_in_the_database": "Kõik andmebaasis olevad näitlejad",
@@ -1210,7 +1226,8 @@
         "untagged_performers": "Märkimata näitlejad",
         "update_performer": "Uuenda Näitlejat",
         "update_performers": "Uuenda Näitlejaid",
-        "updating_untagged_performers_description": "Märgistamata esinejate värskendamisel püütakse leida vasteid esinejatele, kellel puudub stashid, ja värskendatakse metaandmeid."
+        "updating_untagged_performers_description": "Märgistamata esinejate värskendamisel püütakse leida vasteid esinejatele, kellel puudub stashid, ja värskendatakse metaandmeid.",
+        "performer_names_or_stashids_separated_by_comma": "Näitlejate nimed või StashID-d eraldatud komadega"
     },
     "performer_tags": "Näitleja Sildid",
     "performers": "Näitlejad",
@@ -1407,7 +1424,7 @@
     "updated_at": "Viimati Uuendatud",
     "url": "URL",
     "validation": {
-        "date_invalid_form": "${path} peab olema AAAA-KK-PP vormis",
+        "date_invalid_form": "${path} peab olema AAAA, AAAA-KK või AAAA-KK-PP vormis",
         "required": "${path} on nõutud väli",
         "blank": "${path} ei tohi olla tühi",
         "unique": "${path} peab olema kordumatu",
@@ -1487,7 +1504,6 @@
         "no_results_found": "Tulemusi ei leitud.",
         "number_of_studios_will_be_processed": "{studio_count} stuudiot töödeldakse",
         "studio_already_tagged": "Stuudio on juba märgistatud",
-        "studio_names_separated_by_comma": "Komaga eraldatud stuudionimed",
         "studio_selection": "Stuudio valik",
         "studio_successfully_tagged": "Stuudio märgistamine õnnestus",
         "query_all_studios_in_the_database": "Kõik stuudiod andmebaasis",
@@ -1502,7 +1518,8 @@
         "refreshing_will_update_the_data": "Värskendamisel värskendatakse kõigi stash-boxi eksemplari märgistatud stuudiote andmeid.",
         "status_tagging_studios": "Staatus: Stuudiote märgistamine",
         "tag_status": "Märke Staatus",
-        "updating_untagged_studios_description": "Märgistamata stuudiote värskendamisel püütakse sobitada kõik stuudiod, millel puudub stashid, ja värskendatakse metaandmeid."
+        "updating_untagged_studios_description": "Märgistamata stuudiote värskendamisel püütakse sobitada kõik stuudiod, millel puudub stashid, ja värskendatakse metaandmeid.",
+        "studio_names_or_stashids_separated_by_comma": "Stuudio nimes või StashID-d eraldatud komadega"
     },
     "urls": "URLid",
     "video_codec": "Video Koodek",
@@ -1569,5 +1586,11 @@
     "last_o_at_sfw": "Viimane Meeldimine",
     "o_count_sfw": "Meeldimisi",
     "o_history_sfw": "Meeldimiste Ajalugu",
-    "odate_recorded_no_sfw": "Meeldimise Kuupäeva Pole Salvestatud"
+    "odate_recorded_no_sfw": "Meeldimise Kuupäeva Pole Salvestatud",
+    "stashbox_search": {
+        "header": "Otsi {entityType} StashBoxist",
+        "no_results": "Vasteid ei leitud.",
+        "placeholder_name_or_id": "{entityType} nimi või StashID...",
+        "select_stashbox": "Vali StashBox..."
+    }
 }
diff --git a/ui/v2.5/src/locales/fi-FI.json b/ui/v2.5/src/locales/fi-FI.json
index 2256d8e5d..015d133ed 100644
--- a/ui/v2.5/src/locales/fi-FI.json
+++ b/ui/v2.5/src/locales/fi-FI.json
@@ -197,8 +197,6 @@
             "set_cover_label": "Aseta kohtauksen kansikuva",
             "set_tag_desc": "Liitä tunnisteet kohtaukseen, joko ylikirjoittamalla nykyiset tai yhdistämällä ne jo olemassa oleviin tunnisteihin.",
             "set_tag_label": "Aseta tunnisteet",
-            "show_male_desc": "Valitse käytetäänkö miesesiintyjiä automaattisessa tunnisteiden asettamisessa.",
-            "show_male_label": "Näytä miesesiintyjät",
             "source": "Lähde",
             "mark_organized_label": "Merkitse järjestetyksi kun tallennetaan",
             "mark_organized_desc": "Merkitsee kohtauksen järjestellyksi hetki kun Tallenna -painiketta on painettu.",
@@ -1062,7 +1060,6 @@
         "no_results_found": "Ei tuloksia.",
         "number_of_performers_will_be_processed": "{performer_count} esintyjää prosessoidaan",
         "performer_already_tagged": "Esiintyjälle on jo asetettu tunnisteet",
-        "performer_names_separated_by_comma": "Erota esiintyjien nimet pilkulla",
         "performer_selection": "Esiintyjän valinta",
         "performer_successfully_tagged": "Esiintyjälle on asetettu tunnisteet:",
         "query_all_performers_in_the_database": "Kaikki esiintyjät tietokannassa",
@@ -1237,7 +1234,6 @@
         "current_page": "Nykyinen sivu",
         "query_all_studios_in_the_database": "Kaikki studiot tietokannassa",
         "no_results_found": "Ei tuloksia.",
-        "studio_names_separated_by_comma": "Studion nimet eriteltynä pilkuilla",
         "studio_successfully_tagged": "Studion tunnisteiden asettaminen onnistui",
         "studio_selection": "Studion valinta",
         "update_studios": "Päivitä studiot",
diff --git a/ui/v2.5/src/locales/fr-FR.json b/ui/v2.5/src/locales/fr-FR.json
index 94780b647..e461a144a 100644
--- a/ui/v2.5/src/locales/fr-FR.json
+++ b/ui/v2.5/src/locales/fr-FR.json
@@ -151,7 +151,9 @@
         "show_results": "Afficher les résultats",
         "play": "Lecture",
         "load": "Charger",
-        "load_filter": "Charger un filtre"
+        "load_filter": "Charger un filtre",
+        "add_stash_id": "Ajouter un identifiant Stash",
+        "create_new": "Créer un nouveau"
     },
     "actions_name": "Actions",
     "age": "Âge",
@@ -200,11 +202,13 @@
             "set_cover_label": "Définir la vignette de la scène",
             "set_tag_desc": "Attache des étiquettes à la scène, en écrasant ou en fusionnant avec des étiquettes existantes.",
             "set_tag_label": "Définir les étiquettes",
-            "show_male_desc": "Cocher si les performeurs masculins seront disponibles pour le marquage.",
-            "show_male_label": "Montrer les performeurs masculins",
             "source": "Source",
             "errors": {
                 "blacklist_duplicate": "Élément de liste noire en double"
+            },
+            "performer_genders": {
+                "heading": "Genres des performeurs",
+                "description": "Les performeurs de ces genres seront affichés lors du marquage des scènes."
             }
         },
         "noun_query": "Requête",
@@ -226,7 +230,10 @@
         "verb_scrape_all": "Extraire tout",
         "verb_submit_fp": "Soumettre {fpCount, plural, one{# Empreinte} other{# Empreintes}}",
         "verb_toggle_config": "{toggle} {configuration}",
-        "verb_toggle_unmatched": "{toggle} scènes incomparables"
+        "verb_toggle_unmatched": "{toggle} scènes incomparables",
+        "verb_add_as_alias": "Ajouter le nom récupéré comme alias",
+        "verb_link_existing": "Lien vers existant",
+        "verb_match_tag": "Étiquette correspondante"
     },
     "config": {
         "about": {
@@ -314,11 +321,11 @@
                 "heading": "Chemin du répertoire de sauvegarde"
             },
             "blobs_path": {
-                "description": "Emplacement dans le système de fichiers pour le stockage des données binaires. Uniquement applicable lors de l'utilisation du type de stockage blob du système de fichiers. AVERTISSEMENT : La modification de ce paramètre nécessite le déplacement manuel des données existantes.",
+                "description": "Emplacement de stockage des données binaires dans le système de fichiers. Uniquement applicable lors de l'utilisation du type de stockage blob du système de fichiers. AVERTISSEMENT : La modification de ce paramètre nécessite le déplacement manuel des données existantes.",
                 "heading": "Chemin du système de fichiers des données binaires"
             },
             "blobs_storage": {
-                "description": "Emplacement où stocker les données binaires telles que les vignettes de scènes, les images de performeurs, de studios et d'étiquettes. Après avoir modifié cette valeur, les données existantes doivent être migrées à l'aide de la tâche Migrer les blobs. Voir la page Tâches de migration.",
+                "description": "Emplacement de stockage des données binaires telles que les vignettes de scènes, images de performeurs, studios et étiquettes. Après avoir modifié cette valeur, les données existantes doivent être migrées à l'aide de la tâche Migrer les blobs. Voir la page Tâches de migration.",
                 "heading": "Type d'enregistrement de données binaires"
             },
             "cache_location": "Emplacement du cache. Requis si le flux est diffusé à l'aide de HLS (comme sur les appareils Apple) ou de DASH.",
@@ -423,6 +430,10 @@
             "plugins_path": {
                 "description": "Emplacement du répertoire des fichiers de configuration des plugins",
                 "heading": "Chemin des plugins"
+            },
+            "delete_trash_path": {
+                "description": "Chemin où les fichiers supprimés seront déplacés au lieu d'être définitivement supprimés. Laissez ce champ vide pour supprimer définitivement les fichiers.",
+                "heading": "Chemin de la corbeille"
             }
         },
         "library": {
@@ -924,7 +935,8 @@
                 "label": "Mode de défilement",
                 "pan_y": "Panoramique Y",
                 "zoom": "Zoom"
-            }
+            },
+            "disable_animation": "Désactiver l'animation de transition entre les images"
         },
         "merge": {
             "destination": "Destination",
@@ -990,7 +1002,12 @@
         "clear_play_history_confirm": "Êtes-vous sûr de vouloir effacer l'historique de lecture ?",
         "overwrite_filter_warning": "Le filtre enregistré \"{entityName}\" sera remplacé.",
         "set_default_filter_confirm": "Êtes-vous sûr de vouloir définir ce filtre par défaut ?",
-        "clear_o_history_confirm_sfw": "Êtes-vous sûr de vouloir effacer l'historique des \"J'aime\" ?"
+        "clear_o_history_confirm_sfw": "Êtes-vous sûr de vouloir effacer l'historique des \"J'aime\" ?",
+        "delete_alert_to_trash": "Les éléments suivants {count, plural, one {{singularEntity}} other {{pluralEntity}}} seront déplacés vers la corbeille :",
+        "stashid_exists_warning": "L'identifiant Stash existant pour cette Stash-Box sera remplacé.",
+        "studios_found": "{count} studios trouvés",
+        "tags_found": "{count} étiquettes trouvées",
+        "scrape_results_missing": "Manquant"
     },
     "dimensions": "Dimensions",
     "director": "Réalisateur",
@@ -1208,7 +1225,6 @@
         "no_results_found": "Aucun résultat trouvé.",
         "number_of_performers_will_be_processed": "{performer_count} performeurs seront traités",
         "performer_already_tagged": "Performeur déjà étiqueté",
-        "performer_names_separated_by_comma": "Noms des performeurs séparés par une virgule",
         "performer_selection": "Sélection du performeur",
         "performer_successfully_tagged": "Performeur étiqueté avec succès :",
         "query_all_performers_in_the_database": "Tous les performeurs dans la base de données",
@@ -1221,7 +1237,8 @@
         "untagged_performers": "Performeurs non étiquetés",
         "update_performer": "Mise à jour du performeur",
         "update_performers": "Mise à jour des performeurs",
-        "updating_untagged_performers_description": "Une mise à jour des performeurs non étiquetés essaiera de faire correspondre tous les performeurs qui n'ont pas d'identifiant Stash et actualisera les métadonnées."
+        "updating_untagged_performers_description": "Une mise à jour des performeurs non étiquetés essaiera de faire correspondre tous les performeurs qui n'ont pas d'identifiant Stash et actualisera les métadonnées.",
+        "performer_names_or_stashids_separated_by_comma": "Noms des performeurs ou identifiants Stash séparés par des virgules"
     },
     "performer_tags": "Étiquettes de performeur",
     "performers": "Performeurs",
@@ -1410,7 +1427,6 @@
         "status_tagging_job_queued": "Statut : Étiquetage en file d'attente",
         "status_tagging_studios": "Statut : Étiquetage des studios",
         "studio_already_tagged": "Studio déjà étiqueté",
-        "studio_names_separated_by_comma": "Noms de studio séparés par une virgule",
         "studio_selection": "Sélection de studio",
         "studio_successfully_tagged": "Studio étiqueté avec succès",
         "tag_status": "Statut de l'étiquette",
@@ -1418,7 +1434,8 @@
         "untagged_studios": "Studios non étiquetés",
         "update_studio": "Actualiser le studio",
         "update_studios": "Actualiser les studios",
-        "updating_untagged_studios_description": "Une mise à jour des studios non étiquetés essaiera de faire correspondre les studios qui n'ont pas d'identifiant Stash et actualisera les métadonnées."
+        "updating_untagged_studios_description": "Une mise à jour des studios non étiquetés essaiera de faire correspondre les studios qui n'ont pas d'identifiant Stash et actualisera les métadonnées.",
+        "studio_names_or_stashids_separated_by_comma": "Noms de studios ou identifiants Stash séparés par des virgules"
     },
     "studios": "Studios",
     "sub_tag_count": "Nombre d'étiquettes affiliées",
@@ -1458,7 +1475,7 @@
     "url": "URL",
     "urls": "URLs",
     "validation": {
-        "date_invalid_form": "${path} doit être au format AAAA-MM-JJ",
+        "date_invalid_form": "${path} doit être au format AAAA, AAAA-MM, ou AAAA-MM-JJ",
         "required": "${path} est un champ requis",
         "blank": "${path} ne doit pas être vide",
         "unique": "${path} doit être unique",
@@ -1569,5 +1586,11 @@
     "last_o_at_sfw": "Dernier J'aime",
     "o_count_sfw": "J'aime",
     "odate_recorded_no_sfw": "Aucun “J’aime” daté enregistré",
-    "o_history_sfw": "Historique des \"J’aime\""
+    "o_history_sfw": "Historique des \"J’aime\"",
+    "stashbox_search": {
+        "header": "Rechercher {entityType} à partir de Stash-Box",
+        "no_results": "Aucun résultat trouvé.",
+        "placeholder_name_or_id": "{entityType} nom ou identifiant Stash...",
+        "select_stashbox": "Sélectionner une Stash-Box..."
+    }
 }
diff --git a/ui/v2.5/src/locales/hi-IN.json b/ui/v2.5/src/locales/hi-IN.json
index 4f18b8fb7..daa1968b3 100644
--- a/ui/v2.5/src/locales/hi-IN.json
+++ b/ui/v2.5/src/locales/hi-IN.json
@@ -66,5 +66,13 @@
         "generate": "उत्पन्न करें",
         "preview": "पूर्वदर्शन",
         "refresh": "ताजा करें"
+    },
+    "config": {
+        "general": {
+            "blobs_storage": {
+                "heading": "rgfe"
+            },
+            "database": "डेटाबेस"
+        }
     }
 }
diff --git a/ui/v2.5/src/locales/hr-HR.json b/ui/v2.5/src/locales/hr-HR.json
index 70a5a49fe..2102fc165 100644
--- a/ui/v2.5/src/locales/hr-HR.json
+++ b/ui/v2.5/src/locales/hr-HR.json
@@ -199,8 +199,6 @@
             "set_cover_label": "Postavi sliku naslovnice scene",
             "set_tag_desc": "Priložite oznake sceni, bilo prepisivanjem ili spajanjem s postojećim oznakama na sceni.",
             "set_tag_label": "Postavi oznake",
-            "show_male_desc": "Uključi/isključi mogućnost označavanja muških izvođača.",
-            "show_male_label": "Prikaži muške izvođače",
             "source": "Izvor"
         },
         "noun_query": "Upit",
diff --git a/ui/v2.5/src/locales/hu-HU.json b/ui/v2.5/src/locales/hu-HU.json
index b35e4579e..e7b5c15f8 100644
--- a/ui/v2.5/src/locales/hu-HU.json
+++ b/ui/v2.5/src/locales/hu-HU.json
@@ -153,7 +153,6 @@
             "query_mode_metadata": "Metaadat",
             "query_mode_path": "Elérési út",
             "source": "Forrás",
-            "show_male_label": "Férfi előadók mutatása",
             "active_instance": "Aktív stash-box példány:",
             "blacklist_desc": "A tiltólistás elemek nem látszódnak a lekérésekben. Fontos tudni, hogy a regex kifejezések érzékenyek a kis-és nagybetűkre. Bizonyos karakterek után kötelező a \\ : {chars_require_escape}",
             "mark_organized_desc": "Azonnal megjelöli a jelenetet \"Rendezettnek\", amint a \"Mentés\" gomb lenyomásra került.",
diff --git a/ui/v2.5/src/locales/id-ID.json b/ui/v2.5/src/locales/id-ID.json
index a1b4f43f2..876c7a21c 100644
--- a/ui/v2.5/src/locales/id-ID.json
+++ b/ui/v2.5/src/locales/id-ID.json
@@ -238,8 +238,6 @@
             "set_cover_label": "Tetapkan gambar cover adegan",
             "set_tag_label": "Tetapkan tag",
             "set_tag_desc": "Lampirkan tag ke adegan, baik dengan menimpa atau menggabungkan dengan tag yang sudah ada.",
-            "show_male_desc": "Baeralih apakah pemain pria dapat diberi tag.",
-            "show_male_label": "Tampilkan pemain pria",
             "source": "Sumber",
             "errors": {
                 "blacklist_duplicate": "Duplikat item daftar hitam"
diff --git a/ui/v2.5/src/locales/it-IT.json b/ui/v2.5/src/locales/it-IT.json
index 0735540d6..51347e993 100644
--- a/ui/v2.5/src/locales/it-IT.json
+++ b/ui/v2.5/src/locales/it-IT.json
@@ -177,8 +177,6 @@
             "set_cover_label": "Imposta la copertina della scena",
             "set_tag_desc": "Attacca tag alla scena, sovrascrivendoli o unendoli a quelli esistenti sulla scena.",
             "set_tag_label": "Imposta i tags",
-            "show_male_desc": "Attiva/Disattiva l'opzione di taggare attori maschi.",
-            "show_male_label": "Mostra attori maschi",
             "source": "Sorgente",
             "mark_organized_desc": "Contrassegna immediatamente la scena come \"ordinata\" quando si clicca sul pulsante Save.",
             "mark_organized_label": "Contrassegna come \"ordinato\" al salvataggio"
@@ -977,7 +975,6 @@
         "no_results_found": "Nessun risultato trovato.",
         "number_of_performers_will_be_processed": "{performer_count} attori saranno processati",
         "performer_already_tagged": "Attore/Attrice già taggato/a",
-        "performer_names_separated_by_comma": "Nome attore/attrice separato da virgola",
         "performer_selection": "Selezione attore/attrice",
         "performer_successfully_tagged": "Attore/Attrice taggato/a con successo:",
         "query_all_performers_in_the_database": "Tutti gli attori nel database",
diff --git a/ui/v2.5/src/locales/ja-JP.json b/ui/v2.5/src/locales/ja-JP.json
index 0c5a8ef89..1d87f57ac 100644
--- a/ui/v2.5/src/locales/ja-JP.json
+++ b/ui/v2.5/src/locales/ja-JP.json
@@ -184,8 +184,6 @@
             "set_cover_label": "シーンのカバー画像を設定",
             "set_tag_desc": "シーン上の既存のタグを上書きまたはマージすることで、シーンにタグを付与します。",
             "set_tag_label": "タグを設定",
-            "show_male_desc": "男優をタグ付けできるかを切り替えます。",
-            "show_male_label": "男優を表示",
             "source": "ソース",
             "mark_organized_desc": "保存ボタンをクリック後に、すぐにシーンが「分類済み」になります。",
             "mark_organized_label": "分類済みにして保存",
@@ -1119,7 +1117,6 @@
         "no_results_found": "結果が見つかりませんでした。",
         "number_of_performers_will_be_processed": "{performer_count}人の出演者が処理されます",
         "performer_already_tagged": "出演者は既にタグ付けされています",
-        "performer_names_separated_by_comma": "出演者の名前はコンマで区切ってください",
         "performer_selection": "出演者の選択",
         "performer_successfully_tagged": "出演者のタグ付けに成功しました:",
         "query_all_performers_in_the_database": "データベース内の全出演者",
diff --git a/ui/v2.5/src/locales/ko-KR.json b/ui/v2.5/src/locales/ko-KR.json
index 15d285434..566e4806d 100644
--- a/ui/v2.5/src/locales/ko-KR.json
+++ b/ui/v2.5/src/locales/ko-KR.json
@@ -151,7 +151,8 @@
         "show_results": "결과 표시",
         "show_count_results": "{count}개 결과 표시",
         "load": "불러오기",
-        "load_filter": "필터 불러오기"
+        "load_filter": "필터 불러오기",
+        "add_stash_id": "Stash ID 추가"
     },
     "actions_name": "액션",
     "age": "나이",
@@ -197,13 +198,15 @@
             "set_cover_label": "영상 커버 이미지 설정",
             "set_tag_desc": "영상에 이미 존재하는 태그들을 덮어쓰거나 병합함으로써 태그를 영상에 추가합니다.",
             "set_tag_label": "태그 설정",
-            "show_male_desc": "남성 배우들의 태그 가능 여부 설정을 켜거나 끕니다.",
-            "show_male_label": "남성 배우 보여주기",
             "source": "출처",
             "mark_organized_desc": "저장 버튼을 클릭하면 곧바로 영상을 '정리됨' 상태로 만듭니다.",
             "mark_organized_label": "저장 시 '정리됨' 상태로 만들기",
             "errors": {
                 "blacklist_duplicate": "블랙리스트 항목이 중복되었습니다"
+            },
+            "performer_genders": {
+                "heading": "배우 성별",
+                "description": "영상을 태그할 때, 이 성별에 해당하는 배우들이 표시됩니다."
             }
         },
         "noun_query": "쿼리",
@@ -304,7 +307,9 @@
                 "password_desc": "Stash에 접속하기 위한 비밀번호입니다. 로그인 과정을 생략하려면 빈 칸으로 두십시오",
                 "stash-box_integration": "Stash-box 통합",
                 "username": "아이디",
-                "username_desc": "Stash에 접속하기 위한 아이디입니다. 로그인을 생략하려면 빈 칸으로 두십시오"
+                "username_desc": "Stash에 접속하기 위한 아이디입니다. 로그인을 생략하려면 빈 칸으로 두십시오",
+                "log_file_max_size": "최대 로그 크기",
+                "log_file_max_size_desc": "압축 전 로그 파일의 최대 크기(MB)입니다. 0MB를 입력하면 비활성화됩니다. 설정 변경 후 재시작해야 합니다."
             },
             "backup_directory_path": {
                 "description": "SQLite 데이터베이스 백업 파일을 위한 폴더 경로",
@@ -420,6 +425,10 @@
             "plugins_path": {
                 "description": "플러그인 설정 파일의 폴더 위치",
                 "heading": "플러그인 경로"
+            },
+            "delete_trash_path": {
+                "description": "삭제된 파일들이 영구 삭제되는 대신에 옮겨지게 될 경로입니다. 파일들을 영구 삭제하려면 빈 칸으로 두십시오.",
+                "heading": "휴지통 경로"
             }
         },
         "library": {
@@ -819,6 +828,10 @@
                         "heading": "배우 그리드 카드에 링크 표시"
                     }
                 }
+            },
+            "sfw_mode": {
+                "description": "건전한 컨텐츠를 저장하기 위해 Stash를 사용한다면 활성화하세요. 성인 컨텐츠와 관련된 UI 요소들을 숨기거나 변경시킵니다.",
+                "heading": "건전 컨텐츠 모드"
             }
         },
         "advanced_mode": "고급 설정 모드"
@@ -887,7 +900,7 @@
         "delete_object_title": "{count, plural, one {{singularEntity}} other {{pluralEntity}}} 삭제",
         "dont_show_until_updated": "다음 업데이트까지 보지 않기",
         "edit_entity_title": "{count, plural, one {{singularEntity}} other {{pluralEntity}}} 수정",
-        "export_include_related_objects": "내보내기 할 때 관련된 개체를 포합합니다",
+        "export_include_related_objects": "내보내기 할 때 관련된 개체를 포함합니다",
         "export_title": "내보내기",
         "imagewall": {
             "direction": {
@@ -917,7 +930,8 @@
                 "label": "스크롤 모드",
                 "pan_y": "수직 스크롤 모드",
                 "zoom": "확대"
-            }
+            },
+            "disable_animation": "이미지 간 전환 애니메이션 비활성화하기"
         },
         "merge_tags": {
             "destination": "다른 태그와 합쳐질 태그",
@@ -963,7 +977,7 @@
             "image_thumbnails": "이미지 썸네일",
             "phash_tooltip": "중복 방지와 영상 식별에 사용됩니다"
         },
-        "scenes_found": "{count}개의 영상을 찾았습니다",
+        "scenes_found": "{count}개 영상 발견됨",
         "scrape_entity_query": "{entity_type} 스크레이핑 쿼리",
         "scrape_entity_title": "{entity_type} 스크레이핑 결과",
         "scrape_results_existing": "존재",
@@ -982,7 +996,12 @@
             "destination": "~으로 재지정"
         },
         "overwrite_filter_warning": "저장된 필터 \"{entityName}\"은 덮어쓰기될 것입니다.",
-        "set_default_filter_confirm": "정말로 이 필터를 기본값으로 설정하시겠습니까?"
+        "set_default_filter_confirm": "정말로 이 필터를 기본값으로 설정하시겠습니까?",
+        "clear_o_history_confirm_sfw": "정말 좋아요 기록을 삭제하시겠습니까?",
+        "delete_alert_to_trash": "다음 {count, plural, one {{singularEntity}} other {{pluralEntity}}}가 휴지통으로 옮겨질 것입니다:",
+        "stashid_exists_warning": "이 Stash-Box의 기존 Stash ID가 교체될 것입니다.",
+        "studios_found": "{count}개 스튜디오 발견됨",
+        "tags_found": "{count}개 태그 발견됨"
     },
     "dimensions": "해상도",
     "director": "감독",
@@ -1198,7 +1217,6 @@
         "no_results_found": "결과가 없습니다.",
         "number_of_performers_will_be_processed": "{performer_count}명의 배우들이 처리됩니다",
         "performer_already_tagged": "배우가 이미 태그되어 있음",
-        "performer_names_separated_by_comma": "배우 이름 (,으로 구분)",
         "performer_selection": "배우 선택",
         "performer_successfully_tagged": "배우 태깅에 성공했습니다:",
         "query_all_performers_in_the_database": "데이터베이스의 모든 배우",
@@ -1211,7 +1229,8 @@
         "untagged_performers": "태그되지 않은 배우",
         "update_performer": "배우 업데이트",
         "update_performers": "배우 업데이트",
-        "updating_untagged_performers_description": "'태그되지 않은 배우 업데이트'를 통해, Stash ID가 없는 배우들에 대한 데이터를 찾아보고, 가능하다면 이를 이용해 배우를 업데이트합니다."
+        "updating_untagged_performers_description": "'태그되지 않은 배우 업데이트'를 통해, Stash ID가 없는 배우들에 대한 데이터를 찾아보고, 가능하다면 이를 이용해 배우를 업데이트합니다.",
+        "performer_names_or_stashids_separated_by_comma": "배우 이름 또는 Stash ID (쉼표(,)로 구분)"
     },
     "performer_tags": "배우 태그",
     "performers": "배우",
@@ -1291,7 +1310,7 @@
         },
         "paths": {
             "database_filename_empty_for_default": "데이터베이스 파일 이름 (빈 칸으로 두면 기본값을 사용합니다)",
-            "description": "다음으로, 야동 위치와, Stash 데이터베이스, 생성 파일, 캐시 파일의 위치를 정해야 합니다. 이 설정은 나중에 필요할 때 언제든 바꿀 수 있습니다.",
+            "description": "다음으로, 컨텐츠를 찾을 위치를 정하고, Stash 데이터베이스, 생성 파일, 캐시 파일이 저장될 위치를 정해야 합니다. 이 설정은 나중에 필요할 때 언제든 바꿀 수 있습니다.",
             "path_to_cache_directory_empty_for_default": "캐시 폴더 경로 (빈 칸으로 두면 기본값을 사용합니다)",
             "path_to_generated_directory_empty_for_default": "생성되는 파일들을 저장할 폴더 경로 (빈 칸으로 두면 기본값을 사용합니다)",
             "set_up_your_paths": "경로를 설정하세요",
@@ -1302,14 +1321,17 @@
             "where_can_stash_store_cache_files": "어디에 캐시 파일을 저장할까요?",
             "where_can_stash_store_cache_files_description": "HLS/DASH 실시간 스트리밍과 같은 기능들이 동작하기 위해서는, 임시 파일을 저장할 캐시 폴더가 필요합니다. 기본값으로는, 설정 파일이 저장된 폴더 안에 <code>cache</code>라는 폴더가 만들어질 것입니다. 만약 이것을 바꾸고 싶다면, 절대 경로 혹은 (현재 경로의) 상대 경로를 입력해주세요. 입력된 경로에 해당 폴더가 없다면 자동으로 생성됩니다.",
             "where_can_stash_store_its_database": "어디에 Stash 데이터베이스를 저장할까요?",
-            "where_can_stash_store_its_database_description": "Stash는 야동 메타데이터를 저장할 때 SQLite 데이터베이스를 사용합니다. 기본값으로, 데이터베이스 파일은 <code>stash-go.sqlite</code>라는 이름으로 설정 파일이 포함된 폴더 안에 생성될 것입니다. 데이터베이스 파일 이름을 바꾸고 싶다면, 절대 경로 또는 (현재 경로의 )상대 경로를 입력하세요.",
+            "where_can_stash_store_its_database_description": "Stash는 SQLite 데이터베이스를 사용하여 컨텐츠의 메타데이터를 저장합니다. 기본값으로, 데이터베이스 파일은 설정 파일이 포함된 폴더 안에 <code>stash-go.sqlite</code>라는 이름으로 생성될 것입니다. 데이터베이스 파일 이름을 바꾸고 싶다면, 절대 경로 파일 이름, 혹은 (현재 경로의) 상대 경로 파일 이름을 입력하세요.",
             "where_can_stash_store_its_database_warning": "경고: Stash가 동작하는 곳이 아닌 다른 시스템에 데이터베이스를 저장하는 것은 <strong>지원되지 않습니다</strong>! (예시: 데이터베이스를 NAS에 저장하면서 Stash 서버를 다른 컴퓨터에서 돌리는 행위) SQLite는 네트워크를 넘어 사용되도록 만들어지지 않았으며, 이런 행위를 함으로써 데이터베이스가 아주 쉽게 망가지게 될 수 있습니다.",
             "where_can_stash_store_its_generated_content": "생성된 컨텐츠를 어디에 저장할까요?",
             "where_can_stash_store_its_generated_content_description": "Stash에서는 썸네일, 미리보기, 스프라이트로 사용할 이미지와 비디오 파일을 생성합니다. 여기에는 지원되지 않는 파일 형식들의 변환본도 포함됩니다. Stash에서는 기본값으로, 설정 파일이 위치한 폴더 안에 <code>generated</code> 폴더를 만들 것입니다. 생성된 미디어 파일들이 저장되는 위치를 변경하고 싶다면, 절대 경로 혹은 상대 경로(현재 폴더 기준)를 적어주세요. 적혀진 경로에 해당 폴더가 없다면 자동으로 생성됩니다.",
-            "where_is_your_porn_located": "야동이 있는 위치가 어딘가요?",
-            "where_is_your_porn_located_description": "야동 폴더를 추가하세요. 비디오와 이미지를 스캐닝할 때 사용됩니다.",
+            "where_is_your_porn_located": "컨텐츠가 있는 위치가 어딘가요?",
+            "where_is_your_porn_located_description": "영상과 이미지가 들어있는 폴더를 추가하세요. 이 폴더들을 스캔하여 비디오와 이미지를 찾을 것입니다.",
             "path_to_blobs_directory_empty_for_default": "Blob 폴더 경로 (빈 칸으로 두면 기본값을 사용합니다)",
-            "store_blobs_in_database": "데이터베이스에 Blob 저장"
+            "store_blobs_in_database": "데이터베이스에 Blob 저장",
+            "sfw_content_settings": "Stash를 성인물 등이 아닌 건전한 컨텐츠 저장 용도로 사용하시나요?",
+            "sfw_content_settings_description": "Stash는 사진, 그림, 만화 등등의 건전한 컨텐츠를 관리하기 위해 사용될 수 있습니다. 이 옵션을 활성화하면 일부 UI 동작이 건전한 컨텐츠에 더 적합하도록 조정됩니다.",
+            "use_sfw_content_mode": "건전 컨텐츠 모드 사용"
         },
         "stash_setup_wizard": "Stash 설정 마법사",
         "success": {
@@ -1405,7 +1427,7 @@
     "updated_at": "수정 날짜",
     "url": "URL",
     "validation": {
-        "date_invalid_form": "${path}는 YYYY-MM-DD 형태여야 합니다",
+        "date_invalid_form": "${path}는 YYYY, YYYY-MM, YYYY-MM-DD 형식 중 하나여야 합니다",
         "required": "${path}는 필수 항목입니다",
         "unique": "${path}은(는) 유일해야 합니다",
         "blank": "${path}를 빈 칸으로 둘 수 없습니다",
@@ -1432,7 +1454,6 @@
         "name_already_exists": "이름이 이미 존재합니다",
         "studio_already_tagged": "스튜디오가 이미 태그되었음",
         "updating_untagged_studios_description": "태그되지 않은 스튜디오를 업데이트하면, stashid가 없는 스튜디오들을 확인하고 메타데이터를 업데이트할 것입니다.",
-        "studio_names_separated_by_comma": "스튜디오 이름들 (쉼표(,)로 구분)",
         "current_page": "현재 페이지",
         "failed_to_save_studio": "\"{studio}\" 스튜디오를 저장하는 데에 실패했습니다",
         "refresh_tagged_studios": "태그된 스튜디오 새로고침",
@@ -1453,7 +1474,8 @@
         "update_studios": "스튜디오 업데이트",
         "untagged_studios": "태그되지 않은 스튜디오",
         "update_studio": "스튜디오 업데이트",
-        "studio_selection": "스튜디오 선택"
+        "studio_selection": "스튜디오 선택",
+        "studio_names_or_stashids_separated_by_comma": "스튜디오 이름 또는 StashID (쉼표로 구분)"
     },
     "audio_codec": "오디오 코덱",
     "connection_monitor": {
@@ -1555,5 +1577,15 @@
         "any_of": "해당 값 중 일부 포함"
     },
     "eta": "예상 소요 시간",
-    "scenes_duration": "영상 길이"
+    "scenes_duration": "영상 길이",
+    "last_o_at_sfw": "마지막 좋아요 날짜",
+    "o_count_sfw": "좋아요",
+    "o_history_sfw": "좋아요 기록",
+    "odate_recorded_no_sfw": "좋아요 날짜 기록 없음",
+    "stashbox_search": {
+        "header": "StashBox로부터 {entityType} 탐색",
+        "no_results": "탐색 결과가 없습니다.",
+        "placeholder_name_or_id": "({entityType} 이름 또는 StashID를 입력하세요)",
+        "select_stashbox": "StashBox 선택..."
+    }
 }
diff --git a/ui/v2.5/src/locales/nb-NO.json b/ui/v2.5/src/locales/nb-NO.json
index 1eff0a044..6a97b5ca2 100644
--- a/ui/v2.5/src/locales/nb-NO.json
+++ b/ui/v2.5/src/locales/nb-NO.json
@@ -176,9 +176,7 @@
             "errors": {
                 "blacklist_duplicate": "Dupliser element fra svarteliste"
             },
-            "set_tag_desc": "Tilknytt tagger til scenen, enten ved å overskrive eller flette med eksisterende tagger på scenen.",
-            "show_male_label": "Vis mannlige utøvere",
-            "show_male_desc": "Angi om mannlige utøvere skal være tilgjengelige for tagging."
+            "set_tag_desc": "Tilknytt tagger til scenen, enten ved å overskrive eller flette med eksisterende tagger på scenen."
         },
         "noun_query": "Forespørsel",
         "results": {
@@ -903,7 +901,6 @@
         "query_all_studios_in_the_database": "Alle studioer i databasen",
         "refreshing_will_update_the_data": "Oppdatering vil oppdatere dataene til alle taggede studioer fra stash-box-instansen.",
         "studio_already_tagged": "Studio allerede merket",
-        "studio_names_separated_by_comma": "Studionavn atskilt med komma",
         "studio_selection": "Studio utvalg",
         "studio_successfully_tagged": "Studio er tagget",
         "any_names_entered_will_be_queried": "Alle navn som legges inn vil bli spørt fra den eksterne Stash-Box-instansen og lagt til hvis de blir funnet. Bare eksakte treff vil bli ansett som treff.",
@@ -1137,7 +1134,6 @@
         "network_error": "Nettverksfeil",
         "performer_already_tagged": "Skuespilleren er allerede tagget",
         "number_of_performers_will_be_processed": "{skuespiller_antall} skuespillere vil bli behandlet",
-        "performer_names_separated_by_comma": "Skuespillernavn atskilt med komma",
         "batch_add_performers": "Batch Legg Til Skuespillere",
         "current_page": "Gjeldende side",
         "failed_to_save_performer": "Kunne ikke lagre skuespillere «{skuespiller}»",
diff --git a/ui/v2.5/src/locales/nl-NL.json b/ui/v2.5/src/locales/nl-NL.json
index fea685a1e..b05de034f 100644
--- a/ui/v2.5/src/locales/nl-NL.json
+++ b/ui/v2.5/src/locales/nl-NL.json
@@ -151,7 +151,8 @@
         "show_count_results": "{count} resultaten tonen",
         "play": "Afspelen",
         "load_filter": "Laad filter",
-        "load": "Laden"
+        "load": "Laden",
+        "add_stash_id": "Stash ID toevoegen"
     },
     "actions_name": "Acties",
     "age": "Leeftijd",
@@ -185,8 +186,6 @@
             "set_cover_label": "Scèneomslag instellen",
             "set_tag_desc": "Voorzie een scène van labels door ze te overschrijven of samen te voegen met reeds aanwezige.",
             "set_tag_label": "Labels instellen",
-            "show_male_desc": "Geef aan of mannen gelabeld mogen worden.",
-            "show_male_label": "Mannen tonen",
             "source": "Bron",
             "mark_organized_label": "Markeren als geordend na opslaan",
             "mark_organized_desc": "Markeer een scène als geordend na klikken op opslaan.",
@@ -892,7 +891,8 @@
         "duration_options": {
             "equal": "Gelijk"
         },
-        "select_none": "Niets selecteren"
+        "select_none": "Niets selecteren",
+        "select_options": "Selecteer Opties…"
     },
     "duplicated_phash": "Gedupliceerd (phash)",
     "duration": "Looptijd",
@@ -1272,5 +1272,7 @@
         "field": "Veld",
         "value": "Waarde"
     },
-    "datetime_format": "YYYY-MM-DD HH:MM"
+    "datetime_format": "YYYY-MM-DD HH:MM",
+    "sub_group": "Subgroep",
+    "sub_groups": "Subgroepen"
 }
diff --git a/ui/v2.5/src/locales/pl-PL.json b/ui/v2.5/src/locales/pl-PL.json
index 413460800..0afd99dc5 100644
--- a/ui/v2.5/src/locales/pl-PL.json
+++ b/ui/v2.5/src/locales/pl-PL.json
@@ -189,8 +189,6 @@
             "set_cover_label": "Ustawianie obrazu okładki sceny",
             "set_tag_desc": "Dołączanie tagów do sceny poprzez nadpisywanie lub łączenie z istniejącymi tagami w scenie.",
             "set_tag_label": "Ustaw tagi",
-            "show_male_desc": "Włączenie opcji tagowania wykonawców płci męskiej.",
-            "show_male_label": "Pokaż męskich aktorów",
             "source": "Źródło",
             "mark_organized_desc": "Po kliknięciu przycisku Zapisz scena zostaje natychmiast oznaczona jako zorganizowana.",
             "mark_organized_label": "Oznacz jako zorganizowane przy zapisywaniu"
@@ -1079,7 +1077,6 @@
         "no_results_found": "Nie znaleziono wyników.",
         "number_of_performers_will_be_processed": "{performer_count} wykonawców zostanie przetworzonych",
         "performer_already_tagged": "Aktor już otagowany",
-        "performer_names_separated_by_comma": "Nazwy aktorów oddzielone przecinkami",
         "performer_selection": "Wybór aktorów",
         "performer_successfully_tagged": "Aktor pomyślnie otagowany:",
         "query_all_performers_in_the_database": "Wszyscy aktorzy w bazie danych",
diff --git a/ui/v2.5/src/locales/pt-BR.json b/ui/v2.5/src/locales/pt-BR.json
index eb183b234..47ae84cbe 100644
--- a/ui/v2.5/src/locales/pt-BR.json
+++ b/ui/v2.5/src/locales/pt-BR.json
@@ -173,8 +173,6 @@
             "set_cover_label": "Definir imagem da capa da cena",
             "set_tag_desc": "Anexar etiquetas à cena, sobrescrevendo ou mesclando com as etiquetas existentes na cena.",
             "set_tag_label": "Definir etiquetas",
-            "show_male_desc": "Define se artistas masculinos estarão disponíveis para etiquetar.",
-            "show_male_label": "Mostrar artistas masculinos",
             "source": "Fonte"
         },
         "noun_query": "Query",
@@ -904,7 +902,6 @@
         "no_results_found": "Nenhum resultado encontrado.",
         "number_of_performers_will_be_processed": "{performer_count} artistas serão processados",
         "performer_already_tagged": "Artista já etiquetado",
-        "performer_names_separated_by_comma": "Nomes de artistas separados por vírgula",
         "performer_selection": "Seleção de artista",
         "performer_successfully_tagged": "Artista etiquetado com sucesso:",
         "query_all_performers_in_the_database": "Todos os artistas no banco de dados",
diff --git a/ui/v2.5/src/locales/ro-RO.json b/ui/v2.5/src/locales/ro-RO.json
index 1b4375207..defa78a8d 100644
--- a/ui/v2.5/src/locales/ro-RO.json
+++ b/ui/v2.5/src/locales/ro-RO.json
@@ -172,8 +172,6 @@
             "set_cover_label": "Setează imaginea de copertă a scenei",
             "set_tag_desc": "Atașați etichete scenei, fie prin suprascriere, fie prin fuziune cu etichetele existente pe scenă.",
             "set_tag_label": "Setați etichete",
-            "show_male_desc": "Comutați dacă interpreții de sex masculin vor fi disponibili pentru etichetare.",
-            "show_male_label": "Arată interpreți de sex masculin",
             "source": "Sursă",
             "query_mode_metadata": "Date meta",
             "mark_organized_label": "Marchează ca Organizat la salvare",
diff --git a/ui/v2.5/src/locales/ru-RU.json b/ui/v2.5/src/locales/ru-RU.json
index 9b1d790d2..e832e3ed1 100644
--- a/ui/v2.5/src/locales/ru-RU.json
+++ b/ui/v2.5/src/locales/ru-RU.json
@@ -191,8 +191,6 @@
             "set_cover_label": "Выставить обложку для данной сцены",
             "set_tag_desc": "Прикрепить теги к сцене, перезаписав или соединив с существующими тегами на сцене.",
             "set_tag_label": "Установить теги",
-            "show_male_desc": "Включить или выключить доступность пометки тегами мужских актёров.",
-            "show_male_label": "Показывать актеров мужского пола",
             "source": "Источник",
             "mark_organized_label": "Отметить как Организованную при сохранении",
             "mark_organized_desc": "Сразу же отметить сцену как Организованную после нажатия кнопки Сохранить.",
@@ -1162,7 +1160,6 @@
         "no_results_found": "Ничего не найдено.",
         "number_of_performers_will_be_processed": "{performer_count} актер(-ы) будут обработаны",
         "performer_already_tagged": "Актер уже помечен тегом",
-        "performer_names_separated_by_comma": "Имена актеров, разделенные запятой",
         "performer_selection": "Выбор актеров",
         "performer_successfully_tagged": "Актер успешно помечен тегом:",
         "query_all_performers_in_the_database": "Все актеры в базе данных",
@@ -1401,7 +1398,6 @@
         "refreshing_will_update_the_data": "Обновление затронет данные всех тегированных студий в данной инсталляции stash-box.",
         "status_tagging_studios": "Статус: Тегирование студий",
         "studio_already_tagged": "Студия уже тегирована",
-        "studio_names_separated_by_comma": "Названия студий, разделенные запятыми",
         "studio_selection": "Выбор студии",
         "studio_successfully_tagged": "Студия успешно тегирована",
         "to_use_the_studio_tagger": "Для использования тегирования студий stash-box нужно настроить.",
diff --git a/ui/v2.5/src/locales/sv-SE.json b/ui/v2.5/src/locales/sv-SE.json
index 71ba3e99f..31bcf3b1d 100644
--- a/ui/v2.5/src/locales/sv-SE.json
+++ b/ui/v2.5/src/locales/sv-SE.json
@@ -151,7 +151,8 @@
         },
         "show_results": "Visa resultat",
         "load": "Ladda",
-        "load_filter": "Ladda filter"
+        "load_filter": "Ladda filter",
+        "add_stash_id": "Lägg till Stash ID"
     },
     "actions_name": "Handlingar",
     "age": "Ålder",
@@ -200,11 +201,13 @@
             "set_cover_label": "Välj scenens miniatyrbild",
             "set_tag_desc": "Tagga scenen antingen genom att skriva över eller slå samman med de redan existerande.",
             "set_tag_label": "Tagga",
-            "show_male_desc": "Välj huruvida manliga stjärnor kommer vara tillgängliga att tagga.",
-            "show_male_label": "Visa manliga stjärnor",
             "source": "Källa",
             "errors": {
                 "blacklist_duplicate": "Duplicera svartlistat objekt"
+            },
+            "performer_genders": {
+                "heading": "Stjärnors kön",
+                "description": "Stjärnor med dessa kön kommer visas när scener taggas."
             }
         },
         "noun_query": "Query",
@@ -305,7 +308,9 @@
                 "password_desc": "Lösenord till Stash. Lämna tom för att inaktivera användarautentisering",
                 "stash-box_integration": "Integration med Stash-box",
                 "username": "Användarnamn",
-                "username_desc": "Användarnamn till Stash. Lämna tom för att inaktivera användarautentisering"
+                "username_desc": "Användarnamn till Stash. Lämna tom för att inaktivera användarautentisering",
+                "log_file_max_size": "Maximal loggstorlek",
+                "log_file_max_size_desc": "Maximal storlek i megabytes för loggfilen innan den komprimeras. 0MB tolkas som avstängt. Kräver omstart."
             },
             "backup_directory_path": {
                 "description": "Filsökväg för SQLite-databas backupfil",
@@ -421,6 +426,10 @@
             "plugins_path": {
                 "description": "Sökväg till pluginkonfigurationsfiler",
                 "heading": "Pluginsökväg"
+            },
+            "delete_trash_path": {
+                "description": "Sökväg dit raderade filer kommer flyttas till instället för att permanent raderas. Lämna blankt för att permanent radera filer.",
+                "heading": "Skräpsökväg"
             }
         },
         "library": {
@@ -820,6 +829,10 @@
                         "heading": "Visa länkar på stjärnors kort"
                     }
                 }
+            },
+            "sfw_mode": {
+                "description": "Aktivera om stash inte används för vuxet innehåll. Döljer eller ändrar gränssnitt som är mer fokuserade på vuxet innehåll.",
+                "heading": "Vuxet Innehållsläge"
             }
         },
         "advanced_mode": "Avancerat Läge"
@@ -918,7 +931,8 @@
                 "label": "Bläddringsläge",
                 "pan_y": "Panorera Y",
                 "zoom": "Zooma"
-            }
+            },
+            "disable_animation": "Stäng av övergångsanimationen mellan bilder"
         },
         "merge": {
             "destination": "Destination",
@@ -983,7 +997,10 @@
         "clear_o_history_confirm": "Är du säker på att du vill radera O-historiken?",
         "clear_play_history_confirm": "Är du säker på att du vill radera uppspelningshistoriken?",
         "overwrite_filter_warning": "Sparat filter \"{entityName}\" kommer skrivas över.",
-        "set_default_filter_confirm": "Är du säker att du vill ställa in detta filter som standard?"
+        "set_default_filter_confirm": "Är du säker att du vill ställa in detta filter som standard?",
+        "clear_o_history_confirm_sfw": "Är du säker att du vill radera gillningshistoriken?",
+        "delete_alert_to_trash": "De följande {count, plural, one {{singularEntity}} other {{pluralEntity}}} kommer flyttas till skräpet:",
+        "stashid_exists_warning": "Det existerande stash id:et för denna stash-box kommer ersättas."
     },
     "dimensions": "Mått",
     "director": "Regissör",
@@ -1201,7 +1218,6 @@
         "no_results_found": "Inga resultat hittades.",
         "number_of_performers_will_be_processed": "{performer_count} stjärnor kommer behandlas",
         "performer_already_tagged": "Stjärna som redan är taggad",
-        "performer_names_separated_by_comma": "Namn på stjärnor separerade med ett komma",
         "performer_selection": "Val av stjärna",
         "performer_successfully_tagged": "Lyckad taggning av stjärna:",
         "query_all_performers_in_the_database": "Alla stjärnor i databasen",
@@ -1214,7 +1230,8 @@
         "untagged_performers": "Ej taggade stjärnor",
         "update_performer": "Uppdatera stjärna",
         "update_performers": "Uppdatera stjärnor",
-        "updating_untagged_performers_description": "Uppdatering av ej taggade stjärnor kommer försöka att matcha alla stjärnor som saknar StashID och uppdatera metadatan."
+        "updating_untagged_performers_description": "Uppdatering av ej taggade stjärnor kommer försöka att matcha alla stjärnor som saknar StashID och uppdatera metadatan.",
+        "performer_names_or_stashids_separated_by_comma": "Stjärnors namn eller StashID separerade med komma"
     },
     "performer_tags": "Stjärntagg",
     "performers": "Stjärnor",
@@ -1294,7 +1311,7 @@
         },
         "paths": {
             "database_filename_empty_for_default": "databasfilnamn (blank för standard)",
-            "description": "Härnäst, måste vi avgöra var Stash hittar din porrsamling, och vart databasen, de genererade filerna, och cachen ska lagras . Om det skulle behövas kan dessa inställningar ändras senare.",
+            "description": "Härnäst, måste vi avgöra var Stash hittar din media, och var databasen, de genererade filerna, och cachen ska lagras . Om det skulle behövas kan dessa inställningar ändras senare.",
             "path_to_blobs_directory_empty_for_default": "sökväg för blobmapp (tom för standard)",
             "path_to_cache_directory_empty_for_default": "sökväg till cachemappen (tomt för standard)",
             "path_to_generated_directory_empty_for_default": "sökväg till mappen för genererade filer (blank för standard)",
@@ -1307,12 +1324,15 @@
             "where_can_stash_store_cache_files": "Var kan Stash lagra cachefiler?",
             "where_can_stash_store_cache_files_description": "För att viss funktionalitet som HLS/DASH-liveomkodning ska fungera kräver Stash en cache-mapp för tillfälliga filer. Som standard kommer Stash skapa en <code>Cache</code> mapp i mappen som innehåller konfigurationsfilen. Om du vill ändra detta skriv en absolut eller relativ (till den nuvarande platsen) sökväg. Stash kommer skapa mappen om den inte redan finns på platsen.",
             "where_can_stash_store_its_database": "Var kan Stash lagra sin databas?",
-            "where_can_stash_store_its_database_description": "Stash använder en SQLite-databas för att spara metadata till din porr. Som standard kommer databasen att skapas som <code>stash-go.sqlite</code> i mappen som innehåller din konfigurationsfil. Om du vill ändra detta, ange en absolut eller relativ (till den nuvarande arbetsmappen) filnamn.",
+            "where_can_stash_store_its_database_description": "Stash använder en SQLite-databas för att spara metadata till din media. Som standard kommer databasen att skapas som <code>stash-go.sqlite</code> i mappen som innehåller din konfigurationsfil. Om du vill ändra detta, ange en absolut eller relativ (till den nuvarande arbetsmappen) filnamn.",
             "where_can_stash_store_its_database_warning": "VARNING: att lagra databasen på ett annat system än det som Stash körs ifrån (t.ex. databasen på en NAS medan Stash körs från en annan dator) är <strong>inte stöttat</strong>! SQLite är inte avsett för att använding över nätverket, och att försöka oavsett kan väldigt enkelt korrumpera hela databasen.",
             "where_can_stash_store_its_generated_content": "Var kan Stash spara sitt genererade innehåll?",
             "where_can_stash_store_its_generated_content_description": "För att kunna erbjuda miniatyrbilder, förhandsvisningar och sprites måste Stash generera bilder och videor. Detta inkluderar också omkodning av ej stöttade filformat. Som standard skapar Stash en <code>generated</code> mapp i mappen som innehåller din konfigurationsfil. Om du vill ändra detta, ange en absolut eller relativ (till din nuvarande arbetsmapp) sökväg. Stash kommer skapa denna mapp om den inte redan finns.",
-            "where_is_your_porn_located": "Var är din porr lagrad?",
-            "where_is_your_porn_located_description": "Lägg till mappar som innehåller dina porrvideor och bilder. Stash kommer använda dessa mappar för att hitta videor och bilder under skanningen."
+            "where_is_your_porn_located": "Var är din media lagrad?",
+            "where_is_your_porn_located_description": "Lägg till mappar som innehåller dina videor och bilder. Stash kommer använda dessa mappar för att hitta videor och bilder under skanningen.",
+            "sfw_content_settings": "Används stash inte för vuxet innehåll?",
+            "sfw_content_settings_description": "stash kan användas för att hantera icke-vuxen media som fotografier, konst, serietidningar e.t.c.. Aktivering av detta kommer anpassa gränssnittet till att vara mer passande för icke-vuxen media.",
+            "use_sfw_content_mode": "Använd icke-vuxet läge"
         },
         "stash_setup_wizard": "Stash Starthjälp",
         "success": {
@@ -1399,7 +1419,6 @@
         "status_tagging_job_queued": "Status: Taggjob köat",
         "status_tagging_studios": "Status: Taggar studior",
         "studio_already_tagged": "Studio redan taggad",
-        "studio_names_separated_by_comma": "Studionamn separerade med komma",
         "studio_selection": "Studioval",
         "studio_successfully_tagged": "Studiotaggning lyckades",
         "tag_status": "Taggstatus",
@@ -1407,7 +1426,8 @@
         "untagged_studios": "Otaggade studior",
         "update_studio": "Uppdatera Studio",
         "update_studios": "Uppdatera Studior",
-        "updating_untagged_studios_description": "Uppdatera otaggade studior kommer försöka matcha studior som saknar Stash ID och uppdatera metadata."
+        "updating_untagged_studios_description": "Uppdatera otaggade studior kommer försöka matcha studior som saknar Stash ID och uppdatera metadata.",
+        "studio_names_or_stashids_separated_by_comma": "Studionamn eller StashID separerade med komma"
     },
     "studios": "Studior",
     "sub_tag_count": "Antal Underordnade Taggar",
@@ -1447,7 +1467,7 @@
     "url": "URL",
     "urls": "URL:er",
     "validation": {
-        "date_invalid_form": "${path} måste vara i formatet ÅÅÅÅ-MM-DD",
+        "date_invalid_form": "${path} måste vara i formatet ÅÅÅÅ, ÅÅÅÅ-MM, eller ÅÅÅÅ-MM-DD",
         "required": "${path} är ett obligatoriskt fält",
         "unique": "${path} måste vara unik",
         "blank": "${path} får inte lämnas tom",
@@ -1555,5 +1575,15 @@
         "invalid_credentials": "Ogiltigt användarnamn eller lösenord"
     },
     "age_on_date": "{age} vid produktion",
-    "scenes_duration": "Scen Speltid"
+    "scenes_duration": "Scen Speltid",
+    "last_o_at_sfw": "Senaste Gillning Vid",
+    "o_count_sfw": "Gillningar",
+    "o_history_sfw": "Gillningshistorik",
+    "odate_recorded_no_sfw": "Inget Gillningsdatum Sparat",
+    "stashbox_search": {
+        "header": "Sök {entityType} från StashBox",
+        "no_results": "Inga resultat hittades.",
+        "placeholder_name_or_id": "{entityType} namn eller StashID...",
+        "select_stashbox": "Välj StashBox..."
+    }
 }
diff --git a/ui/v2.5/src/locales/th-TH.json b/ui/v2.5/src/locales/th-TH.json
index 9467a0832..ee727e348 100644
--- a/ui/v2.5/src/locales/th-TH.json
+++ b/ui/v2.5/src/locales/th-TH.json
@@ -169,8 +169,6 @@
             "set_cover_label": "ตั้ง Cover รูปภาพของฉาก",
             "set_tag_desc": "แนบแท็กกับฉาก โดยเขียนทับหรือรวมกับแท็กที่มีอยู่ในฉาก",
             "set_tag_label": "ตั้งแท็ก",
-            "show_male_desc": "สลับว่าจะให้นักแสดงชายพร้อมแท็กหรือไม่",
-            "show_male_label": "โชว์นักแสดงชาย",
             "source": "ต้นทาง",
             "mark_organized_desc": "ตั้งค่า scene เป็น organized ทันทีที่กดบันทึกข้อมูล",
             "mark_organized_label": "ตั้งค่าเป็น organized เมื่อบันทึกข้อมูล"
@@ -799,7 +797,6 @@
         "batch_update_studios": "อัพเดตสตูดิโอพร้อมกันหลายแห่ง",
         "no_results_found": "ไม่พบผลลัพธ์",
         "status_tagging_job_queued": "สถานะ: เพิ่มงานเพิ่มข้อมูลแล้ว",
-        "studio_names_separated_by_comma": "ชื่อสตูดิโอคั่นแต่ละแห่ง คั่นด้วยเครื่องหมายคอมมา (,)",
         "to_use_the_studio_tagger": "ต้องทำการตั้งค่า stash-box ก่อนถึงจะใช้งานเครื่องมือเพิ่มข้อมูลสตูดิโอได้",
         "status_tagging_studios": "สถานะ: กำลังเพิ่มข้อมูลสตูดิโอ",
         "studio_already_tagged": "มีข้อมูลสตูดิโอนี้แล้ว",
@@ -940,7 +937,6 @@
         "no_results_found": "ไม่พบผลลัพธ์",
         "update_performer": "เครื่องมืออัปเดตข้อมูลนักแสดง",
         "to_use_the_performer_tagger": "ต้องทำการตั้งค่า stash-box ก่อนถึงจะใช้งานเครื่องมือเพิ่มข้อมูลนักแสดงได้",
-        "performer_names_separated_by_comma": "ชื่อนักแสดงแต่ละคน คั่นด้วยเครื่องหมายคอมมา (,)",
         "refreshing_will_update_the_data": "การรีเฟรชจะอัปเดตนักแสดงที่มีข้อมูลแล้วด้วยข้อมูลจาก stash-box ที่เลือก",
         "name_already_exists": "พบนักแสดงที่ใช้ชื่อนี้แล้ว",
         "number_of_performers_will_be_processed": "จะอัปเดตนักแสดงจำนวน {performer_count} คน",
diff --git a/ui/v2.5/src/locales/tr-TR.json b/ui/v2.5/src/locales/tr-TR.json
index d220e4f6e..3db1d8e1b 100644
--- a/ui/v2.5/src/locales/tr-TR.json
+++ b/ui/v2.5/src/locales/tr-TR.json
@@ -183,8 +183,6 @@
             "set_cover_label": "Sahne için kapak resmi seç",
             "set_tag_desc": "Sahneye etiket ekle (varolan etiketlerle birleştir veya üzerine yaz).",
             "set_tag_label": "Etiketleri düzenle",
-            "show_male_desc": "Erkek oyuncuları etiketleme işlemini aç/kapat.",
-            "show_male_label": "Erkek oyuncuları göster",
             "source": "Kaynak",
             "errors": {
                 "blacklist_duplicate": "Yinelenen kara liste öğesi"
@@ -1278,8 +1276,7 @@
         "status_tagging_job_queued": "Durum: Etiketleme işi sıraya alındı",
         "any_names_entered_will_be_queried": "Girilen tüm isimler karşıdaki Stash-Box oturumundan sorgulanacak ve bulunursa eklenecektir. Yalnızca tam eşleşmeler bir eşleşme olarak kabul edilecektir.",
         "refreshing_will_update_the_data": "Yenileme işlemi stash-box oturumundaki tüm etiketli stüdyoların verilerini güncelleyecektir.",
-        "to_use_the_studio_tagger": "Stüdyo etiketleyiciyi kullanmak için bir stash-box oturumunun yapılandırılması gerekir.",
-        "studio_names_separated_by_comma": "Virgülle ayrılmış stüdyo adları"
+        "to_use_the_studio_tagger": "Stüdyo etiketleyiciyi kullanmak için bir stash-box oturumunun yapılandırılması gerekir."
     },
     "blobs_storage_type": {
         "database": "Veritabanı",
diff --git a/ui/v2.5/src/locales/uk-UA.json b/ui/v2.5/src/locales/uk-UA.json
index 3ecac7c2e..003090197 100644
--- a/ui/v2.5/src/locales/uk-UA.json
+++ b/ui/v2.5/src/locales/uk-UA.json
@@ -182,10 +182,8 @@
             "query_mode_dir": "Каталог",
             "query_mode_label": "Режим запиту",
             "set_tag_desc": "Додайте мітки до сцени, або замінивши, або об'єднавши з існуючими мітками на сцені.",
-            "show_male_desc": "Перемикати, чи будуть доступні чоловічі виконавці для позначення.",
             "set_cover_desc": "Замінити обкладинку сцени, якщо вона знайдена.",
             "set_cover_label": "Встановити обкладинку сцени",
-            "show_male_label": "Показати чоловічих виконавців",
             "errors": {
                 "blacklist_duplicate": "Дублікат елемента чорного списку"
             }
@@ -986,7 +984,6 @@
         "failed_to_save_studio": "Не вдалося зберегти студію \"{studio}\"",
         "number_of_studios_will_be_processed": "Будуть оброблені {studio_count} студії",
         "query_all_studios_in_the_database": "Усі студії в базі даних",
-        "studio_names_separated_by_comma": "Імена студій, розділені комою",
         "add_new_studios": "Додати нові студії",
         "name_already_exists": "Ім'я вже існує",
         "refresh_tagged_studios": "Оновити затеговані студії",
@@ -1029,7 +1026,6 @@
             "no_fields_are_excluded": "Жодне поле не виключено"
         },
         "failed_to_save_performer": "Не вдалося зберегти виконавця \"{performer}\"",
-        "performer_names_separated_by_comma": "Імена виконавців, розділені комою",
         "refreshing_will_update_the_data": "Оновлення оновить дані будь-яких виконавців, позначених мітками, з екземпляра stash-box.",
         "query_all_performers_in_the_database": "Усі виконавці в базі даних",
         "updating_untagged_performers_description": "Оновлення невідмічених виконавців спробує знайти відповідність для виконавців без stashid і оновити метадані.",
diff --git a/ui/v2.5/src/locales/vi-VN.json b/ui/v2.5/src/locales/vi-VN.json
index 25da90f0e..6ba70eefc 100644
--- a/ui/v2.5/src/locales/vi-VN.json
+++ b/ui/v2.5/src/locales/vi-VN.json
@@ -202,8 +202,6 @@
                 "blacklist_duplicate": "Các mục bị trùng lặp trong danh sách đen"
             },
             "query_mode_dir": "Danh sách",
-            "show_male_desc": "Chọn khi thẻ của nam diễn viên có sẵn để gán.",
-            "show_male_label": "Xem danh sách diễn viên nam",
             "query_mode_metadata_desc": "Chỉ dùng dữ liệu mô tả",
             "query_mode_metadata": "Thông tin mô tả"
         },
diff --git a/ui/v2.5/src/locales/zh-CN.json b/ui/v2.5/src/locales/zh-CN.json
index 5e0751171..decf87fab 100644
--- a/ui/v2.5/src/locales/zh-CN.json
+++ b/ui/v2.5/src/locales/zh-CN.json
@@ -151,7 +151,9 @@
         "show_results": "显示结果",
         "show_count_results": "显示{count}个结果",
         "load": "加载",
-        "load_filter": "加载过滤器"
+        "load_filter": "加载过滤器",
+        "add_stash_id": "添加Stash编号",
+        "create_new": "新建"
     },
     "actions_name": "操作",
     "age": "年龄",
@@ -197,13 +199,15 @@
             "set_cover_label": "设置短片封面",
             "set_tag_desc": "通过覆盖或与短片中的现有标签合并，将标签附加到短片。",
             "set_tag_label": "设置标签",
-            "show_male_desc": "选择搜索时是否获取男演员信息.",
-            "show_male_label": "展示男演员标签",
             "source": "源",
             "mark_organized_label": "保存时标记为已整理",
             "mark_organized_desc": "点击保存按钮后，立即将短片标记为 \"已整理\"。",
             "errors": {
                 "blacklist_duplicate": "重复黑名单项目"
+            },
+            "performer_genders": {
+                "heading": "演员性别",
+                "description": "这些性别的演员在标记场景时会被展示。"
             }
         },
         "noun_query": "查询",
@@ -225,7 +229,10 @@
         "verb_scrape_all": "挖掘所有",
         "verb_submit_fp": "提交 {fpCount, plural, one{# 指纹} other{# 指纹}}",
         "verb_toggle_config": "{toggle} {configuration}",
-        "verb_toggle_unmatched": "{toggle} 未匹配的短片"
+        "verb_toggle_unmatched": "{toggle} 未匹配的短片",
+        "verb_add_as_alias": "添加刮削到的名字作为别名",
+        "verb_link_existing": "链接到已存在的",
+        "verb_match_tag": "匹配标签"
     },
     "config": {
         "about": {
@@ -422,6 +429,10 @@
             "plugins_path": {
                 "heading": "插件文件路径",
                 "description": "插件配置文件目录"
+            },
+            "delete_trash_path": {
+                "description": "删除的文件将被移动到的路径，而不是永久删除。留空将永久删除文件。",
+                "heading": "回收站路径"
             }
         },
         "library": {
@@ -923,7 +934,8 @@
                 "label": "卷屏模式",
                 "pan_y": "垂直卷动",
                 "zoom": "放大"
-            }
+            },
+            "disable_animation": "禁用图片之间的切换动画"
         },
         "merge": {
             "destination": "目标",
@@ -989,7 +1001,11 @@
         "clear_play_history_confirm": "真的确定要清空播放历史?",
         "set_default_filter_confirm": "你确定要设置这个过滤器为默认吗？",
         "overwrite_filter_warning": "已保存的过滤器 \"{entityName}\" 将被覆盖。",
-        "clear_o_history_confirm_sfw": "你确定要清除点赞的历史?"
+        "clear_o_history_confirm_sfw": "你确定要清除点赞的历史?",
+        "delete_alert_to_trash": "如下的{count, plural, one {{singularEntity}} other {{pluralEntity}}} 将会被移动到回收站：",
+        "stashid_exists_warning": "此stash-box已存在的stash编号将会被取代。",
+        "studios_found": "找到{count} 个工作室",
+        "tags_found": "找到{count} 个标签"
     },
     "dimensions": "大小",
     "director": "导演",
@@ -1202,7 +1218,6 @@
         "no_results_found": "没有找到资料。",
         "number_of_performers_will_be_processed": "有 {performer_count} 个演员将会被处理",
         "performer_already_tagged": "演员已标签",
-        "performer_names_separated_by_comma": "演员名（逗号分隔）",
         "performer_selection": "选择演员",
         "performer_successfully_tagged": "演员成功标签：",
         "query_all_performers_in_the_database": "查找所有在此数据库的演员",
@@ -1215,7 +1230,8 @@
         "untagged_performers": "未标签的演员",
         "update_performer": "更新演员资料",
         "update_performers": "更新演员们资料",
-        "updating_untagged_performers_description": "更新尚未标记的演员，会尝试搜寻没有stashid的演员并更新其元数据。"
+        "updating_untagged_performers_description": "更新尚未标记的演员，会尝试搜寻没有stashid的演员并更新其元数据。",
+        "performer_names_or_stashids_separated_by_comma": "用逗号分隔的演员名称或Stash编号"
     },
     "performer_tags": "演员标签",
     "performers": "演员",
@@ -1412,7 +1428,7 @@
     "updated_at": "更新于",
     "url": "链接",
     "validation": {
-        "date_invalid_form": "${path} 的格式必须为 YYYY-MM-DD",
+        "date_invalid_form": "${path} 的格式必须为四位年份(YYYY)、四位年份-两位月份(YYYY-MM)或四位年份-两位月份-两位日期(YYYY-MM-DD)",
         "required": "${path} 是必填字段",
         "blank": "${path}不能为空",
         "unique": "${path}不能相同",
@@ -1440,7 +1456,6 @@
         },
         "batch_add_studios": "批量添加工作室",
         "batch_update_studios": "批量更新工作室",
-        "studio_names_separated_by_comma": "工作室名称，用逗号分隔",
         "update_studio": "更新工作室",
         "current_page": "当前页",
         "no_results_found": "未查询到结果。",
@@ -1460,7 +1475,8 @@
         "refreshing_will_update_the_data": "刷新后将更新所有已在此stash-box实例被标记的工作室。",
         "create_or_tag_parent_studios": "创建缺失的上级工作室或标记已存在的上级工作室",
         "any_names_entered_will_be_queried": "任何输入的名字将会从远程的Stash-Box实例查询并且加入（如果找到）。只有完全符合的名字才会视为匹配。",
-        "studio_selection": "工作室选择"
+        "studio_selection": "工作室选择",
+        "studio_names_or_stashids_separated_by_comma": "逗号分隔的工作室名称或Stash编号"
     },
     "subsidiary_studio_count": "子工作室数量",
     "urls": "链接",
@@ -1569,5 +1585,11 @@
     "last_o_at_sfw": "最近一次点赞在",
     "o_count_sfw": "点赞",
     "o_history_sfw": "点赞历史",
-    "odate_recorded_no_sfw": "没有已记录的点赞日期"
+    "odate_recorded_no_sfw": "没有已记录的点赞日期",
+    "stashbox_search": {
+        "header": "在StashBox 搜索{entityType}",
+        "no_results": "没有结果被找到。",
+        "placeholder_name_or_id": "{entityType} 名称或Stash编号……",
+        "select_stashbox": "选择StashBox……"
+    }
 }
diff --git a/ui/v2.5/src/locales/zh-TW.json b/ui/v2.5/src/locales/zh-TW.json
index a3fe67cb8..317d66f61 100644
--- a/ui/v2.5/src/locales/zh-TW.json
+++ b/ui/v2.5/src/locales/zh-TW.json
@@ -191,8 +191,6 @@
             "set_cover_label": "設定短片封面",
             "set_tag_desc": "選擇套用標籤時，該如何處理現有標籤。",
             "set_tag_label": "標籤設定",
-            "show_male_desc": "選擇搜尋時，是否要取得男優資訊。",
-            "show_male_label": "顯示男優",
             "source": "來源",
             "mark_organized_desc": "點選儲存後立即將短片標為已整理。",
             "mark_organized_label": "儲存時標記為已整理",
@@ -1170,7 +1168,6 @@
         "no_results_found": "找不到結果。",
         "number_of_performers_will_be_processed": "將自動處理 {performer_count} 個演員",
         "performer_already_tagged": "演員資料早已新增",
-        "performer_names_separated_by_comma": "演員名稱 (以逗號分隔)",
         "performer_selection": "選取演員",
         "performer_successfully_tagged": "成功新增演員資料：",
         "query_all_performers_in_the_database": "查詢所有資料庫中的演員",
@@ -1479,7 +1476,6 @@
         "update_studio": "更新工作室",
         "update_studios": "更新工作室",
         "updating_untagged_studios_description": "更新未標記的工作室將嘗試匹配任何缺乏stashid的工作室並更新metadata。",
-        "studio_names_separated_by_comma": "以逗號分隔的工作室名稱",
         "studio_selection": "工作室選擇",
         "studio_successfully_tagged": "工作室已成功設定標籤",
         "tag_status": "標籤狀態",

From 1580cf9bd9f8dfa3d51823ee8e9f8e808027ab0d Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Fri, 12 Dec 2025 07:17:41 +1100
Subject: [PATCH 213/405] Provide more information when scraper loadURL fails

---
 pkg/scraper/xpath.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/scraper/xpath.go b/pkg/scraper/xpath.go
index e042c861a..5f7b76372 100644
--- a/pkg/scraper/xpath.go
+++ b/pkg/scraper/xpath.go
@@ -261,7 +261,7 @@ func (s *xpathScraper) scrapeImageByImage(ctx context.Context, image *models.Ima
 func (s *xpathScraper) loadURL(ctx context.Context, url string) (*html.Node, error) {
 	r, err := loadURL(ctx, url, s.client, s.config, s.globalConfig)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("failed to load URL %q: %w", url, err)
 	}
 
 	ret, err := html.Parse(r)

From 25fdf676d20831cf848dc72347b2b61f5a43c062 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Fri, 12 Dec 2025 07:49:07 +1100
Subject: [PATCH 214/405] Handle linking tags in non-stash-box environment
 (#6402)

---
 ui/v2.5/src/components/Tagger/context.tsx | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/ui/v2.5/src/components/Tagger/context.tsx b/ui/v2.5/src/components/Tagger/context.tsx
index fbf20ee40..fb73f21e3 100644
--- a/ui/v2.5/src/components/Tagger/context.tsx
+++ b/ui/v2.5/src/components/Tagger/context.tsx
@@ -871,8 +871,7 @@ export const TaggerContext: React.FC = ({ children }) => {
     tag: GQL.ScrapedTag,
     updateInput: GQL.TagUpdateInput
   ) {
-    if (!tag.remote_site_id || !currentSource?.sourceInput.stash_box_endpoint)
-      return;
+    const hasRemoteID = !!tag.remote_site_id;
 
     try {
       await updateTag({
@@ -889,7 +888,10 @@ export const TaggerContext: React.FC = ({ children }) => {
         return {
           ...r,
           tags: r.tags.map((t) => {
-            if (t.remote_site_id === tag.remote_site_id) {
+            if (
+              (hasRemoteID && t.remote_site_id === tag.remote_site_id) ||
+              (!hasRemoteID && t.name === tag.name)
+            ) {
               return {
                 ...t,
                 stored_id: updateInput.id,

From 67b1dd8dd05f52654caaca010492ad67c03bc23a Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Fri, 12 Dec 2025 08:54:57 +1100
Subject: [PATCH 215/405] Add tag stash ids filter criterion (#6403)

* Add stash id filter to tag filter
* Add tag stash id criterion in UI
---
 graphql/schema/types/filters.graphql   |   3 +
 pkg/models/tag.go                      |   2 +
 pkg/sqlite/setup_test.go               |  13 ++++
 pkg/sqlite/tag_filter.go               |   8 ++
 pkg/sqlite/tag_test.go                 | 103 +++++++++++++++++++++++++
 ui/v2.5/src/models/list-filter/tags.ts |   2 +
 6 files changed, 131 insertions(+)

diff --git a/graphql/schema/types/filters.graphql b/graphql/schema/types/filters.graphql
index 4eb91aa77..bb312e31d 100644
--- a/graphql/schema/types/filters.graphql
+++ b/graphql/schema/types/filters.graphql
@@ -606,6 +606,9 @@ input TagFilterType {
   "Filter by autotag ignore value"
   ignore_auto_tag: Boolean
 
+  "Filter by StashID"
+  stash_id_endpoint: StashIDCriterionInput
+
   "Filter by related scenes that meet this criteria"
   scenes_filter: SceneFilterType
   "Filter by related images that meet this criteria"
diff --git a/pkg/models/tag.go b/pkg/models/tag.go
index 1971a8bb6..29b7e9be3 100644
--- a/pkg/models/tag.go
+++ b/pkg/models/tag.go
@@ -40,6 +40,8 @@ type TagFilterType struct {
 	ChildCount *IntCriterionInput `json:"child_count"`
 	// Filter by autotag ignore value
 	IgnoreAutoTag *bool `json:"ignore_auto_tag"`
+	// Filter by StashID Endpoint
+	StashIDEndpoint *StashIDCriterionInput `json:"stash_id_endpoint"`
 	// Filter by related scenes that meet this criteria
 	ScenesFilter *SceneFilterType `json:"scenes_filter"`
 	// Filter by related images that meet this criteria
diff --git a/pkg/sqlite/setup_test.go b/pkg/sqlite/setup_test.go
index 704dde8a2..2e95012b5 100644
--- a/pkg/sqlite/setup_test.go
+++ b/pkg/sqlite/setup_test.go
@@ -1688,6 +1688,13 @@ func getTagChildCount(id int) int {
 	return 0
 }
 
+func tagStashID(i int) models.StashID {
+	return models.StashID{
+		StashID:  getTagStringValue(i, "stashid"),
+		Endpoint: getTagStringValue(i, "endpoint"),
+	}
+}
+
 // createTags creates n tags with plain Name and o tags with camel cased NaMe included
 func createTags(ctx context.Context, tqb models.TagReaderWriter, n int, o int) error {
 	const namePlain = "Name"
@@ -1709,6 +1716,12 @@ func createTags(ctx context.Context, tqb models.TagReaderWriter, n int, o int) e
 			IgnoreAutoTag: getIgnoreAutoTag(i),
 		}
 
+		if (index+1)%5 != 0 {
+			tag.StashIDs = models.NewRelatedStashIDs([]models.StashID{
+				tagStashID(i),
+			})
+		}
+
 		err := tqb.Create(ctx, &tag)
 
 		if err != nil {
diff --git a/pkg/sqlite/tag_filter.go b/pkg/sqlite/tag_filter.go
index 27afd5858..27ccf3c09 100644
--- a/pkg/sqlite/tag_filter.go
+++ b/pkg/sqlite/tag_filter.go
@@ -84,6 +84,14 @@ func (qb *tagFilterHandler) criterionHandler() criterionHandler {
 		tagHierarchyHandler.ChildrenCriterionHandler(tagFilter.Children),
 		tagHierarchyHandler.ParentCountCriterionHandler(tagFilter.ParentCount),
 		tagHierarchyHandler.ChildCountCriterionHandler(tagFilter.ChildCount),
+
+		&stashIDCriterionHandler{
+			c:                 tagFilter.StashIDEndpoint,
+			stashIDRepository: &tagRepository.stashIDs,
+			stashIDTableAs:    "tag_stash_ids",
+			parentIDCol:       "tags.id",
+		},
+
 		&timestampCriterionHandler{tagFilter.CreatedAt, "tags.created_at", nil},
 		&timestampCriterionHandler{tagFilter.UpdatedAt, "tags.updated_at", nil},
 
diff --git a/pkg/sqlite/tag_test.go b/pkg/sqlite/tag_test.go
index 7d7d1bb09..18fe486bc 100644
--- a/pkg/sqlite/tag_test.go
+++ b/pkg/sqlite/tag_test.go
@@ -343,6 +343,109 @@ func queryTags(ctx context.Context, t *testing.T, qb models.TagReader, tagFilter
 	return tags
 }
 
+func tagsToIDs(i []*models.Tag) []int {
+	ret := make([]int, len(i))
+	for i, v := range i {
+		ret[i] = v.ID
+	}
+
+	return ret
+}
+
+func TestTagQuery(t *testing.T) {
+	var (
+		endpoint = tagStashID(tagIdxWithPerformer).Endpoint
+		stashID  = tagStashID(tagIdxWithPerformer).StashID
+	)
+
+	tests := []struct {
+		name        string
+		findFilter  *models.FindFilterType
+		filter      *models.TagFilterType
+		includeIdxs []int
+		excludeIdxs []int
+		wantErr     bool
+	}{
+		{
+			"stash id with endpoint",
+			nil,
+			&models.TagFilterType{
+				StashIDEndpoint: &models.StashIDCriterionInput{
+					Endpoint: &endpoint,
+					StashID:  &stashID,
+					Modifier: models.CriterionModifierEquals,
+				},
+			},
+			[]int{tagIdxWithPerformer},
+			nil,
+			false,
+		},
+		{
+			"exclude stash id with endpoint",
+			nil,
+			&models.TagFilterType{
+				StashIDEndpoint: &models.StashIDCriterionInput{
+					Endpoint: &endpoint,
+					StashID:  &stashID,
+					Modifier: models.CriterionModifierNotEquals,
+				},
+			},
+			nil,
+			[]int{tagIdxWithPerformer},
+			false,
+		},
+		{
+			"null stash id with endpoint",
+			nil,
+			&models.TagFilterType{
+				StashIDEndpoint: &models.StashIDCriterionInput{
+					Endpoint: &endpoint,
+					Modifier: models.CriterionModifierIsNull,
+				},
+			},
+			nil,
+			[]int{tagIdxWithPerformer},
+			false,
+		},
+		{
+			"not null stash id with endpoint",
+			nil,
+			&models.TagFilterType{
+				StashIDEndpoint: &models.StashIDCriterionInput{
+					Endpoint: &endpoint,
+					Modifier: models.CriterionModifierNotNull,
+				},
+			},
+			[]int{tagIdxWithPerformer},
+			nil,
+			false,
+		},
+	}
+
+	for _, tt := range tests {
+		runWithRollbackTxn(t, tt.name, func(t *testing.T, ctx context.Context) {
+			assert := assert.New(t)
+
+			tags, _, err := db.Tag.Query(ctx, tt.filter, tt.findFilter)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("PerformerStore.Query() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+
+			ids := tagsToIDs(tags)
+			include := indexesToIDs(tagIDs, tt.includeIdxs)
+			exclude := indexesToIDs(tagIDs, tt.excludeIdxs)
+
+			for _, i := range include {
+				assert.Contains(ids, i)
+			}
+			for _, e := range exclude {
+				assert.NotContains(ids, e)
+			}
+		})
+	}
+}
+
 func TestTagQueryIsMissingImage(t *testing.T) {
 	withTxn(func(ctx context.Context) error {
 		qb := db.Tag
diff --git a/ui/v2.5/src/models/list-filter/tags.ts b/ui/v2.5/src/models/list-filter/tags.ts
index c664f218e..e2d4fbed4 100644
--- a/ui/v2.5/src/models/list-filter/tags.ts
+++ b/ui/v2.5/src/models/list-filter/tags.ts
@@ -14,6 +14,7 @@ import {
   ParentTagsCriterionOption,
 } from "./criteria/tags";
 import { FavoriteTagCriterionOption } from "./criteria/favorite";
+import { StashIDCriterionOption } from "./criteria/stash-ids";
 
 const defaultSortBy = "name";
 const sortByOptions = ["name", "random", "scenes_duration"]
@@ -58,6 +59,7 @@ const criterionOptions = [
   createStringCriterionOption("aliases"),
   createStringCriterionOption("description"),
   createBooleanCriterionOption("ignore_auto_tag"),
+  StashIDCriterionOption,
   createMandatoryNumberCriterionOption("scene_count"),
   createMandatoryNumberCriterionOption("image_count"),
   createMandatoryNumberCriterionOption("gallery_count"),

From 62babfb3328ef782696651fa7648d99edbbe6697 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Mon, 15 Dec 2025 07:28:58 +1100
Subject: [PATCH 216/405] Add more patchable components (#6404)

---
 .../GalleryDetails/GalleryAddPanel.tsx        | 162 ++---
 .../GalleryDetails/GalleryImagesPanel.tsx     | 233 +++----
 .../src/components/Galleries/GalleryList.tsx  | 319 ++++-----
 .../GroupDetails/GroupSubGroupsPanel.tsx      | 174 ++---
 ui/v2.5/src/components/Groups/GroupList.tsx   | 264 ++++----
 ui/v2.5/src/components/Images/ImageList.tsx   | 284 ++++----
 .../components/Performers/PerformerList.tsx   | 322 ++++-----
 ui/v2.5/src/components/Scenes/SceneList.tsx   | 147 ++--
 .../src/components/Scenes/SceneMarkerList.tsx | 219 +++---
 ui/v2.5/src/components/Studios/StudioList.tsx | 312 ++++-----
 ui/v2.5/src/components/Tags/TagList.tsx       | 627 +++++++++---------
 ui/v2.5/src/pluginApi.d.ts                    |  12 +
 12 files changed, 1570 insertions(+), 1505 deletions(-)

diff --git a/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryAddPanel.tsx b/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryAddPanel.tsx
index 9e859c1c8..275c4263b 100644
--- a/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryAddPanel.tsx
+++ b/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryAddPanel.tsx
@@ -9,98 +9,102 @@ import { useToast } from "src/hooks/Toast";
 import { useIntl } from "react-intl";
 import { faPlus } from "@fortawesome/free-solid-svg-icons";
 import { galleryTitle } from "src/core/galleries";
+import { IItemListOperation } from "src/components/List/FilteredListToolbar";
+import { PatchComponent } from "src/patch";
 
 interface IGalleryAddProps {
   active: boolean;
   gallery: GQL.GalleryDataFragment;
+  extraOperations?: IItemListOperation<GQL.FindImagesQueryResult>[];
 }
 
-export const GalleryAddPanel: React.FC<IGalleryAddProps> = ({
-  active,
-  gallery,
-}) => {
-  const Toast = useToast();
-  const intl = useIntl();
+export const GalleryAddPanel: React.FC<IGalleryAddProps> = PatchComponent(
+  "GalleryAddPanel",
+  ({ active, gallery, extraOperations = [] }) => {
+    const Toast = useToast();
+    const intl = useIntl();
 
-  function filterHook(filter: ListFilterModel) {
-    const galleryValue = {
-      id: gallery.id,
-      label: galleryTitle(gallery),
-    };
-    // if galleries is already present, then we modify it, otherwise add
-    let galleryCriterion = filter.criteria.find((c) => {
-      return c.criterionOption.type === "galleries";
-    }) as GalleriesCriterion | undefined;
+    function filterHook(filter: ListFilterModel) {
+      const galleryValue = {
+        id: gallery.id,
+        label: galleryTitle(gallery),
+      };
+      // if galleries is already present, then we modify it, otherwise add
+      let galleryCriterion = filter.criteria.find((c) => {
+        return c.criterionOption.type === "galleries";
+      }) as GalleriesCriterion | undefined;
 
-    if (
-      galleryCriterion &&
-      galleryCriterion.modifier === GQL.CriterionModifier.Excludes
-    ) {
-      // add the gallery if not present
       if (
-        !galleryCriterion.value.find((p) => {
-          return p.id === gallery.id;
-        })
+        galleryCriterion &&
+        galleryCriterion.modifier === GQL.CriterionModifier.Excludes
       ) {
-        galleryCriterion.value.push(galleryValue);
+        // add the gallery if not present
+        if (
+          !galleryCriterion.value.find((p) => {
+            return p.id === gallery.id;
+          })
+        ) {
+          galleryCriterion.value.push(galleryValue);
+        }
+
+        galleryCriterion.modifier = GQL.CriterionModifier.Excludes;
+      } else {
+        // overwrite
+        galleryCriterion = new GalleriesCriterion();
+        galleryCriterion.modifier = GQL.CriterionModifier.Excludes;
+        galleryCriterion.value = [galleryValue];
+        filter.criteria.push(galleryCriterion);
       }
 
-      galleryCriterion.modifier = GQL.CriterionModifier.Excludes;
-    } else {
-      // overwrite
-      galleryCriterion = new GalleriesCriterion();
-      galleryCriterion.modifier = GQL.CriterionModifier.Excludes;
-      galleryCriterion.value = [galleryValue];
-      filter.criteria.push(galleryCriterion);
+      return filter;
     }
 
-    return filter;
-  }
-
-  async function addImages(
-    result: GQL.FindImagesQueryResult,
-    filter: ListFilterModel,
-    selectedIds: Set<string>
-  ) {
-    try {
-      await mutateAddGalleryImages({
-        gallery_id: gallery.id!,
-        image_ids: Array.from(selectedIds.values()),
-      });
-      const imageCount = selectedIds.size;
-      Toast.success(
-        intl.formatMessage(
-          { id: "toast.added_entity" },
-          {
-            count: imageCount,
-            singularEntity: intl.formatMessage({ id: "image" }),
-            pluralEntity: intl.formatMessage({ id: "images" }),
-          }
-        )
-      );
-    } catch (e) {
-      Toast.error(e);
+    async function addImages(
+      result: GQL.FindImagesQueryResult,
+      filter: ListFilterModel,
+      selectedIds: Set<string>
+    ) {
+      try {
+        await mutateAddGalleryImages({
+          gallery_id: gallery.id!,
+          image_ids: Array.from(selectedIds.values()),
+        });
+        const imageCount = selectedIds.size;
+        Toast.success(
+          intl.formatMessage(
+            { id: "toast.added_entity" },
+            {
+              count: imageCount,
+              singularEntity: intl.formatMessage({ id: "image" }),
+              pluralEntity: intl.formatMessage({ id: "images" }),
+            }
+          )
+        );
+      } catch (e) {
+        Toast.error(e);
+      }
     }
+
+    const otherOperations = [
+      ...extraOperations,
+      {
+        text: intl.formatMessage(
+          { id: "actions.add_to_entity" },
+          { entityType: intl.formatMessage({ id: "gallery" }) }
+        ),
+        onClick: addImages,
+        isDisplayed: showWhenSelected,
+        postRefetch: true,
+        icon: faPlus,
+      },
+    ];
+
+    return (
+      <ImageList
+        filterHook={filterHook}
+        extraOperations={otherOperations}
+        alterQuery={active}
+      />
+    );
   }
-
-  const otherOperations = [
-    {
-      text: intl.formatMessage(
-        { id: "actions.add_to_entity" },
-        { entityType: intl.formatMessage({ id: "gallery" }) }
-      ),
-      onClick: addImages,
-      isDisplayed: showWhenSelected,
-      postRefetch: true,
-      icon: faPlus,
-    },
-  ];
-
-  return (
-    <ImageList
-      filterHook={filterHook}
-      extraOperations={otherOperations}
-      alterQuery={active}
-    />
-  );
-};
+);
diff --git a/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryImagesPanel.tsx b/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryImagesPanel.tsx
index 1ca450c5e..3d004749f 100644
--- a/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryImagesPanel.tsx
+++ b/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryImagesPanel.tsx
@@ -16,132 +16,139 @@ import { useIntl } from "react-intl";
 import { faMinus } from "@fortawesome/free-solid-svg-icons";
 import { galleryTitle } from "src/core/galleries";
 import { View } from "src/components/List/views";
+import { PatchComponent } from "src/patch";
+import { IItemListOperation } from "src/components/List/FilteredListToolbar";
 
 interface IGalleryDetailsProps {
   active: boolean;
   gallery: GQL.GalleryDataFragment;
+  extraOperations?: IItemListOperation<GQL.FindImagesQueryResult>[];
 }
 
-export const GalleryImagesPanel: React.FC<IGalleryDetailsProps> = ({
-  active,
-  gallery,
-}) => {
-  const intl = useIntl();
-  const Toast = useToast();
+export const GalleryImagesPanel: React.FC<IGalleryDetailsProps> =
+  PatchComponent(
+    "GalleryImagesPanel",
+    ({ active, gallery, extraOperations = [] }) => {
+      const intl = useIntl();
+      const Toast = useToast();
 
-  function filterHook(filter: ListFilterModel) {
-    const galleryValue = {
-      id: gallery.id!,
-      label: galleryTitle(gallery),
-    };
-    // if galleries is already present, then we modify it, otherwise add
-    let galleryCriterion = filter.criteria.find((c) => {
-      return c.criterionOption.type === "galleries";
-    }) as GalleriesCriterion | undefined;
+      function filterHook(filter: ListFilterModel) {
+        const galleryValue = {
+          id: gallery.id!,
+          label: galleryTitle(gallery),
+        };
+        // if galleries is already present, then we modify it, otherwise add
+        let galleryCriterion = filter.criteria.find((c) => {
+          return c.criterionOption.type === "galleries";
+        }) as GalleriesCriterion | undefined;
 
-    if (
-      galleryCriterion &&
-      (galleryCriterion.modifier === GQL.CriterionModifier.IncludesAll ||
-        galleryCriterion.modifier === GQL.CriterionModifier.Includes)
-    ) {
-      // add the gallery if not present
-      if (
-        !galleryCriterion.value.find((p) => {
-          return p.id === gallery.id;
-        })
-      ) {
-        galleryCriterion.value.push(galleryValue);
+        if (
+          galleryCriterion &&
+          (galleryCriterion.modifier === GQL.CriterionModifier.IncludesAll ||
+            galleryCriterion.modifier === GQL.CriterionModifier.Includes)
+        ) {
+          // add the gallery if not present
+          if (
+            !galleryCriterion.value.find((p) => {
+              return p.id === gallery.id;
+            })
+          ) {
+            galleryCriterion.value.push(galleryValue);
+          }
+
+          galleryCriterion.modifier = GQL.CriterionModifier.IncludesAll;
+        } else {
+          // overwrite
+          galleryCriterion = new GalleriesCriterion();
+          galleryCriterion.value = [galleryValue];
+          filter.criteria.push(galleryCriterion);
+        }
+
+        return filter;
       }
 
-      galleryCriterion.modifier = GQL.CriterionModifier.IncludesAll;
-    } else {
-      // overwrite
-      galleryCriterion = new GalleriesCriterion();
-      galleryCriterion.value = [galleryValue];
-      filter.criteria.push(galleryCriterion);
-    }
+      async function setCover(
+        result: GQL.FindImagesQueryResult,
+        filter: ListFilterModel,
+        selectedIds: Set<string>
+      ) {
+        const coverImageID = selectedIds.values().next();
+        if (coverImageID.done) {
+          // operation should only be displayed when exactly one image is selected
+          return;
+        }
+        try {
+          await mutateSetGalleryCover({
+            gallery_id: gallery.id!,
+            cover_image_id: coverImageID.value,
+          });
 
-    return filter;
-  }
+          Toast.success(
+            intl.formatMessage(
+              { id: "toast.updated_entity" },
+              {
+                entity: intl
+                  .formatMessage({ id: "gallery" })
+                  .toLocaleLowerCase(),
+              }
+            )
+          );
+        } catch (e) {
+          Toast.error(e);
+        }
+      }
 
-  async function setCover(
-    result: GQL.FindImagesQueryResult,
-    filter: ListFilterModel,
-    selectedIds: Set<string>
-  ) {
-    const coverImageID = selectedIds.values().next();
-    if (coverImageID.done) {
-      // operation should only be displayed when exactly one image is selected
-      return;
-    }
-    try {
-      await mutateSetGalleryCover({
-        gallery_id: gallery.id!,
-        cover_image_id: coverImageID.value,
-      });
+      async function removeImages(
+        result: GQL.FindImagesQueryResult,
+        filter: ListFilterModel,
+        selectedIds: Set<string>
+      ) {
+        try {
+          await mutateRemoveGalleryImages({
+            gallery_id: gallery.id!,
+            image_ids: Array.from(selectedIds.values()),
+          });
 
-      Toast.success(
-        intl.formatMessage(
-          { id: "toast.updated_entity" },
-          {
-            entity: intl.formatMessage({ id: "gallery" }).toLocaleLowerCase(),
-          }
-        )
+          Toast.success(
+            intl.formatMessage(
+              { id: "toast.removed_entity" },
+              {
+                count: selectedIds.size,
+                singularEntity: intl.formatMessage({ id: "image" }),
+                pluralEntity: intl.formatMessage({ id: "images" }),
+              }
+            )
+          );
+        } catch (e) {
+          Toast.error(e);
+        }
+      }
+
+      const otherOperations = [
+        ...extraOperations,
+        {
+          text: intl.formatMessage({ id: "actions.set_cover" }),
+          onClick: setCover,
+          isDisplayed: showWhenSingleSelection,
+        },
+        {
+          text: intl.formatMessage({ id: "actions.remove_from_gallery" }),
+          onClick: removeImages,
+          isDisplayed: showWhenSelected,
+          postRefetch: true,
+          icon: faMinus,
+          buttonVariant: "danger",
+        },
+      ];
+
+      return (
+        <ImageList
+          filterHook={filterHook}
+          alterQuery={active}
+          extraOperations={otherOperations}
+          view={View.GalleryImages}
+          chapters={gallery.chapters}
+        />
       );
-    } catch (e) {
-      Toast.error(e);
     }
-  }
-
-  async function removeImages(
-    result: GQL.FindImagesQueryResult,
-    filter: ListFilterModel,
-    selectedIds: Set<string>
-  ) {
-    try {
-      await mutateRemoveGalleryImages({
-        gallery_id: gallery.id!,
-        image_ids: Array.from(selectedIds.values()),
-      });
-
-      Toast.success(
-        intl.formatMessage(
-          { id: "toast.removed_entity" },
-          {
-            count: selectedIds.size,
-            singularEntity: intl.formatMessage({ id: "image" }),
-            pluralEntity: intl.formatMessage({ id: "images" }),
-          }
-        )
-      );
-    } catch (e) {
-      Toast.error(e);
-    }
-  }
-
-  const otherOperations = [
-    {
-      text: intl.formatMessage({ id: "actions.set_cover" }),
-      onClick: setCover,
-      isDisplayed: showWhenSingleSelection,
-    },
-    {
-      text: intl.formatMessage({ id: "actions.remove_from_gallery" }),
-      onClick: removeImages,
-      isDisplayed: showWhenSelected,
-      postRefetch: true,
-      icon: faMinus,
-      buttonVariant: "danger",
-    },
-  ];
-
-  return (
-    <ImageList
-      filterHook={filterHook}
-      alterQuery={active}
-      extraOperations={otherOperations}
-      view={View.GalleryImages}
-      chapters={gallery.chapters}
-    />
   );
-};
diff --git a/ui/v2.5/src/components/Galleries/GalleryList.tsx b/ui/v2.5/src/components/Galleries/GalleryList.tsx
index 105557175..d18aadbd3 100644
--- a/ui/v2.5/src/components/Galleries/GalleryList.tsx
+++ b/ui/v2.5/src/components/Galleries/GalleryList.tsx
@@ -15,6 +15,8 @@ import { ExportDialog } from "../Shared/ExportDialog";
 import { GalleryListTable } from "./GalleryListTable";
 import { GalleryCardGrid } from "./GalleryGridCard";
 import { View } from "../List/views";
+import { PatchComponent } from "src/patch";
+import { IItemListOperation } from "../List/FilteredListToolbar";
 
 function getItems(result: GQL.FindGalleriesQueryResult) {
   return result?.data?.findGalleries?.galleries ?? [];
@@ -28,180 +30,183 @@ interface IGalleryList {
   filterHook?: (filter: ListFilterModel) => ListFilterModel;
   view?: View;
   alterQuery?: boolean;
+  extraOperations?: IItemListOperation<GQL.FindGalleriesQueryResult>[];
 }
 
-export const GalleryList: React.FC<IGalleryList> = ({
-  filterHook,
-  view,
-  alterQuery,
-}) => {
-  const intl = useIntl();
-  const history = useHistory();
-  const [isExportDialogOpen, setIsExportDialogOpen] = useState(false);
-  const [isExportAll, setIsExportAll] = useState(false);
+export const GalleryList: React.FC<IGalleryList> = PatchComponent(
+  "GalleryList",
+  ({ filterHook, view, alterQuery, extraOperations = [] }) => {
+    const intl = useIntl();
+    const history = useHistory();
+    const [isExportDialogOpen, setIsExportDialogOpen] = useState(false);
+    const [isExportAll, setIsExportAll] = useState(false);
 
-  const filterMode = GQL.FilterMode.Galleries;
+    const filterMode = GQL.FilterMode.Galleries;
 
-  const otherOperations = [
-    {
-      text: intl.formatMessage({ id: "actions.view_random" }),
-      onClick: viewRandom,
-    },
-    {
-      text: intl.formatMessage({ id: "actions.export" }),
-      onClick: onExport,
-      isDisplayed: showWhenSelected,
-    },
-    {
-      text: intl.formatMessage({ id: "actions.export_all" }),
-      onClick: onExportAll,
-    },
-  ];
+    const otherOperations = [
+      ...extraOperations,
+      {
+        text: intl.formatMessage({ id: "actions.view_random" }),
+        onClick: viewRandom,
+      },
+      {
+        text: intl.formatMessage({ id: "actions.export" }),
+        onClick: onExport,
+        isDisplayed: showWhenSelected,
+      },
+      {
+        text: intl.formatMessage({ id: "actions.export_all" }),
+        onClick: onExportAll,
+      },
+    ];
 
-  function addKeybinds(
-    result: GQL.FindGalleriesQueryResult,
-    filter: ListFilterModel
-  ) {
-    Mousetrap.bind("p r", () => {
-      viewRandom(result, filter);
-    });
+    function addKeybinds(
+      result: GQL.FindGalleriesQueryResult,
+      filter: ListFilterModel
+    ) {
+      Mousetrap.bind("p r", () => {
+        viewRandom(result, filter);
+      });
 
-    return () => {
-      Mousetrap.unbind("p r");
-    };
-  }
-
-  async function viewRandom(
-    result: GQL.FindGalleriesQueryResult,
-    filter: ListFilterModel
-  ) {
-    // query for a random image
-    if (result.data?.findGalleries) {
-      const { count } = result.data.findGalleries;
-
-      const index = Math.floor(Math.random() * count);
-      const filterCopy = cloneDeep(filter);
-      filterCopy.itemsPerPage = 1;
-      filterCopy.currentPage = index + 1;
-      const singleResult = await queryFindGalleries(filterCopy);
-      if (singleResult.data.findGalleries.galleries.length === 1) {
-        const { id } = singleResult.data.findGalleries.galleries[0];
-        // navigate to the image player page
-        history.push(`/galleries/${id}`);
-      }
+      return () => {
+        Mousetrap.unbind("p r");
+      };
     }
-  }
 
-  async function onExport() {
-    setIsExportAll(false);
-    setIsExportDialogOpen(true);
-  }
+    async function viewRandom(
+      result: GQL.FindGalleriesQueryResult,
+      filter: ListFilterModel
+    ) {
+      // query for a random image
+      if (result.data?.findGalleries) {
+        const { count } = result.data.findGalleries;
 
-  async function onExportAll() {
-    setIsExportAll(true);
-    setIsExportDialogOpen(true);
-  }
-
-  function renderContent(
-    result: GQL.FindGalleriesQueryResult,
-    filter: ListFilterModel,
-    selectedIds: Set<string>,
-    onSelectChange: (id: string, selected: boolean, shiftKey: boolean) => void
-  ) {
-    function maybeRenderGalleryExportDialog() {
-      if (isExportDialogOpen) {
-        return (
-          <ExportDialog
-            exportInput={{
-              galleries: {
-                ids: Array.from(selectedIds.values()),
-                all: isExportAll,
-              },
-            }}
-            onClose={() => setIsExportDialogOpen(false)}
-          />
-        );
+        const index = Math.floor(Math.random() * count);
+        const filterCopy = cloneDeep(filter);
+        filterCopy.itemsPerPage = 1;
+        filterCopy.currentPage = index + 1;
+        const singleResult = await queryFindGalleries(filterCopy);
+        if (singleResult.data.findGalleries.galleries.length === 1) {
+          const { id } = singleResult.data.findGalleries.galleries[0];
+          // navigate to the image player page
+          history.push(`/galleries/${id}`);
+        }
       }
     }
 
-    function renderGalleries() {
-      if (!result.data?.findGalleries) return;
+    async function onExport() {
+      setIsExportAll(false);
+      setIsExportDialogOpen(true);
+    }
 
-      if (filter.displayMode === DisplayMode.Grid) {
-        return (
-          <GalleryCardGrid
-            galleries={result.data.findGalleries.galleries}
-            selectedIds={selectedIds}
-            zoomIndex={filter.zoomIndex}
-            onSelectChange={onSelectChange}
-          />
-        );
+    async function onExportAll() {
+      setIsExportAll(true);
+      setIsExportDialogOpen(true);
+    }
+
+    function renderContent(
+      result: GQL.FindGalleriesQueryResult,
+      filter: ListFilterModel,
+      selectedIds: Set<string>,
+      onSelectChange: (id: string, selected: boolean, shiftKey: boolean) => void
+    ) {
+      function maybeRenderGalleryExportDialog() {
+        if (isExportDialogOpen) {
+          return (
+            <ExportDialog
+              exportInput={{
+                galleries: {
+                  ids: Array.from(selectedIds.values()),
+                  all: isExportAll,
+                },
+              }}
+              onClose={() => setIsExportDialogOpen(false)}
+            />
+          );
+        }
       }
-      if (filter.displayMode === DisplayMode.List) {
-        return (
-          <GalleryListTable
-            galleries={result.data.findGalleries.galleries}
-            selectedIds={selectedIds}
-            onSelectChange={onSelectChange}
-          />
-        );
-      }
-      if (filter.displayMode === DisplayMode.Wall) {
-        return (
-          <div className="row">
-            <div className={`GalleryWall zoom-${filter.zoomIndex}`}>
-              {result.data.findGalleries.galleries.map((gallery) => (
-                <GalleryWallCard key={gallery.id} gallery={gallery} />
-              ))}
+
+      function renderGalleries() {
+        if (!result.data?.findGalleries) return;
+
+        if (filter.displayMode === DisplayMode.Grid) {
+          return (
+            <GalleryCardGrid
+              galleries={result.data.findGalleries.galleries}
+              selectedIds={selectedIds}
+              zoomIndex={filter.zoomIndex}
+              onSelectChange={onSelectChange}
+            />
+          );
+        }
+        if (filter.displayMode === DisplayMode.List) {
+          return (
+            <GalleryListTable
+              galleries={result.data.findGalleries.galleries}
+              selectedIds={selectedIds}
+              onSelectChange={onSelectChange}
+            />
+          );
+        }
+        if (filter.displayMode === DisplayMode.Wall) {
+          return (
+            <div className="row">
+              <div className={`GalleryWall zoom-${filter.zoomIndex}`}>
+                {result.data.findGalleries.galleries.map((gallery) => (
+                  <GalleryWallCard key={gallery.id} gallery={gallery} />
+                ))}
+              </div>
             </div>
-          </div>
-        );
+          );
+        }
       }
+
+      return (
+        <>
+          {maybeRenderGalleryExportDialog()}
+          {renderGalleries()}
+        </>
+      );
+    }
+
+    function renderEditDialog(
+      selectedImages: GQL.SlimGalleryDataFragment[],
+      onClose: (applied: boolean) => void
+    ) {
+      return (
+        <EditGalleriesDialog selected={selectedImages} onClose={onClose} />
+      );
+    }
+
+    function renderDeleteDialog(
+      selectedImages: GQL.SlimGalleryDataFragment[],
+      onClose: (confirmed: boolean) => void
+    ) {
+      return (
+        <DeleteGalleriesDialog selected={selectedImages} onClose={onClose} />
+      );
     }
 
     return (
-      <>
-        {maybeRenderGalleryExportDialog()}
-        {renderGalleries()}
-      </>
-    );
-  }
-
-  function renderEditDialog(
-    selectedImages: GQL.SlimGalleryDataFragment[],
-    onClose: (applied: boolean) => void
-  ) {
-    return <EditGalleriesDialog selected={selectedImages} onClose={onClose} />;
-  }
-
-  function renderDeleteDialog(
-    selectedImages: GQL.SlimGalleryDataFragment[],
-    onClose: (confirmed: boolean) => void
-  ) {
-    return (
-      <DeleteGalleriesDialog selected={selectedImages} onClose={onClose} />
-    );
-  }
-
-  return (
-    <ItemListContext
-      filterMode={filterMode}
-      useResult={useFindGalleries}
-      getItems={getItems}
-      getCount={getCount}
-      alterQuery={alterQuery}
-      filterHook={filterHook}
-      view={view}
-      selectable
-    >
-      <ItemList
+      <ItemListContext
+        filterMode={filterMode}
+        useResult={useFindGalleries}
+        getItems={getItems}
+        getCount={getCount}
+        alterQuery={alterQuery}
+        filterHook={filterHook}
         view={view}
-        otherOperations={otherOperations}
-        addKeybinds={addKeybinds}
-        renderContent={renderContent}
-        renderEditDialog={renderEditDialog}
-        renderDeleteDialog={renderDeleteDialog}
-      />
-    </ItemListContext>
-  );
-};
+        selectable
+      >
+        <ItemList
+          view={view}
+          otherOperations={otherOperations}
+          addKeybinds={addKeybinds}
+          renderContent={renderContent}
+          renderEditDialog={renderEditDialog}
+          renderDeleteDialog={renderDeleteDialog}
+        />
+      </ItemListContext>
+    );
+  }
+);
diff --git a/ui/v2.5/src/components/Groups/GroupDetails/GroupSubGroupsPanel.tsx b/ui/v2.5/src/components/Groups/GroupDetails/GroupSubGroupsPanel.tsx
index a02cb6108..bd66490f9 100644
--- a/ui/v2.5/src/components/Groups/GroupDetails/GroupSubGroupsPanel.tsx
+++ b/ui/v2.5/src/components/Groups/GroupDetails/GroupSubGroupsPanel.tsx
@@ -18,7 +18,10 @@ import {
   SearchTermInput,
 } from "src/components/List/ListFilter";
 import { useFilter } from "src/components/List/FilterProvider";
-import { IFilteredListToolbar } from "src/components/List/FilteredListToolbar";
+import {
+  IFilteredListToolbar,
+  IItemListOperation,
+} from "src/components/List/FilteredListToolbar";
 import {
   showWhenNoneSelected,
   showWhenSelected,
@@ -28,6 +31,7 @@ import { useIntl } from "react-intl";
 import { useToast } from "src/hooks/Toast";
 import { useModal } from "src/hooks/modal";
 import { AddSubGroupsDialog } from "./AddGroupsDialog";
+import { PatchComponent } from "src/patch";
 
 const useContainingGroupFilterHook = (
   group: Pick<GQL.StudioDataFragment, "id" | "name">,
@@ -99,6 +103,7 @@ const Toolbar: React.FC<IFilteredListToolbar> = ({
 interface IGroupSubGroupsPanel {
   active: boolean;
   group: GQL.GroupDataFragment;
+  extraOperations?: IItemListOperation<GQL.FindGroupsQueryResult>[];
 }
 
 const defaultFilter = (() => {
@@ -113,92 +118,99 @@ const defaultFilter = (() => {
   return ret;
 })();
 
-export const GroupSubGroupsPanel: React.FC<IGroupSubGroupsPanel> = ({
-  active,
-  group,
-}) => {
-  const intl = useIntl();
-  const Toast = useToast();
-  const { modal, showModal, closeModal } = useModal();
+export const GroupSubGroupsPanel: React.FC<IGroupSubGroupsPanel> =
+  PatchComponent(
+    "GroupSubGroupsPanel",
+    ({ active, group, extraOperations = [] }) => {
+      const intl = useIntl();
+      const Toast = useToast();
+      const { modal, showModal, closeModal } = useModal();
 
-  const [reorderSubGroups] = useReorderSubGroupsMutation();
-  const mutateRemoveSubGroups = useRemoveSubGroups();
+      const [reorderSubGroups] = useReorderSubGroupsMutation();
+      const mutateRemoveSubGroups = useRemoveSubGroups();
 
-  const filterHook = useContainingGroupFilterHook(group);
+      const filterHook = useContainingGroupFilterHook(group);
 
-  async function removeSubGroups(
-    result: GQL.FindGroupsQueryResult,
-    filter: ListFilterModel,
-    selectedIds: Set<string>
-  ) {
-    try {
-      await mutateRemoveSubGroups(group.id, Array.from(selectedIds.values()));
+      async function removeSubGroups(
+        result: GQL.FindGroupsQueryResult,
+        filter: ListFilterModel,
+        selectedIds: Set<string>
+      ) {
+        try {
+          await mutateRemoveSubGroups(
+            group.id,
+            Array.from(selectedIds.values())
+          );
 
-      Toast.success(
-        intl.formatMessage(
-          { id: "toast.removed_entity" },
-          {
-            count: selectedIds.size,
-            singularEntity: intl.formatMessage({ id: "group" }),
-            pluralEntity: intl.formatMessage({ id: "groups" }),
-          }
-        )
-      );
-    } catch (e) {
-      Toast.error(e);
-    }
-  }
+          Toast.success(
+            intl.formatMessage(
+              { id: "toast.removed_entity" },
+              {
+                count: selectedIds.size,
+                singularEntity: intl.formatMessage({ id: "group" }),
+                pluralEntity: intl.formatMessage({ id: "groups" }),
+              }
+            )
+          );
+        } catch (e) {
+          Toast.error(e);
+        }
+      }
 
-  async function onAddSubGroups() {
-    showModal(
-      <AddSubGroupsDialog containingGroup={group} onClose={closeModal} />
-    );
-  }
+      async function onAddSubGroups() {
+        showModal(
+          <AddSubGroupsDialog containingGroup={group} onClose={closeModal} />
+        );
+      }
 
-  const otherOperations = [
-    {
-      text: intl.formatMessage({ id: "actions.add_sub_groups" }),
-      onClick: onAddSubGroups,
-      isDisplayed: showWhenNoneSelected,
-      postRefetch: true,
-      icon: faPlus,
-      buttonVariant: "secondary",
-    },
-    {
-      text: intl.formatMessage({ id: "actions.remove_from_containing_group" }),
-      onClick: removeSubGroups,
-      isDisplayed: showWhenSelected,
-      postRefetch: true,
-      icon: faMinus,
-      buttonVariant: "danger",
-    },
-  ];
-
-  function onMove(srcIds: string[], targetId: string, after: boolean) {
-    reorderSubGroups({
-      variables: {
-        input: {
-          group_id: group.id,
-          sub_group_ids: srcIds,
-          insert_at_id: targetId,
-          insert_after: after,
+      const otherOperations = [
+        ...extraOperations,
+        {
+          text: intl.formatMessage({ id: "actions.add_sub_groups" }),
+          onClick: onAddSubGroups,
+          isDisplayed: showWhenNoneSelected,
+          postRefetch: true,
+          icon: faPlus,
+          buttonVariant: "secondary",
         },
-      },
-    });
-  }
+        {
+          text: intl.formatMessage({
+            id: "actions.remove_from_containing_group",
+          }),
+          onClick: removeSubGroups,
+          isDisplayed: showWhenSelected,
+          postRefetch: true,
+          icon: faMinus,
+          buttonVariant: "danger",
+        },
+      ];
 
-  return (
-    <>
-      {modal}
-      <GroupList
-        defaultFilter={defaultFilter}
-        filterHook={filterHook}
-        alterQuery={active}
-        fromGroupId={group.id}
-        otherOperations={otherOperations}
-        onMove={onMove}
-        renderToolbar={(props) => <Toolbar {...props} />}
-      />
-    </>
+      function onMove(srcIds: string[], targetId: string, after: boolean) {
+        reorderSubGroups({
+          variables: {
+            input: {
+              group_id: group.id,
+              sub_group_ids: srcIds,
+              insert_at_id: targetId,
+              insert_after: after,
+            },
+          },
+        });
+      }
+
+      return (
+        <>
+          {modal}
+          <GroupList
+            defaultFilter={defaultFilter}
+            filterHook={filterHook}
+            alterQuery={active}
+            fromGroupId={group.id}
+            otherOperations={otherOperations}
+            onMove={onMove}
+            renderToolbar={(props) => <Toolbar {...props} />}
+          />
+        </>
+      );
+    }
   );
-};
diff --git a/ui/v2.5/src/components/Groups/GroupList.tsx b/ui/v2.5/src/components/Groups/GroupList.tsx
index aade245b0..38fda7862 100644
--- a/ui/v2.5/src/components/Groups/GroupList.tsx
+++ b/ui/v2.5/src/components/Groups/GroupList.tsx
@@ -21,6 +21,7 @@ import {
   IFilteredListToolbar,
   IItemListOperation,
 } from "../List/FilteredListToolbar";
+import { PatchComponent } from "src/patch";
 
 const GroupExportDialog: React.FC<{
   open?: boolean;
@@ -90,150 +91,153 @@ interface IGroupList extends IGroupListContext {
   otherOperations?: IItemListOperation<GQL.FindGroupsQueryResult>[];
 }
 
-export const GroupList: React.FC<IGroupList> = ({
-  filterHook,
-  alterQuery,
-  defaultFilter,
-  view,
-  fromGroupId,
-  onMove,
-  selectable,
-  renderToolbar,
-  otherOperations: providedOperations = [],
-}) => {
-  const intl = useIntl();
-  const history = useHistory();
-  const [isExportDialogOpen, setIsExportDialogOpen] = useState(false);
-  const [isExportAll, setIsExportAll] = useState(false);
+export const GroupList: React.FC<IGroupList> = PatchComponent(
+  "GroupList",
+  ({
+    filterHook,
+    alterQuery,
+    defaultFilter,
+    view,
+    fromGroupId,
+    onMove,
+    selectable,
+    renderToolbar,
+    otherOperations: providedOperations = [],
+  }) => {
+    const intl = useIntl();
+    const history = useHistory();
+    const [isExportDialogOpen, setIsExportDialogOpen] = useState(false);
+    const [isExportAll, setIsExportAll] = useState(false);
 
-  const otherOperations = [
-    {
-      text: intl.formatMessage({ id: "actions.view_random" }),
-      onClick: viewRandom,
-    },
-    {
-      text: intl.formatMessage({ id: "actions.export" }),
-      onClick: onExport,
-      isDisplayed: showWhenSelected,
-    },
-    {
-      text: intl.formatMessage({ id: "actions.export_all" }),
-      onClick: onExportAll,
-    },
-    ...providedOperations,
-  ];
+    const otherOperations = [
+      {
+        text: intl.formatMessage({ id: "actions.view_random" }),
+        onClick: viewRandom,
+      },
+      {
+        text: intl.formatMessage({ id: "actions.export" }),
+        onClick: onExport,
+        isDisplayed: showWhenSelected,
+      },
+      {
+        text: intl.formatMessage({ id: "actions.export_all" }),
+        onClick: onExportAll,
+      },
+      ...providedOperations,
+    ];
 
-  function addKeybinds(
-    result: GQL.FindGroupsQueryResult,
-    filter: ListFilterModel
-  ) {
-    Mousetrap.bind("p r", () => {
-      viewRandom(result, filter);
-    });
+    function addKeybinds(
+      result: GQL.FindGroupsQueryResult,
+      filter: ListFilterModel
+    ) {
+      Mousetrap.bind("p r", () => {
+        viewRandom(result, filter);
+      });
 
-    return () => {
-      Mousetrap.unbind("p r");
-    };
-  }
+      return () => {
+        Mousetrap.unbind("p r");
+      };
+    }
 
-  async function viewRandom(
-    result: GQL.FindGroupsQueryResult,
-    filter: ListFilterModel
-  ) {
-    // query for a random image
-    if (result.data?.findGroups) {
-      const { count } = result.data.findGroups;
+    async function viewRandom(
+      result: GQL.FindGroupsQueryResult,
+      filter: ListFilterModel
+    ) {
+      // query for a random image
+      if (result.data?.findGroups) {
+        const { count } = result.data.findGroups;
 
-      const index = Math.floor(Math.random() * count);
-      const filterCopy = cloneDeep(filter);
-      filterCopy.itemsPerPage = 1;
-      filterCopy.currentPage = index + 1;
-      const singleResult = await queryFindGroups(filterCopy);
-      if (singleResult.data.findGroups.groups.length === 1) {
-        const { id } = singleResult.data.findGroups.groups[0];
-        // navigate to the group page
-        history.push(`/groups/${id}`);
+        const index = Math.floor(Math.random() * count);
+        const filterCopy = cloneDeep(filter);
+        filterCopy.itemsPerPage = 1;
+        filterCopy.currentPage = index + 1;
+        const singleResult = await queryFindGroups(filterCopy);
+        if (singleResult.data.findGroups.groups.length === 1) {
+          const { id } = singleResult.data.findGroups.groups[0];
+          // navigate to the group page
+          history.push(`/groups/${id}`);
+        }
       }
     }
-  }
 
-  async function onExport() {
-    setIsExportAll(false);
-    setIsExportDialogOpen(true);
-  }
+    async function onExport() {
+      setIsExportAll(false);
+      setIsExportDialogOpen(true);
+    }
 
-  async function onExportAll() {
-    setIsExportAll(true);
-    setIsExportDialogOpen(true);
-  }
+    async function onExportAll() {
+      setIsExportAll(true);
+      setIsExportDialogOpen(true);
+    }
 
-  function renderContent(
-    result: GQL.FindGroupsQueryResult,
-    filter: ListFilterModel,
-    selectedIds: Set<string>,
-    onSelectChange: (id: string, selected: boolean, shiftKey: boolean) => void
-  ) {
-    return (
-      <>
-        <GroupExportDialog
-          open={isExportDialogOpen}
-          selectedIds={selectedIds}
-          isExportAll={isExportAll}
-          onClose={() => setIsExportDialogOpen(false)}
-        />
-        {filter.displayMode === DisplayMode.Grid && (
-          <GroupCardGrid
-            groups={result.data?.findGroups.groups ?? []}
-            zoomIndex={filter.zoomIndex}
+    function renderContent(
+      result: GQL.FindGroupsQueryResult,
+      filter: ListFilterModel,
+      selectedIds: Set<string>,
+      onSelectChange: (id: string, selected: boolean, shiftKey: boolean) => void
+    ) {
+      return (
+        <>
+          <GroupExportDialog
+            open={isExportDialogOpen}
             selectedIds={selectedIds}
-            onSelectChange={onSelectChange}
-            fromGroupId={fromGroupId}
-            onMove={onMove}
+            isExportAll={isExportAll}
+            onClose={() => setIsExportDialogOpen(false)}
           />
-        )}
-      </>
-    );
-  }
+          {filter.displayMode === DisplayMode.Grid && (
+            <GroupCardGrid
+              groups={result.data?.findGroups.groups ?? []}
+              zoomIndex={filter.zoomIndex}
+              selectedIds={selectedIds}
+              onSelectChange={onSelectChange}
+              fromGroupId={fromGroupId}
+              onMove={onMove}
+            />
+          )}
+        </>
+      );
+    }
 
-  function renderEditDialog(
-    selectedGroups: GQL.GroupDataFragment[],
-    onClose: (applied: boolean) => void
-  ) {
-    return <EditGroupsDialog selected={selectedGroups} onClose={onClose} />;
-  }
+    function renderEditDialog(
+      selectedGroups: GQL.GroupDataFragment[],
+      onClose: (applied: boolean) => void
+    ) {
+      return <EditGroupsDialog selected={selectedGroups} onClose={onClose} />;
+    }
+
+    function renderDeleteDialog(
+      selectedGroups: GQL.SlimGroupDataFragment[],
+      onClose: (confirmed: boolean) => void
+    ) {
+      return (
+        <DeleteEntityDialog
+          selected={selectedGroups}
+          onClose={onClose}
+          singularEntity={intl.formatMessage({ id: "group" })}
+          pluralEntity={intl.formatMessage({ id: "groups" })}
+          destroyMutation={useGroupsDestroy}
+        />
+      );
+    }
 
-  function renderDeleteDialog(
-    selectedGroups: GQL.SlimGroupDataFragment[],
-    onClose: (confirmed: boolean) => void
-  ) {
     return (
-      <DeleteEntityDialog
-        selected={selectedGroups}
-        onClose={onClose}
-        singularEntity={intl.formatMessage({ id: "group" })}
-        pluralEntity={intl.formatMessage({ id: "groups" })}
-        destroyMutation={useGroupsDestroy}
-      />
+      <GroupListContext
+        alterQuery={alterQuery}
+        filterHook={filterHook}
+        view={view}
+        defaultFilter={defaultFilter}
+        selectable={selectable}
+      >
+        <ItemList
+          view={view}
+          otherOperations={otherOperations}
+          addKeybinds={addKeybinds}
+          renderContent={renderContent}
+          renderEditDialog={renderEditDialog}
+          renderDeleteDialog={renderDeleteDialog}
+          renderToolbar={renderToolbar}
+        />
+      </GroupListContext>
     );
   }
-
-  return (
-    <GroupListContext
-      alterQuery={alterQuery}
-      filterHook={filterHook}
-      view={view}
-      defaultFilter={defaultFilter}
-      selectable={selectable}
-    >
-      <ItemList
-        view={view}
-        otherOperations={otherOperations}
-        addKeybinds={addKeybinds}
-        renderContent={renderContent}
-        renderEditDialog={renderEditDialog}
-        renderDeleteDialog={renderDeleteDialog}
-        renderToolbar={renderToolbar}
-      />
-    </GroupListContext>
-  );
-};
+);
diff --git a/ui/v2.5/src/components/Images/ImageList.tsx b/ui/v2.5/src/components/Images/ImageList.tsx
index 23e93a94c..9ca5513a9 100644
--- a/ui/v2.5/src/components/Images/ImageList.tsx
+++ b/ui/v2.5/src/components/Images/ImageList.tsx
@@ -26,6 +26,7 @@ import { ImageGridCard } from "./ImageGridCard";
 import { View } from "../List/views";
 import { IItemListOperation } from "../List/FilteredListToolbar";
 import { FileSize } from "../Shared/FileSize";
+import { PatchComponent } from "src/patch";
 
 interface IImageWallProps {
   images: GQL.SlimImageDataFragment[];
@@ -318,167 +319,168 @@ interface IImageList {
   chapters?: GQL.GalleryChapterDataFragment[];
 }
 
-export const ImageList: React.FC<IImageList> = ({
-  filterHook,
-  view,
-  alterQuery,
-  extraOperations,
-  chapters = [],
-}) => {
-  const intl = useIntl();
-  const history = useHistory();
-  const [isExportDialogOpen, setIsExportDialogOpen] = useState(false);
-  const [isExportAll, setIsExportAll] = useState(false);
-  const [slideshowRunning, setSlideshowRunning] = useState<boolean>(false);
+export const ImageList: React.FC<IImageList> = PatchComponent(
+  "ImageList",
+  ({ filterHook, view, alterQuery, extraOperations = [], chapters = [] }) => {
+    const intl = useIntl();
+    const history = useHistory();
+    const [isExportDialogOpen, setIsExportDialogOpen] = useState(false);
+    const [isExportAll, setIsExportAll] = useState(false);
+    const [slideshowRunning, setSlideshowRunning] = useState<boolean>(false);
 
-  const filterMode = GQL.FilterMode.Images;
+    const filterMode = GQL.FilterMode.Images;
 
-  const otherOperations = [
-    ...(extraOperations ?? []),
-    {
-      text: intl.formatMessage({ id: "actions.view_random" }),
-      onClick: viewRandom,
-    },
-    {
-      text: intl.formatMessage({ id: "actions.export" }),
-      onClick: onExport,
-      isDisplayed: showWhenSelected,
-    },
-    {
-      text: intl.formatMessage({ id: "actions.export_all" }),
-      onClick: onExportAll,
-    },
-  ];
+    const otherOperations = [
+      ...extraOperations,
+      {
+        text: intl.formatMessage({ id: "actions.view_random" }),
+        onClick: viewRandom,
+      },
+      {
+        text: intl.formatMessage({ id: "actions.export" }),
+        onClick: onExport,
+        isDisplayed: showWhenSelected,
+      },
+      {
+        text: intl.formatMessage({ id: "actions.export_all" }),
+        onClick: onExportAll,
+      },
+    ];
 
-  function addKeybinds(
-    result: GQL.FindImagesQueryResult,
-    filter: ListFilterModel
-  ) {
-    Mousetrap.bind("p r", () => {
-      viewRandom(result, filter);
-    });
+    function addKeybinds(
+      result: GQL.FindImagesQueryResult,
+      filter: ListFilterModel
+    ) {
+      Mousetrap.bind("p r", () => {
+        viewRandom(result, filter);
+      });
 
-    return () => {
-      Mousetrap.unbind("p r");
-    };
-  }
+      return () => {
+        Mousetrap.unbind("p r");
+      };
+    }
 
-  async function viewRandom(
-    result: GQL.FindImagesQueryResult,
-    filter: ListFilterModel
-  ) {
-    // query for a random image
-    if (result.data?.findImages) {
-      const { count } = result.data.findImages;
+    async function viewRandom(
+      result: GQL.FindImagesQueryResult,
+      filter: ListFilterModel
+    ) {
+      // query for a random image
+      if (result.data?.findImages) {
+        const { count } = result.data.findImages;
 
-      const index = Math.floor(Math.random() * count);
-      const filterCopy = cloneDeep(filter);
-      filterCopy.itemsPerPage = 1;
-      filterCopy.currentPage = index + 1;
-      const singleResult = await queryFindImages(filterCopy);
-      if (singleResult.data.findImages.images.length === 1) {
-        const { id } = singleResult.data.findImages.images[0];
-        // navigate to the image player page
-        history.push(`/images/${id}`);
+        const index = Math.floor(Math.random() * count);
+        const filterCopy = cloneDeep(filter);
+        filterCopy.itemsPerPage = 1;
+        filterCopy.currentPage = index + 1;
+        const singleResult = await queryFindImages(filterCopy);
+        if (singleResult.data.findImages.images.length === 1) {
+          const { id } = singleResult.data.findImages.images[0];
+          // navigate to the image player page
+          history.push(`/images/${id}`);
+        }
       }
     }
-  }
 
-  async function onExport() {
-    setIsExportAll(false);
-    setIsExportDialogOpen(true);
-  }
+    async function onExport() {
+      setIsExportAll(false);
+      setIsExportDialogOpen(true);
+    }
 
-  async function onExportAll() {
-    setIsExportAll(true);
-    setIsExportDialogOpen(true);
-  }
+    async function onExportAll() {
+      setIsExportAll(true);
+      setIsExportDialogOpen(true);
+    }
+
+    function renderContent(
+      result: GQL.FindImagesQueryResult,
+      filter: ListFilterModel,
+      selectedIds: Set<string>,
+      onSelectChange: (
+        id: string,
+        selected: boolean,
+        shiftKey: boolean
+      ) => void,
+      onChangePage: (page: number) => void,
+      pageCount: number
+    ) {
+      function maybeRenderImageExportDialog() {
+        if (isExportDialogOpen) {
+          return (
+            <ExportDialog
+              exportInput={{
+                images: {
+                  ids: Array.from(selectedIds.values()),
+                  all: isExportAll,
+                },
+              }}
+              onClose={() => setIsExportDialogOpen(false)}
+            />
+          );
+        }
+      }
+
+      function renderImages() {
+        if (!result.data?.findImages) return;
 
-  function renderContent(
-    result: GQL.FindImagesQueryResult,
-    filter: ListFilterModel,
-    selectedIds: Set<string>,
-    onSelectChange: (id: string, selected: boolean, shiftKey: boolean) => void,
-    onChangePage: (page: number) => void,
-    pageCount: number
-  ) {
-    function maybeRenderImageExportDialog() {
-      if (isExportDialogOpen) {
         return (
-          <ExportDialog
-            exportInput={{
-              images: {
-                ids: Array.from(selectedIds.values()),
-                all: isExportAll,
-              },
-            }}
-            onClose={() => setIsExportDialogOpen(false)}
+          <ImageListImages
+            filter={filter}
+            images={result.data.findImages.images}
+            onChangePage={onChangePage}
+            onSelectChange={onSelectChange}
+            pageCount={pageCount}
+            selectedIds={selectedIds}
+            slideshowRunning={slideshowRunning}
+            setSlideshowRunning={setSlideshowRunning}
+            chapters={chapters}
           />
         );
       }
-    }
-
-    function renderImages() {
-      if (!result.data?.findImages) return;
 
       return (
-        <ImageListImages
-          filter={filter}
-          images={result.data.findImages.images}
-          onChangePage={onChangePage}
-          onSelectChange={onSelectChange}
-          pageCount={pageCount}
-          selectedIds={selectedIds}
-          slideshowRunning={slideshowRunning}
-          setSlideshowRunning={setSlideshowRunning}
-          chapters={chapters}
-        />
+        <>
+          {maybeRenderImageExportDialog()}
+          {renderImages()}
+        </>
       );
     }
 
+    function renderEditDialog(
+      selectedImages: GQL.SlimImageDataFragment[],
+      onClose: (applied: boolean) => void
+    ) {
+      return <EditImagesDialog selected={selectedImages} onClose={onClose} />;
+    }
+
+    function renderDeleteDialog(
+      selectedImages: GQL.SlimImageDataFragment[],
+      onClose: (confirmed: boolean) => void
+    ) {
+      return <DeleteImagesDialog selected={selectedImages} onClose={onClose} />;
+    }
+
     return (
-      <>
-        {maybeRenderImageExportDialog()}
-        {renderImages()}
-      </>
+      <ItemListContext
+        filterMode={filterMode}
+        useResult={useFindImages}
+        useMetadataInfo={useFindImagesMetadata}
+        getItems={getItems}
+        getCount={getCount}
+        alterQuery={alterQuery}
+        filterHook={filterHook}
+        view={view}
+        selectable
+      >
+        <ItemList
+          view={view}
+          otherOperations={otherOperations}
+          addKeybinds={addKeybinds}
+          renderContent={renderContent}
+          renderEditDialog={renderEditDialog}
+          renderDeleteDialog={renderDeleteDialog}
+          renderMetadataByline={renderMetadataByline}
+        />
+      </ItemListContext>
     );
   }
-
-  function renderEditDialog(
-    selectedImages: GQL.SlimImageDataFragment[],
-    onClose: (applied: boolean) => void
-  ) {
-    return <EditImagesDialog selected={selectedImages} onClose={onClose} />;
-  }
-
-  function renderDeleteDialog(
-    selectedImages: GQL.SlimImageDataFragment[],
-    onClose: (confirmed: boolean) => void
-  ) {
-    return <DeleteImagesDialog selected={selectedImages} onClose={onClose} />;
-  }
-
-  return (
-    <ItemListContext
-      filterMode={filterMode}
-      useResult={useFindImages}
-      useMetadataInfo={useFindImagesMetadata}
-      getItems={getItems}
-      getCount={getCount}
-      alterQuery={alterQuery}
-      filterHook={filterHook}
-      view={view}
-      selectable
-    >
-      <ItemList
-        view={view}
-        otherOperations={otherOperations}
-        addKeybinds={addKeybinds}
-        renderContent={renderContent}
-        renderEditDialog={renderEditDialog}
-        renderDeleteDialog={renderDeleteDialog}
-        renderMetadataByline={renderMetadataByline}
-      />
-    </ItemListContext>
-  );
-};
+);
diff --git a/ui/v2.5/src/components/Performers/PerformerList.tsx b/ui/v2.5/src/components/Performers/PerformerList.tsx
index 68733d3b8..b2c6dc36e 100644
--- a/ui/v2.5/src/components/Performers/PerformerList.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerList.tsx
@@ -22,6 +22,8 @@ import { cmToImperial, cmToInches, kgToLbs } from "src/utils/units";
 import TextUtils from "src/utils/text";
 import { PerformerCardGrid } from "./PerformerCardGrid";
 import { View } from "../List/views";
+import { IItemListOperation } from "../List/FilteredListToolbar";
+import { PatchComponent } from "src/patch";
 
 function getItems(result: GQL.FindPerformersQueryResult) {
   return result?.data?.findPerformers?.performers ?? [];
@@ -159,183 +161,185 @@ interface IPerformerList {
   view?: View;
   alterQuery?: boolean;
   extraCriteria?: IPerformerCardExtraCriteria;
+  extraOperations?: IItemListOperation<GQL.FindPerformersQueryResult>[];
 }
 
-export const PerformerList: React.FC<IPerformerList> = ({
-  filterHook,
-  view,
-  alterQuery,
-  extraCriteria,
-}) => {
-  const intl = useIntl();
-  const history = useHistory();
-  const [isExportDialogOpen, setIsExportDialogOpen] = useState(false);
-  const [isExportAll, setIsExportAll] = useState(false);
+export const PerformerList: React.FC<IPerformerList> = PatchComponent(
+  "PerformerList",
+  ({ filterHook, view, alterQuery, extraCriteria, extraOperations = [] }) => {
+    const intl = useIntl();
+    const history = useHistory();
+    const [isExportDialogOpen, setIsExportDialogOpen] = useState(false);
+    const [isExportAll, setIsExportAll] = useState(false);
 
-  const filterMode = GQL.FilterMode.Performers;
+    const filterMode = GQL.FilterMode.Performers;
 
-  const otherOperations = [
-    {
-      text: intl.formatMessage({ id: "actions.open_random" }),
-      onClick: openRandom,
-    },
-    {
-      text: intl.formatMessage({ id: "actions.export" }),
-      onClick: onExport,
-      isDisplayed: showWhenSelected,
-    },
-    {
-      text: intl.formatMessage({ id: "actions.export_all" }),
-      onClick: onExportAll,
-    },
-  ];
+    const otherOperations = [
+      ...extraOperations,
+      {
+        text: intl.formatMessage({ id: "actions.open_random" }),
+        onClick: openRandom,
+      },
+      {
+        text: intl.formatMessage({ id: "actions.export" }),
+        onClick: onExport,
+        isDisplayed: showWhenSelected,
+      },
+      {
+        text: intl.formatMessage({ id: "actions.export_all" }),
+        onClick: onExportAll,
+      },
+    ];
 
-  function addKeybinds(
-    result: GQL.FindPerformersQueryResult,
-    filter: ListFilterModel
-  ) {
-    Mousetrap.bind("p r", () => {
-      openRandom(result, filter);
-    });
+    function addKeybinds(
+      result: GQL.FindPerformersQueryResult,
+      filter: ListFilterModel
+    ) {
+      Mousetrap.bind("p r", () => {
+        openRandom(result, filter);
+      });
 
-    return () => {
-      Mousetrap.unbind("p r");
-    };
-  }
+      return () => {
+        Mousetrap.unbind("p r");
+      };
+    }
 
-  async function openRandom(
-    result: GQL.FindPerformersQueryResult,
-    filter: ListFilterModel
-  ) {
-    if (result.data?.findPerformers) {
-      const { count } = result.data.findPerformers;
-      const index = Math.floor(Math.random() * count);
-      const filterCopy = cloneDeep(filter);
-      filterCopy.itemsPerPage = 1;
-      filterCopy.currentPage = index + 1;
-      const singleResult = await queryFindPerformers(filterCopy);
-      if (singleResult.data.findPerformers.performers.length === 1) {
-        const { id } = singleResult.data.findPerformers.performers[0]!;
-        history.push(`/performers/${id}`);
+    async function openRandom(
+      result: GQL.FindPerformersQueryResult,
+      filter: ListFilterModel
+    ) {
+      if (result.data?.findPerformers) {
+        const { count } = result.data.findPerformers;
+        const index = Math.floor(Math.random() * count);
+        const filterCopy = cloneDeep(filter);
+        filterCopy.itemsPerPage = 1;
+        filterCopy.currentPage = index + 1;
+        const singleResult = await queryFindPerformers(filterCopy);
+        if (singleResult.data.findPerformers.performers.length === 1) {
+          const { id } = singleResult.data.findPerformers.performers[0]!;
+          history.push(`/performers/${id}`);
+        }
       }
     }
-  }
 
-  async function onExport() {
-    setIsExportAll(false);
-    setIsExportDialogOpen(true);
-  }
+    async function onExport() {
+      setIsExportAll(false);
+      setIsExportDialogOpen(true);
+    }
 
-  async function onExportAll() {
-    setIsExportAll(true);
-    setIsExportDialogOpen(true);
-  }
+    async function onExportAll() {
+      setIsExportAll(true);
+      setIsExportDialogOpen(true);
+    }
 
-  function renderContent(
-    result: GQL.FindPerformersQueryResult,
-    filter: ListFilterModel,
-    selectedIds: Set<string>,
-    onSelectChange: (id: string, selected: boolean, shiftKey: boolean) => void
-  ) {
-    function maybeRenderPerformerExportDialog() {
-      if (isExportDialogOpen) {
-        return (
-          <>
-            <ExportDialog
-              exportInput={{
-                performers: {
-                  ids: Array.from(selectedIds.values()),
-                  all: isExportAll,
-                },
-              }}
-              onClose={() => setIsExportDialogOpen(false)}
+    function renderContent(
+      result: GQL.FindPerformersQueryResult,
+      filter: ListFilterModel,
+      selectedIds: Set<string>,
+      onSelectChange: (id: string, selected: boolean, shiftKey: boolean) => void
+    ) {
+      function maybeRenderPerformerExportDialog() {
+        if (isExportDialogOpen) {
+          return (
+            <>
+              <ExportDialog
+                exportInput={{
+                  performers: {
+                    ids: Array.from(selectedIds.values()),
+                    all: isExportAll,
+                  },
+                }}
+                onClose={() => setIsExportDialogOpen(false)}
+              />
+            </>
+          );
+        }
+      }
+
+      function renderPerformers() {
+        if (!result.data?.findPerformers) return;
+
+        if (filter.displayMode === DisplayMode.Grid) {
+          return (
+            <PerformerCardGrid
+              performers={result.data.findPerformers.performers}
+              zoomIndex={filter.zoomIndex}
+              selectedIds={selectedIds}
+              onSelectChange={onSelectChange}
+              extraCriteria={extraCriteria}
             />
-          </>
-        );
+          );
+        }
+        if (filter.displayMode === DisplayMode.List) {
+          return (
+            <PerformerListTable
+              performers={result.data.findPerformers.performers}
+              selectedIds={selectedIds}
+              onSelectChange={onSelectChange}
+            />
+          );
+        }
+        if (filter.displayMode === DisplayMode.Tagger) {
+          return (
+            <PerformerTagger
+              performers={result.data.findPerformers.performers}
+            />
+          );
+        }
       }
+
+      return (
+        <>
+          {maybeRenderPerformerExportDialog()}
+          {renderPerformers()}
+        </>
+      );
     }
 
-    function renderPerformers() {
-      if (!result.data?.findPerformers) return;
+    function renderEditDialog(
+      selectedPerformers: GQL.SlimPerformerDataFragment[],
+      onClose: (applied: boolean) => void
+    ) {
+      return (
+        <EditPerformersDialog selected={selectedPerformers} onClose={onClose} />
+      );
+    }
 
-      if (filter.displayMode === DisplayMode.Grid) {
-        return (
-          <PerformerCardGrid
-            performers={result.data.findPerformers.performers}
-            zoomIndex={filter.zoomIndex}
-            selectedIds={selectedIds}
-            onSelectChange={onSelectChange}
-            extraCriteria={extraCriteria}
-          />
-        );
-      }
-      if (filter.displayMode === DisplayMode.List) {
-        return (
-          <PerformerListTable
-            performers={result.data.findPerformers.performers}
-            selectedIds={selectedIds}
-            onSelectChange={onSelectChange}
-          />
-        );
-      }
-      if (filter.displayMode === DisplayMode.Tagger) {
-        return (
-          <PerformerTagger performers={result.data.findPerformers.performers} />
-        );
-      }
+    function renderDeleteDialog(
+      selectedPerformers: GQL.SlimPerformerDataFragment[],
+      onClose: (confirmed: boolean) => void
+    ) {
+      return (
+        <DeleteEntityDialog
+          selected={selectedPerformers}
+          onClose={onClose}
+          singularEntity={intl.formatMessage({ id: "performer" })}
+          pluralEntity={intl.formatMessage({ id: "performers" })}
+          destroyMutation={usePerformersDestroy}
+        />
+      );
     }
 
     return (
-      <>
-        {maybeRenderPerformerExportDialog()}
-        {renderPerformers()}
-      </>
-    );
-  }
-
-  function renderEditDialog(
-    selectedPerformers: GQL.SlimPerformerDataFragment[],
-    onClose: (applied: boolean) => void
-  ) {
-    return (
-      <EditPerformersDialog selected={selectedPerformers} onClose={onClose} />
-    );
-  }
-
-  function renderDeleteDialog(
-    selectedPerformers: GQL.SlimPerformerDataFragment[],
-    onClose: (confirmed: boolean) => void
-  ) {
-    return (
-      <DeleteEntityDialog
-        selected={selectedPerformers}
-        onClose={onClose}
-        singularEntity={intl.formatMessage({ id: "performer" })}
-        pluralEntity={intl.formatMessage({ id: "performers" })}
-        destroyMutation={usePerformersDestroy}
-      />
-    );
-  }
-
-  return (
-    <ItemListContext
-      filterMode={filterMode}
-      useResult={useFindPerformers}
-      getItems={getItems}
-      getCount={getCount}
-      alterQuery={alterQuery}
-      filterHook={filterHook}
-      view={view}
-      selectable
-    >
-      <ItemList
+      <ItemListContext
+        filterMode={filterMode}
+        useResult={useFindPerformers}
+        getItems={getItems}
+        getCount={getCount}
+        alterQuery={alterQuery}
+        filterHook={filterHook}
         view={view}
-        otherOperations={otherOperations}
-        addKeybinds={addKeybinds}
-        renderContent={renderContent}
-        renderEditDialog={renderEditDialog}
-        renderDeleteDialog={renderDeleteDialog}
-      />
-    </ItemListContext>
-  );
-};
+        selectable
+      >
+        <ItemList
+          view={view}
+          otherOperations={otherOperations}
+          addKeybinds={addKeybinds}
+          renderContent={renderContent}
+          renderEditDialog={renderEditDialog}
+          renderDeleteDialog={renderDeleteDialog}
+        />
+      </ItemListContext>
+    );
+  }
+);
diff --git a/ui/v2.5/src/components/Scenes/SceneList.tsx b/ui/v2.5/src/components/Scenes/SceneList.tsx
index fa390d187..8258f9b57 100644
--- a/ui/v2.5/src/components/Scenes/SceneList.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneList.tsx
@@ -66,7 +66,7 @@ import {
   FilteredSidebarHeader,
   useFilteredSidebarKeybinds,
 } from "../List/Filters/FilterSidebar";
-import { PatchContainerComponent } from "src/patch";
+import { PatchComponent, PatchContainerComponent } from "src/patch";
 import { Pagination, PaginationIndex } from "../List/Pagination";
 import { Button, ButtonGroup } from "react-bootstrap";
 import { Icon } from "../Shared/Icon";
@@ -380,83 +380,86 @@ const SceneListOperations: React.FC<{
   onDelete: () => void;
   onPlay: () => void;
   onCreateNew: () => void;
-}> = ({
-  items,
-  hasSelection,
-  operations,
-  onEdit,
-  onDelete,
-  onPlay,
-  onCreateNew,
-}) => {
-  const intl = useIntl();
+}> = PatchComponent(
+  "SceneListOperations",
+  ({
+    items,
+    hasSelection,
+    operations,
+    onEdit,
+    onDelete,
+    onPlay,
+    onCreateNew,
+  }) => {
+    const intl = useIntl();
 
-  return (
-    <div className="scene-list-operations">
-      <ButtonGroup>
-        {!!items && (
-          <Button
-            className="play-button"
-            variant="secondary"
-            onClick={() => onPlay()}
-            title={intl.formatMessage({ id: "actions.play" })}
-          >
-            <Icon icon={faPlay} />
-          </Button>
-        )}
-        {!hasSelection && (
-          <Button
-            className="create-new-button"
-            variant="secondary"
-            onClick={() => onCreateNew()}
-            title={intl.formatMessage(
-              { id: "actions.create_entity" },
-              { entityType: intl.formatMessage({ id: "scene" }) }
-            )}
-          >
-            <Icon icon={faPlus} />
-          </Button>
-        )}
-
-        {hasSelection && (
-          <>
-            <Button variant="secondary" onClick={() => onEdit()}>
-              <Icon icon={faPencil} />
-            </Button>
+    return (
+      <div className="scene-list-operations">
+        <ButtonGroup>
+          {!!items && (
             <Button
-              variant="danger"
-              className="btn-danger-minimal"
-              onClick={() => onDelete()}
+              className="play-button"
+              variant="secondary"
+              onClick={() => onPlay()}
+              title={intl.formatMessage({ id: "actions.play" })}
             >
-              <Icon icon={faTrash} />
+              <Icon icon={faPlay} />
             </Button>
-          </>
-        )}
+          )}
+          {!hasSelection && (
+            <Button
+              className="create-new-button"
+              variant="secondary"
+              onClick={() => onCreateNew()}
+              title={intl.formatMessage(
+                { id: "actions.create_entity" },
+                { entityType: intl.formatMessage({ id: "scene" }) }
+              )}
+            >
+              <Icon icon={faPlus} />
+            </Button>
+          )}
 
-        <OperationDropdown
-          className="scene-list-operations"
-          menuClassName="scene-list-operations-dropdown"
-          menuPortalTarget={document.body}
-        >
-          {operations.map((o) => {
-            if (o.isDisplayed && !o.isDisplayed()) {
-              return null;
-            }
+          {hasSelection && (
+            <>
+              <Button variant="secondary" onClick={() => onEdit()}>
+                <Icon icon={faPencil} />
+              </Button>
+              <Button
+                variant="danger"
+                className="btn-danger-minimal"
+                onClick={() => onDelete()}
+              >
+                <Icon icon={faTrash} />
+              </Button>
+            </>
+          )}
 
-            return (
-              <OperationDropdownItem
-                key={o.text}
-                onClick={o.onClick}
-                text={o.text}
-                className={o.className}
-              />
-            );
-          })}
-        </OperationDropdown>
-      </ButtonGroup>
-    </div>
-  );
-};
+          <OperationDropdown
+            className="scene-list-operations"
+            menuClassName="scene-list-operations-dropdown"
+            menuPortalTarget={document.body}
+          >
+            {operations.map((o) => {
+              if (o.isDisplayed && !o.isDisplayed()) {
+                return null;
+              }
+
+              return (
+                <OperationDropdownItem
+                  key={o.text}
+                  onClick={o.onClick}
+                  text={o.text}
+                  className={o.className}
+                />
+              );
+            })}
+          </OperationDropdown>
+        </ButtonGroup>
+      </div>
+    );
+  }
+);
 
 interface IFilteredScenes {
   filterHook?: (filter: ListFilterModel) => ListFilterModel;
diff --git a/ui/v2.5/src/components/Scenes/SceneMarkerList.tsx b/ui/v2.5/src/components/Scenes/SceneMarkerList.tsx
index 3ae595b7c..08d4a4046 100644
--- a/ui/v2.5/src/components/Scenes/SceneMarkerList.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneMarkerList.tsx
@@ -17,6 +17,8 @@ import { View } from "../List/views";
 import { SceneMarkerCardsGrid } from "./SceneMarkerCardsGrid";
 import { DeleteSceneMarkersDialog } from "./DeleteSceneMarkersDialog";
 import { EditSceneMarkersDialog } from "./EditSceneMarkersDialog";
+import { PatchComponent } from "src/patch";
+import { IItemListOperation } from "../List/FilteredListToolbar";
 
 function getItems(result: GQL.FindSceneMarkersQueryResult) {
   return result?.data?.findSceneMarkers?.scene_markers ?? [];
@@ -31,132 +33,133 @@ interface ISceneMarkerList {
   view?: View;
   alterQuery?: boolean;
   defaultSort?: string;
+  extraOperations?: IItemListOperation<GQL.FindSceneMarkersQueryResult>[];
 }
 
-export const SceneMarkerList: React.FC<ISceneMarkerList> = ({
-  filterHook,
-  view,
-  alterQuery,
-}) => {
-  const intl = useIntl();
-  const history = useHistory();
+export const SceneMarkerList: React.FC<ISceneMarkerList> = PatchComponent(
+  "SceneMarkerList",
+  ({ filterHook, view, alterQuery, extraOperations = [] }) => {
+    const intl = useIntl();
+    const history = useHistory();
 
-  const filterMode = GQL.FilterMode.SceneMarkers;
+    const filterMode = GQL.FilterMode.SceneMarkers;
 
-  const otherOperations = [
-    {
-      text: intl.formatMessage({ id: "actions.play_random" }),
-      onClick: playRandom,
-    },
-  ];
+    const otherOperations = [
+      ...extraOperations,
+      {
+        text: intl.formatMessage({ id: "actions.play_random" }),
+        onClick: playRandom,
+      },
+    ];
 
-  function addKeybinds(
-    result: GQL.FindSceneMarkersQueryResult,
-    filter: ListFilterModel
-  ) {
-    Mousetrap.bind("p r", () => {
-      playRandom(result, filter);
-    });
+    function addKeybinds(
+      result: GQL.FindSceneMarkersQueryResult,
+      filter: ListFilterModel
+    ) {
+      Mousetrap.bind("p r", () => {
+        playRandom(result, filter);
+      });
 
-    return () => {
-      Mousetrap.unbind("p r");
-    };
-  }
+      return () => {
+        Mousetrap.unbind("p r");
+      };
+    }
 
-  async function playRandom(
-    result: GQL.FindSceneMarkersQueryResult,
-    filter: ListFilterModel
-  ) {
-    // query for a random scene
-    if (result.data?.findSceneMarkers) {
-      const { count } = result.data.findSceneMarkers;
+    async function playRandom(
+      result: GQL.FindSceneMarkersQueryResult,
+      filter: ListFilterModel
+    ) {
+      // query for a random scene
+      if (result.data?.findSceneMarkers) {
+        const { count } = result.data.findSceneMarkers;
 
-      const index = Math.floor(Math.random() * count);
-      const filterCopy = cloneDeep(filter);
-      filterCopy.itemsPerPage = 1;
-      filterCopy.currentPage = index + 1;
-      const singleResult = await queryFindSceneMarkers(filterCopy);
-      if (singleResult.data.findSceneMarkers.scene_markers.length === 1) {
-        // navigate to the scene player page
-        const url = NavUtils.makeSceneMarkerUrl(
-          singleResult.data.findSceneMarkers.scene_markers[0]
-        );
-        history.push(url);
+        const index = Math.floor(Math.random() * count);
+        const filterCopy = cloneDeep(filter);
+        filterCopy.itemsPerPage = 1;
+        filterCopy.currentPage = index + 1;
+        const singleResult = await queryFindSceneMarkers(filterCopy);
+        if (singleResult.data.findSceneMarkers.scene_markers.length === 1) {
+          // navigate to the scene player page
+          const url = NavUtils.makeSceneMarkerUrl(
+            singleResult.data.findSceneMarkers.scene_markers[0]
+          );
+          history.push(url);
+        }
       }
     }
-  }
 
-  function renderContent(
-    result: GQL.FindSceneMarkersQueryResult,
-    filter: ListFilterModel,
-    selectedIds: Set<string>,
-    onSelectChange: (id: string, selected: boolean, shiftKey: boolean) => void
-  ) {
-    if (!result.data?.findSceneMarkers) return;
+    function renderContent(
+      result: GQL.FindSceneMarkersQueryResult,
+      filter: ListFilterModel,
+      selectedIds: Set<string>,
+      onSelectChange: (id: string, selected: boolean, shiftKey: boolean) => void
+    ) {
+      if (!result.data?.findSceneMarkers) return;
 
-    if (filter.displayMode === DisplayMode.Wall) {
+      if (filter.displayMode === DisplayMode.Wall) {
+        return (
+          <MarkerWallPanel
+            markers={result.data.findSceneMarkers.scene_markers}
+            zoomIndex={filter.zoomIndex}
+          />
+        );
+      }
+
+      if (filter.displayMode === DisplayMode.Grid) {
+        return (
+          <SceneMarkerCardsGrid
+            markers={result.data.findSceneMarkers.scene_markers}
+            zoomIndex={filter.zoomIndex}
+            selectedIds={selectedIds}
+            onSelectChange={onSelectChange}
+          />
+        );
+      }
+    }
+
+    function renderEditDialog(
+      selectedMarkers: GQL.SceneMarkerDataFragment[],
+      onClose: (applied: boolean) => void
+    ) {
       return (
-        <MarkerWallPanel
-          markers={result.data.findSceneMarkers.scene_markers}
-          zoomIndex={filter.zoomIndex}
+        <EditSceneMarkersDialog selected={selectedMarkers} onClose={onClose} />
+      );
+    }
+
+    function renderDeleteDialog(
+      selectedSceneMarkers: GQL.SceneMarkerDataFragment[],
+      onClose: (confirmed: boolean) => void
+    ) {
+      return (
+        <DeleteSceneMarkersDialog
+          selected={selectedSceneMarkers}
+          onClose={onClose}
         />
       );
     }
 
-    if (filter.displayMode === DisplayMode.Grid) {
-      return (
-        <SceneMarkerCardsGrid
-          markers={result.data.findSceneMarkers.scene_markers}
-          zoomIndex={filter.zoomIndex}
-          selectedIds={selectedIds}
-          onSelectChange={onSelectChange}
-        />
-      );
-    }
-  }
-
-  function renderEditDialog(
-    selectedMarkers: GQL.SceneMarkerDataFragment[],
-    onClose: (applied: boolean) => void
-  ) {
     return (
-      <EditSceneMarkersDialog selected={selectedMarkers} onClose={onClose} />
-    );
-  }
-
-  function renderDeleteDialog(
-    selectedSceneMarkers: GQL.SceneMarkerDataFragment[],
-    onClose: (confirmed: boolean) => void
-  ) {
-    return (
-      <DeleteSceneMarkersDialog
-        selected={selectedSceneMarkers}
-        onClose={onClose}
-      />
-    );
-  }
-
-  return (
-    <ItemListContext
-      filterMode={filterMode}
-      useResult={useFindSceneMarkers}
-      getItems={getItems}
-      getCount={getCount}
-      alterQuery={alterQuery}
-      filterHook={filterHook}
-      view={view}
-      selectable
-    >
-      <ItemList
+      <ItemListContext
+        filterMode={filterMode}
+        useResult={useFindSceneMarkers}
+        getItems={getItems}
+        getCount={getCount}
+        alterQuery={alterQuery}
+        filterHook={filterHook}
         view={view}
-        otherOperations={otherOperations}
-        addKeybinds={addKeybinds}
-        renderContent={renderContent}
-        renderEditDialog={renderEditDialog}
-        renderDeleteDialog={renderDeleteDialog}
-      />
-    </ItemListContext>
-  );
-};
+        selectable
+      >
+        <ItemList
+          view={view}
+          otherOperations={otherOperations}
+          addKeybinds={addKeybinds}
+          renderContent={renderContent}
+          renderEditDialog={renderEditDialog}
+          renderDeleteDialog={renderDeleteDialog}
+        />
+      </ItemListContext>
+    );
+  }
+);
 
 export default SceneMarkerList;
diff --git a/ui/v2.5/src/components/Studios/StudioList.tsx b/ui/v2.5/src/components/Studios/StudioList.tsx
index e548467a1..49075da6e 100644
--- a/ui/v2.5/src/components/Studios/StudioList.tsx
+++ b/ui/v2.5/src/components/Studios/StudioList.tsx
@@ -18,6 +18,8 @@ import { StudioTagger } from "../Tagger/studios/StudioTagger";
 import { StudioCardGrid } from "./StudioCardGrid";
 import { View } from "../List/views";
 import { EditStudiosDialog } from "./EditStudiosDialog";
+import { IItemListOperation } from "../List/FilteredListToolbar";
+import { PatchComponent } from "src/patch";
 
 function getItems(result: GQL.FindStudiosQueryResult) {
   return result?.data?.findStudios?.studios ?? [];
@@ -32,177 +34,177 @@ interface IStudioList {
   filterHook?: (filter: ListFilterModel) => ListFilterModel;
   view?: View;
   alterQuery?: boolean;
+  extraOperations?: IItemListOperation<GQL.FindStudiosQueryResult>[];
 }
 
-export const StudioList: React.FC<IStudioList> = ({
-  fromParent,
-  filterHook,
-  view,
-  alterQuery,
-}) => {
-  const intl = useIntl();
-  const history = useHistory();
-  const [isExportDialogOpen, setIsExportDialogOpen] = useState(false);
-  const [isExportAll, setIsExportAll] = useState(false);
+export const StudioList: React.FC<IStudioList> = PatchComponent(
+  "StudioList",
+  ({ fromParent, filterHook, view, alterQuery, extraOperations = [] }) => {
+    const intl = useIntl();
+    const history = useHistory();
+    const [isExportDialogOpen, setIsExportDialogOpen] = useState(false);
+    const [isExportAll, setIsExportAll] = useState(false);
 
-  const filterMode = GQL.FilterMode.Studios;
+    const filterMode = GQL.FilterMode.Studios;
 
-  const otherOperations = [
-    {
-      text: intl.formatMessage({ id: "actions.view_random" }),
-      onClick: viewRandom,
-    },
-    {
-      text: intl.formatMessage({ id: "actions.export" }),
-      onClick: onExport,
-      isDisplayed: showWhenSelected,
-    },
-    {
-      text: intl.formatMessage({ id: "actions.export_all" }),
-      onClick: onExportAll,
-    },
-  ];
+    const otherOperations = [
+      ...extraOperations,
+      {
+        text: intl.formatMessage({ id: "actions.view_random" }),
+        onClick: viewRandom,
+      },
+      {
+        text: intl.formatMessage({ id: "actions.export" }),
+        onClick: onExport,
+        isDisplayed: showWhenSelected,
+      },
+      {
+        text: intl.formatMessage({ id: "actions.export_all" }),
+        onClick: onExportAll,
+      },
+    ];
 
-  function addKeybinds(
-    result: GQL.FindStudiosQueryResult,
-    filter: ListFilterModel
-  ) {
-    Mousetrap.bind("p r", () => {
-      viewRandom(result, filter);
-    });
+    function addKeybinds(
+      result: GQL.FindStudiosQueryResult,
+      filter: ListFilterModel
+    ) {
+      Mousetrap.bind("p r", () => {
+        viewRandom(result, filter);
+      });
 
-    return () => {
-      Mousetrap.unbind("p r");
-    };
-  }
-
-  async function viewRandom(
-    result: GQL.FindStudiosQueryResult,
-    filter: ListFilterModel
-  ) {
-    // query for a random studio
-    if (result.data?.findStudios) {
-      const { count } = result.data.findStudios;
-
-      const index = Math.floor(Math.random() * count);
-      const filterCopy = cloneDeep(filter);
-      filterCopy.itemsPerPage = 1;
-      filterCopy.currentPage = index + 1;
-      const singleResult = await queryFindStudios(filterCopy);
-      if (singleResult.data.findStudios.studios.length === 1) {
-        const { id } = singleResult.data.findStudios.studios[0];
-        // navigate to the studio page
-        history.push(`/studios/${id}`);
-      }
+      return () => {
+        Mousetrap.unbind("p r");
+      };
     }
-  }
 
-  async function onExport() {
-    setIsExportAll(false);
-    setIsExportDialogOpen(true);
-  }
+    async function viewRandom(
+      result: GQL.FindStudiosQueryResult,
+      filter: ListFilterModel
+    ) {
+      // query for a random studio
+      if (result.data?.findStudios) {
+        const { count } = result.data.findStudios;
 
-  async function onExportAll() {
-    setIsExportAll(true);
-    setIsExportDialogOpen(true);
-  }
-
-  function renderContent(
-    result: GQL.FindStudiosQueryResult,
-    filter: ListFilterModel,
-    selectedIds: Set<string>,
-    onSelectChange: (id: string, selected: boolean, shiftKey: boolean) => void
-  ) {
-    function maybeRenderExportDialog() {
-      if (isExportDialogOpen) {
-        return (
-          <ExportDialog
-            exportInput={{
-              studios: {
-                ids: Array.from(selectedIds.values()),
-                all: isExportAll,
-              },
-            }}
-            onClose={() => setIsExportDialogOpen(false)}
-          />
-        );
+        const index = Math.floor(Math.random() * count);
+        const filterCopy = cloneDeep(filter);
+        filterCopy.itemsPerPage = 1;
+        filterCopy.currentPage = index + 1;
+        const singleResult = await queryFindStudios(filterCopy);
+        if (singleResult.data.findStudios.studios.length === 1) {
+          const { id } = singleResult.data.findStudios.studios[0];
+          // navigate to the studio page
+          history.push(`/studios/${id}`);
+        }
       }
     }
 
-    function renderStudios() {
-      if (!result.data?.findStudios) return;
+    async function onExport() {
+      setIsExportAll(false);
+      setIsExportDialogOpen(true);
+    }
 
-      if (filter.displayMode === DisplayMode.Grid) {
-        return (
-          <StudioCardGrid
-            studios={result.data.findStudios.studios}
-            zoomIndex={filter.zoomIndex}
-            fromParent={fromParent}
-            selectedIds={selectedIds}
-            onSelectChange={onSelectChange}
-          />
-        );
+    async function onExportAll() {
+      setIsExportAll(true);
+      setIsExportDialogOpen(true);
+    }
+
+    function renderContent(
+      result: GQL.FindStudiosQueryResult,
+      filter: ListFilterModel,
+      selectedIds: Set<string>,
+      onSelectChange: (id: string, selected: boolean, shiftKey: boolean) => void
+    ) {
+      function maybeRenderExportDialog() {
+        if (isExportDialogOpen) {
+          return (
+            <ExportDialog
+              exportInput={{
+                studios: {
+                  ids: Array.from(selectedIds.values()),
+                  all: isExportAll,
+                },
+              }}
+              onClose={() => setIsExportDialogOpen(false)}
+            />
+          );
+        }
       }
-      if (filter.displayMode === DisplayMode.List) {
-        return <h1>TODO</h1>;
-      }
-      if (filter.displayMode === DisplayMode.Wall) {
-        return <h1>TODO</h1>;
-      }
-      if (filter.displayMode === DisplayMode.Tagger) {
-        return <StudioTagger studios={result.data.findStudios.studios} />;
+
+      function renderStudios() {
+        if (!result.data?.findStudios) return;
+
+        if (filter.displayMode === DisplayMode.Grid) {
+          return (
+            <StudioCardGrid
+              studios={result.data.findStudios.studios}
+              zoomIndex={filter.zoomIndex}
+              fromParent={fromParent}
+              selectedIds={selectedIds}
+              onSelectChange={onSelectChange}
+            />
+          );
+        }
+        if (filter.displayMode === DisplayMode.List) {
+          return <h1>TODO</h1>;
+        }
+        if (filter.displayMode === DisplayMode.Wall) {
+          return <h1>TODO</h1>;
+        }
+        if (filter.displayMode === DisplayMode.Tagger) {
+          return <StudioTagger studios={result.data.findStudios.studios} />;
+        }
       }
+
+      return (
+        <>
+          {maybeRenderExportDialog()}
+          {renderStudios()}
+        </>
+      );
+    }
+
+    function renderEditDialog(
+      selectedStudios: GQL.SlimStudioDataFragment[],
+      onClose: (applied: boolean) => void
+    ) {
+      return <EditStudiosDialog selected={selectedStudios} onClose={onClose} />;
+    }
+
+    function renderDeleteDialog(
+      selectedStudios: GQL.SlimStudioDataFragment[],
+      onClose: (confirmed: boolean) => void
+    ) {
+      return (
+        <DeleteEntityDialog
+          selected={selectedStudios}
+          onClose={onClose}
+          singularEntity={intl.formatMessage({ id: "studio" })}
+          pluralEntity={intl.formatMessage({ id: "studios" })}
+          destroyMutation={useStudiosDestroy}
+        />
+      );
     }
 
     return (
-      <>
-        {maybeRenderExportDialog()}
-        {renderStudios()}
-      </>
-    );
-  }
-
-  function renderEditDialog(
-    selectedStudios: GQL.SlimStudioDataFragment[],
-    onClose: (applied: boolean) => void
-  ) {
-    return <EditStudiosDialog selected={selectedStudios} onClose={onClose} />;
-  }
-
-  function renderDeleteDialog(
-    selectedStudios: GQL.SlimStudioDataFragment[],
-    onClose: (confirmed: boolean) => void
-  ) {
-    return (
-      <DeleteEntityDialog
-        selected={selectedStudios}
-        onClose={onClose}
-        singularEntity={intl.formatMessage({ id: "studio" })}
-        pluralEntity={intl.formatMessage({ id: "studios" })}
-        destroyMutation={useStudiosDestroy}
-      />
-    );
-  }
-
-  return (
-    <ItemListContext
-      filterMode={filterMode}
-      useResult={useFindStudios}
-      getItems={getItems}
-      getCount={getCount}
-      alterQuery={alterQuery}
-      filterHook={filterHook}
-      view={view}
-      selectable
-    >
-      <ItemList
+      <ItemListContext
+        filterMode={filterMode}
+        useResult={useFindStudios}
+        getItems={getItems}
+        getCount={getCount}
+        alterQuery={alterQuery}
+        filterHook={filterHook}
         view={view}
-        otherOperations={otherOperations}
-        addKeybinds={addKeybinds}
-        renderContent={renderContent}
-        renderEditDialog={renderEditDialog}
-        renderDeleteDialog={renderDeleteDialog}
-      />
-    </ItemListContext>
-  );
-};
+        selectable
+      >
+        <ItemList
+          view={view}
+          otherOperations={otherOperations}
+          addKeybinds={addKeybinds}
+          renderContent={renderContent}
+          renderEditDialog={renderEditDialog}
+          renderDeleteDialog={renderDeleteDialog}
+        />
+      </ItemListContext>
+    );
+  }
+);
diff --git a/ui/v2.5/src/components/Tags/TagList.tsx b/ui/v2.5/src/components/Tags/TagList.tsx
index 8373fa836..eb57435ad 100644
--- a/ui/v2.5/src/components/Tags/TagList.tsx
+++ b/ui/v2.5/src/components/Tags/TagList.tsx
@@ -26,6 +26,8 @@ import { faTrashAlt } from "@fortawesome/free-solid-svg-icons";
 import { TagCardGrid } from "./TagCardGrid";
 import { EditTagsDialog } from "./EditTagsDialog";
 import { View } from "../List/views";
+import { IItemListOperation } from "../List/FilteredListToolbar";
+import { PatchComponent } from "src/patch";
 
 function getItems(result: GQL.FindTagsForListQueryResult) {
   return result?.data?.findTags?.tags ?? [];
@@ -38,341 +40,346 @@ function getCount(result: GQL.FindTagsForListQueryResult) {
 interface ITagList {
   filterHook?: (filter: ListFilterModel) => ListFilterModel;
   alterQuery?: boolean;
+  extraOperations?: IItemListOperation<GQL.FindTagsForListQueryResult>[];
 }
 
-export const TagList: React.FC<ITagList> = ({ filterHook, alterQuery }) => {
-  const Toast = useToast();
-  const [deletingTag, setDeletingTag] =
-    useState<Partial<GQL.TagListDataFragment> | null>(null);
+export const TagList: React.FC<ITagList> = PatchComponent(
+  "TagList",
+  ({ filterHook, alterQuery, extraOperations = [] }) => {
+    const Toast = useToast();
+    const [deletingTag, setDeletingTag] =
+      useState<Partial<GQL.TagListDataFragment> | null>(null);
 
-  const filterMode = GQL.FilterMode.Tags;
-  const view = View.Tags;
+    const filterMode = GQL.FilterMode.Tags;
+    const view = View.Tags;
 
-  function getDeleteTagInput() {
-    const tagInput: Partial<GQL.TagDestroyInput> = {};
-    if (deletingTag) {
-      tagInput.id = deletingTag.id;
-    }
-    return tagInput as GQL.TagDestroyInput;
-  }
-  const [deleteTag] = useTagDestroy(getDeleteTagInput());
-
-  const intl = useIntl();
-  const history = useHistory();
-  const [isExportDialogOpen, setIsExportDialogOpen] = useState(false);
-  const [isExportAll, setIsExportAll] = useState(false);
-
-  const otherOperations = [
-    {
-      text: intl.formatMessage({ id: "actions.view_random" }),
-      onClick: viewRandom,
-    },
-    {
-      text: intl.formatMessage({ id: "actions.export" }),
-      onClick: onExport,
-      isDisplayed: showWhenSelected,
-    },
-    {
-      text: intl.formatMessage({ id: "actions.export_all" }),
-      onClick: onExportAll,
-    },
-  ];
-
-  function addKeybinds(
-    result: GQL.FindTagsForListQueryResult,
-    filter: ListFilterModel
-  ) {
-    Mousetrap.bind("p r", () => {
-      viewRandom(result, filter);
-    });
-
-    return () => {
-      Mousetrap.unbind("p r");
-    };
-  }
-
-  async function viewRandom(
-    result: GQL.FindTagsForListQueryResult,
-    filter: ListFilterModel
-  ) {
-    // query for a random tag
-    if (result.data?.findTags) {
-      const { count } = result.data.findTags;
-
-      const index = Math.floor(Math.random() * count);
-      const filterCopy = cloneDeep(filter);
-      filterCopy.itemsPerPage = 1;
-      filterCopy.currentPage = index + 1;
-      const singleResult = await queryFindTagsForList(filterCopy);
-      if (singleResult.data.findTags.tags.length === 1) {
-        const { id } = singleResult.data.findTags.tags[0];
-        // navigate to the tag page
-        history.push(`/tags/${id}`);
+    function getDeleteTagInput() {
+      const tagInput: Partial<GQL.TagDestroyInput> = {};
+      if (deletingTag) {
+        tagInput.id = deletingTag.id;
       }
+      return tagInput as GQL.TagDestroyInput;
     }
-  }
+    const [deleteTag] = useTagDestroy(getDeleteTagInput());
 
-  async function onExport() {
-    setIsExportAll(false);
-    setIsExportDialogOpen(true);
-  }
+    const intl = useIntl();
+    const history = useHistory();
+    const [isExportDialogOpen, setIsExportDialogOpen] = useState(false);
+    const [isExportAll, setIsExportAll] = useState(false);
 
-  async function onExportAll() {
-    setIsExportAll(true);
-    setIsExportDialogOpen(true);
-  }
+    const otherOperations = [
+      ...extraOperations,
+      {
+        text: intl.formatMessage({ id: "actions.view_random" }),
+        onClick: viewRandom,
+      },
+      {
+        text: intl.formatMessage({ id: "actions.export" }),
+        onClick: onExport,
+        isDisplayed: showWhenSelected,
+      },
+      {
+        text: intl.formatMessage({ id: "actions.export_all" }),
+        onClick: onExportAll,
+      },
+    ];
 
-  async function onAutoTag(tag: GQL.TagListDataFragment) {
-    if (!tag) return;
-    try {
-      await mutateMetadataAutoTag({ tags: [tag.id] });
-      Toast.success(intl.formatMessage({ id: "toast.started_auto_tagging" }));
-    } catch (e) {
-      Toast.error(e);
-    }
-  }
-
-  async function onDelete() {
-    try {
-      const oldRelations = {
-        parents: deletingTag?.parents ?? [],
-        children: deletingTag?.children ?? [],
-      };
-      await deleteTag();
-      tagRelationHook(deletingTag as GQL.TagListDataFragment, oldRelations, {
-        parents: [],
-        children: [],
+    function addKeybinds(
+      result: GQL.FindTagsForListQueryResult,
+      filter: ListFilterModel
+    ) {
+      Mousetrap.bind("p r", () => {
+        viewRandom(result, filter);
       });
-      Toast.success(
-        intl.formatMessage(
-          { id: "toast.delete_past_tense" },
-          {
-            count: 1,
-            singularEntity: intl.formatMessage({ id: "tag" }),
-            pluralEntity: intl.formatMessage({ id: "tags" }),
-          }
-        )
-      );
-      setDeletingTag(null);
-    } catch (e) {
-      Toast.error(e);
-    }
-  }
 
-  function renderContent(
-    result: GQL.FindTagsForListQueryResult,
-    filter: ListFilterModel,
-    selectedIds: Set<string>,
-    onSelectChange: (id: string, selected: boolean, shiftKey: boolean) => void
-  ) {
-    function maybeRenderExportDialog() {
-      if (isExportDialogOpen) {
-        return (
-          <ExportDialog
-            exportInput={{
-              tags: {
-                ids: Array.from(selectedIds.values()),
-                all: isExportAll,
-              },
-            }}
-            onClose={() => setIsExportDialogOpen(false)}
-          />
-        );
+      return () => {
+        Mousetrap.unbind("p r");
+      };
+    }
+
+    async function viewRandom(
+      result: GQL.FindTagsForListQueryResult,
+      filter: ListFilterModel
+    ) {
+      // query for a random tag
+      if (result.data?.findTags) {
+        const { count } = result.data.findTags;
+
+        const index = Math.floor(Math.random() * count);
+        const filterCopy = cloneDeep(filter);
+        filterCopy.itemsPerPage = 1;
+        filterCopy.currentPage = index + 1;
+        const singleResult = await queryFindTagsForList(filterCopy);
+        if (singleResult.data.findTags.tags.length === 1) {
+          const { id } = singleResult.data.findTags.tags[0];
+          // navigate to the tag page
+          history.push(`/tags/${id}`);
+        }
       }
     }
 
-    function renderTags() {
-      if (!result.data?.findTags) return;
+    async function onExport() {
+      setIsExportAll(false);
+      setIsExportDialogOpen(true);
+    }
 
-      if (filter.displayMode === DisplayMode.Grid) {
-        return (
-          <TagCardGrid
-            tags={result.data.findTags.tags}
-            zoomIndex={filter.zoomIndex}
-            selectedIds={selectedIds}
-            onSelectChange={onSelectChange}
-          />
-        );
+    async function onExportAll() {
+      setIsExportAll(true);
+      setIsExportDialogOpen(true);
+    }
+
+    async function onAutoTag(tag: GQL.TagListDataFragment) {
+      if (!tag) return;
+      try {
+        await mutateMetadataAutoTag({ tags: [tag.id] });
+        Toast.success(intl.formatMessage({ id: "toast.started_auto_tagging" }));
+      } catch (e) {
+        Toast.error(e);
       }
-      if (filter.displayMode === DisplayMode.List) {
-        const deleteAlert = (
-          <ModalComponent
-            onHide={() => {}}
-            show={!!deletingTag}
-            icon={faTrashAlt}
-            accept={{
-              onClick: onDelete,
-              variant: "danger",
-              text: intl.formatMessage({ id: "actions.delete" }),
-            }}
-            cancel={{ onClick: () => setDeletingTag(null) }}
-          >
-            <span>
-              <FormattedMessage
-                id="dialogs.delete_confirm"
-                values={{ entityName: deletingTag && deletingTag.name }}
-              />
-            </span>
-          </ModalComponent>
-        );
+    }
 
-        const tagElements = result.data.findTags.tags.map((tag) => {
+    async function onDelete() {
+      try {
+        const oldRelations = {
+          parents: deletingTag?.parents ?? [],
+          children: deletingTag?.children ?? [],
+        };
+        await deleteTag();
+        tagRelationHook(deletingTag as GQL.TagListDataFragment, oldRelations, {
+          parents: [],
+          children: [],
+        });
+        Toast.success(
+          intl.formatMessage(
+            { id: "toast.delete_past_tense" },
+            {
+              count: 1,
+              singularEntity: intl.formatMessage({ id: "tag" }),
+              pluralEntity: intl.formatMessage({ id: "tags" }),
+            }
+          )
+        );
+        setDeletingTag(null);
+      } catch (e) {
+        Toast.error(e);
+      }
+    }
+
+    function renderContent(
+      result: GQL.FindTagsForListQueryResult,
+      filter: ListFilterModel,
+      selectedIds: Set<string>,
+      onSelectChange: (id: string, selected: boolean, shiftKey: boolean) => void
+    ) {
+      function maybeRenderExportDialog() {
+        if (isExportDialogOpen) {
           return (
-            <div key={tag.id} className="tag-list-row row">
-              <Link to={`/tags/${tag.id}`}>{tag.name}</Link>
+            <ExportDialog
+              exportInput={{
+                tags: {
+                  ids: Array.from(selectedIds.values()),
+                  all: isExportAll,
+                },
+              }}
+              onClose={() => setIsExportDialogOpen(false)}
+            />
+          );
+        }
+      }
 
-              <div className="ml-auto">
-                <Button
-                  variant="secondary"
-                  className="tag-list-button"
-                  onClick={() => onAutoTag(tag)}
-                >
-                  <FormattedMessage id="actions.auto_tag" />
-                </Button>
-                <Button variant="secondary" className="tag-list-button">
-                  <Link
-                    to={NavUtils.makeTagScenesUrl(tag)}
-                    className="tag-list-anchor"
+      function renderTags() {
+        if (!result.data?.findTags) return;
+
+        if (filter.displayMode === DisplayMode.Grid) {
+          return (
+            <TagCardGrid
+              tags={result.data.findTags.tags}
+              zoomIndex={filter.zoomIndex}
+              selectedIds={selectedIds}
+              onSelectChange={onSelectChange}
+            />
+          );
+        }
+        if (filter.displayMode === DisplayMode.List) {
+          const deleteAlert = (
+            <ModalComponent
+              onHide={() => {}}
+              show={!!deletingTag}
+              icon={faTrashAlt}
+              accept={{
+                onClick: onDelete,
+                variant: "danger",
+                text: intl.formatMessage({ id: "actions.delete" }),
+              }}
+              cancel={{ onClick: () => setDeletingTag(null) }}
+            >
+              <span>
+                <FormattedMessage
+                  id="dialogs.delete_confirm"
+                  values={{ entityName: deletingTag && deletingTag.name }}
+                />
+              </span>
+            </ModalComponent>
+          );
+
+          const tagElements = result.data.findTags.tags.map((tag) => {
+            return (
+              <div key={tag.id} className="tag-list-row row">
+                <Link to={`/tags/${tag.id}`}>{tag.name}</Link>
+
+                <div className="ml-auto">
+                  <Button
+                    variant="secondary"
+                    className="tag-list-button"
+                    onClick={() => onAutoTag(tag)}
                   >
-                    <FormattedMessage
-                      id="countables.scenes"
-                      values={{
-                        count: tag.scene_count ?? 0,
-                      }}
+                    <FormattedMessage id="actions.auto_tag" />
+                  </Button>
+                  <Button variant="secondary" className="tag-list-button">
+                    <Link
+                      to={NavUtils.makeTagScenesUrl(tag)}
+                      className="tag-list-anchor"
+                    >
+                      <FormattedMessage
+                        id="countables.scenes"
+                        values={{
+                          count: tag.scene_count ?? 0,
+                        }}
+                      />
+                      : <FormattedNumber value={tag.scene_count ?? 0} />
+                    </Link>
+                  </Button>
+                  <Button variant="secondary" className="tag-list-button">
+                    <Link
+                      to={NavUtils.makeTagImagesUrl(tag)}
+                      className="tag-list-anchor"
+                    >
+                      <FormattedMessage
+                        id="countables.images"
+                        values={{
+                          count: tag.image_count ?? 0,
+                        }}
+                      />
+                      : <FormattedNumber value={tag.image_count ?? 0} />
+                    </Link>
+                  </Button>
+                  <Button variant="secondary" className="tag-list-button">
+                    <Link
+                      to={NavUtils.makeTagGalleriesUrl(tag)}
+                      className="tag-list-anchor"
+                    >
+                      <FormattedMessage
+                        id="countables.galleries"
+                        values={{
+                          count: tag.gallery_count ?? 0,
+                        }}
+                      />
+                      : <FormattedNumber value={tag.gallery_count ?? 0} />
+                    </Link>
+                  </Button>
+                  <Button variant="secondary" className="tag-list-button">
+                    <Link
+                      to={NavUtils.makeTagSceneMarkersUrl(tag)}
+                      className="tag-list-anchor"
+                    >
+                      <FormattedMessage
+                        id="countables.markers"
+                        values={{
+                          count: tag.scene_marker_count ?? 0,
+                        }}
+                      />
+                      : <FormattedNumber value={tag.scene_marker_count ?? 0} />
+                    </Link>
+                  </Button>
+                  <span className="tag-list-count">
+                    <FormattedMessage id="total" />:{" "}
+                    <FormattedNumber
+                      value={
+                        (tag.scene_count || 0) +
+                        (tag.scene_marker_count || 0) +
+                        (tag.image_count || 0) +
+                        (tag.gallery_count || 0)
+                      }
                     />
-                    : <FormattedNumber value={tag.scene_count ?? 0} />
-                  </Link>
-                </Button>
-                <Button variant="secondary" className="tag-list-button">
-                  <Link
-                    to={NavUtils.makeTagImagesUrl(tag)}
-                    className="tag-list-anchor"
-                  >
-                    <FormattedMessage
-                      id="countables.images"
-                      values={{
-                        count: tag.image_count ?? 0,
-                      }}
-                    />
-                    : <FormattedNumber value={tag.image_count ?? 0} />
-                  </Link>
-                </Button>
-                <Button variant="secondary" className="tag-list-button">
-                  <Link
-                    to={NavUtils.makeTagGalleriesUrl(tag)}
-                    className="tag-list-anchor"
-                  >
-                    <FormattedMessage
-                      id="countables.galleries"
-                      values={{
-                        count: tag.gallery_count ?? 0,
-                      }}
-                    />
-                    : <FormattedNumber value={tag.gallery_count ?? 0} />
-                  </Link>
-                </Button>
-                <Button variant="secondary" className="tag-list-button">
-                  <Link
-                    to={NavUtils.makeTagSceneMarkersUrl(tag)}
-                    className="tag-list-anchor"
-                  >
-                    <FormattedMessage
-                      id="countables.markers"
-                      values={{
-                        count: tag.scene_marker_count ?? 0,
-                      }}
-                    />
-                    : <FormattedNumber value={tag.scene_marker_count ?? 0} />
-                  </Link>
-                </Button>
-                <span className="tag-list-count">
-                  <FormattedMessage id="total" />:{" "}
-                  <FormattedNumber
-                    value={
-                      (tag.scene_count || 0) +
-                      (tag.scene_marker_count || 0) +
-                      (tag.image_count || 0) +
-                      (tag.gallery_count || 0)
-                    }
-                  />
-                </span>
-                <Button variant="danger" onClick={() => setDeletingTag(tag)}>
-                  <Icon icon={faTrashAlt} color="danger" />
-                </Button>
+                  </span>
+                  <Button variant="danger" onClick={() => setDeletingTag(tag)}>
+                    <Icon icon={faTrashAlt} color="danger" />
+                  </Button>
+                </div>
               </div>
+            );
+          });
+
+          return (
+            <div className="col col-sm-8 m-auto">
+              {tagElements}
+              {deleteAlert}
             </div>
           );
-        });
-
-        return (
-          <div className="col col-sm-8 m-auto">
-            {tagElements}
-            {deleteAlert}
-          </div>
-        );
-      }
-      if (filter.displayMode === DisplayMode.Wall) {
-        return <h1>TODO</h1>;
+        }
+        if (filter.displayMode === DisplayMode.Wall) {
+          return <h1>TODO</h1>;
+        }
       }
+      return (
+        <>
+          {maybeRenderExportDialog()}
+          {renderTags()}
+        </>
+      );
     }
+
+    function renderEditDialog(
+      selectedTags: GQL.TagListDataFragment[],
+      onClose: (confirmed: boolean) => void
+    ) {
+      return <EditTagsDialog selected={selectedTags} onClose={onClose} />;
+    }
+
+    function renderDeleteDialog(
+      selectedTags: GQL.TagListDataFragment[],
+      onClose: (confirmed: boolean) => void
+    ) {
+      return (
+        <DeleteEntityDialog
+          selected={selectedTags}
+          onClose={onClose}
+          singularEntity={intl.formatMessage({ id: "tag" })}
+          pluralEntity={intl.formatMessage({ id: "tags" })}
+          destroyMutation={useTagsDestroy}
+          onDeleted={() => {
+            selectedTags.forEach((t) =>
+              tagRelationHook(
+                t,
+                { parents: t.parents ?? [], children: t.children ?? [] },
+                { parents: [], children: [] }
+              )
+            );
+          }}
+        />
+      );
+    }
+
     return (
-      <>
-        {maybeRenderExportDialog()}
-        {renderTags()}
-      </>
-    );
-  }
-
-  function renderEditDialog(
-    selectedTags: GQL.TagListDataFragment[],
-    onClose: (confirmed: boolean) => void
-  ) {
-    return <EditTagsDialog selected={selectedTags} onClose={onClose} />;
-  }
-
-  function renderDeleteDialog(
-    selectedTags: GQL.TagListDataFragment[],
-    onClose: (confirmed: boolean) => void
-  ) {
-    return (
-      <DeleteEntityDialog
-        selected={selectedTags}
-        onClose={onClose}
-        singularEntity={intl.formatMessage({ id: "tag" })}
-        pluralEntity={intl.formatMessage({ id: "tags" })}
-        destroyMutation={useTagsDestroy}
-        onDeleted={() => {
-          selectedTags.forEach((t) =>
-            tagRelationHook(
-              t,
-              { parents: t.parents ?? [], children: t.children ?? [] },
-              { parents: [], children: [] }
-            )
-          );
-        }}
-      />
-    );
-  }
-
-  return (
-    <ItemListContext
-      filterMode={filterMode}
-      useResult={useFindTagsForList}
-      getItems={getItems}
-      getCount={getCount}
-      alterQuery={alterQuery}
-      filterHook={filterHook}
-      view={view}
-      selectable
-    >
-      <ItemList
+      <ItemListContext
+        filterMode={filterMode}
+        useResult={useFindTagsForList}
+        getItems={getItems}
+        getCount={getCount}
+        alterQuery={alterQuery}
+        filterHook={filterHook}
         view={view}
-        otherOperations={otherOperations}
-        addKeybinds={addKeybinds}
-        renderContent={renderContent}
-        renderEditDialog={renderEditDialog}
-        renderDeleteDialog={renderDeleteDialog}
-      />
-    </ItemListContext>
-  );
-};
+        selectable
+      >
+        <ItemList
+          view={view}
+          otherOperations={otherOperations}
+          addKeybinds={addKeybinds}
+          renderContent={renderContent}
+          renderEditDialog={renderEditDialog}
+          renderDeleteDialog={renderDeleteDialog}
+        />
+      </ItemListContext>
+    );
+  }
+);
diff --git a/ui/v2.5/src/pluginApi.d.ts b/ui/v2.5/src/pluginApi.d.ts
index da4a64765..8f4a896f8 100644
--- a/ui/v2.5/src/pluginApi.d.ts
+++ b/ui/v2.5/src/pluginApi.d.ts
@@ -671,14 +671,20 @@ declare namespace PluginApi {
     "GalleryCard.Image": React.FC<any>;
     "GalleryCard.Overlays": React.FC<any>;
     "GalleryCard.Popovers": React.FC<any>;
+    GalleryAddPanel: React.FC<any>;
     GalleryIDSelect: React.FC<any>;
+    GalleryImagesPanel: React.FC<any>;
+    GalleryList: React.FC<any>;
     GallerySelect: React.FC<any>;
     GroupIDSelect: React.FC<any>;
+    GroupList: React.FC<any>;
     GroupSelect: React.FC<any>;
+    GroupSubGroupsPanel: React.FC<any>;
     HeaderImage: React.FC<any>;
     HoverPopover: React.FC<any>;
     Icon: React.FC<any>;
     ImageInput: React.FC<any>;
+    ImageList: React.FC<any>;
     LightboxLink: React.FC<any>;
     LoadingIndicator: React.FC<any>;
     "MainNavBar.MenuItems": React.FC<any>;
@@ -699,6 +705,7 @@ declare namespace PluginApi {
     PerformerHeaderImage: React.FC<any>;
     PerformerIDSelect: React.FC<any>;
     PerformerImagesPanel: React.FC<any>;
+    PerformerList: React.FC<any>;
     PerformerPage: React.FC<any>;
     PerformerScenesPanel: React.FC<any>;
     PerformerSelect: React.FC<any>;
@@ -717,6 +724,9 @@ declare namespace PluginApi {
     "SceneCard.Image": React.FC<any>;
     "SceneCard.Overlays": React.FC<any>;
     "SceneCard.Popovers": React.FC<any>;
+    SceneList: React.FC<any>;
+    SceneListOperations: React.FC<any>;
+    SceneMarkerList: React.FC<any>;
     SelectSetting: React.FC<any>;
     Setting: React.FC<any>;
     SettingGroup: React.FC<any>;
@@ -724,6 +734,7 @@ declare namespace PluginApi {
     StringListSetting: React.FC<any>;
     StringSetting: React.FC<any>;
     StudioIDSelect: React.FC<any>;
+    StudioList: React.FC<any>;
     StudioSelect: React.FC<any>;
     SweatDrops: React.FC<any>;
     TabTitleCounter: React.FC<any>;
@@ -734,6 +745,7 @@ declare namespace PluginApi {
     "TagCard.Popovers": React.FC<any>;
     "TagCard.Title": React.FC<any>;
     TagLink: React.FC<any>;
+    TagList: React.FC<any>;
     TagSelect: React.FC<any>;
     TruncatedText: React.FC<any>;
   };

From 65327a6102b12d1074fe240e1e1c3b7b9cf83ba2 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Mon, 15 Dec 2025 08:16:46 +1100
Subject: [PATCH 217/405] Add useInitialState to studio in search result
 (#6409)

---
 .../src/components/Tagger/scenes/StashSearchResult.tsx | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ui/v2.5/src/components/Tagger/scenes/StashSearchResult.tsx b/ui/v2.5/src/components/Tagger/scenes/StashSearchResult.tsx
index 4e7184fd6..dc0a616d6 100755
--- a/ui/v2.5/src/components/Tagger/scenes/StashSearchResult.tsx
+++ b/ui/v2.5/src/components/Tagger/scenes/StashSearchResult.tsx
@@ -294,9 +294,9 @@ const StashSearchResult: React.FC<IStashSearchResultProps> = ({
   const [performerIDs, setPerformerIDs, setInitialPerformerIDs] =
     useInitialState<(string | undefined)[]>(getInitialPerformers());
 
-  const [studioID, setStudioID] = useState<string | undefined>(
-    getInitialStudio()
-  );
+  const [studioID, setStudioID, setInitialStudioID] = useInitialState<
+    string | undefined
+  >(getInitialStudio());
 
   useEffect(() => {
     setInitialTagIDs(getInitialTags());
@@ -307,8 +307,8 @@ const StashSearchResult: React.FC<IStashSearchResultProps> = ({
   }, [getInitialPerformers, setInitialPerformerIDs]);
 
   useEffect(() => {
-    setStudioID(getInitialStudio());
-  }, [getInitialStudio]);
+    setInitialStudioID(getInitialStudio());
+  }, [getInitialStudio, setInitialStudioID]);
 
   useEffect(() => {
     async function doResolveScene() {

From f64cd5bfac09aadc59675d80ed8dc3f3fe401a61 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Mon, 15 Dec 2025 08:16:58 +1100
Subject: [PATCH 218/405] Add sfw label for o-count in stats page (#6410)

---
 ui/v2.5/src/components/Stats.tsx | 10 +++++++++-
 ui/v2.5/src/locales/en-GB.json   |  1 +
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/ui/v2.5/src/components/Stats.tsx b/ui/v2.5/src/components/Stats.tsx
index b035fe66b..6b5a49d83 100644
--- a/ui/v2.5/src/components/Stats.tsx
+++ b/ui/v2.5/src/components/Stats.tsx
@@ -4,8 +4,16 @@ import { FormattedMessage, FormattedNumber } from "react-intl";
 import { LoadingIndicator } from "src/components/Shared/LoadingIndicator";
 import TextUtils from "src/utils/text";
 import { FileSize } from "./Shared/FileSize";
+import { useConfigurationContext } from "src/hooks/Config";
 
 export const Stats: React.FC = () => {
+  const { configuration } = useConfigurationContext();
+  const { sfwContentMode } = configuration.interface;
+
+  const oCountID = sfwContentMode
+    ? "stats.total_o_count_sfw"
+    : "stats.total_o_count";
+
   const { data, error, loading } = useStats();
 
   if (error) return <span>{error.message}</span>;
@@ -111,7 +119,7 @@ export const Stats: React.FC = () => {
             <FormattedNumber value={data.stats.total_o_count} />
           </p>
           <p className="heading">
-            <FormattedMessage id="stats.total_o_count" />
+            <FormattedMessage id={oCountID} />
           </p>
         </div>
         <div className="stats-element">
diff --git a/ui/v2.5/src/locales/en-GB.json b/ui/v2.5/src/locales/en-GB.json
index 2911ccb6e..21d3f6a24 100644
--- a/ui/v2.5/src/locales/en-GB.json
+++ b/ui/v2.5/src/locales/en-GB.json
@@ -1484,6 +1484,7 @@
     "scenes_played": "Scenes Played",
     "scenes_size": "Scenes size",
     "total_o_count": "Total O-Count",
+    "total_o_count_sfw": "Total Likes",
     "total_play_count": "Total Play Count",
     "total_play_duration": "Total Play Duration"
   },

From 7a8a2c76876fec3568445f6db3a2edb0eb327ea5 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Mon, 15 Dec 2025 08:45:28 +1100
Subject: [PATCH 219/405] Send inner props to CheckboxSelect Option (#6411)

Fixes onChange handler not being called
---
 ui/v2.5/src/components/Shared/Select.tsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ui/v2.5/src/components/Shared/Select.tsx b/ui/v2.5/src/components/Shared/Select.tsx
index ec0fb4ea9..4ad9a51c9 100644
--- a/ui/v2.5/src/components/Shared/Select.tsx
+++ b/ui/v2.5/src/components/Shared/Select.tsx
@@ -516,7 +516,10 @@ export const CheckBoxSelect: React.FC<ICheckBoxSelectProps> = ({
       className={`${props.className || ""} ${props.data.className || ""}`}
       // data values don't seem to be included in props.innerProps by default
       innerProps={
-        { "data-value": props.data.value } as React.DetailedHTMLProps<
+        {
+          ...props.innerProps,
+          "data-value": props.data.value,
+        } as React.DetailedHTMLProps<
           React.HTMLAttributes<HTMLDivElement>,
           HTMLDivElement
         >

From 1691280d1b202fb0a556026cd5d460e4ae1cd7c9 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Mon, 15 Dec 2025 11:49:30 +1100
Subject: [PATCH 220/405] Fix excludes handling in performer studio filter
 (#6413)

---
 pkg/sqlite/performer_filter.go | 63 ++++++++++++++++-------
 pkg/sqlite/performer_test.go   | 94 +++++++++++++++++++++++++++++++++-
 pkg/sqlite/setup_test.go       | 39 ++++++++------
 3 files changed, 162 insertions(+), 34 deletions(-)

diff --git a/pkg/sqlite/performer_filter.go b/pkg/sqlite/performer_filter.go
index 29bc75a74..11d3138bc 100644
--- a/pkg/sqlite/performer_filter.go
+++ b/pkg/sqlite/performer_filter.go
@@ -447,7 +447,7 @@ func (qb *performerFilterHandler) studiosCriterionHandler(studios *models.Hierar
 				return
 			}
 
-			if len(studios.Value) == 0 {
+			if len(studios.Value) == 0 && len(studios.Excludes) == 0 {
 				return
 			}
 
@@ -464,27 +464,54 @@ func (qb *performerFilterHandler) studiosCriterionHandler(studios *models.Hierar
 				return
 			}
 
-			const derivedPerformerStudioTable = "performer_studio"
-			valuesClause, err := getHierarchicalValues(ctx, studios.Value, studioTable, "", "parent_id", "child_id", studios.Depth)
-			if err != nil {
-				f.setError(err)
-				return
-			}
-			f.addWith("studio(root_id, item_id) AS (" + valuesClause + ")")
+			if len(studios.Value) > 0 {
+				const derivedPerformerStudioTable = "performer_studio"
+				valuesClause, err := getHierarchicalValues(ctx, studios.Value, studioTable, "", "parent_id", "child_id", studios.Depth)
+				if err != nil {
+					f.setError(err)
+					return
+				}
+				f.addWith("studio(root_id, item_id) AS (" + valuesClause + ")")
 
-			templStr := `SELECT performer_id FROM {primaryTable}
+				templStr := `SELECT performer_id FROM {primaryTable}
+		INNER JOIN {joinTable} ON {primaryTable}.id = {joinTable}.{primaryFK}
+		INNER JOIN studio ON {primaryTable}.studio_id = studio.item_id`
+
+				var unions []string
+				for _, c := range formatMaps {
+					unions = append(unions, utils.StrFormat(templStr, c))
+				}
+
+				f.addWith(fmt.Sprintf("%s AS (%s)", derivedPerformerStudioTable, strings.Join(unions, " UNION ")))
+
+				f.addLeftJoin(derivedPerformerStudioTable, "", fmt.Sprintf("performers.id = %s.performer_id", derivedPerformerStudioTable))
+				f.addWhere(fmt.Sprintf("%s.performer_id IS %s NULL", derivedPerformerStudioTable, clauseCondition))
+			}
+
+			// #6412 - handle excludes as well
+			if len(studios.Excludes) > 0 {
+				excludeValuesClause, err := getHierarchicalValues(ctx, studios.Excludes, studioTable, "", "parent_id", "child_id", studios.Depth)
+				if err != nil {
+					f.setError(err)
+					return
+				}
+				f.addWith("exclude_studio(root_id, item_id) AS (" + excludeValuesClause + ")")
+
+				excludeTemplStr := `SELECT performer_id FROM {primaryTable}
 	INNER JOIN {joinTable} ON {primaryTable}.id = {joinTable}.{primaryFK}
-	INNER JOIN studio ON {primaryTable}.studio_id = studio.item_id`
+	INNER JOIN exclude_studio ON {primaryTable}.studio_id = exclude_studio.item_id`
 
-			var unions []string
-			for _, c := range formatMaps {
-				unions = append(unions, utils.StrFormat(templStr, c))
+				var unions []string
+				for _, c := range formatMaps {
+					unions = append(unions, utils.StrFormat(excludeTemplStr, c))
+				}
+
+				const excludePerformerStudioTable = "performer_studio_exclude"
+				f.addWith(fmt.Sprintf("%s AS (%s)", excludePerformerStudioTable, strings.Join(unions, " UNION ")))
+
+				f.addLeftJoin(excludePerformerStudioTable, "", fmt.Sprintf("performers.id = %s.performer_id", excludePerformerStudioTable))
+				f.addWhere(fmt.Sprintf("%s.performer_id IS NULL", excludePerformerStudioTable))
 			}
-
-			f.addWith(fmt.Sprintf("%s AS (%s)", derivedPerformerStudioTable, strings.Join(unions, " UNION ")))
-
-			f.addLeftJoin(derivedPerformerStudioTable, "", fmt.Sprintf("performers.id = %s.performer_id", derivedPerformerStudioTable))
-			f.addWhere(fmt.Sprintf("%s.performer_id IS %s NULL", derivedPerformerStudioTable, clauseCondition))
 		}
 	}
 }
diff --git a/pkg/sqlite/performer_test.go b/pkg/sqlite/performer_test.go
index d5d8ce2fa..190d80e31 100644
--- a/pkg/sqlite/performer_test.go
+++ b/pkg/sqlite/performer_test.go
@@ -1160,6 +1160,98 @@ func TestPerformerQuery(t *testing.T) {
 			[]int{performerIdx1WithScene, performerIdxWithScene},
 			false,
 		},
+		{
+			"include scene studio",
+			nil,
+			&models.PerformerFilterType{
+				Studios: &models.HierarchicalMultiCriterionInput{
+					Value:    []string{strconv.Itoa(studioIDs[studioIdxWithScenePerformer])},
+					Modifier: models.CriterionModifierIncludes,
+				},
+			},
+			[]int{performerIdxWithSceneStudio},
+			nil,
+			false,
+		},
+		{
+			"include image studio",
+			nil,
+			&models.PerformerFilterType{
+				Studios: &models.HierarchicalMultiCriterionInput{
+					Value:    []string{strconv.Itoa(studioIDs[studioIdxWithImagePerformer])},
+					Modifier: models.CriterionModifierIncludes,
+				},
+			},
+			[]int{performerIdxWithImageStudio},
+			nil,
+			false,
+		},
+		{
+			"include gallery studio",
+			nil,
+			&models.PerformerFilterType{
+				Studios: &models.HierarchicalMultiCriterionInput{
+					Value:    []string{strconv.Itoa(studioIDs[studioIdxWithGalleryPerformer])},
+					Modifier: models.CriterionModifierIncludes,
+				},
+			},
+			[]int{performerIdxWithGalleryStudio},
+			nil,
+			false,
+		},
+		{
+			"exclude scene studio",
+			nil,
+			&models.PerformerFilterType{
+				Studios: &models.HierarchicalMultiCriterionInput{
+					Value:    []string{strconv.Itoa(studioIDs[studioIdxWithScenePerformer])},
+					Modifier: models.CriterionModifierExcludes,
+				},
+			},
+			nil,
+			[]int{performerIdxWithSceneStudio},
+			false,
+		},
+		{
+			"exclude image studio",
+			nil,
+			&models.PerformerFilterType{
+				Studios: &models.HierarchicalMultiCriterionInput{
+					Value:    []string{strconv.Itoa(studioIDs[studioIdxWithImagePerformer])},
+					Modifier: models.CriterionModifierExcludes,
+				},
+			},
+			nil,
+			[]int{performerIdxWithImageStudio},
+			false,
+		},
+		{
+			"exclude gallery studio",
+			nil,
+			&models.PerformerFilterType{
+				Studios: &models.HierarchicalMultiCriterionInput{
+					Value:    []string{strconv.Itoa(studioIDs[studioIdxWithGalleryPerformer])},
+					Modifier: models.CriterionModifierExcludes,
+				},
+			},
+			nil,
+			[]int{performerIdxWithGalleryStudio},
+			false,
+		},
+		{
+			"include and exclude scene studio",
+			nil,
+			&models.PerformerFilterType{
+				Studios: &models.HierarchicalMultiCriterionInput{
+					Value:    []string{strconv.Itoa(studioIDs[studioIdx1WithTwoScenePerformer])},
+					Modifier: models.CriterionModifierIncludes,
+					Excludes: []string{strconv.Itoa(studioIDs[studioIdx2WithTwoScenePerformer])},
+				},
+			},
+			nil,
+			[]int{performerIdxWithTwoSceneStudio},
+			false,
+		},
 	}
 
 	for _, tt := range tests {
@@ -2260,7 +2352,7 @@ func TestPerformerQuerySortScenesCount(t *testing.T) {
 		assert.True(t, len(performers) > 0)
 		lastPerformer := performers[len(performers)-1]
 
-		assert.Equal(t, performerIDs[performerIdxWithTag], lastPerformer.ID)
+		assert.Equal(t, performerIDs[performerIdxWithTwoSceneStudio], lastPerformer.ID)
 
 		return nil
 	})
diff --git a/pkg/sqlite/setup_test.go b/pkg/sqlite/setup_test.go
index 2e95012b5..63c66fd06 100644
--- a/pkg/sqlite/setup_test.go
+++ b/pkg/sqlite/setup_test.go
@@ -77,6 +77,8 @@ const (
 	sceneIdxWithPerformerTwoTags
 	sceneIdxWithSpacedName
 	sceneIdxWithStudioPerformer
+	sceneIdx1WithTwoStudioPerformer
+	sceneIdx2WithTwoStudioPerformer
 	sceneIdxWithGrandChildStudio
 	sceneIdxMissingPhash
 	sceneIdxWithPerformerParentTag
@@ -138,6 +140,7 @@ const (
 	performerIdxWithSceneStudio
 	performerIdxWithImageStudio
 	performerIdxWithGalleryStudio
+	performerIdxWithTwoSceneStudio
 	performerIdxWithParentTag
 	// new indexes above
 	// performers with dup names start from the end
@@ -257,6 +260,8 @@ const (
 	studioIdxWithScenePerformer
 	studioIdxWithImagePerformer
 	studioIdxWithGalleryPerformer
+	studioIdx1WithTwoScenePerformer
+	studioIdx2WithTwoScenePerformer
 	studioIdxWithTag
 	studioIdx2WithTag
 	studioIdxWithTwoTags
@@ -384,16 +389,18 @@ var (
 	}
 
 	scenePerformers = linkMap{
-		sceneIdxWithPerformer:          {performerIdxWithScene},
-		sceneIdxWithTwoPerformers:      {performerIdx1WithScene, performerIdx2WithScene},
-		sceneIdxWithThreePerformers:    {performerIdx1WithScene, performerIdx2WithScene, performerIdx3WithScene},
-		sceneIdxWithPerformerTag:       {performerIdxWithTag},
-		sceneIdxWithTwoPerformerTag:    {performerIdxWithTag, performerIdx2WithTag},
-		sceneIdxWithPerformerTwoTags:   {performerIdxWithTwoTags},
-		sceneIdx1WithPerformer:         {performerIdxWithTwoScenes},
-		sceneIdx2WithPerformer:         {performerIdxWithTwoScenes},
-		sceneIdxWithStudioPerformer:    {performerIdxWithSceneStudio},
-		sceneIdxWithPerformerParentTag: {performerIdxWithParentTag},
+		sceneIdxWithPerformer:           {performerIdxWithScene},
+		sceneIdxWithTwoPerformers:       {performerIdx1WithScene, performerIdx2WithScene},
+		sceneIdxWithThreePerformers:     {performerIdx1WithScene, performerIdx2WithScene, performerIdx3WithScene},
+		sceneIdxWithPerformerTag:        {performerIdxWithTag},
+		sceneIdxWithTwoPerformerTag:     {performerIdxWithTag, performerIdx2WithTag},
+		sceneIdxWithPerformerTwoTags:    {performerIdxWithTwoTags},
+		sceneIdx1WithPerformer:          {performerIdxWithTwoScenes},
+		sceneIdx2WithPerformer:          {performerIdxWithTwoScenes},
+		sceneIdxWithStudioPerformer:     {performerIdxWithSceneStudio},
+		sceneIdx1WithTwoStudioPerformer: {performerIdxWithTwoSceneStudio},
+		sceneIdx2WithTwoStudioPerformer: {performerIdxWithTwoSceneStudio},
+		sceneIdxWithPerformerParentTag:  {performerIdxWithParentTag},
 	}
 
 	sceneGalleries = linkMap{
@@ -406,11 +413,13 @@ var (
 	}
 
 	sceneStudios = map[int]int{
-		sceneIdxWithStudio:           studioIdxWithScene,
-		sceneIdx1WithStudio:          studioIdxWithTwoScenes,
-		sceneIdx2WithStudio:          studioIdxWithTwoScenes,
-		sceneIdxWithStudioPerformer:  studioIdxWithScenePerformer,
-		sceneIdxWithGrandChildStudio: studioIdxWithGrandParent,
+		sceneIdxWithStudio:              studioIdxWithScene,
+		sceneIdx1WithStudio:             studioIdxWithTwoScenes,
+		sceneIdx2WithStudio:             studioIdxWithTwoScenes,
+		sceneIdxWithStudioPerformer:     studioIdxWithScenePerformer,
+		sceneIdx1WithTwoStudioPerformer: studioIdx1WithTwoScenePerformer,
+		sceneIdx2WithTwoStudioPerformer: studioIdx2WithTwoScenePerformer,
+		sceneIdxWithGrandChildStudio:    studioIdxWithGrandParent,
 	}
 )
 

From b23c3cd61872e29590a617b72695efe3bf63fd4c Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Mon, 15 Dec 2025 14:57:00 +1100
Subject: [PATCH 221/405] Perform hardware codec checks on separate go routine
 (#6414)

Warn if tests are taking a long time
Add WaitDelay to try to kill process if hanging
---
 internal/manager/init.go     |  3 ++-
 pkg/ffmpeg/codec_hardware.go | 35 ++++++++++++++++++++++++++++++++---
 pkg/ffmpeg/ffmpeg.go         | 14 +++++++++++---
 3 files changed, 45 insertions(+), 7 deletions(-)

diff --git a/internal/manager/init.go b/internal/manager/init.go
index dd1640ed3..b388bd15c 100644
--- a/internal/manager/init.go
+++ b/internal/manager/init.go
@@ -313,6 +313,7 @@ func (s *Manager) RefreshFFMpeg(ctx context.Context) {
 		s.FFMpeg = ffmpeg.NewEncoder(ffmpegPath)
 		s.FFProbe = ffmpeg.NewFFProbe(ffprobePath)
 
-		s.FFMpeg.InitHWSupport(ctx)
+		// initialise hardware support with background context
+		s.FFMpeg.InitHWSupport(context.Background())
 	}
 }
diff --git a/pkg/ffmpeg/codec_hardware.go b/pkg/ffmpeg/codec_hardware.go
index 530f4dc59..86fe56bde 100644
--- a/pkg/ffmpeg/codec_hardware.go
+++ b/pkg/ffmpeg/codec_hardware.go
@@ -36,6 +36,32 @@ const minHeight int = 480
 
 // Tests all (given) hardware codec's
 func (f *FFMpeg) InitHWSupport(ctx context.Context) {
+	// do the hardware codec tests in a separate goroutine to avoid blocking
+	done := make(chan struct{})
+	go func() {
+		f.initHWSupport(ctx)
+		close(done)
+	}()
+
+	// log if the initialization takes too long
+	const hwInitLogTimeoutSecondsDefault = 5
+	hwInitLogTimeoutSeconds := hwInitLogTimeoutSecondsDefault * time.Second
+	timer := time.NewTimer(hwInitLogTimeoutSeconds)
+
+	go func() {
+		select {
+		case <-timer.C:
+			logger.Warnf("[InitHWSupport] Hardware codec initialization is taking longer than %s...", hwInitLogTimeoutSeconds)
+			logger.Info("[InitHWSupport] Hardware encoding will not be available until initialization is complete.")
+		case <-done:
+			if !timer.Stop() {
+				<-timer.C
+			}
+		}
+	}()
+}
+
+func (f *FFMpeg) initHWSupport(ctx context.Context) {
 	var hwCodecSupport []VideoCodec
 
 	// Note that the first compatible codec is returned, so order is important
@@ -83,6 +109,7 @@ func (f *FFMpeg) InitHWSupport(ctx context.Context) {
 		defer cancel()
 
 		cmd := f.Command(testCtx, args)
+		cmd.WaitDelay = time.Second
 		logger.Tracef("[InitHWSupport] Testing codec %s: %v", codec, cmd.Args)
 
 		var stderr bytes.Buffer
@@ -112,6 +139,8 @@ func (f *FFMpeg) InitHWSupport(ctx context.Context) {
 	}
 	logger.Info(outstr)
 
+	f.hwCodecSupportMutex.Lock()
+	defer f.hwCodecSupportMutex.Unlock()
 	f.hwCodecSupport = hwCodecSupport
 }
 
@@ -411,7 +440,7 @@ func (f *FFMpeg) hwMaxResFilter(toCodec VideoCodec, vf *models.VideoFile, reqHei
 
 // Return if a hardware accelerated for HLS is available
 func (f *FFMpeg) hwCodecHLSCompatible() *VideoCodec {
-	for _, element := range f.hwCodecSupport {
+	for _, element := range f.getHWCodecSupport() {
 		switch element {
 		case VideoCodecN264,
 			VideoCodecN264H,
@@ -429,7 +458,7 @@ func (f *FFMpeg) hwCodecHLSCompatible() *VideoCodec {
 
 // Return if a hardware accelerated codec for MP4 is available
 func (f *FFMpeg) hwCodecMP4Compatible() *VideoCodec {
-	for _, element := range f.hwCodecSupport {
+	for _, element := range f.getHWCodecSupport() {
 		switch element {
 		case VideoCodecN264,
 			VideoCodecN264H,
@@ -445,7 +474,7 @@ func (f *FFMpeg) hwCodecMP4Compatible() *VideoCodec {
 
 // Return if a hardware accelerated codec for WebM is available
 func (f *FFMpeg) hwCodecWEBMCompatible() *VideoCodec {
-	for _, element := range f.hwCodecSupport {
+	for _, element := range f.getHWCodecSupport() {
 		switch element {
 		case VideoCodecIVP9,
 			VideoCodecVVP9:
diff --git a/pkg/ffmpeg/ffmpeg.go b/pkg/ffmpeg/ffmpeg.go
index ce1232e5d..04c58f04b 100644
--- a/pkg/ffmpeg/ffmpeg.go
+++ b/pkg/ffmpeg/ffmpeg.go
@@ -10,6 +10,7 @@ import (
 	"regexp"
 	"strconv"
 	"strings"
+	"sync"
 
 	stashExec "github.com/stashapp/stash/pkg/exec"
 	"github.com/stashapp/stash/pkg/fsutil"
@@ -216,9 +217,10 @@ func (v Version) String() string {
 
 // FFMpeg provides an interface to ffmpeg.
 type FFMpeg struct {
-	ffmpeg         string
-	version        Version
-	hwCodecSupport []VideoCodec
+	ffmpeg              string
+	version             Version
+	hwCodecSupport      []VideoCodec
+	hwCodecSupportMutex sync.RWMutex
 }
 
 // Creates a new FFMpeg encoder
@@ -241,3 +243,9 @@ func (f *FFMpeg) Command(ctx context.Context, args []string) *exec.Cmd {
 func (f *FFMpeg) Path() string {
 	return f.ffmpeg
 }
+
+func (f *FFMpeg) getHWCodecSupport() []VideoCodec {
+	f.hwCodecSupportMutex.RLock()
+	defer f.hwCodecSupportMutex.RUnlock()
+	return f.hwCodecSupport
+}

From f71d0ac2dd5c5e8159599cb54aa812f9122064d7 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Wed, 17 Dec 2025 08:19:45 +1100
Subject: [PATCH 222/405] Fix scrape result row showing when results are same
 (#6415)

---
 .../src/components/Shared/ScrapeDialog/ScrapedObjectsRow.tsx  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/v2.5/src/components/Shared/ScrapeDialog/ScrapedObjectsRow.tsx b/ui/v2.5/src/components/Shared/ScrapeDialog/ScrapedObjectsRow.tsx
index fea2fd541..f383f245a 100644
--- a/ui/v2.5/src/components/Shared/ScrapeDialog/ScrapedObjectsRow.tsx
+++ b/ui/v2.5/src/components/Shared/ScrapeDialog/ScrapedObjectsRow.tsx
@@ -184,7 +184,7 @@ export const ScrapedObjectsRow = <T,>(props: IScrapedObjectsRow<T>) => {
     field,
     result,
     onChange,
-    newObjects,
+    newObjects = [],
     onCreateNew,
     onLinkExisting,
     renderObjects,
@@ -202,7 +202,7 @@ export const ScrapedObjectsRow = <T,>(props: IScrapedObjectsRow<T>) => {
       )}
       onChange={onChange}
       newValues={
-        onCreateNew ? (
+        onCreateNew && newObjects.length > 0 ? (
           <NewScrapedObjects
             newValues={newObjects ?? []}
             onCreateNew={onCreateNew}

From b2df8192830e59d48917e6d655c7a414d7eb15cc Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Wed, 17 Dec 2025 09:28:46 +1100
Subject: [PATCH 223/405] Update changelog

---
 ui/v2.5/src/docs/en/Changelog/v0300.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ui/v2.5/src/docs/en/Changelog/v0300.md b/ui/v2.5/src/docs/en/Changelog/v0300.md
index 5569aa147..f3d996a3c 100644
--- a/ui/v2.5/src/docs/en/Changelog/v0300.md
+++ b/ui/v2.5/src/docs/en/Changelog/v0300.md
@@ -28,6 +28,7 @@
 * Added auto-start button to scene player. ([#6368](https://github.com/stashapp/stash/pull/6368))
 * Bulk add tasks now accept stash ids in addition to names. ([#6310](https://github.com/stashapp/stash/pull/6310))
 * Image query metadata (total file size and megapixels) is now performed as a separate query to the main query to improve performance. ([#6370](https://github.com/stashapp/stash/pull/6370))
+* Removed some unused fields in the tag list query to improve performance. ([#6398](https://github.com/stashapp/stash/pull/6398))
 * Added hardware encoding support for Rockchip RKMPP devices. ([#6182](https://github.com/stashapp/stash/pull/6182))
 * stash now uses the Media Session API when playing scenes. ([#6298](https://github.com/stashapp/stash/pull/6298))
 * Screen sleeping is now prevented when playing scenes (only in secure contexts: `localhost` or https). ([#6331](https://github.com/stashapp/stash/pull/6331))
@@ -55,13 +56,14 @@
 * Fixed external player not loading on Android when a scene title has special characters. ([#6297](https://github.com/stashapp/stash/pull/6297))
 * Play activity will now be recorded correctly when reaching the end of a video. ([#6334](https://github.com/stashapp/stash/pull/6334))
 * Fixed markers appearing in the wrong location when player is in fullscreen mode. ([#6323](https://github.com/stashapp/stash/pull/6323))
-* Fixed selected performer being reset when saving a scene in the tagger view. ([#6391](https://github.com/stashapp/stash/pull/6391))
+* Fixed selected studio/performer being reset when saving a scene in the tagger view. ([#6391](https://github.com/stashapp/stash/pull/6391), [#6409](https://github.com/stashapp/stash/pull/6409))
 * Fixed performer becoming unmatched when creating a new performer with the same name is created. ([#6308](https://github.com/stashapp/stash/pull/6308))
 * Fixed tagger options and buttons not being visible when there are no scenes in the result list. ([#6316](https://github.com/stashapp/stash/pull/6316))
 * Fixed error when scraping a studio if the alias field was empty. ([#6313](https://github.com/stashapp/stash/pull/6313))
 * Fixed existing match stash ID sometimes not being displayed in the performer scrape dialog. ([#6257](https://github.com/stashapp/stash/pull/6257))
 * Fixed download backup function not working when generated directory is on a different filesystem. ([#6244](https://github.com/stashapp/stash/pull/6244))
 * Fixed issue where duplicate file entries would be created if a file was modified and renamed with a different case on case-insensitive filesystems. ([#6327](https://github.com/stashapp/stash/pull/6327))
+* Hardware encoding tests are now performed concurrently at startup to reduce startup time. ([#6414](https://github.com/stashapp/stash/pull/6414))
 * Fixed scraper and plugin locations being converted to absolute paths during setup. ([#6373](https://github.com/stashapp/stash/pull/6373))
 * Fixed Macos version check pointing to incorrect location. ([#6289](https://github.com/stashapp/stash/pull/6289))
 * stash will no longer try to generate marker previews where a marker start is set after the end of a scene's duration. ([#6290](https://github.com/stashapp/stash/pull/6290))

From 857e673d3ee9c71a29d1cf55f29d90e26952f12e Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Wed, 17 Dec 2025 10:02:35 +1100
Subject: [PATCH 224/405] Codeberg weblate (#6416)

* Translated using Weblate (Czech)

Currently translated at 100.0% (1250 of 1250 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/cs/

* Translated using Weblate (Japanese)

Currently translated at 82.0% (1026 of 1250 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/ja/

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 69.1% (864 of 1250 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/pt_BR/

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 69.1% (864 of 1250 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/pt_BR/

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (1250 of 1250 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/zh_Hans/

* Translated using Weblate (Indonesian)

Currently translated at 48.3% (604 of 1250 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/id/

* Translated using Weblate (Estonian)

Currently translated at 100.0% (1251 of 1251 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/et/

* Translated using Weblate (French)

Currently translated at 100.0% (1251 of 1251 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/fr/

---------

Co-authored-by: NymeriaCZ <nymeriacz@noreply.codeberg.org>
Co-authored-by: hirokazuk <hirokazuk@noreply.codeberg.org>
Co-authored-by: BimboStarsFan <bimbostarsfan@noreply.codeberg.org>
Co-authored-by: icaro <icaro@noreply.codeberg.org>
Co-authored-by: wql219 <wql219@noreply.codeberg.org>
Co-authored-by: koukyoukoku <koukyoukoku@noreply.codeberg.org>
Co-authored-by: Zesty6249 <zesty6249@noreply.codeberg.org>
Co-authored-by: doodoo <doodoo@noreply.codeberg.org>
---
 ui/v2.5/src/locales/cs-CZ.json | 43 +++++++++++++++++++++++++++-------
 ui/v2.5/src/locales/et-EE.json |  7 +++---
 ui/v2.5/src/locales/fr-FR.json |  3 ++-
 ui/v2.5/src/locales/id-ID.json |  8 ++++++-
 ui/v2.5/src/locales/ja-JP.json | 13 ++++++++--
 ui/v2.5/src/locales/pt-BR.json | 23 +++++++++++++++++-
 ui/v2.5/src/locales/zh-CN.json |  3 ++-
 7 files changed, 83 insertions(+), 17 deletions(-)

diff --git a/ui/v2.5/src/locales/cs-CZ.json b/ui/v2.5/src/locales/cs-CZ.json
index 1b9c4c576..d08f1703a 100644
--- a/ui/v2.5/src/locales/cs-CZ.json
+++ b/ui/v2.5/src/locales/cs-CZ.json
@@ -151,7 +151,9 @@
         "show_results": "Zobrazit výsledky",
         "show_count_results": "Zobrazit {count} výsledků",
         "load": "Načíst",
-        "load_filter": "Načíst filtr"
+        "load_filter": "Načíst filtr",
+        "add_stash_id": "Přidat Stash ID",
+        "create_new": "Vytvořit nový"
     },
     "actions_name": "Akce",
     "age": "Věk",
@@ -191,6 +193,10 @@
             "mark_organized_label": "Označit jako Uspořádané při uložení",
             "errors": {
                 "blacklist_duplicate": "Duplikovat položku blacklistu"
+            },
+            "performer_genders": {
+                "heading": "Pohlaví účinkujicích",
+                "description": "Účinkující s těmito pohlavími budou zobrazeni při tagování scén."
             }
         },
         "noun_query": "Dotaz",
@@ -212,7 +218,10 @@
         "verb_scrape_all": "Scrape vše",
         "verb_submit_fp": "Publikovat {fpCount, plural, one{# otisk} other{# otisky}}",
         "verb_toggle_config": "{toggle} {configuration}",
-        "verb_toggle_unmatched": "{toggle} neidentifikované scény"
+        "verb_toggle_unmatched": "{toggle} neidentifikované scény",
+        "verb_add_as_alias": "Přidat scrapované jméno jako alias",
+        "verb_link_existing": "Odkaz na existujicí",
+        "verb_match_tag": "Odpovídajicí tag"
     },
     "config": {
         "about": {
@@ -409,6 +418,10 @@
             "blobs_path": {
                 "description": "Kde v souborovém systému ukládat binární data. Použitelné pouze při použití uložiště typu souborového systému blobů. UPOZORNĚNÍ: převrácení těchto údajů vyžaduje ruční přesun existujících dat.",
                 "heading": "Cesta binárních dat souborového systému"
+            },
+            "delete_trash_path": {
+                "description": "Cesta, kam budou smazané soubory přesunuty, místo aby byly trvale smazány. Pro trvalé smazání souborů ponechte pole prázdné.",
+                "heading": "Cesta koše"
             }
         },
         "library": {
@@ -898,7 +911,8 @@
                 "pan_y": "Náklon Y",
                 "zoom": "Zvětšit"
             },
-            "page_header": "Stránka {page} / {total}"
+            "page_header": "Stránka {page} / {total}",
+            "disable_animation": "Zakázat animaci přechodu mezi obrázky"
         },
         "merge_tags": {
             "destination": "Cíl",
@@ -974,7 +988,12 @@
         "performers_found": "{count} nalezených účinkujících",
         "overwrite_filter_warning": "Uložený filtr \"{entityName}\" bude přepsán.",
         "set_default_filter_confirm": "Chcete doopravdy nastavit tento filtr jako výchozí?",
-        "clear_o_history_confirm_sfw": "Opravdu chcete vymazat historii lajků?"
+        "clear_o_history_confirm_sfw": "Opravdu chcete vymazat historii lajků?",
+        "delete_alert_to_trash": "Následující {count, plural, one {{singularEntity}} other {{pluralEntity}}} budou přesunuty do koše:",
+        "stashid_exists_warning": "Stávající stash id pro tento stash-box bude nahrazeno.",
+        "studios_found": "{count} studií nalezeno",
+        "tags_found": "{count} tagů nalezeno",
+        "scrape_results_missing": "Chybějící"
     },
     "chapters": "Kapitoly",
     "circumcised": "Obřezán",
@@ -1019,7 +1038,7 @@
         "required": "${path} je vyžadované pole",
         "unique": "${path} musí být jedinečná",
         "blank": "${path} nesmí být prázdná",
-        "date_invalid_form": "${path} musí být ve formátu YYYY-MM-DD (Rok-Měsíc-Den)",
+        "date_invalid_form": "${path} musí být ve formátu YYYY, YYYY-MM, nebo YYYY-MM-DD (Rok-Měsíc-Den)",
         "end_time_before_start_time": "Čas ukončení musí být větší nebo roven času zahájení"
     },
     "type": "Typ",
@@ -1155,7 +1174,8 @@
         "name_already_exists": "Název již existuje",
         "update_performers": "Aktualizovat Účinkující",
         "updating_untagged_performers_description": "Aktualizování nepřiřazených účinkujících se pokusí nalézt všechny účinkující, kteří postrádají StashID, a aktualizovat metadata.",
-        "update_performer": "Aktualizovat Účinkující"
+        "update_performer": "Aktualizovat Účinkující",
+        "performer_names_or_stashids_separated_by_comma": "Jména účinkujících nebo Stash ID oddělené čárkou"
     },
     "setup": {
         "paths": {
@@ -1479,7 +1499,8 @@
         "tag_status": "Status označení",
         "network_error": "Chyba sítě",
         "studio_selection": "Výběr studia",
-        "studio_successfully_tagged": "Studio úspěšně označeno"
+        "studio_successfully_tagged": "Studio úspěšně označeno",
+        "studio_names_or_stashids_separated_by_comma": "Jména studií nebo Stash ID odělená čárkou"
     },
     "synopsis": "Souhrn",
     "stashbox": {
@@ -1565,5 +1586,11 @@
     "o_count_sfw": "Lajky",
     "o_history_sfw": "Historie lajků",
     "odate_recorded_no_sfw": "Žádný datum lajku nebyl zaznamenán",
-    "scenes_duration": "Trvání scény"
+    "scenes_duration": "Trvání scény",
+    "stashbox_search": {
+        "header": "Hledej {entityType} ve StashBoxu",
+        "no_results": "Žádné výsledky nenalezeny.",
+        "placeholder_name_or_id": "{entityType} jméno nebo StashID...",
+        "select_stashbox": "Vybrat StashBox..."
+    }
 }
diff --git a/ui/v2.5/src/locales/et-EE.json b/ui/v2.5/src/locales/et-EE.json
index 92b16a7ff..a250674a2 100644
--- a/ui/v2.5/src/locales/et-EE.json
+++ b/ui/v2.5/src/locales/et-EE.json
@@ -202,7 +202,7 @@
             },
             "performer_genders": {
                 "heading": "Näitlejate sood",
-                "description": "Tähe märgistades näidatakse nendest lugudest näitlejaid."
+                "description": "Stseene märgistades näidatakse nende sugudega näitlejaid."
             }
         },
         "noun_query": "Päring",
@@ -1172,7 +1172,7 @@
     "metadata": "Metaandmed",
     "name": "Nimi",
     "new": "Uus",
-    "none": "Puudub",
+    "none": "Mitte ükski",
     "operations": "Operatsioonid",
     "organized": "Organiseeritud",
     "pagination": {
@@ -1382,7 +1382,8 @@
         "scenes_played": "Mängitud Stseenid",
         "total_o_count": "Kokku O-Arv",
         "total_play_count": "Mängimiste Koguarv",
-        "total_play_duration": "Mängimiste Kogukestus"
+        "total_play_duration": "Mängimiste Kogukestus",
+        "total_o_count_sfw": "Meeldimisi kokku"
     },
     "status": "Staatus: {statusText}",
     "studio": "Stuudio",
diff --git a/ui/v2.5/src/locales/fr-FR.json b/ui/v2.5/src/locales/fr-FR.json
index e461a144a..a72361f22 100644
--- a/ui/v2.5/src/locales/fr-FR.json
+++ b/ui/v2.5/src/locales/fr-FR.json
@@ -1393,7 +1393,8 @@
         "scenes_size": "Poids des scènes",
         "total_o_count": "Nombre total de O-",
         "total_play_count": "Nombre de visionnage total",
-        "total_play_duration": "Temps de visionnage total"
+        "total_play_duration": "Temps de visionnage total",
+        "total_o_count_sfw": "Total de J'aime"
     },
     "status": "Statut : {statusText}",
     "studio": "Studio",
diff --git a/ui/v2.5/src/locales/id-ID.json b/ui/v2.5/src/locales/id-ID.json
index 876c7a21c..b4edec6d5 100644
--- a/ui/v2.5/src/locales/id-ID.json
+++ b/ui/v2.5/src/locales/id-ID.json
@@ -163,7 +163,9 @@
             "close": "Tutup bilah samping",
             "open": "Buka bilah samping",
             "toggle": "Alihkan bilah samping"
-        }
+        },
+        "add_stash_id": "Tambah ID Stash",
+        "create_new": "Buat Baru"
     },
     "circumcised_types": {
         "CUT": "Disunat",
@@ -241,6 +243,10 @@
             "source": "Sumber",
             "errors": {
                 "blacklist_duplicate": "Duplikat item daftar hitam"
+            },
+            "performer_genders": {
+                "heading": "Kelamin pemain",
+                "description": "Pemain dengan kelamin ini akan ditampilkan ketika memberi tanda pada adegan."
             }
         },
         "results": {
diff --git a/ui/v2.5/src/locales/ja-JP.json b/ui/v2.5/src/locales/ja-JP.json
index 1d87f57ac..3ee3597eb 100644
--- a/ui/v2.5/src/locales/ja-JP.json
+++ b/ui/v2.5/src/locales/ja-JP.json
@@ -149,7 +149,8 @@
         },
         "play": "再生",
         "show_results": "結果を表示",
-        "show_count_results": "{count}件の結果を表示"
+        "show_count_results": "{count}件の結果を表示",
+        "load": "読み込み"
     },
     "actions_name": "操作",
     "age": "年齢",
@@ -1328,5 +1329,13 @@
     },
     "distance": "距離",
     "age_on_date": "撮影時の年齢 {age}歳",
-    "containing_group": "含まれるグループ"
+    "containing_group": "含まれるグループ",
+    "penis_length": "ペニスの長さ",
+    "parent_studio": "親スタジオ",
+    "sort_name": "ソート用の名称",
+    "groups": "グループ",
+    "include_sub_groups": "サブグループを含める",
+    "sub_groups": "サブグループ",
+    "history": "履歴",
+    "group_scene_number": "シーン番号"
 }
diff --git a/ui/v2.5/src/locales/pt-BR.json b/ui/v2.5/src/locales/pt-BR.json
index 47ae84cbe..64b0e4e4c 100644
--- a/ui/v2.5/src/locales/pt-BR.json
+++ b/ui/v2.5/src/locales/pt-BR.json
@@ -124,7 +124,28 @@
         "use_default": "Usar padrão",
         "view_random": "Mostrar aleatoriamente",
         "remove_date": "Remover data",
-        "view_history": "Visualizar Histórico"
+        "view_history": "Visualizar Histórico",
+        "add_manual_date": "Inserir data manualmente",
+        "add_sub_groups": "Adicionar sub-grupos",
+        "add_o": "Adicionar O",
+        "add_play": "Adicionar play",
+        "add_stash_id": "Adicionar Stash ID",
+        "choose_date": "Escolher uma data",
+        "clean_generated": "Limpar os arquivos gerados",
+        "clear_date_data": "Limpar dados de datas",
+        "create_new": "Criar novo",
+        "disable": "Desabilitar",
+        "enable": "Habilitar",
+        "load": "Carregar",
+        "load_filter": "Carregar filtro",
+        "play": "Assistir",
+        "remove_from_containing_group": "Remover do Grupo",
+        "reset_play_duration": "Redefinir duração",
+        "reset_resume_time": "Redefinir tempo de retomada",
+        "reset_cover": "Restaurar a capa padrão",
+        "copy_to_clipboard": "Copiar para a área de transferência",
+        "encoding_image": "Codificando imagem…",
+        "reload": "Recarregar"
     },
     "actions_name": "Ações",
     "age": "Idade",
diff --git a/ui/v2.5/src/locales/zh-CN.json b/ui/v2.5/src/locales/zh-CN.json
index decf87fab..29e92b049 100644
--- a/ui/v2.5/src/locales/zh-CN.json
+++ b/ui/v2.5/src/locales/zh-CN.json
@@ -1005,7 +1005,8 @@
         "delete_alert_to_trash": "如下的{count, plural, one {{singularEntity}} other {{pluralEntity}}} 将会被移动到回收站：",
         "stashid_exists_warning": "此stash-box已存在的stash编号将会被取代。",
         "studios_found": "找到{count} 个工作室",
-        "tags_found": "找到{count} 个标签"
+        "tags_found": "找到{count} 个标签",
+        "scrape_results_missing": "丢失"
     },
     "dimensions": "大小",
     "director": "导演",

From 5b62cc66d4d71fdf38c141206da2e7acd2d1303d Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Wed, 17 Dec 2025 13:42:42 +1100
Subject: [PATCH 225/405] Initialise IsDesktop early to avoid confusion due to
 ffmpeg checks (#6417)

---
 cmd/stash/main.go           |  4 ++++
 internal/desktop/desktop.go | 21 +++++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/cmd/stash/main.go b/cmd/stash/main.go
index e3a54f020..57fedd0e2 100644
--- a/cmd/stash/main.go
+++ b/cmd/stash/main.go
@@ -76,6 +76,10 @@ func main() {
 		defer pprof.StopCPUProfile()
 	}
 
+	// initialise desktop.IsDesktop here so that it doesn't get affected by
+	// ffmpeg hardware checks later on
+	desktop.InitIsDesktop()
+
 	mgr, err := manager.Initialize(cfg, l)
 	if err != nil {
 		exitError(fmt.Errorf("manager initialization error: %w", err))
diff --git a/internal/desktop/desktop.go b/internal/desktop/desktop.go
index a89a3c962..06d400793 100644
--- a/internal/desktop/desktop.go
+++ b/internal/desktop/desktop.go
@@ -17,6 +17,16 @@ import (
 	"golang.org/x/term"
 )
 
+var isDesktop bool
+
+// InitIsDesktop sets the value of isDesktop.
+// Changed IsDesktop to be evaluated once at startup because if it is
+// checked while there are open terminal sessions (such as the ffmpeg hardware
+// encoding checks), it may return false.
+func InitIsDesktop() {
+	isDesktop = isDesktopCheck()
+}
+
 type FaviconProvider interface {
 	GetFavicon() []byte
 	GetFaviconPng() []byte
@@ -59,22 +69,33 @@ func SendNotification(title string, text string) {
 }
 
 func IsDesktop() bool {
+	return isDesktop
+}
+
+// isDesktop tries to determine if the application is running in a desktop environment
+// where desktop features like system tray and notifications should be enabled.
+func isDesktopCheck() bool {
 	if isDoubleClickLaunched() {
+		logger.Debug("Detected double-click launch")
 		return true
 	}
 
 	// Check if running under root
 	if os.Getuid() == 0 {
+		logger.Debug("Running as root, disabling desktop features")
 		return false
 	}
 	// Check if stdin is a terminal
 	if term.IsTerminal(int(os.Stdin.Fd())) {
+		logger.Debug("Running in terminal, disabling desktop features")
 		return false
 	}
 	if isService() {
+		logger.Debug("Running as a service, disabling desktop features")
 		return false
 	}
 	if IsServerDockerized() {
+		logger.Debug("Running in docker, disabling desktop features")
 		return false
 	}
 

From af111897187a4ed19cb80c99149a92da50aac0e0 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Wed, 17 Dec 2025 17:13:03 +1100
Subject: [PATCH 226/405] Set organised flag in gallery create (#6418)

---
 internal/api/resolver_mutation_gallery.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/internal/api/resolver_mutation_gallery.go b/internal/api/resolver_mutation_gallery.go
index 2ff9e8eb5..8f4863c6d 100644
--- a/internal/api/resolver_mutation_gallery.go
+++ b/internal/api/resolver_mutation_gallery.go
@@ -49,6 +49,7 @@ func (r *mutationResolver) GalleryCreate(ctx context.Context, input GalleryCreat
 	newGallery.Details = translator.string(input.Details)
 	newGallery.Photographer = translator.string(input.Photographer)
 	newGallery.Rating = input.Rating100
+	newGallery.Organized = translator.bool(input.Organized)
 
 	var err error
 

From e9f5e7d6b4e756e323871c68aceee7918f65f05f Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Thu, 18 Dec 2025 14:52:42 +1100
Subject: [PATCH 227/405] Fix handy not working correctly (#6425)

---
 ui/v2.5/src/hooks/Interactive/interactive.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ui/v2.5/src/hooks/Interactive/interactive.ts b/ui/v2.5/src/hooks/Interactive/interactive.ts
index 4ca59b25b..2b1227243 100644
--- a/ui/v2.5/src/hooks/Interactive/interactive.ts
+++ b/ui/v2.5/src/hooks/Interactive/interactive.ts
@@ -178,6 +178,10 @@ export class Interactive {
     this._connected = await this._handy
       .setHsspSetup(funscriptUrl)
       .then((result) => result === HsspSetupResult.downloaded);
+
+    // for some reason we need to call getStatus after setup to ensure proper state
+    // see https://github.com/defucilis/thehandy/issues/3
+    await this._handy.getStatus();
   }
 
   async sync() {

From 772c69c359812ea0b23c5b097ed2aaaa849753c8 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Thu, 18 Dec 2025 14:54:46 +1100
Subject: [PATCH 228/405] Update changelog for 0.30.1

---
 ui/v2.5/src/docs/en/Changelog/v0300.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ui/v2.5/src/docs/en/Changelog/v0300.md b/ui/v2.5/src/docs/en/Changelog/v0300.md
index f3d996a3c..a783932bb 100644
--- a/ui/v2.5/src/docs/en/Changelog/v0300.md
+++ b/ui/v2.5/src/docs/en/Changelog/v0300.md
@@ -49,6 +49,9 @@
 * Custom field values are now displayed truncated to 5 lines. ([#6361](https://github.com/stashapp/stash/pull/6361))
 
 ### 🐛 Bug fixes
+* **[0.30.1]** fixed hardware encode tests preventing desktop features from working correctly. ([#6417](https://github.com/stashapp/stash/pull/6417))
+* **[0.30.1]** fixed Handy integration not functioning correctly. ([#6425](https://github.com/stashapp/stash/pull/6425))
+* **[0.30.1]** fixed gallery create graphql interface not setting organised flag. ([#6418](https://github.com/stashapp/stash/pull/6418))
 * stash-ids are now set when creating new objects from the scrape dialog. ([#6269](https://github.com/stashapp/stash/pull/6269))
 * partial dates are now correctly handled when scraping scenes. ([#6305](https://github.com/stashapp/stash/pull/6305))
 * Fixed zoom keyboard shortcuts not working. ([#6317](https://github.com/stashapp/stash/pull/6317))

From 08b87431c33f643f22fd2f1be3678dce9d444032 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Mon, 5 Jan 2026 11:28:00 +1100
Subject: [PATCH 229/405] Safely handle panic in scan queue goroutine (#6431)

---
 pkg/file/scan.go | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/pkg/file/scan.go b/pkg/file/scan.go
index 4018913b0..803457665 100644
--- a/pkg/file/scan.go
+++ b/pkg/file/scan.go
@@ -7,6 +7,7 @@ import (
 	"io/fs"
 	"os"
 	"path/filepath"
+	"runtime/debug"
 	"strings"
 	"sync"
 	"time"
@@ -178,7 +179,16 @@ func (s *scanJob) execute(ctx context.Context) {
 	wg.Add(1)
 
 	go func() {
-		defer wg.Done()
+		defer func() {
+			wg.Done()
+
+			// handle panics in goroutine
+			if p := recover(); p != nil {
+				logger.Errorf("panic while queuing files for scan: %v", p)
+				logger.Errorf(string(debug.Stack()))
+			}
+		}()
+
 		if err := s.queueFiles(ctx, paths); err != nil {
 			if errors.Is(err, context.Canceled) {
 				return
@@ -204,6 +214,15 @@ func (s *scanJob) execute(ctx context.Context) {
 }
 
 func (s *scanJob) queueFiles(ctx context.Context, paths []string) error {
+	defer func() {
+		close(s.fileQueue)
+
+		if s.ProgressReports != nil {
+			s.ProgressReports.AddTotal(s.count)
+			s.ProgressReports.Definite()
+		}
+	}()
+
 	var err error
 	s.ProgressReports.ExecuteTask("Walking directory tree", func() {
 		for _, p := range paths {
@@ -214,13 +233,6 @@ func (s *scanJob) queueFiles(ctx context.Context, paths []string) error {
 		}
 	})
 
-	close(s.fileQueue)
-
-	if s.ProgressReports != nil {
-		s.ProgressReports.AddTotal(s.count)
-		s.ProgressReports.Definite()
-	}
-
 	return err
 }
 

From d9622470160dd9784458a7e371282cbf394316de Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Mon, 5 Jan 2026 11:30:31 +1100
Subject: [PATCH 230/405] Custom favicon and title (#6366)

* Load favicon if provided
* Add custom title setting
---
 internal/api/server.go                        | 29 +++++++++++++++++++
 ui/v2.5/src/App.tsx                           |  3 +-
 .../SettingsInterfacePanel.tsx                |  8 +++++
 ui/v2.5/src/core/config.ts                    |  2 ++
 ui/v2.5/src/docs/en/Manual/Configuration.md   |  6 ++++
 ui/v2.5/src/hooks/title.ts                    | 13 +++++----
 ui/v2.5/src/locales/en-GB.json                |  4 +++
 7 files changed, 59 insertions(+), 6 deletions(-)

diff --git a/internal/api/server.go b/internal/api/server.go
index 9290c6512..ed11a99a5 100644
--- a/internal/api/server.go
+++ b/internal/api/server.go
@@ -11,6 +11,7 @@ import (
 	"net/http"
 	"os"
 	"path"
+	"path/filepath"
 	"runtime/debug"
 	"strconv"
 	"strings"
@@ -255,6 +256,9 @@ func Initialize() (*Server, error) {
 		staticUI = statigz.FileServer(ui.UIBox.(fs.ReadDirFS))
 	}
 
+	// handle favicon override
+	r.HandleFunc("/favicon.ico", handleFavicon(staticUI))
+
 	// Serve the web app
 	r.HandleFunc("/*", func(w http.ResponseWriter, r *http.Request) {
 		ext := path.Ext(r.URL.Path)
@@ -295,6 +299,31 @@ func Initialize() (*Server, error) {
 	return server, nil
 }
 
+func handleFavicon(staticUI *statigz.Server) func(w http.ResponseWriter, r *http.Request) {
+	mgr := manager.GetInstance()
+	cfg := mgr.Config
+
+	// check if favicon.ico exists in the config directory
+	// if so, use that
+	// otherwise, use the embedded one
+	iconPath := filepath.Join(cfg.GetConfigPath(), "favicon.ico")
+	exists, _ := fsutil.FileExists(iconPath)
+
+	if exists {
+		logger.Debugf("Using custom favicon at %s", iconPath)
+	}
+
+	return func(w http.ResponseWriter, r *http.Request) {
+		w.Header().Set("Cache-Control", "no-cache")
+
+		if exists {
+			http.ServeFile(w, r, iconPath)
+		} else {
+			staticUI.ServeHTTP(w, r)
+		}
+	}
+}
+
 // Start starts the server. It listens on the configured address and port.
 // It calls ListenAndServeTLS if TLS is configured, otherwise it calls ListenAndServe.
 // Calls to Start are blocked until the server is shutdown.
diff --git a/ui/v2.5/src/App.tsx b/ui/v2.5/src/App.tsx
index a8b92ecc3..761352373 100644
--- a/ui/v2.5/src/App.tsx
+++ b/ui/v2.5/src/App.tsx
@@ -307,7 +307,8 @@ export const App: React.FC = () => {
     );
   }
 
-  const titleProps = makeTitleProps();
+  const title = config.data?.configuration.ui.title || "Stash";
+  const titleProps = makeTitleProps(title);
 
   if (!messages) {
     return null;
diff --git a/ui/v2.5/src/components/Settings/SettingsInterfacePanel/SettingsInterfacePanel.tsx b/ui/v2.5/src/components/Settings/SettingsInterfacePanel/SettingsInterfacePanel.tsx
index 7b3f936d3..0ebe3f736 100644
--- a/ui/v2.5/src/components/Settings/SettingsInterfacePanel/SettingsInterfacePanel.tsx
+++ b/ui/v2.5/src/components/Settings/SettingsInterfacePanel/SettingsInterfacePanel.tsx
@@ -248,6 +248,14 @@ export const SettingsInterfacePanel: React.FC = PatchComponent(
             onChange={(v) => saveInterface({ sfwContentMode: v })}
           />
 
+          <StringSetting
+            id="custom-title"
+            headingID="config.ui.custom_title.heading"
+            subHeadingID="config.ui.custom_title.description"
+            value={ui.title ?? ""}
+            onChange={(v) => saveUI({ title: v })}
+          />
+
           <div className="setting-group">
             <div className="setting">
               <div>
diff --git a/ui/v2.5/src/core/config.ts b/ui/v2.5/src/core/config.ts
index 36d915eeb..b0dc15c9d 100644
--- a/ui/v2.5/src/core/config.ts
+++ b/ui/v2.5/src/core/config.ts
@@ -103,6 +103,8 @@ export interface IUIConfig {
   defaultFilters?: DefaultFilters;
 
   taggerConfig?: ITaggerConfig;
+
+  title?: string;
 }
 
 export function getFrontPageContent(
diff --git a/ui/v2.5/src/docs/en/Manual/Configuration.md b/ui/v2.5/src/docs/en/Manual/Configuration.md
index d7c1b4804..76464facf 100644
--- a/ui/v2.5/src/docs/en/Manual/Configuration.md
+++ b/ui/v2.5/src/docs/en/Manual/Configuration.md
@@ -165,6 +165,12 @@ The following environment variables are also supported:
 |----------------------|---------|
 | `STASH_SQLITE_CACHE_SIZE` | Sets the SQLite cache size. See https://www.sqlite.org/pragma.html#pragma_cache_size. Default is `-2000` which is 2MB. |
 
+### Custom favicon
+
+You can provide a custom favicon by placing a `favicon.ico` file in the configuration directory. The configuration directory is located alongside the `config.yml` file.
+
+When a custom favicon is provided, it will be served instead of the default embedded favicon.
+
 ### Custom served folders
 
 Custom served folders are served when the server handles a request with the `/custom` URL prefix. The following is an example configuration:
diff --git a/ui/v2.5/src/hooks/title.ts b/ui/v2.5/src/hooks/title.ts
index 8dd311e47..193a3f920 100644
--- a/ui/v2.5/src/hooks/title.ts
+++ b/ui/v2.5/src/hooks/title.ts
@@ -1,10 +1,13 @@
 import { MessageDescriptor, useIntl } from "react-intl";
+import { useConfigurationContext } from "./Config";
 
 export const TITLE = "Stash";
 export const TITLE_SEPARATOR = " | ";
 
 export function useTitleProps(...messages: (string | MessageDescriptor)[]) {
   const intl = useIntl();
+  const config = useConfigurationContext();
+  const title = config.configuration.ui.title || TITLE;
 
   const parts = messages.map((msg) => {
     if (typeof msg === "object") {
@@ -14,13 +17,13 @@ export function useTitleProps(...messages: (string | MessageDescriptor)[]) {
     }
   });
 
-  return makeTitleProps(...parts);
+  return makeTitleProps(title, ...parts);
 }
 
-export function makeTitleProps(...parts: string[]) {
-  const title = [...parts, TITLE].join(TITLE_SEPARATOR);
+export function makeTitleProps(title: string, ...parts: string[]) {
+  const fullTitle = [...parts, title].join(TITLE_SEPARATOR);
   return {
-    titleTemplate: `%s | ${title}`,
-    defaultTitle: title,
+    titleTemplate: `%s | ${fullTitle}`,
+    defaultTitle: fullTitle,
   };
 }
diff --git a/ui/v2.5/src/locales/en-GB.json b/ui/v2.5/src/locales/en-GB.json
index 21d3f6a24..158164c8d 100644
--- a/ui/v2.5/src/locales/en-GB.json
+++ b/ui/v2.5/src/locales/en-GB.json
@@ -625,6 +625,10 @@
         "heading": "Custom localisation",
         "option_label": "Custom localisation enabled"
       },
+      "custom_title": {
+        "description": "Custom text to append to the page title. If empty, defaults to 'Stash'.",
+        "heading": "Custom Title"
+      },
       "delete_options": {
         "description": "Default settings when deleting images, galleries, and scenes.",
         "heading": "Delete Options",

From 65e82a0cf6e10ebeb171feecc2bc608dc3907a4d Mon Sep 17 00:00:00 2001
From: sezzim <174854242+sezzim@users.noreply.github.com>
Date: Sun, 4 Jan 2026 20:54:19 -0800
Subject: [PATCH 231/405] Performer merge (#5910)

* Implement merging of performers
* Make the tag merge UI consistent with other types of merges
* Add merge action in scene menu
---------
Co-authored-by: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
---
 graphql/schema/schema.graphql                 |   1 +
 graphql/schema/types/performer.graphql        |   7 +
 internal/api/resolver_mutation_performer.go   | 180 +++-
 internal/api/resolver_mutation_studio.go      |   4 +-
 pkg/models/mocks/PerformerReaderWriter.go     |  14 +
 pkg/models/repository_performer.go            |   2 +
 pkg/sqlite/performer.go                       |  55 ++
 pkg/sqlite/performer_test.go                  | 140 +++
 pkg/sqlite/tag.go                             |   2 +
 ui/v2.5/graphql/data/tag.graphql              |   5 +
 ui/v2.5/graphql/mutations/performer.graphql   |   6 +
 .../Performers/PerformerDetails/Performer.tsx |  43 +-
 .../PerformerScrapeDialog.tsx                 |   4 +-
 .../components/Performers/PerformerList.tsx   |  39 +
 .../Performers/PerformerMergeDialog.tsx       | 876 ++++++++++++++++++
 ui/v2.5/src/components/Performers/styles.scss |   8 +
 .../components/Scenes/SceneDetails/Scene.tsx  |  32 +-
 .../components/Scenes/SceneMergeDialog.tsx    |   3 +-
 .../Shared/ScrapeDialog/ScrapeDialog.tsx      |   5 +-
 .../src/components/Tags/TagDetails/Tag.tsx    |  57 +-
 .../Tags/TagDetails/TagMergeDialog.tsx        | 142 ---
 ui/v2.5/src/components/Tags/TagList.tsx       |  36 +
 .../src/components/Tags/TagMergeDialog.tsx    | 157 ++++
 ui/v2.5/src/core/StashService.ts              |  74 +-
 ui/v2.5/src/locales/en-GB.json                |   7 +-
 25 files changed, 1657 insertions(+), 242 deletions(-)
 create mode 100644 ui/v2.5/src/components/Performers/PerformerMergeDialog.tsx
 delete mode 100644 ui/v2.5/src/components/Tags/TagDetails/TagMergeDialog.tsx
 create mode 100644 ui/v2.5/src/components/Tags/TagMergeDialog.tsx

diff --git a/graphql/schema/schema.graphql b/graphql/schema/schema.graphql
index 8936b8a34..edfdecaac 100644
--- a/graphql/schema/schema.graphql
+++ b/graphql/schema/schema.graphql
@@ -373,6 +373,7 @@ type Mutation {
   performerDestroy(input: PerformerDestroyInput!): Boolean!
   performersDestroy(ids: [ID!]!): Boolean!
   bulkPerformerUpdate(input: BulkPerformerUpdateInput!): [Performer!]
+  performerMerge(input: PerformerMergeInput!): Performer!
 
   studioCreate(input: StudioCreateInput!): Studio
   studioUpdate(input: StudioUpdateInput!): Studio
diff --git a/graphql/schema/types/performer.graphql b/graphql/schema/types/performer.graphql
index fbb67ce8f..e788b91a8 100644
--- a/graphql/schema/types/performer.graphql
+++ b/graphql/schema/types/performer.graphql
@@ -185,3 +185,10 @@ type FindPerformersResultType {
   count: Int!
   performers: [Performer!]!
 }
+
+input PerformerMergeInput {
+  source: [ID!]!
+  destination: ID!
+  # values defined here will override values in the destination
+  values: PerformerUpdateInput
+}
diff --git a/internal/api/resolver_mutation_performer.go b/internal/api/resolver_mutation_performer.go
index c54e3ca93..ab9abf6cf 100644
--- a/internal/api/resolver_mutation_performer.go
+++ b/internal/api/resolver_mutation_performer.go
@@ -2,13 +2,16 @@ package api
 
 import (
 	"context"
+	"errors"
 	"fmt"
+	"slices"
 	"strconv"
 	"strings"
 
 	"github.com/stashapp/stash/pkg/models"
 	"github.com/stashapp/stash/pkg/performer"
 	"github.com/stashapp/stash/pkg/plugin/hook"
+	"github.com/stashapp/stash/pkg/sliceutil"
 	"github.com/stashapp/stash/pkg/sliceutil/stringslice"
 	"github.com/stashapp/stash/pkg/utils"
 )
@@ -136,7 +139,7 @@ func (r *mutationResolver) PerformerCreate(ctx context.Context, input models.Per
 	return r.getPerformer(ctx, newPerformer.ID)
 }
 
-func (r *mutationResolver) validateNoLegacyURLs(translator changesetTranslator) error {
+func validateNoLegacyURLs(translator changesetTranslator) error {
 	// ensure url/twitter/instagram are not included in the input
 	if translator.hasField("url") {
 		return fmt.Errorf("url field must not be included if urls is included")
@@ -151,7 +154,7 @@ func (r *mutationResolver) validateNoLegacyURLs(translator changesetTranslator)
 	return nil
 }
 
-func (r *mutationResolver) handleLegacyURLs(ctx context.Context, performerID int, legacyURL, legacyTwitter, legacyInstagram models.OptionalString, updatedPerformer *models.PerformerPartial) error {
+func (r *mutationResolver) handleLegacyURLs(ctx context.Context, performerID int, legacyURLs legacyPerformerURLs, updatedPerformer *models.PerformerPartial) error {
 	qb := r.repository.Performer
 
 	// we need to be careful with URL/Twitter/Instagram
@@ -170,23 +173,23 @@ func (r *mutationResolver) handleLegacyURLs(ctx context.Context, performerID int
 	existingURLs := p.URLs.List()
 
 	// performer partial URLs should be empty
-	if legacyURL.Set {
+	if legacyURLs.URL.Set {
 		replaced := false
 		for i, url := range existingURLs {
 			if !performer.IsTwitterURL(url) && !performer.IsInstagramURL(url) {
-				existingURLs[i] = legacyURL.Value
+				existingURLs[i] = legacyURLs.URL.Value
 				replaced = true
 				break
 			}
 		}
 
 		if !replaced {
-			existingURLs = append(existingURLs, legacyURL.Value)
+			existingURLs = append(existingURLs, legacyURLs.URL.Value)
 		}
 	}
 
-	if legacyTwitter.Set {
-		value := utils.URLFromHandle(legacyTwitter.Value, twitterURL)
+	if legacyURLs.Twitter.Set {
+		value := utils.URLFromHandle(legacyURLs.Twitter.Value, twitterURL)
 		found := false
 		// find and replace the first twitter URL
 		for i, url := range existingURLs {
@@ -201,9 +204,9 @@ func (r *mutationResolver) handleLegacyURLs(ctx context.Context, performerID int
 			existingURLs = append(existingURLs, value)
 		}
 	}
-	if legacyInstagram.Set {
+	if legacyURLs.Instagram.Set {
 		found := false
-		value := utils.URLFromHandle(legacyInstagram.Value, instagramURL)
+		value := utils.URLFromHandle(legacyURLs.Instagram.Value, instagramURL)
 		// find and replace the first instagram URL
 		for i, url := range existingURLs {
 			if performer.IsInstagramURL(url) {
@@ -226,16 +229,25 @@ func (r *mutationResolver) handleLegacyURLs(ctx context.Context, performerID int
 	return nil
 }
 
-func (r *mutationResolver) PerformerUpdate(ctx context.Context, input models.PerformerUpdateInput) (*models.Performer, error) {
-	performerID, err := strconv.Atoi(input.ID)
-	if err != nil {
-		return nil, fmt.Errorf("converting id: %w", err)
-	}
+type legacyPerformerURLs struct {
+	URL       models.OptionalString
+	Twitter   models.OptionalString
+	Instagram models.OptionalString
+}
 
-	translator := changesetTranslator{
-		inputMap: getUpdateInputMap(ctx),
-	}
+func (u *legacyPerformerURLs) AnySet() bool {
+	return u.URL.Set || u.Twitter.Set || u.Instagram.Set
+}
 
+func legacyPerformerURLsFromInput(input models.PerformerUpdateInput, translator changesetTranslator) legacyPerformerURLs {
+	return legacyPerformerURLs{
+		URL:       translator.optionalString(input.URL, "url"),
+		Twitter:   translator.optionalString(input.Twitter, "twitter"),
+		Instagram: translator.optionalString(input.Instagram, "instagram"),
+	}
+}
+
+func performerPartialFromInput(input models.PerformerUpdateInput, translator changesetTranslator) (*models.PerformerPartial, error) {
 	// Populate performer from the input
 	updatedPerformer := models.NewPerformerPartial()
 
@@ -260,19 +272,17 @@ func (r *mutationResolver) PerformerUpdate(ctx context.Context, input models.Per
 	updatedPerformer.IgnoreAutoTag = translator.optionalBool(input.IgnoreAutoTag, "ignore_auto_tag")
 	updatedPerformer.StashIDs = translator.updateStashIDs(input.StashIds, "stash_ids")
 
+	var err error
+
 	if translator.hasField("urls") {
 		// ensure url/twitter/instagram are not included in the input
-		if err := r.validateNoLegacyURLs(translator); err != nil {
+		if err := validateNoLegacyURLs(translator); err != nil {
 			return nil, err
 		}
 
 		updatedPerformer.URLs = translator.updateStrings(input.Urls, "urls")
 	}
 
-	legacyURL := translator.optionalString(input.URL, "url")
-	legacyTwitter := translator.optionalString(input.Twitter, "twitter")
-	legacyInstagram := translator.optionalString(input.Instagram, "instagram")
-
 	updatedPerformer.Birthdate, err = translator.optionalDate(input.Birthdate, "birthdate")
 	if err != nil {
 		return nil, fmt.Errorf("converting birthdate: %w", err)
@@ -299,6 +309,26 @@ func (r *mutationResolver) PerformerUpdate(ctx context.Context, input models.Per
 
 	updatedPerformer.CustomFields = handleUpdateCustomFields(input.CustomFields)
 
+	return &updatedPerformer, nil
+}
+
+func (r *mutationResolver) PerformerUpdate(ctx context.Context, input models.PerformerUpdateInput) (*models.Performer, error) {
+	performerID, err := strconv.Atoi(input.ID)
+	if err != nil {
+		return nil, fmt.Errorf("converting id: %w", err)
+	}
+
+	translator := changesetTranslator{
+		inputMap: getUpdateInputMap(ctx),
+	}
+
+	updatedPerformer, err := performerPartialFromInput(input, translator)
+	if err != nil {
+		return nil, err
+	}
+
+	legacyURLs := legacyPerformerURLsFromInput(input, translator)
+
 	var imageData []byte
 	imageIncluded := translator.hasField("image")
 	if input.Image != nil {
@@ -312,17 +342,17 @@ func (r *mutationResolver) PerformerUpdate(ctx context.Context, input models.Per
 	if err := r.withTxn(ctx, func(ctx context.Context) error {
 		qb := r.repository.Performer
 
-		if legacyURL.Set || legacyTwitter.Set || legacyInstagram.Set {
-			if err := r.handleLegacyURLs(ctx, performerID, legacyURL, legacyTwitter, legacyInstagram, &updatedPerformer); err != nil {
+		if legacyURLs.AnySet() {
+			if err := r.handleLegacyURLs(ctx, performerID, legacyURLs, updatedPerformer); err != nil {
 				return err
 			}
 		}
 
-		if err := performer.ValidateUpdate(ctx, performerID, updatedPerformer, qb); err != nil {
+		if err := performer.ValidateUpdate(ctx, performerID, *updatedPerformer, qb); err != nil {
 			return err
 		}
 
-		_, err = qb.UpdatePartial(ctx, performerID, updatedPerformer)
+		_, err = qb.UpdatePartial(ctx, performerID, *updatedPerformer)
 		if err != nil {
 			return err
 		}
@@ -379,16 +409,18 @@ func (r *mutationResolver) BulkPerformerUpdate(ctx context.Context, input BulkPe
 
 	if translator.hasField("urls") {
 		// ensure url/twitter/instagram are not included in the input
-		if err := r.validateNoLegacyURLs(translator); err != nil {
+		if err := validateNoLegacyURLs(translator); err != nil {
 			return nil, err
 		}
 
 		updatedPerformer.URLs = translator.updateStringsBulk(input.Urls, "urls")
 	}
 
-	legacyURL := translator.optionalString(input.URL, "url")
-	legacyTwitter := translator.optionalString(input.Twitter, "twitter")
-	legacyInstagram := translator.optionalString(input.Instagram, "instagram")
+	legacyURLs := legacyPerformerURLs{
+		URL:       translator.optionalString(input.URL, "url"),
+		Twitter:   translator.optionalString(input.Twitter, "twitter"),
+		Instagram: translator.optionalString(input.Instagram, "instagram"),
+	}
 
 	updatedPerformer.Birthdate, err = translator.optionalDate(input.Birthdate, "birthdate")
 	if err != nil {
@@ -425,8 +457,8 @@ func (r *mutationResolver) BulkPerformerUpdate(ctx context.Context, input BulkPe
 		qb := r.repository.Performer
 
 		for _, performerID := range performerIDs {
-			if legacyURL.Set || legacyTwitter.Set || legacyInstagram.Set {
-				if err := r.handleLegacyURLs(ctx, performerID, legacyURL, legacyTwitter, legacyInstagram, &updatedPerformer); err != nil {
+			if legacyURLs.AnySet() {
+				if err := r.handleLegacyURLs(ctx, performerID, legacyURLs, &updatedPerformer); err != nil {
 					return err
 				}
 			}
@@ -506,3 +538,87 @@ func (r *mutationResolver) PerformersDestroy(ctx context.Context, performerIDs [
 
 	return true, nil
 }
+
+func (r *mutationResolver) PerformerMerge(ctx context.Context, input PerformerMergeInput) (*models.Performer, error) {
+	srcIDs, err := stringslice.StringSliceToIntSlice(input.Source)
+	if err != nil {
+		return nil, fmt.Errorf("converting source ids: %w", err)
+	}
+
+	// ensure source ids are unique
+	srcIDs = sliceutil.AppendUniques(nil, srcIDs)
+
+	destID, err := strconv.Atoi(input.Destination)
+	if err != nil {
+		return nil, fmt.Errorf("converting destination id: %w", err)
+	}
+
+	// ensure destination is not in source list
+	if slices.Contains(srcIDs, destID) {
+		return nil, errors.New("destination performer cannot be in source list")
+	}
+
+	var values *models.PerformerPartial
+	var imageData []byte
+
+	if input.Values != nil {
+		translator := changesetTranslator{
+			inputMap: getNamedUpdateInputMap(ctx, "input.values"),
+		}
+
+		values, err = performerPartialFromInput(*input.Values, translator)
+		if err != nil {
+			return nil, err
+		}
+		legacyURLs := legacyPerformerURLsFromInput(*input.Values, translator)
+		if legacyURLs.AnySet() {
+			return nil, errors.New("Merging legacy performer URLs is not supported")
+		}
+
+		if input.Values.Image != nil {
+			var err error
+			imageData, err = utils.ProcessImageInput(ctx, *input.Values.Image)
+			if err != nil {
+				return nil, fmt.Errorf("processing cover image: %w", err)
+			}
+		}
+	} else {
+		v := models.NewPerformerPartial()
+		values = &v
+	}
+
+	var dest *models.Performer
+	if err := r.withTxn(ctx, func(ctx context.Context) error {
+		qb := r.repository.Performer
+
+		dest, err = qb.Find(ctx, destID)
+		if err != nil {
+			return fmt.Errorf("finding destination performer ID %d: %w", destID, err)
+		}
+
+		// ensure source performers exist
+		if _, err := qb.FindMany(ctx, srcIDs); err != nil {
+			return fmt.Errorf("finding source performers: %w", err)
+		}
+
+		if _, err := qb.UpdatePartial(ctx, destID, *values); err != nil {
+			return fmt.Errorf("updating performer: %w", err)
+		}
+
+		if err := qb.Merge(ctx, srcIDs, destID); err != nil {
+			return fmt.Errorf("merging performers: %w", err)
+		}
+
+		if len(imageData) > 0 {
+			if err := qb.UpdateImage(ctx, destID, imageData); err != nil {
+				return err
+			}
+		}
+
+		return nil
+	}); err != nil {
+		return nil, err
+	}
+
+	return dest, nil
+}
diff --git a/internal/api/resolver_mutation_studio.go b/internal/api/resolver_mutation_studio.go
index 4b3316111..da3aa1983 100644
--- a/internal/api/resolver_mutation_studio.go
+++ b/internal/api/resolver_mutation_studio.go
@@ -134,7 +134,7 @@ func (r *mutationResolver) StudioUpdate(ctx context.Context, input models.Studio
 
 	if translator.hasField("urls") {
 		// ensure url not included in the input
-		if err := r.validateNoLegacyURLs(translator); err != nil {
+		if err := validateNoLegacyURLs(translator); err != nil {
 			return nil, err
 		}
 
@@ -211,7 +211,7 @@ func (r *mutationResolver) BulkStudioUpdate(ctx context.Context, input BulkStudi
 
 	if translator.hasField("urls") {
 		// ensure url/twitter/instagram are not included in the input
-		if err := r.validateNoLegacyURLs(translator); err != nil {
+		if err := validateNoLegacyURLs(translator); err != nil {
 			return nil, err
 		}
 
diff --git a/pkg/models/mocks/PerformerReaderWriter.go b/pkg/models/mocks/PerformerReaderWriter.go
index dbf19a3cd..6487bc5a5 100644
--- a/pkg/models/mocks/PerformerReaderWriter.go
+++ b/pkg/models/mocks/PerformerReaderWriter.go
@@ -473,6 +473,20 @@ func (_m *PerformerReaderWriter) HasImage(ctx context.Context, performerID int)
 	return r0, r1
 }
 
+// Merge provides a mock function with given fields: ctx, source, destination
+func (_m *PerformerReaderWriter) Merge(ctx context.Context, source []int, destination int) error {
+	ret := _m.Called(ctx, source, destination)
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context, []int, int) error); ok {
+		r0 = rf(ctx, source, destination)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
 // Query provides a mock function with given fields: ctx, performerFilter, findFilter
 func (_m *PerformerReaderWriter) Query(ctx context.Context, performerFilter *models.PerformerFilterType, findFilter *models.FindFilterType) ([]*models.Performer, int, error) {
 	ret := _m.Called(ctx, performerFilter, findFilter)
diff --git a/pkg/models/repository_performer.go b/pkg/models/repository_performer.go
index ad0b61da0..175208c9d 100644
--- a/pkg/models/repository_performer.go
+++ b/pkg/models/repository_performer.go
@@ -92,6 +92,8 @@ type PerformerWriter interface {
 	PerformerCreator
 	PerformerUpdater
 	PerformerDestroyer
+
+	Merge(ctx context.Context, source []int, destination int) error
 }
 
 // PerformerReaderWriter provides all performer methods.
diff --git a/pkg/sqlite/performer.go b/pkg/sqlite/performer.go
index bf6b780b2..4e06b5b29 100644
--- a/pkg/sqlite/performer.go
+++ b/pkg/sqlite/performer.go
@@ -893,3 +893,58 @@ func (qb *PerformerStore) FindByStashIDStatus(ctx context.Context, hasStashID bo
 
 	return ret, nil
 }
+
+func (qb *PerformerStore) Merge(ctx context.Context, source []int, destination int) error {
+	if len(source) == 0 {
+		return nil
+	}
+
+	inBinding := getInBinding(len(source))
+
+	args := []interface{}{destination}
+	srcArgs := make([]interface{}, len(source))
+	for i, id := range source {
+		if id == destination {
+			return errors.New("cannot merge where source == destination")
+		}
+		srcArgs[i] = id
+	}
+
+	args = append(args, srcArgs...)
+
+	performerTables := map[string]string{
+		performersScenesTable:    sceneIDColumn,
+		performersGalleriesTable: galleryIDColumn,
+		performersImagesTable:    imageIDColumn,
+		performersTagsTable:      tagIDColumn,
+	}
+
+	args = append(args, destination)
+
+	// for each table, update source performer ids to destination performer id, ignoring duplicates
+	for table, idColumn := range performerTables {
+		_, err := dbWrapper.Exec(ctx, `UPDATE OR IGNORE `+table+`
+SET performer_id = ?
+WHERE performer_id IN `+inBinding+`
+AND NOT EXISTS(SELECT 1 FROM `+table+` o WHERE o.`+idColumn+` = `+table+`.`+idColumn+` AND o.performer_id = ?)`,
+			args...,
+		)
+		if err != nil {
+			return err
+		}
+
+		// delete source performer ids from the table where they couldn't be set
+		if _, err := dbWrapper.Exec(ctx, `DELETE FROM `+table+` WHERE performer_id IN `+inBinding, srcArgs...); err != nil {
+			return err
+		}
+	}
+
+	for _, id := range source {
+		err := qb.Destroy(ctx, id)
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
diff --git a/pkg/sqlite/performer_test.go b/pkg/sqlite/performer_test.go
index 190d80e31..a88166657 100644
--- a/pkg/sqlite/performer_test.go
+++ b/pkg/sqlite/performer_test.go
@@ -2524,6 +2524,146 @@ func TestPerformerStore_FindByStashIDStatus(t *testing.T) {
 	}
 }
 
+func TestPerformerMerge(t *testing.T) {
+	tests := []struct {
+		name    string
+		srcIdxs []int
+		destIdx int
+		wantErr bool
+	}{
+		{
+			name:    "merge into self",
+			srcIdxs: []int{performerIdx1WithDupName},
+			destIdx: performerIdx1WithDupName,
+			wantErr: true,
+		},
+		{
+			name: "merge multiple",
+			srcIdxs: []int{
+				performerIdx2WithScene,
+				performerIdxWithTwoScenes,
+				performerIdx1WithImage,
+				performerIdxWithTwoImages,
+				performerIdxWithGallery,
+				performerIdxWithTwoGalleries,
+				performerIdxWithTag,
+				performerIdxWithTwoTags,
+			},
+			destIdx: tagIdxWithPerformer,
+			wantErr: false,
+		},
+	}
+
+	qb := db.Performer
+
+	for _, tt := range tests {
+		runWithRollbackTxn(t, tt.name, func(t *testing.T, ctx context.Context) {
+			assert := assert.New(t)
+
+			// load src tag ids to compare after merge
+			performerTagIds := make(map[int][]int)
+			for _, srcIdx := range tt.srcIdxs {
+				srcPerformer, err := qb.Find(ctx, performerIDs[srcIdx])
+				if err != nil {
+					t.Errorf("Error finding performer: %s", err.Error())
+				}
+				if err := srcPerformer.LoadTagIDs(ctx, qb); err != nil {
+					t.Errorf("Error loading performer tag IDs: %s", err.Error())
+				}
+				srcTagIDs := srcPerformer.TagIDs.List()
+				performerTagIds[srcIdx] = srcTagIDs
+			}
+
+			err := qb.Merge(ctx, indexesToIDs(tagIDs, tt.srcIdxs), tagIDs[tt.destIdx])
+
+			if (err != nil) != tt.wantErr {
+				t.Errorf("PerformerStore.Merge() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+
+			if err != nil {
+				return
+			}
+
+			// ensure source performers are destroyed
+			for _, srcIdx := range tt.srcIdxs {
+				p, err := qb.Find(ctx, performerIDs[srcIdx])
+
+				// not found returns nil performer and nil error
+				if err != nil {
+					t.Errorf("Error finding performer: %s", err.Error())
+					continue
+				}
+				assert.Nil(p)
+			}
+
+			// ensure items point to new performer
+			for _, srcIdx := range tt.srcIdxs {
+				sceneIdxs := scenePerformers.reverseLookup(srcIdx)
+				for _, sceneIdx := range sceneIdxs {
+					s, err := db.Scene.Find(ctx, sceneIDs[sceneIdx])
+					if err != nil {
+						t.Errorf("Error finding scene: %s", err.Error())
+					}
+					if err := s.LoadPerformerIDs(ctx, db.Scene); err != nil {
+						t.Errorf("Error loading scene performer IDs: %s", err.Error())
+					}
+					scenePerformerIDs := s.PerformerIDs.List()
+
+					assert.Contains(scenePerformerIDs, performerIDs[tt.destIdx])
+					assert.NotContains(scenePerformerIDs, performerIDs[srcIdx])
+				}
+
+				imageIdxs := imagePerformers.reverseLookup(srcIdx)
+				for _, imageIdx := range imageIdxs {
+					i, err := db.Image.Find(ctx, imageIDs[imageIdx])
+					if err != nil {
+						t.Errorf("Error finding image: %s", err.Error())
+					}
+					if err := i.LoadPerformerIDs(ctx, db.Image); err != nil {
+						t.Errorf("Error loading image performer IDs: %s", err.Error())
+					}
+					imagePerformerIDs := i.PerformerIDs.List()
+
+					assert.Contains(imagePerformerIDs, performerIDs[tt.destIdx])
+					assert.NotContains(imagePerformerIDs, performerIDs[srcIdx])
+				}
+
+				galleryIdxs := galleryPerformers.reverseLookup(srcIdx)
+				for _, galleryIdx := range galleryIdxs {
+					g, err := db.Gallery.Find(ctx, galleryIDs[galleryIdx])
+					if err != nil {
+						t.Errorf("Error finding gallery: %s", err.Error())
+					}
+					if err := g.LoadPerformerIDs(ctx, db.Gallery); err != nil {
+						t.Errorf("Error loading gallery performer IDs: %s", err.Error())
+					}
+					galleryPerformerIDs := g.PerformerIDs.List()
+
+					assert.Contains(galleryPerformerIDs, performerIDs[tt.destIdx])
+					assert.NotContains(galleryPerformerIDs, performerIDs[srcIdx])
+				}
+			}
+
+			// ensure tags were merged
+			destPerformer, err := qb.Find(ctx, performerIDs[tt.destIdx])
+			if err != nil {
+				t.Errorf("Error finding performer: %s", err.Error())
+			}
+			if err := destPerformer.LoadTagIDs(ctx, qb); err != nil {
+				t.Errorf("Error loading performer tag IDs: %s", err.Error())
+			}
+			destTagIDs := destPerformer.TagIDs.List()
+
+			for _, srcIdx := range tt.srcIdxs {
+				for _, tagID := range performerTagIds[srcIdx] {
+					assert.Contains(destTagIDs, tagID)
+				}
+			}
+		})
+	}
+}
+
 // TODO Update
 // TODO Destroy
 // TODO Find
diff --git a/pkg/sqlite/tag.go b/pkg/sqlite/tag.go
index 977ac0433..dd730c62c 100644
--- a/pkg/sqlite/tag.go
+++ b/pkg/sqlite/tag.go
@@ -859,6 +859,8 @@ func (qb *TagStore) Merge(ctx context.Context, source []int, destination int) er
 	}
 
 	args = append(args, destination)
+
+	// for each table, update source tag ids to destination tag id, ignoring duplicates
 	for table, idColumn := range tagTables {
 		_, err := dbWrapper.Exec(ctx, `UPDATE OR IGNORE `+table+`
 SET tag_id = ?
diff --git a/ui/v2.5/graphql/data/tag.graphql b/ui/v2.5/graphql/data/tag.graphql
index 4b0c0aef9..e640af0c9 100644
--- a/ui/v2.5/graphql/data/tag.graphql
+++ b/ui/v2.5/graphql/data/tag.graphql
@@ -67,6 +67,11 @@ fragment TagListData on Tag {
   aliases
   ignore_auto_tag
   favorite
+  stash_ids {
+    endpoint
+    stash_id
+    updated_at
+  }
   image_path
   # Direct counts only - no recursive depth queries
   scene_count
diff --git a/ui/v2.5/graphql/mutations/performer.graphql b/ui/v2.5/graphql/mutations/performer.graphql
index a4fa341ed..2082281fc 100644
--- a/ui/v2.5/graphql/mutations/performer.graphql
+++ b/ui/v2.5/graphql/mutations/performer.graphql
@@ -23,3 +23,9 @@ mutation PerformerDestroy($id: ID!) {
 mutation PerformersDestroy($ids: [ID!]!) {
   performersDestroy(ids: $ids)
 }
+
+mutation PerformerMerge($input: PerformerMergeInput!) {
+  performerMerge(input: $input) {
+    id
+  }
+}
diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/Performer.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/Performer.tsx
index dd72d0025..92a563a81 100644
--- a/ui/v2.5/src/components/Performers/PerformerDetails/Performer.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerDetails/Performer.tsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useMemo, useState } from "react";
-import { Tabs, Tab, Col, Row } from "react-bootstrap";
-import { useIntl } from "react-intl";
+import { Button, Tabs, Tab, Col, Row } from "react-bootstrap";
+import { FormattedMessage, useIntl } from "react-intl";
 import { useHistory, Redirect, RouteComponentProps } from "react-router-dom";
 import { Helmet } from "react-helmet";
 import cx from "classnames";
@@ -28,6 +28,7 @@ import { PerformerGroupsPanel } from "./PerformerGroupsPanel";
 import { PerformerImagesPanel } from "./PerformerImagesPanel";
 import { PerformerAppearsWithPanel } from "./performerAppearsWithPanel";
 import { PerformerEditPanel } from "./PerformerEditPanel";
+import { PerformerMergeModal } from "../PerformerMergeDialog";
 import { PerformerSubmitButton } from "./PerformerSubmitButton";
 import { useRatingKeybinds } from "src/hooks/keybinds";
 import { DetailImage } from "src/components/Shared/DetailImage";
@@ -250,6 +251,7 @@ const PerformerPage: React.FC<IProps> = PatchComponent(
 
     const [collapsed, setCollapsed] = useState<boolean>(!showAllDetails);
     const [isEditing, setIsEditing] = useState<boolean>(false);
+    const [isMerging, setIsMerging] = useState<boolean>(false);
     const [image, setImage] = useState<string | null>();
     const [encodingImage, setEncodingImage] = useState<boolean>(false);
     const loadStickyHeader = useLoadStickyHeader();
@@ -285,6 +287,33 @@ const PerformerPage: React.FC<IProps> = PatchComponent(
       }
     }
 
+    function renderMergeButton() {
+      return (
+        <Button variant="secondary" onClick={() => setIsMerging(true)}>
+          <FormattedMessage id="actions.merge" />
+          ...
+        </Button>
+      );
+    }
+
+    function renderMergeDialog() {
+      if (!performer.id) return;
+      return (
+        <PerformerMergeModal
+          show={isMerging}
+          onClose={(mergedId) => {
+            setIsMerging(false);
+            if (mergedId !== undefined && mergedId !== performer.id) {
+              // By default, the merge destination is the current performer, but
+              // the user can change it, in which case we need to redirect.
+              history.replace(`/performers/${mergedId}`);
+            }
+          }}
+          performers={[performer]}
+        />
+      );
+    }
+
     useRatingKeybinds(
       true,
       configuration?.ui.ratingSystemOptions?.type,
@@ -469,9 +498,12 @@ const PerformerPage: React.FC<IProps> = PatchComponent(
                         onImageChange={() => {}}
                         classNames="mb-2"
                         customButtons={
-                          <div>
-                            <PerformerSubmitButton performer={performer} />
-                          </div>
+                          <>
+                            {renderMergeButton()}
+                            <div>
+                              <PerformerSubmitButton performer={performer} />
+                            </div>
+                          </>
                         }
                       ></DetailsEditNavbar>
                     </Row>
@@ -499,6 +531,7 @@ const PerformerPage: React.FC<IProps> = PatchComponent(
             </div>
           </div>
         </div>
+        {renderMergeDialog()}
       </div>
     );
   }
diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerScrapeDialog.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerScrapeDialog.tsx
index b3ec4bff6..afb57a66e 100644
--- a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerScrapeDialog.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerScrapeDialog.tsx
@@ -56,7 +56,7 @@ function renderScrapedGender(
   );
 }
 
-function renderScrapedGenderRow(
+export function renderScrapedGenderRow(
   title: string,
   result: ScrapeResult<string>,
   onChange: (value: ScrapeResult<string>) => void
@@ -104,7 +104,7 @@ function renderScrapedCircumcised(
   );
 }
 
-function renderScrapedCircumcisedRow(
+export function renderScrapedCircumcisedRow(
   title: string,
   result: ScrapeResult<string>,
   onChange: (value: ScrapeResult<string>) => void
diff --git a/ui/v2.5/src/components/Performers/PerformerList.tsx b/ui/v2.5/src/components/Performers/PerformerList.tsx
index b2c6dc36e..ef465fb38 100644
--- a/ui/v2.5/src/components/Performers/PerformerList.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerList.tsx
@@ -21,6 +21,7 @@ import { EditPerformersDialog } from "./EditPerformersDialog";
 import { cmToImperial, cmToInches, kgToLbs } from "src/utils/units";
 import TextUtils from "src/utils/text";
 import { PerformerCardGrid } from "./PerformerCardGrid";
+import { PerformerMergeModal } from "./PerformerMergeDialog";
 import { View } from "../List/views";
 import { IItemListOperation } from "../List/FilteredListToolbar";
 import { PatchComponent } from "src/patch";
@@ -169,6 +170,9 @@ export const PerformerList: React.FC<IPerformerList> = PatchComponent(
   ({ filterHook, view, alterQuery, extraCriteria, extraOperations = [] }) => {
     const intl = useIntl();
     const history = useHistory();
+    const [mergePerformers, setMergePerformers] = useState<
+      GQL.SelectPerformerDataFragment[] | undefined
+    >(undefined);
     const [isExportDialogOpen, setIsExportDialogOpen] = useState(false);
     const [isExportAll, setIsExportAll] = useState(false);
 
@@ -180,6 +184,11 @@ export const PerformerList: React.FC<IPerformerList> = PatchComponent(
         text: intl.formatMessage({ id: "actions.open_random" }),
         onClick: openRandom,
       },
+      {
+        text: `${intl.formatMessage({ id: "actions.merge" })}…`,
+        onClick: merge,
+        isDisplayed: showWhenSelected,
+      },
       {
         text: intl.formatMessage({ id: "actions.export" }),
         onClick: onExport,
@@ -222,6 +231,18 @@ export const PerformerList: React.FC<IPerformerList> = PatchComponent(
       }
     }
 
+    async function merge(
+      result: GQL.FindPerformersQueryResult,
+      filter: ListFilterModel,
+      selectedIds: Set<string>
+    ) {
+      const selected =
+        result.data?.findPerformers.performers.filter((p) =>
+          selectedIds.has(p.id)
+        ) ?? [];
+      setMergePerformers(selected);
+    }
+
     async function onExport() {
       setIsExportAll(false);
       setIsExportDialogOpen(true);
@@ -238,6 +259,23 @@ export const PerformerList: React.FC<IPerformerList> = PatchComponent(
       selectedIds: Set<string>,
       onSelectChange: (id: string, selected: boolean, shiftKey: boolean) => void
     ) {
+      function renderMergeDialog() {
+        if (mergePerformers) {
+          return (
+            <PerformerMergeModal
+              performers={mergePerformers}
+              onClose={(mergedId?: string) => {
+                setMergePerformers(undefined);
+                if (mergedId) {
+                  history.push(`/performers/${mergedId}`);
+                }
+              }}
+              show
+            />
+          );
+        }
+      }
+
       function maybeRenderPerformerExportDialog() {
         if (isExportDialogOpen) {
           return (
@@ -290,6 +328,7 @@ export const PerformerList: React.FC<IPerformerList> = PatchComponent(
 
       return (
         <>
+          {renderMergeDialog()}
           {maybeRenderPerformerExportDialog()}
           {renderPerformers()}
         </>
diff --git a/ui/v2.5/src/components/Performers/PerformerMergeDialog.tsx b/ui/v2.5/src/components/Performers/PerformerMergeDialog.tsx
new file mode 100644
index 000000000..834d2ac76
--- /dev/null
+++ b/ui/v2.5/src/components/Performers/PerformerMergeDialog.tsx
@@ -0,0 +1,876 @@
+import { Form, Col, Row, Button } from "react-bootstrap";
+import React, { useEffect, useMemo, useState } from "react";
+import * as GQL from "src/core/generated-graphql";
+import { Icon } from "../Shared/Icon";
+import { LoadingIndicator } from "../Shared/LoadingIndicator";
+import {
+  circumcisedToString,
+  stringToCircumcised,
+} from "src/utils/circumcised";
+import * as FormUtils from "src/utils/form";
+import { genderToString, stringToGender } from "src/utils/gender";
+import ImageUtils from "src/utils/image";
+import {
+  mutatePerformerMerge,
+  queryFindPerformersByID,
+} from "src/core/StashService";
+import { FormattedMessage, useIntl } from "react-intl";
+import { useToast } from "src/hooks/Toast";
+import { faExchangeAlt, faSignInAlt } from "@fortawesome/free-solid-svg-icons";
+import { ScrapeDialog } from "../Shared/ScrapeDialog/ScrapeDialog";
+import {
+  ScrapedImageRow,
+  ScrapedInputGroupRow,
+  ScrapedStringListRow,
+  ScrapedTextAreaRow,
+} from "../Shared/ScrapeDialog/ScrapeDialogRow";
+import { ModalComponent } from "../Shared/Modal";
+import { sortStoredIdObjects } from "src/utils/data";
+import {
+  ObjectListScrapeResult,
+  ScrapeResult,
+  ZeroableScrapeResult,
+  hasScrapedValues,
+} from "../Shared/ScrapeDialog/scrapeResult";
+import { ScrapedTagsRow } from "../Shared/ScrapeDialog/ScrapedObjectsRow";
+import {
+  renderScrapedGenderRow,
+  renderScrapedCircumcisedRow,
+} from "./PerformerDetails/PerformerScrapeDialog";
+import { PerformerSelect } from "./PerformerSelect";
+import { uniq } from "lodash-es";
+
+/* eslint-disable-next-line @typescript-eslint/no-explicit-any */
+type CustomFieldScrapeResults = Map<string, ZeroableScrapeResult<any>>;
+
+// There are a bunch of similar functions in PerformerScrapeDialog, but since we don't support
+// scraping custom fields, this one is only needed here. The `renderScraped` naming is kept the same
+// for consistency.
+function renderScrapedCustomFieldRows(
+  results: CustomFieldScrapeResults,
+  onChange: (newCustomFields: CustomFieldScrapeResults) => void
+) {
+  return (
+    <>
+      {Array.from(results.entries()).map(([field, result]) => {
+        const fieldName = `custom_${field}`;
+        return (
+          <ScrapedInputGroupRow
+            className="custom-field"
+            title={field}
+            field={fieldName}
+            key={fieldName}
+            result={result}
+            onChange={(newResult) => {
+              const newResults = new Map(results);
+              newResults.set(field, newResult);
+              onChange(newResults);
+            }}
+          />
+        );
+      })}
+    </>
+  );
+}
+
+type MergeOptions = {
+  values: GQL.PerformerUpdateInput;
+};
+
+interface IPerformerMergeDetailsProps {
+  sources: GQL.PerformerDataFragment[];
+  dest: GQL.PerformerDataFragment;
+  onClose: (options?: MergeOptions) => void;
+}
+
+const PerformerMergeDetails: React.FC<IPerformerMergeDetailsProps> = ({
+  sources,
+  dest,
+  onClose,
+}) => {
+  const intl = useIntl();
+
+  const [loading, setLoading] = useState(true);
+
+  const [name, setName] = useState<ScrapeResult<string>>(
+    new ScrapeResult<string>(dest.name)
+  );
+  const [disambiguation, setDisambiguation] = useState<ScrapeResult<string>>(
+    new ScrapeResult<string>(dest.disambiguation)
+  );
+  const [aliases, setAliases] = useState<ScrapeResult<string[]>>(
+    new ScrapeResult<string[]>(dest.alias_list)
+  );
+  const [birthdate, setBirthdate] = useState<ScrapeResult<string>>(
+    new ScrapeResult<string>(dest.birthdate)
+  );
+  const [deathDate, setDeathDate] = useState<ScrapeResult<string>>(
+    new ScrapeResult<string>(dest.death_date)
+  );
+  const [ethnicity, setEthnicity] = useState<ScrapeResult<string>>(
+    new ScrapeResult<string>(dest.ethnicity)
+  );
+  const [country, setCountry] = useState<ScrapeResult<string>>(
+    new ScrapeResult<string>(dest.country)
+  );
+  const [hairColor, setHairColor] = useState<ScrapeResult<string>>(
+    new ScrapeResult<string>(dest.hair_color)
+  );
+  const [eyeColor, setEyeColor] = useState<ScrapeResult<string>>(
+    new ScrapeResult<string>(dest.eye_color)
+  );
+  const [height, setHeight] = useState<ScrapeResult<string>>(
+    new ScrapeResult<string>(dest.height_cm?.toString())
+  );
+  const [weight, setWeight] = useState<ScrapeResult<string>>(
+    new ScrapeResult<string>(dest.weight?.toString())
+  );
+  const [penisLength, setPenisLength] = useState<ScrapeResult<string>>(
+    new ScrapeResult<string>(dest.penis_length?.toString())
+  );
+  const [measurements, setMeasurements] = useState<ScrapeResult<string>>(
+    new ScrapeResult<string>(dest.measurements)
+  );
+  const [fakeTits, setFakeTits] = useState<ScrapeResult<string>>(
+    new ScrapeResult<string>(dest.fake_tits)
+  );
+  const [careerLength, setCareerLength] = useState<ScrapeResult<string>>(
+    new ScrapeResult<string>(dest.career_length)
+  );
+  const [tattoos, setTattoos] = useState<ScrapeResult<string>>(
+    new ScrapeResult<string>(dest.tattoos)
+  );
+  const [piercings, setPiercings] = useState<ScrapeResult<string>>(
+    new ScrapeResult<string>(dest.piercings)
+  );
+  const [urls, setURLs] = useState<ScrapeResult<string[]>>(
+    new ScrapeResult<string[]>(dest.urls)
+  );
+  const [gender, setGender] = useState<ScrapeResult<string>>(
+    new ScrapeResult<string>(genderToString(dest.gender))
+  );
+  const [circumcised, setCircumcised] = useState<ScrapeResult<string>>(
+    new ScrapeResult<string>(circumcisedToString(dest.circumcised))
+  );
+  const [details, setDetails] = useState<ScrapeResult<string>>(
+    new ScrapeResult<string>(dest.details)
+  );
+  const [tags, setTags] = useState<ObjectListScrapeResult<GQL.ScrapedTag>>(
+    new ObjectListScrapeResult<GQL.ScrapedTag>(
+      sortStoredIdObjects(dest.tags.map(idToStoredID))
+    )
+  );
+
+  const [image, setImage] = useState<ScrapeResult<string>>(
+    new ScrapeResult<string>(dest.image_path)
+  );
+
+  const [customFields, setCustomFields] = useState<CustomFieldScrapeResults>(
+    new Map()
+  );
+
+  function idToStoredID(o: { id: string; name: string }) {
+    return {
+      stored_id: o.id,
+      name: o.name,
+    };
+  }
+
+  // calculate the values for everything
+  // uses the first set value for single value fields, and combines all
+  useEffect(() => {
+    async function loadImages() {
+      const src = sources.find((s) => s.image_path);
+      if (!dest.image_path || !src) return;
+
+      setLoading(true);
+
+      const destData = await ImageUtils.imageToDataURL(dest.image_path);
+      const srcData = await ImageUtils.imageToDataURL(src.image_path!);
+
+      // keep destination image by default
+      const useNewValue = false;
+      setImage(new ScrapeResult(destData, srcData, useNewValue));
+
+      setLoading(false);
+    }
+
+    setName(
+      new ScrapeResult(dest.name, sources.find((s) => s.name)?.name, !dest.name)
+    );
+    setDisambiguation(
+      new ScrapeResult(
+        dest.disambiguation,
+        sources.find((s) => s.disambiguation)?.disambiguation,
+        !dest.disambiguation
+      )
+    );
+
+    // default alias list should be the existing aliases, plus the names of all sources,
+    // plus all source aliases, deduplicated
+    const allAliases = uniq(
+      dest.alias_list.concat(
+        sources.map((s) => s.name),
+        sources.flatMap((s) => s.alias_list)
+      )
+    );
+
+    setAliases(
+      new ScrapeResult(dest.alias_list, allAliases, !!allAliases.length)
+    );
+    setBirthdate(
+      new ScrapeResult(
+        dest.birthdate,
+        sources.find((s) => s.birthdate)?.birthdate,
+        !dest.birthdate
+      )
+    );
+    setDeathDate(
+      new ScrapeResult(
+        dest.death_date,
+        sources.find((s) => s.death_date)?.death_date,
+        !dest.death_date
+      )
+    );
+    setEthnicity(
+      new ScrapeResult(
+        dest.ethnicity,
+        sources.find((s) => s.ethnicity)?.ethnicity,
+        !dest.ethnicity
+      )
+    );
+    setCountry(
+      new ScrapeResult(
+        dest.country,
+        sources.find((s) => s.country)?.country,
+        !dest.country
+      )
+    );
+    setHairColor(
+      new ScrapeResult(
+        dest.hair_color,
+        sources.find((s) => s.hair_color)?.hair_color,
+        !dest.hair_color
+      )
+    );
+    setEyeColor(
+      new ScrapeResult(
+        dest.eye_color,
+        sources.find((s) => s.eye_color)?.eye_color,
+        !dest.eye_color
+      )
+    );
+    setHeight(
+      new ScrapeResult(
+        dest.height_cm?.toString(),
+        sources.find((s) => s.height_cm)?.height_cm?.toString(),
+        !dest.height_cm
+      )
+    );
+    setWeight(
+      new ScrapeResult(
+        dest.weight?.toString(),
+        sources.find((s) => s.weight)?.weight?.toString(),
+        !dest.weight
+      )
+    );
+
+    setPenisLength(
+      new ScrapeResult(
+        dest.penis_length?.toString(),
+        sources.find((s) => s.penis_length)?.penis_length?.toString(),
+        !dest.penis_length
+      )
+    );
+    setMeasurements(
+      new ScrapeResult(
+        dest.measurements,
+        sources.find((s) => s.measurements)?.measurements,
+        !dest.measurements
+      )
+    );
+    setFakeTits(
+      new ScrapeResult(
+        dest.fake_tits,
+        sources.find((s) => s.fake_tits)?.fake_tits,
+        !dest.fake_tits
+      )
+    );
+    setCareerLength(
+      new ScrapeResult(
+        dest.career_length,
+        sources.find((s) => s.career_length)?.career_length,
+        !dest.career_length
+      )
+    );
+    setTattoos(
+      new ScrapeResult(
+        dest.tattoos,
+        sources.find((s) => s.tattoos)?.tattoos,
+        !dest.tattoos
+      )
+    );
+    setPiercings(
+      new ScrapeResult(
+        dest.piercings,
+        sources.find((s) => s.piercings)?.piercings,
+        !dest.piercings
+      )
+    );
+    setURLs(
+      new ScrapeResult(
+        dest.urls,
+        sources.find((s) => s.urls)?.urls,
+        !dest.urls?.length
+      )
+    );
+    setGender(
+      new ScrapeResult(
+        genderToString(dest.gender),
+        sources.find((s) => s.gender)?.gender
+          ? genderToString(sources.find((s) => s.gender)?.gender)
+          : undefined,
+        !dest.gender
+      )
+    );
+    setCircumcised(
+      new ScrapeResult(
+        circumcisedToString(dest.circumcised),
+        sources.find((s) => s.circumcised)?.circumcised
+          ? circumcisedToString(sources.find((s) => s.circumcised)?.circumcised)
+          : undefined,
+        !dest.circumcised
+      )
+    );
+    setDetails(
+      new ScrapeResult(
+        dest.details,
+        sources.find((s) => s.details)?.details,
+        !dest.details
+      )
+    );
+    setImage(
+      new ScrapeResult(
+        dest.image_path,
+        sources.find((s) => s.image_path)?.image_path,
+        !dest.image_path
+      )
+    );
+
+    const customFieldNames = new Set<string>(Object.keys(dest.custom_fields));
+
+    for (const s of sources) {
+      for (const n of Object.keys(s.custom_fields)) {
+        customFieldNames.add(n);
+      }
+    }
+
+    setCustomFields(
+      new Map(
+        Array.from(customFieldNames)
+          .sort()
+          .map((field) => {
+            return [
+              field,
+              new ScrapeResult(
+                dest.custom_fields?.[field],
+                sources.find((s) => s.custom_fields?.[field])?.custom_fields?.[
+                  field
+                ],
+                dest.custom_fields?.[field] === undefined
+              ),
+            ];
+          })
+      )
+    );
+
+    loadImages();
+  }, [sources, dest]);
+
+  const hasCustomFieldValues = useMemo(() => {
+    return hasScrapedValues(Array.from(customFields.values()));
+  }, [customFields]);
+
+  // ensure this is updated if fields are changed
+  const hasValues = useMemo(() => {
+    return (
+      hasCustomFieldValues ||
+      hasScrapedValues([
+        name,
+        disambiguation,
+        aliases,
+        birthdate,
+        deathDate,
+        ethnicity,
+        country,
+        hairColor,
+        eyeColor,
+        height,
+        weight,
+        penisLength,
+        measurements,
+        fakeTits,
+        careerLength,
+        tattoos,
+        piercings,
+        urls,
+        gender,
+        circumcised,
+        details,
+        tags,
+        image,
+      ])
+    );
+  }, [
+    name,
+    disambiguation,
+    aliases,
+    birthdate,
+    deathDate,
+    ethnicity,
+    country,
+    hairColor,
+    eyeColor,
+    height,
+    weight,
+    penisLength,
+    measurements,
+    fakeTits,
+    careerLength,
+    tattoos,
+    piercings,
+    urls,
+    gender,
+    circumcised,
+    details,
+    tags,
+    image,
+    hasCustomFieldValues,
+  ]);
+
+  function renderScrapeRows() {
+    if (loading) {
+      return (
+        <div>
+          <LoadingIndicator />
+        </div>
+      );
+    }
+
+    if (!hasValues) {
+      return (
+        <div>
+          <FormattedMessage id="dialogs.merge.empty_results" />
+        </div>
+      );
+    }
+
+    return (
+      <>
+        <ScrapedInputGroupRow
+          field="name"
+          title={intl.formatMessage({ id: "name" })}
+          result={name}
+          onChange={(value) => setName(value)}
+        />
+        <ScrapedInputGroupRow
+          field="disambiguation"
+          title={intl.formatMessage({ id: "disambiguation" })}
+          result={disambiguation}
+          onChange={(value) => setDisambiguation(value)}
+        />
+        <ScrapedStringListRow
+          field="aliases"
+          title={intl.formatMessage({ id: "aliases" })}
+          result={aliases}
+          onChange={(value) => setAliases(value)}
+        />
+        <ScrapedInputGroupRow
+          field="birthdate"
+          title={intl.formatMessage({ id: "birthdate" })}
+          result={birthdate}
+          onChange={(value) => setBirthdate(value)}
+        />
+        <ScrapedInputGroupRow
+          field="death_date"
+          title={intl.formatMessage({ id: "death_date" })}
+          result={deathDate}
+          onChange={(value) => setDeathDate(value)}
+        />
+        <ScrapedInputGroupRow
+          field="ethnicity"
+          title={intl.formatMessage({ id: "ethnicity" })}
+          result={ethnicity}
+          onChange={(value) => setEthnicity(value)}
+        />
+        <ScrapedInputGroupRow
+          field="country"
+          title={intl.formatMessage({ id: "country" })}
+          result={country}
+          onChange={(value) => setCountry(value)}
+        />
+        <ScrapedInputGroupRow
+          field="hair_color"
+          title={intl.formatMessage({ id: "hair_color" })}
+          result={hairColor}
+          onChange={(value) => setHairColor(value)}
+        />
+        <ScrapedInputGroupRow
+          field="eye_color"
+          title={intl.formatMessage({ id: "eye_color" })}
+          result={eyeColor}
+          onChange={(value) => setEyeColor(value)}
+        />
+        <ScrapedInputGroupRow
+          field="height"
+          title={intl.formatMessage({ id: "height" })}
+          result={height}
+          onChange={(value) => setHeight(value)}
+        />
+        <ScrapedInputGroupRow
+          field="weight"
+          title={intl.formatMessage({ id: "weight" })}
+          result={weight}
+          onChange={(value) => setWeight(value)}
+        />
+        <ScrapedInputGroupRow
+          field="penis_length"
+          title={intl.formatMessage({ id: "penis_length" })}
+          result={penisLength}
+          onChange={(value) => setPenisLength(value)}
+        />
+        <ScrapedInputGroupRow
+          field="measurements"
+          title={intl.formatMessage({ id: "measurements" })}
+          result={measurements}
+          onChange={(value) => setMeasurements(value)}
+        />
+        <ScrapedInputGroupRow
+          field="fake_tits"
+          title={intl.formatMessage({ id: "fake_tits" })}
+          result={fakeTits}
+          onChange={(value) => setFakeTits(value)}
+        />
+        <ScrapedInputGroupRow
+          field="career_length"
+          title={intl.formatMessage({ id: "career_length" })}
+          result={careerLength}
+          onChange={(value) => setCareerLength(value)}
+        />
+        <ScrapedTextAreaRow
+          field="tattoos"
+          title={intl.formatMessage({ id: "tattoos" })}
+          result={tattoos}
+          onChange={(value) => setTattoos(value)}
+        />
+        <ScrapedTextAreaRow
+          field="piercings"
+          title={intl.formatMessage({ id: "piercings" })}
+          result={piercings}
+          onChange={(value) => setPiercings(value)}
+        />
+        <ScrapedStringListRow
+          field="urls"
+          title={intl.formatMessage({ id: "urls" })}
+          result={urls}
+          onChange={(value) => setURLs(value)}
+        />
+        {renderScrapedGenderRow(
+          intl.formatMessage({ id: "gender" }),
+          gender,
+          (value) => setGender(value)
+        )}
+        {renderScrapedCircumcisedRow(
+          intl.formatMessage({ id: "circumcised" }),
+          circumcised,
+          (value) => setCircumcised(value)
+        )}
+        <ScrapedTagsRow
+          field="tags"
+          title={intl.formatMessage({ id: "tags" })}
+          result={tags}
+          onChange={(value) => setTags(value)}
+        />
+        <ScrapedTextAreaRow
+          field="details"
+          title={intl.formatMessage({ id: "details" })}
+          result={details}
+          onChange={(value) => setDetails(value)}
+        />
+        <ScrapedImageRow
+          field="image"
+          title={intl.formatMessage({ id: "performer_image" })}
+          className="performer-image"
+          result={image}
+          onChange={(value) => setImage(value)}
+        />
+        {hasCustomFieldValues &&
+          renderScrapedCustomFieldRows(customFields, (newCustomFields) =>
+            setCustomFields(newCustomFields)
+          )}
+      </>
+    );
+  }
+
+  function createValues(): MergeOptions {
+    // only set the cover image if it's different from the existing cover image
+    const coverImage = image.useNewValue ? image.getNewValue() : undefined;
+
+    return {
+      values: {
+        id: dest.id,
+        name: name.getNewValue(),
+        disambiguation: disambiguation.getNewValue(),
+        alias_list: aliases
+          .getNewValue()
+          ?.map((s) => s.trim())
+          .filter((s) => s.length > 0),
+        birthdate: birthdate.getNewValue(),
+        death_date: deathDate.getNewValue(),
+        ethnicity: ethnicity.getNewValue(),
+        country: country.getNewValue(),
+        hair_color: hairColor.getNewValue(),
+        eye_color: eyeColor.getNewValue(),
+        height_cm: height.getNewValue()
+          ? parseFloat(height.getNewValue()!)
+          : undefined,
+        weight: weight.getNewValue()
+          ? parseFloat(weight.getNewValue()!)
+          : undefined,
+        penis_length: penisLength.getNewValue()
+          ? parseFloat(penisLength.getNewValue()!)
+          : undefined,
+        measurements: measurements.getNewValue(),
+        fake_tits: fakeTits.getNewValue(),
+        career_length: careerLength.getNewValue(),
+        tattoos: tattoos.getNewValue(),
+        piercings: piercings.getNewValue(),
+        urls: urls.getNewValue(),
+        gender: stringToGender(gender.getNewValue()),
+        circumcised: stringToCircumcised(circumcised.getNewValue()),
+        tag_ids: tags.getNewValue()?.map((t) => t.stored_id!),
+        details: details.getNewValue(),
+        image: coverImage,
+        custom_fields: {
+          partial: Object.fromEntries(
+            Array.from(customFields.entries()).flatMap(([field, v]) =>
+              v.useNewValue ? [[field, v.getNewValue()]] : []
+            )
+          ),
+        },
+      },
+    };
+  }
+
+  const dialogTitle = intl.formatMessage({
+    id: "actions.merge",
+  });
+
+  const destinationLabel = !hasValues
+    ? ""
+    : intl.formatMessage({ id: "dialogs.merge.destination" });
+  const sourceLabel = !hasValues
+    ? ""
+    : intl.formatMessage({ id: "dialogs.merge.source" });
+
+  return (
+    <ScrapeDialog
+      className="performer-merge-dialog"
+      title={dialogTitle}
+      existingLabel={destinationLabel}
+      scrapedLabel={sourceLabel}
+      onClose={(apply) => {
+        if (!apply) {
+          onClose();
+        } else {
+          onClose(createValues());
+        }
+      }}
+    >
+      {renderScrapeRows()}
+    </ScrapeDialog>
+  );
+};
+
+interface IPerformerMergeModalProps {
+  show: boolean;
+  onClose: (mergedId?: string) => void;
+  performers: GQL.SelectPerformerDataFragment[];
+}
+
+export const PerformerMergeModal: React.FC<IPerformerMergeModalProps> = ({
+  show,
+  onClose,
+  performers,
+}) => {
+  const [sourcePerformers, setSourcePerformers] = useState<
+    GQL.SelectPerformerDataFragment[]
+  >([]);
+  const [destPerformer, setDestPerformer] = useState<
+    GQL.SelectPerformerDataFragment[]
+  >([]);
+
+  const [loadedSources, setLoadedSources] = useState<
+    GQL.PerformerDataFragment[]
+  >([]);
+  const [loadedDest, setLoadedDest] = useState<GQL.PerformerDataFragment>();
+
+  const [running, setRunning] = useState(false);
+  const [secondStep, setSecondStep] = useState(false);
+
+  const intl = useIntl();
+  const Toast = useToast();
+
+  const title = intl.formatMessage({
+    id: "actions.merge",
+  });
+
+  useEffect(() => {
+    if (performers.length > 0) {
+      // set the first performer as the destination, others as source
+      setDestPerformer([performers[0]]);
+
+      if (performers.length > 1) {
+        setSourcePerformers(performers.slice(1));
+      }
+    }
+  }, [performers]);
+
+  async function loadPerformers() {
+    const performerIDs = sourcePerformers.map((s) => parseInt(s.id));
+    performerIDs.push(parseInt(destPerformer[0].id));
+    const query = await queryFindPerformersByID(performerIDs);
+    const { performers: loadedPerformers } = query.data.findPerformers;
+
+    setLoadedDest(loadedPerformers.find((s) => s.id === destPerformer[0].id));
+    setLoadedSources(
+      loadedPerformers.filter((s) => s.id !== destPerformer[0].id)
+    );
+    setSecondStep(true);
+  }
+
+  async function onMerge(options: MergeOptions) {
+    const { values } = options;
+    try {
+      setRunning(true);
+      const result = await mutatePerformerMerge(
+        destPerformer[0].id,
+        sourcePerformers.map((s) => s.id),
+        values
+      );
+      if (result.data?.performerMerge) {
+        Toast.success(intl.formatMessage({ id: "toast.merged_performers" }));
+        onClose(destPerformer[0].id);
+      }
+      onClose();
+    } catch (e) {
+      Toast.error(e);
+    } finally {
+      setRunning(false);
+    }
+  }
+
+  function canMerge() {
+    return sourcePerformers.length > 0 && destPerformer.length !== 0;
+  }
+
+  function switchPerformers() {
+    if (sourcePerformers.length && destPerformer.length) {
+      const newDest = sourcePerformers[0];
+      setSourcePerformers([...sourcePerformers.slice(1), destPerformer[0]]);
+      setDestPerformer([newDest]);
+    }
+  }
+
+  if (secondStep && destPerformer.length > 0) {
+    return (
+      <PerformerMergeDetails
+        sources={loadedSources}
+        dest={loadedDest!}
+        onClose={(values) => {
+          setSecondStep(false);
+          if (values) {
+            onMerge(values);
+          } else {
+            onClose();
+          }
+        }}
+      />
+    );
+  }
+
+  return (
+    <ModalComponent
+      dialogClassName="performer-merge-dialog"
+      show={show}
+      header={title}
+      icon={faSignInAlt}
+      accept={{
+        text: intl.formatMessage({ id: "actions.next_action" }),
+        onClick: () => loadPerformers(),
+      }}
+      disabled={!canMerge()}
+      cancel={{
+        variant: "secondary",
+        onClick: () => onClose(),
+      }}
+      isRunning={running}
+    >
+      <div className="form-container row px-3">
+        <div className="col-12 col-lg-6 col-xl-12">
+          <Form.Group controlId="source" as={Row}>
+            {FormUtils.renderLabel({
+              title: intl.formatMessage({ id: "dialogs.merge.source" }),
+              labelProps: {
+                column: true,
+                sm: 3,
+                xl: 12,
+              },
+            })}
+            <Col sm={9} xl={12}>
+              <PerformerSelect
+                isMulti
+                onSelect={(items) => setSourcePerformers(items)}
+                values={sourcePerformers}
+                menuPortalTarget={document.body}
+              />
+            </Col>
+          </Form.Group>
+          <Form.Group
+            controlId="switch"
+            as={Row}
+            className="justify-content-center"
+          >
+            <Button
+              variant="secondary"
+              onClick={() => switchPerformers()}
+              disabled={!sourcePerformers.length || !destPerformer.length}
+              title={intl.formatMessage({ id: "actions.swap" })}
+            >
+              <Icon className="fa-fw" icon={faExchangeAlt} />
+            </Button>
+          </Form.Group>
+          <Form.Group controlId="destination" as={Row}>
+            {FormUtils.renderLabel({
+              title: intl.formatMessage({
+                id: "dialogs.merge.destination",
+              }),
+              labelProps: {
+                column: true,
+                sm: 3,
+                xl: 12,
+              },
+            })}
+            <Col sm={9} xl={12}>
+              <PerformerSelect
+                onSelect={(items) => setDestPerformer(items)}
+                values={destPerformer}
+                menuPortalTarget={document.body}
+              />
+            </Col>
+          </Form.Group>
+        </div>
+      </div>
+    </ModalComponent>
+  );
+};
diff --git a/ui/v2.5/src/components/Performers/styles.scss b/ui/v2.5/src/components/Performers/styles.scss
index 1840ad960..c3cebf997 100644
--- a/ui/v2.5/src/components/Performers/styles.scss
+++ b/ui/v2.5/src/components/Performers/styles.scss
@@ -302,3 +302,11 @@
   overflow-y: auto;
   padding-right: 1.5rem;
 }
+
+.performer-merge-dialog .custom-field {
+  // ensure we don't catch the destination/source labels
+  & > .form-label,
+  .form-control {
+    font-family: "Courier New", Courier, monospace;
+  }
+}
diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx
index 3615f1327..ee38ebd47 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx
@@ -7,7 +7,7 @@ import React, {
   useLayoutEffect,
 } from "react";
 import { FormattedMessage, useIntl } from "react-intl";
-import { Link, RouteComponentProps } from "react-router-dom";
+import { useHistory, Link, RouteComponentProps } from "react-router-dom";
 import { Helmet } from "react-helmet";
 import * as GQL from "src/core/generated-graphql";
 import {
@@ -50,6 +50,7 @@ import { lazyComponent } from "src/utils/lazyComponent";
 import cx from "classnames";
 import { TruncatedText } from "src/components/Shared/TruncatedText";
 import { PatchComponent, PatchContainerComponent } from "src/patch";
+import { SceneMergeModal } from "../SceneMergeDialog";
 import { goBackOrReplace } from "src/utils/history";
 import { FormattedDate } from "src/components/Shared/Date";
 
@@ -182,6 +183,7 @@ const ScenePage: React.FC<IProps> = PatchComponent("ScenePage", (props) => {
 
   const Toast = useToast();
   const intl = useIntl();
+  const history = useHistory();
   const [updateScene] = useSceneUpdate();
   const [generateScreenshot] = useSceneGenerateScreenshot();
   const { configuration } = useConfigurationContext();
@@ -205,6 +207,7 @@ const ScenePage: React.FC<IProps> = PatchComponent("ScenePage", (props) => {
 
   const [activeTabKey, setActiveTabKey] = useState("scene-details-panel");
 
+  const [isMerging, setIsMerging] = useState(false);
   const [isDeleteAlertOpen, setIsDeleteAlertOpen] = useState<boolean>(false);
   const [isGenerateDialogOpen, setIsGenerateDialogOpen] = useState(false);
 
@@ -347,6 +350,24 @@ const ScenePage: React.FC<IProps> = PatchComponent("ScenePage", (props) => {
     }
   }
 
+  function maybeRenderMergeDialog() {
+    if (!scene.id) return;
+    return (
+      <SceneMergeModal
+        show={isMerging}
+        onClose={(mergedId) => {
+          setIsMerging(false);
+          if (mergedId !== undefined && mergedId !== scene.id) {
+            // By default, the merge destination is the current scene, but
+            // the user can change it, in which case we need to redirect.
+            history.replace(`/scenes/${mergedId}`);
+          }
+        }}
+        scenes={[{ id: scene.id, title: objectTitle(scene) }]}
+      />
+    );
+  }
+
   function maybeRenderDeleteDialog() {
     if (isDeleteAlertOpen) {
       return (
@@ -419,6 +440,14 @@ const ScenePage: React.FC<IProps> = PatchComponent("ScenePage", (props) => {
             <FormattedMessage id="actions.submit_stash_box" />
           </Dropdown.Item>
         )}
+        <Dropdown.Item
+          key="merge-scene"
+          className="bg-secondary text-white"
+          onClick={() => setIsMerging(true)}
+        >
+          <FormattedMessage id="actions.merge" />
+          ...
+        </Dropdown.Item>
         <Dropdown.Item
           key="delete-scene"
           className="bg-secondary text-white"
@@ -588,6 +617,7 @@ const ScenePage: React.FC<IProps> = PatchComponent("ScenePage", (props) => {
         <title>{title}</title>
       </Helmet>
       {maybeRenderSceneGenerateDialog()}
+      {maybeRenderMergeDialog()}
       {maybeRenderDeleteDialog()}
       <div
         className={`scene-tabs order-xl-first order-last ${
diff --git a/ui/v2.5/src/components/Scenes/SceneMergeDialog.tsx b/ui/v2.5/src/components/Scenes/SceneMergeDialog.tsx
index 983978a27..9455af186 100644
--- a/ui/v2.5/src/components/Scenes/SceneMergeDialog.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneMergeDialog.tsx
@@ -705,8 +705,6 @@ export const SceneMergeModal: React.FC<ISceneMergeModalProps> = ({
       );
       if (result.data?.sceneMerge) {
         Toast.success(intl.formatMessage({ id: "toast.merged_scenes" }));
-        // refetch the scene
-        await queryFindScenesByID([parseInt(destScene[0].id)]);
         onClose(destScene[0].id);
       }
       onClose();
@@ -735,6 +733,7 @@ export const SceneMergeModal: React.FC<ISceneMergeModalProps> = ({
         sources={loadedSources}
         dest={loadedDest!}
         onClose={(values) => {
+          setSecondStep(false);
           if (values) {
             onMerge(values);
           } else {
diff --git a/ui/v2.5/src/components/Shared/ScrapeDialog/ScrapeDialog.tsx b/ui/v2.5/src/components/Shared/ScrapeDialog/ScrapeDialog.tsx
index 98699cbb6..ecf95541f 100644
--- a/ui/v2.5/src/components/Shared/ScrapeDialog/ScrapeDialog.tsx
+++ b/ui/v2.5/src/components/Shared/ScrapeDialog/ScrapeDialog.tsx
@@ -14,6 +14,7 @@ export const ScrapeDialogContext =
   React.createContext<IScrapeDialogContextState>({});
 
 interface IScrapeDialogProps {
+  className?: string;
   title: string;
   existingLabel?: React.ReactNode;
   scrapedLabel?: React.ReactNode;
@@ -68,7 +69,9 @@ export const ScrapeDialog: React.FC<
       }}
       modalProps={{
         size: "lg",
-        dialogClassName: `scrape-dialog ${sfwContentMode ? "sfw-mode" : ""}`,
+        dialogClassName: `${props.className ?? ""} scrape-dialog ${
+          sfwContentMode ? "sfw-mode" : ""
+        }`,
       }}
     >
       <div className="dialog-container">
diff --git a/ui/v2.5/src/components/Tags/TagDetails/Tag.tsx b/ui/v2.5/src/components/Tags/TagDetails/Tag.tsx
index e0bc11e37..76442b639 100644
--- a/ui/v2.5/src/components/Tags/TagDetails/Tag.tsx
+++ b/ui/v2.5/src/components/Tags/TagDetails/Tag.tsx
@@ -1,4 +1,4 @@
-import { Tabs, Tab, Dropdown, Form } from "react-bootstrap";
+import { Button, Tabs, Tab, Form } from "react-bootstrap";
 import React, { useEffect, useMemo, useState } from "react";
 import { useHistory, Redirect, RouteComponentProps } from "react-router-dom";
 import { FormattedMessage, useIntl } from "react-intl";
@@ -17,7 +17,6 @@ import { DetailsEditNavbar } from "src/components/Shared/DetailsEditNavbar";
 import { ErrorMessage } from "src/components/Shared/ErrorMessage";
 import { ModalComponent } from "src/components/Shared/Modal";
 import { LoadingIndicator } from "src/components/Shared/LoadingIndicator";
-import { Icon } from "src/components/Shared/Icon";
 import { useToast } from "src/hooks/Toast";
 import { useConfigurationContext } from "src/hooks/Config";
 import { tagRelationHook } from "src/core/tags";
@@ -29,12 +28,8 @@ import { TagStudiosPanel } from "./TagStudiosPanel";
 import { TagGalleriesPanel } from "./TagGalleriesPanel";
 import { CompressedTagDetailsPanel, TagDetailsPanel } from "./TagDetailsPanel";
 import { TagEditPanel } from "./TagEditPanel";
-import { TagMergeModal } from "./TagMergeDialog";
-import {
-  faSignInAlt,
-  faSignOutAlt,
-  faTrashAlt,
-} from "@fortawesome/free-solid-svg-icons";
+import { TagMergeModal } from "../TagMergeDialog";
+import { faTrashAlt } from "@fortawesome/free-solid-svg-icons";
 import { DetailImage } from "src/components/Shared/DetailImage";
 import { useLoadStickyHeader } from "src/hooks/detailsPanel";
 import { useScrollToTopOnMount } from "src/hooks/scrollToTop";
@@ -306,7 +301,7 @@ const TagPage: React.FC<IProps> = ({ tag, tabKey }) => {
   // Editing state
   const [isEditing, setIsEditing] = useState<boolean>(false);
   const [isDeleteAlertOpen, setIsDeleteAlertOpen] = useState<boolean>(false);
-  const [mergeType, setMergeType] = useState<"from" | "into" | undefined>();
+  const [isMerging, setIsMerging] = useState<boolean>(false);
 
   // Editing tag state
   const [image, setImage] = useState<string | null>();
@@ -461,41 +456,27 @@ const TagPage: React.FC<IProps> = ({ tag, tabKey }) => {
 
   function renderMergeButton() {
     return (
-      <Dropdown>
-        <Dropdown.Toggle variant="secondary">
-          <FormattedMessage id="actions.merge" />
-          ...
-        </Dropdown.Toggle>
-        <Dropdown.Menu className="bg-secondary text-white" id="tag-merge-menu">
-          <Dropdown.Item
-            className="bg-secondary text-white"
-            onClick={() => setMergeType("from")}
-          >
-            <Icon icon={faSignInAlt} />
-            <FormattedMessage id="actions.merge_from" />
-            ...
-          </Dropdown.Item>
-          <Dropdown.Item
-            className="bg-secondary text-white"
-            onClick={() => setMergeType("into")}
-          >
-            <Icon icon={faSignOutAlt} />
-            <FormattedMessage id="actions.merge_into" />
-            ...
-          </Dropdown.Item>
-        </Dropdown.Menu>
-      </Dropdown>
+      <Button variant="secondary" onClick={() => setIsMerging(true)}>
+        <FormattedMessage id="actions.merge" />
+        ...
+      </Button>
     );
   }
 
   function renderMergeDialog() {
-    if (!tag || !mergeType) return;
+    if (!tag.id) return;
     return (
       <TagMergeModal
-        tag={tag}
-        onClose={() => setMergeType(undefined)}
-        show={!!mergeType}
-        mergeType={mergeType}
+        show={isMerging}
+        onClose={(mergedId) => {
+          setIsMerging(false);
+          if (mergedId !== undefined && mergedId !== tag.id) {
+            // By default, the merge destination is the current tag, but
+            // the user can change it, in which case we need to redirect.
+            history.replace(`/tags/${mergedId}`);
+          }
+        }}
+        tags={[tag]}
       />
     );
   }
diff --git a/ui/v2.5/src/components/Tags/TagDetails/TagMergeDialog.tsx b/ui/v2.5/src/components/Tags/TagDetails/TagMergeDialog.tsx
deleted file mode 100644
index d6ed87c41..000000000
--- a/ui/v2.5/src/components/Tags/TagDetails/TagMergeDialog.tsx
+++ /dev/null
@@ -1,142 +0,0 @@
-import { Form, Col, Row } from "react-bootstrap";
-import React, { useState } from "react";
-import * as GQL from "src/core/generated-graphql";
-import { ModalComponent } from "src/components/Shared/Modal";
-import * as FormUtils from "src/utils/form";
-import { useTagsMerge } from "src/core/StashService";
-import { useIntl } from "react-intl";
-import { useToast } from "src/hooks/Toast";
-import { useHistory } from "react-router-dom";
-import { faSignInAlt, faSignOutAlt } from "@fortawesome/free-solid-svg-icons";
-import { Tag, TagSelect } from "../TagSelect";
-
-interface ITagMergeModalProps {
-  show: boolean;
-  onClose: () => void;
-  tag: Pick<GQL.Tag, "id">;
-  mergeType: "from" | "into";
-}
-
-export const TagMergeModal: React.FC<ITagMergeModalProps> = ({
-  show,
-  onClose,
-  tag,
-  mergeType,
-}) => {
-  const [src, setSrc] = useState<Tag[]>([]);
-  const [dest, setDest] = useState<Tag | null>(null);
-
-  const [running, setRunning] = useState(false);
-
-  const [mergeTags] = useTagsMerge();
-
-  const intl = useIntl();
-  const Toast = useToast();
-  const history = useHistory();
-
-  const title = intl.formatMessage({
-    id: mergeType === "from" ? "actions.merge_from" : "actions.merge_into",
-  });
-
-  async function onMerge() {
-    const source = mergeType === "from" ? src.map((s) => s.id) : [tag.id];
-    const destination = mergeType === "from" ? tag.id : dest?.id ?? null;
-
-    if (!destination) return;
-
-    try {
-      setRunning(true);
-      const result = await mergeTags({
-        variables: {
-          source,
-          destination,
-        },
-      });
-      if (result.data?.tagsMerge) {
-        Toast.success(intl.formatMessage({ id: "toast.merged_tags" }));
-        onClose();
-        history.replace(`/tags/${destination}`);
-      }
-    } catch (e) {
-      Toast.error(e);
-    } finally {
-      setRunning(false);
-    }
-  }
-
-  function canMerge() {
-    return (
-      (mergeType === "from" && src.length > 0) ||
-      (mergeType === "into" && dest !== null)
-    );
-  }
-
-  return (
-    <ModalComponent
-      show={show}
-      header={title}
-      icon={mergeType === "from" ? faSignInAlt : faSignOutAlt}
-      accept={{
-        text: intl.formatMessage({ id: "actions.merge" }),
-        onClick: () => onMerge(),
-      }}
-      disabled={!canMerge()}
-      cancel={{
-        variant: "secondary",
-        onClick: () => onClose(),
-      }}
-      isRunning={running}
-    >
-      <div className="form-container row px-3">
-        <div className="col-12 col-lg-6 col-xl-12">
-          {mergeType === "from" && (
-            <Form.Group controlId="source" as={Row}>
-              {FormUtils.renderLabel({
-                title: intl.formatMessage({ id: "dialogs.merge_tags.source" }),
-                labelProps: {
-                  column: true,
-                  sm: 3,
-                  xl: 12,
-                },
-              })}
-              <Col sm={9} xl={12}>
-                <TagSelect
-                  isMulti
-                  creatable={false}
-                  onSelect={(items) => setSrc(items)}
-                  values={src}
-                  excludeIds={tag?.id ? [tag.id] : []}
-                  menuPortalTarget={document.body}
-                />
-              </Col>
-            </Form.Group>
-          )}
-          {mergeType === "into" && (
-            <Form.Group controlId="destination" as={Row}>
-              {FormUtils.renderLabel({
-                title: intl.formatMessage({
-                  id: "dialogs.merge_tags.destination",
-                }),
-                labelProps: {
-                  column: true,
-                  sm: 3,
-                  xl: 12,
-                },
-              })}
-              <Col sm={9} xl={12}>
-                <TagSelect
-                  isMulti={false}
-                  creatable={false}
-                  onSelect={(items) => setDest(items[0])}
-                  values={dest ? [dest] : undefined}
-                  excludeIds={tag?.id ? [tag.id] : []}
-                  menuPortalTarget={document.body}
-                />
-              </Col>
-            </Form.Group>
-          )}
-        </div>
-      </div>
-    </ModalComponent>
-  );
-};
diff --git a/ui/v2.5/src/components/Tags/TagList.tsx b/ui/v2.5/src/components/Tags/TagList.tsx
index eb57435ad..e30f6071b 100644
--- a/ui/v2.5/src/components/Tags/TagList.tsx
+++ b/ui/v2.5/src/components/Tags/TagList.tsx
@@ -23,6 +23,8 @@ import { DeleteEntityDialog } from "../Shared/DeleteEntityDialog";
 import { ExportDialog } from "../Shared/ExportDialog";
 import { tagRelationHook } from "../../core/tags";
 import { faTrashAlt } from "@fortawesome/free-solid-svg-icons";
+import { TagMergeModal } from "./TagMergeDialog";
+import { Tag } from "./TagSelect";
 import { TagCardGrid } from "./TagCardGrid";
 import { EditTagsDialog } from "./EditTagsDialog";
 import { View } from "../List/views";
@@ -64,6 +66,7 @@ export const TagList: React.FC<ITagList> = PatchComponent(
 
     const intl = useIntl();
     const history = useHistory();
+    const [mergeTags, setMergeTags] = useState<Tag[] | undefined>(undefined);
     const [isExportDialogOpen, setIsExportDialogOpen] = useState(false);
     const [isExportAll, setIsExportAll] = useState(false);
 
@@ -73,6 +76,11 @@ export const TagList: React.FC<ITagList> = PatchComponent(
         text: intl.formatMessage({ id: "actions.view_random" }),
         onClick: viewRandom,
       },
+      {
+        text: `${intl.formatMessage({ id: "actions.merge" })}…`,
+        onClick: merge,
+        isDisplayed: showWhenSelected,
+      },
       {
         text: intl.formatMessage({ id: "actions.export" }),
         onClick: onExport,
@@ -118,6 +126,16 @@ export const TagList: React.FC<ITagList> = PatchComponent(
       }
     }
 
+    async function merge(
+      result: GQL.FindTagsForListQueryResult,
+      filter: ListFilterModel,
+      selectedIds: Set<string>
+    ) {
+      const selected =
+        result.data?.findTags.tags.filter((t) => selectedIds.has(t.id)) ?? [];
+      setMergeTags(selected);
+    }
+
     async function onExport() {
       setIsExportAll(false);
       setIsExportDialogOpen(true);
@@ -171,6 +189,23 @@ export const TagList: React.FC<ITagList> = PatchComponent(
       selectedIds: Set<string>,
       onSelectChange: (id: string, selected: boolean, shiftKey: boolean) => void
     ) {
+      function renderMergeDialog() {
+        if (mergeTags) {
+          return (
+            <TagMergeModal
+              tags={mergeTags}
+              onClose={(mergedId?: string) => {
+                setMergeTags(undefined);
+                if (mergedId) {
+                  history.push(`/tags/${mergedId}`);
+                }
+              }}
+              show
+            />
+          );
+        }
+      }
+
       function maybeRenderExportDialog() {
         if (isExportDialogOpen) {
           return (
@@ -323,6 +358,7 @@ export const TagList: React.FC<ITagList> = PatchComponent(
       }
       return (
         <>
+          {renderMergeDialog()}
           {maybeRenderExportDialog()}
           {renderTags()}
         </>
diff --git a/ui/v2.5/src/components/Tags/TagMergeDialog.tsx b/ui/v2.5/src/components/Tags/TagMergeDialog.tsx
new file mode 100644
index 000000000..15b648af5
--- /dev/null
+++ b/ui/v2.5/src/components/Tags/TagMergeDialog.tsx
@@ -0,0 +1,157 @@
+import { Button, Form, Col, Row } from "react-bootstrap";
+import React, { useEffect, useState } from "react";
+import { Icon } from "../Shared/Icon";
+import { ModalComponent } from "src/components/Shared/Modal";
+import * as FormUtils from "src/utils/form";
+import { useTagsMerge } from "src/core/StashService";
+import { useIntl } from "react-intl";
+import { useToast } from "src/hooks/Toast";
+import { faExchangeAlt, faSignInAlt } from "@fortawesome/free-solid-svg-icons";
+import { Tag, TagSelect } from "./TagSelect";
+
+interface ITagMergeModalProps {
+  show: boolean;
+  onClose: (mergedID?: string) => void;
+  tags: Tag[];
+}
+
+export const TagMergeModal: React.FC<ITagMergeModalProps> = ({
+  show,
+  onClose,
+  tags,
+}) => {
+  const [src, setSrc] = useState<Tag[]>([]);
+  const [dest, setDest] = useState<Tag | null>(null);
+
+  const [running, setRunning] = useState(false);
+
+  const [mergeTags] = useTagsMerge();
+
+  const intl = useIntl();
+  const Toast = useToast();
+
+  const title = intl.formatMessage({
+    id: "actions.merge",
+  });
+
+  useEffect(() => {
+    if (tags.length > 0) {
+      setDest(tags[0]);
+      setSrc(tags.slice(1));
+    }
+  }, [tags]);
+
+  async function onMerge() {
+    if (!dest) return;
+
+    const source = src.map((s) => s.id);
+    const destination = dest.id;
+
+    try {
+      setRunning(true);
+      const result = await mergeTags({
+        variables: {
+          source,
+          destination,
+        },
+      });
+      if (result.data?.tagsMerge) {
+        Toast.success(intl.formatMessage({ id: "toast.merged_tags" }));
+        onClose(dest.id);
+      }
+    } catch (e) {
+      Toast.error(e);
+    } finally {
+      setRunning(false);
+    }
+  }
+
+  function canMerge() {
+    return src.length > 0 && dest !== null;
+  }
+
+  function switchTags() {
+    if (src.length && dest !== null) {
+      const newDest = src[0];
+      setSrc([...src.slice(1), dest]);
+      setDest(newDest);
+    }
+  }
+
+  return (
+    <ModalComponent
+      show={show}
+      header={title}
+      icon={faSignInAlt}
+      accept={{
+        text: intl.formatMessage({ id: "actions.merge" }),
+        onClick: () => onMerge(),
+      }}
+      disabled={!canMerge()}
+      cancel={{
+        variant: "secondary",
+        onClick: () => onClose(),
+      }}
+      isRunning={running}
+    >
+      <div className="form-container row px-3">
+        <div className="col-12 col-lg-6 col-xl-12">
+          <Form.Group controlId="source" as={Row}>
+            {FormUtils.renderLabel({
+              title: intl.formatMessage({ id: "dialogs.merge.source" }),
+              labelProps: {
+                column: true,
+                sm: 3,
+                xl: 12,
+              },
+            })}
+            <Col sm={9} xl={12}>
+              <TagSelect
+                isMulti
+                creatable={false}
+                onSelect={(items) => setSrc(items)}
+                values={src}
+                menuPortalTarget={document.body}
+              />
+            </Col>
+          </Form.Group>
+          <Form.Group
+            controlId="switch"
+            as={Row}
+            className="justify-content-center"
+          >
+            <Button
+              variant="secondary"
+              onClick={() => switchTags()}
+              disabled={!src.length || !dest}
+              title={intl.formatMessage({ id: "actions.swap" })}
+            >
+              <Icon className="fa-fw" icon={faExchangeAlt} />
+            </Button>
+          </Form.Group>
+          <Form.Group controlId="destination" as={Row}>
+            {FormUtils.renderLabel({
+              title: intl.formatMessage({
+                id: "dialogs.merge.destination",
+              }),
+              labelProps: {
+                column: true,
+                sm: 3,
+                xl: 12,
+              },
+            })}
+            <Col sm={9} xl={12}>
+              <TagSelect
+                isMulti={false}
+                creatable={false}
+                onSelect={(items) => setDest(items[0])}
+                values={dest ? [dest] : undefined}
+                menuPortalTarget={document.body}
+              />
+            </Col>
+          </Form.Group>
+        </div>
+      </div>
+    </ModalComponent>
+  );
+};
diff --git a/ui/v2.5/src/core/StashService.ts b/ui/v2.5/src/core/StashService.ts
index c4f3d4732..6aaf17125 100644
--- a/ui/v2.5/src/core/StashService.ts
+++ b/ui/v2.5/src/core/StashService.ts
@@ -352,6 +352,14 @@ export const queryFindPerformers = (filter: ListFilterModel) =>
     },
   });
 
+export const queryFindPerformersByID = (performerIDs: number[]) =>
+  client.query<GQL.FindPerformersQuery>({
+    query: GQL.FindPerformersDocument,
+    variables: {
+      performer_ids: performerIDs,
+    },
+  });
+
 export const queryFindPerformersByIDForSelect = (performerIDs: string[]) =>
   client.query<GQL.FindPerformersForSelectQuery>({
     query: GQL.FindPerformersForSelectDocument,
@@ -420,6 +428,12 @@ export const useFindTag = (id: string) => {
   return GQL.useFindTagQuery({ variables: { id }, skip });
 };
 
+export const queryFindTag = (id: string) =>
+  client.query<GQL.FindTagQuery>({
+    query: GQL.FindTagDocument,
+    variables: { id },
+  });
+
 export const useFindTags = (filter?: ListFilterModel) =>
   GQL.useFindTagsQuery({
     skip: filter === undefined,
@@ -903,6 +917,10 @@ export const mutateSceneMerge = (
         deleteObject(cache, obj, GQL.FindSceneDocument);
       }
 
+      cache.evict({
+        id: cache.identify({ __typename: "Scene", id: destination }),
+      });
+
       evictTypeFields(cache, sceneMutationImpactedTypeFields);
       evictQueries(cache, [
         ...sceneMutationImpactedQueries,
@@ -1844,7 +1862,6 @@ export const usePerformerDestroy = () =>
       });
       evictQueries(cache, [
         ...performerMutationImpactedQueries,
-        GQL.FindPerformersDocument, // appears with
         GQL.FindGroupsDocument, // filter by performers
         GQL.FindSceneMarkersDocument, // filter by performers
       ]);
@@ -1884,13 +1901,48 @@ export const usePerformersDestroy = (
       });
       evictQueries(cache, [
         ...performerMutationImpactedQueries,
-        GQL.FindPerformersDocument, // appears with
         GQL.FindGroupsDocument, // filter by performers
         GQL.FindSceneMarkersDocument, // filter by performers
       ]);
     },
   });
 
+export const mutatePerformerMerge = (
+  destination: string,
+  source: string[],
+  values: GQL.PerformerUpdateInput
+) =>
+  client.mutate<GQL.PerformerMergeMutation>({
+    mutation: GQL.PerformerMergeDocument,
+    variables: {
+      input: {
+        source,
+        destination,
+        values,
+      },
+    },
+    update(cache, result) {
+      if (!result.data?.performerMerge) return;
+
+      for (const id of source) {
+        const obj = { __typename: "Performer", id };
+        deleteObject(cache, obj, GQL.FindPerformerDocument);
+      }
+
+      cache.evict({
+        id: cache.identify({ __typename: "Performer", id: destination }),
+      });
+
+      evictTypeFields(cache, performerMutationImpactedTypeFields);
+      evictQueries(cache, [
+        ...performerMutationImpactedQueries,
+        GQL.FindGroupsDocument, // filter by performers
+        GQL.FindSceneMarkersDocument, // filter by performers
+        GQL.StatsDocument, // performer count
+      ]);
+    },
+  });
+
 const studioMutationImpactedTypeFields = {
   Studio: ["child_studios"],
 };
@@ -1999,6 +2051,8 @@ const tagMutationImpactedTypeFields = {
 };
 
 const tagMutationImpactedQueries = [
+  GQL.FindGroupsDocument, // filter by tags
+  GQL.FindSceneMarkersDocument, // filter by tags
   GQL.FindScenesDocument, // filter by tags
   GQL.FindImagesDocument, // filter by tags
   GQL.FindGalleriesDocument, // filter by tags
@@ -2106,16 +2160,14 @@ export const useTagsMerge = () =>
         deleteObject(cache, obj, GQL.FindTagDocument);
       }
 
-      updateStats(cache, "tag_count", -source.length);
+      cache.evict({
+        id: cache.identify({ __typename: "Tag", id: destination }),
+      });
 
-      const obj = { __typename: "Tag", id: destination };
-      evictTypeFields(
-        cache,
-        tagMutationImpactedTypeFields,
-        cache.identify(obj) // don't evict destination tag
-      );
-
-      evictQueries(cache, tagMutationImpactedQueries);
+      evictQueries(cache, [
+        ...tagMutationImpactedQueries,
+        GQL.StatsDocument, // tag count
+      ]);
     },
   });
 
diff --git a/ui/v2.5/src/locales/en-GB.json b/ui/v2.5/src/locales/en-GB.json
index 158164c8d..426440fad 100644
--- a/ui/v2.5/src/locales/en-GB.json
+++ b/ui/v2.5/src/locales/en-GB.json
@@ -75,8 +75,6 @@
     "logout": "Log out",
     "make_primary": "Make Primary",
     "merge": "Merge",
-    "merge_from": "Merge from",
-    "merge_into": "Merge into",
     "migrate_blobs": "Migrate Blobs",
     "migrate_scene_screenshots": "Migrate Scene Screenshots",
     "next_action": "Next",
@@ -972,10 +970,6 @@
       "empty_results": "Destination field values will be unchanged.",
       "source": "Source"
     },
-    "merge_tags": {
-      "destination": "Destination",
-      "source": "Source"
-    },
     "overwrite_filter_warning": "Saved filter \"{entityName}\" will be overwritten.",
     "performers_found": "{count} performers found",
     "reassign_entity_title": "{count, plural, one {Reassign {singularEntity}} other {Reassign {pluralEntity}}}",
@@ -1565,6 +1559,7 @@
     "delete_past_tense": "Deleted {count, plural, one {{singularEntity}} other {{pluralEntity}}}",
     "generating_screenshot": "Generating screenshot…",
     "image_index_too_large": "Error: Image index is larger than the number of images in the Gallery",
+    "merged_performers": "Merged performers",
     "merged_scenes": "Merged scenes",
     "merged_tags": "Merged tags",
     "reassign_past_tense": "File reassigned",

From 66ceceeaf1cb676ea15cf232706cbea37f986dfa Mon Sep 17 00:00:00 2001
From: CJ <72030708+cj12312021@users.noreply.github.com>
Date: Sun, 4 Jan 2026 23:10:52 -0600
Subject: [PATCH 232/405] feat(dlna): add activity tracking for DLNA playback
 (#6407)

Adds time-based activity tracking for scenes played via DLNA, enabling
play count, play duration, and resume time tracking similar to the
web frontend.

Key features:
- Uses existing 'trackActivity' UI setting (no new config needed)
- Time-based tracking (elapsed session time / video duration)
- 5-minute session timeout to handle aggressive client buffering
- Minimum thresholds before saving (1% watched or 5 seconds)
- Respects minimumPlayPercent setting for play count increment

Implementation:
- New ActivityTracker in internal/dlna/activity.go
- Session management with automatic expiration
- Integration via DLNA service initialization

Limitations:
- Cannot detect actual playback position (only elapsed time)
- Cannot detect seeking or pause state
- Designed for upstream compatibility (no complex dependencies)
---
 internal/dlna/activity.go         | 341 ++++++++++++++++++++++
 internal/dlna/activity_test.go    | 466 ++++++++++++++++++++++++++++++
 internal/dlna/dms.go              |  19 ++
 internal/dlna/service.go          |  43 ++-
 internal/manager/config/config.go |  36 +++
 internal/manager/init.go          |   2 +-
 6 files changed, 900 insertions(+), 7 deletions(-)
 create mode 100644 internal/dlna/activity.go
 create mode 100644 internal/dlna/activity_test.go

diff --git a/internal/dlna/activity.go b/internal/dlna/activity.go
new file mode 100644
index 000000000..34f0081d7
--- /dev/null
+++ b/internal/dlna/activity.go
@@ -0,0 +1,341 @@
+package dlna
+
+import (
+	"context"
+	"fmt"
+	"sync"
+	"time"
+
+	"github.com/stashapp/stash/pkg/logger"
+	"github.com/stashapp/stash/pkg/txn"
+)
+
+const (
+	// DefaultSessionTimeout is the time after which a session is considered complete
+	// if no new requests are received.
+	// This is set high (5 minutes) because DLNA clients buffer aggressively and may not
+	// send any HTTP requests for extended periods while the user is still watching.
+	DefaultSessionTimeout = 5 * time.Minute
+
+	// monitorInterval is how often we check for expired sessions.
+	monitorInterval = 10 * time.Second
+)
+
+// ActivityConfig provides configuration options for DLNA activity tracking.
+type ActivityConfig interface {
+	// GetDLNAActivityTrackingEnabled returns true if activity tracking should be enabled.
+	// If not implemented, defaults to true.
+	GetDLNAActivityTrackingEnabled() bool
+
+	// GetMinimumPlayPercent returns the minimum percentage of a video that must be
+	// watched before incrementing the play count. Uses UI setting if available.
+	GetMinimumPlayPercent() int
+}
+
+// SceneActivityWriter provides methods for saving scene activity.
+type SceneActivityWriter interface {
+	SaveActivity(ctx context.Context, sceneID int, resumeTime *float64, playDuration *float64) (bool, error)
+	AddViews(ctx context.Context, sceneID int, dates []time.Time) ([]time.Time, error)
+}
+
+// streamSession represents an active DLNA streaming session.
+type streamSession struct {
+	SceneID        int
+	ClientIP       string
+	StartTime      time.Time
+	LastActivity   time.Time
+	VideoDuration  float64
+	PlayCountAdded bool
+}
+
+// sessionKey generates a unique key for a session based on client IP and scene ID.
+func sessionKey(clientIP string, sceneID int) string {
+	return fmt.Sprintf("%s:%d", clientIP, sceneID)
+}
+
+// percentWatched calculates the estimated percentage of video watched.
+// Uses a time-based approach since DLNA clients buffer aggressively and byte
+// positions don't correlate with actual playback position.
+//
+// The key insight: you cannot have watched more of the video than time has elapsed.
+// If the video is 30 minutes and only 1 minute has passed, maximum watched is ~3.3%.
+func (s *streamSession) percentWatched() float64 {
+	if s.VideoDuration <= 0 {
+		return 0
+	}
+
+	// Calculate elapsed time from session start to last activity
+	elapsed := s.LastActivity.Sub(s.StartTime).Seconds()
+	if elapsed <= 0 {
+		return 0
+	}
+
+	// Maximum possible percent is based on elapsed time
+	// You can't watch more of the video than time has passed
+	timeBasedPercent := (elapsed / s.VideoDuration) * 100
+
+	// Cap at 100%
+	if timeBasedPercent > 100 {
+		return 100
+	}
+
+	return timeBasedPercent
+}
+
+// estimatedPlayDuration returns the estimated play duration in seconds.
+// Uses elapsed time from session start to last activity, capped by video duration.
+func (s *streamSession) estimatedPlayDuration() float64 {
+	elapsed := s.LastActivity.Sub(s.StartTime).Seconds()
+	if s.VideoDuration > 0 && elapsed > s.VideoDuration {
+		return s.VideoDuration
+	}
+	return elapsed
+}
+
+// estimatedResumeTime calculates the estimated resume time based on elapsed time.
+// Since DLNA clients buffer aggressively, byte positions don't correlate with playback.
+// Instead, we estimate based on how long the session has been active.
+// Returns the time in seconds, or 0 if the video is nearly complete (>=98%).
+func (s *streamSession) estimatedResumeTime() float64 {
+	if s.VideoDuration <= 0 {
+		return 0
+	}
+
+	// Calculate elapsed time from session start
+	elapsed := s.LastActivity.Sub(s.StartTime).Seconds()
+	if elapsed <= 0 {
+		return 0
+	}
+
+	// If elapsed time exceeds 98% of video duration, reset resume time (matches frontend behavior)
+	if elapsed >= s.VideoDuration*0.98 {
+		return 0
+	}
+
+	// Resume time is approximately where the user was watching
+	// Capped by video duration
+	if elapsed > s.VideoDuration {
+		elapsed = s.VideoDuration
+	}
+
+	return elapsed
+}
+
+// ActivityTracker tracks DLNA streaming activity and saves it to the database.
+type ActivityTracker struct {
+	txnManager     txn.Manager
+	sceneWriter    SceneActivityWriter
+	config         ActivityConfig
+	sessionTimeout time.Duration
+
+	sessions map[string]*streamSession
+	mutex    sync.RWMutex
+
+	ctx        context.Context
+	cancelFunc context.CancelFunc
+	wg         sync.WaitGroup
+}
+
+// NewActivityTracker creates a new ActivityTracker.
+func NewActivityTracker(
+	txnManager txn.Manager,
+	sceneWriter SceneActivityWriter,
+	config ActivityConfig,
+) *ActivityTracker {
+	ctx, cancel := context.WithCancel(context.Background())
+
+	tracker := &ActivityTracker{
+		txnManager:     txnManager,
+		sceneWriter:    sceneWriter,
+		config:         config,
+		sessionTimeout: DefaultSessionTimeout,
+		sessions:       make(map[string]*streamSession),
+		ctx:            ctx,
+		cancelFunc:     cancel,
+	}
+
+	// Start the session monitor goroutine
+	tracker.wg.Add(1)
+	go tracker.monitorSessions()
+
+	return tracker
+}
+
+// Stop stops the activity tracker and processes any remaining sessions.
+func (t *ActivityTracker) Stop() {
+	t.cancelFunc()
+	t.wg.Wait()
+
+	// Process any remaining sessions
+	t.mutex.Lock()
+	sessions := make([]*streamSession, 0, len(t.sessions))
+	for _, session := range t.sessions {
+		sessions = append(sessions, session)
+	}
+	t.sessions = make(map[string]*streamSession)
+	t.mutex.Unlock()
+
+	for _, session := range sessions {
+		t.processCompletedSession(session)
+	}
+}
+
+// RecordRequest records a streaming request for activity tracking.
+// Each request updates the session's LastActivity time, which is used for
+// time-based tracking of watch progress.
+func (t *ActivityTracker) RecordRequest(sceneID int, clientIP string, videoDuration float64) {
+	if !t.isEnabled() {
+		return
+	}
+
+	key := sessionKey(clientIP, sceneID)
+	now := time.Now()
+
+	t.mutex.Lock()
+	defer t.mutex.Unlock()
+
+	session, exists := t.sessions[key]
+	if !exists {
+		session = &streamSession{
+			SceneID:       sceneID,
+			ClientIP:      clientIP,
+			StartTime:     now,
+			VideoDuration: videoDuration,
+		}
+		t.sessions[key] = session
+		logger.Debugf("[DLNA Activity] New session started: scene=%d, client=%s", sceneID, clientIP)
+	}
+
+	session.LastActivity = now
+}
+
+// monitorSessions periodically checks for expired sessions and processes them.
+func (t *ActivityTracker) monitorSessions() {
+	defer t.wg.Done()
+
+	ticker := time.NewTicker(monitorInterval)
+	defer ticker.Stop()
+
+	for {
+		select {
+		case <-t.ctx.Done():
+			return
+		case <-ticker.C:
+			t.processExpiredSessions()
+		}
+	}
+}
+
+// processExpiredSessions finds and processes sessions that have timed out.
+func (t *ActivityTracker) processExpiredSessions() {
+	now := time.Now()
+	var expiredSessions []*streamSession
+
+	t.mutex.Lock()
+	for key, session := range t.sessions {
+		timeSinceStart := now.Sub(session.StartTime)
+		timeSinceActivity := now.Sub(session.LastActivity)
+
+		// Must have no HTTP activity for the full timeout period
+		if timeSinceActivity <= t.sessionTimeout {
+			continue
+		}
+
+		// DLNA clients buffer aggressively - they fetch most/all of the video quickly,
+		// then play from cache with NO further HTTP requests.
+		//
+		// Two scenarios:
+		// 1. User watched the whole video: timeSinceStart >= videoDuration
+		//    -> Set LastActivity to when timeout began (they finished watching)
+		// 2. User stopped early: timeSinceStart < videoDuration
+		//    -> Keep LastActivity as-is (best estimate of when they stopped)
+
+		videoDuration := time.Duration(session.VideoDuration) * time.Second
+		if timeSinceStart >= videoDuration && videoDuration > 0 {
+			// User likely watched the whole video, then it timed out
+			// Estimate they watched until the timeout period started
+			session.LastActivity = now.Add(-t.sessionTimeout)
+		}
+		// else: User stopped early - LastActivity is already our best estimate
+
+		expiredSessions = append(expiredSessions, session)
+		delete(t.sessions, key)
+	}
+	t.mutex.Unlock()
+
+	for _, session := range expiredSessions {
+		t.processCompletedSession(session)
+	}
+}
+
+// processCompletedSession saves activity data for a completed streaming session.
+func (t *ActivityTracker) processCompletedSession(session *streamSession) {
+	percentWatched := session.percentWatched()
+	playDuration := session.estimatedPlayDuration()
+	resumeTime := session.estimatedResumeTime()
+
+	logger.Debugf("[DLNA Activity] Session completed: scene=%d, client=%s, duration=%.1fs, startTime=%s, lastActivity=%s, percent=%.1f%%, duration=%.1fs, resume=%.1fs",
+		session.SceneID, session.ClientIP, session.VideoDuration, session.StartTime.String(), session.LastActivity.String(), percentWatched, playDuration, resumeTime)
+
+	// Only save if there was meaningful activity (at least 1% watched or 5 seconds)
+	if percentWatched < 1 && playDuration < 5 {
+		logger.Debugf("[DLNA Activity] Session too short, skipping save")
+		return
+	}
+
+	// Skip DB operations if txnManager is nil (for testing)
+	if t.txnManager == nil {
+		logger.Debugf("[DLNA Activity] No transaction manager, skipping DB save")
+		return
+	}
+
+	ctx := context.Background()
+
+	// Save activity (resume time and play duration)
+	if playDuration > 0 || resumeTime > 0 {
+		var resumeTimePtr *float64
+		if resumeTime > 0 {
+			resumeTimePtr = &resumeTime
+		}
+
+		if err := txn.WithTxn(ctx, t.txnManager, func(ctx context.Context) error {
+			_, err := t.sceneWriter.SaveActivity(ctx, session.SceneID, resumeTimePtr, &playDuration)
+			return err
+		}); err != nil {
+			logger.Warnf("[DLNA Activity] Failed to save activity for scene %d: %v", session.SceneID, err)
+		}
+	}
+
+	// Increment play count if threshold met
+	if !session.PlayCountAdded {
+		minPercent := t.getMinimumPlayPercent()
+		if percentWatched >= float64(minPercent) {
+			if err := txn.WithTxn(ctx, t.txnManager, func(ctx context.Context) error {
+				_, err := t.sceneWriter.AddViews(ctx, session.SceneID, []time.Time{time.Now()})
+				return err
+			}); err != nil {
+				logger.Warnf("[DLNA Activity] Failed to increment play count for scene %d: %v", session.SceneID, err)
+			} else {
+				logger.Debugf("[DLNA Activity] Incremented play count for scene %d (%.1f%% watched)",
+					session.SceneID, percentWatched)
+				session.PlayCountAdded = true
+			}
+		}
+	}
+}
+
+// isEnabled returns true if activity tracking is enabled.
+func (t *ActivityTracker) isEnabled() bool {
+	if t.config == nil {
+		return true // Default to enabled
+	}
+	return t.config.GetDLNAActivityTrackingEnabled()
+}
+
+// getMinimumPlayPercent returns the minimum play percentage for incrementing play count.
+func (t *ActivityTracker) getMinimumPlayPercent() int {
+	if t.config == nil {
+		return 0 // Default: any play increments count (matches frontend default)
+	}
+	return t.config.GetMinimumPlayPercent()
+}
diff --git a/internal/dlna/activity_test.go b/internal/dlna/activity_test.go
new file mode 100644
index 000000000..3c4d890ba
--- /dev/null
+++ b/internal/dlna/activity_test.go
@@ -0,0 +1,466 @@
+package dlna
+
+import (
+	"context"
+	"sync"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/assert"
+)
+
+// mockSceneWriter is a mock implementation of SceneActivityWriter
+type mockSceneWriter struct {
+	mu                sync.Mutex
+	saveActivityCalls []saveActivityCall
+	addViewsCalls     []addViewsCall
+}
+
+type saveActivityCall struct {
+	sceneID      int
+	resumeTime   *float64
+	playDuration *float64
+}
+
+type addViewsCall struct {
+	sceneID int
+	dates   []time.Time
+}
+
+func (m *mockSceneWriter) SaveActivity(_ context.Context, sceneID int, resumeTime *float64, playDuration *float64) (bool, error) {
+	m.mu.Lock()
+	m.saveActivityCalls = append(m.saveActivityCalls, saveActivityCall{
+		sceneID:      sceneID,
+		resumeTime:   resumeTime,
+		playDuration: playDuration,
+	})
+	m.mu.Unlock()
+	return true, nil
+}
+
+func (m *mockSceneWriter) AddViews(_ context.Context, sceneID int, dates []time.Time) ([]time.Time, error) {
+	m.mu.Lock()
+	m.addViewsCalls = append(m.addViewsCalls, addViewsCall{
+		sceneID: sceneID,
+		dates:   dates,
+	})
+	m.mu.Unlock()
+	return dates, nil
+}
+
+// mockConfig is a mock implementation of ActivityConfig
+type mockConfig struct {
+	enabled        bool
+	minPlayPercent int
+}
+
+func (c *mockConfig) GetDLNAActivityTrackingEnabled() bool {
+	return c.enabled
+}
+
+func (c *mockConfig) GetMinimumPlayPercent() int {
+	return c.minPlayPercent
+}
+
+func TestStreamSession_PercentWatched(t *testing.T) {
+	now := time.Now()
+
+	tests := []struct {
+		name          string
+		startTime     time.Time
+		lastActivity  time.Time
+		videoDuration float64
+		expected      float64
+	}{
+		{
+			name:          "no video duration",
+			startTime:     now.Add(-60 * time.Second),
+			lastActivity:  now,
+			videoDuration: 0,
+			expected:      0,
+		},
+		{
+			name:          "half watched",
+			startTime:     now.Add(-60 * time.Second),
+			lastActivity:  now,
+			videoDuration: 120.0, // 2 minutes, watched for 1 minute = 50%
+			expected:      50.0,
+		},
+		{
+			name:          "fully watched",
+			startTime:     now.Add(-120 * time.Second),
+			lastActivity:  now,
+			videoDuration: 120.0, // 2 minutes, watched for 2 minutes = 100%
+			expected:      100.0,
+		},
+		{
+			name:          "quarter watched",
+			startTime:     now.Add(-30 * time.Second),
+			lastActivity:  now,
+			videoDuration: 120.0, // 2 minutes, watched for 30 seconds = 25%
+			expected:      25.0,
+		},
+		{
+			name:          "elapsed exceeds duration - capped at 100%",
+			startTime:     now.Add(-180 * time.Second),
+			lastActivity:  now,
+			videoDuration: 120.0, // 2 minutes, but 3 minutes elapsed = capped at 100%
+			expected:      100.0,
+		},
+		{
+			name:          "no elapsed time",
+			startTime:     now,
+			lastActivity:  now,
+			videoDuration: 120.0,
+			expected:      0,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			session := &streamSession{
+				StartTime:     tt.startTime,
+				LastActivity:  tt.lastActivity,
+				VideoDuration: tt.videoDuration,
+			}
+			result := session.percentWatched()
+			assert.InDelta(t, tt.expected, result, 0.01)
+		})
+	}
+}
+
+func TestStreamSession_EstimatedPlayDuration(t *testing.T) {
+	now := time.Now()
+
+	tests := []struct {
+		name          string
+		startTime     time.Time
+		lastActivity  time.Time
+		videoDuration float64
+		expected      float64
+	}{
+		{
+			name:          "elapsed less than duration",
+			startTime:     now.Add(-30 * time.Second),
+			lastActivity:  now,
+			videoDuration: 120,
+			expected:      30.0,
+		},
+		{
+			name:          "elapsed exceeds duration - capped",
+			startTime:     now.Add(-180 * time.Second),
+			lastActivity:  now,
+			videoDuration: 120,
+			expected:      120.0,
+		},
+		{
+			name:          "no duration limit",
+			startTime:     now.Add(-300 * time.Second),
+			lastActivity:  now,
+			videoDuration: 0,
+			expected:      300.0,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			session := &streamSession{
+				StartTime:     tt.startTime,
+				LastActivity:  tt.lastActivity,
+				VideoDuration: tt.videoDuration,
+			}
+			result := session.estimatedPlayDuration()
+			assert.InDelta(t, tt.expected, result, 1.0) // Allow 1 second tolerance
+		})
+	}
+}
+
+func TestStreamSession_EstimatedResumeTime(t *testing.T) {
+	now := time.Now()
+
+	tests := []struct {
+		name          string
+		startTime     time.Time
+		lastActivity  time.Time
+		videoDuration float64
+		expected      float64
+	}{
+		{
+			name:          "no elapsed time",
+			startTime:     now,
+			lastActivity:  now,
+			videoDuration: 120.0,
+			expected:      0,
+		},
+		{
+			name:          "half way through",
+			startTime:     now.Add(-60 * time.Second),
+			lastActivity:  now,
+			videoDuration: 120.0, // 2 minutes, watched for 1 minute = resume at 60s
+			expected:      60.0,
+		},
+		{
+			name:          "quarter way through",
+			startTime:     now.Add(-30 * time.Second),
+			lastActivity:  now,
+			videoDuration: 120.0, // 2 minutes, watched for 30 seconds = resume at 30s
+			expected:      30.0,
+		},
+		{
+			name:          "98% complete - should reset to 0",
+			startTime:     now.Add(-118 * time.Second),
+			lastActivity:  now,
+			videoDuration: 120.0, // 98.3% elapsed, should reset
+			expected:      0,
+		},
+		{
+			name:          "100% complete - should reset to 0",
+			startTime:     now.Add(-120 * time.Second),
+			lastActivity:  now,
+			videoDuration: 120.0,
+			expected:      0,
+		},
+		{
+			name:          "elapsed exceeds duration - capped and reset to 0",
+			startTime:     now.Add(-180 * time.Second),
+			lastActivity:  now,
+			videoDuration: 120.0, // 150% elapsed, capped at 100%, reset to 0
+			expected:      0,
+		},
+		{
+			name:          "no video duration",
+			startTime:     now.Add(-60 * time.Second),
+			lastActivity:  now,
+			videoDuration: 0,
+			expected:      0,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			session := &streamSession{
+				StartTime:     tt.startTime,
+				LastActivity:  tt.lastActivity,
+				VideoDuration: tt.videoDuration,
+			}
+			result := session.estimatedResumeTime()
+			assert.InDelta(t, tt.expected, result, 1.0) // Allow 1 second tolerance
+		})
+	}
+}
+
+func TestSessionKey(t *testing.T) {
+	key := sessionKey("192.168.1.100", 42)
+	assert.Equal(t, "192.168.1.100:42", key)
+}
+
+func TestActivityTracker_RecordRequest(t *testing.T) {
+	config := &mockConfig{enabled: true, minPlayPercent: 50}
+
+	// Create tracker without starting the goroutine (for unit testing)
+	tracker := &ActivityTracker{
+		txnManager:     nil, // Don't need DB for this test
+		sceneWriter:    nil,
+		config:         config,
+		sessionTimeout: DefaultSessionTimeout,
+		sessions:       make(map[string]*streamSession),
+	}
+
+	// Record first request - should create new session
+	tracker.RecordRequest(42, "192.168.1.100", 120.0)
+
+	tracker.mutex.RLock()
+	session := tracker.sessions["192.168.1.100:42"]
+	tracker.mutex.RUnlock()
+
+	assert.NotNil(t, session)
+	assert.Equal(t, 42, session.SceneID)
+	assert.Equal(t, "192.168.1.100", session.ClientIP)
+	assert.Equal(t, 120.0, session.VideoDuration)
+	assert.False(t, session.StartTime.IsZero())
+	assert.False(t, session.LastActivity.IsZero())
+
+	// Record second request - should update LastActivity
+	firstActivity := session.LastActivity
+	time.Sleep(10 * time.Millisecond)
+	tracker.RecordRequest(42, "192.168.1.100", 120.0)
+
+	tracker.mutex.RLock()
+	session = tracker.sessions["192.168.1.100:42"]
+	tracker.mutex.RUnlock()
+
+	assert.True(t, session.LastActivity.After(firstActivity))
+}
+
+func TestActivityTracker_DisabledTracking(t *testing.T) {
+	config := &mockConfig{enabled: false, minPlayPercent: 50}
+
+	// Create tracker without starting the goroutine (for unit testing)
+	tracker := &ActivityTracker{
+		txnManager:     nil,
+		sceneWriter:    nil,
+		config:         config,
+		sessionTimeout: DefaultSessionTimeout,
+		sessions:       make(map[string]*streamSession),
+	}
+
+	// Record request - should be ignored when tracking is disabled
+	tracker.RecordRequest(42, "192.168.1.100", 120.0)
+
+	tracker.mutex.RLock()
+	sessionCount := len(tracker.sessions)
+	tracker.mutex.RUnlock()
+
+	assert.Equal(t, 0, sessionCount)
+}
+
+func TestActivityTracker_SessionExpiration(t *testing.T) {
+	// For this test, we'll test the session expiration logic directly
+	// without the full transaction manager integration
+
+	sceneWriter := &mockSceneWriter{}
+	config := &mockConfig{enabled: true, minPlayPercent: 10}
+
+	// Create a tracker with nil txnManager - we'll test processCompletedSession separately
+	// Here we just verify the session management logic
+	tracker := &ActivityTracker{
+		txnManager:     nil, // Skip DB calls for this test
+		sceneWriter:    sceneWriter,
+		config:         config,
+		sessionTimeout: 100 * time.Millisecond,
+		sessions:       make(map[string]*streamSession),
+	}
+
+	// Manually add a session
+	// Use a short video duration (1 second) so the test can verify expiration quickly.
+	now := time.Now()
+	tracker.sessions["192.168.1.100:42"] = &streamSession{
+		SceneID:       42,
+		ClientIP:      "192.168.1.100",
+		StartTime:     now.Add(-5 * time.Second),        // Started 5 seconds ago
+		LastActivity:  now.Add(-200 * time.Millisecond), // Last activity 200ms ago (> 100ms timeout)
+		VideoDuration: 1.0,                              // Short video so timeSinceStart > videoDuration
+	}
+
+	// Verify session exists
+	assert.Len(t, tracker.sessions, 1)
+
+	// Process expired sessions - this will try to save activity but txnManager is nil
+	// so it will skip the DB calls but still remove the session
+	tracker.processExpiredSessions()
+
+	// Verify session was removed (even though DB calls were skipped)
+	assert.Len(t, tracker.sessions, 0)
+}
+
+func TestActivityTracker_SessionExpiration_StoppedEarly(t *testing.T) {
+	// Test that sessions expire when user stops watching early (before video ends)
+	// This was a bug where sessions wouldn't expire until video duration passed
+
+	config := &mockConfig{enabled: true, minPlayPercent: 10}
+	tracker := &ActivityTracker{
+		txnManager:     nil,
+		sceneWriter:    nil,
+		config:         config,
+		sessionTimeout: 100 * time.Millisecond,
+		sessions:       make(map[string]*streamSession),
+	}
+
+	// User started watching a 30-minute video but stopped after 5 seconds
+	now := time.Now()
+	tracker.sessions["192.168.1.100:42"] = &streamSession{
+		SceneID:       42,
+		ClientIP:      "192.168.1.100",
+		StartTime:     now.Add(-5 * time.Second),        // Started 5 seconds ago
+		LastActivity:  now.Add(-200 * time.Millisecond), // Last activity 200ms ago (> 100ms timeout)
+		VideoDuration: 1800.0,                           // 30 minute video - much longer than elapsed time
+	}
+
+	assert.Len(t, tracker.sessions, 1)
+
+	// Session should expire because timeSinceActivity > timeout
+	// Even though the video is 30 minutes and only 5 seconds have passed
+	tracker.processExpiredSessions()
+
+	// Verify session was expired
+	assert.Len(t, tracker.sessions, 0, "Session should expire when user stops early, not wait for video duration")
+}
+
+func TestActivityTracker_MinimumPlayPercentThreshold(t *testing.T) {
+	// Test the threshold logic without full transaction integration
+	config := &mockConfig{enabled: true, minPlayPercent: 75} // High threshold
+
+	tracker := &ActivityTracker{
+		txnManager:     nil,
+		sceneWriter:    nil,
+		config:         config,
+		sessionTimeout: 50 * time.Millisecond,
+		sessions:       make(map[string]*streamSession),
+	}
+
+	// Test that getMinimumPlayPercent returns the configured value
+	assert.Equal(t, 75, tracker.getMinimumPlayPercent())
+
+	// Create a session with 30% watched (36 seconds of a 120 second video)
+	now := time.Now()
+	session := &streamSession{
+		SceneID:       42,
+		StartTime:     now.Add(-36 * time.Second),
+		LastActivity:  now,
+		VideoDuration: 120.0,
+	}
+
+	// 30% is below 75% threshold
+	percentWatched := session.percentWatched()
+	assert.InDelta(t, 30.0, percentWatched, 0.1)
+	assert.False(t, percentWatched >= float64(tracker.getMinimumPlayPercent()))
+}
+
+func TestActivityTracker_MultipleSessions(t *testing.T) {
+	config := &mockConfig{enabled: true, minPlayPercent: 50}
+
+	// Create tracker without starting the goroutine (for unit testing)
+	tracker := &ActivityTracker{
+		txnManager:     nil,
+		sceneWriter:    nil,
+		config:         config,
+		sessionTimeout: DefaultSessionTimeout,
+		sessions:       make(map[string]*streamSession),
+	}
+
+	// Different clients watching same scene
+	tracker.RecordRequest(42, "192.168.1.100", 120.0)
+	tracker.RecordRequest(42, "192.168.1.101", 120.0)
+
+	// Same client watching different scenes
+	tracker.RecordRequest(43, "192.168.1.100", 180.0)
+
+	tracker.mutex.RLock()
+	assert.Len(t, tracker.sessions, 3)
+	tracker.mutex.RUnlock()
+}
+
+func TestActivityTracker_ShortSessionIgnored(t *testing.T) {
+	// Test that short sessions are ignored
+	// Create a session with only ~0.8% watched (1 second of a 120 second video)
+	now := time.Now()
+	session := &streamSession{
+		SceneID:       42,
+		ClientIP:      "192.168.1.100",
+		StartTime:     now.Add(-1 * time.Second), // Only 1 second
+		LastActivity:  now,
+		VideoDuration: 120.0, // 2 minutes
+	}
+
+	// Verify percent watched is below threshold (1s / 120s = 0.83%)
+	assert.InDelta(t, 0.83, session.percentWatched(), 0.1)
+
+	// Verify play duration is short
+	assert.InDelta(t, 1.0, session.estimatedPlayDuration(), 0.5)
+
+	// Both are below the minimum thresholds (1% and 5 seconds)
+	percentWatched := session.percentWatched()
+	playDuration := session.estimatedPlayDuration()
+	shouldSkip := percentWatched < 1 && playDuration < 5
+	assert.True(t, shouldSkip, "Short session should be skipped")
+}
diff --git a/internal/dlna/dms.go b/internal/dlna/dms.go
index 3b27d607b..d68705f74 100644
--- a/internal/dlna/dms.go
+++ b/internal/dlna/dms.go
@@ -278,6 +278,7 @@ type Server struct {
 	repository         Repository
 	sceneServer        sceneServer
 	ipWhitelistManager *ipWhitelistManager
+	activityTracker    *ActivityTracker
 	VideoSortOrder     string
 
 	subscribeLock sync.Mutex
@@ -596,6 +597,7 @@ func (me *Server) initMux(mux *http.ServeMux) {
 	mux.HandleFunc(resPath, func(w http.ResponseWriter, r *http.Request) {
 		sceneId := r.URL.Query().Get("scene")
 		var scene *models.Scene
+		var videoDuration float64
 		repo := me.repository
 		err := repo.WithReadTxn(r.Context(), func(ctx context.Context) error {
 			sceneIdInt, err := strconv.Atoi(sceneId)
@@ -603,6 +605,15 @@ func (me *Server) initMux(mux *http.ServeMux) {
 				return nil
 			}
 			scene, _ = repo.SceneFinder.Find(ctx, sceneIdInt)
+			if scene != nil {
+				// Load primary file to get duration for activity tracking
+				if err := scene.LoadPrimaryFile(ctx, repo.FileGetter); err != nil {
+					logger.Debugf("failed to load primary file for scene %d: %v", sceneIdInt, err)
+				}
+				if f := scene.Files.Primary(); f != nil {
+					videoDuration = f.Duration
+				}
+			}
 			return nil
 		})
 		if err != nil {
@@ -615,6 +626,14 @@ func (me *Server) initMux(mux *http.ServeMux) {
 
 		w.Header().Set("transferMode.dlna.org", "Streaming")
 		w.Header().Set("contentFeatures.dlna.org", "DLNA.ORG_OP=01;DLNA.ORG_CI=0;DLNA.ORG_FLAGS=01500000000000000000000000000000")
+
+		// Track activity - uses time-based tracking, updated on each request
+		if me.activityTracker != nil {
+			sceneIdInt, _ := strconv.Atoi(sceneId)
+			clientIP, _, _ := net.SplitHostPort(r.RemoteAddr)
+			me.activityTracker.RecordRequest(sceneIdInt, clientIP, videoDuration)
+		}
+
 		me.sceneServer.StreamSceneDirect(scene, w, r)
 	})
 	mux.HandleFunc(rootDescPath, func(w http.ResponseWriter, r *http.Request) {
diff --git a/internal/dlna/service.go b/internal/dlna/service.go
index 6ef825bac..98715b1e6 100644
--- a/internal/dlna/service.go
+++ b/internal/dlna/service.go
@@ -77,13 +77,29 @@ type Config interface {
 	GetDLNADefaultIPWhitelist() []string
 	GetVideoSortOrder() string
 	GetDLNAPortAsString() string
+	GetDLNAActivityTrackingEnabled() bool
+}
+
+// activityConfig wraps Config to implement ActivityConfig.
+type activityConfig struct {
+	config         Config
+	minPlayPercent int // cached from UI config
+}
+
+func (c *activityConfig) GetDLNAActivityTrackingEnabled() bool {
+	return c.config.GetDLNAActivityTrackingEnabled()
+}
+
+func (c *activityConfig) GetMinimumPlayPercent() int {
+	return c.minPlayPercent
 }
 
 type Service struct {
-	repository     Repository
-	config         Config
-	sceneServer    sceneServer
-	ipWhitelistMgr *ipWhitelistManager
+	repository      Repository
+	config          Config
+	sceneServer     sceneServer
+	ipWhitelistMgr  *ipWhitelistManager
+	activityTracker *ActivityTracker
 
 	server  *Server
 	running bool
@@ -155,6 +171,7 @@ func (s *Service) init() error {
 		repository:         s.repository,
 		sceneServer:        s.sceneServer,
 		ipWhitelistManager: s.ipWhitelistMgr,
+		activityTracker:    s.activityTracker,
 		Interfaces:         interfaces,
 		HTTPConn: func() net.Listener {
 			conn, err := net.Listen("tcp", dmsConfig.Http)
@@ -215,7 +232,14 @@ func (s *Service) init() error {
 // }
 
 // NewService initialises and returns a new DLNA service.
-func NewService(repo Repository, cfg Config, sceneServer sceneServer) *Service {
+// The sceneWriter parameter should implement SceneActivityWriter (typically models.SceneReaderWriter).
+// The minPlayPercent parameter is the minimum percentage of video that must be played to increment play count.
+func NewService(repo Repository, cfg Config, sceneServer sceneServer, sceneWriter SceneActivityWriter, minPlayPercent int) *Service {
+	activityCfg := &activityConfig{
+		config:         cfg,
+		minPlayPercent: minPlayPercent,
+	}
+
 	ret := &Service{
 		repository:  repo,
 		sceneServer: sceneServer,
@@ -223,7 +247,8 @@ func NewService(repo Repository, cfg Config, sceneServer sceneServer) *Service {
 		ipWhitelistMgr: &ipWhitelistManager{
 			config: cfg,
 		},
-		mutex: sync.Mutex{},
+		activityTracker: NewActivityTracker(repo.TxnManager, sceneWriter, activityCfg),
+		mutex:           sync.Mutex{},
 	}
 
 	return ret
@@ -283,6 +308,12 @@ func (s *Service) Stop(duration *time.Duration) {
 
 	if s.running {
 		logger.Info("Stopping DLNA")
+
+		// Stop activity tracker first to process any pending sessions
+		if s.activityTracker != nil {
+			s.activityTracker.Stop()
+		}
+
 		err := s.server.Close()
 		if err != nil {
 			logger.Error(err)
diff --git a/internal/manager/config/config.go b/internal/manager/config/config.go
index 2cc3994f4..35534f119 100644
--- a/internal/manager/config/config.go
+++ b/internal/manager/config/config.go
@@ -1323,6 +1323,26 @@ func (i *Config) GetUIConfiguration() map[string]interface{} {
 	return i.forKey(UI).Cut(UI).Raw()
 }
 
+// GetMinimumPlayPercent returns the minimum percentage of a video that must be
+// watched before incrementing the play count. Returns 0 if not configured.
+func (i *Config) GetMinimumPlayPercent() int {
+	uiConfig := i.GetUIConfiguration()
+	if uiConfig == nil {
+		return 0
+	}
+	if val, ok := uiConfig["minimumPlayPercent"]; ok {
+		switch v := val.(type) {
+		case int:
+			return v
+		case float64:
+			return int(v)
+		case int64:
+			return int(v)
+		}
+	}
+	return 0
+}
+
 func (i *Config) SetUIConfiguration(v map[string]interface{}) {
 	i.Lock()
 	defer i.Unlock()
@@ -1615,6 +1635,22 @@ func (i *Config) GetDLNAPortAsString() string {
 	return ":" + strconv.Itoa(i.GetDLNAPort())
 }
 
+// GetDLNAActivityTrackingEnabled returns true if DLNA activity tracking is enabled.
+// This uses the same "trackActivity" UI setting that controls frontend play history tracking.
+// When enabled, scenes played via DLNA will have their play count and duration tracked.
+func (i *Config) GetDLNAActivityTrackingEnabled() bool {
+	uiConfig := i.GetUIConfiguration()
+	if uiConfig == nil {
+		return true // Default to enabled
+	}
+	if val, ok := uiConfig["trackActivity"]; ok {
+		if v, ok := val.(bool); ok {
+			return v
+		}
+	}
+	return true // Default to enabled
+}
+
 // GetVideoSortOrder returns the sort order to display videos. If
 // empty, videos will be sorted by titles.
 func (i *Config) GetVideoSortOrder() string {
diff --git a/internal/manager/init.go b/internal/manager/init.go
index b388bd15c..b4af5eab7 100644
--- a/internal/manager/init.go
+++ b/internal/manager/init.go
@@ -78,7 +78,7 @@ func Initialize(cfg *config.Config, l *log.Logger) (*Manager, error) {
 	}
 
 	dlnaRepository := dlna.NewRepository(repo)
-	dlnaService := dlna.NewService(dlnaRepository, cfg, sceneServer)
+	dlnaService := dlna.NewService(dlnaRepository, cfg, sceneServer, repo.Scene, cfg.GetMinimumPlayPercent())
 
 	mgr := &Manager{
 		Config: cfg,

From 39d3e63cbfa346d5376effd4e62350694b4f6ffd Mon Sep 17 00:00:00 2001
From: bob12224 <jonathan.shahen+anon@gmail.com>
Date: Sun, 4 Jan 2026 21:11:42 -0800
Subject: [PATCH 233/405] Remove hiding the age in SFW mode (#6450)

---
 ui/v2.5/src/sfw-mode.scss | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/ui/v2.5/src/sfw-mode.scss b/ui/v2.5/src/sfw-mode.scss
index 9883afb4b..5ba449433 100644
--- a/ui/v2.5/src/sfw-mode.scss
+++ b/ui/v2.5/src/sfw-mode.scss
@@ -83,9 +83,4 @@
       display: none;
     }
   }
-
-  // hide performer age on performer cards
-  .performer-card__age {
-    display: none;
-  }
 }

From 56822dbdc51a0a92c24ea261e1171a20822f481a Mon Sep 17 00:00:00 2001
From: ayaya <62456287+a15355447898a@users.noreply.github.com>
Date: Mon, 5 Jan 2026 13:12:44 +0800
Subject: [PATCH 234/405] Fix hardware decoding detection for 10-bit videos on
 rkmpp (#6420)

---
 pkg/ffmpeg/codec_hardware.go | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkg/ffmpeg/codec_hardware.go b/pkg/ffmpeg/codec_hardware.go
index 86fe56bde..aa8c75dcc 100644
--- a/pkg/ffmpeg/codec_hardware.go
+++ b/pkg/ffmpeg/codec_hardware.go
@@ -363,8 +363,11 @@ func (f *FFMpeg) hwApplyFullHWFilter(args VideoFilter, codec VideoCodec, fullhw
 			args = args.Append("scale_qsv=format=nv12")
 		}
 	case VideoCodecRK264:
-		// For Rockchip, no extra mapping here. If there is no scale filter,
-		// leave frames in DRM_PRIME for the encoder.
+		// Full-hw decode on 10-bit sources often produces DRM_PRIME with sw_pix_fmt=nv15.
+		// h264_rkmpp does NOT accept nv15, so we must force a conversion to nv12
+		if fullhw {
+			args = args.Append("scale_rkrga=w=iw:h=ih:format=nv12")
+		}
 	}
 
 	return args
@@ -399,7 +402,7 @@ func (f *FFMpeg) hwApplyScaleTemplate(sargs string, codec VideoCodec, match []in
 		// by downloading the scaled frame to system RAM and re-uploading it.
 		// The filter chain below uses a zero-copy approach, passing the hardware-scaled
 		// frame directly to the encoder. This is more efficient but may be less stable.
-		template = "scale_rkrga=$value"
+		template = "scale_rkrga=$value:format=nv12"
 	default:
 		return VideoFilter(sargs)
 	}

From 91e1ec520f164dc267f2d8d36e05735e7ab05e0f Mon Sep 17 00:00:00 2001
From: Gykes <24581046+Gykes@users.noreply.github.com>
Date: Sun, 4 Jan 2026 21:20:01 -0800
Subject: [PATCH 235/405] FR: Allow Marker Screenshot Generation
 Unconditionally (#6433)

---
 internal/manager/task_generate.go                     |  6 +++++-
 internal/manager/task_generate_markers.go             | 11 +++++++----
 .../src/components/Settings/Tasks/GenerateOptions.tsx |  2 --
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/internal/manager/task_generate.go b/internal/manager/task_generate.go
index c28ffe55b..30ecd08bf 100644
--- a/internal/manager/task_generate.go
+++ b/internal/manager/task_generate.go
@@ -411,12 +411,13 @@ func (j *GenerateJob) queueSceneJobs(ctx context.Context, g *generate.Generator,
 		}
 	}
 
-	if j.input.Markers {
+	if j.input.Markers || j.input.MarkerImagePreviews || j.input.MarkerScreenshots {
 		task := &GenerateMarkersTask{
 			repository:          r,
 			Scene:               scene,
 			Overwrite:           j.overwrite,
 			fileNamingAlgorithm: j.fileNamingAlgo,
+			VideoPreview:        j.input.Markers,
 			ImagePreview:        j.input.MarkerImagePreviews,
 			Screenshot:          j.input.MarkerScreenshots,
 
@@ -488,6 +489,9 @@ func (j *GenerateJob) queueMarkerJob(g *generate.Generator, marker *models.Scene
 		Marker:              marker,
 		Overwrite:           j.overwrite,
 		fileNamingAlgorithm: j.fileNamingAlgo,
+		VideoPreview:        j.input.Markers,
+		ImagePreview:        j.input.MarkerImagePreviews,
+		Screenshot:          j.input.MarkerScreenshots,
 		generator:           g,
 	}
 	j.totals.markers++
diff --git a/internal/manager/task_generate_markers.go b/internal/manager/task_generate_markers.go
index cfe17926c..1da458ba8 100644
--- a/internal/manager/task_generate_markers.go
+++ b/internal/manager/task_generate_markers.go
@@ -18,6 +18,7 @@ type GenerateMarkersTask struct {
 	Overwrite           bool
 	fileNamingAlgorithm models.HashAlgorithm
 
+	VideoPreview bool
 	ImagePreview bool
 	Screenshot   bool
 
@@ -115,9 +116,11 @@ func (t *GenerateMarkersTask) generateMarker(videoFile *models.VideoFile, scene
 
 	g := t.generator
 
-	if err := g.MarkerPreviewVideo(context.TODO(), videoFile.Path, sceneHash, seconds, sceneMarker.EndSeconds, instance.Config.GetPreviewAudio()); err != nil {
-		logger.Errorf("[generator] failed to generate marker video: %v", err)
-		logErrorOutput(err)
+	if t.VideoPreview {
+		if err := g.MarkerPreviewVideo(context.TODO(), videoFile.Path, sceneHash, seconds, sceneMarker.EndSeconds, instance.Config.GetPreviewAudio()); err != nil {
+			logger.Errorf("[generator] failed to generate marker video: %v", err)
+			logErrorOutput(err)
+		}
 	}
 
 	if t.ImagePreview {
@@ -164,7 +167,7 @@ func (t *GenerateMarkersTask) markerExists(sceneChecksum string, seconds int) bo
 		return false
 	}
 
-	videoExists := t.videoExists(sceneChecksum, seconds)
+	videoExists := !t.VideoPreview || t.videoExists(sceneChecksum, seconds)
 	imageExists := !t.ImagePreview || t.imageExists(sceneChecksum, seconds)
 	screenshotExists := !t.Screenshot || t.screenshotExists(sceneChecksum, seconds)
 
diff --git a/ui/v2.5/src/components/Settings/Tasks/GenerateOptions.tsx b/ui/v2.5/src/components/Settings/Tasks/GenerateOptions.tsx
index 00d129be7..ee126d41e 100644
--- a/ui/v2.5/src/components/Settings/Tasks/GenerateOptions.tsx
+++ b/ui/v2.5/src/components/Settings/Tasks/GenerateOptions.tsx
@@ -100,7 +100,6 @@ export const GenerateOptions: React.FC<IGenerateOptions> = ({
             id="marker-image-preview-task"
             className="sub-setting"
             checked={options.markerImagePreviews ?? false}
-            disabled={!options.markers}
             headingID="dialogs.scene_gen.marker_image_previews"
             tooltipID="dialogs.scene_gen.marker_image_previews_tooltip"
             onChange={(v) =>
@@ -112,7 +111,6 @@ export const GenerateOptions: React.FC<IGenerateOptions> = ({
           <BooleanSetting
             id="marker-screenshot-task"
             checked={options.markerScreenshots ?? false}
-            disabled={!options.markers}
             headingID="dialogs.scene_gen.marker_screenshots"
             tooltipID="dialogs.scene_gen.marker_screenshots_tooltip"
             onChange={(v) => setOptions({ markerScreenshots: v })}

From 09ba41b2bb6c30184eb3fb97d153aad8fb6109e6 Mon Sep 17 00:00:00 2001
From: Gykes <24581046+Gykes@users.noreply.github.com>
Date: Sun, 4 Jan 2026 21:21:55 -0800
Subject: [PATCH 236/405] Chore: Update htmlQuery and Xpath dependencies
 (#6434)

---
 go.mod |  4 ++--
 go.sum | 54 ++++++++++++++++++++++++++++++++++++++++++++++--------
 2 files changed, 48 insertions(+), 10 deletions(-)

diff --git a/go.mod b/go.mod
index 0cf02fa0d..705fe40ed 100644
--- a/go.mod
+++ b/go.mod
@@ -7,7 +7,7 @@ require (
 	github.com/WithoutPants/sortorder v0.0.0-20230616003020-921c9ef69552
 	github.com/Yamashou/gqlgenc v0.32.1
 	github.com/anacrolix/dms v1.2.2
-	github.com/antchfx/htmlquery v1.3.0
+	github.com/antchfx/htmlquery v1.3.5
 	github.com/asticode/go-astisub v0.25.1
 	github.com/chromedp/cdproto v0.0.0-20231007061347-18b01cd81617
 	github.com/chromedp/chromedp v0.9.2
@@ -69,7 +69,7 @@ require (
 
 require (
 	github.com/agnivade/levenshtein v1.2.1 // indirect
-	github.com/antchfx/xpath v1.2.3 // indirect
+	github.com/antchfx/xpath v1.3.5 // indirect
 	github.com/asticode/go-astikit v0.20.0 // indirect
 	github.com/asticode/go-astits v1.8.0 // indirect
 	github.com/chromedp/sysutil v1.0.0 // indirect
diff --git a/go.sum b/go.sum
index fc731b705..750acd9ab 100644
--- a/go.sum
+++ b/go.sum
@@ -85,10 +85,10 @@ github.com/andybalholm/brotli v1.0.5 h1:8uQZIdzKmjc/iuPu7O2ioW48L81FgatrcpfFmiq/
 github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
 github.com/andybalholm/cascadia v1.3.3 h1:AG2YHrzJIm4BZ19iwJ/DAua6Btl3IwJX+VI4kktS1LM=
 github.com/andybalholm/cascadia v1.3.3/go.mod h1:xNd9bqTn98Ln4DwST8/nG+H0yuB8Hmgu1YHNnWw0GeA=
-github.com/antchfx/htmlquery v1.3.0 h1:5I5yNFOVI+egyia5F2s/5Do2nFWxJz41Tr3DyfKD25E=
-github.com/antchfx/htmlquery v1.3.0/go.mod h1:zKPDVTMhfOmcwxheXUsx4rKJy8KEY/PU6eXr/2SebQ8=
-github.com/antchfx/xpath v1.2.3 h1:CCZWOzv5bAqjVv0offZ2LVgVYFbeldKQVuLNbViZdes=
-github.com/antchfx/xpath v1.2.3/go.mod h1:i54GszH55fYfBmoZXapTHN8T8tkcHfRgLyVwwqzXNcs=
+github.com/antchfx/htmlquery v1.3.5 h1:aYthDDClnG2a2xePf6tys/UyyM/kRcsFRm+ifhFKoU0=
+github.com/antchfx/htmlquery v1.3.5/go.mod h1:5oyIPIa3ovYGtLqMPNjBF2Uf25NPCKsMjCnQ8lvjaoA=
+github.com/antchfx/xpath v1.3.5 h1:PqbXLC3TkfeZyakF5eeh3NTWEbYl4VHNVeufANzDbKQ=
+github.com/antchfx/xpath v1.3.5/go.mod h1:i54GszH55fYfBmoZXapTHN8T8tkcHfRgLyVwwqzXNcs=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
 github.com/arbovm/levenshtein v0.0.0-20160628152529-48b4e1c0c4d0 h1:jfIu9sQUG6Ig+0+Ap1h4unLjW6YQJpKZVmUzxsD4E/Q=
 github.com/arbovm/levenshtein v0.0.0-20160628152529-48b4e1c0c4d0/go.mod h1:t2tdKJDJF9BV14lnkjHmOQgcvEKgtqs5a1N3LNdJhGE=
@@ -286,6 +286,7 @@ github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
 github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
@@ -664,6 +665,10 @@ golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5y
 golang.org/x/crypto v0.0.0-20211215165025-cf75a172585e/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=
 golang.org/x/crypto v0.0.0-20220112180741-5e0467b6c7ce/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
+golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
+golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
+golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
 golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q=
 golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -707,6 +712,10 @@ golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
 golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/mod v0.29.0 h1:HV8lRxZC4l2cr3Zq1LvtOsi/ThTgWnUk/y64QSs8GwA=
 golang.org/x/mod v0.29.0/go.mod h1:NyhrlYXJ2H4eJiRy/WDBO6HMqZQ6q9nk4JzS3NuCK+w=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -757,7 +766,12 @@ golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qx
 golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws=
+golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
+golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
+golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
+golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
+golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
 golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY=
 golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -789,6 +803,11 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
+golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sync v0.18.0 h1:kr88TuHDroi+UVf+0hZnirlk8o8T+4MrK6mr60WkH/I=
 golang.org/x/sync v0.18.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -869,14 +888,25 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
 golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ=
+golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
+golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
+golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
+golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
+golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
+golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
 golang.org/x/term v0.37.0 h1:8EGAD0qCmHYZg6J17DvsMy9/wJ7/D/4pV/wfnld5lTU=
 golang.org/x/term v0.37.0/go.mod h1:5pB4lxRNYYVZuTLmy8oR2BH8dflOR+IbTYFD8fi3254=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -889,7 +919,12 @@ golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
-golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
 golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
 golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -956,6 +991,9 @@ golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo=
 golang.org/x/tools v0.1.8/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
+golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
+golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
 golang.org/x/tools v0.38.0 h1:Hx2Xv8hISq8Lm16jvBZ2VQf+RLmbd7wVUsALibYI/IQ=
 golang.org/x/tools v0.38.0/go.mod h1:yEsQ/d/YK8cjh0L6rZlY8tgtlKiBNTL14pGDJPJpYQs=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

From 956af44a2979e0125cd475c197a79b97b255e54a Mon Sep 17 00:00:00 2001
From: Gykes <24581046+Gykes@users.noreply.github.com>
Date: Sun, 4 Jan 2026 21:36:21 -0800
Subject: [PATCH 237/405] FR: Sort Scenes and Images by Resolution (#6441)

---
 pkg/sqlite/image.go                      | 9 +++++++++
 pkg/sqlite/scene.go                      | 4 ++++
 ui/v2.5/src/models/list-filter/images.ts | 8 +++++++-
 ui/v2.5/src/models/list-filter/scenes.ts | 1 +
 4 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/pkg/sqlite/image.go b/pkg/sqlite/image.go
index ccccc90aa..bcaf3f42f 100644
--- a/pkg/sqlite/image.go
+++ b/pkg/sqlite/image.go
@@ -942,6 +942,7 @@ var imageSortOptions = sortOptions{
 	"performer_count",
 	"random",
 	"rating",
+	"resolution",
 	"tag_count",
 	"title",
 	"updated_at",
@@ -1001,6 +1002,14 @@ func (qb *ImageStore) setImageSortAndPagination(q *queryBuilder, findFilter *mod
 		case "mod_time", "filesize":
 			addFilesJoin()
 			sortClause = getSort(sort, direction, "files")
+		case "resolution":
+			addFilesJoin()
+			q.addJoins(join{
+				sort:     true,
+				table:    imageFileTable,
+				onClause: "images_files.file_id = image_files.file_id",
+			})
+			sortClause = " ORDER BY MIN(image_files.width, image_files.height) " + direction
 		case "title":
 			addFilesJoin()
 			addFolderJoin()
diff --git a/pkg/sqlite/scene.go b/pkg/sqlite/scene.go
index 0c2d11345..a0b9005a5 100644
--- a/pkg/sqlite/scene.go
+++ b/pkg/sqlite/scene.go
@@ -1138,6 +1138,7 @@ var sceneSortOptions = sortOptions{
 	"perceptual_similarity",
 	"random",
 	"rating",
+	"resolution",
 	"studio",
 	"tag_count",
 	"title",
@@ -1236,6 +1237,9 @@ func (qb *SceneStore) setSceneSort(query *queryBuilder, findFilter *models.FindF
 		sort = "frame_rate"
 		addVideoFileTable()
 		query.sortAndPagination += getSort(sort, direction, videoFileTable)
+	case "resolution":
+		addVideoFileTable()
+		query.sortAndPagination += fmt.Sprintf(" ORDER BY MIN(%s.width, %s.height) %s", videoFileTable, videoFileTable, getSortDirection(direction))
 	case "filesize":
 		addFileTable()
 		query.sortAndPagination += getSort(sort, direction, fileTable)
diff --git a/ui/v2.5/src/models/list-filter/images.ts b/ui/v2.5/src/models/list-filter/images.ts
index 4d5630b1c..0b2e06df0 100644
--- a/ui/v2.5/src/models/list-filter/images.ts
+++ b/ui/v2.5/src/models/list-filter/images.ts
@@ -25,7 +25,13 @@ import { GalleriesCriterionOption } from "./criteria/galleries";
 
 const defaultSortBy = "path";
 
-const sortByOptions = ["filesize", "file_count", "date", ...MediaSortByOptions]
+const sortByOptions = [
+  "filesize",
+  "file_count",
+  "date",
+  "resolution",
+  ...MediaSortByOptions,
+]
   .map(ListFilterOptions.createSortBy)
   .concat([
     {
diff --git a/ui/v2.5/src/models/list-filter/scenes.ts b/ui/v2.5/src/models/list-filter/scenes.ts
index cf2791567..5fdb6a770 100644
--- a/ui/v2.5/src/models/list-filter/scenes.ts
+++ b/ui/v2.5/src/models/list-filter/scenes.ts
@@ -44,6 +44,7 @@ const sortByOptions = [
   "filesize",
   "duration",
   "framerate",
+  "resolution",
   "bitrate",
   "last_played_at",
   "resume_time",

From dc7ebadb16c5a99838005e176b00789be8799098 Mon Sep 17 00:00:00 2001
From: Gykes <24581046+Gykes@users.noreply.github.com>
Date: Sun, 4 Jan 2026 21:37:18 -0800
Subject: [PATCH 238/405] FR: Update Tray Notification to Include Port (#6448)

---
 internal/desktop/systray_nonlinux.go | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/internal/desktop/systray_nonlinux.go b/internal/desktop/systray_nonlinux.go
index dab6d4dc2..6b6055f11 100644
--- a/internal/desktop/systray_nonlinux.go
+++ b/internal/desktop/systray_nonlinux.go
@@ -3,6 +3,7 @@
 package desktop
 
 import (
+	"fmt"
 	"runtime"
 	"strings"
 
@@ -58,12 +59,12 @@ func startSystray(exit chan int, faviconProvider FaviconProvider) {
 func systrayInitialize(exit chan<- int, faviconProvider FaviconProvider) {
 	favicon := faviconProvider.GetFavicon()
 	systray.SetTemplateIcon(favicon, favicon)
-	systray.SetTooltip("🟢 Stash is Running.")
+	c := config.GetInstance()
+	systray.SetTooltip(fmt.Sprintf("🟢 Stash is Running on port %d.", c.GetPort()))
 
 	openStashButton := systray.AddMenuItem("Open Stash", "Open a browser window to Stash")
 	var menuItems []string
 	systray.AddSeparator()
-	c := config.GetInstance()
 	if !c.IsNewSystem() {
 		menuItems = c.GetMenuItems()
 		for _, item := range menuItems {

From 45dc892a54ee67b6096679ff85b4a56d8b61ee90 Mon Sep 17 00:00:00 2001
From: Gykes <24581046+Gykes@users.noreply.github.com>
Date: Sun, 4 Jan 2026 22:04:28 -0800
Subject: [PATCH 239/405] FR: Hide Already Installed Plugins or Scrapers
 (#6443)

---
 .../src/components/Settings/PluginPackageManager.tsx  | 11 ++++++++++-
 .../src/components/Settings/ScraperPackageManager.tsx | 11 ++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/ui/v2.5/src/components/Settings/PluginPackageManager.tsx b/ui/v2.5/src/components/Settings/PluginPackageManager.tsx
index ed3160139..d71bea5ee 100644
--- a/ui/v2.5/src/components/Settings/PluginPackageManager.tsx
+++ b/ui/v2.5/src/components/Settings/PluginPackageManager.tsx
@@ -100,6 +100,12 @@ export const AvailablePluginPackages: React.FC = () => {
   const [jobID, setJobID] = useState<string>();
   const { job } = useMonitorJob(jobID, () => onPackageChanges());
 
+  // Get installed packages to filter them out from available list
+  const { data: installedData } = useInstalledPluginPackages(false);
+  const installedPackageIds = new Set(
+    installedData?.installedPackages?.map((p) => p.package_id) ?? []
+  );
+
   async function onInstallPackages(packages: GQL.PackageSpecInput[]) {
     const r = await mutateInstallPluginPackages(packages);
 
@@ -114,7 +120,10 @@ export const AvailablePluginPackages: React.FC = () => {
 
   async function loadSource(source: string): Promise<RemotePackage[]> {
     const { data } = await queryAvailablePluginPackages(source);
-    return data.availablePackages;
+    // Filter out already installed packages
+    return data.availablePackages.filter(
+      (pkg) => !installedPackageIds.has(pkg.package_id)
+    );
   }
 
   function addSource(source: GQL.PackageSource) {
diff --git a/ui/v2.5/src/components/Settings/ScraperPackageManager.tsx b/ui/v2.5/src/components/Settings/ScraperPackageManager.tsx
index cb6858610..5c93bc2a3 100644
--- a/ui/v2.5/src/components/Settings/ScraperPackageManager.tsx
+++ b/ui/v2.5/src/components/Settings/ScraperPackageManager.tsx
@@ -100,6 +100,12 @@ export const AvailableScraperPackages: React.FC = () => {
   const [jobID, setJobID] = useState<string>();
   const { job } = useMonitorJob(jobID, () => onPackageChanges());
 
+  // Get installed packages to filter them out from available list
+  const { data: installedData } = useInstalledScraperPackages(false);
+  const installedPackageIds = new Set(
+    installedData?.installedPackages?.map((p) => p.package_id) ?? []
+  );
+
   async function onInstallPackages(packages: GQL.PackageSpecInput[]) {
     const r = await mutateInstallScraperPackages(packages);
 
@@ -114,7 +120,10 @@ export const AvailableScraperPackages: React.FC = () => {
 
   async function loadSource(source: string): Promise<RemotePackage[]> {
     const { data } = await queryAvailableScraperPackages(source);
-    return data.availablePackages;
+    // Filter out already installed packages
+    return data.availablePackages.filter(
+      (pkg) => !installedPackageIds.has(pkg.package_id)
+    );
   }
 
   function addSource(source: GQL.PackageSource) {

From 81e8ccb5a916dc03e8ed763318993079dba89f33 Mon Sep 17 00:00:00 2001
From: Gykes <24581046+Gykes@users.noreply.github.com>
Date: Sun, 4 Jan 2026 22:34:43 -0800
Subject: [PATCH 240/405] FR: Autopopulate Stash-ID Search Box (#6447)

---
 .../Performers/PerformerDetails/PerformerEditPanel.tsx        | 1 +
 ui/v2.5/src/components/Scenes/SceneDetails/SceneEditPanel.tsx | 1 +
 ui/v2.5/src/components/Shared/StashBoxIDSearchModal.tsx       | 4 +++-
 .../src/components/Studios/StudioDetails/StudioEditPanel.tsx  | 1 +
 ui/v2.5/src/components/Tags/TagDetails/TagEditPanel.tsx       | 1 +
 5 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
index f2d825e07..000b723e0 100644
--- a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
@@ -681,6 +681,7 @@ export const PerformerEditPanel: React.FC<IPerformerDetails> = ({
             onStashIDSelected(item);
             setIsStashIDSearchOpen(false);
           }}
+          initialQuery={performer.name ?? ""}
         />
       )}
 
diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/SceneEditPanel.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/SceneEditPanel.tsx
index 9ba5059de..6a119d8d5 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/SceneEditPanel.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/SceneEditPanel.tsx
@@ -731,6 +731,7 @@ export const SceneEditPanel: React.FC<IProps> = ({
             onStashIDSelected(item);
             setIsStashIDSearchOpen(false);
           }}
+          initialQuery={scene.title ?? ""}
         />
       )}
       <Form noValidate onSubmit={formik.handleSubmit}>
diff --git a/ui/v2.5/src/components/Shared/StashBoxIDSearchModal.tsx b/ui/v2.5/src/components/Shared/StashBoxIDSearchModal.tsx
index 4674db08a..47683dc3c 100644
--- a/ui/v2.5/src/components/Shared/StashBoxIDSearchModal.tsx
+++ b/ui/v2.5/src/components/Shared/StashBoxIDSearchModal.tsx
@@ -33,6 +33,7 @@ interface IProps {
   stashBoxes: GQL.StashBox[];
   excludedStashBoxEndpoints?: string[];
   onSelectItem: (item?: GQL.StashIdInput) => void;
+  initialQuery?: string;
 }
 
 const CLASSNAME = "StashBoxIDSearchModal";
@@ -289,6 +290,7 @@ export const StashBoxIDSearchModal: React.FC<IProps> = ({
   stashBoxes,
   excludedStashBoxEndpoints = [],
   onSelectItem,
+  initialQuery = "",
 }) => {
   const intl = useIntl();
   const Toast = useToast();
@@ -297,7 +299,7 @@ export const StashBoxIDSearchModal: React.FC<IProps> = ({
   const [selectedStashBox, setSelectedStashBox] = useState<GQL.StashBox | null>(
     null
   );
-  const [query, setQuery] = useState<string>("");
+  const [query, setQuery] = useState<string>(initialQuery);
   const [results, setResults] = useState<SearchResultItem[] | undefined>(
     undefined
   );
diff --git a/ui/v2.5/src/components/Studios/StudioDetails/StudioEditPanel.tsx b/ui/v2.5/src/components/Studios/StudioDetails/StudioEditPanel.tsx
index c8cfd3a3e..ab2045aac 100644
--- a/ui/v2.5/src/components/Studios/StudioDetails/StudioEditPanel.tsx
+++ b/ui/v2.5/src/components/Studios/StudioDetails/StudioEditPanel.tsx
@@ -200,6 +200,7 @@ export const StudioEditPanel: React.FC<IStudioEditPanel> = ({
             onStashIDSelected(item);
             setIsStashIDSearchOpen(false);
           }}
+          initialQuery={studio.name ?? ""}
         />
       )}
 
diff --git a/ui/v2.5/src/components/Tags/TagDetails/TagEditPanel.tsx b/ui/v2.5/src/components/Tags/TagDetails/TagEditPanel.tsx
index a067470a9..d4784a5fe 100644
--- a/ui/v2.5/src/components/Tags/TagDetails/TagEditPanel.tsx
+++ b/ui/v2.5/src/components/Tags/TagDetails/TagEditPanel.tsx
@@ -213,6 +213,7 @@ export const TagEditPanel: React.FC<ITagEditPanel> = ({
             onStashIDSelected(item);
             setIsStashIDSearchOpen(false);
           }}
+          initialQuery={tag?.name ?? ""}
         />
       )}
 

From 6eed5390e1b0efdab44187de785d31c31aeb3d61 Mon Sep 17 00:00:00 2001
From: feederbox826 <me@feederbox.cc>
Date: Mon, 5 Jan 2026 19:12:03 -0500
Subject: [PATCH 241/405] specify URL for stash ID endpoint (#6464)

---
 ui/v2.5/src/locales/en-GB.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/v2.5/src/locales/en-GB.json b/ui/v2.5/src/locales/en-GB.json
index 426440fad..f165c03cd 100644
--- a/ui/v2.5/src/locales/en-GB.json
+++ b/ui/v2.5/src/locales/en-GB.json
@@ -1459,7 +1459,7 @@
     "welcome_to_stash": "Welcome to Stash"
   },
   "stash_id": "Stash ID",
-  "stash_id_endpoint": "Stash ID Endpoint",
+  "stash_id_endpoint": "Stash ID Endpoint URL",
   "stash_ids": "Stash IDs",
   "stashbox_search": {
     "header": "Search {entityType} from StashBox",

From 3b5e1db2aa53befb2ee0536b5015e2d10c74fc12 Mon Sep 17 00:00:00 2001
From: CJ <72030708+cj12312021@users.noreply.github.com>
Date: Mon, 5 Jan 2026 18:12:59 -0600
Subject: [PATCH 242/405] feat(ui): make CustomFieldsInput patchable via
 PluginApi (#6468)

Wrap the CustomFieldsInput component with PatchComponent to allow
plugins to modify custom field input behavior. This enables plugins
to inject default fields, modify the onChange handler, or customize
the component rendering.
---
 .../src/components/Shared/CustomFields.tsx    | 246 +++++++++---------
 ui/v2.5/src/docs/en/Manual/UIPluginApi.md     |   1 +
 2 files changed, 123 insertions(+), 124 deletions(-)

diff --git a/ui/v2.5/src/components/Shared/CustomFields.tsx b/ui/v2.5/src/components/Shared/CustomFields.tsx
index e7355df66..c8d389a17 100644
--- a/ui/v2.5/src/components/Shared/CustomFields.tsx
+++ b/ui/v2.5/src/components/Shared/CustomFields.tsx
@@ -189,136 +189,134 @@ interface ICustomFieldsInput {
   setError: (error?: string) => void;
 }
 
-export const CustomFieldsInput: React.FC<ICustomFieldsInput> = ({
-  values,
-  error,
-  onChange,
-  setError,
-}) => {
-  const intl = useIntl();
+export const CustomFieldsInput: React.FC<ICustomFieldsInput> = PatchComponent(
+  "CustomFieldsInput",
+  ({ values, error, onChange, setError }) => {
+    const intl = useIntl();
 
-  const [newCustomField, setNewCustomField] = useState<ICustomField>({
-    field: "",
-    value: "",
-  });
+    const [newCustomField, setNewCustomField] = useState<ICustomField>({
+      field: "",
+      value: "",
+    });
 
-  const fields = useMemo(() => {
-    const valueCopy = cloneDeep(values);
-    if (newCustomField.field !== "" && error === undefined) {
-      delete valueCopy[newCustomField.field];
+    const fields = useMemo(() => {
+      const valueCopy = cloneDeep(values);
+      if (newCustomField.field !== "" && error === undefined) {
+        delete valueCopy[newCustomField.field];
+      }
+
+      const ret = Object.keys(valueCopy);
+      ret.sort();
+      return ret;
+    }, [values, newCustomField, error]);
+
+    function onSetNewField(v: ICustomField) {
+      // validate the field name
+      let newError = undefined;
+      if (v.field.length > maxFieldNameLength) {
+        newError = intl.formatMessage({
+          id: "errors.custom_fields.field_name_length",
+        });
+      }
+      if (v.field.trim() === "" && v.value !== "") {
+        newError = intl.formatMessage({
+          id: "errors.custom_fields.field_name_required",
+        });
+      }
+      if (v.field.trim() !== v.field) {
+        newError = intl.formatMessage({
+          id: "errors.custom_fields.field_name_whitespace",
+        });
+      }
+      if (fields.includes(v.field)) {
+        newError = intl.formatMessage({
+          id: "errors.custom_fields.duplicate_field",
+        });
+      }
+
+      const oldField = newCustomField;
+
+      setNewCustomField(v);
+
+      const valuesCopy = cloneDeep(values);
+      if (oldField.field !== "" && error === undefined) {
+        delete valuesCopy[oldField.field];
+      }
+
+      // if valid, pass up
+      if (!newError && v.field !== "") {
+        valuesCopy[v.field] = v.value;
+      }
+
+      onChange(valuesCopy);
+      setError(newError);
     }
 
-    const ret = Object.keys(valueCopy);
-    ret.sort();
-    return ret;
-  }, [values, newCustomField, error]);
-
-  function onSetNewField(v: ICustomField) {
-    // validate the field name
-    let newError = undefined;
-    if (v.field.length > maxFieldNameLength) {
-      newError = intl.formatMessage({
-        id: "errors.custom_fields.field_name_length",
-      });
-    }
-    if (v.field.trim() === "" && v.value !== "") {
-      newError = intl.formatMessage({
-        id: "errors.custom_fields.field_name_required",
-      });
-    }
-    if (v.field.trim() !== v.field) {
-      newError = intl.formatMessage({
-        id: "errors.custom_fields.field_name_whitespace",
-      });
-    }
-    if (fields.includes(v.field)) {
-      newError = intl.formatMessage({
-        id: "errors.custom_fields.duplicate_field",
-      });
+    function onAdd() {
+      const newValues = {
+        ...values,
+        [newCustomField.field]: newCustomField.value,
+      };
+      setNewCustomField({ field: "", value: "" });
+      onChange(newValues);
     }
 
-    const oldField = newCustomField;
-
-    setNewCustomField(v);
-
-    const valuesCopy = cloneDeep(values);
-    if (oldField.field !== "" && error === undefined) {
-      delete valuesCopy[oldField.field];
+    function fieldChanged(
+      currentField: string,
+      newField: string,
+      value: unknown
+    ) {
+      let newValues = cloneDeep(values);
+      delete newValues[currentField];
+      if (newField !== "") {
+        newValues[newField] = value;
+      }
+      onChange(newValues);
     }
 
-    // if valid, pass up
-    if (!newError && v.field !== "") {
-      valuesCopy[v.field] = v.value;
-    }
-
-    onChange(valuesCopy);
-    setError(newError);
-  }
-
-  function onAdd() {
-    const newValues = {
-      ...values,
-      [newCustomField.field]: newCustomField.value,
-    };
-    setNewCustomField({ field: "", value: "" });
-    onChange(newValues);
-  }
-
-  function fieldChanged(
-    currentField: string,
-    newField: string,
-    value: unknown
-  ) {
-    let newValues = cloneDeep(values);
-    delete newValues[currentField];
-    if (newField !== "") {
-      newValues[newField] = value;
-    }
-    onChange(newValues);
-  }
-
-  return (
-    <CollapseButton
-      className="custom-fields-input"
-      text={intl.formatMessage({ id: "custom_fields.title" })}
-    >
-      <Row>
-        <Col xl={12}>
-          <Row className="custom-fields-input-header">
-            <Form.Label column sm={3} xl={2}>
-              <FormattedMessage id="custom_fields.field" />
-            </Form.Label>
-            <Form.Label column sm={9} xl={7}>
-              <FormattedMessage id="custom_fields.value" />
-            </Form.Label>
-          </Row>
-          {fields.map((field) => (
-            <CustomFieldInput
-              key={field}
-              field={field}
-              value={values[field]}
-              onChange={(newField, newValue) =>
-                fieldChanged(field, newField, newValue)
-              }
-            />
-          ))}
-          <CustomFieldInput
-            field={newCustomField.field}
-            value={newCustomField.value}
-            error={error}
-            onChange={(field, value) => onSetNewField({ field, value })}
-            isNew
-          />
-        </Col>
-      </Row>
-      <Button
-        className="custom-fields-add"
-        variant="success"
-        onClick={() => onAdd()}
-        disabled={newCustomField.field === "" || error !== undefined}
+    return (
+      <CollapseButton
+        className="custom-fields-input"
+        text={intl.formatMessage({ id: "custom_fields.title" })}
       >
-        <Icon icon={faPlus} />
-      </Button>
-    </CollapseButton>
-  );
-};
+        <Row>
+          <Col xl={12}>
+            <Row className="custom-fields-input-header">
+              <Form.Label column sm={3} xl={2}>
+                <FormattedMessage id="custom_fields.field" />
+              </Form.Label>
+              <Form.Label column sm={9} xl={7}>
+                <FormattedMessage id="custom_fields.value" />
+              </Form.Label>
+            </Row>
+            {fields.map((field) => (
+              <CustomFieldInput
+                key={field}
+                field={field}
+                value={values[field]}
+                onChange={(newField, newValue) =>
+                  fieldChanged(field, newField, newValue)
+                }
+              />
+            ))}
+            <CustomFieldInput
+              field={newCustomField.field}
+              value={newCustomField.value}
+              error={error}
+              onChange={(field, value) => onSetNewField({ field, value })}
+              isNew
+            />
+          </Col>
+        </Row>
+        <Button
+          className="custom-fields-add"
+          variant="success"
+          onClick={() => onAdd()}
+          disabled={newCustomField.field === "" || error !== undefined}
+        >
+          <Icon icon={faPlus} />
+        </Button>
+      </CollapseButton>
+    );
+  }
+);
diff --git a/ui/v2.5/src/docs/en/Manual/UIPluginApi.md b/ui/v2.5/src/docs/en/Manual/UIPluginApi.md
index 67d837ed7..e1347a46f 100644
--- a/ui/v2.5/src/docs/en/Manual/UIPluginApi.md
+++ b/ui/v2.5/src/docs/en/Manual/UIPluginApi.md
@@ -223,6 +223,7 @@ Returns `void`.
 - `CountrySelect`
 - `CustomFieldInput`
 - `CustomFields`
+- `CustomFieldsInput`
 - `DateInput`
 - `DetailImage`
 - `ExternalLinkButtons`

From 1e6bf74385f276926a0345d9eebeee6c0b83b5e8 Mon Sep 17 00:00:00 2001
From: Valkyr-JS <154020147+Valkyr-JS@users.noreply.github.com>
Date: Tue, 6 Jan 2026 00:14:48 +0000
Subject: [PATCH 243/405] Plugin API more patchable components (#6463)

* StudioDetailsPanel
* StudioCard
* GridCard
* ImageGridCard
* ImageCard
* GroupCard
* SceneMarkerCard.Popovers
* SceneMarkerCard.Details
* SceneMarkerCard.Image
* SceneMarkerCard
---
 ui/v2.5/src/components/Groups/GroupCard.tsx   | 252 ++++++-------
 ui/v2.5/src/components/Images/ImageCard.tsx   | 320 ++++++++---------
 .../src/components/Scenes/SceneMarkerCard.tsx | 285 ++++++++-------
 .../components/Shared/GridCard/GridCard.tsx   | 196 ++++++-----
 ui/v2.5/src/components/Studios/StudioCard.tsx | 332 +++++++++---------
 .../StudioDetails/StudioDetailsPanel.tsx      | 143 ++++----
 ui/v2.5/src/pluginApi.d.ts                    |   9 +
 7 files changed, 790 insertions(+), 747 deletions(-)

diff --git a/ui/v2.5/src/components/Groups/GroupCard.tsx b/ui/v2.5/src/components/Groups/GroupCard.tsx
index 7412c986a..b9b206985 100644
--- a/ui/v2.5/src/components/Groups/GroupCard.tsx
+++ b/ui/v2.5/src/components/Groups/GroupCard.tsx
@@ -1,6 +1,7 @@
 import React, { useMemo } from "react";
 import { Button, ButtonGroup } from "react-bootstrap";
 import * as GQL from "src/core/generated-graphql";
+import { PatchComponent } from "src/patch";
 import { GridCard } from "../Shared/GridCard/GridCard";
 import { HoverPopover } from "../Shared/HoverPopover";
 import { Icon } from "../Shared/Icon";
@@ -47,137 +48,140 @@ interface IProps {
   onMove?: (srcIds: string[], targetId: string, after: boolean) => void;
 }
 
-export const GroupCard: React.FC<IProps> = ({
-  group,
-  sceneNumber,
-  cardWidth,
-  selecting,
-  selected,
-  zoomIndex,
-  onSelectedChanged,
-  fromGroupId,
-  onMove,
-}) => {
-  const groupDescription = useMemo(() => {
-    if (!fromGroupId) {
-      return undefined;
-    }
+export const GroupCard: React.FC<IProps> = PatchComponent(
+  "GroupCard",
+  ({
+    group,
+    sceneNumber,
+    cardWidth,
+    selecting,
+    selected,
+    zoomIndex,
+    onSelectedChanged,
+    fromGroupId,
+    onMove,
+  }) => {
+    const groupDescription = useMemo(() => {
+      if (!fromGroupId) {
+        return undefined;
+      }
 
-    const containingGroup = group.containing_groups.find(
-      (cg) => cg.group.id === fromGroupId
-    );
+      const containingGroup = group.containing_groups.find(
+        (cg) => cg.group.id === fromGroupId
+      );
 
-    return containingGroup?.description ?? undefined;
-  }, [fromGroupId, group.containing_groups]);
+      return containingGroup?.description ?? undefined;
+    }, [fromGroupId, group.containing_groups]);
 
-  function maybeRenderScenesPopoverButton() {
-    if (group.scenes.length === 0) return;
+    function maybeRenderScenesPopoverButton() {
+      if (group.scenes.length === 0) return;
 
-    const popoverContent = group.scenes.map((scene) => (
-      <SceneLink key={scene.id} scene={scene} />
-    ));
+      const popoverContent = group.scenes.map((scene) => (
+        <SceneLink key={scene.id} scene={scene} />
+      ));
 
-    return (
-      <HoverPopover
-        className="scene-count"
-        placement="bottom"
-        content={popoverContent}
-      >
-        <Button className="minimal">
-          <Icon icon={faPlayCircle} />
-          <span>{group.scenes.length}</span>
-        </Button>
-      </HoverPopover>
-    );
-  }
-
-  function maybeRenderTagPopoverButton() {
-    if (group.tags.length <= 0) return;
-
-    const popoverContent = group.tags.map((tag) => (
-      <TagLink key={tag.id} linkType="group" tag={tag} />
-    ));
-
-    return (
-      <HoverPopover placement="bottom" content={popoverContent}>
-        <Button className="minimal tag-count">
-          <Icon icon={faTag} />
-          <span>{group.tags.length}</span>
-        </Button>
-      </HoverPopover>
-    );
-  }
-
-  function maybeRenderOCounter() {
-    if (!group.o_counter) return;
-
-    return <OCounterButton value={group.o_counter} />;
-  }
-
-  function maybeRenderPopoverButtonGroup() {
-    if (
-      sceneNumber ||
-      groupDescription ||
-      group.scenes.length > 0 ||
-      group.tags.length > 0 ||
-      group.containing_groups.length > 0 ||
-      group.sub_group_count > 0
-    ) {
       return (
-        <>
-          <Description
-            sceneNumber={sceneNumber}
-            description={groupDescription}
-          />
-          <hr />
-          <ButtonGroup className="card-popovers">
-            {maybeRenderScenesPopoverButton()}
-            {maybeRenderTagPopoverButton()}
-            {(group.sub_group_count > 0 ||
-              group.containing_groups.length > 0) && (
-              <RelatedGroupPopoverButton group={group} />
-            )}
-            {maybeRenderOCounter()}
-          </ButtonGroup>
-        </>
+        <HoverPopover
+          className="scene-count"
+          placement="bottom"
+          content={popoverContent}
+        >
+          <Button className="minimal">
+            <Icon icon={faPlayCircle} />
+            <span>{group.scenes.length}</span>
+          </Button>
+        </HoverPopover>
       );
     }
-  }
 
-  return (
-    <GridCard
-      className={`group-card zoom-${zoomIndex}`}
-      objectId={group.id}
-      onMove={onMove}
-      url={`/groups/${group.id}`}
-      width={cardWidth}
-      title={group.name}
-      linkClassName="group-card-header"
-      image={
-        <>
-          <img
-            loading="lazy"
-            className="group-card-image"
-            alt={group.name ?? ""}
-            src={group.front_image_path ?? ""}
-          />
-          <RatingBanner rating={group.rating100} />
-        </>
+    function maybeRenderTagPopoverButton() {
+      if (group.tags.length <= 0) return;
+
+      const popoverContent = group.tags.map((tag) => (
+        <TagLink key={tag.id} linkType="group" tag={tag} />
+      ));
+
+      return (
+        <HoverPopover placement="bottom" content={popoverContent}>
+          <Button className="minimal tag-count">
+            <Icon icon={faTag} />
+            <span>{group.tags.length}</span>
+          </Button>
+        </HoverPopover>
+      );
+    }
+
+    function maybeRenderOCounter() {
+      if (!group.o_counter) return;
+
+      return <OCounterButton value={group.o_counter} />;
+    }
+
+    function maybeRenderPopoverButtonGroup() {
+      if (
+        sceneNumber ||
+        groupDescription ||
+        group.scenes.length > 0 ||
+        group.tags.length > 0 ||
+        group.containing_groups.length > 0 ||
+        group.sub_group_count > 0
+      ) {
+        return (
+          <>
+            <Description
+              sceneNumber={sceneNumber}
+              description={groupDescription}
+            />
+            <hr />
+            <ButtonGroup className="card-popovers">
+              {maybeRenderScenesPopoverButton()}
+              {maybeRenderTagPopoverButton()}
+              {(group.sub_group_count > 0 ||
+                group.containing_groups.length > 0) && (
+                <RelatedGroupPopoverButton group={group} />
+              )}
+              {maybeRenderOCounter()}
+            </ButtonGroup>
+          </>
+        );
       }
-      details={
-        <div className="group-card__details">
-          <span className="group-card__date">{group.date}</span>
-          <TruncatedText
-            className="group-card__description"
-            text={group.synopsis}
-            lineCount={3}
-          />
-        </div>
-      }
-      selected={selected}
-      selecting={selecting}
-      onSelectedChanged={onSelectedChanged}
-      popovers={maybeRenderPopoverButtonGroup()}
-    />
-  );
-};
+    }
+
+    return (
+      <GridCard
+        className={`group-card zoom-${zoomIndex}`}
+        objectId={group.id}
+        onMove={onMove}
+        url={`/groups/${group.id}`}
+        width={cardWidth}
+        title={group.name}
+        linkClassName="group-card-header"
+        image={
+          <>
+            <img
+              loading="lazy"
+              className="group-card-image"
+              alt={group.name ?? ""}
+              src={group.front_image_path ?? ""}
+            />
+            <RatingBanner rating={group.rating100} />
+          </>
+        }
+        details={
+          <div className="group-card__details">
+            <span className="group-card__date">{group.date}</span>
+            <TruncatedText
+              className="group-card__description"
+              text={group.synopsis}
+              lineCount={3}
+            />
+          </div>
+        }
+        selected={selected}
+        selecting={selecting}
+        onSelectedChanged={onSelectedChanged}
+        popovers={maybeRenderPopoverButtonGroup()}
+      />
+    );
+  }
+);
diff --git a/ui/v2.5/src/components/Images/ImageCard.tsx b/ui/v2.5/src/components/Images/ImageCard.tsx
index a22e48139..0b60a77ff 100644
--- a/ui/v2.5/src/components/Images/ImageCard.tsx
+++ b/ui/v2.5/src/components/Images/ImageCard.tsx
@@ -15,6 +15,7 @@ import {
   faTag,
 } from "@fortawesome/free-solid-svg-icons";
 import { imageTitle } from "src/core/files";
+import { PatchComponent } from "src/patch";
 import { TruncatedText } from "../Shared/TruncatedText";
 import { StudioOverlay } from "../Shared/GridCard/StudioOverlay";
 import { OCounterButton } from "../Shared/CountButton";
@@ -29,168 +30,171 @@ interface IImageCardProps {
   onPreview?: (ev: MouseEvent) => void;
 }
 
-export const ImageCard: React.FC<IImageCardProps> = (
-  props: IImageCardProps
-) => {
-  const file = useMemo(
-    () =>
-      props.image.visual_files.length > 0
-        ? props.image.visual_files[0]
-        : undefined,
-    [props.image]
-  );
-
-  function maybeRenderTagPopoverButton() {
-    if (props.image.tags.length <= 0) return;
-
-    const popoverContent = props.image.tags.map((tag) => (
-      <TagLink key={tag.id} tag={tag} linkType="image" />
-    ));
-
-    return (
-      <HoverPopover
-        className="tag-count"
-        placement="bottom"
-        content={popoverContent}
-      >
-        <Button className="minimal">
-          <Icon icon={faTag} />
-          <span>{props.image.tags.length}</span>
-        </Button>
-      </HoverPopover>
+export const ImageCard: React.FC<IImageCardProps> = PatchComponent(
+  "ImageCard",
+  (props: IImageCardProps) => {
+    const file = useMemo(
+      () =>
+        props.image.visual_files.length > 0
+          ? props.image.visual_files[0]
+          : undefined,
+      [props.image]
     );
-  }
 
-  function maybeRenderPerformerPopoverButton() {
-    if (props.image.performers.length <= 0) return;
+    function maybeRenderTagPopoverButton() {
+      if (props.image.tags.length <= 0) return;
+
+      const popoverContent = props.image.tags.map((tag) => (
+        <TagLink key={tag.id} tag={tag} linkType="image" />
+      ));
+
+      return (
+        <HoverPopover
+          className="tag-count"
+          placement="bottom"
+          content={popoverContent}
+        >
+          <Button className="minimal">
+            <Icon icon={faTag} />
+            <span>{props.image.tags.length}</span>
+          </Button>
+        </HoverPopover>
+      );
+    }
+
+    function maybeRenderPerformerPopoverButton() {
+      if (props.image.performers.length <= 0) return;
+
+      return (
+        <PerformerPopoverButton
+          performers={props.image.performers}
+          linkType="image"
+        />
+      );
+    }
+
+    function maybeRenderOCounter() {
+      if (props.image.o_counter) {
+        return <OCounterButton value={props.image.o_counter} />;
+      }
+    }
+
+    function maybeRenderGallery() {
+      if (props.image.galleries.length <= 0) return;
+
+      const popoverContent = props.image.galleries.map((gallery) => (
+        <GalleryLink key={gallery.id} gallery={gallery} />
+      ));
+
+      return (
+        <HoverPopover
+          className="gallery-count"
+          placement="bottom"
+          content={popoverContent}
+        >
+          <Button className="minimal">
+            <Icon icon={faImages} />
+            <span>{props.image.galleries.length}</span>
+          </Button>
+        </HoverPopover>
+      );
+    }
+
+    function maybeRenderOrganized() {
+      if (props.image.organized) {
+        return (
+          <div className="organized">
+            <Button className="minimal">
+              <Icon icon={faBox} />
+            </Button>
+          </div>
+        );
+      }
+    }
+
+    function maybeRenderPopoverButtonGroup() {
+      if (
+        props.image.tags.length > 0 ||
+        props.image.performers.length > 0 ||
+        props.image.o_counter ||
+        props.image.galleries.length > 0 ||
+        props.image.organized
+      ) {
+        return (
+          <>
+            <hr />
+            <ButtonGroup className="card-popovers">
+              {maybeRenderTagPopoverButton()}
+              {maybeRenderPerformerPopoverButton()}
+              {maybeRenderOCounter()}
+              {maybeRenderGallery()}
+              {maybeRenderOrganized()}
+            </ButtonGroup>
+          </>
+        );
+      }
+    }
+
+    function isPortrait() {
+      const width = file?.width ? file.width : 0;
+      const height = file?.height ? file.height : 0;
+      return height > width;
+    }
+
+    const source =
+      props.image.paths.preview != ""
+        ? props.image.paths.preview ?? ""
+        : props.image.paths.thumbnail ?? "";
+    const video = source.includes("preview");
+    const ImagePreview = video ? "video" : "img";
 
     return (
-      <PerformerPopoverButton
-        performers={props.image.performers}
-        linkType="image"
+      <GridCard
+        className={`image-card zoom-${props.zoomIndex}`}
+        url={`/images/${props.image.id}`}
+        width={props.cardWidth}
+        title={imageTitle(props.image)}
+        linkClassName="image-card-link"
+        image={
+          <>
+            <div
+              className={cx("image-card-preview", { portrait: isPortrait() })}
+            >
+              <ImagePreview
+                loop={video}
+                autoPlay={video}
+                playsInline={video}
+                className="image-card-preview-image"
+                alt={props.image.title ?? ""}
+                src={source}
+              />
+              {props.onPreview ? (
+                <div className="preview-button">
+                  <Button onClick={props.onPreview}>
+                    <Icon icon={faSearch} />
+                  </Button>
+                </div>
+              ) : undefined}
+            </div>
+            <RatingBanner rating={props.image.rating100} />
+          </>
+        }
+        details={
+          <div className="image-card__details">
+            <span className="image-card__date">{props.image.date}</span>
+            <TruncatedText
+              className="image-card__description"
+              text={props.image.details}
+              lineCount={3}
+            />
+          </div>
+        }
+        overlays={<StudioOverlay studio={props.image.studio} />}
+        popovers={maybeRenderPopoverButtonGroup()}
+        selected={props.selected}
+        selecting={props.selecting}
+        onSelectedChanged={props.onSelectedChanged}
       />
     );
   }
-
-  function maybeRenderOCounter() {
-    if (props.image.o_counter) {
-      return <OCounterButton value={props.image.o_counter} />;
-    }
-  }
-
-  function maybeRenderGallery() {
-    if (props.image.galleries.length <= 0) return;
-
-    const popoverContent = props.image.galleries.map((gallery) => (
-      <GalleryLink key={gallery.id} gallery={gallery} />
-    ));
-
-    return (
-      <HoverPopover
-        className="gallery-count"
-        placement="bottom"
-        content={popoverContent}
-      >
-        <Button className="minimal">
-          <Icon icon={faImages} />
-          <span>{props.image.galleries.length}</span>
-        </Button>
-      </HoverPopover>
-    );
-  }
-
-  function maybeRenderOrganized() {
-    if (props.image.organized) {
-      return (
-        <div className="organized">
-          <Button className="minimal">
-            <Icon icon={faBox} />
-          </Button>
-        </div>
-      );
-    }
-  }
-
-  function maybeRenderPopoverButtonGroup() {
-    if (
-      props.image.tags.length > 0 ||
-      props.image.performers.length > 0 ||
-      props.image.o_counter ||
-      props.image.galleries.length > 0 ||
-      props.image.organized
-    ) {
-      return (
-        <>
-          <hr />
-          <ButtonGroup className="card-popovers">
-            {maybeRenderTagPopoverButton()}
-            {maybeRenderPerformerPopoverButton()}
-            {maybeRenderOCounter()}
-            {maybeRenderGallery()}
-            {maybeRenderOrganized()}
-          </ButtonGroup>
-        </>
-      );
-    }
-  }
-
-  function isPortrait() {
-    const width = file?.width ? file.width : 0;
-    const height = file?.height ? file.height : 0;
-    return height > width;
-  }
-
-  const source =
-    props.image.paths.preview != ""
-      ? props.image.paths.preview ?? ""
-      : props.image.paths.thumbnail ?? "";
-  const video = source.includes("preview");
-  const ImagePreview = video ? "video" : "img";
-
-  return (
-    <GridCard
-      className={`image-card zoom-${props.zoomIndex}`}
-      url={`/images/${props.image.id}`}
-      width={props.cardWidth}
-      title={imageTitle(props.image)}
-      linkClassName="image-card-link"
-      image={
-        <>
-          <div className={cx("image-card-preview", { portrait: isPortrait() })}>
-            <ImagePreview
-              loop={video}
-              autoPlay={video}
-              playsInline={video}
-              className="image-card-preview-image"
-              alt={props.image.title ?? ""}
-              src={source}
-            />
-            {props.onPreview ? (
-              <div className="preview-button">
-                <Button onClick={props.onPreview}>
-                  <Icon icon={faSearch} />
-                </Button>
-              </div>
-            ) : undefined}
-          </div>
-          <RatingBanner rating={props.image.rating100} />
-        </>
-      }
-      details={
-        <div className="image-card__details">
-          <span className="image-card__date">{props.image.date}</span>
-          <TruncatedText
-            className="image-card__description"
-            text={props.image.details}
-            lineCount={3}
-          />
-        </div>
-      }
-      overlays={<StudioOverlay studio={props.image.studio} />}
-      popovers={maybeRenderPopoverButtonGroup()}
-      selected={props.selected}
-      selecting={props.selecting}
-      onSelectedChanged={props.onSelectedChanged}
-    />
-  );
-};
+);
diff --git a/ui/v2.5/src/components/Scenes/SceneMarkerCard.tsx b/ui/v2.5/src/components/Scenes/SceneMarkerCard.tsx
index e76beda0a..96961d68b 100644
--- a/ui/v2.5/src/components/Scenes/SceneMarkerCard.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneMarkerCard.tsx
@@ -12,6 +12,7 @@ import { faTag } from "@fortawesome/free-solid-svg-icons";
 import { markerTitle } from "src/core/markers";
 import { Link } from "react-router-dom";
 import { objectTitle } from "src/core/files";
+import { PatchComponent } from "src/patch";
 import { PerformerPopoverButton } from "../Shared/PerformerPopoverButton";
 import { ScenePreview } from "./SceneCard";
 import { TruncatedText } from "../Shared/TruncatedText";
@@ -28,154 +29,166 @@ interface ISceneMarkerCardProps {
   onSelectedChanged?: (selected: boolean, shiftKey: boolean) => void;
 }
 
-const SceneMarkerCardPopovers = (props: ISceneMarkerCardProps) => {
-  function maybeRenderPerformerPopoverButton() {
-    if (props.marker.scene.performers.length <= 0) return;
+const SceneMarkerCardPopovers = PatchComponent(
+  "SceneMarkerCard.Popovers",
+  (props: ISceneMarkerCardProps) => {
+    function maybeRenderPerformerPopoverButton() {
+      if (props.marker.scene.performers.length <= 0) return;
 
-    return (
-      <PerformerPopoverButton
-        performers={props.marker.scene.performers}
-        linkType="scene_marker"
-      />
-    );
-  }
-
-  function renderTagPopoverButton() {
-    const popoverContent = [
-      <TagLink
-        key={props.marker.primary_tag.id}
-        tag={props.marker.primary_tag}
-        linkType="scene_marker"
-      />,
-    ];
-
-    props.marker.tags.map((tag) =>
-      popoverContent.push(
-        <TagLink key={tag.id} tag={tag} linkType="scene_marker" />
-      )
-    );
-
-    return (
-      <HoverPopover
-        className="tag-count"
-        placement="bottom"
-        content={popoverContent}
-      >
-        <Button className="minimal">
-          <Icon icon={faTag} />
-          <span>{popoverContent.length}</span>
-        </Button>
-      </HoverPopover>
-    );
-  }
-
-  function renderPopoverButtonGroup() {
-    if (!props.compact) {
       return (
-        <>
-          <hr />
-          <ButtonGroup className="card-popovers">
-            {maybeRenderPerformerPopoverButton()}
-            {renderTagPopoverButton()}
-          </ButtonGroup>
-        </>
+        <PerformerPopoverButton
+          performers={props.marker.scene.performers}
+          linkType="scene_marker"
+        />
       );
     }
+
+    function renderTagPopoverButton() {
+      const popoverContent = [
+        <TagLink
+          key={props.marker.primary_tag.id}
+          tag={props.marker.primary_tag}
+          linkType="scene_marker"
+        />,
+      ];
+
+      props.marker.tags.map((tag) =>
+        popoverContent.push(
+          <TagLink key={tag.id} tag={tag} linkType="scene_marker" />
+        )
+      );
+
+      return (
+        <HoverPopover
+          className="tag-count"
+          placement="bottom"
+          content={popoverContent}
+        >
+          <Button className="minimal">
+            <Icon icon={faTag} />
+            <span>{popoverContent.length}</span>
+          </Button>
+        </HoverPopover>
+      );
+    }
+
+    function renderPopoverButtonGroup() {
+      if (!props.compact) {
+        return (
+          <>
+            <hr />
+            <ButtonGroup className="card-popovers">
+              {maybeRenderPerformerPopoverButton()}
+              {renderTagPopoverButton()}
+            </ButtonGroup>
+          </>
+        );
+      }
+    }
+
+    return <>{renderPopoverButtonGroup()}</>;
   }
+);
 
-  return <>{renderPopoverButtonGroup()}</>;
-};
-
-const SceneMarkerCardDetails = (props: ISceneMarkerCardProps) => {
-  return (
-    <div className="scene-marker-card__details">
-      <span className="scene-marker-card__time">
-        {TextUtils.formatTimestampRange(
-          props.marker.seconds,
-          props.marker.end_seconds ?? undefined
-        )}
-      </span>
-      <TruncatedText
-        className="scene-marker-card__scene"
-        lineCount={3}
-        text={
-          <Link to={NavUtils.makeSceneMarkersSceneUrl(props.marker.scene)}>
-            {objectTitle(props.marker.scene)}
-          </Link>
-        }
-      />
-    </div>
-  );
-};
-
-const SceneMarkerCardImage = (props: ISceneMarkerCardProps) => {
-  const { configuration } = useConfigurationContext();
-
-  const file = useMemo(
-    () =>
-      props.marker.scene.files.length > 0
-        ? props.marker.scene.files[0]
-        : undefined,
-    [props.marker.scene]
-  );
-
-  function isPortrait() {
-    const width = file?.width ? file.width : 0;
-    const height = file?.height ? file.height : 0;
-    return height > width;
-  }
-
-  function maybeRenderSceneSpecsOverlay() {
+const SceneMarkerCardDetails = PatchComponent(
+  "SceneMarkerCard.Details",
+  (props: ISceneMarkerCardProps) => {
     return (
-      <div className="scene-specs-overlay">
-        {props.marker.end_seconds && (
-          <span className="overlay-duration">
-            {TextUtils.secondsToTimestamp(
-              props.marker.end_seconds - props.marker.seconds
-            )}
-          </span>
-        )}
+      <div className="scene-marker-card__details">
+        <span className="scene-marker-card__time">
+          {TextUtils.formatTimestampRange(
+            props.marker.seconds,
+            props.marker.end_seconds ?? undefined
+          )}
+        </span>
+        <TruncatedText
+          className="scene-marker-card__scene"
+          lineCount={3}
+          text={
+            <Link to={NavUtils.makeSceneMarkersSceneUrl(props.marker.scene)}>
+              {objectTitle(props.marker.scene)}
+            </Link>
+          }
+        />
       </div>
     );
   }
+);
 
-  return (
-    <>
-      <ScenePreview
-        image={props.marker.screenshot ?? undefined}
-        video={props.marker.stream ?? undefined}
-        soundActive={configuration?.interface?.soundOnPreview ?? false}
-        isPortrait={isPortrait()}
-      />
-      {maybeRenderSceneSpecsOverlay()}
-    </>
-  );
-};
+const SceneMarkerCardImage = PatchComponent(
+  "SceneMarkerCard.Image",
+  (props: ISceneMarkerCardProps) => {
+    const { configuration } = useConfigurationContext();
 
-export const SceneMarkerCard = (props: ISceneMarkerCardProps) => {
-  function zoomIndex() {
-    if (!props.compact && props.zoomIndex !== undefined) {
-      return `zoom-${props.zoomIndex}`;
+    const file = useMemo(
+      () =>
+        props.marker.scene.files.length > 0
+          ? props.marker.scene.files[0]
+          : undefined,
+      [props.marker.scene]
+    );
+
+    function isPortrait() {
+      const width = file?.width ? file.width : 0;
+      const height = file?.height ? file.height : 0;
+      return height > width;
     }
 
-    return "";
-  }
+    function maybeRenderSceneSpecsOverlay() {
+      return (
+        <div className="scene-specs-overlay">
+          {props.marker.end_seconds && (
+            <span className="overlay-duration">
+              {TextUtils.secondsToTimestamp(
+                props.marker.end_seconds - props.marker.seconds
+              )}
+            </span>
+          )}
+        </div>
+      );
+    }
 
-  return (
-    <GridCard
-      className={`scene-marker-card ${zoomIndex()}`}
-      url={NavUtils.makeSceneMarkerUrl(props.marker)}
-      title={markerTitle(props.marker)}
-      width={props.cardWidth}
-      linkClassName="scene-marker-card-link"
-      thumbnailSectionClassName="video-section"
-      resumeTime={props.marker.seconds}
-      image={<SceneMarkerCardImage {...props} />}
-      details={<SceneMarkerCardDetails {...props} />}
-      popovers={<SceneMarkerCardPopovers {...props} />}
-      selected={props.selected}
-      selecting={props.selecting}
-      onSelectedChanged={props.onSelectedChanged}
-    />
-  );
-};
+    return (
+      <>
+        <ScenePreview
+          image={props.marker.screenshot ?? undefined}
+          video={props.marker.stream ?? undefined}
+          soundActive={configuration?.interface?.soundOnPreview ?? false}
+          isPortrait={isPortrait()}
+        />
+        {maybeRenderSceneSpecsOverlay()}
+      </>
+    );
+  }
+);
+
+export const SceneMarkerCard = PatchComponent(
+  "SceneMarkerCard",
+  (props: ISceneMarkerCardProps) => {
+    function zoomIndex() {
+      if (!props.compact && props.zoomIndex !== undefined) {
+        return `zoom-${props.zoomIndex}`;
+      }
+
+      return "";
+    }
+
+    return (
+      <GridCard
+        className={`scene-marker-card ${zoomIndex()}`}
+        url={NavUtils.makeSceneMarkerUrl(props.marker)}
+        title={markerTitle(props.marker)}
+        width={props.cardWidth}
+        linkClassName="scene-marker-card-link"
+        thumbnailSectionClassName="video-section"
+        resumeTime={props.marker.seconds}
+        image={<SceneMarkerCardImage {...props} />}
+        details={<SceneMarkerCardDetails {...props} />}
+        popovers={<SceneMarkerCardPopovers {...props} />}
+        selected={props.selected}
+        selecting={props.selecting}
+        onSelectedChanged={props.onSelectedChanged}
+      />
+    );
+  }
+);
diff --git a/ui/v2.5/src/components/Shared/GridCard/GridCard.tsx b/ui/v2.5/src/components/Shared/GridCard/GridCard.tsx
index ecb914fa1..7bdac36c6 100644
--- a/ui/v2.5/src/components/Shared/GridCard/GridCard.tsx
+++ b/ui/v2.5/src/components/Shared/GridCard/GridCard.tsx
@@ -15,6 +15,7 @@ import { Icon } from "../Icon";
 import { faGripLines } from "@fortawesome/free-solid-svg-icons";
 import { DragSide, useDragMoveSelect } from "./dragMoveSelect";
 import { useDebounce } from "src/hooks/debounce";
+import { PatchComponent } from "src/patch";
 
 interface ICardProps {
   className?: string;
@@ -164,106 +165,113 @@ const MoveTarget: React.FC<{ dragSide: DragSide }> = ({ dragSide }) => {
   );
 };
 
-export const GridCard: React.FC<ICardProps> = (props: ICardProps) => {
-  const { setInHandle, moveTarget, dragProps } = useDragMoveSelect({
-    selecting: props.selecting || false,
-    selected: props.selected || false,
-    onSelectedChanged: props.onSelectedChanged,
-    objectId: props.objectId,
-    onMove: props.onMove,
-  });
+export const GridCard: React.FC<ICardProps> = PatchComponent(
+  "GridCard",
+  (props: ICardProps) => {
+    const { setInHandle, moveTarget, dragProps } = useDragMoveSelect({
+      selecting: props.selecting || false,
+      selected: props.selected || false,
+      onSelectedChanged: props.onSelectedChanged,
+      objectId: props.objectId,
+      onMove: props.onMove,
+    });
 
-  function handleImageClick(event: React.MouseEvent<HTMLElement, MouseEvent>) {
-    const { shiftKey } = event;
-
-    if (!props.onSelectedChanged) {
-      return;
-    }
-
-    if (props.selecting) {
-      props.onSelectedChanged(!props.selected, shiftKey);
-      event.preventDefault();
-      event.stopPropagation();
-    }
-  }
-
-  function maybeRenderInteractiveHeatmap() {
-    if (props.interactiveHeatmap) {
-      return (
-        <img
-          loading="lazy"
-          src={props.interactiveHeatmap}
-          alt="interactive heatmap"
-          className="interactive-heatmap"
-        />
-      );
-    }
-  }
-
-  function maybeRenderProgressBar() {
-    if (
-      props.resumeTime &&
-      props.duration &&
-      props.duration > props.resumeTime
+    function handleImageClick(
+      event: React.MouseEvent<HTMLElement, MouseEvent>
     ) {
-      const percentValue = (100 / props.duration) * props.resumeTime;
-      const percentStr = percentValue + "%";
-      return (
-        <div title={Math.round(percentValue) + "%"} className="progress-bar">
-          <div style={{ width: percentStr }} className="progress-indicator" />
-        </div>
-      );
-    }
-  }
+      const { shiftKey } = event;
 
-  return (
-    <Card
-      className={cx(props.className, "grid-card")}
-      onClick={handleImageClick}
-      {...dragProps}
-      style={
-        props.width && !ScreenUtils.isMobile()
-          ? { width: `${props.width}px` }
-          : {}
+      if (!props.onSelectedChanged) {
+        return;
       }
-    >
-      {moveTarget !== undefined && <MoveTarget dragSide={moveTarget} />}
-      <Controls>
-        {props.onSelectedChanged && (
-          <Checkbox
-            selected={props.selected}
-            onSelectedChanged={props.onSelectedChanged}
+
+      if (props.selecting) {
+        props.onSelectedChanged(!props.selected, shiftKey);
+        event.preventDefault();
+        event.stopPropagation();
+      }
+    }
+
+    function maybeRenderInteractiveHeatmap() {
+      if (props.interactiveHeatmap) {
+        return (
+          <img
+            loading="lazy"
+            src={props.interactiveHeatmap}
+            alt="interactive heatmap"
+            className="interactive-heatmap"
           />
-        )}
+        );
+      }
+    }
 
-        {!!props.objectId && props.onMove && (
-          <DragHandle setInHandle={setInHandle} />
-        )}
-      </Controls>
+    function maybeRenderProgressBar() {
+      if (
+        props.resumeTime &&
+        props.duration &&
+        props.duration > props.resumeTime
+      ) {
+        const percentValue = (100 / props.duration) * props.resumeTime;
+        const percentStr = percentValue + "%";
+        return (
+          <div title={Math.round(percentValue) + "%"} className="progress-bar">
+            <div style={{ width: percentStr }} className="progress-indicator" />
+          </div>
+        );
+      }
+    }
 
-      <div className={cx(props.thumbnailSectionClassName, "thumbnail-section")}>
-        <Link
-          to={props.url}
-          className={props.linkClassName}
-          onClick={handleImageClick}
+    return (
+      <Card
+        className={cx(props.className, "grid-card")}
+        onClick={handleImageClick}
+        {...dragProps}
+        style={
+          props.width && !ScreenUtils.isMobile()
+            ? { width: `${props.width}px` }
+            : {}
+        }
+      >
+        {moveTarget !== undefined && <MoveTarget dragSide={moveTarget} />}
+        <Controls>
+          {props.onSelectedChanged && (
+            <Checkbox
+              selected={props.selected}
+              onSelectedChanged={props.onSelectedChanged}
+            />
+          )}
+
+          {!!props.objectId && props.onMove && (
+            <DragHandle setInHandle={setInHandle} />
+          )}
+        </Controls>
+
+        <div
+          className={cx(props.thumbnailSectionClassName, "thumbnail-section")}
         >
-          {props.image}
-        </Link>
-        {props.overlays}
-        {maybeRenderProgressBar()}
-      </div>
-      {maybeRenderInteractiveHeatmap()}
-      <div className="card-section">
-        <Link to={props.url} onClick={handleImageClick}>
-          <h5 className="card-section-title flex-aligned">
-            {props.pretitleIcon}
-            <TruncatedText text={props.title} lineCount={2} />
-          </h5>
-        </Link>
-        {props.details}
-      </div>
+          <Link
+            to={props.url}
+            className={props.linkClassName}
+            onClick={handleImageClick}
+          >
+            {props.image}
+          </Link>
+          {props.overlays}
+          {maybeRenderProgressBar()}
+        </div>
+        {maybeRenderInteractiveHeatmap()}
+        <div className="card-section">
+          <Link to={props.url} onClick={handleImageClick}>
+            <h5 className="card-section-title flex-aligned">
+              {props.pretitleIcon}
+              <TruncatedText text={props.title} lineCount={2} />
+            </h5>
+          </Link>
+          {props.details}
+        </div>
 
-      {props.popovers}
-    </Card>
-  );
-};
+        {props.popovers}
+      </Card>
+    );
+  }
+);
diff --git a/ui/v2.5/src/components/Studios/StudioCard.tsx b/ui/v2.5/src/components/Studios/StudioCard.tsx
index 01b2b5c5a..87c9b9528 100644
--- a/ui/v2.5/src/components/Studios/StudioCard.tsx
+++ b/ui/v2.5/src/components/Studios/StudioCard.tsx
@@ -3,6 +3,7 @@ import { Link } from "react-router-dom";
 import * as GQL from "src/core/generated-graphql";
 import NavUtils from "src/utils/navigation";
 import { GridCard } from "src/components/Shared/GridCard/GridCard";
+import { PatchComponent } from "src/patch";
 import { HoverPopover } from "../Shared/HoverPopover";
 import { Icon } from "../Shared/Icon";
 import { TagLink } from "../Shared/TagLink";
@@ -70,179 +71,182 @@ function maybeRenderChildren(studio: GQL.StudioDataFragment) {
   }
 }
 
-export const StudioCard: React.FC<IProps> = ({
-  studio,
-  cardWidth,
-  hideParent,
-  selecting,
-  selected,
-  zoomIndex,
-  onSelectedChanged,
-}) => {
-  const [updateStudio] = useStudioUpdate();
+export const StudioCard: React.FC<IProps> = PatchComponent(
+  "StudioCard",
+  ({
+    studio,
+    cardWidth,
+    hideParent,
+    selecting,
+    selected,
+    zoomIndex,
+    onSelectedChanged,
+  }) => {
+    const [updateStudio] = useStudioUpdate();
 
-  function onToggleFavorite(v: boolean) {
-    if (studio.id) {
-      updateStudio({
-        variables: {
-          input: {
-            id: studio.id,
-            favorite: v,
+    function onToggleFavorite(v: boolean) {
+      if (studio.id) {
+        updateStudio({
+          variables: {
+            input: {
+              id: studio.id,
+              favorite: v,
+            },
           },
-        },
-      });
+        });
+      }
     }
-  }
 
-  function maybeRenderScenesPopoverButton() {
-    if (!studio.scene_count) return;
+    function maybeRenderScenesPopoverButton() {
+      if (!studio.scene_count) return;
 
-    return (
-      <PopoverCountButton
-        className="scene-count"
-        type="scene"
-        count={studio.scene_count}
-        url={NavUtils.makeStudioScenesUrl(studio)}
-      />
-    );
-  }
-
-  function maybeRenderImagesPopoverButton() {
-    if (!studio.image_count) return;
-
-    return (
-      <PopoverCountButton
-        className="image-count"
-        type="image"
-        count={studio.image_count}
-        url={NavUtils.makeStudioImagesUrl(studio)}
-      />
-    );
-  }
-
-  function maybeRenderGalleriesPopoverButton() {
-    if (!studio.gallery_count) return;
-
-    return (
-      <PopoverCountButton
-        className="gallery-count"
-        type="gallery"
-        count={studio.gallery_count}
-        url={NavUtils.makeStudioGalleriesUrl(studio)}
-      />
-    );
-  }
-
-  function maybeRenderGroupsPopoverButton() {
-    if (!studio.group_count) return;
-
-    return (
-      <PopoverCountButton
-        className="group-count"
-        type="group"
-        count={studio.group_count}
-        url={NavUtils.makeStudioGroupsUrl(studio)}
-      />
-    );
-  }
-
-  function maybeRenderPerformersPopoverButton() {
-    if (!studio.performer_count) return;
-
-    return (
-      <PopoverCountButton
-        className="performer-count"
-        type="performer"
-        count={studio.performer_count}
-        url={NavUtils.makeStudioPerformersUrl(studio)}
-      />
-    );
-  }
-
-  function maybeRenderTagPopoverButton() {
-    if (studio.tags.length <= 0) return;
-
-    const popoverContent = studio.tags.map((tag) => (
-      <TagLink key={tag.id} linkType="studio" tag={tag} />
-    ));
-
-    return (
-      <HoverPopover placement="bottom" content={popoverContent}>
-        <Button className="minimal tag-count">
-          <Icon icon={faTag} />
-          <span>{studio.tags.length}</span>
-        </Button>
-      </HoverPopover>
-    );
-  }
-
-  function maybeRenderOCounter() {
-    if (!studio.o_counter) return;
-
-    return <OCounterButton value={studio.o_counter} />;
-  }
-
-  function maybeRenderPopoverButtonGroup() {
-    if (
-      studio.scene_count ||
-      studio.image_count ||
-      studio.gallery_count ||
-      studio.group_count ||
-      studio.performer_count ||
-      studio.o_counter ||
-      studio.tags.length > 0
-    ) {
       return (
-        <>
-          <hr />
-          <ButtonGroup className="card-popovers">
-            {maybeRenderScenesPopoverButton()}
-            {maybeRenderGroupsPopoverButton()}
-            {maybeRenderImagesPopoverButton()}
-            {maybeRenderGalleriesPopoverButton()}
-            {maybeRenderPerformersPopoverButton()}
-            {maybeRenderTagPopoverButton()}
-            {maybeRenderOCounter()}
-          </ButtonGroup>
-        </>
+        <PopoverCountButton
+          className="scene-count"
+          type="scene"
+          count={studio.scene_count}
+          url={NavUtils.makeStudioScenesUrl(studio)}
+        />
       );
     }
-  }
 
-  return (
-    <GridCard
-      className={`studio-card zoom-${zoomIndex}`}
-      url={`/studios/${studio.id}`}
-      width={cardWidth}
-      title={studio.name}
-      linkClassName="studio-card-header"
-      image={
-        <img
-          loading="lazy"
-          className="studio-card-image"
-          alt={studio.name}
-          src={studio.image_path ?? ""}
+    function maybeRenderImagesPopoverButton() {
+      if (!studio.image_count) return;
+
+      return (
+        <PopoverCountButton
+          className="image-count"
+          type="image"
+          count={studio.image_count}
+          url={NavUtils.makeStudioImagesUrl(studio)}
         />
-      }
-      details={
-        <div className="studio-card__details">
-          {maybeRenderParent(studio, hideParent)}
-          {maybeRenderChildren(studio)}
-          <RatingBanner rating={studio.rating100} />
-        </div>
-      }
-      overlays={
-        <FavoriteIcon
-          favorite={studio.favorite}
-          onToggleFavorite={(v) => onToggleFavorite(v)}
-          size="2x"
-          className="hide-not-favorite"
+      );
+    }
+
+    function maybeRenderGalleriesPopoverButton() {
+      if (!studio.gallery_count) return;
+
+      return (
+        <PopoverCountButton
+          className="gallery-count"
+          type="gallery"
+          count={studio.gallery_count}
+          url={NavUtils.makeStudioGalleriesUrl(studio)}
         />
+      );
+    }
+
+    function maybeRenderGroupsPopoverButton() {
+      if (!studio.group_count) return;
+
+      return (
+        <PopoverCountButton
+          className="group-count"
+          type="group"
+          count={studio.group_count}
+          url={NavUtils.makeStudioGroupsUrl(studio)}
+        />
+      );
+    }
+
+    function maybeRenderPerformersPopoverButton() {
+      if (!studio.performer_count) return;
+
+      return (
+        <PopoverCountButton
+          className="performer-count"
+          type="performer"
+          count={studio.performer_count}
+          url={NavUtils.makeStudioPerformersUrl(studio)}
+        />
+      );
+    }
+
+    function maybeRenderTagPopoverButton() {
+      if (studio.tags.length <= 0) return;
+
+      const popoverContent = studio.tags.map((tag) => (
+        <TagLink key={tag.id} linkType="studio" tag={tag} />
+      ));
+
+      return (
+        <HoverPopover placement="bottom" content={popoverContent}>
+          <Button className="minimal tag-count">
+            <Icon icon={faTag} />
+            <span>{studio.tags.length}</span>
+          </Button>
+        </HoverPopover>
+      );
+    }
+
+    function maybeRenderOCounter() {
+      if (!studio.o_counter) return;
+
+      return <OCounterButton value={studio.o_counter} />;
+    }
+
+    function maybeRenderPopoverButtonGroup() {
+      if (
+        studio.scene_count ||
+        studio.image_count ||
+        studio.gallery_count ||
+        studio.group_count ||
+        studio.performer_count ||
+        studio.o_counter ||
+        studio.tags.length > 0
+      ) {
+        return (
+          <>
+            <hr />
+            <ButtonGroup className="card-popovers">
+              {maybeRenderScenesPopoverButton()}
+              {maybeRenderGroupsPopoverButton()}
+              {maybeRenderImagesPopoverButton()}
+              {maybeRenderGalleriesPopoverButton()}
+              {maybeRenderPerformersPopoverButton()}
+              {maybeRenderTagPopoverButton()}
+              {maybeRenderOCounter()}
+            </ButtonGroup>
+          </>
+        );
       }
-      popovers={maybeRenderPopoverButtonGroup()}
-      selected={selected}
-      selecting={selecting}
-      onSelectedChanged={onSelectedChanged}
-    />
-  );
-};
+    }
+
+    return (
+      <GridCard
+        className={`studio-card zoom-${zoomIndex}`}
+        url={`/studios/${studio.id}`}
+        width={cardWidth}
+        title={studio.name}
+        linkClassName="studio-card-header"
+        image={
+          <img
+            loading="lazy"
+            className="studio-card-image"
+            alt={studio.name}
+            src={studio.image_path ?? ""}
+          />
+        }
+        details={
+          <div className="studio-card__details">
+            {maybeRenderParent(studio, hideParent)}
+            {maybeRenderChildren(studio)}
+            <RatingBanner rating={studio.rating100} />
+          </div>
+        }
+        overlays={
+          <FavoriteIcon
+            favorite={studio.favorite}
+            onToggleFavorite={(v) => onToggleFavorite(v)}
+            size="2x"
+            className="hide-not-favorite"
+          />
+        }
+        popovers={maybeRenderPopoverButtonGroup()}
+        selected={selected}
+        selecting={selecting}
+        onSelectedChanged={onSelectedChanged}
+      />
+    );
+  }
+);
diff --git a/ui/v2.5/src/components/Studios/StudioDetails/StudioDetailsPanel.tsx b/ui/v2.5/src/components/Studios/StudioDetails/StudioDetailsPanel.tsx
index 4d5af043f..5ad92100f 100644
--- a/ui/v2.5/src/components/Studios/StudioDetails/StudioDetailsPanel.tsx
+++ b/ui/v2.5/src/components/Studios/StudioDetails/StudioDetailsPanel.tsx
@@ -3,6 +3,7 @@ import { TagLink } from "src/components/Shared/TagLink";
 import * as GQL from "src/core/generated-graphql";
 import { DetailItem } from "src/components/Shared/DetailItem";
 import { StashIDPill } from "src/components/Shared/StashID";
+import { PatchComponent } from "src/patch";
 import { Link } from "react-router-dom";
 
 interface IStudioDetailsPanel {
@@ -11,85 +12,85 @@ interface IStudioDetailsPanel {
   fullWidth?: boolean;
 }
 
-export const StudioDetailsPanel: React.FC<IStudioDetailsPanel> = ({
-  studio,
-  fullWidth,
-}) => {
-  function renderTagsField() {
-    if (!studio.tags.length) {
-      return;
-    }
-    return (
-      <ul className="pl-0">
-        {(studio.tags ?? []).map((tag) => (
-          <TagLink key={tag.id} linkType="studio" tag={tag} />
-        ))}
-      </ul>
-    );
-  }
-
-  function renderStashIDs() {
-    if (!studio.stash_ids?.length) {
-      return;
+export const StudioDetailsPanel: React.FC<IStudioDetailsPanel> = PatchComponent(
+  "StudioDetailsPanel",
+  ({ studio, fullWidth }) => {
+    function renderTagsField() {
+      if (!studio.tags.length) {
+        return;
+      }
+      return (
+        <ul className="pl-0">
+          {(studio.tags ?? []).map((tag) => (
+            <TagLink key={tag.id} linkType="studio" tag={tag} />
+          ))}
+        </ul>
+      );
     }
 
-    return (
-      <ul className="pl-0">
-        {studio.stash_ids.map((stashID) => {
-          return (
-            <li key={stashID.stash_id} className="row no-gutters">
-              <StashIDPill stashID={stashID} linkType="studios" />
+    function renderStashIDs() {
+      if (!studio.stash_ids?.length) {
+        return;
+      }
+
+      return (
+        <ul className="pl-0">
+          {studio.stash_ids.map((stashID) => {
+            return (
+              <li key={stashID.stash_id} className="row no-gutters">
+                <StashIDPill stashID={stashID} linkType="studios" />
+              </li>
+            );
+          })}
+        </ul>
+      );
+    }
+
+    function renderURLs() {
+      if (!studio.urls?.length) {
+        return;
+      }
+
+      return (
+        <ul className="pl-0">
+          {studio.urls.map((url) => (
+            <li key={url}>
+              <a href={url} target="_blank" rel="noreferrer">
+                {url}
+              </a>
             </li>
-          );
-        })}
-      </ul>
-    );
-  }
-
-  function renderURLs() {
-    if (!studio.urls?.length) {
-      return;
+          ))}
+        </ul>
+      );
     }
 
     return (
-      <ul className="pl-0">
-        {studio.urls.map((url) => (
-          <li key={url}>
-            <a href={url} target="_blank" rel="noreferrer">
-              {url}
-            </a>
-          </li>
-        ))}
-      </ul>
+      <div className="detail-group">
+        <DetailItem id="details" value={studio.details} fullWidth={fullWidth} />
+        <DetailItem id="urls" value={renderURLs()} fullWidth={fullWidth} />
+        <DetailItem
+          id="parent_studios"
+          value={
+            studio.parent_studio?.name ? (
+              <Link to={`/studios/${studio.parent_studio?.id}`}>
+                {studio.parent_studio.name}
+              </Link>
+            ) : (
+              ""
+            )
+          }
+          fullWidth={fullWidth}
+        />
+        <DetailItem id="tags" value={renderTagsField()} fullWidth={fullWidth} />
+        <DetailItem
+          id="stash_ids"
+          value={renderStashIDs()}
+          fullWidth={fullWidth}
+        />
+      </div>
     );
   }
-
-  return (
-    <div className="detail-group">
-      <DetailItem id="details" value={studio.details} fullWidth={fullWidth} />
-      <DetailItem id="urls" value={renderURLs()} fullWidth={fullWidth} />
-      <DetailItem
-        id="parent_studios"
-        value={
-          studio.parent_studio?.name ? (
-            <Link to={`/studios/${studio.parent_studio?.id}`}>
-              {studio.parent_studio.name}
-            </Link>
-          ) : (
-            ""
-          )
-        }
-        fullWidth={fullWidth}
-      />
-      <DetailItem id="tags" value={renderTagsField()} fullWidth={fullWidth} />
-      <DetailItem
-        id="stash_ids"
-        value={renderStashIDs()}
-        fullWidth={fullWidth}
-      />
-    </div>
-  );
-};
+);
 
 export const CompressedStudioDetailsPanel: React.FC<IStudioDetailsPanel> = ({
   studio,
diff --git a/ui/v2.5/src/pluginApi.d.ts b/ui/v2.5/src/pluginApi.d.ts
index 8f4a896f8..1746cbc44 100644
--- a/ui/v2.5/src/pluginApi.d.ts
+++ b/ui/v2.5/src/pluginApi.d.ts
@@ -676,6 +676,8 @@ declare namespace PluginApi {
     GalleryImagesPanel: React.FC<any>;
     GalleryList: React.FC<any>;
     GallerySelect: React.FC<any>;
+    GridCard: React.FC<any>;
+    GroupCard: React.FC<any>;
     GroupIDSelect: React.FC<any>;
     GroupList: React.FC<any>;
     GroupSelect: React.FC<any>;
@@ -683,6 +685,7 @@ declare namespace PluginApi {
     HeaderImage: React.FC<any>;
     HoverPopover: React.FC<any>;
     Icon: React.FC<any>;
+    ImageCard: React.FC<any>;
     ImageInput: React.FC<any>;
     ImageList: React.FC<any>;
     LightboxLink: React.FC<any>;
@@ -726,6 +729,10 @@ declare namespace PluginApi {
     "SceneCard.Popovers": React.FC<any>;
     SceneList: React.FC<any>;
     SceneListOperations: React.FC<any>;
+    SceneMarkerCard: React.FC<any>;
+    "SceneMarkerCard.Details": React.FC<any>;
+    "SceneMarkerCard.Image": React.FC<any>;
+    "SceneMarkerCard.Popovers": React.FC<any>;
     SceneMarkerList: React.FC<any>;
     SelectSetting: React.FC<any>;
     Setting: React.FC<any>;
@@ -733,6 +740,8 @@ declare namespace PluginApi {
     SettingModal: React.FC<any>;
     StringListSetting: React.FC<any>;
     StringSetting: React.FC<any>;
+    StudioCard: React.FC<any>;
+    StudioDetailsPanel: React.FC<any>;
     StudioIDSelect: React.FC<any>;
     StudioList: React.FC<any>;
     StudioSelect: React.FC<any>;

From fa80454891fd87d07c51ed829ee575aa6e4bc29e Mon Sep 17 00:00:00 2001
From: hckrman101 <239247847+hckrman101@users.noreply.github.com>
Date: Mon, 5 Jan 2026 19:46:29 -0500
Subject: [PATCH 244/405] Resume after scrubbing, hide player UI faster (#6336)

---
 .../src/components/ScenePlayer/ScenePlayer.tsx | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/ui/v2.5/src/components/ScenePlayer/ScenePlayer.tsx b/ui/v2.5/src/components/ScenePlayer/ScenePlayer.tsx
index 31e3e79be..36df653ba 100644
--- a/ui/v2.5/src/components/ScenePlayer/ScenePlayer.tsx
+++ b/ui/v2.5/src/components/ScenePlayer/ScenePlayer.tsx
@@ -364,7 +364,7 @@ export const ScenePlayer: React.FC<IScenePlayerProps> = PatchComponent(
         },
         nativeControlsForTouch: false,
         playbackRates: [0.25, 0.5, 0.75, 1, 1.25, 1.5, 1.75, 2],
-        inactivityTimeout: 2000,
+        inactivityTimeout: 700,
         preload: "none",
         playsinline: true,
         techOrder: ["chromecast", "html5"],
@@ -932,15 +932,23 @@ export const ScenePlayer: React.FC<IScenePlayerProps> = PatchComponent(
         );
     }, [getPlayer, scene]);
 
+    const pausedBeforeScrubber = useRef(true);
+
     function onScrubberScroll() {
-      if (started.current) {
-        getPlayer()?.pause();
+      const player = getPlayer();
+      if (started.current && player) {
+        pausedBeforeScrubber.current = player.paused();
+        player.pause();
       }
     }
 
     function onScrubberSeek(seconds: number) {
-      if (started.current) {
-        getPlayer()?.currentTime(seconds);
+      const player = getPlayer();
+      if (started.current && player) {
+        player.currentTime(seconds);
+        if (!pausedBeforeScrubber.current) {
+          player.play();
+        }
       } else {
         setTime(seconds);
       }

From c0260781a59606d526837bd24884df4d545e35b0 Mon Sep 17 00:00:00 2001
From: CJ <72030708+cj12312021@users.noreply.github.com>
Date: Mon, 5 Jan 2026 18:47:32 -0600
Subject: [PATCH 245/405] fix(scraper): handle base64 data URIs in
 processImageField (#6480)

Add check to skip HTTP fetch for non-HTTP URLs in processImageField(),
matching the existing behavior in setPerformerImage() and setStudioImage().

This allows scrapers to return base64 data URIs (e.g.,
`data:image/jpeg;base64,...`) directly without triggering an HTTP fetch
error. Previously, processImageField() would attempt to create an HTTP
request with the data URI as the URL, causing "Could not set image using
URL" warnings.
---
 pkg/scraper/image.go | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkg/scraper/image.go b/pkg/scraper/image.go
index 87f114668..2f2e038af 100644
--- a/pkg/scraper/image.go
+++ b/pkg/scraper/image.go
@@ -68,6 +68,12 @@ func processImageField(ctx context.Context, imageField *string, client *http.Cli
 		return nil
 	}
 
+	// don't try to get the image if it doesn't appear to be a URL
+	// this allows scrapers to return base64 data URIs directly
+	if !strings.HasPrefix(*imageField, "http") {
+		return nil
+	}
+
 	img, err := getImage(ctx, *imageField, client, globalConfig)
 	if err != nil {
 		return err

From 9b709ef61457b9efb38cdb7f6f8401595855947a Mon Sep 17 00:00:00 2001
From: CJ <72030708+cj12312021@users.noreply.github.com>
Date: Mon, 5 Jan 2026 18:48:16 -0600
Subject: [PATCH 246/405] Perf: Add lightweight ListGroupData fragment for
 groups list (#6478)

Create a new ListGroupData fragment that excludes expensive recursive
count fields (scene_count_all, sub_group_count_all, etc. with depth: -1).
These fields cause 10+ second queries on large databases when loading
the groups list page.

The full GroupData fragment is preserved for detail views where the
recursive counts are needed.
---
 ui/v2.5/graphql/data/group.graphql            | 42 +++++++++++++++++++
 ui/v2.5/graphql/queries/movie.graphql         |  2 +-
 .../components/Groups/EditGroupsDialog.tsx    |  6 +--
 ui/v2.5/src/components/Groups/GroupCard.tsx   |  2 +-
 .../src/components/Groups/GroupCardGrid.tsx   |  2 +-
 ui/v2.5/src/components/Groups/GroupList.tsx   |  2 +-
 .../components/Groups/RelatedGroupPopover.tsx |  2 +-
 7 files changed, 50 insertions(+), 8 deletions(-)

diff --git a/ui/v2.5/graphql/data/group.graphql b/ui/v2.5/graphql/data/group.graphql
index 5251bed89..440c420da 100644
--- a/ui/v2.5/graphql/data/group.graphql
+++ b/ui/v2.5/graphql/data/group.graphql
@@ -1,3 +1,4 @@
+# Full fragment for detail views - includes recursive counts
 fragment GroupData on Group {
   id
   name
@@ -39,3 +40,44 @@ fragment GroupData on Group {
     title
   }
 }
+
+# Lightweight fragment for list views - excludes expensive recursive counts
+# The _all fields (depth: -1) cause 10+ second queries on large databases
+fragment ListGroupData on Group {
+  id
+  name
+  aliases
+  duration
+  date
+  rating100
+  director
+
+  studio {
+    ...SlimStudioData
+  }
+
+  tags {
+    ...SlimTagData
+  }
+
+  containing_groups {
+    group {
+      ...SlimGroupData
+    }
+    description
+  }
+
+  synopsis
+  urls
+  front_image_path
+  back_image_path
+  scene_count
+  performer_count
+  sub_group_count
+  o_counter
+
+  scenes {
+    id
+    title
+  }
+}
diff --git a/ui/v2.5/graphql/queries/movie.graphql b/ui/v2.5/graphql/queries/movie.graphql
index ad47e908d..2b2af7510 100644
--- a/ui/v2.5/graphql/queries/movie.graphql
+++ b/ui/v2.5/graphql/queries/movie.graphql
@@ -2,7 +2,7 @@ query FindGroups($filter: FindFilterType, $group_filter: GroupFilterType) {
   findGroups(filter: $filter, group_filter: $group_filter) {
     count
     groups {
-      ...GroupData
+      ...ListGroupData
     }
   }
 }
diff --git a/ui/v2.5/src/components/Groups/EditGroupsDialog.tsx b/ui/v2.5/src/components/Groups/EditGroupsDialog.tsx
index efd14e757..ef3171de2 100644
--- a/ui/v2.5/src/components/Groups/EditGroupsDialog.tsx
+++ b/ui/v2.5/src/components/Groups/EditGroupsDialog.tsx
@@ -23,12 +23,12 @@ import { ContainingGroupsMultiSet } from "./ContainingGroupsMultiSet";
 import { IRelatedGroupEntry } from "./GroupDetails/RelatedGroupTable";
 
 interface IListOperationProps {
-  selected: GQL.GroupDataFragment[];
+  selected: GQL.ListGroupDataFragment[];
   onClose: (applied: boolean) => void;
 }
 
 export function getAggregateContainingGroups(
-  state: Pick<GQL.GroupDataFragment, "containing_groups">[]
+  state: Pick<GQL.ListGroupDataFragment, "containing_groups">[]
 ) {
   const sortedLists: IRelatedGroupEntry[][] = state.map((o) =>
     o.containing_groups
@@ -144,7 +144,7 @@ export const EditGroupsDialog: React.FC<IListOperationProps> = (
     let updateDirector: string | undefined;
     let first = true;
 
-    state.forEach((group: GQL.GroupDataFragment) => {
+    state.forEach((group: GQL.ListGroupDataFragment) => {
       const groupTagIDs = (group.tags ?? []).map((p) => p.id).sort();
       const groupContainingGroupIDs = (group.containing_groups ?? []).sort(
         (a, b) => a.group.id.localeCompare(b.group.id)
diff --git a/ui/v2.5/src/components/Groups/GroupCard.tsx b/ui/v2.5/src/components/Groups/GroupCard.tsx
index b9b206985..5bc1b5d7f 100644
--- a/ui/v2.5/src/components/Groups/GroupCard.tsx
+++ b/ui/v2.5/src/components/Groups/GroupCard.tsx
@@ -37,7 +37,7 @@ const Description: React.FC<{
 };
 
 interface IProps {
-  group: GQL.GroupDataFragment;
+  group: GQL.ListGroupDataFragment;
   cardWidth?: number;
   sceneNumber?: number;
   selecting?: boolean;
diff --git a/ui/v2.5/src/components/Groups/GroupCardGrid.tsx b/ui/v2.5/src/components/Groups/GroupCardGrid.tsx
index b73919e64..3ad6b02c4 100644
--- a/ui/v2.5/src/components/Groups/GroupCardGrid.tsx
+++ b/ui/v2.5/src/components/Groups/GroupCardGrid.tsx
@@ -7,7 +7,7 @@ import {
 } from "../Shared/GridCard/GridCard";
 
 interface IGroupCardGrid {
-  groups: GQL.GroupDataFragment[];
+  groups: GQL.ListGroupDataFragment[];
   selectedIds: Set<string>;
   zoomIndex: number;
   onSelectChange: (id: string, selected: boolean, shiftKey: boolean) => void;
diff --git a/ui/v2.5/src/components/Groups/GroupList.tsx b/ui/v2.5/src/components/Groups/GroupList.tsx
index 38fda7862..a08610569 100644
--- a/ui/v2.5/src/components/Groups/GroupList.tsx
+++ b/ui/v2.5/src/components/Groups/GroupList.tsx
@@ -199,7 +199,7 @@ export const GroupList: React.FC<IGroupList> = PatchComponent(
     }
 
     function renderEditDialog(
-      selectedGroups: GQL.GroupDataFragment[],
+      selectedGroups: GQL.ListGroupDataFragment[],
       onClose: (applied: boolean) => void
     ) {
       return <EditGroupsDialog selected={selectedGroups} onClose={onClose} />;
diff --git a/ui/v2.5/src/components/Groups/RelatedGroupPopover.tsx b/ui/v2.5/src/components/Groups/RelatedGroupPopover.tsx
index 03095f284..a2eea9975 100644
--- a/ui/v2.5/src/components/Groups/RelatedGroupPopover.tsx
+++ b/ui/v2.5/src/components/Groups/RelatedGroupPopover.tsx
@@ -16,7 +16,7 @@ import { GroupTag } from "./GroupTag";
 
 interface IProps {
   group: Pick<
-    GQL.GroupDataFragment,
+    GQL.ListGroupDataFragment,
     "id" | "name" | "containing_groups" | "sub_group_count"
   >;
 }

From cf3489efdc450dc2812367e8c4d61fd1c9bf3051 Mon Sep 17 00:00:00 2001
From: Valkyr-JS <154020147+Valkyr-JS@users.noreply.github.com>
Date: Sun, 11 Jan 2026 07:07:53 +0000
Subject: [PATCH 247/405] Plugin API - React Font Awesome library (#6487)

* ReactFontAwesome added to plugin API libraries
* ReactFontAwesome added to plugin API export
---
 ui/v2.5/src/pluginApi.d.ts | 1 +
 ui/v2.5/src/pluginApi.tsx  | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/ui/v2.5/src/pluginApi.d.ts b/ui/v2.5/src/pluginApi.d.ts
index 1746cbc44..9372f333d 100644
--- a/ui/v2.5/src/pluginApi.d.ts
+++ b/ui/v2.5/src/pluginApi.d.ts
@@ -617,6 +617,7 @@ declare namespace PluginApi {
     const FontAwesomeBrands: typeof import("@fortawesome/free-brands-svg-icons");
     const Intl: typeof import("react-intl");
     const Mousetrap: typeof import("mousetrap");
+    const ReactFontAwesome: typeof import("@fortawesome/react-fontawesome");
     const ReactSelect: typeof import("react-select");
 
     // @ts-expect-error
diff --git a/ui/v2.5/src/pluginApi.tsx b/ui/v2.5/src/pluginApi.tsx
index e534dddef..276091cde 100644
--- a/ui/v2.5/src/pluginApi.tsx
+++ b/ui/v2.5/src/pluginApi.tsx
@@ -12,6 +12,7 @@ import * as Intl from "react-intl";
 import * as FontAwesomeSolid from "@fortawesome/free-solid-svg-icons";
 import * as FontAwesomeRegular from "@fortawesome/free-regular-svg-icons";
 import * as FontAwesomeBrands from "@fortawesome/free-brands-svg-icons";
+import * as ReactFontAwesome from "@fortawesome/react-fontawesome";
 import * as ReactSelect from "react-select";
 import { useSpriteInfo } from "./hooks/sprite";
 import { useToast } from "./hooks/Toast";
@@ -78,6 +79,7 @@ export const PluginApi = {
     FontAwesomeBrands,
     Mousetrap,
     MousetrapPause,
+    ReactFontAwesome,
     ReactSelect,
   },
   register: {

From c9fa3b76d996c15c962158da2c10506d3218c2e4 Mon Sep 17 00:00:00 2001
From: funntime <shwtrash@gmail.com>
Date: Sun, 11 Jan 2026 18:46:50 -0500
Subject: [PATCH 248/405] Update chromedp and cdproto dependencies (#6486)

---
 go.mod | 11 +++++------
 go.sum | 24 ++++++++++--------------
 2 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/go.mod b/go.mod
index 705fe40ed..db0d6fe34 100644
--- a/go.mod
+++ b/go.mod
@@ -9,8 +9,8 @@ require (
 	github.com/anacrolix/dms v1.2.2
 	github.com/antchfx/htmlquery v1.3.5
 	github.com/asticode/go-astisub v0.25.1
-	github.com/chromedp/cdproto v0.0.0-20231007061347-18b01cd81617
-	github.com/chromedp/chromedp v0.9.2
+	github.com/chromedp/cdproto v0.0.0-20250803210736-d308e07a266d
+	github.com/chromedp/chromedp v0.14.2
 	github.com/corona10/goimagehash v1.1.0
 	github.com/disintegration/imaging v1.6.2
 	github.com/dop251/goja v0.0.0-20231027120936-b396bb4c349d
@@ -72,17 +72,18 @@ require (
 	github.com/antchfx/xpath v1.3.5 // indirect
 	github.com/asticode/go-astikit v0.20.0 // indirect
 	github.com/asticode/go-astits v1.8.0 // indirect
-	github.com/chromedp/sysutil v1.0.0 // indirect
+	github.com/chromedp/sysutil v1.1.0 // indirect
 	github.com/coder/websocket v1.8.12 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.7 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dlclark/regexp2 v1.7.0 // indirect
 	github.com/fsnotify/fsnotify v1.9.0 // indirect
+	github.com/go-json-experiment/json v0.0.0-20250725192818-e39067aee2d2 // indirect
 	github.com/go-sourcemap/sourcemap v2.1.3+incompatible // indirect
 	github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
 	github.com/gobwas/httphead v0.1.0 // indirect
 	github.com/gobwas/pool v0.2.1 // indirect
-	github.com/gobwas/ws v1.3.0 // indirect
+	github.com/gobwas/ws v1.4.0 // indirect
 	github.com/goccy/go-yaml v1.18.0 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/google/pprof v0.0.0-20230207041349-798e818bf904 // indirect
@@ -90,10 +91,8 @@ require (
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/josharian/intern v1.0.0 // indirect
 	github.com/knadh/koanf/maps v0.1.2 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
-	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-colorable v0.1.14 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
diff --git a/go.sum b/go.sum
index 750acd9ab..dbe82cf99 100644
--- a/go.sum
+++ b/go.sum
@@ -116,13 +116,12 @@ github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/chromedp/cdproto v0.0.0-20230802225258-3cf4e6d46a89/go.mod h1:GKljq0VrfU4D5yc+2qA6OVr8pmO/MBbPEWqWQ/oqGEs=
-github.com/chromedp/cdproto v0.0.0-20231007061347-18b01cd81617 h1:/5dwcyi5WOawM1Iz6MjrYqB90TRIdZv3O0fVHEJb86w=
-github.com/chromedp/cdproto v0.0.0-20231007061347-18b01cd81617/go.mod h1:GKljq0VrfU4D5yc+2qA6OVr8pmO/MBbPEWqWQ/oqGEs=
-github.com/chromedp/chromedp v0.9.2 h1:dKtNz4kApb06KuSXoTQIyUC2TrA0fhGDwNZf3bcgfKw=
-github.com/chromedp/chromedp v0.9.2/go.mod h1:LkSXJKONWTCHAfQasKFUZI+mxqS4tZqhmtGzzhLsnLs=
-github.com/chromedp/sysutil v1.0.0 h1:+ZxhTpfpZlmchB58ih/LBHX52ky7w2VhQVKQMucy3Ic=
-github.com/chromedp/sysutil v1.0.0/go.mod h1:kgWmDdq8fTzXYcKIBqIYvRRTnYb9aNS9moAV0xufSww=
+github.com/chromedp/cdproto v0.0.0-20250803210736-d308e07a266d h1:ZtA1sedVbEW7EW80Iz2GR3Ye6PwbJAJXjv7D74xG6HU=
+github.com/chromedp/cdproto v0.0.0-20250803210736-d308e07a266d/go.mod h1:NItd7aLkcfOA/dcMXvl8p1u+lQqioRMq/SqDp71Pb/k=
+github.com/chromedp/chromedp v0.14.2 h1:r3b/WtwM50RsBZHMUm9fsNhhzRStTHrKdr2zmwbZSzM=
+github.com/chromedp/chromedp v0.14.2/go.mod h1:rHzAv60xDE7VNy/MYtTUrYreSc0ujt2O1/C3bzctYBo=
+github.com/chromedp/sysutil v1.1.0 h1:PUFNv5EcprjqXZD9nJb9b/c9ibAbxiYo4exNWZyipwM=
+github.com/chromedp/sysutil v1.1.0/go.mod h1:WiThHUdltqCNKGc4gaU50XgYjwjYIhKWoHGPTUfWTJ8=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/logex v1.2.0/go.mod h1:9+9sk7u7pGNWYMkh0hdiL++6OeibzJccyQU4p4MedaY=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
@@ -206,6 +205,8 @@ github.com/go-chi/httplog v0.3.1/go.mod h1:UoiQQ/MTZH5V6JbNB2FzF0DynTh5okpXxlhsy
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
+github.com/go-json-experiment/json v0.0.0-20250725192818-e39067aee2d2 h1:iizUGZ9pEquQS5jTGkh4AqeeHCMbfbjeb0zMt0aEFzs=
+github.com/go-json-experiment/json v0.0.0-20250725192818-e39067aee2d2/go.mod h1:TiCD2a1pcmjd7YnhGH0f/zKNcCD06B029pHhzV23c2M=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
@@ -224,9 +225,8 @@ github.com/gobwas/httphead v0.1.0 h1:exrUm0f4YX0L7EBwZHuCF4GDp8aJfVeBrlLQrs6NqWU
 github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM=
 github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og=
 github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
-github.com/gobwas/ws v1.2.1/go.mod h1:hRKAFb8wOxFROYNsT1bqfWnhX+b5MFeJM9r2ZSwg/KY=
-github.com/gobwas/ws v1.3.0 h1:sbeU3Y4Qzlb+MOzIe6mQGf7QR4Hkv6ZD0qhGkBFL2O0=
-github.com/gobwas/ws v1.3.0/go.mod h1:hRKAFb8wOxFROYNsT1bqfWnhX+b5MFeJM9r2ZSwg/KY=
+github.com/gobwas/ws v1.4.0 h1:CTaoG1tojrh4ucGPcoJFiAQUAsEWekEWvLy7GsVNqGs=
+github.com/gobwas/ws v1.4.0/go.mod h1:G3gNqMNtPppf5XUz7O4shetPpcZ1VJ7zt18dlUeakrc=
 github.com/goccy/go-yaml v1.18.0 h1:8W7wMFS12Pcas7KU+VVkaiCng+kG8QiFeFwzFb+rwuw=
 github.com/goccy/go-yaml v1.18.0/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
@@ -380,8 +380,6 @@ github.com/jinzhu/copier v0.4.0 h1:w3ciUoD19shMCRargcpm0cm91ytaBhDvuRpz1ODO/U8=
 github.com/jinzhu/copier v0.4.0/go.mod h1:DfbEm0FYsaqBcKcFuvmOZb218JkPGtvSHsKg8S8hyyg=
 github.com/jmoiron/sqlx v1.4.0 h1:1PLqN7S1UYp5t4SrVVnt4nUVNemrDAtxlulVe+Qgm3o=
 github.com/jmoiron/sqlx v1.4.0/go.mod h1:ZrZ7UsYB/weZdl2Bxg6jCRO9c3YHl8r3ahlKmRT4JLY=
-github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
-github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
@@ -433,8 +431,6 @@ github.com/lyft/protoc-gen-star v0.5.3/go.mod h1:V0xaHgaf5oCCqmcxYcWiDfTiKsZsRc8
 github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
 github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=
 github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
-github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
-github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=

From 579fc662756c3760ba5994d1cfdffe3253159fd6 Mon Sep 17 00:00:00 2001
From: RyanAtNight <232988350+RyanAtNight@users.noreply.github.com>
Date: Sun, 11 Jan 2026 16:06:57 -0800
Subject: [PATCH 249/405] Add checkbox controls to Wall View and Tagger for
 Scenes, Scene Markers, Images, and Galleries (#6476)

---
 .../src/components/Galleries/GalleryList.tsx  | 10 ++-
 .../components/Galleries/GalleryWallCard.tsx  | 49 +++++++++++--
 ui/v2.5/src/components/Images/ImageList.tsx   | 30 +++++++-
 .../src/components/Images/ImageWallItem.tsx   | 70 ++++++++++++++-----
 ui/v2.5/src/components/Scenes/SceneList.tsx   | 11 ++-
 .../src/components/Scenes/SceneMarkerList.tsx |  2 +
 .../Scenes/SceneMarkerWallPanel.tsx           | 70 ++++++++++++++++++-
 .../src/components/Scenes/SceneWallPanel.tsx  | 64 ++++++++++++++++-
 ui/v2.5/src/components/Shared/styles.scss     | 36 ++++++++--
 .../components/Tagger/scenes/SceneTagger.tsx  | 45 ++++++++++--
 .../components/Tagger/scenes/TaggerScene.tsx  | 26 ++++++-
 ui/v2.5/src/components/Tagger/styles.scss     |  4 ++
 ui/v2.5/src/locales/en-GB.json                |  1 +
 13 files changed, 378 insertions(+), 40 deletions(-)

diff --git a/ui/v2.5/src/components/Galleries/GalleryList.tsx b/ui/v2.5/src/components/Galleries/GalleryList.tsx
index d18aadbd3..952f27808 100644
--- a/ui/v2.5/src/components/Galleries/GalleryList.tsx
+++ b/ui/v2.5/src/components/Galleries/GalleryList.tsx
@@ -153,7 +153,15 @@ export const GalleryList: React.FC<IGalleryList> = PatchComponent(
             <div className="row">
               <div className={`GalleryWall zoom-${filter.zoomIndex}`}>
                 {result.data.findGalleries.galleries.map((gallery) => (
-                  <GalleryWallCard key={gallery.id} gallery={gallery} />
+                  <GalleryWallCard
+                    key={gallery.id}
+                    gallery={gallery}
+                    selected={selectedIds.has(gallery.id)}
+                    onSelectedChanged={(selected, shiftKey) =>
+                      onSelectChange(gallery.id, selected, shiftKey)
+                    }
+                    selecting={selectedIds.size > 0}
+                  />
                 ))}
               </div>
             </div>
diff --git a/ui/v2.5/src/components/Galleries/GalleryWallCard.tsx b/ui/v2.5/src/components/Galleries/GalleryWallCard.tsx
index c57bf45ad..c1501bd9d 100644
--- a/ui/v2.5/src/components/Galleries/GalleryWallCard.tsx
+++ b/ui/v2.5/src/components/Galleries/GalleryWallCard.tsx
@@ -1,4 +1,5 @@
 import React, { useState } from "react";
+import { Form } from "react-bootstrap";
 import { useIntl } from "react-intl";
 import { Link } from "react-router-dom";
 import * as GQL from "src/core/generated-graphql";
@@ -8,6 +9,7 @@ import { useGalleryLightbox } from "src/hooks/Lightbox/hooks";
 import { galleryTitle } from "src/core/galleries";
 import { RatingSystem } from "../Shared/Rating/RatingSystem";
 import { GalleryPreviewScrubber } from "./GalleryPreviewScrubber";
+import { useDragMoveSelect } from "../Shared/GridCard/dragMoveSelect";
 import cx from "classnames";
 
 const CLASSNAME = "GalleryWallCard";
@@ -18,6 +20,9 @@ const CLASSNAME_IMG_CONTAIN = `${CLASSNAME}-img-contain`;
 
 interface IProps {
   gallery: GQL.SlimGalleryDataFragment;
+  selected?: boolean;
+  onSelectedChanged?: (selected: boolean, shiftKey: boolean) => void;
+  selecting?: boolean;
 }
 
 type Orientation = "landscape" | "portrait";
@@ -26,7 +31,12 @@ function getOrientation(width: number, height: number): Orientation {
   return width > height ? "landscape" : "portrait";
 }
 
-const GalleryWallCard: React.FC<IProps> = ({ gallery }) => {
+const GalleryWallCard: React.FC<IProps> = ({
+  gallery,
+  selected,
+  onSelectedChanged,
+  selecting,
+}) => {
   const intl = useIntl();
   const [coverOrientation, setCoverOrientation] =
     React.useState<Orientation>("landscape");
@@ -34,6 +44,12 @@ const GalleryWallCard: React.FC<IProps> = ({ gallery }) => {
     React.useState<Orientation>("landscape");
   const showLightbox = useGalleryLightbox(gallery.id, gallery.chapters);
 
+  const { dragProps } = useDragMoveSelect({
+    selecting: selecting || false,
+    selected: selected || false,
+    onSelectedChanged: onSelectedChanged,
+  });
+
   const cover = gallery?.paths.cover;
 
   function onCoverLoad(e: React.SyntheticEvent<HTMLImageElement, Event>) {
@@ -58,6 +74,14 @@ const GalleryWallCard: React.FC<IProps> = ({ gallery }) => {
       ? [...performerNames.slice(0, -2), performerNames.slice(-2).join(" & ")]
       : performerNames;
 
+  function handleCardClick(event: React.MouseEvent) {
+    if (selecting && onSelectedChanged) {
+      onSelectedChanged(!selected, event.shiftKey);
+      return;
+    }
+    showLightboxStart();
+  }
+
   async function showLightboxStart() {
     if (gallery.image_count === 0) {
       return;
@@ -69,15 +93,32 @@ const GalleryWallCard: React.FC<IProps> = ({ gallery }) => {
   const imgClassname =
     imageOrientation !== coverOrientation ? CLASSNAME_IMG_CONTAIN : "";
 
+  let shiftKey = false;
+
   return (
     <>
       <section
-        className={`${CLASSNAME} ${CLASSNAME}-${coverOrientation}`}
-        onClick={showLightboxStart}
-        onKeyPress={showLightboxStart}
+        className={`${CLASSNAME} ${CLASSNAME}-${coverOrientation} wall-item`}
+        onClick={handleCardClick}
+        onKeyPress={() => showLightboxStart()}
         role="button"
         tabIndex={0}
+        {...dragProps}
       >
+        {onSelectedChanged && (
+          <Form.Control
+            type="checkbox"
+            className="wall-item-check mousetrap"
+            checked={selected}
+            onChange={() => onSelectedChanged(!selected, shiftKey)}
+            onClick={(
+              event: React.MouseEvent<HTMLInputElement, MouseEvent>
+            ) => {
+              shiftKey = event.shiftKey;
+              event.stopPropagation();
+            }}
+          />
+        )}
         <RatingSystem value={gallery.rating100} disabled withoutContext />
         <img
           loading="lazy"
diff --git a/ui/v2.5/src/components/Images/ImageList.tsx b/ui/v2.5/src/components/Images/ImageList.tsx
index 9ca5513a9..79496823d 100644
--- a/ui/v2.5/src/components/Images/ImageList.tsx
+++ b/ui/v2.5/src/components/Images/ImageList.tsx
@@ -35,6 +35,9 @@ interface IImageWallProps {
   pageCount: number;
   handleImageOpen: (index: number) => void;
   zoomIndex: number;
+  selectedIds?: Set<string>;
+  onSelectChange?: (id: string, selected: boolean, shiftKey: boolean) => void;
+  selecting?: boolean;
 }
 
 const zoomWidths = [280, 340, 480, 640];
@@ -49,6 +52,9 @@ const ImageWall: React.FC<IImageWallProps> = ({
   images,
   zoomIndex,
   handleImageOpen,
+  selectedIds,
+  onSelectChange,
+  selecting,
 }) => {
   const { configuration } = useConfigurationContext();
   const uiConfig = configuration?.ui;
@@ -121,9 +127,26 @@ const ImageWall: React.FC<IImageWallProps> = ({
           ? props.photo.height
           : targetRowHeight(containerRef.current?.offsetWidth ?? 0) *
             maxHeightFactor;
-      return <ImageWallItem {...props} maxHeight={maxHeight} />;
+      const imageId = props.photo.key;
+      if (!imageId) {
+        return null;
+      }
+      return (
+        <ImageWallItem
+          {...props}
+          maxHeight={maxHeight}
+          selected={selectedIds?.has(imageId)}
+          onSelectedChanged={
+            onSelectChange
+              ? (selected, shiftKey) =>
+                  onSelectChange(imageId, selected, shiftKey)
+              : undefined
+          }
+          selecting={selecting}
+        />
+      );
     },
-    [targetRowHeight]
+    [targetRowHeight, selectedIds, onSelectChange, selecting]
   );
 
   return (
@@ -258,6 +281,9 @@ const ImageListImages: React.FC<IImageListImages> = ({
         pageCount={pageCount}
         handleImageOpen={handleImageOpen}
         zoomIndex={filter.zoomIndex}
+        selectedIds={selectedIds}
+        onSelectChange={onSelectChange}
+        selecting={!!selectedIds && selectedIds.size > 0}
       />
     );
   }
diff --git a/ui/v2.5/src/components/Images/ImageWallItem.tsx b/ui/v2.5/src/components/Images/ImageWallItem.tsx
index 901295192..a9f681474 100644
--- a/ui/v2.5/src/components/Images/ImageWallItem.tsx
+++ b/ui/v2.5/src/components/Images/ImageWallItem.tsx
@@ -1,32 +1,50 @@
 import React from "react";
+import { Form } from "react-bootstrap";
 import type { RenderImageProps } from "react-photo-gallery";
+import { useDragMoveSelect } from "../Shared/GridCard/dragMoveSelect";
 
 interface IExtraProps {
   maxHeight: number;
+  selected?: boolean;
+  onSelectedChanged?: (selected: boolean, shiftKey: boolean) => void;
+  selecting?: boolean;
 }
 
 export const ImageWallItem: React.FC<RenderImageProps & IExtraProps> = (
   props: RenderImageProps & IExtraProps
 ) => {
+  const { dragProps } = useDragMoveSelect({
+    selecting: props.selecting || false,
+    selected: props.selected || false,
+    onSelectedChanged: props.onSelectedChanged,
+  });
+
   const height = Math.min(props.maxHeight, props.photo.height);
   const zoomFactor = height / props.photo.height;
   const width = props.photo.width * zoomFactor;
 
   type style = Record<string, string | number | undefined>;
-  var imgStyle: style = {
+  var divStyle: style = {
     margin: props.margin,
     display: "block",
+    position: "relative",
   };
 
   if (props.direction === "column") {
-    imgStyle.position = "absolute";
-    imgStyle.left = props.left;
-    imgStyle.top = props.top;
+    divStyle.position = "absolute";
+    divStyle.left = props.left;
+    divStyle.top = props.top;
   }
 
   var handleClick = function handleClick(
     event: React.MouseEvent<Element, MouseEvent>
   ) {
+    if (props.selecting && props.onSelectedChanged) {
+      props.onSelectedChanged(!props.selected, event.shiftKey);
+      event.preventDefault();
+      event.stopPropagation();
+      return;
+    }
     if (props.onClick) {
       props.onClick(event, { index: props.index });
     }
@@ -35,19 +53,39 @@ export const ImageWallItem: React.FC<RenderImageProps & IExtraProps> = (
   const video = props.photo.src.includes("preview");
   const ImagePreview = video ? "video" : "img";
 
+  let shiftKey = false;
+
   return (
-    <ImagePreview
-      loop={video}
-      muted={video}
-      playsInline={video}
-      autoPlay={video}
-      key={props.photo.key}
-      style={imgStyle}
-      src={props.photo.src}
-      width={width}
-      height={height}
-      alt={props.photo.alt}
+    <div
+      className="wall-item"
+      style={divStyle}
       onClick={handleClick}
-    />
+      {...dragProps}
+    >
+      {props.onSelectedChanged && (
+        <Form.Control
+          type="checkbox"
+          className="wall-item-check mousetrap"
+          checked={props.selected}
+          onChange={() => props.onSelectedChanged!(!props.selected, shiftKey)}
+          onClick={(event: React.MouseEvent<HTMLInputElement, MouseEvent>) => {
+            shiftKey = event.shiftKey;
+            event.stopPropagation();
+          }}
+        />
+      )}
+      <ImagePreview
+        loop={video}
+        muted={video}
+        playsInline={video}
+        autoPlay={video}
+        key={props.photo.key}
+        src={props.photo.src}
+        width={width}
+        height={height}
+        alt={props.photo.alt}
+        onClick={handleClick}
+      />
+    </div>
   );
 };
diff --git a/ui/v2.5/src/components/Scenes/SceneList.tsx b/ui/v2.5/src/components/Scenes/SceneList.tsx
index 8258f9b57..d139c6a72 100644
--- a/ui/v2.5/src/components/Scenes/SceneList.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneList.tsx
@@ -235,11 +235,20 @@ const SceneList: React.FC<{
         scenes={scenes}
         sceneQueue={queue}
         zoomIndex={filter.zoomIndex}
+        selectedIds={selectedIds}
+        onSelectChange={onSelectChange}
       />
     );
   }
   if (filter.displayMode === DisplayMode.Tagger) {
-    return <Tagger scenes={scenes} queue={queue} />;
+    return (
+      <Tagger
+        scenes={scenes}
+        queue={queue}
+        selectedIds={selectedIds}
+        onSelectChange={onSelectChange}
+      />
+    );
   }
 
   return null;
diff --git a/ui/v2.5/src/components/Scenes/SceneMarkerList.tsx b/ui/v2.5/src/components/Scenes/SceneMarkerList.tsx
index 08d4a4046..074ee2b83 100644
--- a/ui/v2.5/src/components/Scenes/SceneMarkerList.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneMarkerList.tsx
@@ -101,6 +101,8 @@ export const SceneMarkerList: React.FC<ISceneMarkerList> = PatchComponent(
           <MarkerWallPanel
             markers={result.data.findSceneMarkers.scene_markers}
             zoomIndex={filter.zoomIndex}
+            selectedIds={selectedIds}
+            onSelectChange={onSelectChange}
           />
         );
       }
diff --git a/ui/v2.5/src/components/Scenes/SceneMarkerWallPanel.tsx b/ui/v2.5/src/components/Scenes/SceneMarkerWallPanel.tsx
index 0349fae0f..863078c4e 100644
--- a/ui/v2.5/src/components/Scenes/SceneMarkerWallPanel.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneMarkerWallPanel.tsx
@@ -1,4 +1,5 @@
 import React, { useCallback, useEffect, useMemo, useState } from "react";
+import { Form } from "react-bootstrap";
 import * as GQL from "src/core/generated-graphql";
 import Gallery, {
   GalleryI,
@@ -10,6 +11,7 @@ import { objectTitle } from "src/core/files";
 import { Link, useHistory } from "react-router-dom";
 import { TruncatedText } from "../Shared/TruncatedText";
 import TextUtils from "src/utils/text";
+import { useDragMoveSelect } from "../Shared/GridCard/dragMoveSelect";
 import cx from "classnames";
 import NavUtils from "src/utils/navigation";
 import { markerTitle } from "src/core/markers";
@@ -35,11 +37,20 @@ interface IMarkerPhoto {
 
 interface IExtraProps {
   maxHeight: number;
+  selected?: boolean;
+  onSelectedChanged?: (selected: boolean, shiftKey: boolean) => void;
+  selecting?: boolean;
 }
 
 export const MarkerWallItem: React.FC<
   RenderImageProps<IMarkerPhoto> & IExtraProps
 > = (props: RenderImageProps<IMarkerPhoto> & IExtraProps) => {
+  const { dragProps } = useDragMoveSelect({
+    selecting: props.selecting || false,
+    selected: props.selected || false,
+    onSelectedChanged: props.onSelectedChanged,
+  });
+
   const { configuration } = useConfigurationContext();
   const playSound = configuration?.interface.soundOnPreview ?? false;
   const showTitle = configuration?.interface.wallShowTitle ?? false;
@@ -63,6 +74,12 @@ export const MarkerWallItem: React.FC<
   }
 
   var handleClick = function handleClick(event: React.MouseEvent) {
+    if (props.selecting && props.onSelectedChanged) {
+      props.onSelectedChanged(!props.selected, event.shiftKey);
+      event.preventDefault();
+      event.stopPropagation();
+      return;
+    }
     if (props.onClick) {
       props.onClick(event, { index: props.index });
     }
@@ -75,16 +92,32 @@ export const MarkerWallItem: React.FC<
   const title = wallItemTitle(marker);
   const tagNames = marker.tags.map((p) => p.name);
 
+  let shiftKey = false;
+
   return (
     <div
       className={cx("wall-item", { "show-title": showTitle })}
       role="button"
+      onClick={handleClick}
+      {...dragProps}
       style={{
         ...divStyle,
         width,
         height,
       }}
     >
+      {props.onSelectedChanged && (
+        <Form.Control
+          type="checkbox"
+          className="wall-item-check mousetrap"
+          checked={props.selected}
+          onChange={() => props.onSelectedChanged!(!props.selected, shiftKey)}
+          onClick={(event: React.MouseEvent<HTMLInputElement, MouseEvent>) => {
+            shiftKey = event.shiftKey;
+            event.stopPropagation();
+          }}
+        />
+      )}
       <ImagePreview
         loading="lazy"
         loop={video}
@@ -124,6 +157,9 @@ export const MarkerWallItem: React.FC<
 interface IMarkerWallProps {
   markers: GQL.SceneMarkerDataFragment[];
   zoomIndex: number;
+  selectedIds?: Set<string>;
+  onSelectChange?: (id: string, selected: boolean, shiftKey: boolean) => void;
+  selecting?: boolean;
 }
 
 // HACK: typescript doesn't allow Gallery to accept a parameter for some reason
@@ -163,7 +199,13 @@ const breakpointZoomHeights = [
   { minWidth: 1400, heights: [160, 240, 300, 480] },
 ];
 
-const MarkerWall: React.FC<IMarkerWallProps> = ({ markers, zoomIndex }) => {
+const MarkerWall: React.FC<IMarkerWallProps> = ({
+  markers,
+  zoomIndex,
+  selectedIds,
+  onSelectChange,
+  selecting,
+}) => {
   const history = useHistory();
 
   const containerRef = React.useRef<HTMLDivElement>(null);
@@ -233,6 +275,7 @@ const MarkerWall: React.FC<IMarkerWallProps> = ({ markers, zoomIndex }) => {
 
   const renderImage = useCallback(
     (props: RenderImageProps<IMarkerPhoto>) => {
+      const markerId = props.photo.marker.id;
       return (
         <MarkerWallItem
           {...props}
@@ -240,10 +283,18 @@ const MarkerWall: React.FC<IMarkerWallProps> = ({ markers, zoomIndex }) => {
             targetRowHeight(containerRef.current?.offsetWidth ?? 0) *
             maxHeightFactor
           }
+          selected={selectedIds?.has(markerId)}
+          onSelectedChanged={
+            onSelectChange
+              ? (selected, shiftKey) =>
+                  onSelectChange(markerId, selected, shiftKey)
+              : undefined
+          }
+          selecting={selecting}
         />
       );
     },
-    [targetRowHeight]
+    [targetRowHeight, selectedIds, onSelectChange, selecting]
   );
 
   return (
@@ -266,11 +317,24 @@ const MarkerWall: React.FC<IMarkerWallProps> = ({ markers, zoomIndex }) => {
 interface IMarkerWallPanelProps {
   markers: GQL.SceneMarkerDataFragment[];
   zoomIndex: number;
+  selectedIds?: Set<string>;
+  onSelectChange?: (id: string, selected: boolean, shiftKey: boolean) => void;
 }
 
 export const MarkerWallPanel: React.FC<IMarkerWallPanelProps> = ({
   markers,
   zoomIndex,
+  selectedIds,
+  onSelectChange,
 }) => {
-  return <MarkerWall markers={markers} zoomIndex={zoomIndex} />;
+  const selecting = !!selectedIds && selectedIds.size > 0;
+  return (
+    <MarkerWall
+      markers={markers}
+      zoomIndex={zoomIndex}
+      selectedIds={selectedIds}
+      onSelectChange={onSelectChange}
+      selecting={selecting}
+    />
+  );
 };
diff --git a/ui/v2.5/src/components/Scenes/SceneWallPanel.tsx b/ui/v2.5/src/components/Scenes/SceneWallPanel.tsx
index 92aa21f59..bf4a97b49 100644
--- a/ui/v2.5/src/components/Scenes/SceneWallPanel.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneWallPanel.tsx
@@ -1,4 +1,5 @@
 import React, { useCallback, useEffect, useMemo, useState } from "react";
+import { Form } from "react-bootstrap";
 import * as GQL from "src/core/generated-graphql";
 import { SceneQueue } from "src/models/sceneQueue";
 import Gallery, {
@@ -12,6 +13,7 @@ import { Link, useHistory } from "react-router-dom";
 import { TruncatedText } from "../Shared/TruncatedText";
 import TextUtils from "src/utils/text";
 import { useIntl } from "react-intl";
+import { useDragMoveSelect } from "../Shared/GridCard/dragMoveSelect";
 import cx from "classnames";
 
 interface IScenePhoto {
@@ -22,6 +24,9 @@ interface IScenePhoto {
 
 interface IExtraProps {
   maxHeight: number;
+  selected?: boolean;
+  onSelectedChanged?: (selected: boolean, shiftKey: boolean) => void;
+  selecting?: boolean;
 }
 
 export const SceneWallItem: React.FC<
@@ -29,6 +34,12 @@ export const SceneWallItem: React.FC<
 > = (props: RenderImageProps<IScenePhoto> & IExtraProps) => {
   const intl = useIntl();
 
+  const { dragProps } = useDragMoveSelect({
+    selecting: props.selecting || false,
+    selected: props.selected || false,
+    onSelectedChanged: props.onSelectedChanged,
+  });
+
   const { configuration } = useConfigurationContext();
   const playSound = configuration?.interface.soundOnPreview ?? false;
   const showTitle = configuration?.interface.wallShowTitle ?? false;
@@ -52,6 +63,12 @@ export const SceneWallItem: React.FC<
   }
 
   var handleClick = function handleClick(event: React.MouseEvent) {
+    if (props.selecting && props.onSelectedChanged) {
+      props.onSelectedChanged(!props.selected, event.shiftKey);
+      event.preventDefault();
+      event.stopPropagation();
+      return;
+    }
     if (props.onClick) {
       props.onClick(event, { index: props.index });
     }
@@ -68,16 +85,32 @@ export const SceneWallItem: React.FC<
       ? [...performerNames.slice(0, -2), performerNames.slice(-2).join(" & ")]
       : performerNames;
 
+  let shiftKey = false;
+
   return (
     <div
       className={cx("wall-item", { "show-title": showTitle })}
       role="button"
+      onClick={handleClick}
+      {...dragProps}
       style={{
         ...divStyle,
         width,
         height,
       }}
     >
+      {props.onSelectedChanged && (
+        <Form.Control
+          type="checkbox"
+          className="wall-item-check mousetrap"
+          checked={props.selected}
+          onChange={() => props.onSelectedChanged!(!props.selected, shiftKey)}
+          onClick={(event: React.MouseEvent<HTMLInputElement, MouseEvent>) => {
+            shiftKey = event.shiftKey;
+            event.stopPropagation();
+          }}
+        />
+      )}
       <ImagePreview
         loading="lazy"
         loop={video}
@@ -132,6 +165,9 @@ interface ISceneWallProps {
   scenes: GQL.SlimSceneDataFragment[];
   sceneQueue?: SceneQueue;
   zoomIndex: number;
+  selectedIds?: Set<string>;
+  onSelectChange?: (id: string, selected: boolean, shiftKey: boolean) => void;
+  selecting?: boolean;
 }
 
 // HACK: typescript doesn't allow Gallery to accept a parameter for some reason
@@ -148,6 +184,9 @@ const SceneWall: React.FC<ISceneWallProps> = ({
   scenes,
   sceneQueue,
   zoomIndex,
+  selectedIds,
+  onSelectChange,
+  selecting,
 }) => {
   const history = useHistory();
 
@@ -223,6 +262,7 @@ const SceneWall: React.FC<ISceneWallProps> = ({
 
   const renderImage = useCallback(
     (props: RenderImageProps<IScenePhoto>) => {
+      const sceneId = props.photo.scene.id;
       return (
         <SceneWallItem
           {...props}
@@ -230,10 +270,18 @@ const SceneWall: React.FC<ISceneWallProps> = ({
             targetRowHeight(containerRef.current?.offsetWidth ?? 0) *
             maxHeightFactor
           }
+          selected={selectedIds?.has(sceneId)}
+          onSelectedChanged={
+            onSelectChange
+              ? (selected, shiftKey) =>
+                  onSelectChange(sceneId, selected, shiftKey)
+              : undefined
+          }
+          selecting={selecting}
         />
       );
     },
-    [targetRowHeight]
+    [targetRowHeight, selectedIds, onSelectChange, selecting]
   );
 
   return (
@@ -257,14 +305,26 @@ interface ISceneWallPanelProps {
   scenes: GQL.SlimSceneDataFragment[];
   sceneQueue?: SceneQueue;
   zoomIndex: number;
+  selectedIds?: Set<string>;
+  onSelectChange?: (id: string, selected: boolean, shiftKey: boolean) => void;
 }
 
 export const SceneWallPanel: React.FC<ISceneWallPanelProps> = ({
   scenes,
   sceneQueue,
   zoomIndex,
+  selectedIds,
+  onSelectChange,
 }) => {
+  const selecting = !!selectedIds && selectedIds.size > 0;
   return (
-    <SceneWall scenes={scenes} sceneQueue={sceneQueue} zoomIndex={zoomIndex} />
+    <SceneWall
+      scenes={scenes}
+      sceneQueue={sceneQueue}
+      zoomIndex={zoomIndex}
+      selectedIds={selectedIds}
+      onSelectChange={onSelectChange}
+      selecting={selecting}
+    />
   );
 };
diff --git a/ui/v2.5/src/components/Shared/styles.scss b/ui/v2.5/src/components/Shared/styles.scss
index aed03cef9..100b4e643 100644
--- a/ui/v2.5/src/components/Shared/styles.scss
+++ b/ui/v2.5/src/components/Shared/styles.scss
@@ -284,6 +284,10 @@ button.collapse-button {
     opacity: 0;
     width: 1.2rem;
 
+    &:checked {
+      opacity: 0.75;
+    }
+
     @media (hover: none), (pointer: coarse) {
       // always show card controls when hovering not supported
       opacity: 0.25;
@@ -297,10 +301,6 @@ button.collapse-button {
   .card-check {
     padding-left: 15px;
 
-    &:checked {
-      opacity: 0.75;
-    }
-
     @media (hover: none), (pointer: coarse) {
       // and make it bigger when hovering not supported
       width: 1.5rem;
@@ -314,6 +314,34 @@ button.collapse-button {
   }
 }
 
+.search-item-check,
+.wall-item-check {
+  height: 1.2rem;
+  width: 1.2rem;
+}
+
+// Wall item checkbox styles
+.wall-item-check {
+  left: 0.5rem;
+  opacity: 0;
+  position: absolute;
+  top: 0.5rem;
+  z-index: 10;
+
+  &:checked {
+    opacity: 0.75;
+  }
+
+  @media (hover: none) {
+    opacity: 0.25;
+  }
+}
+
+.wall-item:hover .wall-item-check {
+  opacity: 0.75;
+  transition: opacity 0.5s;
+}
+
 .TruncatedText {
   -webkit-box-orient: vertical;
   display: -webkit-box;
diff --git a/ui/v2.5/src/components/Tagger/scenes/SceneTagger.tsx b/ui/v2.5/src/components/Tagger/scenes/SceneTagger.tsx
index 34c86e57c..76a67e306 100755
--- a/ui/v2.5/src/components/Tagger/scenes/SceneTagger.tsx
+++ b/ui/v2.5/src/components/Tagger/scenes/SceneTagger.tsx
@@ -22,7 +22,17 @@ const Scene: React.FC<{
   queue?: SceneQueue;
   index: number;
   showLightboxImage: (imagePath: string) => void;
-}> = ({ scene, searchResult, queue, index, showLightboxImage }) => {
+  selected?: boolean;
+  onSelectedChanged?: (selected: boolean, shiftKey: boolean) => void;
+}> = ({
+  scene,
+  searchResult,
+  queue,
+  index,
+  showLightboxImage,
+  selected,
+  onSelectedChanged,
+}) => {
   const intl = useIntl();
   const { currentSource, doSceneQuery, doSceneFragmentScrape, loading } =
     useContext(TaggerStateContext);
@@ -71,6 +81,8 @@ const Scene: React.FC<{
       showLightboxImage={showLightboxImage}
       queue={queue}
       index={index}
+      selected={selected}
+      onSelectedChanged={onSelectedChanged}
     >
       {searchResult && searchResult.results?.length ? (
         <SceneSearchResults scenes={searchResult.results} target={scene} />
@@ -82,9 +94,16 @@ const Scene: React.FC<{
 interface ITaggerProps {
   scenes: GQL.SlimSceneDataFragment[];
   queue?: SceneQueue;
+  selectedIds: Set<string>;
+  onSelectChange: (id: string, selected: boolean, shiftKey: boolean) => void;
 }
 
-export const Tagger: React.FC<ITaggerProps> = ({ scenes, queue }) => {
+export const Tagger: React.FC<ITaggerProps> = ({
+  scenes,
+  queue,
+  selectedIds,
+  onSelectChange,
+}) => {
   const {
     sources,
     setCurrentSource,
@@ -103,6 +122,8 @@ export const Tagger: React.FC<ITaggerProps> = ({ scenes, queue }) => {
 
   const intl = useIntl();
 
+  const hasSelection = selectedIds.size > 0;
+
   function handleSourceSelect(e: React.ChangeEvent<HTMLSelectElement>) {
     setCurrentSource(sources!.find((s) => s.id === e.currentTarget.value));
   }
@@ -211,7 +232,12 @@ export const Tagger: React.FC<ITaggerProps> = ({ scenes, queue }) => {
       return;
     }
 
-    if (scenes.length === 0) {
+    // Use selected scenes if any, otherwise all scenes
+    const scenesToScrape = hasSelection
+      ? scenes.filter((s) => selectedIds.has(s.id))
+      : scenes;
+
+    if (scenesToScrape.length === 0) {
       return;
     }
 
@@ -232,15 +258,20 @@ export const Tagger: React.FC<ITaggerProps> = ({ scenes, queue }) => {
       );
     }
 
+    // Change button text based on selection state
+    const buttonTextId = hasSelection
+      ? "component_tagger.verb_scrape_selected"
+      : "component_tagger.verb_scrape_all";
+
     return (
       <div className="ml-1">
         <OperationButton
           disabled={loading}
           operation={async () => {
-            await doMultiSceneFragmentScrape(scenes.map((s) => s.id));
+            await doMultiSceneFragmentScrape(scenesToScrape.map((s) => s.id));
           }}
         >
-          {intl.formatMessage({ id: "component_tagger.verb_scrape_all" })}
+          {intl.formatMessage({ id: buttonTextId })}
         </OperationButton>
         {multiError && (
           <>
@@ -276,6 +307,10 @@ export const Tagger: React.FC<ITaggerProps> = ({ scenes, queue }) => {
               index={i}
               showLightboxImage={showLightboxImage}
               queue={queue}
+              selected={selectedIds.has(s.id)}
+              onSelectedChanged={(selected, shiftKey) =>
+                onSelectChange(s.id, selected, shiftKey)
+              }
             />
           ))}
         </div>
diff --git a/ui/v2.5/src/components/Tagger/scenes/TaggerScene.tsx b/ui/v2.5/src/components/Tagger/scenes/TaggerScene.tsx
index 4825ebcfd..5446257e5 100644
--- a/ui/v2.5/src/components/Tagger/scenes/TaggerScene.tsx
+++ b/ui/v2.5/src/components/Tagger/scenes/TaggerScene.tsx
@@ -116,6 +116,8 @@ interface ITaggerScene {
   showLightboxImage: (imagePath: string) => void;
   queue?: SceneQueue;
   index?: number;
+  selected?: boolean;
+  onSelectedChanged?: (selected: boolean, shiftKey: boolean) => void;
 }
 
 export const TaggerScene: React.FC<PropsWithChildren<ITaggerScene>> = ({
@@ -129,6 +131,8 @@ export const TaggerScene: React.FC<PropsWithChildren<ITaggerScene>> = ({
   showLightboxImage,
   queue,
   index,
+  selected,
+  onSelectedChanged,
 }) => {
   const { config } = useContext(TaggerStateContext);
   const [queryString, setQueryString] = useState<string>("");
@@ -235,10 +239,28 @@ export const TaggerScene: React.FC<PropsWithChildren<ITaggerScene>> = ({
     history.push(link);
   }
 
+  let shiftKey = false;
+
   return (
     <div key={scene.id} className="mt-3 search-item">
       <div className="row">
-        <div className="col col-lg-6 overflow-hidden align-items-center d-flex flex-column flex-sm-row">
+        {onSelectedChanged && (
+          <div className="col-auto d-flex align-items-start pt-2 pr-2">
+            <Form.Control
+              type="checkbox"
+              className="search-item-check mousetrap"
+              checked={selected}
+              onChange={() => onSelectedChanged(!selected, shiftKey)}
+              onClick={(
+                event: React.MouseEvent<HTMLInputElement, MouseEvent>
+              ) => {
+                shiftKey = event.shiftKey;
+                event.stopPropagation();
+              }}
+            />
+          </div>
+        )}
+        <div className="col-12 col-lg overflow-hidden align-items-center d-flex flex-column flex-sm-row">
           <div className="scene-card mr-3">
             <Link to={url}>
               <ScenePreview
@@ -256,7 +278,7 @@ export const TaggerScene: React.FC<PropsWithChildren<ITaggerScene>> = ({
             <TruncatedText text={objectTitle(scene)} lineCount={2} />
           </Link>
         </div>
-        <div className="col-md-6 my-1">
+        <div className="col-12 col-lg my-1">
           <div>
             {renderQueryForm()}
             {scrapeSceneFragment ? (
diff --git a/ui/v2.5/src/components/Tagger/styles.scss b/ui/v2.5/src/components/Tagger/styles.scss
index 889d6b1b4..8861d0043 100644
--- a/ui/v2.5/src/components/Tagger/styles.scss
+++ b/ui/v2.5/src/components/Tagger/styles.scss
@@ -56,6 +56,10 @@
   }
 }
 
+.search-item-check {
+  cursor: pointer;
+}
+
 .search-result {
   background-color: rgba(61, 80, 92, 0.3);
   padding: 1rem 0;
diff --git a/ui/v2.5/src/locales/en-GB.json b/ui/v2.5/src/locales/en-GB.json
index f165c03cd..9c040bb1a 100644
--- a/ui/v2.5/src/locales/en-GB.json
+++ b/ui/v2.5/src/locales/en-GB.json
@@ -230,6 +230,7 @@
     "verb_match_tag": "Match Tag",
     "verb_matched": "Matched",
     "verb_scrape_all": "Scrape All",
+    "verb_scrape_selected": "Scrape Selected",
     "verb_submit_fp": "Submit {fpCount, plural, one{# Fingerprint} other{# Fingerprints}}",
     "verb_toggle_config": "{toggle} {configuration}",
     "verb_toggle_unmatched": "{toggle} unmatched scenes"

From 95b1bce91739f7267903dad08fd3b5c0395815fa Mon Sep 17 00:00:00 2001
From: CJ <72030708+cj12312021@users.noreply.github.com>
Date: Sun, 11 Jan 2026 18:12:03 -0600
Subject: [PATCH 250/405] fix(dlna): improve activity tracking accuracy and
 efficiency (#6483)

* fix(dlna): improve activity tracking accuracy and efficiency

- Remove play duration tracking: DLNA clients buffer aggressively and
  don't report playback position, making duration estimates unreliable.
  Saving inaccurate values corrupts analytics.

- Combine database transactions: Resume time and view count updates
  now happen in a single transaction for atomicity and performance.

- Keep resume time tracking: While imprecise, it provides useful
  "continue watching" hints. The cost of being wrong is low (user
  just seeks).

* remove elasped time check
---
 internal/dlna/activity.go      | 76 +++++++++++++++-------------------
 internal/dlna/activity_test.go | 54 ++----------------------
 2 files changed, 38 insertions(+), 92 deletions(-)

diff --git a/internal/dlna/activity.go b/internal/dlna/activity.go
index 34f0081d7..a9a5d9b2d 100644
--- a/internal/dlna/activity.go
+++ b/internal/dlna/activity.go
@@ -82,16 +82,6 @@ func (s *streamSession) percentWatched() float64 {
 	return timeBasedPercent
 }
 
-// estimatedPlayDuration returns the estimated play duration in seconds.
-// Uses elapsed time from session start to last activity, capped by video duration.
-func (s *streamSession) estimatedPlayDuration() float64 {
-	elapsed := s.LastActivity.Sub(s.StartTime).Seconds()
-	if s.VideoDuration > 0 && elapsed > s.VideoDuration {
-		return s.VideoDuration
-	}
-	return elapsed
-}
-
 // estimatedResumeTime calculates the estimated resume time based on elapsed time.
 // Since DLNA clients buffer aggressively, byte positions don't correlate with playback.
 // Instead, we estimate based on how long the session has been active.
@@ -271,14 +261,13 @@ func (t *ActivityTracker) processExpiredSessions() {
 // processCompletedSession saves activity data for a completed streaming session.
 func (t *ActivityTracker) processCompletedSession(session *streamSession) {
 	percentWatched := session.percentWatched()
-	playDuration := session.estimatedPlayDuration()
 	resumeTime := session.estimatedResumeTime()
 
-	logger.Debugf("[DLNA Activity] Session completed: scene=%d, client=%s, duration=%.1fs, startTime=%s, lastActivity=%s, percent=%.1f%%, duration=%.1fs, resume=%.1fs",
-		session.SceneID, session.ClientIP, session.VideoDuration, session.StartTime.String(), session.LastActivity.String(), percentWatched, playDuration, resumeTime)
+	logger.Debugf("[DLNA Activity] Session completed: scene=%d, client=%s, videoDuration=%.1fs, percent=%.1f%%, resume=%.1fs",
+		session.SceneID, session.ClientIP, session.VideoDuration, percentWatched, resumeTime)
 
-	// Only save if there was meaningful activity (at least 1% watched or 5 seconds)
-	if percentWatched < 1 && playDuration < 5 {
+	// Only save if there was meaningful activity (at least 1% watched)
+	if percentWatched < 1 {
 		logger.Debugf("[DLNA Activity] Session too short, skipping save")
 		return
 	}
@@ -289,38 +278,41 @@ func (t *ActivityTracker) processCompletedSession(session *streamSession) {
 		return
 	}
 
-	ctx := context.Background()
+	// Determine what needs to be saved
+	shouldSaveResume := resumeTime > 0
+	shouldAddView := !session.PlayCountAdded && percentWatched >= float64(t.getMinimumPlayPercent())
 
-	// Save activity (resume time and play duration)
-	if playDuration > 0 || resumeTime > 0 {
-		var resumeTimePtr *float64
-		if resumeTime > 0 {
-			resumeTimePtr = &resumeTime
-		}
-
-		if err := txn.WithTxn(ctx, t.txnManager, func(ctx context.Context) error {
-			_, err := t.sceneWriter.SaveActivity(ctx, session.SceneID, resumeTimePtr, &playDuration)
-			return err
-		}); err != nil {
-			logger.Warnf("[DLNA Activity] Failed to save activity for scene %d: %v", session.SceneID, err)
-		}
+	// Nothing to save
+	if !shouldSaveResume && !shouldAddView {
+		return
 	}
 
-	// Increment play count if threshold met
-	if !session.PlayCountAdded {
-		minPercent := t.getMinimumPlayPercent()
-		if percentWatched >= float64(minPercent) {
-			if err := txn.WithTxn(ctx, t.txnManager, func(ctx context.Context) error {
-				_, err := t.sceneWriter.AddViews(ctx, session.SceneID, []time.Time{time.Now()})
-				return err
-			}); err != nil {
-				logger.Warnf("[DLNA Activity] Failed to increment play count for scene %d: %v", session.SceneID, err)
-			} else {
-				logger.Debugf("[DLNA Activity] Incremented play count for scene %d (%.1f%% watched)",
-					session.SceneID, percentWatched)
-				session.PlayCountAdded = true
+	// Save everything in a single transaction
+	ctx := context.Background()
+	if err := txn.WithTxn(ctx, t.txnManager, func(ctx context.Context) error {
+		// Save resume time only. DLNA clients buffer aggressively and don't report
+		// playback position, so we can't accurately track play duration - saving
+		// guesses would corrupt analytics. Resume time is still useful as a
+		// "continue watching" hint even if imprecise.
+		if shouldSaveResume {
+			if _, err := t.sceneWriter.SaveActivity(ctx, session.SceneID, &resumeTime, nil); err != nil {
+				return fmt.Errorf("save resume time: %w", err)
 			}
 		}
+
+		// Increment play count (also updates last_played_at via view date)
+		if shouldAddView {
+			if _, err := t.sceneWriter.AddViews(ctx, session.SceneID, []time.Time{time.Now()}); err != nil {
+				return fmt.Errorf("add view: %w", err)
+			}
+			session.PlayCountAdded = true
+			logger.Debugf("[DLNA Activity] Incremented play count for scene %d (%.1f%% watched)",
+				session.SceneID, percentWatched)
+		}
+
+		return nil
+	}); err != nil {
+		logger.Warnf("[DLNA Activity] Failed to save activity for scene %d: %v", session.SceneID, err)
 	}
 }
 
diff --git a/internal/dlna/activity_test.go b/internal/dlna/activity_test.go
index 3c4d890ba..19ae7ebb8 100644
--- a/internal/dlna/activity_test.go
+++ b/internal/dlna/activity_test.go
@@ -129,52 +129,6 @@ func TestStreamSession_PercentWatched(t *testing.T) {
 	}
 }
 
-func TestStreamSession_EstimatedPlayDuration(t *testing.T) {
-	now := time.Now()
-
-	tests := []struct {
-		name          string
-		startTime     time.Time
-		lastActivity  time.Time
-		videoDuration float64
-		expected      float64
-	}{
-		{
-			name:          "elapsed less than duration",
-			startTime:     now.Add(-30 * time.Second),
-			lastActivity:  now,
-			videoDuration: 120,
-			expected:      30.0,
-		},
-		{
-			name:          "elapsed exceeds duration - capped",
-			startTime:     now.Add(-180 * time.Second),
-			lastActivity:  now,
-			videoDuration: 120,
-			expected:      120.0,
-		},
-		{
-			name:          "no duration limit",
-			startTime:     now.Add(-300 * time.Second),
-			lastActivity:  now,
-			videoDuration: 0,
-			expected:      300.0,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			session := &streamSession{
-				StartTime:     tt.startTime,
-				LastActivity:  tt.lastActivity,
-				VideoDuration: tt.videoDuration,
-			}
-			result := session.estimatedPlayDuration()
-			assert.InDelta(t, tt.expected, result, 1.0) // Allow 1 second tolerance
-		})
-	}
-}
-
 func TestStreamSession_EstimatedResumeTime(t *testing.T) {
 	now := time.Now()
 
@@ -455,12 +409,12 @@ func TestActivityTracker_ShortSessionIgnored(t *testing.T) {
 	// Verify percent watched is below threshold (1s / 120s = 0.83%)
 	assert.InDelta(t, 0.83, session.percentWatched(), 0.1)
 
-	// Verify play duration is short
-	assert.InDelta(t, 1.0, session.estimatedPlayDuration(), 0.5)
+	// Verify elapsed time is short
+	elapsed := session.LastActivity.Sub(session.StartTime).Seconds()
+	assert.InDelta(t, 1.0, elapsed, 0.5)
 
 	// Both are below the minimum thresholds (1% and 5 seconds)
 	percentWatched := session.percentWatched()
-	playDuration := session.estimatedPlayDuration()
-	shouldSkip := percentWatched < 1 && playDuration < 5
+	shouldSkip := percentWatched < 1 && elapsed < 5
 	assert.True(t, shouldSkip, "Short session should be skipped")
 }

From deada580e521b9ac1766ae3b69c2db0cef4df968 Mon Sep 17 00:00:00 2001
From: ghuds540 <ghuds540@gmail.com>
Date: Sun, 11 Jan 2026 19:17:41 -0500
Subject: [PATCH 251/405] fix: align card images to center (#6481)

---
 ui/v2.5/src/components/Images/styles.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/v2.5/src/components/Images/styles.scss b/ui/v2.5/src/components/Images/styles.scss
index 8bc736aae..0050a9434 100644
--- a/ui/v2.5/src/components/Images/styles.scss
+++ b/ui/v2.5/src/components/Images/styles.scss
@@ -86,6 +86,7 @@
   }
 
   &-preview {
+    align-items: center;
     display: flex;
     justify-content: center;
     margin-bottom: 5px;
@@ -94,7 +95,6 @@
     &-image {
       height: 100%;
       object-fit: contain;
-      object-position: top;
       width: 100%;
     }
 

From 6049b21d22bbb0bd032560071a7ae495cd0b763d Mon Sep 17 00:00:00 2001
From: Valkyr-JS <154020147+Valkyr-JS@users.noreply.github.com>
Date: Tue, 13 Jan 2026 04:49:50 +0000
Subject: [PATCH 252/405] Plugin API - card grid components (#6482)

* SceneCardsGrid plugin API patch
* GalleryCardGrid plugin API patch
* GroupCardGrid plugin API patch
* ImageGridCard plugin API patch
* PerformerCardGrid plugin API patch
* ImageGridCard name corrected
* SceneMarkerCardsGrid plugin API patch
* StudioCardGrid plugin API patch
* TagCardGrid plugin API patch
* GalleryGridCard.tsx renamed to GalleryCardGrid.tsx
* ImageGridCard renamed to ImageCardGrid
* SceneCardsGrid renamed to SceneCardGrid
* SceneMarkerCardsGrid renamed to SceneMarkerCardGrid
---
 .../components/Galleries/GalleryCardGrid.tsx  | 43 ++++++++++++++
 .../components/Galleries/GalleryGridCard.tsx  | 44 --------------
 .../src/components/Galleries/GalleryList.tsx  |  2 +-
 .../src/components/Groups/GroupCardGrid.tsx   | 57 +++++++++----------
 .../src/components/Images/ImageCardGrid.tsx   | 47 +++++++++++++++
 .../src/components/Images/ImageGridCard.tsx   | 49 ----------------
 ui/v2.5/src/components/Images/ImageList.tsx   |  4 +-
 .../Performers/PerformerCardGrid.tsx          | 54 +++++++++---------
 .../src/components/Scenes/SceneCardGrid.tsx   | 50 ++++++++++++++++
 .../src/components/Scenes/SceneCardsGrid.tsx  | 53 -----------------
 ui/v2.5/src/components/Scenes/SceneList.tsx   |  4 +-
 .../components/Scenes/SceneMarkerCardGrid.tsx | 46 +++++++++++++++
 .../Scenes/SceneMarkerCardsGrid.tsx           | 45 ---------------
 .../src/components/Scenes/SceneMarkerList.tsx |  4 +-
 .../src/components/Studios/StudioCardGrid.tsx | 54 +++++++++---------
 ui/v2.5/src/components/Tags/TagCardGrid.tsx   | 51 ++++++++---------
 ui/v2.5/src/pluginApi.d.ts                    |  8 +++
 17 files changed, 305 insertions(+), 310 deletions(-)
 create mode 100644 ui/v2.5/src/components/Galleries/GalleryCardGrid.tsx
 delete mode 100644 ui/v2.5/src/components/Galleries/GalleryGridCard.tsx
 create mode 100644 ui/v2.5/src/components/Images/ImageCardGrid.tsx
 delete mode 100644 ui/v2.5/src/components/Images/ImageGridCard.tsx
 create mode 100644 ui/v2.5/src/components/Scenes/SceneCardGrid.tsx
 delete mode 100644 ui/v2.5/src/components/Scenes/SceneCardsGrid.tsx
 create mode 100644 ui/v2.5/src/components/Scenes/SceneMarkerCardGrid.tsx
 delete mode 100644 ui/v2.5/src/components/Scenes/SceneMarkerCardsGrid.tsx

diff --git a/ui/v2.5/src/components/Galleries/GalleryCardGrid.tsx b/ui/v2.5/src/components/Galleries/GalleryCardGrid.tsx
new file mode 100644
index 000000000..a249f27f7
--- /dev/null
+++ b/ui/v2.5/src/components/Galleries/GalleryCardGrid.tsx
@@ -0,0 +1,43 @@
+import React from "react";
+import * as GQL from "src/core/generated-graphql";
+import { GalleryCard } from "./GalleryCard";
+import {
+  useCardWidth,
+  useContainerDimensions,
+} from "../Shared/GridCard/GridCard";
+import { PatchComponent } from "src/patch";
+
+interface IGalleryCardGrid {
+  galleries: GQL.SlimGalleryDataFragment[];
+  selectedIds: Set<string>;
+  zoomIndex: number;
+  onSelectChange: (id: string, selected: boolean, shiftKey: boolean) => void;
+}
+
+const zoomWidths = [280, 340, 480, 640];
+
+export const GalleryCardGrid: React.FC<IGalleryCardGrid> = PatchComponent(
+  "GalleryCardGrid",
+  ({ galleries, selectedIds, zoomIndex, onSelectChange }) => {
+    const [componentRef, { width: containerWidth }] = useContainerDimensions();
+    const cardWidth = useCardWidth(containerWidth, zoomIndex, zoomWidths);
+
+    return (
+      <div className="row justify-content-center" ref={componentRef}>
+        {galleries.map((gallery) => (
+          <GalleryCard
+            key={gallery.id}
+            cardWidth={cardWidth}
+            gallery={gallery}
+            zoomIndex={zoomIndex}
+            selecting={selectedIds.size > 0}
+            selected={selectedIds.has(gallery.id)}
+            onSelectedChanged={(selected: boolean, shiftKey: boolean) =>
+              onSelectChange(gallery.id, selected, shiftKey)
+            }
+          />
+        ))}
+      </div>
+    );
+  }
+);
diff --git a/ui/v2.5/src/components/Galleries/GalleryGridCard.tsx b/ui/v2.5/src/components/Galleries/GalleryGridCard.tsx
deleted file mode 100644
index 111ddf08f..000000000
--- a/ui/v2.5/src/components/Galleries/GalleryGridCard.tsx
+++ /dev/null
@@ -1,44 +0,0 @@
-import React from "react";
-import * as GQL from "src/core/generated-graphql";
-import { GalleryCard } from "./GalleryCard";
-import {
-  useCardWidth,
-  useContainerDimensions,
-} from "../Shared/GridCard/GridCard";
-
-interface IGalleryCardGrid {
-  galleries: GQL.SlimGalleryDataFragment[];
-  selectedIds: Set<string>;
-  zoomIndex: number;
-  onSelectChange: (id: string, selected: boolean, shiftKey: boolean) => void;
-}
-
-const zoomWidths = [280, 340, 480, 640];
-
-export const GalleryCardGrid: React.FC<IGalleryCardGrid> = ({
-  galleries,
-  selectedIds,
-  zoomIndex,
-  onSelectChange,
-}) => {
-  const [componentRef, { width: containerWidth }] = useContainerDimensions();
-  const cardWidth = useCardWidth(containerWidth, zoomIndex, zoomWidths);
-
-  return (
-    <div className="row justify-content-center" ref={componentRef}>
-      {galleries.map((gallery) => (
-        <GalleryCard
-          key={gallery.id}
-          cardWidth={cardWidth}
-          gallery={gallery}
-          zoomIndex={zoomIndex}
-          selecting={selectedIds.size > 0}
-          selected={selectedIds.has(gallery.id)}
-          onSelectedChanged={(selected: boolean, shiftKey: boolean) =>
-            onSelectChange(gallery.id, selected, shiftKey)
-          }
-        />
-      ))}
-    </div>
-  );
-};
diff --git a/ui/v2.5/src/components/Galleries/GalleryList.tsx b/ui/v2.5/src/components/Galleries/GalleryList.tsx
index 952f27808..9a4fc5236 100644
--- a/ui/v2.5/src/components/Galleries/GalleryList.tsx
+++ b/ui/v2.5/src/components/Galleries/GalleryList.tsx
@@ -13,7 +13,7 @@ import { EditGalleriesDialog } from "./EditGalleriesDialog";
 import { DeleteGalleriesDialog } from "./DeleteGalleriesDialog";
 import { ExportDialog } from "../Shared/ExportDialog";
 import { GalleryListTable } from "./GalleryListTable";
-import { GalleryCardGrid } from "./GalleryGridCard";
+import { GalleryCardGrid } from "./GalleryCardGrid";
 import { View } from "../List/views";
 import { PatchComponent } from "src/patch";
 import { IItemListOperation } from "../List/FilteredListToolbar";
diff --git a/ui/v2.5/src/components/Groups/GroupCardGrid.tsx b/ui/v2.5/src/components/Groups/GroupCardGrid.tsx
index 3ad6b02c4..e3b70c75f 100644
--- a/ui/v2.5/src/components/Groups/GroupCardGrid.tsx
+++ b/ui/v2.5/src/components/Groups/GroupCardGrid.tsx
@@ -5,6 +5,7 @@ import {
   useCardWidth,
   useContainerDimensions,
 } from "../Shared/GridCard/GridCard";
+import { PatchComponent } from "src/patch";
 
 interface IGroupCardGrid {
   groups: GQL.ListGroupDataFragment[];
@@ -17,34 +18,30 @@ interface IGroupCardGrid {
 
 const zoomWidths = [210, 250, 300, 375];
 
-export const GroupCardGrid: React.FC<IGroupCardGrid> = ({
-  groups,
-  selectedIds,
-  zoomIndex,
-  onSelectChange,
-  fromGroupId,
-  onMove,
-}) => {
-  const [componentRef, { width: containerWidth }] = useContainerDimensions();
-  const cardWidth = useCardWidth(containerWidth, zoomIndex, zoomWidths);
+export const GroupCardGrid: React.FC<IGroupCardGrid> = PatchComponent(
+  "GroupCardGrid",
+  ({ groups, selectedIds, zoomIndex, onSelectChange, fromGroupId, onMove }) => {
+    const [componentRef, { width: containerWidth }] = useContainerDimensions();
+    const cardWidth = useCardWidth(containerWidth, zoomIndex, zoomWidths);
 
-  return (
-    <div className="row justify-content-center" ref={componentRef}>
-      {groups.map((p) => (
-        <GroupCard
-          key={p.id}
-          cardWidth={cardWidth}
-          group={p}
-          zoomIndex={zoomIndex}
-          selecting={selectedIds.size > 0}
-          selected={selectedIds.has(p.id)}
-          onSelectedChanged={(selected: boolean, shiftKey: boolean) =>
-            onSelectChange(p.id, selected, shiftKey)
-          }
-          fromGroupId={fromGroupId}
-          onMove={onMove}
-        />
-      ))}
-    </div>
-  );
-};
+    return (
+      <div className="row justify-content-center" ref={componentRef}>
+        {groups.map((p) => (
+          <GroupCard
+            key={p.id}
+            cardWidth={cardWidth}
+            group={p}
+            zoomIndex={zoomIndex}
+            selecting={selectedIds.size > 0}
+            selected={selectedIds.has(p.id)}
+            onSelectedChanged={(selected: boolean, shiftKey: boolean) =>
+              onSelectChange(p.id, selected, shiftKey)
+            }
+            fromGroupId={fromGroupId}
+            onMove={onMove}
+          />
+        ))}
+      </div>
+    );
+  }
+);
diff --git a/ui/v2.5/src/components/Images/ImageCardGrid.tsx b/ui/v2.5/src/components/Images/ImageCardGrid.tsx
new file mode 100644
index 000000000..dadab571b
--- /dev/null
+++ b/ui/v2.5/src/components/Images/ImageCardGrid.tsx
@@ -0,0 +1,47 @@
+import React from "react";
+import * as GQL from "src/core/generated-graphql";
+import { ImageCard } from "./ImageCard";
+import {
+  useCardWidth,
+  useContainerDimensions,
+} from "../Shared/GridCard/GridCard";
+import { PatchComponent } from "src/patch";
+
+interface IImageCardGrid {
+  images: GQL.SlimImageDataFragment[];
+  selectedIds: Set<string>;
+  zoomIndex: number;
+  onSelectChange: (id: string, selected: boolean, shiftKey: boolean) => void;
+  onPreview: (index: number, ev: React.MouseEvent<Element, MouseEvent>) => void;
+}
+
+const zoomWidths = [280, 340, 480, 640];
+
+export const ImageCardGrid: React.FC<IImageCardGrid> = PatchComponent(
+  "ImageCardGrid",
+  ({ images, selectedIds, zoomIndex, onSelectChange, onPreview }) => {
+    const [componentRef, { width: containerWidth }] = useContainerDimensions();
+    const cardWidth = useCardWidth(containerWidth, zoomIndex, zoomWidths);
+
+    return (
+      <div className="row justify-content-center" ref={componentRef}>
+        {images.map((image, index) => (
+          <ImageCard
+            key={image.id}
+            cardWidth={cardWidth}
+            image={image}
+            zoomIndex={zoomIndex}
+            selecting={selectedIds.size > 0}
+            selected={selectedIds.has(image.id)}
+            onSelectedChanged={(selected: boolean, shiftKey: boolean) =>
+              onSelectChange(image.id, selected, shiftKey)
+            }
+            onPreview={
+              selectedIds.size < 1 ? (ev) => onPreview(index, ev) : undefined
+            }
+          />
+        ))}
+      </div>
+    );
+  }
+);
diff --git a/ui/v2.5/src/components/Images/ImageGridCard.tsx b/ui/v2.5/src/components/Images/ImageGridCard.tsx
deleted file mode 100644
index cbb76d853..000000000
--- a/ui/v2.5/src/components/Images/ImageGridCard.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-import React from "react";
-import * as GQL from "src/core/generated-graphql";
-import { ImageCard } from "./ImageCard";
-import {
-  useCardWidth,
-  useContainerDimensions,
-} from "../Shared/GridCard/GridCard";
-
-interface IImageCardGrid {
-  images: GQL.SlimImageDataFragment[];
-  selectedIds: Set<string>;
-  zoomIndex: number;
-  onSelectChange: (id: string, selected: boolean, shiftKey: boolean) => void;
-  onPreview: (index: number, ev: React.MouseEvent<Element, MouseEvent>) => void;
-}
-
-const zoomWidths = [280, 340, 480, 640];
-
-export const ImageGridCard: React.FC<IImageCardGrid> = ({
-  images,
-  selectedIds,
-  zoomIndex,
-  onSelectChange,
-  onPreview,
-}) => {
-  const [componentRef, { width: containerWidth }] = useContainerDimensions();
-  const cardWidth = useCardWidth(containerWidth, zoomIndex, zoomWidths);
-
-  return (
-    <div className="row justify-content-center" ref={componentRef}>
-      {images.map((image, index) => (
-        <ImageCard
-          key={image.id}
-          cardWidth={cardWidth}
-          image={image}
-          zoomIndex={zoomIndex}
-          selecting={selectedIds.size > 0}
-          selected={selectedIds.has(image.id)}
-          onSelectedChanged={(selected: boolean, shiftKey: boolean) =>
-            onSelectChange(image.id, selected, shiftKey)
-          }
-          onPreview={
-            selectedIds.size < 1 ? (ev) => onPreview(index, ev) : undefined
-          }
-        />
-      ))}
-    </div>
-  );
-};
diff --git a/ui/v2.5/src/components/Images/ImageList.tsx b/ui/v2.5/src/components/Images/ImageList.tsx
index 79496823d..7928090cc 100644
--- a/ui/v2.5/src/components/Images/ImageList.tsx
+++ b/ui/v2.5/src/components/Images/ImageList.tsx
@@ -22,7 +22,7 @@ import Gallery, { RenderImageProps } from "react-photo-gallery";
 import { ExportDialog } from "../Shared/ExportDialog";
 import { objectTitle } from "src/core/files";
 import { useConfigurationContext } from "src/hooks/Config";
-import { ImageGridCard } from "./ImageGridCard";
+import { ImageCardGrid } from "./ImageCardGrid";
 import { View } from "../List/views";
 import { IItemListOperation } from "../List/FilteredListToolbar";
 import { FileSize } from "../Shared/FileSize";
@@ -263,7 +263,7 @@ const ImageListImages: React.FC<IImageListImages> = ({
 
   if (filter.displayMode === DisplayMode.Grid) {
     return (
-      <ImageGridCard
+      <ImageCardGrid
         images={images}
         selectedIds={selectedIds}
         zoomIndex={filter.zoomIndex}
diff --git a/ui/v2.5/src/components/Performers/PerformerCardGrid.tsx b/ui/v2.5/src/components/Performers/PerformerCardGrid.tsx
index f8c02d5a7..9d10c0dd1 100644
--- a/ui/v2.5/src/components/Performers/PerformerCardGrid.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerCardGrid.tsx
@@ -5,6 +5,7 @@ import {
   useCardWidth,
   useContainerDimensions,
 } from "../Shared/GridCard/GridCard";
+import { PatchComponent } from "src/patch";
 
 interface IPerformerCardGrid {
   performers: GQL.PerformerDataFragment[];
@@ -16,32 +17,29 @@ interface IPerformerCardGrid {
 
 const zoomWidths = [240, 300, 375, 470];
 
-export const PerformerCardGrid: React.FC<IPerformerCardGrid> = ({
-  performers,
-  selectedIds,
-  zoomIndex,
-  onSelectChange,
-  extraCriteria,
-}) => {
-  const [componentRef, { width: containerWidth }] = useContainerDimensions();
-  const cardWidth = useCardWidth(containerWidth, zoomIndex, zoomWidths);
+export const PerformerCardGrid: React.FC<IPerformerCardGrid> = PatchComponent(
+  "PerformerCardGrid",
+  ({ performers, selectedIds, zoomIndex, onSelectChange, extraCriteria }) => {
+    const [componentRef, { width: containerWidth }] = useContainerDimensions();
+    const cardWidth = useCardWidth(containerWidth, zoomIndex, zoomWidths);
 
-  return (
-    <div className="row justify-content-center" ref={componentRef}>
-      {performers.map((p) => (
-        <PerformerCard
-          key={p.id}
-          cardWidth={cardWidth}
-          performer={p}
-          zoomIndex={zoomIndex}
-          selecting={selectedIds.size > 0}
-          selected={selectedIds.has(p.id)}
-          onSelectedChanged={(selected: boolean, shiftKey: boolean) =>
-            onSelectChange(p.id, selected, shiftKey)
-          }
-          extraCriteria={extraCriteria}
-        />
-      ))}
-    </div>
-  );
-};
+    return (
+      <div className="row justify-content-center" ref={componentRef}>
+        {performers.map((p) => (
+          <PerformerCard
+            key={p.id}
+            cardWidth={cardWidth}
+            performer={p}
+            zoomIndex={zoomIndex}
+            selecting={selectedIds.size > 0}
+            selected={selectedIds.has(p.id)}
+            onSelectedChanged={(selected: boolean, shiftKey: boolean) =>
+              onSelectChange(p.id, selected, shiftKey)
+            }
+            extraCriteria={extraCriteria}
+          />
+        ))}
+      </div>
+    );
+  }
+);
diff --git a/ui/v2.5/src/components/Scenes/SceneCardGrid.tsx b/ui/v2.5/src/components/Scenes/SceneCardGrid.tsx
new file mode 100644
index 000000000..f60b412d3
--- /dev/null
+++ b/ui/v2.5/src/components/Scenes/SceneCardGrid.tsx
@@ -0,0 +1,50 @@
+import React from "react";
+import * as GQL from "src/core/generated-graphql";
+import { SceneQueue } from "src/models/sceneQueue";
+import { SceneCard } from "./SceneCard";
+import {
+  useCardWidth,
+  useContainerDimensions,
+} from "../Shared/GridCard/GridCard";
+import { PatchComponent } from "src/patch";
+
+interface ISceneCardGrid {
+  scenes: GQL.SlimSceneDataFragment[];
+  queue?: SceneQueue;
+  selectedIds: Set<string>;
+  zoomIndex: number;
+  onSelectChange: (id: string, selected: boolean, shiftKey: boolean) => void;
+  fromGroupId?: string;
+}
+
+const zoomWidths = [280, 340, 480, 640];
+
+export const SceneCardGrid: React.FC<ISceneCardGrid> = PatchComponent(
+  "SceneCardGrid",
+  ({ scenes, queue, selectedIds, zoomIndex, onSelectChange, fromGroupId }) => {
+    const [componentRef, { width: containerWidth }] = useContainerDimensions();
+
+    const cardWidth = useCardWidth(containerWidth, zoomIndex, zoomWidths);
+
+    return (
+      <div className="row justify-content-center" ref={componentRef}>
+        {scenes.map((scene, index) => (
+          <SceneCard
+            key={scene.id}
+            width={cardWidth}
+            scene={scene}
+            queue={queue}
+            index={index}
+            zoomIndex={zoomIndex}
+            selecting={selectedIds.size > 0}
+            selected={selectedIds.has(scene.id)}
+            onSelectedChanged={(selected: boolean, shiftKey: boolean) =>
+              onSelectChange(scene.id, selected, shiftKey)
+            }
+            fromGroupId={fromGroupId}
+          />
+        ))}
+      </div>
+    );
+  }
+);
diff --git a/ui/v2.5/src/components/Scenes/SceneCardsGrid.tsx b/ui/v2.5/src/components/Scenes/SceneCardsGrid.tsx
deleted file mode 100644
index 03b907938..000000000
--- a/ui/v2.5/src/components/Scenes/SceneCardsGrid.tsx
+++ /dev/null
@@ -1,53 +0,0 @@
-import React from "react";
-import * as GQL from "src/core/generated-graphql";
-import { SceneQueue } from "src/models/sceneQueue";
-import { SceneCard } from "./SceneCard";
-import {
-  useCardWidth,
-  useContainerDimensions,
-} from "../Shared/GridCard/GridCard";
-
-interface ISceneCardsGrid {
-  scenes: GQL.SlimSceneDataFragment[];
-  queue?: SceneQueue;
-  selectedIds: Set<string>;
-  zoomIndex: number;
-  onSelectChange: (id: string, selected: boolean, shiftKey: boolean) => void;
-  fromGroupId?: string;
-}
-
-const zoomWidths = [280, 340, 480, 640];
-
-export const SceneCardsGrid: React.FC<ISceneCardsGrid> = ({
-  scenes,
-  queue,
-  selectedIds,
-  zoomIndex,
-  onSelectChange,
-  fromGroupId,
-}) => {
-  const [componentRef, { width: containerWidth }] = useContainerDimensions();
-
-  const cardWidth = useCardWidth(containerWidth, zoomIndex, zoomWidths);
-
-  return (
-    <div className="row justify-content-center" ref={componentRef}>
-      {scenes.map((scene, index) => (
-        <SceneCard
-          key={scene.id}
-          width={cardWidth}
-          scene={scene}
-          queue={queue}
-          index={index}
-          zoomIndex={zoomIndex}
-          selecting={selectedIds.size > 0}
-          selected={selectedIds.has(scene.id)}
-          onSelectedChanged={(selected: boolean, shiftKey: boolean) =>
-            onSelectChange(scene.id, selected, shiftKey)
-          }
-          fromGroupId={fromGroupId}
-        />
-      ))}
-    </div>
-  );
-};
diff --git a/ui/v2.5/src/components/Scenes/SceneList.tsx b/ui/v2.5/src/components/Scenes/SceneList.tsx
index d139c6a72..b85ca7ad8 100644
--- a/ui/v2.5/src/components/Scenes/SceneList.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneList.tsx
@@ -15,7 +15,7 @@ import { EditScenesDialog } from "./EditScenesDialog";
 import { DeleteScenesDialog } from "./DeleteScenesDialog";
 import { GenerateDialog } from "../Dialogs/GenerateDialog";
 import { ExportDialog } from "../Shared/ExportDialog";
-import { SceneCardsGrid } from "./SceneCardsGrid";
+import { SceneCardGrid } from "./SceneCardGrid";
 import { TaggerContext } from "../Tagger/context";
 import { IdentifyDialog } from "../Dialogs/IdentifyDialog/IdentifyDialog";
 import { useConfigurationContext } from "src/hooks/Config";
@@ -209,7 +209,7 @@ const SceneList: React.FC<{
 
   if (filter.displayMode === DisplayMode.Grid) {
     return (
-      <SceneCardsGrid
+      <SceneCardGrid
         scenes={scenes}
         queue={queue}
         zoomIndex={filter.zoomIndex}
diff --git a/ui/v2.5/src/components/Scenes/SceneMarkerCardGrid.tsx b/ui/v2.5/src/components/Scenes/SceneMarkerCardGrid.tsx
new file mode 100644
index 000000000..ad869918b
--- /dev/null
+++ b/ui/v2.5/src/components/Scenes/SceneMarkerCardGrid.tsx
@@ -0,0 +1,46 @@
+import React from "react";
+import * as GQL from "src/core/generated-graphql";
+import { SceneMarkerCard } from "./SceneMarkerCard";
+import {
+  useCardWidth,
+  useContainerDimensions,
+} from "../Shared/GridCard/GridCard";
+import { PatchComponent } from "src/patch";
+
+interface ISceneMarkerCardGrid {
+  markers: GQL.SceneMarkerDataFragment[];
+  selectedIds: Set<string>;
+  zoomIndex: number;
+  onSelectChange: (id: string, selected: boolean, shiftKey: boolean) => void;
+}
+
+const zoomWidths = [240, 340, 480, 640];
+
+export const SceneMarkerCardGrid: React.FC<ISceneMarkerCardGrid> =
+  PatchComponent(
+    "SceneMarkerCardGrid",
+    ({ markers, selectedIds, zoomIndex, onSelectChange }) => {
+      const [componentRef, { width: containerWidth }] =
+        useContainerDimensions();
+      const cardWidth = useCardWidth(containerWidth, zoomIndex, zoomWidths);
+
+      return (
+        <div className="row justify-content-center" ref={componentRef}>
+          {markers.map((marker, index) => (
+            <SceneMarkerCard
+              key={marker.id}
+              cardWidth={cardWidth}
+              marker={marker}
+              index={index}
+              zoomIndex={zoomIndex}
+              selecting={selectedIds.size > 0}
+              selected={selectedIds.has(marker.id)}
+              onSelectedChanged={(selected: boolean, shiftKey: boolean) =>
+                onSelectChange(marker.id, selected, shiftKey)
+              }
+            />
+          ))}
+        </div>
+      );
+    }
+  );
diff --git a/ui/v2.5/src/components/Scenes/SceneMarkerCardsGrid.tsx b/ui/v2.5/src/components/Scenes/SceneMarkerCardsGrid.tsx
deleted file mode 100644
index 9f01fe6da..000000000
--- a/ui/v2.5/src/components/Scenes/SceneMarkerCardsGrid.tsx
+++ /dev/null
@@ -1,45 +0,0 @@
-import React from "react";
-import * as GQL from "src/core/generated-graphql";
-import { SceneMarkerCard } from "./SceneMarkerCard";
-import {
-  useCardWidth,
-  useContainerDimensions,
-} from "../Shared/GridCard/GridCard";
-
-interface ISceneMarkerCardsGrid {
-  markers: GQL.SceneMarkerDataFragment[];
-  selectedIds: Set<string>;
-  zoomIndex: number;
-  onSelectChange: (id: string, selected: boolean, shiftKey: boolean) => void;
-}
-
-const zoomWidths = [240, 340, 480, 640];
-
-export const SceneMarkerCardsGrid: React.FC<ISceneMarkerCardsGrid> = ({
-  markers,
-  selectedIds,
-  zoomIndex,
-  onSelectChange,
-}) => {
-  const [componentRef, { width: containerWidth }] = useContainerDimensions();
-  const cardWidth = useCardWidth(containerWidth, zoomIndex, zoomWidths);
-
-  return (
-    <div className="row justify-content-center" ref={componentRef}>
-      {markers.map((marker, index) => (
-        <SceneMarkerCard
-          key={marker.id}
-          cardWidth={cardWidth}
-          marker={marker}
-          index={index}
-          zoomIndex={zoomIndex}
-          selecting={selectedIds.size > 0}
-          selected={selectedIds.has(marker.id)}
-          onSelectedChanged={(selected: boolean, shiftKey: boolean) =>
-            onSelectChange(marker.id, selected, shiftKey)
-          }
-        />
-      ))}
-    </div>
-  );
-};
diff --git a/ui/v2.5/src/components/Scenes/SceneMarkerList.tsx b/ui/v2.5/src/components/Scenes/SceneMarkerList.tsx
index 074ee2b83..b5975ca5a 100644
--- a/ui/v2.5/src/components/Scenes/SceneMarkerList.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneMarkerList.tsx
@@ -14,7 +14,7 @@ import { ListFilterModel } from "src/models/list-filter/filter";
 import { DisplayMode } from "src/models/list-filter/types";
 import { MarkerWallPanel } from "./SceneMarkerWallPanel";
 import { View } from "../List/views";
-import { SceneMarkerCardsGrid } from "./SceneMarkerCardsGrid";
+import { SceneMarkerCardGrid } from "./SceneMarkerCardGrid";
 import { DeleteSceneMarkersDialog } from "./DeleteSceneMarkersDialog";
 import { EditSceneMarkersDialog } from "./EditSceneMarkersDialog";
 import { PatchComponent } from "src/patch";
@@ -109,7 +109,7 @@ export const SceneMarkerList: React.FC<ISceneMarkerList> = PatchComponent(
 
       if (filter.displayMode === DisplayMode.Grid) {
         return (
-          <SceneMarkerCardsGrid
+          <SceneMarkerCardGrid
             markers={result.data.findSceneMarkers.scene_markers}
             zoomIndex={filter.zoomIndex}
             selectedIds={selectedIds}
diff --git a/ui/v2.5/src/components/Studios/StudioCardGrid.tsx b/ui/v2.5/src/components/Studios/StudioCardGrid.tsx
index 311d4e9d6..8edba4da2 100644
--- a/ui/v2.5/src/components/Studios/StudioCardGrid.tsx
+++ b/ui/v2.5/src/components/Studios/StudioCardGrid.tsx
@@ -5,6 +5,7 @@ import {
   useContainerDimensions,
 } from "../Shared/GridCard/GridCard";
 import { StudioCard } from "./StudioCard";
+import { PatchComponent } from "src/patch";
 
 interface IStudioCardGrid {
   studios: GQL.StudioDataFragment[];
@@ -16,32 +17,29 @@ interface IStudioCardGrid {
 
 const zoomWidths = [280, 340, 420, 560];
 
-export const StudioCardGrid: React.FC<IStudioCardGrid> = ({
-  studios,
-  fromParent,
-  selectedIds,
-  zoomIndex,
-  onSelectChange,
-}) => {
-  const [componentRef, { width: containerWidth }] = useContainerDimensions();
-  const cardWidth = useCardWidth(containerWidth, zoomIndex, zoomWidths);
+export const StudioCardGrid: React.FC<IStudioCardGrid> = PatchComponent(
+  "StudioCardGrid",
+  ({ studios, fromParent, selectedIds, zoomIndex, onSelectChange }) => {
+    const [componentRef, { width: containerWidth }] = useContainerDimensions();
+    const cardWidth = useCardWidth(containerWidth, zoomIndex, zoomWidths);
 
-  return (
-    <div className="row justify-content-center" ref={componentRef}>
-      {studios.map((studio) => (
-        <StudioCard
-          key={studio.id}
-          cardWidth={cardWidth}
-          studio={studio}
-          zoomIndex={zoomIndex}
-          hideParent={fromParent}
-          selecting={selectedIds.size > 0}
-          selected={selectedIds.has(studio.id)}
-          onSelectedChanged={(selected: boolean, shiftKey: boolean) =>
-            onSelectChange(studio.id, selected, shiftKey)
-          }
-        />
-      ))}
-    </div>
-  );
-};
+    return (
+      <div className="row justify-content-center" ref={componentRef}>
+        {studios.map((studio) => (
+          <StudioCard
+            key={studio.id}
+            cardWidth={cardWidth}
+            studio={studio}
+            zoomIndex={zoomIndex}
+            hideParent={fromParent}
+            selecting={selectedIds.size > 0}
+            selected={selectedIds.has(studio.id)}
+            onSelectedChanged={(selected: boolean, shiftKey: boolean) =>
+              onSelectChange(studio.id, selected, shiftKey)
+            }
+          />
+        ))}
+      </div>
+    );
+  }
+);
diff --git a/ui/v2.5/src/components/Tags/TagCardGrid.tsx b/ui/v2.5/src/components/Tags/TagCardGrid.tsx
index ac3bf0317..d779da7e0 100644
--- a/ui/v2.5/src/components/Tags/TagCardGrid.tsx
+++ b/ui/v2.5/src/components/Tags/TagCardGrid.tsx
@@ -5,6 +5,7 @@ import {
   useContainerDimensions,
 } from "../Shared/GridCard/GridCard";
 import { TagCard } from "./TagCard";
+import { PatchComponent } from "src/patch";
 
 interface ITagCardGrid {
   tags: (GQL.TagDataFragment | GQL.TagListDataFragment)[];
@@ -15,30 +16,28 @@ interface ITagCardGrid {
 
 const zoomWidths = [280, 340, 480, 640];
 
-export const TagCardGrid: React.FC<ITagCardGrid> = ({
-  tags,
-  selectedIds,
-  zoomIndex,
-  onSelectChange,
-}) => {
-  const [componentRef, { width: containerWidth }] = useContainerDimensions();
-  const cardWidth = useCardWidth(containerWidth, zoomIndex, zoomWidths);
+export const TagCardGrid: React.FC<ITagCardGrid> = PatchComponent(
+  "TagCardGrid",
+  ({ tags, selectedIds, zoomIndex, onSelectChange }) => {
+    const [componentRef, { width: containerWidth }] = useContainerDimensions();
+    const cardWidth = useCardWidth(containerWidth, zoomIndex, zoomWidths);
 
-  return (
-    <div className="row justify-content-center" ref={componentRef}>
-      {tags.map((tag) => (
-        <TagCard
-          key={tag.id}
-          cardWidth={cardWidth}
-          tag={tag}
-          zoomIndex={zoomIndex}
-          selecting={selectedIds.size > 0}
-          selected={selectedIds.has(tag.id)}
-          onSelectedChanged={(selected: boolean, shiftKey: boolean) =>
-            onSelectChange(tag.id, selected, shiftKey)
-          }
-        />
-      ))}
-    </div>
-  );
-};
+    return (
+      <div className="row justify-content-center" ref={componentRef}>
+        {tags.map((tag) => (
+          <TagCard
+            key={tag.id}
+            cardWidth={cardWidth}
+            tag={tag}
+            zoomIndex={zoomIndex}
+            selecting={selectedIds.size > 0}
+            selected={selectedIds.has(tag.id)}
+            onSelectedChanged={(selected: boolean, shiftKey: boolean) =>
+              onSelectChange(tag.id, selected, shiftKey)
+            }
+          />
+        ))}
+      </div>
+    );
+  }
+);
diff --git a/ui/v2.5/src/pluginApi.d.ts b/ui/v2.5/src/pluginApi.d.ts
index 9372f333d..680f39cd0 100644
--- a/ui/v2.5/src/pluginApi.d.ts
+++ b/ui/v2.5/src/pluginApi.d.ts
@@ -672,6 +672,7 @@ declare namespace PluginApi {
     "GalleryCard.Image": React.FC<any>;
     "GalleryCard.Overlays": React.FC<any>;
     "GalleryCard.Popovers": React.FC<any>;
+    GalleryCardGrid: React.FC<any>;
     GalleryAddPanel: React.FC<any>;
     GalleryIDSelect: React.FC<any>;
     GalleryImagesPanel: React.FC<any>;
@@ -679,6 +680,7 @@ declare namespace PluginApi {
     GallerySelect: React.FC<any>;
     GridCard: React.FC<any>;
     GroupCard: React.FC<any>;
+    GroupCardGrid: React.FC<any>;
     GroupIDSelect: React.FC<any>;
     GroupList: React.FC<any>;
     GroupSelect: React.FC<any>;
@@ -687,6 +689,7 @@ declare namespace PluginApi {
     HoverPopover: React.FC<any>;
     Icon: React.FC<any>;
     ImageCard: React.FC<any>;
+    ImageCardGrid: React.FC<any>;
     ImageInput: React.FC<any>;
     ImageList: React.FC<any>;
     LightboxLink: React.FC<any>;
@@ -697,6 +700,7 @@ declare namespace PluginApi {
     NumberSetting: React.FC<any>;
     PerformerAppearsWithPanel: React.FC<any>;
     PerformerCard: React.FC<any>;
+    PerformerCardGrid: React.FC<any>;
     "PerformerCard.Details": React.FC<any>;
     "PerformerCard.Image": React.FC<any>;
     "PerformerCard.Overlays": React.FC<any>;
@@ -728,12 +732,14 @@ declare namespace PluginApi {
     "SceneCard.Image": React.FC<any>;
     "SceneCard.Overlays": React.FC<any>;
     "SceneCard.Popovers": React.FC<any>;
+    SceneCardGrid: React.FC<any>;
     SceneList: React.FC<any>;
     SceneListOperations: React.FC<any>;
     SceneMarkerCard: React.FC<any>;
     "SceneMarkerCard.Details": React.FC<any>;
     "SceneMarkerCard.Image": React.FC<any>;
     "SceneMarkerCard.Popovers": React.FC<any>;
+    SceneMarkerCardGrid: React.FC<any>;
     SceneMarkerList: React.FC<any>;
     SelectSetting: React.FC<any>;
     Setting: React.FC<any>;
@@ -742,6 +748,7 @@ declare namespace PluginApi {
     StringListSetting: React.FC<any>;
     StringSetting: React.FC<any>;
     StudioCard: React.FC<any>;
+    StudioCardGrid: React.FC<any>;
     StudioDetailsPanel: React.FC<any>;
     StudioIDSelect: React.FC<any>;
     StudioList: React.FC<any>;
@@ -754,6 +761,7 @@ declare namespace PluginApi {
     "TagCard.Overlays": React.FC<any>;
     "TagCard.Popovers": React.FC<any>;
     "TagCard.Title": React.FC<any>;
+    TagCardGrid: React.FC<any>;
     TagLink: React.FC<any>;
     TagList: React.FC<any>;
     TagSelect: React.FC<any>;

From b4969add2747310f34079f01d5f40de1fc679a9d Mon Sep 17 00:00:00 2001
From: Valkyr-JS <154020147+Valkyr-JS@users.noreply.github.com>
Date: Tue, 13 Jan 2026 22:29:57 +0000
Subject: [PATCH 253/405] Plugin API - recommendation row components (#6492)

* Patched RecommendationRow component
* Patched @ant-design/react-slick library to ReactSlick
* Patched GalleryRecommendationRow component
* Patched GroupRecommendationRow component
* Patched ImageRecommendationRow component
* Patched PerformerRecommendationRow component
* Patched SceneRecommendationRow component
* Patched SceneMarkerRecommendationRow component
* Patched StudioRecommendationRow component
* Patched TagRecommendationRow component
---
 .../FrontPage/RecommendationRow.tsx           | 30 +++----
 .../Galleries/GalleryRecommendationRow.tsx    | 74 +++++++--------
 .../Groups/GroupRecommendationRow.tsx         | 71 ++++++++-------
 .../Images/ImageRecommendationRow.tsx         | 71 ++++++++-------
 .../Performers/PerformerRecommendationRow.tsx | 74 +++++++--------
 .../Scenes/SceneMarkerRecommendationRow.tsx   | 86 +++++++++---------
 .../Scenes/SceneRecommendationRow.tsx         | 89 ++++++++++---------
 .../Studios/StudioRecommendationRow.tsx       | 74 +++++++--------
 .../components/Tags/TagRecommendationRow.tsx  | 68 +++++++-------
 ui/v2.5/src/pluginApi.d.ts                    | 10 +++
 ui/v2.5/src/pluginApi.tsx                     |  2 +
 11 files changed, 352 insertions(+), 297 deletions(-)

diff --git a/ui/v2.5/src/components/FrontPage/RecommendationRow.tsx b/ui/v2.5/src/components/FrontPage/RecommendationRow.tsx
index 0b48434c0..115d8642a 100644
--- a/ui/v2.5/src/components/FrontPage/RecommendationRow.tsx
+++ b/ui/v2.5/src/components/FrontPage/RecommendationRow.tsx
@@ -1,4 +1,5 @@
 import React, { PropsWithChildren } from "react";
+import { PatchComponent } from "src/patch";
 
 interface IProps {
   className?: string;
@@ -6,19 +7,18 @@ interface IProps {
   link: JSX.Element;
 }
 
-export const RecommendationRow: React.FC<PropsWithChildren<IProps>> = ({
-  className,
-  header,
-  link,
-  children,
-}) => (
-  <div className={`recommendation-row ${className}`}>
-    <div className="recommendation-row-head">
-      <div>
-        <h2>{header}</h2>
+export const RecommendationRow: React.FC<PropsWithChildren<IProps>> =
+  PatchComponent(
+    "RecommendationRow",
+    ({ className, header, link, children }) => (
+      <div className={`recommendation-row ${className}`}>
+        <div className="recommendation-row-head">
+          <div>
+            <h2>{header}</h2>
+          </div>
+          {link}
+        </div>
+        {children}
       </div>
-      {link}
-    </div>
-    {children}
-  </div>
-);
+    )
+  );
diff --git a/ui/v2.5/src/components/Galleries/GalleryRecommendationRow.tsx b/ui/v2.5/src/components/Galleries/GalleryRecommendationRow.tsx
index ee94d6da2..b56b48c36 100644
--- a/ui/v2.5/src/components/Galleries/GalleryRecommendationRow.tsx
+++ b/ui/v2.5/src/components/Galleries/GalleryRecommendationRow.tsx
@@ -7,6 +7,7 @@ import { ListFilterModel } from "src/models/list-filter/filter";
 import { getSlickSliderSettings } from "src/core/recommendations";
 import { RecommendationRow } from "../FrontPage/RecommendationRow";
 import { FormattedMessage } from "react-intl";
+import { PatchComponent } from "src/patch";
 
 interface IProps {
   isTouch: boolean;
@@ -14,41 +15,44 @@ interface IProps {
   header: string;
 }
 
-export const GalleryRecommendationRow: React.FC<IProps> = (props) => {
-  const result = useFindGalleries(props.filter);
-  const cardCount = result.data?.findGalleries.count;
+export const GalleryRecommendationRow: React.FC<IProps> = PatchComponent(
+  "GalleryRecommendationRow",
+  (props) => {
+    const result = useFindGalleries(props.filter);
+    const cardCount = result.data?.findGalleries.count;
 
-  if (!result.loading && !cardCount) {
-    return null;
-  }
+    if (!result.loading && !cardCount) {
+      return null;
+    }
 
-  return (
-    <RecommendationRow
-      className="gallery-recommendations"
-      header={props.header}
-      link={
-        <Link to={`/galleries?${props.filter.makeQueryParameters()}`}>
-          <FormattedMessage id="view_all" />
-        </Link>
-      }
-    >
-      <Slider
-        {...getSlickSliderSettings(
-          cardCount ? cardCount : props.filter.itemsPerPage,
-          props.isTouch
-        )}
+    return (
+      <RecommendationRow
+        className="gallery-recommendations"
+        header={props.header}
+        link={
+          <Link to={`/galleries?${props.filter.makeQueryParameters()}`}>
+            <FormattedMessage id="view_all" />
+          </Link>
+        }
       >
-        {result.loading
-          ? [...Array(props.filter.itemsPerPage)].map((i) => (
-              <div
-                key={`_${i}`}
-                className="gallery-skeleton skeleton-card"
-              ></div>
-            ))
-          : result.data?.findGalleries.galleries.map((g) => (
-              <GalleryCard key={g.id} gallery={g} zoomIndex={1} />
-            ))}
-      </Slider>
-    </RecommendationRow>
-  );
-};
+        <Slider
+          {...getSlickSliderSettings(
+            cardCount ? cardCount : props.filter.itemsPerPage,
+            props.isTouch
+          )}
+        >
+          {result.loading
+            ? [...Array(props.filter.itemsPerPage)].map((i) => (
+                <div
+                  key={`_${i}`}
+                  className="gallery-skeleton skeleton-card"
+                ></div>
+              ))
+            : result.data?.findGalleries.galleries.map((g) => (
+                <GalleryCard key={g.id} gallery={g} zoomIndex={1} />
+              ))}
+        </Slider>
+      </RecommendationRow>
+    );
+  }
+);
diff --git a/ui/v2.5/src/components/Groups/GroupRecommendationRow.tsx b/ui/v2.5/src/components/Groups/GroupRecommendationRow.tsx
index 3a8fee856..228cb3467 100644
--- a/ui/v2.5/src/components/Groups/GroupRecommendationRow.tsx
+++ b/ui/v2.5/src/components/Groups/GroupRecommendationRow.tsx
@@ -7,6 +7,7 @@ import { ListFilterModel } from "src/models/list-filter/filter";
 import { getSlickSliderSettings } from "src/core/recommendations";
 import { RecommendationRow } from "../FrontPage/RecommendationRow";
 import { FormattedMessage } from "react-intl";
+import { PatchComponent } from "src/patch";
 
 interface IProps {
   isTouch: boolean;
@@ -14,38 +15,44 @@ interface IProps {
   header: string;
 }
 
-export const GroupRecommendationRow: React.FC<IProps> = (props: IProps) => {
-  const result = useFindGroups(props.filter);
-  const cardCount = result.data?.findGroups.count;
+export const GroupRecommendationRow: React.FC<IProps> = PatchComponent(
+  "GroupRecommendationRow",
+  (props: IProps) => {
+    const result = useFindGroups(props.filter);
+    const cardCount = result.data?.findGroups.count;
 
-  if (!result.loading && !cardCount) {
-    return null;
-  }
+    if (!result.loading && !cardCount) {
+      return null;
+    }
 
-  return (
-    <RecommendationRow
-      className="group-recommendations"
-      header={props.header}
-      link={
-        <Link to={`/groups?${props.filter.makeQueryParameters()}`}>
-          <FormattedMessage id="view_all" />
-        </Link>
-      }
-    >
-      <Slider
-        {...getSlickSliderSettings(
-          cardCount ? cardCount : props.filter.itemsPerPage,
-          props.isTouch
-        )}
+    return (
+      <RecommendationRow
+        className="group-recommendations"
+        header={props.header}
+        link={
+          <Link to={`/groups?${props.filter.makeQueryParameters()}`}>
+            <FormattedMessage id="view_all" />
+          </Link>
+        }
       >
-        {result.loading
-          ? [...Array(props.filter.itemsPerPage)].map((i) => (
-              <div key={`_${i}`} className="group-skeleton skeleton-card"></div>
-            ))
-          : result.data?.findGroups.groups.map((g) => (
-              <GroupCard key={g.id} group={g} />
-            ))}
-      </Slider>
-    </RecommendationRow>
-  );
-};
+        <Slider
+          {...getSlickSliderSettings(
+            cardCount ? cardCount : props.filter.itemsPerPage,
+            props.isTouch
+          )}
+        >
+          {result.loading
+            ? [...Array(props.filter.itemsPerPage)].map((i) => (
+                <div
+                  key={`_${i}`}
+                  className="group-skeleton skeleton-card"
+                ></div>
+              ))
+            : result.data?.findGroups.groups.map((g) => (
+                <GroupCard key={g.id} group={g} />
+              ))}
+        </Slider>
+      </RecommendationRow>
+    );
+  }
+);
diff --git a/ui/v2.5/src/components/Images/ImageRecommendationRow.tsx b/ui/v2.5/src/components/Images/ImageRecommendationRow.tsx
index f0fc84493..6499be894 100644
--- a/ui/v2.5/src/components/Images/ImageRecommendationRow.tsx
+++ b/ui/v2.5/src/components/Images/ImageRecommendationRow.tsx
@@ -7,6 +7,7 @@ import { getSlickSliderSettings } from "src/core/recommendations";
 import { RecommendationRow } from "../FrontPage/RecommendationRow";
 import { FormattedMessage } from "react-intl";
 import { ImageCard } from "./ImageCard";
+import { PatchComponent } from "src/patch";
 
 interface IProps {
   isTouch: boolean;
@@ -14,38 +15,44 @@ interface IProps {
   header: string;
 }
 
-export const ImageRecommendationRow: React.FC<IProps> = (props: IProps) => {
-  const result = useFindImages(props.filter);
-  const cardCount = result.data?.findImages.count;
+export const ImageRecommendationRow: React.FC<IProps> = PatchComponent(
+  "ImageRecommendationRow",
+  (props: IProps) => {
+    const result = useFindImages(props.filter);
+    const cardCount = result.data?.findImages.count;
 
-  if (!result.loading && !cardCount) {
-    return null;
-  }
+    if (!result.loading && !cardCount) {
+      return null;
+    }
 
-  return (
-    <RecommendationRow
-      className="images-recommendations"
-      header={props.header}
-      link={
-        <Link to={`/images?${props.filter.makeQueryParameters()}`}>
-          <FormattedMessage id="view_all" />
-        </Link>
-      }
-    >
-      <Slider
-        {...getSlickSliderSettings(
-          cardCount ? cardCount : props.filter.itemsPerPage,
-          props.isTouch
-        )}
+    return (
+      <RecommendationRow
+        className="images-recommendations"
+        header={props.header}
+        link={
+          <Link to={`/images?${props.filter.makeQueryParameters()}`}>
+            <FormattedMessage id="view_all" />
+          </Link>
+        }
       >
-        {result.loading
-          ? [...Array(props.filter.itemsPerPage)].map((i) => (
-              <div key={`_${i}`} className="image-skeleton skeleton-card"></div>
-            ))
-          : result.data?.findImages.images.map((i) => (
-              <ImageCard key={i.id} image={i} zoomIndex={1} />
-            ))}
-      </Slider>
-    </RecommendationRow>
-  );
-};
+        <Slider
+          {...getSlickSliderSettings(
+            cardCount ? cardCount : props.filter.itemsPerPage,
+            props.isTouch
+          )}
+        >
+          {result.loading
+            ? [...Array(props.filter.itemsPerPage)].map((i) => (
+                <div
+                  key={`_${i}`}
+                  className="image-skeleton skeleton-card"
+                ></div>
+              ))
+            : result.data?.findImages.images.map((i) => (
+                <ImageCard key={i.id} image={i} zoomIndex={1} />
+              ))}
+        </Slider>
+      </RecommendationRow>
+    );
+  }
+);
diff --git a/ui/v2.5/src/components/Performers/PerformerRecommendationRow.tsx b/ui/v2.5/src/components/Performers/PerformerRecommendationRow.tsx
index 3c094f7ad..13bba1e99 100644
--- a/ui/v2.5/src/components/Performers/PerformerRecommendationRow.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerRecommendationRow.tsx
@@ -7,6 +7,7 @@ import { ListFilterModel } from "src/models/list-filter/filter";
 import { getSlickSliderSettings } from "src/core/recommendations";
 import { RecommendationRow } from "../FrontPage/RecommendationRow";
 import { FormattedMessage } from "react-intl";
+import { PatchComponent } from "src/patch";
 
 interface IProps {
   isTouch: boolean;
@@ -14,41 +15,44 @@ interface IProps {
   header: string;
 }
 
-export const PerformerRecommendationRow: React.FC<IProps> = (props) => {
-  const result = useFindPerformers(props.filter);
-  const cardCount = result.data?.findPerformers.count;
+export const PerformerRecommendationRow: React.FC<IProps> = PatchComponent(
+  "PerformerRecommendationRow",
+  (props) => {
+    const result = useFindPerformers(props.filter);
+    const cardCount = result.data?.findPerformers.count;
 
-  if (!result.loading && !cardCount) {
-    return null;
-  }
+    if (!result.loading && !cardCount) {
+      return null;
+    }
 
-  return (
-    <RecommendationRow
-      className="performer-recommendations"
-      header={props.header}
-      link={
-        <Link to={`/performers?${props.filter.makeQueryParameters()}`}>
-          <FormattedMessage id="view_all" />
-        </Link>
-      }
-    >
-      <Slider
-        {...getSlickSliderSettings(
-          cardCount ? cardCount : props.filter.itemsPerPage,
-          props.isTouch
-        )}
+    return (
+      <RecommendationRow
+        className="performer-recommendations"
+        header={props.header}
+        link={
+          <Link to={`/performers?${props.filter.makeQueryParameters()}`}>
+            <FormattedMessage id="view_all" />
+          </Link>
+        }
       >
-        {result.loading
-          ? [...Array(props.filter.itemsPerPage)].map((i) => (
-              <div
-                key={`_${i}`}
-                className="performer-skeleton skeleton-card"
-              ></div>
-            ))
-          : result.data?.findPerformers.performers.map((p) => (
-              <PerformerCard key={p.id} performer={p} />
-            ))}
-      </Slider>
-    </RecommendationRow>
-  );
-};
+        <Slider
+          {...getSlickSliderSettings(
+            cardCount ? cardCount : props.filter.itemsPerPage,
+            props.isTouch
+          )}
+        >
+          {result.loading
+            ? [...Array(props.filter.itemsPerPage)].map((i) => (
+                <div
+                  key={`_${i}`}
+                  className="performer-skeleton skeleton-card"
+                ></div>
+              ))
+            : result.data?.findPerformers.performers.map((p) => (
+                <PerformerCard key={p.id} performer={p} />
+              ))}
+        </Slider>
+      </RecommendationRow>
+    );
+  }
+);
diff --git a/ui/v2.5/src/components/Scenes/SceneMarkerRecommendationRow.tsx b/ui/v2.5/src/components/Scenes/SceneMarkerRecommendationRow.tsx
index 7559d609a..5c9769206 100644
--- a/ui/v2.5/src/components/Scenes/SceneMarkerRecommendationRow.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneMarkerRecommendationRow.tsx
@@ -7,6 +7,7 @@ import { getSlickSliderSettings } from "src/core/recommendations";
 import { RecommendationRow } from "../FrontPage/RecommendationRow";
 import { FormattedMessage } from "react-intl";
 import { SceneMarkerCard } from "./SceneMarkerCard";
+import { PatchComponent } from "src/patch";
 
 interface IProps {
   isTouch: boolean;
@@ -14,46 +15,51 @@ interface IProps {
   header: string;
 }
 
-export const SceneMarkerRecommendationRow: React.FC<IProps> = (props) => {
-  const result = useFindSceneMarkers(props.filter);
-  const cardCount = result.data?.findSceneMarkers.count;
+export const SceneMarkerRecommendationRow: React.FC<IProps> = PatchComponent(
+  "SceneMarkerRecommendationRow",
+  (props) => {
+    const result = useFindSceneMarkers(props.filter);
+    const cardCount = result.data?.findSceneMarkers.count;
 
-  if (!result.loading && !cardCount) {
-    return null;
-  }
+    if (!result.loading && !cardCount) {
+      return null;
+    }
 
-  return (
-    <RecommendationRow
-      className="scene-marker-recommendations"
-      header={props.header}
-      link={
-        <Link to={`/scenes/markers?${props.filter.makeQueryParameters()}`}>
-          <FormattedMessage id="view_all" />
-        </Link>
-      }
-    >
-      <Slider
-        {...getSlickSliderSettings(
-          cardCount ? cardCount : props.filter.itemsPerPage,
-          props.isTouch
-        )}
+    return (
+      <RecommendationRow
+        className="scene-marker-recommendations"
+        header={props.header}
+        link={
+          <Link to={`/scenes/markers?${props.filter.makeQueryParameters()}`}>
+            <FormattedMessage id="view_all" />
+          </Link>
+        }
       >
-        {result.loading
-          ? [...Array(props.filter.itemsPerPage)].map((i) => (
-              <div
-                key={`_${i}`}
-                className="scene-marker-skeleton skeleton-card"
-              ></div>
-            ))
-          : result.data?.findSceneMarkers.scene_markers.map((marker, index) => (
-              <SceneMarkerCard
-                key={marker.id}
-                marker={marker}
-                index={index}
-                zoomIndex={1}
-              />
-            ))}
-      </Slider>
-    </RecommendationRow>
-  );
-};
+        <Slider
+          {...getSlickSliderSettings(
+            cardCount ? cardCount : props.filter.itemsPerPage,
+            props.isTouch
+          )}
+        >
+          {result.loading
+            ? [...Array(props.filter.itemsPerPage)].map((i) => (
+                <div
+                  key={`_${i}`}
+                  className="scene-marker-skeleton skeleton-card"
+                ></div>
+              ))
+            : result.data?.findSceneMarkers.scene_markers.map(
+                (marker, index) => (
+                  <SceneMarkerCard
+                    key={marker.id}
+                    marker={marker}
+                    index={index}
+                    zoomIndex={1}
+                  />
+                )
+              )}
+        </Slider>
+      </RecommendationRow>
+    );
+  }
+);
diff --git a/ui/v2.5/src/components/Scenes/SceneRecommendationRow.tsx b/ui/v2.5/src/components/Scenes/SceneRecommendationRow.tsx
index d33762761..f90b63ec6 100644
--- a/ui/v2.5/src/components/Scenes/SceneRecommendationRow.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneRecommendationRow.tsx
@@ -8,6 +8,7 @@ import { ListFilterModel } from "src/models/list-filter/filter";
 import { getSlickSliderSettings } from "src/core/recommendations";
 import { RecommendationRow } from "../FrontPage/RecommendationRow";
 import { FormattedMessage } from "react-intl";
+import { PatchComponent } from "src/patch";
 
 interface IProps {
   isTouch: boolean;
@@ -15,48 +16,54 @@ interface IProps {
   header: string;
 }
 
-export const SceneRecommendationRow: React.FC<IProps> = (props) => {
-  const result = useFindScenes(props.filter);
-  const cardCount = result.data?.findScenes.count;
+export const SceneRecommendationRow: React.FC<IProps> = PatchComponent(
+  "SceneRecommendationRow",
+  (props) => {
+    const result = useFindScenes(props.filter);
+    const cardCount = result.data?.findScenes.count;
 
-  const queue = useMemo(() => {
-    return SceneQueue.fromListFilterModel(props.filter);
-  }, [props.filter]);
+    const queue = useMemo(() => {
+      return SceneQueue.fromListFilterModel(props.filter);
+    }, [props.filter]);
 
-  if (!result.loading && !cardCount) {
-    return null;
-  }
+    if (!result.loading && !cardCount) {
+      return null;
+    }
 
-  return (
-    <RecommendationRow
-      className="scene-recommendations"
-      header={props.header}
-      link={
-        <Link to={`/scenes?${props.filter.makeQueryParameters()}`}>
-          <FormattedMessage id="view_all" />
-        </Link>
-      }
-    >
-      <Slider
-        {...getSlickSliderSettings(
-          cardCount ? cardCount : props.filter.itemsPerPage,
-          props.isTouch
-        )}
+    return (
+      <RecommendationRow
+        className="scene-recommendations"
+        header={props.header}
+        link={
+          <Link to={`/scenes?${props.filter.makeQueryParameters()}`}>
+            <FormattedMessage id="view_all" />
+          </Link>
+        }
       >
-        {result.loading
-          ? [...Array(props.filter.itemsPerPage)].map((i) => (
-              <div key={`_${i}`} className="scene-skeleton skeleton-card"></div>
-            ))
-          : result.data?.findScenes.scenes.map((scene, index) => (
-              <SceneCard
-                key={scene.id}
-                scene={scene}
-                queue={queue}
-                index={index}
-                zoomIndex={1}
-              />
-            ))}
-      </Slider>
-    </RecommendationRow>
-  );
-};
+        <Slider
+          {...getSlickSliderSettings(
+            cardCount ? cardCount : props.filter.itemsPerPage,
+            props.isTouch
+          )}
+        >
+          {result.loading
+            ? [...Array(props.filter.itemsPerPage)].map((i) => (
+                <div
+                  key={`_${i}`}
+                  className="scene-skeleton skeleton-card"
+                ></div>
+              ))
+            : result.data?.findScenes.scenes.map((scene, index) => (
+                <SceneCard
+                  key={scene.id}
+                  scene={scene}
+                  queue={queue}
+                  index={index}
+                  zoomIndex={1}
+                />
+              ))}
+        </Slider>
+      </RecommendationRow>
+    );
+  }
+);
diff --git a/ui/v2.5/src/components/Studios/StudioRecommendationRow.tsx b/ui/v2.5/src/components/Studios/StudioRecommendationRow.tsx
index 3df4f65c6..bede2da1d 100644
--- a/ui/v2.5/src/components/Studios/StudioRecommendationRow.tsx
+++ b/ui/v2.5/src/components/Studios/StudioRecommendationRow.tsx
@@ -7,6 +7,7 @@ import { ListFilterModel } from "src/models/list-filter/filter";
 import { getSlickSliderSettings } from "src/core/recommendations";
 import { RecommendationRow } from "../FrontPage/RecommendationRow";
 import { FormattedMessage } from "react-intl";
+import { PatchComponent } from "src/patch";
 
 interface IProps {
   isTouch: boolean;
@@ -14,41 +15,44 @@ interface IProps {
   header: string;
 }
 
-export const StudioRecommendationRow: React.FC<IProps> = (props) => {
-  const result = useFindStudios(props.filter);
-  const cardCount = result.data?.findStudios.count;
+export const StudioRecommendationRow: React.FC<IProps> = PatchComponent(
+  "StudioRecommendationRow",
+  (props) => {
+    const result = useFindStudios(props.filter);
+    const cardCount = result.data?.findStudios.count;
 
-  if (!result.loading && !cardCount) {
-    return null;
-  }
+    if (!result.loading && !cardCount) {
+      return null;
+    }
 
-  return (
-    <RecommendationRow
-      className="studio-recommendations"
-      header={props.header}
-      link={
-        <Link to={`/studios?${props.filter.makeQueryParameters()}`}>
-          <FormattedMessage id="view_all" />
-        </Link>
-      }
-    >
-      <Slider
-        {...getSlickSliderSettings(
-          cardCount ? cardCount : props.filter.itemsPerPage,
-          props.isTouch
-        )}
+    return (
+      <RecommendationRow
+        className="studio-recommendations"
+        header={props.header}
+        link={
+          <Link to={`/studios?${props.filter.makeQueryParameters()}`}>
+            <FormattedMessage id="view_all" />
+          </Link>
+        }
       >
-        {result.loading
-          ? [...Array(props.filter.itemsPerPage)].map((i) => (
-              <div
-                key={`_${i}`}
-                className="studio-skeleton skeleton-card"
-              ></div>
-            ))
-          : result.data?.findStudios.studios.map((s) => (
-              <StudioCard key={s.id} studio={s} hideParent={true} />
-            ))}
-      </Slider>
-    </RecommendationRow>
-  );
-};
+        <Slider
+          {...getSlickSliderSettings(
+            cardCount ? cardCount : props.filter.itemsPerPage,
+            props.isTouch
+          )}
+        >
+          {result.loading
+            ? [...Array(props.filter.itemsPerPage)].map((i) => (
+                <div
+                  key={`_${i}`}
+                  className="studio-skeleton skeleton-card"
+                ></div>
+              ))
+            : result.data?.findStudios.studios.map((s) => (
+                <StudioCard key={s.id} studio={s} hideParent={true} />
+              ))}
+        </Slider>
+      </RecommendationRow>
+    );
+  }
+);
diff --git a/ui/v2.5/src/components/Tags/TagRecommendationRow.tsx b/ui/v2.5/src/components/Tags/TagRecommendationRow.tsx
index 9d10d7333..27e9e8dce 100644
--- a/ui/v2.5/src/components/Tags/TagRecommendationRow.tsx
+++ b/ui/v2.5/src/components/Tags/TagRecommendationRow.tsx
@@ -7,6 +7,7 @@ import { ListFilterModel } from "src/models/list-filter/filter";
 import { getSlickSliderSettings } from "src/core/recommendations";
 import { RecommendationRow } from "../FrontPage/RecommendationRow";
 import { FormattedMessage } from "react-intl";
+import { PatchComponent } from "src/patch";
 
 interface IProps {
   isTouch: boolean;
@@ -14,38 +15,41 @@ interface IProps {
   header: string;
 }
 
-export const TagRecommendationRow: React.FC<IProps> = (props) => {
-  const result = useFindTags(props.filter);
-  const cardCount = result.data?.findTags.count;
+export const TagRecommendationRow: React.FC<IProps> = PatchComponent(
+  "TagRecommendationRow",
+  (props) => {
+    const result = useFindTags(props.filter);
+    const cardCount = result.data?.findTags.count;
 
-  if (!result.loading && !cardCount) {
-    return null;
-  }
+    if (!result.loading && !cardCount) {
+      return null;
+    }
 
-  return (
-    <RecommendationRow
-      className="tag-recommendations"
-      header={props.header}
-      link={
-        <Link to={`/tags?${props.filter.makeQueryParameters()}`}>
-          <FormattedMessage id="view_all" />
-        </Link>
-      }
-    >
-      <Slider
-        {...getSlickSliderSettings(
-          cardCount ? cardCount : props.filter.itemsPerPage,
-          props.isTouch
-        )}
+    return (
+      <RecommendationRow
+        className="tag-recommendations"
+        header={props.header}
+        link={
+          <Link to={`/tags?${props.filter.makeQueryParameters()}`}>
+            <FormattedMessage id="view_all" />
+          </Link>
+        }
       >
-        {result.loading
-          ? [...Array(props.filter.itemsPerPage)].map((i) => (
-              <div key={`_${i}`} className="tag-skeleton skeleton-card"></div>
-            ))
-          : result.data?.findTags.tags.map((p) => (
-              <TagCard key={p.id} tag={p} zoomIndex={0} />
-            ))}
-      </Slider>
-    </RecommendationRow>
-  );
-};
+        <Slider
+          {...getSlickSliderSettings(
+            cardCount ? cardCount : props.filter.itemsPerPage,
+            props.isTouch
+          )}
+        >
+          {result.loading
+            ? [...Array(props.filter.itemsPerPage)].map((i) => (
+                <div key={`_${i}`} className="tag-skeleton skeleton-card"></div>
+              ))
+            : result.data?.findTags.tags.map((p) => (
+                <TagCard key={p.id} tag={p} zoomIndex={0} />
+              ))}
+        </Slider>
+      </RecommendationRow>
+    );
+  }
+);
diff --git a/ui/v2.5/src/pluginApi.d.ts b/ui/v2.5/src/pluginApi.d.ts
index 680f39cd0..1aae25129 100644
--- a/ui/v2.5/src/pluginApi.d.ts
+++ b/ui/v2.5/src/pluginApi.d.ts
@@ -619,6 +619,7 @@ declare namespace PluginApi {
     const Mousetrap: typeof import("mousetrap");
     const ReactFontAwesome: typeof import("@fortawesome/react-fontawesome");
     const ReactSelect: typeof import("react-select");
+    const ReactSlick: typeof import("@ant-design/react-slick");
 
     // @ts-expect-error
     import { MousetrapStatic } from "mousetrap";
@@ -677,12 +678,14 @@ declare namespace PluginApi {
     GalleryIDSelect: React.FC<any>;
     GalleryImagesPanel: React.FC<any>;
     GalleryList: React.FC<any>;
+    GalleryRecommendationRow: React.FC<any>;
     GallerySelect: React.FC<any>;
     GridCard: React.FC<any>;
     GroupCard: React.FC<any>;
     GroupCardGrid: React.FC<any>;
     GroupIDSelect: React.FC<any>;
     GroupList: React.FC<any>;
+    GroupRecommendationRow: React.FC<any>;
     GroupSelect: React.FC<any>;
     GroupSubGroupsPanel: React.FC<any>;
     HeaderImage: React.FC<any>;
@@ -692,6 +695,7 @@ declare namespace PluginApi {
     ImageCardGrid: React.FC<any>;
     ImageInput: React.FC<any>;
     ImageList: React.FC<any>;
+    ImageRecommendationRow: React.FC<any>;
     LightboxLink: React.FC<any>;
     LoadingIndicator: React.FC<any>;
     "MainNavBar.MenuItems": React.FC<any>;
@@ -715,12 +719,14 @@ declare namespace PluginApi {
     PerformerImagesPanel: React.FC<any>;
     PerformerList: React.FC<any>;
     PerformerPage: React.FC<any>;
+    PerformerRecommendationRow: React.FC<any>;
     PerformerScenesPanel: React.FC<any>;
     PerformerSelect: React.FC<any>;
     PluginSettings: React.FC<any>;
     RatingNumber: React.FC<any>;
     RatingStars: React.FC<any>;
     RatingSystem: React.FC<any>;
+    RecommendationRow: React.FC<any>;
     SceneFileInfoPanel: React.FC<any>;
     SceneIDSelect: React.FC<any>;
     ScenePage: React.FC<any>;
@@ -741,6 +747,8 @@ declare namespace PluginApi {
     "SceneMarkerCard.Popovers": React.FC<any>;
     SceneMarkerCardGrid: React.FC<any>;
     SceneMarkerList: React.FC<any>;
+    SceneMarkerRecommendationRow: React.FC<any>;
+    SceneRecommendationRow: React.FC<any>;
     SelectSetting: React.FC<any>;
     Setting: React.FC<any>;
     SettingGroup: React.FC<any>;
@@ -752,6 +760,7 @@ declare namespace PluginApi {
     StudioDetailsPanel: React.FC<any>;
     StudioIDSelect: React.FC<any>;
     StudioList: React.FC<any>;
+    StudioRecommendationRow: React.FC<any>;
     StudioSelect: React.FC<any>;
     SweatDrops: React.FC<any>;
     TabTitleCounter: React.FC<any>;
@@ -764,6 +773,7 @@ declare namespace PluginApi {
     TagCardGrid: React.FC<any>;
     TagLink: React.FC<any>;
     TagList: React.FC<any>;
+    TagRecommendationRow: React.FC<any>;
     TagSelect: React.FC<any>;
     TruncatedText: React.FC<any>;
   };
diff --git a/ui/v2.5/src/pluginApi.tsx b/ui/v2.5/src/pluginApi.tsx
index 276091cde..72441cec9 100644
--- a/ui/v2.5/src/pluginApi.tsx
+++ b/ui/v2.5/src/pluginApi.tsx
@@ -14,6 +14,7 @@ import * as FontAwesomeRegular from "@fortawesome/free-regular-svg-icons";
 import * as FontAwesomeBrands from "@fortawesome/free-brands-svg-icons";
 import * as ReactFontAwesome from "@fortawesome/react-fontawesome";
 import * as ReactSelect from "react-select";
+import * as ReactSlick from "@ant-design/react-slick";
 import { useSpriteInfo } from "./hooks/sprite";
 import { useToast } from "./hooks/Toast";
 import Event from "./hooks/event";
@@ -81,6 +82,7 @@ export const PluginApi = {
     MousetrapPause,
     ReactFontAwesome,
     ReactSelect,
+    ReactSlick,
   },
   register: {
     // register a route to be added to the main router

From 77d0008c6d5e9d85b03c235403f0a6d6df4241da Mon Sep 17 00:00:00 2001
From: Gykes <24581046+Gykes@users.noreply.github.com>
Date: Tue, 13 Jan 2026 19:06:21 -0800
Subject: [PATCH 254/405] FR: Save & New Button on Objects (#6438)

---
 .../GalleryDetails/GalleryCreate.tsx          |  6 +-
 .../GalleryDetails/GalleryEditPanel.tsx       | 48 ++++++++++-----
 .../Groups/GroupDetails/GroupCreate.tsx       |  6 +-
 .../Groups/GroupDetails/GroupEditPanel.tsx    | 12 +++-
 .../PerformerDetails/PerformerCreate.tsx      |  6 +-
 .../PerformerDetails/PerformerEditPanel.tsx   | 58 ++++++++++++++-----
 .../Scenes/SceneDetails/SceneCreate.tsx       |  6 +-
 .../Scenes/SceneDetails/SceneEditPanel.tsx    | 56 +++++++++++++-----
 .../components/Shared/DetailsEditNavbar.tsx   | 20 ++++++-
 ui/v2.5/src/components/Shared/styles.scss     | 15 ++++-
 .../Studios/StudioDetails/StudioCreate.tsx    |  6 +-
 .../Studios/StudioDetails/StudioEditPanel.tsx | 12 +++-
 .../components/Tags/TagDetails/TagCreate.tsx  |  6 +-
 .../Tags/TagDetails/TagEditPanel.tsx          | 12 +++-
 ui/v2.5/src/index.scss                        |  5 ++
 ui/v2.5/src/locales/en-GB.json                |  1 +
 16 files changed, 209 insertions(+), 66 deletions(-)

diff --git a/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryCreate.tsx b/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryCreate.tsx
index 128e70d38..ebb465868 100644
--- a/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryCreate.tsx
+++ b/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryCreate.tsx
@@ -19,12 +19,14 @@ const GalleryCreate: React.FC = () => {
 
   const [createGallery] = useGalleryCreate();
 
-  async function onSave(input: GQL.GalleryCreateInput) {
+  async function onSave(input: GQL.GalleryCreateInput, andNew?: boolean) {
     const result = await createGallery({
       variables: { input },
     });
     if (result.data?.galleryCreate) {
-      history.push(`/galleries/${result.data.galleryCreate.id}`);
+      if (!andNew) {
+        history.push(`/galleries/${result.data.galleryCreate.id}`);
+      }
       Toast.success(
         intl.formatMessage(
           { id: "toast.created_entity" },
diff --git a/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryEditPanel.tsx b/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryEditPanel.tsx
index fe7959c55..04b802784 100644
--- a/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryEditPanel.tsx
+++ b/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryEditPanel.tsx
@@ -1,7 +1,7 @@
 import React, { useEffect, useMemo, useState } from "react";
 import { FormattedMessage, useIntl } from "react-intl";
 import { Prompt } from "react-router-dom";
-import { Button, Form, Col, Row } from "react-bootstrap";
+import { Button, Dropdown, Form, Col, Row, SplitButton } from "react-bootstrap";
 import Mousetrap from "mousetrap";
 import * as GQL from "src/core/generated-graphql";
 import * as yup from "yup";
@@ -35,7 +35,7 @@ import { ScraperMenu } from "src/components/Shared/ScraperMenu";
 interface IProps {
   gallery: Partial<GQL.GalleryDataFragment>;
   isVisible: boolean;
-  onSubmit: (input: GQL.GalleryCreateInput) => Promise<void>;
+  onSubmit: (input: GQL.GalleryCreateInput, andNew?: boolean) => Promise<void>;
   onDelete: () => void;
 }
 
@@ -177,10 +177,10 @@ export const GalleryEditPanel: React.FC<IProps> = ({
     return <div></div>;
   }, [gallery?.paths?.cover, intl]);
 
-  async function onSave(input: InputValues) {
+  async function onSave(input: InputValues, andNew?: boolean) {
     setIsLoading(true);
     try {
-      await onSubmit(input);
+      await onSubmit(input, andNew);
       formik.resetForm();
     } catch (e) {
       Toast.error(e);
@@ -188,6 +188,11 @@ export const GalleryEditPanel: React.FC<IProps> = ({
     setIsLoading(false);
   }
 
+  async function onSaveAndNewClick() {
+    const input = schema.cast(formik.values);
+    onSave(input, true);
+  }
+
   async function onScrapeClicked(s: GQL.ScraperSourceInput) {
     if (!gallery || !gallery.id) return;
 
@@ -445,16 +450,31 @@ export const GalleryEditPanel: React.FC<IProps> = ({
       <Form noValidate onSubmit={formik.handleSubmit}>
         <Row className="form-container edit-buttons-container px-3 pt-3">
           <div className="edit-buttons mb-3 pl-0">
-            <Button
-              className="edit-button"
-              variant="primary"
-              disabled={
-                (!isNew && !formik.dirty) || !isEqual(formik.errors, {})
-              }
-              onClick={() => formik.submitForm()}
-            >
-              <FormattedMessage id="actions.save" />
-            </Button>
+            {isNew ? (
+              <SplitButton
+                id="gallery-save-split-button"
+                className="edit-button"
+                variant="primary"
+                disabled={!isEqual(formik.errors, {})}
+                title={intl.formatMessage({ id: "actions.save" })}
+                onClick={() => formik.submitForm()}
+              >
+                <Dropdown.Item onClick={() => onSaveAndNewClick()}>
+                  <FormattedMessage id="actions.save_and_new" />
+                </Dropdown.Item>
+              </SplitButton>
+            ) : (
+              <Button
+                className="edit-button"
+                variant="primary"
+                disabled={
+                  (!isNew && !formik.dirty) || !isEqual(formik.errors, {})
+                }
+                onClick={() => formik.submitForm()}
+              >
+                <FormattedMessage id="actions.save" />
+              </Button>
+            )}
             <Button
               className="edit-button"
               variant="danger"
diff --git a/ui/v2.5/src/components/Groups/GroupDetails/GroupCreate.tsx b/ui/v2.5/src/components/Groups/GroupDetails/GroupCreate.tsx
index 9dd3e22b9..5026d5b6e 100644
--- a/ui/v2.5/src/components/Groups/GroupDetails/GroupCreate.tsx
+++ b/ui/v2.5/src/components/Groups/GroupDetails/GroupCreate.tsx
@@ -25,12 +25,14 @@ const GroupCreate: React.FC = () => {
 
   const [createGroup] = useGroupCreate();
 
-  async function onSave(input: GQL.GroupCreateInput) {
+  async function onSave(input: GQL.GroupCreateInput, andNew?: boolean) {
     const result = await createGroup({
       variables: { input },
     });
     if (result.data?.groupCreate?.id) {
-      history.push(`/groups/${result.data.groupCreate.id}`);
+      if (!andNew) {
+        history.push(`/groups/${result.data.groupCreate.id}`);
+      }
       Toast.success(
         intl.formatMessage(
           { id: "toast.created_entity" },
diff --git a/ui/v2.5/src/components/Groups/GroupDetails/GroupEditPanel.tsx b/ui/v2.5/src/components/Groups/GroupDetails/GroupEditPanel.tsx
index 0b94baf27..f0a6f17c1 100644
--- a/ui/v2.5/src/components/Groups/GroupDetails/GroupEditPanel.tsx
+++ b/ui/v2.5/src/components/Groups/GroupDetails/GroupEditPanel.tsx
@@ -31,7 +31,7 @@ import { RelatedGroupTable, IRelatedGroupEntry } from "./RelatedGroupTable";
 
 interface IGroupEditPanel {
   group: Partial<GQL.GroupDataFragment>;
-  onSubmit: (group: GQL.GroupCreateInput) => Promise<void>;
+  onSubmit: (group: GQL.GroupCreateInput, andNew?: boolean) => Promise<void>;
   onCancel: () => void;
   onDelete: () => void;
   setFrontImage: (image?: string | null) => void;
@@ -208,10 +208,10 @@ export const GroupEditPanel: React.FC<IGroupEditPanel> = ({
     }
   }
 
-  async function onSave(input: InputValues) {
+  async function onSave(input: InputValues, andNew?: boolean) {
     setIsLoading(true);
     try {
-      await onSubmit(input);
+      await onSubmit(input, andNew);
       formik.resetForm();
     } catch (e) {
       Toast.error(e);
@@ -219,6 +219,11 @@ export const GroupEditPanel: React.FC<IGroupEditPanel> = ({
     setIsLoading(false);
   }
 
+  async function onSaveAndNewClick() {
+    const input = schema.cast(formik.values);
+    onSave(input, true);
+  }
+
   async function onScrapeGroupURL(url: string) {
     if (!url) return;
     setIsLoading(true);
@@ -462,6 +467,7 @@ export const GroupEditPanel: React.FC<IGroupEditPanel> = ({
         isEditing
         onToggleEdit={onCancel}
         onSave={formik.handleSubmit}
+        onSaveAndNew={isNew ? onSaveAndNewClick : undefined}
         saveDisabled={(!isNew && !formik.dirty) || !isEqual(formik.errors, {})}
         onImageChange={onFrontImageChange}
         onImageChangeURL={onFrontImageLoad}
diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerCreate.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerCreate.tsx
index 7726ed9bc..e6d77761e 100644
--- a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerCreate.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerCreate.tsx
@@ -23,12 +23,14 @@ const PerformerCreate: React.FC = () => {
 
   const [createPerformer] = usePerformerCreate();
 
-  async function onSave(input: GQL.PerformerCreateInput) {
+  async function onSave(input: GQL.PerformerCreateInput, andNew?: boolean) {
     const result = await createPerformer({
       variables: { input },
     });
     if (result.data?.performerCreate) {
-      history.push(`/performers/${result.data.performerCreate.id}`);
+      if (!andNew) {
+        history.push(`/performers/${result.data.performerCreate.id}`);
+      }
       Toast.success(
         intl.formatMessage(
           { id: "toast.created_entity" },
diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
index 000b723e0..7bb8d399a 100644
--- a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from "react";
-import { Button, Form, Dropdown } from "react-bootstrap";
+import { Button, Form, Dropdown, SplitButton } from "react-bootstrap";
 import { FormattedMessage, useIntl } from "react-intl";
 import Mousetrap from "mousetrap";
 import * as GQL from "src/core/generated-graphql";
@@ -58,7 +58,10 @@ const isScraper = (
 interface IPerformerDetails {
   performer: Partial<GQL.PerformerDataFragment>;
   isVisible: boolean;
-  onSubmit: (performer: GQL.PerformerCreateInput) => Promise<void>;
+  onSubmit: (
+    performer: GQL.PerformerCreateInput,
+    andNew?: boolean
+  ) => Promise<void>;
   onCancel?: () => void;
   setImage: (image?: string | null) => void;
   setEncodingImage: (loading: boolean) => void;
@@ -345,10 +348,10 @@ export const PerformerEditPanel: React.FC<IPerformerDetails> = ({
     ImageUtils.onImageChange(event, onImageLoad);
   }
 
-  async function onSave(input: InputValues) {
+  async function onSave(input: InputValues, andNew?: boolean) {
     setIsLoading(true);
     try {
-      await onSubmit(input);
+      await onSubmit(input, andNew);
       formik.resetForm();
     } catch (e) {
       Toast.error(e);
@@ -356,6 +359,15 @@ export const PerformerEditPanel: React.FC<IPerformerDetails> = ({
     setIsLoading(false);
   }
 
+  async function onSaveAndNewClick() {
+    const { values } = formik;
+    const input = {
+      ...schema.cast(values),
+      custom_fields: customFieldInput(isNew, values.custom_fields),
+    };
+    onSave(input, true);
+  }
+
   // set up hotkeys
   useEffect(() => {
     if (isVisible) {
@@ -603,17 +615,33 @@ export const PerformerEditPanel: React.FC<IPerformerDetails> = ({
             <FormattedMessage id="actions.clear_image" />
           </Button>
         </div>
-        <Button
-          variant="success"
-          disabled={
-            (!isNew && !formik.dirty) ||
-            !isEqual(formik.errors, {}) ||
-            customFieldsError !== undefined
-          }
-          onClick={() => formik.submitForm()}
-        >
-          <FormattedMessage id="actions.save" />
-        </Button>
+        {isNew ? (
+          <SplitButton
+            id="save-split-button"
+            variant="success"
+            disabled={
+              !isEqual(formik.errors, {}) || customFieldsError !== undefined
+            }
+            title={intl.formatMessage({ id: "actions.save" })}
+            onClick={() => formik.submitForm()}
+          >
+            <Dropdown.Item onClick={() => onSaveAndNewClick()}>
+              <FormattedMessage id="actions.save_and_new" />
+            </Dropdown.Item>
+          </SplitButton>
+        ) : (
+          <Button
+            variant="success"
+            disabled={
+              (!isNew && !formik.dirty) ||
+              !isEqual(formik.errors, {}) ||
+              customFieldsError !== undefined
+            }
+            onClick={() => formik.submitForm()}
+          >
+            <FormattedMessage id="actions.save" />
+          </Button>
+        )}
       </div>
     );
   }
diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/SceneCreate.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/SceneCreate.tsx
index 707740605..8e3807c83 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/SceneCreate.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/SceneCreate.tsx
@@ -57,14 +57,16 @@ const SceneCreate: React.FC = () => {
     return <LoadingIndicator />;
   }
 
-  async function onSave(input: GQL.SceneCreateInput) {
+  async function onSave(input: GQL.SceneCreateInput, andNew?: boolean) {
     const fileID = query.get("file_id") ?? undefined;
     const result = await mutateCreateScene({
       ...input,
       file_ids: fileID ? [fileID] : undefined,
     });
     if (result.data?.sceneCreate?.id) {
-      history.push(`/scenes/${result.data.sceneCreate.id}`);
+      if (!andNew) {
+        history.push(`/scenes/${result.data.sceneCreate.id}`);
+      }
       Toast.success(
         intl.formatMessage(
           { id: "toast.created_entity" },
diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/SceneEditPanel.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/SceneEditPanel.tsx
index 6a119d8d5..48b353165 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/SceneEditPanel.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/SceneEditPanel.tsx
@@ -1,6 +1,14 @@
 import React, { useEffect, useState, useMemo } from "react";
 import { FormattedMessage, useIntl } from "react-intl";
-import { Button, Form, Col, Row, ButtonGroup } from "react-bootstrap";
+import {
+  Button,
+  Dropdown,
+  Form,
+  Col,
+  Row,
+  ButtonGroup,
+  SplitButton,
+} from "react-bootstrap";
 import Mousetrap from "mousetrap";
 import * as GQL from "src/core/generated-graphql";
 import * as yup from "yup";
@@ -51,7 +59,7 @@ interface IProps {
   initialCoverImage?: string;
   isNew?: boolean;
   isVisible: boolean;
-  onSubmit: (input: GQL.SceneCreateInput) => Promise<void>;
+  onSubmit: (input: GQL.SceneCreateInput, andNew?: boolean) => Promise<void>;
   onDelete?: () => void;
 }
 
@@ -268,10 +276,10 @@ export const SceneEditPanel: React.FC<IProps> = ({
     formik.setFieldValue("groups", newGroups);
   }
 
-  async function onSave(input: InputValues) {
+  async function onSave(input: InputValues, andNew?: boolean) {
     setIsLoading(true);
     try {
-      await onSubmit(input);
+      await onSubmit(input, andNew);
       formik.resetForm();
     } catch (e) {
       Toast.error(e);
@@ -279,6 +287,11 @@ export const SceneEditPanel: React.FC<IProps> = ({
     setIsLoading(false);
   }
 
+  async function onSaveAndNewClick() {
+    const input = schema.cast(formik.values);
+    onSave(input, true);
+  }
+
   const encodingImage = ImageUtils.usePasteImage(onImageLoad);
 
   function onImageLoad(imageData: string) {
@@ -737,16 +750,31 @@ export const SceneEditPanel: React.FC<IProps> = ({
       <Form noValidate onSubmit={formik.handleSubmit}>
         <Row className="form-container edit-buttons-container px-3 pt-3">
           <div className="edit-buttons mb-3 pl-0">
-            <Button
-              className="edit-button"
-              variant="primary"
-              disabled={
-                (!isNew && !formik.dirty) || !isEqual(formik.errors, {})
-              }
-              onClick={() => formik.submitForm()}
-            >
-              <FormattedMessage id="actions.save" />
-            </Button>
+            {isNew ? (
+              <SplitButton
+                id="scene-save-split-button"
+                className="edit-button"
+                variant="primary"
+                disabled={!isEqual(formik.errors, {})}
+                title={intl.formatMessage({ id: "actions.save" })}
+                onClick={() => formik.submitForm()}
+              >
+                <Dropdown.Item onClick={() => onSaveAndNewClick()}>
+                  <FormattedMessage id="actions.save_and_new" />
+                </Dropdown.Item>
+              </SplitButton>
+            ) : (
+              <Button
+                className="edit-button"
+                variant="primary"
+                disabled={
+                  (!isNew && !formik.dirty) || !isEqual(formik.errors, {})
+                }
+                onClick={() => formik.submitForm()}
+              >
+                <FormattedMessage id="actions.save" />
+              </Button>
+            )}
             {onDelete && (
               <Button
                 className="edit-button"
diff --git a/ui/v2.5/src/components/Shared/DetailsEditNavbar.tsx b/ui/v2.5/src/components/Shared/DetailsEditNavbar.tsx
index 2eafcbbc5..cea415db7 100644
--- a/ui/v2.5/src/components/Shared/DetailsEditNavbar.tsx
+++ b/ui/v2.5/src/components/Shared/DetailsEditNavbar.tsx
@@ -1,4 +1,4 @@
-import { Button, Modal } from "react-bootstrap";
+import { Button, Dropdown, Modal, SplitButton } from "react-bootstrap";
 import React, { useState } from "react";
 import { FormattedMessage, useIntl } from "react-intl";
 import { ImageInput } from "./ImageInput";
@@ -10,6 +10,7 @@ interface IProps {
   isEditing: boolean;
   onToggleEdit: () => void;
   onSave: () => void;
+  onSaveAndNew?: () => void;
   saveDisabled?: boolean;
   onDelete: () => void;
   onAutoTag?: () => void;
@@ -48,6 +49,23 @@ export const DetailsEditNavbar: React.FC<IProps> = (props: IProps) => {
   function renderSaveButton() {
     if (!props.isEditing) return;
 
+    if (props.isNew && props.onSaveAndNew) {
+      return (
+        <SplitButton
+          id="save-split-button"
+          variant="success"
+          className="save"
+          disabled={props.saveDisabled}
+          title={intl.formatMessage({ id: "actions.save" })}
+          onClick={() => props.onSave()}
+        >
+          <Dropdown.Item onClick={() => props.onSaveAndNew!()}>
+            <FormattedMessage id="actions.save_and_new" />
+          </Dropdown.Item>
+        </SplitButton>
+      );
+    }
+
     return (
       <Button
         variant="success"
diff --git a/ui/v2.5/src/components/Shared/styles.scss b/ui/v2.5/src/components/Shared/styles.scss
index 100b4e643..f72bbbeea 100644
--- a/ui/v2.5/src/components/Shared/styles.scss
+++ b/ui/v2.5/src/components/Shared/styles.scss
@@ -62,10 +62,23 @@
   padding: 0;
   row-gap: 0.5rem;
 
-  .btn {
+  > .btn {
     margin-right: 0.5rem;
     white-space: nowrap;
   }
+
+  > .btn-group {
+    margin-right: 0.5rem;
+
+    .btn {
+      margin-right: 0;
+    }
+
+    // Show caret on split button dropdown toggle
+    .dropdown-toggle-split::after {
+      content: "";
+    }
+  }
 }
 
 .col-md-8 .details-edit div:nth-last-child(2),
diff --git a/ui/v2.5/src/components/Studios/StudioDetails/StudioCreate.tsx b/ui/v2.5/src/components/Studios/StudioDetails/StudioCreate.tsx
index 244769c5c..e0d64044e 100644
--- a/ui/v2.5/src/components/Studios/StudioDetails/StudioCreate.tsx
+++ b/ui/v2.5/src/components/Studios/StudioDetails/StudioCreate.tsx
@@ -26,12 +26,14 @@ const StudioCreate: React.FC = () => {
 
   const [createStudio] = useStudioCreate();
 
-  async function onSave(input: GQL.StudioCreateInput) {
+  async function onSave(input: GQL.StudioCreateInput, andNew?: boolean) {
     const result = await createStudio({
       variables: { input },
     });
     if (result.data?.studioCreate?.id) {
-      history.push(`/studios/${result.data.studioCreate.id}`);
+      if (!andNew) {
+        history.push(`/studios/${result.data.studioCreate.id}`);
+      }
       Toast.success(
         intl.formatMessage(
           { id: "toast.created_entity" },
diff --git a/ui/v2.5/src/components/Studios/StudioDetails/StudioEditPanel.tsx b/ui/v2.5/src/components/Studios/StudioDetails/StudioEditPanel.tsx
index ab2045aac..a45471b26 100644
--- a/ui/v2.5/src/components/Studios/StudioDetails/StudioEditPanel.tsx
+++ b/ui/v2.5/src/components/Studios/StudioDetails/StudioEditPanel.tsx
@@ -24,7 +24,7 @@ import StashBoxIDSearchModal from "src/components/Shared/StashBoxIDSearchModal";
 
 interface IStudioEditPanel {
   studio: Partial<GQL.StudioDataFragment>;
-  onSubmit: (studio: GQL.StudioCreateInput) => Promise<void>;
+  onSubmit: (studio: GQL.StudioCreateInput, andNew?: boolean) => Promise<void>;
   onCancel: () => void;
   onDelete: () => void;
   setImage: (image?: string | null) => void;
@@ -132,10 +132,10 @@ export const StudioEditPanel: React.FC<IStudioEditPanel> = ({
     };
   });
 
-  async function onSave(input: InputValues) {
+  async function onSave(input: InputValues, andNew?: boolean) {
     setIsLoading(true);
     try {
-      await onSubmit(input);
+      await onSubmit(input, andNew);
       formik.resetForm();
     } catch (e) {
       Toast.error(e);
@@ -143,6 +143,11 @@ export const StudioEditPanel: React.FC<IStudioEditPanel> = ({
     setIsLoading(false);
   }
 
+  async function onSaveAndNewClick() {
+    const input = schema.cast(formik.values);
+    onSave(input, true);
+  }
+
   function onImageLoad(imageData: string | null) {
     formik.setFieldValue("image", imageData);
   }
@@ -248,6 +253,7 @@ export const StudioEditPanel: React.FC<IStudioEditPanel> = ({
         isEditing
         onToggleEdit={onCancel}
         onSave={formik.handleSubmit}
+        onSaveAndNew={isNew ? onSaveAndNewClick : undefined}
         saveDisabled={(!isNew && !formik.dirty) || !isEqual(formik.errors, {})}
         onImageChange={onImageChange}
         onImageChangeURL={onImageLoad}
diff --git a/ui/v2.5/src/components/Tags/TagDetails/TagCreate.tsx b/ui/v2.5/src/components/Tags/TagDetails/TagCreate.tsx
index abbbaa291..9c8253299 100644
--- a/ui/v2.5/src/components/Tags/TagDetails/TagCreate.tsx
+++ b/ui/v2.5/src/components/Tags/TagDetails/TagCreate.tsx
@@ -25,7 +25,7 @@ const TagCreate: React.FC = () => {
 
   const [createTag] = useTagCreate();
 
-  async function onSave(input: GQL.TagCreateInput) {
+  async function onSave(input: GQL.TagCreateInput, andNew?: boolean) {
     const oldRelations = {
       parents: [],
       children: [],
@@ -39,7 +39,9 @@ const TagCreate: React.FC = () => {
         parents: created.parents,
         children: created.children,
       });
-      history.push(`/tags/${created.id}`);
+      if (!andNew) {
+        history.push(`/tags/${created.id}`);
+      }
       Toast.success(
         intl.formatMessage(
           { id: "toast.created_entity" },
diff --git a/ui/v2.5/src/components/Tags/TagDetails/TagEditPanel.tsx b/ui/v2.5/src/components/Tags/TagDetails/TagEditPanel.tsx
index d4784a5fe..077300788 100644
--- a/ui/v2.5/src/components/Tags/TagDetails/TagEditPanel.tsx
+++ b/ui/v2.5/src/components/Tags/TagDetails/TagEditPanel.tsx
@@ -23,7 +23,7 @@ import StashBoxIDSearchModal from "src/components/Shared/StashBoxIDSearchModal";
 
 interface ITagEditPanel {
   tag: Partial<GQL.TagDataFragment>;
-  onSubmit: (tag: GQL.TagCreateInput) => Promise<void>;
+  onSubmit: (tag: GQL.TagCreateInput, andNew?: boolean) => Promise<void>;
   onCancel: () => void;
   onDelete: () => void;
   setImage: (image?: string | null) => void;
@@ -122,10 +122,10 @@ export const TagEditPanel: React.FC<ITagEditPanel> = ({
     };
   });
 
-  async function onSave(input: InputValues) {
+  async function onSave(input: InputValues, andNew?: boolean) {
     setIsLoading(true);
     try {
-      await onSubmit(input);
+      await onSubmit(input, andNew);
       formik.resetForm();
     } catch (e) {
       Toast.error(e);
@@ -133,6 +133,11 @@ export const TagEditPanel: React.FC<ITagEditPanel> = ({
     setIsLoading(false);
   }
 
+  async function onSaveAndNewClick() {
+    const input = schema.cast(formik.values);
+    onSave(input, true);
+  }
+
   const encodingImage = ImageUtils.usePasteImage(onImageLoad);
 
   useEffect(() => {
@@ -272,6 +277,7 @@ export const TagEditPanel: React.FC<ITagEditPanel> = ({
           isEditing
           onToggleEdit={onCancel}
           onSave={formik.handleSubmit}
+          onSaveAndNew={isNew ? onSaveAndNewClick : undefined}
           saveDisabled={
             (!isNew && !formik.dirty) || !isEqual(formik.errors, {})
           }
diff --git a/ui/v2.5/src/index.scss b/ui/v2.5/src/index.scss
index 74599eb34..0c0bffdec 100755
--- a/ui/v2.5/src/index.scss
+++ b/ui/v2.5/src/index.scss
@@ -687,6 +687,11 @@ div.dropdown-menu {
 
 .edit-button {
   margin-right: 10px;
+
+  // Show caret on split button dropdown toggle
+  &.btn-group .dropdown-toggle-split::after {
+    content: "";
+  }
 }
 
 .wrap-tags {
diff --git a/ui/v2.5/src/locales/en-GB.json b/ui/v2.5/src/locales/en-GB.json
index 9c040bb1a..dadf8fd24 100644
--- a/ui/v2.5/src/locales/en-GB.json
+++ b/ui/v2.5/src/locales/en-GB.json
@@ -105,6 +105,7 @@
     "reshuffle": "Reshuffle",
     "running": "running",
     "save": "Save",
+    "save_and_new": "Save & New",
     "save_delete_settings": "Use these options by default when deleting",
     "save_filter": "Save filter",
     "scan": "Scan",

From 0fa132cf60fa17fb05a84082f42bc6dfd0147037 Mon Sep 17 00:00:00 2001
From: Gykes <24581046+Gykes@users.noreply.github.com>
Date: Tue, 13 Jan 2026 19:13:41 -0800
Subject: [PATCH 255/405] FR: Add Delete Button For Scene Covers (#6444)

---
 internal/api/resolver_mutation_scene.go         | 17 +++++++++--------
 internal/api/routes_scene.go                    |  7 +++++++
 .../Scenes/SceneDetails/SceneEditPanel.tsx      |  5 +++++
 ui/v2.5/src/components/Shared/ImageInput.tsx    | 15 ++++++++++++++-
 4 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/internal/api/resolver_mutation_scene.go b/internal/api/resolver_mutation_scene.go
index c08184add..cb2aa7d24 100644
--- a/internal/api/resolver_mutation_scene.go
+++ b/internal/api/resolver_mutation_scene.go
@@ -297,6 +297,7 @@ func (r *mutationResolver) sceneUpdate(ctx context.Context, input models.SceneUp
 	}
 
 	var coverImageData []byte
+	coverImageIncluded := translator.hasField("cover_image")
 	if input.CoverImage != nil {
 		var err error
 		coverImageData, err = utils.ProcessImageInput(ctx, *input.CoverImage)
@@ -310,21 +311,21 @@ func (r *mutationResolver) sceneUpdate(ctx context.Context, input models.SceneUp
 		return nil, err
 	}
 
-	if err := r.sceneUpdateCoverImage(ctx, scene, coverImageData); err != nil {
-		return nil, err
+	if coverImageIncluded {
+		if err := r.sceneUpdateCoverImage(ctx, scene, coverImageData); err != nil {
+			return nil, err
+		}
 	}
 
 	return scene, nil
 }
 
 func (r *mutationResolver) sceneUpdateCoverImage(ctx context.Context, s *models.Scene, coverImageData []byte) error {
-	if len(coverImageData) > 0 {
-		qb := r.repository.Scene
+	qb := r.repository.Scene
 
-		// update cover table
-		if err := qb.UpdateCover(ctx, s.ID, coverImageData); err != nil {
-			return err
-		}
+	// update cover table - empty data will clear the cover
+	if err := qb.UpdateCover(ctx, s.ID, coverImageData); err != nil {
+		return err
 	}
 
 	return nil
diff --git a/internal/api/routes_scene.go b/internal/api/routes_scene.go
index 95e7c9d44..2905bd53a 100644
--- a/internal/api/routes_scene.go
+++ b/internal/api/routes_scene.go
@@ -12,6 +12,7 @@ import (
 
 	"github.com/stashapp/stash/internal/manager"
 	"github.com/stashapp/stash/internal/manager/config"
+	"github.com/stashapp/stash/internal/static"
 	"github.com/stashapp/stash/pkg/ffmpeg"
 	"github.com/stashapp/stash/pkg/file/video"
 	"github.com/stashapp/stash/pkg/fsutil"
@@ -243,6 +244,12 @@ func (rs sceneRoutes) streamSegment(w http.ResponseWriter, r *http.Request, stre
 }
 
 func (rs sceneRoutes) Screenshot(w http.ResponseWriter, r *http.Request) {
+	// if default flag is set, return the default image
+	if r.URL.Query().Get("default") == "true" {
+		utils.ServeImage(w, r, static.ReadAll(static.DefaultSceneImage))
+		return
+	}
+
 	scene := r.Context().Value(sceneKey).(*models.Scene)
 
 	ss := manager.SceneServer{
diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/SceneEditPanel.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/SceneEditPanel.tsx
index 48b353165..54bf5b573 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/SceneEditPanel.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/SceneEditPanel.tsx
@@ -302,6 +302,10 @@ export const SceneEditPanel: React.FC<IProps> = ({
     ImageUtils.onImageChange(event, onImageLoad);
   }
 
+  function onResetCover() {
+    formik.setFieldValue("cover_image", null);
+  }
+
   async function onScrapeClicked(s: GQL.ScraperSourceInput) {
     setIsLoading(true);
     try {
@@ -856,6 +860,7 @@ export const SceneEditPanel: React.FC<IProps> = ({
                 isEditing
                 onImageChange={onCoverImageChange}
                 onImageURL={onImageLoad}
+                onReset={scene.id ? onResetCover : undefined}
               />
             </Form.Group>
           </Col>
diff --git a/ui/v2.5/src/components/Shared/ImageInput.tsx b/ui/v2.5/src/components/Shared/ImageInput.tsx
index 94a83f952..7675da41f 100644
--- a/ui/v2.5/src/components/Shared/ImageInput.tsx
+++ b/ui/v2.5/src/components/Shared/ImageInput.tsx
@@ -18,6 +18,7 @@ interface IImageInput {
   text?: string;
   onImageChange: (event: React.ChangeEvent<HTMLInputElement>) => void;
   onImageURL?: (url: string) => void;
+  onReset?: () => void;
   acceptSVG?: boolean;
 }
 
@@ -27,7 +28,14 @@ function acceptExtensions(acceptSVG: boolean = false) {
 
 export const ImageInput: React.FC<IImageInput> = PatchComponent(
   "ImageInput",
-  ({ isEditing, text, onImageChange, onImageURL, acceptSVG = false }) => {
+  ({
+    isEditing,
+    text,
+    onImageChange,
+    onImageURL,
+    onReset,
+    acceptSVG = false,
+  }) => {
     const [isShowDialog, setIsShowDialog] = useState(false);
     const [url, setURL] = useState("");
     const intl = useIntl();
@@ -137,6 +145,11 @@ export const ImageInput: React.FC<IImageInput> = PatchComponent(
             {text ?? intl.formatMessage({ id: "actions.set_image" })}
           </Button>
         </OverlayTrigger>
+        {onReset && (
+          <Button variant="danger" className="mr-2" onClick={onReset}>
+            {intl.formatMessage({ id: "actions.clear_image" })}
+          </Button>
+        )}
       </>
     );
   }

From 211f06963eb248dbeeebcee877e506650d94f7dd Mon Sep 17 00:00:00 2001
From: RyanAtNight <232988350+RyanAtNight@users.noreply.github.com>
Date: Tue, 13 Jan 2026 19:20:07 -0800
Subject: [PATCH 256/405] Add Invert Selection feature to list toolbars (#6491)

---
 .../GroupDetails/GroupSubGroupsPanel.tsx      |  4 +-
 .../components/List/FilteredListToolbar.tsx   |  4 +-
 ui/v2.5/src/components/List/ItemList.tsx      |  5 +-
 .../components/List/ListOperationButtons.tsx  | 35 +++++++++++--
 ui/v2.5/src/components/List/ListProvider.tsx  |  1 +
 ui/v2.5/src/components/List/util.ts           | 15 +++++-
 ui/v2.5/src/components/Scenes/SceneList.tsx   | 50 +++++++++++--------
 .../src/docs/en/Manual/KeyboardShortcuts.md   |  1 +
 ui/v2.5/src/locales/en-GB.json                |  1 +
 9 files changed, 87 insertions(+), 29 deletions(-)

diff --git a/ui/v2.5/src/components/Groups/GroupDetails/GroupSubGroupsPanel.tsx b/ui/v2.5/src/components/Groups/GroupDetails/GroupSubGroupsPanel.tsx
index bd66490f9..32836ab24 100644
--- a/ui/v2.5/src/components/Groups/GroupDetails/GroupSubGroupsPanel.tsx
+++ b/ui/v2.5/src/components/Groups/GroupDetails/GroupSubGroupsPanel.tsx
@@ -76,7 +76,8 @@ const Toolbar: React.FC<IFilteredListToolbar> = ({
   onDelete,
   operations,
 }) => {
-  const { getSelected, onSelectAll, onSelectNone } = useListContext();
+  const { getSelected, onSelectAll, onSelectNone, onInvertSelection } =
+    useListContext();
   const { filter, setFilter } = useFilter();
 
   return (
@@ -91,6 +92,7 @@ const Toolbar: React.FC<IFilteredListToolbar> = ({
       <ListOperationButtons
         onSelectAll={onSelectAll}
         onSelectNone={onSelectNone}
+        onInvertSelection={onInvertSelection}
         itemsSelected={getSelected().length > 0}
         otherOperations={operations}
         onEdit={onEdit}
diff --git a/ui/v2.5/src/components/List/FilteredListToolbar.tsx b/ui/v2.5/src/components/List/FilteredListToolbar.tsx
index 4e101ee4b..162b30ff3 100644
--- a/ui/v2.5/src/components/List/FilteredListToolbar.tsx
+++ b/ui/v2.5/src/components/List/FilteredListToolbar.tsx
@@ -99,13 +99,15 @@ export const FilteredListToolbar: React.FC<IFilteredListToolbar> = ({
     filter,
     setFilter,
   });
-  const { selectedIds, onSelectAll, onSelectNone } = listSelect;
+  const { selectedIds, onSelectAll, onSelectNone, onInvertSelection } =
+    listSelect;
   const hasSelection = selectedIds.size > 0;
 
   const renderOperations = operationComponent ?? (
     <ListOperationButtons
       onSelectAll={onSelectAll}
       onSelectNone={onSelectNone}
+      onInvertSelection={onInvertSelection}
       otherOperations={operations}
       itemsSelected={selectedIds.size > 0}
       onEdit={onEdit}
diff --git a/ui/v2.5/src/components/List/ItemList.tsx b/ui/v2.5/src/components/List/ItemList.tsx
index 4c360ecc9..67d09e721 100644
--- a/ui/v2.5/src/components/List/ItemList.tsx
+++ b/ui/v2.5/src/components/List/ItemList.tsx
@@ -73,7 +73,7 @@ export function useFilteredItemList<
   const { result, items, totalCount, pages } = queryResult;
 
   const listSelect = useListSelect(items);
-  const { onSelectAll, onSelectNone } = listSelect;
+  const { onSelectAll, onSelectNone, onInvertSelection } = listSelect;
 
   const modalState = useModal();
   const { showModal, closeModal } = modalState;
@@ -99,6 +99,7 @@ export function useFilteredItemList<
     onChangePage: setPage,
     onSelectAll,
     onSelectNone,
+    onInvertSelection,
     pages,
     showEditFilter,
   });
@@ -164,6 +165,7 @@ export const ItemList = <T extends QueryResult, E extends IHasID, M = unknown>(
     onSelectChange,
     onSelectAll,
     onSelectNone,
+    onInvertSelection,
   } = listSelect;
 
   // scroll to the top of the page when the page changes
@@ -212,6 +214,7 @@ export const ItemList = <T extends QueryResult, E extends IHasID, M = unknown>(
     onChangePage,
     onSelectAll,
     onSelectNone,
+    onInvertSelection,
     pages,
     showEditFilter,
   });
diff --git a/ui/v2.5/src/components/List/ListOperationButtons.tsx b/ui/v2.5/src/components/List/ListOperationButtons.tsx
index 66f4b46f3..b377cedba 100644
--- a/ui/v2.5/src/components/List/ListOperationButtons.tsx
+++ b/ui/v2.5/src/components/List/ListOperationButtons.tsx
@@ -63,6 +63,7 @@ export interface IListFilterOperation {
 interface IListOperationButtonsProps {
   onSelectAll?: () => void;
   onSelectNone?: () => void;
+  onInvertSelection?: () => void;
   onEdit?: () => void;
   onDelete?: () => void;
   itemsSelected?: boolean;
@@ -72,6 +73,7 @@ interface IListOperationButtonsProps {
 export const ListOperationButtons: React.FC<IListOperationButtonsProps> = ({
   onSelectAll,
   onSelectNone,
+  onInvertSelection,
   onEdit,
   onDelete,
   itemsSelected,
@@ -82,6 +84,7 @@ export const ListOperationButtons: React.FC<IListOperationButtonsProps> = ({
   useEffect(() => {
     Mousetrap.bind("s a", () => onSelectAll?.());
     Mousetrap.bind("s n", () => onSelectNone?.());
+    Mousetrap.bind("s i", () => onInvertSelection?.());
 
     Mousetrap.bind("e", () => {
       if (itemsSelected) {
@@ -98,10 +101,18 @@ export const ListOperationButtons: React.FC<IListOperationButtonsProps> = ({
     return () => {
       Mousetrap.unbind("s a");
       Mousetrap.unbind("s n");
+      Mousetrap.unbind("s i");
       Mousetrap.unbind("e");
       Mousetrap.unbind("d d");
     };
-  });
+  }, [
+    onSelectAll,
+    onSelectNone,
+    onInvertSelection,
+    itemsSelected,
+    onEdit,
+    onDelete,
+  ]);
 
   const buttons = useMemo(() => {
     const ret = (otherOperations ?? []).filter((o) => {
@@ -185,7 +196,25 @@ export const ListOperationButtons: React.FC<IListOperationButtonsProps> = ({
       }
     }
 
-    const options = [renderSelectAll(), renderSelectNone()].filter((o) => o);
+    function renderInvertSelection() {
+      if (onInvertSelection) {
+        return (
+          <Dropdown.Item
+            key="invert-selection"
+            className="bg-secondary text-white"
+            onClick={() => onInvertSelection?.()}
+          >
+            <FormattedMessage id="actions.invert_selection" />
+          </Dropdown.Item>
+        );
+      }
+    }
+
+    const options = [
+      renderSelectAll(),
+      renderSelectNone(),
+      renderInvertSelection(),
+    ].filter((o) => o);
 
     if (otherOperations) {
       otherOperations
@@ -219,7 +248,7 @@ export const ListOperationButtons: React.FC<IListOperationButtonsProps> = ({
         {options.length > 0 ? options : undefined}
       </OperationDropdown>
     );
-  }, [otherOperations, onSelectAll, onSelectNone]);
+  }, [otherOperations, onSelectAll, onSelectNone, onInvertSelection]);
 
   // don't render anything if there are no buttons or operations
   if (buttons.length === 0 && !moreDropdown) {
diff --git a/ui/v2.5/src/components/List/ListProvider.tsx b/ui/v2.5/src/components/List/ListProvider.tsx
index 0584a61c6..8b9ee7bfb 100644
--- a/ui/v2.5/src/components/List/ListProvider.tsx
+++ b/ui/v2.5/src/components/List/ListProvider.tsx
@@ -63,6 +63,7 @@ const emptyState: IListContextState = {
   onSelectChange: () => {},
   onSelectAll: () => {},
   onSelectNone: () => {},
+  onInvertSelection: () => {},
   items: [],
   hasSelection: false,
   selectedItems: [],
diff --git a/ui/v2.5/src/components/List/util.ts b/ui/v2.5/src/components/List/util.ts
index c15c3335a..707346848 100644
--- a/ui/v2.5/src/components/List/util.ts
+++ b/ui/v2.5/src/components/List/util.ts
@@ -229,6 +229,7 @@ export function useListKeyboardShortcuts(props: {
   pages?: number;
   onSelectAll?: () => void;
   onSelectNone?: () => void;
+  onInvertSelection?: () => void;
 }) {
   const {
     currentPage,
@@ -237,6 +238,7 @@ export function useListKeyboardShortcuts(props: {
     pages = 0,
     onSelectAll,
     onSelectNone,
+    onInvertSelection,
   } = props;
 
   // set up hotkeys
@@ -298,12 +300,14 @@ export function useListKeyboardShortcuts(props: {
   useEffect(() => {
     Mousetrap.bind("s a", () => onSelectAll?.());
     Mousetrap.bind("s n", () => onSelectNone?.());
+    Mousetrap.bind("s i", () => onInvertSelection?.());
 
     return () => {
       Mousetrap.unbind("s a");
       Mousetrap.unbind("s n");
+      Mousetrap.unbind("s i");
     };
-  }, [onSelectAll, onSelectNone]);
+  }, [onSelectAll, onSelectNone, onInvertSelection]);
 }
 
 export function useListSelect<T extends IHasID = IHasID>(items: T[]) {
@@ -420,6 +424,14 @@ export function useListSelect<T extends IHasID = IHasID>(items: T[]) {
     setLastClickedId(undefined);
   }
 
+  function onInvertSelection() {
+    setItemsSelected((prevSelected) => {
+      const selectedSet = new Set(prevSelected.map((item) => item.id));
+      return items.filter((item) => !selectedSet.has(item.id));
+    });
+    setLastClickedId(undefined);
+  }
+
   // TODO - this is for backwards compatibility
   const getSelected = useCallback(() => itemsSelected, [itemsSelected]);
 
@@ -433,6 +445,7 @@ export function useListSelect<T extends IHasID = IHasID>(items: T[]) {
     onSelectChange,
     onSelectAll,
     onSelectNone,
+    onInvertSelection,
     hasSelection,
   };
 }
diff --git a/ui/v2.5/src/components/Scenes/SceneList.tsx b/ui/v2.5/src/components/Scenes/SceneList.tsx
index b85ca7ad8..ff5237c9f 100644
--- a/ui/v2.5/src/components/Scenes/SceneList.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneList.tsx
@@ -522,6 +522,7 @@ export const FilteredSceneList = (props: IFilteredScenes) => {
     onSelectChange,
     onSelectAll,
     onSelectNone,
+    onInvertSelection,
     hasSelection,
   } = listSelect;
 
@@ -539,6 +540,27 @@ export const FilteredSceneList = (props: IFilteredScenes) => {
     setShowSidebar,
   });
 
+  const onCloseEditDelete = useCloseEditDelete({
+    closeModal,
+    onSelectNone,
+    result,
+  });
+
+  const onEdit = useCallback(() => {
+    showModal(
+      <EditScenesDialog selected={selectedItems} onClose={onCloseEditDelete} />
+    );
+  }, [showModal, selectedItems, onCloseEditDelete]);
+
+  const onDelete = useCallback(() => {
+    showModal(
+      <DeleteScenesDialog
+        selected={selectedItems}
+        onClose={onCloseEditDelete}
+      />
+    );
+  }, [showModal, selectedItems, onCloseEditDelete]);
+
   useEffect(() => {
     Mousetrap.bind("e", () => {
       if (hasSelection) {
@@ -556,18 +578,12 @@ export const FilteredSceneList = (props: IFilteredScenes) => {
       Mousetrap.unbind("e");
       Mousetrap.unbind("d d");
     };
-  });
+  }, [onSelectAll, onSelectNone, hasSelection, onEdit, onDelete]);
   useZoomKeybinds({
     zoomIndex: filter.zoomIndex,
     onChangeZoom: (zoom) => setFilter(filter.setZoom(zoom)),
   });
 
-  const onCloseEditDelete = useCloseEditDelete({
-    closeModal,
-    onSelectNone,
-    result,
-  });
-
   const metadataByline = useMemo(() => {
     if (cachedResult.loading) return null;
 
@@ -636,21 +652,6 @@ export const FilteredSceneList = (props: IFilteredScenes) => {
     );
   }
 
-  function onEdit() {
-    showModal(
-      <EditScenesDialog selected={selectedItems} onClose={onCloseEditDelete} />
-    );
-  }
-
-  function onDelete() {
-    showModal(
-      <DeleteScenesDialog
-        selected={selectedItems}
-        onClose={onCloseEditDelete}
-      />
-    );
-  }
-
   const otherOperations = [
     {
       text: intl.formatMessage({ id: "actions.play" }),
@@ -677,6 +678,11 @@ export const FilteredSceneList = (props: IFilteredScenes) => {
       onClick: () => onSelectNone(),
       isDisplayed: () => hasSelection,
     },
+    {
+      text: intl.formatMessage({ id: "actions.invert_selection" }),
+      onClick: () => onInvertSelection(),
+      isDisplayed: () => totalCount > 0,
+    },
     {
       text: intl.formatMessage({ id: "actions.play_random" }),
       onClick: playRandom,
diff --git a/ui/v2.5/src/docs/en/Manual/KeyboardShortcuts.md b/ui/v2.5/src/docs/en/Manual/KeyboardShortcuts.md
index 69006d429..f6cd29334 100644
--- a/ui/v2.5/src/docs/en/Manual/KeyboardShortcuts.md
+++ b/ui/v2.5/src/docs/en/Manual/KeyboardShortcuts.md
@@ -41,6 +41,7 @@
 | `Ctrl + End` | Go to last page of results |
 | `s a` | Select all on page |
 | `s n` | Unselect all |
+| `s i` | Invert selection |
 | `e` | Edit selected |
 | `d d` | Delete selected |
 
diff --git a/ui/v2.5/src/locales/en-GB.json b/ui/v2.5/src/locales/en-GB.json
index dadf8fd24..9fc6f0c0d 100644
--- a/ui/v2.5/src/locales/en-GB.json
+++ b/ui/v2.5/src/locales/en-GB.json
@@ -118,6 +118,7 @@
     "select_entity": "Select {entityType}",
     "select_folders": "Select folders",
     "select_none": "Select None",
+    "invert_selection": "Invert Selection",
     "selective_auto_tag": "Selective Auto Tag",
     "selective_clean": "Selective Clean",
     "selective_scan": "Selective Scan",

From d7d7530c780e412f3d2d943844ddc85962de6893 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Wed, 14 Jan 2026 14:28:44 +1100
Subject: [PATCH 257/405] Add non-binary gender icon and colour transgender
 icons (#6489)

* Add data-gender to gender icon and color transgender gender icons
* Upgrade fontawesome to 7.1
* Add non-binary icon and fix title not showing
---
 ui/v2.5/package.json                          | 10 +--
 ui/v2.5/pnpm-lock.yaml                        | 63 ++++++++++---------
 .../src/components/Performers/GenderIcon.tsx  | 36 +++++++----
 ui/v2.5/src/components/Performers/styles.scss | 22 ++++---
 4 files changed, 75 insertions(+), 56 deletions(-)

diff --git a/ui/v2.5/package.json b/ui/v2.5/package.json
index 5913540db..f774aedbd 100644
--- a/ui/v2.5/package.json
+++ b/ui/v2.5/package.json
@@ -27,11 +27,11 @@
     "@formatjs/intl-locale": "^3.0.11",
     "@formatjs/intl-numberformat": "^8.3.3",
     "@formatjs/intl-pluralrules": "^5.1.8",
-    "@fortawesome/fontawesome-svg-core": "^6.3.0",
-    "@fortawesome/free-brands-svg-icons": "^6.3.0",
-    "@fortawesome/free-regular-svg-icons": "^6.3.0",
-    "@fortawesome/free-solid-svg-icons": "^6.3.0",
-    "@fortawesome/react-fontawesome": "^0.2.0",
+    "@fortawesome/fontawesome-svg-core": "^7.1.0",
+    "@fortawesome/free-brands-svg-icons": "^7.1.0",
+    "@fortawesome/free-regular-svg-icons": "^7.1.0",
+    "@fortawesome/free-solid-svg-icons": "^7.1.0",
+    "@fortawesome/react-fontawesome": "^0.2.6",
     "@react-hook/resize-observer": "^1.2.6",
     "@silvermine/videojs-airplay": "^1.2.0",
     "@silvermine/videojs-chromecast": "^1.4.1",
diff --git a/ui/v2.5/pnpm-lock.yaml b/ui/v2.5/pnpm-lock.yaml
index 16fef0a19..27b993864 100644
--- a/ui/v2.5/pnpm-lock.yaml
+++ b/ui/v2.5/pnpm-lock.yaml
@@ -27,20 +27,20 @@ importers:
         specifier: ^5.1.8
         version: 5.4.6
       '@fortawesome/fontawesome-svg-core':
-        specifier: ^6.3.0
-        version: 6.7.2
+        specifier: ^7.1.0
+        version: 7.1.0
       '@fortawesome/free-brands-svg-icons':
-        specifier: ^6.3.0
-        version: 6.7.2
+        specifier: ^7.1.0
+        version: 7.1.0
       '@fortawesome/free-regular-svg-icons':
-        specifier: ^6.3.0
-        version: 6.7.2
+        specifier: ^7.1.0
+        version: 7.1.0
       '@fortawesome/free-solid-svg-icons':
-        specifier: ^6.3.0
-        version: 6.7.2
+        specifier: ^7.1.0
+        version: 7.1.0
       '@fortawesome/react-fontawesome':
-        specifier: ^0.2.0
-        version: 0.2.6(@fortawesome/fontawesome-svg-core@6.7.2)(react@17.0.2)
+        specifier: ^0.2.6
+        version: 0.2.6(@fortawesome/fontawesome-svg-core@7.1.0)(react@17.0.2)
       '@react-hook/resize-observer':
         specifier: ^1.2.6
         version: 1.2.6(react@17.0.2)
@@ -1262,28 +1262,29 @@ packages:
       ts-jest:
         optional: true
 
-  '@fortawesome/fontawesome-common-types@6.7.2':
-    resolution: {integrity: sha512-Zs+YeHUC5fkt7Mg1l6XTniei3k4bwG/yo3iFUtZWd/pMx9g3fdvkSK9E0FOC+++phXOka78uJcYb8JaFkW52Xg==}
+  '@fortawesome/fontawesome-common-types@7.1.0':
+    resolution: {integrity: sha512-l/BQM7fYntsCI//du+6sEnHOP6a74UixFyOYUyz2DLMXKx+6DEhfR3F2NYGE45XH1JJuIamacb4IZs9S0ZOWLA==}
     engines: {node: '>=6'}
 
-  '@fortawesome/fontawesome-svg-core@6.7.2':
-    resolution: {integrity: sha512-yxtOBWDrdi5DD5o1pmVdq3WMCvnobT0LU6R8RyyVXPvFRd2o79/0NCuQoCjNTeZz9EzA9xS3JxNWfv54RIHFEA==}
+  '@fortawesome/fontawesome-svg-core@7.1.0':
+    resolution: {integrity: sha512-fNxRUk1KhjSbnbuBxlWSnBLKLBNun52ZBTcs22H/xEEzM6Ap81ZFTQ4bZBxVQGQgVY0xugKGoRcCbaKjLQ3XZA==}
     engines: {node: '>=6'}
 
-  '@fortawesome/free-brands-svg-icons@6.7.2':
-    resolution: {integrity: sha512-zu0evbcRTgjKfrr77/2XX+bU+kuGfjm0LbajJHVIgBWNIDzrhpRxiCPNT8DW5AdmSsq7Mcf9D1bH0aSeSUSM+Q==}
+  '@fortawesome/free-brands-svg-icons@7.1.0':
+    resolution: {integrity: sha512-9byUd9bgNfthsZAjBl6GxOu1VPHgBuRUP9juI7ZoM98h8xNPTCTagfwUFyYscdZq4Hr7gD1azMfM9s5tIWKZZA==}
     engines: {node: '>=6'}
 
-  '@fortawesome/free-regular-svg-icons@6.7.2':
-    resolution: {integrity: sha512-7Z/ur0gvCMW8G93dXIQOkQqHo2M5HLhYrRVC0//fakJXxcF1VmMPsxnG6Ee8qEylA8b8Q3peQXWMNZ62lYF28g==}
+  '@fortawesome/free-regular-svg-icons@7.1.0':
+    resolution: {integrity: sha512-0e2fdEyB4AR+e6kU4yxwA/MonnYcw/CsMEP9lH82ORFi9svA6/RhDyhxIv5mlJaldmaHLLYVTb+3iEr+PDSZuQ==}
     engines: {node: '>=6'}
 
-  '@fortawesome/free-solid-svg-icons@6.7.2':
-    resolution: {integrity: sha512-GsBrnOzU8uj0LECDfD5zomZJIjrPhIlWU82AHwa2s40FKH+kcxQaBvBo3Z4TxyZHIyX8XTDxsyA33/Vx9eFuQA==}
+  '@fortawesome/free-solid-svg-icons@7.1.0':
+    resolution: {integrity: sha512-Udu3K7SzAo9N013qt7qmm22/wo2hADdheXtBfxFTecp+ogsc0caQNRKEb7pkvvagUGOpG9wJC1ViH6WXs8oXIA==}
     engines: {node: '>=6'}
 
   '@fortawesome/react-fontawesome@0.2.6':
     resolution: {integrity: sha512-mtBFIi1UsYQo7rYonYFkjgYKGoL8T+fEH6NGUpvuqtY3ytMsAoDaPo5rk25KuMtKDipY4bGYM/CkmCHA1N3FUg==}
+    deprecated: v0.2.x is no longer supported. Unless you are still using FontAwesome 5, please update to v3.1.1 or greater.
     peerDependencies:
       '@fortawesome/fontawesome-svg-core': ~1 || ~6 || ~7
       react: ^16.3 || ^17.0.0 || ^18.0.0 || ^19.0.0
@@ -6485,27 +6486,27 @@ snapshots:
       tslib: 2.8.1
       typescript: 4.8.4
 
-  '@fortawesome/fontawesome-common-types@6.7.2': {}
+  '@fortawesome/fontawesome-common-types@7.1.0': {}
 
-  '@fortawesome/fontawesome-svg-core@6.7.2':
+  '@fortawesome/fontawesome-svg-core@7.1.0':
     dependencies:
-      '@fortawesome/fontawesome-common-types': 6.7.2
+      '@fortawesome/fontawesome-common-types': 7.1.0
 
-  '@fortawesome/free-brands-svg-icons@6.7.2':
+  '@fortawesome/free-brands-svg-icons@7.1.0':
     dependencies:
-      '@fortawesome/fontawesome-common-types': 6.7.2
+      '@fortawesome/fontawesome-common-types': 7.1.0
 
-  '@fortawesome/free-regular-svg-icons@6.7.2':
+  '@fortawesome/free-regular-svg-icons@7.1.0':
     dependencies:
-      '@fortawesome/fontawesome-common-types': 6.7.2
+      '@fortawesome/fontawesome-common-types': 7.1.0
 
-  '@fortawesome/free-solid-svg-icons@6.7.2':
+  '@fortawesome/free-solid-svg-icons@7.1.0':
     dependencies:
-      '@fortawesome/fontawesome-common-types': 6.7.2
+      '@fortawesome/fontawesome-common-types': 7.1.0
 
-  '@fortawesome/react-fontawesome@0.2.6(@fortawesome/fontawesome-svg-core@6.7.2)(react@17.0.2)':
+  '@fortawesome/react-fontawesome@0.2.6(@fortawesome/fontawesome-svg-core@7.1.0)(react@17.0.2)':
     dependencies:
-      '@fortawesome/fontawesome-svg-core': 6.7.2
+      '@fortawesome/fontawesome-svg-core': 7.1.0
       prop-types: 15.8.1
       react: 17.0.2
 
diff --git a/ui/v2.5/src/components/Performers/GenderIcon.tsx b/ui/v2.5/src/components/Performers/GenderIcon.tsx
index 516e70dbd..6f40a2206 100644
--- a/ui/v2.5/src/components/Performers/GenderIcon.tsx
+++ b/ui/v2.5/src/components/Performers/GenderIcon.tsx
@@ -3,6 +3,7 @@ import {
   faVenus,
   faTransgenderAlt,
   faMars,
+  faNonBinary,
 } from "@fortawesome/free-solid-svg-icons";
 import * as GQL from "src/core/generated-graphql";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
@@ -13,21 +14,34 @@ interface IIconProps {
   className?: string;
 }
 
+function genderIcon(gender: GQL.GenderEnum) {
+  switch (gender) {
+    case GQL.GenderEnum.Male:
+      return faMars;
+    case GQL.GenderEnum.Female:
+      return faVenus;
+    case GQL.GenderEnum.NonBinary:
+      return faNonBinary;
+    default:
+      return faTransgenderAlt;
+  }
+}
+
 const GenderIcon: React.FC<IIconProps> = ({ gender, className }) => {
   const intl = useIntl();
   if (gender) {
-    const icon =
-      gender === GQL.GenderEnum.Male
-        ? faMars
-        : gender === GQL.GenderEnum.Female
-        ? faVenus
-        : faTransgenderAlt;
+    const icon = genderIcon(gender);
+
+    // new version of fontawesome doesn't seem to support titles on icons, so adding it
+    // to a span instead
     return (
-      <FontAwesomeIcon
-        title={intl.formatMessage({ id: "gender_types." + gender })}
-        className={className}
-        icon={icon}
-      />
+      <span title={intl.formatMessage({ id: "gender_types." + gender })}>
+        <FontAwesomeIcon
+          data-gender={gender}
+          className={className}
+          icon={icon}
+        />
+      </span>
     );
   }
   return null;
diff --git a/ui/v2.5/src/components/Performers/styles.scss b/ui/v2.5/src/components/Performers/styles.scss
index c3cebf997..17ca3a737 100644
--- a/ui/v2.5/src/components/Performers/styles.scss
+++ b/ui/v2.5/src/components/Performers/styles.scss
@@ -193,17 +193,21 @@
   display: flex;
 }
 
-.fa-mars {
-  color: #89cff0;
-}
+.gender-icon {
+  &[data-gender="FEMALE"],
+  &[data-gender="TRANSGENDER_FEMALE"] {
+    color: #f38cac;
+  }
 
-.fa-venus {
-  color: #f38cac;
-}
+  &[data-gender="MALE"],
+  &[data-gender="TRANSGENDER_MALE"] {
+    color: #89cff0;
+  }
 
-.fa-transgender,
-.fa-transgender-alt {
-  color: #c8a2c8;
+  &[data-gender="NON_BINARY"],
+  &[data-gender="INTERSEX"] {
+    color: #c8a2c8;
+  }
 }
 
 .performer-height .height-imperial,

From 2a5b59a96af3d0713e9851d19121b60b95c2132f Mon Sep 17 00:00:00 2001
From: moonrise-outshoot <254815311+moonrise-outshoot@users.noreply.github.com>
Date: Wed, 14 Jan 2026 13:52:50 +1000
Subject: [PATCH 258/405] Fix duplicate file detection in zip archives (#6493)

When scanning a zip archive duplicate images are being detected as renames rather than duplicates.

This is because in `scanJob.getFileFS` the size of the inner file (`my_archive.zip/001.png`) was being passed to `OpenZip` rather than the size of the zip archive (`my_archive.zip`), causing it to fail when opening the archive. This caused `handleRename` to incorrectly detect it as a rename.

The effects of that are:
- no info on duplicates in the file data
- the file will take the name/path of the final duplicate scanned rather than the first
---
 pkg/file/scan.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkg/file/scan.go b/pkg/file/scan.go
index 803457665..36b409c89 100644
--- a/pkg/file/scan.go
+++ b/pkg/file/scan.go
@@ -895,7 +895,8 @@ func (s *scanJob) getFileFS(f *models.BaseFile) (models.FS, error) {
 	}
 
 	zipPath := f.ZipFile.Base().Path
-	return fs.OpenZip(zipPath, f.Size)
+	zipSize := f.ZipFile.Base().Size
+	return fs.OpenZip(zipPath, zipSize)
 }
 
 func (s *scanJob) handleRename(ctx context.Context, f models.File, fp []models.Fingerprint) (models.File, error) {

From ed3a2393667a3a9ea63fb40ec09c66717ca086f1 Mon Sep 17 00:00:00 2001
From: sashapp <sash@avocode.ch>
Date: Wed, 14 Jan 2026 03:53:40 +0000
Subject: [PATCH 259/405] Implement stash_ids_endpoint for the SceneFilterType
 (#6401)

* Implement stash_ids_endpoint for the SceneFilterType
* Reduce code duplication by calling the stashIDsCriterionHandler from the stashIDCriterionHandler
* Mark stash_id_endpoint in SceneFilterType, StudioFilterType, and PerformerFilterType as deprecated
---
 graphql/schema/types/filters.graphql | 25 +++++++++-
 pkg/models/performer.go              |  2 +
 pkg/models/scene.go                  |  2 +
 pkg/models/stash_ids.go              | 10 +++-
 pkg/models/studio.go                 |  2 +
 pkg/models/tag.go                    |  2 +
 pkg/sqlite/criterion_handlers.go     | 69 ++++++++++++++++++++++++----
 pkg/sqlite/performer_filter.go       |  6 +++
 pkg/sqlite/performer_test.go         | 56 ++++++++++++++++++++++
 pkg/sqlite/scene_filter.go           |  7 ++-
 pkg/sqlite/scene_test.go             | 56 ++++++++++++++++++++++
 pkg/sqlite/setup_test.go             |  6 +--
 pkg/sqlite/studio_filter.go          |  6 +++
 pkg/sqlite/tag_filter.go             |  6 +++
 pkg/sqlite/tag_test.go               | 56 ++++++++++++++++++++++
 15 files changed, 297 insertions(+), 14 deletions(-)

diff --git a/graphql/schema/types/filters.graphql b/graphql/schema/types/filters.graphql
index bb312e31d..4cf25d840 100644
--- a/graphql/schema/types/filters.graphql
+++ b/graphql/schema/types/filters.graphql
@@ -84,13 +84,23 @@ input PHashDuplicationCriterionInput {
 input StashIDCriterionInput {
   """
   If present, this value is treated as a predicate.
-  That is, it will filter based on stash_ids with the matching endpoint
+  That is, it will filter based on stash_id with the matching endpoint
   """
   endpoint: String
   stash_id: String
   modifier: CriterionModifier!
 }
 
+input StashIDsCriterionInput {
+  """
+  If present, this value is treated as a predicate.
+  That is, it will filter based on stash_ids with the matching endpoint
+  """
+  endpoint: String
+  stash_ids: [String]
+  modifier: CriterionModifier!
+}
+
 input CustomFieldCriterionInput {
   field: String!
   value: [Any!]
@@ -156,6 +166,9 @@ input PerformerFilterType {
   o_counter: IntCriterionInput
   "Filter by StashID"
   stash_id_endpoint: StashIDCriterionInput
+    @deprecated(reason: "use stash_ids_endpoint instead")
+  "Filter by StashIDs"
+  stash_ids_endpoint: StashIDsCriterionInput
   # rating expressed as 1-100
   rating100: IntCriterionInput
   "Filter by url"
@@ -292,6 +305,9 @@ input SceneFilterType {
   performer_count: IntCriterionInput
   "Filter by StashID"
   stash_id_endpoint: StashIDCriterionInput
+    @deprecated(reason: "use stash_ids_endpoint instead")
+  "Filter by StashIDs"
+  stash_ids_endpoint: StashIDsCriterionInput
   "Filter by url"
   url: StringCriterionInput
   "Filter by interactive"
@@ -432,6 +448,9 @@ input StudioFilterType {
   parents: MultiCriterionInput
   "Filter by StashID"
   stash_id_endpoint: StashIDCriterionInput
+    @deprecated(reason: "use stash_ids_endpoint instead")
+  "Filter by StashIDs"
+  stash_ids_endpoint: StashIDsCriterionInput
   "Filter to only include studios with these tags"
   tags: HierarchicalMultiCriterionInput
   "Filter to only include studios missing this property"
@@ -608,6 +627,10 @@ input TagFilterType {
 
   "Filter by StashID"
   stash_id_endpoint: StashIDCriterionInput
+    @deprecated(reason: "use stash_ids_endpoint instead")
+
+  "Filter by StashID"
+  stash_ids_endpoint: StashIDsCriterionInput
 
   "Filter by related scenes that meet this criteria"
   scenes_filter: SceneFilterType
diff --git a/pkg/models/performer.go b/pkg/models/performer.go
index 239d8347f..63a08b30c 100644
--- a/pkg/models/performer.go
+++ b/pkg/models/performer.go
@@ -166,6 +166,8 @@ type PerformerFilterType struct {
 	StashID *StringCriterionInput `json:"stash_id"`
 	// Filter by StashID Endpoint
 	StashIDEndpoint *StashIDCriterionInput `json:"stash_id_endpoint"`
+	// Filter by StashIDs Endpoint
+	StashIDsEndpoint *StashIDsCriterionInput `json:"stash_ids_endpoint"`
 	// Filter by rating expressed as 1-100
 	Rating100 *IntCriterionInput `json:"rating100"`
 	// Filter by url
diff --git a/pkg/models/scene.go b/pkg/models/scene.go
index f0a863bf7..1c34967c6 100644
--- a/pkg/models/scene.go
+++ b/pkg/models/scene.go
@@ -79,6 +79,8 @@ type SceneFilterType struct {
 	StashID *StringCriterionInput `json:"stash_id"`
 	// Filter by StashID Endpoint
 	StashIDEndpoint *StashIDCriterionInput `json:"stash_id_endpoint"`
+	// Filter by StashIDs Endpoint
+	StashIDsEndpoint *StashIDsCriterionInput `json:"stash_ids_endpoint"`
 	// Filter by url
 	URL *StringCriterionInput `json:"url"`
 	// Filter by interactive
diff --git a/pkg/models/stash_ids.go b/pkg/models/stash_ids.go
index d761e959f..d73bfd880 100644
--- a/pkg/models/stash_ids.go
+++ b/pkg/models/stash_ids.go
@@ -129,8 +129,16 @@ func (u *UpdateStashIDs) Set(v StashID) {
 
 type StashIDCriterionInput struct {
 	// If present, this value is treated as a predicate.
-	// That is, it will filter based on stash_ids with the matching endpoint
+	// That is, it will filter based on stash_id with the matching endpoint
 	Endpoint *string           `json:"endpoint"`
 	StashID  *string           `json:"stash_id"`
 	Modifier CriterionModifier `json:"modifier"`
 }
+
+type StashIDsCriterionInput struct {
+	// If present, this value is treated as a predicate.
+	// That is, it will filter based on stash_ids with the matching endpoint
+	Endpoint *string           `json:"endpoint"`
+	StashIDs []*string         `json:"stash_ids"`
+	Modifier CriterionModifier `json:"modifier"`
+}
diff --git a/pkg/models/studio.go b/pkg/models/studio.go
index 171168129..fd306b16c 100644
--- a/pkg/models/studio.go
+++ b/pkg/models/studio.go
@@ -10,6 +10,8 @@ type StudioFilterType struct {
 	StashID *StringCriterionInput `json:"stash_id"`
 	// Filter by StashID Endpoint
 	StashIDEndpoint *StashIDCriterionInput `json:"stash_id_endpoint"`
+	// Filter by StashIDs Endpoint
+	StashIDsEndpoint *StashIDsCriterionInput `json:"stash_ids_endpoint"`
 	// Filter to only include studios missing this property
 	IsMissing *string `json:"is_missing"`
 	// Filter by rating expressed as 1-100
diff --git a/pkg/models/tag.go b/pkg/models/tag.go
index 29b7e9be3..69d4f9e3c 100644
--- a/pkg/models/tag.go
+++ b/pkg/models/tag.go
@@ -42,6 +42,8 @@ type TagFilterType struct {
 	IgnoreAutoTag *bool `json:"ignore_auto_tag"`
 	// Filter by StashID Endpoint
 	StashIDEndpoint *StashIDCriterionInput `json:"stash_id_endpoint"`
+	// Filter by StashIDs Endpoint
+	StashIDsEndpoint *StashIDsCriterionInput `json:"stash_ids_endpoint"`
 	// Filter by related scenes that meet this criteria
 	ScenesFilter *SceneFilterType `json:"scenes_filter"`
 	// Filter by related images that meet this criteria
diff --git a/pkg/sqlite/criterion_handlers.go b/pkg/sqlite/criterion_handlers.go
index fe6d1fcb5..c848f1a8b 100644
--- a/pkg/sqlite/criterion_handlers.go
+++ b/pkg/sqlite/criterion_handlers.go
@@ -1012,6 +1012,41 @@ func (h *stashIDCriterionHandler) handle(ctx context.Context, f *filterBuilder)
 		return
 	}
 
+	var stashIDs []*string
+	if h.c.StashID != nil {
+		stashIDs = []*string{h.c.StashID}
+	} else {
+		stashIDs = nil
+	}
+
+	convertedInput := &models.StashIDsCriterionInput{
+		Endpoint: h.c.Endpoint,
+		StashIDs: stashIDs,
+		Modifier: h.c.Modifier,
+	}
+
+	convertedHandler := stashIDsCriterionHandler{
+		c:                 convertedInput,
+		stashIDRepository: h.stashIDRepository,
+		stashIDTableAs:    h.stashIDTableAs,
+		parentIDCol:       h.parentIDCol,
+	}
+
+	convertedHandler.handle(ctx, f)
+}
+
+type stashIDsCriterionHandler struct {
+	c                 *models.StashIDsCriterionInput
+	stashIDRepository *stashIDRepository
+	stashIDTableAs    string
+	parentIDCol       string
+}
+
+func (h *stashIDsCriterionHandler) handle(ctx context.Context, f *filterBuilder) {
+	if h.c == nil {
+		return
+	}
+
 	stashIDRepo := h.stashIDRepository
 	t := stashIDRepo.tableName
 	if h.stashIDTableAs != "" {
@@ -1025,15 +1060,33 @@ func (h *stashIDCriterionHandler) handle(ctx context.Context, f *filterBuilder)
 
 	f.addLeftJoin(stashIDRepo.tableName, h.stashIDTableAs, joinClause)
 
-	v := ""
-	if h.c.StashID != nil {
-		v = *h.c.StashID
-	}
+	if len(h.c.StashIDs) == 0 {
+		stringCriterionHandler(&models.StringCriterionInput{
+			Value:    "",
+			Modifier: h.c.Modifier,
+		}, t+".stash_id")(ctx, f)
+	} else {
+		b := f
+		for _, n := range h.c.StashIDs {
+			query := &filterBuilder{}
+			v := ""
+			if n != nil {
+				v = *n
+			}
 
-	stringCriterionHandler(&models.StringCriterionInput{
-		Value:    v,
-		Modifier: h.c.Modifier,
-	}, t+".stash_id")(ctx, f)
+			stringCriterionHandler(&models.StringCriterionInput{
+				Value:    v,
+				Modifier: h.c.Modifier,
+			}, t+".stash_id")(ctx, query)
+
+			if h.c.Modifier == models.CriterionModifierNotEquals {
+				b.and(query)
+			} else {
+				b.or(query)
+			}
+			b = query
+		}
+	}
 }
 
 type relatedFilterHandler struct {
diff --git a/pkg/sqlite/performer_filter.go b/pkg/sqlite/performer_filter.go
index 11d3138bc..401664e33 100644
--- a/pkg/sqlite/performer_filter.go
+++ b/pkg/sqlite/performer_filter.go
@@ -148,6 +148,12 @@ func (qb *performerFilterHandler) criterionHandler() criterionHandler {
 			stashIDTableAs:    "performer_stash_ids",
 			parentIDCol:       "performers.id",
 		},
+		&stashIDsCriterionHandler{
+			c:                 filter.StashIDsEndpoint,
+			stashIDRepository: &performerRepository.stashIDs,
+			stashIDTableAs:    "performer_stash_ids",
+			parentIDCol:       "performers.id",
+		},
 
 		qb.aliasCriterionHandler(filter.Aliases),
 
diff --git a/pkg/sqlite/performer_test.go b/pkg/sqlite/performer_test.go
index a88166657..8d53ca0db 100644
--- a/pkg/sqlite/performer_test.go
+++ b/pkg/sqlite/performer_test.go
@@ -1069,6 +1069,8 @@ func TestPerformerQuery(t *testing.T) {
 	var (
 		endpoint = performerStashID(performerIdxWithGallery).Endpoint
 		stashID  = performerStashID(performerIdxWithGallery).StashID
+		stashID2 = performerStashID(performerIdx1WithGallery).StashID
+		stashIDs = []*string{&stashID, &stashID2}
 	)
 
 	tests := []struct {
@@ -1133,6 +1135,60 @@ func TestPerformerQuery(t *testing.T) {
 			nil,
 			false,
 		},
+		{
+			"stash ids with endpoint",
+			nil,
+			&models.PerformerFilterType{
+				StashIDsEndpoint: &models.StashIDsCriterionInput{
+					Endpoint: &endpoint,
+					StashIDs: stashIDs,
+					Modifier: models.CriterionModifierEquals,
+				},
+			},
+			[]int{performerIdxWithGallery, performerIdx1WithGallery},
+			nil,
+			false,
+		},
+		{
+			"exclude stash ids with endpoint",
+			nil,
+			&models.PerformerFilterType{
+				StashIDsEndpoint: &models.StashIDsCriterionInput{
+					Endpoint: &endpoint,
+					StashIDs: stashIDs,
+					Modifier: models.CriterionModifierNotEquals,
+				},
+			},
+			nil,
+			[]int{performerIdxWithGallery, performerIdx1WithGallery},
+			false,
+		},
+		{
+			"null stash ids with endpoint",
+			nil,
+			&models.PerformerFilterType{
+				StashIDsEndpoint: &models.StashIDsCriterionInput{
+					Endpoint: &endpoint,
+					Modifier: models.CriterionModifierIsNull,
+				},
+			},
+			nil,
+			[]int{performerIdxWithGallery, performerIdx1WithGallery},
+			false,
+		},
+		{
+			"not null stash ids with endpoint",
+			nil,
+			&models.PerformerFilterType{
+				StashIDsEndpoint: &models.StashIDsCriterionInput{
+					Endpoint: &endpoint,
+					Modifier: models.CriterionModifierNotNull,
+				},
+			},
+			[]int{performerIdxWithGallery, performerIdx1WithGallery},
+			nil,
+			false,
+		},
 		{
 			"circumcised (cut)",
 			nil,
diff --git a/pkg/sqlite/scene_filter.go b/pkg/sqlite/scene_filter.go
index fad300248..72c75eca5 100644
--- a/pkg/sqlite/scene_filter.go
+++ b/pkg/sqlite/scene_filter.go
@@ -114,13 +114,18 @@ func (qb *sceneFilterHandler) criterionHandler() criterionHandler {
 				stringCriterionHandler(sceneFilter.StashID, "scene_stash_ids.stash_id")(ctx, f)
 			}
 		}),
-
 		&stashIDCriterionHandler{
 			c:                 sceneFilter.StashIDEndpoint,
 			stashIDRepository: &sceneRepository.stashIDs,
 			stashIDTableAs:    "scene_stash_ids",
 			parentIDCol:       "scenes.id",
 		},
+		&stashIDsCriterionHandler{
+			c:                 sceneFilter.StashIDsEndpoint,
+			stashIDRepository: &sceneRepository.stashIDs,
+			stashIDTableAs:    "scene_stash_ids",
+			parentIDCol:       "scenes.id",
+		},
 
 		boolCriterionHandler(sceneFilter.Interactive, "video_files.interactive", qb.addVideoFilesTable),
 		intCriterionHandler(sceneFilter.InteractiveSpeed, "video_files.interactive_speed", qb.addVideoFilesTable),
diff --git a/pkg/sqlite/scene_test.go b/pkg/sqlite/scene_test.go
index 1efc4d705..df6676a0f 100644
--- a/pkg/sqlite/scene_test.go
+++ b/pkg/sqlite/scene_test.go
@@ -2098,6 +2098,8 @@ func TestSceneQuery(t *testing.T) {
 	var (
 		endpoint = sceneStashID(sceneIdxWithGallery).Endpoint
 		stashID  = sceneStashID(sceneIdxWithGallery).StashID
+		stashID2 = sceneStashID(sceneIdxWithPerformer).StashID
+		stashIDs = []*string{&stashID, &stashID2}
 
 		depth = -1
 	)
@@ -2203,6 +2205,60 @@ func TestSceneQuery(t *testing.T) {
 			nil,
 			false,
 		},
+		{
+			"stash ids with endpoint",
+			nil,
+			&models.SceneFilterType{
+				StashIDsEndpoint: &models.StashIDsCriterionInput{
+					Endpoint: &endpoint,
+					StashIDs: stashIDs,
+					Modifier: models.CriterionModifierEquals,
+				},
+			},
+			[]int{sceneIdxWithGallery, sceneIdxWithPerformer},
+			nil,
+			false,
+		},
+		{
+			"exclude stash ids with endpoint",
+			nil,
+			&models.SceneFilterType{
+				StashIDsEndpoint: &models.StashIDsCriterionInput{
+					Endpoint: &endpoint,
+					StashIDs: stashIDs,
+					Modifier: models.CriterionModifierNotEquals,
+				},
+			},
+			nil,
+			[]int{sceneIdxWithGallery, sceneIdxWithPerformer},
+			false,
+		},
+		{
+			"null stash ids with endpoint",
+			nil,
+			&models.SceneFilterType{
+				StashIDsEndpoint: &models.StashIDsCriterionInput{
+					Endpoint: &endpoint,
+					Modifier: models.CriterionModifierIsNull,
+				},
+			},
+			nil,
+			[]int{sceneIdxWithGallery, sceneIdxWithPerformer},
+			false,
+		},
+		{
+			"not null stash ids with endpoint",
+			nil,
+			&models.SceneFilterType{
+				StashIDsEndpoint: &models.StashIDsCriterionInput{
+					Endpoint: &endpoint,
+					Modifier: models.CriterionModifierNotNull,
+				},
+			},
+			[]int{sceneIdxWithGallery, sceneIdxWithPerformer},
+			nil,
+			false,
+		},
 		{
 			"with studio id 0 including child studios",
 			nil,
diff --git a/pkg/sqlite/setup_test.go b/pkg/sqlite/setup_test.go
index 63c66fd06..7e6f821d1 100644
--- a/pkg/sqlite/setup_test.go
+++ b/pkg/sqlite/setup_test.go
@@ -1079,7 +1079,7 @@ func getObjectDate(index int) *models.Date {
 func sceneStashID(i int) models.StashID {
 	return models.StashID{
 		StashID:   getSceneStringValue(i, "stashid"),
-		Endpoint:  getSceneStringValue(i, "endpoint"),
+		Endpoint:  getSceneStringValue(0, "endpoint"),
 		UpdatedAt: epochTime,
 	}
 }
@@ -1547,7 +1547,7 @@ func getIgnoreAutoTag(index int) bool {
 func performerStashID(i int) models.StashID {
 	return models.StashID{
 		StashID:  getPerformerStringValue(i, "stashid"),
-		Endpoint: getPerformerStringValue(i, "endpoint"),
+		Endpoint: getPerformerStringValue(0, "endpoint"),
 	}
 }
 
@@ -1700,7 +1700,7 @@ func getTagChildCount(id int) int {
 func tagStashID(i int) models.StashID {
 	return models.StashID{
 		StashID:  getTagStringValue(i, "stashid"),
-		Endpoint: getTagStringValue(i, "endpoint"),
+		Endpoint: getTagStringValue(0, "endpoint"),
 	}
 }
 
diff --git a/pkg/sqlite/studio_filter.go b/pkg/sqlite/studio_filter.go
index 6ff7fcced..83a917701 100644
--- a/pkg/sqlite/studio_filter.go
+++ b/pkg/sqlite/studio_filter.go
@@ -72,6 +72,12 @@ func (qb *studioFilterHandler) criterionHandler() criterionHandler {
 			stashIDTableAs:    "studio_stash_ids",
 			parentIDCol:       "studios.id",
 		},
+		&stashIDsCriterionHandler{
+			c:                 studioFilter.StashIDsEndpoint,
+			stashIDRepository: &studioRepository.stashIDs,
+			stashIDTableAs:    "studio_stash_ids",
+			parentIDCol:       "studios.id",
+		},
 
 		qb.isMissingCriterionHandler(studioFilter.IsMissing),
 		qb.tagCountCriterionHandler(studioFilter.TagCount),
diff --git a/pkg/sqlite/tag_filter.go b/pkg/sqlite/tag_filter.go
index 27ccf3c09..344b7de91 100644
--- a/pkg/sqlite/tag_filter.go
+++ b/pkg/sqlite/tag_filter.go
@@ -91,6 +91,12 @@ func (qb *tagFilterHandler) criterionHandler() criterionHandler {
 			stashIDTableAs:    "tag_stash_ids",
 			parentIDCol:       "tags.id",
 		},
+		&stashIDsCriterionHandler{
+			c:                 tagFilter.StashIDsEndpoint,
+			stashIDRepository: &tagRepository.stashIDs,
+			stashIDTableAs:    "tag_stash_ids",
+			parentIDCol:       "tags.id",
+		},
 
 		&timestampCriterionHandler{tagFilter.CreatedAt, "tags.created_at", nil},
 		&timestampCriterionHandler{tagFilter.UpdatedAt, "tags.updated_at", nil},
diff --git a/pkg/sqlite/tag_test.go b/pkg/sqlite/tag_test.go
index 18fe486bc..f1bac19b2 100644
--- a/pkg/sqlite/tag_test.go
+++ b/pkg/sqlite/tag_test.go
@@ -356,6 +356,8 @@ func TestTagQuery(t *testing.T) {
 	var (
 		endpoint = tagStashID(tagIdxWithPerformer).Endpoint
 		stashID  = tagStashID(tagIdxWithPerformer).StashID
+		stashID2 = tagStashID(tagIdx1WithPerformer).StashID
+		stashIDs = []*string{&stashID, &stashID2}
 	)
 
 	tests := []struct {
@@ -420,6 +422,60 @@ func TestTagQuery(t *testing.T) {
 			nil,
 			false,
 		},
+		{
+			"stash ids with endpoint",
+			nil,
+			&models.TagFilterType{
+				StashIDsEndpoint: &models.StashIDsCriterionInput{
+					Endpoint: &endpoint,
+					StashIDs: stashIDs,
+					Modifier: models.CriterionModifierEquals,
+				},
+			},
+			[]int{tagIdxWithPerformer, tagIdx1WithPerformer},
+			nil,
+			false,
+		},
+		{
+			"exclude stash ids with endpoint",
+			nil,
+			&models.TagFilterType{
+				StashIDsEndpoint: &models.StashIDsCriterionInput{
+					Endpoint: &endpoint,
+					StashIDs: stashIDs,
+					Modifier: models.CriterionModifierNotEquals,
+				},
+			},
+			nil,
+			[]int{tagIdxWithPerformer, tagIdx1WithPerformer},
+			false,
+		},
+		{
+			"null stash ids with endpoint",
+			nil,
+			&models.TagFilterType{
+				StashIDsEndpoint: &models.StashIDsCriterionInput{
+					Endpoint: &endpoint,
+					Modifier: models.CriterionModifierIsNull,
+				},
+			},
+			nil,
+			[]int{tagIdxWithPerformer, tagIdx1WithPerformer},
+			false,
+		},
+		{
+			"not null stash ids with endpoint",
+			nil,
+			&models.TagFilterType{
+				StashIDsEndpoint: &models.StashIDsCriterionInput{
+					Endpoint: &endpoint,
+					Modifier: models.CriterionModifierNotNull,
+				},
+			},
+			[]int{tagIdxWithPerformer, tagIdx1WithPerformer},
+			nil,
+			false,
+		},
 	}
 
 	for _, tt := range tests {

From 5b3785f16490e8bd603dbe71915a6233379e72e1 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Fri, 16 Jan 2026 10:21:15 +1100
Subject: [PATCH 260/405] Revert stashIDCriterionHandler changes. Reimplement
 stashIDsCriterionHandler to not use stringCriterionHandler (#6496)

---
 pkg/sqlite/criterion_handlers.go | 83 ++++++++++++++++----------------
 pkg/sqlite/sql.go                |  2 +
 2 files changed, 43 insertions(+), 42 deletions(-)

diff --git a/pkg/sqlite/criterion_handlers.go b/pkg/sqlite/criterion_handlers.go
index c848f1a8b..6fe9c7ce9 100644
--- a/pkg/sqlite/criterion_handlers.go
+++ b/pkg/sqlite/criterion_handlers.go
@@ -1012,27 +1012,33 @@ func (h *stashIDCriterionHandler) handle(ctx context.Context, f *filterBuilder)
 		return
 	}
 
-	var stashIDs []*string
+	// ideally, this handler should just convert to stashIDsCriterionHandler
+	// but there are some differences in how the existing handler works compared
+	// to the new code, specifically because this code uses the stringCriterionHandler.
+	// To minimise potential regressions, we'll keep the existing logic for now.
+
+	stashIDRepo := h.stashIDRepository
+	t := stashIDRepo.tableName
+	if h.stashIDTableAs != "" {
+		t = h.stashIDTableAs
+	}
+
+	joinClause := fmt.Sprintf("%s.%s = %s", t, stashIDRepo.idColumn, h.parentIDCol)
+	if h.c.Endpoint != nil && *h.c.Endpoint != "" {
+		joinClause += fmt.Sprintf(" AND %s.endpoint = '%s'", t, *h.c.Endpoint)
+	}
+
+	f.addLeftJoin(stashIDRepo.tableName, h.stashIDTableAs, joinClause)
+
+	v := ""
 	if h.c.StashID != nil {
-		stashIDs = []*string{h.c.StashID}
-	} else {
-		stashIDs = nil
+		v = *h.c.StashID
 	}
 
-	convertedInput := &models.StashIDsCriterionInput{
-		Endpoint: h.c.Endpoint,
-		StashIDs: stashIDs,
+	stringCriterionHandler(&models.StringCriterionInput{
+		Value:    v,
 		Modifier: h.c.Modifier,
-	}
-
-	convertedHandler := stashIDsCriterionHandler{
-		c:                 convertedInput,
-		stashIDRepository: h.stashIDRepository,
-		stashIDTableAs:    h.stashIDTableAs,
-		parentIDCol:       h.parentIDCol,
-	}
-
-	convertedHandler.handle(ctx, f)
+	}, t+".stash_id")(ctx, f)
 }
 
 type stashIDsCriterionHandler struct {
@@ -1060,32 +1066,25 @@ func (h *stashIDsCriterionHandler) handle(ctx context.Context, f *filterBuilder)
 
 	f.addLeftJoin(stashIDRepo.tableName, h.stashIDTableAs, joinClause)
 
-	if len(h.c.StashIDs) == 0 {
-		stringCriterionHandler(&models.StringCriterionInput{
-			Value:    "",
-			Modifier: h.c.Modifier,
-		}, t+".stash_id")(ctx, f)
-	} else {
-		b := f
-		for _, n := range h.c.StashIDs {
-			query := &filterBuilder{}
-			v := ""
-			if n != nil {
-				v = *n
-			}
-
-			stringCriterionHandler(&models.StringCriterionInput{
-				Value:    v,
-				Modifier: h.c.Modifier,
-			}, t+".stash_id")(ctx, query)
-
-			if h.c.Modifier == models.CriterionModifierNotEquals {
-				b.and(query)
-			} else {
-				b.or(query)
-			}
-			b = query
+	switch h.c.Modifier {
+	case models.CriterionModifierIsNull:
+		f.addWhere(fmt.Sprintf("%s.stash_id IS NULL", t))
+	case models.CriterionModifierNotNull:
+		f.addWhere(fmt.Sprintf("%s.stash_id IS NOT NULL", t))
+	case models.CriterionModifierEquals:
+		var clauses []sqlClause
+		for _, id := range h.c.StashIDs {
+			clauses = append(clauses, makeClause(fmt.Sprintf("%s.stash_id = ?", t), id))
 		}
+		f.whereClauses = append(f.whereClauses, orClauses(clauses...))
+	case models.CriterionModifierNotEquals:
+		var clauses []sqlClause
+		for _, id := range h.c.StashIDs {
+			clauses = append(clauses, makeClause(fmt.Sprintf("%s.stash_id != ?", t), id))
+		}
+		f.whereClauses = append(f.whereClauses, andClauses(clauses...))
+	default:
+		f.setError(fmt.Errorf("invalid modifier %s for stash IDs criterion", h.c.Modifier))
 	}
 }
 
diff --git a/pkg/sqlite/sql.go b/pkg/sqlite/sql.go
index 2d5922555..0b55af8db 100644
--- a/pkg/sqlite/sql.go
+++ b/pkg/sqlite/sql.go
@@ -137,6 +137,8 @@ func getCountSort(primaryTable, joinTable, primaryFK, direction string) string {
 	return fmt.Sprintf(" ORDER BY (SELECT COUNT(*) FROM %s AS sort WHERE sort.%s = %s.id) %s", joinTable, primaryFK, primaryTable, getSortDirection(direction))
 }
 
+// getStringSearchClause returns a sqlClause for searching strings in the provided columns.
+// It is used for includes and excludes string criteria.
 func getStringSearchClause(columns []string, q string, not bool) sqlClause {
 	var likeClauses []string
 	var args []interface{}

From bef4e3fbd585a272f51c71aaf16d06185d3e26d9 Mon Sep 17 00:00:00 2001
From: Gykes <24581046+Gykes@users.noreply.github.com>
Date: Mon, 26 Jan 2026 19:26:26 -0800
Subject: [PATCH 261/405] Feature: Add "Troubleshooting Mode" (#6343)

Co-authored-by: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Co-authored-by: DogmaDragon <103123951+DogmaDragon@users.noreply.github.com>
---
 graphql/schema/types/config.graphql           |  6 ++
 internal/api/resolver_mutation_configure.go   |  2 +
 internal/api/resolver_query_configuration.go  |  2 +
 internal/api/server.go                        |  6 +-
 internal/manager/config/config.go             |  8 ++
 ui/v2.5/graphql/data/config.graphql           |  1 +
 ui/v2.5/src/App.tsx                           |  9 +-
 ui/v2.5/src/components/Help/Manual.tsx        |  6 ++
 ui/v2.5/src/components/Settings/Settings.tsx  |  4 +
 ui/v2.5/src/components/Settings/styles.scss   | 12 +++
 .../TroubleshootingModeButton.tsx             | 67 +++++++++++++++
 .../TroubleshootingModeOverlay.tsx            | 28 +++++++
 .../useTroubleshootingMode.ts                 | 83 +++++++++++++++++++
 .../src/docs/en/Manual/TroubleshootingMode.md |  7 ++
 ui/v2.5/src/index.scss                        | 37 +++++++++
 ui/v2.5/src/locales/en-GB.json                | 14 ++++
 ui/v2.5/src/plugins.tsx                       | 28 +++++--
 17 files changed, 309 insertions(+), 11 deletions(-)
 create mode 100644 ui/v2.5/src/components/TroubleshootingMode/TroubleshootingModeButton.tsx
 create mode 100644 ui/v2.5/src/components/TroubleshootingMode/TroubleshootingModeOverlay.tsx
 create mode 100644 ui/v2.5/src/components/TroubleshootingMode/useTroubleshootingMode.ts
 create mode 100644 ui/v2.5/src/docs/en/Manual/TroubleshootingMode.md

diff --git a/graphql/schema/types/config.graphql b/graphql/schema/types/config.graphql
index b6f52091b..6990d9d95 100644
--- a/graphql/schema/types/config.graphql
+++ b/graphql/schema/types/config.graphql
@@ -395,6 +395,9 @@ input ConfigInterfaceInput {
   customLocales: String
   customLocalesEnabled: Boolean
 
+  "When true, disables all customizations (plugins, CSS, JavaScript, locales) for troubleshooting"
+  disableCustomizations: Boolean
+
   "Interface language"
   language: String
 
@@ -469,6 +472,9 @@ type ConfigInterfaceResult {
   customLocales: String
   customLocalesEnabled: Boolean
 
+  "When true, disables all customizations (plugins, CSS, JavaScript, locales) for troubleshooting"
+  disableCustomizations: Boolean
+
   "Interface language"
   language: String
 
diff --git a/internal/api/resolver_mutation_configure.go b/internal/api/resolver_mutation_configure.go
index daed0b5b7..23b61c208 100644
--- a/internal/api/resolver_mutation_configure.go
+++ b/internal/api/resolver_mutation_configure.go
@@ -515,6 +515,8 @@ func (r *mutationResolver) ConfigureInterface(ctx context.Context, input ConfigI
 
 	r.setConfigBool(config.CustomLocalesEnabled, input.CustomLocalesEnabled)
 
+	r.setConfigBool(config.DisableCustomizations, input.DisableCustomizations)
+
 	if input.DisableDropdownCreate != nil {
 		ddc := input.DisableDropdownCreate
 		r.setConfigBool(config.DisableDropdownCreatePerformer, ddc.Performer)
diff --git a/internal/api/resolver_query_configuration.go b/internal/api/resolver_query_configuration.go
index 8a20fcad1..bc76212eb 100644
--- a/internal/api/resolver_query_configuration.go
+++ b/internal/api/resolver_query_configuration.go
@@ -156,6 +156,7 @@ func makeConfigInterfaceResult() *ConfigInterfaceResult {
 	javascriptEnabled := config.GetJavascriptEnabled()
 	customLocales := config.GetCustomLocales()
 	customLocalesEnabled := config.GetCustomLocalesEnabled()
+	disableCustomizations := config.GetDisableCustomizations()
 	language := config.GetLanguage()
 	handyKey := config.GetHandyKey()
 	scriptOffset := config.GetFunscriptOffset()
@@ -183,6 +184,7 @@ func makeConfigInterfaceResult() *ConfigInterfaceResult {
 		JavascriptEnabled:            &javascriptEnabled,
 		CustomLocales:                &customLocales,
 		CustomLocalesEnabled:         &customLocalesEnabled,
+		DisableCustomizations:        &disableCustomizations,
 		Language:                     &language,
 
 		ImageLightbox: &imageLightboxOptions,
diff --git a/internal/api/server.go b/internal/api/server.go
index ed11a99a5..a7516da52 100644
--- a/internal/api/server.go
+++ b/internal/api/server.go
@@ -450,7 +450,7 @@ func cssHandler(c *config.Config) func(w http.ResponseWriter, r *http.Request) {
 	return func(w http.ResponseWriter, r *http.Request) {
 		var paths []string
 
-		if c.GetCSSEnabled() {
+		if c.GetCSSEnabled() && !c.GetDisableCustomizations() {
 			// search for custom.css in current directory, then $HOME/.stash
 			fn := c.GetCSSPath()
 			exists, _ := fsutil.FileExists(fn)
@@ -468,7 +468,7 @@ func javascriptHandler(c *config.Config) func(w http.ResponseWriter, r *http.Req
 	return func(w http.ResponseWriter, r *http.Request) {
 		var paths []string
 
-		if c.GetJavascriptEnabled() {
+		if c.GetJavascriptEnabled() && !c.GetDisableCustomizations() {
 			// search for custom.js in current directory, then $HOME/.stash
 			fn := c.GetJavascriptPath()
 			exists, _ := fsutil.FileExists(fn)
@@ -486,7 +486,7 @@ func customLocalesHandler(c *config.Config) func(w http.ResponseWriter, r *http.
 	return func(w http.ResponseWriter, r *http.Request) {
 		buffer := bytes.Buffer{}
 
-		if c.GetCustomLocalesEnabled() {
+		if c.GetCustomLocalesEnabled() && !c.GetDisableCustomizations() {
 			// search for custom-locales.json in current directory, then $HOME/.stash
 			path := c.GetCustomLocalesPath()
 			exists, _ := fsutil.FileExists(path)
diff --git a/internal/manager/config/config.go b/internal/manager/config/config.go
index 35534f119..bb99bdcfc 100644
--- a/internal/manager/config/config.go
+++ b/internal/manager/config/config.go
@@ -194,6 +194,7 @@ const (
 	CSSEnabled                          = "cssenabled"
 	JavascriptEnabled                   = "javascriptenabled"
 	CustomLocalesEnabled                = "customlocalesenabled"
+	DisableCustomizations               = "disable_customizations"
 
 	ShowScrubber        = "show_scrubber"
 	showScrubberDefault = true
@@ -1479,6 +1480,13 @@ func (i *Config) GetCustomLocalesEnabled() bool {
 	return i.getBool(CustomLocalesEnabled)
 }
 
+// GetDisableCustomizations returns true if all customizations (plugins, custom CSS,
+// custom JavaScript, and custom locales) should be disabled. This is useful for
+// troubleshooting issues without permanently disabling individual customizations.
+func (i *Config) GetDisableCustomizations() bool {
+	return i.getBool(DisableCustomizations)
+}
+
 func (i *Config) GetHandyKey() string {
 	return i.getString(HandyKey)
 }
diff --git a/ui/v2.5/graphql/data/config.graphql b/ui/v2.5/graphql/data/config.graphql
index b65ba21cc..08dcf5d3b 100644
--- a/ui/v2.5/graphql/data/config.graphql
+++ b/ui/v2.5/graphql/data/config.graphql
@@ -92,6 +92,7 @@ fragment ConfigInterfaceData on ConfigInterfaceResult {
   javascriptEnabled
   customLocales
   customLocalesEnabled
+  disableCustomizations
   language
   imageLightbox {
     slideshowDelay
diff --git a/ui/v2.5/src/App.tsx b/ui/v2.5/src/App.tsx
index 761352373..d08274b18 100644
--- a/ui/v2.5/src/App.tsx
+++ b/ui/v2.5/src/App.tsx
@@ -49,6 +49,7 @@ import { PluginRoutes, PluginsLoader } from "./plugins";
 // import plugin_api to run code
 import "./pluginApi";
 import { ConnectionMonitor } from "./ConnectionMonitor";
+import { TroubleshootingModeOverlay } from "./components/TroubleshootingMode/TroubleshootingModeOverlay";
 import { PatchFunction } from "./patch";
 
 import moment from "moment/min/moment-with-locales";
@@ -352,11 +353,17 @@ export const App: React.FC = () => {
         formats={intlFormats}
       >
         <ToastProvider>
-          <PluginsLoader>
+          <PluginsLoader
+            disableCustomizations={
+              config.data?.configuration?.interface?.disableCustomizations ??
+              false
+            }
+          >
             <AppContainer>
               <ConfigurationProvider configuration={config.data!.configuration}>
                 {maybeRenderReleaseNotes()}
                 <ConnectionMonitor />
+                <TroubleshootingModeOverlay />
                 <Suspense fallback={<LoadingIndicator />}>
                   <LightboxProvider>
                     <ManualProvider>
diff --git a/ui/v2.5/src/components/Help/Manual.tsx b/ui/v2.5/src/components/Help/Manual.tsx
index d8fc1dbed..e90e2e5ac 100644
--- a/ui/v2.5/src/components/Help/Manual.tsx
+++ b/ui/v2.5/src/components/Help/Manual.tsx
@@ -23,6 +23,7 @@ import Interactive from "src/docs/en/Manual/Interactive.md";
 import Captions from "src/docs/en/Manual/Captions.md";
 import Identify from "src/docs/en/Manual/Identify.md";
 import Browsing from "src/docs/en/Manual/Browsing.md";
+import TroubleshootingMode from "src/docs/en/Manual/TroubleshootingMode.md";
 import { MarkdownPage } from "../Shared/MarkdownPage";
 
 interface IManualProps {
@@ -152,6 +153,11 @@ export const Manual: React.FC<IManualProps> = ({
       title: "Keyboard Shortcuts",
       content: KeyboardShortcuts,
     },
+    {
+      key: "TroubleshootingMode.md",
+      title: "Troubleshooting Mode",
+      content: TroubleshootingMode,
+    },
     {
       key: "Contributing.md",
       title: "Contributing",
diff --git a/ui/v2.5/src/components/Settings/Settings.tsx b/ui/v2.5/src/components/Settings/Settings.tsx
index 4c2b02455..86a781445 100644
--- a/ui/v2.5/src/components/Settings/Settings.tsx
+++ b/ui/v2.5/src/components/Settings/Settings.tsx
@@ -18,6 +18,8 @@ import { SettingsContext, useSettings } from "./context";
 import { SettingsLibraryPanel } from "./SettingsLibraryPanel";
 import { SettingsSecurityPanel } from "./SettingsSecurityPanel";
 import Changelog from "../Changelog/Changelog";
+import { TroubleshootingModeButton } from "../TroubleshootingMode/TroubleshootingModeButton";
+import { useTroubleshootingMode } from "../TroubleshootingMode/useTroubleshootingMode";
 
 const validTabs = [
   "tasks",
@@ -43,6 +45,7 @@ function isTabKey(tab: string | null): tab is TabKey {
 
 const SettingTabs: React.FC<{ tab: TabKey }> = ({ tab }) => {
   const { advancedMode, setAdvancedMode } = useSettings();
+  const { isActive: troubleshootingModeActive } = useTroubleshootingMode();
 
   const titleProps = useTitleProps({ id: "settings" });
 
@@ -148,6 +151,7 @@ const SettingTabs: React.FC<{ tab: TabKey }> = ({ tab }) => {
                 />
               </div>
             </Nav.Item>
+            {!troubleshootingModeActive && <TroubleshootingModeButton />}
             <hr className="d-sm-none" />
           </Nav>
         </Col>
diff --git a/ui/v2.5/src/components/Settings/styles.scss b/ui/v2.5/src/components/Settings/styles.scss
index ed8242ce3..3f3a292b4 100644
--- a/ui/v2.5/src/components/Settings/styles.scss
+++ b/ui/v2.5/src/components/Settings/styles.scss
@@ -447,3 +447,15 @@
     display: inline-block;
   }
 }
+
+.troubleshooting-mode-button {
+  bottom: 1rem;
+  left: 1rem;
+  position: fixed;
+  z-index: 100;
+
+  @include media-breakpoint-down(xs) {
+    padding-left: 0.5rem;
+    position: static;
+  }
+}
diff --git a/ui/v2.5/src/components/TroubleshootingMode/TroubleshootingModeButton.tsx b/ui/v2.5/src/components/TroubleshootingMode/TroubleshootingModeButton.tsx
new file mode 100644
index 000000000..164774446
--- /dev/null
+++ b/ui/v2.5/src/components/TroubleshootingMode/TroubleshootingModeButton.tsx
@@ -0,0 +1,67 @@
+import React, { useState } from "react";
+import { Button } from "react-bootstrap";
+import { FormattedMessage, useIntl } from "react-intl";
+import { faBug } from "@fortawesome/free-solid-svg-icons";
+import { ModalComponent } from "src/components/Shared/Modal";
+import { useTroubleshootingMode } from "./useTroubleshootingMode";
+
+const DIALOG_ITEMS = [
+  "config.ui.troubleshooting_mode.dialog_item_plugins",
+  "config.ui.troubleshooting_mode.dialog_item_css",
+  "config.ui.troubleshooting_mode.dialog_item_js",
+  "config.ui.troubleshooting_mode.dialog_item_locales",
+] as const;
+
+export const TroubleshootingModeButton: React.FC = () => {
+  const intl = useIntl();
+  const [showDialog, setShowDialog] = useState(false);
+  const { enable, isLoading } = useTroubleshootingMode();
+
+  return (
+    <>
+      <div className="troubleshooting-mode-button">
+        <Button variant="primary" size="sm" onClick={() => setShowDialog(true)}>
+          <FormattedMessage id="config.ui.troubleshooting_mode.button" />
+        </Button>
+      </div>
+
+      <ModalComponent
+        show={showDialog}
+        onHide={() => setShowDialog(false)}
+        header={intl.formatMessage({
+          id: "config.ui.troubleshooting_mode.dialog_title",
+        })}
+        icon={faBug}
+        accept={{
+          text: intl.formatMessage({
+            id: "config.ui.troubleshooting_mode.enable",
+          }),
+          variant: "primary",
+          onClick: enable,
+        }}
+        cancel={{
+          onClick: () => setShowDialog(false),
+          variant: "secondary",
+        }}
+        isRunning={isLoading}
+      >
+        <p>
+          <FormattedMessage id="config.ui.troubleshooting_mode.dialog_description" />
+        </p>
+        <ul>
+          {DIALOG_ITEMS.map((id) => (
+            <li key={id}>
+              <FormattedMessage id={id} />
+            </li>
+          ))}
+        </ul>
+        <p>
+          <FormattedMessage id="config.ui.troubleshooting_mode.dialog_log_level" />
+        </p>
+        <p className="text-muted">
+          <FormattedMessage id="config.ui.troubleshooting_mode.dialog_reload_note" />
+        </p>
+      </ModalComponent>
+    </>
+  );
+};
diff --git a/ui/v2.5/src/components/TroubleshootingMode/TroubleshootingModeOverlay.tsx b/ui/v2.5/src/components/TroubleshootingMode/TroubleshootingModeOverlay.tsx
new file mode 100644
index 000000000..bf2b38f8a
--- /dev/null
+++ b/ui/v2.5/src/components/TroubleshootingMode/TroubleshootingModeOverlay.tsx
@@ -0,0 +1,28 @@
+import React from "react";
+import { Button } from "react-bootstrap";
+import { FormattedMessage } from "react-intl";
+import { faBug } from "@fortawesome/free-solid-svg-icons";
+import { Icon } from "src/components/Shared/Icon";
+import { useTroubleshootingMode } from "./useTroubleshootingMode";
+
+export const TroubleshootingModeOverlay: React.FC = () => {
+  const { isActive, isLoading, disable } = useTroubleshootingMode();
+
+  if (!isActive) {
+    return null;
+  }
+
+  return (
+    <div className="troubleshooting-mode-overlay">
+      <div className="troubleshooting-mode-alert">
+        <span>
+          <Icon icon={faBug} className="mr-2" />
+          <FormattedMessage id="config.ui.troubleshooting_mode.overlay_message" />
+        </span>
+        <Button variant="link" onClick={disable} disabled={isLoading}>
+          <FormattedMessage id="config.ui.troubleshooting_mode.exit" />
+        </Button>
+      </div>
+    </div>
+  );
+};
diff --git a/ui/v2.5/src/components/TroubleshootingMode/useTroubleshootingMode.ts b/ui/v2.5/src/components/TroubleshootingMode/useTroubleshootingMode.ts
new file mode 100644
index 000000000..63b4edd4f
--- /dev/null
+++ b/ui/v2.5/src/components/TroubleshootingMode/useTroubleshootingMode.ts
@@ -0,0 +1,83 @@
+import { useState, useRef, useEffect } from "react";
+import {
+  useConfigureInterface,
+  useConfigureGeneral,
+  useConfiguration,
+} from "src/core/StashService";
+
+const ORIGINAL_LOG_LEVEL_KEY = "troubleshootingMode_originalLogLevel";
+
+export function useTroubleshootingMode() {
+  const [isLoading, setIsLoading] = useState(false);
+  const isMounted = useRef(true);
+
+  const { data: config } = useConfiguration();
+  const [configureInterface] = useConfigureInterface();
+  const [configureGeneral] = useConfigureGeneral();
+
+  const isActive =
+    config?.configuration?.interface?.disableCustomizations ?? false;
+  const currentLogLevel = config?.configuration?.general?.logLevel || "Info";
+
+  useEffect(() => {
+    return () => {
+      isMounted.current = false;
+    };
+  }, []);
+
+  async function enable() {
+    setIsLoading(true);
+    try {
+      // Store original log level for restoration later
+      localStorage.setItem(ORIGINAL_LOG_LEVEL_KEY, currentLogLevel);
+
+      // Enable troubleshooting mode and set log level to Debug
+      await Promise.all([
+        configureInterface({
+          variables: { input: { disableCustomizations: true } },
+        }),
+        configureGeneral({
+          variables: { input: { logLevel: "Debug" } },
+        }),
+      ]);
+
+      window.location.reload();
+    } catch (e) {
+      if (isMounted.current) {
+        setIsLoading(false);
+      }
+      throw e;
+    }
+  }
+
+  async function disable() {
+    setIsLoading(true);
+    try {
+      // Restore original log level
+      const originalLogLevel =
+        localStorage.getItem(ORIGINAL_LOG_LEVEL_KEY) || "Info";
+
+      // Disable troubleshooting mode and restore log level
+      await Promise.all([
+        configureInterface({
+          variables: { input: { disableCustomizations: false } },
+        }),
+        configureGeneral({
+          variables: { input: { logLevel: originalLogLevel } },
+        }),
+      ]);
+
+      // Clean up localStorage
+      localStorage.removeItem(ORIGINAL_LOG_LEVEL_KEY);
+
+      window.location.reload();
+    } catch (e) {
+      if (isMounted.current) {
+        setIsLoading(false);
+      }
+      throw e;
+    }
+  }
+
+  return { isActive, isLoading, enable, disable };
+}
diff --git a/ui/v2.5/src/docs/en/Manual/TroubleshootingMode.md b/ui/v2.5/src/docs/en/Manual/TroubleshootingMode.md
new file mode 100644
index 000000000..d7a2c1cee
--- /dev/null
+++ b/ui/v2.5/src/docs/en/Manual/TroubleshootingMode.md
@@ -0,0 +1,7 @@
+# Troubleshooting Mode
+
+Troubleshooting Mode disables all plugins and all custom CSS, JavaScript, and locales. It also temporarily sets the log level to `DEBUG`. This is useful when you are experiencing issues with your Stash instance to eliminate the possibility that a plugin or custom code is causing the issue.
+
+Troubleshooting Mode is enabled from the Settings page, by clicking the `Troubleshooting Mode` button at the bottom left of the page.
+
+When Troubleshooting Mode is enabled, a red border and a banner will be displayed to remind you that you are in Troubleshooting Mode. To exit Troubleshooting Mode, click the `Exit` button in the banner.
\ No newline at end of file
diff --git a/ui/v2.5/src/index.scss b/ui/v2.5/src/index.scss
index 0c0bffdec..24679c158 100755
--- a/ui/v2.5/src/index.scss
+++ b/ui/v2.5/src/index.scss
@@ -1438,3 +1438,40 @@ select {
 h3 .TruncatedText {
   line-height: 1.5;
 }
+
+// Troubleshooting Mode overlay banner
+.troubleshooting-mode-overlay {
+  border: 5px solid $danger;
+  bottom: 0;
+  left: 0;
+  opacity: 0.75;
+  pointer-events: none;
+  position: fixed;
+  right: 0;
+  top: 0;
+  z-index: 1040;
+
+  .troubleshooting-mode-alert {
+    align-items: baseline;
+    border-radius: 0;
+    bottom: 0.5rem;
+    display: inline-flex;
+    margin: 0;
+    position: fixed;
+    right: 0.5rem;
+
+    @include media-breakpoint-down(xs) {
+      @media (orientation: portrait) {
+        bottom: $navbar-height;
+
+        & > span {
+          font-size: 0.75rem;
+        }
+      }
+    }
+  }
+
+  .btn {
+    pointer-events: auto;
+  }
+}
diff --git a/ui/v2.5/src/locales/en-GB.json b/ui/v2.5/src/locales/en-GB.json
index 9fc6f0c0d..4cec0af66 100644
--- a/ui/v2.5/src/locales/en-GB.json
+++ b/ui/v2.5/src/locales/en-GB.json
@@ -616,6 +616,20 @@
         "heading": "Custom CSS",
         "option_label": "Custom CSS enabled"
       },
+      "troubleshooting_mode": {
+        "button": "Troubleshooting Mode",
+        "dialog_title": "Enable Troubleshooting Mode",
+        "dialog_description": "This will temporarily disable all customizations to help diagnose issues:",
+        "dialog_item_plugins": "All plugins",
+        "dialog_item_css": "Custom CSS",
+        "dialog_item_js": "Custom JavaScript",
+        "dialog_item_locales": "Custom locales",
+        "dialog_log_level": "Log level will be set to Debug for detailed diagnostics.",
+        "dialog_reload_note": "The page will reload automatically.",
+        "enable": "Enable & Reload",
+        "overlay_message": "Troubleshooting Mode is active - all customizations are disabled",
+        "exit": "Exit"
+      },
       "custom_javascript": {
         "description": "Page must be reloaded for changes to take effect. There is no guarantee of compatibility between custom Javascript and future releases of Stash.",
         "heading": "Custom Javascript",
diff --git a/ui/v2.5/src/plugins.tsx b/ui/v2.5/src/plugins.tsx
index 41577a92c..00ffb9ca4 100644
--- a/ui/v2.5/src/plugins.tsx
+++ b/ui/v2.5/src/plugins.tsx
@@ -59,7 +59,8 @@ function sortPlugins(plugins: PluginList) {
 
 // load all plugins and their dependencies
 // returns true when all plugins are loaded, regardess of success or failure
-function useLoadPlugins() {
+// if disableCustomizations is true, skip loading plugins entirely
+function useLoadPlugins(disableCustomizations?: boolean) {
   const {
     data: plugins,
     loading: pluginsLoading,
@@ -74,6 +75,12 @@ function useLoadPlugins() {
   }, [plugins?.plugins, pluginsLoading, pluginsError]);
 
   const pluginJavascripts = useMemoOnce(() => {
+    // Skip loading plugin JS if customizations are disabled.
+    // Note: We check inside useMemoOnce rather than early-returning from useLoadPlugins
+    // to comply with React's rules of hooks - hooks must be called unconditionally.
+    if (disableCustomizations) {
+      return [[], true];
+    }
     return [
       uniq(
         sortedPlugins
@@ -83,9 +90,12 @@ function useLoadPlugins() {
       ),
       !!sortedPlugins && !pluginsLoading && !pluginsError,
     ];
-  }, [sortedPlugins, pluginsLoading, pluginsError]);
+  }, [sortedPlugins, pluginsLoading, pluginsError, disableCustomizations]);
 
   const pluginCSS = useMemoOnce(() => {
+    if (disableCustomizations) {
+      return [[], true];
+    }
     return [
       uniq(
         sortedPlugins
@@ -95,7 +105,7 @@ function useLoadPlugins() {
       ),
       !!sortedPlugins && !pluginsLoading && !pluginsError,
     ];
-  }, [sortedPlugins, pluginsLoading, pluginsError]);
+  }, [sortedPlugins, pluginsLoading, pluginsError, disableCustomizations]);
 
   const pluginJavascriptLoaded = useScript(
     pluginJavascripts ?? [],
@@ -109,11 +119,15 @@ function useLoadPlugins() {
   };
 }
 
-export const PluginsLoader: React.FC<React.PropsWithChildren<{}>> = ({
-  children,
-}) => {
+interface IPluginsLoaderProps {
+  disableCustomizations?: boolean;
+}
+
+export const PluginsLoader: React.FC<
+  React.PropsWithChildren<IPluginsLoaderProps>
+> = ({ disableCustomizations, children }) => {
   const Toast = useToast();
-  const { loading: loaded, error } = useLoadPlugins();
+  const { loading: loaded, error } = useLoadPlugins(disableCustomizations);
 
   useEffect(() => {
     if (error) {

From 2c8e7d709ff7dc41f605077ad2081c985fe6a557 Mon Sep 17 00:00:00 2001
From: Gykes <24581046+Gykes@users.noreply.github.com>
Date: Mon, 26 Jan 2026 21:02:47 -0800
Subject: [PATCH 262/405] FR: Add Interfaces to Destroy File Database Entries
 (#6437)

---
 graphql/schema/schema.graphql             |  2 +
 graphql/schema/types/gallery.graphql      |  2 +
 graphql/schema/types/image.graphql        |  4 ++
 graphql/schema/types/scene.graphql        |  4 ++
 internal/api/resolver_mutation_file.go    | 52 +++++++++++++++++++++++
 internal/api/resolver_mutation_gallery.go |  3 +-
 internal/api/resolver_mutation_image.go   |  4 +-
 internal/api/resolver_mutation_scene.go   |  6 ++-
 internal/manager/repository.go            |  6 +--
 internal/manager/task_clean.go            | 10 ++++-
 pkg/gallery/delete.go                     | 12 ++++--
 pkg/gallery/service.go                    |  2 +-
 pkg/image/delete.go                       | 48 ++++++++++++++++++---
 pkg/models/gallery.go                     |  5 ++-
 pkg/models/image.go                       | 14 +++---
 pkg/models/scene.go                       | 14 +++---
 pkg/scene/delete.go                       | 35 ++++++++++++++-
 pkg/scene/merge.go                        |  3 +-
 18 files changed, 191 insertions(+), 35 deletions(-)

diff --git a/graphql/schema/schema.graphql b/graphql/schema/schema.graphql
index edfdecaac..7fda85b24 100644
--- a/graphql/schema/schema.graphql
+++ b/graphql/schema/schema.graphql
@@ -422,6 +422,8 @@ type Mutation {
   """
   moveFiles(input: MoveFilesInput!): Boolean!
   deleteFiles(ids: [ID!]!): Boolean!
+  "Deletes file entries from the database without deleting the files from the filesystem"
+  destroyFiles(ids: [ID!]!): Boolean!
 
   fileSetFingerprints(input: FileSetFingerprintsInput!): Boolean!
 
diff --git a/graphql/schema/types/gallery.graphql b/graphql/schema/types/gallery.graphql
index 999a743f7..f456157a7 100644
--- a/graphql/schema/types/gallery.graphql
+++ b/graphql/schema/types/gallery.graphql
@@ -100,6 +100,8 @@ input GalleryDestroyInput {
   """
   delete_file: Boolean
   delete_generated: Boolean
+  "If true, delete the file entry from the database if the file is not assigned to any other objects"
+  destroy_file_entry: Boolean
 }
 
 type FindGalleriesResultType {
diff --git a/graphql/schema/types/image.graphql b/graphql/schema/types/image.graphql
index fb95556f5..b7ec1a9f5 100644
--- a/graphql/schema/types/image.graphql
+++ b/graphql/schema/types/image.graphql
@@ -82,12 +82,16 @@ input ImageDestroyInput {
   id: ID!
   delete_file: Boolean
   delete_generated: Boolean
+  "If true, delete the file entry from the database if the file is not assigned to any other objects"
+  destroy_file_entry: Boolean
 }
 
 input ImagesDestroyInput {
   ids: [ID!]!
   delete_file: Boolean
   delete_generated: Boolean
+  "If true, delete the file entry from the database if the file is not assigned to any other objects"
+  destroy_file_entry: Boolean
 }
 
 type FindImagesResultType {
diff --git a/graphql/schema/types/scene.graphql b/graphql/schema/types/scene.graphql
index eca01d15e..5fba3819d 100644
--- a/graphql/schema/types/scene.graphql
+++ b/graphql/schema/types/scene.graphql
@@ -196,12 +196,16 @@ input SceneDestroyInput {
   id: ID!
   delete_file: Boolean
   delete_generated: Boolean
+  "If true, delete the file entry from the database if the file is not assigned to any other objects"
+  destroy_file_entry: Boolean
 }
 
 input ScenesDestroyInput {
   ids: [ID!]!
   delete_file: Boolean
   delete_generated: Boolean
+  "If true, delete the file entry from the database if the file is not assigned to any other objects"
+  destroy_file_entry: Boolean
 }
 
 type FindScenesResultType {
diff --git a/internal/api/resolver_mutation_file.go b/internal/api/resolver_mutation_file.go
index c5e5e3530..afbefe554 100644
--- a/internal/api/resolver_mutation_file.go
+++ b/internal/api/resolver_mutation_file.go
@@ -210,6 +210,58 @@ func (r *mutationResolver) DeleteFiles(ctx context.Context, ids []string) (ret b
 	return true, nil
 }
 
+func (r *mutationResolver) DestroyFiles(ctx context.Context, ids []string) (ret bool, err error) {
+	fileIDs, err := stringslice.StringSliceToIntSlice(ids)
+	if err != nil {
+		return false, fmt.Errorf("converting ids: %w", err)
+	}
+
+	destroyer := &file.ZipDestroyer{
+		FileDestroyer:   r.repository.File,
+		FolderDestroyer: r.repository.Folder,
+	}
+
+	if err := r.withTxn(ctx, func(ctx context.Context) error {
+		qb := r.repository.File
+
+		for _, fileIDInt := range fileIDs {
+			fileID := models.FileID(fileIDInt)
+			f, err := qb.Find(ctx, fileID)
+			if err != nil {
+				return err
+			}
+
+			if len(f) == 0 {
+				return fmt.Errorf("file with id %d not found", fileID)
+			}
+
+			path := f[0].Base().Path
+
+			// ensure not a primary file
+			isPrimary, err := qb.IsPrimary(ctx, fileID)
+			if err != nil {
+				return fmt.Errorf("checking if file %s is primary: %w", path, err)
+			}
+
+			if isPrimary {
+				return fmt.Errorf("cannot destroy primary file entry %s", path)
+			}
+
+			// destroy DB entries only (no filesystem deletion)
+			const deleteFile = false
+			if err := destroyer.DestroyZip(ctx, f[0], nil, deleteFile); err != nil {
+				return fmt.Errorf("destroying file entry %s: %w", path, err)
+			}
+		}
+
+		return nil
+	}); err != nil {
+		return false, err
+	}
+
+	return true, nil
+}
+
 func (r *mutationResolver) FileSetFingerprints(ctx context.Context, input FileSetFingerprintsInput) (bool, error) {
 	fileIDInt, err := strconv.Atoi(input.ID)
 	if err != nil {
diff --git a/internal/api/resolver_mutation_gallery.go b/internal/api/resolver_mutation_gallery.go
index 8f4863c6d..e7f853922 100644
--- a/internal/api/resolver_mutation_gallery.go
+++ b/internal/api/resolver_mutation_gallery.go
@@ -346,6 +346,7 @@ func (r *mutationResolver) GalleryDestroy(ctx context.Context, input models.Gall
 
 	deleteGenerated := utils.IsTrue(input.DeleteGenerated)
 	deleteFile := utils.IsTrue(input.DeleteFile)
+	destroyFileEntry := utils.IsTrue(input.DestroyFileEntry)
 
 	if err := r.withTxn(ctx, func(ctx context.Context) error {
 		qb := r.repository.Gallery
@@ -366,7 +367,7 @@ func (r *mutationResolver) GalleryDestroy(ctx context.Context, input models.Gall
 
 			galleries = append(galleries, gallery)
 
-			imgsDestroyed, err = r.galleryService.Destroy(ctx, gallery, fileDeleter, deleteGenerated, deleteFile)
+			imgsDestroyed, err = r.galleryService.Destroy(ctx, gallery, fileDeleter, deleteGenerated, deleteFile, destroyFileEntry)
 			if err != nil {
 				return err
 			}
diff --git a/internal/api/resolver_mutation_image.go b/internal/api/resolver_mutation_image.go
index 82d9be4cd..230d48358 100644
--- a/internal/api/resolver_mutation_image.go
+++ b/internal/api/resolver_mutation_image.go
@@ -325,7 +325,7 @@ func (r *mutationResolver) ImageDestroy(ctx context.Context, input models.ImageD
 			return fmt.Errorf("image with id %d not found", imageID)
 		}
 
-		return r.imageService.Destroy(ctx, i, fileDeleter, utils.IsTrue(input.DeleteGenerated), utils.IsTrue(input.DeleteFile))
+		return r.imageService.Destroy(ctx, i, fileDeleter, utils.IsTrue(input.DeleteGenerated), utils.IsTrue(input.DeleteFile), utils.IsTrue(input.DestroyFileEntry))
 	}); err != nil {
 		fileDeleter.Rollback()
 		return false, err
@@ -372,7 +372,7 @@ func (r *mutationResolver) ImagesDestroy(ctx context.Context, input models.Image
 
 			images = append(images, i)
 
-			if err := r.imageService.Destroy(ctx, i, fileDeleter, utils.IsTrue(input.DeleteGenerated), utils.IsTrue(input.DeleteFile)); err != nil {
+			if err := r.imageService.Destroy(ctx, i, fileDeleter, utils.IsTrue(input.DeleteGenerated), utils.IsTrue(input.DeleteFile), utils.IsTrue(input.DestroyFileEntry)); err != nil {
 				return err
 			}
 		}
diff --git a/internal/api/resolver_mutation_scene.go b/internal/api/resolver_mutation_scene.go
index cb2aa7d24..6ac5b0227 100644
--- a/internal/api/resolver_mutation_scene.go
+++ b/internal/api/resolver_mutation_scene.go
@@ -441,6 +441,7 @@ func (r *mutationResolver) SceneDestroy(ctx context.Context, input models.SceneD
 
 	deleteGenerated := utils.IsTrue(input.DeleteGenerated)
 	deleteFile := utils.IsTrue(input.DeleteFile)
+	destroyFileEntry := utils.IsTrue(input.DestroyFileEntry)
 
 	if err := r.withTxn(ctx, func(ctx context.Context) error {
 		qb := r.repository.Scene
@@ -457,7 +458,7 @@ func (r *mutationResolver) SceneDestroy(ctx context.Context, input models.SceneD
 		// kill any running encoders
 		manager.KillRunningStreams(s, fileNamingAlgo)
 
-		return r.sceneService.Destroy(ctx, s, fileDeleter, deleteGenerated, deleteFile)
+		return r.sceneService.Destroy(ctx, s, fileDeleter, deleteGenerated, deleteFile, destroyFileEntry)
 	}); err != nil {
 		fileDeleter.Rollback()
 		return false, err
@@ -495,6 +496,7 @@ func (r *mutationResolver) ScenesDestroy(ctx context.Context, input models.Scene
 
 	deleteGenerated := utils.IsTrue(input.DeleteGenerated)
 	deleteFile := utils.IsTrue(input.DeleteFile)
+	destroyFileEntry := utils.IsTrue(input.DestroyFileEntry)
 
 	if err := r.withTxn(ctx, func(ctx context.Context) error {
 		qb := r.repository.Scene
@@ -513,7 +515,7 @@ func (r *mutationResolver) ScenesDestroy(ctx context.Context, input models.Scene
 			// kill any running encoders
 			manager.KillRunningStreams(scene, fileNamingAlgo)
 
-			if err := r.sceneService.Destroy(ctx, scene, fileDeleter, deleteGenerated, deleteFile); err != nil {
+			if err := r.sceneService.Destroy(ctx, scene, fileDeleter, deleteGenerated, deleteFile, destroyFileEntry); err != nil {
 				return err
 			}
 		}
diff --git a/internal/manager/repository.go b/internal/manager/repository.go
index 8d4ef1137..e51e737ee 100644
--- a/internal/manager/repository.go
+++ b/internal/manager/repository.go
@@ -13,14 +13,14 @@ type SceneService interface {
 	Create(ctx context.Context, input *models.Scene, fileIDs []models.FileID, coverImage []byte) (*models.Scene, error)
 	AssignFile(ctx context.Context, sceneID int, fileID models.FileID) error
 	Merge(ctx context.Context, sourceIDs []int, destinationID int, fileDeleter *scene.FileDeleter, options scene.MergeOptions) error
-	Destroy(ctx context.Context, scene *models.Scene, fileDeleter *scene.FileDeleter, deleteGenerated, deleteFile bool) error
+	Destroy(ctx context.Context, scene *models.Scene, fileDeleter *scene.FileDeleter, deleteGenerated, deleteFile, destroyFileEntry bool) error
 
 	FindByIDs(ctx context.Context, ids []int, load ...scene.LoadRelationshipOption) ([]*models.Scene, error)
 	sceneFingerprintGetter
 }
 
 type ImageService interface {
-	Destroy(ctx context.Context, image *models.Image, fileDeleter *image.FileDeleter, deleteGenerated, deleteFile bool) error
+	Destroy(ctx context.Context, image *models.Image, fileDeleter *image.FileDeleter, deleteGenerated, deleteFile, destroyFileEntry bool) error
 	DestroyZipImages(ctx context.Context, zipFile models.File, fileDeleter *image.FileDeleter, deleteGenerated bool) ([]*models.Image, error)
 }
 
@@ -31,7 +31,7 @@ type GalleryService interface {
 	SetCover(ctx context.Context, g *models.Gallery, coverImageId int) error
 	ResetCover(ctx context.Context, g *models.Gallery) error
 
-	Destroy(ctx context.Context, i *models.Gallery, fileDeleter *image.FileDeleter, deleteGenerated, deleteFile bool) ([]*models.Image, error)
+	Destroy(ctx context.Context, i *models.Gallery, fileDeleter *image.FileDeleter, deleteGenerated, deleteFile, destroyFileEntry bool) ([]*models.Image, error)
 
 	ValidateImageGalleryChange(ctx context.Context, i *models.Image, updateIDs models.UpdateIDs) error
 
diff --git a/internal/manager/task_clean.go b/internal/manager/task_clean.go
index 9690cf4c8..ddd86e2f2 100644
--- a/internal/manager/task_clean.go
+++ b/internal/manager/task_clean.go
@@ -300,7 +300,10 @@ func (h *cleanHandler) handleRelatedScenes(ctx context.Context, fileDeleter *fil
 		// only delete if the scene has no other files
 		if len(scene.Files.List()) <= 1 {
 			logger.Infof("Deleting scene %q since it has no other related files", scene.DisplayName())
-			if err := mgr.SceneService.Destroy(ctx, scene, sceneFileDeleter, true, false); err != nil {
+			const deleteGenerated = true
+			const deleteFile = false
+			const destroyFileEntry = false
+			if err := mgr.SceneService.Destroy(ctx, scene, sceneFileDeleter, deleteGenerated, deleteFile, destroyFileEntry); err != nil {
 				return err
 			}
 
@@ -421,7 +424,10 @@ func (h *cleanHandler) handleRelatedImages(ctx context.Context, fileDeleter *fil
 
 		if len(i.Files.List()) <= 1 {
 			logger.Infof("Deleting image %q since it has no other related files", i.DisplayName())
-			if err := mgr.ImageService.Destroy(ctx, i, imageFileDeleter, true, false); err != nil {
+			const deleteGenerated = true
+			const deleteFile = false
+			const destroyFileEntry = false
+			if err := mgr.ImageService.Destroy(ctx, i, imageFileDeleter, deleteGenerated, deleteFile, destroyFileEntry); err != nil {
 				return err
 			}
 
diff --git a/pkg/gallery/delete.go b/pkg/gallery/delete.go
index f5186f948..4bc2e2492 100644
--- a/pkg/gallery/delete.go
+++ b/pkg/gallery/delete.go
@@ -8,13 +8,13 @@ import (
 	"github.com/stashapp/stash/pkg/models"
 )
 
-func (s *Service) Destroy(ctx context.Context, i *models.Gallery, fileDeleter *image.FileDeleter, deleteGenerated, deleteFile bool) ([]*models.Image, error) {
+func (s *Service) Destroy(ctx context.Context, i *models.Gallery, fileDeleter *image.FileDeleter, deleteGenerated, deleteFile, destroyFileEntry bool) ([]*models.Image, error) {
 	var imgsDestroyed []*models.Image
 
 	// chapter deletion is done via delete cascade, so we don't need to do anything here
 
 	// if this is a zip-based gallery, delete the images as well first
-	zipImgsDestroyed, err := s.destroyZipFileImages(ctx, i, fileDeleter, deleteGenerated, deleteFile)
+	zipImgsDestroyed, err := s.destroyZipFileImages(ctx, i, fileDeleter, deleteGenerated, deleteFile, destroyFileEntry)
 	if err != nil {
 		return nil, err
 	}
@@ -45,7 +45,7 @@ func DestroyChapter(ctx context.Context, galleryChapter *models.GalleryChapter,
 	return qb.Destroy(ctx, galleryChapter.ID)
 }
 
-func (s *Service) destroyZipFileImages(ctx context.Context, i *models.Gallery, fileDeleter *image.FileDeleter, deleteGenerated, deleteFile bool) ([]*models.Image, error) {
+func (s *Service) destroyZipFileImages(ctx context.Context, i *models.Gallery, fileDeleter *image.FileDeleter, deleteGenerated, deleteFile, destroyFileEntry bool) ([]*models.Image, error) {
 	if err := i.LoadFiles(ctx, s.Repository); err != nil {
 		return nil, err
 	}
@@ -81,6 +81,12 @@ func (s *Service) destroyZipFileImages(ctx context.Context, i *models.Gallery, f
 			if err := destroyer.DestroyZip(ctx, f, fileDeleter.Deleter, deleteFile); err != nil {
 				return nil, err
 			}
+		} else if destroyFileEntry {
+			// destroy file DB entry without deleting filesystem file
+			const deleteFileFromFS = false
+			if err := destroyer.DestroyZip(ctx, f, nil, deleteFileFromFS); err != nil {
+				return nil, err
+			}
 		}
 	}
 
diff --git a/pkg/gallery/service.go b/pkg/gallery/service.go
index 62604e0c5..5b2678480 100644
--- a/pkg/gallery/service.go
+++ b/pkg/gallery/service.go
@@ -16,7 +16,7 @@ type ImageFinder interface {
 }
 
 type ImageService interface {
-	Destroy(ctx context.Context, i *models.Image, fileDeleter *image.FileDeleter, deleteGenerated, deleteFile bool) error
+	Destroy(ctx context.Context, i *models.Image, fileDeleter *image.FileDeleter, deleteGenerated, deleteFile, destroyFileEntry bool) error
 	DestroyZipImages(ctx context.Context, zipFile models.File, fileDeleter *image.FileDeleter, deleteGenerated bool) ([]*models.Image, error)
 	DestroyFolderImages(ctx context.Context, folderID models.FolderID, fileDeleter *image.FileDeleter, deleteGenerated, deleteFile bool) ([]*models.Image, error)
 }
diff --git a/pkg/image/delete.go b/pkg/image/delete.go
index aa3a9c1c8..28bb54a59 100644
--- a/pkg/image/delete.go
+++ b/pkg/image/delete.go
@@ -37,8 +37,8 @@ func (d *FileDeleter) MarkGeneratedFiles(image *models.Image) error {
 }
 
 // Destroy destroys an image, optionally marking the file and generated files for deletion.
-func (s *Service) Destroy(ctx context.Context, i *models.Image, fileDeleter *FileDeleter, deleteGenerated, deleteFile bool) error {
-	return s.destroyImage(ctx, i, fileDeleter, deleteGenerated, deleteFile)
+func (s *Service) Destroy(ctx context.Context, i *models.Image, fileDeleter *FileDeleter, deleteGenerated, deleteFile, destroyFileEntry bool) error {
+	return s.destroyImage(ctx, i, fileDeleter, deleteGenerated, deleteFile, destroyFileEntry)
 }
 
 // DestroyZipImages destroys all images in zip, optionally marking the files and generated files for deletion.
@@ -75,7 +75,8 @@ func (s *Service) DestroyZipImages(ctx context.Context, zipFile models.File, fil
 		}
 
 		const deleteFileInZip = false
-		if err := s.destroyImage(ctx, img, fileDeleter, deleteGenerated, deleteFileInZip); err != nil {
+		const destroyFileEntry = false
+		if err := s.destroyImage(ctx, img, fileDeleter, deleteGenerated, deleteFileInZip, destroyFileEntry); err != nil {
 			return nil, err
 		}
 
@@ -135,7 +136,8 @@ func (s *Service) DestroyFolderImages(ctx context.Context, folderID models.Folde
 			continue
 		}
 
-		if err := s.Destroy(ctx, img, fileDeleter, deleteGenerated, deleteFile); err != nil {
+		const destroyFileEntry = false
+		if err := s.Destroy(ctx, img, fileDeleter, deleteGenerated, deleteFile, destroyFileEntry); err != nil {
 			return nil, err
 		}
 
@@ -146,11 +148,15 @@ func (s *Service) DestroyFolderImages(ctx context.Context, folderID models.Folde
 }
 
 // Destroy destroys an image, optionally marking the file and generated files for deletion.
-func (s *Service) destroyImage(ctx context.Context, i *models.Image, fileDeleter *FileDeleter, deleteGenerated, deleteFile bool) error {
+func (s *Service) destroyImage(ctx context.Context, i *models.Image, fileDeleter *FileDeleter, deleteGenerated, deleteFile, destroyFileEntry bool) error {
 	if deleteFile {
 		if err := s.deleteFiles(ctx, i, fileDeleter); err != nil {
 			return err
 		}
+	} else if destroyFileEntry {
+		if err := s.destroyFileEntries(ctx, i); err != nil {
+			return err
+		}
 	}
 
 	if deleteGenerated {
@@ -192,3 +198,35 @@ func (s *Service) deleteFiles(ctx context.Context, i *models.Image, fileDeleter
 
 	return nil
 }
+
+// destroyFileEntries destroys file entries from the database without deleting
+// the files from the filesystem
+func (s *Service) destroyFileEntries(ctx context.Context, i *models.Image) error {
+	if err := i.LoadFiles(ctx, s.Repository); err != nil {
+		return err
+	}
+
+	for _, f := range i.Files.List() {
+		// only destroy file entries where there is no other associated image
+		otherImages, err := s.Repository.FindByFileID(ctx, f.Base().ID)
+		if err != nil {
+			return err
+		}
+
+		if len(otherImages) > 1 {
+			// other image associated, don't remove
+			continue
+		}
+
+		// don't destroy files in zip archives
+		if f.Base().ZipFileID == nil {
+			const deleteFile = false
+			logger.Info("Destroying image file entry: ", f.Base().Path)
+			if err := file.Destroy(ctx, s.File, f, nil, deleteFile); err != nil {
+				return err
+			}
+		}
+	}
+
+	return nil
+}
diff --git a/pkg/models/gallery.go b/pkg/models/gallery.go
index 5b75febc5..dfc776afe 100644
--- a/pkg/models/gallery.go
+++ b/pkg/models/gallery.go
@@ -95,6 +95,7 @@ type GalleryDestroyInput struct {
 	// If true, then the zip file will be deleted if the gallery is zip-file-based.
 	// If gallery is folder-based, then any files not associated with other
 	// galleries will be deleted, along with the folder, if it is not empty.
-	DeleteFile      *bool `json:"delete_file"`
-	DeleteGenerated *bool `json:"delete_generated"`
+	DeleteFile       *bool `json:"delete_file"`
+	DeleteGenerated  *bool `json:"delete_generated"`
+	DestroyFileEntry *bool `json:"destroy_file_entry"`
 }
diff --git a/pkg/models/image.go b/pkg/models/image.go
index 4ab10eabf..54d1e8a82 100644
--- a/pkg/models/image.go
+++ b/pkg/models/image.go
@@ -88,15 +88,17 @@ type ImageUpdateInput struct {
 }
 
 type ImageDestroyInput struct {
-	ID              string `json:"id"`
-	DeleteFile      *bool  `json:"delete_file"`
-	DeleteGenerated *bool  `json:"delete_generated"`
+	ID               string `json:"id"`
+	DeleteFile       *bool  `json:"delete_file"`
+	DeleteGenerated  *bool  `json:"delete_generated"`
+	DestroyFileEntry *bool  `json:"destroy_file_entry"`
 }
 
 type ImagesDestroyInput struct {
-	Ids             []string `json:"ids"`
-	DeleteFile      *bool    `json:"delete_file"`
-	DeleteGenerated *bool    `json:"delete_generated"`
+	Ids              []string `json:"ids"`
+	DeleteFile       *bool    `json:"delete_file"`
+	DeleteGenerated  *bool    `json:"delete_generated"`
+	DestroyFileEntry *bool    `json:"destroy_file_entry"`
 }
 
 type ImageQueryOptions struct {
diff --git a/pkg/models/scene.go b/pkg/models/scene.go
index 1c34967c6..f50709356 100644
--- a/pkg/models/scene.go
+++ b/pkg/models/scene.go
@@ -204,15 +204,17 @@ type SceneUpdateInput struct {
 }
 
 type SceneDestroyInput struct {
-	ID              string `json:"id"`
-	DeleteFile      *bool  `json:"delete_file"`
-	DeleteGenerated *bool  `json:"delete_generated"`
+	ID               string `json:"id"`
+	DeleteFile       *bool  `json:"delete_file"`
+	DeleteGenerated  *bool  `json:"delete_generated"`
+	DestroyFileEntry *bool  `json:"destroy_file_entry"`
 }
 
 type ScenesDestroyInput struct {
-	Ids             []string `json:"ids"`
-	DeleteFile      *bool    `json:"delete_file"`
-	DeleteGenerated *bool    `json:"delete_generated"`
+	Ids              []string `json:"ids"`
+	DeleteFile       *bool    `json:"delete_file"`
+	DeleteGenerated  *bool    `json:"delete_generated"`
+	DestroyFileEntry *bool    `json:"destroy_file_entry"`
 }
 
 func NewSceneQueryResult(getter SceneGetter) *SceneQueryResult {
diff --git a/pkg/scene/delete.go b/pkg/scene/delete.go
index c34bbdf14..8ca3d6e11 100644
--- a/pkg/scene/delete.go
+++ b/pkg/scene/delete.go
@@ -109,7 +109,7 @@ func (d *FileDeleter) MarkMarkerFiles(scene *models.Scene, seconds int) error {
 
 // Destroy deletes a scene and its associated relationships from the
 // database.
-func (s *Service) Destroy(ctx context.Context, scene *models.Scene, fileDeleter *FileDeleter, deleteGenerated, deleteFile bool) error {
+func (s *Service) Destroy(ctx context.Context, scene *models.Scene, fileDeleter *FileDeleter, deleteGenerated, deleteFile, destroyFileEntry bool) error {
 	mqb := s.MarkerRepository
 	markers, err := mqb.FindBySceneID(ctx, scene.ID)
 	if err != nil {
@@ -126,6 +126,10 @@ func (s *Service) Destroy(ctx context.Context, scene *models.Scene, fileDeleter
 		if err := s.deleteFiles(ctx, scene, fileDeleter); err != nil {
 			return err
 		}
+	} else if destroyFileEntry {
+		if err := s.destroyFileEntries(ctx, scene); err != nil {
+			return err
+		}
 	}
 
 	if deleteGenerated {
@@ -180,6 +184,35 @@ func (s *Service) deleteFiles(ctx context.Context, scene *models.Scene, fileDele
 	return nil
 }
 
+// destroyFileEntries destroys file entries from the database without deleting
+// the files from the filesystem
+func (s *Service) destroyFileEntries(ctx context.Context, scene *models.Scene) error {
+	if err := scene.LoadFiles(ctx, s.Repository); err != nil {
+		return err
+	}
+
+	for _, f := range scene.Files.List() {
+		// only destroy file entries where there is no other associated scene
+		otherScenes, err := s.Repository.FindByFileID(ctx, f.ID)
+		if err != nil {
+			return err
+		}
+
+		if len(otherScenes) > 1 {
+			// other scenes associated, don't remove
+			continue
+		}
+
+		const deleteFile = false
+		logger.Info("Destroying scene file entry: ", f.Path)
+		if err := file.Destroy(ctx, s.File, f, nil, deleteFile); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
 // DestroyMarker deletes the scene marker from the database and returns a
 // function that removes the generated files, to be executed after the
 // transaction is successfully committed.
diff --git a/pkg/scene/merge.go b/pkg/scene/merge.go
index 77b551ab2..b2650ca92 100644
--- a/pkg/scene/merge.go
+++ b/pkg/scene/merge.go
@@ -120,7 +120,8 @@ func (s *Service) Merge(ctx context.Context, sourceIDs []int, destinationID int,
 	for _, src := range sources {
 		const deleteGenerated = true
 		const deleteFile = false
-		if err := s.Destroy(ctx, src, fileDeleter, deleteGenerated, deleteFile); err != nil {
+		const destroyFileEntry = false
+		if err := s.Destroy(ctx, src, fileDeleter, deleteGenerated, deleteFile, destroyFileEntry); err != nil {
 			return fmt.Errorf("deleting scene %d: %w", src.ID, err)
 		}
 	}

From 09044b92bfe6cd4fd9f2c34a6c3cc3313d1a8b1f Mon Sep 17 00:00:00 2001
From: DogmaDragon <103123951+DogmaDragon@users.noreply.github.com>
Date: Tue, 27 Jan 2026 07:06:27 +0200
Subject: [PATCH 263/405] docs: add missing patchable components and library
 (#6517)

---
 ui/v2.5/src/docs/en/Manual/UIPluginApi.md | 31 ++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/ui/v2.5/src/docs/en/Manual/UIPluginApi.md b/ui/v2.5/src/docs/en/Manual/UIPluginApi.md
index e1347a46f..fe33b2ffe 100644
--- a/ui/v2.5/src/docs/en/Manual/UIPluginApi.md
+++ b/ui/v2.5/src/docs/en/Manual/UIPluginApi.md
@@ -33,6 +33,7 @@ This namespace contains the generated graphql client interface. This is a low-le
 - `FontAwesomeBrands`
 - `Mousetrap`
 - `MousetrapPause`
+- `ReactFontAwesome`
 - `ReactSelect`
 
 ### `register`
@@ -235,17 +236,26 @@ Returns `void`.
 - `GalleryCard.Image`
 - `GalleryCard.Overlays`
 - `GalleryCard.Popovers`
+- `GalleryCardGrid`
 - `GalleryIDSelect`
+- `GalleryRecommendationRow`
 - `GallerySelect`
 - `GallerySelect.sort`
+- `GridCard`
+- `GroupCard`
+- `GroupCardGrid`
 - `GroupIDSelect`
+- `GroupRecommendationRow`
 - `GroupSelect`
 - `GroupSelect.sort`
 - `HeaderImage`
 - `HoverPopover`
 - `Icon`
+- `ImageCard`
 - `ImageDetailPanel`
+- `ImageGridCard`
 - `ImageInput`
+- `ImageRecommendationRow`
 - `LightboxLink`
 - `LoadingIndicator`
 - `MainNavBar.MenuItems`
@@ -261,6 +271,7 @@ Returns `void`.
 - `PerformerCard.Overlays`
 - `PerformerCard.Popovers`
 - `PerformerCard.Title`
+- `PerformerCardGrid`
 - `PerformerDetailsPanel`
 - `PerformerDetailsPanel.DetailGroup`
 - `PerformerGalleriesPanel`
@@ -269,6 +280,7 @@ Returns `void`.
 - `PerformerIDSelect`
 - `PerformerImagesPanel`
 - `PerformerPage`
+- `PerformerRecommendationRow`
 - `PerformerScenesPanel`
 - `PerformerSelect`
 - `PerformerSelect.sort`
@@ -277,17 +289,26 @@ Returns `void`.
 - `RatingNumber`
 - `RatingStars`
 - `RatingSystem`
+- `RecommendationRow`
 - `SceneCard`
 - `SceneCard.Details`
 - `SceneCard.Image`
 - `SceneCard.Overlays`
 - `SceneCard.Popovers`
+- `SceneCardsGrid`
 - `SceneFileInfoPanel`
 - `SceneIDSelect`
+- `SceneMarkerCard`
+- `SceneMarkerCard.Details`
+- `SceneMarkerCard.Image`
+- `SceneMarkerCard.Popovers`
+- `SceneMarkerCardsGrid`
+- `SceneMarkerRecommendationRow`
 - `ScenePage`
 - `ScenePage.TabContent`
 - `ScenePage.Tabs`
 - `ScenePlayer`
+- `SceneRecommendationRow`
 - `SceneSelect`
 - `SceneSelect.sort`
 - `SelectSetting`
@@ -296,7 +317,11 @@ Returns `void`.
 - `SettingModal`
 - `StringListSetting`
 - `StringSetting`
+- `StudioCard`
+- `StudioCardGrid`
+- `StudioDetailsPanel`
 - `StudioIDSelect`
+- `StudioRecommendationRow`
 - `StudioSelect`
 - `StudioSelect.sort`
 - `SweatDrops`
@@ -307,8 +332,10 @@ Returns `void`.
 - `TagCard.Overlays`
 - `TagCard.Popovers`
 - `TagCard.Title`
+- `TagCardGrid`
 - `TagIDSelect`
 - `TagLink`
+- `TagRecommendationRow`
 - `TagSelect`
 - `TagSelect.sort`
 - `TruncatedText`
@@ -319,6 +346,4 @@ Allows plugins to listen for Stash's events.
 
 ```js
 PluginApi.Event.addEventListener("stash:location", (e) => console.log("Page Changed", e.detail.data.location.pathname))
-```
-
-
+```
\ No newline at end of file

From 6bb22146b2c1a4039f99dce12c7e928a06758801 Mon Sep 17 00:00:00 2001
From: CJ <72030708+cj12312021@users.noreply.github.com>
Date: Mon, 26 Jan 2026 23:10:49 -0600
Subject: [PATCH 264/405] make ImageCard patchable for plugin extensibility
 (#6470)

* refactor(ui): make ImageCard patchable for plugin extensibility

Refactor ImageCard component to use PatchComponent wrapper.

Changes:
- Wrap ImageCard and sub-components with PatchComponent
- Extract ImageCardPopovers, ImageCardDetails, ImageCardOverlays,
  ImageCardImage as separate patchable components

* Add documentation
---------
Co-authored-by: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
---
 ui/v2.5/src/components/Images/ImageCard.tsx | 158 +++++++++++---------
 ui/v2.5/src/docs/en/Manual/UIPluginApi.md   |   4 +
 2 files changed, 95 insertions(+), 67 deletions(-)

diff --git a/ui/v2.5/src/components/Images/ImageCard.tsx b/ui/v2.5/src/components/Images/ImageCard.tsx
index 0b60a77ff..adaee9923 100644
--- a/ui/v2.5/src/components/Images/ImageCard.tsx
+++ b/ui/v2.5/src/components/Images/ImageCard.tsx
@@ -30,17 +30,9 @@ interface IImageCardProps {
   onPreview?: (ev: MouseEvent) => void;
 }
 
-export const ImageCard: React.FC<IImageCardProps> = PatchComponent(
-  "ImageCard",
+const ImageCardPopovers = PatchComponent(
+  "ImageCard.Popovers",
   (props: IImageCardProps) => {
-    const file = useMemo(
-      () =>
-        props.image.visual_files.length > 0
-          ? props.image.visual_files[0]
-          : undefined,
-      [props.image]
-    );
-
     function maybeRenderTagPopoverButton() {
       if (props.image.tags.length <= 0) return;
 
@@ -112,29 +104,65 @@ export const ImageCard: React.FC<IImageCardProps> = PatchComponent(
       }
     }
 
-    function maybeRenderPopoverButtonGroup() {
-      if (
-        props.image.tags.length > 0 ||
-        props.image.performers.length > 0 ||
-        props.image.o_counter ||
-        props.image.galleries.length > 0 ||
-        props.image.organized
-      ) {
-        return (
-          <>
-            <hr />
-            <ButtonGroup className="card-popovers">
-              {maybeRenderTagPopoverButton()}
-              {maybeRenderPerformerPopoverButton()}
-              {maybeRenderOCounter()}
-              {maybeRenderGallery()}
-              {maybeRenderOrganized()}
-            </ButtonGroup>
-          </>
-        );
-      }
+    if (
+      props.image.tags.length > 0 ||
+      props.image.performers.length > 0 ||
+      props.image.o_counter ||
+      props.image.galleries.length > 0 ||
+      props.image.organized
+    ) {
+      return (
+        <>
+          <hr />
+          <ButtonGroup className="card-popovers">
+            {maybeRenderTagPopoverButton()}
+            {maybeRenderPerformerPopoverButton()}
+            {maybeRenderOCounter()}
+            {maybeRenderGallery()}
+            {maybeRenderOrganized()}
+          </ButtonGroup>
+        </>
+      );
     }
 
+    return null;
+  }
+);
+
+const ImageCardDetails = PatchComponent(
+  "ImageCard.Details",
+  (props: IImageCardProps) => {
+    return (
+      <div className="image-card__details">
+        <span className="image-card__date">{props.image.date}</span>
+        <TruncatedText
+          className="image-card__description"
+          text={props.image.details}
+          lineCount={3}
+        />
+      </div>
+    );
+  }
+);
+
+const ImageCardOverlays = PatchComponent(
+  "ImageCard.Overlays",
+  (props: IImageCardProps) => {
+    return <StudioOverlay studio={props.image.studio} />;
+  }
+);
+
+const ImageCardImage = PatchComponent(
+  "ImageCard.Image",
+  (props: IImageCardProps) => {
+    const file = useMemo(
+      () =>
+        props.image.visual_files.length > 0
+          ? props.image.visual_files[0]
+          : undefined,
+      [props.image]
+    );
+
     function isPortrait() {
       const width = file?.width ? file.width : 0;
       const height = file?.height ? file.height : 0;
@@ -148,6 +176,34 @@ export const ImageCard: React.FC<IImageCardProps> = PatchComponent(
     const video = source.includes("preview");
     const ImagePreview = video ? "video" : "img";
 
+    return (
+      <>
+        <div className={cx("image-card-preview", { portrait: isPortrait() })}>
+          <ImagePreview
+            loop={video}
+            autoPlay={video}
+            playsInline={video}
+            className="image-card-preview-image"
+            alt={props.image.title ?? ""}
+            src={source}
+          />
+          {props.onPreview ? (
+            <div className="preview-button">
+              <Button onClick={props.onPreview}>
+                <Icon icon={faSearch} />
+              </Button>
+            </div>
+          ) : undefined}
+        </div>
+        <RatingBanner rating={props.image.rating100} />
+      </>
+    );
+  }
+);
+
+export const ImageCard: React.FC<IImageCardProps> = PatchComponent(
+  "ImageCard",
+  (props: IImageCardProps) => {
     return (
       <GridCard
         className={`image-card zoom-${props.zoomIndex}`}
@@ -155,42 +211,10 @@ export const ImageCard: React.FC<IImageCardProps> = PatchComponent(
         width={props.cardWidth}
         title={imageTitle(props.image)}
         linkClassName="image-card-link"
-        image={
-          <>
-            <div
-              className={cx("image-card-preview", { portrait: isPortrait() })}
-            >
-              <ImagePreview
-                loop={video}
-                autoPlay={video}
-                playsInline={video}
-                className="image-card-preview-image"
-                alt={props.image.title ?? ""}
-                src={source}
-              />
-              {props.onPreview ? (
-                <div className="preview-button">
-                  <Button onClick={props.onPreview}>
-                    <Icon icon={faSearch} />
-                  </Button>
-                </div>
-              ) : undefined}
-            </div>
-            <RatingBanner rating={props.image.rating100} />
-          </>
-        }
-        details={
-          <div className="image-card__details">
-            <span className="image-card__date">{props.image.date}</span>
-            <TruncatedText
-              className="image-card__description"
-              text={props.image.details}
-              lineCount={3}
-            />
-          </div>
-        }
-        overlays={<StudioOverlay studio={props.image.studio} />}
-        popovers={maybeRenderPopoverButtonGroup()}
+        image={<ImageCardImage {...props} />}
+        details={<ImageCardDetails {...props} />}
+        overlays={<ImageCardOverlays {...props} />}
+        popovers={<ImageCardPopovers {...props} />}
         selected={props.selected}
         selecting={props.selecting}
         onSelectedChanged={props.onSelectedChanged}
diff --git a/ui/v2.5/src/docs/en/Manual/UIPluginApi.md b/ui/v2.5/src/docs/en/Manual/UIPluginApi.md
index fe33b2ffe..683ea5b4e 100644
--- a/ui/v2.5/src/docs/en/Manual/UIPluginApi.md
+++ b/ui/v2.5/src/docs/en/Manual/UIPluginApi.md
@@ -252,6 +252,10 @@ Returns `void`.
 - `HoverPopover`
 - `Icon`
 - `ImageCard`
+- `ImageCard.Details`
+- `ImageCard.Image`
+- `ImageCard.Overlays`
+- `ImageCard.Popovers`
 - `ImageDetailPanel`
 - `ImageGridCard`
 - `ImageInput`

From a05500342a562f08cead711821122365e4d0ad56 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Tue, 27 Jan 2026 17:00:56 +1100
Subject: [PATCH 265/405] Image phash generation (#6497)

* Add image phash generation
* Add phash image filter
* Add phash to image file info and phash image filtering in ui
* Add options to generate image phash for generate/scan tasks
* Add imageIDs input to generate task
* Add generate option to image menus
* Add ellipses to generate
---
 cmd/phasher/main.go                           |  42 ++++++-
 graphql/schema/types/filters.graphql          |   2 +
 graphql/schema/types/metadata.graphql         |  13 ++-
 internal/manager/config/tasks.go              |   4 +-
 internal/manager/task_generate.go             |  48 +++++++-
 internal/manager/task_generate_image_phash.go | 103 ++++++++++++++++++
 internal/manager/task_generate_phash.go       |   2 +-
 internal/manager/task_scan.go                 |  23 ++++
 pkg/hash/imagephash/phash.go                  |  48 ++++++++
 pkg/models/image.go                           |   2 +
 pkg/sqlite/criterion_handlers.go              |  37 +++++++
 pkg/sqlite/image_filter.go                    |   9 ++
 pkg/sqlite/scene_filter.go                    |  63 +++--------
 .../src/components/Dialogs/GenerateDialog.tsx |   8 +-
 .../components/Images/ImageDetails/Image.tsx  |  24 ++++
 .../ImageDetails/ImageFileInfoPanel.tsx       |  11 ++
 ui/v2.5/src/components/Images/ImageList.tsx   |  21 +++-
 .../components/Scenes/SceneDetails/Scene.tsx  |   2 +-
 .../Settings/Tasks/GenerateOptions.tsx        |   7 ++
 .../components/Settings/Tasks/ScanOptions.tsx |   8 ++
 ui/v2.5/src/docs/en/Manual/Tasks.md           |  15 ++-
 ui/v2.5/src/locales/en-GB.json                |   8 +-
 ui/v2.5/src/models/list-filter/images.ts      |   2 +
 ui/v2.5/src/utils/navigation.ts               |  10 ++
 24 files changed, 447 insertions(+), 65 deletions(-)
 create mode 100644 internal/manager/task_generate_image_phash.go
 create mode 100644 pkg/hash/imagephash/phash.go

diff --git a/cmd/phasher/main.go b/cmd/phasher/main.go
index 864195631..e0801d5d7 100644
--- a/cmd/phasher/main.go
+++ b/cmd/phasher/main.go
@@ -5,20 +5,39 @@ import (
 	"fmt"
 	"os"
 	"os/exec"
+	"path/filepath"
 
 	flag "github.com/spf13/pflag"
 	"github.com/stashapp/stash/pkg/ffmpeg"
+	"github.com/stashapp/stash/pkg/hash/imagephash"
 	"github.com/stashapp/stash/pkg/hash/videophash"
 	"github.com/stashapp/stash/pkg/models"
 )
 
 func customUsage() {
 	fmt.Fprintf(os.Stderr, "Usage:\n")
-	fmt.Fprintf(os.Stderr, "%s [OPTIONS] VIDEOFILE...\n\nOptions:\n", os.Args[0])
+	fmt.Fprintf(os.Stderr, "%s [OPTIONS] FILE...\n\nOptions:\n", os.Args[0])
 	flag.PrintDefaults()
 }
 
 func printPhash(ff *ffmpeg.FFMpeg, ffp *ffmpeg.FFProbe, inputfile string, quiet *bool) error {
+	// Determine if this is a video or image file based on extension
+	ext := filepath.Ext(inputfile)
+	ext = ext[1:] // remove the leading dot
+
+	// Common image extensions
+	imageExts := map[string]bool{
+		"jpg": true, "jpeg": true, "png": true, "gif": true, "webp": true, "bmp": true,
+	}
+
+	if imageExts[ext] {
+		return printImagePhash(inputfile, quiet)
+	}
+
+	return printVideoPhash(ff, ffp, inputfile, quiet)
+}
+
+func printVideoPhash(ff *ffmpeg.FFMpeg, ffp *ffmpeg.FFProbe, inputfile string, quiet *bool) error {
 	ffvideoFile, err := ffp.NewVideoFile(inputfile)
 	if err != nil {
 		return err
@@ -46,6 +65,24 @@ func printPhash(ff *ffmpeg.FFMpeg, ffp *ffmpeg.FFProbe, inputfile string, quiet
 	return nil
 }
 
+func printImagePhash(inputfile string, quiet *bool) error {
+	imgFile := &models.ImageFile{
+		BaseFile: &models.BaseFile{Path: inputfile},
+	}
+
+	phash, err := imagephash.Generate(imgFile)
+	if err != nil {
+		return err
+	}
+
+	if *quiet {
+		fmt.Printf("%x\n", *phash)
+	} else {
+		fmt.Printf("%x %v\n", *phash, imgFile.Path)
+	}
+	return nil
+}
+
 func getPaths() (string, string) {
 	ffmpegPath, _ := exec.LookPath("ffmpeg")
 	ffprobePath, _ := exec.LookPath("ffprobe")
@@ -67,7 +104,7 @@ func main() {
 	args := flag.Args()
 
 	if len(args) < 1 {
-		fmt.Fprintf(os.Stderr, "Missing VIDEOFILE argument.\n")
+		fmt.Fprintf(os.Stderr, "Missing FILE argument.\n")
 		flag.Usage()
 		os.Exit(2)
 	}
@@ -87,4 +124,5 @@ func main() {
 			fmt.Fprintln(os.Stderr, err)
 		}
 	}
+
 }
diff --git a/graphql/schema/types/filters.graphql b/graphql/schema/types/filters.graphql
index 4cf25d840..b84bc638e 100644
--- a/graphql/schema/types/filters.graphql
+++ b/graphql/schema/types/filters.graphql
@@ -658,6 +658,8 @@ input ImageFilterType {
   id: IntCriterionInput
   "Filter by file checksum"
   checksum: StringCriterionInput
+  "Filter by file phash distance"
+  phash_distance: PhashDistanceCriterionInput
   "Filter by path"
   path: StringCriterionInput
   "Filter by file count"
diff --git a/graphql/schema/types/metadata.graphql b/graphql/schema/types/metadata.graphql
index c01858f64..66b74bb86 100644
--- a/graphql/schema/types/metadata.graphql
+++ b/graphql/schema/types/metadata.graphql
@@ -10,13 +10,18 @@ input GenerateMetadataInput {
   transcodes: Boolean
   "Generate transcodes even if not required"
   forceTranscodes: Boolean
+  "Generate video phashes during scan"
   phashes: Boolean
   interactiveHeatmapsSpeeds: Boolean
+  "Generate image phashes during scan"
+  imagePhashes: Boolean
   imageThumbnails: Boolean
   clipPreviews: Boolean
 
   "scene ids to generate for"
   sceneIDs: [ID!]
+  "image ids to generate for"
+  imageIDs: [ID!]
   "marker ids to generate for"
   markerIDs: [ID!]
 
@@ -85,8 +90,10 @@ input ScanMetadataInput {
   scanGenerateImagePreviews: Boolean
   "Generate sprites during scan"
   scanGenerateSprites: Boolean
-  "Generate phashes during scan"
+  "Generate video phashes during scan"
   scanGeneratePhashes: Boolean
+  "Generate image phashes during scan"
+  scanGenerateImagePhashes: Boolean
   "Generate image thumbnails during scan"
   scanGenerateThumbnails: Boolean
   "Generate image clip previews during scan"
@@ -107,8 +114,10 @@ type ScanMetadataOptions {
   scanGenerateImagePreviews: Boolean!
   "Generate sprites during scan"
   scanGenerateSprites: Boolean!
-  "Generate phashes during scan"
+  "Generate video phashes during scan"
   scanGeneratePhashes: Boolean!
+  "Generate image phashes during scan"
+  scanGenerateImagePhashes: Boolean
   "Generate image thumbnails during scan"
   scanGenerateThumbnails: Boolean!
   "Generate image clip previews during scan"
diff --git a/internal/manager/config/tasks.go b/internal/manager/config/tasks.go
index 0cfabef30..af7d5f674 100644
--- a/internal/manager/config/tasks.go
+++ b/internal/manager/config/tasks.go
@@ -11,8 +11,10 @@ type ScanMetadataOptions struct {
 	ScanGenerateImagePreviews bool `json:"scanGenerateImagePreviews"`
 	// Generate sprites during scan
 	ScanGenerateSprites bool `json:"scanGenerateSprites"`
-	// Generate phashes during scan
+	// Generate video phashes during scan
 	ScanGeneratePhashes bool `json:"scanGeneratePhashes"`
+	// Generate image phashes during scan
+	ScanGenerateImagePhashes bool `json:"scanGenerateImagePhashes"`
 	// Generate image thumbnails during scan
 	ScanGenerateThumbnails bool `json:"scanGenerateThumbnails"`
 	// Generate image thumbnails during scan
diff --git a/internal/manager/task_generate.go b/internal/manager/task_generate.go
index 30ecd08bf..5631db87b 100644
--- a/internal/manager/task_generate.go
+++ b/internal/manager/task_generate.go
@@ -29,11 +29,14 @@ type GenerateMetadataInput struct {
 	// Generate transcodes even if not required
 	ForceTranscodes           bool `json:"forceTranscodes"`
 	Phashes                   bool `json:"phashes"`
+	ImagePhashes              bool `json:"imagePhashes"`
 	InteractiveHeatmapsSpeeds bool `json:"interactiveHeatmapsSpeeds"`
 	ClipPreviews              bool `json:"clipPreviews"`
 	ImageThumbnails           bool `json:"imageThumbnails"`
 	// scene ids to generate for
 	SceneIDs []string `json:"sceneIDs"`
+	// image ids to generate for
+	ImageIDs []string `json:"imageIDs"`
 	// marker ids to generate for
 	MarkerIDs []string `json:"markerIDs"`
 	// overwrite existing media
@@ -73,6 +76,7 @@ type totalsGenerate struct {
 	markers                  int64
 	transcodes               int64
 	phashes                  int64
+	imagePhashes             int64
 	interactiveHeatmapSpeeds int64
 	clipPreviews             int64
 	imageThumbnails          int64
@@ -82,8 +86,9 @@ type totalsGenerate struct {
 
 func (j *GenerateJob) Execute(ctx context.Context, progress *job.Progress) error {
 	var scenes []*models.Scene
-	var err error
 	var markers []*models.SceneMarker
+	var images []*models.Image
+	var err error
 
 	j.overwrite = j.input.Overwrite
 	j.fileNamingAlgo = config.GetInstance().GetVideoFileNamingAlgorithm()
@@ -105,6 +110,10 @@ func (j *GenerateJob) Execute(ctx context.Context, progress *job.Progress) error
 		if err != nil {
 			logger.Error(err.Error())
 		}
+		imageIDs, err := stringslice.StringSliceToIntSlice(j.input.ImageIDs)
+		if err != nil {
+			logger.Error(err.Error())
+		}
 
 		g := &generate.Generator{
 			Encoder:      instance.FFMpeg,
@@ -118,7 +127,7 @@ func (j *GenerateJob) Execute(ctx context.Context, progress *job.Progress) error
 		r := j.repository
 		if err := r.WithReadTxn(ctx, func(ctx context.Context) error {
 			qb := r.Scene
-			if len(j.input.SceneIDs) == 0 && len(j.input.MarkerIDs) == 0 {
+			if len(j.input.SceneIDs) == 0 && len(j.input.MarkerIDs) == 0 && len(j.input.ImageIDs) == 0 {
 				j.queueTasks(ctx, g, queue)
 			} else {
 				if len(j.input.SceneIDs) > 0 {
@@ -141,6 +150,17 @@ func (j *GenerateJob) Execute(ctx context.Context, progress *job.Progress) error
 						j.queueMarkerJob(g, m, queue)
 					}
 				}
+
+				if len(j.input.ImageIDs) > 0 {
+					images, err = r.Image.FindMany(ctx, imageIDs)
+					for _, i := range images {
+						if err := i.LoadFiles(ctx, r.Image); err != nil {
+							return err
+						}
+
+						j.queueImageJob(g, i, queue)
+					}
+				}
 			}
 
 			return nil
@@ -172,6 +192,9 @@ func (j *GenerateJob) Execute(ctx context.Context, progress *job.Progress) error
 		if j.input.Phashes {
 			logMsg += fmt.Sprintf(" %d phashes", totals.phashes)
 		}
+		if j.input.ImagePhashes {
+			logMsg += fmt.Sprintf(" %d image phashes", totals.imagePhashes)
+		}
 		if j.input.InteractiveHeatmapsSpeeds {
 			logMsg += fmt.Sprintf(" %d heatmaps & speeds", totals.interactiveHeatmapSpeeds)
 		}
@@ -284,7 +307,7 @@ func (j *GenerateJob) queueImagesTasks(ctx context.Context, g *generate.Generato
 
 	r := j.repository
 
-	for more := j.input.ClipPreviews || j.input.ImageThumbnails; more; {
+	for more := j.input.ClipPreviews || j.input.ImageThumbnails || j.input.ImagePhashes; more; {
 		if job.IsCancelled(ctx) {
 			return
 		}
@@ -525,4 +548,23 @@ func (j *GenerateJob) queueImageJob(g *generate.Generator, image *models.Image,
 			queue <- task
 		}
 	}
+
+	if j.input.ImagePhashes {
+		// generate for all files in image
+		for _, f := range image.Files.List() {
+			if imageFile, ok := f.(*models.ImageFile); ok {
+				task := &GenerateImagePhashTask{
+					repository: j.repository,
+					File:       imageFile,
+					Overwrite:  j.overwrite,
+				}
+
+				if task.required() {
+					j.totals.imagePhashes++
+					j.totals.tasks++
+					queue <- task
+				}
+			}
+		}
+	}
 }
diff --git a/internal/manager/task_generate_image_phash.go b/internal/manager/task_generate_image_phash.go
new file mode 100644
index 000000000..4c07ffadf
--- /dev/null
+++ b/internal/manager/task_generate_image_phash.go
@@ -0,0 +1,103 @@
+package manager
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/stashapp/stash/pkg/hash/imagephash"
+	"github.com/stashapp/stash/pkg/logger"
+	"github.com/stashapp/stash/pkg/models"
+)
+
+type GenerateImagePhashTask struct {
+	repository models.Repository
+	File       *models.ImageFile
+	Overwrite  bool
+}
+
+func (t *GenerateImagePhashTask) GetDescription() string {
+	return fmt.Sprintf("Generating phash for %s", t.File.Path)
+}
+
+func (t *GenerateImagePhashTask) Start(ctx context.Context) {
+	if !t.required() {
+		return
+	}
+
+	var hash int64
+	set := false
+
+	// #4393 - if there is a file with the same md5, we can use the same phash
+	// only use this if we're not overwriting
+	if !t.Overwrite {
+		existing, err := t.findExistingPhash(ctx)
+		if err != nil {
+			logger.Warnf("Error finding existing phash: %v", err)
+		} else if existing != nil {
+			logger.Infof("Using existing phash for %s", t.File.Path)
+			hash = existing.(int64)
+			set = true
+		}
+	}
+
+	if !set {
+		generated, err := imagephash.Generate(t.File)
+		if err != nil {
+			logger.Errorf("Error generating phash for %q: %v", t.File.Path, err)
+			logErrorOutput(err)
+			return
+		}
+
+		hash = int64(*generated)
+	}
+
+	r := t.repository
+	if err := r.WithTxn(ctx, func(ctx context.Context) error {
+		t.File.Fingerprints = t.File.Fingerprints.AppendUnique(models.Fingerprint{
+			Type:        models.FingerprintTypePhash,
+			Fingerprint: hash,
+		})
+
+		return r.File.Update(ctx, t.File)
+	}); err != nil && ctx.Err() == nil {
+		logger.Errorf("Error setting phash: %v", err)
+	}
+}
+
+func (t *GenerateImagePhashTask) findExistingPhash(ctx context.Context) (interface{}, error) {
+	r := t.repository
+	var ret interface{}
+	if err := r.WithReadTxn(ctx, func(ctx context.Context) error {
+		md5 := t.File.Fingerprints.Get(models.FingerprintTypeMD5)
+
+		// find other files with the same md5
+		files, err := r.File.FindByFingerprint(ctx, models.Fingerprint{
+			Type:        models.FingerprintTypeMD5,
+			Fingerprint: md5,
+		})
+		if err != nil {
+			return fmt.Errorf("finding files by md5: %w", err)
+		}
+
+		// find the first file with a phash
+		for _, file := range files {
+			if phash := file.Base().Fingerprints.Get(models.FingerprintTypePhash); phash != nil {
+				ret = phash
+				return nil
+			}
+		}
+		return nil
+	}); err != nil {
+		return nil, err
+	}
+
+	return ret, nil
+}
+
+func (t *GenerateImagePhashTask) required() bool {
+	if t.Overwrite {
+		return true
+	}
+
+	return t.File.Fingerprints.Get(models.FingerprintTypePhash) == nil
+}
diff --git a/internal/manager/task_generate_phash.go b/internal/manager/task_generate_phash.go
index 54dc1a10b..5d35a8738 100644
--- a/internal/manager/task_generate_phash.go
+++ b/internal/manager/task_generate_phash.go
@@ -44,7 +44,7 @@ func (t *GeneratePhashTask) Start(ctx context.Context) {
 	if !set {
 		generated, err := videophash.Generate(instance.FFMpeg, t.File)
 		if err != nil {
-			logger.Errorf("Error generating phash: %v", err)
+			logger.Errorf("Error generating phash for %q: %v", t.File.Path, err)
 			logErrorOutput(err)
 			return
 		}
diff --git a/internal/manager/task_scan.go b/internal/manager/task_scan.go
index 6f7f34b3c..fc1a4770f 100644
--- a/internal/manager/task_scan.go
+++ b/internal/manager/task_scan.go
@@ -463,6 +463,29 @@ func (g *imageGenerators) Generate(ctx context.Context, i *models.Image, f model
 		}
 	}
 
+	if t.ScanGenerateImagePhashes {
+		progress.AddTotal(1)
+		phashFn := func(ctx context.Context) {
+			mgr := GetInstance()
+			// Only generate phash for image files, not video files
+			if imageFile, ok := f.(*models.ImageFile); ok {
+				taskPhash := GenerateImagePhashTask{
+					repository: mgr.Repository,
+					File:       imageFile,
+					Overwrite:  overwrite,
+				}
+				taskPhash.Start(ctx)
+			}
+			progress.Increment()
+		}
+
+		if g.sequentialScanning {
+			phashFn(ctx)
+		} else {
+			g.taskQueue.Add(fmt.Sprintf("Generating phash for %s", path), phashFn)
+		}
+	}
+
 	return nil
 }
 
diff --git a/pkg/hash/imagephash/phash.go b/pkg/hash/imagephash/phash.go
new file mode 100644
index 000000000..4cf6e9209
--- /dev/null
+++ b/pkg/hash/imagephash/phash.go
@@ -0,0 +1,48 @@
+package imagephash
+
+import (
+	"bytes"
+	"fmt"
+	"image"
+
+	"github.com/corona10/goimagehash"
+	"github.com/stashapp/stash/pkg/file"
+	"github.com/stashapp/stash/pkg/models"
+)
+
+// Generate computes a perceptual hash for an image file.
+func Generate(imageFile *models.ImageFile) (*uint64, error) {
+	img, err := loadImage(imageFile)
+	if err != nil {
+		return nil, fmt.Errorf("loading image: %w", err)
+	}
+
+	hash, err := goimagehash.PerceptionHash(img)
+	if err != nil {
+		return nil, fmt.Errorf("computing phash from image: %w", err)
+	}
+
+	hashValue := hash.GetHash()
+	return &hashValue, nil
+}
+
+// loadImage loads an image from disk and decodes it.
+func loadImage(imageFile *models.ImageFile) (image.Image, error) {
+	reader, err := imageFile.Open(&file.OsFS{})
+	if err != nil {
+		return nil, err
+	}
+	defer reader.Close()
+
+	buf := new(bytes.Buffer)
+	if _, err := buf.ReadFrom(reader); err != nil {
+		return nil, err
+	}
+
+	img, _, err := image.Decode(buf)
+	if err != nil {
+		return nil, fmt.Errorf("decoding image: %w", err)
+	}
+
+	return img, nil
+}
diff --git a/pkg/models/image.go b/pkg/models/image.go
index 54d1e8a82..84be79360 100644
--- a/pkg/models/image.go
+++ b/pkg/models/image.go
@@ -11,6 +11,8 @@ type ImageFilterType struct {
 	Photographer *StringCriterionInput `json:"photographer"`
 	// Filter by file checksum
 	Checksum *StringCriterionInput `json:"checksum"`
+	// Filter by phash distance
+	PhashDistance *PhashDistanceCriterionInput `json:"phash_distance"`
 	// Filter by path
 	Path *StringCriterionInput `json:"path"`
 	// Filter by file count
diff --git a/pkg/sqlite/criterion_handlers.go b/pkg/sqlite/criterion_handlers.go
index 6fe9c7ce9..1496df71d 100644
--- a/pkg/sqlite/criterion_handlers.go
+++ b/pkg/sqlite/criterion_handlers.go
@@ -1126,3 +1126,40 @@ func (h *relatedFilterHandler) handle(ctx context.Context, f *filterBuilder) {
 
 	f.addWhere(fmt.Sprintf("%s IN ("+subQuery.toSQL(false)+")", h.relatedIDCol), subQuery.args...)
 }
+
+type phashDistanceCriterionHandler struct {
+	// assumes that applicable fingerprints table is joined as fingerprints_phash
+	joinFn    func(f *filterBuilder)
+	criterion *models.PhashDistanceCriterionInput
+}
+
+func (h *phashDistanceCriterionHandler) handle(ctx context.Context, f *filterBuilder) {
+	phashDistance := h.criterion
+	if phashDistance == nil {
+		return
+	}
+
+	h.joinFn(f)
+
+	value, _ := utils.StringToPhash(phashDistance.Value)
+	distance := 0
+	if phashDistance.Distance != nil {
+		distance = *phashDistance.Distance
+	}
+
+	switch {
+	case phashDistance.Modifier == models.CriterionModifierEquals && distance > 0:
+		// needed to avoid a type mismatch
+		f.addWhere("typeof(fingerprints_phash.fingerprint) = 'integer'")
+		f.addWhere("phash_distance(fingerprints_phash.fingerprint, ?) < ?", value, distance)
+	case phashDistance.Modifier == models.CriterionModifierNotEquals && distance > 0:
+		// needed to avoid a type mismatch
+		f.addWhere("typeof(fingerprints_phash.fingerprint) = 'integer'")
+		f.addWhere("phash_distance(fingerprints_phash.fingerprint, ?) > ?", value, distance)
+	default:
+		intCriterionHandler(&models.IntCriterionInput{
+			Value:    int(value),
+			Modifier: phashDistance.Modifier,
+		}, "fingerprints_phash.fingerprint", nil)(ctx, f)
+	}
+}
diff --git a/pkg/sqlite/image_filter.go b/pkg/sqlite/image_filter.go
index 1d119bfde..b56ade26d 100644
--- a/pkg/sqlite/image_filter.go
+++ b/pkg/sqlite/image_filter.go
@@ -62,6 +62,15 @@ func (qb *imageFilterHandler) criterionHandler() criterionHandler {
 
 			stringCriterionHandler(imageFilter.Checksum, "fingerprints_md5.fingerprint")(ctx, f)
 		}),
+
+		&phashDistanceCriterionHandler{
+			joinFn: func(f *filterBuilder) {
+				imageRepository.addImagesFilesTable(f)
+				f.addLeftJoin(fingerprintTable, "fingerprints_phash", "images_files.file_id = fingerprints_phash.file_id AND fingerprints_phash.type = 'phash'")
+			},
+			criterion: imageFilter.PhashDistance,
+		},
+
 		stringCriterionHandler(imageFilter.Title, "images.title"),
 		stringCriterionHandler(imageFilter.Code, "images.code"),
 		stringCriterionHandler(imageFilter.Details, "images.details"),
diff --git a/pkg/sqlite/scene_filter.go b/pkg/sqlite/scene_filter.go
index 72c75eca5..1f856e3cd 100644
--- a/pkg/sqlite/scene_filter.go
+++ b/pkg/sqlite/scene_filter.go
@@ -5,7 +5,6 @@ import (
 	"fmt"
 
 	"github.com/stashapp/stash/pkg/models"
-	"github.com/stashapp/stash/pkg/utils"
 )
 
 type sceneFilterHandler struct {
@@ -83,14 +82,27 @@ func (qb *sceneFilterHandler) criterionHandler() criterionHandler {
 		criterionHandlerFunc(func(ctx context.Context, f *filterBuilder) {
 			if sceneFilter.Phash != nil {
 				// backwards compatibility
-				qb.phashDistanceCriterionHandler(&models.PhashDistanceCriterionInput{
-					Value:    sceneFilter.Phash.Value,
-					Modifier: sceneFilter.Phash.Modifier,
-				})(ctx, f)
+				h := phashDistanceCriterionHandler{
+					joinFn: func(f *filterBuilder) {
+						qb.addSceneFilesTable(f)
+						f.addLeftJoin(fingerprintTable, "fingerprints_phash", "scenes_files.file_id = fingerprints_phash.file_id AND fingerprints_phash.type = 'phash'")
+					},
+					criterion: &models.PhashDistanceCriterionInput{
+						Value:    sceneFilter.Phash.Value,
+						Modifier: sceneFilter.Phash.Modifier,
+					},
+				}
+				h.handle(ctx, f)
 			}
 		}),
 
-		qb.phashDistanceCriterionHandler(sceneFilter.PhashDistance),
+		&phashDistanceCriterionHandler{
+			joinFn: func(f *filterBuilder) {
+				qb.addSceneFilesTable(f)
+				f.addLeftJoin(fingerprintTable, "fingerprints_phash", "scenes_files.file_id = fingerprints_phash.file_id AND fingerprints_phash.type = 'phash'")
+			},
+			criterion: sceneFilter.PhashDistance,
+		},
 
 		intCriterionHandler(sceneFilter.Rating100, "scenes.rating", nil),
 		qb.oCountCriterionHandler(sceneFilter.OCounter),
@@ -547,42 +559,3 @@ func (qb *sceneFilterHandler) performerTagsCriterionHandler(tags *models.Hierarc
 		joinPrimaryKey: sceneIDColumn,
 	}
 }
-
-func (qb *sceneFilterHandler) phashDistanceCriterionHandler(phashDistance *models.PhashDistanceCriterionInput) criterionHandlerFunc {
-	return func(ctx context.Context, f *filterBuilder) {
-		if phashDistance != nil {
-			qb.addSceneFilesTable(f)
-			f.addLeftJoin(fingerprintTable, "fingerprints_phash", "scenes_files.file_id = fingerprints_phash.file_id AND fingerprints_phash.type = 'phash'")
-
-			value, _ := utils.StringToPhash(phashDistance.Value)
-			distance := 0
-			if phashDistance.Distance != nil {
-				distance = *phashDistance.Distance
-			}
-
-			if distance == 0 {
-				// use the default handler
-				intCriterionHandler(&models.IntCriterionInput{
-					Value:    int(value),
-					Modifier: phashDistance.Modifier,
-				}, "fingerprints_phash.fingerprint", nil)(ctx, f)
-			}
-
-			switch {
-			case phashDistance.Modifier == models.CriterionModifierEquals && distance > 0:
-				// needed to avoid a type mismatch
-				f.addWhere("typeof(fingerprints_phash.fingerprint) = 'integer'")
-				f.addWhere("phash_distance(fingerprints_phash.fingerprint, ?) < ?", value, distance)
-			case phashDistance.Modifier == models.CriterionModifierNotEquals && distance > 0:
-				// needed to avoid a type mismatch
-				f.addWhere("typeof(fingerprints_phash.fingerprint) = 'integer'")
-				f.addWhere("phash_distance(fingerprints_phash.fingerprint, ?) > ?", value, distance)
-			default:
-				intCriterionHandler(&models.IntCriterionInput{
-					Value:    int(value),
-					Modifier: phashDistance.Modifier,
-				}, "fingerprints_phash.fingerprint", nil)(ctx, f)
-			}
-		}
-	}
-}
diff --git a/ui/v2.5/src/components/Dialogs/GenerateDialog.tsx b/ui/v2.5/src/components/Dialogs/GenerateDialog.tsx
index 5afdb0b8e..c30073e48 100644
--- a/ui/v2.5/src/components/Dialogs/GenerateDialog.tsx
+++ b/ui/v2.5/src/components/Dialogs/GenerateDialog.tsx
@@ -17,7 +17,7 @@ import { SettingsContext } from "../Settings/context";
 interface ISceneGenerateDialog {
   selectedIds?: string[];
   onClose: () => void;
-  type: "scene"; // TODO - add image generate
+  type: "scene" | "image";
 }
 
 export const GenerateDialog: React.FC<ISceneGenerateDialog> = ({
@@ -25,6 +25,9 @@ export const GenerateDialog: React.FC<ISceneGenerateDialog> = ({
   onClose,
   type,
 }) => {
+  const sceneIDs = type === "scene" ? selectedIds : undefined;
+  const imageIDs = type === "image" ? selectedIds : undefined;
+
   const { configuration } = useConfigurationContext();
 
   function getDefaultOptions(): GQL.GenerateMetadataInput {
@@ -141,7 +144,8 @@ export const GenerateDialog: React.FC<ISceneGenerateDialog> = ({
     try {
       await mutateMetadataGenerate({
         ...options,
-        sceneIDs: selectedIds,
+        sceneIDs,
+        imageIDs,
       });
       Toast.success(
         intl.formatMessage(
diff --git a/ui/v2.5/src/components/Images/ImageDetails/Image.tsx b/ui/v2.5/src/components/Images/ImageDetails/Image.tsx
index 47de3971e..f79d95fca 100644
--- a/ui/v2.5/src/components/Images/ImageDetails/Image.tsx
+++ b/ui/v2.5/src/components/Images/ImageDetails/Image.tsx
@@ -36,6 +36,7 @@ import cx from "classnames";
 import { TruncatedText } from "src/components/Shared/TruncatedText";
 import { goBackOrReplace } from "src/utils/history";
 import { FormattedDate } from "src/components/Shared/Date";
+import { GenerateDialog } from "src/components/Dialogs/GenerateDialog";
 
 interface IProps {
   image: GQL.ImageDataFragment;
@@ -62,6 +63,7 @@ const ImagePage: React.FC<IProps> = ({ image }) => {
   const [activeTabKey, setActiveTabKey] = useState("image-details-panel");
 
   const [isDeleteAlertOpen, setIsDeleteAlertOpen] = useState<boolean>(false);
+  const [isGenerateDialogOpen, setIsGenerateDialogOpen] = useState(false);
 
   async function onSave(input: GQL.ImageUpdateInput) {
     await updateImage({
@@ -170,6 +172,20 @@ const ImagePage: React.FC<IProps> = ({ image }) => {
     }
   }
 
+  function maybeRenderSceneGenerateDialog() {
+    if (isGenerateDialogOpen) {
+      return (
+        <GenerateDialog
+          selectedIds={[image.id]}
+          onClose={() => {
+            setIsGenerateDialogOpen(false);
+          }}
+          type="image"
+        />
+      );
+    }
+  }
+
   function renderOperations() {
     return (
       <Dropdown>
@@ -189,6 +205,13 @@ const ImagePage: React.FC<IProps> = ({ image }) => {
           >
             <FormattedMessage id="actions.rescan" />
           </Dropdown.Item>
+          <Dropdown.Item
+            key="generate"
+            className="bg-secondary text-white"
+            onClick={() => setIsGenerateDialogOpen(true)}
+          >
+            <FormattedMessage id="actions.generate" />…
+          </Dropdown.Item>
           <Dropdown.Item
             key="delete-image"
             className="bg-secondary text-white"
@@ -299,6 +322,7 @@ const ImagePage: React.FC<IProps> = ({ image }) => {
       </Helmet>
 
       {maybeRenderDeleteDialog()}
+      {maybeRenderSceneGenerateDialog()}
       <div className="image-tabs order-xl-first order-last">
         <div>
           <div className="image-header-container">
diff --git a/ui/v2.5/src/components/Images/ImageDetails/ImageFileInfoPanel.tsx b/ui/v2.5/src/components/Images/ImageDetails/ImageFileInfoPanel.tsx
index 4e566a626..f247e062b 100644
--- a/ui/v2.5/src/components/Images/ImageDetails/ImageFileInfoPanel.tsx
+++ b/ui/v2.5/src/components/Images/ImageDetails/ImageFileInfoPanel.tsx
@@ -9,6 +9,7 @@ import { useToast } from "src/hooks/Toast";
 import TextUtils from "src/utils/text";
 import { TextField, URLField, URLsField } from "src/utils/field";
 import { FileSize } from "src/components/Shared/FileSize";
+import NavUtils from "src/utils/navigation";
 
 interface IFileInfoPanelProps {
   file: GQL.ImageFileDataFragment | GQL.VideoFileDataFragment;
@@ -23,6 +24,7 @@ const FileInfoPanel: React.FC<IFileInfoPanelProps> = (
   props: IFileInfoPanelProps
 ) => {
   const checksum = props.file.fingerprints.find((f) => f.type === "md5");
+  const phash = props.file.fingerprints.find((f) => f.type === "phash");
 
   return (
     <div>
@@ -36,6 +38,15 @@ const FileInfoPanel: React.FC<IFileInfoPanelProps> = (
           </>
         )}
         <TextField id="media_info.checksum" value={checksum?.value} truncate />
+        <URLField
+          id="media_info.phash"
+          abbr="Perceptual hash"
+          value={phash?.value}
+          url={NavUtils.makeImagesPHashMatchUrl(phash?.value)}
+          target="_self"
+          truncate
+          internal
+        />
         <URLField
           id="path"
           url={`file://${props.file.path}`}
diff --git a/ui/v2.5/src/components/Images/ImageList.tsx b/ui/v2.5/src/components/Images/ImageList.tsx
index 7928090cc..eee789bb1 100644
--- a/ui/v2.5/src/components/Images/ImageList.tsx
+++ b/ui/v2.5/src/components/Images/ImageList.tsx
@@ -27,6 +27,8 @@ import { View } from "../List/views";
 import { IItemListOperation } from "../List/FilteredListToolbar";
 import { FileSize } from "../Shared/FileSize";
 import { PatchComponent } from "src/patch";
+import { GenerateDialog } from "../Dialogs/GenerateDialog";
+import { useModal } from "src/hooks/modal";
 
 interface IImageWallProps {
   images: GQL.SlimImageDataFragment[];
@@ -356,12 +358,28 @@ export const ImageList: React.FC<IImageList> = PatchComponent(
 
     const filterMode = GQL.FilterMode.Images;
 
-    const otherOperations = [
+    const { modal, showModal, closeModal } = useModal();
+
+    const otherOperations: IItemListOperation<GQL.FindImagesQueryResult>[] = [
       ...extraOperations,
       {
         text: intl.formatMessage({ id: "actions.view_random" }),
         onClick: viewRandom,
       },
+      {
+        text: `${intl.formatMessage({ id: "actions.generate" })}…`,
+        onClick: (result, filter, selectedIds) => {
+          showModal(
+            <GenerateDialog
+              type="image"
+              selectedIds={Array.from(selectedIds.values())}
+              onClose={() => closeModal()}
+            />
+          );
+          return Promise.resolve();
+        },
+        isDisplayed: showWhenSelected,
+      },
       {
         text: intl.formatMessage({ id: "actions.export" }),
         onClick: onExport,
@@ -497,6 +515,7 @@ export const ImageList: React.FC<IImageList> = PatchComponent(
         view={view}
         selectable
       >
+        {modal}
         <ItemList
           view={view}
           otherOperations={otherOperations}
diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx
index ee38ebd47..7c9b178c1 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx
@@ -415,7 +415,7 @@ const ScenePage: React.FC<IProps> = PatchComponent("ScenePage", (props) => {
           className="bg-secondary text-white"
           onClick={() => setIsGenerateDialogOpen(true)}
         >
-          <FormattedMessage id="actions.generate" />
+          <FormattedMessage id="actions.generate" />…
         </Dropdown.Item>
         <Dropdown.Item
           key="generate-screenshot"
diff --git a/ui/v2.5/src/components/Settings/Tasks/GenerateOptions.tsx b/ui/v2.5/src/components/Settings/Tasks/GenerateOptions.tsx
index ee126d41e..24be2c7fe 100644
--- a/ui/v2.5/src/components/Settings/Tasks/GenerateOptions.tsx
+++ b/ui/v2.5/src/components/Settings/Tasks/GenerateOptions.tsx
@@ -167,6 +167,13 @@ export const GenerateOptions: React.FC<IGenerateOptions> = ({
             headingID="dialogs.scene_gen.image_thumbnails"
             onChange={(v) => setOptions({ imageThumbnails: v })}
           />
+          <BooleanSetting
+            id="image-phash-task"
+            checked={options.imagePhashes ?? false}
+            headingID="dialogs.scene_gen.image_phash"
+            tooltipID="dialogs.scene_gen.image_phash_tooltip"
+            onChange={(v) => setOptions({ imagePhashes: v })}
+          />
         </>
       )}
       <BooleanSetting
diff --git a/ui/v2.5/src/components/Settings/Tasks/ScanOptions.tsx b/ui/v2.5/src/components/Settings/Tasks/ScanOptions.tsx
index 5b5c7809e..bb9eb4480 100644
--- a/ui/v2.5/src/components/Settings/Tasks/ScanOptions.tsx
+++ b/ui/v2.5/src/components/Settings/Tasks/ScanOptions.tsx
@@ -18,6 +18,7 @@ export const ScanOptions: React.FC<IScanOptions> = ({
     scanGenerateSprites,
     scanGeneratePhashes,
     scanGenerateThumbnails,
+    scanGenerateImagePhashes,
     scanGenerateClipPreviews,
     rescan,
   } = options;
@@ -72,6 +73,13 @@ export const ScanOptions: React.FC<IScanOptions> = ({
         headingID="config.tasks.generate_thumbnails_during_scan"
         onChange={(v) => setOptions({ scanGenerateThumbnails: v })}
       />
+      <BooleanSetting
+        id="scan-generate-image-phashes"
+        checked={scanGenerateImagePhashes ?? false}
+        headingID="config.tasks.generate_image_phashes_during_scan"
+        tooltipID="config.tasks.generate_image_phashes_during_scan_tooltip"
+        onChange={(v) => setOptions({ scanGenerateImagePhashes: v })}
+      />
       <BooleanSetting
         id="scan-generate-clip-previews"
         checked={scanGenerateClipPreviews ?? false}
diff --git a/ui/v2.5/src/docs/en/Manual/Tasks.md b/ui/v2.5/src/docs/en/Manual/Tasks.md
index aa46f72bb..063d02277 100644
--- a/ui/v2.5/src/docs/en/Manual/Tasks.md
+++ b/ui/v2.5/src/docs/en/Manual/Tasks.md
@@ -18,10 +18,11 @@ The scan task accepts the following options:
 | Generate previews | Generates video previews (mp4) which play when hovering over a scene. |
 | Generate animated image previews* | *Accessible in Advanced Mode* - Also generate animated (webp) previews, only required when Scene/Marker Wall Preview Type is set to Animated Image. When browsing they use less CPU than the video previews, but are generated in addition to them and are larger files.|
 | Generate scrubber sprites | The set of images displayed below the video player for easy navigation. |
-| Generate perceptual hashes | Generates perceptual hashes for scene deduplication and identification. |
+| Generate video perceptual hashes | Generates perceptual hashes for scene deduplication and identification. |
 | Generate thumbnails for images | Generates thumbnails for image files. | 
+| Generate image perceptual hashes | Generates perceptual hashes for image deduplication and identification. |
 | Generate previews for image clips | Generates a gif/looping video as thumbnail for image clips/gifs. |
-| Rescan | By default, Stash will only rescan existing files if the file's modified date has been updated since its previous scan. Stash will rescan files in the path when this option is enabled, regardless of the file modification time. Only required Stash needs to recalculate video/image metadata, or to rescan gallery zips. |
+| Rescan | By default, Stash will only rescan existing files if the file's modified date has been updated since its previous scan. Stash will rescan files in the path when this option is enabled, regardless of the file modification time. Only required if Stash needs to recalculate video/image metadata, or to rescan gallery zips. |
 
 ## Auto Tagging
 See the [Auto Tagging](/help/AutoTagging.md) page.
@@ -31,14 +32,16 @@ See the [Scene Filename Parser](/help/SceneFilenameParser.md) page.
 
 ## Generated Content
 
-The scanning function automatically generates a screenshot of each scene. The generated content provides the following:
+The generated content provides the following:
 
+* Scene covers - screenshot of the scene used as the cover image
 * Video or image previews that are played when mousing over the scene card
-* Perceptual hashes - helps match against StashDB, and feeds the duplicate finder
+* Video Perceptual hashes - helps match against StashDB, and feeds the duplicate finder
 * Sprites (scene stills for parts of each scene) that are shown in the scene scrubber
 * Marker video previews that are shown in the markers page
 * Transcoded versions of scenes. See below
 * Image thumbnails of galleries
+* Image Perceptual hashes - can be used for identification and deduplication
 
 The generate task accepts the following options:
 
@@ -52,9 +55,11 @@ The generate task accepts the following options:
 | Marker Animated Image Previews | *Accessible in Advanced Mode* - Also generate animated (webp) previews, only required when Scene/Marker Wall Preview Type is set to Animated Image. When browsing they use less CPU than the video previews, but are generated in addition to them and are larger files. |
 | Marker Screenshots | Generates static JPG images for markers. Only required if Preview Type is set to Static Image. Requires Marker Previews to be enabled. | 
 | Transcodes | *Accessible in Advanced Mode* - MP4 conversions of unsupported video formats. Allows direct streaming instead of live transcoding. |
-| Perceptual hashes (for deduplication) | Generates perceptual hashes for scene deduplication and identification. |
+| Video Perceptual hashes (for deduplication) | Generates perceptual hashes for scene deduplication and identification. |
 | Generate heatmaps and speeds for interactive scenes | Generates heatmaps and speeds for interactive scenes. |
 | Image Clip Previews | Generates a gif/looping video as thumbnail for image clips/gifs. |
+| Image Thumbnails | Generates thumbnails for image files. |
+| Image Perceptual hashes (for deduplication) | Generates perceptual hashes for image deduplication and identification. |
 | Overwrite existing generated files | By default, where a generated file exists, it is not regenerated. When this flag is enabled, then the generated files are regenerated. |
 
 ### Transcodes
diff --git a/ui/v2.5/src/locales/en-GB.json b/ui/v2.5/src/locales/en-GB.json
index 4cec0af66..e417e8cbb 100644
--- a/ui/v2.5/src/locales/en-GB.json
+++ b/ui/v2.5/src/locales/en-GB.json
@@ -517,7 +517,9 @@
       },
       "generate_clip_previews_during_scan": "Generate previews for image clips",
       "generate_desc": "Generate supporting image, sprite, video, vtt and other files.",
-      "generate_phashes_during_scan": "Generate perceptual hashes",
+      "generate_image_phashes_during_scan": "Generate image perceptual hashes",
+      "generate_image_phashes_during_scan_tooltip": "For deduplication and identification.",
+      "generate_phashes_during_scan": "Generate video perceptual hashes",
       "generate_phashes_during_scan_tooltip": "For deduplication and scene identification.",
       "generate_previews_during_scan": "Generate animated image previews",
       "generate_previews_during_scan_tooltip": "Also generate animated (webp) previews, only required when Scene/Marker Wall Preview Type is set to Animated Image. When browsing they use less CPU than the video previews, but are generated in addition to them and are larger files.",
@@ -999,6 +1001,8 @@
       "covers": "Scene covers",
       "force_transcodes": "Force Transcode generation",
       "force_transcodes_tooltip": "By default, transcodes are only generated when the video file is not supported in the browser. When enabled, transcodes will be generated even when the video file appears to be supported in the browser.",
+      "image_phash": "Image perceptual hashes",
+      "image_phash_tooltip": "For deduplication and identification",
       "image_previews": "Animated Image Previews",
       "image_previews_tooltip": "Also generate animated (webp) previews, only required when Scene/Marker Wall Preview Type is set to Animated Image. When browsing they use less CPU than the video previews, but are generated in addition to them and are larger files.",
       "image_thumbnails": "Image Thumbnails",
@@ -1012,7 +1016,7 @@
       "override_preview_generation_options": "Override Preview Generation Options",
       "override_preview_generation_options_desc": "Override Preview Generation Options for this operation. Defaults are set in System -> Preview Generation.",
       "overwrite": "Overwrite existing files",
-      "phash": "Perceptual hashes",
+      "phash": "Video perceptual hashes",
       "phash_tooltip": "For deduplication and scene identification",
       "preview_exclude_end_time_desc": "Exclude the last x seconds from scene previews. This can be a value in seconds, or a percentage (eg 2%) of the total scene duration.",
       "preview_exclude_end_time_head": "Exclude end time",
diff --git a/ui/v2.5/src/models/list-filter/images.ts b/ui/v2.5/src/models/list-filter/images.ts
index 0b2e06df0..2d3db8265 100644
--- a/ui/v2.5/src/models/list-filter/images.ts
+++ b/ui/v2.5/src/models/list-filter/images.ts
@@ -22,6 +22,7 @@ import {
 import { ListFilterOptions, MediaSortByOptions } from "./filter-options";
 import { DisplayMode } from "./types";
 import { GalleriesCriterionOption } from "./criteria/galleries";
+import { PhashCriterionOption } from "./criteria/phash";
 
 const defaultSortBy = "path";
 
@@ -47,6 +48,7 @@ const criterionOptions = [
   createStringCriterionOption("details"),
   createStringCriterionOption("photographer"),
   createMandatoryStringCriterionOption("checksum", "media_info.checksum"),
+  PhashCriterionOption,
   PathCriterionOption,
   GalleriesCriterionOption,
   OrganizedCriterionOption,
diff --git a/ui/v2.5/src/utils/navigation.ts b/ui/v2.5/src/utils/navigation.ts
index 581d079c7..17d9dfe6b 100644
--- a/ui/v2.5/src/utils/navigation.ts
+++ b/ui/v2.5/src/utils/navigation.ts
@@ -342,6 +342,15 @@ const makeScenesPHashMatchUrl = (phash: GQL.Maybe<string> | undefined) => {
   return `/scenes?${filter.makeQueryParameters()}`;
 };
 
+const makeImagesPHashMatchUrl = (phash: GQL.Maybe<string> | undefined) => {
+  if (!phash) return "#";
+  const filter = new ListFilterModel(GQL.FilterMode.Images, undefined);
+  const criterion = new PhashCriterion();
+  criterion.value = { value: phash };
+  filter.criteria.push(criterion);
+  return `/images?${filter.makeQueryParameters()}`;
+};
+
 const makeGalleryImagesUrl = (
   gallery: Partial<GQL.GalleryDataFragment | GQL.SlimGalleryDataFragment>,
   extraCriteria?: ModifierCriterion<CriterionValue>[]
@@ -493,6 +502,7 @@ const NavUtils = {
   makeTagGroupsUrl,
   makeScenesPHashMatchUrl,
   makeSceneMarkerUrl,
+  makeImagesPHashMatchUrl,
   makeGroupScenesUrl,
   makeChildStudiosUrl,
   makeGalleryImagesUrl,

From b8c5e1521795f4e39dfa7d00071f0ebdfd0e6ee2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 27 Jan 2026 17:13:06 +1100
Subject: [PATCH 266/405] Bump lodash-es from 4.17.21 to 4.17.23 in /ui/v2.5
 (#6511)

Bumps [lodash-es](https://github.com/lodash/lodash) from 4.17.21 to 4.17.23.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.21...4.17.23)

---
updated-dependencies:
- dependency-name: lodash-es
  dependency-version: 4.17.23
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 ui/v2.5/package.json   |  2 +-
 ui/v2.5/pnpm-lock.yaml | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/ui/v2.5/package.json b/ui/v2.5/package.json
index f774aedbd..e024a0053 100644
--- a/ui/v2.5/package.json
+++ b/ui/v2.5/package.json
@@ -50,7 +50,7 @@
     "graphql-ws": "^5.14.3",
     "i18n-iso-countries": "^7.5.0",
     "localforage": "^1.10.0",
-    "lodash-es": "^4.17.21",
+    "lodash-es": "^4.17.23",
     "moment": "^2.30.1",
     "mousetrap": "^1.6.5",
     "mousetrap-pause": "^1.0.0",
diff --git a/ui/v2.5/pnpm-lock.yaml b/ui/v2.5/pnpm-lock.yaml
index 27b993864..02033c41f 100644
--- a/ui/v2.5/pnpm-lock.yaml
+++ b/ui/v2.5/pnpm-lock.yaml
@@ -96,8 +96,8 @@ importers:
         specifier: ^1.10.0
         version: 1.10.0
       lodash-es:
-        specifier: ^4.17.21
-        version: 4.17.21
+        specifier: ^4.17.23
+        version: 4.17.23
       moment:
         specifier: ^2.30.1
         version: 2.30.1
@@ -1215,6 +1215,7 @@ packages:
 
   '@formatjs/intl-enumerator@1.4.6':
     resolution: {integrity: sha512-O2YMcE3SuBy4jL8r6YNq/8hvFrQ92QGLawdmzFbOi8D1r3VOfEMr8ifnOMp3zt8XemfTLrma+aF6yRCVeEbVLw==}
+    deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.
 
   '@formatjs/intl-getcanonicallocales@2.3.0':
     resolution: {integrity: sha512-BOXbLwqQ7nKua/l7tKqDLRN84WupDXFDhGJQMFvsMVA2dKuOdRaWTxWpL3cJ7qPkoNw11Jf+Xpj4OSPBBvW0eQ==}
@@ -2373,6 +2374,7 @@ packages:
 
   bootstrap@4.6.2:
     resolution: {integrity: sha512-51Bbp/Uxr9aTuy6ca/8FbFloBUJZLHwnhTcnjIeRn2suQWsWzcuJhGjKDB5eppVte/8oCdOL3VuwxvZDUggwGQ==}
+    deprecated: This version of Bootstrap is no longer supported. Please upgrade to the latest version.
     peerDependencies:
       jquery: 1.9.1 - 3
       popper.js: ^1.16.1
@@ -3699,8 +3701,8 @@ packages:
     resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==}
     engines: {node: '>=10'}
 
-  lodash-es@4.17.21:
-    resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
+  lodash-es@4.17.23:
+    resolution: {integrity: sha512-kVI48u3PZr38HdYz98UmfPnXl2DXrpdctLrFLCd3kOx1xUkOmpFPx7gCWWM5MPkL/fD8zb+Ph0QzjGFs4+hHWg==}
 
   lodash.debounce@4.0.8:
     resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
@@ -8788,7 +8790,7 @@ snapshots:
       deepmerge: 2.2.1
       hoist-non-react-statics: 3.3.2
       lodash: 4.17.21
-      lodash-es: 4.17.21
+      lodash-es: 4.17.23
       react: 17.0.2
       react-fast-compare: 2.0.4
       tiny-warning: 1.0.3
@@ -9443,7 +9445,7 @@ snapshots:
     dependencies:
       p-locate: 5.0.0
 
-  lodash-es@4.17.21: {}
+  lodash-es@4.17.23: {}
 
   lodash.debounce@4.0.8: {}
 

From 6f5a7d1f0a2f63fc35c8a3f3ef9e034c8db3cbc8 Mon Sep 17 00:00:00 2001
From: WeedLordVegeta420 <81525421+WeedLordVegeta420@users.noreply.github.com>
Date: Tue, 27 Jan 2026 01:24:14 -0500
Subject: [PATCH 267/405] Add latest scene sort for performers and studios.
 (#6501)

---
 pkg/sqlite/performer.go                      | 25 ++++++++++++++++++++
 pkg/sqlite/scene.go                          |  1 +
 pkg/sqlite/studio.go                         | 23 ++++++++++++++++++
 ui/v2.5/src/locales/en-GB.json               |  1 +
 ui/v2.5/src/models/list-filter/performers.ts |  1 +
 ui/v2.5/src/models/list-filter/studios.ts    |  1 +
 6 files changed, 52 insertions(+)

diff --git a/pkg/sqlite/performer.go b/pkg/sqlite/performer.go
index 4e06b5b29..bc4461f5f 100644
--- a/pkg/sqlite/performer.go
+++ b/pkg/sqlite/performer.go
@@ -706,6 +706,28 @@ func (qb *PerformerStore) sortByLastOAt(direction string) string {
 	return " ORDER BY (" + selectPerformerLastOAtSQL + ") " + direction
 }
 
+// used for sorting on performer latest scene
+var selectPerformerLatestSceneSQL = utils.StrFormat(
+	"SELECT MAX(date) FROM ("+
+		"SELECT {date} FROM {performers_scenes} s "+
+		"LEFT JOIN {scenes} ON {scenes}.id = s.{scene_id} "+
+		"WHERE s.{performer_id} = {performers}.id"+
+		")",
+	map[string]interface{}{
+		"performer_id":      performerIDColumn,
+		"performers":        performerTable,
+		"performers_scenes": performersScenesTable,
+		"scenes":            sceneTable,
+		"scene_id":          sceneIDColumn,
+		"date":              sceneDateColumn,
+	},
+)
+
+func (qb *PerformerStore) sortByLatestScene(direction string) string {
+	// need to get the latest date from scenes
+	return " ORDER BY (" + selectPerformerLatestSceneSQL + ") " + direction
+}
+
 // used for sorting on performer last view_date
 var selectPerformerLastPlayedAtSQL = utils.StrFormat(
 	"SELECT MAX(view_date) FROM ("+
@@ -762,6 +784,7 @@ var performerSortOptions = sortOptions{
 	"images_count",
 	"last_o_at",
 	"last_played_at",
+	"latest_scene",
 	"measurements",
 	"name",
 	"o_counter",
@@ -812,6 +835,8 @@ func (qb *PerformerStore) getPerformerSort(findFilter *models.FindFilterType) (s
 		sortQuery += qb.sortByLastPlayedAt(direction)
 	case "last_o_at":
 		sortQuery += qb.sortByLastOAt(direction)
+	case "latest_scene":
+		sortQuery += qb.sortByLatestScene(direction)
 	default:
 		sortQuery += getSort(sort, direction, "performers")
 	}
diff --git a/pkg/sqlite/scene.go b/pkg/sqlite/scene.go
index a0b9005a5..d92800317 100644
--- a/pkg/sqlite/scene.go
+++ b/pkg/sqlite/scene.go
@@ -26,6 +26,7 @@ const (
 	sceneTable            = "scenes"
 	scenesFilesTable      = "scenes_files"
 	sceneIDColumn         = "scene_id"
+	sceneDateColumn       = "date"
 	performersScenesTable = "performers_scenes"
 	scenesTagsTable       = "scenes_tags"
 	scenesGalleriesTable  = "scenes_galleries"
diff --git a/pkg/sqlite/studio.go b/pkg/sqlite/studio.go
index 1a05be6f3..e328818da 100644
--- a/pkg/sqlite/studio.go
+++ b/pkg/sqlite/studio.go
@@ -15,6 +15,7 @@ import (
 
 	"github.com/stashapp/stash/pkg/models"
 	"github.com/stashapp/stash/pkg/studio"
+	"github.com/stashapp/stash/pkg/utils"
 )
 
 const (
@@ -601,12 +602,32 @@ func (qb *StudioStore) sortByScenesDuration(direction string) string {
 	) %s`, sceneTable, scenesFilesTable, scenesFilesTable, sceneIDColumn, sceneTable, scenesFilesTable, sceneTable, studioIDColumn, studioTable, getSortDirection(direction))
 }
 
+// used for sorting on performer latest scene
+var selectStudioLatestSceneSQL = utils.StrFormat(
+	"SELECT MAX(date) FROM ("+
+		"SELECT {date} FROM {scenes} s "+
+		"WHERE s.{studio_id} = {studios}.id"+
+		")",
+	map[string]interface{}{
+		"scenes":    sceneTable,
+		"studios":   studioTable,
+		"studio_id": studioIDColumn,
+		"date":      sceneDateColumn,
+	},
+)
+
+func (qb *StudioStore) sortByLatestScene(direction string) string {
+	// need to get the latest date from scenes
+	return " ORDER BY (" + selectStudioLatestSceneSQL + ") " + direction
+}
+
 var studioSortOptions = sortOptions{
 	"child_count",
 	"created_at",
 	"galleries_count",
 	"id",
 	"images_count",
+	"latest_scene",
 	"name",
 	"scenes_count",
 	"scenes_duration",
@@ -646,6 +667,8 @@ func (qb *StudioStore) getStudioSort(findFilter *models.FindFilterType) (string,
 		sortQuery += getCountSort(studioTable, galleryTable, studioIDColumn, direction)
 	case "child_count":
 		sortQuery += getCountSort(studioTable, studioTable, studioParentIDColumn, direction)
+	case "latest_scene":
+		sortQuery += qb.sortByLatestScene(direction)
 	default:
 		sortQuery += getSort(sort, direction, "studios")
 	}
diff --git a/ui/v2.5/src/locales/en-GB.json b/ui/v2.5/src/locales/en-GB.json
index e417e8cbb..b4eb8a6bc 100644
--- a/ui/v2.5/src/locales/en-GB.json
+++ b/ui/v2.5/src/locales/en-GB.json
@@ -1203,6 +1203,7 @@
   "last_o_at": "Last O At",
   "last_o_at_sfw": "Last Like At",
   "last_played_at": "Last Played At",
+  "latest_scene": "Latest Scene",
   "library": "Library",
   "loading": {
     "generic": "Loading…",
diff --git a/ui/v2.5/src/models/list-filter/performers.ts b/ui/v2.5/src/models/list-filter/performers.ts
index fcc152d01..c0bcb3bba 100644
--- a/ui/v2.5/src/models/list-filter/performers.ts
+++ b/ui/v2.5/src/models/list-filter/performers.ts
@@ -31,6 +31,7 @@ const sortByOptions = [
   "penis_length",
   "play_count",
   "last_played_at",
+  "latest_scene",
   "career_length",
   "weight",
   "measurements",
diff --git a/ui/v2.5/src/models/list-filter/studios.ts b/ui/v2.5/src/models/list-filter/studios.ts
index 02dfae2f6..42ac1b4dc 100644
--- a/ui/v2.5/src/models/list-filter/studios.ts
+++ b/ui/v2.5/src/models/list-filter/studios.ts
@@ -21,6 +21,7 @@ const sortByOptions = [
   "random",
   "rating",
   "scenes_duration",
+  "latest_scene",
 ]
   .map(ListFilterOptions.createSortBy)
   .concat([

From 244d70e20e24e21d63ede318877136e19f495301 Mon Sep 17 00:00:00 2001
From: Gykes <24581046+Gykes@users.noreply.github.com>
Date: Mon, 26 Jan 2026 22:26:42 -0800
Subject: [PATCH 268/405] Feature: Stash ID Count Filter (#6347)

Co-authored-by: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
---
 graphql/schema/types/filters.graphql     |  2 ++
 pkg/models/scene.go                      |  2 ++
 pkg/sqlite/scene_filter.go               | 12 +++++++++++
 pkg/sqlite/scene_test.go                 | 26 ++++++++++++++++++++++++
 pkg/sqlite/setup_test.go                 | 11 +++++++---
 ui/v2.5/src/locales/en-GB.json           |  1 +
 ui/v2.5/src/models/list-filter/scenes.ts |  1 +
 ui/v2.5/src/models/list-filter/types.ts  |  1 +
 8 files changed, 53 insertions(+), 3 deletions(-)

diff --git a/graphql/schema/types/filters.graphql b/graphql/schema/types/filters.graphql
index b84bc638e..4e70b7353 100644
--- a/graphql/schema/types/filters.graphql
+++ b/graphql/schema/types/filters.graphql
@@ -308,6 +308,8 @@ input SceneFilterType {
     @deprecated(reason: "use stash_ids_endpoint instead")
   "Filter by StashIDs"
   stash_ids_endpoint: StashIDsCriterionInput
+  "Filter by StashID count"
+  stash_id_count: IntCriterionInput
   "Filter by url"
   url: StringCriterionInput
   "Filter by interactive"
diff --git a/pkg/models/scene.go b/pkg/models/scene.go
index f50709356..434659cbe 100644
--- a/pkg/models/scene.go
+++ b/pkg/models/scene.go
@@ -81,6 +81,8 @@ type SceneFilterType struct {
 	StashIDEndpoint *StashIDCriterionInput `json:"stash_id_endpoint"`
 	// Filter by StashIDs Endpoint
 	StashIDsEndpoint *StashIDsCriterionInput `json:"stash_ids_endpoint"`
+	// Filter by StashID count
+	StashIDCount *IntCriterionInput `json:"stash_id_count"`
 	// Filter by url
 	URL *StringCriterionInput `json:"url"`
 	// Filter by interactive
diff --git a/pkg/sqlite/scene_filter.go b/pkg/sqlite/scene_filter.go
index 1f856e3cd..aa0d349df 100644
--- a/pkg/sqlite/scene_filter.go
+++ b/pkg/sqlite/scene_filter.go
@@ -139,6 +139,8 @@ func (qb *sceneFilterHandler) criterionHandler() criterionHandler {
 			parentIDCol:       "scenes.id",
 		},
 
+		qb.stashIDCountCriterionHandler(sceneFilter.StashIDCount),
+
 		boolCriterionHandler(sceneFilter.Interactive, "video_files.interactive", qb.addVideoFilesTable),
 		intCriterionHandler(sceneFilter.InteractiveSpeed, "video_files.interactive_speed", qb.addVideoFilesTable),
 
@@ -453,6 +455,16 @@ func (qb *sceneFilterHandler) tagCountCriterionHandler(tagCount *models.IntCrite
 	return h.handler(tagCount)
 }
 
+func (qb *sceneFilterHandler) stashIDCountCriterionHandler(stashIDCount *models.IntCriterionInput) criterionHandlerFunc {
+	h := countCriterionHandlerBuilder{
+		primaryTable: sceneTable,
+		joinTable:    "scene_stash_ids",
+		primaryFK:    sceneIDColumn,
+	}
+
+	return h.handler(stashIDCount)
+}
+
 func (qb *sceneFilterHandler) performersCriterionHandler(performers *models.MultiCriterionInput) criterionHandlerFunc {
 	h := joinedMultiCriterionHandlerBuilder{
 		primaryTable: sceneTable,
diff --git a/pkg/sqlite/scene_test.go b/pkg/sqlite/scene_test.go
index df6676a0f..ae9ba56cf 100644
--- a/pkg/sqlite/scene_test.go
+++ b/pkg/sqlite/scene_test.go
@@ -2273,6 +2273,32 @@ func TestSceneQuery(t *testing.T) {
 			nil,
 			false,
 		},
+		{
+			"single stash id",
+			nil,
+			&models.SceneFilterType{
+				StashIDCount: &models.IntCriterionInput{
+					Modifier: models.CriterionModifierEquals,
+					Value:    1,
+				},
+			},
+			[]int{sceneIdxWithGallery, sceneIdxWithPerformer},
+			[]int{sceneIdxWithGroup},
+			false,
+		},
+		{
+			"less than one stash id",
+			nil,
+			&models.SceneFilterType{
+				StashIDCount: &models.IntCriterionInput{
+					Modifier: models.CriterionModifierLessThan,
+					Value:    1,
+				},
+			},
+			[]int{sceneIdxWithGroup},
+			[]int{sceneIdxWithGallery, sceneIdxWithPerformer},
+			false,
+		},
 	}
 
 	for _, tt := range tests {
diff --git a/pkg/sqlite/setup_test.go b/pkg/sqlite/setup_test.go
index 7e6f821d1..843b8b4c2 100644
--- a/pkg/sqlite/setup_test.go
+++ b/pkg/sqlite/setup_test.go
@@ -1076,6 +1076,13 @@ func getObjectDate(index int) *models.Date {
 	return &ret
 }
 
+func sceneStashIDs(i int) []models.StashID {
+	if i%5 == 0 {
+		return nil
+	}
+	return []models.StashID{sceneStashID(i)}
+}
+
 func sceneStashID(i int) models.StashID {
 	return models.StashID{
 		StashID:   getSceneStringValue(i, "stashid"),
@@ -1174,9 +1181,7 @@ func makeScene(i int) *models.Scene {
 		PerformerIDs: models.NewRelatedIDs(pids),
 		TagIDs:       models.NewRelatedIDs(tids),
 		Groups:       models.NewRelatedGroups(groups),
-		StashIDs: models.NewRelatedStashIDs([]models.StashID{
-			sceneStashID(i),
-		}),
+		StashIDs:     models.NewRelatedStashIDs(sceneStashIDs(i)),
 		PlayDuration: getScenePlayDuration(i),
 		ResumeTime:   getSceneResumeTime(i),
 	}
diff --git a/ui/v2.5/src/locales/en-GB.json b/ui/v2.5/src/locales/en-GB.json
index b4eb8a6bc..76df6cf33 100644
--- a/ui/v2.5/src/locales/en-GB.json
+++ b/ui/v2.5/src/locales/en-GB.json
@@ -1481,6 +1481,7 @@
     "welcome_to_stash": "Welcome to Stash"
   },
   "stash_id": "Stash ID",
+  "stash_id_count": "Stash ID Count",
   "stash_id_endpoint": "Stash ID Endpoint URL",
   "stash_ids": "Stash IDs",
   "stashbox_search": {
diff --git a/ui/v2.5/src/models/list-filter/scenes.ts b/ui/v2.5/src/models/list-filter/scenes.ts
index 5fdb6a770..251e2592d 100644
--- a/ui/v2.5/src/models/list-filter/scenes.ts
+++ b/ui/v2.5/src/models/list-filter/scenes.ts
@@ -133,6 +133,7 @@ const criterionOptions = [
   GalleriesCriterionOption,
   createStringCriterionOption("url"),
   StashIDCriterionOption,
+  createMandatoryNumberCriterionOption("stash_id_count"),
   InteractiveCriterionOption,
   CaptionsCriterionOption,
   createMandatoryNumberCriterionOption("interactive_speed"),
diff --git a/ui/v2.5/src/models/list-filter/types.ts b/ui/v2.5/src/models/list-filter/types.ts
index 83ebaa010..bf5fff4d9 100644
--- a/ui/v2.5/src/models/list-filter/types.ts
+++ b/ui/v2.5/src/models/list-filter/types.ts
@@ -200,6 +200,7 @@ export type CriterionType =
   | "ignore_auto_tag"
   | "file_count"
   | "stash_id_endpoint"
+  | "stash_id_count"
   | "date"
   | "created_at"
   | "updated_at"

From d252a416d0aa378612791e06f8ac43107d60f901 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Tue, 27 Jan 2026 17:42:15 +1100
Subject: [PATCH 269/405] Refactor file scanning and handling logic (#6498)

- Moved directory walking and queuing functionality into scan task code
---
 internal/manager/manager_tasks.go |   6 +
 internal/manager/task_scan.go     | 289 ++++++++++++++-
 pkg/file/file.go                  |  24 ++
 pkg/file/folder_rename_detect.go  |  10 +-
 pkg/file/scan.go                  | 594 ++++++------------------------
 pkg/file/walk.go                  |   4 +-
 pkg/file/zip.go                   |   4 +-
 7 files changed, 431 insertions(+), 500 deletions(-)

diff --git a/internal/manager/manager_tasks.go b/internal/manager/manager_tasks.go
index 1e66433be..bac726c1b 100644
--- a/internal/manager/manager_tasks.go
+++ b/internal/manager/manager_tasks.go
@@ -100,6 +100,8 @@ func (s *Manager) Scan(ctx context.Context, input ScanMetadataInput) (int, error
 		return 0, err
 	}
 
+	cfg := config.GetInstance()
+
 	scanner := &file.Scanner{
 		Repository: file.NewRepository(s.Repository),
 		FileDecorators: []file.Decorator{
@@ -118,6 +120,10 @@ func (s *Manager) Scan(ctx context.Context, input ScanMetadataInput) (int, error
 		},
 		FingerprintCalculator: &fingerprintCalculator{s.Config},
 		FS:                    &file.OsFS{},
+		ZipFileExtensions:     cfg.GetGalleryExtensions(),
+		// ScanFilters is set in ScanJob.Execute
+		// HandlerRequiredFilters is set in ScanJob.Execute
+		Rescan: input.Rescan,
 	}
 
 	scanJob := ScanJob{
diff --git a/internal/manager/task_scan.go b/internal/manager/task_scan.go
index fc1a4770f..d09765577 100644
--- a/internal/manager/task_scan.go
+++ b/internal/manager/task_scan.go
@@ -2,13 +2,17 @@ package manager
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"io/fs"
 	"path/filepath"
 	"regexp"
+	"runtime/debug"
+	"sync"
 	"time"
 
 	"github.com/99designs/gqlgen/graphql/handler/lru"
+	"github.com/remeh/sizedwaitgroup"
 	"github.com/stashapp/stash/internal/manager/config"
 	"github.com/stashapp/stash/pkg/file"
 	"github.com/stashapp/stash/pkg/file/video"
@@ -24,14 +28,13 @@ import (
 	"github.com/stashapp/stash/pkg/txn"
 )
 
-type scanner interface {
-	Scan(ctx context.Context, handlers []file.Handler, options file.ScanOptions, progressReporter file.ProgressReporter)
-}
-
 type ScanJob struct {
-	scanner       scanner
+	scanner       *file.Scanner
 	input         ScanMetadataInput
 	subscriptions *subscriptionManager
+
+	fileQueue chan file.ScannedFile
+	count     int
 }
 
 func (j *ScanJob) Execute(ctx context.Context, progress *job.Progress) error {
@@ -55,22 +58,22 @@ func (j *ScanJob) Execute(ctx context.Context, progress *job.Progress) error {
 
 	start := time.Now()
 
+	nTasks := cfg.GetParallelTasksWithAutoDetection()
+
 	const taskQueueSize = 200000
-	taskQueue := job.NewTaskQueue(ctx, progress, taskQueueSize, cfg.GetParallelTasksWithAutoDetection())
+	taskQueue := job.NewTaskQueue(ctx, progress, taskQueueSize, nTasks)
 
 	var minModTime time.Time
 	if j.input.Filter != nil && j.input.Filter.MinModTime != nil {
 		minModTime = *j.input.Filter.MinModTime
 	}
 
-	j.scanner.Scan(ctx, getScanHandlers(j.input, taskQueue, progress), file.ScanOptions{
-		Paths:                  paths,
-		ScanFilters:            []file.PathFilter{newScanFilter(c, repo, minModTime)},
-		ZipFileExtensions:      cfg.GetGalleryExtensions(),
-		ParallelTasks:          cfg.GetParallelTasksWithAutoDetection(),
-		HandlerRequiredFilters: []file.Filter{newHandlerRequiredFilter(cfg, repo)},
-		Rescan:                 j.input.Rescan,
-	}, progress)
+	// HACK - these should really be set in the scanner initialization
+	j.scanner.FileHandlers = getScanHandlers(j.input, taskQueue, progress)
+	j.scanner.ScanFilters = []file.PathFilter{newScanFilter(c, repo, minModTime)}
+	j.scanner.HandlerRequiredFilters = []file.Filter{newHandlerRequiredFilter(cfg, repo)}
+
+	j.runJob(ctx, paths, nTasks, progress)
 
 	taskQueue.Close()
 
@@ -86,6 +89,264 @@ func (j *ScanJob) Execute(ctx context.Context, progress *job.Progress) error {
 	return nil
 }
 
+func (j *ScanJob) runJob(ctx context.Context, paths []string, nTasks int, progress *job.Progress) {
+	var wg sync.WaitGroup
+	wg.Add(1)
+
+	j.fileQueue = make(chan file.ScannedFile, scanQueueSize)
+
+	go func() {
+		defer func() {
+			wg.Done()
+
+			// handle panics in goroutine
+			if p := recover(); p != nil {
+				logger.Errorf("panic while queuing files for scan: %v", p)
+				logger.Errorf(string(debug.Stack()))
+			}
+		}()
+
+		if err := j.queueFiles(ctx, paths, progress); err != nil {
+			if errors.Is(err, context.Canceled) {
+				return
+			}
+
+			logger.Errorf("error queuing files for scan: %v", err)
+			return
+		}
+
+		logger.Infof("Finished adding files to queue. %d files queued", j.count)
+	}()
+
+	defer wg.Wait()
+
+	j.processQueue(ctx, nTasks, progress)
+}
+
+const scanQueueSize = 200000
+
+func (j *ScanJob) queueFiles(ctx context.Context, paths []string, progress *job.Progress) error {
+	fs := &file.OsFS{}
+
+	defer func() {
+		close(j.fileQueue)
+
+		progress.AddTotal(j.count)
+		progress.Definite()
+	}()
+
+	var err error
+	progress.ExecuteTask("Walking directory tree", func() {
+		for _, p := range paths {
+			err = file.SymWalk(fs, p, j.queueFileFunc(ctx, fs, nil, progress))
+			if err != nil {
+				return
+			}
+		}
+	})
+
+	return err
+}
+
+func (j *ScanJob) queueFileFunc(ctx context.Context, f models.FS, zipFile *file.ScannedFile, progress *job.Progress) fs.WalkDirFunc {
+	return func(path string, d fs.DirEntry, err error) error {
+		if err != nil {
+			// don't let errors prevent scanning
+			logger.Errorf("error scanning %s: %v", path, err)
+			return nil
+		}
+
+		if err = ctx.Err(); err != nil {
+			return err
+		}
+
+		info, err := d.Info()
+		if err != nil {
+			logger.Errorf("reading info for %q: %v", path, err)
+			return nil
+		}
+
+		if !j.scanner.AcceptEntry(ctx, path, info) {
+			if info.IsDir() {
+				logger.Debugf("Skipping directory %s", path)
+				return fs.SkipDir
+			}
+
+			logger.Debugf("Skipping file %s", path)
+			return nil
+		}
+
+		size, err := file.GetFileSize(f, path, info)
+		if err != nil {
+			return err
+		}
+
+		ff := file.ScannedFile{
+			BaseFile: &models.BaseFile{
+				DirEntry: models.DirEntry{
+					ModTime: file.ModTime(info),
+				},
+				Path:     path,
+				Basename: filepath.Base(path),
+				Size:     size,
+			},
+			FS:   f,
+			Info: info,
+		}
+
+		if zipFile != nil {
+			ff.ZipFileID = &zipFile.ID
+			ff.ZipFile = zipFile
+		}
+
+		if info.IsDir() {
+			// handle folders immediately
+			if err := j.handleFolder(ctx, ff, progress); err != nil {
+				if !errors.Is(err, context.Canceled) {
+					logger.Errorf("error processing %q: %v", path, err)
+				}
+
+				// skip the directory since we won't be able to process the files anyway
+				return fs.SkipDir
+			}
+
+			return nil
+		}
+
+		// if zip file is present, we handle immediately
+		if zipFile != nil {
+			progress.ExecuteTask("Scanning "+path, func() {
+				// don't increment progress in zip files
+				if err := j.handleFile(ctx, ff, nil); err != nil {
+					if !errors.Is(err, context.Canceled) {
+						logger.Errorf("error processing %q: %v", path, err)
+					}
+					// don't return an error, just skip the file
+				}
+			})
+
+			return nil
+		}
+
+		logger.Tracef("Queueing file %s for scanning", path)
+		j.fileQueue <- ff
+
+		j.count++
+
+		return nil
+	}
+}
+
+func (j *ScanJob) processQueue(ctx context.Context, parallelTasks int, progress *job.Progress) {
+	if parallelTasks < 1 {
+		parallelTasks = 1
+	}
+
+	wg := sizedwaitgroup.New(parallelTasks)
+
+	func() {
+		defer func() {
+			wg.Wait()
+
+			// handle panics in goroutine
+			if p := recover(); p != nil {
+				logger.Errorf("panic while scanning files: %v", p)
+				logger.Errorf(string(debug.Stack()))
+			}
+		}()
+
+		for f := range j.fileQueue {
+			logger.Tracef("Processing queued file %s", f.Path)
+			if err := ctx.Err(); err != nil {
+				return
+			}
+
+			wg.Add()
+			ff := f
+			go func() {
+				defer wg.Done()
+				j.processQueueItem(ctx, ff, progress)
+			}()
+		}
+	}()
+}
+
+func (j *ScanJob) processQueueItem(ctx context.Context, f file.ScannedFile, progress *job.Progress) {
+	progress.ExecuteTask("Scanning "+f.Path, func() {
+		var err error
+		if f.Info.IsDir() {
+			err = j.handleFolder(ctx, f, progress)
+		} else {
+			err = j.handleFile(ctx, f, progress)
+		}
+
+		if err != nil && !errors.Is(err, context.Canceled) {
+			logger.Errorf("error processing %q: %v", f.Path, err)
+		}
+	})
+}
+
+func (j *ScanJob) handleFolder(ctx context.Context, f file.ScannedFile, progress *job.Progress) error {
+	if progress != nil {
+		defer progress.Increment()
+	}
+
+	_, err := j.scanner.ScanFolder(ctx, f)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (j *ScanJob) handleFile(ctx context.Context, f file.ScannedFile, progress *job.Progress) error {
+	if progress != nil {
+		defer progress.Increment()
+	}
+
+	r, err := j.scanner.ScanFile(ctx, f)
+	if err != nil {
+		return err
+	}
+
+	// handle rename should have already handled the contents of the zip file
+	// so shouldn't need to scan it again
+
+	if (r.New || r.Updated) && j.scanner.IsZipFile(f.Info.Name()) {
+		ff := r.File
+		f.BaseFile = ff.Base()
+
+		// scan zip files with a different context that is not cancellable
+		// cancelling while scanning zip file contents results in the scan
+		// contents being partially completed
+		zipCtx := context.WithoutCancel(ctx)
+
+		if err := j.scanZipFile(zipCtx, f, progress); err != nil {
+			logger.Errorf("Error scanning zip file %q: %v", f.Path, err)
+		}
+	}
+
+	return nil
+}
+
+func (j *ScanJob) scanZipFile(ctx context.Context, f file.ScannedFile, progress *job.Progress) error {
+	zipFS, err := f.FS.OpenZip(f.Path, f.Size)
+	if err != nil {
+		if errors.Is(err, file.ErrNotReaderAt) {
+			// can't walk the zip file
+			// just return
+			logger.Debugf("Skipping zip file %q as it cannot be opened for walking", f.Path)
+			return nil
+		}
+
+		return err
+	}
+
+	defer zipFS.Close()
+
+	return file.SymWalk(zipFS, f.Path, j.queueFileFunc(ctx, zipFS, &f, progress))
+}
+
 type extensionConfig struct {
 	vidExt []string
 	imgExt []string
diff --git a/pkg/file/file.go b/pkg/file/file.go
index 407949ba1..b93083b35 100644
--- a/pkg/file/file.go
+++ b/pkg/file/file.go
@@ -3,6 +3,10 @@ package file
 
 import (
 	"context"
+	"fmt"
+	"io/fs"
+	"os"
+	"time"
 
 	"github.com/stashapp/stash/pkg/models"
 	"github.com/stashapp/stash/pkg/txn"
@@ -35,3 +39,23 @@ func (r *Repository) WithReadTxn(ctx context.Context, fn txn.TxnFunc) error {
 func (r *Repository) WithDB(ctx context.Context, fn txn.TxnFunc) error {
 	return txn.WithDatabase(ctx, r.TxnManager, fn)
 }
+
+// ModTime returns the modification time truncated to seconds.
+func ModTime(info fs.FileInfo) time.Time {
+	// truncate to seconds, since we don't store beyond that in the database
+	return info.ModTime().Truncate(time.Second)
+}
+
+// GetFileSize gets the size of the file, taking into account symlinks.
+func GetFileSize(f models.FS, path string, info fs.FileInfo) (int64, error) {
+	// #2196/#3042 - replace size with target size if file is a symlink
+	if info.Mode()&os.ModeSymlink == os.ModeSymlink {
+		targetInfo, err := f.Stat(path)
+		if err != nil {
+			return 0, fmt.Errorf("reading info for symlink %q: %w", path, err)
+		}
+		return targetInfo.Size(), nil
+	}
+
+	return info.Size(), nil
+}
diff --git a/pkg/file/folder_rename_detect.go b/pkg/file/folder_rename_detect.go
index 4c057461b..cfae7e4fb 100644
--- a/pkg/file/folder_rename_detect.go
+++ b/pkg/file/folder_rename_detect.go
@@ -75,7 +75,7 @@ func (d *folderRenameDetector) bestCandidate() *models.Folder {
 	return best.folder
 }
 
-func (s *scanJob) detectFolderMove(ctx context.Context, file scanFile) (*models.Folder, error) {
+func (s *Scanner) detectFolderMove(ctx context.Context, file ScannedFile) (*models.Folder, error) {
 	// in order for a folder to be considered moved, the existing folder must be
 	// missing, and the majority of the old folder's files must be present, unchanged,
 	// in the new folder.
@@ -88,7 +88,7 @@ func (s *scanJob) detectFolderMove(ctx context.Context, file scanFile) (*models.
 
 	r := s.Repository
 
-	if err := symWalk(file.fs, file.Path, func(path string, d fs.DirEntry, err error) error {
+	if err := SymWalk(file.FS, file.Path, func(path string, d fs.DirEntry, err error) error {
 		if err != nil {
 			// don't let errors prevent scanning
 			logger.Errorf("error scanning %s: %v", path, err)
@@ -111,11 +111,11 @@ func (s *scanJob) detectFolderMove(ctx context.Context, file scanFile) (*models.
 			return nil
 		}
 
-		if !s.acceptEntry(ctx, path, info) {
+		if !s.AcceptEntry(ctx, path, info) {
 			return nil
 		}
 
-		size, err := getFileSize(file.fs, path, info)
+		size, err := GetFileSize(file.FS, path, info)
 		if err != nil {
 			return fmt.Errorf("getting file size for %q: %w", path, err)
 		}
@@ -154,7 +154,7 @@ func (s *scanJob) detectFolderMove(ctx context.Context, file scanFile) (*models.
 				}
 
 				// parent folder must be missing
-				_, err = file.fs.Lstat(pf.Path)
+				_, err = file.FS.Lstat(pf.Path)
 				if err == nil {
 					// parent folder exists, not a candidate
 					detector.reject(parentFolderID)
diff --git a/pkg/file/scan.go b/pkg/file/scan.go
index 36b409c89..d9a58ad44 100644
--- a/pkg/file/scan.go
+++ b/pkg/file/scan.go
@@ -2,29 +2,18 @@ package file
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"io/fs"
-	"os"
 	"path/filepath"
-	"runtime/debug"
 	"strings"
 	"sync"
 	"time"
 
-	"github.com/remeh/sizedwaitgroup"
 	"github.com/stashapp/stash/pkg/logger"
 	"github.com/stashapp/stash/pkg/models"
 	"github.com/stashapp/stash/pkg/txn"
 )
 
-const (
-	scanQueueSize = 200000
-	// maximum number of times to retry in the event of a locked database
-	// use -1 to retry forever
-	maxRetries = -1
-)
-
 // Scanner scans files into the database.
 //
 // The scan process works using two goroutines. The first walks through the provided paths
@@ -55,8 +44,26 @@ type Scanner struct {
 	Repository            Repository
 	FingerprintCalculator FingerprintCalculator
 
+	// ZipFileExtensions is a list of file extensions that are considered zip files.
+	// Extension does not include the . character.
+	ZipFileExtensions []string
+
+	// ScanFilters are used to determine if a file should be scanned.
+	ScanFilters []PathFilter
+
+	// HandlerRequiredFilters are used to determine if an unchanged file needs to be handled
+	HandlerRequiredFilters []Filter
+
 	// FileDecorators are applied to files as they are scanned.
 	FileDecorators []Decorator
+
+	// handlers are called after a file has been scanned.
+	FileHandlers []Handler
+
+	// Rescan indicates whether files should be rescanned even if they haven't changed.
+	Rescan bool
+
+	folderPathToID sync.Map
 }
 
 // FingerprintCalculator calculates a fingerprint for the provided file.
@@ -91,257 +98,18 @@ func (d *FilteredDecorator) IsMissingMetadata(ctx context.Context, fs models.FS,
 	return false
 }
 
-// ProgressReporter is used to report progress of the scan.
-type ProgressReporter interface {
-	AddTotal(total int)
-	Increment()
-	Definite()
-	ExecuteTask(description string, fn func())
-}
-
-type scanJob struct {
-	*Scanner
-
-	// handlers are called after a file has been scanned.
-	handlers []Handler
-
-	ProgressReports ProgressReporter
-	options         ScanOptions
-
-	startTime      time.Time
-	fileQueue      chan scanFile
-	retryList      []scanFile
-	retrying       bool
-	folderPathToID sync.Map
-	zipPathToID    sync.Map
-	count          int
-
-	txnRetryer txn.Retryer
-}
-
-// ScanOptions provides options for scanning files.
-type ScanOptions struct {
-	Paths []string
-
-	// ZipFileExtensions is a list of file extensions that are considered zip files.
-	// Extension does not include the . character.
-	ZipFileExtensions []string
-
-	// ScanFilters are used to determine if a file should be scanned.
-	ScanFilters []PathFilter
-
-	// HandlerRequiredFilters are used to determine if an unchanged file needs to be handled
-	HandlerRequiredFilters []Filter
-
-	ParallelTasks int
-
-	// When true files in path will be rescanned even if they haven't changed
-	Rescan bool
-}
-
-// Scan starts the scanning process.
-func (s *Scanner) Scan(ctx context.Context, handlers []Handler, options ScanOptions, progressReporter ProgressReporter) {
-	job := &scanJob{
-		Scanner:         s,
-		handlers:        handlers,
-		ProgressReports: progressReporter,
-		options:         options,
-		txnRetryer: txn.Retryer{
-			Manager: s.Repository.TxnManager,
-			Retries: maxRetries,
-		},
-	}
-
-	job.execute(ctx)
-}
-
-type scanFile struct {
+// ScannedFile represents a file being scanned.
+type ScannedFile struct {
 	*models.BaseFile
-	fs   models.FS
-	info fs.FileInfo
+	FS   models.FS
+	Info fs.FileInfo
 }
 
-func (s *scanJob) withTxn(ctx context.Context, fn func(ctx context.Context) error) error {
-	return s.txnRetryer.WithTxn(ctx, fn)
-}
-
-func (s *scanJob) withDB(ctx context.Context, fn func(ctx context.Context) error) error {
-	return s.Repository.WithDB(ctx, fn)
-}
-
-func (s *scanJob) execute(ctx context.Context) {
-	paths := s.options.Paths
-	logger.Infof("scanning %d paths", len(paths))
-	s.startTime = time.Now()
-
-	s.fileQueue = make(chan scanFile, scanQueueSize)
-	var wg sync.WaitGroup
-	wg.Add(1)
-
-	go func() {
-		defer func() {
-			wg.Done()
-
-			// handle panics in goroutine
-			if p := recover(); p != nil {
-				logger.Errorf("panic while queuing files for scan: %v", p)
-				logger.Errorf(string(debug.Stack()))
-			}
-		}()
-
-		if err := s.queueFiles(ctx, paths); err != nil {
-			if errors.Is(err, context.Canceled) {
-				return
-			}
-
-			logger.Errorf("error queuing files for scan: %v", err)
-			return
-		}
-
-		logger.Infof("Finished adding files to queue. %d files queued", s.count)
-	}()
-
-	defer wg.Wait()
-
-	if err := s.processQueue(ctx); err != nil {
-		if errors.Is(err, context.Canceled) {
-			return
-		}
-
-		logger.Errorf("error scanning files: %v", err)
-		return
-	}
-}
-
-func (s *scanJob) queueFiles(ctx context.Context, paths []string) error {
-	defer func() {
-		close(s.fileQueue)
-
-		if s.ProgressReports != nil {
-			s.ProgressReports.AddTotal(s.count)
-			s.ProgressReports.Definite()
-		}
-	}()
-
-	var err error
-	s.ProgressReports.ExecuteTask("Walking directory tree", func() {
-		for _, p := range paths {
-			err = symWalk(s.FS, p, s.queueFileFunc(ctx, s.FS, nil))
-			if err != nil {
-				return
-			}
-		}
-	})
-
-	return err
-}
-
-func (s *scanJob) queueFileFunc(ctx context.Context, f models.FS, zipFile *scanFile) fs.WalkDirFunc {
-	return func(path string, d fs.DirEntry, err error) error {
-		if err != nil {
-			// don't let errors prevent scanning
-			logger.Errorf("error scanning %s: %v", path, err)
-			return nil
-		}
-
-		if err = ctx.Err(); err != nil {
-			return err
-		}
-
-		info, err := d.Info()
-		if err != nil {
-			logger.Errorf("reading info for %q: %v", path, err)
-			return nil
-		}
-
-		if !s.acceptEntry(ctx, path, info) {
-			if info.IsDir() {
-				return fs.SkipDir
-			}
-
-			return nil
-		}
-
-		size, err := getFileSize(f, path, info)
-		if err != nil {
-			return err
-		}
-
-		ff := scanFile{
-			BaseFile: &models.BaseFile{
-				DirEntry: models.DirEntry{
-					ModTime: modTime(info),
-				},
-				Path:     path,
-				Basename: filepath.Base(path),
-				Size:     size,
-			},
-			fs:   f,
-			info: info,
-		}
-
-		if zipFile != nil {
-			zipFileID, err := s.getZipFileID(ctx, zipFile)
-			if err != nil {
-				return err
-			}
-			ff.ZipFileID = zipFileID
-			ff.ZipFile = zipFile
-		}
-
-		if info.IsDir() {
-			// handle folders immediately
-			if err := s.handleFolder(ctx, ff); err != nil {
-				if !errors.Is(err, context.Canceled) {
-					logger.Errorf("error processing %q: %v", path, err)
-				}
-
-				// skip the directory since we won't be able to process the files anyway
-				return fs.SkipDir
-			}
-
-			return nil
-		}
-
-		// if zip file is present, we handle immediately
-		if zipFile != nil {
-			s.ProgressReports.ExecuteTask("Scanning "+path, func() {
-				if err := s.handleFile(ctx, ff); err != nil {
-					if !errors.Is(err, context.Canceled) {
-						logger.Errorf("error processing %q: %v", path, err)
-					}
-					// don't return an error, just skip the file
-				}
-			})
-
-			return nil
-		}
-
-		s.fileQueue <- ff
-
-		s.count++
-
-		return nil
-	}
-}
-
-func getFileSize(f models.FS, path string, info fs.FileInfo) (int64, error) {
-	// #2196/#3042 - replace size with target size if file is a symlink
-	if info.Mode()&os.ModeSymlink == os.ModeSymlink {
-		targetInfo, err := f.Stat(path)
-		if err != nil {
-			return 0, fmt.Errorf("reading info for symlink %q: %w", path, err)
-		}
-		return targetInfo.Size(), nil
-	}
-
-	return info.Size(), nil
-}
-
-func (s *scanJob) acceptEntry(ctx context.Context, path string, info fs.FileInfo) bool {
+// AcceptEntry determines if the file entry should be accepted for scanning
+func (s *Scanner) AcceptEntry(ctx context.Context, path string, info fs.FileInfo) bool {
 	// always accept if there's no filters
-	accept := len(s.options.ScanFilters) == 0
-	for _, filter := range s.options.ScanFilters {
+	accept := len(s.ScanFilters) == 0
+	for _, filter := range s.ScanFilters {
 		// accept if any filter accepts the file
 		if filter.Accept(ctx, path, info) {
 			accept = true
@@ -352,102 +120,7 @@ func (s *scanJob) acceptEntry(ctx context.Context, path string, info fs.FileInfo
 	return accept
 }
 
-func (s *scanJob) scanZipFile(ctx context.Context, f scanFile) error {
-	zipFS, err := f.fs.OpenZip(f.Path, f.Size)
-	if err != nil {
-		if errors.Is(err, errNotReaderAt) {
-			// can't walk the zip file
-			// just return
-			return nil
-		}
-
-		return err
-	}
-
-	defer zipFS.Close()
-
-	return symWalk(zipFS, f.Path, s.queueFileFunc(ctx, zipFS, &f))
-}
-
-func (s *scanJob) processQueue(ctx context.Context) error {
-	parallelTasks := s.options.ParallelTasks
-	if parallelTasks < 1 {
-		parallelTasks = 1
-	}
-
-	wg := sizedwaitgroup.New(parallelTasks)
-
-	if err := func() error {
-		defer wg.Wait()
-
-		for f := range s.fileQueue {
-			if err := ctx.Err(); err != nil {
-				return err
-			}
-
-			wg.Add()
-			ff := f
-			go func() {
-				defer wg.Done()
-				s.processQueueItem(ctx, ff)
-			}()
-		}
-
-		return nil
-	}(); err != nil {
-		return err
-	}
-
-	s.retrying = true
-
-	if err := func() error {
-		defer wg.Wait()
-
-		for _, f := range s.retryList {
-			if err := ctx.Err(); err != nil {
-				return err
-			}
-
-			wg.Add()
-			ff := f
-			go func() {
-				defer wg.Done()
-				s.processQueueItem(ctx, ff)
-			}()
-		}
-
-		return nil
-	}(); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (s *scanJob) incrementProgress(f scanFile) {
-	// don't increment for files inside zip files since these aren't
-	// counted during the initial walking
-	if s.ProgressReports != nil && f.ZipFile == nil {
-		s.ProgressReports.Increment()
-	}
-}
-
-func (s *scanJob) processQueueItem(ctx context.Context, f scanFile) {
-	s.ProgressReports.ExecuteTask("Scanning "+f.Path, func() {
-		var err error
-		if f.info.IsDir() {
-			err = s.handleFolder(ctx, f)
-		} else {
-			err = s.handleFile(ctx, f)
-		}
-
-		if err != nil && !errors.Is(err, context.Canceled) {
-			logger.Errorf("error processing %q: %v", f.Path, err)
-		}
-	})
-}
-
-func (s *scanJob) getFolderID(ctx context.Context, path string) (*models.FolderID, error) {
+func (s *Scanner) getFolderID(ctx context.Context, path string) (*models.FolderID, error) {
 	// check the folder cache first
 	if f, ok := s.folderPathToID.Load(path); ok {
 		v := f.(models.FolderID)
@@ -470,48 +143,17 @@ func (s *scanJob) getFolderID(ctx context.Context, path string) (*models.FolderI
 	return &ret.ID, nil
 }
 
-func (s *scanJob) getZipFileID(ctx context.Context, zipFile *scanFile) (*models.FileID, error) {
-	if zipFile == nil {
-		return nil, nil
-	}
-
-	if zipFile.ID != 0 {
-		return &zipFile.ID, nil
-	}
-
-	path := zipFile.Path
-
-	// check the folder cache first
-	if f, ok := s.zipPathToID.Load(path); ok {
-		v := f.(models.FileID)
-		return &v, nil
-	}
-
-	// assume case sensitive when searching for the zip file
-	const caseSensitive = true
-
-	ret, err := s.Repository.File.FindByPath(ctx, path, caseSensitive)
-	if err != nil {
-		return nil, fmt.Errorf("getting zip file ID for %q: %w", path, err)
-	}
-
-	if ret == nil {
-		return nil, fmt.Errorf("zip file %q doesn't exist in database", zipFile.Path)
-	}
-
-	s.zipPathToID.Store(path, ret.Base().ID)
-	return &ret.Base().ID, nil
-}
-
-func (s *scanJob) handleFolder(ctx context.Context, file scanFile) error {
+// ScanFolder scans the provided folder into the database, returning the folder entry.
+// If the folder already exists, it is updated if necessary.
+func (s *Scanner) ScanFolder(ctx context.Context, file ScannedFile) (*models.Folder, error) {
+	var f *models.Folder
+	var err error
 	path := file.Path
 
-	return s.withTxn(ctx, func(ctx context.Context) error {
-		defer s.incrementProgress(file)
-
+	err = s.Repository.WithTxn(ctx, func(ctx context.Context) error {
 		// determine if folder already exists in data store (by path)
 		// assume case sensitive by default
-		f, err := s.Repository.Folder.FindByPath(ctx, path, true)
+		f, err = s.Repository.Folder.FindByPath(ctx, path, true)
 		if err != nil {
 			return fmt.Errorf("checking for existing folder %q: %w", path, err)
 		}
@@ -520,7 +162,7 @@ func (s *scanJob) handleFolder(ctx context.Context, file scanFile) error {
 		// case insensitive searching
 		// assume case sensitive if in zip
 		if f == nil && file.ZipFileID == nil {
-			caseSensitive, _ := file.fs.IsPathCaseSensitive(file.Path)
+			caseSensitive, _ := file.FS.IsPathCaseSensitive(file.Path)
 
 			if !caseSensitive {
 				f, err = s.Repository.Folder.FindByPath(ctx, path, false)
@@ -547,9 +189,11 @@ func (s *scanJob) handleFolder(ctx context.Context, file scanFile) error {
 
 		return nil
 	})
+
+	return f, err
 }
 
-func (s *scanJob) onNewFolder(ctx context.Context, file scanFile) (*models.Folder, error) {
+func (s *Scanner) onNewFolder(ctx context.Context, file ScannedFile) (*models.Folder, error) {
 	renamed, err := s.handleFolderRename(ctx, file)
 	if err != nil {
 		return nil, err
@@ -596,7 +240,7 @@ func (s *scanJob) onNewFolder(ctx context.Context, file scanFile) (*models.Folde
 	return toCreate, nil
 }
 
-func (s *scanJob) handleFolderRename(ctx context.Context, file scanFile) (*models.Folder, error) {
+func (s *Scanner) handleFolderRename(ctx context.Context, file ScannedFile) (*models.Folder, error) {
 	// ignore folders in zip files
 	if file.ZipFileID != nil {
 		return nil, nil
@@ -637,7 +281,7 @@ func (s *scanJob) handleFolderRename(ctx context.Context, file scanFile) (*model
 	return renamedFrom, nil
 }
 
-func (s *scanJob) onExistingFolder(ctx context.Context, f scanFile, existing *models.Folder) (*models.Folder, error) {
+func (s *Scanner) onExistingFolder(ctx context.Context, f ScannedFile, existing *models.Folder) (*models.Folder, error) {
 	update := false
 
 	// update if mod time is changed
@@ -678,22 +322,22 @@ func (s *scanJob) onExistingFolder(ctx context.Context, f scanFile, existing *mo
 	return existing, nil
 }
 
-func modTime(info fs.FileInfo) time.Time {
-	// truncate to seconds, since we don't store beyond that in the database
-	return info.ModTime().Truncate(time.Second)
+type ScanFileResult struct {
+	File    models.File
+	New     bool
+	Renamed bool
+	Updated bool
 }
 
-func (s *scanJob) handleFile(ctx context.Context, f scanFile) error {
-	defer s.incrementProgress(f)
-
-	var ff models.File
+// ScanFile scans the provided file into the database, returning the scan result.
+func (s *Scanner) ScanFile(ctx context.Context, f ScannedFile) (*ScanFileResult, error) {
+	var r *ScanFileResult
 
 	// don't use a transaction to check if new or existing
-	if err := s.withDB(ctx, func(ctx context.Context) error {
+	if err := s.Repository.WithDB(ctx, func(ctx context.Context) error {
 		// determine if file already exists in data store
 		// assume case sensitive when searching for the file to begin with
-		var err error
-		ff, err = s.Repository.File.FindByPath(ctx, f.Path, true)
+		ff, err := s.Repository.File.FindByPath(ctx, f.Path, true)
 		if err != nil {
 			return fmt.Errorf("checking for existing file %q: %w", f.Path, err)
 		}
@@ -702,7 +346,7 @@ func (s *scanJob) handleFile(ctx context.Context, f scanFile) error {
 		// case insensitive search
 		// assume case sensitive if in zip
 		if ff == nil && f.ZipFileID != nil {
-			caseSensitive, _ := f.fs.IsPathCaseSensitive(f.Path)
+			caseSensitive, _ := f.FS.IsPathCaseSensitive(f.Path)
 
 			if !caseSensitive {
 				ff, err = s.Repository.File.FindByPath(ctx, f.Path, false)
@@ -714,35 +358,23 @@ func (s *scanJob) handleFile(ctx context.Context, f scanFile) error {
 
 		if ff == nil {
 			// returns a file only if it is actually new
-			ff, err = s.onNewFile(ctx, f)
+			r, err = s.onNewFile(ctx, f)
 			return err
 		}
 
-		ff, err = s.onExistingFile(ctx, f, ff)
+		r, err = s.onExistingFile(ctx, f, ff)
 		return err
 	}); err != nil {
-		return err
+		return nil, err
 	}
 
-	if ff != nil && s.isZipFile(f.info.Name()) {
-		f.BaseFile = ff.Base()
-
-		// scan zip files with a different context that is not cancellable
-		// cancelling while scanning zip file contents results in the scan
-		// contents being partially completed
-		zipCtx := context.WithoutCancel(ctx)
-
-		if err := s.scanZipFile(zipCtx, f); err != nil {
-			logger.Errorf("Error scanning zip file %q: %v", f.Path, err)
-		}
-	}
-
-	return nil
+	return r, nil
 }
 
-func (s *scanJob) isZipFile(path string) bool {
+// IsZipFile determines if the provided path is a zip file based on its extension.
+func (s *Scanner) IsZipFile(path string) bool {
 	fExt := filepath.Ext(path)
-	for _, ext := range s.options.ZipFileExtensions {
+	for _, ext := range s.ZipFileExtensions {
 		if strings.EqualFold(fExt, "."+ext) {
 			return true
 		}
@@ -751,7 +383,7 @@ func (s *scanJob) isZipFile(path string) bool {
 	return false
 }
 
-func (s *scanJob) onNewFile(ctx context.Context, f scanFile) (models.File, error) {
+func (s *Scanner) onNewFile(ctx context.Context, f ScannedFile) (*ScanFileResult, error) {
 	now := time.Now()
 
 	baseFile := f.BaseFile
@@ -767,28 +399,20 @@ func (s *scanJob) onNewFile(ctx context.Context, f scanFile) (models.File, error
 	}
 
 	if parentFolderID == nil {
-		// if parent folder doesn't exist, assume it's not yet created
-		// add this file to the queue to be created later
-		if s.retrying {
-			// if we're retrying and the folder still doesn't exist, then it's a problem
-			return nil, fmt.Errorf("parent folder for %q doesn't exist", path)
-		}
-
-		s.retryList = append(s.retryList, f)
-		return nil, nil
+		return nil, fmt.Errorf("parent folder for %q doesn't exist", path)
 	}
 
 	baseFile.ParentFolderID = *parentFolderID
 
 	const useExisting = false
-	fp, err := s.calculateFingerprints(f.fs, baseFile, path, useExisting)
+	fp, err := s.calculateFingerprints(f.FS, baseFile, path, useExisting)
 	if err != nil {
 		return nil, err
 	}
 
 	baseFile.SetFingerprints(fp)
 
-	file, err := s.fireDecorators(ctx, f.fs, baseFile)
+	file, err := s.fireDecorators(ctx, f.FS, baseFile)
 	if err != nil {
 		return nil, err
 	}
@@ -801,14 +425,17 @@ func (s *scanJob) onNewFile(ctx context.Context, f scanFile) (models.File, error
 	}
 
 	if renamed != nil {
+		return &ScanFileResult{
+			File:    renamed,
+			Renamed: true,
+		}, nil
 		// handle rename should have already handled the contents of the zip file
 		// so shouldn't need to scan it again
 		// return nil so it doesn't
-		return nil, nil
 	}
 
 	// if not renamed, queue file for creation
-	if err := s.withTxn(ctx, func(ctx context.Context) error {
+	if err := s.Repository.WithTxn(ctx, func(ctx context.Context) error {
 		if err := s.Repository.File.Create(ctx, file); err != nil {
 			return fmt.Errorf("creating file %q: %w", path, err)
 		}
@@ -822,10 +449,13 @@ func (s *scanJob) onNewFile(ctx context.Context, f scanFile) (models.File, error
 		return nil, err
 	}
 
-	return file, nil
+	return &ScanFileResult{
+		File: file,
+		New:  true,
+	}, nil
 }
 
-func (s *scanJob) fireDecorators(ctx context.Context, fs models.FS, f models.File) (models.File, error) {
+func (s *Scanner) fireDecorators(ctx context.Context, fs models.FS, f models.File) (models.File, error) {
 	for _, h := range s.FileDecorators {
 		var err error
 		f, err = h.Decorate(ctx, fs, f)
@@ -837,8 +467,8 @@ func (s *scanJob) fireDecorators(ctx context.Context, fs models.FS, f models.Fil
 	return f, nil
 }
 
-func (s *scanJob) fireHandlers(ctx context.Context, f models.File, oldFile models.File) error {
-	for _, h := range s.handlers {
+func (s *Scanner) fireHandlers(ctx context.Context, f models.File, oldFile models.File) error {
+	for _, h := range s.FileHandlers {
 		if err := h.Handle(ctx, f, oldFile); err != nil {
 			return err
 		}
@@ -847,7 +477,7 @@ func (s *scanJob) fireHandlers(ctx context.Context, f models.File, oldFile model
 	return nil
 }
 
-func (s *scanJob) calculateFingerprints(fs models.FS, f *models.BaseFile, path string, useExisting bool) (models.Fingerprints, error) {
+func (s *Scanner) calculateFingerprints(fs models.FS, f *models.BaseFile, path string, useExisting bool) (models.Fingerprints, error) {
 	// only log if we're (re)calculating fingerprints
 	if !useExisting {
 		logger.Infof("Calculating fingerprints for %s ...", path)
@@ -884,7 +514,7 @@ func appendFileUnique(v []models.File, toAdd []models.File) []models.File {
 	return v
 }
 
-func (s *scanJob) getFileFS(f *models.BaseFile) (models.FS, error) {
+func (s *Scanner) getFileFS(f *models.BaseFile) (models.FS, error) {
 	if f.ZipFile == nil {
 		return s.FS, nil
 	}
@@ -899,7 +529,7 @@ func (s *scanJob) getFileFS(f *models.BaseFile) (models.FS, error) {
 	return fs.OpenZip(zipPath, zipSize)
 }
 
-func (s *scanJob) handleRename(ctx context.Context, f models.File, fp []models.Fingerprint) (models.File, error) {
+func (s *Scanner) handleRename(ctx context.Context, f models.File, fp []models.Fingerprint) (models.File, error) {
 	var others []models.File
 
 	for _, tfp := range fp {
@@ -941,7 +571,7 @@ func (s *scanJob) handleRename(ctx context.Context, f models.File, fp []models.F
 				// treat as a move
 				missing = append(missing, other)
 			}
-		case !s.acceptEntry(ctx, other.Base().Path, info):
+		case !s.AcceptEntry(ctx, other.Base().Path, info):
 			// #4393 - if the file is no longer in the configured library paths, treat it as a move
 			logger.Debugf("File %q no longer in library paths. Treating as a move.", other.Base().Path)
 			missing = append(missing, other)
@@ -974,12 +604,12 @@ func (s *scanJob) handleRename(ctx context.Context, f models.File, fp []models.F
 	fBaseCopy.Fingerprints = updatedBase.Fingerprints
 	*updatedBase = fBaseCopy
 
-	if err := s.withTxn(ctx, func(ctx context.Context) error {
+	if err := s.Repository.WithTxn(ctx, func(ctx context.Context) error {
 		if err := s.Repository.File.Update(ctx, updated); err != nil {
 			return fmt.Errorf("updating file for rename %q: %w", newPath, err)
 		}
 
-		if s.isZipFile(updatedBase.Basename) {
+		if s.IsZipFile(updatedBase.Basename) {
 			if err := transferZipHierarchy(ctx, s.Repository.Folder, s.Repository.File, updatedBase.ID, oldPath, newPath); err != nil {
 				return fmt.Errorf("moving zip hierarchy for renamed zip file %q: %w", newPath, err)
 			}
@@ -997,9 +627,9 @@ func (s *scanJob) handleRename(ctx context.Context, f models.File, fp []models.F
 	return updated, nil
 }
 
-func (s *scanJob) isHandlerRequired(ctx context.Context, f models.File) bool {
-	accept := len(s.options.HandlerRequiredFilters) == 0
-	for _, filter := range s.options.HandlerRequiredFilters {
+func (s *Scanner) isHandlerRequired(ctx context.Context, f models.File) bool {
+	accept := len(s.HandlerRequiredFilters) == 0
+	for _, filter := range s.HandlerRequiredFilters {
 		// accept if any filter accepts the file
 		if filter.Accept(ctx, f) {
 			accept = true
@@ -1018,9 +648,9 @@ func (s *scanJob) isHandlerRequired(ctx context.Context, f models.File) bool {
 // - file size
 // - image format, width or height
 // - video codec, audio codec, format, width, height, framerate or bitrate
-func (s *scanJob) isMissingMetadata(ctx context.Context, f scanFile, existing models.File) bool {
+func (s *Scanner) isMissingMetadata(ctx context.Context, f ScannedFile, existing models.File) bool {
 	for _, h := range s.FileDecorators {
-		if h.IsMissingMetadata(ctx, f.fs, existing) {
+		if h.IsMissingMetadata(ctx, f.FS, existing) {
 			return true
 		}
 	}
@@ -1028,20 +658,20 @@ func (s *scanJob) isMissingMetadata(ctx context.Context, f scanFile, existing mo
 	return false
 }
 
-func (s *scanJob) setMissingMetadata(ctx context.Context, f scanFile, existing models.File) (models.File, error) {
+func (s *Scanner) setMissingMetadata(ctx context.Context, f ScannedFile, existing models.File) (models.File, error) {
 	path := existing.Base().Path
 	logger.Infof("Updating metadata for %s", path)
 
 	existing.Base().Size = f.Size
 
 	var err error
-	existing, err = s.fireDecorators(ctx, f.fs, existing)
+	existing, err = s.fireDecorators(ctx, f.FS, existing)
 	if err != nil {
 		return nil, err
 	}
 
 	// queue file for update
-	if err := s.withTxn(ctx, func(ctx context.Context) error {
+	if err := s.Repository.WithTxn(ctx, func(ctx context.Context) error {
 		if err := s.Repository.File.Update(ctx, existing); err != nil {
 			return fmt.Errorf("updating file %q: %w", path, err)
 		}
@@ -1054,9 +684,9 @@ func (s *scanJob) setMissingMetadata(ctx context.Context, f scanFile, existing m
 	return existing, nil
 }
 
-func (s *scanJob) setMissingFingerprints(ctx context.Context, f scanFile, existing models.File) (models.File, error) {
+func (s *Scanner) setMissingFingerprints(ctx context.Context, f ScannedFile, existing models.File) (models.File, error) {
 	const useExisting = true
-	fp, err := s.calculateFingerprints(f.fs, existing.Base(), f.Path, useExisting)
+	fp, err := s.calculateFingerprints(f.FS, existing.Base(), f.Path, useExisting)
 	if err != nil {
 		return nil, err
 	}
@@ -1064,7 +694,7 @@ func (s *scanJob) setMissingFingerprints(ctx context.Context, f scanFile, existi
 	if fp.ContentsChanged(existing.Base().Fingerprints) {
 		existing.SetFingerprints(fp)
 
-		if err := s.withTxn(ctx, func(ctx context.Context) error {
+		if err := s.Repository.WithTxn(ctx, func(ctx context.Context) error {
 			if err := s.Repository.File.Update(ctx, existing); err != nil {
 				return fmt.Errorf("updating file %q: %w", f.Path, err)
 			}
@@ -1079,14 +709,14 @@ func (s *scanJob) setMissingFingerprints(ctx context.Context, f scanFile, existi
 }
 
 // returns a file only if it was updated
-func (s *scanJob) onExistingFile(ctx context.Context, f scanFile, existing models.File) (models.File, error) {
+func (s *Scanner) onExistingFile(ctx context.Context, f ScannedFile, existing models.File) (*ScanFileResult, error) {
 	base := existing.Base()
 	path := base.Path
 
 	fileModTime := f.ModTime
 	// #6326 - also force a rescan if the basename changed
 	updated := !fileModTime.Equal(base.ModTime) || base.Basename != f.Basename
-	forceRescan := s.options.Rescan
+	forceRescan := s.Rescan
 
 	if !updated && !forceRescan {
 		return s.onUnchangedFile(ctx, f, existing)
@@ -1108,7 +738,7 @@ func (s *scanJob) onExistingFile(ctx context.Context, f scanFile, existing model
 
 	// calculate and update fingerprints for the file
 	const useExisting = false
-	fp, err := s.calculateFingerprints(f.fs, base, path, useExisting)
+	fp, err := s.calculateFingerprints(f.FS, base, path, useExisting)
 	if err != nil {
 		return nil, err
 	}
@@ -1116,13 +746,13 @@ func (s *scanJob) onExistingFile(ctx context.Context, f scanFile, existing model
 	s.removeOutdatedFingerprints(existing, fp)
 	existing.SetFingerprints(fp)
 
-	existing, err = s.fireDecorators(ctx, f.fs, existing)
+	existing, err = s.fireDecorators(ctx, f.FS, existing)
 	if err != nil {
 		return nil, err
 	}
 
 	// queue file for update
-	if err := s.withTxn(ctx, func(ctx context.Context) error {
+	if err := s.Repository.WithTxn(ctx, func(ctx context.Context) error {
 		if err := s.Repository.File.Update(ctx, existing); err != nil {
 			return fmt.Errorf("updating file %q: %w", path, err)
 		}
@@ -1135,11 +765,13 @@ func (s *scanJob) onExistingFile(ctx context.Context, f scanFile, existing model
 	}); err != nil {
 		return nil, err
 	}
-
-	return existing, nil
+	return &ScanFileResult{
+		File:    existing,
+		Updated: true,
+	}, nil
 }
 
-func (s *scanJob) removeOutdatedFingerprints(existing models.File, fp models.Fingerprints) {
+func (s *Scanner) removeOutdatedFingerprints(existing models.File, fp models.Fingerprints) {
 	// HACK - if no MD5 fingerprint was returned, and the oshash is changed
 	// then remove the MD5 fingerprint
 	oshash := fp.For(models.FingerprintTypeOshash)
@@ -1167,7 +799,7 @@ func (s *scanJob) removeOutdatedFingerprints(existing models.File, fp models.Fin
 }
 
 // returns a file only if it was updated
-func (s *scanJob) onUnchangedFile(ctx context.Context, f scanFile, existing models.File) (models.File, error) {
+func (s *Scanner) onUnchangedFile(ctx context.Context, f ScannedFile, existing models.File) (*ScanFileResult, error) {
 	var err error
 
 	isMissingMetdata := s.isMissingMetadata(ctx, f, existing)
@@ -1186,7 +818,7 @@ func (s *scanJob) onUnchangedFile(ctx context.Context, f scanFile, existing mode
 	}
 
 	handlerRequired := false
-	if err := s.withDB(ctx, func(ctx context.Context) error {
+	if err := s.Repository.WithDB(ctx, func(ctx context.Context) error {
 		// check if the handler needs to be run
 		handlerRequired = s.isHandlerRequired(ctx, existing)
 		return nil
@@ -1196,15 +828,20 @@ func (s *scanJob) onUnchangedFile(ctx context.Context, f scanFile, existing mode
 
 	if !handlerRequired {
 		// if this file is a zip file, then we need to rescan the contents
-		// as well. We do this by returning the file, instead of nil.
+		// as well. We do this by indicating that the file is updated.
 		if isMissingMetdata {
-			return existing, nil
+			return &ScanFileResult{
+				File:    existing,
+				Updated: true,
+			}, nil
 		}
 
-		return nil, nil
+		return &ScanFileResult{
+			File: existing,
+		}, nil
 	}
 
-	if err := s.withTxn(ctx, func(ctx context.Context) error {
+	if err := s.Repository.WithTxn(ctx, func(ctx context.Context) error {
 		if err := s.fireHandlers(ctx, existing, nil); err != nil {
 			return err
 		}
@@ -1215,6 +852,9 @@ func (s *scanJob) onUnchangedFile(ctx context.Context, f scanFile, existing mode
 	}
 
 	// if this file is a zip file, then we need to rescan the contents
-	// as well. We do this by returning the file, instead of nil.
-	return existing, nil
+	// as well. We do this by indicating that the file is updated.
+	return &ScanFileResult{
+		File:    existing,
+		Updated: true,
+	}, nil
 }
diff --git a/pkg/file/walk.go b/pkg/file/walk.go
index 3c6a157b7..bd33f42c3 100644
--- a/pkg/file/walk.go
+++ b/pkg/file/walk.go
@@ -81,8 +81,8 @@ func walkSym(f models.FS, filename string, linkDirname string, walkFn fs.WalkDir
 	return fsWalk(f, filename, symWalkFunc)
 }
 
-// symWalk extends filepath.Walk to also follow symlinks
-func symWalk(fs models.FS, path string, walkFn fs.WalkDirFunc) error {
+// SymWalk extends filepath.Walk to also follow symlinks
+func SymWalk(fs models.FS, path string, walkFn fs.WalkDirFunc) error {
 	return walkSym(fs, path, path, walkFn)
 }
 
diff --git a/pkg/file/zip.go b/pkg/file/zip.go
index 4df2453dc..5afcd5329 100644
--- a/pkg/file/zip.go
+++ b/pkg/file/zip.go
@@ -18,7 +18,7 @@ import (
 )
 
 var (
-	errNotReaderAt  = errors.New("not a ReaderAt")
+	ErrNotReaderAt  = errors.New("invalid reader: does not implement io.ReaderAt")
 	errZipFSOpenZip = errors.New("cannot open zip file inside zip file")
 )
 
@@ -38,7 +38,7 @@ func newZipFS(fs models.FS, path string, size int64) (*zipFS, error) {
 	asReaderAt, _ := reader.(io.ReaderAt)
 	if asReaderAt == nil {
 		reader.Close()
-		return nil, errNotReaderAt
+		return nil, ErrNotReaderAt
 	}
 
 	zipReader, err := zip.NewReader(asReaderAt, size)

From fe85b1eff98d9cbf2ae62e4545a2809ebb5ab999 Mon Sep 17 00:00:00 2001
From: Valkyr-JS <154020147+Valkyr-JS@users.noreply.github.com>
Date: Tue, 27 Jan 2026 06:42:58 +0000
Subject: [PATCH 270/405] Image count added to gallery data fragment (#6527)

---
 ui/v2.5/graphql/data/gallery.graphql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/v2.5/graphql/data/gallery.graphql b/ui/v2.5/graphql/data/gallery.graphql
index c41f3e2b2..89f3ed44c 100644
--- a/ui/v2.5/graphql/data/gallery.graphql
+++ b/ui/v2.5/graphql/data/gallery.graphql
@@ -22,7 +22,7 @@ fragment GalleryData on Gallery {
   folder {
     ...FolderData
   }
-
+  image_count
   chapters {
     ...GalleryChapterData
   }

From 0e54a5ceb0840327bc30730b1e3c7be3b96184fa Mon Sep 17 00:00:00 2001
From: DogmaDragon <103123951+DogmaDragon@users.noreply.github.com>
Date: Tue, 27 Jan 2026 08:53:39 +0200
Subject: [PATCH 271/405] docs: add warning emojis to important notes across
 multiple documentation files (#6531)

---
 ui/v2.5/src/docs/en/Manual/AutoTagging.md       |  2 +-
 ui/v2.5/src/docs/en/Manual/Captions.md          |  2 +-
 ui/v2.5/src/docs/en/Manual/Configuration.md     |  6 +++---
 ui/v2.5/src/docs/en/Manual/Deduplication.md     |  6 ++++--
 ui/v2.5/src/docs/en/Manual/EmbeddedPlugins.md   |  4 +++-
 ui/v2.5/src/docs/en/Manual/Images.md            |  2 +-
 ui/v2.5/src/docs/en/Manual/Introduction.md      |  4 +++-
 ui/v2.5/src/docs/en/Manual/JSONSpec.md          |  2 +-
 ui/v2.5/src/docs/en/Manual/Plugins.md           |  2 +-
 .../src/docs/en/Manual/ScraperDevelopment.md    | 17 +++++++++--------
 ui/v2.5/src/docs/en/Manual/Tagger.md            |  4 ++--
 11 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/ui/v2.5/src/docs/en/Manual/AutoTagging.md b/ui/v2.5/src/docs/en/Manual/AutoTagging.md
index 4b1cbb813..4c4265e19 100644
--- a/ui/v2.5/src/docs/en/Manual/AutoTagging.md
+++ b/ui/v2.5/src/docs/en/Manual/AutoTagging.md
@@ -6,7 +6,7 @@ This task is part of the advanced settings mode.
 
 ## Rules
 
-> **Important:** Auto Tag only works for names that already exist in your Stash database. It does not create new Performers, Studios, or Tags.
+> **⚠️ Important:** Auto Tag only works for names that already exist in your Stash database. It does not create new Performers, Studios, or Tags.
 
  - Multi-word names are matched when words appear in order and are separated by any of these characters: `.`, `-`, `_`, or whitespace. These separators are treated as word boundaries.
  - Matching is case-insensitive but requires complete words within word boundaries. Partial words or misspelled words will not match.
diff --git a/ui/v2.5/src/docs/en/Manual/Captions.md b/ui/v2.5/src/docs/en/Manual/Captions.md
index df2bee8bc..4e3849fac 100644
--- a/ui/v2.5/src/docs/en/Manual/Captions.md
+++ b/ui/v2.5/src/docs/en/Manual/Captions.md
@@ -15,4 +15,4 @@ Where `{language_code}` is defined by the [ISO-6399-1](https://en.wikipedia.org/
 
 Scenes with captions can be filtered with the `captions` criterion.
 
-**Note:** If the caption file was added after the scene was initially added during scan, you will need to run a Selective Scan task for it to show up.
+> **⚠️ Note:** If the caption file was added after the scene was initially added during scan, you will need to run a Selective Scan task for it to show up.
diff --git a/ui/v2.5/src/docs/en/Manual/Configuration.md b/ui/v2.5/src/docs/en/Manual/Configuration.md
index 76464facf..d5841b559 100644
--- a/ui/v2.5/src/docs/en/Manual/Configuration.md
+++ b/ui/v2.5/src/docs/en/Manual/Configuration.md
@@ -31,7 +31,7 @@ Some examples:
 - `"^/stash/videos/exclude/"` will exclude all directories that match `/stash/videos/exclude/` pattern.
 - `"\\\\stash\\network\\share\\excl\\"` will exclude specific Windows network path `\\stash\network\share\excl\`.
 
-> **Note:** If a directory is excluded for images and videos, then the directory will be excluded from scans completely.
+> **⚠️ Note:** If a directory is excluded for images and videos, then the directory will be excluded from scans completely.
 
 _There is a useful [regex101](https://regex101.com/) site that can help test and experiment with regexps._
 
@@ -87,7 +87,7 @@ This setting can be used to increase/decrease overall CPU utilisation in two sce
 1. High performance 4+ core cpus.
 2. Media files stored on remote/cloud filesystem.
 
-Note: If this is set too high it will decrease overall performance and causes failures (out of memory).
+> **⚠️ Note:** If this is set too high it will decrease overall performance and causes failures (out of memory).
 
 ## Hardware accelerated live transcoding
 
@@ -117,7 +117,7 @@ Some scrapers require a Chrome instance to function correctly. If left empty, st
 
 `Chrome CDP path` can be set to a path to the chrome executable, or an http(s) address to remote chrome instance (for example: `http://localhost:9222/json/version`).
 
-> **Important**: As of Chrome 136 you need to specify `--user-data-dir` alongside `--remote-debugging-port`. Read more on their [official post](https://developer.chrome.com/blog/remote-debugging-port). 
+> **⚠️ Important:** As of Chrome 136 you need to specify `--user-data-dir` alongside `--remote-debugging-port`. Read more on their [official post](https://developer.chrome.com/blog/remote-debugging-port). 
 
 ## Authentication
 
diff --git a/ui/v2.5/src/docs/en/Manual/Deduplication.md b/ui/v2.5/src/docs/en/Manual/Deduplication.md
index 24c0fb391..d842fcc68 100644
--- a/ui/v2.5/src/docs/en/Manual/Deduplication.md
+++ b/ui/v2.5/src/docs/en/Manual/Deduplication.md
@@ -2,8 +2,10 @@
 
 [The dupe checker](/sceneDuplicateChecker) searches your collection for scenes that are perceptually similar. This means that the files don't need to be identical, and will be identified even with different bitrates, resolutions, and intros/outros.
 
-To achieve this stash needs to generate what's called a phash, or perceptual hash. Similar to sprite generation stash will generate a set of 25 images from fixed points in the scene. These images will be stitched together, and then hashed using the phash algorithm. The phash can then be used to find scenes that are the same or similar to others in the database. Phash generation can be run during scan, or as a separate task. Note that generation can take a while due to the work involved with extracting screenshots.
+To achieve this stash needs to generate what's called a phash, or perceptual hash. Similar to sprite generation stash will generate a set of 25 images from fixed points in the scene. These images will be stitched together, and then hashed using the phash algorithm. The phash can then be used to find scenes that are the same or similar to others in the database. Phash generation can be run during scan, or as a separate task. 
+
+> **⚠️ Note:** Generation can take a while due to the work involved with extracting screenshots.
 
 The dupe checker can be run with four different levels of accuracy. `Exact` looks for scenes that have exactly the same phash. This is a fast and accurate operation that should not yield any false positives except in very rare cases. The other accuracy levels look for duplicate files within a set distance of each other. This means the scenes don't have exactly the same phash, but are very similar. `High` and `Medium` should still yield very good results with few or no false positives. `Low` is likely to produce some false positives, but might still be useful for finding dupes.
 
-Note that to generate a phash stash requires an uncorrupted file. If any errors are encountered during sprite generation the phash will not be generated. This is to prevent false positives.
+> **⚠️ Note:** To generate a pHash Stash requires an uncorrupted file. If any errors are encountered during sprite generation the pHash will not be generated. This is to prevent false positives.
\ No newline at end of file
diff --git a/ui/v2.5/src/docs/en/Manual/EmbeddedPlugins.md b/ui/v2.5/src/docs/en/Manual/EmbeddedPlugins.md
index 1fc217ffc..9d54010e6 100644
--- a/ui/v2.5/src/docs/en/Manual/EmbeddedPlugins.md
+++ b/ui/v2.5/src/docs/en/Manual/EmbeddedPlugins.md
@@ -10,7 +10,9 @@ Stash currently supports Javascript embedded plugin tasks using [goja](https://g
 
 ### Plugin input
 
-The input is provided to Javascript plugin tasks using the `input` global variable, and is an object based on the structure provided in the `Plugin input` section of the [Plugins](/help/Plugins.md) page. Note that the `server_connection` field should not be necessary in most embedded plugins.
+The input is provided to Javascript plugin tasks using the `input` global variable, and is an object based on the structure provided in the `Plugin input` section of the [Plugins](/help/Plugins.md) page. 
+
+> **⚠️ Note:** `server_connection` field should not be necessary in most embedded plugins.
 
 ### Plugin output
 
diff --git a/ui/v2.5/src/docs/en/Manual/Images.md b/ui/v2.5/src/docs/en/Manual/Images.md
index ede9b3457..f08f5241c 100644
--- a/ui/v2.5/src/docs/en/Manual/Images.md
+++ b/ui/v2.5/src/docs/en/Manual/Images.md
@@ -11,7 +11,7 @@ You can add images to every gallery manually in the gallery detail page. Deletin
 
 For best results, images in zip file should be stored without compression (copy, store or no compression options depending on the software you use. Eg on linux: `zip -0 -r gallery.zip foldertozip/`). This impacts **heavily** on the zip read performance.
 
-> **:warning: Note:** AVIF files in ZIP archives are currently unsupported.
+> **⚠️ Note:** AVIF files in ZIP archives are currently unsupported.
 
 If a filename of an image in the gallery zip file ends with `cover.jpg`, it will be treated like a cover and presented first in the gallery view page and as a gallery cover in the gallery list view. If more than one images match the name the first one found in natural sort order is selected.
 
diff --git a/ui/v2.5/src/docs/en/Manual/Introduction.md b/ui/v2.5/src/docs/en/Manual/Introduction.md
index 1496ad2b1..f32b84681 100644
--- a/ui/v2.5/src/docs/en/Manual/Introduction.md
+++ b/ui/v2.5/src/docs/en/Manual/Introduction.md
@@ -2,6 +2,8 @@
 
 Stash works by cataloging your media using the paths that you provide. Once you have [configured](/settings?tab=library) the locations where your media is stored, you can click the Scan button in [`Settings -> Tasks`](/settings?tab=tasks) and stash will begin scanning and importing your media into its library.
 
-For the best experience, it is recommended that after a scan is finished, that video previews and sprites are generated. You can do this in [`Settings -> Tasks`](/settings?tab=tasks). Note that currently it is only possible to perform one task at a time and but there is a task queue, so the generate tasks should be performed after scan is complete.
+For the best experience, it is recommended that after a scan is finished, that video previews and sprites are generated. You can do this in [`Settings -> Tasks`](/settings?tab=tasks). 
+
+> **⚠️ Note:** Currently it is only possible to perform one task at a time and but there is a task queue, so the generate tasks should be performed after scan is complete.
 
 Once your media is imported, you are ready to begin creating Performers, Studios and Tags, and curating your content!
\ No newline at end of file
diff --git a/ui/v2.5/src/docs/en/Manual/JSONSpec.md b/ui/v2.5/src/docs/en/Manual/JSONSpec.md
index 0a53d09f2..b071f26cc 100644
--- a/ui/v2.5/src/docs/en/Manual/JSONSpec.md
+++ b/ui/v2.5/src/docs/en/Manual/JSONSpec.md
@@ -24,7 +24,7 @@ When exported, files are named with different formats depending on the object ty
 | Studios | `<name>.json` |
 | Groups | `<name>.json` |
 
-Note that the file naming is not significant when importing. All json files will be read from the subdirectories.
+> **⚠️ Note:** The file naming is not significant when importing. All json files will be read from the subdirectories.
   
 ## Content of the json files
 
diff --git a/ui/v2.5/src/docs/en/Manual/Plugins.md b/ui/v2.5/src/docs/en/Manual/Plugins.md
index cd24e0d4a..5e403af92 100644
--- a/ui/v2.5/src/docs/en/Manual/Plugins.md
+++ b/ui/v2.5/src/docs/en/Manual/Plugins.md
@@ -240,7 +240,7 @@ hooks:
       argKey: argValue
 ```
 
-**Note:** it is possible for hooks to trigger eachother or themselves if they perform mutations. For safety, hooks will not be triggered if they have already been triggered in the context of the operation. Stash uses cookies to track this context, so it's important for plugins to send cookies when performing operations.
+**⚠️ Note:** It is possible for hooks to trigger eachother or themselves if they perform mutations. For safety, hooks will not be triggered if they have already been triggered in the context of the operation. Stash uses cookies to track this context, so it's important for plugins to send cookies when performing operations.
 
 #### Trigger types
 
diff --git a/ui/v2.5/src/docs/en/Manual/ScraperDevelopment.md b/ui/v2.5/src/docs/en/Manual/ScraperDevelopment.md
index 1f52028f8..4c97e3fcf 100644
--- a/ui/v2.5/src/docs/en/Manual/ScraperDevelopment.md
+++ b/ui/v2.5/src/docs/en/Manual/ScraperDevelopment.md
@@ -375,7 +375,7 @@ scene:
     selector: //div[@data-host="{inputHostname}"]//span[@class="site-name"]
 ```
 
-> **Note:** These placeholders represent the actual URL used to fetch the content, after any URL replacements have been applied.
+> **⚠️ Note:** These placeholders represent the actual URL used to fetch the content, after any URL replacements have been applied.
 
 ### Common fragments
 
@@ -391,6 +391,7 @@ performer:
 The `Measurements` xpath string will replace `$infoPiece` with `//div[@class="infoPiece"]/span`, resulting in: `//div[@class="infoPiece"]/span[text() = 'Measurements:']/../span[@class="smallInfo"]`.
 
 > **⚠️ Note:** Recursive common fragments are **not** supported.  
+
 Referencing a common fragment within another common fragment will cause an error. For example:
 ```yaml
 common:
@@ -881,7 +882,7 @@ Title
 URLs
 ```
 
-> **Important**: `Title` field is required. 
+> **⚠️ Important:** `Title` field is required. 
 
 ### Group
 
@@ -900,7 +901,7 @@ Tags (see Tag fields)
 URLs
 ```
 
-> **Important**: `Name` field is required. 
+> **⚠️ Important:** `Name` field is required. 
 
 ### Image
 
@@ -944,9 +945,9 @@ URLs
 Weight
 ```
 
-> **Important**: `Name` field is required. 
+> **⚠️ Important:** `Name` field is required. 
 
-> **Note:**  - `Gender` must be one of `male`, `female`, `transgender_male`, `transgender_female`, `intersex`, `non_binary` (case insensitive).
+> **⚠️ Note:** `Gender` must be one of `male`, `female`, `transgender_male`, `transgender_female`, `intersex`, `non_binary` (case insensitive).
 
 ### Scene
 
@@ -964,7 +965,7 @@ Title
 URLs
 ```
 
-> **Important**: `Title` field is required only if fileless.
+> **⚠️ Important:** `Title` field is required only if fileless.
 
 ### Studio
 
@@ -976,7 +977,7 @@ Tags (see Tag fields)
 URL
 ```
 
-> **Important**: `Name` field is required. 
+> **⚠️ Important:** `Name` field is required. 
 
 ### Tag
 
@@ -984,4 +985,4 @@ URL
 Name
 ```
 
-> **Important**: `Name` field is required. 
+> **⚠️ Important:** `Name` field is required. 
diff --git a/ui/v2.5/src/docs/en/Manual/Tagger.md b/ui/v2.5/src/docs/en/Manual/Tagger.md
index ba9e5f17a..7c2d12a87 100644
--- a/ui/v2.5/src/docs/en/Manual/Tagger.md
+++ b/ui/v2.5/src/docs/en/Manual/Tagger.md
@@ -4,9 +4,9 @@ Stash can be integrated with stash-box which acts as a centralized metadata data
 
 ## Searching 
 
-The fingerprint search matches your current selection of files against the remote stash-box instance. Any scenes with a matching fingerprint will be returned, although there is currently no validation of fingerprints so it&rsquo;s recommended to double-check the validity before saving.
+The fingerprint search matches your current selection of files against the remote stash-box instance. Any scenes with a matching fingerprint will be returned, although there is currently no validation of fingerprints so it's recommended to double-check the validity before saving.
 
-If no fingerprint match is found it&rsquo;s possible to search by keywords. The search works by matching the query against a scene&rsquo;s _title_, _release date_, _studio name_, and _performer names_. By default the tagger uses metadata set on the file, or parses the filename, this can be changed in the config.
+If no fingerprint match is found it's possible to search by keywords. The search works by matching the query against a scene's _title_, _release date_, _studio name_, and _performer names_. By default the tagger uses metadata set on the file, or parses the filename, this can be changed in the config.
 
 An important thing to note is that it only returns a match *if all query terms are a match*. As an example, if a scene is titled `"A Trip to the Mall"` with the performer `"Jane Doe"`, a search for `"Trip to the Mall 1080p"` will *not* match, however `"trip mall doe"` would. Usually a few pieces of info is enough, for instance performer name + release date or studio name. To avoid common non-related keywords you can add them to the blacklist in the tagger config. Any items in the blacklist are stripped out of the query.
 

From badf9ec35e54f51582593101e242cf49018d46a0 Mon Sep 17 00:00:00 2001
From: Gykes <24581046+Gykes@users.noreply.github.com>
Date: Tue, 3 Feb 2026 14:24:08 -0800
Subject: [PATCH 272/405] add cover check (#6542)

---
 internal/api/resolver_mutation_scene.go | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/internal/api/resolver_mutation_scene.go b/internal/api/resolver_mutation_scene.go
index 6ac5b0227..5347de806 100644
--- a/internal/api/resolver_mutation_scene.go
+++ b/internal/api/resolver_mutation_scene.go
@@ -624,7 +624,12 @@ func (r *mutationResolver) SceneMerge(ctx context.Context, input SceneMergeInput
 			return fmt.Errorf("scene with id %d not found", destID)
 		}
 
-		return r.sceneUpdateCoverImage(ctx, ret, coverImageData)
+		// only update cover image if one was provided
+		if len(coverImageData) > 0 {
+			return r.sceneUpdateCoverImage(ctx, ret, coverImageData)
+		}
+
+		return nil
 	}); err != nil {
 		return nil, err
 	}

From b76edffc5dc82b0cad8eb5bcb24a3e679d1b45b4 Mon Sep 17 00:00:00 2001
From: Gykes <24581046+Gykes@users.noreply.github.com>
Date: Tue, 3 Feb 2026 14:34:56 -0800
Subject: [PATCH 273/405] FR: Add Generate Task to Galleries (#6442)

---
 graphql/schema/types/metadata.graphql         |  6 ++--
 internal/manager/task_generate.go             | 28 +++++++++++++++++--
 .../src/components/Dialogs/GenerateDialog.tsx | 21 ++++++++++----
 .../Galleries/GalleryDetails/Gallery.tsx      | 25 +++++++++++++++++
 .../src/components/Galleries/GalleryList.tsx  | 22 +++++++++++++++
 .../Settings/Tasks/GenerateOptions.tsx        |  4 +--
 6 files changed, 93 insertions(+), 13 deletions(-)

diff --git a/graphql/schema/types/metadata.graphql b/graphql/schema/types/metadata.graphql
index 66b74bb86..3d004ccb3 100644
--- a/graphql/schema/types/metadata.graphql
+++ b/graphql/schema/types/metadata.graphql
@@ -20,10 +20,12 @@ input GenerateMetadataInput {
 
   "scene ids to generate for"
   sceneIDs: [ID!]
-  "image ids to generate for"
-  imageIDs: [ID!]
   "marker ids to generate for"
   markerIDs: [ID!]
+  "image ids to generate for"
+  imageIDs: [ID!]
+  "gallery ids to generate for"
+  galleryIDs: [ID!]
 
   "overwrite existing media"
   overwrite: Boolean
diff --git a/internal/manager/task_generate.go b/internal/manager/task_generate.go
index 5631db87b..2b330bcf3 100644
--- a/internal/manager/task_generate.go
+++ b/internal/manager/task_generate.go
@@ -35,10 +35,12 @@ type GenerateMetadataInput struct {
 	ImageThumbnails           bool `json:"imageThumbnails"`
 	// scene ids to generate for
 	SceneIDs []string `json:"sceneIDs"`
-	// image ids to generate for
-	ImageIDs []string `json:"imageIDs"`
 	// marker ids to generate for
 	MarkerIDs []string `json:"markerIDs"`
+	// image ids to generate for
+	ImageIDs []string `json:"imageIDs"`
+	// gallery ids to generate for
+	GalleryIDs []string `json:"galleryIDs"`
 	// overwrite existing media
 	Overwrite bool `json:"overwrite"`
 }
@@ -114,6 +116,10 @@ func (j *GenerateJob) Execute(ctx context.Context, progress *job.Progress) error
 		if err != nil {
 			logger.Error(err.Error())
 		}
+		galleryIDs, err := stringslice.StringSliceToIntSlice(j.input.GalleryIDs)
+		if err != nil {
+			logger.Error(err.Error())
+		}
 
 		g := &generate.Generator{
 			Encoder:      instance.FFMpeg,
@@ -127,7 +133,7 @@ func (j *GenerateJob) Execute(ctx context.Context, progress *job.Progress) error
 		r := j.repository
 		if err := r.WithReadTxn(ctx, func(ctx context.Context) error {
 			qb := r.Scene
-			if len(j.input.SceneIDs) == 0 && len(j.input.MarkerIDs) == 0 && len(j.input.ImageIDs) == 0 {
+			if len(j.input.SceneIDs) == 0 && len(j.input.MarkerIDs) == 0 && len(j.input.ImageIDs) == 0 && len(j.input.GalleryIDs) == 0 {
 				j.queueTasks(ctx, g, queue)
 			} else {
 				if len(j.input.SceneIDs) > 0 {
@@ -161,6 +167,22 @@ func (j *GenerateJob) Execute(ctx context.Context, progress *job.Progress) error
 						j.queueImageJob(g, i, queue)
 					}
 				}
+
+				if len(j.input.GalleryIDs) > 0 {
+					for _, galleryID := range galleryIDs {
+						imgs, err := r.Image.FindByGalleryID(ctx, galleryID)
+						if err != nil {
+							return err
+						}
+						for _, img := range imgs {
+							if err := img.LoadFiles(ctx, r.Image); err != nil {
+								return err
+							}
+
+							j.queueImageJob(g, img, queue)
+						}
+					}
+				}
 			}
 
 			return nil
diff --git a/ui/v2.5/src/components/Dialogs/GenerateDialog.tsx b/ui/v2.5/src/components/Dialogs/GenerateDialog.tsx
index c30073e48..a5688aed0 100644
--- a/ui/v2.5/src/components/Dialogs/GenerateDialog.tsx
+++ b/ui/v2.5/src/components/Dialogs/GenerateDialog.tsx
@@ -14,19 +14,20 @@ import { SettingSection } from "../Settings/SettingSection";
 import { faCogs, faQuestionCircle } from "@fortawesome/free-solid-svg-icons";
 import { SettingsContext } from "../Settings/context";
 
-interface ISceneGenerateDialog {
+interface IGenerateDialog {
   selectedIds?: string[];
   onClose: () => void;
-  type: "scene" | "image";
+  type: "scene" | "image" | "gallery";
 }
 
-export const GenerateDialog: React.FC<ISceneGenerateDialog> = ({
+export const GenerateDialog: React.FC<IGenerateDialog> = ({
   selectedIds,
   onClose,
   type,
 }) => {
   const sceneIDs = type === "scene" ? selectedIds : undefined;
   const imageIDs = type === "image" ? selectedIds : undefined;
+  const galleryIDs = type === "gallery" ? selectedIds : undefined;
 
   const { configuration } = useConfigurationContext();
 
@@ -92,6 +93,13 @@ export const GenerateDialog: React.FC<ISceneGenerateDialog> = ({
   }, [configuration, configRead]);
 
   const selectionStatus = useMemo(() => {
+    const countableIds: Record<typeof type, string> = {
+      scene: "countables.scenes",
+      image: "countables.images",
+      gallery: "countables.galleries",
+    };
+    const countableId = countableIds[type];
+
     if (selectedIds) {
       return (
         <Form.Group id="selected-generate-ids">
@@ -101,7 +109,7 @@ export const GenerateDialog: React.FC<ISceneGenerateDialog> = ({
               num: selectedIds.length,
               scene: intl.formatMessage(
                 {
-                  id: "countables.scenes",
+                  id: countableId,
                 },
                 {
                   count: selectedIds.length,
@@ -121,7 +129,7 @@ export const GenerateDialog: React.FC<ISceneGenerateDialog> = ({
             num: intl.formatMessage({ id: "all" }),
             scene: intl.formatMessage(
               {
-                id: "countables.scenes",
+                id: countableId,
               },
               {
                 count: 0,
@@ -138,7 +146,7 @@ export const GenerateDialog: React.FC<ISceneGenerateDialog> = ({
         <div>{message}</div>
       </Form.Group>
     );
-  }, [selectedIds, intl]);
+  }, [selectedIds, intl, type]);
 
   async function onGenerate() {
     try {
@@ -146,6 +154,7 @@ export const GenerateDialog: React.FC<ISceneGenerateDialog> = ({
         ...options,
         sceneIDs,
         imageIDs,
+        galleryIDs,
       });
       Toast.success(
         intl.formatMessage(
diff --git a/ui/v2.5/src/components/Galleries/GalleryDetails/Gallery.tsx b/ui/v2.5/src/components/Galleries/GalleryDetails/Gallery.tsx
index 195766e03..18cbeff96 100644
--- a/ui/v2.5/src/components/Galleries/GalleryDetails/Gallery.tsx
+++ b/ui/v2.5/src/components/Galleries/GalleryDetails/Gallery.tsx
@@ -15,6 +15,11 @@ import {
   useFindGallery,
   useGalleryUpdate,
 } from "src/core/StashService";
+import { lazyComponent } from "src/utils/lazyComponent";
+
+const GenerateDialog = lazyComponent(
+  () => import("../../Dialogs/GenerateDialog")
+);
 import { ErrorMessage } from "src/components/Shared/ErrorMessage";
 import { LoadingIndicator } from "src/components/Shared/LoadingIndicator";
 import { Icon } from "src/components/Shared/Icon";
@@ -165,6 +170,7 @@ export const GalleryPage: React.FC<IProps> = ({ gallery, add }) => {
   }
 
   const [isDeleteAlertOpen, setIsDeleteAlertOpen] = useState<boolean>(false);
+  const [isGenerateDialogOpen, setIsGenerateDialogOpen] = useState(false);
 
   function onDeleteDialogClosed(deleted: boolean) {
     setIsDeleteAlertOpen(false);
@@ -184,6 +190,18 @@ export const GalleryPage: React.FC<IProps> = ({ gallery, add }) => {
     }
   }
 
+  function maybeRenderGenerateDialog() {
+    if (isGenerateDialogOpen) {
+      return (
+        <GenerateDialog
+          selectedIds={[gallery.id]}
+          onClose={() => setIsGenerateDialogOpen(false)}
+          type="gallery"
+        />
+      );
+    }
+  }
+
   function renderOperations() {
     return (
       <Dropdown>
@@ -210,6 +228,12 @@ export const GalleryPage: React.FC<IProps> = ({ gallery, add }) => {
           >
             <FormattedMessage id="actions.reset_cover" />
           </Dropdown.Item>
+          <Dropdown.Item
+            className="bg-secondary text-white"
+            onClick={() => setIsGenerateDialogOpen(true)}
+          >
+            {`${intl.formatMessage({ id: "actions.generate" })}…`}
+          </Dropdown.Item>
           <Dropdown.Item
             className="bg-secondary text-white"
             onClick={() => setIsDeleteAlertOpen(true)}
@@ -387,6 +411,7 @@ export const GalleryPage: React.FC<IProps> = ({ gallery, add }) => {
         <title>{title}</title>
       </Helmet>
       {maybeRenderDeleteDialog()}
+      {maybeRenderGenerateDialog()}
       <div className={`gallery-tabs ${collapsed ? "collapsed" : ""}`}>
         <div>
           <div className="gallery-header-container">
diff --git a/ui/v2.5/src/components/Galleries/GalleryList.tsx b/ui/v2.5/src/components/Galleries/GalleryList.tsx
index 9a4fc5236..4afbab620 100644
--- a/ui/v2.5/src/components/Galleries/GalleryList.tsx
+++ b/ui/v2.5/src/components/Galleries/GalleryList.tsx
@@ -12,11 +12,13 @@ import GalleryWallCard from "./GalleryWallCard";
 import { EditGalleriesDialog } from "./EditGalleriesDialog";
 import { DeleteGalleriesDialog } from "./DeleteGalleriesDialog";
 import { ExportDialog } from "../Shared/ExportDialog";
+import { GenerateDialog } from "../Dialogs/GenerateDialog";
 import { GalleryListTable } from "./GalleryListTable";
 import { GalleryCardGrid } from "./GalleryCardGrid";
 import { View } from "../List/views";
 import { PatchComponent } from "src/patch";
 import { IItemListOperation } from "../List/FilteredListToolbar";
+import { useModal } from "src/hooks/modal";
 
 function getItems(result: GQL.FindGalleriesQueryResult) {
   return result?.data?.findGalleries?.galleries ?? [];
@@ -40,6 +42,7 @@ export const GalleryList: React.FC<IGalleryList> = PatchComponent(
     const history = useHistory();
     const [isExportDialogOpen, setIsExportDialogOpen] = useState(false);
     const [isExportAll, setIsExportAll] = useState(false);
+    const { modal, showModal, closeModal } = useModal();
 
     const filterMode = GQL.FilterMode.Galleries;
 
@@ -49,6 +52,24 @@ export const GalleryList: React.FC<IGalleryList> = PatchComponent(
         text: intl.formatMessage({ id: "actions.view_random" }),
         onClick: viewRandom,
       },
+      {
+        text: `${intl.formatMessage({ id: "actions.generate" })}…`,
+        onClick: (
+          _result: GQL.FindGalleriesQueryResult,
+          _filter: ListFilterModel,
+          selectedIds: Set<string>
+        ) => {
+          showModal(
+            <GenerateDialog
+              type="gallery"
+              selectedIds={Array.from(selectedIds.values())}
+              onClose={() => closeModal()}
+            />
+          );
+          return Promise.resolve();
+        },
+        isDisplayed: showWhenSelected,
+      },
       {
         text: intl.formatMessage({ id: "actions.export" }),
         onClick: onExport,
@@ -172,6 +193,7 @@ export const GalleryList: React.FC<IGalleryList> = PatchComponent(
       return (
         <>
           {maybeRenderGalleryExportDialog()}
+          {modal}
           {renderGalleries()}
         </>
       );
diff --git a/ui/v2.5/src/components/Settings/Tasks/GenerateOptions.tsx b/ui/v2.5/src/components/Settings/Tasks/GenerateOptions.tsx
index 24be2c7fe..c68b6d5eb 100644
--- a/ui/v2.5/src/components/Settings/Tasks/GenerateOptions.tsx
+++ b/ui/v2.5/src/components/Settings/Tasks/GenerateOptions.tsx
@@ -7,7 +7,7 @@ import {
 } from "../GeneratePreviewOptions";
 
 interface IGenerateOptions {
-  type?: "scene" | "image";
+  type?: "scene" | "image" | "gallery";
   selection?: boolean;
   options: GQL.GenerateMetadataInput;
   setOptions: (s: GQL.GenerateMetadataInput) => void;
@@ -27,7 +27,7 @@ export const GenerateOptions: React.FC<IGenerateOptions> = ({
   }
 
   const showSceneOptions = !type || type === "scene";
-  const showImageOptions = !type || type === "image";
+  const showImageOptions = !type || type === "image" || type === "gallery";
 
   return (
     <>

From cf5d60f51181b45481b3d2cd36ba1a2587ac8bbc Mon Sep 17 00:00:00 2001
From: GammelSami <39372285+GammelSami@users.noreply.github.com>
Date: Wed, 4 Feb 2026 00:18:39 +0100
Subject: [PATCH 274/405] Added loop feature for markers + AB prefill  (#6510)

* add loop feature for markers + AB prefill
* chore(ui): type ab loop plugin access
---
 ui/v2.5/src/components/ScenePlayer/util.ts    | 22 +++++++-
 .../Scenes/SceneDetails/PrimaryTags.tsx       | 25 ++++++++--
 .../components/Scenes/SceneDetails/Scene.tsx  | 50 ++++++++++++++++++-
 .../Scenes/SceneDetails/SceneMarkerForm.tsx   | 38 +++++++++++---
 .../Scenes/SceneDetails/SceneMarkersPanel.tsx |  3 ++
 5 files changed, 126 insertions(+), 12 deletions(-)

diff --git a/ui/v2.5/src/components/ScenePlayer/util.ts b/ui/v2.5/src/components/ScenePlayer/util.ts
index 8c6fb8010..21ed99b62 100644
--- a/ui/v2.5/src/components/ScenePlayer/util.ts
+++ b/ui/v2.5/src/components/ScenePlayer/util.ts
@@ -1,7 +1,27 @@
-import videojs from "video.js";
+import videojs, { VideoJsPlayer } from "video.js";
 
 export const VIDEO_PLAYER_ID = "VideoJsPlayer";
 
 export const getPlayer = () => videojs.getPlayer(VIDEO_PLAYER_ID);
 
 export const getPlayerPosition = () => getPlayer()?.currentTime();
+
+export type AbLoopOptions = {
+  start: number;
+  end: number | false;
+  enabled?: boolean;
+};
+
+export type AbLoopPluginApi = {
+  getOptions: () => AbLoopOptions;
+  setOptions: (options: AbLoopOptions) => void;
+};
+
+export const getAbLoopPlugin = () => {
+  const player = getPlayer();
+  if (!player) return null;
+  const { abLoopPlugin } = player as VideoJsPlayer & {
+    abLoopPlugin?: AbLoopPluginApi;
+  };
+  return abLoopPlugin ?? null;
+};
diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/PrimaryTags.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/PrimaryTags.tsx
index 11c805ec6..d5a32fc31 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/PrimaryTags.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/PrimaryTags.tsx
@@ -4,18 +4,24 @@ import * as GQL from "src/core/generated-graphql";
 import { Button, Badge, Card } from "react-bootstrap";
 import TextUtils from "src/utils/text";
 import { markerTitle } from "src/core/markers";
+import { useConfigurationContext } from "src/hooks/Config";
 
 interface IPrimaryTags {
   sceneMarkers: GQL.SceneMarkerDataFragment[];
   onClickMarker: (marker: GQL.SceneMarkerDataFragment) => void;
+  onLoopMarker: (marker: GQL.SceneMarkerDataFragment) => void;
   onEdit: (marker: GQL.SceneMarkerDataFragment) => void;
 }
 
 export const PrimaryTags: React.FC<IPrimaryTags> = ({
   sceneMarkers,
   onClickMarker,
+  onLoopMarker,
   onEdit,
 }) => {
+  const { configuration } = useConfigurationContext();
+  const showAbLoopControls = configuration?.ui?.showAbLoopControls;
+
   if (!sceneMarkers?.length) return <div />;
 
   const primaryTagNames: Record<string, string> = {};
@@ -52,10 +58,21 @@ export const PrimaryTags: React.FC<IPrimaryTags> = ({
               <FormattedMessage id="actions.edit" />
             </Button>
           </div>
-          <div>
-            {TextUtils.formatTimestampRange(
-              marker.seconds,
-              marker.end_seconds ?? undefined
+          <div className="d-flex align-items-center">
+            <div>
+              {TextUtils.formatTimestampRange(
+                marker.seconds,
+                marker.end_seconds ?? undefined
+              )}
+            </div>
+            {showAbLoopControls && marker.end_seconds != null && (
+              <Button
+                variant="link"
+                className="ml-2 p-0"
+                onClick={() => onLoopMarker(marker)}
+              >
+                Loop
+              </Button>
             )}
           </div>
           <div className="card-section centered">{tags}</div>
diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx
index 7c9b178c1..435b9dce2 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx
@@ -32,7 +32,10 @@ import { ListFilterModel } from "src/models/list-filter/filter";
 import Mousetrap from "mousetrap";
 import { OrganizedButton } from "./OrganizedButton";
 import { useConfigurationContext } from "src/hooks/Config";
-import { getPlayerPosition } from "src/components/ScenePlayer/util";
+import {
+  getAbLoopPlugin,
+  getPlayerPosition,
+} from "src/components/ScenePlayer/util";
 import {
   faEllipsisV,
   faChevronRight,
@@ -311,9 +314,53 @@ const ScenePage: React.FC<IProps> = PatchComponent("ScenePage", (props) => {
   };
 
   function onClickMarker(marker: GQL.SceneMarkerDataFragment) {
+    const abLoopPlugin = getAbLoopPlugin();
+    const opts = abLoopPlugin?.getOptions();
+    const start = opts?.start;
+    const end = opts?.end;
+
+    const hasLoopRange =
+      opts?.enabled &&
+      typeof start === "number" &&
+      typeof end === "number" &&
+      Number.isFinite(start) &&
+      Number.isFinite(end);
+
+    if (
+      abLoopPlugin &&
+      opts &&
+      hasLoopRange &&
+      (marker.seconds < Math.min(start as number, end as number) ||
+        marker.seconds > Math.max(start as number, end as number))
+    ) {
+      abLoopPlugin.setOptions({
+        ...opts,
+        enabled: false,
+      });
+    }
+
     setTimestamp(marker.seconds);
   }
 
+  function onLoopMarker(marker: GQL.SceneMarkerDataFragment) {
+    if (marker.end_seconds == null) return;
+
+    setTimestamp(marker.seconds);
+    const start = Math.min(marker.seconds, marker.end_seconds);
+    const end = Math.max(marker.seconds, marker.end_seconds);
+    const abLoopPlugin = getAbLoopPlugin();
+    const opts = abLoopPlugin?.getOptions();
+
+    if (opts && abLoopPlugin) {
+      abLoopPlugin.setOptions({
+        ...opts,
+        start,
+        end,
+        enabled: true,
+      });
+    }
+  }
+
   async function onRescan() {
     await mutateMetadataScan({
       paths: [objectPath(scene)],
@@ -561,6 +608,7 @@ const ScenePage: React.FC<IProps> = PatchComponent("ScenePage", (props) => {
             <SceneMarkersPanel
               sceneId={scene.id}
               onClickMarker={onClickMarker}
+              onLoopMarker={onLoopMarker}
               isVisible={activeTabKey === "scene-markers-panel"}
             />
           </Tab.Pane>
diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/SceneMarkerForm.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/SceneMarkerForm.tsx
index ef1a2e7e1..cbb2ad4bb 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/SceneMarkerForm.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/SceneMarkerForm.tsx
@@ -11,7 +11,10 @@ import {
 } from "src/core/StashService";
 import { DurationInput } from "src/components/Shared/DurationInput";
 import { MarkerTitleSuggest } from "src/components/Shared/Select";
-import { getPlayerPosition } from "src/components/ScenePlayer/util";
+import {
+  getAbLoopPlugin,
+  getPlayerPosition,
+} from "src/components/ScenePlayer/util";
 import { useToast } from "src/hooks/Toast";
 import isEqual from "lodash-es/isEqual";
 import { formikUtils } from "src/utils/form";
@@ -61,16 +64,39 @@ export const SceneMarkerForm: React.FC<ISceneMarkerForm> = ({
   });
 
   // useMemo to only run getPlayerPosition when the input marker actually changes
-  const initialValues = useMemo(
-    () => ({
+  const initialValues = useMemo(() => {
+    if (!marker) {
+      const abLoopPlugin = getAbLoopPlugin();
+      const opts = abLoopPlugin?.getOptions();
+      const start = opts?.start;
+      const end = opts?.end;
+      const hasAbLoop = Number.isFinite(start);
+
+      if (hasAbLoop) {
+        const current = Math.round(getPlayerPosition() ?? 0);
+        const rawEnd =
+          Number.isFinite(end) && (end as number) > 0 ? (end as number) : null;
+        const endSeconds =
+          rawEnd !== null ? rawEnd : Math.max(start as number, current);
+
+        return {
+          title: "",
+          seconds: start as number,
+          end_seconds: endSeconds,
+          primary_tag_id: "",
+          tag_ids: [],
+        };
+      }
+    }
+
+    return {
       title: marker?.title ?? "",
       seconds: marker?.seconds ?? Math.round(getPlayerPosition() ?? 0),
       end_seconds: marker?.end_seconds ?? null,
       primary_tag_id: marker?.primary_tag.id ?? "",
       tag_ids: marker?.tags.map((tag) => tag.id) ?? [],
-    }),
-    [marker]
-  );
+    };
+  }, [marker]);
 
   type InputValues = yup.InferType<typeof schema>;
 
diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/SceneMarkersPanel.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/SceneMarkersPanel.tsx
index 331c58c78..28a6e4d98 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/SceneMarkersPanel.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/SceneMarkersPanel.tsx
@@ -11,12 +11,14 @@ interface ISceneMarkersPanelProps {
   sceneId: string;
   isVisible: boolean;
   onClickMarker: (marker: GQL.SceneMarkerDataFragment) => void;
+  onLoopMarker: (marker: GQL.SceneMarkerDataFragment) => void;
 }
 
 export const SceneMarkersPanel: React.FC<ISceneMarkersPanelProps> = ({
   sceneId,
   isVisible,
   onClickMarker,
+  onLoopMarker,
 }) => {
   const { data, loading } = GQL.useFindSceneMarkerTagsQuery({
     variables: { id: sceneId },
@@ -70,6 +72,7 @@ export const SceneMarkersPanel: React.FC<ISceneMarkersPanelProps> = ({
         <PrimaryTags
           sceneMarkers={sceneMarkers}
           onClickMarker={onClickMarker}
+          onLoopMarker={onLoopMarker}
           onEdit={onOpenEditor}
         />
       </div>

From ed0fb53ae0df68ca30195206d9662e06a0ab27fa Mon Sep 17 00:00:00 2001
From: Hans Evers <69341873+xantror@users.noreply.github.com>
Date: Wed, 4 Feb 2026 00:37:15 +0100
Subject: [PATCH 275/405] feat: auto-remove duplicate aliases (#6514)

---
 graphql/schema/types/performer.graphql        |  3 +
 graphql/schema/types/studio.graphql           |  2 +
 graphql/schema/types/tag.graphql              |  3 +
 internal/api/resolver_mutation_performer.go   | 23 ++++-
 internal/api/resolver_mutation_studio.go      | 24 +++++-
 internal/api/resolver_mutation_tag.go         | 24 +++++-
 pkg/performer/validate.go                     |  5 ++
 pkg/performer/validate_test.go                |  6 +-
 .../stringslice/string_collections.go         | 17 ++++
 pkg/studio/validate.go                        |  1 +
 pkg/studio/validate_test.go                   | 69 +++++++++++++++
 pkg/tag/validate.go                           |  4 +-
 pkg/tag/validate_test.go                      | 86 +++++++++++++++++++
 .../PerformerDetails/PerformerEditPanel.tsx   |  4 +-
 .../Studios/StudioDetails/StudioEditPanel.tsx |  4 +-
 .../Tags/TagDetails/TagEditPanel.tsx          |  4 +-
 ui/v2.5/src/utils/yup.ts                      | 39 ---------
 17 files changed, 266 insertions(+), 52 deletions(-)
 create mode 100644 pkg/tag/validate_test.go

diff --git a/graphql/schema/types/performer.graphql b/graphql/schema/types/performer.graphql
index e788b91a8..7275d4495 100644
--- a/graphql/schema/types/performer.graphql
+++ b/graphql/schema/types/performer.graphql
@@ -80,6 +80,7 @@ input PerformerCreateInput {
   career_length: String
   tattoos: String
   piercings: String
+  "Duplicate aliases and those equal to name will be ignored (case-insensitive)"
   alias_list: [String!]
   twitter: String @deprecated(reason: "Use urls")
   instagram: String @deprecated(reason: "Use urls")
@@ -118,6 +119,7 @@ input PerformerUpdateInput {
   career_length: String
   tattoos: String
   piercings: String
+  "Duplicate aliases and those equal to name will be ignored (case-insensitive)"
   alias_list: [String!]
   twitter: String @deprecated(reason: "Use urls")
   instagram: String @deprecated(reason: "Use urls")
@@ -161,6 +163,7 @@ input BulkPerformerUpdateInput {
   career_length: String
   tattoos: String
   piercings: String
+  "Duplicate aliases and those equal to name will result in an error (case-insensitive)"
   alias_list: BulkUpdateStrings
   twitter: String @deprecated(reason: "Use urls")
   instagram: String @deprecated(reason: "Use urls")
diff --git a/graphql/schema/types/studio.graphql b/graphql/schema/types/studio.graphql
index 4c5778c5b..a1e1659ec 100644
--- a/graphql/schema/types/studio.graphql
+++ b/graphql/schema/types/studio.graphql
@@ -40,6 +40,7 @@ input StudioCreateInput {
   rating100: Int
   favorite: Boolean
   details: String
+  "Duplicate aliases and those equal to name will be ignored (case-insensitive)"
   aliases: [String!]
   tag_ids: [ID!]
   ignore_auto_tag: Boolean
@@ -58,6 +59,7 @@ input StudioUpdateInput {
   rating100: Int
   favorite: Boolean
   details: String
+  "Duplicate aliases and those equal to name will be ignored (case-insensitive)"
   aliases: [String!]
   tag_ids: [ID!]
   ignore_auto_tag: Boolean
diff --git a/graphql/schema/types/tag.graphql b/graphql/schema/types/tag.graphql
index 8424ab92a..a69b83548 100644
--- a/graphql/schema/types/tag.graphql
+++ b/graphql/schema/types/tag.graphql
@@ -31,6 +31,7 @@ input TagCreateInput {
   "Value that does not appear in the UI but overrides name for sorting"
   sort_name: String
   description: String
+  "Duplicate aliases and those equal to name will be ignored (case-insensitive)"
   aliases: [String!]
   ignore_auto_tag: Boolean
   favorite: Boolean
@@ -48,6 +49,7 @@ input TagUpdateInput {
   "Value that does not appear in the UI but overrides name for sorting"
   sort_name: String
   description: String
+  "Duplicate aliases and those equal to name will be ignored (case-insensitive)"
   aliases: [String!]
   ignore_auto_tag: Boolean
   favorite: Boolean
@@ -76,6 +78,7 @@ input TagsMergeInput {
 input BulkTagUpdateInput {
   ids: [ID!]
   description: String
+  "Duplicate aliases and those equal to name will result in an error (case-insensitive)"
   aliases: BulkUpdateStrings
   ignore_auto_tag: Boolean
   favorite: Boolean
diff --git a/internal/api/resolver_mutation_performer.go b/internal/api/resolver_mutation_performer.go
index ab9abf6cf..fd18ecb95 100644
--- a/internal/api/resolver_mutation_performer.go
+++ b/internal/api/resolver_mutation_performer.go
@@ -43,7 +43,7 @@ func (r *mutationResolver) PerformerCreate(ctx context.Context, input models.Per
 
 	newPerformer.Name = strings.TrimSpace(input.Name)
 	newPerformer.Disambiguation = translator.string(input.Disambiguation)
-	newPerformer.Aliases = models.NewRelatedStrings(stringslice.TrimSpace(input.AliasList))
+	newPerformer.Aliases = models.NewRelatedStrings(stringslice.UniqueExcludeFold(stringslice.TrimSpace(input.AliasList), newPerformer.Name))
 	newPerformer.Gender = input.Gender
 	newPerformer.Ethnicity = translator.string(input.Ethnicity)
 	newPerformer.Country = translator.string(input.Country)
@@ -348,6 +348,27 @@ func (r *mutationResolver) PerformerUpdate(ctx context.Context, input models.Per
 			}
 		}
 
+		if updatedPerformer.Aliases != nil {
+			p, err := qb.Find(ctx, performerID)
+			if err != nil {
+				return err
+			}
+			if p != nil {
+				if err := p.LoadAliases(ctx, qb); err != nil {
+					return err
+				}
+
+				effectiveAliases := updatedPerformer.Aliases.Apply(p.Aliases.List())
+				name := p.Name
+				if updatedPerformer.Name.Set {
+					name = updatedPerformer.Name.Value
+				}
+
+				sanitized := stringslice.UniqueExcludeFold(effectiveAliases, name)
+				updatedPerformer.Aliases.Values = sanitized
+				updatedPerformer.Aliases.Mode = models.RelationshipUpdateModeSet
+			}
+		}
 		if err := performer.ValidateUpdate(ctx, performerID, *updatedPerformer, qb); err != nil {
 			return err
 		}
diff --git a/internal/api/resolver_mutation_studio.go b/internal/api/resolver_mutation_studio.go
index da3aa1983..fdd700490 100644
--- a/internal/api/resolver_mutation_studio.go
+++ b/internal/api/resolver_mutation_studio.go
@@ -38,7 +38,7 @@ func (r *mutationResolver) StudioCreate(ctx context.Context, input models.Studio
 	newStudio.Favorite = translator.bool(input.Favorite)
 	newStudio.Details = translator.string(input.Details)
 	newStudio.IgnoreAutoTag = translator.bool(input.IgnoreAutoTag)
-	newStudio.Aliases = models.NewRelatedStrings(stringslice.TrimSpace(input.Aliases))
+	newStudio.Aliases = models.NewRelatedStrings(stringslice.UniqueExcludeFold(stringslice.TrimSpace(input.Aliases), newStudio.Name))
 	newStudio.StashIDs = models.NewRelatedStashIDs(models.StashIDInputs(input.StashIds).ToStashIDs())
 
 	var err error
@@ -167,6 +167,28 @@ func (r *mutationResolver) StudioUpdate(ctx context.Context, input models.Studio
 	if err := r.withTxn(ctx, func(ctx context.Context) error {
 		qb := r.repository.Studio
 
+		if updatedStudio.Aliases != nil {
+			s, err := qb.Find(ctx, studioID)
+			if err != nil {
+				return err
+			}
+			if s != nil {
+				if err := s.LoadAliases(ctx, qb); err != nil {
+					return err
+				}
+
+				effectiveAliases := updatedStudio.Aliases.Apply(s.Aliases.List())
+				name := s.Name
+				if updatedStudio.Name.Set {
+					name = updatedStudio.Name.Value
+				}
+
+				sanitized := stringslice.UniqueExcludeFold(effectiveAliases, name)
+				updatedStudio.Aliases.Values = sanitized
+				updatedStudio.Aliases.Mode = models.RelationshipUpdateModeSet
+			}
+		}
+
 		if err := studio.ValidateModify(ctx, updatedStudio, qb); err != nil {
 			return err
 		}
diff --git a/internal/api/resolver_mutation_tag.go b/internal/api/resolver_mutation_tag.go
index f8d4943be..8fb295d40 100644
--- a/internal/api/resolver_mutation_tag.go
+++ b/internal/api/resolver_mutation_tag.go
@@ -35,7 +35,7 @@ func (r *mutationResolver) TagCreate(ctx context.Context, input TagCreateInput)
 
 	newTag.Name = strings.TrimSpace(input.Name)
 	newTag.SortName = translator.string(input.SortName)
-	newTag.Aliases = models.NewRelatedStrings(stringslice.TrimSpace(input.Aliases))
+	newTag.Aliases = models.NewRelatedStrings(stringslice.UniqueExcludeFold(stringslice.TrimSpace(input.Aliases), newTag.Name))
 	newTag.Favorite = translator.bool(input.Favorite)
 	newTag.Description = translator.string(input.Description)
 	newTag.IgnoreAutoTag = translator.bool(input.IgnoreAutoTag)
@@ -151,6 +151,28 @@ func (r *mutationResolver) TagUpdate(ctx context.Context, input TagUpdateInput)
 	if err := r.withTxn(ctx, func(ctx context.Context) error {
 		qb := r.repository.Tag
 
+		if updatedTag.Aliases != nil {
+			t, err := qb.Find(ctx, tagID)
+			if err != nil {
+				return err
+			}
+			if t != nil {
+				if err := t.LoadAliases(ctx, qb); err != nil {
+					return err
+				}
+
+				newAliases := updatedTag.Aliases.Apply(t.Aliases.List())
+				name := t.Name
+				if updatedTag.Name.Set {
+					name = updatedTag.Name.Value
+				}
+
+				sanitized := stringslice.UniqueExcludeFold(newAliases, name)
+				updatedTag.Aliases.Values = sanitized
+				updatedTag.Aliases.Mode = models.RelationshipUpdateModeSet
+			}
+		}
+
 		if err := tag.ValidateUpdate(ctx, tagID, updatedTag, qb); err != nil {
 			return err
 		}
diff --git a/pkg/performer/validate.go b/pkg/performer/validate.go
index 68f7a8ef5..3baaa182b 100644
--- a/pkg/performer/validate.go
+++ b/pkg/performer/validate.go
@@ -225,6 +225,11 @@ func ValidateUpdateAliases(existing models.Performer, name models.OptionalString
 		newName = name.Value
 	}
 
+	// If aliases is nil, we're only changing the name - check existing aliases against new name
+	if aliases == nil {
+		return ValidateAliases(newName, existing.Aliases)
+	}
+
 	newAliases := aliases.Apply(existing.Aliases.List())
 
 	return ValidateAliases(newName, models.NewRelatedStrings(newAliases))
diff --git a/pkg/performer/validate_test.go b/pkg/performer/validate_test.go
index 33f4b1cec..afd9c01c5 100644
--- a/pkg/performer/validate_test.go
+++ b/pkg/performer/validate_test.go
@@ -213,12 +213,12 @@ func TestValidateUpdateAliases(t *testing.T) {
 		want    error
 	}{
 		{"both unset", osUnset, nil, nil},
-		{"invalid name set", os2, nil, &DuplicateAliasError{name2}},
+		{"name conflicts with alias", os2, nil, &DuplicateAliasError{name2}},
 		{"valid name set", os3, nil, nil},
 		{"valid aliases empty", os1, []string{}, nil},
-		{"invalid aliases set", osUnset, []string{name1U}, &DuplicateAliasError{name1U}},
+		{"alias matches name", osUnset, []string{name1U}, &DuplicateAliasError{name1U}},
 		{"valid aliases set", osUnset, []string{name3, name2}, nil},
-		{"invalid both set", os4, []string{name4}, &DuplicateAliasError{name4}},
+		{"alias matches new name", os4, []string{name4}, &DuplicateAliasError{name4}},
 		{"valid both set", os2, []string{name1}, nil},
 	}
 
diff --git a/pkg/sliceutil/stringslice/string_collections.go b/pkg/sliceutil/stringslice/string_collections.go
index f5251de5f..eff3409e2 100644
--- a/pkg/sliceutil/stringslice/string_collections.go
+++ b/pkg/sliceutil/stringslice/string_collections.go
@@ -45,6 +45,23 @@ func UniqueFold(s []string) []string {
 	return ret
 }
 
+// UniqueExcludeFold returns a deduplicated slice of strings with the excluded string removed.
+// The comparison is case-insensitive.
+func UniqueExcludeFold(values []string, exclude string) []string {
+	seen := make(map[string]struct{}, len(values))
+	seen[strings.ToLower(exclude)] = struct{}{}
+	ret := make([]string, 0, len(values))
+	for _, v := range values {
+		vLower := strings.ToLower(v)
+		if _, exists := seen[vLower]; exists {
+			continue
+		}
+		seen[vLower] = struct{}{}
+		ret = append(ret, v)
+	}
+	return ret
+}
+
 // TrimSpace trims whitespace from each string in a slice.
 func TrimSpace(s []string) []string {
 	for i, v := range s {
diff --git a/pkg/studio/validate.go b/pkg/studio/validate.go
index 4e2f51c84..1654a2e78 100644
--- a/pkg/studio/validate.go
+++ b/pkg/studio/validate.go
@@ -135,6 +135,7 @@ func ValidateModify(ctx context.Context, s models.StudioPartial, qb ValidateModi
 		}
 
 		effectiveAliases := s.Aliases.Apply(existing.Aliases.List())
+
 		if err := ValidateAliases(ctx, s.ID, effectiveAliases, qb); err != nil {
 			return err
 		}
diff --git a/pkg/studio/validate_test.go b/pkg/studio/validate_test.go
index 6562dc5ca..b196ba3c3 100644
--- a/pkg/studio/validate_test.go
+++ b/pkg/studio/validate_test.go
@@ -102,3 +102,72 @@ func TestValidateUpdateName(t *testing.T) {
 		})
 	}
 }
+
+func TestValidateUpdateAliases(t *testing.T) {
+	db := mocks.NewDatabase()
+
+	const (
+		name1    = "name 1"
+		name2    = "name 2"
+		alias1   = "alias 1"
+		newAlias = "new alias"
+	)
+
+	existing1 := models.Studio{
+		ID:   1,
+		Name: name1,
+	}
+	existing2 := models.Studio{
+		ID:   2,
+		Name: name2,
+	}
+
+	pp := 1
+	findFilter := &models.FindFilterType{
+		PerPage: &pp,
+	}
+
+	aliasFilter := func(n string) *models.StudioFilterType {
+		return &models.StudioFilterType{
+			Aliases: &models.StringCriterionInput{
+				Value:    n,
+				Modifier: models.CriterionModifierEquals,
+			},
+		}
+	}
+
+	// name1 matches existing1 name - ok
+	db.Studio.On("Query", testCtx, nameFilter(alias1), findFilter).Return(nil, 0, nil)
+	db.Studio.On("Query", testCtx, aliasFilter(alias1), findFilter).Return(nil, 0, nil)
+
+	// name2 matches existing2 name - error
+	db.Studio.On("Query", testCtx, nameFilter(name2), findFilter).Return([]*models.Studio{&existing2}, 1, nil)
+
+	// alias matches existing alias - error
+	db.Studio.On("Query", testCtx, nameFilter(newAlias), findFilter).Return(nil, 0, nil)
+	db.Studio.On("Query", testCtx, aliasFilter(newAlias), findFilter).Return([]*models.Studio{&existing2}, 1, nil)
+
+	// valid alias
+	db.Studio.On("Query", testCtx, nameFilter("valid"), findFilter).Return(nil, 0, nil)
+	db.Studio.On("Query", testCtx, aliasFilter("valid"), findFilter).Return(nil, 0, nil)
+
+	tests := []struct {
+		tName   string
+		studio  models.Studio
+		aliases []string
+		want    error
+	}{
+		{"valid alias", existing1, []string{alias1}, nil},
+		{"alias duplicates other name", existing1, []string{name2}, &NameExistsError{name2}},
+		{"alias duplicates other alias", existing1, []string{newAlias}, &NameUsedByAliasError{newAlias, existing2.Name}},
+		{"valid new alias", existing1, []string{"valid"}, nil},
+		{"empty alias", existing1, []string{""}, ErrEmptyAlias},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.tName, func(t *testing.T) {
+			got := ValidateAliases(testCtx, tt.studio.ID, tt.aliases, db.Studio)
+			assert.Equal(t, tt.want, got)
+		})
+	}
+}
diff --git a/pkg/tag/validate.go b/pkg/tag/validate.go
index 966cec945..abc260b5e 100644
--- a/pkg/tag/validate.go
+++ b/pkg/tag/validate.go
@@ -69,7 +69,9 @@ func ValidateUpdate(ctx context.Context, id int, partial models.TagPartial, qb m
 			return err
 		}
 
-		if err := EnsureAliasesUnique(ctx, id, partial.Aliases.Apply(existing.Aliases.List()), qb); err != nil {
+		newAliases := partial.Aliases.Apply(existing.Aliases.List())
+
+		if err := EnsureAliasesUnique(ctx, id, newAliases, qb); err != nil {
 			return err
 		}
 	}
diff --git a/pkg/tag/validate_test.go b/pkg/tag/validate_test.go
new file mode 100644
index 000000000..539086a6d
--- /dev/null
+++ b/pkg/tag/validate_test.go
@@ -0,0 +1,86 @@
+package tag
+
+import (
+	"testing"
+
+	"github.com/stashapp/stash/pkg/models"
+	"github.com/stashapp/stash/pkg/models/mocks"
+	"github.com/stretchr/testify/assert"
+)
+
+func nameFilter(n string) *models.TagFilterType {
+	return &models.TagFilterType{
+		Name: &models.StringCriterionInput{
+			Value:    n,
+			Modifier: models.CriterionModifierEquals,
+		},
+	}
+}
+
+func aliasFilter(n string) *models.TagFilterType {
+	return &models.TagFilterType{
+		Aliases: &models.StringCriterionInput{
+			Value:    n,
+			Modifier: models.CriterionModifierEquals,
+		},
+	}
+}
+
+func TestEnsureAliasesUnique(t *testing.T) {
+	db := mocks.NewDatabase()
+
+	const (
+		name1    = "name 1"
+		name2    = "name 2"
+		alias1   = "alias 1"
+		newAlias = "new alias"
+	)
+
+	existing2 := models.Tag{
+		ID:   2,
+		Name: name2,
+	}
+
+	pp := 1
+	findFilter := &models.FindFilterType{
+		PerPage: &pp,
+	}
+
+	// name1 matches existing1 name - ok
+	// EnsureAliasesUnique calls EnsureTagNameUnique.
+	// EnsureTagNameUnique calls ByName then ByAlias.
+
+	// Case 1: valid alias
+	// ByName "alias 1" -> nil
+	// ByAlias "alias 1" -> nil
+	db.Tag.On("Query", testCtx, nameFilter(alias1), findFilter).Return(nil, 0, nil)
+	db.Tag.On("Query", testCtx, aliasFilter(alias1), findFilter).Return(nil, 0, nil)
+
+	// Case 2: alias duplicates existing2 name
+	// ByName "name 2" -> existing2
+	db.Tag.On("Query", testCtx, nameFilter(name2), findFilter).Return([]*models.Tag{&existing2}, 1, nil)
+
+	// Case 3: alias duplicates existing2 alias
+	// ByName "new alias" -> nil
+	// ByAlias "new alias" -> existing2
+	db.Tag.On("Query", testCtx, nameFilter(newAlias), findFilter).Return(nil, 0, nil)
+	db.Tag.On("Query", testCtx, aliasFilter(newAlias), findFilter).Return([]*models.Tag{&existing2}, 1, nil)
+
+	tests := []struct {
+		tName   string
+		id      int
+		aliases []string
+		want    error
+	}{
+		{"valid alias", 1, []string{alias1}, nil},
+		{"alias duplicates other name", 1, []string{name2}, &NameExistsError{name2}},
+		{"alias duplicates other alias", 1, []string{newAlias}, &NameUsedByAliasError{newAlias, existing2.Name}},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.tName, func(t *testing.T) {
+			got := EnsureAliasesUnique(testCtx, tt.id, tt.aliases, db.Tag)
+			assert.Equal(t, tt.want, got)
+		})
+	}
+}
diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
index 7bb8d399a..0e769edf9 100644
--- a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
@@ -44,7 +44,7 @@ import {
   yupInputNumber,
   yupInputEnum,
   yupDateString,
-  yupUniqueAliases,
+  yupRequiredStringArray,
   yupUniqueStringList,
 } from "src/utils/yup";
 import { useTagsEdit } from "src/hooks/tagsEdit";
@@ -110,7 +110,7 @@ export const PerformerEditPanel: React.FC<IPerformerDetails> = ({
   const schema = yup.object({
     name: yup.string().required(),
     disambiguation: yup.string().ensure(),
-    alias_list: yupUniqueAliases(intl, "name"),
+    alias_list: yupRequiredStringArray(intl).defined(),
     gender: yupInputEnum(GQL.GenderEnum).nullable().defined(),
     birthdate: yupDateString(intl),
     death_date: yupDateString(intl),
diff --git a/ui/v2.5/src/components/Studios/StudioDetails/StudioEditPanel.tsx b/ui/v2.5/src/components/Studios/StudioDetails/StudioEditPanel.tsx
index a45471b26..f887e5403 100644
--- a/ui/v2.5/src/components/Studios/StudioDetails/StudioEditPanel.tsx
+++ b/ui/v2.5/src/components/Studios/StudioDetails/StudioEditPanel.tsx
@@ -16,7 +16,7 @@ import { useToast } from "src/hooks/Toast";
 import { useConfigurationContext } from "src/hooks/Config";
 import { handleUnsavedChanges } from "src/utils/navigation";
 import { formikUtils } from "src/utils/form";
-import { yupFormikValidate, yupUniqueAliases } from "src/utils/yup";
+import { yupFormikValidate, yupRequiredStringArray } from "src/utils/yup";
 import { Studio, StudioSelect } from "../StudioSelect";
 import { useTagsEdit } from "src/hooks/tagsEdit";
 import { Icon } from "src/components/Shared/Icon";
@@ -58,7 +58,7 @@ export const StudioEditPanel: React.FC<IStudioEditPanel> = ({
     urls: yup.array(yup.string().required()).defined(),
     details: yup.string().ensure(),
     parent_id: yup.string().required().nullable(),
-    aliases: yupUniqueAliases(intl, "name"),
+    aliases: yupRequiredStringArray(intl).defined(),
     tag_ids: yup.array(yup.string().required()).defined(),
     ignore_auto_tag: yup.boolean().defined(),
     stash_ids: yup.mixed<GQL.StashIdInput[]>().defined(),
diff --git a/ui/v2.5/src/components/Tags/TagDetails/TagEditPanel.tsx b/ui/v2.5/src/components/Tags/TagDetails/TagEditPanel.tsx
index 077300788..22c99b80e 100644
--- a/ui/v2.5/src/components/Tags/TagDetails/TagEditPanel.tsx
+++ b/ui/v2.5/src/components/Tags/TagDetails/TagEditPanel.tsx
@@ -15,7 +15,7 @@ import { useToast } from "src/hooks/Toast";
 import { useConfigurationContext } from "src/hooks/Config";
 import { handleUnsavedChanges } from "src/utils/navigation";
 import { formikUtils } from "src/utils/form";
-import { yupFormikValidate, yupUniqueAliases } from "src/utils/yup";
+import { yupFormikValidate, yupRequiredStringArray } from "src/utils/yup";
 import { addUpdateStashID, getStashIDs } from "src/utils/stashIds";
 import { Tag, TagSelect } from "../TagSelect";
 import { Icon } from "src/components/Shared/Icon";
@@ -56,7 +56,7 @@ export const TagEditPanel: React.FC<ITagEditPanel> = ({
   const schema = yup.object({
     name: yup.string().required(),
     sort_name: yup.string().ensure(),
-    aliases: yupUniqueAliases(intl, "name"),
+    aliases: yupRequiredStringArray(intl).defined(),
     description: yup.string().ensure(),
     parent_ids: yup.array(yup.string().required()).defined(),
     child_ids: yup.array(yup.string().required()).defined(),
diff --git a/ui/v2.5/src/utils/yup.ts b/ui/v2.5/src/utils/yup.ts
index 5ae8123df..a9c4f69e1 100644
--- a/ui/v2.5/src/utils/yup.ts
+++ b/ui/v2.5/src/utils/yup.ts
@@ -92,45 +92,6 @@ export function yupUniqueStringList(intl: IntlShape) {
     });
 }
 
-export function yupUniqueAliases(intl: IntlShape, nameField: string) {
-  return yupRequiredStringArray(intl)
-    .defined()
-    .test({
-      name: "unique",
-      test(value) {
-        const aliases = [this.parent[nameField].toLowerCase()];
-        const dupes: number[] = [];
-        for (let i = 0; i < value.length; i++) {
-          const s = value[i].toLowerCase();
-          if (aliases.includes(s)) {
-            dupes.push(i);
-          } else {
-            aliases.push(s);
-          }
-        }
-        if (dupes.length === 0) return true;
-
-        const msg = yup.ValidationError.formatError(
-          intl.formatMessage({ id: "validation.unique" }),
-          {
-            label: this.schema.spec.label,
-            path: this.path,
-          }
-        );
-        const errors = dupes.map(
-          (i) =>
-            new yup.ValidationError(
-              msg,
-              value[i],
-              `${this.path}["${i}"]`,
-              "unique"
-            )
-        );
-        return new yup.ValidationError(errors, value, this.path, "unique");
-      },
-    });
-}
-
 export function yupDateString(intl: IntlShape) {
   return yup
     .string()

From 88eb46380c1f05ecd1e8cac632d503b6b1a5070f Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Wed, 4 Feb 2026 11:07:51 +1100
Subject: [PATCH 276/405] Refactor scraper package (#6495)

* Remove reflection from mapped value processing
* AI generated unit tests
* Move mappedConfig to separate file
* Rename group to configScraper
* Separate mapped post-processing code into separate file
* Update test after group rename
* Check map entry when returning scraper
* Refactor config into definition
* Support single string for string slice translation
* Rename config.go to definition.go
* Rename configScraper to definedScraper
* Rename config_scraper.go to defined_scraper.go
---
 pkg/scraper/action.go                        |  112 +-
 pkg/scraper/cache.go                         |    2 +-
 pkg/scraper/cookies.go                       |    4 +-
 pkg/scraper/{group.go => defined_scraper.go} |   48 +-
 pkg/scraper/{config.go => definition.go}     |   77 +-
 pkg/scraper/freeones.go                      |    2 +-
 pkg/scraper/json.go                          |  133 +--
 pkg/scraper/json_test.go                     |    2 +-
 pkg/scraper/mapped.go                        | 1080 +-----------------
 pkg/scraper/mapped_config.go                 |  537 +++++++++
 pkg/scraper/mapped_postprocessing.go         |  333 ++++++
 pkg/scraper/mapped_result.go                 |  276 +++++
 pkg/scraper/mapped_result_test.go            |  908 +++++++++++++++
 pkg/scraper/mapped_test.go                   |    2 +-
 pkg/scraper/query_url.go                     |    2 +-
 pkg/scraper/script.go                        |  120 +-
 pkg/scraper/stash.go                         |    6 +-
 pkg/scraper/url.go                           |    8 +-
 pkg/scraper/xpath.go                         |  131 +--
 pkg/scraper/xpath_test.go                    |   16 +-
 20 files changed, 2475 insertions(+), 1324 deletions(-)
 rename pkg/scraper/{group.go => defined_scraper.go} (56%)
 rename pkg/scraper/{config.go => definition.go} (80%)
 create mode 100644 pkg/scraper/mapped_config.go
 create mode 100644 pkg/scraper/mapped_postprocessing.go
 create mode 100644 pkg/scraper/mapped_result.go
 create mode 100644 pkg/scraper/mapped_result_test.go

diff --git a/pkg/scraper/action.go b/pkg/scraper/action.go
index 74bbca415..cd31fbe72 100644
--- a/pkg/scraper/action.go
+++ b/pkg/scraper/action.go
@@ -24,9 +24,85 @@ func (e scraperAction) IsValid() bool {
 	return false
 }
 
-type scraperActionImpl interface {
+type urlScraperActionImpl interface {
 	scrapeByURL(ctx context.Context, url string, ty ScrapeContentType) (ScrapedContent, error)
+}
+
+func (c Definition) getURLScraper(def ByURLDefinition, client *http.Client, globalConfig GlobalConfig) urlScraperActionImpl {
+	switch def.Action {
+	case scraperActionScript:
+		return &scriptURLScraper{
+			scriptScraper: scriptScraper{
+				definition:   c,
+				globalConfig: globalConfig,
+			},
+			definition: def,
+		}
+	case scraperActionStash:
+		return newStashScraper(client, c, globalConfig)
+	case scraperActionXPath:
+		return &xpathURLScraper{
+			xpathScraper: xpathScraper{
+				definition:   c,
+				globalConfig: globalConfig,
+				client:       client,
+			},
+			definition: def,
+		}
+	case scraperActionJson:
+		return &jsonURLScraper{
+			jsonScraper: jsonScraper{
+				definition:   c,
+				globalConfig: globalConfig,
+				client:       client,
+			},
+			definition: def,
+		}
+	}
+
+	panic("unknown scraper action: " + def.Action)
+}
+
+type nameScraperActionImpl interface {
 	scrapeByName(ctx context.Context, name string, ty ScrapeContentType) ([]ScrapedContent, error)
+}
+
+func (c Definition) getNameScraper(def ByNameDefinition, client *http.Client, globalConfig GlobalConfig) nameScraperActionImpl {
+	switch def.Action {
+	case scraperActionScript:
+		return &scriptNameScraper{
+			scriptScraper: scriptScraper{
+				definition:   c,
+				globalConfig: globalConfig,
+			},
+			definition: def,
+		}
+	case scraperActionStash:
+		return newStashScraper(client, c, globalConfig)
+	case scraperActionXPath:
+		return &xpathNameScraper{
+			xpathScraper: xpathScraper{
+				definition:   c,
+				globalConfig: globalConfig,
+				client:       client,
+			},
+			definition: def,
+		}
+	case scraperActionJson:
+		return &jsonNameScraper{
+			jsonScraper: jsonScraper{
+				definition:   c,
+				globalConfig: globalConfig,
+				client:       client,
+			},
+			definition: def,
+		}
+	}
+
+	panic("unknown scraper action: " + def.Action)
+}
+
+type fragmentScraperActionImpl interface {
 	scrapeByFragment(ctx context.Context, input Input) (ScrapedContent, error)
 
 	scrapeSceneByScene(ctx context.Context, scene *models.Scene) (*models.ScrapedScene, error)
@@ -34,17 +110,37 @@ type scraperActionImpl interface {
 	scrapeImageByImage(ctx context.Context, image *models.Image) (*models.ScrapedImage, error)
 }
 
-func (c config) getScraper(scraper scraperTypeConfig, client *http.Client, globalConfig GlobalConfig) scraperActionImpl {
-	switch scraper.Action {
+func (c Definition) getFragmentScraper(actionDef ByFragmentDefinition, client *http.Client, globalConfig GlobalConfig) fragmentScraperActionImpl {
+	switch actionDef.Action {
 	case scraperActionScript:
-		return newScriptScraper(scraper, c, globalConfig)
+		return &scriptFragmentScraper{
+			scriptScraper: scriptScraper{
+				definition:   c,
+				globalConfig: globalConfig,
+			},
+			definition: actionDef,
+		}
 	case scraperActionStash:
-		return newStashScraper(scraper, client, c, globalConfig)
+		return newStashScraper(client, c, globalConfig)
 	case scraperActionXPath:
-		return newXpathScraper(scraper, client, c, globalConfig)
+		return &xpathFragmentScraper{
+			xpathScraper: xpathScraper{
+				definition:   c,
+				globalConfig: globalConfig,
+				client:       client,
+			},
+			definition: actionDef,
+		}
 	case scraperActionJson:
-		return newJsonScraper(scraper, client, c, globalConfig)
+		return &jsonFragmentScraper{
+			jsonScraper: jsonScraper{
+				definition:   c,
+				globalConfig: globalConfig,
+				client:       client,
+			},
+			definition: actionDef,
+		}
 	}
 
-	panic("unknown scraper action: " + scraper.Action)
+	panic("unknown scraper action: " + actionDef.Action)
 }
diff --git a/pkg/scraper/cache.go b/pkg/scraper/cache.go
index 5cc51ac54..6aeb95fcf 100644
--- a/pkg/scraper/cache.go
+++ b/pkg/scraper/cache.go
@@ -182,7 +182,7 @@ func (c *Cache) ReloadScrapers() {
 			if err != nil {
 				logger.Errorf("Error loading scraper %s: %v", fp, err)
 			} else {
-				scraper := newGroupScraper(*conf, c.globalConfig)
+				scraper := scraperFromDefinition(*conf, c.globalConfig)
 				scrapers[scraper.spec().ID] = scraper
 			}
 		}
diff --git a/pkg/scraper/cookies.go b/pkg/scraper/cookies.go
index 0a2877b7b..c76dae037 100644
--- a/pkg/scraper/cookies.go
+++ b/pkg/scraper/cookies.go
@@ -18,7 +18,7 @@ import (
 )
 
 // jar constructs a cookie jar from a configuration
-func (c config) jar() (*cookiejar.Jar, error) {
+func (c Definition) jar() (*cookiejar.Jar, error) {
 	opts := c.DriverOptions
 	jar, err := cookiejar.New(&cookiejar.Options{
 		PublicSuffixList: publicsuffix.List,
@@ -77,7 +77,7 @@ func randomSequence(n int) string {
 }
 
 // printCookies prints all cookies from the given cookie jar
-func printCookies(jar *cookiejar.Jar, scraperConfig config, msg string) {
+func printCookies(jar *cookiejar.Jar, scraperConfig Definition, msg string) {
 	driverOptions := scraperConfig.DriverOptions
 	if driverOptions != nil && !driverOptions.UseCDP {
 		var foundURLs []*url.URL
diff --git a/pkg/scraper/group.go b/pkg/scraper/defined_scraper.go
similarity index 56%
rename from pkg/scraper/group.go
rename to pkg/scraper/defined_scraper.go
index 43fd2a37b..0287101d0 100644
--- a/pkg/scraper/group.go
+++ b/pkg/scraper/defined_scraper.go
@@ -8,25 +8,26 @@ import (
 	"github.com/stashapp/stash/pkg/models"
 )
 
-type group struct {
-	config config
+// definedScraper implements the scraper interface using a Definition object.
+type definedScraper struct {
+	config Definition
 
 	globalConf GlobalConfig
 }
 
-func newGroupScraper(c config, globalConfig GlobalConfig) scraper {
-	return group{
+func scraperFromDefinition(c Definition, globalConfig GlobalConfig) definedScraper {
+	return definedScraper{
 		config:     c,
 		globalConf: globalConfig,
 	}
 }
 
-func (g group) spec() Scraper {
+func (g definedScraper) spec() Scraper {
 	return g.config.spec()
 }
 
 // fragmentScraper finds an appropriate fragment scraper based on input.
-func (g group) fragmentScraper(input Input) *scraperTypeConfig {
+func (g definedScraper) fragmentScraper(input Input) *ByFragmentDefinition {
 	switch {
 	case input.Performer != nil:
 		return g.config.PerformerByFragment
@@ -43,7 +44,7 @@ func (g group) fragmentScraper(input Input) *scraperTypeConfig {
 	return nil
 }
 
-func (g group) viaFragment(ctx context.Context, client *http.Client, input Input) (ScrapedContent, error) {
+func (g definedScraper) viaFragment(ctx context.Context, client *http.Client, input Input) (ScrapedContent, error) {
 	stc := g.fragmentScraper(input)
 	if stc == nil {
 		// If there's no performer fragment scraper in the group, we try to use
@@ -56,38 +57,38 @@ func (g group) viaFragment(ctx context.Context, client *http.Client, input Input
 		return nil, ErrNotSupported
 	}
 
-	s := g.config.getScraper(*stc, client, g.globalConf)
+	s := g.config.getFragmentScraper(*stc, client, g.globalConf)
 	return s.scrapeByFragment(ctx, input)
 }
 
-func (g group) viaScene(ctx context.Context, client *http.Client, scene *models.Scene) (*models.ScrapedScene, error) {
+func (g definedScraper) viaScene(ctx context.Context, client *http.Client, scene *models.Scene) (*models.ScrapedScene, error) {
 	if g.config.SceneByFragment == nil {
 		return nil, ErrNotSupported
 	}
 
-	s := g.config.getScraper(*g.config.SceneByFragment, client, g.globalConf)
+	s := g.config.getFragmentScraper(*g.config.SceneByFragment, client, g.globalConf)
 	return s.scrapeSceneByScene(ctx, scene)
 }
 
-func (g group) viaGallery(ctx context.Context, client *http.Client, gallery *models.Gallery) (*models.ScrapedGallery, error) {
+func (g definedScraper) viaGallery(ctx context.Context, client *http.Client, gallery *models.Gallery) (*models.ScrapedGallery, error) {
 	if g.config.GalleryByFragment == nil {
 		return nil, ErrNotSupported
 	}
 
-	s := g.config.getScraper(*g.config.GalleryByFragment, client, g.globalConf)
+	s := g.config.getFragmentScraper(*g.config.GalleryByFragment, client, g.globalConf)
 	return s.scrapeGalleryByGallery(ctx, gallery)
 }
 
-func (g group) viaImage(ctx context.Context, client *http.Client, gallery *models.Image) (*models.ScrapedImage, error) {
+func (g definedScraper) viaImage(ctx context.Context, client *http.Client, gallery *models.Image) (*models.ScrapedImage, error) {
 	if g.config.ImageByFragment == nil {
 		return nil, ErrNotSupported
 	}
 
-	s := g.config.getScraper(*g.config.ImageByFragment, client, g.globalConf)
+	s := g.config.getFragmentScraper(*g.config.ImageByFragment, client, g.globalConf)
 	return s.scrapeImageByImage(ctx, gallery)
 }
 
-func loadUrlCandidates(c config, ty ScrapeContentType) []*scrapeByURLConfig {
+func loadUrlCandidates(c Definition, ty ScrapeContentType) []*ByURLDefinition {
 	switch ty {
 	case ScrapeContentTypePerformer:
 		return c.PerformerByURL
@@ -104,12 +105,13 @@ func loadUrlCandidates(c config, ty ScrapeContentType) []*scrapeByURLConfig {
 	panic("loadUrlCandidates: unreachable")
 }
 
-func (g group) viaURL(ctx context.Context, client *http.Client, url string, ty ScrapeContentType) (ScrapedContent, error) {
+func (g definedScraper) viaURL(ctx context.Context, client *http.Client, url string, ty ScrapeContentType) (ScrapedContent, error) {
 	candidates := loadUrlCandidates(g.config, ty)
 	for _, scraper := range candidates {
 		if scraper.matchesURL(url) {
-			s := g.config.getScraper(scraper.scraperTypeConfig, client, g.globalConf)
-			ret, err := s.scrapeByURL(ctx, url, ty)
+			u := replaceURL(url, *scraper) // allow a URL Replace for url-queries
+			s := g.config.getURLScraper(*scraper, client, g.globalConf)
+			ret, err := s.scrapeByURL(ctx, u, ty)
 			if err != nil {
 				return nil, err
 			}
@@ -123,31 +125,31 @@ func (g group) viaURL(ctx context.Context, client *http.Client, url string, ty S
 	return nil, nil
 }
 
-func (g group) viaName(ctx context.Context, client *http.Client, name string, ty ScrapeContentType) ([]ScrapedContent, error) {
+func (g definedScraper) viaName(ctx context.Context, client *http.Client, name string, ty ScrapeContentType) ([]ScrapedContent, error) {
 	switch ty {
 	case ScrapeContentTypePerformer:
 		if g.config.PerformerByName == nil {
 			break
 		}
 
-		s := g.config.getScraper(*g.config.PerformerByName, client, g.globalConf)
+		s := g.config.getNameScraper(*g.config.PerformerByName, client, g.globalConf)
 		return s.scrapeByName(ctx, name, ty)
 	case ScrapeContentTypeScene:
 		if g.config.SceneByName == nil {
 			break
 		}
 
-		s := g.config.getScraper(*g.config.SceneByName, client, g.globalConf)
+		s := g.config.getNameScraper(*g.config.SceneByName, client, g.globalConf)
 		return s.scrapeByName(ctx, name, ty)
 	}
 
 	return nil, fmt.Errorf("%w: cannot load %v by name", ErrNotSupported, ty)
 }
 
-func (g group) supports(ty ScrapeContentType) bool {
+func (g definedScraper) supports(ty ScrapeContentType) bool {
 	return g.config.supports(ty)
 }
 
-func (g group) supportsURL(url string, ty ScrapeContentType) bool {
+func (g definedScraper) supportsURL(url string, ty ScrapeContentType) bool {
 	return g.config.matchesURL(url, ty)
 }
diff --git a/pkg/scraper/config.go b/pkg/scraper/definition.go
similarity index 80%
rename from pkg/scraper/config.go
rename to pkg/scraper/definition.go
index 5775dc97c..03ba4d75b 100644
--- a/pkg/scraper/config.go
+++ b/pkg/scraper/definition.go
@@ -11,7 +11,8 @@ import (
 	"gopkg.in/yaml.v2"
 )
 
-type config struct {
+// Definition represents a scraper definition (typically) loaded from a YAML configuration file.
+type Definition struct {
 	ID   string
 	path string
 
@@ -19,43 +20,43 @@ type config struct {
 	Name string `yaml:"name"`
 
 	// Configuration for querying performers by name
-	PerformerByName *scraperTypeConfig `yaml:"performerByName"`
+	PerformerByName *ByNameDefinition `yaml:"performerByName"`
 
 	// Configuration for querying performers by a Performer fragment
-	PerformerByFragment *scraperTypeConfig `yaml:"performerByFragment"`
+	PerformerByFragment *ByFragmentDefinition `yaml:"performerByFragment"`
 
 	// Configuration for querying a performer by a URL
-	PerformerByURL []*scrapeByURLConfig `yaml:"performerByURL"`
+	PerformerByURL []*ByURLDefinition `yaml:"performerByURL"`
 
 	// Configuration for querying scenes by a Scene fragment
-	SceneByFragment *scraperTypeConfig `yaml:"sceneByFragment"`
+	SceneByFragment *ByFragmentDefinition `yaml:"sceneByFragment"`
 
 	// Configuration for querying gallery by a Gallery fragment
-	GalleryByFragment *scraperTypeConfig `yaml:"galleryByFragment"`
+	GalleryByFragment *ByFragmentDefinition `yaml:"galleryByFragment"`
 
 	// Configuration for querying scenes by name
-	SceneByName *scraperTypeConfig `yaml:"sceneByName"`
+	SceneByName *ByNameDefinition `yaml:"sceneByName"`
 
 	// Configuration for querying scenes by query fragment
-	SceneByQueryFragment *scraperTypeConfig `yaml:"sceneByQueryFragment"`
+	SceneByQueryFragment *ByFragmentDefinition `yaml:"sceneByQueryFragment"`
 
 	// Configuration for querying a scene by a URL
-	SceneByURL []*scrapeByURLConfig `yaml:"sceneByURL"`
+	SceneByURL []*ByURLDefinition `yaml:"sceneByURL"`
 
 	// Configuration for querying a gallery by a URL
-	GalleryByURL []*scrapeByURLConfig `yaml:"galleryByURL"`
+	GalleryByURL []*ByURLDefinition `yaml:"galleryByURL"`
 
 	// Configuration for querying an image by a URL
-	ImageByURL []*scrapeByURLConfig `yaml:"imageByURL"`
+	ImageByURL []*ByURLDefinition `yaml:"imageByURL"`
 
 	// Configuration for querying image by an Image fragment
-	ImageByFragment *scraperTypeConfig `yaml:"imageByFragment"`
+	ImageByFragment *ByFragmentDefinition `yaml:"imageByFragment"`
 
 	// Configuration for querying a movie by a URL - deprecated, use GroupByURL
-	MovieByURL []*scrapeByURLConfig `yaml:"movieByURL"`
+	MovieByURL []*ByURLDefinition `yaml:"movieByURL"`
 
 	// Configuration for querying a group by a URL
-	GroupByURL []*scrapeByURLConfig `yaml:"groupByURL"`
+	GroupByURL []*ByURLDefinition `yaml:"groupByURL"`
 
 	// Scraper debugging options
 	DebugOptions *scraperDebugOptions `yaml:"debug"`
@@ -73,7 +74,7 @@ type config struct {
 	DriverOptions *scraperDriverOptions `yaml:"driver"`
 }
 
-func (c config) validate() error {
+func (c Definition) validate() error {
 	if strings.TrimSpace(c.Name) == "" {
 		return errors.New("name must not be empty")
 	}
@@ -126,17 +127,13 @@ type stashServer struct {
 	ApiKey string `yaml:"apiKey"`
 }
 
-type scraperTypeConfig struct {
+type ActionDefinition struct {
 	Action  scraperAction `yaml:"action"`
 	Script  []string      `yaml:"script,flow"`
 	Scraper string        `yaml:"scraper"`
-
-	// for xpath name scraper only
-	QueryURL             string               `yaml:"queryURL"`
-	QueryURLReplacements queryURLReplacements `yaml:"queryURLReplace"`
 }
 
-func (c scraperTypeConfig) validate() error {
+func (c ActionDefinition) validate() error {
 	if !c.Action.IsValid() {
 		return fmt.Errorf("%s is not a valid scraper action", c.Action)
 	}
@@ -148,20 +145,22 @@ func (c scraperTypeConfig) validate() error {
 	return nil
 }
 
-type scrapeByURLConfig struct {
-	scraperTypeConfig `yaml:",inline"`
-	URL               []string `yaml:"url,flow"`
+type ByURLDefinition struct {
+	ActionDefinition     `yaml:",inline"`
+	URL                  []string             `yaml:"url,flow"`
+	QueryURL             string               `yaml:"queryURL"`
+	QueryURLReplacements queryURLReplacements `yaml:"queryURLReplace"`
 }
 
-func (c scrapeByURLConfig) validate() error {
+func (c ByURLDefinition) validate() error {
 	if len(c.URL) == 0 {
 		return errors.New("url is mandatory for scrape by url scrapers")
 	}
 
-	return c.scraperTypeConfig.validate()
+	return c.ActionDefinition.validate()
 }
 
-func (c scrapeByURLConfig) matchesURL(url string) bool {
+func (c ByURLDefinition) matchesURL(url string) bool {
 	for _, thisURL := range c.URL {
 		if strings.Contains(url, thisURL) {
 			return true
@@ -171,6 +170,18 @@ func (c scrapeByURLConfig) matchesURL(url string) bool {
 	return false
 }
 
+type ByFragmentDefinition struct {
+	ActionDefinition `yaml:",inline"`
+
+	QueryURL             string               `yaml:"queryURL"`
+	QueryURLReplacements queryURLReplacements `yaml:"queryURLReplace"`
+}
+
+type ByNameDefinition struct {
+	ActionDefinition `yaml:",inline"`
+	QueryURL         string `yaml:"queryURL"`
+}
+
 type scraperDebugOptions struct {
 	PrintHTML bool `yaml:"printHTML"`
 }
@@ -206,8 +217,8 @@ type scraperDriverOptions struct {
 	Headers []*header        `yaml:"headers"`
 }
 
-func loadConfigFromYAML(id string, reader io.Reader) (*config, error) {
-	ret := &config{}
+func loadConfigFromYAML(id string, reader io.Reader) (*Definition, error) {
+	ret := &Definition{}
 
 	parser := yaml.NewDecoder(reader)
 	parser.SetStrict(true)
@@ -225,7 +236,7 @@ func loadConfigFromYAML(id string, reader io.Reader) (*config, error) {
 	return ret, nil
 }
 
-func loadConfigFromYAMLFile(path string) (*config, error) {
+func loadConfigFromYAMLFile(path string) (*Definition, error) {
 	file, err := os.Open(path)
 	if err != nil {
 		return nil, err
@@ -246,7 +257,7 @@ func loadConfigFromYAMLFile(path string) (*config, error) {
 	return ret, nil
 }
 
-func (c config) spec() Scraper {
+func (c Definition) spec() Scraper {
 	ret := Scraper{
 		ID:   c.ID,
 		Name: c.Name,
@@ -334,7 +345,7 @@ func (c config) spec() Scraper {
 	return ret
 }
 
-func (c config) supports(ty ScrapeContentType) bool {
+func (c Definition) supports(ty ScrapeContentType) bool {
 	switch ty {
 	case ScrapeContentTypePerformer:
 		return c.PerformerByName != nil || c.PerformerByFragment != nil || len(c.PerformerByURL) > 0
@@ -351,7 +362,7 @@ func (c config) supports(ty ScrapeContentType) bool {
 	panic("Unhandled ScrapeContentType")
 }
 
-func (c config) matchesURL(url string, ty ScrapeContentType) bool {
+func (c Definition) matchesURL(url string, ty ScrapeContentType) bool {
 	switch ty {
 	case ScrapeContentTypePerformer:
 		for _, scraper := range c.PerformerByURL {
diff --git a/pkg/scraper/freeones.go b/pkg/scraper/freeones.go
index 96caf2fec..e78488b24 100644
--- a/pkg/scraper/freeones.go
+++ b/pkg/scraper/freeones.go
@@ -139,5 +139,5 @@ func getFreeonesScraper(globalConfig GlobalConfig) scraper {
 		logger.Fatalf("Error loading builtin freeones scraper: %s", err.Error())
 	}
 
-	return newGroupScraper(*c, globalConfig)
+	return scraperFromDefinition(*c, globalConfig)
 }
diff --git a/pkg/scraper/json.go b/pkg/scraper/json.go
index 9f479f1c2..1dcb887da 100644
--- a/pkg/scraper/json.go
+++ b/pkg/scraper/json.go
@@ -15,43 +15,22 @@ import (
 )
 
 type jsonScraper struct {
-	scraper      scraperTypeConfig
-	config       config
+	definition   Definition
 	globalConfig GlobalConfig
 	client       *http.Client
 }
 
-func newJsonScraper(scraper scraperTypeConfig, client *http.Client, config config, globalConfig GlobalConfig) *jsonScraper {
-	return &jsonScraper{
-		scraper:      scraper,
-		config:       config,
-		client:       client,
-		globalConfig: globalConfig,
-	}
-}
-
-func (s *jsonScraper) getJsonScraper() *mappedScraper {
-	return s.config.JsonScrapers[s.scraper.Scraper]
-}
-
-func (s *jsonScraper) scrapeURL(ctx context.Context, url string) (string, *mappedScraper, error) {
-	scraper := s.getJsonScraper()
-
-	if scraper == nil {
-		return "", nil, errors.New("json scraper with name " + s.scraper.Scraper + " not found in config")
+func (s *jsonScraper) getJsonScraper(name string) (*mappedScraper, error) {
+	ret, ok := s.definition.JsonScrapers[name]
+	if !ok {
+		return nil, fmt.Errorf("json scraper with name %s not found in config", name)
 	}
 
-	doc, err := s.loadURL(ctx, url)
-
-	if err != nil {
-		return "", nil, err
-	}
-
-	return doc, scraper, nil
+	return &ret, nil
 }
 
 func (s *jsonScraper) loadURL(ctx context.Context, url string) (string, error) {
-	r, err := loadURL(ctx, url, s.client, s.config, s.globalConfig)
+	r, err := loadURL(ctx, url, s.client, s.definition, s.globalConfig)
 	if err != nil {
 		return "", err
 	}
@@ -66,21 +45,30 @@ func (s *jsonScraper) loadURL(ctx context.Context, url string) (string, error) {
 		return "", errors.New("not valid json")
 	}
 
-	if s.config.DebugOptions != nil && s.config.DebugOptions.PrintHTML {
+	if s.definition.DebugOptions != nil && s.definition.DebugOptions.PrintHTML {
 		logger.Infof("loadURL (%s) response: \n%s", url, docStr)
 	}
 
 	return docStr, err
 }
 
-func (s *jsonScraper) scrapeByURL(ctx context.Context, url string, ty ScrapeContentType) (ScrapedContent, error) {
-	u := replaceURL(url, s.scraper) // allow a URL Replace for url-queries
-	doc, scraper, err := s.scrapeURL(ctx, u)
+type jsonURLScraper struct {
+	jsonScraper
+	definition ByURLDefinition
+}
+
+func (s *jsonURLScraper) scrapeByURL(ctx context.Context, url string, ty ScrapeContentType) (ScrapedContent, error) {
+	scraper, err := s.getJsonScraper(s.definition.Scraper)
 	if err != nil {
 		return nil, err
 	}
 
-	q := s.getJsonQuery(doc, u)
+	doc, err := s.loadURL(ctx, url)
+	if err != nil {
+		return nil, err
+	}
+
+	q := s.getJsonQuery(doc, url)
 	// if these just return the return values from scraper.scrape* functions then
 	// it ends up returning ScrapedContent(nil) rather than nil
 	switch ty {
@@ -119,11 +107,15 @@ func (s *jsonScraper) scrapeByURL(ctx context.Context, url string, ty ScrapeCont
 	return nil, ErrNotSupported
 }
 
-func (s *jsonScraper) scrapeByName(ctx context.Context, name string, ty ScrapeContentType) ([]ScrapedContent, error) {
-	scraper := s.getJsonScraper()
+type jsonNameScraper struct {
+	jsonScraper
+	definition ByNameDefinition
+}
 
-	if scraper == nil {
-		return nil, fmt.Errorf("%w: name %v", ErrNotFound, s.scraper.Scraper)
+func (s *jsonNameScraper) scrapeByName(ctx context.Context, name string, ty ScrapeContentType) ([]ScrapedContent, error) {
+	scraper, err := s.getJsonScraper(s.definition.Scraper)
+	if err != nil {
+		return nil, err
 	}
 
 	const placeholder = "{}"
@@ -131,7 +123,7 @@ func (s *jsonScraper) scrapeByName(ctx context.Context, name string, ty ScrapeCo
 	// replace the placeholder string with the URL-escaped name
 	escapedName := url.QueryEscape(name)
 
-	url := s.scraper.QueryURL
+	url := s.definition.QueryURL
 	url = strings.ReplaceAll(url, placeholder, escapedName)
 
 	doc, err := s.loadURL(ctx, url)
@@ -172,18 +164,22 @@ func (s *jsonScraper) scrapeByName(ctx context.Context, name string, ty ScrapeCo
 	return nil, ErrNotSupported
 }
 
-func (s *jsonScraper) scrapeSceneByScene(ctx context.Context, scene *models.Scene) (*models.ScrapedScene, error) {
+type jsonFragmentScraper struct {
+	jsonScraper
+	definition ByFragmentDefinition
+}
+
+func (s *jsonFragmentScraper) scrapeSceneByScene(ctx context.Context, scene *models.Scene) (*models.ScrapedScene, error) {
 	// construct the URL
 	queryURL := queryURLParametersFromScene(scene)
-	if s.scraper.QueryURLReplacements != nil {
-		queryURL.applyReplacements(s.scraper.QueryURLReplacements)
+	if s.definition.QueryURLReplacements != nil {
+		queryURL.applyReplacements(s.definition.QueryURLReplacements)
 	}
-	url := queryURL.constructURL(s.scraper.QueryURL)
+	url := queryURL.constructURL(s.definition.QueryURL)
 
-	scraper := s.getJsonScraper()
-
-	if scraper == nil {
-		return nil, errors.New("json scraper with name " + s.scraper.Scraper + " not found in config")
+	scraper, err := s.getJsonScraper(s.definition.Scraper)
+	if err != nil {
+		return nil, err
 	}
 
 	doc, err := s.loadURL(ctx, url)
@@ -196,7 +192,7 @@ func (s *jsonScraper) scrapeSceneByScene(ctx context.Context, scene *models.Scen
 	return scraper.scrapeScene(ctx, q)
 }
 
-func (s *jsonScraper) scrapeByFragment(ctx context.Context, input Input) (ScrapedContent, error) {
+func (s *jsonFragmentScraper) scrapeByFragment(ctx context.Context, input Input) (ScrapedContent, error) {
 	switch {
 	case input.Gallery != nil:
 		return nil, fmt.Errorf("%w: cannot use a json scraper as a gallery fragment scraper", ErrNotSupported)
@@ -210,15 +206,14 @@ func (s *jsonScraper) scrapeByFragment(ctx context.Context, input Input) (Scrape
 
 	// construct the URL
 	queryURL := queryURLParametersFromScrapedScene(scene)
-	if s.scraper.QueryURLReplacements != nil {
-		queryURL.applyReplacements(s.scraper.QueryURLReplacements)
+	if s.definition.QueryURLReplacements != nil {
+		queryURL.applyReplacements(s.definition.QueryURLReplacements)
 	}
-	url := queryURL.constructURL(s.scraper.QueryURL)
+	url := queryURL.constructURL(s.definition.QueryURL)
 
-	scraper := s.getJsonScraper()
-
-	if scraper == nil {
-		return nil, errors.New("xpath scraper with name " + s.scraper.Scraper + " not found in config")
+	scraper, err := s.getJsonScraper(s.definition.Scraper)
+	if err != nil {
+		return nil, err
 	}
 
 	doc, err := s.loadURL(ctx, url)
@@ -231,18 +226,17 @@ func (s *jsonScraper) scrapeByFragment(ctx context.Context, input Input) (Scrape
 	return scraper.scrapeScene(ctx, q)
 }
 
-func (s *jsonScraper) scrapeImageByImage(ctx context.Context, image *models.Image) (*models.ScrapedImage, error) {
+func (s *jsonFragmentScraper) scrapeImageByImage(ctx context.Context, image *models.Image) (*models.ScrapedImage, error) {
 	// construct the URL
 	queryURL := queryURLParametersFromImage(image)
-	if s.scraper.QueryURLReplacements != nil {
-		queryURL.applyReplacements(s.scraper.QueryURLReplacements)
+	if s.definition.QueryURLReplacements != nil {
+		queryURL.applyReplacements(s.definition.QueryURLReplacements)
 	}
-	url := queryURL.constructURL(s.scraper.QueryURL)
+	url := queryURL.constructURL(s.definition.QueryURL)
 
-	scraper := s.getJsonScraper()
-
-	if scraper == nil {
-		return nil, errors.New("json scraper with name " + s.scraper.Scraper + " not found in config")
+	scraper, err := s.getJsonScraper(s.definition.Scraper)
+	if err != nil {
+		return nil, err
 	}
 
 	doc, err := s.loadURL(ctx, url)
@@ -255,18 +249,17 @@ func (s *jsonScraper) scrapeImageByImage(ctx context.Context, image *models.Imag
 	return scraper.scrapeImage(ctx, q)
 }
 
-func (s *jsonScraper) scrapeGalleryByGallery(ctx context.Context, gallery *models.Gallery) (*models.ScrapedGallery, error) {
+func (s *jsonFragmentScraper) scrapeGalleryByGallery(ctx context.Context, gallery *models.Gallery) (*models.ScrapedGallery, error) {
 	// construct the URL
 	queryURL := queryURLParametersFromGallery(gallery)
-	if s.scraper.QueryURLReplacements != nil {
-		queryURL.applyReplacements(s.scraper.QueryURLReplacements)
+	if s.definition.QueryURLReplacements != nil {
+		queryURL.applyReplacements(s.definition.QueryURLReplacements)
 	}
-	url := queryURL.constructURL(s.scraper.QueryURL)
+	url := queryURL.constructURL(s.definition.QueryURL)
 
-	scraper := s.getJsonScraper()
-
-	if scraper == nil {
-		return nil, errors.New("json scraper with name " + s.scraper.Scraper + " not found in config")
+	scraper, err := s.getJsonScraper(s.definition.Scraper)
+	if err != nil {
+		return nil, err
 	}
 
 	doc, err := s.loadURL(ctx, url)
diff --git a/pkg/scraper/json_test.go b/pkg/scraper/json_test.go
index 249f17ad6..285c15489 100644
--- a/pkg/scraper/json_test.go
+++ b/pkg/scraper/json_test.go
@@ -68,7 +68,7 @@ jsonScrapers:
 }
 `
 
-	c := &config{}
+	c := &Definition{}
 	err := yaml.Unmarshal([]byte(yamlStr), &c)
 
 	if err != nil {
diff --git a/pkg/scraper/mapped.go b/pkg/scraper/mapped.go
index 3fac22ec3..d92415c61 100644
--- a/pkg/scraper/mapped.go
+++ b/pkg/scraper/mapped.go
@@ -2,22 +2,9 @@ package scraper
 
 import (
 	"context"
-	"errors"
-	"fmt"
-	"math"
-	"net/url"
-	"reflect"
-	"regexp"
-	"strconv"
-	"strings"
-	"time"
 
-	"gopkg.in/yaml.v2"
-
-	"github.com/stashapp/stash/pkg/javascript"
 	"github.com/stashapp/stash/pkg/logger"
 	"github.com/stashapp/stash/pkg/models"
-	"github.com/stashapp/stash/pkg/sliceutil"
 )
 
 type mappedQuery interface {
@@ -28,850 +15,7 @@ type mappedQuery interface {
 	getURL() string
 }
 
-type commonMappedConfig map[string]string
-
-type mappedConfig map[string]mappedScraperAttrConfig
-
-func (s mappedConfig) applyCommon(c commonMappedConfig, src string) string {
-	if c == nil {
-		return src
-	}
-
-	ret := src
-	for commonKey, commonVal := range c {
-		ret = strings.ReplaceAll(ret, commonKey, commonVal)
-	}
-
-	return ret
-}
-
-// extractHostname parses a URL string and returns the hostname.
-// Returns empty string if the URL cannot be parsed.
-func extractHostname(urlStr string) string {
-	if urlStr == "" {
-		return ""
-	}
-
-	u, err := url.Parse(urlStr)
-	if err != nil {
-		logger.Warnf("Error parsing URL '%s': %s", urlStr, err.Error())
-		return ""
-	}
-
-	return u.Hostname()
-}
-
-type isMultiFunc func(key string) bool
-
-func (s mappedConfig) process(ctx context.Context, q mappedQuery, common commonMappedConfig, isMulti isMultiFunc) mappedResults {
-	var ret mappedResults
-
-	for k, attrConfig := range s {
-
-		if attrConfig.Fixed != "" {
-			// TODO - not sure if this needs to set _all_ indexes for the key
-			const i = 0
-			// Support {inputURL} and {inputHostname} placeholders in fixed values
-			value := strings.ReplaceAll(attrConfig.Fixed, "{inputURL}", q.getURL())
-			value = strings.ReplaceAll(value, "{inputHostname}", extractHostname(q.getURL()))
-			ret = ret.setSingleValue(i, k, value)
-		} else {
-			selector := attrConfig.Selector
-			selector = s.applyCommon(common, selector)
-			// Support {inputURL} and {inputHostname} placeholders in selectors
-			selector = strings.ReplaceAll(selector, "{inputURL}", q.getURL())
-			selector = strings.ReplaceAll(selector, "{inputHostname}", extractHostname(q.getURL()))
-
-			found, err := q.runQuery(selector)
-			if err != nil {
-				logger.Warnf("key '%v': %v", k, err)
-			}
-
-			if len(found) > 0 {
-				result := s.postProcess(ctx, q, attrConfig, found)
-
-				// HACK - if the key is URLs, then we need to set the value as a multi-value
-				isMulti := isMulti != nil && isMulti(k)
-				if isMulti {
-					ret = ret.setMultiValue(0, k, result)
-				} else {
-					for i, text := range result {
-						ret = ret.setSingleValue(i, k, text)
-					}
-				}
-			}
-		}
-	}
-
-	return ret
-}
-
-func (s mappedConfig) postProcess(ctx context.Context, q mappedQuery, attrConfig mappedScraperAttrConfig, found []string) []string {
-	// check if we're concatenating the results into a single result
-	var ret []string
-	if attrConfig.hasConcat() {
-		result := attrConfig.concatenateResults(found)
-		result = attrConfig.postProcess(ctx, result, q)
-		if attrConfig.hasSplit() {
-			results := attrConfig.splitString(result)
-			// skip cleaning when the query is used for searching
-			if q.getType() == SearchQuery {
-				return results
-			}
-			results = attrConfig.cleanResults(results)
-			return results
-		}
-
-		ret = []string{result}
-	} else {
-		for _, text := range found {
-			text = attrConfig.postProcess(ctx, text, q)
-			if attrConfig.hasSplit() {
-				return attrConfig.splitString(text)
-			}
-
-			ret = append(ret, text)
-		}
-		// skip cleaning when the query is used for searching
-		if q.getType() == SearchQuery {
-			return ret
-		}
-		ret = attrConfig.cleanResults(ret)
-
-	}
-
-	return ret
-}
-
-type mappedSceneScraperConfig struct {
-	mappedConfig
-
-	Tags       mappedConfig                 `yaml:"Tags"`
-	Performers mappedPerformerScraperConfig `yaml:"Performers"`
-	Studio     mappedConfig                 `yaml:"Studio"`
-	Movies     mappedConfig                 `yaml:"Movies"`
-	Groups     mappedConfig                 `yaml:"Groups"`
-}
-type _mappedSceneScraperConfig mappedSceneScraperConfig
-
-const (
-	mappedScraperConfigSceneTags       = "Tags"
-	mappedScraperConfigScenePerformers = "Performers"
-	mappedScraperConfigSceneStudio     = "Studio"
-	mappedScraperConfigSceneMovies     = "Movies"
-	mappedScraperConfigSceneGroups     = "Groups"
-)
-
-func (s *mappedSceneScraperConfig) UnmarshalYAML(unmarshal func(interface{}) error) error {
-	// HACK - unmarshal to map first, then remove known scene sub-fields, then
-	// remarshal to yaml and pass that down to the base map
-	parentMap := make(map[string]interface{})
-	if err := unmarshal(parentMap); err != nil {
-		return err
-	}
-
-	// move the known sub-fields to a separate map
-	thisMap := make(map[string]interface{})
-
-	thisMap[mappedScraperConfigSceneTags] = parentMap[mappedScraperConfigSceneTags]
-	thisMap[mappedScraperConfigScenePerformers] = parentMap[mappedScraperConfigScenePerformers]
-	thisMap[mappedScraperConfigSceneStudio] = parentMap[mappedScraperConfigSceneStudio]
-	thisMap[mappedScraperConfigSceneMovies] = parentMap[mappedScraperConfigSceneMovies]
-	thisMap[mappedScraperConfigSceneGroups] = parentMap[mappedScraperConfigSceneGroups]
-
-	delete(parentMap, mappedScraperConfigSceneTags)
-	delete(parentMap, mappedScraperConfigScenePerformers)
-	delete(parentMap, mappedScraperConfigSceneStudio)
-	delete(parentMap, mappedScraperConfigSceneMovies)
-	delete(parentMap, mappedScraperConfigSceneGroups)
-
-	// re-unmarshal the sub-fields
-	yml, err := yaml.Marshal(thisMap)
-	if err != nil {
-		return err
-	}
-
-	// needs to be a different type to prevent infinite recursion
-	c := _mappedSceneScraperConfig{}
-	if err := yaml.Unmarshal(yml, &c); err != nil {
-		return err
-	}
-
-	*s = mappedSceneScraperConfig(c)
-
-	yml, err = yaml.Marshal(parentMap)
-	if err != nil {
-		return err
-	}
-
-	if err := yaml.Unmarshal(yml, &s.mappedConfig); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-type mappedGalleryScraperConfig struct {
-	mappedConfig
-
-	Tags       mappedConfig `yaml:"Tags"`
-	Performers mappedConfig `yaml:"Performers"`
-	Studio     mappedConfig `yaml:"Studio"`
-}
-
-type _mappedGalleryScraperConfig mappedGalleryScraperConfig
-
-func (s *mappedGalleryScraperConfig) UnmarshalYAML(unmarshal func(interface{}) error) error {
-	// HACK - unmarshal to map first, then remove known scene sub-fields, then
-	// remarshal to yaml and pass that down to the base map
-	parentMap := make(map[string]interface{})
-	if err := unmarshal(parentMap); err != nil {
-		return err
-	}
-
-	// move the known sub-fields to a separate map
-	thisMap := make(map[string]interface{})
-
-	thisMap[mappedScraperConfigSceneTags] = parentMap[mappedScraperConfigSceneTags]
-	thisMap[mappedScraperConfigScenePerformers] = parentMap[mappedScraperConfigScenePerformers]
-	thisMap[mappedScraperConfigSceneStudio] = parentMap[mappedScraperConfigSceneStudio]
-
-	delete(parentMap, mappedScraperConfigSceneTags)
-	delete(parentMap, mappedScraperConfigScenePerformers)
-	delete(parentMap, mappedScraperConfigSceneStudio)
-
-	// re-unmarshal the sub-fields
-	yml, err := yaml.Marshal(thisMap)
-	if err != nil {
-		return err
-	}
-
-	// needs to be a different type to prevent infinite recursion
-	c := _mappedGalleryScraperConfig{}
-	if err := yaml.Unmarshal(yml, &c); err != nil {
-		return err
-	}
-
-	*s = mappedGalleryScraperConfig(c)
-
-	yml, err = yaml.Marshal(parentMap)
-	if err != nil {
-		return err
-	}
-
-	if err := yaml.Unmarshal(yml, &s.mappedConfig); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-type mappedImageScraperConfig struct {
-	mappedConfig
-
-	Tags       mappedConfig `yaml:"Tags"`
-	Performers mappedConfig `yaml:"Performers"`
-	Studio     mappedConfig `yaml:"Studio"`
-}
-type _mappedImageScraperConfig mappedImageScraperConfig
-
-func (s *mappedImageScraperConfig) UnmarshalYAML(unmarshal func(interface{}) error) error {
-	// HACK - unmarshal to map first, then remove known scene sub-fields, then
-	// remarshal to yaml and pass that down to the base map
-	parentMap := make(map[string]interface{})
-	if err := unmarshal(parentMap); err != nil {
-		return err
-	}
-
-	// move the known sub-fields to a separate map
-	thisMap := make(map[string]interface{})
-
-	thisMap[mappedScraperConfigSceneTags] = parentMap[mappedScraperConfigSceneTags]
-	thisMap[mappedScraperConfigScenePerformers] = parentMap[mappedScraperConfigScenePerformers]
-	thisMap[mappedScraperConfigSceneStudio] = parentMap[mappedScraperConfigSceneStudio]
-
-	delete(parentMap, mappedScraperConfigSceneTags)
-	delete(parentMap, mappedScraperConfigScenePerformers)
-	delete(parentMap, mappedScraperConfigSceneStudio)
-
-	// re-unmarshal the sub-fields
-	yml, err := yaml.Marshal(thisMap)
-	if err != nil {
-		return err
-	}
-
-	// needs to be a different type to prevent infinite recursion
-	c := _mappedImageScraperConfig{}
-	if err := yaml.Unmarshal(yml, &c); err != nil {
-		return err
-	}
-
-	*s = mappedImageScraperConfig(c)
-
-	yml, err = yaml.Marshal(parentMap)
-	if err != nil {
-		return err
-	}
-
-	if err := yaml.Unmarshal(yml, &s.mappedConfig); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-type mappedPerformerScraperConfig struct {
-	mappedConfig
-
-	Tags mappedConfig `yaml:"Tags"`
-}
-type _mappedPerformerScraperConfig mappedPerformerScraperConfig
-
-const (
-	mappedScraperConfigPerformerTags = "Tags"
-)
-
-func (s *mappedPerformerScraperConfig) UnmarshalYAML(unmarshal func(interface{}) error) error {
-	// HACK - unmarshal to map first, then remove known scene sub-fields, then
-	// remarshal to yaml and pass that down to the base map
-	parentMap := make(map[string]interface{})
-	if err := unmarshal(parentMap); err != nil {
-		return err
-	}
-
-	// move the known sub-fields to a separate map
-	thisMap := make(map[string]interface{})
-
-	thisMap[mappedScraperConfigPerformerTags] = parentMap[mappedScraperConfigPerformerTags]
-
-	delete(parentMap, mappedScraperConfigPerformerTags)
-
-	// re-unmarshal the sub-fields
-	yml, err := yaml.Marshal(thisMap)
-	if err != nil {
-		return err
-	}
-
-	// needs to be a different type to prevent infinite recursion
-	c := _mappedPerformerScraperConfig{}
-	if err := yaml.Unmarshal(yml, &c); err != nil {
-		return err
-	}
-
-	*s = mappedPerformerScraperConfig(c)
-
-	yml, err = yaml.Marshal(parentMap)
-	if err != nil {
-		return err
-	}
-
-	if err := yaml.Unmarshal(yml, &s.mappedConfig); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-type mappedMovieScraperConfig struct {
-	mappedConfig
-
-	Studio mappedConfig `yaml:"Studio"`
-	Tags   mappedConfig `yaml:"Tags"`
-}
-type _mappedMovieScraperConfig mappedMovieScraperConfig
-
-const (
-	mappedScraperConfigMovieStudio = "Studio"
-	mappedScraperConfigMovieTags   = "Tags"
-)
-
-func (s *mappedMovieScraperConfig) UnmarshalYAML(unmarshal func(interface{}) error) error {
-	// HACK - unmarshal to map first, then remove known movie sub-fields, then
-	// remarshal to yaml and pass that down to the base map
-	parentMap := make(map[string]interface{})
-	if err := unmarshal(parentMap); err != nil {
-		return err
-	}
-
-	// move the known sub-fields to a separate map
-	thisMap := make(map[string]interface{})
-
-	thisMap[mappedScraperConfigMovieStudio] = parentMap[mappedScraperConfigMovieStudio]
-	delete(parentMap, mappedScraperConfigMovieStudio)
-
-	thisMap[mappedScraperConfigMovieTags] = parentMap[mappedScraperConfigMovieTags]
-	delete(parentMap, mappedScraperConfigMovieTags)
-
-	// re-unmarshal the sub-fields
-	yml, err := yaml.Marshal(thisMap)
-	if err != nil {
-		return err
-	}
-
-	// needs to be a different type to prevent infinite recursion
-	c := _mappedMovieScraperConfig{}
-	if err := yaml.Unmarshal(yml, &c); err != nil {
-		return err
-	}
-
-	*s = mappedMovieScraperConfig(c)
-
-	yml, err = yaml.Marshal(parentMap)
-	if err != nil {
-		return err
-	}
-
-	if err := yaml.Unmarshal(yml, &s.mappedConfig); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-type mappedRegexConfig struct {
-	Regex string `yaml:"regex"`
-	With  string `yaml:"with"`
-}
-
-type mappedRegexConfigs []mappedRegexConfig
-
-func (c mappedRegexConfig) apply(value string) string {
-	if c.Regex != "" {
-		re, err := regexp.Compile(c.Regex)
-		if err != nil {
-			logger.Warnf("Error compiling regex '%s': %s", c.Regex, err.Error())
-			return value
-		}
-
-		ret := re.ReplaceAllString(value, c.With)
-
-		// trim leading and trailing whitespace
-		// this is done to maintain backwards compatibility with existing
-		// scrapers
-		ret = strings.TrimSpace(ret)
-
-		logger.Debugf(`Replace: '%s' with '%s'`, c.Regex, c.With)
-		logger.Debugf("Before: %s", value)
-		logger.Debugf("After: %s", ret)
-		return ret
-	}
-
-	return value
-}
-
-func (c mappedRegexConfigs) apply(value string) string {
-	// apply regex in order
-	for _, config := range c {
-		value = config.apply(value)
-	}
-
-	return value
-}
-
-type postProcessAction interface {
-	Apply(ctx context.Context, value string, q mappedQuery) string
-}
-
-type postProcessParseDate string
-
-func (p *postProcessParseDate) Apply(ctx context.Context, value string, q mappedQuery) string {
-	parseDate := string(*p)
-
-	const internalDateFormat = "2006-01-02"
-
-	valueLower := strings.ToLower(value)
-	if valueLower == "today" || valueLower == "yesterday" { // handle today, yesterday
-		dt := time.Now()
-		if valueLower == "yesterday" { // subtract 1 day from now
-			dt = dt.AddDate(0, 0, -1)
-		}
-		return dt.Format(internalDateFormat)
-	}
-
-	if parseDate == "" {
-		return value
-	}
-
-	if parseDate == "unix" {
-		// try to parse the date using unix timestamp format
-		// if it fails, then just fall back to the original value
-		timeAsInt, err := strconv.ParseInt(value, 10, 64)
-		if err != nil {
-			logger.Warnf("Error parsing date string '%s' using unix timestamp format : %s", value, err.Error())
-			return value
-		}
-		parsedValue := time.Unix(timeAsInt, 0)
-
-		return parsedValue.Format(internalDateFormat)
-	}
-
-	// try to parse the date using the pattern
-	// if it fails, then just fall back to the original value
-	parsedValue, err := time.Parse(parseDate, value)
-	if err != nil {
-		logger.Warnf("Error parsing date string '%s' using format '%s': %s", value, parseDate, err.Error())
-		return value
-	}
-
-	// convert it into our date format
-	return parsedValue.Format(internalDateFormat)
-}
-
-type postProcessSubtractDays bool
-
-func (p *postProcessSubtractDays) Apply(ctx context.Context, value string, q mappedQuery) string {
-	const internalDateFormat = "2006-01-02"
-
-	i, err := strconv.Atoi(value)
-	if err != nil {
-		logger.Warnf("Error parsing day string %s: %s", value, err)
-		return value
-	}
-
-	dt := time.Now()
-	dt = dt.AddDate(0, 0, -i)
-	return dt.Format(internalDateFormat)
-}
-
-type postProcessReplace mappedRegexConfigs
-
-func (c *postProcessReplace) Apply(ctx context.Context, value string, q mappedQuery) string {
-	replace := mappedRegexConfigs(*c)
-	return replace.apply(value)
-}
-
-type postProcessSubScraper mappedScraperAttrConfig
-
-func (p *postProcessSubScraper) Apply(ctx context.Context, value string, q mappedQuery) string {
-	subScrapeConfig := mappedScraperAttrConfig(*p)
-
-	logger.Debugf("Sub-scraping for: %s", value)
-	ss := q.subScrape(ctx, value)
-
-	if ss != nil {
-		found, err := ss.runQuery(subScrapeConfig.Selector)
-		if err != nil {
-			logger.Warnf("subscrape for '%v': %v", value, err)
-		}
-
-		if len(found) > 0 {
-			// check if we're concatenating the results into a single result
-			var result string
-			if subScrapeConfig.hasConcat() {
-				result = subScrapeConfig.concatenateResults(found)
-			} else {
-				result = found[0]
-			}
-
-			result = subScrapeConfig.postProcess(ctx, result, ss)
-			return result
-		}
-	}
-
-	return ""
-}
-
-type postProcessMap map[string]string
-
-func (p *postProcessMap) Apply(ctx context.Context, value string, q mappedQuery) string {
-	// return the mapped value if present
-	m := *p
-	mapped, ok := m[value]
-
-	if ok {
-		return mapped
-	}
-
-	return value
-}
-
-type postProcessFeetToCm bool
-
-func (p *postProcessFeetToCm) Apply(ctx context.Context, value string, q mappedQuery) string {
-	const foot_in_cm = 30.48
-	const inch_in_cm = 2.54
-
-	reg := regexp.MustCompile("[0-9]+")
-	filtered := reg.FindAllString(value, -1)
-
-	var feet float64
-	var inches float64
-	if len(filtered) > 0 {
-		feet, _ = strconv.ParseFloat(filtered[0], 64)
-	}
-	if len(filtered) > 1 {
-		inches, _ = strconv.ParseFloat(filtered[1], 64)
-	}
-
-	var centimeters = feet*foot_in_cm + inches*inch_in_cm
-
-	// Return rounded integer string
-	return strconv.Itoa(int(math.Round(centimeters)))
-}
-
-type postProcessLbToKg bool
-
-func (p *postProcessLbToKg) Apply(ctx context.Context, value string, q mappedQuery) string {
-	const lb_in_kg = 0.45359237
-	w, err := strconv.ParseFloat(value, 64)
-	if err == nil {
-		w *= lb_in_kg
-		value = strconv.Itoa(int(math.Round(w)))
-	}
-	return value
-}
-
-type postProcessJavascript string
-
-func (p *postProcessJavascript) Apply(ctx context.Context, value string, q mappedQuery) string {
-	vm := javascript.NewVM()
-	if err := vm.Set("value", value); err != nil {
-		logger.Warnf("javascript failed to set value: %v", err)
-		return value
-	}
-
-	log := &javascript.Log{
-		Logger:       logger.Logger,
-		Prefix:       "",
-		ProgressChan: make(chan float64),
-	}
-
-	if err := log.AddToVM("log", vm); err != nil {
-		logger.Logger.Errorf("error adding log API: %w", err)
-	}
-
-	util := &javascript.Util{}
-	if err := util.AddToVM("util", vm); err != nil {
-		logger.Logger.Errorf("error adding util API: %w", err)
-	}
-
-	script, err := javascript.CompileScript("", "(function() { "+string(*p)+"})()")
-	if err != nil {
-		logger.Warnf("javascript failed to compile: %v", err)
-		return value
-	}
-
-	output, err := vm.RunProgram(script)
-	if err != nil {
-		logger.Warnf("javascript failed to run: %v", err)
-		return value
-	}
-
-	// assume output is string
-	return output.String()
-}
-
-type mappedPostProcessAction struct {
-	ParseDate    string                   `yaml:"parseDate"`
-	SubtractDays bool                     `yaml:"subtractDays"`
-	Replace      mappedRegexConfigs       `yaml:"replace"`
-	SubScraper   *mappedScraperAttrConfig `yaml:"subScraper"`
-	Map          map[string]string        `yaml:"map"`
-	FeetToCm     bool                     `yaml:"feetToCm"`
-	LbToKg       bool                     `yaml:"lbToKg"`
-	Javascript   string                   `yaml:"javascript"`
-}
-
-func (a mappedPostProcessAction) ToPostProcessAction() (postProcessAction, error) {
-	var found string
-	var ret postProcessAction
-
-	ensureOnly := func(field string) error {
-		if found != "" {
-			return fmt.Errorf("post-process actions must have a single field, found %s and %s", found, field)
-		}
-		found = field
-		return nil
-	}
-
-	if a.ParseDate != "" {
-		found = "parseDate"
-		action := postProcessParseDate(a.ParseDate)
-		ret = &action
-	}
-	if len(a.Replace) > 0 {
-		if err := ensureOnly("replace"); err != nil {
-			return nil, err
-		}
-		action := postProcessReplace(a.Replace)
-		ret = &action
-	}
-	if a.SubScraper != nil {
-		if err := ensureOnly("subScraper"); err != nil {
-			return nil, err
-		}
-		action := postProcessSubScraper(*a.SubScraper)
-		ret = &action
-	}
-	if a.Map != nil {
-		if err := ensureOnly("map"); err != nil {
-			return nil, err
-		}
-		action := postProcessMap(a.Map)
-		ret = &action
-	}
-	if a.FeetToCm {
-		if err := ensureOnly("feetToCm"); err != nil {
-			return nil, err
-		}
-		action := postProcessFeetToCm(a.FeetToCm)
-		ret = &action
-	}
-	if a.LbToKg {
-		if err := ensureOnly("lbToKg"); err != nil {
-			return nil, err
-		}
-		action := postProcessLbToKg(a.LbToKg)
-		ret = &action
-	}
-	if a.SubtractDays {
-		if err := ensureOnly("subtractDays"); err != nil {
-			return nil, err
-		}
-		action := postProcessSubtractDays(a.SubtractDays)
-		ret = &action
-	}
-	if a.Javascript != "" {
-		if err := ensureOnly("javascript"); err != nil {
-			return nil, err
-		}
-		action := postProcessJavascript(a.Javascript)
-		ret = &action
-	}
-
-	if ret == nil {
-		return nil, errors.New("invalid post-process action")
-	}
-
-	return ret, nil
-}
-
-type mappedScraperAttrConfig struct {
-	Selector    string                    `yaml:"selector"`
-	Fixed       string                    `yaml:"fixed"`
-	PostProcess []mappedPostProcessAction `yaml:"postProcess"`
-	Concat      string                    `yaml:"concat"`
-	Split       string                    `yaml:"split"`
-
-	postProcessActions []postProcessAction
-
-	// Deprecated: use PostProcess instead
-	ParseDate  string                   `yaml:"parseDate"`
-	Replace    mappedRegexConfigs       `yaml:"replace"`
-	SubScraper *mappedScraperAttrConfig `yaml:"subScraper"`
-}
-
-type _mappedScraperAttrConfig mappedScraperAttrConfig
-
-func (c *mappedScraperAttrConfig) UnmarshalYAML(unmarshal func(interface{}) error) error {
-	// try unmarshalling into a string first
-	if err := unmarshal(&c.Selector); err != nil {
-		// if it's a type error then we try to unmarshall to the full object
-		var typeErr *yaml.TypeError
-		if !errors.As(err, &typeErr) {
-			return err
-		}
-
-		// unmarshall to full object
-		// need it as a separate object
-		t := _mappedScraperAttrConfig{}
-		if err = unmarshal(&t); err != nil {
-			return err
-		}
-
-		*c = mappedScraperAttrConfig(t)
-	}
-
-	return c.convertPostProcessActions()
-}
-
-func (c *mappedScraperAttrConfig) convertPostProcessActions() error {
-	// ensure we don't have the old deprecated fields and the new post process field
-	if len(c.PostProcess) > 0 {
-		if c.ParseDate != "" || len(c.Replace) > 0 || c.SubScraper != nil {
-			return errors.New("cannot include postProcess and (parseDate, replace, subScraper) deprecated fields")
-		}
-
-		// convert xpathPostProcessAction actions to postProcessActions
-		for _, a := range c.PostProcess {
-			action, err := a.ToPostProcessAction()
-			if err != nil {
-				return err
-			}
-			c.postProcessActions = append(c.postProcessActions, action)
-		}
-
-		c.PostProcess = nil
-	} else {
-		// convert old deprecated fields if present
-		// in same order as they used to be executed
-		if len(c.Replace) > 0 {
-			action := postProcessReplace(c.Replace)
-			c.postProcessActions = append(c.postProcessActions, &action)
-			c.Replace = nil
-		}
-
-		if c.SubScraper != nil {
-			action := postProcessSubScraper(*c.SubScraper)
-			c.postProcessActions = append(c.postProcessActions, &action)
-			c.SubScraper = nil
-		}
-
-		if c.ParseDate != "" {
-			action := postProcessParseDate(c.ParseDate)
-			c.postProcessActions = append(c.postProcessActions, &action)
-			c.ParseDate = ""
-		}
-	}
-
-	return nil
-}
-
-func (c mappedScraperAttrConfig) hasConcat() bool {
-	return c.Concat != ""
-}
-
-func (c mappedScraperAttrConfig) hasSplit() bool {
-	return c.Split != ""
-}
-
-func (c mappedScraperAttrConfig) concatenateResults(nodes []string) string {
-	separator := c.Concat
-	return strings.Join(nodes, separator)
-}
-
-func (c mappedScraperAttrConfig) cleanResults(nodes []string) []string {
-	cleaned := sliceutil.Unique(nodes)      // remove duplicate values
-	cleaned = sliceutil.Delete(cleaned, "") // remove empty values
-	return cleaned
-}
-
-func (c mappedScraperAttrConfig) splitString(value string) []string {
-	separator := c.Split
-	var res []string
-
-	if separator == "" {
-		return []string{value}
-	}
-
-	for _, str := range strings.Split(value, separator) {
-		if str != "" {
-			res = append(res, str)
-		}
-	}
-
-	return res
-}
-
-func (c mappedScraperAttrConfig) postProcess(ctx context.Context, value string, q mappedQuery) string {
-	for _, action := range c.postProcessActions {
-		value = action.Apply(ctx, value, q)
-	}
-
-	return value
-}
-
-type mappedScrapers map[string]*mappedScraper
+type mappedScrapers map[string]mappedScraper
 
 type mappedScraper struct {
 	Common    commonMappedConfig            `yaml:"common"`
@@ -885,102 +29,12 @@ type mappedScraper struct {
 	Movie *mappedMovieScraperConfig `yaml:"movie"`
 }
 
-type mappedResult map[string]interface{}
-type mappedResults []mappedResult
-
-func (r mappedResult) apply(dest interface{}) {
-	destVal := reflect.ValueOf(dest).Elem()
-
-	// all fields are either string pointers or string slices
-	for key, value := range r {
-		if err := mapFieldValue(destVal, key, value); err != nil {
-			logger.Errorf("Error mapping field %s in %T: %v", key, dest, err)
-		}
-	}
-}
-
-func mapFieldValue(destVal reflect.Value, key string, value interface{}) error {
-	field := destVal.FieldByName(key)
-
-	if !field.IsValid() {
-		return fmt.Errorf("field %s does not exist on %s", key, destVal.Type().Name())
-	}
-
-	if !field.CanSet() {
-		return fmt.Errorf("field %s cannot be set on %s", key, destVal.Type().Name())
-	}
-
-	fieldType := field.Type()
-
-	switch v := value.(type) {
-	case string:
-		// if the field is a pointer to a string, then we need to convert the string to a pointer
-		// if the field is a string slice, then we need to convert the string to a slice
-		switch {
-		case fieldType.Kind() == reflect.String:
-			field.SetString(v)
-		case fieldType.Kind() == reflect.Ptr && fieldType.Elem().Kind() == reflect.String:
-			ptr := reflect.New(fieldType.Elem())
-			ptr.Elem().SetString(v)
-			field.Set(ptr)
-		case fieldType.Kind() == reflect.Slice && fieldType.Elem().Kind() == reflect.String:
-			field.Set(reflect.ValueOf([]string{v}))
-		default:
-			return fmt.Errorf("cannot convert %T to %s", value, fieldType)
-		}
-	case []string:
-		// expect the field to be a string slice
-		if fieldType.Kind() == reflect.Slice && fieldType.Elem().Kind() == reflect.String {
-			field.Set(reflect.ValueOf(v))
-		} else {
-			return fmt.Errorf("cannot convert %T to %s", value, fieldType)
-		}
-	default:
-		// fallback to reflection
-		reflectValue := reflect.ValueOf(value)
-		reflectValueType := reflectValue.Type()
-
-		switch {
-		case reflectValueType.ConvertibleTo(fieldType):
-			field.Set(reflectValue.Convert(fieldType))
-		case fieldType.Kind() == reflect.Pointer && reflectValueType.ConvertibleTo(fieldType.Elem()):
-			ptr := reflect.New(fieldType.Elem())
-			ptr.Elem().Set(reflectValue.Convert(fieldType.Elem()))
-			field.Set(ptr)
-		default:
-			return fmt.Errorf("cannot convert %T to %s", value, fieldType)
-		}
-	}
-
-	return nil
-}
-
-func (r mappedResults) setSingleValue(index int, key string, value string) mappedResults {
-	if index >= len(r) {
-		r = append(r, make(mappedResult))
-	}
-
-	logger.Debugf(`[%d][%s] = %s`, index, key, value)
-	r[index][key] = value
-	return r
-}
-
-func (r mappedResults) setMultiValue(index int, key string, value []string) mappedResults {
-	if index >= len(r) {
-		r = append(r, make(mappedResult))
-	}
-
-	logger.Debugf(`[%d][%s] = %s`, index, key, value)
-	r[index][key] = value
-	return r
-}
-
 func urlsIsMulti(key string) bool {
 	return key == "URLs"
 }
 
 func (s mappedScraper) scrapePerformer(ctx context.Context, q mappedQuery) (*models.ScrapedPerformer, error) {
-	var ret models.ScrapedPerformer
+	var ret *models.ScrapedPerformer
 
 	performerMap := s.Performer
 	if performerMap == nil {
@@ -992,31 +46,26 @@ func (s mappedScraper) scrapePerformer(ctx context.Context, q mappedQuery) (*mod
 	results := performerMap.process(ctx, q, s.Common, urlsIsMulti)
 
 	// now apply the tags
+	var tagResults mappedResults
+
 	if performerTagsMap != nil {
 		logger.Debug(`Processing performer tags:`)
-		tagResults := performerTagsMap.process(ctx, q, s.Common, nil)
-
-		for _, p := range tagResults {
-			tag := &models.ScrapedTag{}
-			p.apply(tag)
-			ret.Tags = append(ret.Tags, tag)
-		}
+		tagResults = performerTagsMap.process(ctx, q, s.Common, nil)
 	}
 
-	if len(results) == 0 && len(ret.Tags) == 0 {
+	if len(results) == 0 {
 		return nil, nil
 	}
 
 	if len(results) > 0 {
-		results[0].apply(&ret)
+		ret = results[0].scrapedPerformer()
+		ret.Tags = tagResults.scrapedTags()
 	}
 
-	return &ret, nil
+	return ret, nil
 }
 
 func (s mappedScraper) scrapePerformers(ctx context.Context, q mappedQuery) ([]*models.ScrapedPerformer, error) {
-	var ret []*models.ScrapedPerformer
-
 	performerMap := s.Performer
 	if performerMap == nil {
 		return nil, nil
@@ -1024,13 +73,7 @@ func (s mappedScraper) scrapePerformers(ctx context.Context, q mappedQuery) ([]*
 
 	// isMulti is nil because it will behave incorrect when scraping multiple performers
 	results := performerMap.process(ctx, q, s.Common, nil)
-	for _, r := range results {
-		var p models.ScrapedPerformer
-		r.apply(&p)
-		ret = append(ret, &p)
-	}
-
-	return ret, nil
+	return results.scrapedPerformers(), nil
 }
 
 // processSceneRelationships sets the relationships on the models.ScrapedScene. It returns true if any relationships were set.
@@ -1048,7 +91,7 @@ func (s mappedScraper) processSceneRelationships(ctx context.Context, q mappedQu
 	if sceneTagsMap != nil {
 		logger.Debug(`Processing scene tags:`)
 
-		ret.Tags = processRelationships[models.ScrapedTag](ctx, s, sceneTagsMap, q)
+		ret.Tags = sceneTagsMap.process(ctx, q, s.Common, nil).scrapedTags()
 	}
 
 	if sceneStudioMap != nil {
@@ -1056,21 +99,20 @@ func (s mappedScraper) processSceneRelationships(ctx context.Context, q mappedQu
 		studioResults := sceneStudioMap.process(ctx, q, s.Common, nil)
 
 		if len(studioResults) > 0 && resultIndex < len(studioResults) {
-			studio := &models.ScrapedStudio{}
 			// when doing a `search` scrape get the related studio
-			studioResults[resultIndex].apply(studio)
+			studio := studioResults[resultIndex].scrapedStudio()
 			ret.Studio = studio
 		}
 	}
 
 	if sceneMoviesMap != nil {
 		logger.Debug(`Processing scene movies:`)
-		ret.Movies = processRelationships[models.ScrapedMovie](ctx, s, sceneMoviesMap, q)
+		ret.Movies = sceneMoviesMap.process(ctx, q, s.Common, nil).scrapedMovies()
 	}
 
 	if sceneGroupsMap != nil {
 		logger.Debug(`Processing scene groups:`)
-		ret.Groups = processRelationships[models.ScrapedGroup](ctx, s, sceneGroupsMap, q)
+		ret.Groups = sceneGroupsMap.process(ctx, q, s.Common, nil).scrapedGroups()
 	}
 
 	return len(ret.Performers) > 0 || len(ret.Tags) > 0 || ret.Studio != nil || len(ret.Movies) > 0 || len(ret.Groups) > 0
@@ -1094,12 +136,10 @@ func (s mappedScraper) processPerformers(ctx context.Context, performersMap mapp
 		}
 
 		for _, p := range performerResults {
-			performer := &models.ScrapedPerformer{}
-			p.apply(performer)
+			performer := p.scrapedPerformer()
 
 			for _, p := range performerTagResults {
-				tag := &models.ScrapedTag{}
-				p.apply(tag)
+				tag := p.scrapedTag()
 				performer.Tags = append(performer.Tags, tag)
 			}
 
@@ -1110,20 +150,6 @@ func (s mappedScraper) processPerformers(ctx context.Context, performersMap mapp
 	return ret
 }
 
-func processRelationships[T any](ctx context.Context, s mappedScraper, relationshipMap mappedConfig, q mappedQuery) []*T {
-	var ret []*T
-
-	results := relationshipMap.process(ctx, q, s.Common, nil)
-
-	for _, p := range results {
-		var value T
-		p.apply(&value)
-		ret = append(ret, &value)
-	}
-
-	return ret
-}
-
 func (s mappedScraper) scrapeScenes(ctx context.Context, q mappedQuery) ([]*models.ScrapedScene, error) {
 	var ret []*models.ScrapedScene
 
@@ -1139,10 +165,9 @@ func (s mappedScraper) scrapeScenes(ctx context.Context, q mappedQuery) ([]*mode
 	for i, r := range results {
 		logger.Debug(`Processing scene:`)
 
-		var thisScene models.ScrapedScene
-		r.apply(&thisScene)
-		s.processSceneRelationships(ctx, q, i, &thisScene)
-		ret = append(ret, &thisScene)
+		thisScene := r.scrapedScene()
+		s.processSceneRelationships(ctx, q, i, thisScene)
+		ret = append(ret, thisScene)
 	}
 
 	return ret, nil
@@ -1159,17 +184,17 @@ func (s mappedScraper) scrapeScene(ctx context.Context, q mappedQuery) (*models.
 	logger.Debug(`Processing scene:`)
 	results := sceneMap.process(ctx, q, s.Common, urlsIsMulti)
 
-	var ret models.ScrapedScene
+	var ret *models.ScrapedScene
 	if len(results) > 0 {
-		results[0].apply(&ret)
+		ret = results[0].scrapedScene()
 	}
-	hasRelationships := s.processSceneRelationships(ctx, q, 0, &ret)
+	hasRelationships := s.processSceneRelationships(ctx, q, 0, ret)
 
 	// #3953 - process only returns results if the non-relationship fields are
 	// populated
 	// only return if we have results or relationships
 	if len(results) > 0 || hasRelationships {
-		return &ret, nil
+		return ret, nil
 	}
 
 	return nil, nil
@@ -1192,15 +217,19 @@ func (s mappedScraper) scrapeImage(ctx context.Context, q mappedQuery) (*models.
 	logger.Debug(`Processing image:`)
 	results := imageMap.process(ctx, q, s.Common, urlsIsMulti)
 
+	if len(results) > 0 {
+		ret = *results[0].scrapedImage()
+	}
+
 	// now apply the performers and tags
 	if imagePerformersMap != nil {
 		logger.Debug(`Processing image performers:`)
-		ret.Performers = processRelationships[models.ScrapedPerformer](ctx, s, imagePerformersMap, q)
+		ret.Performers = imagePerformersMap.process(ctx, q, s.Common, nil).scrapedPerformers()
 	}
 
 	if imageTagsMap != nil {
 		logger.Debug(`Processing image tags:`)
-		ret.Tags = processRelationships[models.ScrapedTag](ctx, s, imageTagsMap, q)
+		ret.Tags = imageTagsMap.process(ctx, q, s.Common, nil).scrapedTags()
 	}
 
 	if imageStudioMap != nil {
@@ -1208,9 +237,7 @@ func (s mappedScraper) scrapeImage(ctx context.Context, q mappedQuery) (*models.
 		studioResults := imageStudioMap.process(ctx, q, s.Common, nil)
 
 		if len(studioResults) > 0 {
-			studio := &models.ScrapedStudio{}
-			studioResults[0].apply(studio)
-			ret.Studio = studio
+			ret.Studio = studioResults[0].scrapedStudio()
 		}
 	}
 
@@ -1219,10 +246,6 @@ func (s mappedScraper) scrapeImage(ctx context.Context, q mappedQuery) (*models.
 		return nil, nil
 	}
 
-	if len(results) > 0 {
-		results[0].apply(&ret)
-	}
-
 	return &ret, nil
 }
 
@@ -1243,27 +266,22 @@ func (s mappedScraper) scrapeGallery(ctx context.Context, q mappedQuery) (*model
 	logger.Debug(`Processing gallery:`)
 	results := galleryMap.process(ctx, q, s.Common, urlsIsMulti)
 
+	if len(results) > 0 {
+		ret = *results[0].scrapedGallery()
+	}
+
 	// now apply the performers and tags
 	if galleryPerformersMap != nil {
 		logger.Debug(`Processing gallery performers:`)
 		performerResults := galleryPerformersMap.process(ctx, q, s.Common, urlsIsMulti)
 
-		for _, p := range performerResults {
-			performer := &models.ScrapedPerformer{}
-			p.apply(performer)
-			ret.Performers = append(ret.Performers, performer)
-		}
+		ret.Performers = performerResults.scrapedPerformers()
 	}
 
 	if galleryTagsMap != nil {
 		logger.Debug(`Processing gallery tags:`)
 		tagResults := galleryTagsMap.process(ctx, q, s.Common, nil)
-
-		for _, p := range tagResults {
-			tag := &models.ScrapedTag{}
-			p.apply(tag)
-			ret.Tags = append(ret.Tags, tag)
-		}
+		ret.Tags = tagResults.scrapedTags()
 	}
 
 	if galleryStudioMap != nil {
@@ -1271,9 +289,7 @@ func (s mappedScraper) scrapeGallery(ctx context.Context, q mappedQuery) (*model
 		studioResults := galleryStudioMap.process(ctx, q, s.Common, nil)
 
 		if len(studioResults) > 0 {
-			studio := &models.ScrapedStudio{}
-			studioResults[0].apply(studio)
-			ret.Studio = studio
+			ret.Studio = studioResults[0].scrapedStudio()
 		}
 	}
 
@@ -1282,10 +298,6 @@ func (s mappedScraper) scrapeGallery(ctx context.Context, q mappedQuery) (*model
 		return nil, nil
 	}
 
-	if len(results) > 0 {
-		results[0].apply(&ret)
-	}
-
 	return &ret, nil
 }
 
@@ -1309,14 +321,16 @@ func (s mappedScraper) scrapeGroup(ctx context.Context, q mappedQuery) (*models.
 
 	results := groupMap.process(ctx, q, s.Common, urlsIsMulti)
 
+	if len(results) > 0 {
+		ret = *results[0].scrapedGroup()
+	}
+
 	if groupStudioMap != nil {
 		logger.Debug(`Processing group studio:`)
 		studioResults := groupStudioMap.process(ctx, q, s.Common, nil)
 
 		if len(studioResults) > 0 {
-			studio := &models.ScrapedStudio{}
-			studioResults[0].apply(studio)
-			ret.Studio = studio
+			ret.Studio = studioResults[0].scrapedStudio()
 		}
 	}
 
@@ -1325,20 +339,12 @@ func (s mappedScraper) scrapeGroup(ctx context.Context, q mappedQuery) (*models.
 		logger.Debug(`Processing group tags:`)
 		tagResults := groupTagsMap.process(ctx, q, s.Common, nil)
 
-		for _, p := range tagResults {
-			tag := &models.ScrapedTag{}
-			p.apply(tag)
-			ret.Tags = append(ret.Tags, tag)
-		}
+		ret.Tags = tagResults.scrapedTags()
 	}
 
 	if len(results) == 0 && ret.Studio == nil && len(ret.Tags) == 0 {
 		return nil, nil
 	}
 
-	if len(results) > 0 {
-		results[0].apply(&ret)
-	}
-
 	return &ret, nil
 }
diff --git a/pkg/scraper/mapped_config.go b/pkg/scraper/mapped_config.go
new file mode 100644
index 000000000..920bf74b4
--- /dev/null
+++ b/pkg/scraper/mapped_config.go
@@ -0,0 +1,537 @@
+package scraper
+
+import (
+	"context"
+	"errors"
+	"net/url"
+	"strings"
+
+	"github.com/stashapp/stash/pkg/logger"
+	"github.com/stashapp/stash/pkg/sliceutil"
+	"gopkg.in/yaml.v2"
+)
+
+type commonMappedConfig map[string]string
+
+type mappedConfig map[string]mappedScraperAttrConfig
+
+func (s mappedConfig) applyCommon(c commonMappedConfig, src string) string {
+	if c == nil {
+		return src
+	}
+
+	ret := src
+	for commonKey, commonVal := range c {
+		ret = strings.ReplaceAll(ret, commonKey, commonVal)
+	}
+
+	return ret
+}
+
+// extractHostname parses a URL string and returns the hostname.
+// Returns empty string if the URL cannot be parsed.
+func extractHostname(urlStr string) string {
+	if urlStr == "" {
+		return ""
+	}
+
+	u, err := url.Parse(urlStr)
+	if err != nil {
+		logger.Warnf("Error parsing URL '%s': %s", urlStr, err.Error())
+		return ""
+	}
+
+	return u.Hostname()
+}
+
+type isMultiFunc func(key string) bool
+
+func (s mappedConfig) process(ctx context.Context, q mappedQuery, common commonMappedConfig, isMulti isMultiFunc) mappedResults {
+	var ret mappedResults
+
+	for k, attrConfig := range s {
+
+		if attrConfig.Fixed != "" {
+			// TODO - not sure if this needs to set _all_ indexes for the key
+			const i = 0
+			// Support {inputURL} and {inputHostname} placeholders in fixed values
+			value := strings.ReplaceAll(attrConfig.Fixed, "{inputURL}", q.getURL())
+			value = strings.ReplaceAll(value, "{inputHostname}", extractHostname(q.getURL()))
+			ret = ret.setSingleValue(i, k, value)
+		} else {
+			selector := attrConfig.Selector
+			selector = s.applyCommon(common, selector)
+			// Support {inputURL} and {inputHostname} placeholders in selectors
+			selector = strings.ReplaceAll(selector, "{inputURL}", q.getURL())
+			selector = strings.ReplaceAll(selector, "{inputHostname}", extractHostname(q.getURL()))
+
+			found, err := q.runQuery(selector)
+			if err != nil {
+				logger.Warnf("key '%v': %v", k, err)
+			}
+
+			if len(found) > 0 {
+				result := s.postProcess(ctx, q, attrConfig, found)
+
+				// HACK - if the key is URLs, then we need to set the value as a multi-value
+				isMulti := isMulti != nil && isMulti(k)
+				if isMulti {
+					ret = ret.setMultiValue(0, k, result)
+				} else {
+					for i, text := range result {
+						ret = ret.setSingleValue(i, k, text)
+					}
+				}
+			}
+		}
+	}
+
+	return ret
+}
+
+func (s mappedConfig) postProcess(ctx context.Context, q mappedQuery, attrConfig mappedScraperAttrConfig, found []string) []string {
+	// check if we're concatenating the results into a single result
+	var ret []string
+	if attrConfig.hasConcat() {
+		result := attrConfig.concatenateResults(found)
+		result = attrConfig.postProcess(ctx, result, q)
+		if attrConfig.hasSplit() {
+			results := attrConfig.splitString(result)
+			// skip cleaning when the query is used for searching
+			if q.getType() == SearchQuery {
+				return results
+			}
+			results = attrConfig.cleanResults(results)
+			return results
+		}
+
+		ret = []string{result}
+	} else {
+		for _, text := range found {
+			text = attrConfig.postProcess(ctx, text, q)
+			if attrConfig.hasSplit() {
+				return attrConfig.splitString(text)
+			}
+
+			ret = append(ret, text)
+		}
+		// skip cleaning when the query is used for searching
+		if q.getType() == SearchQuery {
+			return ret
+		}
+		ret = attrConfig.cleanResults(ret)
+
+	}
+
+	return ret
+}
+
+type mappedSceneScraperConfig struct {
+	mappedConfig
+
+	Tags       mappedConfig                 `yaml:"Tags"`
+	Performers mappedPerformerScraperConfig `yaml:"Performers"`
+	Studio     mappedConfig                 `yaml:"Studio"`
+	Movies     mappedConfig                 `yaml:"Movies"`
+	Groups     mappedConfig                 `yaml:"Groups"`
+}
+type _mappedSceneScraperConfig mappedSceneScraperConfig
+
+const (
+	mappedScraperConfigSceneTags       = "Tags"
+	mappedScraperConfigScenePerformers = "Performers"
+	mappedScraperConfigSceneStudio     = "Studio"
+	mappedScraperConfigSceneMovies     = "Movies"
+	mappedScraperConfigSceneGroups     = "Groups"
+)
+
+func (s *mappedSceneScraperConfig) UnmarshalYAML(unmarshal func(interface{}) error) error {
+	// HACK - unmarshal to map first, then remove known scene sub-fields, then
+	// remarshal to yaml and pass that down to the base map
+	parentMap := make(map[string]interface{})
+	if err := unmarshal(parentMap); err != nil {
+		return err
+	}
+
+	// move the known sub-fields to a separate map
+	thisMap := make(map[string]interface{})
+
+	thisMap[mappedScraperConfigSceneTags] = parentMap[mappedScraperConfigSceneTags]
+	thisMap[mappedScraperConfigScenePerformers] = parentMap[mappedScraperConfigScenePerformers]
+	thisMap[mappedScraperConfigSceneStudio] = parentMap[mappedScraperConfigSceneStudio]
+	thisMap[mappedScraperConfigSceneMovies] = parentMap[mappedScraperConfigSceneMovies]
+	thisMap[mappedScraperConfigSceneGroups] = parentMap[mappedScraperConfigSceneGroups]
+
+	delete(parentMap, mappedScraperConfigSceneTags)
+	delete(parentMap, mappedScraperConfigScenePerformers)
+	delete(parentMap, mappedScraperConfigSceneStudio)
+	delete(parentMap, mappedScraperConfigSceneMovies)
+	delete(parentMap, mappedScraperConfigSceneGroups)
+
+	// re-unmarshal the sub-fields
+	yml, err := yaml.Marshal(thisMap)
+	if err != nil {
+		return err
+	}
+
+	// needs to be a different type to prevent infinite recursion
+	c := _mappedSceneScraperConfig{}
+	if err := yaml.Unmarshal(yml, &c); err != nil {
+		return err
+	}
+
+	*s = mappedSceneScraperConfig(c)
+
+	yml, err = yaml.Marshal(parentMap)
+	if err != nil {
+		return err
+	}
+
+	if err := yaml.Unmarshal(yml, &s.mappedConfig); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+type mappedGalleryScraperConfig struct {
+	mappedConfig
+
+	Tags       mappedConfig `yaml:"Tags"`
+	Performers mappedConfig `yaml:"Performers"`
+	Studio     mappedConfig `yaml:"Studio"`
+}
+
+type _mappedGalleryScraperConfig mappedGalleryScraperConfig
+
+func (s *mappedGalleryScraperConfig) UnmarshalYAML(unmarshal func(interface{}) error) error {
+	// HACK - unmarshal to map first, then remove known scene sub-fields, then
+	// remarshal to yaml and pass that down to the base map
+	parentMap := make(map[string]interface{})
+	if err := unmarshal(parentMap); err != nil {
+		return err
+	}
+
+	// move the known sub-fields to a separate map
+	thisMap := make(map[string]interface{})
+
+	thisMap[mappedScraperConfigSceneTags] = parentMap[mappedScraperConfigSceneTags]
+	thisMap[mappedScraperConfigScenePerformers] = parentMap[mappedScraperConfigScenePerformers]
+	thisMap[mappedScraperConfigSceneStudio] = parentMap[mappedScraperConfigSceneStudio]
+
+	delete(parentMap, mappedScraperConfigSceneTags)
+	delete(parentMap, mappedScraperConfigScenePerformers)
+	delete(parentMap, mappedScraperConfigSceneStudio)
+
+	// re-unmarshal the sub-fields
+	yml, err := yaml.Marshal(thisMap)
+	if err != nil {
+		return err
+	}
+
+	// needs to be a different type to prevent infinite recursion
+	c := _mappedGalleryScraperConfig{}
+	if err := yaml.Unmarshal(yml, &c); err != nil {
+		return err
+	}
+
+	*s = mappedGalleryScraperConfig(c)
+
+	yml, err = yaml.Marshal(parentMap)
+	if err != nil {
+		return err
+	}
+
+	if err := yaml.Unmarshal(yml, &s.mappedConfig); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+type mappedImageScraperConfig struct {
+	mappedConfig
+
+	Tags       mappedConfig `yaml:"Tags"`
+	Performers mappedConfig `yaml:"Performers"`
+	Studio     mappedConfig `yaml:"Studio"`
+}
+type _mappedImageScraperConfig mappedImageScraperConfig
+
+func (s *mappedImageScraperConfig) UnmarshalYAML(unmarshal func(interface{}) error) error {
+	// HACK - unmarshal to map first, then remove known scene sub-fields, then
+	// remarshal to yaml and pass that down to the base map
+	parentMap := make(map[string]interface{})
+	if err := unmarshal(parentMap); err != nil {
+		return err
+	}
+
+	// move the known sub-fields to a separate map
+	thisMap := make(map[string]interface{})
+
+	thisMap[mappedScraperConfigSceneTags] = parentMap[mappedScraperConfigSceneTags]
+	thisMap[mappedScraperConfigScenePerformers] = parentMap[mappedScraperConfigScenePerformers]
+	thisMap[mappedScraperConfigSceneStudio] = parentMap[mappedScraperConfigSceneStudio]
+
+	delete(parentMap, mappedScraperConfigSceneTags)
+	delete(parentMap, mappedScraperConfigScenePerformers)
+	delete(parentMap, mappedScraperConfigSceneStudio)
+
+	// re-unmarshal the sub-fields
+	yml, err := yaml.Marshal(thisMap)
+	if err != nil {
+		return err
+	}
+
+	// needs to be a different type to prevent infinite recursion
+	c := _mappedImageScraperConfig{}
+	if err := yaml.Unmarshal(yml, &c); err != nil {
+		return err
+	}
+
+	*s = mappedImageScraperConfig(c)
+
+	yml, err = yaml.Marshal(parentMap)
+	if err != nil {
+		return err
+	}
+
+	if err := yaml.Unmarshal(yml, &s.mappedConfig); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+type mappedPerformerScraperConfig struct {
+	mappedConfig
+
+	Tags mappedConfig `yaml:"Tags"`
+}
+type _mappedPerformerScraperConfig mappedPerformerScraperConfig
+
+const (
+	mappedScraperConfigPerformerTags = "Tags"
+)
+
+func (s *mappedPerformerScraperConfig) UnmarshalYAML(unmarshal func(interface{}) error) error {
+	// HACK - unmarshal to map first, then remove known scene sub-fields, then
+	// remarshal to yaml and pass that down to the base map
+	parentMap := make(map[string]interface{})
+	if err := unmarshal(parentMap); err != nil {
+		return err
+	}
+
+	// move the known sub-fields to a separate map
+	thisMap := make(map[string]interface{})
+
+	thisMap[mappedScraperConfigPerformerTags] = parentMap[mappedScraperConfigPerformerTags]
+
+	delete(parentMap, mappedScraperConfigPerformerTags)
+
+	// re-unmarshal the sub-fields
+	yml, err := yaml.Marshal(thisMap)
+	if err != nil {
+		return err
+	}
+
+	// needs to be a different type to prevent infinite recursion
+	c := _mappedPerformerScraperConfig{}
+	if err := yaml.Unmarshal(yml, &c); err != nil {
+		return err
+	}
+
+	*s = mappedPerformerScraperConfig(c)
+
+	yml, err = yaml.Marshal(parentMap)
+	if err != nil {
+		return err
+	}
+
+	if err := yaml.Unmarshal(yml, &s.mappedConfig); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+type mappedMovieScraperConfig struct {
+	mappedConfig
+
+	Studio mappedConfig `yaml:"Studio"`
+	Tags   mappedConfig `yaml:"Tags"`
+}
+type _mappedMovieScraperConfig mappedMovieScraperConfig
+
+const (
+	mappedScraperConfigMovieStudio = "Studio"
+	mappedScraperConfigMovieTags   = "Tags"
+)
+
+func (s *mappedMovieScraperConfig) UnmarshalYAML(unmarshal func(interface{}) error) error {
+	// HACK - unmarshal to map first, then remove known movie sub-fields, then
+	// remarshal to yaml and pass that down to the base map
+	parentMap := make(map[string]interface{})
+	if err := unmarshal(parentMap); err != nil {
+		return err
+	}
+
+	// move the known sub-fields to a separate map
+	thisMap := make(map[string]interface{})
+
+	thisMap[mappedScraperConfigMovieStudio] = parentMap[mappedScraperConfigMovieStudio]
+	delete(parentMap, mappedScraperConfigMovieStudio)
+
+	thisMap[mappedScraperConfigMovieTags] = parentMap[mappedScraperConfigMovieTags]
+	delete(parentMap, mappedScraperConfigMovieTags)
+
+	// re-unmarshal the sub-fields
+	yml, err := yaml.Marshal(thisMap)
+	if err != nil {
+		return err
+	}
+
+	// needs to be a different type to prevent infinite recursion
+	c := _mappedMovieScraperConfig{}
+	if err := yaml.Unmarshal(yml, &c); err != nil {
+		return err
+	}
+
+	*s = mappedMovieScraperConfig(c)
+
+	yml, err = yaml.Marshal(parentMap)
+	if err != nil {
+		return err
+	}
+
+	if err := yaml.Unmarshal(yml, &s.mappedConfig); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+type mappedScraperAttrConfig struct {
+	Selector    string                    `yaml:"selector"`
+	Fixed       string                    `yaml:"fixed"`
+	PostProcess []mappedPostProcessAction `yaml:"postProcess"`
+	Concat      string                    `yaml:"concat"`
+	Split       string                    `yaml:"split"`
+
+	postProcessActions []postProcessAction
+
+	// Deprecated: use PostProcess instead
+	ParseDate  string                   `yaml:"parseDate"`
+	Replace    mappedRegexConfigs       `yaml:"replace"`
+	SubScraper *mappedScraperAttrConfig `yaml:"subScraper"`
+}
+
+type _mappedScraperAttrConfig mappedScraperAttrConfig
+
+func (c *mappedScraperAttrConfig) UnmarshalYAML(unmarshal func(interface{}) error) error {
+	// try unmarshalling into a string first
+	if err := unmarshal(&c.Selector); err != nil {
+		// if it's a type error then we try to unmarshall to the full object
+		var typeErr *yaml.TypeError
+		if !errors.As(err, &typeErr) {
+			return err
+		}
+
+		// unmarshall to full object
+		// need it as a separate object
+		t := _mappedScraperAttrConfig{}
+		if err = unmarshal(&t); err != nil {
+			return err
+		}
+
+		*c = mappedScraperAttrConfig(t)
+	}
+
+	return c.convertPostProcessActions()
+}
+
+func (c *mappedScraperAttrConfig) convertPostProcessActions() error {
+	// ensure we don't have the old deprecated fields and the new post process field
+	if len(c.PostProcess) > 0 {
+		if c.ParseDate != "" || len(c.Replace) > 0 || c.SubScraper != nil {
+			return errors.New("cannot include postProcess and (parseDate, replace, subScraper) deprecated fields")
+		}
+
+		// convert xpathPostProcessAction actions to postProcessActions
+		for _, a := range c.PostProcess {
+			action, err := a.ToPostProcessAction()
+			if err != nil {
+				return err
+			}
+			c.postProcessActions = append(c.postProcessActions, action)
+		}
+
+		c.PostProcess = nil
+	} else {
+		// convert old deprecated fields if present
+		// in same order as they used to be executed
+		if len(c.Replace) > 0 {
+			action := postProcessReplace(c.Replace)
+			c.postProcessActions = append(c.postProcessActions, &action)
+			c.Replace = nil
+		}
+
+		if c.SubScraper != nil {
+			action := postProcessSubScraper(*c.SubScraper)
+			c.postProcessActions = append(c.postProcessActions, &action)
+			c.SubScraper = nil
+		}
+
+		if c.ParseDate != "" {
+			action := postProcessParseDate(c.ParseDate)
+			c.postProcessActions = append(c.postProcessActions, &action)
+			c.ParseDate = ""
+		}
+	}
+
+	return nil
+}
+
+func (c mappedScraperAttrConfig) hasConcat() bool {
+	return c.Concat != ""
+}
+
+func (c mappedScraperAttrConfig) hasSplit() bool {
+	return c.Split != ""
+}
+
+func (c mappedScraperAttrConfig) concatenateResults(nodes []string) string {
+	separator := c.Concat
+	return strings.Join(nodes, separator)
+}
+
+func (c mappedScraperAttrConfig) cleanResults(nodes []string) []string {
+	cleaned := sliceutil.Unique(nodes)      // remove duplicate values
+	cleaned = sliceutil.Delete(cleaned, "") // remove empty values
+	return cleaned
+}
+
+func (c mappedScraperAttrConfig) splitString(value string) []string {
+	separator := c.Split
+	var res []string
+
+	if separator == "" {
+		return []string{value}
+	}
+
+	for _, str := range strings.Split(value, separator) {
+		if str != "" {
+			res = append(res, str)
+		}
+	}
+
+	return res
+}
+
+func (c mappedScraperAttrConfig) postProcess(ctx context.Context, value string, q mappedQuery) string {
+	for _, action := range c.postProcessActions {
+		value = action.Apply(ctx, value, q)
+	}
+
+	return value
+}
diff --git a/pkg/scraper/mapped_postprocessing.go b/pkg/scraper/mapped_postprocessing.go
new file mode 100644
index 000000000..22a8b748a
--- /dev/null
+++ b/pkg/scraper/mapped_postprocessing.go
@@ -0,0 +1,333 @@
+package scraper
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"math"
+	"regexp"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/stashapp/stash/pkg/javascript"
+	"github.com/stashapp/stash/pkg/logger"
+)
+
+type mappedRegexConfig struct {
+	Regex string `yaml:"regex"`
+	With  string `yaml:"with"`
+}
+
+type mappedRegexConfigs []mappedRegexConfig
+
+func (c mappedRegexConfig) apply(value string) string {
+	if c.Regex != "" {
+		re, err := regexp.Compile(c.Regex)
+		if err != nil {
+			logger.Warnf("Error compiling regex '%s': %s", c.Regex, err.Error())
+			return value
+		}
+
+		ret := re.ReplaceAllString(value, c.With)
+
+		// trim leading and trailing whitespace
+		// this is done to maintain backwards compatibility with existing
+		// scrapers
+		ret = strings.TrimSpace(ret)
+
+		logger.Debugf(`Replace: '%s' with '%s'`, c.Regex, c.With)
+		logger.Debugf("Before: %s", value)
+		logger.Debugf("After: %s", ret)
+		return ret
+	}
+
+	return value
+}
+
+func (c mappedRegexConfigs) apply(value string) string {
+	// apply regex in order
+	for _, config := range c {
+		value = config.apply(value)
+	}
+
+	return value
+}
+
+type postProcessAction interface {
+	Apply(ctx context.Context, value string, q mappedQuery) string
+}
+
+type postProcessParseDate string
+
+func (p *postProcessParseDate) Apply(ctx context.Context, value string, q mappedQuery) string {
+	parseDate := string(*p)
+
+	const internalDateFormat = "2006-01-02"
+
+	valueLower := strings.ToLower(value)
+	if valueLower == "today" || valueLower == "yesterday" { // handle today, yesterday
+		dt := time.Now()
+		if valueLower == "yesterday" { // subtract 1 day from now
+			dt = dt.AddDate(0, 0, -1)
+		}
+		return dt.Format(internalDateFormat)
+	}
+
+	if parseDate == "" {
+		return value
+	}
+
+	if parseDate == "unix" {
+		// try to parse the date using unix timestamp format
+		// if it fails, then just fall back to the original value
+		timeAsInt, err := strconv.ParseInt(value, 10, 64)
+		if err != nil {
+			logger.Warnf("Error parsing date string '%s' using unix timestamp format : %s", value, err.Error())
+			return value
+		}
+		parsedValue := time.Unix(timeAsInt, 0)
+
+		return parsedValue.Format(internalDateFormat)
+	}
+
+	// try to parse the date using the pattern
+	// if it fails, then just fall back to the original value
+	parsedValue, err := time.Parse(parseDate, value)
+	if err != nil {
+		logger.Warnf("Error parsing date string '%s' using format '%s': %s", value, parseDate, err.Error())
+		return value
+	}
+
+	// convert it into our date format
+	return parsedValue.Format(internalDateFormat)
+}
+
+type postProcessSubtractDays bool
+
+func (p *postProcessSubtractDays) Apply(ctx context.Context, value string, q mappedQuery) string {
+	const internalDateFormat = "2006-01-02"
+
+	i, err := strconv.Atoi(value)
+	if err != nil {
+		logger.Warnf("Error parsing day string %s: %s", value, err)
+		return value
+	}
+
+	dt := time.Now()
+	dt = dt.AddDate(0, 0, -i)
+	return dt.Format(internalDateFormat)
+}
+
+type postProcessReplace mappedRegexConfigs
+
+func (c *postProcessReplace) Apply(ctx context.Context, value string, q mappedQuery) string {
+	replace := mappedRegexConfigs(*c)
+	return replace.apply(value)
+}
+
+type postProcessSubScraper mappedScraperAttrConfig
+
+func (p *postProcessSubScraper) Apply(ctx context.Context, value string, q mappedQuery) string {
+	subScrapeConfig := mappedScraperAttrConfig(*p)
+
+	logger.Debugf("Sub-scraping for: %s", value)
+	ss := q.subScrape(ctx, value)
+
+	if ss != nil {
+		found, err := ss.runQuery(subScrapeConfig.Selector)
+		if err != nil {
+			logger.Warnf("subscrape for '%v': %v", value, err)
+		}
+
+		if len(found) > 0 {
+			// check if we're concatenating the results into a single result
+			var result string
+			if subScrapeConfig.hasConcat() {
+				result = subScrapeConfig.concatenateResults(found)
+			} else {
+				result = found[0]
+			}
+
+			result = subScrapeConfig.postProcess(ctx, result, ss)
+			return result
+		}
+	}
+
+	return ""
+}
+
+type postProcessMap map[string]string
+
+func (p *postProcessMap) Apply(ctx context.Context, value string, q mappedQuery) string {
+	// return the mapped value if present
+	m := *p
+	mapped, ok := m[value]
+
+	if ok {
+		return mapped
+	}
+
+	return value
+}
+
+type postProcessFeetToCm bool
+
+func (p *postProcessFeetToCm) Apply(ctx context.Context, value string, q mappedQuery) string {
+	const foot_in_cm = 30.48
+	const inch_in_cm = 2.54
+
+	reg := regexp.MustCompile("[0-9]+")
+	filtered := reg.FindAllString(value, -1)
+
+	var feet float64
+	var inches float64
+	if len(filtered) > 0 {
+		feet, _ = strconv.ParseFloat(filtered[0], 64)
+	}
+	if len(filtered) > 1 {
+		inches, _ = strconv.ParseFloat(filtered[1], 64)
+	}
+
+	var centimeters = feet*foot_in_cm + inches*inch_in_cm
+
+	// Return rounded integer string
+	return strconv.Itoa(int(math.Round(centimeters)))
+}
+
+type postProcessLbToKg bool
+
+func (p *postProcessLbToKg) Apply(ctx context.Context, value string, q mappedQuery) string {
+	const lb_in_kg = 0.45359237
+	w, err := strconv.ParseFloat(value, 64)
+	if err == nil {
+		w *= lb_in_kg
+		value = strconv.Itoa(int(math.Round(w)))
+	}
+	return value
+}
+
+type postProcessJavascript string
+
+func (p *postProcessJavascript) Apply(ctx context.Context, value string, q mappedQuery) string {
+	vm := javascript.NewVM()
+	if err := vm.Set("value", value); err != nil {
+		logger.Warnf("javascript failed to set value: %v", err)
+		return value
+	}
+
+	log := &javascript.Log{
+		Logger:       logger.Logger,
+		Prefix:       "",
+		ProgressChan: make(chan float64),
+	}
+
+	if err := log.AddToVM("log", vm); err != nil {
+		logger.Logger.Errorf("error adding log API: %w", err)
+	}
+
+	util := &javascript.Util{}
+	if err := util.AddToVM("util", vm); err != nil {
+		logger.Logger.Errorf("error adding util API: %w", err)
+	}
+
+	script, err := javascript.CompileScript("", "(function() { "+string(*p)+"})()")
+	if err != nil {
+		logger.Warnf("javascript failed to compile: %v", err)
+		return value
+	}
+
+	output, err := vm.RunProgram(script)
+	if err != nil {
+		logger.Warnf("javascript failed to run: %v", err)
+		return value
+	}
+
+	// assume output is string
+	return output.String()
+}
+
+type mappedPostProcessAction struct {
+	ParseDate    string                   `yaml:"parseDate"`
+	SubtractDays bool                     `yaml:"subtractDays"`
+	Replace      mappedRegexConfigs       `yaml:"replace"`
+	SubScraper   *mappedScraperAttrConfig `yaml:"subScraper"`
+	Map          map[string]string        `yaml:"map"`
+	FeetToCm     bool                     `yaml:"feetToCm"`
+	LbToKg       bool                     `yaml:"lbToKg"`
+	Javascript   string                   `yaml:"javascript"`
+}
+
+func (a mappedPostProcessAction) ToPostProcessAction() (postProcessAction, error) {
+	var found string
+	var ret postProcessAction
+
+	ensureOnly := func(field string) error {
+		if found != "" {
+			return fmt.Errorf("post-process actions must have a single field, found %s and %s", found, field)
+		}
+		found = field
+		return nil
+	}
+
+	if a.ParseDate != "" {
+		found = "parseDate"
+		action := postProcessParseDate(a.ParseDate)
+		ret = &action
+	}
+	if len(a.Replace) > 0 {
+		if err := ensureOnly("replace"); err != nil {
+			return nil, err
+		}
+		action := postProcessReplace(a.Replace)
+		ret = &action
+	}
+	if a.SubScraper != nil {
+		if err := ensureOnly("subScraper"); err != nil {
+			return nil, err
+		}
+		action := postProcessSubScraper(*a.SubScraper)
+		ret = &action
+	}
+	if a.Map != nil {
+		if err := ensureOnly("map"); err != nil {
+			return nil, err
+		}
+		action := postProcessMap(a.Map)
+		ret = &action
+	}
+	if a.FeetToCm {
+		if err := ensureOnly("feetToCm"); err != nil {
+			return nil, err
+		}
+		action := postProcessFeetToCm(a.FeetToCm)
+		ret = &action
+	}
+	if a.LbToKg {
+		if err := ensureOnly("lbToKg"); err != nil {
+			return nil, err
+		}
+		action := postProcessLbToKg(a.LbToKg)
+		ret = &action
+	}
+	if a.SubtractDays {
+		if err := ensureOnly("subtractDays"); err != nil {
+			return nil, err
+		}
+		action := postProcessSubtractDays(a.SubtractDays)
+		ret = &action
+	}
+	if a.Javascript != "" {
+		if err := ensureOnly("javascript"); err != nil {
+			return nil, err
+		}
+		action := postProcessJavascript(a.Javascript)
+		ret = &action
+	}
+
+	if ret == nil {
+		return nil, errors.New("invalid post-process action")
+	}
+
+	return ret, nil
+}
diff --git a/pkg/scraper/mapped_result.go b/pkg/scraper/mapped_result.go
new file mode 100644
index 000000000..eb06a4eba
--- /dev/null
+++ b/pkg/scraper/mapped_result.go
@@ -0,0 +1,276 @@
+package scraper
+
+import (
+	"github.com/stashapp/stash/pkg/logger"
+	"github.com/stashapp/stash/pkg/models"
+)
+
+type mappedResult map[string]interface{}
+type mappedResults []mappedResult
+
+func (r mappedResult) string(key string) (string, bool) {
+	v, ok := r[key]
+	if !ok {
+		return "", false
+	}
+
+	val, ok := v.(string)
+	if !ok {
+		logger.Errorf("String field %s is %T in mappedResult", key, r[key])
+	}
+
+	return val, true
+}
+
+func (r mappedResult) mustString(key string) string {
+	v, ok := r[key]
+	if !ok {
+		logger.Errorf("Missing required string field %s in mappedResult", key)
+		return ""
+	}
+
+	val, ok := v.(string)
+	if !ok {
+		logger.Errorf("String field %s is %T in mappedResult", key, r[key])
+	}
+
+	return val
+}
+
+func (r mappedResult) stringPtr(key string) *string {
+	val, ok := r.string(key)
+	if !ok {
+		return nil
+	}
+	return &val
+}
+
+func (r mappedResult) stringSlice(key string) []string {
+	v, ok := r[key]
+	if !ok {
+		return nil
+	}
+
+	// need to try both []string and string
+	val, ok := v.([]string)
+
+	if ok {
+		return val
+	}
+
+	// try single string
+	singleVal, ok := v.(string)
+	if !ok {
+		logger.Errorf("String slice field %s is %T in mappedResult", key, r[key])
+		return nil
+	}
+
+	return []string{singleVal}
+}
+
+func (r mappedResult) IntPtr(key string) *int {
+	v, ok := r[key]
+	if !ok {
+		return nil
+	}
+
+	val, ok := v.(int)
+	if !ok {
+		logger.Errorf("Int field %s is %T in mappedResult", key, r[key])
+		return nil
+	}
+
+	return &val
+}
+
+func (r mappedResults) setSingleValue(index int, key string, value string) mappedResults {
+	if index >= len(r) {
+		r = append(r, make(mappedResult))
+	}
+
+	logger.Debugf(`[%d][%s] = %s`, index, key, value)
+	r[index][key] = value
+	return r
+}
+
+func (r mappedResults) setMultiValue(index int, key string, value []string) mappedResults {
+	if index >= len(r) {
+		r = append(r, make(mappedResult))
+	}
+
+	logger.Debugf(`[%d][%s] = %s`, index, key, value)
+	r[index][key] = value
+	return r
+}
+
+func (r mappedResults) scrapedTags() []*models.ScrapedTag {
+	if len(r) == 0 {
+		return nil
+	}
+
+	ret := make([]*models.ScrapedTag, len(r))
+	for i, result := range r {
+		ret[i] = result.scrapedTag()
+	}
+
+	return ret
+}
+
+func (r mappedResult) scrapedTag() *models.ScrapedTag {
+	return &models.ScrapedTag{
+		Name: r.mustString("Name"),
+	}
+}
+
+func (r mappedResult) scrapedPerformer() *models.ScrapedPerformer {
+	ret := &models.ScrapedPerformer{
+		Name:           r.stringPtr("Name"),
+		Disambiguation: r.stringPtr("Disambiguation"),
+		Gender:         r.stringPtr("Gender"),
+		URL:            r.stringPtr("URL"),
+		URLs:           r.stringSlice("URLs"),
+		Twitter:        r.stringPtr("Twitter"),
+		Birthdate:      r.stringPtr("Birthdate"),
+		Ethnicity:      r.stringPtr("Ethnicity"),
+		Country:        r.stringPtr("Country"),
+		EyeColor:       r.stringPtr("EyeColor"),
+		Height:         r.stringPtr("Height"),
+		Measurements:   r.stringPtr("Measurements"),
+		FakeTits:       r.stringPtr("FakeTits"),
+		PenisLength:    r.stringPtr("PenisLength"),
+		Circumcised:    r.stringPtr("Circumcised"),
+		CareerLength:   r.stringPtr("CareerLength"),
+		Tattoos:        r.stringPtr("Tattoos"),
+		Piercings:      r.stringPtr("Piercings"),
+		Aliases:        r.stringPtr("Aliases"),
+		Image:          r.stringPtr("Image"),
+		Images:         r.stringSlice("Images"),
+		Details:        r.stringPtr("Details"),
+		DeathDate:      r.stringPtr("DeathDate"),
+		HairColor:      r.stringPtr("HairColor"),
+		Weight:         r.stringPtr("Weight"),
+	}
+	return ret
+}
+
+func (r mappedResults) scrapedPerformers() []*models.ScrapedPerformer {
+	if len(r) == 0 {
+		return nil
+	}
+
+	ret := make([]*models.ScrapedPerformer, len(r))
+	for i, result := range r {
+		ret[i] = result.scrapedPerformer()
+	}
+
+	return ret
+}
+
+func (r mappedResult) scrapedScene() *models.ScrapedScene {
+	ret := &models.ScrapedScene{
+		Title:    r.stringPtr("Title"),
+		Code:     r.stringPtr("Code"),
+		Details:  r.stringPtr("Details"),
+		Director: r.stringPtr("Director"),
+		URL:      r.stringPtr("URL"),
+		URLs:     r.stringSlice("URLs"),
+		Date:     r.stringPtr("Date"),
+		Image:    r.stringPtr("Image"),
+		Duration: r.IntPtr("Duration"),
+	}
+	return ret
+}
+
+func (r mappedResult) scrapedImage() *models.ScrapedImage {
+	ret := &models.ScrapedImage{
+		Title:        r.stringPtr("Title"),
+		Code:         r.stringPtr("Code"),
+		Details:      r.stringPtr("Details"),
+		Photographer: r.stringPtr("Photographer"),
+		URLs:         r.stringSlice("URLs"),
+		Date:         r.stringPtr("Date"),
+	}
+	return ret
+}
+
+func (r mappedResult) scrapedGallery() *models.ScrapedGallery {
+	ret := &models.ScrapedGallery{
+		Title:        r.stringPtr("Title"),
+		Code:         r.stringPtr("Code"),
+		Details:      r.stringPtr("Details"),
+		Photographer: r.stringPtr("Photographer"),
+		URL:          r.stringPtr("URL"),
+		URLs:         r.stringSlice("URLs"),
+		Date:         r.stringPtr("Date"),
+	}
+	return ret
+}
+
+func (r mappedResult) scrapedStudio() *models.ScrapedStudio {
+	ret := &models.ScrapedStudio{
+		Name:    r.mustString("Name"),
+		URL:     r.stringPtr("URL"),
+		URLs:    r.stringSlice("URLs"),
+		Image:   r.stringPtr("Image"),
+		Details: r.stringPtr("Details"),
+		Aliases: r.stringPtr("Aliases"),
+	}
+	return ret
+}
+
+func (r mappedResult) scrapedMovie() *models.ScrapedMovie {
+	ret := &models.ScrapedMovie{
+		Name:       r.stringPtr("Name"),
+		Aliases:    r.stringPtr("Aliases"),
+		URLs:       r.stringSlice("URLs"),
+		Duration:   r.stringPtr("Duration"),
+		Date:       r.stringPtr("Date"),
+		Director:   r.stringPtr("Director"),
+		Synopsis:   r.stringPtr("Synopsis"),
+		FrontImage: r.stringPtr("FrontImage"),
+		BackImage:  r.stringPtr("BackImage"),
+	}
+
+	return ret
+}
+
+func (r mappedResult) scrapedGroup() *models.ScrapedGroup {
+	ret := &models.ScrapedGroup{
+		Name:       r.stringPtr("Name"),
+		Aliases:    r.stringPtr("Aliases"),
+		URL:        r.stringPtr("URL"),
+		URLs:       r.stringSlice("URLs"),
+		Duration:   r.stringPtr("Duration"),
+		Date:       r.stringPtr("Date"),
+		Director:   r.stringPtr("Director"),
+		Synopsis:   r.stringPtr("Synopsis"),
+		FrontImage: r.stringPtr("FrontImage"),
+		BackImage:  r.stringPtr("BackImage"),
+	}
+
+	return ret
+}
+
+func (r mappedResults) scrapedMovies() []*models.ScrapedMovie {
+	if len(r) == 0 {
+		return nil
+	}
+	ret := make([]*models.ScrapedMovie, len(r))
+	for i, result := range r {
+		ret[i] = result.scrapedMovie()
+	}
+
+	return ret
+}
+
+func (r mappedResults) scrapedGroups() []*models.ScrapedGroup {
+	if len(r) == 0 {
+		return nil
+	}
+	ret := make([]*models.ScrapedGroup, len(r))
+	for i, result := range r {
+		ret[i] = result.scrapedGroup()
+	}
+
+	return ret
+}
diff --git a/pkg/scraper/mapped_result_test.go b/pkg/scraper/mapped_result_test.go
new file mode 100644
index 000000000..db6d921bf
--- /dev/null
+++ b/pkg/scraper/mapped_result_test.go
@@ -0,0 +1,908 @@
+package scraper
+
+import (
+	"testing"
+
+	"github.com/stashapp/stash/pkg/models"
+	"github.com/stretchr/testify/assert"
+)
+
+// Test string method
+func TestMappedResultString(t *testing.T) {
+	tests := []struct {
+		name          string
+		data          mappedResult
+		key           string
+		expectedValue string
+		expectedOk    bool
+	}{
+		{
+			name:          "valid string",
+			data:          mappedResult{"name": "test"},
+			key:           "name",
+			expectedValue: "test",
+			expectedOk:    true,
+		},
+		{
+			name:          "missing key",
+			data:          mappedResult{},
+			key:           "missing",
+			expectedValue: "",
+			expectedOk:    false,
+		},
+		{
+			name:          "wrong type still returns ok true but empty value",
+			data:          mappedResult{"num": 123},
+			key:           "num",
+			expectedValue: "",
+			expectedOk:    true, // logs error but returns ok=true
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			val, ok := test.data.string(test.key)
+			assert.Equal(t, test.expectedValue, val)
+			assert.Equal(t, test.expectedOk, ok)
+		})
+	}
+}
+
+// Test mustString method
+func TestMappedResultMustString(t *testing.T) {
+	tests := []struct {
+		name          string
+		data          mappedResult
+		key           string
+		expectedValue string
+	}{
+		{
+			name:          "valid string",
+			data:          mappedResult{"name": "test"},
+			key:           "name",
+			expectedValue: "test",
+		},
+		{
+			name:          "missing key returns empty string",
+			data:          mappedResult{},
+			key:           "missing",
+			expectedValue: "",
+		},
+		{
+			name:          "wrong type returns empty string",
+			data:          mappedResult{"num": 123},
+			key:           "num",
+			expectedValue: "",
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			val := test.data.mustString(test.key)
+			assert.Equal(t, test.expectedValue, val)
+		})
+	}
+}
+
+// Test stringPtr method
+func TestMappedResultStringPtr(t *testing.T) {
+	tests := []struct {
+		name          string
+		data          mappedResult
+		key           string
+		expectedValue *string
+	}{
+		{
+			name:          "valid string",
+			data:          mappedResult{"name": "test"},
+			key:           "name",
+			expectedValue: strPtr("test"),
+		},
+		{
+			name:          "missing key returns nil",
+			data:          mappedResult{},
+			key:           "missing",
+			expectedValue: nil,
+		},
+		{
+			name:          "wrong type returns non-nil pointer to empty string",
+			data:          mappedResult{"num": 123},
+			key:           "num",
+			expectedValue: strPtr(""), // string() returns empty string but ok=true
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			val := test.data.stringPtr(test.key)
+			if test.expectedValue == nil {
+				assert.Nil(t, val)
+			} else {
+				assert.NotNil(t, val)
+				assert.Equal(t, *test.expectedValue, *val)
+			}
+		})
+	}
+}
+
+// Test stringSlice method
+func TestMappedResultStringSlice(t *testing.T) {
+	tests := []struct {
+		name          string
+		data          mappedResult
+		key           string
+		expectedValue []string
+	}{
+		{
+			name:          "valid slice",
+			data:          mappedResult{"tags": []string{"a", "b", "c"}},
+			key:           "tags",
+			expectedValue: []string{"a", "b", "c"},
+		},
+		{
+			name:          "missing key returns nil",
+			data:          mappedResult{},
+			key:           "missing",
+			expectedValue: nil,
+		},
+		{
+			name:          "single value converted to slice",
+			data:          mappedResult{"tags": "not a slice"},
+			key:           "tags",
+			expectedValue: []string{"not a slice"},
+		},
+		{
+			name:          "wrong type returns nil",
+			data:          mappedResult{"tags": 123},
+			key:           "tags",
+			expectedValue: nil,
+		},
+		{
+			name:          "empty slice",
+			data:          mappedResult{"tags": []string{}},
+			key:           "tags",
+			expectedValue: []string{},
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			val := test.data.stringSlice(test.key)
+			assert.Equal(t, test.expectedValue, val)
+		})
+	}
+}
+
+// Test IntPtr method
+func TestMappedResultIntPtr(t *testing.T) {
+	tests := []struct {
+		name          string
+		data          mappedResult
+		key           string
+		expectedValue *int
+	}{
+		{
+			name:          "valid int",
+			data:          mappedResult{"duration": 120},
+			key:           "duration",
+			expectedValue: intPtr(120),
+		},
+		{
+			name:          "missing key returns nil",
+			data:          mappedResult{},
+			key:           "missing",
+			expectedValue: nil,
+		},
+		{
+			name:          "wrong type returns nil",
+			data:          mappedResult{"duration": "120"},
+			key:           "duration",
+			expectedValue: nil,
+		},
+		{
+			name:          "zero value",
+			data:          mappedResult{"duration": 0},
+			key:           "duration",
+			expectedValue: intPtr(0),
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			val := test.data.IntPtr(test.key)
+			assert.Equal(t, test.expectedValue, val)
+		})
+	}
+}
+
+// Test setSingleValue method
+func TestMappedResultsSetSingleValue(t *testing.T) {
+	tests := []struct {
+		name           string
+		initialResults mappedResults
+		index          int
+		key            string
+		value          string
+		expectedLen    int
+		shouldPanic    bool
+	}{
+		{
+			name:           "append to empty",
+			initialResults: mappedResults{},
+			index:          0,
+			key:            "name",
+			value:          "test",
+			expectedLen:    1,
+			shouldPanic:    false,
+		},
+		{
+			name:           "set in existing",
+			initialResults: mappedResults{mappedResult{}},
+			index:          0,
+			key:            "name",
+			value:          "test",
+			expectedLen:    1,
+			shouldPanic:    false,
+		},
+		{
+			name:           "append to existing",
+			initialResults: mappedResults{mappedResult{}},
+			index:          1,
+			key:            "name",
+			value:          "test",
+			expectedLen:    2,
+			shouldPanic:    false,
+		},
+		{
+			name:           "sparse index causes panic",
+			initialResults: mappedResults{mappedResult{}},
+			index:          5,
+			key:            "name",
+			value:          "test",
+			expectedLen:    6,
+			shouldPanic:    true,
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			if test.shouldPanic {
+				assert.Panics(t, func() {
+					test.initialResults.setSingleValue(test.index, test.key, test.value)
+				})
+			} else {
+				results := test.initialResults.setSingleValue(test.index, test.key, test.value)
+				assert.Equal(t, test.expectedLen, len(results))
+				assert.Equal(t, test.value, results[test.index][test.key])
+			}
+		})
+	}
+}
+
+// Test setMultiValue method
+func TestMappedResultsSetMultiValue(t *testing.T) {
+	tests := []struct {
+		name           string
+		initialResults mappedResults
+		index          int
+		key            string
+		value          []string
+		expectedLen    int
+	}{
+		{
+			name:           "append to empty",
+			initialResults: mappedResults{},
+			index:          0,
+			key:            "tags",
+			value:          []string{"a", "b"},
+			expectedLen:    1,
+		},
+		{
+			name:           "set in existing",
+			initialResults: mappedResults{mappedResult{}},
+			index:          0,
+			key:            "tags",
+			value:          []string{"a", "b"},
+			expectedLen:    1,
+		},
+		{
+			name:           "append to existing",
+			initialResults: mappedResults{mappedResult{}},
+			index:          1,
+			key:            "tags",
+			value:          []string{"x", "y"},
+			expectedLen:    2,
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			results := test.initialResults.setMultiValue(test.index, test.key, test.value)
+			assert.Equal(t, test.expectedLen, len(results))
+			assert.Equal(t, test.value, results[test.index][test.key])
+		})
+	}
+}
+
+// Test scrapedTag method
+func TestMappedResultScrapedTag(t *testing.T) {
+	tests := []struct {
+		name         string
+		data         mappedResult
+		expectedName string
+	}{
+		{
+			name:         "valid tag",
+			data:         mappedResult{"Name": "Action"},
+			expectedName: "Action",
+		},
+		{
+			name:         "missing name",
+			data:         mappedResult{},
+			expectedName: "",
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			tag := test.data.scrapedTag()
+			assert.NotNil(t, tag)
+			assert.Equal(t, test.expectedName, tag.Name)
+		})
+	}
+}
+
+// Test scrapedTags method
+func TestMappedResultsScrapedTags(t *testing.T) {
+	tests := []struct {
+		name          string
+		data          mappedResults
+		expectedCount int
+		expectedNames []string
+	}{
+		{
+			name:          "empty results",
+			data:          mappedResults{},
+			expectedCount: 0,
+		},
+		{
+			name: "single tag",
+			data: mappedResults{
+				mappedResult{"Name": "Action"},
+			},
+			expectedCount: 1,
+			expectedNames: []string{"Action"},
+		},
+		{
+			name: "multiple tags",
+			data: mappedResults{
+				mappedResult{"Name": "Action"},
+				mappedResult{"Name": "Drama"},
+				mappedResult{"Name": "Comedy"},
+			},
+			expectedCount: 3,
+			expectedNames: []string{"Action", "Drama", "Comedy"},
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			tags := test.data.scrapedTags()
+			if test.expectedCount == 0 {
+				assert.Nil(t, tags)
+			} else {
+				assert.NotNil(t, tags)
+				assert.Equal(t, test.expectedCount, len(tags))
+				for i, expectedName := range test.expectedNames {
+					assert.Equal(t, expectedName, tags[i].Name)
+				}
+			}
+		})
+	}
+}
+
+// Test scrapedPerformer method
+func TestMappedResultScrapedPerformer(t *testing.T) {
+	tests := []struct {
+		name     string
+		data     mappedResult
+		validate func(t *testing.T, p *models.ScrapedPerformer)
+	}{
+		{
+			name: "full performer",
+			data: mappedResult{
+				"Name":           "Jane Doe",
+				"Disambiguation": "Actress",
+				"Gender":         "Female",
+				"URL":            "https://example.com/jane",
+				"URLs":           []string{"url1", "url2"},
+				"Twitter":        "@jane",
+				"Birthdate":      "1990-01-01",
+				"Ethnicity":      "Caucasian",
+				"Country":        "USA",
+				"EyeColor":       "Blue",
+				"Height":         "5'6\"",
+				"Measurements":   "36-24-36",
+				"FakeTits":       "No",
+				"PenisLength":    "N/A",
+				"Circumcised":    "N/A",
+				"CareerLength":   "10 years",
+				"Tattoos":        "Yes",
+				"Piercings":      "Yes",
+				"Aliases":        "Jane Smith",
+				"Image":          "image.jpg",
+				"Images":         []string{"img1", "img2"},
+				"Details":        "Some details",
+				"DeathDate":      "N/A",
+				"HairColor":      "Blonde",
+				"Weight":         "130 lbs",
+			},
+			validate: func(t *testing.T, p *models.ScrapedPerformer) {
+				assert.NotNil(t, p)
+				assert.Equal(t, "Jane Doe", *p.Name)
+				assert.Equal(t, "Actress", *p.Disambiguation)
+				assert.Equal(t, "Female", *p.Gender)
+				assert.Equal(t, "https://example.com/jane", *p.URL)
+				assert.Equal(t, []string{"url1", "url2"}, p.URLs)
+				assert.Equal(t, "@jane", *p.Twitter)
+				assert.Equal(t, "Blonde", *p.HairColor)
+				assert.Equal(t, "130 lbs", *p.Weight)
+			},
+		},
+		{
+			name: "minimal performer",
+			data: mappedResult{},
+			validate: func(t *testing.T, p *models.ScrapedPerformer) {
+				assert.NotNil(t, p)
+				assert.Nil(t, p.Name)
+				assert.Nil(t, p.Gender)
+				assert.Empty(t, p.URLs)
+			},
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			performer := test.data.scrapedPerformer()
+			test.validate(t, performer)
+		})
+	}
+}
+
+// Test scrapedPerformers method
+func TestMappedResultsScrapedPerformers(t *testing.T) {
+	tests := []struct {
+		name          string
+		data          mappedResults
+		expectedCount int
+	}{
+		{
+			name:          "empty results",
+			data:          mappedResults{},
+			expectedCount: 0,
+		},
+		{
+			name: "single performer",
+			data: mappedResults{
+				mappedResult{"Name": "Jane Doe"},
+			},
+			expectedCount: 1,
+		},
+		{
+			name: "multiple performers",
+			data: mappedResults{
+				mappedResult{"Name": "Jane Doe"},
+				mappedResult{"Name": "John Doe"},
+				mappedResult{"Name": "Alice"},
+			},
+			expectedCount: 3,
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			performers := test.data.scrapedPerformers()
+			if test.expectedCount == 0 {
+				assert.Nil(t, performers)
+			} else {
+				assert.NotNil(t, performers)
+				assert.Equal(t, test.expectedCount, len(performers))
+			}
+		})
+	}
+}
+
+// Test scrapedScene method
+func TestMappedResultScrapedScene(t *testing.T) {
+	tests := []struct {
+		name     string
+		data     mappedResult
+		validate func(t *testing.T, s *models.ScrapedScene)
+	}{
+		{
+			name: "full scene",
+			data: mappedResult{
+				"Title":    "Scene Title",
+				"Code":     "CODE123",
+				"Details":  "Scene details",
+				"Director": "John Smith",
+				"URL":      "https://example.com/scene",
+				"URLs":     []string{"url1", "url2"},
+				"Date":     "2020-01-01",
+				"Image":    "scene.jpg",
+				"Duration": 3600,
+			},
+			validate: func(t *testing.T, s *models.ScrapedScene) {
+				assert.NotNil(t, s)
+				assert.Equal(t, "Scene Title", *s.Title)
+				assert.Equal(t, "CODE123", *s.Code)
+				assert.Equal(t, "Scene details", *s.Details)
+				assert.Equal(t, "John Smith", *s.Director)
+				assert.Equal(t, "https://example.com/scene", *s.URL)
+				assert.Equal(t, []string{"url1", "url2"}, s.URLs)
+				assert.Equal(t, "2020-01-01", *s.Date)
+				assert.Equal(t, "scene.jpg", *s.Image)
+				assert.Equal(t, 3600, *s.Duration)
+			},
+		},
+		{
+			name: "minimal scene",
+			data: mappedResult{},
+			validate: func(t *testing.T, s *models.ScrapedScene) {
+				assert.NotNil(t, s)
+				assert.Nil(t, s.Title)
+				assert.Nil(t, s.Duration)
+				assert.Empty(t, s.URLs)
+			},
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			scene := test.data.scrapedScene()
+			test.validate(t, scene)
+		})
+	}
+}
+
+// Test scrapedImage method
+func TestMappedResultScrapedImage(t *testing.T) {
+	tests := []struct {
+		name     string
+		data     mappedResult
+		validate func(t *testing.T, i *models.ScrapedImage)
+	}{
+		{
+			name: "full image",
+			data: mappedResult{
+				"Title":        "Image Title",
+				"Code":         "IMG123",
+				"Details":      "Image details",
+				"Photographer": "Jane Photographer",
+				"URLs":         []string{"url1", "url2"},
+				"Date":         "2020-06-15",
+			},
+			validate: func(t *testing.T, i *models.ScrapedImage) {
+				assert.NotNil(t, i)
+				assert.Equal(t, "Image Title", *i.Title)
+				assert.Equal(t, "IMG123", *i.Code)
+				assert.Equal(t, "Image details", *i.Details)
+				assert.Equal(t, "Jane Photographer", *i.Photographer)
+				assert.Equal(t, []string{"url1", "url2"}, i.URLs)
+				assert.Equal(t, "2020-06-15", *i.Date)
+			},
+		},
+		{
+			name: "minimal image",
+			data: mappedResult{},
+			validate: func(t *testing.T, i *models.ScrapedImage) {
+				assert.NotNil(t, i)
+				assert.Nil(t, i.Title)
+				assert.Empty(t, i.URLs)
+			},
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			image := test.data.scrapedImage()
+			test.validate(t, image)
+		})
+	}
+}
+
+// Test scrapedGallery method
+func TestMappedResultScrapedGallery(t *testing.T) {
+	tests := []struct {
+		name     string
+		data     mappedResult
+		validate func(t *testing.T, g *models.ScrapedGallery)
+	}{
+		{
+			name: "full gallery",
+			data: mappedResult{
+				"Title":        "Gallery Title",
+				"Code":         "GAL123",
+				"Details":      "Gallery details",
+				"Photographer": "Jane Photographer",
+				"URL":          "https://example.com/gallery",
+				"URLs":         []string{"url1", "url2"},
+				"Date":         "2020-07-20",
+			},
+			validate: func(t *testing.T, g *models.ScrapedGallery) {
+				assert.NotNil(t, g)
+				assert.Equal(t, "Gallery Title", *g.Title)
+				assert.Equal(t, "GAL123", *g.Code)
+				assert.Equal(t, "Gallery details", *g.Details)
+				assert.Equal(t, "Jane Photographer", *g.Photographer)
+				assert.Equal(t, "https://example.com/gallery", *g.URL)
+				assert.Equal(t, []string{"url1", "url2"}, g.URLs)
+				assert.Equal(t, "2020-07-20", *g.Date)
+			},
+		},
+		{
+			name: "minimal gallery",
+			data: mappedResult{},
+			validate: func(t *testing.T, g *models.ScrapedGallery) {
+				assert.NotNil(t, g)
+				assert.Nil(t, g.Title)
+				assert.Empty(t, g.URLs)
+			},
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			gallery := test.data.scrapedGallery()
+			test.validate(t, gallery)
+		})
+	}
+}
+
+// Test scrapedStudio method
+func TestMappedResultScrapedStudio(t *testing.T) {
+	tests := []struct {
+		name     string
+		data     mappedResult
+		validate func(t *testing.T, st *models.ScrapedStudio)
+	}{
+		{
+			name: "full studio",
+			data: mappedResult{
+				"Name":    "Studio Name",
+				"URL":     "https://example.com/studio",
+				"URLs":    []string{"url1", "url2"},
+				"Image":   "studio.jpg",
+				"Details": "Studio details",
+				"Aliases": "Studio Alias",
+			},
+			validate: func(t *testing.T, st *models.ScrapedStudio) {
+				assert.NotNil(t, st)
+				assert.Equal(t, "Studio Name", st.Name)
+				assert.Equal(t, "https://example.com/studio", *st.URL)
+				assert.Equal(t, []string{"url1", "url2"}, st.URLs)
+				assert.Equal(t, "studio.jpg", *st.Image)
+				assert.Equal(t, "Studio details", *st.Details)
+				assert.Equal(t, "Studio Alias", *st.Aliases)
+			},
+		},
+		{
+			name: "minimal studio",
+			data: mappedResult{},
+			validate: func(t *testing.T, st *models.ScrapedStudio) {
+				assert.NotNil(t, st)
+				assert.Equal(t, "", st.Name) // mustString returns empty string
+				assert.Nil(t, st.URL)
+				assert.Empty(t, st.URLs)
+			},
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			studio := test.data.scrapedStudio()
+			test.validate(t, studio)
+		})
+	}
+}
+
+// Test scrapedMovie method
+func TestMappedResultScrapedMovie(t *testing.T) {
+	tests := []struct {
+		name     string
+		data     mappedResult
+		validate func(t *testing.T, m *models.ScrapedMovie)
+	}{
+		{
+			name: "full movie",
+			data: mappedResult{
+				"Name":       "Movie Title",
+				"Aliases":    "Movie Alias",
+				"URLs":       []string{"url1", "url2"},
+				"Duration":   "120 minutes",
+				"Date":       "2020-05-10",
+				"Director":   "John Director",
+				"Synopsis":   "Movie synopsis",
+				"FrontImage": "front.jpg",
+				"BackImage":  "back.jpg",
+			},
+			validate: func(t *testing.T, m *models.ScrapedMovie) {
+				assert.NotNil(t, m)
+				assert.Equal(t, "Movie Title", *m.Name)
+				assert.Equal(t, "Movie Alias", *m.Aliases)
+				assert.Equal(t, []string{"url1", "url2"}, m.URLs)
+				assert.Equal(t, "120 minutes", *m.Duration)
+				assert.Equal(t, "2020-05-10", *m.Date)
+				assert.Equal(t, "John Director", *m.Director)
+				assert.Equal(t, "Movie synopsis", *m.Synopsis)
+				assert.Equal(t, "front.jpg", *m.FrontImage)
+				assert.Equal(t, "back.jpg", *m.BackImage)
+			},
+		},
+		{
+			name: "minimal movie",
+			data: mappedResult{},
+			validate: func(t *testing.T, m *models.ScrapedMovie) {
+				assert.NotNil(t, m)
+				assert.Nil(t, m.Name)
+				assert.Empty(t, m.URLs)
+			},
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			movie := test.data.scrapedMovie()
+			test.validate(t, movie)
+		})
+	}
+}
+
+// Test scrapedMovies method
+func TestMappedResultsScrapedMovies(t *testing.T) {
+	tests := []struct {
+		name          string
+		data          mappedResults
+		expectedCount int
+	}{
+		{
+			name:          "empty results",
+			data:          mappedResults{},
+			expectedCount: 0,
+		},
+		{
+			name: "single movie",
+			data: mappedResults{
+				mappedResult{"Name": "Movie 1"},
+			},
+			expectedCount: 1,
+		},
+		{
+			name: "multiple movies",
+			data: mappedResults{
+				mappedResult{"Name": "Movie 1"},
+				mappedResult{"Name": "Movie 2"},
+				mappedResult{"Name": "Movie 3"},
+			},
+			expectedCount: 3,
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			movies := test.data.scrapedMovies()
+			if test.expectedCount == 0 {
+				assert.Nil(t, movies)
+			} else {
+				assert.NotNil(t, movies)
+				assert.Equal(t, test.expectedCount, len(movies))
+			}
+		})
+	}
+}
+
+// Test scrapedGroup method
+func TestMappedResultScrapedGroup(t *testing.T) {
+	tests := []struct {
+		name     string
+		data     mappedResult
+		validate func(t *testing.T, g *models.ScrapedGroup)
+	}{
+		{
+			name: "full group",
+			data: mappedResult{
+				"Name":       "Group Title",
+				"Aliases":    "Group Alias",
+				"URL":        "https://example.com/group",
+				"URLs":       []string{"url1", "url2"},
+				"Duration":   "240 minutes",
+				"Date":       "2020-08-15",
+				"Director":   "Jane Director",
+				"Synopsis":   "Group synopsis",
+				"FrontImage": "front.jpg",
+				"BackImage":  "back.jpg",
+			},
+			validate: func(t *testing.T, g *models.ScrapedGroup) {
+				assert.NotNil(t, g)
+				assert.Equal(t, "Group Title", *g.Name)
+				assert.Equal(t, "Group Alias", *g.Aliases)
+				assert.Equal(t, "https://example.com/group", *g.URL)
+				assert.Equal(t, []string{"url1", "url2"}, g.URLs)
+				assert.Equal(t, "240 minutes", *g.Duration)
+				assert.Equal(t, "2020-08-15", *g.Date)
+				assert.Equal(t, "Jane Director", *g.Director)
+				assert.Equal(t, "Group synopsis", *g.Synopsis)
+				assert.Equal(t, "front.jpg", *g.FrontImage)
+				assert.Equal(t, "back.jpg", *g.BackImage)
+			},
+		},
+		{
+			name: "minimal group",
+			data: mappedResult{},
+			validate: func(t *testing.T, g *models.ScrapedGroup) {
+				assert.NotNil(t, g)
+				assert.Nil(t, g.Name)
+				assert.Empty(t, g.URLs)
+			},
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			group := test.data.scrapedGroup()
+			test.validate(t, group)
+		})
+	}
+}
+
+// Test scrapedGroups method
+func TestMappedResultsScrapedGroups(t *testing.T) {
+	tests := []struct {
+		name          string
+		data          mappedResults
+		expectedCount int
+	}{
+		{
+			name:          "empty results",
+			data:          mappedResults{},
+			expectedCount: 0,
+		},
+		{
+			name: "single group",
+			data: mappedResults{
+				mappedResult{"Name": "Group 1"},
+			},
+			expectedCount: 1,
+		},
+		{
+			name: "multiple groups",
+			data: mappedResults{
+				mappedResult{"Name": "Group 1"},
+				mappedResult{"Name": "Group 2"},
+				mappedResult{"Name": "Group 3"},
+			},
+			expectedCount: 3,
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			groups := test.data.scrapedGroups()
+			if test.expectedCount == 0 {
+				assert.Nil(t, groups)
+			} else {
+				assert.NotNil(t, groups)
+				assert.Equal(t, test.expectedCount, len(groups))
+			}
+		})
+	}
+}
+
+// Helper functions
+func strPtr(s string) *string {
+	return &s
+}
+
+func intPtr(i int) *int {
+	return &i
+}
diff --git a/pkg/scraper/mapped_test.go b/pkg/scraper/mapped_test.go
index 5f44e17af..667bb8385 100644
--- a/pkg/scraper/mapped_test.go
+++ b/pkg/scraper/mapped_test.go
@@ -25,7 +25,7 @@ xPathScrapers:
           - anything
 `
 
-	c := &config{}
+	c := &Definition{}
 	err := yaml.Unmarshal([]byte(yamlStr), &c)
 
 	if err == nil {
diff --git a/pkg/scraper/query_url.go b/pkg/scraper/query_url.go
index 91adb7d67..2cd9f683e 100644
--- a/pkg/scraper/query_url.go
+++ b/pkg/scraper/query_url.go
@@ -110,7 +110,7 @@ func (p queryURLParameters) constructURL(url string) string {
 }
 
 // replaceURL does a partial URL Replace ( only url parameter is used)
-func replaceURL(url string, scraperConfig scraperTypeConfig) string {
+func replaceURL(url string, scraperConfig ByURLDefinition) string {
 	u := url
 	queryURL := queryURLParameterFromURL(u)
 	if scraperConfig.QueryURLReplacements != nil {
diff --git a/pkg/scraper/script.go b/pkg/scraper/script.go
index 866c92365..f8e47b5d8 100644
--- a/pkg/scraper/script.go
+++ b/pkg/scraper/script.go
@@ -208,22 +208,11 @@ func galleryInputFromGallery(gallery *models.Gallery) galleryInput {
 var ErrScraperScript = errors.New("scraper script error")
 
 type scriptScraper struct {
-	scraper      scraperTypeConfig
-	config       config
+	definition   Definition
 	globalConfig GlobalConfig
 }
 
-func newScriptScraper(scraper scraperTypeConfig, config config, globalConfig GlobalConfig) *scriptScraper {
-	return &scriptScraper{
-		scraper:      scraper,
-		config:       config,
-		globalConfig: globalConfig,
-	}
-}
-
-func (s *scriptScraper) runScraperScript(ctx context.Context, inString string, out interface{}) error {
-	command := s.scraper.Script
-
+func (s *scriptScraper) runScraperScript(ctx context.Context, command []string, inString string, out interface{}) error {
 	var cmd *exec.Cmd
 	if python.IsPythonCommand(command[0]) {
 		pythonPath := s.globalConfig.GetPythonPath()
@@ -233,7 +222,7 @@ func (s *scriptScraper) runScraperScript(ctx context.Context, inString string, o
 			logger.Warnf("%s", err)
 		} else {
 			cmd = p.Command(ctx, command[1:])
-			envVariable, _ := filepath.Abs(filepath.Dir(filepath.Dir(s.config.path)))
+			envVariable, _ := filepath.Abs(filepath.Dir(filepath.Dir(s.definition.path)))
 			python.AppendPythonPath(cmd, envVariable)
 		}
 	}
@@ -243,7 +232,7 @@ func (s *scriptScraper) runScraperScript(ctx context.Context, inString string, o
 		cmd = stashExec.CommandContext(ctx, command[0], command[1:]...)
 	}
 
-	cmd.Dir = filepath.Dir(s.config.path)
+	cmd.Dir = filepath.Dir(s.definition.path)
 
 	stdin, err := cmd.StdinPipe()
 	if err != nil {
@@ -273,7 +262,7 @@ func (s *scriptScraper) runScraperScript(ctx context.Context, inString string, o
 		return errors.New("error running scraper script")
 	}
 
-	go handleScraperStderr(s.config.Name, stderr)
+	go handleScraperStderr(s.definition.Name, stderr)
 
 	logger.Debugf("Scraper script <%s> started", strings.Join(cmd.Args, " "))
 
@@ -312,7 +301,39 @@ func (s *scriptScraper) runScraperScript(ctx context.Context, inString string, o
 	return nil
 }
 
-func (s *scriptScraper) scrapeByName(ctx context.Context, name string, ty ScrapeContentType) ([]ScrapedContent, error) {
+func (s *scriptScraper) scrape(ctx context.Context, command []string, input string, ty ScrapeContentType) (ScrapedContent, error) {
+	switch ty {
+	case ScrapeContentTypePerformer:
+		var performer *models.ScrapedPerformer
+		err := s.runScraperScript(ctx, command, input, &performer)
+		return performer, err
+	case ScrapeContentTypeGallery:
+		var gallery *models.ScrapedGallery
+		err := s.runScraperScript(ctx, command, input, &gallery)
+		return gallery, err
+	case ScrapeContentTypeScene:
+		var scene *models.ScrapedScene
+		err := s.runScraperScript(ctx, command, input, &scene)
+		return scene, err
+	case ScrapeContentTypeMovie, ScrapeContentTypeGroup:
+		var movie *models.ScrapedMovie
+		err := s.runScraperScript(ctx, command, input, &movie)
+		return movie, err
+	case ScrapeContentTypeImage:
+		var image *models.ScrapedImage
+		err := s.runScraperScript(ctx, command, input, &image)
+		return image, err
+	}
+
+	return nil, ErrNotSupported
+}
+
+type scriptNameScraper struct {
+	scriptScraper
+	definition ByNameDefinition
+}
+
+func (s *scriptNameScraper) scrapeByName(ctx context.Context, name string, ty ScrapeContentType) ([]ScrapedContent, error) {
 	input := `{"name": "` + name + `"}`
 
 	var ret []ScrapedContent
@@ -320,7 +341,7 @@ func (s *scriptScraper) scrapeByName(ctx context.Context, name string, ty Scrape
 	switch ty {
 	case ScrapeContentTypePerformer:
 		var performers []models.ScrapedPerformer
-		err = s.runScraperScript(ctx, input, &performers)
+		err = s.runScraperScript(ctx, s.definition.Script, input, &performers)
 		if err == nil {
 			for _, p := range performers {
 				v := p
@@ -329,7 +350,7 @@ func (s *scriptScraper) scrapeByName(ctx context.Context, name string, ty Scrape
 		}
 	case ScrapeContentTypeScene:
 		var scenes []models.ScrapedScene
-		err = s.runScraperScript(ctx, input, &scenes)
+		err = s.runScraperScript(ctx, s.definition.Script, input, &scenes)
 		if err == nil {
 			for _, s := range scenes {
 				v := s
@@ -343,7 +364,21 @@ func (s *scriptScraper) scrapeByName(ctx context.Context, name string, ty Scrape
 	return ret, err
 }
 
-func (s *scriptScraper) scrapeByFragment(ctx context.Context, input Input) (ScrapedContent, error) {
+type scriptURLScraper struct {
+	scriptScraper
+	definition ByURLDefinition
+}
+
+func (s *scriptURLScraper) scrapeByURL(ctx context.Context, url string, ty ScrapeContentType) (ScrapedContent, error) {
+	return s.scrape(ctx, s.definition.Script, `{"url": "`+url+`"}`, ty)
+}
+
+type scriptFragmentScraper struct {
+	scriptScraper
+	definition ByFragmentDefinition
+}
+
+func (s *scriptFragmentScraper) scrapeByFragment(ctx context.Context, input Input) (ScrapedContent, error) {
 	var inString []byte
 	var err error
 	var ty ScrapeContentType
@@ -363,41 +398,10 @@ func (s *scriptScraper) scrapeByFragment(ctx context.Context, input Input) (Scra
 		return nil, err
 	}
 
-	return s.scrape(ctx, string(inString), ty)
+	return s.scrape(ctx, s.definition.Script, string(inString), ty)
 }
 
-func (s *scriptScraper) scrapeByURL(ctx context.Context, url string, ty ScrapeContentType) (ScrapedContent, error) {
-	return s.scrape(ctx, `{"url": "`+url+`"}`, ty)
-}
-
-func (s *scriptScraper) scrape(ctx context.Context, input string, ty ScrapeContentType) (ScrapedContent, error) {
-	switch ty {
-	case ScrapeContentTypePerformer:
-		var performer *models.ScrapedPerformer
-		err := s.runScraperScript(ctx, input, &performer)
-		return performer, err
-	case ScrapeContentTypeGallery:
-		var gallery *models.ScrapedGallery
-		err := s.runScraperScript(ctx, input, &gallery)
-		return gallery, err
-	case ScrapeContentTypeScene:
-		var scene *models.ScrapedScene
-		err := s.runScraperScript(ctx, input, &scene)
-		return scene, err
-	case ScrapeContentTypeMovie, ScrapeContentTypeGroup:
-		var movie *models.ScrapedMovie
-		err := s.runScraperScript(ctx, input, &movie)
-		return movie, err
-	case ScrapeContentTypeImage:
-		var image *models.ScrapedImage
-		err := s.runScraperScript(ctx, input, &image)
-		return image, err
-	}
-
-	return nil, ErrNotSupported
-}
-
-func (s *scriptScraper) scrapeSceneByScene(ctx context.Context, scene *models.Scene) (*models.ScrapedScene, error) {
+func (s *scriptFragmentScraper) scrapeSceneByScene(ctx context.Context, scene *models.Scene) (*models.ScrapedScene, error) {
 	inString, err := json.Marshal(sceneInputFromScene(scene))
 
 	if err != nil {
@@ -406,12 +410,12 @@ func (s *scriptScraper) scrapeSceneByScene(ctx context.Context, scene *models.Sc
 
 	var ret *models.ScrapedScene
 
-	err = s.runScraperScript(ctx, string(inString), &ret)
+	err = s.runScraperScript(ctx, s.definition.Script, string(inString), &ret)
 
 	return ret, err
 }
 
-func (s *scriptScraper) scrapeGalleryByGallery(ctx context.Context, gallery *models.Gallery) (*models.ScrapedGallery, error) {
+func (s *scriptFragmentScraper) scrapeGalleryByGallery(ctx context.Context, gallery *models.Gallery) (*models.ScrapedGallery, error) {
 	inString, err := json.Marshal(galleryInputFromGallery(gallery))
 
 	if err != nil {
@@ -420,12 +424,12 @@ func (s *scriptScraper) scrapeGalleryByGallery(ctx context.Context, gallery *mod
 
 	var ret *models.ScrapedGallery
 
-	err = s.runScraperScript(ctx, string(inString), &ret)
+	err = s.runScraperScript(ctx, s.definition.Script, string(inString), &ret)
 
 	return ret, err
 }
 
-func (s *scriptScraper) scrapeImageByImage(ctx context.Context, image *models.Image) (*models.ScrapedImage, error) {
+func (s *scriptFragmentScraper) scrapeImageByImage(ctx context.Context, image *models.Image) (*models.ScrapedImage, error) {
 	inString, err := json.Marshal(imageToUpdateInput(image))
 
 	if err != nil {
@@ -434,7 +438,7 @@ func (s *scriptScraper) scrapeImageByImage(ctx context.Context, image *models.Im
 
 	var ret *models.ScrapedImage
 
-	err = s.runScraperScript(ctx, string(inString), &ret)
+	err = s.runScraperScript(ctx, s.definition.Script, string(inString), &ret)
 
 	return ret, err
 }
diff --git a/pkg/scraper/stash.go b/pkg/scraper/stash.go
index 5c5cab9fc..23c4b9063 100644
--- a/pkg/scraper/stash.go
+++ b/pkg/scraper/stash.go
@@ -14,15 +14,13 @@ import (
 )
 
 type stashScraper struct {
-	scraper      scraperTypeConfig
-	config       config
+	config       Definition
 	globalConfig GlobalConfig
 	client       *http.Client
 }
 
-func newStashScraper(scraper scraperTypeConfig, client *http.Client, config config, globalConfig GlobalConfig) *stashScraper {
+func newStashScraper(client *http.Client, config Definition, globalConfig GlobalConfig) *stashScraper {
 	return &stashScraper{
-		scraper:      scraper,
 		config:       config,
 		client:       client,
 		globalConfig: globalConfig,
diff --git a/pkg/scraper/url.go b/pkg/scraper/url.go
index b53d7b27f..d036ae68e 100644
--- a/pkg/scraper/url.go
+++ b/pkg/scraper/url.go
@@ -25,8 +25,8 @@ import (
 
 const scrapeDefaultSleep = time.Second * 2
 
-func loadURL(ctx context.Context, loadURL string, client *http.Client, scraperConfig config, globalConfig GlobalConfig) (io.Reader, error) {
-	driverOptions := scraperConfig.DriverOptions
+func loadURL(ctx context.Context, loadURL string, client *http.Client, def Definition, globalConfig GlobalConfig) (io.Reader, error) {
+	driverOptions := def.DriverOptions
 	if driverOptions != nil && driverOptions.UseCDP {
 		// get the page using chrome dp
 		return urlFromCDP(ctx, loadURL, *driverOptions, globalConfig)
@@ -37,7 +37,7 @@ func loadURL(ctx context.Context, loadURL string, client *http.Client, scraperCo
 		return nil, err
 	}
 
-	jar, err := scraperConfig.jar()
+	jar, err := def.jar()
 	if err != nil {
 		return nil, fmt.Errorf("error creating cookie jar: %w", err)
 	}
@@ -83,7 +83,7 @@ func loadURL(ctx context.Context, loadURL string, client *http.Client, scraperCo
 	}
 
 	bodyReader := bytes.NewReader(body)
-	printCookies(jar, scraperConfig, "Jar cookies found for scraper urls")
+	printCookies(jar, def, "Jar cookies found for scraper urls")
 	return charset.NewReader(bodyReader, resp.Header.Get("Content-Type"))
 }
 
diff --git a/pkg/scraper/xpath.go b/pkg/scraper/xpath.go
index 5f7b76372..bf70869e8 100644
--- a/pkg/scraper/xpath.go
+++ b/pkg/scraper/xpath.go
@@ -3,7 +3,6 @@ package scraper
 import (
 	"bytes"
 	"context"
-	"errors"
 	"fmt"
 	"net/http"
 	"net/url"
@@ -19,49 +18,36 @@ import (
 )
 
 type xpathScraper struct {
-	scraper      scraperTypeConfig
-	config       config
+	definition   Definition
 	globalConfig GlobalConfig
 	client       *http.Client
 }
 
-func newXpathScraper(scraper scraperTypeConfig, client *http.Client, config config, globalConfig GlobalConfig) *xpathScraper {
-	return &xpathScraper{
-		scraper:      scraper,
-		config:       config,
-		globalConfig: globalConfig,
-		client:       client,
+func (s *xpathScraper) getXpathScraper(name string) (*mappedScraper, error) {
+	ret, ok := s.definition.XPathScrapers[name]
+	if !ok {
+		return nil, fmt.Errorf("xpath scraper with name %s not found in config", name)
 	}
+	return &ret, nil
 }
 
-func (s *xpathScraper) getXpathScraper() *mappedScraper {
-	return s.config.XPathScrapers[s.scraper.Scraper]
+type xpathURLScraper struct {
+	xpathScraper
+	definition ByURLDefinition
 }
 
-func (s *xpathScraper) scrapeURL(ctx context.Context, url string) (*html.Node, *mappedScraper, error) {
-	scraper := s.getXpathScraper()
-
-	if scraper == nil {
-		return nil, nil, errors.New("xpath scraper with name " + s.scraper.Scraper + " not found in config")
-	}
-
-	doc, err := s.loadURL(ctx, url)
-
-	if err != nil {
-		return nil, nil, err
-	}
-
-	return doc, scraper, nil
-}
-
-func (s *xpathScraper) scrapeByURL(ctx context.Context, url string, ty ScrapeContentType) (ScrapedContent, error) {
-	u := replaceURL(url, s.scraper) // allow a URL Replace for performer by URL queries
-	doc, scraper, err := s.scrapeURL(ctx, u)
+func (s *xpathURLScraper) scrapeByURL(ctx context.Context, url string, ty ScrapeContentType) (ScrapedContent, error) {
+	scraper, err := s.getXpathScraper(s.definition.Scraper)
 	if err != nil {
 		return nil, err
 	}
 
-	q := s.getXPathQuery(doc, u)
+	doc, err := s.loadURL(ctx, url)
+	if err != nil {
+		return nil, err
+	}
+
+	q := s.getXPathQuery(doc, url)
 	// if these just return the return values from scraper.scrape* functions then
 	// it ends up returning ScrapedContent(nil) rather than nil
 	switch ty {
@@ -100,11 +86,15 @@ func (s *xpathScraper) scrapeByURL(ctx context.Context, url string, ty ScrapeCon
 	return nil, ErrNotSupported
 }
 
-func (s *xpathScraper) scrapeByName(ctx context.Context, name string, ty ScrapeContentType) ([]ScrapedContent, error) {
-	scraper := s.getXpathScraper()
+type xpathNameScraper struct {
+	xpathScraper
+	definition ByNameDefinition
+}
 
-	if scraper == nil {
-		return nil, fmt.Errorf("%w: name %v", ErrNotFound, s.scraper.Scraper)
+func (s *xpathNameScraper) scrapeByName(ctx context.Context, name string, ty ScrapeContentType) ([]ScrapedContent, error) {
+	scraper, err := s.getXpathScraper(s.definition.Scraper)
+	if err != nil {
+		return nil, err
 	}
 
 	const placeholder = "{}"
@@ -112,7 +102,7 @@ func (s *xpathScraper) scrapeByName(ctx context.Context, name string, ty ScrapeC
 	// replace the placeholder string with the URL-escaped name
 	escapedName := url.QueryEscape(name)
 
-	url := s.scraper.QueryURL
+	url := s.definition.QueryURL
 	url = strings.ReplaceAll(url, placeholder, escapedName)
 
 	doc, err := s.loadURL(ctx, url)
@@ -151,18 +141,22 @@ func (s *xpathScraper) scrapeByName(ctx context.Context, name string, ty ScrapeC
 	return nil, ErrNotSupported
 }
 
-func (s *xpathScraper) scrapeSceneByScene(ctx context.Context, scene *models.Scene) (*models.ScrapedScene, error) {
+type xpathFragmentScraper struct {
+	xpathScraper
+	definition ByFragmentDefinition
+}
+
+func (s *xpathFragmentScraper) scrapeSceneByScene(ctx context.Context, scene *models.Scene) (*models.ScrapedScene, error) {
 	// construct the URL
 	queryURL := queryURLParametersFromScene(scene)
-	if s.scraper.QueryURLReplacements != nil {
-		queryURL.applyReplacements(s.scraper.QueryURLReplacements)
+	if s.definition.QueryURLReplacements != nil {
+		queryURL.applyReplacements(s.definition.QueryURLReplacements)
 	}
-	url := queryURL.constructURL(s.scraper.QueryURL)
+	url := queryURL.constructURL(s.definition.QueryURL)
 
-	scraper := s.getXpathScraper()
-
-	if scraper == nil {
-		return nil, errors.New("xpath scraper with name " + s.scraper.Scraper + " not found in config")
+	scraper, err := s.getXpathScraper(s.definition.Scraper)
+	if err != nil {
+		return nil, err
 	}
 
 	doc, err := s.loadURL(ctx, url)
@@ -175,7 +169,7 @@ func (s *xpathScraper) scrapeSceneByScene(ctx context.Context, scene *models.Sce
 	return scraper.scrapeScene(ctx, q)
 }
 
-func (s *xpathScraper) scrapeByFragment(ctx context.Context, input Input) (ScrapedContent, error) {
+func (s *xpathFragmentScraper) scrapeByFragment(ctx context.Context, input Input) (ScrapedContent, error) {
 	switch {
 	case input.Gallery != nil:
 		return nil, fmt.Errorf("%w: cannot use an xpath scraper as a gallery fragment scraper", ErrNotSupported)
@@ -189,15 +183,14 @@ func (s *xpathScraper) scrapeByFragment(ctx context.Context, input Input) (Scrap
 
 	// construct the URL
 	queryURL := queryURLParametersFromScrapedScene(scene)
-	if s.scraper.QueryURLReplacements != nil {
-		queryURL.applyReplacements(s.scraper.QueryURLReplacements)
+	if s.definition.QueryURLReplacements != nil {
+		queryURL.applyReplacements(s.definition.QueryURLReplacements)
 	}
-	url := queryURL.constructURL(s.scraper.QueryURL)
+	url := queryURL.constructURL(s.definition.QueryURL)
 
-	scraper := s.getXpathScraper()
-
-	if scraper == nil {
-		return nil, errors.New("xpath scraper with name " + s.scraper.Scraper + " not found in config")
+	scraper, err := s.getXpathScraper(s.definition.Scraper)
+	if err != nil {
+		return nil, err
 	}
 
 	doc, err := s.loadURL(ctx, url)
@@ -210,18 +203,17 @@ func (s *xpathScraper) scrapeByFragment(ctx context.Context, input Input) (Scrap
 	return scraper.scrapeScene(ctx, q)
 }
 
-func (s *xpathScraper) scrapeGalleryByGallery(ctx context.Context, gallery *models.Gallery) (*models.ScrapedGallery, error) {
+func (s *xpathFragmentScraper) scrapeGalleryByGallery(ctx context.Context, gallery *models.Gallery) (*models.ScrapedGallery, error) {
 	// construct the URL
 	queryURL := queryURLParametersFromGallery(gallery)
-	if s.scraper.QueryURLReplacements != nil {
-		queryURL.applyReplacements(s.scraper.QueryURLReplacements)
+	if s.definition.QueryURLReplacements != nil {
+		queryURL.applyReplacements(s.definition.QueryURLReplacements)
 	}
-	url := queryURL.constructURL(s.scraper.QueryURL)
+	url := queryURL.constructURL(s.definition.QueryURL)
 
-	scraper := s.getXpathScraper()
-
-	if scraper == nil {
-		return nil, errors.New("xpath scraper with name " + s.scraper.Scraper + " not found in config")
+	scraper, err := s.getXpathScraper(s.definition.Scraper)
+	if err != nil {
+		return nil, err
 	}
 
 	doc, err := s.loadURL(ctx, url)
@@ -234,18 +226,17 @@ func (s *xpathScraper) scrapeGalleryByGallery(ctx context.Context, gallery *mode
 	return scraper.scrapeGallery(ctx, q)
 }
 
-func (s *xpathScraper) scrapeImageByImage(ctx context.Context, image *models.Image) (*models.ScrapedImage, error) {
+func (s *xpathFragmentScraper) scrapeImageByImage(ctx context.Context, image *models.Image) (*models.ScrapedImage, error) {
 	// construct the URL
 	queryURL := queryURLParametersFromImage(image)
-	if s.scraper.QueryURLReplacements != nil {
-		queryURL.applyReplacements(s.scraper.QueryURLReplacements)
+	if s.definition.QueryURLReplacements != nil {
+		queryURL.applyReplacements(s.definition.QueryURLReplacements)
 	}
-	url := queryURL.constructURL(s.scraper.QueryURL)
+	url := queryURL.constructURL(s.definition.QueryURL)
 
-	scraper := s.getXpathScraper()
-
-	if scraper == nil {
-		return nil, errors.New("xpath scraper with name " + s.scraper.Scraper + " not found in config")
+	scraper, err := s.getXpathScraper(s.definition.Scraper)
+	if err != nil {
+		return nil, err
 	}
 
 	doc, err := s.loadURL(ctx, url)
@@ -259,14 +250,14 @@ func (s *xpathScraper) scrapeImageByImage(ctx context.Context, image *models.Ima
 }
 
 func (s *xpathScraper) loadURL(ctx context.Context, url string) (*html.Node, error) {
-	r, err := loadURL(ctx, url, s.client, s.config, s.globalConfig)
+	r, err := loadURL(ctx, url, s.client, s.definition, s.globalConfig)
 	if err != nil {
 		return nil, fmt.Errorf("failed to load URL %q: %w", url, err)
 	}
 
 	ret, err := html.Parse(r)
 
-	if err == nil && s.config.DebugOptions != nil && s.config.DebugOptions.PrintHTML {
+	if err == nil && s.definition.DebugOptions != nil && s.definition.DebugOptions.PrintHTML {
 		var b bytes.Buffer
 		if err := html.Render(&b, ret); err != nil {
 			logger.Warnf("could not render HTML: %v", err)
diff --git a/pkg/scraper/xpath_test.go b/pkg/scraper/xpath_test.go
index 391f60728..42ee2227b 100644
--- a/pkg/scraper/xpath_test.go
+++ b/pkg/scraper/xpath_test.go
@@ -674,10 +674,10 @@ func verifyPerformers(t *testing.T, expectedNames []string, expectedURLs []strin
 		}
 
 		if expectedName != actualName {
-			t.Errorf("Expected performer name %s, got %s", expectedName, actualName)
+			t.Errorf("Expected performer name %q, got %q", expectedName, actualName)
 		}
 		if expectedURL != actualURL {
-			t.Errorf("Expected performer URL %s, got %s", expectedName, actualName)
+			t.Errorf("Expected performer URL %q, got %q", expectedURL, actualURL)
 		}
 		i++
 	}
@@ -780,7 +780,7 @@ xPathScrapers:
         Name: //studio
 `
 
-	c := &config{}
+	c := &Definition{}
 	err := yaml.Unmarshal([]byte(yamlStr), &c)
 
 	if err != nil {
@@ -892,7 +892,7 @@ xPathScrapers:
               selector: //span
 `
 
-	c := &config{}
+	c := &Definition{}
 	err := yaml.Unmarshal([]byte(yamlStr), &c)
 
 	if err != nil {
@@ -904,12 +904,8 @@ xPathScrapers:
 
 	client := &http.Client{}
 	ctx := context.Background()
-	s := newGroupScraper(*c, globalConfig)
-	us, ok := s.(urlScraper)
-	if !ok {
-		t.Error("couldn't convert scraper into url scraper")
-	}
-	content, err := us.viaURL(ctx, client, ts.URL, ScrapeContentTypePerformer)
+	s := scraperFromDefinition(*c, globalConfig)
+	content, err := s.viaURL(ctx, client, ts.URL, ScrapeContentTypePerformer)
 
 	if err != nil {
 		t.Errorf("Error scraping performer: %s", err.Error())

From b5de30a295ffb855000940e69e8d2047416f869a Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Wed, 4 Feb 2026 16:45:59 +1100
Subject: [PATCH 277/405] Revamp gallery list with sidebar (#6157)

* Make list operation utility component
* Add defaults for sidebar filters
* Refactor gallery list for sidebar
* Fix gallery styling
* Fix sidebar state issues
* Auto-populate query string into name on create
* Remove new gallery button from navbar
* Make components patchable
---
 .../src/components/Galleries/Galleries.tsx    |   4 +-
 .../src/components/Galleries/GalleryList.tsx  | 648 ++++++++----
 ui/v2.5/src/components/Galleries/styles.scss  |   1 -
 .../List/Filters/LabeledIdFilter.tsx          |  17 +-
 .../List/Filters/PerformersFilter.tsx         |  26 +-
 .../components/List/Filters/RatingFilter.tsx  |  14 +-
 .../List/Filters/SidebarDurationFilter.tsx    |  10 +-
 .../components/List/Filters/StudiosFilter.tsx |  26 +-
 .../components/List/Filters/TagsFilter.tsx    |  26 +-
 .../components/List/ListOperationButtons.tsx  | 108 ++
 ui/v2.5/src/components/List/styles.scss       |   3 +-
 ui/v2.5/src/components/MainNavbar.tsx         |   1 -
 .../PerformerGalleriesPanel.tsx               |   4 +-
 ui/v2.5/src/components/Scenes/SceneList.tsx   | 925 ++++++++----------
 .../StudioDetails/StudioGalleriesPanel.tsx    |   4 +-
 .../Tags/TagDetails/TagGalleriesPanel.tsx     |   4 +-
 ui/v2.5/src/docs/en/Manual/UIPluginApi.md     |   4 +
 ui/v2.5/src/index.scss                        |   2 -
 ui/v2.5/src/pluginApi.d.ts                    |   2 +
 19 files changed, 1084 insertions(+), 745 deletions(-)

diff --git a/ui/v2.5/src/components/Galleries/Galleries.tsx b/ui/v2.5/src/components/Galleries/Galleries.tsx
index c845a153c..388ce6720 100644
--- a/ui/v2.5/src/components/Galleries/Galleries.tsx
+++ b/ui/v2.5/src/components/Galleries/Galleries.tsx
@@ -4,7 +4,7 @@ import { Helmet } from "react-helmet";
 import { useTitleProps } from "src/hooks/title";
 import Gallery from "./GalleryDetails/Gallery";
 import GalleryCreate from "./GalleryDetails/GalleryCreate";
-import { GalleryList } from "./GalleryList";
+import { FilteredGalleryList } from "./GalleryList";
 import { View } from "../List/views";
 import { LoadingIndicator } from "../Shared/LoadingIndicator";
 import { ErrorMessage } from "../Shared/ErrorMessage";
@@ -40,7 +40,7 @@ const GalleryImage: React.FC<RouteComponentProps<IGalleryImageParams>> = ({
 };
 
 const Galleries: React.FC = () => {
-  return <GalleryList view={View.Galleries} />;
+  return <FilteredGalleryList view={View.Galleries} />;
 };
 
 const GalleryRoutes: React.FC = () => {
diff --git a/ui/v2.5/src/components/Galleries/GalleryList.tsx b/ui/v2.5/src/components/Galleries/GalleryList.tsx
index 4afbab620..de0d23c19 100644
--- a/ui/v2.5/src/components/Galleries/GalleryList.tsx
+++ b/ui/v2.5/src/components/Galleries/GalleryList.tsx
@@ -1,10 +1,10 @@
-import React, { useState } from "react";
-import { useIntl } from "react-intl";
+import React, { useCallback, useEffect } from "react";
+import { FormattedMessage, useIntl } from "react-intl";
 import cloneDeep from "lodash-es/cloneDeep";
-import { useHistory } from "react-router-dom";
+import { useHistory, useLocation } from "react-router-dom";
 import Mousetrap from "mousetrap";
 import * as GQL from "src/core/generated-graphql";
-import { ItemList, ItemListContext, showWhenSelected } from "../List/ItemList";
+import { useFilteredItemList } from "../List/ItemList";
 import { ListFilterModel } from "src/models/list-filter/filter";
 import { DisplayMode } from "src/models/list-filter/types";
 import { queryFindGalleries, useFindGalleries } from "src/core/StashService";
@@ -16,17 +16,167 @@ import { GenerateDialog } from "../Dialogs/GenerateDialog";
 import { GalleryListTable } from "./GalleryListTable";
 import { GalleryCardGrid } from "./GalleryCardGrid";
 import { View } from "../List/views";
-import { PatchComponent } from "src/patch";
-import { IItemListOperation } from "../List/FilteredListToolbar";
-import { useModal } from "src/hooks/modal";
+import useFocus from "src/utils/focus";
+import {
+  Sidebar,
+  SidebarPane,
+  SidebarPaneContent,
+  SidebarStateContext,
+  useSidebarState,
+} from "../Shared/Sidebar";
+import { useCloseEditDelete, useFilterOperations } from "../List/util";
+import {
+  FilteredSidebarHeader,
+  useFilteredSidebarKeybinds,
+} from "../List/Filters/FilterSidebar";
+import cx from "classnames";
+import { LoadedContent } from "../List/PagedList";
+import { Pagination, PaginationIndex } from "../List/Pagination";
+import { PatchComponent, PatchContainerComponent } from "src/patch";
+import { SidebarStudiosFilter } from "../List/Filters/StudiosFilter";
+import { SidebarPerformersFilter } from "../List/Filters/PerformersFilter";
+import { SidebarTagsFilter } from "../List/Filters/TagsFilter";
+import { SidebarRatingFilter } from "../List/Filters/RatingFilter";
+import { SidebarBooleanFilter } from "../List/Filters/BooleanFilter";
+import { OrganizedCriterionOption } from "src/models/list-filter/criteria/organized";
+import { Button } from "react-bootstrap";
+import { ListOperations } from "../List/ListOperationButtons";
+import {
+  FilteredListToolbar,
+  IItemListOperation,
+} from "../List/FilteredListToolbar";
+import { FilterTags } from "../List/FilterTags";
 
-function getItems(result: GQL.FindGalleriesQueryResult) {
-  return result?.data?.findGalleries?.galleries ?? [];
-}
+const GalleryList: React.FC<{
+  galleries: GQL.SlimGalleryDataFragment[];
+  filter: ListFilterModel;
+  selectedIds: Set<string>;
+  onSelectChange: (id: string, selected: boolean, shiftKey: boolean) => void;
+}> = PatchComponent(
+  "GalleryList",
+  ({ galleries, filter, selectedIds, onSelectChange }) => {
+    if (galleries.length === 0) {
+      return null;
+    }
 
-function getCount(result: GQL.FindGalleriesQueryResult) {
-  return result?.data?.findGalleries?.count ?? 0;
-}
+    if (filter.displayMode === DisplayMode.Grid) {
+      return (
+        <GalleryCardGrid
+          galleries={galleries}
+          selectedIds={selectedIds}
+          zoomIndex={filter.zoomIndex}
+          onSelectChange={onSelectChange}
+        />
+      );
+    }
+    if (filter.displayMode === DisplayMode.List) {
+      return (
+        <GalleryListTable
+          galleries={galleries}
+          selectedIds={selectedIds}
+          onSelectChange={onSelectChange}
+        />
+      );
+    }
+    if (filter.displayMode === DisplayMode.Wall) {
+      return (
+        <div className={`GalleryWall zoom-${filter.zoomIndex}`}>
+          {galleries.map((gallery) => (
+            <GalleryWallCard
+              key={gallery.id}
+              gallery={gallery}
+              selected={selectedIds.has(gallery.id)}
+              onSelectedChanged={(selected, shiftKey) =>
+                onSelectChange(gallery.id, selected, shiftKey)
+              }
+              selecting={selectedIds.size > 0}
+            />
+          ))}
+        </div>
+      );
+    }
+
+    return null;
+  }
+);
+
+const GalleryFilterSidebarSections = PatchContainerComponent(
+  "FilteredGalleryList.SidebarSections"
+);
+
+const SidebarContent: React.FC<{
+  filter: ListFilterModel;
+  setFilter: (filter: ListFilterModel) => void;
+  filterHook?: (filter: ListFilterModel) => ListFilterModel;
+  view?: View;
+  sidebarOpen: boolean;
+  onClose?: () => void;
+  showEditFilter: (editingCriterion?: string) => void;
+  count?: number;
+  focus?: ReturnType<typeof useFocus>;
+}> = ({
+  filter,
+  setFilter,
+  filterHook,
+  view,
+  showEditFilter,
+  sidebarOpen,
+  onClose,
+  count,
+  focus,
+}) => {
+  const showResultsId =
+    count !== undefined ? "actions.show_count_results" : "actions.show_results";
+
+  const hideStudios = view === View.StudioScenes;
+
+  return (
+    <>
+      <FilteredSidebarHeader
+        sidebarOpen={sidebarOpen}
+        showEditFilter={showEditFilter}
+        filter={filter}
+        setFilter={setFilter}
+        view={view}
+        focus={focus}
+      />
+
+      <GalleryFilterSidebarSections>
+        {!hideStudios && (
+          <SidebarStudiosFilter
+            filter={filter}
+            setFilter={setFilter}
+            filterHook={filterHook}
+          />
+        )}
+        <SidebarPerformersFilter
+          filter={filter}
+          setFilter={setFilter}
+          filterHook={filterHook}
+        />
+        <SidebarTagsFilter
+          filter={filter}
+          setFilter={setFilter}
+          filterHook={filterHook}
+        />
+        <SidebarRatingFilter filter={filter} setFilter={setFilter} />
+        <SidebarBooleanFilter
+          title={<FormattedMessage id="organized" />}
+          data-type={OrganizedCriterionOption.type}
+          option={OrganizedCriterionOption}
+          filter={filter}
+          setFilter={setFilter}
+        />
+      </GalleryFilterSidebarSections>
+
+      <div className="sidebar-footer">
+        <Button className="sidebar-close-button" onClick={onClose}>
+          <FormattedMessage id={showResultsId} values={{ count }} />
+        </Button>
+      </div>
+    </>
+  );
+};
 
 interface IGalleryList {
   filterHook?: (filter: ListFilterModel) => ListFilterModel;
@@ -35,208 +185,324 @@ interface IGalleryList {
   extraOperations?: IItemListOperation<GQL.FindGalleriesQueryResult>[];
 }
 
-export const GalleryList: React.FC<IGalleryList> = PatchComponent(
-  "GalleryList",
-  ({ filterHook, view, alterQuery, extraOperations = [] }) => {
+function useViewRandom(filter: ListFilterModel, count: number) {
+  const history = useHistory();
+
+  const viewRandom = useCallback(async () => {
+    // query for a random scene
+    if (count === 0) {
+      return;
+    }
+
+    const index = Math.floor(Math.random() * count);
+    const filterCopy = cloneDeep(filter);
+    filterCopy.itemsPerPage = 1;
+    filterCopy.currentPage = index + 1;
+    const singleResult = await queryFindGalleries(filterCopy);
+    if (singleResult.data.findGalleries.galleries.length === 1) {
+      const { id } = singleResult.data.findGalleries.galleries[0];
+      // navigate to the image player page
+      history.push(`/galleries/${id}`);
+    }
+  }, [history, filter, count]);
+
+  return viewRandom;
+}
+
+function useAddKeybinds(filter: ListFilterModel, count: number) {
+  const viewRandom = useViewRandom(filter, count);
+
+  useEffect(() => {
+    Mousetrap.bind("p r", () => {
+      viewRandom();
+    });
+
+    return () => {
+      Mousetrap.unbind("p r");
+    };
+  }, [viewRandom]);
+}
+
+export const FilteredGalleryList = PatchComponent(
+  "FilteredGalleryList",
+  (props: IGalleryList) => {
     const intl = useIntl();
     const history = useHistory();
-    const [isExportDialogOpen, setIsExportDialogOpen] = useState(false);
-    const [isExportAll, setIsExportAll] = useState(false);
-    const { modal, showModal, closeModal } = useModal();
+    const location = useLocation();
 
-    const filterMode = GQL.FilterMode.Galleries;
+    const searchFocus = useFocus();
+
+    const { filterHook, view, alterQuery } = props;
+
+    // States
+    const {
+      showSidebar,
+      setShowSidebar,
+      sectionOpen,
+      setSectionOpen,
+      loading: sidebarStateLoading,
+    } = useSidebarState(view);
+
+    const { filterState, queryResult, modalState, listSelect, showEditFilter } =
+      useFilteredItemList({
+        filterStateProps: {
+          filterMode: GQL.FilterMode.Galleries,
+          view,
+          useURL: alterQuery,
+        },
+        queryResultProps: {
+          useResult: useFindGalleries,
+          getCount: (r) => r.data?.findGalleries.count ?? 0,
+          getItems: (r) => r.data?.findGalleries.galleries ?? [],
+          filterHook,
+        },
+      });
+
+    const { filter, setFilter } = filterState;
+
+    const { effectiveFilter, result, cachedResult, items, totalCount } =
+      queryResult;
+
+    const {
+      selectedIds,
+      selectedItems,
+      onSelectChange,
+      onSelectAll,
+      onSelectNone,
+      onInvertSelection,
+      hasSelection,
+    } = listSelect;
+
+    const { modal, showModal, closeModal } = modalState;
+
+    // Utility hooks
+    const { setPage, removeCriterion, clearAllCriteria } = useFilterOperations({
+      filter,
+      setFilter,
+    });
+
+    useAddKeybinds(filter, totalCount);
+    useFilteredSidebarKeybinds({
+      showSidebar,
+      setShowSidebar,
+    });
+
+    useEffect(() => {
+      Mousetrap.bind("e", () => {
+        if (hasSelection) {
+          onEdit?.();
+        }
+      });
+
+      Mousetrap.bind("d d", () => {
+        if (hasSelection) {
+          onDelete?.();
+        }
+      });
+
+      return () => {
+        Mousetrap.unbind("e");
+        Mousetrap.unbind("d d");
+      };
+    });
+
+    const onCloseEditDelete = useCloseEditDelete({
+      closeModal,
+      onSelectNone,
+      result,
+    });
+
+    function onCreateNew() {
+      let queryParam = new URLSearchParams(location.search).get("q");
+      let newPath = "/galleries/new";
+      if (queryParam) {
+        newPath += "?q=" + encodeURIComponent(queryParam);
+      }
+      history.push(newPath);
+    }
+
+    const viewRandom = useViewRandom(filter, totalCount);
+
+    function onExport(all: boolean) {
+      showModal(
+        <ExportDialog
+          exportInput={{
+            galleries: {
+              ids: Array.from(selectedIds.values()),
+              all: all,
+            },
+          }}
+          onClose={() => closeModal()}
+        />
+      );
+    }
+
+    function onEdit() {
+      showModal(
+        <EditGalleriesDialog
+          selected={selectedItems}
+          onClose={onCloseEditDelete}
+        />
+      );
+    }
+
+    function onDelete() {
+      showModal(
+        <DeleteGalleriesDialog
+          selected={selectedItems}
+          onClose={onCloseEditDelete}
+        />
+      );
+    }
+
+    function onGenerate() {
+      showModal(
+        <GenerateDialog
+          type="gallery"
+          selectedIds={Array.from(selectedIds.values())}
+          onClose={() => closeModal()}
+        />
+      );
+    }
 
     const otherOperations = [
-      ...extraOperations,
+      {
+        text: intl.formatMessage({ id: "actions.select_all" }),
+        onClick: () => onSelectAll(),
+        isDisplayed: () => totalCount > 0,
+      },
+      {
+        text: intl.formatMessage({ id: "actions.select_none" }),
+        onClick: () => onSelectNone(),
+        isDisplayed: () => hasSelection,
+      },
+      {
+        text: intl.formatMessage({ id: "actions.invert_selection" }),
+        onClick: () => onInvertSelection(),
+        isDisplayed: () => totalCount > 0,
+      },
       {
         text: intl.formatMessage({ id: "actions.view_random" }),
         onClick: viewRandom,
       },
       {
         text: `${intl.formatMessage({ id: "actions.generate" })}…`,
-        onClick: (
-          _result: GQL.FindGalleriesQueryResult,
-          _filter: ListFilterModel,
-          selectedIds: Set<string>
-        ) => {
-          showModal(
-            <GenerateDialog
-              type="gallery"
-              selectedIds={Array.from(selectedIds.values())}
-              onClose={() => closeModal()}
-            />
-          );
-          return Promise.resolve();
-        },
-        isDisplayed: showWhenSelected,
+        onClick: onGenerate,
+        isDisplayed: () => hasSelection,
       },
       {
         text: intl.formatMessage({ id: "actions.export" }),
-        onClick: onExport,
-        isDisplayed: showWhenSelected,
+        onClick: () => onExport(false),
+        isDisplayed: () => hasSelection,
       },
       {
         text: intl.formatMessage({ id: "actions.export_all" }),
-        onClick: onExportAll,
+        onClick: () => onExport(true),
       },
     ];
 
-    function addKeybinds(
-      result: GQL.FindGalleriesQueryResult,
-      filter: ListFilterModel
-    ) {
-      Mousetrap.bind("p r", () => {
-        viewRandom(result, filter);
-      });
+    // render
+    if (sidebarStateLoading) return null;
 
-      return () => {
-        Mousetrap.unbind("p r");
-      };
-    }
-
-    async function viewRandom(
-      result: GQL.FindGalleriesQueryResult,
-      filter: ListFilterModel
-    ) {
-      // query for a random image
-      if (result.data?.findGalleries) {
-        const { count } = result.data.findGalleries;
-
-        const index = Math.floor(Math.random() * count);
-        const filterCopy = cloneDeep(filter);
-        filterCopy.itemsPerPage = 1;
-        filterCopy.currentPage = index + 1;
-        const singleResult = await queryFindGalleries(filterCopy);
-        if (singleResult.data.findGalleries.galleries.length === 1) {
-          const { id } = singleResult.data.findGalleries.galleries[0];
-          // navigate to the image player page
-          history.push(`/galleries/${id}`);
-        }
-      }
-    }
-
-    async function onExport() {
-      setIsExportAll(false);
-      setIsExportDialogOpen(true);
-    }
-
-    async function onExportAll() {
-      setIsExportAll(true);
-      setIsExportDialogOpen(true);
-    }
-
-    function renderContent(
-      result: GQL.FindGalleriesQueryResult,
-      filter: ListFilterModel,
-      selectedIds: Set<string>,
-      onSelectChange: (id: string, selected: boolean, shiftKey: boolean) => void
-    ) {
-      function maybeRenderGalleryExportDialog() {
-        if (isExportDialogOpen) {
-          return (
-            <ExportDialog
-              exportInput={{
-                galleries: {
-                  ids: Array.from(selectedIds.values()),
-                  all: isExportAll,
-                },
-              }}
-              onClose={() => setIsExportDialogOpen(false)}
-            />
-          );
-        }
-      }
-
-      function renderGalleries() {
-        if (!result.data?.findGalleries) return;
-
-        if (filter.displayMode === DisplayMode.Grid) {
-          return (
-            <GalleryCardGrid
-              galleries={result.data.findGalleries.galleries}
-              selectedIds={selectedIds}
-              zoomIndex={filter.zoomIndex}
-              onSelectChange={onSelectChange}
-            />
-          );
-        }
-        if (filter.displayMode === DisplayMode.List) {
-          return (
-            <GalleryListTable
-              galleries={result.data.findGalleries.galleries}
-              selectedIds={selectedIds}
-              onSelectChange={onSelectChange}
-            />
-          );
-        }
-        if (filter.displayMode === DisplayMode.Wall) {
-          return (
-            <div className="row">
-              <div className={`GalleryWall zoom-${filter.zoomIndex}`}>
-                {result.data.findGalleries.galleries.map((gallery) => (
-                  <GalleryWallCard
-                    key={gallery.id}
-                    gallery={gallery}
-                    selected={selectedIds.has(gallery.id)}
-                    onSelectedChanged={(selected, shiftKey) =>
-                      onSelectChange(gallery.id, selected, shiftKey)
-                    }
-                    selecting={selectedIds.size > 0}
-                  />
-                ))}
-              </div>
-            </div>
-          );
-        }
-      }
-
-      return (
-        <>
-          {maybeRenderGalleryExportDialog()}
-          {modal}
-          {renderGalleries()}
-        </>
-      );
-    }
-
-    function renderEditDialog(
-      selectedImages: GQL.SlimGalleryDataFragment[],
-      onClose: (applied: boolean) => void
-    ) {
-      return (
-        <EditGalleriesDialog selected={selectedImages} onClose={onClose} />
-      );
-    }
-
-    function renderDeleteDialog(
-      selectedImages: GQL.SlimGalleryDataFragment[],
-      onClose: (confirmed: boolean) => void
-    ) {
-      return (
-        <DeleteGalleriesDialog selected={selectedImages} onClose={onClose} />
-      );
-    }
+    const operations = (
+      <ListOperations
+        items={items.length}
+        hasSelection={hasSelection}
+        operations={otherOperations}
+        onEdit={onEdit}
+        onDelete={onDelete}
+        onCreateNew={onCreateNew}
+        entityType={intl.formatMessage({ id: "gallery" })}
+        operationsMenuClassName="gallery-list-operations-dropdown"
+      />
+    );
 
     return (
-      <ItemListContext
-        filterMode={filterMode}
-        useResult={useFindGalleries}
-        getItems={getItems}
-        getCount={getCount}
-        alterQuery={alterQuery}
-        filterHook={filterHook}
-        view={view}
-        selectable
+      <div
+        className={cx("item-list-container gallery-list", {
+          "hide-sidebar": !showSidebar,
+        })}
       >
-        <ItemList
-          view={view}
-          otherOperations={otherOperations}
-          addKeybinds={addKeybinds}
-          renderContent={renderContent}
-          renderEditDialog={renderEditDialog}
-          renderDeleteDialog={renderDeleteDialog}
-        />
-      </ItemListContext>
+        {modal}
+
+        <SidebarStateContext.Provider value={{ sectionOpen, setSectionOpen }}>
+          <SidebarPane hideSidebar={!showSidebar}>
+            <Sidebar hide={!showSidebar} onHide={() => setShowSidebar(false)}>
+              <SidebarContent
+                filter={filter}
+                setFilter={setFilter}
+                filterHook={filterHook}
+                showEditFilter={showEditFilter}
+                view={view}
+                sidebarOpen={showSidebar}
+                onClose={() => setShowSidebar(false)}
+                count={cachedResult.loading ? undefined : totalCount}
+                focus={searchFocus}
+              />
+            </Sidebar>
+            <SidebarPaneContent
+              onSidebarToggle={() => setShowSidebar(!showSidebar)}
+            >
+              <FilteredListToolbar
+                filter={filter}
+                listSelect={listSelect}
+                setFilter={setFilter}
+                showEditFilter={showEditFilter}
+                onDelete={onDelete}
+                onEdit={onEdit}
+                operationComponent={operations}
+                view={view}
+                zoomable
+              />
+
+              <FilterTags
+                criteria={filter.criteria}
+                onEditCriterion={(c) => showEditFilter(c.criterionOption.type)}
+                onRemoveCriterion={removeCriterion}
+                onRemoveAll={clearAllCriteria}
+              />
+
+              <div className="pagination-index-container">
+                <Pagination
+                  currentPage={filter.currentPage}
+                  itemsPerPage={filter.itemsPerPage}
+                  totalItems={totalCount}
+                  onChangePage={(page) => setFilter(filter.changePage(page))}
+                />
+                <PaginationIndex
+                  loading={cachedResult.loading}
+                  itemsPerPage={filter.itemsPerPage}
+                  currentPage={filter.currentPage}
+                  totalItems={totalCount}
+                />
+              </div>
+
+              <LoadedContent loading={result.loading} error={result.error}>
+                <GalleryList
+                  filter={effectiveFilter}
+                  galleries={items}
+                  selectedIds={selectedIds}
+                  onSelectChange={onSelectChange}
+                />
+              </LoadedContent>
+
+              {totalCount > filter.itemsPerPage && (
+                <div className="pagination-footer-container">
+                  <div className="pagination-footer">
+                    <Pagination
+                      itemsPerPage={filter.itemsPerPage}
+                      currentPage={filter.currentPage}
+                      totalItems={totalCount}
+                      onChangePage={setPage}
+                      pagePopupPlacement="top"
+                    />
+                  </div>
+                </div>
+              )}
+            </SidebarPaneContent>
+          </SidebarPane>
+        </SidebarStateContext.Provider>
+      </div>
     );
   }
 );
diff --git a/ui/v2.5/src/components/Galleries/styles.scss b/ui/v2.5/src/components/Galleries/styles.scss
index 9890e887b..c53175313 100644
--- a/ui/v2.5/src/components/Galleries/styles.scss
+++ b/ui/v2.5/src/components/Galleries/styles.scss
@@ -229,7 +229,6 @@ div.GalleryWall {
   display: flex;
   flex-wrap: wrap;
   margin: 0 auto;
-  width: 96vw;
 
   /* Prevents last row from consuming all space and stretching images to oblivion */
   &::after {
diff --git a/ui/v2.5/src/components/List/Filters/LabeledIdFilter.tsx b/ui/v2.5/src/components/List/Filters/LabeledIdFilter.tsx
index 200c16917..2e63cd465 100644
--- a/ui/v2.5/src/components/List/Filters/LabeledIdFilter.tsx
+++ b/ui/v2.5/src/components/List/Filters/LabeledIdFilter.tsx
@@ -18,6 +18,7 @@ import { Option } from "./SidebarListFilter";
 import {
   CriterionModifier,
   FilterMode,
+  GalleryFilterType,
   InputMaybe,
   IntCriterionInput,
   SceneFilterType,
@@ -515,12 +516,14 @@ export function makeQueryVariables(query: string, extraProps: {}) {
 interface IFilterType {
   scenes_filter?: InputMaybe<SceneFilterType>;
   scene_count?: InputMaybe<IntCriterionInput>;
+  galleries_filter?: InputMaybe<GalleryFilterType>;
+  gallery_count?: InputMaybe<IntCriterionInput>;
 }
 
 export function setObjectFilter(
   out: IFilterType,
   mode: FilterMode,
-  relatedFilterOutput: SceneFilterType
+  relatedFilterOutput: SceneFilterType | GalleryFilterType
 ) {
   const empty = Object.keys(relatedFilterOutput).length === 0;
 
@@ -535,5 +538,17 @@ export function setObjectFilter(
       }
       out.scenes_filter = relatedFilterOutput;
       break;
+    case FilterMode.Galleries:
+      // if empty, only get objects with galleries
+      if (empty) {
+        out.gallery_count = {
+          modifier: CriterionModifier.GreaterThan,
+          value: 0,
+        };
+      }
+      out.galleries_filter = relatedFilterOutput;
+      break;
+    default:
+      throw new Error("Invalid filter mode");
   }
 }
diff --git a/ui/v2.5/src/components/List/Filters/PerformersFilter.tsx b/ui/v2.5/src/components/List/Filters/PerformersFilter.tsx
index 3df19593f..7e0dee855 100644
--- a/ui/v2.5/src/components/List/Filters/PerformersFilter.tsx
+++ b/ui/v2.5/src/components/List/Filters/PerformersFilter.tsx
@@ -1,5 +1,8 @@
 import React, { ReactNode, useMemo } from "react";
-import { PerformersCriterion } from "src/models/list-filter/criteria/performers";
+import {
+  PerformersCriterion,
+  PerformersCriterionOption,
+} from "src/models/list-filter/criteria/performers";
 import {
   CriterionModifier,
   FindPerformersForSelectQueryVariables,
@@ -18,6 +21,7 @@ import {
   useLabeledIdFilterState,
 } from "./LabeledIdFilter";
 import { SidebarListFilter } from "./SidebarListFilter";
+import { FormattedMessage } from "react-intl";
 
 interface IPerformersFilter {
   criterion: PerformersCriterion;
@@ -106,12 +110,19 @@ const PerformersFilter: React.FC<IPerformersFilter> = ({
 
 export const SidebarPerformersFilter: React.FC<{
   title?: ReactNode;
-  option: CriterionOption;
+  option?: CriterionOption;
   filter: ListFilterModel;
   setFilter: (f: ListFilterModel) => void;
   filterHook?: (f: ListFilterModel) => ListFilterModel;
   sectionID?: string;
-}> = ({ title, option, filter, setFilter, filterHook, sectionID }) => {
+}> = ({
+  title = <FormattedMessage id="performers" />,
+  option = PerformersCriterionOption,
+  filter,
+  setFilter,
+  filterHook,
+  sectionID = "performers",
+}) => {
   const state = useLabeledIdFilterState({
     filter,
     setFilter,
@@ -120,7 +131,14 @@ export const SidebarPerformersFilter: React.FC<{
     useQuery: usePerformerQueryFilter,
   });
 
-  return <SidebarListFilter {...state} title={title} sectionID={sectionID} />;
+  return (
+    <SidebarListFilter
+      {...state}
+      data-type={option.type}
+      title={title}
+      sectionID={sectionID}
+    />
+  );
 };
 
 export default PerformersFilter;
diff --git a/ui/v2.5/src/components/List/Filters/RatingFilter.tsx b/ui/v2.5/src/components/List/Filters/RatingFilter.tsx
index 9f5c8f8c9..8a07d54f9 100644
--- a/ui/v2.5/src/components/List/Filters/RatingFilter.tsx
+++ b/ui/v2.5/src/components/List/Filters/RatingFilter.tsx
@@ -13,7 +13,10 @@ import {
   defaultRatingSystemOptions,
 } from "src/utils/rating";
 import { useConfigurationContext } from "src/hooks/Config";
-import { RatingCriterion } from "src/models/list-filter/criteria/rating";
+import {
+  RatingCriterion,
+  RatingCriterionOption,
+} from "src/models/list-filter/criteria/rating";
 import { ListFilterModel } from "src/models/list-filter/filter";
 import { Option, SidebarListFilter } from "./SidebarListFilter";
 
@@ -74,7 +77,7 @@ export const RatingFilter: React.FC<IRatingFilterProps> = ({
 
 interface ISidebarFilter {
   title?: React.ReactNode;
-  option: CriterionOption;
+  option?: CriterionOption;
   filter: ListFilterModel;
   setFilter: (f: ListFilterModel) => void;
   sectionID?: string;
@@ -84,11 +87,11 @@ const any = "any";
 const none = "none";
 
 export const SidebarRatingFilter: React.FC<ISidebarFilter> = ({
-  title,
-  option,
+  title = <FormattedMessage id="rating" />,
+  option = RatingCriterionOption,
   filter,
   setFilter,
-  sectionID,
+  sectionID = "rating",
 }) => {
   const intl = useIntl();
 
@@ -193,6 +196,7 @@ export const SidebarRatingFilter: React.FC<ISidebarFilter> = ({
   return (
     <>
       <SidebarListFilter
+        data-type={option.type}
         title={title}
         candidates={options}
         onSelect={onSelect}
diff --git a/ui/v2.5/src/components/List/Filters/SidebarDurationFilter.tsx b/ui/v2.5/src/components/List/Filters/SidebarDurationFilter.tsx
index ff4b780af..29463bfa6 100644
--- a/ui/v2.5/src/components/List/Filters/SidebarDurationFilter.tsx
+++ b/ui/v2.5/src/components/List/Filters/SidebarDurationFilter.tsx
@@ -7,10 +7,12 @@ import { Option, SidebarListFilter } from "./SidebarListFilter";
 import TextUtils from "src/utils/text";
 import { DoubleRangeInput } from "src/components/Shared/DoubleRangeInput";
 import { useDebounce } from "src/hooks/debounce";
+import { FormattedMessage } from "react-intl";
+import { DurationCriterionOption } from "src/models/list-filter/scenes";
 
 interface ISidebarFilter {
   title?: React.ReactNode;
-  option: CriterionOption;
+  option?: CriterionOption;
   filter: ListFilterModel;
   setFilter: (f: ListFilterModel) => void;
   sectionID?: string;
@@ -55,11 +57,11 @@ function snapToStep(value: number): number {
 }
 
 export const SidebarDurationFilter: React.FC<ISidebarFilter> = ({
-  title,
-  option,
+  title = <FormattedMessage id="duration" />,
+  option = DurationCriterionOption,
   filter,
   setFilter,
-  sectionID,
+  sectionID = "duration",
 }) => {
   const criteria = filter.criteriaFor(option.type) as DurationCriterion[];
   const criterion = criteria.length > 0 ? criteria[0] : null;
diff --git a/ui/v2.5/src/components/List/Filters/StudiosFilter.tsx b/ui/v2.5/src/components/List/Filters/StudiosFilter.tsx
index e922e688a..3e28bd927 100644
--- a/ui/v2.5/src/components/List/Filters/StudiosFilter.tsx
+++ b/ui/v2.5/src/components/List/Filters/StudiosFilter.tsx
@@ -5,7 +5,10 @@ import {
   useFindStudiosForSelectQuery,
 } from "src/core/generated-graphql";
 import { HierarchicalObjectsFilter } from "./SelectableFilter";
-import { StudiosCriterion } from "src/models/list-filter/criteria/studios";
+import {
+  StudiosCriterion,
+  StudiosCriterionOption,
+} from "src/models/list-filter/criteria/studios";
 import { sortByRelevance } from "src/utils/query";
 import { CriterionOption } from "src/models/list-filter/criteria/criterion";
 import { ListFilterModel } from "src/models/list-filter/filter";
@@ -16,6 +19,7 @@ import {
   useLabeledIdFilterState,
 } from "./LabeledIdFilter";
 import { SidebarListFilter } from "./SidebarListFilter";
+import { FormattedMessage } from "react-intl";
 
 interface IStudiosFilter {
   criterion: StudiosCriterion;
@@ -94,12 +98,19 @@ const StudiosFilter: React.FC<IStudiosFilter> = ({
 
 export const SidebarStudiosFilter: React.FC<{
   title?: ReactNode;
-  option: CriterionOption;
+  option?: CriterionOption;
   filter: ListFilterModel;
   setFilter: (f: ListFilterModel) => void;
   filterHook?: (f: ListFilterModel) => ListFilterModel;
   sectionID?: string;
-}> = ({ title, option, filter, setFilter, filterHook, sectionID }) => {
+}> = ({
+  title = <FormattedMessage id="studios" />,
+  option = StudiosCriterionOption,
+  filter,
+  setFilter,
+  filterHook,
+  sectionID = "studios",
+}) => {
   const state = useLabeledIdFilterState({
     filter,
     setFilter,
@@ -111,7 +122,14 @@ export const SidebarStudiosFilter: React.FC<{
     includeSubMessageID: "subsidiary_studios",
   });
 
-  return <SidebarListFilter {...state} title={title} sectionID={sectionID} />;
+  return (
+    <SidebarListFilter
+      {...state}
+      data-type={option.type}
+      title={title}
+      sectionID={sectionID}
+    />
+  );
 };
 
 export default StudiosFilter;
diff --git a/ui/v2.5/src/components/List/Filters/TagsFilter.tsx b/ui/v2.5/src/components/List/Filters/TagsFilter.tsx
index f4c618ffa..446a90331 100644
--- a/ui/v2.5/src/components/List/Filters/TagsFilter.tsx
+++ b/ui/v2.5/src/components/List/Filters/TagsFilter.tsx
@@ -16,7 +16,11 @@ import {
   useLabeledIdFilterState,
 } from "./LabeledIdFilter";
 import { SidebarListFilter } from "./SidebarListFilter";
-import { TagsCriterion } from "src/models/list-filter/criteria/tags";
+import {
+  TagsCriterion,
+  TagsCriterionOption,
+} from "src/models/list-filter/criteria/tags";
+import { FormattedMessage } from "react-intl";
 
 interface ITagsFilter {
   criterion: TagsCriterion;
@@ -99,12 +103,19 @@ const TagsFilter: React.FC<ITagsFilter> = ({ criterion, setCriterion }) => {
 
 export const SidebarTagsFilter: React.FC<{
   title?: ReactNode;
-  option: CriterionOption;
+  option?: CriterionOption;
   filter: ListFilterModel;
   setFilter: (f: ListFilterModel) => void;
   filterHook?: (f: ListFilterModel) => ListFilterModel;
   sectionID?: string;
-}> = ({ title, option, filter, setFilter, filterHook, sectionID }) => {
+}> = ({
+  title = <FormattedMessage id="tags" />,
+  option = TagsCriterionOption,
+  filter,
+  setFilter,
+  filterHook,
+  sectionID = "tags",
+}) => {
   const state = useLabeledIdFilterState({
     filter,
     setFilter,
@@ -115,7 +126,14 @@ export const SidebarTagsFilter: React.FC<{
     includeSubMessageID: "sub_tags",
   });
 
-  return <SidebarListFilter {...state} title={title} sectionID={sectionID} />;
+  return (
+    <SidebarListFilter
+      {...state}
+      data-type={option.type}
+      title={title}
+      sectionID={sectionID}
+    />
+  );
 };
 
 export default TagsFilter;
diff --git a/ui/v2.5/src/components/List/ListOperationButtons.tsx b/ui/v2.5/src/components/List/ListOperationButtons.tsx
index b377cedba..314c28bf8 100644
--- a/ui/v2.5/src/components/List/ListOperationButtons.tsx
+++ b/ui/v2.5/src/components/List/ListOperationButtons.tsx
@@ -6,7 +6,10 @@ import { IconDefinition } from "@fortawesome/fontawesome-svg-core";
 import { Icon } from "../Shared/Icon";
 import {
   faEllipsisH,
+  faPencil,
   faPencilAlt,
+  faPlay,
+  faPlus,
   faTrash,
 } from "@fortawesome/free-solid-svg-icons";
 import cx from "classnames";
@@ -264,3 +267,108 @@ export const ListOperationButtons: React.FC<IListOperationButtonsProps> = ({
     </>
   );
 };
+
+interface IListOperations {
+  text: string;
+  onClick: () => void;
+  isDisplayed?: () => boolean;
+  className?: string;
+}
+
+export const ListOperations: React.FC<{
+  items: number;
+  hasSelection?: boolean;
+  operations?: IListOperations[];
+  onEdit?: () => void;
+  onDelete?: () => void;
+  onPlay?: () => void;
+  onCreateNew?: () => void;
+  entityType?: string;
+  operationsClassName?: string;
+  operationsMenuClassName?: string;
+}> = ({
+  items,
+  hasSelection = false,
+  operations = [],
+  onEdit,
+  onDelete,
+  onPlay,
+  onCreateNew,
+  entityType,
+  operationsClassName = "list-operations",
+  operationsMenuClassName,
+}) => {
+  const intl = useIntl();
+
+  return (
+    <div className="list-operations">
+      <ButtonGroup>
+        {!!items && onPlay && (
+          <Button
+            className="play-button"
+            variant="secondary"
+            onClick={() => onPlay()}
+            title={intl.formatMessage({ id: "actions.play" })}
+          >
+            <Icon icon={faPlay} />
+          </Button>
+        )}
+        {!hasSelection && onCreateNew && (
+          <Button
+            className="create-new-button"
+            variant="secondary"
+            onClick={() => onCreateNew()}
+            title={intl.formatMessage(
+              { id: "actions.create_entity" },
+              { entityType }
+            )}
+          >
+            <Icon icon={faPlus} />
+          </Button>
+        )}
+
+        {hasSelection && (onEdit || onDelete) && (
+          <>
+            {onEdit && (
+              <Button variant="secondary" onClick={() => onEdit()}>
+                <Icon icon={faPencil} />
+              </Button>
+            )}
+            {onDelete && (
+              <Button
+                variant="danger"
+                className="btn-danger-minimal"
+                onClick={() => onDelete()}
+              >
+                <Icon icon={faTrash} />
+              </Button>
+            )}
+          </>
+        )}
+
+        {operations.length > 0 && (
+          <OperationDropdown
+            className={operationsClassName}
+            menuClassName={operationsMenuClassName}
+            menuPortalTarget={document.body}
+          >
+            {operations.map((o) => {
+              if (o.isDisplayed && !o.isDisplayed()) {
+                return null;
+              }
+
+              return (
+                <OperationDropdownItem
+                  key={o.text}
+                  onClick={o.onClick}
+                  text={o.text}
+                  className={o.className}
+                />
+              );
+            })}
+          </OperationDropdown>
+        )}
+      </ButtonGroup>
+    </div>
+  );
+};
diff --git a/ui/v2.5/src/components/List/styles.scss b/ui/v2.5/src/components/List/styles.scss
index 5f1b4da2a..8a7fdf8cf 100644
--- a/ui/v2.5/src/components/List/styles.scss
+++ b/ui/v2.5/src/components/List/styles.scss
@@ -1120,7 +1120,8 @@ input[type="range"].zoom-slider {
   justify-content: flex-end;
 }
 
-.scene-list-toolbar .selected-items-info {
+.scene-list-toolbar .selected-items-info,
+.gallery-list-toolbar .selected-items-info {
   justify-content: flex-start;
 }
 
diff --git a/ui/v2.5/src/components/MainNavbar.tsx b/ui/v2.5/src/components/MainNavbar.tsx
index caee46f0c..ac1be2c13 100644
--- a/ui/v2.5/src/components/MainNavbar.tsx
+++ b/ui/v2.5/src/components/MainNavbar.tsx
@@ -132,7 +132,6 @@ const allMenuItems: IMenuItem[] = [
     href: "/galleries",
     icon: faImages,
     hotkey: "g l",
-    userCreatable: true,
   },
   {
     name: "performers",
diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerGalleriesPanel.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerGalleriesPanel.tsx
index 5a9d0b81d..44b0401e9 100644
--- a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerGalleriesPanel.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerGalleriesPanel.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import * as GQL from "src/core/generated-graphql";
-import { GalleryList } from "src/components/Galleries/GalleryList";
+import { FilteredGalleryList } from "src/components/Galleries/GalleryList";
 import { usePerformerFilterHook } from "src/core/performers";
 import { View } from "src/components/List/views";
 import { PatchComponent } from "src/patch";
@@ -14,7 +14,7 @@ export const PerformerGalleriesPanel: React.FC<IPerformerDetailsProps> =
   PatchComponent("PerformerGalleriesPanel", ({ active, performer }) => {
     const filterHook = usePerformerFilterHook(performer);
     return (
-      <GalleryList
+      <FilteredGalleryList
         filterHook={filterHook}
         alterQuery={active}
         view={View.PerformerGalleries}
diff --git a/ui/v2.5/src/components/Scenes/SceneList.tsx b/ui/v2.5/src/components/Scenes/SceneList.tsx
index ff5237c9f..2f74fc7e4 100644
--- a/ui/v2.5/src/components/Scenes/SceneList.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneList.tsx
@@ -1,7 +1,7 @@
 import React, { useCallback, useEffect, useMemo } from "react";
 import cloneDeep from "lodash-es/cloneDeep";
 import { FormattedMessage, useIntl } from "react-intl";
-import { useHistory } from "react-router-dom";
+import { useHistory, useLocation } from "react-router-dom";
 import Mousetrap from "mousetrap";
 import * as GQL from "src/core/generated-graphql";
 import { queryFindScenes, useFindScenes } from "src/core/StashService";
@@ -19,12 +19,6 @@ import { SceneCardGrid } from "./SceneCardGrid";
 import { TaggerContext } from "../Tagger/context";
 import { IdentifyDialog } from "../Dialogs/IdentifyDialog/IdentifyDialog";
 import { useConfigurationContext } from "src/hooks/Config";
-import {
-  faPencil,
-  faPlay,
-  faPlus,
-  faTrash,
-} from "@fortawesome/free-solid-svg-icons";
 import { SceneMergeModal } from "./SceneMergeDialog";
 import { objectTitle } from "src/core/files";
 import TextUtils from "src/utils/text";
@@ -32,10 +26,7 @@ import { View } from "../List/views";
 import { FileSize } from "../Shared/FileSize";
 import { LoadedContent } from "../List/PagedList";
 import { useCloseEditDelete, useFilterOperations } from "../List/util";
-import {
-  OperationDropdown,
-  OperationDropdownItem,
-} from "../List/ListOperationButtons";
+import { ListOperations } from "../List/ListOperationButtons";
 import { useFilteredItemList } from "../List/ItemList";
 import {
   Sidebar,
@@ -46,20 +37,13 @@ import {
 } from "../Shared/Sidebar";
 import { SidebarPerformersFilter } from "../List/Filters/PerformersFilter";
 import { SidebarStudiosFilter } from "../List/Filters/StudiosFilter";
-import { PerformersCriterionOption } from "src/models/list-filter/criteria/performers";
-import { StudiosCriterionOption } from "src/models/list-filter/criteria/studios";
-import { TagsCriterionOption } from "src/models/list-filter/criteria/tags";
 import { SidebarTagsFilter } from "../List/Filters/TagsFilter";
 import cx from "classnames";
-import { RatingCriterionOption } from "src/models/list-filter/criteria/rating";
 import { SidebarRatingFilter } from "../List/Filters/RatingFilter";
 import { OrganizedCriterionOption } from "src/models/list-filter/criteria/organized";
 import { HasMarkersCriterionOption } from "src/models/list-filter/criteria/has-markers";
 import { SidebarBooleanFilter } from "../List/Filters/BooleanFilter";
-import {
-  DurationCriterionOption,
-  PerformerAgeCriterionOption,
-} from "src/models/list-filter/scenes";
+import { PerformerAgeCriterionOption } from "src/models/list-filter/scenes";
 import { SidebarAgeFilter } from "../List/Filters/SidebarAgeFilter";
 import { SidebarDurationFilter } from "../List/Filters/SidebarDurationFilter";
 import {
@@ -68,8 +52,7 @@ import {
 } from "../List/Filters/FilterSidebar";
 import { PatchComponent, PatchContainerComponent } from "src/patch";
 import { Pagination, PaginationIndex } from "../List/Pagination";
-import { Button, ButtonGroup } from "react-bootstrap";
-import { Icon } from "../Shared/Icon";
+import { Button } from "react-bootstrap";
 import useFocus from "src/utils/focus";
 import { useZoomKeybinds } from "../List/ZoomSlider";
 import { FilteredListToolbar } from "../List/FilteredListToolbar";
@@ -200,59 +183,65 @@ const SceneList: React.FC<{
   selectedIds: Set<string>;
   onSelectChange: (id: string, selected: boolean, shiftKey: boolean) => void;
   fromGroupId?: string;
-}> = ({ scenes, filter, selectedIds, onSelectChange, fromGroupId }) => {
-  const queue = useMemo(() => SceneQueue.fromListFilterModel(filter), [filter]);
+}> = PatchComponent(
+  "SceneList",
+  ({ scenes, filter, selectedIds, onSelectChange, fromGroupId }) => {
+    const queue = useMemo(
+      () => SceneQueue.fromListFilterModel(filter),
+      [filter]
+    );
+
+    if (scenes.length === 0 && filter.displayMode !== DisplayMode.Tagger) {
+      return null;
+    }
+
+    if (filter.displayMode === DisplayMode.Grid) {
+      return (
+        <SceneCardGrid
+          scenes={scenes}
+          queue={queue}
+          zoomIndex={filter.zoomIndex}
+          selectedIds={selectedIds}
+          onSelectChange={onSelectChange}
+          fromGroupId={fromGroupId}
+        />
+      );
+    }
+    if (filter.displayMode === DisplayMode.List) {
+      return (
+        <SceneListTable
+          scenes={scenes}
+          queue={queue}
+          selectedIds={selectedIds}
+          onSelectChange={onSelectChange}
+        />
+      );
+    }
+    if (filter.displayMode === DisplayMode.Wall) {
+      return (
+        <SceneWallPanel
+          scenes={scenes}
+          sceneQueue={queue}
+          zoomIndex={filter.zoomIndex}
+          selectedIds={selectedIds}
+          onSelectChange={onSelectChange}
+        />
+      );
+    }
+    if (filter.displayMode === DisplayMode.Tagger) {
+      return (
+        <Tagger
+          scenes={scenes}
+          queue={queue}
+          selectedIds={selectedIds}
+          onSelectChange={onSelectChange}
+        />
+      );
+    }
 
-  if (scenes.length === 0 && filter.displayMode !== DisplayMode.Tagger) {
     return null;
   }
-
-  if (filter.displayMode === DisplayMode.Grid) {
-    return (
-      <SceneCardGrid
-        scenes={scenes}
-        queue={queue}
-        zoomIndex={filter.zoomIndex}
-        selectedIds={selectedIds}
-        onSelectChange={onSelectChange}
-        fromGroupId={fromGroupId}
-      />
-    );
-  }
-  if (filter.displayMode === DisplayMode.List) {
-    return (
-      <SceneListTable
-        scenes={scenes}
-        queue={queue}
-        selectedIds={selectedIds}
-        onSelectChange={onSelectChange}
-      />
-    );
-  }
-  if (filter.displayMode === DisplayMode.Wall) {
-    return (
-      <SceneWallPanel
-        scenes={scenes}
-        sceneQueue={queue}
-        zoomIndex={filter.zoomIndex}
-        selectedIds={selectedIds}
-        onSelectChange={onSelectChange}
-      />
-    );
-  }
-  if (filter.displayMode === DisplayMode.Tagger) {
-    return (
-      <Tagger
-        scenes={scenes}
-        queue={queue}
-        selectedIds={selectedIds}
-        onSelectChange={onSelectChange}
-      />
-    );
-  }
-
-  return null;
-};
+);
 
 const ScenesFilterSidebarSections = PatchContainerComponent(
   "FilteredSceneList.SidebarSections"
@@ -298,48 +287,23 @@ const SidebarContent: React.FC<{
       <ScenesFilterSidebarSections>
         {!hideStudios && (
           <SidebarStudiosFilter
-            title={<FormattedMessage id="studios" />}
-            data-type={StudiosCriterionOption.type}
-            option={StudiosCriterionOption}
             filter={filter}
             setFilter={setFilter}
             filterHook={filterHook}
-            sectionID="studios"
           />
         )}
         <SidebarPerformersFilter
-          title={<FormattedMessage id="performers" />}
-          data-type={PerformersCriterionOption.type}
-          option={PerformersCriterionOption}
           filter={filter}
           setFilter={setFilter}
           filterHook={filterHook}
-          sectionID="performers"
         />
         <SidebarTagsFilter
-          title={<FormattedMessage id="tags" />}
-          data-type={TagsCriterionOption.type}
-          option={TagsCriterionOption}
           filter={filter}
           setFilter={setFilter}
           filterHook={filterHook}
-          sectionID="tags"
-        />
-        <SidebarRatingFilter
-          title={<FormattedMessage id="rating" />}
-          data-type={RatingCriterionOption.type}
-          option={RatingCriterionOption}
-          filter={filter}
-          setFilter={setFilter}
-          sectionID="rating"
-        />
-        <SidebarDurationFilter
-          title={<FormattedMessage id="duration" />}
-          option={DurationCriterionOption}
-          filter={filter}
-          setFilter={setFilter}
-          sectionID="duration"
         />
+        <SidebarRatingFilter filter={filter} setFilter={setFilter} />
+        <SidebarDurationFilter filter={filter} setFilter={setFilter} />
         <SidebarBooleanFilter
           title={<FormattedMessage id="hasMarkers" />}
           data-type={HasMarkersCriterionOption.type}
@@ -374,102 +338,6 @@ const SidebarContent: React.FC<{
   );
 };
 
-interface IOperations {
-  text: string;
-  onClick: () => void;
-  isDisplayed?: () => boolean;
-  className?: string;
-}
-
-const SceneListOperations: React.FC<{
-  items: number;
-  hasSelection: boolean;
-  operations: IOperations[];
-  onEdit: () => void;
-  onDelete: () => void;
-  onPlay: () => void;
-  onCreateNew: () => void;
-}> = PatchComponent(
-  "SceneListOperations",
-  ({
-    items,
-    hasSelection,
-    operations,
-    onEdit,
-    onDelete,
-    onPlay,
-    onCreateNew,
-  }) => {
-    const intl = useIntl();
-
-    return (
-      <div className="scene-list-operations">
-        <ButtonGroup>
-          {!!items && (
-            <Button
-              className="play-button"
-              variant="secondary"
-              onClick={() => onPlay()}
-              title={intl.formatMessage({ id: "actions.play" })}
-            >
-              <Icon icon={faPlay} />
-            </Button>
-          )}
-          {!hasSelection && (
-            <Button
-              className="create-new-button"
-              variant="secondary"
-              onClick={() => onCreateNew()}
-              title={intl.formatMessage(
-                { id: "actions.create_entity" },
-                { entityType: intl.formatMessage({ id: "scene" }) }
-              )}
-            >
-              <Icon icon={faPlus} />
-            </Button>
-          )}
-
-          {hasSelection && (
-            <>
-              <Button variant="secondary" onClick={() => onEdit()}>
-                <Icon icon={faPencil} />
-              </Button>
-              <Button
-                variant="danger"
-                className="btn-danger-minimal"
-                onClick={() => onDelete()}
-              >
-                <Icon icon={faTrash} />
-              </Button>
-            </>
-          )}
-
-          <OperationDropdown
-            className="scene-list-operations"
-            menuClassName="scene-list-operations-dropdown"
-            menuPortalTarget={document.body}
-          >
-            {operations.map((o) => {
-              if (o.isDisplayed && !o.isDisplayed()) {
-                return null;
-              }
-
-              return (
-                <OperationDropdownItem
-                  key={o.text}
-                  onClick={o.onClick}
-                  text={o.text}
-                  className={o.className}
-                />
-              );
-            })}
-          </OperationDropdown>
-        </ButtonGroup>
-      </div>
-    );
-  }
-);
-
 interface IFilteredScenes {
   filterHook?: (filter: ListFilterModel) => ListFilterModel;
   defaultSort?: string;
@@ -478,362 +346,381 @@ interface IFilteredScenes {
   fromGroupId?: string;
 }
 
-export const FilteredSceneList = (props: IFilteredScenes) => {
-  const intl = useIntl();
-  const history = useHistory();
+export const FilteredSceneList = PatchComponent(
+  "FilteredSceneList",
+  (props: IFilteredScenes) => {
+    const intl = useIntl();
+    const history = useHistory();
+    const location = useLocation();
 
-  const searchFocus = useFocus();
+    const searchFocus = useFocus();
 
-  const { filterHook, defaultSort, view, alterQuery, fromGroupId } = props;
+    const { filterHook, defaultSort, view, alterQuery, fromGroupId } = props;
 
-  // States
-  const {
-    showSidebar,
-    setShowSidebar,
-    loading: sidebarStateLoading,
-    sectionOpen,
-    setSectionOpen,
-  } = useSidebarState(view);
+    // States
+    const {
+      showSidebar,
+      setShowSidebar,
+      loading: sidebarStateLoading,
+      sectionOpen,
+      setSectionOpen,
+    } = useSidebarState(view);
 
-  const { filterState, queryResult, modalState, listSelect, showEditFilter } =
-    useFilteredItemList({
-      filterStateProps: {
-        filterMode: GQL.FilterMode.Scenes,
-        defaultSort,
-        view,
-        useURL: alterQuery,
-      },
-      queryResultProps: {
-        useResult: useFindScenes,
-        getCount: (r) => r.data?.findScenes.count ?? 0,
-        getItems: (r) => r.data?.findScenes.scenes ?? [],
-        filterHook,
-      },
+    const { filterState, queryResult, modalState, listSelect, showEditFilter } =
+      useFilteredItemList({
+        filterStateProps: {
+          filterMode: GQL.FilterMode.Scenes,
+          defaultSort,
+          view,
+          useURL: alterQuery,
+        },
+        queryResultProps: {
+          useResult: useFindScenes,
+          getCount: (r) => r.data?.findScenes.count ?? 0,
+          getItems: (r) => r.data?.findScenes.scenes ?? [],
+          filterHook,
+        },
+      });
+
+    const { filter, setFilter } = filterState;
+
+    const { effectiveFilter, result, cachedResult, items, totalCount } =
+      queryResult;
+
+    const {
+      selectedIds,
+      selectedItems,
+      onSelectChange,
+      onSelectAll,
+      onSelectNone,
+      onInvertSelection,
+      hasSelection,
+    } = listSelect;
+
+    const { modal, showModal, closeModal } = modalState;
+
+    // Utility hooks
+    const { setPage, removeCriterion, clearAllCriteria } = useFilterOperations({
+      filter,
+      setFilter,
     });
 
-  const { filter, setFilter } = filterState;
+    useAddKeybinds(filter, totalCount);
+    useFilteredSidebarKeybinds({
+      showSidebar,
+      setShowSidebar,
+    });
 
-  const { effectiveFilter, result, cachedResult, items, totalCount } =
-    queryResult;
+    const onCloseEditDelete = useCloseEditDelete({
+      closeModal,
+      onSelectNone,
+      result,
+    });
 
-  const {
-    selectedIds,
-    selectedItems,
-    onSelectChange,
-    onSelectAll,
-    onSelectNone,
-    onInvertSelection,
-    hasSelection,
-  } = listSelect;
+    const onEdit = useCallback(() => {
+      showModal(
+        <EditScenesDialog
+          selected={selectedItems}
+          onClose={onCloseEditDelete}
+        />
+      );
+    }, [showModal, selectedItems, onCloseEditDelete]);
 
-  const { modal, showModal, closeModal } = modalState;
+    const onDelete = useCallback(() => {
+      showModal(
+        <DeleteScenesDialog
+          selected={selectedItems}
+          onClose={onCloseEditDelete}
+        />
+      );
+    }, [showModal, selectedItems, onCloseEditDelete]);
 
-  // Utility hooks
-  const { setPage, removeCriterion, clearAllCriteria } = useFilterOperations({
-    filter,
-    setFilter,
-  });
+    useEffect(() => {
+      Mousetrap.bind("e", () => {
+        if (hasSelection) {
+          onEdit?.();
+        }
+      });
 
-  useAddKeybinds(filter, totalCount);
-  useFilteredSidebarKeybinds({
-    showSidebar,
-    setShowSidebar,
-  });
+      Mousetrap.bind("d d", () => {
+        if (hasSelection) {
+          onDelete?.();
+        }
+      });
 
-  const onCloseEditDelete = useCloseEditDelete({
-    closeModal,
-    onSelectNone,
-    result,
-  });
+      return () => {
+        Mousetrap.unbind("e");
+        Mousetrap.unbind("d d");
+      };
+    }, [onSelectAll, onSelectNone, hasSelection, onEdit, onDelete]);
+    useZoomKeybinds({
+      zoomIndex: filter.zoomIndex,
+      onChangeZoom: (zoom) => setFilter(filter.setZoom(zoom)),
+    });
 
-  const onEdit = useCallback(() => {
-    showModal(
-      <EditScenesDialog selected={selectedItems} onClose={onCloseEditDelete} />
+    const metadataByline = useMemo(() => {
+      if (cachedResult.loading) return null;
+
+      return renderMetadataByline(cachedResult) ?? null;
+    }, [cachedResult]);
+
+    const queue = useMemo(
+      () => SceneQueue.fromListFilterModel(filter),
+      [filter]
     );
-  }, [showModal, selectedItems, onCloseEditDelete]);
 
-  const onDelete = useCallback(() => {
-    showModal(
-      <DeleteScenesDialog
-        selected={selectedItems}
-        onClose={onCloseEditDelete}
-      />
-    );
-  }, [showModal, selectedItems, onCloseEditDelete]);
+    const playRandom = usePlayRandom(effectiveFilter, totalCount);
+    const playSelected = usePlaySelected(selectedIds);
+    const playFirst = usePlayFirst();
 
-  useEffect(() => {
-    Mousetrap.bind("e", () => {
-      if (hasSelection) {
-        onEdit?.();
+    function onCreateNew() {
+      let queryParam = new URLSearchParams(location.search).get("q");
+      let newPath = "/scenes/new";
+      if (queryParam) {
+        newPath += "?q=" + encodeURIComponent(queryParam);
       }
-    });
-
-    Mousetrap.bind("d d", () => {
-      if (hasSelection) {
-        onDelete?.();
-      }
-    });
-
-    return () => {
-      Mousetrap.unbind("e");
-      Mousetrap.unbind("d d");
-    };
-  }, [onSelectAll, onSelectNone, hasSelection, onEdit, onDelete]);
-  useZoomKeybinds({
-    zoomIndex: filter.zoomIndex,
-    onChangeZoom: (zoom) => setFilter(filter.setZoom(zoom)),
-  });
-
-  const metadataByline = useMemo(() => {
-    if (cachedResult.loading) return null;
-
-    return renderMetadataByline(cachedResult) ?? null;
-  }, [cachedResult]);
-
-  const queue = useMemo(() => SceneQueue.fromListFilterModel(filter), [filter]);
-
-  const playRandom = usePlayRandom(effectiveFilter, totalCount);
-  const playSelected = usePlaySelected(selectedIds);
-  const playFirst = usePlayFirst();
-
-  function onCreateNew() {
-    history.push("/scenes/new");
-  }
-
-  function onPlay() {
-    if (items.length === 0) {
-      return;
+      history.push(newPath);
     }
 
-    // if there are selected items, play those
-    if (hasSelection) {
-      playSelected();
-      return;
+    function onPlay() {
+      if (items.length === 0) {
+        return;
+      }
+
+      // if there are selected items, play those
+      if (hasSelection) {
+        playSelected();
+        return;
+      }
+
+      // otherwise, play the first item in the list
+      const sceneID = items[0].id;
+      playFirst(queue, sceneID, 0);
     }
 
-    // otherwise, play the first item in the list
-    const sceneID = items[0].id;
-    playFirst(queue, sceneID, 0);
-  }
+    function onExport(all: boolean) {
+      showModal(
+        <ExportDialog
+          exportInput={{
+            scenes: {
+              ids: Array.from(selectedIds.values()),
+              all: all,
+            },
+          }}
+          onClose={() => closeModal()}
+        />
+      );
+    }
 
-  function onExport(all: boolean) {
-    showModal(
-      <ExportDialog
-        exportInput={{
-          scenes: {
-            ids: Array.from(selectedIds.values()),
-            all: all,
-          },
-        }}
-        onClose={() => closeModal()}
+    function onMerge() {
+      const selected =
+        selectedItems.map((s) => {
+          return {
+            id: s.id,
+            title: objectTitle(s),
+          };
+        }) ?? [];
+      showModal(
+        <SceneMergeModal
+          scenes={selected}
+          onClose={(mergedID?: string) => {
+            closeModal();
+            if (mergedID) {
+              history.push(`/scenes/${mergedID}`);
+            }
+          }}
+          show
+        />
+      );
+    }
+
+    const otherOperations = [
+      {
+        text: intl.formatMessage({ id: "actions.play" }),
+        onClick: () => onPlay(),
+        isDisplayed: () => items.length > 0,
+        className: "play-item",
+      },
+      {
+        text: intl.formatMessage(
+          { id: "actions.create_entity" },
+          { entityType: intl.formatMessage({ id: "scene" }) }
+        ),
+        onClick: () => onCreateNew(),
+        isDisplayed: () => !hasSelection,
+        className: "create-new-item",
+      },
+      {
+        text: intl.formatMessage({ id: "actions.select_all" }),
+        onClick: () => onSelectAll(),
+        isDisplayed: () => totalCount > 0,
+      },
+      {
+        text: intl.formatMessage({ id: "actions.select_none" }),
+        onClick: () => onSelectNone(),
+        isDisplayed: () => hasSelection,
+      },
+      {
+        text: intl.formatMessage({ id: "actions.invert_selection" }),
+        onClick: () => onInvertSelection(),
+        isDisplayed: () => totalCount > 0,
+      },
+      {
+        text: intl.formatMessage({ id: "actions.play_random" }),
+        onClick: playRandom,
+        isDisplayed: () => totalCount > 1,
+      },
+      {
+        text: `${intl.formatMessage({ id: "actions.generate" })}…`,
+        onClick: () =>
+          showModal(
+            <GenerateDialog
+              type="scene"
+              selectedIds={Array.from(selectedIds.values())}
+              onClose={() => closeModal()}
+            />
+          ),
+        isDisplayed: () => hasSelection,
+      },
+      {
+        text: `${intl.formatMessage({ id: "actions.identify" })}…`,
+        onClick: () =>
+          showModal(
+            <IdentifyDialog
+              selectedIds={Array.from(selectedIds.values())}
+              onClose={() => closeModal()}
+            />
+          ),
+        isDisplayed: () => hasSelection,
+      },
+      {
+        text: `${intl.formatMessage({ id: "actions.merge" })}…`,
+        onClick: () => onMerge(),
+        isDisplayed: () => hasSelection,
+      },
+      {
+        text: intl.formatMessage({ id: "actions.export" }),
+        onClick: () => onExport(false),
+        isDisplayed: () => hasSelection,
+      },
+      {
+        text: intl.formatMessage({ id: "actions.export_all" }),
+        onClick: () => onExport(true),
+      },
+    ];
+
+    // render
+    if (sidebarStateLoading) return null;
+
+    const operations = (
+      <ListOperations
+        items={items.length}
+        hasSelection={hasSelection}
+        operations={otherOperations}
+        onEdit={onEdit}
+        onDelete={onDelete}
+        onPlay={onPlay}
+        onCreateNew={onCreateNew}
+        entityType={intl.formatMessage({ id: "scene" })}
+        operationsMenuClassName="scene-list-operations-dropdown"
       />
     );
-  }
 
-  function onMerge() {
-    const selected =
-      selectedItems.map((s) => {
-        return {
-          id: s.id,
-          title: objectTitle(s),
-        };
-      }) ?? [];
-    showModal(
-      <SceneMergeModal
-        scenes={selected}
-        onClose={(mergedID?: string) => {
-          closeModal();
-          if (mergedID) {
-            history.push(`/scenes/${mergedID}`);
-          }
-        }}
-        show
-      />
-    );
-  }
+    return (
+      <TaggerContext>
+        <div
+          className={cx("item-list-container scene-list", {
+            "hide-sidebar": !showSidebar,
+          })}
+        >
+          {modal}
 
-  const otherOperations = [
-    {
-      text: intl.formatMessage({ id: "actions.play" }),
-      onClick: () => onPlay(),
-      isDisplayed: () => items.length > 0,
-      className: "play-item",
-    },
-    {
-      text: intl.formatMessage(
-        { id: "actions.create_entity" },
-        { entityType: intl.formatMessage({ id: "scene" }) }
-      ),
-      onClick: () => onCreateNew(),
-      isDisplayed: () => !hasSelection,
-      className: "create-new-item",
-    },
-    {
-      text: intl.formatMessage({ id: "actions.select_all" }),
-      onClick: () => onSelectAll(),
-      isDisplayed: () => totalCount > 0,
-    },
-    {
-      text: intl.formatMessage({ id: "actions.select_none" }),
-      onClick: () => onSelectNone(),
-      isDisplayed: () => hasSelection,
-    },
-    {
-      text: intl.formatMessage({ id: "actions.invert_selection" }),
-      onClick: () => onInvertSelection(),
-      isDisplayed: () => totalCount > 0,
-    },
-    {
-      text: intl.formatMessage({ id: "actions.play_random" }),
-      onClick: playRandom,
-      isDisplayed: () => totalCount > 1,
-    },
-    {
-      text: `${intl.formatMessage({ id: "actions.generate" })}…`,
-      onClick: () =>
-        showModal(
-          <GenerateDialog
-            type="scene"
-            selectedIds={Array.from(selectedIds.values())}
-            onClose={() => closeModal()}
-          />
-        ),
-      isDisplayed: () => hasSelection,
-    },
-    {
-      text: `${intl.formatMessage({ id: "actions.identify" })}…`,
-      onClick: () =>
-        showModal(
-          <IdentifyDialog
-            selectedIds={Array.from(selectedIds.values())}
-            onClose={() => closeModal()}
-          />
-        ),
-      isDisplayed: () => hasSelection,
-    },
-    {
-      text: `${intl.formatMessage({ id: "actions.merge" })}…`,
-      onClick: () => onMerge(),
-      isDisplayed: () => hasSelection,
-    },
-    {
-      text: intl.formatMessage({ id: "actions.export" }),
-      onClick: () => onExport(false),
-      isDisplayed: () => hasSelection,
-    },
-    {
-      text: intl.formatMessage({ id: "actions.export_all" }),
-      onClick: () => onExport(true),
-    },
-  ];
-
-  // render
-  if (sidebarStateLoading) return null;
-
-  const operations = (
-    <SceneListOperations
-      items={items.length}
-      hasSelection={hasSelection}
-      operations={otherOperations}
-      onEdit={onEdit}
-      onDelete={onDelete}
-      onPlay={onPlay}
-      onCreateNew={onCreateNew}
-    />
-  );
-
-  return (
-    <TaggerContext>
-      <div
-        className={cx("item-list-container scene-list", {
-          "hide-sidebar": !showSidebar,
-        })}
-      >
-        {modal}
-
-        <SidebarStateContext.Provider value={{ sectionOpen, setSectionOpen }}>
-          <SidebarPane hideSidebar={!showSidebar}>
-            <Sidebar hide={!showSidebar} onHide={() => setShowSidebar(false)}>
-              <SidebarContent
-                filter={filter}
-                setFilter={setFilter}
-                filterHook={filterHook}
-                showEditFilter={showEditFilter}
-                view={view}
-                sidebarOpen={showSidebar}
-                onClose={() => setShowSidebar(false)}
-                count={cachedResult.loading ? undefined : totalCount}
-                focus={searchFocus}
-              />
-            </Sidebar>
-            <SidebarPaneContent
-              onSidebarToggle={() => setShowSidebar(!showSidebar)}
-            >
-              <FilteredListToolbar
-                filter={filter}
-                listSelect={listSelect}
-                setFilter={setFilter}
-                showEditFilter={showEditFilter}
-                onDelete={onDelete}
-                onEdit={onEdit}
-                operationComponent={operations}
-                view={view}
-                zoomable
-              />
-
-              <FilterTags
-                criteria={filter.criteria}
-                onEditCriterion={(c) => showEditFilter(c.criterionOption.type)}
-                onRemoveCriterion={removeCriterion}
-                onRemoveAll={clearAllCriteria}
-              />
-
-              <div className="pagination-index-container">
-                <Pagination
-                  currentPage={filter.currentPage}
-                  itemsPerPage={filter.itemsPerPage}
-                  totalItems={totalCount}
-                  onChangePage={(page) => setFilter(filter.changePage(page))}
+          <SidebarStateContext.Provider value={{ sectionOpen, setSectionOpen }}>
+            <SidebarPane hideSidebar={!showSidebar}>
+              <Sidebar hide={!showSidebar} onHide={() => setShowSidebar(false)}>
+                <SidebarContent
+                  filter={filter}
+                  setFilter={setFilter}
+                  filterHook={filterHook}
+                  showEditFilter={showEditFilter}
+                  view={view}
+                  sidebarOpen={showSidebar}
+                  onClose={() => setShowSidebar(false)}
+                  count={cachedResult.loading ? undefined : totalCount}
+                  focus={searchFocus}
                 />
-                <PaginationIndex
-                  loading={cachedResult.loading}
-                  itemsPerPage={filter.itemsPerPage}
-                  currentPage={filter.currentPage}
-                  totalItems={totalCount}
-                  metadataByline={metadataByline}
+              </Sidebar>
+              <SidebarPaneContent
+                onSidebarToggle={() => setShowSidebar(!showSidebar)}
+              >
+                <FilteredListToolbar
+                  filter={filter}
+                  listSelect={listSelect}
+                  setFilter={setFilter}
+                  showEditFilter={showEditFilter}
+                  onDelete={onDelete}
+                  onEdit={onEdit}
+                  operationComponent={operations}
+                  view={view}
+                  zoomable
                 />
-              </div>
 
-              <LoadedContent loading={result.loading} error={result.error}>
-                <SceneList
-                  filter={effectiveFilter}
-                  scenes={items}
-                  selectedIds={selectedIds}
-                  onSelectChange={onSelectChange}
-                  fromGroupId={fromGroupId}
+                <FilterTags
+                  criteria={filter.criteria}
+                  onEditCriterion={(c) =>
+                    showEditFilter(c.criterionOption.type)
+                  }
+                  onRemoveCriterion={removeCriterion}
+                  onRemoveAll={clearAllCriteria}
                 />
-              </LoadedContent>
 
-              {totalCount > filter.itemsPerPage && (
-                <div className="pagination-footer-container">
-                  <div className="pagination-footer">
-                    <Pagination
-                      itemsPerPage={filter.itemsPerPage}
-                      currentPage={filter.currentPage}
-                      totalItems={totalCount}
-                      metadataByline={metadataByline}
-                      onChangePage={setPage}
-                      pagePopupPlacement="top"
-                    />
-                  </div>
+                <div className="pagination-index-container">
+                  <Pagination
+                    currentPage={filter.currentPage}
+                    itemsPerPage={filter.itemsPerPage}
+                    totalItems={totalCount}
+                    onChangePage={(page) => setFilter(filter.changePage(page))}
+                  />
+                  <PaginationIndex
+                    loading={cachedResult.loading}
+                    itemsPerPage={filter.itemsPerPage}
+                    currentPage={filter.currentPage}
+                    totalItems={totalCount}
+                    metadataByline={metadataByline}
+                  />
                 </div>
-              )}
-            </SidebarPaneContent>
-          </SidebarPane>
-        </SidebarStateContext.Provider>
-      </div>
-    </TaggerContext>
-  );
-};
+
+                <LoadedContent loading={result.loading} error={result.error}>
+                  <SceneList
+                    filter={effectiveFilter}
+                    scenes={items}
+                    selectedIds={selectedIds}
+                    onSelectChange={onSelectChange}
+                    fromGroupId={fromGroupId}
+                  />
+                </LoadedContent>
+
+                {totalCount > filter.itemsPerPage && (
+                  <div className="pagination-footer-container">
+                    <div className="pagination-footer">
+                      <Pagination
+                        itemsPerPage={filter.itemsPerPage}
+                        currentPage={filter.currentPage}
+                        totalItems={totalCount}
+                        metadataByline={metadataByline}
+                        onChangePage={setPage}
+                        pagePopupPlacement="top"
+                      />
+                    </div>
+                  </div>
+                )}
+              </SidebarPaneContent>
+            </SidebarPane>
+          </SidebarStateContext.Provider>
+        </div>
+      </TaggerContext>
+    );
+  }
+);
 
 export default FilteredSceneList;
diff --git a/ui/v2.5/src/components/Studios/StudioDetails/StudioGalleriesPanel.tsx b/ui/v2.5/src/components/Studios/StudioDetails/StudioGalleriesPanel.tsx
index 340586b94..f5a1aba32 100644
--- a/ui/v2.5/src/components/Studios/StudioDetails/StudioGalleriesPanel.tsx
+++ b/ui/v2.5/src/components/Studios/StudioDetails/StudioGalleriesPanel.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import * as GQL from "src/core/generated-graphql";
-import { GalleryList } from "src/components/Galleries/GalleryList";
+import { FilteredGalleryList } from "src/components/Galleries/GalleryList";
 import { useStudioFilterHook } from "src/core/studios";
 import { View } from "src/components/List/views";
 
@@ -17,7 +17,7 @@ export const StudioGalleriesPanel: React.FC<IStudioGalleriesPanel> = ({
 }) => {
   const filterHook = useStudioFilterHook(studio, showChildStudioContent);
   return (
-    <GalleryList
+    <FilteredGalleryList
       filterHook={filterHook}
       alterQuery={active}
       view={View.StudioGalleries}
diff --git a/ui/v2.5/src/components/Tags/TagDetails/TagGalleriesPanel.tsx b/ui/v2.5/src/components/Tags/TagDetails/TagGalleriesPanel.tsx
index bb95a7ea1..f5df9946b 100644
--- a/ui/v2.5/src/components/Tags/TagDetails/TagGalleriesPanel.tsx
+++ b/ui/v2.5/src/components/Tags/TagDetails/TagGalleriesPanel.tsx
@@ -1,7 +1,7 @@
 import React from "react";
 import * as GQL from "src/core/generated-graphql";
 import { useTagFilterHook } from "src/core/tags";
-import { GalleryList } from "src/components/Galleries/GalleryList";
+import { FilteredGalleryList } from "src/components/Galleries/GalleryList";
 import { View } from "src/components/List/views";
 
 interface ITagGalleriesPanel {
@@ -17,7 +17,7 @@ export const TagGalleriesPanel: React.FC<ITagGalleriesPanel> = ({
 }) => {
   const filterHook = useTagFilterHook(tag, showSubTagContent);
   return (
-    <GalleryList
+    <FilteredGalleryList
       filterHook={filterHook}
       alterQuery={active}
       view={View.TagGalleries}
diff --git a/ui/v2.5/src/docs/en/Manual/UIPluginApi.md b/ui/v2.5/src/docs/en/Manual/UIPluginApi.md
index 683ea5b4e..54ef3a20f 100644
--- a/ui/v2.5/src/docs/en/Manual/UIPluginApi.md
+++ b/ui/v2.5/src/docs/en/Manual/UIPluginApi.md
@@ -229,6 +229,8 @@ Returns `void`.
 - `DetailImage`
 - `ExternalLinkButtons`
 - `ExternalLinksButton`
+- `FilteredGalleryList`
+- `FilteredSceneList`
 - `FolderSelect`
 - `FrontPage`
 - `GalleryCard`
@@ -238,6 +240,7 @@ Returns `void`.
 - `GalleryCard.Popovers`
 - `GalleryCardGrid`
 - `GalleryIDSelect`
+- `GalleryList`
 - `GalleryRecommendationRow`
 - `GallerySelect`
 - `GallerySelect.sort`
@@ -308,6 +311,7 @@ Returns `void`.
 - `SceneMarkerCard.Popovers`
 - `SceneMarkerCardsGrid`
 - `SceneMarkerRecommendationRow`
+- `SceneList`
 - `ScenePage`
 - `ScenePage.TabContent`
 - `ScenePage.Tabs`
diff --git a/ui/v2.5/src/index.scss b/ui/v2.5/src/index.scss
index 24679c158..cadd1ad2f 100755
--- a/ui/v2.5/src/index.scss
+++ b/ui/v2.5/src/index.scss
@@ -526,8 +526,6 @@ textarea.text-input {
 }
 
 .zoom-1 {
-  width: 320px;
-
   .gallery-card-image,
   .tag-card-image {
     height: 240px;
diff --git a/ui/v2.5/src/pluginApi.d.ts b/ui/v2.5/src/pluginApi.d.ts
index 1aae25129..dd881c0b4 100644
--- a/ui/v2.5/src/pluginApi.d.ts
+++ b/ui/v2.5/src/pluginApi.d.ts
@@ -666,6 +666,8 @@ declare namespace PluginApi {
     DetailImage: React.FC<any>;
     ExternalLinkButtons: React.FC<any>;
     ExternalLinksButton: React.FC<any>;
+    FilteredGalleryList: React.FC<any>;
+    FilteredSceneList: React.FC<any>;
     FolderSelect: React.FC<any>;
     FrontPage: React.FC<any>;
     GalleryCard: React.FC<any>;

From 9eda7c2f602db5a26e53f405c2f8299211f7911a Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Thu, 5 Feb 2026 09:01:29 +1100
Subject: [PATCH 278/405] Studio custom fields backend support (#6156)

---
 graphql/schema/types/filters.graphql          |   2 +
 graphql/schema/types/studio.graphql           |   6 +
 internal/api/loaders/dataloaders.go           |  21 +-
 internal/api/resolver_model_studio.go         |  13 +
 internal/api/resolver_mutation_studio.go      |   8 +-
 internal/autotag/integration_test.go          |   7 +-
 internal/identify/scene_test.go               |   2 +-
 internal/identify/studio_test.go              |   6 +-
 pkg/gallery/import.go                         |   2 +-
 pkg/gallery/import_test.go                    |   8 +-
 pkg/group/import.go                           |   2 +-
 pkg/group/import_test.go                      |   8 +-
 pkg/image/import.go                           |   2 +-
 pkg/image/import_test.go                      |   8 +-
 pkg/models/mocks/StudioReaderWriter.go        |  54 +-
 pkg/models/model_scraped_item.go              |   4 +-
 pkg/models/model_scraped_item_test.go         |   2 +-
 pkg/models/model_studio.go                    |  21 +
 pkg/models/repository_studio.go               |   6 +-
 pkg/models/studio.go                          |   7 +
 pkg/scene/import.go                           |   2 +-
 pkg/scene/import_test.go                      |   8 +-
 pkg/sqlite/database.go                        |   2 +-
 .../migrations/76_studio_custom_fields.up.sql |   9 +
 pkg/sqlite/setup_test.go                      |  25 +-
 pkg/sqlite/studio.go                          |  30 +-
 pkg/sqlite/studio_filter.go                   |   7 +
 pkg/sqlite/studio_test.go                     | 576 +++++++++++++++++-
 pkg/sqlite/tables.go                          |   1 +
 pkg/studio/import.go                          |   6 +-
 pkg/studio/import_test.go                     |  18 +-
 pkg/studio/validate.go                        |   2 +-
 32 files changed, 796 insertions(+), 79 deletions(-)
 create mode 100644 pkg/sqlite/migrations/76_studio_custom_fields.up.sql

diff --git a/graphql/schema/types/filters.graphql b/graphql/schema/types/filters.graphql
index 4e70b7353..d0d6a4b65 100644
--- a/graphql/schema/types/filters.graphql
+++ b/graphql/schema/types/filters.graphql
@@ -487,6 +487,8 @@ input StudioFilterType {
   created_at: TimestampCriterionInput
   "Filter by last update time"
   updated_at: TimestampCriterionInput
+
+  custom_fields: [CustomFieldCriterionInput!]
 }
 
 input GalleryFilterType {
diff --git a/graphql/schema/types/studio.graphql b/graphql/schema/types/studio.graphql
index a1e1659ec..3e991ce96 100644
--- a/graphql/schema/types/studio.graphql
+++ b/graphql/schema/types/studio.graphql
@@ -26,6 +26,8 @@ type Studio {
   groups: [Group!]!
   movies: [Movie!]! @deprecated(reason: "use groups instead")
   o_counter: Int
+
+  custom_fields: Map!
 }
 
 input StudioCreateInput {
@@ -44,6 +46,8 @@ input StudioCreateInput {
   aliases: [String!]
   tag_ids: [ID!]
   ignore_auto_tag: Boolean
+
+  custom_fields: Map
 }
 
 input StudioUpdateInput {
@@ -63,6 +67,8 @@ input StudioUpdateInput {
   aliases: [String!]
   tag_ids: [ID!]
   ignore_auto_tag: Boolean
+
+  custom_fields: CustomFieldsInput
 }
 
 input BulkStudioUpdateInput {
diff --git a/internal/api/loaders/dataloaders.go b/internal/api/loaders/dataloaders.go
index 38f72b0a1..4676966c9 100644
--- a/internal/api/loaders/dataloaders.go
+++ b/internal/api/loaders/dataloaders.go
@@ -59,7 +59,9 @@ type Loaders struct {
 	PerformerByID         *PerformerLoader
 	PerformerCustomFields *CustomFieldsLoader
 
-	StudioByID *StudioLoader
+	StudioByID         *StudioLoader
+	StudioCustomFields *CustomFieldsLoader
+
 	TagByID    *TagLoader
 	GroupByID  *GroupLoader
 	FileByID   *FileLoader
@@ -99,6 +101,11 @@ func (m Middleware) Middleware(next http.Handler) http.Handler {
 				maxBatch: maxBatch,
 				fetch:    m.fetchPerformerCustomFields(ctx),
 			},
+			StudioCustomFields: &CustomFieldsLoader{
+				wait:     wait,
+				maxBatch: maxBatch,
+				fetch:    m.fetchStudioCustomFields(ctx),
+			},
 			StudioByID: &StudioLoader{
 				wait:     wait,
 				maxBatch: maxBatch,
@@ -253,6 +260,18 @@ func (m Middleware) fetchStudios(ctx context.Context) func(keys []int) ([]*model
 	}
 }
 
+func (m Middleware) fetchStudioCustomFields(ctx context.Context) func(keys []int) ([]models.CustomFieldMap, []error) {
+	return func(keys []int) (ret []models.CustomFieldMap, errs []error) {
+		err := m.Repository.WithDB(ctx, func(ctx context.Context) error {
+			var err error
+			ret, err = m.Repository.Studio.GetCustomFieldsBulk(ctx, keys)
+			return err
+		})
+
+		return ret, toErrorSlice(err)
+	}
+}
+
 func (m Middleware) fetchTags(ctx context.Context) func(keys []int) ([]*models.Tag, []error) {
 	return func(keys []int) (ret []*models.Tag, errs []error) {
 		err := m.Repository.WithDB(ctx, func(ctx context.Context) error {
diff --git a/internal/api/resolver_model_studio.go b/internal/api/resolver_model_studio.go
index fabcf38bd..b54455920 100644
--- a/internal/api/resolver_model_studio.go
+++ b/internal/api/resolver_model_studio.go
@@ -207,6 +207,19 @@ func (r *studioResolver) Groups(ctx context.Context, obj *models.Studio) (ret []
 	return ret, nil
 }
 
+func (r *studioResolver) CustomFields(ctx context.Context, obj *models.Studio) (map[string]interface{}, error) {
+	m, err := loaders.From(ctx).StudioCustomFields.Load(obj.ID)
+	if err != nil {
+		return nil, err
+	}
+
+	if m == nil {
+		return make(map[string]interface{}), nil
+	}
+
+	return m, nil
+}
+
 // deprecated
 func (r *studioResolver) Movies(ctx context.Context, obj *models.Studio) (ret []*models.Group, err error) {
 	return r.Groups(ctx, obj)
diff --git a/internal/api/resolver_mutation_studio.go b/internal/api/resolver_mutation_studio.go
index fdd700490..e3e1c6395 100644
--- a/internal/api/resolver_mutation_studio.go
+++ b/internal/api/resolver_mutation_studio.go
@@ -31,7 +31,7 @@ func (r *mutationResolver) StudioCreate(ctx context.Context, input models.Studio
 	}
 
 	// Populate a new studio from the input
-	newStudio := models.NewStudio()
+	newStudio := models.NewCreateStudioInput()
 
 	newStudio.Name = strings.TrimSpace(input.Name)
 	newStudio.Rating = input.Rating100
@@ -61,6 +61,7 @@ func (r *mutationResolver) StudioCreate(ctx context.Context, input models.Studio
 	if err != nil {
 		return nil, fmt.Errorf("converting tag ids: %w", err)
 	}
+	newStudio.CustomFields = convertMapJSONNumbers(input.CustomFields)
 
 	// Process the base 64 encoded image string
 	var imageData []byte
@@ -152,6 +153,11 @@ func (r *mutationResolver) StudioUpdate(ctx context.Context, input models.Studio
 		}
 	}
 
+	updatedStudio.CustomFields = input.CustomFields
+	// convert json.Numbers to int/float
+	updatedStudio.CustomFields.Full = convertMapJSONNumbers(updatedStudio.CustomFields.Full)
+	updatedStudio.CustomFields.Partial = convertMapJSONNumbers(updatedStudio.CustomFields.Partial)
+
 	// Process the base 64 encoded image string
 	var imageData []byte
 	imageIncluded := translator.hasField("image")
diff --git a/internal/autotag/integration_test.go b/internal/autotag/integration_test.go
index fc83df848..605082b98 100644
--- a/internal/autotag/integration_test.go
+++ b/internal/autotag/integration_test.go
@@ -101,16 +101,15 @@ func createPerformer(ctx context.Context, pqb models.PerformerWriter) error {
 
 func createStudio(ctx context.Context, qb models.StudioWriter, name string) (*models.Studio, error) {
 	// create the studio
-	studio := models.Studio{
-		Name: name,
-	}
+	studio := models.NewCreateStudioInput()
+	studio.Name = name
 
 	err := qb.Create(ctx, &studio)
 	if err != nil {
 		return nil, err
 	}
 
-	return &studio, nil
+	return studio.Studio, nil
 }
 
 func createTag(ctx context.Context, qb models.TagWriter) error {
diff --git a/internal/identify/scene_test.go b/internal/identify/scene_test.go
index a76aef516..0eec61c4e 100644
--- a/internal/identify/scene_test.go
+++ b/internal/identify/scene_test.go
@@ -27,7 +27,7 @@ func Test_sceneRelationships_studio(t *testing.T) {
 	db := mocks.NewDatabase()
 
 	db.Studio.On("Create", testCtx, mock.Anything).Run(func(args mock.Arguments) {
-		s := args.Get(1).(*models.Studio)
+		s := args.Get(1).(*models.CreateStudioInput)
 		s.ID = validStoredIDInt
 	}).Return(nil)
 
diff --git a/internal/identify/studio_test.go b/internal/identify/studio_test.go
index 5424a6a93..083675650 100644
--- a/internal/identify/studio_test.go
+++ b/internal/identify/studio_test.go
@@ -21,13 +21,13 @@ func Test_createMissingStudio(t *testing.T) {
 
 	db := mocks.NewDatabase()
 
-	db.Studio.On("Create", testCtx, mock.MatchedBy(func(p *models.Studio) bool {
+	db.Studio.On("Create", testCtx, mock.MatchedBy(func(p *models.CreateStudioInput) bool {
 		return p.Name == validName
 	})).Run(func(args mock.Arguments) {
-		s := args.Get(1).(*models.Studio)
+		s := args.Get(1).(*models.CreateStudioInput)
 		s.ID = createdID
 	}).Return(nil)
-	db.Studio.On("Create", testCtx, mock.MatchedBy(func(p *models.Studio) bool {
+	db.Studio.On("Create", testCtx, mock.MatchedBy(func(p *models.CreateStudioInput) bool {
 		return p.Name == invalidName
 	})).Return(errors.New("error creating studio"))
 
diff --git a/pkg/gallery/import.go b/pkg/gallery/import.go
index 0068b3f1c..543d4cf48 100644
--- a/pkg/gallery/import.go
+++ b/pkg/gallery/import.go
@@ -126,7 +126,7 @@ func (i *Importer) populateStudio(ctx context.Context) error {
 }
 
 func (i *Importer) createStudio(ctx context.Context, name string) (int, error) {
-	newStudio := models.NewStudio()
+	newStudio := models.NewCreateStudioInput()
 	newStudio.Name = name
 
 	err := i.StudioWriter.Create(ctx, &newStudio)
diff --git a/pkg/gallery/import_test.go b/pkg/gallery/import_test.go
index b64f80d8f..4248f51bc 100644
--- a/pkg/gallery/import_test.go
+++ b/pkg/gallery/import_test.go
@@ -115,9 +115,9 @@ func TestImporterPreImportWithMissingStudio(t *testing.T) {
 	}
 
 	db.Studio.On("FindByName", testCtx, missingStudioName, false).Return(nil, nil).Times(3)
-	db.Studio.On("Create", testCtx, mock.AnythingOfType("*models.Studio")).Run(func(args mock.Arguments) {
-		s := args.Get(1).(*models.Studio)
-		s.ID = existingStudioID
+	db.Studio.On("Create", testCtx, mock.AnythingOfType("*models.CreateStudioInput")).Run(func(args mock.Arguments) {
+		s := args.Get(1).(*models.CreateStudioInput)
+		s.Studio.ID = existingStudioID
 	}).Return(nil)
 
 	err := i.PreImport(testCtx)
@@ -147,7 +147,7 @@ func TestImporterPreImportWithMissingStudioCreateErr(t *testing.T) {
 	}
 
 	db.Studio.On("FindByName", testCtx, missingStudioName, false).Return(nil, nil).Once()
-	db.Studio.On("Create", testCtx, mock.AnythingOfType("*models.Studio")).Return(errors.New("Create error"))
+	db.Studio.On("Create", testCtx, mock.AnythingOfType("*models.CreateStudioInput")).Return(errors.New("Create error"))
 
 	err := i.PreImport(testCtx)
 	assert.NotNil(t, err)
diff --git a/pkg/group/import.go b/pkg/group/import.go
index 3fc7db8f1..a73c3998e 100644
--- a/pkg/group/import.go
+++ b/pkg/group/import.go
@@ -203,7 +203,7 @@ func (i *Importer) populateStudio(ctx context.Context) error {
 }
 
 func (i *Importer) createStudio(ctx context.Context, name string) (int, error) {
-	newStudio := models.NewStudio()
+	newStudio := models.NewCreateStudioInput()
 	newStudio.Name = name
 
 	err := i.StudioWriter.Create(ctx, &newStudio)
diff --git a/pkg/group/import_test.go b/pkg/group/import_test.go
index c4ca47442..50b8b2dd1 100644
--- a/pkg/group/import_test.go
+++ b/pkg/group/import_test.go
@@ -121,9 +121,9 @@ func TestImporterPreImportWithMissingStudio(t *testing.T) {
 	}
 
 	db.Studio.On("FindByName", testCtx, missingStudioName, false).Return(nil, nil).Times(3)
-	db.Studio.On("Create", testCtx, mock.AnythingOfType("*models.Studio")).Run(func(args mock.Arguments) {
-		s := args.Get(1).(*models.Studio)
-		s.ID = existingStudioID
+	db.Studio.On("Create", testCtx, mock.AnythingOfType("*models.CreateStudioInput")).Run(func(args mock.Arguments) {
+		s := args.Get(1).(*models.CreateStudioInput)
+		s.Studio.ID = existingStudioID
 	}).Return(nil)
 
 	err := i.PreImport(testCtx)
@@ -156,7 +156,7 @@ func TestImporterPreImportWithMissingStudioCreateErr(t *testing.T) {
 	}
 
 	db.Studio.On("FindByName", testCtx, missingStudioName, false).Return(nil, nil).Once()
-	db.Studio.On("Create", testCtx, mock.AnythingOfType("*models.Studio")).Return(errors.New("Create error"))
+	db.Studio.On("Create", testCtx, mock.AnythingOfType("*models.CreateStudioInput")).Return(errors.New("Create error"))
 
 	err := i.PreImport(testCtx)
 	assert.NotNil(t, err)
diff --git a/pkg/image/import.go b/pkg/image/import.go
index bf92a6ae8..77b6d7477 100644
--- a/pkg/image/import.go
+++ b/pkg/image/import.go
@@ -159,7 +159,7 @@ func (i *Importer) populateStudio(ctx context.Context) error {
 }
 
 func (i *Importer) createStudio(ctx context.Context, name string) (int, error) {
-	newStudio := models.NewStudio()
+	newStudio := models.NewCreateStudioInput()
 	newStudio.Name = name
 
 	err := i.StudioWriter.Create(ctx, &newStudio)
diff --git a/pkg/image/import_test.go b/pkg/image/import_test.go
index 286e51fe3..98b3972b9 100644
--- a/pkg/image/import_test.go
+++ b/pkg/image/import_test.go
@@ -77,9 +77,9 @@ func TestImporterPreImportWithMissingStudio(t *testing.T) {
 	}
 
 	db.Studio.On("FindByName", testCtx, missingStudioName, false).Return(nil, nil).Times(3)
-	db.Studio.On("Create", testCtx, mock.AnythingOfType("*models.Studio")).Run(func(args mock.Arguments) {
-		s := args.Get(1).(*models.Studio)
-		s.ID = existingStudioID
+	db.Studio.On("Create", testCtx, mock.AnythingOfType("*models.CreateStudioInput")).Run(func(args mock.Arguments) {
+		s := args.Get(1).(*models.CreateStudioInput)
+		s.Studio.ID = existingStudioID
 	}).Return(nil)
 
 	err := i.PreImport(testCtx)
@@ -109,7 +109,7 @@ func TestImporterPreImportWithMissingStudioCreateErr(t *testing.T) {
 	}
 
 	db.Studio.On("FindByName", testCtx, missingStudioName, false).Return(nil, nil).Once()
-	db.Studio.On("Create", testCtx, mock.AnythingOfType("*models.Studio")).Return(errors.New("Create error"))
+	db.Studio.On("Create", testCtx, mock.AnythingOfType("*models.CreateStudioInput")).Return(errors.New("Create error"))
 
 	err := i.PreImport(testCtx)
 	assert.NotNil(t, err)
diff --git a/pkg/models/mocks/StudioReaderWriter.go b/pkg/models/mocks/StudioReaderWriter.go
index 481565d6f..f57a73aa1 100644
--- a/pkg/models/mocks/StudioReaderWriter.go
+++ b/pkg/models/mocks/StudioReaderWriter.go
@@ -80,11 +80,11 @@ func (_m *StudioReaderWriter) CountByTagID(ctx context.Context, tagID int) (int,
 }
 
 // Create provides a mock function with given fields: ctx, newStudio
-func (_m *StudioReaderWriter) Create(ctx context.Context, newStudio *models.Studio) error {
+func (_m *StudioReaderWriter) Create(ctx context.Context, newStudio *models.CreateStudioInput) error {
 	ret := _m.Called(ctx, newStudio)
 
 	var r0 error
-	if rf, ok := ret.Get(0).(func(context.Context, *models.Studio) error); ok {
+	if rf, ok := ret.Get(0).(func(context.Context, *models.CreateStudioInput) error); ok {
 		r0 = rf(ctx, newStudio)
 	} else {
 		r0 = ret.Error(0)
@@ -291,6 +291,52 @@ func (_m *StudioReaderWriter) GetAliases(ctx context.Context, relatedID int) ([]
 	return r0, r1
 }
 
+// GetCustomFields provides a mock function with given fields: ctx, id
+func (_m *StudioReaderWriter) GetCustomFields(ctx context.Context, id int) (map[string]interface{}, error) {
+	ret := _m.Called(ctx, id)
+
+	var r0 map[string]interface{}
+	if rf, ok := ret.Get(0).(func(context.Context, int) map[string]interface{}); ok {
+		r0 = rf(ctx, id)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(map[string]interface{})
+		}
+	}
+
+	var r1 error
+	if rf, ok := ret.Get(1).(func(context.Context, int) error); ok {
+		r1 = rf(ctx, id)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// GetCustomFieldsBulk provides a mock function with given fields: ctx, ids
+func (_m *StudioReaderWriter) GetCustomFieldsBulk(ctx context.Context, ids []int) ([]models.CustomFieldMap, error) {
+	ret := _m.Called(ctx, ids)
+
+	var r0 []models.CustomFieldMap
+	if rf, ok := ret.Get(0).(func(context.Context, []int) []models.CustomFieldMap); ok {
+		r0 = rf(ctx, ids)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).([]models.CustomFieldMap)
+		}
+	}
+
+	var r1 error
+	if rf, ok := ret.Get(1).(func(context.Context, []int) error); ok {
+		r1 = rf(ctx, ids)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
 // GetImage provides a mock function with given fields: ctx, studioID
 func (_m *StudioReaderWriter) GetImage(ctx context.Context, studioID int) ([]byte, error) {
 	ret := _m.Called(ctx, studioID)
@@ -479,11 +525,11 @@ func (_m *StudioReaderWriter) QueryForAutoTag(ctx context.Context, words []strin
 }
 
 // Update provides a mock function with given fields: ctx, updatedStudio
-func (_m *StudioReaderWriter) Update(ctx context.Context, updatedStudio *models.Studio) error {
+func (_m *StudioReaderWriter) Update(ctx context.Context, updatedStudio *models.UpdateStudioInput) error {
 	ret := _m.Called(ctx, updatedStudio)
 
 	var r0 error
-	if rf, ok := ret.Get(0).(func(context.Context, *models.Studio) error); ok {
+	if rf, ok := ret.Get(0).(func(context.Context, *models.UpdateStudioInput) error); ok {
 		r0 = rf(ctx, updatedStudio)
 	} else {
 		r0 = ret.Error(0)
diff --git a/pkg/models/model_scraped_item.go b/pkg/models/model_scraped_item.go
index 4254a9876..bd6db10c8 100644
--- a/pkg/models/model_scraped_item.go
+++ b/pkg/models/model_scraped_item.go
@@ -27,9 +27,9 @@ type ScrapedStudio struct {
 
 func (ScrapedStudio) IsScrapedContent() {}
 
-func (s *ScrapedStudio) ToStudio(endpoint string, excluded map[string]bool) *Studio {
+func (s *ScrapedStudio) ToStudio(endpoint string, excluded map[string]bool) *CreateStudioInput {
 	// Populate a new studio from the input
-	ret := NewStudio()
+	ret := NewCreateStudioInput()
 	ret.Name = strings.TrimSpace(s.Name)
 
 	if s.RemoteSiteID != nil && endpoint != "" && *s.RemoteSiteID != "" {
diff --git a/pkg/models/model_scraped_item_test.go b/pkg/models/model_scraped_item_test.go
index b6b44025f..545543652 100644
--- a/pkg/models/model_scraped_item_test.go
+++ b/pkg/models/model_scraped_item_test.go
@@ -113,7 +113,7 @@ func Test_scrapedToStudioInput(t *testing.T) {
 					got.StashIDs.List()[stid].UpdatedAt = time.Time{}
 				}
 			}
-			assert.Equal(t, tt.want, got)
+			assert.Equal(t, tt.want, got.Studio)
 		})
 	}
 }
diff --git a/pkg/models/model_studio.go b/pkg/models/model_studio.go
index 8c7a687af..ee6fae2d2 100644
--- a/pkg/models/model_studio.go
+++ b/pkg/models/model_studio.go
@@ -23,6 +23,18 @@ type Studio struct {
 	StashIDs RelatedStashIDs `json:"stash_ids"`
 }
 
+type CreateStudioInput struct {
+	*Studio
+
+	CustomFields map[string]interface{} `json:"custom_fields"`
+}
+
+type UpdateStudioInput struct {
+	*Studio
+
+	CustomFields CustomFieldsInput `json:"custom_fields"`
+}
+
 func NewStudio() Studio {
 	currentTime := time.Now()
 	return Studio{
@@ -31,6 +43,13 @@ func NewStudio() Studio {
 	}
 }
 
+func NewCreateStudioInput() CreateStudioInput {
+	s := NewStudio()
+	return CreateStudioInput{
+		Studio: &s,
+	}
+}
+
 // StudioPartial represents part of a Studio object. It is used to update the database entry.
 type StudioPartial struct {
 	ID       int
@@ -48,6 +67,8 @@ type StudioPartial struct {
 	URLs     *UpdateStrings
 	TagIDs   *UpdateIDs
 	StashIDs *UpdateStashIDs
+
+	CustomFields CustomFieldsInput
 }
 
 func NewStudioPartial() StudioPartial {
diff --git a/pkg/models/repository_studio.go b/pkg/models/repository_studio.go
index 99f98bffc..54fb6ed47 100644
--- a/pkg/models/repository_studio.go
+++ b/pkg/models/repository_studio.go
@@ -42,12 +42,12 @@ type StudioCounter interface {
 
 // StudioCreator provides methods to create studios.
 type StudioCreator interface {
-	Create(ctx context.Context, newStudio *Studio) error
+	Create(ctx context.Context, newStudio *CreateStudioInput) error
 }
 
 // StudioUpdater provides methods to update studios.
 type StudioUpdater interface {
-	Update(ctx context.Context, updatedStudio *Studio) error
+	Update(ctx context.Context, updatedStudio *UpdateStudioInput) error
 	UpdatePartial(ctx context.Context, updatedStudio StudioPartial) (*Studio, error)
 	UpdateImage(ctx context.Context, studioID int, image []byte) error
 }
@@ -79,6 +79,8 @@ type StudioReader interface {
 	TagIDLoader
 	URLLoader
 
+	CustomFieldsReader
+
 	All(ctx context.Context) ([]*Studio, error)
 	GetImage(ctx context.Context, studioID int) ([]byte, error)
 	HasImage(ctx context.Context, studioID int) (bool, error)
diff --git a/pkg/models/studio.go b/pkg/models/studio.go
index fd306b16c..be5d54445 100644
--- a/pkg/models/studio.go
+++ b/pkg/models/studio.go
@@ -46,6 +46,9 @@ type StudioFilterType struct {
 	CreatedAt *TimestampCriterionInput `json:"created_at"`
 	// Filter by updated at
 	UpdatedAt *TimestampCriterionInput `json:"updated_at"`
+
+	// Filter by custom fields
+	CustomFields []CustomFieldCriterionInput `json:"custom_fields"`
 }
 
 type StudioCreateInput struct {
@@ -62,6 +65,8 @@ type StudioCreateInput struct {
 	Aliases       []string       `json:"aliases"`
 	TagIds        []string       `json:"tag_ids"`
 	IgnoreAutoTag *bool          `json:"ignore_auto_tag"`
+
+	CustomFields map[string]interface{} `json:"custom_fields"`
 }
 
 type StudioUpdateInput struct {
@@ -79,4 +84,6 @@ type StudioUpdateInput struct {
 	Aliases       []string       `json:"aliases"`
 	TagIds        []string       `json:"tag_ids"`
 	IgnoreAutoTag *bool          `json:"ignore_auto_tag"`
+
+	CustomFields CustomFieldsInput `json:"custom_fields"`
 }
diff --git a/pkg/scene/import.go b/pkg/scene/import.go
index efffd380d..b3f0f1ff1 100644
--- a/pkg/scene/import.go
+++ b/pkg/scene/import.go
@@ -213,7 +213,7 @@ func (i *Importer) populateStudio(ctx context.Context) error {
 }
 
 func (i *Importer) createStudio(ctx context.Context, name string) (int, error) {
-	newStudio := models.NewStudio()
+	newStudio := models.NewCreateStudioInput()
 	newStudio.Name = name
 
 	err := i.StudioWriter.Create(ctx, &newStudio)
diff --git a/pkg/scene/import_test.go b/pkg/scene/import_test.go
index a6e3edcdf..558b72ba2 100644
--- a/pkg/scene/import_test.go
+++ b/pkg/scene/import_test.go
@@ -241,9 +241,9 @@ func TestImporterPreImportWithMissingStudio(t *testing.T) {
 	}
 
 	db.Studio.On("FindByName", testCtx, missingStudioName, false).Return(nil, nil).Times(3)
-	db.Studio.On("Create", testCtx, mock.AnythingOfType("*models.Studio")).Run(func(args mock.Arguments) {
-		s := args.Get(1).(*models.Studio)
-		s.ID = existingStudioID
+	db.Studio.On("Create", testCtx, mock.AnythingOfType("*models.CreateStudioInput")).Run(func(args mock.Arguments) {
+		s := args.Get(1).(*models.CreateStudioInput)
+		s.Studio.ID = existingStudioID
 	}).Return(nil)
 
 	err := i.PreImport(testCtx)
@@ -273,7 +273,7 @@ func TestImporterPreImportWithMissingStudioCreateErr(t *testing.T) {
 	}
 
 	db.Studio.On("FindByName", testCtx, missingStudioName, false).Return(nil, nil).Once()
-	db.Studio.On("Create", testCtx, mock.AnythingOfType("*models.Studio")).Return(errors.New("Create error"))
+	db.Studio.On("Create", testCtx, mock.AnythingOfType("*models.CreateStudioInput")).Return(errors.New("Create error"))
 
 	err := i.PreImport(testCtx)
 	assert.NotNil(t, err)
diff --git a/pkg/sqlite/database.go b/pkg/sqlite/database.go
index 0ea3d7170..a87f6706f 100644
--- a/pkg/sqlite/database.go
+++ b/pkg/sqlite/database.go
@@ -34,7 +34,7 @@ const (
 	cacheSizeEnv = "STASH_SQLITE_CACHE_SIZE"
 )
 
-var appSchemaVersion uint = 75
+var appSchemaVersion uint = 76
 
 //go:embed migrations/*.sql
 var migrationsBox embed.FS
diff --git a/pkg/sqlite/migrations/76_studio_custom_fields.up.sql b/pkg/sqlite/migrations/76_studio_custom_fields.up.sql
new file mode 100644
index 000000000..81a72d4d4
--- /dev/null
+++ b/pkg/sqlite/migrations/76_studio_custom_fields.up.sql
@@ -0,0 +1,9 @@
+CREATE TABLE `studio_custom_fields` (
+  `studio_id` integer NOT NULL,
+  `field` varchar(64) NOT NULL,
+  `value` BLOB NOT NULL,
+  PRIMARY KEY (`studio_id`, `field`),
+  foreign key(`studio_id`) references `studios`(`id`) on delete CASCADE
+);
+
+CREATE INDEX `index_studio_custom_fields_field_value` ON `studio_custom_fields` (`field`, `value`);
diff --git a/pkg/sqlite/setup_test.go b/pkg/sqlite/setup_test.go
index 843b8b4c2..361b5cb79 100644
--- a/pkg/sqlite/setup_test.go
+++ b/pkg/sqlite/setup_test.go
@@ -1765,7 +1765,19 @@ func getStudioNullStringValue(index int, field string) string {
 	return ret.String
 }
 
-func createStudio(ctx context.Context, sqb *sqlite.StudioStore, name string, parentID *int) (*models.Studio, error) {
+func getStudioCustomFields(index int) map[string]interface{} {
+	if index%5 == 0 {
+		return nil
+	}
+
+	return map[string]interface{}{
+		"string": getStudioStringValue(index, "custom"),
+		"int":    int64(index % 5),
+		"real":   float64(index) / 10,
+	}
+}
+
+func createStudio(ctx context.Context, sqb *sqlite.StudioStore, name string, parentID *int, customFields map[string]interface{}) (*models.Studio, error) {
 	studio := models.Studio{
 		Name: name,
 	}
@@ -1774,7 +1786,7 @@ func createStudio(ctx context.Context, sqb *sqlite.StudioStore, name string, par
 		studio.ParentID = parentID
 	}
 
-	err := createStudioFromModel(ctx, sqb, &studio)
+	err := createStudioFromModel(ctx, sqb, &studio, customFields)
 	if err != nil {
 		return nil, err
 	}
@@ -1782,8 +1794,11 @@ func createStudio(ctx context.Context, sqb *sqlite.StudioStore, name string, par
 	return &studio, nil
 }
 
-func createStudioFromModel(ctx context.Context, sqb *sqlite.StudioStore, studio *models.Studio) error {
-	err := sqb.Create(ctx, studio)
+func createStudioFromModel(ctx context.Context, sqb *sqlite.StudioStore, studio *models.Studio, customFields map[string]interface{}) error {
+	err := sqb.Create(ctx, &models.CreateStudioInput{
+		Studio:       studio,
+		CustomFields: customFields,
+	})
 
 	if err != nil {
 		return fmt.Errorf("Error creating studio %v+: %s", studio, err.Error())
@@ -1845,7 +1860,7 @@ func createStudios(ctx context.Context, n int, o int) error {
 			alias := getStudioStringValue(i, "Alias")
 			studio.Aliases = models.NewRelatedStrings([]string{alias})
 		}
-		err := createStudioFromModel(ctx, sqb, &studio)
+		err := createStudioFromModel(ctx, sqb, &studio, getStudioCustomFields(i))
 
 		if err != nil {
 			return err
diff --git a/pkg/sqlite/studio.go b/pkg/sqlite/studio.go
index e328818da..d0c5c220c 100644
--- a/pkg/sqlite/studio.go
+++ b/pkg/sqlite/studio.go
@@ -141,6 +141,7 @@ var (
 
 type StudioStore struct {
 	blobJoinQueryBuilder
+	customFieldsStore
 	tagRelationshipStore
 
 	tableMgr *table
@@ -152,6 +153,10 @@ func NewStudioStore(blobStore *BlobStore) *StudioStore {
 			blobStore: blobStore,
 			joinTable: studioTable,
 		},
+		customFieldsStore: customFieldsStore{
+			table: studiosCustomFieldsTable,
+			fk:    studiosCustomFieldsTable.Col(studioIDColumn),
+		},
 		tagRelationshipStore: tagRelationshipStore{
 			idRelationshipStore: idRelationshipStore{
 				joinTable: studiosTagsTableMgr,
@@ -170,11 +175,11 @@ func (qb *StudioStore) selectDataset() *goqu.SelectDataset {
 	return dialect.From(qb.table()).Select(qb.table().All())
 }
 
-func (qb *StudioStore) Create(ctx context.Context, newObject *models.Studio) error {
+func (qb *StudioStore) Create(ctx context.Context, newObject *models.CreateStudioInput) error {
 	var err error
 
 	var r studioRow
-	r.fromStudio(*newObject)
+	r.fromStudio(*newObject.Studio)
 
 	id, err := qb.tableMgr.insertID(ctx, r)
 	if err != nil {
@@ -208,12 +213,17 @@ func (qb *StudioStore) Create(ctx context.Context, newObject *models.Studio) err
 		}
 	}
 
+	const partial = false
+	if err := qb.setCustomFields(ctx, id, newObject.CustomFields, partial); err != nil {
+		return err
+	}
+
 	updated, err := qb.find(ctx, id)
 	if err != nil {
 		return fmt.Errorf("finding after create: %w", err)
 	}
 
-	*newObject = *updated
+	*newObject.Studio = *updated
 	return nil
 }
 
@@ -254,13 +264,17 @@ func (qb *StudioStore) UpdatePartial(ctx context.Context, input models.StudioPar
 		}
 	}
 
-	return qb.Find(ctx, input.ID)
+	if err := qb.SetCustomFields(ctx, input.ID, input.CustomFields); err != nil {
+		return nil, err
+	}
+
+	return qb.find(ctx, input.ID)
 }
 
 // This is only used by the Import/Export functionality
-func (qb *StudioStore) Update(ctx context.Context, updatedObject *models.Studio) error {
+func (qb *StudioStore) Update(ctx context.Context, updatedObject *models.UpdateStudioInput) error {
 	var r studioRow
-	r.fromStudio(*updatedObject)
+	r.fromStudio(*updatedObject.Studio)
 
 	if err := qb.tableMgr.updateByID(ctx, updatedObject.ID, r); err != nil {
 		return err
@@ -288,6 +302,10 @@ func (qb *StudioStore) Update(ctx context.Context, updatedObject *models.Studio)
 		}
 	}
 
+	if err := qb.SetCustomFields(ctx, updatedObject.ID, updatedObject.CustomFields); err != nil {
+		return err
+	}
+
 	return nil
 }
 
diff --git a/pkg/sqlite/studio_filter.go b/pkg/sqlite/studio_filter.go
index 83a917701..cd7fc4440 100644
--- a/pkg/sqlite/studio_filter.go
+++ b/pkg/sqlite/studio_filter.go
@@ -117,6 +117,13 @@ func (qb *studioFilterHandler) criterionHandler() criterionHandler {
 				studioRepository.galleries.innerJoin(f, "", "studios.id")
 			},
 		},
+
+		&customFieldsFilterHandler{
+			table: studiosCustomFieldsTable.GetTable(),
+			fkCol: studioIDColumn,
+			c:     studioFilter.CustomFields,
+			idCol: "studios.id",
+		},
 	}
 }
 
diff --git a/pkg/sqlite/studio_test.go b/pkg/sqlite/studio_test.go
index 003877c77..074c77d6f 100644
--- a/pkg/sqlite/studio_test.go
+++ b/pkg/sqlite/studio_test.go
@@ -11,6 +11,7 @@ import (
 	"strconv"
 	"strings"
 	"testing"
+	"time"
 
 	"github.com/stashapp/stash/pkg/models"
 	"github.com/stretchr/testify/assert"
@@ -47,6 +48,559 @@ func TestStudioFindByName(t *testing.T) {
 	})
 }
 
+func loadStudioRelationships(ctx context.Context, expected models.Studio, actual *models.Studio) error {
+	if expected.Aliases.Loaded() {
+		if err := actual.LoadAliases(ctx, db.Studio); err != nil {
+			return err
+		}
+	}
+	if expected.URLs.Loaded() {
+		if err := actual.LoadURLs(ctx, db.Studio); err != nil {
+			return err
+		}
+	}
+	if expected.TagIDs.Loaded() {
+		if err := actual.LoadTagIDs(ctx, db.Studio); err != nil {
+			return err
+		}
+	}
+	if expected.StashIDs.Loaded() {
+		if err := actual.LoadStashIDs(ctx, db.Studio); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func Test_StudioStore_Create(t *testing.T) {
+	var (
+		name          = "name"
+		details       = "details"
+		url           = "url"
+		rating        = 3
+		aliases       = []string{"alias1", "alias2"}
+		ignoreAutoTag = true
+		favorite      = true
+		endpoint1     = "endpoint1"
+		endpoint2     = "endpoint2"
+		stashID1      = "stashid1"
+		stashID2      = "stashid2"
+		createdAt     = time.Date(2001, 1, 1, 0, 0, 0, 0, time.UTC)
+		updatedAt     = time.Date(2001, 1, 1, 0, 0, 0, 0, time.UTC)
+	)
+
+	tests := []struct {
+		name      string
+		newObject models.CreateStudioInput
+		wantErr   bool
+	}{
+		{
+			"full",
+			models.CreateStudioInput{
+				Studio: &models.Studio{
+					Name:          name,
+					URLs:          models.NewRelatedStrings([]string{url}),
+					Favorite:      favorite,
+					Rating:        &rating,
+					Details:       details,
+					IgnoreAutoTag: ignoreAutoTag,
+					TagIDs:        models.NewRelatedIDs([]int{tagIDs[tagIdx1WithStudio], tagIDs[tagIdx1WithDupName]}),
+					Aliases:       models.NewRelatedStrings(aliases),
+					StashIDs: models.NewRelatedStashIDs([]models.StashID{
+						{
+							StashID:   stashID1,
+							Endpoint:  endpoint1,
+							UpdatedAt: epochTime,
+						},
+						{
+							StashID:   stashID2,
+							Endpoint:  endpoint2,
+							UpdatedAt: epochTime,
+						},
+					}),
+					CreatedAt: createdAt,
+					UpdatedAt: updatedAt,
+				},
+				CustomFields: testCustomFields,
+			},
+			false,
+		},
+		{
+			"invalid tag id",
+			models.CreateStudioInput{
+				Studio: &models.Studio{
+					Name:   name,
+					TagIDs: models.NewRelatedIDs([]int{invalidID}),
+				},
+			},
+			true,
+		},
+	}
+
+	qb := db.Studio
+
+	for _, tt := range tests {
+		runWithRollbackTxn(t, tt.name, func(t *testing.T, ctx context.Context) {
+			assert := assert.New(t)
+
+			p := tt.newObject
+			if err := qb.Create(ctx, &p); (err != nil) != tt.wantErr {
+				t.Errorf("StudioStore.Create() error = %v, wantErr = %v", err, tt.wantErr)
+			}
+
+			if tt.wantErr {
+				assert.Zero(p.ID)
+				return
+			}
+
+			assert.NotZero(p.ID)
+
+			copy := *tt.newObject.Studio
+			copy.ID = p.ID
+
+			// load relationships
+			if err := loadStudioRelationships(ctx, copy, p.Studio); err != nil {
+				t.Errorf("loadStudioRelationships() error = %v", err)
+				return
+			}
+
+			assert.Equal(copy, *p.Studio)
+
+			// ensure can find the Studio
+			found, err := qb.Find(ctx, p.ID)
+			if err != nil {
+				t.Errorf("StudioStore.Find() error = %v", err)
+			}
+
+			if !assert.NotNil(found) {
+				return
+			}
+
+			// load relationships
+			if err := loadStudioRelationships(ctx, copy, found); err != nil {
+				t.Errorf("loadStudioRelationships() error = %v", err)
+				return
+			}
+			assert.Equal(copy, *found)
+
+			// ensure custom fields are set
+			cf, err := qb.GetCustomFields(ctx, p.ID)
+			if err != nil {
+				t.Errorf("StudioStore.GetCustomFields() error = %v", err)
+				return
+			}
+
+			assert.Equal(tt.newObject.CustomFields, cf)
+
+			return
+		})
+	}
+}
+
+func Test_StudioStore_Update(t *testing.T) {
+	var (
+		name          = "name"
+		details       = "details"
+		url           = "url"
+		rating        = 3
+		aliases       = []string{"aliasX", "aliasY"}
+		ignoreAutoTag = true
+		favorite      = true
+		endpoint1     = "endpoint1"
+		endpoint2     = "endpoint2"
+		stashID1      = "stashid1"
+		stashID2      = "stashid2"
+		createdAt     = time.Date(2001, 1, 1, 0, 0, 0, 0, time.UTC)
+		updatedAt     = time.Date(2001, 1, 1, 0, 0, 0, 0, time.UTC)
+	)
+
+	tests := []struct {
+		name          string
+		updatedObject models.UpdateStudioInput
+		wantErr       bool
+	}{
+		{
+			"full",
+			models.UpdateStudioInput{
+				Studio: &models.Studio{
+					ID:            studioIDs[studioIdxWithGallery],
+					Name:          name,
+					URLs:          models.NewRelatedStrings([]string{url}),
+					Favorite:      favorite,
+					Rating:        &rating,
+					Details:       details,
+					IgnoreAutoTag: ignoreAutoTag,
+					Aliases:       models.NewRelatedStrings(aliases),
+					TagIDs:        models.NewRelatedIDs([]int{tagIDs[tagIdx1WithDupName], tagIDs[tagIdx1WithStudio]}),
+					StashIDs: models.NewRelatedStashIDs([]models.StashID{
+						{
+							StashID:   stashID1,
+							Endpoint:  endpoint1,
+							UpdatedAt: epochTime,
+						},
+						{
+							StashID:   stashID2,
+							Endpoint:  endpoint2,
+							UpdatedAt: epochTime,
+						},
+					}),
+					CreatedAt: createdAt,
+					UpdatedAt: updatedAt,
+				},
+			},
+			false,
+		},
+		{
+			"clear nullables",
+			models.UpdateStudioInput{
+				Studio: &models.Studio{
+					ID:       studioIDs[studioIdxWithGallery],
+					Name:     name, // name is mandatory
+					URLs:     models.NewRelatedStrings([]string{}),
+					Aliases:  models.NewRelatedStrings([]string{}),
+					TagIDs:   models.NewRelatedIDs([]int{}),
+					StashIDs: models.NewRelatedStashIDs([]models.StashID{}),
+				},
+			},
+			false,
+		},
+		{
+			"clear tag ids",
+			models.UpdateStudioInput{
+				Studio: &models.Studio{
+					ID:     studioIDs[sceneIdxWithTag],
+					Name:   name, // name is mandatory
+					TagIDs: models.NewRelatedIDs([]int{}),
+				},
+			},
+			false,
+		},
+		{
+			"set custom fields",
+			models.UpdateStudioInput{
+				Studio: &models.Studio{
+					ID:   studioIDs[studioIdxWithGallery],
+					Name: name, // name is mandatory
+				},
+				CustomFields: models.CustomFieldsInput{
+					Full: testCustomFields,
+				},
+			},
+			false,
+		},
+		{
+			"clear custom fields",
+			models.UpdateStudioInput{
+				Studio: &models.Studio{
+					ID:   studioIDs[studioIdxWithGallery],
+					Name: name, // name is mandatory
+				},
+				CustomFields: models.CustomFieldsInput{
+					Full: map[string]interface{}{},
+				},
+			},
+			false,
+		},
+		{
+			"invalid tag id",
+			models.UpdateStudioInput{
+				Studio: &models.Studio{
+					ID:     studioIDs[sceneIdxWithGallery],
+					Name:   name, // name is mandatory
+					TagIDs: models.NewRelatedIDs([]int{invalidID}),
+				},
+			},
+			true,
+		},
+	}
+
+	qb := db.Studio
+	for _, tt := range tests {
+		runWithRollbackTxn(t, tt.name, func(t *testing.T, ctx context.Context) {
+			assert := assert.New(t)
+
+			copy := *tt.updatedObject.Studio
+
+			if err := qb.Update(ctx, &tt.updatedObject); (err != nil) != tt.wantErr {
+				t.Errorf("StudioStore.Update() error = %v, wantErr %v", err, tt.wantErr)
+			}
+
+			if tt.wantErr {
+				return
+			}
+
+			s, err := qb.Find(ctx, tt.updatedObject.ID)
+			if err != nil {
+				t.Errorf("StudioStore.Find() error = %v", err)
+			}
+
+			// load relationships
+			if err := loadStudioRelationships(ctx, copy, s); err != nil {
+				t.Errorf("loadStudioRelationships() error = %v", err)
+				return
+			}
+
+			assert.Equal(copy, *s)
+
+			// ensure custom fields are correct
+			if tt.updatedObject.CustomFields.Full != nil {
+				cf, err := qb.GetCustomFields(ctx, tt.updatedObject.ID)
+				if err != nil {
+					t.Errorf("StudioStore.GetCustomFields() error = %v", err)
+					return
+				}
+
+				assert.Equal(tt.updatedObject.CustomFields.Full, cf)
+			}
+		})
+	}
+}
+
+func clearStudioPartial() models.StudioPartial {
+	nullString := models.OptionalString{Set: true, Null: true}
+	nullInt := models.OptionalInt{Set: true, Null: true}
+
+	// leave mandatory fields
+	return models.StudioPartial{
+		URLs:     &models.UpdateStrings{Mode: models.RelationshipUpdateModeSet},
+		Aliases:  &models.UpdateStrings{Mode: models.RelationshipUpdateModeSet},
+		Rating:   nullInt,
+		Details:  nullString,
+		TagIDs:   &models.UpdateIDs{Mode: models.RelationshipUpdateModeSet},
+		StashIDs: &models.UpdateStashIDs{Mode: models.RelationshipUpdateModeSet},
+	}
+}
+
+func Test_StudioStore_UpdatePartial(t *testing.T) {
+	var (
+		name          = "name"
+		details       = "details"
+		url           = "url"
+		aliases       = []string{"aliasX", "aliasY"}
+		rating        = 3
+		ignoreAutoTag = true
+		favorite      = true
+		endpoint1     = "endpoint1"
+		endpoint2     = "endpoint2"
+		stashID1      = "stashid1"
+		stashID2      = "stashid2"
+		createdAt     = time.Date(2001, 1, 1, 0, 0, 0, 0, time.UTC)
+		updatedAt     = time.Date(2001, 1, 1, 0, 0, 0, 0, time.UTC)
+	)
+
+	tests := []struct {
+		name    string
+		id      int
+		partial models.StudioPartial
+		want    models.Studio
+		wantErr bool
+	}{
+		{
+			"full",
+			studioIDs[studioIdxWithDupName],
+			models.StudioPartial{
+				Name: models.NewOptionalString(name),
+				URLs: &models.UpdateStrings{
+					Values: []string{url},
+					Mode:   models.RelationshipUpdateModeSet,
+				},
+				Aliases: &models.UpdateStrings{
+					Values: aliases,
+					Mode:   models.RelationshipUpdateModeSet,
+				},
+				Favorite:      models.NewOptionalBool(favorite),
+				Rating:        models.NewOptionalInt(rating),
+				Details:       models.NewOptionalString(details),
+				IgnoreAutoTag: models.NewOptionalBool(ignoreAutoTag),
+				TagIDs: &models.UpdateIDs{
+					IDs:  []int{tagIDs[tagIdx1WithStudio], tagIDs[tagIdx1WithDupName]},
+					Mode: models.RelationshipUpdateModeSet,
+				},
+				StashIDs: &models.UpdateStashIDs{
+					StashIDs: []models.StashID{
+						{
+							StashID:   stashID1,
+							Endpoint:  endpoint1,
+							UpdatedAt: epochTime,
+						},
+						{
+							StashID:   stashID2,
+							Endpoint:  endpoint2,
+							UpdatedAt: epochTime,
+						},
+					},
+					Mode: models.RelationshipUpdateModeSet,
+				},
+				CreatedAt: models.NewOptionalTime(createdAt),
+				UpdatedAt: models.NewOptionalTime(updatedAt),
+			},
+			models.Studio{
+				ID:            studioIDs[studioIdxWithDupName],
+				Name:          name,
+				URLs:          models.NewRelatedStrings([]string{url}),
+				Aliases:       models.NewRelatedStrings(aliases),
+				Favorite:      favorite,
+				Rating:        &rating,
+				Details:       details,
+				IgnoreAutoTag: ignoreAutoTag,
+				TagIDs:        models.NewRelatedIDs([]int{tagIDs[tagIdx1WithDupName], tagIDs[tagIdx1WithStudio]}),
+				StashIDs: models.NewRelatedStashIDs([]models.StashID{
+					{
+						StashID:   stashID1,
+						Endpoint:  endpoint1,
+						UpdatedAt: epochTime,
+					},
+					{
+						StashID:   stashID2,
+						Endpoint:  endpoint2,
+						UpdatedAt: epochTime,
+					},
+				}),
+				CreatedAt: createdAt,
+				UpdatedAt: updatedAt,
+			},
+			false,
+		},
+		{
+			"clear all",
+			studioIDs[studioIdxWithTwoTags],
+			clearStudioPartial(),
+			models.Studio{
+				ID:            studioIDs[studioIdxWithTwoTags],
+				Name:          getStudioStringValue(studioIdxWithTwoTags, "Name"),
+				Favorite:      getStudioBoolValue(studioIdxWithTwoTags),
+				Aliases:       models.NewRelatedStrings([]string{}),
+				TagIDs:        models.NewRelatedIDs([]int{}),
+				StashIDs:      models.NewRelatedStashIDs([]models.StashID{}),
+				IgnoreAutoTag: getIgnoreAutoTag(studioIdxWithTwoTags),
+			},
+			false,
+		},
+		{
+			"invalid id",
+			invalidID,
+			models.StudioPartial{Name: models.NewOptionalString(name)},
+			models.Studio{},
+			true,
+		},
+	}
+	for _, tt := range tests {
+		qb := db.Studio
+
+		runWithRollbackTxn(t, tt.name, func(t *testing.T, ctx context.Context) {
+			assert := assert.New(t)
+
+			tt.partial.ID = tt.id
+
+			got, err := qb.UpdatePartial(ctx, tt.partial)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("StudioStore.UpdatePartial() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+
+			if tt.wantErr {
+				return
+			}
+
+			if err := loadStudioRelationships(ctx, tt.want, got); err != nil {
+				t.Errorf("loadStudioRelationships() error = %v", err)
+				return
+			}
+
+			assert.Equal(tt.want, *got)
+
+			s, err := qb.Find(ctx, tt.id)
+			if err != nil {
+				t.Errorf("StudioStore.Find() error = %v", err)
+			}
+
+			// load relationships
+			if err := loadStudioRelationships(ctx, tt.want, s); err != nil {
+				t.Errorf("loadStudioRelationships() error = %v", err)
+				return
+			}
+
+			assert.Equal(tt.want, *s)
+		})
+	}
+}
+
+func Test_StudioStore_UpdatePartialCustomFields(t *testing.T) {
+	tests := []struct {
+		name     string
+		id       int
+		partial  models.StudioPartial
+		expected map[string]interface{} // nil to use the partial
+	}{
+		{
+			"set custom fields",
+			studioIDs[studioIdxWithGallery],
+			models.StudioPartial{
+				CustomFields: models.CustomFieldsInput{
+					Full: testCustomFields,
+				},
+			},
+			nil,
+		},
+		{
+			"clear custom fields",
+			studioIDs[studioIdxWithGallery],
+			models.StudioPartial{
+				CustomFields: models.CustomFieldsInput{
+					Full: map[string]interface{}{},
+				},
+			},
+			nil,
+		},
+		{
+			"partial custom fields",
+			studioIDs[studioIdxWithGallery],
+			models.StudioPartial{
+				CustomFields: models.CustomFieldsInput{
+					Partial: map[string]interface{}{
+						"string":    "bbb",
+						"new_field": "new",
+					},
+				},
+			},
+			map[string]interface{}{
+				"int":       int64(2),
+				"real":      0.7,
+				"string":    "bbb",
+				"new_field": "new",
+			},
+		},
+	}
+	for _, tt := range tests {
+		qb := db.Studio
+
+		runWithRollbackTxn(t, tt.name, func(t *testing.T, ctx context.Context) {
+			assert := assert.New(t)
+
+			tt.partial.ID = tt.id
+
+			_, err := qb.UpdatePartial(ctx, tt.partial)
+			if err != nil {
+				t.Errorf("StudioStore.UpdatePartial() error = %v", err)
+				return
+			}
+
+			// ensure custom fields are correct
+			cf, err := qb.GetCustomFields(ctx, tt.id)
+			if err != nil {
+				t.Errorf("StudioStore.GetCustomFields() error = %v", err)
+				return
+			}
+			if tt.expected == nil {
+				assert.Equal(tt.partial.CustomFields.Full, cf)
+			} else {
+				assert.Equal(tt.expected, cf)
+			}
+		})
+	}
+}
+
 func TestStudioQueryNameOr(t *testing.T) {
 	const studio1Idx = 1
 	const studio2Idx = 2
@@ -82,14 +636,6 @@ func TestStudioQueryNameOr(t *testing.T) {
 	})
 }
 
-func loadStudioRelationships(ctx context.Context, t *testing.T, s *models.Studio) error {
-	if err := s.LoadURLs(ctx, db.Studio); err != nil {
-		return err
-	}
-
-	return nil
-}
-
 func TestStudioQueryNameAndUrl(t *testing.T) {
 	const studioIdx = 1
 	studioName := getStudioStringValue(studioIdx, "Name")
@@ -311,13 +857,13 @@ func TestStudioDestroyParent(t *testing.T) {
 
 	// create parent and child studios
 	if err := withTxn(func(ctx context.Context) error {
-		createdParent, err := createStudio(ctx, db.Studio, parentName, nil)
+		createdParent, err := createStudio(ctx, db.Studio, parentName, nil, nil)
 		if err != nil {
 			return fmt.Errorf("Error creating parent studio: %s", err.Error())
 		}
 
 		parentID := createdParent.ID
-		createdChild, err := createStudio(ctx, db.Studio, childName, &parentID)
+		createdChild, err := createStudio(ctx, db.Studio, childName, &parentID, nil)
 		if err != nil {
 			return fmt.Errorf("Error creating child studio: %s", err.Error())
 		}
@@ -373,13 +919,13 @@ func TestStudioUpdateClearParent(t *testing.T) {
 
 	// create parent and child studios
 	if err := withTxn(func(ctx context.Context) error {
-		createdParent, err := createStudio(ctx, db.Studio, parentName, nil)
+		createdParent, err := createStudio(ctx, db.Studio, parentName, nil, nil)
 		if err != nil {
 			return fmt.Errorf("Error creating parent studio: %s", err.Error())
 		}
 
 		parentID := createdParent.ID
-		createdChild, err := createStudio(ctx, db.Studio, childName, &parentID)
+		createdChild, err := createStudio(ctx, db.Studio, childName, &parentID, nil)
 		if err != nil {
 			return fmt.Errorf("Error creating child studio: %s", err.Error())
 		}
@@ -414,7 +960,7 @@ func TestStudioUpdateStudioImage(t *testing.T) {
 
 		// create studio to test against
 		const name = "TestStudioUpdateStudioImage"
-		created, err := createStudio(ctx, db.Studio, name, nil)
+		created, err := createStudio(ctx, db.Studio, name, nil, nil)
 		if err != nil {
 			return fmt.Errorf("Error creating studio: %s", err.Error())
 		}
@@ -578,7 +1124,7 @@ func TestStudioStashIDs(t *testing.T) {
 
 		// create studio to test against
 		const name = "TestStudioStashIDs"
-		created, err := createStudio(ctx, db.Studio, name, nil)
+		created, err := createStudio(ctx, db.Studio, name, nil, nil)
 		if err != nil {
 			return fmt.Errorf("Error creating studio: %s", err.Error())
 		}
@@ -990,7 +1536,7 @@ func TestStudioAlias(t *testing.T) {
 
 		// create studio to test against
 		const name = "TestStudioAlias"
-		created, err := createStudio(ctx, db.Studio, name, nil)
+		created, err := createStudio(ctx, db.Studio, name, nil, nil)
 		if err != nil {
 			return fmt.Errorf("Error creating studio: %s", err.Error())
 		}
diff --git a/pkg/sqlite/tables.go b/pkg/sqlite/tables.go
index 7cddf25cc..bfc5199fe 100644
--- a/pkg/sqlite/tables.go
+++ b/pkg/sqlite/tables.go
@@ -40,6 +40,7 @@ var (
 	studiosURLsJoinTable     = goqu.T(studioURLsTable)
 	studiosTagsJoinTable     = goqu.T(studiosTagsTable)
 	studiosStashIDsJoinTable = goqu.T("studio_stash_ids")
+	studiosCustomFieldsTable = goqu.T("studio_custom_fields")
 
 	groupsURLsJoinTable     = goqu.T(groupURLsTable)
 	groupsTagsJoinTable     = goqu.T(groupsTagsTable)
diff --git a/pkg/studio/import.go b/pkg/studio/import.go
index 405852e53..d5284ce02 100644
--- a/pkg/studio/import.go
+++ b/pkg/studio/import.go
@@ -153,7 +153,7 @@ func (i *Importer) populateParentStudio(ctx context.Context) error {
 }
 
 func (i *Importer) createParentStudio(ctx context.Context, name string) (int, error) {
-	newStudio := models.NewStudio()
+	newStudio := models.NewCreateStudioInput()
 	newStudio.Name = name
 
 	err := i.ReaderWriter.Create(ctx, &newStudio)
@@ -194,7 +194,7 @@ func (i *Importer) FindExistingID(ctx context.Context) (*int, error) {
 }
 
 func (i *Importer) Create(ctx context.Context) (*int, error) {
-	err := i.ReaderWriter.Create(ctx, &i.studio)
+	err := i.ReaderWriter.Create(ctx, &models.CreateStudioInput{Studio: &i.studio})
 	if err != nil {
 		return nil, fmt.Errorf("error creating studio: %v", err)
 	}
@@ -206,7 +206,7 @@ func (i *Importer) Create(ctx context.Context) (*int, error) {
 func (i *Importer) Update(ctx context.Context, id int) error {
 	studio := i.studio
 	studio.ID = id
-	err := i.ReaderWriter.Update(ctx, &studio)
+	err := i.ReaderWriter.Update(ctx, &models.UpdateStudioInput{Studio: &studio})
 	if err != nil {
 		return fmt.Errorf("error updating existing studio: %v", err)
 	}
diff --git a/pkg/studio/import_test.go b/pkg/studio/import_test.go
index 882b8ca56..6648ebe0d 100644
--- a/pkg/studio/import_test.go
+++ b/pkg/studio/import_test.go
@@ -206,9 +206,9 @@ func TestImporterPreImportWithMissingParent(t *testing.T) {
 	}
 
 	db.Studio.On("FindByName", testCtx, missingParentStudioName, false).Return(nil, nil).Times(3)
-	db.Studio.On("Create", testCtx, mock.AnythingOfType("*models.Studio")).Run(func(args mock.Arguments) {
-		s := args.Get(1).(*models.Studio)
-		s.ID = existingStudioID
+	db.Studio.On("Create", testCtx, mock.AnythingOfType("*models.CreateStudioInput")).Run(func(args mock.Arguments) {
+		s := args.Get(1).(*models.CreateStudioInput)
+		s.Studio.ID = existingStudioID
 	}).Return(nil)
 
 	err := i.PreImport(testCtx)
@@ -240,7 +240,7 @@ func TestImporterPreImportWithMissingParentCreateErr(t *testing.T) {
 	}
 
 	db.Studio.On("FindByName", testCtx, missingParentStudioName, false).Return(nil, nil).Once()
-	db.Studio.On("Create", testCtx, mock.AnythingOfType("*models.Studio")).Return(errors.New("Create error"))
+	db.Studio.On("Create", testCtx, mock.AnythingOfType("*models.CreateStudioInput")).Return(errors.New("Create error"))
 
 	err := i.PreImport(testCtx)
 	assert.NotNil(t, err)
@@ -327,11 +327,11 @@ func TestCreate(t *testing.T) {
 	}
 
 	errCreate := errors.New("Create error")
-	db.Studio.On("Create", testCtx, &studio).Run(func(args mock.Arguments) {
-		s := args.Get(1).(*models.Studio)
+	db.Studio.On("Create", testCtx, &models.CreateStudioInput{Studio: &studio}).Run(func(args mock.Arguments) {
+		s := args.Get(1).(*models.CreateStudioInput)
 		s.ID = studioID
 	}).Return(nil).Once()
-	db.Studio.On("Create", testCtx, &studioErr).Return(errCreate).Once()
+	db.Studio.On("Create", testCtx, &models.CreateStudioInput{Studio: &studioErr}).Return(errCreate).Once()
 
 	id, err := i.Create(testCtx)
 	assert.Equal(t, studioID, *id)
@@ -366,7 +366,7 @@ func TestUpdate(t *testing.T) {
 
 	// id needs to be set for the mock input
 	studio.ID = studioID
-	db.Studio.On("Update", testCtx, &studio).Return(nil).Once()
+	db.Studio.On("Update", testCtx, &models.UpdateStudioInput{Studio: &studio}).Return(nil).Once()
 
 	err := i.Update(testCtx, studioID)
 	assert.Nil(t, err)
@@ -375,7 +375,7 @@ func TestUpdate(t *testing.T) {
 
 	// need to set id separately
 	studioErr.ID = errImageID
-	db.Studio.On("Update", testCtx, &studioErr).Return(errUpdate).Once()
+	db.Studio.On("Update", testCtx, &models.UpdateStudioInput{Studio: &studioErr}).Return(errUpdate).Once()
 
 	err = i.Update(testCtx, errImageID)
 	assert.NotNil(t, err)
diff --git a/pkg/studio/validate.go b/pkg/studio/validate.go
index 1654a2e78..526400066 100644
--- a/pkg/studio/validate.go
+++ b/pkg/studio/validate.go
@@ -75,7 +75,7 @@ func ValidateAliases(ctx context.Context, id int, aliases []string, qb models.St
 	return nil
 }
 
-func ValidateCreate(ctx context.Context, studio models.Studio, qb models.StudioQueryer) error {
+func ValidateCreate(ctx context.Context, studio models.CreateStudioInput, qb models.StudioQueryer) error {
 	if err := validateName(ctx, 0, studio.Name, qb); err != nil {
 		return err
 	}

From f629191b282aae08e315e47f5f7432b2333176e2 Mon Sep 17 00:00:00 2001
From: CJ <72030708+cj12312021@users.noreply.github.com>
Date: Wed, 4 Feb 2026 20:35:58 -0600
Subject: [PATCH 279/405] Future support for filtering tags list by current
 filter on Performers page (#6091)

---
 graphql/schema/types/filters.graphql          |  2 ++
 pkg/models/tag.go                             |  2 ++
 pkg/sqlite/tag.go                             | 15 ++++++++++++---
 pkg/sqlite/tag_filter.go                      |  9 +++++++++
 .../List/Filters/LabeledIdFilter.tsx          | 19 ++++++++++++++++---
 5 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/graphql/schema/types/filters.graphql b/graphql/schema/types/filters.graphql
index d0d6a4b65..52eec6785 100644
--- a/graphql/schema/types/filters.graphql
+++ b/graphql/schema/types/filters.graphql
@@ -642,6 +642,8 @@ input TagFilterType {
   images_filter: ImageFilterType
   "Filter by related galleries that meet this criteria"
   galleries_filter: GalleryFilterType
+  "Filter by related performers that meet this criteria"
+  performers_filter: PerformerFilterType
 
   "Filter by creation time"
   created_at: TimestampCriterionInput
diff --git a/pkg/models/tag.go b/pkg/models/tag.go
index 69d4f9e3c..5ff2df6ad 100644
--- a/pkg/models/tag.go
+++ b/pkg/models/tag.go
@@ -50,6 +50,8 @@ type TagFilterType struct {
 	ImagesFilter *ImageFilterType `json:"images_filter"`
 	// Filter by related galleries that meet this criteria
 	GalleriesFilter *GalleryFilterType `json:"galleries_filter"`
+	// Filter by related performers that meet this criteria
+	PerformersFilter *PerformerFilterType `json:"performers_filter"`
 	// Filter by created at
 	CreatedAt *TimestampCriterionInput `json:"created_at"`
 	// Filter by updated at
diff --git a/pkg/sqlite/tag.go b/pkg/sqlite/tag.go
index dd730c62c..b1d773290 100644
--- a/pkg/sqlite/tag.go
+++ b/pkg/sqlite/tag.go
@@ -104,9 +104,10 @@ type tagRepositoryType struct {
 	aliases  stringRepository
 	stashIDs stashIDRepository
 
-	scenes    joinRepository
-	images    joinRepository
-	galleries joinRepository
+	scenes     joinRepository
+	images     joinRepository
+	galleries  joinRepository
+	performers joinRepository
 }
 
 var (
@@ -152,6 +153,14 @@ var (
 			fkColumn:     galleryIDColumn,
 			foreignTable: galleryTable,
 		},
+		performers: joinRepository{
+			repository: repository{
+				tableName: performersTagsTable,
+				idColumn:  tagIDColumn,
+			},
+			fkColumn:     performerIDColumn,
+			foreignTable: performerTable,
+		},
 	}
 )
 
diff --git a/pkg/sqlite/tag_filter.go b/pkg/sqlite/tag_filter.go
index 344b7de91..dadc351ee 100644
--- a/pkg/sqlite/tag_filter.go
+++ b/pkg/sqlite/tag_filter.go
@@ -127,6 +127,15 @@ func (qb *tagFilterHandler) criterionHandler() criterionHandler {
 				tagRepository.galleries.innerJoin(f, "", "tags.id")
 			},
 		},
+
+		&relatedFilterHandler{
+			relatedIDCol:   "performers_tags.performer_id",
+			relatedRepo:    performerRepository.repository,
+			relatedHandler: &performerFilterHandler{tagFilter.PerformersFilter},
+			joinFn: func(f *filterBuilder) {
+				tagRepository.performers.innerJoin(f, "", "tags.id")
+			},
+		},
 	}
 }
 
diff --git a/ui/v2.5/src/components/List/Filters/LabeledIdFilter.tsx b/ui/v2.5/src/components/List/Filters/LabeledIdFilter.tsx
index 2e63cd465..4012ff628 100644
--- a/ui/v2.5/src/components/List/Filters/LabeledIdFilter.tsx
+++ b/ui/v2.5/src/components/List/Filters/LabeledIdFilter.tsx
@@ -21,6 +21,7 @@ import {
   GalleryFilterType,
   InputMaybe,
   IntCriterionInput,
+  PerformerFilterType,
   SceneFilterType,
 } from "src/core/generated-graphql";
 import { useIntl } from "react-intl";
@@ -516,6 +517,8 @@ export function makeQueryVariables(query: string, extraProps: {}) {
 interface IFilterType {
   scenes_filter?: InputMaybe<SceneFilterType>;
   scene_count?: InputMaybe<IntCriterionInput>;
+  performers_filter?: InputMaybe<PerformerFilterType>;
+  performer_count?: InputMaybe<IntCriterionInput>;
   galleries_filter?: InputMaybe<GalleryFilterType>;
   gallery_count?: InputMaybe<IntCriterionInput>;
 }
@@ -523,7 +526,7 @@ interface IFilterType {
 export function setObjectFilter(
   out: IFilterType,
   mode: FilterMode,
-  relatedFilterOutput: SceneFilterType | GalleryFilterType
+  relatedFilterOutput: SceneFilterType | PerformerFilterType | GalleryFilterType
 ) {
   const empty = Object.keys(relatedFilterOutput).length === 0;
 
@@ -536,7 +539,17 @@ export function setObjectFilter(
           value: 0,
         };
       }
-      out.scenes_filter = relatedFilterOutput;
+      out.scenes_filter = relatedFilterOutput as SceneFilterType;
+      break;
+    case FilterMode.Performers:
+      // if empty, only get objects with performers
+      if (empty) {
+        out.performer_count = {
+          modifier: CriterionModifier.GreaterThan,
+          value: 0,
+        };
+      }
+      out.performers_filter = relatedFilterOutput as PerformerFilterType;
       break;
     case FilterMode.Galleries:
       // if empty, only get objects with galleries
@@ -546,7 +559,7 @@ export function setObjectFilter(
           value: 0,
         };
       }
-      out.galleries_filter = relatedFilterOutput;
+      out.galleries_filter = relatedFilterOutput as GalleryFilterType;
       break;
     default:
       throw new Error("Invalid filter mode");

From b278525647a17b2ff0f3f19b03a2eb68e78fb52d Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Fri, 6 Feb 2026 12:35:05 +1100
Subject: [PATCH 280/405] Tag custom fields support for backend (#6546)

* Fix custom field import/export for studio
* Update studio unit tests
* Add tag create and update unit tests
* Add custom fields to tag filter graphql
* Add unit tests for tag filtering
* Add filter unit tests for studio
---
 graphql/schema/types/filters.graphql          |   2 +
 graphql/schema/types/tag.graphql              |   5 +
 internal/api/loaders/dataloaders.go           |  26 +-
 internal/api/resolver_model_tag.go            |  13 +
 internal/api/resolver_mutation_tag.go         |  16 +-
 internal/autotag/integration_test.go          |   2 +-
 internal/identify/scene.go                    |   4 +-
 internal/identify/scene_test.go               |  12 +-
 pkg/gallery/import.go                         |   4 +-
 pkg/gallery/import_test.go                    |   8 +-
 pkg/group/import.go                           |   4 +-
 pkg/group/import_test.go                      |   8 +-
 pkg/image/import.go                           |   4 +-
 pkg/image/import_test.go                      |   8 +-
 pkg/models/custom_fields.go                   |   4 +
 pkg/models/jsonschema/studio.go               |   2 +
 pkg/models/jsonschema/tag.go                  |  23 +-
 pkg/models/mocks/TagReaderWriter.go           |  68 +-
 pkg/models/model_tag.go                       |  14 +
 pkg/models/repository_tag.go                  |   7 +-
 pkg/models/tag.go                             |   3 +
 pkg/performer/import.go                       |   4 +-
 pkg/performer/import_test.go                  |   8 +-
 pkg/scene/import.go                           |   4 +-
 pkg/scene/import_test.go                      |   8 +-
 pkg/sqlite/anonymise.go                       |   8 +
 pkg/sqlite/database.go                        |   2 +-
 .../migrations/77_tag_custom_fields.up.sql    |   9 +
 pkg/sqlite/setup_test.go                      |  17 +-
 pkg/sqlite/studio_test.go                     | 245 +++++++
 pkg/sqlite/tables.go                          |   1 +
 pkg/sqlite/tag.go                             |  28 +-
 pkg/sqlite/tag_filter.go                      |   7 +
 pkg/sqlite/tag_test.go                        | 650 +++++++++++++++++-
 pkg/studio/export.go                          |   7 +
 pkg/studio/export_test.go                     |  67 +-
 pkg/studio/import.go                          |  24 +-
 pkg/studio/import_test.go                     |  11 +-
 pkg/tag/export.go                             |   6 +
 pkg/tag/export_test.go                        |  83 ++-
 pkg/tag/import.go                             |  31 +-
 pkg/tag/import_test.go                        |  34 +-
 42 files changed, 1356 insertions(+), 135 deletions(-)
 create mode 100644 pkg/sqlite/migrations/77_tag_custom_fields.up.sql

diff --git a/graphql/schema/types/filters.graphql b/graphql/schema/types/filters.graphql
index 52eec6785..f89cee3e2 100644
--- a/graphql/schema/types/filters.graphql
+++ b/graphql/schema/types/filters.graphql
@@ -650,6 +650,8 @@ input TagFilterType {
 
   "Filter by last update time"
   updated_at: TimestampCriterionInput
+
+  custom_fields: [CustomFieldCriterionInput!]
 }
 
 input ImageFilterType {
diff --git a/graphql/schema/types/tag.graphql b/graphql/schema/types/tag.graphql
index a69b83548..2210c900e 100644
--- a/graphql/schema/types/tag.graphql
+++ b/graphql/schema/types/tag.graphql
@@ -24,6 +24,7 @@ type Tag {
 
   parent_count: Int! # Resolver
   child_count: Int! # Resolver
+  custom_fields: Map!
 }
 
 input TagCreateInput {
@@ -41,6 +42,8 @@ input TagCreateInput {
 
   parent_ids: [ID!]
   child_ids: [ID!]
+
+  custom_fields: Map
 }
 
 input TagUpdateInput {
@@ -59,6 +62,8 @@ input TagUpdateInput {
 
   parent_ids: [ID!]
   child_ids: [ID!]
+
+  custom_fields: CustomFieldsInput
 }
 
 input TagDestroyInput {
diff --git a/internal/api/loaders/dataloaders.go b/internal/api/loaders/dataloaders.go
index 4676966c9..ecb0bbac2 100644
--- a/internal/api/loaders/dataloaders.go
+++ b/internal/api/loaders/dataloaders.go
@@ -62,10 +62,11 @@ type Loaders struct {
 	StudioByID         *StudioLoader
 	StudioCustomFields *CustomFieldsLoader
 
-	TagByID    *TagLoader
-	GroupByID  *GroupLoader
-	FileByID   *FileLoader
-	FolderByID *FolderLoader
+	TagByID         *TagLoader
+	TagCustomFields *CustomFieldsLoader
+	GroupByID       *GroupLoader
+	FileByID        *FileLoader
+	FolderByID      *FolderLoader
 }
 
 type Middleware struct {
@@ -116,6 +117,11 @@ func (m Middleware) Middleware(next http.Handler) http.Handler {
 				maxBatch: maxBatch,
 				fetch:    m.fetchTags(ctx),
 			},
+			TagCustomFields: &CustomFieldsLoader{
+				wait:     wait,
+				maxBatch: maxBatch,
+				fetch:    m.fetchTagCustomFields(ctx),
+			},
 			GroupByID: &GroupLoader{
 				wait:     wait,
 				maxBatch: maxBatch,
@@ -283,6 +289,18 @@ func (m Middleware) fetchTags(ctx context.Context) func(keys []int) ([]*models.T
 	}
 }
 
+func (m Middleware) fetchTagCustomFields(ctx context.Context) func(keys []int) ([]models.CustomFieldMap, []error) {
+	return func(keys []int) (ret []models.CustomFieldMap, errs []error) {
+		err := m.Repository.WithDB(ctx, func(ctx context.Context) error {
+			var err error
+			ret, err = m.Repository.Tag.GetCustomFieldsBulk(ctx, keys)
+			return err
+		})
+
+		return ret, toErrorSlice(err)
+	}
+}
+
 func (m Middleware) fetchGroups(ctx context.Context) func(keys []int) ([]*models.Group, []error) {
 	return func(keys []int) (ret []*models.Group, errs []error) {
 		err := m.Repository.WithDB(ctx, func(ctx context.Context) error {
diff --git a/internal/api/resolver_model_tag.go b/internal/api/resolver_model_tag.go
index deae41f21..7518036b0 100644
--- a/internal/api/resolver_model_tag.go
+++ b/internal/api/resolver_model_tag.go
@@ -181,3 +181,16 @@ func (r *tagResolver) ChildCount(ctx context.Context, obj *models.Tag) (ret int,
 
 	return ret, nil
 }
+
+func (r *tagResolver) CustomFields(ctx context.Context, obj *models.Tag) (map[string]interface{}, error) {
+	m, err := loaders.From(ctx).TagCustomFields.Load(obj.ID)
+	if err != nil {
+		return nil, err
+	}
+
+	if m == nil {
+		return make(map[string]interface{}), nil
+	}
+
+	return m, nil
+}
diff --git a/internal/api/resolver_mutation_tag.go b/internal/api/resolver_mutation_tag.go
index 8fb295d40..31c7980f6 100644
--- a/internal/api/resolver_mutation_tag.go
+++ b/internal/api/resolver_mutation_tag.go
@@ -31,7 +31,10 @@ func (r *mutationResolver) TagCreate(ctx context.Context, input TagCreateInput)
 	}
 
 	// Populate a new tag from the input
-	newTag := models.NewTag()
+	newTag := models.CreateTagInput{
+		Tag: &models.Tag{},
+	}
+	*newTag.Tag = models.NewTag()
 
 	newTag.Name = strings.TrimSpace(input.Name)
 	newTag.SortName = translator.string(input.SortName)
@@ -60,6 +63,8 @@ func (r *mutationResolver) TagCreate(ctx context.Context, input TagCreateInput)
 		return nil, fmt.Errorf("converting child tag ids: %w", err)
 	}
 
+	newTag.CustomFields = convertMapJSONNumbers(input.CustomFields)
+
 	// Process the base 64 encoded image string
 	var imageData []byte
 	if input.Image != nil {
@@ -73,7 +78,7 @@ func (r *mutationResolver) TagCreate(ctx context.Context, input TagCreateInput)
 	if err := r.withTxn(ctx, func(ctx context.Context) error {
 		qb := r.repository.Tag
 
-		if err := tag.ValidateCreate(ctx, newTag, qb); err != nil {
+		if err := tag.ValidateCreate(ctx, *newTag.Tag, qb); err != nil {
 			return err
 		}
 
@@ -137,6 +142,13 @@ func (r *mutationResolver) TagUpdate(ctx context.Context, input TagUpdateInput)
 		return nil, fmt.Errorf("converting child tag ids: %w", err)
 	}
 
+	if input.CustomFields != nil {
+		updatedTag.CustomFields = *input.CustomFields
+		// convert json.Numbers to int/float
+		updatedTag.CustomFields.Full = convertMapJSONNumbers(updatedTag.CustomFields.Full)
+		updatedTag.CustomFields.Partial = convertMapJSONNumbers(updatedTag.CustomFields.Partial)
+	}
+
 	var imageData []byte
 	imageIncluded := translator.hasField("image")
 	if input.Image != nil {
diff --git a/internal/autotag/integration_test.go b/internal/autotag/integration_test.go
index 605082b98..27cce014e 100644
--- a/internal/autotag/integration_test.go
+++ b/internal/autotag/integration_test.go
@@ -118,7 +118,7 @@ func createTag(ctx context.Context, qb models.TagWriter) error {
 		Name: testName,
 	}
 
-	err := qb.Create(ctx, &tag)
+	err := qb.Create(ctx, &models.CreateTagInput{Tag: &tag})
 	if err != nil {
 		return err
 	}
diff --git a/internal/identify/scene.go b/internal/identify/scene.go
index 789674693..b82a04301 100644
--- a/internal/identify/scene.go
+++ b/internal/identify/scene.go
@@ -167,7 +167,9 @@ func (g sceneRelationships) tags(ctx context.Context) ([]int, error) {
 		} else if createMissing {
 			newTag := t.ToTag(endpoint, nil)
 
-			err := g.tagCreator.Create(ctx, newTag)
+			err := g.tagCreator.Create(ctx, &models.CreateTagInput{
+				Tag: newTag,
+			})
 			if err != nil {
 				return nil, fmt.Errorf("error creating tag: %w", err)
 			}
diff --git a/internal/identify/scene_test.go b/internal/identify/scene_test.go
index 0eec61c4e..862bbbff8 100644
--- a/internal/identify/scene_test.go
+++ b/internal/identify/scene_test.go
@@ -368,14 +368,14 @@ func Test_sceneRelationships_tags(t *testing.T) {
 
 	db := mocks.NewDatabase()
 
-	db.Tag.On("Create", testCtx, mock.MatchedBy(func(p *models.Tag) bool {
-		return p.Name == validName
+	db.Tag.On("Create", testCtx, mock.MatchedBy(func(p *models.CreateTagInput) bool {
+		return p.Tag.Name == validName
 	})).Run(func(args mock.Arguments) {
-		t := args.Get(1).(*models.Tag)
-		t.ID = validStoredIDInt
+		t := args.Get(1).(*models.CreateTagInput)
+		t.Tag.ID = validStoredIDInt
 	}).Return(nil)
-	db.Tag.On("Create", testCtx, mock.MatchedBy(func(p *models.Tag) bool {
-		return p.Name == invalidName
+	db.Tag.On("Create", testCtx, mock.MatchedBy(func(p *models.CreateTagInput) bool {
+		return p.Tag.Name == invalidName
 	})).Return(errors.New("error creating tag"))
 
 	tr := sceneRelationships{
diff --git a/pkg/gallery/import.go b/pkg/gallery/import.go
index 543d4cf48..22f3e6c44 100644
--- a/pkg/gallery/import.go
+++ b/pkg/gallery/import.go
@@ -249,7 +249,9 @@ func (i *Importer) createTags(ctx context.Context, names []string) ([]*models.Ta
 		newTag := models.NewTag()
 		newTag.Name = name
 
-		err := i.TagWriter.Create(ctx, &newTag)
+		err := i.TagWriter.Create(ctx, &models.CreateTagInput{
+			Tag: &newTag,
+		})
 		if err != nil {
 			return nil, err
 		}
diff --git a/pkg/gallery/import_test.go b/pkg/gallery/import_test.go
index 4248f51bc..932f84d48 100644
--- a/pkg/gallery/import_test.go
+++ b/pkg/gallery/import_test.go
@@ -289,9 +289,9 @@ func TestImporterPreImportWithMissingTag(t *testing.T) {
 	}
 
 	db.Tag.On("FindByNames", testCtx, []string{missingTagName}, false).Return(nil, nil).Times(3)
-	db.Tag.On("Create", testCtx, mock.AnythingOfType("*models.Tag")).Run(func(args mock.Arguments) {
-		t := args.Get(1).(*models.Tag)
-		t.ID = existingTagID
+	db.Tag.On("Create", testCtx, mock.AnythingOfType("*models.CreateTagInput")).Run(func(args mock.Arguments) {
+		t := args.Get(1).(*models.CreateTagInput)
+		t.Tag.ID = existingTagID
 	}).Return(nil)
 
 	err := i.PreImport(testCtx)
@@ -323,7 +323,7 @@ func TestImporterPreImportWithMissingTagCreateErr(t *testing.T) {
 	}
 
 	db.Tag.On("FindByNames", testCtx, []string{missingTagName}, false).Return(nil, nil).Once()
-	db.Tag.On("Create", testCtx, mock.AnythingOfType("*models.Tag")).Return(errors.New("Create error"))
+	db.Tag.On("Create", testCtx, mock.AnythingOfType("*models.CreateTagInput")).Return(errors.New("Create error"))
 
 	err := i.PreImport(testCtx)
 	assert.NotNil(t, err)
diff --git a/pkg/group/import.go b/pkg/group/import.go
index a73c3998e..d7acad47c 100644
--- a/pkg/group/import.go
+++ b/pkg/group/import.go
@@ -126,7 +126,9 @@ func createTags(ctx context.Context, tagWriter models.TagFinderCreator, names []
 		newTag := models.NewTag()
 		newTag.Name = name
 
-		err := tagWriter.Create(ctx, &newTag)
+		err := tagWriter.Create(ctx, &models.CreateTagInput{
+			Tag: &newTag,
+		})
 		if err != nil {
 			return nil, err
 		}
diff --git a/pkg/group/import_test.go b/pkg/group/import_test.go
index 50b8b2dd1..387ceb87e 100644
--- a/pkg/group/import_test.go
+++ b/pkg/group/import_test.go
@@ -212,9 +212,9 @@ func TestImporterPreImportWithMissingTag(t *testing.T) {
 	}
 
 	db.Tag.On("FindByNames", testCtx, []string{missingTagName}, false).Return(nil, nil).Times(3)
-	db.Tag.On("Create", testCtx, mock.AnythingOfType("*models.Tag")).Run(func(args mock.Arguments) {
-		t := args.Get(1).(*models.Tag)
-		t.ID = existingTagID
+	db.Tag.On("Create", testCtx, mock.AnythingOfType("*models.CreateTagInput")).Run(func(args mock.Arguments) {
+		t := args.Get(1).(*models.CreateTagInput)
+		t.Tag.ID = existingTagID
 	}).Return(nil)
 
 	err := i.PreImport(testCtx)
@@ -247,7 +247,7 @@ func TestImporterPreImportWithMissingTagCreateErr(t *testing.T) {
 	}
 
 	db.Tag.On("FindByNames", testCtx, []string{missingTagName}, false).Return(nil, nil).Once()
-	db.Tag.On("Create", testCtx, mock.AnythingOfType("*models.Tag")).Return(errors.New("Create error"))
+	db.Tag.On("Create", testCtx, mock.AnythingOfType("*models.CreateTagInput")).Return(errors.New("Create error"))
 
 	err := i.PreImport(testCtx)
 	assert.NotNil(t, err)
diff --git a/pkg/image/import.go b/pkg/image/import.go
index 77b6d7477..c7ef7f00c 100644
--- a/pkg/image/import.go
+++ b/pkg/image/import.go
@@ -407,7 +407,9 @@ func createTags(ctx context.Context, tagWriter models.TagCreator, names []string
 		newTag := models.NewTag()
 		newTag.Name = name
 
-		err := tagWriter.Create(ctx, &newTag)
+		err := tagWriter.Create(ctx, &models.CreateTagInput{
+			Tag: &newTag,
+		})
 		if err != nil {
 			return nil, err
 		}
diff --git a/pkg/image/import_test.go b/pkg/image/import_test.go
index 98b3972b9..5d01d4b97 100644
--- a/pkg/image/import_test.go
+++ b/pkg/image/import_test.go
@@ -251,9 +251,9 @@ func TestImporterPreImportWithMissingTag(t *testing.T) {
 	}
 
 	db.Tag.On("FindByNames", testCtx, []string{missingTagName}, false).Return(nil, nil).Times(3)
-	db.Tag.On("Create", testCtx, mock.AnythingOfType("*models.Tag")).Run(func(args mock.Arguments) {
-		t := args.Get(1).(*models.Tag)
-		t.ID = existingTagID
+	db.Tag.On("Create", testCtx, mock.AnythingOfType("*models.CreateTagInput")).Run(func(args mock.Arguments) {
+		t := args.Get(1).(*models.CreateTagInput)
+		t.Tag.ID = existingTagID
 	}).Return(nil)
 
 	err := i.PreImport(testCtx)
@@ -285,7 +285,7 @@ func TestImporterPreImportWithMissingTagCreateErr(t *testing.T) {
 	}
 
 	db.Tag.On("FindByNames", testCtx, []string{missingTagName}, false).Return(nil, nil).Once()
-	db.Tag.On("Create", testCtx, mock.AnythingOfType("*models.Tag")).Return(errors.New("Create error"))
+	db.Tag.On("Create", testCtx, mock.AnythingOfType("*models.CreateTagInput")).Return(errors.New("Create error"))
 
 	err := i.PreImport(testCtx)
 	assert.NotNil(t, err)
diff --git a/pkg/models/custom_fields.go b/pkg/models/custom_fields.go
index 5c3acd18b..3212d676f 100644
--- a/pkg/models/custom_fields.go
+++ b/pkg/models/custom_fields.go
@@ -17,3 +17,7 @@ type CustomFieldsReader interface {
 	GetCustomFields(ctx context.Context, id int) (map[string]interface{}, error)
 	GetCustomFieldsBulk(ctx context.Context, ids []int) ([]CustomFieldMap, error)
 }
+
+type CustomFieldsWriter interface {
+	SetCustomFields(ctx context.Context, id int, fields CustomFieldsInput) error
+}
diff --git a/pkg/models/jsonschema/studio.go b/pkg/models/jsonschema/studio.go
index a3706df66..7684b4317 100644
--- a/pkg/models/jsonschema/studio.go
+++ b/pkg/models/jsonschema/studio.go
@@ -25,6 +25,8 @@ type Studio struct {
 	Tags          []string         `json:"tags,omitempty"`
 	IgnoreAutoTag bool             `json:"ignore_auto_tag,omitempty"`
 
+	CustomFields map[string]interface{} `json:"custom_fields,omitempty"`
+
 	// deprecated - for import only
 	URL string `json:"url,omitempty"`
 }
diff --git a/pkg/models/jsonschema/tag.go b/pkg/models/jsonschema/tag.go
index faab1bfb2..e7b16b13f 100644
--- a/pkg/models/jsonschema/tag.go
+++ b/pkg/models/jsonschema/tag.go
@@ -11,17 +11,18 @@ import (
 )
 
 type Tag struct {
-	Name          string           `json:"name,omitempty"`
-	SortName      string           `json:"sort_name,omitempty"`
-	Description   string           `json:"description,omitempty"`
-	Favorite      bool             `json:"favorite,omitempty"`
-	Aliases       []string         `json:"aliases,omitempty"`
-	Image         string           `json:"image,omitempty"`
-	Parents       []string         `json:"parents,omitempty"`
-	IgnoreAutoTag bool             `json:"ignore_auto_tag,omitempty"`
-	StashIDs      []models.StashID `json:"stash_ids,omitempty"`
-	CreatedAt     json.JSONTime    `json:"created_at,omitempty"`
-	UpdatedAt     json.JSONTime    `json:"updated_at,omitempty"`
+	Name          string                 `json:"name,omitempty"`
+	SortName      string                 `json:"sort_name,omitempty"`
+	Description   string                 `json:"description,omitempty"`
+	Favorite      bool                   `json:"favorite,omitempty"`
+	Aliases       []string               `json:"aliases,omitempty"`
+	Image         string                 `json:"image,omitempty"`
+	Parents       []string               `json:"parents,omitempty"`
+	IgnoreAutoTag bool                   `json:"ignore_auto_tag,omitempty"`
+	StashIDs      []models.StashID       `json:"stash_ids,omitempty"`
+	CreatedAt     json.JSONTime          `json:"created_at,omitempty"`
+	UpdatedAt     json.JSONTime          `json:"updated_at,omitempty"`
+	CustomFields  map[string]interface{} `json:"custom_fields,omitempty"`
 }
 
 func (s Tag) Filename() string {
diff --git a/pkg/models/mocks/TagReaderWriter.go b/pkg/models/mocks/TagReaderWriter.go
index ac6b10584..95a3b7a87 100644
--- a/pkg/models/mocks/TagReaderWriter.go
+++ b/pkg/models/mocks/TagReaderWriter.go
@@ -101,11 +101,11 @@ func (_m *TagReaderWriter) CountByParentTagID(ctx context.Context, parentID int)
 }
 
 // Create provides a mock function with given fields: ctx, newTag
-func (_m *TagReaderWriter) Create(ctx context.Context, newTag *models.Tag) error {
+func (_m *TagReaderWriter) Create(ctx context.Context, newTag *models.CreateTagInput) error {
 	ret := _m.Called(ctx, newTag)
 
 	var r0 error
-	if rf, ok := ret.Get(0).(func(context.Context, *models.Tag) error); ok {
+	if rf, ok := ret.Get(0).(func(context.Context, *models.CreateTagInput) error); ok {
 		r0 = rf(ctx, newTag)
 	} else {
 		r0 = ret.Error(0)
@@ -542,6 +542,52 @@ func (_m *TagReaderWriter) GetChildIDs(ctx context.Context, relatedID int) ([]in
 	return r0, r1
 }
 
+// GetCustomFields provides a mock function with given fields: ctx, id
+func (_m *TagReaderWriter) GetCustomFields(ctx context.Context, id int) (map[string]interface{}, error) {
+	ret := _m.Called(ctx, id)
+
+	var r0 map[string]interface{}
+	if rf, ok := ret.Get(0).(func(context.Context, int) map[string]interface{}); ok {
+		r0 = rf(ctx, id)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(map[string]interface{})
+		}
+	}
+
+	var r1 error
+	if rf, ok := ret.Get(1).(func(context.Context, int) error); ok {
+		r1 = rf(ctx, id)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// GetCustomFieldsBulk provides a mock function with given fields: ctx, ids
+func (_m *TagReaderWriter) GetCustomFieldsBulk(ctx context.Context, ids []int) ([]models.CustomFieldMap, error) {
+	ret := _m.Called(ctx, ids)
+
+	var r0 []models.CustomFieldMap
+	if rf, ok := ret.Get(0).(func(context.Context, []int) []models.CustomFieldMap); ok {
+		r0 = rf(ctx, ids)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).([]models.CustomFieldMap)
+		}
+	}
+
+	var r1 error
+	if rf, ok := ret.Get(1).(func(context.Context, []int) error); ok {
+		r1 = rf(ctx, ids)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
 // GetImage provides a mock function with given fields: ctx, tagID
 func (_m *TagReaderWriter) GetImage(ctx context.Context, tagID int) ([]byte, error) {
 	ret := _m.Called(ctx, tagID)
@@ -699,12 +745,26 @@ func (_m *TagReaderWriter) QueryForAutoTag(ctx context.Context, words []string)
 	return r0, r1
 }
 
+// SetCustomFields provides a mock function with given fields: ctx, id, fields
+func (_m *TagReaderWriter) SetCustomFields(ctx context.Context, id int, fields models.CustomFieldsInput) error {
+	ret := _m.Called(ctx, id, fields)
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context, int, models.CustomFieldsInput) error); ok {
+		r0 = rf(ctx, id, fields)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
 // Update provides a mock function with given fields: ctx, updatedTag
-func (_m *TagReaderWriter) Update(ctx context.Context, updatedTag *models.Tag) error {
+func (_m *TagReaderWriter) Update(ctx context.Context, updatedTag *models.UpdateTagInput) error {
 	ret := _m.Called(ctx, updatedTag)
 
 	var r0 error
-	if rf, ok := ret.Get(0).(func(context.Context, *models.Tag) error); ok {
+	if rf, ok := ret.Get(0).(func(context.Context, *models.UpdateTagInput) error); ok {
 		r0 = rf(ctx, updatedTag)
 	} else {
 		r0 = ret.Error(0)
diff --git a/pkg/models/model_tag.go b/pkg/models/model_tag.go
index 4cd038f7e..aee468639 100644
--- a/pkg/models/model_tag.go
+++ b/pkg/models/model_tag.go
@@ -29,6 +29,18 @@ func NewTag() Tag {
 	}
 }
 
+type CreateTagInput struct {
+	*Tag
+
+	CustomFields map[string]interface{} `json:"custom_fields"`
+}
+
+type UpdateTagInput struct {
+	*Tag
+
+	CustomFields CustomFieldsInput `json:"custom_fields"`
+}
+
 func (s *Tag) LoadAliases(ctx context.Context, l AliasLoader) error {
 	return s.Aliases.load(func() ([]string, error) {
 		return l.GetAliases(ctx, s.ID)
@@ -66,6 +78,8 @@ type TagPartial struct {
 	ParentIDs *UpdateIDs
 	ChildIDs  *UpdateIDs
 	StashIDs  *UpdateStashIDs
+
+	CustomFields CustomFieldsInput
 }
 
 func NewTagPartial() TagPartial {
diff --git a/pkg/models/repository_tag.go b/pkg/models/repository_tag.go
index a7f828f0b..ba403cf2d 100644
--- a/pkg/models/repository_tag.go
+++ b/pkg/models/repository_tag.go
@@ -51,12 +51,12 @@ type TagCounter interface {
 
 // TagCreator provides methods to create tags.
 type TagCreator interface {
-	Create(ctx context.Context, newTag *Tag) error
+	Create(ctx context.Context, newTag *CreateTagInput) error
 }
 
 // TagUpdater provides methods to update tags.
 type TagUpdater interface {
-	Update(ctx context.Context, updatedTag *Tag) error
+	Update(ctx context.Context, updatedTag *UpdateTagInput) error
 	UpdatePartial(ctx context.Context, id int, updateTag TagPartial) (*Tag, error)
 	UpdateAliases(ctx context.Context, tagID int, aliases []string) error
 	UpdateImage(ctx context.Context, tagID int, image []byte) error
@@ -77,6 +77,7 @@ type TagFinderCreator interface {
 type TagCreatorUpdater interface {
 	TagCreator
 	TagUpdater
+	CustomFieldsWriter
 }
 
 // TagReader provides all methods to read tags.
@@ -89,6 +90,7 @@ type TagReader interface {
 	AliasLoader
 	TagRelationLoader
 	StashIDLoader
+	CustomFieldsReader
 
 	All(ctx context.Context) ([]*Tag, error)
 	GetImage(ctx context.Context, tagID int) ([]byte, error)
@@ -100,6 +102,7 @@ type TagWriter interface {
 	TagCreator
 	TagUpdater
 	TagDestroyer
+	CustomFieldsWriter
 
 	Merge(ctx context.Context, source []int, destination int) error
 }
diff --git a/pkg/models/tag.go b/pkg/models/tag.go
index 5ff2df6ad..0f39d8861 100644
--- a/pkg/models/tag.go
+++ b/pkg/models/tag.go
@@ -56,4 +56,7 @@ type TagFilterType struct {
 	CreatedAt *TimestampCriterionInput `json:"created_at"`
 	// Filter by updated at
 	UpdatedAt *TimestampCriterionInput `json:"updated_at"`
+
+	// Filter by custom fields
+	CustomFields []CustomFieldCriterionInput `json:"custom_fields"`
 }
diff --git a/pkg/performer/import.go b/pkg/performer/import.go
index 622af2b1a..a8e3f7a7a 100644
--- a/pkg/performer/import.go
+++ b/pkg/performer/import.go
@@ -107,7 +107,9 @@ func createTags(ctx context.Context, tagWriter models.TagFinderCreator, names []
 		newTag := models.NewTag()
 		newTag.Name = name
 
-		err := tagWriter.Create(ctx, &newTag)
+		err := tagWriter.Create(ctx, &models.CreateTagInput{
+			Tag: &newTag,
+		})
 		if err != nil {
 			return nil, err
 		}
diff --git a/pkg/performer/import_test.go b/pkg/performer/import_test.go
index 0a3f86291..455a6e7a3 100644
--- a/pkg/performer/import_test.go
+++ b/pkg/performer/import_test.go
@@ -111,9 +111,9 @@ func TestImporterPreImportWithMissingTag(t *testing.T) {
 	}
 
 	db.Tag.On("FindByNames", testCtx, []string{missingTagName}, false).Return(nil, nil).Times(3)
-	db.Tag.On("Create", testCtx, mock.AnythingOfType("*models.Tag")).Run(func(args mock.Arguments) {
-		t := args.Get(1).(*models.Tag)
-		t.ID = existingTagID
+	db.Tag.On("Create", testCtx, mock.AnythingOfType("*models.CreateTagInput")).Run(func(args mock.Arguments) {
+		t := args.Get(1).(*models.CreateTagInput)
+		t.Tag.ID = existingTagID
 	}).Return(nil)
 
 	err := i.PreImport(testCtx)
@@ -146,7 +146,7 @@ func TestImporterPreImportWithMissingTagCreateErr(t *testing.T) {
 	}
 
 	db.Tag.On("FindByNames", testCtx, []string{missingTagName}, false).Return(nil, nil).Once()
-	db.Tag.On("Create", testCtx, mock.AnythingOfType("*models.Tag")).Return(errors.New("Create error"))
+	db.Tag.On("Create", testCtx, mock.AnythingOfType("*models.CreateTagInput")).Return(errors.New("Create error"))
 
 	err := i.PreImport(testCtx)
 	assert.NotNil(t, err)
diff --git a/pkg/scene/import.go b/pkg/scene/import.go
index b3f0f1ff1..58604e1a5 100644
--- a/pkg/scene/import.go
+++ b/pkg/scene/import.go
@@ -549,7 +549,9 @@ func createTags(ctx context.Context, tagWriter models.TagCreator, names []string
 		newTag := models.NewTag()
 		newTag.Name = name
 
-		err := tagWriter.Create(ctx, &newTag)
+		err := tagWriter.Create(ctx, &models.CreateTagInput{
+			Tag: &newTag,
+		})
 		if err != nil {
 			return nil, err
 		}
diff --git a/pkg/scene/import_test.go b/pkg/scene/import_test.go
index 558b72ba2..4936ec2bb 100644
--- a/pkg/scene/import_test.go
+++ b/pkg/scene/import_test.go
@@ -508,9 +508,9 @@ func TestImporterPreImportWithMissingTag(t *testing.T) {
 	}
 
 	db.Tag.On("FindByNames", testCtx, []string{missingTagName}, false).Return(nil, nil).Times(3)
-	db.Tag.On("Create", testCtx, mock.AnythingOfType("*models.Tag")).Run(func(args mock.Arguments) {
-		t := args.Get(1).(*models.Tag)
-		t.ID = existingTagID
+	db.Tag.On("Create", testCtx, mock.AnythingOfType("*models.CreateTagInput")).Run(func(args mock.Arguments) {
+		t := args.Get(1).(*models.CreateTagInput)
+		t.Tag.ID = existingTagID
 	}).Return(nil)
 
 	err := i.PreImport(testCtx)
@@ -542,7 +542,7 @@ func TestImporterPreImportWithMissingTagCreateErr(t *testing.T) {
 	}
 
 	db.Tag.On("FindByNames", testCtx, []string{missingTagName}, false).Return(nil, nil).Once()
-	db.Tag.On("Create", testCtx, mock.AnythingOfType("*models.Tag")).Return(errors.New("Create error"))
+	db.Tag.On("Create", testCtx, mock.AnythingOfType("*models.CreateTagInput")).Return(errors.New("Create error"))
 
 	err := i.PreImport(testCtx)
 	assert.NotNil(t, err)
diff --git a/pkg/sqlite/anonymise.go b/pkg/sqlite/anonymise.go
index 764f569c0..e3b7492cc 100644
--- a/pkg/sqlite/anonymise.go
+++ b/pkg/sqlite/anonymise.go
@@ -678,6 +678,10 @@ func (db *Anonymiser) anonymiseStudios(ctx context.Context) error {
 		return err
 	}
 
+	if err := db.anonymiseCustomFields(ctx, goqu.T(studiosCustomFieldsTable.GetTable()), "studio_id"); err != nil {
+		return err
+	}
+
 	return nil
 }
 
@@ -873,6 +877,10 @@ func (db *Anonymiser) anonymiseTags(ctx context.Context) error {
 		return err
 	}
 
+	if err := db.anonymiseCustomFields(ctx, goqu.T(tagsCustomFieldsTable.GetTable()), "tag_id"); err != nil {
+		return err
+	}
+
 	return nil
 }
 
diff --git a/pkg/sqlite/database.go b/pkg/sqlite/database.go
index a87f6706f..51889ff20 100644
--- a/pkg/sqlite/database.go
+++ b/pkg/sqlite/database.go
@@ -34,7 +34,7 @@ const (
 	cacheSizeEnv = "STASH_SQLITE_CACHE_SIZE"
 )
 
-var appSchemaVersion uint = 76
+var appSchemaVersion uint = 77
 
 //go:embed migrations/*.sql
 var migrationsBox embed.FS
diff --git a/pkg/sqlite/migrations/77_tag_custom_fields.up.sql b/pkg/sqlite/migrations/77_tag_custom_fields.up.sql
new file mode 100644
index 000000000..b34a5f794
--- /dev/null
+++ b/pkg/sqlite/migrations/77_tag_custom_fields.up.sql
@@ -0,0 +1,9 @@
+CREATE TABLE `tag_custom_fields` (
+  `tag_id` integer NOT NULL,
+  `field` varchar(64) NOT NULL,
+  `value` BLOB NOT NULL,
+  PRIMARY KEY (`tag_id`, `field`),
+  foreign key(`tag_id`) references `tags`(`id`) on delete CASCADE
+);
+
+CREATE INDEX `index_tag_custom_fields_field_value` ON `tag_custom_fields` (`field`, `value`);
\ No newline at end of file
diff --git a/pkg/sqlite/setup_test.go b/pkg/sqlite/setup_test.go
index 361b5cb79..bdb83b1df 100644
--- a/pkg/sqlite/setup_test.go
+++ b/pkg/sqlite/setup_test.go
@@ -1709,6 +1709,18 @@ func tagStashID(i int) models.StashID {
 	}
 }
 
+func getTagCustomFields(index int) map[string]interface{} {
+	if index%5 == 0 {
+		return nil
+	}
+
+	return map[string]interface{}{
+		"string": getTagStringValue(index, "custom"),
+		"int":    int64(index % 5),
+		"real":   float64(index) / 10,
+	}
+}
+
 // createTags creates n tags with plain Name and o tags with camel cased NaMe included
 func createTags(ctx context.Context, tqb models.TagReaderWriter, n int, o int) error {
 	const namePlain = "Name"
@@ -1736,7 +1748,10 @@ func createTags(ctx context.Context, tqb models.TagReaderWriter, n int, o int) e
 			})
 		}
 
-		err := tqb.Create(ctx, &tag)
+		err := tqb.Create(ctx, &models.CreateTagInput{
+			Tag:          &tag,
+			CustomFields: getTagCustomFields(i),
+		})
 
 		if err != nil {
 			return fmt.Errorf("Error creating tag %v+: %s", tag, err.Error())
diff --git a/pkg/sqlite/studio_test.go b/pkg/sqlite/studio_test.go
index 074c77d6f..968f43413 100644
--- a/pkg/sqlite/studio_test.go
+++ b/pkg/sqlite/studio_test.go
@@ -1694,6 +1694,251 @@ func TestStudioQueryFast(t *testing.T) {
 	})
 }
 
+func studiesToIDs(i []*models.Studio) []int {
+	ret := make([]int, len(i))
+	for i, v := range i {
+		ret[i] = v.ID
+	}
+
+	return ret
+}
+
+func TestStudioQueryCustomFields(t *testing.T) {
+	tests := []struct {
+		name        string
+		filter      *models.StudioFilterType
+		includeIdxs []int
+		excludeIdxs []int
+		wantErr     bool
+	}{
+		{
+			"equals",
+			&models.StudioFilterType{
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "string",
+						Modifier: models.CriterionModifierEquals,
+						Value:    []any{getStudioStringValue(studioIdxWithTwoScenes, "custom")},
+					},
+				},
+			},
+			[]int{studioIdxWithTwoScenes},
+			nil,
+			false,
+		},
+		{
+			"not equals",
+			&models.StudioFilterType{
+				Name: &models.StringCriterionInput{
+					Value:    getStudioStringValue(studioIdxWithTwoScenes, "Name"),
+					Modifier: models.CriterionModifierEquals,
+				},
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "string",
+						Modifier: models.CriterionModifierNotEquals,
+						Value:    []any{getStudioStringValue(studioIdxWithTwoScenes, "custom")},
+					},
+				},
+			},
+			nil,
+			[]int{studioIdxWithTwoScenes},
+			false,
+		},
+		{
+			"includes",
+			&models.StudioFilterType{
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "string",
+						Modifier: models.CriterionModifierIncludes,
+						Value:    []any{getStudioStringValue(studioIdxWithTwoScenes, "custom")[9:]},
+					},
+				},
+			},
+			[]int{studioIdxWithTwoScenes},
+			nil,
+			false,
+		},
+		{
+			"excludes",
+			&models.StudioFilterType{
+				Name: &models.StringCriterionInput{
+					Value:    getStudioStringValue(studioIdxWithTwoScenes, "Name"),
+					Modifier: models.CriterionModifierEquals,
+				},
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "string",
+						Modifier: models.CriterionModifierExcludes,
+						Value:    []any{getStudioStringValue(studioIdxWithTwoScenes, "custom")[9:]},
+					},
+				},
+			},
+			nil,
+			[]int{studioIdxWithTwoScenes},
+			false,
+		},
+		{
+			"regex",
+			&models.StudioFilterType{
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "string",
+						Modifier: models.CriterionModifierMatchesRegex,
+						Value:    []any{".*1_custom"},
+					},
+				},
+			},
+			[]int{studioIdxWithTwoScenes},
+			nil,
+			false,
+		},
+		{
+			"invalid regex",
+			&models.StudioFilterType{
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "string",
+						Modifier: models.CriterionModifierMatchesRegex,
+						Value:    []any{"["},
+					},
+				},
+			},
+			nil,
+			nil,
+			true,
+		},
+		{
+			"not matches regex",
+			&models.StudioFilterType{
+				Name: &models.StringCriterionInput{
+					Value:    getStudioStringValue(studioIdxWithTwoScenes, "Name"),
+					Modifier: models.CriterionModifierEquals,
+				},
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "string",
+						Modifier: models.CriterionModifierNotMatchesRegex,
+						Value:    []any{".*1_custom"},
+					},
+				},
+			},
+			nil,
+			[]int{studioIdxWithTwoScenes},
+			false,
+		},
+		{
+			"invalid not matches regex",
+			&models.StudioFilterType{
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "string",
+						Modifier: models.CriterionModifierNotMatchesRegex,
+						Value:    []any{"["},
+					},
+				},
+			},
+			nil,
+			nil,
+			true,
+		},
+		{
+			"null",
+			&models.StudioFilterType{
+				Name: &models.StringCriterionInput{
+					Value:    getStudioStringValue(studioIdxWithTwoScenes, "Name"),
+					Modifier: models.CriterionModifierEquals,
+				},
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "not existing",
+						Modifier: models.CriterionModifierIsNull,
+					},
+				},
+			},
+			[]int{studioIdxWithTwoScenes},
+			nil,
+			false,
+		},
+		{
+			"not null",
+			&models.StudioFilterType{
+				Name: &models.StringCriterionInput{
+					Value:    getStudioStringValue(studioIdxWithTwoScenes, "Name"),
+					Modifier: models.CriterionModifierEquals,
+				},
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "string",
+						Modifier: models.CriterionModifierNotNull,
+					},
+				},
+			},
+			[]int{studioIdxWithTwoScenes},
+			nil,
+			false,
+		},
+		{
+			"between",
+			&models.StudioFilterType{
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "real",
+						Modifier: models.CriterionModifierBetween,
+						Value:    []any{0.15, 0.25},
+					},
+				},
+			},
+			[]int{studioIdxWithGroup},
+			nil,
+			false,
+		},
+		{
+			"not between",
+			&models.StudioFilterType{
+				Name: &models.StringCriterionInput{
+					Value:    getStudioStringValue(studioIdxWithGroup, "Name"),
+					Modifier: models.CriterionModifierEquals,
+				},
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "real",
+						Modifier: models.CriterionModifierNotBetween,
+						Value:    []any{0.15, 0.25},
+					},
+				},
+			},
+			nil,
+			[]int{studioIdxWithGroup},
+			false,
+		},
+	}
+
+	for _, tt := range tests {
+		runWithRollbackTxn(t, tt.name, func(t *testing.T, ctx context.Context) {
+			assert := assert.New(t)
+
+			studios, _, err := db.Studio.Query(ctx, tt.filter, nil)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("StudioStore.Query() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+
+			ids := studiesToIDs(studios)
+			include := indexesToIDs(studioIDs, tt.includeIdxs)
+			exclude := indexesToIDs(studioIDs, tt.excludeIdxs)
+
+			for _, i := range include {
+				assert.Contains(ids, i)
+			}
+			for _, e := range exclude {
+				assert.NotContains(ids, e)
+			}
+		})
+	}
+}
+
 // TODO Create
 // TODO Update
 // TODO Destroy
diff --git a/pkg/sqlite/tables.go b/pkg/sqlite/tables.go
index bfc5199fe..f46190a30 100644
--- a/pkg/sqlite/tables.go
+++ b/pkg/sqlite/tables.go
@@ -49,6 +49,7 @@ var (
 	tagsAliasesJoinTable  = goqu.T(tagAliasesTable)
 	tagRelationsJoinTable = goqu.T(tagRelationsTable)
 	tagsStashIDsJoinTable = goqu.T("tag_stash_ids")
+	tagsCustomFieldsTable = goqu.T("tag_custom_fields")
 )
 
 var (
diff --git a/pkg/sqlite/tag.go b/pkg/sqlite/tag.go
index b1d773290..ea18664d9 100644
--- a/pkg/sqlite/tag.go
+++ b/pkg/sqlite/tag.go
@@ -166,6 +166,7 @@ var (
 
 type TagStore struct {
 	blobJoinQueryBuilder
+	customFieldsStore
 
 	tableMgr *table
 }
@@ -176,6 +177,10 @@ func NewTagStore(blobStore *BlobStore) *TagStore {
 			blobStore: blobStore,
 			joinTable: tagTable,
 		},
+		customFieldsStore: customFieldsStore{
+			table: tagsCustomFieldsTable,
+			fk:    tagsCustomFieldsTable.Col(tagIDColumn),
+		},
 		tableMgr: tagTableMgr,
 	}
 }
@@ -188,9 +193,9 @@ func (qb *TagStore) selectDataset() *goqu.SelectDataset {
 	return dialect.From(qb.table()).Select(qb.table().All())
 }
 
-func (qb *TagStore) Create(ctx context.Context, newObject *models.Tag) error {
+func (qb *TagStore) Create(ctx context.Context, newObject *models.CreateTagInput) error {
 	var r tagRow
-	r.fromTag(*newObject)
+	r.fromTag(*newObject.Tag)
 
 	id, err := qb.tableMgr.insertID(ctx, r)
 	if err != nil {
@@ -221,12 +226,17 @@ func (qb *TagStore) Create(ctx context.Context, newObject *models.Tag) error {
 		}
 	}
 
+	const partial = false
+	if err := qb.setCustomFields(ctx, id, newObject.CustomFields, partial); err != nil {
+		return err
+	}
+
 	updated, err := qb.find(ctx, id)
 	if err != nil {
 		return fmt.Errorf("finding after create: %w", err)
 	}
 
-	*newObject = *updated
+	*newObject.Tag = *updated
 
 	return nil
 }
@@ -270,12 +280,16 @@ func (qb *TagStore) UpdatePartial(ctx context.Context, id int, partial models.Ta
 		}
 	}
 
+	if err := qb.SetCustomFields(ctx, id, partial.CustomFields); err != nil {
+		return nil, err
+	}
+
 	return qb.find(ctx, id)
 }
 
-func (qb *TagStore) Update(ctx context.Context, updatedObject *models.Tag) error {
+func (qb *TagStore) Update(ctx context.Context, updatedObject *models.UpdateTagInput) error {
 	var r tagRow
-	r.fromTag(*updatedObject)
+	r.fromTag(*updatedObject.Tag)
 
 	if err := qb.tableMgr.updateByID(ctx, updatedObject.ID, r); err != nil {
 		return err
@@ -305,6 +319,10 @@ func (qb *TagStore) Update(ctx context.Context, updatedObject *models.Tag) error
 		}
 	}
 
+	if err := qb.SetCustomFields(ctx, updatedObject.ID, updatedObject.CustomFields); err != nil {
+		return err
+	}
+
 	return nil
 }
 
diff --git a/pkg/sqlite/tag_filter.go b/pkg/sqlite/tag_filter.go
index dadc351ee..2f4e79149 100644
--- a/pkg/sqlite/tag_filter.go
+++ b/pkg/sqlite/tag_filter.go
@@ -101,6 +101,13 @@ func (qb *tagFilterHandler) criterionHandler() criterionHandler {
 		&timestampCriterionHandler{tagFilter.CreatedAt, "tags.created_at", nil},
 		&timestampCriterionHandler{tagFilter.UpdatedAt, "tags.updated_at", nil},
 
+		&customFieldsFilterHandler{
+			table: tagsCustomFieldsTable.GetTable(),
+			fkCol: tagIDColumn,
+			c:     tagFilter.CustomFields,
+			idCol: "tags.id",
+		},
+
 		&relatedFilterHandler{
 			relatedIDCol:   "scenes_tags.scene_id",
 			relatedRepo:    sceneRepository.repository,
diff --git a/pkg/sqlite/tag_test.go b/pkg/sqlite/tag_test.go
index f1bac19b2..b673de3f9 100644
--- a/pkg/sqlite/tag_test.go
+++ b/pkg/sqlite/tag_test.go
@@ -1012,8 +1012,10 @@ func TestTagUpdateTagImage(t *testing.T) {
 
 		// create tag to test against
 		const name = "TestTagUpdateTagImage"
-		tag := models.Tag{
-			Name: name,
+		tag := models.CreateTagInput{
+			Tag: &models.Tag{
+				Name: name,
+			},
 		}
 		err := qb.Create(ctx, &tag)
 		if err != nil {
@@ -1032,15 +1034,17 @@ func TestTagUpdateAlias(t *testing.T) {
 
 		// create tag to test against
 		const name = "TestTagUpdateAlias"
-		tag := models.Tag{
-			Name: name,
+		tag := models.CreateTagInput{
+			Tag: &models.Tag{
+				Name: name,
+			},
 		}
 		err := qb.Create(ctx, &tag)
 		if err != nil {
 			return fmt.Errorf("Error creating tag: %s", err.Error())
 		}
 
-		aliases := []string{"alias1", "alias2"}
+		aliases := []string{"updatedAlias1", "updatedAlias2"}
 		err = qb.UpdateAliases(ctx, tag.ID, aliases)
 		if err != nil {
 			return fmt.Errorf("Error updating tag aliases: %s", err.Error())
@@ -1065,8 +1069,10 @@ func TestTagStashIDs(t *testing.T) {
 
 		// create tag to test against
 		const name = "TestTagStashIDs"
-		tag := models.Tag{
-			Name: name,
+		tag := models.CreateTagInput{
+			Tag: &models.Tag{
+				Name: name,
+			},
 		}
 		err := qb.Create(ctx, &tag)
 		if err != nil {
@@ -1089,9 +1095,11 @@ func TestTagFindByStashID(t *testing.T) {
 		const name = "TestTagFindByStashID"
 		const stashID = "stashid"
 		const endpoint = "endpoint"
-		tag := models.Tag{
-			Name:     name,
-			StashIDs: models.NewRelatedStashIDs([]models.StashID{{StashID: stashID, Endpoint: endpoint}}),
+		tag := models.CreateTagInput{
+			Tag: &models.Tag{
+				Name:     name,
+				StashIDs: models.NewRelatedStashIDs([]models.StashID{{StashID: stashID, Endpoint: endpoint}}),
+			},
 		}
 		err := qb.Create(ctx, &tag)
 		if err != nil {
@@ -1263,8 +1271,626 @@ func TestTagMerge(t *testing.T) {
 	}
 }
 
-// TODO Create
-// TODO Update
+func loadTagRelationships(ctx context.Context, expected models.Tag, actual *models.Tag) error {
+	if expected.Aliases.Loaded() {
+		if err := actual.LoadAliases(ctx, db.Tag); err != nil {
+			return err
+		}
+	}
+	if expected.ParentIDs.Loaded() {
+		if err := actual.LoadParentIDs(ctx, db.Tag); err != nil {
+			return err
+		}
+	}
+	if expected.ChildIDs.Loaded() {
+		if err := actual.LoadChildIDs(ctx, db.Tag); err != nil {
+			return err
+		}
+	}
+	if expected.StashIDs.Loaded() {
+		if err := actual.LoadStashIDs(ctx, db.Tag); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func Test_TagStore_Create(t *testing.T) {
+	var (
+		name          = "name"
+		sortName      = "sortName"
+		description   = "description"
+		favorite      = true
+		ignoreAutoTag = true
+		aliases       = []string{"alias1", "alias2"}
+		endpoint1     = "endpoint1"
+		endpoint2     = "endpoint2"
+		stashID1      = "stashid1"
+		stashID2      = "stashid2"
+		createdAt     = epochTime
+		updatedAt     = epochTime
+	)
+
+	tests := []struct {
+		name      string
+		newObject models.CreateTagInput
+		wantErr   bool
+	}{
+		{
+			"full",
+			models.CreateTagInput{
+				Tag: &models.Tag{
+					Name:          name,
+					SortName:      sortName,
+					Description:   description,
+					Favorite:      favorite,
+					IgnoreAutoTag: ignoreAutoTag,
+					Aliases:       models.NewRelatedStrings(aliases),
+					ParentIDs:     models.NewRelatedIDs([]int{tagIDs[tagIdxWithScene]}),
+					ChildIDs:      models.NewRelatedIDs([]int{tagIDs[tagIdx1WithScene]}),
+					StashIDs: models.NewRelatedStashIDs([]models.StashID{
+						{
+							StashID:   stashID1,
+							Endpoint:  endpoint1,
+							UpdatedAt: epochTime,
+						},
+						{
+							StashID:   stashID2,
+							Endpoint:  endpoint2,
+							UpdatedAt: epochTime,
+						},
+					}),
+					CreatedAt: createdAt,
+					UpdatedAt: updatedAt,
+				},
+				CustomFields: testCustomFields,
+			},
+			false,
+		},
+		{
+			"invalid parent id",
+			models.CreateTagInput{
+				Tag: &models.Tag{
+					Name:      name,
+					ParentIDs: models.NewRelatedIDs([]int{invalidID}),
+				},
+			},
+			true,
+		},
+		{
+			"invalid child id",
+			models.CreateTagInput{
+				Tag: &models.Tag{
+					Name:     name,
+					ChildIDs: models.NewRelatedIDs([]int{invalidID}),
+				},
+			},
+			true,
+		},
+	}
+
+	qb := db.Tag
+
+	for _, tt := range tests {
+		runWithRollbackTxn(t, tt.name, func(t *testing.T, ctx context.Context) {
+			assert := assert.New(t)
+
+			p := tt.newObject
+			if err := qb.Create(ctx, &p); (err != nil) != tt.wantErr {
+				t.Errorf("TagStore.Create() error = %v, wantErr = %v", err, tt.wantErr)
+			}
+
+			if tt.wantErr {
+				assert.Zero(p.ID)
+				return
+			}
+
+			assert.NotZero(p.ID)
+
+			copy := *tt.newObject.Tag
+			copy.ID = p.ID
+
+			// load relationships
+			if err := loadTagRelationships(ctx, copy, p.Tag); err != nil {
+				t.Errorf("loadTagRelationships() error = %v", err)
+				return
+			}
+
+			assert.Equal(copy, *p.Tag)
+
+			// ensure can find the tag
+			found, err := qb.Find(ctx, p.ID)
+			if err != nil {
+				t.Errorf("TagStore.Find() error = %v", err)
+			}
+
+			if !assert.NotNil(found) {
+				return
+			}
+
+			// load relationships
+			if err := loadTagRelationships(ctx, copy, found); err != nil {
+				t.Errorf("loadTagRelationships() error = %v", err)
+				return
+			}
+			assert.Equal(copy, *found)
+
+			// ensure custom fields are set
+			cf, err := qb.GetCustomFields(ctx, p.ID)
+			if err != nil {
+				t.Errorf("TagStore.GetCustomFields() error = %v", err)
+				return
+			}
+
+			assert.Equal(tt.newObject.CustomFields, cf)
+
+			return
+		})
+	}
+}
+
+func Test_TagStore_Update(t *testing.T) {
+	var (
+		name          = "name"
+		sortName      = "sortName"
+		description   = "description"
+		favorite      = true
+		ignoreAutoTag = true
+		aliases       = []string{"alias1", "alias2"}
+		endpoint1     = "endpoint1"
+		endpoint2     = "endpoint2"
+		stashID1      = "stashid1"
+		stashID2      = "stashid2"
+		createdAt     = epochTime
+		updatedAt     = epochTime
+	)
+
+	tests := []struct {
+		name          string
+		updatedObject models.UpdateTagInput
+		wantErr       bool
+	}{
+		{
+			"full",
+			models.UpdateTagInput{
+				Tag: &models.Tag{
+					ID:            tagIDs[tagIdxWithGallery],
+					Name:          name,
+					SortName:      sortName,
+					Description:   description,
+					Favorite:      favorite,
+					IgnoreAutoTag: ignoreAutoTag,
+					Aliases:       models.NewRelatedStrings(aliases),
+					ParentIDs:     models.NewRelatedIDs([]int{tagIDs[tagIdxWithScene]}),
+					ChildIDs:      models.NewRelatedIDs([]int{tagIDs[tagIdx1WithScene]}),
+					StashIDs: models.NewRelatedStashIDs([]models.StashID{
+						{
+							StashID:   stashID1,
+							Endpoint:  endpoint1,
+							UpdatedAt: epochTime,
+						},
+						{
+							StashID:   stashID2,
+							Endpoint:  endpoint2,
+							UpdatedAt: epochTime,
+						},
+					}),
+					CreatedAt: createdAt,
+					UpdatedAt: updatedAt,
+				},
+				CustomFields: models.CustomFieldsInput{
+					Full: map[string]interface{}{
+						"string": "updated",
+						"int":    int64(999),
+						"real":   9.99,
+					},
+				},
+			},
+			false,
+		},
+		{
+			"set custom fields",
+			models.UpdateTagInput{
+				Tag: &models.Tag{
+					ID:   tagIDs[tagIdxWithGallery],
+					Name: tagNames[tagIdxWithGallery],
+				},
+				CustomFields: models.CustomFieldsInput{
+					Full: testCustomFields,
+				},
+			},
+			false,
+		},
+		{
+			"clear custom fields",
+			models.UpdateTagInput{
+				Tag: &models.Tag{
+					ID:   tagIDs[tagIdxWithGallery],
+					Name: tagNames[tagIdxWithGallery],
+				},
+				CustomFields: models.CustomFieldsInput{
+					Full: map[string]interface{}{},
+				},
+			},
+			false,
+		},
+		{
+			"invalid parent id",
+			models.UpdateTagInput{
+				Tag: &models.Tag{
+					ID:        tagIDs[tagIdxWithGallery],
+					Name:      tagNames[tagIdxWithGallery],
+					ParentIDs: models.NewRelatedIDs([]int{invalidID}),
+				},
+			},
+			true,
+		},
+		{
+			"invalid child id",
+			models.UpdateTagInput{
+				Tag: &models.Tag{
+					ID:       tagIDs[tagIdxWithGallery],
+					Name:     tagNames[tagIdxWithGallery],
+					ChildIDs: models.NewRelatedIDs([]int{invalidID}),
+				},
+			},
+			true,
+		},
+	}
+
+	qb := db.Tag
+
+	for _, tt := range tests {
+		runWithRollbackTxn(t, tt.name, func(t *testing.T, ctx context.Context) {
+			assert := assert.New(t)
+
+			p := tt.updatedObject
+			if err := qb.Update(ctx, &p); (err != nil) != tt.wantErr {
+				t.Errorf("TagStore.Update() error = %v, wantErr = %v", err, tt.wantErr)
+			}
+
+			if tt.wantErr {
+				return
+			}
+
+			s, err := qb.Find(ctx, tt.updatedObject.ID)
+			if err != nil {
+				t.Errorf("TagStore.Find() error = %v", err)
+				return
+			}
+
+			// load relationships
+			if err := loadTagRelationships(ctx, *tt.updatedObject.Tag, s); err != nil {
+				t.Errorf("loadTagRelationships() error = %v", err)
+				return
+			}
+
+			assert.Equal(*tt.updatedObject.Tag, *s)
+
+			// ensure custom fields are correct
+			if tt.updatedObject.CustomFields.Full != nil {
+				cf, err := qb.GetCustomFields(ctx, tt.updatedObject.ID)
+				if err != nil {
+					t.Errorf("TagStore.GetCustomFields() error = %v", err)
+					return
+				}
+
+				assert.Equal(tt.updatedObject.CustomFields.Full, cf)
+			}
+		})
+	}
+}
+
+func Test_TagStore_UpdatePartialCustomFields(t *testing.T) {
+	tests := []struct {
+		name     string
+		id       int
+		partial  models.TagPartial
+		expected map[string]interface{} // nil to use the partial
+	}{
+		{
+			"set custom fields",
+			tagIDs[tagIdxWithGallery],
+			models.TagPartial{
+				CustomFields: models.CustomFieldsInput{
+					Full: testCustomFields,
+				},
+			},
+			nil,
+		},
+		{
+			"clear custom fields",
+			tagIDs[tagIdxWithGallery],
+			models.TagPartial{
+				CustomFields: models.CustomFieldsInput{
+					Full: map[string]interface{}{},
+				},
+			},
+			nil,
+		},
+		{
+			"partial custom fields",
+			tagIDs[tagIdxWithGallery],
+			models.TagPartial{
+				CustomFields: models.CustomFieldsInput{
+					Partial: map[string]interface{}{
+						"string":    "bbb",
+						"new_field": "new",
+					},
+				},
+			},
+			map[string]interface{}{
+				"int":       int64(2),
+				"real":      float64(1.7),
+				"string":    "bbb",
+				"new_field": "new",
+			},
+		},
+	}
+	for _, tt := range tests {
+		qb := db.Tag
+
+		runWithRollbackTxn(t, tt.name, func(t *testing.T, ctx context.Context) {
+			assert := assert.New(t)
+
+			_, err := qb.UpdatePartial(ctx, tt.id, tt.partial)
+			if err != nil {
+				t.Errorf("TagStore.UpdatePartial() error = %v", err)
+				return
+			}
+
+			// ensure custom fields are correct
+			cf, err := qb.GetCustomFields(ctx, tt.id)
+			if err != nil {
+				t.Errorf("TagStore.GetCustomFields() error = %v", err)
+				return
+			}
+			if tt.expected == nil {
+				assert.Equal(tt.partial.CustomFields.Full, cf)
+			} else {
+				assert.Equal(tt.expected, cf)
+			}
+		})
+	}
+}
+
+func TestTagQueryCustomFields(t *testing.T) {
+	tests := []struct {
+		name        string
+		filter      *models.TagFilterType
+		includeIdxs []int
+		excludeIdxs []int
+		wantErr     bool
+	}{
+		{
+			"equals",
+			&models.TagFilterType{
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "string",
+						Modifier: models.CriterionModifierEquals,
+						Value:    []any{getTagStringValue(tagIdxWithGallery, "custom")},
+					},
+				},
+			},
+			[]int{tagIdxWithGallery},
+			nil,
+			false,
+		},
+		{
+			"not equals",
+			&models.TagFilterType{
+				Name: &models.StringCriterionInput{
+					Value:    getTagStringValue(tagIdxWithGallery, "Name"),
+					Modifier: models.CriterionModifierEquals,
+				},
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "string",
+						Modifier: models.CriterionModifierNotEquals,
+						Value:    []any{getTagStringValue(tagIdxWithGallery, "custom")},
+					},
+				},
+			},
+			nil,
+			[]int{tagIdxWithGallery},
+			false,
+		},
+		{
+			"includes",
+			&models.TagFilterType{
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "string",
+						Modifier: models.CriterionModifierIncludes,
+						Value:    []any{getTagStringValue(tagIdxWithGallery, "custom")[9:]},
+					},
+				},
+			},
+			[]int{tagIdxWithGallery},
+			nil,
+			false,
+		},
+		{
+			"excludes",
+			&models.TagFilterType{
+				Name: &models.StringCriterionInput{
+					Value:    getTagStringValue(tagIdxWithGallery, "Name"),
+					Modifier: models.CriterionModifierEquals,
+				},
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "string",
+						Modifier: models.CriterionModifierExcludes,
+						Value:    []any{getTagStringValue(tagIdxWithGallery, "custom")[9:]},
+					},
+				},
+			},
+			nil,
+			[]int{tagIdxWithGallery},
+			false,
+		},
+		{
+			"regex",
+			&models.TagFilterType{
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "string",
+						Modifier: models.CriterionModifierMatchesRegex,
+						Value:    []any{".*17_custom"},
+					},
+				},
+			},
+			[]int{tagIdxWithGallery},
+			nil,
+			false,
+		},
+		{
+			"invalid regex",
+			&models.TagFilterType{
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "string",
+						Modifier: models.CriterionModifierMatchesRegex,
+						Value:    []any{"["},
+					},
+				},
+			},
+			nil,
+			nil,
+			true,
+		},
+		{
+			"not matches regex",
+			&models.TagFilterType{
+				Name: &models.StringCriterionInput{
+					Value:    getTagStringValue(tagIdxWithGallery, "Name"),
+					Modifier: models.CriterionModifierEquals,
+				},
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "string",
+						Modifier: models.CriterionModifierNotMatchesRegex,
+						Value:    []any{".*17_custom"},
+					},
+				},
+			},
+			nil,
+			[]int{tagIdxWithGallery},
+			false,
+		},
+		{
+			"invalid not matches regex",
+			&models.TagFilterType{
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "string",
+						Modifier: models.CriterionModifierNotMatchesRegex,
+						Value:    []any{"["},
+					},
+				},
+			},
+			nil,
+			nil,
+			true,
+		},
+		{
+			"null",
+			&models.TagFilterType{
+				Name: &models.StringCriterionInput{
+					Value:    getTagStringValue(tagIdxWithGallery, "Name"),
+					Modifier: models.CriterionModifierEquals,
+				},
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "not existing",
+						Modifier: models.CriterionModifierIsNull,
+					},
+				},
+			},
+			[]int{tagIdxWithGallery},
+			nil,
+			false,
+		},
+		{
+			"not null",
+			&models.TagFilterType{
+				Name: &models.StringCriterionInput{
+					Value:    getTagStringValue(tagIdxWithGallery, "Name"),
+					Modifier: models.CriterionModifierEquals,
+				},
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "string",
+						Modifier: models.CriterionModifierNotNull,
+					},
+				},
+			},
+			[]int{tagIdxWithGallery},
+			nil,
+			false,
+		},
+		{
+			"between",
+			&models.TagFilterType{
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "real",
+						Modifier: models.CriterionModifierBetween,
+						Value:    []any{0.15, 0.25},
+					},
+				},
+			},
+			[]int{tagIdx2WithScene},
+			nil,
+			false,
+		},
+		{
+			"not between",
+			&models.TagFilterType{
+				Name: &models.StringCriterionInput{
+					Value:    getTagStringValue(tagIdx2WithScene, "Name"),
+					Modifier: models.CriterionModifierEquals,
+				},
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "real",
+						Modifier: models.CriterionModifierNotBetween,
+						Value:    []any{0.15, 0.25},
+					},
+				},
+			},
+			nil,
+			[]int{tagIdx2WithScene},
+			false,
+		},
+	}
+
+	for _, tt := range tests {
+		runWithRollbackTxn(t, tt.name, func(t *testing.T, ctx context.Context) {
+			assert := assert.New(t)
+
+			tags, _, err := db.Tag.Query(ctx, tt.filter, nil)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("TagStore.Query() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+
+			ids := tagsToIDs(tags)
+			include := indexesToIDs(tagIDs, tt.includeIdxs)
+			exclude := indexesToIDs(tagIDs, tt.excludeIdxs)
+
+			for _, i := range include {
+				assert.Contains(ids, i)
+			}
+			for _, e := range exclude {
+				assert.NotContains(ids, e)
+			}
+		})
+	}
+}
+
 // TODO Destroy
 // TODO Find
 // TODO FindBySceneID
diff --git a/pkg/studio/export.go b/pkg/studio/export.go
index 1440c3cdd..c3a50668f 100644
--- a/pkg/studio/export.go
+++ b/pkg/studio/export.go
@@ -17,6 +17,7 @@ type FinderImageStashIDGetter interface {
 	models.URLLoader
 	models.StashIDLoader
 	GetImage(ctx context.Context, studioID int) ([]byte, error)
+	models.CustomFieldsReader
 }
 
 // ToJSON converts a Studio object into its JSON equivalent.
@@ -60,6 +61,12 @@ func ToJSON(ctx context.Context, reader FinderImageStashIDGetter, studio *models
 	}
 	newStudioJSON.StashIDs = studio.StashIDs.List()
 
+	var err error
+	newStudioJSON.CustomFields, err = reader.GetCustomFields(ctx, studio.ID)
+	if err != nil {
+		return nil, fmt.Errorf("getting studio custom fields: %v", err)
+	}
+
 	image, err := reader.GetImage(ctx, studio.ID)
 	if err != nil {
 		logger.Errorf("Error getting studio image: %v", err)
diff --git a/pkg/studio/export_test.go b/pkg/studio/export_test.go
index c333c0ad5..e41e6f36c 100644
--- a/pkg/studio/export_test.go
+++ b/pkg/studio/export_test.go
@@ -18,18 +18,24 @@ const (
 	errImageID            = 3
 	missingParentStudioID = 4
 	errStudioID           = 5
+	customFieldsID        = 6
 
 	parentStudioID    = 10
 	missingStudioID   = 11
 	errParentStudioID = 12
+	errCustomFieldsID = 13
 )
 
 var (
-	studioName       = "testStudio"
-	url              = "url"
-	details          = "details"
-	parentStudioName = "parentStudio"
-	autoTagIgnored   = true
+	studioName        = "testStudio"
+	url               = "url"
+	details           = "details"
+	parentStudioName  = "parentStudio"
+	autoTagIgnored    = true
+	emptyCustomFields = make(map[string]interface{})
+	customFields      = map[string]interface{}{
+		"customField1": "customValue1",
+	}
 )
 
 var studioID = 1
@@ -91,7 +97,7 @@ func createEmptyStudio(id int) models.Studio {
 	}
 }
 
-func createFullJSONStudio(parentStudio, image string, aliases []string) *jsonschema.Studio {
+func createFullJSONStudio(parentStudio, image string, aliases []string, customFields map[string]interface{}) *jsonschema.Studio {
 	return &jsonschema.Studio{
 		Name:     studioName,
 		URLs:     []string{url},
@@ -109,6 +115,7 @@ func createFullJSONStudio(parentStudio, image string, aliases []string) *jsonsch
 		Aliases:       aliases,
 		StashIDs:      stashIDs,
 		IgnoreAutoTag: autoTagIgnored,
+		CustomFields:  customFields,
 	}
 }
 
@@ -120,16 +127,18 @@ func createEmptyJSONStudio() *jsonschema.Studio {
 		UpdatedAt: json.JSONTime{
 			Time: updateTime,
 		},
-		Aliases:  []string{},
-		URLs:     []string{},
-		StashIDs: []models.StashID{},
+		Aliases:      []string{},
+		URLs:         []string{},
+		StashIDs:     []models.StashID{},
+		CustomFields: emptyCustomFields,
 	}
 }
 
 type testScenario struct {
-	input    models.Studio
-	expected *jsonschema.Studio
-	err      bool
+	input        models.Studio
+	customFields map[string]interface{}
+	expected     *jsonschema.Studio
+	err          bool
 }
 
 var scenarios []testScenario
@@ -138,30 +147,48 @@ func initTestTable() {
 	scenarios = []testScenario{
 		{
 			createFullStudio(studioID, parentStudioID),
-			createFullJSONStudio(parentStudioName, image, []string{"alias"}),
+			emptyCustomFields,
+			createFullJSONStudio(parentStudioName, image, []string{"alias"}, emptyCustomFields),
+			false,
+		},
+		{
+			createFullStudio(customFieldsID, parentStudioID),
+			customFields,
+			createFullJSONStudio(parentStudioName, image, []string{"alias"}, customFields),
 			false,
 		},
 		{
 			createEmptyStudio(noImageID),
+			emptyCustomFields,
 			createEmptyJSONStudio(),
 			false,
 		},
 		{
 			createFullStudio(errImageID, parentStudioID),
-			createFullJSONStudio(parentStudioName, "", []string{"alias"}),
+			emptyCustomFields,
+			createFullJSONStudio(parentStudioName, "", []string{"alias"}, emptyCustomFields),
 			// failure to get image is not an error
 			false,
 		},
 		{
 			createFullStudio(missingParentStudioID, missingStudioID),
-			createFullJSONStudio("", image, []string{"alias"}),
+			emptyCustomFields,
+			createFullJSONStudio("", image, []string{"alias"}, emptyCustomFields),
 			false,
 		},
 		{
 			createFullStudio(errStudioID, errParentStudioID),
+			emptyCustomFields,
 			nil,
 			true,
 		},
+		{
+			createFullStudio(errCustomFieldsID, parentStudioID),
+			customFields,
+			nil,
+			// failure to get custom fields should cause an error
+			true,
+		},
 	}
 }
 
@@ -177,6 +204,7 @@ func TestToJSON(t *testing.T) {
 	db.Studio.On("GetImage", testCtx, errImageID).Return(nil, imageErr).Once()
 	db.Studio.On("GetImage", testCtx, missingParentStudioID).Return(imageBytes, nil).Maybe()
 	db.Studio.On("GetImage", testCtx, errStudioID).Return(imageBytes, nil).Maybe()
+	db.Studio.On("GetImage", testCtx, customFieldsID).Return(imageBytes, nil).Once()
 
 	parentStudioErr := errors.New("error getting parent studio")
 
@@ -184,6 +212,15 @@ func TestToJSON(t *testing.T) {
 	db.Studio.On("Find", testCtx, missingStudioID).Return(nil, nil)
 	db.Studio.On("Find", testCtx, errParentStudioID).Return(nil, parentStudioErr)
 
+	customFieldsErr := errors.New("error getting custom fields")
+
+	db.Studio.On("GetCustomFields", testCtx, studioID).Return(emptyCustomFields, nil).Once()
+	db.Studio.On("GetCustomFields", testCtx, customFieldsID).Return(customFields, nil).Once()
+	db.Studio.On("GetCustomFields", testCtx, missingParentStudioID).Return(emptyCustomFields, nil).Once()
+	db.Studio.On("GetCustomFields", testCtx, noImageID).Return(emptyCustomFields, nil).Once()
+	db.Studio.On("GetCustomFields", testCtx, errImageID).Return(emptyCustomFields, nil).Once()
+	db.Studio.On("GetCustomFields", testCtx, errCustomFieldsID).Return(nil, customFieldsErr).Once()
+
 	for i, s := range scenarios {
 		studio := s.input
 		json, err := ToJSON(testCtx, db.Studio, &studio)
diff --git a/pkg/studio/import.go b/pkg/studio/import.go
index d5284ce02..d9e52100c 100644
--- a/pkg/studio/import.go
+++ b/pkg/studio/import.go
@@ -26,13 +26,15 @@ type Importer struct {
 	Input               jsonschema.Studio
 	MissingRefBehaviour models.ImportMissingRefEnum
 
-	ID        int
-	studio    models.Studio
-	imageData []byte
+	ID           int
+	studio       models.Studio
+	customFields models.CustomFieldMap
+	imageData    []byte
 }
 
 func (i *Importer) PreImport(ctx context.Context) error {
 	i.studio = studioJSONtoStudio(i.Input)
+	i.customFields = i.Input.CustomFields
 
 	if err := i.populateParentStudio(ctx); err != nil {
 		return err
@@ -110,7 +112,9 @@ func createTags(ctx context.Context, tagWriter models.TagFinderCreator, names []
 		newTag := models.NewTag()
 		newTag.Name = name
 
-		err := tagWriter.Create(ctx, &newTag)
+		err := tagWriter.Create(ctx, &models.CreateTagInput{
+			Tag: &newTag,
+		})
 		if err != nil {
 			return nil, err
 		}
@@ -194,7 +198,10 @@ func (i *Importer) FindExistingID(ctx context.Context) (*int, error) {
 }
 
 func (i *Importer) Create(ctx context.Context) (*int, error) {
-	err := i.ReaderWriter.Create(ctx, &models.CreateStudioInput{Studio: &i.studio})
+	err := i.ReaderWriter.Create(ctx, &models.CreateStudioInput{
+		Studio:       &i.studio,
+		CustomFields: i.customFields,
+	})
 	if err != nil {
 		return nil, fmt.Errorf("error creating studio: %v", err)
 	}
@@ -206,7 +213,12 @@ func (i *Importer) Create(ctx context.Context) (*int, error) {
 func (i *Importer) Update(ctx context.Context, id int) error {
 	studio := i.studio
 	studio.ID = id
-	err := i.ReaderWriter.Update(ctx, &models.UpdateStudioInput{Studio: &studio})
+	err := i.ReaderWriter.Update(ctx, &models.UpdateStudioInput{
+		Studio: &studio,
+		CustomFields: models.CustomFieldsInput{
+			Full: i.customFields,
+		},
+	})
 	if err != nil {
 		return fmt.Errorf("error updating existing studio: %v", err)
 	}
diff --git a/pkg/studio/import_test.go b/pkg/studio/import_test.go
index 6648ebe0d..4eb757293 100644
--- a/pkg/studio/import_test.go
+++ b/pkg/studio/import_test.go
@@ -62,7 +62,7 @@ func TestImporterPreImport(t *testing.T) {
 
 	assert.Nil(t, err)
 
-	i.Input = *createFullJSONStudio(studioName, image, []string{"alias"})
+	i.Input = *createFullJSONStudio(studioName, image, []string{"alias"}, customFields)
 	i.Input.ParentStudio = ""
 
 	err = i.PreImport(testCtx)
@@ -71,6 +71,7 @@ func TestImporterPreImport(t *testing.T) {
 	expectedStudio := createFullStudio(0, 0)
 	expectedStudio.ParentID = nil
 	assert.Equal(t, expectedStudio, i.studio)
+	assert.Equal(t, models.CustomFieldMap(customFields), i.customFields)
 }
 
 func TestImporterPreImportWithTag(t *testing.T) {
@@ -121,9 +122,9 @@ func TestImporterPreImportWithMissingTag(t *testing.T) {
 	}
 
 	db.Tag.On("FindByNames", testCtx, []string{missingTagName}, false).Return(nil, nil).Times(3)
-	db.Tag.On("Create", testCtx, mock.AnythingOfType("*models.Tag")).Run(func(args mock.Arguments) {
-		t := args.Get(1).(*models.Tag)
-		t.ID = existingTagID
+	db.Tag.On("Create", testCtx, mock.AnythingOfType("*models.CreateTagInput")).Run(func(args mock.Arguments) {
+		t := args.Get(1).(*models.CreateTagInput)
+		t.Tag.ID = existingTagID
 	}).Return(nil)
 
 	err := i.PreImport(testCtx)
@@ -156,7 +157,7 @@ func TestImporterPreImportWithMissingTagCreateErr(t *testing.T) {
 	}
 
 	db.Tag.On("FindByNames", testCtx, []string{missingTagName}, false).Return(nil, nil).Once()
-	db.Tag.On("Create", testCtx, mock.AnythingOfType("*models.Tag")).Return(errors.New("Create error"))
+	db.Tag.On("Create", testCtx, mock.AnythingOfType("*models.CreateTagInput")).Return(errors.New("Create error"))
 
 	err := i.PreImport(testCtx)
 	assert.NotNil(t, err)
diff --git a/pkg/tag/export.go b/pkg/tag/export.go
index b07418667..fc7115209 100644
--- a/pkg/tag/export.go
+++ b/pkg/tag/export.go
@@ -16,6 +16,7 @@ type FinderAliasImageGetter interface {
 	GetAliases(ctx context.Context, studioID int) ([]string, error)
 	GetImage(ctx context.Context, tagID int) ([]byte, error)
 	FindByChildTagID(ctx context.Context, childID int) ([]*models.Tag, error)
+	GetCustomFields(ctx context.Context, id int) (map[string]interface{}, error)
 	models.StashIDLoader
 }
 
@@ -63,6 +64,11 @@ func ToJSON(ctx context.Context, reader FinderAliasImageGetter, tag *models.Tag)
 
 	newTagJSON.Parents = GetNames(parents)
 
+	newTagJSON.CustomFields, err = reader.GetCustomFields(ctx, tag.ID)
+	if err != nil {
+		return nil, fmt.Errorf("getting tag custom fields: %v", err)
+	}
+
 	return &newTagJSON, nil
 }
 
diff --git a/pkg/tag/export_test.go b/pkg/tag/export_test.go
index 84e082f30..cba2d4ebf 100644
--- a/pkg/tag/export_test.go
+++ b/pkg/tag/export_test.go
@@ -14,12 +14,14 @@ import (
 )
 
 const (
-	tagID         = 1
-	noImageID     = 2
-	errImageID    = 3
-	errAliasID    = 4
-	withParentsID = 5
-	errParentsID  = 6
+	tagID = iota + 1
+	customFieldsID
+	noImageID
+	errImageID
+	errAliasID
+	withParentsID
+	errParentsID
+	errCustomFieldsID
 )
 
 const (
@@ -32,6 +34,11 @@ var (
 	autoTagIgnored = true
 	createTime     = time.Date(2001, 01, 01, 0, 0, 0, 0, time.UTC)
 	updateTime     = time.Date(2002, 01, 01, 0, 0, 0, 0, time.UTC)
+
+	emptyCustomFields = make(map[string]interface{})
+	customFields      = map[string]interface{}{
+		"customField1": "customValue1",
+	}
 )
 
 func createTag(id int) models.Tag {
@@ -47,8 +54,8 @@ func createTag(id int) models.Tag {
 	}
 }
 
-func createJSONTag(aliases []string, image string, parents []string) *jsonschema.Tag {
-	return &jsonschema.Tag{
+func createJSONTag(aliases []string, image string, parents []string, withCustomFields bool) *jsonschema.Tag {
+	ret := &jsonschema.Tag{
 		Name:          tagName,
 		SortName:      sortName,
 		Favorite:      true,
@@ -61,15 +68,23 @@ func createJSONTag(aliases []string, image string, parents []string) *jsonschema
 		UpdatedAt: json.JSONTime{
 			Time: updateTime,
 		},
-		Image:   image,
-		Parents: parents,
+		Image:        image,
+		Parents:      parents,
+		CustomFields: emptyCustomFields,
 	}
+
+	if withCustomFields {
+		ret.CustomFields = customFields
+	}
+
+	return ret
 }
 
 type testScenario struct {
-	tag      models.Tag
-	expected *jsonschema.Tag
-	err      bool
+	tag          models.Tag
+	customFields map[string]interface{}
+	expected     *jsonschema.Tag
+	err          bool
 }
 
 var scenarios []testScenario
@@ -78,32 +93,50 @@ func initTestTable() {
 	scenarios = []testScenario{
 		{
 			createTag(tagID),
-			createJSONTag([]string{"alias"}, image, nil),
+			emptyCustomFields,
+			createJSONTag([]string{"alias"}, image, nil, false),
+			false,
+		},
+		{
+			createTag(customFieldsID),
+			customFields,
+			createJSONTag([]string{"alias"}, image, nil, true),
 			false,
 		},
 		{
 			createTag(noImageID),
-			createJSONTag(nil, "", nil),
+			emptyCustomFields,
+			createJSONTag(nil, "", nil, false),
 			false,
 		},
 		{
 			createTag(errImageID),
-			createJSONTag(nil, "", nil),
+			emptyCustomFields,
+			createJSONTag(nil, "", nil, false),
 			// getting the image should not cause an error
 			false,
 		},
 		{
 			createTag(errAliasID),
+			emptyCustomFields,
 			nil,
 			true,
 		},
 		{
 			createTag(withParentsID),
-			createJSONTag(nil, image, []string{"parent"}),
+			emptyCustomFields,
+			createJSONTag(nil, image, []string{"parent"}, false),
 			false,
 		},
 		{
 			createTag(errParentsID),
+			emptyCustomFields,
+			nil,
+			true,
+		},
+		{
+			createTag(errCustomFieldsID),
+			customFields,
 			nil,
 			true,
 		},
@@ -118,32 +151,48 @@ func TestToJSON(t *testing.T) {
 	imageErr := errors.New("error getting image")
 	aliasErr := errors.New("error getting aliases")
 	parentsErr := errors.New("error getting parents")
+	customFieldsErr := errors.New("error getting custom fields")
 
 	db.Tag.On("GetAliases", testCtx, tagID).Return([]string{"alias"}, nil).Once()
+	db.Tag.On("GetAliases", testCtx, customFieldsID).Return([]string{"alias"}, nil).Once()
 	db.Tag.On("GetAliases", testCtx, noImageID).Return(nil, nil).Once()
 	db.Tag.On("GetAliases", testCtx, errImageID).Return(nil, nil).Once()
 	db.Tag.On("GetAliases", testCtx, errAliasID).Return(nil, aliasErr).Once()
 	db.Tag.On("GetAliases", testCtx, withParentsID).Return(nil, nil).Once()
 	db.Tag.On("GetAliases", testCtx, errParentsID).Return(nil, nil).Once()
+	db.Tag.On("GetAliases", testCtx, errCustomFieldsID).Return(nil, nil).Once()
 
 	db.Tag.On("GetStashIDs", testCtx, tagID).Return(nil, nil).Once()
+	db.Tag.On("GetStashIDs", testCtx, customFieldsID).Return(nil, nil).Once()
 	db.Tag.On("GetStashIDs", testCtx, noImageID).Return(nil, nil).Once()
 	db.Tag.On("GetStashIDs", testCtx, errImageID).Return(nil, nil).Once()
 	// errAliasID test fails before GetStashIDs is called, so no mock needed
 	db.Tag.On("GetStashIDs", testCtx, withParentsID).Return(nil, nil).Once()
 	db.Tag.On("GetStashIDs", testCtx, errParentsID).Return(nil, nil).Once()
+	db.Tag.On("GetStashIDs", testCtx, errCustomFieldsID).Return(nil, nil).Once()
 
 	db.Tag.On("GetImage", testCtx, tagID).Return(imageBytes, nil).Once()
+	db.Tag.On("GetImage", testCtx, customFieldsID).Return(imageBytes, nil).Once()
 	db.Tag.On("GetImage", testCtx, noImageID).Return(nil, nil).Once()
 	db.Tag.On("GetImage", testCtx, errImageID).Return(nil, imageErr).Once()
 	db.Tag.On("GetImage", testCtx, withParentsID).Return(imageBytes, nil).Once()
 	db.Tag.On("GetImage", testCtx, errParentsID).Return(nil, nil).Once()
+	db.Tag.On("GetImage", testCtx, errCustomFieldsID).Return(nil, nil).Once()
 
 	db.Tag.On("FindByChildTagID", testCtx, tagID).Return(nil, nil).Once()
+	db.Tag.On("FindByChildTagID", testCtx, customFieldsID).Return(nil, nil).Once()
 	db.Tag.On("FindByChildTagID", testCtx, noImageID).Return(nil, nil).Once()
 	db.Tag.On("FindByChildTagID", testCtx, withParentsID).Return([]*models.Tag{{Name: "parent"}}, nil).Once()
 	db.Tag.On("FindByChildTagID", testCtx, errParentsID).Return(nil, parentsErr).Once()
 	db.Tag.On("FindByChildTagID", testCtx, errImageID).Return(nil, nil).Once()
+	db.Tag.On("FindByChildTagID", testCtx, errCustomFieldsID).Return(nil, nil).Once()
+
+	db.Tag.On("GetCustomFields", testCtx, tagID).Return(emptyCustomFields, nil).Once()
+	db.Tag.On("GetCustomFields", testCtx, customFieldsID).Return(customFields, nil).Once()
+	db.Tag.On("GetCustomFields", testCtx, noImageID).Return(emptyCustomFields, nil).Once()
+	db.Tag.On("GetCustomFields", testCtx, errImageID).Return(emptyCustomFields, nil).Once()
+	db.Tag.On("GetCustomFields", testCtx, withParentsID).Return(emptyCustomFields, nil).Once()
+	db.Tag.On("GetCustomFields", testCtx, errCustomFieldsID).Return(nil, customFieldsErr).Once()
 
 	for i, s := range scenarios {
 		tag := s.tag
diff --git a/pkg/tag/import.go b/pkg/tag/import.go
index 53b741886..501dc6795 100644
--- a/pkg/tag/import.go
+++ b/pkg/tag/import.go
@@ -31,8 +31,9 @@ type Importer struct {
 	Input               jsonschema.Tag
 	MissingRefBehaviour models.ImportMissingRefEnum
 
-	tag       models.Tag
-	imageData []byte
+	tag          models.Tag
+	imageData    []byte
+	customFields map[string]interface{}
 }
 
 func (i *Importer) PreImport(ctx context.Context) error {
@@ -55,6 +56,8 @@ func (i *Importer) PreImport(ctx context.Context) error {
 		}
 	}
 
+	i.customFields = i.Input.CustomFields
+
 	return nil
 }
 
@@ -78,6 +81,14 @@ func (i *Importer) PostImport(ctx context.Context, id int) error {
 		return fmt.Errorf("error setting parents: %v", err)
 	}
 
+	if len(i.customFields) > 0 {
+		if err := i.ReaderWriter.SetCustomFields(ctx, id, models.CustomFieldsInput{
+			Full: i.customFields,
+		}); err != nil {
+			return fmt.Errorf("error setting tag custom fields: %v", err)
+		}
+	}
+
 	return nil
 }
 
@@ -101,7 +112,10 @@ func (i *Importer) FindExistingID(ctx context.Context) (*int, error) {
 }
 
 func (i *Importer) Create(ctx context.Context) (*int, error) {
-	err := i.ReaderWriter.Create(ctx, &i.tag)
+	err := i.ReaderWriter.Create(ctx, &models.CreateTagInput{
+		Tag:          &i.tag,
+		CustomFields: i.customFields,
+	})
 	if err != nil {
 		return nil, fmt.Errorf("error creating tag: %v", err)
 	}
@@ -113,7 +127,12 @@ func (i *Importer) Create(ctx context.Context) (*int, error) {
 func (i *Importer) Update(ctx context.Context, id int) error {
 	tag := i.tag
 	tag.ID = id
-	err := i.ReaderWriter.Update(ctx, &tag)
+	err := i.ReaderWriter.Update(ctx, &models.UpdateTagInput{
+		Tag: &tag,
+		CustomFields: models.CustomFieldsInput{
+			Full: i.customFields,
+		},
+	})
 	if err != nil {
 		return fmt.Errorf("error updating existing tag: %v", err)
 	}
@@ -157,7 +176,9 @@ func (i *Importer) createParent(ctx context.Context, name string) (int, error) {
 	newTag := models.NewTag()
 	newTag.Name = name
 
-	err := i.ReaderWriter.Create(ctx, &newTag)
+	err := i.ReaderWriter.Create(ctx, &models.CreateTagInput{
+		Tag: &newTag,
+	})
 	if err != nil {
 		return 0, err
 	}
diff --git a/pkg/tag/import_test.go b/pkg/tag/import_test.go
index b706c4937..f6eaec88a 100644
--- a/pkg/tag/import_test.go
+++ b/pkg/tag/import_test.go
@@ -154,14 +154,14 @@ func TestImporterPostImportParentMissing(t *testing.T) {
 	db.Tag.On("UpdateParentTags", testCtx, ignoreID, emptyParents).Return(nil).Once()
 	db.Tag.On("UpdateParentTags", testCtx, ignoreFoundID, []int{103}).Return(nil).Once()
 
-	db.Tag.On("Create", testCtx, mock.MatchedBy(func(t *models.Tag) bool {
-		return t.Name == "Create"
+	db.Tag.On("Create", testCtx, mock.MatchedBy(func(input *models.CreateTagInput) bool {
+		return input.Tag.Name == "Create"
 	})).Run(func(args mock.Arguments) {
-		t := args.Get(1).(*models.Tag)
-		t.ID = 100
+		input := args.Get(1).(*models.CreateTagInput)
+		input.Tag.ID = 100
 	}).Return(nil).Once()
-	db.Tag.On("Create", testCtx, mock.MatchedBy(func(t *models.Tag) bool {
-		return t.Name == "CreateError"
+	db.Tag.On("Create", testCtx, mock.MatchedBy(func(input *models.CreateTagInput) bool {
+		return input.Tag.Name == "CreateError"
 	})).Return(errors.New("failed creating parent")).Once()
 
 	i.MissingRefBehaviour = models.ImportMissingRefEnumCreate
@@ -261,11 +261,15 @@ func TestCreate(t *testing.T) {
 	}
 
 	errCreate := errors.New("Create error")
-	db.Tag.On("Create", testCtx, &tag).Run(func(args mock.Arguments) {
-		t := args.Get(1).(*models.Tag)
-		t.ID = tagID
+	db.Tag.On("Create", testCtx, mock.MatchedBy(func(input *models.CreateTagInput) bool {
+		return input.Tag.Name == tag.Name
+	})).Run(func(args mock.Arguments) {
+		input := args.Get(1).(*models.CreateTagInput)
+		input.Tag.ID = tagID
 	}).Return(nil).Once()
-	db.Tag.On("Create", testCtx, &tagErr).Return(errCreate).Once()
+	db.Tag.On("Create", testCtx, mock.MatchedBy(func(input *models.CreateTagInput) bool {
+		return input.Tag.Name == tagErr.Name
+	})).Return(errCreate).Once()
 
 	id, err := i.Create(testCtx)
 	assert.Equal(t, tagID, *id)
@@ -299,7 +303,10 @@ func TestUpdate(t *testing.T) {
 
 	// id needs to be set for the mock input
 	tag.ID = tagID
-	db.Tag.On("Update", testCtx, &tag).Return(nil).Once()
+	tagInput := models.UpdateTagInput{
+		Tag: &tag,
+	}
+	db.Tag.On("Update", testCtx, &tagInput).Return(nil).Once()
 
 	err := i.Update(testCtx, tagID)
 	assert.Nil(t, err)
@@ -308,7 +315,10 @@ func TestUpdate(t *testing.T) {
 
 	// need to set id separately
 	tagErr.ID = errImageID
-	db.Tag.On("Update", testCtx, &tagErr).Return(errUpdate).Once()
+	errInput := models.UpdateTagInput{
+		Tag: &tagErr,
+	}
+	db.Tag.On("Update", testCtx, &errInput).Return(errUpdate).Once()
 
 	err = i.Update(testCtx, errImageID)
 	assert.NotNil(t, err)

From 2b38361a26f516825c734fb13ae52f8d70c10b3e Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Fri, 6 Feb 2026 12:36:56 +1100
Subject: [PATCH 281/405] Revamp performer list with sidebar (#6547)

* Add favourite filter
* Add gender sidebar filter
* Remove new performer button from navbar
---
 .../GroupDetails/GroupPerformersPanel.tsx     |   4 +-
 .../List/Filters/LabeledIdFilter.tsx          |   2 +-
 .../components/List/Filters/OptionFilter.tsx  | 151 +++-
 .../components/List/ListOperationButtons.tsx  |   2 +-
 ui/v2.5/src/components/MainNavbar.tsx         |   1 -
 .../performerAppearsWithPanel.tsx             |   4 +-
 .../components/Performers/PerformerList.tsx   | 674 +++++++++++++-----
 .../src/components/Performers/Performers.tsx  |   4 +-
 .../StudioDetails/StudioPerformersPanel.tsx   |   4 +-
 .../Tags/TagDetails/TagPerformersPanel.tsx    |   4 +-
 10 files changed, 638 insertions(+), 212 deletions(-)

diff --git a/ui/v2.5/src/components/Groups/GroupDetails/GroupPerformersPanel.tsx b/ui/v2.5/src/components/Groups/GroupDetails/GroupPerformersPanel.tsx
index 057b99f2a..3ec78084a 100644
--- a/ui/v2.5/src/components/Groups/GroupDetails/GroupPerformersPanel.tsx
+++ b/ui/v2.5/src/components/Groups/GroupDetails/GroupPerformersPanel.tsx
@@ -1,7 +1,7 @@
 import React from "react";
 import * as GQL from "src/core/generated-graphql";
 import { useGroupFilterHook } from "src/core/groups";
-import { PerformerList } from "src/components/Performers/PerformerList";
+import { FilteredPerformerList } from "src/components/Performers/PerformerList";
 import { View } from "src/components/List/views";
 
 interface IGroupPerformersPanel {
@@ -18,7 +18,7 @@ export const GroupPerformersPanel: React.FC<IGroupPerformersPanel> = ({
   const filterHook = useGroupFilterHook(group, showChildGroupContent);
 
   return (
-    <PerformerList
+    <FilteredPerformerList
       filterHook={filterHook}
       alterQuery={active}
       view={View.GroupPerformers}
diff --git a/ui/v2.5/src/components/List/Filters/LabeledIdFilter.tsx b/ui/v2.5/src/components/List/Filters/LabeledIdFilter.tsx
index 4012ff628..d621d85bd 100644
--- a/ui/v2.5/src/components/List/Filters/LabeledIdFilter.tsx
+++ b/ui/v2.5/src/components/List/Filters/LabeledIdFilter.tsx
@@ -84,7 +84,7 @@ export const LabeledIdFilter: React.FC<ILabeledIdFilterProps> = ({
   );
 };
 
-type ModifierValue = "any" | "none" | "any_of" | "only" | "include_subs";
+export type ModifierValue = "any" | "none" | "any_of" | "only" | "include_subs";
 
 export function getModifierCandidates(props: {
   modifier: CriterionModifier;
diff --git a/ui/v2.5/src/components/List/Filters/OptionFilter.tsx b/ui/v2.5/src/components/List/Filters/OptionFilter.tsx
index d9cfaf733..6753df09d 100644
--- a/ui/v2.5/src/components/List/Filters/OptionFilter.tsx
+++ b/ui/v2.5/src/components/List/Filters/OptionFilter.tsx
@@ -1,10 +1,20 @@
 import cloneDeep from "lodash-es/cloneDeep";
-import React from "react";
+import React, { useMemo } from "react";
 import { Form } from "react-bootstrap";
 import {
   CriterionValue,
   ModifierCriterion,
+  ModifierCriterionOption,
 } from "src/models/list-filter/criteria/criterion";
+import { ListFilterModel } from "src/models/list-filter/filter";
+import { Option, SidebarListFilter } from "./SidebarListFilter";
+import { CriterionModifier } from "src/core/generated-graphql";
+import {
+  getModifierCandidates,
+  ModifierValue,
+  modifierValueToModifier,
+} from "./LabeledIdFilter";
+import { useIntl } from "react-intl";
 
 interface IOptionsFilter {
   criterion: ModifierCriterion<CriterionValue>;
@@ -83,3 +93,142 @@ export const OptionListFilter: React.FC<IOptionsListFilter> = ({
     </div>
   );
 };
+
+interface ISidebarFilter {
+  title?: React.ReactNode;
+  option: ModifierCriterionOption;
+  filter: ListFilterModel;
+  setFilter: (f: ListFilterModel) => void;
+  sectionID?: string;
+}
+
+export const SidebarOptionFilter: React.FC<ISidebarFilter> = ({
+  title,
+  option,
+  filter,
+  setFilter,
+  sectionID,
+}) => {
+  const intl = useIntl();
+
+  const criteria = filter.criteriaFor(
+    option.type
+  ) as ModifierCriterion<CriterionValue>[];
+  const criterion = criteria.length > 0 ? criteria[0] : null;
+  const { options: criterionOptions = [] } = option;
+  const currentValues = criteria.flatMap((c) => c.value as string[]);
+
+  const hasNullModifiers =
+    option.modifierOptions.includes(CriterionModifier.IsNull) &&
+    option.modifierOptions.includes(CriterionModifier.NotNull);
+
+  const selected: Option[] = useMemo(() => {
+    if (!criterion) return [];
+
+    if (criterion.modifier === CriterionModifier.IsNull) {
+      return [
+        {
+          id: "none",
+          label: intl.formatMessage({ id: "criterion_modifier_values.none" }),
+        },
+      ];
+    } else if (criterion.modifier === CriterionModifier.NotNull) {
+      return [
+        {
+          id: "any",
+          label: intl.formatMessage({ id: "criterion_modifier_values.any" }),
+        },
+      ];
+    }
+
+    return criterionOptions
+      .filter((o) => currentValues.includes(o.toString()))
+      .map((o) => ({
+        id: o.toString(),
+        label: o.toLocaleString(),
+      }));
+  }, [criterion, currentValues, criterionOptions, intl]);
+
+  const modifierCandidates: Option[] = useMemo(() => {
+    if (!hasNullModifiers) return [];
+
+    const c = getModifierCandidates({
+      modifier: criterion?.modifier ?? option.defaultModifier,
+      defaultModifier: option.defaultModifier,
+      hasExcluded: false,
+      hasSelected: selected.length > 0,
+      singleValue: true, // so that it doesn't include any_of
+    });
+
+    return c.map((v) => {
+      const messageID = `criterion_modifier_values.${v}`;
+
+      return {
+        id: v,
+        label: `(${intl.formatMessage({
+          id: messageID,
+        })})`,
+        className: "modifier-object",
+        canExclude: false,
+      };
+    });
+  }, [criterion, option, selected, hasNullModifiers, intl]);
+
+  const options = useMemo(() => {
+    const o = criterionOptions
+      .filter((oo) => !currentValues.includes(oo.toString()))
+      .map((oo) => ({
+        id: oo.toString(),
+        label: oo.toString(),
+      }));
+
+    return [...modifierCandidates, ...o];
+  }, [criterionOptions, currentValues, modifierCandidates]);
+
+  function onSelect(item: Option) {
+    const newCriterion = criterion ? criterion.clone() : option.makeCriterion();
+
+    if (item.className === "modifier-object") {
+      newCriterion.modifier = modifierValueToModifier(item.id as ModifierValue);
+      newCriterion.value = [];
+      setFilter(filter.replaceCriteria(option.type, [newCriterion]));
+      return;
+    }
+
+    const cv = newCriterion.value as string[];
+    if (cv.includes(item.id)) {
+      return;
+    } else {
+      newCriterion.value = [...cv, item.id];
+    }
+
+    setFilter(filter.replaceCriteria(option.type, [newCriterion]));
+  }
+
+  function onUnselect(item: Option) {
+    if (item.className === "modifier-object") {
+      const newCriterion = criterion
+        ? criterion.clone()
+        : option.makeCriterion();
+      newCriterion.modifier = option.defaultModifier;
+      setFilter(filter.replaceCriteria(option.type, [newCriterion]));
+      return;
+    }
+
+    setFilter(filter.removeCriterion(option.type));
+  }
+
+  return (
+    <>
+      <SidebarListFilter
+        title={title}
+        candidates={options}
+        onSelect={onSelect}
+        onUnselect={onUnselect}
+        selected={selected}
+        singleValue
+        sectionID={sectionID}
+      />
+    </>
+  );
+};
diff --git a/ui/v2.5/src/components/List/ListOperationButtons.tsx b/ui/v2.5/src/components/List/ListOperationButtons.tsx
index 314c28bf8..c214a947a 100644
--- a/ui/v2.5/src/components/List/ListOperationButtons.tsx
+++ b/ui/v2.5/src/components/List/ListOperationButtons.tsx
@@ -268,7 +268,7 @@ export const ListOperationButtons: React.FC<IListOperationButtonsProps> = ({
   );
 };
 
-interface IListOperations {
+export interface IListOperations {
   text: string;
   onClick: () => void;
   isDisplayed?: () => boolean;
diff --git a/ui/v2.5/src/components/MainNavbar.tsx b/ui/v2.5/src/components/MainNavbar.tsx
index ac1be2c13..a73a3078b 100644
--- a/ui/v2.5/src/components/MainNavbar.tsx
+++ b/ui/v2.5/src/components/MainNavbar.tsx
@@ -139,7 +139,6 @@ const allMenuItems: IMenuItem[] = [
     href: "/performers",
     icon: faUser,
     hotkey: "g p",
-    userCreatable: true,
   },
   {
     name: "studios",
diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/performerAppearsWithPanel.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/performerAppearsWithPanel.tsx
index 913d16625..b6973bf83 100644
--- a/ui/v2.5/src/components/Performers/PerformerDetails/performerAppearsWithPanel.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerDetails/performerAppearsWithPanel.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import * as GQL from "src/core/generated-graphql";
-import { PerformerList } from "src/components/Performers/PerformerList";
+import { FilteredPerformerList } from "src/components/Performers/PerformerList";
 import { usePerformerFilterHook } from "src/core/performers";
 import { View } from "src/components/List/views";
 import { PatchComponent } from "src/patch";
@@ -24,7 +24,7 @@ export const PerformerAppearsWithPanel: React.FC<IPerformerDetailsProps> =
     const filterHook = usePerformerFilterHook(performer);
 
     return (
-      <PerformerList
+      <FilteredPerformerList
         filterHook={filterHook}
         extraCriteria={extraCriteria}
         alterQuery={active}
diff --git a/ui/v2.5/src/components/Performers/PerformerList.tsx b/ui/v2.5/src/components/Performers/PerformerList.tsx
index ef465fb38..12c4b6952 100644
--- a/ui/v2.5/src/components/Performers/PerformerList.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerList.tsx
@@ -1,7 +1,7 @@
 import cloneDeep from "lodash-es/cloneDeep";
-import React, { useState } from "react";
-import { useIntl } from "react-intl";
-import { useHistory } from "react-router-dom";
+import React, { useCallback, useEffect } from "react";
+import { FormattedMessage, useIntl } from "react-intl";
+import { useHistory, useLocation } from "react-router-dom";
 import Mousetrap from "mousetrap";
 import * as GQL from "src/core/generated-graphql";
 import {
@@ -9,7 +9,7 @@ import {
   useFindPerformers,
   usePerformersDestroy,
 } from "src/core/StashService";
-import { ItemList, ItemListContext, showWhenSelected } from "../List/ItemList";
+import { useFilteredItemList } from "../List/ItemList";
 import { ListFilterModel } from "src/models/list-filter/filter";
 import { DisplayMode } from "src/models/list-filter/types";
 import { PerformerTagger } from "../Tagger/performers/PerformerTagger";
@@ -23,16 +23,38 @@ import TextUtils from "src/utils/text";
 import { PerformerCardGrid } from "./PerformerCardGrid";
 import { PerformerMergeModal } from "./PerformerMergeDialog";
 import { View } from "../List/views";
-import { IItemListOperation } from "../List/FilteredListToolbar";
-import { PatchComponent } from "src/patch";
-
-function getItems(result: GQL.FindPerformersQueryResult) {
-  return result?.data?.findPerformers?.performers ?? [];
-}
-
-function getCount(result: GQL.FindPerformersQueryResult) {
-  return result?.data?.findPerformers?.count ?? 0;
-}
+import {
+  FilteredListToolbar,
+  IItemListOperation,
+} from "../List/FilteredListToolbar";
+import { PatchComponent, PatchContainerComponent } from "src/patch";
+import useFocus from "src/utils/focus";
+import {
+  Sidebar,
+  SidebarPane,
+  SidebarPaneContent,
+  SidebarStateContext,
+  useSidebarState,
+} from "../Shared/Sidebar";
+import { useCloseEditDelete, useFilterOperations } from "../List/util";
+import {
+  FilteredSidebarHeader,
+  useFilteredSidebarKeybinds,
+} from "../List/Filters/FilterSidebar";
+import { IListOperations, ListOperations } from "../List/ListOperationButtons";
+import { FilterTags } from "../List/FilterTags";
+import { Pagination, PaginationIndex } from "../List/Pagination";
+import { LoadedContent } from "../List/PagedList";
+import { SidebarTagsFilter } from "../List/Filters/TagsFilter";
+import { SidebarRatingFilter } from "../List/Filters/RatingFilter";
+import { SidebarAgeFilter } from "../List/Filters/SidebarAgeFilter";
+import { PerformerListFilterOptions } from "src/models/list-filter/performers";
+import { Button } from "react-bootstrap";
+import cx from "classnames";
+import { FavoritePerformerCriterionOption } from "src/models/list-filter/criteria/favorite";
+import { SidebarBooleanFilter } from "../List/Filters/BooleanFilter";
+import { SidebarOptionFilter } from "../List/Filters/OptionFilter";
+import { GenderCriterionOption } from "src/models/list-filter/criteria/gender";
 
 export const FormatHeight = (height?: number | null) => {
   const intl = useIntl();
@@ -165,193 +187,302 @@ interface IPerformerList {
   extraOperations?: IItemListOperation<GQL.FindPerformersQueryResult>[];
 }
 
-export const PerformerList: React.FC<IPerformerList> = PatchComponent(
+const PerformerList: React.FC<{
+  performers: GQL.PerformerDataFragment[];
+  filter: ListFilterModel;
+  selectedIds: Set<string>;
+  onSelectChange: (id: string, selected: boolean, shiftKey: boolean) => void;
+  extraCriteria?: IPerformerCardExtraCriteria;
+}> = PatchComponent(
   "PerformerList",
-  ({ filterHook, view, alterQuery, extraCriteria, extraOperations = [] }) => {
+  ({ performers, filter, selectedIds, onSelectChange, extraCriteria }) => {
+    if (performers.length === 0) {
+      return null;
+    }
+
+    if (filter.displayMode === DisplayMode.Grid) {
+      return (
+        <PerformerCardGrid
+          performers={performers}
+          zoomIndex={filter.zoomIndex}
+          selectedIds={selectedIds}
+          onSelectChange={onSelectChange}
+          extraCriteria={extraCriteria}
+        />
+      );
+    }
+    if (filter.displayMode === DisplayMode.List) {
+      return (
+        <PerformerListTable
+          performers={performers}
+          selectedIds={selectedIds}
+          onSelectChange={onSelectChange}
+        />
+      );
+    }
+    if (filter.displayMode === DisplayMode.Tagger) {
+      return <PerformerTagger performers={performers} />;
+    }
+
+    return null;
+  }
+);
+
+const PerformerFilterSidebarSections = PatchContainerComponent(
+  "FilteredPerformerList.SidebarSections"
+);
+
+const SidebarContent: React.FC<{
+  filter: ListFilterModel;
+  setFilter: (filter: ListFilterModel) => void;
+  filterHook?: (filter: ListFilterModel) => ListFilterModel;
+  view?: View;
+  sidebarOpen: boolean;
+  onClose?: () => void;
+  showEditFilter: (editingCriterion?: string) => void;
+  count?: number;
+  focus?: ReturnType<typeof useFocus>;
+}> = ({
+  filter,
+  setFilter,
+  filterHook,
+  view,
+  showEditFilter,
+  sidebarOpen,
+  onClose,
+  count,
+  focus,
+}) => {
+  const showResultsId =
+    count !== undefined ? "actions.show_count_results" : "actions.show_results";
+
+  const AgeCriterionOption = PerformerListFilterOptions.criterionOptions.find(
+    (c) => c.type === "age"
+  );
+
+  return (
+    <>
+      <FilteredSidebarHeader
+        sidebarOpen={sidebarOpen}
+        showEditFilter={showEditFilter}
+        filter={filter}
+        setFilter={setFilter}
+        view={view}
+        focus={focus}
+      />
+
+      <PerformerFilterSidebarSections>
+        <SidebarTagsFilter
+          filter={filter}
+          setFilter={setFilter}
+          filterHook={filterHook}
+        />
+        <SidebarRatingFilter filter={filter} setFilter={setFilter} />
+        <SidebarBooleanFilter
+          title={<FormattedMessage id="favourite" />}
+          data-type={FavoritePerformerCriterionOption.type}
+          option={FavoritePerformerCriterionOption}
+          filter={filter}
+          setFilter={setFilter}
+          sectionID="favourite"
+        />
+        <SidebarOptionFilter
+          title={<FormattedMessage id="gender" />}
+          option={GenderCriterionOption}
+          filter={filter}
+          setFilter={setFilter}
+          sectionID="gender"
+        />
+        <SidebarAgeFilter
+          title={<FormattedMessage id="age" />}
+          option={AgeCriterionOption!}
+          filter={filter}
+          setFilter={setFilter}
+          sectionID="age"
+        />
+      </PerformerFilterSidebarSections>
+
+      <div className="sidebar-footer">
+        <Button className="sidebar-close-button" onClick={onClose}>
+          <FormattedMessage id={showResultsId} values={{ count }} />
+        </Button>
+      </div>
+    </>
+  );
+};
+
+function useViewRandom(filter: ListFilterModel, count: number) {
+  const history = useHistory();
+
+  const viewRandom = useCallback(async () => {
+    // query for a random performer
+    if (count === 0) {
+      return;
+    }
+
+    const index = Math.floor(Math.random() * count);
+    const filterCopy = cloneDeep(filter);
+    filterCopy.itemsPerPage = 1;
+    filterCopy.currentPage = index + 1;
+    const singleResult = await queryFindPerformers(filterCopy);
+    if (singleResult.data.findPerformers.performers.length === 1) {
+      const { id } = singleResult.data.findPerformers.performers[0];
+      // navigate to the image player page
+      history.push(`/performers/${id}`);
+    }
+  }, [history, filter, count]);
+
+  return viewRandom;
+}
+
+function useAddKeybinds(filter: ListFilterModel, count: number) {
+  const viewRandom = useViewRandom(filter, count);
+
+  useEffect(() => {
+    Mousetrap.bind("p r", () => {
+      viewRandom();
+    });
+
+    return () => {
+      Mousetrap.unbind("p r");
+    };
+  }, [viewRandom]);
+}
+
+export const FilteredPerformerList = PatchComponent(
+  "FilteredPerformerList",
+  (props: IPerformerList) => {
     const intl = useIntl();
     const history = useHistory();
-    const [mergePerformers, setMergePerformers] = useState<
-      GQL.SelectPerformerDataFragment[] | undefined
-    >(undefined);
-    const [isExportDialogOpen, setIsExportDialogOpen] = useState(false);
-    const [isExportAll, setIsExportAll] = useState(false);
+    const location = useLocation();
 
-    const filterMode = GQL.FilterMode.Performers;
+    const searchFocus = useFocus();
 
-    const otherOperations = [
-      ...extraOperations,
-      {
-        text: intl.formatMessage({ id: "actions.open_random" }),
-        onClick: openRandom,
-      },
-      {
-        text: `${intl.formatMessage({ id: "actions.merge" })}…`,
-        onClick: merge,
-        isDisplayed: showWhenSelected,
-      },
-      {
-        text: intl.formatMessage({ id: "actions.export" }),
-        onClick: onExport,
-        isDisplayed: showWhenSelected,
-      },
-      {
-        text: intl.formatMessage({ id: "actions.export_all" }),
-        onClick: onExportAll,
-      },
-    ];
+    const {
+      filterHook,
+      view,
+      alterQuery,
+      extraCriteria,
+      extraOperations = [],
+    } = props;
 
-    function addKeybinds(
-      result: GQL.FindPerformersQueryResult,
-      filter: ListFilterModel
-    ) {
-      Mousetrap.bind("p r", () => {
-        openRandom(result, filter);
+    // States
+    const {
+      showSidebar,
+      setShowSidebar,
+      sectionOpen,
+      setSectionOpen,
+      loading: sidebarStateLoading,
+    } = useSidebarState(view);
+
+    const { filterState, queryResult, modalState, listSelect, showEditFilter } =
+      useFilteredItemList({
+        filterStateProps: {
+          filterMode: GQL.FilterMode.Performers,
+          view,
+          useURL: alterQuery,
+        },
+        queryResultProps: {
+          useResult: useFindPerformers,
+          getCount: (r) => r.data?.findPerformers.count ?? 0,
+          getItems: (r) => r.data?.findPerformers.performers ?? [],
+          filterHook,
+        },
+      });
+
+    const { filter, setFilter } = filterState;
+
+    const { effectiveFilter, result, cachedResult, items, totalCount } =
+      queryResult;
+
+    const {
+      selectedIds,
+      selectedItems,
+      onSelectChange,
+      onSelectAll,
+      onSelectNone,
+      onInvertSelection,
+      hasSelection,
+    } = listSelect;
+
+    const { modal, showModal, closeModal } = modalState;
+
+    // Utility hooks
+    const { setPage, removeCriterion, clearAllCriteria } = useFilterOperations({
+      filter,
+      setFilter,
+    });
+
+    useAddKeybinds(filter, totalCount);
+    useFilteredSidebarKeybinds({
+      showSidebar,
+      setShowSidebar,
+    });
+
+    useEffect(() => {
+      Mousetrap.bind("e", () => {
+        if (hasSelection) {
+          onEdit?.();
+        }
+      });
+
+      Mousetrap.bind("d d", () => {
+        if (hasSelection) {
+          onDelete?.();
+        }
       });
 
       return () => {
-        Mousetrap.unbind("p r");
+        Mousetrap.unbind("e");
+        Mousetrap.unbind("d d");
       };
-    }
+    });
 
-    async function openRandom(
-      result: GQL.FindPerformersQueryResult,
-      filter: ListFilterModel
-    ) {
-      if (result.data?.findPerformers) {
-        const { count } = result.data.findPerformers;
-        const index = Math.floor(Math.random() * count);
-        const filterCopy = cloneDeep(filter);
-        filterCopy.itemsPerPage = 1;
-        filterCopy.currentPage = index + 1;
-        const singleResult = await queryFindPerformers(filterCopy);
-        if (singleResult.data.findPerformers.performers.length === 1) {
-          const { id } = singleResult.data.findPerformers.performers[0]!;
-          history.push(`/performers/${id}`);
-        }
+    const onCloseEditDelete = useCloseEditDelete({
+      closeModal,
+      onSelectNone,
+      result,
+    });
+
+    function onCreateNew() {
+      let queryParam = new URLSearchParams(location.search).get("q");
+      let newPath = "/performers/new";
+      if (queryParam) {
+        newPath += "?q=" + encodeURIComponent(queryParam);
       }
+      history.push(newPath);
     }
 
-    async function merge(
-      result: GQL.FindPerformersQueryResult,
-      filter: ListFilterModel,
-      selectedIds: Set<string>
-    ) {
-      const selected =
-        result.data?.findPerformers.performers.filter((p) =>
-          selectedIds.has(p.id)
-        ) ?? [];
-      setMergePerformers(selected);
-    }
+    const viewRandom = useViewRandom(filter, totalCount);
 
-    async function onExport() {
-      setIsExportAll(false);
-      setIsExportDialogOpen(true);
-    }
-
-    async function onExportAll() {
-      setIsExportAll(true);
-      setIsExportDialogOpen(true);
-    }
-
-    function renderContent(
-      result: GQL.FindPerformersQueryResult,
-      filter: ListFilterModel,
-      selectedIds: Set<string>,
-      onSelectChange: (id: string, selected: boolean, shiftKey: boolean) => void
-    ) {
-      function renderMergeDialog() {
-        if (mergePerformers) {
-          return (
-            <PerformerMergeModal
-              performers={mergePerformers}
-              onClose={(mergedId?: string) => {
-                setMergePerformers(undefined);
-                if (mergedId) {
-                  history.push(`/performers/${mergedId}`);
-                }
-              }}
-              show
-            />
-          );
-        }
-      }
-
-      function maybeRenderPerformerExportDialog() {
-        if (isExportDialogOpen) {
-          return (
-            <>
-              <ExportDialog
-                exportInput={{
-                  performers: {
-                    ids: Array.from(selectedIds.values()),
-                    all: isExportAll,
-                  },
-                }}
-                onClose={() => setIsExportDialogOpen(false)}
-              />
-            </>
-          );
-        }
-      }
-
-      function renderPerformers() {
-        if (!result.data?.findPerformers) return;
-
-        if (filter.displayMode === DisplayMode.Grid) {
-          return (
-            <PerformerCardGrid
-              performers={result.data.findPerformers.performers}
-              zoomIndex={filter.zoomIndex}
-              selectedIds={selectedIds}
-              onSelectChange={onSelectChange}
-              extraCriteria={extraCriteria}
-            />
-          );
-        }
-        if (filter.displayMode === DisplayMode.List) {
-          return (
-            <PerformerListTable
-              performers={result.data.findPerformers.performers}
-              selectedIds={selectedIds}
-              onSelectChange={onSelectChange}
-            />
-          );
-        }
-        if (filter.displayMode === DisplayMode.Tagger) {
-          return (
-            <PerformerTagger
-              performers={result.data.findPerformers.performers}
-            />
-          );
-        }
-      }
-
-      return (
-        <>
-          {renderMergeDialog()}
-          {maybeRenderPerformerExportDialog()}
-          {renderPerformers()}
-        </>
+    function onExport(all: boolean) {
+      showModal(
+        <ExportDialog
+          exportInput={{
+            performers: {
+              ids: Array.from(selectedIds.values()),
+              all,
+            },
+          }}
+          onClose={() => closeModal()}
+        />
       );
     }
 
-    function renderEditDialog(
-      selectedPerformers: GQL.SlimPerformerDataFragment[],
-      onClose: (applied: boolean) => void
-    ) {
-      return (
-        <EditPerformersDialog selected={selectedPerformers} onClose={onClose} />
+    function onEdit() {
+      showModal(
+        <EditPerformersDialog
+          selected={selectedItems}
+          onClose={onCloseEditDelete}
+        />
       );
     }
 
-    function renderDeleteDialog(
-      selectedPerformers: GQL.SlimPerformerDataFragment[],
-      onClose: (confirmed: boolean) => void
-    ) {
-      return (
+    function onDelete() {
+      showModal(
         <DeleteEntityDialog
-          selected={selectedPerformers}
-          onClose={onClose}
+          selected={selectedItems}
+          onClose={onCloseEditDelete}
           singularEntity={intl.formatMessage({ id: "performer" })}
           pluralEntity={intl.formatMessage({ id: "performers" })}
           destroyMutation={usePerformersDestroy}
@@ -359,26 +490,173 @@ export const PerformerList: React.FC<IPerformerList> = PatchComponent(
       );
     }
 
-    return (
-      <ItemListContext
-        filterMode={filterMode}
-        useResult={useFindPerformers}
-        getItems={getItems}
-        getCount={getCount}
-        alterQuery={alterQuery}
-        filterHook={filterHook}
-        view={view}
-        selectable
-      >
-        <ItemList
-          view={view}
-          otherOperations={otherOperations}
-          addKeybinds={addKeybinds}
-          renderContent={renderContent}
-          renderEditDialog={renderEditDialog}
-          renderDeleteDialog={renderDeleteDialog}
+    function onMerge() {
+      showModal(
+        <PerformerMergeModal
+          performers={selectedItems}
+          onClose={(mergedId?: string) => {
+            closeModal();
+            if (mergedId) {
+              history.push(`/performers/${mergedId}`);
+            }
+          }}
+          show
         />
-      </ItemListContext>
+      );
+    }
+
+    const convertedExtraOperations: IListOperations[] = extraOperations.map(
+      (o) => ({
+        ...o,
+        isDisplayed: o.isDisplayed
+          ? () => o.isDisplayed!(result, filter, selectedIds)
+          : undefined,
+        onClick: () => {
+          o.onClick(result, filter, selectedIds);
+        },
+      })
+    );
+
+    const otherOperations: IListOperations[] = [
+      ...convertedExtraOperations,
+      {
+        text: intl.formatMessage({ id: "actions.select_all" }),
+        onClick: () => onSelectAll(),
+        isDisplayed: () => totalCount > 0,
+      },
+      {
+        text: intl.formatMessage({ id: "actions.select_none" }),
+        onClick: () => onSelectNone(),
+        isDisplayed: () => hasSelection,
+      },
+      {
+        text: intl.formatMessage({ id: "actions.invert_selection" }),
+        onClick: () => onInvertSelection(),
+        isDisplayed: () => totalCount > 0,
+      },
+      {
+        text: intl.formatMessage({ id: "actions.open_random" }),
+        onClick: viewRandom,
+      },
+      {
+        text: `${intl.formatMessage({ id: "actions.merge" })}…`,
+        onClick: onMerge,
+        isDisplayed: () => hasSelection,
+      },
+      {
+        text: intl.formatMessage({ id: "actions.export" }),
+        onClick: () => onExport(false),
+        isDisplayed: () => hasSelection,
+      },
+      {
+        text: intl.formatMessage({ id: "actions.export_all" }),
+        onClick: () => onExport(true),
+      },
+    ];
+
+    // render
+    if (sidebarStateLoading) return null;
+
+    const operations = (
+      <ListOperations
+        items={items.length}
+        hasSelection={hasSelection}
+        operations={otherOperations}
+        onEdit={onEdit}
+        onDelete={onDelete}
+        onCreateNew={onCreateNew}
+        entityType={intl.formatMessage({ id: "gallery" })}
+        operationsMenuClassName="gallery-list-operations-dropdown"
+      />
+    );
+
+    return (
+      <div
+        className={cx("item-list-container gallery-list", {
+          "hide-sidebar": !showSidebar,
+        })}
+      >
+        {modal}
+
+        <SidebarStateContext.Provider value={{ sectionOpen, setSectionOpen }}>
+          <SidebarPane hideSidebar={!showSidebar}>
+            <Sidebar hide={!showSidebar} onHide={() => setShowSidebar(false)}>
+              <SidebarContent
+                filter={filter}
+                setFilter={setFilter}
+                filterHook={filterHook}
+                showEditFilter={showEditFilter}
+                view={view}
+                sidebarOpen={showSidebar}
+                onClose={() => setShowSidebar(false)}
+                count={cachedResult.loading ? undefined : totalCount}
+                focus={searchFocus}
+              />
+            </Sidebar>
+            <SidebarPaneContent
+              onSidebarToggle={() => setShowSidebar(!showSidebar)}
+            >
+              <FilteredListToolbar
+                filter={filter}
+                listSelect={listSelect}
+                setFilter={setFilter}
+                showEditFilter={showEditFilter}
+                onDelete={onDelete}
+                onEdit={onEdit}
+                operationComponent={operations}
+                view={view}
+                zoomable
+              />
+
+              <FilterTags
+                criteria={filter.criteria}
+                onEditCriterion={(c) => showEditFilter(c.criterionOption.type)}
+                onRemoveCriterion={removeCriterion}
+                onRemoveAll={clearAllCriteria}
+              />
+
+              <div className="pagination-index-container">
+                <Pagination
+                  currentPage={filter.currentPage}
+                  itemsPerPage={filter.itemsPerPage}
+                  totalItems={totalCount}
+                  onChangePage={(page) => setFilter(filter.changePage(page))}
+                />
+                <PaginationIndex
+                  loading={cachedResult.loading}
+                  itemsPerPage={filter.itemsPerPage}
+                  currentPage={filter.currentPage}
+                  totalItems={totalCount}
+                />
+              </div>
+
+              <LoadedContent loading={result.loading} error={result.error}>
+                <PerformerList
+                  filter={effectiveFilter}
+                  performers={items}
+                  selectedIds={selectedIds}
+                  onSelectChange={onSelectChange}
+                  extraCriteria={extraCriteria}
+                />
+              </LoadedContent>
+
+              {totalCount > filter.itemsPerPage && (
+                <div className="pagination-footer-container">
+                  <div className="pagination-footer">
+                    <Pagination
+                      itemsPerPage={filter.itemsPerPage}
+                      currentPage={filter.currentPage}
+                      totalItems={totalCount}
+                      onChangePage={setPage}
+                      pagePopupPlacement="top"
+                    />
+                  </div>
+                </div>
+              )}
+            </SidebarPaneContent>
+          </SidebarPane>
+        </SidebarStateContext.Provider>
+      </div>
     );
   }
 );
diff --git a/ui/v2.5/src/components/Performers/Performers.tsx b/ui/v2.5/src/components/Performers/Performers.tsx
index d240ce988..7b6e32b8f 100644
--- a/ui/v2.5/src/components/Performers/Performers.tsx
+++ b/ui/v2.5/src/components/Performers/Performers.tsx
@@ -4,11 +4,11 @@ import { Helmet } from "react-helmet";
 import { useTitleProps } from "src/hooks/title";
 import Performer from "./PerformerDetails/Performer";
 import PerformerCreate from "./PerformerDetails/PerformerCreate";
-import { PerformerList } from "./PerformerList";
+import { FilteredPerformerList } from "./PerformerList";
 import { View } from "../List/views";
 
 const Performers: React.FC = () => {
-  return <PerformerList view={View.Performers} />;
+  return <FilteredPerformerList view={View.Performers} />;
 };
 
 const PerformerRoutes: React.FC = () => {
diff --git a/ui/v2.5/src/components/Studios/StudioDetails/StudioPerformersPanel.tsx b/ui/v2.5/src/components/Studios/StudioDetails/StudioPerformersPanel.tsx
index 329ac5bc8..551632266 100644
--- a/ui/v2.5/src/components/Studios/StudioDetails/StudioPerformersPanel.tsx
+++ b/ui/v2.5/src/components/Studios/StudioDetails/StudioPerformersPanel.tsx
@@ -1,7 +1,7 @@
 import React from "react";
 import * as GQL from "src/core/generated-graphql";
 import { useStudioFilterHook } from "src/core/studios";
-import { PerformerList } from "src/components/Performers/PerformerList";
+import { FilteredPerformerList } from "src/components/Performers/PerformerList";
 import { StudiosCriterion } from "src/models/list-filter/criteria/studios";
 import { View } from "src/components/List/views";
 
@@ -33,7 +33,7 @@ export const StudioPerformersPanel: React.FC<IStudioPerformersPanel> = ({
   const filterHook = useStudioFilterHook(studio, showChildStudioContent);
 
   return (
-    <PerformerList
+    <FilteredPerformerList
       filterHook={filterHook}
       extraCriteria={extraCriteria}
       alterQuery={active}
diff --git a/ui/v2.5/src/components/Tags/TagDetails/TagPerformersPanel.tsx b/ui/v2.5/src/components/Tags/TagDetails/TagPerformersPanel.tsx
index 4891c0daf..a512ef5a3 100644
--- a/ui/v2.5/src/components/Tags/TagDetails/TagPerformersPanel.tsx
+++ b/ui/v2.5/src/components/Tags/TagDetails/TagPerformersPanel.tsx
@@ -1,7 +1,7 @@
 import React from "react";
 import * as GQL from "src/core/generated-graphql";
 import { useTagFilterHook } from "src/core/tags";
-import { PerformerList } from "src/components/Performers/PerformerList";
+import { FilteredPerformerList } from "src/components/Performers/PerformerList";
 import { View } from "src/components/List/views";
 
 interface ITagPerformersPanel {
@@ -17,7 +17,7 @@ export const TagPerformersPanel: React.FC<ITagPerformersPanel> = ({
 }) => {
   const filterHook = useTagFilterHook(tag, showSubTagContent);
   return (
-    <PerformerList
+    <FilteredPerformerList
       filterHook={filterHook}
       alterQuery={active}
       view={View.TagPerformers}

From d64b3b711cbc2d3fdb8131f8fa51fe1c30c7efb6 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Fri, 6 Feb 2026 12:37:38 +1100
Subject: [PATCH 282/405] Revamp studio list with sidebar (#6549)

* Add studios_filter to TagFilterType
* Convert studio list to use sidebar
---
 graphql/schema/types/filters.graphql          |   2 +
 pkg/models/tag.go                             |   2 +
 pkg/sqlite/tag.go                             |   9 +
 pkg/sqlite/tag_filter.go                      |   9 +
 .../List/Filters/LabeledIdFilter.tsx          |  19 +-
 .../StudioDetails/StudioChildrenPanel.tsx     |   4 +-
 ui/v2.5/src/components/Studios/StudioList.tsx | 565 +++++++++++++-----
 ui/v2.5/src/components/Studios/Studios.tsx    |   4 +-
 .../Tags/TagDetails/TagStudiosPanel.tsx       |   4 +-
 9 files changed, 461 insertions(+), 157 deletions(-)

diff --git a/graphql/schema/types/filters.graphql b/graphql/schema/types/filters.graphql
index f89cee3e2..04a28171c 100644
--- a/graphql/schema/types/filters.graphql
+++ b/graphql/schema/types/filters.graphql
@@ -644,6 +644,8 @@ input TagFilterType {
   galleries_filter: GalleryFilterType
   "Filter by related performers that meet this criteria"
   performers_filter: PerformerFilterType
+  "Filter by related studios that meet this criteria"
+  studios_filter: StudioFilterType
 
   "Filter by creation time"
   created_at: TimestampCriterionInput
diff --git a/pkg/models/tag.go b/pkg/models/tag.go
index 0f39d8861..bfb3f1ad3 100644
--- a/pkg/models/tag.go
+++ b/pkg/models/tag.go
@@ -52,6 +52,8 @@ type TagFilterType struct {
 	GalleriesFilter *GalleryFilterType `json:"galleries_filter"`
 	// Filter by related performers that meet this criteria
 	PerformersFilter *PerformerFilterType `json:"performers_filter"`
+	// Filter by related studios that meet this criteria
+	StudiosFilter *StudioFilterType `json:"studios_filter"`
 	// Filter by created at
 	CreatedAt *TimestampCriterionInput `json:"created_at"`
 	// Filter by updated at
diff --git a/pkg/sqlite/tag.go b/pkg/sqlite/tag.go
index ea18664d9..8a0561b0f 100644
--- a/pkg/sqlite/tag.go
+++ b/pkg/sqlite/tag.go
@@ -108,6 +108,7 @@ type tagRepositoryType struct {
 	images     joinRepository
 	galleries  joinRepository
 	performers joinRepository
+	studios    joinRepository
 }
 
 var (
@@ -161,6 +162,14 @@ var (
 			fkColumn:     performerIDColumn,
 			foreignTable: performerTable,
 		},
+		studios: joinRepository{
+			repository: repository{
+				tableName: studiosTagsTable,
+				idColumn:  tagIDColumn,
+			},
+			fkColumn:     studioIDColumn,
+			foreignTable: studioTable,
+		},
 	}
 )
 
diff --git a/pkg/sqlite/tag_filter.go b/pkg/sqlite/tag_filter.go
index 2f4e79149..92da1237c 100644
--- a/pkg/sqlite/tag_filter.go
+++ b/pkg/sqlite/tag_filter.go
@@ -143,6 +143,15 @@ func (qb *tagFilterHandler) criterionHandler() criterionHandler {
 				tagRepository.performers.innerJoin(f, "", "tags.id")
 			},
 		},
+
+		&relatedFilterHandler{
+			relatedIDCol:   "studios_tags.studio_id",
+			relatedRepo:    studioRepository.repository,
+			relatedHandler: &studioFilterHandler{tagFilter.StudiosFilter},
+			joinFn: func(f *filterBuilder) {
+				tagRepository.studios.innerJoin(f, "", "tags.id")
+			},
+		},
 	}
 }
 
diff --git a/ui/v2.5/src/components/List/Filters/LabeledIdFilter.tsx b/ui/v2.5/src/components/List/Filters/LabeledIdFilter.tsx
index d621d85bd..a5e81087e 100644
--- a/ui/v2.5/src/components/List/Filters/LabeledIdFilter.tsx
+++ b/ui/v2.5/src/components/List/Filters/LabeledIdFilter.tsx
@@ -23,6 +23,7 @@ import {
   IntCriterionInput,
   PerformerFilterType,
   SceneFilterType,
+  StudioFilterType,
 } from "src/core/generated-graphql";
 import { useIntl } from "react-intl";
 
@@ -521,12 +522,18 @@ interface IFilterType {
   performer_count?: InputMaybe<IntCriterionInput>;
   galleries_filter?: InputMaybe<GalleryFilterType>;
   gallery_count?: InputMaybe<IntCriterionInput>;
+  studios_filter?: InputMaybe<StudioFilterType>;
+  studio_count?: InputMaybe<IntCriterionInput>;
 }
 
 export function setObjectFilter(
   out: IFilterType,
   mode: FilterMode,
-  relatedFilterOutput: SceneFilterType | PerformerFilterType | GalleryFilterType
+  relatedFilterOutput:
+    | SceneFilterType
+    | PerformerFilterType
+    | GalleryFilterType
+    | StudioFilterType
 ) {
   const empty = Object.keys(relatedFilterOutput).length === 0;
 
@@ -561,6 +568,16 @@ export function setObjectFilter(
       }
       out.galleries_filter = relatedFilterOutput as GalleryFilterType;
       break;
+    case FilterMode.Studios:
+      // if empty, only get objects with studios
+      if (empty) {
+        out.studio_count = {
+          modifier: CriterionModifier.GreaterThan,
+          value: 0,
+        };
+      }
+      out.studios_filter = relatedFilterOutput as StudioFilterType;
+      break;
     default:
       throw new Error("Invalid filter mode");
   }
diff --git a/ui/v2.5/src/components/Studios/StudioDetails/StudioChildrenPanel.tsx b/ui/v2.5/src/components/Studios/StudioDetails/StudioChildrenPanel.tsx
index b6cd8b484..a69364a89 100644
--- a/ui/v2.5/src/components/Studios/StudioDetails/StudioChildrenPanel.tsx
+++ b/ui/v2.5/src/components/Studios/StudioDetails/StudioChildrenPanel.tsx
@@ -2,7 +2,7 @@ import React from "react";
 import * as GQL from "src/core/generated-graphql";
 import { ParentStudiosCriterion } from "src/models/list-filter/criteria/studios";
 import { ListFilterModel } from "src/models/list-filter/filter";
-import { StudioList } from "../StudioList";
+import { FilteredStudioList } from "../StudioList";
 import { View } from "src/components/List/views";
 
 function useFilterHook(studio: GQL.StudioDataFragment) {
@@ -51,7 +51,7 @@ export const StudioChildrenPanel: React.FC<IStudioChildrenPanel> = ({
   const filterHook = useFilterHook(studio);
 
   return (
-    <StudioList
+    <FilteredStudioList
       fromParent
       filterHook={filterHook}
       alterQuery={active}
diff --git a/ui/v2.5/src/components/Studios/StudioList.tsx b/ui/v2.5/src/components/Studios/StudioList.tsx
index 49075da6e..42d8e1341 100644
--- a/ui/v2.5/src/components/Studios/StudioList.tsx
+++ b/ui/v2.5/src/components/Studios/StudioList.tsx
@@ -1,7 +1,7 @@
-import React, { useState } from "react";
-import { useIntl } from "react-intl";
+import React, { useCallback, useEffect } from "react";
+import { FormattedMessage, useIntl } from "react-intl";
 import cloneDeep from "lodash-es/cloneDeep";
-import { useHistory } from "react-router-dom";
+import { useHistory, useLocation } from "react-router-dom";
 import Mousetrap from "mousetrap";
 import * as GQL from "src/core/generated-graphql";
 import {
@@ -9,7 +9,7 @@ import {
   useFindStudios,
   useStudiosDestroy,
 } from "src/core/StashService";
-import { ItemList, ItemListContext, showWhenSelected } from "../List/ItemList";
+import { useFilteredItemList } from "../List/ItemList";
 import { ListFilterModel } from "src/models/list-filter/filter";
 import { DisplayMode } from "src/models/list-filter/types";
 import { ExportDialog } from "../Shared/ExportDialog";
@@ -18,16 +18,136 @@ import { StudioTagger } from "../Tagger/studios/StudioTagger";
 import { StudioCardGrid } from "./StudioCardGrid";
 import { View } from "../List/views";
 import { EditStudiosDialog } from "./EditStudiosDialog";
-import { IItemListOperation } from "../List/FilteredListToolbar";
-import { PatchComponent } from "src/patch";
+import {
+  FilteredListToolbar,
+  IItemListOperation,
+} from "../List/FilteredListToolbar";
+import { PatchComponent, PatchContainerComponent } from "src/patch";
+import { useCloseEditDelete, useFilterOperations } from "../List/util";
+import { ListOperations } from "../List/ListOperationButtons";
+import {
+  Sidebar,
+  SidebarPane,
+  SidebarPaneContent,
+  SidebarStateContext,
+  useSidebarState,
+} from "../Shared/Sidebar";
+import useFocus from "src/utils/focus";
+import {
+  FilteredSidebarHeader,
+  useFilteredSidebarKeybinds,
+} from "../List/Filters/FilterSidebar";
+import { FilterTags } from "../List/FilterTags";
+import { Pagination, PaginationIndex } from "../List/Pagination";
+import { LoadedContent } from "../List/PagedList";
+import { SidebarTagsFilter } from "../List/Filters/TagsFilter";
+import { SidebarRatingFilter } from "../List/Filters/RatingFilter";
+import { SidebarBooleanFilter } from "../List/Filters/BooleanFilter";
+import { FavoriteStudioCriterionOption } from "src/models/list-filter/criteria/favorite";
+import { Button } from "react-bootstrap";
+import cx from "classnames";
 
-function getItems(result: GQL.FindStudiosQueryResult) {
-  return result?.data?.findStudios?.studios ?? [];
-}
+const StudioList: React.FC<{
+  studios: GQL.StudioDataFragment[];
+  filter: ListFilterModel;
+  selectedIds: Set<string>;
+  onSelectChange: (id: string, selected: boolean, shiftKey: boolean) => void;
+  fromParent?: boolean;
+}> = PatchComponent(
+  "StudioList",
+  ({ studios, filter, selectedIds, onSelectChange, fromParent }) => {
+    if (studios.length === 0) {
+      return null;
+    }
 
-function getCount(result: GQL.FindStudiosQueryResult) {
-  return result?.data?.findStudios?.count ?? 0;
-}
+    if (filter.displayMode === DisplayMode.Grid) {
+      return (
+        <StudioCardGrid
+          studios={studios}
+          zoomIndex={filter.zoomIndex}
+          fromParent={fromParent}
+          selectedIds={selectedIds}
+          onSelectChange={onSelectChange}
+        />
+      );
+    }
+    if (filter.displayMode === DisplayMode.List) {
+      return <h1>TODO</h1>;
+    }
+    if (filter.displayMode === DisplayMode.Wall) {
+      return <h1>TODO</h1>;
+    }
+    if (filter.displayMode === DisplayMode.Tagger) {
+      return <StudioTagger studios={studios} />;
+    }
+
+    return null;
+  }
+);
+
+const StudioFilterSidebarSections = PatchContainerComponent(
+  "FilteredStudioList.SidebarSections"
+);
+
+const SidebarContent: React.FC<{
+  filter: ListFilterModel;
+  setFilter: (filter: ListFilterModel) => void;
+  filterHook?: (filter: ListFilterModel) => ListFilterModel;
+  view?: View;
+  sidebarOpen: boolean;
+  onClose?: () => void;
+  showEditFilter: (editingCriterion?: string) => void;
+  count?: number;
+  focus?: ReturnType<typeof useFocus>;
+}> = ({
+  filter,
+  setFilter,
+  filterHook,
+  view,
+  showEditFilter,
+  sidebarOpen,
+  onClose,
+  count,
+  focus,
+}) => {
+  const showResultsId =
+    count !== undefined ? "actions.show_count_results" : "actions.show_results";
+
+  return (
+    <>
+      <FilteredSidebarHeader
+        sidebarOpen={sidebarOpen}
+        showEditFilter={showEditFilter}
+        filter={filter}
+        setFilter={setFilter}
+        view={view}
+        focus={focus}
+      />
+
+      <StudioFilterSidebarSections>
+        <SidebarTagsFilter
+          filter={filter}
+          setFilter={setFilter}
+          filterHook={filterHook}
+        />
+        <SidebarRatingFilter filter={filter} setFilter={setFilter} />
+        <SidebarBooleanFilter
+          title={<FormattedMessage id="favourite" />}
+          filter={filter}
+          setFilter={setFilter}
+          option={FavoriteStudioCriterionOption}
+          sectionID="favourite"
+        />
+      </StudioFilterSidebarSections>
+
+      <div className="sidebar-footer">
+        <Button className="sidebar-close-button" onClick={onClose}>
+          <FormattedMessage id={showResultsId} values={{ count }} />
+        </Button>
+      </div>
+    </>
+  );
+};
 
 interface IStudioList {
   fromParent?: boolean;
@@ -37,147 +157,172 @@ interface IStudioList {
   extraOperations?: IItemListOperation<GQL.FindStudiosQueryResult>[];
 }
 
-export const StudioList: React.FC<IStudioList> = PatchComponent(
-  "StudioList",
-  ({ fromParent, filterHook, view, alterQuery, extraOperations = [] }) => {
+function useViewRandom(filter: ListFilterModel, count: number) {
+  const history = useHistory();
+
+  const viewRandom = useCallback(async () => {
+    // query for a random studio
+    if (count === 0) {
+      return;
+    }
+
+    const index = Math.floor(Math.random() * count);
+    const filterCopy = cloneDeep(filter);
+    filterCopy.itemsPerPage = 1;
+    filterCopy.currentPage = index + 1;
+    const singleResult = await queryFindStudios(filterCopy);
+    if (singleResult.data.findStudios.studios.length === 1) {
+      const { id } = singleResult.data.findStudios.studios[0];
+      // navigate to the studio page
+      history.push(`/studios/${id}`);
+    }
+  }, [history, filter, count]);
+
+  return viewRandom;
+}
+
+function useAddKeybinds(filter: ListFilterModel, count: number) {
+  const viewRandom = useViewRandom(filter, count);
+
+  useEffect(() => {
+    Mousetrap.bind("p r", () => {
+      viewRandom();
+    });
+
+    return () => {
+      Mousetrap.unbind("p r");
+    };
+  }, [viewRandom]);
+}
+
+export const FilteredStudioList = PatchComponent(
+  "FilteredStudioList",
+  (props: IStudioList) => {
     const intl = useIntl();
     const history = useHistory();
-    const [isExportDialogOpen, setIsExportDialogOpen] = useState(false);
-    const [isExportAll, setIsExportAll] = useState(false);
+    const location = useLocation();
 
-    const filterMode = GQL.FilterMode.Studios;
+    const searchFocus = useFocus();
 
-    const otherOperations = [
-      ...extraOperations,
-      {
-        text: intl.formatMessage({ id: "actions.view_random" }),
-        onClick: viewRandom,
-      },
-      {
-        text: intl.formatMessage({ id: "actions.export" }),
-        onClick: onExport,
-        isDisplayed: showWhenSelected,
-      },
-      {
-        text: intl.formatMessage({ id: "actions.export_all" }),
-        onClick: onExportAll,
-      },
-    ];
+    const { filterHook, view, alterQuery, extraOperations = [] } = props;
 
-    function addKeybinds(
-      result: GQL.FindStudiosQueryResult,
-      filter: ListFilterModel
-    ) {
-      Mousetrap.bind("p r", () => {
-        viewRandom(result, filter);
+    // States
+    const {
+      showSidebar,
+      setShowSidebar,
+      sectionOpen,
+      setSectionOpen,
+      loading: sidebarStateLoading,
+    } = useSidebarState(view);
+
+    const { filterState, queryResult, modalState, listSelect, showEditFilter } =
+      useFilteredItemList({
+        filterStateProps: {
+          filterMode: GQL.FilterMode.Studios,
+          view,
+          useURL: alterQuery,
+        },
+        queryResultProps: {
+          useResult: useFindStudios,
+          getCount: (r) => r.data?.findStudios.count ?? 0,
+          getItems: (r) => r.data?.findStudios.studios ?? [],
+          filterHook,
+        },
+      });
+
+    const { filter, setFilter } = filterState;
+
+    const { effectiveFilter, result, cachedResult, items, totalCount } =
+      queryResult;
+
+    const {
+      selectedIds,
+      selectedItems,
+      onSelectChange,
+      onSelectAll,
+      onSelectNone,
+      onInvertSelection,
+      hasSelection,
+    } = listSelect;
+
+    const { modal, showModal, closeModal } = modalState;
+
+    // Utility hooks
+    const { setPage, removeCriterion, clearAllCriteria } = useFilterOperations({
+      filter,
+      setFilter,
+    });
+
+    useAddKeybinds(filter, totalCount);
+    useFilteredSidebarKeybinds({
+      showSidebar,
+      setShowSidebar,
+    });
+
+    useEffect(() => {
+      Mousetrap.bind("e", () => {
+        if (hasSelection) {
+          onEdit?.();
+        }
+      });
+
+      Mousetrap.bind("d d", () => {
+        if (hasSelection) {
+          onDelete?.();
+        }
       });
 
       return () => {
-        Mousetrap.unbind("p r");
+        Mousetrap.unbind("e");
+        Mousetrap.unbind("d d");
       };
-    }
+    });
 
-    async function viewRandom(
-      result: GQL.FindStudiosQueryResult,
-      filter: ListFilterModel
-    ) {
-      // query for a random studio
-      if (result.data?.findStudios) {
-        const { count } = result.data.findStudios;
+    const onCloseEditDelete = useCloseEditDelete({
+      closeModal,
+      onSelectNone,
+      result,
+    });
 
-        const index = Math.floor(Math.random() * count);
-        const filterCopy = cloneDeep(filter);
-        filterCopy.itemsPerPage = 1;
-        filterCopy.currentPage = index + 1;
-        const singleResult = await queryFindStudios(filterCopy);
-        if (singleResult.data.findStudios.studios.length === 1) {
-          const { id } = singleResult.data.findStudios.studios[0];
-          // navigate to the studio page
-          history.push(`/studios/${id}`);
-        }
+    function onCreateNew() {
+      let queryParam = new URLSearchParams(location.search).get("q");
+      let newPath = "/studios/new";
+      if (queryParam) {
+        newPath += "?q=" + encodeURIComponent(queryParam);
       }
+      history.push(newPath);
     }
 
-    async function onExport() {
-      setIsExportAll(false);
-      setIsExportDialogOpen(true);
-    }
+    const viewRandom = useViewRandom(filter, totalCount);
 
-    async function onExportAll() {
-      setIsExportAll(true);
-      setIsExportDialogOpen(true);
-    }
-
-    function renderContent(
-      result: GQL.FindStudiosQueryResult,
-      filter: ListFilterModel,
-      selectedIds: Set<string>,
-      onSelectChange: (id: string, selected: boolean, shiftKey: boolean) => void
-    ) {
-      function maybeRenderExportDialog() {
-        if (isExportDialogOpen) {
-          return (
-            <ExportDialog
-              exportInput={{
-                studios: {
-                  ids: Array.from(selectedIds.values()),
-                  all: isExportAll,
-                },
-              }}
-              onClose={() => setIsExportDialogOpen(false)}
-            />
-          );
-        }
-      }
-
-      function renderStudios() {
-        if (!result.data?.findStudios) return;
-
-        if (filter.displayMode === DisplayMode.Grid) {
-          return (
-            <StudioCardGrid
-              studios={result.data.findStudios.studios}
-              zoomIndex={filter.zoomIndex}
-              fromParent={fromParent}
-              selectedIds={selectedIds}
-              onSelectChange={onSelectChange}
-            />
-          );
-        }
-        if (filter.displayMode === DisplayMode.List) {
-          return <h1>TODO</h1>;
-        }
-        if (filter.displayMode === DisplayMode.Wall) {
-          return <h1>TODO</h1>;
-        }
-        if (filter.displayMode === DisplayMode.Tagger) {
-          return <StudioTagger studios={result.data.findStudios.studios} />;
-        }
-      }
-
-      return (
-        <>
-          {maybeRenderExportDialog()}
-          {renderStudios()}
-        </>
+    function onExport(all: boolean) {
+      showModal(
+        <ExportDialog
+          exportInput={{
+            studios: {
+              ids: Array.from(selectedIds.values()),
+              all: all,
+            },
+          }}
+          onClose={() => closeModal()}
+        />
       );
     }
 
-    function renderEditDialog(
-      selectedStudios: GQL.SlimStudioDataFragment[],
-      onClose: (applied: boolean) => void
-    ) {
-      return <EditStudiosDialog selected={selectedStudios} onClose={onClose} />;
+    function onEdit() {
+      showModal(
+        <EditStudiosDialog
+          selected={selectedItems}
+          onClose={onCloseEditDelete}
+        />
+      );
     }
 
-    function renderDeleteDialog(
-      selectedStudios: GQL.SlimStudioDataFragment[],
-      onClose: (confirmed: boolean) => void
-    ) {
-      return (
+    function onDelete() {
+      showModal(
         <DeleteEntityDialog
-          selected={selectedStudios}
-          onClose={onClose}
+          selected={selectedItems}
+          onClose={onCloseEditDelete}
           singularEntity={intl.formatMessage({ id: "studio" })}
           pluralEntity={intl.formatMessage({ id: "studios" })}
           destroyMutation={useStudiosDestroy}
@@ -185,26 +330,146 @@ export const StudioList: React.FC<IStudioList> = PatchComponent(
       );
     }
 
+    const convertedExtraOperations = extraOperations.map((op) => ({
+      text: op.text,
+      onClick: () => op.onClick(result, filter, selectedIds),
+      isDisplayed: () => op.isDisplayed?.(result, filter, selectedIds) ?? true,
+    }));
+
+    const otherOperations = [
+      ...convertedExtraOperations,
+      {
+        text: intl.formatMessage({ id: "actions.select_all" }),
+        onClick: () => onSelectAll(),
+        isDisplayed: () => totalCount > 0,
+      },
+      {
+        text: intl.formatMessage({ id: "actions.select_none" }),
+        onClick: () => onSelectNone(),
+        isDisplayed: () => hasSelection,
+      },
+      {
+        text: intl.formatMessage({ id: "actions.invert_selection" }),
+        onClick: () => onInvertSelection(),
+        isDisplayed: () => totalCount > 0,
+      },
+      {
+        text: intl.formatMessage({ id: "actions.view_random" }),
+        onClick: viewRandom,
+      },
+      {
+        text: intl.formatMessage({ id: "actions.export" }),
+        onClick: () => onExport(false),
+        isDisplayed: () => hasSelection,
+      },
+      {
+        text: intl.formatMessage({ id: "actions.export_all" }),
+        onClick: () => onExport(true),
+      },
+    ];
+
+    // render
+    if (sidebarStateLoading) return null;
+
+    const operations = (
+      <ListOperations
+        items={items.length}
+        hasSelection={hasSelection}
+        operations={otherOperations}
+        onEdit={onEdit}
+        onDelete={onDelete}
+        onCreateNew={onCreateNew}
+        entityType={intl.formatMessage({ id: "studio" })}
+        operationsMenuClassName="studio-list-operations-dropdown"
+      />
+    );
+
     return (
-      <ItemListContext
-        filterMode={filterMode}
-        useResult={useFindStudios}
-        getItems={getItems}
-        getCount={getCount}
-        alterQuery={alterQuery}
-        filterHook={filterHook}
-        view={view}
-        selectable
+      <div
+        className={cx("item-list-container studio-list", {
+          "hide-sidebar": !showSidebar,
+        })}
       >
-        <ItemList
-          view={view}
-          otherOperations={otherOperations}
-          addKeybinds={addKeybinds}
-          renderContent={renderContent}
-          renderEditDialog={renderEditDialog}
-          renderDeleteDialog={renderDeleteDialog}
-        />
-      </ItemListContext>
+        {modal}
+
+        <SidebarStateContext.Provider value={{ sectionOpen, setSectionOpen }}>
+          <SidebarPane hideSidebar={!showSidebar}>
+            <Sidebar hide={!showSidebar} onHide={() => setShowSidebar(false)}>
+              <SidebarContent
+                filter={filter}
+                setFilter={setFilter}
+                filterHook={filterHook}
+                showEditFilter={showEditFilter}
+                view={view}
+                sidebarOpen={showSidebar}
+                onClose={() => setShowSidebar(false)}
+                count={cachedResult.loading ? undefined : totalCount}
+                focus={searchFocus}
+              />
+            </Sidebar>
+            <SidebarPaneContent
+              onSidebarToggle={() => setShowSidebar(!showSidebar)}
+            >
+              <FilteredListToolbar
+                filter={filter}
+                listSelect={listSelect}
+                setFilter={setFilter}
+                showEditFilter={showEditFilter}
+                onDelete={onDelete}
+                onEdit={onEdit}
+                operationComponent={operations}
+                view={view}
+                zoomable
+              />
+
+              <FilterTags
+                criteria={filter.criteria}
+                onEditCriterion={(c) => showEditFilter(c.criterionOption.type)}
+                onRemoveCriterion={removeCriterion}
+                onRemoveAll={clearAllCriteria}
+              />
+
+              <div className="pagination-index-container">
+                <Pagination
+                  currentPage={filter.currentPage}
+                  itemsPerPage={filter.itemsPerPage}
+                  totalItems={totalCount}
+                  onChangePage={(page) => setFilter(filter.changePage(page))}
+                />
+                <PaginationIndex
+                  loading={cachedResult.loading}
+                  itemsPerPage={filter.itemsPerPage}
+                  currentPage={filter.currentPage}
+                  totalItems={totalCount}
+                />
+              </div>
+
+              <LoadedContent loading={result.loading} error={result.error}>
+                <StudioList
+                  filter={effectiveFilter}
+                  studios={items}
+                  selectedIds={selectedIds}
+                  onSelectChange={onSelectChange}
+                />
+              </LoadedContent>
+
+              {totalCount > filter.itemsPerPage && (
+                <div className="pagination-footer-container">
+                  <div className="pagination-footer">
+                    <Pagination
+                      itemsPerPage={filter.itemsPerPage}
+                      currentPage={filter.currentPage}
+                      totalItems={totalCount}
+                      onChangePage={setPage}
+                      pagePopupPlacement="top"
+                    />
+                  </div>
+                </div>
+              )}
+            </SidebarPaneContent>
+          </SidebarPane>
+        </SidebarStateContext.Provider>
+      </div>
     );
   }
 );
diff --git a/ui/v2.5/src/components/Studios/Studios.tsx b/ui/v2.5/src/components/Studios/Studios.tsx
index 545de936f..956531fe0 100644
--- a/ui/v2.5/src/components/Studios/Studios.tsx
+++ b/ui/v2.5/src/components/Studios/Studios.tsx
@@ -4,11 +4,11 @@ import { Helmet } from "react-helmet";
 import { useTitleProps } from "src/hooks/title";
 import Studio from "./StudioDetails/Studio";
 import StudioCreate from "./StudioDetails/StudioCreate";
-import { StudioList } from "./StudioList";
+import { FilteredStudioList } from "./StudioList";
 import { View } from "../List/views";
 
 const Studios: React.FC = () => {
-  return <StudioList view={View.Studios} />;
+  return <FilteredStudioList view={View.Studios} />;
 };
 
 const StudioRoutes: React.FC = () => {
diff --git a/ui/v2.5/src/components/Tags/TagDetails/TagStudiosPanel.tsx b/ui/v2.5/src/components/Tags/TagDetails/TagStudiosPanel.tsx
index 72d150b42..045d55481 100644
--- a/ui/v2.5/src/components/Tags/TagDetails/TagStudiosPanel.tsx
+++ b/ui/v2.5/src/components/Tags/TagDetails/TagStudiosPanel.tsx
@@ -1,7 +1,7 @@
 import React from "react";
 import * as GQL from "src/core/generated-graphql";
 import { useTagFilterHook } from "src/core/tags";
-import { StudioList } from "src/components/Studios/StudioList";
+import { FilteredStudioList } from "src/components/Studios/StudioList";
 
 interface ITagStudiosPanel {
   active: boolean;
@@ -15,5 +15,5 @@ export const TagStudiosPanel: React.FC<ITagStudiosPanel> = ({
   showSubTagContent,
 }) => {
   const filterHook = useTagFilterHook(tag, showSubTagContent);
-  return <StudioList filterHook={filterHook} alterQuery={active} />;
+  return <FilteredStudioList filterHook={filterHook} alterQuery={active} />;
 };

From 8dec195c2d5f909fad98d2b59f8498185d4bb21d Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Fri, 6 Feb 2026 15:53:04 +1100
Subject: [PATCH 283/405] Quick fix for front page card styling (#6553)

---
 ui/v2.5/src/components/FrontPage/styles.scss | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/ui/v2.5/src/components/FrontPage/styles.scss b/ui/v2.5/src/components/FrontPage/styles.scss
index 88d7f0c0a..f643e4eb6 100644
--- a/ui/v2.5/src/components/FrontPage/styles.scss
+++ b/ui/v2.5/src/components/FrontPage/styles.scss
@@ -492,3 +492,10 @@
   color: white;
   opacity: 0.75;
 }
+
+// HACK: compatibility with existing behaviour after removed width from zoom-1 class
+// this should really be changed to use the specific card types instead of a generic zoom-1 class,
+// but this is a quick fix to prevent breaking existing styles
+.recommendation-row .zoom-1 {
+  width: 320px;
+}

From 07b483038ae499c8c4f9b93609342940573e5bd4 Mon Sep 17 00:00:00 2001
From: DogmaDragon <103123951+DogmaDragon@users.noreply.github.com>
Date: Mon, 9 Feb 2026 01:55:12 +0200
Subject: [PATCH 284/405] docs: standardize letter casing in settings page
 (#6548)

* Standardize letter casing in settings page for headings, options and buttons
* Add localized messages for changelog header and select directory
---
 internal/manager/task_generate.go             |   4 +-
 .../src/components/Changelog/Changelog.tsx    |   4 +-
 .../FolderSelect/FolderSelectDialog.tsx       |   4 +-
 ui/v2.5/src/docs/en/Manual/AutoTagging.md     |  18 +-
 ui/v2.5/src/docs/en/Manual/Captions.md        |   2 +-
 ui/v2.5/src/docs/en/Manual/Images.md          |   6 +-
 ui/v2.5/src/docs/en/Manual/Interactive.md     |   4 +-
 ui/v2.5/src/docs/en/Manual/Interface.md       |  18 +-
 ui/v2.5/src/docs/en/Manual/Tasks.md           |  18 +-
 .../src/docs/en/Manual/TroubleshootingMode.md |   6 +-
 ui/v2.5/src/locales/en-GB.json                | 306 +++++++++---------
 11 files changed, 199 insertions(+), 191 deletions(-)

diff --git a/internal/manager/task_generate.go b/internal/manager/task_generate.go
index 2b330bcf3..cc991d5d6 100644
--- a/internal/manager/task_generate.go
+++ b/internal/manager/task_generate.go
@@ -221,10 +221,10 @@ func (j *GenerateJob) Execute(ctx context.Context, progress *job.Progress) error
 			logMsg += fmt.Sprintf(" %d heatmaps & speeds", totals.interactiveHeatmapSpeeds)
 		}
 		if j.input.ClipPreviews {
-			logMsg += fmt.Sprintf(" %d Image Clip Previews", totals.clipPreviews)
+			logMsg += fmt.Sprintf(" %d image clip previews", totals.clipPreviews)
 		}
 		if j.input.ImageThumbnails {
-			logMsg += fmt.Sprintf(" %d Image Thumbnails", totals.imageThumbnails)
+			logMsg += fmt.Sprintf(" %d image thumbnails", totals.imageThumbnails)
 		}
 		if logMsg == "Generating" {
 			logMsg = "Nothing selected to generate"
diff --git a/ui/v2.5/src/components/Changelog/Changelog.tsx b/ui/v2.5/src/components/Changelog/Changelog.tsx
index 97175e1c2..7e4207dce 100644
--- a/ui/v2.5/src/components/Changelog/Changelog.tsx
+++ b/ui/v2.5/src/components/Changelog/Changelog.tsx
@@ -256,7 +256,9 @@ const Changelog: React.FC = () => {
 
   return (
     <div className="changelog">
-      <h1 className="mb-4">Changelog:</h1>
+      <h1 className="mb-4">
+        <FormattedMessage id="config.changelog.header" />
+      </h1>
       {releases.map((r) => (
         <Version
           key={r.version}
diff --git a/ui/v2.5/src/components/Shared/FolderSelect/FolderSelectDialog.tsx b/ui/v2.5/src/components/Shared/FolderSelect/FolderSelectDialog.tsx
index 8da39d7e1..b3872d88d 100644
--- a/ui/v2.5/src/components/Shared/FolderSelect/FolderSelectDialog.tsx
+++ b/ui/v2.5/src/components/Shared/FolderSelect/FolderSelectDialog.tsx
@@ -18,7 +18,9 @@ export const FolderSelectDialog: React.FC<IProps> = ({
 
   return (
     <Modal show onHide={() => onClose()} title="">
-      <Modal.Header>Select Directory</Modal.Header>
+      <Modal.Header>
+        <FormattedMessage id="actions.select_directory" />
+      </Modal.Header>
       <Modal.Body>
         <div className="dialog-content">
           <FolderSelect
diff --git a/ui/v2.5/src/docs/en/Manual/AutoTagging.md b/ui/v2.5/src/docs/en/Manual/AutoTagging.md
index 4c4265e19..ad08027f6 100644
--- a/ui/v2.5/src/docs/en/Manual/AutoTagging.md
+++ b/ui/v2.5/src/docs/en/Manual/AutoTagging.md
@@ -1,16 +1,16 @@
 # Auto Tag
 
-Auto Tag automatically assigns Performers, Studios, and Tags to your media based on their names found in file paths or filenames. This task works for scenes, images, and galleries.
+Auto tag automatically assigns Performers, Studios, and Tags to your media based on their names found in file paths or filenames. This task works for scenes, images, and galleries.
 
 This task is part of the advanced settings mode.
 
 ## Rules
 
-> **⚠️ Important:** Auto Tag only works for names that already exist in your Stash database. It does not create new Performers, Studios, or Tags.
+> **⚠️ Important:** Auto tag only works for names that already exist in your Stash database. It does not create new Performers, Studios, or Tags.
 
  - Multi-word names are matched when words appear in order and are separated by any of these characters: `.`, `-`, `_`, or whitespace. These separators are treated as word boundaries.
  - Matching is case-insensitive but requires complete words within word boundaries. Partial words or misspelled words will not match.
- - Auto Tag does not match performer aliases. Aliases will not be considered during matching.
+ - Auto tag does not match performer aliases. Aliases will not be considered during matching.
 
 ### Examples (performer "Jane Doe")
 
@@ -35,14 +35,14 @@ This task is part of the advanced settings mode.
 
 ### Organized flag
 
-Scenes, images, and galleries that have the Organized flag added to them will not be modified by Auto Tag. You can also use Organized flag status as a filter.
+Scenes, images, and galleries that have the Organized flag added to them will not be modified by Auto tag. You can also use Organized flag status as a filter.
 
-### Ignore Auto Tag flag
+### Ignore Auto tag flag
 
-Performers or Tags that have Ignore Auto Tag flag added to them will be skipped by the Auto Tag task.
+Performers or Tags that have Ignore Auto tag flag added to them will be skipped by the Auto tag task.
 
 ## Running task
 
-- **Auto Tag:** You can run the Auto Tag task on your entire library from the Tasks page.
-- **Selective Auto Tag:** You can run the Auto Tag task on specific directories from the Tasks page.
-- **Individual pages:** You can run Auto Tag tasks for specific Performers, Studios, and Tags from their respective pages.
+- **Auto tag:** You can run the Auto tag task on your entire library from the Tasks page.
+- **Selective auto tag:** You can run the Auto tag task on specific directories from the Tasks page.
+- **Individual pages:** You can run Auto tag tasks for specific Performers, Studios, and Tags from their respective pages.
diff --git a/ui/v2.5/src/docs/en/Manual/Captions.md b/ui/v2.5/src/docs/en/Manual/Captions.md
index 4e3849fac..a575f915b 100644
--- a/ui/v2.5/src/docs/en/Manual/Captions.md
+++ b/ui/v2.5/src/docs/en/Manual/Captions.md
@@ -15,4 +15,4 @@ Where `{language_code}` is defined by the [ISO-6399-1](https://en.wikipedia.org/
 
 Scenes with captions can be filtered with the `captions` criterion.
 
-> **⚠️ Note:** If the caption file was added after the scene was initially added during scan, you will need to run a Selective Scan task for it to show up.
+> **⚠️ Note:** If the caption file was added after the scene was initially added during scan, you will need to run a Selective scan task for it to show up.
diff --git a/ui/v2.5/src/docs/en/Manual/Images.md b/ui/v2.5/src/docs/en/Manual/Images.md
index f08f5241c..5be7beba5 100644
--- a/ui/v2.5/src/docs/en/Manual/Images.md
+++ b/ui/v2.5/src/docs/en/Manual/Images.md
@@ -21,11 +21,11 @@ You can also manually select any image from a gallery as its cover. On the galle
 
 Images can also be clips/gifs. These are meant to be short video loops. Right now they are not possible in zipfiles. To declare video files to be images, there are two ways:
 
-1. Deactivate video scanning for all libraries that contain clips/gifs, but keep image scanning active. Set the **Scan Video Extensions as Image Clip** option in the library section of your settings. 
-2. Make sure none of the file endings used by your clips/gifs are present in the **Video Extensions** and add them to the **Image Extensions** in the library section of your settings.
+1. Deactivate video scanning for all libraries that contain clips/gifs, but keep image scanning active. Set the **Scan video extensions as image clips** option in the library section of your settings. 
+2. Make sure none of the file endings used by your clips/gifs are present in the **Video extensions** and add them to the **Image extensions** in the library section of your settings.
 
 A clip/gif will be a stillframe in the wall and grid view by default. To view the loop, you can go into the Lightbox Carousel (e.g. by clicking on an image in the wall view) or the image detail page.
 
 If you want the loop to be used as a preview on the wall and grid view, you will have to generate them. 
-You can do this as you scan for the new clip file by activating **Generate previews for image clips** on the scan settings, or do it after by going to the **Generated Content** section in the task section of your settings, activating **Image Clip Previews** and clicking generate. This takes a while, as the files are transcoded.
+You can do this as you scan for the new clip file by activating **Generate previews for image clips** on the scan settings, or do it after by going to the **Generated Content** section in the task section of your settings, activating **Image clip previews** and clicking generate. This takes a while, as the files are transcoded.
 
diff --git a/ui/v2.5/src/docs/en/Manual/Interactive.md b/ui/v2.5/src/docs/en/Manual/Interactive.md
index 831109aab..ab12381dc 100644
--- a/ui/v2.5/src/docs/en/Manual/Interactive.md
+++ b/ui/v2.5/src/docs/en/Manual/Interactive.md
@@ -1,8 +1,8 @@
 # Interactivity
 
-Stash currently supports syncing with Handy devices, using funscript files.
+Stash currently supports syncing with The Handy devices, using funscript files.
 
-In order for stash to connect to your Handy device, the Handy Connection Key must be entered in Settings -> Interface.
+In order for stash to connect to your Handy device, the Handy connection key must be entered in Settings -> Interface.
 
 Funscript files must be in the same directory as the matching video file and must have the same base name. For example, a funscript file for `video.mp4` must be named `video.funscript`. A scan must be run to update scenes with matching funscript files.
 
diff --git a/ui/v2.5/src/docs/en/Manual/Interface.md b/ui/v2.5/src/docs/en/Manual/Interface.md
index cf5911405..8fd89d57e 100644
--- a/ui/v2.5/src/docs/en/Manual/Interface.md
+++ b/ui/v2.5/src/docs/en/Manual/Interface.md
@@ -4,20 +4,20 @@
 
 Setting the language affects the formatting of numbers and dates.
 
-## SFW Content Mode
+## SFW content mode
 
-SFW Content Mode is used to indicate that the content being managed is _not_ adult content. 
+SFW content mode is used to indicate that the content being managed is _not_ adult content. 
 
-When SFW Content Mode is enabled, the following changes are made to the UI:
+When SFW content mode is enabled, the following changes are made to the UI:
 - default performer images are changed to less adult-oriented images
 - certain adult-specific metadata fields are hidden (e.g. performer genital fields)
 - `O`-Counter is replaced with `Like`-counter
 
-## Scene/Marker Wall Preview Type
+## Scene/Marker Wall Preview type
 
 The Scene Wall and Marker pages display scene preview videos (mp4) by default. This can be changed to animated image (webp) or static image. 
 
-> **⚠️ Note:** scene/marker preview videos must be generated to see them in the applicable wall page if Video preview type is selected. Likewise, if Animated Image is selected, then Image Previews must be generated.
+> **⚠️ Note:** scene/marker preview videos must be generated to see them in the applicable wall page if Video preview type is selected. Likewise, if Animated image is selected, then Image Previews must be generated.
 
 ## Show Studios as text
 
@@ -33,7 +33,7 @@ The maximum loop duration option allows looping of shorter videos. Set this valu
 
 The "Track Activity" option allows tracking of scene play count and duration, and sets the resume point when a scene video is not finished.
 
-The "Minimum Play Percent" gives the minimum proportion of a video that must be played before the play count of the scene is incremented.
+The "Minimum play percent" gives the minimum proportion of a video that must be played before the play count of the scene is incremented.
 
 By default, when a scene has a resume point, the scene player will automatically seek to this point when the scene is played. Setting "Always start video from beginning" to true disables this behaviour.
 
@@ -43,15 +43,15 @@ The stash UI can be customised using custom CSS. See [here](https://docs.stashap
 
 There is also a [collection of community-created themes](https://docs.stashapp.cc/themes/list/#browse-themes) available.
 
-## Custom Javascript
+## Custom JavaScript
 
-Stash supports the injection of custom javascript to assist with theming or adding additional functionality. Be aware that bad Javascript could break the UI or worse.
+Stash supports the injection of custom JavaScript to assist with theming or adding additional functionality. Be aware that bad JavaScript could break the UI or worse.
 
 ## Custom Locales
 
 The localisation strings can be customised. The master list of default (en-GB) locale strings can be found [here](https://github.com/stashapp/stash/blob/develop/ui/v2.5/src/locales/en-GB.json). The custom locale format is the same as this json file.
 
-For example, to override the `actions.add_directory` label (which is `Add Directory` by default), you would have the following in the custom locale:
+For example, to override the `actions.add_directory` label (which is `Add directory` by default), you would have the following in the custom locale:
 
 ```
 {
diff --git a/ui/v2.5/src/docs/en/Manual/Tasks.md b/ui/v2.5/src/docs/en/Manual/Tasks.md
index 063d02277..5dd887cfe 100644
--- a/ui/v2.5/src/docs/en/Manual/Tasks.md
+++ b/ui/v2.5/src/docs/en/Manual/Tasks.md
@@ -16,7 +16,7 @@ The scan task accepts the following options:
 |--------|-------------|
 | Generate scene covers | Generates scene covers for video files. |
 | Generate previews | Generates video previews (mp4) which play when hovering over a scene. |
-| Generate animated image previews* | *Accessible in Advanced Mode* - Also generate animated (webp) previews, only required when Scene/Marker Wall Preview Type is set to Animated Image. When browsing they use less CPU than the video previews, but are generated in addition to them and are larger files.|
+| Generate animated image previews | *Accessible in Advanced mode* - Also generate animated (webp) previews, only required when Scene/Marker Wall Preview type is set to Animated image. When browsing they use less CPU than the video previews, but are generated in addition to them and are larger files.|
 | Generate scrubber sprites | The set of images displayed below the video player for easy navigation. |
 | Generate video perceptual hashes | Generates perceptual hashes for scene deduplication and identification. |
 | Generate thumbnails for images | Generates thumbnails for image files. | 
@@ -49,16 +49,16 @@ The generate task accepts the following options:
 |--------|-------------|
 | Scene covers | Generates scene covers for video files. |
 | Previews | Generates video previews (mp4) which play when hovering over a scene. |
-| Animated image previews | *Accessible in Advanced Mode* - Generates animated previews (webp). Only required if the Preview Type is set to Animated Image. Requires Generate previews to be enabled. |
-| Scene Scrubber Sprites | The set of images displayed below the video player for easy navigation. |
-| Markers Previews | Generates 20 second video previews (mp4) which begin at the marker timecode. |
-| Marker Animated Image Previews | *Accessible in Advanced Mode* - Also generate animated (webp) previews, only required when Scene/Marker Wall Preview Type is set to Animated Image. When browsing they use less CPU than the video previews, but are generated in addition to them and are larger files. |
-| Marker Screenshots | Generates static JPG images for markers. Only required if Preview Type is set to Static Image. Requires Marker Previews to be enabled. | 
-| Transcodes | *Accessible in Advanced Mode* - MP4 conversions of unsupported video formats. Allows direct streaming instead of live transcoding. |
+| Animated image previews | *Accessible in Advanced mode* - Generates animated previews (webp). Only required if the Preview type is set to Animated image. Requires Generate previews to be enabled. |
+| Scene scrubber sprites | The set of images displayed below the video player for easy navigation. |
+| Marker previews | Generates 20 second video previews (mp4) which begin at the marker timecode. |
+| Marker animated image previews | *Accessible in Advanced mode* - Also generate animated (webp) previews, only required when Scene/Marker Wall Preview type is set to Animated image. When browsing they use less CPU than the video previews, but are generated in addition to them and are larger files. |
+| Marker screenshots | Generates static JPG images for markers. Only required if Preview type is set to Static image. Requires marker previews to be enabled. | 
+| Transcodes | *Accessible in Advanced mode* - MP4 conversions of unsupported video formats. Allows direct streaming instead of live transcoding. |
 | Video Perceptual hashes (for deduplication) | Generates perceptual hashes for scene deduplication and identification. |
 | Generate heatmaps and speeds for interactive scenes | Generates heatmaps and speeds for interactive scenes. |
-| Image Clip Previews | Generates a gif/looping video as thumbnail for image clips/gifs. |
-| Image Thumbnails | Generates thumbnails for image files. |
+| Image clip previews | Generates a gif/looping video as thumbnail for image clips/gifs. |
+| Image thumbnails | Generates thumbnails for image files. |
 | Image Perceptual hashes (for deduplication) | Generates perceptual hashes for image deduplication and identification. |
 | Overwrite existing generated files | By default, where a generated file exists, it is not regenerated. When this flag is enabled, then the generated files are regenerated. |
 
diff --git a/ui/v2.5/src/docs/en/Manual/TroubleshootingMode.md b/ui/v2.5/src/docs/en/Manual/TroubleshootingMode.md
index d7a2c1cee..9a5ffd215 100644
--- a/ui/v2.5/src/docs/en/Manual/TroubleshootingMode.md
+++ b/ui/v2.5/src/docs/en/Manual/TroubleshootingMode.md
@@ -1,7 +1,7 @@
 # Troubleshooting Mode
 
-Troubleshooting Mode disables all plugins and all custom CSS, JavaScript, and locales. It also temporarily sets the log level to `DEBUG`. This is useful when you are experiencing issues with your Stash instance to eliminate the possibility that a plugin or custom code is causing the issue.
+Troubleshooting mode disables all plugins and all custom CSS, JavaScript, and locales. It also temporarily sets the log level to `DEBUG`. This is useful when you are experiencing issues with your Stash instance to eliminate the possibility that a plugin or custom code is causing the issue.
 
-Troubleshooting Mode is enabled from the Settings page, by clicking the `Troubleshooting Mode` button at the bottom left of the page.
+Troubleshooting mode is enabled from the Settings page, by clicking the `Troubleshooting mode` button at the bottom left of the page.
 
-When Troubleshooting Mode is enabled, a red border and a banner will be displayed to remind you that you are in Troubleshooting Mode. To exit Troubleshooting Mode, click the `Exit` button in the banner.
\ No newline at end of file
+When Troubleshooting mode is enabled, a red border and a banner will be displayed to remind you that you are in Troubleshooting mode. To exit Troubleshooting mode, click the `Exit` button in the banner.
\ No newline at end of file
diff --git a/ui/v2.5/src/locales/en-GB.json b/ui/v2.5/src/locales/en-GB.json
index 76df6cf33..a2fee0ec1 100644
--- a/ui/v2.5/src/locales/en-GB.json
+++ b/ui/v2.5/src/locales/en-GB.json
@@ -1,7 +1,7 @@
 {
   "actions": {
     "add": "Add",
-    "add_directory": "Add Directory",
+    "add_directory": "Add directory",
     "add_entity": "Add {entityType}",
     "add_manual_date": "Add manual date",
     "add_sub_groups": "Add Sub-Groups",
@@ -14,7 +14,7 @@
     "anonymise": "Anonymise",
     "apply": "Apply",
     "assign_stashid_to_parent_studio": "Assign Stash ID to existing parent studio and update metadata",
-    "auto_tag": "Auto Tag",
+    "auto_tag": "Auto tag",
     "backup": "Backup",
     "browse_for_image": "Browse for image…",
     "cancel": "Cancel",
@@ -47,7 +47,7 @@
     "disallow": "Disallow",
     "download": "Download",
     "download_anonymised": "Download anonymised",
-    "download_backup": "Download Backup",
+    "download_backup": "Download backup",
     "edit": "Edit",
     "edit_entity": "Edit {entityType}",
     "enable": "Enable",
@@ -58,8 +58,8 @@
     "finish": "Finish",
     "from_file": "From file…",
     "from_url": "From URL…",
-    "full_export": "Full Export",
-    "full_import": "Full Import",
+    "full_export": "Full export",
+    "full_import": "Full import",
     "generate": "Generate",
     "generate_thumb_default": "Generate default thumbnail",
     "generate_thumb_from_current": "Generate thumbnail from current",
@@ -75,13 +75,13 @@
     "logout": "Log out",
     "make_primary": "Make Primary",
     "merge": "Merge",
-    "migrate_blobs": "Migrate Blobs",
-    "migrate_scene_screenshots": "Migrate Scene Screenshots",
+    "migrate_blobs": "Migrate blobs",
+    "migrate_scene_screenshots": "Migrate scene screenshots",
     "next_action": "Next",
     "not_running": "not running",
     "open_in_external_player": "Open in external player",
     "open_random": "Open Random",
-    "optimise_database": "Optimise Database",
+    "optimise_database": "Optimise database",
     "overwrite": "Overwrite",
     "play": "Play",
     "play_random": "Play Random",
@@ -115,13 +115,14 @@
     "scrape_with": "Scrape with…",
     "search": "Search",
     "select_all": "Select All",
+    "select_directory": "Select directory",
     "select_entity": "Select {entityType}",
     "select_folders": "Select folders",
     "select_none": "Select None",
     "invert_selection": "Invert Selection",
-    "selective_auto_tag": "Selective Auto Tag",
-    "selective_clean": "Selective Clean",
-    "selective_scan": "Selective Scan",
+    "selective_auto_tag": "Selective auto tag",
+    "selective_clean": "Selective clean",
+    "selective_scan": "Selective scan",
     "set_as_default": "Set as default",
     "set_back_image": "Back image…",
     "set_cover": "Set as Cover",
@@ -252,7 +253,7 @@
       "stash_wiki": "Stash {url} page",
       "version": "Version"
     },
-    "advanced_mode": "Advanced Mode",
+    "advanced_mode": "Advanced mode",
     "application_paths": {
       "heading": "Application Paths"
     },
@@ -270,11 +271,14 @@
       "tasks": "Tasks",
       "tools": "Tools"
     },
+    "changelog": {
+      "header": "Changelog"
+    },
     "dlna": {
       "allow_temp_ip": "Allow {tempIP}",
       "allowed_ip_addresses": "Allowed IP addresses",
       "allowed_ip_temporarily": "Allowed IP temporarily",
-      "default_ip_whitelist": "Default IP Whitelist",
+      "default_ip_whitelist": "Default IP whitelist",
       "default_ip_whitelist_desc": "Default IP addresses allow to access DLNA. Use {wildcard} to allow all IP addresses.",
       "disabled_dlna_temporarily": "Disabled DLNA temporarily",
       "disallowed_ip": "Disallowed IP",
@@ -283,35 +287,35 @@
       "network_interfaces": "Interfaces",
       "network_interfaces_desc": "Interfaces to expose DLNA server on. An empty list results in running on all interfaces. Requires DLNA restart after changing.",
       "recent_ip_addresses": "Recent IP addresses",
-      "server_display_name": "Server Display Name",
+      "server_display_name": "Server display name",
       "server_display_name_desc": "Display name for the DLNA server. Defaults to {server_name} if empty.",
-      "server_port": "Server Port",
+      "server_port": "Server port",
       "server_port_desc": "Port to run the DLNA server on. Requires DLNA restart after changing.",
       "successfully_cancelled_temporary_behaviour": "Successfully cancelled temporary behaviour",
       "until_restart": "until restart",
-      "video_sort_order": "Default Video Sort Order",
+      "video_sort_order": "Default video sort order",
       "video_sort_order_desc": "Order to sort videos by default."
     },
     "general": {
       "auth": {
-        "api_key": "API Key",
+        "api_key": "API key",
         "api_key_desc": "API key for external systems. Only required when username/password is configured. Username must be saved before generating API key.",
         "authentication": "Authentication",
         "clear_api_key": "Clear API key",
         "credentials": {
-          "description": "Credentials to restrict access to stash.",
+          "description": "Credentials to restrict access to Stash.",
           "heading": "Credentials"
         },
         "generate_api_key": "Generate API key",
         "log_file": "Log file",
         "log_file_desc": "Path to the file to output logging to. Blank to disable file logging. Requires restart.",
-        "log_http": "Log http access",
-        "log_http_desc": "Logs http access to the terminal. Requires restart.",
+        "log_http": "Log HTTP access",
+        "log_http_desc": "Logs HTTP access to the terminal. Requires restart.",
         "log_to_terminal": "Log to terminal",
         "log_to_terminal_desc": "Logs to the terminal in addition to a file. Always true if file logging is disabled. Requires restart.",
         "log_file_max_size": "Maximum log size",
         "log_file_max_size_desc": "Maximum size in megabytes of the log file before it is compressed. 0MB is disabled. Requires restart.",
-        "maximum_session_age": "Maximum Session Age",
+        "maximum_session_age": "Maximum session age",
         "maximum_session_age_desc": "Maximum idle time before a login session is expired, in seconds. Requires restart.",
         "password": "Password",
         "password_desc": "Password to access Stash. Leave blank to disable user authentication",
@@ -320,50 +324,50 @@
         "username_desc": "Username to access Stash. Leave blank to disable user authentication"
       },
       "backup_directory_path": {
-        "description": "Directory location for SQLite database file backups",
-        "heading": "Backup Directory Path"
+        "description": "Directory location for SQLite database file backups.",
+        "heading": "Backup directory path"
       },
       "delete_trash_path": {
         "description": "Path where deleted files will be moved to instead of being permanently deleted. Leave empty to permanently delete files.",
-        "heading": "Trash Path"
+        "heading": "Trash path"
       },
       "blobs_path": {
         "description": "Where in the filesystem to store binary data. Applicable only when using the Filesystem blob storage type. WARNING: changing this requires manually moving existing data.",
         "heading": "Binary data filesystem path"
       },
       "blobs_storage": {
-        "description": "Where to store binary data such as scene covers, performer, studio and tag images. After changing this value, the existing data must be migrated using the Migrate Blobs tasks. See Tasks page for migration.",
+        "description": "Where to store binary data such as scene covers, performer, studio and tag images. After changing this value, the existing data must be migrated using the Migrate blobs tasks. See Tasks page for migration.",
         "heading": "Binary data storage type"
       },
       "cache_location": "Directory location of the cache. Required if streaming using HLS (such as on Apple devices) or DASH.",
-      "cache_path_head": "Cache Path",
+      "cache_path_head": "Cache path",
       "calculate_md5_and_ohash_desc": "Calculate MD5 checksum in addition to oshash. Enabling will cause initial scans to be slower. File naming hash must be set to oshash to disable MD5 calculation.",
       "calculate_md5_and_ohash_label": "Calculate MD5 for videos",
       "check_for_insecure_certificates": "Check for insecure certificates",
-      "check_for_insecure_certificates_desc": "Some sites use insecure ssl certificates. When unticked the scraper skips the insecure certificates check and allows scraping of those sites. If you get a certificate error when scraping untick this.",
+      "check_for_insecure_certificates_desc": "Some sites use insecure SSL certificates. When unticked the scraper skips the insecure certificates check and allows scraping of those sites. If you get a certificate error when scraping untick this.",
       "chrome_cdp_path": "Chrome CDP path",
       "chrome_cdp_path_desc": "File path to the Chrome executable, or a remote address (starting with http:// or https://, for example http://localhost:9222/json/version) to a Chrome instance.",
-      "create_galleries_from_folders_desc": "If true, creates galleries from folders containing images by default. Create a File called .forcegallery or .nogallery in a folder to enforce/prevent this.",
+      "create_galleries_from_folders_desc": "If true, creates galleries from folders containing images by default. Create a file called .forcegallery or .nogallery in a folder to override this setting.",
       "create_galleries_from_folders_label": "Create galleries from folders containing images",
       "database": "Database",
-      "db_path_head": "Database Path",
+      "db_path_head": "Database path",
       "directory_locations_to_your_content": "Directory locations to your content",
-      "excluded_image_gallery_patterns_desc": "Regexps of image and gallery files/paths to exclude from Scan and add to Clean",
-      "excluded_image_gallery_patterns_head": "Excluded Image/Gallery Patterns",
-      "excluded_video_patterns_desc": "Regexps of video files/paths to exclude from Scan and add to Clean",
-      "excluded_video_patterns_head": "Excluded Video Patterns",
+      "excluded_image_gallery_patterns_desc": "Regexps of image and gallery files/paths to exclude from Scan and add to Clean tasks.",
+      "excluded_image_gallery_patterns_head": "Excluded image/gallery patterns",
+      "excluded_video_patterns_desc": "Regexps of video files/paths to exclude from Scan and add to Clean tasks.",
+      "excluded_video_patterns_head": "Excluded video patterns",
       "ffmpeg": {
         "download_ffmpeg": {
           "description": "Downloads FFmpeg into the configuration directory and clears the ffmpeg and ffprobe paths to resolve from the configuration directory.",
           "heading": "Download FFmpeg"
         },
         "ffmpeg_path": {
-          "description": "Path to the ffmpeg executable (not just the folder). If empty, ffmpeg will be resolved from the environment via $PATH, the configuration directory, or from $HOME/.stash",
-          "heading": "FFmpeg Executable Path"
+          "description": "Path to the ffmpeg executable (not just the folder). If empty, ffmpeg will be resolved from the environment via $PATH, the configuration directory, or from $HOME/.stash.",
+          "heading": "FFmpeg executable path"
         },
         "ffprobe_path": {
-          "description": "Path to the ffprobe executable (not just the folder). If empty, ffprobe will be resolved from the environment via $PATH, the configuration directory, or from $HOME/.stash",
-          "heading": "FFprobe Executable Path"
+          "description": "Path to the ffprobe executable (not just the folder). If empty, ffprobe will be resolved from the environment via $PATH, the configuration directory, or from $HOME/.stash.",
+          "heading": "FFprobe executable path"
         },
         "hardware_acceleration": {
           "desc": "Uses available hardware to encode video for live transcoding.",
@@ -372,80 +376,80 @@
         "live_transcode": {
           "input_args": {
             "desc": "Advanced: Additional arguments to pass to ffmpeg before the input field when live transcoding video.",
-            "heading": "FFmpeg Live Transcode Input Args"
+            "heading": "FFmpeg live transcode input arguments"
           },
           "output_args": {
             "desc": "Advanced: Additional arguments to pass to ffmpeg before the output field when live transcoding video.",
-            "heading": "FFmpeg Live Transcode Output Args"
+            "heading": "FFmpeg live transcode output arguments"
           }
         },
         "transcode": {
           "input_args": {
             "desc": "Advanced: Additional arguments to pass to ffmpeg before the input field when generating video.",
-            "heading": "FFmpeg Transcode Input Args"
+            "heading": "FFmpeg transcode input arguments"
           },
           "output_args": {
             "desc": "Advanced: Additional arguments to pass to ffmpeg before the output field when generating video.",
-            "heading": "FFmpeg Transcode Output Args"
+            "heading": "FFmpeg transcode output arguments"
           }
         }
       },
       "funscript_heatmap_draw_range": "Include range in generated heatmaps",
       "funscript_heatmap_draw_range_desc": "Draw range of motion on the y-axis of the generated heatmap. Existing heatmaps will need to be regenerated after changing.",
-      "gallery_cover_regex_desc": "Regexp used to identify an image as gallery cover",
+      "gallery_cover_regex_desc": "Regexps used to identify an image as gallery cover.",
       "gallery_cover_regex_label": "Gallery cover pattern",
-      "gallery_ext_desc": "Comma-delimited list of file extensions that will be identified as gallery zip files.",
-      "gallery_ext_head": "Gallery zip Extensions",
+      "gallery_ext_desc": "Comma-delimited list of file extensions that will be identified as gallery ZIP files.",
+      "gallery_ext_head": "Gallery ZIP extensions",
       "generated_file_naming_hash_desc": "Use MD5 or oshash for generated file naming. Changing this requires that all scenes have the applicable MD5/oshash value populated. After changing this value, existing generated files will need to be migrated or regenerated. See Tasks page for migration.",
       "generated_file_naming_hash_head": "Generated file naming hash",
-      "generated_files_location": "Directory location for the generated files (scene markers, scene previews, sprites, etc)",
-      "generated_path_head": "Generated Path",
+      "generated_files_location": "Directory location for the generated files (scene markers, scene previews, sprites, etc).",
+      "generated_path_head": "Generated path",
       "hashing": "Hashing",
       "heatmap_generation": "Funscript Heatmap Generation",
       "image_ext_desc": "Comma-delimited list of file extensions that will be identified as images.",
-      "image_ext_head": "Image Extensions",
+      "image_ext_head": "Image extensions",
       "include_audio_desc": "Includes audio stream when generating previews.",
       "include_audio_head": "Include audio",
       "logging": "Logging",
-      "maximum_streaming_transcode_size_desc": "Maximum size for transcoded streams",
+      "maximum_streaming_transcode_size_desc": "Maximum size for transcoded streams.",
       "maximum_streaming_transcode_size_head": "Maximum streaming transcode size",
-      "maximum_transcode_size_desc": "Maximum size for generated transcodes",
+      "maximum_transcode_size_desc": "Maximum size for generated transcodes.",
       "maximum_transcode_size_head": "Maximum transcode size",
       "metadata_path": {
-        "description": "Directory location used when performing a full export or import",
-        "heading": "Metadata Path"
+        "description": "Directory location used when performing a full export or import.",
+        "heading": "Metadata path"
       },
-      "number_of_parallel_task_for_scan_generation_desc": "Set to 0 for auto-detection. Warning running more tasks than is required to achieve 100% cpu utilisation will decrease performance and potentially cause other issues.",
+      "number_of_parallel_task_for_scan_generation_desc": "Set to 0 for auto-detection. Warning running more tasks than is required to achieve 100% CPU utilisation will decrease performance and potentially cause other issues.",
       "number_of_parallel_task_for_scan_generation_head": "Number of parallel task for scan/generation",
       "parallel_scan_head": "Parallel Scan/Generation",
       "plugins_path": {
-        "description": "Directory location of plugin configuration files",
-        "heading": "Plugins Path"
+        "description": "Directory location of plugin configuration files.",
+        "heading": "Plugins path"
       },
       "preview_generation": "Preview Generation",
       "python_path": {
-        "description": "Path to the python executable (not just the folder). Used for script scrapers and plugins. If blank, python will be resolved from the environment",
-        "heading": "Python Executable Path"
+        "description": "Path to the python executable (not just the folder). Used for script scrapers and plugins. If blank, Python will be resolved from the environment.",
+        "heading": "Python executable path"
       },
-      "scraper_user_agent": "Scraper User Agent",
-      "scraper_user_agent_desc": "User-Agent string used during scrape http requests",
+      "scraper_user_agent": "Scraper User-Agent",
+      "scraper_user_agent_desc": "User-Agent string used during scrape HTTP requests.",
       "scrapers_path": {
-        "description": "Directory location of scraper configuration files",
-        "heading": "Scrapers Path"
+        "description": "Directory location of scraper configuration files.",
+        "heading": "Scrapers path"
       },
       "scraping": "Scraping",
       "sqlite_location": "File location for the SQLite database (requires restart). WARNING: storing the database on a different system to where the Stash server is run from (i.e. over the network) is unsupported!",
       "video_ext_desc": "Comma-delimited list of file extensions that will be identified as videos.",
-      "video_ext_head": "Video Extensions",
+      "video_ext_head": "Video extensions",
       "video_head": "Video"
     },
     "library": {
       "exclusions": "Exclusions",
-      "gallery_and_image_options": "Gallery and Image options",
-      "media_content_extensions": "Media content extensions"
+      "gallery_and_image_options": "Gallery and Image Options",
+      "media_content_extensions": "Media Content Extensions"
     },
     "logs": {
-      "log_level": "Log Level"
+      "log_level": "Log level"
     },
     "plugins": {
       "available_plugins": "Available Plugins",
@@ -457,8 +461,8 @@
       "available_scrapers": "Available Scrapers",
       "entity_metadata": "{entityType} Metadata",
       "entity_scrapers": "{entityType} scrapers",
-      "excluded_tag_patterns_desc": "Regexps of tag names to exclude from scraping results",
-      "excluded_tag_patterns_head": "Excluded Tag Patterns",
+      "excluded_tag_patterns_desc": "Regexps of tag names to exclude from scraping results.",
+      "excluded_tag_patterns_head": "Excluded tag patterns",
       "installed_scrapers": "Installed Scrapers",
       "scraper": "Scraper",
       "scrapers": "Scrapers",
@@ -486,25 +490,25 @@
       "anonymise_database": "Makes a copy of the database to the backups directory, anonymising all sensitive data. This can then be provided to others for troubleshooting and debugging purposes. The original database is not modified. Anonymised database uses the filename format {filename_format}.",
       "anonymising_database": "Anonymising database",
       "auto_tag": {
-        "auto_tagging_all_paths": "Auto Tagging all paths",
-        "auto_tagging_paths": "Auto Tagging the following paths"
+        "auto_tagging_all_paths": "Auto tagging all paths",
+        "auto_tagging_paths": "Auto tagging the following paths"
       },
-      "auto_tag_based_on_filenames": "Auto-tag content based on file paths.",
-      "auto_tagging": "Auto Tagging",
+      "auto_tag_based_on_filenames": "Auto tag content based on file paths.",
+      "auto_tagging": "Auto tagging",
       "backing_up_database": "Backing up database",
       "backup_and_download": "Performs a backup of the database and downloads the resulting file.",
-      "backup_database": "Performs a backup of the database to the backups directory, with the filename format {filename_format}",
+      "backup_database": "Performs a backup of the database to the backups directory, with the filename format {filename_format}.",
       "cleanup_desc": "Check for missing files and remove them from the database. This is a destructive action.",
       "clean_generated": {
         "blob_files": "Blob files",
         "description": "Removes generated files without a corresponding database entry.",
-        "image_thumbnails": "Image Thumbnails",
+        "image_thumbnails": "Image thumbnails",
         "image_thumbnails_desc": "Image thumbnails and clips",
-        "markers": "Marker Previews",
-        "previews": "Scene Previews",
+        "markers": "Marker previews",
+        "previews": "Scene previews",
         "previews_desc": "Scene previews and thumbnails",
-        "sprites": "Scene Sprites",
-        "transcodes": "Scene Transcodes"
+        "sprites": "Scene sprites",
+        "transcodes": "Scene transcodes"
       },
       "data_management": "Data management",
       "defaults_set": "Defaults have been set and will be used when clicking the {action} button on the Tasks page.",
@@ -522,7 +526,7 @@
       "generate_phashes_during_scan": "Generate video perceptual hashes",
       "generate_phashes_during_scan_tooltip": "For deduplication and scene identification.",
       "generate_previews_during_scan": "Generate animated image previews",
-      "generate_previews_during_scan_tooltip": "Also generate animated (webp) previews, only required when Scene/Marker Wall Preview Type is set to Animated Image. When browsing they use less CPU than the video previews, but are generated in addition to them and are larger files.",
+      "generate_previews_during_scan_tooltip": "Also generate animated (webp) previews, only required when Scene/Marker Wall Preview type is set to Animated image. When browsing they use less CPU than the video previews, but are generated in addition to them and are larger files.",
       "generate_sprites_during_scan": "Generate scrubber sprites",
       "generate_sprites_during_scan_tooltip": "The set of images displayed below the video player for easy navigation.",
       "generate_thumbnails_during_scan": "Generate thumbnails for images",
@@ -589,7 +593,7 @@
     "tools": {
       "graphql_playground": "GraphQL playground",
       "heading": "Tools",
-      "scene_duplicate_checker": "Scene Duplicate Checker",
+      "scene_duplicate_checker": "Scene duplicate checker",
       "scene_filename_parser": {
         "add_field": "Add Field",
         "capitalize_title": "Capitalize title",
@@ -601,7 +605,7 @@
         "ignored_words": "Ignored words",
         "matches_with": "Matches with {i}",
         "select_parser_recipe": "Select Parser Recipe",
-        "title": "Scene Filename Parser",
+        "title": "Scene filename parser",
         "whitespace_chars": "Whitespace characters",
         "whitespace_chars_desc": "These characters will be replaced with whitespace in the title"
       },
@@ -619,8 +623,8 @@
         "option_label": "Custom CSS enabled"
       },
       "troubleshooting_mode": {
-        "button": "Troubleshooting Mode",
-        "dialog_title": "Enable Troubleshooting Mode",
+        "button": "Troubleshooting mode",
+        "dialog_title": "Enable troubleshooting mode",
         "dialog_description": "This will temporarily disable all customizations to help diagnose issues:",
         "dialog_item_plugins": "All plugins",
         "dialog_item_css": "Custom CSS",
@@ -629,22 +633,22 @@
         "dialog_log_level": "Log level will be set to Debug for detailed diagnostics.",
         "dialog_reload_note": "The page will reload automatically.",
         "enable": "Enable & Reload",
-        "overlay_message": "Troubleshooting Mode is active - all customizations are disabled",
+        "overlay_message": "Troubleshooting mode is active - all customizations are disabled",
         "exit": "Exit"
       },
       "custom_javascript": {
-        "description": "Page must be reloaded for changes to take effect. There is no guarantee of compatibility between custom Javascript and future releases of Stash.",
-        "heading": "Custom Javascript",
-        "option_label": "Custom Javascript enabled"
+        "description": "Page must be reloaded for changes to take effect. There is no guarantee of compatibility between custom JavaScript and future releases of Stash.",
+        "heading": "Custom JavaScript",
+        "option_label": "Custom JavaScript enabled"
       },
       "custom_locales": {
         "description": "Override individual locale strings. See https://github.com/stashapp/stash/blob/develop/ui/v2.5/src/locales/en-GB.json for the master list. Page must be reloaded for changes to take effect.",
-        "heading": "Custom localisation",
+        "heading": "Custom Localisation",
         "option_label": "Custom localisation enabled"
       },
       "custom_title": {
         "description": "Custom text to append to the page title. If empty, defaults to 'Stash'.",
-        "heading": "Custom Title"
+        "heading": "Custom title"
       },
       "delete_options": {
         "description": "Default settings when deleting images, galleries, and scenes.",
@@ -656,14 +660,14 @@
       },
       "desktop_integration": {
         "desktop_integration": "Desktop Integration",
-        "notifications_enabled": "Enable Notifications",
-        "send_desktop_notifications_for_events": "Send desktop notifications for events",
-        "skip_opening_browser": "Skip Opening Browser",
-        "skip_opening_browser_on_startup": "Skip auto-opening browser during startup"
+        "notifications_enabled": "Enable notifications",
+        "send_desktop_notifications_for_events": "Send desktop notifications for events.",
+        "skip_opening_browser": "Skip opening browser",
+        "skip_opening_browser_on_startup": "Skip auto-opening browser during startup."
       },
       "detail": {
         "compact_expanded_details": {
-          "description": "When enabled, this option will present expanded details while maintaining a compact presentation",
+          "description": "When enabled, this option will present expanded details while maintaining a compact presentation.",
           "heading": "Compact expanded details"
         },
         "enable_background_image": {
@@ -672,13 +676,13 @@
         },
         "heading": "Detail Page",
         "show_all_details": {
-          "description": "When enabled, all content details will be shown by default and each detail item will fit under a single column",
+          "description": "When enabled, all content details will be shown by default and each detail item will fit under a single column.",
           "heading": "Show all details"
         }
       },
       "editing": {
         "disable_dropdown_create": {
-          "description": "Remove the ability to create new objects from the dropdown selectors",
+          "description": "Remove the ability to create new objects from the dropdown selectors.",
           "heading": "Disable dropdown create"
         },
         "heading": "Editing",
@@ -696,7 +700,7 @@
             }
           },
           "type": {
-            "label": "Rating System Type",
+            "label": "Rating system type",
             "options": {
               "decimal": "Decimal",
               "stars": "Stars"
@@ -706,7 +710,7 @@
       },
       "funscript_offset": {
         "description": "Time offset in milliseconds for interactive scripts playback.",
-        "heading": "Funscript Offset (ms)"
+        "heading": "Funscript offset (ms)"
       },
       "handy_connection": {
         "connect": "Connect",
@@ -719,8 +723,8 @@
         "sync": "Sync"
       },
       "handy_connection_key": {
-        "description": "Handy connection key to use for interactive scenes. Setting this key will allow Stash to share your current scene information with handyfeeling.com",
-        "heading": "Handy Connection Key"
+        "description": "Handy connection key to use for interactive scenes. Setting this key will allow Stash to share your current scene information with handyfeeling.com.",
+        "heading": "Handy connection key"
       },
       "image_lightbox": {
         "heading": "Image Lightbox"
@@ -734,11 +738,11 @@
         "heading": "Images",
         "options": {
           "create_image_clips_from_videos": {
-            "description": "When a library has Videos disabled, Video Files (files ending with Video Extension) will be scanned as Image Clip.",
-            "heading": "Scan Video Extensions as Image Clip"
+            "description": "When a library has Videos disabled, video files (see Video extensions) will be scanned as image clips.",
+            "heading": "Scan video extensions as image clips"
           },
           "write_image_thumbnails": {
-            "description": "Write image thumbnails to disk when generated on-the-fly",
+            "description": "Write image thumbnails to disk when generated on-the-fly.",
             "heading": "Write image thumbnails"
           }
         }
@@ -748,31 +752,31 @@
         "heading": "Language"
       },
       "max_loop_duration": {
-        "description": "Maximum scene duration where scene player will loop the video - 0 to disable",
+        "description": "Maximum scene duration where scene player will loop the video. Set 0 to disable.",
         "heading": "Maximum loop duration"
       },
       "menu_items": {
-        "description": "Show or hide different types of content on the navigation bar",
-        "heading": "Menu Items"
+        "description": "Show or hide different types of content on the navigation bar.",
+        "heading": "Menu items"
       },
       "minimum_play_percent": {
         "description": "The percentage of time in which a scene must be played before its play count is incremented.",
-        "heading": "Minimum Play Percent"
+        "heading": "Minimum play percent"
       },
       "performers": {
         "options": {
           "image_location": {
-            "description": "Custom path for default performer images. Leave empty to use in-built defaults",
-            "heading": "Custom Performer Image Path"
+            "description": "Custom path for default performer images. Leave empty to use built-in defaults.",
+            "heading": "Custom performer image path"
           }
         }
       },
       "preview_type": {
         "description": "The default option is video (mp4) previews. For less CPU usage when browsing, you can use the animated image (webp) previews. However they must be generated in addition to the video previews and are larger files.",
-        "heading": "Preview Type",
+        "heading": "Preview type",
         "options": {
-          "animated": "Animated Image",
-          "static": "Static Image",
+          "animated": "Animated image",
+          "static": "Static image",
           "video": "Video"
         }
       },
@@ -788,22 +792,22 @@
           "always_start_from_beginning": "Always start video from beginning",
           "auto_start_video": "Auto-start video",
           "auto_start_video_on_play_selected": {
-            "description": "Auto-start scene videos when playing from queue, or playing selected or random from Scenes page",
+            "description": "Auto-start scene videos when playing from queue, or playing selected or random from Scenes page.",
             "heading": "Auto-start video when playing selected"
           },
           "continue_playlist_default": {
-            "description": "Play next scene in queue when video finishes",
+            "description": "Play next scene in queue when video finishes.",
             "heading": "Continue playlist by default"
           },
-          "disable_mobile_media_auto_rotate": "Disable auto-rotate of fullscreen media on Mobile",
+          "disable_mobile_media_auto_rotate": "Disable auto-rotate of fullscreen media on mobile",
           "enable_chromecast": "Enable Chromecast",
-          "show_ab_loop_controls": "Show AB Loop plugin controls",
-          "show_scrubber": "Show Scrubber",
-          "show_range_markers": "Show Range Markers",
-          "track_activity": "Enable Scene Play history",
+          "show_ab_loop_controls": "Show AB loop controls",
+          "show_scrubber": "Show scrubber",
+          "show_range_markers": "Show range markers",
+          "track_activity": "Enable scene play history",
           "vr_tag": {
             "description": "The VR button will only be displayed for scenes with this tag.",
-            "heading": "VR Tag"
+            "heading": "VR tag"
           }
         }
       },
@@ -820,27 +824,27 @@
       },
       "sfw_mode": {
         "description": "Enable if using stash to store SFW content. Hides or changes some adult-content-related aspects of the UI.",
-        "heading": "SFW Content Mode"
+        "heading": "SFW content mode"
       },
       "show_tag_card_on_hover": {
-        "description": "Show tag card when hovering tag badges",
+        "description": "Show tag card when hovering tag badges.",
         "heading": "Tag card tooltips"
       },
       "slideshow_delay": {
-        "description": "Slideshow is available in galleries when in wall view mode",
-        "heading": "Slideshow Delay (seconds)"
+        "description": "Slideshow is available in galleries when in wall view mode.",
+        "heading": "Slideshow delay (seconds)"
       },
       "studio_panel": {
-        "heading": "Studio view",
+        "heading": "Studio View",
         "options": {
           "show_child_studio_content": {
-            "description": "In the studio view, display content from the sub-studios as well",
+            "description": "In the studio view, display content from the sub-studios as well.",
             "heading": "Display sub-studios content"
           }
         }
       },
       "performer_list": {
-        "heading": "Performer list",
+        "heading": "Performer List",
         "options": {
           "show_links_on_grid_card": {
             "heading": "Display links on performer grid cards"
@@ -848,17 +852,17 @@
         }
       },
       "tag_panel": {
-        "heading": "Tag view",
+        "heading": "Tag View",
         "options": {
           "show_child_tagged_content": {
-            "description": "In the tag view, display content from the subtags as well",
-            "heading": "Display subtag content"
+            "description": "In the tag view, display content from the sub-tags as well.",
+            "heading": "Display sub-tag content"
           }
         }
       },
       "title": "User Interface",
       "use_stash_hosted_funscript": {
-        "description": "When enabled, funscripts will be served directly from Stash to your Handy device without using the third party Handy server. Requires that Stash be accessible from your Handy device, and that an API key is generated if stash has credentials configured.",
+        "description": "When enabled, funscripts will be served directly from Stash to your Handy device without using the third party Handy server. Requires that Stash be accessible from your Handy device, and that an API key is generated if Stash has credentials configured.",
         "heading": "Serve funscripts directly"
       }
     }
@@ -967,19 +971,19 @@
       "display_mode": {
         "fit_horizontally": "Fit horizontally",
         "fit_to_screen": "Fit to screen",
-        "label": "Display Mode",
+        "label": "Display mode",
         "original": "Original"
       },
       "options": "Options",
       "page_header": "Page {page} / {total}",
       "reset_zoom_on_nav": "Reset zoom level when changing image",
       "scale_up": {
-        "description": "Scale smaller images up to fill screen",
+        "description": "Scale smaller images up to fill screen.",
         "label": "Scale up to fit"
       },
       "scroll_mode": {
         "description": "Hold shift to temporarily use other mode.",
-        "label": "Scroll Mode",
+        "label": "Scroll mode",
         "pan_y": "Pan Y",
         "zoom": "Zoom"
       }
@@ -997,24 +1001,24 @@
       "destination": "Reassign to"
     },
     "scene_gen": {
-      "clip_previews": "Image Clip Previews",
+      "clip_previews": "Image clip previews",
       "covers": "Scene covers",
       "force_transcodes": "Force Transcode generation",
       "force_transcodes_tooltip": "By default, transcodes are only generated when the video file is not supported in the browser. When enabled, transcodes will be generated even when the video file appears to be supported in the browser.",
       "image_phash": "Image perceptual hashes",
       "image_phash_tooltip": "For deduplication and identification",
-      "image_previews": "Animated Image Previews",
-      "image_previews_tooltip": "Also generate animated (webp) previews, only required when Scene/Marker Wall Preview Type is set to Animated Image. When browsing they use less CPU than the video previews, but are generated in addition to them and are larger files.",
-      "image_thumbnails": "Image Thumbnails",
+      "image_previews": "Animated image previews",
+      "image_previews_tooltip": "Also generate animated (webp) previews, only required when Scene/Marker Wall Preview type is set to Animated image. When browsing they use less CPU than the video previews, but are generated in addition to them and are larger files.",
+      "image_thumbnails": "Image thumbnails",
       "interactive_heatmap_speed": "Generate heatmaps and speeds for interactive scenes",
-      "marker_image_previews": "Marker Animated Image Previews",
-      "marker_image_previews_tooltip": "Also generate animated (webp) previews, only required when Scene/Marker Wall Preview Type is set to Animated Image. When browsing they use less CPU than the video previews, but are generated in addition to them and are larger files.",
-      "marker_screenshots": "Marker Screenshots",
+      "marker_image_previews": "Marker animated image previews",
+      "marker_image_previews_tooltip": "Also generate animated (webp) previews, only required when Scene/Marker Wall Preview type is set to Animated image. When browsing they use less CPU than the video previews, but are generated in addition to them and are larger files.",
+      "marker_screenshots": "Marker screenshots",
       "marker_screenshots_tooltip": "Marker static JPG images",
-      "markers": "Marker Previews",
+      "markers": "Marker previews",
       "markers_tooltip": "20 second videos which begin at the given timecode.",
-      "override_preview_generation_options": "Override Preview Generation Options",
-      "override_preview_generation_options_desc": "Override Preview Generation Options for this operation. Defaults are set in System -> Preview Generation.",
+      "override_preview_generation_options": "Override preview generation options",
+      "override_preview_generation_options_desc": "Override preview generation options for this operation. Defaults are set in System -> Preview Generation.",
       "overwrite": "Overwrite existing files",
       "phash": "Video perceptual hashes",
       "phash_tooltip": "For deduplication and scene identification",
@@ -1022,7 +1026,7 @@
       "preview_exclude_end_time_head": "Exclude end time",
       "preview_exclude_start_time_desc": "Exclude the first x seconds from scene previews. This can be a value in seconds, or a percentage (eg 2%) of the total scene duration.",
       "preview_exclude_start_time_head": "Exclude start time",
-      "preview_generation_options": "Preview Generation Options",
+      "preview_generation_options": "Preview generation options",
       "preview_options": "Preview Options",
       "preview_preset_desc": "The preset regulates size, quality and encoding time of preview generation. Presets beyond “slow” have diminishing returns and are not recommended.",
       "preview_preset_head": "Preview encoding preset",
@@ -1030,7 +1034,7 @@
       "preview_seg_count_head": "Number of segments in preview",
       "preview_seg_duration_desc": "Duration of each preview segment, in seconds.",
       "preview_seg_duration_head": "Preview segment duration",
-      "sprites": "Scene Scrubber Sprites",
+      "sprites": "Scene scrubber sprites",
       "sprites_tooltip": "The set of images displayed below the video player for easy navigation.",
       "transcodes": "Transcodes",
       "transcodes_tooltip": "MP4 transcodes will be pre-generated for all content; useful for slow CPUs but requires much more disk space",
@@ -1183,7 +1187,7 @@
   "height_cm": "Height (cm)",
   "help": "Help",
   "history": "History",
-  "ignore_auto_tag": "Ignore Auto Tag",
+  "ignore_auto_tag": "Ignore auto tag",
   "image": "Image",
   "image_count": "Image Count",
   "image_index": "Image #",
@@ -1252,16 +1256,16 @@
   "organized": "Organised",
   "orientation": "Orientation",
   "package_manager": {
-    "add_source": "Add Source",
-    "check_for_updates": "Check for Updates",
+    "add_source": "Add source",
+    "check_for_updates": "Check for updates",
     "confirm_delete_source": "Are you sure you want to delete source {name} ({url})?",
     "confirm_uninstall": "Are you sure you want to uninstall {number} packages?",
     "description": "Description",
-    "edit_source": "Edit Source",
+    "edit_source": "Edit source",
     "hide_unselected": "Hide unselected",
     "install": "Install",
-    "installed_version": "Installed Version",
-    "latest_version": "Latest Version",
+    "installed_version": "Installed version",
+    "latest_version": "Latest version",
     "no_packages": "No packages found",
     "no_sources": "No sources configured",
     "no_upgradable": "No upgradable packages found",
@@ -1272,7 +1276,7 @@
     "source": {
       "local_path": {
         "description": "Relative path to store packages for this source. Note that changing this requires the packages to be moved manually.",
-        "heading": "Local Path"
+        "heading": "Local path"
       },
       "name": "Name",
       "url": "Source URL"

From 5cf41c8c8edf22b7c864689a01a84eeb7633eccd Mon Sep 17 00:00:00 2001
From: InfiniteStash <117855276+InfiniteStash@users.noreply.github.com>
Date: Wed, 11 Feb 2026 01:26:05 +0100
Subject: [PATCH 285/405] Remove unused stash-box fingerprint queries (#6561)

* Remove unused stash-box fingerprint query
* Remove findSceneByFingerprint
---
 graphql/stash-box/query.graphql          |  12 -
 pkg/stashbox/graphql/generated_client.go | 334 -----------------------
 2 files changed, 346 deletions(-)

diff --git a/graphql/stash-box/query.graphql b/graphql/stash-box/query.graphql
index 2367e85cf..e2686ac4d 100644
--- a/graphql/stash-box/query.graphql
+++ b/graphql/stash-box/query.graphql
@@ -120,18 +120,6 @@ fragment SceneFragment on Scene {
   }
 }
 
-query FindSceneByFingerprint($fingerprint: FingerprintQueryInput!) {
-  findSceneByFingerprint(fingerprint: $fingerprint) {
-    ...SceneFragment
-  }
-}
-
-query FindScenesByFullFingerprints($fingerprints: [FingerprintQueryInput!]!) {
-  findScenesByFullFingerprints(fingerprints: $fingerprints) {
-    ...SceneFragment
-  }
-}
-
 query FindScenesBySceneFingerprints(
   $fingerprints: [[FingerprintQueryInput!]!]!
 ) {
diff --git a/pkg/stashbox/graphql/generated_client.go b/pkg/stashbox/graphql/generated_client.go
index 640a1c893..29b702a7f 100644
--- a/pkg/stashbox/graphql/generated_client.go
+++ b/pkg/stashbox/graphql/generated_client.go
@@ -9,8 +9,6 @@ import (
 )
 
 type StashBoxGraphQLClient interface {
-	FindSceneByFingerprint(ctx context.Context, fingerprint FingerprintQueryInput, interceptors ...clientv2.RequestInterceptor) (*FindSceneByFingerprint, error)
-	FindScenesByFullFingerprints(ctx context.Context, fingerprints []*FingerprintQueryInput, interceptors ...clientv2.RequestInterceptor) (*FindScenesByFullFingerprints, error)
 	FindScenesBySceneFingerprints(ctx context.Context, fingerprints [][]*FingerprintQueryInput, interceptors ...clientv2.RequestInterceptor) (*FindScenesBySceneFingerprints, error)
 	SearchScene(ctx context.Context, term string, interceptors ...clientv2.RequestInterceptor) (*SearchScene, error)
 	SearchPerformer(ctx context.Context, term string, interceptors ...clientv2.RequestInterceptor) (*SearchPerformer, error)
@@ -536,42 +534,6 @@ func (t *SceneFragment_Studio_StudioFragment_Parent) GetName() string {
 	return t.Name
 }
 
-type FindSceneByFingerprint_FindSceneByFingerprint_SceneFragment_Studio_StudioFragment_Parent struct {
-	ID   string "json:\"id\" graphql:\"id\""
-	Name string "json:\"name\" graphql:\"name\""
-}
-
-func (t *FindSceneByFingerprint_FindSceneByFingerprint_SceneFragment_Studio_StudioFragment_Parent) GetID() string {
-	if t == nil {
-		t = &FindSceneByFingerprint_FindSceneByFingerprint_SceneFragment_Studio_StudioFragment_Parent{}
-	}
-	return t.ID
-}
-func (t *FindSceneByFingerprint_FindSceneByFingerprint_SceneFragment_Studio_StudioFragment_Parent) GetName() string {
-	if t == nil {
-		t = &FindSceneByFingerprint_FindSceneByFingerprint_SceneFragment_Studio_StudioFragment_Parent{}
-	}
-	return t.Name
-}
-
-type FindScenesByFullFingerprints_FindScenesByFullFingerprints_SceneFragment_Studio_StudioFragment_Parent struct {
-	ID   string "json:\"id\" graphql:\"id\""
-	Name string "json:\"name\" graphql:\"name\""
-}
-
-func (t *FindScenesByFullFingerprints_FindScenesByFullFingerprints_SceneFragment_Studio_StudioFragment_Parent) GetID() string {
-	if t == nil {
-		t = &FindScenesByFullFingerprints_FindScenesByFullFingerprints_SceneFragment_Studio_StudioFragment_Parent{}
-	}
-	return t.ID
-}
-func (t *FindScenesByFullFingerprints_FindScenesByFullFingerprints_SceneFragment_Studio_StudioFragment_Parent) GetName() string {
-	if t == nil {
-		t = &FindScenesByFullFingerprints_FindScenesByFullFingerprints_SceneFragment_Studio_StudioFragment_Parent{}
-	}
-	return t.Name
-}
-
 type FindScenesBySceneFingerprints_FindScenesBySceneFingerprints_SceneFragment_Studio_StudioFragment_Parent struct {
 	ID   string "json:\"id\" graphql:\"id\""
 	Name string "json:\"name\" graphql:\"name\""
@@ -695,28 +657,6 @@ func (t *SubmitPerformerDraft_SubmitPerformerDraft) GetID() *string {
 	return t.ID
 }
 
-type FindSceneByFingerprint struct {
-	FindSceneByFingerprint []*SceneFragment "json:\"findSceneByFingerprint\" graphql:\"findSceneByFingerprint\""
-}
-
-func (t *FindSceneByFingerprint) GetFindSceneByFingerprint() []*SceneFragment {
-	if t == nil {
-		t = &FindSceneByFingerprint{}
-	}
-	return t.FindSceneByFingerprint
-}
-
-type FindScenesByFullFingerprints struct {
-	FindScenesByFullFingerprints []*SceneFragment "json:\"findScenesByFullFingerprints\" graphql:\"findScenesByFullFingerprints\""
-}
-
-func (t *FindScenesByFullFingerprints) GetFindScenesByFullFingerprints() []*SceneFragment {
-	if t == nil {
-		t = &FindScenesByFullFingerprints{}
-	}
-	return t.FindScenesByFullFingerprints
-}
-
 type FindScenesBySceneFingerprints struct {
 	FindScenesBySceneFingerprints [][]*SceneFragment "json:\"findScenesBySceneFingerprints\" graphql:\"findScenesBySceneFingerprints\""
 }
@@ -849,278 +789,6 @@ func (t *SubmitPerformerDraft) GetSubmitPerformerDraft() *SubmitPerformerDraft_S
 	return &t.SubmitPerformerDraft
 }
 
-const FindSceneByFingerprintDocument = `query FindSceneByFingerprint ($fingerprint: FingerprintQueryInput!) {
-	findSceneByFingerprint(fingerprint: $fingerprint) {
-		... SceneFragment
-	}
-}
-fragment SceneFragment on Scene {
-	id
-	title
-	code
-	details
-	director
-	duration
-	date
-	urls {
-		... URLFragment
-	}
-	images {
-		... ImageFragment
-	}
-	studio {
-		... StudioFragment
-	}
-	tags {
-		... TagFragment
-	}
-	performers {
-		... PerformerAppearanceFragment
-	}
-	fingerprints {
-		... FingerprintFragment
-	}
-}
-fragment URLFragment on URL {
-	url
-	type
-}
-fragment ImageFragment on Image {
-	id
-	url
-	width
-	height
-}
-fragment StudioFragment on Studio {
-	name
-	id
-	aliases
-	urls {
-		... URLFragment
-	}
-	parent {
-		name
-		id
-	}
-	images {
-		... ImageFragment
-	}
-}
-fragment TagFragment on Tag {
-	name
-	id
-}
-fragment PerformerAppearanceFragment on PerformerAppearance {
-	as
-	performer {
-		... PerformerFragment
-	}
-}
-fragment PerformerFragment on Performer {
-	id
-	name
-	disambiguation
-	aliases
-	gender
-	merged_ids
-	deleted
-	merged_into_id
-	urls {
-		... URLFragment
-	}
-	images {
-		... ImageFragment
-	}
-	birth_date
-	death_date
-	ethnicity
-	country
-	eye_color
-	hair_color
-	height
-	measurements {
-		... MeasurementsFragment
-	}
-	breast_type
-	career_start_year
-	career_end_year
-	tattoos {
-		... BodyModificationFragment
-	}
-	piercings {
-		... BodyModificationFragment
-	}
-}
-fragment MeasurementsFragment on Measurements {
-	band_size
-	cup_size
-	waist
-	hip
-}
-fragment BodyModificationFragment on BodyModification {
-	location
-	description
-}
-fragment FingerprintFragment on Fingerprint {
-	algorithm
-	hash
-	duration
-}
-`
-
-func (c *Client) FindSceneByFingerprint(ctx context.Context, fingerprint FingerprintQueryInput, interceptors ...clientv2.RequestInterceptor) (*FindSceneByFingerprint, error) {
-	vars := map[string]any{
-		"fingerprint": fingerprint,
-	}
-
-	var res FindSceneByFingerprint
-	if err := c.Client.Post(ctx, "FindSceneByFingerprint", FindSceneByFingerprintDocument, &res, vars, interceptors...); err != nil {
-		if c.Client.ParseDataWhenErrors {
-			return &res, err
-		}
-
-		return nil, err
-	}
-
-	return &res, nil
-}
-
-const FindScenesByFullFingerprintsDocument = `query FindScenesByFullFingerprints ($fingerprints: [FingerprintQueryInput!]!) {
-	findScenesByFullFingerprints(fingerprints: $fingerprints) {
-		... SceneFragment
-	}
-}
-fragment SceneFragment on Scene {
-	id
-	title
-	code
-	details
-	director
-	duration
-	date
-	urls {
-		... URLFragment
-	}
-	images {
-		... ImageFragment
-	}
-	studio {
-		... StudioFragment
-	}
-	tags {
-		... TagFragment
-	}
-	performers {
-		... PerformerAppearanceFragment
-	}
-	fingerprints {
-		... FingerprintFragment
-	}
-}
-fragment URLFragment on URL {
-	url
-	type
-}
-fragment ImageFragment on Image {
-	id
-	url
-	width
-	height
-}
-fragment StudioFragment on Studio {
-	name
-	id
-	aliases
-	urls {
-		... URLFragment
-	}
-	parent {
-		name
-		id
-	}
-	images {
-		... ImageFragment
-	}
-}
-fragment TagFragment on Tag {
-	name
-	id
-}
-fragment PerformerAppearanceFragment on PerformerAppearance {
-	as
-	performer {
-		... PerformerFragment
-	}
-}
-fragment PerformerFragment on Performer {
-	id
-	name
-	disambiguation
-	aliases
-	gender
-	merged_ids
-	deleted
-	merged_into_id
-	urls {
-		... URLFragment
-	}
-	images {
-		... ImageFragment
-	}
-	birth_date
-	death_date
-	ethnicity
-	country
-	eye_color
-	hair_color
-	height
-	measurements {
-		... MeasurementsFragment
-	}
-	breast_type
-	career_start_year
-	career_end_year
-	tattoos {
-		... BodyModificationFragment
-	}
-	piercings {
-		... BodyModificationFragment
-	}
-}
-fragment MeasurementsFragment on Measurements {
-	band_size
-	cup_size
-	waist
-	hip
-}
-fragment BodyModificationFragment on BodyModification {
-	location
-	description
-}
-fragment FingerprintFragment on Fingerprint {
-	algorithm
-	hash
-	duration
-}
-`
-
-func (c *Client) FindScenesByFullFingerprints(ctx context.Context, fingerprints []*FingerprintQueryInput, interceptors ...clientv2.RequestInterceptor) (*FindScenesByFullFingerprints, error) {
-	vars := map[string]any{
-		"fingerprints": fingerprints,
-	}
-
-	var res FindScenesByFullFingerprints
-	if err := c.Client.Post(ctx, "FindScenesByFullFingerprints", FindScenesByFullFingerprintsDocument, &res, vars, interceptors...); err != nil {
-		if c.Client.ParseDataWhenErrors {
-			return &res, err
-		}
-
-		return nil, err
-	}
-
-	return &res, nil
-}
-
 const FindScenesBySceneFingerprintsDocument = `query FindScenesBySceneFingerprints ($fingerprints: [[FingerprintQueryInput!]!]!) {
 	findScenesBySceneFingerprints(fingerprints: $fingerprints) {
 		... SceneFragment
@@ -1890,8 +1558,6 @@ func (c *Client) SubmitPerformerDraft(ctx context.Context, input PerformerDraftI
 }
 
 var DocumentOperationNames = map[string]string{
-	FindSceneByFingerprintDocument:        "FindSceneByFingerprint",
-	FindScenesByFullFingerprintsDocument:  "FindScenesByFullFingerprints",
 	FindScenesBySceneFingerprintsDocument: "FindScenesBySceneFingerprints",
 	SearchSceneDocument:                   "SearchScene",
 	SearchPerformerDocument:               "SearchPerformer",

From 5628fbc5d3cdd6867e6069b9b4889701b8892359 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Wed, 11 Feb 2026 11:27:57 +1100
Subject: [PATCH 286/405] Merge tag values dialog (#6552)

* Change tag merge to accept values.

MergeHierarchy is removed as it is no longer needed

* Add tag merge value dialog to choose values when merging
---
 graphql/schema/types/tag.graphql              |   2 +
 internal/api/resolver_mutation_tag.go         |  86 ++--
 pkg/tag/update.go                             |  46 --
 ui/v2.5/graphql/data/tag.graphql              |   2 +
 ui/v2.5/graphql/mutations/tag.graphql         |  10 +-
 ui/v2.5/graphql/queries/tag.graphql           |   8 +-
 .../Performers/PerformerMergeDialog.tsx       |  46 +-
 .../Shared/ScrapeDialog/ScrapeDialogRow.tsx   |  29 +-
 .../Shared/ScrapeDialog/scrapeResult.ts       |   3 +
 .../src/components/Tags/TagMergeDialog.tsx    | 448 +++++++++++++++++-
 ui/v2.5/src/core/StashService.ts              |   8 +
 11 files changed, 565 insertions(+), 123 deletions(-)

diff --git a/graphql/schema/types/tag.graphql b/graphql/schema/types/tag.graphql
index 2210c900e..0acbc927f 100644
--- a/graphql/schema/types/tag.graphql
+++ b/graphql/schema/types/tag.graphql
@@ -78,6 +78,8 @@ type FindTagsResultType {
 input TagsMergeInput {
   source: [ID!]!
   destination: ID!
+  # values defined here will override values in the destination
+  values: TagUpdateInput
 }
 
 input BulkTagUpdateInput {
diff --git a/internal/api/resolver_mutation_tag.go b/internal/api/resolver_mutation_tag.go
index 31c7980f6..ac0183b74 100644
--- a/internal/api/resolver_mutation_tag.go
+++ b/internal/api/resolver_mutation_tag.go
@@ -6,7 +6,6 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/stashapp/stash/pkg/logger"
 	"github.com/stashapp/stash/pkg/models"
 	"github.com/stashapp/stash/pkg/plugin/hook"
 	"github.com/stashapp/stash/pkg/sliceutil/stringslice"
@@ -103,17 +102,7 @@ func (r *mutationResolver) TagCreate(ctx context.Context, input TagCreateInput)
 	return r.getTag(ctx, newTag.ID)
 }
 
-func (r *mutationResolver) TagUpdate(ctx context.Context, input TagUpdateInput) (*models.Tag, error) {
-	tagID, err := strconv.Atoi(input.ID)
-	if err != nil {
-		return nil, fmt.Errorf("converting id: %w", err)
-	}
-
-	translator := changesetTranslator{
-		inputMap: getUpdateInputMap(ctx),
-	}
-
-	// Populate tag from the input
+func tagPartialFromInput(input TagUpdateInput, translator changesetTranslator) (*models.TagPartial, error) {
 	updatedTag := models.NewTagPartial()
 
 	updatedTag.Name = translator.optionalString(input.Name, "name")
@@ -132,6 +121,7 @@ func (r *mutationResolver) TagUpdate(ctx context.Context, input TagUpdateInput)
 	}
 	updatedTag.StashIDs = translator.updateStashIDs(updateStashIDInputs, "stash_ids")
 
+	var err error
 	updatedTag.ParentIDs, err = translator.updateIds(input.ParentIds, "parent_ids")
 	if err != nil {
 		return nil, fmt.Errorf("converting parent tag ids: %w", err)
@@ -149,6 +139,25 @@ func (r *mutationResolver) TagUpdate(ctx context.Context, input TagUpdateInput)
 		updatedTag.CustomFields.Partial = convertMapJSONNumbers(updatedTag.CustomFields.Partial)
 	}
 
+	return &updatedTag, nil
+}
+
+func (r *mutationResolver) TagUpdate(ctx context.Context, input TagUpdateInput) (*models.Tag, error) {
+	tagID, err := strconv.Atoi(input.ID)
+	if err != nil {
+		return nil, fmt.Errorf("converting id: %w", err)
+	}
+
+	translator := changesetTranslator{
+		inputMap: getUpdateInputMap(ctx),
+	}
+
+	// Populate tag from the input
+	updatedTag, err := tagPartialFromInput(input, translator)
+	if err != nil {
+		return nil, err
+	}
+
 	var imageData []byte
 	imageIncluded := translator.hasField("image")
 	if input.Image != nil {
@@ -185,11 +194,11 @@ func (r *mutationResolver) TagUpdate(ctx context.Context, input TagUpdateInput)
 			}
 		}
 
-		if err := tag.ValidateUpdate(ctx, tagID, updatedTag, qb); err != nil {
+		if err := tag.ValidateUpdate(ctx, tagID, *updatedTag, qb); err != nil {
 			return err
 		}
 
-		t, err = qb.UpdatePartial(ctx, tagID, updatedTag)
+		t, err = qb.UpdatePartial(ctx, tagID, *updatedTag)
 		if err != nil {
 			return err
 		}
@@ -337,6 +346,31 @@ func (r *mutationResolver) TagsMerge(ctx context.Context, input TagsMergeInput)
 		return nil, nil
 	}
 
+	var values *models.TagPartial
+	var imageData []byte
+
+	if input.Values != nil {
+		translator := changesetTranslator{
+			inputMap: getNamedUpdateInputMap(ctx, "input.values"),
+		}
+
+		values, err = tagPartialFromInput(*input.Values, translator)
+		if err != nil {
+			return nil, err
+		}
+
+		if input.Values.Image != nil {
+			var err error
+			imageData, err = utils.ProcessImageInput(ctx, *input.Values.Image)
+			if err != nil {
+				return nil, fmt.Errorf("processing cover image: %w", err)
+			}
+		}
+	} else {
+		v := models.NewTagPartial()
+		values = &v
+	}
+
 	var t *models.Tag
 	if err := r.withTxn(ctx, func(ctx context.Context) error {
 		qb := r.repository.Tag
@@ -351,28 +385,22 @@ func (r *mutationResolver) TagsMerge(ctx context.Context, input TagsMergeInput)
 			return fmt.Errorf("tag with id %d not found", destination)
 		}
 
-		parents, children, err := tag.MergeHierarchy(ctx, destination, source, qb)
-		if err != nil {
-			return err
-		}
-
 		if err = qb.Merge(ctx, source, destination); err != nil {
 			return err
 		}
 
-		err = qb.UpdateParentTags(ctx, destination, parents)
-		if err != nil {
-			return err
-		}
-		err = qb.UpdateChildTags(ctx, destination, children)
-		if err != nil {
+		if err := tag.ValidateUpdate(ctx, destination, *values, qb); err != nil {
 			return err
 		}
 
-		err = tag.ValidateHierarchyExisting(ctx, t, parents, children, qb)
-		if err != nil {
-			logger.Errorf("Error merging tag: %s", err)
-			return err
+		if _, err := qb.UpdatePartial(ctx, destination, *values); err != nil {
+			return fmt.Errorf("updating tag: %w", err)
+		}
+
+		if len(imageData) > 0 {
+			if err := qb.UpdateImage(ctx, destination, imageData); err != nil {
+				return err
+			}
 		}
 
 		return nil
diff --git a/pkg/tag/update.go b/pkg/tag/update.go
index 99e9b9165..4a3a2901a 100644
--- a/pkg/tag/update.go
+++ b/pkg/tag/update.go
@@ -220,49 +220,3 @@ func ValidateHierarchyExisting(ctx context.Context, tag *models.Tag, parentIDs,
 
 	return nil
 }
-
-func MergeHierarchy(ctx context.Context, destination int, sources []int, qb RelationshipFinder) ([]int, []int, error) {
-	var mergedParents, mergedChildren []int
-	allIds := append([]int{destination}, sources...)
-
-	addTo := func(mergedItems []int, tagIDs []int) []int {
-	Tags:
-		for _, tagID := range tagIDs {
-			// Ignore tags which are already set
-			for _, existingItem := range mergedItems {
-				if tagID == existingItem {
-					continue Tags
-				}
-			}
-
-			// Ignore tags which are being merged, as these are rolled up anyway (if A is merged into B any direct link between them can be ignored)
-			for _, id := range allIds {
-				if tagID == id {
-					continue Tags
-				}
-			}
-
-			mergedItems = append(mergedItems, tagID)
-		}
-
-		return mergedItems
-	}
-
-	for _, id := range allIds {
-		parents, err := qb.GetParentIDs(ctx, id)
-		if err != nil {
-			return nil, nil, err
-		}
-
-		mergedParents = addTo(mergedParents, parents)
-
-		children, err := qb.GetChildIDs(ctx, id)
-		if err != nil {
-			return nil, nil, err
-		}
-
-		mergedChildren = addTo(mergedChildren, children)
-	}
-
-	return mergedParents, mergedChildren, nil
-}
diff --git a/ui/v2.5/graphql/data/tag.graphql b/ui/v2.5/graphql/data/tag.graphql
index e640af0c9..19438e2a4 100644
--- a/ui/v2.5/graphql/data/tag.graphql
+++ b/ui/v2.5/graphql/data/tag.graphql
@@ -34,6 +34,8 @@ fragment TagData on Tag {
   children {
     ...SlimTagData
   }
+
+  custom_fields
 }
 
 fragment SelectTagData on Tag {
diff --git a/ui/v2.5/graphql/mutations/tag.graphql b/ui/v2.5/graphql/mutations/tag.graphql
index f2138e057..33c50833a 100644
--- a/ui/v2.5/graphql/mutations/tag.graphql
+++ b/ui/v2.5/graphql/mutations/tag.graphql
@@ -24,8 +24,14 @@ mutation BulkTagUpdate($input: BulkTagUpdateInput!) {
   }
 }
 
-mutation TagsMerge($source: [ID!]!, $destination: ID!) {
-  tagsMerge(input: { source: $source, destination: $destination }) {
+mutation TagsMerge(
+  $source: [ID!]!
+  $destination: ID!
+  $values: TagUpdateInput
+) {
+  tagsMerge(
+    input: { source: $source, destination: $destination, values: $values }
+  ) {
     ...TagData
   }
 }
diff --git a/ui/v2.5/graphql/queries/tag.graphql b/ui/v2.5/graphql/queries/tag.graphql
index e0b20ee02..c91315f99 100644
--- a/ui/v2.5/graphql/queries/tag.graphql
+++ b/ui/v2.5/graphql/queries/tag.graphql
@@ -1,5 +1,9 @@
-query FindTags($filter: FindFilterType, $tag_filter: TagFilterType) {
-  findTags(filter: $filter, tag_filter: $tag_filter) {
+query FindTags(
+  $filter: FindFilterType
+  $tag_filter: TagFilterType
+  $ids: [ID!]
+) {
+  findTags(filter: $filter, tag_filter: $tag_filter, ids: $ids) {
     count
     tags {
       ...TagData
diff --git a/ui/v2.5/src/components/Performers/PerformerMergeDialog.tsx b/ui/v2.5/src/components/Performers/PerformerMergeDialog.tsx
index 834d2ac76..ab4a6fed5 100644
--- a/ui/v2.5/src/components/Performers/PerformerMergeDialog.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerMergeDialog.tsx
@@ -19,6 +19,7 @@ import { useToast } from "src/hooks/Toast";
 import { faExchangeAlt, faSignInAlt } from "@fortawesome/free-solid-svg-icons";
 import { ScrapeDialog } from "../Shared/ScrapeDialog/ScrapeDialog";
 import {
+  ScrapedCustomFieldRows,
   ScrapedImageRow,
   ScrapedInputGroupRow,
   ScrapedStringListRow,
@@ -27,9 +28,9 @@ import {
 import { ModalComponent } from "../Shared/Modal";
 import { sortStoredIdObjects } from "src/utils/data";
 import {
+  CustomFieldScrapeResults,
   ObjectListScrapeResult,
   ScrapeResult,
-  ZeroableScrapeResult,
   hasScrapedValues,
 } from "../Shared/ScrapeDialog/scrapeResult";
 import { ScrapedTagsRow } from "../Shared/ScrapeDialog/ScrapedObjectsRow";
@@ -40,39 +41,6 @@ import {
 import { PerformerSelect } from "./PerformerSelect";
 import { uniq } from "lodash-es";
 
-/* eslint-disable-next-line @typescript-eslint/no-explicit-any */
-type CustomFieldScrapeResults = Map<string, ZeroableScrapeResult<any>>;
-
-// There are a bunch of similar functions in PerformerScrapeDialog, but since we don't support
-// scraping custom fields, this one is only needed here. The `renderScraped` naming is kept the same
-// for consistency.
-function renderScrapedCustomFieldRows(
-  results: CustomFieldScrapeResults,
-  onChange: (newCustomFields: CustomFieldScrapeResults) => void
-) {
-  return (
-    <>
-      {Array.from(results.entries()).map(([field, result]) => {
-        const fieldName = `custom_${field}`;
-        return (
-          <ScrapedInputGroupRow
-            className="custom-field"
-            title={field}
-            field={fieldName}
-            key={fieldName}
-            result={result}
-            onChange={(newResult) => {
-              const newResults = new Map(results);
-              newResults.set(field, newResult);
-              onChange(newResults);
-            }}
-          />
-        );
-      })}
-    </>
-  );
-}
-
 type MergeOptions = {
   values: GQL.PerformerUpdateInput;
 };
@@ -604,10 +572,12 @@ const PerformerMergeDetails: React.FC<IPerformerMergeDetailsProps> = ({
           result={image}
           onChange={(value) => setImage(value)}
         />
-        {hasCustomFieldValues &&
-          renderScrapedCustomFieldRows(customFields, (newCustomFields) =>
-            setCustomFields(newCustomFields)
-          )}
+        {hasCustomFieldValues && (
+          <ScrapedCustomFieldRows
+            results={customFields}
+            onChange={(newCustomFields) => setCustomFields(newCustomFields)}
+          />
+        )}
       </>
     );
   }
diff --git a/ui/v2.5/src/components/Shared/ScrapeDialog/ScrapeDialogRow.tsx b/ui/v2.5/src/components/Shared/ScrapeDialog/ScrapeDialogRow.tsx
index 88b79d87d..677ecb87f 100644
--- a/ui/v2.5/src/components/Shared/ScrapeDialog/ScrapeDialogRow.tsx
+++ b/ui/v2.5/src/components/Shared/ScrapeDialog/ScrapeDialogRow.tsx
@@ -14,7 +14,7 @@ import { getCountryByISO } from "src/utils/country";
 import { CountrySelect } from "../CountrySelect";
 import { StringListInput } from "../StringListInput";
 import { ImageSelector } from "../ImageSelector";
-import { ScrapeResult } from "./scrapeResult";
+import { CustomFieldScrapeResults, ScrapeResult } from "./scrapeResult";
 import { ScrapeDialogContext } from "./ScrapeDialog";
 
 function renderButtonIcon(selected: boolean) {
@@ -431,3 +431,30 @@ export const ScrapedCountryRow: React.FC<IScrapedCountryRowProps> = ({
     onChange={onChange}
   />
 );
+
+export const ScrapedCustomFieldRows: React.FC<{
+  results: CustomFieldScrapeResults;
+  onChange: (newCustomFields: CustomFieldScrapeResults) => void;
+}> = ({ results, onChange }) => {
+  return (
+    <>
+      {Array.from(results.entries()).map(([field, result]) => {
+        const fieldName = `custom_${field}`;
+        return (
+          <ScrapedInputGroupRow
+            className="custom-field"
+            title={field}
+            field={fieldName}
+            key={fieldName}
+            result={result}
+            onChange={(newResult) => {
+              const newResults = new Map(results);
+              newResults.set(field, newResult);
+              onChange(newResults);
+            }}
+          />
+        );
+      })}
+    </>
+  );
+};
diff --git a/ui/v2.5/src/components/Shared/ScrapeDialog/scrapeResult.ts b/ui/v2.5/src/components/Shared/ScrapeDialog/scrapeResult.ts
index b9b88cef0..63d1c76c1 100644
--- a/ui/v2.5/src/components/Shared/ScrapeDialog/scrapeResult.ts
+++ b/ui/v2.5/src/components/Shared/ScrapeDialog/scrapeResult.ts
@@ -2,6 +2,9 @@ import lodashIsEqual from "lodash-es/isEqual";
 import clone from "lodash-es/clone";
 import { IHasStoredID } from "src/utils/data";
 
+/* eslint-disable-next-line @typescript-eslint/no-explicit-any */
+export type CustomFieldScrapeResults = Map<string, ZeroableScrapeResult<any>>;
+
 export class ScrapeResult<T> {
   public newValue?: T;
   public originalValue?: T;
diff --git a/ui/v2.5/src/components/Tags/TagMergeDialog.tsx b/ui/v2.5/src/components/Tags/TagMergeDialog.tsx
index 15b648af5..a66ce5789 100644
--- a/ui/v2.5/src/components/Tags/TagMergeDialog.tsx
+++ b/ui/v2.5/src/components/Tags/TagMergeDialog.tsx
@@ -1,13 +1,412 @@
 import { Button, Form, Col, Row } from "react-bootstrap";
-import React, { useEffect, useState } from "react";
+import * as GQL from "src/core/generated-graphql";
+import React, { useCallback, useEffect, useMemo, useState } from "react";
 import { Icon } from "../Shared/Icon";
 import { ModalComponent } from "src/components/Shared/Modal";
 import * as FormUtils from "src/utils/form";
-import { useTagsMerge } from "src/core/StashService";
-import { useIntl } from "react-intl";
+import { queryFindTagsByID, useTagsMerge } from "src/core/StashService";
+import { FormattedMessage, useIntl } from "react-intl";
 import { useToast } from "src/hooks/Toast";
 import { faExchangeAlt, faSignInAlt } from "@fortawesome/free-solid-svg-icons";
 import { Tag, TagSelect } from "./TagSelect";
+import {
+  CustomFieldScrapeResults,
+  hasScrapedValues,
+  ObjectListScrapeResult,
+  ScrapeResult,
+} from "../Shared/ScrapeDialog/scrapeResult";
+import { sortStoredIdObjects } from "src/utils/data";
+import ImageUtils from "src/utils/image";
+import { uniq } from "lodash-es";
+import { LoadingIndicator } from "../Shared/LoadingIndicator";
+import {
+  ScrapedCustomFieldRows,
+  ScrapeDialogRow,
+  ScrapedImageRow,
+  ScrapedInputGroupRow,
+  ScrapedStringListRow,
+  ScrapedTextAreaRow,
+} from "../Shared/ScrapeDialog/ScrapeDialogRow";
+import { ScrapedTagsRow } from "../Shared/ScrapeDialog/ScrapedObjectsRow";
+import { StringListSelect } from "../Shared/Select";
+import { ScrapeDialog } from "../Shared/ScrapeDialog/ScrapeDialog";
+
+interface IStashIDsField {
+  values: GQL.StashId[];
+}
+
+const StashIDsField: React.FC<IStashIDsField> = ({ values }) => {
+  return <StringListSelect value={values.map((v) => v.stash_id)} />;
+};
+
+interface ITagMergeDetailsProps {
+  sources: GQL.TagDataFragment[];
+  dest: GQL.TagDataFragment;
+  onClose: (values?: GQL.TagUpdateInput) => void;
+}
+
+const TagMergeDetails: React.FC<ITagMergeDetailsProps> = ({
+  sources,
+  dest,
+  onClose,
+}) => {
+  const intl = useIntl();
+
+  const [loading, setLoading] = useState(true);
+
+  const filterCandidates = useCallback(
+    (t: { stored_id: string }) =>
+      t.stored_id !== dest.id && sources.every((s) => s.id !== t.stored_id),
+    [dest.id, sources]
+  );
+
+  const [name, setName] = useState<ScrapeResult<string>>(
+    new ScrapeResult<string>(dest.name)
+  );
+  const [sortName, setSortName] = useState<ScrapeResult<string>>(
+    new ScrapeResult<string>(dest.sort_name)
+  );
+  const [aliases, setAliases] = useState<ScrapeResult<string[]>>(
+    new ScrapeResult<string[]>(dest.aliases)
+  );
+  const [description, setDescription] = useState<ScrapeResult<string>>(
+    new ScrapeResult<string>(dest.description)
+  );
+  const [parentTags, setParentTags] = useState<
+    ObjectListScrapeResult<GQL.ScrapedTag>
+  >(
+    new ObjectListScrapeResult<GQL.ScrapedTag>(
+      sortStoredIdObjects(
+        dest.parents.map(idToStoredID).filter(filterCandidates)
+      )
+    )
+  );
+  const [childTags, setChildTags] = useState<
+    ObjectListScrapeResult<GQL.ScrapedTag>
+  >(
+    new ObjectListScrapeResult<GQL.ScrapedTag>(
+      sortStoredIdObjects(
+        dest.children.map(idToStoredID).filter(filterCandidates)
+      )
+    )
+  );
+
+  const [stashIDs, setStashIDs] = useState(new ScrapeResult<GQL.StashId[]>([]));
+
+  const [image, setImage] = useState<ScrapeResult<string>>(
+    new ScrapeResult<string>(dest.image_path)
+  );
+
+  const [customFields, setCustomFields] = useState<CustomFieldScrapeResults>(
+    new Map()
+  );
+
+  function idToStoredID(o: { id: string; name: string }) {
+    return {
+      stored_id: o.id,
+      name: o.name,
+    };
+  }
+
+  // calculate the values for everything
+  // uses the first set value for single value fields, and combines all
+  useEffect(() => {
+    async function loadImages() {
+      const src = sources.find((s) => s.image_path);
+      if (!dest.image_path || !src) return;
+
+      setLoading(true);
+
+      const destData = await ImageUtils.imageToDataURL(dest.image_path);
+      const srcData = await ImageUtils.imageToDataURL(src.image_path!);
+
+      // keep destination image by default
+      const useNewValue = false;
+      setImage(new ScrapeResult(destData, srcData, useNewValue));
+
+      setLoading(false);
+    }
+
+    // append dest to all so that if dest has stash_ids with the same
+    // endpoint, then it will be excluded first
+    const all = sources.concat(dest);
+
+    setName(
+      new ScrapeResult(dest.name, sources.find((s) => s.name)?.name, !dest.name)
+    );
+    setSortName(
+      new ScrapeResult(
+        dest.sort_name,
+        sources.find((s) => s.sort_name)?.sort_name,
+        !dest.sort_name
+      )
+    );
+
+    setDescription(
+      new ScrapeResult(
+        dest.description,
+        sources.find((s) => s.description)?.description,
+        !dest.description
+      )
+    );
+
+    // default alias list should be the existing aliases, plus the names of all sources,
+    // plus all source aliases, deduplicated
+    const allAliases = uniq(
+      dest.aliases.concat(
+        sources.map((s) => s.name),
+        sources.flatMap((s) => s.aliases)
+      )
+    );
+    setAliases(new ScrapeResult(dest.aliases, allAliases, !!allAliases.length));
+
+    // default parent/child tags should be the existing tags, plus all source parent/child tags, deduplicated
+    const allParentTags = uniq(all.flatMap((s) => s.parents))
+      .map(idToStoredID)
+      .filter(filterCandidates); // exclude self and sources
+
+    setParentTags(
+      new ObjectListScrapeResult<GQL.ScrapedTag>(
+        sortStoredIdObjects(dest.parents.map(idToStoredID)),
+        sortStoredIdObjects(allParentTags),
+        !!allParentTags.length
+      )
+    );
+
+    const allChildTags = uniq(all.flatMap((s) => s.children))
+      .map(idToStoredID)
+      .filter(filterCandidates); // exclude self and sources
+
+    setChildTags(
+      new ObjectListScrapeResult<GQL.ScrapedTag>(
+        sortStoredIdObjects(
+          dest.children.map(idToStoredID).filter(filterCandidates)
+        ),
+        sortStoredIdObjects(allChildTags),
+        !!allChildTags.length
+      )
+    );
+
+    setStashIDs(
+      new ScrapeResult(
+        dest.stash_ids,
+        all
+          .map((s) => s.stash_ids)
+          .flat()
+          .filter((s, index, a) => {
+            // remove entries with duplicate endpoints
+            return index === a.findIndex((ss) => ss.endpoint === s.endpoint);
+          })
+      )
+    );
+
+    setImage(
+      new ScrapeResult(
+        dest.image_path,
+        sources.find((s) => s.image_path)?.image_path,
+        !dest.image_path
+      )
+    );
+
+    const customFieldNames = new Set<string>(Object.keys(dest.custom_fields));
+
+    for (const s of sources) {
+      for (const n of Object.keys(s.custom_fields)) {
+        customFieldNames.add(n);
+      }
+    }
+
+    setCustomFields(
+      new Map(
+        Array.from(customFieldNames)
+          .sort()
+          .map((field) => {
+            return [
+              field,
+              new ScrapeResult(
+                dest.custom_fields?.[field],
+                sources.find((s) => s.custom_fields?.[field])?.custom_fields?.[
+                  field
+                ],
+                dest.custom_fields?.[field] === undefined
+              ),
+            ];
+          })
+      )
+    );
+
+    loadImages();
+  }, [sources, dest, filterCandidates]);
+
+  const hasCustomFieldValues = useMemo(() => {
+    return hasScrapedValues(Array.from(customFields.values()));
+  }, [customFields]);
+
+  // ensure this is updated if fields are changed
+  const hasValues = useMemo(() => {
+    return (
+      hasCustomFieldValues ||
+      hasScrapedValues([
+        name,
+        sortName,
+        aliases,
+        description,
+        parentTags,
+        childTags,
+        stashIDs,
+        image,
+      ])
+    );
+  }, [
+    name,
+    sortName,
+    aliases,
+    description,
+    parentTags,
+    childTags,
+    stashIDs,
+    image,
+    hasCustomFieldValues,
+  ]);
+
+  function renderScrapeRows() {
+    if (loading) {
+      return (
+        <div>
+          <LoadingIndicator />
+        </div>
+      );
+    }
+
+    if (!hasValues) {
+      return (
+        <div>
+          <FormattedMessage id="dialogs.merge.empty_results" />
+        </div>
+      );
+    }
+
+    return (
+      <>
+        <ScrapedInputGroupRow
+          field="name"
+          title={intl.formatMessage({ id: "name" })}
+          result={name}
+          onChange={(value) => setName(value)}
+        />
+        <ScrapedInputGroupRow
+          field="sort_name"
+          title={intl.formatMessage({ id: "sort_name" })}
+          result={sortName}
+          onChange={(value) => setSortName(value)}
+        />
+        <ScrapedStringListRow
+          field="aliases"
+          title={intl.formatMessage({ id: "aliases" })}
+          result={aliases}
+          onChange={(value) => setAliases(value)}
+        />
+        <ScrapedTagsRow
+          field="parent_tags"
+          title={intl.formatMessage({ id: "parent_tags" })}
+          result={parentTags}
+          onChange={(value) => setParentTags(value)}
+        />
+        <ScrapedTagsRow
+          field="child_tags"
+          title={intl.formatMessage({ id: "sub_tags" })}
+          result={childTags}
+          onChange={(value) => setChildTags(value)}
+        />
+        <ScrapedTextAreaRow
+          field="description"
+          title={intl.formatMessage({ id: "description" })}
+          result={description}
+          onChange={(value) => setDescription(value)}
+        />
+        <ScrapeDialogRow
+          field="stash_ids"
+          title={intl.formatMessage({ id: "stash_id" })}
+          result={stashIDs}
+          originalField={
+            <StashIDsField values={stashIDs?.originalValue ?? []} />
+          }
+          newField={<StashIDsField values={stashIDs?.newValue ?? []} />}
+          onChange={(value) => setStashIDs(value)}
+        />
+        <ScrapedImageRow
+          field="image"
+          title={intl.formatMessage({ id: "tag_image" })}
+          className="performer-image"
+          result={image}
+          onChange={(value) => setImage(value)}
+        />
+        {hasCustomFieldValues && (
+          <ScrapedCustomFieldRows
+            results={customFields}
+            onChange={(newCustomFields) => setCustomFields(newCustomFields)}
+          />
+        )}
+      </>
+    );
+  }
+
+  function createValues(): GQL.TagUpdateInput {
+    // only set the cover image if it's different from the existing cover image
+    const coverImage = image.useNewValue ? image.getNewValue() : undefined;
+
+    return {
+      id: dest.id,
+      name: name.getNewValue(),
+      sort_name: sortName.getNewValue(),
+      aliases: aliases
+        .getNewValue()
+        ?.map((s) => s.trim())
+        .filter((s) => s.length > 0),
+      parent_ids: parentTags.getNewValue()?.map((t) => t.stored_id!),
+      child_ids: childTags.getNewValue()?.map((t) => t.stored_id!),
+      description: description.getNewValue(),
+      stash_ids: stashIDs.getNewValue(),
+      image: coverImage,
+      custom_fields: {
+        partial: Object.fromEntries(
+          Array.from(customFields.entries()).flatMap(([field, v]) =>
+            v.useNewValue ? [[field, v.getNewValue()]] : []
+          )
+        ),
+      },
+    };
+  }
+
+  const dialogTitle = intl.formatMessage({
+    id: "actions.merge",
+  });
+
+  const destinationLabel = !hasValues
+    ? ""
+    : intl.formatMessage({ id: "dialogs.merge.destination" });
+  const sourceLabel = !hasValues
+    ? ""
+    : intl.formatMessage({ id: "dialogs.merge.source" });
+
+  return (
+    <ScrapeDialog
+      className="tag-merge-dialog"
+      title={dialogTitle}
+      existingLabel={destinationLabel}
+      scrapedLabel={sourceLabel}
+      onClose={(apply) => {
+        if (!apply) {
+          onClose();
+        } else {
+          onClose(createValues());
+        }
+      }}
+    >
+      {renderScrapeRows()}
+    </ScrapeDialog>
+  );
+};
 
 interface ITagMergeModalProps {
   show: boolean;
@@ -23,6 +422,11 @@ export const TagMergeModal: React.FC<ITagMergeModalProps> = ({
   const [src, setSrc] = useState<Tag[]>([]);
   const [dest, setDest] = useState<Tag | null>(null);
 
+  const [loadedSources, setLoadedSources] = useState<GQL.TagDataFragment[]>([]);
+  const [loadedDest, setLoadedDest] = useState<GQL.TagDataFragment>();
+
+  const [secondStep, setSecondStep] = useState(false);
+
   const [running, setRunning] = useState(false);
 
   const [mergeTags] = useTagsMerge();
@@ -41,7 +445,23 @@ export const TagMergeModal: React.FC<ITagMergeModalProps> = ({
     }
   }, [tags]);
 
-  async function onMerge() {
+  async function loadTags() {
+    try {
+      const tagIDs = src.map((s) => s.id);
+      tagIDs.push(dest!.id);
+      const query = await queryFindTagsByID(tagIDs);
+      const { tags: loadedTags } = query.data.findTags;
+
+      setLoadedDest(loadedTags.find((s) => s.id === dest!.id));
+      setLoadedSources(loadedTags.filter((s) => s.id !== dest!.id));
+      setSecondStep(true);
+    } catch (e) {
+      Toast.error(e);
+      return;
+    }
+  }
+
+  async function onMerge(values: GQL.TagUpdateInput) {
     if (!dest) return;
 
     const source = src.map((s) => s.id);
@@ -53,6 +473,7 @@ export const TagMergeModal: React.FC<ITagMergeModalProps> = ({
         variables: {
           source,
           destination,
+          values,
         },
       });
       if (result.data?.tagsMerge) {
@@ -78,6 +499,23 @@ export const TagMergeModal: React.FC<ITagMergeModalProps> = ({
     }
   }
 
+  if (secondStep && dest) {
+    return (
+      <TagMergeDetails
+        sources={loadedSources}
+        dest={loadedDest!}
+        onClose={(values) => {
+          setSecondStep(false);
+          if (values) {
+            onMerge(values);
+          } else {
+            onClose();
+          }
+        }}
+      />
+    );
+  }
+
   return (
     <ModalComponent
       show={show}
@@ -85,7 +523,7 @@ export const TagMergeModal: React.FC<ITagMergeModalProps> = ({
       icon={faSignInAlt}
       accept={{
         text: intl.formatMessage({ id: "actions.merge" }),
-        onClick: () => onMerge(),
+        onClick: () => loadTags(),
       }}
       disabled={!canMerge()}
       cancel={{
diff --git a/ui/v2.5/src/core/StashService.ts b/ui/v2.5/src/core/StashService.ts
index 6aaf17125..58b1aae42 100644
--- a/ui/v2.5/src/core/StashService.ts
+++ b/ui/v2.5/src/core/StashService.ts
@@ -472,6 +472,14 @@ export const queryFindTagsForList = (filter: ListFilterModel) =>
     },
   });
 
+export const queryFindTagsByID = (tagIDs: string[]) =>
+  client.query<GQL.FindTagsQuery>({
+    query: GQL.FindTagsDocument,
+    variables: {
+      ids: tagIDs,
+    },
+  });
+
 export const queryFindTagsByIDForSelect = (tagIDs: string[]) =>
   client.query<GQL.FindTagsForSelectQuery>({
     query: GQL.FindTagsForSelectDocument,

From 7aa7276fa3f60c12b6e84a5e38d4912b4c6dfe37 Mon Sep 17 00:00:00 2001
From: Gykes <24581046+Gykes@users.noreply.github.com>
Date: Tue, 10 Feb 2026 18:38:57 -0600
Subject: [PATCH 287/405] Bugfix: AVIF Image PHash Support (#6556)

* AVIF phash support
* add avif check for zips
---
 cmd/phasher/main.go                           |  8 ++--
 internal/manager/task_generate_image_phash.go |  2 +-
 pkg/hash/imagephash/phash.go                  | 42 +++++++++++++++++--
 3 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/cmd/phasher/main.go b/cmd/phasher/main.go
index e0801d5d7..be2053784 100644
--- a/cmd/phasher/main.go
+++ b/cmd/phasher/main.go
@@ -27,11 +27,11 @@ func printPhash(ff *ffmpeg.FFMpeg, ffp *ffmpeg.FFProbe, inputfile string, quiet
 
 	// Common image extensions
 	imageExts := map[string]bool{
-		"jpg": true, "jpeg": true, "png": true, "gif": true, "webp": true, "bmp": true,
+		"jpg": true, "jpeg": true, "png": true, "gif": true, "webp": true, "bmp": true, "avif": true,
 	}
 
 	if imageExts[ext] {
-		return printImagePhash(inputfile, quiet)
+		return printImagePhash(ff, inputfile, quiet)
 	}
 
 	return printVideoPhash(ff, ffp, inputfile, quiet)
@@ -65,12 +65,12 @@ func printVideoPhash(ff *ffmpeg.FFMpeg, ffp *ffmpeg.FFProbe, inputfile string, q
 	return nil
 }
 
-func printImagePhash(inputfile string, quiet *bool) error {
+func printImagePhash(ff *ffmpeg.FFMpeg, inputfile string, quiet *bool) error {
 	imgFile := &models.ImageFile{
 		BaseFile: &models.BaseFile{Path: inputfile},
 	}
 
-	phash, err := imagephash.Generate(imgFile)
+	phash, err := imagephash.Generate(ff, imgFile)
 	if err != nil {
 		return err
 	}
diff --git a/internal/manager/task_generate_image_phash.go b/internal/manager/task_generate_image_phash.go
index 4c07ffadf..a5c764df0 100644
--- a/internal/manager/task_generate_image_phash.go
+++ b/internal/manager/task_generate_image_phash.go
@@ -41,7 +41,7 @@ func (t *GenerateImagePhashTask) Start(ctx context.Context) {
 	}
 
 	if !set {
-		generated, err := imagephash.Generate(t.File)
+		generated, err := imagephash.Generate(instance.FFMpeg, t.File)
 		if err != nil {
 			logger.Errorf("Error generating phash for %q: %v", t.File.Path, err)
 			logErrorOutput(err)
diff --git a/pkg/hash/imagephash/phash.go b/pkg/hash/imagephash/phash.go
index 4cf6e9209..73e8e3667 100644
--- a/pkg/hash/imagephash/phash.go
+++ b/pkg/hash/imagephash/phash.go
@@ -2,17 +2,22 @@ package imagephash
 
 import (
 	"bytes"
+	"context"
 	"fmt"
 	"image"
+	"path/filepath"
+	"strings"
 
 	"github.com/corona10/goimagehash"
+	"github.com/stashapp/stash/pkg/ffmpeg"
+	"github.com/stashapp/stash/pkg/ffmpeg/transcoder"
 	"github.com/stashapp/stash/pkg/file"
 	"github.com/stashapp/stash/pkg/models"
 )
 
 // Generate computes a perceptual hash for an image file.
-func Generate(imageFile *models.ImageFile) (*uint64, error) {
-	img, err := loadImage(imageFile)
+func Generate(encoder *ffmpeg.FFMpeg, imageFile *models.ImageFile) (*uint64, error) {
+	img, err := loadImage(encoder, imageFile)
 	if err != nil {
 		return nil, fmt.Errorf("loading image: %w", err)
 	}
@@ -27,7 +32,17 @@ func Generate(imageFile *models.ImageFile) (*uint64, error) {
 }
 
 // loadImage loads an image from disk and decodes it.
-func loadImage(imageFile *models.ImageFile) (image.Image, error) {
+// For AVIF files, ffmpeg is used to convert to BMP first since Go has no built-in AVIF decoder.
+func loadImage(encoder *ffmpeg.FFMpeg, imageFile *models.ImageFile) (image.Image, error) {
+	ext := strings.ToLower(filepath.Ext(imageFile.Path))
+	if ext == ".avif" {
+		// AVIF in zip files is not supported - ffmpeg cannot read files inside zips
+		if imageFile.Base().ZipFileID != nil {
+			return nil, fmt.Errorf("AVIF images in zip files are not supported for phash generation")
+		}
+		return loadImageFFmpeg(encoder, imageFile.Path)
+	}
+
 	reader, err := imageFile.Open(&file.OsFS{})
 	if err != nil {
 		return nil, err
@@ -46,3 +61,24 @@ func loadImage(imageFile *models.ImageFile) (image.Image, error) {
 
 	return img, nil
 }
+
+// loadImageFFmpeg uses ffmpeg to convert an image to BMP and then decodes it.
+func loadImageFFmpeg(encoder *ffmpeg.FFMpeg, path string) (image.Image, error) {
+	options := transcoder.ScreenshotOptions{
+		OutputPath: "-",
+		OutputType: transcoder.ScreenshotOutputTypeBMP,
+	}
+
+	args := transcoder.ScreenshotTime(path, 0, options)
+	data, err := encoder.GenerateOutput(context.Background(), args, nil)
+	if err != nil {
+		return nil, fmt.Errorf("converting image with ffmpeg: %w", err)
+	}
+
+	img, _, err := image.Decode(bytes.NewReader(data))
+	if err != nil {
+		return nil, fmt.Errorf("decoding ffmpeg output: %w", err)
+	}
+
+	return img, nil
+}

From 26db935fadf797a6d48b5702b3f0ceb2bdb569f3 Mon Sep 17 00:00:00 2001
From: Gykes <24581046+Gykes@users.noreply.github.com>
Date: Tue, 10 Feb 2026 18:43:18 -0600
Subject: [PATCH 288/405] FR: Change Identify Settings to Use Gender Checkboxes
 (#6557)

---
 graphql/schema/types/metadata.graphql         |  8 ++-
 internal/identify/identify.go                 | 21 ++++--
 internal/identify/identify_test.go            | 24 +++++--
 internal/identify/options.go                  |  4 ++
 internal/identify/scene.go                    | 10 ++-
 internal/identify/scene_test.go               | 32 ++++-----
 ui/v2.5/graphql/data/config.graphql           |  2 +-
 .../Dialogs/IdentifyDialog/IdentifyDialog.tsx |  2 +-
 .../Dialogs/IdentifyDialog/Options.tsx        | 65 ++++++++++++++-----
 ui/v2.5/src/docs/en/Manual/Identify.md        |  2 +-
 ui/v2.5/src/locales/en-GB.json                |  2 +
 11 files changed, 120 insertions(+), 52 deletions(-)

diff --git a/graphql/schema/types/metadata.graphql b/graphql/schema/types/metadata.graphql
index 3d004ccb3..0c0d59579 100644
--- a/graphql/schema/types/metadata.graphql
+++ b/graphql/schema/types/metadata.graphql
@@ -215,7 +215,9 @@ input IdentifyMetadataOptionsInput {
   setCoverImage: Boolean
   setOrganized: Boolean
   "defaults to true if not provided"
-  includeMalePerformers: Boolean
+  includeMalePerformers: Boolean @deprecated(reason: "Use performerGenders")
+  "Filter to only include performers with these genders. If not provided, all genders are included."
+  performerGenders: [GenderEnum!]
   "defaults to true if not provided"
   skipMultipleMatches: Boolean
   "tag to tag skipped multiple matches with"
@@ -260,7 +262,9 @@ type IdentifyMetadataOptions {
   setCoverImage: Boolean
   setOrganized: Boolean
   "defaults to true if not provided"
-  includeMalePerformers: Boolean
+  includeMalePerformers: Boolean @deprecated(reason: "Use performerGenders")
+  "Filter to only include performers with these genders. If not provided, all genders are included."
+  performerGenders: [GenderEnum!]
   "defaults to true if not provided"
   skipMultipleMatches: Boolean
   "tag to tag skipped multiple matches with"
diff --git a/internal/identify/identify.go b/internal/identify/identify.go
index 3d4c94467..6dc67dac3 100644
--- a/internal/identify/identify.go
+++ b/internal/identify/identify.go
@@ -147,6 +147,9 @@ func (t *SceneIdentifier) getOptions(source ScraperSource) MetadataOptions {
 	if source.Options.IncludeMalePerformers != nil {
 		options.IncludeMalePerformers = source.Options.IncludeMalePerformers
 	}
+	if source.Options.PerformerGenders != nil {
+		options.PerformerGenders = source.Options.PerformerGenders
+	}
 	if source.Options.SkipMultipleMatches != nil {
 		options.SkipMultipleMatches = source.Options.SkipMultipleMatches
 	}
@@ -204,13 +207,23 @@ func (t *SceneIdentifier) getSceneUpdater(ctx context.Context, s *models.Scene,
 		ret.Partial.StudioID = models.NewOptionalInt(*studioID)
 	}
 
-	includeMalePerformers := true
-	if options.IncludeMalePerformers != nil {
-		includeMalePerformers = *options.IncludeMalePerformers
+	// Determine allowed genders for performer filtering
+	var allowedGenders []models.GenderEnum
+	if options.PerformerGenders != nil {
+		// New field takes precedence
+		allowedGenders = options.PerformerGenders
+	} else if options.IncludeMalePerformers != nil && !*options.IncludeMalePerformers {
+		// Legacy: if includeMalePerformers is false, include all genders except male
+		for _, g := range models.AllGenderEnum {
+			if g != models.GenderEnumMale {
+				allowedGenders = append(allowedGenders, g)
+			}
+		}
 	}
+	// nil allowedGenders means include all performers
 
 	addSkipSingleNamePerformerTag := false
-	performerIDs, err := rel.performers(ctx, !includeMalePerformers)
+	performerIDs, err := rel.performers(ctx, allowedGenders)
 	if err != nil {
 		if errors.Is(err, ErrSkipSingleNamePerformer) {
 			addSkipSingleNamePerformerTag = true
diff --git a/internal/identify/identify_test.go b/internal/identify/identify_test.go
index eb646c305..35ad2006d 100644
--- a/internal/identify/identify_test.go
+++ b/internal/identify/identify_test.go
@@ -60,9 +60,15 @@ func TestSceneIdentifier_Identify(t *testing.T) {
 	)
 
 	defaultOptions := &MetadataOptions{
-		SetOrganized:             &boolFalse,
-		SetCoverImage:            &boolFalse,
-		IncludeMalePerformers:    &boolFalse,
+		SetOrganized:  &boolFalse,
+		SetCoverImage: &boolFalse,
+		PerformerGenders: []models.GenderEnum{
+			models.GenderEnumFemale,
+			models.GenderEnumTransgenderFemale,
+			models.GenderEnumTransgenderMale,
+			models.GenderEnumIntersex,
+			models.GenderEnumNonBinary,
+		},
 		SkipSingleNamePerformers: &boolFalse,
 	}
 	sources := []ScraperSource{
@@ -216,9 +222,15 @@ func TestSceneIdentifier_modifyScene(t *testing.T) {
 
 	boolFalse := false
 	defaultOptions := &MetadataOptions{
-		SetOrganized:             &boolFalse,
-		SetCoverImage:            &boolFalse,
-		IncludeMalePerformers:    &boolFalse,
+		SetOrganized:  &boolFalse,
+		SetCoverImage: &boolFalse,
+		PerformerGenders: []models.GenderEnum{
+			models.GenderEnumFemale,
+			models.GenderEnumTransgenderFemale,
+			models.GenderEnumTransgenderMale,
+			models.GenderEnumIntersex,
+			models.GenderEnumNonBinary,
+		},
 		SkipSingleNamePerformers: &boolFalse,
 	}
 	tr := &SceneIdentifier{
diff --git a/internal/identify/options.go b/internal/identify/options.go
index b4954a1f1..9e27a3e39 100644
--- a/internal/identify/options.go
+++ b/internal/identify/options.go
@@ -5,6 +5,7 @@ import (
 	"io"
 	"strconv"
 
+	"github.com/stashapp/stash/pkg/models"
 	"github.com/stashapp/stash/pkg/scraper"
 )
 
@@ -32,7 +33,10 @@ type MetadataOptions struct {
 	SetCoverImage *bool `json:"setCoverImage"`
 	SetOrganized  *bool `json:"setOrganized"`
 	// defaults to true if not provided
+	// Deprecated: use PerformerGenders instead
 	IncludeMalePerformers *bool `json:"includeMalePerformers"`
+	// Filter to only include performers with these genders. If not provided, all genders are included.
+	PerformerGenders []models.GenderEnum `json:"performerGenders"`
 	// defaults to true if not provided
 	SkipMultipleMatches *bool `json:"skipMultipleMatches"`
 	// ID of tag to tag skipped multiple matches with
diff --git a/internal/identify/scene.go b/internal/identify/scene.go
index b82a04301..00d387c41 100644
--- a/internal/identify/scene.go
+++ b/internal/identify/scene.go
@@ -5,6 +5,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"slices"
 	"strconv"
 	"strings"
 	"time"
@@ -69,7 +70,7 @@ func (g sceneRelationships) studio(ctx context.Context) (*int, error) {
 	return nil, nil
 }
 
-func (g sceneRelationships) performers(ctx context.Context, ignoreMale bool) ([]int, error) {
+func (g sceneRelationships) performers(ctx context.Context, allowedGenders []models.GenderEnum) ([]int, error) {
 	fieldStrategy := g.fieldOptions["performers"]
 	scraped := g.result.result.Performers
 
@@ -97,8 +98,11 @@ func (g sceneRelationships) performers(ctx context.Context, ignoreMale bool) ([]
 	singleNamePerformerSkipped := false
 
 	for _, p := range scraped {
-		if ignoreMale && p.Gender != nil && strings.EqualFold(*p.Gender, models.GenderEnumMale.String()) {
-			continue
+		if allowedGenders != nil && p.Gender != nil {
+			gender := models.GenderEnum(strings.ToUpper(*p.Gender))
+			if !slices.Contains(allowedGenders, gender) {
+				continue
+			}
 		}
 
 		performerID, err := getPerformerID(ctx, endpoint, g.performerCreator, p, createMissing, g.skipSingleNamePerformers)
diff --git a/internal/identify/scene_test.go b/internal/identify/scene_test.go
index 862bbbff8..9a3fcf025 100644
--- a/internal/identify/scene_test.go
+++ b/internal/identify/scene_test.go
@@ -183,13 +183,13 @@ func Test_sceneRelationships_performers(t *testing.T) {
 	}
 
 	tests := []struct {
-		name         string
-		scene        *models.Scene
-		fieldOptions *FieldOptions
-		scraped      []*models.ScrapedPerformer
-		ignoreMale   bool
-		want         []int
-		wantErr      bool
+		name           string
+		scene          *models.Scene
+		fieldOptions   *FieldOptions
+		scraped        []*models.ScrapedPerformer
+		allowedGenders []models.GenderEnum
+		want           []int
+		wantErr        bool
 	}{
 		{
 			"ignore",
@@ -202,7 +202,7 @@ func Test_sceneRelationships_performers(t *testing.T) {
 					StoredID: &validStoredID,
 				},
 			},
-			false,
+			nil,
 			nil,
 			false,
 		},
@@ -211,7 +211,7 @@ func Test_sceneRelationships_performers(t *testing.T) {
 			emptyScene,
 			defaultOptions,
 			[]*models.ScrapedPerformer{},
-			false,
+			nil,
 			nil,
 			false,
 		},
@@ -225,7 +225,7 @@ func Test_sceneRelationships_performers(t *testing.T) {
 					StoredID: &existingPerformerStr,
 				},
 			},
-			false,
+			nil,
 			nil,
 			false,
 		},
@@ -239,7 +239,7 @@ func Test_sceneRelationships_performers(t *testing.T) {
 					StoredID: &validStoredID,
 				},
 			},
-			false,
+			nil,
 			[]int{existingPerformerID, validStoredIDInt},
 			false,
 		},
@@ -254,7 +254,7 @@ func Test_sceneRelationships_performers(t *testing.T) {
 					Gender:   &male,
 				},
 			},
-			true,
+			[]models.GenderEnum{models.GenderEnumFemale, models.GenderEnumTransgenderMale, models.GenderEnumTransgenderFemale, models.GenderEnumIntersex, models.GenderEnumNonBinary},
 			nil,
 			false,
 		},
@@ -270,7 +270,7 @@ func Test_sceneRelationships_performers(t *testing.T) {
 					StoredID: &validStoredID,
 				},
 			},
-			false,
+			nil,
 			[]int{validStoredIDInt},
 			false,
 		},
@@ -287,7 +287,7 @@ func Test_sceneRelationships_performers(t *testing.T) {
 					Gender:   &female,
 				},
 			},
-			true,
+			[]models.GenderEnum{models.GenderEnumFemale, models.GenderEnumTransgenderMale, models.GenderEnumTransgenderFemale, models.GenderEnumIntersex, models.GenderEnumNonBinary},
 			[]int{validStoredIDInt},
 			false,
 		},
@@ -304,7 +304,7 @@ func Test_sceneRelationships_performers(t *testing.T) {
 					StoredID: &invalidStoredID,
 				},
 			},
-			false,
+			nil,
 			nil,
 			true,
 		},
@@ -319,7 +319,7 @@ func Test_sceneRelationships_performers(t *testing.T) {
 				},
 			}
 
-			got, err := tr.performers(testCtx, tt.ignoreMale)
+			got, err := tr.performers(testCtx, tt.allowedGenders)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("sceneRelationships.performers() error = %v, wantErr %v", err, tt.wantErr)
 				return
diff --git a/ui/v2.5/graphql/data/config.graphql b/ui/v2.5/graphql/data/config.graphql
index 08dcf5d3b..ca1f6a47c 100644
--- a/ui/v2.5/graphql/data/config.graphql
+++ b/ui/v2.5/graphql/data/config.graphql
@@ -143,7 +143,7 @@ fragment IdentifyMetadataOptionsData on IdentifyMetadataOptions {
   }
   setCoverImage
   setOrganized
-  includeMalePerformers
+  performerGenders
   skipMultipleMatches
   skipMultipleMatchTag
   skipSingleNamePerformers
diff --git a/ui/v2.5/src/components/Dialogs/IdentifyDialog/IdentifyDialog.tsx b/ui/v2.5/src/components/Dialogs/IdentifyDialog/IdentifyDialog.tsx
index 3073a7952..8262de4ec 100644
--- a/ui/v2.5/src/components/Dialogs/IdentifyDialog/IdentifyDialog.tsx
+++ b/ui/v2.5/src/components/Dialogs/IdentifyDialog/IdentifyDialog.tsx
@@ -62,7 +62,7 @@ export const IdentifyDialog: React.FC<IIdentifyDialogProps> = ({
           createMissing: true,
         },
       ],
-      includeMalePerformers: true,
+      performerGenders: undefined,
       setCoverImage: true,
       setOrganized: false,
       skipMultipleMatches: true,
diff --git a/ui/v2.5/src/components/Dialogs/IdentifyDialog/Options.tsx b/ui/v2.5/src/components/Dialogs/IdentifyDialog/Options.tsx
index 1362df02a..4987db5f9 100644
--- a/ui/v2.5/src/components/Dialogs/IdentifyDialog/Options.tsx
+++ b/ui/v2.5/src/components/Dialogs/IdentifyDialog/Options.tsx
@@ -6,6 +6,7 @@ import { IScraperSource } from "./constants";
 import { FieldOptionsList } from "./FieldOptions";
 import { ThreeStateBoolean } from "./ThreeStateBoolean";
 import { TagSelect } from "src/components/Shared/Select";
+import { genderList } from "src/utils/gender";
 
 interface IOptionsEditor {
   options: GQL.IdentifyMetadataOptionsInput;
@@ -124,24 +125,52 @@ export const OptionsEditor: React.FC<IOptionsEditor> = ({
         )}
       </Form.Group>
       <Form.Group className="mb-0">
-        <ThreeStateBoolean
-          id="include-male-performers"
-          value={
-            options.includeMalePerformers === null
-              ? undefined
-              : options.includeMalePerformers
-          }
-          setValue={(v) =>
-            setOptions({
-              includeMalePerformers: v,
-            })
-          }
-          label={intl.formatMessage({
-            id: "config.tasks.identify.include_male_performers",
-          })}
-          defaultValue={defaultOptions?.includeMalePerformers ?? undefined}
-          {...checkboxProps}
-        />
+        <Form.Group controlId="performer-genders" className="mb-2">
+          <Form.Label>
+            <FormattedMessage id="config.tasks.identify.performer_genders" />
+          </Form.Label>
+          {source && (
+            <Form.Check
+              id="performer-genders-use-default"
+              label={intl.formatMessage({ id: "actions.use_default" })}
+              checked={options.performerGenders == null}
+              onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
+                if (e.currentTarget.checked) {
+                  setOptions({ performerGenders: undefined });
+                } else {
+                  setOptions({
+                    performerGenders:
+                      defaultOptions?.performerGenders ?? genderList.slice(),
+                  });
+                }
+              }}
+            />
+          )}
+          {(options.performerGenders != null || !source) &&
+            genderList.map((gender) => {
+              const performerGenders =
+                options.performerGenders ?? genderList.slice();
+              return (
+                <Form.Check
+                  id={`identify-gender-${gender}`}
+                  key={gender}
+                  label={<FormattedMessage id={`gender_types.${gender}`} />}
+                  checked={performerGenders.includes(gender)}
+                  onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
+                    const isChecked = e.currentTarget.checked;
+                    setOptions({
+                      performerGenders: isChecked
+                        ? [...performerGenders, gender]
+                        : performerGenders.filter((g) => g !== gender),
+                    });
+                  }}
+                />
+              );
+            })}
+          <Form.Text className="text-muted">
+            <FormattedMessage id="config.tasks.identify.performer_genders_desc" />
+          </Form.Text>
+        </Form.Group>
         <ThreeStateBoolean
           id="set-cover-image"
           value={
diff --git a/ui/v2.5/src/docs/en/Manual/Identify.md b/ui/v2.5/src/docs/en/Manual/Identify.md
index 724a392a3..9407ac9d9 100644
--- a/ui/v2.5/src/docs/en/Manual/Identify.md
+++ b/ui/v2.5/src/docs/en/Manual/Identify.md
@@ -20,7 +20,7 @@ The following options can be configured:
 
 | Option | Description |
 |--------|-------------|
-| Include male performers | If false, male performers will not be created or set on scenes. |
+| Performer genders | Filter which performer genders are included during identification. If no genders are selected, all performers are included regardless of gender. |
 | Set cover images | If false, scene cover images will not be modified. |
 | Set organized flag | If true, the organized flag is set to true when a scene is organized. |
 | Skip matches that have more than one result | If this is not enabled and more than one result is returned, one will be randomly chosen to match |
diff --git a/ui/v2.5/src/locales/en-GB.json b/ui/v2.5/src/locales/en-GB.json
index a2fee0ec1..6f7403686 100644
--- a/ui/v2.5/src/locales/en-GB.json
+++ b/ui/v2.5/src/locales/en-GB.json
@@ -547,6 +547,8 @@
         "identifying_from_paths": "Identifying scenes from the following paths",
         "identifying_scenes": "Identifying {num} {scene}",
         "include_male_performers": "Include male performers",
+        "performer_genders": "Performer genders",
+        "performer_genders_desc": "Performers with selected genders will be included during identification.",
         "set_cover_images": "Set cover images",
         "set_organized": "Set organised flag",
         "skip_multiple_matches": "Skip matches that have more than one result",

From d1479ca4e5142932ab014c0b25f1a371ee1aaab7 Mon Sep 17 00:00:00 2001
From: Gykes <24581046+Gykes@users.noreply.github.com>
Date: Tue, 10 Feb 2026 18:52:44 -0600
Subject: [PATCH 289/405] Feature: Scene Duplicate Filter (#6344)

---
 graphql/schema/types/filters.graphql          |  30 ++-
 pkg/models/file.go                            |   2 +-
 pkg/models/scene.go                           |  26 +-
 pkg/sqlite/file_filter.go                     |  28 ++-
 pkg/sqlite/scene_filter.go                    |  73 ++++--
 pkg/sqlite/scene_test.go                      |   2 +-
 .../src/components/List/CriterionEditor.tsx   |  12 +-
 .../List/Filters/DuplicateFilter.tsx          | 227 ++++++++++++++++++
 ui/v2.5/src/components/List/styles.scss       |  18 ++
 ui/v2.5/src/components/Scenes/SceneList.tsx   |   7 +
 ui/v2.5/src/locales/en-GB.json                |   3 +
 .../models/list-filter/criteria/criterion.ts  |   4 +-
 .../src/models/list-filter/criteria/phash.ts  | 124 ++++++++--
 ui/v2.5/src/models/list-filter/types.ts       |  12 +-
 14 files changed, 510 insertions(+), 58 deletions(-)
 create mode 100644 ui/v2.5/src/components/List/Filters/DuplicateFilter.tsx

diff --git a/graphql/schema/types/filters.graphql b/graphql/schema/types/filters.graphql
index 04a28171c..a7fecca20 100644
--- a/graphql/schema/types/filters.graphql
+++ b/graphql/schema/types/filters.graphql
@@ -75,10 +75,26 @@ input OrientationCriterionInput {
   value: [OrientationEnum!]!
 }
 
-input PHashDuplicationCriterionInput {
-  duplicated: Boolean
-  "Currently unimplemented"
+input DuplicationCriterionInput {
+  duplicated: Boolean @deprecated(reason: "Use phash field instead")
+  "Currently unimplemented. Intended for phash distance matching."
   distance: Int
+  "Filter by phash duplication"
+  phash: Boolean
+  "Filter by URL duplication"
+  url: Boolean
+  "Filter by Stash ID duplication"
+  stash_id: Boolean
+  "Filter by title duplication"
+  title: Boolean
+}
+
+input FileDuplicationCriterionInput {
+  duplicated: Boolean @deprecated(reason: "Use phash field instead")
+  "Currently unimplemented. Intended for phash distance matching."
+  distance: Int
+  "Filter by phash duplication"
+  phash: Boolean
 }
 
 input StashIDCriterionInput {
@@ -261,8 +277,8 @@ input SceneFilterType {
   organized: Boolean
   "Filter by o-counter"
   o_counter: IntCriterionInput
-  "Filter Scenes that have an exact phash match available"
-  duplicated: PHashDuplicationCriterionInput
+  "Filter Scenes by duplication criteria"
+  duplicated: DuplicationCriterionInput
   "Filter by resolution"
   resolution: ResolutionCriterionInput
   "Filter by orientation"
@@ -744,8 +760,8 @@ input FileFilterType {
   "Filter by modification time"
   mod_time: TimestampCriterionInput
 
-  "Filter files that have an exact match available"
-  duplicated: PHashDuplicationCriterionInput
+  "Filter files by duplication criteria (only phash applies to files)"
+  duplicated: FileDuplicationCriterionInput
 
   "find files based on hash"
   hashes: [FingerprintFilterInput!]
diff --git a/pkg/models/file.go b/pkg/models/file.go
index 63c30ba4d..32263319c 100644
--- a/pkg/models/file.go
+++ b/pkg/models/file.go
@@ -26,7 +26,7 @@ type FileFilterType struct {
 	ParentFolder    *HierarchicalMultiCriterionInput `json:"parent_folder"`
 	ZipFile         *MultiCriterionInput             `json:"zip_file"`
 	ModTime         *TimestampCriterionInput         `json:"mod_time"`
-	Duplicated      *PHashDuplicationCriterionInput  `json:"duplicated"`
+	Duplicated      *FileDuplicationCriterionInput   `json:"duplicated"`
 	Hashes          []*FingerprintFilterInput        `json:"hashes"`
 	VideoFileFilter *VideoFileFilterInput            `json:"video_file_filter"`
 	ImageFileFilter *ImageFileFilterInput            `json:"image_file_filter"`
diff --git a/pkg/models/scene.go b/pkg/models/scene.go
index 434659cbe..22863c4d9 100644
--- a/pkg/models/scene.go
+++ b/pkg/models/scene.go
@@ -2,10 +2,28 @@ package models
 
 import "context"
 
-type PHashDuplicationCriterionInput struct {
+type DuplicationCriterionInput struct {
+	// Deprecated: Use Phash field instead. Kept for backwards compatibility.
 	Duplicated *bool `json:"duplicated"`
-	// Currently unimplemented
+	// Currently unimplemented. Intended for phash distance matching.
 	Distance *int `json:"distance"`
+	// Filter by phash duplication
+	Phash *bool `json:"phash"`
+	// Filter by URL duplication
+	URL *bool `json:"url"`
+	// Filter by Stash ID duplication
+	StashID *bool `json:"stash_id"`
+	// Filter by title duplication
+	Title *bool `json:"title"`
+}
+
+type FileDuplicationCriterionInput struct {
+	// Deprecated: Use Phash field instead. Kept for backwards compatibility.
+	Duplicated *bool `json:"duplicated"`
+	// Currently unimplemented. Intended for phash distance matching.
+	Distance *int `json:"distance"`
+	// Filter by phash duplication
+	Phash *bool `json:"phash"`
 }
 
 type SceneFilterType struct {
@@ -33,8 +51,8 @@ type SceneFilterType struct {
 	Organized *bool `json:"organized"`
 	// Filter by o-counter
 	OCounter *IntCriterionInput `json:"o_counter"`
-	// Filter Scenes that have an exact phash match available
-	Duplicated *PHashDuplicationCriterionInput `json:"duplicated"`
+	// Filter Scenes by duplication criteria
+	Duplicated *DuplicationCriterionInput `json:"duplicated"`
 	// Filter by resolution
 	Resolution *ResolutionCriterionInput `json:"resolution"`
 	// Filter by orientation
diff --git a/pkg/sqlite/file_filter.go b/pkg/sqlite/file_filter.go
index 12c7ba3d5..157efb1d8 100644
--- a/pkg/sqlite/file_filter.go
+++ b/pkg/sqlite/file_filter.go
@@ -82,7 +82,7 @@ func (qb *fileFilterHandler) criterionHandler() criterionHandler {
 
 		qb.hashesCriterionHandler(fileFilter.Hashes),
 
-		qb.phashDuplicatedCriterionHandler(fileFilter.Duplicated),
+		qb.duplicatedCriterionHandler(fileFilter.Duplicated),
 		&timestampCriterionHandler{fileFilter.CreatedAt, "files.created_at", nil},
 		&timestampCriterionHandler{fileFilter.UpdatedAt, "files.updated_at", nil},
 
@@ -205,17 +205,27 @@ func (qb *fileFilterHandler) galleryCountCriterionHandler(c *models.IntCriterion
 	return h.handler(c)
 }
 
-func (qb *fileFilterHandler) phashDuplicatedCriterionHandler(duplicatedFilter *models.PHashDuplicationCriterionInput) criterionHandlerFunc {
+func (qb *fileFilterHandler) duplicatedCriterionHandler(duplicatedFilter *models.FileDuplicationCriterionInput) criterionHandlerFunc {
 	return func(ctx context.Context, f *filterBuilder) {
 		// TODO: Wishlist item: Implement Distance matching
-		if duplicatedFilter != nil {
-			var v string
-			if *duplicatedFilter.Duplicated {
-				v = ">"
-			} else {
-				v = "="
-			}
+		// For files, only phash duplication applies
+		if duplicatedFilter == nil {
+			return
+		}
 
+		var phashValue *bool
+
+		// Handle legacy 'duplicated' field for backwards compatibility
+		//nolint:staticcheck
+		if duplicatedFilter.Duplicated != nil && duplicatedFilter.Phash == nil {
+			//nolint:staticcheck
+			phashValue = duplicatedFilter.Duplicated
+		} else if duplicatedFilter.Phash != nil {
+			phashValue = duplicatedFilter.Phash
+		}
+
+		if phashValue != nil {
+			v := getCountOperator(*phashValue)
 			f.addInnerJoin("(SELECT file_id FROM files_fingerprints INNER JOIN (SELECT fingerprint FROM files_fingerprints WHERE type = 'phash' GROUP BY fingerprint HAVING COUNT (fingerprint) "+v+" 1) dupes on files_fingerprints.fingerprint = dupes.fingerprint)", "scph", "files.id = scph.file_id")
 		}
 	}
diff --git a/pkg/sqlite/scene_filter.go b/pkg/sqlite/scene_filter.go
index aa0d349df..e42376950 100644
--- a/pkg/sqlite/scene_filter.go
+++ b/pkg/sqlite/scene_filter.go
@@ -174,7 +174,7 @@ func (qb *sceneFilterHandler) criterionHandler() criterionHandler {
 		qb.performerTagsCriterionHandler(sceneFilter.PerformerTags),
 		qb.performerFavoriteCriterionHandler(sceneFilter.PerformerFavorite),
 		qb.performerAgeCriterionHandler(sceneFilter.PerformerAge),
-		qb.phashDuplicatedCriterionHandler(sceneFilter.Duplicated, qb.addSceneFilesTable),
+		qb.duplicatedCriterionHandler(sceneFilter.Duplicated),
 		&dateCriterionHandler{sceneFilter.Date, "scenes.date", nil},
 		&timestampCriterionHandler{sceneFilter.CreatedAt, "scenes.created_at", nil},
 		&timestampCriterionHandler{sceneFilter.UpdatedAt, "scenes.updated_at", nil},
@@ -296,26 +296,71 @@ func (qb *sceneFilterHandler) fileCountCriterionHandler(fileCount *models.IntCri
 	return h.handler(fileCount)
 }
 
-func (qb *sceneFilterHandler) phashDuplicatedCriterionHandler(duplicatedFilter *models.PHashDuplicationCriterionInput, addJoinFn func(f *filterBuilder)) criterionHandlerFunc {
+func (qb *sceneFilterHandler) duplicatedCriterionHandler(duplicatedFilter *models.DuplicationCriterionInput) criterionHandlerFunc {
 	return func(ctx context.Context, f *filterBuilder) {
-		// TODO: Wishlist item: Implement Distance matching
-		if duplicatedFilter != nil {
-			if addJoinFn != nil {
-				addJoinFn(f)
-			}
+		if duplicatedFilter == nil {
+			return
+		}
 
-			var v string
-			if *duplicatedFilter.Duplicated {
-				v = ">"
-			} else {
-				v = "="
-			}
+		// Handle legacy 'duplicated' field - treat as phash if phash not explicitly set
+		//nolint:staticcheck
+		if duplicatedFilter.Duplicated != nil && duplicatedFilter.Phash == nil {
+			//nolint:staticcheck
+			duplicatedFilter.Phash = duplicatedFilter.Duplicated
+		}
 
-			f.addInnerJoin("(SELECT file_id FROM files_fingerprints INNER JOIN (SELECT fingerprint FROM files_fingerprints WHERE type = 'phash' GROUP BY fingerprint HAVING COUNT (fingerprint) "+v+" 1) dupes on files_fingerprints.fingerprint = dupes.fingerprint)", "scph", "scenes_files.file_id = scph.file_id")
+		// Handle explicit fields
+		if duplicatedFilter.Phash != nil {
+			qb.addSceneFilesTable(f)
+			qb.applyPhashDuplication(f, *duplicatedFilter.Phash)
+		}
+
+		if duplicatedFilter.StashID != nil {
+			qb.applyStashIDDuplication(f, *duplicatedFilter.StashID)
+		}
+
+		if duplicatedFilter.Title != nil {
+			qb.applyTitleDuplication(f, *duplicatedFilter.Title)
+		}
+
+		if duplicatedFilter.URL != nil {
+			qb.applyURLDuplication(f, *duplicatedFilter.URL)
 		}
 	}
 }
 
+// getCountOperator returns ">" for duplicated items (count > 1) or "=" for unique items (count = 1)
+func getCountOperator(duplicated bool) string {
+	if duplicated {
+		return ">"
+	}
+	return "="
+}
+
+func (qb *sceneFilterHandler) applyPhashDuplication(f *filterBuilder, duplicated bool) {
+	// TODO: Wishlist item: Implement Distance matching
+	v := getCountOperator(duplicated)
+	f.addInnerJoin("(SELECT file_id FROM files_fingerprints INNER JOIN (SELECT fingerprint FROM files_fingerprints WHERE type = 'phash' GROUP BY fingerprint HAVING COUNT (fingerprint) "+v+" 1) dupes on files_fingerprints.fingerprint = dupes.fingerprint)", "scph", "scenes_files.file_id = scph.file_id")
+}
+
+func (qb *sceneFilterHandler) applyStashIDDuplication(f *filterBuilder, duplicated bool) {
+	v := getCountOperator(duplicated)
+	// Find stash_ids that appear on more than one scene
+	f.addInnerJoin("(SELECT scene_id FROM scene_stash_ids INNER JOIN (SELECT stash_id FROM scene_stash_ids GROUP BY stash_id HAVING COUNT(DISTINCT scene_id) "+v+" 1) dupes ON scene_stash_ids.stash_id = dupes.stash_id)", "scsi", "scenes.id = scsi.scene_id")
+}
+
+func (qb *sceneFilterHandler) applyTitleDuplication(f *filterBuilder, duplicated bool) {
+	v := getCountOperator(duplicated)
+	// Find titles that appear on more than one scene (excluding empty titles)
+	f.addInnerJoin("(SELECT id FROM scenes WHERE title != '' AND title IS NOT NULL AND title IN (SELECT title FROM scenes WHERE title != '' AND title IS NOT NULL GROUP BY title HAVING COUNT(*) "+v+" 1))", "sctitle", "scenes.id = sctitle.id")
+}
+
+func (qb *sceneFilterHandler) applyURLDuplication(f *filterBuilder, duplicated bool) {
+	v := getCountOperator(duplicated)
+	// Find URLs that appear on more than one scene
+	f.addInnerJoin("(SELECT scene_id FROM scene_urls INNER JOIN (SELECT url FROM scene_urls GROUP BY url HAVING COUNT(DISTINCT scene_id) "+v+" 1) dupes ON scene_urls.url = dupes.url)", "scurl", "scenes.id = scurl.scene_id")
+}
+
 func (qb *sceneFilterHandler) codecCriterionHandler(codec *models.StringCriterionInput, codecColumn string, addJoinFn func(f *filterBuilder)) criterionHandlerFunc {
 	return func(ctx context.Context, f *filterBuilder) {
 		if codec != nil {
diff --git a/pkg/sqlite/scene_test.go b/pkg/sqlite/scene_test.go
index ae9ba56cf..6cdb62a5e 100644
--- a/pkg/sqlite/scene_test.go
+++ b/pkg/sqlite/scene_test.go
@@ -4121,7 +4121,7 @@ func TestSceneQueryPhashDuplicated(t *testing.T) {
 	withTxn(func(ctx context.Context) error {
 		sqb := db.Scene
 		duplicated := true
-		phashCriterion := models.PHashDuplicationCriterionInput{
+		phashCriterion := models.DuplicationCriterionInput{
 			Duplicated: &duplicated,
 		}
 
diff --git a/ui/v2.5/src/components/List/CriterionEditor.tsx b/ui/v2.5/src/components/List/CriterionEditor.tsx
index eba212223..8795296fa 100644
--- a/ui/v2.5/src/components/List/CriterionEditor.tsx
+++ b/ui/v2.5/src/components/List/CriterionEditor.tsx
@@ -42,8 +42,12 @@ import { StudiosCriterion } from "src/models/list-filter/criteria/studios";
 import StudiosFilter from "./Filters/StudiosFilter";
 import { TagsCriterion } from "src/models/list-filter/criteria/tags";
 import TagsFilter from "./Filters/TagsFilter";
-import { PhashCriterion } from "src/models/list-filter/criteria/phash";
+import {
+  PhashCriterion,
+  DuplicatedCriterion,
+} from "src/models/list-filter/criteria/phash";
 import { PhashFilter } from "./Filters/PhashFilter";
+import { DuplicatedFilter } from "./Filters/DuplicateFilter";
 import { PathCriterion } from "src/models/list-filter/criteria/path";
 import { ModifierSelectorButtons } from "./ModifierSelect";
 import { CustomFieldsCriterion } from "src/models/list-filter/criteria/custom-fields";
@@ -273,6 +277,12 @@ export const CriterionEditor: React.FC<ICriterionEditor> = ({
       );
     }
 
+    if (criterion instanceof DuplicatedCriterion) {
+      return (
+        <DuplicatedFilter criterion={criterion} setCriterion={setCriterion} />
+      );
+    }
+
     if (criterion instanceof CustomFieldsCriterion) {
       return (
         <CustomFieldsFilter criterion={criterion} setCriterion={setCriterion} />
diff --git a/ui/v2.5/src/components/List/Filters/DuplicateFilter.tsx b/ui/v2.5/src/components/List/Filters/DuplicateFilter.tsx
new file mode 100644
index 000000000..819d5b885
--- /dev/null
+++ b/ui/v2.5/src/components/List/Filters/DuplicateFilter.tsx
@@ -0,0 +1,227 @@
+import React, { useCallback, useMemo, useState } from "react";
+import { useIntl } from "react-intl";
+import { ListFilterModel } from "src/models/list-filter/filter";
+import { Option, SelectedList } from "./SidebarListFilter";
+import {
+  DuplicatedCriterion,
+  DuplicatedCriterionOption,
+  DuplicationFieldId,
+  DUPLICATION_FIELD_IDS,
+  DUPLICATION_FIELD_MESSAGE_IDS,
+} from "src/models/list-filter/criteria/phash";
+import { IndeterminateCheckbox } from "src/components/Shared/IndeterminateCheckbox";
+import { SidebarSection } from "src/components/Shared/Sidebar";
+import { Icon } from "src/components/Shared/Icon";
+import { faPlus } from "@fortawesome/free-solid-svg-icons";
+import { keyboardClickHandler } from "src/utils/keyboard";
+
+interface IDuplicatedFilter {
+  criterion: DuplicatedCriterion;
+  setCriterion: (c: DuplicatedCriterion) => void;
+}
+
+export const DuplicatedFilter: React.FC<IDuplicatedFilter> = ({
+  criterion,
+  setCriterion,
+}) => {
+  const intl = useIntl();
+
+  function onFieldChange(
+    fieldId: DuplicationFieldId,
+    value: boolean | undefined
+  ) {
+    const c = criterion.clone();
+    if (value === undefined) {
+      delete c.value[fieldId];
+    } else {
+      c.value[fieldId] = value;
+    }
+    setCriterion(c);
+  }
+
+  return (
+    <div className="duplicated-filter">
+      {DUPLICATION_FIELD_IDS.map((fieldId) => (
+        <IndeterminateCheckbox
+          key={fieldId}
+          id={`duplicated-${fieldId}`}
+          label={intl.formatMessage({
+            id: DUPLICATION_FIELD_MESSAGE_IDS[fieldId],
+          })}
+          checked={criterion.value[fieldId]}
+          setChecked={(v) => onFieldChange(fieldId, v)}
+        />
+      ))}
+    </div>
+  );
+};
+
+interface ISidebarDuplicateFilterProps {
+  title?: React.ReactNode;
+  filter: ListFilterModel;
+  setFilter: (f: ListFilterModel) => void;
+  sectionID?: string;
+}
+
+export const SidebarDuplicateFilter: React.FC<ISidebarDuplicateFilterProps> = ({
+  title,
+  filter,
+  setFilter,
+  sectionID,
+}) => {
+  const intl = useIntl();
+  const [expandedType, setExpandedType] = useState<string | null>(null);
+
+  const trueLabel = intl.formatMessage({ id: "true" });
+  const falseLabel = intl.formatMessage({ id: "false" });
+
+  // Get label for a duplicate type
+  const getLabel = useCallback(
+    (typeId: DuplicationFieldId) =>
+      intl.formatMessage({ id: DUPLICATION_FIELD_MESSAGE_IDS[typeId] }),
+    [intl]
+  );
+
+  // Get the single duplicated criterion from the filter
+  const getCriterion = useCallback((): DuplicatedCriterion | null => {
+    const criteria = filter.criteriaFor(
+      DuplicatedCriterionOption.type
+    ) as DuplicatedCriterion[];
+    return criteria.length > 0 ? criteria[0] : null;
+  }, [filter]);
+
+  // Get value for a specific type from the criterion
+  const getTypeValue = useCallback(
+    (typeId: DuplicationFieldId): boolean | undefined => {
+      const criterion = getCriterion();
+      if (!criterion) return undefined;
+      return criterion.value[typeId];
+    },
+    [getCriterion]
+  );
+
+  // Build selected items list
+  const selected: Option[] = useMemo(() => {
+    const result: Option[] = [];
+    const criterion = getCriterion();
+    if (!criterion) return result;
+
+    for (const typeId of DUPLICATION_FIELD_IDS) {
+      const value = criterion.value[typeId];
+      if (value !== undefined) {
+        const valueLabel = value ? trueLabel : falseLabel;
+        result.push({
+          id: typeId,
+          label: `${getLabel(typeId)}: ${valueLabel}`,
+        });
+      }
+    }
+
+    return result;
+  }, [getCriterion, trueLabel, falseLabel, getLabel]);
+
+  // Available options - show options that aren't already selected
+  const options = useMemo(() => {
+    const result: { id: DuplicationFieldId; label: string }[] = [];
+
+    for (const typeId of DUPLICATION_FIELD_IDS) {
+      if (getTypeValue(typeId) === undefined) {
+        result.push({ id: typeId, label: getLabel(typeId) });
+      }
+    }
+
+    return result;
+  }, [getTypeValue, getLabel]);
+
+  function onToggleExpand(id: string) {
+    setExpandedType(expandedType === id ? null : id);
+  }
+
+  function onUnselect(item: Option) {
+    const typeId = item.id as DuplicationFieldId;
+    const criterion = getCriterion();
+
+    if (!criterion) return;
+
+    const newCriterion = criterion.clone();
+    delete newCriterion.value[typeId];
+
+    // If no fields are set, remove the criterion entirely
+    const hasAnyValue = DUPLICATION_FIELD_IDS.some(
+      (id) => newCriterion.value[id] !== undefined
+    );
+
+    if (!hasAnyValue) {
+      setFilter(filter.removeCriterion(DuplicatedCriterionOption.type));
+    } else {
+      setFilter(
+        filter.replaceCriteria(DuplicatedCriterionOption.type, [newCriterion])
+      );
+    }
+    setExpandedType(null);
+  }
+
+  function onSelectValue(typeId: string, value: boolean) {
+    const criterion = getCriterion();
+    const newCriterion = criterion
+      ? criterion.clone()
+      : (DuplicatedCriterionOption.makeCriterion() as DuplicatedCriterion);
+
+    newCriterion.value[typeId as DuplicationFieldId] = value;
+    setFilter(
+      filter.replaceCriteria(DuplicatedCriterionOption.type, [newCriterion])
+    );
+    setExpandedType(null);
+  }
+
+  return (
+    <SidebarSection
+      className="sidebar-list-filter"
+      text={title}
+      sectionID={sectionID}
+      outsideCollapse={
+        <SelectedList items={selected} onUnselect={(i) => onUnselect(i)} />
+      }
+    >
+      <div className="queryable-candidate-list">
+        <ul>
+          {options.map((opt) => (
+            <React.Fragment key={opt.id}>
+              <li className="unselected-object">
+                <a
+                  onClick={() => onToggleExpand(opt.id)}
+                  onKeyDown={keyboardClickHandler(() => onToggleExpand(opt.id))}
+                  tabIndex={0}
+                >
+                  <div className="label-group">
+                    <Icon
+                      className="fa-fw include-button single-value"
+                      icon={faPlus}
+                    />
+                    <span className="unselected-object-label">{opt.label}</span>
+                  </div>
+                </a>
+              </li>
+              {expandedType === opt.id && (
+                <div className="duplicate-sub-options">
+                  <div
+                    className="duplicate-sub-option"
+                    onClick={() => onSelectValue(opt.id, true)}
+                  >
+                    {trueLabel}
+                  </div>
+                  <div
+                    className="duplicate-sub-option"
+                    onClick={() => onSelectValue(opt.id, false)}
+                  >
+                    {falseLabel}
+                  </div>
+                </div>
+              )}
+            </React.Fragment>
+          ))}
+        </ul>
+      </div>
+    </SidebarSection>
+  );
+};
diff --git a/ui/v2.5/src/components/List/styles.scss b/ui/v2.5/src/components/List/styles.scss
index 8a7fdf8cf..e7a4caf02 100644
--- a/ui/v2.5/src/components/List/styles.scss
+++ b/ui/v2.5/src/components/List/styles.scss
@@ -726,6 +726,24 @@ input[type="range"].zoom-slider {
   min-height: 2em;
 }
 
+.duplicate-sub-options {
+  margin-left: 2rem;
+  padding-left: 0.5rem;
+
+  .duplicate-sub-option {
+    align-items: center;
+    cursor: pointer;
+    display: flex;
+    height: 2em;
+    opacity: 0.8;
+    padding-left: 0.5rem;
+
+    &:hover {
+      background-color: rgba(138, 155, 168, 0.15);
+    }
+  }
+}
+
 .tilted {
   transform: rotate(45deg);
 }
diff --git a/ui/v2.5/src/components/Scenes/SceneList.tsx b/ui/v2.5/src/components/Scenes/SceneList.tsx
index 2f74fc7e4..79f470de8 100644
--- a/ui/v2.5/src/components/Scenes/SceneList.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneList.tsx
@@ -44,6 +44,7 @@ import { OrganizedCriterionOption } from "src/models/list-filter/criteria/organi
 import { HasMarkersCriterionOption } from "src/models/list-filter/criteria/has-markers";
 import { SidebarBooleanFilter } from "../List/Filters/BooleanFilter";
 import { PerformerAgeCriterionOption } from "src/models/list-filter/scenes";
+import { SidebarDuplicateFilter } from "../List/Filters/DuplicateFilter";
 import { SidebarAgeFilter } from "../List/Filters/SidebarAgeFilter";
 import { SidebarDurationFilter } from "../List/Filters/SidebarDurationFilter";
 import {
@@ -320,6 +321,12 @@ const SidebarContent: React.FC<{
           setFilter={setFilter}
           sectionID="organized"
         />
+        <SidebarDuplicateFilter
+          title={<FormattedMessage id="duplicated" />}
+          filter={filter}
+          setFilter={setFilter}
+          sectionID="duplicated"
+        />
         <SidebarAgeFilter
           title={<FormattedMessage id="performer_age" />}
           option={PerformerAgeCriterionOption}
diff --git a/ui/v2.5/src/locales/en-GB.json b/ui/v2.5/src/locales/en-GB.json
index 6f7403686..b8800216c 100644
--- a/ui/v2.5/src/locales/en-GB.json
+++ b/ui/v2.5/src/locales/en-GB.json
@@ -1092,7 +1092,10 @@
     "select_youngest": "Select the youngest file in the duplicate group",
     "title": "Duplicate Scenes"
   },
+  "duplicated": "Duplicated",
   "duplicated_phash": "Duplicated (pHash)",
+  "duplicated_stash_id": "Duplicated (Stash ID)",
+  "duplicated_title": "Duplicated (Title)",
   "duration": "Duration",
   "effect_filters": {
     "aspect": "Aspect",
diff --git a/ui/v2.5/src/models/list-filter/criteria/criterion.ts b/ui/v2.5/src/models/list-filter/criteria/criterion.ts
index 8f30e5d17..ae23a48d4 100644
--- a/ui/v2.5/src/models/list-filter/criteria/criterion.ts
+++ b/ui/v2.5/src/models/list-filter/criteria/criterion.ts
@@ -12,6 +12,7 @@ import {
 import TextUtils from "src/utils/text";
 import {
   CriterionType,
+  IDuplicationValue,
   IHierarchicalLabelValue,
   ILabeledId,
   INumberValue,
@@ -36,7 +37,8 @@ export type CriterionValue =
   | IStashIDValue
   | IDateValue
   | ITimestampValue
-  | IPhashDistanceValue;
+  | IPhashDistanceValue
+  | IDuplicationValue;
 
 export interface ISavedCriterion<T> {
   modifier: CriterionModifier;
diff --git a/ui/v2.5/src/models/list-filter/criteria/phash.ts b/ui/v2.5/src/models/list-filter/criteria/phash.ts
index 0cbfa155e..e79b0a447 100644
--- a/ui/v2.5/src/models/list-filter/criteria/phash.ts
+++ b/ui/v2.5/src/models/list-filter/criteria/phash.ts
@@ -1,15 +1,28 @@
 import {
   CriterionModifier,
   PhashDistanceCriterionInput,
-  PHashDuplicationCriterionInput,
+  DuplicationCriterionInput,
 } from "src/core/generated-graphql";
-import { IPhashDistanceValue } from "../types";
-import {
-  BooleanCriterionOption,
-  ModifierCriterion,
-  ModifierCriterionOption,
-  StringCriterion,
-} from "./criterion";
+import { IDuplicationValue, IPhashDistanceValue } from "../types";
+import { ModifierCriterion, ModifierCriterionOption } from "./criterion";
+import { IntlShape } from "react-intl";
+
+// Shared mapping of duplication field IDs to their i18n message IDs
+export const DUPLICATION_FIELD_MESSAGE_IDS = {
+  phash: "media_info.phash",
+  stash_id: "stash_id",
+  title: "title",
+  url: "url",
+} as const;
+
+export type DuplicationFieldId = keyof typeof DUPLICATION_FIELD_MESSAGE_IDS;
+
+export const DUPLICATION_FIELD_IDS: DuplicationFieldId[] = [
+  "phash",
+  "stash_id",
+  "title",
+  "url",
+];
 
 export const PhashCriterionOption = new ModifierCriterionOption({
   messageID: "media_info.phash",
@@ -55,20 +68,97 @@ export class PhashCriterion extends ModifierCriterion<IPhashDistanceValue> {
   }
 }
 
-export const DuplicatedCriterionOption = new BooleanCriterionOption(
-  "duplicated_phash",
-  "duplicated",
-  () => new DuplicatedCriterion()
-);
+export const DuplicatedCriterionOption = new ModifierCriterionOption({
+  messageID: "duplicated",
+  type: "duplicated",
+  modifierOptions: [], // No modifiers for this filter
+  defaultModifier: CriterionModifier.Equals,
+  makeCriterion: () => new DuplicatedCriterion(),
+});
 
-export class DuplicatedCriterion extends StringCriterion {
+export class DuplicatedCriterion extends ModifierCriterion<IDuplicationValue> {
   constructor() {
-    super(DuplicatedCriterionOption);
+    super(DuplicatedCriterionOption, {});
   }
 
-  public toCriterionInput(): PHashDuplicationCriterionInput {
+  public cloneValues() {
+    this.value = { ...this.value };
+  }
+
+  // Override getLabel to provide custom formatting for duplication fields
+  public getLabel(intl: IntlShape): string {
+    const parts: string[] = [];
+    const trueLabel = intl.formatMessage({ id: "true" });
+    const falseLabel = intl.formatMessage({ id: "false" });
+
+    for (const fieldId of DUPLICATION_FIELD_IDS) {
+      const fieldValue = this.value[fieldId];
+      if (fieldValue !== undefined) {
+        const label = intl.formatMessage({
+          id: DUPLICATION_FIELD_MESSAGE_IDS[fieldId],
+        });
+        parts.push(`${label}: ${fieldValue ? trueLabel : falseLabel}`);
+      }
+    }
+
+    // Handle legacy duplicated field
+    if (parts.length === 0 && this.value.duplicated !== undefined) {
+      const label = intl.formatMessage({ id: "duplicated_phash" });
+      return `${label}: ${this.value.duplicated ? trueLabel : falseLabel}`;
+    }
+
+    if (parts.length === 0) {
+      return intl.formatMessage({ id: "duplicated" });
+    }
+
+    return parts.join(", ");
+  }
+
+  protected getLabelValue(intl: IntlShape): string {
+    // Required by abstract class - returns basic label when getLabel isn't overridden
+    return intl.formatMessage({ id: "duplicated" });
+  }
+
+  protected toCriterionInput(): DuplicationCriterionInput {
     return {
-      duplicated: this.value === "true",
+      duplicated: this.value.duplicated,
+      distance: this.value.distance,
+      phash: this.value.phash,
+      url: this.value.url,
+      stash_id: this.value.stash_id,
+      title: this.value.title,
     };
   }
+
+  // Override to handle legacy saved formats
+  public setFromSavedCriterion(criterion: unknown): void {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const c = criterion as any;
+
+    // Handle various saved formats
+    if (c.value !== undefined) {
+      // New format: { value: { phash: true, ... } }
+      if (typeof c.value === "object") {
+        this.value = c.value as IDuplicationValue;
+      } else if (typeof c.value === "string") {
+        // Legacy format: { value: "true" } - convert to phash
+        this.value = { phash: c.value === "true" };
+      }
+    } else if (typeof c === "object") {
+      // Direct value format
+      this.value = c as IDuplicationValue;
+    }
+
+    if (c.modifier) {
+      this.modifier = c.modifier;
+    }
+  }
+
+  public isValid(): boolean {
+    // Check if any duplication field is set
+    const hasFieldSet = DUPLICATION_FIELD_IDS.some(
+      (fieldId) => this.value[fieldId] !== undefined
+    );
+    return hasFieldSet || this.value.duplicated !== undefined;
+  }
 }
diff --git a/ui/v2.5/src/models/list-filter/types.ts b/ui/v2.5/src/models/list-filter/types.ts
index bf5fff4d9..442099a53 100644
--- a/ui/v2.5/src/models/list-filter/types.ts
+++ b/ui/v2.5/src/models/list-filter/types.ts
@@ -47,9 +47,15 @@ export interface IRangeValue<V> {
 export type INumberValue = IRangeValue<number>;
 export type IDateValue = IRangeValue<string>;
 export type ITimestampValue = IRangeValue<string>;
-export interface IPHashDuplicationValue {
-  duplicated: boolean;
-  distance?: number; // currently not implemented
+export interface IDuplicationValue {
+  // Deprecated: Use phash field instead. Kept for backwards compatibility.
+  duplicated?: boolean;
+  // Currently not implemented. Intended for phash distance matching.
+  distance?: number;
+  phash?: boolean;
+  url?: boolean;
+  stash_id?: boolean;
+  title?: boolean;
 }
 
 export interface IStashIDValue {

From 6ef599e894dd03a005ac7f6226455a343a2c795b Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Fri, 13 Feb 2026 17:05:20 +1100
Subject: [PATCH 290/405] Make recommendation row width selector more specific.

Fixes issue where the media overrides would set the card width to the wrong value on small viewports.
---
 ui/v2.5/src/components/FrontPage/styles.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/v2.5/src/components/FrontPage/styles.scss b/ui/v2.5/src/components/FrontPage/styles.scss
index f643e4eb6..2de0c6a44 100644
--- a/ui/v2.5/src/components/FrontPage/styles.scss
+++ b/ui/v2.5/src/components/FrontPage/styles.scss
@@ -496,6 +496,6 @@
 // HACK: compatibility with existing behaviour after removed width from zoom-1 class
 // this should really be changed to use the specific card types instead of a generic zoom-1 class,
 // but this is a quick fix to prevent breaking existing styles
-.recommendation-row .zoom-1 {
+.recommendation-row .card.zoom-1 {
   width: 320px;
 }

From 3ae3ea61025330defe0974147430275d16072e38 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Fri, 13 Feb 2026 17:06:55 +1100
Subject: [PATCH 291/405] Default card width before container width is
 calculated (#6574)

---
 ui/v2.5/src/components/Shared/GridCard/GridCard.tsx | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/ui/v2.5/src/components/Shared/GridCard/GridCard.tsx b/ui/v2.5/src/components/Shared/GridCard/GridCard.tsx
index 7bdac36c6..817527101 100644
--- a/ui/v2.5/src/components/Shared/GridCard/GridCard.tsx
+++ b/ui/v2.5/src/components/Shared/GridCard/GridCard.tsx
@@ -89,15 +89,22 @@ export function useCardWidth(
   zoomWidths: number[]
 ) {
   return useMemo(() => {
+    if (ScreenUtils.isMobile()) {
+      return;
+    }
+
     if (
-      !containerWidth ||
       zoomIndex === undefined ||
       zoomIndex < 0 ||
-      zoomIndex >= zoomWidths.length ||
-      ScreenUtils.isMobile()
+      zoomIndex >= zoomWidths.length
     )
       return;
 
+    // use a default card width if we don't have the container width yet
+    if (!containerWidth) {
+      return zoomWidths[zoomIndex];
+    }
+
     let zoomValue = zoomIndex;
     const preferredCardWidth = zoomWidths[zoomValue];
     let fittedCardWidth = calculateCardWidth(

From c8a8154e83895f14d29abb7b148c955555845357 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Fri, 13 Feb 2026 17:54:58 +1100
Subject: [PATCH 292/405] Only use infinite scrolling where there are more
 items than can be displayed (#6575)

Also show dots on small viewports, up to a limit of 5
---
 ui/v2.5/src/core/recommendations.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/ui/v2.5/src/core/recommendations.ts b/ui/v2.5/src/core/recommendations.ts
index b0a1232e4..7c55fed9d 100644
--- a/ui/v2.5/src/core/recommendations.ts
+++ b/ui/v2.5/src/core/recommendations.ts
@@ -16,7 +16,7 @@ export function getSlickSliderSettings(cardCount: number, isTouch: boolean) {
   return {
     dots: !isTouch,
     arrows: !isTouch,
-    infinite: !isTouch,
+    infinite: !isTouch && cardCount > 5,
     speed: 300,
     variableWidth: true,
     swipeToSlide: true,
@@ -26,6 +26,7 @@ export function getSlickSliderSettings(cardCount: number, isTouch: boolean) {
       {
         breakpoint: 1909,
         settings: {
+          infinite: !isTouch && cardCount > 4,
           slidesToShow: cardCount! > 4 ? 4 : cardCount,
           slidesToScroll: determineSlidesToScroll(cardCount!, 4, isTouch),
         },
@@ -33,6 +34,7 @@ export function getSlickSliderSettings(cardCount: number, isTouch: boolean) {
       {
         breakpoint: 1542,
         settings: {
+          infinite: !isTouch && cardCount > 3,
           slidesToShow: cardCount! > 3 ? 3 : cardCount,
           slidesToScroll: determineSlidesToScroll(cardCount!, 3, isTouch),
         },
@@ -40,6 +42,7 @@ export function getSlickSliderSettings(cardCount: number, isTouch: boolean) {
       {
         breakpoint: 1170,
         settings: {
+          infinite: !isTouch && cardCount > 2,
           slidesToShow: cardCount! > 2 ? 2 : cardCount,
           slidesToScroll: determineSlidesToScroll(cardCount!, 2, isTouch),
         },
@@ -47,9 +50,10 @@ export function getSlickSliderSettings(cardCount: number, isTouch: boolean) {
       {
         breakpoint: 801,
         settings: {
+          infinite: !isTouch && cardCount > 1,
           slidesToShow: 1,
           slidesToScroll: 1,
-          dots: false,
+          dots: cardCount < 6,
         },
       },
     ],

From b1f3bbe5b0cad835e0a4c42a9cae5f414fbf3bfd Mon Sep 17 00:00:00 2001
From: feederbox826 <me@feederbox.cc>
Date: Sun, 15 Feb 2026 23:06:10 -0500
Subject: [PATCH 293/405] Performer image rewrite (#6566)

* SVGs and attribute male performers
* SVG, cleanup and attribute female performer images
---
 internal/static/performer/NoName01.png        | Bin 13753 -> 0 bytes
 internal/static/performer/NoName02.png        | Bin 11353 -> 0 bytes
 internal/static/performer/NoName02.svg        |   1 +
 internal/static/performer/NoName03.png        | Bin 11049 -> 0 bytes
 internal/static/performer/NoName04.png        | Bin 10578 -> 0 bytes
 internal/static/performer/NoName05.png        | Bin 11026 -> 0 bytes
 internal/static/performer/NoName05.svg        |   1 +
 internal/static/performer/NoName06.png        | Bin 10757 -> 3026 bytes
 internal/static/performer/NoName07.png        | Bin 8661 -> 0 bytes
 internal/static/performer/NoName07.svg        |   1 +
 internal/static/performer/NoName08.png        | Bin 12597 -> 0 bytes
 internal/static/performer/NoName09.png        | Bin 9907 -> 0 bytes
 internal/static/performer/NoName09.svg        |   1 +
 internal/static/performer/NoName10.png        | Bin 10761 -> 0 bytes
 internal/static/performer/NoName11.png        | Bin 11893 -> 3587 bytes
 internal/static/performer/NoName12.png        | Bin 40410 -> 0 bytes
 internal/static/performer/NoName12.svg        |   1 +
 internal/static/performer/NoName13.png        | Bin 8925 -> 0 bytes
 internal/static/performer/NoName13.svg        |   1 +
 internal/static/performer/NoName14.png        | Bin 9840 -> 0 bytes
 internal/static/performer/NoName14.svg        |   1 +
 internal/static/performer/NoName15.png        | Bin 13849 -> 0 bytes
 internal/static/performer/NoName16.png        | Bin 14569 -> 0 bytes
 internal/static/performer/NoName17.png        | Bin 10878 -> 0 bytes
 internal/static/performer/NoName17.svg        |   1 +
 internal/static/performer/NoName18.png        | Bin 12196 -> 0 bytes
 internal/static/performer/NoName19.png        | Bin 12482 -> 0 bytes
 internal/static/performer/NoName19.svg        |   1 +
 internal/static/performer/NoName20.png        | Bin 12116 -> 0 bytes
 internal/static/performer/NoName21.png        | Bin 10897 -> 0 bytes
 internal/static/performer/NoName21.svg        |   1 +
 internal/static/performer/NoName22.png        | Bin 10689 -> 0 bytes
 internal/static/performer/NoName22.svg        |   1 +
 internal/static/performer/NoName23.png        | Bin 12121 -> 0 bytes
 internal/static/performer/NoName23.svg        |   1 +
 internal/static/performer/NoName24.png        | Bin 11273 -> 0 bytes
 internal/static/performer/NoName24.svg        |   1 +
 internal/static/performer/NoName25.png        | Bin 11157 -> 0 bytes
 internal/static/performer/NoName25.svg        |   1 +
 internal/static/performer/NoName26.png        | Bin 10647 -> 0 bytes
 internal/static/performer/NoName26.svg        |   1 +
 internal/static/performer/NoName27.png        | Bin 11884 -> 0 bytes
 internal/static/performer/NoName27.svg        |   1 +
 internal/static/performer/NoName28.png        | Bin 12687 -> 0 bytes
 internal/static/performer/NoName28.svg        |   1 +
 internal/static/performer/NoName29.png        | Bin 11191 -> 2990 bytes
 internal/static/performer/NoName30.png        | Bin 12278 -> 0 bytes
 internal/static/performer/NoName30.svg        |   1 +
 internal/static/performer/NoName31.png        | Bin 11289 -> 0 bytes
 internal/static/performer/NoName31.svg        |   1 +
 internal/static/performer/NoName32.png        | Bin 13180 -> 0 bytes
 internal/static/performer/NoName32.svg        |   1 +
 internal/static/performer/NoName33.png        | Bin 11984 -> 3506 bytes
 internal/static/performer/NoName34.png        | Bin 12270 -> 0 bytes
 internal/static/performer/NoName34.svg        |   1 +
 internal/static/performer/NoName35.png        | Bin 8573 -> 2503 bytes
 internal/static/performer/NoName36.png        | Bin 9733 -> 0 bytes
 internal/static/performer/NoName36.svg        |   1 +
 internal/static/performer/NoName37.png        | Bin 9818 -> 0 bytes
 internal/static/performer/NoName37.svg        |   1 +
 internal/static/performer/NoName38.png        | Bin 10489 -> 0 bytes
 internal/static/performer/NoName38.svg        |   1 +
 internal/static/performer/NoName39.png        | Bin 10928 -> 0 bytes
 internal/static/performer/NoName39.svg        |   1 +
 internal/static/performer/NoName40.png        | Bin 13857 -> 0 bytes
 internal/static/performer/attribution.md      |  34 ++++++++++++++++++
 internal/static/performer_male/Male01.png     | Bin 29574 -> 0 bytes
 internal/static/performer_male/Male01.svg     |   1 +
 internal/static/performer_male/Male02.png     | Bin 27367 -> 0 bytes
 internal/static/performer_male/Male02.svg     |   1 +
 internal/static/performer_male/Male03.png     | Bin 26475 -> 0 bytes
 internal/static/performer_male/Male03.svg     |   1 +
 internal/static/performer_male/Male04.png     | Bin 26600 -> 0 bytes
 internal/static/performer_male/Male04.svg     |   1 +
 internal/static/performer_male/Male05.png     | Bin 25812 -> 0 bytes
 internal/static/performer_male/Male05.svg     |   1 +
 internal/static/performer_male/Male06.png     | Bin 31704 -> 0 bytes
 internal/static/performer_male/Male06.svg     |   1 +
 internal/static/performer_male/attribution.md |   8 +++++
 79 files changed, 73 insertions(+)
 delete mode 100644 internal/static/performer/NoName01.png
 delete mode 100644 internal/static/performer/NoName02.png
 create mode 100644 internal/static/performer/NoName02.svg
 delete mode 100644 internal/static/performer/NoName03.png
 delete mode 100644 internal/static/performer/NoName04.png
 delete mode 100644 internal/static/performer/NoName05.png
 create mode 100644 internal/static/performer/NoName05.svg
 delete mode 100644 internal/static/performer/NoName07.png
 create mode 100644 internal/static/performer/NoName07.svg
 delete mode 100644 internal/static/performer/NoName08.png
 delete mode 100644 internal/static/performer/NoName09.png
 create mode 100644 internal/static/performer/NoName09.svg
 delete mode 100644 internal/static/performer/NoName10.png
 delete mode 100644 internal/static/performer/NoName12.png
 create mode 100644 internal/static/performer/NoName12.svg
 delete mode 100644 internal/static/performer/NoName13.png
 create mode 100644 internal/static/performer/NoName13.svg
 delete mode 100644 internal/static/performer/NoName14.png
 create mode 100644 internal/static/performer/NoName14.svg
 delete mode 100644 internal/static/performer/NoName15.png
 delete mode 100644 internal/static/performer/NoName16.png
 delete mode 100644 internal/static/performer/NoName17.png
 create mode 100644 internal/static/performer/NoName17.svg
 delete mode 100644 internal/static/performer/NoName18.png
 delete mode 100644 internal/static/performer/NoName19.png
 create mode 100644 internal/static/performer/NoName19.svg
 delete mode 100644 internal/static/performer/NoName20.png
 delete mode 100644 internal/static/performer/NoName21.png
 create mode 100644 internal/static/performer/NoName21.svg
 delete mode 100644 internal/static/performer/NoName22.png
 create mode 100644 internal/static/performer/NoName22.svg
 delete mode 100644 internal/static/performer/NoName23.png
 create mode 100644 internal/static/performer/NoName23.svg
 delete mode 100644 internal/static/performer/NoName24.png
 create mode 100644 internal/static/performer/NoName24.svg
 delete mode 100644 internal/static/performer/NoName25.png
 create mode 100644 internal/static/performer/NoName25.svg
 delete mode 100644 internal/static/performer/NoName26.png
 create mode 100644 internal/static/performer/NoName26.svg
 delete mode 100644 internal/static/performer/NoName27.png
 create mode 100644 internal/static/performer/NoName27.svg
 delete mode 100644 internal/static/performer/NoName28.png
 create mode 100644 internal/static/performer/NoName28.svg
 delete mode 100644 internal/static/performer/NoName30.png
 create mode 100644 internal/static/performer/NoName30.svg
 delete mode 100644 internal/static/performer/NoName31.png
 create mode 100644 internal/static/performer/NoName31.svg
 delete mode 100644 internal/static/performer/NoName32.png
 create mode 100644 internal/static/performer/NoName32.svg
 delete mode 100644 internal/static/performer/NoName34.png
 create mode 100644 internal/static/performer/NoName34.svg
 delete mode 100644 internal/static/performer/NoName36.png
 create mode 100644 internal/static/performer/NoName36.svg
 delete mode 100644 internal/static/performer/NoName37.png
 create mode 100644 internal/static/performer/NoName37.svg
 delete mode 100644 internal/static/performer/NoName38.png
 create mode 100644 internal/static/performer/NoName38.svg
 delete mode 100644 internal/static/performer/NoName39.png
 create mode 100644 internal/static/performer/NoName39.svg
 delete mode 100644 internal/static/performer/NoName40.png
 create mode 100644 internal/static/performer/attribution.md
 delete mode 100644 internal/static/performer_male/Male01.png
 create mode 100644 internal/static/performer_male/Male01.svg
 delete mode 100644 internal/static/performer_male/Male02.png
 create mode 100644 internal/static/performer_male/Male02.svg
 delete mode 100644 internal/static/performer_male/Male03.png
 create mode 100644 internal/static/performer_male/Male03.svg
 delete mode 100644 internal/static/performer_male/Male04.png
 create mode 100644 internal/static/performer_male/Male04.svg
 delete mode 100644 internal/static/performer_male/Male05.png
 create mode 100644 internal/static/performer_male/Male05.svg
 delete mode 100644 internal/static/performer_male/Male06.png
 create mode 100644 internal/static/performer_male/Male06.svg
 create mode 100644 internal/static/performer_male/attribution.md

diff --git a/internal/static/performer/NoName01.png b/internal/static/performer/NoName01.png
deleted file mode 100644
index cdcba1db9009b2d51379ab8578079ecd23fd1c2f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13753
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

diff --git a/internal/static/performer/NoName02.png b/internal/static/performer/NoName02.png
deleted file mode 100644
index 4687adc08a1a5b20aae5ddcc8c8f9f3f8ccc4bf2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11353
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
SX@C>0Jl2+W7R6>~um2Yjhem(^

diff --git a/internal/static/performer/NoName02.svg b/internal/static/performer/NoName02.svg
new file mode 100644
index 000000000..b5dbaf2b9
--- /dev/null
+++ b/internal/static/performer/NoName02.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 850 1250"><path fill="#fff" fill-rule="evenodd" d="M480.72 36.58c-10.56.01-21.69 1.97-34.35 9.32-28.85 23.98-32.38 59.58-34.6 98.83 2.47 24.57 6.03 47.44-4.17 73.49-11.7 1.42-24.56 5.66-37.6 3.92-13.16-1.77-28.8.54-35.24 7.21-20.4 27.97-29.09 64.17-40.61 100.3-11.53 36.13-18.01 65.15-18.22 70.6-2.83 15.39-2.51 33.25 2.95 50.89 11.33 29.32 21.89 56.36 33.98 87.95.79 1.81-3.34 3.11-2.83 5.1s1.53 4.44 1.83 6.54c.31 2.09 1.54 4.43 1.7 6.54.16 2.12 3.58 4.21 3.68 6.28.2 4.13.72 8.09 1.09 11.57.35 3.46.94 6.44 2.03 8.64l10.12 14.39c1.57 2.4 7.54-.99 8.58.93 2.17 4.07 8.13 2.75 10.29.62 1.53-1.52 3.99 2.03 6.07 1.8 2.09-.21 4.15-.6 6.13-1.25-7.69 22.24-20 44.47-23.07 66.71-8.78 29.38-21.69 44.27-26.36 88.13-1.3 17.3-.07 34.6 0 51.89l-9.88 32.94L280 901.69c-19.57 58.62-20.55 113.74-24.72 174.61l-6.59 12.36v18.93c-3.64 30.03-16.39 58.76-20.53 88.73.83 2.15 1.18 4.75 3.06 6.7 3.02 3.11 8.17 5.46 11.77 8.47 4.47 3.09 9.69 2.36 14.92 1.66 54.03-16.43 20.05-34.21 27.03-52.83.98-17.36 1.37-34.58 13.18-51.07 2.31-9.33-1.25-18.67-3.3-28.01 5.88-43.68 48.11-124.8 50.24-134.25l15.66-65.07c16.14-20.59 23.3-52.18 32.94-80.72l43.65-86.48 21.31-51.73c9.84-.07 19-10.61 23.16-16.63l9.88.82c-.86 10.43.07 20.87 10.71 31.29l27.19 132.61 16.47 37.88 11.54 52.71 15.65 104.61 1.64 42-4.11 14.83.82 30.48-4.94 38.72-11.1 31.68c-1.36 4.76-.24 11.37 2.86 14.2 20.97 20.41 52.34-.35 55.72-11.59.63-18.29 1.25-32.22 4.12-50.52l-.54-35.66-2.47-4.94v-12.36l-3.3-18.12c4.08-41.75 10.1-82.84 9.89-126.02-.54-35.83-6.63-70.28-16.48-103.77-2.39-22.61-4.97-45.14-6.92-67.98-1.4-16.4-2.48-32.94-2.95-49.8 1.15-11.25 2.29-21.55 3.17-31.35 2.86-32.14 2.9-58.75-8.16-94.67l-2.43-6.59 4.95-3.29c3.65-.82 3.05 4.44 11.53-3.3 1.52 1.27 4.12.91 8.72-2.47 3.65-9.09 11.8-16.92 9.84-28.1-6.39-4.95-2.79-3.45-21.03-13.08-2.21-9.68.25-18.2.82-27.17.17-15.34-1.29-29.93-5.11-44.61-5.09-19.73-8.47-39.44-13-59.18-5.76-20.28-4.09-56.63-11.97-89.87-9.42-15.61-19.5-15.96-21.42-17.38l-11.08-31.12c3.56 6.11 6.41 12.23 10.71 18.33l-5.77-19.15c5.23 9.53 16.02 18.6 12.92 28.83 3.22-8.21-1.64-14.95-5.61-21.85 3.91 6.17 10.05 11.8 14.92 17.73-7.23-10.16-14.41-20.32-14.83-30.48l-4.94-24.71c3.06 7.81 2.43 15.63 9.65 23.44-4.6-8.91-1.76-17.82-2.24-26.75 1.76 9.07 3.58 18.13 9.89 27.19-6.47-12.36-6.92-24.71-9.06-37.06-2.43-8.59-5.1-17.18-6.13-25.77-1.33-11.18-.67-22.37-1.29-33.54l.83-42.84c-2.94-12.9-5.05-25.81-16.48-38.72-7.84-10.63-17.89-16.1-28.01-21.41-8-.74-15.89-1.91-24.11-1.91Zm69.42 210.28c.48 1.07 1.02 2.13 1.6 3.19-.6-1.05-1.15-2.11-1.6-3.19Zm-208.4 107.77c1.56 22.71.19 45.21 3.62 67.92 5.74 22.85 11.94 41.69 16.71 66.52.16 12.4 1.33 22.33-6.98 55.89l-4.83-13.46c-1.32-2.05-2.21-4.2-6.7-5.73-4.36-16.84-11.3-31.44-13.26-48.73-2.25-19.97-6.79-34.65-11.92-51.22 1.11-16.12 7.62-28.97 12.69-46.1l10.66-25.09Zm205.09 80.48 7.85 29.71c2.19 15.92 5.13 31.36 15.73 41.92l-6.7 17.77c.05-5.06.11-10.09-.59-15.14-3.01-7.45-6-12.83-9-17.16l-19.23-27.39c-1.85-2.04-4.76-4.67-8.16-7l-.87-7.26-1.76-7.29c10.68-.94 17.45-4.12 22.73-8.16Zm38.42 99.9 1.17 8.13-4.07 11.07-6.13-12.51 7-3.5 2.03-3.19Z"/></svg>
\ No newline at end of file
diff --git a/internal/static/performer/NoName03.png b/internal/static/performer/NoName03.png
deleted file mode 100644
index 8ac0d13b73ae19c5aabe55a6cf6cec8aafcea9ca..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11049
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
R;DqKfBH^TQ4*p`m{{diN<pcl#

diff --git a/internal/static/performer/NoName04.png b/internal/static/performer/NoName04.png
deleted file mode 100644
index 41b55b816de17742c61cc7c1ba0e5659dde02b04..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10578
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
Qk8g>kxvg0q?e|On2S(tood5s;

diff --git a/internal/static/performer/NoName05.png b/internal/static/performer/NoName05.png
deleted file mode 100644
index 8a49ba6d3e9bc1985bbe75d1b2bc3ef25285d09e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11026
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

diff --git a/internal/static/performer/NoName05.svg b/internal/static/performer/NoName05.svg
new file mode 100644
index 000000000..5a26d98d8
--- /dev/null
+++ b/internal/static/performer/NoName05.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 850 1250"><path fill="#fff" d="M376.15 24.84c-3.58 1.02-10.08 2.26-14.39 2.85-9.64 1.31-12.93 2.19-18.26 4.82-14.17 7.01-23.67 19.21-29.66 37.99-3.36 10.52-4.53 19.14-5.26 37.62-.37 9.64-1.1 18.99-1.75 21.99-3.43 16.14-10.3 24.47-23.3 28.12-5.33 1.53-7.52 1.75-20.09 1.75-7.67 0-14.03.07-14.03.15 0 .15 1.46.58 3.29 1.02s3.29 1.02 3.29 1.31-3.07.95-6.72 1.46c-12.2 1.75-22.72 5.41-27.98 9.86-1.68 1.46-1.97 1.97-1.17 2.56.73.44.37 1.1-1.68 2.7-3.36 2.7-6.72 7.38-8.18 11.4-1.31 3.8-1.46 11.25-.22 13.95s2.12 2.48 2.12-.58c0-7.38 8.04-12.2 16.44-9.86 1.83.51 3.29 1.02 3.29 1.17 0 .22-1.39 2.05-3.14 4.16-1.75 2.19-3.87 5.33-4.75 7.16-1.83 3.94-2.92 9.13-1.68 8.4 1.17-.73 1.1-.44-1.39 4.82-2.63 5.62-4.38 13.22-4.38 19.21 0 5.11 1.02 10.08 2.12 10.45.44.15.8 1.53.8 3.07 0 3.87 2.48 11.4 5.04 15.41 2.19 3.58 5.84 6.72 8.69 7.6l1.68.51-1.53-2.48c-.8-1.31-1.46-3.29-1.46-4.38 0-2.48 2.78-10.08 3.73-10.08.37 0 .66 1.75.66 3.8.07 2.12.51 4.68 1.1 5.7 1.02 1.75 1.1 1.75.66-1.17-.51-3.29.88-11.25 1.97-11.25.58 0 .22 5.55-.51 7.89-.58 2.05 1.31 10.67 3.36 15.19 2.19 4.82 3.36 6.06 2.78 2.85-.58-3.07.66-2.05 1.53 1.31.95 3.14 5.04 10.45 5.62 9.86.15-.22 0-2.7-.37-5.55-.73-5.84 0-13.88 1.83-19.87 1.24-4.09 5.84-13.81 7.82-16.44s2.12-.58.22 3.14c-3.36 6.72-5.62 15.92-6.06 24.69-.44 8.62.15 14.9 1.31 14.9.37 0 .66-.44.58-.95-.22-2.05.15-4.89.66-4.89.29 0 .44 2.12.29 4.68-.73 11.47 4.46 26.44 10.23 29.51 3.8 2.05 3.94 2.7 3.43 25.86-.51 24.4-1.24 31.63-8.33 81.3-5.92 41.57-6.57 46.9-8.4 66.26-2.19 24.11-2.12 23.74-12.35 43.25-2.19 4.16-3 6.57-3 8.91q0 3.21 4.24 5.26l4.16 1.97.22 6.65c.22 7.52.22 7.6 6.57 7.6h3.14l-.44 5.26c-1.1 12.71-2.78 24.18-4.53 32-3 13.22-2.85 14.76 2.41 25.93 4.09 8.84 13.37 25.71 18.85 34.33 2.05 3.07 3 3.87 5.99 4.82 3.43 1.02 3.58 1.24 4.09 4.31.29 1.83 1.1 19.72 1.68 39.81.58 20.09 1.75 45.07 2.56 55.52 3.43 43.83 3.36 54.64-.73 100.08-1.17 13.22-3.29 43.03-4.75 66.11-1.39 23.08-4.02 65.16-5.84 93.5-3.65 58.07-6.65 108.33-7.38 124.33l-.51 10.74 1.75.37c.95.22 4.53 1.1 8.04 1.83 8.99 2.12 14.83 4.46 21.33 8.55 5.33 3.36 5.62 3.73 5.26 5.77-1.9 11.18-.58 19.87 3.87 24.62 7.52 7.96 25.06 8.55 34.84 1.17 5.92-4.46 8.4-11.4 8.4-23.52v-6.79l7.74-3.43c4.31-1.97 9.42-4.09 11.54-4.82l3.73-1.24-.22-3.21c-.07-1.75-.95-19.65-1.97-39.74-3.8-75.83-4.68-90.58-9.13-148.29-4.46-57.71-5.19-71.44-5.62-104.83-.58-41.71.44-58.37 7.38-121.7 4.82-43.83 8.33-79.26 9.2-93.8.95-14.61 2.26-23.96 4.38-30.68 1.97-6.5 2.63-7.38 3.51-5.11.44 1.02 4.38 11.03 8.77 22.28 4.38 11.25 14.46 36.96 22.35 57.2 7.96 20.16 20.75 52.23 28.49 71.22 32.14 78.75 37.55 96.06 49.02 159.03 2.26 12.27 5.41 29.37 7.01 37.99 6.72 36.6 12.56 72.32 27.03 165.38 6.28 40.1 6.94 43.76 8.33 44.19.8.29 10.88 3.8 22.35 7.74l20.89 7.16.51 6.28c1.46 19.07 7.89 26.3 24.03 26.96 6.5.29 7.38.15 11.1-1.61 4.46-2.26 9.72-7.6 12.05-12.49 1.97-4.09 2.19-12.49.44-19.07-.66-2.48-1.17-4.68-1.17-4.89 0-.15 2.19-1.61 4.82-3.14 5.7-3.29 9.57-7.52 10.23-11.03.73-3.94-.88-11.91-7.38-36.31-7.67-28.78-33.24-118.05-39.45-137.77-2.63-8.25-10.52-32.07-17.6-52.96-17.82-52.81-19.21-57.93-34.63-124.91-8.99-39.3-18.7-80.79-30.68-130.76-5.55-23.3-11.18-47.77-12.42-54.42-2.63-14.03-5.84-24.11-13.15-41.27-2.92-6.87-6.65-16.07-8.25-20.45l-2.92-8.04-.22-18.63c-.07-10.23-.51-22.06-.95-26.22s-.58-7.89-.37-8.25c.29-.44 1.46-1.17 2.78-1.68 2.19-.95 2.34-.88 5.99 2.56 7.16 6.79 15.49 7.38 27.03 1.9 3.07-1.46 6.43-3.29 7.6-4.09l2.05-1.46 4.09 5.55 4.16 5.48 4.53-3.58c6.36-5.04 11.25-7.96 15.41-9.06 3-.8 4.02-1.61 6.79-5.11 4.53-5.99 8.99-14.54 13.73-26.88 2.26-5.84 6.28-15.19 8.91-20.82 18.34-39.23 23.08-55.96 19.58-69.32-.66-2.41-4.31-10.74-8.11-18.63-17.17-34.99-29.37-64.87-43.03-105.26-8.18-24.25-11.4-31.78-15.71-37.04-1.97-2.34-4.97-6.43-6.57-9.2-3.87-6.43-4.97-7.09-11.69-7.01-3.87.07-8.77-.73-16.8-2.56-7.6-1.83-14.83-2.92-21.99-3.51l-10.74-.88 1.31-3.8c11.18-32.43 14.03-69.18 7.38-96.79-6.43-27.25-27.9-59.46-47.92-71.95-3.07-1.9-8.4-4.46-11.91-5.62-5.7-2.05-7.38-2.26-16.58-2.48-9.06-.22-10.96 0-16.8 1.61Zm125.64 306.44c7.3 11.25 14.76 27.76 25.2 55.74 9.72 26.15 10.96 32.51 8.33 41.42-1.31 4.31-13.37 28.85-15.85 32.29-.95 1.31-3.14 2.63-5.84 3.65-5.55 1.97-8.55 4.82-8.55 7.89 0 1.83.73 3.07 3.29 5.55 1.83 1.75 3.29 3.58 3.29 4.09 0 .58-.95 1.53-2.05 2.19-1.17.73-3.51 2.78-5.19 4.6-2.92 3.21-3.07 3.51-1.9 4.75 1.1 1.24 1.1 1.39-.15 1.68-5.62 1.61-5.26 1.75-13.44-6.21-4.24-4.16-8.91-8.18-10.37-8.91-1.39-.8-2.78-2.12-3-2.92-.22-.88-.8-6.57-1.31-12.78-1.61-20.97 1.97-48.36 10.81-82.25 1.75-6.87 4.82-18.7 6.79-26.3 1.97-7.67 4.16-17.39 4.89-21.77.66-4.31 1.39-7.82 1.53-7.82s1.75 2.26 3.51 5.11ZM283.01 578.92c0 9.72-.66 11.61-2.19 6.79-.95-2.7-2.19-14.76-1.68-15.78.15-.29 1.1-.51 2.12-.51h1.75v9.5Zm-.73 60.92c.58.07 1.31.88 1.53 1.9.73 2.78.73 10.23.07 10.23-1.53 0-7.45-10.3-7.45-12.93 0-.22 1.1-.07 2.41.22 1.24.29 2.85.51 3.43.58Z" vector-effect="non-scaling-stroke"/></svg>
\ No newline at end of file
diff --git a/internal/static/performer/NoName06.png b/internal/static/performer/NoName06.png
index 4359911aefc00700d4d1f927a2c30b823850a080..f2a8016e20b0d391f982500b3cdb9d01741cd1fc 100644
GIT binary patch
literal 3026
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

literal 10757
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
V3OrRaQRUmG)5n|O%C-N9`X5CtX_Wu~

diff --git a/internal/static/performer/NoName07.png b/internal/static/performer/NoName07.png
deleted file mode 100644
index 1bb5f6f82ae12737667297c7e8816020336d9bb6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8661
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

diff --git a/internal/static/performer/NoName07.svg b/internal/static/performer/NoName07.svg
new file mode 100644
index 000000000..ac90cf6d1
--- /dev/null
+++ b/internal/static/performer/NoName07.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 850 1250"><path fill="#fff" d="M472.98 38.67c-13.15.96-26.67 7.37-39.17 14.9-15.4 4.08-26.21 21.1-32.37 33.99-5.93 21.36-10.44 43.16-12.62 65.39-8.56 18.78 2.69 49.48-20.08 58.28-26.46 3.29-45.91 24.89-57.3 47.58-7.59 25.25-21.44 47.64-34.64 70.25-8.14 19.94-32.81 48.39-10.36 66.7 26.26 16.49 58.12 9.34 86.76 5.18 19.26 6.03 13.11 40.3 13.27 57.62.75 24.57-7.78 47.72-11.98 71.55-5.73 30.16 7.91 58.68 9.71 88.38 5.03 13.95-6.07 56.76 17.49 46.62 13.87 33.68 36.67 62.85 51.48 96.15 8.34 20.57 26.8 43.12 16.18 66.04-13.64 21.93-14.66 48.16-13.27 73.17-.62 26.72 8.46 52.33 10.04 78.64.81 38.12-21.73 71.17-25.9 108.47-1.34 21.76-26.4 39.99-12.31 61.54.39 2.59 6.27 16.37 9.72 29.42 2.95 11.19 7.33 18.65 11.32 25.9 7.35 14.5 20.87 3.11 23.96-3.83 8.76-19.79 14.33-29.42 13.27-5.18-1.06 24.24 47.37-4.77 52.13-24.35.58-2.38-.94-3.52 1.62-11.29 2.44-19.89-13.36-38.12-11.98-60.81-1.27-32.43-9.15-64.23-10.69-96.55-2.57-23.93 7.7-45.17 15.87-66.99 19.16-49.34 5.91-103.12 15.54-154.1 10.93-42.36 20.98-85.33 38.52-125.61-.89-18.39 20.38-20.42 25.58-30.76-17.12-45.49-12.18-96.36-31.73-141.15-11.79-19.53-23.53-41.51-34.95-59.57 10.41 8.04 27.29 13.76 37.22-2.59 2.46-11.07 14.4-21 9.72-32.7-8.61-21.13-4.68-43.27-8.42-65.72-10.33-20.34 26.7-1.53 19.42-11.33 21.04-14.01-21.31 8.01-11.98-12.3-4.57-23.82-10.07-47.05-19.75-69.29-7.05-48.59-12.56-98.26-29.46-144.71-7.04-10.12-4.91-16.98-13.6-28.49-10.4-14.73-23.1-19.4-36.26-18.45ZM343.16 329.72c5.59.8 1.72 20.91-.96 29.46-.23 6.92-4.89 5.55-9.4 4.21-23.94.47-6.9-16.97 1.29-26.87 4.43-5.2 7.2-7.07 9.06-6.8Z"/></svg>
\ No newline at end of file
diff --git a/internal/static/performer/NoName08.png b/internal/static/performer/NoName08.png
deleted file mode 100644
index 8ff7ff73494144e9b10407a5e2815101cb267ebb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12597
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

diff --git a/internal/static/performer/NoName09.png b/internal/static/performer/NoName09.png
deleted file mode 100644
index 49b54b725d9a36fdb1c2b5db96d8ddfe9e7fd3d6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9907
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
JkGl8d{{qRF872S#

diff --git a/internal/static/performer/NoName09.svg b/internal/static/performer/NoName09.svg
new file mode 100644
index 000000000..6009133a4
--- /dev/null
+++ b/internal/static/performer/NoName09.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 850 1250"><path fill="#fff" d="M390.27 1215.71c-26.85-.4-39.98-26.54-37.66-50.52-5.05-22.51-3.56-45.85-4.53-68.85 2.06-23.14 21.76-41.17 15.57-66.3-3.11-37.23-4.87-74.88-.58-112.07 4.2-24.94 13.46-48.45 25.58-70.54.29-20.04-3.9-39.59-12.25-57.87-14.58-37.71-27.84-75.94-45.89-112.18-8.06-20.45-4.48-48.36-34.09-48.93-17.01-1.88-35.19-2.94-30.5-26.06-1.18-31.57 3.95-62.99 2.66-94.64 4.55-28.15-22.55-45.52-37.4-65.53-15.7-21.87-32.9-42.98-45.36-67-4.35-29.81 14.01-56.22 24.4-82.85 12.15-30.72 29.69-58.93 42.97-89.06 10.76-17.8 24.8-40.58 48.45-39.99 22.64-.45 46.86.54 65.3-14.85 17.26-15.49 22.96-38.33 32.33-58.42 12.24-28.4 35.57-54.65 67.74-58.99 24.33-3.89 50.81 5.21 68.9 21.61 3.9 22.95 19.71 38.48 25.56 60.65 2.49 21.53-2.29 45.5 24.99 52.18 24.74 16.83 50.28 32.79 73.42 51.79 14.52 18.65-5.63 46.05-27.33 47.31-28.5 13.29-59.15 21.79-90.55 24.61-27.88-4.29-18.63 31.66-1.72 39.88 23.56 21.16-22.88-12.64-23.18-12.36-.26 12.99-3.78 24.58-8.09 5.3-11.15-22.15 3.96 31.49-5.43 19.37-1.78-11.09-13.78-34.88-13.28-9.82 1.3 8.03 14.21 33.96-.67 15.64-6.99-15.67-3.58-33.86-5.09-50.74-26.39-2.77-11.88 22.66-7.91 36.5 5.97 25-25.13 39.55-22.68 61.96 12.94 16.43 31.57 29.5 42.84 49.13 24.41 33.32 29.99 74.92 40.63 113.67-1.49 14.89 32.93 29.94 3.81 30.29-16.72 11.07-10.87 39.91-21.52 57.74-7.71 38.93-19.29 77-31.3 114.78-8.06 27.2-18.27 54.63-17.23 83.57-.36 40.67-6.09 81.1-16.62 120.35-5.81 25.47-15.31 50.35-14.89 77.06-2.19 24.53 2.41 48.98 11.71 71.6 7.37 20.12-4.17 48.71-29.66 40.63-24.51-5.69-10.97 27.47 2.91 33.26 14.53 16.75 1.15 34.28-19.32 29.02-5.02 0-10.06.1-15.06-.33Zm-121.8-810.49c.16-22.09 10.41-42.25 5.24-64.23-2.08-9.98 4.9-41.86-5.44-38.66-6.72 22.85-29.25 40.55-28.37 65.34 8.51 16.52 21.61 30.41 27.22 48.67 1.8-3.45.92-7.45 1.35-11.12Zm252.68-105.3c.93-13.95-20.6-7.37-6.22 2.41 3.97 6.03 8.46 5.04 6.22-2.41Zm59.8-74.98c-11.22-15.73-26.65-27.69-40.46-40.91-11.99-1.74-12.72 24.78-21.55 33.89 1.23 17.12 35.65 4.3 49.7 7.82 4.1-.25 8.26-.03 12.31-.8Zm-20.67-81.28c4.51-20.53-17.82 12.62-1.15 4.06l1.15-4.06Zm-5.14-8.5c8.84-11.18-12.11-43.92-7.45-15.82 1.26 3.6-.62 29.43 7.45 15.82Z"/></svg>
\ No newline at end of file
diff --git a/internal/static/performer/NoName10.png b/internal/static/performer/NoName10.png
deleted file mode 100644
index a2b72043ab809118ac237a07d77fbbd85cb42c2a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10761
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
Y8&?KSe$?CzUmXh2O)QObX{T=fKN9cx`~Uy|

diff --git a/internal/static/performer/NoName11.png b/internal/static/performer/NoName11.png
index 01034c2b035f0ee06e151c46534de30610aed8c0..45158b09491b1808409fef7b0ddc9f383d96f936 100644
GIT binary patch
literal 3587
zcmY+HYg`k@+Q1_e)D%Rk(IbdA49cRYVANWRBoIi##blWYAU7-Gk)YxMqX^~Tr9q9N
z+!jg{MUp^vVzdM~D1x_Et5Ik{7qP8(gEpcliWaK!4xSJ1`+nG+ooD7Z^UOT|=dydG
z5h2cOS2l~qau$n%NEXW;Kc79cv&WJa?vgazjNB-S$zZWQA3O96V`&ckV@N0s1HzDv
zVS|H%xYyO1G#xj?HjxpLtbnf0HF&vVaS$J5{?`3FU*R!-oUm=~tQPkl-g*QsE#s#R
z#-<$NFK>63Hi-Yc*K}s*&c`*H#fLIlzkKrlUOCy&b(ry~#~=Kh1zTtK9UCiimCZ6&
z-)osp|F~bGC~5ok$;uGb?TemMjZY6aU$lRJdQ>O7(|vYP=9VA!WJV8UyKfvO-Ua)F
zKYeZp8J-Z3GJ0<1XPwGcw&c8b^c!XIUv)*hmwD43(0=jw_Q&~`{2oS&?w}b-)12=|
zi;5SIFM=_b1vVCErH?Dg9TOt8YZV?v+dQIa;{J$*2KD0S16PR{%6ht}5sD9cr$j5y
zVp$7uSW-AE#sMget)^%paK_CFAqdym?x2iR`4}ibll{GqFwbrrh*BDlnQaXE2D&mQ
zEhrL7w1j*<{1N#X<uS?3wNw$c8|?s4ho-^lh)u#mRIOj56Umch9OL0JGha@7_?iFB
z?Md@VgBngjWB!gRM0p@3hG$w*(_RXDYIFK(k2U`M)_swQ=V!S4JwnWe^Yzj*eVxsL
z#%8V*n&gEjn~zrI!W-%Gijv)neh4!y9BY^y1e@=a!Q@=VSK_hVwl;wIS6nGnW;1;w
z=5(a4JE2~?l;L*#V$%e`lhHGzrnKyRpCNhFlm|{Irsw4Hy}Nyh7pK*;a$-1tM`<7C
zef`jNy^NPM=yMILxJV8gCjWga3aV)J2k$U=43SHtM9i3JMxDpo9yN$RmesLeR9M>R
z3mG&6ZRMlOe4wn7gu!S^$a|z-YTOG`fIV#sf_$VH4O<2;F4x*blq1Pi>Ll)TdjMLq
zF7ZZ|JFO8>-=qD&S*KV*1#|BXS`I69ifAgBS4hMt1;RnlK;(bwn<UyI_)kN@jSZXx
z9ySR0uQANF-@Qd}?8`@0yA5c_5^BH`pK`e{y$Vgo=0Jzr{L|b>?oiK}{z3-d<X$TM
zUsL7QZwdKw!(-9tyqzvf?RttccE(N3=*cZn{hY-As`Somu{=5W(%@?Qag{D0ay7kT
z4s>IRP|KKQdRvt%DOM^X30j95>P2NJpU@TA0IW*zVjhJNbOiiTPv{g{NdzV4GBojN
z0`AfShA_1Jq^?MUG(?$%pkEv$<3l-Qy^O2o=^DSc=-R*e3s9k43cS;giav)|m4u9;
z|HF0{{`X7Q{$x0rl5O;U9z+zQe2ZS8Wm~i&2@{fBLWG!f1IlU84W^?o<hkoXSeXO^
zJ0utyH{2|d5bRHDr$wm%)<0Fm<){dK5!S;;r*0=imrks}s)W<O8S+3p7>Tu&Co@Gh
zpX*I?b;L1OJodnj_@~Tt5qUB3dE!jJns3I*!|9JlE}XE-SIAH`SPwkXRG=Q-2d4Lh
zp)ij3=UMj-meUgI(Z|}UG6&X1)bV^-7%IP);mJI|5UdxpP4T{72A;i5b7j_7R|F}G
zA2;j^ulM!4P^~Hdb1CuTbM6R#j@>?D9({=9l%OE%_;ZR{L+{!0-&J@s9}4s&+7GW$
zuc^NuHSJxo1iedqJP9K?j7cmZu00o^Vz`&&Wt{OZo3l>D1gnh3eWcY8>;EBxLt@Kx
zd_99zqp)ty2X*IcGk?lIT`XpTttIHGRudJ)MgQ@sR3{P7Ua_54&NFm)6KPt(iwQYk
zZvZbhOFaLNH+8xJuhgUFop?Y~f~dcRZm^x+D5VY&#kMfUV!zcMPLc~JKndjxe3*B5
zYqCP?%kmgG{=&C13V&Z5OK8E?&zTa!PuoZwmgzwaEuVZ{ZHz;)5w!XtVZW`!*0UIT
zGEZP;gtZR_q8?!i6e$yPnAMT}b)OjUHaf9N!Qi+ObnMv029nr7G0@?FqRH&sWF>Rt
z)?bVQG#2<BLB}nb;Puy7x7UaZcP*R1ra!`)ay{rqCAMP3+IHcnWf6_(y?a#Czd8X}
z$@m}+H8*zlLJHrCstm-$P^(da&6hA5T_<4#(q0!4PhdE`#2`S!h4BogIud$OfNYNC
z^{R#--<AE=3p-6!<ivd2-C^|PWCu8mb+tMj6XtZj0GWw?h<zvm&Y^WnAcc|q?fG~|
zC(CJ9jW?~!I-@WfJWsRFuaeE#07WpKT9(cd*Z59nu1wi3<FFj}D$?;q*^u&tW)qP_
za?dFW4Z$BrkRPUxOX)Qh%s`h+Y){y0bljuBw&&eLYR#4}iVdY09Px2q*4{uKc2P}#
z$0I7VuQqLK7;Qr&I#H(}YH+l$pcfN8p*M4VLLiTWojVM^q&vceo5t;*f-dROeVHcu
z+vUkQpff7pKjc9Ud?V`*rxH1JEwauZeAkCsb3nigw2l*XXZ+jDBNp52?b~Zjf`wAk
zP7GJ?LB&QxZ>1%~o>`2{ZTF}8_JB&*@_zazsVNt{ZbyHu3OYH&#hr|NcS@`@Tjnit
z$xl4pT%zcvt5k}4#%+ZuZbaHqO+!u59%m{?Z(c&!7i>@CmMQ+)&u#(d^N1ye4Q|!%
zXlWoP1l$dzChnD4LqJC)F9FvCoJK?UHX_U5Xk-ru|BmF``@?ZfbuImVw`B#rF*V(=
zt-RJakhPnVepz92d=-v)OHYcmCc5w`Puj8&cEI|CNMRsn1sz~;t)<m+BKwF%W_};;
z1Kp?`lP|3s$ROgNYBO4EbS;bQzl91UXjzTfh~khdAvMa+INxZ}5I#nMY2o48P^N3@
zDx7P8@a}gfP&%z>8d+!Dy)euN1~N0qa%`-X;F1zP{Y1^WB&i4rRM$|`K|=QskCM%u
zSz-s8FdQP2-B1DgPLVX4w&+o%x`OWs9jG3s9e@Ki$G}QO|K5!;)H^wM53$*?91H&)
z&(Wbub3T6>{F-@M?b?5;g6{(zV7JrI2_lJm6TiEQ#8qZz%$`8yj3K$*r2@4XEx&4v
zU3u!{<G+SmaY($KM@Sp`n$+pXn=05XFg1j_C5u@E<D!PNdT+)Kv-A1fG#4vLNguFL
zp^GmTKWrpK@WGCgX-;ffV(2#G1o0EsGftjNLg~<1H=o}^8$eq`@^k0~Q#n3W(>u+(
z09n!K{08#?`B)x`I-+jZY6TB2Cxf;G9-g*b^>I;bW;XOi!Twhojn$yJXCOF(xpK`=
zbw;tlDEDA2!?$k1!;X4Imv$ei>Po#|1+3bt(~71lO9GL0Tr+`;$zZVT<3)dsaaC0E
ztlOswEDg|98X#dVcebNGjm3?wIzvps2aoA=c8P6<*f?j2fu{I=J-98b@8t*6_`*X;
z=A)lGS#kT+e#@&<I3)CJNC-*J`~!!CU)I^{6(=P4hOd;y<NTRLdmQ||O~}*PK7j)w
zQQ-kWb1BeX+tOMCUJHmaTM$Pl39P^D238(2uB~Fz?FS9-SKxY!N6FAsm~|jB3A?wo
zWGEQ2e+Fxhs*_N_g<eR#llIT2jwU?nywPpEIG?k^up@w%2!$>bMsB~~SJmluj1AXr
z<sE{d4BXG>i~x1CMQ7PJnV4tj;(}>#P1fgBqKub?x+^WZCE*Uia1t(Q>Okw!6(?u`
zx&b_)8)p>8x(-i1n5I&G!L-f19bLaH>S^T;oI?KvIJ0gSAlh;OP2wJ$Af32J(OhjF
zMHCoFf~9@XAwcI+UwO{vwB?O_T4Syl{?ZtS!!N$Ud%kqUk_DHOVcm~in_ppR0^GEC
zfd*%7E>mjTBdl8;NYFNeotqwzAH1kKLsu$}>oah*L4mZW?ZSGUf@Ti|RqM)r!+gDh
z_8rgMkK!XAlqpCiE7C{5nhCH|HqiTmho<fT`eog%w?G7K?!_}4#xqU1yRmOAxBd)$
zU<zZ?n;#K@R~?(#+2IoALmVGPf(u$rH?izE-lfRKe|8Gj5lC&3)s;vPL7X|Ms2@<W
zYXEl8oTh$_W!4jm?H7)ZNwS%v8;A=<N5CKxhtHA>ych^PDKM9(D?&#UFsfw&#95vE
zaI;7q%QNQY9U=ShDinMsgjK6BNlI}1bd?;hEAES>LWQPuyuSpQv}>fTaP4vbn+3L`
zLnRH$<>?15$s&;-@MI3e5zTh`feQ8vOpO=wQMM;oH51?)ynCw%<ts?+5$v6$Lkn}S
zMV?{BX(;%aL2+_Gd-bx;t~dKWY1-F!lCYs~*Ep6dst<(CjGVTe%8a0<iV3=Py_l&M
z)2{Dv?8&$M1CF8_4NeQ%jOPu$tW9ngwt-6rOHg6?;MMD!=27LjwR6UwzY<XW)l<uY
nm%OnOFMSF5e_r(24=&3e&AGM1Yp@;vtFgqwh@j(wl{@|i=U22Q

literal 11893
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

diff --git a/internal/static/performer/NoName12.png b/internal/static/performer/NoName12.png
deleted file mode 100644
index 7f48ba39ab3c43246c80fc080b6794416c381ad0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 40410
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

diff --git a/internal/static/performer/NoName12.svg b/internal/static/performer/NoName12.svg
new file mode 100644
index 000000000..89843a774
--- /dev/null
+++ b/internal/static/performer/NoName12.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 850 1250"><path fill="#fff" d="M423.22 25.37c-7.65 4.21-11.88 12.66-13.44 20.95-15.06 8.11-28.39 18.82-43 27.59-7.64 5.24-12.55 13.87-21.38 17.39-3.85 1.67-8.39 6.8-12.24 2.66 4.61-5.07 7.9-11.06 11.61-16.76 1.29.85 1.93 7.29 2.93 3.41 1.76-4.96-4.37-7.69-8.07-4.48-5.51 5.8-11.43 11.2-16.96 16.98-5.39 7.28-16.06 5.8-22.56 11.72-7.62 4.77-1.98 17.97-11.69 20.71-22.17 11.05-34.53 46.09-11.44 62.4-1.64 6.73.27 13.89 6.91 17.21.36 7.53-2.11 16.72 3.87 22.69 5.12 4.72-3.94 10.13-5.02 14.98-5.27 2.9-13.75-.48-14.79-7.03-3.69-10.79 3.52-20.24 8.93-28.82-8.68 8.32-14.04 20.55-13.55 32.65.61 8.12 7.15 14.36 15.22 14.61-.78 5.87-2.97 11.63-2.25 17.64 3.12 10.9 15.55 16.34 26.17 15.16-15.08 29.34-24.36 62.44-47.01 87.28-30.78 41.13-42.33 93.17-73.27 134.18-12.81 8.67-29.67 7.22-43.23 14.37-10.83 1.65-22.18 3.86-33.04 1.14-2.14-.87-4.47-.92-4.85 1.61v1.16c8.3 9.95 23.51 7.3 34.95 8.71-7.85 7.97-13.81 17.57-20.67 26.35 2.38 6.84 10.02.39 13.02-2.39 4.09 1.53 8.49.78 12.05-1.69-2.2 3.58-5.01 6.8-7 10.5 1.69 6.57 10.64 2.91 13.68-.49 9.21-10.55 20.18-19.52 32.24-26.63 5.24-1.21 11.17.36 15.98-2.68 19.85-17.2 28.7-42.84 45.11-62.82 16.91-23.64 41.25-41.87 53.24-68.92 6.23-12.69 10.64-26.58 20.22-37.31 4.94 3.16 15.19 4.61 12.09 13.06-3.43.35-7.35-2.35-10.19.62.36 9.73.19 20.22-2.11 29.37-38.66 26.11-56.94 70.62-76.32 111.16-12.36 36.42-37.34 66.23-59.33 97.09-8.41 8.32-13.67 19.36-23.28 26.52 4.56 7.39 12.91 11.52 20.78 14.6 19.45 9.04 39.56 17.89 61.13 20.06-1.65 2.93-6.44 6.13-2.88 9.53 11.52 7.04 24.73 10.99 38.16 12.93 5.63-1.26.23 6.9 6.33 5.6 15.79 1.64 31.69-.2 47.51-.54 8.84 29.49 16.2 59.9 16.39 90.84 1.49 11.61-9.37 18.83-13.63 28.49-19.13 33.63-6.53 73.73-5.91 110.03-2.06 26.77 5.03 55.09-4.9 80.77-2.83.52-6.45-2.03-9.69-2.23 1.57 3.54 5.87 5.29 7.39 8.58-3.08 7.81-7.07 15.33-9.25 23.52-5.05 26.85-25.13 51.03-19.25 79.53 1.19 13.26 7.85 29.92 23.1 31.23 12.43.17 21.86-10.68 26.04-21.45 8.28-23.55 9.48-48.73 15.76-72.78 1.95-9.6 5.66-19.26 3.5-29.19 4.29 1.58 8.29-1.84 12.18-3.21-3.06-2.09-7.12-1.22-10.61-1.82-.34-5.58-2.15-12.73 4.82-14.9 1.8-3.23-6.16 1.41-4.34-2.31 4.3-20.09 10.06-39.85 15.09-59.77 5.33-21.32 17.17-40.27 22.4-61.63 7.17-24.3 6.33-50.97 19.94-73.11 15.18-35.99 5.74-76.3 8.15-114.03 2.57.2 5.14.66 7.58 1.53.29 37.36-3.89 75.18 2.66 112.24 2.7 21.29-2.8 42.35-3.49 63.58-4.29 39.65 4.94 79.19 1.82 118.87-.86 25.43-.31 50.99-3.65 76.28 1.44 4.54-2.11 1.98-3.83 1.6 3.59 4.75.94 10.92-.03 16.14-3.19-.45-6.25-1.39-9.4-1.92 1.46 3.85 5.78 5.31 8.54 8.03-5.03 13.86-2.6 29.08-5.09 43.46-1 21.98-9.81 43.75-4.49 65.81 4.26 8.86 14.53 12.44 23.68 13.33h4.14c9.77-1.79 21.85-6.24 24.58-17 9.67-20.93 1.92-44.38 1.09-66.32 2.7-11.72.85-23.64-.74-35.33 2.86-2.4 6.54-3.63 9.66-5.66-1.31-2.86-6.9.58-9.62-.63-.17-5.02-.7-10.04-.56-15.04.34-1.85 3.6-4.86-.17-3.83.69-29.21 10.69-56.96 16.38-85.35 6.93-38.8 22.2-75.74 27.3-114.9 4.34-28.73-10.26-56.56-5.09-85.24 3.71-25.28 7.36-51.25 17.31-74.87 24.22-1.11 46.19-12.56 68.9-19.87 3.97-.57 1.51-4.91.77-7.39 11.87-5.45 6.09-25.49 17.99-32.75 21.4-11.04 46.06-17.87 62.95-35.9 4.58-3.95-.77-8.19-3.45-11.37 2.83-2.82 5.75-5.56 8.51-8.47 2.28 7.92 1.99 21.41 12.16 22.75 12.69-9.51-9.46-29.21 5.2-37.47 4.03-5.83 7.75 4.85 12.24 5.59 16.02 7.88 5.25 30.15 16.62 41.02 5.34 2.35 3.84-4.8 3.25-7.89 2.89 4.6 4.14 14.2 11.87 12.06.58-5.38-2.48-10.19-3.41-15.33 3.23 2.35 9.55 5.44 12.24.68v-.58c-10.97-9.55-20.25-21.76-22.24-36.63-1.32-12.63-13.38-19.57-19.09-30.02-7.63-9.59-11.29-21.25-15.19-32.64-18.89-37.82-33.17-77.76-52.85-115.19-9.33-19.3-27.97-31.88-37.48-51.08-11.38-21.3-26.75-40.35-36.12-62.75-4.52-11.49-12.53-21.2-17.44-32.44-.1-7.03-3.61-13.8-4.81-20.29 11.36-4.86 19.32-17.08 17.99-29.43-4.31-11.47-16.46-17.02-25.98-23.45 2.32-12.69 8.63-25.23 4.16-38.25-4.24-1.18-5.68 3.44-4.1 6.7-4.5-2.04-6.72-6.33-9.09-10.33 1.5 9.65-3.51-7.5-4.61-7.81.65 4.21 2.05 8.26 2.63 12.47-7.59-8.88.52-20.51-2.35-30.6-2.72-16.16-2.14-32.69-5.22-48.78 7.35-4.82 8.27-14.55 2.58-21.01-12.48-3.83-20.34-17.07-34.03-18.59-12.34.65-20.95-9.82-33.21-10.35h-10.9c-5.2 2.21-10.11 4.31-15.1 0h-1.71Zm-29.66 33.95c-8.21 7.67-20.04 18.51-30.05 26.82-4.83 2.79-5.65 9.81-11.56 11.06 6.9-7.53 10.1-18.63 19.78-23.53 8.09-3.49 14.36-9.86 21.83-14.36Zm-77.67 45.77c8.94 7.02-11.05 5.77-7.07 14.75-3.08 1.42-8.07-.07-11.33-2.12 4.1-6.41 11.39-10.14 18.4-12.64Zm18.16 6.47c.56.41-1.26 5.41-3.49 4.78-1-2.74 1.6-3.95 3.49-4.78Zm-5.95 3.23c4.51 3.05-8.05 7.84-7.9 3.24 2.4-1.54 5.29-2.11 7.9-3.24Zm-16.74.03c.45.21-1.23 3.66.17 5.14-2.14-.93-2.07-3.99-.17-5.14Zm-18.14 12.2c7.56 6.28-9.29 11.69-8.98 19 2.84 8.2-6.02 19.21 3.96 24.48-.32 2.3-4.56 4.21-5.8 6.66-10.64-1.29-13.55-14.76-13.83-23.68.06-14.12 14.15-20.48 24.66-26.47Zm34.41 1.84c3.7-.03-8.83 2.8-9.29.65 1.66-.11 4.98-.33 6.63-.44 1.27-.14 2.13-.21 2.66-.21Zm-.67 1.43c-1.63 3.1-12.95 13.12-13.7 1.59 3.33-.7 9.54-.82 13.7-1.59Zm-15.15 1.83c1.75-.21-.05 7.47-1.41 3.9-2.73-2.82 1.4 3.33-.29 3.55-2.14-2.62-3.15-6.67 1.3-7.3.15-.09.28-.14.4-.15Zm-6.55 3.87c3.5 4.55-.74 9.69 0 0Zm-1.78 1.02c2.75 5.14-2.9 5.13 0 0Zm-7.31 5.64c2.39.63 6.39.54 7.54 2.17-.65 9.31-11.05 7.55-17.59 9.07-2.69-5.07 6.95-8.73 10.05-11.24Zm16.41 4.34c1.49 2.98-1.12 8.67-4.67 10.35 1.95-3.27 3.33-6.81 4.67-10.35Zm-40.31 25.14c2.39 3.33 6.6 4.96 9.06 7.68-3.92-.93-7.93-3.64-9.06-7.68Zm1.14 4.62c2.02 1.92 4.85 2.9 6.53 5.19-2.83-.65-5.06-2.77-6.53-5.19Zm-3.17 2.56c2.65 2.28 5.73 4.27 7.7 7.21-3.39-1.18-5.7-4.38-7.7-7.21Zm2.52.04c2.06 1.61 4.61 2.77 6 5.09-2.54-.92-4.61-2.8-6-5.09Zm275.55 28.98c7.87 4.01 13.88 18.06 4.63 23.37 3.02-8.16-3.2-15.6-4.63-23.37Zm-279.4 32.98c3.26 2.26 6.94 3.84 10.97 3.96-2.9.96-9.44.1-10.97-3.96Zm51.55 3.46c.02 4.48-10.84 11.75-15.12 6.91 5.07-2.22 10.12-4.51 15.12-6.91Zm-53.29 2.21c3.17 3.17 7.41 4.29 11.54 5.38-2.91.79-10.31-1.06-11.54-5.38Zm253.44 79.53c7.8 9.58 13.46 20.6 20.01 31.02 9.94 16.47 23.36 30.53 32.83 47.32 6.88 13.16 13.71 26.41 21.93 38.8 24.57 33.94 59.65 62.14 71.11 104.06-25.02-29.62-50.86-59.2-81.11-83.72-16.4-19.99-32.87-39.95-49.37-59.85-7.21-9.23-10.17-20.73-14.41-31.46-7.37-.32-17.92 8.56-21.64-2.2 6.28-14.91 12.62-29.89 20.65-43.96Z"/></svg>
\ No newline at end of file
diff --git a/internal/static/performer/NoName13.png b/internal/static/performer/NoName13.png
deleted file mode 100644
index fdefafb599bed0c29400490a85141e2230a6eb07..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8925
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
CmCIxR

diff --git a/internal/static/performer/NoName13.svg b/internal/static/performer/NoName13.svg
new file mode 100644
index 000000000..fbbacaacf
--- /dev/null
+++ b/internal/static/performer/NoName13.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 850 1250"><path fill="#fff" d="M515.92 50.69c-6.99 3-13.47 11.05-20.4 10.88-4.77-.12-9.35-6.12-13.66-8.18-13.67-6.52-28.43-11.2-43.59-9.53-12.73 1.41-23.74 8.9-32.71 17.7-6.07 5.96-12.45 15.75-16.36 23.18-3.9 7.43-9.53 25.88-9.53 25.88s-12.4-.29-17.7 0c-15.19.82-35.43 2.84-50.42 5.48-20.31 3.58-49.51 5.07-66.77 16.36-1.71 1.12-3.48 3.46-4.13 5.4-1.83 5.41-1.55 13.55 0 19.05 2.34 8.3 10.81 17 15.01 24.53 15.71 28.21 37.76 49.62 61.29 70.9 7.51 6.79 24.53 23.18 24.53 23.18 6.98 5.76 16.45 11.52 16.36 19.05-15.6 19.28-35.29 36.21-38.65 62.64-1.61 12.64 5.13 24.18 12.76 34.06 6.81 7.35 16.02 14.71 19.05 23.18 1.41 10.87-1.74 21.78-1.35 32.71.35 9.62 5.5 19.48 6.83 31.36 2.99 26.68 8.29 56.95-2.7 80.34-7.19 15.31-9.76 30.37-13.66 46.37-5.57 22.84-7.24 44.89-5.48 68.12 2.63 34.67-1.67 27.3 2.78 55.9 2.44 15.68-5.66 18.62-.59 51.65s7.77 115.9-8.94 159.54c-5.29 13.81-5.21 26.61-5.48 40.89-.47 25.23 1.66 51.32-2.7 76.3-2.69 15.41-13.49 34-17.7 49.07-2.24 8.03-4.51 18.95-5.48 27.23-1.34 11.36-1.15 26.67-1.35 38.11-.14 8.19-7.42 28.07 0 27.32 56.79-5.79 182.54 27.49 216.67 6.83 13.32-8.06 54.71-1.21 77.67-4.12 5.62-.71-7.64-26.93-2.72-35.42 14.6-25.2 11.84-56.1 13.57-84.47 2.94-48.13 1.52-94.96-9.53-141.72-9.64-40.79-28.29-77.44-25.88-119.89.84-14.79 2.8-34.5 5.48-49.07 2.36-12.87 8.08-29.45 10.88-42.24 5-22.83 10.66-46.09 9.53-69.55-2.61-53.82-23.61-105.61-51.77-151.25-32.73-38.42-13.69-70.93 2.7-117.19 18.54-51.11 46.6-98.49 64.42-149.75 3.43-11.62 2.55-23.64 2.35-35.55 1.61-45.84 4.24-91.75-1.35-137.59-.2-3.71-.23-8.77-1.35-12.31-1.53-4.87-3.98-12.03-8.18-14.92-26.26-13.42-56.44-1.36-81.78 9.53Zm39.54 51.77c-5.44 34.07-2.93 22.83-4.13 32.71-1.93 15.86-3.17 37.14-3.78 53.11-.33 8.59 0 28.66 0 28.66l-9.8 8.18-9.53 5.4c-1.92-21.24 3.39-42.82 5.4-63.99 1.51-15.9.47-32.33-4.05-47.72-2.47-8.42-13.66-25.88-13.66-25.88 13.63 0 9.12.6 13.66 0s22.31-.46 27.23-4.28c7.16-5.55-.48 8.39-1.35 13.8ZM368.8 148.74c4.68 1.82 8.99 4.45 12.22 8.18 6.06 6.98.33 21.93 1.35 31.36s5.48 31.36 5.48 31.36l.88 12.33-34.94-28.69-43.59-32.71s41.88-28.34 58.59-21.84Z"/></svg>
\ No newline at end of file
diff --git a/internal/static/performer/NoName14.png b/internal/static/performer/NoName14.png
deleted file mode 100644
index 20a20a2095e2754ae9892651bb3d58b7f0854eb3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9840
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
Q+$2S{bKY8Lv+w->0y`OPl>h($

diff --git a/internal/static/performer/NoName14.svg b/internal/static/performer/NoName14.svg
new file mode 100644
index 000000000..1d0231ab3
--- /dev/null
+++ b/internal/static/performer/NoName14.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 850 1250"><path fill="#fff" d="M439.54 22.98h3.95c7.49.23 14.96 2.18 21.45 5.99 5.2 2.97 9.66 7.03 13.87 11.26 7.76 7.83 14.32 16.91 18.92 26.95 3.62 7.83 6.05 16.19 7.35 24.71.64 4.04.93 8.12 1.34 12.18 2.96 31.64 5.13 63.34 7.56 95.02.41 4.77.46 9.65 2 14.22 1.13 3.55 3.45 6.83 6.81 8.55 4.54 2.4 9.83 2.42 14.85 2.41 7.19.11 14.55.9 21.16 3.9 4.39 1.99 8.25 5.15 11.03 9.1 3.81 5.37 5.86 11.75 7.22 18.12 2.27 10.6 2.52 21.49 2.6 32.29.09 37.2-.42 74.39-.22 111.59.16 37.19 1.46 74.36 2.69 111.53 1.73 50.12 3.64 100.24 4.31 150.39v3.69c-.23 7.17-1.45 14.39-4.28 21.03-2.47 5.85-6.28 11.23-11.37 15.09-4.6 3.54-10.17 5.72-15.89 6.59-5.38.85-10.87.56-16.23-.25 2.52-6.96 5.5-13.77 7.54-20.9 2.25-7.83 4.71-15.6 6.48-23.55 1.4-6.12 2.14-12.37 2.34-18.64.32-8.17.53-16.57 3.53-24.29.74-2.03 1.77-3.94 2.77-5.85 1.71-3.69 1.72-7.9 1.35-11.88-.67-6.85-2.69-13.45-4.51-20.06-7.07-25.07-15.44-49.76-21.91-75-1.9-7.64-3.9-15.29-4.94-23.11-2.29-16.82-1.58-33.83-2.48-50.74-.38-6.42-.03-12.85-.05-19.27-2.16.06-4.31.04-6.47.13.03 18.82-.9 37.65.13 56.45 2.09 35.31 5.96 70.49 8.05 105.79 1.13 18.76 1.56 37.55 1.88 56.34.42 28.92.38 57.85.88 86.78.19 8.37.29 16.75.67 25.11 1 12 6.07 23.07 9.4 34.52 3.83 12.54 8.16 24.92 12.08 37.43 5.85 18.4 10.09 37.26 14.15 56.12 2.33 10.98 4.49 22 6.62 33.02.81 4.49-1.04 8.82-1.58 13.22-.36 2.27.01 4.56.22 6.84 1 10 2.45 19.96 3.84 29.91 1.16 8.03 2.31 16.1 2.21 24.23.05 20.62-5.81 40.93-15.27 59.15-3.27 6.43-7.24 12.46-10.92 18.65-12.65-5.55-25.15-11.48-38.19-16.07-13.93-4.95-28.7-7.95-43.54-7.37-5.28 33.1-2.88 67.28 6.18 99.51 1.81 6.51 3.88 12.96 6.18 19.32 2.15 6.05 4.85 11.94 6.03 18.29.93 4.73.95 9.83-1.09 14.29-2.31 5.14-6.75 8.91-11.31 12.03-4.47 2.94-9.13 5.91-14.48 6.91-5.99 1.26-12.58-.05-17.32-4.01-5.05-4.11-7.67-10.6-8.1-16.98-2.3-39.13-3.74-78.3-5.68-117.45-.34-4.9-1.05-9.77-1.6-14.64-1.67-.04-3.34-.08-5-.14-.48 5.59-1.41 11.13-1.66 16.74-.24 3.6.15 7.21.27 10.81 2.2 42.55 4.71 85.08 7.07 127.62.23 4.85.09 9.71.01 14.57-7.17-.22-14.35.1-21.53.17h-10.86c-12.07-.01-23.97-2.48-35.62-5.4-.84-.24-2.35-.62-1.97-1.79.93-1.73 2.79-2.65 4.38-3.65 2.58-1.58 5.51-2.49 7.96-4.27 3.26-2.14 6.56-4.24 9.99-6.1 4.07-2.03 7.89-5.08 9.62-9.41 1.32-3.12 1.7-6.54 1.81-9.89.75-16.74-1.12-33.49-4.28-49.91-3.13-16.3-7.48-32.34-11.69-48.38-10.8-40.85-19.33-82.24-28.74-123.42-.54-2.32-1.32-4.8-.45-7.14 3.38-10.97 2.52-22.83-.68-33.73-3.01-10.59-7.67-20.6-11.31-30.97-3.45-10.08-6.03-20.43-8.57-30.77-3.41-14.23-6.26-28.58-8.98-42.95-2.41-13.15-5.03-26.27-7.17-39.46-3.06-19.13-5.29-38.37-8.49-57.48-.41-4.68-4.21-8.38-8.29-10.24-4.78-1.52-9.44-3.57-13.5-6.55-5.08-3.65-9.18-8.55-12.22-14-3.94-7.03-6.3-14.8-8.22-22.58v-1.71c.59-4.84 1.45-9.64 2.13-14.46 5.15-33.97 10.32-67.93 15.48-101.9 2.31-15.05 4.52-30.12 7.02-45.14 2.98-18.14 6.09-36.27 8.28-54.53 2.44-20.62 3.82-41.35 4.47-62.09.42-16.02.63-32.06-.21-48.07-.96-20.03-2.92-39.99-3.64-60.03-.38-7.54.6-15.25 3.64-22.2 4.29-10.05 13.01-17.82 23.05-21.87 6.66-2.58 13.85-3.18 20.74-4.9 9.11-47.97 17.53-96.09 27.73-143.86.94-4.35 1.76-8.74 3.25-12.94 3.86-11.25 10.21-21.42 16.69-31.32 1.55-2.5 4.02-4.24 6.57-5.62 3.99-2.14 8.31-3.57 12.41-5.48 2.74-1.27 5.84-.27 8.68-1.02 6.44-1.61 13.01-2.81 19.65-3.15m-92.5 355.4c.01 19.2.01 38.39 0 57.59 2.11-3.68 3.52-7.73 4.62-11.82 2.49-9.87 3.06-20.25 1.46-30.32-.95-5.47-2.49-11.09-6.08-15.46M281.2 669.67c-.71 3.96.85 7.98 3.28 11.07 1.35 1.64 2.77 3.41 4.86 4.11 4.01 1.41 8.35.99 12.46 1.84.88-5.13 1.59-10.29 2.46-15.42-3.28 3-6.49 6.06-9.83 8.98-2.78-6.46-5.75-12.83-8.55-19.27-2.2 2.47-4.17 5.34-4.68 8.68Z"/></svg>
\ No newline at end of file
diff --git a/internal/static/performer/NoName15.png b/internal/static/performer/NoName15.png
deleted file mode 100644
index cfc9d3a8c3b60b5c28887087224807ad08dd5432..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13849
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
Ty=ma@kG7Z^Ss9k;Ukd+UGYD03

diff --git a/internal/static/performer/NoName16.png b/internal/static/performer/NoName16.png
deleted file mode 100644
index f54744280b00364a4c4bb8cce1f8d1be07ef045b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 14569
zcmb_@c{o+y_pk^hQO1arl6$TplrfpdW9Z)F8Vi|+lFXSyk}E{#mU%w7N{U1YWh%GQ
zbR`m*3W+jie)sM3`+eW{`F?-z^ZxTb&$;KEz0TTet-bc%Yp=c5zKH~L!<`($98641
zJB^L>5GE!T@Y_1PjRimwDB@jAOj{HQrX+nayuv<6ey@b||CdWjRS(cnHL(TP|4Hya
zA^&{+2kqbP{~-SZ{1@84fd9Pw8<&3p|AqfAgn#J#TlN1e{)7Lo>i>!G59A-TYH1f4
zpvNuFCWd-US6M}kKw<j@BijHbrX9SD-xj8<oIL=@9%yW)&px(|g-vC9i`5egCZ_#N
z#(LVMi+w+HU#3i|322>KPI;x^qGw=Sg5x#V&9m+Lnb=)C*xIJ#JZr@y!E)E^r{Hrl
zwQOJNR`Xg9F1CFB{CROxoN3o+v^p~r%B%%}+rK{n@Gty-c>X8ye^>q=khP$}@=3R}
zV`ewb-Flw$JO<fSc~|FjuFAa9@SkOCv0h7c1bwgG(WV)3^~ZE{P|p)_hq*IE7@BYt
z`<A;gta{$AmzSjoMLtFc**r<*&*qXN6`}~OnWd{D^0K#@|L9N=`hI)&#+!5HV<#oe
zLg0O}FogY)(On$o-k0St75V^&Q9>n!7R?;3)a}ssw3#jAGt3s<oR?xauzCM;+#4yc
z<&4UUQHLn^IkMR1`CiVkr*Zn!3!SMi+npb&HCOEIYox8oWDUK#IE~{!)IAmAc=B69
z&~octN7Y$UOZn#4p<>d-l9|Vmr>Cl?mNp-W>|JOy4Q7IuUq_j~wNfrF)Y^`<Wa%Vd
zAL7$bX1YTtBx#`|t~Mq({b6pbWvE}}S;|c<s7Ql&^8qW&s{P?BUjZs||2W)u=K?!A
zo8U9TGy0xL3z_VYL9(`D8AgdZHww_6sl7SOX!^)_9`PKk2eoK82|U;VFT=wnh?&{T
z0yJMl*s#!xKr_KxCwub<vx9m>?IgssMC6Kn6K+g&uEWc7KRSDj^4VbbN+Ie|lKkVX
z0Z!jr2hA|hfv!0}6U5N;KLvb+VsNPLP(0BUN1zD`Bul;};l@}qj~E0!Y1&8dwwvq_
z^OQmT^XUhRqrRMB#f|OH?vV17L;XdYuX#Uwum^VHYvlvCvlf>S-K*;sWG4<x<nZse
zIQ%++X78SS>+J>H7|xz!^}OJWTJY&_S4wpu$%*PCP2+P3w$u7h_f**V6)9eEO*FPg
zntk5h+PqBVLj-P2B$xaqHF`6T_xZbOmwi}Hu|>;J`}Qh!2BIVV;PGj?m8h2v>QDBM
zh?$H9Our_P3O@5J7xG2C`yH0@@$CCjhtlD!P}Dym`Ki{0EH%w%UsP~oTs+~p7XWF#
z_SsN>8~@!7ZRpK4wQDDRFRXy3km|I_YJfqL!W}z@Lk19dYc+Y9q~aeDW*kt28XD9}
zubxwl;KT}+_{JBKRPOQ1CtqD7(2f>6%ot{=$|tE6@WG*O^p^vV{SL|BAKJ=+X64jd
zyN;cE8zRxXsd4Wa3l<?i*`8<XaX0AHU^Cb9c67F_{0HursB~9Pw*=YT;}(~ZTExCs
z?V2J~%wS!5w#&N9eq?p<*L)0u8%rj>p6Hay`N*}?;<rb2{1ts_;&{l$z`*ZJ`WI{~
zMxgN)XT7Y^rd76nC|-3Xm+C`e*TVc&W_xS*225x2qB>OLjGg0mHR~<$uim8Th7c(s
znCt^t_>nJtrakZHm(o?u$1PJDf2!{bVpA5!T-d3;Dd+X0emq||ss)+M@3V36)oiXm
zmWe-~CU(4(KvSACIDg$=O8b73?4tioG1%6<r=e_mRNQFCg<5sEckJzporn~B@-Qrd
zR=>Oy*zz*2!#w%M+ZQ;uG`s4gjis6DN8xbVtS%Hj$`UpXzPk6UM};q;!)F4~>I7Gj
zg~5_L!7^jd<>Ha)y$g6r`$%gh`D`7ivMv3~T!7pK1k%w&t6K^x_f&BSe~z9u4m>*X
zT-6xo78CEvS-U3v$6VC10*c}*v3?%wxeL22WHq=lTyTH>cHCXzkW9CrFb!D`U!Gf+
zkhpTT1)4Qw+o0z1TnG1}<YOk-EPv|9^^`^JvWv!6qF9?TTTsWL*;CYIJT^h371H$r
zW^JgkR)$bO4!gOQcq&Eh!xV0;Pp_i&8BX$6u|`*rHdJ>QvDYc9`5XW#{V76s2eTY^
zO}M3TEXCrwx*_CuML;F+k)`{`dhWANaAO^M74pk{H(%mZ`na*JLTcAvwGt;EukP7R
zfUi<IwP|8ly~u8?lxsEE2~u>aV~0C;?G-KYk2avLS9h?Y!f*UNxzz*1mW!1Qh(8h#
zan2*>#}`+UIwZ+sYU^6t&@5;1ZbfYYWru2yS2|Rub33__v{W@>$z>!CO77_hE&Xtf
zlNC1OT~s7qh5d@z;bhl~>-Ifjb7mt)r-*vgs5`H?5$uhDD1ik#7ay7H`|Z_}7l!Kj
zRtMPN1=ovF4XYH7cy@y?4}(h*#2Vyo9JDJSIU3|t^{ii(6=S204tAuN<$ZMPay|m@
zbZV0>d%k-;$~4PaAeiV)OC(vumy+^(4;0V?(s$P^I}BSj8R@^?3MV_M7R@YVc&~lG
zVVKk?q8)?82^|fbH<qnxM937}-$wo5Db=s}bw?mFh6|^7Nj^IxEcfj$<%O%xAxSP4
zO>0WgDZ6lEQ~UYts}9&a);ty&)#q>MB?j+we&t1(%Y#GjTW-iFgf_{>1OW4DySIdF
z=7>d<=d9;yRqgmlCD6J|C*h@|hcxfPx#|RRQWep=LVL1CoI2urG4y49%~1}FP@y|q
zWx|y4#p-0EQJ%$E0uo2X!iH9vE`<M}MoAkLZh_4dDU-XI29D!FSMw`X3u@G|UDANM
zuPYlulBoAirbYyBuoV@)62n|*z2$3T_TfAg{nyg)&em7krQR?<os5zj=;y^=5DMsW
zh{Xwo)$CL1j+;NeCL!DL1@!%#i=FvfzD_rt^81-cl-L_iq$y%ite1>kf^E>0RrkwL
zIK^!rVr&+V4t+OF8?>aRKR$%|U&sjC#?*XxZNODBOG2Rly#YtEU2>d@^hJl&1ySJ+
znz>-3=)e=1Mq)+FR@6T<!#^YSd(H9lXLYI1_#RWjerLDD`{3H;6iL*wW+>cLi~8&p
zNvbyV;mVVe{oAoUrEJwHvL_GQ;NlS%8&50m#VJV%GLZv(*gD5cOhj;sS5DU<Ngi2a
z<(H6ypQv3Y(UWMOzvdA*ZDDW6Z{txxeX*SJSY*VAj$e?{O#4D1t3)zm7rcMDP7Zy%
zExtnHAb3m1J7D|Fzp51T!HM@t74!-D5urjpxRW?R!iV=arXsj@Es31l831Oi&{IiY
z2^MB|8^=i)m)cS{n>Lppl2~yPs%7|NQnf?rTTlfpYCz^>@F=GRgetVcg-D%6T9#^Z
zDsqKTmo_QzTi&P;)t-I&!%Hx_6d|@jH8{7MYF0>6TNoc~d+^hfu$7wA83(h8G~sNY
z>#$F;*zx0^I+GA3Xk`Dv=JB|CZtU>Lt|Ek6zvh7)Y%BSoh5T8E-oqh+MdB3A*yIjj
z)1QYtxTC;$c`APA#f+3b@qIN;QD{OV=UCW$(4VdGMmR;tiOzIhY)<wV9yWVP-6k=+
z`s7KR2}bbtPjSN4uKCtK-bmdcLq=}Q4TajbM`{}KI@aw|y7H#AzY;-Xx&GMOgj-KG
zZ`SXrnzeYm7?0@M{Hge0R%&}AGH9804-x);7N^L0#DuA;nbnIlp!~wHt~&4o44q!r
zp$=KF&Y&y4rjK)DH`e*dKa8W?Dc%H*Fiy+7T;>~JPO?On>t!iR2Bdo2twDET4>&D<
zpJ?rgNQhMC6ke!Z3(|tN`CIYpf4_}L-8Z_^9~m`wF)G6Q+r(V1GLH4YVW#Hva0S-!
zY)#8l{bgqb%ttLAvAcqQ=aS`^BhmaKAFpT#ZM#sOKGh?mx!-tsG!?_K#_Y6gXmtJ4
zz2UI=Ud)6NK1+nt`z@(T>4y2utLcO0>&L$pX+e9g7S}yBc3%<5J$it<wO0r`v){uy
z$!$r@s-@}Mec`1y0+DE}R*pjcRJiNn=o@z&t8Q<6CFz4ML;=oCXB;vZt+E`M&IxPp
zX+`^QHO$*FOGW1&ibLcs;axGB?CmpY-(GNIB)uqq_PRjT@PoS0HhXGr_l(u%>c~+v
z_V+oRu9JbGH3_C|JlGj^*?p!`K>|qG<n@Fv76H7^B;nml@kg^Kk00u|hR9|0cPnUa
zsc!Ps4`XH)EfLPFxxUhuUBq{-qqp)Z^IqxUCb%8P>SEi_P!%$-LYYsN4>6eigKO8L
z@uw3VWqzLUS@ny)n1bwjtLGi@iz3-L=;mJGFNn#}M6dk3E0eS_ywPXPU(9#elk`D4
zjQixeFCG6TdI{P`<cK|1@%=)Y;D>}9Ts-k^&GbsVfcdLo0xX5yW~-!WOOdK?Z!tt;
z^XkJtO?@kyuJh_@NTOF{HXL6d!mQ>;4DFZfN`AM_64ZPLA4Ub9)91wIhyEze)!9ER
zTYXxy`Xs9~B2?eZ{e?FgdzaoNc}U}V$%+QaC*bo)W$9ct(OW&7J3V4B#=6O~YG<Dl
zA8cm&@y|2eoE~TTtF}{84Yquk!TsN(R_{`76Yo1^5;+FseAS27r^#(k8_stJaiGFo
zkA5eGtYRE2GojZA96GQ`zm0pY!0F_3d7!A~|I7VCpQGlqd{l$Rp^c`Vd-XcdxZWi3
z$r44&@wwS&#ghTc#&q-PH7%4QC(}BhJo;e!Lkasc&fLaD^0T_sjVa+~qo|VoJjWd;
zAMUX%;(Jnd?#YOsTltD#Q+1}c_ojVep`SuLvi`?t?dW7)!NrVYCu|o^bS5W$|D68&
zR{3!>R*BqUBHP^2+ssao9*cO)9lCVO9=f(hz<)KSztkUCAJFT+m9yE{x3QW};BdI_
zy*9QK(%D8K{}8JRUfU=W!S<tf^zwi5BO@PrZu>Mzp5KASN{;%CDEl@IW;mDFF6+Hb
z*m@9tCWar3_s$AkRTg;?+!%2)P4mRX%g8V5@{;XLEPjJi-Cl1eTEqN{Ci}Oe$U%BT
zWo=}@?j)CPVS^2+pSK5hUdOeI;Ga5Gv<k^~iXShttP_3QJE9sh3A}Ibm$UH)Nvj6S
zA(rE|&EFqhl#bDXuD^&4RWhyJY#;FYWjohe#fR;m4R=~nUDm>?2i{C4G(CDaB1xEp
zULIC=5Gy*JY9|p@j6McahRsw)Cuz<7pg<y68V2rXD#j>y>iWvtQHOt?IDq3<2<^Z8
zGHGT_{sP-aB2|%HMXL0C>^HeH!+Vmgyo;qlpG3QwjdQ+OO18%9K$vvaFV!V0@54oO
zA#9#_O!#UzcbC*|tlkmc+ucNLq5AgUBICLX_$<n`GJ7-Nbt}9!WG1rLel3z&Y6M<i
zQc#2;r_Y`Te<&LnLyEc(|105m(_&H_a_F`0SV&Xh`neWnjKER6(p_A)IZ=EGsgr3v
zi*n={NNI|-QlsBDRv|AJb0u*6+xDK|^0_6GRCkKSf~uK)JWxN%j-qx}_@>=4uX7M^
z4N;ExRL3O_O^qvIT3akmVjmCUvkBx!XwqnN(^S!_g$)Oea;=&dTho41L|Xq+xyfbW
zyWtHL(Chc`VCv3y^{G=~MY93ez==4|C&-{-oezOLLE8T+I@O@8>s{3)L<S?^+5>5W
z?O((cc`TogUcQ6K!-XWHq=u7}Nrk3llDBf-NmK`tq=c#enK)}Tw<xe2_5^uj3U)ml
zTGZ7xzYUlAi`nx}u31&=%TF_eQ2&~WnWo8xi=+w<)vvoSJqIo<VyFbBE}vKo8}Boj
zgDE(Sj3gmqJ-*?OHY~!D+8%QutMA}-Xhe%zV0)H`-<%#;Xzj(%G)E~}QS+r<z2?H0
zzZaB?PgoRA6*f0-hR0ReWj9{jfpUnL@f+uhMue>P)opeUg$+DA8SJ-t+XF?eWR0Y0
zSf5LJQ+#Ne)i_Zbt6mjG`|l+nQ3a&}CziV|43J|#_B`q~bRkd|d_w5NJHjlOdLgm3
z`AEd-OltWDp<i*lQN+;IhV=9zRPazAYIouYAJ54@`rQl3Ryh5yf{zhy%boVf(Sz<9
z(cDk!YZ&@~skXqf`RT$RNVYHUaA8J8>_w!3MggxoNcis_J!pwoLtphx4f}3alJ-SY
zX_sjcx>^nytyrH9`O{^QVfv?bD-$amZ(3nM4SO;BETcyJ;o&P9sK1yZyk1@WSuu#3
zCJ8J&9B+|Ep9xRBc(411buRE(7-e5B)!}D{-5mt59K$#K7P?W!*Eo?l?tA*sEN>Uy
zGGtZiAWxL>(r#Yt>e`yMw+*c8eI41gOttc^B2e$%_G`5WNPIM^4nH!d5~$iAjy%)G
zuQ|cBh_`ribe+3MveZKG8`BhIbghMIL>B%4H)?)xPDMB^hDe7huSxOmwg0UHeJA>t
zn0#E7bRC!9?UjEr4t#F1KIE3W+0i#Trw3hu1{1?KFL6G3RQg%XKM{O&a(#Czax=ED
zOsJUjLYg1y&akTZVKA{1mN$(rptsZ`_KuNPkOMbv6TP2~-WH3WsOJIRZG8zTpSMup
zN_36@PJjG+v_6ur*{rlKLd1J2;qmEVJ3Dm!#~UjexN!W(o`0plT(&M3cd07w1Z#9;
z;rFk$0isc!$v|tJoJj_FOPhNFScJHC@pF}TI#UsP)TfCjek>TcbPsgK(abL-A}Vfj
z$Bs^rW*&b$;9G3~Icp}UY&2Fywopmu#_S2S;~de~$Ont1=)qCftZ@A58zjtH7E-KH
z+*5=`=bVuD77((maC|rQ>se$xVp@LMPD$ZbzRD+g{96!=Q0LqTt~+VBH+=m`KCv|b
z6N0_I@~p}m30+%Td0jlo3M8%_3FG(qnSyi%?L0ewF$ozO2^9JnGJ9slzhqSSP@c@r
ztGF>mF)qXCy@_p?jKpP|A~T4o-YJOpg~j^$pG$_Pvx66RE@^*jJzvNMFTd>i*{|n%
zUfKUhaYqV;6`pwZ`qPosUaI7&@e_*cZ|sE?4;P`EXbLw{icUVTL6up!*hMlqwV@fm
zcjfQb*w@Bg(5D_ozzCNfynp@2%rDpXGnzMhIgSB{bl_6olUm;nT$%@|80FFEKRVfi
zPf0@uSC1aJ>l?m%Z%M34Nip4|>n=Cq-to@7I7D`3ivs#SCfoz7${|c1Aiccfbqz7a
z?#u_X%=})=%lhM_Nug)U5&*ZaGfIb9pys*kGKFy5#ZR`^l!&xw^SeR|u4^`@Qde)L
z8vF9bC*k;IrM|an9PF#pL}!1W<Xbc~pzgZxlaHKB`5O3HRZ)KYa_^9Z3hIn^bNjO^
z`qumxJ@1W-vR$rm2+r-+isi~{=l+n093xTJK^1MNn%63nxUH_Hf}R?EWW9?YX6@>e
z!OY)iVuA67KYrtrp0|H%d!Nb%v&NmO<&DRFJ@6JQSxoH=Z20h(h2*}PJxf3LZ3MY}
zJ>CKKHy>4ORx<ond2KTy)gZW#J{pJq(l+;bo;=1a=5l1|W>VPP!U<<!Y)u}}zfe97
zHw_P7Ht!f&uUPRqS5@<gNK^JtxCY;$4sIAY-o8J=U7uH}{3h?>HDrs$@e+E+O+<fn
zZzAWlnvriooY}>sdKJ>K&kn(oDwST13y)WXrKMPuB8~SlJ_LTe(>V0tXJl9Y%cpyF
z2M<1`sN@pxHvP5}ks)$%5}4Ie;MYrPmBTi9g1O|^Vm;|Z{4t)BY>+W_^QZ0$OKRXR
za^Kz7NUUN1qFEt2qB=kOMUwJ)+b7{5x1Og}9_X@5=8sPYR(G{kvf#!ZA~Q?sIX|x@
zJm1uS^Vdaw=g%?Snt5IjxeW~ON0s!>0Yjg<rRM8Z;r{Y>^VvVllv;#tOOPl;KfwF~
znv-_pK8xRbj=Ve26ALzjZs&(-{axWfr^E4|YevO<dHGb~LR3{vU;B|Lrgn$UKe1Z2
zvUqZefH!p?;6#v>H-=5GpR}4Uz5d)yWx|8t<+)>u<P^<M3LcN2?5yvbjciC^7m*pf
z6BU1bPM7-Kb%PVpS-3hg=&^ZTRe5q=_{U;?^;WE<EgqilvbP+5{kZK^XTw<k`TT|c
zl`3u=|6z(|9C{7;A?rJT8#(B(6n(F!`t#$Tw<8MpAWdEA<Ix{06{A1MzC8I8^}(Lj
zFfE1@pfzyN<{fH#$mjl)z1gWMVOUh-<;I<7uIoS^l)h8z_mqBIq6x;h3x_;{_FxfM
zh8^{N1wvULyzPjHs=XN}kkS01`jg^gzRME>Z*1VE;I6W{6t^Xu{-|<>gP^SatC<7x
zVyt{++d!yKgxbx0T>oipRQZZgirBM25j3p*RertiT0-vR0mq7pm2G!M3P@)iXhUC~
zXsU!)kggV>*=deG3$4?hJ}8Gh)F8H~ceWU1EtNKyvA<cfe_9t9@@MtFr_J8yJv5-c
zrBtsvy?LMr+d4hYZA`SsJiXCsUA0WaZIin}7ed8nZ%mCG>@uc#dZ8SrshMB6O>~P<
z83A610#-8l%q*4Zz2N@gEsp=<sP(6X=Av98{sM+?5WDGa0ENF=OI&4>(x2E0+q$NQ
zk0o^ZupPF*<!V7mrv6&r+`lHgPFy9BJ5f(D;Ckp#C8gP;KWQspB&fw8g;I)Zt^0&Z
z2((b=e3T5VNRG$ZFXa?_?CL6kCd;1BMm?Y!owWy>s$M)ZH<aO2QIJTa$$sRXlQN9#
z&(H<|YRM&N`p4!Dt=(#H@3&F?-78;Tq_P=6KmHIeYslqRmqrrtf!LiW2k*B;{6(z8
zapuvXDbQwN$IBYyEWC?_q(AWXh_7AoQAdRZu~=*T%|C7OPGVr{OR^`4W!~e)_;3_*
z#OSqi447!)sk0uJBXMK0;cu#WMawLt>;$mG&OeHgG>ZDR0{Sii2mC@8H2qDV+G(>w
zCFyNZgH>rX3(W4j#W5+^ETP+{vFNvr)17`%g7?;1GtB#4YF^q;U5NdDSUdVlq-@v}
z#B;bCj*nrQ>(_L^d-9DQc>VQVxl|o$;v*Z&N!%u@`?+x~sLpe3UultNjiBsHR&>^g
znw&OsugR|V^V<v@b`lal%J2u5LYTnBYs(zJ1Wf0{SY`s;h|nK^F70fg?gGZHS~_$b
zJWR`&uzpLjjykA=@LfVg6a6>{aJp?A$OFW_DkGBd94H5+{TNKtN<s>&bBw6(l$}`M
zN5)DN<n_&jROCQ)mMIjI9lizYFU~WE;2Q+I9&I~i_|*xN<9Z;BnTlj?#VN{km%v1w
zB;=W2mKC+MWIF*bEz2v_J^Ek^9N$id6?2*s5S;#Y891gD9^!)w`OFLX>hF+DkAgt_
z{YVb%sXg{dBOZi-thiC;TNLNp>;T7Y0>>&V)$aBSw4>!hk1QOoHGJLT0kHR4?-;q6
z{X1@<Mc0_IHIK1$BxgDS*|1Q<NHxX!1X_SbKSCy{!J(-xu%aZ$))2@K#NcPj0X?X5
z89TgeHr6kv&ng4&UiLe47{FJrOfU%6hQmbt7(_3s`jr<y&=|4n7|7+Ad@HhGJYTl!
zV>Y=ukhrET7YIUzzU((H)9~Db&QfT`SO#cOnpk)lf#dwE{y=i%KHQj;o9;L}jz4O&
zN7_pWokcU87^<%=hVO%jpk7qYbS(1q9s<ICV~~_J#W|ZDxLxw5g?uV^=y?ydp(C9+
zLFBV#1hNzPEjRYm2{S4wMsG<Al`>%{r^RU{M$`;M-0!($fc%qds~js1lbAjJUJW;P
zAm9q51sR)jN$GEA1#L`hu?ONDJSDCPp#BLI=RrOI1+3680WK-a_v(O9yOS{v%RP}M
zR)8L&w8DNpIC$B}bd((@(V6*zn*f`{ikAfuXu2W;N16+Q7(#(<A(+!l*rCo0(=D*^
z@UOd2N`V&8j#Vjvg8?c8Ds4D~1EIUb*6dOhIx7}&=-?QjX#Ddo!de-J>`PD2XF}6U
zbQsdspJyV#0w^<3yB3(jPvbv=?N|D!-VeqQaRK35nypH^5JrH}EXEfd#^o`z%L6=u
zLjVqg8xL^#i$RRBx-bZcR{k5<g1^+5QGbdM41`qpt|AC{1$W_tO8f{kL$1-cTd+g6
z@)V%L5(9=9uywN9TP56>glfVgCfFF+y#%WH`_aoq&Ek-}mi<7>TGWgyK!V|?@+h+h
zrO2MaYDO2jU<GBd0{PM<UW1jgeSbXiwE_vS10XW6Wnaywa)_sdfezd|01=7K9BsyE
z5RC(39}@a|H)LZ7fM?u^drFwF7E5x=cF+Jeh{0$0mj=pl37ADtOC~!Mh^;DT1Z1lY
z?kGn)w1A)WttjS%PYj}cL41k@<!RqtEbw3}P)i&i9CI7a_1XqV`Sapf@8b0t)6TfM
zNC-&274l>SA6hg}W@}2(P5?PHMAHQj<S%M%F)IM6xN%}niI`D7P%bgyGV<0yqmU?{
zDu%U;JdNcmAno@P;}&ByofkZq59Pip&tjMk<X+nj9KT-w^I}8l{@z`S3~61jGo#|u
zEPw&H_(h0}=5$V<Eq=@mmIb}c-%~`qUa3^>nS4H&wbK>jeVqd+wM7CG@V1MMG1_`T
zN0avWiA^w6lRl1P^|dKx=&<uLETJ9+Xcu>IV+F~7M`kAYLXz_X)}1jvVC}tzV0@*6
zjG-3w!f?|!ogD=vn^9gV%7?8ueu23}%CM&?Aiyh8yd5<96PR4T$Rl*vZ*mVDudiN<
zxV|HjL2wvEeA521+ySU@NKKz@`9#TOViJ^PoCQGawlEaIUwH``A{;NE-*gAOJ{>RM
zy8+f>uy&)dW#<TtMzetN$SSy`D6tcy3?(|#uV_)Va9;>yyFd_hXxWKn088*!a$pYF
z%|N%_^Vg>yW%Tc^h9Y|GLoH}n11!a?&E<c|i2`!*LQ9I0b}S73ij^@8b6CPB*;Pbh
z;^TtaT{#%*E<-I$*ekz4m`Y~T1{=a$WYQ?E0C4hHF63J)_BVk5(XrzujHW3w<o(-G
z7x#ylLFe1Fp=R6qQj$S7sE~i?XdlC_cJjf`Bq7G+s@4a3y*Hx4s51O#JIWkVhUBOu
zAsRIS1S$)d6m5~|e87+v@_~G6td!*6zR+cid1nT<C_GpIz`}K*0hk{6XDOm817;jj
zPbGmoIuLL*jL4B=Nj`p$NVD)ar1X6_h8vSKF{FqmrTjBME+Jqo1gUSivkc0vS3nUz
ztU+D_jdmSsazJO(`t32;jvZ5Xow$pf1us`u%d_=C$V6b$9c-ZVhR6^)d%e#Iv&qnb
zxO<DhuuA{i-wZ?dAmFc=vSQe?&V4|MbW;YHaly)}jQ0CqI7Qtla~a9o-B8IFzKckv
zqBsbYL8EY32Hg*<=K{Q45`kRgYTno6!#YqYBBH^_7)zUEZNpxeU&z}5r{!L_sp@kX
zag_w5Gk~%RP%cab7~3b}h74VCF$6G<1w<-Jk#j$Q_(0w7P2vF{{m$Q^z_4^s_J57}
zLexs>ugJoT$pbMEK9l|t`|q6z>j?O3_`U%wO!i+r4ybBT-=Tl2a)GMz?Tk72Ul%J*
z@umoao@xPO>d7-0=KPDHfjTwU(>aR+TYGw=Z~OUaEvV7Y5wtQMiIqOcke0{nAPP!h
zRIFj6m%y_d*mmv`NsZ10eL(<ji`0oY?Klr?Xgs3u$_(2Lx@N6_=Z#taC*a;d5;uM>
z{djZhHGrb&FTNk<)Q<`f-hs`VVH!=2Az)FAM~Ztl!oTo<u{m{ld~pZhNVz(Idwf*c
zxPijO3_p6)Pv0-$I1V}n^TF53W&Q!{&HFNX)vXjjlK{J$(ViaL310FMYUl1<4B?ax
zbIUQboNxvjSbUQt2Jq+yY(@x~uOrv&7QpIqqxM<-Njs=Ql0ajzau$u+9PM^fPPzAp
z1tUR0DW=>OIZ8>$zU!ISR!a_QX6?Y}QXtEMivQxx9cL_EbUE)GaIWVO)IYE9*EaDm
zsck#JB-Fs1Fb!~S0Tz5TF(6w(GLI`ne;83-3seng&0m<m%%%%{-#t0?+`1~7N3;|X
z=EP83t^7LMt5O1d3#l5^TD%Yldk}$R*wVA-j;8|ZpZ)2g*5N00OQzXicPD+VY?vcQ
z2QqsxrQQGVN!*`W6`{&22-m?IqYic%cY|!UvY;Fin(r#;ru|fp@28pI_!81t>BG@7
zT%Ccaf5xY^`BM2Uz2Fsnb@8jmSDm(pGIp1cEu)fsBloJku7lBQnta0VRp4mIh}LQ$
zDPuWtvCim~s(ukOmgC~(Kz%IVnU|Z0;~#LPbr`9*HV71;Wod)ibyv-f>#rpsTnFSo
zgw}is{*vKw(wG%ijcrpT%uGjl-_c4_gIRf(+s$$9Fh5MqG_5?R+HMq&a1k=BX?=1F
zgO@sUK*++txwkyffLd28atYDUi<)`J>aLVKJP*ukw1Qhu#-yA#Go0xvmWT9DB_S66
z53YON_BpOk;epMbcXX7Wv4`IC;rJI_y`2WB?q(l~&}KNYUfEQ>ScgizZZj3x@GMv(
z-lAlK;LY<<Nxa$k3boYsEjS_I5jEV1y!6T;dpV-B0ScCOp@Og%5l%*CEVfLL%!vh;
z5e<Cz(8o7FN#^(U;*p!XJ3H*9sb^n=XhA(llxPa1Y4)AZ@J1nO=6{M>+Z||5gkz8`
z=B1@}zkWX4vlBO#fn>|h9Lw&4c%pG*naG#(@61XA$S?;wYeG#4;*d87`<}Lshb=y+
z)s|3+G_F(Gu$gLp3xrn3nHrz{t{x<xYax`Jj3}v)1AC^AZv=l(ZEx?zxv><k1~xPg
zWhy$N99gs|i7$c19KkC^XsD7xZmso!FU|^ODoUc*tE2j_-?*-pJ?482HVOr#L9>Y)
zZX2E#P!Q%Hu&-@n7^L1jwRc*Sx1+eRc*JWnB+s*;@BKI2SR4}P&0DIP9;*O^)uuXq
zFEzcfV&WBq`a4n!KWxZA9H8#I^I11QG7wE)AItwr;s_2aKv&`9i~>_RLaygU)Zd;;
z><N`+_}g$|-ZY`tirfmq3PD(h!wHx0g1)!&jF3mMF7)y!{(Qa;bo8`HR_-UWbw4&4
zn6(NWbLJ2h!%PW}x^;c>;Eu{UoLg-FeX;dg{W29YGsbycP0+BN;gcWrSXwD-3{+DF
z{MG$qZuaY(>;xXchIq*F!qFIq?Lwdll(-wP?T(H57lK$xuWH}%v*4V|Ebk*S>%`CR
z!RYYx7L=zHxP>M!n*z6>>25Q>4nS6iNdYTNu&S_wkV=T>Yd{evK})Q$C%{#R`|LXb
zt8$f(+*m(}_V$a}DL@WvLby68!+IX5KLWWVr~=m?hapfv{%>bHh-U(anLu;K94o*8
zThId2WA)TvufH!R=5Ux9^Z}cg--^C3MTcMx^95Zf2o};9kH32fNrBv4uK4;l7-~C$
z{U%yn{m=yz^gXnoGPK&F`v&7IngG@ntWouB@({dEph4KVFFg;Oz``gB_pZL^;EB$e
zOhD8q3b+2a92JKrNVNVh=jYi`e*>stDKM+z&j@l36sXvjRG-PIk{u_QF%cpy7^*8g
zZqz##gWScrt;g-{n+z{8DL@g-RN}(~4-T_}p0$=i`T9@~n&nQRzgP^t3oMi%YIkyO
zA_Vjbe>q|yk#Eh0+P#+|c!yz!SJynQFa{ivQ^fe$Fi1t-rORG&jGyqh0@i_)a|)^3
z*9rJz*x?PH;f50r136Ko68$PMAZ=cV?tsmr?~cZTy_F6!>9R6&pfQfz4xw2HB-r#K
z3q*%wiL~U-C%^n$0X97lR#mtq=rHg09WW^+*$}0{iM(WOXWu)z&j%A_SE>UzFg8Ny
z#VNhLMGZWvpbuAWBna&1XAGtAtXKD4QYAuGrpNc=x^D$t9D2t%3U~O>j(eYF#!&La
z0iX=YFVBj6w9BjlccYWf|M=`K!+DmCi{rXewN`Wb*Nekfw!yuYw0C5mM=kSN=COzs
z#eX451~iXmg7upvCaUV&^T53%+R#0tsY7;?>4b{omM@6!811_gz@>&uuQ1E{KqOR1
zx!ibdS<(V^ndm^LBD)r5tapLFw(i}&l)9To?bwa%Z$w%OvM-|b&}H5VBAkRc(7m2B
zT9J&@#?BaxCm@mKq&0tDP)V`l=fpxOk^oqoljlBPMz>Is1}CTlH3v5$-kffO1R{vE
zI|zGflczDLHZ3*Qtz5|vn7P>8cX7%+sra&mL?jz#r+RkMK?tZ*$b(uDVk}}PU;Lqf
zwD<nq(D*i`LB&QkjMGh0c3;#WE5Lbl8@=UdbH+q`DY*z0!qgjsEI^?yw194c#Q#ox
zdQ*?fREKJP=a_qwyJ;DL)}9&veC+&4-Lk(f7u<Ogi`eJ`h4T}~aT0gXL5um{=5B%e
z&~!_9=GUvBeK@xwkM^{%vQJ=l9jyv&Bp?2nfUv2Yoi<mAM`k$(e(q|CH`xn@q#xT6
zlU$uYi>hEC9lJk$mjuS1szR>H*4g#5;IlHy@okHU9|v}tfG^;v;{<|i!F2E<yXu2B
zSg<oCi1rDVn94Z_ewG_!JNmS18_y@TXg#Q2UT%oL@7Y)8Q{QjlSgpC*B9*s3To%Bw
z#zp6`JmDmKRT|ubo$(A7Z<9RWm+i~&`3{P)?u{hE1!9#K1x(8caP?l+6=}Wm#@C3j
zvP9#znA*!095eg1sO((xnT9vT&3%ZleE4va7@xSgm(;Q@HO+!r;9GgsEr$l&&Bp=X
z5}$aaB5KsDt5Fs^RQdlL;f5Rc9~@jtc!XM<LXj8OTONKrDU*WbaNKne!(N$+#75%;
z<uM)UBOn1+&CAv79EViwL1K!XmL?tEQbl2};ivm0l*5`$zn><+-16{=GBgmsCNqyy
z{Px_YbNh}{#4<+6eWCkovNSu2Xq)vfrNf`7Td`wu1ygo!O1pFKSrnd+H=w3HOD@v2
zbnz-%1T(wh&4<Bb!*_`IbN+~Rux|6$u0{juZ+nBDXM@RG5VYv|c%$KjYYUYToF2H{
zDR4N)n}8?bqnsqSuQT`iT|q+F=&!!@<q^F)s1oq+9d{I_lk}!v5br4hXViQ0?U8$+
z@2-^AaB+xPxWAw(!txYEg`%Khs)*CKCJHU-6TOY7dw`EvhVUq-Tye-uL0HNVnDQ9R
zC6XZ9>D6>xB<U2eObWb9uS2bX&6emjyJ?r-ErJmyWgbm0KiJz!-;FUl#~@eoZ<glH
z;S_&`gtU){gF}{`8vbur>%mG$4QBJPv-!mf9My%`%E`CUOxr<oV#Ms*xuqG=R%q#<
zCdzR|7+XmPYhkV2h1C#7KnSopk&=~f3mj;PyQHG!ObjUOi0%E>=gD9fq2u&R@rdB-
zlRm&xme>f-_KNbB01oI5^Z6}?;Mf4iWtPaN=bv0d*7~aNTOYd(5;N^`ZW6O51U#pK
z<)u=b#B)xp<;*kg+Xrt@W#HeZZXcgLzD)`o`9V3xZ*>R15b>`ze1u5Y;;q3xlAn$B
z9a##lB#_S+Mr1H{*9z}s__!@vC^d?3{L?JO&7mn*idr#g+qQG&xxd2?>5_r_AEIO@
zmiMb`Km=p{dgvWLPhQ?Oko&o0x<#vV&yi>B@H@!|9ynLZ;{v`&oz;}khbDz6by*Sq
zy^A<W{xmku%Gih`1}BoggP5a4uY@z@4P$Vw#Eech)3U?A18ry;jqe(<0ce@o98-K6
zPx(Nvr193AEsH`4wD6l#a{%A}q2{<q>BT6V8$v}5uObx`wE(+GPe#8)zY-R2zVE88
zfhq_tdG!x4a>9{w2ddB}4)V*V7MPVh9RFO~0gAsteO8v_<BS#^mCH;IB_|0|cY<z1
z$sOw09xTJAnC_eYERH^SSPN=~2ypBc!2!#v2tBZ|M}?~!M+O}?fE%Pkb(}w<o#=Rl
z10))S;Ka9^hufycxc9>HMt)5C4}`3pk-rf#@6ou3^&TSJ!*}V6r~!&6;CC&WVuz7Q
z>vtd7!O5jUdb#9s!vhtrd)FO{5z6jj(!MdlRL+zSOed$h%jvP&FnKxS^57e%lqCJc
zRl4ubt1Cx-t%t^ZNj)J3RF<_g?_is3IXN4#dk^+x_)H59Q(pX7Ts-ot>xX4Inx+kZ
z4^nBY^8T~RF?cJ2AJpJP8dIm%S2?^cEQ?0MqCzF3Mjd7PL|V8r8+F1U0xc4}K7IC}
zAi+Bk$#W@k4Xz5h4sS)(3ekrSz+|Y%`0UtAAlIK<-LLrdeZ#{}pLoOpQ7|%=FIoB1
z`y;~gOb(G|vIw$8clI8@ik{-rA3$zruB%axc@G##)#?K!wx2~<te5hdK1$zNyR3k5
zwnaYDDP*hCd(b2d^Z}jlKG(Ld>!X!6K*hd`C)@PtQr}*0F0dZl_;Y&0EAsrWdJuMS
zR7rwzRrmbaf{zpaWeHg-7@4Ve)osu#3GjzQUs(;^41`u#A8)=?Wsuxk^073pN4;c}
zdKmNeD-Qf3EvLN5i(Z*$!HlUH+TN4*9-WBNf)@M+t=_f1Ox|ECMBis#8rH@iU2O~A
zB4Y|6<k;RJzAMp}XD<nq&f_Ga9Sysx(mvJid)tEU!#X4-t>BTS02gCm*r-{YInkRo
zJ#b!sSI1O<U{@+|*xsj|QkiZ3otiFLSC{^l3ig4-g&R=2PJ7((URqia>UgbTNiIsw
z<U7bsJ-}P0oL<a7VHPp*qTutX&Qojw5vRssdjr8zpZpLx{)W(yMf9;*DGdHZ5R>Hl
z@JLjRP|4*VX0fWYBWEx;@pSi;KKILGdxGv)l46i)gr9BY(nIZvhg7-(`dqja*>TYR
z%$)Ntj+=32m^lb>WS-{!qiWw(E83@CM<rcGo*h2qFrA=w_I8d+0UC@=e)4305hx)k
z{RTVF{2e!j#GYJRE1n<YltE%GG4q&nGu!m2^rx!T(a5f&LE+p>N)$44XHh}{N@`iN
zpKE?$Cuh1H;!lv@SgoQL$+u1iZ6Yq{+XJ$q6dD2l>cVEwkF)A~pqg?z8>X|bI8S0B
zPzH`fK3U*7MtWE7qV3vvBy_*KE0MZ+*y1djm6chWNe}t{KFGV~j>XTJ2OPtCf`gQb
zpF5F9G;Mg%=-pz-%C_N&^t^F|Jm2cz0~_C5Y4kNkIY`u-qt>P7(6jJI0|~!zimFn)
z1}9`vKjB47wno=2`VN$F4*f~oeAh2pvAS>2s2D-mCAw$!))-LtQ@lfq;|#EphoOO<
zufQ?yE@YrwHwj5IcMnF@w*I=bZawMjb^U!MY9x1WdR7U?e`ZwqY-qmyWs7fYz+$od
z=H;m<^9^vE_)>1^y+%>7E$iqnppTM*hns3A>yPlLggrdv@)5^>dNd?rLpJG5*Le}z
zixW+DO6RW>kepnuKOQW~@V4^q_q~;6?|uL$5$^KxVWp=2ZgU~dRRaFSiy0Qo0dWRl
zcIO>nVknzj8`__(uMb(L^}n0L4+WkgHhEfmk3UgNCBQzTJ;HN(a-PKr72WFSO6SYu
zKHK84Ca&Kex#MA4PB;l`wN-@&*@_3wsb@HUtEddt<iwN^gZ4_zuJQTxAL0*x?82B+
z*Syh5t)*Q0DmXT#*}K==ydRt$STL&#)66}~6@!xqT>SK-D07DeH6NV#d1IsSSyZa>
z<Y9Cbb49~)r(_aWL5ymoi4)Vhg@}92yZmsKDXqICj)~XAk@R9fs)L@%>v$x(sP58X
zY%A<>I~W_6E`X^oJo~K+`N}OOJ!hHnUA8?hV1^eCDk&S;b1RulNEet=(`svs+rYu*
zN%oPhmXjccJt-JZtv^!aE<nO7ev3-{lAYmi=C~yuPQFmF;C6OcgHS>5`I#U4Ikf5(
zk>degaejJW_B9D#c>5B96`4ryThg!8pJZ~9QuHjK4M6%Qx3t5N4yO+)8~G48P^s<^
zli^3}?cSwGfdkb+^2w7^9rkh{W%0P0cl&Av2)?anv;N$AjS;akO!@ukWgB0f4kxag
zHX(O$--4K!2zfhh;g+}R{+^H#(|&f`LeAQEI)37zMMzy?J`>z{*k0ya&2r(iG)GzT
z7I;em9}~O<Tz{Y7_J4c+Z>0Z5{_p4iyONgYniz`_yj{0K%ntmqj>%ZxT<@;Vnb`jY
Dzov|I

diff --git a/internal/static/performer/NoName17.png b/internal/static/performer/NoName17.png
deleted file mode 100644
index 068d1cf734435bf9204de7539351fb01e166d712..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10878
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

diff --git a/internal/static/performer/NoName17.svg b/internal/static/performer/NoName17.svg
new file mode 100644
index 000000000..8df98d6c4
--- /dev/null
+++ b/internal/static/performer/NoName17.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 850 1250"><path fill="#fff" d="M582.86 677.29c-5.58-11.04-5.58-37.61-5.58-37.61-13.88-171.93-20.53-177.51-20.53-177.51-3.92-25.99 3.68-109.52 3.68-109.52 7.95-83.53-17.68-95.28-17.68-95.28l-9.37-6.05c9.37-2.37 9.73-7.83 9.73-7.83-17.68.83-8.19-20.41-8.19-20.41 7.83-13.29 2.37-28.24 2.37-28.24 14.83-24.32-9.37-57.19-9.37-57.19 3.09-8.66-24.32-43.07-24.32-43.07-6.29-7.83-23.61-45.56-23.61-45.56-20.53-39.16-68.58-26.82-68.58-26.82s-58.26 6.41-58.97 66.69c0 0-2.37 42.36-9.49 51.02 0 0-10.32 21.83-8.66 43.07 0 0-18.87 63.36.71 79.74 0 0-27.29-4.51-27.29 40.11v45.09s-15.9 27.88 4.51 51.38l4.63 60.04s-14.12 45.33-16.97 85.2c0 0-9.73 47.58-15.19 66.33-5.58 18.75-8.19 21.6-7.12 29.9 0 0-13.29 28.24-13.29 37.61 0 0-4.39 7.24-2.73 11.63 0 0-6.64 19.93-4.39 24.32 0 0 14.36 19.93 18.27 23.26 0 0 3.32-6.05-2.73-15.43l-3.32-12.7s11.04 6.64 13.29 7.71c0 0 15.43 1.07 23.73-3.92 0 0 5.58-8.31.59-9.37 0 0 1.07-4.98-2.73-6.64 0 0-3.32-11.04 1.07-22.07 0 0 7.24-13.76 3.32-34.29 0 0 6.05-34.29 13.29-44.73l2.25 6.05s-.24 22.54-3.68 48.65c0 0-8.9 111.66 3.8 178.11 0 0 4.98 41.53 3.32 64.19 0 0-3.32 32.63 5.58 40.94 0 0 0 13.88 5.58 18.75 0 0 13.88 54.46 34.89 114.5 10.8 30.73 7.71 54.7 7.71 54.7-3.92 11.63-11.04 41.53-11.04 41.53-17.09 9.37-19.34 25.99-19.34 25.99-6.05 2.73-6.64 17.09-6.64 17.09-5.58 18.75 13.29 16.02 13.29 16.02 51.38-6.64 46.99-33.7 46.99-33.7 1.66-16.02 19.22-43.19 19.22-43.19l.12 25.39c3.92 4.39 6.53-.47 6.53-.47.12-18.39 5.7-36.07 5.7-36.07 18.27-16.02 7.24-23.73 7.24-23.73 0-4.39-6.64-9.97-6.64-9.97 2.25-5.58-6.05-10.56-6.05-10.56-5.58-4.39-11.63-16.61-11.63-16.61-7.71-12.7-4.98-55.89-4.98-55.89 12.7-37.02-13.41-85.2-13.41-85.2 3.2-15.43 1.31-49.72 1.31-49.72-1.07-30.38 13.88-88.52 13.88-88.52 12.22-24.8 14.48-74.75 14.83-94.69 1.66 11.27 8.42 25.16 8.42 25.16 9.49 20.41 15.43 50.31 15.43 50.31 3.8 28.48 11.04 50.9 11.04 50.9.59 13.29 14.36 55.29 14.36 55.29-2.25 36.55 13.88 47.58 13.88 47.58 2.25 12.22 3.32 78.55 3.32 78.55-1.07 61.35-17.68 97.89-17.68 97.89-9.37 9.97-29.31 71.31-29.31 71.31-10.56 6.64-18.75 19.93-18.75 19.93-4.39 0-11.04 12.22-11.04 12.22-21 12.7 13.29 19.93 13.29 19.93 53.63 5.58 58.85-18.27 58.85-18.27 3.92-11.63 18.39-42.6 18.39-42.6v24.32c2.49 4.98 8.42 0 8.42 0-1.66-16.02 6.29-36.55 6.29-36.55 17.68-27.65 5.81-28.24 5.81-28.24 1.66-9.37-10.44-21.6-10.44-21.6-2.25-5.58 3.32-18.75 3.32-18.75 53.04-117.83 29.31-176.44 29.31-176.44-1.07-12.7-6.64-45.33-6.64-45.33 5.58-48.65 1.66-108.33 1.66-108.33 2.73 4.98 19.93-3.32 19.93-3.32l12.1-8.31c5.58-2.73 11.75-27.53 11.75-27.53 4.39-6.76-9.61-40.58-9.61-40.58Zm-60.16-87.92-2.73-6.05c-.59-15.43-38.68-95.64-38.68-95.64-4.98-15.43 7.24-66.92 7.24-66.92 0-4.98 16.02-37.61 16.02-37.61l7.12 84.6c-7.59 33.58 30.02 152 31.56 156.75v.12-.12c-3.09-9.73-20.53-35.12-20.53-35.12Zm26.46 138.95 1.19-33.34c3.2 6.29 4.15 16.61 4.15 16.61-.83 15.43-5.34 16.73-5.34 16.73Z"/></svg>
\ No newline at end of file
diff --git a/internal/static/performer/NoName18.png b/internal/static/performer/NoName18.png
deleted file mode 100644
index 179d1d3232c8b05d87bfc0c3bf9ff50331930689..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12196
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
F{|{_hw;2Ec

diff --git a/internal/static/performer/NoName19.png b/internal/static/performer/NoName19.png
deleted file mode 100644
index 7349c26b2bf70066d38aa0e71f4721259c252279..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12482
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

diff --git a/internal/static/performer/NoName19.svg b/internal/static/performer/NoName19.svg
new file mode 100644
index 000000000..a35c979d6
--- /dev/null
+++ b/internal/static/performer/NoName19.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 850 1250"><path fill="#fff" d="m434.69 27.94 1.67-.07c1.39 2.28-4.86 6.26-3.95 9.02 11.38 3.47 22.47 7.89 33.36 12.65 1.55 2.77-2.74.28-3.78 1.94-3.26 3.39-8.62 1.06-12.76 2.02 1.92 6.03 10.2 1.14 14.42 4.13 6.59 3.05 14.27.61 20.81 3.8 10.62 2.71 21.79.16 32.49 2.56 38.39 8.38 78.55 6.98 116.34 18.22 12.55 5.44 30.09 9.58 33.14 25.25l.24 5.59c-2.35 14.64-10.42 27.45-17.79 40.02-11.3 20.29-23.93 39.78-36.34 59.39-9.89 18.01-22.55 34.24-34.25 51.06-13.31 18.09-19.06 40.24-24.76 61.58-3.57 20.11-11.88 39.14-14.61 59.39-1.43 4.61-3.81 8.9-4.95 13.6-1.24 9.62-5.54 18.48-8.59 27.6-7.2 12-14.5 24.8-14.35 39.27-3.54 21.74 14.85 37.5 22.63 55.94 11.03 28.11 23.51 55.69 32.64 84.52 8.37 18.83 13.29 38.91 17.52 59 7.94 37.57 7.19 76.17 11.65 114.18-.45 28.59 4.53 56.97 12.02 84.49 2.75 17.66 12.14 33.21 17.16 50.19 4.04 11.92 7.37 24.23 7.76 36.89.7 34.27 6.39 68.12 9.82 102.17 2.23 25.23 6.57 50.56 16.3 74.08 2.35 9.56 7.5 17.99 12.55 26.33 2.84 5.79 10.05 6.8 14.02 11.57 5.38 4.7 6.77 13.22 3.66 19.44-12.76 3.47-28.24 1.11-38.23 11.4-2.12 8.58 2.83 16.62 4.09 24.94-.51 1.22-1.52 2.13-2.47 3.01l-1.1.05c-4.12-4.16-4.25-10.82-7.22-15.77-3.44-9.49-11.85-15.78-20.22-20.7-2.77-1.44-2.8-5.93.24-7.01-4.42-6.03-2.64-14.1-1.52-20.92-.28-8.02-1.05-16.11-3.65-23.74-3.32-11.81-3.38-24.42-7.98-35.91-2.13-5.21-3.09-10.76-4.41-16.18-3.21-11.88-9.61-22.57-13.03-34.38-5.89-16.99-10.95-34.27-17.68-50.96-6.8-18.03-12.61-36.54-15.13-55.7-3.08-16.68-2.43-34.1-8.08-50.25-8.49-19.67-18.15-39.23-21.5-60.56-6.63-27.16-15.83-54.01-30.02-78.2-7.36-16.22-14.85-32.41-21.25-49.04-4.45-17.75-8.76-35.54-13.84-53.11-.63-1.71-1.3-4.26-3.6-4.05-7.25-1.2-14.48-.78-21.76-1.4-4.55 3.57-7.12 8.81-8.56 14.29-5.8 15.25-9.96 31.14-16.86 45.96-11.4 19.44-21 39.98-34.3 58.25-10.59 18.23-20.3 37.2-26.79 57.31-5.24 18.24-13.5 35.46-22.72 52-4.24 7.24-8.25 14.82-9.47 23.23-5.17 26.42-10.26 53.3-22.4 77.59-12.04 25.15-23.93 50.34-35.68 75.64-10.48 20.29-19.2 41.57-25.1 63.68-2.1 6.22-6.58 12.94-2.56 19.53 3.21 6.92 9.2 15.12 4.2 22.67 2.59-.33 3.96 2.22 3.56 4.52-3.93 4.88-8.68 9.1-12.08 14.42-7.84 11.3-9.39 25.29-13.63 38.07-1.7 1-3.68-.26-5.08-1.25 1.43-9.42 3.95-18.73 4.22-28.27-.04-5.48-7.07-8.39-11.27-5.13-12.78 4.61-26.14 13.15-40.1 9.73-2.24-2.91-3.24-6.59-4.68-9.9l-.07-1.7c-.23-7.84 4.77-14.02 9.7-19.48 1.16-4.41 5.29-5.56 9.14-6.57 6.88-17.21 13.42-34.62 21.79-51.19 6.73-15.66 11.39-32.12 16.11-48.46 6.36-33.01 15.66-65.54 21.52-98.79.98-13.65 4.05-27.19 8.03-40.26 6.15-16.38 14.88-31.63 22.72-47.21 7.09-20.5 14.78-41.02 17.7-62.62 4.13-25.36 8.76-50.63 13.04-75.96 4.29-30.12 10.04-60.2 20.71-88.77 6.67-22.68 18.32-43.39 30.73-63.35 5.99-15.39 14.98-29.53 19.18-45.62 4.32-16.26 13.84-30.49 18.97-46.42 3.33-16.59-.01-34.55-6.81-49.57-.53.26-.36 2.23-1.05 1.38-3.49-2.51-3.37-7.33-6.32-10.23-2.33-2.47-3.99-5.44-5.69-8.35-1.54 3.51.27 8.82-.7 12.96-3.4 2.05-3.28-5.64-6.24-2.22-2.56-4.25-7.1-6.8-9.1-11.48-2.01-1.77-3.2-6.37-6.37-4.17-3.6-3.03-5.61-8.32-9.56-11.31-.64 1.57.73 4.84-.96 5.42-.27-3.94.07-8.73-3.71-11.15-1.07 2.34-1.14 5.22-2.84 7.26.39-3.19 1.38-6.25 1.87-9.41-3.44-4.73-6.55-9.84-7.82-15.62-.43-5.23 2.56-9.8 4.57-14.38 1.64-6.65 2.47-13.63 5.91-19.69 2.6-4.58 3.99-10.86.66-15.42-10.32-15.16-15.01-33.93-28.74-46.73-24.72-24.64-46.13-52.22-68.42-79-12.37-17.13-27.93-32.24-36.88-51.63-4.09-8.33-3.1-19.07 3.12-26.1 9.18-9.65 20.47-16.86 31.64-23.96 20.09-9.27 39.62-19.78 60.32-27.73 7.73-4.35 15.5-8.68 23.81-11.89 13.3-7.14 27.05-13.79 41.92-16.91 16.9-5.78 35.25-10.3 53.04-6.4 6.55-.97 12.64-4.22 18.66-6.98m-78.8 47.61c-10.25 1.69-17.44 9.9-26.2 14.7-15.09 7.58-26.7 20.61-42.24 27.47-11.59 8.63-24.87 14.37-37.05 22.02-4 4.3 2.9 8.97 5.81 11.64 18.22 13.74 34.82 29.39 51.23 45.19 10.09 10.42 22.69 17.73 34.25 26.31 1.23-4.24 2.53-8.51 3.15-12.88.04-13.72-9.1-25.34-10.32-38.89.79-8.24-.35-16.62 1.14-24.79 3.11-13.04 12.91-23.42 24.07-30.3 3.65-1.9 6.15-5.19 9.22-7.81 5.51-3.53 6.39-10.85 11.79-14.5 3.64-3.08 8.66-3.42 12.76-5.69-1.3-2.5-4.36 1.26-6.15-.06 1.38-3.02 3.76-5.33 6.11-7.59-9-.66-18.6-.78-27.24-4.27-3.27-1.46-6.9-1.19-10.34-.55m142.15 19.7c-1.85.65-5.24.48-5.39 3.01 3.91.32 6.94 5.48 10.78 2.8 2.78 10.29 13.92 15.48 15.9 26.13.98 8.08-2.63 15.43-6.1 22.4 2.8 5.3 5.81 10.51 7.97 16.13 3.34 5.04 7.63 9.8 8.29 16.12-.7 10.97 11.3 18.21 9.91 29.34 25.71-21.59 42.67-51.25 66.87-74.3 3.49-3.9 8.02-6.91 10.55-11.61 1.02-1.96-.53-3.48-2.2-3.65-31.86-5.13-62.58-15.12-93.84-23-7.44-1.88-14.92-5.44-22.75-3.35m10.25 17.62c1.13 3 6.09 5.03 3.73 8.37 3.22 4.18-.54 9.55.96 14.2.77 3.09-1.26 5.96-3.74 7.61-.21 2.08 1.81 4.05 3.23 5.4 7.76-10.67 8.36-28.21-4.18-35.58Z"/></svg>
\ No newline at end of file
diff --git a/internal/static/performer/NoName20.png b/internal/static/performer/NoName20.png
deleted file mode 100644
index 86dd404bcbf5ae9d55209758be23ccc882f3a61e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12116
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
P?iH5iHfE2Ar>^`jQy>vJ

diff --git a/internal/static/performer/NoName21.png b/internal/static/performer/NoName21.png
deleted file mode 100644
index 7bee5cdb64259143049894a2cc77370b0bd97988..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10897
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

diff --git a/internal/static/performer/NoName21.svg b/internal/static/performer/NoName21.svg
new file mode 100644
index 000000000..2d7647c1d
--- /dev/null
+++ b/internal/static/performer/NoName21.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 850 1250"><path fill="#fff" d="M423.52 18.72c-23.04 1.06-33.36 15.17-35.68 20.59-2.48 5.78-36.33 56.19-36.33 56.19l-20.59 27.23v1.23c-3.67 5.71-8.71 14.06-10.76 20.22-3.3 9.91-3.32 10.69-3.32 10.69l-2.46 10.76 4.98-4.12 4.12-14.01 7.58-19.5c.19 5.9.49 17.21-.14 26.08-.83 11.56-9.1 21.45-9.1 21.45v24.77s-2.47 4.13-9.9 5.78c-7.43 1.65-9.9.02-4.12 3.32s8.23 2.46 8.23 2.46l-7.44 15.67s-23.95 24.75-30.55 33.01-60.24 65.23-60.24 65.23-32.21 35.49-32.21 50.35 15.67 28.1 15.67 28.1 50.41 62.73 54.53 67.68c4.13 4.95 5.76 19.02 8.23 33.88 2.48 14.86 34.67-13.22 34.67-13.22s8.27 7.42 13.22 9.9c4.95 2.48 12.35-3.32 12.35-3.32s1.69 36.34.87 43.77c-.83 7.43-3.35 70.14-2.53 122.14.83 52.01-33.8 227.89-33.8 227.89l33.01 8.23s-4.17 26.41-.87 56.12c3.3 29.72 23.11 123.01 23.11 123.01l2.53 42.9-3.32 1.66-3.32 10.76.87 9.9s-4.15 11.56-3.32 23.11c.83 11.56 4.98 19.79 4.98 19.79s1.59 14.84 7.37 25.57 33.88 17.34 33.88 17.34l16.54-.79-7.44-36.33-3.32-14.01s-1.66-19.85-1.66-41.32-10.7-47.05-12.35-69.34c-1.65-22.29 4.96-44.54 7.44-68.48 2.48-23.94 5.78-92.45 5.78-92.45s38.76 2.42 74.25 3.25c35.5.83 66.89-4.12 66.89-4.12s1.61 23.15 4.91 41.32c3.3 18.16 11.61 35.45 14.08 45.36l19 75.98-2.53 42.11s-14.74 23.05-12.35 33.8c1.65 7.43 9.9 21.45 9.9 21.45l.79 47.09 5.78 3.25s-.83-39.61 0-44.57c.83-4.95 4.16-1.6 10.76 2.53s8.28 38.8 9.1 46.23c.83 7.43 20.59 9.03 20.59 9.03l54.53-3.25-33.88-26.44s-5.78-18.14-5.78-25.57-3.32-32.25-3.32-37.2-2.42-14.02-3.25-21.45-7.44-47.89-7.44-47.89-1.63-146.06-2.46-153.49c-.83-7.43-3.32-22.32-3.32-22.32l14.01-4.98s-9.91-36.31-11.56-44.57c-1.65-8.26-8.21-51.18-16.47-104.01-8.25-52.83-47.89-188.16-47.89-188.16V523.1l4.91.79s-1.66-20.63-1.66-33.01-12.35-59.44-12.35-59.44-1.66-13.21-1.66-17.34 4.98-18.13 4.98-18.13 20.63 36.31 33.01 33.01c25.72-6.86 42.1-20.68 34.67-99.1-8.89-93.86-21.45-126.26-21.45-126.26l-29.76-7.44c-9.91-2.48-37.92-13.22-37.92-13.22l3.25-9.1 2.53-17.34 9.03 11.56-6.57-18.13 2.46-9.1-3.32-11.56s-2.45-16.51-6.57-28.89c-4.13-12.38-15.72-33.83-28.1-50.35-12.38-16.51-33.82-30.52-60.24-31.35-1.65-.05-3.23-.07-4.77 0Zm93.9 104.01 4.19 8.23 1.59 10.76-4.12 7.37-1.66-19.79v-6.57Zm-149.37 10.69-7.44 15.67-11.56 7.44 9.1-16.47 9.9-6.65Zm146.12 20.66v21.45l-1.66 4.12-6.65-3.25 4.19-9.97 4.12-12.35Zm-171.69 18.13-4.19 13.22-7.37 4.98 4.12-9.9 7.44-8.31Zm1.59 15.75 1.66 9.03-10.69 2.53 9.03-11.56Zm-22.54 125.25c1.45.06 2.68.64 3.61 1.88 4.95 6.6 18.13 42.91 18.13 42.91l13.22 33.8 7.44 17.34v22.32l-7.44 1.66-28.89 30.55s-18.19-27.27-28.1-33.88-23.93-19-27.23-24.77c-3.3-5.78-18.17-21.43-13.22-29.69 4.95-8.26 21.46-37.97 34.67-46.23 10.73-6.71 21.51-16.13 27.81-15.89Z"/></svg>
\ No newline at end of file
diff --git a/internal/static/performer/NoName22.png b/internal/static/performer/NoName22.png
deleted file mode 100644
index d92384f9329ec713f5ce0a2cde321aebe74d49a6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10689
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

diff --git a/internal/static/performer/NoName22.svg b/internal/static/performer/NoName22.svg
new file mode 100644
index 000000000..c81400587
--- /dev/null
+++ b/internal/static/performer/NoName22.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 850 1250"><path fill="#fff" d="M492.92 13.57h1.22c8.75 2.8 18.36.25 26.68 4.72-4.42-8.75 6.46 5.52 9.19 4.26-.65-2.46 3.96 2.05 2.53-.41-.49-2.14-5.71-6.12-1.24-6.01 4.85 1.06 4.44 5.97 8.46 11.25 3.64.53 11.6 4.08 8.93 9.56 1.76 1.66 10 1.16 4.63 2.06 8.55 5.05 10.1 15.04 15.16 23-3.08-.73-1.47 3.49-1.71 5.31 2.09 10.05 3.13 23.41-2.45 30.72-1.69 10.53-5.39 20.6-9.76 30.27-6.24 3.63-4.6 16.5-11.72 17.12-3.03 5.57-5.73 11.37-8.59 17.03 3.18 9.37 4.47 19.3 6.56 28.96-3.53-1.28-3.96-1.06-5.85 1.93 3.06-1.74 5.15 7.26 1.47 5.04-5.55-2.09 2.94 10.49-3.19 8.26-5.99-3.58 4.06 10.49-3.79 8.07 1.23-9.35-2.68-18.67-3.61-28.08-.42-4.88 4.57-11.58 1.83-15.24-3.71 10.18-12.5 17.22-20.05 24.07 5.02 2.68 7.17 7.73 7.7 13.13 3.47 11.54 12.79 19.67 19.67 29.15 2.15 4.44 7.39 4.05 11.4 5.37 14.06 3.12 24.97 15.12 28.83 28.72 5.81 13.74 7.66 28.53 9.37 43.2v29.23c-4.21 19.23-1.5 39.1-4.97 58.43-5.84 23.1 3.14 46.42.3 69.8 4.91 45.45-13.06 88.7-16.36 133.52-8.02 16.62-5.15 35.58-7.43 53.37-5.71 11.46-9.44 24.48-19.83 32.66-5 .83-9.43 3.37-14.37 4.46.6 28.64 2.89 57.24 4.47 85.87 2.91 50.58 1.16 100.73 5.12 151.21-.02 9.3-2.74 18.89.16 27.99.6 1.59 4.63 4.13 1.3 4.85-10.61.84-21.36 2.31-31.99.98-7.98 1.53 2.02-9.72-7.62-7.24-2.3 22.07-7.9 43.77-14.83 64.82 2.95 20.97 8.13 42.79 20.19 60.69 7.25 6.58 10.59 16.06 16.02 24.15 5.27 16.37-9.3 29.55-13.25 44.51-2.86 13.26-1.97 26.95-2.07 40.42-2.39.41-4.98.82-7.24-.24-3.96-15.74 8.37-41.07-10.08-50.71-10.61 7.13-9.95 22.7-18.65 31.52-3.12 9.15-15.82 6.94-21 13.75-2.03 6.52-.15 25.04-11.79 16.3-.25-6.6 5.52-20.88-6.02-18.73-8.18 10.47-2.47 28.02-13.25 37.5-14.82 6.59-31.69 4.9-47.37 7.88h-4.96s-.02.03-4.6 0h-5.71c-4.63-.75-9.53-1.17-13.7-3.48-4.29-5.87-.68-12.54-3.31-18.62-.9-12.38 14.42-14.04 19.53-23.21 4.09-7 14.42-8.14 15.95-16.81 18.08-50.42 48.95-99.3 43.87-154.96-14.12-23.04-29.8-45.32-41.42-69.81-6.72-11.69-14.68-22.68-22.9-33.31-9.9 2.56-13.97-9.35-23.21-9.72-9.29.46-18-2.92-27.09-3.65 5.61-45.64 7.53-91.59 13.51-137.17 5.56-34.55 5.71-68.64 9.09-103.63 3.61-31.39 6.36-63.04 10.57-94.26-.44-7.88 7.17-19.22 2.9-28.52-5.18 8.56-11.91 16.39-15.02 26.06-1.45 9.74.45 20-3.3 29.38-4.07 10.99-11.82 22.96-5.99 34.73 1.69 5.3 9.13 7.61 7.96 13.89-6.92 2.6-13.55-4.98-17.65-9.79.59 9.15 13.45 10.95 15.72 19.37-.47 3.54-4.34 3.39-7.03 3.06-1.15 8.85-13.62-3.65-14.87 5.33-8.42-.39-15.28-8.46-20.32-14.84-8.39-8.15-2.45-20.95-6.6-30.67v-4.7c10.65-19.41 22.28-38.76 25.4-61.17 9.99-29.64 22.11-58.6 28.45-89.35 9.09-20.13 6.54-42.25 8.77-63.69 2.61-20.5 1.85-39.91 4.63-58.71 6.42-11.48 13.18-22.89 19.06-34.63 7.68-8.14 6.32-23.55 14.14-33.01 2.35-10.34 3.93-21.24 7.69-31.31 5.45-12.06 19.7-15.78 31.76-16.95 10.99 3.35 15.09-9.98 23.91-13.67 8.95-4.07 2.75-12.06 5.25-19.44-9.98 2.46 2.62-11.96-.29-15.74-4.5-.5.56 8.28-4.08 8.4-2.8-.31-.47-3.77-.18-5.39 3.21-4.35-6-2.03-2.97-5.64 1.96-9.66 7.09-18.28 10.3-27.57 4.26-2.6-4.76-2.76-4.75-6.7-2.88-11.29-4.94-23.64-3.45-35.09 11.8-13.66 4.09-33.9 14.3-48.39 2.96-7.43 9.56-12.05 14.57-17.97.58-2.08-1.08-1.71-2.45-1.16 3.86-3.41 9.47-3.91 13.5-6.96 4.19-9.19 18.7-4.1 23.95-8.97m26.87 376.08c-3.57 7.7-4.63 16.46-10.53 23.14-2.56 16.66-1.25 33.96-4.34 50.5 1.1 5.23 1.31 12.93-4.69 15.27-3.96-1.22-.65-6.18-.56-8.93 1-15.57 2.44-31.02 4.55-46.39-13.66 12.06-7.35 34.11-7.47 50.6 2.48 4.24-5.39 8.9-6.41 3.75.37-11.54-.13-23.05 1.85-34.5-2.38 3.66-3.32 8.64-3.56 12.47-9.39 2.22 4.76 10.24-2.38 14.37-8.4 4.94 1.62 14.71-4.54 21.13 2.41 5.86 8.08 11.65 5.27 19.06-3.14 5.12 5.21 7.9 3.65 13.38 8.02 17.32 14.1 35.59 25.04 51.36 5.11 9.37 7.14 20.04 9.75 30.18 6.66-8.25 7.47-19.49 8.05-29.65.27-36.01-5.69-71.8-6.2-107.78-3.5-25.77-1.7-53.15-7.51-77.96Zm-17.37 36.26q.33.33 0 0Zm-5.35 39.48q.33.33 0 0ZM307.75 638.7q.33.33 0 0Zm5.35 88.34q.33.33 0 0Zm-16.05 158.58q.33.33 0 0Zm43.49 309.13q.33.32 0 0Z"/></svg>
\ No newline at end of file
diff --git a/internal/static/performer/NoName23.png b/internal/static/performer/NoName23.png
deleted file mode 100644
index f28ca89c84744171be35a1acb30c6d75e8ffdeb8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12121
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
YqsB?T)+e{X`|S-xGh5Sg<8#sf0|)kJ2mk;8

diff --git a/internal/static/performer/NoName23.svg b/internal/static/performer/NoName23.svg
new file mode 100644
index 000000000..3156c267f
--- /dev/null
+++ b/internal/static/performer/NoName23.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 850 1250"><path fill="#fff" d="m280.5 271.75 1.28-3.04c.69-5.89-1.28 3.04-1.28 3.04Zm-17.82 37.38-1.98.23s-.6 2.67 1.98-.23Zm334.89 88.5c2.08-31.5-58.57-175.18-58.57-175.18-2.76-17.08-36.92-29.42-36.92-29.42l4.14-3.37c-2.7-27.39-31.34-39.72-31.34-39.72-13.67-2.06-6.15-8.9-6.15-8.9.66-108.74-93.4-119.08-93.4-119.08-71.66-13.6-86.65 104.73-86.65 104.73 4.77 17.06-1.33 36.23-1.33 36.23-5.46 13.71-11.63 10.97-11.63 10.97 7.51 4.08 8.91 0 8.91 0s9.52-4.1 2.04.7c-7.51 4.74-3.44 14.34-3.44 14.34l8.2-12.27-5.48 36.26c-6.79 23.25-31.36 19.13-31.36 19.13l6.13 3.45c14.01 13.91 24.13 9.05 26.18 7.73-.09.64-.16 1.17-.22 1.79-2.7 17.78-7.91 21.55-9.98 22.36 4.33-.65 7.94-5.26 7.94-5.26l-2.83 6.57c-.13 1-.32 2.4-.6 4.4-2.04 13.64-26.61 17.78-26.61 17.78 9.57 8.24 18.43 0 18.43 0l-3.45 8.24c-3.42 5.49-5.5 8.46-6.87 9.99l7.55-1.1-6.09 11.58c-32.71 26.65-10.24 34.96-10.24 34.96l2.05-4.17c2.04-15.75 6.83-7.52 6.83-7.52l-4.09 14.36C263.5 381.2 243 398.95 243 398.95s-4.04 0 2.06.71c6.15.7 8.87-2.7 8.87-2.7 5.72-1.35 7.72-3.21 8.45-4.38l-2.98 7.79c-13.66 6.15-12.28 35.58-12.28 35.58 12.96 11.6 6.13 29.44 6.13 29.44v8.16c-2.04 2.7.68 11.62.68 11.62 0 6.16-2.72 8.25-2.72 8.25-5.47 4.73-2.05 31.46-2.05 31.46l2.05 1.33c-7.5 18.45-2.73 18.45-2.73 18.45 1.32 2.74 18.42 30.84 18.42 30.84l-14.33 64.3c8.16 10.24 19.11 24.64 19.11 24.64-4.79 4.79 11.56 104.68 11.56 104.68l.66 7.55c0 34.9-7.46 97.81-7.46 97.81-19.11 39.01-7.51 123.16-7.51 123.16s-4.2-48.22 1.33 8.21c5.48 55.39 2.1 93.74 2.1 93.74-4.13 12.28-7.53 36.28-7.53 36.28-.65 13.01-6.11 25.99-6.11 25.99-8.93 55.43-5.47 59.47-5.47 59.47 3.42 15.13 40.95 3.58 41.61 3.43 4.42-1.23 6.79-19.15 6.79-19.15s2.72-47.16 8.2-59.56c.25-.5.43-1.01.65-1.58 4.13-11.85-3.38-24.43-3.38-24.43-5.47-13.68 3.4-62.87 3.4-62.87 12.96-36.94 23.22-121.16 23.22-121.16-2.78-19.07 4.05-59.47 4.05-59.47 7.51-21.21 14.31-64.36 14.31-64.36 2.75-4.73 20.48-136.09 20.48-136.09l40.89.63c3.43 15.75 35.52 166.34 35.52 166.34 10.2 20.47 19.04 60.43 19.11 62.88.65 24.64 13.61 78.03 13.61 78.03 16.31 36.93 31.34 111.53 31.34 111.53-5.43 19.17-1.32 34.22-1.32 34.22-2.07 47.19 1.32 79.99 1.32 79.99 0 19.16 52.5 8.24 52.5 8.24 13.64-19.86-10.21-94.4-10.21-94.4l-2.01-8.88c-2.78-18.56-10.94-37.02-10.94-37.02-1.38-6.77-2.03-80.67-2.03-80.67 6.8-66.39-5.47-102.65-5.47-102.65-2.04-14.67-14.32-49.24-14.32-49.24-1.33-17.09-8.19-56.1-8.19-56.1 0-12.99 4.09-114.29 4.09-114.29l3.43.68c4.1-7.52 6.12-75.25 6.12-75.25 9.5-.72 13.65-7.53 13.65-7.53 8.16-5.48 7.5-17.1 7.5-17.1 11.55 0 10.93-5.52 10.93-5.52l47.72-131.31c8.85-19.14-8.22-41.06-8.22-41.06Zm-263.15 25.28c-8.19 8.9-6.91 10.99-6.91 10.99s-28.6 67.73-35.43 68.37c-1.17.14-1.84.14-2.35.14l-3.07 1.9s13.59-62.22 28.61-84.12c0 0 5.43-32.15 5.43-38.97s-5.43-23.27-5.43-23.27 6.18 17.74 15.02 21.2c0 0 12.27 34.9 4.13 43.76Zm208.59-2.72s-2.67 4.82-2.67 10.94c0 0-4.29 62.94-8.23 78.53-.18.9-.43 1.67-.64 2.23-4.09 10.27-7.5 19.12-6.15 22.56 0 0-15.69 19.88-8.19 23.3l3.4 3.37-10.91-1.32s-8.16-8.24-7.56-24.68c0 0-5.41-6.16-6.78-5.43l-4.06-22.6 8.83-3.39s-9.49-57.5-16.37-69.79c0 0 3.47 6.84 10.28 17.74l5.45 7.56s8.18-4.75 6.81-17.11c0 0-6.16 1.36-8.87-8.19-2.69-9.59.65-2.09.65-2.09s6.89-.68 8.22-12.26c0 0 7.51 10.22 19.78 0l6.12-8.21 3.38-6.72c-1.6-.87-4.16-2.7-8.75-6.31 0 0-10.3-4.08-11.67-19.86 0 0-4.06-12.98 8.9-18.44 0 0 8.14 41.72 15.67 38.96 0 0 6.78 4.79 2.03 11 0 0 4.11 3.42 1.33 10.22Z"/></svg>
\ No newline at end of file
diff --git a/internal/static/performer/NoName24.png b/internal/static/performer/NoName24.png
deleted file mode 100644
index 7b9bb42a26bf6c4b136f6e2d6e0f6819840c852f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11273
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

diff --git a/internal/static/performer/NoName24.svg b/internal/static/performer/NoName24.svg
new file mode 100644
index 000000000..3afd26f25
--- /dev/null
+++ b/internal/static/performer/NoName24.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 850 1250"><path fill="#fff" d="M442.74 26.63c-.18.25-2.89 4.31-6.06 9.07-3.14 4.74-7.17 10.61-8.92 13.04-7.32 10.06-9.44 14.12-11.2 21.63-1.05 4.43-.77 14.55.65 25.22.65 4.64.77 5.88.77 6.89v1.17l-3.05.49c-1.66.28-4.55.98-6.37 1.57-3.2 1.05-3.78 1.08-3.81.15 0-.09 1.17-.58 2.58-1.08 1.45-.46 2.55-.92 2.49-.98-.06-.09-1.23.25-2.61.71-1.35.49-2.52.83-2.58.74-.03-.06-1.11-3.11-2.31-6.74-1.23-3.63-2.34-6.89-2.49-7.23s-.65-1.6-1.11-2.77c-1.2-3.2-4-8.64-5.57-10.89-3.32-4.77-7.81-8.92-13.93-12.89-8.09-5.23-10.4-7.01-18.03-14-3.88-3.54-3.94-3.6-4.34-2.89-.62 1.2-1.05 10.34-1.11 23.47-.06 13.44.06 14.95 1.69 20.27 2.52 8.37 9.63 17.23 19.93 24.92 1.69 1.26 3.32 2.43 3.63 2.61.49.28.49.34 0 .62-.31.18-.55.68-.55 1.08 0 .46-.18.77-.43.77s-.55.15-.68.37c-.15.25-.06.28.28.15.31-.09.52-.06.52.06 0 .15-1.02.68-2.21 1.14-2.03.77-2.58 1.2-5.84 4.4-2 1.97-3.63 3.78-3.63 4.06 0 .74-1.11 1.66-1.42 1.17-.15-.25-.09-.31.18-.12.28.15.34.12.18-.09-.12-.22-.09-.37.06-.37.18 0 .37-.22.49-.46.25-.68.12-.58-1.35.98-.77.8-1.02 1.14-.52.74.46-.43.83-.58.83-.4s-.15.43-.31.52c-.18.12-.25.34-.15.49.12.15.03.28-.12.28-.18 0-.34.15-.34.31 0 .18-.55 1.11-1.2 2.09-.68.95-1.51 2.58-1.88 3.6-3.23 8.95-4 11.75-3.97 14.27.03 1.63.06 1.57.58-1.35.49-2.83 1.05-4.77 1.32-4.77.06 0-.22 1.85-.62 4.06-.65 3.63-.71 4.71-.55 9.47.18 6.52-.34 5.94-.74-.77l-.25-4.31-.06 4.31c0 2.4.09 4.46.25 4.61.31.34 1.14 5.08 1.38 8l.15 1.85-.43-1.23c-.22-.68-.43-1.08-.43-.89-.06.62 1.81 9.47 2.12 10.12.74 1.51.98 2.65 1.26 5.35.37 4.06 2.58 15.35 2.92 15.04.12-.12-.71-5.97-1.57-11.32-.68-4-.71-4.34-.52-4.15.52.52 3.17 8.64 3.45 10.58.34 2.37 1.17 5.78 1.2 4.95 0-.25-.18-1.29-.43-2.31-.71-2.95-.49-3.63.37-1.08.46 1.42.8 3.23.86 4.68.06 1.29.28 2.65.43 2.98.43.77.43 2.09.03 2.34-.18.12-.22.4-.03.71.18.34.18.74 0 1.08-.28.49-1.81 4.52-1.81 4.77 0 .06.12.03.28-.06.12-.09.22.18.15.58-.03.43-.03.77.03.77s.77-.83 1.57-1.85c.92-1.11 1.57-1.69 1.69-1.48.12.18 0 .71-.28 1.11-.28.43-.55 1.05-.58 1.38-.09.49-.03.55.34.25s.4-.25.28.28c-.09.37-.37.74-.58.83-.25.09-.43.37-.43.62 0 .4.06.4.52.06.46-.4.46-.37.12.25-.28.55-.28.89.09 1.6.25.46.37.98.25 1.11s.12.12.55 0c.68-.22.71-.18.34.28-.37.43-.34.49.09.49s.49.22.37.98l-.15 1.02.58-.77.62-.77v.86c0 .52.12.8.31.68.34-.22.15 1.51-.22 2.12-.12.18.03.15.28-.06.46-.37.55-.28.74.74.12.62.12 2.25.03 3.63-.15 2.28-.12 2.4.25 1.57.46-1.02.65-1.88.92-4.55.12-.95.31-1.69.46-1.6s.34-.03.43-.22c.09-.22.12.8.06 2.31s-.28 2.89-.49 3.14c-.22.28-.31.55-.25.65.09.09.55-.58.98-1.48l.83-1.63-.15 1.38c-.06.77-.22 1.66-.34 2s.15 0 .58-.74c.43-.71.8-1.69.83-2.15 0-.71.03-.74.25-.18l.25.62.18-.62c.37-1.08.31-4.83-.09-7.84-.58-4.64-.34-4.95 1.23-1.69 1.26 2.55 1.35 3.01 1.54 6 .12 1.78.25 2.74.28 2.15l.09-1.08.28.92c.18.49.25 2.03.15 3.38-.12 1.85-.09 2.31.18 1.88.25-.46.37-.49.58-.15.18.31.43.03.86-.95.62-1.29.65-1.32.46-.34-.12.71-.09.95.15.83.18-.12.4.15.52.65.12.46.34 1.02.49 1.2.12.18.15.62.03.92q-.18.55.55 0c.4-.34 1.26-1.17 1.91-1.85l1.17-1.26-.49 1.23c-.28.68-.34 1.08-.12.86.43-.43 1.2-.18 1.2.43 0 .25.12.37.28.28.15-.12.8.71 1.42 1.81l1.11 2.03.62-.77c.4-.52.58-1.23.58-2.34 0-2.09.46-1.72.92.74.4 2.12 1.17 3.69 1.26 2.49 0-.37.15-.18.34.46.15.58.52 1.32.8 1.6.31.31.8.83 1.11 1.17.46.46.68.52.86.25.12-.22.25-.28.25-.12 0 .12.34.03.77-.25s.77-.4.77-.28c.03.15.22-.22.46-.77s.58-.95.77-.83c.15.09.95 1.05 1.72 2.09.8 1.05 2.09 2.55 2.83 3.35l1.42 1.48.12 2.71c.12 2.58.09 2.77-.65 3.51-.65.65-.8 1.17-.95 3.35-.8 9.87-1.38 13.47-2.71 16.27-1.69 3.63-1.85 4.03-1.51 4.43.74.89-7.11 9.94-10.46 12.06-1.29.8-1.35.8-4.09.49-1.54-.15-4.95-.28-7.57-.25-3.91.06-5.17.22-6.98.77-4.31 1.29-8.15 3.51-10.61 6.06-3.41 3.6-6.86 10.8-8.83 18.43-2.31 8.95-1.48 23.84 2.46 43.53.89 4.61 2.06 11.1 2.25 12.61.49 4 .8 8.21 1.11 14.3.15 3.72.37 7.94.46 9.38.22 3.29.22 32.95.03 33.16-.25.22-4.74-2.52-11.23-6.86-3.32-2.18-7.41-4.89-9.11-6-13.9-9.01-27.01-20.06-32.55-27.47-1.72-2.28-6.58-9.97-7.72-12.15-.83-1.6-1.08-4.15-.86-8.64l.22-4.12 1.85-.52c2.68-.77 3.69-1.38 4.28-2.58.68-1.48.62-2.77-.22-3.75-.71-.83-1.08-.92-4.43-1.26-1.88-.18-1.94-.22-1.94-1.08 0-.8.06-.86.86-.68.46.12 1.6.52 2.52.89 2.52 1.05 7.51 2.09 8.92 1.91 1.38-.18 3.51-1.57 3.97-2.61.43-.89.43-2.09.03-2.83-.4-.71-4.8-3.63-8-5.29-1.69-.89-2.8-1.26-4.15-1.35-3.54-.28-3.85-.37-3.85-1.23 0-.4.18-.83.43-.92.22-.09 2.12.4 4.21 1.11s4.61 1.35 5.57 1.45c1.6.15 1.88.09 3.29-.8 1.69-1.08 1.88-1.42 1.88-3.05s-.58-2.55-2.37-3.6c-.89-.49-3.05-1.78-4.77-2.86-1.75-1.05-3.69-2.06-4.34-2.25-1.26-.34-1.29-.37-.8-1.78.34-.92.4-.95 2.06-.95 4.28-.03 7.78-.95 8.8-2.37.74-.98.98-3.35.52-4.8-.43-1.26-1.57-1.85-4.86-2.4-1.14-.18-2.65-.43-3.29-.55l-1.2-.18-.52-2.61c-.77-3.69-1.6-5.32-3.2-6.43-1.97-1.38-4.61-1.42-6-.12-.74.74-.98 1.42-1.57 4.25-1.08 5.17-.58 4.68-4.83 4.83-4.55.15-5.91.74-9.63 4.06-1.45 1.29-3.85 3.08-5.38 4.03-3.85 2.34-6.18 4.25-7.26 5.91-1.48 2.37-1.48 2.89-.15 10.18.4 2.18.43 2.68.06 3.38-.98 1.94-.77 5.81.55 10.06.28.83.77 3.81 1.11 6.61.95 8 2.49 13.97 4.86 19.07.68 1.45 1.94 4.28 2.83 6.31 3.45 8 3.88 8.58 11.07 14.92 4.77 4.18 7.78 7.11 19.87 19.23 11.01 11.04 15.66 16.03 23.01 24.76 9.26 10.98 13.38 15.66 16.8 19.07 3.85 3.81 7.91 7.17 12.15 9.94 3.48 2.28 9.57 5.63 12.4 6.8 3.91 1.66 9.14 2.18 12.24 1.26 2.92-.86 7.38-4.74 8.98-7.78 1.97-3.75 4.09-12.12 5.48-21.44.09-.52.34-1.97.58-3.23.34-1.97.95-5.44 1.23-7.08.65-3.91.86-4.95.92-4.86.06.06 1.05 2.25 2.25 4.86 5.94 13.2 12.09 29.87 12.7 34.45 1.08 7.87-.89 21.99-4.46 32.08-2.12 6.03-4.52 10.12-11.14 19.04-1.85 2.46-4.18 5.69-5.2 7.17s-2.15 2.8-2.49 2.92c-.37.15-1.69.37-2.92.49-1.26.12-2.55.4-2.89.62-.34.25-.92.43-1.32.43s-1.08.28-1.51.62-.98.62-1.23.62-1.2.65-2.12 1.42c-1.29 1.11-1.66 1.63-1.66 2.31 0 .46-.12.92-.28 1.02s-.37.52-.46.95c-.12.46-.68 1.48-1.26 2.31-.58.86-1.08 1.63-1.08 1.78s-.43.65-.95 1.17c-.8.77-.89 1.05-.74 1.94.18.89.09 1.17-.52 1.6-.62.49-.68.65-.37 1.48.25.58.25 1.02.06 1.2s-.18.52.03.92c.25.46.25.71 0 .86-.25.12-.28.77-.15 1.94.12.95.22 2.06.15 2.49-.18 2.34.31 7.91.83 8.89.25.43.43 1.02.43 1.26s.34 1.08.74 1.85.83 1.72.95 2.15.55 1.17.95 1.63c.4.49.74 1.2.74 1.63 0 .4.15.74.31.74.18 0 .31.28.31.62s.28.89.65 1.26c.74.74.83.43-2.09 6.8-3.51 7.66-6.03 16.24-6.83 23.32-.83 7.29-1.05 22.03-.37 26.92 1.42 10.4 3.91 18.3 11.41 35.99 7.54 17.72 13.29 32.55 15.93 40.91 2.43 7.69 3.63 12.24 6.52 24.46 6.55 27.75 8.61 34.73 17.53 59.22 1.05 2.86 2.49 6.95 3.23 9.07s1.97 5.57 2.71 7.69c2.92 8.24 7.6 22.86 8.8 27.53.28 1.08.18 1.94-.77 5.84-3.23 13.75-4.09 19.72-4.58 32.15-.22 5.48-.43 9.26-.65 11.01-.15 1.26-.31 1.45-2.98 3.41-1.57 1.14-4.71 3.35-7.01 4.89-10.43 7.08-17.69 14.21-23.41 22.98-5.04 7.72-8.15 15.63-9.94 25.22-.74 3.88-4.03 13.38-6.55 18.92-.49 1.11-2.15 4.71-3.69 8-2.74 5.97-4.21 9.47-6.37 15.07-1.94 5.08-6.03 16.06-6.98 18.76-6.34 18.03-8.09 22.49-11.94 30.3-3.66 7.41-6.89 11.23-9.47 11.23-.62 0-2.03-.28-3.14-.65-2.95-.92-5.35-1.05-8.06-.46-6.8 1.51-11.69 5.91-13.9 12.52-1.54 4.55-2.09 12.67-1.38 20.12 1.14 11.63 1.38 14.27 1.63 17.23.18 1.94.37 5.78.65 12.21.37 9.63.49 11.87.62 13.47.22 2.8.68 11.1.92 16.92.49 11.17 2.15 18.76 5.26 24.15.8 1.35 2.03 3.51 2.77 4.77.71 1.26 1.85 2.92 2.46 3.66 1.94 2.21 4.71 3.08 6.71 2.03.46-.25.92-.46.98-.46s.28.62.46 1.38c.46 1.88 1.91 3.78 3.26 4.34 1.14.49 2.4.37 3.81-.37.8-.4.83-.37 1.38.89 1.81 4.15 4.43 5.63 7.87 4.4 1.08-.4 1.17-.37 1.6.28.77 1.14 3.08 2.09 4.55 1.88 1.66-.28 2.86-.92 3.66-2l.65-.86 1.42.43c2.89.89 6.43 0 8.18-2.06.62-.77.8-1.29.8-2.43 0-1.66-.68-3.41-3.85-10-1.94-4.09-3.29-7.57-3.69-9.57-.09-.52-.31-3.57-.46-6.77-.31-5.69-.86-10.24-1.72-14.3-.95-4.31-1.08-5.17-1.17-8-.22-6.18.52-14.77 1.97-22.46 1.11-6 1.17-6.28 1.57-9.97.71-6.86 1.66-10.46 4.28-16.18 3.69-8.15 7.11-15.84 8.46-19.07 4.68-11.23 7.44-15.81 20.55-34.3 6.95-9.81 12.98-18.03 18.36-25.07 3.91-5.11 7.17-9.23 7.26-9.14.37.37.74 7.29.89 16.67.09 5.91.22 13.1.31 16 .09 2.86.22 8.55.34 12.61.09 4.06.25 7.57.31 7.81s.15 5.08.15 10.77c0 22.73-1.48 32.51-5.75 37.74-.71.89-1.91 1.72-3.88 2.74-5.48 2.83-8 4.95-10.15 8.49-2.89 4.77-3.63 10.67-2 15.6 2.55 7.63 6.95 14.4 15.29 23.44 8.12 8.83 11.6 13.57 14.37 19.63 1.48 3.26 2.52 6.28 4.55 13.29 3.01 10.46 5.32 16.73 7.6 20.52 1.45 2.46 5.78 6.92 8.15 8.4 2.61 1.66 4.06 2.15 6.37 2.15 1.69 0 2.31.18 5.57 1.81 2.03.98 4.25 1.97 4.92 2.15 3.01.83 8.52.09 10.98-1.48 1.14-.74 1.72-.89 3.35-.89 2.37 0 3.48-.4 4.8-1.66 1.11-1.08 2.43-4.46 2.12-5.41-.12-.34-.74-1.02-1.42-1.57s-1.23-1.23-1.23-1.54-.34-.83-.71-1.23c-.65-.55-.71-.89-.58-2.15.12-1.35.06-1.57-.68-2.03-.43-.28-1.26-1.17-1.81-1.97-.58-.77-2.15-2.61-3.51-4.09s-2.65-3.14-2.86-3.69c-1.51-3.78-4.64-10.4-6.09-12.86-4.61-7.78-5.84-10.55-8.24-18.58-1.94-6.58-5.69-22.61-6.89-29.56-1.02-5.97-1.17-9.91-1.08-25.69.06-13.2.18-16.49.92-22.24.06-.65.28-2.4.46-3.85.18-1.48.4-3.01.46-3.45s.49-3.05.92-5.84 1.32-7.91 2-11.38c.65-3.48 1.26-6.86 1.38-7.54.25-1.6 3.45-16.98 4-19.38.22-1.02.65-2.74.89-3.85s2.06-8.49 4.03-16.43c7.17-28.92 10.77-47.62 12.18-63.09.43-4.74.52-16.73.18-22.67l-.22-4.21 2.25-3.01c1.23-1.66 3.08-4.18 4.06-5.63s2.71-3.88 3.81-5.44c6.8-9.47 10.34-15.81 11.38-20.43.58-2.49.37-6.12-.58-10.92-1.29-6.34-1.45-7.38-2.15-14.92-.86-9.47-1.32-13.72-2-19.13-.09-.62-.22-1.66-.31-2.31-.28-2.31-2.03-15.63-2.15-16.36-.52-3.48-.55-3.29 1.81-10.15 5.72-16.61 8.43-24.58 8.89-26.15 5.23-17.96 6.46-22.52 10.21-37.37 5.11-20.24 8.21-34.08 11.2-50.08 4.8-25.53 5.57-39.47 3.41-60.69-.34-3.26-.68-6.37-.77-6.92-.18-1.17-1.94-15.66-2.15-17.81-.06-.77-.28-2.83-.46-4.61s-.4-3.66-.49-4.15c-.09-.52-.25-3.91-.34-7.54-.22-8.46.09-11.32 2.98-27.69.55-3.05.65-4.58.52-7.38-.18-4.12-.58-5.81-2.71-10.89-.86-2.03-1.91-4.55-2.34-5.57-.58-1.48-.8-2.71-1.02-6.06-.4-5.88-1.32-9.54-3.2-12.49-.95-1.51-1.23-4.12-.8-7.14.62-4.31.71-7.72.31-11.2-.37-3.26-.34-3.57.4-7.41.77-3.91.89-4.18 4.8-12 4.43-8.83 5.6-12 7.17-19.66.8-3.81.98-5.35.98-8.49v-3.85l1.02 2.15c3.38 7.2 4.06 10.31 5.32 23.53.77 8.12 1.51 12.43 3.23 19.38.74 2.95 1.69 7.32 2.15 9.69s2.12 10.8 3.72 18.76c2.61 13.04 3.69 18.86 4.31 23.38.09.83.25 1.81.31 2.15.37 2.03 1.2 10.49 1.81 18.3.34 4.4.4 11.23.15 13.84-.31 2.89-1.48 8.95-2.61 13.66-.89 3.51-1.69 5.23-4.71 9.84-3.23 4.95-4.09 7.57-7.17 21.72-.34 1.6-.68 3.2-.77 3.54s-.28 2.21-.46 4.15c-.65 7.41-1.26 11.35-2.58 16-1.51 5.38-1.97 7.57-2.18 10.46-.31 4.09-.28 5.94.18 6.77.77 1.42 4.31 2.03 6.15 1.08 3.08-1.6 5.78-8.27 5.88-14.52.03-1.72.03-1.69.55 1.29.52 3.05.52 3.11-.15 6.46-2.28 11.14-2.03 10.46-5.63 15.57-1.42 1.97-2.49 3.14-3.72 3.97-2.15 1.48-3.57 3.05-4.49 5.04-.92 1.97-.95 3.81-.12 4.89l.65.8-.65 1.38c-1.17 2.58-.52 5.17 1.48 6l.95.4 5.32-4.95c3.41-3.17 6.18-5.44 7.63-6.31 1.6-.95 3.41-2.49 5.84-4.95 1.94-1.97 4.34-4.21 5.29-4.98 2.03-1.63 3.05-3.38 3.78-6.71.28-1.2 1.66-5.57 3.08-9.72 2.74-8.06 3.66-12.21 4-18.27.25-4.12.62-6.71 1.85-12.92 1.26-6.43 2.03-12.3 2.58-20.46.22-2.89.4-3.57 1.6-6.31l1.35-3.08-.09-9.35c-.06-5.17-.15-9.87-.25-10.46-.43-3.6-.49-40.88-.09-62.48.46-26.61.46-31.31-.03-38.7-.77-11.17-1.85-15.04-7.47-26.45-2.34-4.74-4.55-9.81-5.88-13.44-4.74-13.07-6.43-17.23-11.35-28.18-1.26-2.8-3.48-8.4-4.92-12.46-3.23-9.17-3.17-8.95-3.6-12.18-.18-1.48-.62-3.75-.95-5.08s-.95-4.06-1.38-6.06c-.83-3.88-1.69-5.97-3.17-7.63-.77-.89-1.02-1.66-1.69-5.17-.43-2.28-1.08-6.09-1.42-8.46-2.15-14.86-3.72-23.56-5.29-29.19-4.09-14.83-11.17-23.5-22.46-27.44-4.37-1.54-5.17-1.63-22.89-2.74-8.09-.52-9.75-.83-12.43-2.46-.92-.55-2.46-1.32-3.38-1.69-3.78-1.48-6.18-4.25-7.38-8.52-.34-1.14-.62-2.15-.62-2.25 0-.28 1.38-.22 1.57.09.18.28.28.09 1.66-3.63.46-1.2.92-2.43 1.08-2.77.46-1.02 1.54-4.52 1.54-4.98 0-.25.62-1.6 1.38-3.01l1.42-2.58-.34-3.17c-.34-3.45-1.48-6.43-2.52-6.58-.31-.03-1.42.12-2.46.34-1.08.22-2.03.34-2.15.25-.15-.06-.25-1.2-.25-2.49 0-2.58-.43-4.55-1.14-5.35-.65-.74-.28-6.15.52-7.47.86-1.45 3.23-6.86 4.74-10.83 1.63-4.25 2.74-8.15 3.38-11.78.43-2.43 1.42-9.81 1.42-10.67 0-.22.22-.31.52-.18.37.15.43.09.25-.25-.25-.37-.18-.37.28 0 .4.34.62.34.86.09.28-.28.18-.55-.34-1.11l-.68-.71.77.12c.65.12.74.06.58-.52-.18-.71 0-.71 1.69-.09.18.09.37 0 .37-.18s.18-.25.43-.15c.83.31.8-.43-.03-1.11-1.08-.86-1.91-2.25-2.09-3.54-.12-.98-.09-1.02.8-.92.77.12.89.06.58-.31-.28-.34-.22-.37.31-.25.37.09.58.34.49.58-.09.22 0 .49.22.62s.28.12.15-.03c-.12-.12-.09-.46.06-.77.22-.43 0-.86-1.08-2.03-1.11-1.23-1.32-1.66-1.2-2.43.09-.74.09-.8-.15-.31-.25.58-.28.58-.46-.15-.83-3.54-.98-6.34-.49-8.4.18-.71.52-2.74.77-4.52.43-3.11.43-2.28.03 2.61-.15 1.69-.12 1.66.28-.58.25-1.32.52-2.49.62-2.58.12-.12.15 2.37.09 5.54-.06 3.14 0 5.66.15 5.57.12-.06.22-1.57.22-3.32s.12-3.29.31-3.38c.18-.12.31 1.17.34 3.6.03 2.21.12 3.48.28 3.01.18-.71.25-.68.43.46.43 2.28.8 3.38 1.42 4.4.68 1.11 1.48 1.08.89-.03-.22-.4.25-.09 1.14.74 1.97 1.85 4.37 3.23 4.8 2.8.22-.22-.28-.71-1.54-1.57-1.05-.68-1.97-1.42-2.09-1.6-.15-.25-.09-.28.18-.12.43.28 1.26.43 3.32.68 1.38.15 1.75-.25.71-.8-.77-.43-2.15-2.92-2.31-4.15-.06-.52-.28-1.35-.46-1.85-.25-.62-.25-1.02-.06-1.2.22-.22.37-.15.49.18.09.28.22.77.34 1.05.12.43.22.43.4.12s.31-.28.43.12c.12.28.09.4-.09.31-.43-.28-.37.22.12.83.46.65 1.6.77 1.23.18-.4-.65-.37-1.51.03-1.17.22.15.46.22.55.09.12-.09.22 0 .25.25s.12.09.25-.34c.15-.43.12-1.02-.03-1.32-.31-.62-.15-.65.65-.15.46.28.68.25 1.05-.12.43-.4.4-.52-.12-.95-.71-.62-.8-1.6-.12-1.32.71.25.55-.28-.22-.86-.4-.28-.52-.43-.31-.34.68.34 2.21.43 2.21.15 0-.12-.18-.34-.37-.4-.22-.09-.06-.18.34-.18.71-.03.74-.06.18-.65-.52-.58-.52-.62 0-.62.43 0 .46-.09.18-.43-.58-.68.22-.95.92-.31.52.49.58.49.58.03 0-.31.15-.52.34-.52.25 0 .22-.15-.03-.46-.52-.65-.12-.98.62-.52.77.46 1.17.49.71.03-.18-.18-.28-.55-.18-.77.09-.25 0-.43-.22-.43-.18 0-.28-.12-.15-.28.09-.15 0-.4-.15-.49-.18-.12-.31-.65-.25-1.17.06-.77-.06-1.05-.62-1.32-.95-.49-1.66-1.2-.89-.95.86.31.58-.03-.46-.58-1.14-.55-3.32-2.55-3.32-3.01 0-.18.15-.15.37.06s.58.37.83.37c.28 0-.06-.34-.71-.77-1.38-.83-1.97-1.66-1.45-1.97.18-.12-.03-.43-.58-.77-.95-.55-1.97-2.28-2.92-5.01-.31-.86-.71-1.57-.86-1.54-.4.09-2.06-4.15-2.37-6.06-.43-2.58-3.23-12.03-4.74-16-.77-2-1.42-3.81-1.42-4 0-.46 1.32 2.43 2.18 4.74.37 1.02.8 1.94.92 2.03.31.18-.55-2.8-1.14-3.94-.52-.98-.55-1.26-.12-1.02.18.09.22-.03.12-.28-.09-.28-.34-.4-.52-.28-.18.09-.22.03-.09-.18.12-.18-.18-1.11-.71-2.06-1.26-2.18-2.55-5.11-2.18-4.89.15.09.86 1.14 1.57 2.31.71 1.2 1.32 2.15 1.38 2.15s-.31-.86-.86-1.94c-.55-1.05-1.02-2.06-1.02-2.21 0-.18-.74-1.42-1.6-2.74-1.57-2.34-1.97-3.2-1.35-2.8.46.28 3.11 4.64 3.26 5.32.12.74 1.45 2.83 1.78 2.83.12 0-.12-.62-.58-1.38-.43-.77-.74-1.48-.65-1.57s.31.12.52.46c.18.37.46.65.65.65.15 0-.25-.74-.89-1.63-.68-.86-2.37-3.48-3.78-5.75-1.51-2.46-3.81-5.63-5.69-7.81-1.75-2.03-3.11-3.75-3.05-3.88.15-.25-3.26-3.69-3.63-3.66-.15.03-1.35-.89-2.68-2-2.52-2.09-7.63-5.72-8.09-5.72-.12 0-.15.18-.03.37.12.25.09.31-.06.15s-.28-.43-.28-.58c0-.43-4.52-2.71-7.54-3.81-1.26-.46-2.34-.86-2.4-.89-.03-.06.68-1.29 1.63-2.8 6.43-10.18 10.31-22.64 10.31-33.19 0-5.57-.58-8.71-3.41-18.73-.68-2.37-1.26-4.58-1.32-4.92-.06-.37-.49-1.97-.92-3.57-1.17-4.28-1.6-5.81-2.95-10.92-1.23-4.55-2.06-6.92-2.43-6.92-.09 0-.34.18-.49.4Zm-28.24 78.23c-.09.09-.37.12-.58.03-.25-.09-.15-.18.18-.18.34-.03.52.06.4.15Zm-4.92 1.23c-.09.09-.37.12-.58.03-.25-.09-.15-.18.18-.18.34-.03.52.06.4.15Zm8.62.3c-.09.09-.37.12-.58.03-.25-.09-.15-.18.18-.18.34-.03.52.06.4.15Zm-11.14 2.28c-.83.37-1.32.37-.77 0 .25-.15.68-.28.92-.28.31 0 .25.09-.15.28Zm19.84 1.54c.37.25.31.31-.31.28-.43-.03-1.11-.15-1.54-.28-.71-.22-.68-.25.31-.28.58 0 1.29.12 1.54.28Zm23.53.92c.09.18-.03.22-.28.12-.55-.22-.65-.43-.22-.43.18 0 .4.12.49.31Zm4.25 3.48c1.2 1.05.52.77-1.17-.49-1.75-1.32-2-1.63-.83-.95.58.31 1.48.98 2 1.45Zm4.15 2c.46.4.03.18-.92-.43-.98-.62-1.78-1.2-1.78-1.26 0-.22 1.78.89 2.71 1.69Zm.37 1.44c.22.28-.31.06-1.17-.49-.89-.52-1.6-1.05-1.6-1.11 0-.25 2.37 1.14 2.77 1.6Zm2.09 2.52c1.05.74 1.91 1.42 1.91 1.51 0 .18-.12.12-2.31-1.29-1.48-.92-3.17-2.49-2-1.81.25.12 1.32.86 2.4 1.6Zm3.91 1.33c.31.34.49.62.4.62s-.4-.28-.71-.62-.49-.62-.4-.62.4.28.71.62Zm-1.39 2c.4.43.65.77.55.77-.06 0-.46-.34-.86-.77s-.65-.77-.55-.77c.06 0 .46.34.86.77Zm.62 1.84c0-.12.22-.06.46.15s.37.52.25.71c-.09.15-.06.22.12.12.34-.22 2.43 1.88 3.48 3.48.65 1.02.58.98-.68-.31-.77-.77-1.88-1.75-2.49-2.21-.58-.49-1.42-1.32-1.78-1.85q-.71-1.02-.03-.43c.37.34.68.49.68.34Zm2.55 3.6c.25.4 1.17 1.45 2.03 2.37.86.89 1.48 1.78 1.35 1.97-.22.34-3.66-3.29-4.55-4.8-.52-.86-.52-.89.06-.55.34.15.83.62 1.11 1.02Zm7.14 9.01c.46.83.71 1.38.52 1.23-.62-.62-3.14-4.49-3.14-4.86 0-.43 1.48 1.63 2.61 3.63Zm.34 2.83c2.55 4.12 3.91 6.55 3.75 6.74-.09.06-.8-1.02-1.6-2.4-.8-1.42-2.15-3.6-2.95-4.86-.83-1.26-1.78-2.8-2.15-3.38l-.62-1.08.86.98c.46.52 1.69 2.34 2.71 4Zm-108.13-1.66c-.31.28-.34.25-.15-.18.09-.31.28-.46.37-.37s0 .34-.22.55Zm110.83 3.51c.28.55.43 1.02.37 1.02-.18 0-1.11-1.69-1.11-2.03s.15-.09.74 1.02Zm-111.94.89c-.52 1.72-.92 2.21-.62.74.34-1.72.49-2.15.77-2.15.15 0 .09.65-.15 1.42Zm-3.13 2.96c-.09.74-.31 1.54-.46 1.78-.18.31-.22.03-.09-.77.37-2.4.83-3.26.55-1.02Zm-1.57 15.31-.28 4.77-.06-5.11c0-2.8.06-5.78.22-6.61l.22-1.51.09 1.85c.03 1.02-.06 4-.18 6.61Zm2.4-2.64c0 2.77-.18 2.52-.43-.58-.15-1.72-.12-2.34.09-2 .18.25.34 1.42.34 2.58Zm-1.26 6.98c.25 1.88.28 1.91.34.58l.06-1.38.4 1.69c.22.92.62 3.57.89 5.84.62 5.35 1.14 8.98 1.32 8.83.06-.09-.09-1.88-.37-4-.25-2.12-.46-4.12-.43-4.43.03-1.14.49.62.86 3.29.55 3.97.95 5.84 1.63 7.69.34.92.8 3.2 1.05 5.08.25 1.85.52 3.97.62 4.68.12.74.12 1.32.03 1.32-.18 0-.89-2.25-2.21-7.08-1.38-5.08-2.21-7.78-3.05-10.15-1.05-2.95-.83-1.69.4 2.49.52 1.78 1.05 3.91 1.14 4.71.12.77.31 1.42.43 1.42.34 0 .55.68 1.23 3.81.34 1.54.71 3.14.8 3.57.31 1.42-.49.18-.95-1.42-.25-.83-1.26-3.94-2.31-6.89-2.06-5.97-2.03-5.69-2.34-17.38-.12-5.04.03-5.72.46-2.28Zm.24-1.2c-.09.22-.15.06-.15-.37s.06-.58.15-.4c.06.22.06.58 0 .77Zm122.77 5.57c.95 2.28 1.48 4.21 1.17 4.21-.43 0-1.72-2.46-2.03-3.85-.15-.86-.4-1.88-.46-2.25-.34-1.38.4-.37 1.32 1.88Zm1.6 6.52c0 .25-.06.46-.12.46s-.18-.22-.31-.46c-.09-.25-.03-.46.12-.46.18 0 .31.22.31.46Zm-117.38 7.05c.28 1.32.46 2.49.37 2.55-.18.18-.74-1.63-.95-3.14-.09-.68-.25-1.57-.34-2-.34-1.94.49.34.92 2.58Zm113.35.18c.03.4 0 .4-.28 0-.15-.25-.28-.74-.28-1.08v-.62l.28.62c.15.34.28.83.28 1.08Zm8.64 1.23c.18.34.25.62.18.62-.09 0-.31-.28-.49-.62s-.25-.62-.18-.62c.09 0 .31.28.49.62Zm-121.07 4.46c.15.68.12.8-.12.46-.15-.25-.31-.74-.31-1.05 0-.8.18-.55.43.58Zm113.05 4.31c0 1.02-.12 2.12-.28 2.46-.15.37-.22-.28-.12-1.69.06-1.6.03-2.03-.15-1.38-.25.89-.28.89-.31-.34 0-.71.06-1.75.18-2.31l.22-1.05.22 1.23c.15.68.25 2.06.25 3.08Zm11.9-.25c-.18.22-1.72-.49-1.72-.8 0-.15-.09-.55-.22-.86-.12-.34.22-.18.92.49.62.58 1.08 1.11 1.02 1.17Zm-126.09.31c-.09.31-.15.12-.15-.37 0-.52.06-.74.15-.55.06.22.06.65 0 .92Zm116.19 4.21c.12 2.34.43 4.83.68 5.51.46 1.29.37 1.91-.12.92-.4-.77-1.54-5.75-1.75-7.72-.18-1.78.4-4.58.8-3.57.09.34.31 2.49.4 4.86Zm-114.99-.27c.28 2-.03 1.69-.43-.4-.15-.92-.18-1.54-.03-1.38s.37.95.46 1.78Zm-.98-.1c.12.86.06 1.51-.12 1.63s-.31-.46-.31-1.57c0-2.06.15-2.09.43-.06Zm113.6.93c-.09.25-.18.15-.18-.18-.03-.34.06-.52.15-.4.09.09.12.37.03.58Zm-112.01 16.18q-.55.49-.18-.18c.18-.4.43-.65.55-.55.09.12-.06.43-.37.74Zm2.28 4.4c-.22.34-.43.55-.52.46s0-.37.22-.65c.55-.65.71-.58.31.18Zm16.37 10.79c.06.77-2.15 5.04-2.43 4.74-.09-.09-.03-.55.15-1.02.22-.46.49-1.51.68-2.28.15-.8.43-1.81.62-2.31.31-.77.4-.83.65-.37.15.28.31.83.34 1.23Zm79.91 56.39c0 .37-.15 1.48-.37 2.49-.31 1.51-.4 1.69-.58 1.05-.12-.43-.22-1.78-.25-3.05-.03-2.25-.03-2.28.58-1.72.34.31.62.86.62 1.23ZM362.09 169.73c0 .68.06.92.12.52.06-.37.06-.92 0-1.23-.09-.28-.15.03-.12.71Zm.3 2.77c0 .68.06.92.12.52.06-.37.06-.92 0-1.23-.09-.28-.15.03-.12.71Zm52.76-69.77c.22.09.49.06.58-.03.12-.09-.06-.18-.4-.15-.34 0-.43.09-.18.18Zm-1.85.31c.18.06.55.06.77 0 .18-.09.03-.15-.4-.15s-.58.06-.37.15Zm-1.53.31c.22.09.49.06.58-.03.12-.09-.06-.18-.4-.15-.34 0-.43.09-.18.18Zm-1.23.31c.22.09.49.06.58-.03.12-.09-.06-.18-.4-.15-.34 0-.43.09-.18.18Zm51.58 14.55c.31.34.62.62.71.62s-.09-.28-.4-.62-.62-.62-.71-.62.09.28.4.62Zm-97.39 16.82c-.4.49-.37.52.12.12.28-.22.52-.46.52-.52 0-.25-.25-.09-.65.4Zm116.62 10.25c.18.34.4.62.49.62.06 0 0-.28-.18-.62s-.4-.62-.49-.62c-.06 0 0 .28.18.62Zm.12 2.76c.52.98.98 1.75 1.05 1.69.15-.12-1.42-3.17-1.72-3.35-.15-.09.15.65.68 1.66Zm1.42 8.06c0 .06.43 1.54.92 3.32.58 1.97.86 2.68.77 1.85-.18-1.38-1.32-5.23-1.57-5.23-.06 0-.12.03-.12.06Zm1.57 1.33c.03.58.55 1.57.55 1.08 0-.25-.12-.68-.28-.92s-.28-.34-.28-.15Zm-125.45 12.3c0 .68.06.92.12.52.06-.37.06-.92 0-1.23-.09-.28-.15.03-.12.71Zm.28 2.46c0 .49.06.68.15.37.06-.28.06-.71 0-.92-.09-.18-.15.03-.15.55Zm127.9-.03c0 .25.12.52.28.62.15.12.22-.09.12-.43-.18-.71-.4-.8-.4-.18Zm-128.24 12.8c0 .09.18.77.4 1.54.25.77.46 1.11.46.77 0-.52-.8-2.71-.86-2.31Zm.92 3.57c0 .34.09.43.18.18.09-.22.06-.49-.03-.58-.09-.12-.18.06-.15.4Zm119.39 8.12c0 .58.06.83.15.52.06-.28.06-.77 0-1.08-.09-.28-.15-.03-.15.55Zm2.46 6.46c0 .43.06.58.15.37.06-.18.06-.55 0-.77-.09-.18-.15-.03-.15.4Zm.24 2c0 .95 1.02 3.23 2.12 4.68.46.62.58.68.43.25-.18-.55-.09-.52.65.12.92.86 2.03 1.23 1.38.46-.18-.22-.46-.37-.58-.28-.25.15-3.08-3.32-3.08-3.78 0-.15-.22-.77-.46-1.32l-.43-1.05-.03.92Zm-113.47.33c0 .34.09.43.18.18.09-.22.06-.49-.03-.58-.09-.12-.18.06-.15.4Zm-2.16 2.47c0 .34.09.43.18.18.09-.22.06-.49-.03-.58-.09-.12-.18.06-.15.4Zm118.4-.07c0 .06.25.31.55.52.46.4.49.37.09-.12s-.65-.65-.65-.4Zm-102.68 26.18c0 .49.06.68.15.37.06-.28.06-.71 0-.92-.09-.18-.15.03-.15.55Zm-.06 1.75c0 .58.06.62.31.25.4-.58.4-.92 0-.92-.15 0-.31.31-.31.68Z" vector-effect="non-scaling-stroke"/></svg>
\ No newline at end of file
diff --git a/internal/static/performer/NoName25.png b/internal/static/performer/NoName25.png
deleted file mode 100644
index 1f4864eedb5982c566f0b7d527bd8e35942e1af1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11157
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
U1$Psi2^Dd6aJ4V9J$C7T0m$F0UjP6A

diff --git a/internal/static/performer/NoName25.svg b/internal/static/performer/NoName25.svg
new file mode 100644
index 000000000..ab040b917
--- /dev/null
+++ b/internal/static/performer/NoName25.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 850 1250"><path fill="#fff" d="M466.93 27.82c-15.66 1.45-31.72 10.54-37.85 25.54-18.09 21.05-26.17 48.37-32.01 74.96-3.51 18.38-7.2 37.27-3.34 55.91-3.7 13.66 1.39 26.72 7.6 38.63-13.02 8.59-29.85 5.55-42.96 13.84-9.79 4.43-13.4 14.87-20.36 22.11-6.35 20.73-11.87 41.76-18.5 62.45-7.46 21.41 3.67 42.53 6.74 63.63 7.84 21.04-2.12 42.36-1.76 64.16.16 32.55 4.66 64.86 6.74 97.29-.27 26.6 7.69 52.2 12.32 78.16-.26 18.72-.7 37.49-1.64 56.22 1.23-.14 2.46-.35 3.7-.47-3.48 27.06-6.11 54.21-9.09 81.32-4.73 25.18-11.31 50.08-19.74 74.27-8.56 20.74-22.31 38.88-30.68 59.72-13.22 33.46-15.81 69.73-22.16 104.84-5.68 29.43-7.3 60.89-23.34 87.1-4.25 5.87-.84 13.29-3.54 19.54-8.58 26.56-9.02 55.48-17.99 81.61v13.23c.81 9.81 10.12 15.05 17.52 19.85h5.79c12.95-4.03 34.45-4.08 35.62-21.49 2.04-47.63-5.97-98.67 16.41-142.82 17.14-33.74 29.84-69.79 50.31-101.79 15.67-27.34 12.89-61.44 30.8-87.59 20-31.1 24.93-68.71 39.95-102.12 11.48-33.02 33.56-61.5 43.42-95.06 4.23-9.51 8.16-19.16 12.31-28.69 10.02.94 20 2.55 30.13 1.91-1 19.68 5.58 38.54 8.77 57.73 9.07 41.46 4.02 84.5 10.94 126.12 13.2 30.31-.18 63.63 8.47 94.86 6.99 23.35 9.13 47.69 13.01 71.66 2.81 22.16 8.22 44.54 4.04 66.91-.9 34.14 3.74 68.19 3.67 102.47-.18 16.93 20.74 17.49 32.94 20.41 18.57.41 29.97-22.83 19.48-37.76-4.01-23.4-9.86-46.53-16.62-69.31.2-6.42 1.84-12.97.09-19.34-5.52-23.95 1.42-48.22 3.97-72.09 3.87-36.03 13.4-72.06 8.63-108.48-3.32-23.5-13.53-46.03-11.62-70.19-1.32-47.99 13.51-94 20.51-141 4.1-15.14 13.32-28.62 17.18-43.88 1.07-12.69 5.47-24.56 6.13-37.26V570.8c-12.08-40.93-15.67-83.8-25.17-125.32-3.82-16.52-17.39-32.79-10.9-49.8.93-19.61 9.87-38.3 8.3-58.05-3.37-20.42-14.29-38.49-20.03-58.23-5.73-22.87-25.09-43.12-49.71-44.28 1.84-11.98-1.38-24.07-.29-36.05 3.29 7.3.67 20.02 6.41 23.63 1.35-7.66 6.67-14.56 11.32-21.07.29-28.94-1.32-59.37-12.24-86.3 2.32-6.49 1.37-14.58-4.76-18.61-2.53-7.63-.45-16.27-2.97-24.07-3.01-13.15-14.46-21.41-21.87-31.94-10.33-7.46-22.97-11.17-35.52-12.88h-6.55Zm67.13 332.15c3.24 11.16 6.31 22.82 9.57 34.14-.09 8.8 1.87 17.82 6.39 25.41 3.01 12.81 2.84 26.15 6.28 38.88.36 1.49-1.45-.19-1.54-.77-3.73-11.87-15.18-19.29-19.05-31.15-6.5-21.7-.75-46.23-1.66-66.52Zm-160.55 46.86c7.07 22.61 19.13 44.72 16.24 69.22-3.26 21.6-2.35 43.68-9.25 64.66-8.87 8.34-13.94 21.36-18.43 30.89-6.84-45.45 12-90.83 8.78-136.64-1.45-9.5.73-18.89 2.65-28.13Z"/></svg>
\ No newline at end of file
diff --git a/internal/static/performer/NoName26.png b/internal/static/performer/NoName26.png
deleted file mode 100644
index b63c47ab51b60f55ec937f541f7fc3b57d6a9d57..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10647
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

diff --git a/internal/static/performer/NoName26.svg b/internal/static/performer/NoName26.svg
new file mode 100644
index 000000000..0c1679e16
--- /dev/null
+++ b/internal/static/performer/NoName26.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 850 1250"><path fill="#fff" d="M428.57 1211.41c-15.97-4.74-23.14-19.26-15.99-32.4 2.06-3.79 2.6-9.28 1.17-12.04-.61-1.17-1.06-3.17-1.01-4.44.05-1.27-.21-2.49-.57-2.72-.39-.24-.51-1.34-.27-2.71.21-1.27.11-3.05-.24-3.96-1.06-2.8-1.97-14.01-1.96-24.15 0-5.31-.28-11.37-.65-13.47-.56-3.24-.48-4.63.57-9.07 1.68-7.12 2.62-13.91 2.51-18.04-.12-4.28.65-10.05 1.48-11.07 3.9-4.82 1.12-118.1-2.9-118.1-1.16 0-1.45.69-2.49 6.08-.65 3.35-2.94 13.96-5.09 23.59-5.26 23.51-5.44 24.97-4.98 40.22.21 7.04.37 15.74.36 19.34s0 10.36.03 15.02c.05 7.49-.13 9.01-1.51 13.1-.86 2.55-1.75 6.74-1.97 9.31-.22 2.57-.82 7.17-1.33 10.22-.51 3.05-.86 6.56-.78 7.8.27 4.35-.08 7.48-.95 8.35-3.56 3.56-4.77 30.15-1.89 41.64 4.71 18.82 1 29.55-12.55 36.34-9.12 4.57-17.93 3.6-28.04-3.09-1.71-1.13-3.47-2.06-3.9-2.06s-.79-.41-.79-.92-.66-1.35-1.46-1.88c-5.62-3.68-7.6-10.09-6.37-20.67.53-4.56.96-8.59.96-8.95s.51-1.17 1.14-1.8c4.16-4.16 12.87-37.25 11.71-44.51-.25-1.56-.13-2.87.3-3.39.39-.47 1.2-3.74 1.81-7.26.61-3.53 1.67-7.96 2.36-9.84.69-1.89 2.12-5.81 3.19-8.72 1.37-3.73 2.14-7.32 2.62-12.17.37-3.78 1.08-8.98 1.56-11.56.49-2.57.89-7.53.89-11.02 0-4.15.24-6.42.7-6.58 2-.67.46-16.42-3.79-38.77-2.14-11.26-3.3-19.22-5.03-34.73-1.82-16.27-2.91-22.75-5.07-30.1-5.58-19-1.11-47.58 10.46-67.02 2.02-3.39 3.78-6.42 3.92-6.75.33-.79 1.37-2.06 2.71-3.33.6-.57 1.09-1.53 1.09-2.14s.39-1.11.87-1.11c2.63 0 3.89-14.99 2.23-26.48-.78-5.37.04-4.93-7.56-4.1-17.01 1.86-20.79 3-25.26 7.63-1.42 1.47-4.23 4.39-6.24 6.48-2.01 2.1-4.08 3.95-4.6 4.11-1.03.33-1.31 15.09-.36 18.99 1.28 5.22-14.51 11.21-18.53 7.03-2.47-2.57-2.64-4.04-2.64-23.02 0-16.94-.11-18.81-1.36-23.4-2.16-7.95-3.59-30.36-4.3-67.39-.25-13.07-.76-22.48-1.56-29.02-6.04-49.28-8.61-86.18-7.43-107.01.37-6.52.91-23.37 1.22-37.44.72-33.68 2.2-43.82 10.13-69.57 6.55-21.28 10.38-29.26 18.43-38.41 4.03-4.59 5.73-7.11 7.41-11.03 1.2-2.79 3.53-7.48 5.18-10.42 7.91-14.05 8.52-16.47 5.95-23.75-3.34-9.49-7.69-30.8-9.35-45.86-1.47-13.36-2.74-19.4-6.52-31.21-5.47-17.05-7.8-30.58-7.33-42.51.33-8.48 1.29-13.05 3.89-18.42l1.59-3.29-.98-8.44c-2.28-19.73-9.25-40.09-16.84-49.24-12.77-15.38-47.66-54.27-55.46-61.83-1.58-1.53-2.87-3.12-2.87-3.52s-.98-1.6-2.18-2.66c-1.2-1.05-2.18-2.18-2.18-2.51s-.91-1.35-2.03-2.28c-1.12-.93-2.17-2.05-2.34-2.49-.36-.92-5.75-7.26-8.27-9.72-.94-.92-1.72-1.86-1.72-2.07s-1.83-2.53-4.06-5.15-4.06-5.11-4.06-5.54-.23-.88-.51-1c-1.77-.72-11.32-18.08-13.49-24.51-5.69-16.86-4.94-24.64 2.92-30.04 14.14-9.71 71.11-3.17 112.74 12.95 17.59 6.81 34.74 11.75 40.81 11.75h3.24l1.46-4.07c17.32-48.29 66.34-72.53 97.12-48.02 2.43 1.94 2.7 2 10.4 2.35 19.71.92 37.2 16.38 42.98 38 1.33 4.96 1.83 5.07 12.3 2.7 61.67-13.92 114.38-12.08 118.74 4.14 1.8 6.68-8.27 28.7-19.37 42.34-2.37 2.92-4.33 5.61-4.34 5.99-.02.38-4.24 4.68-9.39 9.57-5.15 4.89-9.36 9.28-9.36 9.77s-.3.88-.67.88c-.93 0-8.69 6.93-8.69 7.76 0 .37-.88 1.06-1.95 1.54-1.07.48-2.09 1.39-2.26 2.02-.17.64-.65 1.16-1.08 1.16s-3.84 2.9-7.57 6.44-13.39 12.67-21.46 20.28c-20.78 19.62-20.56 18.56-6.24 29.95 4.09 3.25 5.35 4.62 5.51 5.98.12 1.01 1.67 3.55 3.61 5.9 1.88 2.27 3.58 4.84 3.79 5.7s1.6 2.92 3.08 4.58c3.42 3.83 7.32 9.71 11.44 17.26 1.78 3.26 5.39 8.65 8.02 11.98 12.54 15.86 17.47 29.81 15.08 42.71-1.73 9.37-4.18 10.2-5.91 2-1.3-6.16-1.93-7.39-3.74-7.39h-1.58v7.48c0 11.25-3.59 25.6-6.4 25.6-.47 0-1.34 1.02-1.94 2.26-1.46 3.07-1.78 2.42-.97-1.98.48-2.58.48-4.32.02-5.88-.36-1.21-.77-6.71-.91-12.21-.27-10.84-.96-13.52-3.68-14.24-2.79-.75-3.61-.48-3.61 1.17 0 3.92-3.88 15.14-5.61 16.21-1.81 1.12-.63 3.87 2.37 5.5 6.25 3.4 7.08 5.88 4.2 12.52-2.31 5.31-5.09 8.51-7.39 8.51-1.04 0-1.65.43-1.88 1.33-.32 1.22-.63 1.3-3.56.91-2.13-.28-3.51-.18-4.1.31-1.97 1.63-6.02-.21-26.15-11.92-3.09-1.8-10.25-5.67-15.91-8.61-5.66-2.94-10.39-5.57-10.5-5.85-1.86-4.52-3.05-.97-7.63 22.9-4.24 22.09-10.45 38.98-19.97 54.34-7.86 12.67-7.72 18.66.68 27.6 1.67 1.78 5.6 10.18 5.6 11.97 0 2.29 1.65 4.64 5.27 7.52 4.57 3.63 6.75 6.5 19.46 25.56 21.03 31.55 25.76 43.29 32.63 81.12 7.12 39.2 10.71 129.39 7.52 188.76-1.02 18.91-1.14 40.1-.37 63.34.83 24.88-.27 26.73-11.44 19.26-7.37-4.92-10.24-8.38-17.03-20.51-.86-1.54-2.58-4.46-3.81-6.47-1.94-3.19-3.11-5.84-5.99-13.65-.35-.94-1.04-1.72-1.54-1.72s-6.49-2.81-13.32-6.24c-11.23-5.64-15.13-7.13-15.13-5.77 0 1.56-3.5 24.92-5.35 35.72-3.97 23.14-4 28.4-.32 46.37 3.7 18.1 4.71 29.33 3.8 42.52-1.52 22.22-2.51 28.21-6.62 40.41-3.2 9.48-5.25 17.31-9.3 35.43-3.72 16.67-5.36 23.33-9.35 38.06-7.6 28.03-12.97 52.42-11.54 52.42 1.93 0-.53 12.55-2.59 13.23-1.14.38-1.01 11.19.21 17.97.59 3.26 1.52 9.49 2.07 13.85.98 7.79 1.78 11.51 4.87 22.65.86 3.09 1.72 6.35 1.92 7.26.21.93.91 1.78 1.63 1.97 1.14.3 1.23.66.87 3.71-.41 3.5.73 7.03 2.64 8.15.47.27.85.78.85 1.12 0 1.14 2.79 4.42 4.52 5.32 3.89 2.02 6.29 16.46 3.71 22.26-4.52 10.14-25.41 18.44-37.43 14.87ZM344.01 173.48c-.17-1.46-.66-5-1.09-7.87-.85-5.73.62-16.09 3.23-22.73 1.59-4.05 1.57-8.62-.05-9.78-.82-.59-1.35-1.96-1.63-4.19-.39-3.14-.51-3.32-2.21-3.32-.99 0-1.8-.26-1.8-.57 0-1.89-18.59-5.86-30.89-6.59-10.21-.61-25.75-2.08-29.57-2.81-4.04-.77-6.93-.82-6.93-.13 0 1.9 31.79 37.56 33.49 37.56.4 0 .82.26.94.58.17.46 8.3 5.39 21.74 13.19.86.5 1.78 1.26 2.06 1.68.27.43.74.78 1.03.78s1.52.87 2.72 1.93c1.95 1.73 7.38 4.75 8.76 4.88.29.03.39-1.14.21-2.6Zm197.11-24.57c5.81-5.02 12.34-10.71 14.51-12.64 6.18-5.48 6.59-5.84 10-8.71 1.77-1.49 3.21-3.06 3.21-3.49 0-1.15-46.77-2.47-47.88-1.35-.92.92 4.43 26.58 5.55 26.58.29 0 .53.98.53 2.18 0 1.53.28 2.18.94 2.18s.94.66.94 2.18c0 3.37.82 2.9 12.21-6.95Z"/></svg>
\ No newline at end of file
diff --git a/internal/static/performer/NoName27.png b/internal/static/performer/NoName27.png
deleted file mode 100644
index eb57d9cf45767c8174de81fe76a8202edec4fa96..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11884
zcmbVydpuOz|97RUlFBX0Z6-8RQm(n@GVGaLw;57O7ncli+(UGg5N5^<xkPEB8AWk)
z6Haxy5l##uaUx`da?SnuOy~D}pYwX2-}C(Oyk5-Sd+oK>{;bdXtoP^r`K%T1U}r5R
zDkr*R$r3R#Vu>zUA_D)*yH|@qNgM}Pzhuc$9S0jKNrA9Oe*11kqSh9bo&WiR!vEa=
zf83~Q8UNo}>F;;_&#Qm#|6TIWtACgL=N@kU{r8`m|5W(*tN%v{wEEv_{<n|+k81zC
zdfT!h9`v~M_<n24C0AC+Bk-{1H^en~$&$4a!vCd9GP5^B;i?d_EooKnYLS(OV#Crq
zppnuNvZWdIbo<aJa<ZW2$;!Xf_DIXETe4=k@dk5k#uCSn8w1ngpFfo)28S`p7v|&S
zkCl{!Ctlwhe?T_&*3W9@mF0blXI9{lcqNq!>?^{b)hO=QkFe;!DIbmOOBFO-EvZt(
zzFf}^YnEv{6}=yM>+3pFl&(2JQ&w^B(=6_M^IqmM+vx56NW-4Q5-~#jsHGG-+V<1O
zjpPwtm3<}y5i^PNl*;B#@53%<H9ev*KXtey@;3x?8%c^A2se(Gjf>%RZo3un+ooAe
zIfqHw%(a4j^xYZGr#!k7t>~NEoQEtM#0j?4ll4`;*kwlGp}ed43_0^+TGWqI_~yks
z2PJ!7N}}@(rRJi9_}V<Wj_P}+AYzhMdp}EokY{rXuQHv$<8emhxm8{+p{%R`1#XNN
z8Y<bpUAeiogIC}ER0fN@=G1(wrRppena*q4du187%Ck$IkT}l}xYpC4_f2UQ{ds;?
zmNol`d$nGkqXv}LoM#s+qH+X7V+JdwwDuy~OO%`AkrTgt?MbG9{OU2I(MGvB(TIpK
zSe<pYO0n$6Yv8sz_zuII(j8O+zccy_b5X8>M=s}f>@qXncbic<_HBs7`+jG~ya|Rq
z6d|l?z|kUK$q_KDT7*zItxP*zoDt8f_qP<v@oZ?XIO!sl89{A(rM&`G@ygI3j7cJ#
zYtdDC9eZQhH`!LA1WX%6-tI;STQEi=qO1a4d2GO*vf;ab9pGG&L~pk3ki!_Fb!KfK
zp_eFutL-GLudlX-fIZDHr)aA7>RLiu8|7H)tNRz0L5EI=m~mn@S^w-h?r15zP+_)t
z*b1<749#l^?+#2uKRJr%i+XimRAR*?wiiV!mVd9THj}+&BeT&a<HkPv-}-~o$|^VC
zMy`k*n`01nN7aFTGXq~?!wIVhPLfA#m379qPRub_H?^ID^Dk1*XMBbFO#K1)wHTNt
zY!wP@JMfRd7$|b3d5yLKintmiN}`c5$Qty5B&yRrqbsaO0)eO=VKu7=*t!DHHvwBt
zFcalYl{xN1ls#+2xn|xOI)v6q9L;UC>e-2#=NLrwLt_%i+jA?OgpC;H^bZm6sda@J
zs1d?RmjZnr%_IoLa>d88FL}jDqMD52+)^{%n{1H9ylkH+LDsU>{;g7e27FF7Y1nSm
zf^zw<vEZg9Xuemb8uu>CjQ7{Ov2CF=O=Mu2)OYhJ!<?vTz2YL3E9*_B=N)Abb^3Rb
zlcd(6`KnFo3Zg5yXt1!?Kjtn4nZXDcth1%?9B-4eYQ|MBk)4wpS_Y#=-tJrJG;C(c
z>u?(y-bab-8f*Gt!TbBmqoB#+0}P^`%t$_iRW&syDT=Cir-05g#88CX5EWCioSRn$
zvJQl5l{;)hIM>Num~+B%LLJqkg#s7$1cHzs)UikR!DLFJtN^Y2y<id~FYZ5=0&RxC
zEKL<=EJxR=W*L{I*%e*#u*bB*#SmnDIQG#h`A4r>SyRuWn!elHTs|v#{vnxJ7G%z2
zo4C^~?I@yLP0bw^?3<Ektj9rR(6!%Y_{>WW$E(|GnGB+G&v8qdOnxkNfh(HuB8ypL
zGRCr$r6_ZvTVOWGZppuX>to|Hw`*dh^`*NVn=LYwIl<ET@uiC!xObceL;3F<L<!S-
zb#_dM5U?*7-}$--gcIrhxaCgMqFdJcPX!U_VM-idddd~miHfUBT?zWwsLgz<W4~j1
zf!_d$*r2`FX!7UKsykw!!^P2>!P|8wwPHq#C$37Oqgp*KgTv$GR$rklL`G~K7pd<Z
zS@fK>bAp2ThW#bC3QQLoK6)QoVtBIf8_Swl@pRlk(0{%-u7AjKHjXGSrG#emmbW_g
zj8s;<b~#+qG9{8_VNEQ1YGSW<{kpqs-JOrdtNU)OX4Vi>B_)<Sl}R9CIu(-TGsmBc
zb8mX(9u+@Y8~&4MiD^>io;TN3^|q~X*{|Ge>bO`gDgP}qlW2tnk^c^vdZ@mCFuK`n
zYv)z!E`3_%8)q_(W8E^p!82?b*G97l%=Zc)gHiBc(su91N+dR^4B5yz_4F&LW^c`;
z1$Lz-XoIKIDm3EDdvQlCm3XSceXnJN_;*hg^NJ~(xHgUAj?TGw64j%lE>Y64lcY>y
z)1r~LO>R**LBV!r%`*NYAqZ`ZpjIZdnP5-qo(f!tYb3e5f`_xV1LPUhRhd&53H!mb
zAREB~ER|y=9if5ce8m1MO3i3rv{dh-HJHKM`+@-WE_BHI{Rzh~7-ysct@?y^EL)Y*
zD$YF~T(ok-%d6Bw8MGHySXR8)4#h<J?uhLH7_0Aqn0ntlgOWi%7ihN$wH%mJrdfrF
zsN|2uv8{*({#*7D%?d<R^KY6{@KV=r$(^J6>C#qkl%&$5RlJ**5az2s+@UVVE|fkW
zh_VwbL*=-CeK3QC)KZA&9DblQzv<y|eDhx4<d`~}q<y?&yEg9u=<$-A&q*{m&vqti
zZ{aK>oFI(FAfBoE=4W4pxnpuGZdP|+@WU7hNlEdD&YMe0FN6rI8>Pevc(vT8fT5Y>
zPcr~e%Y;=g=PxZ-frbWmTWiI#2jag3{-KEKXywC`q@((mf*>Ut{=t4|lkje7cEgDt
zNwlw_?iRlJR9FY#r_{AAI`%y$Ww6fLm2v>MD^Wz5<9jFbr{=C4b3xLFx}ppKq52UE
zQSO`5uLn<QparTst*wb4cb<GdW<lKT?F=Bbd-6wB_Qm!K?DJF)1^Qal{k7o{z)F(W
znuKSP==u98G6W14T)3Qo*?`BR7XL_Y-D!X_1ONO`q0iMujNeLa)POND1lsH0SPIBb
zd!kK;Ei46Nr(gR{FGra_k{{ZI5!a)+e;Rfk4E(YaL|~Znl1{${Txb5%`3Xf06p=;1
z8$E!|qu_HV?)%N#&=j$SgqNjarRZ7cKH;kGN4Nm^uP_Hksp+D#njpe`<404*)?v6?
zE0sN!z`6#yCmlfX@8rNQYYIKF+X<LUg!C%^N1c{)5~Fb_@hYthnU|?mT^2-50srZm
za*4{?dkTjOms&$eVy`j9&_9D*g<eKs75GS@?%c}qmx53|`BWs0z6qU)W(Kapp-8OP
zT~(0TqYuis$ldi`Y7DvG@=A=hivRxEDU~t9wDqeqND&J0$j@3hx&zW8IX@hPZ~k~G
zQIu;MtY_qCsI!Kv7@w6h8z2{PZmp&>^z|(DYxP2g$@&z&1<9P4#t%@_SohniG{cpQ
z1eH)k$3)BUJbwdOJvFHT6!}!!^j$BDe&(_ydNG@1uh)BC5*7J2ZEGd`pxgY}s|?=O
zE6G&;QF?aB@v0j(R6Mq@e||{5X(OumG|ht2P~v5myYS~Td9kniLa-RyO5eyS`<U*a
zlbBzswV;(BsZ~MIHq!bW$KM?l)3CTxk!eo<E8@@}F8%vV09v$~e|qvY^p$}QjJ1S3
zUl`2Qvlb=P@rxpQvF@AdB=_59$UL*veVaULdzzhHCU=Ri7!j&JQ?xc<rIjFWrSgRL
zD-GK9^oJM4ukx){m<t*@PE_cL;6okGGiG+UD@abZT=x(<A<~y@X#n>!t>cAj)Owlb
zyoavQjr*>5E()<^@yp05g{DYv6I?9&OvBvI6M>B}5k}36dtPkn)s4Vd-UqM_Rj`Ab
zfmuc{Z?EJ<fF^_i@A<_Y7@Pj<YR<C`e7!_CvAm~DSUAI*_W`APbYcksGY@v@gf`E`
z|Bp7rvK1S|7KZEs@v;2eLB$7R3-@8B%mpLGhc2G|mb?^W%-}y-iT`tFT<i5;cTunE
zFDas~g|`z)C9r6tDNhz=X1D&_Ou&NbxsPPZ_hXD2{q!Kq`D@GEo6qjQ^N2~wrR~X^
zOj=z1K{bWC)>XP?XiJiA=QxfNoUk#}ci|1(#`3Lul)#TDHyeTNniGST&a4K3DZhtr
zfD1jdOI2DGJ{ItRbY*6~QDFVXej~>6IPCVYWP##dsE2Ph_g`_>lHTrWOz_7V3opHt
zn7#2MSL_N>&Ik<rRJG{o4N8-UnJAkXys05HurI2GhJZOV!?JsY&h3cu#G2(L`Cyg)
zs>f1^dihC`XzqARL1;|lK_5KFBu<mud~j@!O9zr~Ke>M{Iq>Wnwl1pf;pBm*l~nV7
zX9}4dW&iN16GxzrJ8rdpnAKWXgFg}vTwKu7SwB8r09a(w^_hA?`cr-$QqGLXn6ENu
z7`p9>wZAd;b+nh0j*4W~XnX3Sp*gd~_n2}9T-w**9lqE~dpZzfWJTXO_$|NpTX&T7
zFZnM&BY^x9c3$pAQyW1?3Cr&Z33g`A-XFfY!Wu`bOJ0?VdnWN2<ikCRZmxJ85A+b|
zmRHxd=6{-vD3DKRE0n$l-+Ryzz$5y5(Q|N99+8uOnk?mJH2%7;`{T=?+S%CzF8813
zb7KN{juP)a-~*~xP#OL@pO#NB#e&}Lu}3v*RBT`hU)zjr)3FxinwM#WuCH9lP3pEH
zMkhq8(|U%JIo(#GTm&tcgL-T>fHi>eIuJx~jU8Kts5BgNz!XHca`|sVj2lhF2oEQ4
z9HWd~IoB{{&)u=q(Vf6nEkp@r66z(HB#`|`gTY2_`6l=nf=Z|)13Y8na|}whKJYOQ
zuME}`Tr4%?ZOHoh{Oh*m$SICKYO$44$-l<Og;M(vWhpYf<Q-EE$4#FURoHP6+{Moo
zVGYh;Z-;kfu-b)<+oX)xJhA}eGc^r2lIi(;rkoNtUHA9g)KmVJ6uN5b;n5QH&AHT-
zPDsY})o!~%1}`=9L1XX^l-TtJbXF;Fdu3L8<@a%&^tmTTB)J|L{rd%+;Wpgoy<!Az
zD(w{}{T7k6QReLIxk|3QR|B}cF5leO1SVO^pidSbOFi=Vi>;ux*uBQ~Cqhozsi{U&
z!Ffu{bIm4ac^V^a$dmRpgaKu)MzX^GiqPeR2))5MG7U`JA#4Ss9e8Yv`^lV7%MFB9
zf-5>ZB)dQTD4v5W)I^M32lcqKTGzi`peESVC{27(Z{#Nuu<==3MNGL&W7M8l{ta?;
zB=-LPu>IB@(O7qx`elCM!&=jKd3cUveJ^9i=8u)X>KoF-g%)<i`C0YFZfl~^R2~vN
z8l?O4wX%v>(9T5u-ZXZ2B@*lHCe5YGQEDoVV3&>AGiqaR+>i5?De0U>X&z1$PD>f0
z^-qjY#XGo6s~Jm5riZHnSG;)DBZzxq+&x+Y!2bd{(Hw4d5Md<LJwVX2)pp>kY=U;B
zQo)nXM3XCGoVUReD4Pp(_8M{>e{2AYM{)dv!m(SL7)IXJ%bJP)^y21lifhqwpbIX$
zxTa5HTIz85T{7(xU|5)WMa&6+F{O`r<ayooyeM`TMSUM}cTp*MzJ223FF8)O3K5l_
zvr5QZZV$Qy$8_J825x3OjV&1N9`Jf4&aE%onae->f(t-1Fh%;(@$KQ`+bdzsMhz#$
zZ1J6AB-B1t#A4PL3Wi1=@m3+Ry)ELXsrS6#u>Mm=afWE^BQ;FdHZtbW#1eu9SavvE
zF_VZ-6~3b>OxCN%la~DIfT&i$OdnNa<<OJ-Z_vrWRCI#SJ&3*$bakDKmqg|Jj!YD1
z7=Sk7^d~R#ACO-Z;gqB}(E*4$!@S0UXxk8w0Qw}^IrxEZD$C}X=sH1{t_9J!a#&mQ
zRof&aU$-xABA5~L`X4$;fP=W$Ay_ylp(A7#dZ)9Smt)5@M`XFD>f+yVc;~1##m4yZ
z+if!jpn)5AigG4lkyCa^8JGovW>0X}XMuE@JyS22ulQx!W<NSxI=PuJK@j={*xk~w
z2P(T!e>{bMcR_LODJe8*>~`cwn`VRb$ON`_ZC)G}W8?6SKHnpO9^XFkb~&l6R|biX
z=~6VVzC3He*p$RinR_H()$*1fg<)p9=C@7U%5Q6#F5H1x;wN1Cx?(D9=g%gv`8CBQ
zSXJGg4ms`Lkod>(U4_pBY<J^So<tv$X0qB{mtb9S)T3T=U#FDwKNiA$vFz9_VUhn&
zn0|kEK?ijm7BY(qcF|&J3M;Vv6;Whjr{U?R9AKs{r{CEr<$r87FBYssLp6`}r*5UL
z$LL>@lL35jJshFN`}RsIzE(kzjI1kuLF+;1=4ls|%VlAvX5OvB^PVIXAn<LO$CBNk
zoIX|a{t-|lUWy`sAkRljb~AS)iuhpNngDx$wuvY5dx!4dB3|Ghl5NjPe*1B#)ZhZ!
zze~pa71-y_hsrE40SGHXj!hdbF5ahHV6PeXp7yr>EU0@XgH|m|;upGBPe+wBZvr&k
z5Kxs-rGJUKpAl(1wlra8k8XRl$_9e_Ghf-h;hzs<!sC7_Pgu1ypCec5YL%h;8Jc=O
zM*se*-7;W7)O>xOHPdVNB5NQR(}u|#JpWE2I2w%Gh>Fg-EEeC!gV3EZP1@iAZrCtp
z)SNIzBSK;w1cbA>e8%+SWctWwfKNGYK}O|I(rp!_GUp|OtPZrsK&09h7H3`=5H)OB
z*<B$){bSvH%?nsyv0hrgIX3r{n`+QSp>3;X^r>MdTQfm<Ht$(~ezk_~IBw$j72c5<
zUB7g5LHV8d$Rxh)VKdMtxn^k$QpsNBP(94)divmrG~qpBTr21*IpGcAtXIYl>iiRz
z&a5La8s<eV%$H6rv%vjvHl)%Tkrgc7uSsFmwdRHK*20(5wPt5Neiyp?BMrlY8a=!x
zN)w*NJLe4@W`ef#nMIokYW*B%GD=cPoDTy**k8Whfibhw8wF3OZAk6B_QwXSs(yKz
zUP0RmLUi@*5AEkAoi3wDXsQbE7Ehu)0UNCo-7FCU_OtIQaQ^YR_BuCpGr`0Gf%o=U
z>dB|W!c}Vm=%p)jwCd{EU(85+@bRjvkf~_=u{KG)5~)lT(}W&lU)4ackWeR?StwhC
zLn>u!=W@LAFDrQ(NoAypUSMCYaS#OvI|^AR^B3!d^=H~r${chUn%SD4<ESeG?<Gpb
zAhP?*85KOB?hr!=X+&h2gb{cw*|m)@VcI87|H7E)Y;C~ooBBm^NOR3S`!_~0RdR!Q
z{z|kRuay%Inz$x;K9oc!N)_+j{&7-!cKmFJ(I)gVs?#^#0tDKe=%=I;8Ad%P{7OLh
zY>xbsB04k`Ig<Q)#DW^>(>|W_%BPFpBX$hgYM`ofowZ-|3E>Gi&+Rnd&_BHw%YX$c
z(@unSk7?{{23o8URI#v-3$Q7bTj#LSE=&C9)?CID?iLX3)ROE;Q<*;$Ob*Hw3B|9d
ziaI#2S@-?tn=L{|UTMgk(hBG(%<qCkio2f9#9}^#m3TDS0+wJn`Ec&tEp0qmq<Md}
zOx?o!mO0(e56?tOKg~SP)*mlPA243992*FUJ)y?Xj9YN*t6nTk?b^a!?9F2eaoB77
zL{IgTvva%lzXTzt5Zi@$jn|MMWkd#Wr>(2MHI@94aSfaYx;WIJ^R=st4+BV#$<?0i
zZ%a!R&${_hX6(`h{+5V!KHDb(v?gXHrw_o2a;txVo3K|4I5Uk6%w#0d&r|1j8pw8T
zH3TeNh>=`{SEe<7`?Dduq*d3%Z}g?c+3Tlk6RDpug~gcfmCg3ET2pO>wX-e66=*L*
z&UDN3Kl{tF^m6X*YaO!SZ9}VvuU!k*Wz!Aj%qb=fm1R~uu{y=YdV3jB_vSU2TyHy(
z>sx`DbY7bs@13M__VHZ3<f~LE3xTg6TB9d)mT@m<JRk@fHM!Ft&stMgW0_uEhw(as
zliMdwt=9iosW-3-@!b3QVND$0^f5%)w7pzMJIwBEfKf-$dPIsuZ=duw^$FPp$penP
zprk=TZQ+lJsHW`T@}=B7M167Qo2TA<mHql%zYlHTUg<FO!&vSW^FK<S-g$WPFe8#M
zq@MGkdhZRgtzdk#XAP>;*x4N)HJD@ST>3p(hRgOjl{II*BYKktsk(B{>5y<E)Xen(
zNx)y|c+<BQ?f>DuBY!z}PHoQM=XitaoN7<+&{WnvTU#aCR<5-Pwy<#8Ndn<m)7e^t
z<|W*2MBeb{cyCelQ>R%5F@-9V8x!#(-JQDvk+P<@zbsU&n(Nib4JeSoN>wM?3P%j&
zDbce-@_Q~*PxjrtG82*<*}jMS{!c+Lc05?{JChQr`Q)N2Lx8*6aj9(ZOHZAFQZp&}
zx-NRl_T!El%ejC0^t`#R<}0yYUL1t{`ulx)SZCd(ThB?n#H&q-kp{NlQjGVzR2Vd#
zt(vk$COA~<+>zg;u}F&G{rmo?xJ0TwIdo#WMw%PLG6>T#&hujm)VLZZXMs@wfQ-rH
z=6*Y;8vdJ7vpwn_9aDN@`KL#TR5kr=(i6RJEnEP9A~_MSllWs<w}DkW@@q_(iCpml
z7(*l{^mP)o^jWru3PYgkQ&RsS+*)uOdf(;~u2f%vFQ+{~LRr{U*wc`o7jH_Ul{Hw|
zVR>+lwIR{T3PKM{(3>zZICCLCkHpIg=|ofx>J6^c#b&GpExpU*ea)EyMXpTl-^aHD
z6J%!XC>Dl79{F~q{w;xDk%?q}X_NKd9j@4n74M_<J;=vaF%O2!t`?Psn<sc^BX27%
zOvku;H4WjvN$o_9@y$Q*9g;gyd6oA*y9UE^j<ue`6M!{-jK*`i6|7byQeDWwxpPtd
zChvgyn!1K}A^8Ws6dq*?h~%{M)e&+LXZo8KEHH!G`?FTWXYAbhI3zTUw#>1jp4@i!
z3e`Kq<1Zv>T|Pr#ziI2-J%Ey>-W%=d0GJ|n(mR|Da{?v7Cdy+Ll_w_^Ar|o{^yLWw
zXpb+ms{e|RNI3WF2tz@#YN!J4G>HZMPh6p{w?DS1jLs{Uzxhn~W@^bZ#fJ5bVo?%L
z4||0Nl1{uBen+UAlb-7<SHB1OA}s_5rU>Q_uf1av(NDcO)+swervG%lk83{M7cu^*
z7+l80wk#vT=vJ6T)|<YYZ(m-7c}X?WY|CfI`<d~4yfS`Y|6m-~oZ6wut*QTR!Bcbf
z)V#DOE}3et`PO4~nYQ71s_7;dj^g8xeNsg9uoshTTLmLB-Spr{XzMq92*sLHJhTX4
zn@Ftlm*R(lwP*zMpqE7rc;84fL5>)q0@SpE`$~LM*v^@QH*w7(XzDBRps?=EC^DZO
z(X%STqiKZ{rm56CXV%yE7hw3f4Nf@NkU7|dflh(d!-Fqu&nQckmGoGr{W1^rDoE|3
z%<`YVn6UcwpK8C75Fu+ez?hZdt`heMuff=IZU=JrLXPLJ#N4j=BcQ(NHV<kX<UwMo
zUr9oUim|IJ`Yr}p{jNK~?IdBO66<_S_|e}*?S*{hP3m?<VeQa_sB0oZDGpxzl{{du
z9MGFn9+%w0LLGPr$A&oWu*k5;mjC-I^*v^uvfqTn2&!9xl2Q|*vsa_m`5-A1b8EXy
zeTz*_GY=AJn5e2$N3B5?$(sH*)^|Up47Qb?2iM)10R?|<Q&K@DGWZGvY^5#n%=4K|
z`{>07n8Y;d93^%MD*iHodLOgWXBq5phNO?)(!}>u2~yl)&4wg?-Q03iL{%sG><u7U
zV%Mk%j%)w9-X$*$C>XAh;+m85Z&%2aeMQ95sVr-{9X-#DDcBij!qU8E&U^92B~%Sj
z)}f+4om_v|y}FInPa8K*`EhojBo-y)smqv8NZdAMnkv__|B0?CwVh~+)okPRvg3tW
zf%y#3ys}hA-1HhCG)4X4PWO;dPGB-7*D##~i}SE&2A*34HD7vhJS$0}+~Z9i8l)$+
z@53g;m1y+L4wmlzN$SS}OqwFiO>X>hC+<>fJ*1y$exr9DLZZr?nEpzumvzL9=YZlN
z@V|@**u(c#Vb@NKL4DrzdIUt@hw4wwc_m0gv=bGRHVp~GfHuLju>7N&;+-H_oNyo!
z{*)$p1%H1F-afSAlK6v`F$?->jCUqinAH$fEq8nb3)HtjjBG2l3x<`MB;1t5ht^EJ
z2h6ZUA7+yyv|_0d7+RmFXL9~{eh8D8Ol_>EHTg!Vk3k~0>-a?oG&6F68YrY15RPC8
zcuq*XdDEf5JJ}?j5lSBU?gkr@I(yMtc0(B0*)yi5>3R0LEBwRLU;tlU9A-nNnq<;p
zIgJDVgq3}T?FEpKrC_EH-9KYe3=;iia3B+86bP~#xObNUKYvrGl?YV)rhPwq8zhKA
z-%Jloif#s9cG$_}Qzux)MSR_#eT_?&th+Bf3&0s?V33p&1IcBatYL=$K2+W^0q89y
z7p@FqoLukPV2x9G$t*nsG3sdK)1pmQyuIjHwqirVuMgBs|8S-VKTsDGV^nwoM^oVX
z)Ti{1uYs?ZznlJ%_UmO*aLm)#UoB}ZDTSB*SwEDtU-4vy{4axn?MEP?A0ve<ZkM?w
z5L3`|HTH_K8K#l!YJ47a9j2dJ3Nh*^ay?kpQ^f%7Wm295J{T~ISx>SSs<cG<RHS&f
z?HW8N%&{KJHU|EA6U$}@_o<sC>VJUV98kL~5{#hs4w-ONI49%p?!T7>JF+4UY>n)h
zM}KK62|@&6s+K3AR|C1$5uelMEc|<zVZNp>D!$?>)d%x(HSKg;il@nOZDB}fgzq5#
zDcl<-^y2|8`cu4rC4fyj4^HEn!xSo2^UpBp#y!LlJyWpJdok{UD%e8ga9$Pu^sbD2
zK2V2nT9JH{?Hb<0u(7DGtyW%hjemFzzBx#h)+b*rbgd$TQz|C)p)kQJp0L+6L>aez
z@Nis7#b+iuz9Hvn``Ih}Kj7BTMf_JdQ6NwI1Cc`L*&`AL@@u#)WpC!oskf$6Z!NRp
z4cTO+X7>9oVCR^0!`B^g==!Y|kOtLKYyQ^0{!k=HTIW7da9DeArwpV?JCpd3E`q&|
zU4yam2zeQ(FSkC70QxJhn;CdIDAcIMa2ifU5&Jxi_%wv=1)3e`^XN=>=J;pGZPMJl
zDnEUI*|`3N9n7f&^#uCpx{;sqqkM$($qL5*_0w-4aTM_2ws+Hr1xzL+V_9$Lvv0E5
z5^x$rspsmJ^97h6Y))UaiL{{%;F`^nVauB7bB`9o`uV<3jHF*B%iR@J;_m6>uKwva
z&$yxzra*OivS`;#v=ER$*YJCJ|6CeSq*6qsq*N^Z=V6XI>d8FlJ?jCLAgKt3GHMoP
ztfJ%iJH&53_T<M8M7YUlIH^%T7!?9iX|b!P9_#`r_Og9B*SAoVX&!x#S@f`}W~;Zj
zW=DDslO2;WWm7HA)l41K91*Uqc<M}lyWYlLJIK{0L=-#k8rX<EFB&!pMgg&(BXwYE
zxT0a@0Mr{m{TOByk(&7n)bXoe5?5OCVw0QUEQRn!U!a<(=1&o}D*t}KR@%OULlh$J
z{TP5IWt}?eOv+X8(y`3;FSf!^un|cbRSk8x4Fe}rGH|rbTyiI*C>g{g>X!b9Q-V|j
zq7x>HZ+_);7)oIi!rOv?iPp`kZ7UC|efJ!Cc*dajrpZDnrB1aWnFA(>c$!m~xaL!x
zCj8KJJp#NksQ=iy&S+HC^SmM|@15rPn(hlxE%&h}nSM%m6ESsNP{k>PeR(Q3<4gGV
zzQs~)wmFagt<-PDR^S)+Wv3F^%SgPzFVpQ1xn4FGr0Ef+K(lh(s7}o7eIhKj_K4e$
zVUQ3(gBKN1F8AxdnXE%n=cvJ8pZq@NkeZ3L)JO>R5^{I^0BHX_qbB$qP%cD8*>hGI
zTskX=wHE!<|Cbu-UunggeHZ-AwGOu8iMk`7G(R<NdIDH2l@*#i6776s97pr(G_1?d
zFGItAJvbX@UU$euJQ)P^0@Wi;Xm+wwaeP-F9LG%4=*7sV)`l?QhR9g<_$)(iH8+hu
zBy=JPHkD#m(r!Xb_l6zcwg$XPw5o8!gmZ~qY6)IP9N5Vl!N;1NGta&)M|=Ai$DABS
z%K4OIIF3c1Z2i)$b#_WLe_h!lJDvy?*5Rgg=P|_W#J%a^zQZ^tVf<c$A4xgX7r_b|
z(m^9UILCq=68X-qI1Y(^$HBHTZP*_s;F)V*tCAaV`oF)86;<hh1X9@t)t~Pgzz;#j
zOGg`R)~T>Ag$?{XGOf*+WoXDCX7N=XS_g$`p`NLf4>rvo+xO7e2*;NADO#kpW}5*j
zvW-(ryB)Eyp6rUFX>&vFKCk+9z^5b^VbE_aQ!I_bt=-NbX7ULYYV;F3(v>DiedU7z
zyq?#?6XXoCHE-6B?$YI&r*=?JsW(;wz22WG&-IZ&3$`-^2I=4AE?MQZKUuOLvMjIL
zIpJ9<+%&su(pYze>n$Vlz>IS9Dd|eQrv?tau3FJ@^f2sL%WdOQOU~6Nk>z1UsIVyI
ziD7R46uZTtlkf0ARy<!}X|Ui%5qVA3{Qfv<cw66tlx{F5QomzaqpG3K$W}8!o-hU|
z>S#Y7DBQJp+tyrEHZbWx<$&)O$-cfB@^Q;s{tijvLs)bfAyyB7iy&rDpZglB0>*{t
zKBj#Dzm-tGr-TWn$I0>ZpOAu@dTdI>qZdF&F2l)<<n3T-w#0#)Ht>E@*KPgFbr8PY
zdt9@v|KsKsB~*))NY&#8>bE~wj)v9XY4r}ofiWXkpK@~C-{-5qO-fyt3plTvu`#?>
z64m$QeC%3O0)&EA5oeud@>UCR>iA`}6>BK_;VjC%$*d{Hw=Wn~D^2*cJZ8!bPJyJI
z?hffc?beM&L-yGdp*#cQoqA_s`FK%|TO9QE6mjTe5ZFUmgP&++J?;qL(D>{o@%$E1
zK)|38HG(jL%IFJId}VCT_Wg}Pyxld0%<j{IEx5}lGk$N4r;tz*%Z{wi|HiQ9m0gV@
zQy$}J4%Hez5<7vEa<b)${*uW3B6UCPxqKyrR&qO}blZ&IyFVrzz-k7jIJ?=SAbD}=
zfEuBQ$q*1Lz9FZ8i5{J=`V*@MP5;(6%@lRjilPZo+F+GR`fr!Itlr~jcGUq1Y^4b@
zU7d=|7EFP^5qeC8!f*f8*n6siC&s-{b~n=CGl0V<k90+@1VHrNuJklM96G3}+i8J<
zqY%5x6rLl=&PMhNqq<(NTxG5h%8R=mHhj-ms4@G2YmOA`aypQ<kMaXYv%%A@OPDkX
zQCg2hi7fnDN)WQDQ1*<IFG1WgphFixo_EjRz1{e0ou#cXX|KKa@6YUEuG}z3xYOmL
z|K+ii&->GM$04Y>?$L3hTlGw$5HK@bdmryU1|nR{%0dnv+A=u{;ZL(;SO!aU?<z<v
zibApLp{&jifj~3;OW&mORgQ1m1RB<5QCtq~0PECBH6rUsPn>Fscd10AS`iiA-NaXz
zKlDN_c4ZyZm7a*E0rqip^_c|^thVat0u#l}M$-!NK;$ext!+}lTl*d=hC*zT7F?e~
zeRo*CE1*)C`t_Nw`riITeB(q<f&wr{Bkl(gH#=Z9e&`?^BmgedUT36%Ho=0ZsW;ex
z&hB-rP&6H#z1n93WG(-WCa(PMvN6TH!`)g1E4c1jZ{zstD7Aa-r4`(U(l?j+yQu7E
z5~#dq$D`ro6ABn4ZF%B8N5Wk;rUWKP>o}J&i5$M}-vqDsdB<<8MGrGXPhSasbenDc
zw<y|B+HfOICrQQ=(9gxks3Gjs-0D=2V<y$7KU6P%JM3B#ZN+O1`w4U&9Jp~@FaL05
z|F%5V5xg2=Y+J_rIG)oPD(Bc$?=KB!g&s8xR9WT;qy1fjyL^WsA{(EJd7J;)Iso#?
z0{4PXwna%!@ujAs+)Y_r@@pr&^G{`tkN@HLC)*%5Qo<w_XNaE8Fwg}E&(#mvt;PIZ
zm<xCrI*&8a`E;hs7QAVo>M8MC^fR}Cz_Ui{6;cBK`fTymQk|`ae)4`V*iKX@tc7!q
zw?||i`QkXYuRpisUDHn>|J{E$2_%RZ9vU93P}vmf$bxf0!8Lasb)qtdGz1$U;Xa4u
z?dnO{+y!y2&XqI2ab9b`WzMh7W5`jG7l+n$$oF$iJo8%P*xUTq%XeR3^X-3bs?Hyg
z<Q{uX+=gw_W`4}Cud>6oeWM?V(r2&&T&=Y2gS+r>V6E<mt-4q7BP&Xb{U?!zN$VsD
zbW@{4QiF@T96Gu)z11#I!CoVIlLh5S-N2rTyUtB-JxUMlTsZakRpKWPor=6m|2jGh
ohlu}me)xYKDgJjkYPF!qQ?UDbolok4v&~D$Bs<Gu^P?C32hl5-;{X5v

diff --git a/internal/static/performer/NoName27.svg b/internal/static/performer/NoName27.svg
new file mode 100644
index 000000000..4bf73d04a
--- /dev/null
+++ b/internal/static/performer/NoName27.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 850 1250"><path fill="#fff" d="M462.43 15.89c-11.4 1.7-30.3 9.4-34.7 14.3-1.4 1.4-2.9 2.6-3.4 2.6-1.7 0-7.3 4.8-10.8 9.2-1.9 2.3-2.7 3.8-1.9 3.3 1.5-.9-6.6 11.1-10.5 15.5-3.4 3.9-5.7 10.8-6 18.3-.3 7 1 14.4 2.8 16.2.7.7.8.4.4-.8-.9-2.5.8-1.3 3.5 2.6l2.3 3.2-2.8-1.8c-3.5-2.3-3.5-.5.1 2.1 2.6 2 2.7 2.3 3.2 14.9.5 12.1.7 13 3.3 16.4 1.5 2 2.7 4.1 2.7 4.6 0 .6.7 1.3 1.5 1.7 1.1.4 1.5 2.1 1.5 5.8 0 7.3 2.2 14.9 7 24 2.2 4.2 4 8 4 8.4 0 .3-1.9.4-4.2.2-2.4-.3-5.3-.1-6.6.4-1.5.5-3.3.3-5.2-.7-6.6-3.4-10.5-1.7-21 9-4.1 4.3-12.7 11.9-19.1 17.1-6.4 5.1-15.5 13.4-20.2 18.4-5.2 5.6-9 8.9-9.7 8.5-2.4-1.5-9.9 2.6-14 7.5-4.6 5.5-13.2 10.2-18.6 10.2-3.2 0-3.4.2-6.4 8-3.6 9.5-3.6 9.9-.9 15.3l2.2 4.3-8.1 9.9c-4.4 5.4-11 13.3-14.6 17.6-7.5 8.9-15 19.7-19.2 27.7-2.5 4.8-2.9 6.5-2.9 14 .1 17.6 6.7 30 16.8 31.5 10.5 1.6 25-4 37.5-14.5 4-3.3 10.2-8 13.9-10.4 3.8-2.4 8.6-5.8 10.8-7.6l4-3.2.7 4.4c.4 2.3 1 15.3 1.4 28.8.5 18.3.3 27.1-.7 35-.7 5.8-1.4 19.5-1.4 30.5-.1 25.8-1.2 39.9-3.6 44.5-1.1 1.9-1.9 5.1-1.9 7.1s-.9 6.2-2 9.4-2 7-2 8.4-.9 5.8-2 9.6c-1.1 3.9-2.5 9.7-3 13-.6 3.3-2 9.6-3.2 14-1.1 4.4-2.2 11.7-2.3 16.1l-.2 8.2-8.5 12.8c-9.7 14.6-14.1 22.2-25.7 44.8l-8.3 15.9 4.7 4.6 4.6 4.7-1.5 3.6-1.5 3.6 4.2 3.4c2.3 1.9 4.9 3.7 5.8 4 1.4.5 1.3 1.9-.7 13-5.3 28.8-8.7 67.6-10.5 120.8-.7 17.9-1.4 37.4-1.6 43.4-.3 7.4.1 14.1 1.2 20.5 1.4 8.5 1.5 12.4.4 34.6-.9 19.1-.9 29.6 0 44.3l1.1 19.4-2.5 3c-2.5 3-3.2 6.6-1.6 8.4.5.5 1.7 9 2.7 18.8 1.5 16.1 1.6 20.7.5 45.5-2.7 58.2-3.5 71.4-5 78-.6 2.5-1.7 8.5-2.6 13.3-1.4 8-9.7 33.6-12.6 39.1-.7 1.2-3 4.6-5.2 7.5-3.7 4.9-4 5.9-4.8 14.4-1 10.2-.4 13.6 3.5 20.2 5.1 8.7 12.8 13.6 21.6 13.6 15.1 0 37.9-13.7 40.9-24.6.6-2.2 1.1-12.6 1.1-23.9 0-16.3.4-21.6 2-28.5 1.1-4.7 2.5-11 3.1-14s2.4-8.1 4-11.2c11.4-22 11.7-31.4 1.4-45.3-1.2-1.7-2.5-3.9-2.9-4.9-1.7-4.7 4.6-42.4 9.4-57.1 1.1-3.4 4.1-14.8 6.6-25.5 4.2-17.4 4.9-22.7 4.3-28.8-.1-.9.6-6.2 1.6-11.7 2.7-16.1 1.7-34.1-3.4-59.1l-4.1-20.2 2.5-13.3c7.4-39.3 13-55.4 36.5-103.9 7-14.6 14.6-30.4 16.8-35.3 3.5-7.6 4.4-8.7 6.6-8.7 4 0 7.6 2.1 7.6 4.4 0 1.2.5 8.2 1 15.6 5 69.3 5.7 76 10.4 100.5 1.3 7.1 2.7 15.4 3.1 18.4.6 5.4 2.9 13.2 10.5 36.6 5.3 16.1 6.1 22.9 6.7 58.6l.5 30.7-2.2 3c-1.7 2.3-2.3 4.4-2.2 7.9.1 2.6-.8 11.8-1.8 20.3-1.1 8.5-2.6 23.4-3.5 33-2.1 23.2-8.9 73.3-10.8 79.5-.8 2.8-2.5 11.5-3.6 19.5-2.4 16-7.2 35.2-10.1 41-1.2 2.4-5 6.1-10.2 10-10.7 8.1-19.5 16.5-21.8 21.1-2 3.8-2.9 15.5-1.6 19.7 1.7 5.3 15.2 7.8 36.6 6.7 22.1-1 39.8-5.4 47.4-11.7 5.6-4.6 7.5-9.4 9.7-24.5 2.1-15 5.9-32.3 6.9-32.3 1.1 0 2 14.4 1.3 19.6-.4 3.4-.2 4.8.8 5.5 2.1 1.3 6.9 1.1 7-.4.1-.6 0-11.1-.1-23.3l-.2-22.1 3-6.9c4.8-11.1 6.3-16.9 6.4-23.9 0-7.8-2.9-14.6-9.4-22l-4.1-4.7 1.2-9.6c.7-5.4 2.8-15.6 4.7-22.7 1.9-7.2 5.3-20.8 7.5-30.4 5.6-24.8 7.8-33.2 9.4-36.8 1.9-4 1.9-4.5-.4-7.5-1.9-2.3-1.9-2.8-.6-7.3 3.5-11.6 4.9-23 4.9-41 0-20.7-1.2-29.3-7.8-55-5.9-22.9-7-32.4-6.3-55.8.5-20.3 1.8-29.7 9.7-70.7 2.1-11.3 4.8-25.9 6-32.5 3.8-22.3 5-26.8 6.6-25.4 1.1.9 2.1.8 4.6-.4 1.8-.8 4.8-1.8 6.6-2.2 3-.6 3.2-.5 2.3 1.7-2.9 7.8-2 15.4 1.9 15.8 4.2.6 5.2-.2 8-6.1l2.8-6 2.3 3c1.3 1.7 3.1 3.1 4.1 3.1 1.3 0 1.8.8 1.8 2.8 0 3.4-3.1 5.2-8.6 5.2-5.1 0-10.4 2.5-10.4 4.9 0 1.7.9 2.1 5.2 2.7 4.8.7 5 .8 2.8 1.7-9.6 3.9-12.3 6.4-10.1 9.1.9 1.1 2.1 1.1 6.6.1l5.5-1.3-.6 3.8c-.5 3.1-.3 4 1.4 4.9 2.2 1.2 2.6.8 8.1-7.4 1.9-2.8 4.9-6.4 6.7-8 3-2.7 7.6-10.2 15.1-24.5 1.8-3.5 2.5-7.2 3.3-16.6.5-6.6 1.7-15.4 2.5-19.5 3.4-15.7 5.4-32.5 4.8-40.3-.5-6.4-.3-7.6.9-7.6.9 0 2.6-.9 3.9-1.9 2.2-1.8 2.4-2.6 2.5-12.8.1-5.9.6-12.6 1.2-14.8 2.4-8.5 3.4-14.5 2.9-16-.4-1-2-1.5-4.7-1.5h-4.1l.2-31.3c.3-30.6.2-31.4-2.5-44.7-1.5-7.4-3.1-16.2-3.6-19.5s-1.6-8.2-2.4-10.9c-2.2-6.8-2-21.4.4-36.1 1-6.6 2.6-21.7 3.5-33.5 1.5-20 3.3-37.1 7-64.7 1.1-8.7 1.3-13.4.5-20.5-1.8-16.4-4.4-25-10.1-32.8-1.9-2.5-4-5.8-4.9-7.4-1.1-2.1-4.1-4.3-10.3-7.5-4.8-2.6-11.7-7.1-15.2-10l-6.5-5.5.4-7c.5-8.4.3-7.6 1.9-7.1.7.3 2.2-1.3 3.5-3.8 1.9-3.6 2.7-4.3 4.7-4 1.7.4 2.8-.2 4-2.1 1-1.5 1.5-2.9 1.2-3.2s-1 .4-1.7 1.5c-.6 1.2-2 2.1-3.3 2-2.1 0-2.1-.1-.2-.8 4.1-1.7 5.4-4.6 7.4-16.5 1.2-6.5 2.1-13.5 2.1-15.5s.4-4.1.9-4.7c.5-.5 1.7-5.6 2.6-11.3 1.3-8.8 1.4-12 .4-20-.6-5.3-.8-12.6-.4-16.3.5-5.4.1-8.8-2-17.8-3.2-13.4-4.4-14.1-1.5-.9 2.4 11.2 2.5 14.7.1 6.4-.9-3.3-3.6-10.6-5.9-16.2-2.3-5.5-4.8-12.6-5.6-15.6-.8-3.1-2-6.6-2.6-7.9-.8-1.6-.2-1.3 2.1 1.2l3.2 3.5-2.4-3.9c-1.6-2.7-1.9-4.1-1.1-4.4.7-.2 1.2-1.2 1.2-2.2 0-.9.7-2.3 1.5-3 2.1-1.8.1-4-3.5-4-1.6 0-3.6-.3-4.5-.6-1.4-.6-1.4-.8-.1-2.3 2.1-2.4 2.7-7.9 1.2-12.1-1.6-4.7-9.5-14-11.9-14-2 0-3.6-3.2-1.9-3.8.7-.2 1.2-1.6 1.2-3.2 0-6.1-10.8-10.7-22.4-9.5-3.9.4-6.8.3-6.4-.1 1.3-1.3-2.5-3.2-8.7-4.3-7.3-1.3-25.2-1.9-31.7-1Zm-61.7 49.6c-1.2 2-1.4 1.4-.5-1.2.4-.9.9-1.4 1.1-1.1.3.2 0 1.3-.6 2.3Zm156.4 133.4c-1.8 7-3.1 9.9-4.4 9.9-.5 0 .5-4.2 2.3-9.4 3.4-10.3 4.7-10.6 2.1-.5Zm-118.6-1.6c2.8 3.6 6.6 7.1 8.3 7.8l3.1 1.3-6.2 2.8c-7.6 3.4-10.6 3-11.5-1.5-.3-1.7-.2-3.9.4-4.9.5-.9.7-4.1.3-6.9-.3-2.8-.4-5.1-.1-5.1.2 0 2.8 2.9 5.7 6.5Zm-26.2 6.1c-2.3 2-3.1 2.2-5.8 1.2l-3-1 2.7-2.9c2.6-2.7 2.8-2.8 5.7-1.2l3.1 1.6-2.7 2.3Zm111.7 228c2.6 15.6 2.7 17.4 2.4 48-.3 31.4-.3 32.1 2.4 45.8 3.7 18.7 6.1 28.4 9.6 38.9 1.5 4.8 2.6 9 2.3 9.1-.3.2-2.1.7-3.8 1.1-2.5.5-3.3.3-3.3-.8 0-2.2-3.9-13.4-7.7-22.5-2.8-6.5-3.3-8.5-2.4-9.6 1.6-1.9.8-3.4-8.9-16.6-11.2-15.3-22-31.6-24.2-36.8-1.9-4.2-1.9-5.1-.8-11.9 1-5.8 1-8.5.1-12.6-1-4.4-.9-6 .4-9.6.8-2.4 1.5-5.8 1.5-7.7 0-4.6 1.6-8.2 5-11.4 1.9-1.8 3-3.8 3-5.5 0-3.7 6.9-17.2 12.9-25.4 2.7-3.6 5.5-7.7 6.2-9.1 1.3-2.3 1.5-1.5 2 9 .4 6.3 1.9 18.8 3.3 27.6Zm18 168c2.9 8.9 5.5 12.4 9.1 12.4 2.9 0 3.7 3.1 3.9 14.5l.1 7.4-4.4 4.5c-2.5 2.5-4.6 4.4-4.8 4.2-.2-.1-.8-4.1-1.3-8.7-.6-4.6-2.1-14.5-3.5-21.9-4.5-25.2-4.3-28.5.9-12.4Zm7 89 .1 6.2-2.4-1.9c-1.3-1.1-3-1.9-3.8-1.9-1.7 0-1.1-2.3 1.9-8.4 1.8-3.5 2.1-3.8 3.1-2.1.5 1 1 4.7 1.1 8.1Zm-154.8-618.1c-.9 2.6-.7 3.2.5 1.2.6-1 .9-2.1.6-2.3-.2-.3-.7.2-1.1 1.1Z"/><path fill="#fff" d="M556.13 97.99c.4 1.3 1.1 2.7 1.6 3.3.5.5.4-.5-.2-2.3-1.2-3.6-2.4-4.4-1.4-1Zm1.1 116.3c-.9 2.6-.7 3.2.5 1.2.6-1 .9-2.1.6-2.3-.2-.3-.7.2-1.1 1.1Z"/></svg>
\ No newline at end of file
diff --git a/internal/static/performer/NoName28.png b/internal/static/performer/NoName28.png
deleted file mode 100644
index c00fb15b5ff2bd3716a7f4eefd4a75b9711b3dc4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12687
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

diff --git a/internal/static/performer/NoName28.svg b/internal/static/performer/NoName28.svg
new file mode 100644
index 000000000..5af3dbc38
--- /dev/null
+++ b/internal/static/performer/NoName28.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 850 1250"><path fill="#fff" d="M475.18 22.91c-1.68.21-3.46.73-3.99 1.15-.42.42-3.67.42-7.35 0-16.16-1.99-35.26 2.62-48.7 11.75-7.35 5.04-24.66 21.2-26.97 25.29l-1.99 3.46 2.2-1.99c3.04-2.62 2.94-1.78-.73 4.93-1.68 3.04-3.36 7.14-3.78 9.13l-.84 3.67 2.2-2.62c2.62-3.15 2.83-1.89.84 3.99-.84 2.31-1.36 5.14-1.15 6.19 1.36 6.61 1.78 7.66 3.15 7.66 1.89 0 1.89.31 1.68 10.49-.21 7.14 0 8.29 2.73 12.07 2.2 3.04 2.94 5.35 2.83 8.4-.1 6.09-1.36 11.12-3.67 14.8-2.73 4.51-2.52 6.61 1.26 10.49 2.31 2.31 3.36 4.62 3.78 7.87.31 2.52 1.15 6.09 1.99 7.98.84 1.78 1.47 3.67 1.47 4.2 0 .63.94 1.89 1.99 2.83 1.36 1.26 2.31 3.99 2.73 8.08.52 4.3 1.47 7.24 3.15 9.13 2.1 2.41 3.15 2.73 8.5 2.73 3.46 0 9.66-.73 13.85-1.68l7.66-1.57 1.47 2.94c1.78 3.36 1.99 10.07.52 12.49-.73 1.26-4.51 1.68-18.05 2.2-14.59.42-17.84.94-22.46 2.94-6.51 2.83-14.06 10.39-17.53 17.42-3.25 6.51-9.13 24.24-9.13 27.39 0 3.67-2.94 6.09-15.64 13.01-25.92 13.96-38.31 24.14-43.87 36.21-2.41 5.25-2.83 7.77-2.94 15.22 0 7.45.42 9.87 2.73 14.69 4.83 10.28 10.81 15.43 22.25 18.89 3.46 1.05 3.99 1.57 3.36 3.57-.42 1.15-.94 9.45-1.26 18.26l-.63 16.16-2.73-.63c-14.9-3.25-24.35-4.72-33.16-5.35-12.91-.84-28.44-3.04-41.14-5.77-5.35-1.15-11.23-2.1-13.01-2.1-9.66 0-17.32 5.67-22.98 16.79-1.78 3.57-6.09 10.18-9.45 14.8-6.19 8.4-6.3 8.61-6.3 15.43 0 4.51-.73 9.03-2.1 12.59-2.83 7.56-2.73 9.66.52 9.66 1.57 0 2.94.73 3.36 1.78 3.46 10.18 11.33 24.45 13.43 24.45 2.73 0 3.99-3.15 3.36-8.4-.63-5.04-.52-5.25 1.47-4.2 4.72 2.62 3.78-6.19-1.05-9.03-3.46-2.1-4.2-5.77-3.25-16.16.63-7.03 3.36-10.81 9.55-13.22 2.1-.84 4.83-2.94 6.09-4.62 2.41-3.36 4.72-3.88 9.03-1.89 3.46 1.57 4.2 4.72 2.52 11.23-2.2 8.92 1.68 17.11 7.45 15.32 1.99-.63 3.67-6.09 4.83-16.27.63-4.51 2.41-11.54 2.94-11.54.21 0 3.78 1.99 8.08 4.3 4.3 2.41 11.12 6.19 15.11 8.4 7.77 4.2 23.72 10.49 40.19 15.85 5.25 1.68 9.66 3.67 9.66 4.3 0 .73-1.68 3.36-3.67 5.98-13.85 17.95-16.27 22.77-28.86 56.67-5.88 15.85-12.49 33.58-14.69 39.36-5.04 13.75-9.03 27.92-11.23 40.93-1.68 9.34-1.89 21.93-2.31 113.34-.63 138.53-.63 140.31-2.1 151.12-.63 5.14-1.89 17.42-2.73 27.29-.84 9.76-2.62 26.55-4.09 37.26-1.36 10.7-3.04 26.76-3.67 35.68-.73 8.92-1.68 21.62-2.31 28.02-.52 6.51-1.47 21.41-1.99 33.06-1.99 40.61-2.94 49.22-7.98 69.06-2.52 10.07-4.62 19.31-4.62 20.46-.1 1.15-.84 3.99-1.68 6.3s-1.78 8.08-1.99 12.91c-.52 10.39-1.99 19-4.83 28.13l-2.1 6.72H234c-7.24 0-16.27 1.89-19 3.88-3.46 2.52-5.14 6.61-5.04 12.38.42 19.73 13.33 27.18 38.2 22.04 8.4-1.78 11.33-2.73 19.31-6.51 5.04-2.41 5.25-2.62 6.51-8.5 1.36-6.4 4.41-13.12 7.66-16.48q1.99-1.99 3.46 0c3.04 4.09 2.94 11.86-.31 33.58-2.31 15.85-2.83 21.09-1.89 21.72 1.36.94 5.98 1.15 5.98.31 0-.31 1.26-6.82 2.73-14.38 4.83-24.98 9.87-40.82 18.79-58.67 6.51-12.91 7.35-16.37 5.77-23.51-2.2-10.18-13.22-27.81-17.32-27.81-2.83 0-4.72-3.78-4.72-9.76 0-13.96 9.76-51.63 20.15-77.87 1.36-3.46 4.09-11.23 5.98-17.32 4.83-15.43 12.07-37.26 14.59-44.08 2.1-5.56 4.51-15.01 6.09-23.61.42-2.31.84-21.93.94-43.55.21-33.48.52-40.09 1.99-44.6 1.05-2.94 3.67-11.65 5.88-19.42s5.56-19.1 7.35-25.19c3.46-11.86 5.56-20.88 13.75-58.25 4.93-23.09 12.07-52.47 13.01-53.94.84-1.47 4.93-17.95 8.92-35.68 3.04-13.64 4.62-18.79 6.3-20.46q2.2-2.2 3.46-.1c1.36 2.31 9.24 20.04 18.05 40.51 3.15 7.24 7.35 19.21 9.45 26.76 3.36 11.96 8.4 28.34 11.02 36.1 1.99 5.77 7.45 24.56 12.07 41.45 11.33 40.82 16.58 54.57 27.29 70.84 3.57 5.46 8.71 13.54 11.44 17.84 2.62 4.3 7.24 11.12 10.07 15.22 9.66 13.64 18.05 32.85 29.7 67.69 8.5 25.4 8.29 24.77 18.68 65.59 14.59 57.09 17.84 73.15 18.05 88.16 0 6.61-.42 9.45-2.31 13.64-1.68 3.57-2.52 7.87-2.83 13.54-.52 10.39-2.83 19.52-6.61 26.34l-2.94 5.25-6.82.52c-11.23.84-14.17 4.2-13.22 14.8.63 6.51 4.83 12.8 11.33 17.21l4.72 3.15h18.89c12.17 0 20.78-.52 24.35-1.47 3.04-.73 5.88-1.05 6.3-.84.52.31.31 5.46-.31 11.44-1.99 17-1.99 18.47 1.15 19.31 1.47.42 2.94.42 3.15.21s1.15-5.35 2.1-11.44c2.41-17.11 4.72-28.23 7.03-35.05 2.62-7.66 8.5-19.52 12.38-25.19 4.72-6.72 5.88-13.85 3.67-22.88-1.99-8.08-7.98-22.04-10.91-25.4-.94-1.15-2.41-4.72-3.25-7.87-.73-3.04-2.52-8.29-3.99-11.54-5.46-12.38-6.72-19.1-9.13-48.28-.84-10.07-1.99-24.03-2.62-30.96-.63-6.93-1.57-24.87-2.1-39.88-.84-23.3-1.36-28.76-3.57-37.26-7.45-29.39-19.1-52.26-36.42-71.89-10.91-12.38-16.37-22.46-20.67-38.41-2.62-9.55-3.78-17.42-6.51-45.55-4.41-44.6-10.6-95.82-12.07-98.02-.94-1.68-5.25-36.63-6.82-56.57-1.36-17.32-2.83-24.56-8.4-40.61-7.35-21.3-14.9-47.33-19.52-66.64-.94-4.3-4.09-13.75-6.82-20.99-7.14-18.68-9.34-28.02-9.34-39.04 0-13.54 3.67-34.53 8.5-48.07 2.73-7.77 13.01-26.24 21.72-39.25 5.04-7.35 10.28-15.32 11.75-17.53s2.83-4.09 3.25-4.09c.31 0 2.52 9.55 4.93 21.2 2.41 11.75 5.56 26.24 7.03 32.32 5.04 20.99 5.77 25.4 5.77 36 0 18.68 6.3 59.61 13.22 86.27 6.61 25.29 10.6 45.34 11.75 59.3 1.26 15.32 5.35 26.87 11.86 33.06 2.31 2.31 5.88 7.45 7.98 11.33 5.77 10.91 11.86 14.27 15.53 8.71 1.57-2.31 1.57-2.83-.1-6.09-.94-1.89-2.62-4.62-3.67-5.98-3.46-4.3-2.2-4.93 1.99-.94 3.88 3.78 6.19 4.83 12.28 5.46 2.52.21 3.67 1.26 5.88 5.35 3.36 6.09 4.83 17.63 2.94 22.98-1.47 4.09-.63 8.5 1.89 9.45 3.78 1.47 9.66-10.07 9.76-19.21q0-3.46 2.62-1.78c1.99 1.36 3.15 1.47 4.72.63 1.89-1.05 1.57-1.68-4.72-11.33-9.97-14.8-9.55-13.85-5.77-13.85 1.78 0 7.45 2.1 12.59 4.72 9.76 4.93 13.64 5.67 15.64 3.25.94-1.15.42-2.1-2.73-4.51-2.2-1.78-5.14-3.78-6.51-4.51-1.36-.63-4.51-2.83-6.93-4.72-4.2-3.15-15.64-7.87-19.1-7.87-2.83 0-29.18-18.58-30.85-21.72-.94-1.78-.94-8.5.1-29.39 2.83-56.46 1.57-77.56-6.3-108.93-2.2-8.71-4.72-22.14-5.67-29.91-4.09-33.58-4.83-40.3-6.4-58.25-.84-10.39-2.1-22.25-2.62-26.24-.63-4.09-1.47-13.96-2.1-22.04-1.57-24.03-3.78-36.42-9.03-50.06-3.67-9.66-5.35-11.96-17.84-22.88-9.76-8.71-10.18-9.24-16.16-21.51-6.61-13.85-10.49-27.18-10.49-35.89 0-5.46.1-5.56 2.62-4.93 2.73.63 2.62.84 5.88-7.98.84-1.99 2.94-5.35 4.93-7.45 4.09-4.72 7.98-13.75 9.66-22.98.73-3.78 1.68-7.66 2.2-8.61.52-1.05.94-3.99.94-6.61s.63-6.51 1.47-8.61c.84-2.2 1.78-7.98 2.1-12.91s.84-11.86 1.15-15.53c.94-10.28-.63-14.38-8.5-21.93-4.51-4.41-6.51-7.03-6.09-8.08.31-.94.21-1.68-.31-1.68s-1.89-.84-3.04-1.89c-3.99-3.46-7.24-4.72-12.7-5.04-5.56-.21-13.12-4.3-10.7-5.67 1.47-.94-3.99-4.51-7.45-4.83-1.47-.21-3.57-.52-4.72-.73s-3.46-.21-5.25.1Z"/></svg>
\ No newline at end of file
diff --git a/internal/static/performer/NoName29.png b/internal/static/performer/NoName29.png
index 21e9e27fa1dc3cf7a9a51bff6f115f6edd2cffbe..8a53967a55f999a84c39428076586e11f97b3d57 100644
GIT binary patch
literal 2990
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
Cs>O%^

literal 11191
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

diff --git a/internal/static/performer/NoName30.png b/internal/static/performer/NoName30.png
deleted file mode 100644
index ba968026df04faa2898e8f4e54a077c1182b4cc2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12278
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
J!Ceab{{UY!5Jmt1

diff --git a/internal/static/performer/NoName30.svg b/internal/static/performer/NoName30.svg
new file mode 100644
index 000000000..c77b1163f
--- /dev/null
+++ b/internal/static/performer/NoName30.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 850 1250"><path fill="#fff" d="M307.41 127.49c.55-.43.97-.95 1.3-1.52-1.88 1.9-3.08 2.75-1.29 1.52Zm318.81 989.97c-7.54-14.53-27.11-25.22-26.81-54.03.28-28.77-8.44-95.16-8.72-97.28-.31-2.02-9.07-59.61-20.77-78.88-11.78-19.21-28.33-55.7-28.33-55.7s-12.64-55.79-13.86-82.5c-1.18-26.7-1.8-64.37-1.8-64.37l9.96-.58s-15.05-78.89-25.32-94.01c-10.18-15.1-13.22-61.13-12.64-81.22.61-20.21 2.14-46.28 2.14-46.28s74.36-41.53 78.56-51.85c4.19-10.43-1.53-70.35-1.53-74.5s-21.39-95.74-22.85-99.94c-1.51-4.11-10.21-27-12.98-32.64-2.71-5.66-14.13-19.27-31.88-18.41 0 0 11.45-2.3 18.33 1.55 6.96 3.84-8.43-6.54-14.41-7.12-6.02-.61-6.31-2.98-9.08-4.74 0 0 14.49 4.13 16.89 5.61 2.43 1.44-4.53-27.6-14.12-35.31 0 0 11.1 8 13.54 16.9 0 0 .3-9.47-8.17-19.85-8.41-10.38-11.99-13.03-15.3-19.84 0 0 12.62-5.63 21.37 11.83 8.7 17.48 6 12.75 11.41 16.91 5.42 4.17-4.81-5.35-6.3-12.45-1.53-7.13-11.75-23.46-19.59-25.83-7.81-2.32-11.73-9.47-18.06-23.92 0 0 3.02-2.14 8.43 8.5 5.4 10.69 15.06 16.94 19.85 19.61 4.84 2.62-10.82-11.57-18.65-27.02-7.86-15.36-14.72-9.76-19.29-16.33-4.52-6.49-25.88-68.16-74.34-46.25 0 0-34.62-13.33-54.19 8.02-19.53 21.38-13.82 35.9-20.17 36.5-6.32.56-15.94-.95-21.96 3.54-5.99 4.43-6.57 11.28-6.57 11.28s3.54-4.16 10.78-8.02c7.25-3.84 15.06-.29 19.28-2.65 0 0-5.74 12.19-9.35 13.9-3.6 1.79-10.21 3.9-10.49 15.46-.25 9.85 1.4 16.92-.52 20.41 2.28-2.28 5.58-6.28 5.94-10.34 0 0 1.48 15.43-1.85 18.09-3.27 2.68-12.04 7.09-12.63 10.08-.57 3.01 8.14 6.52 9.63 11.84 1.26 4.54 3.58-3.02 2.87-8.21 1.61 4.21 4.18 10.94 3.46 12.35-1.18 2.39-3.92 8.63-4.8 10.1-.9 1.52.6-2.91-3.33 11-3.92 13.98-2.41 17.5 2.74 9.19 5.1-8.3 2.05-15.98 6.89-22.25 4.84-6.23 10.55-13.35 7.23-1.46-3.31 11.83-8.42 26.64-13.86 30.53-5.4 3.88-2.39 8.28-1.48 10.39.91 2.02 9.02-10.71 12.03-17.21 2.99-6.52 0 15.69-5.12 19.23-5.11 3.63-16.84 1.25-16.56 8.33.29 7.13 5.71 9.22 7.79 9.22s-4.78-4.46-.88-8.89c3.95-4.48 13.25-3.91 16.55-10.39 3.34-6.53 3.05 3.26 1.19 6.26-1.79 2.91-1.79 5.9-6.28 9.15-4.53 3.23 5.42 4.19 11.42-.57 0 0-6 10.1-31.27 21.38-25.33 11.2-34.06 60.2-34.06 60.2s-13.22 55.14-23.19 64.31-12.34 10.45-19.88 82.76c0 0-1.76 6.81 9.38 10.41 0 0 50.56 29.96 59.33 31.42 0 0-27.74 91.59-42.47 121.27-14.76 29.7-15.38 51.58-15.38 51.58l31.95 4.52s12.3 102.58 9.63 140.86c-2.71 38.23-7.55 62.26-9.63 69.11-2.14 6.8-11.51 42.34-5.78 78.53 5.78 36.22 6.96 78.62 8.16 88.07 1.19 9.49 6.02 38.57 5.4 53.12-.56 14.55-5.4 22.57-9.61 29.09-4.25 6.5-4.25 28.42-4.25 28.42s-2.68 51.04 1.84 57.81c4.5 6.86 32.8 14.6 41.56 12.18 8.73-2.38 19.83-11.81 20.74-19.53.89-7.7-8.76-25.87-8.42-42.45.29-16.59-.59-42.72-.59-45.65s-4.25-16.04-3.62-32.63c.62-16.63 9.32-66.12 17.75-101.45 8.42-35.21 6.63-86.86 6.93-90.43.29-3.56.29-11.26 11.13-42.98 10.86-31.72 12.04-71.5 13.83-76.54 1.82-5 16.55-85.71 16.55-85.71l31.92 1.19s37.03 118.34 42.18 126.65c5.06 8.28 13.2 34.69 36.71 70 0 0 7.48 10.38 23.78 67.57 16.25 57.22 27.97 56.65 42.45 98.48 14.44 41.81 10.53 81.83 10.53 81.83s-3.61 35.64-18.7 52.5c-14.98 16.92-18.04 28.81-14.98 30.59 2.94 1.78 76.42 9.74 83.62-20.49 7.26-30.27 3.34-36.2 6.64-44.19 3.27-8.06 13.79-22.26 6.33-36.78v.02Zm-106-788.91 13.23 54.55-18.03 12.2 4.8-66.75ZM311.91 451.93l-35.54-24.89 42.45-112.69c-11.17 54.28 16.24 69.09 16.24 69.09l2.73 13.39c3.9 28.41-25.89 55.11-25.89 55.11Z"/></svg>
\ No newline at end of file
diff --git a/internal/static/performer/NoName31.png b/internal/static/performer/NoName31.png
deleted file mode 100644
index a4003fa7544ec6eeb6c741cc68501aecddfabebc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11289
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
AwEzGB

diff --git a/internal/static/performer/NoName31.svg b/internal/static/performer/NoName31.svg
new file mode 100644
index 000000000..5504136d2
--- /dev/null
+++ b/internal/static/performer/NoName31.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 850 1250"><path fill="#fff" d="M601 1191.51c-.4-5.5-4.3-17-7.1-30.8s-6.3-35.1-5.9-44.2c.4-9.1.8-14.2-2.1-20.9s-1.1-24.5-1.1-46.2 2.4-87.6 0-107.7c-2.4-20.1-11.8-46.6-16.2-57.2-4.3-10.7-2-20.9-3.6-29.6s-4.3-17.8-5.5-24.5-.8-15.4 0-26.8 0-39.5 0-39.5l1.6-1.6s-.4-15.4-1.6-28.8c0 0-.3-8.8-.6-17.4 4.9-4.3 12.6-12.8 14.8-15 2.4-2.4 8.3-3.9 9.9-5.9 1.6-2 9.5-25.6 10.3-29.6.8-3.9-2.8-21.3-2.8-21.3l2.4.8s-2-22.9-1.2-25.2 1.2-9.9 1.6-14.3c.4-4.3-5.5-14.6-5.5-14.6s-2-24.9-3.2-41-2.8-79.7-5.5-91.9c-2.8-12.2-5.1-29.2-4.7-42.6.4-13.4 3.2-44.6 5.9-77.3 2.8-32.7 5.9-77.7 2.4-87.2-3.6-9.5-17.4-17-28.4-20.1-11-3.2-32.9-6.9-32.9-6.9-2.6-3.7-5-9-7-15 .8-10.2 1.3-26.3-.8-40.5-3.2-21.3-12.6-47.3-12.6-47.3s-.8-12.2-3.9-22.5c-3.1-10.3-3.6-32.7-20.9-51.3-17.5-18.4-34.1-21.2-45.1-20.4-11 .8-18.5 5.5-28 12.2-9.5 6.7-13.4 9.5-17 16.6s-10.3 35.5-13.8 49.7-2.8 22.9 0 36.7c2.8 13.8 0 42.2 0 61.6s-.4 38.3-.4 38.3-20.9 12.2-29.6 16.2c-8.7 3.9-8.3 3.6-18.5 12.2-10.3 8.7-9.9 15.8-11 30.4-1.2 14.6-2.4 40.2.8 63.1s-3.6 80.9-4.7 91.1c-1.2 10.3-6.3 19.3-12.2 36.7-5.9 17.4-8.7 38.3-13 59.2s-11.8 50.1-11.8 56-7.5 16.6-8.3 20.1c-.8 3.6-2.4 13.4-4.3 17-2 3.6-2.4 16.2-2.4 16.2s2 0 2 1.6-9.5 27.6-9.9 30.4c-.4 2.8 4.3 7.5 5.5 11 1.2 3.6 3.9 18.2 6.3 21.3 2.4 3.2 11.8 9.1 14.2 11 1.6 1.3 3.7 1 6.1.3l-1.7 11.5s11.8 3.2 17.8 5.9c5.9 2.8 32 8.3 32 8.3s6.7 45 9.5 69c2.8 24.1 1.2 46.2 2.4 80.9s16.6 94.7 29.2 132.6c12.6 37.9 17 54.1 17.8 60.4s-1.2 15.8 1.2 20.9 3.6 10.3 2.4 20.9c-1.2 10.7-8.3 34.3-10.7 42.6-2.4 8.3 2 21.3 3.6 24.5s8.7 8.3 27.2 8.5 25.3-9.6 25.3-9.6.8-8.3-.4-22.9 0-24.9 0-36.7 3.2-15 3.6-22.9c.4-7.9-3.6-13-6.7-20.1-3.2-7.1-5.5-11-7.5-13.4s-6.3-9.5-11.4-28-2-44.2-2.4-82.9-4.7-39.8-8.8-72.6.1-47.7 2.1-59.6-1.2-24.1-2-43 2-47.3 2-47.3 37.1 0 47 1.2 22.5 4.7 22.5 4.7 15 52.9 19.7 75.4 6.7 26.8 11.8 41 6.7 27.2 7.5 49.3 5.9 40.2 15.4 66.3c9.5 26 18.5 69.4 20.5 78.1s-.4 17-1.6 21.7c-1.2 4.7.4 8.7-.8 12.6s-6.3 13.8-5.4 21.3c.9 7.5 3.8 12.6 4.2 20.9s0 15.4-2.8 24.9-.8 17.8 0 26.8c.8 9.1 5.9 9.5 17.4 12.2 11.4 2.8 22.5 3.9 32 0 8.9-3.9 7.8-22.4 7.4-28Zm-324-486.9c-1.8-2.4-4.2-5.8-3.9-7.8.4-3.2 3.9-9.9 3.9-9.9v17.7Zm16.4-47.7c-1.9-6.6-2.9-13.9-1.8-14.1 1.6-.4 5.5-10.7 5.5-10.7l-3.7 24.8Zm68.8-218c-2 16.4-6.3 21.5-6.3 21.5l3.2-43s5.1 5.2 3.1 21.5Zm140.9-294.9s.4-3.6 6.3 14.2c3.6 10.8 4.1 32.5 4.2 46.9-7.6-25.4-10.5-61.1-10.5-61.1Zm48.4 489.8c-3.3-23-10.4-67.1-14.5-87-5.1-24.5-24.9-63.1-27.2-67.9-2.4-4.7-2.4-18.5-2.4-18.5l7.1-5.9-5.9-9.1s2.4-9.5 3.9-14.6c1.6-5.1 17.8-60.8 17.8-60.8s.8 2.4.8 14.6.8 43.8-1.2 65.5 2 17.4 6.3 37.5 13 50.5 12.6 62.3c-.4 11.8 4.3 25.6 5.5 31.6 1.2 5.9-.8 18.1-.8 21.3s4.3 6.3 4.3 6.3-.8 2.8-1.6 4.3c-.8 1.6 1.6 6.8 1.6 6.8s-2 5.5-5.9 12.6c0 .3-.2.7-.4 1Zm6 58.3c3.7-5.6 1.2-12.8 1.6-17 .4-4.7 2.4-10.3 3.2-9.1s5.1-1.6 3.6 2.8c-1.6 4.3 1.2 14.6.4 17s-5.1 7.5-5.1 7.5l2 2.8s-2.3 2.3-5.1 2.4c-.2-1.9-.4-4.1-.6-6.4Z"/></svg>
\ No newline at end of file
diff --git a/internal/static/performer/NoName32.png b/internal/static/performer/NoName32.png
deleted file mode 100644
index 0ca4aca171885302a3b67b4ecfd2b8500b81b120..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13180
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

diff --git a/internal/static/performer/NoName32.svg b/internal/static/performer/NoName32.svg
new file mode 100644
index 000000000..ec72d0836
--- /dev/null
+++ b/internal/static/performer/NoName32.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 850 1250"><path fill="#fff" d="M464.7 27.12h3.73c10.7-.03 20.7 4.45 29 10.93 9.09 3.81 16.75 10.68 20.76 19.74 6.76 5.58 11.39 14.03 10.91 22.82 12.72 16.63 9.65 38.15 8.58 57.21-10.41 24.48-29.84 45.3-39.52 68.48-2.45 6.02-.05-1.22-.81-3.11 10.39-24.99 33.81-44.52 38.13-71.96-8.3 29.47-32.85 50.45-46.73 77.14-4.39 12.75-3.07 26.19 0 39.05 12.11 4.13 23.92 10.99 30.27 22.56 13.24 24.52 12.15 53.29 19.03 79.68 6.63 24.83 16.53 48.65 24.29 73.1 2.18 18.26 15.92 31.37 23.72 47.25 13.5 27.38 24.35 56.05 40.05 82.33 13.24 21.85 23.38 45.45 31.62 69.55v6.57c-3.27 16.46-7.44 35.06-23.8 43.61-2.73-.09-4.08-3.6-3.62-6.1-3.42 3.89-12.46 7.58-10.72-1.39 5.11-5.44 10.8-10.72 14.5-17.43-6.19 5.54-9.91 13.81-17.7 17.51-3.35.2-4.8-4.02-3.33-6.65 3.29-6.42 9.76-10.65 12.31-17.55-3.14 3.8-5.91 8.86-10.82 10.64-4.76-1.67-1.79-7.48.32-10.18 8.39-11.62 3.67-27.06-3.31-38.15-5.24-8.5.27-19.86-7.22-27.35-29.96-38.76-66.82-73.63-85.92-119.58-10.62-39.15-36.48-74.54-33.68-116.73-6.31 14.88-12.91 33.46-16.95 50.46-5.81 16.44-4.58 36.39 7.9 49.51 15.82 15.55 32.87 29.8 49.36 44.62 20.99 18.07 37.22 42.32 43.39 69.52 6.12 20.18 4 42.66 14.11 61.6 6.96 15.05 4.05 39.98-16.38 41.65-3.32 62.36-21.24 124.03-13.18 186.71 3.83 19.94 10.56 39.59 9.48 60.19-1.5 59.55-31.33 115.89-25.07 175.99-2.87 36.97 16.07 73.27 8.22 110.13-9.36 23.91-49.53 18.06-57.17-3.78-.46-14.56.78-29.3 4.54-43.41 4.19-17.94.11-36.73 4.79-54.48-2.13-18.87 6.4-36.94 3.79-55.93 2.39-46.54-11.57-91.99-9.32-138.44.71-12.41 2.85-25.21-.87-37.36-7.72-24.96-4.08-51.72-12.77-76.46-6.41-35.47-8.76-71.6-17.69-106.63-7.53 1.85-15.6 3.07-22.76 5.33-10.71 27.26-18.19 55.71-29.63 82.72-7.49 20.73-21.22 38.84-27.05 60.18-5.5 24.69 7.43 47.17 20.41 66.9 19.07 30.17 22.41 66.74 22.85 101.57 3.31 35.16-1.68 72.43 13.33 105.52.37 2.82 3.43-1.03 4.08 1.6 4.42 10.16 15.56 15.83 18.44 26.74 6.04 19.12-.11 39.68 6.19 58.74 1.62 3.39-3.83 4.09-5.59 3.37-3.14-10.94-5.15-22.35-7.59-33.51-.01-1.68-1.7-2.41-3.11-1.73-24.65 10.79-44 30.84-58.44 53.2-9.11 14.98-28.4 15.42-43.73 18.24h-19.38c-7.71-.88-15.14-8.95-13.43-16.79 13.37-13.29 33.08-17.45 47.9-28.8 8.45-14.69 13.53-30.91 20.62-46.24 5.63-11.46 6.03-24.82 3.83-37.2-9.75-60.41-37.47-115.76-54.34-174.21-8.15-35.24-35.63-65.4-31.43-103.09 8.31-51.18 6.79-103.73 19.64-154.2 3.46-8.37-12.7-4.98-10.55-13.65 14.02-17.51 24.65-37.71 31.97-58.88 1.87-6.29 3.78-13.62.47-19.76-7.46-16.09-12.91-32.97-16.55-50.32-12.77-38.61-24.93-77.46-36.23-116.53-3.39-6.09-10.17-9.33-13.94-15.19-10.76-14.37-11.43-34.11-5.7-50.64 6.15-16.47 10.49-33.56 16.06-50.2 9.13-15.88 11.12-34.58 13.36-52.45 2.5-11.12-7.63-18.7-14-26.17-35.99-32.29-70.37-69.09-87.32-115.25v-6.02c2.29-7.32 8.48-12.15 14.85-15.9 20.35-14.69 45.88-19.51 70.49-20.82 11.79.14 23.65-1.23 34.82-5.14 16.28-.55 28.42 12.24 41.24 20.05-1.14-5.82-1.55-13.39 1.62-18.42 8.67 4.04 13.49 12.78 16.26 21.52 18.17-19.82 44.53-44.35 74.52-36.67 4.29.54 7.51-3.03 11.57-3.77M307.82 83.62c-17.22 2.55-31.18 13.31-45.67 21.92 15.56 17.07 28.8 36.84 48.13 49.99 18.43 10.37 34.66 24.15 49.09 39.53-6.75-15.42-10.39-32.31-7.24-49.1-3.5 3.48-1.51 11.31-3.44 14.81-1.82-12.45 6.48-22.77 7.63-34.79-3.97 5.18-4.55 13.84-6.98 19.34.47-14.03 7.49-26.33 12.18-39.14-21.12 5.97-35.4-18.18-53.7-22.56Z"/></svg>
\ No newline at end of file
diff --git a/internal/static/performer/NoName33.png b/internal/static/performer/NoName33.png
index 38ae2116c799f46f61dde20fc10058dc62936c56..025a1ff7fe97d03f7dfae1607431bc40fc05e7d1 100644
GIT binary patch
literal 3506
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

literal 11984
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
X2EtB1UrmA6rdN<ntc(jt$0PqA8==@R

diff --git a/internal/static/performer/NoName34.png b/internal/static/performer/NoName34.png
deleted file mode 100644
index c40683098437b9a4163422ee6307d77d85899cf2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12270
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
A2><{9

diff --git a/internal/static/performer/NoName34.svg b/internal/static/performer/NoName34.svg
new file mode 100644
index 000000000..49086ca8a
--- /dev/null
+++ b/internal/static/performer/NoName34.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 850 1250"><path fill="#fff" d="M272.72 1194.61c3.1-5.25 22.12-11.6 24.64-19.09 2.51-7.56 4-20.12.99-30.18-3.03-10.03-6.54-24.09-6.54-32.61s-6.04-36.17-6.04-48.25-9.03-57.21-12.05-69.29c-3.01-12.08-16.58-76.37-19.61-88.42-3.01-12.04-28.09-64.3-18.03-84.42 9.99-20.05 29.61-60.73 33.14-70.79 3.49-10.06 12.05-33.63 14.04-44.72-13.56 4.04-34.68 11.57-34.68 4.55s-2.99-41.71 1.01-55.23c4.04-13.59 6.02-28.13 6.02-35.2s-2.99-160.75.53-178.86c3.5-18.03 14.04-82.84 15.55-99.42 1.52-16.6.51-80.87 8.06-89.41 7.53-8.56 19.59-19.09 26.11-24.12 6.54-5.03 10.56-13.05 12.06-18.1 1.5-5.01 16.08-43.14 16.6-53.21.5-10.04 11.53-53.26 14.56-64.31 2.97-11 12.01-36.13 23.57-47.7 11.57-11.55 24.64-17.07 40.7-16.08 16.08 1.03 29.16 5.53 35.18 13.57s31.61 69.82 34.63 86.4c3.01 16.58 11.05 79.85 17.07 91.91 6.02 12.05 24.6 35.67 24.6 46.73s4.55 78.34 6.06 89.91c1.5 11.55 5.03 27.63 6.53 38.17 1.51 10.56 27.61 81.37 30.66 93.91 3.01 12.6 41.12 123.58 40.65 131.64-.48 8.04-.48 19.09 1.51 23.61 2.02 4.52 6.02 21.08 6.02 28.57s-23.61 38.7-29.59 43.25c-6.03 4.52-16.09-5.03-10.06-8.04 6.02-3.05 15.05-10.54 17.04-14.06-5.99.48-7.05-.51-7.97-7.56-.99-7.01-10.54-33.12-10.54-41.16s-2.05-17.07-1.03-23.11c1.03-6-6.02-19.59-6.02-13.05s4.99 29.15-1.03 29.15-15.57-3.01-15.57 1.51.51 25.08-1.51 36.13c-2.02 11.05-14.58 146.69-12.56 160.72 2.02 14.1 11.05 63.82 5.55 93.45-5.55 29.63-24.64 109.97-27.65 125.1-3.01 15.05-9.07 24.09-6.53 33.12 2.54 9.03 13.55 26.66 9.03 36.17-4.52 9.54-11.57 22.07-16.05 31.61-4.55 9.55-5.54 9.55-5.54 31.21s-.99 24.6-11.06 27.1c-10.06 2.5-58.77 10.58-57.25-3.01 1.5-13.55 17.59-35.69 19.57-49.24 2.02-13.55 4.55-35.18 9.54-49.68 5.07-14.61 12.56-51.77 16.6-69.88 4.01-18.07 2.5-106.48 4.99-125.58 2.5-19.09 0-59.23-4.52-76.85-4.52-17.55-4.52-48.25-3.49-64.77 1.03-16.56-1.03-85.41 2.46-98.48-10.98 1.03-39.62 12.08-56.23 7.56-15.57 18.07-33.15 40.17-48.71 61.32-15.55 21.08-55.26 74.79-52.75 83.83 2.52 9.07 10.56 38.7 7.05 43.73-3.53 4.99-5.55 6.02-2.51 10.54 3.01 4.52 7.53 21.04 7.53 32.64s3.03 128.08 6.54 140.12c3.53 12.04 18.6 25.63 26.09 26.14 7.53.52 13.07 0 13.07 9.55s-2.02 45.68 0 61.24c2.02 15.57 7.53 22.62 2.02 23.13-5.55.48-5.55 2.49-11.58-12.56-5.97-15.09-12.01-35.18-13.51-28.16-1.52 7.05-4.04 8.56-6.55 20.08-2.5 11.57 2.04 38.7-9.02 43.73-11.07 5.03-38.68 6.57-50.25 6.57s-18.12-2-11.59-13.01l.03-.05Zm22.61-719.8c-2.51 15.05-.47 117.52-.47 128.55s2.51 18.1-1.01 17.61c-3.53-.49-2.51 5.01 0 18.09 2.52 13.07 0 35.1-2.02 46.7-2 11.53 1.52 8.52 5.01 8.52s10.08-13.07 20.64-25.63c10.54-12.48 4-13.51 6-23.06 2.02-9.55 9.05-21.59 13.06-27.14 4.04-5.54 5.05-3.03 5.05-9.05s3.01-10.54 7.53-19.59c4.53-9.03-4.02-14.58-7.03-32.17-3.01-17.53 2.02-55.22 2.02-73.29s-16.6-63.78-21.11-76.85c-4.53-13.06-4.53-20.6-8.56-49.76-8.02 8.08-16.56 101.99-19.08 117.1v-.04Zm183.85-84.9c0 13.07-.51 21.59 1.47 34.17 2.06 12.52 11.09 18.03 22.14 28.58-6.06-9.53-6.53-23.54-10.06-40.65-3.53-17.09-4.01-24.62-10.02-53.26-3.55 5.05-3.55 18.1-3.55 31.17l.03-.02Z"/></svg>
\ No newline at end of file
diff --git a/internal/static/performer/NoName35.png b/internal/static/performer/NoName35.png
index 92d9ad7845aaa3be52b65dbf2e08f18c64ad7d55..70dc814436b0bc59d55be9d1d9d3a7c16b62d771 100644
GIT binary patch
literal 2503
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
DC}Y2h

literal 8573
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

diff --git a/internal/static/performer/NoName36.png b/internal/static/performer/NoName36.png
deleted file mode 100644
index 7796c8b634deaf396a50c735c62c1613e176fac7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9733
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

diff --git a/internal/static/performer/NoName36.svg b/internal/static/performer/NoName36.svg
new file mode 100644
index 000000000..b69ce0aa3
--- /dev/null
+++ b/internal/static/performer/NoName36.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 850 1250"><path fill="#fff" d="m598.73 660.85-12.95-28.13-2.5-12.16c-.65-4.34-.66-93.98-.66-93.98 3.03-41.29-8.28-89.78-8.28-89.78-4.81-22.33-2.24-77.76-2.24-77.76 3.82-39.32 1.62-81.34 1.62-81.34-1.16-28.38-47.25-39.23-47.25-39.23-14.77-6.47-43.02-27.96-43.02-27.96-6.74-9.16-4.33-30.96-4.33-30.96 6.08-6.97 8.37-26.06 8.37-26.06.8 2.33 3.86 2.2 3.86 2.2l-1.36 7.13c-5.03.91-1.93 10.58-1.93 10.58-7.5 15.52-1.82 30.51-1.82 30.51 13.32-11.75 9.27-30.1 9.27-30.1 4.19-4.18-.48-11.78-.48-11.78l.59-5.8c6.77-4.64 2.82-11.91 2.82-11.91 1.25-1.11 2.71-8.6 2.71-8.6 7.36-27.67-3.96-21.78-3.96-21.78s14.76-34.1-7.28-62.57c0 0 2.27-10.83-11.65-19.46 0 0-33.63-20.56-49.22 2.02 0 0-42.35 14.24-35.56 56.19l2.01 20.21s-9.55-5.62-5.85 18.52c0 0-.75 10.53 1.98 13.72 0 0-3.85 9.59 2.43 10.4l.21 5.06s-6.38 2.62-4.47 11.74c0 0-3.61 18.43 9.58 26.62 0 0 7.65-9.04 5.73-21.47l4.48 8.66s1.74 19.51-11.14 27.47c0 0-26.21 16.76-34.66 17.7-41.45 4.65-45.94 13.09-45.94 13.09-15.73 10.43-15.16 35.89-15.16 35.89-1.38 15.27-3.7 65.26-3.7 65.26-2.11 8.93-7.43 57.63-7.43 57.63-3.06 20.41-7.86 35.59-7.86 35.59-9.39 21.38-14.3 56.85-14.3 56.85-1.57 22.12-9.94 71.3-9.94 71.3-2.89 12.86-4.61 20-4.61 20l-17.98 21.85c-4.03 2.29.57 13.9.57 13.9l4.72 14.43c3.58 12.47 8.96 14.26 8.96 14.26l14.33 1.3c13.3 5 6.86.43 6.86.43 2.69-.58 1.64-3.13 1.64-3.13l6.59-.27c10.55-1.73 4.4-4.78 4.4-4.78-.07-4.48-14.1-7.21-14.1-7.21 4.5-2.54 4-14.67 4-14.67 1.73-3.73 2.07-7.04 2.07-7.04 11.84-13.34 5.23-30.65 5.23-30.65-2.6-5.91 40.78-98.75 40.78-98.75 10.13-23.42 10.86-34.42 10.86-34.42.26-5.08.8-38.13.8-38.13s.89-10.06 3.03-15.22c0 0-1.19 19.98 5.78 17.34 0 0-5.19 14.37.53 12.84 0 0 2.86 3.66-1.3 8.55 0 0-9.57 13.96 8.34 13.46 0 0-3.06 8.85 4 5.62 0 0 3.3 5.64-7.34 10.8 0 0 1.38 7.73 11.44-.11 0 0-3.64 17.72-8.13 23.33l-6.79 18.44c-5.82 13.45-6.49 57.59-6.49 57.59-6 9.09-1.63 20.59-1.63 20.59 3.2 6.24 4.39 12.09 4.39 12.09-9.71 24.93 7.39 85.33 7.39 85.33l15.01 43.97c3.39 22.39 8.12 19.72 8.12 19.72l7.32 23.17c10.73 23.03 6.23 31.12 6.23 31.12 4.01 2.78 5.42-.22 5.42-.22-.82 2.98 5.93 49.65 5.93 49.65 3.36 21.45-.97 36.72-.97 36.72-11.51 41.64 25.91 131.64 25.91 131.64l-1.86 35.34c-1.28 17.63-8.59 40.93-8.59 40.93-4.2 4.06-3.86 12.43-3.86 12.43-.23 5.91-3.35 13.35-3.35 13.35-5.9 11.45-7.92 34.06-7.92 34.06-.03 10.74-6.92 35.55-6.92 35.55-3.5 21.14 3.45 29.58 3.45 29.58l1.51 5.13c18.76 5.84 48.22-.68 48.22-.68l2.86-7.9c8.06-7.64 2.86-25.24 2.86-25.24l10.29.64c34.86 1.52 28.62-41.28 28.62-41.28-2.3-21.49-12.69-50.67-12.69-50.67l-1.92-15.14c4.25-19.99-2.46-31.39-2.46-31.39-1.71-7.24-1.79-9.24-1.79-9.24l3.95-12.9c21.62-65.52 30.32-109.4 30.32-109.4 3.94-7.47 1.38-75.9 1.38-75.9 4.83-20.25 5.98-32.56 5.98-32.56 2.51-10.84 14.17-48.59 14.17-48.59 2.85 9.2 10.3.99 10.3.99 4.66 7.12 8.79-1.3 8.79-1.3l5.58 3.66c7.91 3.1 7.55-54.69 7.55-54.69 3.02 1.76 3.54-14.3 3.54-14.3s2.23 14.06 6.94 13.87c0 0 1.3-.05 4.92-3.62 0 0 12.09-1.56 15.62-7.36l9.65-20.68s7.2-5.6 2.85-19.7ZM528.26 397.4l.37 14.73-4.12.17c2.32-3.87-2.55-7.56-2.55-7.56 4.36-.18 6.31-7.34 6.31-7.34Zm3.13 70.76c-6.96-5.85-7.57-20.57-7.57-20.57 4.74.51 2.42-7.06 2.42-7.06 4.2-3.95 3.82-4.64 3.82-4.64l1.65-.07c-.1 6.26-.33 32.33-.33 32.33Zm47.25 217.81-7.65.31c-2.1-2.39-.65-10.24-.65-10.24 10.06.89 8.31 9.92 8.31 9.92Z"/></svg>
\ No newline at end of file
diff --git a/internal/static/performer/NoName37.png b/internal/static/performer/NoName37.png
deleted file mode 100644
index c47f0abac68d9348a268333a831fb2e81ece4100..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9818
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
Dd+?nn

diff --git a/internal/static/performer/NoName37.svg b/internal/static/performer/NoName37.svg
new file mode 100644
index 000000000..d0053cb58
--- /dev/null
+++ b/internal/static/performer/NoName37.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 850 1250"><path fill="#fff" d="M349.45 398.98c.51 0 .92.88.89 2.3-.04 2.38.77 3.93 1.92 3.93.1 0 .19-.01.29-.03.09-.03.18-.04.26-.04.78 0 1.04 1.54 1.81 9.46.53 5.34 1.36 11.31 1.82 13.28.46 1.97.79 4.18.78 4.8 0 .56.2.91.44.91.05 0 .1-.01.15-.04.2-.12.36-.17.45-.17.34 0 .04.66-.78 1.46-.69.66-.96 2.25-1 5.38-.04 2.76-.45 5.45-1.09 6.85-.64 1.4-1.18 4.7-1.35 7.89-.17 3-.48 7.23-.7 9.31-.22 2.2-.12 3.86.18 3.99 1.34.45.09 9.75-1.4 10.89-.74.54-2.3 5.67-2.84 8.97-.27 1.77-.67 3.36-.98 3.54-.25.18-.7 1.52-.91 3.05-.27 1.53-.72 2.74-1.08 2.74-.3 0-.56.55-.57 1.16-.01.67-.27 1.35-.58 1.52-.8.48-3.76 8.83-4.23 11.95-.21 1.84-1.04 3.54-2.22 4.87-1.56 1.75-1.88 2.67-1.92 5.37-.03 2.08-.36 3.61-.98 4.16-1.06 1.03-1.2 2.13-1.4 10.96-.11 3.37-.48 7.11-.87 8.27-.23.67-.38 1.06-.49 1.06-.19 0-.21-1.28-.2-4.44.02-5.46 2.25-22.17 3.35-25.71 1.22-3.6 2.07-10.88 2.53-20.81.27-5.58.65-10.48.85-10.9.26-.73.2-16.56-.09-25.88-.17-4.85.7-13.3 1.59-15.61.32-.85.95-5.69 1.39-10.71.75-8.7 1.22-11.33 2.83-16.21.39-1.16.98-3.91 1.26-6.11 1.09-7.04 1.69-10.09 2.19-10.88.22-.34.46-.5.67-.5Zm77.65 286.88s.08.03.11.08c.18.19.23.74.04 1.17-.07.19-.14.27-.2.27-.1 0-.16-.23-.16-.65-.04-.53.07-.87.2-.87Zm45.57-661.61c-3.19 0-6.29.11-8.23.35-1.72.22-4.06.79-5.23 1.33-1.17.47-4.13 1.04-6.64 1.18-2.52.21-5.41.71-6.46 1.19-2.58 1.12-9.32 3.21-10.4 3.21h-.01c-.75 0-8.22 4.41-9.1 5.38-.19.24-1.3.96-2.48 1.62-1.18.72-2.79 1.86-3.47 2.52-.75.66-2.42 1.62-3.65 2.09-1.23.53-2.41 1.43-2.61 2.04-.13.61-.88 1.52-1.63 2-2.97 1.92-11.01 10.07-11.03 11.23-.01.67-.7 1.52-1.5 1.94-.8.42-2.12 2.17-2.94 3.94-.82 1.7-1.71 3.16-1.95 3.28-.31.12-.5.73-.51 1.4 0 .61-.58 1.71-1.26 2.37-.69.66-1.25 1.64-1.26 2.19 0 .49-.33 1.53-.77 2.26-1.13 1.94-2.42 5.42-2.43 6.65 0 .61-.26 1.1-.56 1.1-.49 0-1.25 1.35-4.1 7.42-.57 1.22-1.03 3.17-1.05 4.4-.02 1.22-.28 2.2-.64 2.2-.31 0-.62.67-.63 1.52-.01.86-.4 2.2-.9 2.93s-1.21 2.86-1.67 4.7c-.4 1.83-1.05 4.22-1.37 5.25-.32 1.04-.59 2.57-.61 3.49-.01.92-.27 1.65-.63 1.65-.31 0-.63 1.34-.66 3.06-.03 1.65-.29 3.06-.6 3.06s-.68.48-.87 1.03c-.19.61-1.22 3.42-2.31 6.28-1.09 2.87-1.99 5.92-2.01 6.84-.01.86-.21 1.71-.46 1.83-.93.35-5.23 9.06-5.26 10.53-.01.86-.27 1.52-.57 1.52-.55 0-3.89 9.38-3.91 10.98 0 .55-.26 1.22-.58 1.52-.37.36-.98 3.66-1.47 7.46-.77 6.18-.97 6.85-2.13 7.02-1.04.11-1.36.78-1.77 3.1-.27 1.65-.91 3.48-1.41 4.03-.56.6-1.01 1.52-1.01 2.07 0 .55-.26 1.03-.62 1.03-.3 0-.61.3-.62.6 0 .37-.64 1.46-1.33 2.43-1.19 1.51-1.32 2.25-1.01 5.63.26 3.19.12 4.17-.76 5.26-3 3.76-5.24 5.56-9.32 7.64-2.47 1.25-4.52 2.5-4.52 2.75 0 .18-.81.72-1.73 1.08-3.02 1.24-11.95 11.04-11.98 13.24 0 .43-.25.73-.5.73-.62 0-3.91 7.11-3.93 8.4 0 .43-.84 2.56-1.92 4.81-1.02 2.19-1.91 4.39-1.92 4.81 0 .49-.25.85-.62.85-.31 0-.62.55-.63 1.22-.01.67-.41 2.81-.93 4.77-.52 1.89-1.25 5.13-1.65 7.15-1.01 5.44-2.47 12.59-5.76 27.2-1.59 7.27-3.07 15.71-3.3 18.96-.23 3.19-.76 9.25-1.13 13.47-1.11 11.88-1.68 48.24-.86 55.18.49 3.75.68 15.1.55 31.59-.1 14.17-.12 26.98-.08 28.52-.02 1.53-.32 4.96-.79 7.65-1.42 8.44-2.18 25.91-2.54 56.69-.19 19.81-.05 34.28.43 43.24 1.97 34.8 1.98 45.97.08 57.22-.61 3.55-.92 4.16-4.35 7.6l-3.74 3.74.37 3.99c.2 3.07.61 4.24 1.64 5.12 1.15 1 1.27 1.43.73 4.3-.33 1.77-1.31 5.38-2.21 8.06-1.94 6.1-3.09 17.25-2.45 23.57.27 2.52.44 7.12.45 10.13-.08 4.97.09 5.83 1.53 8 .84 1.36 1.8 2.6 2.04 2.79.3.19.9 1.36 1.43 2.66 1 2.47 1.66 3.4 5.52 7.81 1.45 1.56 2.77 3.48 2.94 4.22.17.8.65 1.42.96 1.43.98.02 2.18 1.57 2.4 3.17.11.77.5 1.37.91 1.37h.05c.03-.01.07-.02.1-.02.35 0 .77.53.92 1.26.51 2.46.09 21.4-.64 28.94-.82 9.13-2.91 21.3-3.65 21.78-.31.18-1.03 3.23-1.64 6.72-.55 3.49-1.33 6.54-1.7 6.78-.43.24-.79 3.73-1 9.31-.34 9.93-1.27 18.13-2.19 18.67-1.05.6-2.03 8.43-3.56 27.66-.38 4.59-1 8.88-1.38 9.48-.32.61-.84 2.75-1.06 4.71-.27 1.89-.73 3.48-1.03 3.48-.3 0-.56.61-.57 1.34-.01.74-.46 1.77-.96 2.32-.62.67-1.28 3.29-1.7 6.78-.42 3.31-1.53 7.83-2.62 10.69-1.02 2.68-1.86 5.37-1.87 5.86 0 .55-.4 1.77-.9 2.75-.5.91-1.41 4.15-2.01 7.21-.6 3-1.31 5.62-1.5 5.8-.74.54-1.95 3.28-2.42 5.48-.2 1.16-.79 3.24-1.24 4.58-.45 1.34-1.35 4.03-1.93 5.92-.64 1.95-1.4 3.53-1.65 3.53-.31 0-.56.79-.58 1.71-.02.98-.61 3.92-1.33 6.48-.91 3.48-2.71 16.46-2.77 20.32 0 .12-.35.23-.77.23h-.04c-.67 0-1 1.66-1.32 6.54-.62 8.02-2.07 18.54-2.56 18.54-.18 0-.42 3.12-.54 6.86-.24 7.23-.78 10.78-2.59 16.4-.58 1.83-1.38 5.8-1.67 8.87-.57 5.14-.99 8.14-3.74 27.36-.55 3.98-1.35 7.71-1.66 8.38-.38.67-.7 1.83-.72 2.63-.03 1.9-1.87 9.72-3.35 14.24-1.42 4.33-2.08 7.27-3.88 16.8-1.67 8.81-1.81 13.59-.43 15.82 1.38 2.39 5.42 6.13 6.48 6.13.04 0 .07 0 .1-.02.08-.03.18-.05.27-.05.41 0 .9.27 1.19.62.33.39.78.63 1.1.63.09 0 .17-.02.24-.06.06-.03.13-.05.21-.05.34 0 .85.3 1.19.81.35.5.68.81.83.81.05 0 .08-.04.08-.12 0-.06.03-.08.07-.08.16 0 .57.31 1.08.84.6.62 1.57 1.44 2.06 1.69 1.64 1.01 1.49 6.83-.32 8.83-.69.79-1.25 1.64-1.26 1.94 0 .24-.75.46-1.74.46h-.25c-1.4 0-1.71.35-2.27 2.23-.39 1.28-.73 3.24-.74 4.28-.02 1.1-.28 2.01-.58 2.01-.31 0-.75 1.16-1.02 2.56-.27 1.47-.93 4.28-1.45 6.29-3.58 13.19-4.96 26.72-3.54 34.41.45 2.64 1 6.88 1.2 9.4.2 2.82.72 5.04 1.26 5.72.72.87.95 2.16.78 4.98-.16 2.08.05 4.6.46 5.59.77 2.04 1.33 5.36 2.46 15.06.37 3.56.93 7.19 1.1 8.11.29 1.17.09 1.96-.66 2.75-.93.91-1.01 1.58-.64 5.33.27 2.4.44 7.37.44 11.11-.06 3.68-.05 7.05 0 7.48.16 1.23 4.2 1.91 12.05 2.15 4.11.13 7.41.48 7.53.79.14.4.67.6 1.23.6.64 0 1.33-.25 1.53-.74.13-.27.22-.41.28-.41s.09.14.09.42c.02.53.79.81 1.59.81s1.56-.25 1.78-.75c.16-.27.27-.41.37-.41s.21.14.36.42c.21.54 1.54.83 2.82.83 1.19 0 2.36-.24 2.57-.74.16-.27.27-.41.37-.41s.21.14.36.42c.23.55 2.18.84 4.04.84 1.51 0 2.96-.19 3.38-.6.24-.23.49-.35.79-.35.33 0 .73.14 1.24.44.51.28.93.43 1.24.43.25 0 .43-.09.54-.28.25-.36 4.43-.73 10.13-.82 5.34-.16 9.94-.4 10.31-.57.56-.36.48-7.23-.39-18.47-.35-4.79-.31-7.85.22-10.12 1.85-8.43 1.36-20.1-.85-20.13-.49 0-.97-.87-1.2-1.86-.17-1.05-.52-1.85-.83-1.85-.31 0-.54-.56-.53-1.23.01-.67-.23-1.23-.47-1.23-.43 0-2.47-6.48-2.45-7.89 0-.43-.36-.74-.85-.75s-.97-.87-1.13-2.04c-.44-3.13-1.8-6.59-2.53-6.6-.43 0-.94-2.96-1.28-8.18-.36-4.42-.94-10.62-1.38-13.64-.49-3.69-.57-6.63-.17-8.9.34-1.83.64-5.75.69-8.7.11-2.94.45-5.51.76-5.69.8-.48.95-9.74.26-12.45-.29-1.05-.94-2.41-1.37-2.9-1.87-2.18-2.29-2.8-1.86-2.85 2.77-.45 3.81-.55 5.28-.59 1.35-.04 2.22-.64 3.41-2.46 1.57-2.24 1.7-2.98 1.79-8.5.05-3.31.28-6 .58-6 .24 0 .44-.61.51-1.4 0-.51.1-.78.21-.78.05 0 .11.06.16.17.17.5.42.75.77.75.38 0 .88-.3 1.5-.9.68-.6 1.01-2.07 1.05-4.15.03-1.72.36-3.49.8-3.91.37-.36.92-4.03 1.24-8.81.7-9.43 2.07-18.37 3-18.97.31-.18.64-1.46.72-2.75.08-1.29.29-2.76.54-3.24.19-.49.72-2.69 1.06-4.89 1.76-10.46 3.54-18.71 4.5-20.72.63-1.22 2.46-4.38 4.1-7.05 2.96-4.8 5.27-11.32 7.25-20.12.53-2.32 1-4.89 1.01-5.69.01-.74.27-1.84.65-2.44.57-.97 3.95-9.63 5.88-15.06.45-1.34.96-2.56 1.15-2.74.62-.6 3.2-8.23 3.22-9.58.01-.74.27-1.47.58-1.65.25-.18.83-1.89 1.29-3.84.4-1.96 1.76-6.41 2.98-9.95 4.56-12.93 9.23-29.29 10.71-37.55.95-5.63 4.63-21.64 5.27-23.22 1.91-4.57 6.44-19.4 6.46-21.06 0-.61.4-1.83.9-2.75.51-.91 1.4-3.47 1.99-5.73.59-2.2 1.36-4.58 1.62-5.25.76-1.64 7.46-22.02 8.3-25.01.33-1.34.98-3.66 1.37-5.19.45-1.53 1.12-4.83 1.59-7.33.46-2.64 1.09-4.46 1.46-4.46h.02c.09.02.17.03.25.03 1.08 0 1.75-1.64 1.91-4.72.16-2.21.55-3.61 1.36-4.39.81-.78 1.14-2.01 1.18-4.83.04-2.7.09-3.43.7-3.43.17 0 .37.05.64.14.27.09.5.15.69.15.46 0 .73-.29.91-.98.19-.73.57-1.27.87-1.27.31 0 .56-.98.58-2.14.03-1.59-.21-2.15-1.01-2.22-.86-.01-.86-.14.19-.55 1.91-.71 2.04-1.13 2.25-6.65.13-4.6.2-4.94 1.45-4.94h.3c1.16 0 1.27-.27.99-1.52-.23-.92-.2-1.3.12-1.3.09 0 .2.03.33.08.06.02.12.04.18.04 1.06 0 2.24-3.71 2.78-8.64.35-3.16.61-3.9 1.45-3.9h.06c1.69 0 2.61-1.57 2.16-3.71-.24-1.07-.23-1.59.02-1.59.05 0 .11.02.18.06.16.1.3.16.44.16.67 0 1.05-1.51 1.69-6.32.95-6.95 1.09-7.89 2.05-7.89.09 0 .18 0 .28.02h.14c.65 0 1.04-.49 1.17-1.58.14-.86.89-2.26 1.64-3.04 2.62-2.53 5.21-7.95 6.78-14 1-3.9 1.78-5.96 2.18-5.96.2 0 .3.52.28 1.59-.01.91.13 1.34.52 1.34.11 0 .23-.03.38-.1.13-.04.24-.06.34-.06.45 0 .57.48.55 1.8-.04 2.46.38 3.76 1.13 3.76.09 0 .19-.02.29-.06.04-.01.08-.02.12-.02.91 0 1.41 3.82 1.31 10.16-.04 2.36.13 3.94.35 3.94.03 0 .05-.02.08-.07.01-.02.03-.03.04-.03.31 0 .76 4.48 1.02 10.47.33 6.57.8 11.3 1.17 11.43.3.13.6 1.11.58 2.16-.02 1.04.24 4.17.63 7 .6 4.55.52 6.08-.83 13.85-1.76 10.34-1.97 16.1-.74 23.48.73 4.37.74 7.31.26 14.66-.32 5.02-.66 11.09-.7 13.48.02 2.33-.06 8.03-.14 12.57-.07 4.54-.14 12.69-.1 18.09-.02 28.52-1.11 47.51-3.37 58.39-1.46 7.28-1.46 6.91-1.32 56.52.03 1.84-.32 8.76-.67 15.32-.5 8.21-.53 13.97-.1 18.4.31 3.56.63 10.44.68 15.34.13 7.42.4 9.7 1.63 13.52 2.69 8.51 6.69 27.03 6.63 30.77-.02 1.16.48 4.48 1.11 7.38 1.31 6.28 1.35 15.66.05 19.99-.52 1.65-1.11 4.03-1.31 5.25-.27 1.28-1.61 4.7-3 7.56-1.39 2.92-2.8 6.58-3.19 8.11-.39 1.53-1.86 5.18-3.25 8.11-1.33 2.86-2.74 6.89-3.14 8.84-.4 1.96-.99 4.77-1.39 6.3-1.9 7.58-2.79 13.88-2.97 21.42-.13 4.54-.47 10.17-.75 12.56-.64 5.39.15 21.9 1.35 27.62.45 2.34 1.1 7.87 1.34 12.29.3 4.36.76 10.07 1.09 12.59.39 2.52.62 7.61.56 11.35-.05 3.42.01 6 .18 6 .01 0 .03-.01.04-.04.16-.49.54-.71.92-.71.52 0 1.05.43 1.04 1.17-.02 1.29 3.76 2.57 7.87 2.64 1.41.02 2.51.28 2.5.65 0 .41.37.61.9.61.65 0 1.52-.3 2.18-.87.52-.47 1.09-.68 1.94-.68.47 0 1.01.06 1.69.18 1.35.27 2.5.65 2.5.96 0 .38.6.56 1.33.56.8 0 1.74-.22 2.16-.63.42-.4 4.18-.55 12.45-.55 2.86 0 6.26.02 10.25.05 4.1.05 7.71.07 10.8.07 7.61 0 12.01-.14 12.76-.44 1.3-.53 1.67-1.2 2.08-3.59.21-1.59.43-3.86.45-5.08.02-1.29.35-2.57.72-2.93.37-.36.9-2.56 1.12-4.83.22-2.33.75-4.59 1.24-5.01 1.25-1.27 1.1-3.79-.31-3.81-.92-.01-1.22-.63-1.48-3.09-.22-1.72-.19-3.38 0-3.68.19-.37.13-.61-.24-.62-.31 0-.72-1.12-.94-2.47-.22-1.35-.64-2.46-1-2.47-.86-.01-2.3-1.63-1.87-2.11.25-.18 0-.37-.55-.38-.67-.01-.79-.5-.58-1.85q.27-1.84-2.55-1.88c-2.7-.04-2.82-.11-2.79-1.88.03-1.66-.16-1.84-1.81-1.87h-.08c-1 0-1.76.29-1.77.71 0 .28-.05.42-.17.42s-.27-.13-.51-.37c-.36-.37-.53-1.17-.4-1.78.13-.67-.16-1.54-.71-1.91-.79-.69-.78-.87.02-1.41.81-.54.81-.6 0-.61-.74-.01-.91-.5-.7-2.22.21-1.41.04-2.39-.45-2.71-1.58-1.01-2.2-12.48-.9-16.88.58-1.83.55-3.98.01-8.71-.37-3.5-.88-6.33-1.19-6.34-.67-.01-.36-16.38.32-16.8.31-.24.76-1.77 1.03-3.42.27-1.71 1.17-4.34 1.99-5.86 1.89-3.4 1.9-3.77.19-4.47-1.34-.51-1.28-.57.88-1.46 1.23-.47 4.53-3.18 7.33-5.96 6.73-6.58 6.85-6.7 6.88-8.23.01-.74.58-1.83 1.26-2.37.68-.6 1.25-1.51 1.26-2.13 0-.61.32-1.09.69-1.09.42 0 .55-.61.45-1.53-.17-.86-.04-1.53.21-1.53.3 0 .56-.55.57-1.28.01-.74.7-1.83 1.51-2.43l1.55-1.14.56-23.85c.39-16.98.74-24.03 1.31-24.63.44-.55 1.08-6.24 1.65-15.55.49-8.09 1.22-14.95 1.53-15.31.31-.3.61-3.61.67-7.35.08-5.09.36-7.17 1.18-8.57.69-1.28 1.1-3.72 1.29-8.26.37-7.84.64-9.31 1.97-12.05.57-1.16.9-2.75.73-3.42-.4-1.6.93-12.5 1.76-14.2.26-.67.67-3.55.9-6.43.17-2.88.81-8.94 1.38-13.47.56-4.53 1.38-17.76 1.81-29.41.43-11.58.95-21.51 1.2-22.06.31-.49.81-8.33 1.13-17.46.42-10.91.81-16.61 1.24-16.72.43-.12.72-3.06.8-8.08.07-4.6.37-8.03.74-8.27.37-.18.66-3.06.72-6.49.06-3.62-.15-6.07-.52-6.08-.31 0-.61-.44-.6-.93 0-.49.32-.91.62-.91h.01c.37 0 .62-.61.63-1.28.01-.74.46-1.65 1.01-2.01.93-.66 1.5-5.62.78-6.92-.12-.25.19-4.47.76-9.37.57-4.9 1.09-10.84 1.25-13.17.34-6.07 1.16-11.27 1.84-11.62.31-.24.57-1.46.6-2.75.02-1.29.35-2.57.66-2.75.8-.48.87-4.77.03-5.64-.9-.93.03-6.3 1.08-6.3h.02c1.34 0 1.8-2.4 1.73-9.97 0-3.92.23-7.17.54-7.17.55 0 .75-1.41.76-5.94.04-2.58.3-3.31 1.35-3.84 1.11-.6 1.24-1.15 1.18-4.95-.07-3.25.13-4.41.81-4.89.68-.48.75-.72.2-.98-1.15-.45-.93-3.25.22-3.25h.04c.77 0 .89-.44.56-2.51-.22-1.41-.14-3.13.24-3.86.63-1.22 1.23-4.27 3.05-14.43.47-2.51 1.06-5.13 1.38-5.74.38-.79.33-1.28-.16-1.47-.43-.13-.72-.93-.71-1.79.01-.79.15-1.26.35-1.26.03 0 .07.01.1.04s.07.05.11.05c.54 0 1.95-2.43 1.97-3.57 0-.43.45-1.1.94-1.52 1.18-.96 1.28-3.66.18-3.68-.67-.01-.78-1.05-.54-4.79.16-2.57.64-5.75 1.03-6.98.39-1.22.54-3.06.37-4.1-.23-.98-.09-1.9.28-2.02.31-.12.64-1.89.68-4.04.09-2.08.37-3.79.67-3.79.31 0 .58-1.77.61-3.98.04-2.57.31-3.97.73-3.97.49 0 .62-.92.35-2.94-.22-1.6-.48-4.91-.56-7.37-.11-3.54-.01-4.3.66-4.3.06 0 .13 0 .2.02.06.01.12.02.17.02 1.16 0 1.65-2.54.49-3.26-.67-.44-.6-.68.14-1.16.43-.26.79-.4 1.09-.4.73 0 1.11.81 1.39 2.65.23 1.29.98 4.12 1.62 6.22.7 2.1 1.2 5.35 1.18 7.19-.03 1.84.19 3.5.49 3.69.91.57 1.28 4.44 1.18 10.93-.07 4.66.2 7.06 1.07 9.95.7 2.03 1.39 5.36 1.48 7.32.15 1.96.56 3.69.8 3.88.3.19.52 1.85.49 3.69-.04 2.39.19 3.31.81 3.32.8.01 1.57 1.25 1.55 2.54 0 .3-.42.54-.91.54h-.03c-.49 0-.92.54-.93 1.21-.01.67-.44 1.21-.93 1.21h-.03c-.48 0-.9.24-.91.6 0 .3-.88.58-1.89.58h-.41c-2.47 0-2.95.55-4.77 4.46-1.78 3.9-2.13 6.47-.99 8.33.6.93.59 1.6-.05 3.25-1.15 3.05-1.02 6.18.31 7.43.51.45.83.67 1.05.67.18 0 .3-.14.41-.41.06-.14.12-.21.18-.21.11 0 .19.29.18.83.03.86.17 1.18.66 1.18.18 0 .4-.04.68-.12.45-.14 1.02-.2 1.64-.2 2.21 0 5.03.78 5.02 1.6-.01.67.84.87 3.67.92h.59c2.25 0 3.09-.24 3.1-.81.01-.69 1.35-1.12 2.81-1.12.73 0 1.48.11 2.11.34.37.14.74.21 1.08.21.45 0 .85-.12 1.13-.36.29-.24.67-.38 1-.38.16 0 .3.03.42.09.04.04.1.05.16.05.39 0 1.12-.61 1.76-1.49.82-1.09 1.42-1.57 2.08-1.57.15 0 .3.02.46.07.22.09.44.14.62.14.32 0 .54-.13.55-.36 0-.31.63-.79 1.37-1.02.74-.17 2.23-1.13 3.22-2.1 1.05-.96 2.29-1.74 2.72-1.74.37 0 .73-.36.74-.85 0-.43 1-1.27 2.17-1.81 1.92-.89 2.17-1.25 2.33-3.58.02-1.41.11-3.06.06-3.68-.05-.55.32-1.03.8-1.03h.03c.72 0 1.09-.6.86-1.4 0-.06.7-1.52 1.58-3.23 1.96-3.71 1.96-3.77.63-5.26-.9-1.06-.9-1.12.02-1.17 1.53-.1 1.9-.22 2.77-.69.87-.6 1.15-6.54.23-6.56-.8-.01-.77-1.67.09-1.96.68-.23 1.77-3.65 2.32-7.38.21-1.35 0-3.43-.54-4.91-.47-1.42-1.05-3.45-1.28-4.44-.23-1.05-1-2.71-1.84-3.83-.78-1.05-1.44-2.29-1.43-2.6 0-.37-.23-1.17-.52-1.79-1.07-2.04-2.73-5.99-2.78-6.61-.06-.37-.11-.92-.16-1.29 0-.31-.59-1.24-1.32-1.98-.66-.81-1.85-3.16-2.55-5.31-.76-2.16-1.83-4.63-2.37-5.37-.54-.81-.95-2.22-.93-3.08.01-.92-.57-3.01-1.21-4.68-.77-1.73-1.28-4.56-1.36-6.83-.03-2.09-.24-4.05-.49-4.24-.18-.19-.35-.86-.34-1.48 0-.61-.63-2.65-1.4-4.44-1.66-3.71-3.41-9.5-4.43-14.6-.4-1.85-1.33-5.11-2.16-7.27-1.41-3.82-3.21-10.6-4.35-16.14-.28-1.54-.92-3.63-1.4-4.74-.47-1.05-1.34-4.62-1.96-8-.62-3.32-1.36-7.01-1.71-8.18-.99-3.63-3.43-16-4.38-22.02-.5-3.07-1.14-5.66-1.44-5.66-.31 0-.43-.25-.24-.49s.03-1.59-.26-2.95c-1.55-6.46-3.49-15.82-4.23-19.94-.96-5.47-5.31-21-6.1-21.81-.36-.37-.59-1.36-.58-2.22.01-.92-.52-2.28-1.18-3.09-.66-.81-1.2-1.8-1.19-2.23 0-.43-.29-.86-.66-.99-.3-.13-.77-1.42-.94-2.9-.22-1.9-.63-2.77-1.61-3.09-.73-.32-1.22-.69-1.09-.94.51-1.22 0-3.43-1.03-4.68-.66-.81-1.19-2.1-1.18-2.9.01-.74-.22-1.41-.59-1.42-.31 0-.9-1.18-1.31-2.66-.41-1.42-1.06-2.96-1.48-3.4-.42-.44-.89-1.73-1.12-2.9-.17-1.17-.58-2.16-.82-2.16-.25 0-.59-1.54-.8-3.51-.21-2.09-.74-3.75-1.34-4.19-.67-.5-1.01-1.86-1.1-4.31-.03-1.96-.43-3.75-.8-4-.43-.25-.88-2.41-1.03-4.98-.08-2.52-.48-4.73-.78-4.92-.3-.19-.69-3.02-.94-6.27-.19-3.25-.7-6.27-1-6.7-.36-.43-.66-1.24-.65-1.73-.08-2.7-1.39-8.91-1.94-9.29-.43-.25-.7-2.16-.73-4.24s-.31-3.99-.67-4.18c-.3-.25-.88-2.77-1.2-5.6-.38-2.89-.96-5.41-1.32-5.66-.36-.19-.6-.56-.6-.81 0-.18-.05-.68-.23-1.11-.12-.43-.26-2.95-.4-5.65-.08-2.64-.47-4.97-.78-5.22-.43-.25-.68-7.25-.69-18.72-.08-10.49-.32-18.53-.69-18.72-.67-.44-1.2-5.66-1.36-15.05-.11-4.91-.43-7.49-.92-7.8-.49-.31-.82-2.65-.88-6.64-.13-3.44-.33-6.2-.58-6.2-.18 0-.41-1.29-.44-2.95-.46-13.87-.72-16.69-1.76-16.71-.25 0-.66-1.05-.88-2.34-.23-1.23-.88-2.77-1.54-3.4-.6-.62-1.14-1.49-1.13-1.98 0-.49-.41-.93-.91-.93-.49 0-.92-.26-.91-.57.01-.86-2.88-3.79-3.74-3.8-.43 0-1.28-.63-1.88-1.44-.54-.81-2-1.81-3.15-2.32-1.16-.51-2.13-1.08-2.12-1.38 0-.25-.54-.5-1.16-.51-.61 0-1.28-.39-1.46-.88-.18-.49-1.15-1.06-2.19-1.32-1.47-.33-1.89-.77-1.87-1.93.01-.8-.52-1.97-1.19-2.53-.91-.81-1.2-1.86-1.16-4.25.04-2.33-.19-3.25-.93-3.57-.73-.32-.84-.93-.44-3.26.27-1.65.72-3.06 1.09-3.17 1.6-.59 2.92-2.53 2.58-3.95-.23-1.11-.04-1.53.89-1.7.92-.23 1.18-.72.95-1.95-.29-1.35-.03-1.72 1.01-2.01.68-.17 1.3-.72 1.31-1.14 0-.49.32-.85.68-.85.3 0 .48-.24.31-.55-.15-.26 0-.43.4-.43.07 0 .14 0 .22.01h.02c.98 0 2.62-4.47 2.99-8.17.14-1.03.5-1.51 1.34-1.51h.06c.66 0 1.14-.36 1.03-.78-.05-.43.39-1.34 1.07-2.01.94-1.03 1.14-2.01 1.07-5.75-.06-3.86.13-4.6 1-4.89.26-.08.6-.12.94-.12.38 0 .76.05 1.02.15.13.05.27.08.41.08 1.06 0 2.13-1.4 1.71-2.5-.18-.49-.05-.92.25-.92.36 0 .62-.55.63-1.22.01-.67-.23-1.23-.59-1.24-.31 0-.61-.44-.6-.93 0-.48.55-.9 1.22-.9h.07c.94 0 1.18-.44 1.21-1.88.01-.88.22-1.55.48-1.55.03 0 .06 0 .1.03.05.03.1.04.15.04.27 0 .57-.41.79-1.07.65-2.26.47-2.88-.75-2.89-.98-.02-1.1-.32-.64-2.1.53-2.32.21-5.27-.59-5.28-1.1-.02-.45-2.4.72-2.75 1.73-.53 4.9-3.73 5.36-5.44.65-2.38-.11-8.53-1.14-9.28-.48-.38-.9-1-.9-1.42 0-.37-.3-.68-.73-.69-.55 0-.55-.19.01-.74.44-.42.58-1.65.36-3.37-.27-2.18-.15-2.63.68-2.63h.06c.91 0 1.28-.98 1.13-3.05-.05-.49.53-2.63 1.3-4.76 1.22-3.29 1.29-3.97.56-4.41-.79-.5-.79-.75.03-1.96.69-1.15.92-3.79.89-13.97.05-6.93-.23-12.64-.54-12.76-.3-.13-.65-1.6-.87-3.26-.22-1.72-.74-3.45-1.16-3.94-.48-.44-.83-1.85-.81-3.02.02-1.35-.27-2.21-.7-2.22-.55 0-.61-.19-.12-.49.8-.48 1.59-3.78.92-3.79-.25 0-.41-.93-.4-2.03.27-5.64-.12-8.28-1.26-9.65-.66-.81-1.19-2.1-1.18-2.9.01-.74-.22-1.41-.47-1.42-.31 0-.85-.69-1.2-1.55-.35-.86-1.14-1.55-1.63-1.56-.55 0-.79-.26-.6-.62.19-.3-.29-1.29-1.13-2.1-.85-.81-1.57-1.62-1.57-1.8 0-.61-2.83-3.54-3.38-3.55-.31 0-1.09-.75-1.75-1.56-2.94-3.91-4.47-4.67-9-4.74-1.04-.02-1.65-.21-1.46-.45.62-.54-1.5-1.99-3.03-2.07-.98-.02-1.28-.27-1.03-.94.25-.55.01-.92-.54-.93-.49 0-1.04-.45-1.27-.94-.18-.49-.72-.93-1.27-.94-.49 0-.92-.2-.91-.51 0-.55-2.55-1.7-5.79-2.61-1.65-.47-6.66-.72-11.45-.72Z"/></svg>
\ No newline at end of file
diff --git a/internal/static/performer/NoName38.png b/internal/static/performer/NoName38.png
deleted file mode 100644
index da9fa37c926cfde6943c277f9b41797cb4061d8f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10489
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

diff --git a/internal/static/performer/NoName38.svg b/internal/static/performer/NoName38.svg
new file mode 100644
index 000000000..0131c7efe
--- /dev/null
+++ b/internal/static/performer/NoName38.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 850 1250"><path fill="#fff" d="M386.44 26.13c-3.77 2.09-8.52 5.58-10.75 7.54-2.09 2.09-5.45 3.63-7.54 3.63-5.03 0-18.01 7.54-21.5 12.43-1.54 2.09-3.21 5.45-3.63 7.4-.56 1.95-3.63 5.72-6.84 8.52-8.66 7.12-14.8 17.03-14.8 23.46 0 2.93-1.12 7.4-2.51 9.91-1.26 2.51-3.63 8.1-5.03 12.29-1.4 4.19-3.21 8.24-3.77 8.94-.7.84-1.26 4.05-1.26 7.12 0 4.61.98 6.98 4.89 11.59l5.03 5.72-3.07 5.86c-1.54 3.21-3.21 7.26-3.35 8.8-.28 1.68-1.82 6.42-3.35 10.75-2.65 7.12-2.79 8.24-.98 13.4 2.51 6.98 7.96 12.98 11.87 12.98 5.17 0 8.52 2.65 8.52 6.7.14 2.09.98 5.31 2.09 7.26 2.79 4.89 2.51 6.7-.98 7.82-6.56 1.95-15.92 6.56-19.69 9.77-2.23 1.81-5.45 3.35-7.26 3.35-6.14 0-19.41 27.64-20.24 42.58-.98 16.33-.42 33.65 1.95 56.54 3.77 37.7 2.09 54.45-9.21 89.35-6.98 22.2-15.36 54.73-17.17 67.44-1.82 13.12 4.05 24.71 18.01 35.74 1.95 1.54 2.37 3.21 1.68 8.38-.56 3.49-.98 8.24-.98 10.61 0 15.78.42 19.69 2.79 22.34 2.65 2.93 9.08 21.5 10.75 30.44.42 2.79 1.4 5.59 2.09 6 .7.42 1.26 6.84 1.12 14.24 0 15.36 1.26 29.04 3.21 32.81.84 1.68.14 5.86-2.23 13.4-1.95 6.14-4.89 16.33-6.42 22.76-1.68 6.42-4.19 15.64-5.58 20.66-4.19 14.1-15.5 54.59-16.89 60.73-1.4 5.44-14.8 50.82-21.36 71.9-1.82 5.72-4.05 12.98-4.89 16.06-7.12 25.27-10.75 38.39-14.1 51.66-7.96 30.99-18.15 68.83-23.04 85.03-2.65 9.21-4.89 18.01-4.89 19.69s-1.68 7.68-3.63 13.4c-1.95 5.72-4.75 16.33-6.14 23.59-1.54 7.26-4.19 18.01-6.14 23.73-1.95 5.72-3.91 12.98-4.47 15.92-.56 3.07-1.82 7.12-2.79 9.08-1.12 1.95-1.95 5.03-1.95 6.7s-.56 3.49-1.4 3.91c-.7.42-1.4 2.93-1.4 5.31 0 2.51-1.26 8.52-2.79 13.54-1.54 5.03-2.79 10.47-2.79 12.29s-1.12 5.17-2.37 7.68c-1.26 2.51-2.65 6.98-3.07 10.05-.7 4.89-1.4 5.58-5.03 6.28-3.35.56-4.47 1.81-6.42 7.4-1.4 3.77-3.35 8.1-4.61 9.77-1.12 1.68-4.05 5.86-6.42 9.21-6.7 9.35-5.86 9.91 15.92 9.91 14.8 0 19.96-.56 23.73-2.37 4.89-2.23 5.17-2.23 14.94 2.09 7.68 3.49 12.01 4.47 18.57 4.47s9.77.84 14.1 3.49c3.07 1.81 7.54 4.47 9.77 5.86 3.49 2.09 6.98 2.51 20.38 2.23 15.5-.28 16.61-.42 23.18-4.47 3.91-2.37 7.96-4.33 9.21-4.33 3.91 0 6.56 1.68 6.56 4.19 0 1.4 1.12 3.91 2.65 5.72 2.51 3.07 2.79 3.07 10.75 1.26 4.61-.98 9.91-3.07 12.01-4.47 2.65-1.82 6.28-2.51 13.54-2.51 9.91 0 10.05 0 16.34 6.14 4.89 4.61 8.52 6.56 15.08 8.38 14.66 3.77 24.71 3.07 42.72-2.93 8.8-2.93 11.59-4.75 17.59-11.03 6.84-7.4 7.12-7.54 14.94-7.54 8.94 0 16.33 3.07 21.78 8.94 2.79 2.93 4.75 3.63 10.33 3.63 8.52 0 16.06-3.49 17.17-7.82 1.12-4.47 8.52-6.7 21.64-6.42 9.91.14 10.75 0 14.38-3.77 3.63-3.77 4.05-3.91 15.08-3.21 11.03.7 11.31.56 10.47-2.37-.98-4.05 2.37-7.12 8.24-7.12 9.08 0 15.78-3.91 19.55-11.31 3.63-7.26 5.45-7.96 11.45-4.89 2.09 1.12 6.42 2.37 9.35 2.93 3.07.56 9.21 2.23 13.68 3.77 6.84 2.37 10.61 2.65 25.13 2.09 17.31-.7 30.58-2.65 33.51-4.89 1.82-1.4 24.01 0 38.67 2.37 4.89.7 9.21 1.12 9.63.84.84-.98-2.79-4.89-4.75-4.89-.84 0-4.47-1.82-7.82-4.19-3.35-2.23-7.12-4.19-8.38-4.19s-3.35-1.26-4.75-2.79c-1.4-1.54-3.07-2.79-3.63-2.79s-7.54-3.07-15.5-6.84c-13.96-6.56-14.94-6.84-31.13-7.68-11.03-.7-17.87-1.82-19.96-3.07-1.82-1.26-4.33-2.37-5.58-2.65-12.57-2.93-18.15-5.17-20.94-8.66-6.7-7.96-26.53-51.66-29.6-65.34-.98-3.91-2.79-11.73-4.19-17.45-1.4-5.72-3.07-15.22-3.49-20.94-.56-5.72-1.68-12.98-2.37-16.06-1.4-5.17-2.37-25.27-2.51-50.26-.14-15.22-.28-37-.42-62.13 0-12.7.56-32.53 1.26-43.98.98-13.4.98-32.67.14-53.75-1.54-41.19-2.65-85.44-2.51-99.13.14-5.72.14-11.17.14-11.87-.14-.84-.7-24.29-1.4-52.36-1.82-72.88-3.63-96.2-9.77-131.24-2.51-14.52-2.65-14.38 2.93-16.89 2.65-1.4 11.17-8.94 18.57-16.75l13.68-14.38 6.7 2.37c7.4 2.65 16.2 3.07 21.5.98 5.17-1.95 12.98-14.52 16.89-27.22 7.68-25.41 9.91-38.53 11.17-66.32.84-17.73-1.26-21.5-30.58-55.85-8.24-9.63-17.59-20.94-20.8-25.13-3.07-4.19-11.73-13.4-18.99-20.52-7.4-7.12-13.82-13.4-14.38-13.96-.7-.56-4.61-4.75-8.8-9.22-4.33-4.61-9.35-10.61-11.31-13.54-5.03-7.68-11.59-10.75-18.57-8.94-4.19 1.12-6.56 1.12-9.77-.28-2.23-.98-7.26-2.23-10.89-2.79-11.17-1.54-12.43-2.51-13.54-9.08-.84-5.17-.56-6.42 2.93-9.91 1.95-2.09 4.89-3.91 6.14-3.91 1.4 0 4.19-1.54 6.42-3.35 3.49-2.93 3.77-4.05 3.49-11.45-.14-4.33-.98-8.8-1.68-9.63-.84-1.12-.7-2.51.7-4.33 2.93-3.91 2.51-6.14-1.68-10.61-2.79-2.93-3.21-4.19-2.09-5.72.84-.98 1.82-7.12 2.09-13.4.56-10.89 1.68-13.96 5.58-14.1.56 0 .98-1.26.98-2.65 0-1.54.7-3.21 1.4-3.63.84-.42 1.4-2.37 1.4-4.33 0-4.05-8.24-20.1-10.75-21.08-.98-.42-1.82-1.54-1.82-2.51 0-1.12-1.82-3.21-4.05-4.75-2.23-1.68-6-6.84-8.24-11.73-2.37-4.75-6.14-10.89-8.52-13.54-2.37-2.65-4.33-5.72-4.33-6.7 0-.84-.56-1.68-1.26-1.68-.56 0-3.49-1.54-6.28-3.49-2.79-1.95-7.82-3.91-11.03-4.33-3.21-.56-8.38-2.09-11.31-3.49-3.07-1.54-6.28-2.65-7.26-2.65s-3.49-.84-5.72-1.95c-2.09-1.12-5.45-2.65-7.4-3.35s-5.31-2.09-7.4-2.93c-5.86-2.37-10.75-1.68-18.29 2.65ZM512.38 305.5c6.98 4.61 16.06 12.01 20.1 16.47 6.14 6.56 8.1 10.05 11.31 20.1 2.23 6.7 5.45 13.96 7.4 16.2 3.21 3.91 4.05 4.19 10.33 3.35 9.21-1.12 9.77.98 4.05 12.29-5.17 10.33-8.8 15.5-18.99 26.95-9.77 10.89-9.77 17.45.14 20.94 3.35 1.12 2.37 6.28-3.63 19.27-5.17 11.31-6.84 11.73-17.03 4.19-6.84-5.17-14.38-9.91-26.53-16.75-8.38-4.75-14.38-11.03-19.96-21.08-4.19-7.4-5.17-10.61-5.72-19.27-.56-9.08-.28-10.89 2.37-14.38 1.54-2.23 2.93-5.58 2.93-7.54 0-3.35 8.1-21.5 11.45-25.83 7.54-9.21 9.49-20.38 6.14-33.51-2.79-10.75-2.79-9.91.28-9.91 1.4 0 8.38 3.77 15.36 8.52Zm-172.85 66.73c0 1.4 1.68 3.63 3.63 5.03 4.61 2.93 19.96 34.21 19.41 39.51-.14 2.09-1.95 10.33-3.91 18.43-1.95 8.1-4.75 19.69-6 25.83-1.26 6.14-2.79 12.15-3.49 13.26-1.95 3.91-16.75 51.38-22.34 71.9-8.24 30.3-8.94 31.27-17.45 22.06-4.75-5.03-5.03-5.58-4.19-12.98.98-9.35 2.65-18.01 5.45-27.22 1.54-5.58 4.05-9.07 13.26-18.15 10.75-10.75 11.17-11.59 12.15-19.27 1.26-9.49-1.54-55.15-3.63-63.11-.98-3.07-1.68-13.4-1.82-23.04-.14-15.5.56-21.22 4.19-33.23.84-2.65 4.75-1.95 4.75.98Z"/></svg>
\ No newline at end of file
diff --git a/internal/static/performer/NoName39.png b/internal/static/performer/NoName39.png
deleted file mode 100644
index a7921d01da971900bc1568fcbd3c0f30321c1be7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10928
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

diff --git a/internal/static/performer/NoName39.svg b/internal/static/performer/NoName39.svg
new file mode 100644
index 000000000..6cc5080ac
--- /dev/null
+++ b/internal/static/performer/NoName39.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 850 1250"><path fill="#fff" d="M390.73 32.56c-10.7 1.74-21.54 6.09-28.97 11.64-21.94 16.52-35.39 48.84-41.61 99.75-.8 6.22-1.54 12.44-1.74 13.85-.33 2.27-.13 2.54 2.54 4.08 1.54.94 3.55 2.88 4.48 4.42 5.62 9.17 6.89 10.9 8.83 12.11 1.2.74 2.48 1.27 2.81 1.14s1.4-2.27 2.41-4.82c2.94-7.63 5.29-11.71 7.16-12.58 1.61-.74 1.87-.54 4.35 2.21 9.63 11.17 6.69 21.74-8.83 31.85-11.91 7.69-23.68 11.91-44.29 15.99-27.43 5.42-32.38 6.49-34.45 7.76-11.31 7.02-20.94 51.11-28.57 131.06-2.61 26.69-4.68 53.32-8.76 109.38-2.01 27.96-4.42 60.48-5.29 72.25-2.01 25.82-3.41 45.76-4.75 68.57-.94 16.32-.94 17.13.27 18.73 1.2 1.67 4.68 2.81 11.64 3.68 1.87.27 3.88 1.07 5.02 2.01l1.81 1.54-.2 24.02c-.2 26.16.2 31.18 3.41 37.46 2.14 4.08 4.62 6.42 8.7 8.23 4.01 1.81 4.68 1.34 6.49-4.42 1.4-4.55 2.34-11.24 3.01-21.68.74-10.7 2.88-20.74 4.48-20.74 1.94 0 5.02 2.88 7.76 7.36 3.95 6.29 5.75 8.03 8.43 8.03 1.74 0 2.74-.4 5.62-2.34.07-.07-.94-2.88-2.21-6.29-10.97-28.37-13.31-73.93-6.29-123.63 2.01-14.58 6.56-37.8 7.56-38.8 1.4-1.4 1.34 1.14-1.27 42.28-.54 8.43-1 23.55-1 33.58v18.13l2.01 1.74c3.08 2.54 6.56 2.74 17.6 1 8.83-1.34 9.9-1.4 11.31-.47 1.27.8 2.27 3.68 5.82 15.99 14.12 49.51 35.73 115.2 58.2 176.89 14.18 39.07 14.32 39.47 16.06 39.67.87.13 6.09-1.34 11.64-3.21 10.1-3.48 16.66-4.68 18.53-3.41.87.6 1 4.88 1 31.64 0 19.13-.33 35.06-.87 41.68-5.29 66.57-14.05 109.58-43.95 217.43-6.02 21.68-12.98 47.17-15.45 56.53l-4.42 17.06 1.47 2.88c4.08 7.69 15.39 12.85 28.23 12.85 7.02 0 11.57-.87 17.06-3.35 4.82-2.21 5.82-3.48 9.23-12.38 6.89-17.86 8.23-28.37 9.03-70.11.94-46.76 2.07-57.2 8.36-76.6 5.02-15.65 11.71-29.5 27.1-56.67 5.42-9.57 11.04-19.74 12.44-22.61 1.4-2.81 2.81-5.15 3.08-5.15 1.14 0 5.49 6.89 9.57 15.05 2.34 4.75 6.89 15.45 10.1 23.75 6.62 17.33 11.57 27.9 22.81 48.9 19.87 36.93 26.23 52.32 30.44 73.06 2.34 11.37 2.07 27.16-.67 48.37-3.61 27.36-3.55 34.59.54 42.82 8.3 16.86 37.33 22.55 53.45 10.44l2.27-1.67-.47-13.78c-1.2-36.73-3.75-61.15-8.23-79.68-3.01-12.31-6.36-19.74-17.26-38.13-11.98-20.27-14.92-27.3-18.33-44.49-2.54-12.71-4.28-26.36-6.42-50.85-3.14-36.53-5.15-51.51-8.96-67.5-2.41-9.97-4.95-17.06-12.31-33.85-10.97-25.36-12.31-30.64-13.85-55.53-1.27-21.01-3.28-30.98-7.96-39.94l-2.61-4.88 1.81-.4c8.23-1.74 15.05-4.75 29.9-13.05 13.78-7.76 22.21-10.9 31.24-11.77 2.94-.27 4.48-.67 4.48-1.27 0-1.74-2.74-26.49-4.42-39.4-2.34-18.6-4.08-30.71-11.31-78.27-7.76-51.31-8.43-55.93-11.64-81.62-3.21-25.29-3.35-25.62-15.65-46.16-3.35-5.55-7.29-12.78-8.9-16.06-2.68-5.69-6.09-16.12-5.42-16.79.13-.2 2.48 1.94 5.15 4.75 6.36 6.49 9.37 7.96 16.06 7.89 6.15 0 8.83-1.14 16.32-6.56 8.7-6.22 13.85-11.24 28.83-27.76 7.83-8.63 18.93-20.07 24.62-25.36 15.05-13.92 21.34-21.34 25.42-30.04 1.94-4.08 2.07-5.08 2.07-10.84 0-5.02-.4-7.43-1.74-11.37-3.88-11.17-9.63-19.07-26.23-35.79-11.98-12.04-32.78-35.66-73.12-82.62l-21.54-25.15-7.56-3.21c-4.15-1.74-17.46-6.49-29.64-10.57-12.11-4.01-24.49-8.43-27.5-9.83-9.5-4.48-17.33-10.5-22.14-17.06l-2.94-3.95 14.92-9.83c8.23-5.42 16.19-11.04 17.73-12.44l2.88-2.61 1.67-11.71c2.48-17.86 3.21-29.97 2.81-46.1-.4-16.73-1.94-27.23-5.55-38.13-5.22-15.86-13.45-26.63-24.55-32.31-6.36-3.21-29.97-5.49-40.21-3.88Zm130.06 307.95c5.29 2.68 18.67 10.3 33.12 18.87 4.28 2.54 7.76 5.35 12.11 9.83 5.82 5.95 6.15 6.42 7.56 11.44 1.27 4.55 1.4 5.75.74 8.76-.87 4.28-3.28 6.82-11.11 11.57-2.94 1.87-7.76 5.35-10.7 7.76-2.88 2.41-8.16 6.76-11.64 9.63-8.1 6.76-13.65 10.9-14.52 10.9-.33 0-1.2-.67-1.94-1.4-1.81-2.01-14.12-10.37-21.14-14.32-3.28-1.87-8.16-5.02-10.9-7.02-4.48-3.28-5.15-4.15-7.43-8.9-2.34-4.95-2.41-5.49-2.01-9.7.33-3.48 1.14-5.69 3.35-9.83 1.61-2.94 3.88-7.89 5.08-11.04 1.14-3.08 3.48-7.69 5.08-10.24 1.67-2.54 4.35-7.29 5.95-10.57 4.01-7.89 4.82-8.63 9.23-8.63 2.74 0 4.62.6 9.17 2.88Z" vector-effect="non-scaling-stroke"/></svg>
\ No newline at end of file
diff --git a/internal/static/performer/NoName40.png b/internal/static/performer/NoName40.png
deleted file mode 100644
index 0214efad4b0d68b2de1bb29ba60d6fcb9e6a12a6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13857
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

diff --git a/internal/static/performer/attribution.md b/internal/static/performer/attribution.md
new file mode 100644
index 000000000..3cb40ca04
--- /dev/null
+++ b/internal/static/performer/attribution.md
@@ -0,0 +1,34 @@
+NoName02.svg - "[Exotic dancer silhouette](https://freesvg.org/exotic-dancer-silhouette)" by OpenClipart-Vectors under CC0 License  
+NoName05.svg - "[Fashion girl silhouette](https://creazilla.com/media/silhouette/76433/fashion-girl)" by Creazilla under CC0 License  
+NoName06.png - "[Woman, Female, Girl](https://pixabay.com/illustrations/woman-female-girl-lady-silhouette-163525/)" by No-longer-here under Pixabay License  
+NoName07.svg - "[Woman Silhouette 11](https://openclipart.org/detail/14083/woman-silhouette-11)" by nicubunu under CC0 License  
+NoName09.svg - "[Girl, Pose, Posing](https://pixabay.com/vectors/girl-pose-posing-female-woman-311535/)" by Clker-Free-Vector-Images under CC0 License  
+NoName11.png - "[Alpha Mask, Silhouette, Woman](https://pixabay.com/illustrations/alpha-mask-silhouette-woman-girl-3072470/)" by Wolfgang Eckert under Pixabay License  
+NoName12.svg - "[Dance, Dancer, Dancing](https://pixabay.com/vectors/dance-dancer-dancing-female-girl-2023863/)" by OpenClipart-Vectors under CC0 License  
+NoName13.svg - "[Dress, Silhouette, Woman](https://pixabay.com/vectors/dress-silhouette-woman-female-148745/)" by OpenClipart-Vectors under CC0 License  
+NoName14.svg - "[Woman in long dress silhouette](https://freesvg.org/woman-in-long-dress-silhouette)" by OpenClipart-Vectors under CC0 License  
+NoName17.svg - "[Female Model silhouette](https://creazilla.com/media/silhouette/2495/female-model)" by Natasha Sinegina under CC-BY-4.0  
+NoName19.svg - "[Female, Girl, Heel](https://pixabay.com/vectors/female-girl-heel-silhouette-woman-2023898/)" by OpenClipart-Vectors under CC0 License  
+NoName21.svg - "[Lady, Silhouette, Woman](https://pixabay.com/vectors/lady-silhouette-woman-pink-296698/)" by Clker-Free-Vector-Images under CC0 License  
+NoName22.svg - "[Female, Girl, Heel](https://pixabay.com/vectors/female-girl-heel-silhouette-woman-2023856/)" by OpenClipart-Vectors under CC0 License  
+NoName23.svg - "[Woman, Female, Figure](https://pixabay.com/vectors/woman-female-figure-slender-slim-149723/)" by OpenClipart-Vectors under CC0 License  
+NoName24.svg - "[Silhouette, Woman, Bunny](https://pixabay.com/illustrations/silhouette-woman-bunny-girl-female-3196716/)" by Wolfgang Eckert under Pixabay License  
+NoName25.svg - "[Female, Girl, Silhouette](https://pixabay.com/vectors/female-girl-silhouette-woman-2023857/)" by OpenClipart-Vectors under CC0 License  
+NoName26.svg - "[Female, Girl, Silhouette](https://pixabay.com/vectors/female-girl-silhouette-woman-2024047/)" by OpenClipart-Vectors under CC0 License  
+NoName27.svg - "[Woman, School Clothes, Uniform](https://pixabay.com/illustrations/woman-school-clothes-uniform-644569/)" by Silvia under Pixabay License  
+NoName28.svg - "[Girl, Woman, Feminine](https://pixabay.com/illustrations/girl-woman-feminine-sensual-1369733/)" by Calzas under Pixabay License  
+NoName29.png - "[Alpha Mask, Silhouette, Woman](https://pixabay.com/illustrations/alpha-mask-silhouette-woman-girl-3066005/)" by Wolfgang Eckert under Pixabay License  
+NoName30.svg - "[Architetto](https://openclipart.org/detail/68047)" by Emilie Rollandin under CC0 License  
+NoName31.svg - "[Model silhouette](https://creazilla.com/media/silhouette/1785/model)" by Bob Comix under CC-BY-4.0 License  
+NoName32.svg - "[Fashion, Female, Girl](https://pixabay.com/vectors/fashion-female-girl-heel-model-2023859/)" by OpenClipart-Vectors under CC0 License  
+NoName33.png - "[Silhouette Donna 6](https://www.publicdomainpictures.net/view-image.php?image=82268)" by Tammy Sue under CC0 License  
+NoName34.svg - "[Donna in piedi 01](https://openclipart.org/detail/33139)" by Emilie Rollandin under CC0 License  
+NoName35.png - "[Silhouette, Woman, Young](https://pixabay.com/illustrations/silhouette-woman-young-move-female-3104942/)" by Wolfgang Eckert under Pixabay License  
+NoName36.svg - "[Fashion Model silhouette](https://creazilla.com/media/silhouette/2506/fashion-model)" by Natasha Sinegina under CC-BY-4.0 License  
+NoName37.svg - "[Female, Woman, Standing](https://pixabay.com/vectors/female-woman-standing-confident-2816234/)" by Mohamed Hassan under Pixabay License  
+NoName38.svg - "[Dress, Silhouette, Women](https://pixabay.com/vectors/dress-silhouette-women-dance-lady-3360422/)" by Mohamed Hassan under Pixabay License  
+NoName39.svg - "[Woman, Female, Lady](https://pixabay.com/illustrations/woman-female-lady-business-woman-220260/)" by No-longer-here under Pixabay License  
+
+CC0 License: https://creativecommons.org/publicdomain/zero/1.0/
+CC-BY-4.0 License: https://creativecommons.org/licenses/by/4.0/
+Pixabay License: https://pixabay.com/service/license-summary/
\ No newline at end of file
diff --git a/internal/static/performer_male/Male01.png b/internal/static/performer_male/Male01.png
deleted file mode 100644
index 8a486299ab6fc4ea7ab3cbd98fc3778ff84f7162..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 29574
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

diff --git a/internal/static/performer_male/Male01.svg b/internal/static/performer_male/Male01.svg
new file mode 100644
index 000000000..72599423a
--- /dev/null
+++ b/internal/static/performer_male/Male01.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 850 1250"><path fill="#fff" d="M649.17 636.66c-.54-15.29-5.43-32.93-5.6-46.91-.28-22.72 4.31-43.31 4.2-66.52-.13-27.27-1.58-56.32-7.06-79.83-10.99-47.24-29.53-88.65-46.16-130.91-3.91-9.93-8.6-20.1-14-30.11-3.03-5.62-5-11.8-7.39-16.71 0 0-2.3-4.12-3.24-5.24-6.44-9.39-14.34-17.73-24.26-21.46-5.05-1.9-13.62-1.18-18.91-2.1-8.83-1.53-20.69-9.55-30.81-14.07-8.3-3.71-26.63-11.34-28.7-16.8-2.37-6.24-2.36-19.82-.7-30.04.49-3 1.17-7.23 2.1-10.37 1.35-4.59 2.67-9.12 3.51-10.64 2.13-3.86 8.15-5.35 9.8-9.1 3.91-8.84 3.48-27.8.7-33.61-.5-18.29.79-32.62-4.2-44.81-2.84-6.96-12.78-18.4-22.5-23.68-9.23-5.02-23.09-7.36-23.09-7.36-12.72-1.7-25.06-.61-38.55 7.24-6.85 3.99-18.86 16.85-21.7 23.81-4.99 12.19-3.7 26.52-4.2 44.81-2.78 5.81-3.21 24.77.7 33.61 1.66 3.75 7.67 5.24 9.8 9.1.84 1.52 2.07 4.21 3.42 8.8.93 3.14 1.69 9.2 2.18 12.2 1.66 10.22 1.67 25.27-.7 31.51-2.08 5.46-20.41 13.09-28.71 16.8-10.12 4.52-21.98 11.07-30.81 12.6-5.28.92-13.85.2-18.9 2.1-17.3 6.5-28.53 27.04-36.41 42.71-5.23 10.4-21.63 53.15-25.91 65.82-3.03 8.98-15.01 48.7-17.5 58.11-2.03 7.68-2.09 15.58-4.2 23.11-2.27 8.11-7.3 15.71-9.1 23.81-2.44 11-3.32 24.6-4.9 37.81-4.62 38.75.15 87.16-3.5 125.33-2.01 21.03-8.91 46.6 8 52.2 15.51 5.13 52.56 14.82 46.61-9.49 4.59-1.95 11.98-1.08 14-5.6.17-10.32-.11-16.81-4.2-23.81-6.11-10.45-21.97-12.69-25.21-23.81-1.65-5.67-1.47-13.3-1.4-18.9.17-13.82 3.1-28.32 5.6-42.01 2.4-13.14 8.96-25.23 11.2-37.11 3.69-19.53-.05-40.32 5.6-57.41 3.59-10.86 10.56-21.88 15.4-32.21 10.25-21.86 17.58-40.07 30.11-56.71.69 8.66 7.31 16.37 9.8 25.21 2.4 8.5 4.6 19.67 6.17 30.62 2.31 16.08 5.61 31.45 5.03 49.2-.42 12.8-3.86 23.85-6.01 36.01-1.73 9.79-3.49 19.35-5.9 28.4-3.23 12.2-7.74 24.69-10 36.39-5.79 30-10.6 61.3-12.41 95.24-2.14 40.25-1.63 75.58 2.1 114.12 1.68 17.32 7.61 35.41 7.7 53.91.04 8.5-3.41 18.4-3.5 28.01-.06 5.85.62 12.3.05 17.52-.81 7.42-4.39 15.58-7.05 23.08-2.83 7.96-6.25 15.99-8.4 23.81-9.77 35.42-4.2 80.92-4.2 122.53 0 10.81 1.98 22.8.7 32.91-.54 4.3-2.96 9.17-4.2 14-3.99 15.51-7.25 24.08-17.5 33.61-6.97 6.47-16.25 11.6-25.9 18.2-8.23 5.62-22.16 13.15-23.81 20.3-.63 2.75-2.07 7.75.7 13.3 1.7 3.41 4.62 4.68 7.7 6.94 4.27 3.13 11.39 5.81 12.6 6.37 5.18 2.38 13.66.89 18.2-1.4 8.14-4.11 16.33-14.44 25.21-22.41 8.64-7.75 17.51-17.82 25.21-22.4 4.28-2.55 9.02-3.12 10.5-5.6 3.13-5.24 2.32-21 2.8-28.7.64-10.33.79-21.42 2.8-29.41 1.7-6.75 5.09-12.43 7.08-19.3.92-3.16 1.79-6.95 2.72-10.11 6.56-22.31 19.84-43.42 26.61-66.52 2.97-10.15 4.86-21.12 6.3-31.51 2.01-14.48-.97-30.05 2.1-46.21 3.13-16.47 12.35-32.56 16.1-49.72 2.07-9.44 2.59-19.21 4.2-28.7 7.16-42.23 19.85-82.57 30.11-119.73 1.09-3.96 2.6-9.24 4.9-11.9 11.87 27.77 17.3 58.02 23.81 89.62 3.23 15.69 6.14 32.22 8.4 48.31 2.37 16.91 2.38 33.95 7 49.71 3.75 12.79 11.6 24.18 14 37.11 3.85 20.75-.76 43.78 4.2 64.41 4.14 17.25 12.25 34.23 18.2 51.11 6.18 17.53 13.85 35.19 18.2 51.81 2.94 11.22.87 23.77 2.8 37.11.89 6.15 4.62 9.43 5.7 14.65.73 3.51.38 10.16 1.3 14.75 1.64 8.22 9.31 20.19 14.7 31.51 3.01 6.33 10.72 23.82 17.81 27.98 7.27 4.26 30.54 2.9 35.4.72 5.38-2.4 13.16-13.57 13.3-18.2.13-4.15-3.58-9.66-5.6-14-7.05-15.13-13.24-22.35-23.81-32.91-4.56-4.56-14.68-14.71-16.8-19.6-3.94-9.04-5.57-22.96-6.3-35-2.23-36.87 6.36-83.13 4.2-119.03-1.24-20.56-5.79-37.97-11.2-53.21-3.01-8.47-7.94-16.73-9.1-25.21-1.5-10.95-.48-23.53-1.4-36.4-2.6-36.32 3.29-63.38 7-95.22 5.79-49.76 7-102.2 2.8-153.33-.78-9.55-1.63-19.53-4.2-28.71-3.15-11.25-13.22-93.04-10.5-112.73 2.54-18.46 4.32-37.53 7-55.31 2.66-17.63 4.57-35.32 11.9-50.41 10.24 11.12 16.33 28.24 23.81 45.51 6.91 15.96 17.71 31.62 22.4 47.61 3.53 12.04.07 32.91 1.4 45.51 1.02 9.66 3.97 20.61 5.6 31.51 1.64 10.92 4.18 21.92 4.9 32.21.74 10.6 3.52 36.63.7 46.91-2.51 9.14-19.02 14.71-21 25.91-2.6 14.63 1.85 26.01 7.94 35 2.4 3.54 11.68 3.58 15.4 3.39 4.36-.22 8.93-.99 13.07-1.28 2.56-.19 9.75-.31 11.2-.7 5.35-1.44 7.68.56 11.2-2.8 4.28-4.11 5.97-27.97 5.6-38.53Z"/></svg>
\ No newline at end of file
diff --git a/internal/static/performer_male/Male02.png b/internal/static/performer_male/Male02.png
deleted file mode 100644
index 673b120eb43392fbac967b16b2d2c167a8dfe815..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 27367
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

diff --git a/internal/static/performer_male/Male02.svg b/internal/static/performer_male/Male02.svg
new file mode 100644
index 000000000..1f7f4072e
--- /dev/null
+++ b/internal/static/performer_male/Male02.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 850 1250"><g fill="#fff" fill-rule="evenodd" stroke="#fff" stroke-miterlimit="3.2" stroke-width=".8"><path d="m443.49 177.41-77.92 6.11-9.17 15.28-9.17 9.17-27.5 16.81L301.4 237l-18.33 3.06-22.92 21.39-47.36 56.53-30.56 38.2-41.25 51.95-1.53 15.28 7.64 35.14 13.75 12.22 41.25 35.14 44.31 42.78 24.44 19.86 4.58-7.64s9.02 9.56 13.75 11.46c5.75 2.3 13.75-2.29 13.75-2.29l13.75-3.06 235.29 18.33 12.22-16.81 19.86-4.58 12.22-21.39 3.06 3.05 10.7-35.14 27.5-58.06 7.64-30.56-4.58-38.2-6.12-6.11-67.23-103.9-25.98-33.61-21.39-19.86-35.14-12.22-19.86-3.06-21.39-27.5Zm85.56 175.71 24.44 16.81 16.81 47.36 6.11 10.7v9.17l3.05 16.81v9.17l-6.11 7.64-6.11 29.03-4.58 10.7-6.11 19.86-27.5-4.58 1.53-7.64-1.53-10.7 4.58-16.81v-32.09l-6.11-21.39v-15.28l4.58-21.39-3.06-19.86v-27.5Zm-247.52 38.2 12.23 51.95 4.58 12.22 16.81 47.37 13.75 10.7-24.44 19.86-29.03-30.56-18.33-13.75-3.06-7.64-13.75-9.16v-10.7l-12.23-12.23-9.16-12.22 9.16-6.11 9.17-9.17 27.5-15.28 16.81-15.28Z"/><path d="m368.63 184.29-6.11-16.04-12.22 3.06-4.58-10.7 3.82 3.82 8.4.76-7.64-15.28-12.22-16.81v-10.7l-10.7-30.56 10.7-25.97L361 38.37l9.17-7.64 24.45-4.58 16.81 4.58 22.92 10.7 18.33 30.56 6.11 19.86 6.11-1.53-4.58 9.17v24.45l-12.22 13.75 1.53 15.28-13.75 35.14-67.23-3.82Zm-45.84 379.68-9.17 19.86-4.58 22.92v29.03l3.06 19.86 7.64 61.12 4.58 47.36 4.58 39.73 7.64 44.31-1.53 21.39-3.06 27.5 12.22 123.76 18.33 105.42 3.06 16.81 15.28 4.58 1.53 15.28 3.06 3.06s-10.7-3.06 0 13.75 24.45 25.97 24.45 25.97l27.5 3.06h24.45l6.11-9.17 3.06-16.81-24.45-33.61 1.53-12.22h-6.11l-1.53-47.36-18.33-85.56-15.28-82.51 6.11-9.17-3.06-19.86 19.86-122.23 16.81-61.12 21.39 50.42 24.45 58.06 12.22 45.84 3.06 13.75 7.64 4.58-6.11 12.22 7.64 50.42v45.84l-7.64 65.7 7.64 16.81-12.22 55-6.11 13.75v24.45l1.53 6.11v13.75l41.25 7.64 16.81-3.06 62.64 12.22 38.2-7.64 13.75-6.11-10.7-12.22-47.36-13.75-15.28-22.92 4.58-6.11-6.11-67.23-1.53-88.62-1.53-50.42 4.58-13.75-4.58-22.92 6.11-51.95v-18.33l-6.11-13.75-16.81-76.39-21.39-87.09v-9.17l-7.64-6.11 9.17-48.89-235.3-15.28Z"/></g></svg>
\ No newline at end of file
diff --git a/internal/static/performer_male/Male03.png b/internal/static/performer_male/Male03.png
deleted file mode 100644
index 1814d05bb91edfafada0d52c7c3e6a970289d564..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 26475
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
J-P1gN=KoSNc%T3P

diff --git a/internal/static/performer_male/Male03.svg b/internal/static/performer_male/Male03.svg
new file mode 100644
index 000000000..60e0857ce
--- /dev/null
+++ b/internal/static/performer_male/Male03.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 850 1250"><path fill="#fff" fill-rule="evenodd" d="M469.89 135.32c-1.69 13.46-6.91 26.09-7.38 42.03 10.97 6.76 18.98 18.14 29.54 25.02 8.36 5.44 34.07 13.59 44.3 17.06 13.44 4.49 37.61 5.45 44.32 15.87 1.94 3.13.93 5.76 2.44 9.15 8.65 18.93 15.05 44.76 20.92 65.9.84 7.95 1.68 15.91 2.51 23.84 8.72 33.13 11.2 71.33 19.65 106.83 3.86 16.2.06 34.32 3.69 49.98 3.07 12.94-.94 29.5-1.2 40.98-.82 35.49-1.47 66.53-1.28 100-4.74 1.6-6.56 1.05-7.35 6.78 3.32 4.33 10.03 35.45 6.13 45.51-1.13 2.97-5.82 4.29-7.37 6.78-8.72 13.8-22.16 33.62-43.05 35.22.53-7.9 4.4-10.62 6.17-17.03 2.82-10.74-.8-26.13-3.76-32.99-1.2-.34-2.41-.69-3.68-1.11v1.11c-7.12 11.48.54 27.98-17.19 29.56-.27-14.9.8-43.11 4.89-55.67 1.68-5.17 5.06-9.97 6.17-15.88h-2.45c-2.29-1.42-7.01-1.24-11.1-1.18-3.18 4.18-3.92 7.77-3.73 15.94-13.34 15.58-10.32 60.51-8.58 88.64.37 5.67 4.37 11.67 2.48 18.2-1.01 3.31-5.23 7.22-6.17 10.19.4 12.9.79 25.75 1.24 38.69.07 7.78 5.53 14.47 2.44 22.74-.67 1.7-4.16 3.13-4.94 4.48-2.3 4.18-.53 10.38-1.22 13.64-2.43 11.76 5.36 18.7 1.22 30.73-8.31 24.35-14.37 51.03-23.36 76.11-2.07 5.7-6.9 11.52-8.64 17.1-5.41 17.34 4.29 35.54-1.21 51.14-3.76 10.7-13.28 10.89-13.54 26.12 16.69 20.57-4.63 60.74-12.27 77.27-4.2 8.85-3.76 15.73-17.28 15.92-3.38-2.37-8.75-2.37-14.78-2.3-2.51 4.59-4.84 12.25-6.17 14.74-1.21.79-2.43 1.6-3.66 2.41-1.77 4.64 3.99 14.92 1.23 21.49-.57 1.36-4.42 4.02-4.92 5.69.43 1.91.77 3.84 1.18 5.69-.21 1.36-1.95 4.77-2.38 6.81-16.23 9.29-73.46 19.32-75.14-7.91 4.26-3.85 4.36-8.43 7.42-13.69 6.88-11.88 12.84-13.26 8.61-30.64.42-6.82.85-13.64 1.21-20.43-2.31-6.75-9.46-9.78-11.07-18.22 1.97-1.53 1.41-.74 2.49-3.46-13.07-8.43-8.22-24.88-13.55-40.86-5.09-15.36-5.7-36.22-9.86-53.44-.39-9.04-.8-18.2-1.24-27.24-3.59-14.68-2.48-33.43-6.13-48.91-.41-8.31-.84-16.66-1.21-25.02-5.03-15.86-11.6-27.04-16.04-45.43-.39-16.68-.8-33.34-1.23-49.96.44-2.01 2.29-7.61 1.23-11.39-5.89-21.61-9.51-51.48-15.98-73.86-3.87-13.31.23-30.86-3.73-44.36-3.55-12.33-9.08-22.94-14.75-32.91-3.89-6.93-4.49-18.19-14.75-19.37-4.06 2.26-13.48-.69-19.71-1.08.07-43.39-15.69-73.81-24.61-110.29-.83-15.13-1.67-30.33-2.48-45.43-5.23-22.3-.54-42.88 4.97-63.65 6.83-25.95 7.71-52.38 14.71-77.28.85-6.87 1.65-13.62 2.49-20.46 5.54-19.41 12.27-51.12 23.43-65.92 9.93-13.24 34.86-13.09 51.63-20.49 10.67-4.68 23.83-7.93 34.46-13.59 9.03-4.83 19.09-19.22 27.12-26.19.23-21.14-5.13-33.32-6.2-51.11h-9.82c-1.21-2-1.54-1.92-2.49-4.54-5.86-6.79-3.52-22.73-1.24-30.68 5.5-1.51 7.92-.19 8.61-6.84-4.25-6.08-.7-23.53 1.28-28.39 7.47-18.7 26.56-34.96 51.66-36.37 31.31-1.76 54.99 19.72 60.34 43.18-1.26 9.84-2.48 19.72-3.68 29.62 7.61 2.29 11.16 4.06 12.27 12.48-7.18 10.08-2.36 25.06-21 24.97l.07-.02Zm68.92 253.43c-16.08 33.34-2.86 103.34 4.9 135.28v14.77c3.46 14.27 4.56 29.26 9.85 40.91 1.24.42 2.48.77 3.73 1.13v-1.13c.98-1.34.9-1.93 1.2-4.5-5.23-8.2 1.31-24.89-1.2-35.29-1.14-4.55-2.52-13.15-3.73-18.21v-32.88c-4.63-19.75-4.03-42.1-8.58-61.39-2.82-11.8 3.01-29.38-3.69-37.55-1.29-.91-.39-.46-2.5-1.14h.02Zm-230.18 12.47c-2.75 7.78-1.07 16.71-3.65 25.08-1.24 3.87-5.24 9.66-6.14 13.59-1.82 7.71 5.13 16.16 2.45 26.19-3.19 11.7-7.75 39.69-2.45 54.55h2.45v-2.29c6.87-9.44 6.54-24.36 9.82-37.51 6.37-25.45 13.01-34.8 3.69-62.5-2.08-6.3-.13-11.59-3.69-15.86-1.25-.95-.34-.48-2.48-1.25Zm113.25 348.99c-1.61 2.14-1.61.92-2.44 4.52-10.97 15.04 4.12 38.2 0 54.57-5.75 22.66.66 43.01 6.13 64.77-.4 9.04-.81 18.19-1.22 27.28 4.59 20.81 1 51.22 6.18 74.99h3.62c11.73-18.88 5.63-60.62 12.34-84.08.79-2.78 3.88-28 3.71-28.46-.49-1.14-4.38-1.49-4.92-2.2-1.95-2.96.57-7.8-1.24-10.3-1.74-2.43-6.54-2.4-8.62-4.5-3.48-3.56-7.38-15.98-8.59-20.52-3.62-13.04 8.73-21.83 11.06-29.53 1.49-4.85-10.65-38.58-12.32-45.42-1.22-.4-2.47-.74-3.7-1.11Z"/></svg>
\ No newline at end of file
diff --git a/internal/static/performer_male/Male04.png b/internal/static/performer_male/Male04.png
deleted file mode 100644
index 9dd1f0bcc5ba541b7a61f3b63264e3c2ff4ee66a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 26600
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

diff --git a/internal/static/performer_male/Male04.svg b/internal/static/performer_male/Male04.svg
new file mode 100644
index 000000000..7e7e29fae
--- /dev/null
+++ b/internal/static/performer_male/Male04.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 850 1250"><path fill="#fff" d="m569.13 610.7-3.2 11.65-6.35 11.65s-2.05 4.11-3.61 7.2c-.93 1.88-1.69 3.39-1.69 3.39l3.19-20.12s1.05 3.17 1.05-19.07 1.06-67.8 1.06-67.8l-4.23-33.9v-26.48l16.95 48.74 1.05 27.53-4.22 57.21Zm-265.42-49.17c-1.64 7.88-1.14 9.1-.49 12.77 3.19 18-3.28 34.3-3.28 34.3v16.94l-6.37-6.35-2.1-12.72 1.04-31.78 2.85-46.04 7.36 26.01s2.62-.96.99 6.87Zm332.18-103.39-5.3-45.54s-20.12-34.96-5.3-45.56c14.84-10.59 10.59-4.23 1.06-18.01-9.54-13.77-10.61-34.95-19.07-58.27-8.48-23.3-23.54-26.69-24.24-28.45-.72-1.77-10.95-14.48-13.78-18.03-2.83-3.53-68.19-41.69-68.19-41.69s-8.48-1.41-12.73-2.83c-4.23-1.41-12.01-7.06-12.01-7.06s-1.41 1.06-8.12-1.41c-6.72-2.48-10.95-8.48-10.95-8.48s-1.06-27.57.36-32.51c1.41-4.94 3.17-13.78 6.7-14.48 3.53-.72 3.89-11.31 5.31-19.09 1.41-7.77-1.78-10.95-3.19-10.95s-1.78-2.47-1.78-2.47-1.41-8.13 1.07-11.66c2.47-3.53 1.05-22.26.35-29.68-.7-7.42-6-8.84-6-8.84l-6.36-9.53L442.07 33 435 27.35l-7.07-4.6s-13.77-2.47-23.65-2.12c-9.9.36-25.09 11.66-35.35 21.2-10.23 9.54-9.89 24.73-9.89 24.73l-1.06 17.66 1.77 9.19-5.73 16.21v14.83l7.42 1.06 3.17 11.64 8.47 21.2-2.11 34.95-10.59 2.12-8.48 6.36-16.95 12.72s-14.84 11.65-40.27 25.42c-25.43 13.78-38.16 32.84-47.69 63.57-9.54 30.72-32.85 54.03-32.85 54.03l11.65 7.41 14.84 14.84s5.3 57.2 0 69.91c-5.3 12.72-2.12 41.31-2.12 81.57s10.59 47.67 10.59 47.67l6.37 59.35v42.37l6.36 27.54 23.31 16.95 16.96 13.77s10.59 108.05 13.77 174.79c3.19 66.75 24.38 157.86 24.38 157.86s-1.06 1.06-9.54 5.3c-8.48 4.23 7.42 14.84 7.42 14.84l9.53 12.7s-20.12 13.78-26.48 20.12c-6.36 6.36-5.31 10.61-5.31 10.61l6.36 5.28-14.83 16.96s-8.48 20.12-10.61 29.65c-2.11 9.53 14.84 21.2 36.04 22.26 21.2 1.05 32.84-8.48 43.45-13.78 10.59-5.3 11.65-24.37 11.65-24.37l3.19-21.19 16.95-7.41 12.72-9.54 3.19-16.95v-10.59l9.53-6.36 4.23-10.59-6.35-16.95-5.31-61.45-2.11-153.62 5.3-56.14 6.36-85.82 5.3 60.38 10.61 26.49 9.53 29.65s8.48 118.66 3.19 163.15c-5.31 44.49 7.42 72.04 7.42 72.04l3.17 6.36 2.11 12.7 5.31 11.65 15.89 13.78-5.28 10.59 11.65 13.78 7.42 6.36 3.17 21.19 15.89 26.48s10.61 6.36 31.8 7.41c21.19 1.06 27.56-8.47 27.56-8.47l10.59-21.19-10.59-43.43-10.61-15.89-16.95-10.61 6.36-11.65v-23.3l-8.48-2.12 5.28-14.83 3.2-47.67s-8.48-32.85-4.23-42.38c4.23-9.53-2.12-85.8 1.04-118.64 3.2-32.85-13.77-93.22-13.77-93.22l54.05-34.96 24.37-43.45-3.17-14.83-7.42-30.73 11.65-94.27 4.23-66.75Z"/></svg>
\ No newline at end of file
diff --git a/internal/static/performer_male/Male05.png b/internal/static/performer_male/Male05.png
deleted file mode 100644
index 35231f91487b3ef09414c023abefbbdbde4ddd9c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 25812
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

diff --git a/internal/static/performer_male/Male05.svg b/internal/static/performer_male/Male05.svg
new file mode 100644
index 000000000..b41f8d1cd
--- /dev/null
+++ b/internal/static/performer_male/Male05.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 850 1250"><path fill="#fff" d="M514.66 410.35c.19 0 .47.29.92.9 2.65 3.56 6.98 7.85 12.51 12.48 3.66 3.01 3.88 3.28 3.9 4.96 0 .97.34 2.83.75 4.15 1.05 3.57-.26 5.27-4.54 5.84-3.05.38-4.32 1.55-5.56 5.19-1.29 3.64-1.33 4.52-.18 8.49 1.05 3.57 2.04 4.62 5.5 5.69 4.88 1.54 4.93 1.98 1.14 12.37-.56 1.47-1.11 4.26-1.26 6.2-.35 4.74-1.26 10.58-2.08 13.29-.73 2.4-.58 3.72.82 6.85 1.81 3.96 2.14 6.39 1.87 14l-.24 7.17-2.48 3.78c-4.44 6.77-5 8.94-3.14 12.9 2.17 4.67 2.36 5.64 1.32 7.82-.95 2.04-3.57 5.25-4.28 5.26-.27 0-.72-.84-.99-1.89-.55-1.72-4.71-11.36-5.39-12.46-.18-.26-.67-.97-1.08-1.58-.45-.57-.9-1.89-1.05-2.95-.14-1.06-.55-2.34-.91-2.82-1.08-1.49-.84-4.33.55-7.21 1.99-4 3.72-8.48 4.79-12.17.51-1.82 1.72-5.24 2.67-7.55 2.89-6.97 3.75-10.03 4.27-15.17.44-4.29.39-5.18-.3-7.78-.46-1.63-1.37-4.14-2.09-5.6-1.9-3.78-2.62-5.59-4.44-10.57-1.41-3.92-1.64-5.16-2.01-11.04-.26-3.67-.69-7.33-.97-8.17-.55-1.72-.76-9.9-.24-10.7.17-.31.32-3.14.29-6.33 0-5.09.69-10.31 1.68-13.06.08-.2.17-.3.28-.3Zm-89.92 333.91c.44 0 1.14 1.38 1.86 3.76.46 1.37 1.19 3.7 1.64 5.16.46 1.45 1.1 3.84 1.38 5.29.28 1.46 1.43 6.22 2.58 10.63 1.11 4.37 2.31 9.88 2.69 12.22.38 2.34.8 4.41.93 4.63.13.22.47 2.25.8 4.5.29 2.3.71 4.64.94 5.21.23.57.65 2.96.89 5.3.29 2.3.9 5.48 1.4 7.06 1.14 3.53 1.15 4.76.12 7.69-1.55 4.39-1.51 8.51.27 17.47.42 2.3.96 3.57 1.77 4.4 1.34 1.45 2.6 3.73 2.61 4.79 0 .44-.43 1.69-.94 2.8-1.99 4.22-1.41 8.82 1.92 15.15 1.67 3.17 1.76 3.48 1.66 6.88-.06 2.61-.44 4.56-1.43 7.49-1.89 5.41-2.43 9.09-2.94 19.84-.4 8.19-.34 9.87.32 14.24.47 2.69.82 6.63.84 8.75.05 4.56 1.23 7.82 3.19 8.81.71.35 1.56.96 1.96 1.35.67.66.58.88-1.16 3.02-1.05 1.25-2.45 3.08-3.05 4.06-1.7 2.72-3.32 8.17-3.29 11.22.01 1.46-.27 4.25-.65 6.15-1.47 7.8-1.99 12.67-2.06 19.39-.13 17.56-1.38 29.82-3.13 31.61-.22.22-.41.35-.71.35-.47 0-1.2-.32-2.7-1.07-1.86-.91-3.1-1.34-3.94-1.34-.48 0-.84.14-1.11.42-.15.15-.29.22-.43.22-.19 0-.38-.14-.59-.39-.4-.48-.37-1.63.08-5.18.37-2.52.81-7.22 1.05-10.36.23-3.19.71-8.5 1.07-11.86.69-6.55.41-20.79-.66-34.14-.3-3.67-.72-10.17-.94-14.45-.33-6.23-.57-7.96-1.15-8.61-.72-.79-1.68-3.83-2.92-9.21-.32-1.5-.58-4.86-.61-7.51.04-5.04-.84-9.06-2.97-13.72-1.13-2.51-1.25-5.47-.3-8.09.39-1.11.9-3.28 1.14-4.88.25-1.59.84-4.43 1.31-6.34 1.53-6.38 1.41-17.57-.64-54.7-1.36-24.93-1.71-33.37-1.72-43.11l-.06-10.61 1.43-3.11c.82-1.73 1.99-4.71 2.59-6.66.64-1.95 1.24-3.86 1.37-4.22.07-.22.18-.33.3-.33Zm-20.6-693.15c-6.13 0-9.16.72-12.61 2.41-6.38 3.07-9.46 4.74-10.91 5.86-1.45 1.08-7.04 3.3-8.5 3.31-.4 0-2.51.91-4.62 1.99-2.16 1.08-4.58 2.17-5.37 2.49-1.76.59-6.68 4.09-7.6 5.34-.35.49-1.79 2.27-3.28 3.97-2.45 2.86-2.79 3.57-4.42 8.71-1.63 5.15-1.8 6.03-1.75 10.19.03 2.96-.21 5.44-.64 6.99-.85 2.93-.91 6.64-.17 9.11.32.97 1.4 3.04 2.39 4.53 2.11 3.07 2.61 4.75 2.7 8.86.02 1.64.35 3.8.71 4.81.96 2.64.91 2.95-1.02 4.17-4.09 2.65-4.54 6.24-1.68 12.98 1 2.38 1.81 4.49 1.82 4.71 0 .8 2.94 6.69 4.29 8.67.81 1.1 1.84 3.12 2.43 4.44 1.21 2.93 3.64 4.71 6.48 4.71h.13c1 0 1.98.25 2.24.51.99 1.23 2.33 11.43 2.78 21.38l.39 8-2.5 1.93c-3.73 2.87-6.29 7.32-6.96 11.97-.41 2.83-3.1 8.43-4.29 8.89-.53.23-2.16.86-3.61 1.41-1.45.55-5.15 2.09-8.24 3.44-3.08 1.36-5.86 2.45-6.17 2.45-.31 0-3.26 1.27-6.52 2.76-3.26 1.54-7.62 3.48-9.69 4.34-2.03.86-5.42 2.44-7.48 3.53-3.92 2.03-12.28 6.1-12.63 6.1-.09 0-3.26 1.54-7 3.39s-6.95 3.39-7.04 3.39c-.13 0-1.06.59-2.07 1.26-1.01.72-2.94 2.02-4.31 2.87-2.55 1.71-6.53 6.08-8.27 9.06-2.35 4.14-5.95 15.19-9.44 28.84-.43 1.69-.98 3.81-1.24 4.66-.51 1.82-3.97 18.92-5.1 25.26-.42 2.3-1.05 5.27-1.44 6.6-.38 1.33-.68 3.15-.67 4.03 0 .84-.28 2.66-.62 3.99-.34 1.33-1.27 6.03-2.11 10.41-.8 4.39-1.85 9.75-2.31 11.96-.46 2.17-1.14 5.67-1.51 7.76-.33 2.08-.93 4.65-1.22 5.76-.34 1.11-.76 3.1-.97 4.43-1.33 7.97-1.84 10.81-2.6 14.18-.47 2.08-.93 4.56-1.05 5.54-.12.97-.5 3.15-.84 4.87-3.66 18.92-3.7 19.32-3.67 30.33.01 10.04-.39 13.94-1.52 15.41-.26.36-1.4 1.08-2.59 1.71-2.29 1.17-2.99 2.15-2.97 4.1.02 1.68 1.41 3.39 3.63 4.52 2.36 1.17 3.03 2.58 2.08 4.49-.39.76-1.13 1.96-1.65 2.58-.52.67-1.69 3.56-2.63 6.44-2.19 6.74-2.46 10.68-2.2 31.56.2 15.26.2 15.65-.71 16.81-.48.62-1.31 1.91-1.83 2.89-1.08 2.05-1.03 2.75 1.01 12.2.79 3.75 1.64 9.01 1.89 11.7.25 2.65.63 5.39.9 6.01.27.62.69 2.91.98 5.08.29 2.21.85 5.08 1.3 6.4 1.1 3.44 1.12 10.12.09 13.18-.69 2.09-.76 3.24-.43 9.73.17 4.02.18 9.02.02 11.1-.43 5.13.16 11.01 1.57 14.89 1 2.73 1.14 3.48.76 5.3-.59 3.23-1 23.49-.62 30.04q.37 5.75 2.17 8.6c2.88 4.44 4.01 6.86 5.6 11.71 2.15 6.75 5.74 12.02 10.1 14.89 1.47 1 4.84 2.3 9.99 3.92 4.26 1.28 9.54 3.09 11.72 3.91 2.33.89 3.99 1.37 5.25 1.37 1.9 0 2.87-1.09 3.89-3.5.65-1.51 1.22-2.05 2.76-2.77 3.13-1.36 3.72-3.49 1.75-6.3-.63-.88-1.12-1.85-1.13-2.07 0-.7-4.24-2.64-5.76-2.64h-.09c-1.86 0-3.03-.74-3.04-1.87 0-.53-.19-1.24-.41-1.59-.67-1.01-.06-1.77 1.83-2.32 2.29-.64 3.74-1.63 4.48-3.05 1.26-2.53.51-15.4-1.18-20.16-.64-1.76-.83-3.75-.9-9.94-.07-7.34-.12-7.87-1.26-10.6-.68-1.59-1.54-3.79-1.95-4.89-1-2.69-4.01-7.61-6.2-10.02-1.83-2.06-1.97-2.63-1.24-4.1.61-1.2 2.38-18.07 2.38-22.49-.03-2.92.18-3.76 1.52-6.65 1.3-2.76 1.64-4.13 1.91-7.76.24-2.43.61-5.45.86-6.64.25-1.24.57-4.74.67-7.79l.21-5.57 2.71-2.99c3.28-3.57 4.31-6.41 3.79-10.34-.53-4.11-.41-9.59.32-12.52.38-1.51 1.75-6.21 3.03-10.42 1.33-4.44 2.47-9.22 2.72-11.35.24-2.04.74-5.76 1.11-8.28.62-3.9.61-4.78.11-6.41-.36-1.1-.76-4.72-.89-8.88l-.25-7.03 2.06-1.83c4.12-3.67 5.56-5.41 6.9-8.25 2.29-5.07 1.64-8.51-2.99-15.71-2.38-3.65-2.57-4.97-1.42-9.27 1.28-4.7 1.5-5.1 3.78-6.89 1.1-.85 3.07-2.46 4.43-3.54 1.33-1.1 2.02-1.54 2.42-1.54.15 0 .27.07.35.19.22.35.41.84.41 1.15 0 .27.5 1.54 1.13 2.86.63 1.28 1.14 2.95 1.14 3.7.02 1.55 1.33 4.67 5.26 12.64l1.67 3.43-.71 4.52c-.42 2.48-.91 6.02-1.11 7.84-.78 6.38-2.11 14.84-2.66 17.05-.77 3.06-1.07 11.82-.51 15 .24 1.41.83 3.35 1.37 4.28 1.31 2.46 6.99 8.82 8.63 9.64 2.18 1.13 2.85 2.14 3.19 4.83q.33 2.47-1.68 4.88c-1.09 1.34-2.09 2.9-2.22 3.52-.13.62-.55 2.22-.98 3.59-.81 2.66-.65 5.31.58 8.75.59 1.67.72 9.94.14 13.97-.25 1.99-.42 2.22-1.48 2.36-1.94.24-2.86 1.89-3.17 5.69-.16 1.81-.45 3.98-.66 4.74-.26.8-.77 3.02-1.23 4.97-.42 1.95-1.36 5.23-2.09 7.32-2.28 6.35-3.91 11.72-3.89 12.87 0 .62-.37 2.39-.84 3.99-5.22 17.43-5.64 19.56-5.55 28.8.08 8.09.92 12.42 3.92 20.53l1.46 3.97-.02 11.06c.02 6.55.21 12.25.49 13.93.33 1.59.78 7.42 1.06 13.04.59 10.25.69 10.87 3.5 22.08.41 1.46.88 3.62 1.11 4.85.23 1.19 1.11 4.5 1.89 7.28 1.37 4.63 2.02 7.28 4.66 18.97.46 2.07 1.06 4.32 1.33 4.98.27.66.69 3.04.98 5.3.72 6.01 1.76 12.01 3.57 20.4.93 4.1 1.96 9.67 2.34 12.36.71 4.81 1.37 8.35 2.71 14.79 1.9 8.96 2.61 12.89 2.62 14.26 0 .84.43 2.78.88 4.33.5 1.54 1.25 5.21 1.67 8.12 2.24 15.9 6.08 32.27 10.68 45.8 2.01 5.91 2.1 6.3 1.96 10.37-.17 4.65.9 19.14 1.65 23.03.23 1.32.49 4.24.51 6.5.02 2.39.56 6.81 1.21 10.51.7 3.84 1.19 8.13 1.21 10.74.02 2.39.47 6.72.98 9.63.52 2.91 1.28 8.57 1.68 12.59.39 4.02.92 8.08 1.2 9.05.23.97.66 4.5.92 7.86.5 5.83 1.26 10.87 3.6 23.93.61 3.4 1.27 7.55 1.46 9.27.19 1.68.61 3.89.93 4.81.36.93.88 3.53 1.12 5.74.29 2.21.8 5.12 1.17 6.49.37 1.37.7 3.27.71 4.19 0 .97.43 2.91.88 4.37.46 1.45 1.01 4.01 1.21 5.74.19 1.68.84 4.77 1.48 6.84 1.1 3.66 1.68 8.43 3.04 24.96.25 3.14.78 6.71 1.19 7.95.37 1.19.69 2.6.69 3.09 0 .49 1.14 3.04 2.49 5.59 1.49 2.82 2.89 6.16 3.45 8.37.51 2.03 1.51 4.94 2.23 6.52.68 1.59 1.54 3.57 1.86 4.4.32.84 1.44 2.33 2.51 3.29 1.83 1.71 1.88 1.88 1.49 3.35-.26.84-.89 3.72-1.44 6.43-.59 2.75-1.7 6.47-2.57 8.38-.87 1.91-1.77 4.66-1.97 6.17-.83 5.09-1.13 6.25-2.21 8.47-.61 1.2-1.64 3.73-2.29 5.55-.69 1.82-1.47 3.82-1.81 4.44-.3.62-.56 1.38-.56 1.69s-.3.67-.66.8c-1.15.45-1.91 3.87-2.11 9.84-.1 3.23-.42 6.37-.68 6.95-.26.58-.34 1.51-.2 2.08 1.15 4.37 10.01 10.6 19.02 13.39 3.48 1.07 8.32 1.59 13.46 1.59 5.6 0 11.58-.62 16.57-1.85 5.69-1.43 8.2-2.6 8.63-4.07.17-.49.43-.89.65-.89.22 0 1.01-.94 1.79-2.1 1.26-1.87 1.31-2.09.68-2.57-1.07-.74-.95-1.67.32-2.88.57-.58 1.4-1.87 1.78-2.94.65-1.78.64-1.95-.12-3.23-.77-1.32-.77-1.45.42-6.46 1.19-5.05 1.19-5.19.46-7.48-1.14-3.48-1.06-4.1.75-4.7 2.42-.82 3.03-2.15 2.64-5.69-.69-6.72-1.16-10.12-1.66-11.26-.54-1.37-.71-4.73-.29-6.9.17-.88.44-1.32 1.01-1.32s1.37.4 2.66 1.19c1.11.74 3.2 1.83 4.67 2.47 1.69.74 2.51 1 3.93 1 .49 0 1.05-.03 1.74-.08 2.52-.25 3.4-.52 4.98-1.69 1.05-.76 2.24-1.39 2.64-1.4.4 0 1.67-.81 2.86-1.84 5.09-4.34 13.86-20 18.12-32.16 1.25-3.64 2.27-6.92 2.27-7.32 0-.4.25-1.2.56-1.82 1.95-3.82 4.25-12.96 5.19-20.62.33-2.7.87-6.29 1.25-7.97.93-4.56.76-11.9-.37-14.28-1.18-2.51-1.27-3.22-1.95-14-.42-6.63-.81-9.63-1.3-10.6-.95-1.85-.6-11.49.52-13.85.74-1.47 4.2-4.42 10-8.46 5.18-3.59 7.67-6.49 7.65-8.83 0-.66-.29-2.21-.65-3.44-.96-3.4-1.96-14.09-1.39-15.16.69-1.33 2.56-9 2.84-11.7.24-2.39 2.38-9.93 3.24-11.58.56-1.11 5.53-17.57 5.52-18.32 0-.58 1.23-4.97 2.39-8.69 3.64-11.32 5.78-23.14 6.53-36.15.41-7.35.41-7.7-.55-10.52-1.23-3.61-1.23-3.84-.07-7.25l.95-2.75-1-3c-.55-1.68-1.01-3.35-1.01-3.79 0-.44 1.31-2.09 2.93-3.66l2.89-2.86-.31-4.82c-.37-5.52-2.12-13.11-3.93-16.99l-1.22-2.69-.09-13.05c-.08-11.85 0-13.4.85-17.04 2.2-9.49 2.3-12.76 1.74-54.86-.36-27.24-.37-40.91-.02-45.55.46-6.64.42-24.2-.03-24.94-.49-.7-.46-10.88.01-11.99.69-1.6 1.68-9.04 2.14-15.72q.38-5.75 2.51-9.53c1.13-2.09 3.08-5.69 4.25-8 1.17-2.31 2.95-5.65 3.95-7.34.96-1.73 2.65-4.85 3.73-6.98 3.29-6.58 5.96-10.28 8.07-11.23 1.01-.45 2.46-1.44 3.21-2.24 1.62-1.65 4.7-7.88 7.89-16.05 1.25-3.2 3.15-7.77 4.19-10.21 1.08-2.44 2.29-5.64 2.67-7.1.43-1.46 1.2-3.46 1.72-4.44.57-.98 2.17-4.4 3.55-7.55 1.38-3.2 4.07-8.27 5.99-11.34 4.48-7.21 6.17-10.5 7.68-15.11 1.76-5.28 1.65-7.71-.43-11.45l-1.62-2.95 1.31-5.59c1.74-7.49 2.69-14.22 2.72-19.84 0-4.11.17-5.04 1.42-8.2l1.42-3.55-.09-8.4c-.03-7.83 0-8.54.91-10.4 1.82-3.69 1.94-5.06 1.42-13.11-.52-7.65-1.13-10.74-3.03-15.4-1.72-4.27-2.82-7.98-4.35-14.33-.74-3.27-1.8-7.06-2.3-8.47-.5-1.41-.91-2.87-.92-3.22s-.51-2.07-1.1-3.84c-.59-1.76-1.64-5.03-2.33-7.19-.69-2.2-1.69-5.25-2.28-6.83-1.36-3.66-3.11-10.01-4.41-15.88-.51-2.56-1.39-6.22-1.9-8.16-.51-1.94-1.15-4.72-1.39-6.18s-.84-4.46-1.31-6.62c-.46-2.21-1.31-6.84-1.87-10.37-1.42-9.14-1.7-10.33-3.52-15.22-1.5-4.19-5.29-15.69-6.07-18.51-.55-1.98-4.99-12.55-5.98-14.27-.49-.79-1.4-3.13-2-5.15-1.46-4.85-2.09-5.95-4.55-7.96-1.11-.92-3.08-2.58-4.37-3.67-4.82-4.2-7.89-6.11-15.62-9.66-4.4-2.03-8.58-3.98-9.33-4.37-.71-.39-1.55-.69-1.82-.69-.59 0-4.8-1.77-7.73-3.24-1.11-.56-5.24-2.07-9.19-3.4-3.95-1.29-7.68-2.66-8.21-2.97-.58-.35-1.82-.87-2.8-1.17-2.31-.73-22.11-8.44-23.8-9.27-1.64-.82-4.62-6.5-6.09-11.57-1.65-5.78-4.25-9.29-9.01-12.29-2-1.26-2.09-1.48-2.67-6.21q-.29-2.87 2.35-8.21c2.69-5.51 4.4-10.88 5.23-16.64.41-2.83.67-3.5 2.16-5.15 1.53-1.65 1.75-2.27 2.07-4.97.2-1.73.58-3.5.84-4.03.26-.49.47-2.08.45-3.5-.02-1.81.32-3.28 1.1-5.01.82-1.87 1.2-3.64 1.47-7.53.19-2.79.48-5.36.56-5.71.13-.31-.2-1.86-.7-3.44-1.1-3.48-.81-5.3 1.25-7.44 3.46-3.62 2.68-10.29-3.3-28.49-.46-1.46-.74-3.49-.71-5.08.2-6.37-3.69-14.56-9.58-20.25-11.21-10.77-12.55-11.73-19.6-14.26-2.8-1.03-4.7-1.37-9.08-1.63-4.92-.31-8.68-.49-11.69-.49Z"/></svg>
\ No newline at end of file
diff --git a/internal/static/performer_male/Male06.png b/internal/static/performer_male/Male06.png
deleted file mode 100644
index 9530d274a09f79cfc4aa2c039cc7e63514836f98..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 31704
zcmce;2{_d4+c2ysl`L&kXrx7D8T*>iqKHbHeP@QOW6RhEC7}h8Eul@4eQenVsq7S4
z#xkQ4VHoQS#`2!iegE(0|9r>uyzlcZ$JcQ<a$Ub`InVPtuXDddT)C{py>0(CHa0fy
z3)-63*x1<NhvUbVjnJcU{9G3Nx7AJC*prQoYZvQh1KZPQd)e5wgge|Y@-n(~QPmdf
zB4v%n+F+!7T-;zZ8{0_@A2(}TCybYf4aVNVRb7-;Q7tOsfL0eZRJbI4$?YuWrh~Sh
z2j;rp<r}tsPPQs&Q4N&HNgq{Mzy;%FE#l+i?CPoNqb~YqT~+v<)r}Mt`7^}JNnP|b
zYeNyEOIJkBVm&Y-DpJytw$jovB1$S!w$ifF@;0&(BC^u5a!6@eq_m2pw4$o4qN<F%
z$lw1&VLK1Bo$58s^M7v!Ep^eGUS4jhNF)x2lfubKVLj}TGAb%6tTkk1C1Hf5r?0D*
zwU4B$=b?YCpo#Ic^>A?Wa=^NZuvWCT!QS#x7X?uN!okJupJiP=|E3dA4C!O-hLn+#
zX5sW_Almkyac;Lfod0Z&wnbu`F)kQaFHaaN^Uqkfn^-Tb=S}Q?v-Cfo|I-FQ+e?@J
z+2g;2#l_{HEj+!>c>@}M6Xd@f?Rmr34THRf@x<Qpu*ID71~3o(3mZ?bYncC_=l@_j
z4F5CPP4%n?#@Y+(aRZBW{?{>I`4_$-vhq@LBF79JT+vvZ=W*6<e^0<@T6<yCMOjBK
zDJ>@{D|<smUR6$BRbEz7T1iz}`mdpvuxJN6-~Vc;yo{=X;(r<n42QP%vi?5~M%${|
zVLe=|fm#kO*7g{ro2$L3$UkSGdKT-9^?;25I=MekT)L!s!PV2t+SL|wK~r56P>^zP
zK&#qe?4%XsF*1^hO48DjGIH|PlFEwKwvsj&3`SbfMpn^ULE&HXHL<q0SZu+X|JM~k
zV{KuL|JYSQ5hH_<mQ$9rQ&hxADq!RlB$Z`=Hi|MBB?TE3B^hf4`G2jZ=ivai)Y|#q
zS7kwkW<ez{hgOgVsFanJZCUHsN!r*bC`j5U+R4hwDPZK3Wzejv@Q1rpwH-X+=zRaa
zT-Pz~fB)v}Ao7QyRIP1U7e!svmUYM&wCLa64*wNB{wF*CJs)=y1B?D|4*##+J+XFP
zIBO5gX?vjE|B<<n{~hq2*53bn&@r~Q7>tTMS`sa5D=#U7mRFRtwpCG)R8+B3R+Lt<
zl~s^d`4{T{73lwo8ULSv{x?}{Z(6(BV?gX8MgLo5Y_YE17>|ED3pZ;IYml}W4^MSb
zI}fajh_#!WvxBWQ>)?>yuIRsI*gvc$;)NCY561s*_d#Pk9R7`L|GvvVAc*{bxZnTr
zkp5@)?Jw&8|9D79mJ<2v<{<yCm+G&!=3kUN&pMkwa#r=fx<3C?9t6Rw3c}+baq@rb
z;{Uxr_W!K_VR6kL#Q#m3{;LaAH0#%Yj00%=V_slffw?`vc&N|ZA;8AwLBF7R`i4*6
z<Y1V`p~l-czcLWqemjXnl3VYja(p3wp{}ntoYiykyLpQD`9Os7i|C?P#>cOYc<W<E
z)|vU&H?xV%tfd`fV~fVKu{EIB*w6?zHUcjj8;O%Gn99y}ioStOg!$ig|J$s8AN_CL
z|F+l<ha;AQ*<OXMt2VU5d(Ccy#V&sx{XCPP;TV>7g86fn?EAvAsI#~KSg9Q8{%Q7T
z{Hc@K{NrWaZYDmHb7`wl>kJ*GoK9NY>eqQ%zJc@JivXl%0e#!xD~F;g)WQJ;?)q8s
zl0h-kT1@%_fU|{UP;98NB46L<|5mMBf|i<-V0vB<U_03Bu>GkgzLJqW(pWmS-g&XR
zP6H5?IKD_XvDb*-7f^ajD)5(D*hmmSZ*^Nyd=SRv-=Vp#n6K>$N?q9iy}1Un#Z7C+
zw$<XWef8e>o;>yjRIo}_R}Sr#R>D;$V)eLIn&jd}=)^S+pNLy^M~Bez$iu1>m7;H4
zKvA+y)xb9Q@y~+tk=5CICIXcKfXeYtQ?A$m;a4L}ifGW!td!5GX}kb0^4jkMpQILD
z#c8R&-??B(`-{oPyIUE!)OsD_cn=2}QFHOM#8J1(D-+Z(y;UHKbk@?nMh9YbmMXTl
zMF5t-kte58#Il#xQik2Dc6hB2fj)~ly=oWGbH`b@uZZ;v9e%&G7EdWJt%7eI&WC=_
zA61HICu&fZNOjzB7&<w_PALy89c~ge`bIT!#sN2xM{sl<odH2TbIj=C7&#GUuzX`F
zZ%22)dVifQZ6J>q#z=PSv;yKOBqa>R0=9Cvs<9l?H^Q{Hp~Z~}!(K7S{sBGDxz(@A
zOUu^vT7j%Crz3`A52Y}a8${3FKERaGM(Jx2L(Er7W%PG|&nej)e#fer;vr_1_hRGK
z4Y1AarV9IOwA4ux%57HD*mB{QlY>RkFPWS|1i#y6SmM~Hse*>&<NX6TA2?U-$Qv%z
z%)Tl=^=Wqa$d`Oti|jkZ*?_7+M}7<Xj$0l)&BAc2i9Mxwuv1aoynZX7=VRK~b7QdZ
z9p|pFZLDU$12wZ;z`4)8FeXpc1StQ}s4)zWjCJA`mIOR(vIFOhJE}B)E<Sj*3BZ1M
zOUp23DztKR6B@zSza&)lF44aXj@foIe3WqEaFJnn#H|+m)lB-#Y<koesA9)j_8Ji{
zGGc)#zT(*nz=x+@Ti0x?Y68Zy2F4Q!yi*$*;~!^3`}kM$1k?5iqujjjp0@)a$9J|k
zBuZyW|7iwASdj%)B0enb$v~EumLZQIoXAY4^4iN`i)Pl`Q}lG(2PMxW`(V=s;%+1H
zZebOeg0|dG$ot-~0gVu0#$c<yc@49mNGeaN%qzX>s^Y-{@!>5d>vQmpeBH2wN|<yl
z27hRuy$&bz4U5xKnw4Qml*p1!g}v-lSF^&XWY2bJyWX#|-NzVjB@u2P;si3Z46B97
zPU-u_3WjmR%*DoHdK|!dKH)D|3p;zSd*pSfGN<wZ8a|EwVj^I^{MG)i(WH0YF#1N=
zuD_edN}>6L(e?-NANEz>Zg}KfqaILmW<lI;Qt)Ef;z-Ya)xVlL#CO9Mm<r;=UrQ&M
zodX)5|Kk3K<aIx*%rN_<oIZV~1ZhFP<BPRwn>K?tA!Fei0g!W~&(D>JYq3b6b*I~7
zd>%O(CuY>BpH<gL=}Inay?vGokh`0mU{clCI(cX7n(+fTK^yy$2hA51Zwdt!zXP!l
z{CnHxSDeD0wnu4M@_NKLT)SQSv<pJ{GeE0(X7oo-olzz=>eE10DqWo(G#;5}=%F9B
z59USZ@Q=TA`8u0&R%<`2>9Seaxa8)-tM*8FIN*c*xwIz2xrxYJA%{PQc>+zi9m2ZQ
ziQZ_6hkz%G{j~L%js)yJS8UKmSV8)Y*NyV07wI7Dw22GXuE#b4YiwvNjmf%6IAYXj
zTCfkM^p^j0GA^-F;*o=I-<?teuG?{S5f^_+vzQLmPwPu(N%0fA%e9)EUo`oT{xz=u
z9sLRE3?`ZV59HH1!&&gPTldnRruNO0RX%&J4w*F8R4<MYE_{hd-0EZY?a;h|PG*Ou
z+JZXgUKX(e$cCNv556Q1pgs2d>Df|nb54|X`26ts=5enm{k{R0o@E|MfbT28!tq^^
z3a!z5ZKCe-&==OBRWT|v$a8JiUwHn0{^t;v=(i1$`_Yjz3p%;ue|3qM>EHs=d#QCG
zd4YLXuYXcZxMga<bt`Na3kDO(Z*Ll3_LG@!v5b}i4j40jr&hbPYA%cDpsp6pI=I2}
zUmm;Cp4RlMd+Y{!hKF^J;TGuK#mj+qgzj+`t#%oB_!fd3_{q8e&S;OgsRkXXJOj0r
z;UN~2%awIcdw(%%$BvwkEM3Qp{zym?V%=kqWqAmEu5jSfqeD8xH*-_Brgd^vg_D-Q
zXN-(7tfV^vVAReJeu20*u4XG9+AOj6rtK55m|-|EUvYLLY$mIqN6f6M-d}Giyb}h;
zWO^@Nom|yda$rf>YjKRWF0y6U_m2lzGBs&i%2}8y{od`bl~R^-`<Pjk{v**W34L)Q
z{S7pG)x7_FeOJ?g4+161vlVC`(WSh0VsWiOks-{>0x9d8#-4y6=bq(APS)4reO??C
zMCS{)lPm}c-6Y;trD6+5)xAKy!^TAX^QAWivkIK-K<~q*jUXDFNTb@UJp;PFEB|Wk
z5jI!Z&Khc&t8memUfdp}`lm@b|K+kT9T5D}eEnmN_{83FayqsStesOQyy`PkyLN0p
zAGrZQ$c&!tV#3+hgS8WULwjkYa;fcw?VoYqcr?;gn1t5be>GnRj1hAj+hxF764`Tt
z`AXiNa=z@>UKTXlYRSG&3$evkXIXk~><U?3*OQJR{5|oBx1LJ_>y8hL(=T63#)Dqs
zVcAy%<PuO{h-Ge}Eob$4kN(}uEjVkT%re9pP=d3dicZmwoO$6t%(BHm1|vae{rN~7
zZU(BdW_O6TR(Lu0;QlnwX;ipC!PHnhOHdorCsQ&Mncn;T|19osm4rxYWSJo(`!be#
zX&@$MA@JTT(@*=sxZATn>cpcwu)_XD0n{5sW?)|Lz+UCee@25P5V)SdOPNLH2I8=|
z7mx5}7Wd=@&a3<)^&}5C8<a<K0CHP<l$V~)Qj<YcDcy+-*#LyMiSyP|pipK(3<&*U
zxudZ;aAk{e^}|OgC^u&o43S-Ds(fcJjkewpj+9e*u*AAG)vY?Ep6<tKsU}^&sP%qj
zzpk*ZhHdE7)%Bl`^8Fj<Esy~lK&W@<5KS~zUXNOoI?%pnbe(CfWobwYq<2u``_h(a
zVRP3WZ{afl?MtaxZXJA9Q6+G61G;q%2+ODM^y%Kd3eRVw1y^0w-U4=-mrGQBKg#>n
z7clAza_o;JdF)$|oOOe)b;9N9+{s8H7^!~*+d;5g!G8Qm`Z4M|FYF9EoCzqXpd=f`
zV=sVllH@$}7VdiffItOFWUrZa!4VLcrs9f1EQ2Q=U3|sqS->9a?=5qCEot&}p}Ww_
zzb<3>rDV6~A~Jx{Ry7SqL;fkXM^)sHCnO(#QC@PqhXi&CJ?0hl(cqiiqN~1t<VB#l
z=WY&m@wsz13UE|Dm?F)Y<ecukc)|Rf--XdSJ@KV?wtJ%SHT_`Dm5?5V(wEvFc{J|;
z;Wi}MeSg8>;<0y&)bIW&E<8e|0D=Xm%%Us0LUGF(ku0u87Vq#Xf2F&1&-Jd5s3hl4
z)}X?N_L+8B;GErw@3BAWw~knPO0yGqeZG0;U{8;Hyf|wlt{~h2OW7${;!Bmvc3j+Q
z(!S(a*x_yk!`>h27n)bF+?c^2Qvqu-jB`~;)7Hri82xgZ2e^JN{fsZ8<punz?K?NA
z`|_IvRkjh$UVl=ADe}l;l3nJ>iAO(?-Za4UCaQyw-&`JQ4(CRmjJY3b{@Kv9E42`=
zu@w(zX0#JRSpYsgjk>XAvp~|bL4RPE3q|IXF4ckVvc));sUYb(5PQ-2BZZ9pg`>V^
zD<|lYJ@>gYwl<(%vB9*Pse#DJRF|%0i?uscc6r2c_s)~61|-C<e$M2$DV;XQAUKbP
zW*pDC?Q@IUrU`-b>6JJXcWsU%4h%Ps+rV?8u`JH<3q6;!u2k+Qw9Zp&=JbAtSEaya
z66amp!VZ_T^(RLqu1`??fhmjWE*u*PyhiunIuJDCMeeRi<oiv_^z6^wGts64hxjZf
z!KBs-P2c?0f7{}#O8*k$G1UtPI|#R_A#Z`TW>e}$8kKxc&yR+J38ZwVq?2Eiq2i+$
zjpzFs>sd9>q{s-VJ;$VmC5lA0ug^}hPkcCq<_Ky)g@2r@oLqK&;eUgKP|~aRf21or
zf3&AlqdYrleZ$wAC<^`bG2Xco$*09AsJGN8%>xcs)DxYbR4s*0|J0+`%4QFr=wBF|
zogx*@EhBCn$b4A+{bLi->L~KCpW=Du^T2u1A@#*Wd(E;(Ts8oLF|$0lif$w=#q{z%
zySybOVjGS}1I?ZQ78763SgG1V)wtV_+5?rEbMwjRz=fw<oS*dns+yZxY<eVQG4|%0
zMyn5%lfe6O-3QsfSN<}w+_#Q-fQeV?f(xgqu;>vNFq-c<)66Y6QuKjxDYux`2fMyh
zFn{$$WjwO7J#;CH8ucb4aRQimi+QvYx0*o0RBQeh0isiAITx_rmR5t}p5>|*LWQiv
zz&x*^;OTk{CmJEq@A$%CU*uqfbz}0<lsw%m=oGzn7M;vQ{S3(;HaTl}FdCn~7#6T(
z0$PVDbvNsax`)a}5+_%Y`2<eujq9nyPnI*JbVQg|8wj=Y2Y#OCYT`vB4wH0<-O6h}
z__@gRJJgWFAXfTDy$6GTH{p29GhqjR;6QMG`cG&MT(%wZ+eF|cOZD{8f-2q5h8j5!
zR_ITbIRXci9`oWE)H!&*{O82NwdP_jG@|ly0q)1qZ3UgE^|F|}vO6$HKx1^`KpFnb
zMTN*}FbXI3HlV%)L<f8#N9gWrK>2v{)PIrOwNtvvw)hI}G&_kis?UL1W_d>T2E9Jl
z0RS&)ecqXDl(i|w_R#P5EWTrQ-+wgqyTfH?j6&(ptOtS(sP~6rbL91^E40qcf_5_h
z0T=|mt1GBDbod(htGYrBsKvAZW=+lxY8ObMovyD2WFN8btj5-JW+{bG>%{Prg$URC
z(LSURqWFOZ)HTUoHJsXA`QK(M1anxv!zruJ6Uo85!bZ~Su%wNg=+s!P*m36RoB2T8
z7&}R8e_Rzgba(D|!-<OJ+tfptLR?4*6Y<)kGZHBkEW*@I7-=+QXlPGJRk`$>ipIY_
zm#g448uINOkC;>ld=8B>OP4E$p82N(AnB#<K_Btj`bQVuYq?<S$Z(LfK7cbyw`Nxr
zs76tZ%J-oW{4N`^hk?UvTym~3-ttNp02?+6Y?m4s57u}Sw8gB^(0uP{`u8lbCp{!h
z=kHJtJ>KPmYabX6?jH|JGZQ>be_T_%492yR$`E;DAbAc(IDl=BQyzNZ-05!-jX$i*
zT*>Gcv_c_S6szdQVcG3K$D+_V{o4squipv>cwyNO6z=mf6NAMb-ZC9ujp}yUa6td}
zfwCL0+SWG$UO0ssSt%AaU~l0Rh8o+Mx#lNM(|7m-cS~~nbem+3-PuZr@)7S(V)wb7
z^0{WyE;M2WB;~Kb%_p;ZHQZ|f_lGV9<*s(Y=aONYfFoF++X)V-fu60bFQjO0pBHVv
zI}~7=JD79ju^W)11X%I?39syq?Uf&Nh$BtVG<pZ7hakH}ftO{$cUH$@BU-#F0`CLj
z8F1-;w=h@-Vw(`fGMonLf(?x&znPx|K<jv!JQ`(T8}ecr4b1*@>|s(HH&>p=di-Rq
zque&Sg*DzGZQWxAAX>@ZBRFMUlf@DcK0t&(#XBYbd#6u;eftSulrgJH@AKqkw@3$*
z_6G|NQZB8WwY<}01&lw-@_&G$u+u@X;!NQb|7?n7Qd?kCoYybbriquwewRPmfb1#D
zzlmr-{U{ICt#{cz9V3879B&|cG^=m-iL+t!vNi-mhe#f_s~YfF<sgNz%qRSs6Wp_{
zn@C!f#K}Sx!ReA&X4%ucviqXUhZ|>%OWQX})tDAvuFgBAfku2h2f>l<O_dW#X{A*l
zvqSs7i!mgJQpA^X;+{%nKu=Mz%`1&E_s)&vs$2EH&X-NTybp?@X*2kRu7))MP1t}c
z<FWE0QKpE8Ea|!Gv-ejw%$c`i!2#a*fEuE$V3|G@i?Wg-wBi$tL6CmX$?a2K8*k%~
zxSWe0vVkGfqi#iQf$zmOu;kW-l6@@G0C&jh!mpnF<<qb%2Ushq#U{bOo?7^t1wO{-
z-vGhV&&$^|K+Z9toZCy{)O}iHs-Ay^i*Lj)aDqM!vf(ATvaOxiDb-W&A<kqttI&f6
zN!xV3Y>>ry?3$-nr(>IC3B3F^6(#-2W)+=mU#|jJD<5K7wRz;=mG+9<=~N3C4x@(n
zK3((e8{8EB=JSl9p#vJxqLmpmPTZ*Jf28`hlLCQP9ua-VxXNAwMdirt1!32Ir={Li
z?34scN)<iEPmibwomJW?BIU^Md756^@2u~SPoCT;BU@(NsBc~c15~p@{ovT8Hhy%m
zsZZrnCh%HhxUYO#We-o8C71na7iwCLeraV7AKe&eX;uewu7OIK><LaBe<)@CnbijF
zOJNVsyVyOB2N)VJMh3L1vxgUVof-TjMB?NhXNP#pfQO70y><>_ii2{&M*Z1d<}EPw
z;l+}ULX;ezC&WM|R0zDOGybMLjO{h|Tj5q$LNJJ%J-ouq>9=1bl^p@hYxrBJJoONB
z=mP1vQi+ZnpFc~=tHM0Oj-o-yV2)$7)Uwy`{kSi4dSk?uasNIbqL}_YTO3zSDV`-M
z=pZS$M0UveGR!*wfVXjGT{#=I8_MywCg4ugoM}C^?IQAK?l>TF1AG;O4TtN%P=6Om
z4bjpM+f}+vWFPp=hPTj&lkY$s!_<2hbASB#JmNX*G_~uL2LUPgJ|B*<1Oj>ZjoJ@k
zhfrY>XW<_IdiZRUy;Q;rN+?q}&?Aj)C)i8w)<Bp;b1LT(Sf7XcIi;u#s6=bHMX_u#
zuYsjYV6l7PS|@WvA0C`3RxpdkOP>Xc^3ulXRJfCkJtvn&cs7iEO&)mtJ;)9eQnMO?
zcd7v`zUno=o=W73_txuTbNF&{)#CSS4Et28PR}{i@jF3J)>pMioLJc^i8m`!y=CuL
z3cJs){(f*&WQNeX3IUz8^^5f%BMTk`oOy~Ad@Z?%MsNX_rZ4duX)ISh&0F2K%``50
zC4%QwvqnXHI$G2a>rog}YOb|{>0ErKN4I`4q5>f^N<}2xuVd^xvwJm`{EL(#tKWPN
z@&NlqHSI}Hg@c3!ss5Q>#?+!}3ZwcA<M;PqFgh@&?jZ1>k%FS=kDkZg7h496GH$!}
zj7EQjB5~64cNAS;euiaGA8(a9J^JC^k;B)e-@nJz7>4~EUgu?`D$&#C)8`j*skR#s
z^jkdFede4}RvXZWs_^0KDo0<}niROxZd!_WcjhPRmZ-QDN3Bno!?Fe%%g;U}Q#zeg
z(S$v`E80Jvb(50g;+7jN%ij_-Jc_mG)}M&a6Nr15cWUR9*kDBJBM*Q2EfJ+v&$hge
z$d2JVi2e*bq20aanR7a}DrV~U>=DZ)pCPRe-*`|c_nHiAnS=$8W(CW+Mlb<FO=s)`
zk*go;*)=+*-_p7n2ew*fowN_KAc--x%ZhTYGUnN%!mu^h36C~3uD_#g(pvM&Orl=e
zFU~BP_!2;f+Renr>2*yE&U8T>@7+P2M#asC*H`T_mtxq7Pkz_0cWQhpqnc*v(I5Xv
zH@#LOW?HfoAGe$=M$u$H?%Pxxqq``U6I5z_n1^I9ghqIFft#DEW;vPDJdf3{D8Frl
zZJu$<A&Q}sLpY*78|2WM5NSOXV}p+_(Pe@_YCN^05tkRHTp(CDemim5zGuvE?e?^C
zfv1|?RDC!v1X3Fl-Z{Jj@yU4DWm53?Ll^gj53h(b3xXC-xd~4%s1J#sEmZx{8<0v@
zIqFkt=SZGz!z^3uFOd=Py+8P~RCxLm*<F<L^{wT>PZT(Jt#QzO$IB)mv5_-8lD~;b
z(;L(>z#g^Z3_5D++rJ^LadU*(V5U;p<J|<nS@pu|tCfey_gRC!+$JSud55)EzAaQM
zil=DuG-n-s&qqh|pb>LlQ0sB`mCROSeXIACCUVWdC84jeqaIf*Iw!YGsH9O3>6g5#
zk{_T$d}EY2+iCaZ>#mO<>@Ym-WpX5)S;cpaIG({xHZk~}SLial5X#{e^vJHV{S+?-
zE>g^$@GKrNPv)!3M;s;$h}P#IbMp~bMl{*qElSFyNxHGs_k6gsrQPJcMao2)?@s!=
zQt!pDk7}|kNLqeJJ)aq+(Nj7~GKFQBuZwXfDeP;EY;q^9+ie3$tK}k+5@8wo+ILp6
zaHv%%BWT@wXHSX922eKw?kjl-rV+lnUxY0y1Qttx7TX%hE`{suN1dHME$=+<QPFL<
zSJUIuOY)t_rNfgG5ce+^W{Jj+c^ZV4^nGBzX>Pud()gHa8~AF#TW$IRkm0*x3~{kx
zz;Mi;UYyV-a*ZZs$n^mKttuw(mQ+ms@aScHkMO~mRxvpCxn0|(b_TR(Ap%X-j?~#m
zy>?M459;=eSk(%I*reK>QQ+OXdLzG&;z*Cdb-#k@HWvTZnZKWBCNbrydB>x|Z&9m`
zY@TV<hl{az&F0H^WNp?HNPJmyJB#A-MDO`~c*W0IpTz_{3Dy{gkksIAFeZ)fSZaa$
zaz?0EpLb=8Y5t;%SjoFV$j%Kv>>c`WsrD=|P|U4e<z|)+Wu3~`7QY_e(Nnfq9Frv>
zz38|KDZIPfCKzS!>){sk2oOn?Bh&Hy5tZM&cti^tJ4^~vgQEr_CSRU=@bpQ!@z`PH
zBDI~rYis43nI_bTSPx2jSc%GoZ<smJ6%w%~BEz+ilkl`t<N6Vwfj24>M7}+wA=f3=
zvO*}TpqRT-<aw|2K3RRSA`<HoMy)*~RkD`FmAKT!j2?)nO>tdyAZm~j^!*7@OBXs6
z$JZ|oR*|y3UMV(sk6{`?HkVcNC%!@Nzn5!oN^Z!Oh;LkD-bGGaO{3ag_KTfB4^D30
zAvAn=(nv>$c$q2R-X0X<{R8J(X@3O9Yhx^@DX|)d4l#X3w;hV;yPbpE`PIFxr)W!a
zU)ZFh1v5Wq_{4f;*QLR|_ulu41yQE$))u}Wm=R-2KT=wrqs0{E?{n~}sxY4rvyB>5
zY7L&MP}BT=l@i3eGNnP6(<JZ~avxRtHCWg{Old5>cmJ+YB{?NkvoU#W;Y8@v<BGFS
z2zdbv^*o5`RW9+)FARRXWL4R+O1_}((Gz;NN>3~^4_A6^C7RaVr)1z9*(6AAnZ#8X
zi<dQ^(3C?HbV++eN6)3FD5lh<aO%Y1#oV2*XLV6d?=_dMS{`NQ)8*5^$W<qlj_9Dy
z&;pvLGBp<#rsktAK>GFGOgEZ*Ur<x~O{QVvNqP;fnmX5_N1utuGRrSm7STPXxDu;K
zmu=ezpPZ9yTj}np==68Y407B~BfX;!h`a<L-6kuAoA_eXh_Z00`gXByPi5e|ughg!
zlf}xY!;*$&2F|ZtE)fO5$sH8=V3tcmBn7R{R7VKk)27d~-732_SIoSXtFRqkqxMQy
z>Bh)f#?w;aN2HNJY=8?Jf~onDTXY};kC@V!lv5@|mEF~TYBzZa8=dt6MTgL)`&mre
zgO)BFWqK513C_P$mknlzUR9huhM?np-WyO-O3Rl48&q+fo&$56V@83!0cYmm1!p;F
zf7{#bSA0ib5rf`%t+b+SMVX1EUQ(nhBn0L|VrBvs@&3imAJ+~+7&6Gib|4i3-9M)I
zM#Au^lZ`0;*WWZQOs;y^j;Udf`hODou*lw`E5L8j+C$}AyuT;8YS^5({*-1h&0_DB
z-Tq>kRRqRSCEe6f8SYDf<J(@fK+?5K>YWi6$HHp`$t0#*0}4Ea<ezgf-+dgA0ft-(
zN;l%my_#v5rOVsDP53W=96b1p+KgIxr$=vuLw{zu7-%W3kl<-9*Vpp3Gno$}M~{By
zogd>~BlY!j+hltBAS{#ik?K!YPZpk9U+1U$*PYpm{Zf2w|J>ZiJDQ+?AjrZ;N<U;5
zt8#HD4lm(-;qjnc!eUS0@daY&PQ1;h0kqxVA&}?N@1>P#J3{gJYl-+&*qpyQxY=rW
zXAm~2J9O%UYoq*#lGxbt_YEZ$uElMEd!Lo@N;Lb_`P=J+t;OOcPGKzRtw#MA_q1gN
zy=p=0k(c<HiSHkx)thIl*0;GW59U}e#i~r@l0`vC60n(R%jS^SAw(T>BEO3TTbU5x
zX<CF;c6XY-X9%X~wTv(7@p#Q3u?R|`(s?_qguAg2|MWe^)Ea~v_~p~<qzc+4x;2t$
z?*b)R$e+zIxMzD-Ml0n(^TWp1&99fxh~|0!sLMUeqo{dfam5j(^q&a_F&0Q)H36Os
zm1ffd<m+_P1EeHwQoY$EM1Fp!t$)LMDdgR%?3?Q3`#xrNU?H@`h7x%Wz<pp}k$)s;
z+<udJ_*Aag>H13ti$>(q&e98n43_*p_1p+cGnnmSJS>s9`z^P-?I+2Q?q^6ZI83+q
zAGC28)lecYYg-*LR0!s4U6PsF^rGeas++x@BJT>UT)LykeBRRD<N9wQqV-#dRleeU
zY`Sf9*y*ULJ95kDRZ3g6<-$_F9=$-`h2~3{|A14l^v77^9tvtYotba!0rT2i<Oy}o
z#*n@v5<G^k^-FRA$Wo^YBw}>T()o*sD)=1gqg?Kvh^A@ttN5y{jTpp((O*CPIYJ%?
zNR2&n;^r36)byp9q3<$XD1#$&rVXh01}PUBgwXXT{oZXW_#$Z8e_L{6YX%*Scp)_e
z$(nLR<wOC6ywnsMwOXWbSL622#R(zC;P*kS4=wb0?PI(|vt4>8xOU=|T9EVf&ROr>
z(i4Re6x~9z9moQQ<{Ba{-E^vY@*KUu3j(~e{?+5P5I|3pv0YxtsJ(p!%!j-bzxIuk
z={BQ+b1RLgGkzmVt8xX&AN|wBALh-a)T#9pJAX+V*t^eY%|v(NSG<#d5qa7U-z&xp
zf4Fe15Wm(u_+!;1gR*{kLE3zOd^HLnnus~@X%BNvT!USd8UA5=R6vgVN|%f6Wm<s7
z<z#GDx6<zXqFC2MH!EVa=B`rKQPkv_7QIbPs57hV#`(CZHJP+chmI;e+O?0HYyJJp
zN*vL^u{>C7`6^|y%hb8~C^P(tv+WmQ<~QDOI_DmHjoHbNxMz||KcvGLZJsEwYr_+Z
zZK}Y%#BT~Gd(KZZt=$Co=S5`mD`LyK#jIbcI5WKD4CAf6=n1~Z`U!f(5tBMN-cKst
zBpi;@0<4R0s%`bP&O3Fd-iyCXSk54lAFPMr56m{Ae#{nIdQuc!YhuLC>4(MUP)vtz
zhAQWEWWzOZFN(>!yk0Yzg3Mnm+fM=7?Gbc7EXJH#Rl9eNz9TL302H^ZzglD;S@nV1
zmF?$~Z<p<lFe#wTw5rU5?V~u;0}<kn2x)=IIm^(t7iIgm;`{9RAY2epJv)`OXDyhK
zT~*q-H$3DcYJ9G_2^FKLD{k1R$e0LATShV2EoSc0?7`94dZ|{>B8nY@h<G;lIB&#+
zsj$j<vQ$JjSD{Gn?9-9yCN+|lN6v^-Xqz=Sas7gBG(n=nG=?LMmkAb5yFren2BA)H
znkh(h_N44WLEnJgmx3zf>+bpX!2V)$!w<VP#ydfx%#$3bkU}iqbjFX~3!ry5OB!lm
zeIDaqd$eIou8pTXo!$_U_LAwpgIIZP5uJ7#VuobDOk<5@YWJ2#|4N2G*Pvs&J{ZUY
zX_H@1u1;Ovx)m(rcr3!FGE584a<|PXE-4Wj;S;m|>1&yJ4Dd&IEfo4~hZ-TKgY(+A
zU8>}rd5;vN@Ip$7^c;F1ZTfr3wjKBqMh4x_bsVCu7Q0X;ou;~2k4Y)69hp^7_GI^|
zP#uEJdm&p5v6)un-S?U2GlR+@Tonm1m6(e()wtEGIO=zVgzctyu<Qax-Ew-}W@<+P
zpbw854G51;4<-cVCm!G5sbMzxjbY%i#}F)TzCBr?CPdHPlS|_U+%(xT2caOysw*|Q
z2=K#42d7ZK7yjQ)u8yp6=k+N<V3v|g^UH@wyiIS=r}Hm7dqEpU@<dhERlPfK5t22Q
zREQA2zPQ%f1D04{t=5C;nt6%02)vY6l;TF3+iCjgm!qt-aP81bPxmppUOD}<`jW|b
znzMdIQnv3CNcmtC?_376VpSuis>Wg|C~ZPNWfqbyvyLxPohA*#Vy6~$jz!<)^v|Fa
zw$?hn7@;2ZJLw#c=S!OSYL{+0o|d@jVm72}F55%)q#3bcEp^k69U|`NDj;64R`6@9
zms5+&Ar}OFzKb*2qS!7}E`JxxIMINzB1f^|+9A8=wfXV2-$JTqPt!MW6&N`7aYY`(
z_x5-gKt70nAZVSsiMoWap33r{X-?V#nVZx{&xN;3K`qOk4>6ETPl14QaC-ZCLyykt
zu2>DDH;_rr1afVu*U2@Z3Nt?U+`kKD8hMkYT!i*xr+W3)wn3Gdc0&FYs0#ArMyFj3
z*6!V|dUS=L3`G$35TSp?wj;)gyW$XHMP|KKMV54bj*B%a96z0q7msUSMqFCJxH@to
zQjCMCA>k%Sg^W_ist;zveVlE_A(2w_Gj9M&PRJi`SdvRsw7z&NLaNo~d9T_IsY-xp
z{3KLGd^{!no=>VWEOrYVIWHvJK5Wv1%rWQIgvQN^)4!@H^f=SYM_{pUke7HD%4i#Q
z;ZD(k?cQeb)V~YGK_vb15z(65FOU=*&>=c5@Q)PfhN(&Y0p5Trtjj-AD2BBiy1S8N
zzgy&8tcu4T=A0}Nf|PB?qw(iAoE$&22g*Y-_COl<j^#pExvk}bj9#tPa0{eTG%x!y
zF20c-jS!Aa?h0sagk(r~bn%(NovjjQ3W9#Du!e+R@-dE{`h6lcNBI+^Fdyfey!HK7
z{{!+gZL*M%);v0$s=bRp!+o~P`14L<F*EvxsK(7HU(@BSUv&S8<8K)>$U*8DEq;t7
zvrYlQM`&6zdXj&$wUgGS04pTQl4@YXddC-24<Sc#mvOJOFZNJkJESvMxq=&!`9g7c
z!D7h&eSn1FQ7xlL2&CByaq$~forBE+dK0qdHB8czeifK=>QXfz?GUU6!I#i2%|$zk
zQgCn8Va?}XRCbF>T+hWAa9*9#=sLy}DLcVDbnt^L6bU`UNih0RN5q)H8gnX_TSl!i
zp)T(k&Zk|R8O#S&UT5z9n(CTq^{xMbSU9dh;v4|i?HylyHsm$N3x-Amx}jdFh8@)4
zwu289%m!kN=O@hT6RGS|eeV{IZ1EmB5~0W39tv$p7#`WuTx#K}!kmsVq;JsG|1ETZ
zFCHuRTbXGz9l!%xD!2kzd+Uc;7k&RW6n{Lv)EBN&aL^|I(VcgH^=HylnbX!#n-Kp_
zRY;dF9@$@{A;<*^;TRe*eF`GG9B{E9A(-brtAB@8pTODJqslx8G8Xu0c;cbd5x7;5
zq7A5OeDv4Qol>zmzj@D?)L`1T{<(2oXD$Wt-FKOQKuf$U;Pq3nNpkhJxvI7SorQY~
zL4RU`_e>KpcUSbMCoJh*BLSJEHId!Pagor)k;WNF;7v^LRr`v#Yx8QrV<RC^sj}8-
z{|*voCe%%g@t!G=Vj2yE;f)bXji{m9pJxPCPao^P&n+gx<^PQ_I}&@3z<ceLT6qWJ
z?p%!0O|=b4_H+zFk>a$A575DUMV&FvC6(h_<e0Ki#NI9t{=LVsrd6TSkPK`)J@N}T
zhp~@O<9~t=cBs6Y1G!R_hJlq>d|?x<y_w>R?-1k1AU<}_6U9+mKm(*SmPg2zQkk^d
zmUMC{K5w<M-TF9FB!Z^t_tR<S^jmSo{<k5%sBtEeNx&6i3xaB*BM7{rSikx>;k!_+
z<9?J7PHk=p=vVVsx1S5ZAYPx!3_78<#Sm&1<sO$+Rx}I*w&6xyuuBRRIF2Zd8Wws#
zvTxDPdh^jo@k&qw(AdDN9&aAtCbq0{2G)kW_E)89rcy&VjFF}CoLBSpC)5zWj90{_
zpvSnZjadAsK#O0aTH%U?V8CsQCwRVFpNQ$E;h)Fx74~gf<OF<N%b-{QgS>>AeN5>@
zdWIxyN}EZ*^KpU~dMD%<<lsF~v$<OMvZj_<rrX3-%Amga)F;bnvn`NtAba|#Ifnd(
zxWKcxN*Xt9b+$sI)ONHxi|h<Fu_Nza%R$~3ijTFqUmk)&P=nde)MkAHk2upAC8j=h
zgdAI4&+qB$<y&n}S=pvZ;=H<A=Z*_Fq7WY0wALHZ*q^<EWUg(dJgg67G}H9@G4_`~
z`FQJu;c7u@VloOc<iejo@)HKG@iE1ifeDlp`@nW}dcUu7Rq4tdUm_%Bl0omKoc`v_
z;WBy@>t9z9lSOVKYOVTKsoBa@Q(G4Ose`$a>L7N<Pmq!a!ncc->Y6fo#~LRn(*}mK
z>x*-#jKC%R)a3>mO_xmVTveLO$qikG@jtk+gMt>+j`P<D$aO6Jms2N4z+vWzsH(|U
zbVz-2-U=a;wSPXyE^EFEN}c^Ba!-1;xMC>P?JFKp_+G~E*y<Ll`boP`D+A!{aFP(&
zDfG1b<TqT(>q=KtJw*!-9{Jiw@+jWNnL<|MBA#4q)7#jD3V)wtVrj}}Ts!pPLX#6A
zZx%Z}7+D>ZwzMh`6qj&vDY@Vlt%^}yxSoe$U77H=VE2`X5FlUr>~-b11I6(L(T{nR
zQcYq|`pNrd41GrmD3g87<W(^}-}3d{FQ_5u5QF~0uSxRD96R|-fn=B*PicBMo3*A^
z_mi?%QJ7D8u#A)|T(WbX^{0KOaES$RfbM-h_UWoVpF0$CU5`u98(Um0qFr7ZY$V22
zlM<>{hiOa5b<}|Wl0R~7iZ<sS)SA#jsUC_5wIaaW*Up}nFn6I&@3Ou{VX*FG8kISD
zdTG$)^HK>lJ81OrISbT4R*lx^5^9lQPupmAd5P>w;Em5vE%M^J3I$LXu{CW57O1SB
zAWjxcXAG;<vP%7`=>*;o+6&VZT<JRMq>oTySuxdfq}Fn!A@&0(rUzYR?{DnUq(HdX
z`PZJbyp_Nqh7xm}p|QZc9@wr(X$cZz-Ve1xot#M;niLBqRpdor5cyl6WGPjIA1aJ4
z8(C-+{KV1+14j(2=2~bL9fQe}%xOenRMn=y{IzC{b%oUB^V6==n2z!hFfP;ay-Htp
zeLMs9@~-%v>Tx_ZiL&19Y3#e`OR1~$UqsS^HYryuxneATjosRSty+o0*L;AAO!d=d
z*?Y#@j4ez9p&E8FYQ<G@j8Sb|CC+O(J96M;M+Kt<XSapySkccboMy3mWU8*30Orx#
zTg&Db`2@<kzo;~4t<IG&(iW2!J}BWBE;L)p(ys$SOa7yj>T1;7pkWO|W7~>b&>;|*
z5>xH9W%px5&c6dArlfK-lx8wRx2^8efH>#6`ka6H<dphwGkLw)&h^90kOO74v<lI&
z3J!Gbth0ft&Yituk$F_lb|yzP7cH%?qOhd7`oU68i&-6#xyYmhQ6^FJ^{L0j&&7ES
zXyVN%s{$y4IdZxZ3fS7rMvQJFEJ}EqCE^kSqLrMs{;pxAP!57qfaaJ1Pe9o-qNn+n
zmc>3w+8ijkPmWL9PY*!du8L=bK7Es3pm5@Nk`Qo(YDEr2)^~htgL3_qBNnlvYm2z_
zn(-XWO9j?3K!MaI4)>z#6wkGtc^bBqZN#R@h(ntpu@wWUNcgmSyVSGlk5l@zrj!hP
zbzwUz<I;Tn_kpcje!Ru6buQ_eW#CpSj)#xL;;r^0E1eTcZ0e402XiYEGM@{<=B#4w
z#vWiU-jCi1B@x&6g0k(PJxFJlA*Z`|{pvghO7MYERp|TvEq#~K(3mT6#1Edz-cw%x
zSJNZsg{w&SxR&L!2Cz*=p&wEl6PH|_J)m08$08q>D;Qn@8M`vprso%iUfmR#0)}kE
zz*=%o#kw7j(!rTdX@<%6MeTv%n|E3%SbD04P}x&Egw2mbGegGhPg7Jt`<|8CcP}W1
zI_Y@CGM4M`S*Uc7+Yb=GEw(u;75%K8x$Tyi0+{3_k34k6qxXXHj)l+C{RYKZd$b=m
ztu<WW1_ka?L4;=8C?2HDH`tfty`MejR1Bm++MEEY?J(_%$OS-bjy1V%{=o6w+TEjg
z+fjv&2H;`chH{G+rw9hLIbX=)Tg9JYXdfGzLy2qyKiaC`e$}qH;I2RBiQ#zKJC1BJ
zr%xkSqaj)S`qtiO0^uKCq2zo|({H!>9y~%CbwEg5liquQBL?nO4T-zJ{~K$K6HG!B
z$F|J^ZLZ;uoTrmBAi+As4Iaj`LB52M<`t*qb`0$7Qydr2wUy^9xPEK#z$}~I2?u=R
zJlx^!(gVHg?~t)oXX)Tn8Hz9Hr3~?{vK&k(^fCN7oV82HX2v=#p)&vQ!Ykx*u;%zB
z*FehUXCr)*TPuUaJOjX8y!ptMq-6so9BuC5i|9z+(x>egEsWq<jFS7QYjDcYJqz9N
zjKc^`PYD#@Jgg6uOrEgtTUrQ~X$7w%G(K*)&;<p!^#_|Q7w`>a-w_sas;_k2Pu+n)
z{$<bb5e{+~Y4iwEB3?p-1hoViDw_FAQ?0{`g$MK0eXVaB%qbY3B5VrbvRBod%p$I<
zkN5l5bfS!&EqLhiOH5@EKF{<(j$urrq%F{^zUTAd-S7&i%`1F}gY3_{baFBz6iP|a
zwRfK2+NU1TAz9|cEhuKm-4+AE_{-kmLxSY>rgmKmqdU&F&$sd)rl<rs_m)mn41SF}
zX!3Lnfqh2h%T%glFh-|~c;l^}9(^kEB#FZ*{mrcD)0gLx59*K@jIERqDsxo;$nXTr
z`CWGvZhK`Aot{YaZFlgmV}3LQqVs1FG&(rAz!^&u4l;dhRJ0G`pt$6`fC>nrNL&H3
z9W{!+wmwXnL3%}P|K`DBMBElU4=sc$PFWR$1u}h?FY!reV}e$wi&%s5&5kNiuiJ(T
z|M-f?tQGL-<J9da%a=1vZ2pw9M{u*_1zt-;b_V<1=_2gt_X%^PueI?q0?SeRVE|2t
zv$rqW_x2Y&D{v>C{Yap#u_Oi;+P>tNgn<2%_*Y6q@20c!PoY$g(3>Q=4av{k#cP&;
zuKMQDeKrw6SAUAf!1z-A3EkVD0?9b~Pm<*ewUV2jHw><E@T(;q5@(8>?5udc+h}pu
z8;|Dfr{P=ZZ7B<U26T*Tf~7b8K8qd=FWsAa`Ke`H%<LD1@~yFXZGKy1AbeJxoq^By
z`ZXwbJpU$yg!I<8fv0!g;X<M6QKf2{Y8!sb1UIc(mPCqGVG-_@^5c!V`Nm_Y8Sxts
zqAija#1yJpk!06V<IOAm0ZGgW#b%UIC0OCY`49D)HXmv?YaI`Us_cgu_;qnmJRwIM
zz<Aie%IIm#xPBFgZ@!_J#r`3=#hsQ!$%zmKQ1jGe!{k?PC41()m?<#iJiJy16lYKb
z0vU}cqb)o5Lc=ch8|ax$#TtsCB(AzK>xf|hTB8o}#Kw5#G{&f{#z(s^GN|Sv183z`
zR-78lT4NID0|*eD2*$t*0sD2nPxoq#-=r+3b|OS$@au7u97Z*PcLZDb<KXqfBhh};
za_Xa)G}BXpMjrzr`>mC1Wdz^^ip~4=*_v;Vf}Hmy)C@^n2QKPFK>m(WHPn1Ev5Sez
zE9o~aZA2wjn>F97yt-7Gr&Okh((Qywnfb7E_3;WNe}?t?ph*$w36Ig<=1-y1zLrGA
zxzgWeMi=Ze4QBNX*^Ju4@CduWcE+N-1?+frJgs~ciI=UNYN5Pz8Kh#6uX=B73ceEW
zx-|XmC4QaR-UPc@NqaCY>F7Iyok`W_=H@E^HK^d*!xpa+h8qcp<Sj%j0_B3CAgOfy
zNEV`%Ec()SwslAXmoUr)TL#hxDY3ZEohV>h8AuKftQ{hpyG!}N?-D)4%LL14i1D3#
zA2zFBuM&>OO9xp<+$%h%nYlDw3c(^p+2%=_I4m<SPp;<&1LvC{#O1AJAbmTyb~dr=
z>)w+qlJDvw9!E61IbH*SczohQG!64d4xfT@9WvrG|Bj5pH$7&1lQ4QCISb|-R$s9`
zh|d(yITp*Y%E!ov$C9EFZ+3k^liOZAV3QDI9+>Jn$h0Djz7`DfDhWU4C6OYWQZ*aA
zgrT$@^7O$VBsxL4e@682?<ixMYW5z(E<F{am~mRU$EqA~sR*m^Lc^F|lY;M`5%H}}
ztCFJL;}!Rgh&~u&^Gs@g>`Pd&yF9e23!+>%(#*++Hkx?vxphPve`C#x2DRV!=)&3#
zkUrs1s%@?z0U1Jnjr#JmL;Iu5Z{z&Y%t5Lyp&dl#75XL@-0JU(Bj%FdxOI0QsMzS~
z`;E~y8;h5=H`T}PISZAaOG9UjWhAcpP`9-xG3~l6mgw{fuu)?0#l(uha9I*lK&|=M
zy_w#HSGpS{Rvaj=EEnJ`<6W+6oh`O-9b}#ZyM22z0a1~<>UKQ%6NXYa0VNsH_)KZx
zb^mJZ32KG4aY<uqU43p%|KK(vv-$nWa<2zec2WW{r4|l*d-E*Rr{!+W4^KCh#g*DL
z1IY&y@I{c$Xdt359qm=CW;}qJkNxq-PI_-5&lS<W(<_n;^T?oA$e_eaSG04!@7#X=
z-jQv9J>%qLa>2}0T~{)#dO8lDZ$)}@$*S&~pLEjmB7Zxhm(#s_d`3HopeUyB!;FS`
z;Bf-7%r7<>Kz-rwY?S?dqdWcP9R58sg%U=30PYE3LgG{G*}p$l`ane>P9b<Hus5NM
z*@B$2@}p$~DMgq&T@Kx(toC`dC*Gazy%jL&$To+sQ=21MjMP>q`L5iC_=cQstlj98
zPzMC~67SmlnzA(<Y9%H3dhDmA%+9$0rt<9v&5@-KFK9=Zt4VE<PH?D93d?gxWL2#j
z=rD?S(U#kuc(=Q*i)MvBmDxI4;AGprX~Re&UaorF-{VyzGinv;+0@|0782d{eVDwb
zGx6?As4hMo%+ULZKe2eAWp2@O1!EufoEoCi|IT}mRtK3$KbjU;!`#iYplk&=j5Hzl
zxw1s*{3XVO$0e7Twf9?DnO@8i<b2HehE_>R{>);ncrV}O&^*>MTU4hQ)_J`FL1WQS
zGh4SaRQP&uX%2aISj)e5a^V?m{S)r&6?*NnB&GeElFWY5qpqo~pfASfsg(m<DridE
zGq?jS{cr~Y5#`0#=3oE`AsFkntY+$dDVRYV#uv}FaNgcW;`A(yDK*nxgqOGd8afV)
zmc+ZAlu!4ZHr{=VUti_KR)Z%Z4G$_lwW1uwKkq5m`h0lXDmMgF2vO^?T5C2W&bd)L
zM7bGrh>iq>{OE%As=C|h;7x)3IP64ZN_~dc%G_>%bmdmP;S}Th3GXQEx~N*o<%rMc
zeQN~Y%%BFMaU&y@Nf{$6YqVPMKbI!V%*rWYS(UgzrT{71=%UO{!CxElRveEdmK~(E
zNcyD(NEwy5A|!Ocmtx}IpQxKj(Z8j0$#!SQd0$%r4xb?Upg&bfj>D4h4az2$oIo*G
z^ZEvb*Xfl8J=X8cI@^DY_JC_+%c=t<%(#^?pbLEZ;HvuK??6N@SYva}FUzhTm@c6<
zgUe0(UL9Z~3#EDIwr&=fVjS%GywuJ_m_-J-?Q1$OoFKJjI`z14k}>Kee~`uOhgo>J
zF~zvr&z}voK>2q+Y}!CpiDj%Y0!rgu8&A&pQdX;32#R}2@CcPB`)lZ|{w}oM`U!;D
zQ#P7!pVFZ<JE_6axr=bejl#{GD6OcKK`T$3cSsJ8OS53a>f_rzsLAFQNceme_E~2j
zn?aVKp&+@CchK=gAXDpjf4oxmD(Oz7)5c0)o%&aEiUi(6NFO@(7}IJE3UHJ0zq@HD
zG(i$;^d@MV$E9GE%Hcs@KZTLmT{LeHnO_`hPq=^Yf6t6Q-akL0E<_rsQP@BpE<2Z4
z$V-{?>*KWkt>-#Gt1H%@^qq4xwFviLs*+%)u0sO6b|aKKl~KZ0TnmU3t^S8geodym
z7pXZzz>c0P#KGETU?npldn1|4KMrOk#4mt4srbC3Osg?aAaIZ#IjjD=emuNz3}UTt
zV^##o0&!r4haRJ)R8X`gV+oKQ&zG>A9D2pIu~G$;M58x$Uv-OZvoaVZ`<p}Wx-Rb;
zU|t0?8N^-}uSS_jO@-YoiX6aT(#rN70NcYRqhJ&c*@m`u@eUX<b%cOUYuxGJ()Y}h
zG>b`m;u03cXajHdjPsLLL2hGT2DO$mfo{)r8q_ZA35tnMsj3f5(n2f@T6O`_XR?Ri
z0aw^Vg0%{fjt(l3W|ioQ)Fc;TM@sQY#uR#$6?+t`(AG;U!FB2J(^DqDh4#n)a)K&p
zh2SzYr7l7kXE8f<a-e{*)?x{K*iqzV`H_Ilkdc;X?h&>u+g~G8Nc%o9*fKfN+;;zu
zJ!ch%w~RR_&V+Z;fB^(&vo^GdGf^#$#FoiQ|Jf9fALouk_4e%98~A*)0h3Gzqch*3
zPN{_`MqWWxBqhW5M#ZXY54%s)!oAMFYjecV{d928a>nS1q<YJRw!p@ULrjtF5Tj+{
zzbS_0U)9nk8QwY_43ElVGZ}7U@%vVBqqO79n*CD8`-DE62eWRcbo$S=CuGt@324q-
zc=iaI!-WT4pF2ZA@yCzZoc@JJy-zMd>bsWk4UXoQ)(PgtJf2UGHF9Lb2DUTZf+Cp}
zMS~|kWw0K#Y$WlEI+DQM+n@9c-qx6L52@39HCp=aGa|5yQ^a9VKCc@qnLyDdqM6f8
z)*h|~^<iN%j5~(qrBGc``@`i)|DVs`DL34mcCjSuTKM$nl6l*eESJilUMqiEuKSGp
z*CrwqIyNMBY>;Upa(dosZkK9f^!~BVdQj_Qxrh|1Y2#LR5~oZHaec()WJ^U-+B`hx
zvu0KO_e5Q$<MV9_sUhz%l<bH8qRb|X*)uocjWuo+%9r5TC*;@pcIj1rj>GfGn2zw>
zEmrBzHdhVQ2r5qe(NV@zv#|;O2nXx7zmE%OHP=w}pS=vhdx%Dy7A53KFl(}TQk#fp
z7!6>Kf}teJHrGZ}S{no<ZgxxAon}ddy!1$WL1(X=a`QJ}mMt|Eg)mLzz&7Ei1kopW
z!P^Q&39Rbhb8I7w8k%{KILp(3GIR#gQhKlYY%!(_Rt7QpfURZhwxu!s^sxOcBT?n;
zVD!`nKAvjmz&Ce7&8{fh4zS1e!Oa?2dlifC<dZ?YKtA6B8J9N@0+<YHgx8$0&M%)Y
zH#~8K+>|W5HwIf2UJx8$sz8R~=dNX~c*rTBO(czqd`a+9sy+}5FUq0>tzcp*QyiXm
zPWvLbo;Y#0=0x5BbjNrJydCMzdilSa6gi_%0mZf!^2?ARjlS5wV7@8;V&{gSAEUn`
z!8D0Lz{A?;Q{pOF9LO$%V#ddI_{#>4;qmZ7MtK!doa6H8pLe<#q`u?U9hYc@oY4R$
zq!w%kqtj976Q!w(lJLy-Y>^PW7yR>~(0D97I2~$GQkTCGMy@wwem|5-S%g$*IuzR<
z=L^L>=sYH`sW=?E$hCHaDdHD!twdhDY`nAj9Q=u<C;UXYezzaloO&=G+{tSqqG?Z(
ztZg6gKn!FfILL5S_Z!`@4|-rV)Hv~@$I%s`JOMEJbw#1FZnIL6X{!ezBF0`k-L=aJ
zpK%iCn^&2BHa;5vDofyEc8MIeVJ;IMYHYRV8QWRZ9#l0HT7kdLpQTjhP7I-j6v0E$
z9*zgC#6kpe>0qBg^~0`>hFF!=DRkJTEpS6F6xdfpYIA5o$f$te2l+Cq+mLU+lz-(>
zY#vP5Hh9RkSQ-9qL#%M+@TMjx@FQ5=CgE0o9jX3cP;8&gZ{IHuuVHFvj7mJsSKzJp
z^bCB_A!kQ^q1VHso7W@i*v#Wx{EPaeW&(|o9SP=*lZ?}EGu2keGp%>Zr{S#O4X?o3
zHmJgPlRN_nC{HNoou&nBoKQqwl-|3v=S*t*SGhD;YdWv%jJc46Hb~&m>N{1c{Kb-{
z#iK%Sb}RL3l`rfqkD87JRm#|a?UJQj%UZrsk#pH<ht6tjPXKzUHN4fZc})l+QJhgv
z??9URh{RAG!4Pc;byGH;fqmt;DJm=Ibu+TcGmdX6;0}~2gtz*?7%|UKgeR87N6&M1
zjz~f9VoA@6`+wE;)eli^-`je<SFeg9dQDOk5v4mtkw!s4x|Ecb9BRNMqyz+!R63+%
zXi!SJg&}4Tqz6VoW`F_ayAFPSdH;a-N6sAf*}d0#*0Y}7>{-3~7|@{xjD>n<UG~c6
z=*KQctC|8;8|VzX%9!^dE-|(z?q{D|KH)w51}xTR3heF=tFD}pn1!5izag~;#d2#q
zpWhqo|HCx4$otxPna(=cmp*pM0p2!n5!(9>@HW0qmuuF$ZURa=>q0Nff4(k;p<d9E
z+Pr@0YkOTbX-jRI<QpHI?}EG^(xt2*_^RTvotr411JSpU(h-Efff0Z~F7Rd&yf*|g
zedc;AYQ5EJG_ClcO>*D@^<Vx>7^9K2N0S+F8UuR!pe5uZZJbhu%;`Hoshh`r2G?=x
zIF!_NsJ`X)?M^e(J98&q;w5(-=5a-`q`GyW@lQU-7u(lZH&4Ra@2$O$@`-L64cLEf
za<7;Ne~Z^OW(gv*oaE=pn9#@O$$E^A<>0K_!!S8ME+~9Z%oCOOTRLuN)dnVl81k`d
zkd%-r+6hogDyicr9#hqYo*lD)XW(VJg|*UdwS~i6%mDtK$aW_t8U2s9TMbFwq}M42
zhyXZSArsJAc-72b;+Q)s;8n1hLu}ANMnMc%ouj57up;;EQ^}?x?q*P@PED{vzUt0;
zu|mlCpidB>pTGZx#{*uKLnS(do4{$AeZb>x5Y{&XM%n&PdY`=01dJ`%$Rt+ChrZZg
zWfAW_`42QtwpWytgHpnZoVavovlPq;D>hhC>X4F$+th!`d6^>IZhvU=)q>NLn~((B
zU<#XJSJ5j1#VT0XY%|NSW621fPJwrTEt)69+ay!@{RM_jN{gR>hIYJdI}E`A84^6W
z*cgx@WJiJ!{v%KA^|J2QR_eiBx1v0)eELNyvDYyP`#c9=8&sRcmviw_oVlVrne#{Z
zpDscST&D1%tJj$`-shvyaGdkifDDaOKk~dpYnh||9}E0%X$Kld`>(>zRY=4ff*A|$
zT(gjjOnGF5tJg%)-trwenqUjv`3nxz#N*HTsRW>S@`Y#uXjei5;rS1hwXdu4#%7by
zF^UN`Nj@&VP*BP>NR&2jXDBJ?6%z~@c-g+s6-Zg$&e!;$L%P_>aeM=Lt3#k(8k&R(
z`{|V(y~alf%TIU!pHj3PtzDj`0`f*=Xt^g`xSL;c6ux8)lb_)2N4j4&P<zz4$eUn?
z5DttWc1rN3@_rA$mFY<XSfeT%umlEyR%4E*1n`YWi1<UEGb>lriK+#hxhZ#Bq}uu=
z?x=WLy?7V+VTxrY_e2jHrQCMGs4*P?ekBNJ1qS5VsF7+1AdO-4pdI)Rr=hk}>q#gd
zE(%V_zf#%eNTGOwXb{Aaiqs`GuTyZ@5>?7`2V#JAat9hP@(n|4j+X#(Wv0skmEAK|
zr+`i&4D$gy7ql=2sqNh?P{)wJYfF7`A_at-nQjYpfazRBJ{>i<BESdFT*Laso&j(^
z0J*QH*wZHjuw*8Q(C3L*h%YqV7S0>uFCaj2k_Dmyb3t+WMI-&pcf-R^<H9+*>h$po
zknSBAZ3l84-|9p<%wM`%;<d|`e#4H^bPrGif_M1Jyap2e4}5NOLnkTTj8vvk36>13
zktVew6e|Un3Tf>7FEpCtX6xV|9zDH`fbdPX#ox1hFe3qCjj#i5(?FtTF%ccEGEhPK
z^p7FZCGWlp8G`$~;A3c0X$h}zmi72THB{!_bRmHGDHV={VDVN0<!$@fcm#K6i2=Qm
z?6D}!V8ZkPcW&Qw`va&;hu9$(n8g>2g+U9GBED8+9PW=Du#BguGC-L-5UsJmdp`^?
z+ZVby{9T0$Iw;+D(On!e9TG*MSCG_3>)e=VAGfeWv0oEa0rR-UlHV`P@t94dhoJJK
zAN_izs07rCPN@LVCOao)D-37zDW;qNhD(AF6rh_!2=9;LtZmyEKT;@Cr>aBR*spF9
zWPSX;s)BMAA|JF%@=?(uA-s_N{}{EVf&T!gmFayus7TyVw*Pw>UR@$kpom^6We8Qh
zjQI1-n_D(sk?Fw8UO5z7&Q@@fvfnob6RTRvk?G<LJ?P)CmAG2q|7tk}8%3m`+5kVt
zCtxzhI;i%U;~=n|2^rKZ`QSUH`{S=@*)q2SoN_w^Tu=_B7&{j~x<k4+2{QUBGC#hR
z^%oZrEYqt458fN<u7T#NBAPOWKpcUWhh)%nhboM1kQyK4dmCw^*VJu?v2-)s*P&5=
z-=?Keq`kgCZVr76hc-xOFrPYP?V(%N>*gO^TWV)N4kqHh9E9%DZ|^B@(D>QD<$My0
z`4*4?E9@Ni3F38;_Pl@UuJ>pI7$j(J0;k?OXb7A#`|{}B&K3jqQPG0WZ?O|t2%EVg
zYFVbA0Z)qffx6)uKEQW*yJZXVdjpG_*j4IWD(3md{~hJns)0j9)B@`36m5GV%IF3J
zM^F0~2~?FXBIBS4T2X9XYYUOz8NhG1{#F<2JjQ`6iCpsnX${1+q@FO#OZF#><!>bN
zBXh;lM5O2gWE*x3#|VUcumb?w;2<4zk*mG->3H<e5AzRK^svlqw<r*f`qS~k?Rja!
z?Uw0RKF-y4O^hJLzeV@;i|$qJe6fR+G<VW#{v2qGIbO5;Ypl<Md)usmpy`El{4+xE
z;N5JVPc*YYrQ6)~)N$6f1AF9K-Mr*tF6rx~o+dQ{P|vzAK?OM3oLOZ8mqI?jk8A5j
z_>_7`JJMzI$1tT`VwO3KzRFKY2;J?^{L5dy=0ab@Qfl9nK`ppHi}Z3WA(veMQo-Z`
zQ}r2DBjeC8p#$tDn~=>wtz1meGBKp!Zh}jd_Gh*A>)A61<H!j*b`^xRqN<<U#YWMB
zX?O_iMHZQ3iA~>?)~|L3F)~9Eef@2IlaKL3$S#s<O1=7JomN-|%~)w{LuwgTO1Qo|
z5rkAV8N}vZl<@qX(|`m5e)8fsokR)f@mM8N{%M%(*9NUKl@j?%jPPzN$k1oF|Kj^m
ztt@!>@<~VD3dPx!E{JV1LPvBChTmeBpkz=F-DSXm*)m`OyOFGnhE+Tc%!^n2<-neN
zq2R_gw~nlX&tM;4Lq;p=L5q7PpW?5q?HXk75t!)Hnkp$kuXY5W*Qqr<i-@V<q2#l^
z3l!?DLdUuc>Qcfjcs2rhQXr}|^kXCd?Sj$Il0bI*)k5v8%&QbgUa_9uE_Cb;o))z4
z1`8%IDAf5T8y2%8uS5z!`$59KDl1e%61bELZFOK9Fq67;=BE1p94?954qnBMAC7N=
zxxsO<e?w!y6WRHn8`?^1VRh!2mKL_!F|-K^P>TzoE1(&TUbe^+(-@UfX?y$q<SlUk
z6b|w|SWHg4LCFw)(S7=Gxzm~u+ccKZ1PzBZNE|%NI!@{yh(UuJCl_vWjULqHtZyuo
zYa*wp8{~f3V==GVGUKBia{LAHVy-ukvpC;(lLL7kItn6x4@0fM!Tj_5L!4T#!|}uC
zk24PGx0_Z86ni22=-McUu7*bo=c_)gYt;>U{|?mqjrzM<A7_Q7dg^*XiP4x*?_0>8
z<6uyWhm?8{fJyAa^mds;*oQm|<D6o_rlVv}a%&Ct>XA6{@xL&u^`G%)jzI;DY@6k6
zN{D11oW9@X5_8r1%%{BG$ax(s3^D8!o78bt7uZGn#sdTqI}(@XB01c_HTNG>Dg{Y_
zvob*mQjMA+fo?D?Q;!jPV;*!AKvw8nk%LQ}OYG<u!>{=$s6wY0+BTbz*n?8MxiCgp
zDS%=6Q%Zk%z{p)dXV)3~7x26jJY9(prGBP(V?#|d30=?5`fgU3?lGIr{jEp&KXX-Y
z!a)C*?((|Q8<vTt`K(1rznebNqgioNw0(ON*5#kM?`PK|Z9jA(GbIgJu2_*)ov7&D
zQY+VNzo}Bhicw$xnL8T~_3W~cG{_!LHWQOzgvH}wl9906>qE60c3R#0(rNy3?`I3W
z%RW2v4TOEW$le#<2b&O?J0Vt~=+4c(U(xG}>3a)<CbsFb5=R8a7%sGAR}xX6Z1jkU
zhs~nhPxC<lk)fwQU+$Ej0oP!HAvEntQTeaL%6}Wl-EzEK+u@-fmwzIa>ah8gukL_;
zN5b_`z@4O-2ALV+pI<=CO??F<!9IJN?fGIe&VnStK{~V9g_p(`Ydm>}RSvJ?yH>;l
zRJoyZnu>YmpS&A`Gv1M@6HLH^JE+t!O?HUzvgiZ(I@H-J`^Pj7{3bK^?LfEFvMo&S
zbx`fFeK+Pcy(B_ATk1wL$qc^2z7eTQ^5ofS*fuzCpAUAZmmf$*iB-aX6!R>)FM2!D
zcY>poO5Q`wzzEm;G>SAOZ`!}Kj<2o<MLwjl2Q<Z5>vdZ93`mQG_%?fRbN4G*3LLRe
zXR6Xr+ptIon4{M7dtj0~J0k-r_qlU4WqIv>&wX!yRfrlLN&%;1;5sd=He-oM07)x$
zhZs%vYY{O(eZu+`o%>pc*cne`xFiB05Zb`f?&kD+l~$?aUdz1ayjxrDBZaU+N`qF$
zI6w|{?iW;cHK(sZWZ+-~NZfS1^Dej99X@FWsnZomkmPonr^HsTJDR+)A;}NaCs-xc
z5}{Hb*7gXwC#3|Vkv;55i7P(jea%o(CIo~*AWQO&qjTQF6;MckG$yEo;>X#bwi*;1
zBL$3&kBH-c3LcDR>o5YDq7OC1(S+r%vv$Zt2j*#Xdmg*iu;YchOC)R*_;!!96*_@z
zQ~Q|4W%<xukTfF%3?PeDePT6QcPq76+N<%v${^~*gx`YC_Jr6!!AYS&PZfdF>GVy%
zpZbj=G?VhZe6E<JSYJ2QJDgx$-??<QinO?iy5v~7;eXJuZJ1`l1h^C39KZ|+%mVxS
z^F23iZoH)b0QK|1omBT<eNd`W?IeEkxMd}I7^ZW~z5ITvN2(5v^f>wa46VNtA>oDG
ztslohwB}&AZIbW6&9Sn*_#=fQ5`546fJ(*wALr5sldZ%r?4V}EIXcd0WKrx$HEao9
zt49c3*LAgbfYIzxme|6wTvUwO%RfJZB=1+RIyU2q&K&z142)Jut2|wi0CJ+4uGD7M
zRtBIo?Ef{{ngZlHxL~-WY@aO{Hdi>SST5G<qdDO8RQOH}fH;YZPg5S^#4cAYNf9ZQ
zEeC?V)1Y&xKL@Ic>`<;-No@=m#0>;sPBi|}V-rXcdBh~#zWh%0&V2HPMo(WhJsa`(
z1{GtLMZb6Vei#mdjs+y(Oz*oqk`$nHSe=2jw5Sow8T}&x^RDn2z6KWyyNB*aQ=+JS
zXfa(U^=|2G+pu7P*Rmum?55kJNe{s}x!AI0leqho2_~Z{OBB$eacP<Az|t9>p)*8`
zp9X%Al1ZO&`?={AS9$zWODIdardMubP!ym^r)WVF=-uDSzv}LLBx_-rGkGcJq!4pw
z)-to`eM}nz5%-F0ZQJbS=p2Pu)M1ITFtt2%xd!|B)+Z^a50?x|-!~v}t+*&5%N@Yh
z51ZnU?hwNpd9%_6<!ZgJ>qZA9v(>4BAv{B4$!#IQ==g4I-*>VDLV3(me7s$+IOVaG
zFchH<gn(FgUWKtTUoT-%_id<(DcKXx!^1k41xFiVTyD;cgUz#9!y_KwV$AI)Ijqtp
zXy?~2y0!Sf=Qlta_kq9QiKRz6w03=nT@ybfBb9B<&o%nM-<8c|IV?Xi5l&TsIm9;!
zOD40qY}A!$2z<VLf5(&?$d6|bXHELcB<pjRlV3Lri7_8Nx23*dF`9U{DX7pCdqn&?
zoZ$WvIpE83^f!#{jbEogtSs2FxlRtKZc%aQ0kf8%Lr$DB*dy=aGx3BA)qxBAwQX*H
z4cjo8NLa9BaKS$~XZyvK<~1JMxK3kNgo>;o0A=%O`!h$%vx?CiQe@eKbuHP$!cmBj
zrxL|s?N^lM;gr?4JTRh5OIPWyF1VSek=}x3aV7@+1y`wgSaKOmZjh6^LvaaV6*Rl1
zvk-b_<8`tevLUU;qy=caUU5om5x#KMW_sE_7}>l`?Ni5<yG_4_N+qjucZ2T4zWr}t
zdX3rcaAFo(9DBdl8wYw5=7^DLU?E!W)$syEh+h%BP)-Z?o;QO)QlTzl5B8gXGN4cQ
zv7>J_N#vNcW<KQ&8T+hE3cGJ6NAlTB?WiBvq}&lVBJ!gf>B@>xzvR}rt|CzGQf{(r
zWmi1|o8xI9BTeDhHnLVOt7Fx^@^izEYz=0J;)`W{=@lalM)}`d=Ac&im2*M4_0JC=
z<`F;MRHf3cJ|S+GH=@|Yxezx1+P-g3IpNc}KtG@vZPA4LIeHW+Cai+ke{P1+%=QSg
znN&IOp;W;kyY2kB)#rUVm~2%_6H;$BMpR3N_TPTjEf@0sQqZV>4F<Sgt9uU4<W4M1
zCB=8TJVM1rOA4MX_o!weR-K@q(GAG(?G%FGVJG9qY4kHi_DMcbgV5F#Q#O-O$2i!l
z)tSb?eD-N|=NdIbEN~;*bnW#BV_oj=Y8nFAhHRwZI8&l*9H)%Wd3y(w9cN?s|I^nq
zTvV&4FMMVnuMC_?=|c8ZL=pA0#mkk=8@_63-G1_ZcDbvDrD7LC63)ZIG=F232vR-r
zevizmp16GSCZvIJeN{7GD8wiZ1Os_`H7iaE!+R*zTUo7+^g*@j^Rxt_Ts-@#L8<4J
zClZj~0>YEGD0G<f5eh{YMnv<&5tZI6$m6rsWv@Yq+JlC$qBowQXd=c4PnF7zmRfUF
z%T0^DM^w#tj1P@LW|J%OQ9ZzRn-_1EZaCj$!rwn<N}4d=cr>;DlOe=Q6S3zm8wU%&
zckf9+1Rh`AbTuvcX6WdACiQvVNp^_h0FY9N=o(f)0o>O8K|>iu18?7`lk8i6rXqVy
zwg)3Nr12c16Jg;3S`g&sCXFEAXyD2zgZeMtC|t++EIT4byaicWlI8P(W2G<k@3~7Q
z&1RSE>rUR>(uc?M3@x^g))Vgr??WUpx^~yf2QD<(J``zRj^!LB_i^m2J8Dp`Zo3uh
zEi~Cbf{q^@bAiv(!Qb-ru%&H`oUj9qksJc5$SMgR?n&pzvbY~I2yC1~Lzp8I5xtaS
zy|rBG;&ic9ed1s7bIXY5%|(aTO7T41gU!HxJipbN1y8X@(mM3BFU|;NH@lZxON}Oz
z^?=mC{8oNB*rYGfz6!-Opw8tQo>Kb+k5ae=#k#$?<BGD5Z_&J`AT(8yX8Wg%Ue#A9
zYY@0J6VCw$INs2p6v201$$Gvo&$HpFJ7fUSybcLyLSMgR=sdUmQo5y&LfME!*smCr
z_epPf_Y%lW!rd4sgQ0m}9LP5@kYI!aVM}6-y;i&G_E}*gxrgGA@&W9lszxTHhJ7^e
zzGK5HXzivqRRl|jcWE#+(8#wVTSo?{%0+(OIO(9DF{pZmUr^BR8?LOFnx__igyk*M
z@*2wGGl&PI4a-+DmWgw0s7+HzHK)H|=D<)q2=ODuvXyy$4Yx=~=Btk$!tRncguo^G
zIgL(D-(%?E8JJwQLWqMJ1EHvMj4l`>e3>>PtNjGxKPhE$3YF2%)I%q6sP8u5n?G<!
zriS!Kel0T(u>s?!EDkm{Sry(3dKw-FQ@tMNSt9*XJa9qw>iw$J+@=tl@=C}5J=70u
z4|sBP<im1(_%)TT>v=;vT}~&9X<1~LQ-s3Kltsz9ewY0WB0F!vz1hsGK`{j-UOjml
zo-a?D$rkfmFckd;*7eT1r-|VA4=TEevQ{0_rqrf8P{t%C+DGUT{o1u0Rp4&~nwxOb
z8Q@?~h#j6o<Lz05O+b#4x_a%jf$N|>a-Oj$CzEIN8()RmfVagZj?6s5dR>e0-=t8+
zt9B1xKIx2x#xwi?GkMQS=&!MF4#V3=>4)qDPOCh&Dn6?q3WDfk$>i5HUU<v&_`=Jf
zUsJk3=*Ns6WYH%?A|E?msaAJjb9`8xn)_6tEb(Kl8hoO2X}#__A-)=vatq0~wx&j)
zJD-w6%|AKJei@J6X1`2C^CyUwLmS88jAo<E?$8Jk7#|=S#&#g5PKGSmQ-?r}d!5E@
zPoiW41i+x-&wVH?orI3z(_%RjeHMYKaTo#6r+XFvAS;jO8R1-zx)d#hA|?O(-7;Lv
z1B}N=%)iJECMFdpzRgLQmCU^|7)lhj`vy)Ki%ob2;37-uF*<XweX?3rm($~1vfcR=
zgb?5Pap)pM1G1pnyp1-W&S`%Hbt)ysq3;XiLiwS~K!Bc9f6O&nGccmE_*UB=EQnHx
zDpyGuO^=7V!NPO;jcF&Xi%<;hZ-G=RnuJs;r&sKlm2{A=DLLw!@R3h6*5Lk4LtLjJ
z6|_JeTmtxy-Az&Ch3fUY`qJA|9`I#E|4ArKK@)#kB5mube<|3*s}R7M<XGmlbc3|B
zqfGs{tFM;TK#lx}0CYs=pv<Ve@E6<Tm>xecbzXjX{Sql(^UdYup$Pkvk>Y6(_3L2n
zf%K3+KYT@A=V7xAV7?p6Fd^Z@i`2gzww3<1uR6@dcUS{l^-JL&z)Aapd>DkSnEQo`
zl_pa1ilz1U9?gy&ISF9z0ri9zzbG!HwJunZdPg=gV;jt+q}_8|32ilieg!e~JSeY0
zcwGmQfWdv74G@f%s%tGJO!D$X!NXxdh(FK+=s85ZWVt0kdAx2XVmzNH9*OjtS@n0?
zo0L%{pC0;lZXg{%d)5JkD=c=jx$=bFns@k3=mURs#60o9+0?<w0a&QgrOv{b`WWPc
z#w_%&V$pDZ!!r%V_zA?bI>19=u=im!-2x%Bpo?u@in%|&?LY3X+&pVaVzch5?EW86
zo?j@uxCx$)@;9Bx*IphAl20!nU1Yre+dDRyoVcsl!V9XfNwHuu1iF(FeU9@{fFsP0
zRsPE#R7CxS{J}nKglvF@bs*-+bk$J}crd4VL(=!Gbq_(n3#lOM=dDa?mtxk&8Qu`c
z^oHkzM9~nW=>>p_jT1UBw1ex_?jkq|)c&{I%yQH#usV#YKCIRUU_;_G^dw4-6PEmH
zlp5yHm%06roM2v<J*O5b|HZs_0xh*^34dgBAJ_dGk-ts@sjp8~_=mgm9fC=w;{KPp
zM@0}<cK@3Y$_tbs?e57hPfiCU>c*JN;}tBO&noaEw<3ViLf2M@kJ3Q(n2J1uLov|N
z1Ed2+|BPVWM}j;%B?DrPd=yb<GUx9*CDO?9oP(GSP&QWPZG=pM`{rNoWjW^j*O-|G
zi!O$HP%leB%YV8e#Mn(V>}w!|zQp#2y#Ne94Xj9+-h!;(IHV-IGDV30so-yWPb<zl
zK5IhT)55zv7Zd5m0;!S1P}n){3x={>lnijAuhZ(MS>C4NMk`$A6_JG$;{5k)O1EKy
zSn-vZw!;9`M_l4gCc~r&v?bk_b1%U8%<<Zo4S{{=^%6PlIy~DX-dK|4TsCI!3C|lE
z%0I0Df$Bet#-=a6f3>wVpH<Yb@;h%_<BSw&L_*p{D(0EWJN&w^TD_cm#rI=wt;mv8
zFwv72HqCHeeyMl@Ikjef0HVau4+C!rft-|aK9ICd^M^FSptYxN^6v-2P!C~(#eV9Q
zdgI&*Mwp|A3E8Jq$Q5}SIN%dTy{{>{c_ID$RP<hJe4v#H980N?U(rAVJ~_dAApm_x
zVycVW3fT+KVUJ=_J@a2m3|JNuy5=U+o4J4XY+6bRW=!^7{c=Yc$t(h`8Gons2lBEo
zGwHq-NulpzzMX(D_Iz13FZ8NR^a%iD0_Rl3l#f?{+E#_R33a+FCmjKQb|mh6I<xD;
z;U1nUU<$~hPcf1DMoI-lMGpnSEe+}huN}%BgsYR>xH%_~?V~3EeS|p`&kbtEX@?<W
zCrEt@q&*nspf}oKL;u}qkv9@J_z}bbTCP)I!63gpD>dK|N;TmEQ(~|sk7=v2hYVr$
zFn5^9IdH07ko+tjG+x}8K2hRfVR9-xyBDeRDH{1cwHRwNIs0+oWURvE+Z2z=6`h1S
zFARxO=mKgjDC+bWkNdN`DB<6AhY+(w16)uV(3Ajn|JmjpUr<O4^MsEmL(X;id2h-b
zdUs$%>etxkkraSN-YSE%pGb{kxw=C$H^r_G&J)FK$odboQl{)!y*pCqxy@xcBT}hX
zA_tR$#jO~C8GE&IGF*&eN^U@o_f4cO#dNMI)GVIu__h`YQw30{)6WvygC95|i45C0
zj!d*WBzV1mq1NpbveF^R!R*~YTCwz-F7`;Lu`HwuN10lYxz82_!!++Z0?E8gsa$Me
zX<nzDy`t&W+Kq_N-+;p_f-ADSxnM*p_|0@K4pjDn5NoyW8@CW(BKhwP{9Tp8A6}70
zZpLWv1_ew7m&FyY?2CByJet<k8}%SvvTtA)mziF9aTE!7#D!D7vfim_2S$9*LWvf#
zt$H(7(pL^gz*scZJWbeh3>wJAX%=`vgN_Q-wxSet=;9jqszRE#eL(W_1mL?PoYNT8
zN)6%xJSe~TX}1Z|s<qeJ#`)m#mN$KenIH#0^Dy+EHBh}-*R(*X{_W<GT<Sey=ohnk
zFs}dVh6y4I@>5q%UtG`=bf_H%snf7VFK%h=sS;VBbv(0@eSEhZ_tWdje471FjP34x
z{dyu3Q#TUjkztaM`^4p}<cFbT*}ZjScID<yHS|rN(6l-RpCsipDs3L;H`&>KyD}rg
zU#a}bdz{fku6zfuk|-p?GN*t}&nS~gF=I1HJSk^x<$cvr2?<%mF>Ns3V=a21*eG+E
z3ZeSAh;g<85v9Ha`qNzS^Re|5#)u@{`|~%@j(&6Td4u6~vMx&JDdn&kO=UVU1Qk9>
z-u-1DS*o9<Mt}3g41~u@W0{$N?$4qMTPs~#;3M8Om(GXt4D#z&>PgK7*3sL~6=g|)
zVkz!OG<`(x3Gi#ml6P6dYZpTaU%3aSt(tQ^P4&F}CiYM;aVJ|9CsODCZUV8=^Fhr#
zZhnWt2Z%Q-bMS$pZHG}EfEV1JlD?F?!Mfh33owon`3+hPlvur^mcGT9tpBua`EK8o
zwN*?j!4pVq^#kb4_`mN~dj<5W^;>dD=V-W7YMv{APUBN{Zf1<+T4@gkIvRw8BHkQc
z7fU)DF|nRBR;sf__fi4<!B2AQwMl}^1JXgYy~iRt)+Re|9`eEEB);#h;7$SgnjNrf
zq|ZbowXL#mI!OQOxW!o?Sn~tq0eFu99791jtAnfRLAnnozAp#st`^>&%)B{4nOoib
zrUq!>=)dB0cK;lw);%#*;O;*o;gHuX@Y{^83$kpJNft?7lRCb4Ks|=#B%UAB&5G%=
z1-4y$;rSez*1n#)1zPdlf!EBzS<;IX17GZio}KnSTEJ8#A#XisDzd)ZB6!&_p%vpm
zvAAdj&drC`DaW}WE8m$Tv{aZJtHaeZ+J4Sw+RCJFQQVC8YRV<5-pFkYoxHVO8#r$s
z=Dmtp|7A~XyvW33vIv!>t5}34%azc=Ju}SnGpu#b@b=h@6Xd|&)Vh15y*YGv!4Gob
z4paB9*y*VHNhtwEbLOWebuJgMqSxKScW?7xw3eIMC_q@Fl+#5JI?PQ#K`fgPU-{he
zmw9LHr!8ZnDA0m8%X<*seakNCXf5?igJ9;AhA(ua^u@lmI&c0SbG+G%$hryKP&B9T
z>pNuFG;o4?qB{3Wu3%E_wiNL?Hx|jer4IgJzaq}#DG+|2;IZJ1tER@*ZoHpJI-h_R
zKlqYe8uIEJ#_&houNWVupD9mXaI3ezH@m*=9yQ-NS5eC~cC&-Hs({A4f96?nY%-*N
z>x{Jrg=nUH<d-(6J<#>M&{BJ8ya0iqRX3k@qGj#i?_9cV$S=T>pGLNR-l{19Ak<20
z!i>5)_JvHOazxcm@8Pw9WfWz*tRQ`yU(Z&kUSDXGXN7B4MlhL#u8;^owa|no>Zwh-
zGfC!pPYHba&~c~!XMxWEl54s{J~9q6e=uQc)>PPp<{jZw-nEha2{iHQo}CrHEs>I~
zq}YFUo{Gg9l#xeFwtm$sU8A&|eGGgogL1Jz-xH;FeXG|X3|UhQnhHY&^7B}7lQQ=Q
zJx4oYZD^OI$Ne3`Ky~Nm(fC~vpQRhmifK3Ja_h44dwenvht+SU<F<!pF&@$Qa*nZA
zWHEw|)b|KAsu1%zM6+fS0Jku?V_*hIe;<=|37BCAY?d+<=(D9|Jm$yqxsg4dXha<_
zXMVuFp_aE2VF!Bg#$YrJjI1|C#9I0C_*{?GGY6{aB!+|y*LA%O>g26n>pM-L)nSYs
zUTX+1?1@ugB52{LKZ#|u|IBSjE0dlRcbA+No*7aah#Qs=H*}}nDYvcm6_rW;v1&M?
zW&GX8k@!_?uO|XD|A}=NU*9KD9+Pe7>!Q!cyX<t4{eXU7noDS%z1*uk<m^E7_#9sV
zN8}zhtY8LnWoHdh1E4-Ma?oC!NeZoRAIk`;vFgu<%L_nm{Ef=Nk@BTP{Rq5Ik0cYT
z?Tq`@glYp;Y%`;>!H?Qa-AkU`tCu0&sbcrguHw7#Y(Z#Pjl=}U&4`5w%Ev<C7VGbF
zvg3{vDS-!7y~CvXcedmj&r6D5K(pZra253nQB3h;^@&)VeeP)Rw6`(d^>mvjlUm(k
zSM6Sr$w~|%WiJpi?}q%GL;F&gzyk0sCR3*Xh$R#k6ibuF=%l_t{%7S89v>G0W=fY=
zqxa3tbHgxD8juW2pXp8Qt@S$zS}@b(Br^G>G0`(<#TGBov$*GOyfV|X<3Mda@14~F
z1WymHpW5?GTWvU=u#Soyf%sM*W7fTH@?O)}MYV%g`Rgc3^U9R8Sv30Xlt|5Vu5RA=
z7&*7=v9PJ+dndTAY1h4JO>Z*fwUNW_bRMf=w;vn!2*=q1u^Q^V={%TEDNZ|V?g*25
z`$yms`?Hd1BA!h@Mnc^PxG86=TluP%MASOxV&e^MFEkEO<b6e_aDL1V%T@H>=W?Ji
zIe-ewqu>&`CN*IUxu(*FFuM+!hY$gt%o9)TxG=FXOz7d$0mR!Fs{?eCTsXQSsYZT4
zvrD$C`>xUjmKZ2!>i|Yo(=6Xxu5`B@+<9HD$tfo=h9>Wq+oI!L(tx85@(WE<7qS?A
ze|tj_xa;z^B!|O{^}{dTZL{}DAAme4P&1Z32dD85tW{b0>vr>(vkRC&$BuICK_58z
z)2vK@o06z|elG_zGB59;ih|&oBZSozH!)~Ph`d?(#>D0*1ckqGPh0(9LM$6OpKFf0
zzcl67xi&oJT@@n6K30k+Y+8fKPXx^tS&H{9qWfKsu`$V@UX(9fB=x&K5)Y?6?-7U@
z(%Av;d_ME2lfMEO1M~`0uN^5n?@a(g=4GZEPwGg#bxiyC#@dRW2w~F&v7KkPG<a;1
zU4Z?AXS<=c=N$cX*gXP?+j;8qU|2VDM8+64)l;qvA9IOLhAWGt;SQijb;&MTz-SG$
z>o1Ed*pg%2Xy9qmsRhJ78IVX`KXu*ON>5Yb#5VxH8pSU_hT$~eUb=y%JU^H9)|U^}
z%M9Kd%ay3pUt>qtTe(=}O(HR&G^mtEaH&zjPsxd(6dCf9N@mnCaCsXvT)DqulgdiH
zZGNS0Z&-nhR$aoz2LYxv7>}5YV(DWbp1JAOY##P6T#~RIocvo;s_-m0b&rDFFTFff
zx46V`X)CLKahZX8n~Mqo)C92gRCZob$#IN29f>7dLxq_;N>5R)m3j-89>e$gnKy?}
z@3nmgs0yH}z!%=3;9J%h?jn5vf^oV36d*?NkBLc4&V<ZdmUsfEYh){2a#CvM_UIv4
zhPbU%l>B?pAIldS|LofJ13|LBX_sL>&QfY6<LSbFFdqf{h`2R@g3LcUIEB@}JlbP+
zo8jzcu)@xMBxj(<l&h`ekw~h=odvRTx5#>2NhJ{JbDS{RS@k5%`eJ)`sDV>u*ZC?1
zxPApFQ;<6Q1-At%ulQRYL!tF<B(v0U;aH{Z!*IvO%s(z}1(0vuh-e~V5?g|C<c(`0
zpg5+sdB!?*JZ`UIAS3zWHW1Dd$uPl`JWuJ`K|F*#={H;!qI2BsQ1s4G=1RE#442~$
z97ed|B&SOUUJMdEQSC$dSS+2-yz6`1P%0LLD-Fu(*nPla|NnAvB;4Qf|6ES_?CGwb
Y{9gmabjR<G$lcpYa;mcVGLK&TALyYH@c;k-

diff --git a/internal/static/performer_male/Male06.svg b/internal/static/performer_male/Male06.svg
new file mode 100644
index 000000000..14578c380
--- /dev/null
+++ b/internal/static/performer_male/Male06.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 850 1250"><path fill="#fff" d="M388.8 30.68c28.76-14.49 69 9.79 73.27 44.89.77 9.21-.3 18.45-1.27 27.6 1.2-1.63 2.26-3.95 4.64-3.84 3.28.21 5.28 3.61 5.67 6.59 1.74 13.75-6.92 26.68-7.72 28.2-2.5 4.56-4.38 3.27-7.3 2.18-2.76 59.41-11.2 39.1 27.98 70.03 6.6 5.04 12.47 10.93 18.95 16.11 13.38 8.99 44.57-.88 73.84 35.61 7.68 13.02 16.4 31.82 14.72 46.78-.7 10.75-4.12 8.37 6.49 18.12 17.65 15.75 15.28 20.75 16.22 32.9-.1 5.35-1.65 11.01.9 16.06 4.37 9.69 5.77 20.31 6.98 30.76.65 21.33 4.14 13.07 1.19 30.71-6.43 17.19-33.87 21.71-46.36 28.57-19.34 10.45-44.96 16.74-66.06 22.27-3.7 17.74-8 14.83-.57 30.28 4.94 11.33 4.57 24.02 4.09 36.13-.76 10.35 68.86 198.54 11.29 257.93-4.17 10.49-3.18 24.61-2.67 46.5-.42 46.2 21.48 44.05 7.81 139.78-16.16 115.94-7.72 111.94-.52 130.63 3.88 8.78 5.2 16.24 18.89 30.69 4.6 5.05 9.9 9.67 13.1 15.82 1.53 3.69 14.34 22.46 6.14 28.53-.55 1.52-1.18 3.02-2.07 4.39-.13 5.14.74 5.35-4.81 7.64-.08 4.24-4.48 6.13-8.16 6.01-6.92 11.98-24.68 4.31-29.91-11.26-12-4.47-13.13-16.11-16.53-27.29-1.28-5.02-7.01-23.28-10.08-25.24-6.69-4.83-22.88-8.23-24.75-29.13-2.49-12.08 8.29-20.19 8.24-26.81 1.15-20.1 8.33-4.8-10.92-81.15-8.03-35.87-5.08-25.79-14.98-43.54-10.1-18.53-16.56-22.81.5-89.43-12.8-15.68-14.02-49.57-16.11-64.73-8.67-63.28-13.12-40.48-20.6-152.89-.1-6.22-.62-12.42-1.2-18.61-.4-4.07 1.84-13.53-12.57-12.54-1.11 6.13 1.16 12 3.28 17.62 4.49 13.67 10.9 52.94 8.27 100.28-3.5 83.71 3.63 101.04-8.09 121.86 38.17 94.28 8.5 67.05 5.38 123.95-.74 22.27-8.78 64.01-3.73 79.86 1.67 5.72 4.13 11.27 4.65 17.28.03 2.4 2.03 3.97 3.48 5.63 2.14 2.15 6.78 9.68 6.86 15.02.85 29.34-17.08 27.36-19.15 35.8-7.07 26.95-.23 42.13-13.72 51.77-1.14.7-1.15 2.11-1.49 3.27-2.65 12.46-17.46 23.65-26.31 13.89-3.49 1.5-8.36.72-9.75-3.24-5.34-1.13-5.1-.33-6.49-5.79-1.02-1.03-1.98-2.11-2.9-3.21-1.53-.93-3.39-1.84-3.82-3.74-1.58-6.16-.21-12.66 2.07-18.46 1.15-2.71 1.43-5.69 2.53-8.41 3.8-9.84 12.18-17.12 19.18-35.2 2.13-6.73 3.25-13.72 5.01-20.55 1.24-5.2 3.2-10.47 2.27-15.89-1.31-7.26-.65-14.68-1.57-21.98-3.24-27.06-22.98-88.9-29.34-116.92-8.25-35.99-7.7-27.88-4.94-69.66 2.1-31.47 1.98-29.41-2.35-60.62-3.13-26.68-8.39-26.79-10.21-28.33-16.46-13.47-26.65-44.42-31.78-65.3-11.61-51.78-5.11-87.59-3.21-112.84.69-14.44-1.21-40.97 10.26-70.21 6.15-16.7 1.6-28.55 7.75-44.57 2.1-5.52 6.38-10.34 6.46-16.51-5.04-1.88-9.21-5.38-14.1-7.56-10.66-5.55-51.22-12.59-71.3-25.71-3.55-2.24-7.47-3.79-11.47-4.99-4.62-1.34-16.25-7.17-24.09-15.2-2.23-2.13-2.81-5.26-3.83-8.03-1.98-5.88.28-12.16-1.25-18.1-1.03-7.21.65-14.57 3.65-21.13 9.31-20.37 10.68-42.42 14.61-52.93 5.2-9.66 15.04-15.25 22.64-22.76 4.31-4.12.31-12.18 3.05-22.83 9.49-36.1 31.83-57.3 58.93-64 14.2-4.69 24.47-1.55 34.85-12.57 28.43-29.44 32.39-27.7 44.27-38.4 1.26-49.71-2.52-23.8-4.39-50.33-5.98 3.58-5.79-2.26-8.42-7.17-3.93-7.64-8.65-31.58.04-29.72 2.05.48 2.42 2.91 3.48 4.41.3-15.06-3.05-30.68 2.22-45.26 5.14-12.08 14.81-22.26 26.76-27.77M280.75 379.11c-7.59 12.47-16.49 24.12-26.04 35.15 24.54 13.66 29.15 23.73 54.48 37.9 6.72-43.19-8.73-47.59-21.99-78.68-2.11 1.91-4.74 3.29-6.45 5.63m256.85-6.13c-9.34 22.72-26.95 46.62-27.79 48.36-1.43 4.83-1.56 9.93-1.86 14.92 16.28-10.93 31.15-24.4 49.44-32.01-7.56-9.77-13.84-20.46-19.79-31.28Z"/></svg>
\ No newline at end of file
diff --git a/internal/static/performer_male/attribution.md b/internal/static/performer_male/attribution.md
new file mode 100644
index 000000000..119d73757
--- /dev/null
+++ b/internal/static/performer_male/attribution.md
@@ -0,0 +1,8 @@
+Male01.svg - "[Man Silhouette](https://freesvg.org/1528398040)" by "OpenClipart" under CC0 License  
+Male02.svg - "[Male pose silhouette](https://freesvg.org/male-pose-silhouette)" by OpenClipart under CC0 License  
+Male03.svg - "[Bald man walking in a suit silhouette vector image](https://freesvg.org/bald-man-walking-in-a-suit-silhouette-vector-image)" by OpenClipart under CC0 License  
+Male04.svg - "[Man silhouette vector clip art](https://freesvg.org/man-silhouette-vector-clip-art) by OpenClipart under CC0 License  
+Male05.svg - "[Man, Walking, Confident](https://pixabay.com/vectors/man-walking-confident-silhouette-2759950/)" by Mohamed Hassan under Pixabay License  
+
+CC0 Licence: https://creativecommons.org/public-domain/cc0/  
+Pixabay License: https://pixabay.com/service/license-summary/  
\ No newline at end of file

From fc31823fd2a525a68f169a43c22131d6ca1f134e Mon Sep 17 00:00:00 2001
From: DogmaDragon <103123951+DogmaDragon@users.noreply.github.com>
Date: Mon, 16 Feb 2026 06:06:40 +0200
Subject: [PATCH 294/405] docs:update links for custom CSS and themes in
 Interface.md (#6581)

---
 ui/v2.5/src/docs/en/Manual/Interface.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/v2.5/src/docs/en/Manual/Interface.md b/ui/v2.5/src/docs/en/Manual/Interface.md
index 8fd89d57e..951fb3323 100644
--- a/ui/v2.5/src/docs/en/Manual/Interface.md
+++ b/ui/v2.5/src/docs/en/Manual/Interface.md
@@ -39,9 +39,9 @@ By default, when a scene has a resume point, the scene player will automatically
 
 ## Custom CSS
 
-The stash UI can be customised using custom CSS. See [here](https://docs.stashapp.cc/themes/custom-css-snippets/) for a community-curated set of CSS snippets to customise your UI. 
+The stash UI can be customised using custom CSS. See [here](https://discourse.stashapp.cc/t/custom-css-snippets/4043) for a community-curated set of CSS snippets to customise your UI. 
 
-There is also a [collection of community-created themes](https://docs.stashapp.cc/themes/list/#browse-themes) available.
+There is also a [collection of community-created themes](https://discourse.stashapp.cc/tags/c/plugins/18/all/theme) available.
 
 ## Custom JavaScript
 

From bede849fa64d959a5f515ae44c99735a72aa463d Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Mon, 16 Feb 2026 17:28:41 +1100
Subject: [PATCH 295/405] Add sidebar to group list (#6573)

* Add group filter criteria to tag and studio
* Add sidebar to groups list
* Refactor ListOperations to accept buttons
* Move create new button back to navbar

Having the create new button with a plus icon conflicted with the add sub-group button in the sub-groups view.

* Simplify group-sub-groups view
---
 graphql/schema/types/filters.graphql          |   6 +
 pkg/models/studio.go                          |   4 +
 pkg/models/tag.go                             |   2 +
 pkg/sqlite/studio.go                          |   5 +
 pkg/sqlite/studio_filter.go                   |  21 +
 pkg/sqlite/tag.go                             |   9 +
 pkg/sqlite/tag_filter.go                      |   9 +
 .../src/components/Galleries/GalleryList.tsx  |  34 +-
 .../GroupDetails/GroupSubGroupsPanel.tsx      |  51 +-
 ui/v2.5/src/components/Groups/GroupList.tsx   | 600 +++++++++++++-----
 ui/v2.5/src/components/Groups/Groups.tsx      |   4 +-
 .../components/List/FilteredListToolbar.tsx   |  60 +-
 .../List/Filters/LabeledIdFilter.tsx          |  14 +
 .../components/List/ListOperationButtons.tsx  | 180 ++++--
 ui/v2.5/src/components/List/util.ts           |  17 +-
 ui/v2.5/src/components/List/views.ts          |   1 +
 ui/v2.5/src/components/MainNavbar.tsx         |   3 +
 .../PerformerDetails/PerformerGroupsPanel.tsx |   4 +-
 .../components/Performers/PerformerList.tsx   |  28 +-
 ui/v2.5/src/components/Scenes/SceneList.tsx   |   2 -
 .../StudioDetails/StudioGroupsPanel.tsx       |   4 +-
 ui/v2.5/src/components/Studios/StudioList.tsx |  15 +-
 .../Tags/TagDetails/TagGroupsPanel.tsx        |  11 +-
 23 files changed, 708 insertions(+), 376 deletions(-)

diff --git a/graphql/schema/types/filters.graphql b/graphql/schema/types/filters.graphql
index a7fecca20..d1fd77006 100644
--- a/graphql/schema/types/filters.graphql
+++ b/graphql/schema/types/filters.graphql
@@ -483,6 +483,8 @@ input StudioFilterType {
   image_count: IntCriterionInput
   "Filter by gallery count"
   gallery_count: IntCriterionInput
+  "Filter by group count"
+  group_count: IntCriterionInput
   "Filter by tag count"
   tag_count: IntCriterionInput
   "Filter by url"
@@ -499,6 +501,8 @@ input StudioFilterType {
   images_filter: ImageFilterType
   "Filter by related galleries that meet this criteria"
   galleries_filter: GalleryFilterType
+  "Filter by related groups that meet this criteria"
+  groups_filter: GroupFilterType
   "Filter by creation time"
   created_at: TimestampCriterionInput
   "Filter by last update time"
@@ -658,6 +662,8 @@ input TagFilterType {
   images_filter: ImageFilterType
   "Filter by related galleries that meet this criteria"
   galleries_filter: GalleryFilterType
+  "Filter by related groups that meet this criteria"
+  groups_filter: GroupFilterType
   "Filter by related performers that meet this criteria"
   performers_filter: PerformerFilterType
   "Filter by related studios that meet this criteria"
diff --git a/pkg/models/studio.go b/pkg/models/studio.go
index be5d54445..5d1def1bc 100644
--- a/pkg/models/studio.go
+++ b/pkg/models/studio.go
@@ -28,6 +28,8 @@ type StudioFilterType struct {
 	ImageCount *IntCriterionInput `json:"image_count"`
 	// Filter by gallery count
 	GalleryCount *IntCriterionInput `json:"gallery_count"`
+	// Filter by group count
+	GroupCount *IntCriterionInput `json:"group_count"`
 	// Filter by url
 	URL *StringCriterionInput `json:"url"`
 	// Filter by studio aliases
@@ -42,6 +44,8 @@ type StudioFilterType struct {
 	ImagesFilter *ImageFilterType `json:"images_filter"`
 	// Filter by related galleries that meet this criteria
 	GalleriesFilter *GalleryFilterType `json:"galleries_filter"`
+	// Filter by related groups that meet this criteria
+	GroupsFilter *GroupFilterType `json:"groups_filter"`
 	// Filter by created at
 	CreatedAt *TimestampCriterionInput `json:"created_at"`
 	// Filter by updated at
diff --git a/pkg/models/tag.go b/pkg/models/tag.go
index bfb3f1ad3..3a133dcad 100644
--- a/pkg/models/tag.go
+++ b/pkg/models/tag.go
@@ -50,6 +50,8 @@ type TagFilterType struct {
 	ImagesFilter *ImageFilterType `json:"images_filter"`
 	// Filter by related galleries that meet this criteria
 	GalleriesFilter *GalleryFilterType `json:"galleries_filter"`
+	// Filter by related groups	that meet this criteria
+	GroupsFilter *GroupFilterType `json:"groups_filter"`
 	// Filter by related performers that meet this criteria
 	PerformersFilter *PerformerFilterType `json:"performers_filter"`
 	// Filter by related studios that meet this criteria
diff --git a/pkg/sqlite/studio.go b/pkg/sqlite/studio.go
index d0c5c220c..949929c8d 100644
--- a/pkg/sqlite/studio.go
+++ b/pkg/sqlite/studio.go
@@ -101,6 +101,7 @@ type studioRepositoryType struct {
 	scenes    repository
 	images    repository
 	galleries repository
+	groups    repository
 }
 
 var (
@@ -127,6 +128,10 @@ var (
 			tableName: galleryTable,
 			idColumn:  studioIDColumn,
 		},
+		groups: repository{
+			tableName: groupTable,
+			idColumn:  studioIDColumn,
+		},
 		tags: joinRepository{
 			repository: repository{
 				tableName: studiosTagsTable,
diff --git a/pkg/sqlite/studio_filter.go b/pkg/sqlite/studio_filter.go
index cd7fc4440..889bd4c74 100644
--- a/pkg/sqlite/studio_filter.go
+++ b/pkg/sqlite/studio_filter.go
@@ -84,6 +84,7 @@ func (qb *studioFilterHandler) criterionHandler() criterionHandler {
 		qb.sceneCountCriterionHandler(studioFilter.SceneCount),
 		qb.imageCountCriterionHandler(studioFilter.ImageCount),
 		qb.galleryCountCriterionHandler(studioFilter.GalleryCount),
+		qb.groupCountCriterionHandler(studioFilter.GroupCount),
 		qb.parentCriterionHandler(studioFilter.Parents),
 		qb.aliasCriterionHandler(studioFilter.Aliases),
 		qb.tagsCriterionHandler(studioFilter.Tags),
@@ -118,6 +119,15 @@ func (qb *studioFilterHandler) criterionHandler() criterionHandler {
 			},
 		},
 
+		&relatedFilterHandler{
+			relatedIDCol:   "groups.id",
+			relatedRepo:    groupRepository.repository,
+			relatedHandler: &groupFilterHandler{studioFilter.GroupsFilter},
+			joinFn: func(f *filterBuilder) {
+				studioRepository.groups.innerJoin(f, "", "studios.id")
+			},
+		},
+
 		&customFieldsFilterHandler{
 			table: studiosCustomFieldsTable.GetTable(),
 			fkCol: studioIDColumn,
@@ -179,6 +189,17 @@ func (qb *studioFilterHandler) galleryCountCriterionHandler(galleryCount *models
 	}
 }
 
+func (qb *studioFilterHandler) groupCountCriterionHandler(groupCount *models.IntCriterionInput) criterionHandlerFunc {
+	return func(ctx context.Context, f *filterBuilder) {
+		if groupCount != nil {
+			f.addLeftJoin("groups", "", "groups.studio_id = studios.id")
+			clause, args := getIntCriterionWhereClause("count(distinct groups.id)", *groupCount)
+
+			f.addHaving(clause, args...)
+		}
+	}
+}
+
 func (qb *studioFilterHandler) tagCountCriterionHandler(tagCount *models.IntCriterionInput) criterionHandlerFunc {
 	h := countCriterionHandlerBuilder{
 		primaryTable: studioTable,
diff --git a/pkg/sqlite/tag.go b/pkg/sqlite/tag.go
index 8a0561b0f..a926dd56e 100644
--- a/pkg/sqlite/tag.go
+++ b/pkg/sqlite/tag.go
@@ -107,6 +107,7 @@ type tagRepositoryType struct {
 	scenes     joinRepository
 	images     joinRepository
 	galleries  joinRepository
+	groups     joinRepository
 	performers joinRepository
 	studios    joinRepository
 }
@@ -154,6 +155,14 @@ var (
 			fkColumn:     galleryIDColumn,
 			foreignTable: galleryTable,
 		},
+		groups: joinRepository{
+			repository: repository{
+				tableName: groupsTagsTable,
+				idColumn:  tagIDColumn,
+			},
+			fkColumn:     groupIDColumn,
+			foreignTable: groupTable,
+		},
 		performers: joinRepository{
 			repository: repository{
 				tableName: performersTagsTable,
diff --git a/pkg/sqlite/tag_filter.go b/pkg/sqlite/tag_filter.go
index 92da1237c..b3a7c1756 100644
--- a/pkg/sqlite/tag_filter.go
+++ b/pkg/sqlite/tag_filter.go
@@ -135,6 +135,15 @@ func (qb *tagFilterHandler) criterionHandler() criterionHandler {
 			},
 		},
 
+		&relatedFilterHandler{
+			relatedIDCol:   "groups_tags.group_id",
+			relatedRepo:    groupRepository.repository,
+			relatedHandler: &groupFilterHandler{tagFilter.GroupsFilter},
+			joinFn: func(f *filterBuilder) {
+				tagRepository.groups.innerJoin(f, "", "tags.id")
+			},
+		},
+
 		&relatedFilterHandler{
 			relatedIDCol:   "performers_tags.performer_id",
 			relatedRepo:    performerRepository.repository,
diff --git a/ui/v2.5/src/components/Galleries/GalleryList.tsx b/ui/v2.5/src/components/Galleries/GalleryList.tsx
index de0d23c19..d06aaf3a4 100644
--- a/ui/v2.5/src/components/Galleries/GalleryList.tsx
+++ b/ui/v2.5/src/components/Galleries/GalleryList.tsx
@@ -1,7 +1,7 @@
 import React, { useCallback, useEffect } from "react";
 import { FormattedMessage, useIntl } from "react-intl";
 import cloneDeep from "lodash-es/cloneDeep";
-import { useHistory, useLocation } from "react-router-dom";
+import { useHistory } from "react-router-dom";
 import Mousetrap from "mousetrap";
 import * as GQL from "src/core/generated-graphql";
 import { useFilteredItemList } from "../List/ItemList";
@@ -40,7 +40,10 @@ import { SidebarRatingFilter } from "../List/Filters/RatingFilter";
 import { SidebarBooleanFilter } from "../List/Filters/BooleanFilter";
 import { OrganizedCriterionOption } from "src/models/list-filter/criteria/organized";
 import { Button } from "react-bootstrap";
-import { ListOperations } from "../List/ListOperationButtons";
+import {
+  IListFilterOperation,
+  ListOperations,
+} from "../List/ListOperationButtons";
 import {
   FilteredListToolbar,
   IItemListOperation,
@@ -227,12 +230,10 @@ export const FilteredGalleryList = PatchComponent(
   "FilteredGalleryList",
   (props: IGalleryList) => {
     const intl = useIntl();
-    const history = useHistory();
-    const location = useLocation();
 
     const searchFocus = useFocus();
 
-    const { filterHook, view, alterQuery } = props;
+    const { filterHook, view, alterQuery, extraOperations = [] } = props;
 
     // States
     const {
@@ -312,15 +313,6 @@ export const FilteredGalleryList = PatchComponent(
       result,
     });
 
-    function onCreateNew() {
-      let queryParam = new URLSearchParams(location.search).get("q");
-      let newPath = "/galleries/new";
-      if (queryParam) {
-        newPath += "?q=" + encodeURIComponent(queryParam);
-      }
-      history.push(newPath);
-    }
-
     const viewRandom = useViewRandom(filter, totalCount);
 
     function onExport(all: boolean) {
@@ -365,7 +357,19 @@ export const FilteredGalleryList = PatchComponent(
       );
     }
 
+    const convertedExtraOperations: IListFilterOperation[] =
+      extraOperations.map((o) => ({
+        ...o,
+        isDisplayed: o.isDisplayed
+          ? () => o.isDisplayed!(result, filter, selectedIds)
+          : undefined,
+        onClick: () => {
+          o.onClick(result, filter, selectedIds);
+        },
+      }));
+
     const otherOperations = [
+      ...convertedExtraOperations,
       {
         text: intl.formatMessage({ id: "actions.select_all" }),
         onClick: () => onSelectAll(),
@@ -411,8 +415,6 @@ export const FilteredGalleryList = PatchComponent(
         operations={otherOperations}
         onEdit={onEdit}
         onDelete={onDelete}
-        onCreateNew={onCreateNew}
-        entityType={intl.formatMessage({ id: "gallery" })}
         operationsMenuClassName="gallery-list-operations-dropdown"
       />
     );
diff --git a/ui/v2.5/src/components/Groups/GroupDetails/GroupSubGroupsPanel.tsx b/ui/v2.5/src/components/Groups/GroupDetails/GroupSubGroupsPanel.tsx
index 32836ab24..6a11f7004 100644
--- a/ui/v2.5/src/components/Groups/GroupDetails/GroupSubGroupsPanel.tsx
+++ b/ui/v2.5/src/components/Groups/GroupDetails/GroupSubGroupsPanel.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import * as GQL from "src/core/generated-graphql";
-import { GroupList } from "../GroupList";
+import { FilteredGroupList } from "../GroupList";
 import { ListFilterModel } from "src/models/list-filter/filter";
 import {
   ContainingGroupsCriterionOption,
@@ -10,18 +10,7 @@ import {
   useRemoveSubGroups,
   useReorderSubGroupsMutation,
 } from "src/core/StashService";
-import { ButtonToolbar } from "react-bootstrap";
-import { ListOperationButtons } from "src/components/List/ListOperationButtons";
-import { useListContext } from "src/components/List/ListProvider";
-import {
-  PageSizeSelector,
-  SearchTermInput,
-} from "src/components/List/ListFilter";
-import { useFilter } from "src/components/List/FilterProvider";
-import {
-  IFilteredListToolbar,
-  IItemListOperation,
-} from "src/components/List/FilteredListToolbar";
+import { IItemListOperation } from "src/components/List/FilteredListToolbar";
 import {
   showWhenNoneSelected,
   showWhenSelected,
@@ -32,6 +21,7 @@ import { useToast } from "src/hooks/Toast";
 import { useModal } from "src/hooks/modal";
 import { AddSubGroupsDialog } from "./AddGroupsDialog";
 import { PatchComponent } from "src/patch";
+import { View } from "src/components/List/views";
 
 const useContainingGroupFilterHook = (
   group: Pick<GQL.StudioDataFragment, "id" | "name">,
@@ -71,37 +61,6 @@ const useContainingGroupFilterHook = (
   };
 };
 
-const Toolbar: React.FC<IFilteredListToolbar> = ({
-  onEdit,
-  onDelete,
-  operations,
-}) => {
-  const { getSelected, onSelectAll, onSelectNone, onInvertSelection } =
-    useListContext();
-  const { filter, setFilter } = useFilter();
-
-  return (
-    <ButtonToolbar className="filtered-list-toolbar">
-      <div>
-        <SearchTermInput filter={filter} onFilterUpdate={setFilter} />
-      </div>
-      <PageSizeSelector
-        pageSize={filter.itemsPerPage}
-        setPageSize={(size) => setFilter(filter.setPageSize(size))}
-      />
-      <ListOperationButtons
-        onSelectAll={onSelectAll}
-        onSelectNone={onSelectNone}
-        onInvertSelection={onInvertSelection}
-        itemsSelected={getSelected().length > 0}
-        otherOperations={operations}
-        onEdit={onEdit}
-        onDelete={onDelete}
-      />
-    </ButtonToolbar>
-  );
-};
-
 interface IGroupSubGroupsPanel {
   active: boolean;
   group: GQL.GroupDataFragment;
@@ -203,14 +162,14 @@ export const GroupSubGroupsPanel: React.FC<IGroupSubGroupsPanel> =
       return (
         <>
           {modal}
-          <GroupList
+          <FilteredGroupList
             defaultFilter={defaultFilter}
             filterHook={filterHook}
             alterQuery={active}
             fromGroupId={group.id}
             otherOperations={otherOperations}
             onMove={onMove}
-            renderToolbar={(props) => <Toolbar {...props} />}
+            view={View.GroupSubGroups}
           />
         </>
       );
diff --git a/ui/v2.5/src/components/Groups/GroupList.tsx b/ui/v2.5/src/components/Groups/GroupList.tsx
index a08610569..6ce00831c 100644
--- a/ui/v2.5/src/components/Groups/GroupList.tsx
+++ b/ui/v2.5/src/components/Groups/GroupList.tsx
@@ -1,5 +1,5 @@
-import React, { PropsWithChildren, useState } from "react";
-import { useIntl } from "react-intl";
+import React, { useCallback, useEffect } from "react";
+import { FormattedMessage, useIntl } from "react-intl";
 import cloneDeep from "lodash-es/cloneDeep";
 import Mousetrap from "mousetrap";
 import { useHistory } from "react-router-dom";
@@ -11,208 +11,321 @@ import {
   useFindGroups,
   useGroupsDestroy,
 } from "src/core/StashService";
-import { ItemList, ItemListContext, showWhenSelected } from "../List/ItemList";
+import { useFilteredItemList } from "../List/ItemList";
 import { ExportDialog } from "../Shared/ExportDialog";
 import { DeleteEntityDialog } from "../Shared/DeleteEntityDialog";
 import { GroupCardGrid } from "./GroupCardGrid";
 import { EditGroupsDialog } from "./EditGroupsDialog";
 import { View } from "../List/views";
 import {
-  IFilteredListToolbar,
+  FilteredListToolbar,
   IItemListOperation,
 } from "../List/FilteredListToolbar";
-import { PatchComponent } from "src/patch";
+import { PatchComponent, PatchContainerComponent } from "src/patch";
+import useFocus from "src/utils/focus";
+import {
+  Sidebar,
+  SidebarPane,
+  SidebarPaneContent,
+  SidebarStateContext,
+  useSidebarState,
+} from "../Shared/Sidebar";
+import { useCloseEditDelete, useFilterOperations } from "../List/util";
+import {
+  FilteredSidebarHeader,
+  useFilteredSidebarKeybinds,
+} from "../List/Filters/FilterSidebar";
+import {
+  IListFilterOperation,
+  ListOperations,
+} from "../List/ListOperationButtons";
+import cx from "classnames";
+import { FilterTags } from "../List/FilterTags";
+import { Pagination, PaginationIndex } from "../List/Pagination";
+import { LoadedContent } from "../List/PagedList";
+import { SidebarStudiosFilter } from "../List/Filters/StudiosFilter";
+import { SidebarTagsFilter } from "../List/Filters/TagsFilter";
+import { SidebarRatingFilter } from "../List/Filters/RatingFilter";
+import { Button } from "react-bootstrap";
 
-const GroupExportDialog: React.FC<{
-  open?: boolean;
+const GroupList: React.FC<{
+  groups: GQL.ListGroupDataFragment[];
+  filter: ListFilterModel;
   selectedIds: Set<string>;
-  isExportAll?: boolean;
-  onClose: () => void;
-}> = ({ open = false, selectedIds, isExportAll = false, onClose }) => {
-  if (!open) {
+  onSelectChange: (id: string, selected: boolean, shiftKey: boolean) => void;
+  fromGroupId?: string;
+  onMove?: (srcIds: string[], targetId: string, after: boolean) => void;
+}> = PatchComponent(
+  "GroupList",
+  ({ groups, filter, selectedIds, onSelectChange, fromGroupId, onMove }) => {
+    if (groups.length === 0) {
+      return null;
+    }
+
+    if (filter.displayMode === DisplayMode.Grid) {
+      return (
+        <GroupCardGrid
+          groups={groups ?? []}
+          zoomIndex={filter.zoomIndex}
+          selectedIds={selectedIds}
+          onSelectChange={onSelectChange}
+          fromGroupId={fromGroupId}
+          onMove={onMove}
+        />
+      );
+    }
+
     return null;
   }
+);
+
+const GroupFilterSidebarSections = PatchContainerComponent(
+  "FilteredGroupList.SidebarSections"
+);
+
+const SidebarContent: React.FC<{
+  filter: ListFilterModel;
+  setFilter: (filter: ListFilterModel) => void;
+  filterHook?: (filter: ListFilterModel) => ListFilterModel;
+  view?: View;
+  sidebarOpen: boolean;
+  onClose?: () => void;
+  showEditFilter: (editingCriterion?: string) => void;
+  count?: number;
+  focus?: ReturnType<typeof useFocus>;
+}> = ({
+  filter,
+  setFilter,
+  filterHook,
+  view,
+  showEditFilter,
+  sidebarOpen,
+  onClose,
+  count,
+  focus,
+}) => {
+  const showResultsId =
+    count !== undefined ? "actions.show_count_results" : "actions.show_results";
+
+  const hideStudios = view === View.StudioScenes;
 
   return (
-    <ExportDialog
-      exportInput={{
-        groups: {
-          ids: Array.from(selectedIds.values()),
-          all: isExportAll,
-        },
-      }}
-      onClose={onClose}
-    />
+    <>
+      <FilteredSidebarHeader
+        sidebarOpen={sidebarOpen}
+        showEditFilter={showEditFilter}
+        filter={filter}
+        setFilter={setFilter}
+        view={view}
+        focus={focus}
+      />
+
+      <GroupFilterSidebarSections>
+        {!hideStudios && (
+          <SidebarStudiosFilter
+            filter={filter}
+            setFilter={setFilter}
+            filterHook={filterHook}
+          />
+        )}
+        <SidebarTagsFilter
+          filter={filter}
+          setFilter={setFilter}
+          filterHook={filterHook}
+        />
+        <SidebarRatingFilter filter={filter} setFilter={setFilter} />
+      </GroupFilterSidebarSections>
+
+      <div className="sidebar-footer">
+        <Button className="sidebar-close-button" onClick={onClose}>
+          <FormattedMessage id={showResultsId} values={{ count }} />
+        </Button>
+      </div>
+    </>
   );
 };
 
-const filterMode = GQL.FilterMode.Groups;
-
-function getItems(result: GQL.FindGroupsQueryResult) {
-  return result?.data?.findGroups?.groups ?? [];
-}
-
-function getCount(result: GQL.FindGroupsQueryResult) {
-  return result?.data?.findGroups?.count ?? 0;
-}
-
 interface IGroupListContext {
   filterHook?: (filter: ListFilterModel) => ListFilterModel;
   defaultFilter?: ListFilterModel;
   view?: View;
   alterQuery?: boolean;
-  selectable?: boolean;
 }
 
-export const GroupListContext: React.FC<
-  PropsWithChildren<IGroupListContext>
-> = ({ alterQuery, filterHook, defaultFilter, view, selectable, children }) => {
-  return (
-    <ItemListContext
-      filterMode={filterMode}
-      defaultFilter={defaultFilter}
-      useResult={useFindGroups}
-      getItems={getItems}
-      getCount={getCount}
-      alterQuery={alterQuery}
-      filterHook={filterHook}
-      view={view}
-      selectable={selectable}
-    >
-      {children}
-    </ItemListContext>
-  );
-};
-
 interface IGroupList extends IGroupListContext {
   fromGroupId?: string;
   onMove?: (srcIds: string[], targetId: string, after: boolean) => void;
-  renderToolbar?: (props: IFilteredListToolbar) => React.ReactNode;
   otherOperations?: IItemListOperation<GQL.FindGroupsQueryResult>[];
 }
 
-export const GroupList: React.FC<IGroupList> = PatchComponent(
-  "GroupList",
-  ({
-    filterHook,
-    alterQuery,
-    defaultFilter,
-    view,
-    fromGroupId,
-    onMove,
-    selectable,
-    renderToolbar,
-    otherOperations: providedOperations = [],
-  }) => {
+function useViewRandom(filter: ListFilterModel, count: number) {
+  const history = useHistory();
+
+  const viewRandom = useCallback(async () => {
+    // query for a random scene
+    if (count === 0) {
+      return;
+    }
+
+    const index = Math.floor(Math.random() * count);
+    const filterCopy = cloneDeep(filter);
+    filterCopy.itemsPerPage = 1;
+    filterCopy.currentPage = index + 1;
+    const singleResult = await queryFindGroups(filterCopy);
+    if (singleResult.data.findGroups.groups.length === 1) {
+      const { id } = singleResult.data.findGroups.groups[0];
+      // navigate to the image player page
+      history.push(`/groups/${id}`);
+    }
+  }, [history, filter, count]);
+
+  return viewRandom;
+}
+
+function useAddKeybinds(filter: ListFilterModel, count: number) {
+  const viewRandom = useViewRandom(filter, count);
+
+  useEffect(() => {
+    Mousetrap.bind("p r", () => {
+      viewRandom();
+    });
+
+    return () => {
+      Mousetrap.unbind("p r");
+    };
+  }, [viewRandom]);
+}
+
+export const FilteredGroupList = PatchComponent(
+  "FilteredGroupList",
+  (props: IGroupList) => {
     const intl = useIntl();
-    const history = useHistory();
-    const [isExportDialogOpen, setIsExportDialogOpen] = useState(false);
-    const [isExportAll, setIsExportAll] = useState(false);
 
-    const otherOperations = [
-      {
-        text: intl.formatMessage({ id: "actions.view_random" }),
-        onClick: viewRandom,
-      },
-      {
-        text: intl.formatMessage({ id: "actions.export" }),
-        onClick: onExport,
-        isDisplayed: showWhenSelected,
-      },
-      {
-        text: intl.formatMessage({ id: "actions.export_all" }),
-        onClick: onExportAll,
-      },
-      ...providedOperations,
-    ];
+    const searchFocus = useFocus();
 
-    function addKeybinds(
-      result: GQL.FindGroupsQueryResult,
-      filter: ListFilterModel
-    ) {
-      Mousetrap.bind("p r", () => {
-        viewRandom(result, filter);
+    const {
+      filterHook,
+      view,
+      alterQuery,
+      onMove,
+      fromGroupId,
+      otherOperations: providedOperations = [],
+      defaultFilter,
+    } = props;
+
+    const withSidebar = view !== View.GroupSubGroups;
+    const filterable = view !== View.GroupSubGroups;
+    const sortable = view !== View.GroupSubGroups;
+
+    // States
+    const {
+      showSidebar,
+      setShowSidebar,
+      sectionOpen,
+      setSectionOpen,
+      loading: sidebarStateLoading,
+    } = useSidebarState(view);
+
+    const { filterState, queryResult, modalState, listSelect, showEditFilter } =
+      useFilteredItemList({
+        filterStateProps: {
+          filterMode: GQL.FilterMode.Groups,
+          defaultFilter,
+          view,
+          useURL: alterQuery,
+        },
+        queryResultProps: {
+          useResult: useFindGroups,
+          getCount: (r) => r.data?.findGroups.count ?? 0,
+          getItems: (r) => r.data?.findGroups.groups ?? [],
+          filterHook,
+        },
+      });
+
+    const { filter, setFilter } = filterState;
+
+    const { effectiveFilter, result, cachedResult, items, totalCount } =
+      queryResult;
+
+    const {
+      selectedIds,
+      selectedItems,
+      onSelectChange,
+      onSelectAll,
+      onSelectNone,
+      onInvertSelection,
+      hasSelection,
+    } = listSelect;
+
+    const { modal, showModal, closeModal } = modalState;
+
+    // Utility hooks
+    const { setPage, removeCriterion, clearAllCriteria } = useFilterOperations({
+      filter,
+      setFilter,
+    });
+
+    useAddKeybinds(filter, totalCount);
+    useFilteredSidebarKeybinds({
+      showSidebar,
+      setShowSidebar,
+    });
+
+    useEffect(() => {
+      Mousetrap.bind("e", () => {
+        if (hasSelection) {
+          onEdit?.();
+        }
+      });
+
+      Mousetrap.bind("d d", () => {
+        if (hasSelection) {
+          onDelete?.();
+        }
       });
 
       return () => {
-        Mousetrap.unbind("p r");
+        Mousetrap.unbind("e");
+        Mousetrap.unbind("d d");
       };
-    }
+    });
 
-    async function viewRandom(
-      result: GQL.FindGroupsQueryResult,
-      filter: ListFilterModel
-    ) {
-      // query for a random image
-      if (result.data?.findGroups) {
-        const { count } = result.data.findGroups;
+    const onCloseEditDelete = useCloseEditDelete({
+      closeModal,
+      onSelectNone,
+      result,
+    });
 
-        const index = Math.floor(Math.random() * count);
-        const filterCopy = cloneDeep(filter);
-        filterCopy.itemsPerPage = 1;
-        filterCopy.currentPage = index + 1;
-        const singleResult = await queryFindGroups(filterCopy);
-        if (singleResult.data.findGroups.groups.length === 1) {
-          const { id } = singleResult.data.findGroups.groups[0];
-          // navigate to the group page
-          history.push(`/groups/${id}`);
-        }
-      }
-    }
+    const viewRandom = useViewRandom(filter, totalCount);
 
-    async function onExport() {
-      setIsExportAll(false);
-      setIsExportDialogOpen(true);
-    }
-
-    async function onExportAll() {
-      setIsExportAll(true);
-      setIsExportDialogOpen(true);
-    }
-
-    function renderContent(
-      result: GQL.FindGroupsQueryResult,
-      filter: ListFilterModel,
-      selectedIds: Set<string>,
-      onSelectChange: (id: string, selected: boolean, shiftKey: boolean) => void
-    ) {
-      return (
-        <>
-          <GroupExportDialog
-            open={isExportDialogOpen}
-            selectedIds={selectedIds}
-            isExportAll={isExportAll}
-            onClose={() => setIsExportDialogOpen(false)}
-          />
-          {filter.displayMode === DisplayMode.Grid && (
-            <GroupCardGrid
-              groups={result.data?.findGroups.groups ?? []}
-              zoomIndex={filter.zoomIndex}
-              selectedIds={selectedIds}
-              onSelectChange={onSelectChange}
-              fromGroupId={fromGroupId}
-              onMove={onMove}
-            />
-          )}
-        </>
+    function onExport(all: boolean) {
+      showModal(
+        <ExportDialog
+          exportInput={{
+            groups: {
+              ids: Array.from(selectedIds.values()),
+              all: all,
+            },
+          }}
+          onClose={() => closeModal()}
+        />
       );
     }
 
-    function renderEditDialog(
-      selectedGroups: GQL.ListGroupDataFragment[],
-      onClose: (applied: boolean) => void
-    ) {
-      return <EditGroupsDialog selected={selectedGroups} onClose={onClose} />;
+    function onEdit() {
+      showModal(
+        <EditGroupsDialog
+          selected={selectedItems}
+          onClose={onCloseEditDelete}
+        />
+      );
     }
 
-    function renderDeleteDialog(
-      selectedGroups: GQL.SlimGroupDataFragment[],
-      onClose: (confirmed: boolean) => void
-    ) {
-      return (
+    function onDelete() {
+      showModal(
         <DeleteEntityDialog
-          selected={selectedGroups}
-          onClose={onClose}
+          selected={selectedItems}
+          onClose={onCloseEditDelete}
           singularEntity={intl.formatMessage({ id: "group" })}
           pluralEntity={intl.formatMessage({ id: "groups" })}
           destroyMutation={useGroupsDestroy}
@@ -220,24 +333,163 @@ export const GroupList: React.FC<IGroupList> = PatchComponent(
       );
     }
 
-    return (
-      <GroupListContext
-        alterQuery={alterQuery}
-        filterHook={filterHook}
-        view={view}
-        defaultFilter={defaultFilter}
-        selectable={selectable}
-      >
-        <ItemList
+    const convertedExtraOperations: IListFilterOperation[] =
+      providedOperations.map((o) => ({
+        ...o,
+        isDisplayed: o.isDisplayed
+          ? () => o.isDisplayed!(result, filter, selectedIds)
+          : undefined,
+        onClick: () => {
+          o.onClick(result, filter, selectedIds);
+        },
+      }));
+
+    const otherOperations = [
+      ...convertedExtraOperations,
+      {
+        text: intl.formatMessage({ id: "actions.select_all" }),
+        onClick: () => onSelectAll(),
+        isDisplayed: () => totalCount > 0,
+      },
+      {
+        text: intl.formatMessage({ id: "actions.select_none" }),
+        onClick: () => onSelectNone(),
+        isDisplayed: () => hasSelection,
+      },
+      {
+        text: intl.formatMessage({ id: "actions.invert_selection" }),
+        onClick: () => onInvertSelection(),
+        isDisplayed: () => totalCount > 0,
+      },
+      {
+        text: intl.formatMessage({ id: "actions.view_random" }),
+        onClick: viewRandom,
+      },
+      {
+        text: intl.formatMessage({ id: "actions.export" }),
+        onClick: () => onExport(false),
+        isDisplayed: () => hasSelection,
+      },
+      {
+        text: intl.formatMessage({ id: "actions.export_all" }),
+        onClick: () => onExport(true),
+      },
+    ];
+
+    // render
+    if (sidebarStateLoading) return null;
+
+    const operations = (
+      <ListOperations
+        items={items.length}
+        hasSelection={hasSelection}
+        operations={otherOperations}
+        onEdit={onEdit}
+        onDelete={onDelete}
+        operationsMenuClassName="group-list-operations-dropdown"
+      />
+    );
+
+    const content = (
+      <>
+        <FilteredListToolbar
+          filter={filter}
+          listSelect={listSelect}
+          setFilter={setFilter}
+          showEditFilter={showEditFilter}
+          onDelete={onDelete}
+          onEdit={onEdit}
+          operationComponent={operations}
           view={view}
-          otherOperations={otherOperations}
-          addKeybinds={addKeybinds}
-          renderContent={renderContent}
-          renderEditDialog={renderEditDialog}
-          renderDeleteDialog={renderDeleteDialog}
-          renderToolbar={renderToolbar}
+          zoomable
+          filterable={filterable}
+          sortable={sortable}
         />
-      </GroupListContext>
+
+        <FilterTags
+          criteria={filter.criteria}
+          onEditCriterion={(c) => showEditFilter(c.criterionOption.type)}
+          onRemoveCriterion={removeCriterion}
+          onRemoveAll={clearAllCriteria}
+        />
+
+        <div className="pagination-index-container">
+          <Pagination
+            currentPage={filter.currentPage}
+            itemsPerPage={filter.itemsPerPage}
+            totalItems={totalCount}
+            onChangePage={(page) => setFilter(filter.changePage(page))}
+          />
+          <PaginationIndex
+            loading={cachedResult.loading}
+            itemsPerPage={filter.itemsPerPage}
+            currentPage={filter.currentPage}
+            totalItems={totalCount}
+          />
+        </div>
+
+        <LoadedContent loading={result.loading} error={result.error}>
+          <GroupList
+            filter={effectiveFilter}
+            groups={items}
+            selectedIds={selectedIds}
+            onSelectChange={onSelectChange}
+            fromGroupId={fromGroupId}
+            onMove={onMove}
+          />
+        </LoadedContent>
+
+        {totalCount > filter.itemsPerPage && (
+          <div className="pagination-footer-container">
+            <div className="pagination-footer">
+              <Pagination
+                itemsPerPage={filter.itemsPerPage}
+                currentPage={filter.currentPage}
+                totalItems={totalCount}
+                onChangePage={setPage}
+                pagePopupPlacement="top"
+              />
+            </div>
+          </div>
+        )}
+      </>
+    );
+
+    if (!withSidebar) {
+      return content;
+    }
+
+    return (
+      <div
+        className={cx("item-list-container group-list", {
+          "hide-sidebar": !showSidebar,
+        })}
+      >
+        {modal}
+
+        <SidebarStateContext.Provider value={{ sectionOpen, setSectionOpen }}>
+          <SidebarPane hideSidebar={!showSidebar}>
+            <Sidebar hide={!showSidebar} onHide={() => setShowSidebar(false)}>
+              <SidebarContent
+                filter={filter}
+                setFilter={setFilter}
+                filterHook={filterHook}
+                showEditFilter={showEditFilter}
+                view={view}
+                sidebarOpen={showSidebar}
+                onClose={() => setShowSidebar(false)}
+                count={cachedResult.loading ? undefined : totalCount}
+                focus={searchFocus}
+              />
+            </Sidebar>
+            <SidebarPaneContent
+              onSidebarToggle={() => setShowSidebar(!showSidebar)}
+            >
+              {content}
+            </SidebarPaneContent>
+          </SidebarPane>
+        </SidebarStateContext.Provider>
+      </div>
     );
   }
 );
diff --git a/ui/v2.5/src/components/Groups/Groups.tsx b/ui/v2.5/src/components/Groups/Groups.tsx
index 5ec7b4eaf..1a89444b0 100644
--- a/ui/v2.5/src/components/Groups/Groups.tsx
+++ b/ui/v2.5/src/components/Groups/Groups.tsx
@@ -4,11 +4,11 @@ import { Helmet } from "react-helmet";
 import { useTitleProps } from "src/hooks/title";
 import Group from "./GroupDetails/Group";
 import GroupCreate from "./GroupDetails/GroupCreate";
-import { GroupList } from "./GroupList";
+import { FilteredGroupList } from "./GroupList";
 import { View } from "../List/views";
 
 const Groups: React.FC = () => {
-  return <GroupList view={View.Groups} />;
+  return <FilteredGroupList view={View.Groups} />;
 };
 
 const GroupRoutes: React.FC = () => {
diff --git a/ui/v2.5/src/components/List/FilteredListToolbar.tsx b/ui/v2.5/src/components/List/FilteredListToolbar.tsx
index 162b30ff3..a6a983dc4 100644
--- a/ui/v2.5/src/components/List/FilteredListToolbar.tsx
+++ b/ui/v2.5/src/components/List/FilteredListToolbar.tsx
@@ -80,6 +80,8 @@ export interface IFilteredListToolbar {
   operations?: IListFilterOperation[];
   operationComponent?: React.ReactNode;
   zoomable?: boolean;
+  filterable?: boolean;
+  sortable?: boolean;
 }
 
 export const FilteredListToolbar: React.FC<IFilteredListToolbar> = ({
@@ -93,6 +95,8 @@ export const FilteredListToolbar: React.FC<IFilteredListToolbar> = ({
   operations,
   operationComponent,
   zoomable = false,
+  filterable = true,
+  sortable = true,
 }) => {
   const filterOptions = filter.options;
   const { setDisplayMode, setZoom } = useFilterOperations({
@@ -128,32 +132,40 @@ export const FilteredListToolbar: React.FC<IFilteredListToolbar> = ({
         />
       ) : (
         <>
-          <SearchTermInput filter={filter} onFilterUpdate={setFilter} />
+          {filterable && (
+            <SearchTermInput filter={filter} onFilterUpdate={setFilter} />
+          )}
 
-          <ButtonGroup>
-            <SavedFilterDropdown
-              filter={filter}
-              onSetFilter={setFilter}
-              view={view}
-            />
-            <FilterButton
-              onClick={() => showEditFilter()}
-              count={filter.count()}
-            />
-          </ButtonGroup>
+          {filterable && (
+            <ButtonGroup>
+              <SavedFilterDropdown
+                filter={filter}
+                onSetFilter={setFilter}
+                view={view}
+              />
+              <FilterButton
+                onClick={() => showEditFilter()}
+                count={filter.count()}
+              />
+            </ButtonGroup>
+          )}
 
-          <SortBySelect
-            sortBy={filter.sortBy}
-            sortDirection={filter.sortDirection}
-            options={filterOptions.sortByOptions}
-            onChangeSortBy={(e) => setFilter(filter.setSortBy(e ?? undefined))}
-            onChangeSortDirection={() =>
-              setFilter(filter.toggleSortDirection())
-            }
-            onReshuffleRandomSort={() =>
-              setFilter(filter.reshuffleRandomSort())
-            }
-          />
+          {sortable && (
+            <SortBySelect
+              sortBy={filter.sortBy}
+              sortDirection={filter.sortDirection}
+              options={filterOptions.sortByOptions}
+              onChangeSortBy={(e) =>
+                setFilter(filter.setSortBy(e ?? undefined))
+              }
+              onChangeSortDirection={() =>
+                setFilter(filter.toggleSortDirection())
+              }
+              onReshuffleRandomSort={() =>
+                setFilter(filter.reshuffleRandomSort())
+              }
+            />
+          )}
 
           <PageSizeSelector
             pageSize={filter.itemsPerPage}
diff --git a/ui/v2.5/src/components/List/Filters/LabeledIdFilter.tsx b/ui/v2.5/src/components/List/Filters/LabeledIdFilter.tsx
index a5e81087e..a9163578f 100644
--- a/ui/v2.5/src/components/List/Filters/LabeledIdFilter.tsx
+++ b/ui/v2.5/src/components/List/Filters/LabeledIdFilter.tsx
@@ -19,6 +19,7 @@ import {
   CriterionModifier,
   FilterMode,
   GalleryFilterType,
+  GroupFilterType,
   InputMaybe,
   IntCriterionInput,
   PerformerFilterType,
@@ -522,6 +523,8 @@ interface IFilterType {
   performer_count?: InputMaybe<IntCriterionInput>;
   galleries_filter?: InputMaybe<GalleryFilterType>;
   gallery_count?: InputMaybe<IntCriterionInput>;
+  groups_filter?: InputMaybe<GroupFilterType>;
+  group_count?: InputMaybe<IntCriterionInput>;
   studios_filter?: InputMaybe<StudioFilterType>;
   studio_count?: InputMaybe<IntCriterionInput>;
 }
@@ -533,6 +536,7 @@ export function setObjectFilter(
     | SceneFilterType
     | PerformerFilterType
     | GalleryFilterType
+    | GroupFilterType
     | StudioFilterType
 ) {
   const empty = Object.keys(relatedFilterOutput).length === 0;
@@ -568,6 +572,16 @@ export function setObjectFilter(
       }
       out.galleries_filter = relatedFilterOutput as GalleryFilterType;
       break;
+    case FilterMode.Groups:
+      // if empty, only get objects with groups
+      if (empty) {
+        out.group_count = {
+          modifier: CriterionModifier.GreaterThan,
+          value: 0,
+        };
+      }
+      out.groups_filter = relatedFilterOutput as GroupFilterType;
+      break;
     case FilterMode.Studios:
       // if empty, only get objects with studios
       if (empty) {
diff --git a/ui/v2.5/src/components/List/ListOperationButtons.tsx b/ui/v2.5/src/components/List/ListOperationButtons.tsx
index c214a947a..2a4232fb3 100644
--- a/ui/v2.5/src/components/List/ListOperationButtons.tsx
+++ b/ui/v2.5/src/components/List/ListOperationButtons.tsx
@@ -9,7 +9,6 @@ import {
   faPencil,
   faPencilAlt,
   faPlay,
-  faPlus,
   faTrash,
 } from "@fortawesome/free-solid-svg-icons";
 import cx from "classnames";
@@ -61,6 +60,7 @@ export interface IListFilterOperation {
   isDisplayed?: () => boolean;
   icon?: IconDefinition;
   buttonVariant?: string;
+  className?: string;
 }
 
 interface IListOperationButtonsProps {
@@ -268,22 +268,13 @@ export const ListOperationButtons: React.FC<IListOperationButtonsProps> = ({
   );
 };
 
-export interface IListOperations {
-  text: string;
-  onClick: () => void;
-  isDisplayed?: () => boolean;
-  className?: string;
-}
-
 export const ListOperations: React.FC<{
   items: number;
   hasSelection?: boolean;
-  operations?: IListOperations[];
+  operations?: IListFilterOperation[];
   onEdit?: () => void;
   onDelete?: () => void;
   onPlay?: () => void;
-  onCreateNew?: () => void;
-  entityType?: string;
   operationsClassName?: string;
   operationsMenuClassName?: string;
 }> = ({
@@ -293,79 +284,128 @@ export const ListOperations: React.FC<{
   onEdit,
   onDelete,
   onPlay,
-  onCreateNew,
-  entityType,
   operationsClassName = "list-operations",
   operationsMenuClassName,
 }) => {
   const intl = useIntl();
 
+  const dropdownOperations = useMemo(() => {
+    return operations.filter((o) => {
+      if (o.icon) {
+        return false;
+      }
+
+      if (!o.isDisplayed) {
+        return true;
+      }
+
+      return o.isDisplayed();
+    });
+  }, [operations]);
+
+  const buttons = useMemo(() => {
+    const otherButtons = (operations ?? []).filter((o) => {
+      if (!o.icon) {
+        return false;
+      }
+
+      if (!o.isDisplayed) {
+        return true;
+      }
+
+      return o.isDisplayed();
+    });
+
+    const ret: React.ReactNode[] = [];
+
+    function addButton(b: React.ReactNode | null) {
+      if (b) {
+        ret.push(b);
+      }
+    }
+
+    const playButton =
+      !!items && onPlay ? (
+        <Button
+          className="play-button"
+          variant="secondary"
+          onClick={() => onPlay()}
+          title={intl.formatMessage({ id: "actions.play" })}
+        >
+          <Icon icon={faPlay} />
+        </Button>
+      ) : null;
+
+    const editButton =
+      hasSelection && onEdit ? (
+        <Button
+          className="edit-existing-button"
+          variant="secondary"
+          onClick={() => onEdit()}
+        >
+          <Icon icon={faPencil} />
+        </Button>
+      ) : null;
+
+    const deleteButton =
+      hasSelection && onDelete ? (
+        <Button
+          variant="danger"
+          className="delete-button btn-danger-minimal"
+          onClick={() => onDelete()}
+        >
+          <Icon icon={faTrash} />
+        </Button>
+      ) : null;
+
+    addButton(playButton);
+    addButton(editButton);
+    addButton(deleteButton);
+
+    otherButtons.forEach((button) => {
+      addButton(
+        <Button
+          key={button.text}
+          variant={button.buttonVariant ?? "secondary"}
+          onClick={button.onClick}
+          title={button.text}
+          className={button.className}
+        >
+          <Icon icon={button.icon!} />
+        </Button>
+      );
+    });
+
+    if (ret.length === 0) {
+      return null;
+    }
+
+    return ret;
+  }, [operations, hasSelection, onDelete, onEdit, onPlay, items, intl]);
+
+  if (dropdownOperations.length === 0 && !buttons) {
+    return null;
+  }
+
   return (
     <div className="list-operations">
       <ButtonGroup>
-        {!!items && onPlay && (
-          <Button
-            className="play-button"
-            variant="secondary"
-            onClick={() => onPlay()}
-            title={intl.formatMessage({ id: "actions.play" })}
-          >
-            <Icon icon={faPlay} />
-          </Button>
-        )}
-        {!hasSelection && onCreateNew && (
-          <Button
-            className="create-new-button"
-            variant="secondary"
-            onClick={() => onCreateNew()}
-            title={intl.formatMessage(
-              { id: "actions.create_entity" },
-              { entityType }
-            )}
-          >
-            <Icon icon={faPlus} />
-          </Button>
-        )}
+        {buttons}
 
-        {hasSelection && (onEdit || onDelete) && (
-          <>
-            {onEdit && (
-              <Button variant="secondary" onClick={() => onEdit()}>
-                <Icon icon={faPencil} />
-              </Button>
-            )}
-            {onDelete && (
-              <Button
-                variant="danger"
-                className="btn-danger-minimal"
-                onClick={() => onDelete()}
-              >
-                <Icon icon={faTrash} />
-              </Button>
-            )}
-          </>
-        )}
-
-        {operations.length > 0 && (
+        {dropdownOperations.length > 0 && (
           <OperationDropdown
             className={operationsClassName}
             menuClassName={operationsMenuClassName}
             menuPortalTarget={document.body}
           >
-            {operations.map((o) => {
-              if (o.isDisplayed && !o.isDisplayed()) {
-                return null;
-              }
-
-              return (
-                <OperationDropdownItem
-                  key={o.text}
-                  onClick={o.onClick}
-                  text={o.text}
-                  className={o.className}
-                />
-              );
-            })}
+            {dropdownOperations.map((o) => (
+              <OperationDropdownItem
+                key={o.text}
+                onClick={o.onClick}
+                text={o.text}
+                className={o.className}
+              />
+            ))}
           </OperationDropdown>
         )}
       </ButtonGroup>
diff --git a/ui/v2.5/src/components/List/util.ts b/ui/v2.5/src/components/List/util.ts
index 707346848..d870c631f 100644
--- a/ui/v2.5/src/components/List/util.ts
+++ b/ui/v2.5/src/components/List/util.ts
@@ -139,6 +139,7 @@ function useEmptyFilter(props: {
 
 export interface IFilterStateHook {
   filterMode: GQL.FilterMode;
+  defaultFilter?: ListFilterModel;
   defaultSort?: string;
   view?: View;
   useURL?: boolean;
@@ -149,7 +150,14 @@ export function useFilterState(
     config?: GQL.ConfigDataFragment;
   }
 ) {
-  const { filterMode, defaultSort, config, view, useURL } = props;
+  const {
+    filterMode,
+    defaultSort,
+    config,
+    view,
+    useURL,
+    defaultFilter: propDefaultFilter,
+  } = props;
 
   const [filter, setFilterState] = useState<ListFilterModel>(
     () =>
@@ -158,10 +166,13 @@ export function useFilterState(
 
   const emptyFilter = useEmptyFilter({ filterMode, defaultSort, config });
 
-  const { defaultFilter } = useDefaultFilter(emptyFilter, view);
+  const { defaultFilter: defaultFilterFromConfig } = useDefaultFilter(
+    emptyFilter,
+    view
+  );
 
   const { setFilter } = useFilterURL(filter, setFilterState, {
-    defaultFilter,
+    defaultFilter: propDefaultFilter ?? defaultFilterFromConfig,
     active: useURL,
   });
 
diff --git a/ui/v2.5/src/components/List/views.ts b/ui/v2.5/src/components/List/views.ts
index 5b9f9798f..4ea4e46d8 100644
--- a/ui/v2.5/src/components/List/views.ts
+++ b/ui/v2.5/src/components/List/views.ts
@@ -13,6 +13,7 @@ export enum View {
   TagScenes = "tag_scenes",
   TagImages = "tag_images",
   TagPerformers = "tag_performers",
+  TagGroups = "tag_groups",
 
   PerformerScenes = "performer_scenes",
   PerformerGalleries = "performer_galleries",
diff --git a/ui/v2.5/src/components/MainNavbar.tsx b/ui/v2.5/src/components/MainNavbar.tsx
index a73a3078b..c70994476 100644
--- a/ui/v2.5/src/components/MainNavbar.tsx
+++ b/ui/v2.5/src/components/MainNavbar.tsx
@@ -103,6 +103,7 @@ const allMenuItems: IMenuItem[] = [
     href: "/scenes",
     icon: faPlayCircle,
     hotkey: "g s",
+    userCreatable: true,
   },
   {
     name: "images",
@@ -132,6 +133,7 @@ const allMenuItems: IMenuItem[] = [
     href: "/galleries",
     icon: faImages,
     hotkey: "g l",
+    userCreatable: true,
   },
   {
     name: "performers",
@@ -139,6 +141,7 @@ const allMenuItems: IMenuItem[] = [
     href: "/performers",
     icon: faUser,
     hotkey: "g p",
+    userCreatable: true,
   },
   {
     name: "studios",
diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerGroupsPanel.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerGroupsPanel.tsx
index 5475c1484..ce61edc42 100644
--- a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerGroupsPanel.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerGroupsPanel.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import * as GQL from "src/core/generated-graphql";
-import { GroupList } from "src/components/Groups/GroupList";
+import { FilteredGroupList } from "src/components/Groups/GroupList";
 import { usePerformerFilterHook } from "src/core/performers";
 import { View } from "src/components/List/views";
 import { PatchComponent } from "src/patch";
@@ -14,7 +14,7 @@ export const PerformerGroupsPanel: React.FC<IPerformerDetailsProps> =
   PatchComponent("PerformerGroupsPanel", ({ active, performer }) => {
     const filterHook = usePerformerFilterHook(performer);
     return (
-      <GroupList
+      <FilteredGroupList
         filterHook={filterHook}
         alterQuery={active}
         view={View.PerformerGroups}
diff --git a/ui/v2.5/src/components/Performers/PerformerList.tsx b/ui/v2.5/src/components/Performers/PerformerList.tsx
index 12c4b6952..a0591b4ce 100644
--- a/ui/v2.5/src/components/Performers/PerformerList.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerList.tsx
@@ -1,7 +1,7 @@
 import cloneDeep from "lodash-es/cloneDeep";
 import React, { useCallback, useEffect } from "react";
 import { FormattedMessage, useIntl } from "react-intl";
-import { useHistory, useLocation } from "react-router-dom";
+import { useHistory } from "react-router-dom";
 import Mousetrap from "mousetrap";
 import * as GQL from "src/core/generated-graphql";
 import {
@@ -41,7 +41,10 @@ import {
   FilteredSidebarHeader,
   useFilteredSidebarKeybinds,
 } from "../List/Filters/FilterSidebar";
-import { IListOperations, ListOperations } from "../List/ListOperationButtons";
+import {
+  IListFilterOperation,
+  ListOperations,
+} from "../List/ListOperationButtons";
 import { FilterTags } from "../List/FilterTags";
 import { Pagination, PaginationIndex } from "../List/Pagination";
 import { LoadedContent } from "../List/PagedList";
@@ -354,7 +357,6 @@ export const FilteredPerformerList = PatchComponent(
   (props: IPerformerList) => {
     const intl = useIntl();
     const history = useHistory();
-    const location = useLocation();
 
     const searchFocus = useFocus();
 
@@ -444,15 +446,6 @@ export const FilteredPerformerList = PatchComponent(
       result,
     });
 
-    function onCreateNew() {
-      let queryParam = new URLSearchParams(location.search).get("q");
-      let newPath = "/performers/new";
-      if (queryParam) {
-        newPath += "?q=" + encodeURIComponent(queryParam);
-      }
-      history.push(newPath);
-    }
-
     const viewRandom = useViewRandom(filter, totalCount);
 
     function onExport(all: boolean) {
@@ -505,8 +498,8 @@ export const FilteredPerformerList = PatchComponent(
       );
     }
 
-    const convertedExtraOperations: IListOperations[] = extraOperations.map(
-      (o) => ({
+    const convertedExtraOperations: IListFilterOperation[] =
+      extraOperations.map((o) => ({
         ...o,
         isDisplayed: o.isDisplayed
           ? () => o.isDisplayed!(result, filter, selectedIds)
@@ -514,10 +507,9 @@ export const FilteredPerformerList = PatchComponent(
         onClick: () => {
           o.onClick(result, filter, selectedIds);
         },
-      })
-    );
+      }));
 
-    const otherOperations: IListOperations[] = [
+    const otherOperations: IListFilterOperation[] = [
       ...convertedExtraOperations,
       {
         text: intl.formatMessage({ id: "actions.select_all" }),
@@ -564,8 +556,6 @@ export const FilteredPerformerList = PatchComponent(
         operations={otherOperations}
         onEdit={onEdit}
         onDelete={onDelete}
-        onCreateNew={onCreateNew}
-        entityType={intl.formatMessage({ id: "gallery" })}
         operationsMenuClassName="gallery-list-operations-dropdown"
       />
     );
diff --git a/ui/v2.5/src/components/Scenes/SceneList.tsx b/ui/v2.5/src/components/Scenes/SceneList.tsx
index 79f470de8..a0458c5ac 100644
--- a/ui/v2.5/src/components/Scenes/SceneList.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneList.tsx
@@ -627,8 +627,6 @@ export const FilteredSceneList = PatchComponent(
         onEdit={onEdit}
         onDelete={onDelete}
         onPlay={onPlay}
-        onCreateNew={onCreateNew}
-        entityType={intl.formatMessage({ id: "scene" })}
         operationsMenuClassName="scene-list-operations-dropdown"
       />
     );
diff --git a/ui/v2.5/src/components/Studios/StudioDetails/StudioGroupsPanel.tsx b/ui/v2.5/src/components/Studios/StudioDetails/StudioGroupsPanel.tsx
index ba3a7cc02..75d001c21 100644
--- a/ui/v2.5/src/components/Studios/StudioDetails/StudioGroupsPanel.tsx
+++ b/ui/v2.5/src/components/Studios/StudioDetails/StudioGroupsPanel.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import * as GQL from "src/core/generated-graphql";
-import { GroupList } from "src/components/Groups/GroupList";
+import { FilteredGroupList } from "src/components/Groups/GroupList";
 import { useStudioFilterHook } from "src/core/studios";
 import { View } from "src/components/List/views";
 
@@ -17,7 +17,7 @@ export const StudioGroupsPanel: React.FC<IStudioGroupsPanel> = ({
 }) => {
   const filterHook = useStudioFilterHook(studio, showChildStudioContent);
   return (
-    <GroupList
+    <FilteredGroupList
       filterHook={filterHook}
       alterQuery={active}
       view={View.StudioGroups}
diff --git a/ui/v2.5/src/components/Studios/StudioList.tsx b/ui/v2.5/src/components/Studios/StudioList.tsx
index 42d8e1341..cff6abd45 100644
--- a/ui/v2.5/src/components/Studios/StudioList.tsx
+++ b/ui/v2.5/src/components/Studios/StudioList.tsx
@@ -1,7 +1,7 @@
 import React, { useCallback, useEffect } from "react";
 import { FormattedMessage, useIntl } from "react-intl";
 import cloneDeep from "lodash-es/cloneDeep";
-import { useHistory, useLocation } from "react-router-dom";
+import { useHistory } from "react-router-dom";
 import Mousetrap from "mousetrap";
 import * as GQL from "src/core/generated-graphql";
 import {
@@ -199,8 +199,6 @@ export const FilteredStudioList = PatchComponent(
   "FilteredStudioList",
   (props: IStudioList) => {
     const intl = useIntl();
-    const history = useHistory();
-    const location = useLocation();
 
     const searchFocus = useFocus();
 
@@ -284,15 +282,6 @@ export const FilteredStudioList = PatchComponent(
       result,
     });
 
-    function onCreateNew() {
-      let queryParam = new URLSearchParams(location.search).get("q");
-      let newPath = "/studios/new";
-      if (queryParam) {
-        newPath += "?q=" + encodeURIComponent(queryParam);
-      }
-      history.push(newPath);
-    }
-
     const viewRandom = useViewRandom(filter, totalCount);
 
     function onExport(all: boolean) {
@@ -378,8 +367,6 @@ export const FilteredStudioList = PatchComponent(
         operations={otherOperations}
         onEdit={onEdit}
         onDelete={onDelete}
-        onCreateNew={onCreateNew}
-        entityType={intl.formatMessage({ id: "studio" })}
         operationsMenuClassName="studio-list-operations-dropdown"
       />
     );
diff --git a/ui/v2.5/src/components/Tags/TagDetails/TagGroupsPanel.tsx b/ui/v2.5/src/components/Tags/TagDetails/TagGroupsPanel.tsx
index 363efadde..89636f5d3 100644
--- a/ui/v2.5/src/components/Tags/TagDetails/TagGroupsPanel.tsx
+++ b/ui/v2.5/src/components/Tags/TagDetails/TagGroupsPanel.tsx
@@ -1,7 +1,8 @@
 import React from "react";
 import * as GQL from "src/core/generated-graphql";
 import { useTagFilterHook } from "src/core/tags";
-import { GroupList } from "src/components/Groups/GroupList";
+import { FilteredGroupList } from "src/components/Groups/GroupList";
+import { View } from "src/components/List/views";
 
 export const TagGroupsPanel: React.FC<{
   active: boolean;
@@ -9,5 +10,11 @@ export const TagGroupsPanel: React.FC<{
   showSubTagContent?: boolean;
 }> = ({ active, tag, showSubTagContent }) => {
   const filterHook = useTagFilterHook(tag, showSubTagContent);
-  return <GroupList filterHook={filterHook} alterQuery={active} />;
+  return (
+    <FilteredGroupList
+      filterHook={filterHook}
+      alterQuery={active}
+      view={View.TagGroups}
+    />
+  );
 };

From adaadee368320897656cb1e2b2df01a0cb53c549 Mon Sep 17 00:00:00 2001
From: Gykes <24581046+Gykes@users.noreply.github.com>
Date: Mon, 16 Feb 2026 20:44:03 -0600
Subject: [PATCH 296/405] FR: Change Career Length to Career Start and Career
 End (#6449)

Co-authored-by: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
---
 gqlgen.yml                                    |   4 +
 graphql/schema/types/filters.graphql          |   7 +-
 graphql/schema/types/performer.graphql        |  16 +-
 .../schema/types/scraped-performer.graphql    |   8 +-
 internal/api/resolver_model_performer.go      |  10 +
 internal/api/resolver_mutation_performer.go   |  46 ++++-
 pkg/models/jsonschema/performer.go            |   4 +-
 pkg/models/model_performer.go                 |   6 +-
 pkg/models/model_scraped_item.go              |  27 ++-
 pkg/models/model_scraped_item_test.go         |  17 +-
 pkg/models/performer.go                       |  10 +-
 pkg/performer/export.go                       |   8 +-
 pkg/performer/export_test.go                  |   9 +-
 pkg/performer/import.go                       |  25 ++-
 pkg/performer/import_test.go                  |  83 +++++++++
 pkg/scraper/mapped_result.go                  |   2 +
 pkg/scraper/performer.go                      |   2 +
 pkg/scraper/postprocessing.go                 |  14 ++
 pkg/sqlite/database.go                        |   2 +-
 .../78_performer_career_dates.up.sql          |   2 +
 pkg/sqlite/migrations/78_postmigrate.go       | 143 ++++++++++++++
 pkg/sqlite/performer.go                       |  15 +-
 pkg/sqlite/performer_filter.go                |  69 ++++++-
 pkg/sqlite/performer_test.go                  | 176 +++++++++++++++---
 pkg/sqlite/setup_test.go                      |  23 ++-
 pkg/stashbox/performer.go                     |  25 ++-
 pkg/utils/date.go                             |  79 ++++++++
 pkg/utils/date_test.go                        |  65 +++++++
 ui/v2.5/graphql/data/performer-slim.graphql   |   3 +-
 ui/v2.5/graphql/data/performer.graphql        |   3 +-
 ui/v2.5/graphql/data/scrapers.graphql         |   6 +-
 .../Performers/EditPerformersDialog.tsx       |  14 +-
 .../PerformerDetailsPanel.tsx                 |   6 +-
 .../PerformerDetails/PerformerEditPanel.tsx   |  16 +-
 .../PerformerScrapeDialog.tsx                 |  37 ++--
 .../components/Performers/PerformerList.tsx   |   8 +
 .../Performers/PerformerListTable.tsx         |   3 +-
 .../Performers/PerformerMergeDialog.tsx       |  49 +++--
 ui/v2.5/src/components/Performers/styles.scss |   3 +-
 .../Shared/ScrapeDialog/ScrapeDialogRow.tsx   |  64 +++++++
 .../src/components/Tagger/PerformerModal.tsx  |   6 +-
 ui/v2.5/src/components/Tagger/constants.ts    |   3 +-
 ui/v2.5/src/core/performers.ts                |   5 +-
 ui/v2.5/src/locales/en-GB.json                |   2 +
 .../models/list-filter/criteria/is-missing.ts |   3 +-
 ui/v2.5/src/models/list-filter/performers.ts  |   6 +-
 ui/v2.5/src/models/list-filter/types.ts       |   2 +
 47 files changed, 1004 insertions(+), 132 deletions(-)
 create mode 100644 pkg/sqlite/migrations/78_performer_career_dates.up.sql
 create mode 100644 pkg/sqlite/migrations/78_postmigrate.go

diff --git a/gqlgen.yml b/gqlgen.yml
index b949d44dc..4a3d73d51 100644
--- a/gqlgen.yml
+++ b/gqlgen.yml
@@ -140,4 +140,8 @@ models:
     fields:
       plugins:
         resolver: true
+  Performer:
+    fields:
+      career_length:
+        resolver: true
   
diff --git a/graphql/schema/types/filters.graphql b/graphql/schema/types/filters.graphql
index d1fd77006..81f91f22a 100644
--- a/graphql/schema/types/filters.graphql
+++ b/graphql/schema/types/filters.graphql
@@ -154,8 +154,13 @@ input PerformerFilterType {
   penis_length: FloatCriterionInput
   "Filter by ciricumcision"
   circumcised: CircumcisionCriterionInput
-  "Filter by career length"
+  "Deprecated: use career_start and career_end. This filter is non-functional."
   career_length: StringCriterionInput
+    @deprecated(reason: "Use career_start and career_end")
+  "Filter by career start year"
+  career_start: IntCriterionInput
+  "Filter by career end year"
+  career_end: IntCriterionInput
   "Filter by tattoos"
   tattoos: StringCriterionInput
   "Filter by piercings"
diff --git a/graphql/schema/types/performer.graphql b/graphql/schema/types/performer.graphql
index 7275d4495..97a80b94f 100644
--- a/graphql/schema/types/performer.graphql
+++ b/graphql/schema/types/performer.graphql
@@ -30,7 +30,9 @@ type Performer {
   fake_tits: String
   penis_length: Float
   circumcised: CircumisedEnum
-  career_length: String
+  career_length: String @deprecated(reason: "Use career_start and career_end")
+  career_start: Int
+  career_end: Int
   tattoos: String
   piercings: String
   alias_list: [String!]!
@@ -77,7 +79,9 @@ input PerformerCreateInput {
   fake_tits: String
   penis_length: Float
   circumcised: CircumisedEnum
-  career_length: String
+  career_length: String @deprecated(reason: "Use career_start and career_end")
+  career_start: Int
+  career_end: Int
   tattoos: String
   piercings: String
   "Duplicate aliases and those equal to name will be ignored (case-insensitive)"
@@ -116,7 +120,9 @@ input PerformerUpdateInput {
   fake_tits: String
   penis_length: Float
   circumcised: CircumisedEnum
-  career_length: String
+  career_length: String @deprecated(reason: "Use career_start and career_end")
+  career_start: Int
+  career_end: Int
   tattoos: String
   piercings: String
   "Duplicate aliases and those equal to name will be ignored (case-insensitive)"
@@ -160,7 +166,9 @@ input BulkPerformerUpdateInput {
   fake_tits: String
   penis_length: Float
   circumcised: CircumisedEnum
-  career_length: String
+  career_length: String @deprecated(reason: "Use career_start and career_end")
+  career_start: Int
+  career_end: Int
   tattoos: String
   piercings: String
   "Duplicate aliases and those equal to name will result in an error (case-insensitive)"
diff --git a/graphql/schema/types/scraped-performer.graphql b/graphql/schema/types/scraped-performer.graphql
index 487c89516..0818e61c2 100644
--- a/graphql/schema/types/scraped-performer.graphql
+++ b/graphql/schema/types/scraped-performer.graphql
@@ -18,7 +18,9 @@ type ScrapedPerformer {
   fake_tits: String
   penis_length: String
   circumcised: String
-  career_length: String
+  career_length: String @deprecated(reason: "Use career_start and career_end")
+  career_start: Int
+  career_end: Int
   tattoos: String
   piercings: String
   # aliases must be comma-delimited to be parsed correctly
@@ -54,7 +56,9 @@ input ScrapedPerformerInput {
   fake_tits: String
   penis_length: String
   circumcised: String
-  career_length: String
+  career_length: String @deprecated(reason: "Use career_start and career_end")
+  career_start: Int
+  career_end: Int
   tattoos: String
   piercings: String
   aliases: String
diff --git a/internal/api/resolver_model_performer.go b/internal/api/resolver_model_performer.go
index 94da62932..b770f5801 100644
--- a/internal/api/resolver_model_performer.go
+++ b/internal/api/resolver_model_performer.go
@@ -10,6 +10,7 @@ import (
 	"github.com/stashapp/stash/pkg/image"
 	"github.com/stashapp/stash/pkg/models"
 	"github.com/stashapp/stash/pkg/performer"
+	"github.com/stashapp/stash/pkg/utils"
 )
 
 func (r *performerResolver) AliasList(ctx context.Context, obj *models.Performer) ([]string, error) {
@@ -109,6 +110,15 @@ func (r *performerResolver) HeightCm(ctx context.Context, obj *models.Performer)
 	return obj.Height, nil
 }
 
+func (r *performerResolver) CareerLength(ctx context.Context, obj *models.Performer) (*string, error) {
+	if obj.CareerStart == nil && obj.CareerEnd == nil {
+		return nil, nil
+	}
+
+	ret := utils.FormatYearRange(obj.CareerStart, obj.CareerEnd)
+	return &ret, nil
+}
+
 func (r *performerResolver) Birthdate(ctx context.Context, obj *models.Performer) (*string, error) {
 	if obj.Birthdate != nil {
 		ret := obj.Birthdate.String()
diff --git a/internal/api/resolver_mutation_performer.go b/internal/api/resolver_mutation_performer.go
index fd18ecb95..653348304 100644
--- a/internal/api/resolver_mutation_performer.go
+++ b/internal/api/resolver_mutation_performer.go
@@ -52,7 +52,17 @@ func (r *mutationResolver) PerformerCreate(ctx context.Context, input models.Per
 	newPerformer.FakeTits = translator.string(input.FakeTits)
 	newPerformer.PenisLength = input.PenisLength
 	newPerformer.Circumcised = input.Circumcised
-	newPerformer.CareerLength = translator.string(input.CareerLength)
+	newPerformer.CareerStart = input.CareerStart
+	newPerformer.CareerEnd = input.CareerEnd
+	// if career_start/career_end not provided, parse deprecated career_length
+	if newPerformer.CareerStart == nil && newPerformer.CareerEnd == nil && input.CareerLength != nil {
+		start, end, err := utils.ParseYearRangeString(*input.CareerLength)
+		if err != nil {
+			return nil, fmt.Errorf("could not parse career_length %q: %w", *input.CareerLength, err)
+		}
+		newPerformer.CareerStart = start
+		newPerformer.CareerEnd = end
+	}
 	newPerformer.Tattoos = translator.string(input.Tattoos)
 	newPerformer.Piercings = translator.string(input.Piercings)
 	newPerformer.Favorite = translator.bool(input.Favorite)
@@ -261,7 +271,22 @@ func performerPartialFromInput(input models.PerformerUpdateInput, translator cha
 	updatedPerformer.FakeTits = translator.optionalString(input.FakeTits, "fake_tits")
 	updatedPerformer.PenisLength = translator.optionalFloat64(input.PenisLength, "penis_length")
 	updatedPerformer.Circumcised = translator.optionalString((*string)(input.Circumcised), "circumcised")
-	updatedPerformer.CareerLength = translator.optionalString(input.CareerLength, "career_length")
+	// prefer career_start/career_end over deprecated career_length
+	if translator.hasField("career_start") || translator.hasField("career_end") {
+		updatedPerformer.CareerStart = translator.optionalInt(input.CareerStart, "career_start")
+		updatedPerformer.CareerEnd = translator.optionalInt(input.CareerEnd, "career_end")
+	} else if translator.hasField("career_length") && input.CareerLength != nil {
+		start, end, err := utils.ParseYearRangeString(*input.CareerLength)
+		if err != nil {
+			return nil, fmt.Errorf("could not parse career_length %q: %w", *input.CareerLength, err)
+		}
+		if start != nil {
+			updatedPerformer.CareerStart = models.NewOptionalInt(*start)
+		}
+		if end != nil {
+			updatedPerformer.CareerEnd = models.NewOptionalInt(*end)
+		}
+	}
 	updatedPerformer.Tattoos = translator.optionalString(input.Tattoos, "tattoos")
 	updatedPerformer.Piercings = translator.optionalString(input.Piercings, "piercings")
 	updatedPerformer.Favorite = translator.optionalBool(input.Favorite, "favorite")
@@ -417,7 +442,22 @@ func (r *mutationResolver) BulkPerformerUpdate(ctx context.Context, input BulkPe
 	updatedPerformer.FakeTits = translator.optionalString(input.FakeTits, "fake_tits")
 	updatedPerformer.PenisLength = translator.optionalFloat64(input.PenisLength, "penis_length")
 	updatedPerformer.Circumcised = translator.optionalString((*string)(input.Circumcised), "circumcised")
-	updatedPerformer.CareerLength = translator.optionalString(input.CareerLength, "career_length")
+	// prefer career_start/career_end over deprecated career_length
+	if translator.hasField("career_start") || translator.hasField("career_end") {
+		updatedPerformer.CareerStart = translator.optionalInt(input.CareerStart, "career_start")
+		updatedPerformer.CareerEnd = translator.optionalInt(input.CareerEnd, "career_end")
+	} else if translator.hasField("career_length") && input.CareerLength != nil {
+		start, end, err := utils.ParseYearRangeString(*input.CareerLength)
+		if err != nil {
+			return nil, fmt.Errorf("could not parse career_length %q: %w", *input.CareerLength, err)
+		}
+		if start != nil {
+			updatedPerformer.CareerStart = models.NewOptionalInt(*start)
+		}
+		if end != nil {
+			updatedPerformer.CareerEnd = models.NewOptionalInt(*end)
+		}
+	}
 	updatedPerformer.Tattoos = translator.optionalString(input.Tattoos, "tattoos")
 	updatedPerformer.Piercings = translator.optionalString(input.Piercings, "piercings")
 
diff --git a/pkg/models/jsonschema/performer.go b/pkg/models/jsonschema/performer.go
index 5edd5724c..b738fbfac 100644
--- a/pkg/models/jsonschema/performer.go
+++ b/pkg/models/jsonschema/performer.go
@@ -48,7 +48,9 @@ type Performer struct {
 	FakeTits      string             `json:"fake_tits,omitempty"`
 	PenisLength   float64            `json:"penis_length,omitempty"`
 	Circumcised   string             `json:"circumcised,omitempty"`
-	CareerLength  string             `json:"career_length,omitempty"`
+	CareerLength  string             `json:"career_length,omitempty"` // deprecated - for import only
+	CareerStart   *int               `json:"career_start,omitempty"`
+	CareerEnd     *int               `json:"career_end,omitempty"`
 	Tattoos       string             `json:"tattoos,omitempty"`
 	Piercings     string             `json:"piercings,omitempty"`
 	Aliases       StringOrStringList `json:"aliases,omitempty"`
diff --git a/pkg/models/model_performer.go b/pkg/models/model_performer.go
index 566dcae1e..a30eafa0a 100644
--- a/pkg/models/model_performer.go
+++ b/pkg/models/model_performer.go
@@ -19,7 +19,8 @@ type Performer struct {
 	FakeTits       string          `json:"fake_tits"`
 	PenisLength    *float64        `json:"penis_length"`
 	Circumcised    *CircumisedEnum `json:"circumcised"`
-	CareerLength   string          `json:"career_length"`
+	CareerStart    *int            `json:"career_start"`
+	CareerEnd      *int            `json:"career_end"`
 	Tattoos        string          `json:"tattoos"`
 	Piercings      string          `json:"piercings"`
 	Favorite       bool            `json:"favorite"`
@@ -75,7 +76,8 @@ type PerformerPartial struct {
 	FakeTits       OptionalString
 	PenisLength    OptionalFloat64
 	Circumcised    OptionalString
-	CareerLength   OptionalString
+	CareerStart    OptionalInt
+	CareerEnd      OptionalInt
 	Tattoos        OptionalString
 	Piercings      OptionalString
 	Favorite       OptionalBool
diff --git a/pkg/models/model_scraped_item.go b/pkg/models/model_scraped_item.go
index bd6db10c8..3c0e083c1 100644
--- a/pkg/models/model_scraped_item.go
+++ b/pkg/models/model_scraped_item.go
@@ -176,7 +176,9 @@ type ScrapedPerformer struct {
 	FakeTits       *string       `json:"fake_tits"`
 	PenisLength    *string       `json:"penis_length"`
 	Circumcised    *string       `json:"circumcised"`
-	CareerLength   *string       `json:"career_length"`
+	CareerLength   *string       `json:"career_length"` // deprecated: use CareerStart/CareerEnd
+	CareerStart    *int          `json:"career_start"`
+	CareerEnd      *int          `json:"career_end"`
 	Tattoos        *string       `json:"tattoos"`
 	Piercings      *string       `json:"piercings"`
 	Aliases        *string       `json:"aliases"`
@@ -219,8 +221,16 @@ func (p *ScrapedPerformer) ToPerformer(endpoint string, excluded map[string]bool
 			ret.DeathDate = &date
 		}
 	}
-	if p.CareerLength != nil && !excluded["career_length"] {
-		ret.CareerLength = *p.CareerLength
+
+	// assume that career length is _not_ populated in favour of start/end
+
+	if p.CareerStart != nil && !excluded["career_start"] {
+		cs := *p.CareerStart
+		ret.CareerStart = &cs
+	}
+	if p.CareerEnd != nil && !excluded["career_end"] {
+		ce := *p.CareerEnd
+		ret.CareerEnd = &ce
 	}
 	if p.Country != nil && !excluded["country"] {
 		ret.Country = *p.Country
@@ -356,7 +366,16 @@ func (p *ScrapedPerformer) ToPartial(endpoint string, excluded map[string]bool,
 		}
 	}
 	if p.CareerLength != nil && !excluded["career_length"] {
-		ret.CareerLength = NewOptionalString(*p.CareerLength)
+		// parse career_length into career_start/career_end
+		start, end, err := utils.ParseYearRangeString(*p.CareerLength)
+		if err == nil {
+			if start != nil {
+				ret.CareerStart = NewOptionalInt(*start)
+			}
+			if end != nil {
+				ret.CareerEnd = NewOptionalInt(*end)
+			}
+		}
 	}
 	if p.Country != nil && !excluded["country"] {
 		ret.Country = NewOptionalString(*p.Country)
diff --git a/pkg/models/model_scraped_item_test.go b/pkg/models/model_scraped_item_test.go
index 545543652..09d8fbb32 100644
--- a/pkg/models/model_scraped_item_test.go
+++ b/pkg/models/model_scraped_item_test.go
@@ -8,6 +8,8 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
+func intPtr(i int) *int { return &i }
+
 func Test_scrapedToStudioInput(t *testing.T) {
 	const name = "name"
 	url := "url"
@@ -124,9 +126,10 @@ func Test_scrapedToPerformerInput(t *testing.T) {
 	endpoint := "endpoint"
 	remoteSiteID := "remoteSiteID"
 
-	var stringValues []string
-	for i := 0; i < 20; i++ {
-		stringValues = append(stringValues, strconv.Itoa(i))
+	const nValues = 19
+	stringValues := make([]string, nValues)
+	for i := 0; i < nValues; i++ {
+		stringValues[i] = strconv.Itoa(i)
 	}
 
 	upTo := 0
@@ -183,7 +186,8 @@ func Test_scrapedToPerformerInput(t *testing.T) {
 				Weight:         nextVal(),
 				Measurements:   nextVal(),
 				FakeTits:       nextVal(),
-				CareerLength:   nextVal(),
+				CareerStart:    intPtr(2005),
+				CareerEnd:      intPtr(2015),
 				Tattoos:        nextVal(),
 				Piercings:      nextVal(),
 				Aliases:        nextVal(),
@@ -208,8 +212,9 @@ func Test_scrapedToPerformerInput(t *testing.T) {
 				Weight:         nextIntVal(),
 				Measurements:   *nextVal(),
 				FakeTits:       *nextVal(),
-				CareerLength:   *nextVal(),
-				Tattoos:        *nextVal(),
+				CareerStart:    intPtr(2005),
+				CareerEnd:      intPtr(2015),
+				Tattoos:        *nextVal(), // skip CareerLength counter slot
 				Piercings:      *nextVal(),
 				Aliases:        NewRelatedStrings([]string{*nextVal()}),
 				URLs:           NewRelatedStrings([]string{*nextVal(), *nextVal(), *nextVal()}),
diff --git a/pkg/models/performer.go b/pkg/models/performer.go
index 63a08b30c..e4fb8dd98 100644
--- a/pkg/models/performer.go
+++ b/pkg/models/performer.go
@@ -137,7 +137,11 @@ type PerformerFilterType struct {
 	// Filter by circumcision
 	Circumcised *CircumcisionCriterionInput `json:"circumcised"`
 	// Filter by career length
-	CareerLength *StringCriterionInput `json:"career_length"`
+	CareerLength *StringCriterionInput `json:"career_length"` // deprecated
+	// Filter by career start year
+	CareerStart *IntCriterionInput `json:"career_start"`
+	// Filter by career end year
+	CareerEnd *IntCriterionInput `json:"career_end"`
 	// Filter by tattoos
 	Tattoos *StringCriterionInput `json:"tattoos"`
 	// Filter by piercings
@@ -224,6 +228,8 @@ type PerformerCreateInput struct {
 	PenisLength    *float64        `json:"penis_length"`
 	Circumcised    *CircumisedEnum `json:"circumcised"`
 	CareerLength   *string         `json:"career_length"`
+	CareerStart    *int            `json:"career_start"`
+	CareerEnd      *int            `json:"career_end"`
 	Tattoos        *string         `json:"tattoos"`
 	Piercings      *string         `json:"piercings"`
 	Aliases        *string         `json:"aliases"`
@@ -263,6 +269,8 @@ type PerformerUpdateInput struct {
 	PenisLength    *float64        `json:"penis_length"`
 	Circumcised    *CircumisedEnum `json:"circumcised"`
 	CareerLength   *string         `json:"career_length"`
+	CareerStart    *int            `json:"career_start"`
+	CareerEnd      *int            `json:"career_end"`
 	Tattoos        *string         `json:"tattoos"`
 	Piercings      *string         `json:"piercings"`
 	Aliases        *string         `json:"aliases"`
diff --git a/pkg/performer/export.go b/pkg/performer/export.go
index 1455fb7bf..691175b1f 100644
--- a/pkg/performer/export.go
+++ b/pkg/performer/export.go
@@ -30,7 +30,6 @@ func ToJSON(ctx context.Context, reader ImageAliasStashIDGetter, performer *mode
 		EyeColor:       performer.EyeColor,
 		Measurements:   performer.Measurements,
 		FakeTits:       performer.FakeTits,
-		CareerLength:   performer.CareerLength,
 		Tattoos:        performer.Tattoos,
 		Piercings:      performer.Piercings,
 		Favorite:       performer.Favorite,
@@ -71,6 +70,13 @@ func ToJSON(ctx context.Context, reader ImageAliasStashIDGetter, performer *mode
 		newPerformerJSON.PenisLength = *performer.PenisLength
 	}
 
+	if performer.CareerStart != nil {
+		newPerformerJSON.CareerStart = performer.CareerStart
+	}
+	if performer.CareerEnd != nil {
+		newPerformerJSON.CareerEnd = performer.CareerEnd
+	}
+
 	if err := performer.LoadAliases(ctx, reader); err != nil {
 		return nil, fmt.Errorf("loading performer aliases: %w", err)
 	}
diff --git a/pkg/performer/export_test.go b/pkg/performer/export_test.go
index e51049e14..1a87bc2b1 100644
--- a/pkg/performer/export_test.go
+++ b/pkg/performer/export_test.go
@@ -26,7 +26,6 @@ const (
 	performerName  = "testPerformer"
 	disambiguation = "disambiguation"
 	url            = "url"
-	careerLength   = "careerLength"
 	country        = "country"
 	ethnicity      = "ethnicity"
 	eyeColor       = "eyeColor"
@@ -49,6 +48,8 @@ var (
 	rating          = 5
 	height          = 123
 	weight          = 60
+	careerStart     = 2005
+	careerEnd       = 2015
 	penisLength     = 1.23
 	circumcisedEnum = models.CircumisedEnumCut
 	circumcised     = circumcisedEnum.String()
@@ -87,7 +88,8 @@ func createFullPerformer(id int, name string) *models.Performer {
 		URLs:           models.NewRelatedStrings([]string{url, twitter, instagram}),
 		Aliases:        models.NewRelatedStrings(aliases),
 		Birthdate:      &birthDate,
-		CareerLength:   careerLength,
+		CareerStart:    &careerStart,
+		CareerEnd:      &careerEnd,
 		Country:        country,
 		Ethnicity:      ethnicity,
 		EyeColor:       eyeColor,
@@ -132,7 +134,8 @@ func createFullJSONPerformer(name string, image string, withCustomFields bool) *
 		URLs:           []string{url, twitter, instagram},
 		Aliases:        aliases,
 		Birthdate:      birthDate.String(),
-		CareerLength:   careerLength,
+		CareerStart:    &careerStart,
+		CareerEnd:      &careerEnd,
 		Country:        country,
 		Ethnicity:      ethnicity,
 		EyeColor:       eyeColor,
diff --git a/pkg/performer/import.go b/pkg/performer/import.go
index a8e3f7a7a..1df69521a 100644
--- a/pkg/performer/import.go
+++ b/pkg/performer/import.go
@@ -32,14 +32,17 @@ type Importer struct {
 }
 
 func (i *Importer) PreImport(ctx context.Context) error {
-	i.performer = performerJSONToPerformer(i.Input)
+	var err error
+	i.performer, err = performerJSONToPerformer(i.Input)
+	if err != nil {
+		return err
+	}
 	i.customFields = i.Input.CustomFields
 
 	if err := i.populateTags(ctx); err != nil {
 		return err
 	}
 
-	var err error
 	if len(i.Input.Image) > 0 {
 		i.imageData, err = utils.ProcessBase64Image(i.Input.Image)
 		if err != nil {
@@ -196,7 +199,7 @@ func (i *Importer) Update(ctx context.Context, id int) error {
 	return nil
 }
 
-func performerJSONToPerformer(performerJSON jsonschema.Performer) models.Performer {
+func performerJSONToPerformer(performerJSON jsonschema.Performer) (models.Performer, error) {
 	newPerformer := models.Performer{
 		Name:           performerJSON.Name,
 		Disambiguation: performerJSON.Disambiguation,
@@ -205,7 +208,6 @@ func performerJSONToPerformer(performerJSON jsonschema.Performer) models.Perform
 		EyeColor:       performerJSON.EyeColor,
 		Measurements:   performerJSON.Measurements,
 		FakeTits:       performerJSON.FakeTits,
-		CareerLength:   performerJSON.CareerLength,
 		Tattoos:        performerJSON.Tattoos,
 		Piercings:      performerJSON.Piercings,
 		Aliases:        models.NewRelatedStrings(performerJSON.Aliases),
@@ -282,5 +284,18 @@ func performerJSONToPerformer(performerJSON jsonschema.Performer) models.Perform
 		}
 	}
 
-	return newPerformer
+	// prefer explicit career_start/career_end, fall back to parsing legacy career_length
+	if performerJSON.CareerStart != nil || performerJSON.CareerEnd != nil {
+		newPerformer.CareerStart = performerJSON.CareerStart
+		newPerformer.CareerEnd = performerJSON.CareerEnd
+	} else if performerJSON.CareerLength != "" {
+		start, end, err := utils.ParseYearRangeString(performerJSON.CareerLength)
+		if err != nil {
+			return models.Performer{}, fmt.Errorf("invalid career_length %q: %w", performerJSON.CareerLength, err)
+		}
+		newPerformer.CareerStart = start
+		newPerformer.CareerEnd = end
+	}
+
+	return newPerformer, nil
 }
diff --git a/pkg/performer/import_test.go b/pkg/performer/import_test.go
index 455a6e7a3..ca28c1990 100644
--- a/pkg/performer/import_test.go
+++ b/pkg/performer/import_test.go
@@ -315,3 +315,86 @@ func TestUpdate(t *testing.T) {
 
 	db.AssertExpectations(t)
 }
+
+func TestImportCareerFields(t *testing.T) {
+	startYear := 2005
+	endYear := 2015
+
+	// explicit career_start/career_end should be used directly
+	t.Run("explicit fields", func(t *testing.T) {
+		input := jsonschema.Performer{
+			Name:        "test",
+			CareerStart: &startYear,
+			CareerEnd:   &endYear,
+		}
+
+		p, err := performerJSONToPerformer(input)
+		assert.Nil(t, err)
+		assert.Equal(t, &startYear, p.CareerStart)
+		assert.Equal(t, &endYear, p.CareerEnd)
+	})
+
+	// explicit fields take priority over legacy career_length
+	t.Run("explicit fields override legacy", func(t *testing.T) {
+		input := jsonschema.Performer{
+			Name:         "test",
+			CareerStart:  &startYear,
+			CareerEnd:    &endYear,
+			CareerLength: "1990 - 1995",
+		}
+
+		p, err := performerJSONToPerformer(input)
+		assert.Nil(t, err)
+		assert.Equal(t, &startYear, p.CareerStart)
+		assert.Equal(t, &endYear, p.CareerEnd)
+	})
+
+	// legacy career_length should be parsed when explicit fields are absent
+	t.Run("legacy career_length fallback", func(t *testing.T) {
+		input := jsonschema.Performer{
+			Name:         "test",
+			CareerLength: "2005 - 2015",
+		}
+
+		p, err := performerJSONToPerformer(input)
+		assert.Nil(t, err)
+		assert.Equal(t, &startYear, p.CareerStart)
+		assert.Equal(t, &endYear, p.CareerEnd)
+	})
+
+	// legacy career_length with only start year
+	t.Run("legacy career_length start only", func(t *testing.T) {
+		input := jsonschema.Performer{
+			Name:         "test",
+			CareerLength: "2005 -",
+		}
+
+		p, err := performerJSONToPerformer(input)
+		assert.Nil(t, err)
+		assert.Equal(t, &startYear, p.CareerStart)
+		assert.Nil(t, p.CareerEnd)
+	})
+
+	// unparseable career_length should return an error
+	t.Run("legacy career_length unparseable", func(t *testing.T) {
+		input := jsonschema.Performer{
+			Name:         "test",
+			CareerLength: "not a year range",
+		}
+
+		_, err := performerJSONToPerformer(input)
+		assert.NotNil(t, err)
+	})
+
+	// no career fields at all
+	t.Run("no career fields", func(t *testing.T) {
+		input := jsonschema.Performer{
+			Name: "test",
+		}
+
+		p, err := performerJSONToPerformer(input)
+		assert.Nil(t, err)
+		assert.Nil(t, p.CareerStart)
+		assert.Nil(t, p.CareerEnd)
+	})
+}
diff --git a/pkg/scraper/mapped_result.go b/pkg/scraper/mapped_result.go
index eb06a4eba..1260f3082 100644
--- a/pkg/scraper/mapped_result.go
+++ b/pkg/scraper/mapped_result.go
@@ -140,6 +140,8 @@ func (r mappedResult) scrapedPerformer() *models.ScrapedPerformer {
 		PenisLength:    r.stringPtr("PenisLength"),
 		Circumcised:    r.stringPtr("Circumcised"),
 		CareerLength:   r.stringPtr("CareerLength"),
+		CareerStart:    r.IntPtr("CareerStart"),
+		CareerEnd:      r.IntPtr("CareerEnd"),
 		Tattoos:        r.stringPtr("Tattoos"),
 		Piercings:      r.stringPtr("Piercings"),
 		Aliases:        r.stringPtr("Aliases"),
diff --git a/pkg/scraper/performer.go b/pkg/scraper/performer.go
index 98e931762..4684a6683 100644
--- a/pkg/scraper/performer.go
+++ b/pkg/scraper/performer.go
@@ -20,6 +20,8 @@ type ScrapedPerformerInput struct {
 	PenisLength    *string  `json:"penis_length"`
 	Circumcised    *string  `json:"circumcised"`
 	CareerLength   *string  `json:"career_length"`
+	CareerStart    *int     `json:"career_start"`
+	CareerEnd      *int     `json:"career_end"`
 	Tattoos        *string  `json:"tattoos"`
 	Piercings      *string  `json:"piercings"`
 	Aliases        *string  `json:"aliases"`
diff --git a/pkg/scraper/postprocessing.go b/pkg/scraper/postprocessing.go
index c2653743a..8a4d4de7d 100644
--- a/pkg/scraper/postprocessing.go
+++ b/pkg/scraper/postprocessing.go
@@ -125,6 +125,20 @@ func (c *postScraper) postScrapePerformer(ctx context.Context, p models.ScrapedP
 		}
 	}
 
+	isEmptyStr := func(s *string) bool { return s == nil || *s == "" }
+	isEmptyInt := func(s *int) bool { return s == nil || *s == 0 }
+
+	// populate career start/end from career length and vice versa
+	if !isEmptyStr(p.CareerLength) && isEmptyInt(p.CareerStart) && isEmptyInt(p.CareerEnd) {
+		p.CareerStart, p.CareerEnd, err = utils.ParseYearRangeString(*p.CareerLength)
+		if err != nil {
+			logger.Warnf("Could not parse career length %s: %v", *p.CareerLength, err)
+		}
+	} else if isEmptyStr(p.CareerLength) && (!isEmptyInt(p.CareerStart) || !isEmptyInt(p.CareerEnd)) {
+		v := utils.FormatYearRange(p.CareerStart, p.CareerEnd)
+		p.CareerLength = &v
+	}
+
 	return p, nil
 }
 
diff --git a/pkg/sqlite/database.go b/pkg/sqlite/database.go
index 51889ff20..197602ecd 100644
--- a/pkg/sqlite/database.go
+++ b/pkg/sqlite/database.go
@@ -34,7 +34,7 @@ const (
 	cacheSizeEnv = "STASH_SQLITE_CACHE_SIZE"
 )
 
-var appSchemaVersion uint = 77
+var appSchemaVersion uint = 78
 
 //go:embed migrations/*.sql
 var migrationsBox embed.FS
diff --git a/pkg/sqlite/migrations/78_performer_career_dates.up.sql b/pkg/sqlite/migrations/78_performer_career_dates.up.sql
new file mode 100644
index 000000000..006d9fae7
--- /dev/null
+++ b/pkg/sqlite/migrations/78_performer_career_dates.up.sql
@@ -0,0 +1,2 @@
+ALTER TABLE "performers" ADD COLUMN "career_start" integer;
+ALTER TABLE "performers" ADD COLUMN "career_end" integer;
diff --git a/pkg/sqlite/migrations/78_postmigrate.go b/pkg/sqlite/migrations/78_postmigrate.go
new file mode 100644
index 000000000..15d040457
--- /dev/null
+++ b/pkg/sqlite/migrations/78_postmigrate.go
@@ -0,0 +1,143 @@
+package migrations
+
+import (
+	"context"
+	"database/sql"
+	"fmt"
+
+	"github.com/jmoiron/sqlx"
+	"github.com/stashapp/stash/pkg/logger"
+	"github.com/stashapp/stash/pkg/sqlite"
+	"github.com/stashapp/stash/pkg/utils"
+)
+
+type schema78Migrator struct {
+	migrator
+}
+
+func post78(ctx context.Context, db *sqlx.DB) error {
+	logger.Info("Running post-migration for schema version 78")
+
+	m := schema78Migrator{
+		migrator: migrator{
+			db: db,
+		},
+	}
+
+	if err := m.migrateCareerLength(ctx); err != nil {
+		return fmt.Errorf("migrating career_length: %w", err)
+	}
+
+	if err := m.dropCareerLength(); err != nil {
+		return fmt.Errorf("dropping career_length column: %w", err)
+	}
+
+	return nil
+}
+
+func (m *schema78Migrator) migrateCareerLength(ctx context.Context) error {
+	logger.Info("Migrating career_length to career_start/career_end")
+
+	const limit = 1000
+
+	lastID := 0
+	parsed := 0
+	unparseable := 0
+
+	for {
+		gotSome := false
+
+		if err := m.withTxn(ctx, func(tx *sqlx.Tx) error {
+			query := `SELECT id, career_length FROM performers
+				WHERE career_length IS NOT NULL AND career_length != ''`
+
+			if lastID != 0 {
+				query += fmt.Sprintf(" AND id > %d", lastID)
+			}
+
+			query += fmt.Sprintf(" ORDER BY id LIMIT %d", limit)
+
+			rows, err := tx.Query(query)
+			if err != nil {
+				return err
+			}
+			defer rows.Close()
+
+			for rows.Next() {
+				var (
+					id           int
+					careerLength string
+				)
+
+				if err := rows.Scan(&id, &careerLength); err != nil {
+					return err
+				}
+
+				lastID = id
+				gotSome = true
+
+				start, end, err := utils.ParseYearRangeString(careerLength)
+				if err != nil {
+					logger.Warnf("Could not parse career_length %q for performer %d: %v — preserving as custom field", careerLength, id, err)
+
+					if err := m.preserveAsCustomField(tx, id, careerLength); err != nil {
+						return fmt.Errorf("preserving career_length for performer %d: %w", id, err)
+					}
+					unparseable++
+					continue
+				}
+
+				if err := m.updateCareerFields(tx, id, start, end); err != nil {
+					return fmt.Errorf("updating career fields for performer %d: %w", id, err)
+				}
+				parsed++
+			}
+
+			return rows.Err()
+		}); err != nil {
+			return err
+		}
+
+		if !gotSome {
+			break
+		}
+	}
+
+	logger.Infof("Career length migration complete: %d parsed, %d unparseable (preserved as custom fields)", parsed, unparseable)
+	return nil
+}
+
+func (m *schema78Migrator) updateCareerFields(tx *sqlx.Tx, id int, start *int, end *int) error {
+	_, err := tx.Exec(
+		"UPDATE performers SET career_start = ?, career_end = ? WHERE id = ?",
+		start, end, id,
+	)
+	return err
+}
+
+func (m *schema78Migrator) preserveAsCustomField(tx *sqlx.Tx, id int, value string) error {
+	// check if a career_length custom field already exists
+	var existing sql.NullString
+	err := tx.Get(&existing, "SELECT value FROM performer_custom_fields WHERE performer_id = ? AND field = 'career_length'", id)
+	if err == nil {
+		logger.Debugf("career_length custom field already exists for performer %d, skipping", id)
+		return nil
+	}
+
+	_, err = tx.Exec(
+		"INSERT INTO performer_custom_fields (performer_id, field, value) VALUES (?, 'career_length', ?)",
+		id, value,
+	)
+	return err
+}
+
+func (m *schema78Migrator) dropCareerLength() error {
+	logger.Info("Dropping career_length column from performers table")
+	return m.execAll([]string{
+		"ALTER TABLE performers DROP COLUMN career_length",
+	})
+}
+
+func init() {
+	sqlite.RegisterPostMigration(78, post78)
+}
diff --git a/pkg/sqlite/performer.go b/pkg/sqlite/performer.go
index bc4461f5f..298a681fd 100644
--- a/pkg/sqlite/performer.go
+++ b/pkg/sqlite/performer.go
@@ -44,7 +44,8 @@ type performerRow struct {
 	FakeTits           zero.String `db:"fake_tits"`
 	PenisLength        null.Float  `db:"penis_length"`
 	Circumcised        zero.String `db:"circumcised"`
-	CareerLength       zero.String `db:"career_length"`
+	CareerStart        null.Int    `db:"career_start"`
+	CareerEnd          null.Int    `db:"career_end"`
 	Tattoos            zero.String `db:"tattoos"`
 	Piercings          zero.String `db:"piercings"`
 	Favorite           bool        `db:"favorite"`
@@ -82,7 +83,8 @@ func (r *performerRow) fromPerformer(o models.Performer) {
 	if o.Circumcised != nil && o.Circumcised.IsValid() {
 		r.Circumcised = zero.StringFrom(o.Circumcised.String())
 	}
-	r.CareerLength = zero.StringFrom(o.CareerLength)
+	r.CareerStart = intFromPtr(o.CareerStart)
+	r.CareerEnd = intFromPtr(o.CareerEnd)
 	r.Tattoos = zero.StringFrom(o.Tattoos)
 	r.Piercings = zero.StringFrom(o.Piercings)
 	r.Favorite = o.Favorite
@@ -110,7 +112,8 @@ func (r *performerRow) resolve() *models.Performer {
 		Measurements:   r.Measurements.String,
 		FakeTits:       r.FakeTits.String,
 		PenisLength:    nullFloatPtr(r.PenisLength),
-		CareerLength:   r.CareerLength.String,
+		CareerStart:    nullIntPtr(r.CareerStart),
+		CareerEnd:      nullIntPtr(r.CareerEnd),
 		Tattoos:        r.Tattoos.String,
 		Piercings:      r.Piercings.String,
 		Favorite:       r.Favorite,
@@ -155,7 +158,8 @@ func (r *performerRowRecord) fromPartial(o models.PerformerPartial) {
 	r.setNullString("fake_tits", o.FakeTits)
 	r.setNullFloat64("penis_length", o.PenisLength)
 	r.setNullString("circumcised", o.Circumcised)
-	r.setNullString("career_length", o.CareerLength)
+	r.setNullInt("career_start", o.CareerStart)
+	r.setNullInt("career_end", o.CareerEnd)
 	r.setNullString("tattoos", o.Tattoos)
 	r.setNullString("piercings", o.Piercings)
 	r.setBool("favorite", o.Favorite)
@@ -776,7 +780,8 @@ func (qb *PerformerStore) sortByScenesDuration(direction string) string {
 
 var performerSortOptions = sortOptions{
 	"birthdate",
-	"career_length",
+	"career_start",
+	"career_end",
 	"created_at",
 	"galleries_count",
 	"height",
diff --git a/pkg/sqlite/performer_filter.go b/pkg/sqlite/performer_filter.go
index 401664e33..5296d5a25 100644
--- a/pkg/sqlite/performer_filter.go
+++ b/pkg/sqlite/performer_filter.go
@@ -47,6 +47,29 @@ func (qb *performerFilterHandler) validate() error {
 		}
 	}
 
+	// if legacy career length filter used, ensure only supported modifiers are used and value is valid
+	if filter.CareerLength != nil {
+		careerLength := filter.CareerLength
+		switch careerLength.Modifier {
+		case models.CriterionModifierEquals:
+			start, end, err := utils.ParseYearRangeString(careerLength.Value)
+			if err != nil {
+				return fmt.Errorf("invalid career length value: %s", careerLength.Value)
+			}
+			// ensure career start/end is not set
+			if start != nil && filter.CareerStart != nil {
+				return fmt.Errorf("cannot use legacy CareerLength filter with CareerStart filter")
+			}
+			if end != nil && filter.CareerEnd != nil {
+				return fmt.Errorf("cannot use legacy CareerLength filter with CareerEnd filter")
+			}
+		case models.CriterionModifierIsNull, models.CriterionModifierNotNull:
+			// valid modifiers, no value parsing needed
+		default:
+			return fmt.Errorf("invalid career length modifier: %s", careerLength.Modifier)
+		}
+	}
+
 	return nil
 }
 
@@ -71,10 +94,13 @@ func (qb *performerFilterHandler) handle(ctx context.Context, f *filterBuilder)
 }
 
 func (qb *performerFilterHandler) criterionHandler() criterionHandler {
-	filter := qb.performerFilter
+	// make a copy of the filter to modify with legacy conversions without affecting original filter used for subfilters
+	filter := *qb.performerFilter
 	const tableName = performerTable
 	heightCmCrit := filter.HeightCm
 
+	convertLegacyCareerLengthFilter(&filter)
+
 	return compoundHandler{
 		stringCriterionHandler(filter.Name, tableName+".name"),
 		stringCriterionHandler(filter.Disambiguation, tableName+".disambiguation"),
@@ -129,7 +155,9 @@ func (qb *performerFilterHandler) criterionHandler() criterionHandler {
 			}
 		}),
 
-		stringCriterionHandler(filter.CareerLength, tableName+".career_length"),
+		// CareerLength filter is deprecated and non-functional (column removed in schema 78)
+		intCriterionHandler(filter.CareerStart, tableName+".career_start", nil),
+		intCriterionHandler(filter.CareerEnd, tableName+".career_end", nil),
 		stringCriterionHandler(filter.Tattoos, tableName+".tattoos"),
 		stringCriterionHandler(filter.Piercings, tableName+".piercings"),
 		intCriterionHandler(filter.Rating100, tableName+".rating", nil),
@@ -221,6 +249,43 @@ func (qb *performerFilterHandler) criterionHandler() criterionHandler {
 	}
 }
 
+func convertLegacyCareerLengthFilter(filter *models.PerformerFilterType) {
+	// convert legacy career length filter to career start/end filters
+	if filter.CareerLength != nil {
+		careerLength := filter.CareerLength
+		switch careerLength.Modifier {
+		case models.CriterionModifierEquals:
+			start, end, _ := utils.ParseYearRangeString(careerLength.Value)
+			if start != nil {
+				filter.CareerStart = &models.IntCriterionInput{
+					Value:    (*start) - 1, // minus one to make it exclusive
+					Modifier: models.CriterionModifierGreaterThan,
+				}
+			}
+			if end != nil {
+				filter.CareerEnd = &models.IntCriterionInput{
+					Value:    (*end) + 1, // plus one to make it exclusive
+					Modifier: models.CriterionModifierLessThan,
+				}
+			}
+		case models.CriterionModifierIsNull:
+			filter.CareerStart = &models.IntCriterionInput{
+				Modifier: models.CriterionModifierIsNull,
+			}
+			filter.CareerEnd = &models.IntCriterionInput{
+				Modifier: models.CriterionModifierIsNull,
+			}
+		case models.CriterionModifierNotNull:
+			filter.CareerStart = &models.IntCriterionInput{
+				Modifier: models.CriterionModifierNotNull,
+			}
+			filter.CareerEnd = &models.IntCriterionInput{
+				Modifier: models.CriterionModifierNotNull,
+			}
+		}
+	}
+}
+
 // TODO - we need to provide a whitelist of possible values
 func (qb *performerFilterHandler) performerIsMissingCriterionHandler(isMissing *string) criterionHandlerFunc {
 	return func(ctx context.Context, f *filterBuilder) {
diff --git a/pkg/sqlite/performer_test.go b/pkg/sqlite/performer_test.go
index 8d53ca0db..46a5febee 100644
--- a/pkg/sqlite/performer_test.go
+++ b/pkg/sqlite/performer_test.go
@@ -66,7 +66,8 @@ func Test_PerformerStore_Create(t *testing.T) {
 		fakeTits       = "fakeTits"
 		penisLength    = 1.23
 		circumcised    = models.CircumisedEnumCut
-		careerLength   = "careerLength"
+		careerStart    = 2005
+		careerEnd      = 2015
 		tattoos        = "tattoos"
 		piercings      = "piercings"
 		aliases        = []string{"alias1", "alias2"}
@@ -107,7 +108,8 @@ func Test_PerformerStore_Create(t *testing.T) {
 					FakeTits:       fakeTits,
 					PenisLength:    &penisLength,
 					Circumcised:    &circumcised,
-					CareerLength:   careerLength,
+					CareerStart:    &careerStart,
+					CareerEnd:      &careerEnd,
 					Tattoos:        tattoos,
 					Piercings:      piercings,
 					Favorite:       favorite,
@@ -204,8 +206,6 @@ func Test_PerformerStore_Create(t *testing.T) {
 			}
 
 			assert.Equal(tt.newObject.CustomFields, cf)
-
-			return
 		})
 	}
 }
@@ -229,7 +229,8 @@ func Test_PerformerStore_Update(t *testing.T) {
 		fakeTits       = "fakeTits"
 		penisLength    = 1.23
 		circumcised    = models.CircumisedEnumCut
-		careerLength   = "careerLength"
+		careerStart    = 2005
+		careerEnd      = 2015
 		tattoos        = "tattoos"
 		piercings      = "piercings"
 		aliases        = []string{"alias1", "alias2"}
@@ -271,7 +272,8 @@ func Test_PerformerStore_Update(t *testing.T) {
 					FakeTits:       fakeTits,
 					PenisLength:    &penisLength,
 					Circumcised:    &circumcised,
-					CareerLength:   careerLength,
+					CareerStart:    &careerStart,
+					CareerEnd:      &careerEnd,
 					Tattoos:        tattoos,
 					Piercings:      piercings,
 					Favorite:       favorite,
@@ -422,7 +424,8 @@ func clearPerformerPartial() models.PerformerPartial {
 		FakeTits:       nullString,
 		PenisLength:    nullFloat,
 		Circumcised:    nullString,
-		CareerLength:   nullString,
+		CareerStart:    nullInt,
+		CareerEnd:      nullInt,
 		Tattoos:        nullString,
 		Piercings:      nullString,
 		Aliases:        &models.UpdateStrings{Mode: models.RelationshipUpdateModeSet},
@@ -455,7 +458,8 @@ func Test_PerformerStore_UpdatePartial(t *testing.T) {
 		fakeTits       = "fakeTits"
 		penisLength    = 1.23
 		circumcised    = models.CircumisedEnumCut
-		careerLength   = "careerLength"
+		careerStart    = 2005
+		careerEnd      = 2015
 		tattoos        = "tattoos"
 		piercings      = "piercings"
 		aliases        = []string{"alias1", "alias2"}
@@ -501,7 +505,8 @@ func Test_PerformerStore_UpdatePartial(t *testing.T) {
 				FakeTits:     models.NewOptionalString(fakeTits),
 				PenisLength:  models.NewOptionalFloat64(penisLength),
 				Circumcised:  models.NewOptionalString(circumcised.String()),
-				CareerLength: models.NewOptionalString(careerLength),
+				CareerStart:  models.NewOptionalInt(careerStart),
+				CareerEnd:    models.NewOptionalInt(careerEnd),
 				Tattoos:      models.NewOptionalString(tattoos),
 				Piercings:    models.NewOptionalString(piercings),
 				Aliases: &models.UpdateStrings{
@@ -552,7 +557,8 @@ func Test_PerformerStore_UpdatePartial(t *testing.T) {
 				FakeTits:       fakeTits,
 				PenisLength:    &penisLength,
 				Circumcised:    &circumcised,
-				CareerLength:   careerLength,
+				CareerStart:    &careerStart,
+				CareerEnd:      &careerEnd,
 				Tattoos:        tattoos,
 				Piercings:      piercings,
 				Aliases:        models.NewRelatedStrings(aliases),
@@ -1766,30 +1772,117 @@ func verifyPerformerAge(t *testing.T, ageCriterion models.IntCriterionInput) {
 	})
 }
 
-func TestPerformerQueryCareerLength(t *testing.T) {
-	const value = "2005"
-	careerLengthCriterion := models.StringCriterionInput{
+func TestPerformerQueryLegacyCareerLength(t *testing.T) {
+	const value = "2002 - 2012"
+
+	tests := []struct {
+		name            string
+		c               models.StringCriterionInput
+		careerStartCrit *models.IntCriterionInput
+		careerEndCrit   *models.IntCriterionInput
+		err             bool
+	}{
+		{
+			name: "valid format",
+			c: models.StringCriterionInput{
+				Value:    value,
+				Modifier: models.CriterionModifierEquals,
+			},
+			careerStartCrit: &models.IntCriterionInput{
+				Value:    2002,
+				Modifier: models.CriterionModifierEquals,
+			},
+			careerEndCrit: &models.IntCriterionInput{
+				Value:    2012,
+				Modifier: models.CriterionModifierEquals,
+			},
+			err: false,
+		},
+		{
+			name: "invalid format",
+			c: models.StringCriterionInput{
+				Value:    "invalid format",
+				Modifier: models.CriterionModifierEquals,
+			},
+			err: true,
+		},
+		{
+			name: "is null",
+			c: models.StringCriterionInput{
+				Modifier: models.CriterionModifierIsNull,
+			},
+			careerStartCrit: &models.IntCriterionInput{
+				Modifier: models.CriterionModifierIsNull,
+			},
+			careerEndCrit: &models.IntCriterionInput{
+				Modifier: models.CriterionModifierIsNull,
+			},
+			err: false,
+		},
+		{
+			name: "not null",
+			c: models.StringCriterionInput{
+				Modifier: models.CriterionModifierNotNull,
+			},
+			careerStartCrit: &models.IntCriterionInput{
+				Modifier: models.CriterionModifierNotNull,
+			},
+			careerEndCrit: &models.IntCriterionInput{
+				Modifier: models.CriterionModifierNotNull,
+			},
+			err: false,
+		},
+		{
+			name: "invalid modifier",
+			c: models.StringCriterionInput{
+				Value:    value,
+				Modifier: models.CriterionModifierMatchesRegex,
+			},
+			err: true,
+		},
+	}
+
+	qb := db.Performer
+
+	for _, tt := range tests {
+		runWithRollbackTxn(t, tt.name, func(t *testing.T, ctx context.Context) {
+			performers, _, err := qb.Query(ctx, &models.PerformerFilterType{
+				CareerLength: &tt.c,
+			}, nil)
+
+			if err != nil && !tt.err {
+				t.Errorf("Error querying performer: %s", err.Error())
+			} else if err == nil && tt.err {
+				t.Errorf("Expected error but got none")
+			}
+
+			if err != nil || tt.err {
+				return
+			}
+
+			if len(performers) == 0 {
+				t.Errorf("Expected to find performers but found none")
+			}
+
+			for _, performer := range performers {
+				verifyIntPtr(t, performer.CareerStart, *tt.careerStartCrit)
+				verifyIntPtr(t, performer.CareerEnd, *tt.careerEndCrit)
+			}
+		})
+	}
+}
+
+func TestPerformerQueryCareerStart(t *testing.T) {
+	const value = 2002
+	criterion := models.IntCriterionInput{
 		Value:    value,
 		Modifier: models.CriterionModifierEquals,
 	}
 
-	verifyPerformerCareerLength(t, careerLengthCriterion)
-
-	careerLengthCriterion.Modifier = models.CriterionModifierNotEquals
-	verifyPerformerCareerLength(t, careerLengthCriterion)
-
-	careerLengthCriterion.Modifier = models.CriterionModifierMatchesRegex
-	verifyPerformerCareerLength(t, careerLengthCriterion)
-
-	careerLengthCriterion.Modifier = models.CriterionModifierNotMatchesRegex
-	verifyPerformerCareerLength(t, careerLengthCriterion)
-}
-
-func verifyPerformerCareerLength(t *testing.T, criterion models.StringCriterionInput) {
 	withTxn(func(ctx context.Context) error {
 		qb := db.Performer
 		performerFilter := models.PerformerFilterType{
-			CareerLength: &criterion,
+			CareerStart: &criterion,
 		}
 
 		performers, _, err := qb.Query(ctx, &performerFilter, nil)
@@ -1798,8 +1891,33 @@ func verifyPerformerCareerLength(t *testing.T, criterion models.StringCriterionI
 		}
 
 		for _, performer := range performers {
-			cl := performer.CareerLength
-			verifyString(t, cl, criterion)
+			verifyIntPtr(t, performer.CareerStart, criterion)
+		}
+
+		return nil
+	})
+}
+
+func TestPerformerQueryCareerEnd(t *testing.T) {
+	const value = 2012
+	criterion := models.IntCriterionInput{
+		Value:    value,
+		Modifier: models.CriterionModifierEquals,
+	}
+
+	withTxn(func(ctx context.Context) error {
+		qb := db.Performer
+		performerFilter := models.PerformerFilterType{
+			CareerEnd: &criterion,
+		}
+
+		performers, _, err := qb.Query(ctx, &performerFilter, nil)
+		if err != nil {
+			t.Errorf("Error querying performer: %s", err.Error())
+		}
+
+		for _, performer := range performers {
+			verifyIntPtr(t, performer.CareerEnd, criterion)
 		}
 
 		return nil
diff --git a/pkg/sqlite/setup_test.go b/pkg/sqlite/setup_test.go
index bdb83b1df..ffa60457e 100644
--- a/pkg/sqlite/setup_test.go
+++ b/pkg/sqlite/setup_test.go
@@ -1513,15 +1513,28 @@ func getPerformerDeathDate(index int) *models.Date {
 	return &ret
 }
 
-func getPerformerCareerLength(index int) *string {
+func getPerformerCareerStart(index int) *int {
 	if index%5 == 0 {
 		return nil
 	}
 
-	ret := fmt.Sprintf("20%2d", index)
+	ret := 2000 + index
 	return &ret
 }
 
+func getPerformerCareerEnd(index int) *int {
+	if index%5 == 0 {
+		return nil
+	}
+
+	// only set career_end for even indices
+	if index%2 == 0 {
+		ret := 2010 + index
+		return &ret
+	}
+	return nil
+}
+
 func getPerformerPenisLength(index int) *float64 {
 	if index%5 == 0 {
 		return nil
@@ -1615,10 +1628,8 @@ func createPerformers(ctx context.Context, n int, o int) error {
 			TagIDs:        models.NewRelatedIDs(tids),
 		}
 
-		careerLength := getPerformerCareerLength(i)
-		if careerLength != nil {
-			performer.CareerLength = *careerLength
-		}
+		performer.CareerStart = getPerformerCareerStart(i)
+		performer.CareerEnd = getPerformerCareerEnd(i)
 
 		if (index+1)%5 != 0 {
 			performer.StashIDs = models.NewRelatedStashIDs([]models.StashID{
diff --git a/pkg/stashbox/performer.go b/pkg/stashbox/performer.go
index 38824eba1..231b936d6 100644
--- a/pkg/stashbox/performer.go
+++ b/pkg/stashbox/performer.go
@@ -231,6 +231,16 @@ func performerFragmentToScrapedPerformer(p graphql.PerformerFragment) *models.Sc
 		sp.Height = &hs
 	}
 
+	if p.CareerStartYear != nil {
+		cs := *p.CareerStartYear
+		sp.CareerStart = &cs
+	}
+
+	if p.CareerEndYear != nil {
+		ce := *p.CareerEndYear
+		sp.CareerEnd = &ce
+	}
+
 	if p.BirthDate != nil {
 		sp.Birthdate = padFuzzyDate(p.BirthDate)
 	}
@@ -388,16 +398,11 @@ func (c Client) SubmitPerformerDraft(ctx context.Context, performer *models.Perf
 		aliases := strings.Join(performer.Aliases.List(), ",")
 		draft.Aliases = &aliases
 	}
-	if performer.CareerLength != "" {
-		var career = strings.Split(performer.CareerLength, "-")
-		if i, err := strconv.Atoi(strings.TrimSpace(career[0])); err == nil {
-			draft.CareerStartYear = &i
-		}
-		if len(career) == 2 {
-			if y, err := strconv.Atoi(strings.TrimSpace(career[1])); err == nil {
-				draft.CareerEndYear = &y
-			}
-		}
+	if performer.CareerStart != nil {
+		draft.CareerStartYear = performer.CareerStart
+	}
+	if performer.CareerEnd != nil {
+		draft.CareerEndYear = performer.CareerEnd
 	}
 
 	if len(performer.URLs.List()) > 0 {
diff --git a/pkg/utils/date.go b/pkg/utils/date.go
index de5566e4d..4b805862a 100644
--- a/pkg/utils/date.go
+++ b/pkg/utils/date.go
@@ -2,6 +2,8 @@ package utils
 
 import (
 	"fmt"
+	"strconv"
+	"strings"
 	"time"
 )
 
@@ -25,3 +27,80 @@ func ParseDateStringAsTime(dateString string) (time.Time, error) {
 
 	return time.Time{}, fmt.Errorf("ParseDateStringAsTime failed: dateString <%s>", dateString)
 }
+
+// ParseYearRangeString parses a year range string into start and end year integers.
+// Supported formats: "YYYY", "YYYY - YYYY", "YYYY-YYYY", "YYYY -", "- YYYY", "YYYY-present".
+// Returns nil for start/end if not present in the string.
+func ParseYearRangeString(s string) (start *int, end *int, err error) {
+	s = strings.TrimSpace(s)
+	if s == "" {
+		return nil, nil, fmt.Errorf("empty year range string")
+	}
+
+	// normalize "present" to empty end
+	lower := strings.ToLower(s)
+	lower = strings.ReplaceAll(lower, "present", "")
+
+	// split on "-" if it contains one
+	var parts []string
+	if strings.Contains(lower, "-") {
+		parts = strings.SplitN(lower, "-", 2)
+	} else {
+		// single value, treat as start year
+		year, err := parseYear(lower)
+		if err != nil {
+			return nil, nil, fmt.Errorf("invalid year range %q: %w", s, err)
+		}
+		return &year, nil, nil
+	}
+
+	startStr := strings.TrimSpace(parts[0])
+	endStr := strings.TrimSpace(parts[1])
+
+	if startStr != "" {
+		y, err := parseYear(startStr)
+		if err != nil {
+			return nil, nil, fmt.Errorf("invalid start year in %q: %w", s, err)
+		}
+		start = &y
+	}
+
+	if endStr != "" {
+		y, err := parseYear(endStr)
+		if err != nil {
+			return nil, nil, fmt.Errorf("invalid end year in %q: %w", s, err)
+		}
+		end = &y
+	}
+
+	if start == nil && end == nil {
+		return nil, nil, fmt.Errorf("could not parse year range %q", s)
+	}
+
+	return start, end, nil
+}
+
+func parseYear(s string) (int, error) {
+	s = strings.TrimSpace(s)
+	year, err := strconv.Atoi(s)
+	if err != nil {
+		return 0, fmt.Errorf("invalid year %q: %w", s, err)
+	}
+	if year < 1900 || year > 2200 {
+		return 0, fmt.Errorf("year %d out of reasonable range", year)
+	}
+	return year, nil
+}
+
+func FormatYearRange(start *int, end *int) string {
+	switch {
+	case start == nil && end == nil:
+		return ""
+	case end == nil:
+		return fmt.Sprintf("%d -", *start)
+	case start == nil:
+		return fmt.Sprintf("- %d", *end)
+	default:
+		return fmt.Sprintf("%d - %d", *start, *end)
+	}
+}
diff --git a/pkg/utils/date_test.go b/pkg/utils/date_test.go
index ae077c21e..a9e174094 100644
--- a/pkg/utils/date_test.go
+++ b/pkg/utils/date_test.go
@@ -2,6 +2,8 @@ package utils
 
 import (
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestParseDateStringAsTime(t *testing.T) {
@@ -41,3 +43,66 @@ func TestParseDateStringAsTime(t *testing.T) {
 		})
 	}
 }
+
+func TestParseYearRangeString(t *testing.T) {
+	intPtr := func(v int) *int { return &v }
+
+	tests := []struct {
+		name      string
+		input     string
+		wantStart *int
+		wantEnd   *int
+		wantErr   bool
+	}{
+		{"single year", "2005", intPtr(2005), nil, false},
+		{"year range with spaces", "2005 - 2010", intPtr(2005), intPtr(2010), false},
+		{"year range no spaces", "2005-2010", intPtr(2005), intPtr(2010), false},
+		{"year dash open", "2005 -", intPtr(2005), nil, false},
+		{"year dash open no space", "2005-", intPtr(2005), nil, false},
+		{"dash year", "- 2010", nil, intPtr(2010), false},
+		{"year present", "2005-present", intPtr(2005), nil, false},
+		{"year Present caps", "2005 - Present", intPtr(2005), nil, false},
+		{"whitespace padding", "  2005 - 2010  ", intPtr(2005), intPtr(2010), false},
+		{"empty string", "", nil, nil, true},
+		{"garbage", "not a year", nil, nil, true},
+		{"partial garbage start", "abc - 2010", nil, nil, true},
+		{"partial garbage end", "2005 - abc", nil, nil, true},
+		{"year out of range", "1800", nil, nil, true},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			start, end, err := ParseYearRangeString(tt.input)
+			if tt.wantErr {
+				assert.Error(t, err)
+				return
+			}
+			assert.NoError(t, err)
+			assert.Equal(t, tt.wantStart, start)
+			assert.Equal(t, tt.wantEnd, end)
+		})
+	}
+}
+
+func TestFormatYearRange(t *testing.T) {
+	intPtr := func(v int) *int { return &v }
+
+	tests := []struct {
+		name  string
+		start *int
+		end   *int
+		want  string
+	}{
+		{"both nil", nil, nil, ""},
+		{"only start", intPtr(2005), nil, "2005 -"},
+		{"only end", nil, intPtr(2010), "- 2010"},
+		{"start and end", intPtr(2005), intPtr(2010), "2005 - 2010"},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got := FormatYearRange(tt.start, tt.end)
+			assert.Equal(t, tt.want, got)
+		})
+	}
+}
diff --git a/ui/v2.5/graphql/data/performer-slim.graphql b/ui/v2.5/graphql/data/performer-slim.graphql
index 56a30842d..9bb628fba 100644
--- a/ui/v2.5/graphql/data/performer-slim.graphql
+++ b/ui/v2.5/graphql/data/performer-slim.graphql
@@ -16,7 +16,8 @@ fragment SlimPerformerData on Performer {
   fake_tits
   penis_length
   circumcised
-  career_length
+  career_start
+  career_end
   tattoos
   piercings
   alias_list
diff --git a/ui/v2.5/graphql/data/performer.graphql b/ui/v2.5/graphql/data/performer.graphql
index 035c8abc7..2a75fbb95 100644
--- a/ui/v2.5/graphql/data/performer.graphql
+++ b/ui/v2.5/graphql/data/performer.graphql
@@ -13,7 +13,8 @@ fragment PerformerData on Performer {
   fake_tits
   penis_length
   circumcised
-  career_length
+  career_start
+  career_end
   tattoos
   piercings
   alias_list
diff --git a/ui/v2.5/graphql/data/scrapers.graphql b/ui/v2.5/graphql/data/scrapers.graphql
index 4a0f588a4..e58c21a20 100644
--- a/ui/v2.5/graphql/data/scrapers.graphql
+++ b/ui/v2.5/graphql/data/scrapers.graphql
@@ -38,7 +38,8 @@ fragment ScrapedPerformerData on ScrapedPerformer {
   fake_tits
   penis_length
   circumcised
-  career_length
+  career_start
+  career_end
   tattoos
   piercings
   aliases
@@ -68,7 +69,8 @@ fragment ScrapedScenePerformerData on ScrapedPerformer {
   fake_tits
   penis_length
   circumcised
-  career_length
+  career_start
+  career_end
   tattoos
   piercings
   aliases
diff --git a/ui/v2.5/src/components/Performers/EditPerformersDialog.tsx b/ui/v2.5/src/components/Performers/EditPerformersDialog.tsx
index 677ac3aa1..d60118d4b 100644
--- a/ui/v2.5/src/components/Performers/EditPerformersDialog.tsx
+++ b/ui/v2.5/src/components/Performers/EditPerformersDialog.tsx
@@ -42,7 +42,8 @@ const performerFields = [
   "gender",
   "birthdate",
   "death_date",
-  "career_length",
+  "career_start",
+  "career_end",
   "country",
   "ethnicity",
   "eye_color",
@@ -363,8 +364,15 @@ export const EditPerformersDialog: React.FC<IListOperationProps> = (
           {renderTextField("piercings", updateInput.piercings, (v) =>
             setUpdateField({ piercings: v })
           )}
-          {renderTextField("career_length", updateInput.career_length, (v) =>
-            setUpdateField({ career_length: v })
+          {renderTextField(
+            "career_start",
+            updateInput.career_start?.toString(),
+            (v) => setUpdateField({ career_start: v ? parseInt(v) : undefined })
+          )}
+          {renderTextField(
+            "career_end",
+            updateInput.career_end?.toString(),
+            (v) => setUpdateField({ career_end: v ? parseInt(v) : undefined })
           )}
 
           <Form.Group controlId="tags">
diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerDetailsPanel.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerDetailsPanel.tsx
index 95e03ff8b..473bbbd47 100644
--- a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerDetailsPanel.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerDetailsPanel.tsx
@@ -12,6 +12,7 @@ import {
   FormatHeight,
   FormatPenisLength,
   FormatWeight,
+  formatYearRange,
 } from "../PerformerList";
 import { PatchComponent } from "src/patch";
 import { CustomFields } from "src/components/Shared/CustomFields";
@@ -174,7 +175,10 @@ export const PerformerDetailsPanel: React.FC<IPerformerDetails> =
         />
         <DetailItem
           id="career_length"
-          value={performer?.career_length}
+          value={formatYearRange(
+            performer?.career_start,
+            performer?.career_end
+          )}
           fullWidth={fullWidth}
         />
         <DetailItem id="details" value={details} fullWidth={fullWidth} />
diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
index 0e769edf9..98871bf9a 100644
--- a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
@@ -126,7 +126,8 @@ export const PerformerEditPanel: React.FC<IPerformerDetails> = ({
     circumcised: yupInputEnum(GQL.CircumisedEnum).nullable().defined(),
     tattoos: yup.string().ensure(),
     piercings: yup.string().ensure(),
-    career_length: yup.string().ensure(),
+    career_start: yupInputNumber().positive().nullable().defined(),
+    career_end: yupInputNumber().positive().nullable().defined(),
     urls: yupUniqueStringList(intl),
     details: yup.string().ensure(),
     tag_ids: yup.array(yup.string().required()).defined(),
@@ -155,7 +156,8 @@ export const PerformerEditPanel: React.FC<IPerformerDetails> = ({
     circumcised: performer.circumcised ?? null,
     tattoos: performer.tattoos ?? "",
     piercings: performer.piercings ?? "",
-    career_length: performer.career_length ?? "",
+    career_start: performer.career_start ?? null,
+    career_end: performer.career_end ?? null,
     urls: performer.urls ?? [],
     details: performer.details ?? "",
     tag_ids: (performer.tags ?? []).map((t) => t.id),
@@ -256,8 +258,11 @@ export const PerformerEditPanel: React.FC<IPerformerDetails> = ({
     if (state.fake_tits) {
       formik.setFieldValue("fake_tits", state.fake_tits);
     }
-    if (state.career_length) {
-      formik.setFieldValue("career_length", state.career_length);
+    if (state.career_start) {
+      formik.setFieldValue("career_start", state.career_start);
+    }
+    if (state.career_end) {
+      formik.setFieldValue("career_end", state.career_end);
     }
     if (state.tattoos) {
       formik.setFieldValue("tattoos", state.tattoos);
@@ -747,7 +752,8 @@ export const PerformerEditPanel: React.FC<IPerformerDetails> = ({
         {renderInputField("tattoos", "textarea")}
         {renderInputField("piercings", "textarea")}
 
-        {renderInputField("career_length")}
+        {renderInputField("career_start", "number")}
+        {renderInputField("career_end", "number")}
 
         {renderURLListField("urls", onScrapePerformerURL, urlScrapable)}
 
diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerScrapeDialog.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerScrapeDialog.tsx
index afb57a66e..d5146592b 100644
--- a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerScrapeDialog.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerScrapeDialog.tsx
@@ -8,6 +8,7 @@ import {
   ScrapedTextAreaRow,
   ScrapedCountryRow,
   ScrapedStringListRow,
+  ScrapedNumberRow,
 } from "src/components/Shared/ScrapeDialog/ScrapeDialogRow";
 import { ScrapeDialog } from "src/components/Shared/ScrapeDialog/ScrapeDialog";
 import { Form } from "react-bootstrap";
@@ -272,10 +273,16 @@ export const PerformerScrapeDialog: React.FC<IPerformerScrapeDialogProps> = (
   const [fakeTits, setFakeTits] = useState<ScrapeResult<string>>(
     new ScrapeResult<string>(props.performer.fake_tits, props.scraped.fake_tits)
   );
-  const [careerLength, setCareerLength] = useState<ScrapeResult<string>>(
-    new ScrapeResult<string>(
-      props.performer.career_length,
-      props.scraped.career_length
+  const [careerStart, setCareerStart] = useState<ScrapeResult<number>>(
+    new ScrapeResult<number>(
+      props.performer.career_start,
+      props.scraped.career_start
+    )
+  );
+  const [careerEnd, setCareerEnd] = useState<ScrapeResult<number>>(
+    new ScrapeResult<number>(
+      props.performer.career_end,
+      props.scraped.career_end
     )
   );
   const [tattoos, setTattoos] = useState<ScrapeResult<string>>(
@@ -347,7 +354,8 @@ export const PerformerScrapeDialog: React.FC<IPerformerScrapeDialogProps> = (
     fakeTits,
     penisLength,
     circumcised,
-    careerLength,
+    careerStart,
+    careerEnd,
     tattoos,
     piercings,
     urls,
@@ -379,7 +387,8 @@ export const PerformerScrapeDialog: React.FC<IPerformerScrapeDialogProps> = (
       height: height.getNewValue(),
       measurements: measurements.getNewValue(),
       fake_tits: fakeTits.getNewValue(),
-      career_length: careerLength.getNewValue(),
+      career_start: careerStart.getNewValue(),
+      career_end: careerEnd.getNewValue(),
       tattoos: tattoos.getNewValue(),
       piercings: piercings.getNewValue(),
       urls: urls.getNewValue(),
@@ -493,11 +502,17 @@ export const PerformerScrapeDialog: React.FC<IPerformerScrapeDialogProps> = (
           result={fakeTits}
           onChange={(value) => setFakeTits(value)}
         />
-        <ScrapedInputGroupRow
-          field="career_length"
-          title={intl.formatMessage({ id: "career_length" })}
-          result={careerLength}
-          onChange={(value) => setCareerLength(value)}
+        <ScrapedNumberRow
+          field="career_start"
+          title={intl.formatMessage({ id: "career_start" })}
+          result={careerStart}
+          onChange={(value) => setCareerStart(value)}
+        />
+        <ScrapedNumberRow
+          field="career_end"
+          title={intl.formatMessage({ id: "career_end" })}
+          result={careerEnd}
+          onChange={(value) => setCareerEnd(value)}
         />
         <ScrapedTextAreaRow
           field="tattoos"
diff --git a/ui/v2.5/src/components/Performers/PerformerList.tsx b/ui/v2.5/src/components/Performers/PerformerList.tsx
index a0591b4ce..8c56e451b 100644
--- a/ui/v2.5/src/components/Performers/PerformerList.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerList.tsx
@@ -137,6 +137,14 @@ export const FormatWeight = (weight?: number | null) => {
   );
 };
 
+export function formatYearRange(
+  start?: number | null,
+  end?: number | null
+): string | undefined {
+  if (!start && !end) return undefined;
+  return `${start ?? ""} - ${end ?? ""}`;
+}
+
 export const FormatCircumcised = (circumcised?: GQL.CircumisedEnum | null) => {
   const intl = useIntl();
   if (!circumcised) {
diff --git a/ui/v2.5/src/components/Performers/PerformerListTable.tsx b/ui/v2.5/src/components/Performers/PerformerListTable.tsx
index 58538e7e2..3b500cee6 100644
--- a/ui/v2.5/src/components/Performers/PerformerListTable.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerListTable.tsx
@@ -17,6 +17,7 @@ import {
   FormatHeight,
   FormatPenisLength,
   FormatWeight,
+  formatYearRange,
 } from "./PerformerList";
 import TextUtils from "src/utils/text";
 import { getCountryByISO } from "src/utils/country";
@@ -188,7 +189,7 @@ export const PerformerListTable: React.FC<IPerformerListTableProps> = (
   );
 
   const CareerLengthCell = (performer: GQL.PerformerDataFragment) => (
-    <span className="ellips-data">{performer.career_length}</span>
+    <>{formatYearRange(performer.career_start, performer.career_end) ?? ""}</>
   );
 
   const SceneCountCell = (performer: GQL.PerformerDataFragment) => (
diff --git a/ui/v2.5/src/components/Performers/PerformerMergeDialog.tsx b/ui/v2.5/src/components/Performers/PerformerMergeDialog.tsx
index ab4a6fed5..efa51f1db 100644
--- a/ui/v2.5/src/components/Performers/PerformerMergeDialog.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerMergeDialog.tsx
@@ -102,8 +102,11 @@ const PerformerMergeDetails: React.FC<IPerformerMergeDetailsProps> = ({
   const [fakeTits, setFakeTits] = useState<ScrapeResult<string>>(
     new ScrapeResult<string>(dest.fake_tits)
   );
-  const [careerLength, setCareerLength] = useState<ScrapeResult<string>>(
-    new ScrapeResult<string>(dest.career_length)
+  const [careerStart, setCareerStart] = useState<ScrapeResult<string>>(
+    new ScrapeResult<string>(dest.career_start?.toString())
+  );
+  const [careerEnd, setCareerEnd] = useState<ScrapeResult<string>>(
+    new ScrapeResult<string>(dest.career_end?.toString())
   );
   const [tattoos, setTattoos] = useState<ScrapeResult<string>>(
     new ScrapeResult<string>(dest.tattoos)
@@ -264,11 +267,18 @@ const PerformerMergeDetails: React.FC<IPerformerMergeDetailsProps> = ({
         !dest.fake_tits
       )
     );
-    setCareerLength(
+    setCareerStart(
       new ScrapeResult(
-        dest.career_length,
-        sources.find((s) => s.career_length)?.career_length,
-        !dest.career_length
+        dest.career_start?.toString(),
+        sources.find((s) => s.career_start)?.career_start?.toString(),
+        !dest.career_start
+      )
+    );
+    setCareerEnd(
+      new ScrapeResult(
+        dest.career_end?.toString(),
+        sources.find((s) => s.career_end)?.career_end?.toString(),
+        !dest.career_end
       )
     );
     setTattoos(
@@ -378,7 +388,8 @@ const PerformerMergeDetails: React.FC<IPerformerMergeDetailsProps> = ({
         penisLength,
         measurements,
         fakeTits,
-        careerLength,
+        careerStart,
+        careerEnd,
         tattoos,
         piercings,
         urls,
@@ -404,7 +415,8 @@ const PerformerMergeDetails: React.FC<IPerformerMergeDetailsProps> = ({
     penisLength,
     measurements,
     fakeTits,
-    careerLength,
+    careerStart,
+    careerEnd,
     tattoos,
     piercings,
     urls,
@@ -520,10 +532,16 @@ const PerformerMergeDetails: React.FC<IPerformerMergeDetailsProps> = ({
           onChange={(value) => setFakeTits(value)}
         />
         <ScrapedInputGroupRow
-          field="career_length"
-          title={intl.formatMessage({ id: "career_length" })}
-          result={careerLength}
-          onChange={(value) => setCareerLength(value)}
+          field="career_start"
+          title={intl.formatMessage({ id: "career_start" })}
+          result={careerStart}
+          onChange={(value) => setCareerStart(value)}
+        />
+        <ScrapedInputGroupRow
+          field="career_end"
+          title={intl.formatMessage({ id: "career_end" })}
+          result={careerEnd}
+          onChange={(value) => setCareerEnd(value)}
         />
         <ScrapedTextAreaRow
           field="tattoos"
@@ -612,7 +630,12 @@ const PerformerMergeDetails: React.FC<IPerformerMergeDetailsProps> = ({
           : undefined,
         measurements: measurements.getNewValue(),
         fake_tits: fakeTits.getNewValue(),
-        career_length: careerLength.getNewValue(),
+        career_start: careerStart.getNewValue()
+          ? parseInt(careerStart.getNewValue()!)
+          : undefined,
+        career_end: careerEnd.getNewValue()
+          ? parseInt(careerEnd.getNewValue()!)
+          : undefined,
         tattoos: tattoos.getNewValue(),
         piercings: piercings.getNewValue(),
         urls: urls.getNewValue(),
diff --git a/ui/v2.5/src/components/Performers/styles.scss b/ui/v2.5/src/components/Performers/styles.scss
index 17ca3a737..54a010e50 100644
--- a/ui/v2.5/src/components/Performers/styles.scss
+++ b/ui/v2.5/src/components/Performers/styles.scss
@@ -68,7 +68,8 @@
   .collapsed {
     .detail-item.tattoos,
     .detail-item.piercings,
-    .detail-item.career_length,
+    .detail-item.career_start,
+    .detail-item.career_end,
     .detail-item.details,
     .detail-item.tags,
     .detail-item.stash_ids {
diff --git a/ui/v2.5/src/components/Shared/ScrapeDialog/ScrapeDialogRow.tsx b/ui/v2.5/src/components/Shared/ScrapeDialog/ScrapeDialogRow.tsx
index 677ecb87f..a0fe6489e 100644
--- a/ui/v2.5/src/components/Shared/ScrapeDialog/ScrapeDialogRow.tsx
+++ b/ui/v2.5/src/components/Shared/ScrapeDialog/ScrapeDialogRow.tsx
@@ -171,6 +171,70 @@ export const ScrapedInputGroupRow: React.FC<IScrapedInputGroupRowProps> = (
   );
 };
 
+interface IScrapedNumberInputProps {
+  isNew?: boolean;
+  placeholder?: string;
+  locked?: boolean;
+  result: ScrapeResult<number>;
+  onChange?: (value: number) => void;
+}
+
+const ScrapedNumberInput: React.FC<IScrapedNumberInputProps> = (props) => {
+  return (
+    <FormControl
+      placeholder={props.placeholder}
+      value={props.isNew ? props.result.newValue : props.result.originalValue}
+      readOnly={!props.isNew || props.locked}
+      onChange={(e) => {
+        if (props.isNew && props.onChange) {
+          props.onChange(Number(e.target.value));
+        }
+      }}
+      className="bg-secondary text-white border-secondary"
+      type="number"
+    />
+  );
+};
+
+interface IScrapedNumberRowProps {
+  title: string;
+  field: string;
+  className?: string;
+  placeholder?: string;
+  result: ScrapeResult<number>;
+  locked?: boolean;
+  onChange: (value: ScrapeResult<number>) => void;
+}
+
+export const ScrapedNumberRow: React.FC<IScrapedNumberRowProps> = (props) => {
+  return (
+    <ScrapeDialogRow
+      title={props.title}
+      field={props.field}
+      className={props.className}
+      result={props.result}
+      originalField={
+        <ScrapedNumberInput
+          placeholder={props.placeholder || props.title}
+          result={props.result}
+        />
+      }
+      newField={
+        <ScrapedNumberInput
+          placeholder={props.placeholder || props.title}
+          result={props.result}
+          isNew
+          locked={props.locked}
+          onChange={(value) =>
+            props.onChange(props.result.cloneWithValue(value))
+          }
+        />
+      }
+      onChange={props.onChange}
+    />
+  );
+};
+
 interface IScrapedStringListProps {
   isNew?: boolean;
   placeholder?: string;
diff --git a/ui/v2.5/src/components/Tagger/PerformerModal.tsx b/ui/v2.5/src/components/Tagger/PerformerModal.tsx
index 79f80708a..ac9444c5b 100755
--- a/ui/v2.5/src/components/Tagger/PerformerModal.tsx
+++ b/ui/v2.5/src/components/Tagger/PerformerModal.tsx
@@ -240,7 +240,8 @@ const PerformerModal: React.FC<IPerformerModalProps> = ({
       height_cm: Number.parseFloat(performer.height ?? "") ?? undefined,
       measurements: performer.measurements,
       fake_tits: performer.fake_tits,
-      career_length: performer.career_length,
+      career_start: performer.career_start,
+      career_end: performer.career_end,
       tattoos: performer.tattoos,
       piercings: performer.piercings,
       urls: performer.urls,
@@ -326,7 +327,8 @@ const PerformerModal: React.FC<IPerformerModalProps> = ({
           {maybeRenderField("measurements", performer.measurements)}
           {performer?.gender !== GQL.GenderEnum.Male &&
             maybeRenderField("fake_tits", performer.fake_tits)}
-          {maybeRenderField("career_length", performer.career_length)}
+          {maybeRenderField("career_start", performer.career_start?.toString())}
+          {maybeRenderField("career_end", performer.career_end?.toString())}
           {maybeRenderField("tattoos", performer.tattoos, false)}
           {maybeRenderField("piercings", performer.piercings, false)}
           {maybeRenderField("weight", performer.weight, false)}
diff --git a/ui/v2.5/src/components/Tagger/constants.ts b/ui/v2.5/src/components/Tagger/constants.ts
index d499062aa..d59a6d3d5 100644
--- a/ui/v2.5/src/components/Tagger/constants.ts
+++ b/ui/v2.5/src/components/Tagger/constants.ts
@@ -75,7 +75,8 @@ export const PERFORMER_FIELDS = [
   "fake_tits",
   "tattoos",
   "piercings",
-  "career_length",
+  "career_start",
+  "career_end",
   "urls",
   "details",
 ];
diff --git a/ui/v2.5/src/core/performers.ts b/ui/v2.5/src/core/performers.ts
index 9712c9824..016e9e13f 100644
--- a/ui/v2.5/src/core/performers.ts
+++ b/ui/v2.5/src/core/performers.ts
@@ -104,7 +104,10 @@ export const scrapedPerformerToCreateInput = (
     height_cm: toCreate.height ? Number(toCreate.height) : undefined,
     measurements: toCreate.measurements,
     fake_tits: toCreate.fake_tits,
-    career_length: toCreate.career_length,
+    career_start: toCreate.career_start
+      ? Number(toCreate.career_start)
+      : undefined,
+    career_end: toCreate.career_end ? Number(toCreate.career_end) : undefined,
     tattoos: toCreate.tattoos,
     piercings: toCreate.piercings,
     alias_list: aliases,
diff --git a/ui/v2.5/src/locales/en-GB.json b/ui/v2.5/src/locales/en-GB.json
index b8800216c..595ff4c61 100644
--- a/ui/v2.5/src/locales/en-GB.json
+++ b/ui/v2.5/src/locales/en-GB.json
@@ -175,7 +175,9 @@
     "filesystem": "Filesystem"
   },
   "captions": "Captions",
+  "career_end": "Career End",
   "career_length": "Career Length",
+  "career_start": "Career Start",
   "chapters": "Chapters",
   "circumcised": "Circumcised",
   "circumcised_types": {
diff --git a/ui/v2.5/src/models/list-filter/criteria/is-missing.ts b/ui/v2.5/src/models/list-filter/criteria/is-missing.ts
index 58e3535a6..512616f3c 100644
--- a/ui/v2.5/src/models/list-filter/criteria/is-missing.ts
+++ b/ui/v2.5/src/models/list-filter/criteria/is-missing.ts
@@ -58,7 +58,8 @@ export const PerformerIsMissingCriterionOption = new IsMissingCriterionOption(
     "weight",
     "measurements",
     "fake_tits",
-    "career_length",
+    "career_start",
+    "career_end",
     "tattoos",
     "piercings",
     "aliases",
diff --git a/ui/v2.5/src/models/list-filter/performers.ts b/ui/v2.5/src/models/list-filter/performers.ts
index c0bcb3bba..372dad342 100644
--- a/ui/v2.5/src/models/list-filter/performers.ts
+++ b/ui/v2.5/src/models/list-filter/performers.ts
@@ -32,7 +32,8 @@ const sortByOptions = [
   "play_count",
   "last_played_at",
   "latest_scene",
-  "career_length",
+  "career_start",
+  "career_end",
   "weight",
   "measurements",
   "scenes_duration",
@@ -75,6 +76,8 @@ const numberCriteria: CriterionType[] = [
   "age",
   "weight",
   "penis_length",
+  "career_start",
+  "career_end",
 ];
 
 const stringCriteria: CriterionType[] = [
@@ -86,7 +89,6 @@ const stringCriteria: CriterionType[] = [
   "eye_color",
   "measurements",
   "fake_tits",
-  "career_length",
   "tattoos",
   "piercings",
   "aliases",
diff --git a/ui/v2.5/src/models/list-filter/types.ts b/ui/v2.5/src/models/list-filter/types.ts
index 442099a53..7fe334c4c 100644
--- a/ui/v2.5/src/models/list-filter/types.ts
+++ b/ui/v2.5/src/models/list-filter/types.ts
@@ -166,6 +166,8 @@ export type CriterionType =
   | "penis_length"
   | "circumcised"
   | "career_length"
+  | "career_start"
+  | "career_end"
   | "tattoos"
   | "piercings"
   | "aliases"

From e289199911d37f84703c7707662067d52877c3b1 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Wed, 18 Feb 2026 16:50:32 +1100
Subject: [PATCH 297/405] Scene custom field backend support (#6584)

* Add custom fields to scenes
* Generalise set custom fields tests to other object types
---
 graphql/schema/types/filters.graphql          |   2 +
 graphql/schema/types/scene.graphql            |   8 +
 internal/api/loaders/dataloaders.go           |  32 ++-
 internal/api/resolver_model_scene.go          |  13 +
 internal/api/resolver_mutation_scene.go       |  52 +++-
 internal/manager/repository.go                |   2 +-
 pkg/models/jsonschema/scene.go                |   2 +
 pkg/models/mocks/SceneReaderWriter.go         |  60 +++++
 pkg/models/model_scene.go                     |  14 +
 pkg/models/repository_scene.go                |   2 +
 pkg/models/scene.go                           |   7 +-
 pkg/scene/create.go                           |  24 +-
 pkg/scene/export.go                           |   6 +
 pkg/scene/export_test.go                      |  45 +++-
 pkg/scene/import.go                           |  12 +
 pkg/scene/import_test.go                      | 100 +++++++
 pkg/sqlite/anonymise.go                       |   4 +
 pkg/sqlite/custom_fields_test.go              |  50 +++-
 pkg/sqlite/database.go                        |   2 +-
 .../migrations/79_scene_custom_fields.up.sql  |   9 +
 pkg/sqlite/scene.go                           |   5 +
 pkg/sqlite/scene_filter.go                    |   7 +
 pkg/sqlite/scene_test.go                      | 247 ++++++++++++++++++
 pkg/sqlite/setup_test.go                      |  16 ++
 pkg/sqlite/tables.go                          |   1 +
 25 files changed, 687 insertions(+), 35 deletions(-)
 create mode 100644 pkg/sqlite/migrations/79_scene_custom_fields.up.sql

diff --git a/graphql/schema/types/filters.graphql b/graphql/schema/types/filters.graphql
index 81f91f22a..7633457ce 100644
--- a/graphql/schema/types/filters.graphql
+++ b/graphql/schema/types/filters.graphql
@@ -371,6 +371,8 @@ input SceneFilterType {
   markers_filter: SceneMarkerFilterType
   "Filter by related files that meet this criteria"
   files_filter: FileFilterType
+
+  custom_fields: [CustomFieldCriterionInput!]
 }
 
 input MovieFilterType {
diff --git a/graphql/schema/types/scene.graphql b/graphql/schema/types/scene.graphql
index 5fba3819d..4d99e0a21 100644
--- a/graphql/schema/types/scene.graphql
+++ b/graphql/schema/types/scene.graphql
@@ -79,6 +79,8 @@ type Scene {
   performers: [Performer!]!
   stash_ids: [StashID!]!
 
+  custom_fields: Map!
+
   "Return valid stream paths"
   sceneStreams: [SceneStreamEndpoint!]!
 }
@@ -120,6 +122,8 @@ input SceneCreateInput {
   Files must not already be primary for another scene.
   """
   file_ids: [ID!]
+
+  custom_fields: Map
 }
 
 input SceneUpdateInput {
@@ -158,6 +162,8 @@ input SceneUpdateInput {
     )
 
   primary_file_id: ID
+
+  custom_fields: CustomFieldsInput
 }
 
 enum BulkUpdateIdMode {
@@ -190,6 +196,8 @@ input BulkSceneUpdateInput {
   tag_ids: BulkUpdateIds
   group_ids: BulkUpdateIds
   movie_ids: BulkUpdateIds @deprecated(reason: "Use group_ids")
+
+  custom_fields: CustomFieldsInput
 }
 
 input SceneDestroyInput {
diff --git a/internal/api/loaders/dataloaders.go b/internal/api/loaders/dataloaders.go
index ecb0bbac2..520714432 100644
--- a/internal/api/loaders/dataloaders.go
+++ b/internal/api/loaders/dataloaders.go
@@ -42,13 +42,14 @@ const (
 )
 
 type Loaders struct {
-	SceneByID        *SceneLoader
-	SceneFiles       *SceneFileIDsLoader
-	ScenePlayCount   *ScenePlayCountLoader
-	SceneOCount      *SceneOCountLoader
-	ScenePlayHistory *ScenePlayHistoryLoader
-	SceneOHistory    *SceneOHistoryLoader
-	SceneLastPlayed  *SceneLastPlayedLoader
+	SceneByID         *SceneLoader
+	SceneFiles        *SceneFileIDsLoader
+	ScenePlayCount    *ScenePlayCountLoader
+	SceneOCount       *SceneOCountLoader
+	ScenePlayHistory  *ScenePlayHistoryLoader
+	SceneOHistory     *SceneOHistoryLoader
+	SceneLastPlayed   *SceneLastPlayedLoader
+	SceneCustomFields *CustomFieldsLoader
 
 	ImageFiles   *ImageFileIDsLoader
 	GalleryFiles *GalleryFileIDsLoader
@@ -107,6 +108,11 @@ func (m Middleware) Middleware(next http.Handler) http.Handler {
 				maxBatch: maxBatch,
 				fetch:    m.fetchStudioCustomFields(ctx),
 			},
+			SceneCustomFields: &CustomFieldsLoader{
+				wait:     wait,
+				maxBatch: maxBatch,
+				fetch:    m.fetchSceneCustomFields(ctx),
+			},
 			StudioByID: &StudioLoader{
 				wait:     wait,
 				maxBatch: maxBatch,
@@ -207,6 +213,18 @@ func (m Middleware) fetchScenes(ctx context.Context) func(keys []int) ([]*models
 	}
 }
 
+func (m Middleware) fetchSceneCustomFields(ctx context.Context) func(keys []int) ([]models.CustomFieldMap, []error) {
+	return func(keys []int) (ret []models.CustomFieldMap, errs []error) {
+		err := m.Repository.WithDB(ctx, func(ctx context.Context) error {
+			var err error
+			ret, err = m.Repository.Scene.GetCustomFieldsBulk(ctx, keys)
+			return err
+		})
+
+		return ret, toErrorSlice(err)
+	}
+}
+
 func (m Middleware) fetchImages(ctx context.Context) func(keys []int) ([]*models.Image, []error) {
 	return func(keys []int) (ret []*models.Image, errs []error) {
 		err := m.Repository.WithDB(ctx, func(ctx context.Context) error {
diff --git a/internal/api/resolver_model_scene.go b/internal/api/resolver_model_scene.go
index 2600c9538..81113d858 100644
--- a/internal/api/resolver_model_scene.go
+++ b/internal/api/resolver_model_scene.go
@@ -410,3 +410,16 @@ func (r *sceneResolver) OHistory(ctx context.Context, obj *models.Scene) ([]*tim
 
 	return ptrRet, nil
 }
+
+func (r *sceneResolver) CustomFields(ctx context.Context, obj *models.Scene) (map[string]interface{}, error) {
+	m, err := loaders.From(ctx).SceneCustomFields.Load(obj.ID)
+	if err != nil {
+		return nil, err
+	}
+
+	if m == nil {
+		return make(map[string]interface{}), nil
+	}
+
+	return m, nil
+}
diff --git a/internal/api/resolver_mutation_scene.go b/internal/api/resolver_mutation_scene.go
index 5347de806..70158fc6f 100644
--- a/internal/api/resolver_mutation_scene.go
+++ b/internal/api/resolver_mutation_scene.go
@@ -103,8 +103,15 @@ func (r *mutationResolver) SceneCreate(ctx context.Context, input models.SceneCr
 		}
 	}
 
+	customFields := convertMapJSONNumbers(input.CustomFields)
+
 	if err := r.withTxn(ctx, func(ctx context.Context) error {
-		ret, err = r.Resolver.sceneService.Create(ctx, &newScene, fileIDs, coverImageData)
+		ret, err = r.Resolver.sceneService.Create(ctx, models.CreateSceneInput{
+			Scene:        &newScene,
+			FileIDs:      fileIDs,
+			CoverImage:   coverImageData,
+			CustomFields: customFields,
+		})
 		return err
 	}); err != nil {
 		return nil, err
@@ -306,6 +313,15 @@ func (r *mutationResolver) sceneUpdate(ctx context.Context, input models.SceneUp
 		}
 	}
 
+	var customFields *models.CustomFieldsInput
+	if input.CustomFields != nil {
+		cfCopy := *input.CustomFields
+		customFields = &cfCopy
+		// convert json.Numbers to int/float
+		customFields.Full = convertMapJSONNumbers(customFields.Full)
+		customFields.Partial = convertMapJSONNumbers(customFields.Partial)
+	}
+
 	scene, err := qb.UpdatePartial(ctx, sceneID, *updatedScene)
 	if err != nil {
 		return nil, err
@@ -317,6 +333,12 @@ func (r *mutationResolver) sceneUpdate(ctx context.Context, input models.SceneUp
 		}
 	}
 
+	if customFields != nil {
+		if err := qb.SetCustomFields(ctx, scene.ID, *customFields); err != nil {
+			return nil, err
+		}
+	}
+
 	return scene, nil
 }
 
@@ -387,6 +409,12 @@ func (r *mutationResolver) BulkSceneUpdate(ctx context.Context, input BulkSceneU
 		}
 	}
 
+	var customFields *models.CustomFieldsInput
+	if input.CustomFields != nil {
+		cf := handleUpdateCustomFields(*input.CustomFields)
+		customFields = &cf
+	}
+
 	ret := []*models.Scene{}
 
 	// Start the transaction and save the scenes
@@ -399,6 +427,12 @@ func (r *mutationResolver) BulkSceneUpdate(ctx context.Context, input BulkSceneU
 				return err
 			}
 
+			if customFields != nil {
+				if err := qb.SetCustomFields(ctx, scene.ID, *customFields); err != nil {
+					return err
+				}
+			}
+
 			ret = append(ret, scene)
 		}
 
@@ -575,6 +609,7 @@ func (r *mutationResolver) SceneMerge(ctx context.Context, input SceneMergeInput
 
 	var values *models.ScenePartial
 	var coverImageData []byte
+	var customFields *models.CustomFieldsInput
 
 	if input.Values != nil {
 		translator := changesetTranslator{
@@ -593,6 +628,11 @@ func (r *mutationResolver) SceneMerge(ctx context.Context, input SceneMergeInput
 				return nil, fmt.Errorf("processing cover image: %w", err)
 			}
 		}
+
+		if input.Values.CustomFields != nil {
+			cf := handleUpdateCustomFields(*input.Values.CustomFields)
+			customFields = &cf
+		}
 	} else {
 		v := models.NewScenePartial()
 		values = &v
@@ -626,7 +666,15 @@ func (r *mutationResolver) SceneMerge(ctx context.Context, input SceneMergeInput
 
 		// only update cover image if one was provided
 		if len(coverImageData) > 0 {
-			return r.sceneUpdateCoverImage(ctx, ret, coverImageData)
+			if err := r.sceneUpdateCoverImage(ctx, ret, coverImageData); err != nil {
+				return err
+			}
+		}
+
+		if customFields != nil {
+			if err := r.Resolver.repository.Scene.SetCustomFields(ctx, ret.ID, *customFields); err != nil {
+				return err
+			}
 		}
 
 		return nil
diff --git a/internal/manager/repository.go b/internal/manager/repository.go
index e51e737ee..afbf0b963 100644
--- a/internal/manager/repository.go
+++ b/internal/manager/repository.go
@@ -10,7 +10,7 @@ import (
 )
 
 type SceneService interface {
-	Create(ctx context.Context, input *models.Scene, fileIDs []models.FileID, coverImage []byte) (*models.Scene, error)
+	Create(ctx context.Context, input models.CreateSceneInput) (*models.Scene, error)
 	AssignFile(ctx context.Context, sceneID int, fileID models.FileID) error
 	Merge(ctx context.Context, sourceIDs []int, destinationID int, fileDeleter *scene.FileDeleter, options scene.MergeOptions) error
 	Destroy(ctx context.Context, scene *models.Scene, fileDeleter *scene.FileDeleter, deleteGenerated, deleteFile, destroyFileEntry bool) error
diff --git a/pkg/models/jsonschema/scene.go b/pkg/models/jsonschema/scene.go
index c2f266d5c..8f15b9c5d 100644
--- a/pkg/models/jsonschema/scene.go
+++ b/pkg/models/jsonschema/scene.go
@@ -80,6 +80,8 @@ type Scene struct {
 
 	PlayDuration float64          `json:"play_duration,omitempty"`
 	StashIDs     []models.StashID `json:"stash_ids,omitempty"`
+
+	CustomFields map[string]interface{} `json:"custom_fields,omitempty"`
 }
 
 func (s Scene) Filename(id int, basename string, hash string) string {
diff --git a/pkg/models/mocks/SceneReaderWriter.go b/pkg/models/mocks/SceneReaderWriter.go
index ef10c890d..0053ad6f8 100644
--- a/pkg/models/mocks/SceneReaderWriter.go
+++ b/pkg/models/mocks/SceneReaderWriter.go
@@ -754,6 +754,52 @@ func (_m *SceneReaderWriter) GetCover(ctx context.Context, sceneID int) ([]byte,
 	return r0, r1
 }
 
+// GetCustomFields provides a mock function with given fields: ctx, id
+func (_m *SceneReaderWriter) GetCustomFields(ctx context.Context, id int) (map[string]interface{}, error) {
+	ret := _m.Called(ctx, id)
+
+	var r0 map[string]interface{}
+	if rf, ok := ret.Get(0).(func(context.Context, int) map[string]interface{}); ok {
+		r0 = rf(ctx, id)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(map[string]interface{})
+		}
+	}
+
+	var r1 error
+	if rf, ok := ret.Get(1).(func(context.Context, int) error); ok {
+		r1 = rf(ctx, id)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// GetCustomFieldsBulk provides a mock function with given fields: ctx, ids
+func (_m *SceneReaderWriter) GetCustomFieldsBulk(ctx context.Context, ids []int) ([]models.CustomFieldMap, error) {
+	ret := _m.Called(ctx, ids)
+
+	var r0 []models.CustomFieldMap
+	if rf, ok := ret.Get(0).(func(context.Context, []int) []models.CustomFieldMap); ok {
+		r0 = rf(ctx, ids)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).([]models.CustomFieldMap)
+		}
+	}
+
+	var r1 error
+	if rf, ok := ret.Get(1).(func(context.Context, []int) error); ok {
+		r1 = rf(ctx, ids)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
 // GetFiles provides a mock function with given fields: ctx, relatedID
 func (_m *SceneReaderWriter) GetFiles(ctx context.Context, relatedID int) ([]*models.VideoFile, error) {
 	ret := _m.Called(ctx, relatedID)
@@ -1332,6 +1378,20 @@ func (_m *SceneReaderWriter) SaveActivity(ctx context.Context, sceneID int, resu
 	return r0, r1
 }
 
+// SetCustomFields provides a mock function with given fields: ctx, id, fields
+func (_m *SceneReaderWriter) SetCustomFields(ctx context.Context, id int, fields models.CustomFieldsInput) error {
+	ret := _m.Called(ctx, id, fields)
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context, int, models.CustomFieldsInput) error); ok {
+		r0 = rf(ctx, id, fields)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
 // Size provides a mock function with given fields: ctx
 func (_m *SceneReaderWriter) Size(ctx context.Context) (float64, error) {
 	ret := _m.Called(ctx)
diff --git a/pkg/models/model_scene.go b/pkg/models/model_scene.go
index cf0499388..64ad34b9c 100644
--- a/pkg/models/model_scene.go
+++ b/pkg/models/model_scene.go
@@ -53,6 +53,20 @@ func NewScene() Scene {
 	}
 }
 
+type CreateSceneInput struct {
+	*Scene
+
+	FileIDs      []FileID
+	CoverImage   []byte
+	CustomFields CustomFieldMap `json:"custom_fields"`
+}
+
+type UpdateSceneInput struct {
+	*Scene
+
+	CustomFields CustomFieldsInput `json:"custom_fields"`
+}
+
 // ScenePartial represents part of a Scene object. It is used to update
 // the database entry.
 type ScenePartial struct {
diff --git a/pkg/models/repository_scene.go b/pkg/models/repository_scene.go
index 8c2833470..6b795c3af 100644
--- a/pkg/models/repository_scene.go
+++ b/pkg/models/repository_scene.go
@@ -104,6 +104,7 @@ type SceneReader interface {
 	SceneGroupLoader
 	StashIDLoader
 	VideoFileLoader
+	CustomFieldsReader
 
 	All(ctx context.Context) ([]*Scene, error)
 	Wall(ctx context.Context, q *string) ([]*Scene, error)
@@ -140,6 +141,7 @@ type SceneWriter interface {
 	ViewHistoryWriter
 	SaveActivity(ctx context.Context, sceneID int, resumeTime *float64, playDuration *float64) (bool, error)
 	ResetActivity(ctx context.Context, sceneID int, resetResume bool, resetDuration bool) (bool, error)
+	CustomFieldsWriter
 }
 
 // SceneReaderWriter provides all scene methods.
diff --git a/pkg/models/scene.go b/pkg/models/scene.go
index 22863c4d9..839452501 100644
--- a/pkg/models/scene.go
+++ b/pkg/models/scene.go
@@ -139,6 +139,9 @@ type SceneFilterType struct {
 	CreatedAt *TimestampCriterionInput `json:"created_at"`
 	// Filter by updated at
 	UpdatedAt *TimestampCriterionInput `json:"updated_at"`
+
+	// Filter by custom fields
+	CustomFields []CustomFieldCriterionInput `json:"custom_fields"`
 }
 
 type SceneQueryOptions struct {
@@ -192,7 +195,8 @@ type SceneCreateInput struct {
 	// The first id will be assigned as primary.
 	// Files will be reassigned from existing scenes if applicable.
 	// Files must not already be primary for another scene.
-	FileIds []string `json:"file_ids"`
+	FileIds      []string       `json:"file_ids"`
+	CustomFields map[string]any `json:"custom_fields,omitempty"`
 }
 
 type SceneUpdateInput struct {
@@ -221,6 +225,7 @@ type SceneUpdateInput struct {
 	PlayDuration  *float64       `json:"play_duration"`
 	PlayCount     *int           `json:"play_count"`
 	PrimaryFileID *string        `json:"primary_file_id"`
+	CustomFields  *CustomFieldsInput
 }
 
 type SceneDestroyInput struct {
diff --git a/pkg/scene/create.go b/pkg/scene/create.go
index cd9234b5d..248906295 100644
--- a/pkg/scene/create.go
+++ b/pkg/scene/create.go
@@ -10,14 +10,14 @@ import (
 	"github.com/stashapp/stash/pkg/plugin/hook"
 )
 
-func (s *Service) Create(ctx context.Context, input *models.Scene, fileIDs []models.FileID, coverImage []byte) (*models.Scene, error) {
+func (s *Service) Create(ctx context.Context, input models.CreateSceneInput) (*models.Scene, error) {
 	// title must be set if no files are provided
-	if input.Title == "" && len(fileIDs) == 0 {
+	if input.Scene.Title == "" && len(input.FileIDs) == 0 {
 		return nil, errors.New("title must be set if scene has no files")
 	}
 
 	now := time.Now()
-	newScene := *input
+	newScene := *input.Scene
 	newScene.CreatedAt = now
 	newScene.UpdatedAt = now
 
@@ -27,16 +27,24 @@ func (s *Service) Create(ctx context.Context, input *models.Scene, fileIDs []mod
 		return nil, fmt.Errorf("creating new scene: %w", err)
 	}
 
-	for _, f := range fileIDs {
+	if len(input.CustomFields) > 0 {
+		if err := s.Repository.SetCustomFields(ctx, newScene.ID, models.CustomFieldsInput{
+			Full: input.CustomFields,
+		}); err != nil {
+			return nil, fmt.Errorf("setting custom fields on new scene: %w", err)
+		}
+	}
+
+	for _, f := range input.FileIDs {
 		if err := s.AssignFile(ctx, newScene.ID, f); err != nil {
 			return nil, fmt.Errorf("assigning file %d to new scene: %w", f, err)
 		}
 	}
 
-	if len(fileIDs) > 0 {
+	if len(input.FileIDs) > 0 {
 		// assign the primary to the first
 		if _, err := s.Repository.UpdatePartial(ctx, newScene.ID, models.ScenePartial{
-			PrimaryFileID: &fileIDs[0],
+			PrimaryFileID: &input.FileIDs[0],
 		}); err != nil {
 			return nil, fmt.Errorf("setting primary file on new scene: %w", err)
 		}
@@ -48,8 +56,8 @@ func (s *Service) Create(ctx context.Context, input *models.Scene, fileIDs []mod
 		return nil, err
 	}
 
-	if len(coverImage) > 0 {
-		if err := s.Repository.UpdateCover(ctx, ret.ID, coverImage); err != nil {
+	if len(input.CoverImage) > 0 {
+		if err := s.Repository.UpdateCover(ctx, ret.ID, input.CoverImage); err != nil {
 			return nil, fmt.Errorf("setting cover on new scene: %w", err)
 		}
 	}
diff --git a/pkg/scene/export.go b/pkg/scene/export.go
index a012d1850..069bd587f 100644
--- a/pkg/scene/export.go
+++ b/pkg/scene/export.go
@@ -17,6 +17,7 @@ import (
 type ExportGetter interface {
 	models.ViewDateReader
 	models.ODateReader
+	models.CustomFieldsReader
 	GetCover(ctx context.Context, sceneID int) ([]byte, error)
 }
 
@@ -92,6 +93,11 @@ func ToBasicJSON(ctx context.Context, reader ExportGetter, scene *models.Scene)
 		newSceneJSON.OHistory = append(newSceneJSON.OHistory, json.JSONTime{Time: date})
 	}
 
+	newSceneJSON.CustomFields, err = reader.GetCustomFields(ctx, scene.ID)
+	if err != nil {
+		return nil, fmt.Errorf("getting scene custom fields: %v", err)
+	}
+
 	return &newSceneJSON, nil
 }
 
diff --git a/pkg/scene/export_test.go b/pkg/scene/export_test.go
index cde421bd8..9547ab5e7 100644
--- a/pkg/scene/export_test.go
+++ b/pkg/scene/export_test.go
@@ -22,6 +22,7 @@ const (
 	studioID        = 4
 	missingStudioID = 5
 	errStudioID     = 6
+	customFieldsID  = 7
 
 	noTagsID  = 11
 	errTagsID = 12
@@ -33,6 +34,7 @@ const (
 	errMarkersID        = 17
 	errFindPrimaryTagID = 18
 	errFindByMarkerID   = 19
+	errCustomFieldsID   = 20
 )
 
 var (
@@ -82,6 +84,13 @@ var (
 	updateTime = time.Date(2002, 01, 01, 0, 0, 0, 0, time.UTC)
 )
 
+var (
+	emptyCustomFields = make(map[string]interface{})
+	customFields      = map[string]interface{}{
+		"customField1": "customValue1",
+	}
+)
+
 func createFullScene(id int) models.Scene {
 	return models.Scene{
 		ID:        id,
@@ -123,7 +132,7 @@ func createEmptyScene(id int) models.Scene {
 	}
 }
 
-func createFullJSONScene(image string) *jsonschema.Scene {
+func createFullJSONScene(image string, customFields map[string]interface{}) *jsonschema.Scene {
 	return &jsonschema.Scene{
 		Title:     title,
 		Files:     []string{path},
@@ -142,6 +151,7 @@ func createFullJSONScene(image string) *jsonschema.Scene {
 		StashIDs: []models.StashID{
 			stashID,
 		},
+		CustomFields: customFields,
 	}
 }
 
@@ -155,32 +165,49 @@ func createEmptyJSONScene() *jsonschema.Scene {
 		UpdatedAt: json.JSONTime{
 			Time: updateTime,
 		},
+		CustomFields: emptyCustomFields,
 	}
 }
 
 type basicTestScenario struct {
-	input    models.Scene
-	expected *jsonschema.Scene
-	err      bool
+	input        models.Scene
+	customFields map[string]interface{}
+	expected     *jsonschema.Scene
+	err          bool
 }
 
 var scenarios = []basicTestScenario{
 	{
 		createFullScene(sceneID),
-		createFullJSONScene(imageBase64),
+		emptyCustomFields,
+		createFullJSONScene(imageBase64, emptyCustomFields),
+		false,
+	},
+	{
+		createFullScene(customFieldsID),
+		customFields,
+		createFullJSONScene("", customFields),
 		false,
 	},
 	{
 		createEmptyScene(noImageID),
+		emptyCustomFields,
 		createEmptyJSONScene(),
 		false,
 	},
 	{
 		createFullScene(errImageID),
-		createFullJSONScene(""),
+		emptyCustomFields,
+		createFullJSONScene("", emptyCustomFields),
 		// failure to get image should not cause an error
 		false,
 	},
+	{
+		createFullScene(errCustomFieldsID),
+		customFields,
+		createFullJSONScene("", customFields),
+		true,
+	},
 }
 
 func TestToJSON(t *testing.T) {
@@ -191,8 +218,12 @@ func TestToJSON(t *testing.T) {
 	db.Scene.On("GetCover", testCtx, sceneID).Return(imageBytes, nil).Once()
 	db.Scene.On("GetCover", testCtx, noImageID).Return(nil, nil).Once()
 	db.Scene.On("GetCover", testCtx, errImageID).Return(nil, imageErr).Once()
+	db.Scene.On("GetCover", testCtx, mock.Anything).Return(nil, nil)
 	db.Scene.On("GetViewDates", testCtx, mock.Anything).Return(nil, nil)
 	db.Scene.On("GetODates", testCtx, mock.Anything).Return(nil, nil)
+	db.Scene.On("GetCustomFields", testCtx, customFieldsID).Return(customFields, nil).Once()
+	db.Scene.On("GetCustomFields", testCtx, errCustomFieldsID).Return(nil, errors.New("error getting custom fields")).Once()
+	db.Scene.On("GetCustomFields", testCtx, mock.Anything).Return(emptyCustomFields, nil)
 
 	for i, s := range scenarios {
 		scene := s.input
@@ -203,6 +234,8 @@ func TestToJSON(t *testing.T) {
 			t.Errorf("[%d] unexpected error: %s", i, err.Error())
 		case s.err && err == nil:
 			t.Errorf("[%d] expected error not returned", i)
+		case err != nil:
+			// error case already handled, no need for assertion
 		default:
 			assert.Equal(t, s.expected, json, "[%d]", i)
 		}
diff --git a/pkg/scene/import.go b/pkg/scene/import.go
index 58604e1a5..24dbf1cc0 100644
--- a/pkg/scene/import.go
+++ b/pkg/scene/import.go
@@ -18,6 +18,7 @@ type ImporterReaderWriter interface {
 	models.SceneCreatorUpdater
 	models.ViewHistoryWriter
 	models.OHistoryWriter
+	models.CustomFieldsWriter
 	FindByFileID(ctx context.Context, fileID models.FileID) ([]*models.Scene, error)
 }
 
@@ -35,6 +36,7 @@ type Importer struct {
 
 	ID             int
 	scene          models.Scene
+	customFields   map[string]interface{}
 	coverImageData []byte
 	viewHistory    []time.Time
 	oHistory       []time.Time
@@ -75,6 +77,8 @@ func (i *Importer) PreImport(ctx context.Context) error {
 		}
 	}
 
+	i.customFields = i.Input.CustomFields
+
 	i.populateViewHistory()
 	i.populateOHistory()
 
@@ -449,6 +453,14 @@ func (i *Importer) PostImport(ctx context.Context, id int) error {
 		return err
 	}
 
+	if len(i.customFields) > 0 {
+		if err := i.ReaderWriter.SetCustomFields(ctx, id, models.CustomFieldsInput{
+			Full: i.customFields,
+		}); err != nil {
+			return fmt.Errorf("error setting scene custom fields: %v", err)
+		}
+	}
+
 	return nil
 }
 
diff --git a/pkg/scene/import_test.go b/pkg/scene/import_test.go
index 4936ec2bb..98924e20d 100644
--- a/pkg/scene/import_test.go
+++ b/pkg/scene/import_test.go
@@ -549,3 +549,103 @@ func TestImporterPreImportWithMissingTagCreateErr(t *testing.T) {
 
 	db.AssertExpectations(t)
 }
+
+func TestImporterPostImport(t *testing.T) {
+	db := mocks.NewDatabase()
+
+	vt := time.Now()
+	ot := vt.Add(time.Minute)
+
+	var (
+		okID              = 1
+		errViewHistoryID  = 2
+		errOHistoryID     = 3
+		errImageID        = 4
+		errCustomFieldsID = 5
+	)
+
+	var (
+		errImage        = errors.New("error updating cover image")
+		errViewHistory  = errors.New("error updating view history")
+		errOHistory     = errors.New("error updating o history")
+		errCustomFields = errors.New("error updating custom fields")
+	)
+
+	table := []struct {
+		name     string
+		importer Importer
+		err      bool
+	}{
+		{
+			name: "all set successfully",
+			importer: Importer{
+				ID:             okID,
+				coverImageData: []byte(imageBase64),
+				viewHistory:    []time.Time{vt},
+				oHistory:       []time.Time{ot},
+				customFields:   customFields,
+			},
+			err: false,
+		},
+		{
+			name: "cover image set with error",
+			importer: Importer{
+				ID:             errImageID,
+				coverImageData: []byte(invalidImage),
+			},
+			err: true,
+		},
+		{
+			name: "view history set with error",
+			importer: Importer{
+				ID:          errViewHistoryID,
+				viewHistory: []time.Time{vt},
+			},
+			err: true,
+		},
+		{
+			name: "o history set with error",
+			importer: Importer{
+				ID:       errOHistoryID,
+				oHistory: []time.Time{ot},
+			},
+			err: true,
+		},
+		{
+			name: "custom fields set with error",
+			importer: Importer{
+				ID:           errCustomFieldsID,
+				customFields: customFields,
+			},
+			err: true,
+		},
+	}
+
+	db.Scene.On("UpdateCover", testCtx, okID, []byte(imageBase64)).Return(nil).Once()
+	db.Scene.On("UpdateCover", testCtx, errImageID, []byte(invalidImage)).Return(errImage).Once()
+	db.Scene.On("AddViews", testCtx, okID, []time.Time{vt}).Return([]time.Time{vt}, nil).Once()
+	db.Scene.On("AddViews", testCtx, errViewHistoryID, []time.Time{vt}).Return(nil, errViewHistory).Once()
+	db.Scene.On("AddO", testCtx, okID, []time.Time{ot}).Return([]time.Time{ot}, nil).Once()
+	db.Scene.On("AddO", testCtx, errOHistoryID, []time.Time{ot}).Return(nil, errOHistory).Once()
+	db.Scene.On("SetCustomFields", testCtx, okID, models.CustomFieldsInput{
+		Full: customFields,
+	}).Return(nil).Once()
+	db.Scene.On("SetCustomFields", testCtx, errCustomFieldsID, models.CustomFieldsInput{
+		Full: customFields,
+	}).Return(errCustomFields).Once()
+
+	for _, tt := range table {
+		t.Run(tt.name, func(t *testing.T) {
+			i := tt.importer
+			i.ReaderWriter = db.Scene
+
+			err := i.PostImport(testCtx, i.ID)
+
+			if tt.err {
+				assert.NotNil(t, err, "expected error but got nil")
+			} else {
+				assert.Nil(t, err, "unexpected error: %v", err)
+			}
+		})
+	}
+}
diff --git a/pkg/sqlite/anonymise.go b/pkg/sqlite/anonymise.go
index e3b7492cc..e0a354980 100644
--- a/pkg/sqlite/anonymise.go
+++ b/pkg/sqlite/anonymise.go
@@ -332,6 +332,10 @@ func (db *Anonymiser) anonymiseScenes(ctx context.Context) error {
 		return err
 	}
 
+	if err := db.anonymiseCustomFields(ctx, goqu.T(scenesCustomFieldsTable.GetTable()), "scene_id"); err != nil {
+		return err
+	}
+
 	return nil
 }
 
diff --git a/pkg/sqlite/custom_fields_test.go b/pkg/sqlite/custom_fields_test.go
index 8ee154aec..a2c045851 100644
--- a/pkg/sqlite/custom_fields_test.go
+++ b/pkg/sqlite/custom_fields_test.go
@@ -11,11 +11,23 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func TestSetCustomFields(t *testing.T) {
-	performerIdx := performerIdx1WithScene
+type customFieldsReaderWriter interface {
+	models.CustomFieldsReader
+	models.CustomFieldsWriter
+}
+
+func testSetCustomFields(t *testing.T, namePrefix string, store customFieldsReaderWriter, id int, origCustomFields map[string]interface{}) {
+	getCustomFields := func() map[string]interface{} {
+		m := make(map[string]interface{})
+		for k, v := range origCustomFields {
+			m[k] = v
+		}
+		return m
+	}
 
 	mergeCustomFields := func(i map[string]interface{}) map[string]interface{} {
-		m := getPerformerCustomFields(performerIdx)
+		m := getCustomFields()
+
 		for k, v := range i {
 			m[k] = v
 		}
@@ -70,7 +82,7 @@ func TestSetCustomFields(t *testing.T) {
 				Remove: []string{"real"},
 			},
 			func() map[string]interface{} {
-				m := getPerformerCustomFields(performerIdx)
+				m := getCustomFields()
 				delete(m, "real")
 				return m
 			}(),
@@ -180,12 +192,8 @@ func TestSetCustomFields(t *testing.T) {
 		},
 	}
 
-	// use performer custom fields store
-	store := db.Performer
-	id := performerIDs[performerIdx]
-
 	for _, tt := range tests {
-		runWithRollbackTxn(t, tt.name, func(t *testing.T, ctx context.Context) {
+		runWithRollbackTxn(t, namePrefix+" "+tt.name, func(t *testing.T, ctx context.Context) {
 			assert := assert.New(t)
 
 			err := store.SetCustomFields(ctx, id, tt.input)
@@ -208,3 +216,27 @@ func TestSetCustomFields(t *testing.T) {
 		})
 	}
 }
+
+func TestPerformerSetCustomFields(t *testing.T) {
+	performerIdx := performerIdx1WithScene
+
+	testSetCustomFields(t, "Performer", db.Performer, performerIDs[performerIdx], getPerformerCustomFields(performerIdx))
+}
+
+func TestTagSetCustomFields(t *testing.T) {
+	tagIdx := tagIdx1WithScene
+
+	testSetCustomFields(t, "Tag", db.Tag, tagIDs[tagIdx], getTagCustomFields(tagIdx))
+}
+
+func TestStudioSetCustomFields(t *testing.T) {
+	studioIdx := studioIdxWithScene
+
+	testSetCustomFields(t, "Studio", db.Studio, studioIDs[studioIdx], getStudioCustomFields(studioIdx))
+}
+
+func TestSceneSetCustomFields(t *testing.T) {
+	sceneIdx := sceneIdxWithPerformer
+
+	testSetCustomFields(t, "Scene", db.Scene, sceneIDs[sceneIdx], getSceneCustomFields(sceneIdx))
+}
diff --git a/pkg/sqlite/database.go b/pkg/sqlite/database.go
index 197602ecd..4a950b724 100644
--- a/pkg/sqlite/database.go
+++ b/pkg/sqlite/database.go
@@ -34,7 +34,7 @@ const (
 	cacheSizeEnv = "STASH_SQLITE_CACHE_SIZE"
 )
 
-var appSchemaVersion uint = 78
+var appSchemaVersion uint = 79
 
 //go:embed migrations/*.sql
 var migrationsBox embed.FS
diff --git a/pkg/sqlite/migrations/79_scene_custom_fields.up.sql b/pkg/sqlite/migrations/79_scene_custom_fields.up.sql
new file mode 100644
index 000000000..a56b34e3a
--- /dev/null
+++ b/pkg/sqlite/migrations/79_scene_custom_fields.up.sql
@@ -0,0 +1,9 @@
+CREATE TABLE `scene_custom_fields` (
+  `scene_id` integer NOT NULL,
+  `field` varchar(64) NOT NULL,
+  `value` BLOB NOT NULL,
+  PRIMARY KEY (`scene_id`, `field`),
+  foreign key(`scene_id`) references `scenes`(`id`) on delete CASCADE
+);
+
+CREATE INDEX `index_scene_custom_fields_field_value` ON `scene_custom_fields` (`field`, `value`);
\ No newline at end of file
diff --git a/pkg/sqlite/scene.go b/pkg/sqlite/scene.go
index d92800317..3049681b2 100644
--- a/pkg/sqlite/scene.go
+++ b/pkg/sqlite/scene.go
@@ -234,6 +234,7 @@ var (
 
 type SceneStore struct {
 	blobJoinQueryBuilder
+	customFieldsStore
 
 	tableMgr *table
 	oDateManager
@@ -248,6 +249,10 @@ func NewSceneStore(r *storeRepository, blobStore *BlobStore) *SceneStore {
 			blobStore: blobStore,
 			joinTable: sceneTable,
 		},
+		customFieldsStore: customFieldsStore{
+			table: scenesCustomFieldsTable,
+			fk:    scenesCustomFieldsTable.Col(sceneIDColumn),
+		},
 
 		tableMgr:        sceneTableMgr,
 		viewDateManager: viewDateManager{scenesViewTableMgr},
diff --git a/pkg/sqlite/scene_filter.go b/pkg/sqlite/scene_filter.go
index e42376950..a9eb6b0ae 100644
--- a/pkg/sqlite/scene_filter.go
+++ b/pkg/sqlite/scene_filter.go
@@ -179,6 +179,13 @@ func (qb *sceneFilterHandler) criterionHandler() criterionHandler {
 		&timestampCriterionHandler{sceneFilter.CreatedAt, "scenes.created_at", nil},
 		&timestampCriterionHandler{sceneFilter.UpdatedAt, "scenes.updated_at", nil},
 
+		&customFieldsFilterHandler{
+			table: scenesCustomFieldsTable.GetTable(),
+			fkCol: sceneIDColumn,
+			c:     sceneFilter.CustomFields,
+			idCol: "scenes.id",
+		},
+
 		&relatedFilterHandler{
 			relatedIDCol:   "scenes_galleries.gallery_id",
 			relatedRepo:    galleryRepository.repository,
diff --git a/pkg/sqlite/scene_test.go b/pkg/sqlite/scene_test.go
index 6cdb62a5e..d386175c7 100644
--- a/pkg/sqlite/scene_test.go
+++ b/pkg/sqlite/scene_test.go
@@ -4826,6 +4826,253 @@ func TestSceneStore_SaveActivity(t *testing.T) {
 	}
 }
 
+func TestSceneQueryCustomFields(t *testing.T) {
+	tests := []struct {
+		name        string
+		filter      *models.SceneFilterType
+		includeIdxs []int
+		excludeIdxs []int
+		wantErr     bool
+	}{
+		{
+			"equals",
+			&models.SceneFilterType{
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "string",
+						Modifier: models.CriterionModifierEquals,
+						Value:    []any{getSceneStringValue(sceneIdxWithGallery, "custom")},
+					},
+				},
+			},
+			[]int{sceneIdxWithGallery},
+			nil,
+			false,
+		},
+		{
+			"not equals",
+			&models.SceneFilterType{
+				Title: &models.StringCriterionInput{
+					Value:    getSceneTitle(sceneIdxWithGallery),
+					Modifier: models.CriterionModifierEquals,
+				},
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "string",
+						Modifier: models.CriterionModifierNotEquals,
+						Value:    []any{getSceneStringValue(sceneIdxWithGallery, "custom")},
+					},
+				},
+			},
+			nil,
+			[]int{sceneIdxWithGallery},
+			false,
+		},
+		{
+			"includes",
+			&models.SceneFilterType{
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "string",
+						Modifier: models.CriterionModifierIncludes,
+						Value:    []any{getSceneStringValue(sceneIdxWithGallery, "custom")[9:]},
+					},
+				},
+			},
+			[]int{sceneIdxWithGallery},
+			nil,
+			false,
+		},
+		{
+			"excludes",
+			&models.SceneFilterType{
+				Title: &models.StringCriterionInput{
+					Value:    getSceneTitle(sceneIdxWithGallery),
+					Modifier: models.CriterionModifierEquals,
+				},
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "string",
+						Modifier: models.CriterionModifierExcludes,
+						Value:    []any{getSceneStringValue(sceneIdxWithGallery, "custom")[9:]},
+					},
+				},
+			},
+			nil,
+			[]int{sceneIdxWithGallery},
+			false,
+		},
+		{
+			"regex",
+			&models.SceneFilterType{
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "string",
+						Modifier: models.CriterionModifierMatchesRegex,
+						Value:    []any{".*17_custom"},
+					},
+				},
+			},
+			[]int{sceneIdxWithTwoPerformerTag},
+			nil,
+			false,
+		},
+		{
+			"invalid regex",
+			&models.SceneFilterType{
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "string",
+						Modifier: models.CriterionModifierMatchesRegex,
+						Value:    []any{"["},
+					},
+				},
+			},
+			nil,
+			nil,
+			true,
+		},
+		{
+			"not matches regex",
+			&models.SceneFilterType{
+				Title: &models.StringCriterionInput{
+					Value:    getSceneTitle(sceneIdxWithTwoPerformerTag),
+					Modifier: models.CriterionModifierEquals,
+				},
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "string",
+						Modifier: models.CriterionModifierNotMatchesRegex,
+						Value:    []any{".*17_custom"},
+					},
+				},
+			},
+			nil,
+			[]int{sceneIdxWithTwoPerformerTag},
+			false,
+		},
+		{
+			"invalid not matches regex",
+			&models.SceneFilterType{
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "string",
+						Modifier: models.CriterionModifierNotMatchesRegex,
+						Value:    []any{"["},
+					},
+				},
+			},
+			nil,
+			nil,
+			true,
+		},
+		{
+			"null",
+			&models.SceneFilterType{
+				Title: &models.StringCriterionInput{
+					Value:    getSceneTitle(sceneIdxWithGallery),
+					Modifier: models.CriterionModifierEquals,
+				},
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "not existing",
+						Modifier: models.CriterionModifierIsNull,
+					},
+				},
+			},
+			[]int{sceneIdxWithGallery},
+			nil,
+			false,
+		},
+		{
+			"not null",
+			&models.SceneFilterType{
+				Title: &models.StringCriterionInput{
+					Value:    getSceneTitle(sceneIdxWithGallery),
+					Modifier: models.CriterionModifierEquals,
+				},
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "string",
+						Modifier: models.CriterionModifierNotNull,
+					},
+				},
+			},
+			[]int{sceneIdxWithGallery},
+			nil,
+			false,
+		},
+		{
+			"between",
+			&models.SceneFilterType{
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "real",
+						Modifier: models.CriterionModifierBetween,
+						Value:    []any{0.15, 0.25},
+					},
+				},
+			},
+			[]int{sceneIdxWithPerformer},
+			nil,
+			false,
+		},
+		{
+			"not between",
+			&models.SceneFilterType{
+				Title: &models.StringCriterionInput{
+					Value:    getSceneTitle(sceneIdxWithPerformer),
+					Modifier: models.CriterionModifierEquals,
+				},
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "real",
+						Modifier: models.CriterionModifierNotBetween,
+						Value:    []any{0.15, 0.25},
+					},
+				},
+			},
+			nil,
+			[]int{sceneIdxWithPerformer},
+			false,
+		},
+	}
+
+	for _, tt := range tests {
+		runWithRollbackTxn(t, tt.name, func(t *testing.T, ctx context.Context) {
+			assert := assert.New(t)
+
+			result, err := db.Scene.Query(ctx, models.SceneQueryOptions{
+				SceneFilter: tt.filter,
+			})
+			if (err != nil) != tt.wantErr {
+				t.Errorf("SceneStore.Query() error = %v, wantErr %v", err, tt.wantErr)
+			}
+
+			if err != nil {
+				return
+			}
+
+			scenes, err := result.Resolve(ctx)
+			if err != nil {
+				t.Errorf("SceneStore.Query().Resolve() error = %v", err)
+				return
+			}
+
+			ids := scenesToIDs(scenes)
+			include := indexesToIDs(sceneIDs, tt.includeIdxs)
+			exclude := indexesToIDs(sceneIDs, tt.excludeIdxs)
+
+			for _, i := range include {
+				assert.Contains(ids, i)
+			}
+			for _, e := range exclude {
+				assert.NotContains(ids, e)
+			}
+		})
+	}
+}
+
 // TODO Count
 // TODO SizeCount
 
diff --git a/pkg/sqlite/setup_test.go b/pkg/sqlite/setup_test.go
index ffa60457e..91f9f127b 100644
--- a/pkg/sqlite/setup_test.go
+++ b/pkg/sqlite/setup_test.go
@@ -1187,6 +1187,18 @@ func makeScene(i int) *models.Scene {
 	}
 }
 
+func getSceneCustomFields(index int) map[string]interface{} {
+	if index%5 == 0 {
+		return nil
+	}
+
+	return map[string]interface{}{
+		"string": getSceneStringValue(index, "custom"),
+		"int":    int64(index % 5),
+		"real":   float64(index) / 10,
+	}
+}
+
 func createScenes(ctx context.Context, n int) error {
 	sqb := db.Scene
 	fqb := db.File
@@ -1204,6 +1216,10 @@ func createScenes(ctx context.Context, n int) error {
 			return fmt.Errorf("Error creating scene %v+: %s", scene, err.Error())
 		}
 
+		if err := sqb.SetCustomFields(ctx, scene.ID, models.CustomFieldsInput{Full: getSceneCustomFields(i)}); err != nil {
+			return fmt.Errorf("Error setting custom fields for scene %d: %s", scene.ID, err.Error())
+		}
+
 		sceneIDs = append(sceneIDs, scene.ID)
 	}
 
diff --git a/pkg/sqlite/tables.go b/pkg/sqlite/tables.go
index f46190a30..53e62b166 100644
--- a/pkg/sqlite/tables.go
+++ b/pkg/sqlite/tables.go
@@ -27,6 +27,7 @@ var (
 	scenesStashIDsJoinTable   = goqu.T("scene_stash_ids")
 	scenesGroupsJoinTable     = goqu.T(groupsScenesTable)
 	scenesURLsJoinTable       = goqu.T(scenesURLsTable)
+	scenesCustomFieldsTable   = goqu.T("scene_custom_fields")
 
 	sceneMarkersTagsJoinTable = goqu.T(sceneMarkersTagsTable)
 

From 0164d7ad3132a050df3cf726d03b903c70ec9155 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Wed, 18 Feb 2026 17:30:52 +1100
Subject: [PATCH 298/405] Fix marker form start time not being set when abLoop
 disabled

---
 ui/v2.5/src/components/Scenes/SceneDetails/SceneMarkerForm.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/SceneMarkerForm.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/SceneMarkerForm.tsx
index cbb2ad4bb..a2bad2f8e 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/SceneMarkerForm.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/SceneMarkerForm.tsx
@@ -72,7 +72,7 @@ export const SceneMarkerForm: React.FC<ISceneMarkerForm> = ({
       const end = opts?.end;
       const hasAbLoop = Number.isFinite(start);
 
-      if (hasAbLoop) {
+      if (opts?.enabled && hasAbLoop) {
         const current = Math.round(getPlayerPosition() ?? 0);
         const rawEnd =
           Number.isFinite(end) && (end as number) > 0 ? (end as number) : null;

From b653e91fae2c3850e8c6e5790aabf5821d9ac28a Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Thu, 19 Feb 2026 08:09:06 +1100
Subject: [PATCH 299/405] Fix panic in IsFsPathCaseSensitive (#6589)

* Add crashing unit test
* Fix IsFsPathCaseSensitive to use runes
---
 pkg/fsutil/fs.go      |  6 +++---
 pkg/fsutil/fs_test.go | 44 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 3 deletions(-)
 create mode 100644 pkg/fsutil/fs_test.go

diff --git a/pkg/fsutil/fs.go b/pkg/fsutil/fs.go
index 2b5c37f62..10666bb63 100644
--- a/pkg/fsutil/fs.go
+++ b/pkg/fsutil/fs.go
@@ -32,8 +32,8 @@ func IsFsPathCaseSensitive(path string) (bool, error) {
 		return false, fmt.Errorf("could not case flip path %s", path)
 	}
 
-	flipped := []byte(path)
-	for _, c := range []byte(fBase) { // replace base of path with the flipped one ( we need to flip the base or last dir part )
+	flipped := []rune(path)
+	for _, c := range fBase { // replace base of path with the flipped one ( we need to flip the base or last dir part )
 		flipped[i] = c
 		i++
 	}
@@ -43,7 +43,7 @@ func IsFsPathCaseSensitive(path string) (bool, error) {
 		return true, nil // fs of path should be case sensitive
 	}
 
-	if fiCase.ModTime() == fi.ModTime() { // file path exists and is the same
+	if fiCase.ModTime().Equal(fi.ModTime()) { // file path exists and is the same
 		return false, nil // fs of path is not case sensitive
 	}
 	return false, fmt.Errorf("can not determine case sensitivity of path %s", path)
diff --git a/pkg/fsutil/fs_test.go b/pkg/fsutil/fs_test.go
new file mode 100644
index 000000000..522e95fa6
--- /dev/null
+++ b/pkg/fsutil/fs_test.go
@@ -0,0 +1,44 @@
+package fsutil
+
+import (
+	"os"
+	"path/filepath"
+	"testing"
+)
+
+func TestIsFsPathCaseSensitive_UnicodeByteLength(t *testing.T) {
+	// Ⱥ (U+023A) is 2 bytes in UTF-8
+	// Its lowercase ⱥ (U+2C65) is 3 bytes in UTF-8
+
+	dir := t.TempDir()
+	makeDir := func(path string) {
+		// Create the directory so os.Stat succeeds
+		if err := os.Mkdir(path, 0755); err != nil {
+			t.Fatal(err)
+		}
+	}
+
+	path := filepath.Join(dir, "Ⱥtest")
+	makeDir(path)
+
+	// ensure the test does not panic due to byte length differences in the case flipped path
+	_, err := IsFsPathCaseSensitive(path)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// no guarantee about case sensitivity of the fs running the tests,
+	// so we just want to ensure the function works and does not panic
+	// assert.True(t, r, "expected fs to be case sensitive")
+
+	// test regular ASCII paths still work
+	path2 := filepath.Join(dir, "Test")
+	makeDir(path2)
+
+	_, err = IsFsPathCaseSensitive(path2)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// assert.True(t, r, "expected fs to be case sensitive")
+}

From 8bc4107e54906d811358ed8026bbb1349e931571 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Thu, 19 Feb 2026 08:09:58 +1100
Subject: [PATCH 300/405] Skip directory after deleting it during generated
 files clean (#6590)

---
 internal/manager/task/clean_generated.go | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/internal/manager/task/clean_generated.go b/internal/manager/task/clean_generated.go
index 902989046..a59bda6d1 100644
--- a/internal/manager/task/clean_generated.go
+++ b/internal/manager/task/clean_generated.go
@@ -565,6 +565,7 @@ func (j *CleanGeneratedJob) cleanMarkerFiles(ctx context.Context, progress *job.
 			j.setProgressFromFilename(sceneHash[0:2], progress)
 
 			// check if the scene exists
+			var walkErr error
 			if err := j.Repository.WithReadTxn(ctx, func(ctx context.Context) error {
 				var err error
 				scenes, err = j.getScenesWithHash(ctx, sceneHash)
@@ -575,15 +576,18 @@ func (j *CleanGeneratedJob) cleanMarkerFiles(ctx context.Context, progress *job.
 				if len(scenes) == 0 {
 					j.logDelete("deleting unused marker directory: %s", sceneHash)
 					j.deleteDir(path)
-				} else {
-					// get the markers now
-					for _, scene := range scenes {
-						thisMarkers, err := j.Repository.SceneMarker.FindBySceneID(ctx, scene.ID)
-						if err != nil {
-							return fmt.Errorf("error getting markers for scene: %v", err)
-						}
-						markers = append(markers, thisMarkers...)
+					// #5911 - we've just deleted the directory, so skip it in the walk to avoid errors
+					walkErr = fs.SkipDir
+					return nil
+				}
+
+				// get the markers now
+				for _, scene := range scenes {
+					thisMarkers, err := j.Repository.SceneMarker.FindBySceneID(ctx, scene.ID)
+					if err != nil {
+						return fmt.Errorf("error getting markers for scene: %v", err)
 					}
+					markers = append(markers, thisMarkers...)
 				}
 
 				return nil
@@ -591,7 +595,7 @@ func (j *CleanGeneratedJob) cleanMarkerFiles(ctx context.Context, progress *job.
 				logger.Error(err.Error())
 			}
 
-			return nil
+			return walkErr
 		}
 
 		filename := info.Name()

From 3dc86239d2c7ff9425f00d5aa2ec8aac2acda79b Mon Sep 17 00:00:00 2001
From: Gykes <24581046+Gykes@users.noreply.github.com>
Date: Wed, 18 Feb 2026 16:05:17 -0600
Subject: [PATCH 301/405] Feature Request: Add organized flag to studios
 (#6303)

---
 graphql/schema/types/filters.graphql          |  2 ++
 graphql/schema/types/studio.graphql           |  4 +++
 internal/api/resolver_mutation_studio.go      |  3 ++
 internal/manager/task_stash_box_tag.go        |  6 ++++
 pkg/models/jsonschema/studio.go               |  1 +
 pkg/models/model_studio.go                    |  2 ++
 pkg/models/studio.go                          |  4 +++
 pkg/sqlite/database.go                        |  2 +-
 .../migrations/80_studio_organized.up.sql     |  1 +
 pkg/sqlite/studio.go                          |  4 +++
 pkg/sqlite/studio_filter.go                   |  1 +
 pkg/sqlite/studio_test.go                     |  7 +++++
 pkg/studio/export.go                          |  1 +
 pkg/studio/export_test.go                     |  3 ++
 pkg/studio/import.go                          |  1 +
 pkg/studio/import_test.go                     |  1 +
 ui/v2.5/graphql/data/studio-slim.graphql      |  3 ++
 ui/v2.5/graphql/data/studio.graphql           |  1 +
 .../components/Studios/EditStudiosDialog.tsx  | 16 +++++++++-
 ui/v2.5/src/components/Studios/StudioCard.tsx | 29 +++++++++++++++++--
 .../Studios/StudioDetails/Studio.tsx          | 28 ++++++++++++++++++
 ui/v2.5/src/docs/en/Manual/AutoTagging.md     |  2 ++
 ui/v2.5/src/models/list-filter/studios.ts     |  1 +
 23 files changed, 118 insertions(+), 5 deletions(-)
 create mode 100644 pkg/sqlite/migrations/80_studio_organized.up.sql

diff --git a/graphql/schema/types/filters.graphql b/graphql/schema/types/filters.graphql
index 7633457ce..c0b47f7cf 100644
--- a/graphql/schema/types/filters.graphql
+++ b/graphql/schema/types/filters.graphql
@@ -502,6 +502,8 @@ input StudioFilterType {
   child_count: IntCriterionInput
   "Filter by autotag ignore value"
   ignore_auto_tag: Boolean
+  "Filter by organized"
+  organized: Boolean
   "Filter by related scenes that meet this criteria"
   scenes_filter: SceneFilterType
   "Filter by related images that meet this criteria"
diff --git a/graphql/schema/types/studio.graphql b/graphql/schema/types/studio.graphql
index 3e991ce96..51a87bf4f 100644
--- a/graphql/schema/types/studio.graphql
+++ b/graphql/schema/types/studio.graphql
@@ -8,6 +8,7 @@ type Studio {
   aliases: [String!]!
   tags: [Tag!]!
   ignore_auto_tag: Boolean!
+  organized: Boolean!
 
   image_path: String # Resolver
   scene_count(depth: Int): Int! # Resolver
@@ -46,6 +47,7 @@ input StudioCreateInput {
   aliases: [String!]
   tag_ids: [ID!]
   ignore_auto_tag: Boolean
+  organized: Boolean
 
   custom_fields: Map
 }
@@ -67,6 +69,7 @@ input StudioUpdateInput {
   aliases: [String!]
   tag_ids: [ID!]
   ignore_auto_tag: Boolean
+  organized: Boolean
 
   custom_fields: CustomFieldsInput
 }
@@ -82,6 +85,7 @@ input BulkStudioUpdateInput {
   details: String
   tag_ids: BulkUpdateIds
   ignore_auto_tag: Boolean
+  organized: Boolean
 }
 
 input StudioDestroyInput {
diff --git a/internal/api/resolver_mutation_studio.go b/internal/api/resolver_mutation_studio.go
index e3e1c6395..c7af918a1 100644
--- a/internal/api/resolver_mutation_studio.go
+++ b/internal/api/resolver_mutation_studio.go
@@ -38,6 +38,7 @@ func (r *mutationResolver) StudioCreate(ctx context.Context, input models.Studio
 	newStudio.Favorite = translator.bool(input.Favorite)
 	newStudio.Details = translator.string(input.Details)
 	newStudio.IgnoreAutoTag = translator.bool(input.IgnoreAutoTag)
+	newStudio.Organized = translator.bool(input.Organized)
 	newStudio.Aliases = models.NewRelatedStrings(stringslice.UniqueExcludeFold(stringslice.TrimSpace(input.Aliases), newStudio.Name))
 	newStudio.StashIDs = models.NewRelatedStashIDs(models.StashIDInputs(input.StashIds).ToStashIDs())
 
@@ -120,6 +121,7 @@ func (r *mutationResolver) StudioUpdate(ctx context.Context, input models.Studio
 	updatedStudio.Rating = translator.optionalInt(input.Rating100, "rating100")
 	updatedStudio.Favorite = translator.optionalBool(input.Favorite, "favorite")
 	updatedStudio.IgnoreAutoTag = translator.optionalBool(input.IgnoreAutoTag, "ignore_auto_tag")
+	updatedStudio.Organized = translator.optionalBool(input.Organized, "organized")
 	updatedStudio.Aliases = translator.updateStrings(input.Aliases, "aliases")
 	updatedStudio.StashIDs = translator.updateStashIDs(input.StashIds, "stash_ids")
 
@@ -261,6 +263,7 @@ func (r *mutationResolver) BulkStudioUpdate(ctx context.Context, input BulkStudi
 	partial.Rating = translator.optionalInt(input.Rating100, "rating100")
 	partial.Details = translator.optionalString(input.Details, "details")
 	partial.IgnoreAutoTag = translator.optionalBool(input.IgnoreAutoTag, "ignore_auto_tag")
+	partial.Organized = translator.optionalBool(input.Organized, "organized")
 
 	partial.TagIDs, err = translator.updateIdsBulk(input.TagIds, "tag_ids")
 	if err != nil {
diff --git a/internal/manager/task_stash_box_tag.go b/internal/manager/task_stash_box_tag.go
index 37859ba61..4848b46ad 100644
--- a/internal/manager/task_stash_box_tag.go
+++ b/internal/manager/task_stash_box_tag.go
@@ -275,6 +275,12 @@ func (t *stashBoxBatchStudioTagTask) getName() string {
 }
 
 func (t *stashBoxBatchStudioTagTask) Start(ctx context.Context) {
+	// Skip organized studios
+	if t.studio != nil && t.studio.Organized {
+		logger.Infof("Skipping organized studio %s", t.studio.Name)
+		return
+	}
+
 	studio, err := t.findStashBoxStudio(ctx)
 	if err != nil {
 		logger.Errorf("Error fetching studio data from stash-box: %v", err)
diff --git a/pkg/models/jsonschema/studio.go b/pkg/models/jsonschema/studio.go
index 7684b4317..12a797c13 100644
--- a/pkg/models/jsonschema/studio.go
+++ b/pkg/models/jsonschema/studio.go
@@ -24,6 +24,7 @@ type Studio struct {
 	StashIDs      []models.StashID `json:"stash_ids,omitempty"`
 	Tags          []string         `json:"tags,omitempty"`
 	IgnoreAutoTag bool             `json:"ignore_auto_tag,omitempty"`
+	Organized     bool             `json:"organized,omitempty"`
 
 	CustomFields map[string]interface{} `json:"custom_fields,omitempty"`
 
diff --git a/pkg/models/model_studio.go b/pkg/models/model_studio.go
index ee6fae2d2..ec81aac0e 100644
--- a/pkg/models/model_studio.go
+++ b/pkg/models/model_studio.go
@@ -16,6 +16,7 @@ type Studio struct {
 	Favorite      bool   `json:"favorite"`
 	Details       string `json:"details"`
 	IgnoreAutoTag bool   `json:"ignore_auto_tag"`
+	Organized     bool   `json:"organized"`
 
 	Aliases  RelatedStrings  `json:"aliases"`
 	URLs     RelatedStrings  `json:"urls"`
@@ -62,6 +63,7 @@ type StudioPartial struct {
 	CreatedAt     OptionalTime
 	UpdatedAt     OptionalTime
 	IgnoreAutoTag OptionalBool
+	Organized     OptionalBool
 
 	Aliases  *UpdateStrings
 	URLs     *UpdateStrings
diff --git a/pkg/models/studio.go b/pkg/models/studio.go
index 5d1def1bc..7ad8719ac 100644
--- a/pkg/models/studio.go
+++ b/pkg/models/studio.go
@@ -38,6 +38,8 @@ type StudioFilterType struct {
 	ChildCount *IntCriterionInput `json:"child_count"`
 	// Filter by autotag ignore value
 	IgnoreAutoTag *bool `json:"ignore_auto_tag"`
+	// Filter by organized
+	Organized *bool `json:"organized"`
 	// Filter by related scenes that meet this criteria
 	ScenesFilter *SceneFilterType `json:"scenes_filter"`
 	// Filter by related images that meet this criteria
@@ -69,6 +71,7 @@ type StudioCreateInput struct {
 	Aliases       []string       `json:"aliases"`
 	TagIds        []string       `json:"tag_ids"`
 	IgnoreAutoTag *bool          `json:"ignore_auto_tag"`
+	Organized     *bool          `json:"organized"`
 
 	CustomFields map[string]interface{} `json:"custom_fields"`
 }
@@ -88,6 +91,7 @@ type StudioUpdateInput struct {
 	Aliases       []string       `json:"aliases"`
 	TagIds        []string       `json:"tag_ids"`
 	IgnoreAutoTag *bool          `json:"ignore_auto_tag"`
+	Organized     *bool          `json:"organized"`
 
 	CustomFields CustomFieldsInput `json:"custom_fields"`
 }
diff --git a/pkg/sqlite/database.go b/pkg/sqlite/database.go
index 4a950b724..5b67e5602 100644
--- a/pkg/sqlite/database.go
+++ b/pkg/sqlite/database.go
@@ -34,7 +34,7 @@ const (
 	cacheSizeEnv = "STASH_SQLITE_CACHE_SIZE"
 )
 
-var appSchemaVersion uint = 79
+var appSchemaVersion uint = 80
 
 //go:embed migrations/*.sql
 var migrationsBox embed.FS
diff --git a/pkg/sqlite/migrations/80_studio_organized.up.sql b/pkg/sqlite/migrations/80_studio_organized.up.sql
new file mode 100644
index 000000000..3aa9c4656
--- /dev/null
+++ b/pkg/sqlite/migrations/80_studio_organized.up.sql
@@ -0,0 +1 @@
+ALTER TABLE `studios` ADD COLUMN `organized` boolean not null default '0';
\ No newline at end of file
diff --git a/pkg/sqlite/studio.go b/pkg/sqlite/studio.go
index 949929c8d..a866a94ab 100644
--- a/pkg/sqlite/studio.go
+++ b/pkg/sqlite/studio.go
@@ -44,6 +44,7 @@ type studioRow struct {
 	Favorite      bool        `db:"favorite"`
 	Details       zero.String `db:"details"`
 	IgnoreAutoTag bool        `db:"ignore_auto_tag"`
+	Organized     bool        `db:"organized"`
 
 	// not used in resolutions or updates
 	ImageBlob zero.String `db:"image_blob"`
@@ -59,6 +60,7 @@ func (r *studioRow) fromStudio(o models.Studio) {
 	r.Favorite = o.Favorite
 	r.Details = zero.StringFrom(o.Details)
 	r.IgnoreAutoTag = o.IgnoreAutoTag
+	r.Organized = o.Organized
 }
 
 func (r *studioRow) resolve() *models.Studio {
@@ -72,6 +74,7 @@ func (r *studioRow) resolve() *models.Studio {
 		Favorite:      r.Favorite,
 		Details:       r.Details.String,
 		IgnoreAutoTag: r.IgnoreAutoTag,
+		Organized:     r.Organized,
 	}
 
 	return ret
@@ -90,6 +93,7 @@ func (r *studioRowRecord) fromPartial(o models.StudioPartial) {
 	r.setBool("favorite", o.Favorite)
 	r.setNullString("details", o.Details)
 	r.setBool("ignore_auto_tag", o.IgnoreAutoTag)
+	r.setBool("organized", o.Organized)
 }
 
 type studioRepositoryType struct {
diff --git a/pkg/sqlite/studio_filter.go b/pkg/sqlite/studio_filter.go
index 889bd4c74..cfe3c59b6 100644
--- a/pkg/sqlite/studio_filter.go
+++ b/pkg/sqlite/studio_filter.go
@@ -59,6 +59,7 @@ func (qb *studioFilterHandler) criterionHandler() criterionHandler {
 		intCriterionHandler(studioFilter.Rating100, studioTable+".rating", nil),
 		boolCriterionHandler(studioFilter.Favorite, studioTable+".favorite", nil),
 		boolCriterionHandler(studioFilter.IgnoreAutoTag, studioTable+".ignore_auto_tag", nil),
+		boolCriterionHandler(studioFilter.Organized, studioTable+".organized", nil),
 
 		criterionHandlerFunc(func(ctx context.Context, f *filterBuilder) {
 			if studioFilter.StashID != nil {
diff --git a/pkg/sqlite/studio_test.go b/pkg/sqlite/studio_test.go
index 968f43413..eebc677c3 100644
--- a/pkg/sqlite/studio_test.go
+++ b/pkg/sqlite/studio_test.go
@@ -81,6 +81,7 @@ func Test_StudioStore_Create(t *testing.T) {
 		rating        = 3
 		aliases       = []string{"alias1", "alias2"}
 		ignoreAutoTag = true
+		organized     = true
 		favorite      = true
 		endpoint1     = "endpoint1"
 		endpoint2     = "endpoint2"
@@ -105,6 +106,7 @@ func Test_StudioStore_Create(t *testing.T) {
 					Rating:        &rating,
 					Details:       details,
 					IgnoreAutoTag: ignoreAutoTag,
+					Organized:     organized,
 					TagIDs:        models.NewRelatedIDs([]int{tagIDs[tagIdx1WithStudio], tagIDs[tagIdx1WithDupName]}),
 					Aliases:       models.NewRelatedStrings(aliases),
 					StashIDs: models.NewRelatedStashIDs([]models.StashID{
@@ -206,6 +208,7 @@ func Test_StudioStore_Update(t *testing.T) {
 		rating        = 3
 		aliases       = []string{"aliasX", "aliasY"}
 		ignoreAutoTag = true
+		organized     = true
 		favorite      = true
 		endpoint1     = "endpoint1"
 		endpoint2     = "endpoint2"
@@ -231,6 +234,7 @@ func Test_StudioStore_Update(t *testing.T) {
 					Rating:        &rating,
 					Details:       details,
 					IgnoreAutoTag: ignoreAutoTag,
+					Organized:     organized,
 					Aliases:       models.NewRelatedStrings(aliases),
 					TagIDs:        models.NewRelatedIDs([]int{tagIDs[tagIdx1WithDupName], tagIDs[tagIdx1WithStudio]}),
 					StashIDs: models.NewRelatedStashIDs([]models.StashID{
@@ -380,6 +384,7 @@ func Test_StudioStore_UpdatePartial(t *testing.T) {
 		aliases       = []string{"aliasX", "aliasY"}
 		rating        = 3
 		ignoreAutoTag = true
+		organized     = true
 		favorite      = true
 		endpoint1     = "endpoint1"
 		endpoint2     = "endpoint2"
@@ -413,6 +418,7 @@ func Test_StudioStore_UpdatePartial(t *testing.T) {
 				Rating:        models.NewOptionalInt(rating),
 				Details:       models.NewOptionalString(details),
 				IgnoreAutoTag: models.NewOptionalBool(ignoreAutoTag),
+				Organized:     models.NewOptionalBool(organized),
 				TagIDs: &models.UpdateIDs{
 					IDs:  []int{tagIDs[tagIdx1WithStudio], tagIDs[tagIdx1WithDupName]},
 					Mode: models.RelationshipUpdateModeSet,
@@ -444,6 +450,7 @@ func Test_StudioStore_UpdatePartial(t *testing.T) {
 				Rating:        &rating,
 				Details:       details,
 				IgnoreAutoTag: ignoreAutoTag,
+				Organized:     organized,
 				TagIDs:        models.NewRelatedIDs([]int{tagIDs[tagIdx1WithDupName], tagIDs[tagIdx1WithStudio]}),
 				StashIDs: models.NewRelatedStashIDs([]models.StashID{
 					{
diff --git a/pkg/studio/export.go b/pkg/studio/export.go
index c3a50668f..206791da6 100644
--- a/pkg/studio/export.go
+++ b/pkg/studio/export.go
@@ -27,6 +27,7 @@ func ToJSON(ctx context.Context, reader FinderImageStashIDGetter, studio *models
 		Details:       studio.Details,
 		Favorite:      studio.Favorite,
 		IgnoreAutoTag: studio.IgnoreAutoTag,
+		Organized:     studio.Organized,
 		CreatedAt:     json.JSONTime{Time: studio.CreatedAt},
 		UpdatedAt:     json.JSONTime{Time: studio.UpdatedAt},
 	}
diff --git a/pkg/studio/export_test.go b/pkg/studio/export_test.go
index e41e6f36c..dce75ba9a 100644
--- a/pkg/studio/export_test.go
+++ b/pkg/studio/export_test.go
@@ -32,6 +32,7 @@ var (
 	details           = "details"
 	parentStudioName  = "parentStudio"
 	autoTagIgnored    = true
+	studioOrganized   = true
 	emptyCustomFields = make(map[string]interface{})
 	customFields      = map[string]interface{}{
 		"customField1": "customValue1",
@@ -73,6 +74,7 @@ func createFullStudio(id int, parentID int) models.Studio {
 		UpdatedAt:     updateTime,
 		Rating:        &rating,
 		IgnoreAutoTag: autoTagIgnored,
+		Organized:     studioOrganized,
 		Aliases:       models.NewRelatedStrings(aliases),
 		TagIDs:        models.NewRelatedIDs([]int{}),
 		StashIDs:      models.NewRelatedStashIDs(stashIDs),
@@ -115,6 +117,7 @@ func createFullJSONStudio(parentStudio, image string, aliases []string, customFi
 		Aliases:       aliases,
 		StashIDs:      stashIDs,
 		IgnoreAutoTag: autoTagIgnored,
+		Organized:     studioOrganized,
 		CustomFields:  customFields,
 	}
 }
diff --git a/pkg/studio/import.go b/pkg/studio/import.go
index d9e52100c..264e2566a 100644
--- a/pkg/studio/import.go
+++ b/pkg/studio/import.go
@@ -233,6 +233,7 @@ func studioJSONtoStudio(studioJSON jsonschema.Studio) models.Studio {
 		Details:       studioJSON.Details,
 		Favorite:      studioJSON.Favorite,
 		IgnoreAutoTag: studioJSON.IgnoreAutoTag,
+		Organized:     studioJSON.Organized,
 		CreatedAt:     studioJSON.CreatedAt.GetTime(),
 		UpdatedAt:     studioJSON.UpdatedAt.GetTime(),
 
diff --git a/pkg/studio/import_test.go b/pkg/studio/import_test.go
index 4eb757293..c2bbd40f5 100644
--- a/pkg/studio/import_test.go
+++ b/pkg/studio/import_test.go
@@ -49,6 +49,7 @@ func TestImporterPreImport(t *testing.T) {
 			Name:          studioName,
 			Image:         invalidImage,
 			IgnoreAutoTag: autoTagIgnored,
+			Organized:     studioOrganized,
 		},
 	}
 
diff --git a/ui/v2.5/graphql/data/studio-slim.graphql b/ui/v2.5/graphql/data/studio-slim.graphql
index c48f7d93e..4ca3c8b4d 100644
--- a/ui/v2.5/graphql/data/studio-slim.graphql
+++ b/ui/v2.5/graphql/data/studio-slim.graphql
@@ -17,5 +17,8 @@ fragment SlimStudioData on Studio {
     id
     name
   }
+  favorite
+  ignore_auto_tag
+  organized
   o_counter
 }
diff --git a/ui/v2.5/graphql/data/studio.graphql b/ui/v2.5/graphql/data/studio.graphql
index aabec7a9b..8347b4739 100644
--- a/ui/v2.5/graphql/data/studio.graphql
+++ b/ui/v2.5/graphql/data/studio.graphql
@@ -16,6 +16,7 @@ fragment StudioData on Studio {
     image_path
   }
   ignore_auto_tag
+  organized
   image_path
   scene_count
   scene_count_all: scene_count(depth: -1)
diff --git a/ui/v2.5/src/components/Studios/EditStudiosDialog.tsx b/ui/v2.5/src/components/Studios/EditStudiosDialog.tsx
index 293a8dfb3..1c34dfc36 100644
--- a/ui/v2.5/src/components/Studios/EditStudiosDialog.tsx
+++ b/ui/v2.5/src/components/Studios/EditStudiosDialog.tsx
@@ -23,7 +23,13 @@ interface IListOperationProps {
   onClose: (applied: boolean) => void;
 }
 
-const studioFields = ["favorite", "rating100", "details", "ignore_auto_tag"];
+const studioFields = [
+  "favorite",
+  "rating100",
+  "details",
+  "ignore_auto_tag",
+  "organized",
+];
 
 export const EditStudiosDialog: React.FC<IListOperationProps> = (
   props: IListOperationProps
@@ -236,6 +242,14 @@ export const EditStudiosDialog: React.FC<IListOperationProps> = (
               checked={updateInput.ignore_auto_tag ?? undefined}
             />
           </Form.Group>
+
+          <Form.Group controlId="organized">
+            <IndeterminateCheckbox
+              label={intl.formatMessage({ id: "organized" })}
+              setChecked={(checked) => setUpdateField({ organized: checked })}
+              checked={updateInput.organized ?? undefined}
+            />
+          </Form.Group>
         </Form>
       </ModalComponent>
     );
diff --git a/ui/v2.5/src/components/Studios/StudioCard.tsx b/ui/v2.5/src/components/Studios/StudioCard.tsx
index 87c9b9528..839489182 100644
--- a/ui/v2.5/src/components/Studios/StudioCard.tsx
+++ b/ui/v2.5/src/components/Studios/StudioCard.tsx
@@ -7,13 +7,13 @@ import { PatchComponent } from "src/patch";
 import { HoverPopover } from "../Shared/HoverPopover";
 import { Icon } from "../Shared/Icon";
 import { TagLink } from "../Shared/TagLink";
-import { Button, ButtonGroup } from "react-bootstrap";
+import { Button, ButtonGroup, OverlayTrigger, Tooltip } from "react-bootstrap";
 import { FormattedMessage } from "react-intl";
 import { PopoverCountButton } from "../Shared/PopoverCountButton";
 import { RatingBanner } from "../Shared/RatingBanner";
 import { FavoriteIcon } from "../Shared/FavoriteIcon";
 import { useStudioUpdate } from "src/core/StashService";
-import { faTag } from "@fortawesome/free-solid-svg-icons";
+import { faTag, faBox } from "@fortawesome/free-solid-svg-icons";
 import { OCounterButton } from "../Shared/CountButton";
 
 interface IProps {
@@ -185,6 +185,27 @@ export const StudioCard: React.FC<IProps> = PatchComponent(
       return <OCounterButton value={studio.o_counter} />;
     }
 
+    function maybeRenderOrganized() {
+      if (studio.organized) {
+        return (
+          <OverlayTrigger
+            overlay={
+              <Tooltip id="organized-tooltip">
+                <FormattedMessage id="organized" />
+              </Tooltip>
+            }
+            placement="bottom"
+          >
+            <div className="organized">
+              <Button className="minimal">
+                <Icon icon={faBox} />
+              </Button>
+            </div>
+          </OverlayTrigger>
+        );
+      }
+    }
+
     function maybeRenderPopoverButtonGroup() {
       if (
         studio.scene_count ||
@@ -193,7 +214,8 @@ export const StudioCard: React.FC<IProps> = PatchComponent(
         studio.group_count ||
         studio.performer_count ||
         studio.o_counter ||
-        studio.tags.length > 0
+        studio.tags.length > 0 ||
+        studio.organized
       ) {
         return (
           <>
@@ -206,6 +228,7 @@ export const StudioCard: React.FC<IProps> = PatchComponent(
               {maybeRenderPerformersPopoverButton()}
               {maybeRenderTagPopoverButton()}
               {maybeRenderOCounter()}
+              {maybeRenderOrganized()}
             </ButtonGroup>
           </>
         );
diff --git a/ui/v2.5/src/components/Studios/StudioDetails/Studio.tsx b/ui/v2.5/src/components/Studios/StudioDetails/Studio.tsx
index 2edc53fe1..0096851e2 100644
--- a/ui/v2.5/src/components/Studios/StudioDetails/Studio.tsx
+++ b/ui/v2.5/src/components/Studios/StudioDetails/Studio.tsx
@@ -49,6 +49,7 @@ import { AliasList } from "src/components/Shared/DetailsPage/AliasList";
 import { HeaderImage } from "src/components/Shared/DetailsPage/HeaderImage";
 import { goBackOrReplace } from "src/utils/history";
 import { OCounterButton } from "src/components/Shared/CountButton";
+import { OrganizedButton } from "src/components/Scenes/SceneDetails/OrganizedButton";
 
 interface IProps {
   studio: GQL.StudioDataFragment;
@@ -316,6 +317,28 @@ const StudioPage: React.FC<IProps> = ({ studio, tabKey }) => {
     }
   }
 
+  const [organizedLoading, setOrganizedLoading] = useState(false);
+
+  async function onOrganizedClick() {
+    if (!studio.id) return;
+
+    setOrganizedLoading(true);
+    try {
+      await updateStudio({
+        variables: {
+          input: {
+            id: studio.id,
+            organized: !studio.organized,
+          },
+        },
+      });
+    } catch (e) {
+      Toast.error(e);
+    } finally {
+      setOrganizedLoading(false);
+    }
+  }
+
   // set up hotkeys
   useEffect(() => {
     Mousetrap.bind("e", () => toggleEditing());
@@ -467,6 +490,11 @@ const StudioPage: React.FC<IProps> = ({ studio, tabKey }) => {
                     favorite={studio.favorite}
                     onToggleFavorite={(v) => setFavorite(v)}
                   />
+                  <OrganizedButton
+                    loading={organizedLoading}
+                    organized={studio.organized}
+                    onClick={onOrganizedClick}
+                  />
                   <ExternalLinkButtons urls={studio.urls} />
                 </span>
               </DetailTitle>
diff --git a/ui/v2.5/src/docs/en/Manual/AutoTagging.md b/ui/v2.5/src/docs/en/Manual/AutoTagging.md
index ad08027f6..c3ef00971 100644
--- a/ui/v2.5/src/docs/en/Manual/AutoTagging.md
+++ b/ui/v2.5/src/docs/en/Manual/AutoTagging.md
@@ -37,6 +37,8 @@ This task is part of the advanced settings mode.
 
 Scenes, images, and galleries that have the Organized flag added to them will not be modified by Auto tag. You can also use Organized flag status as a filter.
 
+Studios also support the Organized flag, however it is purely informational. It serves as a front-end indicator for the user to mark that a studio's collection is complete and does not affect Auto tag behavior. The Ignore Auto tag flag should be used to exclude a studio from Auto tag.
+
 ### Ignore Auto tag flag
 
 Performers or Tags that have Ignore Auto tag flag added to them will be skipped by the Auto tag task.
diff --git a/ui/v2.5/src/models/list-filter/studios.ts b/ui/v2.5/src/models/list-filter/studios.ts
index 42ac1b4dc..a38540a47 100644
--- a/ui/v2.5/src/models/list-filter/studios.ts
+++ b/ui/v2.5/src/models/list-filter/studios.ts
@@ -53,6 +53,7 @@ const criterionOptions = [
   TagsCriterionOption,
   RatingCriterionOption,
   createBooleanCriterionOption("ignore_auto_tag"),
+  createBooleanCriterionOption("organized"),
   createMandatoryNumberCriterionOption("tag_count"),
   createMandatoryNumberCriterionOption("scene_count"),
   createMandatoryNumberCriterionOption("image_count"),

From c15e6a5b630f76afc139a4f901ae9208bada811c Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Fri, 20 Feb 2026 09:13:55 +1100
Subject: [PATCH 302/405] Include blobs in backup  (#6586)

* Optionally backup blobs into zip
* Add backup dialog
---
 graphql/schema/types/metadata.graphql         |   2 +
 internal/api/resolver_mutation_metadata.go    |   3 +-
 internal/manager/backup.go                    | 185 ++++++++++++++++++
 internal/manager/manager.go                   |  40 ----
 .../Settings/Tasks/DataManagementTasks.tsx    | 176 ++++++++++++++---
 ui/v2.5/src/docs/en/Manual/Tasks.md           |  16 ++
 ui/v2.5/src/locales/en-GB.json                |  12 +-
 7 files changed, 364 insertions(+), 70 deletions(-)
 create mode 100644 internal/manager/backup.go

diff --git a/graphql/schema/types/metadata.graphql b/graphql/schema/types/metadata.graphql
index 0c0d59579..27cbb86fb 100644
--- a/graphql/schema/types/metadata.graphql
+++ b/graphql/schema/types/metadata.graphql
@@ -325,6 +325,8 @@ input ImportObjectsInput {
 
 input BackupDatabaseInput {
   download: Boolean
+  "If true, blob files will be included in the backup. This can significantly increase the size of the backup and the time it takes to create it, but allows for a complete backup of the system that can be restored without needing access to the original media files."
+  includeBlobs: Boolean
 }
 
 input AnonymiseDatabaseInput {
diff --git a/internal/api/resolver_mutation_metadata.go b/internal/api/resolver_mutation_metadata.go
index 8120e2d31..ea6496800 100644
--- a/internal/api/resolver_mutation_metadata.go
+++ b/internal/api/resolver_mutation_metadata.go
@@ -122,9 +122,10 @@ func (r *mutationResolver) MigrateHashNaming(ctx context.Context) (string, error
 func (r *mutationResolver) BackupDatabase(ctx context.Context, input BackupDatabaseInput) (*string, error) {
 	// if download is true, then backup to temporary file and return a link
 	download := input.Download != nil && *input.Download
+	includeBlobs := input.IncludeBlobs != nil && *input.IncludeBlobs
 	mgr := manager.GetInstance()
 
-	backupPath, backupName, err := mgr.BackupDatabase(download)
+	backupPath, backupName, err := mgr.BackupDatabase(download, includeBlobs)
 	if err != nil {
 		logger.Errorf("Error backing up database: %v", err)
 		return nil, err
diff --git a/internal/manager/backup.go b/internal/manager/backup.go
new file mode 100644
index 000000000..4a41b263b
--- /dev/null
+++ b/internal/manager/backup.go
@@ -0,0 +1,185 @@
+package manager
+
+import (
+	"archive/zip"
+	"fmt"
+	"io"
+	"io/fs"
+	"os"
+	"path/filepath"
+	"strings"
+
+	"github.com/stashapp/stash/internal/manager/config"
+	"github.com/stashapp/stash/pkg/fsutil"
+	"github.com/stashapp/stash/pkg/logger"
+)
+
+type databaseBackupZip struct {
+	*zip.Writer
+}
+
+func (z *databaseBackupZip) zipFileRename(fn, outDir, outFn string) error {
+	p := filepath.Join(outDir, outFn)
+	p = filepath.ToSlash(p)
+
+	f, err := z.Create(p)
+	if err != nil {
+		return fmt.Errorf("error creating zip entry for %s: %v", fn, err)
+	}
+
+	i, err := os.Open(fn)
+	if err != nil {
+		return fmt.Errorf("error opening %s: %v", fn, err)
+	}
+
+	defer i.Close()
+
+	if _, err := io.Copy(f, i); err != nil {
+		return fmt.Errorf("error writing %s to zip: %v", fn, err)
+	}
+
+	return nil
+}
+
+func (z *databaseBackupZip) zipFile(fn, outDir string) error {
+	return z.zipFileRename(fn, outDir, filepath.Base(fn))
+}
+
+func (s *Manager) BackupDatabase(download bool, includeBlobs bool) (string, string, error) {
+	var backupPath string
+	var backupName string
+
+	// if we include blobs, then the output is a zip file
+	// if not, using the same backup logic as before, which creates a sqlite file
+	if !includeBlobs || s.Config.GetBlobsStorage() != config.BlobStorageTypeFilesystem {
+		return s.backupDatabaseOnly(download)
+	}
+
+	// use tmp directory for the backup
+	backupDir := s.Paths.Generated.Tmp
+	if err := fsutil.EnsureDir(backupDir); err != nil {
+		return "", "", fmt.Errorf("could not create backup directory %v: %w", backupDir, err)
+	}
+	f, err := os.CreateTemp(backupDir, "backup*.sqlite")
+	if err != nil {
+		return "", "", err
+	}
+
+	backupPath = f.Name()
+	backupName = s.Database.DatabaseBackupPath("")
+	f.Close()
+
+	// delete the temp file so that the backup operation can create it
+	if err := os.Remove(backupPath); err != nil {
+		return "", "", fmt.Errorf("could not remove temporary backup file %v: %w", backupPath, err)
+	}
+
+	if err := s.Database.Backup(backupPath); err != nil {
+		return "", "", err
+	}
+
+	// create a zip file
+	zipFileDir := s.Paths.Generated.Downloads
+	if !download {
+		zipFileDir = s.Config.GetBackupDirectoryPathOrDefault()
+		if zipFileDir != "" {
+			if err := fsutil.EnsureDir(zipFileDir); err != nil {
+				return "", "", fmt.Errorf("could not create backup directory %v: %w", zipFileDir, err)
+			}
+		}
+	}
+
+	zipFileName := backupName + ".zip"
+	zipFilePath := filepath.Join(zipFileDir, zipFileName)
+
+	logger.Debugf("Preparing zip file for database backup at %v", zipFilePath)
+
+	zf, err := os.Create(zipFilePath)
+	if err != nil {
+		return "", "", fmt.Errorf("could not create zip file %v: %w", zipFilePath, err)
+	}
+	defer zf.Close()
+
+	z := databaseBackupZip{
+		Writer: zip.NewWriter(zf),
+	}
+
+	defer z.Close()
+
+	// move the database file into the zip
+	dbFn := filepath.Base(s.Config.GetDatabasePath())
+	if err := z.zipFileRename(backupPath, "", dbFn); err != nil {
+		return "", "", fmt.Errorf("could not add database backup to zip file: %w", err)
+	}
+
+	if err := os.Remove(backupPath); err != nil {
+		return "", "", fmt.Errorf("could not remove temporary backup file %v: %w", backupPath, err)
+	}
+
+	// walk the blobs directory and add files to the zip
+	blobsDir := s.Config.GetBlobsPath()
+	err = filepath.WalkDir(blobsDir, func(path string, d fs.DirEntry, err error) error {
+		if err != nil {
+			return err
+		}
+
+		if d.IsDir() {
+			return nil
+		}
+
+		// calculate out dir by removing the blobsDir prefix from the path
+		outDir := filepath.Join("blobs", strings.TrimPrefix(filepath.Dir(path), blobsDir))
+		if err := z.zipFile(path, outDir); err != nil {
+			return fmt.Errorf("could not add blob %v to zip file: %w", path, err)
+		}
+
+		return nil
+	})
+
+	if err != nil {
+		return "", "", fmt.Errorf("error walking blobs directory: %w", err)
+	}
+
+	return zipFilePath, zipFileName, nil
+}
+
+func (s *Manager) backupDatabaseOnly(download bool) (string, string, error) {
+	var backupPath string
+	var backupName string
+
+	if download {
+		backupDir := s.Paths.Generated.Downloads
+		if err := fsutil.EnsureDir(backupDir); err != nil {
+			return "", "", fmt.Errorf("could not create backup directory %v: %w", backupDir, err)
+		}
+		f, err := os.CreateTemp(backupDir, "backup*.sqlite")
+		if err != nil {
+			return "", "", err
+		}
+
+		backupPath = f.Name()
+		backupName = s.Database.DatabaseBackupPath("")
+		f.Close()
+
+		// delete the temp file so that the backup operation can create it
+		if err := os.Remove(backupPath); err != nil {
+			return "", "", fmt.Errorf("could not remove temporary backup file %v: %w", backupPath, err)
+		}
+	} else {
+		backupDir := s.Config.GetBackupDirectoryPathOrDefault()
+		if backupDir != "" {
+			if err := fsutil.EnsureDir(backupDir); err != nil {
+				return "", "", fmt.Errorf("could not create backup directory %v: %w", backupDir, err)
+			}
+		}
+		backupPath = s.Database.DatabaseBackupPath(backupDir)
+		backupName = filepath.Base(backupPath)
+	}
+
+	err := s.Database.Backup(backupPath)
+	if err != nil {
+		return "", "", err
+	}
+
+	return backupPath, backupName, nil
+}
diff --git a/internal/manager/manager.go b/internal/manager/manager.go
index f4f3fa636..d3b91ec29 100644
--- a/internal/manager/manager.go
+++ b/internal/manager/manager.go
@@ -313,46 +313,6 @@ func (s *Manager) validateFFmpeg() error {
 	return nil
 }
 
-func (s *Manager) BackupDatabase(download bool) (string, string, error) {
-	var backupPath string
-	var backupName string
-	if download {
-		backupDir := s.Paths.Generated.Downloads
-		if err := fsutil.EnsureDir(backupDir); err != nil {
-			return "", "", fmt.Errorf("could not create backup directory %v: %w", backupDir, err)
-		}
-		f, err := os.CreateTemp(backupDir, "backup*.sqlite")
-		if err != nil {
-			return "", "", err
-		}
-
-		backupPath = f.Name()
-		backupName = s.Database.DatabaseBackupPath("")
-		f.Close()
-
-		// delete the temp file so that the backup operation can create it
-		if err := os.Remove(backupPath); err != nil {
-			return "", "", fmt.Errorf("could not remove temporary backup file %v: %w", backupPath, err)
-		}
-	} else {
-		backupDir := s.Config.GetBackupDirectoryPathOrDefault()
-		if backupDir != "" {
-			if err := fsutil.EnsureDir(backupDir); err != nil {
-				return "", "", fmt.Errorf("could not create backup directory %v: %w", backupDir, err)
-			}
-		}
-		backupPath = s.Database.DatabaseBackupPath(backupDir)
-		backupName = filepath.Base(backupPath)
-	}
-
-	err := s.Database.Backup(backupPath)
-	if err != nil {
-		return "", "", err
-	}
-
-	return backupPath, backupName, nil
-}
-
 func (s *Manager) AnonymiseDatabase(download bool) (string, string, error) {
 	var outPath string
 	var outName string
diff --git a/ui/v2.5/src/components/Settings/Tasks/DataManagementTasks.tsx b/ui/v2.5/src/components/Settings/Tasks/DataManagementTasks.tsx
index c36e076f4..a6bda7c09 100644
--- a/ui/v2.5/src/components/Settings/Tasks/DataManagementTasks.tsx
+++ b/ui/v2.5/src/components/Settings/Tasks/DataManagementTasks.tsx
@@ -25,6 +25,8 @@ import { Icon } from "src/components/Shared/Icon";
 import { useConfigurationContext } from "src/hooks/Config";
 import { FolderSelect } from "src/components/Shared/FolderSelect/FolderSelect";
 import {
+  faBoxArchive,
+  faExclamationTriangle,
   faMinus,
   faPlus,
   faQuestionCircle,
@@ -153,6 +155,125 @@ const CleanOptions: React.FC<ICleanOptions> = ({
   );
 };
 
+const BackupDialog: React.FC<{
+  onClose: (
+    confirmed?: boolean,
+    download?: boolean,
+    includeBlobs?: boolean
+  ) => void;
+}> = ({ onClose }) => {
+  const intl = useIntl();
+  const { configuration } = useConfigurationContext();
+
+  const includeBlobsDefault =
+    configuration?.general.blobsStorage === GQL.BlobsStorageType.Filesystem;
+  const backupDir =
+    configuration.general.backupDirectoryPath ||
+    `<${intl.formatMessage({
+      id: "config.general.backup_directory_path.heading",
+    })}>`;
+
+  const [download, setDownload] = useState(false);
+  const [includeBlobs, setIncludeBlobs] = useState(includeBlobsDefault);
+
+  let msg;
+  if (!includeBlobs) {
+    msg = intl.formatMessage(
+      { id: "config.tasks.backup_database.sqlite" },
+      {
+        filename_format: (
+          <code>[origFilename].sqlite.[schemaVersion].[YYYYMMDD_HHMMSS]</code>
+        ),
+      }
+    );
+  } else {
+    msg = intl.formatMessage(
+      { id: "config.tasks.backup_database.zip" },
+      {
+        filename_format: (
+          <code>
+            [origFilename].sqlite.[schemaVersion].[YYYYMMDD_HHMMSS].zip
+          </code>
+        ),
+      }
+    );
+  }
+
+  const warning =
+    includeBlobs !== includeBlobsDefault ? (
+      <p className="lead">
+        <Icon icon={faExclamationTriangle} className="text-warning" />
+        <FormattedMessage id="config.tasks.backup_database.warning_blobs" />
+      </p>
+    ) : null;
+
+  const acceptID = download
+    ? "config.tasks.backup_database.download"
+    : "actions.backup";
+
+  return (
+    <ModalComponent
+      show
+      icon={faBoxArchive}
+      accept={{
+        text: intl.formatMessage({ id: acceptID }),
+        onClick: () => onClose(true, download, includeBlobs),
+      }}
+      cancel={{
+        onClick: () => onClose(),
+        variant: "secondary",
+      }}
+    >
+      <div className="dialog-container">
+        <Form.Group>
+          <h5>
+            <FormattedMessage id="config.tasks.backup_database.destination" />
+          </h5>
+          <Form.Check
+            type="radio"
+            id="backup-directory"
+            checked={!download}
+            onChange={() => setDownload(false)}
+            label={intl.formatMessage(
+              {
+                id: "config.tasks.backup_database.to_directory",
+              },
+              {
+                directory: <code>{backupDir}</code>,
+              }
+            )}
+          />
+
+          <Form.Check
+            type="radio"
+            id="backup-download"
+            checked={download}
+            onChange={() => setDownload(true)}
+            label={intl.formatMessage({
+              id: "config.tasks.backup_database.download",
+            })}
+          />
+        </Form.Group>
+
+        <SettingSection>
+          <BooleanSetting
+            id="backup-include-blobs"
+            // if includeBlobsDefault is false, then blobs are in the database, so we check the box and disable it
+            checked={includeBlobs || !includeBlobsDefault}
+            headingID="config.tasks.backup_database.include_blobs"
+            onChange={(v) => setIncludeBlobs(v)}
+            // if includeBlobsDefault is false, then blobs are in the database
+            disabled={!includeBlobsDefault}
+          />
+        </SettingSection>
+
+        <p>{msg}</p>
+        {warning}
+      </div>
+    </ModalComponent>
+  );
+};
+
 interface IDataManagementTasks {
   setIsBackupRunning: (v: boolean) => void;
   setIsAnonymiseRunning: (v: boolean) => void;
@@ -167,6 +288,7 @@ export const DataManagementTasks: React.FC<IDataManagementTasks> = ({
   const [dialogOpen, setDialogOpenState] = useState({
     importAlert: false,
     import: false,
+    backup: false,
     clean: false,
     cleanAlert: false,
     cleanGenerated: false,
@@ -344,11 +466,12 @@ export const DataManagementTasks: React.FC<IDataManagementTasks> = ({
     }
   }
 
-  async function onBackup(download?: boolean) {
+  async function onBackup(download?: boolean, includeBlobs?: boolean) {
     try {
       setIsBackupRunning(true);
       const ret = await mutateBackupDatabase({
         download,
+        includeBlobs,
       });
 
       // download the result
@@ -439,6 +562,17 @@ export const DataManagementTasks: React.FC<IDataManagementTasks> = ({
           }}
         />
       )}
+      {dialogOpen.backup && (
+        <BackupDialog
+          onClose={(confirmed, download, includeBlobs) => {
+            if (confirmed) {
+              onBackup(download, includeBlobs);
+            }
+
+            setDialogOpen({ backup: false });
+          }}
+        />
+      )}
 
       <SettingSection headingID="config.tasks.maintenance">
         <div className="setting-group">
@@ -555,39 +689,25 @@ export const DataManagementTasks: React.FC<IDataManagementTasks> = ({
 
       <SettingSection headingID="actions.backup">
         <Setting
-          headingID="actions.backup"
-          subHeading={intl.formatMessage(
-            { id: "config.tasks.backup_database" },
-            {
-              filename_format: (
-                <code>
-                  [origFilename].sqlite.[schemaVersion].[YYYYMMDD_HHMMSS]
-                </code>
-              ),
-            }
-          )}
+          heading={
+            <>
+              <FormattedMessage id="actions.backup" />
+              <ManualLink tab="Tasks">
+                <Icon icon={faQuestionCircle} />
+              </ManualLink>
+            </>
+          }
+          subHeading={intl.formatMessage({
+            id: "config.tasks.backup_database.description",
+          })}
         >
           <Button
             id="backup"
             variant="secondary"
             type="submit"
-            onClick={() => onBackup()}
+            onClick={() => setDialogOpen({ backup: true })}
           >
-            <FormattedMessage id="actions.backup" />
-          </Button>
-        </Setting>
-
-        <Setting
-          headingID="actions.download_backup"
-          subHeadingID="config.tasks.backup_and_download"
-        >
-          <Button
-            id="backupDownload"
-            variant="secondary"
-            type="submit"
-            onClick={() => onBackup(true)}
-          >
-            <FormattedMessage id="actions.download_backup" />
+            <FormattedMessage id="actions.backup" />…
           </Button>
         </Setting>
       </SettingSection>
diff --git a/ui/v2.5/src/docs/en/Manual/Tasks.md b/ui/v2.5/src/docs/en/Manual/Tasks.md
index 5dd887cfe..4191afd24 100644
--- a/ui/v2.5/src/docs/en/Manual/Tasks.md
+++ b/ui/v2.5/src/docs/en/Manual/Tasks.md
@@ -85,3 +85,19 @@ The import and export tasks read and write JSON files to the configured metadata
 > **⚠️ Note:** The full import task wipes the current database completely before importing.
 
 See the [JSON Specification](/help/JSONSpec.md) page for details on the exported JSON format.
+
+## Backing up
+
+The backup task creates a backup of the stash database and (optionally) blob files. The backup can either be downloaded or output into the backup directory (under `Settings > Paths`) or the database directory if the backup directory is not configured.
+
+For a full backup, the database file and all blob files must be copied. The backup is stored as a zip file, with the database file at the root of the zip and the blob files in a `blobs` directory.
+
+> **⚠️ Note:** generated files are not included in the backup, so these will need to be regenerated when restoring with an empty system from backup.
+
+For database-only backups, only the database file is copied into the destination. This is useful for quick backups before performing risky operations, or for users who do not use filesystem blob storage.
+
+## Restoring from backup
+
+Restoring from backup is currently a manual process. The database backup zip file must be unzipped, and the database file and blob files (if applicable) copied into the database and blob directories respectively. Stash should then be restarted to load the restored database.
+
+> **⚠️ Note:** the filename for a database-only backup is not the same as the original database file, so the database file from the backup must be renamed to match the original database filename before copying it into the database directory. The original database filename can be found in `Settings > Paths > Database path`.
\ No newline at end of file
diff --git a/ui/v2.5/src/locales/en-GB.json b/ui/v2.5/src/locales/en-GB.json
index 595ff4c61..2aee4fe2b 100644
--- a/ui/v2.5/src/locales/en-GB.json
+++ b/ui/v2.5/src/locales/en-GB.json
@@ -499,7 +499,17 @@
       "auto_tagging": "Auto tagging",
       "backing_up_database": "Backing up database",
       "backup_and_download": "Performs a backup of the database and downloads the resulting file.",
-      "backup_database": "Performs a backup of the database to the backups directory, with the filename format {filename_format}.",
+      "backup_database": {
+        "description": "Performs a backup of the database and blob files.",
+        "destination": "Destination",
+        "download": "Download backup",
+        "include_blobs": "Include blobs in backup",
+        "include_blobs_desc": "Disable to only backup the SQLite database file.",
+        "sqlite": "Backup file will be a copy of the SQLite database file, with the filename {filename_format}",
+        "to_directory": "To {directory}",
+        "warning_blobs": "Blob files will not be included in the backup. This means that to succesfully restore from the backup, the blob files must be present in the blob storage location.",
+        "zip": "SQLite database file and blob files will be zipped into a single file, with the filename {filename_format}"
+      },
       "cleanup_desc": "Check for missing files and remove them from the database. This is a destructive action.",
       "clean_generated": {
         "blob_files": "Blob files",

From 843806247d9f9162bb7775b668058d730bb4a71f Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Fri, 20 Feb 2026 09:14:25 +1100
Subject: [PATCH 303/405] Add group scene count filter (#6593)

---
 graphql/schema/types/filters.graphql     |  2 ++
 pkg/models/group.go                      |  2 ++
 pkg/sqlite/group_filter.go               | 11 ++++++++++
 pkg/sqlite/group_test.go                 | 26 ++++++++++++++++++++++++
 ui/v2.5/src/models/list-filter/groups.ts |  1 +
 5 files changed, 42 insertions(+)

diff --git a/graphql/schema/types/filters.graphql b/graphql/schema/types/filters.graphql
index c0b47f7cf..075e40372 100644
--- a/graphql/schema/types/filters.graphql
+++ b/graphql/schema/types/filters.graphql
@@ -455,6 +455,8 @@ input GroupFilterType {
   containing_group_count: IntCriterionInput
   "Filter by number of sub-groups the group has"
   sub_group_count: IntCriterionInput
+  "Filter by number of scenes the group has"
+  scene_count: IntCriterionInput
 
   "Filter by related scenes that meet this criteria"
   scenes_filter: SceneFilterType
diff --git a/pkg/models/group.go b/pkg/models/group.go
index 6943b1055..ec550eea8 100644
--- a/pkg/models/group.go
+++ b/pkg/models/group.go
@@ -33,6 +33,8 @@ type GroupFilterType struct {
 	ContainingGroupCount *IntCriterionInput `json:"containing_group_count"`
 	// Filter by number of sub-groups the group has
 	SubGroupCount *IntCriterionInput `json:"sub_group_count"`
+	// Filter by number of scenes the group has
+	SceneCount *IntCriterionInput `json:"scene_count"`
 	// Filter by related scenes that meet this criteria
 	ScenesFilter *SceneFilterType `json:"scenes_filter"`
 	// Filter by related studios that meet this criteria
diff --git a/pkg/sqlite/group_filter.go b/pkg/sqlite/group_filter.go
index f29023785..f81783374 100644
--- a/pkg/sqlite/group_filter.go
+++ b/pkg/sqlite/group_filter.go
@@ -75,6 +75,7 @@ func (qb *groupFilterHandler) criterionHandler() criterionHandler {
 		qb.tagsCriterionHandler(groupFilter.Tags),
 		qb.tagCountCriterionHandler(groupFilter.TagCount),
 		qb.groupOCounterCriterionHandler(groupFilter.OCounter),
+		qb.sceneCountCriterionHandler(groupFilter.SceneCount),
 		&dateCriterionHandler{groupFilter.Date, "groups.date", nil},
 		groupHierarchyHandler.ParentsCriterionHandler(groupFilter.ContainingGroups),
 		groupHierarchyHandler.ChildrenCriterionHandler(groupFilter.SubGroups),
@@ -204,6 +205,16 @@ func (qb *groupFilterHandler) tagCountCriterionHandler(count *models.IntCriterio
 	return h.handler(count)
 }
 
+func (qb *groupFilterHandler) sceneCountCriterionHandler(count *models.IntCriterionInput) criterionHandlerFunc {
+	h := countCriterionHandlerBuilder{
+		primaryTable: groupTable,
+		joinTable:    groupsScenesTable,
+		primaryFK:    groupIDColumn,
+	}
+
+	return h.handler(count)
+}
+
 // used for sorting and filtering on group o-count
 var selectGroupOCountSQL = utils.StrFormat(
 	"SELECT SUM(o_counter) "+
diff --git a/pkg/sqlite/group_test.go b/pkg/sqlite/group_test.go
index d4a177e86..db293dd92 100644
--- a/pkg/sqlite/group_test.go
+++ b/pkg/sqlite/group_test.go
@@ -669,6 +669,32 @@ func TestGroupQuery(t *testing.T) {
 			nil,
 			false,
 		},
+		{
+			"scene count equals 1",
+			nil,
+			&models.GroupFilterType{
+				SceneCount: &models.IntCriterionInput{
+					Value:    1,
+					Modifier: models.CriterionModifierEquals,
+				},
+			},
+			[]int{groupIdxWithScene},
+			[]int{groupIdxWithParentAndChild},
+			false,
+		},
+		{
+			"scene count less than 1",
+			nil,
+			&models.GroupFilterType{
+				SceneCount: &models.IntCriterionInput{
+					Value:    1,
+					Modifier: models.CriterionModifierLessThan,
+				},
+			},
+			[]int{groupIdxWithParentAndChild},
+			[]int{groupIdxWithScene},
+			false,
+		},
 	}
 
 	for _, tt := range tests {
diff --git a/ui/v2.5/src/models/list-filter/groups.ts b/ui/v2.5/src/models/list-filter/groups.ts
index 5a263b272..ee0c90d73 100644
--- a/ui/v2.5/src/models/list-filter/groups.ts
+++ b/ui/v2.5/src/models/list-filter/groups.ts
@@ -63,6 +63,7 @@ const criterionOptions = [
   createMandatoryNumberCriterionOption("sub_group_count"),
   TagsCriterionOption,
   createMandatoryNumberCriterionOption("tag_count"),
+  createMandatoryNumberCriterionOption("scene_count"),
   createMandatoryTimestampCriterionOption("created_at"),
   createMandatoryTimestampCriterionOption("updated_at"),
 ];

From 076032ff8b69864480dd3434438ae9202f43bbc5 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Fri, 20 Feb 2026 15:09:59 +1100
Subject: [PATCH 304/405] Custom sprite generation (#6588)

* configurable minimum/maximum number of sprites
* configurable sprite size
---------
Co-authored-by: cacheflush <github.stoneware268@passmail.com>
---
 graphql/schema/types/config.graphql           |  22 ++++
 internal/api/resolver_mutation_configure.go   |   5 +
 internal/api/resolver_query_configuration.go  |   5 +
 internal/manager/config/config.go             |  65 ++++++++++
 internal/manager/generator_sprite.go          | 121 ++++++++++++++++--
 internal/manager/task_generate_sprite.go      |  12 +-
 pkg/ffmpeg/transcoder/screenshot.go           |   7 +
 pkg/scene/generate/sprite.go                  |  58 +++++----
 ui/v2.5/graphql/data/config.graphql           |   5 +
 .../src/components/Scenes/PreviewScrubber.tsx |   2 +
 .../Settings/SettingsSystemPanel.tsx          |  38 ++++++
 ui/v2.5/src/docs/en/Manual/Configuration.md   |  30 +++++
 ui/v2.5/src/locales/en-GB.json                |  11 ++
 13 files changed, 343 insertions(+), 38 deletions(-)

diff --git a/graphql/schema/types/config.graphql b/graphql/schema/types/config.graphql
index 6990d9d95..5ab7fdfea 100644
--- a/graphql/schema/types/config.graphql
+++ b/graphql/schema/types/config.graphql
@@ -184,6 +184,18 @@ input ConfigGeneralInput {
   scraperPackageSources: [PackageSourceInput!]
   "Source of plugin packages"
   pluginPackageSources: [PackageSourceInput!]
+
+  "Size of the longest dimension for each sprite in pixels"
+  spriteScreenshotSize: Int
+
+  "True if sprite generation should use the sprite interval and min/max sprites settings instead of the default"
+  useCustomSpriteInterval: Boolean
+  "Time between two different scrubber sprites in seconds - only used if useCustomSpriteInterval is true"
+  spriteInterval: Float
+  "Minimum number of sprites to be generated - only used if useCustomSpriteInterval is true"
+  minimumSprites: Int
+  "Minimum number of sprites to be generated - only used if useCustomSpriteInterval is true"
+  maximumSprites: Int
 }
 
 type ConfigGeneralResult {
@@ -287,6 +299,16 @@ type ConfigGeneralResult {
   logAccess: Boolean!
   "Maximum log size"
   logFileMaxSize: Int!
+  "True if sprite generation should use the sprite interval and min/max sprites settings instead of the default"
+  useCustomSpriteInterval: Boolean!
+  "Time between two different scrubber sprites in seconds - only used if useCustomSpriteInterval is true"
+  spriteInterval: Float!
+  "Minimum number of sprites to be generated - only used if useCustomSpriteInterval is true"
+  minimumSprites: Int!
+  "Maximum number of sprites to be generated - only used if useCustomSpriteInterval is true"
+  maximumSprites: Int!
+  "Size of the longest dimension for each sprite in pixels"
+  spriteScreenshotSize: Int!
   "Array of video file extensions"
   videoExtensions: [String!]!
   "Array of image file extensions"
diff --git a/internal/api/resolver_mutation_configure.go b/internal/api/resolver_mutation_configure.go
index 23b61c208..718d24998 100644
--- a/internal/api/resolver_mutation_configure.go
+++ b/internal/api/resolver_mutation_configure.go
@@ -287,6 +287,11 @@ func (r *mutationResolver) ConfigureGeneral(ctx context.Context, input ConfigGen
 	if input.PreviewPreset != nil {
 		c.SetString(config.PreviewPreset, input.PreviewPreset.String())
 	}
+	r.setConfigBool(config.UseCustomSpriteInterval, input.UseCustomSpriteInterval)
+	r.setConfigFloat(config.SpriteInterval, input.SpriteInterval)
+	r.setConfigInt(config.MinimumSprites, input.MinimumSprites)
+	r.setConfigInt(config.MaximumSprites, input.MaximumSprites)
+	r.setConfigInt(config.SpriteScreenshotSize, input.SpriteScreenshotSize)
 
 	r.setConfigBool(config.TranscodeHardwareAcceleration, input.TranscodeHardwareAcceleration)
 	if input.MaxTranscodeSize != nil {
diff --git a/internal/api/resolver_query_configuration.go b/internal/api/resolver_query_configuration.go
index bc76212eb..cf2c0e3cc 100644
--- a/internal/api/resolver_query_configuration.go
+++ b/internal/api/resolver_query_configuration.go
@@ -96,6 +96,11 @@ func makeConfigGeneralResult() *ConfigGeneralResult {
 		CalculateMd5:                  config.IsCalculateMD5(),
 		VideoFileNamingAlgorithm:      config.GetVideoFileNamingAlgorithm(),
 		ParallelTasks:                 config.GetParallelTasks(),
+		UseCustomSpriteInterval:       config.GetUseCustomSpriteInterval(),
+		SpriteInterval:                config.GetSpriteInterval(),
+		SpriteScreenshotSize:          config.GetSpriteScreenshotSize(),
+		MinimumSprites:                config.GetMinimumSprites(),
+		MaximumSprites:                config.GetMaximumSprites(),
 		PreviewAudio:                  config.GetPreviewAudio(),
 		PreviewSegments:               config.GetPreviewSegments(),
 		PreviewSegmentDuration:        config.GetPreviewSegmentDuration(),
diff --git a/internal/manager/config/config.go b/internal/manager/config/config.go
index bb99bdcfc..19e263810 100644
--- a/internal/manager/config/config.go
+++ b/internal/manager/config/config.go
@@ -83,6 +83,21 @@ const (
 	ParallelTasks        = "parallel_tasks"
 	parallelTasksDefault = 1
 
+	UseCustomSpriteInterval        = "use_custom_sprite_interval"
+	UseCustomSpriteIntervalDefault = false
+
+	SpriteInterval        = "sprite_interval"
+	SpriteIntervalDefault = 30
+
+	MinimumSprites        = "minimum_sprites"
+	MinimumSpritesDefault = 10
+
+	MaximumSprites        = "maximum_sprites"
+	MaximumSpritesDefault = 500
+
+	SpriteScreenshotSize        = "sprite_screenshot_width"
+	spriteScreenshotSizeDefault = 160
+
 	PreviewPreset                 = "preview_preset"
 	TranscodeHardwareAcceleration = "ffmpeg.hardware_acceleration"
 
@@ -975,6 +990,50 @@ func (i *Config) GetParallelTasksWithAutoDetection() int {
 	return parallelTasks
 }
 
+// GetUseCustomSpriteInterval returns true if the sprite minimum, maximum, and interval settings
+// should be used instead of the default
+func (i *Config) GetUseCustomSpriteInterval() bool {
+	value := i.getBool(UseCustomSpriteInterval)
+	return value
+}
+
+// GetSpriteInterval returns the time (in seconds) to be between each scrubber sprite
+// A value of 0 indicates that the sprite interval should be automatically determined
+// based on the minimum sprite setting.
+func (i *Config) GetSpriteInterval() float64 {
+	value := i.getFloat64(SpriteInterval)
+	return value
+}
+
+// GetMinimumSprites returns the minimum number of sprites that have to be generated
+// A value of 0 will be overridden with the default of 10.
+func (i *Config) GetMinimumSprites() int {
+	value := i.getInt(MinimumSprites)
+	if value <= 0 {
+		return MinimumSpritesDefault
+	}
+	return value
+}
+
+// GetMaximumSprites returns the maximum number of sprites that can be generated
+// A value of 0 indicates no maximum.
+func (i *Config) GetMaximumSprites() int {
+	value := i.getInt(MaximumSprites)
+	return value
+}
+
+// GetSpriteScreenshotSize returns the required size of the screenshots to be taken
+// during sprite generation in pixels. This will be the width for landscape scenes
+// and the height for portrait scenes, with the other dimension being scaled to maintain
+// the aspect ratio. If the value is less than or equal to 0, the default will be used.
+func (i *Config) GetSpriteScreenshotSize() int {
+	value := i.getInt(SpriteScreenshotSize)
+	if value <= 0 {
+		return spriteScreenshotSizeDefault
+	}
+	return value
+}
+
 func (i *Config) GetPreviewAudio() bool {
 	return i.getBool(PreviewAudio)
 }
@@ -1861,6 +1920,12 @@ func (i *Config) setDefaultValues() {
 	i.setDefault(PreviewAudio, previewAudioDefault)
 	i.setDefault(SoundOnPreview, false)
 
+	i.setDefault(UseCustomSpriteInterval, UseCustomSpriteIntervalDefault)
+	i.setDefault(SpriteInterval, SpriteIntervalDefault)
+	i.setDefault(MinimumSprites, MinimumSpritesDefault)
+	i.setDefault(MaximumSprites, MaximumSpritesDefault)
+	i.setDefault(SpriteScreenshotSize, spriteScreenshotSizeDefault)
+
 	i.setDefault(ThemeColor, DefaultThemeColor)
 
 	i.setDefault(WriteImageThumbnails, writeImageThumbnailsDefault)
diff --git a/internal/manager/generator_sprite.go b/internal/manager/generator_sprite.go
index c28d28674..dc56fde88 100644
--- a/internal/manager/generator_sprite.go
+++ b/internal/manager/generator_sprite.go
@@ -21,8 +21,7 @@ type SpriteGenerator struct {
 	VideoChecksum   string
 	ImageOutputPath string
 	VTTOutputPath   string
-	Rows            int
-	Columns         int
+	Config          SpriteGeneratorConfig
 	SlowSeek        bool // use alternate seek function, very slow!
 
 	Overwrite bool
@@ -30,13 +29,81 @@ type SpriteGenerator struct {
 	g *generate.Generator
 }
 
-func NewSpriteGenerator(videoFile ffmpeg.VideoFile, videoChecksum string, imageOutputPath string, vttOutputPath string, rows int, cols int) (*SpriteGenerator, error) {
+// SpriteGeneratorConfig holds configuration for the SpriteGenerator
+type SpriteGeneratorConfig struct {
+	// MinimumSprites is the minimum number of sprites to generate, even if the video duration is short
+	// SpriteInterval will be adjusted accordingly to ensure at least this many sprites are generated.
+	// A value of 0 means no minimum, and the generator will use the provided SpriteInterval or
+	// calculate it based on the video duration and MaximumSprites
+	MinimumSprites int
+
+	// MaximumSprites is the maximum number of sprites to generate, even if the video duration is long
+	// SpriteInterval will be adjusted accordingly to ensure no more than this many sprites are generated
+	// A value of 0 means no maximum, and the generator will use the provided SpriteInterval or
+	// calculate it based on the video duration and MinimumSprites
+	MaximumSprites int
+
+	// SpriteInterval is the default interval in seconds between each sprite.
+	// If MinimumSprites or MaximumSprites are set, this value will be adjusted accordingly
+	// to ensure the desired number of sprites are generated
+	// A value of 0 means the generator will calculate the interval based on the video duration and
+	// the provided MinimumSprites and MaximumSprites
+	SpriteInterval float64
+
+	// SpriteSize is the size in pixels of the longest dimension of each sprite image.
+	// The other dimension will be automatically calculated to maintain the aspect ratio of the video
+	SpriteSize int
+}
+
+const (
+	// DefaultSpriteAmount is the default number of sprites to generate if no configuration is provided
+	// This corresponds to the legacy behavior of the generator, which generates 81 sprites at equal
+	// intervals across the video duration
+	DefaultSpriteAmount = 81
+
+	// DefaultSpriteSize is the default size in pixels of the longest dimension of each sprite image
+	// if no configuration is provided. This corresponds to the legacy behavior of the generator.
+	DefaultSpriteSize = 160
+)
+
+var DefaultSpriteGeneratorConfig = SpriteGeneratorConfig{
+	MinimumSprites: DefaultSpriteAmount,
+	MaximumSprites: DefaultSpriteAmount,
+	SpriteInterval: 0,
+	SpriteSize:     DefaultSpriteSize,
+}
+
+// NewSpriteGenerator creates a new SpriteGenerator for the given video file and configuration
+// It calculates the appropriate sprite interval and count based on the video duration and the provided configuration
+func NewSpriteGenerator(videoFile ffmpeg.VideoFile, videoChecksum string, imageOutputPath string, vttOutputPath string, config SpriteGeneratorConfig) (*SpriteGenerator, error) {
 	exists, err := fsutil.FileExists(videoFile.Path)
 	if !exists {
 		return nil, err
 	}
+
+	if videoFile.VideoStreamDuration <= 0 {
+		s := fmt.Sprintf("video %s: duration(%.3f)/frame count(%d) invalid, skipping sprite creation", videoFile.Path, videoFile.VideoStreamDuration, videoFile.FrameCount)
+		return nil, errors.New(s)
+	}
+
+	config.SpriteInterval = calculateSpriteInterval(videoFile, config)
+	chunkCount := int(math.Ceil(videoFile.VideoStreamDuration / config.SpriteInterval))
+
+	// adjust the chunk count to the next highest perfect square, to ensure the sprite image
+	// is completely filled (no empty space in the grid) and the grid is as square as possible (minimizing the number of rows/columns)
+	gridSize := generate.GetSpriteGridSize(chunkCount)
+	newChunkCount := gridSize * gridSize
+
+	if newChunkCount != chunkCount {
+		logger.Debugf("[generator] adjusting chunk count from %d to %d to fit a %dx%d grid", chunkCount, newChunkCount, gridSize, gridSize)
+		chunkCount = newChunkCount
+	}
+
+	if config.SpriteSize <= 0 {
+		config.SpriteSize = DefaultSpriteSize
+	}
+
 	slowSeek := false
-	chunkCount := rows * cols
 
 	// For files with small duration / low frame count  try to seek using frame number intead of seconds
 	if videoFile.VideoStreamDuration < 5 || (0 < videoFile.FrameCount && videoFile.FrameCount <= int64(chunkCount)) { // some files can have FrameCount == 0, only use SlowSeek  if duration < 5
@@ -71,9 +138,8 @@ func NewSpriteGenerator(videoFile ffmpeg.VideoFile, videoChecksum string, imageO
 		VideoChecksum:   videoChecksum,
 		ImageOutputPath: imageOutputPath,
 		VTTOutputPath:   vttOutputPath,
-		Rows:            rows,
+		Config:          config,
 		SlowSeek:        slowSeek,
-		Columns:         cols,
 		g: &generate.Generator{
 			Encoder:      instance.FFMpeg,
 			FFMpegConfig: instance.Config,
@@ -83,6 +149,40 @@ func NewSpriteGenerator(videoFile ffmpeg.VideoFile, videoChecksum string, imageO
 	}, nil
 }
 
+func calculateSpriteInterval(videoFile ffmpeg.VideoFile, config SpriteGeneratorConfig) float64 {
+	// If a custom sprite interval is provided, start with that
+	spriteInterval := config.SpriteInterval
+
+	// If no custom interval is provided, calculate the interval based on the
+	// video duration and minimum sprite count
+	if spriteInterval <= 0 {
+		minSprites := config.MinimumSprites
+		if minSprites <= 0 {
+			panic("invalid configuration: MinimumSprites must be greater than 0 if SpriteInterval is not set")
+		}
+
+		logger.Debugf("[generator] calculating sprite interval for video duration %.3fs with minimum sprites %d", videoFile.VideoStreamDuration, minSprites)
+		return videoFile.VideoStreamDuration / float64(minSprites)
+	}
+
+	// Calculate the number of sprites that would be generated with the provided interval
+	spriteCount := int(math.Ceil(videoFile.VideoStreamDuration / spriteInterval))
+
+	// If the calculated sprite count is greater than the maximum, adjust the interval to meet the maximum
+	if config.MaximumSprites > 0 && spriteCount > int(config.MaximumSprites) {
+		spriteInterval = videoFile.VideoStreamDuration / float64(config.MaximumSprites)
+		logger.Debugf("[generator] provided sprite interval %.1fs results in %d sprites, which exceeds the maximum of %d, adjusting interval to %.1fs", config.SpriteInterval, spriteCount, config.MaximumSprites, spriteInterval)
+	}
+
+	// If the calculated sprite count is less than the minimum, adjust the interval to meet the minimum
+	if config.MinimumSprites > 0 && spriteCount < int(config.MinimumSprites) {
+		spriteInterval = videoFile.VideoStreamDuration / float64(config.MinimumSprites)
+		logger.Debugf("[generator] provided sprite interval %.1fs results in %d sprites, which is less than the minimum of %d, adjusting interval to %.1fs", config.SpriteInterval, spriteCount, config.MinimumSprites, spriteInterval)
+	}
+
+	return spriteInterval
+}
+
 func (g *SpriteGenerator) Generate() error {
 	if err := g.generateSpriteImage(); err != nil {
 		return err
@@ -100,6 +200,8 @@ func (g *SpriteGenerator) generateSpriteImage() error {
 
 	var images []image.Image
 
+	isPortrait := g.Info.VideoFile.Height > g.Info.VideoFile.Width
+
 	if !g.SlowSeek {
 		logger.Infof("[generator] generating sprite image for %s", g.Info.VideoFile.Path)
 		// generate `ChunkCount` thumbnails
@@ -107,8 +209,7 @@ func (g *SpriteGenerator) generateSpriteImage() error {
 
 		for i := 0; i < g.Info.ChunkCount; i++ {
 			time := float64(i) * stepSize
-
-			img, err := g.g.SpriteScreenshot(context.TODO(), g.Info.VideoFile.Path, time)
+			img, err := g.g.SpriteScreenshot(context.TODO(), g.Info.VideoFile.Path, time, g.Config.SpriteSize, isPortrait)
 			if err != nil {
 				return err
 			}
@@ -126,7 +227,7 @@ func (g *SpriteGenerator) generateSpriteImage() error {
 				return errors.New("invalid frame number conversion")
 			}
 
-			img, err := g.g.SpriteScreenshotSlow(context.TODO(), g.Info.VideoFile.Path, int(frame))
+			img, err := g.g.SpriteScreenshotSlow(context.TODO(), g.Info.VideoFile.Path, int(frame), g.Config.SpriteSize)
 			if err != nil {
 				return err
 			}
@@ -158,7 +259,7 @@ func (g *SpriteGenerator) generateSpriteVTT() error {
 		stepSize /= g.Info.FrameRate
 	}
 
-	return g.g.SpriteVTT(context.TODO(), g.VTTOutputPath, g.ImageOutputPath, stepSize)
+	return g.g.SpriteVTT(context.TODO(), g.VTTOutputPath, g.ImageOutputPath, stepSize, g.Info.ChunkCount)
 }
 
 func (g *SpriteGenerator) imageExists() bool {
diff --git a/internal/manager/task_generate_sprite.go b/internal/manager/task_generate_sprite.go
index 0275830ab..c173147cd 100644
--- a/internal/manager/task_generate_sprite.go
+++ b/internal/manager/task_generate_sprite.go
@@ -34,7 +34,17 @@ func (t *GenerateSpriteTask) Start(ctx context.Context) {
 	sceneHash := t.Scene.GetHash(t.fileNamingAlgorithm)
 	imagePath := instance.Paths.Scene.GetSpriteImageFilePath(sceneHash)
 	vttPath := instance.Paths.Scene.GetSpriteVttFilePath(sceneHash)
-	generator, err := NewSpriteGenerator(*videoFile, sceneHash, imagePath, vttPath, 9, 9)
+
+	cfg := DefaultSpriteGeneratorConfig
+	cfg.SpriteSize = instance.Config.GetSpriteScreenshotSize()
+
+	if instance.Config.GetUseCustomSpriteInterval() {
+		cfg.MinimumSprites = instance.Config.GetMinimumSprites()
+		cfg.MaximumSprites = instance.Config.GetMaximumSprites()
+		cfg.SpriteInterval = instance.Config.GetSpriteInterval()
+	}
+
+	generator, err := NewSpriteGenerator(*videoFile, sceneHash, imagePath, vttPath, cfg)
 
 	if err != nil {
 		logger.Errorf("error creating sprite generator: %s", err.Error())
diff --git a/pkg/ffmpeg/transcoder/screenshot.go b/pkg/ffmpeg/transcoder/screenshot.go
index c3343d594..c65f23941 100644
--- a/pkg/ffmpeg/transcoder/screenshot.go
+++ b/pkg/ffmpeg/transcoder/screenshot.go
@@ -9,7 +9,11 @@ type ScreenshotOptions struct {
 	// Quality is the quality scale. See https://ffmpeg.org/ffmpeg.html#Main-options
 	Quality int
 
+	// Width is the width to scale the screenshot to. If 0, no scaling will be applied.
 	Width int
+	// Height is the height to scale the screenshot to. If 0, no scaling will be applied.
+	// Not used if Width is set.
+	Height int
 
 	// Verbosity is the logging verbosity. Defaults to LogLevelError if not set.
 	Verbosity ffmpeg.LogLevel
@@ -70,6 +74,9 @@ func ScreenshotTime(input string, t float64, options ScreenshotOptions) ffmpeg.A
 	if options.Width > 0 {
 		vf = vf.ScaleWidth(options.Width)
 		args = args.VideoFilter(vf)
+	} else if options.Height > 0 {
+		vf = vf.ScaleHeight(options.Height)
+		args = args.VideoFilter(vf)
 	}
 
 	args = args.AppendArgs(options.OutputType)
diff --git a/pkg/scene/generate/sprite.go b/pkg/scene/generate/sprite.go
index c3b10f680..e0dea9659 100644
--- a/pkg/scene/generate/sprite.go
+++ b/pkg/scene/generate/sprite.go
@@ -18,22 +18,19 @@ import (
 	"github.com/stashapp/stash/pkg/utils"
 )
 
-const (
-	spriteScreenshotWidth = 160
-
-	spriteRows   = 9
-	spriteCols   = 9
-	spriteChunks = spriteRows * spriteCols
-)
-
-func (g Generator) SpriteScreenshot(ctx context.Context, input string, seconds float64) (image.Image, error) {
+func (g Generator) SpriteScreenshot(ctx context.Context, input string, seconds float64, size int, isPortrait bool) (image.Image, error) {
 	lockCtx := g.LockManager.ReadLock(ctx, input)
 	defer lockCtx.Cancel()
 
 	ssOptions := transcoder.ScreenshotOptions{
 		OutputPath: "-",
 		OutputType: transcoder.ScreenshotOutputTypeBMP,
-		Width:      spriteScreenshotWidth,
+	}
+
+	if !isPortrait {
+		ssOptions.Width = size
+	} else {
+		ssOptions.Height = size
 	}
 
 	args := transcoder.ScreenshotTime(input, seconds, ssOptions)
@@ -41,14 +38,14 @@ func (g Generator) SpriteScreenshot(ctx context.Context, input string, seconds f
 	return g.generateImage(lockCtx, args)
 }
 
-func (g Generator) SpriteScreenshotSlow(ctx context.Context, input string, frame int) (image.Image, error) {
+func (g Generator) SpriteScreenshotSlow(ctx context.Context, input string, frame int, width int) (image.Image, error) {
 	lockCtx := g.LockManager.ReadLock(ctx, input)
 	defer lockCtx.Cancel()
 
 	ssOptions := transcoder.ScreenshotOptions{
 		OutputPath: "-",
 		OutputType: transcoder.ScreenshotOutputTypeBMP,
-		Width:      spriteScreenshotWidth,
+		Width:      width,
 	}
 
 	args := transcoder.ScreenshotFrame(input, frame, ssOptions)
@@ -74,12 +71,13 @@ func (g Generator) CombineSpriteImages(images []image.Image) image.Image {
 	// Combine all of the thumbnails into a sprite image
 	width := images[0].Bounds().Size().X
 	height := images[0].Bounds().Size().Y
-	canvasWidth := width * spriteCols
-	canvasHeight := height * spriteRows
+	gridSize := GetSpriteGridSize(len(images))
+	canvasWidth := width * gridSize
+	canvasHeight := height * gridSize
 	montage := imaging.New(canvasWidth, canvasHeight, color.NRGBA{})
 	for index := 0; index < len(images); index++ {
-		x := width * (index % spriteCols)
-		y := height * int(math.Floor(float64(index)/float64(spriteRows)))
+		x := width * (index % gridSize)
+		y := height * int(math.Floor(float64(index)/float64(gridSize)))
 		img := images[index]
 		montage = imaging.Paste(montage, img, image.Pt(x, y))
 	}
@@ -87,14 +85,19 @@ func (g Generator) CombineSpriteImages(images []image.Image) image.Image {
 	return montage
 }
 
-func (g Generator) SpriteVTT(ctx context.Context, output string, spritePath string, stepSize float64) error {
-	lockCtx := g.LockManager.ReadLock(ctx, spritePath)
-	defer lockCtx.Cancel()
-
-	return g.generateFile(lockCtx, g.ScenePaths, vttPattern, output, g.spriteVTT(spritePath, stepSize))
+// GetSpriteGridSize return the required size of a grid, where the number of images in width
+// equals the number of images in height, to hold 'imageCount' images
+func GetSpriteGridSize(imageCount int) int {
+	return int(math.Ceil(math.Sqrt(float64(imageCount))))
 }
 
-func (g Generator) spriteVTT(spritePath string, stepSize float64) generateFn {
+func (g Generator) SpriteVTT(ctx context.Context, output string, spritePath string, stepSize float64, spriteChunks int) error {
+	lockCtx := g.LockManager.ReadLock(ctx, spritePath)
+	defer lockCtx.Cancel()
+	return g.generateFile(lockCtx, g.ScenePaths, vttPattern, output, g.spriteVTT(spritePath, stepSize, spriteChunks))
+}
+
+func (g Generator) spriteVTT(spritePath string, stepSize float64, spriteChunks int) generateFn {
 	return func(lockCtx *fsutil.LockContext, tmpFn string) error {
 		spriteImage, err := os.Open(spritePath)
 		if err != nil {
@@ -106,16 +109,17 @@ func (g Generator) spriteVTT(spritePath string, stepSize float64) generateFn {
 		if err != nil {
 			return err
 		}
-		width := image.Width / spriteCols
-		height := image.Height / spriteRows
+
+		gridSize := GetSpriteGridSize(spriteChunks)
+		width := image.Width / gridSize
+		height := image.Height / gridSize
 
 		vttLines := []string{"WEBVTT", ""}
 		for index := 0; index < spriteChunks; index++ {
-			x := width * (index % spriteCols)
-			y := height * int(math.Floor(float64(index)/float64(spriteRows)))
+			x := width * (index % gridSize)
+			y := height * int(math.Floor(float64(index)/float64(gridSize)))
 			startTime := utils.GetVTTTime(float64(index) * stepSize)
 			endTime := utils.GetVTTTime(float64(index+1) * stepSize)
-
 			vttLines = append(vttLines, startTime+" --> "+endTime)
 			vttLines = append(vttLines, fmt.Sprintf("%s#xywh=%d,%d,%d,%d", spriteImageName, x, y, width, height))
 			vttLines = append(vttLines, "")
diff --git a/ui/v2.5/graphql/data/config.graphql b/ui/v2.5/graphql/data/config.graphql
index ca1f6a47c..ba8215fe3 100644
--- a/ui/v2.5/graphql/data/config.graphql
+++ b/ui/v2.5/graphql/data/config.graphql
@@ -39,6 +39,11 @@ fragment ConfigGeneralData on ConfigGeneralResult {
   logLevel
   logAccess
   logFileMaxSize
+  useCustomSpriteInterval
+  spriteInterval
+  minimumSprites
+  maximumSprites
+  spriteScreenshotSize
   createGalleriesFromFolders
   galleryCoverRegex
   videoExtensions
diff --git a/ui/v2.5/src/components/Scenes/PreviewScrubber.tsx b/ui/v2.5/src/components/Scenes/PreviewScrubber.tsx
index 143daca4f..8ecb6e557 100644
--- a/ui/v2.5/src/components/Scenes/PreviewScrubber.tsx
+++ b/ui/v2.5/src/components/Scenes/PreviewScrubber.tsx
@@ -67,6 +67,8 @@ export const PreviewScrubber: React.FC<IScenePreviewProps> = ({
 
     const clientRect = imageParent.getBoundingClientRect();
     const scale = scaleToFit(sprite, clientRect);
+    const spriteSheet = new Image();
+    spriteSheet.src = sprite.url;
 
     setStyle({
       backgroundPosition: `${-sprite.x}px ${-sprite.y}px`,
diff --git a/ui/v2.5/src/components/Settings/SettingsSystemPanel.tsx b/ui/v2.5/src/components/Settings/SettingsSystemPanel.tsx
index 34fb634b2..446ad09a1 100644
--- a/ui/v2.5/src/components/Settings/SettingsSystemPanel.tsx
+++ b/ui/v2.5/src/components/Settings/SettingsSystemPanel.tsx
@@ -427,6 +427,44 @@ export const SettingsConfigurationPanel: React.FC = () => {
         />
       </SettingSection>
 
+      <SettingSection headingID="config.general.sprite_generation_head">
+        <NumberSetting
+          id="sprite-screenshot-size"
+          headingID="config.general.sprite_screenshot_size_head"
+          subHeadingID="config.general.sprite_screenshot_size_desc"
+          value={general.spriteScreenshotSize ?? 160}
+          onChange={(v) => saveGeneral({ spriteScreenshotSize: v })}
+        />
+        <BooleanSetting
+          id="use-custom-sprite-interval"
+          headingID="config.general.use_custom_sprite_interval_head"
+          subHeadingID="config.general.use_custom_sprite_interval_desc"
+          checked={general.useCustomSpriteInterval ?? false}
+          onChange={(v) => saveGeneral({ useCustomSpriteInterval: v })}
+        />
+        <NumberSetting
+          id="sprite-interval"
+          headingID="config.general.sprite_interval_head"
+          subHeadingID="config.general.sprite_interval_desc"
+          value={general.spriteInterval ?? 0}
+          onChange={(v) => saveGeneral({ spriteInterval: v })}
+        />
+        <NumberSetting
+          id="minimum-sprites"
+          headingID="config.general.sprite_minimum_head"
+          subHeadingID="config.general.sprite_minimum_desc"
+          value={general.minimumSprites ?? 10}
+          onChange={(v) => saveGeneral({ minimumSprites: v })}
+        />
+        <NumberSetting
+          id="maximum-sprites"
+          headingID="config.general.sprite_maximum_head"
+          subHeadingID="config.general.sprite_maximum_desc"
+          value={general.maximumSprites ?? 10}
+          onChange={(v) => saveGeneral({ maximumSprites: v })}
+        />
+      </SettingSection>
+
       <SettingSection headingID="config.general.heatmap_generation">
         <BooleanSetting
           id="heatmap-draw-range"
diff --git a/ui/v2.5/src/docs/en/Manual/Configuration.md b/ui/v2.5/src/docs/en/Manual/Configuration.md
index d5841b559..2d08f9750 100644
--- a/ui/v2.5/src/docs/en/Manual/Configuration.md
+++ b/ui/v2.5/src/docs/en/Manual/Configuration.md
@@ -89,6 +89,36 @@ This setting can be used to increase/decrease overall CPU utilisation in two sce
 
 > **⚠️ Note:** If this is set too high it will decrease overall performance and causes failures (out of memory).
 
+## Sprite generation
+
+### Sprite size
+
+Fixed size of a generated sprite, being the longest dimension in pixels. 
+Setting this to `0` will fallback to the default of `160`.
+Althought it is possible to set this value to anything bigger than `0` it is recommended to set it to `160` at least.
+
+### Use custom sprite generation
+
+If this setting is disabled, the settings below will be ignored and the default sprite generation settings are used.
+
+### Sprite interval
+
+This represents the time in seconds between each sprite to be generated. This value will be adjusted if necessary to fit within the bounds of the `Minimum Sprites` and `Maximum Sprites` settings.
+
+Setting this to `0` means that the sprite interval will be calculated based on the value of the `Minimum Sprites` field.
+
+### Minimum sprites
+
+The minimal number of distinct sprites that will be generated for a scene. `Sprite interval` will be adjusted if necessary.
+Setting this to `0` will fallback to the default of `10`
+
+### Maximum sprites
+
+The maximum number of distinct sprites that will be generated for a scene. `Sprite interval` will be adjusted if necessary.
+Setting this to `0` indicates there is no maximum.
+
+> **⚠️ Note:** The number of generated sprites is adjusted upwards to the next perfect square to ensure the sprite image is completely filled (no empty space in the grid) and the grid is as square as possible (minimizing the number of rows/columns). This means that if you set a minimum of 10 sprites, 16 will actually be generated, and if you set a maximum of 15 sprites, 16 will actually be generated.
+
 ## Hardware accelerated live transcoding
 
 Hardware accelerated live transcoding can be enabled by setting the `FFmpeg hardware encoding` setting. Stash outputs the supported hardware encoders to the log file on startup at the Info log level. If a given hardware encoder is not supported, it's error message is logged to the Debug log level for debugging purposes.
diff --git a/ui/v2.5/src/locales/en-GB.json b/ui/v2.5/src/locales/en-GB.json
index 2aee4fe2b..4bfd4322d 100644
--- a/ui/v2.5/src/locales/en-GB.json
+++ b/ui/v2.5/src/locales/en-GB.json
@@ -440,7 +440,18 @@
         "heading": "Scrapers path"
       },
       "scraping": "Scraping",
+      "sprite_generation_head": "Sprite generation",
+      "sprite_interval_desc": "Time between each generated sprite in seconds.",
+      "sprite_interval_head": "Sprite interval",
+      "sprite_maximum_desc": "Maximum number of sprites to be generated for a scene. Set to 0 to disable the limit.",
+      "sprite_maximum_head": "Maximum sprites",
+      "sprite_minimum_desc": "Minimum number of sprites to be generated for a scene",
+      "sprite_minimum_head": "Minimum sprites",
+      "sprite_screenshot_size_desc": "Desired size of each sprite in pixels.",
+      "sprite_screenshot_size_head": "Sprite size",
       "sqlite_location": "File location for the SQLite database (requires restart). WARNING: storing the database on a different system to where the Stash server is run from (i.e. over the network) is unsupported!",
+      "use_custom_sprite_interval_head": "Use custom sprite interval",
+      "use_custom_sprite_interval_desc": "Enable the custom sprite interval according to the settings below.",
       "video_ext_desc": "Comma-delimited list of file extensions that will be identified as videos.",
       "video_ext_head": "Video extensions",
       "video_head": "Video"

From 47dcdd439cea335d80025c56e2ccc9f415a41a2c Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Mon, 23 Feb 2026 07:39:28 +1100
Subject: [PATCH 305/405] Backend support for gallery custom fields (#6592)

---
 graphql/schema/types/filters.graphql          |   2 +
 graphql/schema/types/gallery.graphql          |   7 +
 internal/api/loaders/dataloaders.go           |  22 +-
 internal/api/resolver_model_gallery.go        |  13 +
 internal/api/resolver_mutation_gallery.go     |  17 +-
 internal/autotag/integration_test.go          |   5 +-
 internal/manager/task_export.go               |   7 +
 pkg/gallery/import.go                         |  20 +-
 pkg/gallery/scan.go                           |   7 +-
 pkg/image/scan.go                             |  15 +-
 pkg/models/gallery.go                         |   5 +
 pkg/models/jsonschema/gallery.go              |  33 +--
 pkg/models/mocks/GalleryReaderWriter.go       |  74 +++++-
 pkg/models/model_gallery.go                   |  16 ++
 pkg/models/repository_gallery.go              |   7 +-
 pkg/sqlite/anonymise.go                       |   4 +
 pkg/sqlite/custom_fields_test.go              |   6 +
 pkg/sqlite/database.go                        |   2 +-
 pkg/sqlite/gallery.go                         |  33 ++-
 pkg/sqlite/gallery_filter.go                  |   7 +
 pkg/sqlite/gallery_test.go                    | 248 +++++++++++++++++-
 .../81_gallery_custom_fields.up.sql           |   9 +
 pkg/sqlite/setup_test.go                      |  18 +-
 pkg/sqlite/tables.go                          |   1 +
 24 files changed, 528 insertions(+), 50 deletions(-)
 create mode 100644 pkg/sqlite/migrations/81_gallery_custom_fields.up.sql

diff --git a/graphql/schema/types/filters.graphql b/graphql/schema/types/filters.graphql
index 075e40372..d683329b6 100644
--- a/graphql/schema/types/filters.graphql
+++ b/graphql/schema/types/filters.graphql
@@ -596,6 +596,8 @@ input GalleryFilterType {
   files_filter: FileFilterType
   "Filter by related folders that meet this criteria"
   folders_filter: FolderFilterType
+
+  custom_fields: [CustomFieldCriterionInput!]
 }
 
 input TagFilterType {
diff --git a/graphql/schema/types/gallery.graphql b/graphql/schema/types/gallery.graphql
index f456157a7..e28c3802b 100644
--- a/graphql/schema/types/gallery.graphql
+++ b/graphql/schema/types/gallery.graphql
@@ -32,6 +32,7 @@ type Gallery {
   cover: Image
 
   paths: GalleryPathsType! # Resolver
+  custom_fields: Map!
   image(index: Int!): Image!
 }
 
@@ -50,6 +51,8 @@ input GalleryCreateInput {
   studio_id: ID
   tag_ids: [ID!]
   performer_ids: [ID!]
+
+  custom_fields: Map
 }
 
 input GalleryUpdateInput {
@@ -71,6 +74,8 @@ input GalleryUpdateInput {
   performer_ids: [ID!]
 
   primary_file_id: ID
+
+  custom_fields: CustomFieldsInput
 }
 
 input BulkGalleryUpdateInput {
@@ -89,6 +94,8 @@ input BulkGalleryUpdateInput {
   studio_id: ID
   tag_ids: BulkUpdateIds
   performer_ids: BulkUpdateIds
+
+  custom_fields: CustomFieldsInput
 }
 
 input GalleryDestroyInput {
diff --git a/internal/api/loaders/dataloaders.go b/internal/api/loaders/dataloaders.go
index 520714432..e7293ad1c 100644
--- a/internal/api/loaders/dataloaders.go
+++ b/internal/api/loaders/dataloaders.go
@@ -54,8 +54,9 @@ type Loaders struct {
 	ImageFiles   *ImageFileIDsLoader
 	GalleryFiles *GalleryFileIDsLoader
 
-	GalleryByID *GalleryLoader
-	ImageByID   *ImageLoader
+	GalleryByID         *GalleryLoader
+	GalleryCustomFields *CustomFieldsLoader
+	ImageByID           *ImageLoader
 
 	PerformerByID         *PerformerLoader
 	PerformerCustomFields *CustomFieldsLoader
@@ -88,6 +89,11 @@ func (m Middleware) Middleware(next http.Handler) http.Handler {
 				maxBatch: maxBatch,
 				fetch:    m.fetchGalleries(ctx),
 			},
+			GalleryCustomFields: &CustomFieldsLoader{
+				wait:     wait,
+				maxBatch: maxBatch,
+				fetch:    m.fetchGalleryCustomFields(ctx),
+			},
 			ImageByID: &ImageLoader{
 				wait:     wait,
 				maxBatch: maxBatch,
@@ -319,6 +325,18 @@ func (m Middleware) fetchTagCustomFields(ctx context.Context) func(keys []int) (
 	}
 }
 
+func (m Middleware) fetchGalleryCustomFields(ctx context.Context) func(keys []int) ([]models.CustomFieldMap, []error) {
+	return func(keys []int) (ret []models.CustomFieldMap, errs []error) {
+		err := m.Repository.WithDB(ctx, func(ctx context.Context) error {
+			var err error
+			ret, err = m.Repository.Gallery.GetCustomFieldsBulk(ctx, keys)
+			return err
+		})
+
+		return ret, toErrorSlice(err)
+	}
+}
+
 func (m Middleware) fetchGroups(ctx context.Context) func(keys []int) ([]*models.Group, []error) {
 	return func(keys []int) (ret []*models.Group, errs []error) {
 		err := m.Repository.WithDB(ctx, func(ctx context.Context) error {
diff --git a/internal/api/resolver_model_gallery.go b/internal/api/resolver_model_gallery.go
index 9dc68b4c4..773a831d8 100644
--- a/internal/api/resolver_model_gallery.go
+++ b/internal/api/resolver_model_gallery.go
@@ -216,3 +216,16 @@ func (r *galleryResolver) Image(ctx context.Context, obj *models.Gallery, index
 
 	return
 }
+
+func (r *galleryResolver) CustomFields(ctx context.Context, obj *models.Gallery) (map[string]interface{}, error) {
+	m, err := loaders.From(ctx).GalleryCustomFields.Load(obj.ID)
+	if err != nil {
+		return nil, err
+	}
+
+	if m == nil {
+		return make(map[string]interface{}), nil
+	}
+
+	return m, nil
+}
diff --git a/internal/api/resolver_mutation_gallery.go b/internal/api/resolver_mutation_gallery.go
index e7f853922..2cd80b1ff 100644
--- a/internal/api/resolver_mutation_gallery.go
+++ b/internal/api/resolver_mutation_gallery.go
@@ -42,7 +42,10 @@ func (r *mutationResolver) GalleryCreate(ctx context.Context, input GalleryCreat
 	}
 
 	// Populate a new gallery from the input
-	newGallery := models.NewGallery()
+	newGallery := models.CreateGalleryInput{
+		Gallery: &models.Gallery{},
+	}
+	*newGallery.Gallery = models.NewGallery()
 
 	newGallery.Title = strings.TrimSpace(input.Title)
 	newGallery.Code = translator.string(input.Code)
@@ -81,10 +84,12 @@ func (r *mutationResolver) GalleryCreate(ctx context.Context, input GalleryCreat
 		newGallery.URLs = models.NewRelatedStrings([]string{strings.TrimSpace(*input.URL)})
 	}
 
+	newGallery.CustomFields = convertMapJSONNumbers(input.CustomFields)
+
 	// Start the transaction and save the gallery
 	if err := r.withTxn(ctx, func(ctx context.Context) error {
 		qb := r.repository.Gallery
-		if err := qb.Create(ctx, &newGallery, nil); err != nil {
+		if err := qb.Create(ctx, &newGallery); err != nil {
 			return err
 		}
 
@@ -241,6 +246,10 @@ func (r *mutationResolver) galleryUpdate(ctx context.Context, input models.Galle
 		return nil, fmt.Errorf("converting scene ids: %w", err)
 	}
 
+	if input.CustomFields != nil {
+		updatedGallery.CustomFields = handleUpdateCustomFields(*input.CustomFields)
+	}
+
 	// gallery scene is set from the scene only
 
 	gallery, err := qb.UpdatePartial(ctx, galleryID, updatedGallery)
@@ -293,6 +302,10 @@ func (r *mutationResolver) BulkGalleryUpdate(ctx context.Context, input BulkGall
 		return nil, fmt.Errorf("converting scene ids: %w", err)
 	}
 
+	if input.CustomFields != nil {
+		updatedGallery.CustomFields = handleUpdateCustomFields(*input.CustomFields)
+	}
+
 	ret := []*models.Gallery{}
 
 	// Start the transaction and save the galleries
diff --git a/internal/autotag/integration_test.go b/internal/autotag/integration_test.go
index 27cce014e..9745d623e 100644
--- a/internal/autotag/integration_test.go
+++ b/internal/autotag/integration_test.go
@@ -468,7 +468,10 @@ func makeGallery(expectedResult bool) *models.Gallery {
 }
 
 func createGallery(ctx context.Context, w models.GalleryWriter, o *models.Gallery, f *models.BaseFile) error {
-	err := w.Create(ctx, o, []models.FileID{f.ID})
+	err := w.Create(ctx, &models.CreateGalleryInput{
+		Gallery: o,
+		FileIDs: []models.FileID{f.ID},
+	})
 	if err != nil {
 		return fmt.Errorf("Failed to create gallery with path '%s': %s", f.Path, err.Error())
 	}
diff --git a/internal/manager/task_export.go b/internal/manager/task_export.go
index 5f2897670..30adf626b 100644
--- a/internal/manager/task_export.go
+++ b/internal/manager/task_export.go
@@ -779,6 +779,7 @@ func (t *ExportTask) exportGallery(ctx context.Context, wg *sync.WaitGroup, jobC
 	studioReader := r.Studio
 	performerReader := r.Performer
 	tagReader := r.Tag
+	galleryReader := r.Gallery
 	galleryChapterReader := r.GalleryChapter
 
 	for g := range jobChan {
@@ -847,6 +848,12 @@ func (t *ExportTask) exportGallery(ctx context.Context, wg *sync.WaitGroup, jobC
 
 		newGalleryJSON.Tags = tag.GetNames(tags)
 
+		newGalleryJSON.CustomFields, err = galleryReader.GetCustomFields(ctx, g.ID)
+		if err != nil {
+			logger.Errorf("[galleries] <%s> error getting gallery custom fields: %v", g.DisplayName(), err)
+			continue
+		}
+
 		if t.includeDependencies {
 			if g.StudioID != nil {
 				t.studios.IDs = sliceutil.AppendUnique(t.studios.IDs, *g.StudioID)
diff --git a/pkg/gallery/import.go b/pkg/gallery/import.go
index 22f3e6c44..e33297bdb 100644
--- a/pkg/gallery/import.go
+++ b/pkg/gallery/import.go
@@ -28,8 +28,9 @@ type Importer struct {
 	Input               jsonschema.Gallery
 	MissingRefBehaviour models.ImportMissingRefEnum
 
-	ID      int
-	gallery models.Gallery
+	ID           int
+	gallery      models.Gallery
+	customFields map[string]interface{}
 }
 
 func (i *Importer) PreImport(ctx context.Context) error {
@@ -51,6 +52,8 @@ func (i *Importer) PreImport(ctx context.Context) error {
 		return err
 	}
 
+	i.customFields = i.Input.CustomFields
+
 	return nil
 }
 
@@ -356,7 +359,11 @@ func (i *Importer) Create(ctx context.Context) (*int, error) {
 	for _, f := range i.gallery.Files.List() {
 		fileIDs = append(fileIDs, f.Base().ID)
 	}
-	err := i.ReaderWriter.Create(ctx, &i.gallery, fileIDs)
+	err := i.ReaderWriter.Create(ctx, &models.CreateGalleryInput{
+		Gallery:      &i.gallery,
+		FileIDs:      fileIDs,
+		CustomFields: i.customFields,
+	})
 	if err != nil {
 		return nil, fmt.Errorf("error creating gallery: %v", err)
 	}
@@ -368,7 +375,12 @@ func (i *Importer) Create(ctx context.Context) (*int, error) {
 func (i *Importer) Update(ctx context.Context, id int) error {
 	gallery := i.gallery
 	gallery.ID = id
-	err := i.ReaderWriter.Update(ctx, &gallery)
+	err := i.ReaderWriter.Update(ctx, &models.UpdateGalleryInput{
+		Gallery: &gallery,
+		CustomFields: models.CustomFieldsInput{
+			Full: i.customFields,
+		},
+	})
 	if err != nil {
 		return fmt.Errorf("error updating existing gallery: %v", err)
 	}
diff --git a/pkg/gallery/scan.go b/pkg/gallery/scan.go
index 9d0313b17..2064355cd 100644
--- a/pkg/gallery/scan.go
+++ b/pkg/gallery/scan.go
@@ -17,7 +17,7 @@ type ScanCreatorUpdater interface {
 	FindByFingerprints(ctx context.Context, fp []models.Fingerprint) ([]*models.Gallery, error)
 	GetFiles(ctx context.Context, relatedID int) ([]models.File, error)
 
-	Create(ctx context.Context, newGallery *models.Gallery, fileIDs []models.FileID) error
+	models.GalleryCreator
 	UpdatePartial(ctx context.Context, id int, updatedGallery models.GalleryPartial) (*models.Gallery, error)
 	AddFileID(ctx context.Context, id int, fileID models.FileID) error
 }
@@ -80,7 +80,10 @@ func (h *ScanHandler) Handle(ctx context.Context, f models.File, oldFile models.
 
 		logger.Infof("%s doesn't exist. Creating new gallery...", f.Base().Path)
 
-		if err := h.CreatorUpdater.Create(ctx, &newGallery, []models.FileID{baseFile.ID}); err != nil {
+		if err := h.CreatorUpdater.Create(ctx, &models.CreateGalleryInput{
+			Gallery: &newGallery,
+			FileIDs: []models.FileID{baseFile.ID},
+		}); err != nil {
 			return fmt.Errorf("creating new gallery: %w", err)
 		}
 
diff --git a/pkg/image/scan.go b/pkg/image/scan.go
index a6002057f..67f4b334c 100644
--- a/pkg/image/scan.go
+++ b/pkg/image/scan.go
@@ -35,7 +35,7 @@ type ScanCreatorUpdater interface {
 type GalleryFinderCreator interface {
 	FindByFileID(ctx context.Context, fileID models.FileID) ([]*models.Gallery, error)
 	FindByFolderID(ctx context.Context, folderID models.FolderID) ([]*models.Gallery, error)
-	Create(ctx context.Context, newObject *models.Gallery, fileIDs []models.FileID) error
+	models.GalleryCreator
 	UpdatePartial(ctx context.Context, id int, updatedGallery models.GalleryPartial) (*models.Gallery, error)
 }
 
@@ -252,9 +252,13 @@ func (h *ScanHandler) getOrCreateFolderBasedGallery(ctx context.Context, f model
 	newGallery := models.NewGallery()
 	newGallery.FolderID = &folderID
 
+	input := models.CreateGalleryInput{
+		Gallery: &newGallery,
+	}
+
 	logger.Infof("Creating folder-based gallery for %s", filepath.Dir(f.Base().Path))
 
-	if err := h.GalleryFinder.Create(ctx, &newGallery, nil); err != nil {
+	if err := h.GalleryFinder.Create(ctx, &input); err != nil {
 		return nil, fmt.Errorf("creating folder based gallery: %w", err)
 	}
 
@@ -308,7 +312,12 @@ func (h *ScanHandler) getOrCreateZipBasedGallery(ctx context.Context, zipFile mo
 
 	logger.Infof("%s doesn't exist. Creating new gallery...", zipFile.Base().Path)
 
-	if err := h.GalleryFinder.Create(ctx, &newGallery, []models.FileID{zipFile.Base().ID}); err != nil {
+	input := models.CreateGalleryInput{
+		Gallery: &newGallery,
+		FileIDs: []models.FileID{zipFile.Base().ID},
+	}
+
+	if err := h.GalleryFinder.Create(ctx, &input); err != nil {
 		return nil, fmt.Errorf("creating zip-based gallery: %w", err)
 	}
 
diff --git a/pkg/models/gallery.go b/pkg/models/gallery.go
index dfc776afe..8f335020a 100644
--- a/pkg/models/gallery.go
+++ b/pkg/models/gallery.go
@@ -67,6 +67,9 @@ type GalleryFilterType struct {
 	CreatedAt *TimestampCriterionInput `json:"created_at"`
 	// Filter by updated at
 	UpdatedAt *TimestampCriterionInput `json:"updated_at"`
+
+	// Filter by custom fields
+	CustomFields []CustomFieldCriterionInput `json:"custom_fields"`
 }
 
 type GalleryUpdateInput struct {
@@ -86,6 +89,8 @@ type GalleryUpdateInput struct {
 	PerformerIds     []string `json:"performer_ids"`
 	PrimaryFileID    *string  `json:"primary_file_id"`
 
+	CustomFields *CustomFieldsInput `json:"custom_fields"`
+
 	// deprecated
 	URL *string `json:"url"`
 }
diff --git a/pkg/models/jsonschema/gallery.go b/pkg/models/jsonschema/gallery.go
index 7323e37ba..5fb6e16ab 100644
--- a/pkg/models/jsonschema/gallery.go
+++ b/pkg/models/jsonschema/gallery.go
@@ -18,22 +18,23 @@ type GalleryChapter struct {
 }
 
 type Gallery struct {
-	ZipFiles     []string         `json:"zip_files,omitempty"`
-	FolderPath   string           `json:"folder_path,omitempty"`
-	Title        string           `json:"title,omitempty"`
-	Code         string           `json:"code,omitempty"`
-	URLs         []string         `json:"urls,omitempty"`
-	Date         string           `json:"date,omitempty"`
-	Details      string           `json:"details,omitempty"`
-	Photographer string           `json:"photographer,omitempty"`
-	Rating       int              `json:"rating,omitempty"`
-	Organized    bool             `json:"organized,omitempty"`
-	Chapters     []GalleryChapter `json:"chapters,omitempty"`
-	Studio       string           `json:"studio,omitempty"`
-	Performers   []string         `json:"performers,omitempty"`
-	Tags         []string         `json:"tags,omitempty"`
-	CreatedAt    json.JSONTime    `json:"created_at,omitempty"`
-	UpdatedAt    json.JSONTime    `json:"updated_at,omitempty"`
+	ZipFiles     []string               `json:"zip_files,omitempty"`
+	FolderPath   string                 `json:"folder_path,omitempty"`
+	Title        string                 `json:"title,omitempty"`
+	Code         string                 `json:"code,omitempty"`
+	URLs         []string               `json:"urls,omitempty"`
+	Date         string                 `json:"date,omitempty"`
+	Details      string                 `json:"details,omitempty"`
+	Photographer string                 `json:"photographer,omitempty"`
+	Rating       int                    `json:"rating,omitempty"`
+	Organized    bool                   `json:"organized,omitempty"`
+	Chapters     []GalleryChapter       `json:"chapters,omitempty"`
+	Studio       string                 `json:"studio,omitempty"`
+	Performers   []string               `json:"performers,omitempty"`
+	Tags         []string               `json:"tags,omitempty"`
+	CreatedAt    json.JSONTime          `json:"created_at,omitempty"`
+	UpdatedAt    json.JSONTime          `json:"updated_at,omitempty"`
+	CustomFields map[string]interface{} `json:"custom_fields,omitempty"`
 
 	// deprecated - for import only
 	URL string `json:"url,omitempty"`
diff --git a/pkg/models/mocks/GalleryReaderWriter.go b/pkg/models/mocks/GalleryReaderWriter.go
index f07f8a7d9..f20d9f76e 100644
--- a/pkg/models/mocks/GalleryReaderWriter.go
+++ b/pkg/models/mocks/GalleryReaderWriter.go
@@ -114,13 +114,13 @@ func (_m *GalleryReaderWriter) CountByFileID(ctx context.Context, fileID models.
 	return r0, r1
 }
 
-// Create provides a mock function with given fields: ctx, newGallery, fileIDs
-func (_m *GalleryReaderWriter) Create(ctx context.Context, newGallery *models.Gallery, fileIDs []models.FileID) error {
-	ret := _m.Called(ctx, newGallery, fileIDs)
+// Create provides a mock function with given fields: ctx, newGallery
+func (_m *GalleryReaderWriter) Create(ctx context.Context, newGallery *models.CreateGalleryInput) error {
+	ret := _m.Called(ctx, newGallery)
 
 	var r0 error
-	if rf, ok := ret.Get(0).(func(context.Context, *models.Gallery, []models.FileID) error); ok {
-		r0 = rf(ctx, newGallery, fileIDs)
+	if rf, ok := ret.Get(0).(func(context.Context, *models.CreateGalleryInput) error); ok {
+		r0 = rf(ctx, newGallery)
 	} else {
 		r0 = ret.Error(0)
 	}
@@ -395,6 +395,52 @@ func (_m *GalleryReaderWriter) FindUserGalleryByTitle(ctx context.Context, title
 	return r0, r1
 }
 
+// GetCustomFields provides a mock function with given fields: ctx, id
+func (_m *GalleryReaderWriter) GetCustomFields(ctx context.Context, id int) (map[string]interface{}, error) {
+	ret := _m.Called(ctx, id)
+
+	var r0 map[string]interface{}
+	if rf, ok := ret.Get(0).(func(context.Context, int) map[string]interface{}); ok {
+		r0 = rf(ctx, id)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(map[string]interface{})
+		}
+	}
+
+	var r1 error
+	if rf, ok := ret.Get(1).(func(context.Context, int) error); ok {
+		r1 = rf(ctx, id)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// GetCustomFieldsBulk provides a mock function with given fields: ctx, ids
+func (_m *GalleryReaderWriter) GetCustomFieldsBulk(ctx context.Context, ids []int) ([]models.CustomFieldMap, error) {
+	ret := _m.Called(ctx, ids)
+
+	var r0 []models.CustomFieldMap
+	if rf, ok := ret.Get(0).(func(context.Context, []int) []models.CustomFieldMap); ok {
+		r0 = rf(ctx, ids)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).([]models.CustomFieldMap)
+		}
+	}
+
+	var r1 error
+	if rf, ok := ret.Get(1).(func(context.Context, []int) error); ok {
+		r1 = rf(ctx, ids)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
 // GetFiles provides a mock function with given fields: ctx, relatedID
 func (_m *GalleryReaderWriter) GetFiles(ctx context.Context, relatedID int) ([]models.File, error) {
 	ret := _m.Called(ctx, relatedID)
@@ -656,12 +702,26 @@ func (_m *GalleryReaderWriter) SetCover(ctx context.Context, galleryID int, cove
 	return r0
 }
 
+// SetCustomFields provides a mock function with given fields: ctx, id, fields
+func (_m *GalleryReaderWriter) SetCustomFields(ctx context.Context, id int, fields models.CustomFieldsInput) error {
+	ret := _m.Called(ctx, id, fields)
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context, int, models.CustomFieldsInput) error); ok {
+		r0 = rf(ctx, id, fields)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
 // Update provides a mock function with given fields: ctx, updatedGallery
-func (_m *GalleryReaderWriter) Update(ctx context.Context, updatedGallery *models.Gallery) error {
+func (_m *GalleryReaderWriter) Update(ctx context.Context, updatedGallery *models.UpdateGalleryInput) error {
 	ret := _m.Called(ctx, updatedGallery)
 
 	var r0 error
-	if rf, ok := ret.Get(0).(func(context.Context, *models.Gallery) error); ok {
+	if rf, ok := ret.Get(0).(func(context.Context, *models.UpdateGalleryInput) error); ok {
 		r0 = rf(ctx, updatedGallery)
 	} else {
 		r0 = ret.Error(0)
diff --git a/pkg/models/model_gallery.go b/pkg/models/model_gallery.go
index 4b6a3183d..bbdba46a6 100644
--- a/pkg/models/model_gallery.go
+++ b/pkg/models/model_gallery.go
@@ -46,6 +46,20 @@ func NewGallery() Gallery {
 	}
 }
 
+type CreateGalleryInput struct {
+	*Gallery
+
+	FileIDs      []FileID
+	CustomFields map[string]interface{} `json:"custom_fields"`
+}
+
+type UpdateGalleryInput struct {
+	*Gallery
+
+	FileIDs      []FileID
+	CustomFields CustomFieldsInput `json:"custom_fields"`
+}
+
 // GalleryPartial represents part of a Gallery object. It is used to update
 // the database entry. Only non-nil fields will be updated.
 type GalleryPartial struct {
@@ -70,6 +84,8 @@ type GalleryPartial struct {
 	TagIDs        *UpdateIDs
 	PerformerIDs  *UpdateIDs
 	PrimaryFileID *FileID
+
+	CustomFields CustomFieldsInput
 }
 
 func NewGalleryPartial() GalleryPartial {
diff --git a/pkg/models/repository_gallery.go b/pkg/models/repository_gallery.go
index 0cfb9964f..b8f1452f3 100644
--- a/pkg/models/repository_gallery.go
+++ b/pkg/models/repository_gallery.go
@@ -37,12 +37,12 @@ type GalleryCounter interface {
 
 // GalleryCreator provides methods to create galleries.
 type GalleryCreator interface {
-	Create(ctx context.Context, newGallery *Gallery, fileIDs []FileID) error
+	Create(ctx context.Context, newGallery *CreateGalleryInput) error
 }
 
 // GalleryUpdater provides methods to update galleries.
 type GalleryUpdater interface {
-	Update(ctx context.Context, updatedGallery *Gallery) error
+	Update(ctx context.Context, updatedGallery *UpdateGalleryInput) error
 	UpdatePartial(ctx context.Context, id int, updatedGallery GalleryPartial) (*Gallery, error)
 	UpdateImages(ctx context.Context, galleryID int, imageIDs []int) error
 }
@@ -70,6 +70,7 @@ type GalleryReader interface {
 	PerformerIDLoader
 	TagIDLoader
 	FileLoader
+	CustomFieldsReader
 
 	All(ctx context.Context) ([]*Gallery, error)
 }
@@ -80,6 +81,8 @@ type GalleryWriter interface {
 	GalleryUpdater
 	GalleryDestroyer
 
+	CustomFieldsWriter
+
 	AddFileID(ctx context.Context, id int, fileID FileID) error
 	AddImages(ctx context.Context, galleryID int, imageIDs ...int) error
 	RemoveImages(ctx context.Context, galleryID int, imageIDs ...int) error
diff --git a/pkg/sqlite/anonymise.go b/pkg/sqlite/anonymise.go
index e0a354980..6a5cd4da5 100644
--- a/pkg/sqlite/anonymise.go
+++ b/pkg/sqlite/anonymise.go
@@ -522,6 +522,10 @@ func (db *Anonymiser) anonymiseGalleries(ctx context.Context) error {
 		return err
 	}
 
+	if err := db.anonymiseCustomFields(ctx, goqu.T(galleriesCustomFieldsTable.GetTable()), "gallery_id"); err != nil {
+		return err
+	}
+
 	return nil
 }
 
diff --git a/pkg/sqlite/custom_fields_test.go b/pkg/sqlite/custom_fields_test.go
index a2c045851..ae4a276f7 100644
--- a/pkg/sqlite/custom_fields_test.go
+++ b/pkg/sqlite/custom_fields_test.go
@@ -240,3 +240,9 @@ func TestSceneSetCustomFields(t *testing.T) {
 
 	testSetCustomFields(t, "Scene", db.Scene, sceneIDs[sceneIdx], getSceneCustomFields(sceneIdx))
 }
+
+func TestGallerySetCustomFields(t *testing.T) {
+	galleryIdx := galleryIdxWithScene
+
+	testSetCustomFields(t, "Gallery", db.Gallery, galleryIDs[galleryIdx], getGalleryCustomFields(galleryIdx))
+}
diff --git a/pkg/sqlite/database.go b/pkg/sqlite/database.go
index 5b67e5602..d95832836 100644
--- a/pkg/sqlite/database.go
+++ b/pkg/sqlite/database.go
@@ -34,7 +34,7 @@ const (
 	cacheSizeEnv = "STASH_SQLITE_CACHE_SIZE"
 )
 
-var appSchemaVersion uint = 80
+var appSchemaVersion uint = 81
 
 //go:embed migrations/*.sql
 var migrationsBox embed.FS
diff --git a/pkg/sqlite/gallery.go b/pkg/sqlite/gallery.go
index 41729057b..305b1fe09 100644
--- a/pkg/sqlite/gallery.go
+++ b/pkg/sqlite/gallery.go
@@ -183,6 +183,8 @@ var (
 )
 
 type GalleryStore struct {
+	customFieldsStore
+
 	tableMgr *table
 
 	fileStore   *FileStore
@@ -191,6 +193,10 @@ type GalleryStore struct {
 
 func NewGalleryStore(fileStore *FileStore, folderStore *FolderStore) *GalleryStore {
 	return &GalleryStore{
+		customFieldsStore: customFieldsStore{
+			table: galleriesCustomFieldsTable,
+			fk:    galleriesCustomFieldsTable.Col(galleryIDColumn),
+		},
 		tableMgr:    galleryTableMgr,
 		fileStore:   fileStore,
 		folderStore: folderStore,
@@ -231,18 +237,18 @@ func (qb *GalleryStore) selectDataset() *goqu.SelectDataset {
 	)
 }
 
-func (qb *GalleryStore) Create(ctx context.Context, newObject *models.Gallery, fileIDs []models.FileID) error {
+func (qb *GalleryStore) Create(ctx context.Context, newObject *models.CreateGalleryInput) error {
 	var r galleryRow
-	r.fromGallery(*newObject)
+	r.fromGallery(*newObject.Gallery)
 
 	id, err := qb.tableMgr.insertID(ctx, r)
 	if err != nil {
 		return err
 	}
 
-	if len(fileIDs) > 0 {
+	if len(newObject.FileIDs) > 0 {
 		const firstPrimary = true
-		if err := galleriesFilesTableMgr.insertJoins(ctx, id, firstPrimary, fileIDs); err != nil {
+		if err := galleriesFilesTableMgr.insertJoins(ctx, id, firstPrimary, newObject.FileIDs); err != nil {
 			return err
 		}
 	}
@@ -269,19 +275,24 @@ func (qb *GalleryStore) Create(ctx context.Context, newObject *models.Gallery, f
 		}
 	}
 
+	const partial = false
+	if err := qb.setCustomFields(ctx, id, newObject.CustomFields, partial); err != nil {
+		return err
+	}
+
 	updated, err := qb.find(ctx, id)
 	if err != nil {
 		return fmt.Errorf("finding after create: %w", err)
 	}
 
-	*newObject = *updated
+	*newObject.Gallery = *updated
 
 	return nil
 }
 
-func (qb *GalleryStore) Update(ctx context.Context, updatedObject *models.Gallery) error {
+func (qb *GalleryStore) Update(ctx context.Context, updatedObject *models.UpdateGalleryInput) error {
 	var r galleryRow
-	r.fromGallery(*updatedObject)
+	r.fromGallery(*updatedObject.Gallery)
 
 	if err := qb.tableMgr.updateByID(ctx, updatedObject.ID, r); err != nil {
 		return err
@@ -319,6 +330,10 @@ func (qb *GalleryStore) Update(ctx context.Context, updatedObject *models.Galler
 		}
 	}
 
+	if err := qb.SetCustomFields(ctx, updatedObject.ID, updatedObject.CustomFields); err != nil {
+		return err
+	}
+
 	return nil
 }
 
@@ -364,6 +379,10 @@ func (qb *GalleryStore) UpdatePartial(ctx context.Context, id int, partial model
 		}
 	}
 
+	if err := qb.SetCustomFields(ctx, id, partial.CustomFields); err != nil {
+		return nil, err
+	}
+
 	return qb.find(ctx, id)
 }
 
diff --git a/pkg/sqlite/gallery_filter.go b/pkg/sqlite/gallery_filter.go
index f05ff7b81..f920e442a 100644
--- a/pkg/sqlite/gallery_filter.go
+++ b/pkg/sqlite/gallery_filter.go
@@ -105,6 +105,13 @@ func (qb *galleryFilterHandler) criterionHandler() criterionHandler {
 		&timestampCriterionHandler{filter.CreatedAt, "galleries.created_at", nil},
 		&timestampCriterionHandler{filter.UpdatedAt, "galleries.updated_at", nil},
 
+		&customFieldsFilterHandler{
+			table: galleriesCustomFieldsTable.GetTable(),
+			fkCol: galleryIDColumn,
+			c:     filter.CustomFields,
+			idCol: "galleries.id",
+		},
+
 		&relatedFilterHandler{
 			relatedIDCol:   "scenes_galleries.scene_id",
 			relatedRepo:    sceneRepository.repository,
diff --git a/pkg/sqlite/gallery_test.go b/pkg/sqlite/gallery_test.go
index 06d7daf17..4156f129c 100644
--- a/pkg/sqlite/gallery_test.go
+++ b/pkg/sqlite/gallery_test.go
@@ -160,7 +160,10 @@ func Test_galleryQueryBuilder_Create(t *testing.T) {
 				fileIDs = []models.FileID{s.Files.List()[0].Base().ID}
 			}
 
-			if err := qb.Create(ctx, &s, fileIDs); (err != nil) != tt.wantErr {
+			if err := qb.Create(ctx, &models.CreateGalleryInput{
+				Gallery: &s,
+				FileIDs: fileIDs,
+			}); (err != nil) != tt.wantErr {
 				t.Errorf("galleryQueryBuilder.Create() error = %v, wantErr = %v", err, tt.wantErr)
 			}
 
@@ -360,7 +363,9 @@ func Test_galleryQueryBuilder_Update(t *testing.T) {
 
 			copy := *tt.updatedObject
 
-			if err := qb.Update(ctx, tt.updatedObject); (err != nil) != tt.wantErr {
+			if err := qb.Update(ctx, &models.UpdateGalleryInput{
+				Gallery: tt.updatedObject,
+			}); (err != nil) != tt.wantErr {
 				t.Errorf("galleryQueryBuilder.Update() error = %v, wantErr %v", err, tt.wantErr)
 			}
 
@@ -3001,6 +3006,245 @@ func TestGallerySetAndResetCover(t *testing.T) {
 	})
 }
 
+func TestGalleryQueryCustomFields(t *testing.T) {
+	tests := []struct {
+		name        string
+		filter      *models.GalleryFilterType
+		includeIdxs []int
+		excludeIdxs []int
+		wantErr     bool
+	}{
+		{
+			"equals",
+			&models.GalleryFilterType{
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "string",
+						Modifier: models.CriterionModifierEquals,
+						Value:    []any{getGalleryStringValue(galleryIdxWithImage, "custom")},
+					},
+				},
+			},
+			[]int{galleryIdxWithImage},
+			nil,
+			false,
+		},
+		{
+			"not equals",
+			&models.GalleryFilterType{
+				Title: &models.StringCriterionInput{
+					Value:    getGalleryStringValue(galleryIdxWithImage, titleField),
+					Modifier: models.CriterionModifierEquals,
+				},
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "string",
+						Modifier: models.CriterionModifierNotEquals,
+						Value:    []any{getGalleryStringValue(galleryIdxWithImage, "custom")},
+					},
+				},
+			},
+			nil,
+			[]int{galleryIdxWithImage},
+			false,
+		},
+		{
+			"includes",
+			&models.GalleryFilterType{
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "string",
+						Modifier: models.CriterionModifierIncludes,
+						Value:    []any{getGalleryStringValue(galleryIdxWithImage, "custom")[9:]},
+					},
+				},
+			},
+			[]int{galleryIdxWithImage},
+			nil,
+			false,
+		},
+		{
+			"excludes",
+			&models.GalleryFilterType{
+				Title: &models.StringCriterionInput{
+					Value:    getGalleryStringValue(galleryIdxWithImage, titleField),
+					Modifier: models.CriterionModifierEquals,
+				},
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "string",
+						Modifier: models.CriterionModifierExcludes,
+						Value:    []any{getGalleryStringValue(galleryIdxWithImage, "custom")[9:]},
+					},
+				},
+			},
+			nil,
+			[]int{galleryIdxWithImage},
+			false,
+		},
+		{
+			"regex",
+			&models.GalleryFilterType{
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "string",
+						Modifier: models.CriterionModifierMatchesRegex,
+						Value:    []any{".*17_custom"},
+					},
+				},
+			},
+			[]int{galleryIdxWithPerformerTag},
+			nil,
+			false,
+		},
+		{
+			"invalid regex",
+			&models.GalleryFilterType{
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "string",
+						Modifier: models.CriterionModifierMatchesRegex,
+						Value:    []any{"["},
+					},
+				},
+			},
+			nil,
+			nil,
+			true,
+		},
+		{
+			"not matches regex",
+			&models.GalleryFilterType{
+				Title: &models.StringCriterionInput{
+					Value:    getGalleryStringValue(galleryIdxWithPerformerTag, titleField),
+					Modifier: models.CriterionModifierEquals,
+				},
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "string",
+						Modifier: models.CriterionModifierNotMatchesRegex,
+						Value:    []any{".*17_custom"},
+					},
+				},
+			},
+			nil,
+			[]int{galleryIdxWithPerformerTag},
+			false,
+		},
+		{
+			"invalid not matches regex",
+			&models.GalleryFilterType{
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "string",
+						Modifier: models.CriterionModifierNotMatchesRegex,
+						Value:    []any{"["},
+					},
+				},
+			},
+			nil,
+			nil,
+			true,
+		},
+		{
+			"null",
+			&models.GalleryFilterType{
+				Title: &models.StringCriterionInput{
+					Value:    getGalleryStringValue(galleryIdxWithImage, titleField),
+					Modifier: models.CriterionModifierEquals,
+				},
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "not existing",
+						Modifier: models.CriterionModifierIsNull,
+					},
+				},
+			},
+			[]int{galleryIdxWithImage},
+			nil,
+			false,
+		},
+		{
+			"not null",
+			&models.GalleryFilterType{
+				Title: &models.StringCriterionInput{
+					Value:    getGalleryStringValue(galleryIdxWithImage, titleField),
+					Modifier: models.CriterionModifierEquals,
+				},
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "string",
+						Modifier: models.CriterionModifierNotNull,
+					},
+				},
+			},
+			[]int{galleryIdxWithImage},
+			nil,
+			false,
+		},
+		{
+			"between",
+			&models.GalleryFilterType{
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "real",
+						Modifier: models.CriterionModifierBetween,
+						Value:    []any{0.15, 0.25},
+					},
+				},
+			},
+			[]int{galleryIdxWithImage},
+			nil,
+			false,
+		},
+		{
+			"not between",
+			&models.GalleryFilterType{
+				Title: &models.StringCriterionInput{
+					Value:    getGalleryStringValue(galleryIdxWithImage, titleField),
+					Modifier: models.CriterionModifierEquals,
+				},
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "real",
+						Modifier: models.CriterionModifierNotBetween,
+						Value:    []any{0.15, 0.25},
+					},
+				},
+			},
+			nil,
+			[]int{galleryIdxWithImage},
+			false,
+		},
+	}
+
+	for _, tt := range tests {
+		runWithRollbackTxn(t, tt.name, func(t *testing.T, ctx context.Context) {
+			assert := assert.New(t)
+
+			galleries, _, err := db.Gallery.Query(ctx, tt.filter, nil)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("GalleryStore.Query() error = %v, wantErr %v", err, tt.wantErr)
+			}
+
+			if err != nil {
+				return
+			}
+
+			ids := galleriesToIDs(galleries)
+			include := indexesToIDs(galleryIDs, tt.includeIdxs)
+			exclude := indexesToIDs(galleryIDs, tt.excludeIdxs)
+
+			for _, i := range include {
+				assert.Contains(ids, i)
+			}
+			for _, e := range exclude {
+				assert.NotContains(ids, e)
+			}
+		})
+	}
+}
+
 // TODO Count
 // TODO All
 // TODO Query
diff --git a/pkg/sqlite/migrations/81_gallery_custom_fields.up.sql b/pkg/sqlite/migrations/81_gallery_custom_fields.up.sql
new file mode 100644
index 000000000..89a6e4c05
--- /dev/null
+++ b/pkg/sqlite/migrations/81_gallery_custom_fields.up.sql
@@ -0,0 +1,9 @@
+CREATE TABLE `gallery_custom_fields` (
+  `gallery_id` integer NOT NULL,
+  `field` varchar(64) NOT NULL,
+  `value` BLOB NOT NULL,
+  PRIMARY KEY (`gallery_id`, `field`),
+  foreign key(`gallery_id`) references `galleries`(`id`) on delete CASCADE
+);
+
+CREATE INDEX `index_gallery_custom_fields_field_value` ON `gallery_custom_fields` (`field`, `value`);
diff --git a/pkg/sqlite/setup_test.go b/pkg/sqlite/setup_test.go
index 91f9f127b..675b3f417 100644
--- a/pkg/sqlite/setup_test.go
+++ b/pkg/sqlite/setup_test.go
@@ -1389,6 +1389,18 @@ func makeGallery(i int, includeScenes bool) *models.Gallery {
 	return ret
 }
 
+func getGalleryCustomFields(index int) map[string]interface{} {
+	if index%5 == 0 {
+		return nil
+	}
+
+	return map[string]interface{}{
+		"string": getGalleryStringValue(index, "custom"),
+		"int":    int64(index % 5),
+		"real":   float64(index) / 10,
+	}
+}
+
 func createGalleries(ctx context.Context, n int) error {
 	gqb := db.Gallery
 	fqb := db.File
@@ -1410,7 +1422,11 @@ func createGalleries(ctx context.Context, n int) error {
 		const includeScenes = false
 		gallery := makeGallery(i, includeScenes)
 
-		err := gqb.Create(ctx, gallery, fileIDs)
+		err := gqb.Create(ctx, &models.CreateGalleryInput{
+			Gallery:      gallery,
+			FileIDs:      fileIDs,
+			CustomFields: getGalleryCustomFields(i),
+		})
 
 		if err != nil {
 			return fmt.Errorf("Error creating gallery %v+: %s", gallery, err.Error())
diff --git a/pkg/sqlite/tables.go b/pkg/sqlite/tables.go
index 53e62b166..7867054ba 100644
--- a/pkg/sqlite/tables.go
+++ b/pkg/sqlite/tables.go
@@ -20,6 +20,7 @@ var (
 	performersGalleriesJoinTable = goqu.T(performersGalleriesTable)
 	galleriesScenesJoinTable     = goqu.T(galleriesScenesTable)
 	galleriesURLsJoinTable       = goqu.T(galleriesURLsTable)
+	galleriesCustomFieldsTable   = goqu.T("gallery_custom_fields")
 
 	scenesFilesJoinTable      = goqu.T(scenesFilesTable)
 	scenesTagsJoinTable       = goqu.T(scenesTagsTable)

From ca5178f05ebd5f702e5c20e660a3c4c062ed0335 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Mon, 23 Feb 2026 11:53:12 +1100
Subject: [PATCH 306/405] Backend support for Group custom fields (#6596)

---
 graphql/schema/types/filters.graphql          |   3 +
 graphql/schema/types/group.graphql            |   7 +
 internal/api/loaders/dataloaders.go           |  28 +-
 internal/api/resolver_model_movie.go          |  13 +
 internal/api/resolver_mutation_group.go       |  57 ++--
 internal/manager/repository.go                |   2 +-
 pkg/group/create.go                           |  24 +-
 pkg/group/export.go                           |  60 ++--
 pkg/group/export_test.go                      |  62 +++-
 pkg/group/import.go                           |   9 +
 pkg/group/import_test.go                      |  21 +-
 pkg/group/service.go                          |   1 +
 pkg/models/group.go                           |   2 +
 pkg/models/jsonschema/group.go                |   2 +
 pkg/models/mocks/GroupReaderWriter.go         |  60 ++++
 pkg/models/model_group.go                     |  10 +
 pkg/models/repository_group.go                |   2 +
 pkg/sqlite/anonymise.go                       |   4 +
 pkg/sqlite/custom_fields_test.go              |   8 +-
 pkg/sqlite/database.go                        |   2 +-
 pkg/sqlite/gallery_test.go                    |  73 ++++
 pkg/sqlite/group.go                           |   9 +
 pkg/sqlite/group_filter.go                    |   7 +
 pkg/sqlite/group_test.go                      | 312 ++++++++++++++++++
 .../migrations/82_group_custom_fields.up.sql  |   9 +
 pkg/sqlite/setup_test.go                      |  19 ++
 pkg/sqlite/tables.go                          |   1 +
 27 files changed, 725 insertions(+), 82 deletions(-)
 create mode 100644 pkg/sqlite/migrations/82_group_custom_fields.up.sql

diff --git a/graphql/schema/types/filters.graphql b/graphql/schema/types/filters.graphql
index d683329b6..4162f0af3 100644
--- a/graphql/schema/types/filters.graphql
+++ b/graphql/schema/types/filters.graphql
@@ -462,6 +462,9 @@ input GroupFilterType {
   scenes_filter: SceneFilterType
   "Filter by related studios that meet this criteria"
   studios_filter: StudioFilterType
+
+  "Filter by custom fields"
+  custom_fields: [CustomFieldCriterionInput!]
 }
 
 input StudioFilterType {
diff --git a/graphql/schema/types/group.graphql b/graphql/schema/types/group.graphql
index a46932054..a1c878923 100644
--- a/graphql/schema/types/group.graphql
+++ b/graphql/schema/types/group.graphql
@@ -31,6 +31,7 @@ type Group {
   sub_group_count(depth: Int): Int! # Resolver
   scenes: [Scene!]!
   o_counter: Int # Resolver
+  custom_fields: Map!
 }
 
 input GroupDescriptionInput {
@@ -59,6 +60,8 @@ input GroupCreateInput {
   front_image: String
   "This should be a URL or a base64 encoded data URL"
   back_image: String
+
+  custom_fields: Map
 }
 
 input GroupUpdateInput {
@@ -82,6 +85,8 @@ input GroupUpdateInput {
   front_image: String
   "This should be a URL or a base64 encoded data URL"
   back_image: String
+
+  custom_fields: CustomFieldsInput
 }
 
 input BulkUpdateGroupDescriptionsInput {
@@ -101,6 +106,8 @@ input BulkGroupUpdateInput {
 
   containing_groups: BulkUpdateGroupDescriptionsInput
   sub_groups: BulkUpdateGroupDescriptionsInput
+
+  custom_fields: CustomFieldsInput
 }
 
 input GroupDestroyInput {
diff --git a/internal/api/loaders/dataloaders.go b/internal/api/loaders/dataloaders.go
index e7293ad1c..ff8a87ab0 100644
--- a/internal/api/loaders/dataloaders.go
+++ b/internal/api/loaders/dataloaders.go
@@ -64,11 +64,12 @@ type Loaders struct {
 	StudioByID         *StudioLoader
 	StudioCustomFields *CustomFieldsLoader
 
-	TagByID         *TagLoader
-	TagCustomFields *CustomFieldsLoader
-	GroupByID       *GroupLoader
-	FileByID        *FileLoader
-	FolderByID      *FolderLoader
+	TagByID           *TagLoader
+	TagCustomFields   *CustomFieldsLoader
+	GroupByID         *GroupLoader
+	GroupCustomFields *CustomFieldsLoader
+	FileByID          *FileLoader
+	FolderByID        *FolderLoader
 }
 
 type Middleware struct {
@@ -139,6 +140,11 @@ func (m Middleware) Middleware(next http.Handler) http.Handler {
 				maxBatch: maxBatch,
 				fetch:    m.fetchGroups(ctx),
 			},
+			GroupCustomFields: &CustomFieldsLoader{
+				wait:     wait,
+				maxBatch: maxBatch,
+				fetch:    m.fetchGroupCustomFields(ctx),
+			},
 			FileByID: &FileLoader{
 				wait:     wait,
 				maxBatch: maxBatch,
@@ -325,6 +331,18 @@ func (m Middleware) fetchTagCustomFields(ctx context.Context) func(keys []int) (
 	}
 }
 
+func (m Middleware) fetchGroupCustomFields(ctx context.Context) func(keys []int) ([]models.CustomFieldMap, []error) {
+	return func(keys []int) (ret []models.CustomFieldMap, errs []error) {
+		err := m.Repository.WithDB(ctx, func(ctx context.Context) error {
+			var err error
+			ret, err = m.Repository.Group.GetCustomFieldsBulk(ctx, keys)
+			return err
+		})
+
+		return ret, toErrorSlice(err)
+	}
+}
+
 func (m Middleware) fetchGalleryCustomFields(ctx context.Context) func(keys []int) ([]models.CustomFieldMap, []error) {
 	return func(keys []int) (ret []models.CustomFieldMap, errs []error) {
 		err := m.Repository.WithDB(ctx, func(ctx context.Context) error {
diff --git a/internal/api/resolver_model_movie.go b/internal/api/resolver_model_movie.go
index 317123c6e..287d5d51a 100644
--- a/internal/api/resolver_model_movie.go
+++ b/internal/api/resolver_model_movie.go
@@ -215,3 +215,16 @@ func (r *groupResolver) OCounter(ctx context.Context, obj *models.Group) (ret *i
 	}
 	return &count, nil
 }
+
+func (r *groupResolver) CustomFields(ctx context.Context, obj *models.Group) (map[string]interface{}, error) {
+	m, err := loaders.From(ctx).GroupCustomFields.Load(obj.ID)
+	if err != nil {
+		return nil, err
+	}
+
+	if m == nil {
+		return make(map[string]interface{}), nil
+	}
+
+	return m, nil
+}
diff --git a/internal/api/resolver_mutation_group.go b/internal/api/resolver_mutation_group.go
index 14dc817b9..dff5a6c1e 100644
--- a/internal/api/resolver_mutation_group.go
+++ b/internal/api/resolver_mutation_group.go
@@ -14,13 +14,17 @@ import (
 	"github.com/stashapp/stash/pkg/utils"
 )
 
-func groupFromGroupCreateInput(ctx context.Context, input GroupCreateInput) (*models.Group, error) {
+func groupFromGroupCreateInput(ctx context.Context, input GroupCreateInput) (*models.CreateGroupInput, error) {
 	translator := changesetTranslator{
 		inputMap: getUpdateInputMap(ctx),
 	}
 
 	// Populate a new group from the input
-	newGroup := models.NewGroup()
+	newGroupInput := &models.CreateGroupInput{
+		Group: &models.Group{},
+	}
+	*newGroupInput.Group = models.NewGroup()
+	newGroup := newGroupInput.Group
 
 	newGroup.Name = strings.TrimSpace(input.Name)
 	newGroup.Aliases = translator.string(input.Aliases)
@@ -59,28 +63,19 @@ func groupFromGroupCreateInput(ctx context.Context, input GroupCreateInput) (*mo
 		newGroup.URLs = models.NewRelatedStrings(stringslice.TrimSpace(input.Urls))
 	}
 
-	return &newGroup, nil
-}
-
-func (r *mutationResolver) GroupCreate(ctx context.Context, input GroupCreateInput) (*models.Group, error) {
-	newGroup, err := groupFromGroupCreateInput(ctx, input)
-	if err != nil {
-		return nil, err
-	}
+	newGroupInput.CustomFields = convertMapJSONNumbers(input.CustomFields)
 
 	// Process the base 64 encoded image string
-	var frontimageData []byte
 	if input.FrontImage != nil {
-		frontimageData, err = utils.ProcessImageInput(ctx, *input.FrontImage)
+		newGroupInput.FrontImageData, err = utils.ProcessImageInput(ctx, *input.FrontImage)
 		if err != nil {
 			return nil, fmt.Errorf("processing front image: %w", err)
 		}
 	}
 
 	// Process the base 64 encoded image string
-	var backimageData []byte
 	if input.BackImage != nil {
-		backimageData, err = utils.ProcessImageInput(ctx, *input.BackImage)
+		newGroupInput.BackImageData, err = utils.ProcessImageInput(ctx, *input.BackImage)
 		if err != nil {
 			return nil, fmt.Errorf("processing back image: %w", err)
 		}
@@ -88,13 +83,22 @@ func (r *mutationResolver) GroupCreate(ctx context.Context, input GroupCreateInp
 
 	// HACK: if back image is being set, set the front image to the default.
 	// This is because we can't have a null front image with a non-null back image.
-	if len(frontimageData) == 0 && len(backimageData) != 0 {
-		frontimageData = static.ReadAll(static.DefaultGroupImage)
+	if len(newGroupInput.FrontImageData) == 0 && len(newGroupInput.BackImageData) != 0 {
+		newGroupInput.FrontImageData = static.ReadAll(static.DefaultGroupImage)
+	}
+
+	return newGroupInput, nil
+}
+
+func (r *mutationResolver) GroupCreate(ctx context.Context, input GroupCreateInput) (*models.Group, error) {
+	createGroupInput, err := groupFromGroupCreateInput(ctx, input)
+	if err != nil {
+		return nil, err
 	}
 
 	// Start the transaction and save the group
 	if err := r.withTxn(ctx, func(ctx context.Context) error {
-		if err = r.groupService.Create(ctx, newGroup, frontimageData, backimageData); err != nil {
+		if err = r.groupService.Create(ctx, createGroupInput); err != nil {
 			return err
 		}
 
@@ -104,9 +108,9 @@ func (r *mutationResolver) GroupCreate(ctx context.Context, input GroupCreateInp
 	}
 
 	// for backwards compatibility - run both movie and group hooks
-	r.hookExecutor.ExecutePostHooks(ctx, newGroup.ID, hook.GroupCreatePost, input, nil)
-	r.hookExecutor.ExecutePostHooks(ctx, newGroup.ID, hook.MovieCreatePost, input, nil)
-	return r.getGroup(ctx, newGroup.ID)
+	r.hookExecutor.ExecutePostHooks(ctx, createGroupInput.Group.ID, hook.GroupCreatePost, input, nil)
+	r.hookExecutor.ExecutePostHooks(ctx, createGroupInput.Group.ID, hook.MovieCreatePost, input, nil)
+	return r.getGroup(ctx, createGroupInput.Group.ID)
 }
 
 func groupPartialFromGroupUpdateInput(translator changesetTranslator, input GroupUpdateInput) (ret models.GroupPartial, err error) {
@@ -150,6 +154,12 @@ func groupPartialFromGroupUpdateInput(translator changesetTranslator, input Grou
 	}
 
 	updatedGroup.URLs = translator.updateStrings(input.Urls, "urls")
+	if input.CustomFields != nil {
+		updatedGroup.CustomFields = *input.CustomFields
+		// convert json.Numbers to int/float
+		updatedGroup.CustomFields.Full = convertMapJSONNumbers(updatedGroup.CustomFields.Full)
+		updatedGroup.CustomFields.Partial = convertMapJSONNumbers(updatedGroup.CustomFields.Partial)
+	}
 
 	return updatedGroup, nil
 }
@@ -246,6 +256,13 @@ func groupPartialFromBulkGroupUpdateInput(translator changesetTranslator, input
 
 	updatedGroup.URLs = translator.optionalURLsBulk(input.Urls, nil)
 
+	if input.CustomFields != nil {
+		updatedGroup.CustomFields = *input.CustomFields
+		// convert json.Numbers to int/float
+		updatedGroup.CustomFields.Full = convertMapJSONNumbers(updatedGroup.CustomFields.Full)
+		updatedGroup.CustomFields.Partial = convertMapJSONNumbers(updatedGroup.CustomFields.Partial)
+	}
+
 	return updatedGroup, nil
 }
 
diff --git a/internal/manager/repository.go b/internal/manager/repository.go
index afbf0b963..65514ed1d 100644
--- a/internal/manager/repository.go
+++ b/internal/manager/repository.go
@@ -39,7 +39,7 @@ type GalleryService interface {
 }
 
 type GroupService interface {
-	Create(ctx context.Context, group *models.Group, frontimageData []byte, backimageData []byte) error
+	Create(ctx context.Context, input *models.CreateGroupInput) error
 	UpdatePartial(ctx context.Context, id int, updatedGroup models.GroupPartial, frontImage group.ImageInput, backImage group.ImageInput) (*models.Group, error)
 
 	AddSubGroups(ctx context.Context, groupID int, subGroups []models.GroupIDDescription, insertIndex *int) error
diff --git a/pkg/group/create.go b/pkg/group/create.go
index 56d6b7a4e..9cc578b23 100644
--- a/pkg/group/create.go
+++ b/pkg/group/create.go
@@ -12,27 +12,37 @@ var (
 	ErrHierarchyLoop = errors.New("a group cannot be contained by one of its subgroups")
 )
 
-func (s *Service) Create(ctx context.Context, group *models.Group, frontimageData []byte, backimageData []byte) error {
+func (s *Service) Create(ctx context.Context, input *models.CreateGroupInput) error {
 	r := s.Repository
+	group := input.Group
 
 	if err := s.validateCreate(ctx, group); err != nil {
 		return err
 	}
 
-	err := r.Create(ctx, group)
+	err := r.Create(ctx, input.Group)
 	if err != nil {
 		return err
 	}
 
-	// update image table
-	if len(frontimageData) > 0 {
-		if err := r.UpdateFrontImage(ctx, group.ID, frontimageData); err != nil {
+	// set custom fields
+	if len(input.CustomFields) > 0 {
+		if err := r.SetCustomFields(ctx, group.ID, models.CustomFieldsInput{
+			Full: input.CustomFields,
+		}); err != nil {
 			return err
 		}
 	}
 
-	if len(backimageData) > 0 {
-		if err := r.UpdateBackImage(ctx, group.ID, backimageData); err != nil {
+	// update image table
+	if len(input.FrontImageData) > 0 {
+		if err := r.UpdateFrontImage(ctx, group.ID, input.FrontImageData); err != nil {
+			return err
+		}
+	}
+
+	if len(input.BackImageData) > 0 {
+		if err := r.UpdateBackImage(ctx, group.ID, input.BackImageData); err != nil {
 			return err
 		}
 	}
diff --git a/pkg/group/export.go b/pkg/group/export.go
index 418ce7bed..0a56fbdbb 100644
--- a/pkg/group/export.go
+++ b/pkg/group/export.go
@@ -11,61 +11,67 @@ import (
 	"github.com/stashapp/stash/pkg/utils"
 )
 
-type ImageGetter interface {
-	GetFrontImage(ctx context.Context, movieID int) ([]byte, error)
-	GetBackImage(ctx context.Context, movieID int) ([]byte, error)
+type GroupExportReader interface {
+	GetFrontImage(ctx context.Context, groupID int) ([]byte, error)
+	GetBackImage(ctx context.Context, groupID int) ([]byte, error)
+	GetCustomFields(ctx context.Context, groupID int) (map[string]interface{}, error)
 }
 
-// ToJSON converts a Movie into its JSON equivalent.
-func ToJSON(ctx context.Context, reader ImageGetter, studioReader models.StudioGetter, movie *models.Group) (*jsonschema.Group, error) {
-	newMovieJSON := jsonschema.Group{
-		Name:      movie.Name,
-		Aliases:   movie.Aliases,
-		Director:  movie.Director,
-		Synopsis:  movie.Synopsis,
-		URLs:      movie.URLs.List(),
-		CreatedAt: json.JSONTime{Time: movie.CreatedAt},
-		UpdatedAt: json.JSONTime{Time: movie.UpdatedAt},
+// ToJSON converts a Group into its JSON equivalent.
+func ToJSON(ctx context.Context, reader GroupExportReader, studioReader models.StudioGetter, group *models.Group) (*jsonschema.Group, error) {
+	newGroupJSON := jsonschema.Group{
+		Name:      group.Name,
+		Aliases:   group.Aliases,
+		Director:  group.Director,
+		Synopsis:  group.Synopsis,
+		URLs:      group.URLs.List(),
+		CreatedAt: json.JSONTime{Time: group.CreatedAt},
+		UpdatedAt: json.JSONTime{Time: group.UpdatedAt},
 	}
 
-	if movie.Date != nil {
-		newMovieJSON.Date = movie.Date.String()
+	if group.Date != nil {
+		newGroupJSON.Date = group.Date.String()
 	}
-	if movie.Rating != nil {
-		newMovieJSON.Rating = *movie.Rating
+	if group.Rating != nil {
+		newGroupJSON.Rating = *group.Rating
 	}
-	if movie.Duration != nil {
-		newMovieJSON.Duration = *movie.Duration
+	if group.Duration != nil {
+		newGroupJSON.Duration = *group.Duration
 	}
 
-	if movie.StudioID != nil {
-		studio, err := studioReader.Find(ctx, *movie.StudioID)
+	if group.StudioID != nil {
+		studio, err := studioReader.Find(ctx, *group.StudioID)
 		if err != nil {
 			return nil, fmt.Errorf("error getting movie studio: %v", err)
 		}
 
 		if studio != nil {
-			newMovieJSON.Studio = studio.Name
+			newGroupJSON.Studio = studio.Name
 		}
 	}
 
-	frontImage, err := reader.GetFrontImage(ctx, movie.ID)
+	frontImage, err := reader.GetFrontImage(ctx, group.ID)
 	if err != nil {
 		logger.Errorf("Error getting movie front image: %v", err)
 	}
 
 	if len(frontImage) > 0 {
-		newMovieJSON.FrontImage = utils.GetBase64StringFromData(frontImage)
+		newGroupJSON.FrontImage = utils.GetBase64StringFromData(frontImage)
 	}
 
-	backImage, err := reader.GetBackImage(ctx, movie.ID)
+	backImage, err := reader.GetBackImage(ctx, group.ID)
 	if err != nil {
 		logger.Errorf("Error getting movie back image: %v", err)
 	}
 
 	if len(backImage) > 0 {
-		newMovieJSON.BackImage = utils.GetBase64StringFromData(backImage)
+		newGroupJSON.BackImage = utils.GetBase64StringFromData(backImage)
 	}
 
-	return &newMovieJSON, nil
+	newGroupJSON.CustomFields, err = reader.GetCustomFields(ctx, group.ID)
+	if err != nil {
+		return nil, fmt.Errorf("getting group custom fields: %v", err)
+	}
+
+	return &newGroupJSON, nil
 }
diff --git a/pkg/group/export_test.go b/pkg/group/export_test.go
index 5f8d9f7dc..bff50de5e 100644
--- a/pkg/group/export_test.go
+++ b/pkg/group/export_test.go
@@ -8,24 +8,26 @@ import (
 	"github.com/stashapp/stash/pkg/models/jsonschema"
 	"github.com/stashapp/stash/pkg/models/mocks"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
 
 	"testing"
 	"time"
 )
 
 const (
-	movieID              = 1
-	emptyID              = 2
-	errFrontImageID      = 3
-	errBackImageID       = 4
-	errStudioMovieID     = 5
-	missingStudioMovieID = 6
+	movieID = iota + 1
+	emptyID
+	errFrontImageID
+	errBackImageID
+	errStudioMovieID
+	missingStudioMovieID
+	errCustomFieldsID
 )
 
 const (
-	studioID        = 1
-	missingStudioID = 2
-	errStudioID     = 3
+	studioID = iota + 1
+	missingStudioID
+	errStudioID
 )
 
 const movieName = "testMovie"
@@ -51,6 +53,11 @@ const (
 var (
 	frontImageBytes = []byte("frontImageBytes")
 	backImageBytes  = []byte("backImageBytes")
+
+	emptyCustomFields = make(map[string]interface{})
+	customFields      = map[string]interface{}{
+		"customField1": "customValue1",
+	}
 )
 
 var movieStudio models.Studio = models.Studio{
@@ -88,7 +95,7 @@ func createEmptyMovie(id int) models.Group {
 	}
 }
 
-func createFullJSONMovie(studio, frontImage, backImage string) *jsonschema.Group {
+func createFullJSONMovie(studio, frontImage, backImage string, customFields map[string]interface{}) *jsonschema.Group {
 	return &jsonschema.Group{
 		Name:       movieName,
 		Aliases:    movieAliases,
@@ -107,6 +114,7 @@ func createFullJSONMovie(studio, frontImage, backImage string) *jsonschema.Group
 		UpdatedAt: json.JSONTime{
 			Time: updateTime,
 		},
+		CustomFields: customFields,
 	}
 }
 
@@ -119,13 +127,15 @@ func createEmptyJSONMovie() *jsonschema.Group {
 		UpdatedAt: json.JSONTime{
 			Time: updateTime,
 		},
+		CustomFields: emptyCustomFields,
 	}
 }
 
 type testScenario struct {
-	movie    models.Group
-	expected *jsonschema.Group
-	err      bool
+	movie        models.Group
+	customFields map[string]interface{}
+	expected     *jsonschema.Group
+	err          bool
 }
 
 var scenarios []testScenario
@@ -134,36 +144,48 @@ func initTestTable() {
 	scenarios = []testScenario{
 		{
 			createFullMovie(movieID, studioID),
-			createFullJSONMovie(studioName, frontImage, backImage),
+			customFields,
+			createFullJSONMovie(studioName, frontImage, backImage, customFields),
 			false,
 		},
 		{
 			createEmptyMovie(emptyID),
+			emptyCustomFields,
 			createEmptyJSONMovie(),
 			false,
 		},
 		{
 			createFullMovie(errFrontImageID, studioID),
-			createFullJSONMovie(studioName, "", backImage),
+			emptyCustomFields,
+			createFullJSONMovie(studioName, "", backImage, emptyCustomFields),
 			// failure to get front image should not cause error
 			false,
 		},
 		{
 			createFullMovie(errBackImageID, studioID),
-			createFullJSONMovie(studioName, frontImage, ""),
+			emptyCustomFields,
+			createFullJSONMovie(studioName, frontImage, "", emptyCustomFields),
 			// failure to get back image should not cause error
 			false,
 		},
 		{
 			createFullMovie(errStudioMovieID, errStudioID),
+			emptyCustomFields,
 			nil,
 			true,
 		},
 		{
 			createFullMovie(missingStudioMovieID, missingStudioID),
-			createFullJSONMovie("", frontImage, backImage),
+			emptyCustomFields,
+			createFullJSONMovie("", frontImage, backImage, emptyCustomFields),
 			false,
 		},
+		{
+			createFullMovie(errCustomFieldsID, studioID),
+			customFields,
+			nil,
+			true,
+		},
 	}
 }
 
@@ -179,6 +201,7 @@ func TestToJSON(t *testing.T) {
 	db.Group.On("GetFrontImage", testCtx, emptyID).Return(nil, nil).Once().Maybe()
 	db.Group.On("GetFrontImage", testCtx, errFrontImageID).Return(nil, imageErr).Once()
 	db.Group.On("GetFrontImage", testCtx, errBackImageID).Return(frontImageBytes, nil).Once()
+	db.Group.On("GetFrontImage", testCtx, errCustomFieldsID).Return(nil, nil).Once()
 
 	db.Group.On("GetBackImage", testCtx, movieID).Return(backImageBytes, nil).Once()
 	db.Group.On("GetBackImage", testCtx, missingStudioMovieID).Return(backImageBytes, nil).Once()
@@ -186,6 +209,11 @@ func TestToJSON(t *testing.T) {
 	db.Group.On("GetBackImage", testCtx, errBackImageID).Return(nil, imageErr).Once()
 	db.Group.On("GetBackImage", testCtx, errFrontImageID).Return(backImageBytes, nil).Maybe()
 	db.Group.On("GetBackImage", testCtx, errStudioMovieID).Return(backImageBytes, nil).Maybe()
+	db.Group.On("GetBackImage", testCtx, errCustomFieldsID).Return(nil, nil).Once()
+
+	db.Group.On("GetCustomFields", testCtx, movieID).Return(customFields, nil).Once()
+	db.Group.On("GetCustomFields", testCtx, errCustomFieldsID).Return(nil, errors.New("error getting custom fields")).Once()
+	db.Group.On("GetCustomFields", testCtx, mock.Anything).Return(emptyCustomFields, nil).Times(4)
 
 	studioErr := errors.New("error getting studio")
 
diff --git a/pkg/group/import.go b/pkg/group/import.go
index d7acad47c..1a332bac2 100644
--- a/pkg/group/import.go
+++ b/pkg/group/import.go
@@ -14,6 +14,7 @@ import (
 
 type ImporterReaderWriter interface {
 	models.GroupCreatorUpdater
+	models.CustomFieldsWriter
 	FindByName(ctx context.Context, name string, nocase bool) (*models.Group, error)
 }
 
@@ -233,6 +234,14 @@ func (i *Importer) PostImport(ctx context.Context, id int) error {
 		}
 	}
 
+	if len(i.Input.CustomFields) > 0 {
+		if err := i.ReaderWriter.SetCustomFields(ctx, id, models.CustomFieldsInput{
+			Full: i.Input.CustomFields,
+		}); err != nil {
+			return fmt.Errorf("error setting custom fields: %v", err)
+		}
+	}
+
 	if len(i.frontImageData) > 0 {
 		if err := i.ReaderWriter.UpdateFrontImage(ctx, id, i.frontImageData); err != nil {
 			return fmt.Errorf("error setting group front image: %v", err)
diff --git a/pkg/group/import_test.go b/pkg/group/import_test.go
index 387ceb87e..006c91327 100644
--- a/pkg/group/import_test.go
+++ b/pkg/group/import_test.go
@@ -259,17 +259,29 @@ func TestImporterPostImport(t *testing.T) {
 	db := mocks.NewDatabase()
 
 	i := Importer{
-		ReaderWriter:   db.Group,
-		StudioWriter:   db.Studio,
+		ReaderWriter: db.Group,
+		StudioWriter: db.Studio,
+		Input: jsonschema.Group{
+			CustomFields: customFields,
+		},
 		frontImageData: frontImageBytes,
 		backImageData:  backImageBytes,
 	}
 
 	updateMovieImageErr := errors.New("UpdateImages error")
+	customFieldsErr := errors.New("SetCustomFields error")
+
+	customFieldsInput := models.CustomFieldsInput{
+		Full: customFields,
+	}
 
 	db.Group.On("UpdateFrontImage", testCtx, movieID, frontImageBytes).Return(nil).Once()
-	db.Group.On("UpdateBackImage", testCtx, movieID, backImageBytes).Return(nil).Once()
 	db.Group.On("UpdateFrontImage", testCtx, errImageID, frontImageBytes).Return(updateMovieImageErr).Once()
+	db.Group.On("UpdateBackImage", testCtx, movieID, backImageBytes).Return(nil).Once()
+
+	db.Group.On("SetCustomFields", testCtx, movieID, customFieldsInput).Return(nil).Once()
+	db.Group.On("SetCustomFields", testCtx, errImageID, customFieldsInput).Return(nil).Once()
+	db.Group.On("SetCustomFields", testCtx, errCustomFieldsID, customFieldsInput).Return(customFieldsErr).Once()
 
 	err := i.PostImport(testCtx, movieID)
 	assert.Nil(t, err)
@@ -277,6 +289,9 @@ func TestImporterPostImport(t *testing.T) {
 	err = i.PostImport(testCtx, errImageID)
 	assert.NotNil(t, err)
 
+	err = i.PostImport(testCtx, errCustomFieldsID)
+	assert.NotNil(t, err)
+
 	db.AssertExpectations(t)
 }
 
diff --git a/pkg/group/service.go b/pkg/group/service.go
index ff6e03541..37094665a 100644
--- a/pkg/group/service.go
+++ b/pkg/group/service.go
@@ -10,6 +10,7 @@ type CreatorUpdater interface {
 	models.GroupGetter
 	models.GroupCreator
 	models.GroupUpdater
+	models.CustomFieldsWriter
 
 	models.ContainingGroupLoader
 	models.SubGroupLoader
diff --git a/pkg/models/group.go b/pkg/models/group.go
index ec550eea8..396384b51 100644
--- a/pkg/models/group.go
+++ b/pkg/models/group.go
@@ -43,4 +43,6 @@ type GroupFilterType struct {
 	CreatedAt *TimestampCriterionInput `json:"created_at"`
 	// Filter by updated at
 	UpdatedAt *TimestampCriterionInput `json:"updated_at"`
+	// Filter by custom fields
+	CustomFields []CustomFieldCriterionInput `json:"custom_fields"`
 }
diff --git a/pkg/models/jsonschema/group.go b/pkg/models/jsonschema/group.go
index b284dab6e..357ac70bc 100644
--- a/pkg/models/jsonschema/group.go
+++ b/pkg/models/jsonschema/group.go
@@ -33,6 +33,8 @@ type Group struct {
 	CreatedAt  json.JSONTime         `json:"created_at,omitempty"`
 	UpdatedAt  json.JSONTime         `json:"updated_at,omitempty"`
 
+	CustomFields map[string]interface{} `json:"custom_fields,omitempty"`
+
 	// deprecated - for import only
 	URL string `json:"url,omitempty"`
 }
diff --git a/pkg/models/mocks/GroupReaderWriter.go b/pkg/models/mocks/GroupReaderWriter.go
index dc745d094..ac9e513f4 100644
--- a/pkg/models/mocks/GroupReaderWriter.go
+++ b/pkg/models/mocks/GroupReaderWriter.go
@@ -312,6 +312,52 @@ func (_m *GroupReaderWriter) GetContainingGroupDescriptions(ctx context.Context,
 	return r0, r1
 }
 
+// GetCustomFields provides a mock function with given fields: ctx, id
+func (_m *GroupReaderWriter) GetCustomFields(ctx context.Context, id int) (map[string]interface{}, error) {
+	ret := _m.Called(ctx, id)
+
+	var r0 map[string]interface{}
+	if rf, ok := ret.Get(0).(func(context.Context, int) map[string]interface{}); ok {
+		r0 = rf(ctx, id)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(map[string]interface{})
+		}
+	}
+
+	var r1 error
+	if rf, ok := ret.Get(1).(func(context.Context, int) error); ok {
+		r1 = rf(ctx, id)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// GetCustomFieldsBulk provides a mock function with given fields: ctx, ids
+func (_m *GroupReaderWriter) GetCustomFieldsBulk(ctx context.Context, ids []int) ([]models.CustomFieldMap, error) {
+	ret := _m.Called(ctx, ids)
+
+	var r0 []models.CustomFieldMap
+	if rf, ok := ret.Get(0).(func(context.Context, []int) []models.CustomFieldMap); ok {
+		r0 = rf(ctx, ids)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).([]models.CustomFieldMap)
+		}
+	}
+
+	var r1 error
+	if rf, ok := ret.Get(1).(func(context.Context, []int) error); ok {
+		r1 = rf(ctx, ids)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
 // GetFrontImage provides a mock function with given fields: ctx, groupID
 func (_m *GroupReaderWriter) GetFrontImage(ctx context.Context, groupID int) ([]byte, error) {
 	ret := _m.Called(ctx, groupID)
@@ -497,6 +543,20 @@ func (_m *GroupReaderWriter) QueryCount(ctx context.Context, groupFilter *models
 	return r0, r1
 }
 
+// SetCustomFields provides a mock function with given fields: ctx, id, fields
+func (_m *GroupReaderWriter) SetCustomFields(ctx context.Context, id int, fields models.CustomFieldsInput) error {
+	ret := _m.Called(ctx, id, fields)
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context, int, models.CustomFieldsInput) error); ok {
+		r0 = rf(ctx, id, fields)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
 // Update provides a mock function with given fields: ctx, updatedGroup
 func (_m *GroupReaderWriter) Update(ctx context.Context, updatedGroup *models.Group) error {
 	ret := _m.Called(ctx, updatedGroup)
diff --git a/pkg/models/model_group.go b/pkg/models/model_group.go
index 82c71996a..5bfb42c44 100644
--- a/pkg/models/model_group.go
+++ b/pkg/models/model_group.go
@@ -34,6 +34,14 @@ func NewGroup() Group {
 	}
 }
 
+type CreateGroupInput struct {
+	*Group
+
+	CustomFields   map[string]interface{} `json:"custom_fields"`
+	FrontImageData []byte
+	BackImageData  []byte
+}
+
 func (m *Group) LoadURLs(ctx context.Context, l URLLoader) error {
 	return m.URLs.load(func() ([]string, error) {
 		return l.GetURLs(ctx, m.ID)
@@ -74,6 +82,8 @@ type GroupPartial struct {
 	SubGroups        *UpdateGroupDescriptions
 	CreatedAt        OptionalTime
 	UpdatedAt        OptionalTime
+
+	CustomFields CustomFieldsInput
 }
 
 func NewGroupPartial() GroupPartial {
diff --git a/pkg/models/repository_group.go b/pkg/models/repository_group.go
index 704390d77..d7f74de64 100644
--- a/pkg/models/repository_group.go
+++ b/pkg/models/repository_group.go
@@ -68,6 +68,7 @@ type GroupReader interface {
 	TagIDLoader
 	ContainingGroupLoader
 	SubGroupLoader
+	CustomFieldsReader
 
 	All(ctx context.Context) ([]*Group, error)
 	GetFrontImage(ctx context.Context, groupID int) ([]byte, error)
@@ -81,6 +82,7 @@ type GroupWriter interface {
 	GroupCreator
 	GroupUpdater
 	GroupDestroyer
+	CustomFieldsWriter
 }
 
 // GroupReaderWriter provides all group methods.
diff --git a/pkg/sqlite/anonymise.go b/pkg/sqlite/anonymise.go
index 6a5cd4da5..ace306169 100644
--- a/pkg/sqlite/anonymise.go
+++ b/pkg/sqlite/anonymise.go
@@ -964,6 +964,10 @@ func (db *Anonymiser) anonymiseGroups(ctx context.Context) error {
 		return err
 	}
 
+	if err := db.anonymiseCustomFields(ctx, goqu.T(groupsCustomFieldsTable.GetTable()), "group_id"); err != nil {
+		return err
+	}
+
 	return nil
 }
 
diff --git a/pkg/sqlite/custom_fields_test.go b/pkg/sqlite/custom_fields_test.go
index ae4a276f7..2f7ecd7dc 100644
--- a/pkg/sqlite/custom_fields_test.go
+++ b/pkg/sqlite/custom_fields_test.go
@@ -242,7 +242,13 @@ func TestSceneSetCustomFields(t *testing.T) {
 }
 
 func TestGallerySetCustomFields(t *testing.T) {
-	galleryIdx := galleryIdxWithScene
+	galleryIdx := galleryIdxWithChapters
 
 	testSetCustomFields(t, "Gallery", db.Gallery, galleryIDs[galleryIdx], getGalleryCustomFields(galleryIdx))
 }
+
+func TestGroupSetCustomFields(t *testing.T) {
+	groupIdx := groupIdxWithScene
+
+	testSetCustomFields(t, "Group", db.Group, groupIDs[groupIdx], getGroupCustomFields(groupIdx))
+}
diff --git a/pkg/sqlite/database.go b/pkg/sqlite/database.go
index d95832836..000b91c4d 100644
--- a/pkg/sqlite/database.go
+++ b/pkg/sqlite/database.go
@@ -34,7 +34,7 @@ const (
 	cacheSizeEnv = "STASH_SQLITE_CACHE_SIZE"
 )
 
-var appSchemaVersion uint = 81
+var appSchemaVersion uint = 82
 
 //go:embed migrations/*.sql
 var migrationsBox embed.FS
diff --git a/pkg/sqlite/gallery_test.go b/pkg/sqlite/gallery_test.go
index 4156f129c..9bd0da47f 100644
--- a/pkg/sqlite/gallery_test.go
+++ b/pkg/sqlite/gallery_test.go
@@ -831,6 +831,79 @@ func Test_galleryQueryBuilder_UpdatePartialRelationships(t *testing.T) {
 	}
 }
 
+func Test_GalleryStore_UpdatePartialCustomFields(t *testing.T) {
+	tests := []struct {
+		name     string
+		id       int
+		partial  models.GalleryPartial
+		expected map[string]interface{} // nil to use the partial
+	}{
+		{
+			"set custom fields",
+			galleryIDs[galleryIdx1WithImage],
+			models.GalleryPartial{
+				CustomFields: models.CustomFieldsInput{
+					Full: testCustomFields,
+				},
+			},
+			nil,
+		},
+		{
+			"clear custom fields",
+			galleryIDs[galleryIdx1WithImage],
+			models.GalleryPartial{
+				CustomFields: models.CustomFieldsInput{
+					Full: map[string]interface{}{},
+				},
+			},
+			nil,
+		},
+		{
+			"partial custom fields",
+			galleryIDs[galleryIdxWithTwoTags],
+			models.GalleryPartial{
+				CustomFields: models.CustomFieldsInput{
+					Partial: map[string]interface{}{
+						"string":    "bbb",
+						"new_field": "new",
+					},
+				},
+			},
+			map[string]interface{}{
+				"int":       int64(2),
+				"real":      1.2,
+				"string":    "bbb",
+				"new_field": "new",
+			},
+		},
+	}
+	for _, tt := range tests {
+		qb := db.Gallery
+
+		runWithRollbackTxn(t, tt.name, func(t *testing.T, ctx context.Context) {
+			assert := assert.New(t)
+
+			_, err := qb.UpdatePartial(ctx, tt.id, tt.partial)
+			if err != nil {
+				t.Errorf("GalleryStore.UpdatePartial() error = %v", err)
+				return
+			}
+
+			// ensure custom fields are correct
+			cf, err := qb.GetCustomFields(ctx, tt.id)
+			if err != nil {
+				t.Errorf("GalleryStore.GetCustomFields() error = %v", err)
+				return
+			}
+			if tt.expected == nil {
+				assert.Equal(tt.partial.CustomFields.Full, cf)
+			} else {
+				assert.Equal(tt.expected, cf)
+			}
+		})
+	}
+}
+
 func Test_galleryQueryBuilder_Destroy(t *testing.T) {
 	tests := []struct {
 		name    string
diff --git a/pkg/sqlite/group.go b/pkg/sqlite/group.go
index b216335b8..13a6905a5 100644
--- a/pkg/sqlite/group.go
+++ b/pkg/sqlite/group.go
@@ -131,6 +131,7 @@ var (
 
 type GroupStore struct {
 	blobJoinQueryBuilder
+	customFieldsStore
 	tagRelationshipStore
 	groupRelationshipStore
 
@@ -143,6 +144,10 @@ func NewGroupStore(blobStore *BlobStore) *GroupStore {
 			blobStore: blobStore,
 			joinTable: groupTable,
 		},
+		customFieldsStore: customFieldsStore{
+			table: groupsCustomFieldsTable,
+			fk:    groupsCustomFieldsTable.Col(groupIDColumn),
+		},
 		tagRelationshipStore: tagRelationshipStore{
 			idRelationshipStore: idRelationshipStore{
 				joinTable: groupsTagsTableMgr,
@@ -235,6 +240,10 @@ func (qb *GroupStore) UpdatePartial(ctx context.Context, id int, partial models.
 		return nil, err
 	}
 
+	if err := qb.SetCustomFields(ctx, id, partial.CustomFields); err != nil {
+		return nil, err
+	}
+
 	return qb.find(ctx, id)
 }
 
diff --git a/pkg/sqlite/group_filter.go b/pkg/sqlite/group_filter.go
index f81783374..4f3f7b41a 100644
--- a/pkg/sqlite/group_filter.go
+++ b/pkg/sqlite/group_filter.go
@@ -84,6 +84,13 @@ func (qb *groupFilterHandler) criterionHandler() criterionHandler {
 		&timestampCriterionHandler{groupFilter.CreatedAt, "groups.created_at", nil},
 		&timestampCriterionHandler{groupFilter.UpdatedAt, "groups.updated_at", nil},
 
+		&customFieldsFilterHandler{
+			table: groupsCustomFieldsTable.GetTable(),
+			fkCol: groupIDColumn,
+			c:     groupFilter.CustomFields,
+			idCol: "groups.id",
+		},
+
 		&relatedFilterHandler{
 			relatedIDCol:   "groups_scenes.scene_id",
 			relatedRepo:    sceneRepository.repository,
diff --git a/pkg/sqlite/group_test.go b/pkg/sqlite/group_test.go
index db293dd92..22b551e02 100644
--- a/pkg/sqlite/group_test.go
+++ b/pkg/sqlite/group_test.go
@@ -566,6 +566,79 @@ func Test_groupQueryBuilder_UpdatePartial(t *testing.T) {
 	}
 }
 
+func Test_GroupStore_UpdatePartialCustomFields(t *testing.T) {
+	tests := []struct {
+		name     string
+		id       int
+		partial  models.GroupPartial
+		expected map[string]interface{} // nil to use the partial
+	}{
+		{
+			"set custom fields",
+			groupIDs[groupIdxWithChild],
+			models.GroupPartial{
+				CustomFields: models.CustomFieldsInput{
+					Full: testCustomFields,
+				},
+			},
+			nil,
+		},
+		{
+			"clear custom fields",
+			groupIDs[groupIdxWithChild],
+			models.GroupPartial{
+				CustomFields: models.CustomFieldsInput{
+					Full: map[string]interface{}{},
+				},
+			},
+			nil,
+		},
+		{
+			"partial custom fields",
+			groupIDs[groupIdxWithTwoTags],
+			models.GroupPartial{
+				CustomFields: models.CustomFieldsInput{
+					Partial: map[string]interface{}{
+						"string":    "bbb",
+						"new_field": "new",
+					},
+				},
+			},
+			map[string]interface{}{
+				"int":       int64(3),
+				"real":      0.3,
+				"string":    "bbb",
+				"new_field": "new",
+			},
+		},
+	}
+	for _, tt := range tests {
+		qb := db.Group
+
+		runWithRollbackTxn(t, tt.name, func(t *testing.T, ctx context.Context) {
+			assert := assert.New(t)
+
+			_, err := qb.UpdatePartial(ctx, tt.id, tt.partial)
+			if err != nil {
+				t.Errorf("GroupStore.UpdatePartial() error = %v", err)
+				return
+			}
+
+			// ensure custom fields are correct
+			cf, err := qb.GetCustomFields(ctx, tt.id)
+			if err != nil {
+				t.Errorf("GroupStore.GetCustomFields() error = %v", err)
+				return
+			}
+			if tt.expected == nil {
+				assert.Equal(tt.partial.CustomFields.Full, cf)
+			} else {
+				assert.Equal(tt.expected, cf)
+			}
+		})
+	}
+}
+
 func TestGroupFindByName(t *testing.T) {
 	withTxn(func(ctx context.Context) error {
 		mqb := db.Group
@@ -1917,6 +1990,245 @@ func TestGroupFindSubGroupIDs(t *testing.T) {
 	}
 }
 
+func TestGroupQueryCustomFields(t *testing.T) {
+	tests := []struct {
+		name        string
+		filter      *models.GroupFilterType
+		includeIdxs []int
+		excludeIdxs []int
+		wantErr     bool
+	}{
+		{
+			"equals",
+			&models.GroupFilterType{
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "string",
+						Modifier: models.CriterionModifierEquals,
+						Value:    []any{getGroupStringValue(groupIdxWithChild, "custom")},
+					},
+				},
+			},
+			[]int{groupIdxWithChild},
+			nil,
+			false,
+		},
+		{
+			"not equals",
+			&models.GroupFilterType{
+				Name: &models.StringCriterionInput{
+					Value:    getGroupStringValue(groupIdxWithChild, "Name"),
+					Modifier: models.CriterionModifierEquals,
+				},
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "string",
+						Modifier: models.CriterionModifierNotEquals,
+						Value:    []any{getGroupStringValue(groupIdxWithChild, "custom")},
+					},
+				},
+			},
+			nil,
+			[]int{groupIdxWithChild},
+			false,
+		},
+		{
+			"includes",
+			&models.GroupFilterType{
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "string",
+						Modifier: models.CriterionModifierIncludes,
+						Value:    []any{getGroupStringValue(groupIdxWithChild, "custom")[9:]},
+					},
+				},
+			},
+			[]int{groupIdxWithChild},
+			nil,
+			false,
+		},
+		{
+			"excludes",
+			&models.GroupFilterType{
+				Name: &models.StringCriterionInput{
+					Value:    getGroupStringValue(groupIdxWithChild, "Name"),
+					Modifier: models.CriterionModifierEquals,
+				},
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "string",
+						Modifier: models.CriterionModifierExcludes,
+						Value:    []any{getGroupStringValue(groupIdxWithChild, "custom")[9:]},
+					},
+				},
+			},
+			nil,
+			[]int{groupIdxWithChild},
+			false,
+		},
+		{
+			"regex",
+			&models.GroupFilterType{
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "string",
+						Modifier: models.CriterionModifierMatchesRegex,
+						Value:    []any{".*11_custom"},
+					},
+				},
+			},
+			[]int{groupIdxWithChildWithScene},
+			nil,
+			false,
+		},
+		{
+			"invalid regex",
+			&models.GroupFilterType{
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "string",
+						Modifier: models.CriterionModifierMatchesRegex,
+						Value:    []any{"["},
+					},
+				},
+			},
+			nil,
+			nil,
+			true,
+		},
+		{
+			"not matches regex",
+			&models.GroupFilterType{
+				Name: &models.StringCriterionInput{
+					Value:    getGroupStringValue(groupIdxWithChildWithScene, "Name"),
+					Modifier: models.CriterionModifierEquals,
+				},
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "string",
+						Modifier: models.CriterionModifierNotMatchesRegex,
+						Value:    []any{".*11_custom"},
+					},
+				},
+			},
+			nil,
+			[]int{groupIdxWithChildWithScene},
+			false,
+		},
+		{
+			"invalid not matches regex",
+			&models.GroupFilterType{
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "string",
+						Modifier: models.CriterionModifierNotMatchesRegex,
+						Value:    []any{"["},
+					},
+				},
+			},
+			nil,
+			nil,
+			true,
+		},
+		{
+			"null",
+			&models.GroupFilterType{
+				Name: &models.StringCriterionInput{
+					Value:    getGroupStringValue(groupIdxWithGrandParent, "Name"),
+					Modifier: models.CriterionModifierEquals,
+				},
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "not existing",
+						Modifier: models.CriterionModifierIsNull,
+					},
+				},
+			},
+			[]int{groupIdxWithGrandParent},
+			nil,
+			false,
+		},
+		{
+			"not null",
+			&models.GroupFilterType{
+				Name: &models.StringCriterionInput{
+					Value:    getGroupStringValue(groupIdxWithGrandParent, "Name"),
+					Modifier: models.CriterionModifierEquals,
+				},
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "string",
+						Modifier: models.CriterionModifierNotNull,
+					},
+				},
+			},
+			[]int{groupIdxWithGrandParent},
+			nil,
+			false,
+		},
+		{
+			"between",
+			&models.GroupFilterType{
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "real",
+						Modifier: models.CriterionModifierBetween,
+						Value:    []any{0.15, 0.25},
+					},
+				},
+			},
+			[]int{groupIdxWithTag},
+			nil,
+			false,
+		},
+		{
+			"not between",
+			&models.GroupFilterType{
+				Name: &models.StringCriterionInput{
+					Value:    getGroupStringValue(groupIdxWithTag, "Name"),
+					Modifier: models.CriterionModifierEquals,
+				},
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "real",
+						Modifier: models.CriterionModifierNotBetween,
+						Value:    []any{0.15, 0.25},
+					},
+				},
+			},
+			nil,
+			[]int{groupIdxWithTag},
+			false,
+		},
+	}
+
+	for _, tt := range tests {
+		runWithRollbackTxn(t, tt.name, func(t *testing.T, ctx context.Context) {
+			assert := assert.New(t)
+
+			groups, _, err := db.Group.Query(ctx, tt.filter, nil)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("GroupStore.Query() error = %v, wantErr %v", err, tt.wantErr)
+			}
+
+			if err != nil {
+				return
+			}
+
+			ids := groupsToIDs(groups)
+			include := indexesToIDs(groupIDs, tt.includeIdxs)
+			exclude := indexesToIDs(groupIDs, tt.excludeIdxs)
+
+			for _, i := range include {
+				assert.Contains(ids, i)
+			}
+			for _, e := range exclude {
+				assert.NotContains(ids, e)
+			}
+		})
+	}
+}
+
 // TODO Update
 // TODO Destroy - ensure image is destroyed
 // TODO Find
diff --git a/pkg/sqlite/migrations/82_group_custom_fields.up.sql b/pkg/sqlite/migrations/82_group_custom_fields.up.sql
new file mode 100644
index 000000000..c1f287fec
--- /dev/null
+++ b/pkg/sqlite/migrations/82_group_custom_fields.up.sql
@@ -0,0 +1,9 @@
+CREATE TABLE `group_custom_fields` (
+  `group_id` integer NOT NULL,
+  `field` varchar(64) NOT NULL,
+  `value` BLOB NOT NULL,
+  PRIMARY KEY (`group_id`, `field`),
+  foreign key(`group_id`) references `groups`(`id`) on delete CASCADE
+);
+
+CREATE INDEX `index_group_custom_fields_field_value` ON `group_custom_fields` (`field`, `value`);
diff --git a/pkg/sqlite/setup_test.go b/pkg/sqlite/setup_test.go
index 675b3f417..0078f1a67 100644
--- a/pkg/sqlite/setup_test.go
+++ b/pkg/sqlite/setup_test.go
@@ -1457,6 +1457,18 @@ func getGroupEmptyString(index int, field string) string {
 	return v.String
 }
 
+func getGroupCustomFields(index int) map[string]interface{} {
+	if index%5 == 0 {
+		return nil
+	}
+
+	return map[string]interface{}{
+		"string": getGroupStringValue(index, "custom"),
+		"int":    int64(index % 5),
+		"real":   float64(index) / 10,
+	}
+}
+
 // createGroups creates n groups with plain Name and o groups with camel cased NaMe included
 func createGroups(ctx context.Context, mqb models.GroupReaderWriter, n int, o int) error {
 	const namePlain = "Name"
@@ -1489,6 +1501,13 @@ func createGroups(ctx context.Context, mqb models.GroupReaderWriter, n int, o in
 			return fmt.Errorf("Error creating group [%d] %v+: %s", i, group, err.Error())
 		}
 
+		customFields := getGroupCustomFields(i)
+		if customFields != nil {
+			if err := mqb.SetCustomFields(ctx, group.ID, models.CustomFieldsInput{Full: customFields}); err != nil {
+				return fmt.Errorf("Error setting custom fields for group %d: %s", group.ID, err.Error())
+			}
+		}
+
 		groupIDs = append(groupIDs, group.ID)
 		groupNames = append(groupNames, group.Name)
 	}
diff --git a/pkg/sqlite/tables.go b/pkg/sqlite/tables.go
index 7867054ba..6c898048d 100644
--- a/pkg/sqlite/tables.go
+++ b/pkg/sqlite/tables.go
@@ -47,6 +47,7 @@ var (
 	groupsURLsJoinTable     = goqu.T(groupURLsTable)
 	groupsTagsJoinTable     = goqu.T(groupsTagsTable)
 	groupRelationsJoinTable = goqu.T(groupRelationsTable)
+	groupsCustomFieldsTable = goqu.T("group_custom_fields")
 
 	tagsAliasesJoinTable  = goqu.T(tagAliasesTable)
 	tagRelationsJoinTable = goqu.T(tagRelationsTable)

From 9a1b1fb7187eb6f2fdaffd6df777a75ff470b7ea Mon Sep 17 00:00:00 2001
From: 1509x <shvffle@gmail.com>
Date: Sun, 22 Feb 2026 20:51:35 -0500
Subject: [PATCH 307/405] [Feature] Reveal file in system file manager from
 file info panel (#6587)

* Add reveal in file manager button to file info panel

Adds a folder icon button next to the path field in the Scene, Image,
and Gallery file info panels. Clicking it calls a new GraphQL mutation
that opens the file's enclosing directory in the system file manager
(Finder on macOS, Explorer on Windows, xdg-open on Linux).

Also fixes the existing revealInFileManager implementations which were
constructing exec.Command but never calling Run(), making them no-ops:
- darwin: add Run() to open -R
- windows: add Run() and fix flag from \select to /select,<path>
- linux: implement with xdg-open on the parent directory
- desktop.go: use os.Stat instead of FileExists so folders work too

* Disallow reveal operation if request not from loopback
---------
Co-authored-by: 1509x <1509x@users.noreply.github.com>
Co-authored-by: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
---
 graphql/schema/schema.graphql                 |  4 ++
 internal/api/authentication.go                |  2 +
 internal/api/resolver_mutation_file.go        | 71 +++++++++++++++++++
 internal/desktop/desktop.go                   | 15 ++--
 internal/desktop/desktop_platform_darwin.go   | 11 ++-
 internal/desktop/desktop_platform_nixes.go    | 13 +++-
 internal/desktop/desktop_platform_windows.go  |  9 ++-
 pkg/session/local.go                          | 44 ++++++++++++
 pkg/session/session.go                        |  1 +
 ui/v2.5/graphql/mutations/file.graphql        |  8 +++
 .../GalleryDetails/GalleryFileInfoPanel.tsx   | 18 +++--
 .../ImageDetails/ImageFileInfoPanel.tsx       | 13 ++--
 .../SceneDetails/SceneFileInfoPanel.tsx       | 13 ++--
 .../Shared/RevealInFilesystemButton.tsx       | 48 +++++++++++++
 ui/v2.5/src/components/Shared/styles.scss     |  5 ++
 ui/v2.5/src/core/StashService.ts              | 12 ++++
 ui/v2.5/src/docs/en/Manual/Browsing.md        |  6 ++
 ui/v2.5/src/index.scss                        |  1 +
 ui/v2.5/src/locales/en-GB.json                |  1 +
 19 files changed, 263 insertions(+), 32 deletions(-)
 create mode 100644 pkg/session/local.go
 create mode 100644 ui/v2.5/src/components/Shared/RevealInFilesystemButton.tsx

diff --git a/graphql/schema/schema.graphql b/graphql/schema/schema.graphql
index 7fda85b24..996afefe7 100644
--- a/graphql/schema/schema.graphql
+++ b/graphql/schema/schema.graphql
@@ -426,6 +426,10 @@ type Mutation {
   destroyFiles(ids: [ID!]!): Boolean!
 
   fileSetFingerprints(input: FileSetFingerprintsInput!): Boolean!
+  "Reveal the file in the system file manager"
+  revealFileInFileManager(id: ID!): Boolean!
+  "Reveal the folder in the system file manager"
+  revealFolderInFileManager(id: ID!): Boolean!
 
   # Saved filters
   saveFilter(input: SaveFilterInput!): SavedFilter!
diff --git a/internal/api/authentication.go b/internal/api/authentication.go
index 6ad7117a1..be399d222 100644
--- a/internal/api/authentication.go
+++ b/internal/api/authentication.go
@@ -40,6 +40,8 @@ func authenticateHandler() func(http.Handler) http.Handler {
 				return
 			}
 
+			r = session.SetLocalRequest(r)
+
 			userID, err := manager.GetInstance().SessionStore.Authenticate(w, r)
 			if err != nil {
 				if !errors.Is(err, session.ErrUnauthorized) {
diff --git a/internal/api/resolver_mutation_file.go b/internal/api/resolver_mutation_file.go
index afbefe554..f6279ad16 100644
--- a/internal/api/resolver_mutation_file.go
+++ b/internal/api/resolver_mutation_file.go
@@ -5,10 +5,13 @@ import (
 	"fmt"
 	"strconv"
 
+	"github.com/stashapp/stash/internal/desktop"
 	"github.com/stashapp/stash/internal/manager"
 	"github.com/stashapp/stash/pkg/file"
 	"github.com/stashapp/stash/pkg/fsutil"
+	"github.com/stashapp/stash/pkg/logger"
 	"github.com/stashapp/stash/pkg/models"
+	"github.com/stashapp/stash/pkg/session"
 	"github.com/stashapp/stash/pkg/sliceutil/stringslice"
 )
 
@@ -326,3 +329,71 @@ func (r *mutationResolver) FileSetFingerprints(ctx context.Context, input FileSe
 
 	return true, nil
 }
+
+func (r *mutationResolver) RevealFileInFileManager(ctx context.Context, id string) (bool, error) {
+	// disallow if request did not come from localhost
+	if !session.IsLocalRequest(ctx) {
+		logger.Warnf("Attempt to reveal file in file manager from non-local request")
+		return false, fmt.Errorf("access denied")
+	}
+
+	fileIDInt, err := strconv.Atoi(id)
+	if err != nil {
+		return false, fmt.Errorf("converting id: %w", err)
+	}
+
+	var filePath string
+	if err := r.withReadTxn(ctx, func(ctx context.Context) error {
+		files, err := r.repository.File.Find(ctx, models.FileID(fileIDInt))
+		if err != nil {
+			return fmt.Errorf("finding file: %w", err)
+		}
+		if len(files) == 0 {
+			return fmt.Errorf("file with id %d not found", fileIDInt)
+		}
+		filePath = files[0].Base().Path
+		return nil
+	}); err != nil {
+		return false, err
+	}
+
+	if err := desktop.RevealInFileManager(filePath); err != nil {
+		return false, err
+	}
+
+	return true, nil
+}
+
+func (r *mutationResolver) RevealFolderInFileManager(ctx context.Context, id string) (bool, error) {
+	// disallow if request did not come from localhost
+	if !session.IsLocalRequest(ctx) {
+		logger.Warnf("Attempt to reveal folder in file manager from non-local request")
+		return false, fmt.Errorf("access denied")
+	}
+
+	folderIDInt, err := strconv.Atoi(id)
+	if err != nil {
+		return false, fmt.Errorf("converting id: %w", err)
+	}
+
+	var folderPath string
+	if err := r.withReadTxn(ctx, func(ctx context.Context) error {
+		folder, err := r.repository.Folder.Find(ctx, models.FolderID(folderIDInt))
+		if err != nil {
+			return fmt.Errorf("finding folder: %w", err)
+		}
+		if folder == nil {
+			return fmt.Errorf("folder with id %d not found", folderIDInt)
+		}
+		folderPath = folder.Path
+		return nil
+	}); err != nil {
+		return false, err
+	}
+
+	if err := desktop.RevealInFileManager(folderPath); err != nil {
+		return false, err
+	}
+
+	return true, nil
+}
diff --git a/internal/desktop/desktop.go b/internal/desktop/desktop.go
index 06d400793..f1ca9bc92 100644
--- a/internal/desktop/desktop.go
+++ b/internal/desktop/desktop.go
@@ -2,6 +2,7 @@
 package desktop
 
 import (
+	"fmt"
 	"os"
 	"path"
 	"path/filepath"
@@ -155,15 +156,17 @@ func getIconPath() string {
 	return path.Join(config.GetInstance().GetConfigPath(), "icon.png")
 }
 
-func RevealInFileManager(path string) {
-	exists, err := fsutil.FileExists(path)
+func RevealInFileManager(path string) error {
+	info, err := os.Stat(path)
 	if err != nil {
-		logger.Errorf("Error checking file: %s", err)
-		return
+		return fmt.Errorf("error checking path: %w", err)
 	}
-	if exists && IsDesktop() {
-		revealInFileManager(path)
+
+	absPath, err := filepath.Abs(path)
+	if err != nil {
+		return fmt.Errorf("error getting absolute path: %w", err)
 	}
+	return revealInFileManager(absPath, info)
 }
 
 func getServerURL(path string) string {
diff --git a/internal/desktop/desktop_platform_darwin.go b/internal/desktop/desktop_platform_darwin.go
index 593e9516f..732009007 100644
--- a/internal/desktop/desktop_platform_darwin.go
+++ b/internal/desktop/desktop_platform_darwin.go
@@ -4,9 +4,11 @@
 package desktop
 
 import (
+	"fmt"
+	"os"
 	"os/exec"
 
-	"github.com/kermieisinthehouse/gosx-notifier"
+	gosxnotifier "github.com/kermieisinthehouse/gosx-notifier"
 	"github.com/stashapp/stash/pkg/logger"
 )
 
@@ -32,8 +34,11 @@ func sendNotification(notificationTitle string, notificationText string) {
 	}
 }
 
-func revealInFileManager(path string) {
-	exec.Command(`open`, `-R`, path)
+func revealInFileManager(path string, _ os.FileInfo) error {
+	if err := exec.Command(`open`, `-R`, path).Run(); err != nil {
+		return fmt.Errorf("error revealing path in Finder: %w", err)
+	}
+	return nil
 }
 
 func isDoubleClickLaunched() bool {
diff --git a/internal/desktop/desktop_platform_nixes.go b/internal/desktop/desktop_platform_nixes.go
index 69c780d3c..f5ab13384 100644
--- a/internal/desktop/desktop_platform_nixes.go
+++ b/internal/desktop/desktop_platform_nixes.go
@@ -4,8 +4,10 @@
 package desktop
 
 import (
+	"fmt"
 	"os"
 	"os/exec"
+	"path/filepath"
 	"strings"
 
 	"github.com/stashapp/stash/pkg/logger"
@@ -33,8 +35,15 @@ func sendNotification(notificationTitle string, notificationText string) {
 	}
 }
 
-func revealInFileManager(path string) {
-
+func revealInFileManager(path string, info os.FileInfo) error {
+	dir := path
+	if !info.IsDir() {
+		dir = filepath.Dir(path)
+	}
+	if err := exec.Command("xdg-open", dir).Run(); err != nil {
+		return fmt.Errorf("error opening directory in file manager: %w", err)
+	}
+	return nil
 }
 
 func isDoubleClickLaunched() bool {
diff --git a/internal/desktop/desktop_platform_windows.go b/internal/desktop/desktop_platform_windows.go
index ecb4060e6..48feabed5 100644
--- a/internal/desktop/desktop_platform_windows.go
+++ b/internal/desktop/desktop_platform_windows.go
@@ -4,6 +4,7 @@
 package desktop
 
 import (
+	"os"
 	"os/exec"
 	"syscall"
 	"unsafe"
@@ -83,6 +84,10 @@ func sendNotification(notificationTitle string, notificationText string) {
 	}
 }
 
-func revealInFileManager(path string) {
-	exec.Command(`explorer`, `\select`, path)
+func revealInFileManager(path string, _ os.FileInfo) error {
+	c := exec.Command(`explorer`, `/select,`, path)
+	logger.Debugf("Running: %s", c.String())
+	// explorer seems to return an error code even when it works, so ignore the error
+	_ = c.Run()
+	return nil
 }
diff --git a/pkg/session/local.go b/pkg/session/local.go
new file mode 100644
index 000000000..519328496
--- /dev/null
+++ b/pkg/session/local.go
@@ -0,0 +1,44 @@
+package session
+
+import (
+	"context"
+	"net"
+	"net/http"
+
+	"github.com/stashapp/stash/pkg/logger"
+)
+
+// SetLocalRequest checks if the request is from localhost and sets the context value accordingly.
+// It returns the modified request with the updated context, or the original request if it did
+// not come from localhost or if there was an error parsing the remote address.
+func SetLocalRequest(r *http.Request) *http.Request {
+	// determine if request is from localhost
+	host, _, err := net.SplitHostPort(r.RemoteAddr)
+	if err != nil {
+		logger.Errorf("Error parsing remote address: %v", err)
+		return r
+	}
+
+	ip := net.ParseIP(host)
+	if ip == nil {
+		logger.Errorf("Error parsing IP address: %s", host)
+		return r
+	}
+
+	if ip.IsLoopback() {
+		ctx := context.WithValue(r.Context(), contextLocalRequest, true)
+		r = r.WithContext(ctx)
+	}
+
+	return r
+}
+
+// IsLocalRequest returns true if the request is from localhost, as determined by the context value set by SetLocalRequest.
+// If the context value is not set, it returns false.
+func IsLocalRequest(ctx context.Context) bool {
+	val := ctx.Value(contextLocalRequest)
+	if val == nil {
+		return false
+	}
+	return val.(bool)
+}
diff --git a/pkg/session/session.go b/pkg/session/session.go
index 66cb39e09..3e4c2eea1 100644
--- a/pkg/session/session.go
+++ b/pkg/session/session.go
@@ -15,6 +15,7 @@ type key int
 const (
 	contextUser key = iota
 	contextVisitedPlugins
+	contextLocalRequest
 )
 
 const (
diff --git a/ui/v2.5/graphql/mutations/file.graphql b/ui/v2.5/graphql/mutations/file.graphql
index 254a55126..fe920d308 100644
--- a/ui/v2.5/graphql/mutations/file.graphql
+++ b/ui/v2.5/graphql/mutations/file.graphql
@@ -1,3 +1,11 @@
 mutation DeleteFiles($ids: [ID!]!) {
   deleteFiles(ids: $ids)
 }
+
+mutation RevealFileInFileManager($id: ID!) {
+  revealFileInFileManager(id: $id)
+}
+
+mutation RevealFolderInFileManager($id: ID!) {
+  revealFolderInFileManager(id: $id)
+}
diff --git a/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryFileInfoPanel.tsx b/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryFileInfoPanel.tsx
index 63fedd400..e97146b91 100644
--- a/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryFileInfoPanel.tsx
+++ b/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryFileInfoPanel.tsx
@@ -3,11 +3,12 @@ import { Accordion, Button, Card } from "react-bootstrap";
 import { FormattedMessage, FormattedTime } from "react-intl";
 import { TruncatedText } from "src/components/Shared/TruncatedText";
 import { DeleteFilesDialog } from "src/components/Shared/DeleteFilesDialog";
+import { RevealInFilesystemButton } from "src/components/Shared/RevealInFilesystemButton";
 import * as GQL from "src/core/generated-graphql";
 import { mutateGallerySetPrimaryFile } from "src/core/StashService";
 import { useToast } from "src/hooks/Toast";
 import TextUtils from "src/utils/text";
-import { TextField, URLField, URLsField } from "src/utils/field";
+import { TextField, URLsField } from "src/utils/field";
 
 interface IFileInfoPanelProps {
   folder?: Pick<GQL.Folder, "id" | "path">;
@@ -38,12 +39,15 @@ const FileInfoPanel: React.FC<IFileInfoPanelProps> = (
           </>
         )}
         <TextField id="media_info.checksum" value={checksum?.value} truncate />
-        <URLField
-          id={id}
-          url={`file://${path}`}
-          value={`file://${path}`}
-          truncate
-        />
+        <TextField id={id}>
+          <span className="d-flex align-items-center">
+            <TruncatedText text={path} />
+            <RevealInFilesystemButton
+              folderId={props.folder?.id}
+              fileId={props.file?.id}
+            />
+          </span>
+        </TextField>
         {props.file && (
           <TextField id="file_mod_time">
             <FormattedTime
diff --git a/ui/v2.5/src/components/Images/ImageDetails/ImageFileInfoPanel.tsx b/ui/v2.5/src/components/Images/ImageDetails/ImageFileInfoPanel.tsx
index f247e062b..c346cf874 100644
--- a/ui/v2.5/src/components/Images/ImageDetails/ImageFileInfoPanel.tsx
+++ b/ui/v2.5/src/components/Images/ImageDetails/ImageFileInfoPanel.tsx
@@ -3,6 +3,7 @@ import { Accordion, Button, Card } from "react-bootstrap";
 import { FormattedMessage, FormattedTime } from "react-intl";
 import { TruncatedText } from "src/components/Shared/TruncatedText";
 import { DeleteFilesDialog } from "src/components/Shared/DeleteFilesDialog";
+import { RevealInFilesystemButton } from "src/components/Shared/RevealInFilesystemButton";
 import * as GQL from "src/core/generated-graphql";
 import { mutateImageSetPrimaryFile } from "src/core/StashService";
 import { useToast } from "src/hooks/Toast";
@@ -47,12 +48,12 @@ const FileInfoPanel: React.FC<IFileInfoPanelProps> = (
           truncate
           internal
         />
-        <URLField
-          id="path"
-          url={`file://${props.file.path}`}
-          value={`file://${props.file.path}`}
-          truncate
-        />
+        <TextField id="path">
+          <span className="d-flex align-items-center">
+            <TruncatedText text={props.file.path} />
+            <RevealInFilesystemButton fileId={props.file.id} />
+          </span>
+        </TextField>
         <TextField id="filesize">
           <span className="text-truncate">
             <FileSize size={props.file.size} />
diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/SceneFileInfoPanel.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/SceneFileInfoPanel.tsx
index 63490a2ee..6be55925e 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/SceneFileInfoPanel.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/SceneFileInfoPanel.tsx
@@ -9,6 +9,7 @@ import {
 import { useHistory } from "react-router-dom";
 import { TruncatedText } from "src/components/Shared/TruncatedText";
 import { DeleteFilesDialog } from "src/components/Shared/DeleteFilesDialog";
+import { RevealInFilesystemButton } from "src/components/Shared/RevealInFilesystemButton";
 import { ReassignFilesDialog } from "src/components/Shared/ReassignFilesDialog";
 import * as GQL from "src/core/generated-graphql";
 import { mutateSceneSetPrimaryFile } from "src/core/StashService";
@@ -70,12 +71,12 @@ const FileInfoPanel: React.FC<IFileInfoPanelProps> = (
           truncate
           internal
         />
-        <URLField
-          id="path"
-          url={`file://${props.file.path}`}
-          value={`file://${props.file.path}`}
-          truncate
-        />
+        <TextField id="path">
+          <span className="d-flex align-items-center">
+            <TruncatedText text={props.file.path} />
+            <RevealInFilesystemButton fileId={props.file.id} />
+          </span>
+        </TextField>
         <TextField id="filesize">
           <span className="text-truncate">
             <FileSize size={props.file.size} />
diff --git a/ui/v2.5/src/components/Shared/RevealInFilesystemButton.tsx b/ui/v2.5/src/components/Shared/RevealInFilesystemButton.tsx
new file mode 100644
index 000000000..ecc03f9f7
--- /dev/null
+++ b/ui/v2.5/src/components/Shared/RevealInFilesystemButton.tsx
@@ -0,0 +1,48 @@
+import React from "react";
+import { Button } from "react-bootstrap";
+import { faFolderOpen } from "@fortawesome/free-solid-svg-icons";
+import { useIntl } from "react-intl";
+import { Icon } from "./Icon";
+import {
+  mutateRevealFileInFileManager,
+  mutateRevealFolderInFileManager,
+} from "src/core/StashService";
+import { getPlatformURL } from "src/core/createClient";
+
+interface IRevealInFilesystemButtonProps {
+  fileId?: string;
+  folderId?: string;
+}
+
+function isLocalhost(): boolean {
+  const { hostname } = getPlatformURL();
+  return (
+    hostname === "localhost" || hostname === "127.0.0.1" || hostname === "::1"
+  );
+}
+
+export const RevealInFilesystemButton: React.FC<
+  IRevealInFilesystemButtonProps
+> = ({ fileId, folderId }) => {
+  const intl = useIntl();
+
+  if (!isLocalhost()) return null;
+
+  function onClick() {
+    if (folderId) {
+      mutateRevealFolderInFileManager(folderId);
+    } else if (fileId) {
+      mutateRevealFileInFileManager(fileId);
+    }
+  }
+
+  return (
+    <Button
+      className="minimal reveal-in-filesystem-button"
+      title={intl.formatMessage({ id: "actions.reveal_in_file_manager" })}
+      onClick={onClick}
+    >
+      <Icon icon={faFolderOpen} />
+    </Button>
+  );
+};
diff --git a/ui/v2.5/src/components/Shared/styles.scss b/ui/v2.5/src/components/Shared/styles.scss
index f72bbbeea..32b222832 100644
--- a/ui/v2.5/src/components/Shared/styles.scss
+++ b/ui/v2.5/src/components/Shared/styles.scss
@@ -1204,3 +1204,8 @@ input[type="range"].double-range-slider-max {
     overflow-y: auto;
   }
 }
+
+.reveal-in-filesystem-button {
+  margin-left: 0.25rem;
+  padding: 0 0.25rem;
+}
diff --git a/ui/v2.5/src/core/StashService.ts b/ui/v2.5/src/core/StashService.ts
index 58b1aae42..d276806fc 100644
--- a/ui/v2.5/src/core/StashService.ts
+++ b/ui/v2.5/src/core/StashService.ts
@@ -2248,6 +2248,18 @@ export const mutateDeleteFiles = (ids: string[]) =>
     },
   });
 
+export const mutateRevealFileInFileManager = (id: string) =>
+  client.mutate<GQL.RevealFileInFileManagerMutation>({
+    mutation: GQL.RevealFileInFileManagerDocument,
+    variables: { id },
+  });
+
+export const mutateRevealFolderInFileManager = (id: string) =>
+  client.mutate<GQL.RevealFolderInFileManagerMutation>({
+    mutation: GQL.RevealFolderInFileManagerDocument,
+    variables: { id },
+  });
+
 /// Scrapers
 
 export const useListSceneScrapers = () => GQL.useListSceneScrapersQuery();
diff --git a/ui/v2.5/src/docs/en/Manual/Browsing.md b/ui/v2.5/src/docs/en/Manual/Browsing.md
index 69277146e..6b6681253 100644
--- a/ui/v2.5/src/docs/en/Manual/Browsing.md
+++ b/ui/v2.5/src/docs/en/Manual/Browsing.md
@@ -50,3 +50,9 @@ Saved filters are sorted alphabetically by title with capitalized titles sorted
 ### Default filter
 
 The default filter for the top-level pages may be set to the current filter by clicking the `Set as default` button in the saved filter menu.
+
+## Reveal file in file manager
+
+The `Reveal in file manager` action is available for file-based scenes, galleries and images in the `File Info` tab. This action will open the file manager to the location of the file on disk. The file will be selected if supported by the file manager.
+
+This button will only be available when accessing stash from a local loopback address (e.g. `localhost` or `127.0.0.1`), and will not be shown when accessing stash from a remote address.
\ No newline at end of file
diff --git a/ui/v2.5/src/index.scss b/ui/v2.5/src/index.scss
index cadd1ad2f..3d9478194 100755
--- a/ui/v2.5/src/index.scss
+++ b/ui/v2.5/src/index.scss
@@ -84,6 +84,7 @@ code,
 }
 
 dd {
+  overflow: hidden;
   white-space: pre-line;
 }
 
diff --git a/ui/v2.5/src/locales/en-GB.json b/ui/v2.5/src/locales/en-GB.json
index 4bfd4322d..957bf2837 100644
--- a/ui/v2.5/src/locales/en-GB.json
+++ b/ui/v2.5/src/locales/en-GB.json
@@ -98,6 +98,7 @@
     "remove_from_containing_group": "Remove from Group",
     "remove_from_gallery": "Remove from Gallery",
     "rename_gen_files": "Rename generated files",
+    "reveal_in_file_manager": "Reveal in File Manager",
     "rescan": "Rescan",
     "reset_play_duration": "Reset play duration",
     "reset_resume_time": "Reset resume time",

From aff6db15009e83192b9e2ef82107eb6b29073bd7 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Mon, 23 Feb 2026 16:51:36 +1100
Subject: [PATCH 308/405] Fix scene player scrubber when custom sprite size
 used (#6597)

---
 .../ScenePlayer/ScenePlayerScrubber.tsx       | 36 +++++++++++++++----
 1 file changed, 30 insertions(+), 6 deletions(-)

diff --git a/ui/v2.5/src/components/ScenePlayer/ScenePlayerScrubber.tsx b/ui/v2.5/src/components/ScenePlayer/ScenePlayerScrubber.tsx
index 93e45a7e7..196bc9bd0 100644
--- a/ui/v2.5/src/components/ScenePlayer/ScenePlayerScrubber.tsx
+++ b/ui/v2.5/src/components/ScenePlayer/ScenePlayerScrubber.tsx
@@ -28,6 +28,10 @@ interface ISceneSpriteItem {
   time: string;
 }
 
+const scrubberViewportHeight = 120;
+const scrubberTagsHeight = 30;
+const scrubberSpriteHeight = scrubberViewportHeight - scrubberTagsHeight;
+
 export const ScenePlayerScrubber: React.FC<IScenePlayerScrubberProps> = ({
   file,
   scene,
@@ -86,16 +90,36 @@ export const ScenePlayerScrubber: React.FC<IScenePlayerScrubberProps> = ({
   const [spriteItems, setSpriteItems] = useState<ISceneSpriteItem[]>();
 
   useEffect(() => {
-    if (!spriteInfo) return;
+    if (!spriteInfo || spriteInfo.length === 0) return;
     let totalWidth = 0;
+
+    // calculate total width/height of scrubber image so we can scale it
+    const maxX = Math.max(...spriteInfo.map((sprite) => sprite.x + sprite.w));
+    const maxY = Math.max(...spriteInfo.map((sprite) => sprite.y + sprite.h));
+    const spriteWidth = spriteInfo[0].w;
+    const spriteHeight = spriteInfo[0].h;
+    const scale = scrubberSpriteHeight / spriteHeight;
+
+    const w = spriteWidth * scale;
+    const h = scrubberSpriteHeight;
+
+    const sizeX = maxX * scale;
+    const sizeY = maxY * scale;
+
+    // scale sprite dimensions to fit scrubber height, and calculate background position for each sprite
     const newSprites = spriteInfo?.map((sprite, index) => {
-      totalWidth += sprite.w;
-      const left = sprite.w * index;
+      totalWidth += w;
+      const left = w * index;
+
+      const spriteX = sprite.x * scale;
+      const spriteY = sprite.y * scale;
+
       const style = {
-        width: `${sprite.w}px`,
-        height: `${sprite.h}px`,
-        backgroundPosition: `${-sprite.x}px ${-sprite.y}px`,
+        width: `${w}px`,
+        height: `${h}px`,
+        backgroundPosition: `${-spriteX}px ${-spriteY}px`,
         backgroundImage: `url(${sprite.url})`,
+        backgroundSize: `${sizeX}px ${sizeY}px`,
         left: `${left}px`,
       };
       const start = TextUtils.secondsToTimestamp(sprite.start);

From 86abe7b24c79fd82fe7eb4543e11e1cace8a5182 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Tue, 24 Feb 2026 07:41:40 +1100
Subject: [PATCH 309/405] Backend support for image custom fields (#6598)

* Initialise maps in bulk get custom fields to fix graphql validation error
---
 graphql/schema/types/filters.graphql          |   2 +
 graphql/schema/types/image.graphql            |   3 +
 internal/api/loaders/dataloaders.go           |  18 +
 internal/api/resolver_model_image.go          |   9 +
 internal/api/resolver_mutation_image.go       |  14 +
 internal/autotag/integration_test.go          |   5 +-
 internal/manager/task_export.go               |   8 +-
 pkg/image/export.go                           |  15 +-
 pkg/image/export_test.go                      |  26 +-
 pkg/image/import.go                           |  13 +-
 pkg/image/import_test.go                      |   4 +-
 pkg/image/scan.go                             |   7 +-
 pkg/models/image.go                           |  39 +-
 pkg/models/jsonschema/image.go                |  25 +-
 pkg/models/mocks/ImageReaderWriter.go         |  70 ++-
 pkg/models/model_image.go                     |   8 +
 pkg/models/repository_image.go                |   4 +-
 pkg/sqlite/custom_fields.go                   |   4 +
 pkg/sqlite/custom_fields_test.go              |   6 +
 pkg/sqlite/database.go                        |   2 +-
 pkg/sqlite/image.go                           |  26 +-
 pkg/sqlite/image_filter.go                    |   7 +
 pkg/sqlite/image_test.go                      | 437 +++++++++++++++---
 .../migrations/83_image_custom_fields.up.sql  |   9 +
 pkg/sqlite/setup_test.go                      |  18 +-
 pkg/sqlite/tables.go                          |   1 +
 26 files changed, 669 insertions(+), 111 deletions(-)
 create mode 100644 pkg/sqlite/migrations/83_image_custom_fields.up.sql

diff --git a/graphql/schema/types/filters.graphql b/graphql/schema/types/filters.graphql
index 4162f0af3..907e597f4 100644
--- a/graphql/schema/types/filters.graphql
+++ b/graphql/schema/types/filters.graphql
@@ -765,6 +765,8 @@ input ImageFilterType {
   tags_filter: TagFilterType
   "Filter by related files that meet this criteria"
   files_filter: FileFilterType
+  "Filter by custom fields"
+  custom_fields: [CustomFieldCriterionInput!]
 }
 
 input FileFilterType {
diff --git a/graphql/schema/types/image.graphql b/graphql/schema/types/image.graphql
index b7ec1a9f5..ccc414542 100644
--- a/graphql/schema/types/image.graphql
+++ b/graphql/schema/types/image.graphql
@@ -21,6 +21,7 @@ type Image {
   studio: Studio
   tags: [Tag!]!
   performers: [Performer!]!
+  custom_fields: Map!
 }
 
 type ImageFileType {
@@ -56,6 +57,7 @@ input ImageUpdateInput {
   gallery_ids: [ID!]
 
   primary_file_id: ID
+  custom_fields: CustomFieldsInput
 }
 
 input BulkImageUpdateInput {
@@ -76,6 +78,7 @@ input BulkImageUpdateInput {
   performer_ids: BulkUpdateIds
   tag_ids: BulkUpdateIds
   gallery_ids: BulkUpdateIds
+  custom_fields: CustomFieldsInput
 }
 
 input ImageDestroyInput {
diff --git a/internal/api/loaders/dataloaders.go b/internal/api/loaders/dataloaders.go
index ff8a87ab0..dac8ba6b8 100644
--- a/internal/api/loaders/dataloaders.go
+++ b/internal/api/loaders/dataloaders.go
@@ -57,6 +57,7 @@ type Loaders struct {
 	GalleryByID         *GalleryLoader
 	GalleryCustomFields *CustomFieldsLoader
 	ImageByID           *ImageLoader
+	ImageCustomFields   *CustomFieldsLoader
 
 	PerformerByID         *PerformerLoader
 	PerformerCustomFields *CustomFieldsLoader
@@ -100,6 +101,11 @@ func (m Middleware) Middleware(next http.Handler) http.Handler {
 				maxBatch: maxBatch,
 				fetch:    m.fetchImages(ctx),
 			},
+			ImageCustomFields: &CustomFieldsLoader{
+				wait:     wait,
+				maxBatch: maxBatch,
+				fetch:    m.fetchImageCustomFields(ctx),
+			},
 			PerformerByID: &PerformerLoader{
 				wait:     wait,
 				maxBatch: maxBatch,
@@ -249,6 +255,18 @@ func (m Middleware) fetchImages(ctx context.Context) func(keys []int) ([]*models
 	}
 }
 
+func (m Middleware) fetchImageCustomFields(ctx context.Context) func(keys []int) ([]models.CustomFieldMap, []error) {
+	return func(keys []int) (ret []models.CustomFieldMap, errs []error) {
+		err := m.Repository.WithDB(ctx, func(ctx context.Context) error {
+			var err error
+			ret, err = m.Repository.Image.GetCustomFieldsBulk(ctx, keys)
+			return err
+		})
+
+		return ret, toErrorSlice(err)
+	}
+}
+
 func (m Middleware) fetchGalleries(ctx context.Context) func(keys []int) ([]*models.Gallery, []error) {
 	return func(keys []int) (ret []*models.Gallery, errs []error) {
 		err := m.Repository.WithDB(ctx, func(ctx context.Context) error {
diff --git a/internal/api/resolver_model_image.go b/internal/api/resolver_model_image.go
index 0886bea40..4a95ae1f4 100644
--- a/internal/api/resolver_model_image.go
+++ b/internal/api/resolver_model_image.go
@@ -161,3 +161,12 @@ func (r *imageResolver) Urls(ctx context.Context, obj *models.Image) ([]string,
 
 	return obj.URLs.List(), nil
 }
+
+func (r *imageResolver) CustomFields(ctx context.Context, obj *models.Image) (map[string]interface{}, error) {
+	customFields, err := loaders.From(ctx).ImageCustomFields.Load(obj.ID)
+	if err != nil {
+		return nil, err
+	}
+
+	return customFields, nil
+}
diff --git a/internal/api/resolver_mutation_image.go b/internal/api/resolver_mutation_image.go
index 230d48358..cc03c5286 100644
--- a/internal/api/resolver_mutation_image.go
+++ b/internal/api/resolver_mutation_image.go
@@ -177,6 +177,13 @@ func (r *mutationResolver) imageUpdate(ctx context.Context, input models.ImageUp
 		return nil, fmt.Errorf("converting tag ids: %w", err)
 	}
 
+	if input.CustomFields != nil {
+		updatedImage.CustomFields = *input.CustomFields
+		// convert json.Numbers to int/float
+		updatedImage.CustomFields.Full = convertMapJSONNumbers(updatedImage.CustomFields.Full)
+		updatedImage.CustomFields.Partial = convertMapJSONNumbers(updatedImage.CustomFields.Partial)
+	}
+
 	qb := r.repository.Image
 	image, err := qb.UpdatePartial(ctx, imageID, updatedImage)
 	if err != nil {
@@ -237,6 +244,13 @@ func (r *mutationResolver) BulkImageUpdate(ctx context.Context, input BulkImageU
 		return nil, fmt.Errorf("converting tag ids: %w", err)
 	}
 
+	if input.CustomFields != nil {
+		updatedImage.CustomFields = *input.CustomFields
+		// convert json.Numbers to int/float
+		updatedImage.CustomFields.Full = convertMapJSONNumbers(updatedImage.CustomFields.Full)
+		updatedImage.CustomFields.Partial = convertMapJSONNumbers(updatedImage.CustomFields.Partial)
+	}
+
 	// Start the transaction and save the images
 	if err := r.withTxn(ctx, func(ctx context.Context) error {
 		var updatedGalleryIDs []int
diff --git a/internal/autotag/integration_test.go b/internal/autotag/integration_test.go
index 9745d623e..f537ecfe7 100644
--- a/internal/autotag/integration_test.go
+++ b/internal/autotag/integration_test.go
@@ -365,7 +365,10 @@ func makeImage(expectedResult bool) *models.Image {
 }
 
 func createImage(ctx context.Context, w models.ImageWriter, o *models.Image, f *models.ImageFile) error {
-	err := w.Create(ctx, o, []models.FileID{f.ID})
+	err := w.Create(ctx, &models.CreateImageInput{
+		Image:   o,
+		FileIDs: []models.FileID{f.ID},
+	})
 
 	if err != nil {
 		return fmt.Errorf("Failed to create image with path '%s': %s", f.Path, err.Error())
diff --git a/internal/manager/task_export.go b/internal/manager/task_export.go
index 30adf626b..01bab9430 100644
--- a/internal/manager/task_export.go
+++ b/internal/manager/task_export.go
@@ -651,6 +651,7 @@ func (t *ExportTask) exportImage(ctx context.Context, wg *sync.WaitGroup, jobCha
 	galleryReader := r.Gallery
 	performerReader := r.Performer
 	tagReader := r.Tag
+	imageReader := r.Image
 
 	for s := range jobChan {
 		imageHash := s.Checksum
@@ -665,14 +666,17 @@ func (t *ExportTask) exportImage(ctx context.Context, wg *sync.WaitGroup, jobCha
 			continue
 		}
 
-		newImageJSON := image.ToBasicJSON(s)
+		newImageJSON, err := image.ToBasicJSON(ctx, imageReader, s)
+		if err != nil {
+			logger.Errorf("[images] <%s> error converting image to JSON: %v", imageHash, err)
+			continue
+		}
 
 		// export files
 		for _, f := range s.Files.List() {
 			t.exportFile(f)
 		}
 
-		var err error
 		newImageJSON.Studio, err = image.GetStudioName(ctx, studioReader, s)
 		if err != nil {
 			logger.Errorf("[images] <%s> error getting image studio name: %v", imageHash, err)
diff --git a/pkg/image/export.go b/pkg/image/export.go
index fdba6165c..eb5d5da27 100644
--- a/pkg/image/export.go
+++ b/pkg/image/export.go
@@ -2,16 +2,21 @@ package image
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/stashapp/stash/pkg/models"
 	"github.com/stashapp/stash/pkg/models/json"
 	"github.com/stashapp/stash/pkg/models/jsonschema"
 )
 
+type ExportReader interface {
+	models.CustomFieldsReader
+}
+
 // ToBasicJSON converts a image object into its JSON object equivalent. It
 // does not convert the relationships to other objects, with the exception
 // of cover image.
-func ToBasicJSON(image *models.Image) *jsonschema.Image {
+func ToBasicJSON(ctx context.Context, reader ExportReader, image *models.Image) (*jsonschema.Image, error) {
 	newImageJSON := jsonschema.Image{
 		Title:        image.Title,
 		Code:         image.Code,
@@ -33,11 +38,17 @@ func ToBasicJSON(image *models.Image) *jsonschema.Image {
 	newImageJSON.Organized = image.Organized
 	newImageJSON.OCounter = image.OCounter
 
+	var err error
+	newImageJSON.CustomFields, err = reader.GetCustomFields(ctx, image.ID)
+	if err != nil {
+		return nil, fmt.Errorf("getting image custom fields: %v", err)
+	}
+
 	for _, f := range image.Files.List() {
 		newImageJSON.Files = append(newImageJSON.Files, f.Base().Path)
 	}
 
-	return &newImageJSON
+	return &newImageJSON, nil
 }
 
 // GetStudioName returns the name of the provided image's studio. It returns an
diff --git a/pkg/image/export_test.go b/pkg/image/export_test.go
index 6adaf1d33..d0d36afbb 100644
--- a/pkg/image/export_test.go
+++ b/pkg/image/export_test.go
@@ -29,6 +29,10 @@ var (
 	dateObj, _ = models.ParseDate(date)
 	organized  = true
 	ocounter   = 2
+
+	customFields = map[string]interface{}{
+		"customField1": "customValue1",
+	}
 )
 
 const (
@@ -60,7 +64,7 @@ func createFullImage(id int) models.Image {
 	}
 }
 
-func createFullJSONImage() *jsonschema.Image {
+func createFullJSONImage(customFields map[string]interface{}) *jsonschema.Image {
 	return &jsonschema.Image{
 		Title:     title,
 		OCounter:  ocounter,
@@ -75,28 +79,40 @@ func createFullJSONImage() *jsonschema.Image {
 		UpdatedAt: json.JSONTime{
 			Time: updateTime,
 		},
+		CustomFields: customFields,
 	}
 }
 
 type basicTestScenario struct {
-	input    models.Image
-	expected *jsonschema.Image
+	input        models.Image
+	customFields map[string]interface{}
+	expected     *jsonschema.Image
 }
 
 var scenarios = []basicTestScenario{
 	{
 		createFullImage(imageID),
-		createFullJSONImage(),
+		customFields,
+		createFullJSONImage(customFields),
 	},
 }
 
 func TestToJSON(t *testing.T) {
+	db := mocks.NewDatabase()
+	db.Image.On("GetCustomFields", testCtx, imageID).Return(customFields, nil).Once()
+
 	for i, s := range scenarios {
 		image := s.input
-		json := ToBasicJSON(&image)
+		json, err := ToBasicJSON(testCtx, db.Image, &image)
+		if err != nil {
+			t.Errorf("[%d] unexpected error: %s", i, err.Error())
+			continue
+		}
 
 		assert.Equal(t, s.expected, json, "[%d]", i)
 	}
+
+	db.AssertExpectations(t)
 }
 
 func createStudioImage(studioID int) models.Image {
diff --git a/pkg/image/import.go b/pkg/image/import.go
index c7ef7f00c..d8dfa987f 100644
--- a/pkg/image/import.go
+++ b/pkg/image/import.go
@@ -31,8 +31,9 @@ type Importer struct {
 	Input               jsonschema.Image
 	MissingRefBehaviour models.ImportMissingRefEnum
 
-	ID    int
-	image models.Image
+	ID           int
+	image        models.Image
+	customFields map[string]interface{}
 }
 
 func (i *Importer) PreImport(ctx context.Context) error {
@@ -58,6 +59,8 @@ func (i *Importer) PreImport(ctx context.Context) error {
 		return err
 	}
 
+	i.customFields = i.Input.CustomFields
+
 	return nil
 }
 
@@ -344,7 +347,11 @@ func (i *Importer) Create(ctx context.Context) (*int, error) {
 		fileIDs = append(fileIDs, f.Base().ID)
 	}
 
-	err := i.ReaderWriter.Create(ctx, &i.image, fileIDs)
+	err := i.ReaderWriter.Create(ctx, &models.CreateImageInput{
+		Image:        &i.image,
+		FileIDs:      fileIDs,
+		CustomFields: i.customFields,
+	})
 	if err != nil {
 		return nil, fmt.Errorf("error creating image: %v", err)
 	}
diff --git a/pkg/image/import_test.go b/pkg/image/import_test.go
index 5d01d4b97..a693c4568 100644
--- a/pkg/image/import_test.go
+++ b/pkg/image/import_test.go
@@ -45,7 +45,8 @@ func TestImporterPreImportWithStudio(t *testing.T) {
 	i := Importer{
 		StudioWriter: db.Studio,
 		Input: jsonschema.Image{
-			Studio: existingStudioName,
+			Studio:       existingStudioName,
+			CustomFields: customFields,
 		},
 	}
 
@@ -57,6 +58,7 @@ func TestImporterPreImportWithStudio(t *testing.T) {
 	err := i.PreImport(testCtx)
 	assert.Nil(t, err)
 	assert.Equal(t, existingStudioID, *i.image.StudioID)
+	assert.Equal(t, customFields, i.customFields)
 
 	i.Input.Studio = existingStudioErr
 	err = i.PreImport(testCtx)
diff --git a/pkg/image/scan.go b/pkg/image/scan.go
index 67f4b334c..317e3605f 100644
--- a/pkg/image/scan.go
+++ b/pkg/image/scan.go
@@ -27,7 +27,7 @@ type ScanCreatorUpdater interface {
 	GetFiles(ctx context.Context, relatedID int) ([]models.File, error)
 	GetGalleryIDs(ctx context.Context, relatedID int) ([]int, error)
 
-	Create(ctx context.Context, newImage *models.Image, fileIDs []models.FileID) error
+	Create(ctx context.Context, newImage *models.CreateImageInput) error
 	UpdatePartial(ctx context.Context, id int, updatedImage models.ImagePartial) (*models.Image, error)
 	AddFileID(ctx context.Context, id int, fileID models.FileID) error
 }
@@ -124,7 +124,10 @@ func (h *ScanHandler) Handle(ctx context.Context, f models.File, oldFile models.
 			logger.Infof("Adding %s to gallery %s", f.Base().Path, g.Path)
 		}
 
-		if err := h.CreatorUpdater.Create(ctx, &newImage, []models.FileID{imageFile.ID}); err != nil {
+		if err := h.CreatorUpdater.Create(ctx, &models.CreateImageInput{
+			Image:   &newImage,
+			FileIDs: []models.FileID{imageFile.ID},
+		}); err != nil {
 			return fmt.Errorf("creating new image: %w", err)
 		}
 
diff --git a/pkg/models/image.go b/pkg/models/image.go
index 84be79360..b99267e8c 100644
--- a/pkg/models/image.go
+++ b/pkg/models/image.go
@@ -1,6 +1,8 @@
 package models
 
-import "context"
+import (
+	"context"
+)
 
 type ImageFilterType struct {
 	OperatorFilter[ImageFilterType]
@@ -65,25 +67,28 @@ type ImageFilterType struct {
 	CreatedAt *TimestampCriterionInput `json:"created_at"`
 	// Filter by updated at
 	UpdatedAt *TimestampCriterionInput `json:"updated_at"`
+	// Filter by custom fields
+	CustomFields []CustomFieldCriterionInput `json:"custom_fields"`
 }
 
 type ImageUpdateInput struct {
-	ClientMutationID *string  `json:"clientMutationId"`
-	ID               string   `json:"id"`
-	Title            *string  `json:"title"`
-	Code             *string  `json:"code"`
-	Urls             []string `json:"urls"`
-	Date             *string  `json:"date"`
-	Details          *string  `json:"details"`
-	Photographer     *string  `json:"photographer"`
-	Rating100        *int     `json:"rating100"`
-	Organized        *bool    `json:"organized"`
-	SceneIds         []string `json:"scene_ids"`
-	StudioID         *string  `json:"studio_id"`
-	TagIds           []string `json:"tag_ids"`
-	PerformerIds     []string `json:"performer_ids"`
-	GalleryIds       []string `json:"gallery_ids"`
-	PrimaryFileID    *string  `json:"primary_file_id"`
+	ClientMutationID *string            `json:"clientMutationId"`
+	ID               string             `json:"id"`
+	Title            *string            `json:"title"`
+	Code             *string            `json:"code"`
+	Urls             []string           `json:"urls"`
+	Date             *string            `json:"date"`
+	Details          *string            `json:"details"`
+	Photographer     *string            `json:"photographer"`
+	Rating100        *int               `json:"rating100"`
+	Organized        *bool              `json:"organized"`
+	SceneIds         []string           `json:"scene_ids"`
+	StudioID         *string            `json:"studio_id"`
+	TagIds           []string           `json:"tag_ids"`
+	PerformerIds     []string           `json:"performer_ids"`
+	GalleryIds       []string           `json:"gallery_ids"`
+	PrimaryFileID    *string            `json:"primary_file_id"`
+	CustomFields     *CustomFieldsInput `json:"custom_fields"`
 
 	// deprecated
 	URL *string `json:"url"`
diff --git a/pkg/models/jsonschema/image.go b/pkg/models/jsonschema/image.go
index 1bdac8770..168ea9eec 100644
--- a/pkg/models/jsonschema/image.go
+++ b/pkg/models/jsonschema/image.go
@@ -18,18 +18,19 @@ type Image struct {
 	// deprecated - for import only
 	URL string `json:"url,omitempty"`
 
-	URLs         []string      `json:"urls,omitempty"`
-	Date         string        `json:"date,omitempty"`
-	Details      string        `json:"details,omitempty"`
-	Photographer string        `json:"photographer,omitempty"`
-	Organized    bool          `json:"organized,omitempty"`
-	OCounter     int           `json:"o_counter,omitempty"`
-	Galleries    []GalleryRef  `json:"galleries,omitempty"`
-	Performers   []string      `json:"performers,omitempty"`
-	Tags         []string      `json:"tags,omitempty"`
-	Files        []string      `json:"files,omitempty"`
-	CreatedAt    json.JSONTime `json:"created_at,omitempty"`
-	UpdatedAt    json.JSONTime `json:"updated_at,omitempty"`
+	URLs         []string               `json:"urls,omitempty"`
+	Date         string                 `json:"date,omitempty"`
+	Details      string                 `json:"details,omitempty"`
+	Photographer string                 `json:"photographer,omitempty"`
+	Organized    bool                   `json:"organized,omitempty"`
+	OCounter     int                    `json:"o_counter,omitempty"`
+	Galleries    []GalleryRef           `json:"galleries,omitempty"`
+	Performers   []string               `json:"performers,omitempty"`
+	Tags         []string               `json:"tags,omitempty"`
+	Files        []string               `json:"files,omitempty"`
+	CreatedAt    json.JSONTime          `json:"created_at,omitempty"`
+	UpdatedAt    json.JSONTime          `json:"updated_at,omitempty"`
+	CustomFields map[string]interface{} `json:"custom_fields,omitempty"`
 }
 
 func (s Image) Filename(basename string, hash string) string {
diff --git a/pkg/models/mocks/ImageReaderWriter.go b/pkg/models/mocks/ImageReaderWriter.go
index afc5efdb7..f2c9934be 100644
--- a/pkg/models/mocks/ImageReaderWriter.go
+++ b/pkg/models/mocks/ImageReaderWriter.go
@@ -137,13 +137,13 @@ func (_m *ImageReaderWriter) CoverByGalleryID(ctx context.Context, galleryId int
 	return r0, r1
 }
 
-// Create provides a mock function with given fields: ctx, newImage, fileIDs
-func (_m *ImageReaderWriter) Create(ctx context.Context, newImage *models.Image, fileIDs []models.FileID) error {
-	ret := _m.Called(ctx, newImage, fileIDs)
+// Create provides a mock function with given fields: ctx, newImage
+func (_m *ImageReaderWriter) Create(ctx context.Context, newImage *models.CreateImageInput) error {
+	ret := _m.Called(ctx, newImage)
 
 	var r0 error
-	if rf, ok := ret.Get(0).(func(context.Context, *models.Image, []models.FileID) error); ok {
-		r0 = rf(ctx, newImage, fileIDs)
+	if rf, ok := ret.Get(0).(func(context.Context, *models.CreateImageInput) error); ok {
+		r0 = rf(ctx, newImage)
 	} else {
 		r0 = ret.Error(0)
 	}
@@ -393,6 +393,52 @@ func (_m *ImageReaderWriter) FindMany(ctx context.Context, ids []int) ([]*models
 	return r0, r1
 }
 
+// GetCustomFields provides a mock function with given fields: ctx, id
+func (_m *ImageReaderWriter) GetCustomFields(ctx context.Context, id int) (map[string]interface{}, error) {
+	ret := _m.Called(ctx, id)
+
+	var r0 map[string]interface{}
+	if rf, ok := ret.Get(0).(func(context.Context, int) map[string]interface{}); ok {
+		r0 = rf(ctx, id)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(map[string]interface{})
+		}
+	}
+
+	var r1 error
+	if rf, ok := ret.Get(1).(func(context.Context, int) error); ok {
+		r1 = rf(ctx, id)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// GetCustomFieldsBulk provides a mock function with given fields: ctx, ids
+func (_m *ImageReaderWriter) GetCustomFieldsBulk(ctx context.Context, ids []int) ([]models.CustomFieldMap, error) {
+	ret := _m.Called(ctx, ids)
+
+	var r0 []models.CustomFieldMap
+	if rf, ok := ret.Get(0).(func(context.Context, []int) []models.CustomFieldMap); ok {
+		r0 = rf(ctx, ids)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).([]models.CustomFieldMap)
+		}
+	}
+
+	var r1 error
+	if rf, ok := ret.Get(1).(func(context.Context, []int) error); ok {
+		r1 = rf(ctx, ids)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
 // GetFiles provides a mock function with given fields: ctx, relatedID
 func (_m *ImageReaderWriter) GetFiles(ctx context.Context, relatedID int) ([]models.File, error) {
 	ret := _m.Called(ctx, relatedID)
@@ -694,6 +740,20 @@ func (_m *ImageReaderWriter) ResetOCounter(ctx context.Context, id int) (int, er
 	return r0, r1
 }
 
+// SetCustomFields provides a mock function with given fields: ctx, id, fields
+func (_m *ImageReaderWriter) SetCustomFields(ctx context.Context, id int, fields models.CustomFieldsInput) error {
+	ret := _m.Called(ctx, id, fields)
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context, int, models.CustomFieldsInput) error); ok {
+		r0 = rf(ctx, id, fields)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
 // Size provides a mock function with given fields: ctx
 func (_m *ImageReaderWriter) Size(ctx context.Context) (float64, error) {
 	ret := _m.Called(ctx)
diff --git a/pkg/models/model_image.go b/pkg/models/model_image.go
index 1d0993536..72ca61826 100644
--- a/pkg/models/model_image.go
+++ b/pkg/models/model_image.go
@@ -47,6 +47,13 @@ func NewImage() Image {
 	}
 }
 
+type CreateImageInput struct {
+	*Image
+
+	FileIDs      []FileID
+	CustomFields map[string]interface{} `json:"custom_fields"`
+}
+
 type ImagePartial struct {
 	Title OptionalString
 	Code  OptionalString
@@ -66,6 +73,7 @@ type ImagePartial struct {
 	TagIDs        *UpdateIDs
 	PerformerIDs  *UpdateIDs
 	PrimaryFileID *FileID
+	CustomFields  CustomFieldsInput
 }
 
 func NewImagePartial() ImagePartial {
diff --git a/pkg/models/repository_image.go b/pkg/models/repository_image.go
index 672ecd063..99dab3479 100644
--- a/pkg/models/repository_image.go
+++ b/pkg/models/repository_image.go
@@ -43,7 +43,7 @@ type ImageCounter interface {
 
 // ImageCreator provides methods to create images.
 type ImageCreator interface {
-	Create(ctx context.Context, newImage *Image, fileIDs []FileID) error
+	Create(ctx context.Context, newImage *CreateImageInput) error
 }
 
 // ImageUpdater provides methods to update images.
@@ -78,6 +78,7 @@ type ImageReader interface {
 	FileLoader
 
 	GalleryCoverFinder
+	CustomFieldsReader
 
 	All(ctx context.Context) ([]*Image, error)
 	Size(ctx context.Context) (float64, error)
@@ -88,6 +89,7 @@ type ImageWriter interface {
 	ImageCreator
 	ImageUpdater
 	ImageDestroyer
+	CustomFieldsWriter
 
 	AddFileID(ctx context.Context, id int, fileID FileID) error
 	RemoveFileID(ctx context.Context, id int, fileID FileID) error
diff --git a/pkg/sqlite/custom_fields.go b/pkg/sqlite/custom_fields.go
index 63f85b250..d78e3f9ab 100644
--- a/pkg/sqlite/custom_fields.go
+++ b/pkg/sqlite/custom_fields.go
@@ -192,6 +192,10 @@ func (s *customFieldsStore) GetCustomFieldsBulk(ctx context.Context, ids []int)
 
 	const single = false
 	ret := make([]models.CustomFieldMap, len(ids))
+	// initialise ret with empty maps for each id
+	for i := range ret {
+		ret[i] = make(map[string]interface{})
+	}
 
 	idi := make(map[int]int, len(ids))
 	for i, id := range ids {
diff --git a/pkg/sqlite/custom_fields_test.go b/pkg/sqlite/custom_fields_test.go
index 2f7ecd7dc..5d5545210 100644
--- a/pkg/sqlite/custom_fields_test.go
+++ b/pkg/sqlite/custom_fields_test.go
@@ -247,6 +247,12 @@ func TestGallerySetCustomFields(t *testing.T) {
 	testSetCustomFields(t, "Gallery", db.Gallery, galleryIDs[galleryIdx], getGalleryCustomFields(galleryIdx))
 }
 
+func TestImageSetCustomFields(t *testing.T) {
+	imageIdx := imageIdx2WithGallery
+
+	testSetCustomFields(t, "Image", db.Image, imageIDs[imageIdx], getImageCustomFields(imageIdx))
+}
+
 func TestGroupSetCustomFields(t *testing.T) {
 	groupIdx := groupIdxWithScene
 
diff --git a/pkg/sqlite/database.go b/pkg/sqlite/database.go
index 000b91c4d..003c6eebc 100644
--- a/pkg/sqlite/database.go
+++ b/pkg/sqlite/database.go
@@ -34,7 +34,7 @@ const (
 	cacheSizeEnv = "STASH_SQLITE_CACHE_SIZE"
 )
 
-var appSchemaVersion uint = 82
+var appSchemaVersion uint = 83
 
 //go:embed migrations/*.sql
 var migrationsBox embed.FS
diff --git a/pkg/sqlite/image.go b/pkg/sqlite/image.go
index bcaf3f42f..da1c67a10 100644
--- a/pkg/sqlite/image.go
+++ b/pkg/sqlite/image.go
@@ -185,6 +185,8 @@ var (
 )
 
 type ImageStore struct {
+	customFieldsStore
+
 	tableMgr *table
 	oCounterManager
 
@@ -193,6 +195,10 @@ type ImageStore struct {
 
 func NewImageStore(r *storeRepository) *ImageStore {
 	return &ImageStore{
+		customFieldsStore: customFieldsStore{
+			table: imagesCustomFieldsTable,
+			fk:    imagesCustomFieldsTable.Col(imageIDColumn),
+		},
 		tableMgr:        imageTableMgr,
 		oCounterManager: oCounterManager{imageTableMgr},
 		repo:            r,
@@ -236,18 +242,18 @@ func (qb *ImageStore) selectDataset() *goqu.SelectDataset {
 	)
 }
 
-func (qb *ImageStore) Create(ctx context.Context, newObject *models.Image, fileIDs []models.FileID) error {
+func (qb *ImageStore) Create(ctx context.Context, newObject *models.CreateImageInput) error {
 	var r imageRow
-	r.fromImage(*newObject)
+	r.fromImage(*newObject.Image)
 
 	id, err := qb.tableMgr.insertID(ctx, r)
 	if err != nil {
 		return err
 	}
 
-	if len(fileIDs) > 0 {
+	if len(newObject.FileIDs) > 0 {
 		const firstPrimary = true
-		if err := imagesFilesTableMgr.insertJoins(ctx, id, firstPrimary, fileIDs); err != nil {
+		if err := imagesFilesTableMgr.insertJoins(ctx, id, firstPrimary, newObject.FileIDs); err != nil {
 			return err
 		}
 	}
@@ -276,12 +282,18 @@ func (qb *ImageStore) Create(ctx context.Context, newObject *models.Image, fileI
 		}
 	}
 
+	if err := qb.SetCustomFields(ctx, id, models.CustomFieldsInput{
+		Full: newObject.CustomFields,
+	}); err != nil {
+		return err
+	}
+
 	updated, err := qb.find(ctx, id)
 	if err != nil {
 		return fmt.Errorf("finding after create: %w", err)
 	}
 
-	*newObject = *updated
+	*newObject.Image = *updated
 
 	return nil
 }
@@ -329,6 +341,10 @@ func (qb *ImageStore) UpdatePartial(ctx context.Context, id int, partial models.
 		}
 	}
 
+	if err := qb.SetCustomFields(ctx, id, partial.CustomFields); err != nil {
+		return nil, err
+	}
+
 	return qb.find(ctx, id)
 }
 
diff --git a/pkg/sqlite/image_filter.go b/pkg/sqlite/image_filter.go
index b56ade26d..aafd2aa40 100644
--- a/pkg/sqlite/image_filter.go
+++ b/pkg/sqlite/image_filter.go
@@ -100,6 +100,13 @@ func (qb *imageFilterHandler) criterionHandler() criterionHandler {
 		&timestampCriterionHandler{imageFilter.CreatedAt, "images.created_at", nil},
 		&timestampCriterionHandler{imageFilter.UpdatedAt, "images.updated_at", nil},
 
+		&customFieldsFilterHandler{
+			table: imagesCustomFieldsTable.GetTable(),
+			fkCol: imageIDColumn,
+			c:     imageFilter.CustomFields,
+			idCol: "images.id",
+		},
+
 		&relatedFilterHandler{
 			relatedIDCol:   "galleries_images.gallery_id",
 			relatedRepo:    galleryRepository.repository,
diff --git a/pkg/sqlite/image_test.go b/pkg/sqlite/image_test.go
index aa4ed3b99..3bad40b3b 100644
--- a/pkg/sqlite/image_test.go
+++ b/pkg/sqlite/image_test.go
@@ -73,81 +73,94 @@ func Test_imageQueryBuilder_Create(t *testing.T) {
 
 	tests := []struct {
 		name      string
-		newObject models.Image
+		newObject models.CreateImageInput
 		wantErr   bool
 	}{
 		{
 			"full",
-			models.Image{
-				Title:        title,
-				Code:         code,
-				Rating:       &rating,
-				Date:         &date,
-				Details:      details,
-				Photographer: photographer,
-				URLs:         models.NewRelatedStrings([]string{url}),
-				Organized:    true,
-				OCounter:     ocounter,
-				StudioID:     &studioIDs[studioIdxWithImage],
-				CreatedAt:    createdAt,
-				UpdatedAt:    updatedAt,
-				GalleryIDs:   models.NewRelatedIDs([]int{galleryIDs[galleryIdxWithImage]}),
-				TagIDs:       models.NewRelatedIDs([]int{tagIDs[tagIdx1WithDupName], tagIDs[tagIdx1WithImage]}),
-				PerformerIDs: models.NewRelatedIDs([]int{performerIDs[performerIdx1WithImage], performerIDs[performerIdx1WithDupName]}),
+			models.CreateImageInput{
+				Image: &models.Image{
+					Title:        title,
+					Code:         code,
+					Rating:       &rating,
+					Date:         &date,
+					Details:      details,
+					Photographer: photographer,
+					URLs:         models.NewRelatedStrings([]string{url}),
+					Organized:    true,
+					OCounter:     ocounter,
+					StudioID:     &studioIDs[studioIdxWithImage],
+					CreatedAt:    createdAt,
+					UpdatedAt:    updatedAt,
+					GalleryIDs:   models.NewRelatedIDs([]int{galleryIDs[galleryIdxWithImage]}),
+					TagIDs:       models.NewRelatedIDs([]int{tagIDs[tagIdx1WithDupName], tagIDs[tagIdx1WithImage]}),
+					PerformerIDs: models.NewRelatedIDs([]int{performerIDs[performerIdx1WithImage], performerIDs[performerIdx1WithDupName]}),
+				},
+				CustomFields: testCustomFields,
 			},
 			false,
 		},
 		{
 			"with file",
-			models.Image{
-				Title:        title,
-				Code:         code,
-				Rating:       &rating,
-				Date:         &date,
-				Details:      details,
-				Photographer: photographer,
-				URLs:         models.NewRelatedStrings([]string{url}),
-				Organized:    true,
-				OCounter:     ocounter,
-				StudioID:     &studioIDs[studioIdxWithImage],
-				Files: models.NewRelatedFiles([]models.File{
-					imageFile.(*models.ImageFile),
-				}),
-				PrimaryFileID: &imageFile.Base().ID,
-				Path:          imageFile.Base().Path,
-				CreatedAt:     createdAt,
-				UpdatedAt:     updatedAt,
-				GalleryIDs:    models.NewRelatedIDs([]int{galleryIDs[galleryIdxWithImage]}),
-				TagIDs:        models.NewRelatedIDs([]int{tagIDs[tagIdx1WithDupName], tagIDs[tagIdx1WithImage]}),
-				PerformerIDs:  models.NewRelatedIDs([]int{performerIDs[performerIdx1WithImage], performerIDs[performerIdx1WithDupName]}),
+			models.CreateImageInput{
+				Image: &models.Image{
+					Title:        title,
+					Code:         code,
+					Rating:       &rating,
+					Date:         &date,
+					Details:      details,
+					Photographer: photographer,
+					URLs:         models.NewRelatedStrings([]string{url}),
+					Organized:    true,
+					OCounter:     ocounter,
+					StudioID:     &studioIDs[studioIdxWithImage],
+					Files: models.NewRelatedFiles([]models.File{
+						imageFile.(*models.ImageFile),
+					}),
+					PrimaryFileID: &imageFile.Base().ID,
+					Path:          imageFile.Base().Path,
+					CreatedAt:     createdAt,
+					UpdatedAt:     updatedAt,
+					GalleryIDs:    models.NewRelatedIDs([]int{galleryIDs[galleryIdxWithImage]}),
+					TagIDs:        models.NewRelatedIDs([]int{tagIDs[tagIdx1WithDupName], tagIDs[tagIdx1WithImage]}),
+					PerformerIDs:  models.NewRelatedIDs([]int{performerIDs[performerIdx1WithImage], performerIDs[performerIdx1WithDupName]}),
+				},
 			},
 			false,
 		},
 		{
 			"invalid studio id",
-			models.Image{
-				StudioID: &invalidID,
+			models.CreateImageInput{
+				Image: &models.Image{
+					StudioID: &invalidID,
+				},
 			},
 			true,
 		},
 		{
 			"invalid gallery id",
-			models.Image{
-				GalleryIDs: models.NewRelatedIDs([]int{invalidID}),
+			models.CreateImageInput{
+				Image: &models.Image{
+					GalleryIDs: models.NewRelatedIDs([]int{invalidID}),
+				},
 			},
 			true,
 		},
 		{
 			"invalid tag id",
-			models.Image{
-				TagIDs: models.NewRelatedIDs([]int{invalidID}),
+			models.CreateImageInput{
+				Image: &models.Image{
+					TagIDs: models.NewRelatedIDs([]int{invalidID}),
+				},
 			},
 			true,
 		},
 		{
 			"invalid performer id",
-			models.Image{
-				PerformerIDs: models.NewRelatedIDs([]int{invalidID}),
+			models.CreateImageInput{
+				Image: &models.Image{
+					PerformerIDs: models.NewRelatedIDs([]int{invalidID}),
+				},
 			},
 			true,
 		},
@@ -165,8 +178,11 @@ func Test_imageQueryBuilder_Create(t *testing.T) {
 					fileIDs = append(fileIDs, f.Base().ID)
 				}
 			}
-			s := tt.newObject
-			if err := qb.Create(ctx, &s, fileIDs); (err != nil) != tt.wantErr {
+			s := *tt.newObject.Image
+			if err := qb.Create(ctx, &models.CreateImageInput{
+				Image:   &s,
+				FileIDs: fileIDs,
+			}); (err != nil) != tt.wantErr {
 				t.Errorf("imageQueryBuilder.Create() error = %v, wantErr = %v", err, tt.wantErr)
 			}
 
@@ -177,7 +193,7 @@ func Test_imageQueryBuilder_Create(t *testing.T) {
 
 			assert.NotZero(s.ID)
 
-			copy := tt.newObject
+			copy := *tt.newObject.Image
 			copy.ID = s.ID
 
 			// load relationships
@@ -201,8 +217,6 @@ func Test_imageQueryBuilder_Create(t *testing.T) {
 			}
 
 			assert.Equal(copy, *found)
-
-			return
 		})
 	}
 }
@@ -387,8 +401,6 @@ func Test_imageQueryBuilder_Update(t *testing.T) {
 			}
 
 			assert.Equal(copy, *s)
-
-			return
 		})
 	}
 }
@@ -832,6 +844,79 @@ func Test_imageQueryBuilder_UpdatePartialRelationships(t *testing.T) {
 	}
 }
 
+func Test_ImageStore_UpdatePartialCustomFields(t *testing.T) {
+	tests := []struct {
+		name     string
+		id       int
+		partial  models.ImagePartial
+		expected map[string]interface{} // nil to use the partial
+	}{
+		{
+			"set custom fields",
+			imageIDs[imageIdx1WithGallery],
+			models.ImagePartial{
+				CustomFields: models.CustomFieldsInput{
+					Full: testCustomFields,
+				},
+			},
+			nil,
+		},
+		{
+			"clear custom fields",
+			imageIDs[imageIdx1WithGallery],
+			models.ImagePartial{
+				CustomFields: models.CustomFieldsInput{
+					Full: map[string]interface{}{},
+				},
+			},
+			nil,
+		},
+		{
+			"partial custom fields",
+			imageIDs[imageIdxWithStudio],
+			models.ImagePartial{
+				CustomFields: models.CustomFieldsInput{
+					Partial: map[string]interface{}{
+						"string":    "bbb",
+						"new_field": "new",
+					},
+				},
+			},
+			map[string]interface{}{
+				"int":       int64(2),
+				"real":      1.2,
+				"string":    "bbb",
+				"new_field": "new",
+			},
+		},
+	}
+	for _, tt := range tests {
+		qb := db.Image
+
+		runWithRollbackTxn(t, tt.name, func(t *testing.T, ctx context.Context) {
+			assert := assert.New(t)
+
+			_, err := qb.UpdatePartial(ctx, tt.id, tt.partial)
+			if err != nil {
+				t.Errorf("ImageStore.UpdatePartial() error = %v", err)
+				return
+			}
+
+			// ensure custom fields are correct
+			cf, err := qb.GetCustomFields(ctx, tt.id)
+			if err != nil {
+				t.Errorf("ImageStore.GetCustomFields() error = %v", err)
+				return
+			}
+			if tt.expected == nil {
+				assert.Equal(tt.partial.CustomFields.Full, cf)
+			} else {
+				assert.Equal(tt.expected, cf)
+			}
+		})
+	}
+}
+
 func Test_imageQueryBuilder_IncrementOCounter(t *testing.T) {
 	tests := []struct {
 		name    string
@@ -3018,6 +3103,252 @@ func TestImageQueryPagination(t *testing.T) {
 	})
 }
 
+func TestImageQueryCustomFields(t *testing.T) {
+	tests := []struct {
+		name        string
+		filter      *models.ImageFilterType
+		includeIdxs []int
+		excludeIdxs []int
+		wantErr     bool
+	}{
+		{
+			"equals",
+			&models.ImageFilterType{
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "string",
+						Modifier: models.CriterionModifierEquals,
+						Value:    []any{getImageStringValue(imageIdx1WithGallery, "custom")},
+					},
+				},
+			},
+			[]int{imageIdx1WithGallery},
+			nil,
+			false,
+		},
+		{
+			"not equals",
+			&models.ImageFilterType{
+				Title: &models.StringCriterionInput{
+					Value:    getImageStringValue(imageIdx1WithGallery, titleField),
+					Modifier: models.CriterionModifierEquals,
+				},
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "string",
+						Modifier: models.CriterionModifierNotEquals,
+						Value:    []any{getImageStringValue(imageIdx1WithGallery, "custom")},
+					},
+				},
+			},
+			nil,
+			[]int{imageIdx1WithGallery},
+			false,
+		},
+		{
+			"includes",
+			&models.ImageFilterType{
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "string",
+						Modifier: models.CriterionModifierIncludes,
+						Value:    []any{getImageStringValue(imageIdx1WithGallery, "custom")[9:]},
+					},
+				},
+			},
+			[]int{imageIdx1WithGallery},
+			nil,
+			false,
+		},
+		{
+			"excludes",
+			&models.ImageFilterType{
+				Title: &models.StringCriterionInput{
+					Value:    getImageStringValue(imageIdx1WithGallery, titleField),
+					Modifier: models.CriterionModifierEquals,
+				},
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "string",
+						Modifier: models.CriterionModifierExcludes,
+						Value:    []any{getImageStringValue(imageIdx1WithGallery, "custom")[9:]},
+					},
+				},
+			},
+			nil,
+			[]int{imageIdx1WithGallery},
+			false,
+		},
+		{
+			"regex",
+			&models.ImageFilterType{
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "string",
+						Modifier: models.CriterionModifierMatchesRegex,
+						Value:    []any{".*17_custom"},
+					},
+				},
+			},
+			[]int{imageIdxWithPerformerTag},
+			nil,
+			false,
+		},
+		{
+			"invalid regex",
+			&models.ImageFilterType{
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "string",
+						Modifier: models.CriterionModifierMatchesRegex,
+						Value:    []any{"["},
+					},
+				},
+			},
+			nil,
+			nil,
+			true,
+		},
+		{
+			"not matches regex",
+			&models.ImageFilterType{
+				Title: &models.StringCriterionInput{
+					Value:    getImageStringValue(imageIdxWithPerformerTag, titleField),
+					Modifier: models.CriterionModifierEquals,
+				},
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "string",
+						Modifier: models.CriterionModifierNotMatchesRegex,
+						Value:    []any{".*17_custom"},
+					},
+				},
+			},
+			nil,
+			[]int{imageIdxWithPerformerTag},
+			false,
+		},
+		{
+			"invalid not matches regex",
+			&models.ImageFilterType{
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "string",
+						Modifier: models.CriterionModifierNotMatchesRegex,
+						Value:    []any{"["},
+					},
+				},
+			},
+			nil,
+			nil,
+			true,
+		},
+		{
+			"null",
+			&models.ImageFilterType{
+				Title: &models.StringCriterionInput{
+					Value:    getImageStringValue(imageIdx1WithGallery, titleField),
+					Modifier: models.CriterionModifierEquals,
+				},
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "not existing",
+						Modifier: models.CriterionModifierIsNull,
+					},
+				},
+			},
+			[]int{imageIdx1WithGallery},
+			nil,
+			false,
+		},
+		{
+			"not null",
+			&models.ImageFilterType{
+				Title: &models.StringCriterionInput{
+					Value:    getImageStringValue(imageIdx1WithGallery, titleField),
+					Modifier: models.CriterionModifierEquals,
+				},
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "string",
+						Modifier: models.CriterionModifierNotNull,
+					},
+				},
+			},
+			[]int{imageIdx1WithGallery},
+			nil,
+			false,
+		},
+		{
+			"between",
+			&models.ImageFilterType{
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "real",
+						Modifier: models.CriterionModifierBetween,
+						Value:    []any{0.15, 0.25},
+					},
+				},
+			},
+			[]int{imageIdx2WithGallery},
+			nil,
+			false,
+		},
+		{
+			"not between",
+			&models.ImageFilterType{
+				Title: &models.StringCriterionInput{
+					Value:    getImageStringValue(imageIdx2WithGallery, titleField),
+					Modifier: models.CriterionModifierEquals,
+				},
+				CustomFields: []models.CustomFieldCriterionInput{
+					{
+						Field:    "real",
+						Modifier: models.CriterionModifierNotBetween,
+						Value:    []any{0.15, 0.25},
+					},
+				},
+			},
+			nil,
+			[]int{imageIdx2WithGallery},
+			false,
+		},
+	}
+
+	for _, tt := range tests {
+		runWithRollbackTxn(t, tt.name, func(t *testing.T, ctx context.Context) {
+			assert := assert.New(t)
+
+			result, err := db.Image.Query(ctx, models.ImageQueryOptions{
+				ImageFilter: tt.filter,
+			})
+			if (err != nil) != tt.wantErr {
+				t.Errorf("ImageStore.Query() error = %v, wantErr %v", err, tt.wantErr)
+			}
+
+			if err != nil {
+				return
+			}
+
+			images, err := result.Resolve(ctx)
+			if err != nil {
+				t.Errorf("ImageStore.Query().Resolve() error = %v", err)
+			}
+
+			ids := imagesToIDs(images)
+			include := indexesToIDs(imageIDs, tt.includeIdxs)
+			exclude := indexesToIDs(imageIDs, tt.excludeIdxs)
+
+			for _, i := range include {
+				assert.Contains(ids, i)
+			}
+			for _, e := range exclude {
+				assert.NotContains(ids, e)
+			}
+		})
+	}
+}
+
 // TODO Count
 // TODO SizeCount
 // TODO All
diff --git a/pkg/sqlite/migrations/83_image_custom_fields.up.sql b/pkg/sqlite/migrations/83_image_custom_fields.up.sql
new file mode 100644
index 000000000..0aa3aa4d7
--- /dev/null
+++ b/pkg/sqlite/migrations/83_image_custom_fields.up.sql
@@ -0,0 +1,9 @@
+CREATE TABLE `image_custom_fields` (
+  `image_id` integer NOT NULL,
+  `field` varchar(64) NOT NULL,
+  `value` BLOB NOT NULL,
+  PRIMARY KEY (`image_id`, `field`),
+  foreign key(`image_id`) references `images`(`id`) on delete CASCADE
+);
+
+CREATE INDEX `index_image_custom_fields_field_value` ON `image_custom_fields` (`field`, `value`);
diff --git a/pkg/sqlite/setup_test.go b/pkg/sqlite/setup_test.go
index 0078f1a67..2848a0a14 100644
--- a/pkg/sqlite/setup_test.go
+++ b/pkg/sqlite/setup_test.go
@@ -1247,6 +1247,18 @@ func getImageBasename(index int) string {
 	return getImageStringValue(index, pathField)
 }
 
+func getImageCustomFields(index int) map[string]interface{} {
+	if index%5 == 0 {
+		return nil
+	}
+
+	return map[string]interface{}{
+		"string": getImageStringValue(index, "custom"),
+		"int":    int64(index % 5),
+		"real":   float64(index) / 10,
+	}
+}
+
 func makeImageFile(i int) *models.ImageFile {
 	return &models.ImageFile{
 		BaseFile: &models.BaseFile{
@@ -1309,7 +1321,11 @@ func createImages(ctx context.Context, n int) error {
 
 		image := makeImage(i)
 
-		err := qb.Create(ctx, image, []models.FileID{f.ID})
+		err := qb.Create(ctx, &models.CreateImageInput{
+			Image:        image,
+			FileIDs:      []models.FileID{f.ID},
+			CustomFields: getImageCustomFields(i),
+		})
 
 		if err != nil {
 			return fmt.Errorf("Error creating image %v+: %s", image, err.Error())
diff --git a/pkg/sqlite/tables.go b/pkg/sqlite/tables.go
index 6c898048d..4c09113f0 100644
--- a/pkg/sqlite/tables.go
+++ b/pkg/sqlite/tables.go
@@ -14,6 +14,7 @@ var (
 	performersImagesJoinTable = goqu.T(performersImagesTable)
 	imagesFilesJoinTable      = goqu.T(imagesFilesTable)
 	imagesURLsJoinTable       = goqu.T(imagesURLsTable)
+	imagesCustomFieldsTable   = goqu.T("image_custom_fields")
 
 	galleriesFilesJoinTable      = goqu.T(galleriesFilesTable)
 	galleriesTagsJoinTable       = goqu.T(galleriesTagsTable)

From 410dd27d93bd3fce553902f334eccde0311f17da Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Wed, 25 Feb 2026 10:54:20 +1100
Subject: [PATCH 310/405] Fix misclicks resulting in navigating to new page
 during selection (#6599)

* Disable studio overlay link if selecting
* Prevent scene preview scrubber click navigating during selection
* Prevent gallery preview scrubber click navigating during selection
---
 .../src/components/Galleries/GalleryCard.tsx   | 17 +++++++++++++++--
 .../Galleries/GalleryPreviewScrubber.tsx       |  3 +++
 ui/v2.5/src/components/Images/ImageCard.tsx    |  8 +++++++-
 .../src/components/Scenes/PreviewScrubber.tsx  |  3 +++
 ui/v2.5/src/components/Scenes/SceneCard.tsx    | 18 ++++++++++++++++--
 .../Shared/GridCard/StudioOverlay.tsx          | 11 +++++++++--
 .../src/components/Shared/HoverScrubber.tsx    |  7 +++++++
 7 files changed, 60 insertions(+), 7 deletions(-)

diff --git a/ui/v2.5/src/components/Galleries/GalleryCard.tsx b/ui/v2.5/src/components/Galleries/GalleryCard.tsx
index e4e227f3e..01e0b6045 100644
--- a/ui/v2.5/src/components/Galleries/GalleryCard.tsx
+++ b/ui/v2.5/src/components/Galleries/GalleryCard.tsx
@@ -1,5 +1,5 @@
 import { Button, ButtonGroup, OverlayTrigger, Tooltip } from "react-bootstrap";
-import React, { useState } from "react";
+import React, { useMemo, useState } from "react";
 import * as GQL from "src/core/generated-graphql";
 import { GridCard } from "../Shared/GridCard/GridCard";
 import { HoverPopover } from "../Shared/HoverPopover";
@@ -21,11 +21,13 @@ import { PatchComponent } from "src/patch";
 interface IGalleryPreviewProps {
   gallery: GQL.SlimGalleryDataFragment;
   onScrubberClick?: (index: number) => void;
+  disabled?: boolean;
 }
 
 export const GalleryPreview: React.FC<IGalleryPreviewProps> = ({
   gallery,
   onScrubberClick,
+  disabled,
 }) => {
   const [imgSrc, setImgSrc] = useState<string | undefined>(
     gallery.paths.cover ?? undefined
@@ -48,6 +50,7 @@ export const GalleryPreview: React.FC<IGalleryPreviewProps> = ({
           imageCount={gallery.image_count}
           onClick={onScrubberClick}
           onPathChanged={setImgSrc}
+          disabled={disabled}
         />
       )}
     </div>
@@ -195,7 +198,16 @@ const GalleryCardDetails = PatchComponent(
 const GalleryCardOverlays = PatchComponent(
   "GalleryCard.Overlays",
   (props: IGalleryCardProps) => {
-    return <StudioOverlay studio={props.gallery.studio} />;
+    const ret = useMemo(() => {
+      return (
+        <StudioOverlay
+          studio={props.gallery.studio}
+          disabled={props.selecting}
+        />
+      );
+    }, [props.gallery.studio, props.selecting]);
+
+    return ret;
   }
 );
 
@@ -211,6 +223,7 @@ const GalleryCardImage = PatchComponent(
           onScrubberClick={(i) => {
             history.push(`/galleries/${props.gallery.id}/images/${i}`);
           }}
+          disabled={props.selecting}
         />
         <RatingBanner rating={props.gallery.rating100} />
       </>
diff --git a/ui/v2.5/src/components/Galleries/GalleryPreviewScrubber.tsx b/ui/v2.5/src/components/Galleries/GalleryPreviewScrubber.tsx
index ef47782bf..5c0a07356 100644
--- a/ui/v2.5/src/components/Galleries/GalleryPreviewScrubber.tsx
+++ b/ui/v2.5/src/components/Galleries/GalleryPreviewScrubber.tsx
@@ -10,6 +10,7 @@ export const GalleryPreviewScrubber: React.FC<{
   imageCount: number;
   onClick?: (imageIndex: number) => void;
   onPathChanged: React.Dispatch<React.SetStateAction<string | undefined>>;
+  disabled?: boolean;
 }> = ({
   className,
   previewPath,
@@ -17,6 +18,7 @@ export const GalleryPreviewScrubber: React.FC<{
   imageCount,
   onClick,
   onPathChanged,
+  disabled,
 }) => {
   const [activeIndex, setActiveIndex] = useState<number>();
   const debounceSetActiveIndex = useThrottle(setActiveIndex, 50);
@@ -48,6 +50,7 @@ export const GalleryPreviewScrubber: React.FC<{
         activeIndex={activeIndex}
         setActiveIndex={(i) => debounceSetActiveIndex(i)}
         onClick={onScrubberClick}
+        disabled={disabled}
       />
     </div>
   );
diff --git a/ui/v2.5/src/components/Images/ImageCard.tsx b/ui/v2.5/src/components/Images/ImageCard.tsx
index adaee9923..a1189c844 100644
--- a/ui/v2.5/src/components/Images/ImageCard.tsx
+++ b/ui/v2.5/src/components/Images/ImageCard.tsx
@@ -148,7 +148,13 @@ const ImageCardDetails = PatchComponent(
 const ImageCardOverlays = PatchComponent(
   "ImageCard.Overlays",
   (props: IImageCardProps) => {
-    return <StudioOverlay studio={props.image.studio} />;
+    const ret = useMemo(() => {
+      return (
+        <StudioOverlay studio={props.image.studio} disabled={props.selecting} />
+      );
+    }, [props.image.studio, props.selecting]);
+
+    return ret;
   }
 );
 
diff --git a/ui/v2.5/src/components/Scenes/PreviewScrubber.tsx b/ui/v2.5/src/components/Scenes/PreviewScrubber.tsx
index 8ecb6e557..8c9d3097d 100644
--- a/ui/v2.5/src/components/Scenes/PreviewScrubber.tsx
+++ b/ui/v2.5/src/components/Scenes/PreviewScrubber.tsx
@@ -13,6 +13,7 @@ import { HoverScrubber } from "../Shared/HoverScrubber";
 interface IScenePreviewProps {
   vttPath: string | undefined;
   onClick?: (timestamp: number) => void;
+  disabled?: boolean;
 }
 
 function scaleToFit(dimensions: { w: number; h: number }, bounds: DOMRect) {
@@ -32,6 +33,7 @@ const defaultSprites = 81; // 9x9 grid by default
 export const PreviewScrubber: React.FC<IScenePreviewProps> = ({
   vttPath,
   onClick,
+  disabled,
 }) => {
   const imageParentRef = useRef<HTMLDivElement>(null);
   const [style, setStyle] = useState({});
@@ -113,6 +115,7 @@ export const PreviewScrubber: React.FC<IScenePreviewProps> = ({
         activeIndex={activeIndex}
         setActiveIndex={(i) => debounceSetActiveIndex(i)}
         onClick={onScrubberClick}
+        disabled={disabled}
       />
     </div>
   );
diff --git a/ui/v2.5/src/components/Scenes/SceneCard.tsx b/ui/v2.5/src/components/Scenes/SceneCard.tsx
index 2cb4a9af3..b7c263168 100644
--- a/ui/v2.5/src/components/Scenes/SceneCard.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneCard.tsx
@@ -38,6 +38,7 @@ interface IScenePreviewProps {
   soundActive: boolean;
   vttPath?: string;
   onScrubberClick?: (timestamp: number) => void;
+  disabled?: boolean;
 }
 
 export const ScenePreview: React.FC<IScenePreviewProps> = ({
@@ -47,6 +48,7 @@ export const ScenePreview: React.FC<IScenePreviewProps> = ({
   soundActive,
   vttPath,
   onScrubberClick,
+  disabled,
 }) => {
   const videoEl = useRef<HTMLVideoElement>(null);
 
@@ -86,7 +88,11 @@ export const ScenePreview: React.FC<IScenePreviewProps> = ({
         ref={videoEl}
         src={video}
       />
-      <PreviewScrubber vttPath={vttPath} onClick={onScrubberClick} />
+      <PreviewScrubber
+        vttPath={vttPath}
+        onClick={onScrubberClick}
+        disabled={disabled}
+      />
     </div>
   );
 };
@@ -336,7 +342,13 @@ const SceneCardDetails = PatchComponent(
 const SceneCardOverlays = PatchComponent(
   "SceneCard.Overlays",
   (props: ISceneCardProps) => {
-    return <StudioOverlay studio={props.scene.studio} />;
+    const ret = useMemo(() => {
+      return (
+        <StudioOverlay studio={props.scene.studio} disabled={props.selecting} />
+      );
+    }, [props.scene.studio, props.selecting]);
+
+    return ret;
   }
 );
 
@@ -390,6 +402,7 @@ const SceneCardImage = PatchComponent(
     }
 
     function onScrubberClick(timestamp: number) {
+      if (props.selecting) return;
       const link = props.queue
         ? props.queue.makeLink(props.scene.id, {
             sceneIndex: props.index,
@@ -416,6 +429,7 @@ const SceneCardImage = PatchComponent(
           soundActive={configuration?.interface?.soundOnPreview ?? false}
           vttPath={props.scene.paths.vtt ?? undefined}
           onScrubberClick={onScrubberClick}
+          disabled={props.selecting}
         />
         <RatingBanner rating={props.scene.rating100} />
         {maybeRenderSceneSpecsOverlay()}
diff --git a/ui/v2.5/src/components/Shared/GridCard/StudioOverlay.tsx b/ui/v2.5/src/components/Shared/GridCard/StudioOverlay.tsx
index 9bfd25071..6fe07a454 100644
--- a/ui/v2.5/src/components/Shared/GridCard/StudioOverlay.tsx
+++ b/ui/v2.5/src/components/Shared/GridCard/StudioOverlay.tsx
@@ -10,7 +10,8 @@ interface IStudio {
 
 export const StudioOverlay: React.FC<{
   studio: IStudio | null | undefined;
-}> = ({ studio }) => {
+  disabled?: boolean;
+}> = ({ studio, disabled }) => {
   const { configuration } = useConfigurationContext();
 
   const configValue = configuration?.interface.showStudioAsText;
@@ -29,12 +30,18 @@ export const StudioOverlay: React.FC<{
     return false;
   }, [configValue, studio?.image_path]);
 
+  function onClick(e: React.MouseEvent<HTMLAnchorElement, MouseEvent>) {
+    if (disabled) {
+      e.preventDefault();
+    }
+  }
+
   if (!studio) return <></>;
 
   return (
     // this class name is incorrect
     <div className="studio-overlay">
-      <Link to={`/studios/${studio.id}`}>
+      <Link to={`/studios/${studio.id}`} onClick={onClick}>
         {showStudioAsText ? (
           studio.name
         ) : (
diff --git a/ui/v2.5/src/components/Shared/HoverScrubber.tsx b/ui/v2.5/src/components/Shared/HoverScrubber.tsx
index 7c07e8adc..17c0ed79e 100644
--- a/ui/v2.5/src/components/Shared/HoverScrubber.tsx
+++ b/ui/v2.5/src/components/Shared/HoverScrubber.tsx
@@ -9,6 +9,7 @@ interface IHoverScrubber {
   activeIndex: number | undefined;
   setActiveIndex: (index: number | undefined) => void;
   onClick?: (index: number) => void;
+  disabled?: boolean;
 }
 
 export const HoverScrubber: React.FC<IHoverScrubber> = ({
@@ -16,6 +17,7 @@ export const HoverScrubber: React.FC<IHoverScrubber> = ({
   activeIndex,
   setActiveIndex,
   onClick,
+  disabled,
 }) => {
   function getActiveIndex(
     e:
@@ -69,6 +71,11 @@ export const HoverScrubber: React.FC<IHoverScrubber> = ({
       | React.TouchEvent<HTMLDivElement>
   ) {
     if (!onClick) return;
+    if (disabled) {
+      // allow propagation up so that selection still works
+      e.preventDefault();
+      return;
+    }
 
     const relatedTarget = e.currentTarget;
 

From 14105a2d54d77324ad90a994f586bd5d0705a14b Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Wed, 25 Feb 2026 10:54:40 +1100
Subject: [PATCH 311/405] Rename checksum and hash fields (#6600)

Checksum -> MD5 Checksum
Hash -> oshash with hover showing OpenSubtitles Hash.
Also internationalised perceptual hash hover text.
---
 .../Images/ImageDetails/ImageFileInfoPanel.tsx        |  7 ++++---
 .../Scenes/SceneDetails/SceneFileInfoPanel.tsx        | 11 ++++++++---
 ui/v2.5/src/locales/en-GB.json                        |  6 ++++--
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/ui/v2.5/src/components/Images/ImageDetails/ImageFileInfoPanel.tsx b/ui/v2.5/src/components/Images/ImageDetails/ImageFileInfoPanel.tsx
index c346cf874..097a64340 100644
--- a/ui/v2.5/src/components/Images/ImageDetails/ImageFileInfoPanel.tsx
+++ b/ui/v2.5/src/components/Images/ImageDetails/ImageFileInfoPanel.tsx
@@ -1,6 +1,6 @@
 import React, { useState } from "react";
 import { Accordion, Button, Card } from "react-bootstrap";
-import { FormattedMessage, FormattedTime } from "react-intl";
+import { FormattedMessage, FormattedTime, useIntl } from "react-intl";
 import { TruncatedText } from "src/components/Shared/TruncatedText";
 import { DeleteFilesDialog } from "src/components/Shared/DeleteFilesDialog";
 import { RevealInFilesystemButton } from "src/components/Shared/RevealInFilesystemButton";
@@ -24,6 +24,7 @@ interface IFileInfoPanelProps {
 const FileInfoPanel: React.FC<IFileInfoPanelProps> = (
   props: IFileInfoPanelProps
 ) => {
+  const intl = useIntl();
   const checksum = props.file.fingerprints.find((f) => f.type === "md5");
   const phash = props.file.fingerprints.find((f) => f.type === "phash");
 
@@ -38,10 +39,10 @@ const FileInfoPanel: React.FC<IFileInfoPanelProps> = (
             </dd>
           </>
         )}
-        <TextField id="media_info.checksum" value={checksum?.value} truncate />
+        <TextField id="media_info.md5" value={checksum?.value} truncate />
         <URLField
           id="media_info.phash"
-          abbr="Perceptual hash"
+          abbr={intl.formatMessage({ id: "media_info.phash_meaning" })}
           value={phash?.value}
           url={NavUtils.makeImagesPHashMatchUrl(phash?.value)}
           target="_self"
diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/SceneFileInfoPanel.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/SceneFileInfoPanel.tsx
index 6be55925e..cd11a2c8a 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/SceneFileInfoPanel.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/SceneFileInfoPanel.tsx
@@ -60,11 +60,16 @@ const FileInfoPanel: React.FC<IFileInfoPanelProps> = (
             </dd>
           </>
         )}
-        <TextField id="media_info.hash" value={oshash?.value} truncate />
-        <TextField id="media_info.checksum" value={checksum?.value} truncate />
+        <TextField
+          id="media_info.oshash"
+          abbr={intl.formatMessage({ id: "media_info.oshash_meaning" })}
+          value={oshash?.value}
+          truncate
+        />
+        <TextField id="media_info.md5" value={checksum?.value} truncate />
         <URLField
           id="media_info.phash"
-          abbr="Perceptual hash"
+          abbr={intl.formatMessage({ id: "media_info.phash_meaning" })}
           value={phash?.value}
           url={NavUtils.makeScenesPHashMatchUrl(phash?.value)}
           target="_self"
diff --git a/ui/v2.5/src/locales/en-GB.json b/ui/v2.5/src/locales/en-GB.json
index 957bf2837..629f1ece8 100644
--- a/ui/v2.5/src/locales/en-GB.json
+++ b/ui/v2.5/src/locales/en-GB.json
@@ -1254,16 +1254,18 @@
   "measurements": "Measurements",
   "media_info": {
     "audio_codec": "Audio Codec",
-    "checksum": "Checksum",
     "downloaded_from": "Downloaded From",
-    "hash": "Hash",
     "interactive_speed": "Interactive Speed",
+    "md5": "MD5 Checksum",
     "o_count": "O Count",
+    "oshash": "oshash",
+    "oshash_meaning": "OpenSubtitles Hash",
     "performer_card": {
       "age": "{age} {years_old}",
       "age_context": "{age} {years_old} at production"
     },
     "phash": "PHash",
+    "phash_meaning": "Perceptual Hash",
     "play_count": "Play Count",
     "play_duration": "Play Duration",
     "stream": "Stream",

From 0103fe47515aa24683b3271f6ad198fd82d8166d Mon Sep 17 00:00:00 2001
From: Gykes <24581046+Gykes@users.noreply.github.com>
Date: Tue, 24 Feb 2026 16:39:14 -0800
Subject: [PATCH 312/405] FR: Tags Tagger (#6559)

* Refactor Tagger components
* condense localization
* add alias and description to model and schema
---
 graphql/schema/schema.graphql                 |   2 +
 graphql/schema/types/scraper.graphql          |   2 +
 graphql/stash-box/query.graphql               |   2 +
 internal/api/resolver_mutation_stash_box.go   |  10 +
 internal/manager/manager_tasks.go             | 130 +++
 internal/manager/task_stash_box_tag.go        | 173 ++++
 pkg/models/mocks/TagReaderWriter.go           |  23 +
 pkg/models/model_scraped_item.go              |  52 +-
 pkg/models/repository_tag.go                  |   1 +
 pkg/sqlite/tag.go                             |  30 +
 pkg/stashbox/graphql/generated_client.go      |  28 +-
 pkg/stashbox/tag.go                           |  25 +-
 ui/v2.5/graphql/data/scrapers.graphql         |   2 +
 ui/v2.5/graphql/mutations/stash-box.graphql   |   4 +
 .../Shared/ScrapeDialog/ScrapedObjectsRow.tsx |   8 +-
 ...merFieldSelector.tsx => FieldSelector.tsx} |  13 +-
 .../Config.tsx => TaggerConfig.tsx}           |  51 +-
 ui/v2.5/src/components/Tagger/constants.ts    |   4 +
 .../Tagger/performers/PerformerTagger.tsx     |  12 +-
 ui/v2.5/src/components/Tagger/queries.ts      |  41 +
 .../src/components/Tagger/studios/Config.tsx  | 130 ---
 .../Tagger/studios/StudioFieldSelector.tsx    |  68 --
 .../Tagger/studios/StudioTagger.tsx           |  34 +-
 .../Tagger/tags/StashSearchResult.tsx         | 119 +++
 .../src/components/Tagger/tags/TagModal.tsx   | 144 ++++
 .../src/components/Tagger/tags/TagTagger.tsx  | 758 ++++++++++++++++++
 ui/v2.5/src/components/Tagger/utils.ts        |  30 +-
 ui/v2.5/src/components/Tags/TagList.tsx       |   4 +
 ui/v2.5/src/core/StashService.ts              |   6 +
 ui/v2.5/src/locales/en-GB.json                |  52 +-
 ui/v2.5/src/models/list-filter/tags.ts        |   6 +-
 31 files changed, 1702 insertions(+), 262 deletions(-)
 rename ui/v2.5/src/components/Tagger/{PerformerFieldSelector.tsx => FieldSelector.tsx} (84%)
 rename ui/v2.5/src/components/Tagger/{performers/Config.tsx => TaggerConfig.tsx} (69%)
 delete mode 100644 ui/v2.5/src/components/Tagger/studios/Config.tsx
 delete mode 100644 ui/v2.5/src/components/Tagger/studios/StudioFieldSelector.tsx
 create mode 100644 ui/v2.5/src/components/Tagger/tags/StashSearchResult.tsx
 create mode 100644 ui/v2.5/src/components/Tagger/tags/TagModal.tsx
 create mode 100644 ui/v2.5/src/components/Tagger/tags/TagTagger.tsx

diff --git a/graphql/schema/schema.graphql b/graphql/schema/schema.graphql
index 996afefe7..7f07e4579 100644
--- a/graphql/schema/schema.graphql
+++ b/graphql/schema/schema.graphql
@@ -583,6 +583,8 @@ type Mutation {
   stashBoxBatchPerformerTag(input: StashBoxBatchTagInput!): String!
   "Run batch studio tag task. Returns the job ID."
   stashBoxBatchStudioTag(input: StashBoxBatchTagInput!): String!
+  "Run batch tag tag task. Returns the job ID."
+  stashBoxBatchTagTag(input: StashBoxBatchTagInput!): String!
 
   "Enables DLNA for an optional duration. Has no effect if DLNA is enabled by default"
   enableDLNA(input: EnableDLNAInput!): Boolean!
diff --git a/graphql/schema/types/scraper.graphql b/graphql/schema/types/scraper.graphql
index 9c0e33fdf..b8810aa79 100644
--- a/graphql/schema/types/scraper.graphql
+++ b/graphql/schema/types/scraper.graphql
@@ -71,6 +71,8 @@ type ScrapedTag {
   "Set if tag matched"
   stored_id: ID
   name: String!
+  description: String
+  alias_list: [String!]
   "Remote site ID, if applicable"
   remote_site_id: String
 }
diff --git a/graphql/stash-box/query.graphql b/graphql/stash-box/query.graphql
index e2686ac4d..edd44c835 100644
--- a/graphql/stash-box/query.graphql
+++ b/graphql/stash-box/query.graphql
@@ -29,6 +29,8 @@ fragment StudioFragment on Studio {
 fragment TagFragment on Tag {
   name
   id
+  description
+  aliases
 }
 
 fragment MeasurementsFragment on Measurements {
diff --git a/internal/api/resolver_mutation_stash_box.go b/internal/api/resolver_mutation_stash_box.go
index 436937511..6d2ab84fd 100644
--- a/internal/api/resolver_mutation_stash_box.go
+++ b/internal/api/resolver_mutation_stash_box.go
@@ -58,6 +58,16 @@ func (r *mutationResolver) StashBoxBatchStudioTag(ctx context.Context, input man
 	return strconv.Itoa(jobID), nil
 }
 
+func (r *mutationResolver) StashBoxBatchTagTag(ctx context.Context, input manager.StashBoxBatchTagInput) (string, error) {
+	b, err := resolveStashBoxBatchTagInput(input.Endpoint, input.StashBoxEndpoint) //nolint:staticcheck
+	if err != nil {
+		return "", err
+	}
+
+	jobID := manager.GetInstance().StashBoxBatchTagTag(ctx, b, input)
+	return strconv.Itoa(jobID), nil
+}
+
 func (r *mutationResolver) SubmitStashBoxSceneDraft(ctx context.Context, input StashBoxDraftSubmissionInput) (*string, error) {
 	b, err := resolveStashBox(input.StashBoxIndex, input.StashBoxEndpoint)
 	if err != nil {
diff --git a/internal/manager/manager_tasks.go b/internal/manager/manager_tasks.go
index bac726c1b..e97227fcf 100644
--- a/internal/manager/manager_tasks.go
+++ b/internal/manager/manager_tasks.go
@@ -704,3 +704,133 @@ func (s *Manager) StashBoxBatchStudioTag(ctx context.Context, box *models.StashB
 
 	return s.JobManager.Add(ctx, "Batch stash-box studio tag...", j)
 }
+
+func (s *Manager) batchTagTagsByIds(ctx context.Context, input StashBoxBatchTagInput, box *models.StashBox) ([]Task, error) {
+	var tasks []Task
+
+	err := s.Repository.WithTxn(ctx, func(ctx context.Context) error {
+		tagQuery := s.Repository.Tag
+
+		for _, tagID := range input.Ids {
+			if id, err := strconv.Atoi(tagID); err == nil {
+				t, err := tagQuery.Find(ctx, id)
+				if err != nil {
+					return err
+				}
+
+				if err := t.LoadStashIDs(ctx, tagQuery); err != nil {
+					return fmt.Errorf("loading tag stash ids: %w", err)
+				}
+
+				hasStashID := t.StashIDs.ForEndpoint(box.Endpoint) != nil
+				if (input.Refresh && hasStashID) || (!input.Refresh && !hasStashID) {
+					tasks = append(tasks, &stashBoxBatchTagTagTask{
+						tag:            t,
+						box:            box,
+						excludedFields: input.ExcludeFields,
+					})
+				}
+			}
+		}
+		return nil
+	})
+
+	return tasks, err
+}
+
+func (s *Manager) batchTagTagsByNamesOrStashIds(input StashBoxBatchTagInput, box *models.StashBox) []Task {
+	var tasks []Task
+
+	for i := range input.StashIDs {
+		stashID := input.StashIDs[i]
+		if len(stashID) > 0 {
+			tasks = append(tasks, &stashBoxBatchTagTagTask{
+				stashID:        &stashID,
+				box:            box,
+				excludedFields: input.ExcludeFields,
+			})
+		}
+	}
+
+	for i := range input.Names {
+		name := input.Names[i]
+		if len(name) > 0 {
+			tasks = append(tasks, &stashBoxBatchTagTagTask{
+				name:           &name,
+				box:            box,
+				excludedFields: input.ExcludeFields,
+			})
+		}
+	}
+
+	return tasks
+}
+
+func (s *Manager) batchTagAllTags(ctx context.Context, input StashBoxBatchTagInput, box *models.StashBox) ([]Task, error) {
+	var tasks []Task
+
+	err := s.Repository.WithTxn(ctx, func(ctx context.Context) error {
+		tagQuery := s.Repository.Tag
+		var tags []*models.Tag
+		var err error
+
+		tags, err = tagQuery.FindByStashIDStatus(ctx, input.Refresh, box.Endpoint)
+
+		if err != nil {
+			return fmt.Errorf("error querying tags: %v", err)
+		}
+
+		for _, t := range tags {
+			tasks = append(tasks, &stashBoxBatchTagTagTask{
+				tag:            t,
+				box:            box,
+				excludedFields: input.ExcludeFields,
+			})
+		}
+		return nil
+	})
+
+	return tasks, err
+}
+
+func (s *Manager) StashBoxBatchTagTag(ctx context.Context, box *models.StashBox, input StashBoxBatchTagInput) int {
+	j := job.MakeJobExec(func(ctx context.Context, progress *job.Progress) error {
+		logger.Infof("Initiating stash-box batch tag tag")
+
+		var tasks []Task
+		var err error
+
+		switch input.getBatchTagType(false) {
+		case batchTagByIds:
+			tasks, err = s.batchTagTagsByIds(ctx, input, box)
+		case batchTagByNamesOrStashIds:
+			tasks = s.batchTagTagsByNamesOrStashIds(input, box)
+		case batchTagAll:
+			tasks, err = s.batchTagAllTags(ctx, input, box)
+		}
+
+		if err != nil {
+			return err
+		}
+
+		if len(tasks) == 0 {
+			return nil
+		}
+
+		progress.SetTotal(len(tasks))
+
+		logger.Infof("Starting stash-box batch operation for %d tags", len(tasks))
+
+		for _, task := range tasks {
+			progress.ExecuteTask(task.GetDescription(), func() {
+				task.Start(ctx)
+			})
+
+			progress.Increment()
+		}
+
+		return nil
+	})
+
+	return s.JobManager.Add(ctx, "Batch stash-box tag tag...", j)
+}
diff --git a/internal/manager/task_stash_box_tag.go b/internal/manager/task_stash_box_tag.go
index 4848b46ad..97c766010 100644
--- a/internal/manager/task_stash_box_tag.go
+++ b/internal/manager/task_stash_box_tag.go
@@ -12,6 +12,7 @@ import (
 	"github.com/stashapp/stash/pkg/sliceutil"
 	"github.com/stashapp/stash/pkg/stashbox"
 	"github.com/stashapp/stash/pkg/studio"
+	"github.com/stashapp/stash/pkg/tag"
 )
 
 // stashBoxBatchPerformerTagTask is used to tag or create performers from stash-box.
@@ -529,3 +530,175 @@ func (t *stashBoxBatchStudioTagTask) processParentStudio(ctx context.Context, pa
 		return err
 	}
 }
+
+// stashBoxBatchTagTagTask is used to tag or create tags from stash-box.
+//
+// Two modes of operation:
+//   - Update existing tag: set tag to update from stash-box data
+//   - Create new tag: set name or stashID to search stash-box and create locally
+type stashBoxBatchTagTagTask struct {
+	box            *models.StashBox
+	name           *string
+	stashID        *string
+	tag            *models.Tag
+	excludedFields []string
+}
+
+func (t *stashBoxBatchTagTagTask) getName() string {
+	switch {
+	case t.name != nil:
+		return *t.name
+	case t.stashID != nil:
+		return *t.stashID
+	case t.tag != nil:
+		return t.tag.Name
+	default:
+		return ""
+	}
+}
+
+func (t *stashBoxBatchTagTagTask) Start(ctx context.Context) {
+	scrapedTag, err := t.findStashBoxTag(ctx)
+	if err != nil {
+		logger.Errorf("Error fetching tag data from stash-box: %v", err)
+		return
+	}
+
+	excluded := map[string]bool{}
+	for _, field := range t.excludedFields {
+		excluded[field] = true
+	}
+
+	if scrapedTag != nil {
+		t.processMatchedTag(ctx, scrapedTag, excluded)
+	} else {
+		logger.Infof("No match found for %s", t.getName())
+	}
+}
+
+func (t *stashBoxBatchTagTagTask) GetDescription() string {
+	return fmt.Sprintf("Tagging tag %s from stash-box", t.getName())
+}
+
+func (t *stashBoxBatchTagTagTask) findStashBoxTag(ctx context.Context) (*models.ScrapedTag, error) {
+	var results []*models.ScrapedTag
+	var err error
+
+	r := instance.Repository
+
+	client := stashbox.NewClient(*t.box, stashbox.ExcludeTagPatterns(instance.Config.GetScraperExcludeTagPatterns()))
+
+	switch {
+	case t.name != nil:
+		results, err = client.QueryTag(ctx, *t.name)
+	case t.stashID != nil:
+		results, err = client.QueryTag(ctx, *t.stashID)
+	case t.tag != nil:
+		var remoteID string
+		if err := r.WithReadTxn(ctx, func(ctx context.Context) error {
+			if !t.tag.StashIDs.Loaded() {
+				err = t.tag.LoadStashIDs(ctx, r.Tag)
+				if err != nil {
+					return err
+				}
+			}
+			for _, id := range t.tag.StashIDs.List() {
+				if id.Endpoint == t.box.Endpoint {
+					remoteID = id.StashID
+				}
+			}
+			return nil
+		}); err != nil {
+			return nil, err
+		}
+
+		if remoteID != "" {
+			results, err = client.QueryTag(ctx, remoteID)
+		} else {
+			results, err = client.QueryTag(ctx, t.tag.Name)
+		}
+	}
+
+	if err != nil {
+		return nil, err
+	}
+
+	if len(results) == 0 {
+		return nil, nil
+	}
+
+	result := results[0]
+
+	if err := r.WithReadTxn(ctx, func(ctx context.Context) error {
+		return match.ScrapedTag(ctx, r.Tag, result, t.box.Endpoint)
+	}); err != nil {
+		return nil, err
+	}
+
+	return result, nil
+}
+
+func (t *stashBoxBatchTagTagTask) processMatchedTag(ctx context.Context, s *models.ScrapedTag, excluded map[string]bool) {
+	// Determine the tag ID to update — either from the task's tag or from the
+	// StoredID set by match.ScrapedTag (when batch adding by name and the tag
+	// already exists locally).
+	tagID := 0
+	if t.tag != nil {
+		tagID = t.tag.ID
+	} else if s.StoredID != nil {
+		tagID, _ = strconv.Atoi(*s.StoredID)
+	}
+
+	if tagID > 0 {
+		r := instance.Repository
+		err := r.WithTxn(ctx, func(ctx context.Context) error {
+			qb := r.Tag
+
+			existingStashIDs, err := qb.GetStashIDs(ctx, tagID)
+			if err != nil {
+				return err
+			}
+
+			storedID := strconv.Itoa(tagID)
+			partial := s.ToPartial(storedID, t.box.Endpoint, excluded, existingStashIDs)
+
+			if err := tag.ValidateUpdate(ctx, tagID, partial, qb); err != nil {
+				return err
+			}
+
+			if _, err := qb.UpdatePartial(ctx, tagID, partial); err != nil {
+				return err
+			}
+
+			return nil
+		})
+		if err != nil {
+			logger.Errorf("Failed to update tag %s: %v", s.Name, err)
+		} else {
+			logger.Infof("Updated tag %s", s.Name)
+		}
+	} else if s.Name != "" {
+		// no existing tag, create a new one
+		newTag := s.ToTag(t.box.Endpoint, excluded)
+
+		r := instance.Repository
+		err := r.WithTxn(ctx, func(ctx context.Context) error {
+			qb := r.Tag
+
+			if err := tag.ValidateCreate(ctx, *newTag, qb); err != nil {
+				return err
+			}
+
+			if err := qb.Create(ctx, &models.CreateTagInput{Tag: newTag}); err != nil {
+				return err
+			}
+
+			return nil
+		})
+		if err != nil {
+			logger.Errorf("Failed to create tag %s: %v", s.Name, err)
+		} else {
+			logger.Infof("Created tag %s", s.Name)
+		}
+	}
+}
diff --git a/pkg/models/mocks/TagReaderWriter.go b/pkg/models/mocks/TagReaderWriter.go
index 95a3b7a87..c4423ee52 100644
--- a/pkg/models/mocks/TagReaderWriter.go
+++ b/pkg/models/mocks/TagReaderWriter.go
@@ -450,6 +450,29 @@ func (_m *TagReaderWriter) FindByStashID(ctx context.Context, stashID models.Sta
 	return r0, r1
 }
 
+// FindByStashIDStatus provides a mock function with given fields: ctx, hasStashID, stashboxEndpoint
+func (_m *TagReaderWriter) FindByStashIDStatus(ctx context.Context, hasStashID bool, stashboxEndpoint string) ([]*models.Tag, error) {
+	ret := _m.Called(ctx, hasStashID, stashboxEndpoint)
+
+	var r0 []*models.Tag
+	if rf, ok := ret.Get(0).(func(context.Context, bool, string) []*models.Tag); ok {
+		r0 = rf(ctx, hasStashID, stashboxEndpoint)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).([]*models.Tag)
+		}
+	}
+
+	var r1 error
+	if rf, ok := ret.Get(1).(func(context.Context, bool, string) error); ok {
+		r1 = rf(ctx, hasStashID, stashboxEndpoint)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
 // FindByStudioID provides a mock function with given fields: ctx, studioID
 func (_m *TagReaderWriter) FindByStudioID(ctx context.Context, studioID int) ([]*models.Tag, error) {
 	ret := _m.Called(ctx, studioID)
diff --git a/pkg/models/model_scraped_item.go b/pkg/models/model_scraped_item.go
index 3c0e083c1..1367003cb 100644
--- a/pkg/models/model_scraped_item.go
+++ b/pkg/models/model_scraped_item.go
@@ -471,9 +471,11 @@ func (p *ScrapedPerformer) ToPartial(endpoint string, excluded map[string]bool,
 
 type ScrapedTag struct {
 	// Set if tag matched
-	StoredID     *string `json:"stored_id"`
-	Name         string  `json:"name"`
-	RemoteSiteID *string `json:"remote_site_id"`
+	StoredID     *string  `json:"stored_id"`
+	Name         string   `json:"name"`
+	Description  *string  `json:"description"`
+	AliasList    []string `json:"alias_list"`
+	RemoteSiteID *string  `json:"remote_site_id"`
 }
 
 func (ScrapedTag) IsScrapedContent() {}
@@ -482,6 +484,17 @@ func (t *ScrapedTag) ToTag(endpoint string, excluded map[string]bool) *Tag {
 	currentTime := time.Now()
 	ret := NewTag()
 	ret.Name = t.Name
+	ret.ParentIDs = NewRelatedIDs([]int{})
+	ret.ChildIDs = NewRelatedIDs([]int{})
+	ret.Aliases = NewRelatedStrings([]string{})
+
+	if t.Description != nil && !excluded["description"] {
+		ret.Description = *t.Description
+	}
+
+	if len(t.AliasList) > 0 && !excluded["aliases"] {
+		ret.Aliases = NewRelatedStrings(t.AliasList)
+	}
 
 	if t.RemoteSiteID != nil && endpoint != "" && *t.RemoteSiteID != "" {
 		ret.StashIDs = NewRelatedStashIDs([]StashID{
@@ -496,6 +509,39 @@ func (t *ScrapedTag) ToTag(endpoint string, excluded map[string]bool) *Tag {
 	return &ret
 }
 
+func (t *ScrapedTag) ToPartial(storedID string, endpoint string, excluded map[string]bool, existingStashIDs []StashID) TagPartial {
+	ret := NewTagPartial()
+
+	if t.Name != "" && !excluded["name"] {
+		ret.Name = NewOptionalString(t.Name)
+	}
+
+	if t.Description != nil && !excluded["description"] {
+		ret.Description = NewOptionalString(*t.Description)
+	}
+
+	if len(t.AliasList) > 0 && !excluded["aliases"] {
+		ret.Aliases = &UpdateStrings{
+			Values: t.AliasList,
+			Mode:   RelationshipUpdateModeSet,
+		}
+	}
+
+	if t.RemoteSiteID != nil && endpoint != "" && *t.RemoteSiteID != "" {
+		ret.StashIDs = &UpdateStashIDs{
+			StashIDs: existingStashIDs,
+			Mode:     RelationshipUpdateModeSet,
+		}
+		ret.StashIDs.Set(StashID{
+			Endpoint:  endpoint,
+			StashID:   *t.RemoteSiteID,
+			UpdatedAt: time.Now(),
+		})
+	}
+
+	return ret
+}
+
 func ScrapedTagSortFunction(a, b *ScrapedTag) int {
 	return strings.Compare(strings.ToLower(a.Name), strings.ToLower(b.Name))
 }
diff --git a/pkg/models/repository_tag.go b/pkg/models/repository_tag.go
index ba403cf2d..02dfe0cb6 100644
--- a/pkg/models/repository_tag.go
+++ b/pkg/models/repository_tag.go
@@ -26,6 +26,7 @@ type TagFinder interface {
 	FindByName(ctx context.Context, name string, nocase bool) (*Tag, error)
 	FindByNames(ctx context.Context, names []string, nocase bool) ([]*Tag, error)
 	FindByStashID(ctx context.Context, stashID StashID) ([]*Tag, error)
+	FindByStashIDStatus(ctx context.Context, hasStashID bool, stashboxEndpoint string) ([]*Tag, error)
 }
 
 // TagQueryer provides methods to query tags.
diff --git a/pkg/sqlite/tag.go b/pkg/sqlite/tag.go
index a926dd56e..750836516 100644
--- a/pkg/sqlite/tag.go
+++ b/pkg/sqlite/tag.go
@@ -597,6 +597,36 @@ func (qb *TagStore) FindByStashID(ctx context.Context, stashID models.StashID) (
 	return ret, nil
 }
 
+func (qb *TagStore) FindByStashIDStatus(ctx context.Context, hasStashID bool, stashboxEndpoint string) ([]*models.Tag, error) {
+	table := qb.table()
+	sq := dialect.From(table).LeftJoin(
+		tagsStashIDsJoinTable,
+		goqu.On(table.Col(idColumn).Eq(tagsStashIDsJoinTable.Col(tagIDColumn))),
+	).Select(table.Col(idColumn))
+
+	if hasStashID {
+		sq = sq.Where(
+			tagsStashIDsJoinTable.Col("stash_id").IsNotNull(),
+			tagsStashIDsJoinTable.Col("endpoint").Eq(stashboxEndpoint),
+		)
+	} else {
+		sq = sq.Where(
+			tagsStashIDsJoinTable.Col("stash_id").IsNull(),
+		)
+	}
+
+	idsQuery := qb.selectDataset().Where(
+		table.Col(idColumn).In(sq),
+	)
+
+	ret, err := qb.getMany(ctx, idsQuery)
+	if err != nil {
+		return nil, fmt.Errorf("getting tags for stash-box endpoint %s: %w", stashboxEndpoint, err)
+	}
+
+	return ret, nil
+}
+
 func (qb *TagStore) GetParentIDs(ctx context.Context, relatedID int) ([]int, error) {
 	return tagsParentTagsTableMgr.get(ctx, relatedID)
 }
diff --git a/pkg/stashbox/graphql/generated_client.go b/pkg/stashbox/graphql/generated_client.go
index 29b702a7f..acb2202dc 100644
--- a/pkg/stashbox/graphql/generated_client.go
+++ b/pkg/stashbox/graphql/generated_client.go
@@ -128,8 +128,10 @@ func (t *StudioFragment) GetImages() []*ImageFragment {
 }
 
 type TagFragment struct {
-	Name string "json:\"name\" graphql:\"name\""
-	ID   string "json:\"id\" graphql:\"id\""
+	Name        string   "json:\"name\" graphql:\"name\""
+	ID          string   "json:\"id\" graphql:\"id\""
+	Description *string  "json:\"description,omitempty\" graphql:\"description\""
+	Aliases     []string "json:\"aliases\" graphql:\"aliases\""
 }
 
 func (t *TagFragment) GetName() string {
@@ -144,6 +146,18 @@ func (t *TagFragment) GetID() string {
 	}
 	return t.ID
 }
+func (t *TagFragment) GetDescription() *string {
+	if t == nil {
+		t = &TagFragment{}
+	}
+	return t.Description
+}
+func (t *TagFragment) GetAliases() []string {
+	if t == nil {
+		t = &TagFragment{}
+	}
+	return t.Aliases
+}
 
 type MeasurementsFragment struct {
 	BandSize *int    "json:\"band_size,omitempty\" graphql:\"band_size\""
@@ -849,6 +863,8 @@ fragment StudioFragment on Studio {
 fragment TagFragment on Tag {
 	name
 	id
+	description
+	aliases
 }
 fragment PerformerAppearanceFragment on PerformerAppearance {
 	as
@@ -985,6 +1001,8 @@ fragment StudioFragment on Studio {
 fragment TagFragment on Tag {
 	name
 	id
+	description
+	aliases
 }
 fragment PerformerAppearanceFragment on PerformerAppearance {
 	as
@@ -1279,6 +1297,8 @@ fragment StudioFragment on Studio {
 fragment TagFragment on Tag {
 	name
 	id
+	description
+	aliases
 }
 fragment PerformerAppearanceFragment on PerformerAppearance {
 	as
@@ -1413,6 +1433,8 @@ const FindTagDocument = `query FindTag ($id: ID, $name: String) {
 fragment TagFragment on Tag {
 	name
 	id
+	description
+	aliases
 }
 `
 
@@ -1445,6 +1467,8 @@ const QueryTagsDocument = `query QueryTags ($input: TagQueryInput!) {
 fragment TagFragment on Tag {
 	name
 	id
+	description
+	aliases
 }
 `
 
diff --git a/pkg/stashbox/tag.go b/pkg/stashbox/tag.go
index df2ecbcc0..452dd9928 100644
--- a/pkg/stashbox/tag.go
+++ b/pkg/stashbox/tag.go
@@ -31,10 +31,8 @@ func (c Client) findTagByID(ctx context.Context, id string) ([]*models.ScrapedTa
 		return nil, nil
 	}
 
-	return []*models.ScrapedTag{{
-		Name:         tag.FindTag.Name,
-		RemoteSiteID: &tag.FindTag.ID,
-	}}, nil
+	ret := tagFragmentToScrapedTag(*tag.FindTag)
+	return []*models.ScrapedTag{ret}, nil
 }
 
 func (c Client) queryTagsByName(ctx context.Context, name string) ([]*models.ScrapedTag, error) {
@@ -57,11 +55,22 @@ func (c Client) queryTagsByName(ctx context.Context, name string) ([]*models.Scr
 
 	var ret []*models.ScrapedTag
 	for _, t := range result.QueryTags.Tags {
-		ret = append(ret, &models.ScrapedTag{
-			Name:         t.Name,
-			RemoteSiteID: &t.ID,
-		})
+		ret = append(ret, tagFragmentToScrapedTag(*t))
 	}
 
 	return ret, nil
 }
+
+func tagFragmentToScrapedTag(t graphql.TagFragment) *models.ScrapedTag {
+	ret := &models.ScrapedTag{
+		Name:         t.Name,
+		Description:  t.Description,
+		RemoteSiteID: &t.ID,
+	}
+
+	if len(t.Aliases) > 0 {
+		ret.AliasList = t.Aliases
+	}
+
+	return ret
+}
diff --git a/ui/v2.5/graphql/data/scrapers.graphql b/ui/v2.5/graphql/data/scrapers.graphql
index e58c21a20..7214c2064 100644
--- a/ui/v2.5/graphql/data/scrapers.graphql
+++ b/ui/v2.5/graphql/data/scrapers.graphql
@@ -160,6 +160,8 @@ fragment ScrapedSceneStudioData on ScrapedStudio {
 fragment ScrapedSceneTagData on ScrapedTag {
   stored_id
   name
+  description
+  alias_list
   remote_site_id
 }
 
diff --git a/ui/v2.5/graphql/mutations/stash-box.graphql b/ui/v2.5/graphql/mutations/stash-box.graphql
index 596dc4302..de5f5136c 100644
--- a/ui/v2.5/graphql/mutations/stash-box.graphql
+++ b/ui/v2.5/graphql/mutations/stash-box.graphql
@@ -12,6 +12,10 @@ mutation StashBoxBatchStudioTag($input: StashBoxBatchTagInput!) {
   stashBoxBatchStudioTag(input: $input)
 }
 
+mutation StashBoxBatchTagTag($input: StashBoxBatchTagInput!) {
+  stashBoxBatchTagTag(input: $input)
+}
+
 mutation SubmitStashBoxSceneDraft($input: StashBoxDraftSubmissionInput!) {
   submitStashBoxSceneDraft(input: $input)
 }
diff --git a/ui/v2.5/src/components/Shared/ScrapeDialog/ScrapedObjectsRow.tsx b/ui/v2.5/src/components/Shared/ScrapeDialog/ScrapedObjectsRow.tsx
index f383f245a..6bd535df7 100644
--- a/ui/v2.5/src/components/Shared/ScrapeDialog/ScrapedObjectsRow.tsx
+++ b/ui/v2.5/src/components/Shared/ScrapeDialog/ScrapedObjectsRow.tsx
@@ -395,7 +395,13 @@ export const ScrapedTagsRow: React.FC<
         onSelect={(items) => {
           if (onChangeFn) {
             // map the id back to stored_id
-            onChangeFn(items.map((p) => ({ ...p, stored_id: p.id })));
+            onChangeFn(
+              items.map((p) => ({
+                ...p,
+                stored_id: p.id,
+                alias_list: p.aliases,
+              }))
+            );
           }
         }}
         ids={selectValue}
diff --git a/ui/v2.5/src/components/Tagger/PerformerFieldSelector.tsx b/ui/v2.5/src/components/Tagger/FieldSelector.tsx
similarity index 84%
rename from ui/v2.5/src/components/Tagger/PerformerFieldSelector.tsx
rename to ui/v2.5/src/components/Tagger/FieldSelector.tsx
index b50716511..7a47862b5 100644
--- a/ui/v2.5/src/components/Tagger/PerformerFieldSelector.tsx
+++ b/ui/v2.5/src/components/Tagger/FieldSelector.tsx
@@ -5,22 +5,25 @@ import { useIntl } from "react-intl";
 
 import { ModalComponent } from "../Shared/Modal";
 import { Icon } from "../Shared/Icon";
-import { PERFORMER_FIELDS } from "./constants";
 
 interface IProps {
   show: boolean;
+  fields: string[];
   excludedFields: string[];
   onSelect: (fields: string[]) => void;
 }
 
-const PerformerFieldSelect: React.FC<IProps> = ({
+const FieldSelector: React.FC<IProps> = ({
   show,
+  fields,
   excludedFields,
   onSelect,
 }) => {
   const intl = useIntl();
   const [excluded, setExcluded] = useState<Record<string, boolean>>(
-    excludedFields.reduce((dict, field) => ({ ...dict, [field]: true }), {})
+    excludedFields
+      .filter((field) => fields.includes(field))
+      .reduce((dict, field) => ({ ...dict, [field]: true }), {})
   );
 
   const toggleField = (field: string) =>
@@ -57,9 +60,9 @@ const PerformerFieldSelect: React.FC<IProps> = ({
       <div className="mb-2">
         These fields will be tagged by default. Click the button to toggle.
       </div>
-      <Row>{PERFORMER_FIELDS.map((f) => renderField(f))}</Row>
+      <Row>{fields.map((f) => renderField(f))}</Row>
     </ModalComponent>
   );
 };
 
-export default PerformerFieldSelect;
+export default FieldSelector;
diff --git a/ui/v2.5/src/components/Tagger/performers/Config.tsx b/ui/v2.5/src/components/Tagger/TaggerConfig.tsx
similarity index 69%
rename from ui/v2.5/src/components/Tagger/performers/Config.tsx
rename to ui/v2.5/src/components/Tagger/TaggerConfig.tsx
index 0d5316735..c578d58c4 100644
--- a/ui/v2.5/src/components/Tagger/performers/Config.tsx
+++ b/ui/v2.5/src/components/Tagger/TaggerConfig.tsx
@@ -3,21 +3,33 @@ import { Badge, Button, Card, Collapse, Form } from "react-bootstrap";
 import { FormattedMessage } from "react-intl";
 import { useConfigurationContext } from "src/hooks/Config";
 
-import { ITaggerConfig } from "../constants";
-import PerformerFieldSelector from "../PerformerFieldSelector";
+import { ITaggerConfig } from "./constants";
+import FieldSelector from "./FieldSelector";
 
-interface IConfigProps {
+interface ITaggerConfigProps {
   show: boolean;
   config: ITaggerConfig;
   setConfig: Dispatch<ITaggerConfig>;
+  excludedFields: string[];
+  onFieldsChange: (fields: string[]) => void;
+  fields: string[];
+  entityName: string;
+  extraConfig?: React.ReactNode;
 }
 
-const Config: React.FC<IConfigProps> = ({ show, config, setConfig }) => {
+const TaggerConfig: React.FC<ITaggerConfigProps> = ({
+  show,
+  config,
+  setConfig,
+  excludedFields,
+  onFieldsChange,
+  fields,
+  entityName,
+  extraConfig,
+}) => {
   const { configuration: stashConfig } = useConfigurationContext();
   const [showExclusionModal, setShowExclusionModal] = useState(false);
 
-  const excludedFields = config.excludedPerformerFields ?? [];
-
   const handleInstanceSelect = (e: React.ChangeEvent<HTMLSelectElement>) => {
     const selectedEndpoint = e.currentTarget.value;
     setConfig({
@@ -28,8 +40,8 @@ const Config: React.FC<IConfigProps> = ({ show, config, setConfig }) => {
 
   const stashBoxes = stashConfig?.general.stashBoxes ?? [];
 
-  const handleFieldSelect = (fields: string[]) => {
-    setConfig({ ...config, excludedPerformerFields: fields });
+  const handleFieldSelect = (selectedFields: string[]) => {
+    onFieldsChange(selectedFields);
     setShowExclusionModal(false);
   };
 
@@ -43,9 +55,10 @@ const Config: React.FC<IConfigProps> = ({ show, config, setConfig }) => {
             </h4>
             <hr className="w-100" />
             <div className="col-md-6">
-              <Form.Group controlId="excluded-performer-fields">
+              {extraConfig}
+              <Form.Group controlId="excluded-fields">
                 <h6>
-                  <FormattedMessage id="performer_tagger.config.excluded_fields" />
+                  <FormattedMessage id="tagger.config.excluded_fields" />
                 </h6>
                 <span>
                   {excludedFields.length > 0 ? (
@@ -55,17 +68,20 @@ const Config: React.FC<IConfigProps> = ({ show, config, setConfig }) => {
                       </Badge>
                     ))
                   ) : (
-                    <FormattedMessage id="performer_tagger.config.no_fields_are_excluded" />
+                    <FormattedMessage id="tagger.config.no_fields_are_excluded" />
                   )}
                 </span>
                 <Form.Text>
-                  <FormattedMessage id="performer_tagger.config.these_fields_will_not_be_changed_when_updating_performers" />
+                  <FormattedMessage
+                    id="tagger.config.fields_will_not_be_changed"
+                    values={{ entity: entityName }}
+                  />
                 </Form.Text>
                 <Button
                   onClick={() => setShowExclusionModal(true)}
                   className="mt-2"
                 >
-                  <FormattedMessage id="performer_tagger.config.edit_excluded_fields" />
+                  <FormattedMessage id="tagger.config.edit_excluded_fields" />
                 </Button>
               </Form.Group>
               <Form.Group
@@ -73,7 +89,7 @@ const Config: React.FC<IConfigProps> = ({ show, config, setConfig }) => {
                 className="align-items-center row no-gutters mt-4"
               >
                 <Form.Label className="mr-4">
-                  <FormattedMessage id="performer_tagger.config.active_stash-box_instance" />
+                  <FormattedMessage id="tagger.config.active_stash-box_instance" />
                 </Form.Label>
                 <Form.Control
                   as="select"
@@ -84,7 +100,7 @@ const Config: React.FC<IConfigProps> = ({ show, config, setConfig }) => {
                 >
                   {!stashBoxes.length && (
                     <option>
-                      <FormattedMessage id="performer_tagger.config.no_instances_found" />
+                      <FormattedMessage id="tagger.config.no_instances_found" />
                     </option>
                   )}
                   {stashConfig?.general.stashBoxes.map((i) => (
@@ -98,8 +114,9 @@ const Config: React.FC<IConfigProps> = ({ show, config, setConfig }) => {
           </div>
         </Card>
       </Collapse>
-      <PerformerFieldSelector
+      <FieldSelector
         show={showExclusionModal}
+        fields={fields}
         onSelect={handleFieldSelect}
         excludedFields={excludedFields}
       />
@@ -107,4 +124,4 @@ const Config: React.FC<IConfigProps> = ({ show, config, setConfig }) => {
   );
 };
 
-export default Config;
+export default TaggerConfig;
diff --git a/ui/v2.5/src/components/Tagger/constants.ts b/ui/v2.5/src/components/Tagger/constants.ts
index d59a6d3d5..af9afcefb 100644
--- a/ui/v2.5/src/components/Tagger/constants.ts
+++ b/ui/v2.5/src/components/Tagger/constants.ts
@@ -24,6 +24,7 @@ export const DEFAULT_BLACKLIST = [
 ];
 export const DEFAULT_EXCLUDED_PERFORMER_FIELDS = ["name"];
 export const DEFAULT_EXCLUDED_STUDIO_FIELDS = ["name"];
+export const DEFAULT_EXCLUDED_TAG_FIELDS = ["name"];
 
 export const initialConfig: ITaggerConfig = {
   blacklist: DEFAULT_BLACKLIST,
@@ -35,6 +36,7 @@ export const initialConfig: ITaggerConfig = {
   excludedPerformerFields: DEFAULT_EXCLUDED_PERFORMER_FIELDS,
   markSceneAsOrganizedOnSave: false,
   excludedStudioFields: DEFAULT_EXCLUDED_STUDIO_FIELDS,
+  excludedTagFields: DEFAULT_EXCLUDED_TAG_FIELDS,
   createParentStudios: true,
 };
 
@@ -52,6 +54,7 @@ export interface ITaggerConfig {
   excludedPerformerFields?: string[];
   markSceneAsOrganizedOnSave?: boolean;
   excludedStudioFields?: string[];
+  excludedTagFields?: string[];
   createParentStudios: boolean;
 }
 
@@ -82,3 +85,4 @@ export const PERFORMER_FIELDS = [
 ];
 
 export const STUDIO_FIELDS = ["name", "image", "url", "parent_studio"];
+export const TAG_FIELDS = ["name", "description", "aliases"];
diff --git a/ui/v2.5/src/components/Tagger/performers/PerformerTagger.tsx b/ui/v2.5/src/components/Tagger/performers/PerformerTagger.tsx
index bb934a241..8106d6a44 100755
--- a/ui/v2.5/src/components/Tagger/performers/PerformerTagger.tsx
+++ b/ui/v2.5/src/components/Tagger/performers/PerformerTagger.tsx
@@ -19,8 +19,8 @@ import { Manual } from "src/components/Help/Manual";
 import { useConfigurationContext } from "src/hooks/Config";
 
 import StashSearchResult from "./StashSearchResult";
-import PerformerConfig from "./Config";
-import { ITaggerConfig } from "../constants";
+import TaggerConfig from "../TaggerConfig";
+import { ITaggerConfig, PERFORMER_FIELDS } from "../constants";
 import PerformerModal from "../PerformerModal";
 import { useUpdatePerformer } from "../queries";
 import { faStar, faTags } from "@fortawesome/free-solid-svg-icons";
@@ -771,10 +771,16 @@ export const PerformerTagger: React.FC<ITaggerProps> = ({ performers }) => {
               </Button>
             </div>
 
-            <PerformerConfig
+            <TaggerConfig
               config={config}
               setConfig={setConfig}
               show={showConfig}
+              excludedFields={config.excludedPerformerFields ?? []}
+              onFieldsChange={(fields) =>
+                setConfig({ ...config, excludedPerformerFields: fields })
+              }
+              fields={PERFORMER_FIELDS}
+              entityName="performers"
             />
             <PerformerTaggerList
               performers={performers}
diff --git a/ui/v2.5/src/components/Tagger/queries.ts b/ui/v2.5/src/components/Tagger/queries.ts
index 734a6f736..1d98c2a76 100644
--- a/ui/v2.5/src/components/Tagger/queries.ts
+++ b/ui/v2.5/src/components/Tagger/queries.ts
@@ -97,3 +97,44 @@ export const useUpdateStudio = () => {
 
   return updateStudioHandler;
 };
+
+export const useUpdateTag = () => {
+  const [updateTag] = GQL.useTagUpdateMutation({
+    onError: (errors) => errors,
+    errorPolicy: "all",
+  });
+
+  const updateTagHandler = (input: GQL.TagUpdateInput) =>
+    updateTag({
+      variables: {
+        input,
+      },
+      update: (store, updatedTag) => {
+        if (!updatedTag.data?.tagUpdate) return;
+
+        updatedTag.data.tagUpdate.stash_ids.forEach((id) => {
+          store.writeQuery<GQL.FindTagsQuery, GQL.FindTagsQueryVariables>({
+            query: GQL.FindTagsDocument,
+            variables: {
+              tag_filter: {
+                stash_id_endpoint: {
+                  stash_id: id.stash_id,
+                  endpoint: id.endpoint,
+                  modifier: GQL.CriterionModifier.Equals,
+                },
+              },
+            },
+            data: {
+              findTags: {
+                count: 1,
+                tags: [updatedTag.data!.tagUpdate!],
+                __typename: "FindTagsResultType",
+              },
+            },
+          });
+        });
+      },
+    });
+
+  return updateTagHandler;
+};
diff --git a/ui/v2.5/src/components/Tagger/studios/Config.tsx b/ui/v2.5/src/components/Tagger/studios/Config.tsx
deleted file mode 100644
index ddfd17b1e..000000000
--- a/ui/v2.5/src/components/Tagger/studios/Config.tsx
+++ /dev/null
@@ -1,130 +0,0 @@
-import React, { Dispatch, useState } from "react";
-import { Badge, Button, Card, Collapse, Form } from "react-bootstrap";
-import { FormattedMessage } from "react-intl";
-import { useConfigurationContext } from "src/hooks/Config";
-
-import { ITaggerConfig } from "../constants";
-import StudioFieldSelector from "./StudioFieldSelector";
-
-interface IConfigProps {
-  show: boolean;
-  config: ITaggerConfig;
-  setConfig: Dispatch<ITaggerConfig>;
-}
-
-const Config: React.FC<IConfigProps> = ({ show, config, setConfig }) => {
-  const { configuration: stashConfig } = useConfigurationContext();
-  const [showExclusionModal, setShowExclusionModal] = useState(false);
-
-  const excludedFields = config.excludedStudioFields ?? [];
-
-  const handleInstanceSelect = (e: React.ChangeEvent<HTMLSelectElement>) => {
-    const selectedEndpoint = e.currentTarget.value;
-    setConfig({
-      ...config,
-      selectedEndpoint,
-    });
-  };
-
-  const stashBoxes = stashConfig?.general.stashBoxes ?? [];
-
-  const handleFieldSelect = (fields: string[]) => {
-    setConfig({ ...config, excludedStudioFields: fields });
-    setShowExclusionModal(false);
-  };
-
-  return (
-    <>
-      <Collapse in={show}>
-        <Card>
-          <div className="row">
-            <h4 className="col-12">
-              <FormattedMessage id="configuration" />
-            </h4>
-            <hr className="w-100" />
-            <div className="col-md-6">
-              <Form.Group
-                controlId="create-parent"
-                className="align-items-center"
-              >
-                <Form.Check
-                  label={
-                    <FormattedMessage id="studio_tagger.config.create_parent_label" />
-                  }
-                  checked={config.createParentStudios}
-                  onChange={(e: React.ChangeEvent<HTMLInputElement>) =>
-                    setConfig({
-                      ...config,
-                      createParentStudios: e.currentTarget.checked,
-                    })
-                  }
-                />
-                <Form.Text>
-                  <FormattedMessage id="studio_tagger.config.create_parent_desc" />
-                </Form.Text>
-              </Form.Group>
-              <Form.Group controlId="excluded-studio-fields">
-                <h6>
-                  <FormattedMessage id="studio_tagger.config.excluded_fields" />
-                </h6>
-                <span>
-                  {excludedFields.length > 0 ? (
-                    excludedFields.map((f) => (
-                      <Badge variant="secondary" className="tag-item" key={f}>
-                        <FormattedMessage id={f} />
-                      </Badge>
-                    ))
-                  ) : (
-                    <FormattedMessage id="studio_tagger.config.no_fields_are_excluded" />
-                  )}
-                </span>
-                <Form.Text>
-                  <FormattedMessage id="studio_tagger.config.these_fields_will_not_be_changed_when_updating_studios" />
-                </Form.Text>
-                <Button
-                  onClick={() => setShowExclusionModal(true)}
-                  className="mt-2"
-                >
-                  <FormattedMessage id="studio_tagger.config.edit_excluded_fields" />
-                </Button>
-              </Form.Group>
-              <Form.Group
-                controlId="stash-box-endpoint"
-                className="align-items-center row no-gutters mt-4"
-              >
-                <Form.Label className="mr-4">
-                  <FormattedMessage id="studio_tagger.config.active_stash-box_instance" />
-                </Form.Label>
-                <Form.Control
-                  as="select"
-                  value={config.selectedEndpoint}
-                  className="col-md-4 col-6 input-control"
-                  disabled={!stashBoxes.length}
-                  onChange={handleInstanceSelect}
-                >
-                  {!stashBoxes.length && (
-                    <option>
-                      <FormattedMessage id="studio_tagger.config.no_instances_found" />
-                    </option>
-                  )}
-                  {stashConfig?.general.stashBoxes.map((i) => (
-                    <option value={i.endpoint} key={i.endpoint}>
-                      {i.endpoint}
-                    </option>
-                  ))}
-                </Form.Control>
-              </Form.Group>
-            </div>
-          </div>
-        </Card>
-      </Collapse>
-      <StudioFieldSelector
-        show={showExclusionModal}
-        onSelect={handleFieldSelect}
-        excludedFields={excludedFields}
-      />
-    </>
-  );
-};
-
-export default Config;
diff --git a/ui/v2.5/src/components/Tagger/studios/StudioFieldSelector.tsx b/ui/v2.5/src/components/Tagger/studios/StudioFieldSelector.tsx
deleted file mode 100644
index 658f23510..000000000
--- a/ui/v2.5/src/components/Tagger/studios/StudioFieldSelector.tsx
+++ /dev/null
@@ -1,68 +0,0 @@
-import { faCheck, faList, faTimes } from "@fortawesome/free-solid-svg-icons";
-import React, { useState } from "react";
-import { Button, Row, Col } from "react-bootstrap";
-import { useIntl } from "react-intl";
-
-import { ModalComponent } from "../../Shared/Modal";
-import { Icon } from "../../Shared/Icon";
-import { STUDIO_FIELDS } from "../constants";
-
-interface IProps {
-  show: boolean;
-  excludedFields: string[];
-  onSelect: (fields: string[]) => void;
-}
-
-const StudioFieldSelect: React.FC<IProps> = ({
-  show,
-  excludedFields,
-  onSelect,
-}) => {
-  const intl = useIntl();
-  const [excluded, setExcluded] = useState<Record<string, boolean>>(
-    // filter out fields that aren't in STUDIO_FIELDS
-    excludedFields
-      .filter((field) => STUDIO_FIELDS.includes(field))
-      .reduce((dict, field) => ({ ...dict, [field]: true }), {})
-  );
-
-  const toggleField = (field: string) =>
-    setExcluded({
-      ...excluded,
-      [field]: !excluded[field],
-    });
-
-  const renderField = (field: string) => (
-    <Col xs={6} className="mb-1" key={field}>
-      <Button
-        onClick={() => toggleField(field)}
-        variant="secondary"
-        className={excluded[field] ? "text-muted" : "text-success"}
-      >
-        <Icon icon={excluded[field] ? faTimes : faCheck} />
-      </Button>
-      <span className="ml-3">{intl.formatMessage({ id: field })}</span>
-    </Col>
-  );
-
-  return (
-    <ModalComponent
-      show={show}
-      icon={faList}
-      dialogClassName="FieldSelect"
-      accept={{
-        text: intl.formatMessage({ id: "actions.save" }),
-        onClick: () =>
-          onSelect(Object.keys(excluded).filter((f) => excluded[f])),
-      }}
-    >
-      <h4>Select tagged fields</h4>
-      <div className="mb-2">
-        These fields will be tagged by default. Click the button to toggle.
-      </div>
-      <Row>{STUDIO_FIELDS.map((f) => renderField(f))}</Row>
-    </ModalComponent>
-  );
-};
-
-export default StudioFieldSelect;
diff --git a/ui/v2.5/src/components/Tagger/studios/StudioTagger.tsx b/ui/v2.5/src/components/Tagger/studios/StudioTagger.tsx
index ed9570431..64bb99b72 100644
--- a/ui/v2.5/src/components/Tagger/studios/StudioTagger.tsx
+++ b/ui/v2.5/src/components/Tagger/studios/StudioTagger.tsx
@@ -20,8 +20,8 @@ import { Manual } from "src/components/Help/Manual";
 import { useConfigurationContext } from "src/hooks/Config";
 
 import StashSearchResult from "./StashSearchResult";
-import StudioConfig from "./Config";
-import { ITaggerConfig } from "../constants";
+import TaggerConfig from "../TaggerConfig";
+import { ITaggerConfig, STUDIO_FIELDS } from "../constants";
 import StudioModal from "../scenes/StudioModal";
 import { useUpdateStudio } from "../queries";
 import { apolloError } from "src/utils";
@@ -825,10 +825,38 @@ export const StudioTagger: React.FC<ITaggerProps> = ({ studios }) => {
               </Button>
             </div>
 
-            <StudioConfig
+            <TaggerConfig
               config={config}
               setConfig={setConfig}
               show={showConfig}
+              excludedFields={config.excludedStudioFields ?? []}
+              onFieldsChange={(fields) =>
+                setConfig({ ...config, excludedStudioFields: fields })
+              }
+              fields={STUDIO_FIELDS}
+              entityName="studios"
+              extraConfig={
+                <Form.Group
+                  controlId="create-parent"
+                  className="align-items-center"
+                >
+                  <Form.Check
+                    label={
+                      <FormattedMessage id="studio_tagger.config.create_parent_label" />
+                    }
+                    checked={config.createParentStudios}
+                    onChange={(e: React.ChangeEvent<HTMLInputElement>) =>
+                      setConfig({
+                        ...config,
+                        createParentStudios: e.currentTarget.checked,
+                      })
+                    }
+                  />
+                  <Form.Text>
+                    <FormattedMessage id="studio_tagger.config.create_parent_desc" />
+                  </Form.Text>
+                </Form.Group>
+              }
             />
             <StudioTaggerList
               studios={studios}
diff --git a/ui/v2.5/src/components/Tagger/tags/StashSearchResult.tsx b/ui/v2.5/src/components/Tagger/tags/StashSearchResult.tsx
new file mode 100644
index 000000000..cd6abca02
--- /dev/null
+++ b/ui/v2.5/src/components/Tagger/tags/StashSearchResult.tsx
@@ -0,0 +1,119 @@
+import React, { useState } from "react";
+import { Button } from "react-bootstrap";
+
+import * as GQL from "src/core/generated-graphql";
+import { useUpdateTag } from "../queries";
+import TagModal from "./TagModal";
+import { faTags } from "@fortawesome/free-solid-svg-icons";
+import { useIntl } from "react-intl";
+import { mergeTagStashIDs } from "../utils";
+
+interface IStashSearchResultProps {
+  tag: GQL.TagListDataFragment;
+  stashboxTags: GQL.ScrapedSceneTagDataFragment[];
+  endpoint: string;
+  onTagTagged: (
+    tag: Pick<GQL.TagListDataFragment, "id"> &
+      Partial<Omit<GQL.TagListDataFragment, "id">>
+  ) => void;
+  excludedTagFields: string[];
+}
+
+const StashSearchResult: React.FC<IStashSearchResultProps> = ({
+  tag,
+  stashboxTags,
+  onTagTagged,
+  excludedTagFields,
+  endpoint,
+}) => {
+  const intl = useIntl();
+
+  const [modalTag, setModalTag] = useState<GQL.ScrapedSceneTagDataFragment>();
+  const [saveState, setSaveState] = useState<string>("");
+  const [error, setError] = useState<{ message?: string; details?: string }>(
+    {}
+  );
+
+  const updateTag = useUpdateTag();
+
+  const handleSave = async (input: GQL.TagCreateInput) => {
+    setError({});
+    setModalTag(undefined);
+    setSaveState("Saving tag");
+
+    const updateData: GQL.TagUpdateInput = {
+      ...input,
+      id: tag.id,
+    };
+
+    updateData.stash_ids = await mergeTagStashIDs(
+      tag.id,
+      input.stash_ids ?? []
+    );
+
+    const res = await updateTag(updateData);
+
+    if (!res?.data?.tagUpdate) {
+      setError({
+        message: intl.formatMessage(
+          { id: "tag_tagger.failed_to_save_tag" },
+          { tag: input.name ?? tag.name }
+        ),
+        details:
+          res?.errors?.[0]?.message === "UNIQUE constraint failed: tags.name"
+            ? intl.formatMessage({
+                id: "tag_tagger.name_already_exists",
+              })
+            : res?.errors?.[0]?.message ?? "",
+      });
+    } else {
+      onTagTagged(tag);
+    }
+    setSaveState("");
+  };
+
+  const tags = stashboxTags.map((p) => (
+    <Button
+      className="StudioTagger-studio-search-item minimal col-6"
+      variant="link"
+      key={p.remote_site_id}
+      onClick={() => setModalTag(p)}
+    >
+      <span>{p.name}</span>
+    </Button>
+  ));
+
+  return (
+    <>
+      {modalTag && (
+        <TagModal
+          closeModal={() => setModalTag(undefined)}
+          modalVisible={modalTag !== undefined}
+          tag={modalTag}
+          onSave={handleSave}
+          icon={faTags}
+          header="Update Tag"
+          excludedTagFields={excludedTagFields}
+          endpoint={endpoint}
+        />
+      )}
+      <div className="StudioTagger-studio-search">{tags}</div>
+      <div className="row no-gutters mt-2 align-items-center justify-content-end">
+        {error.message && (
+          <div className="text-right text-danger mt-1">
+            <strong>
+              <span className="mr-2">Error:</span>
+              {error.message}
+            </strong>
+            <div>{error.details}</div>
+          </div>
+        )}
+        {saveState && (
+          <strong className="col-4 mt-1 mr-2 text-right">{saveState}</strong>
+        )}
+      </div>
+    </>
+  );
+};
+
+export default StashSearchResult;
diff --git a/ui/v2.5/src/components/Tagger/tags/TagModal.tsx b/ui/v2.5/src/components/Tagger/tags/TagModal.tsx
new file mode 100644
index 000000000..1183d8f0c
--- /dev/null
+++ b/ui/v2.5/src/components/Tagger/tags/TagModal.tsx
@@ -0,0 +1,144 @@
+import React, { useState } from "react";
+import { FormattedMessage, useIntl } from "react-intl";
+import { IconDefinition } from "@fortawesome/fontawesome-svg-core";
+
+import * as GQL from "src/core/generated-graphql";
+import { Icon } from "src/components/Shared/Icon";
+import { ModalComponent } from "src/components/Shared/Modal";
+import {
+  faCheck,
+  faExternalLinkAlt,
+  faTimes,
+} from "@fortawesome/free-solid-svg-icons";
+import { Button } from "react-bootstrap";
+import { TruncatedText } from "src/components/Shared/TruncatedText";
+import { excludeFields } from "src/utils/data";
+import { ExternalLink } from "src/components/Shared/ExternalLink";
+
+interface ITagModalProps {
+  tag: GQL.ScrapedSceneTagDataFragment;
+  modalVisible: boolean;
+  closeModal: () => void;
+  onSave: (input: GQL.TagCreateInput) => void;
+  excludedTagFields?: string[];
+  header: string;
+  icon: IconDefinition;
+  endpoint?: string;
+}
+
+const TagModal: React.FC<ITagModalProps> = ({
+  modalVisible,
+  tag,
+  onSave,
+  closeModal,
+  excludedTagFields = [],
+  header,
+  icon,
+  endpoint,
+}) => {
+  const intl = useIntl();
+
+  const [excluded, setExcluded] = useState<Record<string, boolean>>(
+    excludedTagFields.reduce((dict, field) => ({ ...dict, [field]: true }), {})
+  );
+  const toggleField = (name: string) =>
+    setExcluded({
+      ...excluded,
+      [name]: !excluded[name],
+    });
+
+  function maybeRenderField(id: string, text: string | null | undefined) {
+    if (!text) return;
+
+    return (
+      <div className="row no-gutters">
+        <div className="col-5 studio-create-modal-field" key={id}>
+          <Button
+            onClick={() => toggleField(id)}
+            variant="secondary"
+            className={excluded[id] ? "text-muted" : "text-success"}
+          >
+            <Icon icon={excluded[id] ? faTimes : faCheck} />
+          </Button>
+          <strong>
+            <FormattedMessage id={id} />:
+          </strong>
+        </div>
+        <TruncatedText className="col-7" text={text} />
+      </div>
+    );
+  }
+
+  function maybeRenderStashBoxLink() {
+    const base = endpoint?.match(/https?:\/\/.*?\//)?.[0];
+    const link = base ? `${base}tags/${tag.remote_site_id}` : undefined;
+
+    if (!link) return;
+
+    return (
+      <h6 className="mt-2">
+        <ExternalLink href={link}>
+          <FormattedMessage id="stashbox.source" />
+          <Icon icon={faExternalLinkAlt} className="ml-2" />
+        </ExternalLink>
+      </h6>
+    );
+  }
+
+  function handleSave() {
+    if (!tag.name) {
+      throw new Error("tag name must be set");
+    }
+
+    const tagData: GQL.TagCreateInput = {
+      name: tag.name,
+      description: tag.description ?? undefined,
+      aliases: tag.alias_list?.filter((a) => a) ?? undefined,
+    };
+
+    // stashid handling code
+    const remoteSiteID = tag.remote_site_id;
+    if (remoteSiteID && endpoint) {
+      tagData.stash_ids = [
+        {
+          endpoint,
+          stash_id: remoteSiteID,
+          updated_at: new Date().toISOString(),
+        },
+      ];
+    }
+
+    // handle exclusions
+    excludeFields(tagData, excluded);
+
+    onSave(tagData);
+  }
+
+  return (
+    <ModalComponent
+      show={modalVisible}
+      accept={{
+        text: intl.formatMessage({ id: "actions.save" }),
+        onClick: handleSave,
+      }}
+      cancel={{ onClick: () => closeModal(), variant: "secondary" }}
+      onHide={() => closeModal()}
+      dialogClassName="studio-create-modal"
+      icon={icon}
+      header={header}
+    >
+      <div>
+        <div className="row">
+          <div className="col-12">
+            {maybeRenderField("name", tag.name)}
+            {maybeRenderField("description", tag.description)}
+            {maybeRenderField("aliases", tag.alias_list?.join(", "))}
+            {maybeRenderStashBoxLink()}
+          </div>
+        </div>
+      </div>
+    </ModalComponent>
+  );
+};
+
+export default TagModal;
diff --git a/ui/v2.5/src/components/Tagger/tags/TagTagger.tsx b/ui/v2.5/src/components/Tagger/tags/TagTagger.tsx
new file mode 100644
index 000000000..1113bdfd4
--- /dev/null
+++ b/ui/v2.5/src/components/Tagger/tags/TagTagger.tsx
@@ -0,0 +1,758 @@
+import React, { useEffect, useMemo, useRef, useState } from "react";
+import { Button, Card, Form, InputGroup, ProgressBar } from "react-bootstrap";
+import { FormattedMessage, useIntl } from "react-intl";
+import { Link } from "react-router-dom";
+import { HashLink } from "react-router-hash-link";
+
+import * as GQL from "src/core/generated-graphql";
+import { LoadingIndicator } from "src/components/Shared/LoadingIndicator";
+import { ModalComponent } from "src/components/Shared/Modal";
+import {
+  stashBoxTagQuery,
+  useJobsSubscribe,
+  mutateStashBoxBatchTagTag,
+  getClient,
+} from "src/core/StashService";
+import { Manual } from "src/components/Help/Manual";
+import { useConfigurationContext } from "src/hooks/Config";
+
+import StashSearchResult from "./StashSearchResult";
+import TaggerConfig from "../TaggerConfig";
+import { ITaggerConfig, TAG_FIELDS } from "../constants";
+import { useUpdateTag } from "../queries";
+import { faStar, faTags } from "@fortawesome/free-solid-svg-icons";
+import { ExternalLink } from "src/components/Shared/ExternalLink";
+import { mergeTagStashIDs } from "../utils";
+import { separateNamesAndStashIds } from "src/utils/stashIds";
+import { useTaggerConfig } from "../config";
+
+type JobFragment = Pick<
+  GQL.Job,
+  "id" | "status" | "subTasks" | "description" | "progress"
+>;
+
+const CLASSNAME = "StudioTagger";
+
+interface ITagBatchUpdateModal {
+  tags: GQL.TagListDataFragment[];
+  isIdle: boolean;
+  selectedEndpoint: { endpoint: string; index: number };
+  onBatchUpdate: (queryAll: boolean, refresh: boolean) => void;
+  close: () => void;
+}
+
+const TagBatchUpdateModal: React.FC<ITagBatchUpdateModal> = ({
+  tags,
+  isIdle,
+  selectedEndpoint,
+  onBatchUpdate,
+  close,
+}) => {
+  const intl = useIntl();
+
+  const [queryAll, setQueryAll] = useState(false);
+
+  const [refresh, setRefresh] = useState(false);
+  const { data: allTags } = GQL.useFindTagsQuery({
+    variables: {
+      tag_filter: {
+        stash_id_endpoint: {
+          endpoint: selectedEndpoint.endpoint,
+          modifier: refresh
+            ? GQL.CriterionModifier.NotNull
+            : GQL.CriterionModifier.IsNull,
+        },
+      },
+      filter: {
+        per_page: 0,
+      },
+    },
+  });
+
+  const tagCount = useMemo(() => {
+    const filteredStashIDs = tags.map((t) =>
+      t.stash_ids.filter((s) => s.endpoint === selectedEndpoint.endpoint)
+    );
+
+    return queryAll
+      ? allTags?.findTags.count
+      : filteredStashIDs.filter((s) =>
+          refresh ? s.length > 0 : s.length === 0
+        ).length;
+  }, [queryAll, refresh, tags, allTags, selectedEndpoint.endpoint]);
+
+  return (
+    <ModalComponent
+      show
+      icon={faTags}
+      header={intl.formatMessage({
+        id: "tag_tagger.update_tags",
+      })}
+      accept={{
+        text: intl.formatMessage({
+          id: "tag_tagger.update_tags",
+        }),
+        onClick: () => onBatchUpdate(queryAll, refresh),
+      }}
+      cancel={{
+        text: intl.formatMessage({ id: "actions.cancel" }),
+        variant: "danger",
+        onClick: () => close(),
+      }}
+      disabled={!isIdle}
+    >
+      <Form.Group>
+        <Form.Label>
+          <h6>
+            <FormattedMessage id="tag_tagger.tag_selection" />
+          </h6>
+        </Form.Label>
+        <Form.Check
+          id="query-page"
+          type="radio"
+          name="tag-query"
+          label={<FormattedMessage id="tag_tagger.current_page" />}
+          checked={!queryAll}
+          onChange={() => setQueryAll(false)}
+        />
+        <Form.Check
+          id="query-all"
+          type="radio"
+          name="tag-query"
+          label={intl.formatMessage({
+            id: "tag_tagger.query_all_tags_in_the_database",
+          })}
+          checked={queryAll}
+          onChange={() => setQueryAll(true)}
+        />
+      </Form.Group>
+      <Form.Group>
+        <Form.Label>
+          <h6>
+            <FormattedMessage id="tag_tagger.tag_status" />
+          </h6>
+        </Form.Label>
+        <Form.Check
+          id="untagged-tags"
+          type="radio"
+          name="tag-refresh"
+          label={intl.formatMessage({
+            id: "tag_tagger.untagged_tags",
+          })}
+          checked={!refresh}
+          onChange={() => setRefresh(false)}
+        />
+        <Form.Text>
+          <FormattedMessage id="tag_tagger.updating_untagged_tags_description" />
+        </Form.Text>
+        <Form.Check
+          id="tagged-tags"
+          type="radio"
+          name="tag-refresh"
+          label={intl.formatMessage({
+            id: "tag_tagger.refresh_tagged_tags",
+          })}
+          checked={refresh}
+          onChange={() => setRefresh(true)}
+        />
+        <Form.Text>
+          <FormattedMessage id="tag_tagger.refreshing_will_update_the_data" />
+        </Form.Text>
+      </Form.Group>
+      <b>
+        <FormattedMessage
+          id="tag_tagger.number_of_tags_will_be_processed"
+          values={{
+            tag_count: tagCount,
+          }}
+        />
+      </b>
+    </ModalComponent>
+  );
+};
+
+interface ITagBatchAddModal {
+  isIdle: boolean;
+  onBatchAdd: (input: string) => void;
+  close: () => void;
+}
+
+const TagBatchAddModal: React.FC<ITagBatchAddModal> = ({
+  isIdle,
+  onBatchAdd,
+  close,
+}) => {
+  const intl = useIntl();
+
+  const tagInput = useRef<HTMLTextAreaElement | null>(null);
+
+  return (
+    <ModalComponent
+      show
+      icon={faStar}
+      header={intl.formatMessage({
+        id: "tag_tagger.add_new_tags",
+      })}
+      accept={{
+        text: intl.formatMessage({
+          id: "tag_tagger.add_new_tags",
+        }),
+        onClick: () => {
+          if (tagInput.current) {
+            onBatchAdd(tagInput.current.value);
+          } else {
+            close();
+          }
+        },
+      }}
+      cancel={{
+        text: intl.formatMessage({ id: "actions.cancel" }),
+        variant: "danger",
+        onClick: () => close(),
+      }}
+      disabled={!isIdle}
+    >
+      <Form.Control
+        className="text-input"
+        as="textarea"
+        ref={tagInput}
+        placeholder={intl.formatMessage({
+          id: "tag_tagger.tag_names_or_stashids_separated_by_comma",
+        })}
+        rows={6}
+      />
+      <Form.Text>
+        <FormattedMessage id="tag_tagger.any_names_entered_will_be_queried" />
+      </Form.Text>
+    </ModalComponent>
+  );
+};
+
+interface ITagTaggerListProps {
+  tags: GQL.TagListDataFragment[];
+  selectedEndpoint: { endpoint: string; index: number };
+  isIdle: boolean;
+  config: ITaggerConfig;
+  onBatchAdd: (tagInput: string) => void;
+  onBatchUpdate: (ids: string[] | undefined, refresh: boolean) => void;
+}
+
+const TagTaggerList: React.FC<ITagTaggerListProps> = ({
+  tags,
+  selectedEndpoint,
+  isIdle,
+  config,
+  onBatchAdd,
+  onBatchUpdate,
+}) => {
+  const intl = useIntl();
+
+  const [loading, setLoading] = useState(false);
+  const [searchResults, setSearchResults] = useState<
+    Record<string, GQL.ScrapedSceneTagDataFragment[]>
+  >({});
+  const [searchErrors, setSearchErrors] = useState<
+    Record<string, string | undefined>
+  >({});
+  const [taggedTags, setTaggedTags] = useState<
+    Record<string, Partial<GQL.TagListDataFragment>>
+  >({});
+  const [queries, setQueries] = useState<Record<string, string>>({});
+
+  const [showBatchAdd, setShowBatchAdd] = useState(false);
+  const [showBatchUpdate, setShowBatchUpdate] = useState(false);
+
+  const [error, setError] = useState<
+    Record<string, { message?: string; details?: string } | undefined>
+  >({});
+  const [loadingUpdate, setLoadingUpdate] = useState<string | undefined>();
+
+  const doBoxSearch = (tagID: string, searchVal: string) => {
+    stashBoxTagQuery(searchVal, selectedEndpoint.endpoint)
+      .then((queryData) => {
+        const s = queryData.data?.scrapeSingleTag ?? [];
+        setSearchResults({
+          ...searchResults,
+          [tagID]: s,
+        });
+        setSearchErrors({
+          ...searchErrors,
+          [tagID]: undefined,
+        });
+        setLoading(false);
+      })
+      .catch(() => {
+        setLoading(false);
+        const { [tagID]: unassign, ...results } = searchResults;
+        setSearchResults(results);
+        setSearchErrors({
+          ...searchErrors,
+          [tagID]: intl.formatMessage({
+            id: "tag_tagger.network_error",
+          }),
+        });
+      });
+
+    setLoading(true);
+  };
+
+  const updateTag = useUpdateTag();
+
+  const doBoxUpdate = (tagID: string, stashID: string, endpoint: string) => {
+    setLoadingUpdate(stashID);
+    setError({
+      ...error,
+      [tagID]: undefined,
+    });
+    stashBoxTagQuery(stashID, endpoint)
+      .then(async (queryData) => {
+        const data = queryData.data?.scrapeSingleTag ?? [];
+        if (data.length > 0) {
+          const stashboxTag = data[0];
+          const updateData: GQL.TagUpdateInput = {
+            id: tagID,
+          };
+
+          if (
+            !(config.excludedTagFields ?? []).includes("name") &&
+            stashboxTag.name
+          ) {
+            updateData.name = stashboxTag.name;
+          }
+
+          if (
+            stashboxTag.description &&
+            !(config.excludedTagFields ?? []).includes("description")
+          ) {
+            updateData.description = stashboxTag.description;
+          }
+
+          if (
+            stashboxTag.alias_list &&
+            stashboxTag.alias_list.length > 0 &&
+            !(config.excludedTagFields ?? []).includes("aliases")
+          ) {
+            updateData.aliases = stashboxTag.alias_list;
+          }
+
+          if (stashboxTag.remote_site_id) {
+            updateData.stash_ids = await mergeTagStashIDs(tagID, [
+              {
+                endpoint,
+                stash_id: stashboxTag.remote_site_id,
+              },
+            ]);
+          }
+
+          const res = await updateTag(updateData);
+          if (!res?.data?.tagUpdate) {
+            setError({
+              ...error,
+              [tagID]: {
+                message: `Failed to update tag`,
+                details: res?.errors?.[0]?.message ?? "",
+              },
+            });
+          }
+        }
+      })
+      .finally(() => setLoadingUpdate(undefined));
+  };
+
+  async function handleBatchAdd(input: string) {
+    onBatchAdd(input);
+    setShowBatchAdd(false);
+  }
+
+  const handleBatchUpdate = (queryAll: boolean, refresh: boolean) => {
+    onBatchUpdate(!queryAll ? tags.map((t) => t.id) : undefined, refresh);
+    setShowBatchUpdate(false);
+  };
+
+  const handleTaggedTag = (
+    tag: Pick<GQL.TagListDataFragment, "id"> &
+      Partial<Omit<GQL.TagListDataFragment, "id">>
+  ) => {
+    setTaggedTags({
+      ...taggedTags,
+      [tag.id]: tag,
+    });
+  };
+
+  const renderTags = () =>
+    tags.map((tag) => {
+      const isTagged = taggedTags[tag.id];
+
+      const stashID = tag.stash_ids.find((s) => {
+        return s.endpoint === selectedEndpoint.endpoint;
+      });
+
+      let mainContent;
+      if (!isTagged && stashID !== undefined) {
+        mainContent = (
+          <div className="text-left">
+            <h5 className="text-bold">
+              <FormattedMessage id="tag_tagger.tag_already_tagged" />
+            </h5>
+          </div>
+        );
+      } else if (!isTagged && !stashID) {
+        mainContent = (
+          <InputGroup>
+            <Form.Control
+              className="text-input"
+              defaultValue={tag.name ?? ""}
+              onChange={(e) =>
+                setQueries({
+                  ...queries,
+                  [tag.id]: e.currentTarget.value,
+                })
+              }
+              onKeyPress={(e: React.KeyboardEvent<HTMLInputElement>) =>
+                e.key === "Enter" &&
+                doBoxSearch(tag.id, queries[tag.id] ?? tag.name ?? "")
+              }
+            />
+            <InputGroup.Append>
+              <Button
+                disabled={loading}
+                onClick={() =>
+                  doBoxSearch(tag.id, queries[tag.id] ?? tag.name ?? "")
+                }
+              >
+                <FormattedMessage id="actions.search" />
+              </Button>
+            </InputGroup.Append>
+          </InputGroup>
+        );
+      } else if (isTagged) {
+        mainContent = (
+          <div className="d-flex flex-column text-left">
+            <h5>
+              <FormattedMessage id="tag_tagger.tag_successfully_tagged" />
+            </h5>
+          </div>
+        );
+      }
+
+      let subContent;
+      if (stashID !== undefined) {
+        const base = stashID.endpoint.match(/https?:\/\/.*?\//)?.[0];
+        const link = base ? (
+          <ExternalLink
+            className="small d-block"
+            href={`${base}tags/${stashID.stash_id}`}
+          >
+            {stashID.stash_id}
+          </ExternalLink>
+        ) : (
+          <div className="small">{stashID.stash_id}</div>
+        );
+
+        subContent = (
+          <div key={tag.id}>
+            <InputGroup className="StudioTagger-box-link">
+              <InputGroup.Text>{link}</InputGroup.Text>
+              <InputGroup.Append>
+                <Button
+                  onClick={() =>
+                    doBoxUpdate(tag.id, stashID.stash_id, stashID.endpoint)
+                  }
+                  disabled={!!loadingUpdate}
+                >
+                  {loadingUpdate === stashID.stash_id ? (
+                    <LoadingIndicator inline small message="" />
+                  ) : (
+                    <FormattedMessage id="actions.refresh" />
+                  )}
+                </Button>
+              </InputGroup.Append>
+            </InputGroup>
+            {error[tag.id] && (
+              <div className="text-danger mt-1">
+                <strong>
+                  <span className="mr-2">Error:</span>
+                  {error[tag.id]?.message}
+                </strong>
+                <div>{error[tag.id]?.details}</div>
+              </div>
+            )}
+          </div>
+        );
+      } else if (searchErrors[tag.id]) {
+        subContent = (
+          <div className="text-danger font-weight-bold">
+            {searchErrors[tag.id]}
+          </div>
+        );
+      } else if (searchResults[tag.id]?.length === 0) {
+        subContent = (
+          <div className="text-danger font-weight-bold">
+            <FormattedMessage id="tag_tagger.no_results_found" />
+          </div>
+        );
+      }
+
+      let searchResult;
+      if (searchResults[tag.id]?.length > 0 && !isTagged) {
+        searchResult = (
+          <StashSearchResult
+            key={tag.id}
+            stashboxTags={searchResults[tag.id]}
+            tag={tag}
+            endpoint={selectedEndpoint.endpoint}
+            onTagTagged={handleTaggedTag}
+            excludedTagFields={config.excludedTagFields ?? []}
+          />
+        );
+      }
+
+      return (
+        <div key={tag.id} className={`${CLASSNAME}-studio`}>
+          <div className={`${CLASSNAME}-details`}>
+            <div></div>
+            <div>
+              <Card className="studio-card">
+                <img loading="lazy" src={tag.image_path ?? ""} alt="" />
+              </Card>
+            </div>
+            <div className={`${CLASSNAME}-details-text`}>
+              <Link to={`/tags/${tag.id}`} className={`${CLASSNAME}-header`}>
+                <h2>{tag.name}</h2>
+              </Link>
+              {mainContent}
+              <div className="sub-content text-left">{subContent}</div>
+              {searchResult}
+            </div>
+          </div>
+        </div>
+      );
+    });
+
+  return (
+    <Card>
+      {showBatchUpdate && (
+        <TagBatchUpdateModal
+          close={() => setShowBatchUpdate(false)}
+          isIdle={isIdle}
+          selectedEndpoint={selectedEndpoint}
+          tags={tags}
+          onBatchUpdate={handleBatchUpdate}
+        />
+      )}
+
+      {showBatchAdd && (
+        <TagBatchAddModal
+          close={() => setShowBatchAdd(false)}
+          isIdle={isIdle}
+          onBatchAdd={handleBatchAdd}
+        />
+      )}
+      <div className="ml-auto mb-3">
+        <Button onClick={() => setShowBatchAdd(true)}>
+          <FormattedMessage id="tag_tagger.batch_add_tags" />
+        </Button>
+        <Button className="ml-3" onClick={() => setShowBatchUpdate(true)}>
+          <FormattedMessage id="tag_tagger.batch_update_tags" />
+        </Button>
+      </div>
+      <div className={CLASSNAME}>{renderTags()}</div>
+    </Card>
+  );
+};
+
+interface ITaggerProps {
+  tags: GQL.TagListDataFragment[];
+}
+
+export const TagTagger: React.FC<ITaggerProps> = ({ tags }) => {
+  const jobsSubscribe = useJobsSubscribe();
+  const intl = useIntl();
+  const { configuration: stashConfig } = useConfigurationContext();
+  const { config, setConfig } = useTaggerConfig();
+  const [showConfig, setShowConfig] = useState(false);
+  const [showManual, setShowManual] = useState(false);
+
+  const [batchJobID, setBatchJobID] = useState<string | undefined | null>();
+  const [batchJob, setBatchJob] = useState<JobFragment | undefined>();
+
+  useEffect(() => {
+    if (!jobsSubscribe.data) {
+      return;
+    }
+
+    const event = jobsSubscribe.data.jobsSubscribe;
+    if (event.job.id !== batchJobID) {
+      return;
+    }
+
+    if (event.type !== GQL.JobStatusUpdateType.Remove) {
+      setBatchJob(event.job);
+    } else {
+      setBatchJob(undefined);
+      setBatchJobID(undefined);
+
+      const ac = getClient();
+      ac.cache.evict({ fieldName: "findTags" });
+      ac.cache.gc();
+    }
+  }, [jobsSubscribe, batchJobID]);
+
+  if (!config) return <LoadingIndicator />;
+
+  const savedEndpointIndex =
+    stashConfig?.general.stashBoxes.findIndex(
+      (s) => s.endpoint === config.selectedEndpoint
+    ) ?? -1;
+  const selectedEndpointIndex =
+    savedEndpointIndex === -1 && stashConfig?.general.stashBoxes.length
+      ? 0
+      : savedEndpointIndex;
+  const selectedEndpoint =
+    stashConfig?.general.stashBoxes[selectedEndpointIndex];
+
+  async function batchAdd(tagInput: string) {
+    if (tagInput && selectedEndpoint) {
+      const inputs = tagInput
+        .split(",")
+        .map((n) => n.trim())
+        .filter((n) => n.length > 0);
+
+      const { names, stashIds } = separateNamesAndStashIds(inputs);
+
+      if (names.length > 0 || stashIds.length > 0) {
+        const ret = await mutateStashBoxBatchTagTag({
+          names: names.length > 0 ? names : undefined,
+          stash_ids: stashIds.length > 0 ? stashIds : undefined,
+          endpoint: selectedEndpointIndex,
+          refresh: false,
+          createParent: false,
+          exclude_fields: config?.excludedTagFields ?? [],
+        });
+
+        setBatchJobID(ret.data?.stashBoxBatchTagTag);
+      }
+    }
+  }
+
+  async function batchUpdate(ids: string[] | undefined, refresh: boolean) {
+    if (selectedEndpoint) {
+      const ret = await mutateStashBoxBatchTagTag({
+        ids: ids,
+        endpoint: selectedEndpointIndex,
+        refresh,
+        createParent: false,
+        exclude_fields: config?.excludedTagFields ?? [],
+      });
+
+      setBatchJobID(ret.data?.stashBoxBatchTagTag);
+    }
+  }
+
+  function renderStatus() {
+    if (batchJob) {
+      const progress =
+        batchJob.progress !== undefined && batchJob.progress !== null
+          ? batchJob.progress * 100
+          : undefined;
+      return (
+        <Form.Group className="px-4">
+          <h5>
+            <FormattedMessage id="tag_tagger.status_tagging_tags" />
+          </h5>
+          {progress !== undefined && (
+            <ProgressBar
+              animated
+              now={progress}
+              label={`${progress.toFixed(0)}%`}
+            />
+          )}
+        </Form.Group>
+      );
+    }
+
+    if (batchJobID !== undefined) {
+      return (
+        <Form.Group className="px-4">
+          <h5>
+            <FormattedMessage id="tag_tagger.status_tagging_job_queued" />
+          </h5>
+        </Form.Group>
+      );
+    }
+  }
+
+  const showHideConfigId = showConfig
+    ? "actions.hide_configuration"
+    : "actions.show_configuration";
+
+  return (
+    <>
+      <Manual
+        show={showManual}
+        onClose={() => setShowManual(false)}
+        defaultActiveTab="Tagger.md"
+      />
+      {renderStatus()}
+      <div className="tagger-container mx-md-auto">
+        {selectedEndpointIndex !== -1 && selectedEndpoint ? (
+          <>
+            <div className="row mb-2 no-gutters">
+              <Button onClick={() => setShowConfig(!showConfig)} variant="link">
+                {intl.formatMessage({ id: showHideConfigId })}
+              </Button>
+              <Button
+                className="ml-auto"
+                onClick={() => setShowManual(true)}
+                title={intl.formatMessage({ id: "help" })}
+                variant="link"
+              >
+                <FormattedMessage id="help" />
+              </Button>
+            </div>
+
+            <TaggerConfig
+              config={config}
+              setConfig={setConfig}
+              show={showConfig}
+              excludedFields={config.excludedTagFields ?? []}
+              onFieldsChange={(fields) =>
+                setConfig({ ...config, excludedTagFields: fields })
+              }
+              fields={TAG_FIELDS}
+              entityName="tags"
+            />
+            <TagTaggerList
+              tags={tags}
+              selectedEndpoint={{
+                endpoint: selectedEndpoint.endpoint,
+                index: selectedEndpointIndex,
+              }}
+              isIdle={batchJobID === undefined}
+              config={config}
+              onBatchAdd={batchAdd}
+              onBatchUpdate={batchUpdate}
+            />
+          </>
+        ) : (
+          <div className="my-4">
+            <h3 className="text-center mt-4">
+              <FormattedMessage id="tag_tagger.to_use_the_tag_tagger" />
+            </h3>
+            <h5 className="text-center">
+              Please see{" "}
+              <HashLink
+                to="/settings?tab=metadata-providers#stash-boxes"
+                scroll={(el) =>
+                  el.scrollIntoView({ behavior: "smooth", block: "center" })
+                }
+              >
+                Settings.
+              </HashLink>
+            </h5>
+          </div>
+        )}
+      </div>
+    </>
+  );
+};
diff --git a/ui/v2.5/src/components/Tagger/utils.ts b/ui/v2.5/src/components/Tagger/utils.ts
index 8c1cf54e5..cddad33d9 100644
--- a/ui/v2.5/src/components/Tagger/utils.ts
+++ b/ui/v2.5/src/components/Tagger/utils.ts
@@ -1,6 +1,6 @@
 import * as GQL from "src/core/generated-graphql";
 import { ParseMode } from "./constants";
-import { queryFindStudio } from "src/core/StashService";
+import { queryFindStudio, queryFindTag } from "src/core/StashService";
 import { mergeStashIDs } from "src/utils/stashbox";
 
 const months = [
@@ -173,14 +173,32 @@ export const parsePath = (filePath: string) => {
   return { paths, file, ext };
 };
 
-export async function mergeStudioStashIDs(
+async function mergeEntityStashIDs(
+  fetchExisting: (id: string) => Promise<GQL.StashIdInput[] | undefined>,
   id: string,
   newStashIDs: GQL.StashIdInput[]
 ) {
-  const existing = await queryFindStudio(id);
-  if (existing?.data?.findStudio?.stash_ids) {
-    return mergeStashIDs(existing.data.findStudio.stash_ids, newStashIDs);
+  const existing = await fetchExisting(id);
+  if (existing) {
+    return mergeStashIDs(existing, newStashIDs);
   }
-
   return newStashIDs;
 }
+
+export const mergeStudioStashIDs = (
+  id: string,
+  newStashIDs: GQL.StashIdInput[]
+) =>
+  mergeEntityStashIDs(
+    async (studioId) =>
+      (await queryFindStudio(studioId))?.data?.findStudio?.stash_ids,
+    id,
+    newStashIDs
+  );
+
+export const mergeTagStashIDs = (id: string, newStashIDs: GQL.StashIdInput[]) =>
+  mergeEntityStashIDs(
+    async (tagId) => (await queryFindTag(tagId))?.data?.findTag?.stash_ids,
+    id,
+    newStashIDs
+  );
diff --git a/ui/v2.5/src/components/Tags/TagList.tsx b/ui/v2.5/src/components/Tags/TagList.tsx
index e30f6071b..61b81b727 100644
--- a/ui/v2.5/src/components/Tags/TagList.tsx
+++ b/ui/v2.5/src/components/Tags/TagList.tsx
@@ -30,6 +30,7 @@ import { EditTagsDialog } from "./EditTagsDialog";
 import { View } from "../List/views";
 import { IItemListOperation } from "../List/FilteredListToolbar";
 import { PatchComponent } from "src/patch";
+import { TagTagger } from "../Tagger/tags/TagTagger";
 
 function getItems(result: GQL.FindTagsForListQueryResult) {
   return result?.data?.findTags?.tags ?? [];
@@ -355,6 +356,9 @@ export const TagList: React.FC<ITagList> = PatchComponent(
         if (filter.displayMode === DisplayMode.Wall) {
           return <h1>TODO</h1>;
         }
+        if (filter.displayMode === DisplayMode.Tagger) {
+          return <TagTagger tags={result.data.findTags.tags} />;
+        }
       }
       return (
         <>
diff --git a/ui/v2.5/src/core/StashService.ts b/ui/v2.5/src/core/StashService.ts
index d276806fc..27186d6e1 100644
--- a/ui/v2.5/src/core/StashService.ts
+++ b/ui/v2.5/src/core/StashService.ts
@@ -2463,6 +2463,12 @@ export const mutateStashBoxBatchStudioTag = (
     variables: { input },
   });
 
+export const mutateStashBoxBatchTagTag = (input: GQL.StashBoxBatchTagInput) =>
+  client.mutate<GQL.StashBoxBatchTagTagMutation>({
+    mutation: GQL.StashBoxBatchTagTagDocument,
+    variables: { input },
+  });
+
 export const useListGroupScrapers = () => GQL.useListGroupScrapersQuery();
 
 export const queryScrapeGroupURL = (url: string) =>
diff --git a/ui/v2.5/src/locales/en-GB.json b/ui/v2.5/src/locales/en-GB.json
index 629f1ece8..b7d3e2894 100644
--- a/ui/v2.5/src/locales/en-GB.json
+++ b/ui/v2.5/src/locales/en-GB.json
@@ -1345,14 +1345,6 @@
     "any_names_entered_will_be_queried": "Any names entered will be queried from the remote Stash-Box instance and added if found. Only exact matches will be considered a match.",
     "batch_add_performers": "Batch Add Performers",
     "batch_update_performers": "Batch Update Performers",
-    "config": {
-      "active_stash-box_instance": "Active stash-box instance:",
-      "edit_excluded_fields": "Edit Excluded Fields",
-      "excluded_fields": "Excluded fields:",
-      "no_fields_are_excluded": "No fields are excluded",
-      "no_instances_found": "No instances found",
-      "these_fields_will_not_be_changed_when_updating_performers": "These fields will not be changed when updating performers."
-    },
     "current_page": "Current page",
     "failed_to_save_performer": "Failed to save performer \"{performer}\"",
     "name_already_exists": "Name already exists",
@@ -1555,14 +1547,8 @@
     "batch_add_studios": "Batch Add Studios",
     "batch_update_studios": "Batch Update Studios",
     "config": {
-      "active_stash-box_instance": "Active stash-box instance:",
       "create_parent_desc": "Create missing parent studios, or tag and update data/image for existing parent studios with exact name matches",
-      "create_parent_label": "Create parent studios",
-      "edit_excluded_fields": "Edit Excluded Fields",
-      "excluded_fields": "Excluded fields:",
-      "no_fields_are_excluded": "No fields are excluded",
-      "no_instances_found": "No instances found",
-      "these_fields_will_not_be_changed_when_updating_studios": "These fields will not be changed when updating studios."
+      "create_parent_label": "Create parent studios"
     },
     "create_or_tag_parent_studios": "Create missing or tag existing parent studios",
     "current_page": "Current page",
@@ -1604,6 +1590,42 @@
   "tag_count": "Tag Count",
   "tag_parent_tooltip": "Has parent tags",
   "tag_sub_tag_tooltip": "Has sub-tags",
+  "tag_tagger": {
+    "add_new_tags": "Add New Tags",
+    "any_names_entered_will_be_queried": "Any names entered will be queried from the remote Stash-Box instance and added if found. Only exact matches will be considered a match.",
+    "batch_add_tags": "Batch Add Tags",
+    "batch_update_tags": "Batch Update Tags",
+    "current_page": "Current page",
+    "failed_to_save_tag": "Failed to save tag \"{tag}\"",
+    "name_already_exists": "Name already exists",
+    "network_error": "Network Error",
+    "no_results_found": "No results found.",
+    "number_of_tags_will_be_processed": "{tag_count} tags will be processed",
+    "query_all_tags_in_the_database": "All tags in the database",
+    "refresh_tagged_tags": "Refresh tagged tags",
+    "refreshing_will_update_the_data": "Refreshing will update the data of any tagged tags from the stash-box instance.",
+    "status_tagging_job_queued": "Status: Tagging job queued",
+    "status_tagging_tags": "Status: Tagging tags",
+    "tag_already_tagged": "Tag already tagged",
+    "tag_names_or_stashids_separated_by_comma": "Tag names or StashIDs separated by comma",
+    "tag_selection": "Tag selection",
+    "tag_successfully_tagged": "Tag successfully tagged",
+    "tag_status": "Tag Status",
+    "to_use_the_tag_tagger": "To use the tag tagger a stash-box instance needs to be configured.",
+    "untagged_tags": "Untagged tags",
+    "update_tags": "Update Tags",
+    "updating_untagged_tags_description": "Updating untagged tags will try to match any tags that lack a stashid and update the metadata."
+  },
+  "tagger": {
+    "config": {
+      "active_stash-box_instance": "Active stash-box instance:",
+      "edit_excluded_fields": "Edit Excluded Fields",
+      "excluded_fields": "Excluded fields:",
+      "fields_will_not_be_changed": "These fields will not be changed when updating {entity}.",
+      "no_fields_are_excluded": "No fields are excluded",
+      "no_instances_found": "No instances found"
+    }
+  },
   "tags": "Tags",
   "tattoos": "Tattoos",
   "time": "Time",
diff --git a/ui/v2.5/src/models/list-filter/tags.ts b/ui/v2.5/src/models/list-filter/tags.ts
index e2d4fbed4..39ce9ca39 100644
--- a/ui/v2.5/src/models/list-filter/tags.ts
+++ b/ui/v2.5/src/models/list-filter/tags.ts
@@ -50,7 +50,11 @@ const sortByOptions = ["name", "random", "scenes_duration"]
     },
   ]);
 
-const displayModeOptions = [DisplayMode.Grid, DisplayMode.List];
+const displayModeOptions = [
+  DisplayMode.Grid,
+  DisplayMode.List,
+  DisplayMode.Tagger,
+];
 const criterionOptions = [
   FavoriteTagCriterionOption,
   createMandatoryStringCriterionOption("name"),

From cf04e854d62178a719909d97e79d0b4318790040 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Wed, 25 Feb 2026 14:21:16 +1100
Subject: [PATCH 313/405] Fix missing message id changes from #6600

---
 .../Galleries/GalleryDetails/GalleryFileInfoPanel.tsx         | 2 +-
 ui/v2.5/src/components/Tagger/scenes/StashSearchResult.tsx    | 2 +-
 ui/v2.5/src/models/list-filter/galleries.ts                   | 2 +-
 ui/v2.5/src/models/list-filter/images.ts                      | 2 +-
 ui/v2.5/src/models/list-filter/scenes.ts                      | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryFileInfoPanel.tsx b/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryFileInfoPanel.tsx
index e97146b91..b7dab09a0 100644
--- a/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryFileInfoPanel.tsx
+++ b/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryFileInfoPanel.tsx
@@ -38,7 +38,7 @@ const FileInfoPanel: React.FC<IFileInfoPanelProps> = (
             </dd>
           </>
         )}
-        <TextField id="media_info.checksum" value={checksum?.value} truncate />
+        <TextField id="media_info.md5" value={checksum?.value} truncate />
         <TextField id={id}>
           <span className="d-flex align-items-center">
             <TruncatedText text={path} />
diff --git a/ui/v2.5/src/components/Tagger/scenes/StashSearchResult.tsx b/ui/v2.5/src/components/Tagger/scenes/StashSearchResult.tsx
index dc0a616d6..f39fef103 100755
--- a/ui/v2.5/src/components/Tagger/scenes/StashSearchResult.tsx
+++ b/ui/v2.5/src/components/Tagger/scenes/StashSearchResult.tsx
@@ -201,7 +201,7 @@ const getFingerprintStatus = (
             <FormattedMessage
               id="component_tagger.results.hash_matches"
               values={{
-                hash_type: <FormattedMessage id="media_info.checksum" />,
+                hash_type: <FormattedMessage id="media_info.md5" />,
               }}
             />
           </div>
diff --git a/ui/v2.5/src/models/list-filter/galleries.ts b/ui/v2.5/src/models/list-filter/galleries.ts
index 630267c72..3d4d40a1c 100644
--- a/ui/v2.5/src/models/list-filter/galleries.ts
+++ b/ui/v2.5/src/models/list-filter/galleries.ts
@@ -49,7 +49,7 @@ const criterionOptions = [
   createStringCriterionOption("details"),
   createStringCriterionOption("photographer"),
   PathCriterionOption,
-  createStringCriterionOption("checksum", "media_info.checksum"),
+  createStringCriterionOption("checksum", "media_info.md5"),
   RatingCriterionOption,
   OrganizedCriterionOption,
   AverageResolutionCriterionOption,
diff --git a/ui/v2.5/src/models/list-filter/images.ts b/ui/v2.5/src/models/list-filter/images.ts
index 2d3db8265..9468e5eaf 100644
--- a/ui/v2.5/src/models/list-filter/images.ts
+++ b/ui/v2.5/src/models/list-filter/images.ts
@@ -47,7 +47,7 @@ const criterionOptions = [
   createStringCriterionOption("code", "scene_code"),
   createStringCriterionOption("details"),
   createStringCriterionOption("photographer"),
-  createMandatoryStringCriterionOption("checksum", "media_info.checksum"),
+  createMandatoryStringCriterionOption("checksum", "media_info.md5"),
   PhashCriterionOption,
   PathCriterionOption,
   GalleriesCriterionOption,
diff --git a/ui/v2.5/src/models/list-filter/scenes.ts b/ui/v2.5/src/models/list-filter/scenes.ts
index 251e2592d..f4f93deeb 100644
--- a/ui/v2.5/src/models/list-filter/scenes.ts
+++ b/ui/v2.5/src/models/list-filter/scenes.ts
@@ -97,8 +97,8 @@ const criterionOptions = [
   PathCriterionOption,
   createStringCriterionOption("details"),
   createStringCriterionOption("director"),
-  createMandatoryStringCriterionOption("oshash", "media_info.hash"),
-  createStringCriterionOption("checksum", "media_info.checksum"),
+  createMandatoryStringCriterionOption("oshash", "media_info.oshash"),
+  createStringCriterionOption("checksum", "media_info.md5"),
   PhashCriterionOption,
   DuplicatedCriterionOption,
   OrganizedCriterionOption,

From 01d351c85d57b4a580cefd4482c1499afa829c05 Mon Sep 17 00:00:00 2001
From: Gykes <24581046+Gykes@users.noreply.github.com>
Date: Tue, 24 Feb 2026 19:56:24 -0800
Subject: [PATCH 314/405] FR: Custom Fields Frontend (#6601)

* Add "custom-field-" prefix to custom field detail item ids
---------
Co-authored-by: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
---
 ui/v2.5/graphql/data/gallery.graphql          |   2 +
 ui/v2.5/graphql/data/group.graphql            |   2 +
 ui/v2.5/graphql/data/image.graphql            |   2 +
 ui/v2.5/graphql/data/scene.graphql            |   2 +
 ui/v2.5/graphql/data/studio.graphql           |   1 +
 ui/v2.5/graphql/queries/scene.graphql         |   8 ++
 .../GalleryDetails/GalleryDetailPanel.tsx     |   2 +
 .../GalleryDetails/GalleryEditPanel.tsx       |  39 ++++++-
 ui/v2.5/src/components/Galleries/styles.scss  |  14 +++
 .../Groups/GroupDetails/GroupDetailsPanel.tsx |   2 +
 .../Groups/GroupDetails/GroupEditPanel.tsx    |  37 +++++-
 .../Images/ImageDetails/ImageDetailPanel.tsx  |   2 +
 .../Images/ImageDetails/ImageEditPanel.tsx    |  30 ++++-
 ui/v2.5/src/components/Images/styles.scss     |  14 +++
 .../PerformerDetails/PerformerEditPanel.tsx   |  19 +--
 ui/v2.5/src/components/Performers/styles.scss |   5 -
 .../Scenes/SceneDetails/SceneDetailPanel.tsx  |   2 +
 .../Scenes/SceneDetails/SceneEditPanel.tsx    |  39 ++++++-
 .../components/Scenes/SceneMergeDialog.tsx    | 109 ++++++++++++++----
 ui/v2.5/src/components/Scenes/styles.scss     |  14 +++
 .../src/components/Shared/CustomFields.tsx    |  25 ++--
 ui/v2.5/src/components/Shared/styles.scss     |  35 ++++++
 .../StudioDetails/StudioDetailsPanel.tsx      |   2 +
 .../Studios/StudioDetails/StudioEditPanel.tsx |  38 +++++-
 .../Tags/TagDetails/TagDetailsPanel.tsx       |   2 +
 .../Tags/TagDetails/TagEditPanel.tsx          |  36 +++++-
 ui/v2.5/src/core/StashService.ts              |   8 ++
 ui/v2.5/src/models/list-filter/galleries.ts   |   2 +
 ui/v2.5/src/models/list-filter/groups.ts      |   2 +
 ui/v2.5/src/models/list-filter/images.ts      |   2 +
 ui/v2.5/src/models/list-filter/scenes.ts      |   2 +
 ui/v2.5/src/models/list-filter/studios.ts     |   2 +
 ui/v2.5/src/models/list-filter/tags.ts        |   2 +
 33 files changed, 434 insertions(+), 69 deletions(-)

diff --git a/ui/v2.5/graphql/data/gallery.graphql b/ui/v2.5/graphql/data/gallery.graphql
index 89f3ed44c..349a52ad7 100644
--- a/ui/v2.5/graphql/data/gallery.graphql
+++ b/ui/v2.5/graphql/data/gallery.graphql
@@ -39,6 +39,8 @@ fragment GalleryData on Gallery {
   scenes {
     ...SlimSceneData
   }
+
+  custom_fields
 }
 
 fragment SelectGalleryData on Gallery {
diff --git a/ui/v2.5/graphql/data/group.graphql b/ui/v2.5/graphql/data/group.graphql
index 440c420da..a9968bbae 100644
--- a/ui/v2.5/graphql/data/group.graphql
+++ b/ui/v2.5/graphql/data/group.graphql
@@ -39,6 +39,8 @@ fragment GroupData on Group {
     id
     title
   }
+
+  custom_fields
 }
 
 # Lightweight fragment for list views - excludes expensive recursive counts
diff --git a/ui/v2.5/graphql/data/image.graphql b/ui/v2.5/graphql/data/image.graphql
index 52163b007..63ce5b458 100644
--- a/ui/v2.5/graphql/data/image.graphql
+++ b/ui/v2.5/graphql/data/image.graphql
@@ -37,4 +37,6 @@ fragment ImageData on Image {
   visual_files {
     ...VisualFileData
   }
+
+  custom_fields
 }
diff --git a/ui/v2.5/graphql/data/scene.graphql b/ui/v2.5/graphql/data/scene.graphql
index e4a6e5cc6..b7378c1da 100644
--- a/ui/v2.5/graphql/data/scene.graphql
+++ b/ui/v2.5/graphql/data/scene.graphql
@@ -79,6 +79,8 @@ fragment SceneData on Scene {
     mime_type
     label
   }
+
+  custom_fields
 }
 
 fragment SelectSceneData on Scene {
diff --git a/ui/v2.5/graphql/data/studio.graphql b/ui/v2.5/graphql/data/studio.graphql
index 8347b4739..0e23a885e 100644
--- a/ui/v2.5/graphql/data/studio.graphql
+++ b/ui/v2.5/graphql/data/studio.graphql
@@ -41,6 +41,7 @@ fragment StudioData on Studio {
     ...SlimTagData
   }
   o_counter
+  custom_fields
 }
 
 fragment SelectStudioData on Studio {
diff --git a/ui/v2.5/graphql/queries/scene.graphql b/ui/v2.5/graphql/queries/scene.graphql
index d6a3afd47..0e1a9fa11 100644
--- a/ui/v2.5/graphql/queries/scene.graphql
+++ b/ui/v2.5/graphql/queries/scene.graphql
@@ -40,6 +40,14 @@ query FindScene($id: ID!, $checksum: String) {
   }
 }
 
+query FindFullScenes($ids: [Int!]) {
+  findScenes(scene_ids: $ids) {
+    scenes {
+      ...SceneData
+    }
+  }
+}
+
 query FindSceneMarkerTags($id: ID!) {
   sceneMarkerTags(scene_id: $id) {
     tag {
diff --git a/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryDetailPanel.tsx b/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryDetailPanel.tsx
index 597a57b15..ead882ec0 100644
--- a/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryDetailPanel.tsx
+++ b/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryDetailPanel.tsx
@@ -6,6 +6,7 @@ import { TagLink } from "src/components/Shared/TagLink";
 import { PerformerCard } from "src/components/Performers/PerformerCard";
 import { sortPerformers } from "src/core/performers";
 import { PhotographerLink } from "src/components/Shared/Link";
+import { CustomFields } from "src/components/Shared/CustomFields";
 
 interface IGalleryDetailProps {
   gallery: GQL.GalleryDataFragment;
@@ -108,6 +109,7 @@ export const GalleryDetailPanel: React.FC<IGalleryDetailProps> = ({
           {renderDetails()}
           {renderTags()}
           {renderPerformers()}
+          <CustomFields values={gallery.custom_fields} fullWidth />
         </div>
       </div>
     </>
diff --git a/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryEditPanel.tsx b/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryEditPanel.tsx
index 04b802784..14b5d6aad 100644
--- a/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryEditPanel.tsx
+++ b/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryEditPanel.tsx
@@ -31,6 +31,11 @@ import { Studio, StudioSelect } from "src/components/Studios/StudioSelect";
 import { Scene, SceneSelect } from "src/components/Scenes/SceneSelect";
 import { useTagsEdit } from "src/hooks/tagsEdit";
 import { ScraperMenu } from "src/components/Shared/ScraperMenu";
+import {
+  CustomFieldsInput,
+  formatCustomFieldInput,
+} from "src/components/Shared/CustomFields";
+import { cloneDeep } from "@apollo/client/utilities";
 
 interface IProps {
   gallery: Partial<GQL.GalleryDataFragment>;
@@ -76,6 +81,7 @@ export const GalleryEditPanel: React.FC<IProps> = ({
     tag_ids: yup.array(yup.string().required()).defined(),
     scene_ids: yup.array(yup.string().required()).defined(),
     details: yup.string().ensure(),
+    custom_fields: yup.object().required().defined(),
   });
 
   const initialValues = {
@@ -89,15 +95,26 @@ export const GalleryEditPanel: React.FC<IProps> = ({
     tag_ids: (gallery?.tags ?? []).map((t) => t.id),
     scene_ids: (gallery?.scenes ?? []).map((s) => s.id),
     details: gallery?.details ?? "",
+    custom_fields: cloneDeep(gallery?.custom_fields ?? {}),
   };
 
   type InputValues = yup.InferType<typeof schema>;
 
+  const [customFieldsError, setCustomFieldsError] = useState<string>();
+
+  function submit(values: InputValues) {
+    const input = {
+      ...schema.cast(values),
+      custom_fields: formatCustomFieldInput(isNew, values.custom_fields),
+    };
+    onSave(input);
+  }
+
   const formik = useFormik<InputValues>({
     initialValues,
     enableReinitialize: true,
     validate: yupFormikValidate(schema),
-    onSubmit: (values) => onSave(schema.cast(values)),
+    onSubmit: submit,
   });
 
   const { tags, updateTagsStateFromScraper, tagsControl } = useTagsEdit(
@@ -189,7 +206,10 @@ export const GalleryEditPanel: React.FC<IProps> = ({
   }
 
   async function onSaveAndNewClick() {
-    const input = schema.cast(formik.values);
+    const input = {
+      ...schema.cast(formik.values),
+      custom_fields: formatCustomFieldInput(isNew, formik.values.custom_fields),
+    };
     onSave(input, true);
   }
 
@@ -455,7 +475,9 @@ export const GalleryEditPanel: React.FC<IProps> = ({
                 id="gallery-save-split-button"
                 className="edit-button"
                 variant="primary"
-                disabled={!isEqual(formik.errors, {})}
+                disabled={
+                  !isEqual(formik.errors, {}) || customFieldsError !== undefined
+                }
                 title={intl.formatMessage({ id: "actions.save" })}
                 onClick={() => formik.submitForm()}
               >
@@ -468,7 +490,9 @@ export const GalleryEditPanel: React.FC<IProps> = ({
                 className="edit-button"
                 variant="primary"
                 disabled={
-                  (!isNew && !formik.dirty) || !isEqual(formik.errors, {})
+                  (!isNew && !formik.dirty) ||
+                  !isEqual(formik.errors, {}) ||
+                  customFieldsError !== undefined
                 }
                 onClick={() => formik.submitForm()}
               >
@@ -523,6 +547,13 @@ export const GalleryEditPanel: React.FC<IProps> = ({
               </Form.Label>
               {cover}
             </Form.Group>
+
+            <CustomFieldsInput
+              values={formik.values.custom_fields}
+              onChange={(v) => formik.setFieldValue("custom_fields", v)}
+              error={customFieldsError}
+              setError={(e) => setCustomFieldsError(e)}
+            />
           </Col>
         </Row>
       </Form>
diff --git a/ui/v2.5/src/components/Galleries/styles.scss b/ui/v2.5/src/components/Galleries/styles.scss
index c53175313..ac9330e9a 100644
--- a/ui/v2.5/src/components/Galleries/styles.scss
+++ b/ui/v2.5/src/components/Galleries/styles.scss
@@ -208,6 +208,20 @@ $galleryTabWidth: 450px;
   .form-group[data-field="urls"] .string-list-input input.form-control {
     font-size: 0.85em;
   }
+
+  @include media-breakpoint-up(xl) {
+    .custom-fields-input {
+      .custom-fields-field {
+        flex: 0 0 25%;
+        max-width: 25%;
+      }
+
+      .custom-fields-value {
+        flex: 0 0 75%;
+        max-width: 75%;
+      }
+    }
+  }
 }
 
 .gallery-cover {
diff --git a/ui/v2.5/src/components/Groups/GroupDetails/GroupDetailsPanel.tsx b/ui/v2.5/src/components/Groups/GroupDetails/GroupDetailsPanel.tsx
index b8e39ffe6..8ae4b16a9 100644
--- a/ui/v2.5/src/components/Groups/GroupDetails/GroupDetailsPanel.tsx
+++ b/ui/v2.5/src/components/Groups/GroupDetails/GroupDetailsPanel.tsx
@@ -6,6 +6,7 @@ import { DetailItem } from "src/components/Shared/DetailItem";
 import { Link } from "react-router-dom";
 import { DirectorLink } from "src/components/Shared/Link";
 import { GroupLink, TagLink } from "src/components/Shared/TagLink";
+import { CustomFields } from "src/components/Shared/CustomFields";
 
 interface IGroupDescription {
   group: GQL.SlimGroupDataFragment;
@@ -101,6 +102,7 @@ export const GroupDetailsPanel: React.FC<IGroupDetailsPanel> = ({
           fullWidth={fullWidth}
         />
       )}
+      <CustomFields values={group.custom_fields} />
     </div>
   );
 };
diff --git a/ui/v2.5/src/components/Groups/GroupDetails/GroupEditPanel.tsx b/ui/v2.5/src/components/Groups/GroupDetails/GroupEditPanel.tsx
index f0a6f17c1..6401738fa 100644
--- a/ui/v2.5/src/components/Groups/GroupDetails/GroupEditPanel.tsx
+++ b/ui/v2.5/src/components/Groups/GroupDetails/GroupEditPanel.tsx
@@ -28,6 +28,11 @@ import { Studio, StudioSelect } from "src/components/Studios/StudioSelect";
 import { useTagsEdit } from "src/hooks/tagsEdit";
 import { Group } from "src/components/Groups/GroupSelect";
 import { RelatedGroupTable, IRelatedGroupEntry } from "./RelatedGroupTable";
+import {
+  CustomFieldsInput,
+  formatCustomFieldInput,
+} from "src/components/Shared/CustomFields";
+import { cloneDeep } from "@apollo/client/utilities";
 
 interface IGroupEditPanel {
   group: Partial<GQL.GroupDataFragment>;
@@ -84,6 +89,7 @@ export const GroupEditPanel: React.FC<IGroupEditPanel> = ({
     synopsis: yup.string().ensure(),
     front_image: yup.string().nullable().optional(),
     back_image: yup.string().nullable().optional(),
+    custom_fields: yup.object().required().defined(),
   });
 
   const initialValues = {
@@ -99,15 +105,26 @@ export const GroupEditPanel: React.FC<IGroupEditPanel> = ({
     director: group?.director ?? "",
     urls: group?.urls ?? [],
     synopsis: group?.synopsis ?? "",
+    custom_fields: cloneDeep(group?.custom_fields ?? {}),
   };
 
   type InputValues = yup.InferType<typeof schema>;
 
+  const [customFieldsError, setCustomFieldsError] = useState<string>();
+
+  function submit(values: InputValues) {
+    const input = {
+      ...schema.cast(values),
+      custom_fields: formatCustomFieldInput(isNew, values.custom_fields),
+    };
+    onSave(input);
+  }
+
   const formik = useFormik<InputValues>({
     initialValues,
     enableReinitialize: true,
     validate: yupFormikValidate(schema),
-    onSubmit: (values) => onSave(schema.cast(values)),
+    onSubmit: submit,
   });
 
   const { tags, updateTagsStateFromScraper, tagsControl } = useTagsEdit(
@@ -220,7 +237,10 @@ export const GroupEditPanel: React.FC<IGroupEditPanel> = ({
   }
 
   async function onSaveAndNewClick() {
-    const input = schema.cast(formik.values);
+    const input = {
+      ...schema.cast(formik.values),
+      custom_fields: formatCustomFieldInput(isNew, formik.values.custom_fields),
+    };
     onSave(input, true);
   }
 
@@ -458,6 +478,13 @@ export const GroupEditPanel: React.FC<IGroupEditPanel> = ({
         {renderURLListField("urls", onScrapeGroupURL, urlScrapable)}
         {renderInputField("synopsis", "textarea")}
         {renderTagsField()}
+
+        <CustomFieldsInput
+          values={formik.values.custom_fields}
+          onChange={(v) => formik.setFieldValue("custom_fields", v)}
+          error={customFieldsError}
+          setError={(e) => setCustomFieldsError(e)}
+        />
       </Form>
 
       <DetailsEditNavbar
@@ -468,7 +495,11 @@ export const GroupEditPanel: React.FC<IGroupEditPanel> = ({
         onToggleEdit={onCancel}
         onSave={formik.handleSubmit}
         onSaveAndNew={isNew ? onSaveAndNewClick : undefined}
-        saveDisabled={(!isNew && !formik.dirty) || !isEqual(formik.errors, {})}
+        saveDisabled={
+          (!isNew && !formik.dirty) ||
+          !isEqual(formik.errors, {}) ||
+          customFieldsError !== undefined
+        }
         onImageChange={onFrontImageChange}
         onImageChangeURL={onFrontImageLoad}
         onClearImage={() => onFrontImageLoad(null)}
diff --git a/ui/v2.5/src/components/Images/ImageDetails/ImageDetailPanel.tsx b/ui/v2.5/src/components/Images/ImageDetails/ImageDetailPanel.tsx
index a2044fcff..cf33b648b 100644
--- a/ui/v2.5/src/components/Images/ImageDetails/ImageDetailPanel.tsx
+++ b/ui/v2.5/src/components/Images/ImageDetails/ImageDetailPanel.tsx
@@ -7,6 +7,7 @@ import { sortPerformers } from "src/core/performers";
 import { FormattedMessage, useIntl } from "react-intl";
 import { PhotographerLink } from "src/components/Shared/Link";
 import { PatchComponent } from "../../../patch";
+import { CustomFields } from "src/components/Shared/CustomFields";
 interface IImageDetailProps {
   image: GQL.ImageDataFragment;
 }
@@ -132,6 +133,7 @@ export const ImageDetailPanel: React.FC<IImageDetailProps> = PatchComponent(
             {renderDetails()}
             {renderTags()}
             {renderPerformers()}
+            <CustomFields values={props.image.custom_fields} fullWidth />
           </div>
         </div>
       </>
diff --git a/ui/v2.5/src/components/Images/ImageDetails/ImageEditPanel.tsx b/ui/v2.5/src/components/Images/ImageDetails/ImageEditPanel.tsx
index 58b809d41..94dddac4b 100644
--- a/ui/v2.5/src/components/Images/ImageDetails/ImageEditPanel.tsx
+++ b/ui/v2.5/src/components/Images/ImageDetails/ImageEditPanel.tsx
@@ -35,6 +35,11 @@ import {
 } from "src/components/Galleries/GallerySelect";
 import { useTagsEdit } from "src/hooks/tagsEdit";
 import { ScraperMenu } from "src/components/Shared/ScraperMenu";
+import {
+  CustomFieldsInput,
+  formatCustomFieldInput,
+} from "src/components/Shared/CustomFields";
+import { cloneDeep } from "@apollo/client/utilities";
 
 interface IProps {
   image: GQL.ImageDataFragment;
@@ -86,6 +91,7 @@ export const ImageEditPanel: React.FC<IProps> = ({
     studio_id: yup.string().required().nullable(),
     performer_ids: yup.array(yup.string().required()).defined(),
     tag_ids: yup.array(yup.string().required()).defined(),
+    custom_fields: yup.object().required().defined(),
   });
 
   const initialValues = {
@@ -99,15 +105,26 @@ export const ImageEditPanel: React.FC<IProps> = ({
     studio_id: image.studio?.id ?? null,
     performer_ids: (image.performers ?? []).map((p) => p.id),
     tag_ids: (image.tags ?? []).map((t) => t.id),
+    custom_fields: cloneDeep(image.custom_fields ?? {}),
   };
 
   type InputValues = yup.InferType<typeof schema>;
 
+  const [customFieldsError, setCustomFieldsError] = useState<string>();
+
+  function submit(values: InputValues) {
+    const input = {
+      ...schema.cast(values),
+      custom_fields: formatCustomFieldInput(isNew, values.custom_fields),
+    };
+    onSave(input);
+  }
+
   const formik = useFormik<InputValues>({
     initialValues,
     enableReinitialize: true,
     validate: yupFormikValidate(schema),
-    onSubmit: (values) => onSave(schema.cast(values)),
+    onSubmit: submit,
   });
 
   const { tags, updateTagsStateFromScraper, tagsControl } = useTagsEdit(
@@ -444,7 +461,9 @@ export const ImageEditPanel: React.FC<IProps> = ({
               className="edit-button"
               variant="primary"
               disabled={
-                (!isNew && !formik.dirty) || !isEqual(formik.errors, {})
+                (!isNew && !formik.dirty) ||
+                !isEqual(formik.errors, {}) ||
+                customFieldsError !== undefined
               }
               onClick={() => formik.submitForm()}
             >
@@ -492,6 +511,13 @@ export const ImageEditPanel: React.FC<IProps> = ({
           </Col>
           <Col lg={5} xl={12}>
             {renderDetailsField()}
+
+            <CustomFieldsInput
+              values={formik.values.custom_fields}
+              onChange={(v) => formik.setFieldValue("custom_fields", v)}
+              error={customFieldsError}
+              setError={(e) => setCustomFieldsError(e)}
+            />
           </Col>
         </Row>
       </Form>
diff --git a/ui/v2.5/src/components/Images/styles.scss b/ui/v2.5/src/components/Images/styles.scss
index 0050a9434..43ac56590 100644
--- a/ui/v2.5/src/components/Images/styles.scss
+++ b/ui/v2.5/src/components/Images/styles.scss
@@ -179,6 +179,20 @@ $imageTabWidth: 450px;
   .form-group[data-field="urls"] .string-list-input input.form-control {
     font-size: 0.85em;
   }
+
+  @include media-breakpoint-up(xl) {
+    .custom-fields-input {
+      .custom-fields-field {
+        flex: 0 0 25%;
+        max-width: 25%;
+      }
+
+      .custom-fields-value {
+        flex: 0 0 75%;
+        max-width: 75%;
+      }
+    }
+  }
 }
 
 .image-file-card.card {
diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
index 98871bf9a..93b69e7b5 100644
--- a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
@@ -48,7 +48,10 @@ import {
   yupUniqueStringList,
 } from "src/utils/yup";
 import { useTagsEdit } from "src/hooks/tagsEdit";
-import { CustomFieldsInput } from "src/components/Shared/CustomFields";
+import {
+  CustomFieldsInput,
+  formatCustomFieldInput,
+} from "src/components/Shared/CustomFields";
 import { cloneDeep } from "@apollo/client/utilities";
 
 const isScraper = (
@@ -67,16 +70,6 @@ interface IPerformerDetails {
   setEncodingImage: (loading: boolean) => void;
 }
 
-function customFieldInput(isNew: boolean, input: {}) {
-  if (isNew) {
-    return input;
-  } else {
-    return {
-      full: input,
-    };
-  }
-}
-
 export const PerformerEditPanel: React.FC<IPerformerDetails> = ({
   performer,
   isVisible,
@@ -173,7 +166,7 @@ export const PerformerEditPanel: React.FC<IPerformerDetails> = ({
   function submit(values: InputValues) {
     const input = {
       ...schema.cast(values),
-      custom_fields: customFieldInput(isNew, values.custom_fields),
+      custom_fields: formatCustomFieldInput(isNew, values.custom_fields),
     };
     onSave(input);
   }
@@ -368,7 +361,7 @@ export const PerformerEditPanel: React.FC<IPerformerDetails> = ({
     const { values } = formik;
     const input = {
       ...schema.cast(values),
-      custom_fields: customFieldInput(isNew, values.custom_fields),
+      custom_fields: formatCustomFieldInput(isNew, values.custom_fields),
     };
     onSave(input, true);
   }
diff --git a/ui/v2.5/src/components/Performers/styles.scss b/ui/v2.5/src/components/Performers/styles.scss
index 54a010e50..49dc27550 100644
--- a/ui/v2.5/src/components/Performers/styles.scss
+++ b/ui/v2.5/src/components/Performers/styles.scss
@@ -82,11 +82,6 @@
     font-weight: 700;
     padding-left: 0;
   }
-
-  .custom-fields .detail-item-title,
-  .custom-fields .detail-item-value {
-    font-family: "Courier New", Courier, monospace;
-  }
   /* stylelint-enable selector-class-pattern */
 }
 
diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/SceneDetailPanel.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/SceneDetailPanel.tsx
index ad7663e9d..b109016b1 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/SceneDetailPanel.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/SceneDetailPanel.tsx
@@ -6,6 +6,7 @@ import { TagLink } from "src/components/Shared/TagLink";
 import { PerformerCard } from "src/components/Performers/PerformerCard";
 import { sortPerformers } from "src/core/performers";
 import { DirectorLink } from "src/components/Shared/Link";
+import { CustomFields } from "src/components/Shared/CustomFields";
 
 interface ISceneDetailProps {
   scene: GQL.SceneDataFragment;
@@ -103,6 +104,7 @@ export const SceneDetailPanel: React.FC<ISceneDetailProps> = (props) => {
           {renderDetails()}
           {renderTags()}
           {renderPerformers()}
+          <CustomFields values={props.scene.custom_fields} fullWidth />
         </div>
       </div>
     </>
diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/SceneEditPanel.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/SceneEditPanel.tsx
index 54bf5b573..41293ff78 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/SceneEditPanel.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/SceneEditPanel.tsx
@@ -50,6 +50,11 @@ import { Group } from "src/components/Groups/GroupSelect";
 import { useTagsEdit } from "src/hooks/tagsEdit";
 import { ScraperMenu } from "src/components/Shared/ScraperMenu";
 import StashBoxIDSearchModal from "src/components/Shared/StashBoxIDSearchModal";
+import {
+  CustomFieldsInput,
+  formatCustomFieldInput,
+} from "src/components/Shared/CustomFields";
+import { cloneDeep } from "@apollo/client/utilities";
 
 const SceneScrapeDialog = lazyComponent(() => import("./SceneScrapeDialog"));
 const SceneQueryModal = lazyComponent(() => import("./SceneQueryModal"));
@@ -140,6 +145,7 @@ export const SceneEditPanel: React.FC<IProps> = ({
     stash_ids: yup.mixed<GQL.StashIdInput[]>().defined(),
     details: yup.string().ensure(),
     cover_image: yup.string().nullable().optional(),
+    custom_fields: yup.object().required().defined(),
   });
 
   const initialValues = useMemo(
@@ -159,17 +165,28 @@ export const SceneEditPanel: React.FC<IProps> = ({
       stash_ids: getStashIDs(scene.stash_ids),
       details: scene.details ?? "",
       cover_image: initialCoverImage,
+      custom_fields: cloneDeep(scene.custom_fields ?? {}),
     }),
     [scene, initialCoverImage]
   );
 
   type InputValues = yup.InferType<typeof schema>;
 
+  const [customFieldsError, setCustomFieldsError] = useState<string>();
+
+  function submit(values: InputValues) {
+    const input = {
+      ...schema.cast(values),
+      custom_fields: formatCustomFieldInput(isNew, values.custom_fields),
+    };
+    onSave(input);
+  }
+
   const formik = useFormik<InputValues>({
     initialValues,
     enableReinitialize: true,
     validate: yupFormikValidate(schema),
-    onSubmit: (values) => onSave(schema.cast(values)),
+    onSubmit: submit,
   });
 
   const { tags, updateTagsStateFromScraper, tagsControl } = useTagsEdit(
@@ -288,7 +305,10 @@ export const SceneEditPanel: React.FC<IProps> = ({
   }
 
   async function onSaveAndNewClick() {
-    const input = schema.cast(formik.values);
+    const input = {
+      ...schema.cast(formik.values),
+      custom_fields: formatCustomFieldInput(isNew, formik.values.custom_fields),
+    };
     onSave(input, true);
   }
 
@@ -759,7 +779,9 @@ export const SceneEditPanel: React.FC<IProps> = ({
                 id="scene-save-split-button"
                 className="edit-button"
                 variant="primary"
-                disabled={!isEqual(formik.errors, {})}
+                disabled={
+                  !isEqual(formik.errors, {}) || customFieldsError !== undefined
+                }
                 title={intl.formatMessage({ id: "actions.save" })}
                 onClick={() => formik.submitForm()}
               >
@@ -772,7 +794,9 @@ export const SceneEditPanel: React.FC<IProps> = ({
                 className="edit-button"
                 variant="primary"
                 disabled={
-                  (!isNew && !formik.dirty) || !isEqual(formik.errors, {})
+                  (!isNew && !formik.dirty) ||
+                  !isEqual(formik.errors, {}) ||
+                  customFieldsError !== undefined
                 }
                 onClick={() => formik.submitForm()}
               >
@@ -863,6 +887,13 @@ export const SceneEditPanel: React.FC<IProps> = ({
                 onReset={scene.id ? onResetCover : undefined}
               />
             </Form.Group>
+
+            <CustomFieldsInput
+              values={formik.values.custom_fields}
+              onChange={(v) => formik.setFieldValue("custom_fields", v)}
+              error={customFieldsError}
+              setError={(e) => setCustomFieldsError(e)}
+            />
           </Col>
         </Row>
       </Form>
diff --git a/ui/v2.5/src/components/Scenes/SceneMergeDialog.tsx b/ui/v2.5/src/components/Scenes/SceneMergeDialog.tsx
index 9455af186..89d445002 100644
--- a/ui/v2.5/src/components/Scenes/SceneMergeDialog.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneMergeDialog.tsx
@@ -7,12 +7,16 @@ import { StringListSelect, GallerySelect } from "../Shared/Select";
 import * as FormUtils from "src/utils/form";
 import ImageUtils from "src/utils/image";
 import TextUtils from "src/utils/text";
-import { mutateSceneMerge, queryFindScenesByID } from "src/core/StashService";
+import {
+  mutateSceneMerge,
+  queryFindFullScenesByID,
+} from "src/core/StashService";
 import { FormattedMessage, useIntl } from "react-intl";
 import { useToast } from "src/hooks/Toast";
 import { faExchangeAlt, faSignInAlt } from "@fortawesome/free-solid-svg-icons";
 import {
   ScrapeDialogRow,
+  ScrapedCustomFieldRows,
   ScrapedImageRow,
   ScrapedInputGroupRow,
   ScrapedStringListRow,
@@ -24,6 +28,7 @@ import { RatingSystem } from "src/components/Shared/Rating/RatingSystem";
 import { ModalComponent } from "../Shared/Modal";
 import { IHasStoredID, sortStoredIdObjects } from "src/utils/data";
 import {
+  CustomFieldScrapeResults,
   ObjectListScrapeResult,
   ScrapeResult,
   ZeroableScrapeResult,
@@ -52,8 +57,8 @@ type MergeOptions = {
 };
 
 interface ISceneMergeDetailsProps {
-  sources: GQL.SlimSceneDataFragment[];
-  dest: GQL.SlimSceneDataFragment;
+  sources: GQL.SceneDataFragment[];
+  dest: GQL.SceneDataFragment;
   onClose: (options?: MergeOptions) => void;
 }
 
@@ -173,6 +178,10 @@ const SceneMergeDetails: React.FC<ISceneMergeDetailsProps> = ({
     new ScrapeResult<string>(dest.paths.screenshot)
   );
 
+  const [customFields, setCustomFields] = useState<CustomFieldScrapeResults>(
+    new Map()
+  );
+
   // calculate the values for everything
   // uses the first set value for single value fields, and combines all
   useEffect(() => {
@@ -309,28 +318,64 @@ const SceneMergeDetails: React.FC<ISceneMergeDetailsProps> = ({
       )
     );
 
+    const customFieldNames = new Set<string>(
+      Object.keys(dest.custom_fields ?? {})
+    );
+
+    for (const s of sources) {
+      for (const n of Object.keys(s.custom_fields ?? {})) {
+        customFieldNames.add(n);
+      }
+    }
+
+    setCustomFields(
+      new Map(
+        Array.from(customFieldNames)
+          .sort()
+          .map((field) => {
+            return [
+              field,
+              new ScrapeResult(
+                dest.custom_fields?.[field],
+                sources.find((s) => s.custom_fields?.[field])?.custom_fields?.[
+                  field
+                ],
+                dest.custom_fields?.[field] === undefined
+              ),
+            ];
+          })
+      )
+    );
+
     loadImages();
   }, [sources, dest]);
 
+  const hasCustomFieldValues = useMemo(() => {
+    return hasScrapedValues(Array.from(customFields.values()));
+  }, [customFields]);
+
   // ensure this is updated if fields are changed
   const hasValues = useMemo(() => {
-    return hasScrapedValues([
-      title,
-      code,
-      url,
-      date,
-      rating,
-      oCounter,
-      galleries,
-      studio,
-      performers,
-      groups,
-      tags,
-      details,
-      organized,
-      stashIDs,
-      image,
-    ]);
+    return (
+      hasCustomFieldValues ||
+      hasScrapedValues([
+        title,
+        code,
+        url,
+        date,
+        rating,
+        oCounter,
+        galleries,
+        studio,
+        performers,
+        groups,
+        tags,
+        details,
+        organized,
+        stashIDs,
+        image,
+      ])
+    );
   }, [
     title,
     code,
@@ -347,6 +392,7 @@ const SceneMergeDetails: React.FC<ISceneMergeDetailsProps> = ({
     organized,
     stashIDs,
     image,
+    hasCustomFieldValues,
   ]);
 
   function renderScrapeRows() {
@@ -566,6 +612,12 @@ const SceneMergeDetails: React.FC<ISceneMergeDetailsProps> = ({
           result={image}
           onChange={(value) => setImage(value)}
         />
+        {hasCustomFieldValues && (
+          <ScrapedCustomFieldRows
+            results={customFields}
+            onChange={(newCustomFields) => setCustomFields(newCustomFields)}
+          />
+        )}
       </>
     );
   }
@@ -606,6 +658,13 @@ const SceneMergeDetails: React.FC<ISceneMergeDetailsProps> = ({
         organized: organized.getNewValue(),
         stash_ids: stashIDs.getNewValue(),
         cover_image: coverImage,
+        custom_fields: {
+          partial: Object.fromEntries(
+            Array.from(customFields.entries()).flatMap(([field, v]) =>
+              v.useNewValue ? [[field, v.getNewValue()]] : []
+            )
+          ),
+        },
       },
       includeViewHistory: playCount.getNewValue() !== undefined,
       includeOHistory: oCounter.getNewValue() !== undefined,
@@ -655,10 +714,10 @@ export const SceneMergeModal: React.FC<ISceneMergeModalProps> = ({
   const [sourceScenes, setSourceScenes] = useState<Scene[]>([]);
   const [destScene, setDestScene] = useState<Scene[]>([]);
 
-  const [loadedSources, setLoadedSources] = useState<
-    GQL.SlimSceneDataFragment[]
-  >([]);
-  const [loadedDest, setLoadedDest] = useState<GQL.SlimSceneDataFragment>();
+  const [loadedSources, setLoadedSources] = useState<GQL.SceneDataFragment[]>(
+    []
+  );
+  const [loadedDest, setLoadedDest] = useState<GQL.SceneDataFragment>();
 
   const [running, setRunning] = useState(false);
   const [secondStep, setSecondStep] = useState(false);
@@ -684,7 +743,7 @@ export const SceneMergeModal: React.FC<ISceneMergeModalProps> = ({
   async function loadScenes() {
     const sceneIDs = sourceScenes.map((s) => parseInt(s.id));
     sceneIDs.push(parseInt(destScene[0].id));
-    const query = await queryFindScenesByID(sceneIDs);
+    const query = await queryFindFullScenesByID(sceneIDs);
     const { scenes: loadedScenes } = query.data.findScenes;
 
     setLoadedDest(loadedScenes.find((s) => s.id === destScene[0].id));
diff --git a/ui/v2.5/src/components/Scenes/styles.scss b/ui/v2.5/src/components/Scenes/styles.scss
index 78644b4c9..3f142f4bd 100644
--- a/ui/v2.5/src/components/Scenes/styles.scss
+++ b/ui/v2.5/src/components/Scenes/styles.scss
@@ -562,6 +562,20 @@ input[type="range"].blue-slider {
   .form-group[data-field="urls"] .string-list-input input.form-control {
     font-size: 0.85em;
   }
+
+  @include media-breakpoint-up(xl) {
+    .custom-fields-input {
+      .custom-fields-field {
+        flex: 0 0 25%;
+        max-width: 25%;
+      }
+
+      .custom-fields-value {
+        flex: 0 0 75%;
+        max-width: 75%;
+      }
+    }
+  }
 }
 
 .scene-markers-panel {
diff --git a/ui/v2.5/src/components/Shared/CustomFields.tsx b/ui/v2.5/src/components/Shared/CustomFields.tsx
index c8d389a17..e6e892f7c 100644
--- a/ui/v2.5/src/components/Shared/CustomFields.tsx
+++ b/ui/v2.5/src/components/Shared/CustomFields.tsx
@@ -18,6 +18,7 @@ export type CustomFieldMap = {
 
 interface ICustomFields {
   values: CustomFieldMap;
+  fullWidth?: boolean;
 }
 
 function convertValue(value: unknown): string {
@@ -41,7 +42,7 @@ const CustomField: React.FC<{ field: string; value: unknown }> = ({
   const valueStr = convertValue(value);
 
   // replace spaces with hyphen characters for css id
-  const id = field.toLowerCase().replace(/ /g, "-");
+  const id = `custom-field-${field.toLowerCase().replace(/ /g, "-")}`;
 
   return (
     <DetailItem
@@ -57,7 +58,7 @@ const CustomField: React.FC<{ field: string; value: unknown }> = ({
 
 export const CustomFields: React.FC<ICustomFields> = PatchComponent(
   "CustomFields",
-  ({ values }) => {
+  ({ values, fullWidth }) => {
     const intl = useIntl();
     if (Object.keys(values).length === 0) {
       return null;
@@ -65,7 +66,7 @@ export const CustomFields: React.FC<ICustomFields> = PatchComponent(
 
     return (
       // according to linter rule CSS classes shouldn't use underscores
-      <div className="custom-fields">
+      <div className={cx("custom-fields", { "full-width": fullWidth })}>
         <CollapseButton
           text={intl.formatMessage({ id: "custom_fields.title" })}
         >
@@ -125,7 +126,7 @@ const CustomFieldInput: React.FC<{
         <Row
           className={cx("custom-fields-row", { "custom-fields-new": isNew })}
         >
-          <Col sm={3} xl={2} className="custom-fields-field">
+          <Col className="custom-fields-field">
             {isNew ? (
               <>
                 <Form.Control
@@ -146,7 +147,7 @@ const CustomFieldInput: React.FC<{
               <Form.Label title={currentField}>{currentField}</Form.Label>
             )}
           </Col>
-          <Col sm={9} xl={7}>
+          <Col className="custom-fields-value">
             <InputGroup>
               <Form.Control
                 ref={valueRef}
@@ -189,6 +190,16 @@ interface ICustomFieldsInput {
   setError: (error?: string) => void;
 }
 
+export function formatCustomFieldInput(isNew: boolean, input: {}) {
+  if (isNew) {
+    return input;
+  } else {
+    return {
+      full: input,
+    };
+  }
+}
+
 export const CustomFieldsInput: React.FC<ICustomFieldsInput> = PatchComponent(
   "CustomFieldsInput",
   ({ values, error, onChange, setError }) => {
@@ -282,10 +293,10 @@ export const CustomFieldsInput: React.FC<ICustomFieldsInput> = PatchComponent(
         <Row>
           <Col xl={12}>
             <Row className="custom-fields-input-header">
-              <Form.Label column sm={3} xl={2}>
+              <Form.Label column className="custom-fields-field">
                 <FormattedMessage id="custom_fields.field" />
               </Form.Label>
-              <Form.Label column sm={9} xl={7}>
+              <Form.Label column className="custom-fields-value">
                 <FormattedMessage id="custom_fields.value" />
               </Form.Label>
             </Row>
diff --git a/ui/v2.5/src/components/Shared/styles.scss b/ui/v2.5/src/components/Shared/styles.scss
index 32b222832..97a5c4387 100644
--- a/ui/v2.5/src/components/Shared/styles.scss
+++ b/ui/v2.5/src/components/Shared/styles.scss
@@ -795,6 +795,11 @@ button.btn.favorite-button {
   .detail-item {
     max-width: 100%;
   }
+
+  .detail-item-title,
+  .detail-item-value {
+    font-family: "Courier New", Courier, monospace;
+  }
 }
 
 .custom-fields .detail-item .detail-item-title {
@@ -816,6 +821,36 @@ button.btn.favorite-button {
   font-weight: 700;
 }
 
+.custom-fields-input {
+  .custom-fields-field {
+    flex: 0 0 100%;
+    max-width: 100%;
+
+    @include media-breakpoint-up(sm) {
+      flex: 0 0 25%;
+      max-width: 25%;
+    }
+    @include media-breakpoint-up(xl) {
+      flex: 0 0 16.667%;
+      max-width: 16.667%;
+    }
+  }
+
+  .custom-fields-value {
+    flex: 0 0 100%;
+    max-width: 100%;
+
+    @include media-breakpoint-up(sm) {
+      flex: 0 0 75%;
+      max-width: 75%;
+    }
+    @include media-breakpoint-up(xl) {
+      flex: 0 0 58.33%;
+      max-width: 58.33%;
+    }
+  }
+}
+
 .custom-fields-row {
   align-items: center;
   font-family: "Courier New", Courier, monospace;
diff --git a/ui/v2.5/src/components/Studios/StudioDetails/StudioDetailsPanel.tsx b/ui/v2.5/src/components/Studios/StudioDetails/StudioDetailsPanel.tsx
index 5ad92100f..ae8314fe8 100644
--- a/ui/v2.5/src/components/Studios/StudioDetails/StudioDetailsPanel.tsx
+++ b/ui/v2.5/src/components/Studios/StudioDetails/StudioDetailsPanel.tsx
@@ -4,6 +4,7 @@ import * as GQL from "src/core/generated-graphql";
 import { DetailItem } from "src/components/Shared/DetailItem";
 import { StashIDPill } from "src/components/Shared/StashID";
 import { PatchComponent } from "src/patch";
+import { CustomFields } from "src/components/Shared/CustomFields";
 import { Link } from "react-router-dom";
 
 interface IStudioDetailsPanel {
@@ -87,6 +88,7 @@ export const StudioDetailsPanel: React.FC<IStudioDetailsPanel> = PatchComponent(
           value={renderStashIDs()}
           fullWidth={fullWidth}
         />
+        <CustomFields values={studio.custom_fields} />
       </div>
     );
   }
diff --git a/ui/v2.5/src/components/Studios/StudioDetails/StudioEditPanel.tsx b/ui/v2.5/src/components/Studios/StudioDetails/StudioEditPanel.tsx
index f887e5403..490f09a55 100644
--- a/ui/v2.5/src/components/Studios/StudioDetails/StudioEditPanel.tsx
+++ b/ui/v2.5/src/components/Studios/StudioDetails/StudioEditPanel.tsx
@@ -21,6 +21,11 @@ import { Studio, StudioSelect } from "../StudioSelect";
 import { useTagsEdit } from "src/hooks/tagsEdit";
 import { Icon } from "src/components/Shared/Icon";
 import StashBoxIDSearchModal from "src/components/Shared/StashBoxIDSearchModal";
+import {
+  CustomFieldsInput,
+  formatCustomFieldInput,
+} from "src/components/Shared/CustomFields";
+import { cloneDeep } from "@apollo/client/utilities";
 
 interface IStudioEditPanel {
   studio: Partial<GQL.StudioDataFragment>;
@@ -63,6 +68,7 @@ export const StudioEditPanel: React.FC<IStudioEditPanel> = ({
     ignore_auto_tag: yup.boolean().defined(),
     stash_ids: yup.mixed<GQL.StashIdInput[]>().defined(),
     image: yup.string().nullable().optional(),
+    custom_fields: yup.object().required().defined(),
   });
 
   const initialValues = {
@@ -75,15 +81,26 @@ export const StudioEditPanel: React.FC<IStudioEditPanel> = ({
     tag_ids: (studio.tags ?? []).map((t) => t.id),
     ignore_auto_tag: studio.ignore_auto_tag ?? false,
     stash_ids: getStashIDs(studio.stash_ids),
+    custom_fields: cloneDeep(studio.custom_fields ?? {}),
   };
 
   type InputValues = yup.InferType<typeof schema>;
 
+  const [customFieldsError, setCustomFieldsError] = useState<string>();
+
+  function submit(values: InputValues) {
+    const input = {
+      ...schema.cast(values),
+      custom_fields: formatCustomFieldInput(isNew, values.custom_fields),
+    };
+    onSave(input);
+  }
+
   const formik = useFormik<InputValues>({
     initialValues,
     enableReinitialize: true,
     validate: yupFormikValidate(schema),
-    onSubmit: (values) => onSave(schema.cast(values)),
+    onSubmit: submit,
   });
 
   const { tagsControl } = useTagsEdit(studio.tags, (ids) =>
@@ -144,7 +161,10 @@ export const StudioEditPanel: React.FC<IStudioEditPanel> = ({
   }
 
   async function onSaveAndNewClick() {
-    const input = schema.cast(formik.values);
+    const input = {
+      ...schema.cast(formik.values),
+      custom_fields: formatCustomFieldInput(isNew, formik.values.custom_fields),
+    };
     onSave(input, true);
   }
 
@@ -242,6 +262,14 @@ export const StudioEditPanel: React.FC<IStudioEditPanel> = ({
             <Icon icon={faPlus} />
           </Button>
         )}
+
+        <CustomFieldsInput
+          values={formik.values.custom_fields}
+          onChange={(v) => formik.setFieldValue("custom_fields", v)}
+          error={customFieldsError}
+          setError={(e) => setCustomFieldsError(e)}
+        />
+
         <hr />
         {renderInputField("ignore_auto_tag", "checkbox")}
       </Form>
@@ -254,7 +282,11 @@ export const StudioEditPanel: React.FC<IStudioEditPanel> = ({
         onToggleEdit={onCancel}
         onSave={formik.handleSubmit}
         onSaveAndNew={isNew ? onSaveAndNewClick : undefined}
-        saveDisabled={(!isNew && !formik.dirty) || !isEqual(formik.errors, {})}
+        saveDisabled={
+          (!isNew && !formik.dirty) ||
+          !isEqual(formik.errors, {}) ||
+          customFieldsError !== undefined
+        }
         onImageChange={onImageChange}
         onImageChangeURL={onImageLoad}
         onClearImage={() => onImageLoad(null)}
diff --git a/ui/v2.5/src/components/Tags/TagDetails/TagDetailsPanel.tsx b/ui/v2.5/src/components/Tags/TagDetails/TagDetailsPanel.tsx
index 92c92d072..bf2e80c91 100644
--- a/ui/v2.5/src/components/Tags/TagDetails/TagDetailsPanel.tsx
+++ b/ui/v2.5/src/components/Tags/TagDetails/TagDetailsPanel.tsx
@@ -3,6 +3,7 @@ import { TagLink } from "src/components/Shared/TagLink";
 import { DetailItem } from "src/components/Shared/DetailItem";
 import { StashIDPill } from "src/components/Shared/StashID";
 import * as GQL from "src/core/generated-graphql";
+import { CustomFields } from "src/components/Shared/CustomFields";
 
 interface ITagDetails {
   tag: GQL.TagDataFragment;
@@ -90,6 +91,7 @@ export const TagDetailsPanel: React.FC<ITagDetails> = ({ tag, fullWidth }) => {
         value={renderStashIDs()}
         fullWidth={fullWidth}
       />
+      <CustomFields values={tag.custom_fields} />
     </div>
   );
 };
diff --git a/ui/v2.5/src/components/Tags/TagDetails/TagEditPanel.tsx b/ui/v2.5/src/components/Tags/TagDetails/TagEditPanel.tsx
index 22c99b80e..21cd32c53 100644
--- a/ui/v2.5/src/components/Tags/TagDetails/TagEditPanel.tsx
+++ b/ui/v2.5/src/components/Tags/TagDetails/TagEditPanel.tsx
@@ -20,6 +20,11 @@ import { addUpdateStashID, getStashIDs } from "src/utils/stashIds";
 import { Tag, TagSelect } from "../TagSelect";
 import { Icon } from "src/components/Shared/Icon";
 import StashBoxIDSearchModal from "src/components/Shared/StashBoxIDSearchModal";
+import {
+  CustomFieldsInput,
+  formatCustomFieldInput,
+} from "src/components/Shared/CustomFields";
+import { cloneDeep } from "@apollo/client/utilities";
 
 interface ITagEditPanel {
   tag: Partial<GQL.TagDataFragment>;
@@ -63,6 +68,7 @@ export const TagEditPanel: React.FC<ITagEditPanel> = ({
     ignore_auto_tag: yup.boolean().defined(),
     stash_ids: yup.mixed<GQL.StashIdInput[]>().defined(),
     image: yup.string().nullable().optional(),
+    custom_fields: yup.object().required().defined(),
   });
 
   const initialValues = {
@@ -74,15 +80,26 @@ export const TagEditPanel: React.FC<ITagEditPanel> = ({
     child_ids: (tag?.children ?? []).map((t) => t.id),
     ignore_auto_tag: tag?.ignore_auto_tag ?? false,
     stash_ids: getStashIDs(tag?.stash_ids),
+    custom_fields: cloneDeep(tag?.custom_fields ?? {}),
   };
 
   type InputValues = yup.InferType<typeof schema>;
 
+  const [customFieldsError, setCustomFieldsError] = useState<string>();
+
+  function submit(values: InputValues) {
+    const input = {
+      ...schema.cast(values),
+      custom_fields: formatCustomFieldInput(isNew, values.custom_fields),
+    };
+    onSave(input);
+  }
+
   const formik = useFormik<InputValues>({
     initialValues,
     enableReinitialize: true,
     validate: yupFormikValidate(schema),
-    onSubmit: (values) => onSave(schema.cast(values)),
+    onSubmit: submit,
   });
 
   function onSetParentTags(items: Tag[]) {
@@ -134,7 +151,10 @@ export const TagEditPanel: React.FC<ITagEditPanel> = ({
   }
 
   async function onSaveAndNewClick() {
-    const input = schema.cast(formik.values);
+    const input = {
+      ...schema.cast(formik.values),
+      custom_fields: formatCustomFieldInput(isNew, formik.values.custom_fields),
+    };
     onSave(input, true);
   }
 
@@ -266,6 +286,14 @@ export const TagEditPanel: React.FC<ITagEditPanel> = ({
               <Icon icon={faPlus} />
             </Button>
           )}
+
+          <CustomFieldsInput
+            values={formik.values.custom_fields}
+            onChange={(v) => formik.setFieldValue("custom_fields", v)}
+            error={customFieldsError}
+            setError={(e) => setCustomFieldsError(e)}
+          />
+
           <hr />
           {renderInputField("ignore_auto_tag", "checkbox")}
         </Form>
@@ -279,7 +307,9 @@ export const TagEditPanel: React.FC<ITagEditPanel> = ({
           onSave={formik.handleSubmit}
           onSaveAndNew={isNew ? onSaveAndNewClick : undefined}
           saveDisabled={
-            (!isNew && !formik.dirty) || !isEqual(formik.errors, {})
+            (!isNew && !formik.dirty) ||
+            !isEqual(formik.errors, {}) ||
+            customFieldsError !== undefined
           }
           onImageChange={onImageChange}
           onImageChangeURL={onImageLoad}
diff --git a/ui/v2.5/src/core/StashService.ts b/ui/v2.5/src/core/StashService.ts
index 27186d6e1..535beed65 100644
--- a/ui/v2.5/src/core/StashService.ts
+++ b/ui/v2.5/src/core/StashService.ts
@@ -166,6 +166,14 @@ export const queryFindScenesByID = (sceneIDs: number[]) =>
     },
   });
 
+export const queryFindFullScenesByID = (sceneIDs: number[]) =>
+  client.query<GQL.FindFullScenesQuery>({
+    query: GQL.FindFullScenesDocument,
+    variables: {
+      ids: sceneIDs,
+    },
+  });
+
 export const queryFindScenesForSelect = (filter: ListFilterModel) =>
   client.query<GQL.FindScenesForSelectQuery>({
     query: GQL.FindScenesForSelectDocument,
diff --git a/ui/v2.5/src/models/list-filter/galleries.ts b/ui/v2.5/src/models/list-filter/galleries.ts
index 3d4d40a1c..adac37e3c 100644
--- a/ui/v2.5/src/models/list-filter/galleries.ts
+++ b/ui/v2.5/src/models/list-filter/galleries.ts
@@ -21,6 +21,7 @@ import { ListFilterOptions, MediaSortByOptions } from "./filter-options";
 import { DisplayMode } from "./types";
 import { RatingCriterionOption } from "./criteria/rating";
 import { PathCriterionOption } from "./criteria/path";
+import { CustomFieldsCriterionOption } from "./criteria/custom-fields";
 
 const defaultSortBy = "path";
 
@@ -71,6 +72,7 @@ const criterionOptions = [
   createDateCriterionOption("date"),
   createMandatoryTimestampCriterionOption("created_at"),
   createMandatoryTimestampCriterionOption("updated_at"),
+  CustomFieldsCriterionOption,
 ];
 
 export const GalleryListFilterOptions = new ListFilterOptions(
diff --git a/ui/v2.5/src/models/list-filter/groups.ts b/ui/v2.5/src/models/list-filter/groups.ts
index ee0c90d73..9c5b3f2d4 100644
--- a/ui/v2.5/src/models/list-filter/groups.ts
+++ b/ui/v2.5/src/models/list-filter/groups.ts
@@ -17,6 +17,7 @@ import {
   ContainingGroupsCriterionOption,
   SubGroupsCriterionOption,
 } from "./criteria/groups";
+import { CustomFieldsCriterionOption } from "./criteria/custom-fields";
 
 const defaultSortBy = "name";
 
@@ -66,6 +67,7 @@ const criterionOptions = [
   createMandatoryNumberCriterionOption("scene_count"),
   createMandatoryTimestampCriterionOption("created_at"),
   createMandatoryTimestampCriterionOption("updated_at"),
+  CustomFieldsCriterionOption,
 ];
 
 export const GroupListFilterOptions = new ListFilterOptions(
diff --git a/ui/v2.5/src/models/list-filter/images.ts b/ui/v2.5/src/models/list-filter/images.ts
index 9468e5eaf..eabcbfd26 100644
--- a/ui/v2.5/src/models/list-filter/images.ts
+++ b/ui/v2.5/src/models/list-filter/images.ts
@@ -23,6 +23,7 @@ import { ListFilterOptions, MediaSortByOptions } from "./filter-options";
 import { DisplayMode } from "./types";
 import { GalleriesCriterionOption } from "./criteria/galleries";
 import { PhashCriterionOption } from "./criteria/phash";
+import { CustomFieldsCriterionOption } from "./criteria/custom-fields";
 
 const defaultSortBy = "path";
 
@@ -73,6 +74,7 @@ const criterionOptions = [
   createMandatoryNumberCriterionOption("file_count"),
   createMandatoryTimestampCriterionOption("created_at"),
   createMandatoryTimestampCriterionOption("updated_at"),
+  CustomFieldsCriterionOption,
 ];
 export const ImageListFilterOptions = new ListFilterOptions(
   defaultSortBy,
diff --git a/ui/v2.5/src/models/list-filter/scenes.ts b/ui/v2.5/src/models/list-filter/scenes.ts
index f4f93deeb..c0e4a75a1 100644
--- a/ui/v2.5/src/models/list-filter/scenes.ts
+++ b/ui/v2.5/src/models/list-filter/scenes.ts
@@ -35,6 +35,7 @@ import { StashIDCriterionOption } from "./criteria/stash-ids";
 import { RatingCriterionOption } from "./criteria/rating";
 import { PathCriterionOption } from "./criteria/path";
 import { OrientationCriterionOption } from "./criteria/orientation";
+import { CustomFieldsCriterionOption } from "./criteria/custom-fields";
 
 const defaultSortBy = "date";
 const sortByOptions = [
@@ -141,6 +142,7 @@ const criterionOptions = [
   createDateCriterionOption("date"),
   createMandatoryTimestampCriterionOption("created_at"),
   createMandatoryTimestampCriterionOption("updated_at"),
+  CustomFieldsCriterionOption,
 ];
 
 export const SceneListFilterOptions = new ListFilterOptions(
diff --git a/ui/v2.5/src/models/list-filter/studios.ts b/ui/v2.5/src/models/list-filter/studios.ts
index a38540a47..e62d41c7a 100644
--- a/ui/v2.5/src/models/list-filter/studios.ts
+++ b/ui/v2.5/src/models/list-filter/studios.ts
@@ -13,6 +13,7 @@ import { ParentStudiosCriterionOption } from "./criteria/studios";
 import { TagsCriterionOption } from "./criteria/tags";
 import { ListFilterOptions } from "./filter-options";
 import { DisplayMode } from "./types";
+import { CustomFieldsCriterionOption } from "./criteria/custom-fields";
 
 const defaultSortBy = "name";
 const sortByOptions = [
@@ -67,6 +68,7 @@ const criterionOptions = [
   ),
   createMandatoryTimestampCriterionOption("created_at"),
   createMandatoryTimestampCriterionOption("updated_at"),
+  CustomFieldsCriterionOption,
 ];
 
 export const StudioListFilterOptions = new ListFilterOptions(
diff --git a/ui/v2.5/src/models/list-filter/tags.ts b/ui/v2.5/src/models/list-filter/tags.ts
index 39ce9ca39..4c8bed69f 100644
--- a/ui/v2.5/src/models/list-filter/tags.ts
+++ b/ui/v2.5/src/models/list-filter/tags.ts
@@ -15,6 +15,7 @@ import {
 } from "./criteria/tags";
 import { FavoriteTagCriterionOption } from "./criteria/favorite";
 import { StashIDCriterionOption } from "./criteria/stash-ids";
+import { CustomFieldsCriterionOption } from "./criteria/custom-fields";
 
 const defaultSortBy = "name";
 const sortByOptions = ["name", "random", "scenes_duration"]
@@ -77,6 +78,7 @@ const criterionOptions = [
   new MandatoryNumberCriterionOption("sub_tag_count", "child_count"),
   createMandatoryTimestampCriterionOption("created_at"),
   createMandatoryTimestampCriterionOption("updated_at"),
+  CustomFieldsCriterionOption,
 ];
 
 export const TagListFilterOptions = new ListFilterOptions(

From c9f0dba62f2dd4ecdb03ac80e5cca9cc65207696 Mon Sep 17 00:00:00 2001
From: DogmaDragon <103123951+DogmaDragon@users.noreply.github.com>
Date: Wed, 25 Feb 2026 22:54:12 +0200
Subject: [PATCH 315/405] Fix capitalization in custom localisation heading
 [skip-ci] (#6606)

---
 ui/v2.5/src/locales/en-GB.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/v2.5/src/locales/en-GB.json b/ui/v2.5/src/locales/en-GB.json
index b7d3e2894..e19f9ca8f 100644
--- a/ui/v2.5/src/locales/en-GB.json
+++ b/ui/v2.5/src/locales/en-GB.json
@@ -669,7 +669,7 @@
       },
       "custom_locales": {
         "description": "Override individual locale strings. See https://github.com/stashapp/stash/blob/develop/ui/v2.5/src/locales/en-GB.json for the master list. Page must be reloaded for changes to take effect.",
-        "heading": "Custom Localisation",
+        "heading": "Custom localisation",
         "option_label": "Custom localisation enabled"
       },
       "custom_title": {

From 5734ee43ff788d12c2caa604de2bfa18358fb269 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Thu, 26 Feb 2026 07:54:40 +1100
Subject: [PATCH 316/405] Add sidebar to scene markers list (#6603)

* Add tag markers filter
* Add marker count and markers filter to performer filter
* Add sidebar to marker list
---
 graphql/schema/types/filters.graphql          |   6 +
 pkg/models/performer.go                       |   4 +
 pkg/models/tag.go                             |   2 +
 pkg/sqlite/criterion_handlers.go              |  13 +-
 pkg/sqlite/performer_filter.go                |  27 +
 pkg/sqlite/tag_filter.go                      |  14 +
 .../List/Filters/LabeledIdFilter.tsx          |  19 +
 .../src/components/Scenes/SceneMarkerList.tsx | 538 ++++++++++++++----
 .../Tags/TagDetails/TagMarkersPanel.tsx       |   4 +-
 9 files changed, 504 insertions(+), 123 deletions(-)

diff --git a/graphql/schema/types/filters.graphql b/graphql/schema/types/filters.graphql
index 907e597f4..d9814ef34 100644
--- a/graphql/schema/types/filters.graphql
+++ b/graphql/schema/types/filters.graphql
@@ -177,6 +177,8 @@ input PerformerFilterType {
   tag_count: IntCriterionInput
   "Filter by scene count"
   scene_count: IntCriterionInput
+  "Filter by marker count (via scene)"
+  marker_count: IntCriterionInput
   "Filter by image count"
   image_count: IntCriterionInput
   "Filter by gallery count"
@@ -220,6 +222,8 @@ input PerformerFilterType {
   galleries_filter: GalleryFilterType
   "Filter by related tags that meet this criteria"
   tags_filter: TagFilterType
+  "Filter by related scene markers (via scene) that meet this criteria"
+  markers_filter: SceneMarkerFilterType
   "Filter by creation time"
   created_at: TimestampCriterionInput
   "Filter by last update time"
@@ -684,6 +688,8 @@ input TagFilterType {
   performers_filter: PerformerFilterType
   "Filter by related studios that meet this criteria"
   studios_filter: StudioFilterType
+  "Filter by related scene markers that meet this criteria"
+  markers_filter: SceneMarkerFilterType
 
   "Filter by creation time"
   created_at: TimestampCriterionInput
diff --git a/pkg/models/performer.go b/pkg/models/performer.go
index e4fb8dd98..8de5d94f4 100644
--- a/pkg/models/performer.go
+++ b/pkg/models/performer.go
@@ -158,6 +158,8 @@ type PerformerFilterType struct {
 	TagCount *IntCriterionInput `json:"tag_count"`
 	// Filter by scene count
 	SceneCount *IntCriterionInput `json:"scene_count"`
+	// Filter by scene marker count (via scene)
+	MarkerCount *IntCriterionInput `json:"marker_count"`
 	// Filter by image count
 	ImageCount *IntCriterionInput `json:"image_count"`
 	// Filter by gallery count
@@ -202,6 +204,8 @@ type PerformerFilterType struct {
 	GalleriesFilter *GalleryFilterType `json:"galleries_filter"`
 	// Filter by related tags that meet this criteria
 	TagsFilter *TagFilterType `json:"tags_filter"`
+	// Filter by related scene markers (via scene) that meet this criteria
+	MarkersFilter *SceneMarkerFilterType `json:"markers_filter"`
 	// Filter by created at
 	CreatedAt *TimestampCriterionInput `json:"created_at"`
 	// Filter by updated at
diff --git a/pkg/models/tag.go b/pkg/models/tag.go
index 3a133dcad..b166e5a69 100644
--- a/pkg/models/tag.go
+++ b/pkg/models/tag.go
@@ -56,6 +56,8 @@ type TagFilterType struct {
 	PerformersFilter *PerformerFilterType `json:"performers_filter"`
 	// Filter by related studios that meet this criteria
 	StudiosFilter *StudioFilterType `json:"studios_filter"`
+	// Filter by related scene markers that meet this criteria
+	MarkersFilter *SceneMarkerFilterType `json:"markers_filter"`
 	// Filter by created at
 	CreatedAt *TimestampCriterionInput `json:"created_at"`
 	// Filter by updated at
diff --git a/pkg/sqlite/criterion_handlers.go b/pkg/sqlite/criterion_handlers.go
index 1496df71d..943704cfe 100644
--- a/pkg/sqlite/criterion_handlers.go
+++ b/pkg/sqlite/criterion_handlers.go
@@ -1089,11 +1089,16 @@ func (h *stashIDsCriterionHandler) handle(ctx context.Context, f *filterBuilder)
 }
 
 type relatedFilterHandler struct {
-	relatedIDCol   string
-	relatedRepo    repository
+	// column on the primary table that relates to the related table (eg scene_id)
+	relatedIDCol string
+	// repository for the related table (eg sceneRepository)
+	relatedRepo repository
+	// handler for the filter on the related table
 	relatedHandler criterionHandler
-	joinFn         func(f *filterBuilder)
-	directJoin     bool
+	// optional function to perform the necessary join(s) to the related table
+	joinFn func(f *filterBuilder)
+	// if true, related filter handler will be run using the existing filterBuilder instead of a subquery.
+	directJoin bool
 }
 
 func (h *relatedFilterHandler) handle(ctx context.Context, f *filterBuilder) {
diff --git a/pkg/sqlite/performer_filter.go b/pkg/sqlite/performer_filter.go
index 5296d5a25..e99f3068f 100644
--- a/pkg/sqlite/performer_filter.go
+++ b/pkg/sqlite/performer_filter.go
@@ -195,6 +195,7 @@ func (qb *performerFilterHandler) criterionHandler() criterionHandler {
 
 		qb.tagCountCriterionHandler(filter.TagCount),
 		qb.sceneCountCriterionHandler(filter.SceneCount),
+		qb.markerCountCriterionHandler(filter.MarkerCount),
 		qb.imageCountCriterionHandler(filter.ImageCount),
 		qb.galleryCountCriterionHandler(filter.GalleryCount),
 		qb.playCounterCriterionHandler(filter.PlayCount),
@@ -204,6 +205,16 @@ func (qb *performerFilterHandler) criterionHandler() criterionHandler {
 		&timestampCriterionHandler{filter.CreatedAt, tableName + ".created_at", nil},
 		&timestampCriterionHandler{filter.UpdatedAt, tableName + ".updated_at", nil},
 
+		&relatedFilterHandler{
+			relatedIDCol:   "scene_markers.id",
+			relatedRepo:    sceneMarkerRepository.repository,
+			relatedHandler: &sceneMarkerFilterHandler{filter.MarkersFilter},
+			joinFn: func(f *filterBuilder) {
+				performerRepository.scenes.innerJoin(f, "", "performers.id")
+				f.addInnerJoin(sceneMarkerTable, "", "scene_markers.scene_id = performers_scenes.scene_id")
+			},
+		},
+
 		&relatedFilterHandler{
 			relatedIDCol:   "performers_scenes.scene_id",
 			relatedRepo:    sceneRepository.repository,
@@ -387,6 +398,22 @@ func (qb *performerFilterHandler) sceneCountCriterionHandler(count *models.IntCr
 	return h.handler(count)
 }
 
+func (qb *performerFilterHandler) markerCountCriterionHandler(count *models.IntCriterionInput) criterionHandlerFunc {
+	return func(ctx context.Context, f *filterBuilder) {
+		if count != nil {
+			performerRepository.scenes.innerJoin(f, "", "performers.id")
+
+			const query = `(SELECT COUNT(*) FROM scene_markers 
+  INNER JOIN scenes ON scene_markers.scene_id = scenes.id
+  INNER JOIN performers_scenes ON performers_scenes.scene_id = scenes.id
+  WHERE performers_scenes.performer_id = performers.id)`
+
+			clause, args := getIntCriterionWhereClause(query, *count)
+			f.addWhere(clause, args...)
+		}
+	}
+}
+
 func (qb *performerFilterHandler) imageCountCriterionHandler(count *models.IntCriterionInput) criterionHandlerFunc {
 	h := countCriterionHandlerBuilder{
 		primaryTable: performerTable,
diff --git a/pkg/sqlite/tag_filter.go b/pkg/sqlite/tag_filter.go
index b3a7c1756..4e2313080 100644
--- a/pkg/sqlite/tag_filter.go
+++ b/pkg/sqlite/tag_filter.go
@@ -161,6 +161,20 @@ func (qb *tagFilterHandler) criterionHandler() criterionHandler {
 				tagRepository.studios.innerJoin(f, "", "tags.id")
 			},
 		},
+
+		&relatedFilterHandler{
+			relatedIDCol:   "markers_tags.marker_id",
+			relatedRepo:    sceneMarkerRepository.repository,
+			relatedHandler: &sceneMarkerFilterHandler{tagFilter.MarkersFilter},
+			joinFn: func(f *filterBuilder) {
+				f.addWith(`markers_tags AS (
+				SELECT mt.scene_marker_id AS marker_id, mt.tag_id AS tag_id FROM scene_markers_tags mt
+				UNION
+				SELECT m.id, m.primary_tag_id FROM scene_markers m
+				)`)
+				f.addInnerJoin("markers_tags", "", "markers_tags.tag_id = tags.id")
+			},
+		},
 	}
 }
 
diff --git a/ui/v2.5/src/components/List/Filters/LabeledIdFilter.tsx b/ui/v2.5/src/components/List/Filters/LabeledIdFilter.tsx
index a9163578f..f19472d64 100644
--- a/ui/v2.5/src/components/List/Filters/LabeledIdFilter.tsx
+++ b/ui/v2.5/src/components/List/Filters/LabeledIdFilter.tsx
@@ -24,6 +24,7 @@ import {
   IntCriterionInput,
   PerformerFilterType,
   SceneFilterType,
+  SceneMarkerFilterType,
   StudioFilterType,
 } from "src/core/generated-graphql";
 import { useIntl } from "react-intl";
@@ -527,6 +528,8 @@ interface IFilterType {
   group_count?: InputMaybe<IntCriterionInput>;
   studios_filter?: InputMaybe<StudioFilterType>;
   studio_count?: InputMaybe<IntCriterionInput>;
+  marker_count?: InputMaybe<IntCriterionInput>;
+  markers_filter?: InputMaybe<SceneMarkerFilterType>;
 }
 
 export function setObjectFilter(
@@ -549,6 +552,7 @@ export function setObjectFilter(
           modifier: CriterionModifier.GreaterThan,
           value: 0,
         };
+        break;
       }
       out.scenes_filter = relatedFilterOutput as SceneFilterType;
       break;
@@ -559,6 +563,7 @@ export function setObjectFilter(
           modifier: CriterionModifier.GreaterThan,
           value: 0,
         };
+        break;
       }
       out.performers_filter = relatedFilterOutput as PerformerFilterType;
       break;
@@ -569,6 +574,7 @@ export function setObjectFilter(
           modifier: CriterionModifier.GreaterThan,
           value: 0,
         };
+        break;
       }
       out.galleries_filter = relatedFilterOutput as GalleryFilterType;
       break;
@@ -579,6 +585,7 @@ export function setObjectFilter(
           modifier: CriterionModifier.GreaterThan,
           value: 0,
         };
+        break;
       }
       out.groups_filter = relatedFilterOutput as GroupFilterType;
       break;
@@ -589,9 +596,21 @@ export function setObjectFilter(
           modifier: CriterionModifier.GreaterThan,
           value: 0,
         };
+        break;
       }
       out.studios_filter = relatedFilterOutput as StudioFilterType;
       break;
+    case FilterMode.SceneMarkers:
+      // if empty, only get objects with scene markers
+      if (empty) {
+        out.marker_count = {
+          modifier: CriterionModifier.GreaterThan,
+          value: 0,
+        };
+        break;
+      }
+      out.markers_filter = relatedFilterOutput as SceneMarkerFilterType;
+      break;
     default:
       throw new Error("Invalid filter mode");
   }
diff --git a/ui/v2.5/src/components/Scenes/SceneMarkerList.tsx b/ui/v2.5/src/components/Scenes/SceneMarkerList.tsx
index b5975ca5a..781a3f0b2 100644
--- a/ui/v2.5/src/components/Scenes/SceneMarkerList.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneMarkerList.tsx
@@ -1,7 +1,7 @@
 import cloneDeep from "lodash-es/cloneDeep";
-import React from "react";
+import React, { useCallback, useEffect } from "react";
 import { useHistory } from "react-router-dom";
-import { useIntl } from "react-intl";
+import { FormattedMessage, useIntl } from "react-intl";
 import Mousetrap from "mousetrap";
 import * as GQL from "src/core/generated-graphql";
 import {
@@ -9,7 +9,7 @@ import {
   useFindSceneMarkers,
 } from "src/core/StashService";
 import NavUtils from "src/utils/navigation";
-import { ItemList, ItemListContext } from "../List/ItemList";
+import { useFilteredItemList } from "../List/ItemList";
 import { ListFilterModel } from "src/models/list-filter/filter";
 import { DisplayMode } from "src/models/list-filter/types";
 import { MarkerWallPanel } from "./SceneMarkerWallPanel";
@@ -17,17 +17,179 @@ import { View } from "../List/views";
 import { SceneMarkerCardGrid } from "./SceneMarkerCardGrid";
 import { DeleteSceneMarkersDialog } from "./DeleteSceneMarkersDialog";
 import { EditSceneMarkersDialog } from "./EditSceneMarkersDialog";
-import { PatchComponent } from "src/patch";
-import { IItemListOperation } from "../List/FilteredListToolbar";
+import { PatchComponent, PatchContainerComponent } from "src/patch";
+import {
+  FilteredListToolbar,
+  IItemListOperation,
+} from "../List/FilteredListToolbar";
+import {
+  Sidebar,
+  SidebarPane,
+  SidebarPaneContent,
+  SidebarStateContext,
+  useSidebarState,
+} from "../Shared/Sidebar";
+import { useCloseEditDelete, useFilterOperations } from "../List/util";
+import {
+  FilteredSidebarHeader,
+  useFilteredSidebarKeybinds,
+} from "../List/Filters/FilterSidebar";
+import { useZoomKeybinds } from "../List/ZoomSlider";
+import {
+  IListFilterOperation,
+  ListOperations,
+} from "../List/ListOperationButtons";
+import cx from "classnames";
+import { FilterTags } from "../List/FilterTags";
+import { Pagination, PaginationIndex } from "../List/Pagination";
+import { LoadedContent } from "../List/PagedList";
+import useFocus from "src/utils/focus";
+import { SidebarPerformersFilter } from "../List/Filters/PerformersFilter";
+import { SidebarTagsFilter } from "../List/Filters/TagsFilter";
+import { Button } from "react-bootstrap";
 
-function getItems(result: GQL.FindSceneMarkersQueryResult) {
-  return result?.data?.findSceneMarkers?.scene_markers ?? [];
+const SceneMarkerList: React.FC<{
+  markers: GQL.SceneMarkerDataFragment[];
+  filter: ListFilterModel;
+  selectedIds: Set<string>;
+  onSelectChange: (id: string, selected: boolean, shiftKey: boolean) => void;
+}> = PatchComponent(
+  "SceneList",
+  ({ markers, filter, selectedIds, onSelectChange }) => {
+    if (markers.length === 0) {
+      return null;
+    }
+
+    if (filter.displayMode === DisplayMode.Wall) {
+      return (
+        <MarkerWallPanel
+          markers={markers}
+          zoomIndex={filter.zoomIndex}
+          selectedIds={selectedIds}
+          onSelectChange={onSelectChange}
+        />
+      );
+    }
+
+    if (filter.displayMode === DisplayMode.Grid) {
+      return (
+        <SceneMarkerCardGrid
+          markers={markers}
+          zoomIndex={filter.zoomIndex}
+          selectedIds={selectedIds}
+          onSelectChange={onSelectChange}
+        />
+      );
+    }
+
+    return null;
+  }
+);
+
+function usePlayRandom(filter: ListFilterModel, count: number) {
+  const history = useHistory();
+
+  const playRandom = useCallback(async () => {
+    // query for a random scene
+    if (count === 0) {
+      return;
+    }
+
+    const pages = Math.ceil(count / filter.itemsPerPage);
+    const page = Math.floor(Math.random() * pages) + 1;
+
+    const indexMax = Math.min(filter.itemsPerPage, count);
+    const index = Math.floor(Math.random() * indexMax);
+    const filterCopy = cloneDeep(filter);
+    filterCopy.currentPage = page;
+    filterCopy.sortBy = "random";
+    const queryResults = await queryFindSceneMarkers(filterCopy);
+    const marker = queryResults.data.findSceneMarkers.scene_markers[index];
+    if (marker) {
+      // navigate to the scene player page
+      const url = NavUtils.makeSceneMarkerUrl(marker);
+      history.push(url);
+    }
+  }, [filter, count, history]);
+
+  return playRandom;
 }
 
-function getCount(result: GQL.FindSceneMarkersQueryResult) {
-  return result?.data?.findSceneMarkers?.count ?? 0;
+function useAddKeybinds(filter: ListFilterModel, count: number) {
+  const playRandom = usePlayRandom(filter, count);
+
+  useEffect(() => {
+    Mousetrap.bind("p r", () => {
+      playRandom();
+    });
+
+    return () => {
+      Mousetrap.unbind("p r");
+    };
+  }, [playRandom]);
 }
 
+const ScenesFilterSidebarSections = PatchContainerComponent(
+  "FilteredSceneMarkerList.SidebarSections"
+);
+
+const SidebarContent: React.FC<{
+  filter: ListFilterModel;
+  setFilter: (filter: ListFilterModel) => void;
+  filterHook?: (filter: ListFilterModel) => ListFilterModel;
+  view?: View;
+  sidebarOpen: boolean;
+  onClose?: () => void;
+  showEditFilter: (editingCriterion?: string) => void;
+  count?: number;
+  focus?: ReturnType<typeof useFocus>;
+}> = ({
+  filter,
+  setFilter,
+  filterHook,
+  view,
+  showEditFilter,
+  sidebarOpen,
+  onClose,
+  count,
+  focus,
+}) => {
+  const showResultsId =
+    count !== undefined ? "actions.show_count_results" : "actions.show_results";
+
+  return (
+    <>
+      <FilteredSidebarHeader
+        sidebarOpen={sidebarOpen}
+        showEditFilter={showEditFilter}
+        filter={filter}
+        setFilter={setFilter}
+        view={view}
+        focus={focus}
+      />
+
+      <ScenesFilterSidebarSections>
+        <SidebarPerformersFilter
+          filter={filter}
+          setFilter={setFilter}
+          filterHook={filterHook}
+        />
+        <SidebarTagsFilter
+          filter={filter}
+          setFilter={setFilter}
+          filterHook={filterHook}
+        />
+      </ScenesFilterSidebarSections>
+
+      <div className="sidebar-footer">
+        <Button className="sidebar-close-button" onClick={onClose}>
+          <FormattedMessage id={showResultsId} values={{ count }} />
+        </Button>
+      </div>
+    </>
+  );
+};
+
 interface ISceneMarkerList {
   filterHook?: (filter: ListFilterModel) => ListFilterModel;
   view?: View;
@@ -36,132 +198,274 @@ interface ISceneMarkerList {
   extraOperations?: IItemListOperation<GQL.FindSceneMarkersQueryResult>[];
 }
 
-export const SceneMarkerList: React.FC<ISceneMarkerList> = PatchComponent(
-  "SceneMarkerList",
-  ({ filterHook, view, alterQuery, extraOperations = [] }) => {
+export const FilteredSceneMarkerList = PatchComponent(
+  "FilteredSceneMarkerList",
+  (props: ISceneMarkerList) => {
     const intl = useIntl();
-    const history = useHistory();
 
-    const filterMode = GQL.FilterMode.SceneMarkers;
+    const searchFocus = useFocus();
 
-    const otherOperations = [
-      ...extraOperations,
-      {
-        text: intl.formatMessage({ id: "actions.play_random" }),
-        onClick: playRandom,
-      },
-    ];
+    const {
+      filterHook,
+      defaultSort,
+      view,
+      alterQuery,
+      extraOperations = [],
+    } = props;
 
-    function addKeybinds(
-      result: GQL.FindSceneMarkersQueryResult,
-      filter: ListFilterModel
-    ) {
-      Mousetrap.bind("p r", () => {
-        playRandom(result, filter);
+    // States
+    const {
+      showSidebar,
+      setShowSidebar,
+      loading: sidebarStateLoading,
+      sectionOpen,
+      setSectionOpen,
+    } = useSidebarState(view);
+
+    const { filterState, queryResult, modalState, listSelect, showEditFilter } =
+      useFilteredItemList({
+        filterStateProps: {
+          filterMode: GQL.FilterMode.SceneMarkers,
+          defaultSort,
+          view,
+          useURL: alterQuery,
+        },
+        queryResultProps: {
+          useResult: useFindSceneMarkers,
+          getCount: (r) => r.data?.findSceneMarkers.count ?? 0,
+          getItems: (r) => r.data?.findSceneMarkers.scene_markers ?? [],
+          filterHook,
+        },
+      });
+
+    const { filter, setFilter } = filterState;
+
+    const { effectiveFilter, result, cachedResult, items, totalCount } =
+      queryResult;
+
+    const {
+      selectedIds,
+      selectedItems,
+      onSelectChange,
+      onSelectAll,
+      onSelectNone,
+      onInvertSelection,
+      hasSelection,
+    } = listSelect;
+
+    const { modal, showModal, closeModal } = modalState;
+
+    // Utility hooks
+    const { setPage, removeCriterion, clearAllCriteria } = useFilterOperations({
+      filter,
+      setFilter,
+    });
+
+    useAddKeybinds(filter, totalCount);
+    useFilteredSidebarKeybinds({
+      showSidebar,
+      setShowSidebar,
+    });
+
+    const onCloseEditDelete = useCloseEditDelete({
+      closeModal,
+      onSelectNone,
+      result,
+    });
+
+    const onEdit = useCallback(() => {
+      showModal(
+        <EditSceneMarkersDialog
+          selected={selectedItems}
+          onClose={onCloseEditDelete}
+        />
+      );
+    }, [showModal, selectedItems, onCloseEditDelete]);
+
+    const onDelete = useCallback(() => {
+      showModal(
+        <DeleteSceneMarkersDialog
+          selected={selectedItems}
+          onClose={onCloseEditDelete}
+        />
+      );
+    }, [showModal, selectedItems, onCloseEditDelete]);
+
+    useEffect(() => {
+      Mousetrap.bind("e", () => {
+        if (hasSelection) {
+          onEdit?.();
+        }
+      });
+
+      Mousetrap.bind("d d", () => {
+        if (hasSelection) {
+          onDelete?.();
+        }
       });
 
       return () => {
-        Mousetrap.unbind("p r");
+        Mousetrap.unbind("e");
+        Mousetrap.unbind("d d");
       };
-    }
+    }, [onSelectAll, onSelectNone, hasSelection, onEdit, onDelete]);
 
-    async function playRandom(
-      result: GQL.FindSceneMarkersQueryResult,
-      filter: ListFilterModel
-    ) {
-      // query for a random scene
-      if (result.data?.findSceneMarkers) {
-        const { count } = result.data.findSceneMarkers;
+    useZoomKeybinds({
+      zoomIndex: filter.zoomIndex,
+      onChangeZoom: (zoom) => setFilter(filter.setZoom(zoom)),
+    });
 
-        const index = Math.floor(Math.random() * count);
-        const filterCopy = cloneDeep(filter);
-        filterCopy.itemsPerPage = 1;
-        filterCopy.currentPage = index + 1;
-        const singleResult = await queryFindSceneMarkers(filterCopy);
-        if (singleResult.data.findSceneMarkers.scene_markers.length === 1) {
-          // navigate to the scene player page
-          const url = NavUtils.makeSceneMarkerUrl(
-            singleResult.data.findSceneMarkers.scene_markers[0]
-          );
-          history.push(url);
-        }
-      }
-    }
+    const playRandom = usePlayRandom(effectiveFilter, totalCount);
 
-    function renderContent(
-      result: GQL.FindSceneMarkersQueryResult,
-      filter: ListFilterModel,
-      selectedIds: Set<string>,
-      onSelectChange: (id: string, selected: boolean, shiftKey: boolean) => void
-    ) {
-      if (!result.data?.findSceneMarkers) return;
+    const convertedExtraOperations: IListFilterOperation[] =
+      extraOperations.map((o) => ({
+        ...o,
+        isDisplayed: o.isDisplayed
+          ? () => o.isDisplayed!(result, filter, selectedIds)
+          : undefined,
+        onClick: () => {
+          o.onClick(result, filter, selectedIds);
+        },
+      }));
 
-      if (filter.displayMode === DisplayMode.Wall) {
-        return (
-          <MarkerWallPanel
-            markers={result.data.findSceneMarkers.scene_markers}
-            zoomIndex={filter.zoomIndex}
-            selectedIds={selectedIds}
-            onSelectChange={onSelectChange}
-          />
-        );
-      }
+    const otherOperations = [
+      ...convertedExtraOperations,
+      {
+        text: intl.formatMessage({ id: "actions.select_all" }),
+        onClick: () => onSelectAll(),
+        isDisplayed: () => totalCount > 0,
+      },
+      {
+        text: intl.formatMessage({ id: "actions.select_none" }),
+        onClick: () => onSelectNone(),
+        isDisplayed: () => hasSelection,
+      },
+      {
+        text: intl.formatMessage({ id: "actions.invert_selection" }),
+        onClick: () => onInvertSelection(),
+        isDisplayed: () => totalCount > 0,
+      },
+      {
+        text: intl.formatMessage({ id: "actions.play_random" }),
+        onClick: playRandom,
+        isDisplayed: () => totalCount > 1,
+      },
+      // {
+      //   text: `${intl.formatMessage({ id: "actions.generate" })}…`,
+      //   onClick: () =>
+      //     showModal(
+      //       <GenerateDialog
+      //         type="scene"
+      //         selectedIds={Array.from(selectedIds.values())}
+      //         onClose={() => closeModal()}
+      //       />
+      //     ),
+      //   isDisplayed: () => hasSelection,
+      // },
+    ];
 
-      if (filter.displayMode === DisplayMode.Grid) {
-        return (
-          <SceneMarkerCardGrid
-            markers={result.data.findSceneMarkers.scene_markers}
-            zoomIndex={filter.zoomIndex}
-            selectedIds={selectedIds}
-            onSelectChange={onSelectChange}
-          />
-        );
-      }
-    }
+    // render
+    if (sidebarStateLoading) return null;
 
-    function renderEditDialog(
-      selectedMarkers: GQL.SceneMarkerDataFragment[],
-      onClose: (applied: boolean) => void
-    ) {
-      return (
-        <EditSceneMarkersDialog selected={selectedMarkers} onClose={onClose} />
-      );
-    }
-
-    function renderDeleteDialog(
-      selectedSceneMarkers: GQL.SceneMarkerDataFragment[],
-      onClose: (confirmed: boolean) => void
-    ) {
-      return (
-        <DeleteSceneMarkersDialog
-          selected={selectedSceneMarkers}
-          onClose={onClose}
-        />
-      );
-    }
+    const operations = (
+      <ListOperations
+        items={items.length}
+        hasSelection={hasSelection}
+        operations={otherOperations}
+        onEdit={onEdit}
+        onDelete={onDelete}
+        operationsMenuClassName="scene-marker-list-operations-dropdown"
+      />
+    );
 
     return (
-      <ItemListContext
-        filterMode={filterMode}
-        useResult={useFindSceneMarkers}
-        getItems={getItems}
-        getCount={getCount}
-        alterQuery={alterQuery}
-        filterHook={filterHook}
-        view={view}
-        selectable
+      <div
+        className={cx("item-list-container scene-list", {
+          "hide-sidebar": !showSidebar,
+        })}
       >
-        <ItemList
-          view={view}
-          otherOperations={otherOperations}
-          addKeybinds={addKeybinds}
-          renderContent={renderContent}
-          renderEditDialog={renderEditDialog}
-          renderDeleteDialog={renderDeleteDialog}
-        />
-      </ItemListContext>
+        {modal}
+
+        <SidebarStateContext.Provider value={{ sectionOpen, setSectionOpen }}>
+          <SidebarPane hideSidebar={!showSidebar}>
+            <Sidebar hide={!showSidebar} onHide={() => setShowSidebar(false)}>
+              <SidebarContent
+                filter={filter}
+                setFilter={setFilter}
+                filterHook={filterHook}
+                showEditFilter={showEditFilter}
+                view={view}
+                sidebarOpen={showSidebar}
+                onClose={() => setShowSidebar(false)}
+                count={cachedResult.loading ? undefined : totalCount}
+                focus={searchFocus}
+              />
+            </Sidebar>
+            <SidebarPaneContent
+              onSidebarToggle={() => setShowSidebar(!showSidebar)}
+            >
+              <FilteredListToolbar
+                filter={filter}
+                listSelect={listSelect}
+                setFilter={setFilter}
+                showEditFilter={showEditFilter}
+                onDelete={onDelete}
+                onEdit={onEdit}
+                operationComponent={operations}
+                view={view}
+                zoomable
+              />
+
+              <FilterTags
+                criteria={filter.criteria}
+                onEditCriterion={(c) => showEditFilter(c.criterionOption.type)}
+                onRemoveCriterion={removeCriterion}
+                onRemoveAll={clearAllCriteria}
+              />
+
+              <div className="pagination-index-container">
+                <Pagination
+                  currentPage={filter.currentPage}
+                  itemsPerPage={filter.itemsPerPage}
+                  totalItems={totalCount}
+                  onChangePage={(page) => setFilter(filter.changePage(page))}
+                />
+                <PaginationIndex
+                  loading={cachedResult.loading}
+                  itemsPerPage={filter.itemsPerPage}
+                  currentPage={filter.currentPage}
+                  totalItems={totalCount}
+                />
+              </div>
+
+              <LoadedContent loading={result.loading} error={result.error}>
+                <SceneMarkerList
+                  filter={effectiveFilter}
+                  markers={items}
+                  selectedIds={selectedIds}
+                  onSelectChange={onSelectChange}
+                />
+              </LoadedContent>
+
+              {totalCount > filter.itemsPerPage && (
+                <div className="pagination-footer-container">
+                  <div className="pagination-footer">
+                    <Pagination
+                      itemsPerPage={filter.itemsPerPage}
+                      currentPage={filter.currentPage}
+                      totalItems={totalCount}
+                      onChangePage={setPage}
+                      pagePopupPlacement="top"
+                    />
+                  </div>
+                </div>
+              )}
+            </SidebarPaneContent>
+          </SidebarPane>
+        </SidebarStateContext.Provider>
+      </div>
     );
   }
 );
 
-export default SceneMarkerList;
+export default FilteredSceneMarkerList;
diff --git a/ui/v2.5/src/components/Tags/TagDetails/TagMarkersPanel.tsx b/ui/v2.5/src/components/Tags/TagDetails/TagMarkersPanel.tsx
index f32f26497..63b906c80 100644
--- a/ui/v2.5/src/components/Tags/TagDetails/TagMarkersPanel.tsx
+++ b/ui/v2.5/src/components/Tags/TagDetails/TagMarkersPanel.tsx
@@ -5,7 +5,7 @@ import {
   TagsCriterion,
   TagsCriterionOption,
 } from "src/models/list-filter/criteria/tags";
-import { SceneMarkerList } from "src/components/Scenes/SceneMarkerList";
+import { FilteredSceneMarkerList } from "src/components/Scenes/SceneMarkerList";
 import { View } from "src/components/List/views";
 
 function useFilterHook(tag: GQL.TagDataFragment, showSubTagContent?: boolean) {
@@ -60,7 +60,7 @@ export const TagMarkersPanel: React.FC<ITagMarkersPanel> = ({
   const filterHook = useFilterHook(tag, showSubTagContent);
 
   return (
-    <SceneMarkerList
+    <FilteredSceneMarkerList
       filterHook={filterHook}
       alterQuery={active}
       view={View.TagMarkers}

From c522e548052f8e5337ec604bd0dafa1c1721cd08 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Thu, 26 Feb 2026 07:55:26 +1100
Subject: [PATCH 317/405] Show unsupported filter criteria in filter tags
 (#6604)

* Show unsupported filter criteria in filter tags

Shows a warning coloured filter tag, with warning icon and text "<type> (unsupported) ...". Cannot be edited, can only be removed. Won't be saved to saved filters.

* Generalise filtered recommendation rows. Include warning popover for unsupported criteria
---
 .../FrontPage/FilteredRecommendationRow.tsx   | 79 +++++++++++++++++++
 .../FrontPage/RecommendationRow.tsx           |  2 +-
 .../Galleries/GalleryRecommendationRow.tsx    | 55 +++++--------
 .../Groups/GroupRecommendationRow.tsx         | 52 ++++--------
 .../Images/ImageRecommendationRow.tsx         | 52 ++++--------
 ui/v2.5/src/components/List/FilterTags.tsx    | 29 ++++++-
 ui/v2.5/src/components/List/styles.scss       |  4 +
 .../Performers/PerformerRecommendationRow.tsx | 55 +++++--------
 .../Scenes/SceneMarkerRecommendationRow.tsx   | 67 ++++++----------
 .../Scenes/SceneRecommendationRow.tsx         | 64 ++++++---------
 .../src/components/Shared/HoverPopover.tsx    | 19 +++++
 ui/v2.5/src/components/Shared/styles.scss     | 13 +++
 .../Studios/StudioRecommendationRow.tsx       | 55 +++++--------
 .../components/Tags/TagRecommendationRow.tsx  | 49 ++++--------
 ui/v2.5/src/locales/en-GB.json                |  2 +
 .../models/list-filter/criteria/criterion.ts  | 51 ++++++++++++
 ui/v2.5/src/models/list-filter/filter.ts      |  4 +-
 17 files changed, 355 insertions(+), 297 deletions(-)
 create mode 100644 ui/v2.5/src/components/FrontPage/FilteredRecommendationRow.tsx

diff --git a/ui/v2.5/src/components/FrontPage/FilteredRecommendationRow.tsx b/ui/v2.5/src/components/FrontPage/FilteredRecommendationRow.tsx
new file mode 100644
index 000000000..8cf27a625
--- /dev/null
+++ b/ui/v2.5/src/components/FrontPage/FilteredRecommendationRow.tsx
@@ -0,0 +1,79 @@
+import React from "react";
+import { Link } from "react-router-dom";
+import Slider from "@ant-design/react-slick";
+import { ListFilterModel } from "src/models/list-filter/filter";
+import { getSlickSliderSettings } from "src/core/recommendations";
+import { RecommendationRow } from "../FrontPage/RecommendationRow";
+import { FormattedMessage } from "react-intl";
+import { PatchComponent } from "src/patch";
+import { UnsupportedCriterion } from "src/models/list-filter/criteria/criterion";
+import { PopoverCard, WarningHoverPopover } from "../Shared/HoverPopover";
+
+interface IProps {
+  className?: string;
+  isTouch: boolean;
+  filter: ListFilterModel;
+  heading: string;
+  count: number;
+  loading: boolean;
+  url: string;
+}
+
+export const FilteredRecommendationRow: React.FC<IProps> = PatchComponent(
+  "FilteredRecommendationRow",
+  (props) => {
+    const cardCount = props.count;
+
+    const unsupportedCriteria = props.filter.criteria.filter(
+      (criterion) => criterion instanceof UnsupportedCriterion
+    );
+
+    const header = unsupportedCriteria.length ? (
+      <div>
+        <span>{props.heading}</span>
+        <WarningHoverPopover
+          placement="top"
+          content={
+            <PopoverCard>
+              <FormattedMessage
+                id="unsupported_criteria"
+                values={{
+                  criteria: unsupportedCriteria
+                    .map((c) => c.criterionOption.type)
+                    .join(", "),
+                }}
+              />
+            </PopoverCard>
+          }
+        />
+      </div>
+    ) : (
+      props.heading
+    );
+
+    if (!props.loading && !cardCount) {
+      return null;
+    }
+
+    return (
+      <RecommendationRow
+        className={props.className}
+        header={header}
+        link={
+          <Link to={props.url}>
+            <FormattedMessage id="view_all" />
+          </Link>
+        }
+      >
+        <Slider
+          {...getSlickSliderSettings(
+            cardCount ? cardCount : props.filter.itemsPerPage,
+            props.isTouch
+          )}
+        >
+          {props.children}
+        </Slider>
+      </RecommendationRow>
+    );
+  }
+);
diff --git a/ui/v2.5/src/components/FrontPage/RecommendationRow.tsx b/ui/v2.5/src/components/FrontPage/RecommendationRow.tsx
index 115d8642a..97e43f294 100644
--- a/ui/v2.5/src/components/FrontPage/RecommendationRow.tsx
+++ b/ui/v2.5/src/components/FrontPage/RecommendationRow.tsx
@@ -3,7 +3,7 @@ import { PatchComponent } from "src/patch";
 
 interface IProps {
   className?: string;
-  header: string;
+  header: React.ReactNode;
   link: JSX.Element;
 }
 
diff --git a/ui/v2.5/src/components/Galleries/GalleryRecommendationRow.tsx b/ui/v2.5/src/components/Galleries/GalleryRecommendationRow.tsx
index b56b48c36..3df07b643 100644
--- a/ui/v2.5/src/components/Galleries/GalleryRecommendationRow.tsx
+++ b/ui/v2.5/src/components/Galleries/GalleryRecommendationRow.tsx
@@ -1,13 +1,9 @@
 import React from "react";
-import { Link } from "react-router-dom";
 import { useFindGalleries } from "src/core/StashService";
-import Slider from "@ant-design/react-slick";
 import { GalleryCard } from "./GalleryCard";
 import { ListFilterModel } from "src/models/list-filter/filter";
-import { getSlickSliderSettings } from "src/core/recommendations";
-import { RecommendationRow } from "../FrontPage/RecommendationRow";
-import { FormattedMessage } from "react-intl";
 import { PatchComponent } from "src/patch";
+import { FilteredRecommendationRow } from "../FrontPage/FilteredRecommendationRow";
 
 interface IProps {
   isTouch: boolean;
@@ -19,40 +15,29 @@ export const GalleryRecommendationRow: React.FC<IProps> = PatchComponent(
   "GalleryRecommendationRow",
   (props) => {
     const result = useFindGalleries(props.filter);
-    const cardCount = result.data?.findGalleries.count;
-
-    if (!result.loading && !cardCount) {
-      return null;
-    }
+    const count = result.data?.findGalleries.count ?? 0;
 
     return (
-      <RecommendationRow
+      <FilteredRecommendationRow
         className="gallery-recommendations"
-        header={props.header}
-        link={
-          <Link to={`/galleries?${props.filter.makeQueryParameters()}`}>
-            <FormattedMessage id="view_all" />
-          </Link>
-        }
+        heading={props.header}
+        url={`/galleries?${props.filter.makeQueryParameters()}`}
+        count={count}
+        loading={result.loading}
+        isTouch={props.isTouch}
+        filter={props.filter}
       >
-        <Slider
-          {...getSlickSliderSettings(
-            cardCount ? cardCount : props.filter.itemsPerPage,
-            props.isTouch
-          )}
-        >
-          {result.loading
-            ? [...Array(props.filter.itemsPerPage)].map((i) => (
-                <div
-                  key={`_${i}`}
-                  className="gallery-skeleton skeleton-card"
-                ></div>
-              ))
-            : result.data?.findGalleries.galleries.map((g) => (
-                <GalleryCard key={g.id} gallery={g} zoomIndex={1} />
-              ))}
-        </Slider>
-      </RecommendationRow>
+        {result.loading
+          ? [...Array(props.filter.itemsPerPage)].map((i) => (
+              <div
+                key={`_${i}`}
+                className="gallery-skeleton skeleton-card"
+              ></div>
+            ))
+          : result.data?.findGalleries.galleries.map((g) => (
+              <GalleryCard key={g.id} gallery={g} zoomIndex={1} />
+            ))}
+      </FilteredRecommendationRow>
     );
   }
 );
diff --git a/ui/v2.5/src/components/Groups/GroupRecommendationRow.tsx b/ui/v2.5/src/components/Groups/GroupRecommendationRow.tsx
index 228cb3467..b9e523b34 100644
--- a/ui/v2.5/src/components/Groups/GroupRecommendationRow.tsx
+++ b/ui/v2.5/src/components/Groups/GroupRecommendationRow.tsx
@@ -1,13 +1,9 @@
 import React from "react";
-import { Link } from "react-router-dom";
 import { useFindGroups } from "src/core/StashService";
-import Slider from "@ant-design/react-slick";
 import { GroupCard } from "./GroupCard";
 import { ListFilterModel } from "src/models/list-filter/filter";
-import { getSlickSliderSettings } from "src/core/recommendations";
-import { RecommendationRow } from "../FrontPage/RecommendationRow";
-import { FormattedMessage } from "react-intl";
 import { PatchComponent } from "src/patch";
+import { FilteredRecommendationRow } from "../FrontPage/FilteredRecommendationRow";
 
 interface IProps {
   isTouch: boolean;
@@ -19,40 +15,26 @@ export const GroupRecommendationRow: React.FC<IProps> = PatchComponent(
   "GroupRecommendationRow",
   (props: IProps) => {
     const result = useFindGroups(props.filter);
-    const cardCount = result.data?.findGroups.count;
-
-    if (!result.loading && !cardCount) {
-      return null;
-    }
+    const count = result.data?.findGroups.count ?? 0;
 
     return (
-      <RecommendationRow
+      <FilteredRecommendationRow
         className="group-recommendations"
-        header={props.header}
-        link={
-          <Link to={`/groups?${props.filter.makeQueryParameters()}`}>
-            <FormattedMessage id="view_all" />
-          </Link>
-        }
+        heading={props.header}
+        url={`/groups?${props.filter.makeQueryParameters()}`}
+        count={count}
+        loading={result.loading}
+        isTouch={props.isTouch}
+        filter={props.filter}
       >
-        <Slider
-          {...getSlickSliderSettings(
-            cardCount ? cardCount : props.filter.itemsPerPage,
-            props.isTouch
-          )}
-        >
-          {result.loading
-            ? [...Array(props.filter.itemsPerPage)].map((i) => (
-                <div
-                  key={`_${i}`}
-                  className="group-skeleton skeleton-card"
-                ></div>
-              ))
-            : result.data?.findGroups.groups.map((g) => (
-                <GroupCard key={g.id} group={g} />
-              ))}
-        </Slider>
-      </RecommendationRow>
+        {result.loading
+          ? [...Array(props.filter.itemsPerPage)].map((i) => (
+              <div key={`_${i}`} className="group-skeleton skeleton-card"></div>
+            ))
+          : result.data?.findGroups.groups.map((g) => (
+              <GroupCard key={g.id} group={g} />
+            ))}
+      </FilteredRecommendationRow>
     );
   }
 );
diff --git a/ui/v2.5/src/components/Images/ImageRecommendationRow.tsx b/ui/v2.5/src/components/Images/ImageRecommendationRow.tsx
index 6499be894..0541e5934 100644
--- a/ui/v2.5/src/components/Images/ImageRecommendationRow.tsx
+++ b/ui/v2.5/src/components/Images/ImageRecommendationRow.tsx
@@ -1,13 +1,9 @@
 import React from "react";
-import { Link } from "react-router-dom";
 import { useFindImages } from "src/core/StashService";
-import Slider from "@ant-design/react-slick";
 import { ListFilterModel } from "src/models/list-filter/filter";
-import { getSlickSliderSettings } from "src/core/recommendations";
-import { RecommendationRow } from "../FrontPage/RecommendationRow";
-import { FormattedMessage } from "react-intl";
 import { ImageCard } from "./ImageCard";
 import { PatchComponent } from "src/patch";
+import { FilteredRecommendationRow } from "../FrontPage/FilteredRecommendationRow";
 
 interface IProps {
   isTouch: boolean;
@@ -19,40 +15,26 @@ export const ImageRecommendationRow: React.FC<IProps> = PatchComponent(
   "ImageRecommendationRow",
   (props: IProps) => {
     const result = useFindImages(props.filter);
-    const cardCount = result.data?.findImages.count;
-
-    if (!result.loading && !cardCount) {
-      return null;
-    }
+    const count = result.data?.findImages.count ?? 0;
 
     return (
-      <RecommendationRow
+      <FilteredRecommendationRow
         className="images-recommendations"
-        header={props.header}
-        link={
-          <Link to={`/images?${props.filter.makeQueryParameters()}`}>
-            <FormattedMessage id="view_all" />
-          </Link>
-        }
+        heading={props.header}
+        url={`/images?${props.filter.makeQueryParameters()}`}
+        count={count}
+        loading={result.loading}
+        isTouch={props.isTouch}
+        filter={props.filter}
       >
-        <Slider
-          {...getSlickSliderSettings(
-            cardCount ? cardCount : props.filter.itemsPerPage,
-            props.isTouch
-          )}
-        >
-          {result.loading
-            ? [...Array(props.filter.itemsPerPage)].map((i) => (
-                <div
-                  key={`_${i}`}
-                  className="image-skeleton skeleton-card"
-                ></div>
-              ))
-            : result.data?.findImages.images.map((i) => (
-                <ImageCard key={i.id} image={i} zoomIndex={1} />
-              ))}
-        </Slider>
-      </RecommendationRow>
+        {result.loading
+          ? [...Array(props.filter.itemsPerPage)].map((i) => (
+              <div key={`_${i}`} className="image-skeleton skeleton-card"></div>
+            ))
+          : result.data?.findImages.images.map((i) => (
+              <ImageCard key={i.id} image={i} zoomIndex={1} />
+            ))}
+      </FilteredRecommendationRow>
     );
   }
 );
diff --git a/ui/v2.5/src/components/List/FilterTags.tsx b/ui/v2.5/src/components/List/FilterTags.tsx
index 5597cae79..28c9f77fa 100644
--- a/ui/v2.5/src/components/List/FilterTags.tsx
+++ b/ui/v2.5/src/components/List/FilterTags.tsx
@@ -6,10 +6,17 @@ import React, {
   useRef,
 } from "react";
 import { Badge, BadgeProps, Button, Overlay, Popover } from "react-bootstrap";
-import { Criterion } from "src/models/list-filter/criteria/criterion";
+import {
+  Criterion,
+  UnsupportedCriterion,
+} from "src/models/list-filter/criteria/criterion";
 import { FormattedMessage, useIntl } from "react-intl";
 import { Icon } from "../Shared/Icon";
-import { faMagnifyingGlass, faTimes } from "@fortawesome/free-solid-svg-icons";
+import {
+  faExclamationTriangle,
+  faMagnifyingGlass,
+  faTimes,
+} from "@fortawesome/free-solid-svg-icons";
 import { BsPrefixProps, ReplaceProps } from "react-bootstrap/esm/helpers";
 import { CustomFieldsCriterion } from "src/models/list-filter/criteria/custom-fields";
 import { useDebounce } from "src/hooks/debounce";
@@ -38,9 +45,20 @@ export const FilterTag: React.FC<{
   label: React.ReactNode;
   onClick: React.MouseEventHandler<HTMLSpanElement>;
   onRemove: React.MouseEventHandler<HTMLElement>;
-}> = ({ className, label, onClick, onRemove }) => {
+  unsupported?: boolean;
+}> = ({ className, label, onClick, onRemove, unsupported }) => {
+  function handleClick(e: React.MouseEvent<HTMLSpanElement, MouseEvent>) {
+    if (unsupported) {
+      return;
+    }
+    onClick(e);
+  }
+
   return (
-    <TagItem className={className} onClick={onClick}>
+    <TagItem className={cx(className, { unsupported })} onClick={handleClick}>
+      {unsupported && (
+        <Icon icon={faExclamationTriangle} className="unsupported-icon" />
+      )}
       {label}
       <Button
         variant="secondary"
@@ -271,10 +289,13 @@ export const FilterTags: React.FC<IFilterTagsProps> = ({
       });
     }
 
+    const unsupported = criterion instanceof UnsupportedCriterion;
+
     return (
       <FilterTag
         key={criterion.getId()}
         label={criterion.getLabel(intl, sfwContentMode)}
+        unsupported={unsupported}
         onClick={() => onClickCriterionTag(criterion)}
         onRemove={($event) => onRemoveCriterionTag(criterion, $event)}
       />
diff --git a/ui/v2.5/src/components/List/styles.scss b/ui/v2.5/src/components/List/styles.scss
index e7a4caf02..ede004101 100644
--- a/ui/v2.5/src/components/List/styles.scss
+++ b/ui/v2.5/src/components/List/styles.scss
@@ -470,6 +470,10 @@ input[type="range"].zoom-slider {
     line-height: 16px;
     padding: 0;
   }
+
+  .tag-item.unsupported {
+    background-color: $warning;
+  }
 }
 
 .filter-button {
diff --git a/ui/v2.5/src/components/Performers/PerformerRecommendationRow.tsx b/ui/v2.5/src/components/Performers/PerformerRecommendationRow.tsx
index 13bba1e99..e07c44947 100644
--- a/ui/v2.5/src/components/Performers/PerformerRecommendationRow.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerRecommendationRow.tsx
@@ -1,13 +1,9 @@
 import React from "react";
-import { Link } from "react-router-dom";
 import { useFindPerformers } from "src/core/StashService";
-import Slider from "@ant-design/react-slick";
 import { PerformerCard } from "./PerformerCard";
 import { ListFilterModel } from "src/models/list-filter/filter";
-import { getSlickSliderSettings } from "src/core/recommendations";
-import { RecommendationRow } from "../FrontPage/RecommendationRow";
-import { FormattedMessage } from "react-intl";
 import { PatchComponent } from "src/patch";
+import { FilteredRecommendationRow } from "../FrontPage/FilteredRecommendationRow";
 
 interface IProps {
   isTouch: boolean;
@@ -19,40 +15,29 @@ export const PerformerRecommendationRow: React.FC<IProps> = PatchComponent(
   "PerformerRecommendationRow",
   (props) => {
     const result = useFindPerformers(props.filter);
-    const cardCount = result.data?.findPerformers.count;
-
-    if (!result.loading && !cardCount) {
-      return null;
-    }
+    const count = result.data?.findPerformers.count ?? 0;
 
     return (
-      <RecommendationRow
+      <FilteredRecommendationRow
         className="performer-recommendations"
-        header={props.header}
-        link={
-          <Link to={`/performers?${props.filter.makeQueryParameters()}`}>
-            <FormattedMessage id="view_all" />
-          </Link>
-        }
+        heading={props.header}
+        url={`/performers?${props.filter.makeQueryParameters()}`}
+        count={count}
+        loading={result.loading}
+        isTouch={props.isTouch}
+        filter={props.filter}
       >
-        <Slider
-          {...getSlickSliderSettings(
-            cardCount ? cardCount : props.filter.itemsPerPage,
-            props.isTouch
-          )}
-        >
-          {result.loading
-            ? [...Array(props.filter.itemsPerPage)].map((i) => (
-                <div
-                  key={`_${i}`}
-                  className="performer-skeleton skeleton-card"
-                ></div>
-              ))
-            : result.data?.findPerformers.performers.map((p) => (
-                <PerformerCard key={p.id} performer={p} />
-              ))}
-        </Slider>
-      </RecommendationRow>
+        {result.loading
+          ? [...Array(props.filter.itemsPerPage)].map((i) => (
+              <div
+                key={`_${i}`}
+                className="performer-skeleton skeleton-card"
+              ></div>
+            ))
+          : result.data?.findPerformers.performers.map((p) => (
+              <PerformerCard key={p.id} performer={p} />
+            ))}
+      </FilteredRecommendationRow>
     );
   }
 );
diff --git a/ui/v2.5/src/components/Scenes/SceneMarkerRecommendationRow.tsx b/ui/v2.5/src/components/Scenes/SceneMarkerRecommendationRow.tsx
index 5c9769206..891801f2d 100644
--- a/ui/v2.5/src/components/Scenes/SceneMarkerRecommendationRow.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneMarkerRecommendationRow.tsx
@@ -1,13 +1,9 @@
 import React from "react";
-import { Link } from "react-router-dom";
 import { useFindSceneMarkers } from "src/core/StashService";
-import Slider from "@ant-design/react-slick";
 import { ListFilterModel } from "src/models/list-filter/filter";
-import { getSlickSliderSettings } from "src/core/recommendations";
-import { RecommendationRow } from "../FrontPage/RecommendationRow";
-import { FormattedMessage } from "react-intl";
 import { SceneMarkerCard } from "./SceneMarkerCard";
 import { PatchComponent } from "src/patch";
+import { FilteredRecommendationRow } from "../FrontPage/FilteredRecommendationRow";
 
 interface IProps {
   isTouch: boolean;
@@ -19,47 +15,34 @@ export const SceneMarkerRecommendationRow: React.FC<IProps> = PatchComponent(
   "SceneMarkerRecommendationRow",
   (props) => {
     const result = useFindSceneMarkers(props.filter);
-    const cardCount = result.data?.findSceneMarkers.count;
-
-    if (!result.loading && !cardCount) {
-      return null;
-    }
+    const count = result.data?.findSceneMarkers.count ?? 0;
 
     return (
-      <RecommendationRow
+      <FilteredRecommendationRow
         className="scene-marker-recommendations"
-        header={props.header}
-        link={
-          <Link to={`/scenes/markers?${props.filter.makeQueryParameters()}`}>
-            <FormattedMessage id="view_all" />
-          </Link>
-        }
+        heading={props.header}
+        url={`/scenes/markers?${props.filter.makeQueryParameters()}`}
+        count={count}
+        loading={result.loading}
+        isTouch={props.isTouch}
+        filter={props.filter}
       >
-        <Slider
-          {...getSlickSliderSettings(
-            cardCount ? cardCount : props.filter.itemsPerPage,
-            props.isTouch
-          )}
-        >
-          {result.loading
-            ? [...Array(props.filter.itemsPerPage)].map((i) => (
-                <div
-                  key={`_${i}`}
-                  className="scene-marker-skeleton skeleton-card"
-                ></div>
-              ))
-            : result.data?.findSceneMarkers.scene_markers.map(
-                (marker, index) => (
-                  <SceneMarkerCard
-                    key={marker.id}
-                    marker={marker}
-                    index={index}
-                    zoomIndex={1}
-                  />
-                )
-              )}
-        </Slider>
-      </RecommendationRow>
+        {result.loading
+          ? [...Array(props.filter.itemsPerPage)].map((i) => (
+              <div
+                key={`_${i}`}
+                className="scene-marker-skeleton skeleton-card"
+              ></div>
+            ))
+          : result.data?.findSceneMarkers.scene_markers.map((marker, index) => (
+              <SceneMarkerCard
+                key={marker.id}
+                marker={marker}
+                index={index}
+                zoomIndex={1}
+              />
+            ))}
+      </FilteredRecommendationRow>
     );
   }
 );
diff --git a/ui/v2.5/src/components/Scenes/SceneRecommendationRow.tsx b/ui/v2.5/src/components/Scenes/SceneRecommendationRow.tsx
index f90b63ec6..f5aafe846 100644
--- a/ui/v2.5/src/components/Scenes/SceneRecommendationRow.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneRecommendationRow.tsx
@@ -1,14 +1,10 @@
 import React, { useMemo } from "react";
-import { Link } from "react-router-dom";
 import { useFindScenes } from "src/core/StashService";
-import Slider from "@ant-design/react-slick";
 import { SceneCard } from "./SceneCard";
 import { SceneQueue } from "src/models/sceneQueue";
 import { ListFilterModel } from "src/models/list-filter/filter";
-import { getSlickSliderSettings } from "src/core/recommendations";
-import { RecommendationRow } from "../FrontPage/RecommendationRow";
-import { FormattedMessage } from "react-intl";
 import { PatchComponent } from "src/patch";
+import { FilteredRecommendationRow } from "../FrontPage/FilteredRecommendationRow";
 
 interface IProps {
   isTouch: boolean;
@@ -20,50 +16,36 @@ export const SceneRecommendationRow: React.FC<IProps> = PatchComponent(
   "SceneRecommendationRow",
   (props) => {
     const result = useFindScenes(props.filter);
-    const cardCount = result.data?.findScenes.count;
+    const count = result.data?.findScenes.count ?? 0;
 
     const queue = useMemo(() => {
       return SceneQueue.fromListFilterModel(props.filter);
     }, [props.filter]);
 
-    if (!result.loading && !cardCount) {
-      return null;
-    }
-
     return (
-      <RecommendationRow
+      <FilteredRecommendationRow
         className="scene-recommendations"
-        header={props.header}
-        link={
-          <Link to={`/scenes?${props.filter.makeQueryParameters()}`}>
-            <FormattedMessage id="view_all" />
-          </Link>
-        }
+        heading={props.header}
+        url={`/scenes?${props.filter.makeQueryParameters()}`}
+        count={count}
+        loading={result.loading}
+        isTouch={props.isTouch}
+        filter={props.filter}
       >
-        <Slider
-          {...getSlickSliderSettings(
-            cardCount ? cardCount : props.filter.itemsPerPage,
-            props.isTouch
-          )}
-        >
-          {result.loading
-            ? [...Array(props.filter.itemsPerPage)].map((i) => (
-                <div
-                  key={`_${i}`}
-                  className="scene-skeleton skeleton-card"
-                ></div>
-              ))
-            : result.data?.findScenes.scenes.map((scene, index) => (
-                <SceneCard
-                  key={scene.id}
-                  scene={scene}
-                  queue={queue}
-                  index={index}
-                  zoomIndex={1}
-                />
-              ))}
-        </Slider>
-      </RecommendationRow>
+        {result.loading
+          ? [...Array(props.filter.itemsPerPage)].map((i) => (
+              <div key={`_${i}`} className="scene-skeleton skeleton-card"></div>
+            ))
+          : result.data?.findScenes.scenes.map((scene, index) => (
+              <SceneCard
+                key={scene.id}
+                scene={scene}
+                queue={queue}
+                index={index}
+                zoomIndex={1}
+              />
+            ))}
+      </FilteredRecommendationRow>
     );
   }
 );
diff --git a/ui/v2.5/src/components/Shared/HoverPopover.tsx b/ui/v2.5/src/components/Shared/HoverPopover.tsx
index 013da7472..7ec8137ca 100644
--- a/ui/v2.5/src/components/Shared/HoverPopover.tsx
+++ b/ui/v2.5/src/components/Shared/HoverPopover.tsx
@@ -1,6 +1,8 @@
 import React, { useState, useCallback, useEffect, useRef } from "react";
 import { Overlay, Popover, OverlayProps } from "react-bootstrap";
 import { PatchComponent } from "src/patch";
+import { Icon } from "./Icon";
+import { faExclamationTriangle } from "@fortawesome/free-solid-svg-icons";
 
 interface IHoverPopover {
   enterDelay?: number;
@@ -85,3 +87,20 @@ export const HoverPopover: React.FC<IHoverPopover> = PatchComponent(
     );
   }
 );
+
+// convenience component to set the padding on popover content
+export const PopoverCard: React.FC<{ className?: string }> = ({
+  className,
+  children,
+}) => {
+  return <div className={`popover-card ${className}`}>{children}</div>;
+};
+
+export const WarningHoverPopover: React.FC<IHoverPopover> = PatchComponent(
+  "WarningHoverPopover",
+  ({ children, ...props }) => (
+    <HoverPopover {...props} className="warning-hover-popover">
+      <Icon icon={faExclamationTriangle} />
+    </HoverPopover>
+  )
+);
diff --git a/ui/v2.5/src/components/Shared/styles.scss b/ui/v2.5/src/components/Shared/styles.scss
index 97a5c4387..1251ffb9b 100644
--- a/ui/v2.5/src/components/Shared/styles.scss
+++ b/ui/v2.5/src/components/Shared/styles.scss
@@ -233,6 +233,19 @@ button.collapse-button {
 .hover-popover-content {
   max-width: 32rem;
   text-align: center;
+
+  .popover-card {
+    padding: 0.5rem;
+  }
+}
+
+.warning-hover-popover {
+  display: inline-flex;
+  margin: 0 0.25rem;
+
+  .fa-icon {
+    color: $warning;
+  }
 }
 
 .ErrorMessage-container {
diff --git a/ui/v2.5/src/components/Studios/StudioRecommendationRow.tsx b/ui/v2.5/src/components/Studios/StudioRecommendationRow.tsx
index bede2da1d..3b6c037a8 100644
--- a/ui/v2.5/src/components/Studios/StudioRecommendationRow.tsx
+++ b/ui/v2.5/src/components/Studios/StudioRecommendationRow.tsx
@@ -1,13 +1,9 @@
 import React from "react";
-import { Link } from "react-router-dom";
 import { useFindStudios } from "src/core/StashService";
-import Slider from "@ant-design/react-slick";
 import { StudioCard } from "./StudioCard";
 import { ListFilterModel } from "src/models/list-filter/filter";
-import { getSlickSliderSettings } from "src/core/recommendations";
-import { RecommendationRow } from "../FrontPage/RecommendationRow";
-import { FormattedMessage } from "react-intl";
 import { PatchComponent } from "src/patch";
+import { FilteredRecommendationRow } from "../FrontPage/FilteredRecommendationRow";
 
 interface IProps {
   isTouch: boolean;
@@ -19,40 +15,29 @@ export const StudioRecommendationRow: React.FC<IProps> = PatchComponent(
   "StudioRecommendationRow",
   (props) => {
     const result = useFindStudios(props.filter);
-    const cardCount = result.data?.findStudios.count;
-
-    if (!result.loading && !cardCount) {
-      return null;
-    }
+    const count = result.data?.findStudios.count ?? 0;
 
     return (
-      <RecommendationRow
+      <FilteredRecommendationRow
         className="studio-recommendations"
-        header={props.header}
-        link={
-          <Link to={`/studios?${props.filter.makeQueryParameters()}`}>
-            <FormattedMessage id="view_all" />
-          </Link>
-        }
+        heading={props.header}
+        url={`/studios?${props.filter.makeQueryParameters()}`}
+        count={count}
+        loading={result.loading}
+        isTouch={props.isTouch}
+        filter={props.filter}
       >
-        <Slider
-          {...getSlickSliderSettings(
-            cardCount ? cardCount : props.filter.itemsPerPage,
-            props.isTouch
-          )}
-        >
-          {result.loading
-            ? [...Array(props.filter.itemsPerPage)].map((i) => (
-                <div
-                  key={`_${i}`}
-                  className="studio-skeleton skeleton-card"
-                ></div>
-              ))
-            : result.data?.findStudios.studios.map((s) => (
-                <StudioCard key={s.id} studio={s} hideParent={true} />
-              ))}
-        </Slider>
-      </RecommendationRow>
+        {result.loading
+          ? [...Array(props.filter.itemsPerPage)].map((i) => (
+              <div
+                key={`_${i}`}
+                className="studio-skeleton skeleton-card"
+              ></div>
+            ))
+          : result.data?.findStudios.studios.map((s) => (
+              <StudioCard key={s.id} studio={s} hideParent={true} />
+            ))}
+      </FilteredRecommendationRow>
     );
   }
 );
diff --git a/ui/v2.5/src/components/Tags/TagRecommendationRow.tsx b/ui/v2.5/src/components/Tags/TagRecommendationRow.tsx
index 27e9e8dce..741c83245 100644
--- a/ui/v2.5/src/components/Tags/TagRecommendationRow.tsx
+++ b/ui/v2.5/src/components/Tags/TagRecommendationRow.tsx
@@ -1,13 +1,9 @@
 import React from "react";
-import { Link } from "react-router-dom";
 import { useFindTags } from "src/core/StashService";
-import Slider from "@ant-design/react-slick";
 import { TagCard } from "./TagCard";
 import { ListFilterModel } from "src/models/list-filter/filter";
-import { getSlickSliderSettings } from "src/core/recommendations";
-import { RecommendationRow } from "../FrontPage/RecommendationRow";
-import { FormattedMessage } from "react-intl";
 import { PatchComponent } from "src/patch";
+import { FilteredRecommendationRow } from "../FrontPage/FilteredRecommendationRow";
 
 interface IProps {
   isTouch: boolean;
@@ -19,37 +15,26 @@ export const TagRecommendationRow: React.FC<IProps> = PatchComponent(
   "TagRecommendationRow",
   (props) => {
     const result = useFindTags(props.filter);
-    const cardCount = result.data?.findTags.count;
-
-    if (!result.loading && !cardCount) {
-      return null;
-    }
+    const count = result.data?.findTags.count ?? 0;
 
     return (
-      <RecommendationRow
+      <FilteredRecommendationRow
         className="tag-recommendations"
-        header={props.header}
-        link={
-          <Link to={`/tags?${props.filter.makeQueryParameters()}`}>
-            <FormattedMessage id="view_all" />
-          </Link>
-        }
+        heading={props.header}
+        url={`/tags?${props.filter.makeQueryParameters()}`}
+        count={count}
+        loading={result.loading}
+        isTouch={props.isTouch}
+        filter={props.filter}
       >
-        <Slider
-          {...getSlickSliderSettings(
-            cardCount ? cardCount : props.filter.itemsPerPage,
-            props.isTouch
-          )}
-        >
-          {result.loading
-            ? [...Array(props.filter.itemsPerPage)].map((i) => (
-                <div key={`_${i}`} className="tag-skeleton skeleton-card"></div>
-              ))
-            : result.data?.findTags.tags.map((p) => (
-                <TagCard key={p.id} tag={p} zoomIndex={0} />
-              ))}
-        </Slider>
-      </RecommendationRow>
+        {result.loading
+          ? [...Array(props.filter.itemsPerPage)].map((i) => (
+              <div key={`_${i}`} className="tag-skeleton skeleton-card"></div>
+            ))
+          : result.data?.findTags.tags.map((p) => (
+              <TagCard key={p.id} tag={p} zoomIndex={0} />
+            ))}
+      </FilteredRecommendationRow>
     );
   }
 );
diff --git a/ui/v2.5/src/locales/en-GB.json b/ui/v2.5/src/locales/en-GB.json
index e19f9ca8f..8c9aaf3f0 100644
--- a/ui/v2.5/src/locales/en-GB.json
+++ b/ui/v2.5/src/locales/en-GB.json
@@ -918,6 +918,7 @@
   "criterion": {
     "greater_than": "Greater than",
     "less_than": "Less than",
+    "unsupported": "{type} (unsupported)",
     "value": "Value"
   },
   "criterion_modifier": {
@@ -1656,6 +1657,7 @@
   "twitter": "Twitter",
   "type": "Type",
   "unknown_date": "Unknown date",
+  "unsupported_criteria": "Unsupported criteria: {criteria}",
   "updated_at": "Updated At",
   "url": "URL",
   "urls": "URLs",
diff --git a/ui/v2.5/src/models/list-filter/criteria/criterion.ts b/ui/v2.5/src/models/list-filter/criteria/criterion.ts
index ae23a48d4..007ee6508 100644
--- a/ui/v2.5/src/models/list-filter/criteria/criterion.ts
+++ b/ui/v2.5/src/models/list-filter/criteria/criterion.ts
@@ -1221,3 +1221,54 @@ export class TimestampCriterion extends ModifierCriterion<ITimestampValue> {
     return true;
   }
 }
+
+export class UnsupportedCriterionOption extends StringCriterionOption {
+  constructor(type: string) {
+    super({
+      messageID: "unsupported_criterion",
+      type: type as CriterionType,
+      makeCriterion: () => new UnsupportedCriterion(this),
+    });
+  }
+}
+
+export class UnsupportedCriterion extends StringCriterion {
+  public getLabel(intl: IntlShape): string {
+    const modifierString = ModifierCriterion.getModifierLabel(
+      intl,
+      this.modifier
+    );
+    let valueString = "";
+
+    if (
+      this.modifier !== CriterionModifier.IsNull &&
+      this.modifier !== CriterionModifier.NotNull
+    ) {
+      valueString = this.getLabelValue(intl);
+    }
+
+    return intl.formatMessage(
+      { id: "criterion_modifier.format_string" },
+      {
+        criterion: intl.formatMessage(
+          { id: "criterion.unsupported" },
+          { type: this.criterionOption.type }
+        ),
+        modifierString,
+        valueString,
+      }
+    );
+  }
+
+  public applyToCriterionInput(): void {
+    // do nothing
+  }
+
+  public applyToSavedCriterion(): void {
+    // do nothing
+  }
+
+  public setFromSavedCriterion(): void {
+    // do nothing
+  }
+}
diff --git a/ui/v2.5/src/models/list-filter/filter.ts b/ui/v2.5/src/models/list-filter/filter.ts
index d28107a12..419346c55 100644
--- a/ui/v2.5/src/models/list-filter/filter.ts
+++ b/ui/v2.5/src/models/list-filter/filter.ts
@@ -5,7 +5,7 @@ import {
   SavedFilterDataFragment,
   SortDirectionEnum,
 } from "src/core/generated-graphql";
-import { Criterion } from "./criteria/criterion";
+import { Criterion, UnsupportedCriterionOption } from "./criteria/criterion";
 import { getFilterOptions } from "./factory";
 import { CriterionType, DisplayMode, SavedUIOptions } from "./types";
 import { ListFilterOptions } from "./filter-options";
@@ -437,7 +437,7 @@ export class ListFilterModel {
     const option = criterionOptions.find((o) => o.type === type);
 
     if (!option) {
-      throw new Error(`Unknown criterion parameter name: ${type}`);
+      return new UnsupportedCriterionOption(type).makeCriterion(this.config);
     }
 
     return option.makeCriterion(this.config);

From ed58d183341502fcdd198594ce33d3a07568c396 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Thu, 26 Feb 2026 14:13:15 +1100
Subject: [PATCH 318/405] Add sidebar to images list (#6607)

* Use effective filter for keybinds/view random
* Refactor ImageList to use sidebar
* Add performer age filter to gallery sidebar
* Port metadata info changes
* Fix incorrect patch component parameter
* Update plugin doc and types
---
 .../GalleryDetails/GalleryAddPanel.tsx        |   4 +-
 .../GalleryDetails/GalleryImagesPanel.tsx     |   4 +-
 .../src/components/Galleries/GalleryList.tsx  |  14 +-
 ui/v2.5/src/components/Groups/GroupList.tsx   |   4 +-
 ui/v2.5/src/components/Images/ImageList.tsx   | 801 ++++++++++++------
 ui/v2.5/src/components/Images/Images.tsx      |   4 +-
 .../List/Filters/LabeledIdFilter.tsx          |  14 +
 ui/v2.5/src/components/List/ItemList.tsx      |  16 +-
 ui/v2.5/src/components/List/util.ts           |  20 +-
 .../PerformerDetails/PerformerImagesPanel.tsx |   4 +-
 .../components/Performers/PerformerList.tsx   |   4 +-
 ui/v2.5/src/components/Scenes/SceneList.tsx   |   2 +-
 .../src/components/Scenes/SceneMarkerList.tsx |   2 +-
 .../StudioDetails/StudioImagesPanel.tsx       |   4 +-
 ui/v2.5/src/components/Studios/StudioList.tsx |   4 +-
 .../Tags/TagDetails/TagImagesPanel.tsx        |   4 +-
 ui/v2.5/src/docs/en/Manual/UIPluginApi.md     |  10 +
 ui/v2.5/src/models/list-filter/galleries.ts   |   5 +-
 ui/v2.5/src/models/list-filter/images.ts      |   7 +-
 ui/v2.5/src/pluginApi.d.ts                    |   5 +
 20 files changed, 645 insertions(+), 287 deletions(-)

diff --git a/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryAddPanel.tsx b/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryAddPanel.tsx
index 275c4263b..6fbb12f15 100644
--- a/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryAddPanel.tsx
+++ b/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryAddPanel.tsx
@@ -2,7 +2,7 @@ import React from "react";
 import * as GQL from "src/core/generated-graphql";
 import { GalleriesCriterion } from "src/models/list-filter/criteria/galleries";
 import { ListFilterModel } from "src/models/list-filter/filter";
-import { ImageList } from "src/components/Images/ImageList";
+import { FilteredImageList } from "src/components/Images/ImageList";
 import { showWhenSelected } from "src/components/List/ItemList";
 import { mutateAddGalleryImages } from "src/core/StashService";
 import { useToast } from "src/hooks/Toast";
@@ -100,7 +100,7 @@ export const GalleryAddPanel: React.FC<IGalleryAddProps> = PatchComponent(
     ];
 
     return (
-      <ImageList
+      <FilteredImageList
         filterHook={filterHook}
         extraOperations={otherOperations}
         alterQuery={active}
diff --git a/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryImagesPanel.tsx b/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryImagesPanel.tsx
index 3d004749f..174e507a8 100644
--- a/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryImagesPanel.tsx
+++ b/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryImagesPanel.tsx
@@ -2,7 +2,7 @@ import React from "react";
 import * as GQL from "src/core/generated-graphql";
 import { GalleriesCriterion } from "src/models/list-filter/criteria/galleries";
 import { ListFilterModel } from "src/models/list-filter/filter";
-import { ImageList } from "src/components/Images/ImageList";
+import { FilteredImageList } from "src/components/Images/ImageList";
 import {
   mutateRemoveGalleryImages,
   mutateSetGalleryCover,
@@ -142,7 +142,7 @@ export const GalleryImagesPanel: React.FC<IGalleryDetailsProps> =
       ];
 
       return (
-        <ImageList
+        <FilteredImageList
           filterHook={filterHook}
           alterQuery={active}
           extraOperations={otherOperations}
diff --git a/ui/v2.5/src/components/Galleries/GalleryList.tsx b/ui/v2.5/src/components/Galleries/GalleryList.tsx
index d06aaf3a4..b31b597cc 100644
--- a/ui/v2.5/src/components/Galleries/GalleryList.tsx
+++ b/ui/v2.5/src/components/Galleries/GalleryList.tsx
@@ -49,6 +49,8 @@ import {
   IItemListOperation,
 } from "../List/FilteredListToolbar";
 import { FilterTags } from "../List/FilterTags";
+import { SidebarAgeFilter } from "../List/Filters/SidebarAgeFilter";
+import { PerformerAgeCriterionOption } from "src/models/list-filter/galleries";
 
 const GalleryList: React.FC<{
   galleries: GQL.SlimGalleryDataFragment[];
@@ -169,6 +171,14 @@ const SidebarContent: React.FC<{
           option={OrganizedCriterionOption}
           filter={filter}
           setFilter={setFilter}
+          sectionID="organized"
+        />
+        <SidebarAgeFilter
+          title={<FormattedMessage id="performer_age" />}
+          option={PerformerAgeCriterionOption}
+          filter={filter}
+          setFilter={setFilter}
+          sectionID="performer_age"
         />
       </GalleryFilterSidebarSections>
 
@@ -282,7 +292,7 @@ export const FilteredGalleryList = PatchComponent(
       setFilter,
     });
 
-    useAddKeybinds(filter, totalCount);
+    useAddKeybinds(effectiveFilter, totalCount);
     useFilteredSidebarKeybinds({
       showSidebar,
       setShowSidebar,
@@ -313,7 +323,7 @@ export const FilteredGalleryList = PatchComponent(
       result,
     });
 
-    const viewRandom = useViewRandom(filter, totalCount);
+    const viewRandom = useViewRandom(effectiveFilter, totalCount);
 
     function onExport(all: boolean) {
       showModal(
diff --git a/ui/v2.5/src/components/Groups/GroupList.tsx b/ui/v2.5/src/components/Groups/GroupList.tsx
index 6ce00831c..69961f783 100644
--- a/ui/v2.5/src/components/Groups/GroupList.tsx
+++ b/ui/v2.5/src/components/Groups/GroupList.tsx
@@ -265,7 +265,7 @@ export const FilteredGroupList = PatchComponent(
       setFilter,
     });
 
-    useAddKeybinds(filter, totalCount);
+    useAddKeybinds(effectiveFilter, totalCount);
     useFilteredSidebarKeybinds({
       showSidebar,
       setShowSidebar,
@@ -296,7 +296,7 @@ export const FilteredGroupList = PatchComponent(
       result,
     });
 
-    const viewRandom = useViewRandom(filter, totalCount);
+    const viewRandom = useViewRandom(effectiveFilter, totalCount);
 
     function onExport(all: boolean) {
       showModal(
diff --git a/ui/v2.5/src/components/Images/ImageList.tsx b/ui/v2.5/src/components/Images/ImageList.tsx
index eee789bb1..8c11abdee 100644
--- a/ui/v2.5/src/components/Images/ImageList.tsx
+++ b/ui/v2.5/src/components/Images/ImageList.tsx
@@ -1,5 +1,11 @@
-import React, { useCallback, useState, useMemo, MouseEvent } from "react";
-import { FormattedNumber, useIntl } from "react-intl";
+import React, {
+  useCallback,
+  useState,
+  useMemo,
+  MouseEvent,
+  useEffect,
+} from "react";
+import { FormattedMessage, FormattedNumber, useIntl } from "react-intl";
 import cloneDeep from "lodash-es/cloneDeep";
 import { useHistory } from "react-router-dom";
 import Mousetrap from "mousetrap";
@@ -9,11 +15,10 @@ import {
   useFindImages,
   useFindImagesMetadata,
 } from "src/core/StashService";
-import { ItemList, ItemListContext, showWhenSelected } from "../List/ItemList";
+import { useFilteredItemList } from "../List/ItemList";
 import { useLightbox } from "src/hooks/Lightbox/hooks";
 import { ListFilterModel } from "src/models/list-filter/filter";
 import { DisplayMode } from "src/models/list-filter/types";
-
 import { ImageWallItem } from "./ImageWallItem";
 import { EditImagesDialog } from "./EditImagesDialog";
 import { DeleteImagesDialog } from "./DeleteImagesDialog";
@@ -24,11 +29,43 @@ import { objectTitle } from "src/core/files";
 import { useConfigurationContext } from "src/hooks/Config";
 import { ImageCardGrid } from "./ImageCardGrid";
 import { View } from "../List/views";
-import { IItemListOperation } from "../List/FilteredListToolbar";
+import {
+  FilteredListToolbar,
+  IItemListOperation,
+} from "../List/FilteredListToolbar";
 import { FileSize } from "../Shared/FileSize";
-import { PatchComponent } from "src/patch";
+import { PatchComponent, PatchContainerComponent } from "src/patch";
 import { GenerateDialog } from "../Dialogs/GenerateDialog";
-import { useModal } from "src/hooks/modal";
+import {
+  Sidebar,
+  SidebarPane,
+  SidebarPaneContent,
+  SidebarStateContext,
+  useSidebarState,
+} from "../Shared/Sidebar";
+import { useCloseEditDelete, useFilterOperations } from "../List/util";
+import {
+  FilteredSidebarHeader,
+  useFilteredSidebarKeybinds,
+} from "../List/Filters/FilterSidebar";
+import {
+  IListFilterOperation,
+  ListOperations,
+} from "../List/ListOperationButtons";
+import { FilterTags } from "../List/FilterTags";
+import { Pagination, PaginationIndex } from "../List/Pagination";
+import { LoadedContent } from "../List/PagedList";
+import useFocus from "src/utils/focus";
+import cx from "classnames";
+import { SidebarStudiosFilter } from "../List/Filters/StudiosFilter";
+import { SidebarPerformersFilter } from "../List/Filters/PerformersFilter";
+import { SidebarTagsFilter } from "../List/Filters/TagsFilter";
+import { SidebarRatingFilter } from "../List/Filters/RatingFilter";
+import { SidebarBooleanFilter } from "../List/Filters/BooleanFilter";
+import { Button } from "react-bootstrap";
+import { OrganizedCriterionOption } from "src/models/list-filter/criteria/organized";
+import { SidebarAgeFilter } from "../List/Filters/SidebarAgeFilter";
+import { PerformerAgeCriterionOption } from "src/models/list-filter/images";
 
 interface IImageWallProps {
   images: GQL.SlimImageDataFragment[];
@@ -180,131 +217,125 @@ interface IImageListImages {
   chapters?: GQL.GalleryChapterDataFragment[];
 }
 
-const ImageListImages: React.FC<IImageListImages> = ({
-  images,
-  filter,
-  selectedIds,
-  onChangePage,
-  pageCount,
-  onSelectChange,
-  slideshowRunning,
-  setSlideshowRunning,
-  chapters = [],
-}) => {
-  const handleLightBoxPage = useCallback(
-    (props: { direction?: number; page?: number }) => {
-      const { direction, page: newPage } = props;
-
-      if (direction !== undefined) {
-        if (direction < 0) {
-          if (filter.currentPage === 1) {
-            onChangePage(pageCount);
-          } else {
-            onChangePage(filter.currentPage + direction);
-          }
-        } else if (direction > 0) {
-          if (filter.currentPage === pageCount) {
-            // return to the first page
-            onChangePage(1);
-          } else {
-            onChangePage(filter.currentPage + direction);
-          }
-        }
-      } else if (newPage !== undefined) {
-        onChangePage(newPage);
-      }
-    },
-    [onChangePage, filter.currentPage, pageCount]
-  );
-
-  const handleClose = useCallback(() => {
-    setSlideshowRunning(false);
-  }, [setSlideshowRunning]);
-
-  const lightboxState = useMemo(() => {
-    return {
-      images,
-      showNavigation: false,
-      pageCallback: pageCount > 1 ? handleLightBoxPage : undefined,
-      page: filter.currentPage,
-      pages: pageCount,
-      pageSize: filter.itemsPerPage,
-      slideshowEnabled: slideshowRunning,
-      onClose: handleClose,
-    };
-  }, [
+const ImageList: React.FC<IImageListImages> = PatchComponent(
+  "ImageList",
+  ({
     images,
+    filter,
+    selectedIds,
+    onChangePage,
     pageCount,
-    filter.currentPage,
-    filter.itemsPerPage,
+    onSelectChange,
     slideshowRunning,
-    handleClose,
-    handleLightBoxPage,
-  ]);
+    setSlideshowRunning,
+    chapters = [],
+  }) => {
+    const handleLightBoxPage = useCallback(
+      (props: { direction?: number; page?: number }) => {
+        const { direction, page: newPage } = props;
 
-  const showLightbox = useLightbox(
-    lightboxState,
-    filter.sortBy === "path" &&
-      filter.sortDirection === GQL.SortDirectionEnum.Asc
-      ? chapters
-      : []
-  );
-
-  const handleImageOpen = useCallback(
-    (index) => {
-      setSlideshowRunning(true);
-      showLightbox({ initialIndex: index, slideshowEnabled: true });
-    },
-    [showLightbox, setSlideshowRunning]
-  );
-
-  function onPreview(index: number, ev: MouseEvent) {
-    handleImageOpen(index);
-    ev.preventDefault();
-  }
-
-  if (filter.displayMode === DisplayMode.Grid) {
-    return (
-      <ImageCardGrid
-        images={images}
-        selectedIds={selectedIds}
-        zoomIndex={filter.zoomIndex}
-        onSelectChange={onSelectChange}
-        onPreview={onPreview}
-      />
+        if (direction !== undefined) {
+          if (direction < 0) {
+            if (filter.currentPage === 1) {
+              onChangePage(pageCount);
+            } else {
+              onChangePage(filter.currentPage + direction);
+            }
+          } else if (direction > 0) {
+            if (filter.currentPage === pageCount) {
+              // return to the first page
+              onChangePage(1);
+            } else {
+              onChangePage(filter.currentPage + direction);
+            }
+          }
+        } else if (newPage !== undefined) {
+          onChangePage(newPage);
+        }
+      },
+      [onChangePage, filter.currentPage, pageCount]
     );
-  }
-  if (filter.displayMode === DisplayMode.Wall) {
-    return (
-      <ImageWall
-        images={images}
-        onChangePage={onChangePage}
-        currentPage={filter.currentPage}
-        pageCount={pageCount}
-        handleImageOpen={handleImageOpen}
-        zoomIndex={filter.zoomIndex}
-        selectedIds={selectedIds}
-        onSelectChange={onSelectChange}
-        selecting={!!selectedIds && selectedIds.size > 0}
-      />
+
+    const handleClose = useCallback(() => {
+      setSlideshowRunning(false);
+    }, [setSlideshowRunning]);
+
+    const lightboxState = useMemo(() => {
+      return {
+        images,
+        showNavigation: false,
+        pageCallback: pageCount > 1 ? handleLightBoxPage : undefined,
+        page: filter.currentPage,
+        pages: pageCount,
+        pageSize: filter.itemsPerPage,
+        slideshowEnabled: slideshowRunning,
+        onClose: handleClose,
+      };
+    }, [
+      images,
+      pageCount,
+      filter.currentPage,
+      filter.itemsPerPage,
+      slideshowRunning,
+      handleClose,
+      handleLightBoxPage,
+    ]);
+
+    const showLightbox = useLightbox(
+      lightboxState,
+      filter.sortBy === "path" &&
+        filter.sortDirection === GQL.SortDirectionEnum.Asc
+        ? chapters
+        : []
     );
+
+    const handleImageOpen = useCallback(
+      (index) => {
+        setSlideshowRunning(true);
+        showLightbox({ initialIndex: index, slideshowEnabled: true });
+      },
+      [showLightbox, setSlideshowRunning]
+    );
+
+    function onPreview(index: number, ev: MouseEvent) {
+      handleImageOpen(index);
+      ev.preventDefault();
+    }
+
+    if (filter.displayMode === DisplayMode.Grid) {
+      return (
+        <ImageCardGrid
+          images={images}
+          selectedIds={selectedIds}
+          zoomIndex={filter.zoomIndex}
+          onSelectChange={onSelectChange}
+          onPreview={onPreview}
+        />
+      );
+    }
+    if (filter.displayMode === DisplayMode.Wall) {
+      return (
+        <ImageWall
+          images={images}
+          onChangePage={onChangePage}
+          currentPage={filter.currentPage}
+          pageCount={pageCount}
+          handleImageOpen={handleImageOpen}
+          zoomIndex={filter.zoomIndex}
+          selectedIds={selectedIds}
+          onSelectChange={onSelectChange}
+          selecting={!!selectedIds && selectedIds.size > 0}
+        />
+      );
+    }
+
+    // should not happen
+    return <></>;
   }
-
-  // should not happen
-  return <></>;
-};
-
-function getItems(result: GQL.FindImagesQueryResult) {
-  return result?.data?.findImages?.images ?? [];
-}
-
-function getCount(result: GQL.FindImagesQueryResult) {
-  return result?.data?.findImages?.count ?? 0;
-}
+);
 
 function renderMetadataByline(
-  result: GQL.FindImagesQueryResult,
-  metadataInfo?: GQL.FindImagesMetadataQueryResult
+  metadataInfo: GQL.FindImagesMetadataQueryResult | undefined
 ) {
   const megapixels = metadataInfo?.data?.findImages?.megapixels;
   const size = metadataInfo?.data?.findImages?.filesize;
@@ -339,6 +370,130 @@ function renderMetadataByline(
   );
 }
 
+const ImageFilterSidebarSections = PatchContainerComponent(
+  "FilteredImageList.SidebarSections"
+);
+
+const SidebarContent: React.FC<{
+  filter: ListFilterModel;
+  setFilter: (filter: ListFilterModel) => void;
+  filterHook?: (filter: ListFilterModel) => ListFilterModel;
+  view?: View;
+  sidebarOpen: boolean;
+  onClose?: () => void;
+  showEditFilter: (editingCriterion?: string) => void;
+  count?: number;
+  focus?: ReturnType<typeof useFocus>;
+}> = ({
+  filter,
+  setFilter,
+  filterHook,
+  view,
+  showEditFilter,
+  sidebarOpen,
+  onClose,
+  count,
+  focus,
+}) => {
+  const showResultsId =
+    count !== undefined ? "actions.show_count_results" : "actions.show_results";
+
+  const hideStudios = view === View.StudioScenes;
+
+  return (
+    <>
+      <FilteredSidebarHeader
+        sidebarOpen={sidebarOpen}
+        showEditFilter={showEditFilter}
+        filter={filter}
+        setFilter={setFilter}
+        view={view}
+        focus={focus}
+      />
+
+      <ImageFilterSidebarSections>
+        {!hideStudios && (
+          <SidebarStudiosFilter
+            filter={filter}
+            setFilter={setFilter}
+            filterHook={filterHook}
+          />
+        )}
+        <SidebarPerformersFilter
+          filter={filter}
+          setFilter={setFilter}
+          filterHook={filterHook}
+        />
+        <SidebarTagsFilter
+          filter={filter}
+          setFilter={setFilter}
+          filterHook={filterHook}
+        />
+        <SidebarRatingFilter filter={filter} setFilter={setFilter} />
+        <SidebarBooleanFilter
+          title={<FormattedMessage id="organized" />}
+          data-type={OrganizedCriterionOption.type}
+          option={OrganizedCriterionOption}
+          filter={filter}
+          setFilter={setFilter}
+          sectionID="organized"
+        />
+        <SidebarAgeFilter
+          title={<FormattedMessage id="performer_age" />}
+          option={PerformerAgeCriterionOption}
+          filter={filter}
+          setFilter={setFilter}
+          sectionID="performer_age"
+        />
+      </ImageFilterSidebarSections>
+
+      <div className="sidebar-footer">
+        <Button className="sidebar-close-button" onClick={onClose}>
+          <FormattedMessage id={showResultsId} values={{ count }} />
+        </Button>
+      </div>
+    </>
+  );
+};
+
+function useViewRandom(filter: ListFilterModel, count: number) {
+  const history = useHistory();
+
+  const viewRandom = useCallback(async () => {
+    // query for a random image
+    if (count === 0) {
+      return;
+    }
+
+    const index = Math.floor(Math.random() * count);
+    const filterCopy = cloneDeep(filter);
+    filterCopy.itemsPerPage = 1;
+    filterCopy.currentPage = index + 1;
+    const singleResult = await queryFindImages(filterCopy);
+    if (singleResult.data.findImages.images.length === 1) {
+      const { id } = singleResult.data.findImages.images[0];
+      // navigate to the image player page
+      history.push(`/images/${id}`);
+    }
+  }, [history, filter, count]);
+
+  return viewRandom;
+}
+
+function useAddKeybinds(filter: ListFilterModel, count: number) {
+  const viewRandom = useViewRandom(filter, count);
+
+  useEffect(() => {
+    Mousetrap.bind("p r", () => {
+      viewRandom();
+    });
+
+    return () => {
+      Mousetrap.unbind("p r");
+    };
+  }, [viewRandom]);
+}
+
 interface IImageList {
   filterHook?: (filter: ListFilterModel) => ListFilterModel;
   view?: View;
@@ -347,28 +502,185 @@ interface IImageList {
   chapters?: GQL.GalleryChapterDataFragment[];
 }
 
-export const ImageList: React.FC<IImageList> = PatchComponent(
-  "ImageList",
-  ({ filterHook, view, alterQuery, extraOperations = [], chapters = [] }) => {
+export const FilteredImageList = PatchComponent(
+  "FilteredImageList",
+  (props: IImageList) => {
     const intl = useIntl();
-    const history = useHistory();
-    const [isExportDialogOpen, setIsExportDialogOpen] = useState(false);
-    const [isExportAll, setIsExportAll] = useState(false);
+
     const [slideshowRunning, setSlideshowRunning] = useState<boolean>(false);
 
-    const filterMode = GQL.FilterMode.Images;
+    const searchFocus = useFocus();
 
-    const { modal, showModal, closeModal } = useModal();
+    const withSidebar = props.view !== View.GalleryImages;
 
-    const otherOperations: IItemListOperation<GQL.FindImagesQueryResult>[] = [
-      ...extraOperations,
+    const {
+      filterHook,
+      view,
+      alterQuery,
+      extraOperations: providedOperations = [],
+      chapters,
+    } = props;
+
+    // States
+    const {
+      showSidebar,
+      setShowSidebar,
+      sectionOpen,
+      setSectionOpen,
+      loading: sidebarStateLoading,
+    } = useSidebarState(view);
+
+    const {
+      filterState,
+      queryResult,
+      metadataInfo,
+      modalState,
+      listSelect,
+      showEditFilter,
+    } = useFilteredItemList({
+      filterStateProps: {
+        filterMode: GQL.FilterMode.Images,
+        view,
+        useURL: alterQuery,
+      },
+      queryResultProps: {
+        useResult: useFindImages,
+        useMetadataInfo: useFindImagesMetadata,
+        getCount: (r) => r.data?.findImages.count ?? 0,
+        getItems: (r) => r.data?.findImages.images ?? [],
+        filterHook,
+      },
+    });
+
+    const { filter, setFilter } = filterState;
+
+    const { effectiveFilter, result, cachedResult, items, totalCount } =
+      queryResult;
+
+    const metadataByline = useMemo(() => {
+      if (cachedResult.loading) return null;
+
+      return renderMetadataByline(metadataInfo) ?? null;
+    }, [cachedResult.loading, metadataInfo]);
+
+    const {
+      selectedIds,
+      selectedItems,
+      onSelectChange,
+      onSelectAll,
+      onSelectNone,
+      onInvertSelection,
+      hasSelection,
+    } = listSelect;
+
+    const { modal, showModal, closeModal } = modalState;
+
+    // Utility hooks
+    const { setPage, removeCriterion, clearAllCriteria } = useFilterOperations({
+      filter,
+      setFilter,
+    });
+
+    useAddKeybinds(filter, totalCount);
+    useFilteredSidebarKeybinds({
+      showSidebar,
+      setShowSidebar,
+    });
+
+    useEffect(() => {
+      Mousetrap.bind("e", () => {
+        if (hasSelection) {
+          onEdit?.();
+        }
+      });
+
+      Mousetrap.bind("d d", () => {
+        if (hasSelection) {
+          onDelete?.();
+        }
+      });
+
+      return () => {
+        Mousetrap.unbind("e");
+        Mousetrap.unbind("d d");
+      };
+    });
+
+    const onCloseEditDelete = useCloseEditDelete({
+      closeModal,
+      onSelectNone,
+      result,
+    });
+
+    const viewRandom = useViewRandom(effectiveFilter, totalCount);
+
+    function onExport(all: boolean) {
+      showModal(
+        <ExportDialog
+          exportInput={{
+            groups: {
+              ids: Array.from(selectedIds.values()),
+              all: all,
+            },
+          }}
+          onClose={() => closeModal()}
+        />
+      );
+    }
+
+    function onEdit() {
+      showModal(
+        <EditImagesDialog
+          selected={selectedItems}
+          onClose={onCloseEditDelete}
+        />
+      );
+    }
+
+    function onDelete() {
+      showModal(
+        <DeleteImagesDialog
+          selected={selectedItems}
+          onClose={onCloseEditDelete}
+        />
+      );
+    }
+
+    const convertedExtraOperations: IListFilterOperation[] =
+      providedOperations.map((o) => ({
+        ...o,
+        isDisplayed: o.isDisplayed
+          ? () => o.isDisplayed!(result, filter, selectedIds)
+          : undefined,
+        onClick: () => {
+          o.onClick(result, filter, selectedIds);
+        },
+      }));
+
+    const otherOperations: IListFilterOperation[] = [
+      ...convertedExtraOperations,
+      {
+        text: intl.formatMessage({ id: "actions.select_all" }),
+        onClick: () => onSelectAll(),
+        isDisplayed: () => totalCount > 0,
+      },
+      {
+        text: intl.formatMessage({ id: "actions.select_none" }),
+        onClick: () => onSelectNone(),
+        isDisplayed: () => hasSelection,
+      },
+      {
+        text: intl.formatMessage({ id: "actions.invert_selection" }),
+        onClick: () => onInvertSelection(),
+        isDisplayed: () => totalCount > 0,
+      },
       {
         text: intl.formatMessage({ id: "actions.view_random" }),
         onClick: viewRandom,
       },
       {
         text: `${intl.formatMessage({ id: "actions.generate" })}…`,
-        onClick: (result, filter, selectedIds) => {
+        onClick: () => {
           showModal(
             <GenerateDialog
               type="image"
@@ -376,101 +688,78 @@ export const ImageList: React.FC<IImageList> = PatchComponent(
               onClose={() => closeModal()}
             />
           );
-          return Promise.resolve();
         },
-        isDisplayed: showWhenSelected,
+        isDisplayed: () => hasSelection,
       },
       {
         text: intl.formatMessage({ id: "actions.export" }),
-        onClick: onExport,
-        isDisplayed: showWhenSelected,
+        onClick: () => onExport(false),
+        isDisplayed: () => hasSelection,
       },
       {
         text: intl.formatMessage({ id: "actions.export_all" }),
-        onClick: onExportAll,
+        onClick: () => onExport(true),
       },
     ];
 
-    function addKeybinds(
-      result: GQL.FindImagesQueryResult,
-      filter: ListFilterModel
-    ) {
-      Mousetrap.bind("p r", () => {
-        viewRandom(result, filter);
-      });
+    // render
+    if (sidebarStateLoading) return null;
 
-      return () => {
-        Mousetrap.unbind("p r");
-      };
-    }
+    const operations = (
+      <ListOperations
+        items={items.length}
+        hasSelection={hasSelection}
+        operations={otherOperations}
+        onEdit={onEdit}
+        onDelete={onDelete}
+        operationsMenuClassName="image-list-operations-dropdown"
+      />
+    );
 
-    async function viewRandom(
-      result: GQL.FindImagesQueryResult,
-      filter: ListFilterModel
-    ) {
-      // query for a random image
-      if (result.data?.findImages) {
-        const { count } = result.data.findImages;
+    const pageCount = Math.ceil(totalCount / filter.itemsPerPage);
 
-        const index = Math.floor(Math.random() * count);
-        const filterCopy = cloneDeep(filter);
-        filterCopy.itemsPerPage = 1;
-        filterCopy.currentPage = index + 1;
-        const singleResult = await queryFindImages(filterCopy);
-        if (singleResult.data.findImages.images.length === 1) {
-          const { id } = singleResult.data.findImages.images[0];
-          // navigate to the image player page
-          history.push(`/images/${id}`);
-        }
-      }
-    }
+    const content = (
+      <>
+        <FilteredListToolbar
+          filter={filter}
+          listSelect={listSelect}
+          setFilter={setFilter}
+          showEditFilter={showEditFilter}
+          onDelete={onDelete}
+          onEdit={onEdit}
+          operationComponent={operations}
+          view={view}
+          zoomable
+        />
 
-    async function onExport() {
-      setIsExportAll(false);
-      setIsExportDialogOpen(true);
-    }
+        <FilterTags
+          criteria={filter.criteria}
+          onEditCriterion={(c) => showEditFilter(c.criterionOption.type)}
+          onRemoveCriterion={removeCriterion}
+          onRemoveAll={clearAllCriteria}
+        />
 
-    async function onExportAll() {
-      setIsExportAll(true);
-      setIsExportDialogOpen(true);
-    }
+        <div className="pagination-index-container">
+          <Pagination
+            currentPage={filter.currentPage}
+            itemsPerPage={filter.itemsPerPage}
+            totalItems={totalCount}
+            onChangePage={(page) => setFilter(filter.changePage(page))}
+          />
+          <PaginationIndex
+            loading={cachedResult.loading}
+            itemsPerPage={filter.itemsPerPage}
+            currentPage={filter.currentPage}
+            totalItems={totalCount}
+            metadataByline={metadataByline}
+          />
+        </div>
 
-    function renderContent(
-      result: GQL.FindImagesQueryResult,
-      filter: ListFilterModel,
-      selectedIds: Set<string>,
-      onSelectChange: (
-        id: string,
-        selected: boolean,
-        shiftKey: boolean
-      ) => void,
-      onChangePage: (page: number) => void,
-      pageCount: number
-    ) {
-      function maybeRenderImageExportDialog() {
-        if (isExportDialogOpen) {
-          return (
-            <ExportDialog
-              exportInput={{
-                images: {
-                  ids: Array.from(selectedIds.values()),
-                  all: isExportAll,
-                },
-              }}
-              onClose={() => setIsExportDialogOpen(false)}
-            />
-          );
-        }
-      }
-
-      function renderImages() {
-        if (!result.data?.findImages) return;
-
-        return (
-          <ImageListImages
+        <LoadedContent loading={result.loading} error={result.error}>
+          <ImageList
             filter={filter}
-            images={result.data.findImages.images}
-            onChangePage={onChangePage}
+            images={items}
+            onChangePage={(page) => setFilter(filter.changePage(page))}
             onSelectChange={onSelectChange}
             pageCount={pageCount}
             selectedIds={selectedIds}
@@ -478,54 +767,60 @@ export const ImageList: React.FC<IImageList> = PatchComponent(
             setSlideshowRunning={setSlideshowRunning}
             chapters={chapters}
           />
-        );
-      }
+        </LoadedContent>
 
-      return (
-        <>
-          {maybeRenderImageExportDialog()}
-          {renderImages()}
-        </>
-      );
-    }
+        {totalCount > filter.itemsPerPage && (
+          <div className="pagination-footer-container">
+            <div className="pagination-footer">
+              <Pagination
+                itemsPerPage={filter.itemsPerPage}
+                currentPage={filter.currentPage}
+                totalItems={totalCount}
+                onChangePage={setPage}
+                pagePopupPlacement="top"
+                metadataByline={metadataByline}
+              />
+            </div>
+          </div>
+        )}
+      </>
+    );
 
-    function renderEditDialog(
-      selectedImages: GQL.SlimImageDataFragment[],
-      onClose: (applied: boolean) => void
-    ) {
-      return <EditImagesDialog selected={selectedImages} onClose={onClose} />;
-    }
-
-    function renderDeleteDialog(
-      selectedImages: GQL.SlimImageDataFragment[],
-      onClose: (confirmed: boolean) => void
-    ) {
-      return <DeleteImagesDialog selected={selectedImages} onClose={onClose} />;
+    if (!withSidebar) {
+      return content;
     }
 
     return (
-      <ItemListContext
-        filterMode={filterMode}
-        useResult={useFindImages}
-        useMetadataInfo={useFindImagesMetadata}
-        getItems={getItems}
-        getCount={getCount}
-        alterQuery={alterQuery}
-        filterHook={filterHook}
-        view={view}
-        selectable
+      <div
+        className={cx("item-list-container image-list", {
+          "hide-sidebar": !showSidebar,
+        })}
       >
         {modal}
-        <ItemList
-          view={view}
-          otherOperations={otherOperations}
-          addKeybinds={addKeybinds}
-          renderContent={renderContent}
-          renderEditDialog={renderEditDialog}
-          renderDeleteDialog={renderDeleteDialog}
-          renderMetadataByline={renderMetadataByline}
-        />
-      </ItemListContext>
+
+        <SidebarStateContext.Provider value={{ sectionOpen, setSectionOpen }}>
+          <SidebarPane hideSidebar={!showSidebar}>
+            <Sidebar hide={!showSidebar} onHide={() => setShowSidebar(false)}>
+              <SidebarContent
+                filter={filter}
+                setFilter={setFilter}
+                filterHook={filterHook}
+                showEditFilter={showEditFilter}
+                view={view}
+                sidebarOpen={showSidebar}
+                onClose={() => setShowSidebar(false)}
+                count={cachedResult.loading ? undefined : totalCount}
+                focus={searchFocus}
+              />
+            </Sidebar>
+            <SidebarPaneContent
+              onSidebarToggle={() => setShowSidebar(!showSidebar)}
+            >
+              {content}
+            </SidebarPaneContent>
+          </SidebarPane>
+        </SidebarStateContext.Provider>
+      </div>
     );
   }
 );
diff --git a/ui/v2.5/src/components/Images/Images.tsx b/ui/v2.5/src/components/Images/Images.tsx
index 91edfdf79..932bbc2c1 100644
--- a/ui/v2.5/src/components/Images/Images.tsx
+++ b/ui/v2.5/src/components/Images/Images.tsx
@@ -3,11 +3,11 @@ import { Route, Switch } from "react-router-dom";
 import { Helmet } from "react-helmet";
 import { useTitleProps } from "src/hooks/title";
 import Image from "./ImageDetails/Image";
-import { ImageList } from "./ImageList";
+import { FilteredImageList } from "./ImageList";
 import { View } from "../List/views";
 
 const Images: React.FC = () => {
-  return <ImageList view={View.Images} />;
+  return <FilteredImageList view={View.Images} />;
 };
 
 const ImageRoutes: React.FC = () => {
diff --git a/ui/v2.5/src/components/List/Filters/LabeledIdFilter.tsx b/ui/v2.5/src/components/List/Filters/LabeledIdFilter.tsx
index f19472d64..e006d6b50 100644
--- a/ui/v2.5/src/components/List/Filters/LabeledIdFilter.tsx
+++ b/ui/v2.5/src/components/List/Filters/LabeledIdFilter.tsx
@@ -20,6 +20,7 @@ import {
   FilterMode,
   GalleryFilterType,
   GroupFilterType,
+  ImageFilterType,
   InputMaybe,
   IntCriterionInput,
   PerformerFilterType,
@@ -524,6 +525,8 @@ interface IFilterType {
   performer_count?: InputMaybe<IntCriterionInput>;
   galleries_filter?: InputMaybe<GalleryFilterType>;
   gallery_count?: InputMaybe<IntCriterionInput>;
+  images_filter?: InputMaybe<ImageFilterType>;
+  image_count?: InputMaybe<IntCriterionInput>;
   groups_filter?: InputMaybe<GroupFilterType>;
   group_count?: InputMaybe<IntCriterionInput>;
   studios_filter?: InputMaybe<StudioFilterType>;
@@ -578,6 +581,17 @@ export function setObjectFilter(
       }
       out.galleries_filter = relatedFilterOutput as GalleryFilterType;
       break;
+    case FilterMode.Images:
+      // if empty, only get objects with galleries
+      if (empty) {
+        out.image_count = {
+          modifier: CriterionModifier.GreaterThan,
+          value: 0,
+        };
+        break;
+      }
+      out.images_filter = relatedFilterOutput as ImageFilterType;
+      break;
     case FilterMode.Groups:
       // if empty, only get objects with groups
       if (empty) {
diff --git a/ui/v2.5/src/components/List/ItemList.tsx b/ui/v2.5/src/components/List/ItemList.tsx
index 67d09e721..962e3fc4c 100644
--- a/ui/v2.5/src/components/List/ItemList.tsx
+++ b/ui/v2.5/src/components/List/ItemList.tsx
@@ -46,16 +46,21 @@ import { useConfigurationContext } from "src/hooks/Config";
 import { useZoomKeybinds } from "./ZoomSlider";
 import { DisplayMode } from "src/models/list-filter/types";
 
-interface IFilteredItemList<T extends QueryResult, E extends IHasID = IHasID> {
+interface IFilteredItemList<
+  T extends QueryResult,
+  E extends IHasID = IHasID,
+  M = unknown
+> {
   filterStateProps: IFilterStateHook;
-  queryResultProps: IQueryResultHook<T, E>;
+  queryResultProps: IQueryResultHook<T, E, M>;
 }
 
 // Provides the common state and behaviour for filtered item list components
 export function useFilteredItemList<
   T extends QueryResult,
-  E extends IHasID = IHasID
->(props: IFilteredItemList<T, E>) {
+  E extends IHasID = IHasID,
+  M = unknown
+>(props: IFilteredItemList<T, E, M>) {
   const { configuration: config } = useConfigurationContext();
 
   // States
@@ -70,7 +75,7 @@ export function useFilteredItemList<
     filter,
     ...props.queryResultProps,
   });
-  const { result, items, totalCount, pages } = queryResult;
+  const { result, items, totalCount, pages, metadataInfo } = queryResult;
 
   const listSelect = useListSelect(items);
   const { onSelectAll, onSelectNone, onInvertSelection } = listSelect;
@@ -107,6 +112,7 @@ export function useFilteredItemList<
   return {
     filterState,
     queryResult,
+    metadataInfo,
     listSelect,
     modalState,
     showEditFilter,
diff --git a/ui/v2.5/src/components/List/util.ts b/ui/v2.5/src/components/List/util.ts
index d870c631f..89c32222f 100644
--- a/ui/v2.5/src/components/List/util.ts
+++ b/ui/v2.5/src/components/List/util.ts
@@ -509,23 +509,27 @@ export function useCachedQueryResult<T extends QueryResult>(
 
 export interface IQueryResultHook<
   T extends QueryResult,
-  E extends IHasID = IHasID
+  E extends IHasID = IHasID,
+  M = unknown
 > {
   filterHook?: (filter: ListFilterModel) => ListFilterModel;
   useResult: (filter: ListFilterModel) => T;
+  useMetadataInfo?: (filter: ListFilterModel) => M;
   getCount: (data: T) => number;
   getItems: (data: T) => E[];
 }
 
 export function useQueryResult<
   T extends QueryResult,
-  E extends IHasID = IHasID
+  E extends IHasID = IHasID,
+  M = unknown
 >(
-  props: IQueryResultHook<T, E> & {
+  props: IQueryResultHook<T, E, M> & {
     filter: ListFilterModel;
   }
 ) {
-  const { filter, filterHook, useResult, getItems, getCount } = props;
+  const { filter, filterHook, useResult, useMetadataInfo, getItems, getCount } =
+    props;
 
   const effectiveFilter = useMemo(() => {
     if (filterHook) {
@@ -534,7 +538,14 @@ export function useQueryResult<
     return filter;
   }, [filter, filterHook]);
 
+  // metadata filter is the effective filter with the sort, page size and page number removed
+  const metadataFilter = useMemo(
+    () => effectiveFilter.metadataInfo(),
+    [effectiveFilter]
+  );
+
   const result = useResult(effectiveFilter);
+  const metadataInfo = useMetadataInfo?.(metadataFilter);
 
   // use cached query result for pagination and metadata rendering
   const cachedResult = useCachedQueryResult(effectiveFilter, result);
@@ -549,6 +560,7 @@ export function useQueryResult<
 
   return {
     effectiveFilter,
+    metadataInfo,
     result,
     cachedResult,
     items,
diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerImagesPanel.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerImagesPanel.tsx
index 7b088e5be..bd1484a17 100644
--- a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerImagesPanel.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerImagesPanel.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import * as GQL from "src/core/generated-graphql";
-import { ImageList } from "src/components/Images/ImageList";
+import { FilteredImageList } from "src/components/Images/ImageList";
 import { usePerformerFilterHook } from "src/core/performers";
 import { View } from "src/components/List/views";
 import { PatchComponent } from "src/patch";
@@ -14,7 +14,7 @@ export const PerformerImagesPanel: React.FC<IPerformerImagesPanel> =
   PatchComponent("PerformerImagesPanel", ({ active, performer }) => {
     const filterHook = usePerformerFilterHook(performer);
     return (
-      <ImageList
+      <FilteredImageList
         filterHook={filterHook}
         alterQuery={active}
         view={View.PerformerImages}
diff --git a/ui/v2.5/src/components/Performers/PerformerList.tsx b/ui/v2.5/src/components/Performers/PerformerList.tsx
index 8c56e451b..8d002a1e6 100644
--- a/ui/v2.5/src/components/Performers/PerformerList.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerList.tsx
@@ -423,7 +423,7 @@ export const FilteredPerformerList = PatchComponent(
       setFilter,
     });
 
-    useAddKeybinds(filter, totalCount);
+    useAddKeybinds(effectiveFilter, totalCount);
     useFilteredSidebarKeybinds({
       showSidebar,
       setShowSidebar,
@@ -454,7 +454,7 @@ export const FilteredPerformerList = PatchComponent(
       result,
     });
 
-    const viewRandom = useViewRandom(filter, totalCount);
+    const viewRandom = useViewRandom(effectiveFilter, totalCount);
 
     function onExport(all: boolean) {
       showModal(
diff --git a/ui/v2.5/src/components/Scenes/SceneList.tsx b/ui/v2.5/src/components/Scenes/SceneList.tsx
index a0458c5ac..6570e39db 100644
--- a/ui/v2.5/src/components/Scenes/SceneList.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneList.tsx
@@ -412,7 +412,7 @@ export const FilteredSceneList = PatchComponent(
       setFilter,
     });
 
-    useAddKeybinds(filter, totalCount);
+    useAddKeybinds(effectiveFilter, totalCount);
     useFilteredSidebarKeybinds({
       showSidebar,
       setShowSidebar,
diff --git a/ui/v2.5/src/components/Scenes/SceneMarkerList.tsx b/ui/v2.5/src/components/Scenes/SceneMarkerList.tsx
index 781a3f0b2..6287b25ae 100644
--- a/ui/v2.5/src/components/Scenes/SceneMarkerList.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneMarkerList.tsx
@@ -54,7 +54,7 @@ const SceneMarkerList: React.FC<{
   selectedIds: Set<string>;
   onSelectChange: (id: string, selected: boolean, shiftKey: boolean) => void;
 }> = PatchComponent(
-  "SceneList",
+  "SceneMarkerList",
   ({ markers, filter, selectedIds, onSelectChange }) => {
     if (markers.length === 0) {
       return null;
diff --git a/ui/v2.5/src/components/Studios/StudioDetails/StudioImagesPanel.tsx b/ui/v2.5/src/components/Studios/StudioDetails/StudioImagesPanel.tsx
index a81c91462..f81599ceb 100644
--- a/ui/v2.5/src/components/Studios/StudioDetails/StudioImagesPanel.tsx
+++ b/ui/v2.5/src/components/Studios/StudioDetails/StudioImagesPanel.tsx
@@ -1,7 +1,7 @@
 import React from "react";
 import * as GQL from "src/core/generated-graphql";
 import { useStudioFilterHook } from "src/core/studios";
-import { ImageList } from "src/components/Images/ImageList";
+import { FilteredImageList } from "src/components/Images/ImageList";
 import { View } from "src/components/List/views";
 
 interface IStudioImagesPanel {
@@ -17,7 +17,7 @@ export const StudioImagesPanel: React.FC<IStudioImagesPanel> = ({
 }) => {
   const filterHook = useStudioFilterHook(studio, showChildStudioContent);
   return (
-    <ImageList
+    <FilteredImageList
       filterHook={filterHook}
       alterQuery={active}
       view={View.StudioImages}
diff --git a/ui/v2.5/src/components/Studios/StudioList.tsx b/ui/v2.5/src/components/Studios/StudioList.tsx
index cff6abd45..6067fb7fd 100644
--- a/ui/v2.5/src/components/Studios/StudioList.tsx
+++ b/ui/v2.5/src/components/Studios/StudioList.tsx
@@ -251,7 +251,7 @@ export const FilteredStudioList = PatchComponent(
       setFilter,
     });
 
-    useAddKeybinds(filter, totalCount);
+    useAddKeybinds(effectiveFilter, totalCount);
     useFilteredSidebarKeybinds({
       showSidebar,
       setShowSidebar,
@@ -282,7 +282,7 @@ export const FilteredStudioList = PatchComponent(
       result,
     });
 
-    const viewRandom = useViewRandom(filter, totalCount);
+    const viewRandom = useViewRandom(effectiveFilter, totalCount);
 
     function onExport(all: boolean) {
       showModal(
diff --git a/ui/v2.5/src/components/Tags/TagDetails/TagImagesPanel.tsx b/ui/v2.5/src/components/Tags/TagDetails/TagImagesPanel.tsx
index 19ceb5431..406f924e4 100644
--- a/ui/v2.5/src/components/Tags/TagDetails/TagImagesPanel.tsx
+++ b/ui/v2.5/src/components/Tags/TagDetails/TagImagesPanel.tsx
@@ -1,7 +1,7 @@
 import React from "react";
 import * as GQL from "src/core/generated-graphql";
 import { useTagFilterHook } from "src/core/tags";
-import { ImageList } from "src/components/Images/ImageList";
+import { FilteredImageList } from "src/components/Images/ImageList";
 import { View } from "src/components/List/views";
 
 interface ITagImagesPanel {
@@ -17,7 +17,7 @@ export const TagImagesPanel: React.FC<ITagImagesPanel> = ({
 }) => {
   const filterHook = useTagFilterHook(tag, showSubTagContent);
   return (
-    <ImageList
+    <FilteredImageList
       filterHook={filterHook}
       alterQuery={active}
       view={View.TagImages}
diff --git a/ui/v2.5/src/docs/en/Manual/UIPluginApi.md b/ui/v2.5/src/docs/en/Manual/UIPluginApi.md
index 54ef3a20f..4ff8b5143 100644
--- a/ui/v2.5/src/docs/en/Manual/UIPluginApi.md
+++ b/ui/v2.5/src/docs/en/Manual/UIPluginApi.md
@@ -230,7 +230,12 @@ Returns `void`.
 - `ExternalLinkButtons`
 - `ExternalLinksButton`
 - `FilteredGalleryList`
+- `FilteredGroupList`
+- `FilteredImageList`
+- `FilteredPerformerList`
 - `FilteredSceneList`
+- `FilteredSceneMarkerList`
+- `FilteredStudioList`
 - `FolderSelect`
 - `FrontPage`
 - `GalleryCard`
@@ -248,6 +253,7 @@ Returns `void`.
 - `GroupCard`
 - `GroupCardGrid`
 - `GroupIDSelect`
+- `GroupList`
 - `GroupRecommendationRow`
 - `GroupSelect`
 - `GroupSelect.sort`
@@ -262,6 +268,7 @@ Returns `void`.
 - `ImageDetailPanel`
 - `ImageGridCard`
 - `ImageInput`
+- `ImageList`
 - `ImageRecommendationRow`
 - `LightboxLink`
 - `LoadingIndicator`
@@ -286,6 +293,7 @@ Returns `void`.
 - `PerformerHeaderImage`
 - `PerformerIDSelect`
 - `PerformerImagesPanel`
+- `PerformerList`
 - `PerformerPage`
 - `PerformerRecommendationRow`
 - `PerformerScenesPanel`
@@ -310,6 +318,7 @@ Returns `void`.
 - `SceneMarkerCard.Image`
 - `SceneMarkerCard.Popovers`
 - `SceneMarkerCardsGrid`
+- `SceneMarkerList`
 - `SceneMarkerRecommendationRow`
 - `SceneList`
 - `ScenePage`
@@ -329,6 +338,7 @@ Returns `void`.
 - `StudioCardGrid`
 - `StudioDetailsPanel`
 - `StudioIDSelect`
+- `StudioList`
 - `StudioRecommendationRow`
 - `StudioSelect`
 - `StudioSelect.sort`
diff --git a/ui/v2.5/src/models/list-filter/galleries.ts b/ui/v2.5/src/models/list-filter/galleries.ts
index adac37e3c..e8549701f 100644
--- a/ui/v2.5/src/models/list-filter/galleries.ts
+++ b/ui/v2.5/src/models/list-filter/galleries.ts
@@ -44,6 +44,9 @@ const displayModeOptions = [
   DisplayMode.Wall,
 ];
 
+export const PerformerAgeCriterionOption =
+  createMandatoryNumberCriterionOption("performer_age");
+
 const criterionOptions = [
   createStringCriterionOption("title"),
   createStringCriterionOption("code", "scene_code"),
@@ -61,7 +64,7 @@ const criterionOptions = [
   PerformerTagsCriterionOption,
   PerformersCriterionOption,
   createMandatoryNumberCriterionOption("performer_count"),
-  createMandatoryNumberCriterionOption("performer_age"),
+  PerformerAgeCriterionOption,
   PerformerFavoriteCriterionOption,
   createMandatoryNumberCriterionOption("image_count"),
   // StudioTagsCriterionOption,
diff --git a/ui/v2.5/src/models/list-filter/images.ts b/ui/v2.5/src/models/list-filter/images.ts
index eabcbfd26..aa6ad81ca 100644
--- a/ui/v2.5/src/models/list-filter/images.ts
+++ b/ui/v2.5/src/models/list-filter/images.ts
@@ -16,7 +16,6 @@ import { OrientationCriterionOption } from "./criteria/orientation";
 import { StudiosCriterionOption } from "./criteria/studios";
 import {
   PerformerTagsCriterionOption,
-  // StudioTagsCriterionOption,
   TagsCriterionOption,
 } from "./criteria/tags";
 import { ListFilterOptions, MediaSortByOptions } from "./filter-options";
@@ -43,6 +42,10 @@ const sortByOptions = [
     },
   ]);
 const displayModeOptions = [DisplayMode.Grid, DisplayMode.Wall];
+
+export const PerformerAgeCriterionOption =
+  createMandatoryNumberCriterionOption("performer_age");
+
 const criterionOptions = [
   createStringCriterionOption("title"),
   createStringCriterionOption("code", "scene_code"),
@@ -65,7 +68,7 @@ const criterionOptions = [
   PerformerTagsCriterionOption,
   PerformersCriterionOption,
   createMandatoryNumberCriterionOption("performer_count"),
-  createMandatoryNumberCriterionOption("performer_age"),
+  PerformerAgeCriterionOption,
   PerformerFavoriteCriterionOption,
   // StudioTagsCriterionOption,
   StudiosCriterionOption,
diff --git a/ui/v2.5/src/pluginApi.d.ts b/ui/v2.5/src/pluginApi.d.ts
index dd881c0b4..77627be10 100644
--- a/ui/v2.5/src/pluginApi.d.ts
+++ b/ui/v2.5/src/pluginApi.d.ts
@@ -667,7 +667,12 @@ declare namespace PluginApi {
     ExternalLinkButtons: React.FC<any>;
     ExternalLinksButton: React.FC<any>;
     FilteredGalleryList: React.FC<any>;
+    FilteredGroupList: React.FC<any>;
+    FilteredImageList: React.FC<any>;
+    FilteredPerformerList: React.FC<any>;
     FilteredSceneList: React.FC<any>;
+    FilteredSceneMarkerList: React.FC<any>;
+    FilteredStudioList: React.FC<any>;
     FolderSelect: React.FC<any>;
     FrontPage: React.FC<any>;
     GalleryCard: React.FC<any>;

From b77abd64e2e98c9410de3a9666da62430123f5a0 Mon Sep 17 00:00:00 2001
From: Gykes <24581046+Gykes@users.noreply.github.com>
Date: Wed, 25 Feb 2026 21:36:54 -0800
Subject: [PATCH 319/405] FR: Add Missing is-missing Filter Options Across all
 Object Types (#6565)

Co-authored-by: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
---
 pkg/sqlite/gallery_filter.go                  |  9 +++
 pkg/sqlite/group_filter.go                    | 18 ++++++
 pkg/sqlite/image_filter.go                    |  9 +++
 pkg/sqlite/performer_filter.go                | 12 ++++
 pkg/sqlite/scene_filter.go                    |  6 ++
 pkg/sqlite/sql.go                             | 10 ++++
 pkg/sqlite/studio_filter.go                   | 12 ++++
 pkg/sqlite/tag_filter.go                      | 12 ++++
 .../models/list-filter/criteria/is-missing.ts | 60 +++++++++++++++++--
 9 files changed, 142 insertions(+), 6 deletions(-)

diff --git a/pkg/sqlite/gallery_filter.go b/pkg/sqlite/gallery_filter.go
index f920e442a..069bb1015 100644
--- a/pkg/sqlite/gallery_filter.go
+++ b/pkg/sqlite/gallery_filter.go
@@ -308,7 +308,16 @@ func (qb *galleryFilterHandler) missingCriterionHandler(isMissing *string) crite
 			case "tags":
 				galleryRepository.tags.join(f, "tags_join", "galleries.id")
 				f.addWhere("tags_join.gallery_id IS NULL")
+			case "cover":
+				f.addLeftJoin("galleries_images", "cover_join", "cover_join.gallery_id = galleries.id AND cover_join.cover = 1")
+				f.addWhere("cover_join.image_id IS NULL")
 			default:
+				if err := validateIsMissing(*isMissing, []string{
+					"title", "code", "rating", "details", "photographer",
+				}); err != nil {
+					f.setError(err)
+					return
+				}
 				f.addWhere("(galleries." + *isMissing + " IS NULL OR TRIM(galleries." + *isMissing + ") = '')")
 			}
 		}
diff --git a/pkg/sqlite/group_filter.go b/pkg/sqlite/group_filter.go
index 4f3f7b41a..14f3841f4 100644
--- a/pkg/sqlite/group_filter.go
+++ b/pkg/sqlite/group_filter.go
@@ -119,7 +119,25 @@ func (qb *groupFilterHandler) missingCriterionHandler(isMissing *string) criteri
 			case "scenes":
 				f.addLeftJoin("groups_scenes", "", "groups_scenes.group_id = groups.id")
 				f.addWhere("groups_scenes.scene_id IS NULL")
+			case "url":
+				groupsURLsTableMgr.join(f, "", "groups.id")
+				f.addWhere("group_urls.url IS NULL")
+			case "studio":
+				f.addWhere("groups.studio_id IS NULL")
+			case "performers":
+				f.addLeftJoin("groups_scenes", "gs_perf", "groups.id = gs_perf.group_id")
+				f.addLeftJoin("performers_scenes", "ps_perf", "gs_perf.scene_id = ps_perf.scene_id")
+				f.addWhere("ps_perf.performer_id IS NULL")
+			case "tags":
+				groupRepository.tags.join(f, "tags_join", "groups.id")
+				f.addWhere("tags_join.group_id IS NULL")
 			default:
+				if err := validateIsMissing(*isMissing, []string{
+					"aliases", "description", "director", "date", "rating",
+				}); err != nil {
+					f.setError(err)
+					return
+				}
 				f.addWhere("(groups." + *isMissing + " IS NULL OR TRIM(groups." + *isMissing + ") = '')")
 			}
 		}
diff --git a/pkg/sqlite/image_filter.go b/pkg/sqlite/image_filter.go
index aafd2aa40..4d1d2c4b3 100644
--- a/pkg/sqlite/image_filter.go
+++ b/pkg/sqlite/image_filter.go
@@ -171,6 +171,9 @@ func (qb *imageFilterHandler) missingCriterionHandler(isMissing *string) criteri
 	return func(ctx context.Context, f *filterBuilder) {
 		if isMissing != nil && *isMissing != "" {
 			switch *isMissing {
+			case "url":
+				imagesURLsTableMgr.join(f, "", "images.id")
+				f.addWhere("image_urls.url IS NULL")
 			case "studio":
 				f.addWhere("images.studio_id IS NULL")
 			case "performers":
@@ -183,6 +186,12 @@ func (qb *imageFilterHandler) missingCriterionHandler(isMissing *string) criteri
 				imageRepository.tags.join(f, "tags_join", "images.id")
 				f.addWhere("tags_join.image_id IS NULL")
 			default:
+				if err := validateIsMissing(*isMissing, []string{
+					"title", "details", "photographer", "date", "code", "rating",
+				}); err != nil {
+					f.setError(err)
+					return
+				}
 				f.addWhere("(images." + *isMissing + " IS NULL OR TRIM(images." + *isMissing + ") = '')")
 			}
 		}
diff --git a/pkg/sqlite/performer_filter.go b/pkg/sqlite/performer_filter.go
index e99f3068f..fdcc283ab 100644
--- a/pkg/sqlite/performer_filter.go
+++ b/pkg/sqlite/performer_filter.go
@@ -316,7 +316,19 @@ func (qb *performerFilterHandler) performerIsMissingCriterionHandler(isMissing *
 			case "aliases":
 				performersAliasesTableMgr.join(f, "", "performers.id")
 				f.addWhere("performer_aliases.alias IS NULL")
+			case "tags":
+				f.addLeftJoin(performersTagsTable, "tags_join", "tags_join.performer_id = performers.id")
+				f.addWhere("tags_join.performer_id IS NULL")
 			default:
+				if err := validateIsMissing(*isMissing, []string{
+					"disambiguation", "gender", "birthdate", "death_date",
+					"ethnicity", "country", "hair_color", "eye_color", "height", "weight",
+					"measurements", "fake_tits", "penis_length", "circumcised",
+					"career_start", "career_end", "tattoos", "piercings", "details", "rating",
+				}); err != nil {
+					f.setError(err)
+					return
+				}
 				f.addWhere("(performers." + *isMissing + " IS NULL OR TRIM(performers." + *isMissing + ") = '')")
 			}
 		}
diff --git a/pkg/sqlite/scene_filter.go b/pkg/sqlite/scene_filter.go
index a9eb6b0ae..712c3d83d 100644
--- a/pkg/sqlite/scene_filter.go
+++ b/pkg/sqlite/scene_filter.go
@@ -426,6 +426,12 @@ func (qb *sceneFilterHandler) isMissingCriterionHandler(isMissing *string) crite
 			case "cover":
 				f.addWhere("scenes.cover_blob IS NULL")
 			default:
+				if err := validateIsMissing(*isMissing, []string{
+					"title", "code", "details", "director", "rating",
+				}); err != nil {
+					f.setError(err)
+					return
+				}
 				f.addWhere("(scenes." + *isMissing + " IS NULL OR TRIM(scenes." + *isMissing + ") = '')")
 			}
 		}
diff --git a/pkg/sqlite/sql.go b/pkg/sqlite/sql.go
index 0b55af8db..70d86ab5e 100644
--- a/pkg/sqlite/sql.go
+++ b/pkg/sqlite/sql.go
@@ -71,6 +71,16 @@ func (o sortOptions) validateSort(sort string) error {
 	return fmt.Errorf("invalid sort: %s", sort)
 }
 
+func validateIsMissing(isMissing string, allowed []string) error {
+	for _, v := range allowed {
+		if v == isMissing {
+			return nil
+		}
+	}
+
+	return fmt.Errorf("invalid is_missing field: %s", isMissing)
+}
+
 func getSortDirection(direction string) string {
 	if direction != "ASC" && direction != "DESC" {
 		return "ASC"
diff --git a/pkg/sqlite/studio_filter.go b/pkg/sqlite/studio_filter.go
index cfe3c59b6..6d5a8fe7c 100644
--- a/pkg/sqlite/studio_filter.go
+++ b/pkg/sqlite/studio_filter.go
@@ -150,7 +150,19 @@ func (qb *studioFilterHandler) isMissingCriterionHandler(isMissing *string) crit
 			case "stash_id":
 				studioRepository.stashIDs.join(f, "studio_stash_ids", "studios.id")
 				f.addWhere("studio_stash_ids.studio_id IS NULL")
+			case "aliases":
+				studiosAliasesTableMgr.join(f, "", "studios.id")
+				f.addWhere("studio_aliases.alias IS NULL")
+			case "tags":
+				f.addLeftJoin(studiosTagsTable, "tags_join", "tags_join.studio_id = studios.id")
+				f.addWhere("tags_join.studio_id IS NULL")
 			default:
+				if err := validateIsMissing(*isMissing, []string{
+					"details", "rating",
+				}); err != nil {
+					f.setError(err)
+					return
+				}
 				f.addWhere("(studios." + *isMissing + " IS NULL OR TRIM(studios." + *isMissing + ") = '')")
 			}
 		}
diff --git a/pkg/sqlite/tag_filter.go b/pkg/sqlite/tag_filter.go
index 4e2313080..5fd41e80a 100644
--- a/pkg/sqlite/tag_filter.go
+++ b/pkg/sqlite/tag_filter.go
@@ -198,7 +198,19 @@ func (qb *tagFilterHandler) isMissingCriterionHandler(isMissing *string) criteri
 			switch *isMissing {
 			case "image":
 				f.addWhere("tags.image_blob IS NULL")
+			case "aliases":
+				tagRepository.aliases.join(f, "", "tags.id")
+				f.addWhere("tag_aliases.alias IS NULL")
+			case "stash_id":
+				tagRepository.stashIDs.join(f, "tag_stash_ids", "tags.id")
+				f.addWhere("tag_stash_ids.tag_id IS NULL")
 			default:
+				if err := validateIsMissing(*isMissing, []string{
+					"description",
+				}); err != nil {
+					f.setError(err)
+					return
+				}
 				f.addWhere("(tags." + *isMissing + " IS NULL OR TRIM(tags." + *isMissing + ") = '')")
 			}
 		}
diff --git a/ui/v2.5/src/models/list-filter/criteria/is-missing.ts b/ui/v2.5/src/models/list-filter/criteria/is-missing.ts
index 512616f3c..821870e47 100644
--- a/ui/v2.5/src/models/list-filter/criteria/is-missing.ts
+++ b/ui/v2.5/src/models/list-filter/criteria/is-missing.ts
@@ -26,10 +26,13 @@ export const SceneIsMissingCriterionOption = new IsMissingCriterionOption(
   "is_missing",
   [
     "title",
-    "cover",
+    "code",
     "details",
+    "director",
     "url",
     "date",
+    "rating",
+    "cover",
     "galleries",
     "studio",
     "group",
@@ -42,7 +45,19 @@ export const SceneIsMissingCriterionOption = new IsMissingCriterionOption(
 export const ImageIsMissingCriterionOption = new IsMissingCriterionOption(
   "isMissing",
   "is_missing",
-  ["title", "galleries", "studio", "performers", "tags"]
+  [
+    "title",
+    "details",
+    "photographer",
+    "url",
+    "date",
+    "code",
+    "rating",
+    "galleries",
+    "studio",
+    "performers",
+    "tags",
+  ]
 );
 
 export const PerformerIsMissingCriterionOption = new IsMissingCriterionOption(
@@ -58,14 +73,21 @@ export const PerformerIsMissingCriterionOption = new IsMissingCriterionOption(
     "weight",
     "measurements",
     "fake_tits",
+    "penis_length",
+    "circumcised",
     "career_start",
     "career_end",
     "tattoos",
     "piercings",
     "aliases",
     "gender",
+    "birthdate",
+    "death_date",
+    "disambiguation",
+    "tags",
     "image",
     "details",
+    "rating",
     "stash_id",
   ]
 );
@@ -73,23 +95,49 @@ export const PerformerIsMissingCriterionOption = new IsMissingCriterionOption(
 export const GalleryIsMissingCriterionOption = new IsMissingCriterionOption(
   "isMissing",
   "is_missing",
-  ["title", "details", "url", "date", "studio", "performers", "tags", "scenes"]
+  [
+    "title",
+    "code",
+    "details",
+    "photographer",
+    "url",
+    "date",
+    "rating",
+    "cover",
+    "studio",
+    "performers",
+    "tags",
+    "scenes",
+  ]
 );
 
 export const TagIsMissingCriterionOption = new IsMissingCriterionOption(
   "isMissing",
   "is_missing",
-  ["image"]
+  ["image", "aliases", "description", "stash_id"]
 );
 
 export const StudioIsMissingCriterionOption = new IsMissingCriterionOption(
   "isMissing",
   "is_missing",
-  ["image", "stash_id", "details"]
+  ["image", "stash_id", "details", "url", "aliases", "tags", "rating"]
 );
 
 export const GroupIsMissingCriterionOption = new IsMissingCriterionOption(
   "isMissing",
   "is_missing",
-  ["front_image", "back_image", "scenes"]
+  [
+    "aliases",
+    "description",
+    "director",
+    "date",
+    "url",
+    "rating",
+    "studio",
+    "performers",
+    "tags",
+    "front_image",
+    "back_image",
+    "scenes",
+  ]
 );

From e52ac14d56945c1aba0626b81cbf641dbf8b5791 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Fri, 27 Feb 2026 07:42:53 +1100
Subject: [PATCH 320/405] Fix missing folder corruption during scanning (#6608)

* Add root paths parameter to GetOrCreateFolderHierarchy

Ensures that folders are only created up to the root library paths.

* Create full folder hierarchy when scanning a new folder

During a recursive scan, folders should be created as they are encountered (folders are handled in a single thread). This change applies only during a selective scan. Creates up to the root library folder.

* Create folder hierarchy on new file scan

This should only apply when scanning a specific file, as parent folders should be been created during a recursive scan.

* Fix existing folders with missing parents during scan
---
 internal/api/resolver_mutation_file.go  | 11 +++--
 internal/manager/config/stash_config.go |  8 +++
 internal/manager/manager_tasks.go       |  3 +-
 pkg/file/folder.go                      | 61 ++++++++++++++++-------
 pkg/file/move.go                        | 14 +++++-
 pkg/file/scan.go                        | 66 ++++++++++++++++++++-----
 6 files changed, 125 insertions(+), 38 deletions(-)

diff --git a/internal/api/resolver_mutation_file.go b/internal/api/resolver_mutation_file.go
index f6279ad16..b9e36aa76 100644
--- a/internal/api/resolver_mutation_file.go
+++ b/internal/api/resolver_mutation_file.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/stashapp/stash/internal/desktop"
 	"github.com/stashapp/stash/internal/manager"
+	"github.com/stashapp/stash/internal/manager/config"
 	"github.com/stashapp/stash/pkg/file"
 	"github.com/stashapp/stash/pkg/fsutil"
 	"github.com/stashapp/stash/pkg/logger"
@@ -19,7 +20,7 @@ func (r *mutationResolver) MoveFiles(ctx context.Context, input MoveFilesInput)
 	if err := r.withTxn(ctx, func(ctx context.Context) error {
 		fileStore := r.repository.File
 		folderStore := r.repository.Folder
-		mover := file.NewMover(fileStore, folderStore)
+		mover := file.NewMover(fileStore, folderStore, manager.GetInstance().Config.GetStashPaths().Paths())
 		mover.RegisterHooks(ctx)
 
 		var (
@@ -57,13 +58,14 @@ func (r *mutationResolver) MoveFiles(ctx context.Context, input MoveFilesInput)
 			folderPath := *input.DestinationFolder
 
 			// ensure folder path is within the library
-			if err := r.validateFolderPath(folderPath); err != nil {
+			stashPaths := manager.GetInstance().Config.GetStashPaths()
+			if err := r.validateFolderPath(stashPaths, folderPath); err != nil {
 				return err
 			}
 
 			// get or create folder hierarchy
 			var err error
-			folder, err = file.GetOrCreateFolderHierarchy(ctx, folderStore, folderPath)
+			folder, err = file.GetOrCreateFolderHierarchy(ctx, folderStore, folderPath, stashPaths.Paths())
 			if err != nil {
 				return fmt.Errorf("getting or creating folder hierarchy: %w", err)
 			}
@@ -112,8 +114,7 @@ func (r *mutationResolver) MoveFiles(ctx context.Context, input MoveFilesInput)
 	return true, nil
 }
 
-func (r *mutationResolver) validateFolderPath(folderPath string) error {
-	paths := manager.GetInstance().Config.GetStashPaths()
+func (r *mutationResolver) validateFolderPath(paths config.StashConfigs, folderPath string) error {
 	if l := paths.GetStashFromDirPath(folderPath); l == nil {
 		return fmt.Errorf("folder path %s must be within a stash library path", folderPath)
 	}
diff --git a/internal/manager/config/stash_config.go b/internal/manager/config/stash_config.go
index 4a2cc7d60..3854c707b 100644
--- a/internal/manager/config/stash_config.go
+++ b/internal/manager/config/stash_config.go
@@ -38,3 +38,11 @@ func (s StashConfigs) GetStashFromDirPath(dirPath string) *StashConfig {
 	}
 	return nil
 }
+
+func (s StashConfigs) Paths() []string {
+	paths := make([]string, len(s))
+	for i, c := range s {
+		paths[i] = c.Path
+	}
+	return paths
+}
diff --git a/internal/manager/manager_tasks.go b/internal/manager/manager_tasks.go
index e97227fcf..e84fda9b9 100644
--- a/internal/manager/manager_tasks.go
+++ b/internal/manager/manager_tasks.go
@@ -123,7 +123,8 @@ func (s *Manager) Scan(ctx context.Context, input ScanMetadataInput) (int, error
 		ZipFileExtensions:     cfg.GetGalleryExtensions(),
 		// ScanFilters is set in ScanJob.Execute
 		// HandlerRequiredFilters is set in ScanJob.Execute
-		Rescan: input.Rescan,
+		RootPaths: cfg.GetStashPaths().Paths(),
+		Rescan:    input.Rescan,
 	}
 
 	scanJob := ScanJob{
diff --git a/pkg/file/folder.go b/pkg/file/folder.go
index fe260c155..e3e14186b 100644
--- a/pkg/file/folder.go
+++ b/pkg/file/folder.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"path/filepath"
+	"slices"
 	"strings"
 	"time"
 
@@ -12,8 +13,9 @@ import (
 )
 
 // GetOrCreateFolderHierarchy gets the folder for the given path, or creates a folder hierarchy for the given path if one if no existing folder is found.
-// Does not create any folders in the file system
-func GetOrCreateFolderHierarchy(ctx context.Context, fc models.FolderFinderCreator, path string) (*models.Folder, error) {
+// Creates folder entries for each level of the hierarchy that doesn't already exist, up to the provided root paths.
+// Does not create any folders in the file system.
+func GetOrCreateFolderHierarchy(ctx context.Context, fc models.FolderFinderCreator, path string, rootPaths []string) (*models.Folder, error) {
 	// get or create folder hierarchy
 	// assume case sensitive when searching for the folder
 	const caseSensitive = true
@@ -23,17 +25,30 @@ func GetOrCreateFolderHierarchy(ctx context.Context, fc models.FolderFinderCreat
 	}
 
 	if folder == nil {
-		parentPath := filepath.Dir(path)
-		parent, err := GetOrCreateFolderHierarchy(ctx, fc, parentPath)
-		if err != nil {
-			return nil, err
+		var parentID *models.FolderID
+
+		if !slices.Contains(rootPaths, path) {
+			parentPath := filepath.Dir(path)
+
+			// safety check - don't allow parent path to be the same as the current path,
+			// otherwise we could end up in an infinite loop
+			if parentPath == path {
+				panic(fmt.Sprintf("parent path is the same as the current path: %s", path))
+			}
+
+			parent, err := GetOrCreateFolderHierarchy(ctx, fc, parentPath, rootPaths)
+			if err != nil {
+				return nil, err
+			}
+
+			parentID = &parent.ID
 		}
 
 		now := time.Now()
 
 		folder = &models.Folder{
 			Path:           path,
-			ParentFolderID: &parent.ID,
+			ParentFolderID: parentID,
 			DirEntry:       models.DirEntry{
 				// leave mod time empty for now - it will be updated when the folder is scanned
 			},
@@ -41,6 +56,8 @@ func GetOrCreateFolderHierarchy(ctx context.Context, fc models.FolderFinderCreat
 			UpdatedAt: now,
 		}
 
+		logger.Infof("%s doesn't exist. Creating new folder entry...", path)
+
 		if err = fc.Create(ctx, folder); err != nil {
 			return nil, fmt.Errorf("creating folder %s: %w", path, err)
 		}
@@ -49,12 +66,18 @@ func GetOrCreateFolderHierarchy(ctx context.Context, fc models.FolderFinderCreat
 	return folder, nil
 }
 
-func transferZipHierarchy(ctx context.Context, folderStore models.FolderReaderWriter, files models.FileFinderUpdater, zipFileID models.FileID, oldPath string, newPath string) error {
-	if err := transferZipFolderHierarchy(ctx, folderStore, zipFileID, oldPath, newPath); err != nil {
+type zipHierarchyMover struct {
+	folderStore models.FolderReaderWriter
+	files       models.FileFinderUpdater
+	rootPaths   []string
+}
+
+func (m zipHierarchyMover) transferZipHierarchy(ctx context.Context, zipFileID models.FileID, oldPath string, newPath string) error {
+	if err := m.transferZipFolderHierarchy(ctx, zipFileID, oldPath, newPath); err != nil {
 		return fmt.Errorf("moving folder hierarchy for file %s: %w", oldPath, err)
 	}
 
-	if err := transferZipFileEntries(ctx, folderStore, files, zipFileID, oldPath, newPath); err != nil {
+	if err := m.transferZipFileEntries(ctx, zipFileID, oldPath, newPath); err != nil {
 		return fmt.Errorf("moving zip file contents for file %s: %w", oldPath, err)
 	}
 
@@ -63,8 +86,8 @@ func transferZipHierarchy(ctx context.Context, folderStore models.FolderReaderWr
 
 // transferZipFolderHierarchy creates the folder hierarchy for zipFileID under newPath, and removes
 // ZipFileID from folders under oldPath.
-func transferZipFolderHierarchy(ctx context.Context, folderStore models.FolderReaderWriter, zipFileID models.FileID, oldPath string, newPath string) error {
-	zipFolders, err := folderStore.FindByZipFileID(ctx, zipFileID)
+func (m zipHierarchyMover) transferZipFolderHierarchy(ctx context.Context, zipFileID models.FileID, oldPath string, newPath string) error {
+	zipFolders, err := m.folderStore.FindByZipFileID(ctx, zipFileID)
 	if err != nil {
 		return err
 	}
@@ -83,7 +106,7 @@ func transferZipFolderHierarchy(ctx context.Context, folderStore models.FolderRe
 		}
 		newZfPath := filepath.Join(newPath, relZfPath)
 
-		newFolder, err := GetOrCreateFolderHierarchy(ctx, folderStore, newZfPath)
+		newFolder, err := GetOrCreateFolderHierarchy(ctx, m.folderStore, newZfPath, m.rootPaths)
 		if err != nil {
 			return err
 		}
@@ -91,14 +114,14 @@ func transferZipFolderHierarchy(ctx context.Context, folderStore models.FolderRe
 		// add ZipFileID to new folder
 		logger.Debugf("adding zip file %s to folder %s", zipFileID, newFolder.Path)
 		newFolder.ZipFileID = &zipFileID
-		if err = folderStore.Update(ctx, newFolder); err != nil {
+		if err = m.folderStore.Update(ctx, newFolder); err != nil {
 			return err
 		}
 
 		// remove ZipFileID from old folder
 		logger.Debugf("removing zip file %s from folder %s", zipFileID, oldFolder.Path)
 		oldFolder.ZipFileID = nil
-		if err = folderStore.Update(ctx, oldFolder); err != nil {
+		if err = m.folderStore.Update(ctx, oldFolder); err != nil {
 			return err
 		}
 	}
@@ -106,9 +129,9 @@ func transferZipFolderHierarchy(ctx context.Context, folderStore models.FolderRe
 	return nil
 }
 
-func transferZipFileEntries(ctx context.Context, folders models.FolderFinderCreator, files models.FileFinderUpdater, zipFileID models.FileID, oldPath, newPath string) error {
+func (m zipHierarchyMover) transferZipFileEntries(ctx context.Context, zipFileID models.FileID, oldPath, newPath string) error {
 	// move contained files if file is a zip file
-	zipFiles, err := files.FindByZipFileID(ctx, zipFileID)
+	zipFiles, err := m.files.FindByZipFileID(ctx, zipFileID)
 	if err != nil {
 		return fmt.Errorf("finding contained files in file %s: %w", oldPath, err)
 	}
@@ -129,7 +152,7 @@ func transferZipFileEntries(ctx context.Context, folders models.FolderFinderCrea
 		newZfDir := filepath.Join(newPath, relZfDir)
 
 		// folder should have been created by transferZipFolderHierarchy
-		newZfFolder, err := GetOrCreateFolderHierarchy(ctx, folders, newZfDir)
+		newZfFolder, err := GetOrCreateFolderHierarchy(ctx, m.folderStore, newZfDir, m.rootPaths)
 		if err != nil {
 			return fmt.Errorf("getting or creating folder hierarchy: %w", err)
 		}
@@ -137,7 +160,7 @@ func transferZipFileEntries(ctx context.Context, folders models.FolderFinderCrea
 		// update file parent folder
 		zfBase.ParentFolderID = newZfFolder.ID
 		logger.Debugf("moving %s to folder %s", zfBase.Path, newZfFolder.Path)
-		if err := files.Update(ctx, zf); err != nil {
+		if err := m.files.Update(ctx, zf); err != nil {
 			return fmt.Errorf("updating file %s: %w", oldZfPath, err)
 		}
 	}
diff --git a/pkg/file/move.go b/pkg/file/move.go
index ba2a496bb..06605912b 100644
--- a/pkg/file/move.go
+++ b/pkg/file/move.go
@@ -45,9 +45,12 @@ type Mover struct {
 
 	moved          map[string]string
 	foldersCreated []string
+
+	// needed for creating folder hierarchy when moving zip file entries
+	rootPaths []string
 }
 
-func NewMover(fileStore models.FileFinderUpdater, folderStore models.FolderReaderWriter) *Mover {
+func NewMover(fileStore models.FileFinderUpdater, folderStore models.FolderReaderWriter, rootPaths []string) *Mover {
 	return &Mover{
 		Files:   fileStore,
 		Folders: folderStore,
@@ -55,6 +58,7 @@ func NewMover(fileStore models.FileFinderUpdater, folderStore models.FolderReade
 			renamerRemoverImpl: newRenamerRemoverImpl(),
 			mkDirFn:            os.Mkdir,
 		},
+		rootPaths: rootPaths,
 	}
 }
 
@@ -87,7 +91,13 @@ func (m *Mover) Move(ctx context.Context, f models.File, folder *models.Folder,
 		return fmt.Errorf("file %s already exists", newPath)
 	}
 
-	if err := transferZipHierarchy(ctx, m.Folders, m.Files, fBase.ID, oldPath, newPath); err != nil {
+	zipMover := zipHierarchyMover{
+		folderStore: m.Folders,
+		files:       m.Files,
+		rootPaths:   m.rootPaths,
+	}
+
+	if err := zipMover.transferZipHierarchy(ctx, fBase.ID, oldPath, newPath); err != nil {
 		return fmt.Errorf("moving folder hierarchy for file %s: %w", fBase.Path, err)
 	}
 
diff --git a/pkg/file/scan.go b/pkg/file/scan.go
index d9a58ad44..cf1b43603 100644
--- a/pkg/file/scan.go
+++ b/pkg/file/scan.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"io/fs"
 	"path/filepath"
+	"slices"
 	"strings"
 	"sync"
 	"time"
@@ -60,6 +61,10 @@ type Scanner struct {
 	// handlers are called after a file has been scanned.
 	FileHandlers []Handler
 
+	// RootPaths form the top-level paths for the library.
+	// Used to determine the root of the folder hierarchy when creating folders.
+	RootPaths []string
+
 	// Rescan indicates whether files should be rescanned even if they haven't changed.
 	Rescan bool
 
@@ -193,6 +198,10 @@ func (s *Scanner) ScanFolder(ctx context.Context, file ScannedFile) (*models.Fol
 	return f, err
 }
 
+func (s *Scanner) isRootPath(path string) bool {
+	return path == "." || slices.Contains(s.RootPaths, path)
+}
+
 func (s *Scanner) onNewFolder(ctx context.Context, file ScannedFile) (*models.Folder, error) {
 	renamed, err := s.handleFolderRename(ctx, file)
 	if err != nil {
@@ -212,18 +221,16 @@ func (s *Scanner) onNewFolder(ctx context.Context, file ScannedFile) (*models.Fo
 		UpdatedAt: now,
 	}
 
-	dir := filepath.Dir(file.Path)
-	if dir != "." {
-		parentFolderID, err := s.getFolderID(ctx, dir)
+	if !s.isRootPath(file.Path) {
+		dir := filepath.Dir(file.Path)
+
+		// create full folder hierarchy if parent folder doesn't exist, and set parent folder ID
+		parentFolder, err := GetOrCreateFolderHierarchy(ctx, s.Repository.Folder, dir, s.RootPaths)
 		if err != nil {
 			return nil, fmt.Errorf("getting parent folder %q: %w", dir, err)
 		}
 
-		// if parent folder doesn't exist, assume it's a top-level folder
-		// this may not be true if we're using multiple goroutines
-		if parentFolderID != nil {
-			toCreate.ParentFolderID = parentFolderID
-		}
+		toCreate.ParentFolderID = &parentFolder.ID
 	}
 
 	txn.AddPostCommitHook(ctx, func(ctx context.Context) {
@@ -312,6 +319,19 @@ func (s *Scanner) onExistingFolder(ctx context.Context, f ScannedFile, existing
 		}
 	}
 
+	// handle case where parent folder was not previously set
+	if existing.ParentFolderID == nil && !s.isRootPath(existing.Path) {
+		logger.Infof("Existing folder entry %q has no parent folder. Creating folder hierarchy and setting parent ID...", existing.Path)
+
+		// create full folder hierarchy if parent folder doesn't exist, and set parent folder ID
+		parentFolder, err := GetOrCreateFolderHierarchy(ctx, s.Repository.Folder, filepath.Dir(f.Path), s.RootPaths)
+		if err != nil {
+			return nil, fmt.Errorf("getting parent folder for %q: %w", f.Path, err)
+		}
+		existing.ParentFolderID = &parentFolder.ID
+		update = true
+	}
+
 	if update {
 		var err error
 		if err = s.Repository.Folder.Update(ctx, existing); err != nil {
@@ -393,13 +413,31 @@ func (s *Scanner) onNewFile(ctx context.Context, f ScannedFile) (*ScanFileResult
 	baseFile.UpdatedAt = now
 
 	// find the parent folder
-	parentFolderID, err := s.getFolderID(ctx, filepath.Dir(path))
+	folderPath := filepath.Dir(path)
+	parentFolderID, err := s.getFolderID(ctx, folderPath)
 	if err != nil {
 		return nil, fmt.Errorf("getting parent folder for %q: %w", path, err)
 	}
 
 	if parentFolderID == nil {
-		return nil, fmt.Errorf("parent folder for %q doesn't exist", path)
+		// parent folders should have been created before scanning this file in a recursive scan
+		// assume that we are scanning specifically and only this file,
+		// so we should create the parent folder hierarchy if it doesn't exist
+		if err := s.Repository.WithTxn(ctx, func(ctx context.Context) error {
+			parentFolder, err := GetOrCreateFolderHierarchy(ctx, s.Repository.Folder, folderPath, s.RootPaths)
+			if err != nil {
+				return fmt.Errorf("getting parent folder for %q: %w", f.Path, err)
+			}
+
+			parentFolderID = &parentFolder.ID
+			return nil
+		}); err != nil {
+			return nil, err
+		}
+	}
+	if parentFolderID == nil {
+		// shouldn't happen
+		return nil, fmt.Errorf("parent folder ID is nil for %q", path)
 	}
 
 	baseFile.ParentFolderID = *parentFolderID
@@ -604,13 +642,19 @@ func (s *Scanner) handleRename(ctx context.Context, f models.File, fp []models.F
 	fBaseCopy.Fingerprints = updatedBase.Fingerprints
 	*updatedBase = fBaseCopy
 
+	zipMover := zipHierarchyMover{
+		folderStore: s.Repository.Folder,
+		files:       s.Repository.File,
+		rootPaths:   s.RootPaths,
+	}
+
 	if err := s.Repository.WithTxn(ctx, func(ctx context.Context) error {
 		if err := s.Repository.File.Update(ctx, updated); err != nil {
 			return fmt.Errorf("updating file for rename %q: %w", newPath, err)
 		}
 
 		if s.IsZipFile(updatedBase.Basename) {
-			if err := transferZipHierarchy(ctx, s.Repository.Folder, s.Repository.File, updatedBase.ID, oldPath, newPath); err != nil {
+			if err := zipMover.transferZipHierarchy(ctx, updatedBase.ID, oldPath, newPath); err != nil {
 				return fmt.Errorf("moving zip hierarchy for renamed zip file %q: %w", newPath, err)
 			}
 		}

From 660feabced3494e36ca5add5501e5f43f30dcf54 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Fri, 27 Feb 2026 07:43:16 +1100
Subject: [PATCH 321/405] Update minimatch and ajv dependencies (#6609)

* Update minimatch
* Update ajv
---
 ui/v2.5/pnpm-lock.yaml | 88 +++++++++++++++++++++++++++---------------
 1 file changed, 56 insertions(+), 32 deletions(-)

diff --git a/ui/v2.5/pnpm-lock.yaml b/ui/v2.5/pnpm-lock.yaml
index 02033c41f..46dcec4d8 100644
--- a/ui/v2.5/pnpm-lock.yaml
+++ b/ui/v2.5/pnpm-lock.yaml
@@ -1660,36 +1660,42 @@ packages:
     engines: {node: '>= 10.0.0'}
     cpu: [arm]
     os: [linux]
+    libc: [glibc]
 
   '@parcel/watcher-linux-arm-musl@2.5.1':
     resolution: {integrity: sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q==}
     engines: {node: '>= 10.0.0'}
     cpu: [arm]
     os: [linux]
+    libc: [musl]
 
   '@parcel/watcher-linux-arm64-glibc@2.5.1':
     resolution: {integrity: sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w==}
     engines: {node: '>= 10.0.0'}
     cpu: [arm64]
     os: [linux]
+    libc: [glibc]
 
   '@parcel/watcher-linux-arm64-musl@2.5.1':
     resolution: {integrity: sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg==}
     engines: {node: '>= 10.0.0'}
     cpu: [arm64]
     os: [linux]
+    libc: [musl]
 
   '@parcel/watcher-linux-x64-glibc@2.5.1':
     resolution: {integrity: sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A==}
     engines: {node: '>= 10.0.0'}
     cpu: [x64]
     os: [linux]
+    libc: [glibc]
 
   '@parcel/watcher-linux-x64-musl@2.5.1':
     resolution: {integrity: sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg==}
     engines: {node: '>= 10.0.0'}
     cpu: [x64]
     os: [linux]
+    libc: [musl]
 
   '@parcel/watcher-win32-arm64@2.5.1':
     resolution: {integrity: sha512-RFzklRvmc3PkjKjry3hLF9wD7ppR4AKcWNzH7kXR7GUe0Igb3Nz8fyPwtZCSquGrhU5HhUNDr/mKBqj7tqA2Vw==}
@@ -1781,56 +1787,67 @@ packages:
     resolution: {integrity: sha512-JzWRR41o2U3/KMNKRuZNsDUAcAVUYhsPuMlx5RUldw0E4lvSIXFUwejtYz1HJXohUmqs/M6BBJAUBzKXZVddbg==}
     cpu: [arm]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-arm-musleabihf@4.53.1':
     resolution: {integrity: sha512-L8kRIrnfMrEoHLHtHn+4uYA52fiLDEDyezgxZtGUTiII/yb04Krq+vk3P2Try+Vya9LeCE9ZHU8CXD6J9EhzHQ==}
     cpu: [arm]
     os: [linux]
+    libc: [musl]
 
   '@rollup/rollup-linux-arm64-gnu@4.53.1':
     resolution: {integrity: sha512-ysAc0MFRV+WtQ8li8hi3EoFi7us6d1UzaS/+Dp7FYZfg3NdDljGMoVyiIp6Ucz7uhlYDBZ/zt6XI0YEZbUO11Q==}
     cpu: [arm64]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-arm64-musl@4.53.1':
     resolution: {integrity: sha512-UV6l9MJpDbDZZ/fJvqNcvO1PcivGEf1AvKuTcHoLjVZVFeAMygnamCTDikCVMRnA+qJe+B3pSbgX2+lBMqgBhA==}
     cpu: [arm64]
     os: [linux]
+    libc: [musl]
 
   '@rollup/rollup-linux-loong64-gnu@4.53.1':
     resolution: {integrity: sha512-UDUtelEprkA85g95Q+nj3Xf0M4hHa4DiJ+3P3h4BuGliY4NReYYqwlc0Y8ICLjN4+uIgCEvaygYlpf0hUj90Yg==}
     cpu: [loong64]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-ppc64-gnu@4.53.1':
     resolution: {integrity: sha512-vrRn+BYhEtNOte/zbc2wAUQReJXxEx2URfTol6OEfY2zFEUK92pkFBSXRylDM7aHi+YqEPJt9/ABYzmcrS4SgQ==}
     cpu: [ppc64]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-riscv64-gnu@4.53.1':
     resolution: {integrity: sha512-gto/1CxHyi4A7YqZZNznQYrVlPSaodOBPKM+6xcDSCMVZN/Fzb4K+AIkNz/1yAYz9h3Ng+e2fY9H6bgawVq17w==}
     cpu: [riscv64]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-riscv64-musl@4.53.1':
     resolution: {integrity: sha512-KZ6Vx7jAw3aLNjFR8eYVcQVdFa/cvBzDNRFM3z7XhNNunWjA03eUrEwJYPk0G8V7Gs08IThFKcAPS4WY/ybIrQ==}
     cpu: [riscv64]
     os: [linux]
+    libc: [musl]
 
   '@rollup/rollup-linux-s390x-gnu@4.53.1':
     resolution: {integrity: sha512-HvEixy2s/rWNgpwyKpXJcHmE7om1M89hxBTBi9Fs6zVuLU4gOrEMQNbNsN/tBVIMbLyysz/iwNiGtMOpLAOlvA==}
     cpu: [s390x]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-x64-gnu@4.53.1':
     resolution: {integrity: sha512-E/n8x2MSjAQgjj9IixO4UeEUeqXLtiA7pyoXCFYLuXpBA/t2hnbIdxHfA7kK9BFsYAoNU4st1rHYdldl8dTqGA==}
     cpu: [x64]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-x64-musl@4.53.1':
     resolution: {integrity: sha512-IhJ087PbLOQXCN6Ui/3FUkI9pWNZe/Z7rEIVOzMsOs1/HSAECCvSZ7PkIbkNqL/AZn6WbZvnoVZw/qwqYMo4/w==}
     cpu: [x64]
     os: [linux]
+    libc: [musl]
 
   '@rollup/rollup-openharmony-arm64@4.53.1':
     resolution: {integrity: sha512-0++oPNgLJHBblreu0SFM7b3mAsBJBTY0Ksrmu9N6ZVrPiTkRgda52mWR7TKhHAsUb9noCjFvAw9l6ZO1yzaVbA==}
@@ -2195,11 +2212,11 @@ packages:
     peerDependencies:
       ajv: ^6.9.1
 
-  ajv@6.12.6:
-    resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==}
+  ajv@6.14.0:
+    resolution: {integrity: sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw==}
 
-  ajv@8.17.1:
-    resolution: {integrity: sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==}
+  ajv@8.18.0:
+    resolution: {integrity: sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==}
 
   ansi-escapes@4.3.2:
     resolution: {integrity: sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==}
@@ -2350,6 +2367,10 @@ packages:
   balanced-match@2.0.0:
     resolution: {integrity: sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==}
 
+  balanced-match@4.0.4:
+    resolution: {integrity: sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==}
+    engines: {node: 18 || 20 || >=22}
+
   base64-blob@1.4.1:
     resolution: {integrity: sha512-n5Ov4cPTbLBTX1PiFbaB5AmK7LMigO9HWh5Lzx+Kcx/yx1MppeeLYtAH8aLv1m++WNoHQnr+xbGSqcZinopwlw==}
 
@@ -2382,8 +2403,9 @@ packages:
   brace-expansion@1.1.12:
     resolution: {integrity: sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==}
 
-  brace-expansion@2.0.2:
-    resolution: {integrity: sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==}
+  brace-expansion@5.0.3:
+    resolution: {integrity: sha512-fy6KJm2RawA5RcHkLa1z/ScpBeA762UF9KmZQxwIbDtRJrgLzM10depAiEQ+CXYcoiqW1/m96OAAoke2nE9EeA==}
+    engines: {node: 18 || 20 || >=22}
 
   braces@3.0.3:
     resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==}
@@ -3895,11 +3917,11 @@ packages:
     resolution: {integrity: sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==}
     engines: {node: '>=4'}
 
-  minimatch@3.1.2:
-    resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==}
+  minimatch@3.1.5:
+    resolution: {integrity: sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==}
 
-  minimatch@9.0.5:
-    resolution: {integrity: sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==}
+  minimatch@9.0.8:
+    resolution: {integrity: sha512-reYkDYtj/b19TeqbNZCV4q9t+Yxylf/rYBsLb42SXJatTv4/ylq5lEiAmhA/IToxO7NI2UzNMghHoHuaqDkAjw==}
     engines: {node: '>=16 || 14 >=14.17'}
 
   minimist-options@4.1.0:
@@ -6336,14 +6358,14 @@ snapshots:
 
   '@eslint/eslintrc@2.1.4':
     dependencies:
-      ajv: 6.12.6
+      ajv: 6.14.0
       debug: 4.4.3
       espree: 9.6.1
       globals: 13.24.0
       ignore: 5.3.2
       import-fresh: 3.3.1
       js-yaml: 4.1.0
-      minimatch: 3.1.2
+      minimatch: 3.1.5
       strip-json-comments: 3.1.1
     transitivePeerDependencies:
       - supports-color
@@ -7037,7 +7059,7 @@ snapshots:
     dependencies:
       '@humanwhocodes/object-schema': 2.0.3
       debug: 4.4.3
-      minimatch: 3.1.2
+      minimatch: 3.1.5
     transitivePeerDependencies:
       - supports-color
 
@@ -7663,18 +7685,18 @@ snapshots:
       clean-stack: 2.2.0
       indent-string: 4.0.0
 
-  ajv-keywords@3.5.2(ajv@6.12.6):
+  ajv-keywords@3.5.2(ajv@6.14.0):
     dependencies:
-      ajv: 6.12.6
+      ajv: 6.14.0
 
-  ajv@6.12.6:
+  ajv@6.14.0:
     dependencies:
       fast-deep-equal: 3.1.3
       fast-json-stable-stringify: 2.1.0
       json-schema-traverse: 0.4.1
       uri-js: 4.4.1
 
-  ajv@8.17.1:
+  ajv@8.18.0:
     dependencies:
       fast-deep-equal: 3.1.3
       fast-uri: 3.1.0
@@ -7887,6 +7909,8 @@ snapshots:
 
   balanced-match@2.0.0: {}
 
+  balanced-match@4.0.4: {}
+
   base64-blob@1.4.1:
     dependencies:
       b64-to-blob: 1.2.19
@@ -7924,9 +7948,9 @@ snapshots:
       balanced-match: 1.0.2
       concat-map: 0.0.1
 
-  brace-expansion@2.0.2:
+  brace-expansion@5.0.3:
     dependencies:
-      balanced-match: 1.0.2
+      balanced-match: 4.0.4
 
   braces@3.0.3:
     dependencies:
@@ -8520,7 +8544,7 @@ snapshots:
       hasown: 2.0.2
       is-core-module: 2.16.1
       is-glob: 4.0.3
-      minimatch: 3.1.2
+      minimatch: 3.1.5
       object.fromentries: 2.0.8
       object.groupby: 1.0.3
       object.values: 1.2.1
@@ -8548,7 +8572,7 @@ snapshots:
       hasown: 2.0.2
       jsx-ast-utils: 3.3.5
       language-tags: 1.0.9
-      minimatch: 3.1.2
+      minimatch: 3.1.5
       object.fromentries: 2.0.8
       safe-regex-test: 1.1.0
       string.prototype.includes: 2.0.1
@@ -8569,7 +8593,7 @@ snapshots:
       estraverse: 5.3.0
       hasown: 2.0.2
       jsx-ast-utils: 3.3.5
-      minimatch: 3.1.2
+      minimatch: 3.1.5
       object.entries: 1.1.9
       object.fromentries: 2.0.8
       object.values: 1.2.1
@@ -8601,7 +8625,7 @@ snapshots:
       '@humanwhocodes/module-importer': 1.0.1
       '@nodelib/fs.walk': 1.2.8
       '@ungap/structured-clone': 1.3.0
-      ajv: 6.12.6
+      ajv: 6.14.0
       chalk: 4.1.2
       cross-spawn: 7.0.6
       debug: 4.4.3
@@ -8626,7 +8650,7 @@ snapshots:
       json-stable-stringify-without-jsonify: 1.0.1
       levn: 0.4.1
       lodash.merge: 4.6.2
-      minimatch: 3.1.2
+      minimatch: 3.1.5
       natural-compare: 1.4.0
       optionator: 0.9.4
       strip-ansi: 6.0.1
@@ -8874,7 +8898,7 @@ snapshots:
       fs.realpath: 1.0.0
       inflight: 1.0.6
       inherits: 2.0.4
-      minimatch: 3.1.2
+      minimatch: 3.1.5
       once: 1.4.0
       path-is-absolute: 1.0.1
 
@@ -8932,7 +8956,7 @@ snapshots:
       cosmiconfig: 8.3.6(typescript@4.8.4)
       graphql: 16.11.0
       jiti: 2.6.1
-      minimatch: 9.0.5
+      minimatch: 9.0.8
       string-env-interpolation: 1.0.1
       tslib: 2.8.1
     transitivePeerDependencies:
@@ -9700,13 +9724,13 @@ snapshots:
 
   min-indent@1.0.1: {}
 
-  minimatch@3.1.2:
+  minimatch@3.1.5:
     dependencies:
       brace-expansion: 1.1.12
 
-  minimatch@9.0.5:
+  minimatch@9.0.8:
     dependencies:
-      brace-expansion: 2.0.2
+      brace-expansion: 5.0.3
 
   minimist-options@4.1.0:
     dependencies:
@@ -10497,8 +10521,8 @@ snapshots:
   schema-utils@2.7.1:
     dependencies:
       '@types/json-schema': 7.0.15
-      ajv: 6.12.6
-      ajv-keywords: 3.5.2(ajv@6.12.6)
+      ajv: 6.14.0
+      ajv-keywords: 3.5.2(ajv@6.14.0)
 
   scuid@1.1.0: {}
 
@@ -10827,7 +10851,7 @@ snapshots:
 
   table@6.9.0:
     dependencies:
-      ajv: 8.17.1
+      ajv: 8.18.0
       lodash.truncate: 4.4.2
       slice-ansi: 4.0.0
       string-width: 4.2.3

From ead0c7fe077723dbf0ae93b650e5f7a95e217371 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Fri, 27 Feb 2026 07:44:23 +1100
Subject: [PATCH 322/405] Add sidebar to Tag list (#6610)

* Fix image export dialog
* Add sidebar to TagList
* Update plugin docs and types
* Remove ItemList as it is no longer referenced
---
 ui/v2.5/src/components/Images/ImageList.tsx |   2 +-
 ui/v2.5/src/components/List/ItemList.tsx    | 372 +--------
 ui/v2.5/src/components/Tags/TagList.tsx     | 874 ++++++++++++--------
 ui/v2.5/src/components/Tags/Tags.tsx        |   4 +-
 ui/v2.5/src/docs/en/Manual/UIPluginApi.md   |   2 +
 ui/v2.5/src/pluginApi.d.ts                  |   1 +
 6 files changed, 528 insertions(+), 727 deletions(-)

diff --git a/ui/v2.5/src/components/Images/ImageList.tsx b/ui/v2.5/src/components/Images/ImageList.tsx
index 8c11abdee..cc8aa48f7 100644
--- a/ui/v2.5/src/components/Images/ImageList.tsx
+++ b/ui/v2.5/src/components/Images/ImageList.tsx
@@ -618,7 +618,7 @@ export const FilteredImageList = PatchComponent(
       showModal(
         <ExportDialog
           exportInput={{
-            groups: {
+            images: {
               ids: Array.from(selectedIds.values()),
               all: all,
             },
diff --git a/ui/v2.5/src/components/List/ItemList.tsx b/ui/v2.5/src/components/List/ItemList.tsx
index 962e3fc4c..893f1d005 100644
--- a/ui/v2.5/src/components/List/ItemList.tsx
+++ b/ui/v2.5/src/components/List/ItemList.tsx
@@ -1,33 +1,11 @@
-import React, {
-  PropsWithChildren,
-  useCallback,
-  useEffect,
-  useMemo,
-  useState,
-} from "react";
-import * as GQL from "src/core/generated-graphql";
 import { QueryResult } from "@apollo/client";
-import { Criterion } from "src/models/list-filter/criteria/criterion";
 import { ListFilterModel } from "src/models/list-filter/filter";
-import {
-  EditFilterDialog,
-  useShowEditFilter,
-} from "src/components/List/EditFilterDialog";
-import { FilterTags } from "./FilterTags";
-import { View } from "./views";
+import { useShowEditFilter } from "src/components/List/EditFilterDialog";
 import { IHasID } from "src/utils/data";
-import {
-  ListContext,
-  QueryResultContext,
-  useListContext,
-  useQueryResultContext,
-} from "./ListProvider";
-import { FilterContext, SetFilterURL, useFilter } from "./FilterProvider";
 import { useModal } from "src/hooks/modal";
 import {
   IFilterStateHook,
   IQueryResultHook,
-  useDefaultFilter,
   useEnsureValidPage,
   useFilterOperations,
   useFilterState,
@@ -36,15 +14,7 @@ import {
   useQueryResult,
   useScrollToTopOnPageChange,
 } from "./util";
-import {
-  FilteredListToolbar,
-  IFilteredListToolbar,
-  IItemListOperation,
-} from "./FilteredListToolbar";
-import { PagedList } from "./PagedList";
 import { useConfigurationContext } from "src/hooks/Config";
-import { useZoomKeybinds } from "./ZoomSlider";
-import { DisplayMode } from "src/models/list-filter/types";
 
 interface IFilteredItemList<
   T extends QueryResult,
@@ -119,346 +89,6 @@ export function useFilteredItemList<
   };
 }
 
-interface IItemListProps<T extends QueryResult, E extends IHasID, M = unknown> {
-  view?: View;
-  otherOperations?: IItemListOperation<T>[];
-  renderContent: (
-    result: T,
-    filter: ListFilterModel,
-    selectedIds: Set<string>,
-    onSelectChange: (id: string, selected: boolean, shiftKey: boolean) => void,
-    onChangePage: (page: number) => void,
-    pageCount: number
-  ) => React.ReactNode;
-  renderMetadataByline?: (data: T, metadataInfo?: M) => React.ReactNode;
-  renderEditDialog?: (
-    selected: E[],
-    onClose: (applied: boolean) => void
-  ) => React.ReactNode;
-  renderDeleteDialog?: (
-    selected: E[],
-    onClose: (confirmed: boolean) => void
-  ) => React.ReactNode;
-  addKeybinds?: (
-    result: T,
-    filter: ListFilterModel,
-    selectedIds: Set<string>
-  ) => () => void;
-  renderToolbar?: (props: IFilteredListToolbar) => React.ReactNode;
-}
-
-export const ItemList = <T extends QueryResult, E extends IHasID, M = unknown>(
-  props: IItemListProps<T, E, M>
-) => {
-  const {
-    view,
-    otherOperations,
-    renderContent,
-    renderEditDialog,
-    renderDeleteDialog,
-    renderMetadataByline,
-    addKeybinds,
-    renderToolbar: providedToolbar,
-  } = props;
-
-  const { filter, setFilter: updateFilter } = useFilter();
-  const { effectiveFilter, result, metadataInfo, cachedResult, totalCount } =
-    useQueryResultContext<T, E, M>();
-  const listSelect = useListContext<E>();
-  const {
-    selectedIds,
-    getSelected,
-    onSelectChange,
-    onSelectAll,
-    onSelectNone,
-    onInvertSelection,
-  } = listSelect;
-
-  // scroll to the top of the page when the page changes
-  useScrollToTopOnPageChange(filter.currentPage, result.loading);
-
-  const { modal, showModal, closeModal } = useModal();
-
-  const metadataByline = useMemo(() => {
-    if (cachedResult.loading) return "";
-
-    return renderMetadataByline?.(cachedResult, metadataInfo) ?? "";
-  }, [renderMetadataByline, cachedResult, metadataInfo]);
-
-  const pages = Math.ceil(totalCount / filter.itemsPerPage);
-
-  const onChangePage = useCallback(
-    (p: number) => {
-      updateFilter(filter.changePage(p));
-    },
-    [filter, updateFilter]
-  );
-
-  useEnsureValidPage(filter, totalCount, updateFilter);
-
-  const showEditFilter = useCallback(
-    (editingCriterion?: string) => {
-      function onApplyEditFilter(f: ListFilterModel) {
-        closeModal();
-        updateFilter(f);
-      }
-
-      showModal(
-        <EditFilterDialog
-          filter={filter}
-          onApply={onApplyEditFilter}
-          onCancel={() => closeModal()}
-          editingCriterion={editingCriterion}
-        />
-      );
-    },
-    [filter, updateFilter, showModal, closeModal]
-  );
-
-  useListKeyboardShortcuts({
-    currentPage: filter.currentPage,
-    onChangePage,
-    onSelectAll,
-    onSelectNone,
-    onInvertSelection,
-    pages,
-    showEditFilter,
-  });
-
-  const zoomable =
-    filter.displayMode === DisplayMode.Grid ||
-    filter.displayMode === DisplayMode.Wall;
-
-  useZoomKeybinds({
-    zoomIndex: zoomable ? filter.zoomIndex : undefined,
-    onChangeZoom: (zoom) => updateFilter(filter.setZoom(zoom)),
-  });
-
-  useEffect(() => {
-    if (addKeybinds) {
-      const unbindExtras = addKeybinds(result, effectiveFilter, selectedIds);
-      return () => {
-        unbindExtras();
-      };
-    }
-  }, [addKeybinds, result, effectiveFilter, selectedIds]);
-
-  const operations = useMemo(() => {
-    async function onOperationClicked(o: IItemListOperation<T>) {
-      await o.onClick(result, effectiveFilter, selectedIds);
-      if (o.postRefetch) {
-        result.refetch();
-      }
-    }
-
-    return otherOperations?.map((o) => ({
-      text: o.text,
-      onClick: () => {
-        onOperationClicked(o);
-      },
-      isDisplayed: () => {
-        if (o.isDisplayed) {
-          return o.isDisplayed(result, effectiveFilter, selectedIds);
-        }
-
-        return true;
-      },
-      icon: o.icon,
-      buttonVariant: o.buttonVariant,
-    }));
-  }, [result, effectiveFilter, selectedIds, otherOperations]);
-
-  function onEdit() {
-    if (!renderEditDialog) {
-      return;
-    }
-
-    showModal(
-      renderEditDialog(getSelected(), (applied) => onEditDialogClosed(applied))
-    );
-  }
-
-  function onEditDialogClosed(applied: boolean) {
-    if (applied) {
-      onSelectNone();
-    }
-    closeModal();
-
-    // refetch
-    result.refetch();
-  }
-
-  function onDelete() {
-    if (!renderDeleteDialog) {
-      return;
-    }
-
-    showModal(
-      renderDeleteDialog(getSelected(), (deleted) =>
-        onDeleteDialogClosed(deleted)
-      )
-    );
-  }
-
-  function onDeleteDialogClosed(deleted: boolean) {
-    if (deleted) {
-      onSelectNone();
-    }
-    closeModal();
-
-    // refetch
-    result.refetch();
-  }
-
-  function onRemoveCriterion(removedCriterion: Criterion, valueIndex?: number) {
-    if (valueIndex === undefined) {
-      updateFilter(
-        filter.removeCriterion(removedCriterion.criterionOption.type)
-      );
-    } else {
-      updateFilter(
-        filter.removeCustomFieldCriterion(
-          removedCriterion.criterionOption.type,
-          valueIndex
-        )
-      );
-    }
-  }
-
-  function onClearAllCriteria() {
-    updateFilter(filter.clearCriteria());
-  }
-
-  const filterListToolbarProps: IFilteredListToolbar = {
-    filter,
-    setFilter: updateFilter,
-    listSelect,
-    showEditFilter,
-    view: view,
-    operations: operations,
-    zoomable: zoomable,
-    onEdit: renderEditDialog ? onEdit : undefined,
-    onDelete: renderDeleteDialog ? onDelete : undefined,
-  };
-
-  return (
-    <div className="item-list-container">
-      {providedToolbar ? (
-        providedToolbar(filterListToolbarProps)
-      ) : (
-        <FilteredListToolbar {...filterListToolbarProps} />
-      )}
-      <FilterTags
-        criteria={filter.criteria}
-        onEditCriterion={(c) => showEditFilter(c.criterionOption.type)}
-        onRemoveCriterion={onRemoveCriterion}
-        onRemoveAll={() => onClearAllCriteria()}
-      />
-      {modal}
-
-      <PagedList
-        result={result}
-        cachedResult={cachedResult}
-        filter={filter}
-        totalCount={totalCount}
-        onChangePage={onChangePage}
-        metadataByline={metadataByline}
-      >
-        {renderContent(
-          result,
-          // #4780 - use effectiveFilter to ensure filterHook is applied
-          effectiveFilter,
-          selectedIds,
-          onSelectChange,
-          onChangePage,
-          pages
-        )}
-      </PagedList>
-    </div>
-  );
-};
-
-interface IItemListContextProps<
-  T extends QueryResult,
-  E extends IHasID,
-  M = unknown
-> {
-  filterMode: GQL.FilterMode;
-  defaultSort?: string;
-  defaultFilter?: ListFilterModel;
-  useResult: (filter: ListFilterModel) => T;
-  useMetadataInfo?: (filter: ListFilterModel) => M;
-  getCount: (data: T) => number;
-  getItems: (data: T) => E[];
-  filterHook?: (filter: ListFilterModel) => ListFilterModel;
-  view?: View;
-  alterQuery?: boolean;
-  selectable?: boolean;
-}
-
-// Provides the contexts for the ItemList component. Includes functionality to scroll
-// to top on page change.
-export const ItemListContext = <
-  T extends QueryResult,
-  E extends IHasID,
-  M = unknown
->(
-  props: PropsWithChildren<IItemListContextProps<T, E, M>>
-) => {
-  const {
-    filterMode,
-    defaultSort,
-    defaultFilter: providedDefaultFilter,
-    useResult,
-    useMetadataInfo,
-    getCount,
-    getItems,
-    view,
-    filterHook,
-    alterQuery = true,
-    selectable,
-    children,
-  } = props;
-
-  const { configuration: config } = useConfigurationContext();
-
-  const emptyFilter = useMemo(
-    () =>
-      providedDefaultFilter?.clone() ??
-      new ListFilterModel(filterMode, config, {
-        defaultSortBy: defaultSort,
-      }),
-    [config, filterMode, defaultSort, providedDefaultFilter]
-  );
-
-  const [filter, setFilterState] = useState<ListFilterModel>(
-    () =>
-      new ListFilterModel(filterMode, config, { defaultSortBy: defaultSort })
-  );
-
-  const { defaultFilter } = useDefaultFilter(emptyFilter, view);
-
-  return (
-    <FilterContext filter={filter} setFilter={setFilterState}>
-      <SetFilterURL defaultFilter={defaultFilter} setURL={alterQuery}>
-        <QueryResultContext
-          filterHook={filterHook}
-          useResult={useResult}
-          useMetadataInfo={useMetadataInfo}
-          getCount={getCount}
-          getItems={getItems}
-        >
-          {({ items }) => (
-            <ListContext selectable={selectable} items={items}>
-              {children}
-            </ListContext>
-          )}
-        </QueryResultContext>
-      </SetFilterURL>
-    </FilterContext>
-  );
-};
-
 export const showWhenSelected = <T extends QueryResult>(
   result: T,
   filter: ListFilterModel,
diff --git a/ui/v2.5/src/components/Tags/TagList.tsx b/ui/v2.5/src/components/Tags/TagList.tsx
index 61b81b727..38cc13141 100644
--- a/ui/v2.5/src/components/Tags/TagList.tsx
+++ b/ui/v2.5/src/components/Tags/TagList.tsx
@@ -1,9 +1,9 @@
-import React, { useState } from "react";
+import React, { useCallback, useEffect } from "react";
 import cloneDeep from "lodash-es/cloneDeep";
 import Mousetrap from "mousetrap";
 import { ListFilterModel } from "src/models/list-filter/filter";
 import { DisplayMode } from "src/models/list-filter/types";
-import { ItemList, ItemListContext, showWhenSelected } from "../List/ItemList";
+import { useFilteredItemList } from "../List/ItemList";
 import { Button } from "react-bootstrap";
 import { Link, useHistory } from "react-router-dom";
 import * as GQL from "src/core/generated-graphql";
@@ -11,33 +11,269 @@ import {
   queryFindTagsForList,
   mutateMetadataAutoTag,
   useFindTagsForList,
-  useTagDestroy,
   useTagsDestroy,
 } from "src/core/StashService";
 import { useToast } from "src/hooks/Toast";
 import { FormattedMessage, FormattedNumber, useIntl } from "react-intl";
 import NavUtils from "src/utils/navigation";
 import { Icon } from "../Shared/Icon";
-import { ModalComponent } from "../Shared/Modal";
 import { DeleteEntityDialog } from "../Shared/DeleteEntityDialog";
 import { ExportDialog } from "../Shared/ExportDialog";
 import { tagRelationHook } from "../../core/tags";
 import { faTrashAlt } from "@fortawesome/free-solid-svg-icons";
 import { TagMergeModal } from "./TagMergeDialog";
-import { Tag } from "./TagSelect";
 import { TagCardGrid } from "./TagCardGrid";
 import { EditTagsDialog } from "./EditTagsDialog";
 import { View } from "../List/views";
-import { IItemListOperation } from "../List/FilteredListToolbar";
-import { PatchComponent } from "src/patch";
+import {
+  FilteredListToolbar,
+  IItemListOperation,
+} from "../List/FilteredListToolbar";
+import { PatchComponent, PatchContainerComponent } from "src/patch";
 import { TagTagger } from "../Tagger/tags/TagTagger";
+import useFocus from "src/utils/focus";
+import {
+  Sidebar,
+  SidebarPane,
+  SidebarPaneContent,
+  SidebarStateContext,
+  useSidebarState,
+} from "../Shared/Sidebar";
+import { useCloseEditDelete, useFilterOperations } from "../List/util";
+import {
+  FilteredSidebarHeader,
+  useFilteredSidebarKeybinds,
+} from "../List/Filters/FilterSidebar";
+import { ListOperations } from "../List/ListOperationButtons";
+import cx from "classnames";
+import { FilterTags } from "../List/FilterTags";
+import { Pagination, PaginationIndex } from "../List/Pagination";
+import { LoadedContent } from "../List/PagedList";
+import { SidebarBooleanFilter } from "../List/Filters/BooleanFilter";
+import { FavoriteTagCriterionOption } from "src/models/list-filter/criteria/favorite";
 
-function getItems(result: GQL.FindTagsForListQueryResult) {
-  return result?.data?.findTags?.tags ?? [];
+const TagList: React.FC<{
+  tags: GQL.TagListDataFragment[];
+  filter: ListFilterModel;
+  selectedIds: Set<string>;
+  onSelectChange: (id: string, selected: boolean, shiftKey: boolean) => void;
+  onDelete: (tag: GQL.TagListDataFragment) => void;
+  onAutoTag: (tag: GQL.TagListDataFragment) => void;
+}> = PatchComponent(
+  "TagList",
+  ({ tags, filter, selectedIds, onSelectChange, onDelete, onAutoTag }) => {
+    if (tags.length === 0 && filter.displayMode !== DisplayMode.Tagger) {
+      return null;
+    }
+
+    if (filter.displayMode === DisplayMode.Grid) {
+      return (
+        <TagCardGrid
+          tags={tags}
+          zoomIndex={filter.zoomIndex}
+          selectedIds={selectedIds}
+          onSelectChange={onSelectChange}
+        />
+      );
+    }
+    if (filter.displayMode === DisplayMode.List) {
+      const tagElements = tags.map((tag) => {
+        return (
+          <div key={tag.id} className="tag-list-row row">
+            <Link to={`/tags/${tag.id}`}>{tag.name}</Link>
+
+            <div className="ml-auto">
+              <Button
+                variant="secondary"
+                className="tag-list-button"
+                onClick={() => onAutoTag(tag)}
+              >
+                <FormattedMessage id="actions.auto_tag" />
+              </Button>
+              <Button variant="secondary" className="tag-list-button">
+                <Link
+                  to={NavUtils.makeTagScenesUrl(tag)}
+                  className="tag-list-anchor"
+                >
+                  <FormattedMessage
+                    id="countables.scenes"
+                    values={{
+                      count: tag.scene_count ?? 0,
+                    }}
+                  />
+                  : <FormattedNumber value={tag.scene_count ?? 0} />
+                </Link>
+              </Button>
+              <Button variant="secondary" className="tag-list-button">
+                <Link
+                  to={NavUtils.makeTagImagesUrl(tag)}
+                  className="tag-list-anchor"
+                >
+                  <FormattedMessage
+                    id="countables.images"
+                    values={{
+                      count: tag.image_count ?? 0,
+                    }}
+                  />
+                  : <FormattedNumber value={tag.image_count ?? 0} />
+                </Link>
+              </Button>
+              <Button variant="secondary" className="tag-list-button">
+                <Link
+                  to={NavUtils.makeTagGalleriesUrl(tag)}
+                  className="tag-list-anchor"
+                >
+                  <FormattedMessage
+                    id="countables.galleries"
+                    values={{
+                      count: tag.gallery_count ?? 0,
+                    }}
+                  />
+                  : <FormattedNumber value={tag.gallery_count ?? 0} />
+                </Link>
+              </Button>
+              <Button variant="secondary" className="tag-list-button">
+                <Link
+                  to={NavUtils.makeTagSceneMarkersUrl(tag)}
+                  className="tag-list-anchor"
+                >
+                  <FormattedMessage
+                    id="countables.markers"
+                    values={{
+                      count: tag.scene_marker_count ?? 0,
+                    }}
+                  />
+                  : <FormattedNumber value={tag.scene_marker_count ?? 0} />
+                </Link>
+              </Button>
+              <span className="tag-list-count">
+                <FormattedMessage id="total" />:{" "}
+                <FormattedNumber
+                  value={
+                    (tag.scene_count || 0) +
+                    (tag.scene_marker_count || 0) +
+                    (tag.image_count || 0) +
+                    (tag.gallery_count || 0)
+                  }
+                />
+              </span>
+              <Button variant="danger" onClick={() => onDelete(tag)}>
+                <Icon icon={faTrashAlt} color="danger" />
+              </Button>
+            </div>
+          </div>
+        );
+      });
+
+      return <div className="col col-sm-8 m-auto">{tagElements}</div>;
+    }
+    if (filter.displayMode === DisplayMode.Tagger) {
+      return <TagTagger tags={tags} />;
+    }
+
+    return null;
+  }
+);
+
+const TagFilterSidebarSections = PatchContainerComponent(
+  "FilteredTagList.SidebarSections"
+);
+
+const SidebarContent: React.FC<{
+  filter: ListFilterModel;
+  setFilter: (filter: ListFilterModel) => void;
+  filterHook?: (filter: ListFilterModel) => ListFilterModel;
+  view?: View;
+  sidebarOpen: boolean;
+  onClose?: () => void;
+  showEditFilter: (editingCriterion?: string) => void;
+  count?: number;
+  focus?: ReturnType<typeof useFocus>;
+}> = ({
+  filter,
+  setFilter,
+  // filterHook,
+  view,
+  showEditFilter,
+  sidebarOpen,
+  onClose,
+  count,
+  focus,
+}) => {
+  const showResultsId =
+    count !== undefined ? "actions.show_count_results" : "actions.show_results";
+
+  return (
+    <>
+      <FilteredSidebarHeader
+        sidebarOpen={sidebarOpen}
+        showEditFilter={showEditFilter}
+        filter={filter}
+        setFilter={setFilter}
+        view={view}
+        focus={focus}
+      />
+
+      <TagFilterSidebarSections>
+        {/* <SidebarTagsFilter
+          filter={filter}
+          setFilter={setFilter}
+          filterHook={filterHook}
+        /> */}
+        <SidebarBooleanFilter
+          title={<FormattedMessage id="favourite" />}
+          filter={filter}
+          setFilter={setFilter}
+          option={FavoriteTagCriterionOption}
+          sectionID="favourite"
+        />
+      </TagFilterSidebarSections>
+
+      <div className="sidebar-footer">
+        <Button className="sidebar-close-button" onClick={onClose}>
+          <FormattedMessage id={showResultsId} values={{ count }} />
+        </Button>
+      </div>
+    </>
+  );
+};
+
+function useViewRandom(filter: ListFilterModel, count: number) {
+  const history = useHistory();
+
+  const viewRandom = useCallback(async () => {
+    // query for a random tag
+    if (count === 0) {
+      return;
+    }
+
+    const index = Math.floor(Math.random() * count);
+    const filterCopy = cloneDeep(filter);
+    filterCopy.itemsPerPage = 1;
+    filterCopy.currentPage = index + 1;
+    const singleResult = await queryFindTagsForList(filterCopy);
+    if (singleResult.data.findTags.tags.length === 1) {
+      const { id } = singleResult.data.findTags.tags[0];
+      // navigate to the tag page
+      history.push(`/tags/${id}`);
+    }
+  }, [history, filter, count]);
+
+  return viewRandom;
 }
 
-function getCount(result: GQL.FindTagsForListQueryResult) {
-  return result?.data?.findTags?.count ?? 0;
+function useAddKeybinds(filter: ListFilterModel, count: number) {
+  const viewRandom = useViewRandom(filter, count);
+
+  useEffect(() => {
+    Mousetrap.bind("p r", () => {
+      viewRandom();
+    });
+
+    return () => {
+      Mousetrap.unbind("p r");
+    };
+  }, [viewRandom]);
 }
 
 interface ITagList {
@@ -46,105 +282,155 @@ interface ITagList {
   extraOperations?: IItemListOperation<GQL.FindTagsForListQueryResult>[];
 }
 
-export const TagList: React.FC<ITagList> = PatchComponent(
-  "TagList",
-  ({ filterHook, alterQuery, extraOperations = [] }) => {
-    const Toast = useToast();
-    const [deletingTag, setDeletingTag] =
-      useState<Partial<GQL.TagListDataFragment> | null>(null);
-
-    const filterMode = GQL.FilterMode.Tags;
-    const view = View.Tags;
-
-    function getDeleteTagInput() {
-      const tagInput: Partial<GQL.TagDestroyInput> = {};
-      if (deletingTag) {
-        tagInput.id = deletingTag.id;
-      }
-      return tagInput as GQL.TagDestroyInput;
-    }
-    const [deleteTag] = useTagDestroy(getDeleteTagInput());
-
+export const FilteredTagList = PatchComponent(
+  "FilteredTagList",
+  (props: ITagList) => {
     const intl = useIntl();
     const history = useHistory();
-    const [mergeTags, setMergeTags] = useState<Tag[] | undefined>(undefined);
-    const [isExportDialogOpen, setIsExportDialogOpen] = useState(false);
-    const [isExportAll, setIsExportAll] = useState(false);
+    const Toast = useToast();
 
-    const otherOperations = [
-      ...extraOperations,
-      {
-        text: intl.formatMessage({ id: "actions.view_random" }),
-        onClick: viewRandom,
-      },
-      {
-        text: `${intl.formatMessage({ id: "actions.merge" })}…`,
-        onClick: merge,
-        isDisplayed: showWhenSelected,
-      },
-      {
-        text: intl.formatMessage({ id: "actions.export" }),
-        onClick: onExport,
-        isDisplayed: showWhenSelected,
-      },
-      {
-        text: intl.formatMessage({ id: "actions.export_all" }),
-        onClick: onExportAll,
-      },
-    ];
+    const searchFocus = useFocus();
 
-    function addKeybinds(
-      result: GQL.FindTagsForListQueryResult,
-      filter: ListFilterModel
-    ) {
-      Mousetrap.bind("p r", () => {
-        viewRandom(result, filter);
+    const { filterHook, alterQuery, extraOperations = [] } = props;
+
+    const view = View.Tags;
+
+    // States
+    const {
+      showSidebar,
+      setShowSidebar,
+      sectionOpen,
+      setSectionOpen,
+      loading: sidebarStateLoading,
+    } = useSidebarState(view);
+
+    const { filterState, queryResult, modalState, listSelect, showEditFilter } =
+      useFilteredItemList({
+        filterStateProps: {
+          filterMode: GQL.FilterMode.Tags,
+          view,
+          useURL: alterQuery,
+        },
+        queryResultProps: {
+          useResult: useFindTagsForList,
+          getCount: (r) => r.data?.findTags.count ?? 0,
+          getItems: (r) => r.data?.findTags.tags ?? [],
+          filterHook,
+        },
+      });
+
+    const { filter, setFilter } = filterState;
+
+    const { effectiveFilter, result, cachedResult, items, totalCount } =
+      queryResult;
+
+    const {
+      selectedIds,
+      selectedItems,
+      onSelectChange,
+      onSelectAll,
+      onSelectNone,
+      onInvertSelection,
+      hasSelection,
+    } = listSelect;
+
+    const { modal, showModal, closeModal } = modalState;
+
+    // Utility hooks
+    const { setPage, removeCriterion, clearAllCriteria } = useFilterOperations({
+      filter,
+      setFilter,
+    });
+
+    useAddKeybinds(effectiveFilter, totalCount);
+    useFilteredSidebarKeybinds({
+      showSidebar,
+      setShowSidebar,
+    });
+
+    useEffect(() => {
+      Mousetrap.bind("e", () => {
+        if (hasSelection) {
+          onEdit?.();
+        }
+      });
+
+      Mousetrap.bind("d d", () => {
+        if (hasSelection) {
+          onDelete?.();
+        }
       });
 
       return () => {
-        Mousetrap.unbind("p r");
+        Mousetrap.unbind("e");
+        Mousetrap.unbind("d d");
       };
+    });
+
+    const onCloseEditDelete = useCloseEditDelete({
+      closeModal,
+      onSelectNone,
+      result,
+    });
+
+    const viewRandom = useViewRandom(effectiveFilter, totalCount);
+
+    function onExport(all: boolean) {
+      showModal(
+        <ExportDialog
+          exportInput={{
+            studios: {
+              ids: Array.from(selectedIds.values()),
+              all: all,
+            },
+          }}
+          onClose={() => closeModal()}
+        />
+      );
     }
 
-    async function viewRandom(
-      result: GQL.FindTagsForListQueryResult,
-      filter: ListFilterModel
-    ) {
-      // query for a random tag
-      if (result.data?.findTags) {
-        const { count } = result.data.findTags;
-
-        const index = Math.floor(Math.random() * count);
-        const filterCopy = cloneDeep(filter);
-        filterCopy.itemsPerPage = 1;
-        filterCopy.currentPage = index + 1;
-        const singleResult = await queryFindTagsForList(filterCopy);
-        if (singleResult.data.findTags.tags.length === 1) {
-          const { id } = singleResult.data.findTags.tags[0];
-          // navigate to the tag page
-          history.push(`/tags/${id}`);
-        }
-      }
+    function onEdit() {
+      showModal(
+        <EditTagsDialog selected={selectedItems} onClose={onCloseEditDelete} />
+      );
     }
 
-    async function merge(
-      result: GQL.FindTagsForListQueryResult,
-      filter: ListFilterModel,
-      selectedIds: Set<string>
-    ) {
-      const selected =
-        result.data?.findTags.tags.filter((t) => selectedIds.has(t.id)) ?? [];
-      setMergeTags(selected);
+    function onDelete(tag?: GQL.TagListDataFragment) {
+      const itemsToDelete = tag ? [tag] : selectedItems;
+
+      showModal(
+        <DeleteEntityDialog
+          selected={itemsToDelete}
+          onClose={onCloseEditDelete}
+          singularEntity={intl.formatMessage({ id: "tag" })}
+          pluralEntity={intl.formatMessage({ id: "tags" })}
+          destroyMutation={useTagsDestroy}
+          onDeleted={() => {
+            itemsToDelete.forEach((t) =>
+              tagRelationHook(
+                t,
+                { parents: t.parents ?? [], children: t.children ?? [] },
+                { parents: [], children: [] }
+              )
+            );
+          }}
+        />
+      );
     }
 
-    async function onExport() {
-      setIsExportAll(false);
-      setIsExportDialogOpen(true);
-    }
-
-    async function onExportAll() {
-      setIsExportAll(true);
-      setIsExportDialogOpen(true);
+    function onMerge() {
+      showModal(
+        <TagMergeModal
+          tags={selectedItems}
+          onClose={(mergedId?: string) => {
+            onCloseEditDelete();
+            if (mergedId) {
+              history.push(`/tags/${mergedId}`);
+            }
+          }}
+          show
+        />
+      );
     }
 
     async function onAutoTag(tag: GQL.TagListDataFragment) {
@@ -157,269 +443,151 @@ export const TagList: React.FC<ITagList> = PatchComponent(
       }
     }
 
-    async function onDelete() {
-      try {
-        const oldRelations = {
-          parents: deletingTag?.parents ?? [],
-          children: deletingTag?.children ?? [],
-        };
-        await deleteTag();
-        tagRelationHook(deletingTag as GQL.TagListDataFragment, oldRelations, {
-          parents: [],
-          children: [],
-        });
-        Toast.success(
-          intl.formatMessage(
-            { id: "toast.delete_past_tense" },
-            {
-              count: 1,
-              singularEntity: intl.formatMessage({ id: "tag" }),
-              pluralEntity: intl.formatMessage({ id: "tags" }),
-            }
-          )
-        );
-        setDeletingTag(null);
-      } catch (e) {
-        Toast.error(e);
-      }
-    }
+    const convertedExtraOperations = extraOperations.map((op) => ({
+      text: op.text,
+      onClick: () => op.onClick(result, filter, selectedIds),
+      isDisplayed: () => op.isDisplayed?.(result, filter, selectedIds) ?? true,
+    }));
 
-    function renderContent(
-      result: GQL.FindTagsForListQueryResult,
-      filter: ListFilterModel,
-      selectedIds: Set<string>,
-      onSelectChange: (id: string, selected: boolean, shiftKey: boolean) => void
-    ) {
-      function renderMergeDialog() {
-        if (mergeTags) {
-          return (
-            <TagMergeModal
-              tags={mergeTags}
-              onClose={(mergedId?: string) => {
-                setMergeTags(undefined);
-                if (mergedId) {
-                  history.push(`/tags/${mergedId}`);
-                }
-              }}
-              show
-            />
-          );
-        }
-      }
+    const otherOperations = [
+      ...convertedExtraOperations,
+      {
+        text: intl.formatMessage({ id: "actions.select_all" }),
+        onClick: () => onSelectAll(),
+        isDisplayed: () => totalCount > 0,
+      },
+      {
+        text: intl.formatMessage({ id: "actions.select_none" }),
+        onClick: () => onSelectNone(),
+        isDisplayed: () => hasSelection,
+      },
+      {
+        text: intl.formatMessage({ id: "actions.invert_selection" }),
+        onClick: () => onInvertSelection(),
+        isDisplayed: () => totalCount > 0,
+      },
+      {
+        text: intl.formatMessage({ id: "actions.view_random" }),
+        onClick: viewRandom,
+      },
+      {
+        text: `${intl.formatMessage({ id: "actions.merge" })}…`,
+        onClick: () => onMerge(),
+        isDisplayed: () => hasSelection,
+      },
+      {
+        text: intl.formatMessage({ id: "actions.export" }),
+        onClick: () => onExport(false),
+        isDisplayed: () => hasSelection,
+      },
+      {
+        text: intl.formatMessage({ id: "actions.export_all" }),
+        onClick: () => onExport(true),
+      },
+    ];
 
-      function maybeRenderExportDialog() {
-        if (isExportDialogOpen) {
-          return (
-            <ExportDialog
-              exportInput={{
-                tags: {
-                  ids: Array.from(selectedIds.values()),
-                  all: isExportAll,
-                },
-              }}
-              onClose={() => setIsExportDialogOpen(false)}
-            />
-          );
-        }
-      }
+    // render
+    if (sidebarStateLoading) return null;
 
-      function renderTags() {
-        if (!result.data?.findTags) return;
-
-        if (filter.displayMode === DisplayMode.Grid) {
-          return (
-            <TagCardGrid
-              tags={result.data.findTags.tags}
-              zoomIndex={filter.zoomIndex}
-              selectedIds={selectedIds}
-              onSelectChange={onSelectChange}
-            />
-          );
-        }
-        if (filter.displayMode === DisplayMode.List) {
-          const deleteAlert = (
-            <ModalComponent
-              onHide={() => {}}
-              show={!!deletingTag}
-              icon={faTrashAlt}
-              accept={{
-                onClick: onDelete,
-                variant: "danger",
-                text: intl.formatMessage({ id: "actions.delete" }),
-              }}
-              cancel={{ onClick: () => setDeletingTag(null) }}
-            >
-              <span>
-                <FormattedMessage
-                  id="dialogs.delete_confirm"
-                  values={{ entityName: deletingTag && deletingTag.name }}
-                />
-              </span>
-            </ModalComponent>
-          );
-
-          const tagElements = result.data.findTags.tags.map((tag) => {
-            return (
-              <div key={tag.id} className="tag-list-row row">
-                <Link to={`/tags/${tag.id}`}>{tag.name}</Link>
-
-                <div className="ml-auto">
-                  <Button
-                    variant="secondary"
-                    className="tag-list-button"
-                    onClick={() => onAutoTag(tag)}
-                  >
-                    <FormattedMessage id="actions.auto_tag" />
-                  </Button>
-                  <Button variant="secondary" className="tag-list-button">
-                    <Link
-                      to={NavUtils.makeTagScenesUrl(tag)}
-                      className="tag-list-anchor"
-                    >
-                      <FormattedMessage
-                        id="countables.scenes"
-                        values={{
-                          count: tag.scene_count ?? 0,
-                        }}
-                      />
-                      : <FormattedNumber value={tag.scene_count ?? 0} />
-                    </Link>
-                  </Button>
-                  <Button variant="secondary" className="tag-list-button">
-                    <Link
-                      to={NavUtils.makeTagImagesUrl(tag)}
-                      className="tag-list-anchor"
-                    >
-                      <FormattedMessage
-                        id="countables.images"
-                        values={{
-                          count: tag.image_count ?? 0,
-                        }}
-                      />
-                      : <FormattedNumber value={tag.image_count ?? 0} />
-                    </Link>
-                  </Button>
-                  <Button variant="secondary" className="tag-list-button">
-                    <Link
-                      to={NavUtils.makeTagGalleriesUrl(tag)}
-                      className="tag-list-anchor"
-                    >
-                      <FormattedMessage
-                        id="countables.galleries"
-                        values={{
-                          count: tag.gallery_count ?? 0,
-                        }}
-                      />
-                      : <FormattedNumber value={tag.gallery_count ?? 0} />
-                    </Link>
-                  </Button>
-                  <Button variant="secondary" className="tag-list-button">
-                    <Link
-                      to={NavUtils.makeTagSceneMarkersUrl(tag)}
-                      className="tag-list-anchor"
-                    >
-                      <FormattedMessage
-                        id="countables.markers"
-                        values={{
-                          count: tag.scene_marker_count ?? 0,
-                        }}
-                      />
-                      : <FormattedNumber value={tag.scene_marker_count ?? 0} />
-                    </Link>
-                  </Button>
-                  <span className="tag-list-count">
-                    <FormattedMessage id="total" />:{" "}
-                    <FormattedNumber
-                      value={
-                        (tag.scene_count || 0) +
-                        (tag.scene_marker_count || 0) +
-                        (tag.image_count || 0) +
-                        (tag.gallery_count || 0)
-                      }
-                    />
-                  </span>
-                  <Button variant="danger" onClick={() => setDeletingTag(tag)}>
-                    <Icon icon={faTrashAlt} color="danger" />
-                  </Button>
-                </div>
-              </div>
-            );
-          });
-
-          return (
-            <div className="col col-sm-8 m-auto">
-              {tagElements}
-              {deleteAlert}
-            </div>
-          );
-        }
-        if (filter.displayMode === DisplayMode.Wall) {
-          return <h1>TODO</h1>;
-        }
-        if (filter.displayMode === DisplayMode.Tagger) {
-          return <TagTagger tags={result.data.findTags.tags} />;
-        }
-      }
-      return (
-        <>
-          {renderMergeDialog()}
-          {maybeRenderExportDialog()}
-          {renderTags()}
-        </>
-      );
-    }
-
-    function renderEditDialog(
-      selectedTags: GQL.TagListDataFragment[],
-      onClose: (confirmed: boolean) => void
-    ) {
-      return <EditTagsDialog selected={selectedTags} onClose={onClose} />;
-    }
-
-    function renderDeleteDialog(
-      selectedTags: GQL.TagListDataFragment[],
-      onClose: (confirmed: boolean) => void
-    ) {
-      return (
-        <DeleteEntityDialog
-          selected={selectedTags}
-          onClose={onClose}
-          singularEntity={intl.formatMessage({ id: "tag" })}
-          pluralEntity={intl.formatMessage({ id: "tags" })}
-          destroyMutation={useTagsDestroy}
-          onDeleted={() => {
-            selectedTags.forEach((t) =>
-              tagRelationHook(
-                t,
-                { parents: t.parents ?? [], children: t.children ?? [] },
-                { parents: [], children: [] }
-              )
-            );
-          }}
-        />
-      );
-    }
+    const operations = (
+      <ListOperations
+        items={items.length}
+        hasSelection={hasSelection}
+        operations={otherOperations}
+        onEdit={onEdit}
+        onDelete={onDelete}
+        operationsMenuClassName="tag-list-operations-dropdown"
+      />
+    );
 
     return (
-      <ItemListContext
-        filterMode={filterMode}
-        useResult={useFindTagsForList}
-        getItems={getItems}
-        getCount={getCount}
-        alterQuery={alterQuery}
-        filterHook={filterHook}
-        view={view}
-        selectable
+      <div
+        className={cx("item-list-container tag-list", {
+          "hide-sidebar": !showSidebar,
+        })}
       >
-        <ItemList
-          view={view}
-          otherOperations={otherOperations}
-          addKeybinds={addKeybinds}
-          renderContent={renderContent}
-          renderEditDialog={renderEditDialog}
-          renderDeleteDialog={renderDeleteDialog}
-        />
-      </ItemListContext>
+        {modal}
+
+        <SidebarStateContext.Provider value={{ sectionOpen, setSectionOpen }}>
+          <SidebarPane hideSidebar={!showSidebar}>
+            <Sidebar hide={!showSidebar} onHide={() => setShowSidebar(false)}>
+              <SidebarContent
+                filter={filter}
+                setFilter={setFilter}
+                filterHook={filterHook}
+                showEditFilter={showEditFilter}
+                view={view}
+                sidebarOpen={showSidebar}
+                onClose={() => setShowSidebar(false)}
+                count={cachedResult.loading ? undefined : totalCount}
+                focus={searchFocus}
+              />
+            </Sidebar>
+            <SidebarPaneContent
+              onSidebarToggle={() => setShowSidebar(!showSidebar)}
+            >
+              <FilteredListToolbar
+                filter={filter}
+                listSelect={listSelect}
+                setFilter={setFilter}
+                showEditFilter={showEditFilter}
+                onDelete={onDelete}
+                onEdit={onEdit}
+                operationComponent={operations}
+                view={view}
+                zoomable
+              />
+
+              <FilterTags
+                criteria={filter.criteria}
+                onEditCriterion={(c) => showEditFilter(c.criterionOption.type)}
+                onRemoveCriterion={removeCriterion}
+                onRemoveAll={clearAllCriteria}
+              />
+
+              <div className="pagination-index-container">
+                <Pagination
+                  currentPage={filter.currentPage}
+                  itemsPerPage={filter.itemsPerPage}
+                  totalItems={totalCount}
+                  onChangePage={(page) => setFilter(filter.changePage(page))}
+                />
+                <PaginationIndex
+                  loading={cachedResult.loading}
+                  itemsPerPage={filter.itemsPerPage}
+                  currentPage={filter.currentPage}
+                  totalItems={totalCount}
+                />
+              </div>
+
+              <LoadedContent loading={result.loading} error={result.error}>
+                <TagList
+                  filter={effectiveFilter}
+                  tags={items}
+                  selectedIds={selectedIds}
+                  onSelectChange={onSelectChange}
+                  onDelete={(tag) => onDelete(tag)}
+                  onAutoTag={(tag) => onAutoTag(tag)}
+                />
+              </LoadedContent>
+
+              {totalCount > filter.itemsPerPage && (
+                <div className="pagination-footer-container">
+                  <div className="pagination-footer">
+                    <Pagination
+                      itemsPerPage={filter.itemsPerPage}
+                      currentPage={filter.currentPage}
+                      totalItems={totalCount}
+                      onChangePage={setPage}
+                      pagePopupPlacement="top"
+                    />
+                  </div>
+                </div>
+              )}
+            </SidebarPaneContent>
+          </SidebarPane>
+        </SidebarStateContext.Provider>
+      </div>
     );
   }
 );
diff --git a/ui/v2.5/src/components/Tags/Tags.tsx b/ui/v2.5/src/components/Tags/Tags.tsx
index 806a0f7a6..a4336fea9 100644
--- a/ui/v2.5/src/components/Tags/Tags.tsx
+++ b/ui/v2.5/src/components/Tags/Tags.tsx
@@ -4,10 +4,10 @@ import { Helmet } from "react-helmet";
 import { useTitleProps } from "src/hooks/title";
 import Tag from "./TagDetails/Tag";
 import TagCreate from "./TagDetails/TagCreate";
-import { TagList } from "./TagList";
+import { FilteredTagList } from "./TagList";
 
 const Tags: React.FC = () => {
-  return <TagList />;
+  return <FilteredTagList />;
 };
 
 const TagRoutes: React.FC = () => {
diff --git a/ui/v2.5/src/docs/en/Manual/UIPluginApi.md b/ui/v2.5/src/docs/en/Manual/UIPluginApi.md
index 4ff8b5143..68d5676d3 100644
--- a/ui/v2.5/src/docs/en/Manual/UIPluginApi.md
+++ b/ui/v2.5/src/docs/en/Manual/UIPluginApi.md
@@ -236,6 +236,7 @@ Returns `void`.
 - `FilteredSceneList`
 - `FilteredSceneMarkerList`
 - `FilteredStudioList`
+- `FilteredTagList`
 - `FolderSelect`
 - `FrontPage`
 - `GalleryCard`
@@ -353,6 +354,7 @@ Returns `void`.
 - `TagCardGrid`
 - `TagIDSelect`
 - `TagLink`
+- `TagList`
 - `TagRecommendationRow`
 - `TagSelect`
 - `TagSelect.sort`
diff --git a/ui/v2.5/src/pluginApi.d.ts b/ui/v2.5/src/pluginApi.d.ts
index 77627be10..e04d472b6 100644
--- a/ui/v2.5/src/pluginApi.d.ts
+++ b/ui/v2.5/src/pluginApi.d.ts
@@ -673,6 +673,7 @@ declare namespace PluginApi {
     FilteredSceneList: React.FC<any>;
     FilteredSceneMarkerList: React.FC<any>;
     FilteredStudioList: React.FC<any>;
+    FilteredTagList: React.FC<any>;
     FolderSelect: React.FC<any>;
     FrontPage: React.FC<any>;
     GalleryCard: React.FC<any>;

From d8448ba37ecf7749b4d75356b33be471ac6c8fdd Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Fri, 27 Feb 2026 10:58:11 +1100
Subject: [PATCH 323/405] Add basename and parent_folders fields to Folder
 graphql interface (#6494)

* Add basename field to folder
* Add parent_folders field to folder
* Add basename column to folder table
* Add basename filter field
* Create missing folder hierarchies during migration
* Treat files/folders in zips where path can't be made relative as not found

Addresses an issue during clean where corrupt folder entries in zip files could not be removed due to an error during the call to Rel.
---
 graphql/schema/types/file.graphql             |   3 +
 graphql/schema/types/filters.graphql          |   1 +
 internal/api/loaders/dataloaders.go           |  29 +-
 .../folderparentfolderidsloader_gen.go        | 225 ++++++++++++++
 internal/api/resolver_model_folder.go         |  16 +
 pkg/file/zip.go                               |   4 +-
 pkg/models/folder.go                          |   6 +-
 pkg/models/mocks/FolderReaderWriter.go        |  23 ++
 pkg/models/repository_folder.go               |   1 +
 pkg/sqlite/database.go                        |   2 +-
 pkg/sqlite/folder.go                          |  87 ++++++
 pkg/sqlite/folder_filter.go                   |   1 +
 pkg/sqlite/folder_filter_test.go              |  11 +
 pkg/sqlite/folder_test.go                     |  74 ++++-
 .../migrations/84_folder_basename.up.sql      |  50 +++
 pkg/sqlite/migrations/84_postmigrate.go       | 285 ++++++++++++++++++
 pkg/sqlite/setup_test.go                      |   9 +-
 17 files changed, 814 insertions(+), 13 deletions(-)
 create mode 100644 internal/api/loaders/folderparentfolderidsloader_gen.go
 create mode 100644 pkg/sqlite/migrations/84_folder_basename.up.sql
 create mode 100644 pkg/sqlite/migrations/84_postmigrate.go

diff --git a/graphql/schema/types/file.graphql b/graphql/schema/types/file.graphql
index 835479fad..37fb5539f 100644
--- a/graphql/schema/types/file.graphql
+++ b/graphql/schema/types/file.graphql
@@ -6,11 +6,14 @@ type Fingerprint {
 type Folder {
   id: ID!
   path: String!
+  basename: String!
 
   parent_folder_id: ID @deprecated(reason: "Use parent_folder instead")
   zip_file_id: ID @deprecated(reason: "Use zip_file instead")
 
   parent_folder: Folder
+  "Returns all parent folders in order from immediate parent to top-level"
+  parent_folders: [Folder!]!
   zip_file: BasicFile
 
   mod_time: Time!
diff --git a/graphql/schema/types/filters.graphql b/graphql/schema/types/filters.graphql
index d9814ef34..6eda473b4 100644
--- a/graphql/schema/types/filters.graphql
+++ b/graphql/schema/types/filters.graphql
@@ -822,6 +822,7 @@ input FolderFilterType {
   NOT: FolderFilterType
 
   path: StringCriterionInput
+  basename: StringCriterionInput
 
   parent_folder: HierarchicalMultiCriterionInput
   zip_file: MultiCriterionInput
diff --git a/internal/api/loaders/dataloaders.go b/internal/api/loaders/dataloaders.go
index dac8ba6b8..2ba650962 100644
--- a/internal/api/loaders/dataloaders.go
+++ b/internal/api/loaders/dataloaders.go
@@ -11,6 +11,7 @@
 //go:generate go run github.com/vektah/dataloaden GroupLoader int *github.com/stashapp/stash/pkg/models.Group
 //go:generate go run github.com/vektah/dataloaden FileLoader github.com/stashapp/stash/pkg/models.FileID github.com/stashapp/stash/pkg/models.File
 //go:generate go run github.com/vektah/dataloaden FolderLoader github.com/stashapp/stash/pkg/models.FolderID *github.com/stashapp/stash/pkg/models.Folder
+//go:generate go run github.com/vektah/dataloaden FolderParentFolderIDsLoader github.com/stashapp/stash/pkg/models.FolderID []github.com/stashapp/stash/pkg/models.FolderID
 //go:generate go run github.com/vektah/dataloaden SceneFileIDsLoader int []github.com/stashapp/stash/pkg/models.FileID
 //go:generate go run github.com/vektah/dataloaden ImageFileIDsLoader int []github.com/stashapp/stash/pkg/models.FileID
 //go:generate go run github.com/vektah/dataloaden GalleryFileIDsLoader int []github.com/stashapp/stash/pkg/models.FileID
@@ -65,12 +66,16 @@ type Loaders struct {
 	StudioByID         *StudioLoader
 	StudioCustomFields *CustomFieldsLoader
 
-	TagByID           *TagLoader
-	TagCustomFields   *CustomFieldsLoader
+	TagByID         *TagLoader
+	TagCustomFields *CustomFieldsLoader
+
 	GroupByID         *GroupLoader
 	GroupCustomFields *CustomFieldsLoader
-	FileByID          *FileLoader
-	FolderByID        *FolderLoader
+
+	FileByID *FileLoader
+
+	FolderByID            *FolderLoader
+	FolderParentFolderIDs *FolderParentFolderIDsLoader
 }
 
 type Middleware struct {
@@ -161,6 +166,11 @@ func (m Middleware) Middleware(next http.Handler) http.Handler {
 				maxBatch: maxBatch,
 				fetch:    m.fetchFolders(ctx),
 			},
+			FolderParentFolderIDs: &FolderParentFolderIDsLoader{
+				wait:     wait,
+				maxBatch: maxBatch,
+				fetch:    m.fetchFoldersParentFolderIDs(ctx),
+			},
 			SceneFiles: &SceneFileIDsLoader{
 				wait:     wait,
 				maxBatch: maxBatch,
@@ -406,6 +416,17 @@ func (m Middleware) fetchFolders(ctx context.Context) func(keys []models.FolderI
 	}
 }
 
+func (m Middleware) fetchFoldersParentFolderIDs(ctx context.Context) func(keys []models.FolderID) ([][]models.FolderID, []error) {
+	return func(keys []models.FolderID) (ret [][]models.FolderID, errs []error) {
+		err := m.Repository.WithDB(ctx, func(ctx context.Context) error {
+			var err error
+			ret, err = m.Repository.Folder.GetManyParentFolderIDs(ctx, keys)
+			return err
+		})
+		return ret, toErrorSlice(err)
+	}
+}
+
 func (m Middleware) fetchScenesFileIDs(ctx context.Context) func(keys []int) ([][]models.FileID, []error) {
 	return func(keys []int) (ret [][]models.FileID, errs []error) {
 		err := m.Repository.WithDB(ctx, func(ctx context.Context) error {
diff --git a/internal/api/loaders/folderparentfolderidsloader_gen.go b/internal/api/loaders/folderparentfolderidsloader_gen.go
new file mode 100644
index 000000000..c9eca3a3d
--- /dev/null
+++ b/internal/api/loaders/folderparentfolderidsloader_gen.go
@@ -0,0 +1,225 @@
+// Code generated by github.com/vektah/dataloaden, DO NOT EDIT.
+
+package loaders
+
+import (
+	"sync"
+	"time"
+
+	"github.com/stashapp/stash/pkg/models"
+)
+
+// FolderParentFolderIDsLoaderConfig captures the config to create a new FolderParentFolderIDsLoader
+type FolderParentFolderIDsLoaderConfig struct {
+	// Fetch is a method that provides the data for the loader
+	Fetch func(keys []models.FolderID) ([][]models.FolderID, []error)
+
+	// Wait is how long wait before sending a batch
+	Wait time.Duration
+
+	// MaxBatch will limit the maximum number of keys to send in one batch, 0 = not limit
+	MaxBatch int
+}
+
+// NewFolderParentFolderIDsLoader creates a new FolderParentFolderIDsLoader given a fetch, wait, and maxBatch
+func NewFolderParentFolderIDsLoader(config FolderParentFolderIDsLoaderConfig) *FolderParentFolderIDsLoader {
+	return &FolderParentFolderIDsLoader{
+		fetch:    config.Fetch,
+		wait:     config.Wait,
+		maxBatch: config.MaxBatch,
+	}
+}
+
+// FolderParentFolderIDsLoader batches and caches requests
+type FolderParentFolderIDsLoader struct {
+	// this method provides the data for the loader
+	fetch func(keys []models.FolderID) ([][]models.FolderID, []error)
+
+	// how long to done before sending a batch
+	wait time.Duration
+
+	// this will limit the maximum number of keys to send in one batch, 0 = no limit
+	maxBatch int
+
+	// INTERNAL
+
+	// lazily created cache
+	cache map[models.FolderID][]models.FolderID
+
+	// the current batch. keys will continue to be collected until timeout is hit,
+	// then everything will be sent to the fetch method and out to the listeners
+	batch *folderParentFolderIDsLoaderBatch
+
+	// mutex to prevent races
+	mu sync.Mutex
+}
+
+type folderParentFolderIDsLoaderBatch struct {
+	keys    []models.FolderID
+	data    [][]models.FolderID
+	error   []error
+	closing bool
+	done    chan struct{}
+}
+
+// Load a FolderID by key, batching and caching will be applied automatically
+func (l *FolderParentFolderIDsLoader) Load(key models.FolderID) ([]models.FolderID, error) {
+	return l.LoadThunk(key)()
+}
+
+// LoadThunk returns a function that when called will block waiting for a FolderID.
+// This method should be used if you want one goroutine to make requests to many
+// different data loaders without blocking until the thunk is called.
+func (l *FolderParentFolderIDsLoader) LoadThunk(key models.FolderID) func() ([]models.FolderID, error) {
+	l.mu.Lock()
+	if it, ok := l.cache[key]; ok {
+		l.mu.Unlock()
+		return func() ([]models.FolderID, error) {
+			return it, nil
+		}
+	}
+	if l.batch == nil {
+		l.batch = &folderParentFolderIDsLoaderBatch{done: make(chan struct{})}
+	}
+	batch := l.batch
+	pos := batch.keyIndex(l, key)
+	l.mu.Unlock()
+
+	return func() ([]models.FolderID, error) {
+		<-batch.done
+
+		var data []models.FolderID
+		if pos < len(batch.data) {
+			data = batch.data[pos]
+		}
+
+		var err error
+		// its convenient to be able to return a single error for everything
+		if len(batch.error) == 1 {
+			err = batch.error[0]
+		} else if batch.error != nil {
+			err = batch.error[pos]
+		}
+
+		if err == nil {
+			l.mu.Lock()
+			l.unsafeSet(key, data)
+			l.mu.Unlock()
+		}
+
+		return data, err
+	}
+}
+
+// LoadAll fetches many keys at once. It will be broken into appropriate sized
+// sub batches depending on how the loader is configured
+func (l *FolderParentFolderIDsLoader) LoadAll(keys []models.FolderID) ([][]models.FolderID, []error) {
+	results := make([]func() ([]models.FolderID, error), len(keys))
+
+	for i, key := range keys {
+		results[i] = l.LoadThunk(key)
+	}
+
+	folderIDs := make([][]models.FolderID, len(keys))
+	errors := make([]error, len(keys))
+	for i, thunk := range results {
+		folderIDs[i], errors[i] = thunk()
+	}
+	return folderIDs, errors
+}
+
+// LoadAllThunk returns a function that when called will block waiting for a FolderIDs.
+// This method should be used if you want one goroutine to make requests to many
+// different data loaders without blocking until the thunk is called.
+func (l *FolderParentFolderIDsLoader) LoadAllThunk(keys []models.FolderID) func() ([][]models.FolderID, []error) {
+	results := make([]func() ([]models.FolderID, error), len(keys))
+	for i, key := range keys {
+		results[i] = l.LoadThunk(key)
+	}
+	return func() ([][]models.FolderID, []error) {
+		folderIDs := make([][]models.FolderID, len(keys))
+		errors := make([]error, len(keys))
+		for i, thunk := range results {
+			folderIDs[i], errors[i] = thunk()
+		}
+		return folderIDs, errors
+	}
+}
+
+// Prime the cache with the provided key and value. If the key already exists, no change is made
+// and false is returned.
+// (To forcefully prime the cache, clear the key first with loader.clear(key).prime(key, value).)
+func (l *FolderParentFolderIDsLoader) Prime(key models.FolderID, value []models.FolderID) bool {
+	l.mu.Lock()
+	var found bool
+	if _, found = l.cache[key]; !found {
+		// make a copy when writing to the cache, its easy to pass a pointer in from a loop var
+		// and end up with the whole cache pointing to the same value.
+		cpy := make([]models.FolderID, len(value))
+		copy(cpy, value)
+		l.unsafeSet(key, cpy)
+	}
+	l.mu.Unlock()
+	return !found
+}
+
+// Clear the value at key from the cache, if it exists
+func (l *FolderParentFolderIDsLoader) Clear(key models.FolderID) {
+	l.mu.Lock()
+	delete(l.cache, key)
+	l.mu.Unlock()
+}
+
+func (l *FolderParentFolderIDsLoader) unsafeSet(key models.FolderID, value []models.FolderID) {
+	if l.cache == nil {
+		l.cache = map[models.FolderID][]models.FolderID{}
+	}
+	l.cache[key] = value
+}
+
+// keyIndex will return the location of the key in the batch, if its not found
+// it will add the key to the batch
+func (b *folderParentFolderIDsLoaderBatch) keyIndex(l *FolderParentFolderIDsLoader, key models.FolderID) int {
+	for i, existingKey := range b.keys {
+		if key == existingKey {
+			return i
+		}
+	}
+
+	pos := len(b.keys)
+	b.keys = append(b.keys, key)
+	if pos == 0 {
+		go b.startTimer(l)
+	}
+
+	if l.maxBatch != 0 && pos >= l.maxBatch-1 {
+		if !b.closing {
+			b.closing = true
+			l.batch = nil
+			go b.end(l)
+		}
+	}
+
+	return pos
+}
+
+func (b *folderParentFolderIDsLoaderBatch) startTimer(l *FolderParentFolderIDsLoader) {
+	time.Sleep(l.wait)
+	l.mu.Lock()
+
+	// we must have hit a batch limit and are already finalizing this batch
+	if b.closing {
+		l.mu.Unlock()
+		return
+	}
+
+	l.batch = nil
+	l.mu.Unlock()
+
+	b.end(l)
+}
+
+func (b *folderParentFolderIDsLoaderBatch) end(l *FolderParentFolderIDsLoader) {
+	b.data, b.error = l.fetch(b.keys)
+	close(b.done)
+}
diff --git a/internal/api/resolver_model_folder.go b/internal/api/resolver_model_folder.go
index ee6bbfd05..c203a3f82 100644
--- a/internal/api/resolver_model_folder.go
+++ b/internal/api/resolver_model_folder.go
@@ -2,11 +2,16 @@ package api
 
 import (
 	"context"
+	"path/filepath"
 
 	"github.com/stashapp/stash/internal/api/loaders"
 	"github.com/stashapp/stash/pkg/models"
 )
 
+func (r *folderResolver) Basename(ctx context.Context, obj *models.Folder) (string, error) {
+	return filepath.Base(obj.Path), nil
+}
+
 func (r *folderResolver) ParentFolder(ctx context.Context, obj *models.Folder) (*models.Folder, error) {
 	if obj.ParentFolderID == nil {
 		return nil, nil
@@ -15,6 +20,17 @@ func (r *folderResolver) ParentFolder(ctx context.Context, obj *models.Folder) (
 	return loaders.From(ctx).FolderByID.Load(*obj.ParentFolderID)
 }
 
+func (r *folderResolver) ParentFolders(ctx context.Context, obj *models.Folder) ([]*models.Folder, error) {
+	ids, err := loaders.From(ctx).FolderParentFolderIDs.Load(obj.ID)
+	if err != nil {
+		return nil, err
+	}
+
+	var errs []error
+	ret, errs := loaders.From(ctx).FolderByID.LoadAll(ids)
+	return ret, firstError(errs)
+}
+
 func (r *folderResolver) ZipFile(ctx context.Context, obj *models.Folder) (*BasicFile, error) {
 	return zipFileResolver(ctx, obj.ZipFileID)
 }
diff --git a/pkg/file/zip.go b/pkg/file/zip.go
index 5afcd5329..6d00c7e35 100644
--- a/pkg/file/zip.go
+++ b/pkg/file/zip.go
@@ -99,7 +99,9 @@ func (f *zipFS) rel(name string) (string, error) {
 
 	relName, err := filepath.Rel(f.zipPath, name)
 	if err != nil {
-		return "", fmt.Errorf("internal error getting relative path: %w", err)
+		// if the path is not relative to the zip path, then it's not found in the zip file,
+		// so treat this as a file not found
+		return "", fs.ErrNotExist
 	}
 
 	// convert relName to use slash, since zip files do so regardless
diff --git a/pkg/models/folder.go b/pkg/models/folder.go
index ada9e17b7..e9e9a3971 100644
--- a/pkg/models/folder.go
+++ b/pkg/models/folder.go
@@ -18,10 +18,8 @@ type FolderQueryOptions struct {
 type FolderFilterType struct {
 	OperatorFilter[FolderFilterType]
 
-	Path     *StringCriterionInput `json:"path,omitempty"`
-	Basename *StringCriterionInput `json:"basename,omitempty"`
-	// Filter by parent directory path
-	Dir          *StringCriterionInput            `json:"dir,omitempty"`
+	Path         *StringCriterionInput            `json:"path,omitempty"`
+	Basename     *StringCriterionInput            `json:"basename,omitempty"`
 	ParentFolder *HierarchicalMultiCriterionInput `json:"parent_folder,omitempty"`
 	ZipFile      *MultiCriterionInput             `json:"zip_file,omitempty"`
 	// Filter by modification time
diff --git a/pkg/models/mocks/FolderReaderWriter.go b/pkg/models/mocks/FolderReaderWriter.go
index 7bca013fe..5d4d95027 100644
--- a/pkg/models/mocks/FolderReaderWriter.go
+++ b/pkg/models/mocks/FolderReaderWriter.go
@@ -201,6 +201,29 @@ func (_m *FolderReaderWriter) FindMany(ctx context.Context, id []models.FolderID
 	return r0, r1
 }
 
+// GetManyParentFolderIDs provides a mock function with given fields: ctx, folderIDs
+func (_m *FolderReaderWriter) GetManyParentFolderIDs(ctx context.Context, folderIDs []models.FolderID) ([][]models.FolderID, error) {
+	ret := _m.Called(ctx, folderIDs)
+
+	var r0 [][]models.FolderID
+	if rf, ok := ret.Get(0).(func(context.Context, []models.FolderID) [][]models.FolderID); ok {
+		r0 = rf(ctx, folderIDs)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).([][]models.FolderID)
+		}
+	}
+
+	var r1 error
+	if rf, ok := ret.Get(1).(func(context.Context, []models.FolderID) error); ok {
+		r1 = rf(ctx, folderIDs)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
 // Query provides a mock function with given fields: ctx, options
 func (_m *FolderReaderWriter) Query(ctx context.Context, options models.FolderQueryOptions) (*models.FolderQueryResult, error) {
 	ret := _m.Called(ctx, options)
diff --git a/pkg/models/repository_folder.go b/pkg/models/repository_folder.go
index 3d0fdb822..539d51cb9 100644
--- a/pkg/models/repository_folder.go
+++ b/pkg/models/repository_folder.go
@@ -15,6 +15,7 @@ type FolderFinder interface {
 	FindByPath(ctx context.Context, path string, caseSensitive bool) (*Folder, error)
 	FindByZipFileID(ctx context.Context, zipFileID FileID) ([]*Folder, error)
 	FindByParentFolderID(ctx context.Context, parentFolderID FolderID) ([]*Folder, error)
+	GetManyParentFolderIDs(ctx context.Context, folderIDs []FolderID) ([][]FolderID, error)
 }
 
 type FolderQueryer interface {
diff --git a/pkg/sqlite/database.go b/pkg/sqlite/database.go
index 003c6eebc..f8c2cdef7 100644
--- a/pkg/sqlite/database.go
+++ b/pkg/sqlite/database.go
@@ -34,7 +34,7 @@ const (
 	cacheSizeEnv = "STASH_SQLITE_CACHE_SIZE"
 )
 
-var appSchemaVersion uint = 83
+var appSchemaVersion uint = 84
 
 //go:embed migrations/*.sql
 var migrationsBox embed.FS
diff --git a/pkg/sqlite/folder.go b/pkg/sqlite/folder.go
index f250f7861..73a065cff 100644
--- a/pkg/sqlite/folder.go
+++ b/pkg/sqlite/folder.go
@@ -20,6 +20,7 @@ const folderIDColumn = "folder_id"
 
 type folderRow struct {
 	ID             models.FolderID `db:"id" goqu:"skipinsert"`
+	Basename       string          `db:"basename"`
 	Path           string          `db:"path"`
 	ZipFileID      null.Int        `db:"zip_file_id"`
 	ParentFolderID null.Int        `db:"parent_folder_id"`
@@ -30,6 +31,8 @@ type folderRow struct {
 
 func (r *folderRow) fromFolder(o models.Folder) {
 	r.ID = o.ID
+	// derive basename from path
+	r.Basename = filepath.Base(o.Path)
 	r.Path = o.Path
 	r.ZipFileID = nullIntFromFileIDPtr(o.ZipFileID)
 	r.ParentFolderID = nullIntFromFolderIDPtr(o.ParentFolderID)
@@ -322,6 +325,90 @@ func (qb *FolderStore) FindByParentFolderID(ctx context.Context, parentFolderID
 	return ret, nil
 }
 
+func (qb *FolderStore) GetManyParentFolderIDs(ctx context.Context, folderIDs []models.FolderID) ([][]models.FolderID, error) {
+	table := qb.table()
+
+	// SQL recursive query to get all parent folder IDs for each folder ID
+	/*
+		WITH RECURSIVE parent_folders AS (
+		    SELECT id, parent_folder_id
+		    FROM folders
+		    WHERE id IN (folderIDs)
+
+		    UNION ALL
+
+		    SELECT f.id, f.parent_folder_id
+		    FROM folders f
+		    INNER JOIN parent_folders pf ON f.id = pf.parent_folder_id
+		)
+		SELECT id, parent_folder_id FROM parent_folders;
+	*/
+	const parentFolders = "parent_folders"
+	const parentFolderID = "parent_folder_id"
+	const parentID = "parent_id"
+	const foldersAlias = "f"
+
+	const parentFoldersAlias = "pf"
+	foldersAliasedI := table.As(foldersAlias)
+	parentFoldersI := goqu.T(parentFolders).As(parentFoldersAlias)
+
+	q := dialect.From(parentFolders).Prepared(true).
+		WithRecursive(parentFolders,
+			dialect.From(table).Select(table.Col(idColumn), table.Col(parentFolderID).As(parentID)).
+				Where(table.Col(idColumn).In(folderIDs)).
+				Union(
+					dialect.From(foldersAliasedI).InnerJoin(
+						parentFoldersI,
+						goqu.On(foldersAliasedI.Col(idColumn).Eq(parentFoldersI.Col(parentID))),
+					).Select(foldersAliasedI.Col(idColumn), foldersAliasedI.Col(parentFolderID).As(parentID)),
+				),
+		).Select(idColumn, parentID)
+
+	type resultRow struct {
+		FolderID       models.FolderID `db:"id"`
+		ParentFolderID null.Int        `db:"parent_id"`
+	}
+
+	folderMap := make(map[models.FolderID]models.FolderID)
+
+	if err := queryFunc(ctx, q, false, func(r *sqlx.Rows) error {
+		var row resultRow
+		if err := r.StructScan(&row); err != nil {
+			return err
+		}
+
+		if row.ParentFolderID.Valid {
+			folderMap[row.FolderID] = models.FolderID(row.ParentFolderID.Int64)
+		} else {
+			folderMap[row.FolderID] = 0
+		}
+
+		return nil
+	}); err != nil {
+		return nil, err
+	}
+
+	ret := make([][]models.FolderID, len(folderIDs))
+
+	for i, folderID := range folderIDs {
+		var parents []models.FolderID
+		currentID := folderID
+
+		for {
+			parentID, exists := folderMap[currentID]
+			if !exists || parentID == 0 {
+				break
+			}
+			parents = append(parents, parentID)
+			currentID = parentID
+		}
+
+		ret[i] = parents
+	}
+
+	return ret, nil
+}
+
 func (qb *FolderStore) allInPaths(q *goqu.SelectDataset, p []string) *goqu.SelectDataset {
 	table := qb.table()
 
diff --git a/pkg/sqlite/folder_filter.go b/pkg/sqlite/folder_filter.go
index 6b2bd96e9..e0145bcca 100644
--- a/pkg/sqlite/folder_filter.go
+++ b/pkg/sqlite/folder_filter.go
@@ -65,6 +65,7 @@ func (qb *folderFilterHandler) criterionHandler() criterionHandler {
 	folderFilter := qb.folderFilter
 	return compoundHandler{
 		stringCriterionHandler(folderFilter.Path, qb.table.Col("path")),
+		stringCriterionHandler(folderFilter.Basename, qb.table.Col("basename")),
 		&timestampCriterionHandler{folderFilter.ModTime, qb.table.Col("mod_time"), nil},
 
 		qb.parentFolderCriterionHandler(folderFilter.ParentFolder),
diff --git a/pkg/sqlite/folder_filter_test.go b/pkg/sqlite/folder_filter_test.go
index c1c7d7a37..c08208f30 100644
--- a/pkg/sqlite/folder_filter_test.go
+++ b/pkg/sqlite/folder_filter_test.go
@@ -33,6 +33,17 @@ func TestFolderQuery(t *testing.T) {
 			includeIdxs: []int{folderIdxWithSubFolder, folderIdxWithParentFolder},
 			excludeIdxs: []int{folderIdxInZip},
 		},
+		{
+			name: "basename",
+			filter: &models.FolderFilterType{
+				Basename: &models.StringCriterionInput{
+					Value:    getFolderBasename(folderIdxWithParentFolder, nil),
+					Modifier: models.CriterionModifierIncludes,
+				},
+			},
+			includeIdxs: []int{folderIdxWithParentFolder},
+			excludeIdxs: []int{folderIdxInZip},
+		},
 		{
 			name: "parent folder",
 			filter: &models.FolderFilterType{
diff --git a/pkg/sqlite/folder_test.go b/pkg/sqlite/folder_test.go
index 15b2b96b8..072a1167f 100644
--- a/pkg/sqlite/folder_test.go
+++ b/pkg/sqlite/folder_test.go
@@ -186,8 +186,6 @@ func Test_FolderStore_Update(t *testing.T) {
 			}
 
 			assert.Equal(copy, *s)
-
-			return
 		})
 	}
 }
@@ -239,3 +237,75 @@ func Test_FolderStore_FindByPath(t *testing.T) {
 		})
 	}
 }
+
+func Test_FolderStore_GetManyParentFolderIDs(t *testing.T) {
+	var empty []models.FolderID
+	emptyResult := [][]models.FolderID{empty}
+	tests := []struct {
+		name            string
+		parentFolderIDs []models.FolderID
+		want            [][]models.FolderID
+		wantErr         bool
+	}{
+		{
+			"valid with parent folders",
+			[]models.FolderID{folderIDs[folderIdxWithParentFolder]},
+			[][]models.FolderID{
+				{
+					folderIDs[folderIdxWithSubFolder],
+					folderIDs[folderIdxRoot],
+				},
+			},
+			false,
+		},
+		{
+			"valid multiple folders",
+			[]models.FolderID{
+				folderIDs[folderIdxWithParentFolder],
+				folderIDs[folderIdxWithSceneFiles],
+			},
+			[][]models.FolderID{
+				{
+					folderIDs[folderIdxWithSubFolder],
+					folderIDs[folderIdxRoot],
+				},
+				{
+					folderIDs[folderIdxForObjectFiles],
+					folderIDs[folderIdxRoot],
+				},
+			},
+			false,
+		},
+		{
+			"valid without parent folders",
+			[]models.FolderID{folderIDs[folderIdxRoot]},
+			emptyResult,
+			false,
+		},
+		{
+			"invalid folder id",
+			[]models.FolderID{invalidFolderID},
+			emptyResult,
+			// does not error, just returns empty result
+			false,
+		},
+	}
+
+	qb := db.Folder
+
+	for _, tt := range tests {
+		runWithRollbackTxn(t, tt.name, func(t *testing.T, ctx context.Context) {
+			assert := assert.New(t)
+			got, err := qb.GetManyParentFolderIDs(ctx, tt.parentFolderIDs)
+			if (err != nil) != tt.wantErr {
+				assert.Errorf(err, "FolderStore.GetManyParentFolderIDs() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			if tt.wantErr {
+				return
+			}
+
+			assert.Equal(got, tt.want)
+		})
+	}
+}
diff --git a/pkg/sqlite/migrations/84_folder_basename.up.sql b/pkg/sqlite/migrations/84_folder_basename.up.sql
new file mode 100644
index 000000000..5cfd5c2d9
--- /dev/null
+++ b/pkg/sqlite/migrations/84_folder_basename.up.sql
@@ -0,0 +1,50 @@
+-- we cannot add basename column directly because we require it to be NOT NULL
+-- recreate folders table with basename column
+PRAGMA foreign_keys=OFF;
+
+CREATE TABLE `folders_new` (
+  `id` integer not null primary key autoincrement,
+  `basename` varchar(255) NOT NULL,
+  `path` varchar(255) NOT NULL,
+  `parent_folder_id` integer,
+  `zip_file_id` integer REFERENCES `files`(`id`),
+  `mod_time` datetime not null,
+  `created_at` datetime not null,
+  `updated_at` datetime not null,
+  foreign key(`parent_folder_id`) references `folders`(`id`) on delete SET NULL
+);
+
+-- copy data from old table to new table, setting basename to path temporarily
+INSERT INTO `folders_new` (
+    `id`, 
+    `basename`, 
+    `path`, 
+    `parent_folder_id`, 
+    `zip_file_id`,
+    `mod_time`, 
+    `created_at`, 
+    `updated_at`
+) SELECT 
+    `id`, 
+    `path`, 
+    `path`, 
+    `parent_folder_id`, 
+    `zip_file_id`,
+    `mod_time`, 
+    `created_at`, 
+    `updated_at`
+FROM `folders`;
+
+DROP INDEX IF EXISTS `index_folders_on_parent_folder_id`;
+DROP INDEX IF EXISTS `index_folders_on_path_unique`;
+DROP INDEX IF EXISTS `index_folders_on_zip_file_id`;
+DROP TABLE `folders`;
+
+ALTER TABLE `folders_new` RENAME TO `folders`;
+
+CREATE UNIQUE INDEX `index_folders_on_path_unique` on `folders` (`path`);
+CREATE UNIQUE INDEX `index_folders_on_parent_folder_id_basename_unique` on `folders` (`parent_folder_id`, `basename`);
+CREATE INDEX `index_folders_on_zip_file_id` on `folders` (`zip_file_id`) WHERE `zip_file_id` IS NOT NULL;
+CREATE INDEX `index_folders_on_basename` on `folders` (`basename`);
+
+PRAGMA foreign_keys=ON;
\ No newline at end of file
diff --git a/pkg/sqlite/migrations/84_postmigrate.go b/pkg/sqlite/migrations/84_postmigrate.go
new file mode 100644
index 000000000..71b0feeb0
--- /dev/null
+++ b/pkg/sqlite/migrations/84_postmigrate.go
@@ -0,0 +1,285 @@
+package migrations
+
+import (
+	"context"
+	"database/sql"
+	"errors"
+	"fmt"
+	"path/filepath"
+	"slices"
+	"time"
+
+	"github.com/jmoiron/sqlx"
+	"github.com/stashapp/stash/internal/manager/config"
+	"github.com/stashapp/stash/pkg/logger"
+	"github.com/stashapp/stash/pkg/sqlite"
+	"gopkg.in/guregu/null.v4"
+)
+
+func post84(ctx context.Context, db *sqlx.DB) error {
+	logger.Info("Running post-migration for schema version 76")
+
+	m := schema84Migrator{
+		migrator: migrator{
+			db: db,
+		},
+		folderCache: make(map[string]folderInfo),
+	}
+
+	rootPaths := config.GetInstance().GetStashPaths().Paths()
+
+	if err := m.createMissingFolderHierarchies(ctx, rootPaths); err != nil {
+		return fmt.Errorf("creating missing folder hierarchies: %w", err)
+	}
+
+	if err := m.migrateFolders(ctx); err != nil {
+		return fmt.Errorf("migrating folders: %w", err)
+	}
+
+	return nil
+}
+
+type schema84Migrator struct {
+	migrator
+	folderCache map[string]folderInfo
+}
+
+func (m *schema84Migrator) createMissingFolderHierarchies(ctx context.Context, rootPaths []string) error {
+	// before we set the basenames, we need to address any folders that are missing their
+	// parent folders.
+	const (
+		limit    = 1000
+		logEvery = 10000
+	)
+
+	lastID := 0
+	count := 0
+	logged := false
+
+	for {
+		gotSome := false
+
+		if err := m.withTxn(ctx, func(tx *sqlx.Tx) error {
+			query := "SELECT `folders`.`id`, `folders`.`path` FROM `folders` WHERE `folders`.`parent_folder_id` IS NULL "
+
+			if lastID != 0 {
+				query += fmt.Sprintf("AND `folders`.`id` > %d ", lastID)
+			}
+
+			query += fmt.Sprintf("ORDER BY `folders`.`id` LIMIT %d", limit)
+
+			rows, err := tx.Query(query)
+			if err != nil {
+				return err
+			}
+			defer rows.Close()
+
+			for rows.Next() {
+				// log once if we find any folders with missing parent folders
+				if !logged {
+					logger.Info("Migrating folders with missing parents...")
+					logged = true
+				}
+
+				var id int
+				var p string
+
+				err := rows.Scan(&id, &p)
+				if err != nil {
+					return err
+				}
+
+				lastID = id
+				gotSome = true
+				count++
+
+				// don't try to create parent folders for root paths
+				if slices.Contains(rootPaths, p) {
+					continue
+				}
+
+				parentDir := filepath.Dir(p)
+				if parentDir == p {
+					// this can happen if the path is something like "C:\", where the parent directory is the same as the current directory
+					continue
+				}
+
+				parentID, err := m.getOrCreateFolderHierarchy(tx, parentDir, rootPaths)
+				if err != nil {
+					return fmt.Errorf("error creating parent folder for folder %d %q: %w", id, p, err)
+				}
+
+				if parentID == nil {
+					continue
+				}
+
+				// now set the parent folder ID for the current folder
+				logger.Debugf("Migrating folder %d %q: setting parent folder ID to %d", id, p, *parentID)
+
+				_, err = tx.Exec("UPDATE `folders` SET `parent_folder_id` = ? WHERE `id` = ?", *parentID, id)
+				if err != nil {
+					return fmt.Errorf("error setting parent folder for folder %d %q: %w", id, p, err)
+				}
+			}
+
+			return rows.Err()
+		}); err != nil {
+			return err
+		}
+
+		if !gotSome {
+			break
+		}
+
+		if count%logEvery == 0 {
+			logger.Infof("Migrated %d folders", count)
+		}
+	}
+
+	return nil
+}
+
+func (m *schema84Migrator) findFolderByPath(tx *sqlx.Tx, path string) (*int, error) {
+	query := "SELECT `folders`.`id` FROM `folders` WHERE `folders`.`path` = ?"
+
+	var id int
+	if err := tx.Get(&id, query, path); err != nil {
+		if errors.Is(err, sql.ErrNoRows) {
+			return nil, nil
+		}
+
+		return nil, err
+	}
+
+	return &id, nil
+}
+
+// this is a copy of the GetOrCreateFolderHierarchy function from pkg/file/folder.go,
+// but modified to use low-level SQL queries instead of the models.FolderFinderCreator interface, to avoid
+func (m *schema84Migrator) getOrCreateFolderHierarchy(tx *sqlx.Tx, path string, rootPaths []string) (*int, error) {
+	// get or create folder hierarchy
+	folderID, err := m.findFolderByPath(tx, path)
+	if err != nil {
+		return nil, err
+	}
+
+	if folderID == nil {
+		var parentID *int
+
+		if !slices.Contains(rootPaths, path) {
+			parentPath := filepath.Dir(path)
+
+			// it's possible that the parent path is the same as the current path, if there are folders outside
+			// of the root paths. In that case, we should just return nil for the parent ID.
+			if parentPath == path {
+				return nil, nil
+			}
+
+			parentID, err = m.getOrCreateFolderHierarchy(tx, parentPath, rootPaths)
+			if err != nil {
+				return nil, err
+			}
+		}
+
+		logger.Debugf("%s doesn't exist. Creating new folder entry...", path)
+
+		// we need to set basename to path, which will be addressed in the next step
+		const insertSQL = "INSERT INTO `folders` (`path`,`basename`,`parent_folder_id`,`mod_time`,`created_at`,`updated_at`) VALUES (?,?,?,?,?,?)"
+
+		var parentFolderID null.Int
+		if parentID != nil {
+			parentFolderID = null.IntFrom(int64(*parentID))
+		}
+
+		now := time.Now()
+		result, err := tx.Exec(insertSQL, path, path, parentFolderID, time.Time{}, now, now)
+		if err != nil {
+			return nil, fmt.Errorf("creating folder %s: %w", path, err)
+		}
+
+		id, err := result.LastInsertId()
+		if err != nil {
+			return nil, fmt.Errorf("creating folder %s: %w", path, err)
+		}
+
+		idInt := int(id)
+		folderID = &idInt
+	}
+
+	return folderID, nil
+}
+
+func (m *schema84Migrator) migrateFolders(ctx context.Context) error {
+	const (
+		limit    = 1000
+		logEvery = 10000
+	)
+
+	lastID := 0
+	count := 0
+	logged := false
+
+	for {
+		gotSome := false
+
+		if err := m.withTxn(ctx, func(tx *sqlx.Tx) error {
+			query := "SELECT `folders`.`id`, `folders`.`path` FROM `folders` "
+
+			if lastID != 0 {
+				query += fmt.Sprintf("WHERE `folders`.`id` > %d ", lastID)
+			}
+
+			query += fmt.Sprintf("ORDER BY `folders`.`id` LIMIT %d", limit)
+
+			rows, err := tx.Query(query)
+			if err != nil {
+				return err
+			}
+			defer rows.Close()
+
+			for rows.Next() {
+				if !logged {
+					logger.Infof("Migrating folders to set basenames...")
+					logged = true
+				}
+
+				var id int
+				var p string
+
+				err := rows.Scan(&id, &p)
+				if err != nil {
+					return err
+				}
+
+				lastID = id
+				gotSome = true
+				count++
+
+				basename := filepath.Base(p)
+				logger.Debugf("Migrating folder %d %q: setting basename to %q", id, p, basename)
+				_, err = tx.Exec("UPDATE `folders` SET `basename` = ? WHERE `id` = ?", basename, id)
+				if err != nil {
+					return fmt.Errorf("error migrating folder %d %q: %w", id, p, err)
+				}
+			}
+
+			return rows.Err()
+		}); err != nil {
+			return err
+		}
+
+		if !gotSome {
+			break
+		}
+
+		if count%logEvery == 0 {
+			logger.Infof("Migrated %d folders", count)
+		}
+	}
+
+	return nil
+}
+
+func init() {
+	sqlite.RegisterPostMigration(84, post84)
+}
diff --git a/pkg/sqlite/setup_test.go b/pkg/sqlite/setup_test.go
index 2848a0a14..d8baae3b8 100644
--- a/pkg/sqlite/setup_test.go
+++ b/pkg/sqlite/setup_test.go
@@ -31,7 +31,8 @@ const (
 )
 
 const (
-	folderIdxWithSubFolder = iota
+	folderIdxRoot = iota
+	folderIdxWithSubFolder
 	folderIdxWithParentFolder
 	folderIdxWithFiles
 	folderIdxInZip
@@ -359,6 +360,8 @@ func (m linkMap) reverseLookup(idx int) []int {
 
 var (
 	folderParentFolders = map[int]int{
+		folderIdxWithSubFolder:    folderIdxRoot,
+		folderIdxForObjectFiles:   folderIdxRoot,
 		folderIdxWithParentFolder: folderIdxWithSubFolder,
 		folderIdxWithSceneFiles:   folderIdxForObjectFiles,
 		folderIdxWithImageFiles:   folderIdxForObjectFiles,
@@ -785,6 +788,10 @@ func getFolderPath(index int, parentFolderIdx *int) string {
 	return path
 }
 
+func getFolderBasename(index int, parentFolderIdx *int) string {
+	return filepath.Base(getFolderPath(index, parentFolderIdx))
+}
+
 func getFolderModTime(index int) time.Time {
 	return time.Date(2000, 1, (index%10)+1, 0, 0, 0, 0, time.UTC)
 }

From 3b8f6bd94c4f9efddd5f517ee9a0f1b22b285abd Mon Sep 17 00:00:00 2001
From: Gykes <24581046+Gykes@users.noreply.github.com>
Date: Fri, 27 Feb 2026 14:11:13 -0800
Subject: [PATCH 324/405] update logs and fix UNIQUE constraint failure (#6617)

---
 pkg/sqlite/migrations/84_postmigrate.go | 102 +++++++++++++++++++++++-
 1 file changed, 101 insertions(+), 1 deletion(-)

diff --git a/pkg/sqlite/migrations/84_postmigrate.go b/pkg/sqlite/migrations/84_postmigrate.go
index 71b0feeb0..3be0dd22e 100644
--- a/pkg/sqlite/migrations/84_postmigrate.go
+++ b/pkg/sqlite/migrations/84_postmigrate.go
@@ -17,7 +17,7 @@ import (
 )
 
 func post84(ctx context.Context, db *sqlx.DB) error {
-	logger.Info("Running post-migration for schema version 76")
+	logger.Info("Running post-migration for schema version 84")
 
 	m := schema84Migrator{
 		migrator: migrator{
@@ -32,6 +32,10 @@ func post84(ctx context.Context, db *sqlx.DB) error {
 		return fmt.Errorf("creating missing folder hierarchies: %w", err)
 	}
 
+	if err := m.fixIncorrectParents(ctx, rootPaths); err != nil {
+		return fmt.Errorf("fixing incorrect parent folders: %w", err)
+	}
+
 	if err := m.migrateFolders(ctx); err != nil {
 		return fmt.Errorf("migrating folders: %w", err)
 	}
@@ -209,6 +213,102 @@ func (m *schema84Migrator) getOrCreateFolderHierarchy(tx *sqlx.Tx, path string,
 	return folderID, nil
 }
 
+func (m *schema84Migrator) fixIncorrectParents(ctx context.Context, rootPaths []string) error {
+	const (
+		limit    = 1000
+		logEvery = 10000
+	)
+
+	lastID := 0
+	count := 0
+	fixed := 0
+	logged := false
+
+	for {
+		gotSome := false
+
+		if err := m.withTxn(ctx, func(tx *sqlx.Tx) error {
+			query := "SELECT f.id, f.path, f.parent_folder_id, pf.path AS parent_path " +
+				"FROM folders f " +
+				"JOIN folders pf ON f.parent_folder_id = pf.id "
+
+			if lastID != 0 {
+				query += fmt.Sprintf("WHERE f.id > %d ", lastID)
+			}
+
+			query += fmt.Sprintf("ORDER BY f.id LIMIT %d", limit)
+
+			rows, err := tx.Query(query)
+			if err != nil {
+				return err
+			}
+			defer rows.Close()
+
+			for rows.Next() {
+				var id int
+				var p string
+				var parentFolderID int
+				var parentPath string
+
+				err := rows.Scan(&id, &p, &parentFolderID, &parentPath)
+				if err != nil {
+					return err
+				}
+
+				lastID = id
+				gotSome = true
+				count++
+
+				expectedParent := filepath.Dir(p)
+				if expectedParent == parentPath {
+					continue
+				}
+
+				if !logged {
+					logger.Info("Fixing folders with incorrect parent folder assignments...")
+					logged = true
+				}
+
+				correctParentID, err := m.getOrCreateFolderHierarchy(tx, expectedParent, rootPaths)
+				if err != nil {
+					return fmt.Errorf("error getting/creating correct parent for folder %d %q: %w", id, p, err)
+				}
+
+				if correctParentID == nil {
+					continue
+				}
+
+				logger.Debugf("Fixing folder %d %q: changing parent_folder_id from %d to %d", id, p, parentFolderID, *correctParentID)
+
+				_, err = tx.Exec("UPDATE `folders` SET `parent_folder_id` = ? WHERE `id` = ?", *correctParentID, id)
+				if err != nil {
+					return fmt.Errorf("error fixing parent folder for folder %d %q: %w", id, p, err)
+				}
+
+				fixed++
+			}
+
+			return rows.Err()
+		}); err != nil {
+			return err
+		}
+
+		if !gotSome {
+			break
+		}
+
+		if count%logEvery == 0 {
+			logger.Infof("Checked %d folders", count)
+		}
+	}
+
+	if fixed > 0 {
+		logger.Infof("Fixed %d folders with incorrect parent assignments", fixed)
+	}
+
+	return nil
+}
+
 func (m *schema84Migrator) migrateFolders(ctx context.Context) error {
 	const (
 		limit    = 1000

From c7e1c3da69bf51ea39e54836b080fcf487bfac06 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Sat, 28 Feb 2026 10:51:02 +1100
Subject: [PATCH 325/405] Fix panic when library path has trailing path
 separator (#6619)

* Replace panic with warning if creating a folder hierarchy where parent is equal to current
* Clean stash paths so that comparison works correctly when creating folder hierarchies
---
 internal/manager/config/stash_config.go | 3 ++-
 pkg/file/folder.go                      | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/internal/manager/config/stash_config.go b/internal/manager/config/stash_config.go
index 3854c707b..7a103631c 100644
--- a/internal/manager/config/stash_config.go
+++ b/internal/manager/config/stash_config.go
@@ -42,7 +42,8 @@ func (s StashConfigs) GetStashFromDirPath(dirPath string) *StashConfig {
 func (s StashConfigs) Paths() []string {
 	paths := make([]string, len(s))
 	for i, c := range s {
-		paths[i] = c.Path
+		// #6618 - clean the path to ensure comparison works correctly
+		paths[i] = filepath.Clean(c.Path)
 	}
 	return paths
 }
diff --git a/pkg/file/folder.go b/pkg/file/folder.go
index e3e14186b..249f73a7a 100644
--- a/pkg/file/folder.go
+++ b/pkg/file/folder.go
@@ -33,7 +33,10 @@ func GetOrCreateFolderHierarchy(ctx context.Context, fc models.FolderFinderCreat
 			// safety check - don't allow parent path to be the same as the current path,
 			// otherwise we could end up in an infinite loop
 			if parentPath == path {
-				panic(fmt.Sprintf("parent path is the same as the current path: %s", path))
+				// #6618 - log a warning and return nil for the parent ID,
+				// which will cause the folder to be created with no parent
+				logger.Warnf("parent path is the same as the current path: %s", path)
+				return nil, nil
 			}
 
 			parent, err := GetOrCreateFolderHierarchy(ctx, fc, parentPath, rootPaths)

From c874bd560e24692d11585aff3b1397b09e8d1a4c Mon Sep 17 00:00:00 2001
From: Gykes <24581046+Gykes@users.noreply.github.com>
Date: Fri, 27 Feb 2026 16:05:13 -0800
Subject: [PATCH 326/405] Fix: Custom Field Filtering (#6614)

* add tests
* Refactor queryBuilder: split args into per-clause fields
---
 pkg/sqlite/criterion_handlers.go |  2 +-
 pkg/sqlite/file.go               |  2 +-
 pkg/sqlite/folder.go             |  2 +-
 pkg/sqlite/image.go              |  2 +-
 pkg/sqlite/query.go              | 38 +++++++++++++-------
 pkg/sqlite/scene.go              |  2 +-
 pkg/sqlite/tag_test.go           | 59 ++++++++++++++++++++++++++++++++
 7 files changed, 89 insertions(+), 18 deletions(-)

diff --git a/pkg/sqlite/criterion_handlers.go b/pkg/sqlite/criterion_handlers.go
index 943704cfe..ae245f1b5 100644
--- a/pkg/sqlite/criterion_handlers.go
+++ b/pkg/sqlite/criterion_handlers.go
@@ -1129,7 +1129,7 @@ func (h *relatedFilterHandler) handle(ctx context.Context, f *filterBuilder) {
 		return
 	}
 
-	f.addWhere(fmt.Sprintf("%s IN ("+subQuery.toSQL(false)+")", h.relatedIDCol), subQuery.args...)
+	f.addWhere(fmt.Sprintf("%s IN ("+subQuery.toSQL(false)+")", h.relatedIDCol), subQuery.allArgs()...)
 }
 
 type phashDistanceCriterionHandler struct {
diff --git a/pkg/sqlite/file.go b/pkg/sqlite/file.go
index 1be5648b4..ba925a448 100644
--- a/pkg/sqlite/file.go
+++ b/pkg/sqlite/file.go
@@ -975,7 +975,7 @@ func (qb *FileStore) queryGroupedFields(ctx context.Context, options models.File
 		Megapixels float64
 		Size       int64
 	}{}
-	if err := qb.repository.queryStruct(ctx, aggregateQuery.toSQL(includeSortPagination), query.args, &out); err != nil {
+	if err := qb.repository.queryStruct(ctx, aggregateQuery.toSQL(includeSortPagination), query.allArgs(), &out); err != nil {
 		return nil, err
 	}
 
diff --git a/pkg/sqlite/folder.go b/pkg/sqlite/folder.go
index 73a065cff..fdeb00913 100644
--- a/pkg/sqlite/folder.go
+++ b/pkg/sqlite/folder.go
@@ -600,7 +600,7 @@ func (qb *FolderStore) queryGroupedFields(ctx context.Context, options models.Fo
 		Megapixels float64
 		Size       int64
 	}{}
-	if err := qb.repository.queryStruct(ctx, aggregateQuery.toSQL(includeSortPagination), query.args, &out); err != nil {
+	if err := qb.repository.queryStruct(ctx, aggregateQuery.toSQL(includeSortPagination), query.allArgs(), &out); err != nil {
 		return nil, err
 	}
 
diff --git a/pkg/sqlite/image.go b/pkg/sqlite/image.go
index da1c67a10..b92a1c073 100644
--- a/pkg/sqlite/image.go
+++ b/pkg/sqlite/image.go
@@ -926,7 +926,7 @@ func (qb *ImageStore) queryGroupedFields(ctx context.Context, options models.Ima
 		Megapixels null.Float
 		Size       null.Float
 	}{}
-	if err := imageRepository.queryStruct(ctx, aggregateQuery.toSQL(includeSortPagination), query.args, &out); err != nil {
+	if err := imageRepository.queryStruct(ctx, aggregateQuery.toSQL(includeSortPagination), query.allArgs(), &out); err != nil {
 		return nil, err
 	}
 
diff --git a/pkg/sqlite/query.go b/pkg/sqlite/query.go
index 99c1f4e5f..80c7fcd40 100644
--- a/pkg/sqlite/query.go
+++ b/pkg/sqlite/query.go
@@ -17,13 +17,26 @@ type queryBuilder struct {
 	joins         joins
 	whereClauses  []string
 	havingClauses []string
-	args          []interface{}
 	withClauses   []string
 	recursiveWith bool
 
+	withArgs   []interface{}
+	joinArgs   []interface{}
+	whereArgs  []interface{}
+	havingArgs []interface{}
+
 	sortAndPagination string
 }
 
+func (qb queryBuilder) allArgs() []interface{} {
+	var args []interface{}
+	args = append(args, qb.withArgs...)
+	args = append(args, qb.joinArgs...)
+	args = append(args, qb.whereArgs...)
+	args = append(args, qb.havingArgs...)
+	return args
+}
+
 func (qb queryBuilder) body(includeSortPagination bool) string {
 	return fmt.Sprintf("SELECT %s FROM %s%s", strings.Join(qb.columns, ", "), qb.from, qb.joins.toSQL(includeSortPagination))
 }
@@ -55,13 +68,13 @@ func (qb queryBuilder) toSQL(includeSortPagination bool) string {
 func (qb queryBuilder) findIDs(ctx context.Context) ([]int, error) {
 	const includeSortPagination = true
 	sql := qb.toSQL(includeSortPagination)
-	return qb.repository.runIdsQuery(ctx, sql, qb.args)
+	return qb.repository.runIdsQuery(ctx, sql, qb.allArgs())
 }
 
 func (qb queryBuilder) executeFind(ctx context.Context) ([]int, int, error) {
 	const includeSortPagination = true
 	body := qb.body(includeSortPagination)
-	return qb.repository.executeFindQuery(ctx, body, qb.args, qb.sortAndPagination, qb.whereClauses, qb.havingClauses, qb.withClauses, qb.recursiveWith)
+	return qb.repository.executeFindQuery(ctx, body, qb.allArgs(), qb.sortAndPagination, qb.whereClauses, qb.havingClauses, qb.withClauses, qb.recursiveWith)
 }
 
 func (qb queryBuilder) executeCount(ctx context.Context) (int, error) {
@@ -79,7 +92,7 @@ func (qb queryBuilder) executeCount(ctx context.Context) (int, error) {
 
 	body = qb.repository.buildQueryBody(body, qb.whereClauses, qb.havingClauses)
 	countQuery := withClause + qb.repository.buildCountQuery(body)
-	return qb.repository.runCountQuery(ctx, countQuery, qb.args)
+	return qb.repository.runCountQuery(ctx, countQuery, qb.allArgs())
 }
 
 func (qb *queryBuilder) addWhere(clauses ...string) {
@@ -109,7 +122,11 @@ func (qb *queryBuilder) addWith(recursive bool, clauses ...string) {
 }
 
 func (qb *queryBuilder) addArg(args ...interface{}) {
-	qb.args = append(qb.args, args...)
+	qb.whereArgs = append(qb.whereArgs, args...)
+}
+
+func (qb *queryBuilder) addHavingArg(args ...interface{}) {
+	qb.havingArgs = append(qb.havingArgs, args...)
 }
 
 func (qb *queryBuilder) hasJoin(alias string) bool {
@@ -148,7 +165,7 @@ func (qb *queryBuilder) joinSort(table, as, onClause string) {
 func (qb *queryBuilder) addJoins(joins ...join) {
 	for _, j := range joins {
 		if qb.joins.addUnique(j) {
-			qb.args = append(qb.args, j.args...)
+			qb.joinArgs = append(qb.joinArgs, j.args...)
 		}
 	}
 }
@@ -163,20 +180,16 @@ func (qb *queryBuilder) addFilter(f *filterBuilder) error {
 	if len(clause) > 0 {
 		qb.addWith(f.recursiveWith, clause)
 	}
-
 	if len(args) > 0 {
-		// WITH clause always comes first and thus precedes alk args
-		qb.args = append(args, qb.args...)
+		qb.withArgs = append(qb.withArgs, args...)
 	}
 
-	// add joins here to insert args
 	qb.addJoins(f.getAllJoins()...)
 
 	clause, args = f.generateWhereClauses()
 	if len(clause) > 0 {
 		qb.addWhere(clause)
 	}
-
 	if len(args) > 0 {
 		qb.addArg(args...)
 	}
@@ -185,9 +198,8 @@ func (qb *queryBuilder) addFilter(f *filterBuilder) error {
 	if len(clause) > 0 {
 		qb.addHaving(clause)
 	}
-
 	if len(args) > 0 {
-		qb.addArg(args...)
+		qb.addHavingArg(args...)
 	}
 
 	return nil
diff --git a/pkg/sqlite/scene.go b/pkg/sqlite/scene.go
index 3049681b2..c2093431d 100644
--- a/pkg/sqlite/scene.go
+++ b/pkg/sqlite/scene.go
@@ -1097,7 +1097,7 @@ func (qb *SceneStore) queryGroupedFields(ctx context.Context, options models.Sce
 		Duration null.Float
 		Size     null.Float
 	}{}
-	if err := sceneRepository.queryStruct(ctx, aggregateQuery.toSQL(includeSortPagination), query.args, &out); err != nil {
+	if err := sceneRepository.queryStruct(ctx, aggregateQuery.toSQL(includeSortPagination), query.allArgs(), &out); err != nil {
 		return nil, err
 	}
 
diff --git a/pkg/sqlite/tag_test.go b/pkg/sqlite/tag_test.go
index b673de3f9..179969fd6 100644
--- a/pkg/sqlite/tag_test.go
+++ b/pkg/sqlite/tag_test.go
@@ -1889,6 +1889,65 @@ func TestTagQueryCustomFields(t *testing.T) {
 			}
 		})
 	}
+
+	// Test combining text search (findFilter.Q) with custom field filters.
+	// This verifies that positional args are bound in the correct order
+	// when JOINs (from custom fields) and WHERE (from text search) both
+	// have parameterized placeholders.
+	runWithRollbackTxn(t, "equals with text search", func(t *testing.T, ctx context.Context) {
+		assert := assert.New(t)
+
+		tagName := getTagStringValue(tagIdxWithGallery, "Name")
+		q := tagName
+		findFilter := &models.FindFilterType{Q: &q}
+
+		tagFilter := &models.TagFilterType{
+			CustomFields: []models.CustomFieldCriterionInput{
+				{
+					Field:    "string",
+					Modifier: models.CriterionModifierEquals,
+					Value:    []any{getTagStringValue(tagIdxWithGallery, "custom")},
+				},
+			},
+		}
+
+		tags, _, err := db.Tag.Query(ctx, tagFilter, findFilter)
+		if err != nil {
+			t.Errorf("TagStore.Query() error = %v", err)
+			return
+		}
+
+		ids := tagsToIDs(tags)
+		assert.Contains(ids, tagIDs[tagIdxWithGallery])
+		assert.Len(tags, 1)
+	})
+
+	runWithRollbackTxn(t, "is_null with text search", func(t *testing.T, ctx context.Context) {
+		assert := assert.New(t)
+
+		tagName := getTagStringValue(tagIdxWithGallery, "Name")
+		q := tagName
+		findFilter := &models.FindFilterType{Q: &q}
+
+		tagFilter := &models.TagFilterType{
+			CustomFields: []models.CustomFieldCriterionInput{
+				{
+					Field:    "not existing",
+					Modifier: models.CriterionModifierIsNull,
+				},
+			},
+		}
+
+		tags, _, err := db.Tag.Query(ctx, tagFilter, findFilter)
+		if err != nil {
+			t.Errorf("TagStore.Query() error = %v", err)
+			return
+		}
+
+		ids := tagsToIDs(tags)
+		assert.Contains(ids, tagIDs[tagIdxWithGallery])
+		assert.Len(tags, 1)
+	})
 }
 
 // TODO Destroy

From b46fbb2e7a1002a5532129addd4e028b86a77c35 Mon Sep 17 00:00:00 2001
From: DogmaDragon <103123951+DogmaDragon@users.noreply.github.com>
Date: Mon, 2 Mar 2026 05:30:38 +0200
Subject: [PATCH 327/405] Update capitalization for sprite generation heading
 (#6623)

---
 ui/v2.5/src/locales/en-GB.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/v2.5/src/locales/en-GB.json b/ui/v2.5/src/locales/en-GB.json
index 8c9aaf3f0..a25f3c765 100644
--- a/ui/v2.5/src/locales/en-GB.json
+++ b/ui/v2.5/src/locales/en-GB.json
@@ -441,7 +441,7 @@
         "heading": "Scrapers path"
       },
       "scraping": "Scraping",
-      "sprite_generation_head": "Sprite generation",
+      "sprite_generation_head": "Sprite Generation",
       "sprite_interval_desc": "Time between each generated sprite in seconds.",
       "sprite_interval_head": "Sprite interval",
       "sprite_maximum_desc": "Maximum number of sprites to be generated for a scene. Set to 0 to disable the limit.",

From 681ccbf380a580daf1fa81b90ad95351e569360b Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Mon, 2 Mar 2026 14:44:20 +1100
Subject: [PATCH 328/405] Fix caption handling during scan and check before
 correcting path (#6634)

* Handle case where folder entry exists for corrected path in correctSubFolderHierarchy
* Log scan start
* Handle caption files during scan
---
 internal/manager/task_scan.go | 115 +++++++++++++++++++---------------
 pkg/file/move.go              |  19 ++++++
 pkg/file/scan.go              |   4 ++
 pkg/file/video/caption.go     |  15 ++++-
 pkg/utils/mutex.go            |  25 ++++++++
 5 files changed, 128 insertions(+), 50 deletions(-)

diff --git a/internal/manager/task_scan.go b/internal/manager/task_scan.go
index d09765577..77a492134 100644
--- a/internal/manager/task_scan.go
+++ b/internal/manager/task_scan.go
@@ -26,6 +26,7 @@ import (
 	"github.com/stashapp/stash/pkg/scene"
 	"github.com/stashapp/stash/pkg/scene/generate"
 	"github.com/stashapp/stash/pkg/txn"
+	"github.com/stashapp/stash/pkg/utils"
 )
 
 type ScanJob struct {
@@ -35,6 +36,8 @@ type ScanJob struct {
 
 	fileQueue chan file.ScannedFile
 	count     int
+
+	unmatchedCaptionFiles utils.MutexField[[]string]
 }
 
 func (j *ScanJob) Execute(ctx context.Context, progress *job.Progress) error {
@@ -73,6 +76,8 @@ func (j *ScanJob) Execute(ctx context.Context, progress *job.Progress) error {
 	j.scanner.ScanFilters = []file.PathFilter{newScanFilter(c, repo, minModTime)}
 	j.scanner.HandlerRequiredFilters = []file.Filter{newHandlerRequiredFilter(cfg, repo)}
 
+	logger.Infof("Starting scan of %d paths with %d parallel tasks", len(paths), nTasks)
+
 	j.runJob(ctx, paths, nTasks, progress)
 
 	taskQueue.Close()
@@ -83,7 +88,7 @@ func (j *ScanJob) Execute(ctx context.Context, progress *job.Progress) error {
 	}
 
 	elapsed := time.Since(start)
-	logger.Info(fmt.Sprintf("Scan finished (%s)", elapsed))
+	logger.Infof("Scan finished (%s)", elapsed)
 
 	j.subscriptions.notify()
 	return nil
@@ -172,6 +177,22 @@ func (j *ScanJob) queueFileFunc(ctx context.Context, f models.FS, zipFile *file.
 				return fs.SkipDir
 			}
 
+			// we don't include caption files in the file scan, but we do need
+			// to handle them
+			if fsutil.MatchExtension(path, video.CaptionExts) {
+				fileRepo := j.scanner.Repository.File
+				matched := video.AssociateCaptions(ctx, path, j.scanner.Repository.TxnManager, fileRepo, fileRepo)
+
+				if !matched {
+					logger.Debugf("No matching video file found for caption file %s", path)
+					j.unmatchedCaptionFiles.SetFunc(func(files []string) []string {
+						return append(files, path)
+					})
+				}
+
+				return nil
+			}
+
 			logger.Debugf("Skipping file %s", path)
 			return nil
 		}
@@ -309,6 +330,45 @@ func (j *ScanJob) handleFile(ctx context.Context, f file.ScannedFile, progress *
 		return err
 	}
 
+	// if this is a new video file, match it with any unmatched caption files
+	if r.New && len(j.unmatchedCaptionFiles.Get()) > 0 {
+		videoFile, _ := r.File.(*models.VideoFile)
+
+		if videoFile != nil {
+			// try to match any unmatched caption files to this video file
+			for _, captionPath := range j.unmatchedCaptionFiles.Get() {
+				if video.MatchesCaption(videoFile.Path, captionPath) {
+					video.AssociateCaptions(ctx, captionPath, j.scanner.Repository.TxnManager, j.scanner.Repository.File, j.scanner.Repository.File)
+
+					// remove from the unmatched list
+					j.unmatchedCaptionFiles.SetFunc(func(files []string) []string {
+						newFiles := make([]string, 0, len(files)-1)
+						for _, f := range files {
+							if f != captionPath {
+								newFiles = append(newFiles, f)
+							}
+						}
+						return newFiles
+					})
+				}
+			}
+		}
+	}
+
+	// clean captions - scene handler handles this as well, but
+	// unchanged files aren't processed by the scene handler
+	if r.IsUnchanged() {
+		videoFile, _ := r.File.(*models.VideoFile)
+
+		if videoFile != nil {
+			txnMgr := j.scanner.Repository.TxnManager
+			fileRepo := j.scanner.Repository.File
+			if err := video.CleanCaptions(ctx, videoFile, txnMgr, fileRepo); err != nil {
+				logger.Errorf("Error cleaning captions: %v", err)
+			}
+		}
+	}
+
 	// handle rename should have already handled the contents of the zip file
 	// so shouldn't need to scan it again
 
@@ -378,11 +438,10 @@ type sceneFinder interface {
 // handlerRequiredFilter returns true if a File's handler needs to be executed despite the file not being updated.
 type handlerRequiredFilter struct {
 	extensionConfig
-	txnManager     txn.Manager
-	SceneFinder    sceneFinder
-	ImageFinder    fileCounter
-	GalleryFinder  galleryFinder
-	CaptionUpdater video.CaptionUpdater
+	txnManager    txn.Manager
+	SceneFinder   sceneFinder
+	ImageFinder   fileCounter
+	GalleryFinder galleryFinder
 
 	FolderCache *lru.LRU[bool]
 
@@ -398,7 +457,6 @@ func newHandlerRequiredFilter(c *config.Config, repo models.Repository) *handler
 		SceneFinder:              repo.Scene,
 		ImageFinder:              repo.Image,
 		GalleryFinder:            repo.Gallery,
-		CaptionUpdater:           repo.File,
 		FolderCache:              lru.New[bool](processes * 2),
 		videoFileNamingAlgorithm: c.GetVideoFileNamingAlgorithm(),
 	}
@@ -473,42 +531,12 @@ func (f *handlerRequiredFilter) Accept(ctx context.Context, ff models.File) bool
 		}
 	}
 
-	if isVideoFile {
-		// TODO - check if the cover exists
-		// hash := scene.GetHash(ff, f.videoFileNamingAlgorithm)
-		// ssPath := instance.Paths.Scene.GetScreenshotPath(hash)
-		// if exists, _ := fsutil.FileExists(ssPath); !exists {
-		// 	// if not, check if the file is a primary file for a scene
-		// 	scenes, err := f.SceneFinder.FindByPrimaryFileID(ctx, ff.Base().ID)
-		// 	if err != nil {
-		// 		// just ignore
-		// 		return false
-		// 	}
-
-		// 	if len(scenes) > 0 {
-		// 		// if it is, then it needs to be re-generated
-		// 		return true
-		// 	}
-		// }
-
-		// clean captions - scene handler handles this as well, but
-		// unchanged files aren't processed by the scene handler
-		videoFile, _ := ff.(*models.VideoFile)
-		if videoFile != nil {
-			if err := video.CleanCaptions(ctx, videoFile, f.txnManager, f.CaptionUpdater); err != nil {
-				logger.Errorf("Error cleaning captions: %v", err)
-			}
-		}
-	}
-
 	return false
 }
 
 type scanFilter struct {
 	extensionConfig
-	txnManager     txn.Manager
-	FileFinder     models.FileFinder
-	CaptionUpdater video.CaptionUpdater
+	txnManager txn.Manager
 
 	stashPaths        config.StashConfigs
 	generatedPath     string
@@ -521,8 +549,6 @@ func newScanFilter(c *config.Config, repo models.Repository, minModTime time.Tim
 	return &scanFilter{
 		extensionConfig:   newExtensionConfig(c),
 		txnManager:        repo.TxnManager,
-		FileFinder:        repo.File,
-		CaptionUpdater:    repo.File,
 		stashPaths:        c.GetStashPaths(),
 		generatedPath:     c.GetGeneratedPath(),
 		videoExcludeRegex: generateRegexps(c.GetExcludes()),
@@ -552,15 +578,6 @@ func (f *scanFilter) Accept(ctx context.Context, path string, info fs.FileInfo)
 	isImageFile := useAsImage(path)
 	isZipFile := fsutil.MatchExtension(path, f.zipExt)
 
-	// handle caption files
-	if fsutil.MatchExtension(path, video.CaptionExts) {
-		// we don't include caption files in the file scan, but we do need
-		// to handle them
-		video.AssociateCaptions(ctx, path, f.txnManager, f.FileFinder, f.CaptionUpdater)
-
-		return false
-	}
-
 	if !info.IsDir() && !isVideoFile && !isImageFile && !isZipFile {
 		logger.Debugf("Skipping %s as it does not match any known file extensions", path)
 		return false
diff --git a/pkg/file/move.go b/pkg/file/move.go
index 06605912b..1f0a5012c 100644
--- a/pkg/file/move.go
+++ b/pkg/file/move.go
@@ -205,6 +205,25 @@ func correctSubFolderHierarchy(ctx context.Context, rw models.FolderReaderWriter
 
 		logger.Debugf("updating folder %s to %s", oldPath, correctPath)
 
+		// #6427 - ensure folder entry with new path doesn't already exist
+		const caseSensitive = true
+		existing, err := rw.FindByPath(ctx, correctPath, caseSensitive)
+		if err != nil {
+			return fmt.Errorf("finding folder by path %s: %w", correctPath, err)
+		}
+
+		if existing != nil {
+			// this should no longer be possible, but if it does happen, log a warning
+			// and skip updating this folder and its subfolders
+			logger.Warnf("folder with path %s already exists, setting parent_folder_id of %s to NULL and skipping", correctPath, oldPath)
+			f.ParentFolderID = nil
+			if err := rw.Update(ctx, f); err != nil {
+				return fmt.Errorf("updating folder parent id to NULL for folder %s: %w", oldPath, err)
+			}
+
+			continue
+		}
+
 		f.Path = correctPath
 		if err := rw.Update(ctx, f); err != nil {
 			return fmt.Errorf("updating folder path %s -> %s: %w", oldPath, f.Path, err)
diff --git a/pkg/file/scan.go b/pkg/file/scan.go
index cf1b43603..467fa7f22 100644
--- a/pkg/file/scan.go
+++ b/pkg/file/scan.go
@@ -349,6 +349,10 @@ type ScanFileResult struct {
 	Updated bool
 }
 
+func (r ScanFileResult) IsUnchanged() bool {
+	return !r.New && !r.Renamed && !r.Updated
+}
+
 // ScanFile scans the provided file into the database, returning the scan result.
 func (s *Scanner) ScanFile(ctx context.Context, f ScannedFile) (*ScanFileResult, error) {
 	var r *ScanFileResult
diff --git a/pkg/file/video/caption.go b/pkg/file/video/caption.go
index 43723864f..a9e216acd 100644
--- a/pkg/file/video/caption.go
+++ b/pkg/file/video/caption.go
@@ -90,11 +90,20 @@ type CaptionUpdater interface {
 	UpdateCaptions(ctx context.Context, fileID models.FileID, captions []*models.VideoCaption) error
 }
 
+// MatchesCaption returns true if the caption file matches the video file based on the filename
+func MatchesCaption(videoPath, captionPath string) bool {
+	captionPrefix := getCaptionPrefix(captionPath)
+	videoPrefix := strings.TrimSuffix(videoPath, filepath.Ext(videoPath)) + "."
+	return captionPrefix == videoPrefix
+}
+
 // associates captions to scene/s with the same basename
-func AssociateCaptions(ctx context.Context, captionPath string, txnMgr txn.Manager, fqb models.FileFinder, w CaptionUpdater) {
+// returns true if the caption file was matched to a video file and processed, false otherwise
+func AssociateCaptions(ctx context.Context, captionPath string, txnMgr txn.Manager, fqb models.FileFinder, w CaptionUpdater) bool {
 	captionLang := getCaptionsLangFromPath(captionPath)
 
 	captionPrefix := getCaptionPrefix(captionPath)
+	matched := false
 	if err := txn.WithTxn(ctx, txnMgr, func(ctx context.Context) error {
 		var err error
 		files, er := fqb.FindAllByPath(ctx, captionPrefix+"*", true)
@@ -117,6 +126,8 @@ func AssociateCaptions(ctx context.Context, captionPath string, txnMgr txn.Manag
 			path := f.Base().Path
 
 			logger.Debugf("Matched captions to file %s", path)
+			matched = true
+
 			captions, er := w.GetCaptions(ctx, fileID)
 			if er == nil {
 				fileExt := filepath.Ext(captionPath)
@@ -139,6 +150,8 @@ func AssociateCaptions(ctx context.Context, captionPath string, txnMgr txn.Manag
 	}); err != nil {
 		logger.Error(err.Error())
 	}
+
+	return matched
 }
 
 // CleanCaptions removes non existent/accessible language codes from captions
diff --git a/pkg/utils/mutex.go b/pkg/utils/mutex.go
index 212200214..47439e32b 100644
--- a/pkg/utils/mutex.go
+++ b/pkg/utils/mutex.go
@@ -1,5 +1,7 @@
 package utils
 
+import "sync"
+
 // MutexManager manages access to mutexes using a mutex type and key.
 type MutexManager struct {
 	mapChan chan map[string]<-chan struct{}
@@ -62,3 +64,26 @@ func (csm *MutexManager) Claim(mutexType string, key string, done <-chan struct{
 		csm.mapChan <- m
 	}()
 }
+
+type MutexField[T any] struct {
+	mutex sync.RWMutex
+	value T
+}
+
+func (mf *MutexField[T]) Get() T {
+	mf.mutex.RLock()
+	defer mf.mutex.RUnlock()
+	return mf.value
+}
+
+func (mf *MutexField[T]) Set(value T) {
+	mf.mutex.Lock()
+	defer mf.mutex.Unlock()
+	mf.value = value
+}
+
+func (mf *MutexField[T]) SetFunc(f func(T) T) {
+	mf.mutex.Lock()
+	defer mf.mutex.Unlock()
+	mf.value = f(mf.value)
+}

From bc75d47f15eece4648a547bda9ffa4759f68da77 Mon Sep 17 00:00:00 2001
From: dev-null-life <dev-null-life@proton.me>
Date: Sun, 1 Mar 2026 21:45:33 -0600
Subject: [PATCH 329/405] Fix edit modal not opening inside gallery view
 (#6629)

* Fix edit modal not opening inside gallery view

The modal element was only rendered in the sidebar layout branch, but
gallery images use the non-sidebar path which returned content without
the modal. Also stabilize onEdit/onDelete with useCallback and add
missing dependency array to the Mousetrap useEffect.

Closes #6624

* Render modal once above sidebar conditional

Move {modal} above the withSidebar ternary so it is rendered
exactly once, avoiding the duplication that caused the original bug.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 ui/v2.5/src/components/Images/ImageList.tsx | 116 ++++++++++----------
 1 file changed, 61 insertions(+), 55 deletions(-)

diff --git a/ui/v2.5/src/components/Images/ImageList.tsx b/ui/v2.5/src/components/Images/ImageList.tsx
index cc8aa48f7..f47990c4c 100644
--- a/ui/v2.5/src/components/Images/ImageList.tsx
+++ b/ui/v2.5/src/components/Images/ImageList.tsx
@@ -587,25 +587,6 @@ export const FilteredImageList = PatchComponent(
       setShowSidebar,
     });
 
-    useEffect(() => {
-      Mousetrap.bind("e", () => {
-        if (hasSelection) {
-          onEdit?.();
-        }
-      });
-
-      Mousetrap.bind("d d", () => {
-        if (hasSelection) {
-          onDelete?.();
-        }
-      });
-
-      return () => {
-        Mousetrap.unbind("e");
-        Mousetrap.unbind("d d");
-      };
-    });
-
     const onCloseEditDelete = useCloseEditDelete({
       closeModal,
       onSelectNone,
@@ -628,23 +609,42 @@ export const FilteredImageList = PatchComponent(
       );
     }
 
-    function onEdit() {
+    const onEdit = useCallback(() => {
       showModal(
         <EditImagesDialog
           selected={selectedItems}
           onClose={onCloseEditDelete}
         />
       );
-    }
+    }, [showModal, selectedItems, onCloseEditDelete]);
 
-    function onDelete() {
+    const onDelete = useCallback(() => {
       showModal(
         <DeleteImagesDialog
           selected={selectedItems}
           onClose={onCloseEditDelete}
         />
       );
-    }
+    }, [showModal, selectedItems, onCloseEditDelete]);
+
+    useEffect(() => {
+      Mousetrap.bind("e", () => {
+        if (hasSelection) {
+          onEdit?.();
+        }
+      });
+
+      Mousetrap.bind("d d", () => {
+        if (hasSelection) {
+          onDelete?.();
+        }
+      });
+
+      return () => {
+        Mousetrap.unbind("e");
+        Mousetrap.unbind("d d");
+      };
+    }, [hasSelection, onEdit, onDelete]);
 
     const convertedExtraOperations: IListFilterOperation[] =
       providedOperations.map((o) => ({
@@ -786,41 +786,47 @@ export const FilteredImageList = PatchComponent(
       </>
     );
 
-    if (!withSidebar) {
-      return content;
-    }
-
     return (
-      <div
-        className={cx("item-list-container image-list", {
-          "hide-sidebar": !showSidebar,
-        })}
-      >
+      <>
         {modal}
-
-        <SidebarStateContext.Provider value={{ sectionOpen, setSectionOpen }}>
-          <SidebarPane hideSidebar={!showSidebar}>
-            <Sidebar hide={!showSidebar} onHide={() => setShowSidebar(false)}>
-              <SidebarContent
-                filter={filter}
-                setFilter={setFilter}
-                filterHook={filterHook}
-                showEditFilter={showEditFilter}
-                view={view}
-                sidebarOpen={showSidebar}
-                onClose={() => setShowSidebar(false)}
-                count={cachedResult.loading ? undefined : totalCount}
-                focus={searchFocus}
-              />
-            </Sidebar>
-            <SidebarPaneContent
-              onSidebarToggle={() => setShowSidebar(!showSidebar)}
+        {!withSidebar ? (
+          content
+        ) : (
+          <div
+            className={cx("item-list-container image-list", {
+              "hide-sidebar": !showSidebar,
+            })}
+          >
+            <SidebarStateContext.Provider
+              value={{ sectionOpen, setSectionOpen }}
             >
-              {content}
-            </SidebarPaneContent>
-          </SidebarPane>
-        </SidebarStateContext.Provider>
-      </div>
+              <SidebarPane hideSidebar={!showSidebar}>
+                <Sidebar
+                  hide={!showSidebar}
+                  onHide={() => setShowSidebar(false)}
+                >
+                  <SidebarContent
+                    filter={filter}
+                    setFilter={setFilter}
+                    filterHook={filterHook}
+                    showEditFilter={showEditFilter}
+                    view={view}
+                    sidebarOpen={showSidebar}
+                    onClose={() => setShowSidebar(false)}
+                    count={cachedResult.loading ? undefined : totalCount}
+                    focus={searchFocus}
+                  />
+                </Sidebar>
+                <SidebarPaneContent
+                  onSidebarToggle={() => setShowSidebar(!showSidebar)}
+                >
+                  {content}
+                </SidebarPaneContent>
+              </SidebarPane>
+            </SidebarStateContext.Provider>
+          </div>
+        )}
+      </>
     );
   }
 );

From 09e2b2bd4e516d52e65d66d8ce2e04100da93b59 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Mon, 2 Mar 2026 15:45:37 +1100
Subject: [PATCH 330/405] Wrap CleanCaptions with database. Refactor
 AssociateCaptions.

---
 internal/manager/task_scan.go |  4 +++-
 pkg/file/video/caption.go     | 32 ++++++++++++++++++--------------
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/internal/manager/task_scan.go b/internal/manager/task_scan.go
index 77a492134..5d1f063c2 100644
--- a/internal/manager/task_scan.go
+++ b/internal/manager/task_scan.go
@@ -363,7 +363,9 @@ func (j *ScanJob) handleFile(ctx context.Context, f file.ScannedFile, progress *
 		if videoFile != nil {
 			txnMgr := j.scanner.Repository.TxnManager
 			fileRepo := j.scanner.Repository.File
-			if err := video.CleanCaptions(ctx, videoFile, txnMgr, fileRepo); err != nil {
+			if err := txn.WithDatabase(ctx, txnMgr, func(ctx context.Context) error {
+				return video.CleanCaptions(ctx, videoFile, txnMgr, fileRepo)
+			}); err != nil {
 				logger.Errorf("Error cleaning captions: %v", err)
 			}
 		}
diff --git a/pkg/file/video/caption.go b/pkg/file/video/caption.go
index a9e216acd..46317d90c 100644
--- a/pkg/file/video/caption.go
+++ b/pkg/file/video/caption.go
@@ -129,21 +129,25 @@ func AssociateCaptions(ctx context.Context, captionPath string, txnMgr txn.Manag
 			matched = true
 
 			captions, er := w.GetCaptions(ctx, fileID)
-			if er == nil {
-				fileExt := filepath.Ext(captionPath)
-				ext := fileExt[1:]
-				if !IsLangInCaptions(captionLang, ext, captions) { // only update captions if language code is not present
-					newCaption := &models.VideoCaption{
-						LanguageCode: captionLang,
-						Filename:     filepath.Base(captionPath),
-						CaptionType:  ext,
-					}
-					captions = append(captions, newCaption)
-					er = w.UpdateCaptions(ctx, fileID, captions)
-					if er == nil {
-						logger.Debugf("Updated captions for file %s. Added %s", path, captionLang)
-					}
+			if er != nil {
+				return fmt.Errorf("getting captions for file %s: %w", path, er)
+			}
+
+			fileExt := filepath.Ext(captionPath)
+			ext := fileExt[1:]
+			if !IsLangInCaptions(captionLang, ext, captions) { // only update captions if language code is not present
+				newCaption := &models.VideoCaption{
+					LanguageCode: captionLang,
+					Filename:     filepath.Base(captionPath),
+					CaptionType:  ext,
 				}
+				captions = append(captions, newCaption)
+				er = w.UpdateCaptions(ctx, fileID, captions)
+				if er != nil {
+					return fmt.Errorf("updating captions for file %s: %w", path, er)
+				}
+
+				logger.Debugf("Updated captions for file %s. Added %s", path, captionLang)
 			}
 		}
 		return err

From 784795660ba07e1f6fecd1dd0b9ebbc2cbf535f7 Mon Sep 17 00:00:00 2001
From: dev-null-life <dev-null-life@proton.me>
Date: Sun, 1 Mar 2026 22:47:23 -0600
Subject: [PATCH 331/405] Skip scanning zip contents when fingerprint is
 unchanged (#6633)

* Skip scanning zip contents when fingerprint is unchanged

When a zip-based gallery's modification time changes but its content
hash (oshash/md5) remains the same, skip walking and rescanning every
file inside the zip. This avoids expensive per-file fingerprint
recalculation when zip metadata changes without actual content changes.

Closes #6512

* Log a debug message when skipping a zip scan due to unchanged
  fingerprint

---------
Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
Co-authored-by: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
---
 internal/manager/task_scan.go |  8 ++++++--
 pkg/file/scan.go              | 17 +++++++++++------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/internal/manager/task_scan.go b/internal/manager/task_scan.go
index 5d1f063c2..cf675a5af 100644
--- a/internal/manager/task_scan.go
+++ b/internal/manager/task_scan.go
@@ -372,9 +372,11 @@ func (j *ScanJob) handleFile(ctx context.Context, f file.ScannedFile, progress *
 	}
 
 	// handle rename should have already handled the contents of the zip file
-	// so shouldn't need to scan it again
+	// so shouldn't need to scan it again.
+	// Only scan zip contents if the file is new, the fingerprint changed,
+	// or if a force rescan was requested.
 
-	if (r.New || r.Updated) && j.scanner.IsZipFile(f.Info.Name()) {
+	if j.scanner.IsZipFile(f.Info.Name()) && (r.New || r.FingerprintChanged || j.scanner.Rescan) {
 		ff := r.File
 		f.BaseFile = ff.Base()
 
@@ -386,6 +388,8 @@ func (j *ScanJob) handleFile(ctx context.Context, f file.ScannedFile, progress *
 		if err := j.scanZipFile(zipCtx, f, progress); err != nil {
 			logger.Errorf("Error scanning zip file %q: %v", f.Path, err)
 		}
+	} else if r.Updated && j.scanner.IsZipFile(f.Info.Name()) {
+		logger.Debugf("Skipping zip file scan for %q: fingerprint unchanged", f.Path)
 	}
 
 	return nil
diff --git a/pkg/file/scan.go b/pkg/file/scan.go
index 467fa7f22..8ff51b359 100644
--- a/pkg/file/scan.go
+++ b/pkg/file/scan.go
@@ -343,10 +343,11 @@ func (s *Scanner) onExistingFolder(ctx context.Context, f ScannedFile, existing
 }
 
 type ScanFileResult struct {
-	File    models.File
-	New     bool
-	Renamed bool
-	Updated bool
+	File               models.File
+	New                bool
+	Renamed            bool
+	Updated            bool
+	FingerprintChanged bool
 }
 
 func (r ScanFileResult) IsUnchanged() bool {
@@ -791,6 +792,9 @@ func (s *Scanner) onExistingFile(ctx context.Context, f ScannedFile, existing mo
 		return nil, err
 	}
 
+	oldFingerprints := existing.Base().Fingerprints
+	fingerprintChanged := fp.ContentsChanged(oldFingerprints)
+
 	s.removeOutdatedFingerprints(existing, fp)
 	existing.SetFingerprints(fp)
 
@@ -814,8 +818,9 @@ func (s *Scanner) onExistingFile(ctx context.Context, f ScannedFile, existing mo
 		return nil, err
 	}
 	return &ScanFileResult{
-		File:    existing,
-		Updated: true,
+		File:               existing,
+		Updated:            true,
+		FingerprintChanged: fingerprintChanged,
 	}, nil
 }
 

From b8dff736963094712368a94512a65e1ce2065f74 Mon Sep 17 00:00:00 2001
From: dev-null-life <dev-null-life@proton.me>
Date: Sun, 1 Mar 2026 22:47:43 -0600
Subject: [PATCH 332/405] Fix datepicker button border radius in input groups
 (#6630)

Add missing .input-group-append .btn border-radius rule to zero out
the left-side radius, matching the existing .input-group-prepend rule.

Fixes #6518

Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
---
 ui/v2.5/src/components/Shared/styles.scss | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/ui/v2.5/src/components/Shared/styles.scss b/ui/v2.5/src/components/Shared/styles.scss
index 1251ffb9b..f2881fc55 100644
--- a/ui/v2.5/src/components/Shared/styles.scss
+++ b/ui/v2.5/src/components/Shared/styles.scss
@@ -446,6 +446,13 @@ button.collapse-button {
   }
 }
 
+.input-group-append {
+  .btn {
+    border-bottom-left-radius: 0;
+    border-top-left-radius: 0;
+  }
+}
+
 .ModalComponent .modal-footer {
   justify-content: space-between;
 }

From 52bd9392fbb5ea4a5307de0c06363ffef0f583fb Mon Sep 17 00:00:00 2001
From: Abdu Dihan <abdu.dihan@gmail.com>
Date: Mon, 2 Mar 2026 04:53:02 +0000
Subject: [PATCH 333/405] Fix stale browser-cached thumbnails after file
 content changes during scan. (#6622)

* Fix stale thumbnails after file content changes

When a file's content changed (e.g. after renaming files in a gallery),
the scan handler updated fingerprints but did not bump the entity's
updated_at timestamp. Since thumbnail URLs use updated_at as a cache
buster and are served with immutable/1-year cache headers, browsers
would indefinitely serve the old cached thumbnail.

Update image, scene, and gallery scan handlers to call UpdatePartial
(which sets updated_at to now) whenever file content changes, not only
when a new file association is created.
---
 pkg/gallery/scan.go          |   9 +--
 pkg/gallery/scan_test.go     | 108 +++++++++++++++++++++++++++++++
 pkg/image/scan.go            |   6 +-
 pkg/image/scan_test.go       | 120 +++++++++++++++++++++++++++++++++++
 pkg/models/mocks/database.go |  11 ++++
 pkg/scene/scan.go            |   6 +-
 pkg/scene/scan_test.go       | 114 +++++++++++++++++++++++++++++++++
 7 files changed, 363 insertions(+), 11 deletions(-)
 create mode 100644 pkg/gallery/scan_test.go
 create mode 100644 pkg/image/scan_test.go
 create mode 100644 pkg/scene/scan_test.go

diff --git a/pkg/gallery/scan.go b/pkg/gallery/scan.go
index 2064355cd..b3e5d2c3c 100644
--- a/pkg/gallery/scan.go
+++ b/pkg/gallery/scan.go
@@ -135,13 +135,14 @@ func (h *ScanHandler) associateExisting(ctx context.Context, existing []*models.
 			if err := h.CreatorUpdater.AddFileID(ctx, i.ID, f.Base().ID); err != nil {
 				return fmt.Errorf("adding file to gallery: %w", err)
 			}
-			// update updated_at time
-			if _, err := h.CreatorUpdater.UpdatePartial(ctx, i.ID, models.NewGalleryPartial()); err != nil {
-				return fmt.Errorf("updating gallery: %w", err)
-			}
 		}
 
 		if !found || updateExisting {
+			// update updated_at time when file association or content changes
+			if _, err := h.CreatorUpdater.UpdatePartial(ctx, i.ID, models.NewGalleryPartial()); err != nil {
+				return fmt.Errorf("updating gallery: %w", err)
+			}
+
 			h.PluginCache.RegisterPostHooks(ctx, i.ID, hook.GalleryUpdatePost, nil, nil)
 		}
 	}
diff --git a/pkg/gallery/scan_test.go b/pkg/gallery/scan_test.go
new file mode 100644
index 000000000..4a89206e3
--- /dev/null
+++ b/pkg/gallery/scan_test.go
@@ -0,0 +1,108 @@
+package gallery
+
+import (
+	"context"
+	"testing"
+
+	"github.com/stashapp/stash/pkg/models"
+	"github.com/stashapp/stash/pkg/models/mocks"
+	"github.com/stashapp/stash/pkg/plugin"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
+)
+
+func TestAssociateExisting_UpdatePartialOnContentChange(t *testing.T) {
+	const (
+		testGalleryID = 1
+		testFileID    = 100
+	)
+
+	existingFile := &models.BaseFile{ID: models.FileID(testFileID), Path: "test.zip"}
+
+	makeGallery := func() *models.Gallery {
+		return &models.Gallery{
+			ID:    testGalleryID,
+			Files: models.NewRelatedFiles([]models.File{existingFile}),
+		}
+	}
+
+	tests := []struct {
+		name           string
+		updateExisting bool
+		expectUpdate   bool
+	}{
+		{
+			name:           "calls UpdatePartial when file content changed",
+			updateExisting: true,
+			expectUpdate:   true,
+		},
+		{
+			name:           "skips UpdatePartial when file unchanged and already associated",
+			updateExisting: false,
+			expectUpdate:   false,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			db := mocks.NewDatabase()
+			db.Gallery.On("GetFiles", mock.Anything, testGalleryID).Return([]models.File{existingFile}, nil)
+
+			if tt.expectUpdate {
+				db.Gallery.On("UpdatePartial", mock.Anything, testGalleryID, mock.Anything).
+					Return(&models.Gallery{ID: testGalleryID}, nil)
+			}
+
+			h := &ScanHandler{
+				CreatorUpdater: db.Gallery,
+				PluginCache:    &plugin.Cache{},
+			}
+
+			db.WithTxnCtx(func(ctx context.Context) {
+				err := h.associateExisting(ctx, []*models.Gallery{makeGallery()}, existingFile, tt.updateExisting)
+				assert.NoError(t, err)
+			})
+
+			if tt.expectUpdate {
+				db.Gallery.AssertCalled(t, "UpdatePartial", mock.Anything, testGalleryID, mock.Anything)
+			} else {
+				db.Gallery.AssertNotCalled(t, "UpdatePartial", mock.Anything, mock.Anything, mock.Anything)
+			}
+		})
+	}
+}
+
+func TestAssociateExisting_UpdatePartialOnNewFile(t *testing.T) {
+	const (
+		testGalleryID = 1
+		existFileID   = 100
+		newFileID     = 200
+	)
+
+	existingFile := &models.BaseFile{ID: models.FileID(existFileID), Path: "existing.zip"}
+	newFile := &models.BaseFile{ID: models.FileID(newFileID), Path: "new.zip"}
+
+	gallery := &models.Gallery{
+		ID:    testGalleryID,
+		Files: models.NewRelatedFiles([]models.File{existingFile}),
+	}
+
+	db := mocks.NewDatabase()
+	db.Gallery.On("GetFiles", mock.Anything, testGalleryID).Return([]models.File{existingFile}, nil)
+	db.Gallery.On("AddFileID", mock.Anything, testGalleryID, models.FileID(newFileID)).Return(nil)
+	db.Gallery.On("UpdatePartial", mock.Anything, testGalleryID, mock.Anything).
+		Return(&models.Gallery{ID: testGalleryID}, nil)
+
+	h := &ScanHandler{
+		CreatorUpdater: db.Gallery,
+		PluginCache:    &plugin.Cache{},
+	}
+
+	db.WithTxnCtx(func(ctx context.Context) {
+		err := h.associateExisting(ctx, []*models.Gallery{gallery}, newFile, false)
+		assert.NoError(t, err)
+	})
+
+	db.Gallery.AssertCalled(t, "AddFileID", mock.Anything, testGalleryID, models.FileID(newFileID))
+	db.Gallery.AssertCalled(t, "UpdatePartial", mock.Anything, testGalleryID, mock.Anything)
+}
diff --git a/pkg/image/scan.go b/pkg/image/scan.go
index 317e3605f..99b31f698 100644
--- a/pkg/image/scan.go
+++ b/pkg/image/scan.go
@@ -210,8 +210,8 @@ func (h *ScanHandler) associateExisting(ctx context.Context, existing []*models.
 			changed = true
 		}
 
-		if changed {
-			// always update updated_at time
+		if changed || updateExisting {
+			// update updated_at time when file association or content changes
 			imagePartial := models.NewImagePartial()
 			imagePartial.GalleryIDs = galleryIDs
 
@@ -229,9 +229,7 @@ func (h *ScanHandler) associateExisting(ctx context.Context, existing []*models.
 					return fmt.Errorf("updating gallery updated at timestamp: %w", err)
 				}
 			}
-		}
 
-		if changed || updateExisting {
 			h.PluginCache.RegisterPostHooks(ctx, i.ID, hook.ImageUpdatePost, nil, nil)
 		}
 	}
diff --git a/pkg/image/scan_test.go b/pkg/image/scan_test.go
new file mode 100644
index 000000000..f48c188ee
--- /dev/null
+++ b/pkg/image/scan_test.go
@@ -0,0 +1,120 @@
+package image
+
+import (
+	"context"
+	"testing"
+
+	"github.com/stashapp/stash/pkg/models"
+	"github.com/stashapp/stash/pkg/models/mocks"
+	"github.com/stashapp/stash/pkg/plugin"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
+)
+
+type mockScanConfig struct{}
+
+func (m *mockScanConfig) GetCreateGalleriesFromFolders() bool { return false }
+
+func TestAssociateExisting_UpdatePartialOnContentChange(t *testing.T) {
+	const (
+		testImageID = 1
+		testFileID  = 100
+	)
+
+	existingFile := &models.BaseFile{ID: models.FileID(testFileID), Path: "/images/test.jpg"}
+
+	makeImage := func() *models.Image {
+		return &models.Image{
+			ID:         testImageID,
+			Files:      models.NewRelatedFiles([]models.File{existingFile}),
+			GalleryIDs: models.NewRelatedIDs([]int{}),
+		}
+	}
+
+	tests := []struct {
+		name           string
+		updateExisting bool
+		expectUpdate   bool
+	}{
+		{
+			name:           "calls UpdatePartial when file content changed",
+			updateExisting: true,
+			expectUpdate:   true,
+		},
+		{
+			name:           "skips UpdatePartial when file unchanged and already associated",
+			updateExisting: false,
+			expectUpdate:   false,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			db := mocks.NewDatabase()
+			db.Image.On("GetFiles", mock.Anything, testImageID).Return([]models.File{existingFile}, nil)
+			db.Image.On("GetGalleryIDs", mock.Anything, testImageID).Return([]int{}, nil)
+
+			if tt.expectUpdate {
+				db.Image.On("UpdatePartial", mock.Anything, testImageID, mock.Anything).
+					Return(&models.Image{ID: testImageID}, nil)
+			}
+
+			h := &ScanHandler{
+				CreatorUpdater: db.Image,
+				GalleryFinder:  db.Gallery,
+				ScanConfig:     &mockScanConfig{},
+				PluginCache:    &plugin.Cache{},
+			}
+
+			db.WithTxnCtx(func(ctx context.Context) {
+				err := h.associateExisting(ctx, []*models.Image{makeImage()}, existingFile, tt.updateExisting)
+				assert.NoError(t, err)
+			})
+
+			if tt.expectUpdate {
+				db.Image.AssertCalled(t, "UpdatePartial", mock.Anything, testImageID, mock.Anything)
+			} else {
+				db.Image.AssertNotCalled(t, "UpdatePartial", mock.Anything, mock.Anything, mock.Anything)
+			}
+		})
+	}
+}
+
+func TestAssociateExisting_UpdatePartialOnNewFile(t *testing.T) {
+	const (
+		testImageID = 1
+		existFileID = 100
+		newFileID   = 200
+	)
+
+	existingFile := &models.BaseFile{ID: models.FileID(existFileID), Path: "/images/existing.jpg"}
+	newFile := &models.BaseFile{ID: models.FileID(newFileID), Path: "/images/new.jpg"}
+
+	image := &models.Image{
+		ID:         testImageID,
+		Files:      models.NewRelatedFiles([]models.File{existingFile}),
+		GalleryIDs: models.NewRelatedIDs([]int{}),
+	}
+
+	db := mocks.NewDatabase()
+	db.Image.On("GetFiles", mock.Anything, testImageID).Return([]models.File{existingFile}, nil)
+	db.Image.On("GetGalleryIDs", mock.Anything, testImageID).Return([]int{}, nil)
+	db.Image.On("AddFileID", mock.Anything, testImageID, models.FileID(newFileID)).Return(nil)
+	db.Image.On("UpdatePartial", mock.Anything, testImageID, mock.Anything).
+		Return(&models.Image{ID: testImageID}, nil)
+
+	h := &ScanHandler{
+		CreatorUpdater: db.Image,
+		GalleryFinder:  db.Gallery,
+		ScanConfig:     &mockScanConfig{},
+		PluginCache:    &plugin.Cache{},
+	}
+
+	db.WithTxnCtx(func(ctx context.Context) {
+		err := h.associateExisting(ctx, []*models.Image{image}, newFile, false)
+		assert.NoError(t, err)
+	})
+
+	db.Image.AssertCalled(t, "AddFileID", mock.Anything, testImageID, models.FileID(newFileID))
+	db.Image.AssertCalled(t, "UpdatePartial", mock.Anything, testImageID, mock.Anything)
+}
diff --git a/pkg/models/mocks/database.go b/pkg/models/mocks/database.go
index ec4177b30..88f106e19 100644
--- a/pkg/models/mocks/database.go
+++ b/pkg/models/mocks/database.go
@@ -3,6 +3,7 @@ package mocks
 
 import (
 	"context"
+	"errors"
 
 	"github.com/stashapp/stash/pkg/models"
 	"github.com/stashapp/stash/pkg/txn"
@@ -89,6 +90,16 @@ func (db *Database) AssertExpectations(t mock.TestingT) {
 	db.SavedFilter.AssertExpectations(t)
 }
 
+// WithTxnCtx runs fn with a context that has a transaction hook manager registered,
+// so code that calls txn.AddPostCommitHook (e.g. plugin cache) won't nil-panic.
+// Always rolls back to avoid executing the registered hooks.
+func (db *Database) WithTxnCtx(fn func(ctx context.Context)) {
+	_ = txn.WithTxn(context.Background(), db, func(ctx context.Context) error {
+		fn(ctx)
+		return errors.New("rollback")
+	})
+}
+
 func (db *Database) Repository() models.Repository {
 	return models.Repository{
 		TxnManager:     db,
diff --git a/pkg/scene/scan.go b/pkg/scene/scan.go
index e1038fbc3..c70c44a9e 100644
--- a/pkg/scene/scan.go
+++ b/pkg/scene/scan.go
@@ -160,15 +160,15 @@ func (h *ScanHandler) associateExisting(ctx context.Context, existing []*models.
 			if err := h.CreatorUpdater.AddFileID(ctx, s.ID, f.ID); err != nil {
 				return fmt.Errorf("adding file to scene: %w", err)
 			}
+		}
 
-			// update updated_at time
+		if !found || updateExisting {
+			// update updated_at time when file association or content changes
 			scenePartial := models.NewScenePartial()
 			if _, err := h.CreatorUpdater.UpdatePartial(ctx, s.ID, scenePartial); err != nil {
 				return fmt.Errorf("updating scene: %w", err)
 			}
-		}
 
-		if !found || updateExisting {
 			h.PluginCache.RegisterPostHooks(ctx, s.ID, hook.SceneUpdatePost, nil, nil)
 		}
 	}
diff --git a/pkg/scene/scan_test.go b/pkg/scene/scan_test.go
new file mode 100644
index 000000000..71729bb57
--- /dev/null
+++ b/pkg/scene/scan_test.go
@@ -0,0 +1,114 @@
+package scene
+
+import (
+	"context"
+	"testing"
+
+	"github.com/stashapp/stash/pkg/models"
+	"github.com/stashapp/stash/pkg/models/mocks"
+	"github.com/stashapp/stash/pkg/plugin"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
+)
+
+func TestAssociateExisting_UpdatePartialOnContentChange(t *testing.T) {
+	const (
+		testSceneID = 1
+		testFileID  = 100
+	)
+
+	existingFile := &models.VideoFile{
+		BaseFile: &models.BaseFile{ID: models.FileID(testFileID), Path: "test.mp4"},
+	}
+
+	makeScene := func() *models.Scene {
+		return &models.Scene{
+			ID:    testSceneID,
+			Files: models.NewRelatedVideoFiles([]*models.VideoFile{existingFile}),
+		}
+	}
+
+	tests := []struct {
+		name           string
+		updateExisting bool
+		expectUpdate   bool
+	}{
+		{
+			name:           "calls UpdatePartial when file content changed",
+			updateExisting: true,
+			expectUpdate:   true,
+		},
+		{
+			name:           "skips UpdatePartial when file unchanged and already associated",
+			updateExisting: false,
+			expectUpdate:   false,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			db := mocks.NewDatabase()
+			db.Scene.On("GetFiles", mock.Anything, testSceneID).Return([]*models.VideoFile{existingFile}, nil)
+
+			if tt.expectUpdate {
+				db.Scene.On("UpdatePartial", mock.Anything, testSceneID, mock.Anything).
+					Return(&models.Scene{ID: testSceneID}, nil)
+			}
+
+			h := &ScanHandler{
+				CreatorUpdater: db.Scene,
+				PluginCache:    &plugin.Cache{},
+			}
+
+			db.WithTxnCtx(func(ctx context.Context) {
+				err := h.associateExisting(ctx, []*models.Scene{makeScene()}, existingFile, tt.updateExisting)
+				assert.NoError(t, err)
+			})
+
+			if tt.expectUpdate {
+				db.Scene.AssertCalled(t, "UpdatePartial", mock.Anything, testSceneID, mock.Anything)
+			} else {
+				db.Scene.AssertNotCalled(t, "UpdatePartial", mock.Anything, mock.Anything, mock.Anything)
+			}
+		})
+	}
+}
+
+func TestAssociateExisting_UpdatePartialOnNewFile(t *testing.T) {
+	const (
+		testSceneID = 1
+		existFileID = 100
+		newFileID   = 200
+	)
+
+	existingFile := &models.VideoFile{
+		BaseFile: &models.BaseFile{ID: models.FileID(existFileID), Path: "existing.mp4"},
+	}
+	newFile := &models.VideoFile{
+		BaseFile: &models.BaseFile{ID: models.FileID(newFileID), Path: "new.mp4"},
+	}
+
+	scene := &models.Scene{
+		ID:    testSceneID,
+		Files: models.NewRelatedVideoFiles([]*models.VideoFile{existingFile}),
+	}
+
+	db := mocks.NewDatabase()
+	db.Scene.On("GetFiles", mock.Anything, testSceneID).Return([]*models.VideoFile{existingFile}, nil)
+	db.Scene.On("AddFileID", mock.Anything, testSceneID, models.FileID(newFileID)).Return(nil)
+	db.Scene.On("UpdatePartial", mock.Anything, testSceneID, mock.Anything).
+		Return(&models.Scene{ID: testSceneID}, nil)
+
+	h := &ScanHandler{
+		CreatorUpdater: db.Scene,
+		PluginCache:    &plugin.Cache{},
+	}
+
+	db.WithTxnCtx(func(ctx context.Context) {
+		err := h.associateExisting(ctx, []*models.Scene{scene}, newFile, false)
+		assert.NoError(t, err)
+	})
+
+	db.Scene.AssertCalled(t, "AddFileID", mock.Anything, testSceneID, models.FileID(newFileID))
+	db.Scene.AssertCalled(t, "UpdatePartial", mock.Anything, testSceneID, mock.Anything)
+}

From 99a0d01371eb39674c3e01346d1cbe0a4f6be2a4 Mon Sep 17 00:00:00 2001
From: puc9 <51006296+puc9@users.noreply.github.com>
Date: Mon, 2 Mar 2026 13:11:55 -0800
Subject: [PATCH 334/405] Fix new panic in IsFsPathCaseSensitive: Use filepath
 operations to check for file system case sensitivity (#6635)

* Use filepath operations to check for file system case sensitivity
---
 pkg/fsutil/fs.go      | 13 ++-----------
 pkg/fsutil/fs_test.go | 11 +++++++++++
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/pkg/fsutil/fs.go b/pkg/fsutil/fs.go
index 10666bb63..032bec53c 100644
--- a/pkg/fsutil/fs.go
+++ b/pkg/fsutil/fs.go
@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
-	"strings"
 	"unicode"
 )
 
@@ -27,18 +26,10 @@ func IsFsPathCaseSensitive(path string) (bool, error) {
 	if err != nil { // cannot be case flipped
 		return false, err
 	}
-	i := strings.LastIndex(path, base)
-	if i < 0 { // shouldn't happen
-		return false, fmt.Errorf("could not case flip path %s", path)
-	}
 
-	flipped := []rune(path)
-	for _, c := range fBase { // replace base of path with the flipped one ( we need to flip the base or last dir part )
-		flipped[i] = c
-		i++
-	}
+	flippedPath := filepath.Join(filepath.Dir(path), fBase)
 
-	fiCase, err := os.Stat(string(flipped))
+	fiCase, err := os.Stat(flippedPath)
 	if err != nil { // cannot stat the case flipped path
 		return true, nil // fs of path should be case sensitive
 	}
diff --git a/pkg/fsutil/fs_test.go b/pkg/fsutil/fs_test.go
index 522e95fa6..155e76ba5 100644
--- a/pkg/fsutil/fs_test.go
+++ b/pkg/fsutil/fs_test.go
@@ -41,4 +41,15 @@ func TestIsFsPathCaseSensitive_UnicodeByteLength(t *testing.T) {
 	}
 
 	// assert.True(t, r, "expected fs to be case sensitive")
+
+	// Ensure that subfolders of a folder with multi-byte chars is not causing a panic
+	path3 := filepath.Join(dir, "NoPanic ❤️")
+	makeDir(path3)
+	path4 := filepath.Join(path3, "Test")
+	makeDir(path4)
+
+	_, err = IsFsPathCaseSensitive(path4)
+	if err != nil {
+		t.Fatal(err)
+	}
 }

From b9baa7ea9f0b737745fc500f7584442aeb116ebd Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Tue, 3 Mar 2026 08:26:04 +1100
Subject: [PATCH 335/405] Fix gallery image list styling

---
 ui/v2.5/src/components/Galleries/styles.scss | 5 +++++
 ui/v2.5/src/components/Images/ImageList.tsx  | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ui/v2.5/src/components/Galleries/styles.scss b/ui/v2.5/src/components/Galleries/styles.scss
index ac9330e9a..b59da415e 100644
--- a/ui/v2.5/src/components/Galleries/styles.scss
+++ b/ui/v2.5/src/components/Galleries/styles.scss
@@ -182,6 +182,11 @@ $galleryTabWidth: 450px;
   width: 100%;
 }
 
+@media (min-width: 1200px) {
+  .gallery-container .image-list .filtered-list-toolbar.has-selection {
+    top: 0;
+  }
+}
 @media (min-width: 1200px), (max-width: 575px) {
   .gallery-performers {
     .performer-card {
diff --git a/ui/v2.5/src/components/Images/ImageList.tsx b/ui/v2.5/src/components/Images/ImageList.tsx
index f47990c4c..50956b497 100644
--- a/ui/v2.5/src/components/Images/ImageList.tsx
+++ b/ui/v2.5/src/components/Images/ImageList.tsx
@@ -790,7 +790,7 @@ export const FilteredImageList = PatchComponent(
       <>
         {modal}
         {!withSidebar ? (
-          content
+          <div className="item-list-container image-list">{content}</div>
         ) : (
           <div
             className={cx("item-list-container image-list", {

From 1457ad590def3ac764982f97ea4983a777bd28d9 Mon Sep 17 00:00:00 2001
From: puc9 <51006296+puc9@users.noreply.github.com>
Date: Mon, 2 Mar 2026 14:11:28 -0800
Subject: [PATCH 336/405] Add Selective generate (#6621)

---
 graphql/schema/types/metadata.graphql         |  2 +
 internal/manager/manager_tasks.go             | 22 +++++++
 internal/manager/task_generate.go             | 32 +++++++---
 pkg/image/query.go                            | 31 ++++++++++
 .../Settings/Tasks/LibraryTasks.tsx           | 61 ++++++++++++++++---
 ui/v2.5/src/locales/en-GB.json                |  1 +
 6 files changed, 133 insertions(+), 16 deletions(-)

diff --git a/graphql/schema/types/metadata.graphql b/graphql/schema/types/metadata.graphql
index 27cbb86fb..e2601150b 100644
--- a/graphql/schema/types/metadata.graphql
+++ b/graphql/schema/types/metadata.graphql
@@ -26,6 +26,8 @@ input GenerateMetadataInput {
   imageIDs: [ID!]
   "gallery ids to generate for"
   galleryIDs: [ID!]
+  "paths to run generate on, in addition to the other ID lists"
+  paths: [String!]
 
   "overwrite existing media"
   overwrite: Boolean
diff --git a/internal/manager/manager_tasks.go b/internal/manager/manager_tasks.go
index e84fda9b9..c9e840519 100644
--- a/internal/manager/manager_tasks.go
+++ b/internal/manager/manager_tasks.go
@@ -74,6 +74,28 @@ func getScanPaths(inputPaths []string) []*config.StashConfig {
 	return ret
 }
 
+// Filters the input array for paths that are within the paths managed by stash
+func filterStashPaths(inputPaths []string) []string {
+	if len(inputPaths) == 0 {
+		return inputPaths
+	}
+
+	stashPaths := config.GetInstance().GetStashPaths()
+
+	var ret []string
+	for _, p := range inputPaths {
+		s := stashPaths.GetStashFromDirPath(p)
+		if s == nil {
+			logger.Warnf("%s is not in the configured stash paths", p)
+			continue
+		}
+
+		ret = append(ret, p)
+	}
+
+	return ret
+}
+
 // ScanSubscribe subscribes to a notification that is triggered when a
 // scan or clean is complete.
 func (s *Manager) ScanSubscribe(ctx context.Context) <-chan bool {
diff --git a/internal/manager/task_generate.go b/internal/manager/task_generate.go
index cc991d5d6..f2aab2b3c 100644
--- a/internal/manager/task_generate.go
+++ b/internal/manager/task_generate.go
@@ -43,6 +43,8 @@ type GenerateMetadataInput struct {
 	GalleryIDs []string `json:"galleryIDs"`
 	// overwrite existing media
 	Overwrite bool `json:"overwrite"`
+	// paths to run generate on, in addition to the other ID lists
+	Paths []string `json:"paths"`
 }
 
 type GeneratePreviewOptionsInput struct {
@@ -133,8 +135,13 @@ func (j *GenerateJob) Execute(ctx context.Context, progress *job.Progress) error
 		r := j.repository
 		if err := r.WithReadTxn(ctx, func(ctx context.Context) error {
 			qb := r.Scene
-			if len(j.input.SceneIDs) == 0 && len(j.input.MarkerIDs) == 0 && len(j.input.ImageIDs) == 0 && len(j.input.GalleryIDs) == 0 {
-				j.queueTasks(ctx, g, queue)
+			if len(j.input.SceneIDs) == 0 &&
+				len(j.input.MarkerIDs) == 0 &&
+				len(j.input.ImageIDs) == 0 &&
+				len(j.input.GalleryIDs) == 0 &&
+				len(j.input.Paths) == 0 {
+
+				j.queueTasks(ctx, g, nil, queue)
 			} else {
 				if len(j.input.SceneIDs) > 0 {
 					scenes, err = qb.FindMany(ctx, sceneIDs)
@@ -183,6 +190,11 @@ func (j *GenerateJob) Execute(ctx context.Context, progress *job.Progress) error
 						}
 					}
 				}
+
+				if len(j.input.Paths) > 0 {
+					paths := filterStashPaths(j.input.Paths)
+					j.queueTasks(ctx, g, paths, queue)
+				}
 			}
 
 			return nil
@@ -276,17 +288,18 @@ func (j *GenerateJob) Execute(ctx context.Context, progress *job.Progress) error
 	return nil
 }
 
-func (j *GenerateJob) queueTasks(ctx context.Context, g *generate.Generator, queue chan<- Task) {
+func (j *GenerateJob) queueTasks(ctx context.Context, g *generate.Generator, paths []string, queue chan<- Task) {
 	j.totals = totalsGenerate{}
 
-	j.queueScenesTasks(ctx, g, queue)
-	j.queueImagesTasks(ctx, g, queue)
+	j.queueScenesTasks(ctx, g, paths, queue)
+	j.queueImagesTasks(ctx, g, paths, queue)
 }
 
-func (j *GenerateJob) queueScenesTasks(ctx context.Context, g *generate.Generator, queue chan<- Task) {
+func (j *GenerateJob) queueScenesTasks(ctx context.Context, g *generate.Generator, paths []string, queue chan<- Task) {
 	const batchSize = 1000
 
 	findFilter := models.BatchFindFilter(batchSize)
+	sceneFilter := scene.FilterFromPaths(paths)
 
 	r := j.repository
 
@@ -295,7 +308,7 @@ func (j *GenerateJob) queueScenesTasks(ctx context.Context, g *generate.Generato
 			return
 		}
 
-		scenes, err := scene.Query(ctx, r.Scene, nil, findFilter)
+		scenes, err := scene.Query(ctx, r.Scene, sceneFilter, findFilter)
 		if err != nil {
 			logger.Errorf("Error encountered queuing files to scan: %s", err.Error())
 			return
@@ -322,10 +335,11 @@ func (j *GenerateJob) queueScenesTasks(ctx context.Context, g *generate.Generato
 	}
 }
 
-func (j *GenerateJob) queueImagesTasks(ctx context.Context, g *generate.Generator, queue chan<- Task) {
+func (j *GenerateJob) queueImagesTasks(ctx context.Context, g *generate.Generator, paths []string, queue chan<- Task) {
 	const batchSize = 1000
 
 	findFilter := models.BatchFindFilter(batchSize)
+	imageFilter := image.FilterFromPaths(paths)
 
 	r := j.repository
 
@@ -334,7 +348,7 @@ func (j *GenerateJob) queueImagesTasks(ctx context.Context, g *generate.Generato
 			return
 		}
 
-		images, err := image.Query(ctx, r.Image, nil, findFilter)
+		images, err := image.Query(ctx, r.Image, imageFilter, findFilter)
 		if err != nil {
 			logger.Errorf("Error encountered queuing files to scan: %s", err.Error())
 			return
diff --git a/pkg/image/query.go b/pkg/image/query.go
index b9b9e6628..958c9de9b 100644
--- a/pkg/image/query.go
+++ b/pkg/image/query.go
@@ -2,7 +2,9 @@ package image
 
 import (
 	"context"
+	"path/filepath"
 	"strconv"
+	"strings"
 
 	"github.com/stashapp/stash/pkg/models"
 )
@@ -46,6 +48,35 @@ func Query(ctx context.Context, qb Queryer, imageFilter *models.ImageFilterType,
 	return images, nil
 }
 
+// FilterFromPaths creates a ImageFilterType that filters using the provided
+// paths.
+func FilterFromPaths(paths []string) *models.ImageFilterType {
+	ret := &models.ImageFilterType{}
+	or := ret
+	sep := string(filepath.Separator)
+
+	for _, p := range paths {
+		if !strings.HasSuffix(p, sep) {
+			p += sep
+		}
+
+		if ret.Path == nil {
+			or = ret
+		} else {
+			newOr := &models.ImageFilterType{}
+			or.Or = newOr
+			or = newOr
+		}
+
+		or.Path = &models.StringCriterionInput{
+			Modifier: models.CriterionModifierEquals,
+			Value:    p + "%",
+		}
+	}
+
+	return ret
+}
+
 func CountByPerformerID(ctx context.Context, r QueryCounter, id int) (int, error) {
 	filter := &models.ImageFilterType{
 		Performers: &models.MultiCriterionInput{
diff --git a/ui/v2.5/src/components/Settings/Tasks/LibraryTasks.tsx b/ui/v2.5/src/components/Settings/Tasks/LibraryTasks.tsx
index 605e37933..6e9c13ea4 100644
--- a/ui/v2.5/src/components/Settings/Tasks/LibraryTasks.tsx
+++ b/ui/v2.5/src/components/Settings/Tasks/LibraryTasks.tsx
@@ -79,6 +79,7 @@ export const LibraryTasks: React.FC = () => {
     scan: false,
     autoTag: false,
     identify: false,
+    generate: false,
   });
 
   function getDefaultScanOptions(): GQL.ScanMetadataInput {
@@ -265,6 +266,41 @@ export const LibraryTasks: React.FC = () => {
     );
   }
 
+  function renderGenerateDialog() {
+    if (!dialogOpen.generate) {
+      return;
+    }
+
+    return <DirectorySelectionDialog onClose={onGenerateDialogClosed} />;
+  }
+
+  function onGenerateDialogClosed(paths?: string[]) {
+    if (paths) {
+      runGenerate(paths);
+    }
+
+    setDialogOpen({ generate: false });
+  }
+
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  async function runGenerate(paths?: string[]) {
+    try {
+      await mutateMetadataGenerate({
+        ...generateOptions,
+        paths,
+      });
+
+      Toast.success(
+        intl.formatMessage(
+          { id: "config.tasks.added_job_to_queue" },
+          { operation_name: intl.formatMessage({ id: "actions.generate" }) }
+        )
+      );
+    } catch (e) {
+      Toast.error(e);
+    }
+  }
+
   async function onGenerateClicked() {
     try {
       // insert preview options here instead of loading them
@@ -307,6 +343,7 @@ export const LibraryTasks: React.FC = () => {
       {renderScanDialog()}
       {renderAutoTagDialog()}
       {maybeRenderIdentifyDialog()}
+      {renderGenerateDialog()}
 
       <SettingSection headingID="library">
         <SettingGroup
@@ -425,13 +462,23 @@ export const LibraryTasks: React.FC = () => {
             subHeadingID: "config.tasks.generate_desc",
           }}
           topLevel={
-            <Button
-              variant="secondary"
-              type="submit"
-              onClick={() => onGenerateClicked()}
-            >
-              <FormattedMessage id="actions.generate" />
-            </Button>
+            <>
+              <Button
+                variant="secondary"
+                type="submit"
+                onClick={() => onGenerateClicked()}
+              >
+                <FormattedMessage id="actions.generate" />
+              </Button>
+              <Button
+                variant="secondary"
+                type="submit"
+                className="mr-2"
+                onClick={() => setDialogOpen({ generate: true })}
+              >
+                <FormattedMessage id="actions.selective_generate" />…
+              </Button>
+            </>
           }
           collapsible
         >
diff --git a/ui/v2.5/src/locales/en-GB.json b/ui/v2.5/src/locales/en-GB.json
index a25f3c765..56b11f3f9 100644
--- a/ui/v2.5/src/locales/en-GB.json
+++ b/ui/v2.5/src/locales/en-GB.json
@@ -123,6 +123,7 @@
     "invert_selection": "Invert Selection",
     "selective_auto_tag": "Selective auto tag",
     "selective_clean": "Selective clean",
+    "selective_generate": "Selective generate",
     "selective_scan": "Selective scan",
     "set_as_default": "Set as default",
     "set_back_image": "Back image…",

From cd0980201c6eda6046f8a61f8a34cf98603fed0f Mon Sep 17 00:00:00 2001
From: Matt Stone <matt@mattstone.com.au>
Date: Wed, 4 Mar 2026 07:17:14 +1000
Subject: [PATCH 337/405] feat: Add .stashignore support for gitignore-style
 scan exclusions (#6485)

Co-authored-by: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
---
 go.mod                                    |   1 +
 go.sum                                    |   2 +
 internal/manager/scan_stashignore_test.go | 268 +++++++++++
 internal/manager/task_clean.go            |  11 +-
 internal/manager/task_scan.go             |   8 +
 pkg/file/stashignore.go                   | 255 +++++++++++
 pkg/file/stashignore_test.go              | 523 ++++++++++++++++++++++
 ui/v2.5/src/docs/en/Manual/Tasks.md       |  33 ++
 8 files changed, 1099 insertions(+), 2 deletions(-)
 create mode 100644 internal/manager/scan_stashignore_test.go
 create mode 100644 pkg/file/stashignore.go
 create mode 100644 pkg/file/stashignore_test.go

diff --git a/go.mod b/go.mod
index db0d6fe34..348036710 100644
--- a/go.mod
+++ b/go.mod
@@ -44,6 +44,7 @@ require (
 	github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8
 	github.com/remeh/sizedwaitgroup v1.0.0
 	github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd
+	github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06
 	github.com/sirupsen/logrus v1.9.3
 	github.com/spf13/cast v1.6.0
 	github.com/spf13/pflag v1.0.6
diff --git a/go.sum b/go.sum
index dbe82cf99..4e19720f5 100644
--- a/go.sum
+++ b/go.sum
@@ -537,6 +537,8 @@ github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd h1:CmH9+J6ZSsIjUK
 github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd/go.mod h1:hPqNNc0+uJM6H+SuU8sEs5K5IQeKccPqeSjfgcKGgPk=
 github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/ryszard/goskiplist v0.0.0-20150312221310-2dfbae5fcf46/go.mod h1:uAQ5PCi+MFsC7HjREoAz1BU+Mq60+05gifQSsHSDG/8=
+github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 h1:OkMGxebDjyw0ULyrTYWeN0UNCCkmCWfjPnIA2W6oviI=
+github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06/go.mod h1:+ePHsJ1keEjQtpvf9HHw0f4ZeJ0TLRsxhunSI2hYJSs=
 github.com/sagikazarmark/crypt v0.3.0/go.mod h1:uD/D+6UF4SrIR1uGEv7bBNkNqLGqUr43MRiaGWX1Nig=
 github.com/sagikazarmark/crypt v0.4.0/go.mod h1:ALv2SRj7GxYV4HO9elxH9nS6M9gW+xDNxqmyJ6RfDFM=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
diff --git a/internal/manager/scan_stashignore_test.go b/internal/manager/scan_stashignore_test.go
new file mode 100644
index 000000000..fafd246e8
--- /dev/null
+++ b/internal/manager/scan_stashignore_test.go
@@ -0,0 +1,268 @@
+//go:build integration
+// +build integration
+
+package manager
+
+import (
+	"context"
+	"io/fs"
+	"os"
+	"path/filepath"
+	"testing"
+
+	"github.com/stashapp/stash/pkg/file"
+
+	// Necessary to register custom migrations.
+	_ "github.com/stashapp/stash/pkg/sqlite/migrations"
+)
+
+// stashIgnorePathFilter wraps StashIgnoreFilter to implement PathFilter for testing.
+// It provides a fixed library root for the filter.
+type stashIgnorePathFilter struct {
+	filter      *file.StashIgnoreFilter
+	libraryRoot string
+}
+
+func (f *stashIgnorePathFilter) Accept(ctx context.Context, path string, info fs.FileInfo) bool {
+	return f.filter.Accept(ctx, path, info, f.libraryRoot)
+}
+
+// createTestFileOnDisk creates a file with some content.
+func createTestFileOnDisk(t *testing.T, dir, name string) string {
+	t.Helper()
+	path := filepath.Join(dir, name)
+	if err := os.MkdirAll(filepath.Dir(path), 0755); err != nil {
+		t.Fatalf("failed to create directory for %s: %v", path, err)
+	}
+	// Write some content so the file has a non-zero size.
+	if err := os.WriteFile(path, []byte("test content for "+name), 0644); err != nil {
+		t.Fatalf("failed to create file %s: %v", path, err)
+	}
+	return path
+}
+
+// createStashIgnoreFile creates a .stashignore file with the given content.
+func createStashIgnoreFile(t *testing.T, dir, content string) {
+	t.Helper()
+	path := filepath.Join(dir, ".stashignore")
+	if err := os.WriteFile(path, []byte(content), 0644); err != nil {
+		t.Fatalf("failed to create .stashignore: %v", err)
+	}
+}
+
+func TestScannerWithStashIgnore(t *testing.T) {
+	// Create temp directory structure.
+	tmpDir := t.TempDir()
+
+	// Create test files.
+	createTestFileOnDisk(t, tmpDir, "video1.mp4")
+	createTestFileOnDisk(t, tmpDir, "video2.mp4")
+	createTestFileOnDisk(t, tmpDir, "ignore_me.mp4")
+	createTestFileOnDisk(t, tmpDir, "subdir/video3.mp4")
+	createTestFileOnDisk(t, tmpDir, "subdir/skip_this.mp4")
+	createTestFileOnDisk(t, tmpDir, "excluded_dir/video4.mp4")
+	createTestFileOnDisk(t, tmpDir, "temp/processing.mp4")
+
+	// Create .stashignore file.
+	stashignore := `# Ignore specific files
+ignore_me.mp4
+subdir/skip_this.mp4
+
+# Ignore directories
+excluded_dir/
+temp/
+`
+	createStashIgnoreFile(t, tmpDir, stashignore)
+
+	// Create stashignore filter with library root.
+	stashIgnoreFilter := &stashIgnorePathFilter{
+		filter:      file.NewStashIgnoreFilter(),
+		libraryRoot: tmpDir,
+	}
+
+	// Create scanner.
+	scanner := &file.Scanner{
+		ScanFilters: []file.PathFilter{stashIgnoreFilter},
+	}
+
+	testScenarios := []struct {
+		path     string
+		accepted bool
+	}{
+		{filepath.Join(tmpDir, "video1.mp4"), true},
+		{filepath.Join(tmpDir, "video2.mp4"), true},
+		{filepath.Join(tmpDir, "ignore_me.mp4"), false},
+		{filepath.Join(tmpDir, "subdir/video3.mp4"), true},
+		{filepath.Join(tmpDir, "subdir/skip_this.mp4"), false},
+		{filepath.Join(tmpDir, "excluded_dir/video4.mp4"), false},
+		{filepath.Join(tmpDir, "temp/processing.mp4"), false},
+	}
+
+	ctx := context.Background()
+
+	for _, scenario := range testScenarios {
+		info, err := os.Stat(scenario.path)
+		if err != nil {
+			t.Fatalf("failed to stat file %s: %v", scenario.path, err)
+		}
+		accepted := scanner.AcceptEntry(ctx, scenario.path, info)
+
+		if accepted != scenario.accepted {
+			t.Errorf("unexpected accept result for %s: expected %v, got %v",
+				scenario.path, scenario.accepted, accepted)
+		}
+	}
+}
+
+func TestScannerWithNestedStashIgnore(t *testing.T) {
+	// Create temp directory structure.
+	tmpDir := t.TempDir()
+
+	// Create test files.
+	createTestFileOnDisk(t, tmpDir, "root.mp4")
+	createTestFileOnDisk(t, tmpDir, "root.tmp")
+	createTestFileOnDisk(t, tmpDir, "subdir/sub.mp4")
+	createTestFileOnDisk(t, tmpDir, "subdir/sub.log")
+	createTestFileOnDisk(t, tmpDir, "subdir/sub.tmp")
+
+	// Root .stashignore excludes *.tmp.
+	createStashIgnoreFile(t, tmpDir, "*.tmp\n")
+
+	// Subdir .stashignore excludes *.log.
+	createStashIgnoreFile(t, filepath.Join(tmpDir, "subdir"), "*.log\n")
+
+	// Create stashignore filter with library root.
+	stashIgnoreFilter := &stashIgnorePathFilter{
+		filter:      file.NewStashIgnoreFilter(),
+		libraryRoot: tmpDir,
+	}
+
+	// Create scanner.
+	scanner := &file.Scanner{
+		ScanFilters: []file.PathFilter{stashIgnoreFilter},
+	}
+
+	testScenarios := []struct {
+		path     string
+		accepted bool
+	}{
+		{filepath.Join(tmpDir, "root.mp4"), true},
+		{filepath.Join(tmpDir, "root.tmp"), false},
+		{filepath.Join(tmpDir, "subdir/sub.mp4"), true},
+		{filepath.Join(tmpDir, "subdir/sub.log"), false},
+		{filepath.Join(tmpDir, "subdir/sub.tmp"), false},
+	}
+
+	ctx := context.Background()
+
+	for _, scenario := range testScenarios {
+		info, err := os.Stat(scenario.path)
+		if err != nil {
+			t.Fatalf("failed to stat file %s: %v", scenario.path, err)
+		}
+		accepted := scanner.AcceptEntry(ctx, scenario.path, info)
+
+		if accepted != scenario.accepted {
+			t.Errorf("unexpected accept result for %s: expected %v, got %v",
+				scenario.path, scenario.accepted, accepted)
+		}
+	}
+}
+
+func TestScannerWithoutStashIgnore(t *testing.T) {
+	// Create temp directory structure (no .stashignore).
+	tmpDir := t.TempDir()
+
+	// Create test files.
+	createTestFileOnDisk(t, tmpDir, "video1.mp4")
+	createTestFileOnDisk(t, tmpDir, "video2.mp4")
+	createTestFileOnDisk(t, tmpDir, "subdir/video3.mp4")
+
+	// Create stashignore filter with library root (but no .stashignore file exists).
+	stashIgnoreFilter := &stashIgnorePathFilter{
+		filter:      file.NewStashIgnoreFilter(),
+		libraryRoot: tmpDir,
+	}
+
+	// Create scanner.
+	scanner := &file.Scanner{
+		ScanFilters: []file.PathFilter{stashIgnoreFilter},
+	}
+
+	testScenarios := []struct {
+		path     string
+		accepted bool
+	}{
+		{filepath.Join(tmpDir, "video1.mp4"), true},
+		{filepath.Join(tmpDir, "video2.mp4"), true},
+		{filepath.Join(tmpDir, "subdir/video3.mp4"), true},
+	}
+
+	ctx := context.Background()
+
+	for _, scenario := range testScenarios {
+		info, err := os.Stat(scenario.path)
+		if err != nil {
+			t.Fatalf("failed to stat file %s: %v", scenario.path, err)
+		}
+		accepted := scanner.AcceptEntry(ctx, scenario.path, info)
+
+		if accepted != scenario.accepted {
+			t.Errorf("unexpected accept result for %s: expected %v, got %v",
+				scenario.path, scenario.accepted, accepted)
+		}
+	}
+}
+
+func TestScannerWithNegationPattern(t *testing.T) {
+	// Create temp directory structure.
+	tmpDir := t.TempDir()
+
+	// Create test files.
+	createTestFileOnDisk(t, tmpDir, "file1.tmp")
+	createTestFileOnDisk(t, tmpDir, "file2.tmp")
+	createTestFileOnDisk(t, tmpDir, "keep_this.tmp")
+	createTestFileOnDisk(t, tmpDir, "video.mp4")
+
+	// Create .stashignore with negation.
+	stashignore := `*.tmp
+!keep_this.tmp
+`
+	createStashIgnoreFile(t, tmpDir, stashignore)
+
+	// Create stashignore filter with library root.
+	stashIgnoreFilter := &stashIgnorePathFilter{
+		filter:      file.NewStashIgnoreFilter(),
+		libraryRoot: tmpDir,
+	}
+
+	// Create scanner.
+	scanner := &file.Scanner{
+		ScanFilters: []file.PathFilter{stashIgnoreFilter},
+	}
+
+	testScenarios := []struct {
+		path     string
+		accepted bool
+	}{
+		{filepath.Join(tmpDir, "file1.tmp"), false},
+		{filepath.Join(tmpDir, "file2.tmp"), false},
+		{filepath.Join(tmpDir, "keep_this.tmp"), true},
+		{filepath.Join(tmpDir, "video.mp4"), true},
+	}
+
+	ctx := context.Background()
+
+	for _, scenario := range testScenarios {
+		info, err := os.Stat(scenario.path)
+		if err != nil {
+			t.Fatalf("failed to stat file %s: %v", scenario.path, err)
+		}
+		accepted := scanner.AcceptEntry(ctx, scenario.path, info)
+
+		if accepted != scenario.accepted {
+			t.Errorf("unexpected accept result for %s: expected %v, got %v",
+				scenario.path, scenario.accepted, accepted)
+		}
+	}
+}
diff --git a/internal/manager/task_clean.go b/internal/manager/task_clean.go
index ddd86e2f2..9a20b3990 100644
--- a/internal/manager/task_clean.go
+++ b/internal/manager/task_clean.go
@@ -154,6 +154,7 @@ func newCleanFilter(c *config.Config) *cleanFilter {
 			generatedPath:     c.GetGeneratedPath(),
 			videoExcludeRegex: generateRegexps(c.GetExcludes()),
 			imageExcludeRegex: generateRegexps(c.GetImageExcludes()),
+			stashIgnoreFilter: file.NewStashIgnoreFilter(),
 		},
 	}
 }
@@ -173,12 +174,18 @@ func (f *cleanFilter) Accept(ctx context.Context, path string, info fs.FileInfo)
 	}
 
 	if stash == nil {
-		logger.Infof("%s not in any stash library directories. Marking to clean: \"%s\"", fileOrFolder, path)
+		logger.Infof("%s not in any stash library directories. Marking to clean: %q", fileOrFolder, path)
 		return false
 	}
 
 	if fsutil.IsPathInDir(generatedPath, path) {
-		logger.Infof("%s is in generated path. Marking to clean: \"%s\"", fileOrFolder, path)
+		logger.Infof("%s is in generated path. Marking to clean: %q", fileOrFolder, path)
+		return false
+	}
+
+	// Check .stashignore files, bounded to the library root.
+	if !f.stashIgnoreFilter.Accept(ctx, path, info, stash.Path) {
+		logger.Infof("%s is excluded due to .stashignore. Marking to clean: %q", fileOrFolder, path)
 		return false
 	}
 
diff --git a/internal/manager/task_scan.go b/internal/manager/task_scan.go
index cf675a5af..a006abbf8 100644
--- a/internal/manager/task_scan.go
+++ b/internal/manager/task_scan.go
@@ -549,6 +549,7 @@ type scanFilter struct {
 	videoExcludeRegex []*regexp.Regexp
 	imageExcludeRegex []*regexp.Regexp
 	minModTime        time.Time
+	stashIgnoreFilter *file.StashIgnoreFilter
 }
 
 func newScanFilter(c *config.Config, repo models.Repository, minModTime time.Time) *scanFilter {
@@ -560,6 +561,7 @@ func newScanFilter(c *config.Config, repo models.Repository, minModTime time.Tim
 		videoExcludeRegex: generateRegexps(c.GetExcludes()),
 		imageExcludeRegex: generateRegexps(c.GetImageExcludes()),
 		minModTime:        minModTime,
+		stashIgnoreFilter: file.NewStashIgnoreFilter(),
 	}
 }
 
@@ -580,6 +582,12 @@ func (f *scanFilter) Accept(ctx context.Context, path string, info fs.FileInfo)
 		return false
 	}
 
+	// Check .stashignore files, bounded to the library root.
+	if !f.stashIgnoreFilter.Accept(ctx, path, info, s.Path) {
+		logger.Debugf("Skipping %s due to .stashignore", path)
+		return false
+	}
+
 	isVideoFile := useAsVideo(path)
 	isImageFile := useAsImage(path)
 	isZipFile := fsutil.MatchExtension(path, f.zipExt)
diff --git a/pkg/file/stashignore.go b/pkg/file/stashignore.go
new file mode 100644
index 000000000..160b5c224
--- /dev/null
+++ b/pkg/file/stashignore.go
@@ -0,0 +1,255 @@
+package file
+
+import (
+	"context"
+	"io/fs"
+	"os"
+	"path/filepath"
+	"strings"
+	"sync"
+
+	lru "github.com/hashicorp/golang-lru/v2"
+	ignore "github.com/sabhiram/go-gitignore"
+	"github.com/stashapp/stash/pkg/logger"
+)
+
+const stashIgnoreFilename = ".stashignore"
+
+// entriesCacheSize is the size of the LRU cache for collected ignore entries.
+// This cache stores the computed list of ignore entries per directory, avoiding
+// repeated directory tree walks for files in the same directory.
+const entriesCacheSize = 500
+
+// StashIgnoreFilter implements PathFilter to exclude files/directories
+// based on .stashignore files with gitignore-style patterns.
+type StashIgnoreFilter struct {
+	// cache stores compiled ignore patterns per directory.
+	cache sync.Map // map[string]*ignoreEntry
+	// entriesCache stores collected ignore entries per (dir, libraryRoot) pair.
+	// This avoids recomputing the entry list for every file in the same directory.
+	entriesCache *lru.Cache[string, []*ignoreEntry]
+}
+
+// ignoreEntry holds the compiled ignore patterns for a directory.
+type ignoreEntry struct {
+	// patterns is the compiled gitignore matcher for this directory.
+	patterns *ignore.GitIgnore
+	// dir is the directory this entry applies to.
+	dir string
+}
+
+// NewStashIgnoreFilter creates a new StashIgnoreFilter.
+func NewStashIgnoreFilter() *StashIgnoreFilter {
+	// Create the LRU cache for collected entries.
+	// Ignore error as it only fails if size <= 0.
+	entriesCache, _ := lru.New[string, []*ignoreEntry](entriesCacheSize)
+	return &StashIgnoreFilter{
+		entriesCache: entriesCache,
+	}
+}
+
+// Accept returns true if the path should be included in the scan.
+// It checks for .stashignore files in the directory hierarchy and
+// applies gitignore-style pattern matching.
+// The libraryRoot parameter bounds the search for .stashignore files -
+// only directories within the library root are checked.
+func (f *StashIgnoreFilter) Accept(ctx context.Context, path string, info fs.FileInfo, libraryRoot string) bool {
+	// If no library root provided, accept the file (safety fallback).
+	if libraryRoot == "" {
+		return true
+	}
+
+	// Get the directory containing this path.
+	dir := filepath.Dir(path)
+
+	// Collect all applicable ignore entries from library root to this directory.
+	entries := f.collectIgnoreEntries(dir, libraryRoot)
+
+	// If no .stashignore files found, accept the file.
+	if len(entries) == 0 {
+		return true
+	}
+
+	// Check each ignore entry in order (from root to most specific).
+	// Later entries can override earlier ones with negation patterns.
+	ignored := false
+	for _, entry := range entries {
+		// Get path relative to the ignore file's directory.
+		entryRelPath, err := filepath.Rel(entry.dir, path)
+		if err != nil {
+			continue
+		}
+		entryRelPath = filepath.ToSlash(entryRelPath)
+		if info.IsDir() {
+			entryRelPath += "/"
+		}
+
+		if entry.patterns.MatchesPath(entryRelPath) {
+			ignored = true
+		}
+	}
+
+	return !ignored
+}
+
+// collectIgnoreEntries gathers all ignore entries from library root to the given directory.
+// It walks up the directory tree from dir to libraryRoot and returns entries in order
+// from root to most specific. Results are cached to avoid repeated computation for
+// files in the same directory.
+func (f *StashIgnoreFilter) collectIgnoreEntries(dir string, libraryRoot string) []*ignoreEntry {
+	// Clean paths for consistent comparison and cache key generation.
+	dir = filepath.Clean(dir)
+	libraryRoot = filepath.Clean(libraryRoot)
+
+	// Build cache key from dir and libraryRoot.
+	cacheKey := dir + "\x00" + libraryRoot
+
+	// Check the entries cache first.
+	if cached, ok := f.entriesCache.Get(cacheKey); ok {
+		return cached
+	}
+
+	// Try subdirectory shortcut: if parent's entries are cached, extend them.
+	if dir != libraryRoot {
+		parent := filepath.Dir(dir)
+		if isPathInOrEqual(libraryRoot, parent) {
+			parentKey := parent + "\x00" + libraryRoot
+			if parentEntries, ok := f.entriesCache.Get(parentKey); ok {
+				// Parent is cached - just check if current dir has a .stashignore.
+				entries := parentEntries
+				if entry := f.getOrLoadIgnoreEntry(dir); entry != nil {
+					// Copy parent slice and append to avoid mutating cached slice.
+					entries = make([]*ignoreEntry, len(parentEntries), len(parentEntries)+1)
+					copy(entries, parentEntries)
+					entries = append(entries, entry)
+				}
+				f.entriesCache.Add(cacheKey, entries)
+				return entries
+			}
+		}
+	}
+
+	// No cache hit - compute from scratch.
+	// Walk up from dir to library root, collecting directories.
+	var dirs []string
+	current := dir
+	for {
+		// Check if we're still within the library root.
+		if !isPathInOrEqual(libraryRoot, current) {
+			break
+		}
+
+		dirs = append(dirs, current)
+
+		// Stop if we've reached the library root.
+		if current == libraryRoot {
+			break
+		}
+
+		parent := filepath.Dir(current)
+		if parent == current {
+			// Reached filesystem root without finding library root.
+			break
+		}
+		current = parent
+	}
+
+	// Reverse to get root-to-leaf order.
+	for i, j := 0, len(dirs)-1; i < j; i, j = i+1, j-1 {
+		dirs[i], dirs[j] = dirs[j], dirs[i]
+	}
+
+	// Check each directory for .stashignore files.
+	var entries []*ignoreEntry
+	for _, d := range dirs {
+		if entry := f.getOrLoadIgnoreEntry(d); entry != nil {
+			entries = append(entries, entry)
+		}
+	}
+
+	// Cache the result.
+	f.entriesCache.Add(cacheKey, entries)
+
+	return entries
+}
+
+// isPathInOrEqual checks if path is equal to or inside root.
+func isPathInOrEqual(root, path string) bool {
+	if path == root {
+		return true
+	}
+	// Check if path starts with root + separator.
+	return strings.HasPrefix(path, root+string(filepath.Separator))
+}
+
+// getOrLoadIgnoreEntry returns the cached ignore entry for a directory, or loads it.
+func (f *StashIgnoreFilter) getOrLoadIgnoreEntry(dir string) *ignoreEntry {
+	// Check cache first.
+	if cached, ok := f.cache.Load(dir); ok {
+		entry := cached.(*ignoreEntry)
+		if entry.patterns == nil {
+			return nil // Cached negative result.
+		}
+		return entry
+	}
+
+	// Try to load .stashignore from this directory.
+	stashIgnorePath := filepath.Join(dir, stashIgnoreFilename)
+	patterns, err := f.loadIgnoreFile(stashIgnorePath)
+	if err != nil {
+		if !os.IsNotExist(err) {
+			logger.Warnf("Failed to load .stashignore from %s: %v", dir, err)
+		}
+		f.cache.Store(dir, &ignoreEntry{patterns: nil, dir: dir})
+		return nil
+	}
+	if patterns == nil {
+		// File exists but has no patterns (empty or only comments).
+		f.cache.Store(dir, &ignoreEntry{patterns: nil, dir: dir})
+		return nil
+	}
+
+	logger.Debugf("Loaded .stashignore from %s", dir)
+
+	entry := &ignoreEntry{
+		patterns: patterns,
+		dir:      dir,
+	}
+	f.cache.Store(dir, entry)
+	return entry
+}
+
+// loadIgnoreFile loads and compiles a .stashignore file.
+func (f *StashIgnoreFilter) loadIgnoreFile(path string) (*ignore.GitIgnore, error) {
+	data, err := os.ReadFile(path)
+	if err != nil {
+		return nil, err
+	}
+
+	lines := strings.Split(string(data), "\n")
+	var patterns []string
+
+	for _, line := range lines {
+		// Trim trailing whitespace (but preserve leading for patterns).
+		line = strings.TrimRight(line, " \t\r")
+
+		// Skip empty lines.
+		if line == "" {
+			continue
+		}
+
+		// Skip comments (but not escaped #).
+		if strings.HasPrefix(line, "#") && !strings.HasPrefix(line, "\\#") {
+			continue
+		}
+
+		patterns = append(patterns, line)
+	}
+
+	if len(patterns) == 0 {
+		// File exists but has no patterns (e.g., only comments).
+		return nil, nil
+	}
+
+	return ignore.CompileIgnoreLines(patterns...), nil
+}
diff --git a/pkg/file/stashignore_test.go b/pkg/file/stashignore_test.go
new file mode 100644
index 000000000..5297f544b
--- /dev/null
+++ b/pkg/file/stashignore_test.go
@@ -0,0 +1,523 @@
+package file
+
+import (
+	"context"
+	"io/fs"
+	"os"
+	"path/filepath"
+	"sort"
+	"testing"
+)
+
+// Helper to create an empty file.
+func createTestFile(t *testing.T, dir, name string) {
+	t.Helper()
+	path := filepath.Join(dir, name)
+	if err := os.MkdirAll(filepath.Dir(path), 0755); err != nil {
+		t.Fatalf("failed to create directory for %s: %v", path, err)
+	}
+	if err := os.WriteFile(path, []byte{}, 0644); err != nil {
+		t.Fatalf("failed to create file %s: %v", path, err)
+	}
+}
+
+// Helper to create a file with content.
+func createTestFileWithContent(t *testing.T, dir, name, content string) {
+	t.Helper()
+	path := filepath.Join(dir, name)
+	if err := os.MkdirAll(filepath.Dir(path), 0755); err != nil {
+		t.Fatalf("failed to create directory for %s: %v", path, err)
+	}
+	if err := os.WriteFile(path, []byte(content), 0644); err != nil {
+		t.Fatalf("failed to create file %s: %v", path, err)
+	}
+}
+
+// Helper to create a directory.
+func createTestDir(t *testing.T, dir, name string) {
+	t.Helper()
+	path := filepath.Join(dir, name)
+	if err := os.MkdirAll(path, 0755); err != nil {
+		t.Fatalf("failed to create directory %s: %v", path, err)
+	}
+}
+
+// walkAndFilter walks the directory tree and returns paths accepted by the filter.
+// Returns paths relative to root for easier assertion.
+func walkAndFilter(t *testing.T, root string, filter *StashIgnoreFilter) []string {
+	t.Helper()
+	var accepted []string
+	ctx := context.Background()
+
+	err := filepath.WalkDir(root, func(path string, d fs.DirEntry, err error) error {
+		if err != nil {
+			return err
+		}
+
+		// Skip the root directory itself.
+		if path == root {
+			return nil
+		}
+
+		info, err := d.Info()
+		if err != nil {
+			return err
+		}
+
+		if filter.Accept(ctx, path, info, root) {
+			relPath, _ := filepath.Rel(root, path)
+			accepted = append(accepted, relPath)
+		} else if info.IsDir() {
+			// If directory is rejected, skip it.
+			return filepath.SkipDir
+		}
+
+		return nil
+	})
+
+	if err != nil {
+		t.Fatalf("walk failed: %v", err)
+	}
+
+	sort.Strings(accepted)
+	return accepted
+}
+
+// assertPathsEqual checks that the accepted paths match expected.
+func assertPathsEqual(t *testing.T, expected, actual []string) {
+	t.Helper()
+	sort.Strings(expected)
+
+	if len(expected) != len(actual) {
+		t.Errorf("path count mismatch:\nexpected %d: %v\nactual %d: %v", len(expected), expected, len(actual), actual)
+		return
+	}
+
+	for i := range expected {
+		if expected[i] != actual[i] {
+			t.Errorf("path mismatch at index %d:\nexpected: %s\nactual: %s", i, expected[i], actual[i])
+		}
+	}
+}
+
+func TestStashIgnore_ExactFilename(t *testing.T) {
+	tmpDir := t.TempDir()
+
+	// Create test files.
+	createTestFile(t, tmpDir, "video1.mp4")
+	createTestFile(t, tmpDir, "video2.mp4")
+	createTestFile(t, tmpDir, "ignore_me.mp4")
+
+	// Create .stashignore that excludes exact filename.
+	createTestFileWithContent(t, tmpDir, ".stashignore", "ignore_me.mp4\n")
+
+	filter := NewStashIgnoreFilter()
+	accepted := walkAndFilter(t, tmpDir, filter)
+
+	expected := []string{
+		".stashignore",
+		"video1.mp4",
+		"video2.mp4",
+	}
+
+	assertPathsEqual(t, expected, accepted)
+}
+
+func TestStashIgnore_WildcardPattern(t *testing.T) {
+	tmpDir := t.TempDir()
+
+	// Create test files.
+	createTestFile(t, tmpDir, "video1.mp4")
+	createTestFile(t, tmpDir, "video2.mp4")
+	createTestFile(t, tmpDir, "temp1.tmp")
+	createTestFile(t, tmpDir, "temp2.tmp")
+	createTestFile(t, tmpDir, "notes.log")
+
+	// Create .stashignore that excludes by extension.
+	createTestFileWithContent(t, tmpDir, ".stashignore", "*.tmp\n*.log\n")
+
+	filter := NewStashIgnoreFilter()
+	accepted := walkAndFilter(t, tmpDir, filter)
+
+	expected := []string{
+		".stashignore",
+		"video1.mp4",
+		"video2.mp4",
+	}
+
+	assertPathsEqual(t, expected, accepted)
+}
+
+func TestStashIgnore_DirectoryExclusion(t *testing.T) {
+	tmpDir := t.TempDir()
+
+	// Create test files.
+	createTestFile(t, tmpDir, "video1.mp4")
+	createTestDir(t, tmpDir, "excluded_dir")
+	createTestFile(t, tmpDir, "excluded_dir/video2.mp4")
+	createTestFile(t, tmpDir, "excluded_dir/video3.mp4")
+	createTestDir(t, tmpDir, "included_dir")
+	createTestFile(t, tmpDir, "included_dir/video4.mp4")
+
+	// Create .stashignore that excludes a directory.
+	createTestFileWithContent(t, tmpDir, ".stashignore", "excluded_dir/\n")
+
+	filter := NewStashIgnoreFilter()
+	accepted := walkAndFilter(t, tmpDir, filter)
+
+	expected := []string{
+		".stashignore",
+		"included_dir",
+		"included_dir/video4.mp4",
+		"video1.mp4",
+	}
+
+	assertPathsEqual(t, expected, accepted)
+}
+
+func TestStashIgnore_NegationPattern(t *testing.T) {
+	tmpDir := t.TempDir()
+
+	// Create test files.
+	createTestFile(t, tmpDir, "file1.tmp")
+	createTestFile(t, tmpDir, "file2.tmp")
+	createTestFile(t, tmpDir, "keep_this.tmp")
+
+	// Create .stashignore that excludes *.tmp but keeps one.
+	createTestFileWithContent(t, tmpDir, ".stashignore", "*.tmp\n!keep_this.tmp\n")
+
+	filter := NewStashIgnoreFilter()
+	accepted := walkAndFilter(t, tmpDir, filter)
+
+	expected := []string{
+		".stashignore",
+		"keep_this.tmp",
+	}
+
+	assertPathsEqual(t, expected, accepted)
+}
+
+func TestStashIgnore_CommentsAndEmptyLines(t *testing.T) {
+	tmpDir := t.TempDir()
+
+	// Create test files.
+	createTestFile(t, tmpDir, "video1.mp4")
+	createTestFile(t, tmpDir, "ignore_me.mp4")
+
+	// Create .stashignore with comments and empty lines.
+	stashignore := `# This is a comment
+ignore_me.mp4
+
+# Another comment
+
+`
+	createTestFileWithContent(t, tmpDir, ".stashignore", stashignore)
+
+	filter := NewStashIgnoreFilter()
+	accepted := walkAndFilter(t, tmpDir, filter)
+
+	expected := []string{
+		".stashignore",
+		"video1.mp4",
+	}
+
+	assertPathsEqual(t, expected, accepted)
+}
+
+func TestStashIgnore_NestedStashIgnoreFiles(t *testing.T) {
+	tmpDir := t.TempDir()
+
+	// Create test files.
+	createTestFile(t, tmpDir, "root_video.mp4")
+	createTestFile(t, tmpDir, "root_ignore.tmp")
+	createTestDir(t, tmpDir, "subdir")
+	createTestFile(t, tmpDir, "subdir/sub_video.mp4")
+	createTestFile(t, tmpDir, "subdir/sub_ignore.log")
+	createTestFile(t, tmpDir, "subdir/also_tmp.tmp")
+
+	// Root .stashignore excludes *.tmp.
+	createTestFileWithContent(t, tmpDir, ".stashignore", "*.tmp\n")
+
+	// Subdir .stashignore excludes *.log.
+	createTestFileWithContent(t, tmpDir, "subdir/.stashignore", "*.log\n")
+
+	filter := NewStashIgnoreFilter()
+	accepted := walkAndFilter(t, tmpDir, filter)
+
+	// *.tmp from root should apply everywhere.
+	// *.log from subdir should only apply in subdir.
+	expected := []string{
+		".stashignore",
+		"root_video.mp4",
+		"subdir",
+		"subdir/.stashignore",
+		"subdir/sub_video.mp4",
+	}
+
+	assertPathsEqual(t, expected, accepted)
+}
+
+func TestStashIgnore_PathPattern(t *testing.T) {
+	tmpDir := t.TempDir()
+
+	// Create test files.
+	createTestFile(t, tmpDir, "video1.mp4")
+	createTestDir(t, tmpDir, "subdir")
+	createTestFile(t, tmpDir, "subdir/video2.mp4")
+	createTestFile(t, tmpDir, "subdir/skip_this.mp4")
+
+	// Create .stashignore that excludes a specific path.
+	createTestFileWithContent(t, tmpDir, ".stashignore", "subdir/skip_this.mp4\n")
+
+	filter := NewStashIgnoreFilter()
+	accepted := walkAndFilter(t, tmpDir, filter)
+
+	expected := []string{
+		".stashignore",
+		"subdir",
+		"subdir/video2.mp4",
+		"video1.mp4",
+	}
+
+	assertPathsEqual(t, expected, accepted)
+}
+
+func TestStashIgnore_DoubleStarPattern(t *testing.T) {
+	tmpDir := t.TempDir()
+
+	// Create test files.
+	createTestFile(t, tmpDir, "video1.mp4")
+	createTestDir(t, tmpDir, "a")
+	createTestFile(t, tmpDir, "a/video2.mp4")
+	createTestDir(t, tmpDir, "a/temp")
+	createTestFile(t, tmpDir, "a/temp/video3.mp4")
+	createTestDir(t, tmpDir, "a/b")
+	createTestDir(t, tmpDir, "a/b/temp")
+	createTestFile(t, tmpDir, "a/b/temp/video4.mp4")
+
+	// Create .stashignore that excludes temp directories at any level.
+	createTestFileWithContent(t, tmpDir, ".stashignore", "**/temp/\n")
+
+	filter := NewStashIgnoreFilter()
+	accepted := walkAndFilter(t, tmpDir, filter)
+
+	expected := []string{
+		".stashignore",
+		"a",
+		"a/b",
+		"a/video2.mp4",
+		"video1.mp4",
+	}
+
+	assertPathsEqual(t, expected, accepted)
+}
+
+func TestStashIgnore_LeadingSlashPattern(t *testing.T) {
+	tmpDir := t.TempDir()
+
+	// Create test files.
+	createTestFile(t, tmpDir, "ignore.mp4")
+	createTestDir(t, tmpDir, "subdir")
+	createTestFile(t, tmpDir, "subdir/ignore.mp4")
+
+	// Create .stashignore that excludes only at root level.
+	createTestFileWithContent(t, tmpDir, ".stashignore", "/ignore.mp4\n")
+
+	filter := NewStashIgnoreFilter()
+	accepted := walkAndFilter(t, tmpDir, filter)
+
+	// Only root ignore.mp4 should be excluded.
+	expected := []string{
+		".stashignore",
+		"subdir",
+		"subdir/ignore.mp4",
+	}
+
+	assertPathsEqual(t, expected, accepted)
+}
+
+func TestStashIgnore_NoStashIgnoreFile(t *testing.T) {
+	tmpDir := t.TempDir()
+
+	// Create test files without any .stashignore.
+	createTestFile(t, tmpDir, "video1.mp4")
+	createTestFile(t, tmpDir, "video2.mp4")
+	createTestDir(t, tmpDir, "subdir")
+	createTestFile(t, tmpDir, "subdir/video3.mp4")
+
+	filter := NewStashIgnoreFilter()
+	accepted := walkAndFilter(t, tmpDir, filter)
+
+	// All files should be accepted.
+	expected := []string{
+		"subdir",
+		"subdir/video3.mp4",
+		"video1.mp4",
+		"video2.mp4",
+	}
+
+	assertPathsEqual(t, expected, accepted)
+}
+
+func TestStashIgnore_HiddenDirectories(t *testing.T) {
+	tmpDir := t.TempDir()
+
+	// Create test files including hidden directory.
+	createTestFile(t, tmpDir, "video1.mp4")
+	createTestDir(t, tmpDir, ".hidden")
+	createTestFile(t, tmpDir, ".hidden/video2.mp4")
+
+	// Create .stashignore that excludes hidden directories.
+	createTestFileWithContent(t, tmpDir, ".stashignore", ".*\n!.stashignore\n")
+
+	filter := NewStashIgnoreFilter()
+	accepted := walkAndFilter(t, tmpDir, filter)
+
+	expected := []string{
+		".stashignore",
+		"video1.mp4",
+	}
+
+	assertPathsEqual(t, expected, accepted)
+}
+
+func TestStashIgnore_MultiplePatternsSameLine(t *testing.T) {
+	tmpDir := t.TempDir()
+
+	// Create test files.
+	createTestFile(t, tmpDir, "video1.mp4")
+	createTestFile(t, tmpDir, "file.tmp")
+	createTestFile(t, tmpDir, "file.log")
+	createTestFile(t, tmpDir, "file.bak")
+
+	// Each pattern should be on its own line.
+	createTestFileWithContent(t, tmpDir, ".stashignore", "*.tmp\n*.log\n*.bak\n")
+
+	filter := NewStashIgnoreFilter()
+	accepted := walkAndFilter(t, tmpDir, filter)
+
+	expected := []string{
+		".stashignore",
+		"video1.mp4",
+	}
+
+	assertPathsEqual(t, expected, accepted)
+}
+
+func TestStashIgnore_TrailingSpaces(t *testing.T) {
+	tmpDir := t.TempDir()
+
+	// Create test files.
+	createTestFile(t, tmpDir, "video1.mp4")
+	createTestFile(t, tmpDir, "ignore_me.mp4")
+
+	// Pattern with trailing spaces (should be trimmed).
+	createTestFileWithContent(t, tmpDir, ".stashignore", "ignore_me.mp4   \n")
+
+	filter := NewStashIgnoreFilter()
+	accepted := walkAndFilter(t, tmpDir, filter)
+
+	expected := []string{
+		".stashignore",
+		"video1.mp4",
+	}
+
+	assertPathsEqual(t, expected, accepted)
+}
+
+func TestStashIgnore_EscapedHash(t *testing.T) {
+	tmpDir := t.TempDir()
+
+	// Create test files.
+	createTestFile(t, tmpDir, "video1.mp4")
+	createTestFile(t, tmpDir, "#filename.mp4")
+
+	// Escaped hash should match literal # character.
+	createTestFileWithContent(t, tmpDir, ".stashignore", "\\#filename.mp4\n")
+
+	filter := NewStashIgnoreFilter()
+	accepted := walkAndFilter(t, tmpDir, filter)
+
+	expected := []string{
+		".stashignore",
+		"video1.mp4",
+	}
+
+	assertPathsEqual(t, expected, accepted)
+}
+
+func TestStashIgnore_CaseSensitiveMatching(t *testing.T) {
+	tmpDir := t.TempDir()
+
+	// Create test files - use distinct names that work on all filesystems.
+	createTestFile(t, tmpDir, "video_lower.mp4")
+	createTestFile(t, tmpDir, "VIDEO_UPPER.mp4")
+	createTestFile(t, tmpDir, "other.avi")
+
+	// Pattern should match exactly (case-sensitive).
+	createTestFileWithContent(t, tmpDir, ".stashignore", "video_lower.mp4\n")
+
+	filter := NewStashIgnoreFilter()
+	accepted := walkAndFilter(t, tmpDir, filter)
+
+	// Only exact match is excluded.
+	expected := []string{
+		".stashignore",
+		"VIDEO_UPPER.mp4",
+		"other.avi",
+	}
+
+	assertPathsEqual(t, expected, accepted)
+}
+
+func TestStashIgnore_ComplexScenario(t *testing.T) {
+	tmpDir := t.TempDir()
+
+	// Create a complex directory structure.
+	createTestFile(t, tmpDir, "video1.mp4")
+	createTestFile(t, tmpDir, "video2.avi")
+	createTestFile(t, tmpDir, "thumbnail.jpg")
+	createTestFile(t, tmpDir, "metadata.nfo")
+	createTestDir(t, tmpDir, "movies")
+	createTestFile(t, tmpDir, "movies/movie1.mp4")
+	createTestFile(t, tmpDir, "movies/movie1.nfo")
+	createTestDir(t, tmpDir, "movies/.thumbnails")
+	createTestFile(t, tmpDir, "movies/.thumbnails/thumb1.jpg")
+	createTestDir(t, tmpDir, "temp")
+	createTestFile(t, tmpDir, "temp/processing.mp4")
+	createTestDir(t, tmpDir, "backup")
+	createTestFile(t, tmpDir, "backup/video1.mp4.bak")
+
+	// Complex .stashignore.
+	stashignore := `# Ignore metadata files
+*.nfo
+
+# Ignore hidden directories
+.*
+!.stashignore
+
+# Ignore temp and backup directories
+temp/
+backup/
+
+# But keep thumbnails in specific location
+!movies/.thumbnails/
+`
+	createTestFileWithContent(t, tmpDir, ".stashignore", stashignore)
+
+	filter := NewStashIgnoreFilter()
+	accepted := walkAndFilter(t, tmpDir, filter)
+
+	expected := []string{
+		".stashignore",
+		"movies",
+		"movies/.thumbnails",
+		"movies/.thumbnails/thumb1.jpg",
+		"movies/movie1.mp4",
+		"thumbnail.jpg",
+		"video1.mp4",
+		"video2.avi",
+	}
+
+	assertPathsEqual(t, expected, accepted)
+}
diff --git a/ui/v2.5/src/docs/en/Manual/Tasks.md b/ui/v2.5/src/docs/en/Manual/Tasks.md
index 4191afd24..584759b09 100644
--- a/ui/v2.5/src/docs/en/Manual/Tasks.md
+++ b/ui/v2.5/src/docs/en/Manual/Tasks.md
@@ -10,6 +10,39 @@ Stash currently identifies files by performing a quick file hash. This means tha
 
 Stash currently ignores duplicate files. If two files contain identical content, only the first one it comes across is used.
 
+### Ignoring Files with .stashignore
+
+You can create `.stashignore` files to exclude specific files or directories from being scanned. These files use gitignore-style pattern matching syntax.
+
+Place a `.stashignore` file in any directory within your library. The patterns in that file will apply to all files and subdirectories within that directory. You can have multiple `.stashignore` files at different levels of your directory hierarchy - patterns from parent directories cascade down to child directories.
+
+**Supported patterns:**
+
+| Pattern | Description |
+|---------|-------------|
+| `filename.mp4` | Ignore a specific file. |
+| `*.tmp` | Ignore all files with a specific extension. |
+| `temp/` | Ignore a directory and all its contents. |
+| `**/cache/` | Ignore directories named "cache" at any level. |
+| `!important.mp4` | Negation - do not ignore this file even if it matches a previous pattern. |
+| `# comment` | Lines starting with # are comments. |
+| `\#filename` | Use backslash to match a literal # character. |
+
+**Example .stashignore file:**
+
+```
+# Ignore temporary files
+*.tmp
+*.log
+
+# Ignore specific directories
+temp/
+.thumbnails/
+
+# But keep this specific file
+!important.tmp
+```
+
 The scan task accepts the following options:
 
 | Option | Description |

From f7da37400bac091f2eb706909865d569dbac9775 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Wed, 4 Mar 2026 10:10:07 +1100
Subject: [PATCH 338/405] Fix preview scrubber scaling on smaller sizes (#6640)

---
 .../src/components/Scenes/PreviewScrubber.tsx | 26 ++++++++++++++-----
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/ui/v2.5/src/components/Scenes/PreviewScrubber.tsx b/ui/v2.5/src/components/Scenes/PreviewScrubber.tsx
index 8c9d3097d..e60c638d7 100644
--- a/ui/v2.5/src/components/Scenes/PreviewScrubber.tsx
+++ b/ui/v2.5/src/components/Scenes/PreviewScrubber.tsx
@@ -46,6 +46,18 @@ export const PreviewScrubber: React.FC<IScenePreviewProps> = ({
   const [hasLoaded, setHasLoaded] = useState(false);
   const spriteInfo = useSpriteInfo(hasLoaded ? vttPath : undefined);
 
+  const spriteSheetSize = useMemo(() => {
+    if (!spriteInfo) {
+      return { x: 0, y: 0 };
+    }
+
+    // calculate total width/height of scrubber image so we can scale it
+    const maxX = Math.max(...spriteInfo.map((sprite) => sprite.x + sprite.w));
+    const maxY = Math.max(...spriteInfo.map((sprite) => sprite.y + sprite.h));
+
+    return { x: maxX, y: maxY };
+  }, [spriteInfo]);
+
   const sprite = useMemo(() => {
     if (!spriteInfo || activeIndex === undefined) {
       return undefined;
@@ -69,17 +81,17 @@ export const PreviewScrubber: React.FC<IScenePreviewProps> = ({
 
     const clientRect = imageParent.getBoundingClientRect();
     const scale = scaleToFit(sprite, clientRect);
-    const spriteSheet = new Image();
-    spriteSheet.src = sprite.url;
 
     setStyle({
-      backgroundPosition: `${-sprite.x}px ${-sprite.y}px`,
+      backgroundPosition: `${-sprite.x * scale}px ${-sprite.y * scale}px`,
       backgroundImage: `url(${sprite.url})`,
-      width: `${sprite.w}px`,
-      height: `${sprite.h}px`,
-      transform: `scale(${scale})`,
+      backgroundSize: `${spriteSheetSize.x * scale}px ${
+        spriteSheetSize.y * scale
+      }px`,
+      width: `${sprite.w * scale}px`,
+      height: `${sprite.h * scale}px`,
     });
-  }, [sprite]);
+  }, [sprite, spriteSheetSize]);
 
   const currentTime = useMemo(() => {
     if (!sprite) return undefined;

From fbf91b25262dcbb39a8cdcc566ae39d5c8d757e6 Mon Sep 17 00:00:00 2001
From: Gykes <24581046+Gykes@users.noreply.github.com>
Date: Tue, 3 Mar 2026 17:01:31 -0800
Subject: [PATCH 339/405] New: Add From Clipboard to Set Image (#6637)

* add from clipboard to UI
* only trigger when input not focused
---
 ui/v2.5/src/components/Shared/ImageInput.tsx | 37 ++++++++-
 ui/v2.5/src/locales/en-GB.json               |  4 +
 ui/v2.5/src/utils/image.tsx                  | 85 ++++++++++++--------
 3 files changed, 93 insertions(+), 33 deletions(-)

diff --git a/ui/v2.5/src/components/Shared/ImageInput.tsx b/ui/v2.5/src/components/Shared/ImageInput.tsx
index 7675da41f..57b8f06f8 100644
--- a/ui/v2.5/src/components/Shared/ImageInput.tsx
+++ b/ui/v2.5/src/components/Shared/ImageInput.tsx
@@ -10,8 +10,10 @@ import {
 import { useIntl } from "react-intl";
 import { ModalComponent } from "./Modal";
 import { Icon } from "./Icon";
-import { faFile, faLink } from "@fortawesome/free-solid-svg-icons";
+import { faClipboard, faFile, faLink } from "@fortawesome/free-solid-svg-icons";
 import { PatchComponent } from "src/patch";
+import ImageUtils from "src/utils/image";
+import { useToast } from "src/hooks/Toast";
 
 interface IImageInput {
   isEditing: boolean;
@@ -39,6 +41,7 @@ export const ImageInput: React.FC<IImageInput> = PatchComponent(
     const [isShowDialog, setIsShowDialog] = useState(false);
     const [url, setURL] = useState("");
     const intl = useIntl();
+    const Toast = useToast();
 
     if (!isEditing) return <div />;
 
@@ -58,6 +61,28 @@ export const ImageInput: React.FC<IImageInput> = PatchComponent(
       );
     }
 
+    async function onPasteClipboard() {
+      try {
+        const data = await ImageUtils.readClipboardImage();
+        if (data && onImageURL) {
+          onImageURL(data);
+          Toast.success(
+            intl.formatMessage({ id: "toast.clipboard_image_pasted" })
+          );
+        } else {
+          Toast.error(intl.formatMessage({ id: "toast.clipboard_no_image" }));
+        }
+      } catch (e) {
+        if (e instanceof DOMException && e.name === "NotAllowedError") {
+          Toast.error(
+            intl.formatMessage({ id: "toast.clipboard_access_denied" })
+          );
+        } else {
+          Toast.error(e);
+        }
+      }
+    }
+
     function showDialog() {
       setURL("");
       setIsShowDialog(true);
@@ -127,6 +152,16 @@ export const ImageInput: React.FC<IImageInput> = PatchComponent(
                 <span>{intl.formatMessage({ id: "actions.from_url" })}</span>
               </Button>
             </div>
+            {window.isSecureContext && (
+              <div>
+                <Button className="minimal" onClick={onPasteClipboard}>
+                  <Icon icon={faClipboard} className="fa-fw" />
+                  <span>
+                    {intl.formatMessage({ id: "actions.from_clipboard" })}
+                  </span>
+                </Button>
+              </div>
+            )}
           </>
         </Popover.Content>
       </Popover>
diff --git a/ui/v2.5/src/locales/en-GB.json b/ui/v2.5/src/locales/en-GB.json
index 56b11f3f9..8a0ad96da 100644
--- a/ui/v2.5/src/locales/en-GB.json
+++ b/ui/v2.5/src/locales/en-GB.json
@@ -56,6 +56,7 @@
     "export_all": "Export all…",
     "find": "Find",
     "finish": "Finish",
+    "from_clipboard": "From clipboard",
     "from_file": "From file…",
     "from_url": "From URL…",
     "full_export": "Full export",
@@ -1636,6 +1637,9 @@
   "toast": {
     "added_entity": "Added {count, plural, one {{singularEntity}} other {{pluralEntity}}}",
     "added_generation_job_to_queue": "Added generation job to queue",
+    "clipboard_access_denied": "Clipboard access denied. Check your browser permissions",
+    "clipboard_image_pasted": "Image pasted from clipboard",
+    "clipboard_no_image": "No image found in clipboard",
     "created_entity": "Created {entity}",
     "default_filter_set": "Default filter set",
     "delete_past_tense": "Deleted {count, plural, one {{singularEntity}} other {{pluralEntity}}}",
diff --git a/ui/v2.5/src/utils/image.tsx b/ui/v2.5/src/utils/image.tsx
index b31387e83..73b833f80 100644
--- a/ui/v2.5/src/utils/image.tsx
+++ b/ui/v2.5/src/utils/image.tsx
@@ -1,25 +1,18 @@
 import React, { useCallback, useEffect } from "react";
 
+const blobToDataURL = (blob: Blob): Promise<string> =>
+  new Promise((resolve, reject) => {
+    const reader = new FileReader();
+    reader.onloadend = () => resolve(reader.result as string);
+    reader.onerror = reject;
+    reader.readAsDataURL(blob);
+  });
+
 const readImage = (file: File, onLoadEnd: (imageData: string) => void) => {
-  const reader: FileReader = new FileReader();
-  reader.onloadend = () => {
-    // only proceed if no error encountered
-    if (!reader.error) {
-      onLoadEnd(reader.result as string);
-    }
-  };
-  reader.readAsDataURL(file);
-};
-
-const pasteImage = (
-  event: ClipboardEvent,
-  onLoadEnd: (imageData: string) => void
-) => {
-  const files = event?.clipboardData?.files;
-  if (!files?.length) return;
-
-  const file = files[0];
-  readImage(file, onLoadEnd);
+  // only proceed if no error encountered
+  blobToDataURL(file)
+    .then(onLoadEnd)
+    .catch(() => {});
 };
 
 const onImageChange = (
@@ -30,6 +23,46 @@ const onImageChange = (
   if (file) readImage(file, onLoadEnd);
 };
 
+const imageToDataURL = async (url: string) => {
+  const response = await fetch(url);
+  const blob = await response.blob();
+  return blobToDataURL(blob);
+};
+
+// uses event.clipboardData which works in all contexts including insecure HTTP
+const pasteImage = (
+  event: ClipboardEvent,
+  onLoadEnd: (imageData: string) => void
+) => {
+  const files = event?.clipboardData?.files;
+  if (!files?.length) return;
+
+  if (document.activeElement instanceof HTMLInputElement) {
+    // don't interfere with pasting text into inputs
+    return;
+  }
+
+  const file = Array.from(files).find((f) => f.type.startsWith("image/"));
+  if (file) readImage(file, onLoadEnd);
+};
+
+// uses Clipboard API which requires secure context (HTTPS or localhost)
+const readClipboardImage = async (): Promise<string | null> => {
+  if (!window.isSecureContext) {
+    return null;
+  }
+
+  const items = await navigator.clipboard.read();
+  for (const item of items) {
+    const imageType = item.types.find((t) => t.startsWith("image/"));
+    if (imageType) {
+      const blob = await item.getType(imageType);
+      return blobToDataURL(blob);
+    }
+  }
+  return null;
+};
+
 const usePasteImage = (
   onLoadEnd: (imageData: string) => void,
   isActive: boolean = true
@@ -53,23 +86,11 @@ const usePasteImage = (
   return false;
 };
 
-const imageToDataURL = async (url: string) => {
-  const response = await fetch(url);
-  const blob = await response.blob();
-  return new Promise<string>((resolve, reject) => {
-    const reader = new FileReader();
-    reader.onloadend = () => {
-      resolve(reader.result as string);
-    };
-    reader.onerror = reject;
-    reader.readAsDataURL(blob);
-  });
-};
-
 const ImageUtils = {
   onImageChange,
   usePasteImage,
   imageToDataURL,
+  readClipboardImage,
 };
 
 export default ImageUtils;

From 69e781b0ee3ed210787c2f2f9a1cf4424d3e2da3 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Thu, 5 Mar 2026 07:58:51 +1100
Subject: [PATCH 340/405] Use ffmpeg as a general fallback when generating
 phash (#6641)

---
 pkg/hash/imagephash/phash.go | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkg/hash/imagephash/phash.go b/pkg/hash/imagephash/phash.go
index 73e8e3667..0af5adec9 100644
--- a/pkg/hash/imagephash/phash.go
+++ b/pkg/hash/imagephash/phash.go
@@ -3,10 +3,9 @@ package imagephash
 import (
 	"bytes"
 	"context"
+	"errors"
 	"fmt"
 	"image"
-	"path/filepath"
-	"strings"
 
 	"github.com/corona10/goimagehash"
 	"github.com/stashapp/stash/pkg/ffmpeg"
@@ -32,17 +31,9 @@ func Generate(encoder *ffmpeg.FFMpeg, imageFile *models.ImageFile) (*uint64, err
 }
 
 // loadImage loads an image from disk and decodes it.
-// For AVIF files, ffmpeg is used to convert to BMP first since Go has no built-in AVIF decoder.
+// Where Go has no built-in decoder for a specific format, ffmpeg is used to convert to BMP first.
 func loadImage(encoder *ffmpeg.FFMpeg, imageFile *models.ImageFile) (image.Image, error) {
-	ext := strings.ToLower(filepath.Ext(imageFile.Path))
-	if ext == ".avif" {
-		// AVIF in zip files is not supported - ffmpeg cannot read files inside zips
-		if imageFile.Base().ZipFileID != nil {
-			return nil, fmt.Errorf("AVIF images in zip files are not supported for phash generation")
-		}
-		return loadImageFFmpeg(encoder, imageFile.Path)
-	}
-
+	// try to load with Go's built-in decoders first for better performance
 	reader, err := imageFile.Open(&file.OsFS{})
 	if err != nil {
 		return nil, err
@@ -55,6 +46,15 @@ func loadImage(encoder *ffmpeg.FFMpeg, imageFile *models.ImageFile) (image.Image
 	}
 
 	img, _, err := image.Decode(buf)
+	if errors.Is(err, image.ErrFormat) {
+		// try ffmpeg as a fallback for unsupported formats
+		// ffmpeg cannot read files inside zips
+		if imageFile.Base().ZipFileID != nil {
+			return nil, fmt.Errorf("ffmpeg fallback unsupported for images in zip files")
+		}
+		return loadImageFFmpeg(encoder, imageFile.Path)
+	}
+
 	if err != nil {
 		return nil, fmt.Errorf("decoding image: %w", err)
 	}

From 697c66ae627261376a01734a5b4362887904cad0 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Thu, 5 Mar 2026 07:59:13 +1100
Subject: [PATCH 341/405] Allow stash path to non-existing directory (#6644)

---
 internal/api/resolver_mutation_configure.go | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/internal/api/resolver_mutation_configure.go b/internal/api/resolver_mutation_configure.go
index 718d24998..3df1c9114 100644
--- a/internal/api/resolver_mutation_configure.go
+++ b/internal/api/resolver_mutation_configure.go
@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"io/fs"
 	"path/filepath"
 	"regexp"
 	"strconv"
@@ -85,6 +86,8 @@ func (r *mutationResolver) setConfigFloat(key string, value *float64) {
 func (r *mutationResolver) ConfigureGeneral(ctx context.Context, input ConfigGeneralInput) (*ConfigGeneralResult, error) {
 	c := config.GetInstance()
 
+	// #4709 - allow stash paths even if they do not exist, so that users may configure stash
+	// for disconnected drives or network storage.
 	existingPaths := c.GetStashPaths()
 	if input.Stashes != nil {
 		for _, s := range input.Stashes {
@@ -97,8 +100,12 @@ func (r *mutationResolver) ConfigureGeneral(ctx context.Context, input ConfigGen
 				}
 			}
 			if isNew {
+				s.Path = filepath.Clean(s.Path)
+
+				// if it exists, it must be directory
 				exists, err := fsutil.DirExists(s.Path)
-				if !exists {
+				// allow it to not exist but if it does exist it must be a directory
+				if !exists && !errors.Is(err, fs.ErrNotExist) {
 					return makeConfigGeneralResult(), err
 				}
 			}

From 717f968a2c544a3f0c0f0be0b30e45cd0da58f10 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Thu, 5 Mar 2026 08:02:13 +1100
Subject: [PATCH 342/405] Add folder criteria to scenes, images and galleries
 and sidebars (#6636)

* Add useDebouncedState hook
* Add basename to folder sort whitelist
* Add parent_folder criterion to gallery
* Add selection on enter if single result
---
 graphql/schema/types/filters.graphql          |   2 +
 pkg/models/gallery.go                         |   2 +
 pkg/sqlite/folder.go                          |   1 +
 pkg/sqlite/gallery_filter.go                  |  60 ++
 ui/v2.5/graphql/data/file.graphql             |  15 +
 ui/v2.5/graphql/queries/folder.graphql        |  24 +
 .../src/components/Galleries/GalleryList.tsx  |   9 +
 ui/v2.5/src/components/Images/ImageList.tsx   |   7 +
 .../src/components/List/CriterionEditor.tsx   |  21 +-
 .../components/List/Filters/FolderFilter.tsx  | 612 ++++++++++++++++++
 .../List/Filters/LabeledIdFilter.tsx          |  22 +-
 .../List/Filters/SelectableFilter.tsx         |  95 ++-
 .../List/Filters/SidebarListFilter.tsx        |  26 +-
 ui/v2.5/src/components/List/styles.scss       |  43 +-
 ui/v2.5/src/components/Scenes/SceneList.tsx   |   7 +
 .../src/components/Shared/ClearableInput.tsx  |   5 +
 .../src/components/Shared/CollapseButton.tsx  |  14 +-
 ui/v2.5/src/components/Shared/Sidebar.tsx     |  18 +-
 ui/v2.5/src/core/StashService.ts              |  15 +
 ui/v2.5/src/hooks/debounce.ts                 |  29 +-
 ui/v2.5/src/locales/en-GB.json                |   5 +
 .../models/list-filter/criteria/criterion.ts  |   1 +
 .../src/models/list-filter/criteria/folder.ts |  52 ++
 ui/v2.5/src/models/list-filter/galleries.ts   |   2 +
 ui/v2.5/src/models/list-filter/images.ts      |   2 +
 ui/v2.5/src/models/list-filter/scenes.ts      |   2 +
 ui/v2.5/src/models/list-filter/types.ts       |   4 +-
 27 files changed, 1025 insertions(+), 70 deletions(-)
 create mode 100644 ui/v2.5/graphql/queries/folder.graphql
 create mode 100644 ui/v2.5/src/components/List/Filters/FolderFilter.tsx
 create mode 100644 ui/v2.5/src/models/list-filter/criteria/folder.ts

diff --git a/graphql/schema/types/filters.graphql b/graphql/schema/types/filters.graphql
index 6eda473b4..323fb8741 100644
--- a/graphql/schema/types/filters.graphql
+++ b/graphql/schema/types/filters.graphql
@@ -603,6 +603,8 @@ input GalleryFilterType {
   files_filter: FileFilterType
   "Filter by related folders that meet this criteria"
   folders_filter: FolderFilterType
+  "Filter by parent folder of the zip or folder the gallery is in"
+  parent_folder: HierarchicalMultiCriterionInput
 
   custom_fields: [CustomFieldCriterionInput!]
 }
diff --git a/pkg/models/gallery.go b/pkg/models/gallery.go
index 8f335020a..3bf70b754 100644
--- a/pkg/models/gallery.go
+++ b/pkg/models/gallery.go
@@ -11,6 +11,8 @@ type GalleryFilterType struct {
 	Checksum *StringCriterionInput `json:"checksum"`
 	// Filter by path
 	Path *StringCriterionInput `json:"path"`
+	// Filter by parent folder
+	ParentFolder *HierarchicalMultiCriterionInput `json:"parent_folder,omitempty"`
 	// Filter by zip file count
 	FileCount *IntCriterionInput `json:"file_count"`
 	// Filter to only include galleries missing this property
diff --git a/pkg/sqlite/folder.go b/pkg/sqlite/folder.go
index fdeb00913..549b40d31 100644
--- a/pkg/sqlite/folder.go
+++ b/pkg/sqlite/folder.go
@@ -614,6 +614,7 @@ var folderSortOptions = sortOptions{
 	"created_at",
 	"id",
 	"path",
+	"basename",
 	"random",
 	"updated_at",
 }
diff --git a/pkg/sqlite/gallery_filter.go b/pkg/sqlite/gallery_filter.go
index 069bb1015..28f3b8fac 100644
--- a/pkg/sqlite/gallery_filter.go
+++ b/pkg/sqlite/gallery_filter.go
@@ -84,6 +84,7 @@ func (qb *galleryFilterHandler) criterionHandler() criterionHandler {
 		}),
 
 		qb.pathCriterionHandler(filter.Path),
+		qb.parentFolderCriterionHandler(filter.ParentFolder),
 		qb.fileCountCriterionHandler(filter.FileCount),
 		intCriterionHandler(filter.Rating100, "galleries.rating", nil),
 		qb.urlsCriterionHandler(filter.URL),
@@ -278,6 +279,65 @@ func (qb *galleryFilterHandler) pathCriterionHandler(c *models.StringCriterionIn
 	}
 }
 
+func (qb *galleryFilterHandler) parentFolderCriterionHandler(folder *models.HierarchicalMultiCriterionInput) criterionHandlerFunc {
+	return func(ctx context.Context, f *filterBuilder) {
+		if folder == nil {
+			return
+		}
+
+		galleryRepository.addFoldersTable(f)
+		f.addLeftJoin(folderTable, "gallery_folder", "galleries.folder_id = gallery_folder.id")
+
+		criterion := *folder
+		switch criterion.Modifier {
+		case models.CriterionModifierEquals:
+			criterion.Modifier = models.CriterionModifierIncludes
+		case models.CriterionModifierNotEquals:
+			criterion.Modifier = models.CriterionModifierExcludes
+		}
+
+		// only allow includes or excludes filters
+		if criterion.Modifier != models.CriterionModifierIncludes && criterion.Modifier != models.CriterionModifierExcludes {
+			f.setError(fmt.Errorf("invalid modifier for parent folder criterion: %s", criterion.Modifier))
+		}
+
+		if len(criterion.Value) == 0 && len(criterion.Excludes) == 0 {
+			return
+		}
+
+		// combine excludes if excludes modifier is selected
+		if criterion.Modifier == models.CriterionModifierExcludes {
+			criterion.Modifier = models.CriterionModifierIncludes
+			criterion.Excludes = append(criterion.Excludes, criterion.Value...)
+			criterion.Value = nil
+		}
+
+		if len(criterion.Value) > 0 {
+			valuesClause, err := getHierarchicalValues(ctx, criterion.Value, "folders", "", "parent_folder_id", "parent_folder_id", criterion.Depth)
+			if err != nil {
+				f.setError(err)
+				return
+			}
+
+			// combine clauses with OR to handle zip file or folder
+			c1 := makeClause(fmt.Sprintf("folders.parent_folder_id IN (SELECT column2 FROM (%s))", valuesClause))
+			c2 := makeClause(fmt.Sprintf("gallery_folder.parent_folder_id IN (SELECT column2 FROM (%s))", valuesClause))
+			f.whereClauses = append(f.whereClauses, orClauses(c1, c2))
+		}
+
+		if len(criterion.Excludes) > 0 {
+			valuesClause, err := getHierarchicalValues(ctx, criterion.Excludes, "folders", "", "parent_folder_id", "parent_folder_id", criterion.Depth)
+			if err != nil {
+				f.setError(err)
+				return
+			}
+
+			f.addWhere(fmt.Sprintf("folders.parent_folder_id NOT IN (SELECT column2 FROM (%s)) OR folders.parent_folder_id IS NULL", valuesClause))
+			f.addWhere(fmt.Sprintf("gallery_folder.parent_folder_id NOT IN (SELECT column2 FROM (%s)) OR gallery_folder.parent_folder_id IS NULL", valuesClause))
+		}
+	}
+}
+
 func (qb *galleryFilterHandler) fileCountCriterionHandler(fileCount *models.IntCriterionInput) criterionHandlerFunc {
 	h := countCriterionHandlerBuilder{
 		primaryTable: galleryTable,
diff --git a/ui/v2.5/graphql/data/file.graphql b/ui/v2.5/graphql/data/file.graphql
index 52a4c50f8..7386adb81 100644
--- a/ui/v2.5/graphql/data/file.graphql
+++ b/ui/v2.5/graphql/data/file.graphql
@@ -1,5 +1,6 @@
 fragment FolderData on Folder {
   id
+  basename
   path
 }
 
@@ -86,3 +87,17 @@ fragment VisualFileData on VisualFile {
     }
   }
 }
+
+fragment SelectFolderData on Folder {
+  id
+  path
+  basename
+}
+
+fragment RecursiveFolderData on Folder {
+  ...SelectFolderData
+
+  parent_folders {
+    ...SelectFolderData
+  }
+}
diff --git a/ui/v2.5/graphql/queries/folder.graphql b/ui/v2.5/graphql/queries/folder.graphql
new file mode 100644
index 000000000..a42f5eb84
--- /dev/null
+++ b/ui/v2.5/graphql/queries/folder.graphql
@@ -0,0 +1,24 @@
+query FindRootFoldersForSelect {
+  findFolders(
+    filter: { per_page: -1, sort: "path", direction: ASC }
+    folder_filter: { parent_folder: { modifier: IS_NULL } }
+  ) {
+    count
+    folders {
+      ...SelectFolderData
+    }
+  }
+}
+
+query FindFoldersForQuery(
+  $filter: FindFilterType
+  $folder_filter: FolderFilterType
+  $ids: [ID!]
+) {
+  findFolders(filter: $filter, folder_filter: $folder_filter, ids: $ids) {
+    count
+    folders {
+      ...RecursiveFolderData
+    }
+  }
+}
diff --git a/ui/v2.5/src/components/Galleries/GalleryList.tsx b/ui/v2.5/src/components/Galleries/GalleryList.tsx
index b31b597cc..abb2bdda8 100644
--- a/ui/v2.5/src/components/Galleries/GalleryList.tsx
+++ b/ui/v2.5/src/components/Galleries/GalleryList.tsx
@@ -51,6 +51,8 @@ import {
 import { FilterTags } from "../List/FilterTags";
 import { SidebarAgeFilter } from "../List/Filters/SidebarAgeFilter";
 import { PerformerAgeCriterionOption } from "src/models/list-filter/galleries";
+import { SidebarFolderFilter } from "../List/Filters/FolderFilter";
+import { ParentFolderCriterionOption } from "src/models/list-filter/criteria/folder";
 
 const GalleryList: React.FC<{
   galleries: GQL.SlimGalleryDataFragment[];
@@ -165,6 +167,13 @@ const SidebarContent: React.FC<{
           filterHook={filterHook}
         />
         <SidebarRatingFilter filter={filter} setFilter={setFilter} />
+        <SidebarFolderFilter
+          text={<FormattedMessage id="parent_folder" />}
+          criterionOption={ParentFolderCriterionOption}
+          filter={filter}
+          setFilter={setFilter}
+          sectionID="parent_folder"
+        />
         <SidebarBooleanFilter
           title={<FormattedMessage id="organized" />}
           data-type={OrganizedCriterionOption.type}
diff --git a/ui/v2.5/src/components/Images/ImageList.tsx b/ui/v2.5/src/components/Images/ImageList.tsx
index 50956b497..35c367a8a 100644
--- a/ui/v2.5/src/components/Images/ImageList.tsx
+++ b/ui/v2.5/src/components/Images/ImageList.tsx
@@ -66,6 +66,7 @@ import { Button } from "react-bootstrap";
 import { OrganizedCriterionOption } from "src/models/list-filter/criteria/organized";
 import { SidebarAgeFilter } from "../List/Filters/SidebarAgeFilter";
 import { PerformerAgeCriterionOption } from "src/models/list-filter/images";
+import { SidebarFolderFilter } from "../List/Filters/FolderFilter";
 
 interface IImageWallProps {
   images: GQL.SlimImageDataFragment[];
@@ -430,6 +431,12 @@ const SidebarContent: React.FC<{
           filterHook={filterHook}
         />
         <SidebarRatingFilter filter={filter} setFilter={setFilter} />
+        <SidebarFolderFilter
+          text={<FormattedMessage id="folder" />}
+          filter={filter}
+          setFilter={setFilter}
+          sectionID="folder"
+        />
         <SidebarBooleanFilter
           title={<FormattedMessage id="organized" />}
           data-type={OrganizedCriterionOption.type}
diff --git a/ui/v2.5/src/components/List/CriterionEditor.tsx b/ui/v2.5/src/components/List/CriterionEditor.tsx
index 8795296fa..8a72d6e43 100644
--- a/ui/v2.5/src/components/List/CriterionEditor.tsx
+++ b/ui/v2.5/src/components/List/CriterionEditor.tsx
@@ -52,6 +52,11 @@ import { PathCriterion } from "src/models/list-filter/criteria/path";
 import { ModifierSelectorButtons } from "./ModifierSelect";
 import { CustomFieldsCriterion } from "src/models/list-filter/criteria/custom-fields";
 import { CustomFieldsFilter } from "./Filters/CustomFieldsFilter";
+import { FolderFilter } from "./Filters/FolderFilter";
+import {
+  FolderCriterion,
+  ParentFolderCriterion,
+} from "src/models/list-filter/criteria/folder";
 
 interface IGenericCriterionEditor {
   criterion: ModifierCriterion<CriterionValue>;
@@ -68,7 +73,9 @@ const GenericCriterionEditor: React.FC<IGenericCriterionEditor> = ({
     if (
       criterion instanceof PerformersCriterion ||
       criterion instanceof StudiosCriterion ||
-      criterion instanceof TagsCriterion
+      criterion instanceof TagsCriterion ||
+      criterion instanceof FolderCriterion ||
+      criterion instanceof ParentFolderCriterion
     ) {
       return false;
     }
@@ -163,6 +170,18 @@ const GenericCriterionEditor: React.FC<IGenericCriterionEditor> = ({
       );
     }
 
+    if (
+      criterion instanceof FolderCriterion ||
+      criterion instanceof ParentFolderCriterion
+    ) {
+      return (
+        <FolderFilter
+          criterion={criterion}
+          setCriterion={(c) => setCriterion(c)}
+        />
+      );
+    }
+
     if (criterion instanceof ILabeledIdCriterion) {
       return (
         <LabeledIdFilter
diff --git a/ui/v2.5/src/components/List/Filters/FolderFilter.tsx b/ui/v2.5/src/components/List/Filters/FolderFilter.tsx
new file mode 100644
index 000000000..38e9d21ec
--- /dev/null
+++ b/ui/v2.5/src/components/List/Filters/FolderFilter.tsx
@@ -0,0 +1,612 @@
+import React, { useCallback, useEffect, useMemo, useState } from "react";
+import {
+  FolderDataFragment,
+  useFindFoldersForQueryQuery,
+  useFindRootFoldersForSelectQuery,
+} from "src/core/generated-graphql";
+import {
+  ISidebarSectionProps,
+  SidebarSection,
+} from "src/components/Shared/Sidebar";
+import {
+  faChevronDown,
+  faChevronRight,
+  faMinus,
+  faPlus,
+} from "@fortawesome/free-solid-svg-icons";
+import { ExpandCollapseButton } from "src/components/Shared/CollapseButton";
+import cx from "classnames";
+import { queryFindSubFolders } from "src/core/StashService";
+import { keyboardClickHandler } from "src/utils/keyboard";
+import { ListFilterModel } from "src/models/list-filter/filter";
+import {
+  FolderCriterion,
+  FolderCriterionOption,
+} from "src/models/list-filter/criteria/folder";
+import { Option, SelectedList } from "./SidebarListFilter";
+import {
+  defineMessages,
+  FormattedMessage,
+  MessageDescriptor,
+  useIntl,
+} from "react-intl";
+import { Icon } from "src/components/Shared/Icon";
+import { Button, Form } from "react-bootstrap";
+import { DepthSelector } from "./SelectableFilter";
+import ClearableInput from "src/components/Shared/ClearableInput";
+import { useDebouncedState } from "src/hooks/debounce";
+import { ModifierCriterionOption } from "src/models/list-filter/criteria/criterion";
+
+interface IFolder extends FolderDataFragment {
+  children?: IFolder[];
+  expanded: boolean;
+}
+
+const FolderRow: React.FC<{
+  folder: IFolder;
+  level?: number;
+  canExclude?: boolean;
+  toggleExpanded: (folder: IFolder) => void;
+  onSelect: (folder: IFolder, exclude?: boolean) => void;
+}> = ({ folder, level, toggleExpanded, onSelect, canExclude }) => {
+  return (
+    <>
+      <li
+        className="folder-row unselected-object"
+        style={{ paddingLeft: (level ?? 0) * 5 }}
+      >
+        <a
+          onClick={() => onSelect(folder)}
+          onKeyDown={keyboardClickHandler(() => onSelect(folder))}
+          tabIndex={0}
+        >
+          <span>
+            <span
+              className={cx({
+                empty: folder.children && folder.children.length === 0,
+              })}
+            >
+              <ExpandCollapseButton
+                collapsed={!folder.expanded}
+                setCollapsed={() => toggleExpanded(folder)}
+                collapsedIcon={faChevronRight}
+                notCollapsedIcon={faChevronDown}
+              />
+            </span>
+            {folder.basename}
+          </span>
+          {canExclude && (
+            <Button
+              onClick={(e) => {
+                e.stopPropagation();
+                onSelect(folder, true);
+              }}
+              onKeyDown={(e) => e.stopPropagation()}
+              className="minimal exclude-button"
+            >
+              <span className="exclude-button-text">
+                <FormattedMessage id="actions.exclude_lowercase" />
+              </span>
+              <Icon className="fa-fw exclude-icon" icon={faMinus} />
+            </Button>
+          )}
+        </a>
+      </li>
+      {folder.expanded &&
+        folder.children?.map((child) => (
+          <FolderRow
+            key={child.id}
+            folder={child}
+            level={(level ?? 0) + 1}
+            toggleExpanded={toggleExpanded}
+            onSelect={onSelect}
+            canExclude={canExclude}
+          />
+        ))}
+    </>
+  );
+};
+
+function toggleExpandedFn(object: IFolder): (f: IFolder) => IFolder {
+  return (f: IFolder) => {
+    if (f.id === object.id) {
+      return { ...f, expanded: !f.expanded };
+    }
+
+    if (f.children) {
+      return {
+        ...f,
+        children: f.children.map(toggleExpandedFn(object)),
+      };
+    }
+
+    return f;
+  };
+}
+
+function replaceFolder(folder: IFolder): (f: IFolder) => IFolder {
+  return (f: IFolder) => {
+    if (f.id === folder.id) {
+      return folder;
+    }
+
+    if (f.children) {
+      return {
+        ...f,
+        children: f.children.map(replaceFolder(folder)),
+      };
+    }
+
+    return f;
+  };
+}
+
+function useFolderMap(query: string, skip?: boolean) {
+  const { data: rootFoldersResult } = useFindRootFoldersForSelectQuery({
+    skip,
+  });
+
+  const { data: queryFoldersResult } = useFindFoldersForQueryQuery({
+    skip: !query,
+    variables: {
+      filter: { q: query, per_page: 200 },
+    },
+  });
+
+  const rootFolders: IFolder[] = useMemo(() => {
+    const ret = rootFoldersResult?.findFolders.folders ?? [];
+    return ret.map((f) => ({ ...f, expanded: false, children: undefined }));
+  }, [rootFoldersResult]);
+
+  const queryFolders: IFolder[] = useMemo(() => {
+    // construct the folder list from the query result
+    const ret: IFolder[] = [];
+
+    (queryFoldersResult?.findFolders.folders ?? []).forEach((folder) => {
+      if (!folder.parent_folders.length) {
+        // no parents, just add it if not present
+        if (!ret.find((f) => f.id === folder.id)) {
+          ret.push({ ...folder, expanded: true, children: [] });
+        }
+        return;
+      }
+
+      // expand the parent folders
+      let currentParent: IFolder | undefined;
+      for (let i = folder.parent_folders.length - 1; i >= 0; i--) {
+        const thisFolder = folder.parent_folders[i];
+        let existing: IFolder | undefined;
+
+        if (i === folder.parent_folders.length - 1) {
+          // last parent, add the folder as root
+          existing = ret.find((f) => f.id === thisFolder.id);
+          if (!existing) {
+            existing = {
+              ...folder.parent_folders[i],
+              expanded: true,
+              children: [],
+            };
+            ret.push(existing);
+          }
+          currentParent = existing;
+          continue;
+        }
+
+        // find folder in current parent's children
+        // currentParent is guaranteed to be defined here
+        existing = currentParent!.children?.find((f) => f.id === thisFolder.id);
+        if (!existing) {
+          // add to current parent's children
+          existing = {
+            ...thisFolder,
+            expanded: true,
+            children: [],
+          };
+          currentParent!.children!.push(existing);
+        }
+        currentParent = existing;
+      }
+
+      if (!currentParent) {
+        return;
+      }
+
+      if (!currentParent.children) {
+        currentParent.children = [];
+      }
+
+      // currentParent is now the immediate parent folder
+      currentParent!.children!.push({
+        ...folder,
+        expanded: false,
+        children: undefined,
+      });
+    });
+    return ret;
+  }, [queryFoldersResult]);
+
+  const [folderMap, setFolderMap] = React.useState<IFolder[]>([]);
+
+  useEffect(() => {
+    if (!query) {
+      setFolderMap(rootFolders);
+    } else {
+      setFolderMap(queryFolders);
+    }
+  }, [query, rootFolders, queryFolders]);
+
+  async function onToggleExpanded(folder: IFolder) {
+    setFolderMap(folderMap.map(toggleExpandedFn(folder)));
+
+    // query children folders if not already loaded
+    if (folder.children === undefined) {
+      const subFolderResult = await queryFindSubFolders(folder.id);
+      setFolderMap((current) =>
+        current.map(
+          replaceFolder({
+            ...folder,
+            expanded: true,
+            children: subFolderResult.data.findFolders.folders.map((f) => ({
+              ...f,
+              expanded: false,
+            })),
+          })
+        )
+      );
+    }
+  }
+
+  return { folderMap, onToggleExpanded };
+}
+
+function getMatchingFolders(folders: IFolder[], query: string): IFolder[] {
+  let matches: IFolder[] = [];
+
+  const queryLower = query.toLowerCase();
+
+  folders.forEach((folder) => {
+    if (
+      folder.basename.toLowerCase().includes(queryLower) ||
+      folder.path.toLowerCase() === queryLower
+    ) {
+      matches.push(folder);
+    }
+
+    if (folder.children) {
+      matches = matches.concat(getMatchingFolders(folder.children, query));
+    }
+  });
+
+  return matches;
+}
+
+export const FolderSelector: React.FC<{
+  onSelect: (folder: IFolder, exclude?: boolean) => void;
+  canExclude?: boolean;
+  preListContent?: React.ReactNode;
+  folderMap: IFolder[];
+  onToggleExpanded: (folder: IFolder) => void;
+}> = ({
+  onSelect,
+  preListContent,
+  canExclude = false,
+  folderMap,
+  onToggleExpanded,
+}) => {
+  return (
+    <ul className="selectable-list">
+      {preListContent}
+      {folderMap.map((folder) => (
+        <FolderRow
+          key={folder.id}
+          folder={folder}
+          onSelect={(f, exclude) => onSelect(f, exclude)}
+          toggleExpanded={onToggleExpanded}
+          canExclude={canExclude}
+        />
+      ))}
+    </ul>
+  );
+};
+
+interface IInputFilterProps {
+  criterion: FolderCriterion;
+  setCriterion: (c: FolderCriterion) => void;
+}
+
+export const FolderFilter: React.FC<IInputFilterProps> = ({
+  criterion,
+  setCriterion,
+}) => {
+  const intl = useIntl();
+  const [query, setQuery] = useState("");
+  const [displayQuery, onQueryChange] = useDebouncedState(query, setQuery, 250);
+
+  const { folderMap, onToggleExpanded } = useFolderMap(query);
+
+  const messages = defineMessages({
+    sub_folder_depth: {
+      id: "sub_folder_depth",
+      defaultMessage: "Levels (empty for all)",
+    },
+  });
+
+  function criterionOptionTypeToIncludeID(): string {
+    return "include-sub-folders";
+  }
+
+  function criterionOptionTypeToIncludeUIString(): MessageDescriptor {
+    const optionType = "include_sub_folders";
+
+    return {
+      id: optionType,
+    };
+  }
+
+  function onDepthChanged(depth: number) {
+    // this could be ParentFolderCriterion, but the types are the same
+    const newValue = criterion.clone() as FolderCriterion;
+    newValue.value.depth = depth;
+    setCriterion(newValue);
+  }
+
+  function onSelect(folder: IFolder, exclude: boolean = false) {
+    // toggle selection
+    const newValue = criterion.clone() as FolderCriterion;
+
+    if (!exclude) {
+      if (newValue.value.items.find((i) => i.id === folder.id)) {
+        return;
+      }
+
+      newValue.value.items.push({ id: folder.id, label: folder.path });
+    } else {
+      if (newValue.value.excluded.find((i) => i.id === folder.id)) {
+        return;
+      }
+
+      newValue.value.excluded.push({ id: folder.id, label: folder.path });
+    }
+
+    setCriterion(newValue);
+  }
+
+  const onUnselect = useCallback(
+    (i: Option, excluded?: boolean) => {
+      const newValue = criterion.clone() as FolderCriterion;
+
+      if (!excluded) {
+        newValue.value.items = newValue.value.items.filter(
+          (item) => item.id !== i.id
+        );
+      } else {
+        newValue.value.excluded = newValue.value.excluded.filter(
+          (item) => item.id !== i.id
+        );
+      }
+      setCriterion(newValue);
+    },
+    [criterion, setCriterion]
+  );
+
+  function onEnter() {
+    if (!query) return;
+
+    // if there is a single folder that matches the query, select it
+    const matchingFolders = getMatchingFolders(folderMap, query);
+    if (matchingFolders.length === 1) {
+      onSelect(matchingFolders[0]);
+    }
+  }
+
+  const selectedList = useMemo(() => {
+    const selected: Option[] =
+      criterion.value?.items.map((item) => ({
+        id: item.id,
+        label: item.label,
+      })) ?? [];
+
+    return <SelectedList items={selected} onUnselect={onUnselect} />;
+  }, [criterion, onUnselect]);
+
+  const excludedList = useMemo(() => {
+    const selected: Option[] =
+      criterion.value?.excluded.map((item) => ({
+        id: item.id,
+        label: item.label,
+      })) ?? [];
+
+    return (
+      <SelectedList
+        excluded
+        items={selected}
+        onUnselect={(i) => onUnselect(i, true)}
+      />
+    );
+  }, [criterion, onUnselect]);
+
+  return (
+    <div className="folder-filter">
+      <DepthSelector
+        depth={criterion.value.depth}
+        onDepthChanged={onDepthChanged}
+        id={criterionOptionTypeToIncludeID()}
+        label={intl.formatMessage(criterionOptionTypeToIncludeUIString())}
+        placeholder={intl.formatMessage(messages.sub_folder_depth)}
+      />
+
+      <Form.Group>
+        {selectedList}
+        {excludedList}
+        <ClearableInput
+          value={displayQuery}
+          setValue={(v) => onQueryChange(v)}
+          placeholder={`${intl.formatMessage({ id: "actions.search" })}…`}
+          onEnter={onEnter}
+        />
+        <FolderSelector
+          folderMap={folderMap}
+          onToggleExpanded={onToggleExpanded}
+          onSelect={onSelect}
+          canExclude
+        />
+      </Form.Group>
+    </div>
+  );
+};
+
+export const SidebarFolderFilter: React.FC<
+  ISidebarSectionProps & {
+    filter: ListFilterModel;
+    setFilter: (f: ListFilterModel) => void;
+    criterionOption?: ModifierCriterionOption;
+  }
+> = (props) => {
+  const intl = useIntl();
+  const [skip, setSkip] = useState(true);
+  const [query, setQuery] = useState("");
+  const [displayQuery, onQueryChange] = useDebouncedState(query, setQuery, 250);
+
+  function onOpen() {
+    setSkip(false);
+    props.onOpen?.();
+  }
+
+  const { folderMap, onToggleExpanded } = useFolderMap(query, skip);
+
+  const option = props.criterionOption ?? FolderCriterionOption;
+  const { filter, setFilter } = props;
+
+  const criterion = useMemo(() => {
+    const ret = filter.criteria.find(
+      (c) => c.criterionOption.type === option.type
+    );
+    if (ret) return ret as FolderCriterion;
+
+    const newCriterion = filter.makeCriterion(option.type) as FolderCriterion;
+    return newCriterion;
+  }, [option.type, filter]);
+
+  // if there are multiple values or excluded values, then we show none of the
+  // current values
+  const multipleSelected =
+    criterion.value.items.length > 1 || criterion.value.excluded.length > 0;
+
+  function onSelect(folder: IFolder) {
+    const c = criterion.clone() as FolderCriterion;
+    c.value = {
+      items: [{ id: folder.id, label: folder.path }],
+      depth: 0,
+      excluded: [],
+    };
+
+    const newCriteria = props.filter.criteria.filter(
+      (cc) => cc.criterionOption.type !== option.type
+    );
+
+    if (c.isValid()) newCriteria.push(c);
+
+    setFilter(props.filter.setCriteria(newCriteria));
+  }
+
+  function onSelectSubfolders() {
+    const c = criterion.clone() as FolderCriterion;
+    c.value = {
+      items: c.value?.items ?? [],
+      depth: -1,
+      excluded: c.value?.excluded ?? [],
+    };
+
+    setFilter(props.filter.replaceCriteria(option.type, [c]));
+  }
+
+  const onUnselect = useCallback(
+    (i: Option) => {
+      if (i.className === "modifier-object") {
+        // subfolders option
+        const c = criterion.clone() as FolderCriterion;
+        c.value = {
+          items: c.value?.items ?? [],
+          depth: 0,
+          excluded: c.value?.excluded ?? [],
+        };
+
+        setFilter(props.filter.replaceCriteria(option.type, [c]));
+        return;
+      }
+
+      setFilter(props.filter.removeCriterion(option.type));
+    },
+    [props.filter, setFilter, option.type, criterion]
+  );
+
+  function onEnter() {
+    if (!query) return;
+
+    // if there is a single folder that matches the query, select it
+    const matchingFolders = getMatchingFolders(folderMap, query);
+    if (matchingFolders.length === 1) {
+      onSelect(matchingFolders[0]);
+    }
+  }
+
+  const subDirsSelected = criterion.value?.depth === -1;
+
+  const selectedList = useMemo(() => {
+    if (multipleSelected) {
+      return null;
+    }
+
+    const selected: Option[] =
+      criterion.value?.items.map((item) => ({
+        id: item.id,
+        label: item.label,
+      })) ?? [];
+
+    if (subDirsSelected) {
+      selected.push({
+        id: "subfolders",
+        label: "(" + intl.formatMessage({ id: "sub_folders" }) + ")",
+        className: "modifier-object",
+      });
+    }
+
+    return <SelectedList items={selected} onUnselect={onUnselect} />;
+  }, [intl, multipleSelected, subDirsSelected, criterion, onUnselect]);
+
+  const modifierItem = criterion.value.items.length > 0 &&
+    !multipleSelected &&
+    !subDirsSelected && (
+      <li className="unselected-object modifier-object">
+        <a onClick={onSelectSubfolders}>
+          <span>
+            <Icon className={`fa-fw include-button`} icon={faPlus} />
+            (<FormattedMessage id="sub_folders" />)
+          </span>
+        </a>
+      </li>
+    );
+
+  return (
+    <SidebarSection
+      {...props}
+      outsideCollapse={selectedList}
+      onOpen={onOpen}
+      className="sidebar-list-filter sidebar-folder-filter"
+    >
+      <ClearableInput
+        value={displayQuery}
+        setValue={(v) => onQueryChange(v)}
+        placeholder={`${intl.formatMessage({ id: "actions.search" })}…`}
+        onEnter={onEnter}
+      />
+
+      <FolderSelector
+        folderMap={folderMap}
+        onToggleExpanded={onToggleExpanded}
+        preListContent={modifierItem}
+        onSelect={(f) => onSelect(f)}
+      />
+    </SidebarSection>
+  );
+};
diff --git a/ui/v2.5/src/components/List/Filters/LabeledIdFilter.tsx b/ui/v2.5/src/components/List/Filters/LabeledIdFilter.tsx
index e006d6b50..355a85d67 100644
--- a/ui/v2.5/src/components/List/Filters/LabeledIdFilter.tsx
+++ b/ui/v2.5/src/components/List/Filters/LabeledIdFilter.tsx
@@ -391,10 +391,17 @@ export function useCandidates(props: {
   const defaultModifier = getDefaultModifier(singleValue);
 
   const candidates = useMemo(() => {
+    return (results ?? []).map((r) => ({
+      id: r.id,
+      label: r.label,
+    }));
+  }, [results]);
+
+  const modifierCandidates = useMemo(() => {
     const hierarchicalCandidate =
       hierarchical && (criterion.value as IHierarchicalLabelValue).depth !== -1;
 
-    const modifierCandidates: Option[] = getModifierCandidates({
+    return getModifierCandidates({
       modifier,
       defaultModifier,
       hasSelected: selected.length > 0,
@@ -416,19 +423,11 @@ export function useCandidates(props: {
         canExclude: false,
       };
     });
-
-    return modifierCandidates.concat(
-      (results ?? []).map((r) => ({
-        id: r.id,
-        label: r.label,
-      }))
-    );
   }, [
     defaultModifier,
     intl,
     modifier,
     singleValue,
-    results,
     selected,
     excluded,
     criterion.value,
@@ -436,7 +435,7 @@ export function useCandidates(props: {
     includeSubMessageID,
   ]);
 
-  return candidates;
+  return { candidates, modifierCandidates };
 }
 
 export function useLabeledIdFilterState(props: {
@@ -481,7 +480,7 @@ export function useLabeledIdFilterState(props: {
       includeSubMessageID,
     });
 
-  const candidates = useCandidates({
+  const { candidates, modifierCandidates } = useCandidates({
     criterion,
     queryResults,
     selected,
@@ -497,6 +496,7 @@ export function useLabeledIdFilterState(props: {
 
   return {
     candidates,
+    modifierCandidates,
     onSelect,
     onUnselect,
     selected,
diff --git a/ui/v2.5/src/components/List/Filters/SelectableFilter.tsx b/ui/v2.5/src/components/List/Filters/SelectableFilter.tsx
index 9ea4333da..e599f3a87 100644
--- a/ui/v2.5/src/components/List/Filters/SelectableFilter.tsx
+++ b/ui/v2.5/src/components/List/Filters/SelectableFilter.tsx
@@ -19,7 +19,12 @@ import {
   ModifierCriterion,
   IHierarchicalLabeledIdCriterion,
 } from "src/models/list-filter/criteria/criterion";
-import { defineMessages, MessageDescriptor, useIntl } from "react-intl";
+import {
+  defineMessages,
+  FormattedMessage,
+  MessageDescriptor,
+  useIntl,
+} from "react-intl";
 import { CriterionModifier } from "src/core/generated-graphql";
 import { keyboardClickHandler } from "src/utils/keyboard";
 import { useDebounce } from "src/hooks/debounce";
@@ -118,7 +123,9 @@ const UnselectedItem: React.FC<{
               onKeyDown={(e) => e.stopPropagation()}
               className="minimal exclude-button"
             >
-              <span className="exclude-button-text">exclude</span>
+              <span className="exclude-button-text">
+                <FormattedMessage id="actions.exclude_lowercase" />
+              </span>
               {excludeIcon}
             </Button>
           )}
@@ -240,12 +247,19 @@ const SelectableFilter: React.FC<ISelectableFilter> = ({
     onSetModifier(defaultModifier);
   }
 
+  function onEnter() {
+    if (objects.length === 1) {
+      onSelect(objects[0], false);
+    }
+  }
+
   return (
     <div className="selectable-filter">
       <ClearableInput
         focus={inputFocus}
         value={query}
         setValue={(v) => onQueryChange(v)}
+        onEnter={onEnter}
         placeholder={`${intl.formatMessage({ id: "actions.search" })}…`}
       />
       <ul>
@@ -450,6 +464,42 @@ export const ObjectsFilter = <
   );
 };
 
+export const DepthSelector: React.FC<{
+  depth: number | undefined;
+  onDepthChanged: (depth: number) => void;
+  id: string;
+  label?: React.ReactNode;
+  placeholder?: string;
+  disabled?: boolean;
+}> = ({ depth, onDepthChanged, id, label, disabled, placeholder }) => {
+  return (
+    <Form.Group>
+      <Form.Group>
+        <Form.Check
+          id={id}
+          checked={depth !== 0}
+          label={label}
+          onChange={() => onDepthChanged(depth !== 0 ? 0 : -1)}
+          disabled={disabled}
+        />
+      </Form.Group>
+      {depth !== 0 && (
+        <Form.Group>
+          <NumberField
+            className="btn-secondary"
+            placeholder={placeholder}
+            onChange={(e) =>
+              onDepthChanged(e.target.value ? parseInt(e.target.value, 10) : -1)
+            }
+            defaultValue={depth !== -1 ? depth : ""}
+            min="1"
+          />
+        </Form.Group>
+      )}
+    </Form.Group>
+  );
+};
+
 interface IHierarchicalObjectsFilter<T extends IHierarchicalLabeledIdCriterion>
   extends IObjectsFilter<T> {}
 
@@ -497,38 +547,15 @@ export const HierarchicalObjectsFilter = <
   }
 
   return (
-    <Form>
-      <Form.Group>
-        <Form.Check
-          id={criterionOptionTypeToIncludeID()}
-          checked={
-            criterion.modifier !== CriterionModifier.Equals &&
-            criterion.value.depth !== 0
-          }
-          label={intl.formatMessage(criterionOptionTypeToIncludeUIString())}
-          onChange={() => onDepthChanged(criterion.value.depth !== 0 ? 0 : -1)}
-          disabled={criterion.modifier === CriterionModifier.Equals}
-        />
-      </Form.Group>
-
-      {criterion.value.depth !== 0 && (
-        <Form.Group>
-          <NumberField
-            className="btn-secondary"
-            placeholder={intl.formatMessage(messages.studio_depth)}
-            onChange={(e) =>
-              onDepthChanged(e.target.value ? parseInt(e.target.value, 10) : -1)
-            }
-            defaultValue={
-              criterion.value && criterion.value.depth !== -1
-                ? criterion.value.depth
-                : ""
-            }
-            min="1"
-          />
-        </Form.Group>
-      )}
+    <div>
+      <DepthSelector
+        depth={criterion.value.depth}
+        onDepthChanged={onDepthChanged}
+        id={criterionOptionTypeToIncludeID()}
+        label={intl.formatMessage(criterionOptionTypeToIncludeUIString())}
+        placeholder={intl.formatMessage(messages.studio_depth)}
+      />
       <ObjectsFilter {...props} />
-    </Form>
+    </div>
   );
 };
diff --git a/ui/v2.5/src/components/List/Filters/SidebarListFilter.tsx b/ui/v2.5/src/components/List/Filters/SidebarListFilter.tsx
index fe9b7987c..14e11e968 100644
--- a/ui/v2.5/src/components/List/Filters/SidebarListFilter.tsx
+++ b/ui/v2.5/src/components/List/Filters/SidebarListFilter.tsx
@@ -182,7 +182,8 @@ const QueryField: React.FC<{
   focus: ReturnType<typeof useFocus>;
   value: string;
   setValue: (query: string) => void;
-}> = ({ focus, value, setValue }) => {
+  onEnter?: () => void;
+}> = ({ focus, value, setValue, onEnter }) => {
   const intl = useIntl();
 
   const [displayQuery, setDisplayQuery] = useState(value);
@@ -206,6 +207,7 @@ const QueryField: React.FC<{
       value={displayQuery}
       setValue={(v) => onQueryChange(v)}
       placeholder={`${intl.formatMessage({ id: "actions.search" })}…`}
+      onEnter={onEnter}
     />
   );
 };
@@ -214,6 +216,7 @@ interface IQueryableProps {
   inputFocus?: ReturnType<typeof useFocus>;
   query?: string;
   setQuery?: (query: string) => void;
+  onEnter?: () => void;
 }
 
 export const CandidateList: React.FC<
@@ -227,6 +230,7 @@ export const CandidateList: React.FC<
   inputFocus,
   query,
   setQuery,
+  onEnter,
   items,
   onSelect,
   canExclude,
@@ -242,6 +246,7 @@ export const CandidateList: React.FC<
           focus={inputFocus}
           value={query}
           setValue={(v) => setQuery(v)}
+          onEnter={onEnter}
         />
       )}
       <ul>
@@ -265,6 +270,7 @@ export const SidebarListFilter: React.FC<{
   selected: Option[];
   excluded?: Option[];
   candidates: Option[];
+  modifierCandidates?: Option[];
   singleValue?: boolean;
   onSelect: (item: Option, exclude: boolean) => void;
   onUnselect: (item: Option, exclude: boolean) => void;
@@ -283,6 +289,7 @@ export const SidebarListFilter: React.FC<{
   selected,
   excluded,
   candidates,
+  modifierCandidates,
   onSelect,
   onUnselect,
   canExclude,
@@ -324,6 +331,20 @@ export const SidebarListFilter: React.FC<{
     }
   }
 
+  function onEnter() {
+    if (candidates && candidates.length === 1) {
+      selectHook(candidates[0], false);
+    }
+  }
+
+  const items = useMemo(() => {
+    if (!modifierCandidates) {
+      return candidates;
+    }
+
+    return [...modifierCandidates, ...candidates];
+  }, [candidates, modifierCandidates]);
+
   return (
     <SidebarSection
       className="sidebar-list-filter"
@@ -350,13 +371,14 @@ export const SidebarListFilter: React.FC<{
     >
       {preCandidates ? <div className="extra">{preCandidates}</div> : null}
       <CandidateList
-        items={candidates}
+        items={items}
         onSelect={selectHook}
         canExclude={canExclude}
         inputFocus={inputFocus}
         query={query}
         setQuery={setQuery}
         singleValue={singleValue}
+        onEnter={onEnter}
       />
       {postCandidates ? <div className="extra">{postCandidates}</div> : null}
     </SidebarSection>
diff --git a/ui/v2.5/src/components/List/styles.scss b/ui/v2.5/src/components/List/styles.scss
index ede004101..cccd73cb2 100644
--- a/ui/v2.5/src/components/List/styles.scss
+++ b/ui/v2.5/src/components/List/styles.scss
@@ -234,14 +234,14 @@ input[type="range"].zoom-slider {
 
   .saved-filter-item {
     cursor: pointer;
-    height: 2em;
     margin-bottom: 0.25rem;
+    min-height: 2em;
 
     a {
       align-items: center;
       display: flex;
-      height: 2em;
       justify-content: space-between;
+      min-height: 2em;
       outline: none;
 
       &:hover,
@@ -507,7 +507,8 @@ input[type="range"].zoom-slider {
   }
 }
 
-.selectable-filter ul {
+.selectable-filter ul,
+ul.selectable-list {
   list-style-type: none;
   margin-top: 0.5rem;
   max-height: 300px;
@@ -533,14 +534,14 @@ input[type="range"].zoom-slider {
   .excluded-object,
   .unselected-object {
     cursor: pointer;
-    height: 2em;
     margin-bottom: 0.25rem;
+    min-height: 2em;
 
     a {
       align-items: center;
       display: flex;
-      height: 2em;
       justify-content: space-between;
+      min-height: 2em;
       outline: none;
 
       &:hover,
@@ -613,7 +614,8 @@ input[type="range"].zoom-slider {
   margin-bottom: 0.5rem;
 }
 
-.sidebar-list-filter ul {
+.sidebar-list-filter ul,
+.folder-filter ul {
   list-style-type: none;
   margin-bottom: 0.25rem;
   max-height: 300px;
@@ -639,14 +641,14 @@ input[type="range"].zoom-slider {
   .excluded-object,
   .unselected-object {
     cursor: pointer;
-    height: 2em;
     margin-bottom: 0.25rem;
+    min-height: 2em;
 
     a {
       align-items: center;
       display: flex;
-      height: 2em;
       justify-content: space-between;
+      min-height: 2em;
       outline: none;
 
       &:hover,
@@ -687,7 +689,7 @@ input[type="range"].zoom-slider {
       }
 
       &:hover {
-        background-color: inherit;
+        background-color: transparent;
       }
 
       &:hover .exclude-button-text,
@@ -748,6 +750,29 @@ input[type="range"].zoom-slider {
   }
 }
 
+.sidebar-folder-filter ul,
+.folder-filter ul,
+ul.selectable-list {
+  margin-top: 0.25rem;
+
+  .btn.expand-collapse {
+    font-size: 0.8rem;
+    padding-left: 0;
+    padding-right: 0.25rem;
+    text-align: left;
+  }
+
+  .empty .btn.expand-collapse {
+    visibility: hidden;
+  }
+
+  .selected-object a .selected-object-label {
+    font-size: 0.8em;
+    overflow-wrap: break-word;
+    white-space: normal;
+  }
+}
+
 .tilted {
   transform: rotate(45deg);
 }
diff --git a/ui/v2.5/src/components/Scenes/SceneList.tsx b/ui/v2.5/src/components/Scenes/SceneList.tsx
index 6570e39db..156258045 100644
--- a/ui/v2.5/src/components/Scenes/SceneList.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneList.tsx
@@ -58,6 +58,7 @@ import useFocus from "src/utils/focus";
 import { useZoomKeybinds } from "../List/ZoomSlider";
 import { FilteredListToolbar } from "../List/FilteredListToolbar";
 import { FilterTags } from "../List/FilterTags";
+import { SidebarFolderFilter } from "../List/Filters/FolderFilter";
 
 function renderMetadataByline(result: GQL.FindScenesQueryResult) {
   const duration = result?.data?.findScenes?.duration;
@@ -305,6 +306,12 @@ const SidebarContent: React.FC<{
         />
         <SidebarRatingFilter filter={filter} setFilter={setFilter} />
         <SidebarDurationFilter filter={filter} setFilter={setFilter} />
+        <SidebarFolderFilter
+          text={<FormattedMessage id="folder" />}
+          filter={filter}
+          setFilter={setFilter}
+          sectionID="folder"
+        />
         <SidebarBooleanFilter
           title={<FormattedMessage id="hasMarkers" />}
           data-type={HasMarkersCriterionOption.type}
diff --git a/ui/v2.5/src/components/Shared/ClearableInput.tsx b/ui/v2.5/src/components/Shared/ClearableInput.tsx
index 76c6db54a..56f17a7f9 100644
--- a/ui/v2.5/src/components/Shared/ClearableInput.tsx
+++ b/ui/v2.5/src/components/Shared/ClearableInput.tsx
@@ -10,6 +10,7 @@ interface IClearableInput {
   className?: string;
   value: string;
   setValue: (value: string) => void;
+  onEnter?: () => void;
   focus?: ReturnType<typeof useFocus>;
   placeholder?: string;
 }
@@ -18,6 +19,7 @@ export const ClearableInput: React.FC<IClearableInput> = ({
   className,
   value,
   setValue,
+  onEnter,
   focus,
   placeholder,
 }) => {
@@ -43,6 +45,9 @@ export const ClearableInput: React.FC<IClearableInput> = ({
     if (e.key === "Escape") {
       queryRef.current?.blur();
     }
+    if (e.key === "Enter" && onEnter) {
+      onEnter();
+    }
   }
 
   return (
diff --git a/ui/v2.5/src/components/Shared/CollapseButton.tsx b/ui/v2.5/src/components/Shared/CollapseButton.tsx
index 0d05f6e64..fe8330a9c 100644
--- a/ui/v2.5/src/components/Shared/CollapseButton.tsx
+++ b/ui/v2.5/src/components/Shared/CollapseButton.tsx
@@ -2,6 +2,7 @@ import {
   faChevronDown,
   faChevronRight,
   faChevronUp,
+  IconDefinition,
 } from "@fortawesome/free-solid-svg-icons";
 import React, { useEffect, useState } from "react";
 import { Button, Collapse, CollapseProps } from "react-bootstrap";
@@ -55,14 +56,21 @@ export const CollapseButton: React.FC<React.PropsWithChildren<IProps>> = (
 export const ExpandCollapseButton: React.FC<{
   collapsed: boolean;
   setCollapsed: (collapsed: boolean) => void;
-}> = ({ collapsed, setCollapsed }) => {
-  const buttonIcon = collapsed ? faChevronDown : faChevronUp;
+  collapsedIcon?: IconDefinition;
+  notCollapsedIcon?: IconDefinition;
+}> = ({ collapsedIcon, notCollapsedIcon, collapsed, setCollapsed }) => {
+  const buttonIcon = collapsed
+    ? collapsedIcon ?? faChevronDown
+    : notCollapsedIcon ?? faChevronUp;
 
   return (
     <span className="detail-expand-collapse">
       <Button
         className="minimal expand-collapse"
-        onClick={() => setCollapsed(!collapsed)}
+        onClick={(e) => {
+          setCollapsed(!collapsed);
+          e.stopPropagation();
+        }}
       >
         <Icon icon={buttonIcon} fixedWidth />
       </Button>
diff --git a/ui/v2.5/src/components/Shared/Sidebar.tsx b/ui/v2.5/src/components/Shared/Sidebar.tsx
index 10dbaaaba..51fddee33 100644
--- a/ui/v2.5/src/components/Shared/Sidebar.tsx
+++ b/ui/v2.5/src/components/Shared/Sidebar.tsx
@@ -97,15 +97,17 @@ interface IContext {
 
 export const SidebarStateContext = React.createContext<IContext | null>(null);
 
+export interface ISidebarSectionProps {
+  text: React.ReactNode;
+  className?: string;
+  outsideCollapse?: React.ReactNode;
+  onOpen?: () => void;
+  // used to store open/closed state in SidebarStateContext
+  sectionID?: string;
+}
+
 export const SidebarSection: React.FC<
-  PropsWithChildren<{
-    text: React.ReactNode;
-    className?: string;
-    outsideCollapse?: React.ReactNode;
-    onOpen?: () => void;
-    // used to store open/closed state in SidebarStateContext
-    sectionID?: string;
-  }>
+  PropsWithChildren<ISidebarSectionProps>
 > = ({
   className = "",
   text,
diff --git a/ui/v2.5/src/core/StashService.ts b/ui/v2.5/src/core/StashService.ts
index 535beed65..ac23d59e0 100644
--- a/ui/v2.5/src/core/StashService.ts
+++ b/ui/v2.5/src/core/StashService.ts
@@ -515,6 +515,21 @@ export const useFindSavedFilters = (mode?: GQL.FilterMode) =>
     variables: { mode },
   });
 
+export const queryFindSubFolders = (id: string) =>
+  client.query<GQL.FindFoldersForQueryQuery>({
+    query: GQL.FindFoldersForQueryDocument,
+    variables: {
+      folder_filter: {
+        parent_folder: { value: id, modifier: GQL.CriterionModifier.Equals },
+      },
+      filter: {
+        per_page: -1,
+        sort: "basename",
+        direction: GQL.SortDirectionEnum.Asc,
+      },
+    },
+  });
+
 /// Object Mutations
 
 // Increases/decreases the given field of the Stats query by diff
diff --git a/ui/v2.5/src/hooks/debounce.ts b/ui/v2.5/src/hooks/debounce.ts
index 9baf3d1d4..bc4f63ef1 100644
--- a/ui/v2.5/src/hooks/debounce.ts
+++ b/ui/v2.5/src/hooks/debounce.ts
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable react-hooks/exhaustive-deps */
 import { debounce, DebouncedFunc, DebounceSettings } from "lodash-es";
-import { useCallback, useRef } from "react";
+import { useCallback, useRef, useState } from "react";
 
 export function useDebounce<T extends (...args: any) => any>(
   fn: T,
@@ -21,3 +21,30 @@ export function useDebounce<T extends (...args: any) => any>(
     [wait, options?.leading, options?.trailing, options?.maxWait]
   );
 }
+
+export function useDebouncedState<T>(
+  initialValue: T,
+  setValue: (v: T) => void,
+  wait?: number
+): [T, (v: T) => void, (v: T) => void] {
+  const [displayedState, setDisplayedState] = useState(initialValue);
+
+  const debouncedSetValue = useDebounce(setValue, wait);
+  const onChange = useCallback(
+    (input: T) => {
+      setDisplayedState(input);
+      debouncedSetValue(input);
+    },
+    [debouncedSetValue, setDisplayedState]
+  );
+
+  const setInstant = useCallback(
+    (v: T) => {
+      setDisplayedState(v);
+      setValue(v);
+    },
+    [setValue]
+  );
+
+  return [displayedState, onChange, setInstant];
+}
diff --git a/ui/v2.5/src/locales/en-GB.json b/ui/v2.5/src/locales/en-GB.json
index 8a0ad96da..7b4091f8b 100644
--- a/ui/v2.5/src/locales/en-GB.json
+++ b/ui/v2.5/src/locales/en-GB.json
@@ -52,6 +52,7 @@
     "edit_entity": "Edit {entityType}",
     "enable": "Enable",
     "encoding_image": "Encoding image…",
+    "exclude_lowercase": "exclude",
     "export": "Export",
     "export_all": "Export all…",
     "find": "Find",
@@ -1225,6 +1226,7 @@
   "image_index": "Image #",
   "images": "Images",
   "include_parent_tags": "Include parent tags",
+  "include_sub_folders": "Include sub-folders",
   "include_sub_group_content": "Include sub-group content",
   "include_sub_groups": "Include sub-groups",
   "include_sub_studio_content": "Include sub-studio content",
@@ -1327,6 +1329,7 @@
     "next": "Next",
     "previous": "Previous"
   },
+  "parent_folder": "Parent Folder",
   "parent_of": "Parent of {children}",
   "parent_studio": "Parent Studio",
   "parent_studios": "Parent Studios",
@@ -1578,6 +1581,8 @@
   },
   "studio_tags": "Studio Tags",
   "studios": "Studios",
+  "sub_folder_depth": "Sub folder depth (empty for all)",
+  "sub_folders": "Sub folders",
   "sub_group": "Sub-Group",
   "sub_group_count": "Sub-Group Count",
   "sub_group_of": "Sub-group of {parent}",
diff --git a/ui/v2.5/src/models/list-filter/criteria/criterion.ts b/ui/v2.5/src/models/list-filter/criteria/criterion.ts
index 007ee6508..37f04e6dc 100644
--- a/ui/v2.5/src/models/list-filter/criteria/criterion.ts
+++ b/ui/v2.5/src/models/list-filter/criteria/criterion.ts
@@ -251,6 +251,7 @@ export type InputType =
   | "scene_tags"
   | "groups"
   | "galleries"
+  | "folders"
   | undefined;
 
 type MakeCriterionFn = (
diff --git a/ui/v2.5/src/models/list-filter/criteria/folder.ts b/ui/v2.5/src/models/list-filter/criteria/folder.ts
new file mode 100644
index 000000000..2e288a5f1
--- /dev/null
+++ b/ui/v2.5/src/models/list-filter/criteria/folder.ts
@@ -0,0 +1,52 @@
+import { CriterionModifier } from "src/core/generated-graphql";
+import {
+  ModifierCriterionOption,
+  IHierarchicalLabeledIdCriterion,
+} from "./criterion";
+
+const modifierOptions = [CriterionModifier.Includes];
+
+const defaultModifier = CriterionModifier.Includes;
+const inputType = "folders";
+
+export const FolderCriterionOption = new ModifierCriterionOption({
+  messageID: "folder",
+  type: "folder",
+  modifierOptions,
+  defaultModifier,
+  inputType,
+  makeCriterion: () => new FolderCriterion(),
+});
+
+// for galleries, we should use parent folder to distinguish between gallery folder
+// and parent folder of the gallery folder
+export const ParentFolderCriterionOption = new ModifierCriterionOption({
+  messageID: "parent_folder",
+  type: "parent_folder",
+  modifierOptions,
+  defaultModifier,
+  inputType,
+  makeCriterion: () => new ParentFolderCriterion(),
+});
+
+export class FolderCriterion extends IHierarchicalLabeledIdCriterion {
+  constructor() {
+    super(FolderCriterionOption);
+  }
+
+  public applyToCriterionInput(input: Record<string, unknown>) {
+    input.files_filter = {
+      parent_folder: this.toCriterionInput(),
+    };
+  }
+}
+
+export class ParentFolderCriterion extends IHierarchicalLabeledIdCriterion {
+  constructor() {
+    super(ParentFolderCriterionOption);
+  }
+
+  public applyToCriterionInput(input: Record<string, unknown>) {
+    input.parent_folder = this.toCriterionInput();
+  }
+}
diff --git a/ui/v2.5/src/models/list-filter/galleries.ts b/ui/v2.5/src/models/list-filter/galleries.ts
index e8549701f..ed0b2c155 100644
--- a/ui/v2.5/src/models/list-filter/galleries.ts
+++ b/ui/v2.5/src/models/list-filter/galleries.ts
@@ -22,6 +22,7 @@ import { DisplayMode } from "./types";
 import { RatingCriterionOption } from "./criteria/rating";
 import { PathCriterionOption } from "./criteria/path";
 import { CustomFieldsCriterionOption } from "./criteria/custom-fields";
+import { ParentFolderCriterionOption } from "./criteria/folder";
 
 const defaultSortBy = "path";
 
@@ -53,6 +54,7 @@ const criterionOptions = [
   createStringCriterionOption("details"),
   createStringCriterionOption("photographer"),
   PathCriterionOption,
+  ParentFolderCriterionOption,
   createStringCriterionOption("checksum", "media_info.md5"),
   RatingCriterionOption,
   OrganizedCriterionOption,
diff --git a/ui/v2.5/src/models/list-filter/images.ts b/ui/v2.5/src/models/list-filter/images.ts
index aa6ad81ca..82b382677 100644
--- a/ui/v2.5/src/models/list-filter/images.ts
+++ b/ui/v2.5/src/models/list-filter/images.ts
@@ -23,6 +23,7 @@ import { DisplayMode } from "./types";
 import { GalleriesCriterionOption } from "./criteria/galleries";
 import { PhashCriterionOption } from "./criteria/phash";
 import { CustomFieldsCriterionOption } from "./criteria/custom-fields";
+import { FolderCriterionOption } from "./criteria/folder";
 
 const defaultSortBy = "path";
 
@@ -54,6 +55,7 @@ const criterionOptions = [
   createMandatoryStringCriterionOption("checksum", "media_info.md5"),
   PhashCriterionOption,
   PathCriterionOption,
+  FolderCriterionOption,
   GalleriesCriterionOption,
   OrganizedCriterionOption,
   createMandatoryNumberCriterionOption("o_counter", "o_count", {
diff --git a/ui/v2.5/src/models/list-filter/scenes.ts b/ui/v2.5/src/models/list-filter/scenes.ts
index c0e4a75a1..ef7c62802 100644
--- a/ui/v2.5/src/models/list-filter/scenes.ts
+++ b/ui/v2.5/src/models/list-filter/scenes.ts
@@ -36,6 +36,7 @@ import { RatingCriterionOption } from "./criteria/rating";
 import { PathCriterionOption } from "./criteria/path";
 import { OrientationCriterionOption } from "./criteria/orientation";
 import { CustomFieldsCriterionOption } from "./criteria/custom-fields";
+import { FolderCriterionOption } from "./criteria/folder";
 
 const defaultSortBy = "date";
 const sortByOptions = [
@@ -96,6 +97,7 @@ const criterionOptions = [
   createStringCriterionOption("title"),
   createStringCriterionOption("code", "scene_code"),
   PathCriterionOption,
+  FolderCriterionOption,
   createStringCriterionOption("details"),
   createStringCriterionOption("director"),
   createMandatoryStringCriterionOption("oshash", "media_info.oshash"),
diff --git a/ui/v2.5/src/models/list-filter/types.ts b/ui/v2.5/src/models/list-filter/types.ts
index 7fe334c4c..d5ae684fc 100644
--- a/ui/v2.5/src/models/list-filter/types.ts
+++ b/ui/v2.5/src/models/list-filter/types.ts
@@ -223,4 +223,6 @@ export type CriterionType =
   | "disambiguation"
   | "has_chapters"
   | "sort_name"
-  | "custom_fields";
+  | "custom_fields"
+  | "folder"
+  | "parent_folder";

From 74a8f2e5d59ad70f2e7cd676fdf02537f03d6457 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Fri, 6 Mar 2026 08:27:25 +1100
Subject: [PATCH 343/405] Disable links on wall items when selecting (#6649)

---
 ui/v2.5/src/components/Galleries/GalleryWallCard.tsx |  8 +++++++-
 ui/v2.5/src/components/Scenes/SceneWallPanel.tsx     | 11 ++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/ui/v2.5/src/components/Galleries/GalleryWallCard.tsx b/ui/v2.5/src/components/Galleries/GalleryWallCard.tsx
index c1501bd9d..c79000783 100644
--- a/ui/v2.5/src/components/Galleries/GalleryWallCard.tsx
+++ b/ui/v2.5/src/components/Galleries/GalleryWallCard.tsx
@@ -132,7 +132,13 @@ const GalleryWallCard: React.FC<IProps> = ({
           <footer className={CLASSNAME_FOOTER}>
             <Link
               to={`/galleries/${gallery.id}`}
-              onClick={(e) => e.stopPropagation()}
+              onClick={(e) => {
+                if (selecting) {
+                  e.preventDefault();
+                  handleCardClick(e);
+                }
+                e.stopPropagation();
+              }}
             >
               {title && (
                 <TruncatedText
diff --git a/ui/v2.5/src/components/Scenes/SceneWallPanel.tsx b/ui/v2.5/src/components/Scenes/SceneWallPanel.tsx
index bf4a97b49..d960db31f 100644
--- a/ui/v2.5/src/components/Scenes/SceneWallPanel.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneWallPanel.tsx
@@ -131,7 +131,16 @@ export const SceneWallItem: React.FC<
       />
       <div className="lineargradient">
         <footer className="wall-item-footer">
-          <Link to={props.photo.link} onClick={(e) => e.stopPropagation()}>
+          <Link
+            to={props.photo.link}
+            onClick={(e) => {
+              if (props.selecting) {
+                e.preventDefault();
+                handleClick(e);
+              }
+              e.stopPropagation();
+            }}
+          >
             {title && (
               <TruncatedText
                 text={title}

From cacaf36347fa0ef707be17963d462a3e024dc335 Mon Sep 17 00:00:00 2001
From: smith113-p <205463041+smith113-p@users.noreply.github.com>
Date: Mon, 9 Mar 2026 17:01:46 -0400
Subject: [PATCH 344/405] Use StashIDPill in the performer modal dialog (#6655)

Currently, this dialog just shows a text "Stash-Box Source".
This change instead re-uses the StashIDPill, with the main advantage
that you can immediately tell which stash box is being used.
---
 ui/v2.5/src/components/Tagger/PerformerModal.tsx | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/ui/v2.5/src/components/Tagger/PerformerModal.tsx b/ui/v2.5/src/components/Tagger/PerformerModal.tsx
index ac9444c5b..9b2434165 100755
--- a/ui/v2.5/src/components/Tagger/PerformerModal.tsx
+++ b/ui/v2.5/src/components/Tagger/PerformerModal.tsx
@@ -15,10 +15,10 @@ import {
   faArrowLeft,
   faArrowRight,
   faCheck,
-  faExternalLinkAlt,
   faTimes,
 } from "@fortawesome/free-solid-svg-icons";
 import { ExternalLink } from "../Shared/ExternalLink";
+import { StashIDPill } from "../Shared/StashID";
 
 interface IPerformerModalProps {
   performer: GQL.ScrapedScenePerformerDataFragment;
@@ -208,15 +208,13 @@ const PerformerModal: React.FC<IPerformerModalProps> = ({
 
   function maybeRenderStashBoxLink() {
     const base = endpoint?.match(/https?:\/\/.*?\//)?.[0];
-    if (!base) return;
+    if (!base || !performer.remote_site_id) return;
 
     return (
-      <h6 className="mt-2">
-        <ExternalLink href={`${base}performers/${performer.remote_site_id}`}>
-          <FormattedMessage id="stashbox.source" />
-          <Icon icon={faExternalLinkAlt} className="ml-2" />
-        </ExternalLink>
-      </h6>
+      <StashIDPill
+        linkType="performers"
+        stashID={{ endpoint: endpoint, stash_id: performer.remote_site_id }}
+      />
     );
   }
 

From ae5d065da1980305b2b56a31fb55d5159f414df5 Mon Sep 17 00:00:00 2001
From: Gykes <24581046+Gykes@users.noreply.github.com>
Date: Mon, 9 Mar 2026 19:50:57 -0700
Subject: [PATCH 345/405] Fix infinite re-render loop in gallery image list
 (#6651)

---
 .../GalleryDetails/GalleryAddPanel.tsx        | 63 ++++++++++---------
 .../GalleryDetails/GalleryImagesPanel.tsx     | 63 ++++++++++---------
 ui/v2.5/src/components/Images/ImageList.tsx   |  4 +-
 ui/v2.5/src/components/List/util.ts           | 10 +--
 4 files changed, 73 insertions(+), 67 deletions(-)

diff --git a/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryAddPanel.tsx b/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryAddPanel.tsx
index 6fbb12f15..e0c115f34 100644
--- a/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryAddPanel.tsx
+++ b/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryAddPanel.tsx
@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useCallback } from "react";
 import * as GQL from "src/core/generated-graphql";
 import { GalleriesCriterion } from "src/models/list-filter/criteria/galleries";
 import { ListFilterModel } from "src/models/list-filter/filter";
@@ -24,40 +24,43 @@ export const GalleryAddPanel: React.FC<IGalleryAddProps> = PatchComponent(
     const Toast = useToast();
     const intl = useIntl();
 
-    function filterHook(filter: ListFilterModel) {
-      const galleryValue = {
-        id: gallery.id,
-        label: galleryTitle(gallery),
-      };
-      // if galleries is already present, then we modify it, otherwise add
-      let galleryCriterion = filter.criteria.find((c) => {
-        return c.criterionOption.type === "galleries";
-      }) as GalleriesCriterion | undefined;
+    const filterHook = useCallback(
+      (filter: ListFilterModel) => {
+        const galleryValue = {
+          id: gallery.id,
+          label: galleryTitle(gallery),
+        };
+        // if galleries is already present, then we modify it, otherwise add
+        let galleryCriterion = filter.criteria.find((c) => {
+          return c.criterionOption.type === "galleries";
+        }) as GalleriesCriterion | undefined;
 
-      if (
-        galleryCriterion &&
-        galleryCriterion.modifier === GQL.CriterionModifier.Excludes
-      ) {
-        // add the gallery if not present
         if (
-          !galleryCriterion.value.find((p) => {
-            return p.id === gallery.id;
-          })
+          galleryCriterion &&
+          galleryCriterion.modifier === GQL.CriterionModifier.Excludes
         ) {
-          galleryCriterion.value.push(galleryValue);
+          // add the gallery if not present
+          if (
+            !galleryCriterion.value.find((p) => {
+              return p.id === gallery.id;
+            })
+          ) {
+            galleryCriterion.value.push(galleryValue);
+          }
+
+          galleryCriterion.modifier = GQL.CriterionModifier.Excludes;
+        } else {
+          // overwrite
+          galleryCriterion = new GalleriesCriterion();
+          galleryCriterion.modifier = GQL.CriterionModifier.Excludes;
+          galleryCriterion.value = [galleryValue];
+          filter.criteria.push(galleryCriterion);
         }
 
-        galleryCriterion.modifier = GQL.CriterionModifier.Excludes;
-      } else {
-        // overwrite
-        galleryCriterion = new GalleriesCriterion();
-        galleryCriterion.modifier = GQL.CriterionModifier.Excludes;
-        galleryCriterion.value = [galleryValue];
-        filter.criteria.push(galleryCriterion);
-      }
-
-      return filter;
-    }
+        return filter;
+      },
+      [gallery]
+    );
 
     async function addImages(
       result: GQL.FindImagesQueryResult,
diff --git a/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryImagesPanel.tsx b/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryImagesPanel.tsx
index 174e507a8..c555116b5 100644
--- a/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryImagesPanel.tsx
+++ b/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryImagesPanel.tsx
@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useCallback } from "react";
 import * as GQL from "src/core/generated-graphql";
 import { GalleriesCriterion } from "src/models/list-filter/criteria/galleries";
 import { ListFilterModel } from "src/models/list-filter/filter";
@@ -32,40 +32,43 @@ export const GalleryImagesPanel: React.FC<IGalleryDetailsProps> =
       const intl = useIntl();
       const Toast = useToast();
 
-      function filterHook(filter: ListFilterModel) {
-        const galleryValue = {
-          id: gallery.id!,
-          label: galleryTitle(gallery),
-        };
-        // if galleries is already present, then we modify it, otherwise add
-        let galleryCriterion = filter.criteria.find((c) => {
-          return c.criterionOption.type === "galleries";
-        }) as GalleriesCriterion | undefined;
+      const filterHook = useCallback(
+        (filter: ListFilterModel) => {
+          const galleryValue = {
+            id: gallery.id!,
+            label: galleryTitle(gallery),
+          };
+          // if galleries is already present, then we modify it, otherwise add
+          let galleryCriterion = filter.criteria.find((c) => {
+            return c.criterionOption.type === "galleries";
+          }) as GalleriesCriterion | undefined;
 
-        if (
-          galleryCriterion &&
-          (galleryCriterion.modifier === GQL.CriterionModifier.IncludesAll ||
-            galleryCriterion.modifier === GQL.CriterionModifier.Includes)
-        ) {
-          // add the gallery if not present
           if (
-            !galleryCriterion.value.find((p) => {
-              return p.id === gallery.id;
-            })
+            galleryCriterion &&
+            (galleryCriterion.modifier === GQL.CriterionModifier.IncludesAll ||
+              galleryCriterion.modifier === GQL.CriterionModifier.Includes)
           ) {
-            galleryCriterion.value.push(galleryValue);
+            // add the gallery if not present
+            if (
+              !galleryCriterion.value.find((p) => {
+                return p.id === gallery.id;
+              })
+            ) {
+              galleryCriterion.value.push(galleryValue);
+            }
+
+            galleryCriterion.modifier = GQL.CriterionModifier.IncludesAll;
+          } else {
+            // overwrite
+            galleryCriterion = new GalleriesCriterion();
+            galleryCriterion.value = [galleryValue];
+            filter.criteria.push(galleryCriterion);
           }
 
-          galleryCriterion.modifier = GQL.CriterionModifier.IncludesAll;
-        } else {
-          // overwrite
-          galleryCriterion = new GalleriesCriterion();
-          galleryCriterion.value = [galleryValue];
-          filter.criteria.push(galleryCriterion);
-        }
-
-        return filter;
-      }
+          return filter;
+        },
+        [gallery]
+      );
 
       async function setCover(
         result: GQL.FindImagesQueryResult,
diff --git a/ui/v2.5/src/components/Images/ImageList.tsx b/ui/v2.5/src/components/Images/ImageList.tsx
index 35c367a8a..00b23b0aa 100644
--- a/ui/v2.5/src/components/Images/ImageList.tsx
+++ b/ui/v2.5/src/components/Images/ImageList.tsx
@@ -751,7 +751,7 @@ export const FilteredImageList = PatchComponent(
             currentPage={filter.currentPage}
             itemsPerPage={filter.itemsPerPage}
             totalItems={totalCount}
-            onChangePage={(page) => setFilter(filter.changePage(page))}
+            onChangePage={setPage}
           />
           <PaginationIndex
             loading={cachedResult.loading}
@@ -766,7 +766,7 @@ export const FilteredImageList = PatchComponent(
           <ImageList
             filter={filter}
             images={items}
-            onChangePage={(page) => setFilter(filter.changePage(page))}
+            onChangePage={setPage}
             onSelectChange={onSelectChange}
             pageCount={pageCount}
             selectedIds={selectedIds}
diff --git a/ui/v2.5/src/components/List/util.ts b/ui/v2.5/src/components/List/util.ts
index 89c32222f..da52ea765 100644
--- a/ui/v2.5/src/components/List/util.ts
+++ b/ui/v2.5/src/components/List/util.ts
@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useMemo, useState } from "react";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import Mousetrap from "mousetrap";
 import { ListFilterModel } from "src/models/list-filter/filter";
 import { useHistory, useLocation } from "react-router-dom";
@@ -489,20 +489,20 @@ export function useCachedQueryResult<T extends QueryResult>(
   result: T
 ) {
   const [cachedResult, setCachedResult] = useState(result);
-  const [lastFilter, setLastFilter] = useState(filter);
+  const lastFilterRef = useRef(filter);
 
   // if we are only changing the page or sort, don't update the result count
   useEffect(() => {
     if (!result.loading) {
       setCachedResult(result);
     } else {
-      if (totalCountImpacted(lastFilter, filter)) {
+      if (totalCountImpacted(lastFilterRef.current, filter)) {
         setCachedResult(result);
       }
     }
 
-    setLastFilter(filter);
-  }, [filter, result, lastFilter]);
+    lastFilterRef.current = filter;
+  }, [filter, result]);
 
   return cachedResult;
 }

From 69a49c9ab8b36de520ed68d92759c706c2cf9277 Mon Sep 17 00:00:00 2001
From: smith113-p <205463041+smith113-p@users.noreply.github.com>
Date: Mon, 9 Mar 2026 23:12:17 -0400
Subject: [PATCH 346/405] Show the stash box for each stash ID in the scene
 merge dialog (#6656)

* Show the stash box for each stash ID in the scene merge dialog

Currently, this dialog only shows the ID but not the stash box it
corresponds to. This is not very useful because the ID does not mean
anything to a user.

This renders the ID as "Stashdb | 1234...", mimicing the StashIDPill.

* Use StashIDPill instead
---
 .../src/components/Scenes/SceneMergeDialog.tsx    | 15 +++++++++++++--
 ui/v2.5/src/components/Shared/styles.scss         |  6 +++++-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/ui/v2.5/src/components/Scenes/SceneMergeDialog.tsx b/ui/v2.5/src/components/Scenes/SceneMergeDialog.tsx
index 89d445002..c38b27f07 100644
--- a/ui/v2.5/src/components/Scenes/SceneMergeDialog.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneMergeDialog.tsx
@@ -3,7 +3,7 @@ import React, { useEffect, useMemo, useState } from "react";
 import * as GQL from "src/core/generated-graphql";
 import { Icon } from "../Shared/Icon";
 import { LoadingIndicator } from "../Shared/LoadingIndicator";
-import { StringListSelect, GallerySelect } from "../Shared/Select";
+import { GallerySelect } from "../Shared/Select";
 import * as FormUtils from "src/utils/form";
 import ImageUtils from "src/utils/image";
 import TextUtils from "src/utils/text";
@@ -41,13 +41,24 @@ import {
   ScrapedTagsRow,
 } from "../Shared/ScrapeDialog/ScrapedObjectsRow";
 import { Scene, SceneSelect } from "src/components/Scenes/SceneSelect";
+import { StashIDPill } from "src/components/Shared/StashID";
 
 interface IStashIDsField {
   values: GQL.StashId[];
 }
 
 const StashIDsField: React.FC<IStashIDsField> = ({ values }) => {
-  return <StringListSelect value={values.map((v) => v.stash_id)} />;
+  if (!values.length) return null;
+
+  return (
+    <ul className="pl-0 mw-100">
+      {values.map((v) => (
+        <li key={v.stash_id} className="row no-gutters">
+          <StashIDPill linkType="scenes" stashID={v} />
+        </li>
+      ))}
+    </ul>
+  );
 };
 
 type MergeOptions = {
diff --git a/ui/v2.5/src/components/Shared/styles.scss b/ui/v2.5/src/components/Shared/styles.scss
index f2881fc55..61226df49 100644
--- a/ui/v2.5/src/components/Shared/styles.scss
+++ b/ui/v2.5/src/components/Shared/styles.scss
@@ -666,10 +666,11 @@ div.react-datepicker {
 }
 
 .stash-id-pill {
-  display: inline-block;
+  display: inline-flex;
   font-size: 90%;
   font-weight: 700;
   line-height: 1;
+  max-width: 100%;
   padding-bottom: 0.25em;
   padding-top: 0.25em;
   text-align: center;
@@ -685,12 +686,15 @@ div.react-datepicker {
   span {
     background-color: $primary;
     border-radius: 0.25rem 0 0 0.25rem;
+    flex-shrink: 0;
     min-width: 5em;
   }
 
   a {
     background-color: $secondary;
     border-radius: 0 0.25rem 0.25rem 0;
+    overflow: hidden;
+    text-overflow: ellipsis;
   }
 }
 

From 490fa3ea14fb168386f0c08c672a30908c149f0c Mon Sep 17 00:00:00 2001
From: smith113-p <205463041+smith113-p@users.noreply.github.com>
Date: Mon, 9 Mar 2026 23:53:20 -0400
Subject: [PATCH 347/405] Show scene resolution and duration in tagger (#6663)

* Show scene resolution and duration in tagger

A scene's duration and resolution is often useful to ensure you have
found the right scene. This PR adds the same resolution/duration
overlay from the grid view to the tagger view.
---
 ui/v2.5/src/components/Scenes/SceneCard.tsx   | 62 ++++++++++---------
 .../components/Tagger/scenes/TaggerScene.tsx  |  6 +-
 ui/v2.5/src/components/Tagger/styles.scss     |  5 ++
 3 files changed, 42 insertions(+), 31 deletions(-)

diff --git a/ui/v2.5/src/components/Scenes/SceneCard.tsx b/ui/v2.5/src/components/Scenes/SceneCard.tsx
index b7c263168..e840dcbac 100644
--- a/ui/v2.5/src/components/Scenes/SceneCard.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneCard.tsx
@@ -352,6 +352,37 @@ const SceneCardOverlays = PatchComponent(
   }
 );
 
+interface ISceneSpecsOverlay {
+  scene: GQL.SlimSceneDataFragment;
+}
+
+export const SceneSpecsOverlay: React.FC<ISceneSpecsOverlay> = ({ scene }) => {
+  if (!scene.files.length) return null;
+  let file = scene.files[0];
+  return (
+    <div className="scene-specs-overlay">
+      <span className="overlay-filesize extra-scene-info">
+        <FileSize size={file.size} />
+      </span>
+      {file.width && file.height ? (
+        <span className="overlay-resolution">
+          {" "}
+          {TextUtils.resolution(file.width, file.height)}
+        </span>
+      ) : (
+        ""
+      )}
+      {(file.duration ?? 0) >= 1 ? (
+        <span className="overlay-duration">
+          {TextUtils.secondsToTimestamp(file.duration)}
+        </span>
+      ) : (
+        ""
+      )}
+    </div>
+  );
+};
+
 const SceneCardImage = PatchComponent(
   "SceneCard.Image",
   (props: ISceneCardProps) => {
@@ -364,35 +395,6 @@ const SceneCardImage = PatchComponent(
       [props.scene]
     );
 
-    function maybeRenderSceneSpecsOverlay() {
-      return (
-        <div className="scene-specs-overlay">
-          {file?.size !== undefined ? (
-            <span className="overlay-filesize extra-scene-info">
-              <FileSize size={file.size} />
-            </span>
-          ) : (
-            ""
-          )}
-          {file?.width && file?.height ? (
-            <span className="overlay-resolution">
-              {" "}
-              {TextUtils.resolution(file?.width, file?.height)}
-            </span>
-          ) : (
-            ""
-          )}
-          {(file?.duration ?? 0) >= 1 ? (
-            <span className="overlay-duration">
-              {TextUtils.secondsToTimestamp(file?.duration ?? 0)}
-            </span>
-          ) : (
-            ""
-          )}
-        </div>
-      );
-    }
-
     function maybeRenderInteractiveSpeedOverlay() {
       return (
         <div className="scene-interactive-speed-overlay">
@@ -432,7 +434,7 @@ const SceneCardImage = PatchComponent(
           disabled={props.selecting}
         />
         <RatingBanner rating={props.scene.rating100} />
-        {maybeRenderSceneSpecsOverlay()}
+        <SceneSpecsOverlay scene={props.scene} />
         {maybeRenderInteractiveSpeedOverlay()}
       </>
     );
diff --git a/ui/v2.5/src/components/Tagger/scenes/TaggerScene.tsx b/ui/v2.5/src/components/Tagger/scenes/TaggerScene.tsx
index 5446257e5..5ad895fc2 100644
--- a/ui/v2.5/src/components/Tagger/scenes/TaggerScene.tsx
+++ b/ui/v2.5/src/components/Tagger/scenes/TaggerScene.tsx
@@ -11,7 +11,10 @@ import { StashIDPill } from "src/components/Shared/StashID";
 import { PerformerLink, TagLink } from "src/components/Shared/TagLink";
 import { TruncatedText } from "src/components/Shared/TruncatedText";
 import { parsePath, prepareQueryString } from "src/components/Tagger/utils";
-import { ScenePreview } from "src/components/Scenes/SceneCard";
+import {
+  ScenePreview,
+  SceneSpecsOverlay,
+} from "src/components/Scenes/SceneCard";
 import { TaggerStateContext } from "../context";
 import {
   faChevronDown,
@@ -271,6 +274,7 @@ export const TaggerScene: React.FC<PropsWithChildren<ITaggerScene>> = ({
                 vttPath={scene.paths.vtt ?? undefined}
                 onScrubberClick={onScrubberClick}
               />
+              <SceneSpecsOverlay scene={scene} />
               {maybeRenderSpriteIcon()}
             </Link>
           </div>
diff --git a/ui/v2.5/src/components/Tagger/styles.scss b/ui/v2.5/src/components/Tagger/styles.scss
index 8861d0043..5f6ece37d 100644
--- a/ui/v2.5/src/components/Tagger/styles.scss
+++ b/ui/v2.5/src/components/Tagger/styles.scss
@@ -8,6 +8,11 @@
 
   .scene-card {
     position: relative;
+
+    .scene-specs-overlay {
+      bottom: 5px;
+      right: 5px;
+    }
   }
 
   .scene-card-preview {

From 300e7edb755193bba61d38bac6547648bab4b749 Mon Sep 17 00:00:00 2001
From: hyper440 <111574945+hyper440@users.noreply.github.com>
Date: Tue, 10 Mar 2026 07:07:46 +0300
Subject: [PATCH 348/405] fix: support string-based fingerprints in hashes
 filter (#6654)

* fix: support string-based fingerprints in hashes filter
* Fix tests and add phash test

File fingerprints weren't using correct types. Filter test wasn't using correct types. Add phash to general files.
---------

Co-authored-by: hyper440 <hyper440@users.noreply.github.com>
Co-authored-by: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
---
 pkg/sqlite/file_filter.go      | 30 ++++++++++++++++---------
 pkg/sqlite/file_filter_test.go | 41 +++++++++++++++++++++++++++++++++-
 pkg/sqlite/file_test.go        |  6 ++---
 pkg/sqlite/setup_test.go       | 12 ++++++++--
 4 files changed, 73 insertions(+), 16 deletions(-)

diff --git a/pkg/sqlite/file_filter.go b/pkg/sqlite/file_filter.go
index 157efb1d8..29946a8ce 100644
--- a/pkg/sqlite/file_filter.go
+++ b/pkg/sqlite/file_filter.go
@@ -238,22 +238,32 @@ func (qb *fileFilterHandler) hashesCriterionHandler(hashes []*models.Fingerprint
 			t := fmt.Sprintf("file_fingerprints_%d", i)
 			f.addLeftJoin(fingerprintTable, t, fmt.Sprintf("files.id = %s.file_id AND %s.type = ?", t, t), hash.Type)
 
-			value, _ := utils.StringToPhash(hash.Value)
 			distance := 0
 			if hash.Distance != nil {
 				distance = *hash.Distance
 			}
 
-			if distance > 0 {
-				// needed to avoid a type mismatch
-				f.addWhere(fmt.Sprintf("typeof(%s.fingerprint) = 'integer'", t))
-				f.addWhere(fmt.Sprintf("phash_distance(%s.fingerprint, ?) < ?", t), value, distance)
+			// Only phash supports distance matching and is stored as integer
+			if hash.Type == models.FingerprintTypePhash {
+				value, err := utils.StringToPhash(hash.Value)
+				if err != nil {
+					f.setError(fmt.Errorf("invalid phash value: %w", err))
+					return
+				}
+				if distance > 0 {
+					// needed to avoid a type mismatch
+					f.addWhere(fmt.Sprintf("typeof(%s.fingerprint) = 'integer'", t))
+					f.addWhere(fmt.Sprintf("phash_distance(%s.fingerprint, ?) < ?", t), value, distance)
+				} else {
+					intCriterionHandler(&models.IntCriterionInput{
+						Value:    int(value),
+						Modifier: models.CriterionModifierEquals,
+					}, t+".fingerprint", nil)(ctx, f)
+				}
 			} else {
-				// use the default handler
-				intCriterionHandler(&models.IntCriterionInput{
-					Value:    int(value),
-					Modifier: models.CriterionModifierEquals,
-				}, t+".fingerprint", nil)(ctx, f)
+				// All other fingerprint types (md5, oshash, sha1, etc.) are stored as strings
+				// Use exact match for string-based fingerprints
+				f.addWhere(fmt.Sprintf("%s.fingerprint = ?", t), hash.Value)
 			}
 		}
 	}
diff --git a/pkg/sqlite/file_filter_test.go b/pkg/sqlite/file_filter_test.go
index 50eed0129..648e502f7 100644
--- a/pkg/sqlite/file_filter_test.go
+++ b/pkg/sqlite/file_filter_test.go
@@ -9,6 +9,7 @@ import (
 	"testing"
 
 	"github.com/stashapp/stash/pkg/models"
+	"github.com/stashapp/stash/pkg/utils"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -81,7 +82,45 @@ func TestFileQuery(t *testing.T) {
 			includeIDs:  []models.FileID{fileIDs[fileIdxInZip]},
 			excludeIdxs: []int{fileIdxStartImageFiles},
 		},
-		// TODO - add more tests for other file filters
+		{
+			name: "hashes md5",
+			filter: &models.FileFilterType{
+				Hashes: []*models.FingerprintFilterInput{
+					{
+						Type:  models.FingerprintTypeMD5,
+						Value: getPrefixedStringValue("file", fileIdxStartVideoFiles, "md5"),
+					},
+				},
+			},
+			includeIdxs: []int{fileIdxStartVideoFiles},
+			excludeIdxs: []int{fileIdxStartImageFiles},
+		},
+		{
+			name: "hashes oshash",
+			filter: &models.FileFilterType{
+				Hashes: []*models.FingerprintFilterInput{
+					{
+						Type:  models.FingerprintTypeOshash,
+						Value: getPrefixedStringValue("file", fileIdxStartVideoFiles, "oshash"),
+					},
+				},
+			},
+			includeIdxs: []int{fileIdxStartVideoFiles},
+			excludeIdxs: []int{fileIdxStartImageFiles},
+		},
+		{
+			name: "hashes phash",
+			filter: &models.FileFilterType{
+				Hashes: []*models.FingerprintFilterInput{
+					{
+						Type:  models.FingerprintTypePhash,
+						Value: utils.PhashToString(getFilePhash(fileIdxStartImageFiles)),
+					},
+				},
+			},
+			includeIdxs: []int{fileIdxStartImageFiles},
+			excludeIdxs: []int{fileIdxStartVideoFiles},
+		},
 	}
 
 	for _, tt := range tests {
diff --git a/pkg/sqlite/file_test.go b/pkg/sqlite/file_test.go
index 8422390c0..55c41f4f7 100644
--- a/pkg/sqlite/file_test.go
+++ b/pkg/sqlite/file_test.go
@@ -572,7 +572,7 @@ func TestFileStore_FindByFingerprint(t *testing.T) {
 		{
 			"by MD5",
 			models.Fingerprint{
-				Type:        "MD5",
+				Type:        models.FingerprintTypeMD5,
 				Fingerprint: getPrefixedStringValue("file", fileIdxZip, "md5"),
 			},
 			[]models.File{makeFileWithID(fileIdxZip)},
@@ -581,7 +581,7 @@ func TestFileStore_FindByFingerprint(t *testing.T) {
 		{
 			"by OSHASH",
 			models.Fingerprint{
-				Type:        "OSHASH",
+				Type:        models.FingerprintTypeOshash,
 				Fingerprint: getPrefixedStringValue("file", fileIdxZip, "oshash"),
 			},
 			[]models.File{makeFileWithID(fileIdxZip)},
@@ -590,7 +590,7 @@ func TestFileStore_FindByFingerprint(t *testing.T) {
 		{
 			"non-existing",
 			models.Fingerprint{
-				Type:        "OSHASH",
+				Type:        models.FingerprintTypeOshash,
 				Fingerprint: "foo",
 			},
 			nil,
diff --git a/pkg/sqlite/setup_test.go b/pkg/sqlite/setup_test.go
index d8baae3b8..db59ff570 100644
--- a/pkg/sqlite/setup_test.go
+++ b/pkg/sqlite/setup_test.go
@@ -865,16 +865,24 @@ func getFileModTime(index int) time.Time {
 	return getFolderModTime(index)
 }
 
+func getFilePhash(index int) int64 {
+	return int64(index * 567)
+}
+
 func getFileFingerprints(index int) []models.Fingerprint {
 	return []models.Fingerprint{
 		{
-			Type:        "MD5",
+			Type:        models.FingerprintTypeMD5,
 			Fingerprint: getPrefixedStringValue("file", index, "md5"),
 		},
 		{
-			Type:        "OSHASH",
+			Type:        models.FingerprintTypeOshash,
 			Fingerprint: getPrefixedStringValue("file", index, "oshash"),
 		},
+		{
+			Type:        models.FingerprintTypePhash,
+			Fingerprint: getFilePhash(index),
+		},
 	}
 }
 

From b8bd8953f7ac2f790785b6e794a9b357c6594d82 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Sat, 14 Mar 2026 17:56:31 +1100
Subject: [PATCH 349/405] Refactor bulk edit dialogs (#6647)

* Add BulkUpdateDateInput
* Refactor edit scenes dialog
* Improve bulk date input styling
* Make fields inline in edit performers dialog
* Refactor edit images dialog
* Refactor edit galleries dialog
* Add date and synopsis to bulk update group input
* Refactor edit groups dialog
* Change edit dialog titles to 'Edit x entities'
* Update styling of bulk fields to be consistent with other UI
* Rename BulkUpdateTextInput to generic BulkUpdate

We'll collect other bulk inputs here

* Add and use BulkUpdateFormGroup
* Handle null dates correctly
* Add date clear button and validation
---
 graphql/schema/types/group.graphql            |   2 +
 internal/api/resolver_mutation_group.go       |   6 +
 .../Galleries/EditGalleriesDialog.tsx         | 410 ++++++++---------
 .../components/Groups/EditGroupsDialog.tsx    | 293 ++++++------
 .../components/Images/EditImagesDialog.tsx    | 384 ++++++++--------
 .../Performers/EditPerformersDialog.tsx       | 290 +++++++-----
 .../Scenes/EditSceneMarkersDialog.tsx         |  73 ++-
 .../components/Scenes/EditScenesDialog.tsx    | 432 ++++++++----------
 ui/v2.5/src/components/Shared/BulkUpdate.tsx  |  89 ++++
 .../components/Shared/BulkUpdateTextInput.tsx |  48 --
 ui/v2.5/src/components/Shared/DateInput.tsx   | 131 +++++-
 ui/v2.5/src/components/Shared/MultiSet.tsx    |  14 +-
 ui/v2.5/src/components/Shared/styles.scss     |  33 +-
 .../components/Studios/EditStudiosDialog.tsx  |  94 ++--
 .../src/components/Tags/EditTagsDialog.tsx    |  44 +-
 ui/v2.5/src/core/StashService.ts              |   6 +-
 ui/v2.5/src/locales/en-GB.json                |   2 +
 ui/v2.5/src/utils/bulkUpdate.ts               |   5 +
 ui/v2.5/src/utils/form.tsx                    |   2 +-
 ui/v2.5/src/utils/yup.ts                      |  50 +-
 20 files changed, 1253 insertions(+), 1155 deletions(-)
 create mode 100644 ui/v2.5/src/components/Shared/BulkUpdate.tsx
 delete mode 100644 ui/v2.5/src/components/Shared/BulkUpdateTextInput.tsx

diff --git a/graphql/schema/types/group.graphql b/graphql/schema/types/group.graphql
index a1c878923..8610f39dc 100644
--- a/graphql/schema/types/group.graphql
+++ b/graphql/schema/types/group.graphql
@@ -99,6 +99,8 @@ input BulkGroupUpdateInput {
   ids: [ID!]
   # rating expressed as 1-100
   rating100: Int
+  date: String
+  synopsis: String
   studio_id: ID
   director: String
   urls: BulkUpdateStrings
diff --git a/internal/api/resolver_mutation_group.go b/internal/api/resolver_mutation_group.go
index dff5a6c1e..6c986c4da 100644
--- a/internal/api/resolver_mutation_group.go
+++ b/internal/api/resolver_mutation_group.go
@@ -227,6 +227,12 @@ func (r *mutationResolver) GroupUpdate(ctx context.Context, input GroupUpdateInp
 func groupPartialFromBulkGroupUpdateInput(translator changesetTranslator, input BulkGroupUpdateInput) (ret models.GroupPartial, err error) {
 	updatedGroup := models.NewGroupPartial()
 
+	updatedGroup.Date, err = translator.optionalDate(input.Date, "date")
+	if err != nil {
+		err = fmt.Errorf("converting date: %w", err)
+		return
+	}
+	updatedGroup.Synopsis = translator.optionalString(input.Synopsis, "synopsis")
 	updatedGroup.Rating = translator.optionalInt(input.Rating100, "rating100")
 	updatedGroup.Director = translator.optionalString(input.Director, "director")
 
diff --git a/ui/v2.5/src/components/Galleries/EditGalleriesDialog.tsx b/ui/v2.5/src/components/Galleries/EditGalleriesDialog.tsx
index 9ff7e00f2..cec44abf1 100644
--- a/ui/v2.5/src/components/Galleries/EditGalleriesDialog.tsx
+++ b/ui/v2.5/src/components/Galleries/EditGalleriesDialog.tsx
@@ -1,100 +1,129 @@
-import React, { useEffect, useState } from "react";
-import { Form, Col, Row } from "react-bootstrap";
-import { FormattedMessage, useIntl } from "react-intl";
-import isEqual from "lodash-es/isEqual";
+import React, { useEffect, useMemo, useState } from "react";
+import { Form } from "react-bootstrap";
+import { useIntl } from "react-intl";
 import { useBulkGalleryUpdate } from "src/core/StashService";
 import * as GQL from "src/core/generated-graphql";
 import { StudioSelect } from "../Shared/Select";
 import { ModalComponent } from "../Shared/Modal";
-import { useToast } from "src/hooks/Toast";
-import * as FormUtils from "src/utils/form";
 import { MultiSet } from "../Shared/MultiSet";
+import { useToast } from "src/hooks/Toast";
 import { RatingSystem } from "../Shared/Rating/RatingSystem";
 import {
-  getAggregateInputIDs,
   getAggregateInputValue,
   getAggregatePerformerIds,
-  getAggregateRating,
-  getAggregateStudioId,
+  getAggregateStateObject,
   getAggregateTagIds,
+  getAggregateStudioId,
+  getAggregateSceneIds,
 } from "src/utils/bulkUpdate";
 import { faPencilAlt } from "@fortawesome/free-solid-svg-icons";
+import { IndeterminateCheckbox } from "../Shared/IndeterminateCheckbox";
+import { BulkUpdateFormGroup, BulkUpdateTextInput } from "../Shared/BulkUpdate";
+import { BulkUpdateDateInput } from "../Shared/DateInput";
+import { getDateError } from "src/utils/yup";
 
 interface IListOperationProps {
   selected: GQL.SlimGalleryDataFragment[];
   onClose: (applied: boolean) => void;
 }
 
+const galleryFields = [
+  "code",
+  "rating100",
+  "details",
+  "organized",
+  "photographer",
+  "date",
+];
+
 export const EditGalleriesDialog: React.FC<IListOperationProps> = (
   props: IListOperationProps
 ) => {
   const intl = useIntl();
   const Toast = useToast();
-  const [rating100, setRating] = useState<number>();
-  const [studioId, setStudioId] = useState<string>();
-  const [performerMode, setPerformerMode] =
-    React.useState<GQL.BulkUpdateIdMode>(GQL.BulkUpdateIdMode.Add);
-  const [performerIds, setPerformerIds] = useState<string[]>();
-  const [existingPerformerIds, setExistingPerformerIds] = useState<string[]>();
-  const [tagMode, setTagMode] = React.useState<GQL.BulkUpdateIdMode>(
-    GQL.BulkUpdateIdMode.Add
-  );
-  const [tagIds, setTagIds] = useState<string[]>();
-  const [existingTagIds, setExistingTagIds] = useState<string[]>();
-  const [organized, setOrganized] = useState<boolean | undefined>();
+
+  const [updateInput, setUpdateInput] = useState<GQL.BulkGalleryUpdateInput>({
+    ids: props.selected.map((gallery) => {
+      return gallery.id;
+    }),
+  });
+
+  const [performerIds, setPerformerIds] = useState<GQL.BulkUpdateIds>({
+    mode: GQL.BulkUpdateIdMode.Add,
+  });
+  const [tagIds, setTagIds] = useState<GQL.BulkUpdateIds>({
+    mode: GQL.BulkUpdateIdMode.Add,
+  });
+  const [sceneIds, setSceneIds] = useState<GQL.BulkUpdateIds>({
+    mode: GQL.BulkUpdateIdMode.Add,
+  });
+
+  const unsetDisabled = props.selected.length < 2;
+
+  const [dateError, setDateError] = useState<string | undefined>();
 
   const [updateGalleries] = useBulkGalleryUpdate();
 
   // Network state
   const [isUpdating, setIsUpdating] = useState(false);
 
-  const checkboxRef = React.createRef<HTMLInputElement>();
+  const aggregateState = useMemo(() => {
+    const updateState: Partial<GQL.BulkGalleryUpdateInput> = {};
+    const state = props.selected;
+    updateState.studio_id = getAggregateStudioId(props.selected);
+    const updateTagIds = getAggregateTagIds(props.selected);
+    const updatePerformerIds = getAggregatePerformerIds(props.selected);
+    const updateSceneIds = getAggregateSceneIds(props.selected);
+    let first = true;
+
+    state.forEach((gallery: GQL.SlimGalleryDataFragment) => {
+      getAggregateStateObject(updateState, gallery, galleryFields, first);
+      first = false;
+    });
+
+    return {
+      state: updateState,
+      tagIds: updateTagIds,
+      performerIds: updatePerformerIds,
+      sceneIds: updateSceneIds,
+    };
+  }, [props.selected]);
+
+  // update initial state from aggregate
+  useEffect(() => {
+    setUpdateInput((current) => ({ ...current, ...aggregateState.state }));
+  }, [aggregateState]);
+
+  useEffect(() => {
+    setDateError(getDateError(updateInput.date ?? "", intl));
+  }, [updateInput.date, intl]);
+
+  function setUpdateField(input: Partial<GQL.BulkGalleryUpdateInput>) {
+    setUpdateInput((current) => ({ ...current, ...input }));
+  }
 
   function getGalleryInput(): GQL.BulkGalleryUpdateInput {
-    // need to determine what we are actually setting on each gallery
-    const aggregateRating = getAggregateRating(props.selected);
-    const aggregateStudioId = getAggregateStudioId(props.selected);
-    const aggregatePerformerIds = getAggregatePerformerIds(props.selected);
-    const aggregateTagIds = getAggregateTagIds(props.selected);
-
     const galleryInput: GQL.BulkGalleryUpdateInput = {
-      ids: props.selected.map((gallery) => {
-        return gallery.id;
-      }),
+      ...updateInput,
+      tag_ids: tagIds,
+      performer_ids: performerIds,
+      scene_ids: sceneIds,
     };
 
-    galleryInput.rating100 = getAggregateInputValue(rating100, aggregateRating);
-    galleryInput.studio_id = getAggregateInputValue(
-      studioId,
-      aggregateStudioId
+    // we don't have unset functionality for the rating star control
+    // so need to determine if we are setting a rating or not
+    galleryInput.rating100 = getAggregateInputValue(
+      updateInput.rating100,
+      aggregateState.state.rating100
     );
 
-    galleryInput.performer_ids = getAggregateInputIDs(
-      performerMode,
-      performerIds,
-      aggregatePerformerIds
-    );
-    galleryInput.tag_ids = getAggregateInputIDs(
-      tagMode,
-      tagIds,
-      aggregateTagIds
-    );
-
-    if (organized !== undefined) {
-      galleryInput.organized = organized;
-    }
-
     return galleryInput;
   }
 
   async function onSave() {
     setIsUpdating(true);
     try {
-      await updateGalleries({
-        variables: {
-          input: getGalleryInput(),
-        },
-      });
+      await updateGalleries({ variables: { input: getGalleryInput() } });
       Toast.success(
         intl.formatMessage(
           { id: "toast.updated_entity" },
@@ -110,129 +139,13 @@ export const EditGalleriesDialog: React.FC<IListOperationProps> = (
     setIsUpdating(false);
   }
 
-  useEffect(() => {
-    const state = props.selected;
-    let updateRating: number | undefined;
-    let updateStudioID: string | undefined;
-    let updatePerformerIds: string[] = [];
-    let updateTagIds: string[] = [];
-    let updateOrganized: boolean | undefined;
-    let first = true;
-
-    state.forEach((gallery: GQL.SlimGalleryDataFragment) => {
-      const galleryRating = gallery.rating100;
-      const GalleriestudioID = gallery?.studio?.id;
-      const galleryPerformerIDs = (gallery.performers ?? [])
-        .map((p) => p.id)
-        .sort();
-      const galleryTagIDs = (gallery.tags ?? []).map((p) => p.id).sort();
-
-      if (first) {
-        updateRating = galleryRating ?? undefined;
-        updateStudioID = GalleriestudioID;
-        updatePerformerIds = galleryPerformerIDs;
-        updateTagIds = galleryTagIDs;
-        updateOrganized = gallery.organized;
-        first = false;
-      } else {
-        if (galleryRating !== updateRating) {
-          updateRating = undefined;
-        }
-        if (GalleriestudioID !== updateStudioID) {
-          updateStudioID = undefined;
-        }
-        if (!isEqual(galleryPerformerIDs, updatePerformerIds)) {
-          updatePerformerIds = [];
-        }
-        if (!isEqual(galleryTagIDs, updateTagIds)) {
-          updateTagIds = [];
-        }
-        if (gallery.organized !== updateOrganized) {
-          updateOrganized = undefined;
-        }
-      }
-    });
-
-    setRating(updateRating);
-    setStudioId(updateStudioID);
-    setExistingPerformerIds(updatePerformerIds);
-    setExistingTagIds(updateTagIds);
-
-    setOrganized(updateOrganized);
-  }, [props.selected]);
-
-  useEffect(() => {
-    if (checkboxRef.current) {
-      checkboxRef.current.indeterminate = organized === undefined;
-    }
-  }, [organized, checkboxRef]);
-
-  function renderMultiSelect(
-    type: "performers" | "tags",
-    ids: string[] | undefined
-  ) {
-    let mode = GQL.BulkUpdateIdMode.Add;
-    let existingIds: string[] | undefined = [];
-    switch (type) {
-      case "performers":
-        mode = performerMode;
-        existingIds = existingPerformerIds;
-        break;
-      case "tags":
-        mode = tagMode;
-        existingIds = existingTagIds;
-        break;
-    }
-
-    return (
-      <MultiSet
-        type={type}
-        disabled={isUpdating}
-        onUpdate={(itemIDs) => {
-          switch (type) {
-            case "performers":
-              setPerformerIds(itemIDs);
-              break;
-            case "tags":
-              setTagIds(itemIDs);
-              break;
-          }
-        }}
-        onSetMode={(newMode) => {
-          switch (type) {
-            case "performers":
-              setPerformerMode(newMode);
-              break;
-            case "tags":
-              setTagMode(newMode);
-              break;
-          }
-        }}
-        existingIds={existingIds ?? []}
-        ids={ids ?? []}
-        mode={mode}
-        menuPortalTarget={document.body}
-      />
-    );
-  }
-
-  function cycleOrganized() {
-    if (organized) {
-      setOrganized(undefined);
-    } else if (organized === undefined) {
-      setOrganized(false);
-    } else {
-      setOrganized(true);
-    }
-  }
-
   function render() {
     return (
       <ModalComponent
         show
         icon={faPencilAlt}
         header={intl.formatMessage(
-          { id: "dialogs.edit_entity_title" },
+          { id: "dialogs.edit_entity_count_title" },
           {
             count: props?.selected?.length ?? 1,
             singularEntity: intl.formatMessage({ id: "gallery" }),
@@ -243,6 +156,7 @@ export const EditGalleriesDialog: React.FC<IListOperationProps> = (
           onClick: onSave,
           text: intl.formatMessage({ id: "actions.apply" }),
         }}
+        disabled={isUpdating || !!dateError}
         cancel={{
           onClick: () => props.onClose(false),
           text: intl.formatMessage({ id: "actions.cancel" }),
@@ -251,55 +165,119 @@ export const EditGalleriesDialog: React.FC<IListOperationProps> = (
         isRunning={isUpdating}
       >
         <Form>
-          <Form.Group controlId="rating" as={Row}>
-            {FormUtils.renderLabel({
-              title: intl.formatMessage({ id: "rating" }),
-            })}
-            <Col xs={9}>
-              <RatingSystem
-                value={rating100}
-                onSetRating={(value) => setRating(value ?? undefined)}
-                disabled={isUpdating}
-              />
-            </Col>
-          </Form.Group>
-          <Form.Group controlId="studio" as={Row}>
-            {FormUtils.renderLabel({
-              title: intl.formatMessage({ id: "studio" }),
-            })}
-            <Col xs={9}>
-              <StudioSelect
-                onSelect={(items) =>
-                  setStudioId(items.length > 0 ? items[0]?.id : undefined)
-                }
-                ids={studioId ? [studioId] : []}
-                isDisabled={isUpdating}
-                menuPortalTarget={document.body}
-              />
-            </Col>
-          </Form.Group>
+          <BulkUpdateFormGroup name="rating">
+            <RatingSystem
+              value={updateInput.rating100}
+              onSetRating={(value) =>
+                setUpdateField({ rating100: value ?? undefined })
+              }
+              disabled={isUpdating}
+            />
+          </BulkUpdateFormGroup>
 
-          <Form.Group controlId="performers">
-            <Form.Label>
-              <FormattedMessage id="performers" />
-            </Form.Label>
-            {renderMultiSelect("performers", performerIds)}
-          </Form.Group>
+          <BulkUpdateFormGroup name="scene_code">
+            <BulkUpdateTextInput
+              value={updateInput.code}
+              valueChanged={(newValue) => setUpdateField({ code: newValue })}
+              unsetDisabled={unsetDisabled}
+            />
+          </BulkUpdateFormGroup>
+          <BulkUpdateFormGroup name="date">
+            <BulkUpdateDateInput
+              value={updateInput.date}
+              valueChanged={(newValue) => setUpdateField({ date: newValue })}
+              unsetDisabled={unsetDisabled}
+              error={dateError}
+            />
+          </BulkUpdateFormGroup>
 
-          <Form.Group controlId="tags">
-            <Form.Label>
-              <FormattedMessage id="tags" />
-            </Form.Label>
-            {renderMultiSelect("tags", tagIds)}
-          </Form.Group>
+          <BulkUpdateFormGroup name="photographer">
+            <BulkUpdateTextInput
+              value={updateInput.photographer}
+              valueChanged={(newValue) =>
+                setUpdateField({ photographer: newValue })
+              }
+              unsetDisabled={unsetDisabled}
+            />
+          </BulkUpdateFormGroup>
+          <BulkUpdateFormGroup name="studio">
+            <StudioSelect
+              onSelect={(items) =>
+                setUpdateField({
+                  studio_id: items.length > 0 ? items[0]?.id : undefined,
+                })
+              }
+              ids={updateInput.studio_id ? [updateInput.studio_id] : []}
+              isDisabled={isUpdating}
+              menuPortalTarget={document.body}
+            />
+          </BulkUpdateFormGroup>
+
+          <BulkUpdateFormGroup name="performers" inline={false}>
+            <MultiSet
+              type={"performers"}
+              disabled={isUpdating}
+              onUpdate={(itemIDs) => {
+                setPerformerIds((c) => ({ ...c, ids: itemIDs }));
+              }}
+              onSetMode={(newMode) => {
+                setPerformerIds((c) => ({ ...c, mode: newMode }));
+              }}
+              ids={performerIds.ids ?? []}
+              existingIds={aggregateState.performerIds}
+              mode={performerIds.mode}
+              menuPortalTarget={document.body}
+            />
+          </BulkUpdateFormGroup>
+
+          <BulkUpdateFormGroup name="scenes" inline={false}>
+            <MultiSet
+              type={"scenes"}
+              disabled={isUpdating}
+              onUpdate={(itemIDs) => {
+                setSceneIds((c) => ({ ...c, ids: itemIDs }));
+              }}
+              onSetMode={(newMode) => {
+                setSceneIds((c) => ({ ...c, mode: newMode }));
+              }}
+              ids={sceneIds.ids ?? []}
+              existingIds={aggregateState.sceneIds}
+              mode={sceneIds.mode}
+              menuPortalTarget={document.body}
+            />
+          </BulkUpdateFormGroup>
+
+          <BulkUpdateFormGroup name="tags" inline={false}>
+            <MultiSet
+              type={"tags"}
+              disabled={isUpdating}
+              onUpdate={(itemIDs) => {
+                setTagIds((c) => ({ ...c, ids: itemIDs }));
+              }}
+              onSetMode={(newMode) => {
+                setTagIds((c) => ({ ...c, mode: newMode }));
+              }}
+              ids={tagIds.ids ?? []}
+              existingIds={aggregateState.tagIds}
+              mode={tagIds.mode}
+              menuPortalTarget={document.body}
+            />
+          </BulkUpdateFormGroup>
+
+          <BulkUpdateFormGroup name="details" inline={false}>
+            <BulkUpdateTextInput
+              value={updateInput.details}
+              valueChanged={(newValue) => setUpdateField({ details: newValue })}
+              unsetDisabled={unsetDisabled}
+              as="textarea"
+            />
+          </BulkUpdateFormGroup>
 
           <Form.Group controlId="organized">
-            <Form.Check
-              type="checkbox"
+            <IndeterminateCheckbox
               label={intl.formatMessage({ id: "organized" })}
-              checked={organized}
-              ref={checkboxRef}
-              onChange={() => cycleOrganized()}
+              setChecked={(checked) => setUpdateField({ organized: checked })}
+              checked={updateInput.organized ?? undefined}
             />
           </Form.Group>
         </Form>
diff --git a/ui/v2.5/src/components/Groups/EditGroupsDialog.tsx b/ui/v2.5/src/components/Groups/EditGroupsDialog.tsx
index ef3171de2..99c482aba 100644
--- a/ui/v2.5/src/components/Groups/EditGroupsDialog.tsx
+++ b/ui/v2.5/src/components/Groups/EditGroupsDialog.tsx
@@ -1,26 +1,26 @@
-import React, { useEffect, useState } from "react";
-import { Form, Col, Row } from "react-bootstrap";
-import { FormattedMessage, useIntl } from "react-intl";
+import React, { useEffect, useMemo, useState } from "react";
+import { Form } from "react-bootstrap";
+import { useIntl } from "react-intl";
 import { useBulkGroupUpdate } from "src/core/StashService";
 import * as GQL from "src/core/generated-graphql";
-import { ModalComponent } from "../Shared/Modal";
 import { StudioSelect } from "../Shared/Select";
+import { ModalComponent } from "../Shared/Modal";
+import { MultiSet } from "../Shared/MultiSet";
 import { useToast } from "src/hooks/Toast";
-import * as FormUtils from "src/utils/form";
 import { RatingSystem } from "../Shared/Rating/RatingSystem";
 import {
-  getAggregateIds,
-  getAggregateInputIDs,
   getAggregateInputValue,
-  getAggregateRating,
-  getAggregateStudioId,
+  getAggregateStateObject,
   getAggregateTagIds,
+  getAggregateStudioId,
+  getAggregateIds,
 } from "src/utils/bulkUpdate";
 import { faPencilAlt } from "@fortawesome/free-solid-svg-icons";
-import { isEqual } from "lodash-es";
-import { MultiSet } from "../Shared/MultiSet";
-import { ContainingGroupsMultiSet } from "./ContainingGroupsMultiSet";
+import { BulkUpdateFormGroup, BulkUpdateTextInput } from "../Shared/BulkUpdate";
+import { BulkUpdateDateInput } from "../Shared/DateInput";
 import { IRelatedGroupEntry } from "./GroupDetails/RelatedGroupTable";
+import { ContainingGroupsMultiSet } from "./ContainingGroupsMultiSet";
+import { getDateError } from "src/utils/yup";
 
 interface IListOperationProps {
   selected: GQL.ListGroupDataFragment[];
@@ -67,50 +67,86 @@ function getAggregateContainingGroupInput(
   return undefined;
 }
 
+const groupFields = ["rating100", "synopsis", "director", "date"];
+
 export const EditGroupsDialog: React.FC<IListOperationProps> = (
   props: IListOperationProps
 ) => {
   const intl = useIntl();
   const Toast = useToast();
-  const [rating100, setRating] = useState<number | undefined>();
-  const [studioId, setStudioId] = useState<string | undefined>();
-  const [director, setDirector] = useState<string | undefined>();
 
-  const [tagMode, setTagMode] = React.useState<GQL.BulkUpdateIdMode>(
-    GQL.BulkUpdateIdMode.Add
-  );
-  const [tagIds, setTagIds] = useState<string[]>();
-  const [existingTagIds, setExistingTagIds] = useState<string[]>();
+  const [updateInput, setUpdateInput] = useState<GQL.BulkGroupUpdateInput>({
+    ids: props.selected.map((group) => {
+      return group.id;
+    }),
+  });
 
+  const [tagIds, setTagIds] = useState<GQL.BulkUpdateIds>({
+    mode: GQL.BulkUpdateIdMode.Add,
+  });
   const [containingGroupsMode, setGroupMode] =
     React.useState<GQL.BulkUpdateIdMode>(GQL.BulkUpdateIdMode.Add);
   const [containingGroups, setGroups] = useState<IRelatedGroupEntry[]>();
-  const [existingContainingGroups, setExistingContainingGroups] =
-    useState<IRelatedGroupEntry[]>();
 
-  const [updateGroups] = useBulkGroupUpdate(getGroupInput());
+  const unsetDisabled = props.selected.length < 2;
 
+  const [updateGroups] = useBulkGroupUpdate();
+
+  const [dateError, setDateError] = useState<string | undefined>();
+
+  // Network state
   const [isUpdating, setIsUpdating] = useState(false);
 
-  function getGroupInput(): GQL.BulkGroupUpdateInput {
-    const aggregateRating = getAggregateRating(props.selected);
-    const aggregateStudioId = getAggregateStudioId(props.selected);
-    const aggregateTagIds = getAggregateTagIds(props.selected);
+  const aggregateState = useMemo(() => {
+    const updateState: Partial<GQL.BulkGroupUpdateInput> = {};
+    const state = props.selected;
+    updateState.studio_id = getAggregateStudioId(props.selected);
+    const updateTagIds = getAggregateTagIds(props.selected);
     const aggregateGroups = getAggregateContainingGroups(props.selected);
+    let first = true;
 
+    state.forEach((group: GQL.ListGroupDataFragment) => {
+      getAggregateStateObject(updateState, group, groupFields, first);
+      first = false;
+    });
+
+    return {
+      state: updateState,
+      tagIds: updateTagIds,
+      containingGroups: aggregateGroups,
+    };
+  }, [props.selected]);
+
+  // update initial state from aggregate
+  useEffect(() => {
+    setUpdateInput((current) => ({ ...current, ...aggregateState.state }));
+  }, [aggregateState]);
+
+  useEffect(() => {
+    setDateError(getDateError(updateInput.date ?? "", intl));
+  }, [updateInput.date, intl]);
+
+  function setUpdateField(input: Partial<GQL.BulkGroupUpdateInput>) {
+    setUpdateInput((current) => ({ ...current, ...input }));
+  }
+
+  function getGroupInput(): GQL.BulkGroupUpdateInput {
     const groupInput: GQL.BulkGroupUpdateInput = {
-      ids: props.selected.map((group) => group.id),
-      director,
+      ...updateInput,
+      tag_ids: tagIds,
     };
 
-    groupInput.rating100 = getAggregateInputValue(rating100, aggregateRating);
-    groupInput.studio_id = getAggregateInputValue(studioId, aggregateStudioId);
-    groupInput.tag_ids = getAggregateInputIDs(tagMode, tagIds, aggregateTagIds);
+    // we don't have unset functionality for the rating star control
+    // so need to determine if we are setting a rating or not
+    groupInput.rating100 = getAggregateInputValue(
+      updateInput.rating100,
+      aggregateState.state.rating100
+    );
 
     groupInput.containing_groups = getAggregateContainingGroupInput(
       containingGroupsMode,
       containingGroups,
-      aggregateGroups
+      aggregateState.containingGroups
     );
 
     return groupInput;
@@ -119,13 +155,11 @@ export const EditGroupsDialog: React.FC<IListOperationProps> = (
   async function onSave() {
     setIsUpdating(true);
     try {
-      await updateGroups();
+      await updateGroups({ variables: { input: getGroupInput() } });
       Toast.success(
         intl.formatMessage(
           { id: "toast.updated_entity" },
-          {
-            entity: intl.formatMessage({ id: "groups" }).toLocaleLowerCase(),
-          }
+          { entity: intl.formatMessage({ id: "groups" }).toLocaleLowerCase() }
         )
       );
       props.onClose(true);
@@ -135,67 +169,24 @@ export const EditGroupsDialog: React.FC<IListOperationProps> = (
     setIsUpdating(false);
   }
 
-  useEffect(() => {
-    const state = props.selected;
-    let updateRating: number | undefined;
-    let updateStudioId: string | undefined;
-    let updateTagIds: string[] = [];
-    let updateContainingGroupIds: IRelatedGroupEntry[] = [];
-    let updateDirector: string | undefined;
-    let first = true;
-
-    state.forEach((group: GQL.ListGroupDataFragment) => {
-      const groupTagIDs = (group.tags ?? []).map((p) => p.id).sort();
-      const groupContainingGroupIDs = (group.containing_groups ?? []).sort(
-        (a, b) => a.group.id.localeCompare(b.group.id)
-      );
-
-      if (first) {
-        first = false;
-        updateRating = group.rating100 ?? undefined;
-        updateStudioId = group.studio?.id ?? undefined;
-        updateTagIds = groupTagIDs;
-        updateContainingGroupIds = groupContainingGroupIDs;
-        updateDirector = group.director ?? undefined;
-      } else {
-        if (group.rating100 !== updateRating) {
-          updateRating = undefined;
-        }
-        if (group.studio?.id !== updateStudioId) {
-          updateStudioId = undefined;
-        }
-        if (group.director !== updateDirector) {
-          updateDirector = undefined;
-        }
-        if (!isEqual(groupTagIDs, updateTagIds)) {
-          updateTagIds = [];
-        }
-        if (!isEqual(groupContainingGroupIDs, updateContainingGroupIds)) {
-          updateTagIds = [];
-        }
-      }
-    });
-
-    setRating(updateRating);
-    setStudioId(updateStudioId);
-    setExistingTagIds(updateTagIds);
-    setExistingContainingGroups(updateContainingGroupIds);
-    setDirector(updateDirector);
-  }, [props.selected]);
-
   function render() {
     return (
       <ModalComponent
         show
         icon={faPencilAlt}
         header={intl.formatMessage(
-          { id: "actions.edit_entity" },
-          { entityType: intl.formatMessage({ id: "groups" }) }
+          { id: "dialogs.edit_entity_count_title" },
+          {
+            count: props?.selected?.length ?? 1,
+            singularEntity: intl.formatMessage({ id: "group" }),
+            pluralEntity: intl.formatMessage({ id: "groups" }),
+          }
         )}
         accept={{
           onClick: onSave,
           text: intl.formatMessage({ id: "actions.apply" }),
         }}
+        disabled={isUpdating || !!dateError}
         cancel={{
           onClick: () => props.onClose(false),
           text: intl.formatMessage({ id: "actions.cancel" }),
@@ -204,74 +195,90 @@ export const EditGroupsDialog: React.FC<IListOperationProps> = (
         isRunning={isUpdating}
       >
         <Form>
-          <Form.Group controlId="rating" as={Row}>
-            {FormUtils.renderLabel({
-              title: intl.formatMessage({ id: "rating" }),
-            })}
-            <Col xs={9}>
-              <RatingSystem
-                value={rating100}
-                onSetRating={(value) => setRating(value ?? undefined)}
-                disabled={isUpdating}
-              />
-            </Col>
-          </Form.Group>
-          <Form.Group controlId="studio" as={Row}>
-            {FormUtils.renderLabel({
-              title: intl.formatMessage({ id: "studio" }),
-            })}
-            <Col xs={9}>
-              <StudioSelect
-                onSelect={(items) =>
-                  setStudioId(items.length > 0 ? items[0]?.id : undefined)
-                }
-                ids={studioId ? [studioId] : []}
-                isDisabled={isUpdating}
-                menuPortalTarget={document.body}
-              />
-            </Col>
-          </Form.Group>
-          <Form.Group controlId="containing-groups">
-            <Form.Label>
-              <FormattedMessage id="containing_groups" />
-            </Form.Label>
+          <BulkUpdateFormGroup name="rating">
+            <RatingSystem
+              value={updateInput.rating100}
+              onSetRating={(value) =>
+                setUpdateField({ rating100: value ?? undefined })
+              }
+              disabled={isUpdating}
+            />
+          </BulkUpdateFormGroup>
+
+          <BulkUpdateFormGroup name="date">
+            <BulkUpdateDateInput
+              value={updateInput.date}
+              valueChanged={(newValue) => setUpdateField({ date: newValue })}
+              unsetDisabled={unsetDisabled}
+              error={dateError}
+            />
+          </BulkUpdateFormGroup>
+
+          <BulkUpdateFormGroup name="director">
+            <BulkUpdateTextInput
+              value={updateInput.director}
+              valueChanged={(newValue) =>
+                setUpdateField({ director: newValue })
+              }
+              unsetDisabled={unsetDisabled}
+            />
+          </BulkUpdateFormGroup>
+          <BulkUpdateFormGroup name="studio">
+            <StudioSelect
+              onSelect={(items) =>
+                setUpdateField({
+                  studio_id: items.length > 0 ? items[0]?.id : undefined,
+                })
+              }
+              ids={updateInput.studio_id ? [updateInput.studio_id] : []}
+              isDisabled={isUpdating}
+              menuPortalTarget={document.body}
+            />
+          </BulkUpdateFormGroup>
+
+          <BulkUpdateFormGroup
+            name="containing-groups"
+            messageId="containing_groups"
+            inline={false}
+          >
             <ContainingGroupsMultiSet
               disabled={isUpdating}
               onUpdate={(v) => setGroups(v)}
               onSetMode={(newMode) => setGroupMode(newMode)}
-              existingValue={existingContainingGroups ?? []}
+              existingValue={aggregateState.containingGroups ?? []}
               value={containingGroups ?? []}
               mode={containingGroupsMode}
               menuPortalTarget={document.body}
             />
-          </Form.Group>
-          <Form.Group controlId="director">
-            <Form.Label>
-              <FormattedMessage id="director" />
-            </Form.Label>
-            <Form.Control
-              className="input-control"
-              type="text"
-              value={director}
-              onChange={(event) => setDirector(event.currentTarget.value)}
-              placeholder={intl.formatMessage({ id: "director" })}
-            />
-          </Form.Group>
-          <Form.Group controlId="tags">
-            <Form.Label>
-              <FormattedMessage id="tags" />
-            </Form.Label>
+          </BulkUpdateFormGroup>
+
+          <BulkUpdateFormGroup name="tags" inline={false}>
             <MultiSet
-              type="tags"
+              type={"tags"}
               disabled={isUpdating}
-              onUpdate={(itemIDs) => setTagIds(itemIDs)}
-              onSetMode={(newMode) => setTagMode(newMode)}
-              existingIds={existingTagIds ?? []}
-              ids={tagIds ?? []}
-              mode={tagMode}
+              onUpdate={(itemIDs) => {
+                setTagIds((c) => ({ ...c, ids: itemIDs }));
+              }}
+              onSetMode={(newMode) => {
+                setTagIds((c) => ({ ...c, mode: newMode }));
+              }}
+              ids={tagIds.ids ?? []}
+              existingIds={aggregateState.tagIds}
+              mode={tagIds.mode}
               menuPortalTarget={document.body}
             />
-          </Form.Group>
+          </BulkUpdateFormGroup>
+
+          <BulkUpdateFormGroup name="synopsis" inline={false}>
+            <BulkUpdateTextInput
+              value={updateInput.synopsis}
+              valueChanged={(newValue) =>
+                setUpdateField({ synopsis: newValue })
+              }
+              unsetDisabled={unsetDisabled}
+              as="textarea"
+            />
+          </BulkUpdateFormGroup>
         </Form>
       </ModalComponent>
     );
diff --git a/ui/v2.5/src/components/Images/EditImagesDialog.tsx b/ui/v2.5/src/components/Images/EditImagesDialog.tsx
index 275ff1556..a90ef922e 100644
--- a/ui/v2.5/src/components/Images/EditImagesDialog.tsx
+++ b/ui/v2.5/src/components/Images/EditImagesDialog.tsx
@@ -1,96 +1,121 @@
-import React, { useEffect, useState } from "react";
-import { Form, Col, Row } from "react-bootstrap";
-import { FormattedMessage, useIntl } from "react-intl";
-import isEqual from "lodash-es/isEqual";
+import React, { useEffect, useMemo, useState } from "react";
+import { Form } from "react-bootstrap";
+import { useIntl } from "react-intl";
 import { useBulkImageUpdate } from "src/core/StashService";
 import * as GQL from "src/core/generated-graphql";
-import { StudioSelect } from "src/components/Shared/Select";
-import { ModalComponent } from "src/components/Shared/Modal";
-import { useToast } from "src/hooks/Toast";
-import * as FormUtils from "src/utils/form";
+import { StudioSelect } from "../Shared/Select";
+import { ModalComponent } from "../Shared/Modal";
 import { MultiSet } from "../Shared/MultiSet";
+import { useToast } from "src/hooks/Toast";
 import { RatingSystem } from "../Shared/Rating/RatingSystem";
 import {
-  getAggregateGalleryIds,
-  getAggregateInputIDs,
   getAggregateInputValue,
   getAggregatePerformerIds,
-  getAggregateRating,
-  getAggregateStudioId,
+  getAggregateStateObject,
   getAggregateTagIds,
+  getAggregateStudioId,
+  getAggregateGalleryIds,
 } from "src/utils/bulkUpdate";
 import { faPencilAlt } from "@fortawesome/free-solid-svg-icons";
+import { IndeterminateCheckbox } from "../Shared/IndeterminateCheckbox";
+import { BulkUpdateFormGroup, BulkUpdateTextInput } from "../Shared/BulkUpdate";
+import { BulkUpdateDateInput } from "../Shared/DateInput";
+import { getDateError } from "src/utils/yup";
 
 interface IListOperationProps {
   selected: GQL.SlimImageDataFragment[];
   onClose: (applied: boolean) => void;
 }
 
+const imageFields = [
+  "code",
+  "rating100",
+  "details",
+  "organized",
+  "photographer",
+  "date",
+];
+
 export const EditImagesDialog: React.FC<IListOperationProps> = (
   props: IListOperationProps
 ) => {
   const intl = useIntl();
   const Toast = useToast();
-  const [rating100, setRating] = useState<number>();
-  const [studioId, setStudioId] = useState<string>();
-  const [performerMode, setPerformerMode] =
-    React.useState<GQL.BulkUpdateIdMode>(GQL.BulkUpdateIdMode.Add);
-  const [performerIds, setPerformerIds] = useState<string[]>();
-  const [existingPerformerIds, setExistingPerformerIds] = useState<string[]>();
 
-  const [tagMode, setTagMode] = React.useState<GQL.BulkUpdateIdMode>(
-    GQL.BulkUpdateIdMode.Add
-  );
-  const [tagIds, setTagIds] = useState<string[]>();
-  const [existingTagIds, setExistingTagIds] = useState<string[]>();
+  const [updateInput, setUpdateInput] = useState<GQL.BulkImageUpdateInput>({
+    ids: props.selected.map((image) => {
+      return image.id;
+    }),
+  });
 
-  const [galleryMode, setGalleryMode] = React.useState<GQL.BulkUpdateIdMode>(
-    GQL.BulkUpdateIdMode.Add
-  );
-  const [galleryIds, setGalleryIds] = useState<string[]>();
-  const [existingGalleryIds, setExistingGalleryIds] = useState<string[]>();
+  const [performerIds, setPerformerIds] = useState<GQL.BulkUpdateIds>({
+    mode: GQL.BulkUpdateIdMode.Add,
+  });
+  const [tagIds, setTagIds] = useState<GQL.BulkUpdateIds>({
+    mode: GQL.BulkUpdateIdMode.Add,
+  });
+  const [galleryIds, setGalleryIds] = useState<GQL.BulkUpdateIds>({
+    mode: GQL.BulkUpdateIdMode.Add,
+  });
 
-  const [organized, setOrganized] = useState<boolean | undefined>();
+  const unsetDisabled = props.selected.length < 2;
+
+  const [dateError, setDateError] = useState<string | undefined>();
 
   const [updateImages] = useBulkImageUpdate();
 
   // Network state
   const [isUpdating, setIsUpdating] = useState(false);
 
-  const checkboxRef = React.createRef<HTMLInputElement>();
+  const aggregateState = useMemo(() => {
+    const updateState: Partial<GQL.BulkImageUpdateInput> = {};
+    const state = props.selected;
+    updateState.studio_id = getAggregateStudioId(props.selected);
+    const updateTagIds = getAggregateTagIds(props.selected);
+    const updatePerformerIds = getAggregatePerformerIds(props.selected);
+    const updateGalleryIds = getAggregateGalleryIds(props.selected);
+    let first = true;
+
+    state.forEach((image: GQL.SlimImageDataFragment) => {
+      getAggregateStateObject(updateState, image, imageFields, first);
+      first = false;
+    });
+
+    return {
+      state: updateState,
+      tagIds: updateTagIds,
+      performerIds: updatePerformerIds,
+      galleryIds: updateGalleryIds,
+    };
+  }, [props.selected]);
+
+  // update initial state from aggregate
+  useEffect(() => {
+    setUpdateInput((current) => ({ ...current, ...aggregateState.state }));
+  }, [aggregateState]);
+
+  useEffect(() => {
+    setDateError(getDateError(updateInput.date ?? "", intl));
+  }, [updateInput.date, intl]);
+
+  function setUpdateField(input: Partial<GQL.BulkImageUpdateInput>) {
+    setUpdateInput((current) => ({ ...current, ...input }));
+  }
 
   function getImageInput(): GQL.BulkImageUpdateInput {
-    // need to determine what we are actually setting on each image
-    const aggregateRating = getAggregateRating(props.selected);
-    const aggregateStudioId = getAggregateStudioId(props.selected);
-    const aggregatePerformerIds = getAggregatePerformerIds(props.selected);
-    const aggregateTagIds = getAggregateTagIds(props.selected);
-    const aggregateGalleryIds = getAggregateGalleryIds(props.selected);
-
     const imageInput: GQL.BulkImageUpdateInput = {
-      ids: props.selected.map((image) => {
-        return image.id;
-      }),
+      ...updateInput,
+      tag_ids: tagIds,
+      performer_ids: performerIds,
+      gallery_ids: galleryIds,
     };
 
-    imageInput.rating100 = getAggregateInputValue(rating100, aggregateRating);
-    imageInput.studio_id = getAggregateInputValue(studioId, aggregateStudioId);
-
-    imageInput.performer_ids = getAggregateInputIDs(
-      performerMode,
-      performerIds,
-      aggregatePerformerIds
+    // we don't have unset functionality for the rating star control
+    // so need to determine if we are setting a rating or not
+    imageInput.rating100 = getAggregateInputValue(
+      updateInput.rating100,
+      aggregateState.state.rating100
     );
-    imageInput.tag_ids = getAggregateInputIDs(tagMode, tagIds, aggregateTagIds);
-    imageInput.gallery_ids = getAggregateInputIDs(
-      galleryMode,
-      galleryIds,
-      aggregateGalleryIds
-    );
-
-    if (organized !== undefined) {
-      imageInput.organized = organized;
-    }
 
     return imageInput;
   }
@@ -98,11 +123,7 @@ export const EditImagesDialog: React.FC<IListOperationProps> = (
   async function onSave() {
     setIsUpdating(true);
     try {
-      await updateImages({
-        variables: {
-          input: getImageInput(),
-        },
-      });
+      await updateImages({ variables: { input: getImageInput() } });
       Toast.success(
         intl.formatMessage(
           { id: "toast.updated_entity" },
@@ -116,86 +137,13 @@ export const EditImagesDialog: React.FC<IListOperationProps> = (
     setIsUpdating(false);
   }
 
-  useEffect(() => {
-    const state = props.selected;
-    let updateRating: number | undefined;
-    let updateStudioID: string | undefined;
-    let updatePerformerIds: string[] = [];
-    let updateTagIds: string[] = [];
-    let updateGalleryIds: string[] = [];
-    let updateOrganized: boolean | undefined;
-    let first = true;
-
-    state.forEach((image: GQL.SlimImageDataFragment) => {
-      const imageRating = image.rating100;
-      const imageStudioID = image?.studio?.id;
-      const imagePerformerIDs = (image.performers ?? [])
-        .map((p) => p.id)
-        .sort();
-      const imageTagIDs = (image.tags ?? []).map((p) => p.id).sort();
-      const imageGalleryIDs = (image.galleries ?? []).map((p) => p.id).sort();
-
-      if (first) {
-        updateRating = imageRating ?? undefined;
-        updateStudioID = imageStudioID;
-        updatePerformerIds = imagePerformerIDs;
-        updateTagIds = imageTagIDs;
-        updateGalleryIds = imageGalleryIDs;
-        updateOrganized = image.organized;
-        first = false;
-      } else {
-        if (imageRating !== updateRating) {
-          updateRating = undefined;
-        }
-        if (imageStudioID !== updateStudioID) {
-          updateStudioID = undefined;
-        }
-        if (!isEqual(imagePerformerIDs, updatePerformerIds)) {
-          updatePerformerIds = [];
-        }
-        if (!isEqual(imageTagIDs, updateTagIds)) {
-          updateTagIds = [];
-        }
-        if (!isEqual(imageGalleryIDs, updateGalleryIds)) {
-          updateGalleryIds = [];
-        }
-        if (image.organized !== updateOrganized) {
-          updateOrganized = undefined;
-        }
-      }
-    });
-
-    setRating(updateRating);
-    setStudioId(updateStudioID);
-    setExistingPerformerIds(updatePerformerIds);
-    setExistingTagIds(updateTagIds);
-    setExistingGalleryIds(updateGalleryIds);
-    setOrganized(updateOrganized);
-  }, [props.selected]);
-
-  useEffect(() => {
-    if (checkboxRef.current) {
-      checkboxRef.current.indeterminate = organized === undefined;
-    }
-  }, [organized, checkboxRef]);
-
-  function cycleOrganized() {
-    if (organized) {
-      setOrganized(undefined);
-    } else if (organized === undefined) {
-      setOrganized(false);
-    } else {
-      setOrganized(true);
-    }
-  }
-
   function render() {
     return (
       <ModalComponent
         show
         icon={faPencilAlt}
         header={intl.formatMessage(
-          { id: "dialogs.edit_entity_title" },
+          { id: "dialogs.edit_entity_count_title" },
           {
             count: props?.selected?.length ?? 1,
             singularEntity: intl.formatMessage({ id: "image" }),
@@ -206,6 +154,7 @@ export const EditImagesDialog: React.FC<IListOperationProps> = (
           onClick: onSave,
           text: intl.formatMessage({ id: "actions.apply" }),
         }}
+        disabled={isUpdating || !!dateError}
         cancel={{
           onClick: () => props.onClose(false),
           text: intl.formatMessage({ id: "actions.cancel" }),
@@ -214,89 +163,120 @@ export const EditImagesDialog: React.FC<IListOperationProps> = (
         isRunning={isUpdating}
       >
         <Form>
-          <Form.Group controlId="rating" as={Row}>
-            {FormUtils.renderLabel({
-              title: intl.formatMessage({ id: "rating" }),
-            })}
-            <Col xs={9}>
-              <RatingSystem
-                value={rating100}
-                onSetRating={(value) => setRating(value ?? undefined)}
-                disabled={isUpdating}
-              />
-            </Col>
-          </Form.Group>
-          <Form.Group controlId="studio" as={Row}>
-            {FormUtils.renderLabel({
-              title: intl.formatMessage({ id: "studio" }),
-            })}
-            <Col xs={9}>
-              <StudioSelect
-                onSelect={(items) =>
-                  setStudioId(items.length > 0 ? items[0]?.id : undefined)
-                }
-                ids={studioId ? [studioId] : []}
-                isDisabled={isUpdating}
-                menuPortalTarget={document.body}
-              />
-            </Col>
-          </Form.Group>
-
-          <Form.Group controlId="performers">
-            <Form.Label>
-              <FormattedMessage id="performers" />
-            </Form.Label>
-            <MultiSet
-              type="performers"
+          <BulkUpdateFormGroup name="rating">
+            <RatingSystem
+              value={updateInput.rating100}
+              onSetRating={(value) =>
+                setUpdateField({ rating100: value ?? undefined })
+              }
               disabled={isUpdating}
-              onUpdate={(itemIDs) => setPerformerIds(itemIDs)}
-              onSetMode={(newMode) => setPerformerMode(newMode)}
-              existingIds={existingPerformerIds ?? []}
-              ids={performerIds ?? []}
-              mode={performerMode}
+            />
+          </BulkUpdateFormGroup>
+
+          <BulkUpdateFormGroup name="scene_code">
+            <BulkUpdateTextInput
+              value={updateInput.code}
+              valueChanged={(newValue) => setUpdateField({ code: newValue })}
+              unsetDisabled={unsetDisabled}
+            />
+          </BulkUpdateFormGroup>
+
+          <BulkUpdateFormGroup name="date">
+            <BulkUpdateDateInput
+              value={updateInput.date}
+              valueChanged={(newValue) => setUpdateField({ date: newValue })}
+              unsetDisabled={unsetDisabled}
+              error={dateError}
+            />
+          </BulkUpdateFormGroup>
+
+          <BulkUpdateFormGroup name="photographer">
+            <BulkUpdateTextInput
+              value={updateInput.photographer}
+              valueChanged={(newValue) =>
+                setUpdateField({ photographer: newValue })
+              }
+              unsetDisabled={unsetDisabled}
+            />
+          </BulkUpdateFormGroup>
+          <BulkUpdateFormGroup name="studio">
+            <StudioSelect
+              onSelect={(items) =>
+                setUpdateField({
+                  studio_id: items.length > 0 ? items[0]?.id : undefined,
+                })
+              }
+              ids={updateInput.studio_id ? [updateInput.studio_id] : []}
+              isDisabled={isUpdating}
               menuPortalTarget={document.body}
             />
-          </Form.Group>
+          </BulkUpdateFormGroup>
 
-          <Form.Group controlId="tags">
-            <Form.Label>
-              <FormattedMessage id="tags" />
-            </Form.Label>
+          <BulkUpdateFormGroup name="performers" inline={false}>
             <MultiSet
-              type="tags"
+              type={"performers"}
               disabled={isUpdating}
-              onUpdate={(itemIDs) => setTagIds(itemIDs)}
-              onSetMode={(newMode) => setTagMode(newMode)}
-              existingIds={existingTagIds ?? []}
-              ids={tagIds ?? []}
-              mode={tagMode}
+              onUpdate={(itemIDs) => {
+                setPerformerIds((c) => ({ ...c, ids: itemIDs }));
+              }}
+              onSetMode={(newMode) => {
+                setPerformerIds((c) => ({ ...c, mode: newMode }));
+              }}
+              ids={performerIds.ids ?? []}
+              existingIds={aggregateState.performerIds}
+              mode={performerIds.mode}
               menuPortalTarget={document.body}
             />
-          </Form.Group>
+          </BulkUpdateFormGroup>
 
-          <Form.Group controlId="galleries">
-            <Form.Label>
-              <FormattedMessage id="galleries" />
-            </Form.Label>
+          <BulkUpdateFormGroup name="galleries" inline={false}>
             <MultiSet
               type="galleries"
               disabled={isUpdating}
-              onUpdate={(itemIDs) => setGalleryIds(itemIDs)}
-              onSetMode={(newMode) => setGalleryMode(newMode)}
-              existingIds={existingGalleryIds ?? []}
-              ids={galleryIds ?? []}
-              mode={galleryMode}
+              onUpdate={(itemIDs) => {
+                setGalleryIds((c) => ({ ...c, ids: itemIDs }));
+              }}
+              onSetMode={(newMode) => {
+                setGalleryIds((c) => ({ ...c, mode: newMode }));
+              }}
+              ids={galleryIds.ids ?? []}
+              existingIds={aggregateState.galleryIds}
+              mode={galleryIds.mode}
               menuPortalTarget={document.body}
             />
-          </Form.Group>
+          </BulkUpdateFormGroup>
+
+          <BulkUpdateFormGroup name="tags" inline={false}>
+            <MultiSet
+              type={"tags"}
+              disabled={isUpdating}
+              onUpdate={(itemIDs) => {
+                setTagIds((c) => ({ ...c, ids: itemIDs }));
+              }}
+              onSetMode={(newMode) => {
+                setTagIds((c) => ({ ...c, mode: newMode }));
+              }}
+              ids={tagIds.ids ?? []}
+              existingIds={aggregateState.tagIds}
+              mode={tagIds.mode}
+              menuPortalTarget={document.body}
+            />
+          </BulkUpdateFormGroup>
+
+          <BulkUpdateFormGroup name="details" inline={false}>
+            <BulkUpdateTextInput
+              value={updateInput.details}
+              valueChanged={(newValue) => setUpdateField({ details: newValue })}
+              unsetDisabled={unsetDisabled}
+              as="textarea"
+            />
+          </BulkUpdateFormGroup>
 
           <Form.Group controlId="organized">
-            <Form.Check
-              type="checkbox"
+            <IndeterminateCheckbox
               label={intl.formatMessage({ id: "organized" })}
-              checked={organized}
-              ref={checkboxRef}
-              onChange={() => cycleOrganized()}
+              setChecked={(checked) => setUpdateField({ organized: checked })}
+              checked={updateInput.organized ?? undefined}
             />
           </Form.Group>
         </Form>
diff --git a/ui/v2.5/src/components/Performers/EditPerformersDialog.tsx b/ui/v2.5/src/components/Performers/EditPerformersDialog.tsx
index d60118d4b..d63886167 100644
--- a/ui/v2.5/src/components/Performers/EditPerformersDialog.tsx
+++ b/ui/v2.5/src/components/Performers/EditPerformersDialog.tsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useState } from "react";
-import { Col, Form, Row } from "react-bootstrap";
-import { FormattedMessage, useIntl } from "react-intl";
+import { Form } from "react-bootstrap";
+import { useIntl } from "react-intl";
 import { useBulkPerformerUpdate } from "src/core/StashService";
 import * as GQL from "src/core/generated-graphql";
 import { ModalComponent } from "../Shared/Modal";
@@ -23,12 +23,13 @@ import {
   stringToCircumcised,
 } from "src/utils/circumcised";
 import { IndeterminateCheckbox } from "../Shared/IndeterminateCheckbox";
-import { BulkUpdateTextInput } from "../Shared/BulkUpdateTextInput";
+import { BulkUpdateFormGroup, BulkUpdateTextInput } from "../Shared/BulkUpdate";
 import { faPencilAlt } from "@fortawesome/free-solid-svg-icons";
-import * as FormUtils from "src/utils/form";
 import { CountrySelect } from "../Shared/CountrySelect";
 import { useConfigurationContext } from "src/hooks/Config";
 import cx from "classnames";
+import { BulkUpdateDateInput } from "../Shared/DateInput";
+import { getDateError } from "src/utils/yup";
 
 interface IListOperationProps {
   selected: GQL.SlimPerformerDataFragment[];
@@ -75,17 +76,30 @@ export const EditPerformersDialog: React.FC<IListOperationProps> = (
   const [aggregateState, setAggregateState] =
     useState<GQL.BulkPerformerUpdateInput>({});
   // height and weight needs conversion to/from number
-  const [height, setHeight] = useState<string | undefined>();
-  const [weight, setWeight] = useState<string | undefined>();
-  const [penis_length, setPenisLength] = useState<string | undefined>();
+  const [height, setHeight] = useState<string | undefined | null>();
+  const [weight, setWeight] = useState<string | undefined | null>();
+  const [penis_length, setPenisLength] = useState<string | undefined | null>();
   const [updateInput, setUpdateInput] = useState<GQL.BulkPerformerUpdateInput>(
     {}
   );
   const genderOptions = [""].concat(genderStrings);
   const circumcisedOptions = [""].concat(circumcisedStrings);
 
+  const unsetDisabled = props.selected.length < 2;
+
   const [updatePerformers] = useBulkPerformerUpdate(getPerformerInput());
 
+  const [birthdateError, setBirthdateError] = useState<string | undefined>();
+  const [deathDateError, setDeathDateError] = useState<string | undefined>();
+
+  useEffect(() => {
+    setBirthdateError(getDateError(updateInput.birthdate ?? "", intl));
+  }, [updateInput.birthdate, intl]);
+
+  useEffect(() => {
+    setDeathDateError(getDateError(updateInput.death_date ?? "", intl));
+  }, [updateInput.death_date, intl]);
+
   // Network state
   const [isUpdating, setIsUpdating] = useState(false);
 
@@ -121,14 +135,14 @@ export const EditPerformersDialog: React.FC<IListOperationProps> = (
     );
 
     if (height !== undefined) {
-      performerInput.height_cm = parseFloat(height);
+      performerInput.height_cm = height === null ? null : parseFloat(height);
     }
     if (weight !== undefined) {
-      performerInput.weight = parseFloat(weight);
+      performerInput.weight = weight === null ? null : parseFloat(weight);
     }
-
     if (penis_length !== undefined) {
-      performerInput.penis_length = parseFloat(penis_length);
+      performerInput.penis_length =
+        penis_length === null ? null : parseFloat(penis_length);
     }
 
     return performerInput;
@@ -205,25 +219,6 @@ export const EditPerformersDialog: React.FC<IListOperationProps> = (
     setUpdateInput(updateState);
   }, [props.selected]);
 
-  function renderTextField(
-    name: string,
-    value: string | undefined | null,
-    setter: (newValue: string | undefined) => void
-  ) {
-    return (
-      <Form.Group controlId={name} data-field={name}>
-        <Form.Label>
-          <FormattedMessage id={name} />
-        </Form.Label>
-        <BulkUpdateTextInput
-          value={value === null ? "" : value ?? undefined}
-          valueChanged={(newValue) => setter(newValue)}
-          unsetDisabled={props.selected.length < 2}
-        />
-      </Form.Group>
-    );
-  }
-
   function render() {
     // sfw class needs to be set because it is outside body
 
@@ -235,13 +230,18 @@ export const EditPerformersDialog: React.FC<IListOperationProps> = (
         show
         icon={faPencilAlt}
         header={intl.formatMessage(
-          { id: "actions.edit_entity" },
-          { entityType: intl.formatMessage({ id: "performers" }) }
+          { id: "dialogs.edit_entity_count_title" },
+          {
+            count: props?.selected?.length ?? 1,
+            singularEntity: intl.formatMessage({ id: "performer" }),
+            pluralEntity: intl.formatMessage({ id: "performers" }),
+          }
         )}
         accept={{
           onClick: onSave,
           text: intl.formatMessage({ id: "actions.apply" }),
         }}
+        disabled={isUpdating || !!birthdateError || !!deathDateError}
         cancel={{
           onClick: () => props.onClose(false),
           text: intl.formatMessage({ id: "actions.cancel" }),
@@ -249,11 +249,8 @@ export const EditPerformersDialog: React.FC<IListOperationProps> = (
         }}
         isRunning={isUpdating}
       >
-        <Form.Group controlId="rating" as={Row} data-field={name}>
-          {FormUtils.renderLabel({
-            title: intl.formatMessage({ id: "rating" }),
-          })}
-          <Col xs={9}>
+        <Form>
+          <BulkUpdateFormGroup name="rating">
             <RatingSystem
               value={updateInput.rating100}
               onSetRating={(value) =>
@@ -261,9 +258,8 @@ export const EditPerformersDialog: React.FC<IListOperationProps> = (
               }
               disabled={isUpdating}
             />
-          </Col>
-        </Form.Group>
-        <Form>
+          </BulkUpdateFormGroup>
+
           <Form.Group controlId="favorite">
             <IndeterminateCheckbox
               setChecked={(checked) => setUpdateField({ favorite: checked })}
@@ -272,10 +268,7 @@ export const EditPerformersDialog: React.FC<IListOperationProps> = (
             />
           </Form.Group>
 
-          <Form.Group>
-            <Form.Label>
-              <FormattedMessage id="gender" />
-            </Form.Label>
+          <BulkUpdateFormGroup name="gender">
             <Form.Control
               as="select"
               className="input-control"
@@ -292,51 +285,105 @@ export const EditPerformersDialog: React.FC<IListOperationProps> = (
                 </option>
               ))}
             </Form.Control>
-          </Form.Group>
+          </BulkUpdateFormGroup>
 
-          {renderTextField("disambiguation", updateInput.disambiguation, (v) =>
-            setUpdateField({ disambiguation: v })
-          )}
-          {renderTextField("birthdate", updateInput.birthdate, (v) =>
-            setUpdateField({ birthdate: v })
-          )}
-          {renderTextField("death_date", updateInput.death_date, (v) =>
-            setUpdateField({ death_date: v })
-          )}
+          <BulkUpdateFormGroup name="disambiguation">
+            <BulkUpdateTextInput
+              value={updateInput.disambiguation}
+              valueChanged={(newValue) =>
+                setUpdateField({ disambiguation: newValue })
+              }
+              unsetDisabled={unsetDisabled}
+            />
+          </BulkUpdateFormGroup>
 
-          <Form.Group>
-            <Form.Label>
-              <FormattedMessage id="country" />
-            </Form.Label>
+          <BulkUpdateFormGroup name="birthdate">
+            <BulkUpdateDateInput
+              value={updateInput.birthdate}
+              valueChanged={(newValue) =>
+                setUpdateField({ birthdate: newValue })
+              }
+              unsetDisabled={unsetDisabled}
+              error={birthdateError}
+            />
+          </BulkUpdateFormGroup>
+          <BulkUpdateFormGroup name="death_date">
+            <BulkUpdateDateInput
+              value={updateInput.death_date}
+              valueChanged={(newValue) =>
+                setUpdateField({ death_date: newValue })
+              }
+              unsetDisabled={unsetDisabled}
+              error={deathDateError}
+            />
+          </BulkUpdateFormGroup>
+          <BulkUpdateFormGroup name="country">
             <CountrySelect
               value={updateInput.country ?? ""}
               onChange={(v) => setUpdateField({ country: v })}
               showFlag
             />
-          </Form.Group>
+          </BulkUpdateFormGroup>
 
-          {renderTextField("ethnicity", updateInput.ethnicity, (v) =>
-            setUpdateField({ ethnicity: v })
-          )}
-          {renderTextField("hair_color", updateInput.hair_color, (v) =>
-            setUpdateField({ hair_color: v })
-          )}
-          {renderTextField("eye_color", updateInput.eye_color, (v) =>
-            setUpdateField({ eye_color: v })
-          )}
-          {renderTextField("height", height, (v) => setHeight(v))}
-          {renderTextField("weight", weight, (v) => setWeight(v))}
-          {renderTextField("measurements", updateInput.measurements, (v) =>
-            setUpdateField({ measurements: v })
-          )}
-          {renderTextField("penis_length", penis_length, (v) =>
-            setPenisLength(v)
-          )}
+          <BulkUpdateFormGroup name="ethnicity">
+            <BulkUpdateTextInput
+              value={updateInput.ethnicity}
+              valueChanged={(newValue) =>
+                setUpdateField({ ethnicity: newValue })
+              }
+              unsetDisabled={unsetDisabled}
+            />
+          </BulkUpdateFormGroup>
+          <BulkUpdateFormGroup name="hair_color">
+            <BulkUpdateTextInput
+              value={updateInput.hair_color}
+              valueChanged={(newValue) =>
+                setUpdateField({ hair_color: newValue })
+              }
+              unsetDisabled={unsetDisabled}
+            />
+          </BulkUpdateFormGroup>
+          <BulkUpdateFormGroup name="eye_color">
+            <BulkUpdateTextInput
+              value={updateInput.eye_color}
+              valueChanged={(newValue) =>
+                setUpdateField({ eye_color: newValue })
+              }
+              unsetDisabled={unsetDisabled}
+            />
+          </BulkUpdateFormGroup>
+          <BulkUpdateFormGroup name="height">
+            <BulkUpdateTextInput
+              value={height}
+              valueChanged={(newValue) => setHeight(newValue)}
+              unsetDisabled={unsetDisabled}
+            />
+          </BulkUpdateFormGroup>
+          <BulkUpdateFormGroup name="weight">
+            <BulkUpdateTextInput
+              value={weight}
+              valueChanged={(newValue) => setWeight(newValue)}
+              unsetDisabled={unsetDisabled}
+            />
+          </BulkUpdateFormGroup>
+          <BulkUpdateFormGroup name="measurements">
+            <BulkUpdateTextInput
+              value={updateInput.measurements}
+              valueChanged={(newValue) =>
+                setUpdateField({ measurements: newValue })
+              }
+              unsetDisabled={unsetDisabled}
+            />
+          </BulkUpdateFormGroup>
+          <BulkUpdateFormGroup name="penis_length">
+            <BulkUpdateTextInput
+              value={penis_length}
+              valueChanged={(newValue) => setPenisLength(newValue)}
+              unsetDisabled={unsetDisabled}
+            />
+          </BulkUpdateFormGroup>
 
-          <Form.Group data-field="circumcised">
-            <Form.Label>
-              <FormattedMessage id="circumcised" />
-            </Form.Label>
+          <BulkUpdateFormGroup name="circumcised">
             <Form.Control
               as="select"
               className="input-control"
@@ -353,43 +400,68 @@ export const EditPerformersDialog: React.FC<IListOperationProps> = (
                 </option>
               ))}
             </Form.Control>
-          </Form.Group>
+          </BulkUpdateFormGroup>
 
-          {renderTextField("fake_tits", updateInput.fake_tits, (v) =>
-            setUpdateField({ fake_tits: v })
-          )}
-          {renderTextField("tattoos", updateInput.tattoos, (v) =>
-            setUpdateField({ tattoos: v })
-          )}
-          {renderTextField("piercings", updateInput.piercings, (v) =>
-            setUpdateField({ piercings: v })
-          )}
-          {renderTextField(
-            "career_start",
-            updateInput.career_start?.toString(),
-            (v) => setUpdateField({ career_start: v ? parseInt(v) : undefined })
-          )}
-          {renderTextField(
-            "career_end",
-            updateInput.career_end?.toString(),
-            (v) => setUpdateField({ career_end: v ? parseInt(v) : undefined })
-          )}
+          <BulkUpdateFormGroup name="fake_tits">
+            <BulkUpdateTextInput
+              value={updateInput.fake_tits}
+              valueChanged={(newValue) =>
+                setUpdateField({ fake_tits: newValue })
+              }
+              unsetDisabled={unsetDisabled}
+            />
+          </BulkUpdateFormGroup>
+          <BulkUpdateFormGroup name="tattoos">
+            <BulkUpdateTextInput
+              value={updateInput.tattoos}
+              valueChanged={(newValue) => setUpdateField({ tattoos: newValue })}
+              unsetDisabled={unsetDisabled}
+            />
+          </BulkUpdateFormGroup>
+          <BulkUpdateFormGroup name="piercings">
+            <BulkUpdateTextInput
+              value={updateInput.piercings}
+              valueChanged={(newValue) =>
+                setUpdateField({ piercings: newValue })
+              }
+              unsetDisabled={unsetDisabled}
+            />
+          </BulkUpdateFormGroup>
+          <BulkUpdateFormGroup name="career_start">
+            <BulkUpdateTextInput
+              value={updateInput.career_start?.toString()}
+              valueChanged={(v) =>
+                setUpdateField({ career_start: v ? parseInt(v) : undefined })
+              }
+              unsetDisabled={unsetDisabled}
+            />
+          </BulkUpdateFormGroup>
+          <BulkUpdateFormGroup name="career_end">
+            <BulkUpdateTextInput
+              value={updateInput.career_end?.toString()}
+              valueChanged={(v) =>
+                setUpdateField({ career_end: v ? parseInt(v) : undefined })
+              }
+              unsetDisabled={unsetDisabled}
+            />
+          </BulkUpdateFormGroup>
 
-          <Form.Group controlId="tags">
-            <Form.Label>
-              <FormattedMessage id="tags" />
-            </Form.Label>
+          <BulkUpdateFormGroup name="tags" inline={false}>
             <MultiSet
-              type="tags"
+              type={"tags"}
               disabled={isUpdating}
-              onUpdate={(itemIDs) => setTagIds({ ...tagIds, ids: itemIDs })}
-              onSetMode={(newMode) => setTagIds({ ...tagIds, mode: newMode })}
-              existingIds={existingTagIds ?? []}
+              onUpdate={(itemIDs) => {
+                setTagIds((c) => ({ ...c, ids: itemIDs }));
+              }}
+              onSetMode={(newMode) => {
+                setTagIds((c) => ({ ...c, mode: newMode }));
+              }}
               ids={tagIds.ids ?? []}
+              existingIds={existingTagIds}
               mode={tagIds.mode}
               menuPortalTarget={document.body}
             />
-          </Form.Group>
+          </BulkUpdateFormGroup>
 
           <Form.Group controlId="ignore-auto-tags">
             <IndeterminateCheckbox
diff --git a/ui/v2.5/src/components/Scenes/EditSceneMarkersDialog.tsx b/ui/v2.5/src/components/Scenes/EditSceneMarkersDialog.tsx
index bb1d8067b..1856543f9 100644
--- a/ui/v2.5/src/components/Scenes/EditSceneMarkersDialog.tsx
+++ b/ui/v2.5/src/components/Scenes/EditSceneMarkersDialog.tsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useMemo, useState } from "react";
 import { Form } from "react-bootstrap";
-import { FormattedMessage, useIntl } from "react-intl";
+import { useIntl } from "react-intl";
 import { useBulkSceneMarkerUpdate } from "src/core/StashService";
 import * as GQL from "src/core/generated-graphql";
 import { ModalComponent } from "../Shared/Modal";
@@ -10,7 +10,7 @@ import {
   getAggregateState,
   getAggregateStateObject,
 } from "src/utils/bulkUpdate";
-import { BulkUpdateTextInput } from "../Shared/BulkUpdateTextInput";
+import { BulkUpdateFormGroup, BulkUpdateTextInput } from "../Shared/BulkUpdate";
 import { faPencilAlt } from "@fortawesome/free-solid-svg-icons";
 import { TagSelect } from "../Shared/Select";
 
@@ -38,6 +38,8 @@ export const EditSceneMarkersDialog: React.FC<IListOperationProps> = (
     mode: GQL.BulkUpdateIdMode.Add,
   });
 
+  const unsetDisabled = props.selected.length < 2;
+
   const [updateSceneMarkers] = useBulkSceneMarkerUpdate();
 
   // Network state
@@ -115,27 +117,6 @@ export const EditSceneMarkersDialog: React.FC<IListOperationProps> = (
     setIsUpdating(false);
   }
 
-  function renderTextField(
-    name: string,
-    value: string | undefined | null,
-    setter: (newValue: string | undefined) => void,
-    area: boolean = false
-  ) {
-    return (
-      <Form.Group controlId={name}>
-        <Form.Label>
-          <FormattedMessage id={name} />
-        </Form.Label>
-        <BulkUpdateTextInput
-          value={value === null ? "" : value ?? undefined}
-          valueChanged={(newValue) => setter(newValue)}
-          unsetDisabled={props.selected.length < 2}
-          as={area ? "textarea" : undefined}
-        />
-      </Form.Group>
-    );
-  }
-
   function render() {
     return (
       <ModalComponent
@@ -143,8 +124,12 @@ export const EditSceneMarkersDialog: React.FC<IListOperationProps> = (
         show
         icon={faPencilAlt}
         header={intl.formatMessage(
-          { id: "actions.edit_entity" },
-          { entityType: intl.formatMessage({ id: "markers" }) }
+          { id: "dialogs.edit_entity_count_title" },
+          {
+            count: props?.selected?.length ?? 1,
+            singularEntity: intl.formatMessage({ id: "marker" }),
+            pluralEntity: intl.formatMessage({ id: "markers" }),
+          }
         )}
         accept={{
           onClick: onSave,
@@ -158,39 +143,39 @@ export const EditSceneMarkersDialog: React.FC<IListOperationProps> = (
         isRunning={isUpdating}
       >
         <Form>
-          {renderTextField("title", updateInput.title, (newValue) =>
-            setUpdateField({ title: newValue })
-          )}
+          <BulkUpdateFormGroup name="title">
+            <BulkUpdateTextInput
+              value={updateInput.title}
+              valueChanged={(newValue) => setUpdateField({ title: newValue })}
+              unsetDisabled={unsetDisabled}
+            />
+          </BulkUpdateFormGroup>
 
-          <Form.Group controlId="primary-tag">
-            <Form.Label>
-              <FormattedMessage id="primary_tag" />
-            </Form.Label>
+          <BulkUpdateFormGroup name="primary-tag" messageId="primary_tag">
             <TagSelect
               onSelect={(t) => setUpdateField({ primary_tag_id: t[0]?.id })}
               ids={
                 updateInput.primary_tag_id ? [updateInput.primary_tag_id] : []
               }
             />
-          </Form.Group>
+          </BulkUpdateFormGroup>
 
-          <Form.Group controlId="tags">
-            <Form.Label>
-              <FormattedMessage id="tags" />
-            </Form.Label>
+          <BulkUpdateFormGroup name="tags" inline={false}>
             <MultiSet
-              type="tags"
+              type={"tags"}
               disabled={isUpdating}
-              onUpdate={(itemIDs) => setTagIds((v) => ({ ...v, ids: itemIDs }))}
-              onSetMode={(newMode) =>
-                setTagIds((v) => ({ ...v, mode: newMode }))
-              }
-              existingIds={aggregateState.tagIds ?? []}
+              onUpdate={(itemIDs) => {
+                setTagIds((c) => ({ ...c, ids: itemIDs }));
+              }}
+              onSetMode={(newMode) => {
+                setTagIds((c) => ({ ...c, mode: newMode }));
+              }}
               ids={tagIds.ids ?? []}
+              existingIds={aggregateState.tagIds ?? []}
               mode={tagIds.mode}
               menuPortalTarget={document.body}
             />
-          </Form.Group>
+          </BulkUpdateFormGroup>
         </Form>
       </ModalComponent>
     );
diff --git a/ui/v2.5/src/components/Scenes/EditScenesDialog.tsx b/ui/v2.5/src/components/Scenes/EditScenesDialog.tsx
index 7b69cf655..17466bfc9 100644
--- a/ui/v2.5/src/components/Scenes/EditScenesDialog.tsx
+++ b/ui/v2.5/src/components/Scenes/EditScenesDialog.tsx
@@ -1,93 +1,121 @@
-import React, { useEffect, useState } from "react";
-import { Form, Col, Row } from "react-bootstrap";
-import { FormattedMessage, useIntl } from "react-intl";
-import isEqual from "lodash-es/isEqual";
+import React, { useEffect, useMemo, useState } from "react";
+import { Form } from "react-bootstrap";
+import { useIntl } from "react-intl";
 import { useBulkSceneUpdate } from "src/core/StashService";
 import * as GQL from "src/core/generated-graphql";
 import { StudioSelect } from "../Shared/Select";
 import { ModalComponent } from "../Shared/Modal";
 import { MultiSet } from "../Shared/MultiSet";
 import { useToast } from "src/hooks/Toast";
-import * as FormUtils from "src/utils/form";
 import { RatingSystem } from "../Shared/Rating/RatingSystem";
 import {
-  getAggregateInputIDs,
   getAggregateInputValue,
   getAggregateGroupIds,
   getAggregatePerformerIds,
-  getAggregateRating,
-  getAggregateStudioId,
+  getAggregateStateObject,
   getAggregateTagIds,
+  getAggregateStudioId,
 } from "src/utils/bulkUpdate";
 import { faPencilAlt } from "@fortawesome/free-solid-svg-icons";
+import { IndeterminateCheckbox } from "../Shared/IndeterminateCheckbox";
+import { BulkUpdateFormGroup, BulkUpdateTextInput } from "../Shared/BulkUpdate";
+import { BulkUpdateDateInput } from "../Shared/DateInput";
+import { getDateError } from "src/utils/yup";
 
 interface IListOperationProps {
   selected: GQL.SlimSceneDataFragment[];
   onClose: (applied: boolean) => void;
 }
 
+const sceneFields = [
+  "code",
+  "rating100",
+  "details",
+  "organized",
+  "director",
+  "date",
+];
+
 export const EditScenesDialog: React.FC<IListOperationProps> = (
   props: IListOperationProps
 ) => {
   const intl = useIntl();
   const Toast = useToast();
-  const [rating100, setRating] = useState<number>();
-  const [studioId, setStudioId] = useState<string>();
-  const [performerMode, setPerformerMode] =
-    React.useState<GQL.BulkUpdateIdMode>(GQL.BulkUpdateIdMode.Add);
-  const [performerIds, setPerformerIds] = useState<string[]>();
-  const [existingPerformerIds, setExistingPerformerIds] = useState<string[]>();
-  const [tagMode, setTagMode] = React.useState<GQL.BulkUpdateIdMode>(
-    GQL.BulkUpdateIdMode.Add
-  );
-  const [tagIds, setTagIds] = useState<string[]>();
-  const [existingTagIds, setExistingTagIds] = useState<string[]>();
-  const [groupMode, setGroupMode] = React.useState<GQL.BulkUpdateIdMode>(
-    GQL.BulkUpdateIdMode.Add
-  );
-  const [groupIds, setGroupIds] = useState<string[]>();
-  const [existingGroupIds, setExistingGroupIds] = useState<string[]>();
-  const [organized, setOrganized] = useState<boolean | undefined>();
 
-  const [updateScenes] = useBulkSceneUpdate(getSceneInput());
+  const [updateInput, setUpdateInput] = useState<GQL.BulkSceneUpdateInput>({
+    ids: props.selected.map((scene) => {
+      return scene.id;
+    }),
+  });
+
+  const [dateError, setDateError] = useState<string | undefined>();
+
+  const [performerIds, setPerformerIds] = useState<GQL.BulkUpdateIds>({
+    mode: GQL.BulkUpdateIdMode.Add,
+  });
+  const [tagIds, setTagIds] = useState<GQL.BulkUpdateIds>({
+    mode: GQL.BulkUpdateIdMode.Add,
+  });
+  const [groupIds, setGroupIds] = useState<GQL.BulkUpdateIds>({
+    mode: GQL.BulkUpdateIdMode.Add,
+  });
+
+  const unsetDisabled = props.selected.length < 2;
+
+  const [updateScenes] = useBulkSceneUpdate();
 
   // Network state
   const [isUpdating, setIsUpdating] = useState(false);
 
-  const checkboxRef = React.createRef<HTMLInputElement>();
+  const aggregateState = useMemo(() => {
+    const updateState: Partial<GQL.BulkSceneUpdateInput> = {};
+    const state = props.selected;
+    updateState.studio_id = getAggregateStudioId(props.selected);
+    const updateTagIds = getAggregateTagIds(props.selected);
+    const updatePerformerIds = getAggregatePerformerIds(props.selected);
+    const updateGroupIds = getAggregateGroupIds(props.selected);
+    let first = true;
+
+    state.forEach((scene: GQL.SlimSceneDataFragment) => {
+      getAggregateStateObject(updateState, scene, sceneFields, first);
+      first = false;
+    });
+
+    return {
+      state: updateState,
+      tagIds: updateTagIds,
+      performerIds: updatePerformerIds,
+      groupIds: updateGroupIds,
+    };
+  }, [props.selected]);
+
+  // update initial state from aggregate
+  useEffect(() => {
+    setUpdateInput((current) => ({ ...current, ...aggregateState.state }));
+  }, [aggregateState]);
+
+  useEffect(() => {
+    setDateError(getDateError(updateInput.date ?? "", intl));
+  }, [updateInput.date, intl]);
+
+  function setUpdateField(input: Partial<GQL.BulkSceneUpdateInput>) {
+    setUpdateInput((current) => ({ ...current, ...input }));
+  }
 
   function getSceneInput(): GQL.BulkSceneUpdateInput {
-    // need to determine what we are actually setting on each scene
-    const aggregateRating = getAggregateRating(props.selected);
-    const aggregateStudioId = getAggregateStudioId(props.selected);
-    const aggregatePerformerIds = getAggregatePerformerIds(props.selected);
-    const aggregateTagIds = getAggregateTagIds(props.selected);
-    const aggregateGroupIds = getAggregateGroupIds(props.selected);
-
     const sceneInput: GQL.BulkSceneUpdateInput = {
-      ids: props.selected.map((scene) => {
-        return scene.id;
-      }),
+      ...updateInput,
+      tag_ids: tagIds,
+      performer_ids: performerIds,
+      group_ids: groupIds,
     };
 
-    sceneInput.rating100 = getAggregateInputValue(rating100, aggregateRating);
-    sceneInput.studio_id = getAggregateInputValue(studioId, aggregateStudioId);
-
-    sceneInput.performer_ids = getAggregateInputIDs(
-      performerMode,
-      performerIds,
-      aggregatePerformerIds
+    // we don't have unset functionality for the rating star control
+    // so need to determine if we are setting a rating or not
+    sceneInput.rating100 = getAggregateInputValue(
+      updateInput.rating100,
+      aggregateState.state.rating100
     );
-    sceneInput.tag_ids = getAggregateInputIDs(tagMode, tagIds, aggregateTagIds);
-    sceneInput.group_ids = getAggregateInputIDs(
-      groupMode,
-      groupIds,
-      aggregateGroupIds
-    );
-
-    if (organized !== undefined) {
-      sceneInput.organized = organized;
-    }
 
     return sceneInput;
   }
@@ -95,7 +123,7 @@ export const EditScenesDialog: React.FC<IListOperationProps> = (
   async function onSave() {
     setIsUpdating(true);
     try {
-      await updateScenes();
+      await updateScenes({ variables: { input: getSceneInput() } });
       Toast.success(
         intl.formatMessage(
           { id: "toast.updated_entity" },
@@ -109,145 +137,13 @@ export const EditScenesDialog: React.FC<IListOperationProps> = (
     setIsUpdating(false);
   }
 
-  useEffect(() => {
-    const state = props.selected;
-    let updateRating: number | undefined;
-    let updateStudioID: string | undefined;
-    let updatePerformerIds: string[] = [];
-    let updateTagIds: string[] = [];
-    let updateGroupIds: string[] = [];
-    let updateOrganized: boolean | undefined;
-    let first = true;
-
-    state.forEach((scene: GQL.SlimSceneDataFragment) => {
-      const sceneRating = scene.rating100;
-      const sceneStudioID = scene?.studio?.id;
-      const scenePerformerIDs = (scene.performers ?? [])
-        .map((p) => p.id)
-        .sort();
-      const sceneTagIDs = (scene.tags ?? []).map((p) => p.id).sort();
-      const sceneGroupIDs = (scene.groups ?? []).map((m) => m.group.id).sort();
-
-      if (first) {
-        updateRating = sceneRating ?? undefined;
-        updateStudioID = sceneStudioID;
-        updatePerformerIds = scenePerformerIDs;
-        updateTagIds = sceneTagIDs;
-        updateGroupIds = sceneGroupIDs;
-        first = false;
-        updateOrganized = scene.organized;
-      } else {
-        if (sceneRating !== updateRating) {
-          updateRating = undefined;
-        }
-        if (sceneStudioID !== updateStudioID) {
-          updateStudioID = undefined;
-        }
-        if (!isEqual(scenePerformerIDs, updatePerformerIds)) {
-          updatePerformerIds = [];
-        }
-        if (!isEqual(sceneTagIDs, updateTagIds)) {
-          updateTagIds = [];
-        }
-        if (!isEqual(sceneGroupIDs, updateGroupIds)) {
-          updateGroupIds = [];
-        }
-        if (scene.organized !== updateOrganized) {
-          updateOrganized = undefined;
-        }
-      }
-    });
-
-    setRating(updateRating);
-    setStudioId(updateStudioID);
-    setExistingPerformerIds(updatePerformerIds);
-    setExistingTagIds(updateTagIds);
-    setExistingGroupIds(updateGroupIds);
-    setOrganized(updateOrganized);
-  }, [props.selected]);
-
-  useEffect(() => {
-    if (checkboxRef.current) {
-      checkboxRef.current.indeterminate = organized === undefined;
-    }
-  }, [organized, checkboxRef]);
-
-  function renderMultiSelect(
-    type: "performers" | "tags" | "groups",
-    ids: string[] | undefined
-  ) {
-    let mode = GQL.BulkUpdateIdMode.Add;
-    let existingIds: string[] | undefined = [];
-    switch (type) {
-      case "performers":
-        mode = performerMode;
-        existingIds = existingPerformerIds;
-        break;
-      case "tags":
-        mode = tagMode;
-        existingIds = existingTagIds;
-        break;
-      case "groups":
-        mode = groupMode;
-        existingIds = existingGroupIds;
-        break;
-    }
-
-    return (
-      <MultiSet
-        type={type}
-        disabled={isUpdating}
-        onUpdate={(itemIDs) => {
-          switch (type) {
-            case "performers":
-              setPerformerIds(itemIDs);
-              break;
-            case "tags":
-              setTagIds(itemIDs);
-              break;
-            case "groups":
-              setGroupIds(itemIDs);
-              break;
-          }
-        }}
-        onSetMode={(newMode) => {
-          switch (type) {
-            case "performers":
-              setPerformerMode(newMode);
-              break;
-            case "tags":
-              setTagMode(newMode);
-              break;
-            case "groups":
-              setGroupMode(newMode);
-              break;
-          }
-        }}
-        ids={ids ?? []}
-        existingIds={existingIds ?? []}
-        mode={mode}
-        menuPortalTarget={document.body}
-      />
-    );
-  }
-
-  function cycleOrganized() {
-    if (organized) {
-      setOrganized(undefined);
-    } else if (organized === undefined) {
-      setOrganized(false);
-    } else {
-      setOrganized(true);
-    }
-  }
-
   function render() {
     return (
       <ModalComponent
         show
         icon={faPencilAlt}
         header={intl.formatMessage(
-          { id: "dialogs.edit_entity_title" },
+          { id: "dialogs.edit_entity_count_title" },
           {
             count: props?.selected?.length ?? 1,
             singularEntity: intl.formatMessage({ id: "scene" }),
@@ -258,6 +154,7 @@ export const EditScenesDialog: React.FC<IListOperationProps> = (
           onClick: onSave,
           text: intl.formatMessage({ id: "actions.apply" }),
         }}
+        disabled={isUpdating || !!dateError}
         cancel={{
           onClick: () => props.onClose(false),
           text: intl.formatMessage({ id: "actions.cancel" }),
@@ -266,62 +163,121 @@ export const EditScenesDialog: React.FC<IListOperationProps> = (
         isRunning={isUpdating}
       >
         <Form>
-          <Form.Group controlId="rating" as={Row}>
-            {FormUtils.renderLabel({
-              title: intl.formatMessage({ id: "rating" }),
-            })}
-            <Col xs={9}>
-              <RatingSystem
-                value={rating100}
-                onSetRating={(value) => setRating(value ?? undefined)}
-                disabled={isUpdating}
-              />
-            </Col>
-          </Form.Group>
-          <Form.Group controlId="studio" as={Row}>
-            {FormUtils.renderLabel({
-              title: intl.formatMessage({ id: "studio" }),
-            })}
-            <Col xs={9}>
-              <StudioSelect
-                onSelect={(items) =>
-                  setStudioId(items.length > 0 ? items[0]?.id : undefined)
-                }
-                ids={studioId ? [studioId] : []}
-                isDisabled={isUpdating}
-                menuPortalTarget={document.body}
-              />
-            </Col>
-          </Form.Group>
+          <BulkUpdateFormGroup name="rating">
+            <RatingSystem
+              value={updateInput.rating100}
+              onSetRating={(value) =>
+                setUpdateField({ rating100: value ?? undefined })
+              }
+              disabled={isUpdating}
+            />
+          </BulkUpdateFormGroup>
 
-          <Form.Group controlId="performers">
-            <Form.Label>
-              <FormattedMessage id="performers" />
-            </Form.Label>
-            {renderMultiSelect("performers", performerIds)}
-          </Form.Group>
+          <BulkUpdateFormGroup name="scene_code">
+            <BulkUpdateTextInput
+              value={updateInput.code}
+              valueChanged={(newValue) => setUpdateField({ code: newValue })}
+              unsetDisabled={unsetDisabled}
+            />
+          </BulkUpdateFormGroup>
 
-          <Form.Group controlId="tags">
-            <Form.Label>
-              <FormattedMessage id="tags" />
-            </Form.Label>
-            {renderMultiSelect("tags", tagIds)}
-          </Form.Group>
+          <BulkUpdateFormGroup name="date">
+            <BulkUpdateDateInput
+              value={updateInput.date}
+              valueChanged={(newValue) => setUpdateField({ date: newValue })}
+              unsetDisabled={unsetDisabled}
+              error={dateError}
+            />
+          </BulkUpdateFormGroup>
 
-          <Form.Group controlId="groups">
-            <Form.Label>
-              <FormattedMessage id="groups" />
-            </Form.Label>
-            {renderMultiSelect("groups", groupIds)}
-          </Form.Group>
+          <BulkUpdateFormGroup name="director">
+            <BulkUpdateTextInput
+              value={updateInput.director}
+              valueChanged={(newValue) =>
+                setUpdateField({ director: newValue })
+              }
+              unsetDisabled={unsetDisabled}
+            />
+          </BulkUpdateFormGroup>
+
+          <BulkUpdateFormGroup name="studio">
+            <StudioSelect
+              onSelect={(items) =>
+                setUpdateField({
+                  studio_id: items.length > 0 ? items[0]?.id : undefined,
+                })
+              }
+              ids={updateInput.studio_id ? [updateInput.studio_id] : []}
+              isDisabled={isUpdating}
+              menuPortalTarget={document.body}
+            />
+          </BulkUpdateFormGroup>
+
+          <BulkUpdateFormGroup name="performers" inline={false}>
+            <MultiSet
+              type={"performers"}
+              disabled={isUpdating}
+              onUpdate={(itemIDs) => {
+                setPerformerIds((c) => ({ ...c, ids: itemIDs }));
+              }}
+              onSetMode={(newMode) => {
+                setPerformerIds((c) => ({ ...c, mode: newMode }));
+              }}
+              ids={performerIds.ids ?? []}
+              existingIds={aggregateState.performerIds}
+              mode={performerIds.mode}
+              menuPortalTarget={document.body}
+            />
+          </BulkUpdateFormGroup>
+
+          <BulkUpdateFormGroup name="groups" inline={false}>
+            <MultiSet
+              type={"groups"}
+              disabled={isUpdating}
+              onUpdate={(itemIDs) => {
+                setGroupIds((c) => ({ ...c, ids: itemIDs }));
+              }}
+              onSetMode={(newMode) => {
+                setGroupIds((c) => ({ ...c, mode: newMode }));
+              }}
+              ids={groupIds.ids ?? []}
+              existingIds={aggregateState.groupIds}
+              mode={groupIds.mode}
+              menuPortalTarget={document.body}
+            />
+          </BulkUpdateFormGroup>
+
+          <BulkUpdateFormGroup name="tags" inline={false}>
+            <MultiSet
+              type={"tags"}
+              disabled={isUpdating}
+              onUpdate={(itemIDs) => {
+                setTagIds((c) => ({ ...c, ids: itemIDs }));
+              }}
+              onSetMode={(newMode) => {
+                setTagIds((c) => ({ ...c, mode: newMode }));
+              }}
+              ids={tagIds.ids ?? []}
+              existingIds={aggregateState.tagIds}
+              mode={tagIds.mode}
+              menuPortalTarget={document.body}
+            />
+          </BulkUpdateFormGroup>
+
+          <BulkUpdateFormGroup name="details" inline={false}>
+            <BulkUpdateTextInput
+              value={updateInput.details}
+              valueChanged={(newValue) => setUpdateField({ details: newValue })}
+              unsetDisabled={unsetDisabled}
+              as="textarea"
+            />
+          </BulkUpdateFormGroup>
 
           <Form.Group controlId="organized">
-            <Form.Check
-              type="checkbox"
+            <IndeterminateCheckbox
               label={intl.formatMessage({ id: "organized" })}
-              checked={organized}
-              ref={checkboxRef}
-              onChange={() => cycleOrganized()}
+              setChecked={(checked) => setUpdateField({ organized: checked })}
+              checked={updateInput.organized ?? undefined}
             />
           </Form.Group>
         </Form>
diff --git a/ui/v2.5/src/components/Shared/BulkUpdate.tsx b/ui/v2.5/src/components/Shared/BulkUpdate.tsx
new file mode 100644
index 000000000..8a1b7c884
--- /dev/null
+++ b/ui/v2.5/src/components/Shared/BulkUpdate.tsx
@@ -0,0 +1,89 @@
+import { faBan } from "@fortawesome/free-solid-svg-icons";
+import React from "react";
+import {
+  Button,
+  Col,
+  Form,
+  FormControlProps,
+  InputGroup,
+  Row,
+} from "react-bootstrap";
+import { FormattedMessage, useIntl } from "react-intl";
+import { Icon } from "./Icon";
+import * as FormUtils from "src/utils/form";
+
+interface IBulkUpdateTextInputProps extends Omit<FormControlProps, "value"> {
+  valueChanged: (value: string | null | undefined) => void;
+  value: string | null | undefined;
+  unsetDisabled?: boolean;
+  as?: React.ElementType;
+}
+
+export const BulkUpdateTextInput: React.FC<IBulkUpdateTextInputProps> = ({
+  valueChanged,
+  unsetDisabled,
+  ...props
+}) => {
+  const intl = useIntl();
+
+  const value = props.value === null ? "" : props.value ?? undefined;
+  const unset = value === undefined;
+
+  const placeholderValue = unset
+    ? `<${intl.formatMessage({ id: "existing_value" })}>`
+    : value === ""
+    ? `<${intl.formatMessage({ id: "empty_value" })}>`
+    : undefined;
+
+  return (
+    <InputGroup className="bulk-update-text-input">
+      <Form.Control
+        {...props}
+        className="text-input"
+        type="text"
+        as={props.as}
+        value={value ?? ""}
+        placeholder={placeholderValue}
+        onChange={(event) => valueChanged(event.currentTarget.value)}
+      />
+      <InputGroup.Append>
+        {!unsetDisabled ? (
+          <Button
+            variant="secondary"
+            onClick={() => valueChanged(undefined)}
+            title={intl.formatMessage({ id: "actions.unset" })}
+            disabled={unset}
+          >
+            <Icon icon={faBan} />
+          </Button>
+        ) : undefined}
+      </InputGroup.Append>
+    </InputGroup>
+  );
+};
+
+export const BulkUpdateFormGroup: React.FC<{
+  name: string;
+  messageId?: string;
+  inline?: boolean;
+}> = ({ name, messageId = name, inline = true, children }) => {
+  if (inline) {
+    return (
+      <Form.Group controlId={name} data-field={name} as={Row}>
+        {FormUtils.renderLabel({
+          title: <FormattedMessage id={messageId} />,
+        })}
+        <Col xs={9}>{children}</Col>
+      </Form.Group>
+    );
+  }
+
+  return (
+    <Form.Group controlId={name} data-field={name}>
+      <Form.Label>
+        <FormattedMessage id={messageId} />
+      </Form.Label>
+      {children}
+    </Form.Group>
+  );
+};
diff --git a/ui/v2.5/src/components/Shared/BulkUpdateTextInput.tsx b/ui/v2.5/src/components/Shared/BulkUpdateTextInput.tsx
deleted file mode 100644
index cf78798e1..000000000
--- a/ui/v2.5/src/components/Shared/BulkUpdateTextInput.tsx
+++ /dev/null
@@ -1,48 +0,0 @@
-import { faBan } from "@fortawesome/free-solid-svg-icons";
-import React from "react";
-import { Button, Form, FormControlProps, InputGroup } from "react-bootstrap";
-import { useIntl } from "react-intl";
-import { Icon } from "./Icon";
-
-interface IBulkUpdateTextInputProps extends FormControlProps {
-  valueChanged: (value: string | undefined) => void;
-  unsetDisabled?: boolean;
-  as?: React.ElementType;
-}
-
-export const BulkUpdateTextInput: React.FC<IBulkUpdateTextInputProps> = ({
-  valueChanged,
-  unsetDisabled,
-  ...props
-}) => {
-  const intl = useIntl();
-
-  const unsetClassName = props.value === undefined ? "unset" : "";
-
-  return (
-    <InputGroup className={`bulk-update-text-input ${unsetClassName}`}>
-      <Form.Control
-        {...props}
-        className="input-control"
-        type="text"
-        as={props.as}
-        value={props.value ?? ""}
-        placeholder={
-          props.value === undefined
-            ? `<${intl.formatMessage({ id: "existing_value" })}>`
-            : undefined
-        }
-        onChange={(event) => valueChanged(event.currentTarget.value)}
-      />
-      {!unsetDisabled ? (
-        <Button
-          variant="secondary"
-          onClick={() => valueChanged(undefined)}
-          title={intl.formatMessage({ id: "actions.unset" })}
-        >
-          <Icon icon={faBan} />
-        </Button>
-      ) : undefined}
-    </InputGroup>
-  );
-};
diff --git a/ui/v2.5/src/components/Shared/DateInput.tsx b/ui/v2.5/src/components/Shared/DateInput.tsx
index 15a0f1123..4bb39ac39 100644
--- a/ui/v2.5/src/components/Shared/DateInput.tsx
+++ b/ui/v2.5/src/components/Shared/DateInput.tsx
@@ -8,14 +8,20 @@ import { Icon } from "./Icon";
 import "react-datepicker/dist/react-datepicker.css";
 import { useIntl } from "react-intl";
 import { PatchComponent } from "src/patch";
+import { faBan, faTimes } from "@fortawesome/free-solid-svg-icons";
 
 interface IProps {
+  groupClassName?: string;
+  className?: string;
   disabled?: boolean;
   value: string;
   isTime?: boolean;
   onValueChange(value: string): void;
   placeholder?: string;
+  placeholderOverride?: string;
   error?: string;
+  appendBefore?: React.ReactNode;
+  appendAfter?: React.ReactNode;
 }
 
 const ShowPickerButton = forwardRef<
@@ -32,6 +38,11 @@ const ShowPickerButton = forwardRef<
 const _DateInput: React.FC<IProps> = (props: IProps) => {
   const intl = useIntl();
 
+  const {
+    groupClassName = "date-input-group",
+    className = "date-input text-input",
+  } = props;
+
   const date = useMemo(() => {
     const toDate = props.isTime
       ? TextUtils.stringToFuzzyDateTime
@@ -70,34 +81,108 @@ const _DateInput: React.FC<IProps> = (props: IProps) => {
     }
   }
 
-  const placeholderText = intl.formatMessage({
+  const formatHint = intl.formatMessage({
     id: props.isTime ? "datetime_format" : "date_format",
   });
 
+  const placeholderText = props.placeholder
+    ? `${props.placeholder} (${formatHint})`
+    : formatHint;
+
   return (
-    <div>
-      <InputGroup hasValidation>
-        <Form.Control
-          className="date-input text-input"
-          disabled={props.disabled}
-          value={props.value}
-          onChange={(e) => props.onValueChange(e.currentTarget.value)}
-          placeholder={
-            !props.disabled
-              ? props.placeholder
-                ? `${props.placeholder} (${placeholderText})`
-                : placeholderText
-              : undefined
-          }
-          isInvalid={!!props.error}
-        />
-        <InputGroup.Append>{maybeRenderButton()}</InputGroup.Append>
-        <Form.Control.Feedback type="invalid">
-          {props.error}
-        </Form.Control.Feedback>
-      </InputGroup>
-    </div>
+    <InputGroup hasValidation className={groupClassName}>
+      <Form.Control
+        className={className}
+        disabled={props.disabled}
+        value={props.value}
+        onChange={(e) => props.onValueChange(e.currentTarget.value)}
+        placeholder={
+          !props.disabled
+            ? props.placeholderOverride ?? placeholderText
+            : undefined
+        }
+        isInvalid={!!props.error}
+      />
+      <InputGroup.Append>
+        {props.appendBefore}
+        {maybeRenderButton()}
+        {props.appendAfter}
+      </InputGroup.Append>
+      <Form.Control.Feedback type="invalid">
+        {props.error}
+      </Form.Control.Feedback>
+    </InputGroup>
   );
 };
 
 export const DateInput = PatchComponent("DateInput", _DateInput);
+
+interface IBulkUpdateDateInputProps
+  extends Omit<IProps, "onValueChange" | "value"> {
+  value: string | null | undefined;
+  valueChanged: (value: string | null | undefined) => void;
+  unsetDisabled?: boolean;
+  as?: React.ElementType;
+  error?: string;
+}
+
+export const BulkUpdateDateInput: React.FC<IBulkUpdateDateInputProps> = ({
+  valueChanged,
+  unsetDisabled,
+  ...props
+}) => {
+  const intl = useIntl();
+
+  const unset = props.value === undefined;
+
+  const unsetButton = !unsetDisabled ? (
+    <Button
+      variant="secondary"
+      onClick={() => valueChanged(undefined)}
+      title={intl.formatMessage({ id: "actions.unset" })}
+      disabled={unset}
+    >
+      <Icon icon={faBan} />
+    </Button>
+  ) : undefined;
+
+  const clearButton =
+    props.value !== null ? (
+      <Button
+        className="minimal"
+        variant="secondary"
+        onClick={() => valueChanged(null)}
+        title={intl.formatMessage({ id: "actions.clear" })}
+      >
+        <Icon icon={faTimes} />
+      </Button>
+    ) : undefined;
+
+  const placeholderValue =
+    props.value === null
+      ? `<${intl.formatMessage({ id: "empty_value" })}>`
+      : props.value === undefined
+      ? `<${intl.formatMessage({ id: "existing_value" })}>`
+      : undefined;
+
+  function outValue(v: string | undefined) {
+    if (v === "") {
+      return null;
+    }
+
+    return v;
+  }
+
+  return (
+    <DateInput
+      {...props}
+      value={props.value ?? ""}
+      placeholderOverride={placeholderValue}
+      onValueChange={(v) => valueChanged(outValue(v))}
+      groupClassName="bulk-update-date-input"
+      className="date-input text-input"
+      appendBefore={clearButton}
+      appendAfter={unsetButton}
+    />
+  );
+};
diff --git a/ui/v2.5/src/components/Shared/MultiSet.tsx b/ui/v2.5/src/components/Shared/MultiSet.tsx
index 6be85b8b3..8f16bd716 100644
--- a/ui/v2.5/src/components/Shared/MultiSet.tsx
+++ b/ui/v2.5/src/components/Shared/MultiSet.tsx
@@ -12,9 +12,10 @@ import { PerformerIDSelect } from "../Performers/PerformerSelect";
 import { StudioIDSelect } from "../Studios/StudioSelect";
 import { TagIDSelect } from "../Tags/TagSelect";
 import { GroupIDSelect } from "../Groups/GroupSelect";
+import { SceneIDSelect } from "../Scenes/SceneSelect";
 
 interface IMultiSetProps {
-  type: "performers" | "studios" | "tags" | "groups" | "galleries";
+  type: "performers" | "studios" | "tags" | "groups" | "galleries" | "scenes";
   existingIds?: string[];
   ids?: string[];
   mode: GQL.BulkUpdateIdMode;
@@ -89,6 +90,17 @@ const Select: React.FC<IMultiSetProps> = (props) => {
           menuPortalTarget={props.menuPortalTarget}
         />
       );
+    case "scenes":
+      return (
+        <SceneIDSelect
+          isDisabled={disabled}
+          isMulti
+          isClearable={false}
+          onSelect={onUpdate}
+          ids={props.ids ?? []}
+          menuPortalTarget={props.menuPortalTarget}
+        />
+      );
     default:
       return (
         <FilterSelect
diff --git a/ui/v2.5/src/components/Shared/styles.scss b/ui/v2.5/src/components/Shared/styles.scss
index 61226df49..709712231 100644
--- a/ui/v2.5/src/components/Shared/styles.scss
+++ b/ui/v2.5/src/components/Shared/styles.scss
@@ -494,30 +494,10 @@ button.collapse-button {
   }
 }
 
-.bulk-update-text-input {
-  button {
-    background-color: $secondary;
-    color: $text-muted;
-    font-size: $btn-font-size-sm;
-    margin: $btn-padding-y $btn-padding-x;
-    padding: 0;
-    position: absolute;
-    right: 0;
-    z-index: 4;
-
-    &:hover,
-    &:focus,
-    &:active,
-    &:not(:disabled):not(.disabled):active,
-    &:not(:disabled):not(.disabled):active:focus {
-      background-color: $secondary;
-      border-color: transparent;
-      box-shadow: none;
-    }
-  }
-
-  &.unset button {
-    visibility: hidden;
+.bulk-update-date-input {
+  .react-datepicker-wrapper .btn {
+    border-bottom-right-radius: 0;
+    border-top-right-radius: 0;
   }
 }
 
@@ -1268,3 +1248,8 @@ input[type="range"].double-range-slider-max {
   margin-left: 0.25rem;
   padding: 0 0.25rem;
 }
+
+// general styling for appended minimal button to input group
+.text-input + .input-group-append .btn.minimal {
+  background-color: $textfield-bg;
+}
diff --git a/ui/v2.5/src/components/Studios/EditStudiosDialog.tsx b/ui/v2.5/src/components/Studios/EditStudiosDialog.tsx
index 1c34dfc36..72fcb3f71 100644
--- a/ui/v2.5/src/components/Studios/EditStudiosDialog.tsx
+++ b/ui/v2.5/src/components/Studios/EditStudiosDialog.tsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useMemo, useState } from "react";
-import { Col, Form, Row } from "react-bootstrap";
-import { FormattedMessage, useIntl } from "react-intl";
+import { Form } from "react-bootstrap";
+import { useIntl } from "react-intl";
 import { useBulkStudioUpdate } from "src/core/StashService";
 import * as GQL from "src/core/generated-graphql";
 import { ModalComponent } from "../Shared/Modal";
@@ -13,9 +13,8 @@ import {
   getAggregateStateObject,
 } from "src/utils/bulkUpdate";
 import { IndeterminateCheckbox } from "../Shared/IndeterminateCheckbox";
-import { BulkUpdateTextInput } from "../Shared/BulkUpdateTextInput";
+import { BulkUpdateFormGroup, BulkUpdateTextInput } from "../Shared/BulkUpdate";
 import { faPencilAlt } from "@fortawesome/free-solid-svg-icons";
-import * as FormUtils from "src/utils/form";
 import { StudioSelect } from "../Shared/Select";
 
 interface IListOperationProps {
@@ -47,6 +46,8 @@ export const EditStudiosDialog: React.FC<IListOperationProps> = (
     mode: GQL.BulkUpdateIdMode.Add,
   });
 
+  const unsetDisabled = props.selected.length < 2;
+
   const [updateStudios] = useBulkStudioUpdate();
 
   // Network state
@@ -126,27 +127,6 @@ export const EditStudiosDialog: React.FC<IListOperationProps> = (
     setIsUpdating(false);
   }
 
-  function renderTextField(
-    name: string,
-    value: string | undefined | null,
-    setter: (newValue: string | undefined) => void,
-    area: boolean = false
-  ) {
-    return (
-      <Form.Group controlId={name}>
-        <Form.Label>
-          <FormattedMessage id={name} />
-        </Form.Label>
-        <BulkUpdateTextInput
-          value={value === null ? "" : value ?? undefined}
-          valueChanged={(newValue) => setter(newValue)}
-          unsetDisabled={props.selected.length < 2}
-          as={area ? "textarea" : undefined}
-        />
-      </Form.Group>
-    );
-  }
-
   function render() {
     return (
       <ModalComponent
@@ -154,8 +134,12 @@ export const EditStudiosDialog: React.FC<IListOperationProps> = (
         show
         icon={faPencilAlt}
         header={intl.formatMessage(
-          { id: "actions.edit_entity" },
-          { entityType: intl.formatMessage({ id: "studios" }) }
+          { id: "dialogs.edit_entity_count_title" },
+          {
+            count: props?.selected?.length ?? 1,
+            singularEntity: intl.formatMessage({ id: "studio" }),
+            pluralEntity: intl.formatMessage({ id: "studios" }),
+          }
         )}
         accept={{
           onClick: onSave,
@@ -168,11 +152,8 @@ export const EditStudiosDialog: React.FC<IListOperationProps> = (
         }}
         isRunning={isUpdating}
       >
-        <Form.Group controlId="parent-studio" as={Row}>
-          {FormUtils.renderLabel({
-            title: intl.formatMessage({ id: "parent_studio" }),
-          })}
-          <Col xs={9}>
+        <Form>
+          <BulkUpdateFormGroup name="parent-studio" messageId="parent_studio">
             <StudioSelect
               onSelect={(items) =>
                 setUpdateField({
@@ -183,13 +164,8 @@ export const EditStudiosDialog: React.FC<IListOperationProps> = (
               isDisabled={isUpdating}
               menuPortalTarget={document.body}
             />
-          </Col>
-        </Form.Group>
-        <Form.Group controlId="rating" as={Row}>
-          {FormUtils.renderLabel({
-            title: intl.formatMessage({ id: "rating" }),
-          })}
-          <Col xs={9}>
+          </BulkUpdateFormGroup>
+          <BulkUpdateFormGroup name="rating">
             <RatingSystem
               value={updateInput.rating100}
               onSetRating={(value) =>
@@ -197,9 +173,8 @@ export const EditStudiosDialog: React.FC<IListOperationProps> = (
               }
               disabled={isUpdating}
             />
-          </Col>
-        </Form.Group>
-        <Form>
+          </BulkUpdateFormGroup>
+
           <Form.Group controlId="favorite">
             <IndeterminateCheckbox
               setChecked={(checked) => setUpdateField({ favorite: checked })}
@@ -208,30 +183,31 @@ export const EditStudiosDialog: React.FC<IListOperationProps> = (
             />
           </Form.Group>
 
-          <Form.Group controlId="tags">
-            <Form.Label>
-              <FormattedMessage id="tags" />
-            </Form.Label>
+          <BulkUpdateFormGroup name="tags" inline={false}>
             <MultiSet
-              type="tags"
+              type={"tags"}
               disabled={isUpdating}
-              onUpdate={(itemIDs) => setTagIds((v) => ({ ...v, ids: itemIDs }))}
-              onSetMode={(newMode) =>
-                setTagIds((v) => ({ ...v, mode: newMode }))
-              }
-              existingIds={aggregateState.tagIds ?? []}
+              onUpdate={(itemIDs) => {
+                setTagIds((c) => ({ ...c, ids: itemIDs }));
+              }}
+              onSetMode={(newMode) => {
+                setTagIds((c) => ({ ...c, mode: newMode }));
+              }}
               ids={tagIds.ids ?? []}
+              existingIds={aggregateState.tagIds}
               mode={tagIds.mode}
               menuPortalTarget={document.body}
             />
-          </Form.Group>
+          </BulkUpdateFormGroup>
 
-          {renderTextField(
-            "details",
-            updateInput.details,
-            (newValue) => setUpdateField({ details: newValue }),
-            true
-          )}
+          <BulkUpdateFormGroup name="details" inline={false}>
+            <BulkUpdateTextInput
+              value={updateInput.details}
+              valueChanged={(newValue) => setUpdateField({ details: newValue })}
+              unsetDisabled={unsetDisabled}
+              as="textarea"
+            />
+          </BulkUpdateFormGroup>
 
           <Form.Group controlId="ignore-auto-tags">
             <IndeterminateCheckbox
diff --git a/ui/v2.5/src/components/Tags/EditTagsDialog.tsx b/ui/v2.5/src/components/Tags/EditTagsDialog.tsx
index 896016098..9b3dc0660 100644
--- a/ui/v2.5/src/components/Tags/EditTagsDialog.tsx
+++ b/ui/v2.5/src/components/Tags/EditTagsDialog.tsx
@@ -11,7 +11,7 @@ import {
   getAggregateStateObject,
 } from "src/utils/bulkUpdate";
 import { IndeterminateCheckbox } from "../Shared/IndeterminateCheckbox";
-import { BulkUpdateTextInput } from "../Shared/BulkUpdateTextInput";
+import { BulkUpdateFormGroup, BulkUpdateTextInput } from "../Shared/BulkUpdate";
 import { faPencilAlt } from "@fortawesome/free-solid-svg-icons";
 
 function Tags(props: {
@@ -85,6 +85,8 @@ export const EditTagsDialog: React.FC<IListOperationProps> = (
 
   const [updateInput, setUpdateInput] = useState<GQL.BulkTagUpdateInput>({});
 
+  const unsetDisabled = props.selected.length < 2;
+
   const [updateTags] = useBulkTagUpdate(getTagInput());
 
   // Network state
@@ -153,33 +155,18 @@ export const EditTagsDialog: React.FC<IListOperationProps> = (
     setUpdateInput(updateState);
   }, [props.selected]);
 
-  function renderTextField(
-    name: string,
-    value: string | undefined | null,
-    setter: (newValue: string | undefined) => void
-  ) {
-    return (
-      <Form.Group controlId={name}>
-        <Form.Label>
-          <FormattedMessage id={name} />
-        </Form.Label>
-        <BulkUpdateTextInput
-          value={value === null ? "" : value ?? undefined}
-          valueChanged={(newValue) => setter(newValue)}
-          unsetDisabled={props.selected.length < 2}
-        />
-      </Form.Group>
-    );
-  }
-
   return (
     <ModalComponent
       dialogClassName="edit-tags-dialog"
       show
       icon={faPencilAlt}
       header={intl.formatMessage(
-        { id: "actions.edit_entity" },
-        { entityType: intl.formatMessage({ id: "tags" }) }
+        { id: "dialogs.edit_entity_count_title" },
+        {
+          count: props?.selected?.length ?? 1,
+          singularEntity: intl.formatMessage({ id: "tag" }),
+          pluralEntity: intl.formatMessage({ id: "tags" }),
+        }
       )}
       accept={{
         onClick: onSave,
@@ -201,9 +188,16 @@ export const EditTagsDialog: React.FC<IListOperationProps> = (
           />
         </Form.Group>
 
-        {renderTextField("description", updateInput.description, (v) =>
-          setUpdateField({ description: v })
-        )}
+        <BulkUpdateFormGroup name="description" inline={false}>
+          <BulkUpdateTextInput
+            value={updateInput.description}
+            valueChanged={(newValue) =>
+              setUpdateField({ description: newValue })
+            }
+            unsetDisabled={unsetDisabled}
+            as="textarea"
+          />
+        </BulkUpdateFormGroup>
 
         <Tags
           isUpdating={isUpdating}
diff --git a/ui/v2.5/src/core/StashService.ts b/ui/v2.5/src/core/StashService.ts
index ac23d59e0..bfd76f7ee 100644
--- a/ui/v2.5/src/core/StashService.ts
+++ b/ui/v2.5/src/core/StashService.ts
@@ -625,9 +625,8 @@ export const useSceneUpdate = () =>
     },
   });
 
-export const useBulkSceneUpdate = (input: GQL.BulkSceneUpdateInput) =>
+export const useBulkSceneUpdate = () =>
   GQL.useBulkSceneUpdateMutation({
-    variables: { input },
     update(cache, result) {
       if (!result.data?.bulkSceneUpdate) return;
 
@@ -1403,9 +1402,8 @@ export const useGroupUpdate = () =>
     },
   });
 
-export const useBulkGroupUpdate = (input: GQL.BulkGroupUpdateInput) =>
+export const useBulkGroupUpdate = () =>
   GQL.useBulkGroupUpdateMutation({
-    variables: { input },
     update(cache, result) {
       if (!result.data?.bulkGroupUpdate) return;
 
diff --git a/ui/v2.5/src/locales/en-GB.json b/ui/v2.5/src/locales/en-GB.json
index 7b4091f8b..3c3fd4f28 100644
--- a/ui/v2.5/src/locales/en-GB.json
+++ b/ui/v2.5/src/locales/en-GB.json
@@ -985,6 +985,7 @@
     "delete_object_title": "Delete {count, plural, one {{singularEntity}} other {{pluralEntity}}}",
     "dont_show_until_updated": "Don't show until next update",
     "edit_entity_title": "Edit {count, plural, one {{singularEntity}} other {{pluralEntity}}}",
+    "edit_entity_count_title": "Edit {count} {count, plural, one {{singularEntity}} other {{pluralEntity}}}",
     "export_include_related_objects": "Include related objects in export",
     "export_title": "Export",
     "imagewall": {
@@ -1147,6 +1148,7 @@
     "warmth": "Warmth"
   },
   "empty_server": "Add some scenes to your server to view recommendations on this page.",
+  "empty_value": "empty",
   "errors": {
     "custom_fields": {
       "duplicate_field": "Field name must be unique",
diff --git a/ui/v2.5/src/utils/bulkUpdate.ts b/ui/v2.5/src/utils/bulkUpdate.ts
index 1ded76c27..c667b231b 100644
--- a/ui/v2.5/src/utils/bulkUpdate.ts
+++ b/ui/v2.5/src/utils/bulkUpdate.ts
@@ -81,6 +81,11 @@ export function getAggregateTagIds(state: { tags: IHasID[] }[]) {
   return getAggregateIds(sortedLists);
 }
 
+export function getAggregateSceneIds(state: { scenes: IHasID[] }[]) {
+  const sortedLists = state.map((o) => o.scenes.map((oo) => oo.id).sort());
+  return getAggregateIds(sortedLists);
+}
+
 interface IGroup {
   group: IHasID;
 }
diff --git a/ui/v2.5/src/utils/form.tsx b/ui/v2.5/src/utils/form.tsx
index fbf239a9b..7c804e221 100644
--- a/ui/v2.5/src/utils/form.tsx
+++ b/ui/v2.5/src/utils/form.tsx
@@ -33,7 +33,7 @@ function getLabelProps(labelProps?: FormLabelProps) {
 }
 
 export function renderLabel(options: {
-  title: string;
+  title: React.ReactNode;
   labelProps?: FormLabelProps;
 }) {
   return (
diff --git a/ui/v2.5/src/utils/yup.ts b/ui/v2.5/src/utils/yup.ts
index a9c4f69e1..912886858 100644
--- a/ui/v2.5/src/utils/yup.ts
+++ b/ui/v2.5/src/utils/yup.ts
@@ -92,6 +92,37 @@ export function yupUniqueStringList(intl: IntlShape) {
     });
 }
 
+export function validateDateString(value?: string) {
+  if (!value) return true;
+  // Allow YYYY, YYYY-MM, or YYYY-MM-DD formats
+  if (!value.match(/^\d{4}(-\d{2}(-\d{2})?)?$/)) return false;
+  // Validate the date components
+  const parts = value.split("-");
+  const year = parseInt(parts[0], 10);
+  if (year < 1 || year > 9999) return false;
+  if (parts.length >= 2) {
+    const month = parseInt(parts[1], 10);
+    if (month < 1 || month > 12) return false;
+  }
+  if (parts.length === 3) {
+    const day = parseInt(parts[2], 10);
+    if (day < 1 || day > 31) return false;
+    // Full date - validate it parses correctly
+    if (Number.isNaN(Date.parse(value))) return false;
+  }
+  return true;
+}
+
+export function getDateError(
+  value: string | undefined | null,
+  intl: IntlShape
+) {
+  if (validateDateString(value ?? "")) return undefined;
+  return intl
+    .formatMessage({ id: "validation.date_invalid_form" })
+    .replace("${path}", intl.formatMessage({ id: "date" }));
+}
+
 export function yupDateString(intl: IntlShape) {
   return yup
     .string()
@@ -99,24 +130,7 @@ export function yupDateString(intl: IntlShape) {
     .test({
       name: "date",
       test(value) {
-        if (!value) return true;
-        // Allow YYYY, YYYY-MM, or YYYY-MM-DD formats
-        if (!value.match(/^\d{4}(-\d{2}(-\d{2})?)?$/)) return false;
-        // Validate the date components
-        const parts = value.split("-");
-        const year = parseInt(parts[0], 10);
-        if (year < 1 || year > 9999) return false;
-        if (parts.length >= 2) {
-          const month = parseInt(parts[1], 10);
-          if (month < 1 || month > 12) return false;
-        }
-        if (parts.length === 3) {
-          const day = parseInt(parts[2], 10);
-          if (day < 1 || day > 31) return false;
-          // Full date - validate it parses correctly
-          if (Number.isNaN(Date.parse(value))) return false;
-        }
-        return true;
+        return validateDateString(value);
       },
       message: intl.formatMessage({ id: "validation.date_invalid_form" }),
     });

From b4fab0ac48732b3e3cb20d571f6fd8a0edac120d Mon Sep 17 00:00:00 2001
From: Gykes <24581046+Gykes@users.noreply.github.com>
Date: Sun, 15 Mar 2026 17:34:57 -0700
Subject: [PATCH 350/405] Add parent tag hierarchy support to tag tagger
 (#6620)

---
 graphql/schema/types/scraper.graphql          |   1 +
 graphql/stash-box/query.graphql               |   5 +
 internal/manager/manager_tasks.go             |   6 +-
 internal/manager/task_stash_box_tag.go        |  42 ++-
 pkg/match/scraped.go                          |  14 +
 pkg/models/model_scraped_item.go              |  28 +-
 pkg/stashbox/graphql/generated_client.go      | 215 ++++++++++++-
 pkg/stashbox/tag.go                           |   7 +
 ui/v2.5/graphql/data/scrapers.graphql         |   5 +
 ui/v2.5/src/components/Shared/BatchModals.tsx | 242 ++++++++++++++
 ui/v2.5/src/components/Tagger/constants.ts    |   4 +-
 .../Tagger/studios/StudioTagger.tsx           | 266 ++--------------
 ui/v2.5/src/components/Tagger/styles.scss     |   6 +-
 .../Tagger/tags/StashSearchResult.tsx         |  59 +++-
 .../src/components/Tagger/tags/TagModal.tsx   | 150 ++++++++-
 .../src/components/Tagger/tags/TagTagger.tsx  | 295 +++++-------------
 ui/v2.5/src/locales/en-GB.json                |   6 +
 17 files changed, 867 insertions(+), 484 deletions(-)
 create mode 100644 ui/v2.5/src/components/Shared/BatchModals.tsx

diff --git a/graphql/schema/types/scraper.graphql b/graphql/schema/types/scraper.graphql
index b8810aa79..fafd928f7 100644
--- a/graphql/schema/types/scraper.graphql
+++ b/graphql/schema/types/scraper.graphql
@@ -73,6 +73,7 @@ type ScrapedTag {
   name: String!
   description: String
   alias_list: [String!]
+  parent: ScrapedTag
   "Remote site ID, if applicable"
   remote_site_id: String
 }
diff --git a/graphql/stash-box/query.graphql b/graphql/stash-box/query.graphql
index edd44c835..ebaf05648 100644
--- a/graphql/stash-box/query.graphql
+++ b/graphql/stash-box/query.graphql
@@ -31,6 +31,11 @@ fragment TagFragment on Tag {
   id
   description
   aliases
+  category {
+    id
+    name
+    description
+  }
 }
 
 fragment MeasurementsFragment on Measurements {
diff --git a/internal/manager/manager_tasks.go b/internal/manager/manager_tasks.go
index c9e840519..e3529c0b8 100644
--- a/internal/manager/manager_tasks.go
+++ b/internal/manager/manager_tasks.go
@@ -431,7 +431,7 @@ type StashBoxBatchTagInput struct {
 	ExcludeFields []string `json:"exclude_fields"`
 	// Refresh items already tagged by StashBox if true. Only tag items with no StashBox tagging if false
 	Refresh bool `json:"refresh"`
-	// If batch adding studios, should their parent studios also be created?
+	// If batch adding studios or tags, should their parent entities also be created?
 	CreateParent bool `json:"createParent"`
 	// IDs in stash of the items to update.
 	// If set, names and stash_ids fields will be ignored.
@@ -749,6 +749,7 @@ func (s *Manager) batchTagTagsByIds(ctx context.Context, input StashBoxBatchTagI
 				if (input.Refresh && hasStashID) || (!input.Refresh && !hasStashID) {
 					tasks = append(tasks, &stashBoxBatchTagTagTask{
 						tag:            t,
+						createParent:   input.CreateParent,
 						box:            box,
 						excludedFields: input.ExcludeFields,
 					})
@@ -769,6 +770,7 @@ func (s *Manager) batchTagTagsByNamesOrStashIds(input StashBoxBatchTagInput, box
 		if len(stashID) > 0 {
 			tasks = append(tasks, &stashBoxBatchTagTagTask{
 				stashID:        &stashID,
+				createParent:   input.CreateParent,
 				box:            box,
 				excludedFields: input.ExcludeFields,
 			})
@@ -780,6 +782,7 @@ func (s *Manager) batchTagTagsByNamesOrStashIds(input StashBoxBatchTagInput, box
 		if len(name) > 0 {
 			tasks = append(tasks, &stashBoxBatchTagTagTask{
 				name:           &name,
+				createParent:   input.CreateParent,
 				box:            box,
 				excludedFields: input.ExcludeFields,
 			})
@@ -806,6 +809,7 @@ func (s *Manager) batchTagAllTags(ctx context.Context, input StashBoxBatchTagInp
 		for _, t := range tags {
 			tasks = append(tasks, &stashBoxBatchTagTagTask{
 				tag:            t,
+				createParent:   input.CreateParent,
 				box:            box,
 				excludedFields: input.ExcludeFields,
 			})
diff --git a/internal/manager/task_stash_box_tag.go b/internal/manager/task_stash_box_tag.go
index 97c766010..ec17fac06 100644
--- a/internal/manager/task_stash_box_tag.go
+++ b/internal/manager/task_stash_box_tag.go
@@ -541,6 +541,7 @@ type stashBoxBatchTagTagTask struct {
 	name           *string
 	stashID        *string
 	tag            *models.Tag
+	createParent   bool
 	excludedFields []string
 }
 
@@ -630,7 +631,7 @@ func (t *stashBoxBatchTagTagTask) findStashBoxTag(ctx context.Context) (*models.
 	result := results[0]
 
 	if err := r.WithReadTxn(ctx, func(ctx context.Context) error {
-		return match.ScrapedTag(ctx, r.Tag, result, t.box.Endpoint)
+		return match.ScrapedTagHierarchy(ctx, r.Tag, result, t.box.Endpoint)
 	}); err != nil {
 		return nil, err
 	}
@@ -638,6 +639,39 @@ func (t *stashBoxBatchTagTagTask) findStashBoxTag(ctx context.Context) (*models.
 	return result, nil
 }
 
+func (t *stashBoxBatchTagTagTask) processParentTag(ctx context.Context, parent *models.ScrapedTag, excluded map[string]bool) error {
+	if parent.StoredID == nil {
+		// Create new parent tag
+		newParentTag := parent.ToTag(t.box.Endpoint, excluded)
+
+		r := instance.Repository
+		err := r.WithTxn(ctx, func(ctx context.Context) error {
+			qb := r.Tag
+
+			if err := tag.ValidateCreate(ctx, *newParentTag, qb); err != nil {
+				return err
+			}
+
+			if err := qb.Create(ctx, &models.CreateTagInput{Tag: newParentTag}); err != nil {
+				return err
+			}
+
+			storedID := strconv.Itoa(newParentTag.ID)
+			parent.StoredID = &storedID
+			return nil
+		})
+		if err != nil {
+			logger.Errorf("Failed to create parent tag %s: %v", parent.Name, err)
+		} else {
+			logger.Infof("Created parent tag %s", parent.Name)
+		}
+		return err
+	}
+
+	// Parent already exists — nothing to update for categories
+	return nil
+}
+
 func (t *stashBoxBatchTagTagTask) processMatchedTag(ctx context.Context, s *models.ScrapedTag, excluded map[string]bool) {
 	// Determine the tag ID to update — either from the task's tag or from the
 	// StoredID set by match.ScrapedTag (when batch adding by name and the tag
@@ -649,6 +683,12 @@ func (t *stashBoxBatchTagTagTask) processMatchedTag(ctx context.Context, s *mode
 		tagID, _ = strconv.Atoi(*s.StoredID)
 	}
 
+	if s.Parent != nil && t.createParent {
+		if err := t.processParentTag(ctx, s.Parent, excluded); err != nil {
+			return
+		}
+	}
+
 	if tagID > 0 {
 		r := instance.Repository
 		err := r.WithTxn(ctx, func(ctx context.Context) error {
diff --git a/pkg/match/scraped.go b/pkg/match/scraped.go
index d3039f4c6..a6683ff52 100644
--- a/pkg/match/scraped.go
+++ b/pkg/match/scraped.go
@@ -188,6 +188,20 @@ func ScrapedGroup(ctx context.Context, qb GroupNamesFinder, storedID *string, na
 	return
 }
 
+// ScrapedTagHierarchy executes ScrapedTag for the provided tag and its parent.
+func ScrapedTagHierarchy(ctx context.Context, qb models.TagQueryer, s *models.ScrapedTag, stashBoxEndpoint string) error {
+	if err := ScrapedTag(ctx, qb, s, stashBoxEndpoint); err != nil {
+		return err
+	}
+
+	if s.Parent == nil {
+		return nil
+	}
+
+	// Match parent by name only (categories don't have StashDB tag IDs)
+	return ScrapedTag(ctx, qb, s.Parent, "")
+}
+
 // ScrapedTag matches the provided tag with the tags
 // in the database and sets the ID field if one is found.
 func ScrapedTag(ctx context.Context, qb models.TagQueryer, s *models.ScrapedTag, stashBoxEndpoint string) error {
diff --git a/pkg/models/model_scraped_item.go b/pkg/models/model_scraped_item.go
index 1367003cb..1a64d0849 100644
--- a/pkg/models/model_scraped_item.go
+++ b/pkg/models/model_scraped_item.go
@@ -471,11 +471,12 @@ func (p *ScrapedPerformer) ToPartial(endpoint string, excluded map[string]bool,
 
 type ScrapedTag struct {
 	// Set if tag matched
-	StoredID     *string  `json:"stored_id"`
-	Name         string   `json:"name"`
-	Description  *string  `json:"description"`
-	AliasList    []string `json:"alias_list"`
-	RemoteSiteID *string  `json:"remote_site_id"`
+	StoredID     *string     `json:"stored_id"`
+	Name         string      `json:"name"`
+	Description  *string     `json:"description"`
+	AliasList    []string    `json:"alias_list"`
+	RemoteSiteID *string     `json:"remote_site_id"`
+	Parent       *ScrapedTag `json:"parent"`
 }
 
 func (ScrapedTag) IsScrapedContent() {}
@@ -496,6 +497,13 @@ func (t *ScrapedTag) ToTag(endpoint string, excluded map[string]bool) *Tag {
 		ret.Aliases = NewRelatedStrings(t.AliasList)
 	}
 
+	if t.Parent != nil && t.Parent.StoredID != nil {
+		parentID, err := strconv.Atoi(*t.Parent.StoredID)
+		if err == nil && parentID > 0 {
+			ret.ParentIDs = NewRelatedIDs([]int{parentID})
+		}
+	}
+
 	if t.RemoteSiteID != nil && endpoint != "" && *t.RemoteSiteID != "" {
 		ret.StashIDs = NewRelatedStashIDs([]StashID{
 			{
@@ -527,6 +535,16 @@ func (t *ScrapedTag) ToPartial(storedID string, endpoint string, excluded map[st
 		}
 	}
 
+	if t.Parent != nil && t.Parent.StoredID != nil {
+		parentID, err := strconv.Atoi(*t.Parent.StoredID)
+		if err == nil && parentID > 0 {
+			ret.ParentIDs = &UpdateIDs{
+				IDs:  []int{parentID},
+				Mode: RelationshipUpdateModeAdd,
+			}
+		}
+	}
+
 	if t.RemoteSiteID != nil && endpoint != "" && *t.RemoteSiteID != "" {
 		ret.StashIDs = &UpdateStashIDs{
 			StashIDs: existingStashIDs,
diff --git a/pkg/stashbox/graphql/generated_client.go b/pkg/stashbox/graphql/generated_client.go
index acb2202dc..bc9a6ce89 100644
--- a/pkg/stashbox/graphql/generated_client.go
+++ b/pkg/stashbox/graphql/generated_client.go
@@ -128,10 +128,11 @@ func (t *StudioFragment) GetImages() []*ImageFragment {
 }
 
 type TagFragment struct {
-	Name        string   "json:\"name\" graphql:\"name\""
-	ID          string   "json:\"id\" graphql:\"id\""
-	Description *string  "json:\"description,omitempty\" graphql:\"description\""
-	Aliases     []string "json:\"aliases\" graphql:\"aliases\""
+	Name        string                "json:\"name\" graphql:\"name\""
+	ID          string                "json:\"id\" graphql:\"id\""
+	Description *string               "json:\"description,omitempty\" graphql:\"description\""
+	Aliases     []string              "json:\"aliases\" graphql:\"aliases\""
+	Category    *TagFragment_Category "json:\"category,omitempty\" graphql:\"category\""
 }
 
 func (t *TagFragment) GetName() string {
@@ -158,6 +159,12 @@ func (t *TagFragment) GetAliases() []string {
 	}
 	return t.Aliases
 }
+func (t *TagFragment) GetCategory() *TagFragment_Category {
+	if t == nil {
+		t = &TagFragment{}
+	}
+	return t.Category
+}
 
 type MeasurementsFragment struct {
 	BandSize *int    "json:\"band_size,omitempty\" graphql:\"band_size\""
@@ -530,6 +537,31 @@ func (t *StudioFragment_Parent) GetName() string {
 	return t.Name
 }
 
+type TagFragment_Category struct {
+	Description *string "json:\"description,omitempty\" graphql:\"description\""
+	ID          string  "json:\"id\" graphql:\"id\""
+	Name        string  "json:\"name\" graphql:\"name\""
+}
+
+func (t *TagFragment_Category) GetDescription() *string {
+	if t == nil {
+		t = &TagFragment_Category{}
+	}
+	return t.Description
+}
+func (t *TagFragment_Category) GetID() string {
+	if t == nil {
+		t = &TagFragment_Category{}
+	}
+	return t.ID
+}
+func (t *TagFragment_Category) GetName() string {
+	if t == nil {
+		t = &TagFragment_Category{}
+	}
+	return t.Name
+}
+
 type SceneFragment_Studio_StudioFragment_Parent struct {
 	ID   string "json:\"id\" graphql:\"id\""
 	Name string "json:\"name\" graphql:\"name\""
@@ -548,6 +580,31 @@ func (t *SceneFragment_Studio_StudioFragment_Parent) GetName() string {
 	return t.Name
 }
 
+type SceneFragment_Tags_TagFragment_Category struct {
+	Description *string "json:\"description,omitempty\" graphql:\"description\""
+	ID          string  "json:\"id\" graphql:\"id\""
+	Name        string  "json:\"name\" graphql:\"name\""
+}
+
+func (t *SceneFragment_Tags_TagFragment_Category) GetDescription() *string {
+	if t == nil {
+		t = &SceneFragment_Tags_TagFragment_Category{}
+	}
+	return t.Description
+}
+func (t *SceneFragment_Tags_TagFragment_Category) GetID() string {
+	if t == nil {
+		t = &SceneFragment_Tags_TagFragment_Category{}
+	}
+	return t.ID
+}
+func (t *SceneFragment_Tags_TagFragment_Category) GetName() string {
+	if t == nil {
+		t = &SceneFragment_Tags_TagFragment_Category{}
+	}
+	return t.Name
+}
+
 type FindScenesBySceneFingerprints_FindScenesBySceneFingerprints_SceneFragment_Studio_StudioFragment_Parent struct {
 	ID   string "json:\"id\" graphql:\"id\""
 	Name string "json:\"name\" graphql:\"name\""
@@ -566,6 +623,31 @@ func (t *FindScenesBySceneFingerprints_FindScenesBySceneFingerprints_SceneFragme
 	return t.Name
 }
 
+type FindScenesBySceneFingerprints_FindScenesBySceneFingerprints_SceneFragment_Tags_TagFragment_Category struct {
+	Description *string "json:\"description,omitempty\" graphql:\"description\""
+	ID          string  "json:\"id\" graphql:\"id\""
+	Name        string  "json:\"name\" graphql:\"name\""
+}
+
+func (t *FindScenesBySceneFingerprints_FindScenesBySceneFingerprints_SceneFragment_Tags_TagFragment_Category) GetDescription() *string {
+	if t == nil {
+		t = &FindScenesBySceneFingerprints_FindScenesBySceneFingerprints_SceneFragment_Tags_TagFragment_Category{}
+	}
+	return t.Description
+}
+func (t *FindScenesBySceneFingerprints_FindScenesBySceneFingerprints_SceneFragment_Tags_TagFragment_Category) GetID() string {
+	if t == nil {
+		t = &FindScenesBySceneFingerprints_FindScenesBySceneFingerprints_SceneFragment_Tags_TagFragment_Category{}
+	}
+	return t.ID
+}
+func (t *FindScenesBySceneFingerprints_FindScenesBySceneFingerprints_SceneFragment_Tags_TagFragment_Category) GetName() string {
+	if t == nil {
+		t = &FindScenesBySceneFingerprints_FindScenesBySceneFingerprints_SceneFragment_Tags_TagFragment_Category{}
+	}
+	return t.Name
+}
+
 type SearchScene_SearchScene_SceneFragment_Studio_StudioFragment_Parent struct {
 	ID   string "json:\"id\" graphql:\"id\""
 	Name string "json:\"name\" graphql:\"name\""
@@ -584,6 +666,31 @@ func (t *SearchScene_SearchScene_SceneFragment_Studio_StudioFragment_Parent) Get
 	return t.Name
 }
 
+type SearchScene_SearchScene_SceneFragment_Tags_TagFragment_Category struct {
+	Description *string "json:\"description,omitempty\" graphql:\"description\""
+	ID          string  "json:\"id\" graphql:\"id\""
+	Name        string  "json:\"name\" graphql:\"name\""
+}
+
+func (t *SearchScene_SearchScene_SceneFragment_Tags_TagFragment_Category) GetDescription() *string {
+	if t == nil {
+		t = &SearchScene_SearchScene_SceneFragment_Tags_TagFragment_Category{}
+	}
+	return t.Description
+}
+func (t *SearchScene_SearchScene_SceneFragment_Tags_TagFragment_Category) GetID() string {
+	if t == nil {
+		t = &SearchScene_SearchScene_SceneFragment_Tags_TagFragment_Category{}
+	}
+	return t.ID
+}
+func (t *SearchScene_SearchScene_SceneFragment_Tags_TagFragment_Category) GetName() string {
+	if t == nil {
+		t = &SearchScene_SearchScene_SceneFragment_Tags_TagFragment_Category{}
+	}
+	return t.Name
+}
+
 type FindSceneByID_FindScene_SceneFragment_Studio_StudioFragment_Parent struct {
 	ID   string "json:\"id\" graphql:\"id\""
 	Name string "json:\"name\" graphql:\"name\""
@@ -602,6 +709,31 @@ func (t *FindSceneByID_FindScene_SceneFragment_Studio_StudioFragment_Parent) Get
 	return t.Name
 }
 
+type FindSceneByID_FindScene_SceneFragment_Tags_TagFragment_Category struct {
+	Description *string "json:\"description,omitempty\" graphql:\"description\""
+	ID          string  "json:\"id\" graphql:\"id\""
+	Name        string  "json:\"name\" graphql:\"name\""
+}
+
+func (t *FindSceneByID_FindScene_SceneFragment_Tags_TagFragment_Category) GetDescription() *string {
+	if t == nil {
+		t = &FindSceneByID_FindScene_SceneFragment_Tags_TagFragment_Category{}
+	}
+	return t.Description
+}
+func (t *FindSceneByID_FindScene_SceneFragment_Tags_TagFragment_Category) GetID() string {
+	if t == nil {
+		t = &FindSceneByID_FindScene_SceneFragment_Tags_TagFragment_Category{}
+	}
+	return t.ID
+}
+func (t *FindSceneByID_FindScene_SceneFragment_Tags_TagFragment_Category) GetName() string {
+	if t == nil {
+		t = &FindSceneByID_FindScene_SceneFragment_Tags_TagFragment_Category{}
+	}
+	return t.Name
+}
+
 type FindStudio_FindStudio_StudioFragment_Parent struct {
 	ID   string "json:\"id\" graphql:\"id\""
 	Name string "json:\"name\" graphql:\"name\""
@@ -620,6 +752,56 @@ func (t *FindStudio_FindStudio_StudioFragment_Parent) GetName() string {
 	return t.Name
 }
 
+type FindTag_FindTag_TagFragment_Category struct {
+	Description *string "json:\"description,omitempty\" graphql:\"description\""
+	ID          string  "json:\"id\" graphql:\"id\""
+	Name        string  "json:\"name\" graphql:\"name\""
+}
+
+func (t *FindTag_FindTag_TagFragment_Category) GetDescription() *string {
+	if t == nil {
+		t = &FindTag_FindTag_TagFragment_Category{}
+	}
+	return t.Description
+}
+func (t *FindTag_FindTag_TagFragment_Category) GetID() string {
+	if t == nil {
+		t = &FindTag_FindTag_TagFragment_Category{}
+	}
+	return t.ID
+}
+func (t *FindTag_FindTag_TagFragment_Category) GetName() string {
+	if t == nil {
+		t = &FindTag_FindTag_TagFragment_Category{}
+	}
+	return t.Name
+}
+
+type QueryTags_QueryTags_Tags_TagFragment_Category struct {
+	Description *string "json:\"description,omitempty\" graphql:\"description\""
+	ID          string  "json:\"id\" graphql:\"id\""
+	Name        string  "json:\"name\" graphql:\"name\""
+}
+
+func (t *QueryTags_QueryTags_Tags_TagFragment_Category) GetDescription() *string {
+	if t == nil {
+		t = &QueryTags_QueryTags_Tags_TagFragment_Category{}
+	}
+	return t.Description
+}
+func (t *QueryTags_QueryTags_Tags_TagFragment_Category) GetID() string {
+	if t == nil {
+		t = &QueryTags_QueryTags_Tags_TagFragment_Category{}
+	}
+	return t.ID
+}
+func (t *QueryTags_QueryTags_Tags_TagFragment_Category) GetName() string {
+	if t == nil {
+		t = &QueryTags_QueryTags_Tags_TagFragment_Category{}
+	}
+	return t.Name
+}
+
 type QueryTags_QueryTags struct {
 	Count int            "json:\"count\" graphql:\"count\""
 	Tags  []*TagFragment "json:\"tags\" graphql:\"tags\""
@@ -865,6 +1047,11 @@ fragment TagFragment on Tag {
 	id
 	description
 	aliases
+	category {
+		id
+		name
+		description
+	}
 }
 fragment PerformerAppearanceFragment on PerformerAppearance {
 	as
@@ -1003,6 +1190,11 @@ fragment TagFragment on Tag {
 	id
 	description
 	aliases
+	category {
+		id
+		name
+		description
+	}
 }
 fragment PerformerAppearanceFragment on PerformerAppearance {
 	as
@@ -1299,6 +1491,11 @@ fragment TagFragment on Tag {
 	id
 	description
 	aliases
+	category {
+		id
+		name
+		description
+	}
 }
 fragment PerformerAppearanceFragment on PerformerAppearance {
 	as
@@ -1435,6 +1632,11 @@ fragment TagFragment on Tag {
 	id
 	description
 	aliases
+	category {
+		id
+		name
+		description
+	}
 }
 `
 
@@ -1469,6 +1671,11 @@ fragment TagFragment on Tag {
 	id
 	description
 	aliases
+	category {
+		id
+		name
+		description
+	}
 }
 `
 
diff --git a/pkg/stashbox/tag.go b/pkg/stashbox/tag.go
index 452dd9928..45bcf96c4 100644
--- a/pkg/stashbox/tag.go
+++ b/pkg/stashbox/tag.go
@@ -72,5 +72,12 @@ func tagFragmentToScrapedTag(t graphql.TagFragment) *models.ScrapedTag {
 		ret.AliasList = t.Aliases
 	}
 
+	if t.Category != nil {
+		ret.Parent = &models.ScrapedTag{
+			Name:        t.Category.Name,
+			Description: t.Category.Description,
+		}
+	}
+
 	return ret
 }
diff --git a/ui/v2.5/graphql/data/scrapers.graphql b/ui/v2.5/graphql/data/scrapers.graphql
index 7214c2064..0dae3c2d5 100644
--- a/ui/v2.5/graphql/data/scrapers.graphql
+++ b/ui/v2.5/graphql/data/scrapers.graphql
@@ -162,6 +162,11 @@ fragment ScrapedSceneTagData on ScrapedTag {
   name
   description
   alias_list
+  parent {
+    stored_id
+    name
+    description
+  }
   remote_site_id
 }
 
diff --git a/ui/v2.5/src/components/Shared/BatchModals.tsx b/ui/v2.5/src/components/Shared/BatchModals.tsx
new file mode 100644
index 000000000..0de8f5e1f
--- /dev/null
+++ b/ui/v2.5/src/components/Shared/BatchModals.tsx
@@ -0,0 +1,242 @@
+import React, { useMemo, useRef, useState } from "react";
+import { Form } from "react-bootstrap";
+import { FormattedMessage, useIntl } from "react-intl";
+
+import { ModalComponent } from "src/components/Shared/Modal";
+import { faStar, faTags } from "@fortawesome/free-solid-svg-icons";
+
+interface IEntityWithStashIDs {
+  stash_ids: { endpoint: string }[];
+}
+
+interface IBatchUpdateModalProps {
+  entities: IEntityWithStashIDs[];
+  isIdle: boolean;
+  selectedEndpoint: { endpoint: string; index: number };
+  allCount: number | undefined;
+  onBatchUpdate: (queryAll: boolean, refresh: boolean) => void;
+  onRefreshChange?: (refresh: boolean) => void;
+  batchAddParents: boolean;
+  setBatchAddParents: (addParents: boolean) => void;
+  close: () => void;
+  localePrefix: string;
+  entityName: string;
+  countVariableName: string;
+}
+
+export const BatchUpdateModal: React.FC<IBatchUpdateModalProps> = ({
+  entities,
+  isIdle,
+  selectedEndpoint,
+  allCount,
+  onBatchUpdate,
+  onRefreshChange,
+  batchAddParents,
+  setBatchAddParents,
+  close,
+  localePrefix,
+  entityName,
+  countVariableName,
+}) => {
+  const intl = useIntl();
+
+  const [queryAll, setQueryAll] = useState(false);
+  const [refresh, setRefreshState] = useState(false);
+
+  const setRefresh = (value: boolean) => {
+    setRefreshState(value);
+    onRefreshChange?.(value);
+  };
+
+  const entityCount = useMemo(() => {
+    const filteredStashIDs = entities.map((e) =>
+      e.stash_ids.filter((s) => s.endpoint === selectedEndpoint.endpoint)
+    );
+
+    return queryAll
+      ? allCount
+      : filteredStashIDs.filter((s) =>
+          refresh ? s.length > 0 : s.length === 0
+        ).length;
+  }, [queryAll, refresh, entities, allCount, selectedEndpoint.endpoint]);
+
+  return (
+    <ModalComponent
+      show
+      icon={faTags}
+      header={intl.formatMessage({
+        id: `${localePrefix}.update_${entityName}s`,
+      })}
+      accept={{
+        text: intl.formatMessage({
+          id: `${localePrefix}.update_${entityName}s`,
+        }),
+        onClick: () => onBatchUpdate(queryAll, refresh),
+      }}
+      cancel={{
+        text: intl.formatMessage({ id: "actions.cancel" }),
+        variant: "danger",
+        onClick: () => close(),
+      }}
+      disabled={!isIdle}
+    >
+      <Form.Group>
+        <Form.Label>
+          <h6>
+            <FormattedMessage id={`${localePrefix}.${entityName}_selection`} />
+          </h6>
+        </Form.Label>
+        <Form.Check
+          id="query-page"
+          type="radio"
+          name={`${entityName}-query`}
+          label={<FormattedMessage id={`${localePrefix}.current_page`} />}
+          checked={!queryAll}
+          onChange={() => setQueryAll(false)}
+        />
+        <Form.Check
+          id="query-all"
+          type="radio"
+          name={`${entityName}-query`}
+          label={intl.formatMessage({
+            id: `${localePrefix}.query_all_${entityName}s_in_the_database`,
+          })}
+          checked={queryAll}
+          onChange={() => setQueryAll(true)}
+        />
+      </Form.Group>
+      <Form.Group>
+        <Form.Label>
+          <h6>
+            <FormattedMessage id={`${localePrefix}.tag_status`} />
+          </h6>
+        </Form.Label>
+        <Form.Check
+          id={`untagged-${entityName}s`}
+          type="radio"
+          name={`${entityName}-refresh`}
+          label={intl.formatMessage({
+            id: `${localePrefix}.untagged_${entityName}s`,
+          })}
+          checked={!refresh}
+          onChange={() => setRefresh(false)}
+        />
+        <Form.Text>
+          <FormattedMessage
+            id={`${localePrefix}.updating_untagged_${entityName}s_description`}
+          />
+        </Form.Text>
+        <Form.Check
+          id={`tagged-${entityName}s`}
+          type="radio"
+          name={`${entityName}-refresh`}
+          label={intl.formatMessage({
+            id: `${localePrefix}.refresh_tagged_${entityName}s`,
+          })}
+          checked={refresh}
+          onChange={() => setRefresh(true)}
+        />
+        <Form.Text>
+          <FormattedMessage
+            id={`${localePrefix}.refreshing_will_update_the_data`}
+          />
+        </Form.Text>
+      </Form.Group>
+      <div className="mt-4">
+        <Form.Check
+          id="add-parent"
+          checked={batchAddParents}
+          label={intl.formatMessage({
+            id: `${localePrefix}.create_or_tag_parent_${entityName}s`,
+          })}
+          onChange={() => setBatchAddParents(!batchAddParents)}
+        />
+      </div>
+      <b>
+        <FormattedMessage
+          id={`${localePrefix}.number_of_${entityName}s_will_be_processed`}
+          values={{
+            [countVariableName]: entityCount,
+          }}
+        />
+      </b>
+    </ModalComponent>
+  );
+};
+
+interface IBatchAddModalProps {
+  isIdle: boolean;
+  onBatchAdd: (input: string) => void;
+  batchAddParents: boolean;
+  setBatchAddParents: (addParents: boolean) => void;
+  close: () => void;
+  localePrefix: string;
+  entityName: string;
+}
+
+export const BatchAddModal: React.FC<IBatchAddModalProps> = ({
+  isIdle,
+  onBatchAdd,
+  batchAddParents,
+  setBatchAddParents,
+  close,
+  localePrefix,
+  entityName,
+}) => {
+  const intl = useIntl();
+
+  const inputRef = useRef<HTMLTextAreaElement | null>(null);
+
+  return (
+    <ModalComponent
+      show
+      icon={faStar}
+      header={intl.formatMessage({
+        id: `${localePrefix}.add_new_${entityName}s`,
+      })}
+      accept={{
+        text: intl.formatMessage({
+          id: `${localePrefix}.add_new_${entityName}s`,
+        }),
+        onClick: () => {
+          if (inputRef.current) {
+            onBatchAdd(inputRef.current.value);
+          } else {
+            close();
+          }
+        },
+      }}
+      cancel={{
+        text: intl.formatMessage({ id: "actions.cancel" }),
+        variant: "danger",
+        onClick: () => close(),
+      }}
+      disabled={!isIdle}
+    >
+      <Form.Control
+        className="text-input"
+        as="textarea"
+        ref={inputRef}
+        placeholder={intl.formatMessage({
+          id: `${localePrefix}.${entityName}_names_or_stashids_separated_by_comma`,
+        })}
+        rows={6}
+      />
+      <Form.Text>
+        <FormattedMessage
+          id={`${localePrefix}.any_names_entered_will_be_queried`}
+        />
+      </Form.Text>
+      <div className="mt-2">
+        <Form.Check
+          id="add-parent"
+          checked={batchAddParents}
+          label={intl.formatMessage({
+            id: `${localePrefix}.create_or_tag_parent_${entityName}s`,
+          })}
+          onChange={() => setBatchAddParents(!batchAddParents)}
+        />
+      </div>
+    </ModalComponent>
+  );
+};
diff --git a/ui/v2.5/src/components/Tagger/constants.ts b/ui/v2.5/src/components/Tagger/constants.ts
index af9afcefb..646dbf4c3 100644
--- a/ui/v2.5/src/components/Tagger/constants.ts
+++ b/ui/v2.5/src/components/Tagger/constants.ts
@@ -38,6 +38,7 @@ export const initialConfig: ITaggerConfig = {
   excludedStudioFields: DEFAULT_EXCLUDED_STUDIO_FIELDS,
   excludedTagFields: DEFAULT_EXCLUDED_TAG_FIELDS,
   createParentStudios: true,
+  createParentTags: true,
 };
 
 export type ParseMode = "auto" | "filename" | "dir" | "path" | "metadata";
@@ -56,6 +57,7 @@ export interface ITaggerConfig {
   excludedStudioFields?: string[];
   excludedTagFields?: string[];
   createParentStudios: boolean;
+  createParentTags: boolean;
 }
 
 export const PERFORMER_FIELDS = [
@@ -85,4 +87,4 @@ export const PERFORMER_FIELDS = [
 ];
 
 export const STUDIO_FIELDS = ["name", "image", "url", "parent_studio"];
-export const TAG_FIELDS = ["name", "description", "aliases"];
+export const TAG_FIELDS = ["name", "description", "aliases", "parent_tags"];
diff --git a/ui/v2.5/src/components/Tagger/studios/StudioTagger.tsx b/ui/v2.5/src/components/Tagger/studios/StudioTagger.tsx
index 64bb99b72..adc58cc04 100644
--- a/ui/v2.5/src/components/Tagger/studios/StudioTagger.tsx
+++ b/ui/v2.5/src/components/Tagger/studios/StudioTagger.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useMemo, useRef, useState } from "react";
+import React, { useEffect, useState } from "react";
 import { Button, Card, Form, InputGroup, ProgressBar } from "react-bootstrap";
 import { FormattedMessage, useIntl } from "react-intl";
 import { Link } from "react-router-dom";
@@ -6,7 +6,6 @@ import { HashLink } from "react-router-hash-link";
 
 import * as GQL from "src/core/generated-graphql";
 import { LoadingIndicator } from "src/components/Shared/LoadingIndicator";
-import { ModalComponent } from "src/components/Shared/Modal";
 import {
   stashBoxStudioQuery,
   useJobsSubscribe,
@@ -25,11 +24,15 @@ import { ITaggerConfig, STUDIO_FIELDS } from "../constants";
 import StudioModal from "../scenes/StudioModal";
 import { useUpdateStudio } from "../queries";
 import { apolloError } from "src/utils";
-import { faStar, faTags } from "@fortawesome/free-solid-svg-icons";
+import { faTags } from "@fortawesome/free-solid-svg-icons";
 import { ExternalLink } from "src/components/Shared/ExternalLink";
 import { mergeStudioStashIDs } from "../utils";
 import { separateNamesAndStashIds } from "src/utils/stashIds";
 import { useTaggerConfig } from "../config";
+import {
+  BatchUpdateModal,
+  BatchAddModal,
+} from "src/components/Shared/BatchModals";
 
 type JobFragment = Pick<
   GQL.Job,
@@ -38,232 +41,6 @@ type JobFragment = Pick<
 
 const CLASSNAME = "StudioTagger";
 
-interface IStudioBatchUpdateModal {
-  studios: GQL.StudioDataFragment[];
-  isIdle: boolean;
-  selectedEndpoint: { endpoint: string; index: number };
-  onBatchUpdate: (queryAll: boolean, refresh: boolean) => void;
-  batchAddParents: boolean;
-  setBatchAddParents: (addParents: boolean) => void;
-  close: () => void;
-}
-
-const StudioBatchUpdateModal: React.FC<IStudioBatchUpdateModal> = ({
-  studios,
-  isIdle,
-  selectedEndpoint,
-  onBatchUpdate,
-  batchAddParents,
-  setBatchAddParents,
-  close,
-}) => {
-  const intl = useIntl();
-
-  const [queryAll, setQueryAll] = useState(false);
-
-  const [refresh, setRefresh] = useState(false);
-  const { data: allStudios } = GQL.useFindStudiosQuery({
-    variables: {
-      studio_filter: {
-        stash_id_endpoint: {
-          endpoint: selectedEndpoint.endpoint,
-          modifier: refresh
-            ? GQL.CriterionModifier.NotNull
-            : GQL.CriterionModifier.IsNull,
-        },
-      },
-      filter: {
-        per_page: 0,
-      },
-    },
-  });
-
-  const studioCount = useMemo(() => {
-    // get all stash ids for the selected endpoint
-    const filteredStashIDs = studios.map((p) =>
-      p.stash_ids.filter((s) => s.endpoint === selectedEndpoint.endpoint)
-    );
-
-    return queryAll
-      ? allStudios?.findStudios.count
-      : filteredStashIDs.filter((s) =>
-          // if refresh, then we filter out the studios without a stash id
-          // otherwise, we want untagged studios, filtering out those with a stash id
-          refresh ? s.length > 0 : s.length === 0
-        ).length;
-  }, [queryAll, refresh, studios, allStudios, selectedEndpoint.endpoint]);
-
-  return (
-    <ModalComponent
-      show
-      icon={faTags}
-      header={intl.formatMessage({
-        id: "studio_tagger.update_studios",
-      })}
-      accept={{
-        text: intl.formatMessage({
-          id: "studio_tagger.update_studios",
-        }),
-        onClick: () => onBatchUpdate(queryAll, refresh),
-      }}
-      cancel={{
-        text: intl.formatMessage({ id: "actions.cancel" }),
-        variant: "danger",
-        onClick: () => close(),
-      }}
-      disabled={!isIdle}
-    >
-      <Form.Group>
-        <Form.Label>
-          <h6>
-            <FormattedMessage id="studio_tagger.studio_selection" />
-          </h6>
-        </Form.Label>
-        <Form.Check
-          id="query-page"
-          type="radio"
-          name="studio-query"
-          label={<FormattedMessage id="studio_tagger.current_page" />}
-          checked={!queryAll}
-          onChange={() => setQueryAll(false)}
-        />
-        <Form.Check
-          id="query-all"
-          type="radio"
-          name="studio-query"
-          label={intl.formatMessage({
-            id: "studio_tagger.query_all_studios_in_the_database",
-          })}
-          checked={queryAll}
-          onChange={() => setQueryAll(true)}
-        />
-      </Form.Group>
-      <Form.Group>
-        <Form.Label>
-          <h6>
-            <FormattedMessage id="studio_tagger.tag_status" />
-          </h6>
-        </Form.Label>
-        <Form.Check
-          id="untagged-studios"
-          type="radio"
-          name="studio-refresh"
-          label={intl.formatMessage({
-            id: "studio_tagger.untagged_studios",
-          })}
-          checked={!refresh}
-          onChange={() => setRefresh(false)}
-        />
-        <Form.Text>
-          <FormattedMessage id="studio_tagger.updating_untagged_studios_description" />
-        </Form.Text>
-        <Form.Check
-          id="tagged-studios"
-          type="radio"
-          name="studio-refresh"
-          label={intl.formatMessage({
-            id: "studio_tagger.refresh_tagged_studios",
-          })}
-          checked={refresh}
-          onChange={() => setRefresh(true)}
-        />
-        <Form.Text>
-          <FormattedMessage id="studio_tagger.refreshing_will_update_the_data" />
-        </Form.Text>
-        <div className="mt-4">
-          <Form.Check
-            id="add-parent"
-            checked={batchAddParents}
-            label={intl.formatMessage({
-              id: "studio_tagger.create_or_tag_parent_studios",
-            })}
-            onChange={() => setBatchAddParents(!batchAddParents)}
-          />
-        </div>
-      </Form.Group>
-      <b>
-        <FormattedMessage
-          id="studio_tagger.number_of_studios_will_be_processed"
-          values={{
-            studio_count: studioCount,
-          }}
-        />
-      </b>
-    </ModalComponent>
-  );
-};
-
-interface IStudioBatchAddModal {
-  isIdle: boolean;
-  onBatchAdd: (input: string) => void;
-  batchAddParents: boolean;
-  setBatchAddParents: (addParents: boolean) => void;
-  close: () => void;
-}
-
-const StudioBatchAddModal: React.FC<IStudioBatchAddModal> = ({
-  isIdle,
-  onBatchAdd,
-  batchAddParents,
-  setBatchAddParents,
-  close,
-}) => {
-  const intl = useIntl();
-
-  const studioInput = useRef<HTMLTextAreaElement | null>(null);
-
-  return (
-    <ModalComponent
-      show
-      icon={faStar}
-      header={intl.formatMessage({
-        id: "studio_tagger.add_new_studios",
-      })}
-      accept={{
-        text: intl.formatMessage({
-          id: "studio_tagger.add_new_studios",
-        }),
-        onClick: () => {
-          if (studioInput.current) {
-            onBatchAdd(studioInput.current.value);
-          } else {
-            close();
-          }
-        },
-      }}
-      cancel={{
-        text: intl.formatMessage({ id: "actions.cancel" }),
-        variant: "danger",
-        onClick: () => close(),
-      }}
-      disabled={!isIdle}
-    >
-      <Form.Control
-        className="text-input"
-        as="textarea"
-        ref={studioInput}
-        placeholder={intl.formatMessage({
-          id: "studio_tagger.studio_names_or_stashids_separated_by_comma",
-        })}
-        rows={6}
-      />
-      <Form.Text>
-        <FormattedMessage id="studio_tagger.any_names_entered_will_be_queried" />
-      </Form.Text>
-      <div className="mt-2">
-        <Form.Check
-          id="add-parent"
-          checked={batchAddParents}
-          label={intl.formatMessage({
-            id: "studio_tagger.create_or_tag_parent_studios",
-          })}
-          onChange={() => setBatchAddParents(!batchAddParents)}
-        />
-      </div>
-    </ModalComponent>
-  );
-};
-
 interface IStudioTaggerListProps {
   studios: GQL.StudioDataFragment[];
   selectedEndpoint: { endpoint: string; index: number };
@@ -305,6 +82,24 @@ const StudioTaggerList: React.FC<IStudioTaggerListProps> = ({
     config.createParentStudios || false
   );
 
+  const [batchUpdateRefresh, setBatchUpdateRefresh] = useState(false);
+  const { data: allStudios } = GQL.useFindStudiosQuery({
+    skip: !showBatchUpdate,
+    variables: {
+      studio_filter: {
+        stash_id_endpoint: {
+          endpoint: selectedEndpoint.endpoint,
+          modifier: batchUpdateRefresh
+            ? GQL.CriterionModifier.NotNull
+            : GQL.CriterionModifier.IsNull,
+        },
+      },
+      filter: {
+        per_page: 0,
+      },
+    },
+  });
+
   const [error, setError] = useState<
     Record<string, { message?: string; details?: string } | undefined>
   >({});
@@ -630,24 +425,31 @@ const StudioTaggerList: React.FC<IStudioTaggerListProps> = ({
   return (
     <Card>
       {showBatchUpdate && (
-        <StudioBatchUpdateModal
+        <BatchUpdateModal
           close={() => setShowBatchUpdate(false)}
           isIdle={isIdle}
           selectedEndpoint={selectedEndpoint}
-          studios={studios}
+          entities={studios}
+          allCount={allStudios?.findStudios.count}
           onBatchUpdate={handleBatchUpdate}
+          onRefreshChange={setBatchUpdateRefresh}
           batchAddParents={batchAddParents}
           setBatchAddParents={setBatchAddParents}
+          localePrefix="studio_tagger"
+          entityName="studio"
+          countVariableName="studio_count"
         />
       )}
 
       {showBatchAdd && (
-        <StudioBatchAddModal
+        <BatchAddModal
           close={() => setShowBatchAdd(false)}
           isIdle={isIdle}
           onBatchAdd={handleBatchAdd}
           batchAddParents={batchAddParents}
           setBatchAddParents={setBatchAddParents}
+          localePrefix="studio_tagger"
+          entityName="studio"
         />
       )}
       <div className="ml-auto mb-3">
diff --git a/ui/v2.5/src/components/Tagger/styles.scss b/ui/v2.5/src/components/Tagger/styles.scss
index 5f6ece37d..1c05e574f 100644
--- a/ui/v2.5/src/components/Tagger/styles.scss
+++ b/ui/v2.5/src/components/Tagger/styles.scss
@@ -287,7 +287,8 @@
   }
 }
 
-.StudioTagger {
+.StudioTagger,
+.TagTagger {
   display: flex;
   flex-wrap: wrap;
   justify-content: center;
@@ -342,7 +343,8 @@
     vertical-align: bottom;
   }
 
-  &-studio-search {
+  &-studio-search,
+  &-tag-search {
     display: flex;
     flex-wrap: wrap;
 
diff --git a/ui/v2.5/src/components/Tagger/tags/StashSearchResult.tsx b/ui/v2.5/src/components/Tagger/tags/StashSearchResult.tsx
index cd6abca02..55b86c931 100644
--- a/ui/v2.5/src/components/Tagger/tags/StashSearchResult.tsx
+++ b/ui/v2.5/src/components/Tagger/tags/StashSearchResult.tsx
@@ -7,6 +7,8 @@ import TagModal from "./TagModal";
 import { faTags } from "@fortawesome/free-solid-svg-icons";
 import { useIntl } from "react-intl";
 import { mergeTagStashIDs } from "../utils";
+import { useTagCreate } from "src/core/StashService";
+import { apolloError } from "src/utils";
 
 interface IStashSearchResultProps {
   tag: GQL.TagListDataFragment;
@@ -34,13 +36,49 @@ const StashSearchResult: React.FC<IStashSearchResultProps> = ({
     {}
   );
 
+  const [createTag] = useTagCreate();
   const updateTag = useUpdateTag();
 
-  const handleSave = async (input: GQL.TagCreateInput) => {
+  function handleSaveError(name: string, message: string) {
+    setError({
+      message: intl.formatMessage(
+        { id: "tag_tagger.failed_to_save_tag" },
+        { tag: name }
+      ),
+      details:
+        message === "UNIQUE constraint failed: tags.name"
+          ? intl.formatMessage({
+              id: "tag_tagger.name_already_exists",
+            })
+          : message,
+    });
+  }
+
+  const handleSave = async (
+    input: GQL.TagCreateInput,
+    parentInput?: GQL.TagCreateInput
+  ) => {
     setError({});
     setModalTag(undefined);
-    setSaveState("Saving tag");
 
+    if (parentInput) {
+      setSaveState("Saving parent tag");
+
+      try {
+        const parentRes = await createTag({
+          variables: { input: parentInput },
+        });
+        input.parent_ids = [parentRes.data?.tagCreate?.id].filter(
+          Boolean
+        ) as string[];
+      } catch (e) {
+        handleSaveError(parentInput.name, apolloError(e));
+        setSaveState("");
+        return;
+      }
+    }
+
+    setSaveState("Saving tag");
     const updateData: GQL.TagUpdateInput = {
       ...input,
       id: tag.id,
@@ -54,18 +92,7 @@ const StashSearchResult: React.FC<IStashSearchResultProps> = ({
     const res = await updateTag(updateData);
 
     if (!res?.data?.tagUpdate) {
-      setError({
-        message: intl.formatMessage(
-          { id: "tag_tagger.failed_to_save_tag" },
-          { tag: input.name ?? tag.name }
-        ),
-        details:
-          res?.errors?.[0]?.message === "UNIQUE constraint failed: tags.name"
-            ? intl.formatMessage({
-                id: "tag_tagger.name_already_exists",
-              })
-            : res?.errors?.[0]?.message ?? "",
-      });
+      handleSaveError(input.name ?? tag.name, res?.errors?.[0]?.message ?? "");
     } else {
       onTagTagged(tag);
     }
@@ -74,7 +101,7 @@ const StashSearchResult: React.FC<IStashSearchResultProps> = ({
 
   const tags = stashboxTags.map((p) => (
     <Button
-      className="StudioTagger-studio-search-item minimal col-6"
+      className="TagTagger-tag-search-item minimal col-6"
       variant="link"
       key={p.remote_site_id}
       onClick={() => setModalTag(p)}
@@ -97,7 +124,7 @@ const StashSearchResult: React.FC<IStashSearchResultProps> = ({
           endpoint={endpoint}
         />
       )}
-      <div className="StudioTagger-studio-search">{tags}</div>
+      <div className="TagTagger-tag-search">{tags}</div>
       <div className="row no-gutters mt-2 align-items-center justify-content-end">
         {error.message && (
           <div className="text-right text-danger mt-1">
diff --git a/ui/v2.5/src/components/Tagger/tags/TagModal.tsx b/ui/v2.5/src/components/Tagger/tags/TagModal.tsx
index 1183d8f0c..d9a7d99b8 100644
--- a/ui/v2.5/src/components/Tagger/tags/TagModal.tsx
+++ b/ui/v2.5/src/components/Tagger/tags/TagModal.tsx
@@ -10,7 +10,7 @@ import {
   faExternalLinkAlt,
   faTimes,
 } from "@fortawesome/free-solid-svg-icons";
-import { Button } from "react-bootstrap";
+import { Button, Form } from "react-bootstrap";
 import { TruncatedText } from "src/components/Shared/TruncatedText";
 import { excludeFields } from "src/utils/data";
 import { ExternalLink } from "src/components/Shared/ExternalLink";
@@ -19,7 +19,7 @@ interface ITagModalProps {
   tag: GQL.ScrapedSceneTagDataFragment;
   modalVisible: boolean;
   closeModal: () => void;
-  onSave: (input: GQL.TagCreateInput) => void;
+  onSave: (input: GQL.TagCreateInput, parentInput?: GQL.TagCreateInput) => void;
   excludedTagFields?: string[];
   header: string;
   icon: IconDefinition;
@@ -47,19 +47,58 @@ const TagModal: React.FC<ITagModalProps> = ({
       [name]: !excluded[name],
     });
 
-  function maybeRenderField(id: string, text: string | null | undefined) {
+  const [createParentTag, setCreateParentTag] = useState<boolean>(
+    !!tag.parent && !tag.parent.stored_id
+  );
+
+  // Check if a tag with the parent name already exists locally.
+  // Categories don't have stash IDs, so stored_id may be null even when the
+  // parent tag has already been created (e.g. by tagging a sibling tag first).
+  const parentNameQuery = GQL.useFindTagsQuery({
+    skip: !tag.parent || !!tag.parent.stored_id,
+    variables: {
+      tag_filter: {
+        name: {
+          value: tag.parent?.name ?? "",
+          modifier: GQL.CriterionModifier.Equals,
+        },
+      },
+      filter: { per_page: 1 },
+    },
+  });
+  const existingParentId = parentNameQuery.data?.findTags.tags[0]?.id;
+
+  // If the parent already exists locally, don't offer to create it
+  const sendParentTag = !existingParentId;
+
+  const [parentExcluded, setParentExcluded] = useState<Record<string, boolean>>(
+    excludedTagFields.reduce((dict, field) => ({ ...dict, [field]: true }), {})
+  );
+  const toggleParentField = (name: string) =>
+    setParentExcluded({
+      ...parentExcluded,
+      [name]: !parentExcluded[name],
+    });
+
+  function maybeRenderField(
+    id: string,
+    text: string | null | undefined,
+    isSelectable: boolean = true
+  ) {
     if (!text) return;
 
     return (
       <div className="row no-gutters">
         <div className="col-5 studio-create-modal-field" key={id}>
-          <Button
-            onClick={() => toggleField(id)}
-            variant="secondary"
-            className={excluded[id] ? "text-muted" : "text-success"}
-          >
-            <Icon icon={excluded[id] ? faTimes : faCheck} />
-          </Button>
+          {isSelectable && (
+            <Button
+              onClick={() => toggleField(id)}
+              variant="secondary"
+              className={excluded[id] ? "text-muted" : "text-success"}
+            >
+              <Icon icon={excluded[id] ? faTimes : faCheck} />
+            </Button>
+          )}
           <strong>
             <FormattedMessage id={id} />:
           </strong>
@@ -85,15 +124,82 @@ const TagModal: React.FC<ITagModalProps> = ({
     );
   }
 
+  function maybeRenderParentField(
+    id: string,
+    text: string | null | undefined,
+    isSelectable: boolean = true
+  ) {
+    if (!text) return;
+
+    return (
+      <div className="row no-gutters">
+        <div className="col-5 studio-create-modal-field" key={id}>
+          {isSelectable && (
+            <Button
+              onClick={() => toggleParentField(id)}
+              variant="secondary"
+              className={parentExcluded[id] ? "text-muted" : "text-success"}
+            >
+              <Icon icon={parentExcluded[id] ? faTimes : faCheck} />
+            </Button>
+          )}
+          <strong>
+            <FormattedMessage id={id} />:
+          </strong>
+        </div>
+        <TruncatedText className="col-7" text={text} />
+      </div>
+    );
+  }
+
+  function maybeRenderParentTagDetails() {
+    if (!createParentTag || !tag.parent) {
+      return;
+    }
+
+    return (
+      <div>
+        {maybeRenderParentField("name", tag.parent.name, false)}
+        {maybeRenderParentField("description", tag.parent.description)}
+      </div>
+    );
+  }
+
+  function maybeRenderParentTag() {
+    // No parent tag, or parent already exists locally
+    if (!tag.parent || tag.parent.stored_id || !sendParentTag) {
+      return;
+    }
+
+    return (
+      <div>
+        <div className="mb-4 mt-4">
+          <Form.Check
+            id="create-parent"
+            checked={createParentTag}
+            label={intl.formatMessage({
+              id: "actions.create_parent_tag",
+            })}
+            onChange={() => setCreateParentTag(!createParentTag)}
+          />
+        </div>
+        {maybeRenderParentTagDetails()}
+      </div>
+    );
+  }
+
   function handleSave() {
     if (!tag.name) {
       throw new Error("tag name must be set");
     }
 
+    const parentId = tag.parent?.stored_id ?? existingParentId;
+
     const tagData: GQL.TagCreateInput = {
       name: tag.name,
       description: tag.description ?? undefined,
       aliases: tag.alias_list?.filter((a) => a) ?? undefined,
+      parent_ids: parentId ? [parentId] : undefined,
     };
 
     // stashid handling code
@@ -111,7 +217,27 @@ const TagModal: React.FC<ITagModalProps> = ({
     // handle exclusions
     excludeFields(tagData, excluded);
 
-    onSave(tagData);
+    let parentData: GQL.TagCreateInput | undefined = undefined;
+
+    // Categories don't have stash IDs, so we only create new parent tags
+    if (
+      createParentTag &&
+      sendParentTag &&
+      tag.parent &&
+      !tag.parent.stored_id
+    ) {
+      parentData = {
+        name: tag.parent.name,
+        description: tag.parent.description ?? undefined,
+      };
+
+      // handle exclusions
+      // Can't exclude parent tag name when creating a new one
+      parentExcluded.name = false;
+      excludeFields(parentData, parentExcluded);
+    }
+
+    onSave(tagData, parentData);
   }
 
   return (
@@ -133,10 +259,12 @@ const TagModal: React.FC<ITagModalProps> = ({
             {maybeRenderField("name", tag.name)}
             {maybeRenderField("description", tag.description)}
             {maybeRenderField("aliases", tag.alias_list?.join(", "))}
+            {maybeRenderField("parent_tags", tag.parent?.name, false)}
             {maybeRenderStashBoxLink()}
           </div>
         </div>
       </div>
+      {maybeRenderParentTag()}
     </ModalComponent>
   );
 };
diff --git a/ui/v2.5/src/components/Tagger/tags/TagTagger.tsx b/ui/v2.5/src/components/Tagger/tags/TagTagger.tsx
index 1113bdfd4..21891724c 100644
--- a/ui/v2.5/src/components/Tagger/tags/TagTagger.tsx
+++ b/ui/v2.5/src/components/Tagger/tags/TagTagger.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useMemo, useRef, useState } from "react";
+import React, { useEffect, useState } from "react";
 import { Button, Card, Form, InputGroup, ProgressBar } from "react-bootstrap";
 import { FormattedMessage, useIntl } from "react-intl";
 import { Link } from "react-router-dom";
@@ -6,7 +6,6 @@ import { HashLink } from "react-router-hash-link";
 
 import * as GQL from "src/core/generated-graphql";
 import { LoadingIndicator } from "src/components/Shared/LoadingIndicator";
-import { ModalComponent } from "src/components/Shared/Modal";
 import {
   stashBoxTagQuery,
   useJobsSubscribe,
@@ -20,221 +19,33 @@ import StashSearchResult from "./StashSearchResult";
 import TaggerConfig from "../TaggerConfig";
 import { ITaggerConfig, TAG_FIELDS } from "../constants";
 import { useUpdateTag } from "../queries";
-import { faStar, faTags } from "@fortawesome/free-solid-svg-icons";
 import { ExternalLink } from "src/components/Shared/ExternalLink";
 import { mergeTagStashIDs } from "../utils";
 import { separateNamesAndStashIds } from "src/utils/stashIds";
 import { useTaggerConfig } from "../config";
+import {
+  BatchUpdateModal,
+  BatchAddModal,
+} from "src/components/Shared/BatchModals";
 
 type JobFragment = Pick<
   GQL.Job,
   "id" | "status" | "subTasks" | "description" | "progress"
 >;
 
-const CLASSNAME = "StudioTagger";
-
-interface ITagBatchUpdateModal {
-  tags: GQL.TagListDataFragment[];
-  isIdle: boolean;
-  selectedEndpoint: { endpoint: string; index: number };
-  onBatchUpdate: (queryAll: boolean, refresh: boolean) => void;
-  close: () => void;
-}
-
-const TagBatchUpdateModal: React.FC<ITagBatchUpdateModal> = ({
-  tags,
-  isIdle,
-  selectedEndpoint,
-  onBatchUpdate,
-  close,
-}) => {
-  const intl = useIntl();
-
-  const [queryAll, setQueryAll] = useState(false);
-
-  const [refresh, setRefresh] = useState(false);
-  const { data: allTags } = GQL.useFindTagsQuery({
-    variables: {
-      tag_filter: {
-        stash_id_endpoint: {
-          endpoint: selectedEndpoint.endpoint,
-          modifier: refresh
-            ? GQL.CriterionModifier.NotNull
-            : GQL.CriterionModifier.IsNull,
-        },
-      },
-      filter: {
-        per_page: 0,
-      },
-    },
-  });
-
-  const tagCount = useMemo(() => {
-    const filteredStashIDs = tags.map((t) =>
-      t.stash_ids.filter((s) => s.endpoint === selectedEndpoint.endpoint)
-    );
-
-    return queryAll
-      ? allTags?.findTags.count
-      : filteredStashIDs.filter((s) =>
-          refresh ? s.length > 0 : s.length === 0
-        ).length;
-  }, [queryAll, refresh, tags, allTags, selectedEndpoint.endpoint]);
-
-  return (
-    <ModalComponent
-      show
-      icon={faTags}
-      header={intl.formatMessage({
-        id: "tag_tagger.update_tags",
-      })}
-      accept={{
-        text: intl.formatMessage({
-          id: "tag_tagger.update_tags",
-        }),
-        onClick: () => onBatchUpdate(queryAll, refresh),
-      }}
-      cancel={{
-        text: intl.formatMessage({ id: "actions.cancel" }),
-        variant: "danger",
-        onClick: () => close(),
-      }}
-      disabled={!isIdle}
-    >
-      <Form.Group>
-        <Form.Label>
-          <h6>
-            <FormattedMessage id="tag_tagger.tag_selection" />
-          </h6>
-        </Form.Label>
-        <Form.Check
-          id="query-page"
-          type="radio"
-          name="tag-query"
-          label={<FormattedMessage id="tag_tagger.current_page" />}
-          checked={!queryAll}
-          onChange={() => setQueryAll(false)}
-        />
-        <Form.Check
-          id="query-all"
-          type="radio"
-          name="tag-query"
-          label={intl.formatMessage({
-            id: "tag_tagger.query_all_tags_in_the_database",
-          })}
-          checked={queryAll}
-          onChange={() => setQueryAll(true)}
-        />
-      </Form.Group>
-      <Form.Group>
-        <Form.Label>
-          <h6>
-            <FormattedMessage id="tag_tagger.tag_status" />
-          </h6>
-        </Form.Label>
-        <Form.Check
-          id="untagged-tags"
-          type="radio"
-          name="tag-refresh"
-          label={intl.formatMessage({
-            id: "tag_tagger.untagged_tags",
-          })}
-          checked={!refresh}
-          onChange={() => setRefresh(false)}
-        />
-        <Form.Text>
-          <FormattedMessage id="tag_tagger.updating_untagged_tags_description" />
-        </Form.Text>
-        <Form.Check
-          id="tagged-tags"
-          type="radio"
-          name="tag-refresh"
-          label={intl.formatMessage({
-            id: "tag_tagger.refresh_tagged_tags",
-          })}
-          checked={refresh}
-          onChange={() => setRefresh(true)}
-        />
-        <Form.Text>
-          <FormattedMessage id="tag_tagger.refreshing_will_update_the_data" />
-        </Form.Text>
-      </Form.Group>
-      <b>
-        <FormattedMessage
-          id="tag_tagger.number_of_tags_will_be_processed"
-          values={{
-            tag_count: tagCount,
-          }}
-        />
-      </b>
-    </ModalComponent>
-  );
-};
-
-interface ITagBatchAddModal {
-  isIdle: boolean;
-  onBatchAdd: (input: string) => void;
-  close: () => void;
-}
-
-const TagBatchAddModal: React.FC<ITagBatchAddModal> = ({
-  isIdle,
-  onBatchAdd,
-  close,
-}) => {
-  const intl = useIntl();
-
-  const tagInput = useRef<HTMLTextAreaElement | null>(null);
-
-  return (
-    <ModalComponent
-      show
-      icon={faStar}
-      header={intl.formatMessage({
-        id: "tag_tagger.add_new_tags",
-      })}
-      accept={{
-        text: intl.formatMessage({
-          id: "tag_tagger.add_new_tags",
-        }),
-        onClick: () => {
-          if (tagInput.current) {
-            onBatchAdd(tagInput.current.value);
-          } else {
-            close();
-          }
-        },
-      }}
-      cancel={{
-        text: intl.formatMessage({ id: "actions.cancel" }),
-        variant: "danger",
-        onClick: () => close(),
-      }}
-      disabled={!isIdle}
-    >
-      <Form.Control
-        className="text-input"
-        as="textarea"
-        ref={tagInput}
-        placeholder={intl.formatMessage({
-          id: "tag_tagger.tag_names_or_stashids_separated_by_comma",
-        })}
-        rows={6}
-      />
-      <Form.Text>
-        <FormattedMessage id="tag_tagger.any_names_entered_will_be_queried" />
-      </Form.Text>
-    </ModalComponent>
-  );
-};
+const CLASSNAME = "TagTagger";
 
 interface ITagTaggerListProps {
   tags: GQL.TagListDataFragment[];
   selectedEndpoint: { endpoint: string; index: number };
   isIdle: boolean;
   config: ITaggerConfig;
-  onBatchAdd: (tagInput: string) => void;
-  onBatchUpdate: (ids: string[] | undefined, refresh: boolean) => void;
+  onBatchAdd: (tagInput: string, createParent: boolean) => void;
+  onBatchUpdate: (
+    ids: string[] | undefined,
+    refresh: boolean,
+    createParent: boolean
+  ) => void;
 }
 
 const TagTaggerList: React.FC<ITagTaggerListProps> = ({
@@ -261,6 +72,27 @@ const TagTaggerList: React.FC<ITagTaggerListProps> = ({
 
   const [showBatchAdd, setShowBatchAdd] = useState(false);
   const [showBatchUpdate, setShowBatchUpdate] = useState(false);
+  const [batchAddParents, setBatchAddParents] = useState(
+    config.createParentTags || false
+  );
+
+  const [batchUpdateRefresh, setBatchUpdateRefresh] = useState(false);
+  const { data: allTags } = GQL.useFindTagsQuery({
+    skip: !showBatchUpdate,
+    variables: {
+      tag_filter: {
+        stash_id_endpoint: {
+          endpoint: selectedEndpoint.endpoint,
+          modifier: batchUpdateRefresh
+            ? GQL.CriterionModifier.NotNull
+            : GQL.CriterionModifier.IsNull,
+        },
+      },
+      filter: {
+        per_page: 0,
+      },
+    },
+  });
 
   const [error, setError] = useState<
     Record<string, { message?: string; details?: string } | undefined>
@@ -360,12 +192,16 @@ const TagTaggerList: React.FC<ITagTaggerListProps> = ({
   };
 
   async function handleBatchAdd(input: string) {
-    onBatchAdd(input);
+    onBatchAdd(input, batchAddParents);
     setShowBatchAdd(false);
   }
 
   const handleBatchUpdate = (queryAll: boolean, refresh: boolean) => {
-    onBatchUpdate(!queryAll ? tags.map((t) => t.id) : undefined, refresh);
+    onBatchUpdate(
+      !queryAll ? tags.map((t) => t.id) : undefined,
+      refresh,
+      batchAddParents
+    );
     setShowBatchUpdate(false);
   };
 
@@ -451,7 +287,7 @@ const TagTaggerList: React.FC<ITagTaggerListProps> = ({
 
         subContent = (
           <div key={tag.id}>
-            <InputGroup className="StudioTagger-box-link">
+            <InputGroup className="TagTagger-box-link">
               <InputGroup.Text>{link}</InputGroup.Text>
               <InputGroup.Append>
                 <Button
@@ -532,20 +368,31 @@ const TagTaggerList: React.FC<ITagTaggerListProps> = ({
   return (
     <Card>
       {showBatchUpdate && (
-        <TagBatchUpdateModal
+        <BatchUpdateModal
           close={() => setShowBatchUpdate(false)}
           isIdle={isIdle}
           selectedEndpoint={selectedEndpoint}
-          tags={tags}
+          entities={tags}
+          allCount={allTags?.findTags.count}
           onBatchUpdate={handleBatchUpdate}
+          onRefreshChange={setBatchUpdateRefresh}
+          batchAddParents={batchAddParents}
+          setBatchAddParents={setBatchAddParents}
+          localePrefix="tag_tagger"
+          entityName="tag"
+          countVariableName="tag_count"
         />
       )}
 
       {showBatchAdd && (
-        <TagBatchAddModal
+        <BatchAddModal
           close={() => setShowBatchAdd(false)}
           isIdle={isIdle}
           onBatchAdd={handleBatchAdd}
+          batchAddParents={batchAddParents}
+          setBatchAddParents={setBatchAddParents}
+          localePrefix="tag_tagger"
+          entityName="tag"
         />
       )}
       <div className="ml-auto mb-3">
@@ -611,7 +458,7 @@ export const TagTagger: React.FC<ITaggerProps> = ({ tags }) => {
   const selectedEndpoint =
     stashConfig?.general.stashBoxes[selectedEndpointIndex];
 
-  async function batchAdd(tagInput: string) {
+  async function batchAdd(tagInput: string, createParent: boolean) {
     if (tagInput && selectedEndpoint) {
       const inputs = tagInput
         .split(",")
@@ -626,7 +473,7 @@ export const TagTagger: React.FC<ITaggerProps> = ({ tags }) => {
           stash_ids: stashIds.length > 0 ? stashIds : undefined,
           endpoint: selectedEndpointIndex,
           refresh: false,
-          createParent: false,
+          createParent: createParent,
           exclude_fields: config?.excludedTagFields ?? [],
         });
 
@@ -635,13 +482,17 @@ export const TagTagger: React.FC<ITaggerProps> = ({ tags }) => {
     }
   }
 
-  async function batchUpdate(ids: string[] | undefined, refresh: boolean) {
+  async function batchUpdate(
+    ids: string[] | undefined,
+    refresh: boolean,
+    createParent: boolean
+  ) {
     if (selectedEndpoint) {
       const ret = await mutateStashBoxBatchTagTag({
         ids: ids,
         endpoint: selectedEndpointIndex,
         refresh,
-        createParent: false,
+        createParent: createParent,
         exclude_fields: config?.excludedTagFields ?? [],
       });
 
@@ -721,6 +572,28 @@ export const TagTagger: React.FC<ITaggerProps> = ({ tags }) => {
               }
               fields={TAG_FIELDS}
               entityName="tags"
+              extraConfig={
+                <Form.Group
+                  controlId="create-parent"
+                  className="align-items-center"
+                >
+                  <Form.Check
+                    label={
+                      <FormattedMessage id="tag_tagger.config.create_parent_label" />
+                    }
+                    checked={config.createParentTags}
+                    onChange={(e: React.ChangeEvent<HTMLInputElement>) =>
+                      setConfig({
+                        ...config,
+                        createParentTags: e.currentTarget.checked,
+                      })
+                    }
+                  />
+                  <Form.Text>
+                    <FormattedMessage id="tag_tagger.config.create_parent_desc" />
+                  </Form.Text>
+                </Form.Group>
+              }
             />
             <TagTaggerList
               tags={tags}
diff --git a/ui/v2.5/src/locales/en-GB.json b/ui/v2.5/src/locales/en-GB.json
index 3c3fd4f28..1fd650453 100644
--- a/ui/v2.5/src/locales/en-GB.json
+++ b/ui/v2.5/src/locales/en-GB.json
@@ -36,6 +36,7 @@
     "create_marker": "Create Marker",
     "create_new": "Create new",
     "create_parent_studio": "Create parent studio",
+    "create_parent_tag": "Create parent tag",
     "created_entity": "Created {entity_type}: {entity_name}",
     "customise": "Customise",
     "delete": "Delete",
@@ -1605,6 +1606,11 @@
     "any_names_entered_will_be_queried": "Any names entered will be queried from the remote Stash-Box instance and added if found. Only exact matches will be considered a match.",
     "batch_add_tags": "Batch Add Tags",
     "batch_update_tags": "Batch Update Tags",
+    "config": {
+      "create_parent_desc": "Create missing parent tags from stash-box categories, or tag existing parent tags with exact name matches",
+      "create_parent_label": "Create parent tags"
+    },
+    "create_or_tag_parent_tags": "Create missing or tag existing parent tags",
     "current_page": "Current page",
     "failed_to_save_tag": "Failed to save tag \"{tag}\"",
     "name_already_exists": "Name already exists",

From e851d8d3bf270fe7344f183d8ca389673660e797 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Mon, 16 Mar 2026 17:32:43 +1100
Subject: [PATCH 351/405] Treat bad network path error as non-existing folder
 during folder rename check (#6680)

* treat any error as missing folder
---
 pkg/file/folder_rename_detect.go | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkg/file/folder_rename_detect.go b/pkg/file/folder_rename_detect.go
index cfae7e4fb..73a12e3e4 100644
--- a/pkg/file/folder_rename_detect.go
+++ b/pkg/file/folder_rename_detect.go
@@ -2,7 +2,6 @@ package file
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"io/fs"
 
@@ -161,9 +160,7 @@ func (s *Scanner) detectFolderMove(ctx context.Context, file ScannedFile) (*mode
 					continue
 				}
 
-				if !errors.Is(err, fs.ErrNotExist) {
-					return fmt.Errorf("checking for parent folder %q: %w", pf.Path, err)
-				}
+				// treat any error as missing folder
 
 				// parent folder is missing, possible candidate
 				// count the total number of files in the existing folder

From 8d1aeede1c28bac9645fdca6343e9405baacf60e Mon Sep 17 00:00:00 2001
From: dev-null-life <dev-null-life@proton.me>
Date: Mon, 16 Mar 2026 01:48:59 -0500
Subject: [PATCH 352/405] fix: correct typos in GraphQL schema (#6679)

* fix: correct typos in GraphQL schema comments

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* fix: rename CircumisedEnum to CircumcisedEnum across codebase

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* fix: gofmt performer model files after enum rename

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

---------

Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 graphql/schema/types/file.graphql             |   2 +-
 graphql/schema/types/filters.graphql          |  10 +-
 graphql/schema/types/performer.graphql        |  10 +-
 pkg/models/model_performer.go                 |  40 +++---
 pkg/models/model_scraped_item.go              |   2 +-
 pkg/models/performer.go                       | 134 +++++++++---------
 pkg/performer/export_test.go                  |   2 +-
 pkg/performer/import.go                       |   2 +-
 pkg/sqlite/performer.go                       |   2 +-
 pkg/sqlite/performer_test.go                  |  10 +-
 pkg/sqlite/setup_test.go                      |   8 +-
 .../PerformerDetails/PerformerEditPanel.tsx   |   2 +-
 .../PerformerScrapeDialog.tsx                 |   2 +-
 .../components/Performers/PerformerList.tsx   |   2 +-
 .../list-filter/criteria/circumcised.ts       |   4 +-
 ui/v2.5/src/pluginApi.d.ts                    |   2 +-
 ui/v2.5/src/utils/circumcised.ts              |  12 +-
 17 files changed, 123 insertions(+), 123 deletions(-)

diff --git a/graphql/schema/types/file.graphql b/graphql/schema/types/file.graphql
index 37fb5539f..07fa473bc 100644
--- a/graphql/schema/types/file.graphql
+++ b/graphql/schema/types/file.graphql
@@ -156,7 +156,7 @@ input MoveFilesInput {
 
 input SetFingerprintsInput {
   type: String!
-  "an null value will remove the fingerprint"
+  "a null value will remove the fingerprint"
   value: String
 }
 
diff --git a/graphql/schema/types/filters.graphql b/graphql/schema/types/filters.graphql
index 323fb8741..fa1f3a3a4 100644
--- a/graphql/schema/types/filters.graphql
+++ b/graphql/schema/types/filters.graphql
@@ -152,7 +152,7 @@ input PerformerFilterType {
   fake_tits: StringCriterionInput
   "Filter by penis length value"
   penis_length: FloatCriterionInput
-  "Filter by ciricumcision"
+  "Filter by circumcision"
   circumcised: CircumcisionCriterionInput
   "Deprecated: use career_start and career_end. This filter is non-functional."
   career_length: StringCriterionInput
@@ -249,9 +249,9 @@ input SceneMarkerFilterType {
   updated_at: TimestampCriterionInput
   "Filter by scene date"
   scene_date: DateCriterionInput
-  "Filter by cscene reation time"
+  "Filter by scene creation time"
   scene_created_at: TimestampCriterionInput
-  "Filter by lscene ast update time"
+  "Filter by scene last update time"
   scene_updated_at: TimestampCriterionInput
   "Filter by related scenes that meet this criteria"
   scene_filter: SceneFilterType
@@ -665,7 +665,7 @@ input TagFilterType {
   "Filter by number of parent tags the tag has"
   parent_count: IntCriterionInput
 
-  "Filter by number f child tags the tag has"
+  "Filter by number of child tags the tag has"
   child_count: IntCriterionInput
 
   "Filter by autotag ignore value"
@@ -933,7 +933,7 @@ input GenderCriterionInput {
 }
 
 input CircumcisionCriterionInput {
-  value: [CircumisedEnum!]
+  value: [CircumcisedEnum!]
   modifier: CriterionModifier!
 }
 
diff --git a/graphql/schema/types/performer.graphql b/graphql/schema/types/performer.graphql
index 97a80b94f..6b838e832 100644
--- a/graphql/schema/types/performer.graphql
+++ b/graphql/schema/types/performer.graphql
@@ -7,7 +7,7 @@ enum GenderEnum {
   NON_BINARY
 }
 
-enum CircumisedEnum {
+enum CircumcisedEnum {
   CUT
   UNCUT
 }
@@ -29,7 +29,7 @@ type Performer {
   measurements: String
   fake_tits: String
   penis_length: Float
-  circumcised: CircumisedEnum
+  circumcised: CircumcisedEnum
   career_length: String @deprecated(reason: "Use career_start and career_end")
   career_start: Int
   career_end: Int
@@ -78,7 +78,7 @@ input PerformerCreateInput {
   measurements: String
   fake_tits: String
   penis_length: Float
-  circumcised: CircumisedEnum
+  circumcised: CircumcisedEnum
   career_length: String @deprecated(reason: "Use career_start and career_end")
   career_start: Int
   career_end: Int
@@ -119,7 +119,7 @@ input PerformerUpdateInput {
   measurements: String
   fake_tits: String
   penis_length: Float
-  circumcised: CircumisedEnum
+  circumcised: CircumcisedEnum
   career_length: String @deprecated(reason: "Use career_start and career_end")
   career_start: Int
   career_end: Int
@@ -165,7 +165,7 @@ input BulkPerformerUpdateInput {
   measurements: String
   fake_tits: String
   penis_length: Float
-  circumcised: CircumisedEnum
+  circumcised: CircumcisedEnum
   career_length: String @deprecated(reason: "Use career_start and career_end")
   career_start: Int
   career_end: Int
diff --git a/pkg/models/model_performer.go b/pkg/models/model_performer.go
index a30eafa0a..f5415b0b4 100644
--- a/pkg/models/model_performer.go
+++ b/pkg/models/model_performer.go
@@ -6,26 +6,26 @@ import (
 )
 
 type Performer struct {
-	ID             int             `json:"id"`
-	Name           string          `json:"name"`
-	Disambiguation string          `json:"disambiguation"`
-	Gender         *GenderEnum     `json:"gender"`
-	Birthdate      *Date           `json:"birthdate"`
-	Ethnicity      string          `json:"ethnicity"`
-	Country        string          `json:"country"`
-	EyeColor       string          `json:"eye_color"`
-	Height         *int            `json:"height"`
-	Measurements   string          `json:"measurements"`
-	FakeTits       string          `json:"fake_tits"`
-	PenisLength    *float64        `json:"penis_length"`
-	Circumcised    *CircumisedEnum `json:"circumcised"`
-	CareerStart    *int            `json:"career_start"`
-	CareerEnd      *int            `json:"career_end"`
-	Tattoos        string          `json:"tattoos"`
-	Piercings      string          `json:"piercings"`
-	Favorite       bool            `json:"favorite"`
-	CreatedAt      time.Time       `json:"created_at"`
-	UpdatedAt      time.Time       `json:"updated_at"`
+	ID             int              `json:"id"`
+	Name           string           `json:"name"`
+	Disambiguation string           `json:"disambiguation"`
+	Gender         *GenderEnum      `json:"gender"`
+	Birthdate      *Date            `json:"birthdate"`
+	Ethnicity      string           `json:"ethnicity"`
+	Country        string           `json:"country"`
+	EyeColor       string           `json:"eye_color"`
+	Height         *int             `json:"height"`
+	Measurements   string           `json:"measurements"`
+	FakeTits       string           `json:"fake_tits"`
+	PenisLength    *float64         `json:"penis_length"`
+	Circumcised    *CircumcisedEnum `json:"circumcised"`
+	CareerStart    *int             `json:"career_start"`
+	CareerEnd      *int             `json:"career_end"`
+	Tattoos        string           `json:"tattoos"`
+	Piercings      string           `json:"piercings"`
+	Favorite       bool             `json:"favorite"`
+	CreatedAt      time.Time        `json:"created_at"`
+	UpdatedAt      time.Time        `json:"updated_at"`
 	// Rating expressed in 1-100 scale
 	Rating        *int   `json:"rating"`
 	Details       string `json:"details"`
diff --git a/pkg/models/model_scraped_item.go b/pkg/models/model_scraped_item.go
index 1a64d0849..a5fa5d8ef 100644
--- a/pkg/models/model_scraped_item.go
+++ b/pkg/models/model_scraped_item.go
@@ -288,7 +288,7 @@ func (p *ScrapedPerformer) ToPerformer(endpoint string, excluded map[string]bool
 		}
 	}
 	if p.Circumcised != nil && !excluded["circumcised"] {
-		v := CircumisedEnum(*p.Circumcised)
+		v := CircumcisedEnum(*p.Circumcised)
 		if v.IsValid() {
 			ret.Circumcised = &v
 		}
diff --git a/pkg/models/performer.go b/pkg/models/performer.go
index 8de5d94f4..16d351372 100644
--- a/pkg/models/performer.go
+++ b/pkg/models/performer.go
@@ -61,49 +61,49 @@ type GenderCriterionInput struct {
 	Modifier  CriterionModifier `json:"modifier"`
 }
 
-type CircumisedEnum string
+type CircumcisedEnum string
 
 const (
-	CircumisedEnumCut   CircumisedEnum = "CUT"
-	CircumisedEnumUncut CircumisedEnum = "UNCUT"
+	CircumcisedEnumCut   CircumcisedEnum = "CUT"
+	CircumcisedEnumUncut CircumcisedEnum = "UNCUT"
 )
 
-var AllCircumcisionEnum = []CircumisedEnum{
-	CircumisedEnumCut,
-	CircumisedEnumUncut,
+var AllCircumcisionEnum = []CircumcisedEnum{
+	CircumcisedEnumCut,
+	CircumcisedEnumUncut,
 }
 
-func (e CircumisedEnum) IsValid() bool {
+func (e CircumcisedEnum) IsValid() bool {
 	switch e {
-	case CircumisedEnumCut, CircumisedEnumUncut:
+	case CircumcisedEnumCut, CircumcisedEnumUncut:
 		return true
 	}
 	return false
 }
 
-func (e CircumisedEnum) String() string {
+func (e CircumcisedEnum) String() string {
 	return string(e)
 }
 
-func (e *CircumisedEnum) UnmarshalGQL(v interface{}) error {
+func (e *CircumcisedEnum) UnmarshalGQL(v interface{}) error {
 	str, ok := v.(string)
 	if !ok {
 		return fmt.Errorf("enums must be strings")
 	}
 
-	*e = CircumisedEnum(str)
+	*e = CircumcisedEnum(str)
 	if !e.IsValid() {
-		return fmt.Errorf("%s is not a valid CircumisedEnum", str)
+		return fmt.Errorf("%s is not a valid CircumcisedEnum", str)
 	}
 	return nil
 }
 
-func (e CircumisedEnum) MarshalGQL(w io.Writer) {
+func (e CircumcisedEnum) MarshalGQL(w io.Writer) {
 	fmt.Fprint(w, strconv.Quote(e.String()))
 }
 
 type CircumcisionCriterionInput struct {
-	Value    []CircumisedEnum  `json:"value"`
+	Value    []CircumcisedEnum `json:"value"`
 	Modifier CriterionModifier `json:"modifier"`
 }
 
@@ -216,32 +216,32 @@ type PerformerFilterType struct {
 }
 
 type PerformerCreateInput struct {
-	Name           string          `json:"name"`
-	Disambiguation *string         `json:"disambiguation"`
-	URL            *string         `json:"url"` // deprecated
-	Urls           []string        `json:"urls"`
-	Gender         *GenderEnum     `json:"gender"`
-	Birthdate      *string         `json:"birthdate"`
-	Ethnicity      *string         `json:"ethnicity"`
-	Country        *string         `json:"country"`
-	EyeColor       *string         `json:"eye_color"`
-	Height         *string         `json:"height"`
-	HeightCm       *int            `json:"height_cm"`
-	Measurements   *string         `json:"measurements"`
-	FakeTits       *string         `json:"fake_tits"`
-	PenisLength    *float64        `json:"penis_length"`
-	Circumcised    *CircumisedEnum `json:"circumcised"`
-	CareerLength   *string         `json:"career_length"`
-	CareerStart    *int            `json:"career_start"`
-	CareerEnd      *int            `json:"career_end"`
-	Tattoos        *string         `json:"tattoos"`
-	Piercings      *string         `json:"piercings"`
-	Aliases        *string         `json:"aliases"`
-	AliasList      []string        `json:"alias_list"`
-	Twitter        *string         `json:"twitter"`   // deprecated
-	Instagram      *string         `json:"instagram"` // deprecated
-	Favorite       *bool           `json:"favorite"`
-	TagIds         []string        `json:"tag_ids"`
+	Name           string           `json:"name"`
+	Disambiguation *string          `json:"disambiguation"`
+	URL            *string          `json:"url"` // deprecated
+	Urls           []string         `json:"urls"`
+	Gender         *GenderEnum      `json:"gender"`
+	Birthdate      *string          `json:"birthdate"`
+	Ethnicity      *string          `json:"ethnicity"`
+	Country        *string          `json:"country"`
+	EyeColor       *string          `json:"eye_color"`
+	Height         *string          `json:"height"`
+	HeightCm       *int             `json:"height_cm"`
+	Measurements   *string          `json:"measurements"`
+	FakeTits       *string          `json:"fake_tits"`
+	PenisLength    *float64         `json:"penis_length"`
+	Circumcised    *CircumcisedEnum `json:"circumcised"`
+	CareerLength   *string          `json:"career_length"`
+	CareerStart    *int             `json:"career_start"`
+	CareerEnd      *int             `json:"career_end"`
+	Tattoos        *string          `json:"tattoos"`
+	Piercings      *string          `json:"piercings"`
+	Aliases        *string          `json:"aliases"`
+	AliasList      []string         `json:"alias_list"`
+	Twitter        *string          `json:"twitter"`   // deprecated
+	Instagram      *string          `json:"instagram"` // deprecated
+	Favorite       *bool            `json:"favorite"`
+	TagIds         []string         `json:"tag_ids"`
 	// This should be a URL or a base64 encoded data URL
 	Image         *string        `json:"image"`
 	StashIds      []StashIDInput `json:"stash_ids"`
@@ -256,33 +256,33 @@ type PerformerCreateInput struct {
 }
 
 type PerformerUpdateInput struct {
-	ID             string          `json:"id"`
-	Name           *string         `json:"name"`
-	Disambiguation *string         `json:"disambiguation"`
-	URL            *string         `json:"url"` // deprecated
-	Urls           []string        `json:"urls"`
-	Gender         *GenderEnum     `json:"gender"`
-	Birthdate      *string         `json:"birthdate"`
-	Ethnicity      *string         `json:"ethnicity"`
-	Country        *string         `json:"country"`
-	EyeColor       *string         `json:"eye_color"`
-	Height         *string         `json:"height"`
-	HeightCm       *int            `json:"height_cm"`
-	Measurements   *string         `json:"measurements"`
-	FakeTits       *string         `json:"fake_tits"`
-	PenisLength    *float64        `json:"penis_length"`
-	Circumcised    *CircumisedEnum `json:"circumcised"`
-	CareerLength   *string         `json:"career_length"`
-	CareerStart    *int            `json:"career_start"`
-	CareerEnd      *int            `json:"career_end"`
-	Tattoos        *string         `json:"tattoos"`
-	Piercings      *string         `json:"piercings"`
-	Aliases        *string         `json:"aliases"`
-	AliasList      []string        `json:"alias_list"`
-	Twitter        *string         `json:"twitter"`   // deprecated
-	Instagram      *string         `json:"instagram"` // deprecated
-	Favorite       *bool           `json:"favorite"`
-	TagIds         []string        `json:"tag_ids"`
+	ID             string           `json:"id"`
+	Name           *string          `json:"name"`
+	Disambiguation *string          `json:"disambiguation"`
+	URL            *string          `json:"url"` // deprecated
+	Urls           []string         `json:"urls"`
+	Gender         *GenderEnum      `json:"gender"`
+	Birthdate      *string          `json:"birthdate"`
+	Ethnicity      *string          `json:"ethnicity"`
+	Country        *string          `json:"country"`
+	EyeColor       *string          `json:"eye_color"`
+	Height         *string          `json:"height"`
+	HeightCm       *int             `json:"height_cm"`
+	Measurements   *string          `json:"measurements"`
+	FakeTits       *string          `json:"fake_tits"`
+	PenisLength    *float64         `json:"penis_length"`
+	Circumcised    *CircumcisedEnum `json:"circumcised"`
+	CareerLength   *string          `json:"career_length"`
+	CareerStart    *int             `json:"career_start"`
+	CareerEnd      *int             `json:"career_end"`
+	Tattoos        *string          `json:"tattoos"`
+	Piercings      *string          `json:"piercings"`
+	Aliases        *string          `json:"aliases"`
+	AliasList      []string         `json:"alias_list"`
+	Twitter        *string          `json:"twitter"`   // deprecated
+	Instagram      *string          `json:"instagram"` // deprecated
+	Favorite       *bool            `json:"favorite"`
+	TagIds         []string         `json:"tag_ids"`
 	// This should be a URL or a base64 encoded data URL
 	Image         *string        `json:"image"`
 	StashIds      []StashIDInput `json:"stash_ids"`
diff --git a/pkg/performer/export_test.go b/pkg/performer/export_test.go
index 1a87bc2b1..626e16173 100644
--- a/pkg/performer/export_test.go
+++ b/pkg/performer/export_test.go
@@ -51,7 +51,7 @@ var (
 	careerStart     = 2005
 	careerEnd       = 2015
 	penisLength     = 1.23
-	circumcisedEnum = models.CircumisedEnumCut
+	circumcisedEnum = models.CircumcisedEnumCut
 	circumcised     = circumcisedEnum.String()
 
 	emptyCustomFields = make(map[string]interface{})
diff --git a/pkg/performer/import.go b/pkg/performer/import.go
index 1df69521a..f6a006457 100644
--- a/pkg/performer/import.go
+++ b/pkg/performer/import.go
@@ -247,7 +247,7 @@ func performerJSONToPerformer(performerJSON jsonschema.Performer) (models.Perfor
 	}
 
 	if performerJSON.Circumcised != "" {
-		v := models.CircumisedEnum(performerJSON.Circumcised)
+		v := models.CircumcisedEnum(performerJSON.Circumcised)
 		newPerformer.Circumcised = &v
 	}
 
diff --git a/pkg/sqlite/performer.go b/pkg/sqlite/performer.go
index 298a681fd..62c069b51 100644
--- a/pkg/sqlite/performer.go
+++ b/pkg/sqlite/performer.go
@@ -134,7 +134,7 @@ func (r *performerRow) resolve() *models.Performer {
 	}
 
 	if r.Circumcised.ValueOrZero() != "" {
-		v := models.CircumisedEnum(r.Circumcised.String)
+		v := models.CircumcisedEnum(r.Circumcised.String)
 		ret.Circumcised = &v
 	}
 
diff --git a/pkg/sqlite/performer_test.go b/pkg/sqlite/performer_test.go
index 46a5febee..6dd38d881 100644
--- a/pkg/sqlite/performer_test.go
+++ b/pkg/sqlite/performer_test.go
@@ -65,7 +65,7 @@ func Test_PerformerStore_Create(t *testing.T) {
 		measurements   = "measurements"
 		fakeTits       = "fakeTits"
 		penisLength    = 1.23
-		circumcised    = models.CircumisedEnumCut
+		circumcised    = models.CircumcisedEnumCut
 		careerStart    = 2005
 		careerEnd      = 2015
 		tattoos        = "tattoos"
@@ -228,7 +228,7 @@ func Test_PerformerStore_Update(t *testing.T) {
 		measurements   = "measurements"
 		fakeTits       = "fakeTits"
 		penisLength    = 1.23
-		circumcised    = models.CircumisedEnumCut
+		circumcised    = models.CircumcisedEnumCut
 		careerStart    = 2005
 		careerEnd      = 2015
 		tattoos        = "tattoos"
@@ -457,7 +457,7 @@ func Test_PerformerStore_UpdatePartial(t *testing.T) {
 		measurements   = "measurements"
 		fakeTits       = "fakeTits"
 		penisLength    = 1.23
-		circumcised    = models.CircumisedEnumCut
+		circumcised    = models.CircumcisedEnumCut
 		careerStart    = 2005
 		careerEnd      = 2015
 		tattoos        = "tattoos"
@@ -1200,7 +1200,7 @@ func TestPerformerQuery(t *testing.T) {
 			nil,
 			&models.PerformerFilterType{
 				Circumcised: &models.CircumcisionCriterionInput{
-					Value:    []models.CircumisedEnum{models.CircumisedEnumCut},
+					Value:    []models.CircumcisedEnum{models.CircumcisedEnumCut},
 					Modifier: models.CriterionModifierIncludes,
 				},
 			},
@@ -1213,7 +1213,7 @@ func TestPerformerQuery(t *testing.T) {
 			nil,
 			&models.PerformerFilterType{
 				Circumcised: &models.CircumcisionCriterionInput{
-					Value:    []models.CircumisedEnum{models.CircumisedEnumCut},
+					Value:    []models.CircumcisedEnum{models.CircumcisedEnumCut},
 					Modifier: models.CriterionModifierExcludes,
 				},
 			},
diff --git a/pkg/sqlite/setup_test.go b/pkg/sqlite/setup_test.go
index db59ff570..f0f103a77 100644
--- a/pkg/sqlite/setup_test.go
+++ b/pkg/sqlite/setup_test.go
@@ -1626,15 +1626,15 @@ func getPerformerPenisLength(index int) *float64 {
 	return &ret
 }
 
-func getPerformerCircumcised(index int) *models.CircumisedEnum {
-	var ret models.CircumisedEnum
+func getPerformerCircumcised(index int) *models.CircumcisedEnum {
+	var ret models.CircumcisedEnum
 	switch {
 	case index%3 == 0:
 		return nil
 	case index%3 == 1:
-		ret = models.CircumisedEnumCut
+		ret = models.CircumcisedEnumCut
 	default:
-		ret = models.CircumisedEnumUncut
+		ret = models.CircumcisedEnumUncut
 	}
 
 	return &ret
diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
index 93b69e7b5..a82a1f8c8 100644
--- a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
@@ -116,7 +116,7 @@ export const PerformerEditPanel: React.FC<IPerformerDetails> = ({
     measurements: yup.string().ensure(),
     fake_tits: yup.string().ensure(),
     penis_length: yupInputNumber().positive().nullable().defined(),
-    circumcised: yupInputEnum(GQL.CircumisedEnum).nullable().defined(),
+    circumcised: yupInputEnum(GQL.CircumcisedEnum).nullable().defined(),
     tattoos: yup.string().ensure(),
     piercings: yup.string().ensure(),
     career_start: yupInputNumber().positive().nullable().defined(),
diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerScrapeDialog.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerScrapeDialog.tsx
index d5146592b..6167ea3a2 100644
--- a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerScrapeDialog.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerScrapeDialog.tsx
@@ -191,7 +191,7 @@ export const PerformerScrapeDialog: React.FC<IPerformerScrapeDialogProps> = (
       return;
     }
 
-    let retEnum: GQL.CircumisedEnum | undefined;
+    let retEnum: GQL.CircumcisedEnum | undefined;
 
     // try to translate from enum values first
     const upperCircumcised = scrapedCircumcised.toUpperCase();
diff --git a/ui/v2.5/src/components/Performers/PerformerList.tsx b/ui/v2.5/src/components/Performers/PerformerList.tsx
index 8d002a1e6..87258b35b 100644
--- a/ui/v2.5/src/components/Performers/PerformerList.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerList.tsx
@@ -145,7 +145,7 @@ export function formatYearRange(
   return `${start ?? ""} - ${end ?? ""}`;
 }
 
-export const FormatCircumcised = (circumcised?: GQL.CircumisedEnum | null) => {
+export const FormatCircumcised = (circumcised?: GQL.CircumcisedEnum | null) => {
   const intl = useIntl();
   if (!circumcised) {
     return "";
diff --git a/ui/v2.5/src/models/list-filter/criteria/circumcised.ts b/ui/v2.5/src/models/list-filter/criteria/circumcised.ts
index b1419ee8b..871f4f8bc 100644
--- a/ui/v2.5/src/models/list-filter/criteria/circumcised.ts
+++ b/ui/v2.5/src/models/list-filter/criteria/circumcised.ts
@@ -1,6 +1,6 @@
 import {
   CircumcisionCriterionInput,
-  CircumisedEnum,
+  CircumcisedEnum,
   CriterionModifier,
 } from "src/core/generated-graphql";
 import { circumcisedStrings, stringToCircumcised } from "src/utils/circumcised";
@@ -28,7 +28,7 @@ export class CircumcisedCriterion extends MultiStringCriterion {
   public toCriterionInput(): CircumcisionCriterionInput {
     const value = this.value.map((v) =>
       stringToCircumcised(v)
-    ) as CircumisedEnum[];
+    ) as CircumcisedEnum[];
 
     return {
       value,
diff --git a/ui/v2.5/src/pluginApi.d.ts b/ui/v2.5/src/pluginApi.d.ts
index e04d472b6..ed7ca1962 100644
--- a/ui/v2.5/src/pluginApi.d.ts
+++ b/ui/v2.5/src/pluginApi.d.ts
@@ -15,7 +15,7 @@ declare namespace PluginApi {
     const BulkPerformerUpdateDocument: { [key: string]: any };
     const BulkSceneUpdateDocument: { [key: string]: any };
     const BulkUpdateIdMode: { [key: string]: any };
-    const CircumisedEnum: { [key: string]: any };
+    const CircumcisedEnum: { [key: string]: any };
     const ConfigDataFragmentDoc: { [key: string]: any };
     const ConfigDefaultSettingsDataFragmentDoc: { [key: string]: any };
     const ConfigDlnaDataFragmentDoc: { [key: string]: any };
diff --git a/ui/v2.5/src/utils/circumcised.ts b/ui/v2.5/src/utils/circumcised.ts
index b922a7795..5a53dee65 100644
--- a/ui/v2.5/src/utils/circumcised.ts
+++ b/ui/v2.5/src/utils/circumcised.ts
@@ -1,12 +1,12 @@
 import * as GQL from "../core/generated-graphql";
 
-export const stringCircumMap = new Map<string, GQL.CircumisedEnum>([
-  ["Uncut", GQL.CircumisedEnum.Uncut],
-  ["Cut", GQL.CircumisedEnum.Cut],
+export const stringCircumMap = new Map<string, GQL.CircumcisedEnum>([
+  ["Uncut", GQL.CircumcisedEnum.Uncut],
+  ["Cut", GQL.CircumcisedEnum.Cut],
 ]);
 
 export const circumcisedToString = (
-  value?: GQL.CircumisedEnum | String | null
+  value?: GQL.CircumcisedEnum | String | null
 ) => {
   if (!value) {
     return undefined;
@@ -24,12 +24,12 @@ export const circumcisedToString = (
 export const stringToCircumcised = (
   value?: string | null,
   caseInsensitive?: boolean
-): GQL.CircumisedEnum | undefined => {
+): GQL.CircumcisedEnum | undefined => {
   if (!value) {
     return undefined;
   }
 
-  const existing = Object.entries(GQL.CircumisedEnum).find(
+  const existing = Object.entries(GQL.CircumcisedEnum).find(
     (e) => e[1] === value
   );
   if (existing) return existing[1];

From 7872029ffa07d040d94982797c942fa5ac4a1c20 Mon Sep 17 00:00:00 2001
From: feederbox826 <me@feederbox.cc>
Date: Mon, 16 Mar 2026 03:05:02 -0400
Subject: [PATCH 353/405] add patching for scene-specs-overlay (#6684)

---
 ui/v2.5/src/components/Scenes/SceneCard.tsx | 52 +++++++++++----------
 ui/v2.5/src/components/Scenes/styles.scss   |  5 +-
 ui/v2.5/src/docs/en/Manual/UIPluginApi.md   |  1 +
 ui/v2.5/src/pluginApi.d.ts                  |  1 +
 4 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/ui/v2.5/src/components/Scenes/SceneCard.tsx b/ui/v2.5/src/components/Scenes/SceneCard.tsx
index e840dcbac..0a80880f1 100644
--- a/ui/v2.5/src/components/Scenes/SceneCard.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneCard.tsx
@@ -356,32 +356,34 @@ interface ISceneSpecsOverlay {
   scene: GQL.SlimSceneDataFragment;
 }
 
-export const SceneSpecsOverlay: React.FC<ISceneSpecsOverlay> = ({ scene }) => {
-  if (!scene.files.length) return null;
-  let file = scene.files[0];
-  return (
-    <div className="scene-specs-overlay">
-      <span className="overlay-filesize extra-scene-info">
-        <FileSize size={file.size} />
-      </span>
-      {file.width && file.height ? (
-        <span className="overlay-resolution">
-          {" "}
-          {TextUtils.resolution(file.width, file.height)}
+export const SceneSpecsOverlay: React.FC<ISceneSpecsOverlay> = PatchComponent(
+  "SceneCard.SceneSpecs",
+  ({ scene }) => {
+    const file = scene.files?.[0];
+    if (!file) return null;
+    return (
+      <div className="scene-specs-overlay">
+        <span className="overlay-filesize extra-scene-info">
+          <FileSize size={file.size} />
         </span>
-      ) : (
-        ""
-      )}
-      {(file.duration ?? 0) >= 1 ? (
-        <span className="overlay-duration">
-          {TextUtils.secondsToTimestamp(file.duration)}
-        </span>
-      ) : (
-        ""
-      )}
-    </div>
-  );
-};
+        {file.width && file.height ? (
+          <span className="overlay-resolution">
+            {TextUtils.resolution(file.width, file.height)}
+          </span>
+        ) : (
+          ""
+        )}
+        {file.duration > 0 ? (
+          <span className="overlay-duration">
+            {TextUtils.secondsToTimestamp(file.duration)}
+          </span>
+        ) : (
+          ""
+        )}
+      </div>
+    );
+  }
+);
 
 const SceneCardImage = PatchComponent(
   "SceneCard.Image",
diff --git a/ui/v2.5/src/components/Scenes/styles.scss b/ui/v2.5/src/components/Scenes/styles.scss
index 3f142f4bd..8eb63f378 100644
--- a/ui/v2.5/src/components/Scenes/styles.scss
+++ b/ui/v2.5/src/components/Scenes/styles.scss
@@ -190,6 +190,10 @@ textarea.scene-description {
   right: 0.7rem;
 }
 
+.scene-specs-overlay > span:not(:last-child) {
+  margin-right: 0.3rem;
+}
+
 .scene-interactive-speed-overlay {
   left: 0.7rem;
 }
@@ -200,7 +204,6 @@ textarea.scene-description {
 
 .overlay-resolution {
   font-weight: 900;
-  margin-right: 0.3rem;
   text-transform: uppercase;
 }
 
diff --git a/ui/v2.5/src/docs/en/Manual/UIPluginApi.md b/ui/v2.5/src/docs/en/Manual/UIPluginApi.md
index 68d5676d3..a1bd7c434 100644
--- a/ui/v2.5/src/docs/en/Manual/UIPluginApi.md
+++ b/ui/v2.5/src/docs/en/Manual/UIPluginApi.md
@@ -311,6 +311,7 @@ Returns `void`.
 - `SceneCard.Image`
 - `SceneCard.Overlays`
 - `SceneCard.Popovers`
+- `SceneCard.SceneSpecs`
 - `SceneCardsGrid`
 - `SceneFileInfoPanel`
 - `SceneIDSelect`
diff --git a/ui/v2.5/src/pluginApi.d.ts b/ui/v2.5/src/pluginApi.d.ts
index ed7ca1962..35d0df65d 100644
--- a/ui/v2.5/src/pluginApi.d.ts
+++ b/ui/v2.5/src/pluginApi.d.ts
@@ -746,6 +746,7 @@ declare namespace PluginApi {
     "SceneCard.Image": React.FC<any>;
     "SceneCard.Overlays": React.FC<any>;
     "SceneCard.Popovers": React.FC<any>;
+    "SceneCard.SceneSpecs": React.FC<any>;
     SceneCardGrid: React.FC<any>;
     SceneList: React.FC<any>;
     SceneListOperations: React.FC<any>;

From c2e80d26764ab73e9009454c83cdd309c4773185 Mon Sep 17 00:00:00 2001
From: notsafeforgit <96166447+notsafeforgit@users.noreply.github.com>
Date: Mon, 16 Mar 2026 16:18:44 -0700
Subject: [PATCH 354/405] feat: add image details to search filter (#6673)

* feat: add image details to search filter

This change adds the image details field to the image search filter, allowing for better discovery of images based on their description.
---------
Co-authored-by: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
---
 pkg/sqlite/image.go      |  2 +-
 pkg/sqlite/image_test.go | 14 ++++++++++++++
 pkg/sqlite/setup_test.go |  8 +++++---
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/pkg/sqlite/image.go b/pkg/sqlite/image.go
index b92a1c073..e0ac576d8 100644
--- a/pkg/sqlite/image.go
+++ b/pkg/sqlite/image.go
@@ -837,7 +837,7 @@ func (qb *ImageStore) makeQuery(ctx context.Context, imageFilter *models.ImageFi
 		)
 
 		filepathColumn := "folders.path || '" + string(filepath.Separator) + "' || files.basename"
-		searchColumns := []string{"images.title", filepathColumn, "files_fingerprints.fingerprint"}
+		searchColumns := []string{"images.title", "images.details", filepathColumn, "files_fingerprints.fingerprint"}
 		query.parseQueryString(searchColumns, *q)
 	}
 
diff --git a/pkg/sqlite/image_test.go b/pkg/sqlite/image_test.go
index 3bad40b3b..85337c911 100644
--- a/pkg/sqlite/image_test.go
+++ b/pkg/sqlite/image_test.go
@@ -1596,6 +1596,20 @@ func TestImageQueryQ(t *testing.T) {
 	})
 }
 
+func TestImageQueryQ_Details(t *testing.T) {
+	withTxn(func(ctx context.Context) error {
+		const imageIdx = 3
+
+		q := getImageStringValue(imageIdx, detailsField)
+
+		sqb := db.Image
+
+		imageQueryQ(ctx, t, sqb, q, imageIdx)
+
+		return nil
+	})
+}
+
 func queryImagesWithCount(ctx context.Context, sqb models.ImageReader, imageFilter *models.ImageFilterType, findFilter *models.FindFilterType) ([]*models.Image, int, error) {
 	result, err := sqb.Query(ctx, models.ImageQueryOptions{
 		QueryOptions: models.QueryOptions{
diff --git a/pkg/sqlite/setup_test.go b/pkg/sqlite/setup_test.go
index f0f103a77..cb5744636 100644
--- a/pkg/sqlite/setup_test.go
+++ b/pkg/sqlite/setup_test.go
@@ -306,6 +306,7 @@ const (
 	pathField            = "Path"
 	checksumField        = "Checksum"
 	titleField           = "Title"
+	detailsField         = "Details"
 	urlField             = "URL"
 	zipPath              = "zipPath.zip"
 	firstSavedFilterName = "firstSavedFilterName"
@@ -1305,9 +1306,10 @@ func makeImage(i int) *models.Image {
 	tids := indexesToIDs(tagIDs, imageTags[i])
 
 	return &models.Image{
-		Title:  title,
-		Rating: getIntPtr(getRating(i)),
-		Date:   getObjectDate(i),
+		Title:   title,
+		Details: getImageStringValue(i, detailsField),
+		Rating:  getIntPtr(getRating(i)),
+		Date:    getObjectDate(i),
 		URLs: models.NewRelatedStrings([]string{
 			getImageEmptyString(i, urlField),
 		}),

From f3c8e7ac9c8c8971aa5625ffa90ca1b57ac21294 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Tue, 17 Mar 2026 15:48:30 +1100
Subject: [PATCH 355/405] Convert career length fields to dates (#6682)

* Convert career start/end to date
* Update UI to accept dates for career length fields
* Fix date filtering
---------
Co-authored-by: Gykes <24581046+Gykes@users.noreply.github.com>
---
 graphql/schema/types/filters.graphql          |   8 +-
 graphql/schema/types/performer.graphql        |  16 +-
 .../schema/types/scraped-performer.graphql    |   8 +-
 internal/api/resolver_model_performer.go      |  19 ++-
 internal/api/resolver_mutation_performer.go   |  63 +++++---
 pkg/models/date.go                            | 112 ++++++++++++++
 pkg/models/date_test.go                       | 101 ++++++++++++
 pkg/models/jsonschema/performer.go            |   4 +-
 pkg/models/model_performer.go                 |   8 +-
 pkg/models/model_scraped_item.go              |  22 +--
 pkg/models/model_scraped_item_test.go         |  10 +-
 pkg/models/performer.go                       |  12 +-
 pkg/performer/export.go                       |   4 +-
 pkg/performer/export_test.go                  |   8 +-
 pkg/performer/import.go                       |  14 +-
 pkg/performer/import_test.go                  |  12 +-
 pkg/scraper/mapped_result.go                  |   4 +-
 pkg/scraper/performer.go                      |   4 +-
 pkg/scraper/post_processing_test.go           | 144 ++++++++++++++++++
 pkg/scraper/postprocessing.go                 |  67 ++++++--
 pkg/sqlite/database.go                        |   2 +-
 pkg/sqlite/migrations/78_postmigrate.go       |  21 ++-
 .../85_performer_career_dates.up.sql          | 112 ++++++++++++++
 pkg/sqlite/performer.go                       |  58 +++----
 pkg/sqlite/performer_filter.go                |  54 +++++--
 pkg/sqlite/performer_test.go                  |  60 ++++----
 pkg/sqlite/scene_test.go                      |  27 ++++
 pkg/sqlite/setup_test.go                      |  12 +-
 pkg/sqlite/sql.go                             |   7 +-
 pkg/stashbox/performer.go                     |  10 +-
 pkg/utils/date.go                             |  79 ----------
 pkg/utils/date_test.go                        |  65 --------
 .../Performers/EditPerformersDialog.tsx       |  30 +++-
 .../PerformerDetails/PerformerEditPanel.tsx   |  12 +-
 .../PerformerScrapeDialog.tsx                 |  13 +-
 .../components/Performers/PerformerList.tsx   |   5 +-
 .../Performers/PerformerMergeDialog.tsx       |   8 +-
 ui/v2.5/src/core/performers.ts                |   6 +-
 ui/v2.5/src/models/list-filter/performers.ts  |   4 +-
 39 files changed, 861 insertions(+), 364 deletions(-)
 create mode 100644 pkg/scraper/post_processing_test.go
 create mode 100644 pkg/sqlite/migrations/85_performer_career_dates.up.sql

diff --git a/graphql/schema/types/filters.graphql b/graphql/schema/types/filters.graphql
index fa1f3a3a4..c7d880266 100644
--- a/graphql/schema/types/filters.graphql
+++ b/graphql/schema/types/filters.graphql
@@ -157,10 +157,10 @@ input PerformerFilterType {
   "Deprecated: use career_start and career_end. This filter is non-functional."
   career_length: StringCriterionInput
     @deprecated(reason: "Use career_start and career_end")
-  "Filter by career start year"
-  career_start: IntCriterionInput
-  "Filter by career end year"
-  career_end: IntCriterionInput
+  "Filter by career start"
+  career_start: DateCriterionInput
+  "Filter by career end"
+  career_end: DateCriterionInput
   "Filter by tattoos"
   tattoos: StringCriterionInput
   "Filter by piercings"
diff --git a/graphql/schema/types/performer.graphql b/graphql/schema/types/performer.graphql
index 6b838e832..bf17298da 100644
--- a/graphql/schema/types/performer.graphql
+++ b/graphql/schema/types/performer.graphql
@@ -31,8 +31,8 @@ type Performer {
   penis_length: Float
   circumcised: CircumcisedEnum
   career_length: String @deprecated(reason: "Use career_start and career_end")
-  career_start: Int
-  career_end: Int
+  career_start: String
+  career_end: String
   tattoos: String
   piercings: String
   alias_list: [String!]!
@@ -80,8 +80,8 @@ input PerformerCreateInput {
   penis_length: Float
   circumcised: CircumcisedEnum
   career_length: String @deprecated(reason: "Use career_start and career_end")
-  career_start: Int
-  career_end: Int
+  career_start: String
+  career_end: String
   tattoos: String
   piercings: String
   "Duplicate aliases and those equal to name will be ignored (case-insensitive)"
@@ -121,8 +121,8 @@ input PerformerUpdateInput {
   penis_length: Float
   circumcised: CircumcisedEnum
   career_length: String @deprecated(reason: "Use career_start and career_end")
-  career_start: Int
-  career_end: Int
+  career_start: String
+  career_end: String
   tattoos: String
   piercings: String
   "Duplicate aliases and those equal to name will be ignored (case-insensitive)"
@@ -167,8 +167,8 @@ input BulkPerformerUpdateInput {
   penis_length: Float
   circumcised: CircumcisedEnum
   career_length: String @deprecated(reason: "Use career_start and career_end")
-  career_start: Int
-  career_end: Int
+  career_start: String
+  career_end: String
   tattoos: String
   piercings: String
   "Duplicate aliases and those equal to name will result in an error (case-insensitive)"
diff --git a/graphql/schema/types/scraped-performer.graphql b/graphql/schema/types/scraped-performer.graphql
index 0818e61c2..799b5cd6e 100644
--- a/graphql/schema/types/scraped-performer.graphql
+++ b/graphql/schema/types/scraped-performer.graphql
@@ -19,8 +19,8 @@ type ScrapedPerformer {
   penis_length: String
   circumcised: String
   career_length: String @deprecated(reason: "Use career_start and career_end")
-  career_start: Int
-  career_end: Int
+  career_start: String
+  career_end: String
   tattoos: String
   piercings: String
   # aliases must be comma-delimited to be parsed correctly
@@ -57,8 +57,8 @@ input ScrapedPerformerInput {
   penis_length: String
   circumcised: String
   career_length: String @deprecated(reason: "Use career_start and career_end")
-  career_start: Int
-  career_end: Int
+  career_start: String
+  career_end: String
   tattoos: String
   piercings: String
   aliases: String
diff --git a/internal/api/resolver_model_performer.go b/internal/api/resolver_model_performer.go
index b770f5801..261a98ff3 100644
--- a/internal/api/resolver_model_performer.go
+++ b/internal/api/resolver_model_performer.go
@@ -10,7 +10,6 @@ import (
 	"github.com/stashapp/stash/pkg/image"
 	"github.com/stashapp/stash/pkg/models"
 	"github.com/stashapp/stash/pkg/performer"
-	"github.com/stashapp/stash/pkg/utils"
 )
 
 func (r *performerResolver) AliasList(ctx context.Context, obj *models.Performer) ([]string, error) {
@@ -110,12 +109,28 @@ func (r *performerResolver) HeightCm(ctx context.Context, obj *models.Performer)
 	return obj.Height, nil
 }
 
+func (r *performerResolver) CareerStart(ctx context.Context, obj *models.Performer) (*string, error) {
+	if obj.CareerStart != nil {
+		ret := obj.CareerStart.String()
+		return &ret, nil
+	}
+	return nil, nil
+}
+
+func (r *performerResolver) CareerEnd(ctx context.Context, obj *models.Performer) (*string, error) {
+	if obj.CareerEnd != nil {
+		ret := obj.CareerEnd.String()
+		return &ret, nil
+	}
+	return nil, nil
+}
+
 func (r *performerResolver) CareerLength(ctx context.Context, obj *models.Performer) (*string, error) {
 	if obj.CareerStart == nil && obj.CareerEnd == nil {
 		return nil, nil
 	}
 
-	ret := utils.FormatYearRange(obj.CareerStart, obj.CareerEnd)
+	ret := models.FormatYearRange(obj.CareerStart, obj.CareerEnd)
 	return &ret, nil
 }
 
diff --git a/internal/api/resolver_mutation_performer.go b/internal/api/resolver_mutation_performer.go
index 653348304..6f88c54ca 100644
--- a/internal/api/resolver_mutation_performer.go
+++ b/internal/api/resolver_mutation_performer.go
@@ -52,17 +52,6 @@ func (r *mutationResolver) PerformerCreate(ctx context.Context, input models.Per
 	newPerformer.FakeTits = translator.string(input.FakeTits)
 	newPerformer.PenisLength = input.PenisLength
 	newPerformer.Circumcised = input.Circumcised
-	newPerformer.CareerStart = input.CareerStart
-	newPerformer.CareerEnd = input.CareerEnd
-	// if career_start/career_end not provided, parse deprecated career_length
-	if newPerformer.CareerStart == nil && newPerformer.CareerEnd == nil && input.CareerLength != nil {
-		start, end, err := utils.ParseYearRangeString(*input.CareerLength)
-		if err != nil {
-			return nil, fmt.Errorf("could not parse career_length %q: %w", *input.CareerLength, err)
-		}
-		newPerformer.CareerStart = start
-		newPerformer.CareerEnd = end
-	}
 	newPerformer.Tattoos = translator.string(input.Tattoos)
 	newPerformer.Piercings = translator.string(input.Piercings)
 	newPerformer.Favorite = translator.bool(input.Favorite)
@@ -100,6 +89,25 @@ func (r *mutationResolver) PerformerCreate(ctx context.Context, input models.Per
 		return nil, fmt.Errorf("converting death date: %w", err)
 	}
 
+	newPerformer.CareerStart, err = translator.datePtr(input.CareerStart)
+	if err != nil {
+		return nil, fmt.Errorf("converting career start: %w", err)
+	}
+	newPerformer.CareerEnd, err = translator.datePtr(input.CareerEnd)
+	if err != nil {
+		return nil, fmt.Errorf("converting career end: %w", err)
+	}
+
+	// if career_start/career_end not provided, parse deprecated career_length
+	if newPerformer.CareerStart == nil && newPerformer.CareerEnd == nil && input.CareerLength != nil {
+		start, end, err := models.ParseYearRangeString(*input.CareerLength)
+		if err != nil {
+			return nil, fmt.Errorf("could not parse career_length %q: %w", *input.CareerLength, err)
+		}
+		newPerformer.CareerStart = start
+		newPerformer.CareerEnd = end
+	}
+
 	newPerformer.TagIDs, err = translator.relatedIds(input.TagIds)
 	if err != nil {
 		return nil, fmt.Errorf("converting tag ids: %w", err)
@@ -273,18 +281,25 @@ func performerPartialFromInput(input models.PerformerUpdateInput, translator cha
 	updatedPerformer.Circumcised = translator.optionalString((*string)(input.Circumcised), "circumcised")
 	// prefer career_start/career_end over deprecated career_length
 	if translator.hasField("career_start") || translator.hasField("career_end") {
-		updatedPerformer.CareerStart = translator.optionalInt(input.CareerStart, "career_start")
-		updatedPerformer.CareerEnd = translator.optionalInt(input.CareerEnd, "career_end")
+		var err error
+		updatedPerformer.CareerStart, err = translator.optionalDate(input.CareerStart, "career_start")
+		if err != nil {
+			return nil, fmt.Errorf("converting career start: %w", err)
+		}
+		updatedPerformer.CareerEnd, err = translator.optionalDate(input.CareerEnd, "career_end")
+		if err != nil {
+			return nil, fmt.Errorf("converting career end: %w", err)
+		}
 	} else if translator.hasField("career_length") && input.CareerLength != nil {
-		start, end, err := utils.ParseYearRangeString(*input.CareerLength)
+		start, end, err := models.ParseYearRangeString(*input.CareerLength)
 		if err != nil {
 			return nil, fmt.Errorf("could not parse career_length %q: %w", *input.CareerLength, err)
 		}
 		if start != nil {
-			updatedPerformer.CareerStart = models.NewOptionalInt(*start)
+			updatedPerformer.CareerStart = models.NewOptionalDate(*start)
 		}
 		if end != nil {
-			updatedPerformer.CareerEnd = models.NewOptionalInt(*end)
+			updatedPerformer.CareerEnd = models.NewOptionalDate(*end)
 		}
 	}
 	updatedPerformer.Tattoos = translator.optionalString(input.Tattoos, "tattoos")
@@ -444,18 +459,24 @@ func (r *mutationResolver) BulkPerformerUpdate(ctx context.Context, input BulkPe
 	updatedPerformer.Circumcised = translator.optionalString((*string)(input.Circumcised), "circumcised")
 	// prefer career_start/career_end over deprecated career_length
 	if translator.hasField("career_start") || translator.hasField("career_end") {
-		updatedPerformer.CareerStart = translator.optionalInt(input.CareerStart, "career_start")
-		updatedPerformer.CareerEnd = translator.optionalInt(input.CareerEnd, "career_end")
+		updatedPerformer.CareerStart, err = translator.optionalDate(input.CareerStart, "career_start")
+		if err != nil {
+			return nil, fmt.Errorf("converting career start: %w", err)
+		}
+		updatedPerformer.CareerEnd, err = translator.optionalDate(input.CareerEnd, "career_end")
+		if err != nil {
+			return nil, fmt.Errorf("converting career end: %w", err)
+		}
 	} else if translator.hasField("career_length") && input.CareerLength != nil {
-		start, end, err := utils.ParseYearRangeString(*input.CareerLength)
+		start, end, err := models.ParseYearRangeString(*input.CareerLength)
 		if err != nil {
 			return nil, fmt.Errorf("could not parse career_length %q: %w", *input.CareerLength, err)
 		}
 		if start != nil {
-			updatedPerformer.CareerStart = models.NewOptionalInt(*start)
+			updatedPerformer.CareerStart = models.NewOptionalDate(*start)
 		}
 		if end != nil {
-			updatedPerformer.CareerEnd = models.NewOptionalInt(*end)
+			updatedPerformer.CareerEnd = models.NewOptionalDate(*end)
 		}
 	}
 	updatedPerformer.Tattoos = translator.optionalString(input.Tattoos, "tattoos")
diff --git a/pkg/models/date.go b/pkg/models/date.go
index dbd5c4ec6..912361507 100644
--- a/pkg/models/date.go
+++ b/pkg/models/date.go
@@ -2,6 +2,7 @@ package models
 
 import (
 	"fmt"
+	"strings"
 	"time"
 
 	"github.com/stashapp/stash/pkg/utils"
@@ -61,3 +62,114 @@ func ParseDate(s string) (Date, error) {
 
 	return Date{}, fmt.Errorf("failed to parse date %q: %v", s, errs)
 }
+
+func DateFromYear(year int) Date {
+	return Date{
+		Time:      time.Date(year, 1, 1, 0, 0, 0, 0, time.UTC),
+		Precision: DatePrecisionYear,
+	}
+}
+
+func FormatYearRange(start *Date, end *Date) string {
+	var (
+		startStr, endStr string
+	)
+
+	if start != nil {
+		startStr = start.Format(dateFormatPrecision[DatePrecisionYear])
+	}
+
+	if end != nil {
+		endStr = end.Format(dateFormatPrecision[DatePrecisionYear])
+	}
+
+	switch {
+	case startStr == "" && endStr == "":
+		return ""
+	case endStr == "":
+		return fmt.Sprintf("%s -", startStr)
+	case startStr == "":
+		return fmt.Sprintf("- %s", endStr)
+	default:
+		return fmt.Sprintf("%s - %s", startStr, endStr)
+	}
+}
+
+func FormatYearRangeString(start *string, end *string) string {
+	switch {
+	case start == nil && end == nil:
+		return ""
+	case end == nil:
+		return fmt.Sprintf("%s -", *start)
+	case start == nil:
+		return fmt.Sprintf("- %s", *end)
+	default:
+		return fmt.Sprintf("%s - %s", *start, *end)
+	}
+}
+
+// ParseYearRangeString parses a year range string into start and end year integers.
+// Supported formats: "YYYY", "YYYY - YYYY", "YYYY-YYYY", "YYYY -", "- YYYY", "YYYY-present".
+// Returns nil for start/end if not present in the string.
+func ParseYearRangeString(s string) (start *Date, end *Date, err error) {
+	s = strings.TrimSpace(s)
+	if s == "" {
+		return nil, nil, fmt.Errorf("empty year range string")
+	}
+
+	// normalize "present" to empty end
+	lower := strings.ToLower(s)
+	lower = strings.ReplaceAll(lower, "present", "")
+
+	// split on "-" if it contains one
+	var parts []string
+	if strings.Contains(lower, "-") {
+		parts = strings.SplitN(lower, "-", 2)
+	} else {
+		// single value, treat as start year
+		year, err := parseYear(lower)
+		if err != nil {
+			return nil, nil, fmt.Errorf("invalid year range %q: %w", s, err)
+		}
+		return year, nil, nil
+	}
+
+	startStr := strings.TrimSpace(parts[0])
+	endStr := strings.TrimSpace(parts[1])
+
+	if startStr != "" {
+		y, err := parseYear(startStr)
+		if err != nil {
+			return nil, nil, fmt.Errorf("invalid start year in %q: %w", s, err)
+		}
+		start = y
+	}
+
+	if endStr != "" {
+		y, err := parseYear(endStr)
+		if err != nil {
+			return nil, nil, fmt.Errorf("invalid end year in %q: %w", s, err)
+		}
+		end = y
+	}
+
+	if start == nil && end == nil {
+		return nil, nil, fmt.Errorf("could not parse year range %q", s)
+	}
+
+	return start, end, nil
+}
+
+func parseYear(s string) (*Date, error) {
+	ret, err := ParseDate(s)
+	if err != nil {
+		return nil, fmt.Errorf("parsing year %q: %w", s, err)
+	}
+
+	year := ret.Time.Year()
+	if year < 1900 || year > 2200 {
+		return nil, fmt.Errorf("year %d out of reasonable range", year)
+	}
+
+	return &ret, nil
+}
diff --git a/pkg/models/date_test.go b/pkg/models/date_test.go
index b6cca9ee1..3b2962e28 100644
--- a/pkg/models/date_test.go
+++ b/pkg/models/date_test.go
@@ -3,6 +3,8 @@ package models
 import (
 	"testing"
 	"time"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestParseDateStringAsTime(t *testing.T) {
@@ -48,3 +50,102 @@ func TestParseDateStringAsTime(t *testing.T) {
 		})
 	}
 }
+
+func TestFormatYearRange(t *testing.T) {
+	datePtr := func(v int) *Date {
+		date := DateFromYear(v)
+		return &date
+	}
+
+	tests := []struct {
+		name  string
+		start *Date
+		end   *Date
+		want  string
+	}{
+		{"both nil", nil, nil, ""},
+		{"only start", datePtr(2005), nil, "2005 -"},
+		{"only end", nil, datePtr(2010), "- 2010"},
+		{"start and end", datePtr(2005), datePtr(2010), "2005 - 2010"},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got := FormatYearRange(tt.start, tt.end)
+			assert.Equal(t, tt.want, got)
+		})
+	}
+}
+
+func TestFormatYearRangeString(t *testing.T) {
+	stringPtr := func(v string) *string { return &v }
+
+	tests := []struct {
+		name  string
+		start *string
+		end   *string
+		want  string
+	}{
+		{"both nil", nil, nil, ""},
+		{"only start", stringPtr("2005"), nil, "2005 -"},
+		{"only end", nil, stringPtr("2010"), "- 2010"},
+		{"start and end", stringPtr("2005"), stringPtr("2010"), "2005 - 2010"},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got := FormatYearRangeString(tt.start, tt.end)
+			assert.Equal(t, tt.want, got)
+		})
+	}
+}
+
+func TestParseYearRangeString(t *testing.T) {
+	intPtr := func(v int) *int { return &v }
+
+	tests := []struct {
+		name      string
+		input     string
+		wantStart *int
+		wantEnd   *int
+		wantErr   bool
+	}{
+		{"single year", "2005", intPtr(2005), nil, false},
+		{"year range with spaces", "2005 - 2010", intPtr(2005), intPtr(2010), false},
+		{"year range no spaces", "2005-2010", intPtr(2005), intPtr(2010), false},
+		{"year dash open", "2005 -", intPtr(2005), nil, false},
+		{"year dash open no space", "2005-", intPtr(2005), nil, false},
+		{"dash year", "- 2010", nil, intPtr(2010), false},
+		{"year present", "2005-present", intPtr(2005), nil, false},
+		{"year Present caps", "2005 - Present", intPtr(2005), nil, false},
+		{"whitespace padding", "  2005 - 2010  ", intPtr(2005), intPtr(2010), false},
+		{"empty string", "", nil, nil, true},
+		{"garbage", "not a year", nil, nil, true},
+		{"partial garbage start", "abc - 2010", nil, nil, true},
+		{"partial garbage end", "2005 - abc", nil, nil, true},
+		{"year out of range", "1800", nil, nil, true},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			start, end, err := ParseYearRangeString(tt.input)
+			if tt.wantErr {
+				assert.Error(t, err)
+				return
+			}
+			assert.NoError(t, err)
+			if tt.wantStart != nil {
+				assert.NotNil(t, start)
+				assert.Equal(t, *tt.wantStart, start.Time.Year())
+			} else {
+				assert.Nil(t, start)
+			}
+			if tt.wantEnd != nil {
+				assert.NotNil(t, end)
+				assert.Equal(t, *tt.wantEnd, end.Time.Year())
+			} else {
+				assert.Nil(t, end)
+			}
+		})
+	}
+}
diff --git a/pkg/models/jsonschema/performer.go b/pkg/models/jsonschema/performer.go
index b738fbfac..1a8acd5f3 100644
--- a/pkg/models/jsonschema/performer.go
+++ b/pkg/models/jsonschema/performer.go
@@ -49,8 +49,8 @@ type Performer struct {
 	PenisLength   float64            `json:"penis_length,omitempty"`
 	Circumcised   string             `json:"circumcised,omitempty"`
 	CareerLength  string             `json:"career_length,omitempty"` // deprecated - for import only
-	CareerStart   *int               `json:"career_start,omitempty"`
-	CareerEnd     *int               `json:"career_end,omitempty"`
+	CareerStart   string             `json:"career_start,omitempty"`
+	CareerEnd     string             `json:"career_end,omitempty"`
 	Tattoos       string             `json:"tattoos,omitempty"`
 	Piercings     string             `json:"piercings,omitempty"`
 	Aliases       StringOrStringList `json:"aliases,omitempty"`
diff --git a/pkg/models/model_performer.go b/pkg/models/model_performer.go
index f5415b0b4..7bc3b3174 100644
--- a/pkg/models/model_performer.go
+++ b/pkg/models/model_performer.go
@@ -19,8 +19,8 @@ type Performer struct {
 	FakeTits       string           `json:"fake_tits"`
 	PenisLength    *float64         `json:"penis_length"`
 	Circumcised    *CircumcisedEnum `json:"circumcised"`
-	CareerStart    *int             `json:"career_start"`
-	CareerEnd      *int             `json:"career_end"`
+	CareerStart    *Date            `json:"career_start"`
+	CareerEnd      *Date            `json:"career_end"`
 	Tattoos        string           `json:"tattoos"`
 	Piercings      string           `json:"piercings"`
 	Favorite       bool             `json:"favorite"`
@@ -76,8 +76,8 @@ type PerformerPartial struct {
 	FakeTits       OptionalString
 	PenisLength    OptionalFloat64
 	Circumcised    OptionalString
-	CareerStart    OptionalInt
-	CareerEnd      OptionalInt
+	CareerStart    OptionalDate
+	CareerEnd      OptionalDate
 	Tattoos        OptionalString
 	Piercings      OptionalString
 	Favorite       OptionalBool
diff --git a/pkg/models/model_scraped_item.go b/pkg/models/model_scraped_item.go
index a5fa5d8ef..d20fbd589 100644
--- a/pkg/models/model_scraped_item.go
+++ b/pkg/models/model_scraped_item.go
@@ -177,8 +177,8 @@ type ScrapedPerformer struct {
 	PenisLength    *string       `json:"penis_length"`
 	Circumcised    *string       `json:"circumcised"`
 	CareerLength   *string       `json:"career_length"` // deprecated: use CareerStart/CareerEnd
-	CareerStart    *int          `json:"career_start"`
-	CareerEnd      *int          `json:"career_end"`
+	CareerStart    *string       `json:"career_start"`
+	CareerEnd      *string       `json:"career_end"`
 	Tattoos        *string       `json:"tattoos"`
 	Piercings      *string       `json:"piercings"`
 	Aliases        *string       `json:"aliases"`
@@ -225,12 +225,16 @@ func (p *ScrapedPerformer) ToPerformer(endpoint string, excluded map[string]bool
 	// assume that career length is _not_ populated in favour of start/end
 
 	if p.CareerStart != nil && !excluded["career_start"] {
-		cs := *p.CareerStart
-		ret.CareerStart = &cs
+		date, err := ParseDate(*p.CareerStart)
+		if err == nil {
+			ret.CareerStart = &date
+		}
 	}
 	if p.CareerEnd != nil && !excluded["career_end"] {
-		ce := *p.CareerEnd
-		ret.CareerEnd = &ce
+		date, err := ParseDate(*p.CareerEnd)
+		if err == nil {
+			ret.CareerEnd = &date
+		}
 	}
 	if p.Country != nil && !excluded["country"] {
 		ret.Country = *p.Country
@@ -367,13 +371,13 @@ func (p *ScrapedPerformer) ToPartial(endpoint string, excluded map[string]bool,
 	}
 	if p.CareerLength != nil && !excluded["career_length"] {
 		// parse career_length into career_start/career_end
-		start, end, err := utils.ParseYearRangeString(*p.CareerLength)
+		start, end, err := ParseYearRangeString(*p.CareerLength)
 		if err == nil {
 			if start != nil {
-				ret.CareerStart = NewOptionalInt(*start)
+				ret.CareerStart = NewOptionalDate(*start)
 			}
 			if end != nil {
-				ret.CareerEnd = NewOptionalInt(*end)
+				ret.CareerEnd = NewOptionalDate(*end)
 			}
 		}
 	}
diff --git a/pkg/models/model_scraped_item_test.go b/pkg/models/model_scraped_item_test.go
index 09d8fbb32..1956d8a0b 100644
--- a/pkg/models/model_scraped_item_test.go
+++ b/pkg/models/model_scraped_item_test.go
@@ -8,8 +8,6 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func intPtr(i int) *int { return &i }
-
 func Test_scrapedToStudioInput(t *testing.T) {
 	const name = "name"
 	url := "url"
@@ -186,8 +184,8 @@ func Test_scrapedToPerformerInput(t *testing.T) {
 				Weight:         nextVal(),
 				Measurements:   nextVal(),
 				FakeTits:       nextVal(),
-				CareerStart:    intPtr(2005),
-				CareerEnd:      intPtr(2015),
+				CareerStart:    dateStrFromInt(2005),
+				CareerEnd:      dateStrFromInt(2015),
 				Tattoos:        nextVal(),
 				Piercings:      nextVal(),
 				Aliases:        nextVal(),
@@ -212,8 +210,8 @@ func Test_scrapedToPerformerInput(t *testing.T) {
 				Weight:         nextIntVal(),
 				Measurements:   *nextVal(),
 				FakeTits:       *nextVal(),
-				CareerStart:    intPtr(2005),
-				CareerEnd:      intPtr(2015),
+				CareerStart:    dateFromInt(2005),
+				CareerEnd:      dateFromInt(2015),
 				Tattoos:        *nextVal(), // skip CareerLength counter slot
 				Piercings:      *nextVal(),
 				Aliases:        NewRelatedStrings([]string{*nextVal()}),
diff --git a/pkg/models/performer.go b/pkg/models/performer.go
index 16d351372..606b87f9f 100644
--- a/pkg/models/performer.go
+++ b/pkg/models/performer.go
@@ -139,9 +139,9 @@ type PerformerFilterType struct {
 	// Filter by career length
 	CareerLength *StringCriterionInput `json:"career_length"` // deprecated
 	// Filter by career start year
-	CareerStart *IntCriterionInput `json:"career_start"`
+	CareerStart *DateCriterionInput `json:"career_start"`
 	// Filter by career end year
-	CareerEnd *IntCriterionInput `json:"career_end"`
+	CareerEnd *DateCriterionInput `json:"career_end"`
 	// Filter by tattoos
 	Tattoos *StringCriterionInput `json:"tattoos"`
 	// Filter by piercings
@@ -232,8 +232,8 @@ type PerformerCreateInput struct {
 	PenisLength    *float64         `json:"penis_length"`
 	Circumcised    *CircumcisedEnum `json:"circumcised"`
 	CareerLength   *string          `json:"career_length"`
-	CareerStart    *int             `json:"career_start"`
-	CareerEnd      *int             `json:"career_end"`
+	CareerStart    *string          `json:"career_start"`
+	CareerEnd      *string          `json:"career_end"`
 	Tattoos        *string          `json:"tattoos"`
 	Piercings      *string          `json:"piercings"`
 	Aliases        *string          `json:"aliases"`
@@ -273,8 +273,8 @@ type PerformerUpdateInput struct {
 	PenisLength    *float64         `json:"penis_length"`
 	Circumcised    *CircumcisedEnum `json:"circumcised"`
 	CareerLength   *string          `json:"career_length"`
-	CareerStart    *int             `json:"career_start"`
-	CareerEnd      *int             `json:"career_end"`
+	CareerStart    *string          `json:"career_start"`
+	CareerEnd      *string          `json:"career_end"`
 	Tattoos        *string          `json:"tattoos"`
 	Piercings      *string          `json:"piercings"`
 	Aliases        *string          `json:"aliases"`
diff --git a/pkg/performer/export.go b/pkg/performer/export.go
index 691175b1f..d7807f651 100644
--- a/pkg/performer/export.go
+++ b/pkg/performer/export.go
@@ -71,10 +71,10 @@ func ToJSON(ctx context.Context, reader ImageAliasStashIDGetter, performer *mode
 	}
 
 	if performer.CareerStart != nil {
-		newPerformerJSON.CareerStart = performer.CareerStart
+		newPerformerJSON.CareerStart = performer.CareerStart.String()
 	}
 	if performer.CareerEnd != nil {
-		newPerformerJSON.CareerEnd = performer.CareerEnd
+		newPerformerJSON.CareerEnd = performer.CareerEnd.String()
 	}
 
 	if err := performer.LoadAliases(ctx, reader); err != nil {
diff --git a/pkg/performer/export_test.go b/pkg/performer/export_test.go
index 626e16173..2cf476321 100644
--- a/pkg/performer/export_test.go
+++ b/pkg/performer/export_test.go
@@ -48,8 +48,8 @@ var (
 	rating          = 5
 	height          = 123
 	weight          = 60
-	careerStart     = 2005
-	careerEnd       = 2015
+	careerStart, _  = models.ParseDate("2005")
+	careerEnd, _    = models.ParseDate("2015")
 	penisLength     = 1.23
 	circumcisedEnum = models.CircumcisedEnumCut
 	circumcised     = circumcisedEnum.String()
@@ -134,8 +134,8 @@ func createFullJSONPerformer(name string, image string, withCustomFields bool) *
 		URLs:           []string{url, twitter, instagram},
 		Aliases:        aliases,
 		Birthdate:      birthDate.String(),
-		CareerStart:    &careerStart,
-		CareerEnd:      &careerEnd,
+		CareerStart:    careerStart.String(),
+		CareerEnd:      careerEnd.String(),
 		Country:        country,
 		Ethnicity:      ethnicity,
 		EyeColor:       eyeColor,
diff --git a/pkg/performer/import.go b/pkg/performer/import.go
index f6a006457..62b4d87d0 100644
--- a/pkg/performer/import.go
+++ b/pkg/performer/import.go
@@ -285,11 +285,17 @@ func performerJSONToPerformer(performerJSON jsonschema.Performer) (models.Perfor
 	}
 
 	// prefer explicit career_start/career_end, fall back to parsing legacy career_length
-	if performerJSON.CareerStart != nil || performerJSON.CareerEnd != nil {
-		newPerformer.CareerStart = performerJSON.CareerStart
-		newPerformer.CareerEnd = performerJSON.CareerEnd
+	if performerJSON.CareerStart != "" || performerJSON.CareerEnd != "" {
+		careerStart, err := models.ParseDate(performerJSON.CareerStart)
+		if err == nil {
+			newPerformer.CareerStart = &careerStart
+		}
+		careerEnd, err := models.ParseDate(performerJSON.CareerEnd)
+		if err == nil {
+			newPerformer.CareerEnd = &careerEnd
+		}
 	} else if performerJSON.CareerLength != "" {
-		start, end, err := utils.ParseYearRangeString(performerJSON.CareerLength)
+		start, end, err := models.ParseYearRangeString(performerJSON.CareerLength)
 		if err != nil {
 			return models.Performer{}, fmt.Errorf("invalid career_length %q: %w", performerJSON.CareerLength, err)
 		}
diff --git a/pkg/performer/import_test.go b/pkg/performer/import_test.go
index ca28c1990..0d5f80d01 100644
--- a/pkg/performer/import_test.go
+++ b/pkg/performer/import_test.go
@@ -317,15 +317,15 @@ func TestUpdate(t *testing.T) {
 }
 
 func TestImportCareerFields(t *testing.T) {
-	startYear := 2005
-	endYear := 2015
+	startYear, _ := models.ParseDate("2005")
+	endYear, _ := models.ParseDate("2015")
 
 	// explicit career_start/career_end should be used directly
 	t.Run("explicit fields", func(t *testing.T) {
 		input := jsonschema.Performer{
 			Name:        "test",
-			CareerStart: &startYear,
-			CareerEnd:   &endYear,
+			CareerStart: startYear.String(),
+			CareerEnd:   endYear.String(),
 		}
 
 		p, err := performerJSONToPerformer(input)
@@ -338,8 +338,8 @@ func TestImportCareerFields(t *testing.T) {
 	t.Run("explicit fields override legacy", func(t *testing.T) {
 		input := jsonschema.Performer{
 			Name:         "test",
-			CareerStart:  &startYear,
-			CareerEnd:    &endYear,
+			CareerStart:  startYear.String(),
+			CareerEnd:    endYear.String(),
 			CareerLength: "1990 - 1995",
 		}
 
diff --git a/pkg/scraper/mapped_result.go b/pkg/scraper/mapped_result.go
index 1260f3082..64cc97ec7 100644
--- a/pkg/scraper/mapped_result.go
+++ b/pkg/scraper/mapped_result.go
@@ -140,8 +140,8 @@ func (r mappedResult) scrapedPerformer() *models.ScrapedPerformer {
 		PenisLength:    r.stringPtr("PenisLength"),
 		Circumcised:    r.stringPtr("Circumcised"),
 		CareerLength:   r.stringPtr("CareerLength"),
-		CareerStart:    r.IntPtr("CareerStart"),
-		CareerEnd:      r.IntPtr("CareerEnd"),
+		CareerStart:    r.stringPtr("CareerStart"),
+		CareerEnd:      r.stringPtr("CareerEnd"),
 		Tattoos:        r.stringPtr("Tattoos"),
 		Piercings:      r.stringPtr("Piercings"),
 		Aliases:        r.stringPtr("Aliases"),
diff --git a/pkg/scraper/performer.go b/pkg/scraper/performer.go
index 4684a6683..e05240453 100644
--- a/pkg/scraper/performer.go
+++ b/pkg/scraper/performer.go
@@ -20,8 +20,8 @@ type ScrapedPerformerInput struct {
 	PenisLength    *string  `json:"penis_length"`
 	Circumcised    *string  `json:"circumcised"`
 	CareerLength   *string  `json:"career_length"`
-	CareerStart    *int     `json:"career_start"`
-	CareerEnd      *int     `json:"career_end"`
+	CareerStart    *string  `json:"career_start"`
+	CareerEnd      *string  `json:"career_end"`
 	Tattoos        *string  `json:"tattoos"`
 	Piercings      *string  `json:"piercings"`
 	Aliases        *string  `json:"aliases"`
diff --git a/pkg/scraper/post_processing_test.go b/pkg/scraper/post_processing_test.go
new file mode 100644
index 000000000..2eb9385e1
--- /dev/null
+++ b/pkg/scraper/post_processing_test.go
@@ -0,0 +1,144 @@
+package scraper
+
+import (
+	"context"
+	"testing"
+
+	"github.com/stashapp/stash/pkg/models"
+)
+
+func TestPostScrapePerformerCareerLength(t *testing.T) {
+	ctx := context.Background()
+	const related = false
+
+	strPtr := func(s string) *string {
+		return &s
+	}
+
+	tests := []struct {
+		name  string
+		input models.ScrapedPerformer
+		want  models.ScrapedPerformer
+	}{
+		{
+			"start = 2000",
+			models.ScrapedPerformer{
+				CareerStart: strPtr("2000"),
+			},
+			models.ScrapedPerformer{
+				CareerStart:  strPtr("2000"),
+				CareerLength: strPtr("2000 -"),
+			},
+		},
+		{
+			"end = 2000",
+			models.ScrapedPerformer{
+				CareerEnd: strPtr("2000"),
+			},
+			models.ScrapedPerformer{
+				CareerEnd:    strPtr("2000"),
+				CareerLength: strPtr("- 2000"),
+			},
+		},
+		{
+			"start = 2000, end = 2020",
+			models.ScrapedPerformer{
+				CareerStart: strPtr("2000"),
+				CareerEnd:   strPtr("2020"),
+			},
+			models.ScrapedPerformer{
+				CareerStart:  strPtr("2000"),
+				CareerEnd:    strPtr("2020"),
+				CareerLength: strPtr("2000 - 2020"),
+			},
+		},
+		{
+			"length = 2000 -",
+			models.ScrapedPerformer{
+				CareerLength: strPtr("2000 -"),
+			},
+			models.ScrapedPerformer{
+				CareerStart:  strPtr("2000"),
+				CareerLength: strPtr("2000 -"),
+			},
+		},
+		{
+			"length = - 2010",
+			models.ScrapedPerformer{
+				CareerLength: strPtr("- 2010"),
+			},
+			models.ScrapedPerformer{
+				CareerEnd:    strPtr("2010"),
+				CareerLength: strPtr("- 2010"),
+			},
+		},
+		{
+			"length = 2000 - 2010",
+			models.ScrapedPerformer{
+				CareerLength: strPtr("2000 - 2010"),
+			},
+			models.ScrapedPerformer{
+				CareerStart:  strPtr("2000"),
+				CareerEnd:    strPtr("2010"),
+				CareerLength: strPtr("2000 - 2010"),
+			},
+		},
+		{
+			"invalid start",
+			models.ScrapedPerformer{
+				CareerStart: strPtr("two thousand"),
+			},
+			models.ScrapedPerformer{
+				CareerStart: strPtr("two thousand"),
+			},
+		},
+		{
+			"invalid end",
+			models.ScrapedPerformer{
+				CareerEnd: strPtr("two thousand"),
+			},
+			models.ScrapedPerformer{
+				CareerEnd: strPtr("two thousand"),
+			},
+		},
+		{
+			"invalid career length",
+			models.ScrapedPerformer{
+				CareerLength: strPtr("1234 - 4567 - 9224"),
+			},
+			models.ScrapedPerformer{
+				CareerLength: strPtr("1234 - 4567 - 9224"),
+			},
+		},
+	}
+
+	compareStrPtr := func(a, b *string) bool {
+		if a == b {
+			return true
+		}
+		if a == nil || b == nil {
+			return false
+		}
+		return *a == *b
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			c := &postScraper{}
+			got, err := c.postScrapePerformer(ctx, tt.input, related)
+			if err != nil {
+				t.Fatalf("postScrapePerformer returned error: %v", err)
+			}
+			postScraped := got.(models.ScrapedPerformer)
+			if !compareStrPtr(postScraped.CareerStart, tt.want.CareerStart) {
+				t.Errorf("CareerStart = %v, want %v", postScraped.CareerStart, tt.want.CareerStart)
+			}
+			if !compareStrPtr(postScraped.CareerEnd, tt.want.CareerEnd) {
+				t.Errorf("CareerEnd = %v, want %v", postScraped.CareerEnd, tt.want.CareerEnd)
+			}
+			if !compareStrPtr(postScraped.CareerLength, tt.want.CareerLength) {
+				t.Errorf("CareerLength = %v, want %v", postScraped.CareerLength, tt.want.CareerLength)
+			}
+		})
+	}
+}
diff --git a/pkg/scraper/postprocessing.go b/pkg/scraper/postprocessing.go
index 8a4d4de7d..4b8f7e022 100644
--- a/pkg/scraper/postprocessing.go
+++ b/pkg/scraper/postprocessing.go
@@ -125,23 +125,64 @@ func (c *postScraper) postScrapePerformer(ctx context.Context, p models.ScrapedP
 		}
 	}
 
-	isEmptyStr := func(s *string) bool { return s == nil || *s == "" }
-	isEmptyInt := func(s *int) bool { return s == nil || *s == 0 }
-
-	// populate career start/end from career length and vice versa
-	if !isEmptyStr(p.CareerLength) && isEmptyInt(p.CareerStart) && isEmptyInt(p.CareerEnd) {
-		p.CareerStart, p.CareerEnd, err = utils.ParseYearRangeString(*p.CareerLength)
-		if err != nil {
-			logger.Warnf("Could not parse career length %s: %v", *p.CareerLength, err)
-		}
-	} else if isEmptyStr(p.CareerLength) && (!isEmptyInt(p.CareerStart) || !isEmptyInt(p.CareerEnd)) {
-		v := utils.FormatYearRange(p.CareerStart, p.CareerEnd)
-		p.CareerLength = &v
-	}
+	c.postProcessCareerLength(&p)
 
 	return p, nil
 }
 
+func (c *postScraper) postProcessCareerLength(p *models.ScrapedPerformer) {
+	isEmptyStr := func(s *string) bool { return s == nil || *s == "" }
+
+	// populate career start/end from career length and vice versa
+	if !isEmptyStr(p.CareerLength) && isEmptyStr(p.CareerStart) && isEmptyStr(p.CareerEnd) {
+		start, end, err := models.ParseYearRangeString(*p.CareerLength)
+		if err != nil {
+			logger.Warnf("Could not parse career length %s: %v", *p.CareerLength, err)
+			return
+		}
+
+		if start != nil {
+			startStr := start.String()
+			p.CareerStart = &startStr
+		}
+		if end != nil {
+			endStr := end.String()
+			p.CareerEnd = &endStr
+		}
+
+		return
+	}
+
+	// populate career length from career start/end if career length is missing
+	if isEmptyStr(p.CareerLength) {
+		var (
+			start *models.Date
+			end   *models.Date
+		)
+
+		if !isEmptyStr(p.CareerStart) {
+			date, err := models.ParseDate(*p.CareerStart)
+			if err != nil {
+				logger.Warnf("Could not parse career start %s: %v", *p.CareerStart, err)
+				return
+			}
+			start = &date
+		}
+
+		if !isEmptyStr(p.CareerEnd) {
+			date, err := models.ParseDate(*p.CareerEnd)
+			if err != nil {
+				logger.Warnf("Could not parse career end %s: %v", *p.CareerEnd, err)
+				return
+			}
+			end = &date
+		}
+
+		v := models.FormatYearRange(start, end)
+		p.CareerLength = &v
+	}
+}
+
 func (c *postScraper) postScrapeMovie(ctx context.Context, m models.ScrapedMovie, related bool) (_ ScrapedContent, err error) {
 	r := c.repository
 	tqb := r.TagFinder
diff --git a/pkg/sqlite/database.go b/pkg/sqlite/database.go
index f8c2cdef7..7c383dc4c 100644
--- a/pkg/sqlite/database.go
+++ b/pkg/sqlite/database.go
@@ -34,7 +34,7 @@ const (
 	cacheSizeEnv = "STASH_SQLITE_CACHE_SIZE"
 )
 
-var appSchemaVersion uint = 84
+var appSchemaVersion uint = 85
 
 //go:embed migrations/*.sql
 var migrationsBox embed.FS
diff --git a/pkg/sqlite/migrations/78_postmigrate.go b/pkg/sqlite/migrations/78_postmigrate.go
index 15d040457..34dbe6eb3 100644
--- a/pkg/sqlite/migrations/78_postmigrate.go
+++ b/pkg/sqlite/migrations/78_postmigrate.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/jmoiron/sqlx"
 	"github.com/stashapp/stash/pkg/logger"
+	"github.com/stashapp/stash/pkg/models"
 	"github.com/stashapp/stash/pkg/sqlite"
-	"github.com/stashapp/stash/pkg/utils"
 )
 
 type schema78Migrator struct {
@@ -76,7 +76,7 @@ func (m *schema78Migrator) migrateCareerLength(ctx context.Context) error {
 				lastID = id
 				gotSome = true
 
-				start, end, err := utils.ParseYearRangeString(careerLength)
+				start, end, err := models.ParseYearRangeString(careerLength)
 				if err != nil {
 					logger.Warnf("Could not parse career_length %q for performer %d: %v — preserving as custom field", careerLength, id, err)
 
@@ -107,10 +107,23 @@ func (m *schema78Migrator) migrateCareerLength(ctx context.Context) error {
 	return nil
 }
 
-func (m *schema78Migrator) updateCareerFields(tx *sqlx.Tx, id int, start *int, end *int) error {
+func (m *schema78Migrator) updateCareerFields(tx *sqlx.Tx, id int, start *models.Date, end *models.Date) error {
+	var (
+		startYear, endYear *int
+	)
+
+	if start != nil {
+		year := start.Year()
+		startYear = &year
+	}
+	if end != nil {
+		year := end.Year()
+		endYear = &year
+	}
+
 	_, err := tx.Exec(
 		"UPDATE performers SET career_start = ?, career_end = ? WHERE id = ?",
-		start, end, id,
+		startYear, endYear, id,
 	)
 	return err
 }
diff --git a/pkg/sqlite/migrations/85_performer_career_dates.up.sql b/pkg/sqlite/migrations/85_performer_career_dates.up.sql
new file mode 100644
index 000000000..1ce1cc97e
--- /dev/null
+++ b/pkg/sqlite/migrations/85_performer_career_dates.up.sql
@@ -0,0 +1,112 @@
+-- have to change the type of the career start/end columns so need to recreate the table
+PRAGMA foreign_keys=OFF;
+
+CREATE TABLE IF NOT EXISTS "performers_new" (
+  `id` integer not null primary key autoincrement,
+  `name` varchar(255) not null,
+  `disambiguation` varchar(255),
+  `gender` varchar(20),
+  `birthdate` date,
+  `birthdate_precision` TINYINT, 
+  `ethnicity` varchar(255),
+  `country` varchar(255),
+  `eye_color` varchar(255),
+  `height` int,
+  `measurements` varchar(255),
+  `fake_tits` varchar(255),
+  `tattoos` varchar(255),
+  `piercings` varchar(255),
+  `favorite` boolean not null default '0',
+  `created_at` datetime not null,
+  `updated_at` datetime not null,
+  `details` text, 
+  `death_date` date, 
+  `death_date_precision` TINYINT, 
+  `hair_color` varchar(255), 
+  `weight` integer, 
+  `rating` tinyint, 
+  `ignore_auto_tag` boolean not null default '0', 
+  `penis_length` float, 
+  `circumcised` varchar[10], 
+  `career_start` date, 
+  `career_start_precision` TINYINT, 
+  `career_end` date, 
+  `career_end_precision` TINYINT,
+  `image_blob` varchar(255) REFERENCES `blobs`(`checksum`)
+);
+
+INSERT INTO `performers_new` (
+    `id`,
+    `name`,
+    `disambiguation`,
+    `gender`,
+    `birthdate`,
+    `ethnicity`,
+    `country`,
+    `eye_color`,
+    `height`,
+    `measurements`,
+    `fake_tits`,
+    `tattoos`,
+    `piercings`,
+    `favorite`,
+    `created_at`,
+    `updated_at`,
+    `details`,
+    `death_date`,
+    `hair_color`,
+    `weight`,
+    `rating`,
+    `ignore_auto_tag`,
+    `image_blob`,
+    `penis_length`,
+    `circumcised`,
+    `birthdate_precision`,
+    `death_date_precision`,
+    `career_start`,
+    `career_end`
+) SELECT 
+    `id`,
+    `name`,
+    `disambiguation`,
+    `gender`,
+    `birthdate`,
+    `ethnicity`,
+    `country`,
+    `eye_color`,
+    `height`,
+    `measurements`,
+    `fake_tits`,
+    `tattoos`,
+    `piercings`,
+    `favorite`,
+    `created_at`,
+    `updated_at`,
+    `details`,
+    `death_date`,
+    `hair_color`,
+    `weight`,
+    `rating`,
+    `ignore_auto_tag`,
+    `image_blob`,
+    `penis_length`,
+    `circumcised`,
+    `birthdate_precision`,
+    `death_date_precision`,
+    CAST(`career_start` AS TEXT),
+    CAST(`career_end` AS TEXT)
+FROM `performers`;
+
+DROP INDEX IF EXISTS `performers_name_disambiguation_unique`;
+DROP INDEX IF EXISTS `performers_name_unique`;
+DROP TABLE `performers`;
+
+ALTER TABLE `performers_new` RENAME TO `performers`;
+
+UPDATE "performers" SET `career_start` = CONCAT(`career_start`, '-01-01'), "career_start_precision" = 2 WHERE "career_start" IS NOT NULL;
+UPDATE "performers" SET `career_end` = CONCAT(`career_end`, '-01-01'), "career_end_precision" = 2 WHERE "career_end" IS NOT NULL;  
+
+CREATE UNIQUE INDEX `performers_name_disambiguation_unique` on `performers` (`name`, `disambiguation`) WHERE `disambiguation` IS NOT NULL;
+CREATE UNIQUE INDEX `performers_name_unique` on `performers` (`name`) WHERE `disambiguation` IS NULL;
+
+PRAGMA foreign_keys=ON;
\ No newline at end of file
diff --git a/pkg/sqlite/performer.go b/pkg/sqlite/performer.go
index 62c069b51..5b24ca8e6 100644
--- a/pkg/sqlite/performer.go
+++ b/pkg/sqlite/performer.go
@@ -30,27 +30,29 @@ const (
 )
 
 type performerRow struct {
-	ID                 int         `db:"id" goqu:"skipinsert"`
-	Name               null.String `db:"name"` // TODO: make schema non-nullable
-	Disambigation      zero.String `db:"disambiguation"`
-	Gender             zero.String `db:"gender"`
-	Birthdate          NullDate    `db:"birthdate"`
-	BirthdatePrecision null.Int    `db:"birthdate_precision"`
-	Ethnicity          zero.String `db:"ethnicity"`
-	Country            zero.String `db:"country"`
-	EyeColor           zero.String `db:"eye_color"`
-	Height             null.Int    `db:"height"`
-	Measurements       zero.String `db:"measurements"`
-	FakeTits           zero.String `db:"fake_tits"`
-	PenisLength        null.Float  `db:"penis_length"`
-	Circumcised        zero.String `db:"circumcised"`
-	CareerStart        null.Int    `db:"career_start"`
-	CareerEnd          null.Int    `db:"career_end"`
-	Tattoos            zero.String `db:"tattoos"`
-	Piercings          zero.String `db:"piercings"`
-	Favorite           bool        `db:"favorite"`
-	CreatedAt          Timestamp   `db:"created_at"`
-	UpdatedAt          Timestamp   `db:"updated_at"`
+	ID                   int         `db:"id" goqu:"skipinsert"`
+	Name                 null.String `db:"name"` // TODO: make schema non-nullable
+	Disambigation        zero.String `db:"disambiguation"`
+	Gender               zero.String `db:"gender"`
+	Birthdate            NullDate    `db:"birthdate"`
+	BirthdatePrecision   null.Int    `db:"birthdate_precision"`
+	Ethnicity            zero.String `db:"ethnicity"`
+	Country              zero.String `db:"country"`
+	EyeColor             zero.String `db:"eye_color"`
+	Height               null.Int    `db:"height"`
+	Measurements         zero.String `db:"measurements"`
+	FakeTits             zero.String `db:"fake_tits"`
+	PenisLength          null.Float  `db:"penis_length"`
+	Circumcised          zero.String `db:"circumcised"`
+	CareerStart          NullDate    `db:"career_start"`
+	CareerStartPrecision null.Int    `db:"career_start_precision"`
+	CareerEnd            NullDate    `db:"career_end"`
+	CareerEndPrecision   null.Int    `db:"career_end_precision"`
+	Tattoos              zero.String `db:"tattoos"`
+	Piercings            zero.String `db:"piercings"`
+	Favorite             bool        `db:"favorite"`
+	CreatedAt            Timestamp   `db:"created_at"`
+	UpdatedAt            Timestamp   `db:"updated_at"`
 	// expressed as 1-100
 	Rating             null.Int    `db:"rating"`
 	Details            zero.String `db:"details"`
@@ -83,8 +85,10 @@ func (r *performerRow) fromPerformer(o models.Performer) {
 	if o.Circumcised != nil && o.Circumcised.IsValid() {
 		r.Circumcised = zero.StringFrom(o.Circumcised.String())
 	}
-	r.CareerStart = intFromPtr(o.CareerStart)
-	r.CareerEnd = intFromPtr(o.CareerEnd)
+	r.CareerStart = NullDateFromDatePtr(o.CareerStart)
+	r.CareerStartPrecision = datePrecisionFromDatePtr(o.CareerStart)
+	r.CareerEnd = NullDateFromDatePtr(o.CareerEnd)
+	r.CareerEndPrecision = datePrecisionFromDatePtr(o.CareerEnd)
 	r.Tattoos = zero.StringFrom(o.Tattoos)
 	r.Piercings = zero.StringFrom(o.Piercings)
 	r.Favorite = o.Favorite
@@ -112,8 +116,8 @@ func (r *performerRow) resolve() *models.Performer {
 		Measurements:   r.Measurements.String,
 		FakeTits:       r.FakeTits.String,
 		PenisLength:    nullFloatPtr(r.PenisLength),
-		CareerStart:    nullIntPtr(r.CareerStart),
-		CareerEnd:      nullIntPtr(r.CareerEnd),
+		CareerStart:    r.CareerStart.DatePtr(r.CareerStartPrecision),
+		CareerEnd:      r.CareerEnd.DatePtr(r.CareerEndPrecision),
 		Tattoos:        r.Tattoos.String,
 		Piercings:      r.Piercings.String,
 		Favorite:       r.Favorite,
@@ -158,8 +162,8 @@ func (r *performerRowRecord) fromPartial(o models.PerformerPartial) {
 	r.setNullString("fake_tits", o.FakeTits)
 	r.setNullFloat64("penis_length", o.PenisLength)
 	r.setNullString("circumcised", o.Circumcised)
-	r.setNullInt("career_start", o.CareerStart)
-	r.setNullInt("career_end", o.CareerEnd)
+	r.setNullDate("career_start", "career_start_precision", o.CareerStart)
+	r.setNullDate("career_end", "career_end_precision", o.CareerEnd)
 	r.setNullString("tattoos", o.Tattoos)
 	r.setNullString("piercings", o.Piercings)
 	r.setBool("favorite", o.Favorite)
diff --git a/pkg/sqlite/performer_filter.go b/pkg/sqlite/performer_filter.go
index fdcc283ab..4336e998c 100644
--- a/pkg/sqlite/performer_filter.go
+++ b/pkg/sqlite/performer_filter.go
@@ -52,7 +52,7 @@ func (qb *performerFilterHandler) validate() error {
 		careerLength := filter.CareerLength
 		switch careerLength.Modifier {
 		case models.CriterionModifierEquals:
-			start, end, err := utils.ParseYearRangeString(careerLength.Value)
+			start, end, err := models.ParseYearRangeString(careerLength.Value)
 			if err != nil {
 				return fmt.Errorf("invalid career length value: %s", careerLength.Value)
 			}
@@ -70,6 +70,28 @@ func (qb *performerFilterHandler) validate() error {
 		}
 	}
 
+	// validate date formats
+	if filter.Birthdate != nil && filter.Birthdate.Value != "" {
+		if _, err := models.ParseDate(filter.Birthdate.Value); err != nil {
+			return fmt.Errorf("invalid birthdate value: %s", filter.Birthdate.Value)
+		}
+	}
+	if filter.DeathDate != nil && filter.DeathDate.Value != "" {
+		if _, err := models.ParseDate(filter.DeathDate.Value); err != nil {
+			return fmt.Errorf("invalid death date value: %s", filter.DeathDate.Value)
+		}
+	}
+	if filter.CareerStart != nil && filter.CareerStart.Value != "" {
+		if _, err := models.ParseDate(filter.CareerStart.Value); err != nil {
+			return fmt.Errorf("invalid career start value: %s", filter.CareerStart.Value)
+		}
+	}
+	if filter.CareerEnd != nil && filter.CareerEnd.Value != "" {
+		if _, err := models.ParseDate(filter.CareerEnd.Value); err != nil {
+			return fmt.Errorf("invalid career end value: %s", filter.CareerEnd.Value)
+		}
+	}
+
 	return nil
 }
 
@@ -156,8 +178,8 @@ func (qb *performerFilterHandler) criterionHandler() criterionHandler {
 		}),
 
 		// CareerLength filter is deprecated and non-functional (column removed in schema 78)
-		intCriterionHandler(filter.CareerStart, tableName+".career_start", nil),
-		intCriterionHandler(filter.CareerEnd, tableName+".career_end", nil),
+		&dateCriterionHandler{filter.CareerStart, tableName + ".career_start", nil},
+		&dateCriterionHandler{filter.CareerEnd, tableName + ".career_end", nil},
 		stringCriterionHandler(filter.Tattoos, tableName+".tattoos"),
 		stringCriterionHandler(filter.Piercings, tableName+".piercings"),
 		intCriterionHandler(filter.Rating100, tableName+".rating", nil),
@@ -266,31 +288,39 @@ func convertLegacyCareerLengthFilter(filter *models.PerformerFilterType) {
 		careerLength := filter.CareerLength
 		switch careerLength.Modifier {
 		case models.CriterionModifierEquals:
-			start, end, _ := utils.ParseYearRangeString(careerLength.Value)
+			start, end, _ := models.ParseYearRangeString(careerLength.Value)
 			if start != nil {
-				filter.CareerStart = &models.IntCriterionInput{
-					Value:    (*start) - 1, // minus one to make it exclusive
+				start = &models.Date{
+					Time:      start.AddDate(0, 0, -1), // make exclusive
+					Precision: models.DatePrecisionDay,
+				}
+				filter.CareerStart = &models.DateCriterionInput{
+					Value:    start.String(),
 					Modifier: models.CriterionModifierGreaterThan,
 				}
 			}
 			if end != nil {
-				filter.CareerEnd = &models.IntCriterionInput{
-					Value:    (*end) + 1, // plus one to make it exclusive
+				end = &models.Date{
+					Time:      end.AddDate(1, 0, 0), // make exclusive
+					Precision: models.DatePrecisionDay,
+				}
+				filter.CareerEnd = &models.DateCriterionInput{
+					Value:    end.String(), // plus one to make it exclusive
 					Modifier: models.CriterionModifierLessThan,
 				}
 			}
 		case models.CriterionModifierIsNull:
-			filter.CareerStart = &models.IntCriterionInput{
+			filter.CareerStart = &models.DateCriterionInput{
 				Modifier: models.CriterionModifierIsNull,
 			}
-			filter.CareerEnd = &models.IntCriterionInput{
+			filter.CareerEnd = &models.DateCriterionInput{
 				Modifier: models.CriterionModifierIsNull,
 			}
 		case models.CriterionModifierNotNull:
-			filter.CareerStart = &models.IntCriterionInput{
+			filter.CareerStart = &models.DateCriterionInput{
 				Modifier: models.CriterionModifierNotNull,
 			}
-			filter.CareerEnd = &models.IntCriterionInput{
+			filter.CareerEnd = &models.DateCriterionInput{
 				Modifier: models.CriterionModifierNotNull,
 			}
 		}
diff --git a/pkg/sqlite/performer_test.go b/pkg/sqlite/performer_test.go
index 6dd38d881..ebe1b9eab 100644
--- a/pkg/sqlite/performer_test.go
+++ b/pkg/sqlite/performer_test.go
@@ -66,8 +66,8 @@ func Test_PerformerStore_Create(t *testing.T) {
 		fakeTits       = "fakeTits"
 		penisLength    = 1.23
 		circumcised    = models.CircumcisedEnumCut
-		careerStart    = 2005
-		careerEnd      = 2015
+		careerStart    = models.DateFromYear(2005)
+		careerEnd      = models.DateFromYear(2015)
 		tattoos        = "tattoos"
 		piercings      = "piercings"
 		aliases        = []string{"alias1", "alias2"}
@@ -229,8 +229,8 @@ func Test_PerformerStore_Update(t *testing.T) {
 		fakeTits       = "fakeTits"
 		penisLength    = 1.23
 		circumcised    = models.CircumcisedEnumCut
-		careerStart    = 2005
-		careerEnd      = 2015
+		careerStart    = models.DateFromYear(2005)
+		careerEnd      = models.DateFromYear(2015)
 		tattoos        = "tattoos"
 		piercings      = "piercings"
 		aliases        = []string{"alias1", "alias2"}
@@ -424,8 +424,8 @@ func clearPerformerPartial() models.PerformerPartial {
 		FakeTits:       nullString,
 		PenisLength:    nullFloat,
 		Circumcised:    nullString,
-		CareerStart:    nullInt,
-		CareerEnd:      nullInt,
+		CareerStart:    nullDate,
+		CareerEnd:      nullDate,
 		Tattoos:        nullString,
 		Piercings:      nullString,
 		Aliases:        &models.UpdateStrings{Mode: models.RelationshipUpdateModeSet},
@@ -458,8 +458,8 @@ func Test_PerformerStore_UpdatePartial(t *testing.T) {
 		fakeTits       = "fakeTits"
 		penisLength    = 1.23
 		circumcised    = models.CircumcisedEnumCut
-		careerStart    = 2005
-		careerEnd      = 2015
+		careerStart    = models.DateFromYear(2005)
+		careerEnd      = models.DateFromYear(2015)
 		tattoos        = "tattoos"
 		piercings      = "piercings"
 		aliases        = []string{"alias1", "alias2"}
@@ -505,8 +505,8 @@ func Test_PerformerStore_UpdatePartial(t *testing.T) {
 				FakeTits:     models.NewOptionalString(fakeTits),
 				PenisLength:  models.NewOptionalFloat64(penisLength),
 				Circumcised:  models.NewOptionalString(circumcised.String()),
-				CareerStart:  models.NewOptionalInt(careerStart),
-				CareerEnd:    models.NewOptionalInt(careerEnd),
+				CareerStart:  models.NewOptionalDate(careerStart),
+				CareerEnd:    models.NewOptionalDate(careerEnd),
 				Tattoos:      models.NewOptionalString(tattoos),
 				Piercings:    models.NewOptionalString(piercings),
 				Aliases: &models.UpdateStrings{
@@ -1778,8 +1778,8 @@ func TestPerformerQueryLegacyCareerLength(t *testing.T) {
 	tests := []struct {
 		name            string
 		c               models.StringCriterionInput
-		careerStartCrit *models.IntCriterionInput
-		careerEndCrit   *models.IntCriterionInput
+		careerStartCrit *models.DateCriterionInput
+		careerEndCrit   *models.DateCriterionInput
 		err             bool
 	}{
 		{
@@ -1788,13 +1788,13 @@ func TestPerformerQueryLegacyCareerLength(t *testing.T) {
 				Value:    value,
 				Modifier: models.CriterionModifierEquals,
 			},
-			careerStartCrit: &models.IntCriterionInput{
-				Value:    2002,
-				Modifier: models.CriterionModifierEquals,
+			careerStartCrit: &models.DateCriterionInput{
+				Value:    "2001-12-31",
+				Modifier: models.CriterionModifierGreaterThan,
 			},
-			careerEndCrit: &models.IntCriterionInput{
-				Value:    2012,
-				Modifier: models.CriterionModifierEquals,
+			careerEndCrit: &models.DateCriterionInput{
+				Value:    "2013-01-01",
+				Modifier: models.CriterionModifierLessThan,
 			},
 			err: false,
 		},
@@ -1811,10 +1811,10 @@ func TestPerformerQueryLegacyCareerLength(t *testing.T) {
 			c: models.StringCriterionInput{
 				Modifier: models.CriterionModifierIsNull,
 			},
-			careerStartCrit: &models.IntCriterionInput{
+			careerStartCrit: &models.DateCriterionInput{
 				Modifier: models.CriterionModifierIsNull,
 			},
-			careerEndCrit: &models.IntCriterionInput{
+			careerEndCrit: &models.DateCriterionInput{
 				Modifier: models.CriterionModifierIsNull,
 			},
 			err: false,
@@ -1824,10 +1824,10 @@ func TestPerformerQueryLegacyCareerLength(t *testing.T) {
 			c: models.StringCriterionInput{
 				Modifier: models.CriterionModifierNotNull,
 			},
-			careerStartCrit: &models.IntCriterionInput{
+			careerStartCrit: &models.DateCriterionInput{
 				Modifier: models.CriterionModifierNotNull,
 			},
-			careerEndCrit: &models.IntCriterionInput{
+			careerEndCrit: &models.DateCriterionInput{
 				Modifier: models.CriterionModifierNotNull,
 			},
 			err: false,
@@ -1865,16 +1865,16 @@ func TestPerformerQueryLegacyCareerLength(t *testing.T) {
 			}
 
 			for _, performer := range performers {
-				verifyIntPtr(t, performer.CareerStart, *tt.careerStartCrit)
-				verifyIntPtr(t, performer.CareerEnd, *tt.careerEndCrit)
+				verifyDatePtr(t, performer.CareerStart, *tt.careerStartCrit)
+				verifyDatePtr(t, performer.CareerEnd, *tt.careerEndCrit)
 			}
 		})
 	}
 }
 
 func TestPerformerQueryCareerStart(t *testing.T) {
-	const value = 2002
-	criterion := models.IntCriterionInput{
+	const value = "2002"
+	criterion := models.DateCriterionInput{
 		Value:    value,
 		Modifier: models.CriterionModifierEquals,
 	}
@@ -1891,7 +1891,7 @@ func TestPerformerQueryCareerStart(t *testing.T) {
 		}
 
 		for _, performer := range performers {
-			verifyIntPtr(t, performer.CareerStart, criterion)
+			verifyDatePtr(t, performer.CareerStart, criterion)
 		}
 
 		return nil
@@ -1899,8 +1899,8 @@ func TestPerformerQueryCareerStart(t *testing.T) {
 }
 
 func TestPerformerQueryCareerEnd(t *testing.T) {
-	const value = 2012
-	criterion := models.IntCriterionInput{
+	const value = "2012"
+	criterion := models.DateCriterionInput{
 		Value:    value,
 		Modifier: models.CriterionModifierEquals,
 	}
@@ -1917,7 +1917,7 @@ func TestPerformerQueryCareerEnd(t *testing.T) {
 		}
 
 		for _, performer := range performers {
-			verifyIntPtr(t, performer.CareerEnd, criterion)
+			verifyDatePtr(t, performer.CareerEnd, criterion)
 		}
 
 		return nil
diff --git a/pkg/sqlite/scene_test.go b/pkg/sqlite/scene_test.go
index d386175c7..67bf227a2 100644
--- a/pkg/sqlite/scene_test.go
+++ b/pkg/sqlite/scene_test.go
@@ -2821,6 +2821,33 @@ func verifyIntPtr(t *testing.T, value *int, criterion models.IntCriterionInput)
 	}
 }
 
+func verifyDatePtr(t *testing.T, value *models.Date, criterion models.DateCriterionInput) {
+	t.Helper()
+	assert := assert.New(t)
+	if criterion.Modifier == models.CriterionModifierIsNull {
+		assert.Nil(value, "expect is null values to be null")
+	}
+	if criterion.Modifier == models.CriterionModifierNotNull {
+		assert.NotNil(value, "expect not null values to be not null")
+	}
+	if criterion.Modifier == models.CriterionModifierEquals {
+		date, _ := models.ParseDate(criterion.Value)
+		assert.Equal(date, *value)
+	}
+	if criterion.Modifier == models.CriterionModifierNotEquals {
+		date, _ := models.ParseDate(criterion.Value)
+		assert.NotEqual(date, *value)
+	}
+	if criterion.Modifier == models.CriterionModifierGreaterThan {
+		date, _ := models.ParseDate(criterion.Value)
+		assert.True(value.After(date))
+	}
+	if criterion.Modifier == models.CriterionModifierLessThan {
+		date, _ := models.ParseDate(criterion.Value)
+		assert.True(date.After(*value))
+	}
+}
+
 func TestSceneQueryOCounter(t *testing.T) {
 	const oCounter = 1
 	oCounterCriterion := models.IntCriterionInput{
diff --git a/pkg/sqlite/setup_test.go b/pkg/sqlite/setup_test.go
index cb5744636..4ab310ee7 100644
--- a/pkg/sqlite/setup_test.go
+++ b/pkg/sqlite/setup_test.go
@@ -1597,24 +1597,24 @@ func getPerformerDeathDate(index int) *models.Date {
 	return &ret
 }
 
-func getPerformerCareerStart(index int) *int {
+func getPerformerCareerStart(index int) *models.Date {
 	if index%5 == 0 {
 		return nil
 	}
 
-	ret := 2000 + index
-	return &ret
+	date := models.DateFromYear(2000 + index)
+	return &date
 }
 
-func getPerformerCareerEnd(index int) *int {
+func getPerformerCareerEnd(index int) *models.Date {
 	if index%5 == 0 {
 		return nil
 	}
 
 	// only set career_end for even indices
 	if index%2 == 0 {
-		ret := 2010 + index
-		return &ret
+		date := models.DateFromYear(2010 + index)
+		return &date
 	}
 	return nil
 }
diff --git a/pkg/sqlite/sql.go b/pkg/sqlite/sql.go
index 70d86ab5e..87376c2c1 100644
--- a/pkg/sqlite/sql.go
+++ b/pkg/sqlite/sql.go
@@ -269,8 +269,11 @@ func getDateWhereClause(column string, modifier models.CriterionModifier, value
 		upper = &u
 	}
 
-	args := []interface{}{value}
-	betweenArgs := []interface{}{value, *upper}
+	valueDate, _ := models.ParseDate(value)
+	date := Date{Date: valueDate.Time}
+
+	args := []interface{}{date}
+	betweenArgs := []interface{}{date, *upper}
 
 	switch modifier {
 	case models.CriterionModifierIsNull:
diff --git a/pkg/stashbox/performer.go b/pkg/stashbox/performer.go
index 231b936d6..589fd29b6 100644
--- a/pkg/stashbox/performer.go
+++ b/pkg/stashbox/performer.go
@@ -232,12 +232,12 @@ func performerFragmentToScrapedPerformer(p graphql.PerformerFragment) *models.Sc
 	}
 
 	if p.CareerStartYear != nil {
-		cs := *p.CareerStartYear
+		cs := strconv.Itoa(*p.CareerStartYear)
 		sp.CareerStart = &cs
 	}
 
 	if p.CareerEndYear != nil {
-		ce := *p.CareerEndYear
+		ce := strconv.Itoa(*p.CareerEndYear)
 		sp.CareerEnd = &ce
 	}
 
@@ -399,10 +399,12 @@ func (c Client) SubmitPerformerDraft(ctx context.Context, performer *models.Perf
 		draft.Aliases = &aliases
 	}
 	if performer.CareerStart != nil {
-		draft.CareerStartYear = performer.CareerStart
+		year := performer.CareerStart.Year()
+		draft.CareerStartYear = &year
 	}
 	if performer.CareerEnd != nil {
-		draft.CareerEndYear = performer.CareerEnd
+		year := performer.CareerEnd.Year()
+		draft.CareerEndYear = &year
 	}
 
 	if len(performer.URLs.List()) > 0 {
diff --git a/pkg/utils/date.go b/pkg/utils/date.go
index 4b805862a..de5566e4d 100644
--- a/pkg/utils/date.go
+++ b/pkg/utils/date.go
@@ -2,8 +2,6 @@ package utils
 
 import (
 	"fmt"
-	"strconv"
-	"strings"
 	"time"
 )
 
@@ -27,80 +25,3 @@ func ParseDateStringAsTime(dateString string) (time.Time, error) {
 
 	return time.Time{}, fmt.Errorf("ParseDateStringAsTime failed: dateString <%s>", dateString)
 }
-
-// ParseYearRangeString parses a year range string into start and end year integers.
-// Supported formats: "YYYY", "YYYY - YYYY", "YYYY-YYYY", "YYYY -", "- YYYY", "YYYY-present".
-// Returns nil for start/end if not present in the string.
-func ParseYearRangeString(s string) (start *int, end *int, err error) {
-	s = strings.TrimSpace(s)
-	if s == "" {
-		return nil, nil, fmt.Errorf("empty year range string")
-	}
-
-	// normalize "present" to empty end
-	lower := strings.ToLower(s)
-	lower = strings.ReplaceAll(lower, "present", "")
-
-	// split on "-" if it contains one
-	var parts []string
-	if strings.Contains(lower, "-") {
-		parts = strings.SplitN(lower, "-", 2)
-	} else {
-		// single value, treat as start year
-		year, err := parseYear(lower)
-		if err != nil {
-			return nil, nil, fmt.Errorf("invalid year range %q: %w", s, err)
-		}
-		return &year, nil, nil
-	}
-
-	startStr := strings.TrimSpace(parts[0])
-	endStr := strings.TrimSpace(parts[1])
-
-	if startStr != "" {
-		y, err := parseYear(startStr)
-		if err != nil {
-			return nil, nil, fmt.Errorf("invalid start year in %q: %w", s, err)
-		}
-		start = &y
-	}
-
-	if endStr != "" {
-		y, err := parseYear(endStr)
-		if err != nil {
-			return nil, nil, fmt.Errorf("invalid end year in %q: %w", s, err)
-		}
-		end = &y
-	}
-
-	if start == nil && end == nil {
-		return nil, nil, fmt.Errorf("could not parse year range %q", s)
-	}
-
-	return start, end, nil
-}
-
-func parseYear(s string) (int, error) {
-	s = strings.TrimSpace(s)
-	year, err := strconv.Atoi(s)
-	if err != nil {
-		return 0, fmt.Errorf("invalid year %q: %w", s, err)
-	}
-	if year < 1900 || year > 2200 {
-		return 0, fmt.Errorf("year %d out of reasonable range", year)
-	}
-	return year, nil
-}
-
-func FormatYearRange(start *int, end *int) string {
-	switch {
-	case start == nil && end == nil:
-		return ""
-	case end == nil:
-		return fmt.Sprintf("%d -", *start)
-	case start == nil:
-		return fmt.Sprintf("- %d", *end)
-	default:
-		return fmt.Sprintf("%d - %d", *start, *end)
-	}
-}
diff --git a/pkg/utils/date_test.go b/pkg/utils/date_test.go
index a9e174094..ae077c21e 100644
--- a/pkg/utils/date_test.go
+++ b/pkg/utils/date_test.go
@@ -2,8 +2,6 @@ package utils
 
 import (
 	"testing"
-
-	"github.com/stretchr/testify/assert"
 )
 
 func TestParseDateStringAsTime(t *testing.T) {
@@ -43,66 +41,3 @@ func TestParseDateStringAsTime(t *testing.T) {
 		})
 	}
 }
-
-func TestParseYearRangeString(t *testing.T) {
-	intPtr := func(v int) *int { return &v }
-
-	tests := []struct {
-		name      string
-		input     string
-		wantStart *int
-		wantEnd   *int
-		wantErr   bool
-	}{
-		{"single year", "2005", intPtr(2005), nil, false},
-		{"year range with spaces", "2005 - 2010", intPtr(2005), intPtr(2010), false},
-		{"year range no spaces", "2005-2010", intPtr(2005), intPtr(2010), false},
-		{"year dash open", "2005 -", intPtr(2005), nil, false},
-		{"year dash open no space", "2005-", intPtr(2005), nil, false},
-		{"dash year", "- 2010", nil, intPtr(2010), false},
-		{"year present", "2005-present", intPtr(2005), nil, false},
-		{"year Present caps", "2005 - Present", intPtr(2005), nil, false},
-		{"whitespace padding", "  2005 - 2010  ", intPtr(2005), intPtr(2010), false},
-		{"empty string", "", nil, nil, true},
-		{"garbage", "not a year", nil, nil, true},
-		{"partial garbage start", "abc - 2010", nil, nil, true},
-		{"partial garbage end", "2005 - abc", nil, nil, true},
-		{"year out of range", "1800", nil, nil, true},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			start, end, err := ParseYearRangeString(tt.input)
-			if tt.wantErr {
-				assert.Error(t, err)
-				return
-			}
-			assert.NoError(t, err)
-			assert.Equal(t, tt.wantStart, start)
-			assert.Equal(t, tt.wantEnd, end)
-		})
-	}
-}
-
-func TestFormatYearRange(t *testing.T) {
-	intPtr := func(v int) *int { return &v }
-
-	tests := []struct {
-		name  string
-		start *int
-		end   *int
-		want  string
-	}{
-		{"both nil", nil, nil, ""},
-		{"only start", intPtr(2005), nil, "2005 -"},
-		{"only end", nil, intPtr(2010), "- 2010"},
-		{"start and end", intPtr(2005), intPtr(2010), "2005 - 2010"},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got := FormatYearRange(tt.start, tt.end)
-			assert.Equal(t, tt.want, got)
-		})
-	}
-}
diff --git a/ui/v2.5/src/components/Performers/EditPerformersDialog.tsx b/ui/v2.5/src/components/Performers/EditPerformersDialog.tsx
index d63886167..06ae2834a 100644
--- a/ui/v2.5/src/components/Performers/EditPerformersDialog.tsx
+++ b/ui/v2.5/src/components/Performers/EditPerformersDialog.tsx
@@ -91,6 +91,10 @@ export const EditPerformersDialog: React.FC<IListOperationProps> = (
 
   const [birthdateError, setBirthdateError] = useState<string | undefined>();
   const [deathDateError, setDeathDateError] = useState<string | undefined>();
+  const [careerStartError, setCareerStartError] = useState<
+    string | undefined
+  >();
+  const [careerEndError, setCareerEndError] = useState<string | undefined>();
 
   useEffect(() => {
     setBirthdateError(getDateError(updateInput.birthdate ?? "", intl));
@@ -100,6 +104,14 @@ export const EditPerformersDialog: React.FC<IListOperationProps> = (
     setDeathDateError(getDateError(updateInput.death_date ?? "", intl));
   }, [updateInput.death_date, intl]);
 
+  useEffect(() => {
+    setCareerStartError(getDateError(updateInput.career_start ?? "", intl));
+  }, [updateInput.career_start, intl]);
+
+  useEffect(() => {
+    setCareerEndError(getDateError(updateInput.career_end ?? "", intl));
+  }, [updateInput.career_end, intl]);
+
   // Network state
   const [isUpdating, setIsUpdating] = useState(false);
 
@@ -428,21 +440,23 @@ export const EditPerformersDialog: React.FC<IListOperationProps> = (
             />
           </BulkUpdateFormGroup>
           <BulkUpdateFormGroup name="career_start">
-            <BulkUpdateTextInput
-              value={updateInput.career_start?.toString()}
-              valueChanged={(v) =>
-                setUpdateField({ career_start: v ? parseInt(v) : undefined })
+            <BulkUpdateDateInput
+              value={updateInput.career_start}
+              valueChanged={(newValue) =>
+                setUpdateField({ career_start: newValue })
               }
               unsetDisabled={unsetDisabled}
+              error={careerStartError}
             />
           </BulkUpdateFormGroup>
           <BulkUpdateFormGroup name="career_end">
-            <BulkUpdateTextInput
-              value={updateInput.career_end?.toString()}
-              valueChanged={(v) =>
-                setUpdateField({ career_end: v ? parseInt(v) : undefined })
+            <BulkUpdateDateInput
+              value={updateInput.career_end}
+              valueChanged={(newValue) =>
+                setUpdateField({ career_end: newValue })
               }
               unsetDisabled={unsetDisabled}
+              error={careerEndError}
             />
           </BulkUpdateFormGroup>
 
diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
index a82a1f8c8..6d5570ef0 100644
--- a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
@@ -119,8 +119,8 @@ export const PerformerEditPanel: React.FC<IPerformerDetails> = ({
     circumcised: yupInputEnum(GQL.CircumcisedEnum).nullable().defined(),
     tattoos: yup.string().ensure(),
     piercings: yup.string().ensure(),
-    career_start: yupInputNumber().positive().nullable().defined(),
-    career_end: yupInputNumber().positive().nullable().defined(),
+    career_start: yupDateString(intl),
+    career_end: yupDateString(intl),
     urls: yupUniqueStringList(intl),
     details: yup.string().ensure(),
     tag_ids: yup.array(yup.string().required()).defined(),
@@ -149,8 +149,8 @@ export const PerformerEditPanel: React.FC<IPerformerDetails> = ({
     circumcised: performer.circumcised ?? null,
     tattoos: performer.tattoos ?? "",
     piercings: performer.piercings ?? "",
-    career_start: performer.career_start ?? null,
-    career_end: performer.career_end ?? null,
+    career_start: performer.career_start ?? "",
+    career_end: performer.career_end ?? "",
     urls: performer.urls ?? [],
     details: performer.details ?? "",
     tag_ids: (performer.tags ?? []).map((t) => t.id),
@@ -745,8 +745,8 @@ export const PerformerEditPanel: React.FC<IPerformerDetails> = ({
         {renderInputField("tattoos", "textarea")}
         {renderInputField("piercings", "textarea")}
 
-        {renderInputField("career_start", "number")}
-        {renderInputField("career_end", "number")}
+        {renderDateField("career_start")}
+        {renderDateField("career_end")}
 
         {renderURLListField("urls", onScrapePerformerURL, urlScrapable)}
 
diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerScrapeDialog.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerScrapeDialog.tsx
index 6167ea3a2..d1005b68c 100644
--- a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerScrapeDialog.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerScrapeDialog.tsx
@@ -8,7 +8,6 @@ import {
   ScrapedTextAreaRow,
   ScrapedCountryRow,
   ScrapedStringListRow,
-  ScrapedNumberRow,
 } from "src/components/Shared/ScrapeDialog/ScrapeDialogRow";
 import { ScrapeDialog } from "src/components/Shared/ScrapeDialog/ScrapeDialog";
 import { Form } from "react-bootstrap";
@@ -273,14 +272,14 @@ export const PerformerScrapeDialog: React.FC<IPerformerScrapeDialogProps> = (
   const [fakeTits, setFakeTits] = useState<ScrapeResult<string>>(
     new ScrapeResult<string>(props.performer.fake_tits, props.scraped.fake_tits)
   );
-  const [careerStart, setCareerStart] = useState<ScrapeResult<number>>(
-    new ScrapeResult<number>(
+  const [careerStart, setCareerStart] = useState<ScrapeResult<string>>(
+    new ScrapeResult<string>(
       props.performer.career_start,
       props.scraped.career_start
     )
   );
-  const [careerEnd, setCareerEnd] = useState<ScrapeResult<number>>(
-    new ScrapeResult<number>(
+  const [careerEnd, setCareerEnd] = useState<ScrapeResult<string>>(
+    new ScrapeResult<string>(
       props.performer.career_end,
       props.scraped.career_end
     )
@@ -502,13 +501,13 @@ export const PerformerScrapeDialog: React.FC<IPerformerScrapeDialogProps> = (
           result={fakeTits}
           onChange={(value) => setFakeTits(value)}
         />
-        <ScrapedNumberRow
+        <ScrapedInputGroupRow
           field="career_start"
           title={intl.formatMessage({ id: "career_start" })}
           result={careerStart}
           onChange={(value) => setCareerStart(value)}
         />
-        <ScrapedNumberRow
+        <ScrapedInputGroupRow
           field="career_end"
           title={intl.formatMessage({ id: "career_end" })}
           result={careerEnd}
diff --git a/ui/v2.5/src/components/Performers/PerformerList.tsx b/ui/v2.5/src/components/Performers/PerformerList.tsx
index 87258b35b..85531e0db 100644
--- a/ui/v2.5/src/components/Performers/PerformerList.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerList.tsx
@@ -138,10 +138,11 @@ export const FormatWeight = (weight?: number | null) => {
 };
 
 export function formatYearRange(
-  start?: number | null,
-  end?: number | null
+  start?: string | null,
+  end?: string | null
 ): string | undefined {
   if (!start && !end) return undefined;
+
   return `${start ?? ""} - ${end ?? ""}`;
 }
 
diff --git a/ui/v2.5/src/components/Performers/PerformerMergeDialog.tsx b/ui/v2.5/src/components/Performers/PerformerMergeDialog.tsx
index efa51f1db..e4699c8e0 100644
--- a/ui/v2.5/src/components/Performers/PerformerMergeDialog.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerMergeDialog.tsx
@@ -630,12 +630,8 @@ const PerformerMergeDetails: React.FC<IPerformerMergeDetailsProps> = ({
           : undefined,
         measurements: measurements.getNewValue(),
         fake_tits: fakeTits.getNewValue(),
-        career_start: careerStart.getNewValue()
-          ? parseInt(careerStart.getNewValue()!)
-          : undefined,
-        career_end: careerEnd.getNewValue()
-          ? parseInt(careerEnd.getNewValue()!)
-          : undefined,
+        career_start: careerStart.getNewValue(),
+        career_end: careerEnd.getNewValue(),
         tattoos: tattoos.getNewValue(),
         piercings: piercings.getNewValue(),
         urls: urls.getNewValue(),
diff --git a/ui/v2.5/src/core/performers.ts b/ui/v2.5/src/core/performers.ts
index 016e9e13f..e11130abf 100644
--- a/ui/v2.5/src/core/performers.ts
+++ b/ui/v2.5/src/core/performers.ts
@@ -104,10 +104,8 @@ export const scrapedPerformerToCreateInput = (
     height_cm: toCreate.height ? Number(toCreate.height) : undefined,
     measurements: toCreate.measurements,
     fake_tits: toCreate.fake_tits,
-    career_start: toCreate.career_start
-      ? Number(toCreate.career_start)
-      : undefined,
-    career_end: toCreate.career_end ? Number(toCreate.career_end) : undefined,
+    career_start: toCreate.career_start,
+    career_end: toCreate.career_end,
     tattoos: toCreate.tattoos,
     piercings: toCreate.piercings,
     alias_list: aliases,
diff --git a/ui/v2.5/src/models/list-filter/performers.ts b/ui/v2.5/src/models/list-filter/performers.ts
index 372dad342..b491b7fdc 100644
--- a/ui/v2.5/src/models/list-filter/performers.ts
+++ b/ui/v2.5/src/models/list-filter/performers.ts
@@ -76,8 +76,6 @@ const numberCriteria: CriterionType[] = [
   "age",
   "weight",
   "penis_length",
-  "career_start",
-  "career_end",
 ];
 
 const stringCriteria: CriterionType[] = [
@@ -120,6 +118,8 @@ const criterionOptions = [
   ...stringCriteria.map((c) => createStringCriterionOption(c)),
   createDateCriterionOption("birthdate"),
   createDateCriterionOption("death_date"),
+  createDateCriterionOption("career_start"),
+  createDateCriterionOption("career_end"),
   createMandatoryTimestampCriterionOption("created_at"),
   createMandatoryTimestampCriterionOption("updated_at"),
   CustomFieldsCriterionOption,

From b2179cd7230c21460bf2a057badeefe1ac4174e8 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Tue, 17 Mar 2026 15:48:56 +1100
Subject: [PATCH 356/405] Add stash ids to performer merge dialog (#6688)

* Move reused functions/components to separate files
* Add alwaysShow field to ScrapedDialogRow
* Add stash ids to performer merge dialog
* Reuse StashIDsField in TagMergeDialog
* Always show stash ids when available on scene and tag merge dialogs
---
 .../Performers/PerformerMergeDialog.tsx       | 48 +++++++++++++++++--
 .../components/Scenes/SceneMergeDialog.tsx    | 31 ++----------
 .../Shared/ScrapeDialog/ScrapeDialogRow.tsx   |  3 +-
 ui/v2.5/src/components/Shared/StashID.tsx     | 18 +++++++
 .../src/components/Tags/TagMergeDialog.tsx    | 13 ++---
 ui/v2.5/src/utils/data.ts                     |  6 +++
 6 files changed, 79 insertions(+), 40 deletions(-)

diff --git a/ui/v2.5/src/components/Performers/PerformerMergeDialog.tsx b/ui/v2.5/src/components/Performers/PerformerMergeDialog.tsx
index e4699c8e0..0d42dd6ed 100644
--- a/ui/v2.5/src/components/Performers/PerformerMergeDialog.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerMergeDialog.tsx
@@ -20,13 +20,14 @@ import { faExchangeAlt, faSignInAlt } from "@fortawesome/free-solid-svg-icons";
 import { ScrapeDialog } from "../Shared/ScrapeDialog/ScrapeDialog";
 import {
   ScrapedCustomFieldRows,
+  ScrapeDialogRow,
   ScrapedImageRow,
   ScrapedInputGroupRow,
   ScrapedStringListRow,
   ScrapedTextAreaRow,
 } from "../Shared/ScrapeDialog/ScrapeDialogRow";
 import { ModalComponent } from "../Shared/Modal";
-import { sortStoredIdObjects } from "src/utils/data";
+import { sortStoredIdObjects, uniqIDStoredIDs } from "src/utils/data";
 import {
   CustomFieldScrapeResults,
   ObjectListScrapeResult,
@@ -40,6 +41,7 @@ import {
 } from "./PerformerDetails/PerformerScrapeDialog";
 import { PerformerSelect } from "./PerformerSelect";
 import { uniq } from "lodash-es";
+import { StashIDsField } from "../Shared/StashID";
 
 type MergeOptions = {
   values: GQL.PerformerUpdateInput;
@@ -132,6 +134,8 @@ const PerformerMergeDetails: React.FC<IPerformerMergeDetailsProps> = ({
     )
   );
 
+  const [stashIDs, setStashIDs] = useState(new ScrapeResult<GQL.StashId[]>([]));
+
   const [image, setImage] = useState<ScrapeResult<string>>(
     new ScrapeResult<string>(dest.image_path)
   );
@@ -166,6 +170,10 @@ const PerformerMergeDetails: React.FC<IPerformerMergeDetailsProps> = ({
       setLoading(false);
     }
 
+    // append dest to all so that if dest has stash_ids with the same
+    // endpoint, then it will be excluded first
+    const all = sources.concat(dest);
+
     setName(
       new ScrapeResult(dest.name, sources.find((s) => s.name)?.name, !dest.name)
     );
@@ -297,9 +305,8 @@ const PerformerMergeDetails: React.FC<IPerformerMergeDetailsProps> = ({
     );
     setURLs(
       new ScrapeResult(
-        dest.urls,
-        sources.find((s) => s.urls)?.urls,
-        !dest.urls?.length
+        dest.urls ?? [],
+        uniq(all.map((s) => s.urls ?? []).flat())
       )
     );
     setGender(
@@ -327,6 +334,25 @@ const PerformerMergeDetails: React.FC<IPerformerMergeDetailsProps> = ({
         !dest.details
       )
     );
+    setTags(
+      new ObjectListScrapeResult<GQL.ScrapedTag>(
+        sortStoredIdObjects(dest.tags.map(idToStoredID)),
+        uniqIDStoredIDs(all.map((s) => s.tags.map(idToStoredID)).flat())
+      )
+    );
+    setStashIDs(
+      new ScrapeResult(
+        dest.stash_ids,
+        all
+          .map((s) => s.stash_ids)
+          .flat()
+          .filter((s, index, a) => {
+            // remove entries with duplicate endpoints
+            return index === a.findIndex((ss) => ss.endpoint === s.endpoint);
+          })
+      )
+    );
+
     setImage(
       new ScrapeResult(
         dest.image_path,
@@ -583,6 +609,19 @@ const PerformerMergeDetails: React.FC<IPerformerMergeDetailsProps> = ({
           result={details}
           onChange={(value) => setDetails(value)}
         />
+        <ScrapeDialogRow
+          field="stash_ids"
+          title={intl.formatMessage({ id: "stash_id" })}
+          result={stashIDs}
+          originalField={
+            <StashIDsField values={stashIDs?.originalValue ?? []} />
+          }
+          newField={<StashIDsField values={stashIDs?.newValue ?? []} />}
+          onChange={(value) => setStashIDs(value)}
+          alwaysShow={
+            !!stashIDs.originalValue?.length || !!stashIDs.newValue?.length
+          }
+        />
         <ScrapedImageRow
           field="image"
           title={intl.formatMessage({ id: "performer_image" })}
@@ -639,6 +678,7 @@ const PerformerMergeDetails: React.FC<IPerformerMergeDetailsProps> = ({
         circumcised: stringToCircumcised(circumcised.getNewValue()),
         tag_ids: tags.getNewValue()?.map((t) => t.stored_id!),
         details: details.getNewValue(),
+        stash_ids: stashIDs.getNewValue(),
         image: coverImage,
         custom_fields: {
           partial: Object.fromEntries(
diff --git a/ui/v2.5/src/components/Scenes/SceneMergeDialog.tsx b/ui/v2.5/src/components/Scenes/SceneMergeDialog.tsx
index c38b27f07..29ae93143 100644
--- a/ui/v2.5/src/components/Scenes/SceneMergeDialog.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneMergeDialog.tsx
@@ -26,7 +26,7 @@ import { ScrapeDialog } from "../Shared/ScrapeDialog/ScrapeDialog";
 import { clone, uniq } from "lodash-es";
 import { RatingSystem } from "src/components/Shared/Rating/RatingSystem";
 import { ModalComponent } from "../Shared/Modal";
-import { IHasStoredID, sortStoredIdObjects } from "src/utils/data";
+import { sortStoredIdObjects, uniqIDStoredIDs } from "src/utils/data";
 import {
   CustomFieldScrapeResults,
   ObjectListScrapeResult,
@@ -41,25 +41,7 @@ import {
   ScrapedTagsRow,
 } from "../Shared/ScrapeDialog/ScrapedObjectsRow";
 import { Scene, SceneSelect } from "src/components/Scenes/SceneSelect";
-import { StashIDPill } from "src/components/Shared/StashID";
-
-interface IStashIDsField {
-  values: GQL.StashId[];
-}
-
-const StashIDsField: React.FC<IStashIDsField> = ({ values }) => {
-  if (!values.length) return null;
-
-  return (
-    <ul className="pl-0 mw-100">
-      {values.map((v) => (
-        <li key={v.stash_id} className="row no-gutters">
-          <StashIDPill linkType="scenes" stashID={v} />
-        </li>
-      ))}
-    </ul>
-  );
-};
+import { StashIDsField } from "../Shared/StashID";
 
 type MergeOptions = {
   values: GQL.SceneUpdateInput;
@@ -143,12 +125,6 @@ const SceneMergeDetails: React.FC<ISceneMergeDetailsProps> = ({
     return ret;
   }
 
-  function uniqIDStoredIDs<T extends IHasStoredID>(objs: T[]) {
-    return objs.filter((o, i) => {
-      return objs.findIndex((oo) => oo.stored_id === o.stored_id) === i;
-    });
-  }
-
   const [performers, setPerformers] = useState<
     ObjectListScrapeResult<GQL.ScrapedPerformer>
   >(
@@ -615,6 +591,9 @@ const SceneMergeDetails: React.FC<ISceneMergeDetailsProps> = ({
           }
           newField={<StashIDsField values={stashIDs?.newValue ?? []} />}
           onChange={(value) => setStashIDs(value)}
+          alwaysShow={
+            !!stashIDs.originalValue?.length || !!stashIDs.newValue?.length
+          }
         />
         <ScrapedImageRow
           field="cover_image"
diff --git a/ui/v2.5/src/components/Shared/ScrapeDialog/ScrapeDialogRow.tsx b/ui/v2.5/src/components/Shared/ScrapeDialog/ScrapeDialogRow.tsx
index a0fe6489e..665dfa187 100644
--- a/ui/v2.5/src/components/Shared/ScrapeDialog/ScrapeDialogRow.tsx
+++ b/ui/v2.5/src/components/Shared/ScrapeDialog/ScrapeDialogRow.tsx
@@ -40,6 +40,7 @@ interface IScrapedRowProps<T> extends IScrapedFieldProps<T> {
   newField: React.ReactNode;
   onChange: (value: ScrapeResult<T>) => void;
   newValues?: React.ReactNode;
+  alwaysShow?: boolean;
 }
 
 export const ScrapeDialogRow = <T,>(props: IScrapedRowProps<T>) => {
@@ -51,7 +52,7 @@ export const ScrapeDialogRow = <T,>(props: IScrapedRowProps<T>) => {
     props.onChange(ret);
   }
 
-  if (!props.result.scraped && !props.newValues) {
+  if (!props.result.scraped && !props.newValues && !props.alwaysShow) {
     return <></>;
   }
 
diff --git a/ui/v2.5/src/components/Shared/StashID.tsx b/ui/v2.5/src/components/Shared/StashID.tsx
index 847dd7ab2..be9ee0fba 100644
--- a/ui/v2.5/src/components/Shared/StashID.tsx
+++ b/ui/v2.5/src/components/Shared/StashID.tsx
@@ -31,3 +31,21 @@ export const StashIDPill: React.FC<{
     </span>
   );
 };
+
+interface IStashIDsField {
+  values: StashId[];
+}
+
+export const StashIDsField: React.FC<IStashIDsField> = ({ values }) => {
+  if (!values.length) return null;
+
+  return (
+    <ul className="pl-0 mw-100">
+      {values.map((v) => (
+        <li key={v.stash_id} className="row no-gutters">
+          <StashIDPill linkType="scenes" stashID={v} />
+        </li>
+      ))}
+    </ul>
+  );
+};
diff --git a/ui/v2.5/src/components/Tags/TagMergeDialog.tsx b/ui/v2.5/src/components/Tags/TagMergeDialog.tsx
index a66ce5789..b155f46e2 100644
--- a/ui/v2.5/src/components/Tags/TagMergeDialog.tsx
+++ b/ui/v2.5/src/components/Tags/TagMergeDialog.tsx
@@ -28,16 +28,8 @@ import {
   ScrapedTextAreaRow,
 } from "../Shared/ScrapeDialog/ScrapeDialogRow";
 import { ScrapedTagsRow } from "../Shared/ScrapeDialog/ScrapedObjectsRow";
-import { StringListSelect } from "../Shared/Select";
 import { ScrapeDialog } from "../Shared/ScrapeDialog/ScrapeDialog";
-
-interface IStashIDsField {
-  values: GQL.StashId[];
-}
-
-const StashIDsField: React.FC<IStashIDsField> = ({ values }) => {
-  return <StringListSelect value={values.map((v) => v.stash_id)} />;
-};
+import { StashIDsField } from "../Shared/StashID";
 
 interface ITagMergeDetailsProps {
   sources: GQL.TagDataFragment[];
@@ -333,6 +325,9 @@ const TagMergeDetails: React.FC<ITagMergeDetailsProps> = ({
           }
           newField={<StashIDsField values={stashIDs?.newValue ?? []} />}
           onChange={(value) => setStashIDs(value)}
+          alwaysShow={
+            !!stashIDs.originalValue?.length || !!stashIDs.newValue?.length
+          }
         />
         <ScrapedImageRow
           field="image"
diff --git a/ui/v2.5/src/utils/data.ts b/ui/v2.5/src/utils/data.ts
index 26505bebb..f92271655 100644
--- a/ui/v2.5/src/utils/data.ts
+++ b/ui/v2.5/src/utils/data.ts
@@ -70,3 +70,9 @@ export function sortStoredIdObjects<T extends IHasStoredID>(
 
   return ret;
 }
+
+export function uniqIDStoredIDs<T extends IHasStoredID>(objs: T[]) {
+  return objs.filter((o, i) => {
+    return objs.findIndex((oo) => oo.stored_id === o.stored_id) === i;
+  });
+}

From f7b04fba6101832e81670af3c4ce7be1f615e05d Mon Sep 17 00:00:00 2001
From: dev-null-life <dev-null-life@proton.me>
Date: Tue, 17 Mar 2026 19:51:56 -0500
Subject: [PATCH 357/405] Sort performers and studios by scenes file size
 (#6642)

* feat: add scenes_size sort option for performers

Adds sorting performers by total file size of associated scenes.
Follows the existing scenes_duration pattern.

Ref: stashapp/stash#5530

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

* feat: add scenes_size sort option for studios

Adds sorting studios by total file size of associated scenes.
Follows the existing scenes_duration pattern.

Ref: stashapp/stash#5530

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

* feat(ui): add Scenes Size sort option for performers and studios

Adds 'Scenes Size' to the sort dropdown for performer and studio
list views, with i18n label.

Ref: stashapp/stash#5530

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

* feat: extend scenes_size sort to tags

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 pkg/sqlite/performer.go                      | 25 ++++++++++++++++++++
 pkg/sqlite/studio.go                         | 13 ++++++++++
 pkg/sqlite/tag.go                            | 14 +++++++++++
 ui/v2.5/src/locales/en-GB.json               |  1 +
 ui/v2.5/src/models/list-filter/performers.ts |  1 +
 ui/v2.5/src/models/list-filter/studios.ts    |  1 +
 ui/v2.5/src/models/list-filter/tags.ts       |  2 +-
 7 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/pkg/sqlite/performer.go b/pkg/sqlite/performer.go
index 5b24ca8e6..aacd9172f 100644
--- a/pkg/sqlite/performer.go
+++ b/pkg/sqlite/performer.go
@@ -782,6 +782,28 @@ func (qb *PerformerStore) sortByScenesDuration(direction string) string {
 	return " ORDER BY (" + selectPerformerScenesDurationSQL + ") " + direction
 }
 
+// used for sorting by total scene file size
+var selectPerformerScenesSizeSQL = utils.StrFormat(
+	"SELECT COALESCE(SUM({files}.size), 0) FROM {performers_scenes} s "+
+		"LEFT JOIN {scenes} ON {scenes}.id = s.{scene_id} "+
+		"LEFT JOIN {scenes_files} ON {scenes_files}.{scene_id} = {scenes}.id "+
+		"LEFT JOIN {files} ON {files}.id = {scenes_files}.file_id "+
+		"WHERE s.{performer_id} = {performers}.id",
+	map[string]interface{}{
+		"performer_id":      performerIDColumn,
+		"performers":        performerTable,
+		"performers_scenes": performersScenesTable,
+		"scenes":            sceneTable,
+		"scene_id":          sceneIDColumn,
+		"scenes_files":      scenesFilesTable,
+		"files":             fileTable,
+	},
+)
+
+func (qb *PerformerStore) sortByScenesSize(direction string) string {
+	return " ORDER BY (" + selectPerformerScenesSizeSQL + ") " + direction
+}
+
 var performerSortOptions = sortOptions{
 	"birthdate",
 	"career_start",
@@ -803,6 +825,7 @@ var performerSortOptions = sortOptions{
 	"rating",
 	"scenes_count",
 	"scenes_duration",
+	"scenes_size",
 	"tag_count",
 	"updated_at",
 	"weight",
@@ -832,6 +855,8 @@ func (qb *PerformerStore) getPerformerSort(findFilter *models.FindFilterType) (s
 		sortQuery += getCountSort(performerTable, performersScenesTable, performerIDColumn, direction)
 	case "scenes_duration":
 		sortQuery += qb.sortByScenesDuration(direction)
+	case "scenes_size":
+		sortQuery += qb.sortByScenesSize(direction)
 	case "images_count":
 		sortQuery += getCountSort(performerTable, performersImagesTable, performerIDColumn, direction)
 	case "galleries_count":
diff --git a/pkg/sqlite/studio.go b/pkg/sqlite/studio.go
index a866a94ab..87f905935 100644
--- a/pkg/sqlite/studio.go
+++ b/pkg/sqlite/studio.go
@@ -629,6 +629,16 @@ func (qb *StudioStore) sortByScenesDuration(direction string) string {
 	) %s`, sceneTable, scenesFilesTable, scenesFilesTable, sceneIDColumn, sceneTable, scenesFilesTable, sceneTable, studioIDColumn, studioTable, getSortDirection(direction))
 }
 
+func (qb *StudioStore) sortByScenesSize(direction string) string {
+	return fmt.Sprintf(` ORDER BY (
+		SELECT COALESCE(SUM(%s.size), 0)
+		FROM %s
+		LEFT JOIN %s ON %s.%s = %s.id
+		LEFT JOIN %s ON %s.id = %s.file_id
+		WHERE %s.%s = %s.id
+	) %s`, fileTable, sceneTable, scenesFilesTable, scenesFilesTable, sceneIDColumn, sceneTable, fileTable, fileTable, scenesFilesTable, sceneTable, studioIDColumn, studioTable, getSortDirection(direction))
+}
+
 // used for sorting on performer latest scene
 var selectStudioLatestSceneSQL = utils.StrFormat(
 	"SELECT MAX(date) FROM ("+
@@ -658,6 +668,7 @@ var studioSortOptions = sortOptions{
 	"name",
 	"scenes_count",
 	"scenes_duration",
+	"scenes_size",
 	"random",
 	"rating",
 	"tag_count",
@@ -688,6 +699,8 @@ func (qb *StudioStore) getStudioSort(findFilter *models.FindFilterType) (string,
 		sortQuery += getCountSort(studioTable, sceneTable, studioIDColumn, direction)
 	case "scenes_duration":
 		sortQuery += qb.sortByScenesDuration(direction)
+	case "scenes_size":
+		sortQuery += qb.sortByScenesSize(direction)
 	case "images_count":
 		sortQuery += getCountSort(studioTable, imageTable, studioIDColumn, direction)
 	case "galleries_count":
diff --git a/pkg/sqlite/tag.go b/pkg/sqlite/tag.go
index 750836516..f6a542c91 100644
--- a/pkg/sqlite/tag.go
+++ b/pkg/sqlite/tag.go
@@ -770,6 +770,7 @@ var tagSortOptions = sortOptions{
 	"scene_markers_count",
 	"scenes_count",
 	"scenes_duration",
+	"scenes_size",
 	"updated_at",
 }
 
@@ -784,6 +785,17 @@ func (qb *TagStore) sortByScenesDuration(direction string) string {
 	) %s`, scenesTagsTable, sceneTable, sceneTable, scenesTagsTable, sceneIDColumn, scenesFilesTable, scenesFilesTable, sceneIDColumn, sceneTable, scenesFilesTable, scenesTagsTable, tagIDColumn, tagTable, getSortDirection(direction))
 }
 
+func (qb *TagStore) sortByScenesSize(direction string) string {
+	return fmt.Sprintf(` ORDER BY (
+		SELECT COALESCE(SUM(%s.size), 0)
+		FROM %s
+		LEFT JOIN %s ON %s.id = %s.%s
+		LEFT JOIN %s ON %s.%s = %s.id
+		LEFT JOIN %s ON %s.id = %s.file_id
+		WHERE %s.%s = %s.id
+	) %s`, fileTable, scenesTagsTable, sceneTable, sceneTable, scenesTagsTable, sceneIDColumn, scenesFilesTable, scenesFilesTable, sceneIDColumn, sceneTable, fileTable, fileTable, scenesFilesTable, scenesTagsTable, tagIDColumn, tagTable, getSortDirection(direction))
+}
+
 func (qb *TagStore) getDefaultTagSort() string {
 	return getSort("name", "ASC", "tags")
 }
@@ -812,6 +824,8 @@ func (qb *TagStore) getTagSort(query *queryBuilder, findFilter *models.FindFilte
 		sortQuery += getCountSort(tagTable, scenesTagsTable, tagIDColumn, direction)
 	case "scenes_duration":
 		sortQuery += qb.sortByScenesDuration(direction)
+	case "scenes_size":
+		sortQuery += qb.sortByScenesSize(direction)
 	case "scene_markers_count":
 		sortQuery += fmt.Sprintf(" ORDER BY (SELECT COUNT(*) FROM scene_markers_tags WHERE tags.id = scene_markers_tags.tag_id)+(SELECT COUNT(*) FROM scene_markers WHERE tags.id = scene_markers.primary_tag_id) %s", getSortDirection(direction))
 	case "images_count":
diff --git a/ui/v2.5/src/locales/en-GB.json b/ui/v2.5/src/locales/en-GB.json
index 1fd650453..b52697fc3 100644
--- a/ui/v2.5/src/locales/en-GB.json
+++ b/ui/v2.5/src/locales/en-GB.json
@@ -1400,6 +1400,7 @@
   "scene_code": "Studio Code",
   "scene_count": "Scene Count",
   "scenes_duration": "Scene Duration",
+  "scenes_size": "Scene Size",
   "scene_created_at": "Scene Created At",
   "scene_date": "Date of Scene",
   "scene_id": "Scene ID",
diff --git a/ui/v2.5/src/models/list-filter/performers.ts b/ui/v2.5/src/models/list-filter/performers.ts
index b491b7fdc..8e2a1eaa0 100644
--- a/ui/v2.5/src/models/list-filter/performers.ts
+++ b/ui/v2.5/src/models/list-filter/performers.ts
@@ -37,6 +37,7 @@ const sortByOptions = [
   "weight",
   "measurements",
   "scenes_duration",
+  "scenes_size",
 ]
   .map(ListFilterOptions.createSortBy)
   .concat([
diff --git a/ui/v2.5/src/models/list-filter/studios.ts b/ui/v2.5/src/models/list-filter/studios.ts
index e62d41c7a..f5500b10c 100644
--- a/ui/v2.5/src/models/list-filter/studios.ts
+++ b/ui/v2.5/src/models/list-filter/studios.ts
@@ -22,6 +22,7 @@ const sortByOptions = [
   "random",
   "rating",
   "scenes_duration",
+  "scenes_size",
   "latest_scene",
 ]
   .map(ListFilterOptions.createSortBy)
diff --git a/ui/v2.5/src/models/list-filter/tags.ts b/ui/v2.5/src/models/list-filter/tags.ts
index 4c8bed69f..074a0a48c 100644
--- a/ui/v2.5/src/models/list-filter/tags.ts
+++ b/ui/v2.5/src/models/list-filter/tags.ts
@@ -18,7 +18,7 @@ import { StashIDCriterionOption } from "./criteria/stash-ids";
 import { CustomFieldsCriterionOption } from "./criteria/custom-fields";
 
 const defaultSortBy = "name";
-const sortByOptions = ["name", "random", "scenes_duration"]
+const sortByOptions = ["name", "random", "scenes_duration", "scenes_size"]
   .map(ListFilterOptions.createSortBy)
   .concat([
     {

From de6c0bace575c1651397af5482e4a54610e79ba9 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Wed, 18 Mar 2026 13:01:22 +1100
Subject: [PATCH 358/405] Don't read stashignore files in zip files (#6693)

---
 internal/manager/scan_stashignore_test.go | 12 ++++++------
 internal/manager/task_clean.go            |  4 ++--
 internal/manager/task_scan.go             | 11 ++++++++---
 pkg/file/clean.go                         | 16 ++++++++++++++--
 pkg/file/folder_rename_detect.go          |  7 ++++++-
 pkg/file/handler.go                       |  2 +-
 pkg/file/scan.go                          | 14 +++++++++-----
 pkg/file/stashignore.go                   |  9 ++++++++-
 pkg/file/stashignore_test.go              |  2 +-
 ui/v2.5/src/docs/en/Manual/Tasks.md       |  2 ++
 10 files changed, 57 insertions(+), 22 deletions(-)

diff --git a/internal/manager/scan_stashignore_test.go b/internal/manager/scan_stashignore_test.go
index fafd246e8..2745ff970 100644
--- a/internal/manager/scan_stashignore_test.go
+++ b/internal/manager/scan_stashignore_test.go
@@ -23,8 +23,8 @@ type stashIgnorePathFilter struct {
 	libraryRoot string
 }
 
-func (f *stashIgnorePathFilter) Accept(ctx context.Context, path string, info fs.FileInfo) bool {
-	return f.filter.Accept(ctx, path, info, f.libraryRoot)
+func (f *stashIgnorePathFilter) Accept(ctx context.Context, path string, info fs.FileInfo, zipFilePath string) bool {
+	return f.filter.Accept(ctx, path, info, f.libraryRoot, zipFilePath)
 }
 
 // createTestFileOnDisk creates a file with some content.
@@ -105,7 +105,7 @@ temp/
 		if err != nil {
 			t.Fatalf("failed to stat file %s: %v", scenario.path, err)
 		}
-		accepted := scanner.AcceptEntry(ctx, scenario.path, info)
+		accepted := scanner.AcceptEntry(ctx, scenario.path, info, "")
 
 		if accepted != scenario.accepted {
 			t.Errorf("unexpected accept result for %s: expected %v, got %v",
@@ -160,7 +160,7 @@ func TestScannerWithNestedStashIgnore(t *testing.T) {
 		if err != nil {
 			t.Fatalf("failed to stat file %s: %v", scenario.path, err)
 		}
-		accepted := scanner.AcceptEntry(ctx, scenario.path, info)
+		accepted := scanner.AcceptEntry(ctx, scenario.path, info, "")
 
 		if accepted != scenario.accepted {
 			t.Errorf("unexpected accept result for %s: expected %v, got %v",
@@ -205,7 +205,7 @@ func TestScannerWithoutStashIgnore(t *testing.T) {
 		if err != nil {
 			t.Fatalf("failed to stat file %s: %v", scenario.path, err)
 		}
-		accepted := scanner.AcceptEntry(ctx, scenario.path, info)
+		accepted := scanner.AcceptEntry(ctx, scenario.path, info, "")
 
 		if accepted != scenario.accepted {
 			t.Errorf("unexpected accept result for %s: expected %v, got %v",
@@ -258,7 +258,7 @@ func TestScannerWithNegationPattern(t *testing.T) {
 		if err != nil {
 			t.Fatalf("failed to stat file %s: %v", scenario.path, err)
 		}
-		accepted := scanner.AcceptEntry(ctx, scenario.path, info)
+		accepted := scanner.AcceptEntry(ctx, scenario.path, info, "")
 
 		if accepted != scenario.accepted {
 			t.Errorf("unexpected accept result for %s: expected %v, got %v",
diff --git a/internal/manager/task_clean.go b/internal/manager/task_clean.go
index 9a20b3990..6221d7d5f 100644
--- a/internal/manager/task_clean.go
+++ b/internal/manager/task_clean.go
@@ -159,7 +159,7 @@ func newCleanFilter(c *config.Config) *cleanFilter {
 	}
 }
 
-func (f *cleanFilter) Accept(ctx context.Context, path string, info fs.FileInfo) bool {
+func (f *cleanFilter) Accept(ctx context.Context, path string, info fs.FileInfo, zipFilePath string) bool {
 	//  #1102 - clean anything in generated path
 	generatedPath := f.generatedPath
 
@@ -184,7 +184,7 @@ func (f *cleanFilter) Accept(ctx context.Context, path string, info fs.FileInfo)
 	}
 
 	// Check .stashignore files, bounded to the library root.
-	if !f.stashIgnoreFilter.Accept(ctx, path, info, stash.Path) {
+	if !f.stashIgnoreFilter.Accept(ctx, path, info, stash.Path, zipFilePath) {
 		logger.Infof("%s is excluded due to .stashignore. Marking to clean: %q", fileOrFolder, path)
 		return false
 	}
diff --git a/internal/manager/task_scan.go b/internal/manager/task_scan.go
index a006abbf8..53e6944b5 100644
--- a/internal/manager/task_scan.go
+++ b/internal/manager/task_scan.go
@@ -171,7 +171,12 @@ func (j *ScanJob) queueFileFunc(ctx context.Context, f models.FS, zipFile *file.
 			return nil
 		}
 
-		if !j.scanner.AcceptEntry(ctx, path, info) {
+		zipFilePath := ""
+		if zipFile != nil {
+			zipFilePath = zipFile.Path
+		}
+
+		if !j.scanner.AcceptEntry(ctx, path, info, zipFilePath) {
 			if info.IsDir() {
 				logger.Debugf("Skipping directory %s", path)
 				return fs.SkipDir
@@ -565,7 +570,7 @@ func newScanFilter(c *config.Config, repo models.Repository, minModTime time.Tim
 	}
 }
 
-func (f *scanFilter) Accept(ctx context.Context, path string, info fs.FileInfo) bool {
+func (f *scanFilter) Accept(ctx context.Context, path string, info fs.FileInfo, zipFilePath string) bool {
 	if fsutil.IsPathInDir(f.generatedPath, path) {
 		logger.Warnf("Skipping %q as it overlaps with the generated folder", path)
 		return false
@@ -583,7 +588,7 @@ func (f *scanFilter) Accept(ctx context.Context, path string, info fs.FileInfo)
 	}
 
 	// Check .stashignore files, bounded to the library root.
-	if !f.stashIgnoreFilter.Accept(ctx, path, info, s.Path) {
+	if !f.stashIgnoreFilter.Accept(ctx, path, info, s.Path, zipFilePath) {
 		logger.Debugf("Skipping %s due to .stashignore", path)
 		return false
 	}
diff --git a/pkg/file/clean.go b/pkg/file/clean.go
index 53b2e0612..111d5425c 100644
--- a/pkg/file/clean.go
+++ b/pkg/file/clean.go
@@ -348,8 +348,14 @@ func (j *cleanJob) shouldClean(ctx context.Context, f models.File) bool {
 	// run through path filter, if returns false then the file should be cleaned
 	filter := j.options.PathFilter
 
+	// need to get the zip file path if present
+	zipFilePath := ""
+	if f.Base().ZipFile != nil {
+		zipFilePath = f.Base().ZipFile.Base().Path
+	}
+
 	// don't log anything - assume filter will have logged the reason
-	return !filter.Accept(ctx, path, info)
+	return !filter.Accept(ctx, path, info, zipFilePath)
 }
 
 func (j *cleanJob) shouldCleanFolder(ctx context.Context, f *models.Folder) bool {
@@ -387,8 +393,14 @@ func (j *cleanJob) shouldCleanFolder(ctx context.Context, f *models.Folder) bool
 	// run through path filter, if returns false then the file should be cleaned
 	filter := j.options.PathFilter
 
+	// need to get the zip file path if present
+	zipFilePath := ""
+	if f.ZipFile != nil {
+		zipFilePath = f.ZipFile.Base().Path
+	}
+
 	// don't log anything - assume filter will have logged the reason
-	return !filter.Accept(ctx, path, info)
+	return !filter.Accept(ctx, path, info, zipFilePath)
 }
 
 func (j *cleanJob) deleteFile(ctx context.Context, fileID models.FileID, fn string) {
diff --git a/pkg/file/folder_rename_detect.go b/pkg/file/folder_rename_detect.go
index 73a12e3e4..d45593b28 100644
--- a/pkg/file/folder_rename_detect.go
+++ b/pkg/file/folder_rename_detect.go
@@ -87,6 +87,11 @@ func (s *Scanner) detectFolderMove(ctx context.Context, file ScannedFile) (*mode
 
 	r := s.Repository
 
+	zipFilePath := ""
+	if file.ZipFile != nil {
+		zipFilePath = file.ZipFile.Base().Path
+	}
+
 	if err := SymWalk(file.FS, file.Path, func(path string, d fs.DirEntry, err error) error {
 		if err != nil {
 			// don't let errors prevent scanning
@@ -110,7 +115,7 @@ func (s *Scanner) detectFolderMove(ctx context.Context, file ScannedFile) (*mode
 			return nil
 		}
 
-		if !s.AcceptEntry(ctx, path, info) {
+		if !s.AcceptEntry(ctx, path, info, zipFilePath) {
 			return nil
 		}
 
diff --git a/pkg/file/handler.go b/pkg/file/handler.go
index 10616eefa..b4056f195 100644
--- a/pkg/file/handler.go
+++ b/pkg/file/handler.go
@@ -9,7 +9,7 @@ import (
 
 // PathFilter provides a filter function for paths.
 type PathFilter interface {
-	Accept(ctx context.Context, path string, info fs.FileInfo) bool
+	Accept(ctx context.Context, path string, info fs.FileInfo, zipFilePath string) bool
 }
 
 type PathFilterFunc func(path string) bool
diff --git a/pkg/file/scan.go b/pkg/file/scan.go
index 8ff51b359..4cfcaf7ae 100644
--- a/pkg/file/scan.go
+++ b/pkg/file/scan.go
@@ -111,12 +111,12 @@ type ScannedFile struct {
 }
 
 // AcceptEntry determines if the file entry should be accepted for scanning
-func (s *Scanner) AcceptEntry(ctx context.Context, path string, info fs.FileInfo) bool {
+func (s *Scanner) AcceptEntry(ctx context.Context, path string, info fs.FileInfo, zipFilePath string) bool {
 	// always accept if there's no filters
 	accept := len(s.ScanFilters) == 0
 	for _, filter := range s.ScanFilters {
 		// accept if any filter accepts the file
-		if filter.Accept(ctx, path, info) {
+		if filter.Accept(ctx, path, info, zipFilePath) {
 			accept = true
 			break
 		}
@@ -462,7 +462,11 @@ func (s *Scanner) onNewFile(ctx context.Context, f ScannedFile) (*ScanFileResult
 
 	// determine if the file is renamed from an existing file in the store
 	// do this after decoration so that missing fields can be populated
-	renamed, err := s.handleRename(ctx, file, fp)
+	zipFilePath := ""
+	if f.ZipFile != nil {
+		zipFilePath = f.ZipFile.Base().Path
+	}
+	renamed, err := s.handleRename(ctx, file, fp, zipFilePath)
 	if err != nil {
 		return nil, err
 	}
@@ -572,7 +576,7 @@ func (s *Scanner) getFileFS(f *models.BaseFile) (models.FS, error) {
 	return fs.OpenZip(zipPath, zipSize)
 }
 
-func (s *Scanner) handleRename(ctx context.Context, f models.File, fp []models.Fingerprint) (models.File, error) {
+func (s *Scanner) handleRename(ctx context.Context, f models.File, fp []models.Fingerprint, zipFilePath string) (models.File, error) {
 	var others []models.File
 
 	for _, tfp := range fp {
@@ -614,7 +618,7 @@ func (s *Scanner) handleRename(ctx context.Context, f models.File, fp []models.F
 				// treat as a move
 				missing = append(missing, other)
 			}
-		case !s.AcceptEntry(ctx, other.Base().Path, info):
+		case !s.AcceptEntry(ctx, other.Base().Path, info, zipFilePath):
 			// #4393 - if the file is no longer in the configured library paths, treat it as a move
 			logger.Debugf("File %q no longer in library paths. Treating as a move.", other.Base().Path)
 			missing = append(missing, other)
diff --git a/pkg/file/stashignore.go b/pkg/file/stashignore.go
index 160b5c224..681ccf795 100644
--- a/pkg/file/stashignore.go
+++ b/pkg/file/stashignore.go
@@ -53,7 +53,9 @@ func NewStashIgnoreFilter() *StashIgnoreFilter {
 // applies gitignore-style pattern matching.
 // The libraryRoot parameter bounds the search for .stashignore files -
 // only directories within the library root are checked.
-func (f *StashIgnoreFilter) Accept(ctx context.Context, path string, info fs.FileInfo, libraryRoot string) bool {
+// zipFilepath is the path of the zip file if the file is inside a zip.
+// .stashignore files will not be read within zip files.
+func (f *StashIgnoreFilter) Accept(ctx context.Context, path string, info fs.FileInfo, libraryRoot string, zipFilePath string) bool {
 	// If no library root provided, accept the file (safety fallback).
 	if libraryRoot == "" {
 		return true
@@ -62,6 +64,11 @@ func (f *StashIgnoreFilter) Accept(ctx context.Context, path string, info fs.Fil
 	// Get the directory containing this path.
 	dir := filepath.Dir(path)
 
+	// If the file is inside a zip, use the zip file's directory as the base for .stashignore lookup.
+	if zipFilePath != "" {
+		dir = filepath.Dir(zipFilePath)
+	}
+
 	// Collect all applicable ignore entries from library root to this directory.
 	entries := f.collectIgnoreEntries(dir, libraryRoot)
 
diff --git a/pkg/file/stashignore_test.go b/pkg/file/stashignore_test.go
index 5297f544b..41668b51b 100644
--- a/pkg/file/stashignore_test.go
+++ b/pkg/file/stashignore_test.go
@@ -64,7 +64,7 @@ func walkAndFilter(t *testing.T, root string, filter *StashIgnoreFilter) []strin
 			return err
 		}
 
-		if filter.Accept(ctx, path, info, root) {
+		if filter.Accept(ctx, path, info, root, "") {
 			relPath, _ := filepath.Rel(root, path)
 			accepted = append(accepted, relPath)
 		} else if info.IsDir() {
diff --git a/ui/v2.5/src/docs/en/Manual/Tasks.md b/ui/v2.5/src/docs/en/Manual/Tasks.md
index 584759b09..22548cbbe 100644
--- a/ui/v2.5/src/docs/en/Manual/Tasks.md
+++ b/ui/v2.5/src/docs/en/Manual/Tasks.md
@@ -16,6 +16,8 @@ You can create `.stashignore` files to exclude specific files or directories fro
 
 Place a `.stashignore` file in any directory within your library. The patterns in that file will apply to all files and subdirectories within that directory. You can have multiple `.stashignore` files at different levels of your directory hierarchy - patterns from parent directories cascade down to child directories.
 
+`.stashignore` files are not read inside zip files.
+
 **Supported patterns:**
 
 | Pattern | Description |

From b4dd7e3f1529a074be62e20ee5ff00941fb8d354 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Wed, 18 Mar 2026 13:01:50 +1100
Subject: [PATCH 359/405] Changelog v0.31 (#6692)

* Modify styling to improve readability
---
 .../src/components/Changelog/Changelog.tsx    | 11 ++-
 ui/v2.5/src/components/Changelog/styles.scss  |  5 --
 ui/v2.5/src/docs/en/Changelog/v0310.md        | 79 +++++++++++++++++++
 3 files changed, 88 insertions(+), 7 deletions(-)
 create mode 100644 ui/v2.5/src/docs/en/Changelog/v0310.md

diff --git a/ui/v2.5/src/components/Changelog/Changelog.tsx b/ui/v2.5/src/components/Changelog/Changelog.tsx
index 7e4207dce..df7517f7d 100644
--- a/ui/v2.5/src/components/Changelog/Changelog.tsx
+++ b/ui/v2.5/src/components/Changelog/Changelog.tsx
@@ -35,6 +35,7 @@ import V0270 from "src/docs/en/Changelog/v0270.md";
 import V0280 from "src/docs/en/Changelog/v0280.md";
 import V0290 from "src/docs/en/Changelog/v0290.md";
 import V0300 from "src/docs/en/Changelog/v0300.md";
+import V0310 from "src/docs/en/Changelog/v0310.md";
 
 import V0290ReleaseNotes from "src/docs/en/ReleaseNotes/v0290.md";
 
@@ -75,9 +76,9 @@ const Changelog: React.FC = () => {
   // after new release:
   // add entry to releases, using the current* fields
   // then update the current fields.
-  const currentVersion = stashVersion || "v0.30.0";
+  const currentVersion = stashVersion || "v0.31.0";
   const currentDate = buildDate;
-  const currentPage = V0300;
+  const currentPage = V0310;
 
   const releases: IStashRelease[] = [
     {
@@ -86,6 +87,12 @@ const Changelog: React.FC = () => {
       page: currentPage,
       defaultOpen: true,
     },
+    {
+      version: "v0.30.1",
+      date: "2025-12-18",
+      page: V0300,
+      releaseNotes: V0290ReleaseNotes,
+    },
     {
       version: "v0.29.3",
       date: "2025-11-06",
diff --git a/ui/v2.5/src/components/Changelog/styles.scss b/ui/v2.5/src/components/Changelog/styles.scss
index 07c88f698..9d79e7d3b 100644
--- a/ui/v2.5/src/components/Changelog/styles.scss
+++ b/ui/v2.5/src/components/Changelog/styles.scss
@@ -20,11 +20,6 @@
     padding: 0;
   }
 
-  ul {
-    list-style-type: none;
-    padding-left: 0.5rem;
-  }
-
   &-version {
     &-body {
       padding: 1rem 2rem;
diff --git a/ui/v2.5/src/docs/en/Changelog/v0310.md b/ui/v2.5/src/docs/en/Changelog/v0310.md
new file mode 100644
index 000000000..c3fd89a40
--- /dev/null
+++ b/ui/v2.5/src/docs/en/Changelog/v0310.md
@@ -0,0 +1,79 @@
+### ✨ New Features
+
+* Added support for image phash generation and filtering. ([#6497](https://github.com/stashapp/stash/pull/6497))
+* Added minimum/maximum number of sprites and sprite size options to support customised scene sprite generation. ([#6588](https://github.com/stashapp/stash/pull/6588))
+* Added support for merging performers. ([#5910](https://github.com/stashapp/stash/pull/5910))
+* Added `Reveal in file manager` button to file info panel when running locally. ([#6587](https://github.com/stashapp/stash/pull/6587))
+* Added `.stashignore` support for gitignore-style scan exclusions. ([#6485](https://github.com/stashapp/stash/pull/6485))
+* Added Selective generate option. ([#6621](https://github.com/stashapp/stash/pull/6621))
+* Added `From Clipboard` option to Set Image dropdown button (on secure connections). ([#6637](https://github.com/stashapp/stash/pull/6637))
+* Added Tags tagger view. ([#6559](https://github.com/stashapp/stash/pull/6559), [#6620](https://github.com/stashapp/stash/pull/6620))
+* Added loop option for markers. ([#6510](https://github.com/stashapp/stash/pull/6510))
+* Added support for custom favicon and title. ([#6366](https://github.com/stashapp/stash/pull/6366))
+* Added Troubleshooting Mode to help identify and resolve common issues. ([#6343](https://github.com/stashapp/stash/pull/6343))
+
+### 🎨 Improvements
+
+* Sidebars are now used for lists of galleries ([#6157](https://github.com/stashapp/stash/pull/6157)), images ([#6607](https://github.com/stashapp/stash/pull/6607)), groups ([#6573](https://github.com/stashapp/stash/pull/6573)), performers ([#6547](https://github.com/stashapp/stash/pull/6547)), studios ([#6549](https://github.com/stashapp/stash/pull/6549)), tags ([#6610](https://github.com/stashapp/stash/pull/6610)), and scene markers ([#6603](https://github.com/stashapp/stash/pull/6603)).
+* Added folder sidebar criterion option for scenes, images and galleries. ([#6636](https://github.com/stashapp/stash/pull/6636))
+* Custom field support has been added to scenes ([#6584](https://github.com/stashapp/stash/pull/6584)), galleries ([#6592](https://github.com/stashapp/stash/pull/6592)), images ([#6598](https://github.com/stashapp/stash/pull/6598)), groups ([#6596](https://github.com/stashapp/stash/pull/6596)) studios ([#6156](https://github.com/stashapp/stash/pull/6156)) and tags ([#6546](https://github.com/stashapp/stash/pull/6546)). 
+* Bulk edit dialogs have been refactored to include more fields. ([#6647](https://github.com/stashapp/stash/pull/6647))
+* Extended duplicate criterion to filter by duplicated titles and stash IDs. ([#6344](https://github.com/stashapp/stash/pull/6344))
+* Extended missing criterion to add full coverage of fields. ([#6565](https://github.com/stashapp/stash/pull/6565))
+* Identify settings now allows for selecting included genders. ([#6557](https://github.com/stashapp/stash/pull/6557))
+* Backup now provides an option to include blobs in a backup zip. ([#6586](https://github.com/stashapp/stash/pull/6586))
+* Added checkbox selection on wall and tagger views. ([#6476](https://github.com/stashapp/stash/pull/6476))
+* Performer career length field has been replaced with career start and end fields. ([#6449](https://github.com/stashapp/stash/pull/6449))
+* Added organised flag to studios. ([#6303](https://github.com/stashapp/stash/pull/6303))
+* Merging tags now shows a dialog to edit the merged tag's details. ([#6552](https://github.com/stashapp/stash/pull/6552))
+* New object pages now support for saving and creating another object. ([#6438](https://github.com/stashapp/stash/pull/6438))
+* Default performer images have been updated to be consistent with other card images. ([#6566](https://github.com/stashapp/stash/pull/6566))
+* Unsupported filter criteria are now indicated in the UI. ([#6604](https://github.com/stashapp/stash/pull/6604))
+* Marker screenshots can now be generated independently of marker previews. ([#6433](https://github.com/stashapp/stash/pull/6433))
+* Added invert selection option to list menus. ([#6491](https://github.com/stashapp/stash/pull/6491))
+* Added Generate task option for galleries. ([#6442](https://github.com/stashapp/stash/pull/6442))
+* Scene resolution and duration is now shown in the tagger view. ([#6663](https://github.com/stashapp/stash/pull/6663))
+* Added button to delete scene cover. ([#6444](https://github.com/stashapp/stash/pull/6444))
+* Duplicate aliases are now silently removed. ([#6514](https://github.com/stashapp/stash/pull/6514))
+* Image query now includes image details field. ([#6673](https://github.com/stashapp/stash/pull/6673))
+* Added non-binary gender icon. ([#6489](https://github.com/stashapp/stash/pull/6489))
+* Transgender icons are now coloured by their presented gender. ([#6489](https://github.com/stashapp/stash/pull/6489))
+* It is now possible to add a library path to a non-existing directory (useful for disconnected network paths). ([#6644](https://github.com/stashapp/stash/pull/6644))
+* Added activity tracking for DLNA resume/view counts. ([#6407](https://github.com/stashapp/stash/pull/6407), [#6483](https://github.com/stashapp/stash/pull/6483))
+* SFW Mode now shows performer ages. ([#6450](https://github.com/stashapp/stash/pull/6450))
+* Added support for sorting scenes and images by resolution. ([#6441](https://github.com/stashapp/stash/pull/6441))
+* Added support for sorting performers and studios by latest scene. ([#6501](https://github.com/stashapp/stash/pull/6501))
+* Added support for sorting performers, studios and tags by total scene file size. ([#6642](https://github.com/stashapp/stash/pull/6642))
+* Added support for filtering by stash ID count. ([#6437](https://github.com/stashapp/stash/pull/6437))
+* Added support for filtering group by scene count. ([#6593](https://github.com/stashapp/stash/pull/6593))
+* Installed plugins/scrapers no longer show in the available list. ([#6443](https://github.com/stashapp/stash/pull/6443))
+* Name is now populated when searching by stash-box. ([#6447](https://github.com/stashapp/stash/pull/6447))
+* Improved performance of group queries on large systems. ([#6478](https://github.com/stashapp/stash/pull/6478))
+* Systray notification now shows the port stash is running on. ([#6448](https://github.com/stashapp/stash/pull/6448))
+
+### 🐛 Bug fixes
+
+* Fixed certain unicode characters in library path causing panic in scan task. ([#6431](https://github.com/stashapp/stash/pull/6431), [#6589](https://github.com/stashapp/stash/pull/6589), [#6635](https://github.com/stashapp/stash/pull/6635))
+* Fixed bad network path error preventing rename detection during scanning. ([#6680](https://github.com/stashapp/stash/pull/6680))
+* Fixed duplicate files in zips being incorrectly reported as renames. ([#6493](https://github.com/stashapp/stash/pull/6493))
+* Fixed merging scene causing cover to be lost. ([#6542](https://github.com/stashapp/stash/pull/6542))
+* Improved scanning algorithm to prevent creation of orphaned folders and handle missing parent folders. ([#6608](https://github.com/stashapp/stash/pull/6608))
+* Scanning no longer scans zip contents when the zip file is unchanged. ([#6633](https://github.com/stashapp/stash/pull/6633))
+* Captions are now correctly detected in a single scan. ([#6634](https://github.com/stashapp/stash/pull/6634))
+* Fixed mis-clicks on cards navigating to new page when selecting items. ([#6599](https://github.com/stashapp/stash/pull/6599), [#6649](https://github.com/stashapp/stash/pull/6649))
+* Fixed custom field filtering not working correctly when query value was provided. ([#6614](https://github.com/stashapp/stash/pull/6614))
+* Fixed stale thumbnails after file content is changed. ([#6622](https://github.com/stashapp/stash/pull/6622))
+* Clicking on the scrubber in the scene player no longer pauses the video. ([#6336](https://github.com/stashapp/stash/pull/6336))
+* Fixed string-based hash filtering not functioning correctly. ([#6654](https://github.com/stashapp/stash/pull/6654))
+* Fixed hardware decoding detection for 10-bit videos on rkmpp. ([#6420](https://github.com/stashapp/stash/pull/6420))
+
+### Api Changes
+
+* Many new components are now patchable. ([#6468](https://github.com/stashapp/stash/pull/6468), [#6463](https://github.com/stashapp/stash/pull/6463), [#6482](https://github.com/stashapp/stash/pull/6482), [#6492](https://github.com/stashapp/stash/pull/6492), [#6470](https://github.com/stashapp/stash/pull/6470))
+* Added access to `ReactFontAwesome` in the plugin API. ([#6487](https://github.com/stashapp/stash/pull/6487))
+* Added `destroyFiles` mutation to delete file entries from the database. ([#6437](https://github.com/stashapp/stash/pull/6437))
+* Added `destroy_file_entry` flag to destroy inputs to destroy file entries when destroying scenes, images, and galleries. ([#6437](https://github.com/stashapp/stash/pull/6437))
+* Added `basename` and `parent_folders` fields to the `folder` type. ([#6494](https://github.com/stashapp/stash/pull/6494))
+* Added `basename` filter field to `FolderFilterType`. ([#6494](https://github.com/stashapp/stash/pull/6494))
+* Added `parent_folder` filter field to `GalleryFilterType`. ([#6636](https://github.com/stashapp/stash/pull/6636))
+* Performer `career_length` field is deprecated in favour of `career_start` and `career_end`.

From 63b1132897b871261d2c9176ca29b41b1cb14cfd Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Wed, 18 Mar 2026 14:04:14 +1100
Subject: [PATCH 360/405] Update weblate translations (#6698)

* Translated using Weblate (German)

Currently translated at 100.0% (1251 of 1251 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/de/

* Translated using Weblate (Spanish)

Currently translated at 100.0% (1251 of 1251 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/es/

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (1251 of 1251 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/zh_Hans/

* Translated using Weblate (Swedish)

Currently translated at 100.0% (1251 of 1251 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/sv/

* Translated using Weblate (Japanese)

Currently translated at 82.2% (1029 of 1251 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/ja/

* Translated using Weblate (Finnish)

Currently translated at 79.3% (993 of 1251 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/fi/

* Translated using Weblate (Japanese)

Currently translated at 83.2% (1042 of 1251 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/ja/

* Translated using Weblate (Polish)

Currently translated at 95.2% (1192 of 1251 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/pl/

* Translated using Weblate (Danish)

Currently translated at 86.1% (1078 of 1251 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/da/

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 69.6% (871 of 1251 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/pt_BR/

* Translated using Weblate (Danish)

Currently translated at 86.2% (1079 of 1251 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/da/

* Translated using Weblate (Danish)

Currently translated at 86.1% (1080 of 1253 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/da/

* Translated using Weblate (Korean)

Currently translated at 100.0% (1253 of 1253 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/ko/

* Update translation files

Updated by "Cleanup translation files" add-on in Weblate.

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/

* Translated using Weblate (French)

Currently translated at 100.0% (1250 of 1250 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/fr/

* Translated using Weblate (French)

Currently translated at 100.0% (1250 of 1250 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/fr/

* Translated using Weblate (Swedish)

Currently translated at 100.0% (1250 of 1250 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/sv/

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (1250 of 1250 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/zh_Hans/

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 69.9% (874 of 1250 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/pt_BR/

* Translated using Weblate (Spanish)

Currently translated at 100.0% (1251 of 1251 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/es/

* Translated using Weblate (French)

Currently translated at 100.0% (1251 of 1251 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/fr/

* Translated using Weblate (Swedish)

Currently translated at 100.0% (1251 of 1251 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/sv/

* Translated using Weblate (German)

Currently translated at 100.0% (1251 of 1251 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/de/

* Translated using Weblate (French)

Currently translated at 100.0% (1253 of 1253 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/fr/

* Translated using Weblate (Swedish)

Currently translated at 100.0% (1253 of 1253 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/sv/

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (1253 of 1253 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/zh_Hans/

* Translated using Weblate (German)

Currently translated at 100.0% (1253 of 1253 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/de/

* Translated using Weblate (Estonian)

Currently translated at 100.0% (1253 of 1253 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/et/

* Translated using Weblate (Korean)

Currently translated at 100.0% (1253 of 1253 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/ko/

* Translated using Weblate (Spanish)

Currently translated at 100.0% (1253 of 1253 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/es/

* Translated using Weblate (Ukrainian)

Currently translated at 100.0% (1253 of 1253 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/uk/

* Translated using Weblate (Ukrainian)

Currently translated at 100.0% (1253 of 1253 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/uk/

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 70.0% (878 of 1253 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/pt_BR/

* Translated using Weblate (French)

Currently translated at 100.0% (1271 of 1271 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/fr/

* Translated using Weblate (French)

Currently translated at 100.0% (1271 of 1271 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/fr/

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (1271 of 1271 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/zh_Hans/

* Translated using Weblate (Spanish)

Currently translated at 100.0% (1271 of 1271 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/es/

* Translated using Weblate (Korean)

Currently translated at 100.0% (1271 of 1271 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/ko/

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 69.0% (877 of 1271 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/pt_BR/

* Translated using Weblate (Ukrainian)

Currently translated at 100.0% (1271 of 1271 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/uk/

* Translated using Weblate (Swedish)

Currently translated at 100.0% (1271 of 1271 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/sv/

* Translated using Weblate (Dutch)

Currently translated at 76.7% (975 of 1271 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/nl/

* Translated using Weblate (Czech)

Currently translated at 100.0% (1271 of 1271 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/cs/

* Translated using Weblate (Japanese)

Currently translated at 86.7% (1102 of 1271 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/ja/

* Translated using Weblate (French)

Currently translated at 100.0% (1273 of 1273 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/fr/

* Translated using Weblate (Korean)

Currently translated at 100.0% (1273 of 1273 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/ko/

* Translated using Weblate (French)

Currently translated at 100.0% (1273 of 1273 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/fr/

* Translated using Weblate (French)

Currently translated at 100.0% (1273 of 1273 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/fr/

* Translated using Weblate (Korean)

Currently translated at 100.0% (1273 of 1273 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/ko/

* Translated using Weblate (Korean)

Currently translated at 100.0% (1273 of 1273 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/ko/

* Translated using Weblate (Korean)

Currently translated at 100.0% (1273 of 1273 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/ko/

* Translated using Weblate (Ukrainian)

Currently translated at 91.0% (1159 of 1273 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/uk/

* Translated using Weblate (Ukrainian)

Currently translated at 100.0% (1273 of 1273 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/uk/

* Translated using Weblate (French)

Currently translated at 100.0% (1278 of 1278 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/fr/

* Translated using Weblate (Ukrainian)

Currently translated at 100.0% (1278 of 1278 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/uk/

* Translated using Weblate (German)

Currently translated at 86.5% (1106 of 1278 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/de/

* Translated using Weblate (Spanish)

Currently translated at 88.1% (1127 of 1278 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/es/

* Translated using Weblate (Italian)

Currently translated at 65.9% (843 of 1278 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/it/

* Translated using Weblate (Russian)

Currently translated at 82.7% (1057 of 1278 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/ru/

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (1278 of 1278 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/zh_Hans/

* Translated using Weblate (French)

Currently translated at 100.0% (1280 of 1280 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/fr/

* Translated using Weblate (Ukrainian)

Currently translated at 100.0% (1280 of 1280 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/uk/

* Update translation files

Updated by "Cleanup translation files" add-on in Weblate.

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/

* Translated using Weblate (French)

Currently translated at 100.0% (1299 of 1299 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/fr/

* Translated using Weblate (Ukrainian)

Currently translated at 100.0% (1299 of 1299 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/uk/

* Translated using Weblate (Korean)

Currently translated at 100.0% (1300 of 1300 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/ko/

* Translated using Weblate (Spanish)

Currently translated at 100.0% (1300 of 1300 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/es/

* Translated using Weblate (Ukrainian)

Currently translated at 100.0% (1300 of 1300 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/uk/

* Translated using Weblate (French)

Currently translated at 100.0% (1300 of 1300 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/fr/

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (1300 of 1300 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/zh_Hans/

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (1300 of 1300 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/zh_Hans/

* Update translation files

Updated by "Cleanup translation files" add-on in Weblate.

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/

* Update translation files

Updated by "Cleanup translation files" add-on in Weblate.

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/

* Translated using Weblate (Estonian)

Currently translated at 85.0% (1122 of 1320 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/et/

* Translated using Weblate (Estonian)

Currently translated at 100.0% (1320 of 1320 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/et/

* Translated using Weblate (French)

Currently translated at 100.0% (1320 of 1320 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/fr/

* Translated using Weblate (Ukrainian)

Currently translated at 98.0% (1294 of 1320 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/uk/

* Translated using Weblate (French)

Currently translated at 100.0% (1322 of 1322 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/fr/

* Translated using Weblate (Korean)

Currently translated at 100.0% (1322 of 1322 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/ko/

* Translated using Weblate (Korean)

Currently translated at 100.0% (1322 of 1322 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/ko/

* Translated using Weblate (Korean)

Currently translated at 100.0% (1322 of 1322 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/ko/

* Translated using Weblate (Ukrainian)

Currently translated at 100.0% (1322 of 1322 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/uk/

* Translated using Weblate (Spanish)

Currently translated at 97.4% (1288 of 1322 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/es/

* Translated using Weblate (Swedish)

Currently translated at 100.0% (1322 of 1322 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/sv/

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (1322 of 1322 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/zh_Hans/

* Translated using Weblate (Spanish)

Currently translated at 100.0% (1322 of 1322 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/es/

* Translated using Weblate (Ukrainian)

Currently translated at 100.0% (1323 of 1323 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/uk/

* Translated using Weblate (German)

Currently translated at 85.1% (1130 of 1327 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/de/

* Translated using Weblate (French)

Currently translated at 100.0% (1327 of 1327 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/fr/

* Translated using Weblate (Ukrainian)

Currently translated at 100.0% (1327 of 1327 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/uk/

* Translated using Weblate (Estonian)

Currently translated at 100.0% (1332 of 1332 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/et/

* Translated using Weblate (Ukrainian)

Currently translated at 100.0% (1332 of 1332 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/uk/

* Translated using Weblate (French)

Currently translated at 100.0% (1332 of 1332 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/fr/

* Translated using Weblate (Korean)

Currently translated at 100.0% (1332 of 1332 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/ko/

* Translated using Weblate (Spanish)

Currently translated at 100.0% (1332 of 1332 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/es/

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (1332 of 1332 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/zh_Hans/

* Added translation using Weblate (Arabic)

* Translated using Weblate (Arabic)

Currently translated at 29.8% (397 of 1332 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/ar/

* Translated using Weblate (French)

Currently translated at 100.0% (1334 of 1334 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/fr/

* Translated using Weblate (Ukrainian)

Currently translated at 100.0% (1334 of 1334 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/uk/

* Translated using Weblate (French)

Currently translated at 100.0% (1338 of 1338 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/fr/

* Translated using Weblate (Spanish)

Currently translated at 100.0% (1338 of 1338 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/es/

* Translated using Weblate (Estonian)

Currently translated at 99.7% (1335 of 1338 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/et/

* Translated using Weblate (Korean)

Currently translated at 100.0% (1338 of 1338 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/ko/

* Translated using Weblate (Ukrainian)

Currently translated at 100.0% (1338 of 1338 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/uk/

* Translated using Weblate (Arabic)

Currently translated at 40.1% (537 of 1338 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/ar/

* Add arabic language option

---------

Co-authored-by: Alex-NBY <alex-nby@noreply.codeberg.org>
Co-authored-by: donlothario <donlothario@noreply.codeberg.org>
Co-authored-by: wql219 <wql219@noreply.codeberg.org>
Co-authored-by: AlpacaSerious <alpacaserious@noreply.codeberg.org>
Co-authored-by: Anpontant <anpontant@noreply.codeberg.org>
Co-authored-by: gimmeliina <gimmeliina@noreply.codeberg.org>
Co-authored-by: minerh <minerh@noreply.codeberg.org>
Co-authored-by: warchlak <warchlak@noreply.codeberg.org>
Co-authored-by: powdom <powdom@noreply.codeberg.org>
Co-authored-by: qeepoo <qeepoo@noreply.codeberg.org>
Co-authored-by: lugged9922 <lugged9922@noreply.codeberg.org>
Co-authored-by: Codeberg Translate <translate@codeberg.org>
Co-authored-by: doodoo <doodoo@noreply.codeberg.org>
Co-authored-by: bittin <bittin@noreply.codeberg.org>
Co-authored-by: diegoml <diegoml@noreply.codeberg.org>
Co-authored-by: BSSPM <bsspm@noreply.codeberg.org>
Co-authored-by: Zesty6249 <zesty6249@noreply.codeberg.org>
Co-authored-by: Saenko <saenko@noreply.codeberg.org>
Co-authored-by: arkvenom <arkvenom@noreply.codeberg.org>
Co-authored-by: andersondn <andersondn@noreply.codeberg.org>
Co-authored-by: xantror <xantror@noreply.codeberg.org>
Co-authored-by: NymeriaCZ <nymeriacz@noreply.codeberg.org>
Co-authored-by: shimanchu <shimanchu@noreply.codeberg.org>
Co-authored-by: Anonymous <anonymous@noreply.codeberg.org>
Co-authored-by: yec <yec@noreply.codeberg.org>
Co-authored-by: LostUser <lostuser@noreply.codeberg.org>
Co-authored-by: gallegonovato <gallegonovato@noreply.codeberg.org>
Co-authored-by: Strambino <strambino@noreply.codeberg.org>
Co-authored-by: PiskaBoomGonit <piskaboomgonit@noreply.codeberg.org>
Co-authored-by: Super_L <super_l@noreply.codeberg.org>
Co-authored-by: Lauri Lepik <laurilepik@noreply.codeberg.org>
Co-authored-by: interj4 <interj4@noreply.codeberg.org>
---
 .../SettingsInterfacePanel.tsx                |    1 +
 ui/v2.5/src/locales/ar.json                   |  660 ++++++++
 ui/v2.5/src/locales/bg-BG.json                |    2 -
 ui/v2.5/src/locales/bn-BD.json                |    2 -
 ui/v2.5/src/locales/ca-ES.json                |    3 -
 ui/v2.5/src/locales/cs-CZ.json                |   74 +-
 ui/v2.5/src/locales/da-DK.json                |  114 +-
 ui/v2.5/src/locales/de-DE.json                |  144 +-
 ui/v2.5/src/locales/es-ES.json                |  307 ++--
 ui/v2.5/src/locales/et-EE.json                |  454 +++---
 ui/v2.5/src/locales/fi-FI.json                |   64 +-
 ui/v2.5/src/locales/fr-FR.json                |  263 +++-
 ui/v2.5/src/locales/hi-IN.json                |    2 -
 ui/v2.5/src/locales/hr-HR.json                |    2 -
 ui/v2.5/src/locales/hu-HU.json                |    9 -
 ui/v2.5/src/locales/id-ID.json                |    6 -
 ui/v2.5/src/locales/index.ts                  |    2 +
 ui/v2.5/src/locales/it-IT.json                |  118 +-
 ui/v2.5/src/locales/ja-JP.json                |  148 +-
 ui/v2.5/src/locales/ko-KR.json                |  289 ++--
 ui/v2.5/src/locales/lt-LT.json                |    2 -
 ui/v2.5/src/locales/lv-LV.json                |    2 -
 ui/v2.5/src/locales/nb-NO.json                |   23 -
 ui/v2.5/src/locales/nl-NL.json                |   26 +-
 ui/v2.5/src/locales/nn-NO.json                |    4 +-
 ui/v2.5/src/locales/pl-PL.json                |  370 ++++-
 ui/v2.5/src/locales/pt-BR.json                |   58 +-
 ui/v2.5/src/locales/ro-RO.json                |   11 -
 ui/v2.5/src/locales/ru-RU.json                |   27 +-
 ui/v2.5/src/locales/sv-SE.json                |  353 +++--
 ui/v2.5/src/locales/th-TH.json                |   25 +-
 ui/v2.5/src/locales/tr-TR.json                |   25 +-
 ui/v2.5/src/locales/uk-UA.json                | 1361 ++++++++++-------
 ui/v2.5/src/locales/vi-VN.json                |    7 -
 ui/v2.5/src/locales/zh-CN.json                |  262 +++-
 ui/v2.5/src/locales/zh-TW.json                |   25 +-
 36 files changed, 3528 insertions(+), 1717 deletions(-)
 create mode 100644 ui/v2.5/src/locales/ar.json

diff --git a/ui/v2.5/src/components/Settings/SettingsInterfacePanel/SettingsInterfacePanel.tsx b/ui/v2.5/src/components/Settings/SettingsInterfacePanel/SettingsInterfacePanel.tsx
index 0ebe3f736..85af31a4a 100644
--- a/ui/v2.5/src/components/Settings/SettingsInterfacePanel/SettingsInterfacePanel.tsx
+++ b/ui/v2.5/src/components/Settings/SettingsInterfacePanel/SettingsInterfacePanel.tsx
@@ -200,6 +200,7 @@ export const SettingsInterfacePanel: React.FC = PatchComponent(
             onChange={(v) => saveInterface({ language: v })}
           >
             <option value="af-ZA">Afrikaans (Preview)</option>
+            <option value="ar">Arabic (Preview)</option>
             <option value="bg-BG">Bulgarian (Preview)</option>
             <option value="bn-BD">বাংলা (বাংলাদেশ) (Preview)</option>
             <option value="ca-ES">Catalan (Preview)</option>
diff --git a/ui/v2.5/src/locales/ar.json b/ui/v2.5/src/locales/ar.json
new file mode 100644
index 000000000..41718177d
--- /dev/null
+++ b/ui/v2.5/src/locales/ar.json
@@ -0,0 +1,660 @@
+{
+    "actions": {
+        "add": "إضافة",
+        "add_directory": "إضافة مسار",
+        "add_entity": "إضافة {entityType}",
+        "add_manual_date": "إضافة تاريخ يدوي",
+        "add_sub_groups": "إضافة مجموعة فرعية",
+        "add_o": "إضافة فتح",
+        "add_play": "إضافة تشغيل",
+        "add_stash_id": "إضافة معرف ستاش",
+        "add_to_entity": "إضافة إلى {entityType}",
+        "allow": "سماح",
+        "allow_temporarily": "سماح مؤقت",
+        "anonymise": "إخفاء الهوية",
+        "apply": "تطبيق",
+        "assign_stashid_to_parent_studio": "إضافة معرف ستاش إلى ستوديو رئيسي موجود و تحديث البيانات",
+        "auto_tag": "وسم تلقاني",
+        "backup": "نسخة احتياطية",
+        "browse_for_image": "استعرض صورة…",
+        "cancel": "إلغاء",
+        "choose_date": "اختر تاريخ",
+        "clean": "تنظيف",
+        "clean_generated": "تنظيف الملفات التي تم انشاؤها",
+        "clear": "مسح",
+        "clear_back_image": "مسح الصورة الخلفية",
+        "clear_date_data": "مسح بيانات التاريخ",
+        "clear_front_image": "مسح الصورة الامامية",
+        "clear_image": "مسح الصورة",
+        "close": "إغلاق",
+        "confirm": "تأكيد",
+        "continue": "متابعة",
+        "copy_to_clipboard": "نسخ إلى الحافظة",
+        "create": "إنشاء",
+        "create_chapters": "إنشاء فصل",
+        "create_entity": "إنشاء {entityType}",
+        "create_marker": "إنشاء علامة",
+        "create_new": "إنشاء جديد",
+        "create_parent_studio": "إنشاء ستوديو رئيسي",
+        "created_entity": "إنشاء {entity_type}: {entity_name}",
+        "customise": "تخصيص",
+        "delete": "حذف",
+        "delete_entity": "حذف {entityType}",
+        "delete_file": "حذف الملف",
+        "delete_file_and_funscript": "حذف الملف (و funscript)",
+        "delete_generated_supporting_files": "حذف الملفات الداعمة المنشأة",
+        "disable": "تعطيل",
+        "disallow": "إلغاء السماح",
+        "download": "تحميل",
+        "download_anonymised": "تحميل خفي",
+        "download_backup": "تحميل نسخة احتياطية",
+        "edit": "تعديل",
+        "edit_entity": "تعديل {entityType}",
+        "enable": "تفعيل",
+        "encoding_image": "جارِ ترميز صورة…",
+        "exclude_lowercase": "استبعاد",
+        "export": "تصدير",
+        "export_all": "تصدير الكل…",
+        "find": "عثور",
+        "finish": "انتهاء",
+        "from_clipboard": "من الحافظة",
+        "from_file": "من ملف…",
+        "from_url": "من رابط…",
+        "full_export": "تصدير كامل",
+        "full_import": "استيراد كامل",
+        "generate": "توليد",
+        "generate_thumb_default": "توليد صورة مصغرة افتراضية",
+        "generate_thumb_from_current": "توليد صورة مصغرة افتراضية من اللقطة الحالية",
+        "hash_migration": "دمج الترميز",
+        "hide": "إخفاء",
+        "hide_configuration": "إخفاء الإعدادات",
+        "identify": "تعرف",
+        "ignore": "تجاهل",
+        "import": "استيراد…",
+        "import_from_file": "استيراد من ملف",
+        "load": "حمل",
+        "load_filter": "تحميل فلتر",
+        "logout": "تسجيل الخروج",
+        "make_primary": "اجعلها أساسية",
+        "merge": "دمج",
+        "migrate_blobs": "نقل الكتل",
+        "migrate_scene_screenshots": "نقل لقطات الشاشة من المشهد",
+        "next_action": "التالي",
+        "not_running": "لا يعمل",
+        "open_in_external_player": "فتح في مشغل خارجي",
+        "open_random": "فتح عشوائي",
+        "optimise_database": "تحسين قاعدة البيانات",
+        "overwrite": "استبدال",
+        "play": "تشغيل",
+        "play_random": "تشغيل عشوائي",
+        "play_selected": "تشغيل المحدد",
+        "preview": "معاينة",
+        "previous_action": "رجوع",
+        "reassign": "إعادة تعيين",
+        "refresh": "تحديث",
+        "reload": "اعادة تحميل",
+        "reload_plugins": "إعادة تحميل الإضافات",
+        "reload_scrapers": "إعادة تحميل مستخرجات بيانات المشهد",
+        "remove": "إزالة",
+        "remove_date": "إزالة التاريخ",
+        "remove_from_containing_group": "إزالة من المجموعة",
+        "remove_from_gallery": "إزالة من المعرض",
+        "rename_gen_files": "إعادة تسمية الملفات التي تم إنشاؤها",
+        "reveal_in_file_manager": "إظهار في مدير الملفات",
+        "rescan": "إعادة المسح",
+        "reset_play_duration": "إعادة ضبط مدة التشغيل",
+        "reset_resume_time": "إعادة ضبط وقت الاستئناف",
+        "reset_cover": "استعادة الغطاء الافتراضي",
+        "reshuffle": "إعادة ترتيب",
+        "running": "جارِ",
+        "save": "حفظ",
+        "save_and_new": "حفظ وجديد",
+        "save_delete_settings": "استخدام هذه الخيارات افتراضيًا عند الحذف",
+        "save_filter": "حفظ الفلتر",
+        "scan": "تفحص",
+        "scrape": "استخرج البيانات",
+        "scrape_query": "استعلام استخراج البيانات",
+        "scrape_scene_fragment": "استراج بيانات بشكل جزئي",
+        "scrape_with": "استخراج البيانات باستخدام…",
+        "search": "بحث",
+        "select_all": "تحديد الكل",
+        "select_directory": "تحديد الدليل",
+        "select_entity": "حدد {entityType}",
+        "select_folders": "تحديد المجلدات",
+        "select_none": "اختيار لا شيء",
+        "invert_selection": "عكس التحديد",
+        "selective_auto_tag": "علامة تلقائية انتقائية",
+        "selective_clean": "التنظيف الانتقائي",
+        "selective_generate": "توليد انتقائي",
+        "selective_scan": "المسح الانتقائي",
+        "set_as_default": "تعيين كافتراضي",
+        "set_back_image": "صورة خلفية…",
+        "set_cover": "تعيين كغلاف",
+        "set_front_image": "صورة أمامية…",
+        "set_image": "تعيين الصورة…",
+        "show": "إظهار",
+        "show_configuration": "إظهار الاعدادات",
+        "show_results": "عرض النتائج",
+        "show_count_results": "إظهار {count} النتائج",
+        "sidebar": {
+            "close": "إغلاق الشريط الجانبي",
+            "open": "فتح الشريط الجانبي",
+            "toggle": "تبديل الشريط الجانبي"
+        },
+        "skip": "تخطى",
+        "split": "انقسم",
+        "stop": "إيقاف",
+        "submit": "إرسال",
+        "submit_stash_box": "ارسال إلى Stash-Box",
+        "submit_update": "إرسال التحديث",
+        "swap": "تبديل",
+        "tasks": {
+            "clean_confirm_message": "هل أنت متأكد من رغبتك في التنظيف؟ سيؤدي هذا إلى حذف معلومات قاعدة البيانات والمحتوى المُنشأ لجميع المشاهد والمعارض التي لم تعد موجودة في نظام الملفات.",
+            "dry_mode_selected": "تم اختيار الوضع الجاف. لن يتم حذف أي بيانات فعلياً، بل سيتم تسجيلها فقط.",
+            "import_warning": "هل أنت متأكد من رغبتك في الاستيراد؟ سيؤدي هذا إلى حذف قاعدة البيانات وإعادة الاستيراد من بياناتك الوصفية المصدرة."
+        },
+        "temp_disable": "تعطيل مؤقت…",
+        "temp_enable": "تفعيل مؤقتًا…",
+        "unset": "غير محدد",
+        "use_default": "استخدم الإعدادات الافتراضية",
+        "view_history": "عرض السجل",
+        "view_random": "عرض عشوائي",
+        "create_parent_tag": "إنشاء علامة رئيسية"
+    },
+    "actions_name": "الإجراءات",
+    "age": "العمر",
+    "age_on_date": "{age} في مرحلة الإنتاج",
+    "aliases": "الأسماء المستعارة",
+    "all": "الكل",
+    "also_known_as": "يُعرف أيضًا باسم",
+    "appears_with": "يظهر مع",
+    "ascending": "تصاعدي",
+    "audio_codec": "ترميز الصوت",
+    "average_resolution": "متوسط الدقة",
+    "between_and": "أيضا",
+    "birth_year": "سنة الميلاد",
+    "birthdate": "تاريخ الميلاد",
+    "bitrate": "معدل البت",
+    "blobs_storage_type": {
+        "database": "قاعدة البيانات",
+        "filesystem": "نظام الملفات"
+    },
+    "captions": "التعليقات التوضيحية",
+    "career_end": "نهاية المسيرة المهنية",
+    "career_length": "طول المسيرة المهنية",
+    "career_start": "بداية المسيرة المهنية",
+    "chapters": "الفصول",
+    "circumcised": "مختون",
+    "circumcised_types": {
+        "CUT": "قص مختون",
+        "UNCUT": "غير مختون"
+    },
+    "component_tagger": {
+        "config": {
+            "active_instance": "مثال stash-box فعال:",
+            "blacklist_desc": "تُستثنى عناصر القائمة السوداء من الاستعلامات. لاحظ أنها تعبيرات نمطية غير حساسة لحالة الأحرف. يجب وضع علامة (\\) قبل بعض الأحرف: {chars_require_escape}",
+            "blacklist_label": "القائمة السوداء",
+            "errors": {
+                "blacklist_duplicate": "عنصر مكرر في القائمة السوداء"
+            },
+            "mark_organized_desc": "تحديد المشهد على أنه منظم فور النقر على زر الحفظ.",
+            "mark_organized_label": "وضع علامة \"منظم\" عند الحفظ",
+            "performer_genders": {
+                "heading": "جنس الفنان",
+                "description": "سيتم عرض الفنانين من هذه الأجناس عند تصنيف المشاهد."
+            },
+            "query_mode_auto": "تلقائي",
+            "query_mode_auto_desc": "يستخدم البيانات الوصفية إن وجدت، أو اسم الملف",
+            "query_mode_dir": "الدليل",
+            "query_mode_dir_desc": "يستخدم فقط الدليل الرئيسي لملف الفيديو",
+            "query_mode_filename": "اسم الملف",
+            "query_mode_filename_desc": "يستخدم اسم الملف فقط",
+            "query_mode_label": "وضع الاستعلام",
+            "query_mode_metadata": "البيانات الوصفية",
+            "query_mode_metadata_desc": "يستخدم البيانات الوصفية فقط",
+            "query_mode_path": "مسار",
+            "query_mode_path_desc": "يستخدم مسار الملف بالكامل",
+            "set_cover_desc": "استبدل غلاف المشهد إذا تم العثور على واحد.",
+            "set_cover_label": "صورة غلاف المشهد المحدد",
+            "set_tag_desc": "إرفاق العلامات بالمشهد، إما عن طريق الكتابة فوق العلامات الموجودة في المشهد أو دمجها معها.",
+            "set_tag_label": "تعيين العلامات",
+            "source": "المصدر"
+        },
+        "noun_query": "استفسار",
+        "results": {
+            "duration_off": "مدة الخطأ لا تقل عن {number} ث",
+            "duration_unknown": "المدة غير معروفة",
+            "fp_found": "{fpCount, plural, =0 {No new fingerprint matches found} other {# new fingerprint matches found}}",
+            "fp_matches": "المدة متطابقة",
+            "fp_matches_multi": "مدة مطابقة {matchCount}/{durationsLength} بصمات",
+            "hash_matches": "{hash_type} متطابق",
+            "match_failed_already_tagged": "تم وضع علامة على المشهد بالفعل",
+            "match_failed_no_result": "لم يتم العثور على نتائج",
+            "match_success": "تم وضع علامة على المشهد بنجاح",
+            "phash_matches": "{count} تطابق التجزئات",
+            "unnamed": "غير مسمى"
+        },
+        "verb_add_as_alias": "أضف الاسم المستخرج كاسم مستعار",
+        "verb_link_existing": "ربط إلى الموجود",
+        "verb_match_fp": "مطابقة بصمات",
+        "verb_match_tag": "علامة المطابقة",
+        "verb_matched": "متطابق",
+        "verb_scrape_all": "استخرج بيانات الكل",
+        "verb_scrape_selected": "استخرج بيانات المحدد",
+        "verb_submit_fp": "ارسال {fpCount, plural, one{# Fingerprint} other{# Fingerprints}}",
+        "verb_toggle_unmatched": "{toggle} مشاهد لا مثيل لها",
+        "verb_toggle_config": "{toggle} {configuration}"
+    },
+    "config": {
+        "about": {
+            "build_hash": "بناء التجزئة:",
+            "build_time": "وقت البناء:",
+            "check_for_new_version": "تحقق من وجود إصدار جديد",
+            "latest_version": "أحدث إصدار",
+            "latest_version_build_hash": "أحدث إصدار من رقم البناء:",
+            "release_date": "تاريخ الاصدار:",
+            "stash_discord": "انضم إلى {url} قناتنا",
+            "stash_home": "صفحة ستاش {url}",
+            "stash_open_collective": "ادعمونا من خلال {url}",
+            "stash_wiki": "موقع ستاش {url}",
+            "version": "إصدار",
+            "new_version_notice": "[NEW]"
+        },
+        "advanced_mode": "الوضع المتقدم",
+        "application_paths": {
+            "heading": "مسارات التطبيق"
+        },
+        "categories": {
+            "about": "حول",
+            "changelog": "سجل التغييرات",
+            "interface": "واجهة المستخدم",
+            "logs": "سجلات",
+            "metadata_providers": "موفرو البيانات الوصفية",
+            "plugins": "الإضافات",
+            "scraping": "استخراج البيانات",
+            "security": "حماية",
+            "services": "خدمات",
+            "system": "نظام",
+            "tasks": "المهام",
+            "tools": "أدوات"
+        },
+        "changelog": {
+            "header": "سجل التغييرات"
+        },
+        "dlna": {
+            "allow_temp_ip": "سماح {tempIP}",
+            "allowed_ip_addresses": "عناوين IP المسموح بها",
+            "allowed_ip_temporarily": "عنوان IP مسموح به مؤقتًا",
+            "default_ip_whitelist": "قائمة عناوين IP المسموح بها الافتراضية",
+            "default_ip_whitelist_desc": "تسمح عناوين IP الافتراضية بالوصول إلى DLNA. استخدم {wildcard} للسماح بجميع عناوين IP.",
+            "disabled_dlna_temporarily": "تعطيل DLNA مؤقتًا",
+            "disallowed_ip": "عنوان IP غير مسموح به",
+            "enabled_by_default": "مُفعّل افتراضياً",
+            "enabled_dlna_temporarily": "تفعيل DLNA مؤقتًا",
+            "network_interfaces": "واجهات",
+            "network_interfaces_desc": "واجهات لعرض خادم DLNA عليها. القائمة الفارغة تؤدي إلى تشغيله على جميع الواجهات. يتطلب الأمر إعادة تشغيل DLNA بعد التغيير.",
+            "recent_ip_addresses": "عناوين IP الحديثة",
+            "server_display_name": "اسم عرض الخادم",
+            "server_display_name_desc": "اسم العرض لخادم DLNA. الوضع الافتراضي هو {server_name} إذا كان فارغًا.",
+            "server_port": "منفذ الخادم",
+            "server_port_desc": "المنفذ الذي سيتم تشغيل خادم DLNA عليه. يتطلب إعادة تشغيل DLNA بعد التغيير.",
+            "successfully_cancelled_temporary_behaviour": "تم إلغاء السلوك المؤقت بنجاح",
+            "until_restart": "حتى إعادة التشغيل",
+            "video_sort_order": "ترتيب فرز الفيديو الافتراضي",
+            "video_sort_order_desc": "ترتيب الفيديوهات افتراضياً."
+        },
+        "general": {
+            "auth": {
+                "api_key": "مفتاح API",
+                "api_key_desc": "مفتاح API للأنظمة الخارجية. مطلوب فقط عند إعداد اسم المستخدم/كلمة المرور. يجب حفظ اسم المستخدم قبل إنشاء مفتاح API.",
+                "authentication": "المصادقة",
+                "clear_api_key": "ازالة مفتاح API",
+                "credentials": {
+                    "description": "بيانات اعتماد لتقييد الوصول إلى ستاش.",
+                    "heading": "الاعتمادات"
+                },
+                "generate_api_key": "توليد مفتاح API",
+                "log_file": "ملف السجل",
+                "log_file_desc": "مسار الملف المراد إخراج سجلات النظام إليه. اتركه فارغًا لتعطيل تسجيل الملفات. يتطلب إعادة التشغيل.",
+                "log_http": "تسجيل الوصول إلى HTTP",
+                "log_http_desc": "تسجيل الوصول إلى الطرفية عبر بروتوكول HTTP. يتطلب إعادة التشغيل.",
+                "log_to_terminal": "سجل الدخول إلى الطرفية",
+                "log_to_terminal_desc": "يُسجّل في الطرفية بالإضافة إلى ملف. هذا صحيح دائمًا إذا كان تسجيل الملفات مُعطّلاً. يتطلب إعادة التشغيل.",
+                "log_file_max_size": "أقصى حجم للسجل",
+                "log_file_max_size_desc": "الحد الأقصى لحجم ملف السجل بالميغابايت قبل ضغطه. 0 ميغابايت معطل. يتطلب إعادة التشغيل.",
+                "maximum_session_age": "الحد الأقصى لمدة الجلسة",
+                "maximum_session_age_desc": "أقصى مدة خمول قبل انتهاء صلاحية جلسة تسجيل الدخول، بالثواني. يتطلب إعادة التشغيل.",
+                "password": "كلمة المرور",
+                "password_desc": "كلمة المرور للوصول إلى ستاش. اترك هذا الحقل فارغًا لتعطيل مصادقة المستخدم",
+                "stash-box_integration": "تكامل Stash-box",
+                "username": "اسم المستخدم",
+                "username_desc": "اسم المستخدم للوصول إلى Stash. اتركه فارغًا لتعطيل مصادقة المستخدم"
+            },
+            "backup_directory_path": {
+                "description": "موقع المجلد لنسخ ملفات قاعدة بيانات SQLite الاحتياطية.",
+                "heading": "مسار دليل النسخ الاحتياطي"
+            },
+            "delete_trash_path": {
+                "description": "المسار الذي ستُنقل إليه الملفات المحذوفة بدلاً من حذفها نهائياً. اتركه فارغاً لحذف الملفات نهائياً.",
+                "heading": "مسار المهملات"
+            },
+            "blobs_path": {
+                "description": "مكان تخزين البيانات الثنائية في نظام الملفات. ينطبق هذا فقط عند استخدام نوع تخزين الكائنات الثنائية الكبيرة (blob) في نظام الملفات. تحذير: يتطلب تغيير هذا نقل البيانات الموجودة يدويًا.",
+                "heading": "مسار نظام ملفات البيانات الثنائية"
+            },
+            "blobs_storage": {
+                "description": "أين يتم تخزين البيانات الثنائية مثل صور أغلفة المشاهد، وصور الفنانين، وصور الاستوديو، وصور الوسوم؟ بعد تغيير هذه القيمة، يجب نقل البيانات الموجودة باستخدام مهام نقل البيانات الثنائية. راجع صفحة المهام للاطلاع على تفاصيل النقل.",
+                "heading": "نوع تخزين البيانات الثنائية"
+            },
+            "cache_location": "موقع مجلد ذاكرة التخزين المؤقت. مطلوب في حالة البث باستخدام HLS (كما هو الحال على أجهزة Apple) أو DASH.",
+            "cache_path_head": "مسار التخزين المؤقت",
+            "calculate_md5_and_ohash_desc": "احسب مجموع التحقق MD5 بالإضافة إلى oshash. سيؤدي التفعيل إلى إبطاء عمليات المسح الأولية. يجب ضبط تجزئة اسم الملف على oshash لتعطيل حساب MD5.",
+            "calculate_md5_and_ohash_label": "احسب قيمة MD5 للفيديوهات",
+            "check_for_insecure_certificates": "تحقق من وجود شهادات غير آمنة",
+            "check_for_insecure_certificates_desc": "تستخدم بعض المواقع شهادات SSL غير آمنة. عند إلغاء تحديد هذا الخيار، يتجاوز برنامج استخراج البيانات فحص الشهادات غير الآمنة ويسمح باستخراج البيانات من تلك المواقع. إذا واجهت خطأً متعلقًا بالشهادة أثناء استخراج البيانات، فقم بإلغاء تحديد هذا الخيار.",
+            "chrome_cdp_path": "مسار CDP لمتصفح Chrome",
+            "chrome_cdp_path_desc": "مسار الملف إلى ملف Chrome القابل للتنفيذ، أو عنوان بعيد (يبدأ بـ http:// أو https://، على سبيل المثال http://localhost:9222/json/version) إلى مثيل Chrome.",
+            "create_galleries_from_folders_desc": "إذا كان هذا الخيار صحيحًا، فسيتم إنشاء معارض الصور من المجلدات التي تحتوي على الصور افتراضيًا. أنشئ ملفًا باسم .forcegallery أو .nogallery في مجلد لتجاوز هذا الإعداد.",
+            "create_galleries_from_folders_label": "أنشئ معارض من مجلدات تحتوي على صور",
+            "database": "قاعدة البيانات",
+            "db_path_head": "مسار قاعدة البيانات",
+            "directory_locations_to_your_content": "مواقع الدليل لمحتواك",
+            "excluded_image_gallery_patterns_desc": "التعبيرات النمطية لملفات/مسارات الصور والمعرض المراد استبعادها من الفحص وإضافتها إلى مهام التنظيف.",
+            "excluded_image_gallery_patterns_head": "أنماط الصور/المعارض المستبعدة",
+            "excluded_video_patterns_desc": "التعبيرات النمطية لملفات/مسارات الفيديو المراد استبعادها من الفحص وإضافتها إلى مهام التنظيف.",
+            "excluded_video_patterns_head": "أنماط الفيديو المستبعدة",
+            "ffmpeg": {
+                "download_ffmpeg": {
+                    "description": "تنزيل FFmpeg إلى دليل التكوين ومسح مسارات ffmpeg و ffprobe التي يجب حلها من دليل التكوين.",
+                    "heading": "تنزيل FFmpeg"
+                },
+                "ffmpeg_path": {
+                    "description": "مسار ملف ffmpeg التنفيذي (وليس المجلد فقط). إذا كان فارغًا، فسيتم تحديد مسار ffmpeg من بيئة النظام عبر متغير البيئة $PATH، أو من دليل الإعدادات، أو من $HOME/.stash.",
+                    "heading": "مسار ملف FFmpeg القابل للتنفيذ"
+                },
+                "ffprobe_path": {
+                    "description": "مسار ملف ffprobe القابل للتنفيذ (وليس المجلد فقط). إذا كان فارغًا، فسيتم تحديد مسار ffprobe من بيئة النظام عبر متغير البيئة $PATH، أو من دليل الإعدادات، أو من $HOME/.stash.",
+                    "heading": "مسار الملف التنفيذي FFprobe"
+                },
+                "hardware_acceleration": {
+                    "desc": "يستخدم الأجهزة المتاحة لترميز الفيديو من أجل التحويل المباشر.",
+                    "heading": "ترميز الأجهزة FFmpeg"
+                },
+                "live_transcode": {
+                    "input_args": {
+                        "desc": "متقدم: وسائط إضافية لتمريرها إلى ffmpeg قبل حقل الإدخال عند تحويل ترميز الفيديو المباشر.",
+                        "heading": "وسائط إدخال التحويل المباشر لـ FFmpeg"
+                    },
+                    "output_args": {
+                        "desc": "متقدم: وسائط إضافية لتمريرها إلى ffmpeg قبل حقل الإخراج عند تحويل ترميز الفيديو المباشر.",
+                        "heading": "وسائط إخراج التحويل المباشر لـ FFmpeg"
+                    }
+                },
+                "transcode": {
+                    "input_args": {
+                        "desc": "متقدم: وسائط إضافية لتمريرها إلى ffmpeg قبل حقل الإدخال عند إنشاء الفيديو.",
+                        "heading": "وسائط إدخال تحويل ترميز FFmpeg"
+                    },
+                    "output_args": {
+                        "desc": "متقدم: وسائط إضافية لتمريرها إلى ffmpeg قبل حقل الإخراج عند إنشاء الفيديو.",
+                        "heading": "وسائط إخراج تحويل ترميز FFmpeg"
+                    }
+                }
+            },
+            "funscript_heatmap_draw_range": "قم بتضمين النطاق في الخرائط الحرارية المُنشأة",
+            "funscript_heatmap_draw_range_desc": "ارسم نطاق الحركة على المحور الصادي للخريطة الحرارية المُنشأة. ستحتاج الخرائط الحرارية الموجودة إلى إعادة إنشائها بعد التغيير.",
+            "gallery_cover_regex_desc": "تُستخدم التعابير النمطية لتحديد صورة كغلاف لمعرض الصور.",
+            "gallery_cover_regex_label": "نمط غلاف المعرض",
+            "gallery_ext_desc": "قائمة مفصولة بفواصل لامتدادات الملفات التي سيتم التعرف عليها كملفات ZIP خاصة بالمعرض.",
+            "gallery_ext_head": "امتداد ملفات ZIP للمعرض",
+            "generated_file_naming_hash_desc": "استخدم MD5 أو oshash لتسمية الملفات المُنشأة. يتطلب تغيير هذا أن تحتوي جميع المشاهد على MD5 المناسب.",
+            "generated_file_naming_hash_head": "تم إنشاء تجزئة تسمية الملف",
+            "generated_files_location": "موقع الدليل للملفات التي تم إنشاؤها (علامات المشهد، معاينات المشهد، الصور المتحركة، إلخ).",
+            "generated_path_head": "المسار المُنشأ",
+            "hashing": "التجزئة",
+            "heatmap_generation": "إنشاء خريطة حرارية باستخدام Funscript",
+            "image_ext_desc": "قائمة مفصولة بفواصل لامتدادات الملفات التي سيتم التعرف عليها كصور.",
+            "image_ext_head": "امتدادات الصور",
+            "include_audio_desc": "يتضمن ذلك بث الصوت عند إنشاء المعاينات.",
+            "include_audio_head": "تضمين الصوت",
+            "logging": "تسجيل الأحداث",
+            "maximum_streaming_transcode_size_desc": "الحد الأقصى لحجم التدفقات المُعاد ترميزها.",
+            "maximum_streaming_transcode_size_head": "الحد الأقصى لحجم عملية ترميز البث",
+            "maximum_transcode_size_desc": "الحد الأقصى لحجم عمليات التحويل البرمجي المُنشأة.",
+            "maximum_transcode_size_head": "الحد الأقصى لحجم عملية الترميز",
+            "metadata_path": {
+                "description": "موقع الدليل المستخدم عند إجراء عملية تصدير أو استيراد كاملة.",
+                "heading": "مسار البيانات الوصفية"
+            },
+            "number_of_parallel_task_for_scan_generation_desc": "اضبط القيمة على 0 للكشف التلقائي. تحذير: تشغيل مهام أكثر من اللازم لتحقيق استخدام كامل لوحدة المعالجة المركزية سيؤدي إلى انخفاض الأداء وقد يتسبب في مشاكل أخرى.",
+            "number_of_parallel_task_for_scan_generation_head": "عدد المهام المتوازية للمسح/التوليد",
+            "parallel_scan_head": "المسح/التوليد المتوازي",
+            "plugins_path": {
+                "description": "موقع مجلد ملفات تكوين الملحق.",
+                "heading": "مسار الإضافات"
+            },
+            "preview_generation": "توليد معاينة",
+            "python_path": {
+                "description": "مسار ملف بايثون التنفيذي (وليس المجلد فقط). يُستخدم هذا المسار لبرامج استخراج البيانات والإضافات. في حال تركه فارغًا، سيتم تحديد مسار بايثون من بيئة النظام.",
+                "heading": "مسار ملف بايثون القابل للتنفيذ"
+            },
+            "scraper_user_agent": "وكيل مستخدم برنامج استخراج البيانات",
+            "scraper_user_agent_desc": "سلسلة User-Agent المستخدمة أثناء طلبات HTTP الخاصة بالاستخراج.",
+            "scrapers_path": {
+                "description": "موقع مجلد ملفات تهيئة برنامج استخراج البيانات.",
+                "heading": "مسار البيانات المستخرجة"
+            },
+            "scraping": "جار استخراج البيانات",
+            "sprite_generation_head": "توليد الصور المتحركة",
+            "sprite_interval_desc": "الوقت بين كل صورة متحركة يتم إنشاؤها بالثواني.",
+            "sprite_interval_head": "فاصل زمني للصورة متحركة",
+            "sprite_maximum_desc": "الحد الأقصى لعدد الصور المتحركة التي سيتم إنشاؤها لمشهد واحد. اضبطه على 0 لإلغاء الحد.",
+            "sprite_maximum_head": "أقصى عدد من الصور المتحركة",
+            "sprite_minimum_desc": "الحد الأدنى لعدد الصور المتحركة التي يجب إنشاؤها لمشهد واحد",
+            "sprite_minimum_head": "الحد الأدنى من الصور المتحركة",
+            "sprite_screenshot_size_desc": "الحجم المطلوب لكل صورة متحركة بالبكسل.",
+            "sprite_screenshot_size_head": "حجم الصورة المتحركة",
+            "sqlite_location": "موقع ملف قاعدة بيانات SQLite (يتطلب إعادة التشغيل). تحذير: تخزين قاعدة البيانات على نظام مختلف عن النظام الذي يُشغّل منه خادم Stash (أي عبر الشبكة) غير مدعوم!",
+            "use_custom_sprite_interval_head": "استخدم فاصل زمني مخصص للصور المتحركة",
+            "use_custom_sprite_interval_desc": "قم بتمكين فاصل الصور المتحركة المخصص وفقًا للإعدادات أدناه.",
+            "video_ext_desc": "قائمة مفصولة بفواصل لامتدادات الملفات التي سيتم التعرف عليها كملفات فيديو.",
+            "video_ext_head": "امتدادات الفيديو",
+            "video_head": "فيديو"
+        },
+        "library": {
+            "exclusions": "الاستثناءات",
+            "gallery_and_image_options": "خيارات المعرض والصور",
+            "media_content_extensions": "امتدادات محتوى الوسائط"
+        },
+        "logs": {
+            "log_level": "مستوى السجل"
+        },
+        "plugins": {
+            "available_plugins": "الإضافات المتاحة",
+            "hooks": "خطافات",
+            "installed_plugins": "الإضافات المثبتة",
+            "triggers_on": "تشغيل المحفزات"
+        },
+        "scraping": {
+            "available_scrapers": "مستخرجات البيانات المتاحة",
+            "entity_metadata": "{entityType} البيانات الوصفية",
+            "entity_scrapers": "{entityType} مستخرجات البيانات",
+            "excluded_tag_patterns_desc": "التعبيرات النمطية لأسماء العلامات المراد استبعادها من نتائج استخراج البيانات.",
+            "excluded_tag_patterns_head": "أنماط العلامات المستبعدة",
+            "installed_scrapers": "مستخرجات البيانات المثبته",
+            "scraper": "مستخرج البيانات",
+            "scrapers": "مستخرجات البيانات",
+            "search_by_name": "البحث بالاسم",
+            "supported_types": "الأنواع المدعومة",
+            "supported_urls": "عناوين URL"
+        },
+        "stashbox": {
+            "add_instance": "أضف مثيل stash-box",
+            "api_key": "مفتاح API",
+            "description": "يُسهّل هذا البرنامج عملية الوسم الآلي للمشاهد والمؤدين بناءً على بصمات وأسماء الملفات من Stash-box.\nيمكنك العثور على نقطة النهاية ومفتاح واجهة برمجة التطبيقات (API) في صفحة حسابك على منصة stash-box. يُشترط إدخال الأسماء عند إضافة أكثر من منصة.",
+            "endpoint": "نقطة النهاية",
+            "graphql_endpoint": "نقطة نهاية GraphQL",
+            "max_requests_per_minute": "الحد الأقصى للطلبات في الدقيقة",
+            "max_requests_per_minute_description": "يستخدم القيمة الافتراضية لـ {defaultValue} إذا تم ضبطه على 0",
+            "name": "اسم",
+            "title": "نقاط نهاية Stash-box"
+        },
+        "system": {
+            "transcoding": "تحويل الترميز"
+        },
+        "tasks": {
+            "added_job_to_queue": "تمت إضافة {operation_name} إلى قائمة انتظار المهام",
+            "anonymise_and_download": "يقوم بإنشاء نسخة مجهولة المصدر من قاعدة البيانات وتنزيل الملف الناتج.",
+            "anonymise_database": "ينشئ نسخة من قاعدة البيانات في دليل النسخ الاحتياطية، مع إخفاء هوية جميع البيانات الحساسة. ويمكن بعد ذلك تقديم هذه النسخة للآخرين لأغراض استكشاف الأخطاء وإصلاحها وتصحيحها. ولا يتم إجراء أي تعديل على قاعدة البيانات الأصلية. وتستخدم قاعدة البيانات التي تم إخفاء هويتها تنسيق اسم الملف التالي: {filename_format}.",
+            "anonymising_database": "قاعدة بيانات إخفاء الهوية",
+            "auto_tag": {
+                "auto_tagging_all_paths": "وضع علامات تلقائية على جميع المسارات",
+                "auto_tagging_paths": "وضع علامات تلقائية على المسارات التالية"
+            },
+            "auto_tag_based_on_filenames": "يتم وضع علامات تلقائية على المحتوى بناءً على مسارات الملفات.",
+            "auto_tagging": "الوسم التلقائي",
+            "backing_up_database": "نسخ قاعدة البيانات احتياطياً",
+            "backup_and_download": "يقوم بنسخ قاعدة البيانات احتياطياً وتنزيل الملف الناتج.",
+            "backup_database": {
+                "description": "يقوم بإجراء نسخ احتياطي لقاعدة البيانات وملفات الكائنات الثنائية الكبيرة (blob).",
+                "destination": "وجهة",
+                "download": "تنزيل النسخة الاحتياطية",
+                "include_blobs": "تضمين الكائنات الثنائية الكبيرة في النسخ الاحتياطي",
+                "include_blobs_desc": "قم بتعطيل النسخ الاحتياطي لملف قاعدة بيانات SQLite فقط.",
+                "sqlite": "سيكون ملف النسخ الاحتياطي نسخة من ملف قاعدة بيانات SQLite، باسم الملف {filename_format}",
+                "to_directory": "إلى {directory}",
+                "warning_blobs": "لن يتم تضمين ملفات الكائنات الثنائية الكبيرة (Blob) في النسخة الاحتياطية. هذا يعني أنه لكي تتم عملية الاستعادة بنجاح من النسخة الاحتياطية، يجب أن تكون ملفات الكائنات الثنائية الكبيرة موجودة في موقع تخزين الكائنات الثنائية الكبيرة.",
+                "zip": "سيتم ضغط ملفات قاعدة بيانات SQLite وملفات الكائنات الثنائية الكبيرة في ملف واحد، باسم الملف {filename_format}"
+            },
+            "cleanup_desc": "تحقق من وجود ملفات مفقودة وقم بإزالتها من قاعدة البيانات. هذا إجراء ضار.",
+            "clean_generated": {
+                "blob_files": "ملفات Blob",
+                "description": "يزيل الملفات التي تم إنشاؤها بدون وجود مدخل مطابق لها في قاعدة البيانات.",
+                "image_thumbnails": "صور مصغرة",
+                "image_thumbnails_desc": "صور مصغرة ومقاطع فيديو",
+                "markers": "معاينات العلامات",
+                "previews": "معاينات المشاهد",
+                "previews_desc": "معاينات المشاهد والصور المصغرة",
+                "sprites": "صور المشهد",
+                "transcodes": "تحويل المشهد"
+            },
+            "data_management": "إدارة البيانات",
+            "defaults_set": "تم تعيين الإعدادات الافتراضية وسيتم استخدامها عند النقر على زر {action} في صفحة المهام.",
+            "dont_include_file_extension_as_part_of_the_title": "لا تقم بتضمين امتداد الملف كجزء من العنوان",
+            "empty_queue": "لا توجد مهام قيد التشغيل حاليًا.",
+            "export_to_json": "يقوم بتصدير محتوى قاعدة البيانات إلى تنسيق JSON في دليل البيانات الوصفية.",
+            "generate": {
+                "generating_from_paths": "إنشاء مشاهد من المسارات التالية",
+                "generating_scenes": "جارٍ إنشاء {num} {scene}"
+            },
+            "generate_clip_previews_during_scan": "إنشاء معاينات لمقاطع الصور",
+            "generate_desc": "إنشاء ملفات الصور والرسوم المتحركة والفيديوهات وملفات الفيديو الافتراضية وغيرها من الملفات الداعمة.",
+            "generate_image_phashes_during_scan": "توليد تجزئات إدراكية للصور",
+            "generate_image_phashes_during_scan_tooltip": "لإزالة التكرارات والتعرف على البيانات.",
+            "generate_phashes_during_scan": "توليد تجزئات إدراكية للفيديو",
+            "generate_phashes_during_scan_tooltip": "لإزالة التكرارات وتحديد المشهد.",
+            "generate_previews_during_scan": "إنشاء معاينات صور متحركة",
+            "generate_previews_during_scan_tooltip": "كما يُمكن إنشاء معاينات متحركة (webp)، وهي مطلوبة فقط عند ضبط نوع معاينة المشهد/جدار العلامات على صورة متحركة. تستهلك هذه المعاينات موارد أقل من وحدة المعالجة المركزية مقارنةً بمعاينات الفيديو أثناء التصفح، ولكنها تُنشأ بالإضافة إليها وتكون ملفاتها أكبر حجمًا.",
+            "generate_sprites_during_scan": "إنشاء صور متحركة",
+            "generate_sprites_during_scan_tooltip": "مجموعة الصور المعروضة أسفل مشغل الفيديو لتسهيل التصفح.",
+            "generate_thumbnails_during_scan": "إنشاء صور مصغرة للصور",
+            "generate_video_covers_during_scan": "إنشاء أغلفة المشاهد",
+            "generate_video_previews_during_scan": "إنشاء معاينات",
+            "generate_video_previews_during_scan_tooltip": "إنشاء معاينات فيديو يتم تشغيلها عند تمرير المؤشر فوق مشهد ما",
+            "generated_content": "المحتوى المُنشأ",
+            "identify": {
+                "and_create_missing": "وخلق حالات مفقودة",
+                "create_missing": "إنشاء مفقود",
+                "default_options": "الخيارات الافتراضية",
+                "description": "قم بتعيين بيانات المشهد الوصفية تلقائيًا باستخدام مصادر stash-box و scraper.",
+                "explicit_set_description": "سيتم استخدام الخيارات التالية في حال عدم تجاوزها في الخيارات الخاصة بالمصدر.",
+                "field": "حقل",
+                "field_options": "خيارات الحقل",
+                "heading": "تعرف",
+                "identifying_from_paths": "تحديد المشاهد من المسارات التالية",
+                "identifying_scenes": "تعرف على {num} {scene}",
+                "include_male_performers": "يشمل ذلك فنانين ذكور",
+                "performer_genders": "جنس الفنانين",
+                "performer_genders_desc": "سيتم إدراج الفنانين من أجناس محددة أثناء عملية تحديد الهوية.",
+                "set_cover_images": "ضبط صوة غلاف",
+                "set_organized": "تعيين علامة منظمة",
+                "skip_multiple_matches": "تخطّي المتطابقات التي لها أكثر من نتيجة واحدة",
+                "skip_multiple_matches_tooltip": "إذا لم يتم تفعيل هذا الخيار وتم إرجاع أكثر من نتيجة، فسيتم اختيار واحدة منها عشوائيًا للمطابقة",
+                "skip_single_name_performers": "تخطّي الفنانين الذين يحملون اسماً واحداً دون أي لبس",
+                "skip_single_name_performers_tooltip": "إذا لم يتم تفعيل هذا الخيار، فسيتم اختيار فنانين ذوي نمطية عالية مثل سامانثا أو أولغا",
+                "source": "مصدر",
+                "source_options": "{source} خيارات",
+                "sources": "مصادر",
+                "strategy": "استراتيجية",
+                "tag_skipped_matches": "تم تخطي علامة المتطابقة مع",
+                "tag_skipped_matches_tooltip": "أنشئ علامة مثل \"تحديد: تطابقات متعددة\" يمكنك استخدامها للتصفية في عرض مُصنِّف المشهد، ثم اختر التطابق الصحيح يدويًا",
+                "tag_skipped_performer_tooltip": "أنشئ علامة مثل \"تحديد: اسم فنان واحد\" يمكنك استخدامها للتصفية في عرض مُصنِّف المشهد، ثم اختر الطريقة التي تريد التعامل بها مع هؤلاء الفنانين",
+                "tag_skipped_performers": "تخطت علامة الأداء بعض الفنانين الذين",
+                "field_behaviour": "{strategy} {field}"
+            },
+            "import_from_exported_json": "يستورد من ملف JSON مُصدّر في دليل البيانات الوصفية. يؤدي ذلك إلى مسح قاعدة البيانات الموجودة.",
+            "incremental_import": "استيراد تدريجي من ملف مضغوط للتصدير.",
+            "job_queue": "قائمة المهام",
+            "maintenance": "صيانة",
+            "migrate_blobs": {
+                "delete_old": "حذف البيانات القديمة",
+                "description": "قم بنقل البيانات الثنائية الكبيرة (blobs) إلى نظام تخزين البيانات الثنائية الكبيرة الحالي. يجب تنفيذ عملية النقل هذه بعد تغيير نظام تخزين البيانات الثنائية الكبيرة. يمكنك حذف البيانات القديمة بعد النقل."
+            },
+            "migrate_hash_files": "يُستخدم بعد تغيير تجزئة تسمية الملفات المُنشأة لإعادة تسمية الملفات المُنشأة الموجودة إلى تنسيق التجزئة الجديد.",
+            "migrate_scene_screenshots": {
+                "delete_files": "حذف ملفات لقطات الشاشة",
+                "description": "انقل لقطات الشاشة الخاصة بالمشاهد إلى نظام تخزين الكائنات الثنائية الكبيرة الجديد. يجب تنفيذ عملية النقل هذه بعد ترقية النظام الحالي إلى الإصدار 0.20. يمكنك حذف لقطات الشاشة القديمة بعد النقل.",
+                "overwrite_existing": "استبدل البيانات الموجودة ببيانات لقطات الشاشة"
+            },
+            "migrations": "اندماجات",
+            "only_dry_run": "قم بإجراء تجربة جافة فقط. لا تقم بإزالة أي شيء",
+            "optimise_database": "حاول تحسين الأداء من خلال تحليل ملف قاعدة البيانات بالكامل ثم إعادة بنائه.",
+            "optimise_database_warning": "تحذير: أثناء تشغيل هذه المهمة، ستفشل أي عمليات لتعديل قاعدة البيانات، وقد يستغرق إكمالها عدة دقائق، اعتمادًا على حجم قاعدة البيانات الخاصة بك. كما يتطلب أيضًا على الأقل مساحة خالية على القرص بقدر ما تكون قاعدة بياناتك كبيرة، ولكن يوصى بـ 1.5x.",
+            "plugin_tasks": "مهام الملحقات",
+            "rescan": "إعادة فحص الملفات",
+            "rescan_tooltip": "أعد فحص جميع الملفات في المسار. يُستخدم هذا الخيار لفرض تحديث بيانات تعريف الملفات وإعادة فحص ملفات zip.",
+            "scan": {
+                "scanning_all_paths": "مسح جميع المسارات",
+                "scanning_paths": "مسح المسارات التالية"
+            },
+            "scan_for_content_desc": "قم بمسح المحتوى الجديد وإضافته إلى قاعدة البيانات.",
+            "set_name_date_details_from_metadata_if_present": "قم بتعيين الاسم والتاريخ والتفاصيل من بيانات تعريف الملف المضمنة"
+        },
+        "tools": {
+            "graphql_playground": "بيئة اختبار GraphQL",
+            "heading": "أدوات",
+            "scene_duplicate_checker": "مدقق تكرار المشاهد",
+            "scene_filename_parser": {
+                "add_field": "إضافة حقل",
+                "capitalize_title": "العنوان بحروف كبيرة",
+                "display_fields": "حقول العرض",
+                "escape_chars": "استخدم \\ للهروب من الأحرف الحرفية",
+                "filename": "اسم الملف",
+                "filename_pattern": "نمط اسم الملف",
+                "ignore_organized": "تجاهل المشاهد المنظمة",
+                "ignored_words": "الكلمات المتجاهلة",
+                "matches_with": "يتطابق مع {i}",
+                "select_parser_recipe": "حدد وصفة المحلل اللغوي",
+                "title": "محلل أسماء ملفات المشاهد",
+                "whitespace_chars": "أحرف المسافة البيضاء",
+                "whitespace_chars_desc": "سيتم استبدال هذه الأحرف بمسافات بيضاء في العنوان"
+            },
+            "scene_tools": "أدوات المشهد"
+        },
+        "ui": {
+            "abbreviate_counters": {
+                "description": "قم بتقصير العدادات في صفحات عرض البطاقات والتفاصيل، على سبيل المثال سيتم تنسيق \"1831\" إلى \"1.8K\".",
+                "heading": "عدادات مختصرة"
+            },
+            "basic_settings": "الإعدادات الأساسية",
+            "custom_css": {
+                "description": "يجب إعادة تحميل الصفحة لتطبيق التغييرات. لا يوجد ضمان للتوافق بين ملفات CSS المخصصة والإصدارات المستقبلية من ستاش.",
+                "heading": "CSS مخصص",
+                "option_label": "تم تفعيل CSS المخصص"
+            },
+            "troubleshooting_mode": {
+                "button": "وضع استكشاف الأخطاء وإصلاحها"
+            }
+        }
+    }
+}
diff --git a/ui/v2.5/src/locales/bg-BG.json b/ui/v2.5/src/locales/bg-BG.json
index 5c933c9ce..2b056a0d6 100644
--- a/ui/v2.5/src/locales/bg-BG.json
+++ b/ui/v2.5/src/locales/bg-BG.json
@@ -74,8 +74,6 @@
         "logout": "Изход",
         "make_primary": "Направи Основен",
         "merge": "Слей",
-        "merge_from": "Слей от",
-        "merge_into": "Слей към",
         "migrate_blobs": "Мигрирай Блобове",
         "migrate_scene_screenshots": "Мигрирай Скрийншоти от Сцени",
         "next_action": "Следващ",
diff --git a/ui/v2.5/src/locales/bn-BD.json b/ui/v2.5/src/locales/bn-BD.json
index 687dcdaa9..6fed1cc7e 100644
--- a/ui/v2.5/src/locales/bn-BD.json
+++ b/ui/v2.5/src/locales/bn-BD.json
@@ -55,8 +55,6 @@
         "logout": "লগ ছাড়ুন",
         "make_primary": "প্রাথমিক বানান",
         "merge": "ছাটুন",
-        "merge_from": "এর থেকে ছাটুন",
-        "merge_into": "এর মধ্যে ছাটুন",
         "next_action": "পরবর্তী",
         "not_running": "চলছে না",
         "open_in_external_player": "বাইরের প্লেয়ার এ খুলুন",
diff --git a/ui/v2.5/src/locales/ca-ES.json b/ui/v2.5/src/locales/ca-ES.json
index dd9cdb7f6..68df3a33c 100644
--- a/ui/v2.5/src/locales/ca-ES.json
+++ b/ui/v2.5/src/locales/ca-ES.json
@@ -53,8 +53,6 @@
         "logout": "Tanca la sessió",
         "make_primary": "Fes primari",
         "merge": "Fusiona",
-        "merge_from": "Fusiona des de",
-        "merge_into": "Fusiona dins",
         "migrate_blobs": "Migra els Blobs",
         "migrate_scene_screenshots": "Migra les captures de pantalla de l'escena",
         "not_running": "sense executar",
@@ -430,7 +428,6 @@
                 "overwrite_existing": "Sobreescriure blobs existents amb dades de captures de pantalla"
             },
             "migrations": "Migracions",
-            "backup_database": "Realitza una còpia de seguretat de la base de dades en el directori de còpies de seguretat. La còpia s'emmagatzema amb el format {filename_format}",
             "added_job_to_queue": "Afegit/a {operation_name} a la cua de treball",
             "anonymise_and_download": "Realitza una còpia anònima de la base de dades i descàrrega el fitxer resultant.",
             "anonymise_database": "Fa una còpia de la base de dades al directori de còpies de seguretat anonimitzant tota la informació sensible. Aquesta còpia es pot proveir a tercers per a solucionar i depurar problemes. La base de dades original no és modificada. La base de dades anonimitzada s'emmagatzema amb el format {filename_format}.",
diff --git a/ui/v2.5/src/locales/cs-CZ.json b/ui/v2.5/src/locales/cs-CZ.json
index d08f1703a..7da949a9d 100644
--- a/ui/v2.5/src/locales/cs-CZ.json
+++ b/ui/v2.5/src/locales/cs-CZ.json
@@ -55,8 +55,6 @@
         "logout": "Odhlásit se",
         "make_primary": "Natavit jako primární",
         "merge": "Sloučit",
-        "merge_from": "Sloučit z",
-        "merge_into": "Sloučit do",
         "next_action": "Další",
         "not_running": "neběží",
         "open_in_external_player": "Otevřít v externím přehrávači",
@@ -153,7 +151,9 @@
         "load": "Načíst",
         "load_filter": "Načíst filtr",
         "add_stash_id": "Přidat Stash ID",
-        "create_new": "Vytvořit nový"
+        "create_new": "Vytvořit nový",
+        "save_and_new": "Ulož & Nový",
+        "invert_selection": "Obrátit výběr"
     },
     "actions_name": "Akce",
     "age": "Věk",
@@ -221,7 +221,8 @@
         "verb_toggle_unmatched": "{toggle} neidentifikované scény",
         "verb_add_as_alias": "Přidat scrapované jméno jako alias",
         "verb_link_existing": "Odkaz na existujicí",
-        "verb_match_tag": "Odpovídajicí tag"
+        "verb_match_tag": "Odpovídajicí tag",
+        "verb_scrape_selected": "Scrapovat Vybrané"
     },
     "config": {
         "about": {
@@ -475,7 +476,6 @@
             "auto_tagging": "Autotagování",
             "backing_up_database": "Zálohovat databázi",
             "backup_and_download": "Provede zálohu databáze a stáhne výsledný soubor.",
-            "backup_database": "Provede zálohu databáze do stejné složky s formátem názvu souboru {filename_format}",
             "cleanup_desc": "Zkontrolovat chybějící soubory a odstranit je z databáze. Toto je destruktivní akce.",
             "data_management": "Správa dat",
             "defaults_set": "Výchozí hodnoty byly nastaveny a budou použity při kliknutí na tlačítko {action} na stránce Úloh.",
@@ -487,7 +487,7 @@
                 "generating_scenes": "Generováno pro {num} {scene}"
             },
             "generate_desc": "Generovat podpůrné obrázky, sprite, video, vtt a další soubory.",
-            "generate_phashes_during_scan": "Generovat PHASHe",
+            "generate_phashes_during_scan": "Generovat percepční hashe (phash) videa",
             "generate_phashes_during_scan_tooltip": "Pro deduplikaci a identifikaci scén.",
             "generate_previews_during_scan": "Generovat animované náhledy",
             "generate_previews_during_scan_tooltip": "Vytvářet také animované (webp) náhledy, které jsou vyžadovány pouze v případě, že je Typ náhledu scény/značky nastaven na Animovaný obrázek. Při procházení nevytěžují tolik procesor než náhledy videí, ale jsou generovány navíc a jsou to větší soubory.",
@@ -567,7 +567,9 @@
             "generate_clip_previews_during_scan": "Generování náhledů pro obrázkové klipy",
             "optimise_database_warning": "Varování: Pokud je tato úloha spuštěna, všechny operace, které upravují databázi, selžou a v závislosti na velikosti databáze může její dokončení trvat několik minut. Vyžaduje také minimálně tolik volného místa na disku, jak je vaše databáze velká, ale doporučuje se 1,5x.",
             "rescan": "Znovu skenovat soubory",
-            "rescan_tooltip": "Znovu skenovat každý soubor v cestě. Používá se k vynucení aktualizace metadat souboru a opětovnému skenování zip souborů."
+            "rescan_tooltip": "Znovu skenovat každý soubor v cestě. Používá se k vynucení aktualizace metadat souboru a opětovnému skenování zip souborů.",
+            "generate_image_phashes_during_scan": "Generovat percepční hashe (phash) obrazu",
+            "generate_image_phashes_during_scan_tooltip": "Pro deduplikaci a identifikaci."
         },
         "tools": {
             "scene_duplicate_checker": "Detektor duplicitních scén",
@@ -825,6 +827,24 @@
                         "heading": "Zobrazit odkazy na mřížce karet účinkujicích"
                     }
                 }
+            },
+            "troubleshooting_mode": {
+                "button": "Režim řešení problémů",
+                "dialog_title": "Povolit režim řešení problémů",
+                "dialog_description": "Tím se dočasně zakážou všechny customizace, která pomohou diagnostikovat problémy:",
+                "dialog_item_plugins": "Všechna rozšíření",
+                "dialog_item_css": "Vlastní CSS",
+                "dialog_item_js": "Vlastní JavaScript",
+                "dialog_item_locales": "Vlastní locales",
+                "dialog_log_level": "Log level bude nastaven na Debug pro detailní diagnostiku.",
+                "dialog_reload_note": "Stránka se automaticky znovu načte.",
+                "enable": "Povolit a znovu načíst",
+                "overlay_message": "Režim řešení problémů je aktivní – všechny customizace jsou zakázány",
+                "exit": "Odejít"
+            },
+            "custom_title": {
+                "description": "Vlastní text, který se přidá k názvu stránky. Pokud je prázdný, výchozí nastavení je 'Stash'.",
+                "heading": "Vlastní název"
             }
         },
         "advanced_mode": "Pokročilý mód"
@@ -914,10 +934,6 @@
             "page_header": "Stránka {page} / {total}",
             "disable_animation": "Zakázat animaci přechodu mezi obrázky"
         },
-        "merge_tags": {
-            "destination": "Cíl",
-            "source": "Zdroj"
-        },
         "scene_gen": {
             "force_transcodes": "Vynutit generování Transkódu",
             "force_transcodes_tooltip": "Ve výchozím nastavení, transkódy jsou generovány pouze tehdy, když video soubor není podporován prohlížečem. V případě aktivování, transkódy budou generovány i v ostatních případech.",
@@ -930,7 +946,7 @@
             "preview_exclude_start_time_desc": "Vyloučit prvních x sekund z náhledů scén. Může to být hodnota v sekundách nebo procentech (např. 2 %) z celkové doby trvání scény.",
             "preview_exclude_start_time_head": "Vyloučit čas zahájení",
             "preview_generation_options": "Možnosti generování náhledů",
-            "phash": "Percepční hashe",
+            "phash": "Percepční hashe (phash) videa",
             "preview_preset_head": "Enkódovací předvolba náhledů",
             "preview_seg_count_desc": "Počet segmentů v souborech náhledů.",
             "preview_seg_duration_desc": "Doba trvání každého segmentu náhledu v sekundách.",
@@ -955,7 +971,9 @@
             "override_preview_generation_options_desc": "Přepsat možnosti generování náhledu pro tuto operaci. Výchozí nastavení se nastavuje: Systém -> Generování náhledu.",
             "clip_previews": "Náhledy obrázkových klipů",
             "marker_screenshots_tooltip": "Statické JPG obrázky značek",
-            "overwrite": "Přepsat existující soubory"
+            "overwrite": "Přepsat existující soubory",
+            "image_phash": "Percepční hashování (phash) obrazu",
+            "image_phash_tooltip": "Pro deduplikaci a identifikaci"
         },
         "unsaved_changes": "Neuložené změny. Opravdu chcete odejít?",
         "scenes_found": "{count} nalezené scény",
@@ -1016,7 +1034,8 @@
         "rescanning_entity": "Přeskenování {count, plural, one {{singularEntity}} other {{pluralEntity}}}…",
         "removed_entity": "Odebráno {count, plural, one {{singularEntity}} other {{pluralEntity}}}",
         "image_index_too_large": "Chyba: Index obrázku je větší než počet obrázků v galerii",
-        "reassign_past_tense": "Soubor byl znovu přidělen"
+        "reassign_past_tense": "Soubor byl znovu přidělen",
+        "merged_performers": "Sloučení účinkující"
     },
     "urls": "Odkazy",
     "url": "Odkaz",
@@ -1147,14 +1166,6 @@
         "performer_selection": "Výběr účinkujících",
         "status_tagging_performers": "Stav: Tagování Účinkujících",
         "add_new_performers": "Přidat nové Účinkující",
-        "config": {
-            "active_stash-box_instance": "Aktivní instance stash-box:",
-            "edit_excluded_fields": "Upravit vyloučená pole",
-            "excluded_fields": "Vyloučená pole:",
-            "no_fields_are_excluded": "Nejsou vyloučena žádná pole",
-            "these_fields_will_not_be_changed_when_updating_performers": "Tato pole se při aktualizaci účinkujících nezmění.",
-            "no_instances_found": "Nebyly nalezeny žádné instance"
-        },
         "current_page": "Aktuální stránka",
         "no_results_found": "Nebyly nalezeny žádné výsledky.",
         "number_of_performers_will_be_processed": "{performer_count} účinkujících bude zpracováno",
@@ -1329,7 +1340,6 @@
     "measurements": "Míry",
     "media_info": {
         "audio_codec": "Audio Kodek",
-        "checksum": "Kontrolní součet",
         "downloaded_from": "Staženo z",
         "performer_card": {
             "age": "{age} {years_old}",
@@ -1338,7 +1348,6 @@
         "play_duration": "Délka přehrávání",
         "stream": "Stream",
         "video_codec": "Video Kodek",
-        "hash": "Hash",
         "interactive_speed": "Interaktivní rychlost",
         "phash": "PHash",
         "play_count": "Počet přehrání",
@@ -1470,13 +1479,7 @@
         "add_new_studios": "Přidat nová studia",
         "config": {
             "create_parent_label": "Vytvořit nadřazená studia",
-            "these_fields_will_not_be_changed_when_updating_studios": "Tato pole se při aktualizaci studií nezmění.",
-            "active_stash-box_instance": "Aktivní stash-box instance:",
-            "create_parent_desc": "Vytvořte chybějící nadřazená studia nebo označte a aktualizujte data/obrázeky pro stávající nadřazená studia s přesnými shodami názvů",
-            "edit_excluded_fields": "Upravit vyloučená pole",
-            "excluded_fields": "Vyloučená pole:",
-            "no_fields_are_excluded": "Nejsou vyloučena žádná pole",
-            "no_instances_found": "Nebyly nalezeny žádné instance"
+            "create_parent_desc": "Vytvořte chybějící nadřazená studia nebo označte a aktualizujte data/obrázeky pro stávající nadřazená studia s přesnými shodami názvů"
         },
         "number_of_studios_will_be_processed": "Bude zpracováno {studio_count} studií",
         "to_use_the_studio_tagger": "Chcete-li použít studio Tagger, je třeba nakonfigurovat instanci stash-boxu.",
@@ -1519,7 +1522,7 @@
         "websocket_connection_reestablished": "Připojení Websocket bylo obnoveno"
     },
     "o_count": "Počet O",
-    "stash_id_endpoint": "Koncový bod Stash ID",
+    "stash_id_endpoint": "URL koncového bodu (endpoint) Stash ID",
     "stash_ids": "Stash IDs",
     "statistics": "Statistiky",
     "stats": {
@@ -1529,7 +1532,8 @@
         "total_o_count": "Celkový Počet O",
         "total_play_duration": "Celková doba přehrávání",
         "scenes_size": "Velikost scén",
-        "total_play_count": "Celkový počet přehrátí"
+        "total_play_count": "Celkový počet přehrátí",
+        "total_o_count_sfw": "Celkový počet lajků"
     },
     "studio": "Studio",
     "studio_and_parent": "Studio & Nadřazené studio",
@@ -1592,5 +1596,7 @@
         "no_results": "Žádné výsledky nenalezeny.",
         "placeholder_name_or_id": "{entityType} jméno nebo StashID...",
         "select_stashbox": "Vybrat StashBox..."
-    }
+    },
+    "latest_scene": "Nejnovější scéna",
+    "stash_id_count": "Počet Stash ID"
 }
diff --git a/ui/v2.5/src/locales/da-DK.json b/ui/v2.5/src/locales/da-DK.json
index ab89ec69a..ea62c977a 100644
--- a/ui/v2.5/src/locales/da-DK.json
+++ b/ui/v2.5/src/locales/da-DK.json
@@ -58,8 +58,6 @@
         "logout": "Log ud",
         "make_primary": "Gør til primær",
         "merge": "Fusioner",
-        "merge_from": "Fusioner fra",
-        "merge_into": "Fusioner til",
         "migrate_blobs": "Migrér Blobs",
         "migrate_scene_screenshots": "Migrér Scene-skærmbilleder",
         "next_action": "Næste",
@@ -133,7 +131,27 @@
         "remove_date": "Fjern dato",
         "assign_stashid_to_parent_studio": "Tildel Stash ID til eksisterende forældre studie og updater metadata",
         "clean_generated": "Rens generede filer",
-        "clear_date_data": "Rens dato data"
+        "clear_date_data": "Rens dato data",
+        "add_sub_groups": "Tilføj undergrupper",
+        "add_stash_id": "Tilføj Stash ID",
+        "create_new": "Skab ny",
+        "encoding_image": "Enkoder billede…",
+        "load": "Hent",
+        "load_filter": "Hent filter",
+        "play": "Afspil",
+        "remove_from_containing_group": "Fjern fra Gruppe",
+        "reset_play_duration": "Nulstil afspilningslængde",
+        "reset_resume_time": "Nulstil genoptag tidspunkt",
+        "reset_cover": "Genskab Standard Cover",
+        "set_cover": "Sæt som Cover",
+        "show_results": "Vis resultater",
+        "show_count_results": "Vis {count} resultater",
+        "sidebar": {
+            "close": "Luk sidepanel",
+            "open": "Åbn sidepanel",
+            "toggle": "Skift sidepanel"
+        },
+        "view_history": "Se historik"
     },
     "actions_name": "Handlinger",
     "age": "Alder",
@@ -176,7 +194,14 @@
             "set_tag_label": "Sæt tags",
             "source": "Kilde",
             "mark_organized_desc": "Sæt scene som Organiseret efter klik på Save knappen.",
-            "mark_organized_label": "Marker som Organiseret ved gem"
+            "mark_organized_label": "Marker som Organiseret ved gem",
+            "errors": {
+                "blacklist_duplicate": "Duplikér blacklist element"
+            },
+            "performer_genders": {
+                "heading": "Skuespilleres køn",
+                "description": "Skuespillere med disse køn vil blive vist når scener tagges."
+            }
         },
         "noun_query": "Query",
         "results": {
@@ -197,7 +222,10 @@
         "verb_scrape_all": "Scrape Alle",
         "verb_submit_fp": "Indsend {fpCount, plural, one{# Fingerprint} other{# Fingerprints}}",
         "verb_toggle_config": "{toggle} {configuration}",
-        "verb_toggle_unmatched": "{toggle} ikke matchede scener"
+        "verb_toggle_unmatched": "{toggle} ikke matchede scener",
+        "verb_add_as_alias": "Tilføj scrapede navne som alias",
+        "verb_link_existing": "Link til eksisterende",
+        "verb_match_tag": "Match Tag"
     },
     "config": {
         "about": {
@@ -249,7 +277,9 @@
             "successfully_cancelled_temporary_behaviour": "Midlertidig adfærd blev annulleret",
             "until_restart": "indtil genstart",
             "video_sort_order": "Standard Video Sorteringsrækkefølge",
-            "video_sort_order_desc": "Standard rækkefølge til sortering af videoer."
+            "video_sort_order_desc": "Standard rækkefølge til sortering af videoer.",
+            "server_port": "Server Port",
+            "server_port_desc": "Porten som DLNA serveren skal køre på. Kræver DLNA genstart efter ændring."
         },
         "general": {
             "auth": {
@@ -274,7 +304,9 @@
                 "password_desc": "Adgangskode for at få adgang til Stash. Lad tom for at deaktivere brugergodkendelse",
                 "stash-box_integration": "Stash-box integration",
                 "username": "Brugernavn",
-                "username_desc": "Brugernavn for at få adgang til Stash. Lad tom for at deaktivere brugergodkendelse"
+                "username_desc": "Brugernavn for at få adgang til Stash. Lad tom for at deaktivere brugergodkendelse",
+                "log_file_max_size": "Maksimal log størrelse",
+                "log_file_max_size_desc": "Den maksimale størrelse i megabytes for logfilen, før den bliver komprimeret. 0MB betyder slået fra. Kræver genstart."
             },
             "backup_directory_path": {
                 "description": "Mappelokation for SQLite database backup filer",
@@ -314,6 +346,32 @@
                     "input_args": {
                         "desc": "Avanceret: Yderligere argumenter for videreførsel til ffmpeg forinden inputsfeltet, når live video omkodes.",
                         "heading": "FFmpeg Live Omkodning Input Argumenter"
+                    },
+                    "output_args": {
+                        "desc": "Avanceret: Øvrige argumenter som overføres til ffmpeg før output feltet når videoer transkodes live.",
+                        "heading": "FFmpeg Live Trankodning Output Args"
+                    }
+                },
+                "download_ffmpeg": {
+                    "description": "Downloader FFmpeg til konfigurationsmappen og nulstiller ffmpeg and ffprobe mappestier så de hentes fra konfigurationsmappen.",
+                    "heading": "Download FFmpeg"
+                },
+                "ffmpeg_path": {
+                    "description": "Stien til det eksekverbare ffmpeg program (ikke bare mappen). Hvis tom, bliver ffmpeg hentet fra enten miljøet via $PATH, konfigurationsmappen, eller fra $HOME/.stash",
+                    "heading": "FFmpeg Eksekvérbare Sti"
+                },
+                "ffprobe_path": {
+                    "description": "Stien til ffprobes eksekvérbare fil (ikke bare mappen). Hvis tom, bliver ffprobe hentet fra enten miljøet via $PATH, konfigurationsmappen, eller fra $HOME/.stash",
+                    "heading": "FFProbes Eksekvérbare Sti"
+                },
+                "transcode": {
+                    "input_args": {
+                        "desc": "Avanceret: Øvrige argumenter som overføres til ffmpeg før input feltet når video skabes.",
+                        "heading": "FFmpeg Transkodning Input Args"
+                    },
+                    "output_args": {
+                        "desc": "Avanceret: Øvrige argumenter som overføres til ffmpeg før output feltet når videoer skabes.",
+                        "heading": "FFMpeg Transkodning Output Args"
                     }
                 }
             },
@@ -359,7 +417,16 @@
                 "heading": "Sti til Plugins",
                 "description": "Placeringen af plugin konfigurations filer"
             },
-            "gallery_cover_regex_desc": "Regexp bruges til at identificere et billede som galleri cover"
+            "gallery_cover_regex_desc": "Regexp bruges til at identificere et billede som galleri cover",
+            "delete_trash_path": {
+                "description": "Stien slettede filer flyttes til, i stedet for at blive slettet permanent. Efterlad tom hvis filer skal slettes permanent.",
+                "heading": "Sti til Papirkurv"
+            },
+            "funscript_heatmap_draw_range": "Inkludér interval i genererede heatmaps",
+            "funscript_heatmap_draw_range_desc": "Tegn bevægelsesomfang på y-aksen af det genererede heatmap. Eksisterende heatmaps vil blive regenereret efter ændringen.",
+            "gallery_cover_regex_label": "Galleri cover mønster",
+            "hashing": "Hashing",
+            "heatmap_generation": "Funscript Heatmap Generering"
         },
         "library": {
             "exclusions": "Udelukkelser",
@@ -395,7 +462,9 @@
             "endpoint": "Slutpunkt",
             "graphql_endpoint": "GraphQL slutpunkt",
             "name": "Navn",
-            "title": "Stash-box-endepunkter"
+            "title": "Stash-box-endepunkter",
+            "max_requests_per_minute": "Max forespørgsler per minut",
+            "max_requests_per_minute_description": "Bruger standardværdien {defaultValue} hvis sat til 0"
         },
         "system": {
             "transcoding": "Omkodning"
@@ -410,7 +479,6 @@
             "auto_tagging": "Auto tagging",
             "backing_up_database": "Sikkerhedskopiering af database",
             "backup_and_download": "Udfører en sikkerhedskopi af databasen og downloader den resulterende fil.",
-            "backup_database": "Udfører en sikkerhedskopi af databasen til backup-mappen med filnavnsformatet {filename_format}",
             "cleanup_desc": "Tjek for manglende filer og fjern dem fra databasen. Dette er en destruktiv handling.",
             "data_management": "Datastyring",
             "defaults_set": "Standarder er blevet indstillet og vil blive brugt, når du klikker på knappen {action} på siden Opgaver.",
@@ -492,7 +560,8 @@
             "optimise_database": "Forsøg forøgelse af ydelsen ved at analysere og derefter genopbygge hele database filen.",
             "optimise_database_warning": "Advarsel: mens denne opgave kører, hvilken som helst opgave der ændrer databasen vil fejle, og afhængigt af din databasestørrelse, kan det tage flere minutter at gennemføre. Det kræver også som minimum lige så meget ledig diskplads som din database er stor, men 1.5X mere anbefales.",
             "anonymise_and_download": "Laver en anonymiseret kopi af databasen og downloader den endelige fil.",
-            "generate_sprites_during_scan_tooltip": "Sættet af billeder bliver vist under afspilleren for nem navigation."
+            "generate_sprites_during_scan_tooltip": "Sættet af billeder bliver vist under afspilleren for nem navigation.",
+            "anonymise_database": "Laver en kopi af databasen til backupmappen, alle følsomme data anonymiseres. Dette kan herefter gives til andre til fejlsøgnings og debugging formål. Den originale database forbliver uændret. Den anonymiserede database bruger filnavnformatet {filename_format}."
         },
         "tools": {
             "scene_duplicate_checker": "Scene duplikatkontrol",
@@ -815,10 +884,6 @@
             },
             "page_header": "Side {page} / {total}"
         },
-        "merge_tags": {
-            "destination": "Destination",
-            "source": "Kilde"
-        },
         "scene_gen": {
             "force_transcodes": "Tving omkodningsgenerering",
             "force_transcodes_tooltip": "Som standard genereres omkoder kun, når videofilen ikke understøttes i browseren. Når det er aktiveret, genereres omkoder, selv når videofilen ser ud til at være understøttet i browseren.",
@@ -883,7 +948,8 @@
         },
         "reassign_files": {
             "destination": "Gentildel til"
-        }
+        },
+        "delete_alert_to_trash": "Følgende {count, plural, one {{singularEntity}} other {{pluralEntity}}} vil blive flyttet til papirkurv:"
     },
     "dimensions": "Dimensioner",
     "director": "Direktør",
@@ -1010,9 +1076,7 @@
     "measurements": "Målinger",
     "media_info": {
         "audio_codec": "Audio Codec",
-        "checksum": "Kontrolsum",
         "downloaded_from": "Downloadet fra",
-        "hash": "Hash",
         "interactive_speed": "Interaktiv hastighed",
         "performer_card": {
             "age": "{age} {years_old}",
@@ -1055,14 +1119,6 @@
         "any_names_entered_will_be_queried": "Alle indtastede navne vil blive forespurgt fra den eksterne Stash-Box-instans og tilføjet, hvis de findes. Kun eksakte matches vil blive betragtet som et match.",
         "batch_add_performers": "Batch Tilføj Kunstnere",
         "batch_update_performers": "Batch Opdater Kunstnere",
-        "config": {
-            "active_stash-box_instance": "Aktiv stash-box instans:",
-            "edit_excluded_fields": "Rediger ekskluderede felter",
-            "excluded_fields": "Udelukkede felter:",
-            "no_fields_are_excluded": "Ingen felter er udelukket",
-            "no_instances_found": "Ingen forekomster fundet",
-            "these_fields_will_not_be_changed_when_updating_performers": "Disse felter ændres ikke ved opdatering af kunstnere."
-        },
         "current_page": "Nuværende side",
         "failed_to_save_performer": "Kunne ikke gemme kunstneren \"{performer}\"",
         "name_already_exists": "Navnet findes allerede",
@@ -1254,7 +1310,8 @@
     "years_old": "år gammel",
     "circumcised": "Omskåret",
     "circumcised_types": {
-        "CUT": ""
+        "CUT": "Omskåret",
+        "UNCUT": "Ej Omskåret"
     },
     "disambiguation": "Fjernelse af flertydighed",
     "distance": "Afstand",
@@ -1329,5 +1386,6 @@
     "history": "Historie",
     "index_of_total": "{index} af {total}",
     "primary_file": "Primær fil",
-    "primary_tag": "Primær Mærke"
+    "primary_tag": "Primær Mærke",
+    "age_on_date": "{age} på produktionstidpunktet"
 }
diff --git a/ui/v2.5/src/locales/de-DE.json b/ui/v2.5/src/locales/de-DE.json
index af20a8151..50f4c8827 100644
--- a/ui/v2.5/src/locales/de-DE.json
+++ b/ui/v2.5/src/locales/de-DE.json
@@ -23,7 +23,7 @@
         "create": "Erstellen",
         "create_chapters": "Kapitel erstellen",
         "create_entity": "Erstelle {entityType}",
-        "create_marker": "Erstelle Markierung",
+        "create_marker": "Markierung erstellen",
         "created_entity": "{entity_type} erstellt: {entity_name}",
         "customise": "Anpassen",
         "delete": "Löschen",
@@ -34,7 +34,7 @@
         "disallow": "Nicht erlauben",
         "download": "Herunterladen",
         "download_anonymised": "Anonymisiert herunterladen",
-        "download_backup": "Lade Backup herunter",
+        "download_backup": "Backup herunterladen",
         "edit": "Bearbeiten",
         "edit_entity": "Bearbeiten {entityType}",
         "export": "Exportieren",
@@ -58,8 +58,6 @@
         "logout": "Ausloggen",
         "make_primary": "Als Primärquelle festlegen",
         "merge": "Zusammenführen",
-        "merge_from": "Zusammenführen aus",
-        "merge_into": "Zusammenführen in",
         "migrate_blobs": "Blobs migrieren",
         "migrate_scene_screenshots": "Szenen-Screenshots migrieren",
         "next_action": "Nächste",
@@ -87,7 +85,7 @@
         "scan": "Scannen",
         "scrape": "Scrapen",
         "scrape_query": "Scrape Anfrage",
-        "scrape_scene_fragment": "An Bruchstück scrapen",
+        "scrape_scene_fragment": "An Fragment scrapen",
         "scrape_with": "Scrape mit…",
         "search": "Suchen",
         "select_all": "Alle auswählen",
@@ -95,7 +93,7 @@
         "select_folders": "Ordner auswählen",
         "select_none": "Nichts auswählen",
         "selective_auto_tag": "Automatisch selektiv taggen",
-        "selective_clean": "Selektive Reinigung",
+        "selective_clean": "Selektives Aufräumen",
         "selective_scan": "Selektiv scannen",
         "set_as_default": "Als Voreinstellung festlegen",
         "set_back_image": "Rückseite…",
@@ -135,7 +133,7 @@
         "add_o": "O hinzufügen",
         "add_play": "Abspielen hinzufügen",
         "clear_date_data": "Datum-Eintrag löschen",
-        "assign_stashid_to_parent_studio": "Stash ID existierendem Elternstudio hinzufügen und Metadaten aktualisieren",
+        "assign_stashid_to_parent_studio": "Stash ID zu existierendem Übergeordnetem Studio hinzufügen und Metadaten aktualisieren",
         "set_cover": "Als Titelbild setzen",
         "reset_cover": "Titelbild zurücksetzen",
         "remove_from_containing_group": "Von Gruppe entfernen",
@@ -151,7 +149,15 @@
         "show_count_results": "Zeige {count} Ergebnisse",
         "show_results": "Ergebnisse anzeigen",
         "load_filter": "Filter laden",
-        "load": "Laden"
+        "load": "Laden",
+        "create_new": "Neu erstellen",
+        "add_stash_id": "Stash-ID hinzufügen",
+        "save_and_new": "Speichern & Neu",
+        "invert_selection": "Invertiere Auswahl",
+        "select_directory": "Ordner Auswählen",
+        "from_clipboard": "Aus Zwischenablage",
+        "reveal_in_file_manager": "Im Dateimanager anzeigen",
+        "selective_generate": "Selektives Generieren"
     },
     "actions_name": "Aktionen",
     "age": "Alter",
@@ -202,6 +208,10 @@
             "mark_organized_desc": "Markiere die Szene nach dem klicken auf Speichern als organisiert.",
             "errors": {
                 "blacklist_duplicate": "Blacklist item duplizieren"
+            },
+            "performer_genders": {
+                "heading": "Darsteller-Geschlechter",
+                "description": "Darsteller mit diesem Geschlecht werden angezeigt, wenn Szenen getaggt werden."
             }
         },
         "noun_query": "Anfrage",
@@ -223,7 +233,11 @@
         "verb_scrape_all": "Alles Scrapen",
         "verb_submit_fp": "Übermittele {fpCount, plural, one{# Fingerabdruck} other{# Fingerabdrücke}}",
         "verb_toggle_config": "{toggle} {configuration}",
-        "verb_toggle_unmatched": "{toggle} nicht zugeordnete Szenen"
+        "verb_toggle_unmatched": "{toggle} nicht zugeordnete Szenen",
+        "verb_add_as_alias": "Füge Spitzname als Alias hinzu",
+        "verb_link_existing": "Link zu bereits existierendem",
+        "verb_match_tag": "Tag zuordnen",
+        "verb_scrape_selected": "Ausgewählte \"scrapen\""
     },
     "config": {
         "about": {
@@ -276,7 +290,7 @@
             "until_restart": "bis Neustart",
             "video_sort_order": "Standard-Videosortierreihenfolge",
             "video_sort_order_desc": "Reihenfolge, in der Videos standardmäßig sortiert werden.",
-            "server_port": "Server Port",
+            "server_port": "Serverport",
             "server_port_desc": "Port, auf dem der DLNA Server laufen soll. Benötigt nach einer Änderung einen DLNA Neustart."
         },
         "general": {
@@ -286,7 +300,7 @@
                 "authentication": "Authentifizierung",
                 "clear_api_key": "API-Schlüssel löschen",
                 "credentials": {
-                    "description": "Anmeldedaten, um den Zugriff auf den Stash einzuschränken.",
+                    "description": "Anmeldedaten, um den Zugriff auf Stash einzuschränken.",
                     "heading": "Anmeldedaten"
                 },
                 "generate_api_key": "API-Schlüssel erzeugen",
@@ -315,11 +329,11 @@
                 "heading": "Binärdaten Dateisystem-Pfad"
             },
             "blobs_storage": {
-                "description": "Der Ort an dem Binärdaten wie Szenencover, Darsteller-, Studio- und Tag-Bilder bespeichert werden. Nach einer Änderung müssen die bereits existierenden Daten mit der Blobs migrieren Aufgabe migriert werden. Siehe Aufgaben-Seite für Migrierungen.",
+                "description": "Der Ort an dem Binärdaten wie Szenencover, Darsteller-, Studio- und Tag-Bilder bespeichert werden. Nach einer Änderung müssen die bereits existierenden Daten mit der \"Blobs migrieren\"-Aufgabe migriert werden. Siehe Aufgaben-Seite für Migrierungen.",
                 "heading": "Binärdaten Speichertyp"
             },
             "cache_location": "Verzeichnis für den Cache. Notwendig falls Streaming mit HLS (wie auf Apple Geräten üblich) oder DASH erfolgt.",
-            "cache_path_head": "Cache Pfad",
+            "cache_path_head": "Cachepfad",
             "calculate_md5_and_ohash_desc": "Berechne MD5 Prüfsumme zusätzlich zu oshash. Aktivierung führt dazu, dass erstmalige Scans mehr Zeit benötigen. Dateibenennungshash muss auf oshash gesetzt sein, um Berechnung des MD5 zu unterbinden.",
             "calculate_md5_and_ohash_label": "Berechne MD5 für Videodateien",
             "check_for_insecure_certificates": "Überprüfe auf unsichere Zertifikate",
@@ -329,11 +343,11 @@
             "create_galleries_from_folders_desc": "Wenn ausgewählt, erzeuge standardmäßig Galerien aus Verzeichnissen, welche Bilder enthalten. Erstellen Sie eine Datei .forcegallery oder .nogallery in dem Ordner, um das Verhalten für diesen zu erzwingen/unterdrücken.",
             "create_galleries_from_folders_label": "Erzeuge Galerien aus Verzeichnissen mit Bilder darin",
             "database": "Datenbank",
-            "db_path_head": "Datenbank Pfad",
+            "db_path_head": "Datenbankpfad",
             "directory_locations_to_your_content": "Verzeichnis zu Ihren Inhalten",
-            "excluded_image_gallery_patterns_desc": "Reguläre Ausdrücke für Dateinamen/Pfade von Bildern/Galerien, welche von Scans ausgeschlossen werden und beim Aufräumen der Datenbank berücksichtigt werden sollen",
+            "excluded_image_gallery_patterns_desc": "Reguläre Ausdrücke für Dateinamen/Pfade von Bildern/Galerien, welche von Scans ausgeschlossen werden und beim Aufräumen der Datenbank berücksichtigt werden sollen.",
             "excluded_image_gallery_patterns_head": "Schema für ausgeschlossene Bilder/Galerien",
-            "excluded_video_patterns_desc": "Reguläre Ausdrücke für Dateinamen/Pfade von Videos, welche von Scans ausgeschlossen werden und beim Aufräumen der Datenbank berücksichtigt werden sollen",
+            "excluded_video_patterns_desc": "Reguläre Ausdrücke für Dateinamen/Pfade von Videos, welche von Scans ausgeschlossen werden und beim Aufräumen der Datenbank berücksichtigt werden sollen.",
             "excluded_video_patterns_head": "Schema für ausgeschlossene Videos",
             "ffmpeg": {
                 "hardware_acceleration": {
@@ -369,16 +383,16 @@
                     "description": "Pfad zu ffmpeg.exe (nicht nur der Ordner). Wenn nicht angegeben wird ffmpeg.exe aus der Umgebungsvariable $PATH, dem Konfigurationsverzeichnis oder aus $HOME/.stash aufgelöst"
                 },
                 "ffprobe_path": {
-                    "description": "Pfad zu ffprobe.exe (nicht nur der Ordner). Wenn nicht angegeben wird ffprobe.exe aus der Umgebungsvariable $PATH, dem Konfigurationsverzeichnis oder aus $HOME/.stash aufgelöst",
+                    "description": "Pfad zu ffprobe.exe (nicht nur der Ordner). Wenn nicht angegeben wird ffprobe.exe aus der Umgebungsvariable $PATH, dem Konfigurationsverzeichnis oder aus $HOME/.stash aufgelöst.",
                     "heading": "FFprobe.exe Pfad"
                 }
             },
             "funscript_heatmap_draw_range": "Reichweite in generierte Heatmaps einbeziehen",
             "funscript_heatmap_draw_range_desc": "Zeichnet den Bewegungsbereich auf der y-Achse der erzeugten Heatmap. Vorhandene Heatmaps müssen nach der Änderung neu generiert werden.",
-            "gallery_cover_regex_desc": "Regulärer Ausdruck, verwendet um ein Bild als Galerietitelbild zu identifiziert",
+            "gallery_cover_regex_desc": "Regulärer Ausdruck, der verwendet wird um ein Bild als Galerietitelbild zu identifizieren.",
             "gallery_cover_regex_label": "Schema für Galerietitelbilder",
             "gallery_ext_desc": "Durch Kommas getrennte Liste von Dateiformaten, welche als Galeriecontainer gelesen werden sollen.",
-            "gallery_ext_head": "Galeriecontainer Dateiformate",
+            "gallery_ext_head": "Galerie-ZIP Dateiendung",
             "generated_file_naming_hash_desc": "Verwende MD5 oder oshash für die Benennung der generierten Dateien. Um dies zu ändern, müssen für alle Szenen der entsprechende MD5/oshash berechnet werden. Nachdem dieser Wert geändert wurde, müssen vorhandene generierte Dateien migriert oder neu generiert werden. Siehe Aufgabenseite für die Migration.",
             "generated_file_naming_hash_head": "Dateinamen-Hash für generierte Dateien",
             "generated_files_location": "Verzeichnisspeicherort für die generierten Dateien (Markierungen, Vorschauen, Sprites usw.)",
@@ -420,6 +434,10 @@
             "plugins_path": {
                 "heading": "Dateipfad für Plugins",
                 "description": "Speicherort der Plugin-Konfigurationsdateien"
+            },
+            "delete_trash_path": {
+                "description": "Pfad in den gelöschte Dateien verschoben, anstatt dauerhaft gelöscht werden. Freilassen, um Dateien permanent zu löschen.",
+                "heading": "Papierkorbverzeichnis"
             }
         },
         "library": {
@@ -458,7 +476,7 @@
             "name": "Name",
             "title": "Stash-Box-Endpunkte",
             "max_requests_per_minute": "Max requests pro Minute",
-            "max_requests_per_minute_description": "Verwendet default Wert  {defaultValue} wenn auf 0 gesetzt"
+            "max_requests_per_minute_description": "Verwendet Standardwert {defaultValue}, wenn auf 0 gesetzt"
         },
         "system": {
             "transcoding": "Transcodierung"
@@ -476,7 +494,6 @@
             "auto_tagging": "Automatisches Tagging",
             "backing_up_database": "Datenbank sichern",
             "backup_and_download": "Führt eine Sicherung der Datenbank durch und lädt die resultierende Datei herunter.",
-            "backup_database": "Führt eine Sicherung der Datenbank in den Backup-Verzeichnispfad mit dem Dateiformat {filename_format} aus",
             "cleanup_desc": "Suche nach fehlenden Dateien und entfernen Sie diese aus der Datenbank. Dies ist eine destruktive Aktion.",
             "data_management": "Datenmanagement",
             "defaults_set": "Standardeinstellungen wurden eingestellt und werden genutzt, wenn {action} Button auf der Aufgabenseite geklickt wurde.",
@@ -823,9 +840,19 @@
             "sfw_mode": {
                 "description": "Aktivieren wenn man Stash für das speichern von SFW content benutzt. Versteckt oder Ändernt ein paar NFSW eigenschaften des UI.",
                 "heading": "SFW Content Modus"
+            },
+            "custom_title": {
+                "description": "Benutzerdefinierter Text, der an den Seitentitel angehängt werden soll. Falls leer, wird Standard \"Stash\" verwendet.",
+                "heading": "Benutzerdefinierter Titel"
+            },
+            "troubleshooting_mode": {
+                "exit": "Abbrechen"
             }
         },
-        "advanced_mode": "Fortgeschrittener Modus"
+        "advanced_mode": "Fortgeschrittener Modus",
+        "changelog": {
+            "header": "Änderungsprotokoll"
+        }
     },
     "configuration": "Konfiguration",
     "countables": {
@@ -921,17 +948,14 @@
                 "label": "Scroll-Modus",
                 "pan_y": "Schwenkung Y",
                 "zoom": "Zoomen"
-            }
+            },
+            "disable_animation": "Deaktivieren Übergangsanimation zwischen Bildern"
         },
         "merge": {
             "destination": "Ziel",
             "empty_results": "Die Werte der Zielfelder bleiben unverändert.",
             "source": "Quelle"
         },
-        "merge_tags": {
-            "destination": "Ziel",
-            "source": "Quelle"
-        },
         "reassign_entity_title": "{count, plural, one {Weise {singularEntity} neu zu} other {Weise {pluralEntity} neu zu}}}",
         "reassign_files": {
             "destination": "Neu zuweisen an"
@@ -988,7 +1012,11 @@
         "overwrite_filter_warning": "Der gespeicherte Filter \"{entityName}\" wird überschrieben.",
         "set_default_filter_confirm": "Sind Sie sicher, dass Sie diesen Filter als Standard festlegen möchten?",
         "clear_o_history_confirm_sfw": "Bist du dir sicher das du den Verlauf löschen willst?",
-        "tags_found": "{count} Tags gefunden"
+        "tags_found": "{count} Tags gefunden",
+        "stashid_exists_warning": "Die existierende Stash ID für diese Stash-Box wird ersetzt.",
+        "studios_found": "{count} Studios gefunden",
+        "scrape_results_missing": "fehlend",
+        "delete_alert_to_trash": "Folgendes {count, plural, one {{singularEntity}} other {{pluralEntity}}} wird in den Papierkorb verschoben:"
     },
     "dimensions": "Maße",
     "director": "Regisseur",
@@ -1112,8 +1140,8 @@
         "syncing": "Synchronisiert mit Server",
         "uploading": "Skript wird hochgeladen"
     },
-    "hasChapters": "Hat Kapitel",
-    "hasMarkers": "Hat Markierungen",
+    "hasChapters": "Kapitel",
+    "hasMarkers": "Markierungen",
     "height": "Größe",
     "height_cm": "Höhe (cm)",
     "help": "Hilfe",
@@ -1140,9 +1168,7 @@
     "measurements": "Maße",
     "media_info": {
         "audio_codec": "Audio-Codec",
-        "checksum": "Prüfsumme",
         "downloaded_from": "Heruntergeladen von",
-        "hash": "Hash",
         "interactive_speed": "Interaktive Geschwindigkeit",
         "performer_card": {
             "age": "{age} {years_old}",
@@ -1189,14 +1215,6 @@
         "any_names_entered_will_be_queried": "Alle eingetragenen Namen werden bei der stash-box Instanz nachgeschlagen und hinzugefügt, wenn gefunden. Nur exakte Übereinstimmungen werden als Treffer gewertet.",
         "batch_add_performers": "Stapelverarbeitung für Darsteller",
         "batch_update_performers": "Stapelverarbeitungsaktualisierung für Darsteller",
-        "config": {
-            "active_stash-box_instance": "Ausgewählte stash-box Instanz:",
-            "edit_excluded_fields": "Ausgeschlossene Felder bearbeiten",
-            "excluded_fields": "Ausgeschlossene Felder:",
-            "no_fields_are_excluded": "Keine Felder werden ausgeschlossen",
-            "no_instances_found": "Keine Instanzen gefunden",
-            "these_fields_will_not_be_changed_when_updating_performers": "Diese Felder werden durch die Aktualisierung nicht verändert."
-        },
         "current_page": "Aktuelle Seite",
         "failed_to_save_performer": "Fehler beim Speichern der Darsteller \"{performer}\"",
         "name_already_exists": "Name bereits vergeben",
@@ -1216,7 +1234,8 @@
         "untagged_performers": "Nicht getaggte Darsteller",
         "update_performer": "Darsteller aktualisieren",
         "update_performers": "Darsteller aktualisieren",
-        "updating_untagged_performers_description": "Bei der Aktualisierung von nicht getaggten Darstellern wird versucht die Metadaten alle Darsteller, welche keine StashID haben, zu aktualisieren."
+        "updating_untagged_performers_description": "Bei der Aktualisierung von nicht getaggten Darstellern wird versucht die Metadaten alle Darsteller, welche keine StashID haben, zu aktualisieren.",
+        "performer_names_or_stashids_separated_by_comma": "Darstellernamen oder StashIDs, durch Komma getrennt"
     },
     "performer_tags": "Darsteller-Tags",
     "performers": "Darsteller",
@@ -1296,7 +1315,7 @@
         },
         "paths": {
             "database_filename_empty_for_default": "Datenbank-Dateiname (Leer für Standardwert)",
-            "description": "Als nächstes müssen wir festhalten wo für deine Porno-Kollektion finden können und wo wir unsere Datenbank, generierten Hilfsdateien und Cache speichern dürfen. Diese Einstellungen lassen sich später auch noch ändern.",
+            "description": "Als nächstes müssen wir festhalten, wo wir deine Sammlung finden können und wo wir unsere Datenbank, generierten Hilfsdateien und Cache speichern dürfen. Diese Einstellungen lassen sich später auch noch ändern.",
             "path_to_cache_directory_empty_for_default": "Pfad zum Cache-Verzeichnis (leer für Voreinstellung)",
             "path_to_generated_directory_empty_for_default": "Pfad zum Ordner der Hilfsdateien (Leer für Standardwert)",
             "set_up_your_paths": "Setze die Dateipfade",
@@ -1307,15 +1326,17 @@
             "where_can_stash_store_cache_files": "Wo darf Stash Cache-Dateien zwischenspeichern?",
             "where_can_stash_store_cache_files_description": "Um einige Funktionen wie HLS/DASH Live-Transkodierung zu nutzen, muss Stash über ein Cache-Verzeichnis als temporären Zwischenspeicher verfügen. Als Voreinstellung wird Stash ein Verzeichnis <code>cache</code> im Ordner erstellen in dem auch die Konfigurationsdatei gespeichert ist. Wenn Sie dies ändern möchten, geben Sie bitte einen absoluten oder relativen Pfad an. Stash wird dieses Verzeichnis für Sie erstellen, sollte es nicht bereits existieren.",
             "where_can_stash_store_its_database": "Wo darf Stash seine Datenbank abspeichern?",
-            "where_can_stash_store_its_database_description": "Stash nutzt eine SQLite-Datenbank, um Metadaten über deine Pornosammlung zu speichern. Standardmäßig wird diese als <code>stash-go.sqlite</code> in dem Ordner gespeichert, in dem auf deine Konfigurationsdatei liegt. Wenn du das ändern möchtest, gebe bitte einen absoluten oder relativen (gegenüber der aktuellen working directory) Pfad mit Dateinamen an.",
+            "where_can_stash_store_its_database_description": "Stash nutzt eine SQLite-Datenbank, um Metadaten über deine Sammlung zu speichern. Standardmäßig wird diese als <code>stash-go.sqlite</code> in dem Ordner gespeichert, in dem auf deine Konfigurationsdatei liegt. Wenn du das ändern möchtest, gebe bitte einen absoluten oder relativen (gegenüber der aktuellen working directory) Pfad mit Dateinamen an.",
             "where_can_stash_store_its_database_warning": "ACHTUNG: Ein Speicherort abseits des Systems auf dem Stash ausgeführt wird (z.B. speichern der Datenbank auf einem Netzwerkspeicher während Stash auf einem anderen Computer ausgeführt wird) ist <strong>nicht unterstützt</strong>! SQLite ist nicht für Nutzung über das Netzwerk ausgelegt und der Versuch, dies zu tun, kann sehr leicht dazu führen, dass Ihre gesamte Datenbank beschädigt wird.",
             "where_can_stash_store_its_generated_content": "Wo darf Stash seine generierten Hilfsdateien abspeichern?",
             "where_can_stash_store_its_generated_content_description": "Um Thumbnails, Previews und Sprites zur Verfügung zu stellen, generiert Stash diese aus deinen Videos und Bildern. Das schließt auch Transkodierungen von nicht unterstützten Dateiformaten mit ein. Standardmäßig wird Stash diese im Ordner <code>generated</code> abspeichern, der sich am Ort der Konfigurationsdatei befindet. Wenn du das ändern möchtest, gebe bitte einen absoluten oder relativen (gegenüber der aktuellen working directory) Pfad an. Stash wird den Ordner erstellen, sollte er noch nicht existieren.",
-            "where_is_your_porn_located": "Wo finden wir deine Porno-Kollektion?",
-            "where_is_your_porn_located_description": "Füge Ordner hinzu in denen sich deine Porno-Videos und -Bilder befinden. Stash wird diese Ordner nutzen, um Videos und Bilder in das System einzupflegen.",
+            "where_is_your_porn_located": "Wo finden wir deine Sammlung?",
+            "where_is_your_porn_located_description": "Füge Ordner hinzu, in denen sich deine Videos und Bilder befinden. Stash wird diese Ordner nutzen, um Videos und Bilder in das System einzupflegen.",
             "path_to_blobs_directory_empty_for_default": "Pfad zum Verzeichnis der blobs (standardmäßig leer)",
             "store_blobs_in_database": "blobs in der Datenbank speichern",
-            "sfw_content_settings": "Benutzt du stash auch für SFW Inhalte?"
+            "sfw_content_settings": "Benutzt du stash auch für SFW Inhalte?",
+            "sfw_content_settings_description": "Stash kann verwendet werden, um SFW Inhalte wie Fotografie, Kunst, Comics und mehr zu verwalten. Wenn du diese Option aktivierst, wird die Oberfläche für SFW Inhalte angepasst.",
+            "use_sfw_content_mode": "Benutze den Modus für SFW Inhalte"
         },
         "stash_setup_wizard": "Einrichtungshelfer für Stash",
         "success": {
@@ -1351,7 +1372,7 @@
         "welcome_to_stash": "Willkommen zu Stash"
     },
     "stash_id": "Stash-ID",
-    "stash_id_endpoint": "Stash ID Endpunkt",
+    "stash_id_endpoint": "Stash ID Endpunkt URL",
     "stash_ids": "Stash IDs",
     "stashbox": {
         "go_review_draft": "Gehe zu {endpoint_name}, um Entwurf zu begutachten.",
@@ -1369,7 +1390,8 @@
         "scenes_played": "Szenen Abgespielt",
         "total_o_count": "Insgesamt Anzahl der Os",
         "total_play_count": "Gesamtanzahl der Wiedergaben",
-        "total_play_duration": "Spieldauer insgesamt"
+        "total_play_duration": "Spieldauer insgesamt",
+        "total_o_count_sfw": "Gefällt-Mir gesamt"
     },
     "status": "Status: {statusText}",
     "studio": "Studio",
@@ -1402,7 +1424,8 @@
         "started_auto_tagging": "Automatisches Tagging gestartet",
         "started_generating": "Generierung gestartet",
         "started_importing": "Import gestartet",
-        "updated_entity": "{entity} aktualisiert"
+        "updated_entity": "{entity} aktualisiert",
+        "merged_performers": "Zusammengefügte Künstler"
     },
     "total": "Gesamt",
     "true": "Wahr",
@@ -1411,7 +1434,7 @@
     "updated_at": "Aktualisiert am",
     "url": "URL",
     "validation": {
-        "date_invalid_form": "${path} muss die Form YYYY-MM-DD haben",
+        "date_invalid_form": "${path} muss die Form YYY,YYY-MM, oder YYYY-MM-DD haben",
         "required": "${path} ist ein notwendiges Feld",
         "end_time_before_start_time": "Der Endzeitpunkt muss nach oder am Startzeitpunkt sein",
         "unique": "${path} muss einzigartig sein",
@@ -1432,12 +1455,6 @@
         "update_studio": "Studio Updaten",
         "any_names_entered_will_be_queried": "Alle eingetragenen Namen werden bei der stash-box Instanz nachgeschlagen und hinzugefügt, wenn gefunden. Nur exakte Übereinstimmungen werden als Treffer gewertet.",
         "config": {
-            "these_fields_will_not_be_changed_when_updating_studios": "Diese Felder werden nicht geändert, wenn Studios aktualisiert werden.",
-            "no_instances_found": "Keine Instanz gefunden",
-            "edit_excluded_fields": "Abgewählte Felder bearbeiten",
-            "excluded_fields": "Abgewähltes Feld:",
-            "no_fields_are_excluded": "Keine Felder sind abgewählt",
-            "active_stash-box_instance": "Aktive stash-box Instanz:",
             "create_parent_desc": "Erstelle fehlende übergeordnete Studios oder tagge und aktualisiere Daten/Bilder für bestehende übergeordnete Studios mit genau passenden Namen",
             "create_parent_label": "Übergeordnete Studios erstellen"
         },
@@ -1462,7 +1479,8 @@
         "studio_successfully_tagged": "Studios erfolgreich getaggt",
         "tag_status": "Tag Status",
         "name_already_exists": "Name existiert bereits",
-        "no_results_found": "Keine Ergebnisse gefunden."
+        "no_results_found": "Keine Ergebnisse gefunden.",
+        "studio_names_or_stashids_separated_by_comma": "Studionamen oder StashID, getrennt durch Komma"
     },
     "parent_studio": "Übergeordnetes Studio",
     "package_manager": {
@@ -1564,5 +1582,15 @@
     "last_o_at_sfw": "Letztes mal ein Gefällt mir gegeben am",
     "o_count_sfw": "Gefällt mir",
     "o_history_sfw": "Gefällt mir Verlauf",
-    "odate_recorded_no_sfw": "Kein Gefällt mir Datum vermerkt"
+    "odate_recorded_no_sfw": "Kein Gefällt mir Datum vermerkt",
+    "stashbox_search": {
+        "header": "Suche {entityType} von StashBox",
+        "no_results": "Keine Ergebnisse gfunden.",
+        "placeholder_name_or_id": "{entityType} Name oder StashID...",
+        "select_stashbox": "StashBox auswählen..."
+    },
+    "duplicated": "Dupliziert",
+    "unsupported_criteria": "ungültige Kriterien",
+    "career_end": "Ende der Karriere",
+    "career_start": "Beginn der Karriere"
 }
diff --git a/ui/v2.5/src/locales/es-ES.json b/ui/v2.5/src/locales/es-ES.json
index 42df6f91c..f8d447037 100644
--- a/ui/v2.5/src/locales/es-ES.json
+++ b/ui/v2.5/src/locales/es-ES.json
@@ -58,8 +58,6 @@
         "logout": "Cerrar sesión",
         "make_primary": "Establecer como primario",
         "merge": "Unir",
-        "merge_from": "Fusionar desde (origen)",
-        "merge_into": "Fusionar en (destino)",
         "migrate_blobs": "Migrar blobs",
         "migrate_scene_screenshots": "Migrar capturas de pantalla",
         "next_action": "Próximo",
@@ -95,8 +93,8 @@
         "select_folders": "Seleccionar carpetas",
         "select_none": "Deseleccionar todo",
         "selective_auto_tag": "Etiquetado automático selectivo",
-        "selective_clean": "Limpieza Selectiva",
-        "selective_scan": "Búsqueda selectiva",
+        "selective_clean": "Limpieza selectiva",
+        "selective_scan": "Escaneo selectivo",
         "set_as_default": "Establecer por defecto",
         "set_back_image": "Contraportada…",
         "set_front_image": "Portada…",
@@ -152,7 +150,16 @@
             "open": "Abrir barra lateral",
             "toggle": "Alternar barra lateral"
         },
-        "add_stash_id": "Añadir ID de Stash"
+        "add_stash_id": "Añadir ID de Stash",
+        "create_new": "Crear nuevo",
+        "save_and_new": "Guardar y nuevo",
+        "invert_selection": "Invertir selección",
+        "select_directory": "Seleccionar directorio",
+        "reveal_in_file_manager": "Mostrar en el Administrador de archivos",
+        "exclude_lowercase": "excluir",
+        "from_clipboard": "Desde el portapapeles",
+        "selective_generate": "Generación selectiva",
+        "create_parent_tag": "Crear etiqueta principal"
     },
     "actions_name": "Acciones",
     "age": "Edad",
@@ -222,7 +229,11 @@
         "verb_scrape_all": "Rastrear todo",
         "verb_submit_fp": "Enviar {fpCount, plural, one{# huella dactilar} other{# huellas dactilares}}",
         "verb_toggle_config": "{toggle} {configuration}",
-        "verb_toggle_unmatched": "{toggle} escenas sin coincidencia"
+        "verb_toggle_unmatched": "{toggle} escenas sin coincidencia",
+        "verb_add_as_alias": "Añadir el nombre extraído como alias",
+        "verb_link_existing": "Enlace a existente",
+        "verb_match_tag": "Coincidir etiqueta",
+        "verb_scrape_selected": "Proveedor de metadatos seleccionado"
     },
     "config": {
         "about": {
@@ -291,8 +302,8 @@
                 "generate_api_key": "Generar clave API",
                 "log_file": "Archivo de registro",
                 "log_file_desc": "Ruta del archivo en el que se volcarán los registros de eventos. En blanco deshabilita el fichero de registro. Los cambios se guardarán tras reiniciar la aplicación.",
-                "log_http": "Registro de accesos http",
-                "log_http_desc": "Registro de accesos http en consola. Requiere reinicio de la aplicación.",
+                "log_http": "Registro de accesos HTTP",
+                "log_http_desc": "Registro de accesos HTTP en consola. Requiere reinicio de la aplicación.",
                 "log_to_terminal": "Registro de eventos en consola",
                 "log_to_terminal_desc": "Registro de eventos en la consola de Stash además del respaldo en fichero. Habilitado si el registro a fichero está deshabilitado. Requiere reinicio de la aplicación.",
                 "maximum_session_age": "Tiempo máximo de sesión",
@@ -306,7 +317,7 @@
                 "log_file_max_size_desc": "Tamaño máximo en megabytes del archivo de registro antes de comprimirlo. 0 MB está desactivado. Requiere reiniciar."
             },
             "backup_directory_path": {
-                "description": "Ubicación del directorio para copias de seguridad de archivos de bases de datos SQLite",
+                "description": "Ubicación del directorio para copias de seguridad de archivos de bases de datos SQLite.",
                 "heading": "Ruta del directorio de la copia de seguridad"
             },
             "blobs_path": {
@@ -318,21 +329,21 @@
                 "heading": "Almacenamiento de datos binario"
             },
             "cache_location": "Ruta de la caché. Requerido para utilizar streaming mediante HLS (por ejemplo dispositivos Apple) o DASH.",
-            "cache_path_head": "Ruta relative para la caché",
+            "cache_path_head": "Ruta relativa para la caché",
             "calculate_md5_and_ohash_desc": "Calcular comprobación MD5 en adición a oshash. Habilitar esta opción puede provocar que los escaneos iniciales resulten más lentos. El cálculo de hash del nombre del fichero debe establecerse en oshash para deshabilitar el cálculo MD5.",
             "calculate_md5_and_ohash_label": "Calcular MD5 para los vídeos",
             "check_for_insecure_certificates": "Comprobación para certificados no seguros",
             "check_for_insecure_certificates_desc": "Algunos sitios utilizan certificados SSL inseguros. Cuando la casilla esté desmarcada el rastreador se saltará la comprobación de certificados inseguros y permitirá el rastreo de esos sitios web. Si el resultado es un error de certificado al rastrear entonces desmarca esta opción.",
             "chrome_cdp_path": "Ruta Chrome CDP",
             "chrome_cdp_path_desc": "Ruta del archivo del ejecutable Chrome o una dirección remota (comenzando por http:// o https://, por ejemplo, http://localhost:9222/json/version) para una instancia Chrome.",
-            "create_galleries_from_folders_desc": "Si esta opción está marcada se crearán automáticamente galerías de aquellos directorios que contienen imágenes.",
+            "create_galleries_from_folders_desc": "Si esta opción está marcada, se crearán galerías de aquellos directorios que contienen imágenes de forma predeterminada. Crea un archivo llamado .forcegallery o .nogallery en una carpeta para anular esta configuración.",
             "create_galleries_from_folders_label": "Crear galerías desde directorios con imágenes",
             "database": "Base de datos",
             "db_path_head": "Ruta de la base de datos",
             "directory_locations_to_your_content": "Ruta relativa de los directorios que almacenan el contenido",
-            "excluded_image_gallery_patterns_desc": "Expresiones regulares de archivos/rutas de imágenes que serán excluidos del escaneo y que serán añadidos a la tarea de depuración/limpieza",
+            "excluded_image_gallery_patterns_desc": "Expresiones regulares de archivos/rutas de imágenes que serán excluidos del escaneo y que serán añadidos a la tarea de depuración/limpieza.",
             "excluded_image_gallery_patterns_head": "Patrones de imágenes/galerías excluidos",
-            "excluded_video_patterns_desc": "Expresiones regulares de archivos/rutas de vídeos que serán excluidos del escaneo y que serán añadidos a la tarea de depuración/limpieza",
+            "excluded_video_patterns_desc": "Expresiones regulares de archivos/rutas de vídeos que serán excluidos del escaneo y que serán añadidos a la tarea de depuración/limpieza.",
             "excluded_video_patterns_head": "Patrones de vídeo excluidos",
             "ffmpeg": {
                 "hardware_acceleration": {
@@ -365,23 +376,23 @@
                 },
                 "ffmpeg_path": {
                     "heading": "Ruta del ejecutable FFmpeg",
-                    "description": "Ruta al ejecutable ffmpeg (no solo la carpeta). Si está vacía, ffmpeg se resolverá desde el entorno a través de $PATH, el directorio de configuración o $HOME/.stash"
+                    "description": "Ruta al ejecutable ffmpeg (no solo la carpeta). Si está vacía, ffmpeg se resolverá desde el entorno a través de $PATH, el directorio de configuración o $HOME/.stash."
                 },
                 "ffprobe_path": {
-                    "description": "Ruta al ejecutable ffprobe (no solo la carpeta). Si está vacía, ffprobe se resolverá desde el entorno a través de $PATH, el directorio de configuración o $HOME/.stash",
+                    "description": "Ruta al ejecutable ffprobe (no solo la carpeta). Si está vacía, ffprobe se resolverá desde el entorno a través de $PATH, el directorio de configuración o $HOME/.stash.",
                     "heading": "Ruta del ejecutable FFprobe"
                 }
             },
             "funscript_heatmap_draw_range": "Inluir rango en los mapas de calor generados",
             "funscript_heatmap_draw_range_desc": "Dibujar rango de movimiento en el eje \"y\" del mapa de calor generado. Los mapas de calor existentes tendrán que ser generados de nuevo tras el cambio.",
-            "gallery_cover_regex_desc": "Expresión regular utilizada para identificar una imagen como carátula de una galería",
+            "gallery_cover_regex_desc": "Expresión regular utilizada para identificar una imagen como carátula de una galería.",
             "gallery_cover_regex_label": "Patrón carátula galería",
-            "gallery_ext_desc": "Lista delimitada por comas de extensiones de archivo que serán identificados como archivos de galería en formato zip.",
-            "gallery_ext_head": "Extensiones de galería zip",
+            "gallery_ext_desc": "Lista delimitada por comas de extensiones de archivo que serán identificados como archivos de galería en formato ZIP.",
+            "gallery_ext_head": "Extensiones de galería ZIP",
             "generated_file_naming_hash_desc": "Usar MD5 o oshash para la los nombres de archivo generados. Cambiar esta opción requiere que todas las escenas tengan relleno el correspondiente valor MD5/oshash. Después de cambiar este valor los ficheros generados existentes tendrán que ser migrados o regenerados. Ver la página de tareas para llevar a cabo la migración.",
             "generated_file_naming_hash_head": "Hash de nombre de archivo generado",
-            "generated_files_location": "Ruta relativa del directorio para los ficheros generados (marcadores de escena, vistas previas de escena, conjuntos de imágenes o “sprites”, etc)",
-            "generated_path_head": "Ruta relativa para el directorio de arvhivos generados",
+            "generated_files_location": "Ruta relativa del directorio para los ficheros generados (marcadores de escena, vistas previas de escena, conjuntos de imágenes o “sprites”, etc).",
+            "generated_path_head": "Ruta para el directorio de archivos generados",
             "hashing": "Función hash",
             "heatmap_generation": "Generación mapa de calor Funscript",
             "image_ext_desc": "Lista delimitada por comas de las extensiones de archivo que serán identificadas como imágenes.",
@@ -389,12 +400,12 @@
             "include_audio_desc": "Incluye flujo de audio cuando se generen vistas previas.",
             "include_audio_head": "Incluir audio",
             "logging": "Registros",
-            "maximum_streaming_transcode_size_desc": "Tamaño máximo para la transcodificación de archivos de vídeo en streaming",
+            "maximum_streaming_transcode_size_desc": "Tamaño máximo para la transcodificación de archivos de vídeo en streaming.",
             "maximum_streaming_transcode_size_head": "Tamaño máximo de transcodificación en streaming",
-            "maximum_transcode_size_desc": "Tamaño máximo para las transcodificaciones generadas y almacenadas en el sistema de archivos donde se encuentra la aplicación Stash instalada",
+            "maximum_transcode_size_desc": "Tamaño máximo para las transcodificaciones generadas.",
             "maximum_transcode_size_head": "Tamaño máximo de transcodificación",
             "metadata_path": {
-                "description": "Ruta relativa del directorio usado durante la exportación o importación completa de los metadatos",
+                "description": "Ubicación del directorio utilizada al realizar una exportación o importación completa.",
                 "heading": "Ruta de metadatos"
             },
             "number_of_parallel_task_for_scan_generation_desc": "Seleccionar 0 para detección automática. Advertencia: lanzar más tareas de las requeridas puede provocar una elevada utilización de la CPU pudiendo provocar lentitud en el sistema y otros problemas.",
@@ -402,33 +413,44 @@
             "parallel_scan_head": "Escaneo/Generación en paralelo",
             "preview_generation": "Previsualizar generación de ficheros",
             "python_path": {
-                "description": "Ruta al ejecutable python (no sólo la carpeta). Usado para script scrapers y plugins. Si está en blanco, python se resolverá desde el entorno",
+                "description": "Ruta al ejecutable python (no sólo la carpeta). Usado para script scrapers y plugins. Si está en blanco, Python se resolverá desde el entorno.",
                 "heading": "Ruta del ejecutable Python"
             },
             "scraper_user_agent": "Identificador del agente de usuario del navegador para rastreo",
-            "scraper_user_agent_desc": "Identificador del agente de usuario del navegador web (USER-AGENT) usado durante el rastreo mediante peticiones http",
+            "scraper_user_agent_desc": "Identificador del agente de usuario del navegador web (User-Agent) usado durante el rastreo mediante peticiones HTTP.",
             "scrapers_path": {
-                "description": "Ruta del directorio de rastreadores",
-                "heading": "Ruta de Rastreadores"
+                "description": "Ubicación del directorio de los archivos de configuración del scraper.",
+                "heading": "Ruta de rastreadores"
             },
             "scraping": "Rastreo",
             "sqlite_location": "Ruta relativa para la base de datos SQLite (requiere reinicio). AVISO: Almacenar la base de datos en un sistema distinto al servidor Stash (por ejemplo a través de la red) no está soportado!",
             "video_ext_desc": "Lista delimitada por comas de las extensiones de archivo que serán identificadas como vídeos.",
-            "video_ext_head": "Extensions de vídeo",
+            "video_ext_head": "Extensiones de vídeo",
             "video_head": "Vídeo",
             "plugins_path": {
-                "description": "Ubicación del directorio de los archivos de configuración de complementos",
+                "description": "Ubicación del directorio de los archivos de configuración de complementos.",
                 "heading": "Ruta de complementos"
             },
             "delete_trash_path": {
                 "description": "Ruta a la que se moverán los archivos eliminados en lugar de eliminarlos permanentemente. Déjela vacía para eliminar los archivos de forma permanente.",
                 "heading": "Ruta de la papelera"
-            }
+            },
+            "sprite_generation_head": "Generación de sprites",
+            "sprite_interval_desc": "Tiempo entre cada sprite generado en segundos.",
+            "sprite_interval_head": "Intervalo de sprite",
+            "sprite_maximum_desc": "Número máximo de sprites que se pueden generar para una escena. Establezca el valor en 0 para desactivar el límite.",
+            "sprite_maximum_head": "Máximo de sprites",
+            "sprite_minimum_desc": "Número mínimo de sprites que se generarán para una escena",
+            "sprite_minimum_head": "Mínimo de sprites",
+            "sprite_screenshot_size_desc": "Tamaño deseado de cada sprite en píxeles.",
+            "sprite_screenshot_size_head": "Tamaño del sprite",
+            "use_custom_sprite_interval_head": "Usar intervalo de sprites personalizado",
+            "use_custom_sprite_interval_desc": "Habilita el intervalo de sprites personalizado según la configuración siguiente."
         },
         "library": {
             "exclusions": "Exclusiones",
             "gallery_and_image_options": "Opciones para Imágenes y Galerías",
-            "media_content_extensions": "Extensiones para contenido multimedia"
+            "media_content_extensions": "Extensiones para Contenido Multimedia"
         },
         "logs": {
             "log_level": "Nivel de registro"
@@ -442,7 +464,7 @@
         "scraping": {
             "entity_metadata": "Metadatos de {entityType}",
             "entity_scrapers": "Rastreadores de {entityType}",
-            "excluded_tag_patterns_desc": "Expresiones regulares de nombres de etiquetas para excluir de los resultados del rastreo",
+            "excluded_tag_patterns_desc": "Expresiones regulares de nombres de etiquetas para excluir de los resultados del rastreo.",
             "excluded_tag_patterns_head": "Patrones de etiquetas excluidos",
             "scraper": "Rastreador",
             "scrapers": "Rastreadores",
@@ -476,10 +498,9 @@
                 "auto_tagging_paths": "Etiquetar automáticamente las siguientes rutas"
             },
             "auto_tag_based_on_filenames": "Etiquetado automatizado del contenido basado en nombres de archivo.",
-            "auto_tagging": "Auto-Etiquetado",
+            "auto_tagging": "Etiquetado automático",
             "backing_up_database": "Guardando respaldo de la base de datos",
             "backup_and_download": "Lleva a cabo una copia de seguridad de la base de datos y la guarda en un fichero de respaldo.",
-            "backup_database": "Realiza una copia de seguridad de la base de datos en el directorio de copias de seguridad. La copia se almacena con el formato {filename_format}",
             "cleanup_desc": "Buscar ficheros eliminados del sistema de archivos y eliminarlos de la base de datos. PRECAUCIÓN: esta es una acción destructiva.",
             "data_management": "Gestión de datos",
             "defaults_set": "Las opciones por defecto se han guardado y serán usadas cada vez que pulses el botoón de {action} en la página de Tareas.",
@@ -491,10 +512,10 @@
                 "generating_scenes": "Generando multimedia de soporte para {num} {scene}"
             },
             "generate_desc": "Generar imagen de soporte, conjuntos de imágenes, vídeo, vtt y resto de archivos.",
-            "generate_phashes_during_scan": "Generar hashes de percepción (Phashes)",
+            "generate_phashes_during_scan": "Generar hash perceptuales de vídeo",
             "generate_phashes_during_scan_tooltip": "Para búsqueda de duplicados e identificación de escenas.",
             "generate_previews_during_scan": "Generar imágenes previas animadas",
-            "generate_previews_during_scan_tooltip": "También genere vistas previas animadas (webp), que solo son necesarias cuando el Tipo de vista previa de pared de escena/marcador está configurado en Imagen animada. Al navegar utilizan menos CPU que las vistas previas de vídeo, pero se generan además de ellos y son archivos de mayor tamaño.",
+            "generate_previews_during_scan_tooltip": "También genera vistas previas animadas (webp), solo necesarias cuando el tipo de vista previa del Muro de Escena/Marcador está configurado en Imagen animada. Al navegar, consumen menos CPU que las vistas previas de vídeo, pero se generan además de estas y son archivos más grandes.",
             "generate_sprites_during_scan": "Generar miniaturas de imagen del reproductor de vídeo",
             "generate_thumbnails_during_scan": "Generar miniaturas de las imágenes",
             "generate_video_covers_during_scan": "Generar carátulas de escenas",
@@ -527,7 +548,9 @@
                 "tag_skipped_performer_tooltip": "Crea una etiqueta como \"Identificar: Artista con un nombre\" que puedes filtrar en el etiquetador de escenas y elegir cómo quieres tratar a estos artistas",
                 "tag_skipped_matches": "Etiquetar coincidencias omitidas con",
                 "tag_skipped_matches_tooltip": "Cree una etiqueta como 'Identificar: coincidencias múltiples' que pueda filtrar en la vista Etiquetador de escenas y elija la coincidencia correcta manualmente",
-                "tag_skipped_performers": "Etiqueta a los intérpretes omitidos con"
+                "tag_skipped_performers": "Etiqueta a los intérpretes omitidos con",
+                "performer_genders": "Género del intérprete",
+                "performer_genders_desc": "Los artistas con los géneros seleccionados serán incluidos en la identificación."
             },
             "import_from_exported_json": "Importar desde el fichero JSON exportado en el directorio de metadatos. Borrará la base de datos existente.",
             "incremental_import": "Importación gradual o progresiva desde un archivo zip de exportación aportado por el usuario.",
@@ -568,7 +591,20 @@
             "optimise_database_warning": "Advertencia: mientras se esté ejecutando esta tarea, cualquier operación que modifique la base de datos fallará, y dependiendo del tamaño de su base de datos, podría tardar varios minutos en completarse. También requiere como mínimo tanto espacio libre en disco como grande sea su base de datos, pero se recomienda 1.5 veces más.",
             "optimise_database": "Intentar mejorar el rendimiento mediante el análisis y posterior reconstrucción del archivo de base de datos completo.",
             "rescan_tooltip": "Volver a analizar todos los archivos en la ruta. Se usa para forzar la actualización de metadatos y contenidos de archivos ZIP.",
-            "rescan": "Reanalizar archivos"
+            "rescan": "Reanalizar archivos",
+            "generate_image_phashes_during_scan": "Generar hash perceptuales de imágenes",
+            "generate_image_phashes_during_scan_tooltip": "Para la deduplicación y la identificación.",
+            "backup_database": {
+                "description": "Realiza una copia de seguridad de la base de datos y los archivos blob.",
+                "destination": "Destino",
+                "download": "Descargar copia de seguridad",
+                "include_blobs": "Incluir blobs en la copia de seguridad",
+                "include_blobs_desc": "Desactivar para realizar únicamente una copia de seguridad del archivo de base de datos SQLite.",
+                "sqlite": "El archivo de copia de seguridad será una copia del archivo de base de datos SQLite, con el nombre de archivo {filename_format}",
+                "to_directory": "A {directory}",
+                "warning_blobs": "Los archivos blob no se incluirán en la copia de seguridad. Esto significa que, para restaurar correctamente desde la copia de seguridad, los archivos blob deben estar presentes en la ubicación de almacenamiento de blobs.",
+                "zip": "El archivo de base de datos SQLite y los archivos blob se comprimirán en un único archivo, con el nombre de archivo {filename_format}"
+            }
         },
         "tools": {
             "scene_duplicate_checker": "Comprobación de escenas duplicadas",
@@ -603,13 +639,13 @@
                 "option_label": "Habilitar CSS personalizado"
             },
             "custom_javascript": {
-                "description": "La página debe ser refrescada para que los cambios tomen efecto. Futuras versiones de Stash pueden no ser compatibles con Javascripts personalizados.",
-                "heading": "JavaScript personalizada",
-                "option_label": "JavaScript personalizada activada"
+                "description": "La página debe ser refrescada para que los cambios tomen efecto. Futuras versiones de Stash pueden no ser compatibles con JavaScript personalizados.",
+                "heading": "JavaScript personalizado",
+                "option_label": "JavaScript personalizado activada"
             },
             "custom_locales": {
                 "description": "Sobreescribir traducciones individuales. El listado original se puede encontrar aquí: https://github.com/stashapp/stash/blob/develop/ui/v2.5/src/locales/en-GB.json. La página debe ser refrescada para reflejar los cambios realizados.",
-                "heading": "Traducciones personalizadas",
+                "heading": "Localización personalizada",
                 "option_label": "Traducción personalizada activada"
             },
             "delete_options": {
@@ -623,13 +659,13 @@
             "desktop_integration": {
                 "desktop_integration": "Integración de escritorio",
                 "notifications_enabled": "Habilitar notificaciones",
-                "send_desktop_notifications_for_events": "Enviar notificaciones de escritorio de eventos",
+                "send_desktop_notifications_for_events": "Enviar notificaciones de escritorio de eventos.",
                 "skip_opening_browser": "Saltar apertura del navegador",
-                "skip_opening_browser_on_startup": "Saltar auto-apertura del navegador durante el inicio"
+                "skip_opening_browser_on_startup": "Saltar auto-apertura del navegador durante el inicio."
             },
             "editing": {
                 "disable_dropdown_create": {
-                    "description": "Eliminar la capacidad de crear nuevos recursos desde los selectores de formulario desplegables",
+                    "description": "Eliminar la capacidad de crear nuevos recursos desde los selectores de formulario desplegables.",
                     "heading": "Deshabilitar creación en menú desplegable"
                 },
                 "heading": "Edición",
@@ -657,7 +693,7 @@
             },
             "funscript_offset": {
                 "description": "Tiempo de compensación en milisegundos para la reproducción de scripts interactivos.",
-                "heading": "Tiempo de compensación Funscript (mseg)"
+                "heading": "Desplazamiento de Funscript (ms)"
             },
             "handy_connection": {
                 "connect": "Conectar",
@@ -670,8 +706,8 @@
                 "sync": "Sincronizar"
             },
             "handy_connection_key": {
-                "description": "Clave para conexión práctica que se usará en las escenas interactivas. Configurar esta clave permitirá a Stash compartir la información actual de las escenas con handyfeeling.com",
-                "heading": "Clave para conexión práctica"
+                "description": "Clave para conexión práctica que se usará en las escenas interactivas. Configurar esta clave permitirá a Stash compartir la información actual de las escenas con handyfeeling.com.",
+                "heading": "Clave de conexión para Handy"
             },
             "image_lightbox": {
                 "heading": "Lightbox para imágenes"
@@ -685,7 +721,7 @@
                 "heading": "Imágenes",
                 "options": {
                     "write_image_thumbnails": {
-                        "description": "Guardar miniaturas de imagen en el sistema de archivos cuando son generadas al vuelo",
+                        "description": "Guardar miniaturas de imagen en el sistema de archivos cuando son generadas al vuelo.",
                         "heading": "Guardar miniaturas de imágenes"
                     },
                     "create_image_clips_from_videos": {
@@ -699,11 +735,11 @@
                 "heading": "Lenguaje"
             },
             "max_loop_duration": {
-                "description": "Duración máxima de la escena para la que el reproductor de vídeo reproducirá en bucle el vídeo - “0” para deshabilitar",
+                "description": "Duración máxima de la escena en la que el reproductor de escenas reproducirá el vídeo en bucle. Establezca 0 para desactivarlo.",
                 "heading": "Máxima duración del bucle"
             },
             "menu_items": {
-                "description": "Mostrar u ocultar los diferentes tipos de contenido del menú de navegación",
+                "description": "Mostrar u ocultar los diferentes tipos de contenido del menú de navegación.",
                 "heading": "Elementos del menú"
             },
             "minimum_play_percent": {
@@ -713,7 +749,7 @@
             "performers": {
                 "options": {
                     "image_location": {
-                        "description": "Ruta personalizada para las imágenes de perfil de actrices/actores. Dejar en blanco para usar la ruta por defecto de la aplicación",
+                        "description": "Ruta personalizada para las imágenes de perfil de actrices/actores. Dejar en blanco para usar la ruta por defecto de la aplicación.",
                         "heading": "Ruta para las imágenes personalizadas de actrices/actores"
                     }
                 }
@@ -739,11 +775,11 @@
                     "always_start_from_beginning": "Siempre iniciar vídeo desde el inicio",
                     "auto_start_video": "Iniciar vídeo automáticamente",
                     "auto_start_video_on_play_selected": {
-                        "description": "Comenzar automáticamente la reproducción del vídeo de la escena cuando \"reproducir\" esté seleccionado o se seleccione una escena aleatoria desde la página de escenas",
+                        "description": "Iniciar automáticamente los vídeos de escenas al reproducirlos desde la cola, o al reproducirlos de forma seleccionada o aleatoria desde la página Escenas.",
                         "heading": "Comenzar automáticamente el vídeo cuando \"reproducir\" esté seleccionado"
                     },
                     "continue_playlist_default": {
-                        "description": "Reproducir la siguiente escena cuando el fichero en reproducción finalice",
+                        "description": "Reproducir la siguiente escena cuando el fichero en reproducción finalice.",
                         "heading": "(Por defecto) Continuar lista de reproducción"
                     },
                     "show_scrubber": "Mostrar depurador",
@@ -751,10 +787,10 @@
                     "disable_mobile_media_auto_rotate": "Desactivar la rotación automática de medios en pantalla completa en dispositivos móviles",
                     "vr_tag": {
                         "description": "El botón de VR solo se mostrará para escenas con esta etiqueta.",
-                        "heading": "Etiqueta de VR"
+                        "heading": "Etiqueta de RV"
                     },
                     "enable_chromecast": "Habilitar Chromecast",
-                    "show_ab_loop_controls": "Mostrar controles del plugin de bucle AB",
+                    "show_ab_loop_controls": "Mostrar controles de bucle AB",
                     "show_range_markers": "Mostrar marcadores de rango"
                 }
             },
@@ -766,19 +802,19 @@
                 }
             },
             "slideshow_delay": {
-                "description": "La presentación de diapositivas estará disponible en las galerías al seleccionar el muro como modo de visualización",
+                "description": "La presentación de diapositivas estará disponible en las galerías al seleccionar el muro como modo de visualización.",
                 "heading": "Retardo en la presentación de diapositivas (segundos)"
             },
             "title": "Interfaz de usuario",
             "show_tag_card_on_hover": {
                 "heading": "Sugerencias emergentes de la tarjeta de etiqueta",
-                "description": "Mostrar tarjeta de etiqueta al pasar el cursor sobre las insignias de etiquetas"
+                "description": "Mostrar tarjeta de etiqueta al pasar el cursor sobre las insignias de etiquetas."
             },
             "studio_panel": {
                 "heading": "Vista de estudio",
                 "options": {
                     "show_child_studio_content": {
-                        "description": "En la vista de estudio, mostrar también el contenido de los subestudios",
+                        "description": "En la vista de estudio, mostrar también el contenido de los subestudios.",
                         "heading": "Mostar contenido de estudios filiales"
                     }
                 }
@@ -786,11 +822,11 @@
             "detail": {
                 "show_all_details": {
                     "heading": "Mostrar todos los detalles",
-                    "description": "Si está habilitado, todo el contenido de detalles se mostrará por defecto y cada elemento se ajustará a una columna"
+                    "description": "Si está habilitado, todo el contenido de detalles se mostrará por defecto y cada elemento se ajustará a una columna."
                 },
                 "compact_expanded_details": {
                     "heading": "Detalles expandidos compactos",
-                    "description": "Si está habilitada, esta opción mostrará el detalle completo manteniendo una presentación compacta"
+                    "description": "Si está habilitada, esta opción mostrará el detalle completo manteniendo una presentación compacta."
                 },
                 "enable_background_image": {
                     "heading": "Habilitar imagen de fondo",
@@ -799,7 +835,7 @@
                 "heading": "Página de detalle"
             },
             "use_stash_hosted_funscript": {
-                "description": "Cuando se activa, los funscripts se servirán directamente desde Stash a tu dispositivo Handy sin utilizar el servidor Handy de terceros. Requiere que Stash sea accesible desde tu dispositivo Handy, y que se genere una clave API si stash tiene las credenciales configuradas.",
+                "description": "Cuando se activa, los funscripts se servirán directamente desde Stash a tu dispositivo Handy sin utilizar el servidor Handy de terceros. Requiere que Stash sea accesible desde tu dispositivo Handy, y que se genere una clave API si Stash tiene las credenciales configuradas.",
                 "heading": "Servir funscripts directamente"
             },
             "scroll_attempts_before_change": {
@@ -810,7 +846,7 @@
                 "heading": "Vista de etiquetas",
                 "options": {
                     "show_child_tagged_content": {
-                        "description": "Mostrar también contenido de subetiquetas en la vista de etiquetas",
+                        "description": "Mostrar también contenido de subetiquetas en la vista de etiquetas.",
                         "heading": "Mostrar contenido de subetiquetas"
                     }
                 }
@@ -820,15 +856,36 @@
                 "description": "Actívelo si utiliza Stash para almacenar contenido SFW. Oculta o modifica algunos aspectos de la interfaz de usuario relacionados con contenido para adultos."
             },
             "performer_list": {
-                "heading": "Lista de actores",
+                "heading": "Lista de actrices",
                 "options": {
                     "show_links_on_grid_card": {
                         "heading": "Mostrar enlaces en las tarjetas de la cuadrícula de actores"
                     }
                 }
+            },
+            "custom_title": {
+                "description": "Texto personalizado para añadir al título de la página. Si está vacío, el valor predeterminado es «Stash».",
+                "heading": "Título personalizado"
+            },
+            "troubleshooting_mode": {
+                "button": "Modo de resolución de problemas",
+                "dialog_title": "Habilitar modo de resolución de problemas",
+                "dialog_description": "Esto desactivará temporalmente todas las personalizaciones para ayudar a diagnosticar problemas:",
+                "dialog_item_plugins": "Todos los complementos",
+                "dialog_item_css": "CSS personalizado",
+                "dialog_item_js": "JavaScript personalizado",
+                "dialog_item_locales": "Configuraciones regionales personalizadas",
+                "dialog_log_level": "El nivel de registro se establecerá en Depuración para obtener diagnósticos detallados.",
+                "dialog_reload_note": "La página se recargará automáticamente.",
+                "enable": "Habilitar y recargar",
+                "overlay_message": "El modo de resolución de problemas está activo: todas las personalizaciones están desactivadas",
+                "exit": "Salir"
             }
         },
-        "advanced_mode": "Modo avanzado"
+        "advanced_mode": "Modo avanzado",
+        "changelog": {
+            "header": "Registro de cambios"
+        }
     },
     "configuration": "Configuración",
     "countables": {
@@ -848,7 +905,8 @@
     "criterion": {
         "greater_than": "Mayor que",
         "less_than": "Menor que",
-        "value": "Valor"
+        "value": "Valor",
+        "unsupported": "{type} (no compatible)"
     },
     "criterion_modifier": {
         "between": "está entre",
@@ -901,30 +959,26 @@
             "options": "Opciones",
             "reset_zoom_on_nav": "Restaurar nivel de zoom al cambiar de imagen",
             "scale_up": {
-                "description": "Aumentar imágenes pequeñas hasta rellenar la pantalla",
+                "description": "Aumentar imágenes pequeñas hasta rellenar la pantalla.",
                 "label": "Ampliación hasta ajuste"
             },
             "scroll_mode": {
                 "description": "Mantener pulsado la tecla shift para cambiar de modo temporalmente.",
-                "label": "Modo scroll",
+                "label": "Modo de desplazamiento",
                 "pan_y": "Panorámica eje Y",
                 "zoom": "Zoom"
             },
             "page_header": "Página {page} / {total}",
             "disable_animation": "Desactivar la animación de transición entre imágenes"
         },
-        "merge_tags": {
-            "destination": "Destino",
-            "source": "Fuente"
-        },
         "scene_gen": {
             "force_transcodes": "Forzar generación de transcodificación",
             "force_transcodes_tooltip": "Por defecto las transcodificaciones son solo generadas cuando el archivo de vídeo no es soportado por el navegador. Cuando están habilitadas, las transcodificaciones se generarán incluso cuando el fichero de vídeo sea soportado por el navegador.",
             "image_previews": "Vistas previas en formato de imagen animada",
-            "image_previews_tooltip": "Generar también vistas previas animadas (webp), solo requeridas cuando el tipo de vista previa de la pared de escenas/marcadores está configurado como imagen animada. Al navegar, utilizan menos CPU que las vistas previas de video, pero se generan además de ellas y son archivos más grandes.",
+            "image_previews_tooltip": "Generar también vistas previas animadas (webp), solo requeridas cuando el tipo de vista previa del Muro de Escenas/Marcadores está configurado como imagen animada. Al navegar, utilizan menos CPU que las vistas previas de video, pero se generan además de ellas y son archivos más grandes.",
             "interactive_heatmap_speed": "Generar mapas de calor y velocidades para escenas interactivas",
             "marker_image_previews": "Vistas previas de marcadores en formato de imagen animada",
-            "marker_image_previews_tooltip": "Generar también vistas previas animadas (webp), solo requeridas cuando el tipo de vista previa de la pared de escenas/marcadores está configurado como Imagen Animada. Al navegar, consumen menos CPU que las vistas previas de video, pero se generan además de ellas y son archivos más grandes.",
+            "marker_image_previews_tooltip": "Generar también vistas previas animadas (webp), solo requeridas cuando el tipo de vista previa del Muro de Escena/Marcador está configurado como Imagen Animada. Al navegar, consumen menos CPU que las vistas previas de video, pero se generan además de ellas y son archivos más grandes.",
             "marker_screenshots": "Capturas de pantalla de marcadores",
             "marker_screenshots_tooltip": "Imágenes estáticas JPG de marcadores",
             "markers": "Vistas previas de marcadores",
@@ -932,7 +986,7 @@
             "override_preview_generation_options": "Sobrescribir opciones para la generación de vistas previas",
             "override_preview_generation_options_desc": "Sobrescribir opciones de generación de vistas previas para esta operación. Las opciones por defecto se configuran en Sistema -> Generación de vistas previas.",
             "overwrite": "Sobreescribir archivos generados ya existentes",
-            "phash": "Hashes perceptuales",
+            "phash": "Hashes de video perceptuales",
             "preview_exclude_end_time_desc": "Excluir los últimos X segundos de la vista previa de la escena. Puede ser un valor en segundos o un porcentaje (p.ej. 2%) de la duración total de la escena.",
             "preview_exclude_end_time_head": "Excluir desde el final del vídeo",
             "preview_exclude_start_time_desc": "Excluir los primeros X segundos de la vista previa de la escena. Puede ser un valor en segundos o un porcentaje (p.ej. 2%) de la duración total de la escena.",
@@ -954,7 +1008,9 @@
             "clip_previews": "Vistas previas de clips de imagen",
             "covers": "Imagen de la escena",
             "image_thumbnails": "Miniaturas de imágenes",
-            "phash_tooltip": "Para la búsqueda de duplicados e identificación de escenas"
+            "phash_tooltip": "Para la búsqueda de duplicados e identificación de escenas",
+            "image_phash": "Hashes perceptuales de imágenes",
+            "image_phash_tooltip": "Para la deduplicación y la identificación"
         },
         "scenes_found": "{count} escenas encontradas",
         "scrape_entity_query": "Consulta de rastreo de {entity_type}",
@@ -992,7 +1048,9 @@
         "delete_alert_to_trash": "Los siguientes {count, plural, one {{singularEntity}} other {{pluralEntity}}} se moverán a la papelera:",
         "stashid_exists_warning": "Se sustituirá el identificador de stash existente para este stash-box.",
         "studios_found": "{count} estudios encontrados",
-        "tags_found": "{count} etiquetas encontradas"
+        "tags_found": "{count} etiquetas encontradas",
+        "scrape_results_missing": "Faltante",
+        "edit_entity_count_title": "Editar {count} {count, plural, una {{singularEntity}} otra {{pluralEntity}}}"
     },
     "dimensions": "Dimensiones",
     "director": "Director",
@@ -1093,7 +1151,7 @@
     "hasMarkers": "Marcadores",
     "height": "Estatura",
     "help": "Ayuda",
-    "ignore_auto_tag": "Ignorar Etiquetado Automático",
+    "ignore_auto_tag": "Ignorar etiquetado automático",
     "image": "Imagen",
     "image_count": "Número de imágenes",
     "images": "Imágenes",
@@ -1114,9 +1172,7 @@
     "measurements": "Medidas",
     "media_info": {
         "audio_codec": "Códec de audio",
-        "checksum": "Suma de verificación (checksum)",
         "downloaded_from": "Descargado de",
-        "hash": "Hash",
         "interactive_speed": "Velocidad interactiva",
         "performer_card": {
             "age": "{age} {years_old}",
@@ -1127,7 +1183,11 @@
         "video_codec": "Códec de vídeo",
         "play_count": "Contador de reproducciones",
         "play_duration": "Tiempo de reproducción",
-        "o_count": "Contador de orgasmos"
+        "o_count": "Contador de orgasmos",
+        "md5": "Suma de comprobación MD5",
+        "oshash": "oshash",
+        "oshash_meaning": "Hash de OpenSubtitles",
+        "phash_meaning": "Hash perceptual"
     },
     "megabits_per_second": "{value} megabits por segundo (mbps)",
     "metadata": "Metadatos",
@@ -1160,14 +1220,6 @@
         "any_names_entered_will_be_queried": "Cualquier nombre introducido será consultado desde una instancia Stash-Box remota y añadido si es encontrado. Solo se aceptan coincidencias exactas.",
         "batch_add_performers": "Adición automatizada de actrices/actores",
         "batch_update_performers": "Actualización automatizada de actrices/actores",
-        "config": {
-            "active_stash-box_instance": "Instancia Stash-Box activa:",
-            "edit_excluded_fields": "Editar campos excluidos",
-            "excluded_fields": "Campos excluidos:",
-            "no_fields_are_excluded": "No hay campos excluidos",
-            "no_instances_found": "No se han encontrado instancias",
-            "these_fields_will_not_be_changed_when_updating_performers": "Estos campos permanecerán inalterados al actualizar actrices/actores."
-        },
         "current_page": "Página actual",
         "failed_to_save_performer": "Error al guardar \"{performer}\"",
         "name_already_exists": "El nombre ya existe",
@@ -1329,7 +1381,8 @@
         "total_play_count": "Contador total de reproducciones",
         "total_o_count": "Total de orgasmos",
         "total_play_duration": "Tiempo total de reproducciones",
-        "scenes_played": "Escenas reproducidas"
+        "scenes_played": "Escenas reproducidas",
+        "total_o_count_sfw": "Total de «Me gusta»"
     },
     "status": "Estado: {statusText}",
     "studio": "Estudio",
@@ -1362,7 +1415,11 @@
         "image_index_too_large": "Error: El índice de imagen es mayor que el número de imágenes en la galería",
         "removed_entity": "Eliminado {count, plural, one {{singularEntity}} other {{pluralEntity}}}",
         "reassign_past_tense": "Archivo reasignado",
-        "merged_scenes": "Escenas fusionadas"
+        "merged_scenes": "Escenas fusionadas",
+        "merged_performers": "Actores fusionados",
+        "clipboard_access_denied": "Acceso al portapapeles denegado. Comprueba los permisos de tu navegador",
+        "clipboard_image_pasted": "Imagen pegada desde el portapapeles",
+        "clipboard_no_image": "No se ha encontrado ninguna imagen en el portapapeles"
     },
     "total": "Total",
     "true": "Sí",
@@ -1455,14 +1512,8 @@
         "any_names_entered_will_be_queried": "Cualquier nombre ingresado será consultado desde la instancia remota de Stash-Box y se agregará si se encuentra. Solo se considerarán coincidencias exactas como una coincidencia.",
         "batch_add_studios": "Agregar estudios en lote",
         "config": {
-            "active_stash-box_instance": "Activar instancia stash-box:",
             "create_parent_desc": "Crear estudios padres faltantes, o etiquetar y actualizar datos/imagen para estudios padres existentes con coincidencias exactas de nombre",
-            "create_parent_label": "Crear estudios principales",
-            "edit_excluded_fields": "Editar campos excluidos",
-            "no_fields_are_excluded": "Ningún campo ha sido excluido",
-            "no_instances_found": "No se han encontrado instancias",
-            "excluded_fields": "Campos excluidos:",
-            "these_fields_will_not_be_changed_when_updating_studios": "Estos campos no serán cambiados cuando se actualicen estudios."
+            "create_parent_label": "Crear estudios principales"
         },
         "number_of_studios_will_be_processed": "{studio_count} estudios serán procesados",
         "refreshing_will_update_the_data": "Recargar actualizará los datos de cualquier estudio etiquetado desde la instancia de stash-box.",
@@ -1519,7 +1570,7 @@
     "second": "Segundo",
     "validation": {
         "blank": "${path} no puede estar vacío",
-        "date_invalid_form": "${path} debe estar en formato AAAA, AAAA-MM o AAAA-MM-DD.",
+        "date_invalid_form": "${path} debe estar en formato AAAA, AAAA-MM o AAAA-MM-DD",
         "required": "${path} es un campo requerido",
         "unique": "${path} tiene que ser único",
         "end_time_before_start_time": "El tiempo de finalización debe ser mayor o igual que el tiempo de inicio"
@@ -1533,7 +1584,7 @@
     "urls": "URLs",
     "zip_file_count": "Números de archivos zip",
     "unknown_date": "Fecha desconocida",
-    "stash_id_endpoint": "Punto final de identificador (ID) de Stash",
+    "stash_id_endpoint": "URL del punto final de identificador (ID) de Stash",
     "studio_and_parent": "Estudio y ancestro",
     "group": "Grupo",
     "group_count": "Recuento de grupos",
@@ -1587,5 +1638,59 @@
         "no_results": "No se han encontrado resultados.",
         "placeholder_name_or_id": "Nombre de {entityType} o StashID...",
         "select_stashbox": "Seleccionar StashBox..."
-    }
+    },
+    "latest_scene": "Última escena",
+    "stash_id_count": "Recuento de ID de Stash",
+    "duplicated": "Duplicado",
+    "duplicated_stash_id": "Duplicado (ID de Stash)",
+    "duplicated_title": "Duplicado (Título)",
+    "career_end": "Fin de la carrera",
+    "career_start": "Inicio de la carrera",
+    "tag_tagger": {
+        "add_new_tags": "Añadir nuevas etiquetas",
+        "any_names_entered_will_be_queried": "Cualquier nombre introducido se consultará en la instancia remota de Stash-Box y se añadirá si se encuentra. Solo se considerarán coincidencias las coincidencias exactas.",
+        "batch_add_tags": "Añadir etiquetas por lotes",
+        "batch_update_tags": "Actualización por lotes de etiquetas",
+        "current_page": "Página actual",
+        "failed_to_save_tag": "No se pudo guardar la etiqueta «{tag}»",
+        "name_already_exists": "El nombre ya existe",
+        "network_error": "Error de red",
+        "no_results_found": "No se han encontrado resultados.",
+        "number_of_tags_will_be_processed": "Se procesarán {tag_count} etiquetas",
+        "query_all_tags_in_the_database": "Todas las etiquetas de la base de datos",
+        "refresh_tagged_tags": "Actualizar etiquetas etiquetadas",
+        "refreshing_will_update_the_data": "Al actualizar se actualizarán los datos de cualquier etiqueta etiquetada de la instancia stash-box.",
+        "status_tagging_job_queued": "Estado: Trabajo de etiquetado en cola",
+        "status_tagging_tags": "Estado: Etiquetado de etiquetas",
+        "tag_already_tagged": "Etiqueta ya etiquetada",
+        "tag_names_or_stashids_separated_by_comma": "Nombres de etiquetas o StashID separados por comas",
+        "tag_selection": "Selección de etiquetas",
+        "tag_successfully_tagged": "Etiqueta etiquetada correctamente",
+        "tag_status": "Estado de la etiqueta",
+        "to_use_the_tag_tagger": "Para utilizar el etiquetador, es necesario configurar una instancia de stash-box.",
+        "untagged_tags": "Etiquetas sin etiquetar",
+        "update_tags": "Actualizar etiquetas",
+        "updating_untagged_tags_description": "Al actualizar las etiquetas sin etiquetar, se intentará encontrar cualquier etiqueta que carezca de un stashid y se actualizarán los metadatos.",
+        "config": {
+            "create_parent_desc": "Crear etiquetas principales que falten a partir de las categorías de stash-box, o etiquetar las etiquetas principales existentes con nombres que coincidan exactamente",
+            "create_parent_label": "Crear etiquetas principales"
+        },
+        "create_or_tag_parent_tags": "Crear las etiquetas principales que falten o etiquetar las ya existentes"
+    },
+    "tagger": {
+        "config": {
+            "active_stash-box_instance": "Instancia activa del almacén oculto:",
+            "edit_excluded_fields": "Editar campos excluidos",
+            "excluded_fields": "Campos excluidos:",
+            "fields_will_not_be_changed": "Estos campos no se modificarán al actualizar {entity}.",
+            "no_fields_are_excluded": "No se excluye ningún campo",
+            "no_instances_found": "No se han encontrado instancias"
+        }
+    },
+    "unsupported_criteria": "Criterios no admitidos: {criteria}",
+    "include_sub_folders": "Incluir subcarpetas",
+    "parent_folder": "Carpeta principal",
+    "sub_folder_depth": "Profundidad de la subcarpeta (vacía para todas)",
+    "sub_folders": "Subcarpetas",
+    "empty_value": "vacío"
 }
diff --git a/ui/v2.5/src/locales/et-EE.json b/ui/v2.5/src/locales/et-EE.json
index a250674a2..0e6431cd5 100644
--- a/ui/v2.5/src/locales/et-EE.json
+++ b/ui/v2.5/src/locales/et-EE.json
@@ -1,14 +1,14 @@
 {
     "actions": {
         "add": "Lisa",
-        "add_directory": "Lisa Kaust",
+        "add_directory": "Lisa kaust",
         "add_entity": "Lisa {entityType}",
         "add_to_entity": "Lisa {entityType}-sse",
         "allow": "Luba",
         "allow_temporarily": "Luba ajutiselt",
         "anonymise": "Anonüümseks Muutmine",
         "apply": "Rakenda",
-        "auto_tag": "Märgi Automaatselt",
+        "auto_tag": "Märgi automaatselt",
         "backup": "Varunda",
         "browse_for_image": "Otsi pilti…",
         "cancel": "Tühista",
@@ -43,12 +43,12 @@
         "finish": "Lõpeta",
         "from_file": "Failist…",
         "from_url": "URL-ilt…",
-        "full_export": "Täielik Eksportimine",
-        "full_import": "Täielik Importimine",
+        "full_export": "Täielik eksportimine",
+        "full_import": "Täielik importimine",
         "generate": "Genereeri",
         "generate_thumb_default": "Genereri vaikepisipilt",
         "generate_thumb_from_current": "Genereeri pisipilt praegusest",
-        "hash_migration": "hashi migratsioon",
+        "hash_migration": "räsi migratsioon",
         "hide": "Peida",
         "hide_configuration": "Peida Seadistus",
         "identify": "Tuvasta",
@@ -58,10 +58,8 @@
         "logout": "Logi välja",
         "make_primary": "Määra Peamiseks",
         "merge": "Liida",
-        "merge_from": "Liida teisest",
-        "merge_into": "Liida teise",
-        "migrate_blobs": "Migreeri Blobid",
-        "migrate_scene_screenshots": "Migreeri Stseenide Ekraanipildid",
+        "migrate_blobs": "Migreeri blobid",
+        "migrate_scene_screenshots": "Migreeri stseenide ekraanipildid",
         "next_action": "Järgmine",
         "not_running": "ei jookse",
         "open_in_external_player": "Ava välises mängijas",
@@ -94,9 +92,9 @@
         "select_entity": "Vali {entityType}",
         "select_folders": "Vali kaustad",
         "select_none": "Vali Mitte Midagi",
-        "selective_auto_tag": "Valikuline Automaatne Märkija",
-        "selective_clean": "Valikuline Puhastus",
-        "selective_scan": "Valikuline Skaneerimine",
+        "selective_auto_tag": "Valikuline automaatne märkija",
+        "selective_clean": "Valikuline puhastus",
+        "selective_scan": "Valikuline skaneerimine",
         "set_as_default": "Määra vaikeväärtuseks",
         "set_back_image": "Tagapilt…",
         "set_front_image": "Esipilt…",
@@ -126,7 +124,7 @@
         "assign_stashid_to_parent_studio": "Määra eksisteerivale vanemstuudiole Stash ID ja uuenda metaandmeid",
         "create_parent_studio": "Loo vanemstuudio",
         "encoding_image": "Pildi kodeerimine…",
-        "optimise_database": "Optimiseeri Andmebaasi",
+        "optimise_database": "Optimiseeri andmebaasi",
         "clean_generated": "Puhasta genereeritud faile",
         "choose_date": "Vali kuupäev",
         "copy_to_clipboard": "Kopeeri lõikelauale",
@@ -153,7 +151,15 @@
         "load": "Lae",
         "load_filter": "Lae filter",
         "add_stash_id": "Lisa Stash ID",
-        "create_new": "Loo uus"
+        "create_new": "Loo uus",
+        "save_and_new": "Salvesta & Uus",
+        "invert_selection": "Inverteeri Valik",
+        "reveal_in_file_manager": "Kuva Failihalduris",
+        "select_directory": "Vali kaust",
+        "exclude_lowercase": "välista",
+        "from_clipboard": "Lõikelaualt",
+        "selective_generate": "Valiv genereerimine",
+        "create_parent_tag": "Loo vanemsilt"
     },
     "actions_name": "Tegevused",
     "age": "Vanus",
@@ -227,15 +233,16 @@
         "verb_toggle_unmatched": "{toggle} kokkusobitamata stseenid",
         "verb_add_as_alias": "Lisa nimi alisena",
         "verb_link_existing": "Ühenda eksisteerivaga",
-        "verb_match_tag": "Sobita Silt"
+        "verb_match_tag": "Sobita Silt",
+        "verb_scrape_selected": "Otsi Valitute Metaandmeid"
     },
     "config": {
         "about": {
-            "build_hash": "Ehituse hash:",
+            "build_hash": "Ehituse räsi:",
             "build_time": "Ehituse aeg:",
             "check_for_new_version": "Kontrolli värskendusi",
             "latest_version": "Uusim Versioon",
-            "latest_version_build_hash": "Uusima Versiooni Ehituse Hash:",
+            "latest_version_build_hash": "Uusima Versiooni Ehituse Räsi:",
             "new_version_notice": "[UUS]",
             "release_date": "Väljalaskekuupäev:",
             "stash_discord": "Liitu meie {url}i kanaliga",
@@ -265,7 +272,7 @@
             "allow_temp_ip": "Luba {tempIP}",
             "allowed_ip_addresses": "Lubatud IP aadressid",
             "allowed_ip_temporarily": "Lubatud IP ajutiselt",
-            "default_ip_whitelist": "Vaikimisi IP Valge Nimekiri",
+            "default_ip_whitelist": "Vaikimisi IP valge nimekiri",
             "default_ip_whitelist_desc": "Vaikimisi IP aadressid lubavad DLNA ligipääsu. Kasuta {wildcard}, et lubada kõiki IP aadresse.",
             "disabled_dlna_temporarily": "DLNA ajutiselt keelatud",
             "disallowed_ip": "Keelatud IP",
@@ -274,33 +281,33 @@
             "network_interfaces": "Kasutajaliidesed",
             "network_interfaces_desc": "Kasutajaliidesed DLNA serveri paljastamiseks. Tühi nimekiri lubab jooksutamist kõigil kasutajaliidestel. Vajalik DLNA taaskäivitus peale muutmist.",
             "recent_ip_addresses": "Hiljutised IP aadressid",
-            "server_display_name": "Serveri Nimi",
+            "server_display_name": "Serveri kuvanimi",
             "server_display_name_desc": "DLNA server nimi. Vaikimisi {server_name}, kui midagi pole sisestatud.",
             "successfully_cancelled_temporary_behaviour": "Edukalt tühistatud ajutine käitumine",
             "until_restart": "restardini",
-            "video_sort_order": "Videote Sorteerimise Vaikeväärtus",
+            "video_sort_order": "Videote sorteerimise vaikeväärtus",
             "video_sort_order_desc": "Viis, kuidas vaikimisi videoid sorteerida.",
             "server_port": "Serveri port",
             "server_port_desc": "Port DLNA serveri jaoks. Vajab peale muutmist DLNA taaskäivitust."
         },
         "general": {
             "auth": {
-                "api_key": "API Võti",
+                "api_key": "API võti",
                 "api_key_desc": "API võti välistele süsteemidele. Nõutud ainult siis, kui kasutajanimi/parool on sätitud. Kasutajanimi peab olema salvestatud enne API võtme genereerimist.",
                 "authentication": "Autentimine",
                 "clear_api_key": "Puhasta API võti",
                 "credentials": {
-                    "description": "Mandaat Stashile ligipääsu piiramiseks.",
+                    "description": "Mandaat stashile ligipääsu piiramiseks.",
                     "heading": "Mandaat"
                 },
                 "generate_api_key": "Genereeri API võti",
                 "log_file": "Logi fail",
                 "log_file_desc": "Failitee failini, kuhu logid sisestada. Jäta tühjaks, kui soovid logide salvestamise välja lülitada. Vajab taaskäivitust.",
-                "log_http": "Logi http ligipääs",
-                "log_http_desc": "Avaldab http ligipääsu logid terminali. Vajab taaskäivitust.",
+                "log_http": "Logi HTTP ligipääs",
+                "log_http_desc": "Avaldab HTTP ligipääsu logid terminali. Vajab taaskäivitust.",
                 "log_to_terminal": "Logi terminali",
                 "log_to_terminal_desc": "Avaldab logid lisaks failile ka terminalis. Alati sisselülitatud, kui logimine faili on keelatud. Vajab taaskäivitust.",
-                "maximum_session_age": "Maksimaalne Sessiooni Vanus",
+                "maximum_session_age": "Maksimaalne sessiooni vanus",
                 "maximum_session_age_desc": "Maksimaalne paigalseisuaeg enne, kui sessioon aegub, sekundites. Vajab taaskäivitust.",
                 "password": "Parool",
                 "password_desc": "Parool Stashi pääsemiseks. Jäta tühjaks, kui soovid sisselogimise keelata",
@@ -311,34 +318,34 @@
                 "log_file_max_size_desc": "Maksimaalne logifaili suurus megabaitides enne tihendamist. 0MB on väljalülitatud. Nõuab taaskäivitust."
             },
             "backup_directory_path": {
-                "description": "Failitee SQLite andmebaasi varundusfailide jaoks",
-                "heading": "Varunduse Failitee"
+                "description": "Failitee SQLite andmebaasi varundusfailide jaoks.",
+                "heading": "Varunduse failitee"
             },
             "blobs_path": {
                 "description": "Kus kohas hoida binaarseid andmeid failisüsteemis. Kehtib ainult kui kasutad Failisüsteem blob salvestustüüpi. HOIATUS: selle muutmine nõuab olemasolevate andmete manuaalset liigutamist.",
                 "heading": "Binaarseete andmete failisüsteemi tee"
             },
             "blobs_storage": {
-                "description": "Kus hoida binaarseid andmeid nagu stseeni kaanepildid, näitlejate, stuudiote ja siltide pilte. Peale selle väärtuse muutmist tuleb olemasolevad andmed migreerida kasutades Migreeri Blobe ülesannet. Vaata Ülesannete lehele migreerimiseks.",
+                "description": "Kus hoida binaarseid andmeid nagu stseeni kaanepildid, näitlejate, stuudiote ja siltide pilte. Peale selle väärtuse muutmist tuleb olemasolevad andmed migreerida kasutades Migreeri blobe ülesannet. Vaata Ülesannete lehele migreerimiseks.",
                 "heading": "Binaarsete andmete hoiustamistüüp"
             },
             "cache_location": "Failitee vahemäluni. Nõutud kui striimimiseks kasutatakse HLSi (näiteks Apple seadetel) või DASHi.",
-            "cache_path_head": "Vahemälu Failitee",
-            "calculate_md5_and_ohash_desc": "Kalkuleeri MD5 checksum lisaks oshashile. Lubamine põhjustab aeglasemat esmast skaneerimist. Faili nimetuse hash peab olema sätitud oshashiks, et keelata MD5 kalkuleerimine.",
+            "cache_path_head": "Vahemälu failitee",
+            "calculate_md5_and_ohash_desc": "Kalkuleeri MD5 checksum lisaks oshashile. Lubamine põhjustab aeglasemat esmast skaneerimist. Faili nimetuse räsi peab olema sätitud oshashiks, et keelata MD5 kalkuleerimine.",
             "calculate_md5_and_ohash_label": "Kalkuleeri MD5 videote jaoks",
             "check_for_insecure_certificates": "Otsi ebaturvalisi sertifikaate",
-            "check_for_insecure_certificates_desc": "Mõned lehed kasutavad ebaturvalisi ssl sertifikaate. Kui märkimata, kraapija jätab sertifikaadi kontrollimise vahele ning võimaldab nendelt lehtedelt andmeid kraapida. Kui kraapimise ajal esineb sertifikaadivigu, eemalda linnuke.",
+            "check_for_insecure_certificates_desc": "Mõned lehed kasutavad ebaturvalisi SSL sertifikaate. Kui märkimata, kraapija jätab sertifikaadi kontrollimise vahele ning võimaldab nendelt lehtedelt andmeid kraapida. Kui kraapimise ajal esineb sertifikaadivigu, eemalda linnuke.",
             "chrome_cdp_path": "Chrome CDP tee",
             "chrome_cdp_path_desc": "Failitee Chrome käivitajani, või kaugaadress (algab http:// või https:// -iga, näiteks http://localhost:9222/json/version) Chrome'i eksemplarini.",
-            "create_galleries_from_folders_desc": "Kui lubatud, loob vaikeväärtusena galeriisid pilte sisaldavatest kaustadest. Loo kasutas fail nimega .forcegallery või .nogallery, et seda sundida või sellest hoiduda.",
+            "create_galleries_from_folders_desc": "Kui lubatud, loob vaikeväärtusena galeriisid pilte sisaldavatest kaustadest. Loo kasutas fail nimega .forcegallery või .nogallery, et seda seadet üle kirjutada.",
             "create_galleries_from_folders_label": "Loo galeriisid kaustadest, mis sisaldavad pilte",
             "database": "Andmebaas",
-            "db_path_head": "Andmebaasi Failitee",
+            "db_path_head": "Andmebaasi failitee",
             "directory_locations_to_your_content": "Failitee asukohad sisule",
-            "excluded_image_gallery_patterns_desc": "Pildi- ja galeriifailide/teede regexpid, mida skannimisest välja jätta ja Clean'i lisada",
-            "excluded_image_gallery_patterns_head": "Välistatud Pildi/Galerii Mustrid",
-            "excluded_video_patterns_desc": "Videofailide/teede regexpid, mida skannimisest välja jätta ja Clean'i lisada",
-            "excluded_video_patterns_head": "Välistatud Video Mustrid",
+            "excluded_image_gallery_patterns_desc": "Pildi- ja galeriifailide/teede regexpid, mida skannimisest välja jätta ja Clean'i ülesannetesse lisada.",
+            "excluded_image_gallery_patterns_head": "Välistatud pildi/galerii mustrid",
+            "excluded_video_patterns_desc": "Videofailide/teede regexpid, mida skannimisest välja jätta ja Clean'i ülesannetesse lisada.",
+            "excluded_video_patterns_head": "Välistatud video mustrid",
             "ffmpeg": {
                 "hardware_acceleration": {
                     "desc": "Kasutab olemasolevat riistvara reaalajas video transkodeerimiseks.",
@@ -347,30 +354,30 @@
                 "live_transcode": {
                     "input_args": {
                         "desc": "Edasijõudnutele: Lisaargumendid mida edastada ffmpegi sisendväljale live video transkodeerimise ajal.",
-                        "heading": "FFmpeg Live Transkodeerimise Sisendargumendid"
+                        "heading": "FFmpeg live transkodeerimise sisendargumendid"
                     },
                     "output_args": {
                         "desc": "Edasijõudnutele: Lisaargumendid mida edastada ffmpegi väljundväljale live video transkodeerimise ajal.",
-                        "heading": "FFmpeg Live Transkodeerimise Väljundargumendid"
+                        "heading": "FFmpeg live transkodeerimise väljundargumendid"
                     }
                 },
                 "transcode": {
                     "input_args": {
                         "desc": "Edasijõudnutele: Lisaargumendid mida edastada ffmpegi sisendväljale video genereerimisel.",
-                        "heading": "FFmpeg Transkodeerimise Sisendargumendid"
+                        "heading": "FFmpeg transkodeerimise sisendargumendid"
                     },
                     "output_args": {
                         "desc": "Edasijõudnutele: Lisaargumendid mida edastada ffmpegi väljundväljale video genereerimisel.",
-                        "heading": "FFmpeg Transkodeerimise Väljundargumendid"
+                        "heading": "FFmpeg transkodeerimise väljundargumendid"
                     }
                 },
                 "ffprobe_path": {
-                    "heading": "FFprobe Käivitava Faili Tee",
-                    "description": "ffprobe käivitatava faili tee (mitte ainult kaust). Kui see on tühi, lahendatakse ffprobe keskkonnast $PATHi, konfiguratsioonikataloogi või $HOME/.stash kaudu"
+                    "heading": "FFprobe käivitava faili tee",
+                    "description": "ffprobe käivitatava faili tee (mitte ainult kaust). Kui see on tühi, lahendatakse ffprobe keskkonnast $PATHi, konfiguratsioonikataloogi või $HOME/.stash kaudu."
                 },
                 "ffmpeg_path": {
-                    "heading": "FFmpegi Käivitava Faili Tee",
-                    "description": "ffmpegi käivitatava faili tee (mitte ainult kaust). Kui see on tühi, lahendatakse ffmpeg keskkonnast $PATHi, konfiguratsioonikataloogi või $HOME/.stash kaudu"
+                    "heading": "FFmpegi käivitava faili tee",
+                    "description": "ffmpegi käivitatava faili tee (mitte ainult kaust). Kui see on tühi, lahendatakse ffmpeg keskkonnast $PATHi, konfiguratsioonikataloogi või $HOME/.stash kaudu."
                 },
                 "download_ffmpeg": {
                     "description": "Laadib FFmpegi alla konfiguratsioonikataloogi ja tühjendab ffmpegi ja ffprobe'i teed konfiguratsioonikataloogist lahendamiseks.",
@@ -379,42 +386,42 @@
             },
             "funscript_heatmap_draw_range": "Kaasa vahemik genereeritud kuumkaartidel",
             "funscript_heatmap_draw_range_desc": "Joonista liikumisvahemik genereeritud kuumkaardi y-teljel. Olemasolevad kuumkaardid tuleb peale muutmist uuesti genereerida.",
-            "gallery_cover_regex_desc": "Regexp kasutakse, et tuvastada pilti kui galerii kaanepildina",
+            "gallery_cover_regex_desc": "Regexpte kasutakse, et tuvastada pilti kui galerii kaanepildina.",
             "gallery_cover_regex_label": "Galerii kaanepildi muster",
             "gallery_ext_desc": "Komadega eraldatud faililaiendite loend, mis tuvastatakse galerii ZIP-failidena.",
-            "gallery_ext_head": "Galerii zip Laiendused",
+            "gallery_ext_head": "Galerii ZIP laiendused",
             "generated_file_naming_hash_desc": "Kasutage failide nimetamiseks MD5 või oshashi. Selle muutmiseks on vaja, et kõikides stseenides oleks kohaldatav MD5/oshash väärtus täidetud. Pärast selle väärtuse muutmist tuleb olemasolevad loodud failid migreerida või uuesti genereerida. Vaadake üleviimise kohta lehekülge Ülesanded.",
-            "generated_file_naming_hash_head": "Genereeritud faili nimetamise hash",
-            "generated_files_location": "Loodud failide (stseenimarkerid, stseeni eelvaated, spraidid jne) asukoht Failiteel",
-            "generated_path_head": "Genereeritud Failitee",
-            "hashing": "Hashimine",
+            "generated_file_naming_hash_head": "Genereeritud faili nimetamise räsi",
+            "generated_files_location": "Loodud failide (stseenimarkerid, stseeni eelvaated, spraidid jne) asukoht failiteel.",
+            "generated_path_head": "Genereeritud failitee",
+            "hashing": "Räsimine",
             "heatmap_generation": "Funscripti Kuumkaardi Genereerimine",
             "image_ext_desc": "Komadega eraldatud faililaiendite loend, mis tuvastatakse piltidena.",
             "image_ext_head": "Pildilaiendused",
             "include_audio_desc": "Kaasa eelvaadete loomisel helivoog.",
             "include_audio_head": "Kaasa heli",
             "logging": "Logimine",
-            "maximum_streaming_transcode_size_desc": "Transkodeeritud voogude maksimaalne suurus",
+            "maximum_streaming_transcode_size_desc": "Transkodeeritud voogude maksimaalne suurus.",
             "maximum_streaming_transcode_size_head": "Maksimaalne voogesituse ümberkodeerimise suurus",
-            "maximum_transcode_size_desc": "Loodud ümberkoodimiste maksimaalne suurus",
+            "maximum_transcode_size_desc": "Loodud ümberkoodimiste maksimaalne suurus.",
             "maximum_transcode_size_head": "Maksimaalne ümberkodeerimise suurus",
             "metadata_path": {
-                "description": "Kataloogi asukoht, mida kasutatakse täieliku ekspordi või impordi teostamisel",
-                "heading": "Metaandmete Failitee"
+                "description": "Kataloogi asukoht, mida kasutatakse täieliku ekspordi või impordi teostamisel.",
+                "heading": "Metaandmete failitee"
             },
-            "number_of_parallel_task_for_scan_generation_desc": "Automaatse tuvastamise jaoks määra 0. Hoiatus, kui tehakse rohkem toiminguid, kui on vaja 100% protsessori kasutuse saavutamiseks, väheneb jõudlus ja võib esineda muid probleeme.",
+            "number_of_parallel_task_for_scan_generation_desc": "Automaatse tuvastamise jaoks määra 0. Hoiatus: kui tehakse rohkem toiminguid, kui on vaja 100% CPU kasutuse saavutamiseks, väheneb jõudlus ja võib esineda muid probleeme.",
             "number_of_parallel_task_for_scan_generation_head": "Paralleelsete skaneerimise/genereerimise ülesannete arv",
             "parallel_scan_head": "Paralleelne Skaneerimine/Generatsioon",
             "preview_generation": "Eelvaate Genereerimine",
             "python_path": {
-                "description": "Pythoni käivitataja faili tee (mitte ainult kaust). Kasutatakse skriptipõhiste kraapijate ja pluginate jaoks. Kui see on tühi, lahendatakse python keskkonnast",
-                "heading": "Pythoni Käivitaja Tee"
+                "description": "Pythoni käivitataja faili tee (mitte ainult kaust). Kasutatakse skriptipõhiste kraapijate ja pluginate jaoks. Kui see on tühi, lahendatakse Python keskkonnast.",
+                "heading": "Pythoni käivitaja failitee"
             },
-            "scraper_user_agent": "Kraapija Kasutajaagent",
-            "scraper_user_agent_desc": "Kasutajaagendi string, mida kasutatakse kraapimise HTTP-päringute käigus",
+            "scraper_user_agent": "Kraapija Kasutaja-Agent",
+            "scraper_user_agent_desc": "Kasutajaagendi string, mida kasutatakse kraapimise HTTP-päringute käigus.",
             "scrapers_path": {
-                "description": "Failitee kraapijate sättefailide jaoks",
-                "heading": "Kraapijate Failitee"
+                "description": "Failitee kraapijate sättefailide jaoks.",
+                "heading": "Kraapijate failitee"
             },
             "scraping": "Kraapimine",
             "sqlite_location": "Failitee asukoht SQLite andmebaasi jaoks (vajab taaskäivitust). HOIATUS: andmebaasi kasutamine, mis ei jookse samal süsteemil, kui Stash (nt üle võrgu) ei ole toetatud!",
@@ -422,18 +429,29 @@
             "video_ext_head": "Videolaiendused",
             "video_head": "Video",
             "plugins_path": {
-                "description": "Plugina konfiguratsioonifailide asukoht kataloogis",
-                "heading": "Pluginate Tee"
+                "description": "Plugina konfiguratsioonifailide asukoht kataloogis.",
+                "heading": "Pluginate failitee"
             },
             "delete_trash_path": {
                 "description": "Tee, kuhu liigutatakse kustutatud failide lõpliku kustutamise asemel. Jäta tühjaks, et alati faile lõplikult kustutada.",
-                "heading": "Prügi Tee"
-            }
+                "heading": "Prügi failitee"
+            },
+            "sprite_generation_head": "Spraitide Genereerimine",
+            "sprite_interval_desc": "Iga genereeritud spraidi vaheline aeg sekundites.",
+            "sprite_interval_head": "Spraitide intervall",
+            "sprite_maximum_desc": "Stseeni jaoks genereeritavate spraitide maksimaalne arv. Piirangu keelamiseks määrake väärtuseks 0.",
+            "sprite_maximum_head": "Maksimaalne spraitide arv",
+            "sprite_minimum_desc": "Stseeni jaoks genereeritavate spraitide minimaalne arv",
+            "sprite_minimum_head": "Minimaalne spraitide arv",
+            "sprite_screenshot_size_desc": "Iga spraidi soovitud suurus pikslites.",
+            "sprite_screenshot_size_head": "Spraidi suurus",
+            "use_custom_sprite_interval_head": "Kasuta kohandatud spraitide intervalli",
+            "use_custom_sprite_interval_desc": "Luba kohandatud spraitide intervall vastavalt allolevatele sätetele."
         },
         "library": {
             "exclusions": "Välistused",
-            "gallery_and_image_options": "Galerii ja Piltide sätted",
-            "media_content_extensions": "Media sisu laiendused"
+            "gallery_and_image_options": "Galerii ja Piltide Sätted",
+            "media_content_extensions": "Mediasisu Laiendused"
         },
         "logs": {
             "log_level": "Logimise tase"
@@ -447,8 +465,8 @@
         "scraping": {
             "entity_metadata": "{entityType} Metaandmed",
             "entity_scrapers": "{entityType} kraapijad",
-            "excluded_tag_patterns_desc": "Sildinimede regexpid, mida kraapise tulemustest välja jätta",
-            "excluded_tag_patterns_head": "Välistatud Siltide Mustrid",
+            "excluded_tag_patterns_desc": "Sildinimede regexpid, mida kraapise tulemustest välja jätta.",
+            "excluded_tag_patterns_head": "Välistatud siltide mustrid",
             "scraper": "Kraapija",
             "scrapers": "Kraapijad",
             "search_by_name": "Otsi nime järgi",
@@ -477,14 +495,13 @@
             "anonymise_database": "Loob andmebaasist tagavarakoopia tagavara koopiate kausta, muudab tundliku teabe anonüümseks. Seda saab jagada teistega abistamise ja probleemide analüüsimise eesmärgil. Originaalset andmebaasi ei muudeta. Anonüümne andmebaas kasutab failinime formaati {filename_format}.",
             "anonymising_database": "Muudan andmebaasi anonüümseks",
             "auto_tag": {
-                "auto_tagging_all_paths": "Automaatne Märkimine kõikidel failiteedel",
-                "auto_tagging_paths": "Automaatne Märkimine järgnevatel failiteedel"
+                "auto_tagging_all_paths": "Automaatne märkimine kõikidel failiteedel",
+                "auto_tagging_paths": "Automaatne märkimine järgnevatel failiteedel"
             },
-            "auto_tag_based_on_filenames": "Automaatselt märgi sisu vastavalt failinimedele.",
-            "auto_tagging": "Automaatne Märkimine",
+            "auto_tag_based_on_filenames": "Märgi sisu automaatselt vastavalt failinimedele.",
+            "auto_tagging": "Automaatne märkimine",
             "backing_up_database": "Andmebaasi varundamine",
             "backup_and_download": "Teeb andmebaasist varukoopia ja laadib saadud faili alla.",
-            "backup_database": "Varundab andmebaasi varundamise failiteele, failinimega vormingus {filename_format}",
             "cleanup_desc": "Kontrolli puuduvaid faile ja eemalda need andmebaasist. See on hävitav tegevus.",
             "data_management": "Andmehaldus",
             "defaults_set": "Vaikesätted on määratud ja neid kasutatakse, kui klõpsate lehel Ülesanded nupul {action}.",
@@ -496,10 +513,10 @@
                 "generating_scenes": "Genereerimine {num} {scene} jaoks"
             },
             "generate_desc": "Genereeri toetavad pildi-, sprite-, video-, vtt- ja muud failid.",
-            "generate_phashes_during_scan": "Genereeri nähtavaid hashe",
+            "generate_phashes_during_scan": "Videote tajutavate räsi genereerimine",
             "generate_phashes_during_scan_tooltip": "Duplikaatide eemaldamiseks ja stseenide tuvastamiseks.",
             "generate_previews_during_scan": "Genereeri animeeritud eelvaateid",
-            "generate_previews_during_scan_tooltip": "Genereeri ka animeeritud (webp) eelvaateid, nõutav ainult siis, kui Stseenide/Markeri Seinte eelvaate tüüp on seatud väärtusele Animeeritud Pilt. Sirvides kasutavad need vähem CPUd, kui video eelvaated, kuid need genereeritakse lisaks põhifailidele ja on suuremad.",
+            "generate_previews_during_scan_tooltip": "Genereeri ka animeeritud (webp) eelvaateid, nõutav ainult siis, kui Stseenide/Markeri Seinte eelvaate tüüp on seatud väärtusele Animeeritud pilt. Sirvides kasutavad need vähem CPUd, kui video eelvaated, kuid need genereeritakse lisaks põhifailidele ja on suuremad.",
             "generate_sprites_during_scan": "Genereeri puhastusspriite",
             "generate_thumbnails_during_scan": "Genereeri piltide jaoks pisipilte",
             "generate_video_covers_during_scan": "Genereeri stseeni kaanepidid",
@@ -532,7 +549,9 @@
                 "tag_skipped_performer_tooltip": "Loo märgend, nagu „Identifitseeri: Ühe Nimega Esineja”, mille saate stseenisildistaja vaates filtreerida, ja valida, kuidas soovite neid esinejaid käsitleda",
                 "tag_skipped_performers": "Märgista vahelejäetud esinejad",
                 "tag_skipped_matches": "Märgista vahelejäänud vasteid",
-                "tag_skipped_matches_tooltip": "Loo märgend, nagu „Identifitseeri: Mitu Vastet”, mida saate stseenisildistaja vaates filtreerida, ja valige käsitsi õige vaste"
+                "tag_skipped_matches_tooltip": "Loo märgend, nagu „Identifitseeri: Mitu Vastet”, mida saate stseenisildistaja vaates filtreerida, ja valige käsitsi õige vaste",
+                "performer_genders": "Näitlejate sood",
+                "performer_genders_desc": "Identifitseerimise käigus kaasatakse valitud sooga näitlejad."
             },
             "import_from_exported_json": "Impordi eksporditud JSON-ist metaandmete kataloogist. Kustutab olemasoleva andmebaasi.",
             "incremental_import": "Järkjärguline import esitatud eksporditud ZIP-failist.",
@@ -542,7 +561,7 @@
                 "delete_old": "Kustuta vanad andmed",
                 "description": "Migreeri blobid praegusele blobi andmesüsteemile. Seeda migratsiooni tuleb jooksutada peale blobi andmesalvestussüsteemi muutmist. Saab valikuliselt kustutada vanad andmed peale migratsiooni."
             },
-            "migrate_hash_files": "Kasutatakse pärast genereeritud faili nimetamise hashi muutmist olemasolevate loodud failide ümbernimetamiseks uuele hashivormingule.",
+            "migrate_hash_files": "Kasutatakse pärast Genereeritud faili nimetamise räsi muutmist olemasolevate loodud failide ümbernimetamiseks uuele räsi-vormingule.",
             "migrate_scene_screenshots": {
                 "delete_files": "Kustuta ekraanipiltide failid",
                 "description": "Migreeri stseeni ekranipildid uute blobi andmesüsteemi. Seda migratsuiooni peaks jooksutama peale olemasoleva süsteemi migreerimist 0.20le. Saab valikuselt kustutada vanu ekraanipilte peale migratsiooni.",
@@ -563,20 +582,33 @@
             "optimise_database_warning": "Hoiatus: selle ülesande täitmise ajal nurjuvad kõik andmebaasi muutvad toimingud ja sõltuvalt teie andmebaasi suurusest võib selle lõpuleviimiseks kuluda mitu minutit. See nõuab ka minimaalselt nii palju vaba kettaruumi, kui suur on teie andmebaas, kuid soovitatav on 1,5x.",
             "clean_generated": {
                 "blob_files": "Blobi failid",
-                "markers": "Markeri Eelvaated",
-                "image_thumbnails": "Piltide Pisipildid",
+                "markers": "Markeri eelvaated",
+                "image_thumbnails": "Piltide pisipildid",
                 "image_thumbnails_desc": "Piltide pisipildid ning klipid",
-                "previews": "Stseenide Eelvaated",
+                "previews": "Stseenide eelvaated",
                 "previews_desc": "Stseenide eelvaated ja pisipildid",
-                "sprites": "Stseeni Spraidid",
-                "transcodes": "Stseeni Transkodeeringud",
+                "sprites": "Stseeni spraidid",
+                "transcodes": "Stseeni transkodeeringud",
                 "description": "Eemaldab genereeritud failid ilma vastava andmebaasi kirjeta."
             },
             "rescan": "Skaneeri failid uuesti",
-            "rescan_tooltip": "Kontrollige uuesti kõiki teel olevaid faile. Kasutatakse faili metaandmete värskendamiseks ja ZIP-failide uuesti skannimiseks."
+            "rescan_tooltip": "Kontrollige uuesti kõiki teel olevaid faile. Kasutatakse faili metaandmete värskendamiseks ja ZIP-failide uuesti skannimiseks.",
+            "backup_database": {
+                "description": "Varundab andmebaasi ja blob-failid.",
+                "destination": "Sihtkoht",
+                "download": "Laadi alla varukoopia",
+                "include_blobs": "Lisa varukoopiasse blob-id",
+                "include_blobs_desc": "Keela, et varundada ainult SQLite'i andmebaasifaili.",
+                "sqlite": "Varukoopiafail on SQLite'i andmebaasifaili koopia failinimega {filename_format}",
+                "to_directory": "Kausta {directory}",
+                "warning_blobs": "Blob-faile varukoopiasse ei lisata. See tähendab, et varukoopiast edukaks taastamiseks peavad blob-failid olema blob-salvestuskohas.",
+                "zip": "SQLite'i andmebaasifail ja blob-failid pakitakse ühte faili nimega {filename_format}"
+            },
+            "generate_image_phashes_during_scan": "Kujutise tajutavate räsi genereerimine",
+            "generate_image_phashes_during_scan_tooltip": "Deduplikatsiooni ja identifitseerimise jaoks."
         },
         "tools": {
-            "scene_duplicate_checker": "Duplikaatstseenide Kontroll",
+            "scene_duplicate_checker": "Duplikaatstseenide kontroll",
             "scene_filename_parser": {
                 "add_field": "Lisa Väli",
                 "capitalize_title": "Pealkirja kirjutamine suurtähtedega",
@@ -588,7 +620,7 @@
                 "ignored_words": "Ignoreeritud sõnad",
                 "matches_with": "Kattub {i}-ga",
                 "select_parser_recipe": "Valige Parser-i Retsept",
-                "title": "Stseeni Failinimede Parser",
+                "title": "Stseeni failinimede parser",
                 "whitespace_chars": "Tühikumärgid",
                 "whitespace_chars_desc": "Need märgid asendatakse pealkirjas tühikutega"
             },
@@ -608,9 +640,9 @@
                 "option_label": "Kohandatud CSS lubatud"
             },
             "custom_javascript": {
-                "description": "Pead muudatuste nägemiseks lehe uuesti laadima. Pole garantiid, et kohandatud Javascript töötab ka tuleviku Stashi uuendustes.",
-                "heading": "Kohandatud Javascript",
-                "option_label": "Kohandatud Javascript lubatud"
+                "description": "Pead muudatuste nägemiseks lehe uuesti laadima. Pole garantiid, et kohandatud JavaScript töötab ka tuleviku Stashi uuendustes.",
+                "heading": "Kohandatud JavaScript",
+                "option_label": "Kohandatud JavaScript lubatud"
             },
             "custom_locales": {
                 "description": "Muutke üksikuid keele stringe. Põhiloendi leiate aadressilt https://github.com/stashapp/stash/blob/develop/ui/v2.5/src/locales/en-GB.json. Muudatuste jõustumiseks tuleb leht uuesti laadida.",
@@ -627,14 +659,14 @@
             },
             "desktop_integration": {
                 "desktop_integration": "Töölaua Integratsioon",
-                "notifications_enabled": "Luba Teavitused",
-                "send_desktop_notifications_for_events": "Saada töölaua teated sündmuste korral",
-                "skip_opening_browser": "Jäta Brauseri Avamine Vahele",
-                "skip_opening_browser_on_startup": "Jäta käivitamise ajal brauseri automaatne avamine vahele"
+                "notifications_enabled": "Luba teavitused",
+                "send_desktop_notifications_for_events": "Saada töölaua teated sündmuste korral.",
+                "skip_opening_browser": "Jäta brauseri avamine vahele",
+                "skip_opening_browser_on_startup": "Jäta käivitamise ajal brauseri automaatne avamine vahele."
             },
             "editing": {
                 "disable_dropdown_create": {
-                    "description": "Eemaldage rippmenüü valijatest võimalus luua uusi objekte",
+                    "description": "Eemaldage rippmenüü valijatest võimalus luua uusi objekte.",
                     "heading": "Keela rippmenüü loomine"
                 },
                 "heading": "Redigeerimine",
@@ -652,7 +684,7 @@
                         }
                     },
                     "type": {
-                        "label": "Hindamissüsteemi Tüüp",
+                        "label": "Hindamissüsteemi tüüp",
                         "options": {
                             "decimal": "Komakohaga",
                             "stars": "Tähed"
@@ -675,8 +707,8 @@
                 "sync": "Sünkroniseeri"
             },
             "handy_connection_key": {
-                "description": "Handy ühendusvõti interaktiivsete stseenide jaoks. Selle määramine võimaldab Stashil jagada teie praeguse stseeni teavet saidiga handyfeeling.com",
-                "heading": "Handy Ühendusvõti"
+                "description": "Handy ühendusvõti interaktiivsete stseenide jaoks. Selle määramine võimaldab Stashil jagada teie praeguse stseeni teavet saidiga handyfeeling.com.",
+                "heading": "Handy ühendusvõti"
             },
             "image_lightbox": {
                 "heading": "Pildi Valguskast"
@@ -690,12 +722,12 @@
                 "heading": "Pildid",
                 "options": {
                     "write_image_thumbnails": {
-                        "description": "Kirjuta piltide pisipildid kettale, kui need luuakse käigupealt",
+                        "description": "Kirjuta piltide pisipildid kettale, kui need luuakse käigupealt.",
                         "heading": "Kirjutage piltide pisipildid"
                     },
                     "create_image_clips_from_videos": {
-                        "description": "Kui teegis on videod keelatud, skannitakse videofailid (videolaiendiga lõppevad failid) Pildiklipina.",
-                        "heading": "Skanni Videolaiendeid Pildiklipina"
+                        "description": "Kui teegis on videod keelatud, skannitakse videofailid (videolaiendiga lõppevad failid) pildiklipina.",
+                        "heading": "Skanni videolaiendeid pildiklipina"
                     }
                 }
             },
@@ -704,31 +736,31 @@
                 "heading": "Keel"
             },
             "max_loop_duration": {
-                "description": "Stseeni maksimaalne kestus, mille jooksul stseenimängija videot uuesti mängib – sisesta 0 keelamiseks",
+                "description": "Stseeni maksimaalne kestus, mille jooksul stseenimängija videot uuesti mängib. Määra 0 keelamiseks.",
                 "heading": "Silmuse maksimaalne kestus"
             },
             "menu_items": {
-                "description": "Saad navigeerimisribal kuvada või peita erinevat tüüpi sisu",
+                "description": "Saad navigeerimisribal kuvada või peita erinevat tüüpi sisu.",
                 "heading": "Menüüelemendid"
             },
             "minimum_play_percent": {
                 "description": "Aja protsent, kui kaua stseeni tuleb esitada, enne kui selle esitamiste arvu suurendatakse.",
-                "heading": "Minimaalne Esitusprotsent"
+                "heading": "Minimaalne esitusprotsent"
             },
             "performers": {
                 "options": {
                     "image_location": {
-                        "description": "Esitaja vaikekujutiste kohandatud failitee. Sisseehitatud vaikeseadete kasutamiseks jätke tühjaks",
-                        "heading": "Kohandatud Esinejate Pilditee"
+                        "description": "Esitaja vaikekujutiste kohandatud failitee. Sisseehitatud vaikeseadete kasutamiseks jätke tühjaks.",
+                        "heading": "Näitlejate kohandatud pilditee"
                     }
                 }
             },
             "preview_type": {
                 "description": "Vaikimisi on video (mp4) eelvaated. Kui soovite sirvimisel CPUd vähem kasutada, saate kasutada animeeritud piltide (veebi) eelvaateid. Kuid need tuleb genereerida lisaks video eelvaadetele ja need on suuremad failid.",
-                "heading": "Eelvaate Tüüp",
+                "heading": "Eelvaate tüüp",
                 "options": {
-                    "animated": "Animeeritud Pilt",
-                    "static": "Staatiline Pilt",
+                    "animated": "Animeeritud pilt",
+                    "static": "Staatiline pilt",
                     "video": "Video"
                 }
             },
@@ -744,23 +776,23 @@
                     "always_start_from_beginning": "Alusta videot alati algusest",
                     "auto_start_video": "Video automaatne alustamine",
                     "auto_start_video_on_play_selected": {
-                        "description": "Stseenivideote automaatne esitamine järjekorrast esitamisel või stseenide lehelt valitud või juhusliku esitamise korral",
+                        "description": "Stseenivideote automaatne esitamine järjekorrast esitamisel või stseenide lehelt valitud või juhusliku esitamise korral.",
                         "heading": "Video automaatne esitamine valitud esitamisel"
                     },
                     "continue_playlist_default": {
-                        "description": "Kui video lõppeb, esitage järjekorras järgmine stseen",
+                        "description": "Kui video lõppeb, esitage järjekorras järgmine stseen.",
                         "heading": "Esitusloendi jätkamine vaikimisi"
                     },
-                    "show_scrubber": "Näita Detailide Otsijat",
-                    "track_activity": "Jälgi Tegevust",
+                    "show_scrubber": "Näita detailide otsijat",
+                    "track_activity": "Luba stseeni vaatamiste ajalugu",
                     "disable_mobile_media_auto_rotate": "Keela täisekraani meedia automaatne pööramine mobiilis",
                     "enable_chromecast": "Luba Chromecast",
-                    "show_ab_loop_controls": "Näita AB Loopi pistikprogrammi juhtnuppe",
+                    "show_ab_loop_controls": "Näita AB loopi juhtnuppe",
                     "vr_tag": {
                         "description": "VR-nupp kuvatakse ainult selle sildiga stseenide puhul.",
-                        "heading": "VR Silt"
+                        "heading": "VR silt"
                     },
-                    "show_range_markers": "Näita Vahemiku Märke"
+                    "show_range_markers": "Näita vahemiku märke"
                 }
             },
             "scene_wall": {
@@ -775,39 +807,39 @@
                 "heading": "Kerimiskatsed enne üleminekut"
             },
             "show_tag_card_on_hover": {
-                "description": "Kuva märgendi kaarti, kui hõljute sildi märkidel",
+                "description": "Kuva märgendi kaarti, kui hõljute sildi märkidel.",
                 "heading": "Sildikaardi tööriistanäpunäited"
             },
             "slideshow_delay": {
-                "description": "Slaidiseanss on galeriides seinavaaterežiimi korral saadaval",
-                "heading": "Slaidiseansi Viivitus (sekundites)"
+                "description": "Slaidiseanss on galeriides seinavaaterežiimi korral saadaval.",
+                "heading": "Slaidiseansi viivitus (sekundites)"
             },
             "studio_panel": {
-                "heading": "Studiovaade",
+                "heading": "Studio Vaade",
                 "options": {
                     "show_child_studio_content": {
-                        "description": "Stuudiovaates kuvage ka alamstuudiote sisu",
+                        "description": "Stuudiovaates kuvage ka alamstuudiote sisu.",
                         "heading": "Kuvage alamstuudiote sisu"
                     }
                 }
             },
             "tag_panel": {
-                "heading": "Sildivaade",
+                "heading": "Siltide Vaade",
                 "options": {
                     "show_child_tagged_content": {
-                        "description": "Sildivaates kuvage ka alammärgendite sisu",
-                        "heading": "Kuva alamsildi sisu"
+                        "description": "Sildivaates kuvage ka alam-märgendite sisu.",
+                        "heading": "Kuva alam-sildi sisu"
                     }
                 }
             },
             "title": "Kasutajaliides",
             "use_stash_hosted_funscript": {
-                "description": "Kui see on lubatud, edastatakse funscriptid otse Stashist teie Handy seadmesse ilma kolmanda osapoole Handy serverit kasutamata. Nõuab, et Stash oleks teie Handy seadmest juurdepääsetav.",
+                "description": "Kui see on lubatud, edastatakse funscriptid otse Stashist teie Handy seadmesse ilma kolmanda osapoole Handy serverit kasutamata. See nõuab, et Stash oleks teie Handy seadmest juurdepääsetav ja API võti on genereeritud, kui Stashil on ligipääs piiratud.",
                 "heading": "Serveeri funscripte otse"
             },
             "detail": {
                 "show_all_details": {
-                    "description": "Kui see on lubatud, kuvatakse vaikimisi kõik sisu üksikasjad ja iga üksikasjade üksus mahub ühte veergu",
+                    "description": "Kui see on lubatud, kuvatakse vaikimisi kõik sisu üksikasjad ja iga üksikasjade üksus mahub ühte veergu.",
                     "heading": "Näita kõiki detaile"
                 },
                 "enable_background_image": {
@@ -815,13 +847,13 @@
                     "heading": "Luba taustapildid"
                 },
                 "compact_expanded_details": {
-                    "description": "Kui lubatud, kuvab see suvand laiendatud üksikasjad, säilitades samas kompaktse esitluse",
+                    "description": "Kui lubatud, kuvab see suvand laiendatud üksikasjad, säilitades samas kompaktse esitluse.",
                     "heading": "Kompaktselt laiendatud detailid"
                 },
                 "heading": "Detailide Leht"
             },
             "performer_list": {
-                "heading": "Näitlejate nimekiri",
+                "heading": "Näitlejate Nimekiri",
                 "options": {
                     "show_links_on_grid_card": {
                         "heading": "Kuva linke näitlejate ruudustiku kaartidel"
@@ -830,10 +862,31 @@
             },
             "sfw_mode": {
                 "description": "Luba, kui kasutad stashi SFW sisu jaoks. Peidab või muudab kasutajaliidese mõningaid täiskasvanutele mõeldud sisuga seotud aspekte.",
-                "heading": "SFW Sisu Režiim"
+                "heading": "SFW režiim"
+            },
+            "custom_title": {
+                "description": "Kohandatav tekst mis lisatakse lehe tiitlile. Kui tühi, siis on vaikimisi \"Stash\".",
+                "heading": "Kohandatud tiitel"
+            },
+            "troubleshooting_mode": {
+                "button": "Veaotsingu režiim",
+                "dialog_title": "Luba veaotsingu režiim",
+                "dialog_description": "See keelab ajutiselt kõik kohandused, et aidata probleeme diagnoosida:",
+                "dialog_item_plugins": "Kõik pluginad",
+                "dialog_item_css": "Kohandatud CSS",
+                "dialog_item_js": "Kohandatud JavaScript",
+                "dialog_item_locales": "Kohandatud keeled",
+                "dialog_log_level": "Üksikasjaliku diagnostika jaoks määratakse logimise tasemeks Debug.",
+                "dialog_reload_note": "Leht värskendab ennast automaatselt.",
+                "enable": "Luba & Värskenda",
+                "overlay_message": "Veaotsingu režiim on aktiivne – kõik kohandused on keelatud",
+                "exit": "Välju"
             }
         },
-        "advanced_mode": "Täpsem Režiim"
+        "advanced_mode": "Täpsem režiim",
+        "changelog": {
+            "header": "Muudatuste logi"
+        }
     },
     "configuration": "Konfiguratsioon",
     "countables": {
@@ -853,7 +906,8 @@
     "criterion": {
         "greater_than": "Suurem kui",
         "less_than": "Väiksem kui",
-        "value": "Väärtus"
+        "value": "Väärtus",
+        "unsupported": "{type} (ilma toeta)"
     },
     "criterion_modifier": {
         "between": "vahel",
@@ -921,7 +975,7 @@
             "page_header": "Leht {page} / {total}",
             "reset_zoom_on_nav": "Pildi muutumisel lähtesta suumi tase",
             "scale_up": {
-                "description": "Suurendage väiksemaid pilte ekraani täitmiseks",
+                "description": "Suurendage väiksemaid pilte ekraani täitmiseks.",
                 "label": "Suurenda ekraanile mahtumiseks"
             },
             "scroll_mode": {
@@ -937,10 +991,6 @@
             "empty_results": "Sihtkoha välja väärtusi ei muudeta.",
             "source": "Allikas"
         },
-        "merge_tags": {
-            "destination": "Sihtkoht",
-            "source": "Allikas"
-        },
         "reassign_entity_title": "{count, plural, one {Määra Ümber {singularEntity}} other {Määra Ümber {pluralEntity}-d/id}}",
         "reassign_files": {
             "destination": "Määra Ümber"
@@ -949,24 +999,24 @@
             "covers": "Stseeni kaaned",
             "force_transcodes": "Sunni Ümbertöötlemise genereerimine",
             "force_transcodes_tooltip": "Vaikimisi genereeritakse ümbertöötlemisi ainult siis, kui brauser videofaili ei toeta. Kui see on lubatud, genereeritakse ümbertöötlemisi isegi siis, kui videofail näib olevat brauseris toetatud.",
-            "image_previews": "Animeeritud Piltide Eelvaated",
-            "image_previews_tooltip": "Looge ka animeeritud (webp) eelvaateid, mis on nõutavad ainult siis, kui Stseeni/Markeri Seina Eelvaate Tüüp on seatud väärtusele Animeeritud Pilt. Sirvimisel kasutavad nad vähem CPUd kui video eelvaated, kuid genereeritakse neile lisaks ja need on suuremad failid.",
+            "image_previews": "Animeeritud piltide eelvaated",
+            "image_previews_tooltip": "Looge ka animeeritud (webp) eelvaateid, mis on nõutavad ainult siis, kui Stseeni/Markeri Seina Eelvaate tüüp on seatud väärtusele Animeeritud pilt. Sirvimisel kasutavad nad vähem CPUd kui video eelvaated, kuid genereeritakse neile lisaks ja need on suuremad failid.",
             "interactive_heatmap_speed": "Looge interaktiivsete stseenide jaoks soojuskaarte ja kiirusi",
-            "marker_image_previews": "Markeri Animeeritud Piltide Eelvaated",
-            "marker_image_previews_tooltip": "Looge ka animeeritud (webp) eelvaateid, mis on nõutavad ainult siis, kui Stseeni/Markeri Seina Eelvaate Tüüp on seatud väärtusele Animeeritud Pilt. Sirvimisel kasutavad nad vähem CPUd kui video eelvaated, kuid genereeritakse neile lisaks ja need on suuremad failid.",
-            "marker_screenshots": "Markeri Ekraanipildid",
+            "marker_image_previews": "Markeri animeeritud piltide eelvaated",
+            "marker_image_previews_tooltip": "Looge ka animeeritud (webp) eelvaateid, mis on nõutavad ainult siis, kui Stseeni/Markeri Seina Eelvaate tüüp on seatud väärtusele Animeeritud pilt. Sirvimisel kasutavad nad vähem CPUd kui video eelvaated, kuid genereeritakse neile lisaks ja need on suuremad failid.",
+            "marker_screenshots": "Markeri ekraanipildid",
             "marker_screenshots_tooltip": "Markeeri staatilised JPG-kujutised",
-            "markers": "Markeri Eelvaated",
+            "markers": "Markeri eelvaated",
             "markers_tooltip": "20-sekundilised videod, mis algavad etteantud ajakoodiga.",
-            "override_preview_generation_options": "Eelvaate Genereerimise Valikute Ülekirjutamine",
-            "override_preview_generation_options_desc": "Eelvaate Genereerimise Sätete üle kirjutamine selle operatsiooni jaoks. Vaikeseaded määratakse jaotises Süsteem -> Eelvaate Genereerimine.",
+            "override_preview_generation_options": "Eelvaate genereerimise valikute ülekirjutamine",
+            "override_preview_generation_options_desc": "Eelvaate genereerimise sätete üle kirjutamine selle operatsiooni jaoks. Vaikeseaded määratakse jaotises Süsteem -> Eelvaate Genereerimine.",
             "overwrite": "Kirjuta üle olemasolevad failid",
-            "phash": "Tajutavad räsid",
+            "phash": "Videote tajutav räsi",
             "preview_exclude_end_time_desc": "Välista stseeni eelvaadetest viimased x sekundid. See võib olla väärtus sekundites või protsent (nt 2%) stseeni kogukestusest.",
             "preview_exclude_end_time_head": "Välista lõpuaeg",
             "preview_exclude_start_time_desc": "Välista esimesed x sekundid stseeni eelvaadetest. See võib olla väärtus sekundites või protsent (nt 2%) stseeni kogukestusest.",
             "preview_exclude_start_time_head": "Välista algusaeg",
-            "preview_generation_options": "Eelvaate Genereerimise Sätted",
+            "preview_generation_options": "Eelvaate genereerimise sätted",
             "preview_options": "Eelvaate Sätted",
             "preview_preset_desc": "Eelseadistus reguleerib eelvaate genereerimise suurust, kvaliteeti ja kodeerimisaega. Eelseadistused peale „aeglase” on väheneva tootlikkusega ja neid ei soovitata.",
             "preview_preset_head": "Eelvaate kodeeringu eelseadistus",
@@ -974,15 +1024,17 @@
             "preview_seg_count_head": "Eelvaates olevate segmentide arv",
             "preview_seg_duration_desc": "Iga eelvaate lõigu kestus sekundites.",
             "preview_seg_duration_head": "Eelvaate segmendi kestus",
-            "sprites": "Stseenipuhastuse Spraidid",
+            "sprites": "Stseeniotsingu spraidid",
             "sprites_tooltip": "Videopleieri all kuvatav piltide komplekt hõlpsaks navigeerimiseks.",
             "transcodes": "Ümbertöötlemine",
             "transcodes_tooltip": "MP4 ümberkoodeeringud luuakse kogu sisu jaoks; kasulik aeglaste CPUde jaoks, kuid nõuab palju rohkem kettaruumi",
             "video_previews": "Eelvaated",
             "video_previews_tooltip": "Video eelvaated, mis esitatakse kursorit stseeni kohal hoides",
-            "clip_previews": "Pildiklipi Eelvaated",
+            "clip_previews": "Pildiklipi eelvaated",
             "phash_tooltip": "De-dubleerimiseks ja stseeni tuvastamiseks",
-            "image_thumbnails": "Piltide Pisipildid"
+            "image_thumbnails": "Piltide pisipildid",
+            "image_phash": "Kujutiste tajutav räsi",
+            "image_phash_tooltip": "Deduplikatsiooni ja identifitseerimise jaoks"
         },
         "scenes_found": "Leiti {count} stseeni",
         "scrape_entity_query": "{entity_type} Kraapija Päring",
@@ -1039,7 +1091,7 @@
         "select_youngest": "Valige duplikaatrühma noorim fail",
         "select_none": "Valige Puudub"
     },
-    "duplicated_phash": "Duplikeeritud (phash)",
+    "duplicated_phash": "Duplikeeritud (pHash)",
     "duration": "Pikkus",
     "effect_filters": {
         "aspect": "Aspekt",
@@ -1130,7 +1182,7 @@
     "height": "Pikkus",
     "height_cm": "Pikkus (cm)",
     "help": "Abi",
-    "ignore_auto_tag": "Ignoneeri Automaatset Märkimist",
+    "ignore_auto_tag": "Ignoneeri automaatset märkimist",
     "image": "Pilt",
     "image_count": "Pildiarv",
     "image_index": "Pilt #",
@@ -1153,9 +1205,7 @@
     "measurements": "Mõõdud",
     "media_info": {
         "audio_codec": "Heli Koodek",
-        "checksum": "Kontrollsumma",
         "downloaded_from": "Allalaetud Asukohast",
-        "hash": "Hash",
         "interactive_speed": "Interaktiivne kiirus",
         "performer_card": {
             "age": "{age} {years_old}",
@@ -1166,7 +1216,11 @@
         "play_duration": "Esitamisaeg",
         "stream": "Striim",
         "video_codec": "Video Koodek",
-        "o_count": "O Arv"
+        "o_count": "O Arv",
+        "oshash": "oshash",
+        "oshash_meaning": "OpenSubtitles'i Räsi",
+        "phash_meaning": "Tajutav Räsi",
+        "md5": "MD5 Kontrollsumma"
     },
     "megabits_per_second": "{value} mbps",
     "metadata": "Metaandmed",
@@ -1188,7 +1242,7 @@
     "parent_tags": "Vanem-sildid",
     "part_of": "Osa {parent}-st",
     "path": "Failitee",
-    "perceptual_similarity": "Tajutav Sarnasus (phash)",
+    "perceptual_similarity": "Tajutav Sarnasus (pHash)",
     "performer": "Näitleja",
     "performer_age": "Näitleja Vanus",
     "performer_count": "Näitlejate Arv",
@@ -1199,14 +1253,6 @@
         "any_names_entered_will_be_queried": "Kõigi sisestatud nimede kohta päritakse Stash-kastii kaugeksemplari ja lisatakse, kui need leitakse. Vastena loetakse ainult täpseid vasteid.",
         "batch_add_performers": "Lisa Näitlejaid Hunnikus",
         "batch_update_performers": "Uuenda Näitlejaid Hunnikus",
-        "config": {
-            "active_stash-box_instance": "Aktiivne stash-kasti eksemplar:",
-            "edit_excluded_fields": "Muuda Välistatud Välju",
-            "excluded_fields": "Välistatud väljad:",
-            "no_fields_are_excluded": "Ühtegi välja ei ole välistatud",
-            "no_instances_found": "Eksemplare ei leitud",
-            "these_fields_will_not_be_changed_when_updating_performers": "Neid välju näitlejaid uuendades ei muudeta."
-        },
         "current_page": "Käesolev lehekülg",
         "failed_to_save_performer": "Näitleja \"{performer}\" salvestamine ebaõnnestus",
         "name_already_exists": "Nimi juba eksisteerib",
@@ -1364,7 +1410,7 @@
         "welcome_to_stash": "Teretulemast Stashi"
     },
     "stash_id": "Stashi ID",
-    "stash_id_endpoint": "Stash ID Lõpp-punkt",
+    "stash_id_endpoint": "Stash ID Lõpp-punkti URL",
     "stash_ids": "Stashi ID-d",
     "stashbox": {
         "go_review_draft": "Mustandi ülevaatamiseks mine saidile {endpoint_name}.",
@@ -1416,7 +1462,11 @@
         "started_auto_tagging": "Alustasin automaatset märkimist",
         "started_generating": "Alustasin genereerimist",
         "started_importing": "Alustasin importimist",
-        "updated_entity": "Uuendatud {entity}"
+        "updated_entity": "Uuendatud {entity}",
+        "merged_performers": "Näitlejad kokku seotud",
+        "clipboard_access_denied": "Lõikelaua ligipääs on keelatud. Vaata brauseri õigused üle",
+        "clipboard_image_pasted": "Pilt kleebitud lõikelaualt",
+        "clipboard_no_image": "Lõukelaualt ei leitud pilti"
     },
     "total": "Kokku",
     "true": "Tõene",
@@ -1446,9 +1496,9 @@
         "confirm_delete_source": "Kas olete kindel, et soovite allika {name} ({url}) kustutada?",
         "confirm_uninstall": "Kas olete kindel, et soovite desinstallida {number} paketti?",
         "description": "Kirjeldus",
-        "edit_source": "Redigeeri Allikat",
+        "edit_source": "Redigeeri allikat",
         "install": "Installi",
-        "latest_version": "Uusim Versioon",
+        "latest_version": "Uusim versioon",
         "no_packages": "Ühtegi paketti ei leitud",
         "no_sources": "Ühtegi Allikat pole seadistatud",
         "package": "Pakett",
@@ -1458,7 +1508,7 @@
         "source": {
             "local_path": {
                 "description": "Selle allika pakettide salvestamise suhteline tee. Pange tähele, et selle muutmiseks tuleb paketid käsitsi teisaldada.",
-                "heading": "Kohalik Tee"
+                "heading": "Kohalik tee"
             },
             "name": "Nimi",
             "url": "Allika URL"
@@ -1467,10 +1517,10 @@
         "update": "Uuenda",
         "uninstall": "Uninstalli",
         "version": "Versioon",
-        "add_source": "Lisa Allikas",
-        "check_for_updates": "Kontrolli Uuendusi",
+        "add_source": "Lisa allikas",
+        "check_for_updates": "Kontrolli uuendusi",
         "hide_unselected": "Peida valimata",
-        "installed_version": "Installitud Versioon",
+        "installed_version": "Installitud versioon",
         "no_upgradable": "Uuendatavaid pakette ei leitud"
     },
     "penis_length_cm": "Peenise Pikkus (cm)",
@@ -1489,13 +1539,7 @@
         "batch_add_studios": "Mitmete Stuudiote Lisamine",
         "config": {
             "create_parent_label": "Loo vanemstuudioid",
-            "create_parent_desc": "Looge puuduvad vanemstuudiod või märgistage ja värskendage olemasolevate vanemstuudiote andmeid/pilti täpsete nimede vastetega",
-            "no_fields_are_excluded": "Ühtegi välja pole välistatud",
-            "active_stash-box_instance": "Aktiivne stash-boxi eksemplar:",
-            "edit_excluded_fields": "Välistatud Väljade Muutmine",
-            "excluded_fields": "Välistatud väljad:",
-            "no_instances_found": "Eksemplare ei leitud",
-            "these_fields_will_not_be_changed_when_updating_studios": "Neid välju stuudiote värskendamisel ei muudeta."
+            "create_parent_desc": "Looge puuduvad vanemstuudiod või märgistage ja värskendage olemasolevate vanemstuudiote andmeid/pilti täpsete nimede vastetega"
         },
         "current_page": "Praegune leht",
         "failed_to_save_studio": "Stuudio \"{studio}\" salvestamine ebaõnnestus",
@@ -1593,5 +1637,57 @@
         "no_results": "Vasteid ei leitud.",
         "placeholder_name_or_id": "{entityType} nimi või StashID...",
         "select_stashbox": "Vali StashBox..."
-    }
+    },
+    "career_end": "Karjääri Lõpp",
+    "career_start": "Karjääri Algus",
+    "duplicated": "Duplikaat",
+    "duplicated_stash_id": "Duplikaat (Stash ID)",
+    "duplicated_title": "Duplikaat (Tiitel)",
+    "latest_scene": "Viimatine Stseen",
+    "stash_id_count": "Stash ID Arv",
+    "tag_tagger": {
+        "add_new_tags": "Lisa Uusi Silte",
+        "any_names_entered_will_be_queried": "Kõik sisestatud nimed päritakse Stash-Boxi kaug-instantsist ja lisatakse, kui need leitakse. Ainult täpseid vasteid loetakse vasteks.",
+        "batch_add_tags": "Siltide Partii Lisamine",
+        "batch_update_tags": "Partii Siltide Uuendamine",
+        "current_page": "Hetke leht",
+        "failed_to_save_tag": "Sildi \"{tag}\" salvestamine ebaõnnestus",
+        "name_already_exists": "Nimi juba eksisteerib",
+        "network_error": "Võrgu Viga",
+        "no_results_found": "Tulemusi ei leitud.",
+        "number_of_tags_will_be_processed": "töödeldakse {tag_count} silti",
+        "query_all_tags_in_the_database": "Kõik andmebaasis olevad sildid",
+        "refresh_tagged_tags": "Värskenda märgistatud silte",
+        "refreshing_will_update_the_data": "Värskendamine uuendab kõigi stash-boxi eksemplari siltidega siltide andmeid.",
+        "status_tagging_job_queued": "Staatus: Sildistamistöö on järjekorras",
+        "status_tagging_tags": "Staatus: Siltide märgistamine",
+        "tag_already_tagged": "Silt juba märgistatud",
+        "tag_names_or_stashids_separated_by_comma": "Siltide nimed või StashID-d eraldatud komadega",
+        "tag_selection": "Siltide valik",
+        "tag_successfully_tagged": "Silt edukalt märgistatud",
+        "tag_status": "Sildi Staatus",
+        "to_use_the_tag_tagger": "Sildistaja kasutamiseks tuleb seadistada stash-boxi eksemplar.",
+        "untagged_tags": "Märgistamata sildid",
+        "update_tags": "Uuenda Silte",
+        "updating_untagged_tags_description": "Märgendamata siltide uuendamine püüab leida vasteid siltidele, millel puudub stashid, ja uuendab metaandmeid.",
+        "config": {
+            "create_parent_label": "Loo vanemsildid"
+        }
+    },
+    "tagger": {
+        "config": {
+            "active_stash-box_instance": "Aktiivne stash-boxi instants:",
+            "edit_excluded_fields": "Redigeeri Välistatud Välju",
+            "excluded_fields": "Välistatud väljad:",
+            "fields_will_not_be_changed": "Neid välju {entity} värskendamisel ei muudeta.",
+            "no_fields_are_excluded": "Mitte ühtegi välja pole välistatud",
+            "no_instances_found": "Instanse ei leitud"
+        }
+    },
+    "include_sub_folders": "Sisalda alam-kaustu",
+    "parent_folder": "Pea-Kaust",
+    "sub_folder_depth": "Alamkausta sügavus (tühi kõigi jaoks)",
+    "sub_folders": "Alamkaustad",
+    "unsupported_criteria": "Ilma toeata kriteeriumid: {criteria}",
+    "empty_value": "tühi"
 }
diff --git a/ui/v2.5/src/locales/fi-FI.json b/ui/v2.5/src/locales/fi-FI.json
index 015d133ed..05e927fd5 100644
--- a/ui/v2.5/src/locales/fi-FI.json
+++ b/ui/v2.5/src/locales/fi-FI.json
@@ -58,8 +58,6 @@
         "logout": "Kirjaudu ulos",
         "make_primary": "Tee ensisijaikseksi",
         "merge": "Yhdistä",
-        "merge_from": "Yhdistä kohteesta",
-        "merge_into": "Yhdistä kohteeseen",
         "next_action": "Seuraava",
         "not_running": "ei käynnissä",
         "open_in_external_player": "Avaa ulkoisessa soittimessa",
@@ -151,7 +149,9 @@
             "close": "Sulje sivupalkki",
             "open": "Avaa sivupalkki",
             "toggle": "näytä/piilota sivupalkki"
-        }
+        },
+        "add_stash_id": "Lisää Stash ID",
+        "create_new": "Lisää uusi"
     },
     "actions_name": "Toiminnot",
     "age": "Ikä",
@@ -202,6 +202,10 @@
             "mark_organized_desc": "Merkitsee kohtauksen järjestellyksi hetki kun Tallenna -painiketta on painettu.",
             "errors": {
                 "blacklist_duplicate": "Monista musta lista -kohde"
+            },
+            "performer_genders": {
+                "heading": "Esiintyjien sukupuolet",
+                "description": "Esiintyjät näillä sukupuolilla näytetään lisättäessä tunnisteita kohtauksille."
             }
         },
         "noun_query": "Haku",
@@ -223,7 +227,9 @@
         "verb_scrape_all": "Kaavi kaikki",
         "verb_submit_fp": "Lähetä {fpCount, plural, one{# sormenjäki} other{# sormenjälkeä}}",
         "verb_toggle_config": "{toggle} {configuration}",
-        "verb_toggle_unmatched": "{toggle} täsmäämättömät kohtaukset"
+        "verb_toggle_unmatched": "{toggle} täsmäämättömät kohtaukset",
+        "verb_add_as_alias": "Lisää kaavittu nimi aliaksena",
+        "verb_link_existing": "Linkitä olemassaolevaan"
     },
     "config": {
         "about": {
@@ -302,7 +308,9 @@
                 "password_desc": "Salasana Stashiin. Jätä tyhjäksi, mikäli et halua autentikointia",
                 "stash-box_integration": "Stash-box integraatio",
                 "username": "Käyttäjätunnus",
-                "username_desc": "Käyttäjätunnus Stashiin. Jätä tyhjäksi, mikäli et halua autentikointia"
+                "username_desc": "Käyttäjätunnus Stashiin. Jätä tyhjäksi, mikäli et halua autentikointia",
+                "log_file_max_size": "Lokin maksimikoko",
+                "log_file_max_size_desc": "Lokin maksimikoko megatavuina ennen pakkaamista. 0MB laittaa pois käytöstä. Vaatii uudelleenkäynnistyksen."
             },
             "backup_directory_path": {
                 "description": "SQLite -tietokannan varmuuskopiokansion sijainti",
@@ -418,7 +426,11 @@
             "funscript_heatmap_draw_range": "Sisällytä alue luotuihin lämpökarttoihin",
             "gallery_cover_regex_desc": "Regexp käytetään kuvaamaan gallerian kansikuvaa",
             "gallery_cover_regex_label": "Gallerian kansikuvio",
-            "heatmap_generation": "Funscript-lämpökarttageneraattori"
+            "heatmap_generation": "Funscript-lämpökarttageneraattori",
+            "delete_trash_path": {
+                "description": "Polku johon poistetut tiedostot siirretään sen sijaan, että ne poistettaisiin lopullisesti. Jätä tyhjäksi poistaaksesi tiedostot lopullisesti.",
+                "heading": "Roskakorin polku"
+            }
         },
         "library": {
             "exclusions": "Poisjättäminen",
@@ -466,7 +478,6 @@
             "auto_tagging": "Automaattinen tunnisteiden asetus",
             "backing_up_database": "Varmuuskopioidaan tietokantaa",
             "backup_and_download": "Suorittaa tietokannan varmuuskopioinnin ja lataa luodun tiedoston.",
-            "backup_database": "Suorittaa tietokannan varmuuskopioinnin ja tallentaa {filename_format} -tiedoston varmuuskopiokansioon",
             "cleanup_desc": "Tarkistaa puuttuvat tiedostot ja poistaa ne tietokannasta. Tämä on tuhoava toimi.",
             "data_management": "Datan hallinta",
             "defaults_set": "Oletukset on asetettu ja niitä käytetään kun painat {action} -painiketta Tehtävät -sivulla.",
@@ -754,6 +765,12 @@
                     "description": "Kun tämä on otettu käyttöön, kaikki sisällön tiedot näytetään oletuksena ja jokainen tietoelementti mahtuu yhden sarakkeen alle.",
                     "heading": "Näytä kaikki tiedot"
                 }
+            },
+            "sfw_mode": {
+                "heading": "SFW -sisältötila"
+            },
+            "performer_list": {
+                "heading": "Esiintyjälista"
             }
         },
         "advanced_mode": "Edistynyt tila",
@@ -848,10 +865,6 @@
             "destination": "Kohde",
             "source": "Lähde"
         },
-        "merge_tags": {
-            "destination": "Kohde",
-            "source": "Lähde"
-        },
         "scene_gen": {
             "force_transcodes": "Pakota transkoodaus",
             "force_transcodes_tooltip": "Oletuksena transkoodaus tehdään vain, mikäli selain ei tue videotiedostoa. Jos tämä valinta on päällä, transkoodaus tehdään vaikka selain näyttäisi tukevan videotiedostoa.",
@@ -885,7 +898,9 @@
         "scrape_results_existing": "Olemassaoleva",
         "scrape_results_scraped": "Kaavittu",
         "set_image_url_title": "Kuvan URL",
-        "unsaved_changes": "Tallentamattomia muutoksia. Haluatko varmasti poistua?"
+        "unsaved_changes": "Tallentamattomia muutoksia. Haluatko varmasti poistua?",
+        "scrape_results_missing": "Puuttuu",
+        "stashid_exists_warning": "Olemassaoleva stash ID tälle stash-boxille korvataan."
     },
     "dimensions": "Mitat",
     "director": "Ohjaaja",
@@ -979,7 +994,7 @@
         "syncing": "Synkronoidaan palvelimelle",
         "uploading": "Ladataan skriptiä"
     },
-    "hasMarkers": "On merkki",
+    "hasMarkers": "Merkit",
     "height": "Pituus",
     "height_cm": "Pituus (cm)",
     "help": "Apua",
@@ -1003,9 +1018,7 @@
     "measurements": "Mitat",
     "media_info": {
         "audio_codec": "Audiokodekki",
-        "checksum": "Tarkistussumma",
         "downloaded_from": "Ladattu kohteesta",
-        "hash": "Tiiviste",
         "interactive_speed": "Interaktiivinen nopeus",
         "performer_card": {
             "age": "{age} {years_old}",
@@ -1046,13 +1059,6 @@
         "add_new_performers": "Lisää uusia esiintyjiä",
         "batch_add_performers": "Lisää joukko esiintyjiä",
         "batch_update_performers": "Päivitä joukko esiintyjiä",
-        "config": {
-            "active_stash-box_instance": "Aktiivinen stash-box instanssi:",
-            "edit_excluded_fields": "Muokkaa poisjätettyjä kenttiä",
-            "excluded_fields": "Poisjätetyt kentät:",
-            "no_fields_are_excluded": "Ei poisjätettyjä kenttiä",
-            "these_fields_will_not_be_changed_when_updating_performers": "Näitä kenttiä ei muokata kun päivitetään esiintyjiä."
-        },
         "current_page": "Nykyinen sivu",
         "failed_to_save_performer": "Esiintyjän \"{performer}\" tallentaminen ei onnistunut",
         "name_already_exists": "Nimi on jo olemassa",
@@ -1133,15 +1139,15 @@
         },
         "paths": {
             "database_filename_empty_for_default": "tietokannan tiedostonimi (oletus jos tyhjä)",
-            "description": "Seuraavaksi meidän pitää tietää mistä etsiä pornokokoelmaasi ja mihin tallennetaan tietokanta, välimuisti ja generoidut tiedostot. Nämä asetukset ovat muutettavissa myöhemmin.",
+            "description": "Seuraavaksi meidän pitää tietää mistä etsiä sisältösi ja mihin tallennetaa tietokanta, välimuisti ja generoidut tiedostot. Nämä asetukset ovat muutettavissa myöhemmin.",
             "path_to_generated_directory_empty_for_default": "polku generated -kansioon (käytetään oletussijaintia jos tyhjä)",
             "set_up_your_paths": "Aseta polut",
             "stash_alert": "Et ole valinnut yhtään polkua kirjastoon. Mediaa ei voida skannata Stashiin. Oletko aivan varma?",
             "where_can_stash_store_its_database": "Mihin Stash voi tallentaa tietokantansa?",
-            "where_can_stash_store_its_database_description": "Stash käyttää SQLite -tietokantaa tallentaaksesi pornosi metadatan. Oletuksena <code>stash-go.sqlite</code> luodaan samaan kansioon konfiguraatiotiedoston kanssa. Jos haluat muuttaa tätä, anna absoluuttinen tai relatiivinen tiedostonimi.",
+            "where_can_stash_store_its_database_description": "Stash käyttää SQLite -tietokantaa sisällön metadatan tallennukseen. Oletuksena <code>stash-go.sqlite</code> luodaan samaan kansioon konfiguraatiotiedoston kanssa. Jos haluat muuttaa tätä, anna absoluuttinen tai relatiivinen tiedostonimi.",
             "where_can_stash_store_its_generated_content": "Mihin Stash voi tallentaa generoimansa sisällön?",
-            "where_is_your_porn_located": "Missä pornosi on?",
-            "where_is_your_porn_located_description": "Lisää hakemistoja jotka sisältävät pornovideosi ja -kuvasi. Stash käyttää näitä hakemistoja etsiessään videoita ja kuvia."
+            "where_is_your_porn_located": "Missä sisältösi on?",
+            "where_is_your_porn_located_description": "Lisää hakemistoja joissa videot ja kuvat sijaitsevat. Stash käyttää näitä hakemistoja etsiessään videoita ja kuvia."
         },
         "stash_setup_wizard": "Stashin asetusvelho",
         "success": {
@@ -1253,5 +1259,9 @@
     "type": "Tyyppi",
     "studio_and_parent": "Studio ja vanhempi",
     "studio_count": "Studion määrä",
-    "age_on_date": "{age} tuotannossa"
+    "age_on_date": "{age} tuotannossa",
+    "stashbox_search": {
+        "no_results": "Ei tuloksia.",
+        "header": "Etsi {entityType} StashBoxista"
+    }
 }
diff --git a/ui/v2.5/src/locales/fr-FR.json b/ui/v2.5/src/locales/fr-FR.json
index a72361f22..9f7c6d323 100644
--- a/ui/v2.5/src/locales/fr-FR.json
+++ b/ui/v2.5/src/locales/fr-FR.json
@@ -61,8 +61,6 @@
         "logout": "Déconnecter",
         "make_primary": "Rendre principal",
         "merge": "Fusionner",
-        "merge_from": "Fusionner depuis",
-        "merge_into": "Fusionner dans",
         "migrate_blobs": "Migrer les blobs",
         "migrate_scene_screenshots": "Migrer les vignettes de scène",
         "next_action": "Suivant",
@@ -153,7 +151,15 @@
         "load": "Charger",
         "load_filter": "Charger un filtre",
         "add_stash_id": "Ajouter un identifiant Stash",
-        "create_new": "Créer un nouveau"
+        "create_new": "Créer un nouveau",
+        "save_and_new": "Enregistrer et nouveau",
+        "invert_selection": "Inverser la sélection",
+        "select_directory": "Sélectionner un répertoire",
+        "reveal_in_file_manager": "Afficher dans le gestionnaire de fichiers",
+        "from_clipboard": "Depuis le presse-papiers",
+        "selective_generate": "Génération sélective",
+        "exclude_lowercase": "exclure",
+        "create_parent_tag": "Créer une étiquette parente"
     },
     "actions_name": "Actions",
     "age": "Âge",
@@ -233,7 +239,8 @@
         "verb_toggle_unmatched": "{toggle} scènes incomparables",
         "verb_add_as_alias": "Ajouter le nom récupéré comme alias",
         "verb_link_existing": "Lien vers existant",
-        "verb_match_tag": "Étiquette correspondante"
+        "verb_match_tag": "Étiquette correspondante",
+        "verb_scrape_selected": "Extraire la sélection"
     },
     "config": {
         "about": {
@@ -286,7 +293,7 @@
             "until_restart": "jusqu'au redémarrage",
             "video_sort_order": "Ordre de tri vidéo par défaut",
             "video_sort_order_desc": "Commande pour trier les vidéos par défaut.",
-            "server_port": "Port du Serveur",
+            "server_port": "Port du serveur",
             "server_port_desc": "Port sur lequel le serveur DLNA doit fonctionner. Nécessite un redémarrage du DLNA après modification."
         },
         "general": {
@@ -317,7 +324,7 @@
                 "log_file_max_size_desc": "Taille maximale en mégaoctets du fichier journal avant compression. 0 Mo est désactivé. Nécessite un redémarrage."
             },
             "backup_directory_path": {
-                "description": "Emplacement de sauvegarde des bases de données SQLite",
+                "description": "Emplacement de sauvegarde des bases de données SQLite.",
                 "heading": "Chemin du répertoire de sauvegarde"
             },
             "blobs_path": {
@@ -336,14 +343,14 @@
             "check_for_insecure_certificates_desc": "Certains sites utilisent des certificats SSL non sécurisés. Lorsque cette option est décochée, l'extracteur de contenu ignore la vérification des certificats non sécurisés et autorise l'extraction de ces sites. Si vous obtenez une erreur de certificat lors de l'extraction, décochez cette option.",
             "chrome_cdp_path": "Chemin Chrome CDP (Chrome Debugging Protocol)",
             "chrome_cdp_path_desc": "Chemin de l'exécutable Chrome, ou adresse distante (commençant par http:// ou https://, par exemple http://localhost:9222/json/version) d'une instance de Chrome.",
-            "create_galleries_from_folders_desc": "Si vrai, crée par défaut des galeries à partir des répertoires contenant des images. Créer un fichier appelé .forcegallery ou .nogallery dans un répertoire pour forcer/empêcher cela.",
-            "create_galleries_from_folders_label": "Créer des galeries à partir de dossiers contenant des images",
+            "create_galleries_from_folders_desc": "Si vrai, crée par défaut des galeries à partir des répertoires contenant des images. Créer un fichier appelé .forcegallery ou .nogallery dans un répertoire pour remplacer ce paramètre.",
+            "create_galleries_from_folders_label": "Créer des galeries à partir de répertoires contenant des images",
             "database": "Base de données",
             "db_path_head": "Chemin de la base de données",
             "directory_locations_to_your_content": "Emplacements de votre contenu",
-            "excluded_image_gallery_patterns_desc": "Expressions régulières de fichiers images et galeries ou de chemins d'accès à exclure de l'analyse et à ajouter au nettoyage",
+            "excluded_image_gallery_patterns_desc": "Expressions régulières de fichiers images et galeries ou de chemins d'accès à exclure de l'analyse et à ajouter aux tâches de nettoyage.",
             "excluded_image_gallery_patterns_head": "Modèles d'image ou galerie exclus",
-            "excluded_video_patterns_desc": "Expressions régulières de fichiers vidéo ou de chemins d'accès à exclure de l'analyse et à ajouter au nettoyage",
+            "excluded_video_patterns_desc": "Expressions régulières de fichiers vidéo ou de chemins d'accès à exclure de l'analyse et à ajouter aux tâches de nettoyage.",
             "excluded_video_patterns_head": "Modèles de vidéo exclus",
             "ffmpeg": {
                 "hardware_acceleration": {
@@ -376,22 +383,22 @@
                 },
                 "ffmpeg_path": {
                     "heading": "Chemin de l'exécutable FFmpeg",
-                    "description": "Chemin vers l'exécutable de FFmpeg (pas seulement le répertoire). Si vide, FFmpeg sera résolu à partir de l'environnement via $PATH, le répertoire de configuration, ou depuis $HOME/.stash"
+                    "description": "Chemin vers l'exécutable de FFmpeg (pas seulement le répertoire). Si vide, FFmpeg sera résolu à partir de l'environnement via $PATH, le répertoire de configuration, ou depuis $HOME/.stash."
                 },
                 "ffprobe_path": {
-                    "description": "Chemin vers l'exécutable de FFprobe (pas seulement le répertoire). Si vide, FFprobe sera résolu à partir de l'environnement via $PATH, le répertoire de configuration, ou depuis $HOME/.stash",
+                    "description": "Chemin vers l'exécutable de FFprobe (pas seulement le répertoire). Si vide, FFprobe sera résolu à partir de l'environnement via $PATH, le répertoire de configuration, ou depuis $HOME/.stash.",
                     "heading": "Chemin de l'exécutable FFprobe"
                 }
             },
             "funscript_heatmap_draw_range": "Inclure l'amplitude dans les cartes thermiques générées",
             "funscript_heatmap_draw_range_desc": "Dessiner l'étendue du mouvement sur l'axe des ordonnées de la carte thermique générée. Les cartes thermiques existantes devront être régénérées après modifications.",
-            "gallery_cover_regex_desc": "Expression régulière utilisée pour identifier une image comme vignette de la galerie",
+            "gallery_cover_regex_desc": "Expressions régulières utilisées pour identifier une image comme vignette de la galerie.",
             "gallery_cover_regex_label": "Modèle de vignette de la galerie",
-            "gallery_ext_desc": "Liste d'extensions de fichiers séparées par des virgules qui seront reconnues comme des archives zip de la galerie.",
-            "gallery_ext_head": "Extensions zip de la galerie",
+            "gallery_ext_desc": "Liste d'extensions de fichiers séparées par des virgules qui seront reconnues comme des archives ZIP de la galerie.",
+            "gallery_ext_head": "Extensions ZIP de la galerie",
             "generated_file_naming_hash_desc": "Utilisez MD5 ou oshash pour le nommage des fichiers générés. Le modifier exige que toutes les scènes soient renseignées avec une valeur MD5/oshash appropriée. Après avoir modifié cette valeur, les fichiers générés existants devront être migrés ou régénérés. Voir la page Tâches pour la migration.",
             "generated_file_naming_hash_head": "Empreinte pour le nommage des fichiers générés",
-            "generated_files_location": "Emplacement des fichiers générés (marqueurs de scène, aperçus de scène, sprites, etc.)",
+            "generated_files_location": "Emplacement des fichiers générés (marqueurs de scène, aperçus de scène, sprites, etc.).",
             "generated_path_head": "Chemin des fichiers générés",
             "hashing": "Hachage",
             "heatmap_generation": "Génération de la carte thermique du script interactif",
@@ -400,26 +407,26 @@
             "include_audio_desc": "Inclure le flux audio lors de la génération des aperçus.",
             "include_audio_head": "Inclure l'audio",
             "logging": "Journalisation",
-            "maximum_streaming_transcode_size_desc": "Résolution maximale pour les flux transcodés",
+            "maximum_streaming_transcode_size_desc": "Résolution maximale pour les flux transcodés.",
             "maximum_streaming_transcode_size_head": "Résolution maximale du flux transcodé",
-            "maximum_transcode_size_desc": "Résolution maximale pour les transcodes générés",
+            "maximum_transcode_size_desc": "Résolution maximale pour les transcodes générés.",
             "maximum_transcode_size_head": "Résolution maximale de transcodage",
             "metadata_path": {
-                "description": "Emplacement utilisé lors d'une exportation ou d'une importation complète",
+                "description": "Emplacement utilisé lors d'une exportation ou d'une importation complète.",
                 "heading": "Chemin des métadonnées"
             },
-            "number_of_parallel_task_for_scan_generation_desc": "Définir à 0 pour une détection automatique. Avertissement exécuter plus de tâches que ce qui est nécessaire pour atteindre une utilisation à 100% du processeur diminuera les performances et pourra causer d'autres problèmes.",
+            "number_of_parallel_task_for_scan_generation_desc": "Définir à 0 pour une détection automatique. Avertissement exécuter plus de tâches que ce qui est nécessaire pour atteindre une utilisation à 100% du CPU diminuera les performances et pourra causer d'autres problèmes.",
             "number_of_parallel_task_for_scan_generation_head": "Nombre de tâches parallèles pour l'analyse et la génération",
             "parallel_scan_head": "Analyse ou génération en parallèle",
             "preview_generation": "Génération d'aperçu",
             "python_path": {
-                "description": "Chemin de l'exécutable python (pas uniquement le répertoire). Utilisé par les extracteurs de contenu et les plugins. Si vide, python sera résolu à partir de l'environnement",
+                "description": "Chemin de l'exécutable python (pas uniquement le répertoire). Utilisé par les extracteurs de contenu et les plugins. Si vide, Python sera résolu à partir de l'environnement.",
                 "heading": "Chemin de l'exécutable Python"
             },
             "scraper_user_agent": "Agent utilisateur de l'extracteur",
-            "scraper_user_agent_desc": "Chaîne agent utilisateur utilisée par les requêtes http lors de l'extraction de contenu",
+            "scraper_user_agent_desc": "Chaîne agent utilisateur utilisée par les requêtes HTTP lors de l'extraction de contenu.",
             "scrapers_path": {
-                "description": "Emplacement des fichiers de configuration des extracteurs de contenu",
+                "description": "Emplacement des fichiers de configuration des extracteurs de contenu.",
                 "heading": "Chemin des extracteurs de contenu"
             },
             "scraping": "Extraction de données",
@@ -428,13 +435,24 @@
             "video_ext_head": "Extensions de fichiers vidéo",
             "video_head": "Vidéo",
             "plugins_path": {
-                "description": "Emplacement du répertoire des fichiers de configuration des plugins",
+                "description": "Emplacement du répertoire des fichiers de configuration des plugins.",
                 "heading": "Chemin des plugins"
             },
             "delete_trash_path": {
                 "description": "Chemin où les fichiers supprimés seront déplacés au lieu d'être définitivement supprimés. Laissez ce champ vide pour supprimer définitivement les fichiers.",
                 "heading": "Chemin de la corbeille"
-            }
+            },
+            "sprite_generation_head": "Génération de sprites",
+            "sprite_interval_desc": "Temps en secondes entre chaque sprite généré.",
+            "sprite_interval_head": "Intervalle entre sprites",
+            "sprite_maximum_desc": "Nombre maximal de sprites à générer pour une scène. Définir sur 0 pour désactiver la limite.",
+            "sprite_maximum_head": "Sprites maximums",
+            "sprite_minimum_desc": "Nombre minimum de sprites à générer pour une scène",
+            "sprite_minimum_head": "Sprites minimums",
+            "sprite_screenshot_size_desc": "Taille désirée pour chaque sprite en pixels.",
+            "sprite_screenshot_size_head": "Taille des sprites",
+            "use_custom_sprite_interval_head": "Utiliser un intervalle de sprite personnalisé",
+            "use_custom_sprite_interval_desc": "Active l'intervalle de sprite personnalisé selon les paramètres ci-dessous."
         },
         "library": {
             "exclusions": "Exceptions",
@@ -453,7 +471,7 @@
         "scraping": {
             "entity_metadata": "Métadonnées {entityType}",
             "entity_scrapers": "Extracteurs de {entityType}",
-            "excluded_tag_patterns_desc": "Expressions régulières de noms d'étiquettes à exclure des résultats de l'extraction",
+            "excluded_tag_patterns_desc": "Expressions régulières de noms d'étiquettes à exclure des résultats de l'extraction.",
             "excluded_tag_patterns_head": "Modèles d'étiquette excluse",
             "scraper": "Extracteur",
             "scrapers": "Extracteurs",
@@ -490,7 +508,6 @@
             "auto_tagging": "Étiquetage automatique",
             "backing_up_database": "Sauvegarde de la base de données",
             "backup_and_download": "Effectue une sauvegarde de la base de données et télécharge le fichier résultant.",
-            "backup_database": "Effectue un enregistrement de la base de données dans le répertoire de sauvegarde, avec le format de nom de fichier {filename_format}",
             "cleanup_desc": "Vérifier les fichiers manquants et les supprimer de la base de données. Cette action est irréversible.",
             "data_management": "Gestion des données",
             "defaults_set": "Les valeurs par défaut ont été définies et seront utilisées en cliquant sur le bouton {action} de la page Tâches.",
@@ -503,7 +520,7 @@
             },
             "generate_clip_previews_during_scan": "Générer des aperçus pour les séquences d'images",
             "generate_desc": "Générer les supports images, sprites, vidéos, vtt et autres fichiers associés.",
-            "generate_phashes_during_scan": "Générer des empreintes perceptuelles",
+            "generate_phashes_during_scan": "Générer les empreintes perceptuelles de la vidéo",
             "generate_phashes_during_scan_tooltip": "Pour la déduplication et l'identification des scènes.",
             "generate_previews_during_scan": "Générer des aperçus d'images animées",
             "generate_previews_during_scan_tooltip": "Génère également des aperçus animés (webp), uniquement requis lorsque le mode de prévisualisation Scène/Mur de marqueurs est défini sur Image animée. Lors de la navigation, ils utilisent moins de ressources CPU que les aperçus vidéo, mais sont générés en complément de ceux-ci et constituent des fichiers plus volumineux.",
@@ -539,7 +556,9 @@
                 "tag_skipped_matches": "Étiqueter les correspondances ignorées avec",
                 "tag_skipped_matches_tooltip": "Créer une étiquette telle que \"Identifier : plusieurs correspondances\" filtrable dans la vue Étiquetage de scène et déterminer la bonne correspondance manuellement",
                 "tag_skipped_performer_tooltip": "Créer une étiquette telle que \"Identifier : Performeur à nom unique\" filtrable dans la vue Étiquetage de scène et déterminer comment les traiter",
-                "tag_skipped_performers": "Étiqueter les performeurs ignorés avec"
+                "tag_skipped_performers": "Étiqueter les performeurs ignorés avec",
+                "performer_genders": "Genres des performeurs",
+                "performer_genders_desc": "Les performeurs dont le genre a été sélectionné seront inclus lors de l'identification."
             },
             "import_from_exported_json": "Importation à partir du JSON exporté dans le répertoire des métadonnées. Efface la base de données existante.",
             "incremental_import": "Importation incrémentielle à partir d'un fichier zip d'exportation fourni.",
@@ -579,7 +598,20 @@
             },
             "generate_sprites_during_scan_tooltip": "L'ensemble des images affichées en dessous du lecteur vidéo pour une navigation aisée.",
             "rescan": "Réanalyse des fichiers",
-            "rescan_tooltip": "Réanalyse chaque fichier contenu dans le chemin d'accès. Utilisé pour forcer la mise à jour des métadonnées des fichiers et réanalyser les archives zip."
+            "rescan_tooltip": "Réanalyse chaque fichier contenu dans le chemin d'accès. Utilisé pour forcer la mise à jour des métadonnées des fichiers et réanalyser les archives zip.",
+            "generate_image_phashes_during_scan": "Générer les empreintes perceptuelles de l'image",
+            "generate_image_phashes_during_scan_tooltip": "Pour déduplication et identification.",
+            "backup_database": {
+                "description": "Effectue une sauvegarde de la base de données et des fichiers blob.",
+                "destination": "Destination",
+                "download": "Télécharger une sauvegarde",
+                "include_blobs": "Inclure les blobs dans la sauvegarde",
+                "include_blobs_desc": "Désactiver pour ne sauvegarder que le fichier de base de données SQLite.",
+                "sqlite": "Le fichier de sauvegarde sera une copie du fichier de base de données SQLite, avec comme nom de fichier {filename_format}",
+                "to_directory": "Vers {directory}",
+                "warning_blobs": "Les fichiers blob ne seront pas inclus dans la sauvegarde. Cela signifie que pour réussir une restauration à partir de sauvegarde, les fichiers blob doivent être présents dans l'emplacement de stockage blob.",
+                "zip": "Les fichiers de base de données SQLite et les fichiers blob seront compressés en un seul fichier, avec comme nom de fichier {filename_format}"
+            }
         },
         "tools": {
             "scene_duplicate_checker": "Vérificateur de doublons de scènes",
@@ -614,9 +646,9 @@
                 "option_label": "Activer le CSS personnalisé"
             },
             "custom_javascript": {
-                "description": "La page doit être actualisée pour que les changements prennent effet. La compatibilité entre le Javascript personnalisé et les futures versions de Stash n'est pas garantie.",
-                "heading": "Javascript personnalisé",
-                "option_label": "Activer le Javascript personnalisé"
+                "description": "La page doit être actualisée pour que les changements prennent effet. La compatibilité entre le JavaScript personnalisé et les futures versions de Stash n'est pas garantie.",
+                "heading": "JavaScript personnalisé",
+                "option_label": "Activer le JavaScript personnalisé"
             },
             "custom_locales": {
                 "description": "Remplacer individuellement des chaines linguistiques. Voir https://github.com/stashapp/stash/blob/develop/ui/v2.5/src/locales/fr-FR.json pour la liste principale. La page doit être actualisée pour que les changements prennent effet.",
@@ -634,13 +666,13 @@
             "desktop_integration": {
                 "desktop_integration": "Intégration au bureau",
                 "notifications_enabled": "Activer les notifications",
-                "send_desktop_notifications_for_events": "Envoyer des notifications sur le bureau en cas d'événements",
+                "send_desktop_notifications_for_events": "Envoyer des notifications sur le bureau en cas d'événements.",
                 "skip_opening_browser": "Ne pas ouvrir de navigateur",
-                "skip_opening_browser_on_startup": "Ignorer l'ouverture automatique du navigateur lors du démarrage"
+                "skip_opening_browser_on_startup": "Ignorer l'ouverture automatique du navigateur lors du démarrage."
             },
             "detail": {
                 "compact_expanded_details": {
-                    "description": "Activée, cette option présentera des détails plus étendus en préservant une présentation compacte",
+                    "description": "Activée, cette option présentera des détails plus étendus en préservant une présentation compacte.",
                     "heading": "Détails étendus compacts"
                 },
                 "enable_background_image": {
@@ -649,13 +681,13 @@
                 },
                 "heading": "Page Détail",
                 "show_all_details": {
-                    "description": "Activée, tous les détails du contenu seront affichés par défaut et chaque élément détaillé tiendra dans une seule colonne",
+                    "description": "Activée, tous les détails du contenu seront affichés par défaut et chaque élément détaillé tiendra dans une seule colonne.",
                     "heading": "Montrer tous les détails"
                 }
             },
             "editing": {
                 "disable_dropdown_create": {
-                    "description": "Supprimer la possibilité de créer de nouveaux objets à partir des sélecteurs de liste déroulante",
+                    "description": "Supprimer la possibilité de créer de nouveaux objets à partir des sélecteurs de liste déroulante.",
                     "heading": "Désactiver la création depuis la liste déroulante"
                 },
                 "heading": "Édition",
@@ -696,7 +728,7 @@
                 "sync": "Synchroniser"
             },
             "handy_connection_key": {
-                "description": "Clé de connexion Handy à utiliser pour les scènes interactives. En définissant cette clé, vous permettez à Stash de partager les informations de votre scène actuelle avec handyfeeling.com",
+                "description": "Clé de connexion Handy à utiliser pour les scènes interactives. En définissant cette clé, vous permettez à Stash de partager les informations de votre scène actuelle avec handyfeeling.com.",
                 "heading": "Clé de connexion Handy"
             },
             "image_lightbox": {
@@ -711,11 +743,11 @@
                 "heading": "Images",
                 "options": {
                     "create_image_clips_from_videos": {
-                        "description": "Lorsqu'une bibliothèque a des vidéos désactivées, les fichiers vidéo (fichiers se terminant par une extension vidéo) seront analysés comme séquences d'images.",
+                        "description": "Lorsqu'une bibliothèque a des vidéos désactivées, les fichiers vidéo (voir extension vidéo) seront analysés comme séquences d'images.",
                         "heading": "Analyser les extensions vidéo comme séquences d'images"
                     },
                     "write_image_thumbnails": {
-                        "description": "Écrire les vignettes des images sur disque lorsqu'elles sont générées à la volée",
+                        "description": "Écrire les vignettes des images sur disque lorsqu'elles sont générées à la volée.",
                         "heading": "Enregistrer les vignettes des images"
                     }
                 }
@@ -725,11 +757,11 @@
                 "heading": "Langue"
             },
             "max_loop_duration": {
-                "description": "Durée maximale de la scène pendant laquelle le lecteur bouclera la vidéo - 0 pour désactiver",
+                "description": "Durée maximale de la scène pendant laquelle le lecteur bouclera la vidéo. Définir sur 0 pour désactiver.",
                 "heading": "Durée maximale de la boucle"
             },
             "menu_items": {
-                "description": "Afficher ou masquer différents types de contenus dans la barre de navigation",
+                "description": "Afficher ou masquer différents types de contenus dans la barre de navigation.",
                 "heading": "Éléments de la barre de navigation"
             },
             "minimum_play_percent": {
@@ -739,7 +771,7 @@
             "performers": {
                 "options": {
                     "image_location": {
-                        "description": "Emplacement personnalisé pour les images de performeurs par défaut. Laisser vide pour utiliser les réglages intégrés par défaut",
+                        "description": "Emplacement personnalisé pour les images de performeurs par défaut. Laisser vide pour utiliser les réglages intégrés par défaut.",
                         "heading": "Chemin de l'image personnalisée du performeur"
                     }
                 }
@@ -765,16 +797,16 @@
                     "always_start_from_beginning": "Toujours démarrer la vidéo depuis le début",
                     "auto_start_video": "Démarrer automatiquement la vidéo",
                     "auto_start_video_on_play_selected": {
-                        "description": "Démarrage automatique des scènes vidéo lorsqu'elles sont lues à partir de la file d'attente, d'une sélection ou aléatoires à partir de la page Scènes",
+                        "description": "Démarrage automatique des scènes vidéo lorsqu'elles sont lues à partir de la file d'attente, d'une sélection ou aléatoires à partir de la page Scènes.",
                         "heading": "Démarrer automatiquement la vidéo lorsque lecture est sélectionnée"
                     },
                     "continue_playlist_default": {
-                        "description": "Lire la scène suivante de la file d'attente lorsque une vidéo se termine",
+                        "description": "Lire la scène suivante de la file d'attente lorsque une vidéo se termine.",
                         "heading": "Continuer la liste de lecture par défaut"
                     },
                     "disable_mobile_media_auto_rotate": "Désactiver la rotation automatique des médias en plein écran sur mobile",
                     "enable_chromecast": "Activer Chromecast",
-                    "show_ab_loop_controls": "Afficher les commandes du plugin AB Loop",
+                    "show_ab_loop_controls": "Afficher les commandes de boucle AB",
                     "show_scrubber": "Montrer la barre de progression",
                     "track_activity": "Activer l'historique de lecture des scènes",
                     "vr_tag": {
@@ -796,18 +828,18 @@
                 "heading": "Tentatives de défilement avant transition"
             },
             "show_tag_card_on_hover": {
-                "description": "Afficher une fiche d'identification lors du survol des badges d'étiquettes",
+                "description": "Afficher une fiche d'identification lors du survol des badges d'étiquettes.",
                 "heading": "Infobulles d'identification"
             },
             "slideshow_delay": {
-                "description": "Le diaporama est disponible dans galerie en mode de vue mural",
+                "description": "Le diaporama est disponible dans galerie en mode de vue mural.",
                 "heading": "Délai du diaporama (secondes)"
             },
             "studio_panel": {
                 "heading": "Vue studios",
                 "options": {
                     "show_child_studio_content": {
-                        "description": "Dans la vue studios, afficher également le contenu des studios affiliés",
+                        "description": "Dans la vue studios, afficher également le contenu des studios affiliés.",
                         "heading": "Afficher le contenu des studios affiliés"
                     }
                 }
@@ -816,7 +848,7 @@
                 "heading": "Vue étiquettes",
                 "options": {
                     "show_child_tagged_content": {
-                        "description": "Dans la vue étiquettes, afficher également le contenu des étiquettes affiliées",
+                        "description": "Dans la vue étiquettes, afficher également le contenu des étiquettes affiliées.",
                         "heading": "Afficher le contenu des étiquettes affiliées"
                     }
                 }
@@ -837,9 +869,30 @@
             "sfw_mode": {
                 "description": "Activez cette option si vous utilisez Stash pour stocker du contenu SFW. Masque ou modifie certains aspects de l'interface utilisateur liés au contenu pour adultes.",
                 "heading": "Mode contenu SFW"
+            },
+            "custom_title": {
+                "description": "Texte personnalisé à ajouter au titre de la page. Si vide, \"Stash\" par défaut.",
+                "heading": "Titre personnalisé"
+            },
+            "troubleshooting_mode": {
+                "button": "Mode dépannage",
+                "dialog_title": "Activer le mode dépannage",
+                "dialog_description": "Cela désactivera temporairement toutes les personnalisations afin de faciliter le diagnostic des problèmes :",
+                "dialog_item_plugins": "Tous les plugins",
+                "dialog_item_css": "CSS personnalisé",
+                "dialog_item_js": "JavaScript personnalisé",
+                "dialog_item_locales": "Paramètres régionaux personnalisés",
+                "dialog_log_level": "Le niveau de journalisation sera défini sur Débogage pour des diagnostics détaillés.",
+                "dialog_reload_note": "La page s'actualisera automatiquement.",
+                "enable": "Activer et actualiser",
+                "overlay_message": "Le mode dépannage est actif. Toutes les personnalisations sont désactivées.",
+                "exit": "Sortir"
             }
         },
-        "advanced_mode": "Mode avancé"
+        "advanced_mode": "Mode avancé",
+        "changelog": {
+            "header": "Journal de modifications"
+        }
     },
     "configuration": "Configuration",
     "countables": {
@@ -859,7 +912,8 @@
     "criterion": {
         "greater_than": "Supérieur à",
         "less_than": "Inférieur à",
-        "value": "Valeur"
+        "value": "Valeur",
+        "unsupported": "{type} (non supporté)"
     },
     "criterion_modifier": {
         "between": "entre",
@@ -927,7 +981,7 @@
             "page_header": "Page {page} / {total}",
             "reset_zoom_on_nav": "Réinitialisation du facteur de zoom lors d'un changement d'image",
             "scale_up": {
-                "description": "Redimensionner les petites images pour les adapter à l'écran",
+                "description": "Redimensionner les petites images pour les adapter à l'écran.",
                 "label": "Mise à l'échelle"
             },
             "scroll_mode": {
@@ -943,10 +997,6 @@
             "empty_results": "Les valeurs des champs de destination seront inchangées.",
             "source": "Source"
         },
-        "merge_tags": {
-            "destination": "Destination",
-            "source": "Source"
-        },
         "performers_found": "{count} performeurs trouvés",
         "reassign_entity_title": "{count, plural, one {Réaffecté {singularEntity}} other {Réaffectés {pluralEntity}}}",
         "reassign_files": {
@@ -969,7 +1019,7 @@
             "override_preview_generation_options": "Remplacer les options de génération d'aperçu",
             "override_preview_generation_options_desc": "Remplacer les options de génération d'aperçu pour cette opération. Les valeurs par défaut sont définies dans Système -> Génération d'aperçus.",
             "overwrite": "Remplacer les fichiers existants",
-            "phash": "Empreintes perceptuelles",
+            "phash": "Empreintes perceptuelles de la vidéo",
             "preview_exclude_end_time_desc": "Exclure les x dernières secondes des aperçus de la scène. Cela peut être une valeur en secondes, ou un pourcentage (par exemple 2%) de la durée totale de la scène.",
             "preview_exclude_end_time_head": "Exclure le temps de fin",
             "preview_exclude_start_time_desc": "Exclure les x premières secondes des aperçus de la scène. Cela peut être une valeur en secondes, ou un pourcentage (par exemple 2%) de la durée totale de la scène.",
@@ -989,7 +1039,9 @@
             "video_previews": "Aperçus",
             "video_previews_tooltip": "Prévisualisation de la vidéo lors du survol d'une scène",
             "phash_tooltip": "Pour la déduplication et l'identification des scènes",
-            "image_thumbnails": "Vignettes d'images"
+            "image_thumbnails": "Vignettes d'images",
+            "image_phash": "Empreintes perceptuelles de l'image",
+            "image_phash_tooltip": "Pour déduplication et identification"
         },
         "scenes_found": "{count} scènes trouvées",
         "scrape_entity_query": "Requête d'extraction {entity_type}",
@@ -1007,7 +1059,8 @@
         "stashid_exists_warning": "L'identifiant Stash existant pour cette Stash-Box sera remplacé.",
         "studios_found": "{count} studios trouvés",
         "tags_found": "{count} étiquettes trouvées",
-        "scrape_results_missing": "Manquant"
+        "scrape_results_missing": "Manquant",
+        "edit_entity_count_title": "Éditer {count} {count, plural, one {{singularEntity}} other {{pluralEntity}}}"
     },
     "dimensions": "Dimensions",
     "director": "Réalisateur",
@@ -1160,9 +1213,7 @@
     "measurements": "Mensurations",
     "media_info": {
         "audio_codec": "Codec audio",
-        "checksum": "Somme de contrôle",
         "downloaded_from": "Téléchargé depuis",
-        "hash": "Empreinte",
         "interactive_speed": "Vitesse interactive",
         "performer_card": {
             "age": "{age} {years_old}",
@@ -1173,7 +1224,11 @@
         "play_duration": "Temps de lecture",
         "stream": "Flux",
         "video_codec": "Codec vidéo",
-        "o_count": "Nombre d'O"
+        "o_count": "Nombre d'O",
+        "md5": "Somme de contrôle MD5",
+        "oshash": "oshash",
+        "oshash_meaning": "Empreinte OpenSubtitles",
+        "phash_meaning": "Empreinte perceptuelle"
     },
     "megabits_per_second": "{value} mbps",
     "metadata": "Métadonnées",
@@ -1210,14 +1265,6 @@
         "any_names_entered_will_be_queried": "Tout nom saisi sera demandé à l'instance distante StashBox et ajouté si trouvé. Seules les correspondances exactes seront considérées comme équivalentes.",
         "batch_add_performers": "Ajouter des performeurs par lots",
         "batch_update_performers": "Mises à jour des performeurs par lots",
-        "config": {
-            "active_stash-box_instance": "Instance stash-box active :",
-            "edit_excluded_fields": "Modifier les champs exclus",
-            "excluded_fields": "Champs exclus :",
-            "no_fields_are_excluded": "Aucun champ n'est exclu",
-            "no_instances_found": "Aucune instance trouvée",
-            "these_fields_will_not_be_changed_when_updating_performers": "Ces champs ne seront pas modifiés lors de la mise à jour des performeurs."
-        },
         "current_page": "Page actuelle",
         "failed_to_save_performer": "Échec pour sauvegarder le performeur \"{performer}\"",
         "name_already_exists": "Le nom existe déjà",
@@ -1375,7 +1422,7 @@
         "welcome_to_stash": "Bienvenue sur Stash"
     },
     "stash_id": "identifiant Stash",
-    "stash_id_endpoint": "Point de terminaison de l'identifiant Stash",
+    "stash_id_endpoint": "URL du point de terminaison de l'identifiant Stash",
     "stash_ids": "identifiants Stash",
     "stashbox": {
         "go_review_draft": "Allez sur {endpoint_name} pour examiner l'ébauche.",
@@ -1406,14 +1453,8 @@
         "batch_add_studios": "Ajouter des studios par lots",
         "batch_update_studios": "Mise à jour des studios par lots",
         "config": {
-            "active_stash-box_instance": "Instance active Stash-Box :",
             "create_parent_desc": "Créer les studios parents manquants, ou étiqueter et mettre à jour les données/image pour les studios parents existants avec des correspondances de noms exactes",
-            "create_parent_label": "Créer les studios parents",
-            "edit_excluded_fields": "Éditer les champs exclus",
-            "excluded_fields": "Champs exclus :",
-            "no_fields_are_excluded": "Aucun champ n'est exclu",
-            "no_instances_found": "Aucunes instances trouvées",
-            "these_fields_will_not_be_changed_when_updating_studios": "Ces champs ne seront pas modifiés lors de la mise à jour des studios."
+            "create_parent_label": "Créer les studios parents"
         },
         "create_or_tag_parent_studios": "Créer les studios parents manquants ou étiqueter les existants",
         "current_page": "Page actuelle",
@@ -1466,7 +1507,11 @@
         "started_auto_tagging": "Début de l'étiquetage automatique",
         "started_generating": "Début de la génération",
         "started_importing": "Début d'importation",
-        "updated_entity": "{entity} mis·e à jour"
+        "updated_entity": "{entity} mis·e à jour",
+        "merged_performers": "Performeurs fusionnés",
+        "clipboard_access_denied": "Accès au presse-papiers refusé. Vérifiez les autorisations de votre navigateur.",
+        "clipboard_image_pasted": "Image collée depuis le presse-papiers",
+        "clipboard_no_image": "Aucune image trouvée dans le presse-papiers"
     },
     "total": "Total",
     "true": "Vrai",
@@ -1593,5 +1638,59 @@
         "no_results": "Aucun résultat trouvé.",
         "placeholder_name_or_id": "{entityType} nom ou identifiant Stash...",
         "select_stashbox": "Sélectionner une Stash-Box..."
-    }
+    },
+    "latest_scene": "Dernière scène",
+    "stash_id_count": "Nombre d'identifiants Stash",
+    "duplicated": "Dupliqué",
+    "duplicated_stash_id": "Dupliqué (identifiant Stash)",
+    "duplicated_title": "Dupliqué (Titre)",
+    "career_end": "Fin de carrière",
+    "career_start": "Début de carrière",
+    "tag_tagger": {
+        "add_new_tags": "Ajouter de nouvelles étiquettes",
+        "any_names_entered_will_be_queried": "Tous les noms saisis seront recherchés dans l'instance Stash-Box distante et ajoutés si trouvés. Seules les correspondances exactes seront considérées comme valides.",
+        "batch_add_tags": "Ajouter des étiquettes par lot",
+        "batch_update_tags": "Mise à jour groupée d'étiquettes",
+        "current_page": "Page actuelle",
+        "failed_to_save_tag": "Impossible d'enregistrer l'étiquette \"{tag}\"",
+        "name_already_exists": "Nom déjà existant",
+        "network_error": "Erreur réseau",
+        "no_results_found": "Aucun résultat trouvé.",
+        "number_of_tags_will_be_processed": "{tag_count} étiquettes seront traitées",
+        "query_all_tags_in_the_database": "Toutes les étiquettes dans la base de données",
+        "refresh_tagged_tags": "Actualiser les étiquettes marquées",
+        "refreshing_will_update_the_data": "Une actualisation mettra à jour les données de toutes les étiquettes marquées à partir de l'instance Stash-Box.",
+        "status_tagging_job_queued": "Statut : Tâche d'étiquetage en attente",
+        "status_tagging_tags": "Statut : Marquage des étiquettes",
+        "tag_already_tagged": "Étiquette déjà marquée",
+        "tag_names_or_stashids_separated_by_comma": "Noms d'étiquettes ou identifiants Stash séparés par des virgules",
+        "tag_selection": "Sélection d'étiquettes",
+        "tag_successfully_tagged": "Étiquette marquée avec succès",
+        "tag_status": "Statut étiquette",
+        "to_use_the_tag_tagger": "Pour utiliser le marqueur d'étiquettes, une instance Stash-Box doit être configurée.",
+        "untagged_tags": "Étiquettes non marquées",
+        "update_tags": "Mise à jour des étiquettes",
+        "updating_untagged_tags_description": "Une mise à jour des étiquettes non marquées tentera de faire correspondre toutes les étiquettes sans identifiant Stash et d'actualiser les métadonnées.",
+        "config": {
+            "create_parent_desc": "Créer les étiquettes parentes manquantes à partir des catégories de Stash-Box, ou attribuer des étiquettes parentes existantes dont le nom correspond exactement",
+            "create_parent_label": "Créer des étiquettes parentes"
+        },
+        "create_or_tag_parent_tags": "Créer les étiquettes parentes manquantes ou les associer aux étiquettes existantes"
+    },
+    "tagger": {
+        "config": {
+            "active_stash-box_instance": "Instance active Stash-Box :",
+            "edit_excluded_fields": "Éditer les champs exclus",
+            "excluded_fields": "Champs exclus :",
+            "fields_will_not_be_changed": "Ces champs ne seront pas modifiés lors de la mise à jour de {entity}.",
+            "no_fields_are_excluded": "Aucun champ n'est exclu",
+            "no_instances_found": "Aucune instance trouvée"
+        }
+    },
+    "unsupported_criteria": "Critère non supporté : {criteria}",
+    "include_sub_folders": "Inclure les sous-répertoires",
+    "parent_folder": "Répertoire parent",
+    "sub_folder_depth": "Profondeur des sous-répertoires (vide pour tous)",
+    "sub_folders": "Sous-répertoires",
+    "empty_value": "vide"
 }
diff --git a/ui/v2.5/src/locales/hi-IN.json b/ui/v2.5/src/locales/hi-IN.json
index daa1968b3..dec64f576 100644
--- a/ui/v2.5/src/locales/hi-IN.json
+++ b/ui/v2.5/src/locales/hi-IN.json
@@ -38,8 +38,6 @@
         "export_all": "सभी निर्यात करें…",
         "logout": "लॉग आउट",
         "merge": "मिलाएं",
-        "merge_from": "इससे मिलाएं",
-        "merge_into": "इसमें मिलाएं",
         "previous_action": "पीछे जाएं",
         "reload": "पुनः लोड करें",
         "remove": "निकालें",
diff --git a/ui/v2.5/src/locales/hr-HR.json b/ui/v2.5/src/locales/hr-HR.json
index 2102fc165..2f9e4134b 100644
--- a/ui/v2.5/src/locales/hr-HR.json
+++ b/ui/v2.5/src/locales/hr-HR.json
@@ -49,8 +49,6 @@
         "import_from_file": "Uvezi iz datoteke",
         "logout": "Odjava",
         "merge": "Spoji",
-        "merge_from": "Spoji iz",
-        "merge_into": "Spoji u",
         "next_action": "Dalje",
         "not_running": "nije pokrenuto",
         "open_in_external_player": "Otvori u vanjskom playeru",
diff --git a/ui/v2.5/src/locales/hu-HU.json b/ui/v2.5/src/locales/hu-HU.json
index e7b5c15f8..62f19cbdd 100644
--- a/ui/v2.5/src/locales/hu-HU.json
+++ b/ui/v2.5/src/locales/hu-HU.json
@@ -100,10 +100,8 @@
         "encoding_image": "Kép kódolása…",
         "hash_migration": "hash-migráció",
         "make_primary": "Beállítás elsődlegesnek",
-        "merge_into": "Összefűzés a",
         "migrate_blobs": "Blobok migrálása",
         "migrate_scene_screenshots": "Jelenet képernyőképek migrálása",
-        "merge_from": "Összefűzés innen",
         "optimise_database": "Adatbázis optimalizálása",
         "reassign": "Átcsoportosítás",
         "remove_from_gallery": "Eltávolítás a galériából",
@@ -398,10 +396,6 @@
                 "zoom": "Nagyítás"
             }
         },
-        "merge_tags": {
-            "destination": "Cél",
-            "source": "Forrás"
-        },
         "scene_gen": {
             "preview_exclude_end_time_desc": "Az utolsó x másodperc kihagyása a jelenetek bemutatóiból. Ez az érték lehet másodpercben, vagy a jelenet teljes hosszának százalékában (pl. 2%) is megadva.",
             "preview_exclude_start_time_desc": "Az első x másodperc kihagyása a jelenetek bemutatóiból. Ez az érték lehet másodpercben, vagy a jelenet teljes hosszának százalékában (pl. 2%) is megadva.",
@@ -518,9 +512,6 @@
     "performer_favorite": "Szereplő Kedvencek Közt",
     "performer_image": "Szereplő Képe",
     "performer_tagger": {
-        "config": {
-            "excluded_fields": "Kihagyott mezők:"
-        },
         "current_page": "Jelenlegi oldal",
         "network_error": "Hálózati Hiba",
         "tag_status": "Címke Státusza",
diff --git a/ui/v2.5/src/locales/id-ID.json b/ui/v2.5/src/locales/id-ID.json
index b4edec6d5..d408aec7c 100644
--- a/ui/v2.5/src/locales/id-ID.json
+++ b/ui/v2.5/src/locales/id-ID.json
@@ -73,8 +73,6 @@
         "logout": "Keluar",
         "make_primary": "Jadikan Utama",
         "merge": "Gabung",
-        "merge_from": "Gabung dari",
-        "merge_into": "Gabung ke",
         "migrate_blobs": "Migrasi Blob",
         "next_action": "Selanjutnya",
         "not_running": "tidak berjalan",
@@ -605,10 +603,6 @@
             "destination": "Destinasi",
             "source": "Sumber"
         },
-        "merge_tags": {
-            "destination": "Destinasi",
-            "source": "Sumber"
-        },
         "scene_gen": {
             "transcodes": "Transkode",
             "video_previews": "Pratinjau"
diff --git a/ui/v2.5/src/locales/index.ts b/ui/v2.5/src/locales/index.ts
index 0e699b8f7..4c6c784a5 100644
--- a/ui/v2.5/src/locales/index.ts
+++ b/ui/v2.5/src/locales/index.ts
@@ -2,6 +2,7 @@ import Countries from "i18n-iso-countries";
 
 export const localeCountries = {
   af: () => import("i18n-iso-countries/langs/af.json"),
+  ar: () => import("i18n-iso-countries/langs/ar.json"),
   bg: () => import("i18n-iso-countries/langs/bg.json"),
   bn: () => import("i18n-iso-countries/langs/bn.json"),
   ca: () => import("i18n-iso-countries/langs/ca.json"),
@@ -56,6 +57,7 @@ export async function registerCountry(locale: string) {
 
 export const localeLoader = {
   afZA: () => import("./af-ZA.json"),
+  ar: () => import("./ar.json"),
   bgBG: () => import("./bg-BG.json"),
   bnBD: () => import("./bn-BD.json"),
   caES: () => import("./ca-ES.json"),
diff --git a/ui/v2.5/src/locales/it-IT.json b/ui/v2.5/src/locales/it-IT.json
index 51347e993..08f3b9ca3 100644
--- a/ui/v2.5/src/locales/it-IT.json
+++ b/ui/v2.5/src/locales/it-IT.json
@@ -58,8 +58,6 @@
         "logout": "Esci",
         "make_primary": "Rendi Primario",
         "merge": "Unisci",
-        "merge_from": "Unisci da",
-        "merge_into": "Unisci in",
         "next_action": "Prossima",
         "not_running": "non in funzione",
         "open_in_external_player": "Aprire nel lettore esterno",
@@ -136,7 +134,25 @@
         "reload": "Ricarica",
         "remove_date": "Rimuovi la data",
         "view_history": "Visualizza cronologia",
-        "add_sub_groups": "Aggiungi Sottogruppi"
+        "add_sub_groups": "Aggiungi Sottogruppi",
+        "add_stash_id": "Aggiungi ID Stash",
+        "create_new": "Crea nuovo",
+        "load": "Carica",
+        "load_filter": "Carica filtro",
+        "play": "Riproduci",
+        "remove_from_containing_group": "Rimuovi dal Gruppo",
+        "reset_play_duration": "Reimposta la durata di riproduzione",
+        "reset_cover": "Ripristina Copertina Predefinita",
+        "select_directory": "Seleziona cartella",
+        "invert_selection": "Inverti Selezione",
+        "set_cover": "Imposta come Copertina",
+        "show_results": "Mostra risultati",
+        "show_count_results": "Mostra risultati {count}",
+        "sidebar": {
+            "close": "Chiudi barra laterale",
+            "open": "Apri barra laterale",
+            "toggle": "Attiva/disattiva barra laterale"
+        }
     },
     "actions_name": "Azioni",
     "age": "Età",
@@ -179,7 +195,14 @@
             "set_tag_label": "Imposta i tags",
             "source": "Sorgente",
             "mark_organized_desc": "Contrassegna immediatamente la scena come \"ordinata\" quando si clicca sul pulsante Save.",
-            "mark_organized_label": "Contrassegna come \"ordinato\" al salvataggio"
+            "mark_organized_label": "Contrassegna come \"ordinato\" al salvataggio",
+            "errors": {
+                "blacklist_duplicate": "Duplica oggetto blacklistato"
+            },
+            "performer_genders": {
+                "heading": "Genere dell'attore/attrice",
+                "description": "Attori con questi generi saranno mostrati durante il tag delle scene."
+            }
         },
         "noun_query": "Query",
         "results": {
@@ -200,7 +223,10 @@
         "verb_scrape_all": "Scrape Tutto",
         "verb_submit_fp": "Invia {fpCount, plural, one{# Fingerprint} other{# Fingerprints}}",
         "verb_toggle_config": "{toggle} {configuration}",
-        "verb_toggle_unmatched": "{toggle} scene non uguali"
+        "verb_toggle_unmatched": "{toggle} scene non uguali",
+        "verb_add_as_alias": "aggiungi nomi ottenuti con scrape come alias",
+        "verb_match_tag": "Compara Tag",
+        "verb_scrape_selected": "Scrape Selezionato"
     },
     "config": {
         "about": {
@@ -251,7 +277,8 @@
             "server_display_name_desc": "Nome visualizzato per il server DLNA. Predefinito come {server_name} se lasciato vuoto.",
             "successfully_cancelled_temporary_behaviour": "Funzionamento temporaneo cancellato con successo",
             "until_restart": "fino al riavvio",
-            "video_sort_order": "Ordinamento dei video di default"
+            "video_sort_order": "Ordinamento dei video di default",
+            "server_port": "Porta del server"
         },
         "general": {
             "auth": {
@@ -276,14 +303,17 @@
                 "password_desc": "Password per accedere a Stash. Lasciare vuota per disabilitare l'autenticazione utente",
                 "stash-box_integration": "Integrazione Stash-box",
                 "username": "Nome Utente",
-                "username_desc": "Nome Utente per accedere a Stash. Lasciare vuoto per disabilitare l'autenticazione"
+                "username_desc": "Nome Utente per accedere a Stash. Lasciare vuoto per disabilitare l'autenticazione",
+                "log_file_max_size": "Massima grandezza log",
+                "log_file_max_size_desc": "Massima grandezza in megabytes del file di log prima che sia compresso. 0MB è disabilitato. Richiede riavvio."
             },
             "backup_directory_path": {
                 "description": "Percorso della directory per i file di backup del database SQLite",
                 "heading": "Percorso Directory di Backup"
             },
             "blobs_path": {
-                "heading": "Percorso dei dati binari"
+                "heading": "Percorso dei dati binari",
+                "description": "Dove salvare dati binari nel filesystem. Applicabile solo quando si utilizza Filesystem con archiviazione Blob. ATTENZIONE: cambiare questo richiede spostare manualmente i dati esistenti."
             },
             "cache_location": "Percorso della Cartella cache",
             "cache_path_head": "Percorso Cache",
@@ -338,10 +368,41 @@
                 "heading": "Percorso Scraper"
             },
             "scraping": "Scraping",
-            "sqlite_location": "Locazione del file per il database SQLite (richiede riavvio)",
+            "sqlite_location": "Locazione del file per il database SQLite (richiede riavvio) ATTENZIONE: salvare il database su un sistema differente rispetto a dove il server di stash è in funzione (p.es. sulla rete) non è supportato!",
             "video_ext_desc": "Lista di estensioni delimitate da Virgola che saranno identificate come video.",
             "video_ext_head": "Estensioni Video",
-            "video_head": "Video"
+            "video_head": "Video",
+            "delete_trash_path": {
+                "description": "Percorso dove i file cancellati saranno spostati invece di essere cancellati permanentemente. Lasciare vuoto per cancellare permanentemente i file.",
+                "heading": "Percorso cestino"
+            },
+            "blobs_storage": {
+                "description": "Dove salvare dati binari come copertine di scene, attori, studio e tag di immagini. Dopo aver cambiato questo valore, i dati esistenti devono essere migrati usando l'attività \"Migrare Blobs\". Guarda la pagina Attività per la migrazione.",
+                "heading": "Tipo storage per dati binari"
+            },
+            "database": "Database",
+            "ffmpeg": {
+                "download_ffmpeg": {
+                    "heading": "Scarica FFmpeg"
+                },
+                "ffmpeg_path": {
+                    "description": "Percorso per l'eseguibile di FFmpeg (non solo la cartella). Se vuoto, ffmpeg verrà determinato dall'ambiente tramite $PATH, dalla cartella di configurazione, o da $HOME/.stash.",
+                    "heading": "Percorso eseguibile FFmpeg"
+                },
+                "ffprobe_path": {
+                    "description": "Percorso per l'eseguibile di FFprobe (non solo la cartella). Se vuoto, ffprobe verrà determinato dall'ambiente tramite $PATH, dalla cartella di configurazione, o da $HOME/.stash.",
+                    "heading": "Percorso eseguibile FFprobe"
+                },
+                "hardware_acceleration": {
+                    "desc": "Usa l'Hardware disponibile per codificare video per la transcodifica in tempo reale.",
+                    "heading": "Codifica hardware FFmpeg"
+                },
+                "live_transcode": {
+                    "input_args": {
+                        "desc": "Avanzato: Arguments aggiuntivi da passare a FFmpeg nel campo di input prima della transcodifica video in tempo reale"
+                    }
+                }
+            }
         },
         "library": {
             "exclusions": "Esclusioni",
@@ -391,7 +452,6 @@
             "auto_tagging": "Tag Automatico",
             "backing_up_database": "Backup del database",
             "backup_and_download": "Esegue il backup del database e scarica il file risultante.",
-            "backup_database": "Esegue il backup del database nella cartella dei backup, nel formato {filename_format}",
             "cleanup_desc": "Controlla il database per file mancanti e li rimuove. Questa è un'azione distruttiva.",
             "data_management": "Gestione dati",
             "defaults_set": "I default sono stati scelti e saranno usati quando si clicca il bottone {action} nella pagina Attività.",
@@ -651,7 +711,10 @@
             },
             "title": "Interfaccia Utente"
         },
-        "advanced_mode": "Modalità Avanzata"
+        "advanced_mode": "Modalità Avanzata",
+        "changelog": {
+            "header": "Registro delle modifiche"
+        }
     },
     "configuration": "Configurazione",
     "countables": {
@@ -739,10 +802,6 @@
             "empty_results": "Il valore del campo destinazione rimarranno inalterati.",
             "source": "Sorgente"
         },
-        "merge_tags": {
-            "destination": "Destinazione",
-            "source": "Origine"
-        },
         "reassign_entity_title": "{count, plural, one {Riassegna {singularEntity}} other {Riassegna {pluralEntity}}}",
         "reassign_files": {
             "destination": "Riassegna a"
@@ -900,7 +959,7 @@
     "image_count": "Numero Immagini",
     "images": "Immagini",
     "include_parent_tags": "Include tag principali",
-    "include_sub_studios": "Include tag sussidiarie",
+    "include_sub_studios": "Includi Studi sussidiari",
     "include_sub_tags": "Include sotto-tags",
     "instagram": "Instagram",
     "interactive": "Interattivo",
@@ -916,9 +975,7 @@
     "measurements": "Misure",
     "media_info": {
         "audio_codec": "Codec Audio",
-        "checksum": "Checksum",
         "downloaded_from": "Scaricato Da",
-        "hash": "Hash",
         "interactive_speed": "Velocità interattiva",
         "performer_card": {
             "age": "{age} {years_old}",
@@ -960,14 +1017,6 @@
         "any_names_entered_will_be_queried": "Qualsiasi nome inserito sarà richiesto dall'istanza remota Stash-Box e aggiunto se trovato. Solo corrispondenze esatte saranno considerate corrispondenze.",
         "batch_add_performers": "Aggiungi Attori in Blocco",
         "batch_update_performers": "Aggiorna Attori in Blocco",
-        "config": {
-            "active_stash-box_instance": "Istanza stash-box attiva:",
-            "edit_excluded_fields": "Modifica Campi Esclusi",
-            "excluded_fields": "Campi esclusi:",
-            "no_fields_are_excluded": "Nessun campo escluso",
-            "no_instances_found": "Nessuna istanza trovata",
-            "these_fields_will_not_be_changed_when_updating_performers": "Questi campi non saranno modificati quando si aggiorneranno gli attori."
-        },
         "current_page": "Pagina corrente",
         "failed_to_save_performer": "Salvataggio attore/attrice \"{performer}\" fallito",
         "name_already_exists": "Nome già esistente",
@@ -1084,8 +1133,8 @@
         },
         "welcome": {
             "config_path_logic_explained": "Stash cerca di trovare il file di configurazione (<code>config.yml</code>) dall'attuale cartella di lavoro inizialmente e se non lo trova lì, cerca in <code>$HOME/.stash/config.yml</code> (sotto Windows, sarà <code>%USERPROFILE%\\.stash\\config.yml</code>). Potete far leggere a Stash un specifico file di configurazione lanciandolo con l'opzione <code>-c '<percorso al file>'</code> o <code>--config '<percorso al file>'</code>.",
-            "in_current_stash_directory": "Nella cartella <code>$HOME/.stash</code>",
-            "in_the_current_working_directory": "Nell'attuale cartella di lavoro",
+            "in_current_stash_directory": "Nella cartella <code>{path}</code>:",
+            "in_the_current_working_directory": "In <code>{path}</code> , attuale cartella di lavoro:",
             "next_step": "Dopo tutto questo, se siete pronti a procedere con la configurazione di un nuovo sistema, scegliete dove vorreste salvare il file di configurazione e premete Prossimo.",
             "store_stash_config": "Dove volete salvare la vostra configurazione di Stash?",
             "unable_to_locate_config": "Se potete leggere questo, allora Stash non ha potuto trovare una configurazione esistente. Questa procedura guidata vi guiderà attraverso il processo per impostare una nuova configurazione.",
@@ -1141,7 +1190,7 @@
         "removed_entity": "Rimosso {count, plural, one {{singularEntity}} other {{pluralEntity}}}",
         "rescanning_entity": "Riscansionando {count, plural, one {{singularEntity}} other {{pluralEntity}}}…",
         "saved_entity": "Salvato/a {entity}",
-        "started_auto_tagging": "Inizato il tag automatico",
+        "started_auto_tagging": "Iniziato il tag automatico",
         "started_generating": "Creazione iniziata",
         "started_importing": "Importazione iniziata",
         "updated_entity": "Aggiornato/a {entity}"
@@ -1172,5 +1221,12 @@
     "circumcised_types": {
         "CUT": "Taglia",
         "UNCUT": "Annulla taglio"
-    }
+    },
+    "studio_tags": "Tag dello Studio",
+    "sub_group": "Sottogruppo",
+    "sub_group_count": "Numero di Sottogruppi",
+    "sub_group_of": "Sottogruppo di {parent}",
+    "sub_group_order": "Ordine Sottogruppi",
+    "sub_groups": "Sottogruppi",
+    "subsidiary_studio_count": "Numero di Studi sussidiari"
 }
diff --git a/ui/v2.5/src/locales/ja-JP.json b/ui/v2.5/src/locales/ja-JP.json
index 3ee3597eb..e6519f7d8 100644
--- a/ui/v2.5/src/locales/ja-JP.json
+++ b/ui/v2.5/src/locales/ja-JP.json
@@ -57,8 +57,6 @@
         "logout": "ログアウト",
         "make_primary": "メインに設定",
         "merge": "マージ",
-        "merge_from": "次からマージ：",
-        "merge_into": "次へマージ：",
         "next_action": "次へ",
         "not_running": "未実行",
         "open_in_external_player": "外部プレーヤーで開く",
@@ -150,7 +148,11 @@
         "play": "再生",
         "show_results": "結果を表示",
         "show_count_results": "{count}件の結果を表示",
-        "load": "読み込み"
+        "load": "読み込み",
+        "add_stash_id": "Stash IDを追加",
+        "create_new": "新規作成",
+        "load_filter": "フィルタを読み込む",
+        "invert_selection": "選択を反転"
     },
     "actions_name": "操作",
     "age": "年齢",
@@ -190,6 +192,9 @@
             "mark_organized_label": "分類済みにして保存",
             "errors": {
                 "blacklist_duplicate": "ブラックリスト項目が重複しています"
+            },
+            "performer_genders": {
+                "heading": "出演者の性別"
             }
         },
         "noun_query": "クエリ",
@@ -211,7 +216,9 @@
         "verb_scrape_all": "全てスクレイプ",
         "verb_submit_fp": "送信 {fpCount, plural, one{# Fingerprint} other{# Fingerprints}}",
         "verb_toggle_config": "{toggle} {configuration}",
-        "verb_toggle_unmatched": "{toggle} 一致しないシーン"
+        "verb_toggle_unmatched": "{toggle} 一致しないシーン",
+        "verb_add_as_alias": "スクレイピングした名前をエイリアスとして追加",
+        "verb_link_existing": "既存のものにリンク"
     },
     "config": {
         "about": {
@@ -290,7 +297,9 @@
                 "password_desc": "Stashにアクセスするためのパスワードです。空白にすると、ユーザー認証を無効にします",
                 "stash-box_integration": "Stash-boxの連携",
                 "username": "ユーザー名",
-                "username_desc": "Stashにアクセスするためのユーザー名です。空白にすると、ユーザー認証を無効にします"
+                "username_desc": "Stashにアクセスするためのユーザー名です。空白にすると、ユーザー認証を無効にします",
+                "log_file_max_size": "最大ログサイズ",
+                "log_file_max_size_desc": "ログファイルが圧縮される前の最大サイズ(MB)。0MBの場合は無効。再起動が必要。"
             },
             "backup_directory_path": {
                 "description": "SQLiteデータベースファイルのバックアップ場所",
@@ -406,7 +415,10 @@
                 "description": "プラグイン設定ファイルのディレクトリ",
                 "heading": "プラグインパス"
             },
-            "funscript_heatmap_draw_range": "生成済みのヒートマップに範囲を含める"
+            "funscript_heatmap_draw_range": "生成済みのヒートマップに範囲を含める",
+            "delete_trash_path": {
+                "heading": "ゴミ箱のパス"
+            }
         },
         "library": {
             "exclusions": "除外",
@@ -461,7 +473,6 @@
             "auto_tagging": "自動タグ付け",
             "backing_up_database": "データベースをバックアップ",
             "backup_and_download": "データベースのバックアップを実施し、結果ファイルをダウンロードします。",
-            "backup_database": "{filename_format}形式で、バックアップ先にデータベースをバックアップします",
             "cleanup_desc": "不明なファイルを確認し、データベースから削除します。この操作はもとに戻せません。",
             "data_management": "データ管理",
             "defaults_set": "デフォルトが設定されており、タスクページの{action}ボタンをクリックした際に使用されます。",
@@ -516,7 +527,7 @@
             "maintenance": "メンテナンス",
             "migrate_hash_files": "生成ファイルの命名ハッシュを変更後、既に存在する生成ファイルを新しいハッシュ形式にリネームする際に使用されます。",
             "migrations": "移行",
-            "only_dry_run": "ドライモードで実行します。削除されません",
+            "only_dry_run": "ドライランモードで実行します。何も削除されません",
             "plugin_tasks": "プラグインのタスク",
             "scan": {
                 "scanning_all_paths": "すべてのパスをスキャン中",
@@ -569,7 +580,8 @@
                 "whitespace_chars": "空白文字",
                 "whitespace_chars_desc": "タイトルに含まれるこれらの文字は空白文字で置き換えられます"
             },
-            "scene_tools": "シーンツール"
+            "scene_tools": "シーンツール",
+            "heading": "ツール"
         },
         "ui": {
             "abbreviate_counters": {
@@ -726,7 +738,7 @@
                     "disable_mobile_media_auto_rotate": "モバイル機器でフル画面再生時の画面回転を無効化",
                     "enable_chromecast": "クロームキャスト機能の有効化",
                     "vr_tag": {
-                        "heading": "VRタッグ",
+                        "heading": "VRタグ",
                         "description": "VRボタンはこのタグがついたシーンにのみ表示されます。"
                     },
                     "show_ab_loop_controls": "ABループプラグインのコントロールを表示",
@@ -793,6 +805,28 @@
             },
             "performer_list": {
                 "heading": "AV女優・男優リスト"
+            },
+            "sfw_mode": {
+                "description": "健全なコンテンツの為にstashを使用している場合に有効化しましょう。 アダルトコンテンツに関連したUIは隠されるか健全化されて表示されます。",
+                "heading": "SFWコンテンツモード"
+            },
+            "custom_title": {
+                "heading": "カスタムタイトル",
+                "description": "ページタイトルに追加するカスタムテキスト。空欄の場合は'Stash'がデフォルトになります。"
+            },
+            "troubleshooting_mode": {
+                "button": "トラブルシューティングモード",
+                "dialog_title": "トラブルシューティングモードを有効化",
+                "dialog_description": "問題の診断を行うため、すべてのカスタマイズを一時的に無効化します。",
+                "dialog_item_plugins": "すべてのプラグイン",
+                "dialog_item_css": "カスタムCSS",
+                "dialog_item_js": "カスタムJavaScript",
+                "dialog_item_locales": "カスタムロケール",
+                "dialog_log_level": "詳細な診断のため、ログレベルがDebugに設定されます。",
+                "dialog_reload_note": "このページは自動的にリロードされます。",
+                "enable": "有効化してリロード",
+                "overlay_message": "トラブルシューティングモードが有効 - すべてのカスタマイズが無効化",
+                "exit": "終了"
             }
         },
         "advanced_mode": "高度なモード"
@@ -884,10 +918,6 @@
             "empty_results": "宛先欄の値は変更されません。",
             "source": "ソース"
         },
-        "merge_tags": {
-            "destination": "場所",
-            "source": "ソース"
-        },
         "reassign_entity_title": "{count, plural, one {{singularEntity}を再割り当て} other {{pluralEntity}を再割り当て}}",
         "reassign_files": {
             "destination": "次に再割り当て:"
@@ -961,7 +991,8 @@
             "medium": "中"
         },
         "search_accuracy_label": "検索精度",
-        "title": "重複シーン"
+        "title": "重複シーン",
+        "select_youngest": "重複グループの中で最も新しいファイルを選択"
     },
     "duplicated_phash": "重複 (phash)",
     "duration": "長さ",
@@ -1059,9 +1090,7 @@
     "measurements": "スリーサイズ",
     "media_info": {
         "audio_codec": "音声コーデック",
-        "checksum": "チェックサム",
         "downloaded_from": "ダウンロード元",
-        "hash": "ハッシュ",
         "interactive_speed": "インタラクティブ速度",
         "performer_card": {
             "age": "{age}{years_old}",
@@ -1084,7 +1113,8 @@
         "first": "最初",
         "last": "最後",
         "next": "次へ",
-        "previous": "前へ"
+        "previous": "前へ",
+        "current_total": "{total} 中 {current}"
     },
     "parent_of": "{children}の親",
     "parent_studios": "親スタジオ",
@@ -1103,14 +1133,6 @@
         "any_names_entered_will_be_queried": "入力された全ての名前は外部のStash-Boxインスタンスで検索され、見つかった場合追加されます。完全一致のみ、一致とみなされます。",
         "batch_add_performers": "出演者を一括追加",
         "batch_update_performers": "出演者の一括更新",
-        "config": {
-            "active_stash-box_instance": "アクティブなstash-boxインスタンス:",
-            "edit_excluded_fields": "除外する欄を編集",
-            "excluded_fields": "除外する欄:",
-            "no_fields_are_excluded": "除外する欄なし",
-            "no_instances_found": "インスタンスが見つかりませんでした",
-            "these_fields_will_not_be_changed_when_updating_performers": "これらの欄は、出演者の更新時に変更されません。"
-        },
         "current_page": "現在のページ",
         "failed_to_save_performer": "出演者\"{performer}\"の保存に失敗しました",
         "name_already_exists": "既に使用されている名前です",
@@ -1255,7 +1277,12 @@
     "stats": {
         "image_size": "画像サイズ",
         "scenes_duration": "シーンの再生時間",
-        "scenes_size": "シーンサイズ"
+        "scenes_size": "シーンサイズ",
+        "scenes_played": "再生済みシーン",
+        "total_o_count": "O-Count数",
+        "total_o_count_sfw": "健全O-Count数",
+        "total_play_count": "総再生数",
+        "total_play_duration": "総再生時間"
     },
     "status": "状態: {statusText}",
     "studio": "スタジオ",
@@ -1320,7 +1347,8 @@
         "only": "のみ"
     },
     "connection_monitor": {
-        "websocket_connection_failed": "WebSocket接続ができません：詳細はブラウザのコンソールを確認してください"
+        "websocket_connection_failed": "WebSocket接続ができません：詳細はブラウザのコンソールを確認してください",
+        "websocket_connection_reestablished": "WebSocket接続が再確立されました"
     },
     "custom_fields": {
         "field": "フィールド",
@@ -1337,5 +1365,67 @@
     "include_sub_groups": "サブグループを含める",
     "sub_groups": "サブグループ",
     "history": "履歴",
-    "group_scene_number": "シーン番号"
+    "group_scene_number": "シーン番号",
+    "stashbox_search": {
+        "select_stashbox": "StashBoxを選択",
+        "no_results": "結果が見つかりません。"
+    },
+    "studio_tagger": {
+        "add_new_studios": "スタジオを新規追加",
+        "current_page": "現在のページ",
+        "failed_to_save_studio": "スタジオの保存に失敗",
+        "name_already_exists": "名前が既に存在します",
+        "network_error": "ネットワークエラー",
+        "no_results_found": "結果が見付かりません"
+    },
+    "video_codec": "ビデオコーデック",
+    "errors": {
+        "custom_fields": {
+            "duplicate_field": "フィールド名は一意である必要があります",
+            "field_name_length": "フィールド名は65文字未満である必要があります",
+            "field_name_required": "フィールド名が必要です",
+            "field_name_whitespace": "フィールド名の前後に空白を含めることはできません"
+        },
+        "header": "エラー",
+        "image_index_greater_than_zero": "画像インデックスは0より大きい必要があります",
+        "invalid_javascript_string": "無効なJavaScriptコードです: {error}",
+        "invalid_json_string": "無効なJSON文字列です: {error}",
+        "lazy_component_error_help": "最近Stashをアップグレードした場合は、ページを再読み込みするか、ブラウザのキャッシュをクリアしてください。",
+        "loading_type": "{type} の読み込みでエラーが発生しました",
+        "something_went_wrong": "問題が発生しました。"
+    },
+    "group": "グループ",
+    "group_count": "グループ数",
+    "hasChapters": "チャプター",
+    "image_index": "画像番号",
+    "include_sub_group_content": "サブグループの内容を含める",
+    "include_sub_studio_content": "サブスタジオの内容を含める",
+    "include_sub_tag_content": "サブタグの内容を含める",
+    "index_of_total": "{total} 中 {index}",
+    "package_manager": {
+        "confirm_delete_source": "ソース {name} ({url}) を削除してもよろしいですか？",
+        "description": "説明",
+        "edit_source": "ソースを編集",
+        "hide_unselected": "未選択を隠す",
+        "install": "インストール",
+        "installed_version": "インストールバージョン",
+        "latest_version": "最新バージョン",
+        "no_packages": "パッケージが見つかりません",
+        "no_upgradable": "更新可能なパッケージが見つかりません",
+        "package": "パッケージ",
+        "show_all": "すべて表示",
+        "source": {
+            "local_path": {
+                "heading": "ローカルパス"
+            },
+            "name": "名前",
+            "url": "ソースURL"
+        },
+        "uninstall": "アンインストール",
+        "update": "アップデート",
+        "version": "バージョン"
+    },
+    "penis": "ペニス",
+    "penis_length_cm": "ペニスの長さ (cm)",
+    "photographer": "写真家"
 }
diff --git a/ui/v2.5/src/locales/ko-KR.json b/ui/v2.5/src/locales/ko-KR.json
index 566e4806d..038b870cb 100644
--- a/ui/v2.5/src/locales/ko-KR.json
+++ b/ui/v2.5/src/locales/ko-KR.json
@@ -58,8 +58,6 @@
         "logout": "로그아웃",
         "make_primary": "첫 번째로 만들기",
         "merge": "병합",
-        "merge_from": "...에서 병합",
-        "merge_into": "...로 병합",
         "migrate_blobs": "Blob 마이그레이션",
         "migrate_scene_screenshots": "영상 스크린샷 마이그레이션",
         "next_action": "다음",
@@ -152,7 +150,16 @@
         "show_count_results": "{count}개 결과 표시",
         "load": "불러오기",
         "load_filter": "필터 불러오기",
-        "add_stash_id": "Stash ID 추가"
+        "add_stash_id": "Stash ID 추가",
+        "create_new": "신규 생성",
+        "save_and_new": "저장 & 신규",
+        "invert_selection": "선택 영역 반전",
+        "select_directory": "경로 선택",
+        "reveal_in_file_manager": "파일 관리자에서 열기",
+        "exclude_lowercase": "제외",
+        "from_clipboard": "클립보드에서 불러오기",
+        "selective_generate": "선택적 생성",
+        "create_parent_tag": "부모 태그 만들기"
     },
     "actions_name": "액션",
     "age": "나이",
@@ -206,7 +213,7 @@
             },
             "performer_genders": {
                 "heading": "배우 성별",
-                "description": "영상을 태그할 때, 이 성별에 해당하는 배우들이 표시됩니다."
+                "description": "영상을 태깅할 때, 이 성별에 해당하는 배우들이 표시됩니다."
             }
         },
         "noun_query": "쿼리",
@@ -217,7 +224,7 @@
             "fp_matches": "영상 길이가 일치함",
             "fp_matches_multi": "영상 길이가 {durationsLength}개 중 {matchCount}개의 식별값과 일치합니다",
             "hash_matches": "{hash_type}이 일치함",
-            "match_failed_already_tagged": "이미 태그된 영상",
+            "match_failed_already_tagged": "이미 태깅된 영상",
             "match_failed_no_result": "결과 없음",
             "match_success": "영상 태깅 성공",
             "phash_matches": "{count}개의 PHash가 일치함",
@@ -228,7 +235,11 @@
         "verb_scrape_all": "모두 스크레이핑하기",
         "verb_submit_fp": "{fpCount, plural, one{# 식별값} other{# 식별값들}} 제출하기",
         "verb_toggle_config": "{configuration} {toggle}",
-        "verb_toggle_unmatched": "일치하지 않는 영상 {toggle}"
+        "verb_toggle_unmatched": "일치하지 않는 영상 {toggle}",
+        "verb_add_as_alias": "스크레이핑된 이름을 별칭으로 추가",
+        "verb_link_existing": "외부 링크",
+        "verb_match_tag": "태그 비교하기",
+        "verb_scrape_selected": "선택된 항목 스크레이핑"
     },
     "config": {
         "about": {
@@ -312,7 +323,7 @@
                 "log_file_max_size_desc": "압축 전 로그 파일의 최대 크기(MB)입니다. 0MB를 입력하면 비활성화됩니다. 설정 변경 후 재시작해야 합니다."
             },
             "backup_directory_path": {
-                "description": "SQLite 데이터베이스 백업 파일을 위한 폴더 경로",
+                "description": "SQLite 데이터베이스 백업 파일을 위한 폴더 경로.",
                 "heading": "백업 폴더 경로"
             },
             "blobs_path": {
@@ -336,9 +347,9 @@
             "database": "데이터베이스",
             "db_path_head": "데이터베이스 경로",
             "directory_locations_to_your_content": "컨텐츠가 있는 폴더 위치",
-            "excluded_image_gallery_patterns_desc": "스캔과 데이터베이스 정리에서 제외할 이미지와 갤러리 파일/경로의 정규표현식",
+            "excluded_image_gallery_patterns_desc": "스캔과 데이터베이스 정리 작업에서 제외할 이미지와 갤러리 파일/경로의 정규표현식.",
             "excluded_image_gallery_patterns_head": "제외된 이미지/갤러리 패턴",
-            "excluded_video_patterns_desc": "스캔과 데이터베이스 정리에서 제외할 비디오 파일/경로의 정규표현식",
+            "excluded_video_patterns_desc": "스캔과 데이터베이스 정리 작업에서 제외할 비디오 파일/경로의 정규표현식.",
             "excluded_video_patterns_head": "제외된 비디오 패턴",
             "ffmpeg": {
                 "hardware_acceleration": {
@@ -370,23 +381,23 @@
                     "description": "FFmpeg를 설정 폴더에 다운로드하고 ffmpeg와 ffprobe 경로를 초기화해, Stash가 이 둘을 설정 폴더에서 찾을 수 있도록 합니다."
                 },
                 "ffmpeg_path": {
-                    "description": "ffmpeg 실행파일의 경로입니다. (ffmpeg가 포함된 폴더의 경로가 아님) 만약 비어 있다면, ffmpeg의 위치를 환경변수로부터 찾습니다. ($PATH, 설정 폴더, $HOME/.stash)",
+                    "description": "ffmpeg 실행파일의 경로입니다(ffmpeg가 포함된 폴더의 경로가 아님). 만약 비어 있다면, ffmpeg의 위치를 환경변수로부터 찾습니다($PATH, 설정 폴더, $HOME/.stash).",
                     "heading": "FFmpeg 실행파일 경로"
                 },
                 "ffprobe_path": {
-                    "description": "ffprobe 실행파일의 경로입니다. (ffprobe가 포함된 폴더의 경로가 아님) 만약 비어 있다면, ffprobe의 위치를 환경변수로부터 찾습니다. ($PATH, 설정 폴더, $HOME/.stash)",
+                    "description": "ffprobe 실행파일의 경로입니다(ffprobe가 포함된 폴더의 경로가 아님). 만약 비어 있다면, ffprobe의 위치를 환경변수로부터 찾습니다($PATH, 설정 폴더, $HOME/.stash).",
                     "heading": "FFprobe 실행파일 경로"
                 }
             },
             "funscript_heatmap_draw_range": "히트맵에 범위 포함",
             "funscript_heatmap_draw_range_desc": "히트맵의 y축에 움직임의 범위를 그립니다. 기존 히트맵은 이 설정을 바꾼 후 재생성되어야 합니다.",
-            "gallery_cover_regex_desc": "이미지를 갤러리 커버로 인식하는 데에 사용되는 정규표현식",
+            "gallery_cover_regex_desc": "이미지를 갤러리 커버로 인식하는 데에 사용되는 정규표현식.",
             "gallery_cover_regex_label": "갤러리 커버 패턴",
-            "gallery_ext_desc": "갤러리 zip 파일로 인식될 파일 확장자입니다 (쉼표로 구분합니다).",
-            "gallery_ext_head": "갤러리 zip 확장자",
+            "gallery_ext_desc": "갤러리 ZIP 파일로 인식될 파일 확장자입니다 (쉼표로 구분합니다).",
+            "gallery_ext_head": "갤러리 ZIP 확장자",
             "generated_file_naming_hash_desc": "생성되는 컨텐츠 파일 이름을 정할 때 MD5 또는 oshash를 사용합니다. 이를 변경하려면 모든 영상에 해당 MD5/osash 값이 채워져 있어야 합니다. 이 값을 변경한 후에는 기존에 생성된 파일을 마이그레이션하거나 재생성해야 합니다. 마이그레이션은 '작업' 페이지를 참조하세요.",
             "generated_file_naming_hash_head": "생성된 컨텐츠 파일 이름 해쉬",
-            "generated_files_location": "생성된 컨텐츠 파일들의 폴더 위치 (영상 마커, 영상 미리보기, 스프라이트 등등)",
+            "generated_files_location": "생성된 컨텐츠 파일들의 폴더 위치 (영상 마커, 영상 미리보기, 스프라이트 등등).",
             "generated_path_head": "생성된 컨텐츠 파일 경로",
             "hashing": "해싱",
             "heatmap_generation": "Funscript 히트맵 생성",
@@ -395,12 +406,12 @@
             "include_audio_desc": "미리보기를 생성할 때 소리를 포함합니다.",
             "include_audio_head": "소리 포함",
             "logging": "로깅",
-            "maximum_streaming_transcode_size_desc": "트랜스코딩된 스트림의 최대 크기",
+            "maximum_streaming_transcode_size_desc": "트랜스코딩된 스트림의 최대 크기.",
             "maximum_streaming_transcode_size_head": "최대 스트리밍 트랜스코드 크기",
-            "maximum_transcode_size_desc": "트랜스코드의 최대 크기",
+            "maximum_transcode_size_desc": "트랜스코드의 최대 크기.",
             "maximum_transcode_size_head": "최대 트랜스코드 크기",
             "metadata_path": {
-                "description": "전체 내보내기 또는 전체 불러오기를 실행할 때 사용되는 폴더 위치",
+                "description": "전체 내보내기 또는 전체 불러오기를 실행할 때 사용되는 폴더 위치.",
                 "heading": "메타데이터 경로"
             },
             "number_of_parallel_task_for_scan_generation_desc": "자동으로 설정하려면 0을 입력하세요. 경고: 100% CPU 활용률을 달성하는 데 필요한 작업보다 더 많은 작업을 실행하면 성능이 저하되고 잠재적으로 다른 문제가 발생할 수 있습니다.",
@@ -408,13 +419,13 @@
             "parallel_scan_head": "병렬 스캔/생성",
             "preview_generation": "미리보기 생성",
             "python_path": {
-                "description": "파이썬 실행파일의 위치입니다. (실행파일이 들어 있는 폴더가 아님) 스크립트 스크레이퍼와 플러그인의 실행에 사용됩니다. 빈 칸으로 두면, 시스템 환경 설정으로부터 위치를 받아 옵니다",
+                "description": "파이썬 실행파일의 위치입니다. (실행파일이 들어 있는 폴더가 아님) 스크립트 스크레이퍼와 플러그인의 실행에 사용됩니다. 빈 칸으로 두면, 시스템 환경 설정으로부터 위치를 받아 옵니다.",
                 "heading": "Python 실행파일 경로"
             },
             "scraper_user_agent": "스크레이퍼 사용자 에이전트",
-            "scraper_user_agent_desc": "HTTP 요청 스크레이핑 중 사용되는 사용자 에이전트 문자열",
+            "scraper_user_agent_desc": "HTTP 요청 스크레이핑 중 사용되는 사용자 에이전트 문자열.",
             "scrapers_path": {
-                "description": "스크레이퍼 설정 파일의 폴더 위치",
+                "description": "스크레이퍼 설정 파일의 폴더 위치.",
                 "heading": "스크레이퍼 경로"
             },
             "scraping": "스크레이핑",
@@ -423,13 +434,24 @@
             "video_ext_head": "비디오 확장 프로그램",
             "video_head": "비디오",
             "plugins_path": {
-                "description": "플러그인 설정 파일의 폴더 위치",
+                "description": "플러그인 설정 파일의 폴더 위치.",
                 "heading": "플러그인 경로"
             },
             "delete_trash_path": {
                 "description": "삭제된 파일들이 영구 삭제되는 대신에 옮겨지게 될 경로입니다. 파일들을 영구 삭제하려면 빈 칸으로 두십시오.",
                 "heading": "휴지통 경로"
-            }
+            },
+            "sprite_generation_head": "스프라이트 생성",
+            "sprite_interval_desc": "생성된 각각의 스프라이트 사이의 시간 간격(초).",
+            "sprite_interval_head": "스프라이트 시간 간격",
+            "sprite_maximum_desc": "하나의 영상에 대해 생성되는 최대 스프라이트 개수입니다. 0으로 설정하면 제한을 해제합니다.",
+            "sprite_maximum_head": "최대 스프라이트 개수",
+            "sprite_minimum_desc": "하나의 영상에 대해 생성되는 최소 스프라이트 개수",
+            "sprite_minimum_head": "최소 스프라이트 개수",
+            "sprite_screenshot_size_desc": "각각의 스프라이트의 원하는 크기를 지정합니다 (픽셀).",
+            "sprite_screenshot_size_head": "스프라이트 크기",
+            "use_custom_sprite_interval_head": "사용자 지정 스프라이트 시간 간격 사용",
+            "use_custom_sprite_interval_desc": "사용자 지정 스프라이트 시간 간격을, 아래 설정과 같이 활성화합니다."
         },
         "library": {
             "exclusions": "제외",
@@ -448,7 +470,7 @@
         "scraping": {
             "entity_metadata": "{entityType} 메타데이터",
             "entity_scrapers": "{entityType} 스크레이퍼",
-            "excluded_tag_patterns_desc": "스크레이핑 결과에서 제외할 태그 이름의 정규표현식",
+            "excluded_tag_patterns_desc": "스크레이핑 결과에서 제외할 태그 이름의 정규표현식.",
             "excluded_tag_patterns_head": "제외된 태그 패턴",
             "scraper": "스크레이퍼",
             "scrapers": "스크레이퍼",
@@ -485,7 +507,6 @@
             "auto_tagging": "자동 태깅",
             "backing_up_database": "데이터베이스 백업 중",
             "backup_and_download": "데이터베이스를 백업하고 결과 파일을 다운로드합니다.",
-            "backup_database": "백업 폴더에 {filename_format}의 파일 이름 형식으로 데이터베이스를 백업합니다",
             "cleanup_desc": "있어야 할 곳에 없는 파일이 있는지 검사한 후, 데이터베이스에서 삭제합니다. 데이터베이스의 일부 내용이 삭제될 수 있습니다.",
             "data_management": "데이터 관리",
             "defaults_set": "기본값이 설정되었습니다. '작업' 페이지의 {action} 버튼을 클릭할 때 사용됩니다.",
@@ -498,7 +519,7 @@
             },
             "generate_clip_previews_during_scan": "이미지 클립 미리보기 생성",
             "generate_desc": "이미지, 스프라이트, 비디오, vtt 등 파일을 생성합니다.",
-            "generate_phashes_during_scan": "해쉬 값 생성",
+            "generate_phashes_during_scan": "비디오 해쉬 값 생성",
             "generate_phashes_during_scan_tooltip": "중복된 파일 확인과 영상 식별에 사용됩니다.",
             "generate_previews_during_scan": "움직이는 이미지 미리보기 생성",
             "generate_previews_during_scan_tooltip": "애니메이션(webp) 미리보기 또한 생성합니다. 영상/마커 월의 미리보기 유형이 '애니메이션 이미지'로 설정된 경우에만 필요합니다. '애니메이션 미리보기'는 '비디오 미리보기'보다 CPU를 덜 사용하지만, '비디오 미리보기'에 추가적으로 '애니메이션 미리보기'가 생성되기 때문에 파일 크기가 커집니다.",
@@ -532,9 +553,11 @@
                 "skip_multiple_matches_tooltip": "만약 이 옵션이 설정되지 않은 상태에서 여러 개의 결과가 도출된 경우, 여러 개의 결과 중 무작위로 하나가 선택될 것입니다",
                 "skip_single_name_performers": "다른 배우의 이름과 겹치지 않으면서도 한 단어의 이름으로 이뤄진 배우의 경우, 처리하지 않고 건너뛰기",
                 "skip_multiple_matches": "여러 개의 매칭 결과가 나왔을 때, 처리하지 않고 건너뛰기",
-                "tag_skipped_matches": "처리하지 않고 건너뛴 항목들에 대해 다음과 같이 태그하기",
+                "tag_skipped_matches": "처리하지 않고 건너뛴 항목들에 대해 다음과 같이 태깅하기",
                 "tag_skipped_matches_tooltip": "다수 식별 결과가 도출된 항목들을 대상으로, 실제로 일치하는 식별 결과를 영상 태거 뷰에서 직접 고를 수 있도록, '식별: 다수 매칭' 등과 같은 태그를 만듭니다",
-                "tag_skipped_performers": "처리하지 않고 건너뛴 배우들에 대해 다음과 같이 태그하기"
+                "tag_skipped_performers": "처리하지 않고 건너뛴 배우들에 대해 다음과 같이 태깅하기",
+                "performer_genders": "배우 성별",
+                "performer_genders_desc": "선택된 성별에 해당되는 배우들은, 식별 과정 중 포함됩니다."
             },
             "import_from_exported_json": "메타데이터 폴더에서 내보낸 JSON 파일에서 가져오기 작업을 합니다. 기존 데이터베이스를 지웁니다.",
             "incremental_import": "내보낸 zip 파일에서 증가한 부분만 가져옵니다.",
@@ -574,7 +597,20 @@
             "optimise_database_warning": "주의: 이 작업이 수행되는 동안, 데이터베이스를 수정하는 다른 모든 작업들은 실패할 것이고, 데이터베이스의 크기에 따라 작업 종료까지 몇 분이 걸릴 수 있습니다. 그리고 이 작업은 적어도 데이터베이스 크기만큼의 디스크 공간이 필요한데, 데이터베이스 크기의 1.5배의 디스크 공간을 확보하는 것을 권장합니다.",
             "optimise_database": "모든 데이터베이스 파일을 분석하고 다시 만듦으로써, 성능을 향상시키려고 시도합니다.",
             "rescan_tooltip": "경로 내의 모든 파일을 재스캔합니다. 파일 메타데이터를 강제 업데이트하고 zip 파일들을 재스캔하기 위해 사용됩니다.",
-            "rescan": "파일 재스캔"
+            "rescan": "파일 재스캔",
+            "generate_image_phashes_during_scan": "이미지 해쉬 값 생성",
+            "generate_image_phashes_during_scan_tooltip": "중복 제거 및 식별 목적.",
+            "backup_database": {
+                "description": "데이터베이스와 blob 파일의 백업을 수행합니다.",
+                "destination": "백업 파일의 위치",
+                "download": "백업 파일 다운로드",
+                "include_blobs": "백업 파일에 blob 포함",
+                "include_blobs_desc": "SQLite 데이터베이스 파일만을 백업하려면 비활성화하세요.",
+                "sqlite": "백업 파일은 SQLite 데이터베이스 파일의 복제본이 될 것입니다. (백업 파일 이름: {filename_format})",
+                "to_directory": "{directory} 경로로",
+                "warning_blobs": "blob 파일들은 백업 파일에 포함되지 않을 것입니다. 이는, 백업을 완전히 복원하려면 blob 저장 위치에 blob 파일이 존재해야 함을 의미합니다.",
+                "zip": "SQLite 데이터베이스 파일과 blob 파일은 하나의 파일로 압축될 것입니다. (압축 파일 이름: {filename_format})"
+            }
         },
         "tools": {
             "scene_duplicate_checker": "영상 중복 체크 도구",
@@ -629,13 +665,13 @@
             "desktop_integration": {
                 "desktop_integration": "데스크탑 통합",
                 "notifications_enabled": "알림 활성화",
-                "send_desktop_notifications_for_events": "이벤트가 발생했을 때 데스크탑 알림을 보냅니다",
+                "send_desktop_notifications_for_events": "이벤트가 발생했을 때 데스크탑 알림을 보냅니다.",
                 "skip_opening_browser": "브라우저 자동 열기 해제",
-                "skip_opening_browser_on_startup": "Stash를 시작할 때 자동으로 브라우저를 열지 않습니다"
+                "skip_opening_browser_on_startup": "Stash를 시작할 때 자동으로 브라우저를 열지 않습니다."
             },
             "editing": {
                 "disable_dropdown_create": {
-                    "description": "선택창에서 새로운 오브젝트를 추가할 수 없도록 합니다",
+                    "description": "선택창에서 새로운 오브젝트를 추가할 수 없도록 합니다.",
                     "heading": "선택창 비활성화"
                 },
                 "heading": "수정하기",
@@ -676,7 +712,7 @@
                 "sync": "동기화"
             },
             "handy_connection_key": {
-                "description": "인터랙티브 영상에 사용할 수 있는 Handy 연결 키입니다. 이 키를 설정하면 현재 장면 정보를 handyfeeling.com과 공유할 수 있습니다",
+                "description": "인터랙티브 영상에 사용할 수 있는 Handy 연결 키입니다. 이 키를 설정하면 현재 장면 정보를 handyfeeling.com과 공유할 수 있습니다.",
                 "heading": "Handy 연결 키"
             },
             "image_lightbox": {
@@ -691,11 +727,11 @@
                 "heading": "이미지",
                 "options": {
                     "create_image_clips_from_videos": {
-                        "description": "라이브러리에서 비디오가 비활성화되었을 때, (파일이 비디오 확장자로 끝나는) 비디오 파일들은 이미지 클립으로 스캔될 것입니다.",
+                        "description": "라이브러리에서 비디오가 비활성화되었을 때, 비디오 파일들(비디오 확장자 참조)은 이미지 클립으로 스캔될 것입니다.",
                         "heading": "비디오 확장자를 이미지 클립으로 스캔"
                     },
                     "write_image_thumbnails": {
-                        "description": "즉시 생성된 경우 디스크에 이미지 썸네일 쓰기",
+                        "description": "즉시 생성된 경우 디스크에 이미지 썸네일 쓰기.",
                         "heading": "이미지 썸네일 디스크에 저장하기"
                     }
                 }
@@ -705,11 +741,11 @@
                 "heading": "언어"
             },
             "max_loop_duration": {
-                "description": "영상 플레이어가 비디오를 루프하는 최대 영상 지속 시간 - 0을 입력하면 비활성화합니다",
+                "description": "영상 플레이어가 비디오를 루프하는 최대 영상 지속 시간. 0을 입력하면 비활성화합니다.",
                 "heading": "최대 구간 길이"
             },
             "menu_items": {
-                "description": "탐색 바에 여러 종류의 컨텐츠들이 보여지게 하거나 숨깁니다",
+                "description": "탐색 바에 여러 종류의 컨텐츠들이 보여지게 하거나 숨깁니다.",
                 "heading": "메뉴 항목"
             },
             "minimum_play_percent": {
@@ -719,7 +755,7 @@
             "performers": {
                 "options": {
                     "image_location": {
-                        "description": "배우의 기본 이미지를 저장하기 위한 경로입니다. 빈 칸으로 두면 기본값을 사용합니다",
+                        "description": "배우의 기본 이미지를 저장하기 위한 경로입니다. 빈 칸으로 두면 기본값을 사용합니다.",
                         "heading": "커스텀 배우 이미지 경로"
                     }
                 }
@@ -745,11 +781,11 @@
                     "always_start_from_beginning": "항상 처음부터 비디오 시작",
                     "auto_start_video": "비디오 자동 재생",
                     "auto_start_video_on_play_selected": {
-                        "description": "대기열, 또는 '영상' 페이지에서 (랜덤)선택한 영상을 자동 재생",
+                        "description": "대기열, 또는 '영상' 페이지에서 (랜덤)선택한 영상을 자동 재생.",
                         "heading": "선택한 항목을 재생할 때 비디오 자동 시작"
                     },
                     "continue_playlist_default": {
-                        "description": "비디오가 끝나면 대기열에 있는 다음 영상을 재생합니다",
+                        "description": "비디오가 끝나면 대기열에 있는 다음 영상을 재생합니다.",
                         "heading": "플레이리스트 이어보기"
                     },
                     "show_scrubber": "스크러버 표시",
@@ -776,18 +812,18 @@
                 "heading": "전환 전 스크롤 시도 횟수"
             },
             "show_tag_card_on_hover": {
-                "description": "태그 뱃지 위에 마우스 커서를 올리면 태그 카드를 보여줍니다",
+                "description": "태그 뱃지 위에 마우스 커서를 올리면 태그 카드를 보여줍니다.",
                 "heading": "태그 카드 툴팁"
             },
             "slideshow_delay": {
-                "description": "월 보기 모드일 때 갤러리에서 슬라이드 쇼를 사용할 수 있습니다",
+                "description": "월 보기 모드일 때 갤러리에서 슬라이드 쇼를 사용할 수 있습니다.",
                 "heading": "슬라이드쇼 딜레이 (단위: 초)"
             },
             "studio_panel": {
                 "heading": "스튜디오 창",
                 "options": {
                     "show_child_studio_content": {
-                        "description": "스튜디오 창에서, 하위 스튜디오의 컨텐츠도 보여줍니다",
+                        "description": "스튜디오 창에서, 하위 스튜디오의 컨텐츠도 보여줍니다.",
                         "heading": "하위 스튜디오의 컨텐츠 보이기"
                     }
                 }
@@ -796,7 +832,7 @@
                 "heading": "태그 창",
                 "options": {
                     "show_child_tagged_content": {
-                        "description": "태그 창에서, 하위 태그들도 보여줍니다",
+                        "description": "태그 창에서, 하위 태그들도 보여줍니다.",
                         "heading": "서브태그 컨텐츠 보이기"
                     }
                 }
@@ -813,11 +849,11 @@
                 },
                 "heading": "세부사항 페이지",
                 "compact_expanded_details": {
-                    "description": "활성화되면, 더 간결한 형태로 확장된 세부사항이 보여집니다",
+                    "description": "활성화되면, 더 간결한 형태로 확장된 세부사항이 보여집니다.",
                     "heading": "확장된 세부사항들 간결화"
                 },
                 "show_all_details": {
-                    "description": "활성화되면, 모든 컨텐츠 세부사항이 기본값으로 보여지게 되고, 각각의 세부사항들이 하나의 열에 위아래로 정렬됩니다",
+                    "description": "활성화되면, 모든 컨텐츠 세부사항이 기본값으로 보여지게 되고, 각각의 세부사항들이 하나의 열에 위아래로 정렬됩니다.",
                     "heading": "모든 세부사항 보여주기"
                 }
             },
@@ -832,9 +868,30 @@
             "sfw_mode": {
                 "description": "건전한 컨텐츠를 저장하기 위해 Stash를 사용한다면 활성화하세요. 성인 컨텐츠와 관련된 UI 요소들을 숨기거나 변경시킵니다.",
                 "heading": "건전 컨텐츠 모드"
+            },
+            "custom_title": {
+                "description": "페이지 제목에 추가되는 커스텀 텍스트입니다. 공백일 경우 기본값 'Stash'가 사용됩니다.",
+                "heading": "커스텀 타이틀"
+            },
+            "troubleshooting_mode": {
+                "button": "트러블슈팅 모드",
+                "dialog_title": "트러블슈팅 모드 활성화",
+                "dialog_description": "문제 진단을 위해 모든 사용자 지정 설정을 일시적으로 비활성화합니다:",
+                "dialog_item_plugins": "모든 플러그인",
+                "dialog_item_css": "커스텀 CSS",
+                "dialog_item_js": "커스텀 JavaScript",
+                "dialog_item_locales": "커스텀 로케일",
+                "dialog_log_level": "상세 진단을 위해 로그 수준이 디버그(Debug)로 설정됩니다.",
+                "dialog_reload_note": "페이지를 자동으로 다시 불러옵니다.",
+                "enable": "활성화 & 다시 불러오기",
+                "overlay_message": "트러블슈팅 모드 활성화 - 모든 사용자 지정 설정이 비활성화됨",
+                "exit": "나가기"
             }
         },
-        "advanced_mode": "고급 설정 모드"
+        "advanced_mode": "고급 설정 모드",
+        "changelog": {
+            "header": "변경 내역"
+        }
     },
     "configuration": "설정",
     "countables": {
@@ -854,7 +911,8 @@
     "criterion": {
         "greater_than": "초과",
         "less_than": "미만",
-        "value": "값"
+        "value": "값",
+        "unsupported": "{type} (공식 지원되지 않음)"
     },
     "criterion_modifier": {
         "between": "구간",
@@ -922,7 +980,7 @@
             "page_header": "{total} 페이지 중 {page} 페이지",
             "reset_zoom_on_nav": "이미지를 바꿀 때 줌 수준 초기화",
             "scale_up": {
-                "description": "작은 이미지들이 화면을 채우도록 확대합니다",
+                "description": "작은 이미지들이 화면을 채우도록 확대합니다.",
                 "label": "화면에 딱 맞춰 확대"
             },
             "scroll_mode": {
@@ -933,10 +991,6 @@
             },
             "disable_animation": "이미지 간 전환 애니메이션 비활성화하기"
         },
-        "merge_tags": {
-            "destination": "다른 태그와 합쳐질 태그",
-            "source": "다른 태그로 합쳐질 태그"
-        },
         "reassign_entity_title": "{count, plural, one {{singularEntity} 재할당} other {{pluralEntity} 재할당}}",
         "scene_gen": {
             "clip_previews": "이미지 클립 미리보기",
@@ -955,7 +1009,7 @@
             "override_preview_generation_options": "미리보기 생성 옵션 재정의",
             "override_preview_generation_options_desc": "이 작업에 대한 미리보기 생성 옵션을 재정의합니다. 기본값은 '시스템' -> '미리보기 생성'에서 설정됩니다.",
             "overwrite": "기존 파일들 덮어쓰기",
-            "phash": "해쉬",
+            "phash": "비디오 해쉬",
             "preview_exclude_end_time_desc": "영상 미리보기에서 마지막 x 초를 제외합니다. 초 단위, 혹은 전체 영상 재생 길이 중 비율(예: 2%)로 나타낼 수 있습니다.",
             "preview_exclude_end_time_head": "마지막 영상 부분 제외",
             "preview_exclude_start_time_desc": "영상 미리보기에서 처음 x 초를 제외합니다. 초 단위, 혹은 전체 영상 재생 길이 중 비율(예: 2%)로 나타낼 수 있습니다.",
@@ -975,7 +1029,9 @@
             "video_previews": "미리보기",
             "video_previews_tooltip": "영상 위로 마우스를 올렸을 때 표시되는 비디오 미리보기",
             "image_thumbnails": "이미지 썸네일",
-            "phash_tooltip": "중복 방지와 영상 식별에 사용됩니다"
+            "phash_tooltip": "중복 방지와 영상 식별에 사용됩니다",
+            "image_phash": "이미지 해쉬 값",
+            "image_phash_tooltip": "중복 제거 및 식별 목적"
         },
         "scenes_found": "{count}개 영상 발견됨",
         "scrape_entity_query": "{entity_type} 스크레이핑 쿼리",
@@ -1001,7 +1057,9 @@
         "delete_alert_to_trash": "다음 {count, plural, one {{singularEntity}} other {{pluralEntity}}}가 휴지통으로 옮겨질 것입니다:",
         "stashid_exists_warning": "이 Stash-Box의 기존 Stash ID가 교체될 것입니다.",
         "studios_found": "{count}개 스튜디오 발견됨",
-        "tags_found": "{count}개 태그 발견됨"
+        "tags_found": "{count}개 태그 발견됨",
+        "scrape_results_missing": "없음",
+        "edit_entity_count_title": "{count}개의 {count, plural, one {{singularEntity}} other {{pluralEntity}}} 수정"
     },
     "dimensions": "해상도",
     "director": "감독",
@@ -1153,9 +1211,7 @@
     "measurements": "치수",
     "media_info": {
         "audio_codec": "오디오 코덱",
-        "checksum": "체크섬",
         "downloaded_from": "다운로드 출처",
-        "hash": "해쉬",
         "interactive_speed": "인터랙티브 속도",
         "performer_card": {
             "age": "{age} {years_old}",
@@ -1166,7 +1222,11 @@
         "play_duration": "재생된 길이",
         "stream": "스트림",
         "video_codec": "비디오 코덱",
-        "o_count": "싼 횟수"
+        "o_count": "싼 횟수",
+        "md5": "MD5 체크섬",
+        "oshash": "oshash",
+        "oshash_meaning": "파일 일치 여부 확인 해시 (OpenSubtitles Hash)",
+        "phash_meaning": "시각적 유사성 비교 해시 (Perceptual Hash)"
     },
     "megabits_per_second": "{value} mbps",
     "metadata": "메타데이터",
@@ -1202,34 +1262,26 @@
         "any_names_entered_will_be_queried": "입력되는 이름들은, 원격 Stash-Box 개체에 존재하면 추가됩니다. 정확하게 일치해야만 합니다.",
         "batch_add_performers": "배우 일괄 추가",
         "batch_update_performers": "배우 일괄 수정",
-        "config": {
-            "active_stash-box_instance": "stash-box 인스턴스 활성화:",
-            "edit_excluded_fields": "제외된 항목 수정",
-            "excluded_fields": "제외된 항목:",
-            "no_fields_are_excluded": "제외된 항목 없음",
-            "no_instances_found": "인스턴스 없음",
-            "these_fields_will_not_be_changed_when_updating_performers": "배우 데이터를 수정할 때 이 항목들은 변경되지 않습니다."
-        },
         "current_page": "현재 페이지",
         "failed_to_save_performer": "\"{performer}\" 배우를 저장하는 데에 실패했습니다",
         "name_already_exists": "이름이 이미 존재합니다",
         "network_error": "네트워크 오류",
         "no_results_found": "결과가 없습니다.",
         "number_of_performers_will_be_processed": "{performer_count}명의 배우들이 처리됩니다",
-        "performer_already_tagged": "배우가 이미 태그되어 있음",
+        "performer_already_tagged": "배우가 이미 태깅되어 있음",
         "performer_selection": "배우 선택",
         "performer_successfully_tagged": "배우 태깅에 성공했습니다:",
         "query_all_performers_in_the_database": "데이터베이스의 모든 배우",
-        "refresh_tagged_performers": "태그된 배우 새로고침",
-        "refreshing_will_update_the_data": "'새로고침'을 통해, Stash-box 인스턴스로부터 태그된 배우들의 데이터를 업데이트합니다.",
+        "refresh_tagged_performers": "태깅된 배우 새로고침",
+        "refreshing_will_update_the_data": "'새로고침'을 통해, Stash-box 인스턴스로부터 태깅된 배우들의 데이터를 업데이트합니다.",
         "status_tagging_job_queued": "상태: 태그 작업 대기열 추가됨",
-        "status_tagging_performers": "상태: 배우 태그 중",
+        "status_tagging_performers": "상태: 배우 태깅 중",
         "tag_status": "태그 상태",
         "to_use_the_performer_tagger": "배우 태거를 사용하기 위해서는 stash-box 인스턴스가 설정되어야 합니다.",
-        "untagged_performers": "태그되지 않은 배우",
+        "untagged_performers": "태깅되지 않은 배우",
         "update_performer": "배우 업데이트",
         "update_performers": "배우 업데이트",
-        "updating_untagged_performers_description": "'태그되지 않은 배우 업데이트'를 통해, Stash ID가 없는 배우들에 대한 데이터를 찾아보고, 가능하다면 이를 이용해 배우를 업데이트합니다.",
+        "updating_untagged_performers_description": "'태깅되지 않은 배우 업데이트'를 통해, Stash ID가 없는 배우들에 대한 데이터를 찾아보고, 가능하다면 이를 이용해 배우를 업데이트합니다.",
         "performer_names_or_stashids_separated_by_comma": "배우 이름 또는 Stash ID (쉼표(,)로 구분)"
     },
     "performer_tags": "배우 태그",
@@ -1367,7 +1419,7 @@
         "welcome_to_stash": "Stash에 오신 것을 환영합니다"
     },
     "stash_id": "Stash ID",
-    "stash_id_endpoint": "Stash ID 엔드포인트",
+    "stash_id_endpoint": "Stash ID 엔드포인트 URL",
     "stash_ids": "Stash IDs",
     "stashbox": {
         "go_review_draft": "초안을 검토하려면 {endpoint_name}(으)로 이동하십시오.",
@@ -1385,7 +1437,8 @@
         "scenes_played": "재생된 영상",
         "total_o_count": "싸버린 총 횟수",
         "total_play_count": "총 재생 횟수",
-        "total_play_duration": "총 재생 길이"
+        "total_play_duration": "총 재생 길이",
+        "total_o_count_sfw": "좋아요 총 횟수"
     },
     "status": "상태: {statusText}",
     "studio": "스튜디오",
@@ -1418,7 +1471,11 @@
         "started_auto_tagging": "자동 태깅을 시작했습니다",
         "started_generating": "컨텐츠 생성을 시작했습니다",
         "started_importing": "불러오기를 시작했습니다",
-        "updated_entity": "{entity}를 수정했습니다"
+        "updated_entity": "{entity}를 수정했습니다",
+        "merged_performers": "배우가 병합되었습니다",
+        "clipboard_access_denied": "클립보드 접근 거부됨. 브라우저 권한을 확인하십시오",
+        "clipboard_image_pasted": "클립보드에서 이미지 복사됨",
+        "clipboard_no_image": "클립보드에 이미지 없음"
     },
     "total": "전체",
     "true": "참",
@@ -1441,38 +1498,32 @@
     "zip_file_count": "zip 파일 개수",
     "studio_tagger": {
         "config": {
-            "excluded_fields": "제외된 항목들:",
             "create_parent_label": "부모 스튜디오 생성",
-            "edit_excluded_fields": "제외 항목 수정",
-            "active_stash-box_instance": "stash-box 인스턴스 활성화:",
-            "create_parent_desc": "누락된 부모 스튜디오를 만들거나, 정확히 이름이 일치하며 이미 존재하는 부모 스튜디오를 태그하고 데이터/이미지를 업데이트합니다",
-            "no_fields_are_excluded": "제외된 항목 없음",
-            "no_instances_found": "인스턴스 없음",
-            "these_fields_will_not_be_changed_when_updating_studios": "이 항목들은 스튜디오를 업데이트할 때 변경되지 않을 것입니다."
+            "create_parent_desc": "누락된 부모 스튜디오를 만들거나, 정확히 이름이 일치하며 이미 존재하는 부모 스튜디오를 태깅하고 데이터/이미지를 업데이트합니다"
         },
         "batch_update_studios": "스튜디오 일괄 업데이트",
         "name_already_exists": "이름이 이미 존재합니다",
-        "studio_already_tagged": "스튜디오가 이미 태그되었음",
-        "updating_untagged_studios_description": "태그되지 않은 스튜디오를 업데이트하면, stashid가 없는 스튜디오들을 확인하고 메타데이터를 업데이트할 것입니다.",
+        "studio_already_tagged": "스튜디오가 이미 태깅되었음",
+        "updating_untagged_studios_description": "태깅되지 않은 스튜디오를 업데이트하면, stashid가 없는 스튜디오들을 확인하고 메타데이터를 업데이트할 것입니다.",
         "current_page": "현재 페이지",
         "failed_to_save_studio": "\"{studio}\" 스튜디오를 저장하는 데에 실패했습니다",
-        "refresh_tagged_studios": "태그된 스튜디오 새로고침",
+        "refresh_tagged_studios": "태깅된 스튜디오 새로고침",
         "add_new_studios": "새 스튜디오 추가",
         "any_names_entered_will_be_queried": "기입된 이름은 원격 Stash-Box 인스턴스에 검색되고, 만약 해당하는 이름의 스튜디오가 있으면 추가합니다. 이름이 정확히 같은 경우만 고려합니다.",
-        "create_or_tag_parent_studios": "존재하지 않는 부모 스튜디오를 만드거나, 이미 존재하는 부모 스튜디오 태그",
+        "create_or_tag_parent_studios": "존재하지 않는 부모 스튜디오를 만드거나, 이미 존재하는 부모 스튜디오 태깅",
         "network_error": "네트워크 오류",
         "no_results_found": "결과가 없습니다.",
         "number_of_studios_will_be_processed": "{studio_count}개의 스튜디오가 처리됩니다",
         "query_all_studios_in_the_database": "데이터베이스의 모든 스튜디오",
-        "refreshing_will_update_the_data": "stash-box 인스턴스로부터 태그된 스튜디오의 데이터를 업데이트합니다.",
+        "refreshing_will_update_the_data": "stash-box 인스턴스로부터 태깅된 스튜디오의 데이터를 업데이트합니다.",
         "studio_successfully_tagged": "스튜디오 태깅 성공",
         "tag_status": "태그 상태",
         "batch_add_studios": "스튜디오 일괄 추가",
-        "status_tagging_job_queued": "작업 상태: 태그 작업 제출됨",
-        "status_tagging_studios": "작업 상태: 스튜디오 태그 중",
+        "status_tagging_job_queued": "상태: 태깅 작업 대기열 추가됨",
+        "status_tagging_studios": "상태: 스튜디오 태깅 중",
         "to_use_the_studio_tagger": "스튜디오 태거를 사용하려면, stash-box 인스턴스가 설정되어야 합니다.",
         "update_studios": "스튜디오 업데이트",
-        "untagged_studios": "태그되지 않은 스튜디오",
+        "untagged_studios": "태깅되지 않은 스튜디오",
         "update_studio": "스튜디오 업데이트",
         "studio_selection": "스튜디오 선택",
         "studio_names_or_stashids_separated_by_comma": "스튜디오 이름 또는 StashID (쉼표로 구분)"
@@ -1587,5 +1638,59 @@
         "no_results": "탐색 결과가 없습니다.",
         "placeholder_name_or_id": "({entityType} 이름 또는 StashID를 입력하세요)",
         "select_stashbox": "StashBox 선택..."
-    }
+    },
+    "latest_scene": "최근 영상",
+    "stash_id_count": "Stash ID 카운트",
+    "career_end": "경력 종료",
+    "career_start": "경력 시작",
+    "duplicated": "중복됨",
+    "duplicated_stash_id": "중복됨 (Stash ID)",
+    "duplicated_title": "중복됨 (제목)",
+    "tag_tagger": {
+        "status_tagging_tags": "상태: 표준화 작업 중",
+        "tag_already_tagged": "태그가 이미 표준화됨",
+        "tag_names_or_stashids_separated_by_comma": "태그 이름 또는 StashID (\",\"로 구분)",
+        "tag_selection": "태그 선택",
+        "tag_successfully_tagged": "태그 표준화됨",
+        "tag_status": "태그 상태",
+        "to_use_the_tag_tagger": "태그 표준화 도구를 사용하려면 stash-box 인스턴스를 구성해야 합니다.",
+        "untagged_tags": "비표준 태그",
+        "update_tags": "태그 업데이트",
+        "updating_untagged_tags_description": "비표준 태그 업데이트 작업을 하면, StashId가 없는 비표준 태그의 매칭을 시도하고 메타데이터를 업데이트합니다.",
+        "add_new_tags": "새로운 태그 추가",
+        "any_names_entered_will_be_queried": "입력된 이름은 원격 Stash-Box 인스턴스에서 조회되어, 발견되면 추가됩니다. 정확히 일치하는 이름만 일치하는 것으로 간주됩니다.",
+        "batch_add_tags": "여러 개의 태그 추가",
+        "batch_update_tags": "여러 개의 태그 수정",
+        "current_page": "현재 페이지",
+        "failed_to_save_tag": "태그 \"{tag}\"를 저장하는 데에 실패했습니다",
+        "name_already_exists": "이름이 이미 존재합니다",
+        "network_error": "네트워크 오류",
+        "no_results_found": "결과가 없습니다.",
+        "number_of_tags_will_be_processed": "{tag_count}개의 태그가 처리됩니다",
+        "query_all_tags_in_the_database": "데이터베이스 내 모든 태그",
+        "refresh_tagged_tags": "표준 태그 새로고침",
+        "refreshing_will_update_the_data": "새로고침하면, Stash-Box 인스턴스로부터 표준 태그의 데이터를 업데이트할 것입니다.",
+        "status_tagging_job_queued": "상태: 표준화 작업 대기열 추가됨",
+        "config": {
+            "create_parent_desc": "stash-box 카테고리에서 누락된 부모 태그를 만들거나, 기존 부모 태그를 정확한 이름과 연결하는 태그를 지정합니다",
+            "create_parent_label": "부모 태그 만들기"
+        },
+        "create_or_tag_parent_tags": "누락된 부모 태그 생성 또는 기존 태그 지정"
+    },
+    "tagger": {
+        "config": {
+            "active_stash-box_instance": "활성 stash-box 인스턴스:",
+            "edit_excluded_fields": "제외된 항목 편집",
+            "excluded_fields": "제외된 항목:",
+            "fields_will_not_be_changed": "{entity}를 업데이트할 때 이 항목은 변경되지 않습니다.",
+            "no_fields_are_excluded": "제외된 항목 없음",
+            "no_instances_found": "인스턴스 없음"
+        }
+    },
+    "unsupported_criteria": "지원되지 않는 기준: {criteria}",
+    "include_sub_folders": "하위 폴더 포함",
+    "parent_folder": "상위 폴더",
+    "sub_folder_depth": "하위 폴더 깊이 (전체일 경우 비워둠)",
+    "sub_folders": "하위 폴더",
+    "empty_value": "공백"
 }
diff --git a/ui/v2.5/src/locales/lt-LT.json b/ui/v2.5/src/locales/lt-LT.json
index 0007adb26..179197e57 100644
--- a/ui/v2.5/src/locales/lt-LT.json
+++ b/ui/v2.5/src/locales/lt-LT.json
@@ -70,8 +70,6 @@
         "logout": "Atsijungti",
         "make_primary": "Padaryti pirminiu",
         "merge": "Sulieti",
-        "merge_from": "Sulieti iš",
-        "merge_into": "Sulieti į",
         "next_action": "Kitas",
         "not_running": "Nevykdomas",
         "open_in_external_player": "Atidaryti išoriniame grotuve",
diff --git a/ui/v2.5/src/locales/lv-LV.json b/ui/v2.5/src/locales/lv-LV.json
index e61f8f9ab..e3fd9066e 100644
--- a/ui/v2.5/src/locales/lv-LV.json
+++ b/ui/v2.5/src/locales/lv-LV.json
@@ -83,8 +83,6 @@
         "import": "Ievietot…",
         "hide": "Paslēpt",
         "make_primary": "Padarīt primāro",
-        "merge_from": "Apvienot no",
-        "merge_into": "Apvienot ar",
         "migrate_blobs": "Migrēt Blobus",
         "next_action": "Nākamais",
         "not_running": "nestrādā",
diff --git a/ui/v2.5/src/locales/nb-NO.json b/ui/v2.5/src/locales/nb-NO.json
index 6a97b5ca2..44cf2e6e2 100644
--- a/ui/v2.5/src/locales/nb-NO.json
+++ b/ui/v2.5/src/locales/nb-NO.json
@@ -21,7 +21,6 @@
             "import_warning": "Er du sikker på at du vil importere? Dette vil slette databasen og re-importere fra dine eksporterte metadata."
         },
         "generate_thumb_default": "Generer standard miniatyrbilde",
-        "merge_into": "Slå sammen til",
         "scrape_query": "Skrape forespørsel",
         "reset_play_duration": "Tilbakestill avspillingsvarigheten",
         "reset_resume_time": "Tilbakestill gjenoppta tid",
@@ -59,7 +58,6 @@
         "encoding_image": "Omsetter bilde til kode…",
         "merge": "Slå sammen",
         "created_entity": "Opprettet {entity_type}: {entity_name}",
-        "merge_from": "Slå sammen fra",
         "clean_generated": "Rydd opp i genererte filer",
         "clear": "Fjern",
         "clear_back_image": "Fjern bakbilde",
@@ -456,7 +454,6 @@
             "added_job_to_queue": "La til {operation_name} i jobbkøen",
             "anonymise_and_download": "Lager en anonymisert kopi av databasen og laster ned den resulterende filen.",
             "anonymise_database": "Lager en kopi av databasen i backup-mappen, og anonymiserer all sensitiv informasjon. Denne kan deretter deles med andre for feilsøking og debugging. Den opprinnelige databasen blir ikke endret. Den anonymiserte databasen bruker filnavnformatet {filename_format}.",
-            "backup_database": "Utfører en sikkerhetskopi av databasen til backup-mappen, med filnavnformatet {filename_format}",
             "cleanup_desc": "Sjekk etter manglende filer og fjern dem fra databasen. Dette er en destruktiv handling.",
             "defaults_set": "Standardinnstillinger er satt og vil bli brukt når du klikker på {action}-knappen på Oppgaver-siden.",
             "migrate_scene_screenshots": {
@@ -819,9 +816,7 @@
         },
         "video_codec": "Video Kodek",
         "audio_codec": "Lydkodek",
-        "checksum": "Sjekksum",
         "downloaded_from": "Lastet ned fra",
-        "hash": "Hash",
         "interactive_speed": "Interaktiv hastighet",
         "o_count": "0 Antall",
         "phash": "PHash",
@@ -883,12 +878,6 @@
         "add_new_studios": "Legg til nye studioer",
         "batch_add_studios": "Batch Legg Til Studio",
         "config": {
-            "edit_excluded_fields": "Rediger ekskluderte felt",
-            "excluded_fields": "Ekskluderte felt:",
-            "no_fields_are_excluded": "Ingen felt er ekskludert",
-            "no_instances_found": "Ingen forekomster funnet",
-            "these_fields_will_not_be_changed_when_updating_studios": "Disse feltene vil ikke bli endret når du oppdaterer studioer.",
-            "active_stash-box_instance": "Aktiv stash-box-instans:",
             "create_parent_label": "Lag foreldrestudioer",
             "create_parent_desc": "Opprett manglende foreldrestudioer, eller tagg og oppdater data/bilde for eksisterende foreldrestudioer med nøyaktige navnesamsvar"
         },
@@ -1043,10 +1032,6 @@
         "dont_show_until_updated": "Ikke vis før neste oppdatering",
         "export_include_related_objects": "Inkluder relaterte objekter i eksporten",
         "export_title": "Eksport",
-        "merge_tags": {
-            "destination": "Destinasjon",
-            "source": "Kilde"
-        },
         "performers_found": "{count} utøvere funnet",
         "reassign_entity_title": "{antall, flertall, én {Reassign {singularEntity}} annen {Reassign {pluralEntity}}}",
         "reassign_files": {
@@ -1123,14 +1108,6 @@
     "part_of": "En del av {forelder}",
     "performer_tagger": {
         "batch_update_performers": "Batch Oppdater Skuespillere",
-        "config": {
-            "active_stash-box_instance": "Aktiv stash-box-instans:",
-            "edit_excluded_fields": "Rediger Ekskluderte Felt",
-            "no_fields_are_excluded": "Ingen felt er ekskludert",
-            "no_instances_found": "Ingen forekomster funnet",
-            "excluded_fields": "Ekskluderte felt:",
-            "these_fields_will_not_be_changed_when_updating_performers": "Disse feltene vil ikke bli endret når skuespillerne oppdateres."
-        },
         "network_error": "Nettverksfeil",
         "performer_already_tagged": "Skuespilleren er allerede tagget",
         "number_of_performers_will_be_processed": "{skuespiller_antall} skuespillere vil bli behandlet",
diff --git a/ui/v2.5/src/locales/nl-NL.json b/ui/v2.5/src/locales/nl-NL.json
index b05de034f..fc44475e2 100644
--- a/ui/v2.5/src/locales/nl-NL.json
+++ b/ui/v2.5/src/locales/nl-NL.json
@@ -54,8 +54,6 @@
         "import_from_file": "Importeren uit bestand",
         "logout": "Uitloggen",
         "merge": "Samenvoegen",
-        "merge_from": "Samenvoegen uit",
-        "merge_into": "Samenvoegen naar",
         "next_action": "Volgende",
         "not_running": "niet actief",
         "open_in_external_player": "Openen in externe speler",
@@ -462,7 +460,6 @@
             "auto_tagging": "Automatisch taggen",
             "backing_up_database": "Database back-uppen",
             "backup_and_download": "Voert een backup uit van de database en download het backup bestand.",
-            "backup_database": "Voert een backup van de database uit naar de backup map, met het bestandsformaat {filename_format}",
             "cleanup_desc": "Controleer op missende bestanden en verwijder deze uit de database. Dit is een destructieve handeling.",
             "data_management": "Opslagbeheer",
             "defaults_set": "Standaarden zijn ingesteld en zullen gebruikt worden wanneer de {action} knop op de Taken pagina ingedrukt wordt.",
@@ -807,10 +804,6 @@
                 "zoom": "Zoom"
             }
         },
-        "merge_tags": {
-            "destination": "Bestemming",
-            "source": "Afkomst"
-        },
         "scene_gen": {
             "force_transcodes": "Genereren van transcode forceren",
             "force_transcodes_tooltip": "Standaard worden transcodes alleen gegenereerd als het videobestand niet wordt ondersteund in de browser. Indien ingeschakeld, worden transcodes gegenereerd, zelfs als het videobestand in de browser lijkt te worden ondersteund.",
@@ -986,9 +979,7 @@
     "measurements": "Afmetingen",
     "media_info": {
         "audio_codec": "Audio Codec",
-        "checksum": "Checksum",
         "downloaded_from": "Gedownload van",
-        "hash": "Hash",
         "interactive_speed": "Interactieve snelheid",
         "performer_card": {
             "age": "{age} {years_old}",
@@ -1028,14 +1019,6 @@
         "any_names_entered_will_be_queried": "Alle ingevoerde namen worden opgevraagd vanuit de externe Stash-Box-instantie en toegevoegd als ze worden gevonden. Alleen exacte overeenkomsten worden als een overeenkomst beschouwd.",
         "batch_add_performers": "Batch Artiesten toevoegen",
         "batch_update_performers": "Artiesten in batch bewerken",
-        "config": {
-            "active_stash-box_instance": "Actieve stashbox-instantie:",
-            "edit_excluded_fields": "Uitgesloten velden bewerken",
-            "excluded_fields": "Uitgesloten velden:",
-            "no_fields_are_excluded": "Er zijn geen velden uitgesloten",
-            "no_instances_found": "Geen instanties gevonden",
-            "these_fields_will_not_be_changed_when_updating_performers": "Deze velden worden niet gewijzigd bij het updaten van artiesten."
-        },
         "current_page": "Huidige pagina",
         "failed_to_save_performer": "Kan artiest \"{performer}\" niet opslaan",
         "name_already_exists": "Naam bestaat al",
@@ -1229,10 +1212,6 @@
         "query_all_studios_in_the_database": "Alle studio's in de database",
         "current_page": "Huidige pagina",
         "status_tagging_job_queued": "Status: Tagging-taak in de wachtrij",
-        "config": {
-            "no_instances_found": "Geen gevallen gevonden",
-            "these_fields_will_not_be_changed_when_updating_studios": "Deze velden worden niet gewijzigd bij het updaten van studio's."
-        },
         "failed_to_save_studio": "Opslaan van studio “{studio}” mislukt",
         "name_already_exists": "Naam bestaat reeds",
         "network_error": "Netwerkfout",
@@ -1274,5 +1253,8 @@
     },
     "datetime_format": "YYYY-MM-DD HH:MM",
     "sub_group": "Subgroep",
-    "sub_groups": "Subgroepen"
+    "sub_groups": "Subgroepen",
+    "weight_kg": "Gewicht (kg)",
+    "type": "Type",
+    "time_end": "Eindtijd"
 }
diff --git a/ui/v2.5/src/locales/nn-NO.json b/ui/v2.5/src/locales/nn-NO.json
index 995336e58..1e918a677 100644
--- a/ui/v2.5/src/locales/nn-NO.json
+++ b/ui/v2.5/src/locales/nn-NO.json
@@ -81,11 +81,9 @@
         "logout": "Logg ut",
         "make_primary": "Set som føretrekt",
         "merge": "Flett",
-        "merge_into": "Flett inn i",
         "migrate_scene_screenshots": "Migrer skjermbilete av scener",
         "download_anonymised": "Last ned anonymisert",
-        "disallow": "Ikkje tillat",
-        "merge_from": "Flett frå"
+        "disallow": "Ikkje tillat"
     },
     "countables": {
         "groups": "{count, plural, one {Gruppe} other {Grupper}}",
diff --git a/ui/v2.5/src/locales/pl-PL.json b/ui/v2.5/src/locales/pl-PL.json
index 0afd99dc5..800ab7842 100644
--- a/ui/v2.5/src/locales/pl-PL.json
+++ b/ui/v2.5/src/locales/pl-PL.json
@@ -58,8 +58,6 @@
         "logout": "Wyloguj",
         "make_primary": "Ustaw jako główny",
         "merge": "Scal",
-        "merge_from": "Scal z",
-        "merge_into": "Scal do",
         "migrate_blobs": "Migruj bloby",
         "migrate_scene_screenshots": "Migruj zrzuty ekranu ze scen",
         "next_action": "Dalej",
@@ -143,7 +141,16 @@
         "add_sub_groups": "Dodaj podgrupy",
         "view_history": "Zobacz historię",
         "play": "Odtwarzaj",
-        "show_results": "Pokaż wyniki"
+        "show_results": "Pokaż wyniki",
+        "add_stash_id": "Dodaj Stash ID",
+        "create_new": "Utwórz nowy",
+        "load": "Wczytaj",
+        "load_filter": "Wczytaj filtr",
+        "sidebar": {
+            "close": "Zamknij pasek boczny",
+            "open": "Otwórz pasek boczny",
+            "toggle": "Przełącz pasek boczny"
+        }
     },
     "actions_name": "Działania",
     "age": "Wiek",
@@ -191,7 +198,14 @@
             "set_tag_label": "Ustaw tagi",
             "source": "Źródło",
             "mark_organized_desc": "Po kliknięciu przycisku Zapisz scena zostaje natychmiast oznaczona jako zorganizowana.",
-            "mark_organized_label": "Oznacz jako zorganizowane przy zapisywaniu"
+            "mark_organized_label": "Oznacz jako zorganizowane przy zapisywaniu",
+            "errors": {
+                "blacklist_duplicate": "Duplikuj element czarnej listy"
+            },
+            "performer_genders": {
+                "heading": "Płeć wykonawcy",
+                "description": "Wykonawcy o tych płciach będą wyświetlani podczas tagowania scen."
+            }
         },
         "noun_query": "Zapytanie",
         "results": {
@@ -212,7 +226,9 @@
         "verb_scrape_all": "Zbierz wszystko",
         "verb_submit_fp": "Wyślij {fpCount, plural, one{# odcisk palca} few{# odciski palców} other{# odcisków palców}}",
         "verb_toggle_config": "{toggle} {configuration}",
-        "verb_toggle_unmatched": "{toggle} niedopasowane sceny"
+        "verb_toggle_unmatched": "{toggle} niedopasowane sceny",
+        "verb_add_as_alias": "Dodaj zebraną nazwę jako alias",
+        "verb_link_existing": "Połącz z istniejącym"
     },
     "config": {
         "about": {
@@ -291,7 +307,9 @@
                 "password_desc": "Hasło dostępu do aplikacji Stash. Pozostaw puste, aby wyłączyć uwierzytelnianie użytkownika",
                 "stash-box_integration": "Integracja ze Stash-box",
                 "username": "Nazwa użytkownika",
-                "username_desc": "Nazwa użytkownika umożliwiająca dostęp do Stash. Pozostaw puste, aby wyłączyć uwierzytelnianie użytkownika"
+                "username_desc": "Nazwa użytkownika umożliwiająca dostęp do Stash. Pozostaw puste, aby wyłączyć uwierzytelnianie użytkownika",
+                "log_file_max_size": "Maksymalny rozmiar pliku loga",
+                "log_file_max_size_desc": "Maksymalny rozmiar pliku loga w megabajtach przed jego skompresowaniem. 0MB wyłącza tę funkcję. Wymaga ponownego uruchomienia."
             },
             "backup_directory_path": {
                 "description": "Lokalizacja katalogu kopii zapasowych plików bazy danych SQLite",
@@ -348,7 +366,16 @@
                     }
                 },
                 "download_ffmpeg": {
-                    "heading": "Pobierz FFmpeg"
+                    "heading": "Pobierz FFmpeg",
+                    "description": "Pobiera FFmpeg do katalogu konfiguracji i czyści ścieżki do ffmpeg oraz ffprobe, aby były powiązane z katalogiem konfiguracji."
+                },
+                "ffmpeg_path": {
+                    "heading": "Ścieżka pliku wykonywalnego FFmpeg",
+                    "description": "Ścieżka do pliku wykonywalnego ffmpeg (nie do folderu). Jeśli pole jest puste, ffmpeg zostanie odnaleziony na podstawie zmiennej środowiskowej $PATH, katalogu konfiguracji lub katalogu $HOME/.stash"
+                },
+                "ffprobe_path": {
+                    "description": "Ścieżka do pliku wykonywalnego ffprobe (nie do folderu). Jeśli pole jest puste, ffprobe zostanie odnalezione na podstawie zmiennej środowiskowej $PATH, katalogu konfiguracji lub katalogu $HOME/.stash",
+                    "heading": "Ścieżka pliku wykonywalnego FFprobe"
                 }
             },
             "funscript_heatmap_draw_range": "Bierz pod uwagę zakres dla wygenerowanych heatmap",
@@ -394,7 +421,15 @@
             "sqlite_location": "Lokalizacja pliku dla bazy danych SQLite (wymaga ponownego uruchomienia). UWAGA: przechowywanie bazy danych w systemie innym niż ten na którym uruchomiony jest serwer Stash (np. w lokalizacji sieciowej) nie jest wspierane!",
             "video_ext_desc": "Rozdzielona przecinkami lista rozszerzeń plików, które będą identyfikowane jako pliki wideo.",
             "video_ext_head": "Rozszerzenia wideo",
-            "video_head": "Wideo"
+            "video_head": "Wideo",
+            "delete_trash_path": {
+                "description": "Ścieżka, do której będą przenoszone usuwane pliki zamiast ich trwałego usunięcia. Pozostaw puste, aby usuwać pliki na stałe.",
+                "heading": "Ścieżka kosza"
+            },
+            "plugins_path": {
+                "description": "Lokalizacja katalogu plików konfiguracyjnych wtyczek",
+                "heading": "Ścieżka wtyczek"
+            }
         },
         "library": {
             "exclusions": "Wykluczenia",
@@ -406,7 +441,9 @@
         },
         "plugins": {
             "hooks": "Punkty zaczepienia",
-            "triggers_on": "Wyzwalacze \"w przypadku\""
+            "triggers_on": "Wyzwalacze \"w przypadku\"",
+            "available_plugins": "Dostępne wtyczki",
+            "installed_plugins": "Zainstalowane wtyczki"
         },
         "scraping": {
             "entity_metadata": "Metadane - {entityType}",
@@ -417,7 +454,9 @@
             "scrapers": "Zbieracze",
             "search_by_name": "Wyszukiwanie według nazwy",
             "supported_types": "Obsługiwane typy",
-            "supported_urls": "Adresy URL"
+            "supported_urls": "Adresy URL",
+            "available_scrapers": "Dostępne zbieracze",
+            "installed_scrapers": "Zainstalowane zbieracze"
         },
         "stashbox": {
             "add_instance": "Dodaj instancję stash-box",
@@ -426,7 +465,9 @@
             "endpoint": "Punkt końcowy",
             "graphql_endpoint": "Punkt końcowy GraphQL",
             "name": "Nazwa",
-            "title": "Punkty końcowe stash-box"
+            "title": "Punkty końcowe stash-box",
+            "max_requests_per_minute": "Maksymalna liczba żądań na minutę",
+            "max_requests_per_minute_description": "Używa wartości domyślnej {defaultValue}, jeśli ustawiono 0"
         },
         "system": {
             "transcoding": "Transkodowanie"
@@ -444,7 +485,6 @@
             "auto_tagging": "Automatyczne tagowanie",
             "backing_up_database": "Tworzenie kopii zapasowej bazy danych",
             "backup_and_download": "Wykonuje kopię zapasową bazy danych i pobiera plik wynikowy.",
-            "backup_database": "Wykonuje kopię zapasową bazy danych do katalogu kopii zapasowych, z nazwą pliku w formacie {filename_format}",
             "cleanup_desc": "Sprawdza, czy nie ma brakujących plików i usuwa je z bazy danych. Jest to działanie destrukcyjne.",
             "data_management": "Zarządzanie danymi",
             "defaults_set": "Zostały ustawione wartości domyślne, które będą używane po kliknięciu przycisku {action} na stronie Zadania.",
@@ -485,7 +525,13 @@
                 "source": "Źródło",
                 "source_options": "Opcje {source}",
                 "sources": "Źródła",
-                "strategy": "Strategia"
+                "strategy": "Strategia",
+                "skip_multiple_matches": "Pomiń dopasowania, które mają więcej niż jeden wynik",
+                "skip_multiple_matches_tooltip": "Jeśli ta opcja nie jest włączona i zwrócono więcej niż jeden wynik, jeden z nich zostanie losowo wybrany do dopasowania",
+                "skip_single_name_performers": "Pomiń wykonawców z jedną nazwą bez dodatkowego rozróżnienia",
+                "tag_skipped_matches": "Otaguj pominięte dopasowania",
+                "tag_skipped_performers": "Otaguj pominiętych wykonawców",
+                "skip_single_name_performers_tooltip": "Bez włączenia tej opcji wykonawcy o popularnych imionach (np. Samantha, Olga) będą dopasowywani"
             },
             "import_from_exported_json": "Import z wyeksportowanego pliku JSON w katalogu metadanych. Wymazuje istniejącą bazę danych.",
             "incremental_import": "Import przyrostowy z dostarczonego wyeksportowanego pliku zip.",
@@ -509,7 +555,22 @@
                 "scanning_paths": "Skanowanie następujących ścieżek"
             },
             "scan_for_content_desc": "Skanowanie w poszukiwaniu nowych treści i dodawanie ich do bazy danych.",
-            "set_name_date_details_from_metadata_if_present": "Ustawianie nazwy, daty i szczegółów z metadanych osadzonego pliku"
+            "set_name_date_details_from_metadata_if_present": "Ustawianie nazwy, daty i szczegółów z metadanych osadzonego pliku",
+            "clean_generated": {
+                "blob_files": "Pliki blob",
+                "description": "Usuwa wygenerowane pliki, które nie mają odpowiadającego wpisu w bazie danych.",
+                "image_thumbnails": "Miniatury obrazów",
+                "image_thumbnails_desc": "Miniatury obrazów i klipy",
+                "markers": "Podglądy znaczników",
+                "previews": "Podglądy scen",
+                "previews_desc": "Podglądy scen i miniatury",
+                "sprites": "Klipy scen",
+                "transcodes": "Transkodowania scen"
+            },
+            "generate_sprites_during_scan_tooltip": "Obrazy wyświetlane pod odtwarzaczem wideo ułatwiające nawigację.",
+            "optimise_database": "Popraw wydajność, analizując i przebudowując całą bazę danych.",
+            "rescan": "Przeskanuj pliki ponownie",
+            "rescan_tooltip": "Przeskanuj ponownie każdy plik w ścieżce. Używane do wymuszenia aktualizacji metadanych plików i ponownego skanowania plików ZIP."
         },
         "tools": {
             "scene_duplicate_checker": "Sprawdzacz duplikatów scen",
@@ -528,7 +589,9 @@
                 "whitespace_chars": "Białe znaki",
                 "whitespace_chars_desc": "Te znaki zostaną zastąpione spacją w tytule"
             },
-            "scene_tools": "Narzędzia scen"
+            "scene_tools": "Narzędzia scen",
+            "graphql_playground": "Środowisko testowe GraphQL",
+            "heading": "Narzędzia"
         },
         "ui": {
             "abbreviate_counters": {
@@ -658,7 +721,7 @@
                 }
             },
             "preview_type": {
-                "description": "Konfiguracja dla elementów ściany",
+                "description": "Domyślną opcją są podglądy wideo (MP4). Aby zmniejszyć obciążenie CPU podczas przeglądania, możesz używać podglądów w formacie animowanego obrazu (WebP). Jednakże muszą one zostać dodatkowo wygenerowane i zajmują więcej miejsca.",
                 "heading": "Typ podglądu",
                 "options": {
                     "animated": "Animowany obraz",
@@ -690,7 +753,8 @@
                     "vr_tag": {
                         "description": "Przycisk VR będzie wyświetlany tylko dla scen z tym znacznikiem.",
                         "heading": "Tag VR"
-                    }
+                    },
+                    "enable_chromecast": "Włącz Chromecast"
                 }
             },
             "scene_wall": {
@@ -730,7 +794,33 @@
                     }
                 }
             },
-            "title": "Interfejs użytkownika"
+            "title": "Interfejs użytkownika",
+            "detail": {
+                "compact_expanded_details": {
+                    "description": "Po włączeniu ta opcja wyświetli rozszerzone szczegóły przy zachowaniu kompaktowego układu",
+                    "heading": "Kompaktowy widok szczegółów"
+                },
+                "enable_background_image": {
+                    "description": "Pokaż tło na stronie szczegółów.",
+                    "heading": "Włącz obraz tła"
+                },
+                "heading": "Strona szczegółów",
+                "show_all_details": {
+                    "description": "Po włączeniu wszystkie szczegóły zawartości będą domyślnie wyświetlane, każdy element szczegółów w jednej kolumnie",
+                    "heading": "Pokaż wszystkie szczegóły"
+                }
+            },
+            "performer_list": {
+                "heading": "Lista wykonawców",
+                "options": {
+                    "show_links_on_grid_card": {
+                        "heading": "Wyświetl linki na kartach siatki wykonawców"
+                    }
+                }
+            },
+            "sfw_mode": {
+                "heading": "Tryb treści SFW"
+            }
         },
         "advanced_mode": "Tryb zaawansowany"
     },
@@ -824,17 +914,14 @@
                 "label": "Tryb przewijania",
                 "pan_y": "Przesunięcie Y",
                 "zoom": "Powiększenie"
-            }
+            },
+            "disable_animation": "Wyłącz animację przejścia między obrazami"
         },
         "merge": {
             "destination": "Cel",
             "empty_results": "Wartości pola \"cel\" nie zostaną zmienione.",
             "source": "Źródło"
         },
-        "merge_tags": {
-            "destination": "Cel",
-            "source": "Źródło"
-        },
         "reassign_entity_title": "Przypisz {count, plural, one {{singularEntity}} other {{pluralEntity}}}",
         "reassign_files": {
             "destination": "Przypisz ponownie do"
@@ -870,11 +957,13 @@
             "preview_seg_duration_desc": "Czas trwania każdego segmentu podglądu, w sekundach.",
             "preview_seg_duration_head": "Czas trwania segmentu podglądu",
             "sprites": "Sprite'y sceny",
-            "sprites_tooltip": "Sprite'y (dla scrubbera)",
+            "sprites_tooltip": "Obrazy wyświetlane pod odtwarzaczem wideo ułatwiające nawigację.",
             "transcodes": "Transkodowanie",
             "transcodes_tooltip": "Konwersja do MP4 z nieobsługiwanych formatów wideo",
             "video_previews": "Podglądy",
-            "video_previews_tooltip": "Podgląd wideo odtwarzany po najechaniu kursorem myszy na scenę"
+            "video_previews_tooltip": "Podgląd wideo odtwarzany po najechaniu kursorem myszy na scenę",
+            "image_thumbnails": "Miniatury obrazów",
+            "phash_tooltip": "Do deduplikacji i identyfikacji scen"
         },
         "scenes_found": "Znaleziono {count} scen",
         "scrape_entity_query": "Zapytanie zbieracza – {entity_type}",
@@ -882,7 +971,17 @@
         "scrape_results_existing": "Istniejący",
         "scrape_results_scraped": "Zebrany",
         "set_image_url_title": "Adres URL obrazu",
-        "unsaved_changes": "Niezapisane zmiany. Czy na pewno chcesz wyjść?"
+        "unsaved_changes": "Niezapisane zmiany. Czy na pewno chcesz wyjść?",
+        "clear_o_history_confirm": "Czy na pewno chcesz wyczyścić historię O?",
+        "clear_play_history_confirm": "Czy na pewno chcesz wyczyścić historię odtwarzania?",
+        "overwrite_filter_warning": "Zapisany filtr \"{entityName}\" zostanie zastąpiony.",
+        "studios_found": "Znalezione studia: {count}",
+        "tags_found": "Znalezione tagi: {count}",
+        "set_default_filter_confirm": "Czy na pewno chcesz ustawić ten filtr jako domyślny?",
+        "clear_o_history_confirm_sfw": "Czy na pewno chcesz wyczyścić historię polubień?",
+        "performers_found": "Znalezieni wykonawcy: {count}",
+        "stashid_exists_warning": "Istniejący stash id dla tego stash-box zostanie zastąpiony.",
+        "scrape_results_missing": "Brakuje"
     },
     "dimensions": "Wymiary",
     "director": "Reżyser",
@@ -892,7 +991,8 @@
         "list": "Lista",
         "tagger": "Otagowywacz",
         "unknown": "Nieznany",
-        "wall": "Ściana"
+        "wall": "Ściana",
+        "label_current": "Tryb wyświetlania: {current}"
     },
     "donate": "Przekaż darowiznę",
     "dupe_check": {
@@ -910,7 +1010,14 @@
             "medium": "Średnia"
         },
         "search_accuracy_label": "Dokładność wyszukiwania",
-        "title": "Duplikaty scen"
+        "title": "Duplikaty scen",
+        "select_all_but_largest_file": "Zaznacz wszystkie pliki w każdej grupie duplikatów, z wyjątkiem największego pliku",
+        "select_all_but_largest_resolution": "Zaznacz wszystkie pliki w każdej grupie duplikatów, z wyjątkiem pliku o najwyższej rozdzielczości",
+        "only_select_matching_codecs": "Zaznacz tylko wtedy, gdy wszystkie kodeki w grupie duplikatów się zgadzają",
+        "select_oldest": "Zaznacz najstarszy plik w grupie duplikatów",
+        "select_none": "Odznacz wszystko",
+        "select_options": "Ustawienia zaznaczania…",
+        "select_youngest": "Zaznacz najmłodszy plik w grupie duplikatów"
     },
     "duplicated_phash": "Duplikaty (phash)",
     "duration": "Czas trwania",
@@ -939,7 +1046,17 @@
     "errors": {
         "image_index_greater_than_zero": "Indeks obrazu musi być większy niż 0",
         "lazy_component_error_help": "Jeśli Stash został niedawno zaktualizowany, proszę przeładować stronę lub wyczyścić pamięć podręczną przeglądarki.",
-        "something_went_wrong": "Coś się zepsuło."
+        "something_went_wrong": "Coś się zepsuło.",
+        "custom_fields": {
+            "duplicate_field": "Nazwa pola musi być unikalna",
+            "field_name_length": "Nazwa pola musi mieć mniej niż 65 znaków",
+            "field_name_required": "Nazwa pola jest wymagana",
+            "field_name_whitespace": "Nazwa pola nie może zawierać spacji na początku ani na końcu"
+        },
+        "header": "Błąd",
+        "invalid_javascript_string": "Nieprawidłowy kod JavaScript: {error}",
+        "invalid_json_string": "Nieprawidłowy ciąg JSON: {error}",
+        "loading_type": "Błąd podczas ładowania {type}"
     },
     "ethnicity": "Pochodzenie etniczne",
     "existing_value": "istniejąca wartość",
@@ -988,8 +1105,8 @@
         "syncing": "Synchronizacja z serwerem",
         "uploading": "Wgrywanie skryptu"
     },
-    "hasChapters": "Posiada Rozdziały",
-    "hasMarkers": "Ma znaczniki",
+    "hasChapters": "Rozdziały",
+    "hasMarkers": "Znaczniki",
     "height": "Wzrost",
     "height_cm": "Wzrost (cm)",
     "help": "Help",
@@ -1008,26 +1125,26 @@
     "last_played_at": "Ostatnio odtwarzano",
     "library": "Biblioteka",
     "loading": {
-        "generic": "Ładowanie…"
+        "generic": "Ładowanie…",
+        "plugins": "Ładowanie wtyczek…"
     },
     "marker_count": "Liczba Znaczników",
     "markers": "Znaczniki",
     "measurements": "Wymiary",
     "media_info": {
         "audio_codec": "Kodek audio",
-        "checksum": "Suma kontrolna",
         "downloaded_from": "Pobrano z",
-        "hash": "Hash",
         "interactive_speed": "Szybkość interaktywna",
         "performer_card": {
             "age": "{age} {years_old}",
-            "age_context": "{age} {years_old} w tej scenie"
+            "age_context": "{age} {years_old} w momencie produkcji"
         },
         "phash": "PHash",
         "play_count": "Liczba odtworzeń",
         "play_duration": "Czas odtwarzania",
         "stream": "Stream",
-        "video_codec": "Kodek wideo"
+        "video_codec": "Kodek wideo",
+        "o_count": "Licznik O"
     },
     "megabits_per_second": "{value} megabitów na sekundę",
     "metadata": "Metadane",
@@ -1040,7 +1157,8 @@
         "first": "Pierwsza",
         "last": "Ostatnia",
         "next": "Następna",
-        "previous": "Poprzednia"
+        "previous": "Poprzednia",
+        "current_total": "{current} z {total}"
     },
     "parent_of": "Rodzic {children}",
     "parent_studios": "Studia nadrzędne",
@@ -1062,14 +1180,6 @@
         "any_names_entered_will_be_queried": "Wszystkie wprowadzone nazwy zostaną wyszukane w zdalnej instancji Stash-Box i dodane, jeśli zostaną znalezione. Tylko dokładne dopasowania będą uznawane za dopasowanie.",
         "batch_add_performers": "Grupowe dodawanie aktorów",
         "batch_update_performers": "Grupowe aktualizowanie aktorów",
-        "config": {
-            "active_stash-box_instance": "Aktywna instancja stash-box:",
-            "edit_excluded_fields": "Edytuj wykluczone pola",
-            "excluded_fields": "Wykluczone pola:",
-            "no_fields_are_excluded": "Żadne pola nie są wykluczone",
-            "no_instances_found": "Nie znaleziono instancji",
-            "these_fields_will_not_be_changed_when_updating_performers": "Te pola nie zostaną zmienione podczas aktualizacji aktorów.."
-        },
         "current_page": "Bieżąca strona",
         "failed_to_save_performer": "Nie udało się zapisać aktora \"{performer}\"",
         "name_already_exists": "Nazwa już istnieje",
@@ -1087,9 +1197,10 @@
         "tag_status": "Status tagu",
         "to_use_the_performer_tagger": "Aby korzystać z otagowywacza aktorów, należy skonfigurować instancję stash-box.",
         "untagged_performers": "Nieotagowany aktor",
-        "update_performer": "Zaktualizowano aktora",
+        "update_performer": "Aktualizacja aktora",
         "update_performers": "Zaktualizowano aktorów",
-        "updating_untagged_performers_description": "Aktualizowanie nieotagowanych aktorów spróbuje dopasować aktorów, którym brakuje stashid i zaktualizować metadane."
+        "updating_untagged_performers_description": "Aktualizowanie nieotagowanych aktorów spróbuje dopasować aktorów, którym brakuje stashid i zaktualizować metadane.",
+        "performer_names_or_stashids_separated_by_comma": "Nazwiska wykonawców lub StashID oddzielone przecinkiem"
     },
     "performer_tags": "Tagi aktorów",
     "performers": "Aktorzy",
@@ -1120,7 +1231,9 @@
         "edit_filter": "Filtr Edycji",
         "name": "Filtr",
         "saved_filters": "Zapisane filtry",
-        "update_filter": "Aktualizuj filtr"
+        "update_filter": "Aktualizuj filtr",
+        "search_term": "Szukana fraza",
+        "more_filter_criteria": "+{count} więcej"
     },
     "second": "Drugi",
     "seconds": "Sekund",
@@ -1134,7 +1247,8 @@
             "database_file_path": "Ścieżka do pliku bazy danych",
             "generated_directory": "Folder z wygenerowaną zawartością",
             "nearly_there": "Już prawie gotowe!",
-            "stash_library_directories": "Katalogi biblioteki Stash"
+            "stash_library_directories": "Katalogi biblioteki Stash",
+            "blobs_use_database": "<używa bazy danych>"
         },
         "creating": {
             "creating_your_system": "Tworzenie systemu"
@@ -1142,11 +1256,13 @@
         "errors": {
             "something_went_wrong": "O nie! Coś poszło nie tak!",
             "something_went_wrong_description": "Wygląda to na problem z twoimi danymi wejściowymi, kliknij Wstecz, aby je poprawić. W przeciwnym razie zgłoś błąd na stronie {githubLink} lub poszukaj pomocy na {discordLink}.",
-            "something_went_wrong_while_setting_up_your_system": "Coś poszło nie tak podczas konfigurowania systemu. Oto błąd, który otrzymaliśmy: {error}"
+            "something_went_wrong_while_setting_up_your_system": "Coś poszło nie tak podczas konfigurowania systemu. Oto błąd, który otrzymaliśmy: {error}",
+            "unable_to_retrieve_system_status": "Nie można uzyskać statusu systemu: {error}",
+            "unexpected_error": "Wystąpił nieoczekiwany błąd: {error}"
         },
         "folder": {
             "file_path": "Ścieżka do pliku",
-            "up_dir": "W górę katalogu"
+            "up_dir": "Katalog wyżej"
         },
         "github_repository": "Repozytorium na Githubie",
         "migrate": {
@@ -1164,7 +1280,7 @@
         },
         "paths": {
             "database_filename_empty_for_default": "nazwa pliku bazy danych (domyślnie puste)",
-            "description": "Następnie należy określić, gdzie ma się znajdować kolekcja porno oraz gdzie ma być przechowywana baza danych Stash, wygenerowane pliki i pliki pamięci podręcznej. Ustawienia te można zmienić później, jeśli zajdzie taka potrzeba.",
+            "description": "Następnie należy określić, gdzie ma się znajdować Twoja zawartość oraz gdzie ma być przechowywana baza danych Stash, wygenerowane pliki i pliki pamięci podręcznej. Ustawienia te można zmienić później, jeśli zajdzie taka potrzeba.",
             "path_to_cache_directory_empty_for_default": "ścieżka do katalogu cache (domyślnie pusta)",
             "path_to_generated_directory_empty_for_default": "ścieżka do katalogu z wygenerowanymi plikami (domyślnie pusta)",
             "set_up_your_paths": "Ustaw ścieżki",
@@ -1175,12 +1291,17 @@
             "where_can_stash_store_cache_files": "Gdzie Stash może przechowywać pliki pamięci podręcznej?",
             "where_can_stash_store_cache_files_description": "Aby niektóre funkcjonalności takie jak transkodowanie na żywo HLS/DASH mogły działać, Stash wymaga katalogu cache dla plików tymczasowych. Domyślnie, Stash utworzy katalog <code>cache</code> w katalogu zawierającym twój plik konfiguracyjny. Jeśli chcesz to zmienić, podaj ścieżkę bezwzględną lub względną (do bieżącego katalogu roboczego). Stash utworzy ten katalog, jeśli jeszcze nie istnieje.",
             "where_can_stash_store_its_database": "Gdzie Stash może przechowywać swoją bazę danych?",
-            "where_can_stash_store_its_database_description": "Stash używa bazy danych SQLite do przechowywania metadanych porno. Domyślnie zostanie ona utworzona jako <code>stash-go.sqlite</code> w katalogu zawierającym twój plik konfiguracyjny. Jeśli chcesz to zmienić, podaj bezwzględną lub względną (względem bieżącego katalogu roboczego) nazwę pliku.",
+            "where_can_stash_store_its_database_description": "Stash używa bazy danych SQLite do przechowywania metadanych zawartości. Domyślnie zostanie ona utworzona jako <code>stash-go.sqlite</code> w katalogu zawierającym Twój plik konfiguracyjny. Jeśli chcesz to zmienić, podaj bezwzględną lub względną (względem bieżącego katalogu roboczego) nazwę pliku.",
             "where_can_stash_store_its_database_warning": "UWAGA: przechowywanie bazy danych w innym systemie niż ten, z którego uruchamiany jest Stash (np. przechowywanie bazy danych na dysku NAS przy jednoczesnym uruchomieniu serwera Stash na innym komputerze) jest <strong>nieobsługiwane</strong>! SQLite nie jest przeznaczony do pracy w sieci, a próba takiego działania może bardzo łatwo spowodować uszkodzenie całej bazy danych.",
             "where_can_stash_store_its_generated_content": "Gdzie Stash może przechowywać wygenerowaną zawartość?",
             "where_can_stash_store_its_generated_content_description": "Aby zapewnić miniatury, podglądy i sprite'y, Stash generuje obrazy i wideo. Obejmuje to również transkodowanie dla nieobsługiwanych formatów plików. Domyślnie Stash tworzy katalog <code>generated</code> w katalogu zawierającym plik konfiguracyjny. Jeśli chcesz zmienić miejsce przechowywania wygenerowanych multimediów, podaj ścieżkę bezwzględną lub względną (do bieżącego katalogu roboczego). Stash utworzy ten katalog, jeśli jeszcze nie istnieje.",
-            "where_is_your_porn_located": "Gdzie znajduje się Twoje porno?",
-            "where_is_your_porn_located_description": "Dodaj katalogi zawierające filmy porno i obrazy. Stash będzie używał tych katalogów do wyszukiwania filmów i obrazów podczas skanowania.."
+            "where_is_your_porn_located": "Gdzie znajduje się Twoja zawartość?",
+            "where_is_your_porn_located_description": "Dodaj katalogi zawierające filmy i obrazy. Stash będzie używał tych katalogów do wyszukiwania filmów i obrazów podczas skanowania..",
+            "path_to_blobs_directory_empty_for_default": "ścieżka do katalogu blobs (domyślnie pusta)",
+            "sfw_content_settings": "Korzystasz ze stash do treści SFW?",
+            "sfw_content_settings_description": "Stash może być używany do zarządzania treściami SFW, takimi jak fotografia, sztuka, komiksy i inne. Włączenie tej opcji dostosuje niektóre elementy interfejsu, aby były bardziej odpowiednie dla treści SFW.",
+            "store_blobs_in_database": "Przechowuj bloby w bazie danych",
+            "use_sfw_content_mode": "Użyj trybu treści SFW"
         },
         "stash_setup_wizard": "Kreator konfiguracji Stash",
         "success": {
@@ -1193,16 +1314,20 @@
             "support_us": "Wesprzyj nas",
             "thanks_for_trying_stash": "Dzięki za wypróbowanie Stasha!",
             "welcome_contrib": "Mile widziany jest również wkład w postaci kodu (poprawki błędów, ulepszenia i nowe funkcje), testowania, raportów o błędach, próśb o ulepszenia i funkcje oraz wsparcia użytkowników. Szczegóły można znaleźć w sekcji Wkład w instrukcję obsługi aplikacji.",
-            "your_system_has_been_created": "Sukces! Twój system został utworzony!"
+            "your_system_has_been_created": "Sukces! Twój system został utworzony!",
+            "download_ffmpeg": "Pobierz ffmpeg",
+            "missing_ffmpeg": "Brakuje wymaganego pliku wykonywalnego<code>ffmpeg</code>. Możesz go automatycznie pobrać do katalogu konfiguracji, zaznaczając poniższe pole. Alternatywnie, możesz podać ścieżki do plików binarnych <code>ffmpeg</code> i <code>ffprobe</code> w Ustawieniach Systemu. Te pliki binarne muszą być obecne, aby Stash działał prawidłowo."
         },
         "welcome": {
             "config_path_logic_explained": "Stash próbuje najpierw znaleźć swój plik konfiguracyjny (<code>config.yml</code>) w bieżącym katalogu roboczym, a jeśli go tam nie znajdzie, wraca do <code>$HOME/.stash/config.yml</code> (w systemie Windows będzie to <code>%USERPROFILE%\\.stash\\config.yml</code>). Można również sprawić, że Stash będzie odczytywał dane z określonego pliku konfiguracyjnego, uruchamiając go z opcją opcji <code>-c '<ścieżka do pliku konfiguracyjnego>'</code> lub <code>--config '<ścieżka do pliku konfiguracyjnego>'</code>.",
-            "in_current_stash_directory": "W katalogu <code>$HOME/.stash</code>",
-            "in_the_current_working_directory": "W bieżącym katalogu roboczym",
-            "next_step": "Jeśli jesteś gotowy do skonfigurowania nowego systemu, wybierz miejsce, w którym chcesz przechowywać plik konfiguracyjny, i kliknij przycisk Dalej.",
+            "in_current_stash_directory": "W katalogu <code>$HOME/.stash</code>:",
+            "in_the_current_working_directory": "W katalogu roboczym <code>{path}</code>, obecnie:",
+            "next_step": "Jeśli jesteś gotowy do skonfigurowania nowego systemu, wybierz miejsce, w którym chcesz przechowywać plik konfiguracyjny i kliknij przycisk Dalej.",
             "store_stash_config": "Gdzie ma być przechowywana konfiguracja Stasha?",
             "unable_to_locate_config": "Jeśli to czytasz, to znaczy, że Stash nie mógł znaleźć istniejącej konfiguracji. Kreator poprowadzi Cię przez proces tworzenia nowej konfiguracji.",
-            "unexpected_explained": "Jeśli ten ekran pojawia się niespodziewanie, spróbuj ponownie uruchomić Stash we właściwym katalogu roboczym lub z flagą <code>-c</code>."
+            "unexpected_explained": "Jeśli ten ekran pojawia się niespodziewanie, spróbuj ponownie uruchomić Stash we właściwym katalogu roboczym lub z flagą <code>-c</code>.",
+            "in_the_current_working_directory_disabled": "W katalogu roboczym <code>{path}</code>:",
+            "in_the_current_working_directory_disabled_macos": "Nieobsługiwane podczas uruchamiania <code>Stash.app</code>.<br></br>Uruchom <code>stash-macos</code>, aby skonfigurować katalog roboczy"
         },
         "welcome_specific_config": {
             "config_path": "Stash będzie używał następującej ścieżki do pliku konfiguracyjnego: <code>{path}</code>",
@@ -1215,17 +1340,23 @@
     "stash_id_endpoint": "Punkt końcowy Stash ID",
     "stash_ids": "ID Stasha",
     "stashbox": {
-        "go_review_draft": "Przejdź do {endpoint_name}, aby zapoznać się z projektem.",
+        "go_review_draft": "Przejdź do {endpoint_name}, aby zapoznać się z wersją roboczą.",
         "selected_stash_box": "Wybrany punkt końcowy Stash-Box",
         "submission_failed": "Zgłoszenie nie powiodło się",
         "submission_successful": "Zgłoszenie przesłano sukcesem",
-        "submit_update": "Już istnieje w {endpoint_name}"
+        "submit_update": "Już istnieje w {endpoint_name}",
+        "source": "Źródło Stash-Box"
     },
     "statistics": "Statystyki",
     "stats": {
         "image_size": "Rozmiar obrazów",
         "scenes_duration": "Czas trwania scen",
-        "scenes_size": "Rozmiar scen"
+        "scenes_size": "Rozmiar scen",
+        "scenes_played": "Odtworzone sceny",
+        "total_o_count": "Łączna ilość O",
+        "total_o_count_sfw": "Łączna ilość polubień",
+        "total_play_count": "Łączna liczba odtworzeń",
+        "total_play_duration": "Łączny czas odtwarzania"
     },
     "status": "Status: {statusText}",
     "studio": "Studio",
@@ -1267,10 +1398,11 @@
     "updated_at": "Zaktualizowano",
     "url": "URL",
     "validation": {
-        "date_invalid_form": "${path} musi być w formacie RRRR-MM-DD",
+        "date_invalid_form": "${path} musi być w formacie RRRR, RRRR-MM lub RRRR-MM-DD",
         "required": "${path} jest wymagana",
         "unique": "${path} musi być unikalny",
-        "blank": "${path} nie może być puste"
+        "blank": "${path} nie może być puste",
+        "end_time_before_start_time": "Czas zakończenia musi być większy lub równy czasowi rozpoczęcia"
     },
     "videos": "Filmy wideo",
     "view_all": "Pokaż wszystko",
@@ -1285,5 +1417,111 @@
     "sub_group_order": "Kolejność podgrup",
     "sub_groups": "Podgrupy",
     "unknown_date": "Nieznana data",
-    "video_codec": "Kodek Wideo"
+    "video_codec": "Kodek Wideo",
+    "distance": "Dystans",
+    "eta": "ETA",
+    "group_count": "Ilość grup",
+    "group_scene_number": "Numer sceny",
+    "groups": "Grupy",
+    "group": "Grupa",
+    "history": "Historia",
+    "include_sub_group_content": "Uwzględnij zawartość podgrupy",
+    "include_sub_groups": "Uwzględnij podgrupy",
+    "index_of_total": "{index} z {total}",
+    "last_o_at": "Ostatnie O",
+    "login": {
+        "login": "Logowanie",
+        "username": "Użytkownik",
+        "password": "Hasło",
+        "invalid_credentials": "Nieprawidłowa nazwa użytkownika lub hasło",
+        "internal_error": "Nieoczekiwany błąd wewnętrzny. Szczegóły znajdziesz w logach"
+    },
+    "o_count": "Licznik O",
+    "o_count_sfw": "Polubienia",
+    "o_history": "Historia O",
+    "o_history_sfw": "Historia polubień",
+    "odate_recorded_no": "Nie zarejestrowano O",
+    "orientation": "Orientacja",
+    "package_manager": {
+        "add_source": "Dodaj źródło",
+        "check_for_updates": "Sprawdź dostępność aktualizacji",
+        "confirm_delete_source": "Czy na pewno chcesz usunąć źródło {name} ({url})?",
+        "confirm_uninstall": "Czy na pewno chcesz odinstalować {number} pakietów?",
+        "description": "Opis",
+        "edit_source": "Edytuj źródło",
+        "hide_unselected": "Ukryj niezaznaczone",
+        "install": "Instaluj",
+        "installed_version": "Zainstalowana wersja",
+        "latest_version": "Najnowsza wersja",
+        "no_packages": "Nie znaleziono pakietów",
+        "no_sources": "Nie skonfigurowano żadnych źródeł",
+        "no_upgradable": "Brak pakietów do aktualizacji",
+        "package": "Pakiet",
+        "required_by": "Wymagane przez {packages}",
+        "selected_only": "Tylko zaznaczone",
+        "show_all": "Pokaż wszystko",
+        "source": {
+            "local_path": {
+                "description": "Ścieżka względna do przechowywania pakietów dla tego źródła. Uwaga: zmiana tej ścieżki wymaga ręcznego przeniesienia pakietów.",
+                "heading": "Ścieżka lokalna"
+            },
+            "name": "Nazwa",
+            "url": "URL źródła"
+        },
+        "uninstall": "Odinstaluj",
+        "unknown": "<nieznany>",
+        "update": "Aktualizuj",
+        "version": "Wersja"
+    },
+    "parent_studio": "Studio nadrzędne",
+    "photographer": "Fotograf",
+    "play_history": "Historia odtwarzania",
+    "playdate_recorded_no": "Nie zarejestrowano odtworzeń",
+    "plays": "Odtworzenia: {value}",
+    "primary_tag": "Tag nadrzędny",
+    "scenes_duration": "Czas trwania sceny",
+    "stashbox_search": {
+        "no_results": "Nie znaleziono wyników.",
+        "select_stashbox": "Wybierz StashBox..."
+    },
+    "studio_tagger": {
+        "add_new_studios": "Dodaj nowe studia",
+        "config": {
+            "create_parent_desc": "Utwórz brakujące studia nadrzędne lub otaguj i zaktualizuj dane/obraz dla istniejących studiów nadrzędnych o dokładnie takich samych nazwach",
+            "create_parent_label": "Utwórz studia nadrzędne"
+        },
+        "any_names_entered_will_be_queried": "Wszystkie wprowadzone nazwy zostaną wyszukane w zdalnej instancji Stash-Box i dodane, jeśli zostaną znalezione. Tylko dokładne dopasowania będą uznawane za dopasowanie.",
+        "batch_add_studios": "Dodaj studia zbiorowo",
+        "batch_update_studios": "Aktualizuj studia zbiorowo",
+        "create_or_tag_parent_studios": "Utwórz brakujące studia nadrzędne lub otaguj istniejące",
+        "current_page": "Aktualna strona",
+        "failed_to_save_studio": "Nie udało się zapisać studia \"{studio}\"",
+        "name_already_exists": "Nazwa już istnieje",
+        "network_error": "Błąd sieci",
+        "no_results_found": "Nie znaleziono wyników.",
+        "query_all_studios_in_the_database": "Wszystkie studia w bazie danych",
+        "number_of_studios_will_be_processed": "{studio_count} studiów zostanie przetworzonych"
+    },
+    "studio_and_parent": "Studio i Studio nadrzędne",
+    "studio_count": "Liczba studiów",
+    "studio_tags": "Tagi studia",
+    "tag_parent_tooltip": "Ma tagi nadrzędne",
+    "tag_sub_tag_tooltip": "Ma podtagi",
+    "time": "Czas",
+    "time_end": "Czas zakończenia",
+    "urls": "Adresy URL",
+    "age_on_date": "{age} w momencie produkcji",
+    "criterion_modifier_values": {
+        "any": "Którykolwiek",
+        "any_of": "Którykolwiek z",
+        "only": "Wyłącznie"
+    },
+    "custom_fields": {
+        "field": "Pole",
+        "title": "Pola niestandardowe",
+        "value": "Wartość"
+    },
+    "include_sub_studio_content": "Uwzględnij zawartość podstudia",
+    "include_sub_tag_content": "Uwzględnij zawartość podtaga",
+    "odate_recorded_no_sfw": "Nie zarejestrowano polubień"
 }
diff --git a/ui/v2.5/src/locales/pt-BR.json b/ui/v2.5/src/locales/pt-BR.json
index 64b0e4e4c..3b5856ca5 100644
--- a/ui/v2.5/src/locales/pt-BR.json
+++ b/ui/v2.5/src/locales/pt-BR.json
@@ -60,8 +60,6 @@
         "logout": "Sair",
         "make_primary": "Tornar Primário",
         "merge": "Unir",
-        "merge_from": "Unir do",
-        "merge_into": "Unir em",
         "migrate_blobs": "Migrar Blobs",
         "migrate_scene_screenshots": "Migrar Print da Cena",
         "next_action": "Próximo",
@@ -145,7 +143,16 @@
         "reset_cover": "Restaurar a capa padrão",
         "copy_to_clipboard": "Copiar para a área de transferência",
         "encoding_image": "Codificando imagem…",
-        "reload": "Recarregar"
+        "reload": "Recarregar",
+        "set_cover": "Definir como Capa",
+        "show_results": "Mostrar resultados",
+        "show_count_results": "Mostrar {count} resultados",
+        "sidebar": {
+            "close": "Fechar barra lateral",
+            "open": "Abrir barra lateral",
+            "toggle": "Alternar barra lateral"
+        },
+        "invert_selection": "Inverter Seleção"
     },
     "actions_name": "Ações",
     "age": "Idade",
@@ -194,7 +201,13 @@
             "set_cover_label": "Definir imagem da capa da cena",
             "set_tag_desc": "Anexar etiquetas à cena, sobrescrevendo ou mesclando com as etiquetas existentes na cena.",
             "set_tag_label": "Definir etiquetas",
-            "source": "Fonte"
+            "source": "Fonte",
+            "errors": {
+                "blacklist_duplicate": "Lista negra duplicada"
+            },
+            "performer_genders": {
+                "heading": "Gêneros de artistas"
+            }
         },
         "noun_query": "Query",
         "results": {
@@ -423,7 +436,6 @@
             "auto_tagging": "Etiquetamento automático",
             "backing_up_database": "Backup do banco de dados",
             "backup_and_download": "Executa um backup do banco de dados e baixa do arquivo resultante.",
-            "backup_database": "Executa um backup do banco de dados para o mesmo diretório que o banco de dados, com o formato do nome do arquivo {filename_format}",
             "cleanup_desc": "Verifique os arquivos ausentes removendo-os do banco de dados. Esta é uma ação destrutiva.",
             "data_management": "Gestão de dados",
             "defaults_set": "Opções padrão foram definidas e serão usadas quando clicar o botão {action} na página de Tarefas.",
@@ -462,7 +474,10 @@
                 "source": "Fonte",
                 "source_options": "Opções de {source}",
                 "sources": "Fontes",
-                "strategy": "Estratégia"
+                "strategy": "Estratégia",
+                "skip_single_name_performers": "Pular artistas com nome único que não possuem desambiguação",
+                "skip_single_name_performers_tooltip": "Se isso não estiver ativado, artistas que costumam ser genéricos, como Samantha ou Olga, vão ser combinados",
+                "tag_skipped_performers": "Marcar artistas ignorados com"
             },
             "import_from_exported_json": "Importação de JSON exportado no diretório de metadados. Limpa o banco de dados existente.",
             "incremental_import": "Importação incremental de um arquivo zip de exportação fornecido.",
@@ -622,7 +637,10 @@
                 "description": "Slideshow está disponível em galerias quando no modo de exibição de paredão",
                 "heading": "Atraso do slideshow (segundos)"
             },
-            "title": "Interface de usuário"
+            "title": "Interface de usuário",
+            "performer_list": {
+                "heading": "Lista de artistas"
+            }
         },
         "advanced_mode": "Modo Avançado"
     },
@@ -704,10 +722,6 @@
                 "zoom": "Zoom"
             }
         },
-        "merge_tags": {
-            "destination": "Destino",
-            "source": "Fonte"
-        },
         "scene_gen": {
             "force_transcodes": "Forçar geração de transcodificação",
             "force_transcodes_tooltip": "Por padrão, transcodificações são geradas apenas quando o arquivo de vídeo não é suportado pelo navegador. Quando ativado, transcodificações serão geradas mesmo quando o vídeo parecer ser suportado no navegador.",
@@ -749,7 +763,8 @@
         "scrape_results_existing": "Existem",
         "scrape_results_scraped": "Scrape finalizado",
         "set_image_url_title": "URL da imagem",
-        "unsaved_changes": "Mudanças não salvas. Você tem certeza de que quer sair?"
+        "unsaved_changes": "Mudanças não salvas. Você tem certeza de que quer sair?",
+        "performers_found": "{count} artistas encontrados"
     },
     "dimensions": "Dimensões",
     "director": "Diretor(a)",
@@ -866,9 +881,7 @@
     "measurements": "Medidas",
     "media_info": {
         "audio_codec": "Codec de áudio",
-        "checksum": "Checksum",
         "downloaded_from": "Baixado de",
-        "hash": "Hash",
         "interactive_speed": "Velocidade interativa",
         "performer_card": {
             "age": "{age} {years_old}",
@@ -908,14 +921,6 @@
         "any_names_entered_will_be_queried": "Quaisquer nomes inseridos serão consultados na instância remota do Stash-Box e adicionados caso encontrados. Apenas correspondências exatas serão consideradas.",
         "batch_add_performers": "Adicionar Artistas em Lote",
         "batch_update_performers": "Atualizar Artistas em Lote",
-        "config": {
-            "active_stash-box_instance": "Instância Stash-Box ativa:",
-            "edit_excluded_fields": "Editar Campos Excluídos",
-            "excluded_fields": "Campos excluídos:",
-            "no_fields_are_excluded": "Nenhum campo é excluído",
-            "no_instances_found": "Nenhuma instância encontrada",
-            "these_fields_will_not_be_changed_when_updating_performers": "Estes campos não serão alterados ao atualizar artistas."
-        },
         "current_page": "Página atual",
         "failed_to_save_performer": "Falha ao salvar artista \"{performer}\"",
         "name_already_exists": "Nome já existe",
@@ -1080,7 +1085,8 @@
         "started_auto_tagging": "Etiquetamento automático iniciado",
         "started_generating": "Geração de arquivos multimídia iniciada",
         "started_importing": "Importação iniciada",
-        "updated_entity": "{entity} atualizado(a)"
+        "updated_entity": "{entity} atualizado(a)",
+        "merged_scenes": "Cenas mescladas"
     },
     "total": "Total",
     "true": "Verdadeiro",
@@ -1091,5 +1097,9 @@
     "videos": "Vídeos",
     "view_all": "Ver todos",
     "weight": "Peso",
-    "years_old": "anos"
+    "years_old": "anos",
+    "age_on_date": "{age} na produção",
+    "weight_kg": "Peso (kg)",
+    "unknown_date": "Data desconhecida",
+    "urls": "URLs"
 }
diff --git a/ui/v2.5/src/locales/ro-RO.json b/ui/v2.5/src/locales/ro-RO.json
index defa78a8d..293d85c70 100644
--- a/ui/v2.5/src/locales/ro-RO.json
+++ b/ui/v2.5/src/locales/ro-RO.json
@@ -124,8 +124,6 @@
         "delete_generated_supporting_files": "Șterge fișierele suport generate",
         "hash_migration": "migrare hash",
         "make_primary": "Definește ca primar",
-        "merge_from": "Îmbină din",
-        "merge_into": "Îmbină în",
         "migrate_blobs": "Migrează obiect binar (blob)",
         "migrate_scene_screenshots": "Migrează Capturi Scene",
         "remove_date": "Șterge data",
@@ -377,8 +375,6 @@
     "measurements": "Măsurători",
     "media_info": {
         "audio_codec": "Codec Audio",
-        "checksum": "Sumă de control",
-        "hash": "Hash",
         "interactive_speed": "Viteză Interactivă",
         "performer_card": {
             "age": "{age} {years_old}",
@@ -407,13 +403,6 @@
     "performer_image": "Imagine Interpret",
     "performer_tagger": {
         "add_new_performers": "Adaugă Interpreți Noi",
-        "config": {
-            "active_stash-box_instance": "Instață stash-box activă:",
-            "edit_excluded_fields": "Editați câmpurile excluse",
-            "no_fields_are_excluded": "Nu se exclude niciun câmp",
-            "no_instances_found": "Nicio instanță găsită",
-            "these_fields_will_not_be_changed_when_updating_performers": "Aceste câmpuri nu vor fi modificate la actualizarea artiștilor interpreți sau executanți."
-        },
         "current_page": "Pagina curentă",
         "failed_to_save_performer": "Nu s-a reușit salvarea interpretului \"{performer}\"",
         "name_already_exists": "Numele există deja",
diff --git a/ui/v2.5/src/locales/ru-RU.json b/ui/v2.5/src/locales/ru-RU.json
index e832e3ed1..ccc28b459 100644
--- a/ui/v2.5/src/locales/ru-RU.json
+++ b/ui/v2.5/src/locales/ru-RU.json
@@ -58,8 +58,6 @@
         "logout": "Выйти",
         "make_primary": "Сделать основным",
         "merge": "Слияние",
-        "merge_from": "Слияние из",
-        "merge_into": "Слияние в",
         "migrate_blobs": "Перенос блоков",
         "migrate_scene_screenshots": "Перенос скриншотов сцены",
         "next_action": "Вперёд",
@@ -151,7 +149,9 @@
         "show_count_results": "Показать {count} результат(ов)",
         "play": "Воспроизвести",
         "load": "Загрузить",
-        "load_filter": "Загрузить фильтр"
+        "load_filter": "Загрузить фильтр",
+        "add_stash_id": "Добавить Stash ID",
+        "create_new": "Создать новый"
     },
     "actions_name": "Действия",
     "age": "Возраст",
@@ -465,7 +465,6 @@
             "auto_tagging": "Автоматическая расстановка тегов",
             "backing_up_database": "Резервное копирование базы данных",
             "backup_and_download": "Создает резервную копию базы данных, и скачивает файл.",
-            "backup_database": "Выполняет резервное копирование базы данных в каталог резервных копий , в формате {filename_format}",
             "cleanup_desc": "Проверить наличие отсутствующих файлов и удалить их из базы данных. Данное действие безвозвратно.",
             "data_management": "Управление данными",
             "defaults_set": "Значения по умолчанию установлены и будут использоваться при нажатии кнопки {action} на странице Задач.",
@@ -898,10 +897,6 @@
             "empty_results": "Значения в полях целевого файла останутся без изменений.",
             "source": "Источник"
         },
-        "merge_tags": {
-            "destination": "Назначение",
-            "source": "Источник"
-        },
         "reassign_entity_title": "{count, plural, one {Переназначить {singularEntity}} other {Переназначить {pluralEntity}}}",
         "reassign_files": {
             "destination": "Переназначить на"
@@ -1099,9 +1094,7 @@
     "measurements": "Размеры",
     "media_info": {
         "audio_codec": "Аудио кодек",
-        "checksum": "Контрольная сумма",
         "downloaded_from": "Скачан с",
-        "hash": "Хэш",
         "interactive_speed": "Интерактивная скорость",
         "performer_card": {
             "age": "{age} {years_old}",
@@ -1145,14 +1138,6 @@
         "any_names_entered_will_be_queried": "Любые введенные имена будут проверены при помощи Stash-Box и позже добавлены, если они будут найдены точные совпадения.",
         "batch_add_performers": "Пакетное добавление участников",
         "batch_update_performers": "Пакетное обновление участников",
-        "config": {
-            "active_stash-box_instance": "Активный stash-box экземпляр:",
-            "edit_excluded_fields": "Редактировать исключенные поля",
-            "excluded_fields": "Исключенные поля:",
-            "no_fields_are_excluded": "Нет исключенных полей",
-            "no_instances_found": "Экземпляры не обнаружены",
-            "these_fields_will_not_be_changed_when_updating_performers": "Эти поля не будут изменены при обновлении актеров."
-        },
         "current_page": "Текущая страница",
         "failed_to_save_performer": "Ошибка сохранения актера \"{performer}\"",
         "name_already_exists": "Такое имя уже существует",
@@ -1377,13 +1362,7 @@
         "batch_add_studios": "Пакетное добавление студий",
         "add_new_studios": "Добавить новую студию",
         "config": {
-            "no_fields_are_excluded": "Нет исключенных полей",
             "create_parent_label": "Создать родительские студии",
-            "no_instances_found": "Инсталляции не найдены",
-            "these_fields_will_not_be_changed_when_updating_studios": "Эти поля не изменятся при обновлении студий.",
-            "edit_excluded_fields": "Изменить исключенные поля",
-            "excluded_fields": "Исключенные поля:",
-            "active_stash-box_instance": "Активная инсталляция stash-box:",
             "create_parent_desc": "Создать отсутствующие родительские студии или связать и обновить данные\\логотипы текущих студий с точным совпадением имени"
         },
         "create_or_tag_parent_studios": "Создать отсутствующие или связать существующие родительские студии",
diff --git a/ui/v2.5/src/locales/sv-SE.json b/ui/v2.5/src/locales/sv-SE.json
index 31bcf3b1d..d5f1a46a7 100644
--- a/ui/v2.5/src/locales/sv-SE.json
+++ b/ui/v2.5/src/locales/sv-SE.json
@@ -61,15 +61,13 @@
         "logout": "Logga ut",
         "make_primary": "Gör primär",
         "merge": "Slå samman",
-        "merge_from": "Slå samman från",
-        "merge_into": "Slå samman till",
-        "migrate_blobs": "Migrera Blobbar",
-        "migrate_scene_screenshots": "Migrera Scenbilder",
+        "migrate_blobs": "Migrera blobbar",
+        "migrate_scene_screenshots": "Migrera scenbilder",
         "next_action": "Nästa",
         "not_running": "körs ej",
         "open_in_external_player": "Öppna i extern spelare",
         "open_random": "Öppna slumpad",
-        "optimise_database": "Optimera Databas",
+        "optimise_database": "Optimera databas",
         "overwrite": "Ersätt",
         "play_random": "Spela slumpad",
         "play_selected": "Spela vald",
@@ -98,7 +96,7 @@
         "select_entity": "Välj {entityType}",
         "select_folders": "Välj mappar",
         "select_none": "Välj inga",
-        "selective_auto_tag": "Selektiv Auto Tag",
+        "selective_auto_tag": "Selektiv autotagg",
         "selective_clean": "Selektiv städning",
         "selective_scan": "Selektiv skanning",
         "set_as_default": "Välj som standard",
@@ -152,7 +150,12 @@
         "show_results": "Visa resultat",
         "load": "Ladda",
         "load_filter": "Ladda filter",
-        "add_stash_id": "Lägg till Stash ID"
+        "add_stash_id": "Lägg till Stash ID",
+        "create_new": "Skapa ny",
+        "save_and_new": "Spara & ny",
+        "invert_selection": "Invertera markering",
+        "reveal_in_file_manager": "Visa i filhanteraren",
+        "select_directory": "Välj mapp"
     },
     "actions_name": "Handlingar",
     "age": "Ålder",
@@ -229,7 +232,11 @@
         "verb_scrape_all": "Skrapa alla",
         "verb_submit_fp": "Skicka {fpCount, plural, one{# Fingeravtryck} other{# Fingeravtryck}}",
         "verb_toggle_config": "{toggle} {configuration}",
-        "verb_toggle_unmatched": "{toggle} ej matchade scener"
+        "verb_toggle_unmatched": "{toggle} ej matchade scener",
+        "verb_add_as_alias": "Lägg til skrapat namn som alias",
+        "verb_link_existing": "Länk till existerande",
+        "verb_match_tag": "Matcha Tagg",
+        "verb_scrape_selected": "Skrapa utvalda"
     },
     "config": {
         "about": {
@@ -276,11 +283,11 @@
             "network_interfaces": "Nätverksgränssnitt",
             "network_interfaces_desc": "Nätverksgränssnitt att visa DLNA på. En tom lista gör att DLNA kör på alla gränssnitt. Kräver DLNA-omstart efter ändring.",
             "recent_ip_addresses": "Senaste IP-adresser",
-            "server_display_name": "Servers visningsnamn",
+            "server_display_name": "Serverns visningsnamn",
             "server_display_name_desc": "Visningsnamnet för DLNA-servern. Återgår till standard {server_name} om tom.",
             "successfully_cancelled_temporary_behaviour": "Lyckad avbrytning av temporärt beteende",
             "until_restart": "tills omstart",
-            "video_sort_order": "Standard Scen Sorteringsordning",
+            "video_sort_order": "Standard scen sorteringsordning",
             "video_sort_order_desc": "Ordningen som scener sorteras i som standard.",
             "server_port_desc": "Port att köra DLNA-servern från. Kräver omstart av DLNA efter ändring.",
             "server_port": "Serverport"
@@ -298,8 +305,8 @@
                 "generate_api_key": "Generera API-nyckel",
                 "log_file": "Loggfil",
                 "log_file_desc": "Sökväg till en fil att logga till. Tom för att inte logga till fil. Kräver omstart.",
-                "log_http": "Logga http-åtkomst",
-                "log_http_desc": "Loggar http-åtkomst till terminalen. Kräver omstart.",
+                "log_http": "Logga HTTP-åtkomst",
+                "log_http_desc": "Loggar HTTP-åtkomst till terminalen. Kräver omstart.",
                 "log_to_terminal": "Logga till terminal",
                 "log_to_terminal_desc": "Loggar till terminalen samt en fil. Alltid sant om filloggning är avstängt. Kräver omstart.",
                 "maximum_session_age": "Maximal inloggningstid",
@@ -313,7 +320,7 @@
                 "log_file_max_size_desc": "Maximal storlek i megabytes för loggfilen innan den komprimeras. 0MB tolkas som avstängt. Kräver omstart."
             },
             "backup_directory_path": {
-                "description": "Filsökväg för SQLite-databas backupfil",
+                "description": "Filsökväg för SQLite-databasens backupfil.",
                 "heading": "Backup filsökväg"
             },
             "blobs_path": {
@@ -321,7 +328,7 @@
                 "heading": "Binär data filsystemssökväg"
             },
             "blobs_storage": {
-                "description": "Var binär data som scenomslag, stjärnor-, studio-, och taggbilder ska lagras. Efter ändring måste den redan existerande datan migreras genom Migrera Blobbar-uppgiften. Se Uppgifter-sidan för migrering.",
+                "description": "Var binär data som scenomslag, stjärnor-, studio-, och taggbilder ska lagras. Efter ändring måste den redan existerande datan migreras genom Migrera blobbar-uppgiften. Se Uppgifter-sidan för migrering.",
                 "heading": "Binär data lagringstyp"
             },
             "cache_location": "Mappsökväg till cache. Krävs om strömning använder HLS (som på Apple-enheter) eller DASH.",
@@ -329,17 +336,17 @@
             "calculate_md5_and_ohash_desc": "Beräkna MD5 checksumma i tillägg med ohash. Aktivering kan sakta ner första skanningar. Hashen måste vara vald till ohash för att avaktivera MD5-beräkning.",
             "calculate_md5_and_ohash_label": "Beräkna MD5 för videor",
             "check_for_insecure_certificates": "Kolla efter osäkra certifikat",
-            "check_for_insecure_certificates_desc": "Vissa webbplatser använder osäkra SSl-certifikat. När detta är avstängt kommer skraparen att kunna skrapa webbplatser med osäkra certifikat. Stäng av detta om du får certifikatfel vid skrapning.",
+            "check_for_insecure_certificates_desc": "Vissa webbplatser använder osäkra SSL-certifikat. När detta är avstängt kommer skraparen att kunna skrapa webbplatser med osäkra certifikat. Stäng av detta om du får certifikatfel vid skrapning.",
             "chrome_cdp_path": "Chrome CDP-sökväg",
             "chrome_cdp_path_desc": "Sökväg till Chrome-programfilen, eller en fjärradress (börjar med http:// eller https://, till exempel http://localhost:9222/json/version) till en Chrome-instans.",
-            "create_galleries_from_folders_desc": "Om sant, skapar gallerier från mappar som innehåller bilder. Skapa en fil med namn .forcegalllery i en mapp för att aktivera/förhindra detta.",
+            "create_galleries_from_folders_desc": "Om sant, skapar gallerier från mappar som innehåller bilder. Skapa en fil med namn .forcegalllery i en mapp för att ignorera denna inställning.",
             "create_galleries_from_folders_label": "Skapa gallerier från mappar som innehåller bilder",
             "database": "Databas",
             "db_path_head": "Databassökväg",
             "directory_locations_to_your_content": "Sökväg till ditt innehåll",
-            "excluded_image_gallery_patterns_desc": "Regexps av bilder och gallery filer/sökväg att exkludera från Skanna och lägga till på Rensa",
-            "excluded_image_gallery_patterns_head": "Mönster för Bild/Galleri exklusion",
-            "excluded_video_patterns_desc": "Regexps av video filer/sökväg att exkludera från Skanna och lägga till på Rensa",
+            "excluded_image_gallery_patterns_desc": "Regexps av bilder och gallery filer/sökväg att exkludera från Skanna och lägga till på Rensa-uppgifterna.",
+            "excluded_image_gallery_patterns_head": "Mönster för bild/galleri ignorering",
+            "excluded_video_patterns_desc": "Regexps av video filer/sökväg att exkludera från Skanna och lägga till på Rensa-uppgifter.",
             "excluded_video_patterns_head": "Exluderade video-mönster",
             "ffmpeg": {
                 "hardware_acceleration": {
@@ -349,30 +356,30 @@
                 "live_transcode": {
                     "input_args": {
                         "desc": "Avancerat: Ytterligare argument att skicka till ffmpeg innan input-fältet vid live videogenerering.",
-                        "heading": "FFmpeg Liveomkodning Input Argument"
+                        "heading": "FFmpeg liveomkodning input argument"
                     },
                     "output_args": {
                         "desc": "Avancerat: Ytterligare argument att skicka till ffmpeg innan output-fältet vid live videogenerering.",
-                        "heading": "FFmpeg Liveomkodning Output Argument"
+                        "heading": "FFmpeg liveomkodning output argument"
                     }
                 },
                 "transcode": {
                     "input_args": {
                         "desc": "Avancerat: Ytterligare argument att skicka till ffmpeg innan input-fältet vid videogeneration.",
-                        "heading": "FFmpeg Omkodning Input Argument"
+                        "heading": "FFmpeg omkodning input argument"
                     },
                     "output_args": {
                         "desc": "Avancerat: Ytterligare argument att skicka till ffmpeg innan output-fältet vid videogenerering.",
-                        "heading": "FFmpeg Omkodning Output Argument"
+                        "heading": "FFmpeg omkodning output argument"
                     }
                 },
                 "ffmpeg_path": {
-                    "heading": "FFmpeg Program Sökväg",
-                    "description": "Sökväg till ffmpeg-programmet (inte bara mappen). Om tom kommer ffmpeg att hittas från miljön via $PATH, konfigurationsmappen, eller från $HOME/.stash"
+                    "heading": "FFmpeg program sökväg",
+                    "description": "Sökväg till ffmpeg-programmet (inte bara mappen). Om tom kommer ffmpeg att hittas från miljön via $PATH, konfigurationsmappen, eller från $HOME/.stash."
                 },
                 "ffprobe_path": {
-                    "description": "Sökväg till ffprobe-programmet (inte bara mappen). Om tom kommer ffprobe att hittas från miljön via $PATH, konfigurationsmappen, eller från $HOME/.stash",
-                    "heading": "FFprobe Program Sökväg"
+                    "description": "Sökväg till ffprobe-programmet (inte bara mappen). Om tom kommer ffprobe att hittas från miljön via $PATH, konfigurationsmappen, eller från $HOME/.stash.",
+                    "heading": "FFprobe program sökväg"
                 },
                 "download_ffmpeg": {
                     "description": "Laddar ner FFmpeg till konfigurationsmappen och nollställer ffmpeg- och ffprobe-sökvägarna för att istället använda konfigurationsmappen.",
@@ -381,13 +388,13 @@
             },
             "funscript_heatmap_draw_range": "Inkludera räckvidd i genererade värmekartor",
             "funscript_heatmap_draw_range_desc": "Visa y-axelns rörelseräckvidd på den genererade värmekartan. Existerande värmekartor kommer behöva genereras om efter ändring.",
-            "gallery_cover_regex_desc": "Regexp som används för att identifiera en bild som galleriomslag",
+            "gallery_cover_regex_desc": "Regexps som används för att identifiera en bild som galleriomslag.",
             "gallery_cover_regex_label": "Galleriomslagsmönster",
-            "gallery_ext_desc": "Komma-avgränsad lista av filtillägg som kommer identifieras som galleri zip-filer.",
-            "gallery_ext_head": "Galleri zip-tillägg",
+            "gallery_ext_desc": "Komma-avgränsad lista av filtillägg som kommer identifieras som galleri ZIP-filer.",
+            "gallery_ext_head": "Galleri ZIP-tillägg",
             "generated_file_naming_hash_desc": "Använd MD5 eller ohash för att döpa genererade filer. Ett byte kräver att alla scener har ett värde för MD5/oshash. Efter ett byte måste existerande genererade filer migreras eller återgenereras. Se Job-sidan för migration.",
             "generated_file_naming_hash_head": "Genererad fil namn-hash",
-            "generated_files_location": "Mappsökväg för genererade filer (markörer, förhandsvisningar, sprites, m.m.)",
+            "generated_files_location": "Mappsökväg för genererade filer (markörer, förhandsvisningar, sprites, m.m.).",
             "generated_path_head": "Genererad filsökväg",
             "hashing": "Hashande",
             "heatmap_generation": "Funscript Värmekarta Generering",
@@ -396,46 +403,57 @@
             "include_audio_desc": "Inkluderar ljud vid förhandsvisningsgeneration.",
             "include_audio_head": "Inkludera ljud",
             "logging": "Loggning",
-            "maximum_streaming_transcode_size_desc": "Maximal storlek av transkodade strömmar",
+            "maximum_streaming_transcode_size_desc": "Maximal storlek av transkodade strömmar.",
             "maximum_streaming_transcode_size_head": "Maximal transkodningsstorlek på strömmar",
-            "maximum_transcode_size_desc": "Maximal storlek för genererade trankodningar",
+            "maximum_transcode_size_desc": "Maximal storlek för genererade transkodningar.",
             "maximum_transcode_size_head": "Maximal transkodningsstorlek",
             "metadata_path": {
-                "description": "Mappsökväg att använda vid en komplett export eller import",
-                "heading": "Metadata Sökväg"
+                "description": "Mappsökväg att använda vid en komplett export eller import.",
+                "heading": "Metadatasökväg"
             },
-            "number_of_parallel_task_for_scan_generation_desc": "Ställ på 0 för auto. Varning-Att köra fler jobb än vad som krävs för att nå 100% CPU-användning kommer försämra prestanda och kan potentiellt skapa andra problem.",
+            "number_of_parallel_task_for_scan_generation_desc": "Ställ på 0 för auto. Varning-Att köra fler jobb än vad som krävs för att nå 100% CPU-användning kommer försämra prestandan och kan orsaka andra problem.",
             "number_of_parallel_task_for_scan_generation_head": "Antal parallella jobb för skanning/generering",
             "parallel_scan_head": "Parallell Skan/Generering",
             "preview_generation": "Generera förhandsvisningar",
             "python_path": {
-                "description": "Sökväg till python-executablen (inte mappen). Används för skriptade skrapare och plugins. Om blank, kommer python att hanteras från den interna miljön",
-                "heading": "Python Körbar Sökväg"
+                "description": "Sökväg till python-executablen (inte mappen). Används för skriptade skrapare och plugins. Om blank, kommer Python att hanteras från miljön.",
+                "heading": "Python program sökväg"
             },
             "scraper_user_agent": "Användaragent för skrapning",
-            "scraper_user_agent_desc": "Användaragent-sträng som används under http-förfrågningar under skrapning",
+            "scraper_user_agent_desc": "Användaragent-sträng som används under HTTP-förfrågningar under skrapning.",
             "scrapers_path": {
-                "description": "Mappsökväg till skraparnas konfigurationsfiler",
+                "description": "Mappsökväg till skraparnas konfigurationsfiler.",
                 "heading": "Skraparnas sökväg"
             },
             "scraping": "Skrapning",
             "sqlite_location": "Filsökväg för SQLite databasen (kräver omstart). VARNING: lagring av databasen på ett annat system än det som Stash körs ifrån (t.ex. över nätvärket) är inte stöttat!",
             "video_ext_desc": "Kommaavgränsad lista av filändelser som kommer identifieras som videor.",
-            "video_ext_head": "Videofiländelser",
+            "video_ext_head": "Videofiltillägg",
             "video_head": "Video",
             "plugins_path": {
-                "description": "Sökväg till pluginkonfigurationsfiler",
+                "description": "Sökväg till pluginkonfigurationsfiler.",
                 "heading": "Pluginsökväg"
             },
             "delete_trash_path": {
                 "description": "Sökväg dit raderade filer kommer flyttas till instället för att permanent raderas. Lämna blankt för att permanent radera filer.",
                 "heading": "Skräpsökväg"
-            }
+            },
+            "sprite_generation_head": "Sprite-generering",
+            "sprite_interval_desc": "Tid i sekunder mellan varje genererad sprite.",
+            "sprite_interval_head": "Sprite-intervall",
+            "sprite_maximum_desc": "Maximalt antal sprites att generera för en scen. Sätt till 0 för att inte begränsa.",
+            "sprite_maximum_head": "Maximalt antal sprites",
+            "sprite_minimum_desc": "Lägst antal sprites att generera för en scen",
+            "sprite_minimum_head": "Lägst antal sprites",
+            "sprite_screenshot_size_desc": "Önskad storlek i pixlar för varje sprite.",
+            "sprite_screenshot_size_head": "Sprite-storlek",
+            "use_custom_sprite_interval_head": "Använd egen sprite-intervall",
+            "use_custom_sprite_interval_desc": "Aktivera den egna sprite-intervallen enligt inställningarna nedan."
         },
         "library": {
             "exclusions": "Exkludera",
             "gallery_and_image_options": "Galleri- och Bildinställningar",
-            "media_content_extensions": "Filändelser för media"
+            "media_content_extensions": "Mediafiltillägg"
         },
         "logs": {
             "log_level": "Loggnivå"
@@ -449,7 +467,7 @@
         "scraping": {
             "entity_metadata": "{entityType} Metadata",
             "entity_scrapers": "{entityType} skrapare",
-            "excluded_tag_patterns_desc": "Regexps av tagg-namn att exkludera från skrapresultat",
+            "excluded_tag_patterns_desc": "Regexps av tagg-namn att exkludera från skrapresultat.",
             "excluded_tag_patterns_head": "Exkluderade tagg-mönster",
             "scraper": "Skrapare",
             "scrapers": "Skrapare",
@@ -486,7 +504,6 @@
             "auto_tagging": "Automatisk taggning",
             "backing_up_database": "Säkerhetskopierar databas",
             "backup_and_download": "Säkerhetskopierar databasen och laddar ner den resulterande filen.",
-            "backup_database": "Säkerhetskopierar databasen i backup-mappen med filnamnsformatet {filename_format}",
             "cleanup_desc": "Kollar efter saknade filer och raderar dem från databasen. Detta är en destruktiv handling.",
             "data_management": "Datahantering",
             "defaults_set": "Standard har valts och kommer användas när {action} trycks på Jobbsidan.",
@@ -499,10 +516,10 @@
             },
             "generate_clip_previews_during_scan": "Generera förhandsvisningar för bildklipp",
             "generate_desc": "Generera stöttande bilder, sprites, videor, vtt och andra filer.",
-            "generate_phashes_during_scan": "Generera phash",
+            "generate_phashes_during_scan": "Generera videoperceptuella hashkoder",
             "generate_phashes_during_scan_tooltip": "För deduplikation och identifiering av scener.",
             "generate_previews_during_scan": "Generera animerade bildförhandsvisningar",
-            "generate_previews_during_scan_tooltip": "Generera också animerade (webp) förhandsvisningar, krävs bara när Förhandsvisning i Scen/Markörvägg är Animerad Bild. Vid surfande använder de mindre CPU än videoförhandsvisngar, men genereras bredvid de och är större filer.",
+            "generate_previews_during_scan_tooltip": "Generera också animerade (webp) förhandsvisningar, krävs bara när Förhandsvisning i Scen/Markörväggen är Animerad bild. Vid surfande använder de mindre CPU än videoförhandsvisngar, men genereras bredvid de och är större filer.",
             "generate_sprites_during_scan": "Generera sprites för videoskrubbaren",
             "generate_thumbnails_during_scan": "Generera miniatyrer för bilder",
             "generate_video_covers_during_scan": "Generera scenomslag",
@@ -535,7 +552,9 @@
                 "tag_skipped_matches": "Tagga skippade matchningar med",
                 "tag_skipped_matches_tooltip": "Skapa en tagg t.ex. \"Identifiera: Flera Matchningar\" som man kan filtrera i Scentaggvyn och välja korrekt matchning manuellt",
                 "tag_skipped_performer_tooltip": "Skapa en tagg t.ex. \"Identifiera: Singelnamnsstjärnor\" som man kan filtrera i Scentaggvyn och välj hur man hanterar dessa stjärnor",
-                "tag_skipped_performers": "Tagga skippade stjärnor med"
+                "tag_skipped_performers": "Tagga skippade stjärnor med",
+                "performer_genders": "Stjärnors kön",
+                "performer_genders_desc": "Stjärnor med de valda könen kommer att inkluderas i identifieringen."
             },
             "import_from_exported_json": "Importera från den exporterade JSON-filen i metadatamappen. Rensar den existerande databasen.",
             "incremental_import": "Stegvis import från en exporterad zip-fil.",
@@ -575,10 +594,23 @@
                 "transcodes": "Scenomkodningar"
             },
             "rescan": "Skanna om filer",
-            "rescan_tooltip": "Skanna om alla filer i sökvägen. Används för att tvångsuppdatera filmetadata och att skanna om zip-filer."
+            "rescan_tooltip": "Skanna om alla filer i sökvägen. Används för att tvångsuppdatera filmetadata och att skanna om zip-filer.",
+            "generate_image_phashes_during_scan": "Generera bildperceptuella hashkoder",
+            "generate_image_phashes_during_scan_tooltip": "För deduplicering och identifiering.",
+            "backup_database": {
+                "description": "Genomför en säkerhetskopia av databasen och blobb-filerna.",
+                "destination": "Destination",
+                "download": "Ladda ner säkerhetskopia",
+                "include_blobs": "Inkludera blobbar i säkerhetskopia",
+                "include_blobs_desc": "Stäng av för att endast säkerhetskopiera SQLites databasfil.",
+                "sqlite": "Säkerhetskopiafilen kommer vara en kopia av SQLites databasfil, med namnet {filename_format}",
+                "to_directory": "Till {directory}",
+                "warning_blobs": "Blobb-filer kommer inte inkluderas i säkerhetskopian. Detta betyder att för att komplett återställa från en säkerhetskopia, så måste blobb-filena vara närvarande på blobb-förvaringsplatsen.",
+                "zip": "SQLite-databasfilen och blobb-filerna kommer zippas till en enda fil med namnet {filename_format}"
+            }
         },
         "tools": {
-            "scene_duplicate_checker": "Scen Duplikat Kontroll",
+            "scene_duplicate_checker": "Scen duplikatkontroll",
             "scene_filename_parser": {
                 "add_field": "Lägg till fält",
                 "capitalize_title": "Använd versaler i titel",
@@ -590,7 +622,7 @@
                 "ignored_words": "Ignorerade ord",
                 "matches_with": "Matchar med {i}",
                 "select_parser_recipe": "Välj Parser Recept",
-                "title": "Scen Filnamn Parser",
+                "title": "Scen filnamnsparser",
                 "whitespace_chars": "Blankstegstecken",
                 "whitespace_chars_desc": "Dessa tecken kommer ersättas med blanksteg i titeln"
             },
@@ -610,9 +642,9 @@
                 "option_label": "Använd anpassad CSS"
             },
             "custom_javascript": {
-                "description": "Sidan måste laddas om för att ändringar ska ta effekt. Det finns ingen garanti att anpassad Javascript kommer vara kompatibel med framtida versioner av Stash.",
-                "heading": "Anpassad Javascript",
-                "option_label": "Använd anpassad Javascript"
+                "description": "Sidan måste laddas om för att ändringar ska ta effekt. Det finns ingen garanti att anpassad JavaScript kommer vara kompatibel med framtida versioner av Stash.",
+                "heading": "Anpassad JavaScript",
+                "option_label": "Använd anpassad JavaScript"
             },
             "custom_locales": {
                 "description": "Ändra individuella lokala strängar. Se https://github.com/stashapp/stash/blob/develop/ui/v2.5/src/locales/en-GB.json för kompletta listan. Sidan måste laddas om för att ändringar ska ske.",
@@ -629,14 +661,14 @@
             },
             "desktop_integration": {
                 "desktop_integration": "Desktopintegration",
-                "notifications_enabled": "Aktivera Notifikationer",
-                "send_desktop_notifications_for_events": "Skicka skrivbordsnotifikationer för händelser",
+                "notifications_enabled": "Aktivera notifikationer",
+                "send_desktop_notifications_for_events": "Skicka skrivbordsnotifikationer för händelser.",
                 "skip_opening_browser": "Öppna inte webbläsare",
-                "skip_opening_browser_on_startup": "Öppna inte webbläsaren under serverstart"
+                "skip_opening_browser_on_startup": "Öppna inte webbläsaren under serverstart."
             },
             "detail": {
                 "compact_expanded_details": {
-                    "description": "När aktiverat, kommer detaljerna automatiskt expanderas medan det behålls en kompakt presentation",
+                    "description": "När aktiverat, kommer detaljerna automatiskt expanderas medan en kompakt presentation behålls.",
                     "heading": "Kompakta expanderade detaljer"
                 },
                 "enable_background_image": {
@@ -645,13 +677,13 @@
                 },
                 "heading": "Detaljsida",
                 "show_all_details": {
-                    "description": "När aktiverat kommer alla detaljer visas som standard och varje detalj kommer passa i en enda kolumn",
+                    "description": "När aktiverat kommer alla detaljer visas och varje detalj kommer passa i en enda kolumn.",
                     "heading": "Visa alla detaljer"
                 }
             },
             "editing": {
                 "disable_dropdown_create": {
-                    "description": "Ta bort möjligheten att skapa nya objekt från dropdown-menyer",
+                    "description": "Ta bort möjligheten att skapa nya objekt från dropdown-väljare.",
                     "heading": "Stäng av skapande via dropdowns"
                 },
                 "heading": "Redigering",
@@ -679,7 +711,7 @@
             },
             "funscript_offset": {
                 "description": "Tidsfördröjning i millisekunder för interaktiva skripter.",
-                "heading": "Funscript fördröjning (ms)"
+                "heading": "Funscript-fördröjning (ms)"
             },
             "handy_connection": {
                 "connect": "Koppla ihop",
@@ -692,8 +724,8 @@
                 "sync": "Synka"
             },
             "handy_connection_key": {
-                "description": "Handy anslutningsnyckel för interaktiva scener. Denna nyckel kommer låta Stash dela din nuvarande sceninformation med handyfeeling.com",
-                "heading": "Handy Uppkopplingsnyckel"
+                "description": "Handy anslutningsnyckel för interaktiva scener. Denna nyckel kommer låta Stash dela din nuvarande sceninformation med handyfeeling.com.",
+                "heading": "Handy uppkopplingsnyckel"
             },
             "image_lightbox": {
                 "heading": "Bild Ljuslåda"
@@ -707,11 +739,11 @@
                 "heading": "Bilder",
                 "options": {
                     "create_image_clips_from_videos": {
-                        "description": "När ett bibliotek har Videor avstängt kommer Videofiler (filer som slutar med Videofiltillägg) att skannas som Bildklipp.",
-                        "heading": "Skanna Videofiltillägg som Bildklipp"
+                        "description": "När ett bibliotek har Videor avstängt kommer videofiler (se videofiltillägg) att skannas som bildklipp..",
+                        "heading": "Skanna Vvdeofiltillägg som bildklipp"
                     },
                     "write_image_thumbnails": {
-                        "description": "Skriv miniatyrer till disk när de genereras",
+                        "description": "Skriv miniatyrer till disk när de genereras.",
                         "heading": "Skriv bildminiatyrer"
                     }
                 }
@@ -721,21 +753,21 @@
                 "heading": "Språk"
             },
             "max_loop_duration": {
-                "description": "Maximal scenspeltid där spelaren kommer loopa videon - 0 för att avaktivera",
+                "description": "Maximal scenspeltid där spelaren kommer loopa videon . Sätt till 0 för att avaktivera.",
                 "heading": "Maximal loopvaraktighet"
             },
             "menu_items": {
-                "description": "Visa eller göm olika flikar på navigationsremsan",
+                "description": "Visa eller göm olika flikar på navigationsremsan.",
                 "heading": "Menyobjekt"
             },
             "minimum_play_percent": {
                 "description": "I procent, hur mycket av scenen som måste spelas innan visningsräknaren ökar.",
-                "heading": "Minimal Visningsprocent"
+                "heading": "Minimal visningsprocent"
             },
             "performers": {
                 "options": {
                     "image_location": {
-                        "description": "Sökväg för egna standardstjärnbilder. Lämna blank för att använda inbyggd standard",
+                        "description": "Sökväg för egna standardstjärnbilder. Lämna blank för att använda inbyggd standard.",
                         "heading": "Sökväg för egna stjärnbilder"
                     }
                 }
@@ -761,23 +793,23 @@
                     "always_start_from_beginning": "Starta alltid video från början",
                     "auto_start_video": "Starta videouppspelning automatiskt",
                     "auto_start_video_on_play_selected": {
-                        "description": "Autostarta uppspelning från kön, valda eller slumpade från Scener-sidan",
+                        "description": "Autostarta uppspelning från kön, valda eller slumpade från Scener-sidan.",
                         "heading": "Autostarta video när valda spelas"
                     },
                     "continue_playlist_default": {
-                        "description": "Spela nästa scen i kö efter scenens slut",
+                        "description": "Spela nästa köade scen efter scenens slut.",
                         "heading": "Fortsätt spellista som standard"
                     },
                     "disable_mobile_media_auto_rotate": "Inaktivera automatisk rotering av helskärmsmedia på mobil",
                     "enable_chromecast": "Aktivera Chromecast",
-                    "show_ab_loop_controls": "Visa AB-loop plugin kontroller",
+                    "show_ab_loop_controls": "Visa AB-loop kontroller",
                     "show_scrubber": "Visa skrubbaren",
-                    "track_activity": "Spåra Scenvisningshistorik",
+                    "track_activity": "Spåra scenvisningshistorik",
                     "vr_tag": {
                         "description": "VR-knappen kommer endast visas för scener med denna tagg.",
-                        "heading": "VR Tagg"
+                        "heading": "VR-tagg"
                     },
-                    "show_range_markers": "Visa Räckviddsmarkörer"
+                    "show_range_markers": "Visa räckviddsmarkörer"
                 }
             },
             "scene_wall": {
@@ -792,18 +824,18 @@
                 "heading": "Bläddringsförsök innan flytt"
             },
             "show_tag_card_on_hover": {
-                "description": "Visa taggkortet när pekaren är på taggmärken",
+                "description": "Visa taggkort när pekaren är på taggmärken.",
                 "heading": "Taggkort"
             },
             "slideshow_delay": {
-                "description": "Bildspel är tillgängligt för gallerier i väggvisningsläge",
+                "description": "Bildspel är tillgängligt för gallerier i väggvisningsläge.",
                 "heading": "Bildspelsfördröjning (sekunder)"
             },
             "studio_panel": {
                 "heading": "Studiovy",
                 "options": {
                     "show_child_studio_content": {
-                        "description": "Visa också innehåll från underordnade studior i studiovyn",
+                        "description": "Visa också innehåll från underordnade studior i studiovyn.",
                         "heading": "Visa underordnade studiors innehåll"
                     }
                 }
@@ -812,18 +844,18 @@
                 "heading": "Taggvy",
                 "options": {
                     "show_child_tagged_content": {
-                        "description": "Visa också innehåll från underordnade taggar i taggvyn",
+                        "description": "Visa också innehåll från underordnade taggar i taggvyn.",
                         "heading": "Visa underordande taggars innehåll"
                     }
                 }
             },
             "title": "Användargränssnitt",
             "use_stash_hosted_funscript": {
-                "description": "När aktiverat kommer funscripts att skickas direkt från Stash till din Handy-enhet utan att använda tredjeparts Handy-servern. Kräver att Stash kan nås från din Handy-enhet och att en API-nyckel är genererad om stash har lösenord aktiverat.",
+                "description": "När aktiverat kommer funscripts att skickas direkt från Stash till din Handy-enhet utan att använda tredjeparts Handy-servern. Kräver att Stash kan nås från din Handy-enhet och att en API-nyckel är genererad om Stash har lösenord aktiverat.",
                 "heading": "Skicka funscripts direkt"
             },
             "performer_list": {
-                "heading": "Lista av stjärnor",
+                "heading": "Stjärnlista",
                 "options": {
                     "show_links_on_grid_card": {
                         "heading": "Visa länkar på stjärnors kort"
@@ -832,10 +864,31 @@
             },
             "sfw_mode": {
                 "description": "Aktivera om stash inte används för vuxet innehåll. Döljer eller ändrar gränssnitt som är mer fokuserade på vuxet innehåll.",
-                "heading": "Vuxet Innehållsläge"
+                "heading": "SFW-innehållsläge"
+            },
+            "custom_title": {
+                "description": "Anpassad text som ska läggas till i sidtiteln. Om tomt används standardvärdet \"Stash\".",
+                "heading": "Anpassad titel"
+            },
+            "troubleshooting_mode": {
+                "button": "Felsökningsläge",
+                "dialog_title": "Aktivera felsökningsläge",
+                "dialog_description": "Detta inaktiverar tillfälligt alla anpassningar för att hjälpa till att diagnostisera problem:",
+                "dialog_item_plugins": "Alla insticksmoduler",
+                "dialog_item_css": "Anpassad CSS",
+                "dialog_item_js": "Anpassad JavaScript",
+                "dialog_item_locales": "Anpassade lokaler",
+                "dialog_log_level": "Loggnivån kommer att ställas in på Felsökning för detaljerad diagnostik.",
+                "dialog_reload_note": "Sidan laddas om automatiskt.",
+                "enable": "Aktivera & ladda om",
+                "overlay_message": "Felsökningsläget är aktivt – alla egna anpassningar är avstängda",
+                "exit": "Avsluta"
             }
         },
-        "advanced_mode": "Avancerat Läge"
+        "advanced_mode": "Avancerat läge",
+        "changelog": {
+            "header": "Uppdateringsnyheter"
+        }
     },
     "configuration": "Konfiguration",
     "countables": {
@@ -855,7 +908,8 @@
     "criterion": {
         "greater_than": "Större än",
         "less_than": "Mindre än",
-        "value": "Värde"
+        "value": "Värde",
+        "unsupported": "{type} (ej stöttat)"
     },
     "criterion_modifier": {
         "between": "mellan",
@@ -923,7 +977,7 @@
             "page_header": "Sida {page} / {total}",
             "reset_zoom_on_nav": "Återställ zoom vid bildbyte",
             "scale_up": {
-                "description": "Skala mindre bilder så att de fyller skärmen",
+                "description": "Skala mindre bilder så att de fyller skärmen.",
                 "label": "Skala upp för att passa"
             },
             "scroll_mode": {
@@ -939,38 +993,34 @@
             "empty_results": "Destinationens värden kommer ej ändras.",
             "source": "Källa"
         },
-        "merge_tags": {
-            "destination": "Mål",
-            "source": "Källa"
-        },
         "performers_found": "{count} stjärnor hittade",
         "reassign_entity_title": "{count, plural, one {Omplacera {singularEntity}} other {Omplacera {pluralEntity}}}",
         "reassign_files": {
             "destination": "Omplacera till"
         },
         "scene_gen": {
-            "clip_previews": "Bildklipp Förhandsvisning",
+            "clip_previews": "Bildklippsförhandsvisning",
             "covers": "Scenomslag",
             "force_transcodes": "Tvinga omkodning",
             "force_transcodes_tooltip": "Som standard blir videofiler bara omkodade om formatet inte stöds i webbläsaren. Vid aktivering kommer alla videofiler bli omkodande, även om de antas vara stöttade i webbläsaren.",
-            "image_previews": "Animerad Bildförhandsvisning",
-            "image_previews_tooltip": "Generera också animerade (webp) förhandsvisningar, krävs enbart när Förhandsvisning i Scen/Markörvägg är Animerad Bild. Vid surfande använder de mindre CPU än videoförhandsvisngar, men genereras bredvid de och är större filer.",
+            "image_previews": "Animerad bildförhandsvisning",
+            "image_previews_tooltip": "Generera också animerade (webp) förhandsvisningar, krävs enbart när Förhandsvisning i Scen/Markörvägg är Animerad bild. Vid surfande använder de mindre CPU än videoförhandsvisngar, men genereras bredvid de och är större filer.",
             "interactive_heatmap_speed": "Generera värmekartor och hastigheter för interaktiva scener",
-            "marker_image_previews": "Markörer Animerad bildförhandsvisning",
-            "marker_image_previews_tooltip": "Generera också Animerad (webp) föhandsvisning, krävs bara när Förhandsvisning i Scen/Markörvägg är Animerad Bild. Vid surfande använder de mindre CPU än videoförhandsvisngar, men genereras bredvid de och är större filer.",
+            "marker_image_previews": "Markörer animerad bildförhandsvisning",
+            "marker_image_previews_tooltip": "Generera också Animerad (webp) föhandsvisning, krävs bara när Förhandsvisning i Scen/Markörvägg är Animerad bild. Vid surfande använder de mindre CPU än videoförhandsvisngar, men genereras bredvid de och är större filer.",
             "marker_screenshots": "Markörskärmklipp",
             "marker_screenshots_tooltip": "Markör statiska JPG-bilder",
             "markers": "Markörförhandsvisningar",
             "markers_tooltip": "20-sekunders videor som börjar vid angiven tidsstämpel.",
-            "override_preview_generation_options": "Åsidosätt Inställningar för Förhandsvisningsgeneration",
-            "override_preview_generation_options_desc": "Åsidosätt inställningar för Förhandsvisningsgeneration. Standarder ställs in i System -> Förhandsvisningsgeneration.",
+            "override_preview_generation_options": "Åsidosätt inställningar för förhandsvisningsgeneration",
+            "override_preview_generation_options_desc": "Åsidosätt inställningar för förhandsvisningsgeneration. Standarden ställs in i System -> Förhandsvisningsgeneration.",
             "overwrite": "Ersätt existerande filer",
-            "phash": "Perceptuella hashar",
+            "phash": "Videoperceptuella hashkoder",
             "preview_exclude_end_time_desc": "Exkludera de sista x sekunderna från videoförhandsvisning. Detta kan vara ett värde i sekunder, eller en procent (ex. 2%) av scenes totala speltid.",
             "preview_exclude_end_time_head": "Exludera sluttid",
             "preview_exclude_start_time_desc": "Exkludera de första x sekunderna från videoförhandsvisning. Detta kan vara ett värde i sekunder, eller en procent (ex. 2%) av scenes totala speltid.",
             "preview_exclude_start_time_head": "Exkludera starttid",
-            "preview_generation_options": "Inställningar för Förhandsvisningsgeneration",
+            "preview_generation_options": "Inställningar för förhandsvisningsgeneration",
             "preview_options": "Förhandsvisningsinställningar",
             "preview_preset_desc": "Förinställningarna bestämmer storlek, kvalite och kodningstiden of förhandsvisningsgeneration. Förinställningar bortom “långsam” har minskande vinst och är inte rekommenderade.",
             "preview_preset_head": "Förinställningar för förhandsvisningskodning",
@@ -985,7 +1035,9 @@
             "video_previews": "Förhandsvisning",
             "video_previews_tooltip": "Videoförhandsvisning som visas när man håller över en scen",
             "phash_tooltip": "För deduplicering och scenidentifiering",
-            "image_thumbnails": "Bildomslagsbilder"
+            "image_thumbnails": "Bildomslagsbilder",
+            "image_phash": "Bildperceptuella hashkoder",
+            "image_phash_tooltip": "För deduplicering och identifiering"
         },
         "scenes_found": "{count} scener hittades",
         "scrape_entity_query": "{entity_type} Skrapa text",
@@ -1000,7 +1052,10 @@
         "set_default_filter_confirm": "Är du säker att du vill ställa in detta filter som standard?",
         "clear_o_history_confirm_sfw": "Är du säker att du vill radera gillningshistoriken?",
         "delete_alert_to_trash": "De följande {count, plural, one {{singularEntity}} other {{pluralEntity}}} kommer flyttas till skräpet:",
-        "stashid_exists_warning": "Det existerande stash id:et för denna stash-box kommer ersättas."
+        "stashid_exists_warning": "Det existerande stash id:et för denna stash-box kommer ersättas.",
+        "studios_found": "{count} studior hittades",
+        "tags_found": "{count} taggar hittades",
+        "scrape_results_missing": "Saknat"
     },
     "dimensions": "Mått",
     "director": "Regissör",
@@ -1129,7 +1184,7 @@
     "height": "Längd",
     "height_cm": "Längd (cm)",
     "help": "Hjälp",
-    "ignore_auto_tag": "Ignorera Autotagg",
+    "ignore_auto_tag": "Ignorera autotagg",
     "image": "Bild",
     "image_count": "Antal Bilder",
     "image_index": "Bild #",
@@ -1153,9 +1208,7 @@
     "measurements": "Mått",
     "media_info": {
         "audio_codec": "Ljudkodek",
-        "checksum": "Checksumma",
         "downloaded_from": "Nedladdad från",
-        "hash": "Hash",
         "interactive_speed": "Interaktiv Hastighet",
         "performer_card": {
             "age": "{age} {years_old}",
@@ -1166,7 +1219,11 @@
         "play_duration": "Uppspelad Tid",
         "stream": "Ström",
         "video_codec": "Videokodek",
-        "o_count": "Antal O"
+        "o_count": "Antal O",
+        "md5": "MD5 Checksumma",
+        "oshash": "oshash",
+        "oshash_meaning": "OpenSubtitles Hash",
+        "phash_meaning": "Perceptuell Hash"
     },
     "megabits_per_second": "{value} mbps",
     "metadata": "Metadata",
@@ -1203,14 +1260,6 @@
         "any_names_entered_will_be_queried": "Alla namn kommer skickas till Stash-Box-instansen och läggas till om de hittas. Endast exakta matchningar kommer övervägas.",
         "batch_add_performers": "Lägg till flera stjärnor",
         "batch_update_performers": "Uppdatera flera stjärnor",
-        "config": {
-            "active_stash-box_instance": "Aktiv Stash-Box-instans:",
-            "edit_excluded_fields": "Ändra exkluderade fält",
-            "excluded_fields": "Exkluderade fält:",
-            "no_fields_are_excluded": "Inga fält är exkluderade",
-            "no_instances_found": "Inga instanser hittades",
-            "these_fields_will_not_be_changed_when_updating_performers": "Dessa fält kommer inte ändras när stjärnor uppdateras."
-        },
         "current_page": "Nuvarande sida",
         "failed_to_save_performer": "Misslyckades med att spara \"{performer}\"",
         "name_already_exists": "Namnet finns redan",
@@ -1368,7 +1417,7 @@
         "welcome_to_stash": "Välkommen till Stash"
     },
     "stash_id": "Stash ID",
-    "stash_id_endpoint": "Stash ID Slutpunkt",
+    "stash_id_endpoint": "Stash ID Slutpunkt URL",
     "stash_ids": "Stash ID:er",
     "stashbox": {
         "go_review_draft": "Gå till {endpoint_name} för att granska utkast.",
@@ -1386,7 +1435,8 @@
         "scenes_size": "Storlek på scener",
         "total_o_count": "Total O-Räkning",
         "total_play_count": "Totalt Antal Spelningar",
-        "total_play_duration": "Total Spelad Tid"
+        "total_play_duration": "Total Spelad Tid",
+        "total_o_count_sfw": "Totala Gillningar"
     },
     "status": "Status: {statusText}",
     "studio": "Studio",
@@ -1397,14 +1447,8 @@
         "batch_add_studios": "Lägg Till Flera Studior",
         "batch_update_studios": "Uppdatera Flera Studior",
         "config": {
-            "active_stash-box_instance": "Aktiv Stash-Box instans:",
             "create_parent_desc": "Skapa saknade överordnad studio, eller tagga och uppdatera data/bild för existerande överordnad studio med exakt namnmatchning",
-            "create_parent_label": "Skapa överordnande studior",
-            "edit_excluded_fields": "Ändra Exkluderade Fält",
-            "excluded_fields": "Exkluderade Fält:",
-            "no_fields_are_excluded": "Inga fält är exkluderade",
-            "no_instances_found": "Inga hittade instanser",
-            "these_fields_will_not_be_changed_when_updating_studios": "Dessa fält kommer inte ändras när studior uppdateras."
+            "create_parent_label": "Skapa överordnande studior"
         },
         "create_or_tag_parent_studios": "Skapa saknad eller tagga existerande överordnade studior",
         "current_page": "Nuvarande sida",
@@ -1457,7 +1501,8 @@
         "started_auto_tagging": "Började auto-tagga",
         "started_generating": "Började generera",
         "started_importing": "Började importera",
-        "updated_entity": "Uppdaterade {entity}"
+        "updated_entity": "Uppdaterade {entity}",
+        "merged_performers": "Sammanslagna stjärnor"
     },
     "total": "Total",
     "true": "Sant",
@@ -1482,24 +1527,24 @@
     "zip_file_count": "Antal Zip-filer",
     "tag_parent_tooltip": "Har överordnade taggar",
     "package_manager": {
-        "check_for_updates": "Kolla efter Uppdateringar",
+        "check_for_updates": "Kolla efter uppdateringar",
         "hide_unselected": "Dölj ovalda",
         "source": {
             "local_path": {
                 "description": "Relativ sökväg för att lagra paket från denna källa. Notera att ändring av detta kräver att paketen manuellt flyttas.",
-                "heading": "Lokal Sökväg"
+                "heading": "Lokal sökväg"
             },
             "name": "Namn",
             "url": "Källa URL"
         },
-        "add_source": "Lägg till Källa",
+        "add_source": "Lägg till källa",
         "confirm_delete_source": "Är du säker på att du vill radera källa {name} ({url})?",
         "confirm_uninstall": "Är du säker på att du vill avinstallera {number} paket?",
         "description": "Beskrivning",
-        "edit_source": "Ändra Källa",
+        "edit_source": "Ändra källa",
         "install": "Installera",
-        "installed_version": "Installerad Version",
-        "latest_version": "Senaste Version",
+        "installed_version": "Installerad version",
+        "latest_version": "Senaste version",
         "no_packages": "Inga paket hittades",
         "no_sources": "Inga konfigurerade källor",
         "package": "Paket",
@@ -1560,7 +1605,7 @@
     },
     "custom_fields": {
         "field": "Fält",
-        "title": "Skäddarsydda Fält",
+        "title": "Egna Fält",
         "value": "Värde",
         "criteria_format_string": "{criterion} (eget fält) {modifierString} {valueString}",
         "criteria_format_string_others": "{criterion} (eget fält) {modifierString} {valueString} (+{others} andra)"
@@ -1585,5 +1630,49 @@
         "no_results": "Inga resultat hittades.",
         "placeholder_name_or_id": "{entityType} namn eller StashID...",
         "select_stashbox": "Välj StashBox..."
-    }
+    },
+    "latest_scene": "Senaste scen",
+    "stash_id_count": "Stash ID-räkning",
+    "career_end": "Karriär Avslutades",
+    "career_start": "Karriär Började",
+    "duplicated": "Duplicerad",
+    "duplicated_stash_id": "Duplicerad (Stash ID)",
+    "duplicated_title": "Duplicerad (Titel)",
+    "tag_tagger": {
+        "add_new_tags": "Lägg till Nya Taggar",
+        "any_names_entered_will_be_queried": "Alla namn kommer efterfrågas från Stash-Box-instansen och läggas till om de hittas. Bara exakta matchningar kommer räknas som en match.",
+        "batch_add_tags": "Lägg till Flera Taggar",
+        "batch_update_tags": "Uppdatera Flera Taggar",
+        "current_page": "Nuvarande sida",
+        "failed_to_save_tag": "Misslyckade att spara tagg \"{tag}\"",
+        "name_already_exists": "Namnet finns redan",
+        "network_error": "Nätverksfel",
+        "no_results_found": "Inga resultat hittades.",
+        "number_of_tags_will_be_processed": "{tag_count} taggar kommer behandlas",
+        "query_all_tags_in_the_database": "Alla taggar i databasen",
+        "refresh_tagged_tags": "Förnya taggade taggar",
+        "refreshing_will_update_the_data": "Förnyande kommer uppdatera datan för alla taggar som är taggade från stash-box instansen.",
+        "status_tagging_job_queued": "Status: Taggande uppgift köad",
+        "status_tagging_tags": "Status: Taggar taggar",
+        "tag_already_tagged": "Tagg redan taggad",
+        "tag_names_or_stashids_separated_by_comma": "Tagg-namn eller StashID separerat med komma",
+        "tag_selection": "Taggval",
+        "tag_successfully_tagged": "Taggning av tagg lyckades",
+        "tag_status": "Taggstatus",
+        "to_use_the_tag_tagger": "För att använda taggtaggaren så måste en stash-box-instans konfigureras.",
+        "untagged_tags": "Otaggade taggar",
+        "update_tags": "Uppdatera Taggar",
+        "updating_untagged_tags_description": "Uppdatering av otaggade taggar kommer att försöka matcha alla taggar som saknar StashID och uppdatera deras metadata."
+    },
+    "tagger": {
+        "config": {
+            "active_stash-box_instance": "Aktiv stash-box-instans:",
+            "edit_excluded_fields": "Ändra Exkluderade Fält",
+            "excluded_fields": "Exkluderade fält:",
+            "fields_will_not_be_changed": "De här fälten kommer inte ändras när {entity} uppdateras.",
+            "no_fields_are_excluded": "Inga fält är exkluderad",
+            "no_instances_found": "Inga instanser hittades"
+        }
+    },
+    "unsupported_criteria": "Ej stöttat kriterium: {critera}"
 }
diff --git a/ui/v2.5/src/locales/th-TH.json b/ui/v2.5/src/locales/th-TH.json
index ee727e348..592f838c6 100644
--- a/ui/v2.5/src/locales/th-TH.json
+++ b/ui/v2.5/src/locales/th-TH.json
@@ -54,8 +54,6 @@
         "import_from_file": "นำเข้าด้วยไฟล์",
         "logout": "ล็อกเอาท์",
         "merge": "รวม",
-        "merge_from": "รวมจาก",
-        "merge_into": "รวมไปยัง",
         "next_action": "ต่อไป",
         "not_running": "ไม่สามารถรันได้",
         "open_in_external_player": "เปิดด้วย Player อื่น",
@@ -438,7 +436,6 @@
             "auto_tagging": "การแท็กอัตโนมัติ",
             "backing_up_database": "กำลังสำรองฐานข้อมูล",
             "backup_and_download": "ทำการสำรองฐานข้อมูลและดาวน์โหลดไฟล์",
-            "backup_database": "ทำการสำรองฐานข้อมูลไปยังไดเร็กทอรีสำรองข้อมูล โดยมีรูปแบบชื่อไฟล์ {filename_format}",
             "cleanup_desc": "ตรวจสอบไฟล์ที่หายไปและลบออกจากฐานข้อมูล นี่คือการกระทำที่ทำลายล้าง",
             "data_management": "การจัดการเดต้า",
             "defaults_set": "มีการตั้งค่าเริ่มต้นและจะใช้เมื่อคลิกปุ่ม {action} บนหน้างาน",
@@ -779,13 +776,7 @@
         "updating_untagged_studios_description": "อัพเดตสตูดิโอที่ยังไม่มีข้อมูลโดยการค้นหาสตูดิโอที่ยังไม่มี stashid และทำการอัปเดตข้อมูล metadata",
         "config": {
             "create_parent_label": "สร้างสตูดิโอบริษัทแม่",
-            "create_parent_desc": "สร้างสตูดิโอบริษัทแม่หรือแท็กที่เกี่ยวข้องหากยังไม่มี พร้อมอัปเดตข้อมูลและรูปภาพให้กับรายการที่มีอยู่แล้ว",
-            "active_stash-box_instance": "Stash-box instance ที่ใช้งาน:",
-            "excluded_fields": "ข้อมูลที่ไม่ต้องการใช้งาน:",
-            "edit_excluded_fields": "แก้ไขประเภทข้อมูลที่ไม่ต้องการใช้งาน",
-            "no_fields_are_excluded": "ไม่มีข้อมูลที่ไม่ต้องการใช้งาน",
-            "no_instances_found": "ไม่พบแหล่งข้อมูล",
-            "these_fields_will_not_be_changed_when_updating_studios": "ข้อมูลประเภทที่เลือกไว้จะไม่ถูกเปลี่ยนแปลงหรืออัปเดต"
+            "create_parent_desc": "สร้างสตูดิโอบริษัทแม่หรือแท็กที่เกี่ยวข้องหากยังไม่มี พร้อมอัปเดตข้อมูลและรูปภาพให้กับรายการที่มีอยู่แล้ว"
         },
         "create_or_tag_parent_studios": "สร้างสตูดิโอบริษัทแม่หรือแท็กที่เกียวข้องหากยังไม่มี",
         "untagged_studios": "สตูดิโอที่ยังไม่มีข้อมูล",
@@ -922,14 +913,6 @@
         "tag_status": "สถานะการเพิ่มข้อมูล",
         "refresh_tagged_performers": "รีเฟรชนักแสดงที่มีข้อมูลแล้ว",
         "batch_add_performers": "เพิ่มนักแสดงพร้อมกันหลายคน",
-        "config": {
-            "active_stash-box_instance": "แหล่งข้อมูล stash-box ที่เลือกใช้:",
-            "excluded_fields": "ข้อมูลที่ไม่ต้องการใช้งาน:",
-            "no_fields_are_excluded": "ไม่มีข้อมูลที่ไม่ต้องการใช้งาน",
-            "these_fields_will_not_be_changed_when_updating_performers": "ข้อมูลประเภทที่เลือกไว้จะไม่ถูกเปลี่ยนแปลงหรืออัปเดต",
-            "no_instances_found": "ไม่พบแหล่งข้อมูล",
-            "edit_excluded_fields": "แก้ไขประเภทข้อมูลที่ไม่ต้องการใช้งาน"
-        },
         "batch_update_performers": "อัปเดตข้อมูลนักแสดงพร้อมกันหลายคน",
         "network_error": "พบปัญหาเน็ตเวิร์ค",
         "any_names_entered_will_be_queried": "รายชื่อนักแสดงจะถูกเรียกหาข้อมูลจาก stash-box ที่เลือกไว้ โดยจะเลือกเฉพาะข้อมูลที่ตรงกันเท่านั้น",
@@ -1070,10 +1053,6 @@
         "delete_galleries_extra": "…รวมถึงไฟล์ภาพต่างๆ ที่ไม่เกี่ยวข้องกับแกลเลอรีอื่นๆ ด้วย",
         "delete_gallery_files": "ลบโฟลเดอร์แกลเลอรี/ไฟล์ซิปและรูปภาพอื่นๆ ที่ไม่เกี่ยวข้องกับแกลเลอรีอื่นๆ",
         "delete_object_overflow": "…และอีก {count} {count, plural, one {{singularEntity}} other {{pluralEntity}}}",
-        "merge_tags": {
-            "destination": "ปลายทาง",
-            "source": "ต้นทาง"
-        },
         "reassign_files": {
             "destination": "ย้ายไปที่"
         },
@@ -1162,7 +1141,6 @@
     "markers": "มาร์คเกอร์",
     "marker_count": "จำนวนมาร์คเกอร์",
     "media_info": {
-        "checksum": "Checksum",
         "audio_codec": "โคเด็คเสียง",
         "phash": "PHash",
         "play_count": "จำนวนครั้งที่เล่น",
@@ -1172,7 +1150,6 @@
             "age_context": "อายุ {age} {years_old} ในเรื่องนี้"
         },
         "downloaded_from": "ดาวน์โหลดมาจาก",
-        "hash": "Hash",
         "play_duration": "ระยะเวลาที่เล่น",
         "stream": "สตรีม",
         "video_codec": "โคเด็ควิดีโอ",
diff --git a/ui/v2.5/src/locales/tr-TR.json b/ui/v2.5/src/locales/tr-TR.json
index 3db1d8e1b..3f19cd59c 100644
--- a/ui/v2.5/src/locales/tr-TR.json
+++ b/ui/v2.5/src/locales/tr-TR.json
@@ -49,8 +49,6 @@
         "import": "İçe Aktar…",
         "import_from_file": "Dosyadan içe aktar",
         "merge": "Birleştir",
-        "merge_from": "Buradan birleştir",
-        "merge_into": "Bununla birleştir",
         "next_action": "Sonraki",
         "not_running": "çalışmıyor",
         "open_random": "Rastgele Aç",
@@ -452,7 +450,6 @@
             "auto_tagging": "Otomatik Etiketleme",
             "backing_up_database": "Veritabanı yedekleniyor",
             "backup_and_download": "Veritabanını yedekler ve yedek dosyasını kaydetmenizi sağlar.",
-            "backup_database": "Veritabanı diziniyle aynı yere {filename_format} biçimini kullanarak yedekler",
             "cleanup_desc": "Eksik dosyaları kontrol eder ve veritabanından siler. Bu geri döndürülemez bir işlemdir.",
             "data_management": "Veri yönetimi",
             "defaults_set": "Varsayılanlar ayarlandı. Bundan sonra Görevler sayfasındaki {action} düğmesi bu varsayılanları kullanacak.",
@@ -860,10 +857,6 @@
             },
             "page_header": "Sayfa {page} / {total}"
         },
-        "merge_tags": {
-            "destination": "Hedef Noktası",
-            "source": "Kaynak"
-        },
         "scene_gen": {
             "force_transcodes": "Dönüştürülmüş video oluşturmayı zorla",
             "force_transcodes_tooltip": "Varsayılan olarak, video yalnızca video dosyası tarayıcı tarafından desteklenmediğinde dönüştürülür. Etkinleştirildiğinde, video dosyası tarayıcı tarafından destekleniyorsa bile video dönüştürülür.",
@@ -1032,9 +1025,7 @@
     "measurements": "Beden Ölçüleri",
     "media_info": {
         "audio_codec": "Ses Kodlayıcı",
-        "checksum": "Sağlama Toplamı (checksum)",
         "downloaded_from": "İndirildiği Yer",
-        "hash": "Dosya İmzası (Hash)",
         "interactive_speed": "Etkileşimli Hız",
         "performer_card": {
             "age": "{age} {years_old}",
@@ -1246,13 +1237,7 @@
         "add_new_studios": "Yeni Stüdyo Ekle",
         "batch_add_studios": "Toplu Stüdyo Ekle",
         "config": {
-            "excluded_fields": "Hariç tutulan alanlar:",
-            "edit_excluded_fields": "Hariç Tutulan Alanları Düzenle",
-            "no_fields_are_excluded": "Hiçbir alan hariç tutulmadı",
-            "create_parent_label": "Ana stüdyo oluştur",
-            "these_fields_will_not_be_changed_when_updating_studios": "Stüdyolar güncellenirken bu alanlar değişmeyecektir.",
-            "active_stash-box_instance": "Aktif stash-box oturumu:",
-            "no_instances_found": "Oturum bulunamadı"
+            "create_parent_label": "Ana stüdyo oluştur"
         },
         "batch_update_studios": "Stüdyoları Toplu Güncelle",
         "failed_to_save_studio": "Stüdyo kaydedilemedi \"{studio}\"",
@@ -1318,14 +1303,6 @@
     "penis_length_cm": "Penis Uzunluğu (cm)",
     "performer_age": "Oyuncu Yaşı",
     "performer_tagger": {
-        "config": {
-            "excluded_fields": "Hariç tutulan alanlar:",
-            "edit_excluded_fields": "Hariç Tutulan Alanları Düzenle",
-            "no_fields_are_excluded": "Hiçbir alan hariç tutulmadı",
-            "these_fields_will_not_be_changed_when_updating_performers": "Oyuncular güncellenirken bu alanlar değiştirilmeyecektir.",
-            "active_stash-box_instance": "Aktif stash-box oturumu:",
-            "no_instances_found": "Oturum bulunamadı"
-        },
         "current_page": "Geçerli sayfa",
         "network_error": "Ağ Hatası",
         "no_results_found": "Sonuç bulunamadı.",
diff --git a/ui/v2.5/src/locales/uk-UA.json b/ui/v2.5/src/locales/uk-UA.json
index 003090197..376311012 100644
--- a/ui/v2.5/src/locales/uk-UA.json
+++ b/ui/v2.5/src/locales/uk-UA.json
@@ -1,121 +1,119 @@
 {
     "actions": {
         "add": "Додати",
-        "add_directory": "Додати Папку",
+        "add_directory": "Додати каталог",
         "add_entity": "Додати {entityType}",
-        "add_to_entity": "Добавити до {entityType}",
+        "add_to_entity": "Додати до {entityType}",
         "allow": "Дозволити",
-        "allow_temporarily": "Дозволити Тимчасово",
+        "allow_temporarily": "Дозволити тимчасово",
         "apply": "Застосувати",
-        "auto_tag": "Авто-тегування",
-        "backup": "Резервна Копія",
-        "browse_for_image": "Обрати зображення…",
-        "cancel": "Відмінити",
-        "clean": "Почистити",
+        "auto_tag": "Авто тегування",
+        "backup": "Резервне копіювання",
+        "browse_for_image": "Вибрати зображення…",
+        "cancel": "Скасувати",
+        "clean": "Очистити",
         "clear": "Очистити",
-        "clear_back_image": "Очистити Фонову Картинку",
-        "clear_front_image": "Очистити Першу Картинку",
-        "clear_image": "Очистити Картинку",
+        "clear_back_image": "Очистити заднє зображення",
+        "clear_front_image": "Очистити переднє зображення",
+        "clear_image": "Очистити зображення",
         "close": "Закрити",
         "confirm": "Підтвердити",
-        "continue": "Далі",
+        "continue": "Продовжити",
         "create": "Створити",
         "create_entity": "Створити {entityType}",
-        "create_marker": "Створити Маркер",
-        "created_entity": "Створений {entity_type}:{entity_name}",
-        "customise": "Кастомізувати",
+        "create_marker": "Створити позначку",
+        "created_entity": "{entity_type} {entity_name} створено",
+        "customise": "Налаштувати",
         "delete": "Видалити",
         "delete_entity": "Видалити {entityType}",
-        "delete_file": "Видалити Файл",
-        "delete_file_and_funscript": "Видалити Файл (і фанскрипт)",
+        "delete_file": "Видалити файл",
+        "delete_file_and_funscript": "Видалити файл (і фанскрипт)",
         "delete_generated_supporting_files": "Видалити згенеровані допоміжні файли",
         "disallow": "Заборонити",
         "download": "Завантажити",
-        "download_backup": "Завантажити Резервну Копію",
+        "download_backup": "Завантажити резервну копію",
         "edit": "Редагувати",
         "edit_entity": "Редагувати {entityType}",
         "export": "Експортувати",
-        "export_all": "Експортувати Все…",
+        "export_all": "Експортувати все…",
         "find": "Знайти",
         "finish": "Завершити",
-        "from_file": "З Файлу…",
+        "from_file": "З файлу…",
         "from_url": "З URL…",
-        "full_export": "Повний Експорт",
-        "full_import": "Повний Імпорт",
+        "full_export": "Повний експорт",
+        "full_import": "Повний імпорт",
         "generate": "Згенерувати",
-        "generate_thumb_default": "Згенерувати Стандартну Мініатюру",
-        "generate_thumb_from_current": "Згенерувати Мініатюрю з поточного",
-        "hash_migration": "Міграція Хешу",
-        "hide": "Заховати",
-        "hide_configuration": "Заховати Налаштування",
-        "identify": "Ідентифікувати",
+        "generate_thumb_default": "Згенерувати стандартну мініатюру",
+        "generate_thumb_from_current": "Згенерувати мініатюру з поточного",
+        "hash_migration": "міграція хешу",
+        "hide": "Приховати",
+        "hide_configuration": "Приховати налаштування",
+        "identify": "Розпізнати",
         "ignore": "Ігнорувати",
         "import": "Імпортувати…",
-        "import_from_file": "Імпортувати З Файлу",
-        "logout": "Вилогінитися",
-        "make_primary": "Зробити Головним",
-        "merge": "Зкомбінувати",
-        "merge_from": "Зкомбінувати з",
-        "merge_into": "Зкомбінувати В",
+        "import_from_file": "Імпортувати з файлу",
+        "logout": "Вийти",
+        "make_primary": "Зробити головним",
+        "merge": "Об'єднати",
         "next_action": "Наступний",
         "not_running": "не працює",
-        "open_in_external_player": "Відкрити В Зовнішньому Програвачі",
-        "open_random": "Відкрити Випадковий",
-        "overwrite": "Переписати Існуючий",
-        "play_random": "Програти Випадковий",
-        "play_selected": "Програти Вибраний",
-        "preview": "Прев‘ю",
+        "open_in_external_player": "Відкрити у зовнішньому програвачі",
+        "open_random": "Відкрити випадкове",
+        "overwrite": "Перезаписати",
+        "play_random": "Відтворити випадкове",
+        "play_selected": "Відтворити вибране",
+        "preview": "Попередній перегляд",
         "previous_action": "Назад",
         "refresh": "Оновити",
-        "reload_plugins": "Перезавантажити Плагіни",
-        "reload_scrapers": "Перезавантажити Скрейпери",
-        "remove": "Видалити",
-        "remove_from_gallery": "Видалити З Галереї",
-        "rename_gen_files": "Перейменувати Згенеровані Файли",
+        "reload_plugins": "Перезавантажити плагіни",
+        "reload_scrapers": "Перезавантажити скрейпери",
+        "remove": "Вилучити",
+        "remove_from_gallery": "Вилучити з галереї",
+        "rename_gen_files": "Перейменувати згенеровані файли",
         "rescan": "Пересканувати",
         "reshuffle": "Перемішати",
         "running": "працює",
         "save": "Зберегти",
-        "save_delete_settings": "Використати ці опції за замовчуванням, коли видаляєте",
-        "save_filter": "Зберегти Фільтр",
+        "save_delete_settings": "Використовувати ці параметри видалення за замовчуванням",
+        "save_filter": "Зберегти фільтр",
         "scan": "Сканувати",
         "scrape": "Скрейпити",
         "scrape_query": "Скрейп-запит",
-        "scrape_scene_fragment": "Скрепнути по фрагменту",
+        "scrape_scene_fragment": "Скрейпити за фрагментом",
         "scrape_with": "Скрейпити за допомогою…",
         "search": "Пошук",
-        "select_all": "Вибрати Всі",
+        "select_all": "Вибрати все",
         "select_entity": "Вибрати {entityType}",
-        "select_folders": "Вибрати Папку",
-        "select_none": "Нічого Не Вибрати",
-        "selective_auto_tag": "Селективне Авто-Тегування",
-        "selective_clean": "Селективна Очистка",
-        "selective_scan": "Селективне Сканування",
-        "set_as_default": "Зробити За Замовчуванням",
+        "select_folders": "Вибрати папки",
+        "select_none": "Зняти виділення",
+        "selective_auto_tag": "Вибіркове автотегування",
+        "selective_clean": "Вибіркове очищення",
+        "selective_scan": "Вибіркове сканування",
+        "set_as_default": "Зробити типовим",
         "set_image": "Встановити зображення…",
         "show": "Показати",
-        "show_configuration": "Показати Конфігурацію",
+        "show_configuration": "Показати конфігурацію",
         "skip": "Пропустити",
         "stop": "Зупинити",
-        "submit": "Підтвердити",
-        "submit_update": "Підтвердити Оновлення",
-        "temp_disable": "Тимчасово відключити…",
-        "temp_enable": "Тимчасово включити…",
-        "use_default": "Використовувати за замовчуванням",
-        "view_random": "Дивитися випадкове",
-        "swap": "Обмін",
+        "submit": "Надіслати",
+        "submit_update": "Надіслати оновлення",
+        "temp_disable": "Тимчасово вимкнути…",
+        "temp_enable": "Тимчасово увімкнути…",
+        "use_default": "Використовувати типове",
+        "view_random": "Переглянути випадкове",
+        "swap": "Поміняти місцями",
         "add_sub_groups": "Додати підгрупи",
         "encoding_image": "Кодування зображення…",
-        "migrate_scene_screenshots": "Мігрувати скріншоти Сцен",
-        "optimise_database": "Оптимізувати Базу даних",
-        "add_manual_date": "Додати дату вручну",
-        "add_o": "Додати O",
+        "migrate_scene_screenshots": "Мігрувати скріншоти сцен",
+        "optimise_database": "Оптимізувати базу даних",
+        "add_manual_date": "Вказати дату вручну",
+        "add_o": "Додати оргазм",
         "add_play": "Додати перегляд",
         "anonymise": "Анонімізувати",
-        "create_chapters": "Створити Розділ",
+        "create_chapters": "Створити розділ",
         "create_parent_studio": "Створити батьківську студію",
-        "download_anonymised": "Завантажити анонімізовано",
-        "enable": "Включити",
+        "download_anonymised": "Завантажити анонімно",
+        "enable": "Увімкнути",
         "disable": "Вимкнути",
         "migrate_blobs": "Мігрувати Blobs",
         "reload": "Перезавантажити",
@@ -126,137 +124,155 @@
         "reassign": "Перепризначити",
         "set_cover": "Встановити як обкладинку",
         "reset_play_duration": "Скинути тривалість відтворення",
-        "reset_resume_time": "Скинути час відновлення відтворення",
+        "reset_resume_time": "Скинути час відновлення",
         "reset_cover": "Відновити обкладинку за замовчуванням",
         "tasks": {
-            "import_warning": "Ви впевнені, що хочете імпортувати? Це видалить базу даних і повторно імпортує дані з вашого експортованого метаданих.",
-            "clean_confirm_message": "Ви впевнені, що хочете виконати очищення? Це видалить інформацію з бази даних і згенерований вміст для всіх сцен і галерей, які більше не знайдені у файловій системі.",
-            "dry_mode_selected": "Вибрано тестовий режим. Видалення не буде виконано, лише ведення журналу."
+            "import_warning": "Ви впевнені, що хочете імпортувати? Це видалить базу даних і виконає повторний імпорт з ваших експортованих метаданих.",
+            "clean_confirm_message": "Ви впевнені, що бажаєте виконати очищення? Це видалить інформацію з бази даних та згенерований вміст для всіх сцен і галерей, які більше не знайдені у файловій системі.",
+            "dry_mode_selected": "Вибрано тестовий режим. Видалення не буде виконано, лише запис у журнал."
         },
-        "remove_from_containing_group": "Видалити з Групи",
+        "remove_from_containing_group": "Вилучити з групи",
         "choose_date": "Обрати дату",
-        "assign_stashid_to_parent_studio": "Призначити Stash ID існуючій батьківській студії та оновити метадані",
+        "assign_stashid_to_parent_studio": "Присвоїти Stash ID наявній батьківській студії та оновити метадані",
         "clean_generated": "Очистити згенеровані файли",
-        "clear_date_data": "Очистити дані дати",
-        "copy_to_clipboard": "Копіювати до буфера обміну",
-        "set_back_image": "Зворотне зображення…",
+        "clear_date_data": "Очистити дату",
+        "copy_to_clipboard": "Копіювати в буфер обміну",
+        "set_back_image": "Заднє зображення…",
         "set_front_image": "Переднє зображення…",
-        "unset": "Скинути",
+        "unset": "Зняти",
         "load": "Завантажити",
         "load_filter": "Завантажити фільтр",
         "play": "Відтворити",
-        "show_results": "Висвітити вислід",
-        "show_count_results": "Висвітити {count} висліди",
+        "show_results": "Показати результати",
+        "show_count_results": "Показати {count} результатів",
         "sidebar": {
             "close": "Сховати бічну панель",
-            "open": "Розгорнути бічну панель",
-            "toggle": "Перемикнути бічну панель"
-        }
+            "open": "Відкрити бічну панель",
+            "toggle": "Перемкнути бічну панель"
+        },
+        "add_stash_id": "Додати Stash ID",
+        "create_new": "Створити нове",
+        "save_and_new": "Зберегти та створити",
+        "invert_selection": "Інвертувати виділення",
+        "select_directory": "Вибрати каталог",
+        "reveal_in_file_manager": "Показати в файловому менеджері",
+        "selective_generate": "Вибіркове генерування",
+        "from_clipboard": "З буфера обміну",
+        "exclude_lowercase": "виключити",
+        "create_parent_tag": "Створити головний тег"
     },
     "actions_name": "Дії",
     "age": "Вік",
     "aliases": "Псевдоніми",
     "all": "всі",
-    "also_known_as": "Також відомий, як",
+    "also_known_as": "Також відомий як",
     "birth_year": "Рік народження",
     "birthdate": "Дата народження",
     "bitrate": "Бітрейт",
     "component_tagger": {
         "config": {
-            "active_instance": "Активувати екземпляр stash-box:",
+            "active_instance": "Активний екземпляр stash-box:",
             "blacklist_label": "Чорний список",
             "query_mode_auto": "Авто",
-            "query_mode_auto_desc": "Використовує мета-інформацію, якщо наявна, або ім'я файлу",
-            "query_mode_dir_desc": "Використовує лише батьківську директорію відео-файлу",
-            "query_mode_filename": "Ім'я файлу",
-            "query_mode_filename_desc": "Використовує лише ім'я файла",
-            "query_mode_metadata": "Мета-інформація",
-            "query_mode_metadata_desc": "Використовує лише мета-інформацію",
+            "query_mode_auto_desc": "Використовує метадані, якщо вони є, або назву файлу",
+            "query_mode_dir_desc": "Використовує лише батьківський каталог відеофайлу",
+            "query_mode_filename": "Назва файлу",
+            "query_mode_filename_desc": "Використовує лише назву файлу",
+            "query_mode_metadata": "Метадані",
+            "query_mode_metadata_desc": "Використовує лише метадані",
             "query_mode_path": "Шлях",
-            "query_mode_path_desc": "Використовує повний путь до файлу",
+            "query_mode_path_desc": "Використовує повний шлях до файлу",
             "set_tag_label": "Встановити теги",
             "source": "Джерело",
-            "blacklist_desc": "Елементи чорного списку виключаються з запитів. Зверніть увагу, що вони є регулярними виразами і нечутливі до регістру. Певні символи необхідно екранувати зворотнім слешем: {chars_require_escape}",
-            "mark_organized_desc": "Негайно позначити сцену як Організовану після натискання кнопки Зберегти.",
+            "blacklist_desc": "Елементи чорного списку виключаються із запитів. Зауважте, що це регулярні вирази, нечутливі до регістру. Певні символи необхідно екранувати зворотним слешем: {chars_require_escape}",
+            "mark_organized_desc": "Негайно позначати сцену як організовану після натискання кнопки Зберегти.",
             "mark_organized_label": "Позначати як організоване під час збереження",
             "query_mode_dir": "Каталог",
             "query_mode_label": "Режим запиту",
-            "set_tag_desc": "Додайте мітки до сцени, або замінивши, або об'єднавши з існуючими мітками на сцені.",
+            "set_tag_desc": "Додати теги до сцени, перезаписуючи або об'єднуючи з існуючими тегами.",
             "set_cover_desc": "Замінити обкладинку сцени, якщо вона знайдена.",
             "set_cover_label": "Встановити обкладинку сцени",
             "errors": {
-                "blacklist_duplicate": "Дублікат елемента чорного списку"
+                "blacklist_duplicate": "Дублікат у чорному списку"
+            },
+            "performer_genders": {
+                "heading": "Стать виконавців",
+                "description": "Виконавці з обраною статтю будуть показані під час тегування сцен."
             }
         },
         "results": {
             "duration_unknown": "Тривалість невідома",
-            "match_failed_no_result": "Результати відсутні",
-            "phash_matches": "{count} PHashes співпадає",
+            "match_failed_no_result": "Результатів не знайдено",
+            "phash_matches": "{count} PHashes збігаються",
             "unnamed": "Без назви",
-            "duration_off": "Тривалість відрізняється щонайменше на {number}s",
+            "duration_off": "Тривалість відрізняється щонайменше на {number}с",
             "fp_matches": "Тривалість збігається",
             "fp_matches_multi": "Тривалість збігається з {matchCount}/{durationsLength} відбитками",
             "hash_matches": "{hash_type} збігається",
-            "match_failed_already_tagged": "Сцена вже позначена",
-            "match_success": "Сцена успішно позначена",
+            "match_failed_already_tagged": "Сцена вже має теги",
+            "match_success": "Теги успішно додано до сцени",
             "fp_found": "{fpCount, plural, =0 {Нових збігів відбитків не знайдено} other {Знайдено # нових збігів відбитків}}"
         },
-        "verb_match_fp": "Порівняти відбитки",
-        "verb_matched": "Співпадінь",
+        "verb_match_fp": "Зіставити відбитки",
+        "verb_matched": "Зіставлено",
         "verb_scrape_all": "Скрейпити все",
         "verb_toggle_config": "{toggle} {configuration}",
-        "verb_toggle_unmatched": "{toggle} не співпавші сцени",
-        "verb_submit_fp": "Надіслати {fpCount, plural, one{# Fingerprint} other{# Fingerprints}}",
-        "noun_query": "Запит"
+        "verb_toggle_unmatched": "{toggle} незіставлені сцени",
+        "verb_submit_fp": "Надіслати {fpCount, plural, one{відбиток} few{відбитки} other{відбитків}}",
+        "noun_query": "Запит",
+        "verb_add_as_alias": "Додати отриману назву як псевдонім",
+        "verb_link_existing": "Прив'язати до наявного",
+        "verb_match_tag": "Зіставити тег",
+        "verb_scrape_selected": "Скрейпити вибране"
     },
     "config": {
         "about": {
-            "check_for_new_version": "Перевірити на оновлення",
-            "latest_version": "Найновіша версія",
-            "stash_discord": "Приєднуйтесь до нашого {url} каналу",
-            "stash_open_collective": "Підтримати нас на {url}",
+            "check_for_new_version": "Перевірити наявність нової версії",
+            "latest_version": "Остання Версія",
+            "stash_discord": "Приєднуйтесь до нашого каналу в {url}",
+            "stash_open_collective": "Підтримайте нас через {url}",
             "version": "Версія",
-            "release_date": "Дата релізу:",
-            "stash_home": "Домівка Stash {url}",
-            "build_time": "Дата збірки:",
-            "build_hash": "Геш збірки:",
-            "latest_version_build_hash": "Геш збірки останньої версії:",
+            "release_date": "Дата випуску:",
+            "stash_home": "Домашня сторінка Stash: {url}",
+            "build_time": "Час збірки:",
+            "build_hash": "Хеш збірки:",
+            "latest_version_build_hash": "Хеш збірки останньої версії:",
             "new_version_notice": "[НОВЕ]",
-            "stash_wiki": "Stash {url} сторінка"
+            "stash_wiki": "Сторінка Stash на {url}"
         },
         "categories": {
             "changelog": "Список змін",
             "interface": "Інтерфейс",
-            "logs": "Логи",
-            "metadata_providers": "Провайдери мета-інформації",
+            "logs": "Журнали",
+            "metadata_providers": "Джерела метаданих",
             "plugins": "Плагіни",
             "security": "Безпека",
             "services": "Сервіси",
             "system": "Система",
-            "tasks": "Задачі",
+            "tasks": "Завдання",
             "tools": "Інструменти",
             "about": "Про програму",
-            "scraping": "Збирання даних"
+            "scraping": "Скрейпінг"
         },
         "dlna": {
             "allow_temp_ip": "Дозволити {tempIP}",
             "allowed_ip_addresses": "Дозволені IP-адреси",
-            "allowed_ip_temporarily": "Тимчасово дозволені IP-адреси",
-            "default_ip_whitelist": "Білий список IP-адрес за замовчуванням",
-            "default_ip_whitelist_desc": "IP-адреси за замовчуванням мають доступ до DLNA. Використовуйте {wildcard} щоб дозволити усі IP-адреси.",
-            "disallowed_ip": "Заборонені IP-адреси",
-            "enabled_by_default": "Вмикнено за замовчуванням",
-            "network_interfaces": "Інтерфейси",
-            "recent_ip_addresses": "Нещодавні IP-адреси",
-            "server_display_name_desc": "Відображуване ім'я DLNA-сервера. Якщо пусте, {server_name} буде використано за замовчуванням.",
-            "successfully_cancelled_temporary_behaviour": "Тимчасова поведінка успішно скасована",
+            "allowed_ip_temporarily": "Тимчасово дозволені IP",
+            "default_ip_whitelist": "Білий список IP за замовчуванням",
+            "default_ip_whitelist_desc": "IP-адреси за замовчуванням для доступу до DLNA. Використовуйте {wildcard}, щоб дозволити всі IP-адреси.",
+            "disallowed_ip": "Заборонені IP",
+            "enabled_by_default": "Увімкнено за замовчуванням",
+            "network_interfaces": "Мережеві інтерфейси",
+            "recent_ip_addresses": "Недавні IP-адреси",
+            "server_display_name_desc": "Відображуване ім'я для сервера DLNA. Якщо порожнє, використовується {server_name}.",
+            "successfully_cancelled_temporary_behaviour": "Тимчасовий режим успішно скасовано",
             "until_restart": "до рестарту",
-            "enabled_dlna_temporarily": "Включити DLNA тимчасово",
-            "disabled_dlna_temporarily": "Вимкнути DLNA тимчасово",
-            "server_display_name": "Відображуване ім'я серверу",
-            "server_port": "Порт серверу",
-            "network_interfaces_desc": "Інтерфейси для доступу до сервера DLNA. Порожній список призводить до запуску на всіх інтерфейсах. Потрібно перезапустити DLNA після зміни.",
-            "server_port_desc": "Порт для запуску сервера DLNA. Потрібен перезапуск DLNA після зміни.",
+            "enabled_dlna_temporarily": "DLNA тимчасово увімкнено",
+            "disabled_dlna_temporarily": "DLNA тимчасово вимкнено",
+            "server_display_name": "Відображуване ім'я сервера",
+            "server_port": "Порт сервера",
+            "network_interfaces_desc": "Інтерфейси, на яких працюватиме сервер DLNA. Порожній список означає запуск на всіх інтерфейсах. Зміна потребує перезапуску DLNA.",
+            "server_port_desc": "Порт для роботи сервера DLNA. Зміна потребує перезапуску DLNA.",
             "video_sort_order_desc": "Порядок сортування відео за замовчуванням.",
             "video_sort_order": "Порядок сортування відео за замовчуванням"
         },
@@ -283,10 +299,12 @@
                     "description": "Облікові дані для обмеження доступу до Stash.",
                     "heading": "Облікові дані"
                 },
-                "password_desc": "Пароль для доступу до Stash. Залиште порожнім, щоб вимкнути аутентифікацію користувача"
+                "password_desc": "Пароль для доступу до Stash. Залиште порожнім, щоб вимкнути аутентифікацію користувача",
+                "log_file_max_size": "Максимальний розмір журналу",
+                "log_file_max_size_desc": "Максимальний розмір файлу журналу в мегабайтах перед стисненням. 0 МБ — вимкнено. Потребує перезапуску."
             },
             "backup_directory_path": {
-                "description": "Директорія для зберігання резервних копій бази даних SQLite",
+                "description": "Директорія для зберігання резервних копій бази даних SQLite.",
                 "heading": "Шлях до директорії з резервними копіями"
             },
             "cache_location": "Розташування каталогу кешу. Обов'язково, якщо використовується потокова передача через HLS (наприклад, на пристроях Apple) або DASH.",
@@ -295,7 +313,7 @@
             "check_for_insecure_certificates": "Перевірити на ненадійні сертифікати",
             "chrome_cdp_path": "Шлях до Chrome CDP",
             "chrome_cdp_path_desc": "Шлях до виконуваного файлу Chrome, або видаленна адреса (починається з http:// або https://, наприклад, http://localhost:9222/json/version) до екземпляру Chrome.",
-            "create_galleries_from_folders_desc": "Якщо так, то створює галереї з папок із зображеннями.",
+            "create_galleries_from_folders_desc": "Якщо значення true, за замовчуванням створює галереї з папок, що містять зображення. Створіть файл з назвою .forcegallery або .nogallery у папці, щоб перезаписати це налаштування.",
             "create_galleries_from_folders_label": "Створити галереї з папок із зображеннями",
             "db_path_head": "Шлях до бази даних",
             "excluded_image_gallery_patterns_head": "Виключені паттерни Зображень/Галерей",
@@ -304,25 +322,25 @@
             "gallery_ext_head": "Розширення ZIP-файлів з галереями",
             "generated_path_head": "Згенерований Шлях",
             "image_ext_desc": "Розділений комою список розширень файлів, які можуть бути ідентифікованими, як зображення.",
-            "image_ext_head": "Розширення Зображень",
+            "image_ext_head": "Розширення зображень",
             "include_audio_head": "Включити аудіо",
             "metadata_path": {
                 "heading": "Шлях до мета-інформації",
-                "description": "Розташування каталогу, що використовується під час виконання повного експорту або імпорту"
+                "description": "Розташування каталогу, що використовується під час виконання повного експорту або імпорту."
             },
             "number_of_parallel_task_for_scan_generation_head": "Кількість паралельних задач для сканування/генерації",
             "parallel_scan_head": "Паралельне сканування/генерація",
             "preview_generation": "Генерація прев'ю",
-            "scraper_user_agent_desc": "Рядок User-Agent, що використовується під час виконання HTTP-запитів сканування",
+            "scraper_user_agent_desc": "Рядок User-Agent, що використовується під час виконання HTTP-запитів сканування.",
             "scrapers_path": {
-                "description": "Розташування каталогу файлів конфігурації сканерів",
+                "description": "Розташування каталогу файлів конфігурації сканерів.",
                 "heading": "Шлях до сканерів"
             },
             "scraping": "Збирання даних",
-            "generated_file_naming_hash_desc": "Використовуйте MD5 або oshash для генерації імен файлів. Зміна цього параметра вимагає, щоб усі сцени мали заповнене відповідне значення MD5/oshash. Після зміни цього параметра існуючі згенеровані файли потрібно буде перенести або згенерувати заново. Перейдіть на сторінку Завдання (Tasks) для виконання міграції.",
+            "generated_file_naming_hash_desc": "Використовувати MD5 або oshash для іменування згенерованих файлів. Зміна цього параметра вимагає, щоб усі сцени мали заповнене відповідне значення MD5/oshash. Після зміни цього значення існуючі згенеровані файли потрібно буде мігрувати або згенерувати заново. Дивіться сторінку «Завдання» для міграції.",
             "sqlite_location": "Розташування файлу для бази даних SQLite (вимагає перезапуску). УВАГА: зберігання бази даних на іншій системі, ніж сервер Stash (наприклад, через мережу), не підтримується!",
             "blobs_storage": {
-                "description": "Місце зберігання двійкових даних, таких як обкладинки сцен, зображення виконавців, студій і тегів. Після зміни цього параметра існуючі дані потрібно перенести, використовуючи завдання \"Migrate Blobs\". Перейдіть на сторінку Завдання (Tasks) для виконання міграції.",
+                "description": "Де зберігати бінарні дані, такі як обкладинки сцен, зображення виконавців, студій і тегів. Після зміни цього значення існуючі дані потрібно мігрувати, використовуючи завдання «Міграція Blobs». Дивіться сторінку «Завдання» для виконання міграції.",
                 "heading": "Тип зберігання бінарних даних"
             },
             "blobs_path": {
@@ -332,7 +350,7 @@
             "calculate_md5_and_ohash_desc": "Обчислювати контрольну суму MD5 додатково до oshash. Увімкнення цієї функції сповільнить початкове сканування. Хеш для назви файлу повинен бути встановлений на oshash, щоб вимкнути обчислення MD5.",
             "ffmpeg": {
                 "ffmpeg_path": {
-                    "description": "Шлях до виконуваного файлу ffmpeg (а не лише до папки). Якщо залишити порожнім, ffmpeg буде визначено з середовища через $PATH, каталог конфігурації або $HOME/.stash",
+                    "description": "Шлях до виконуваного файлу ffmpeg (а не лише до папки). Якщо залишити порожнім, ffmpeg буде визначено з середовища через $PATH, каталог конфігурації або $HOME/.stash.",
                     "heading": "Шлях до виконуваного файлу FFmpeg"
                 },
                 "download_ffmpeg": {
@@ -340,7 +358,7 @@
                     "heading": "Завантажити FFmpeg"
                 },
                 "ffprobe_path": {
-                    "description": "Шлях до виконуваного файлу ffprobe (а не лише до папки). Якщо залишити порожнім, ffprobe буде визначено з середовища через $PATH, каталог конфігурації або $HOME/.stash",
+                    "description": "Шлях до виконуваного файлу ffprobe (а не лише до папки). Якщо залишити порожнім, ffprobe буде визначено з середовища через $PATH, каталог конфігурації або $HOME/.stash.",
                     "heading": "Шлях до виконуваного файлу FFprobe"
                 },
                 "transcode": {
@@ -369,28 +387,28 @@
                 }
             },
             "funscript_heatmap_draw_range_desc": "Відобразити діапазон руху на осі y створеної теплової карти. Існуючі теплові карти потрібно буде перегенерувати після зміни.",
-            "maximum_transcode_size_desc": "Максимальний розмір для згенерованих транскодувань",
-            "generated_files_location": "Розташування каталогу для згенерованих файлів (позначки сцен, попередні перегляди сцен, спрайти тощо)",
+            "maximum_transcode_size_desc": "Максимальний розмір для згенерованих транскодувань.",
+            "generated_files_location": "Розташування каталогу для згенерованих файлів (позначки сцен, попередні перегляди сцен, спрайти тощо).",
             "maximum_transcode_size_head": "Максимальний розмір транскодування",
-            "check_for_insecure_certificates_desc": "Деякі сайти використовують ненадійні SSL-сертифікати. Якщо прапорець знято, скрейпер пропускає перевірку таких сертифікатів і дозволяє збір даних із цих сайтів. Якщо під час скрейпінгу виникає помилка сертифіката, зніміть цей прапорець.",
-            "excluded_image_gallery_patterns_desc": "Регулярні вирази для файлів/шляхів зображень і галерей, які потрібно виключити зі сканування та додати до очищення",
+            "check_for_insecure_certificates_desc": "Деякі сайти використовують ненадійні SSL-сертифікати. Якщо цей прапорець знято, скрейпер пропускає перевірку ненадійних сертифікатів і дозволяє скрейпінг таких сайтів. Якщо ви отримуєте помилку сертифіката під час скрейпінгу, зніміть цей прапорець.",
+            "excluded_image_gallery_patterns_desc": "Регулярні вирази для файлів/шляхів зображень і галерей, які потрібно виключити зі сканування та додати до очищення.",
             "directory_locations_to_your_content": "Розташування каталогів із вашим контентом",
             "database": "База даних",
-            "excluded_video_patterns_desc": "Регулярні вирази для відеофайлів/шляхів, які потрібно виключити зі сканування та додати до очищення",
+            "excluded_video_patterns_desc": "Регулярні вирази для відеофайлів/шляхів, які потрібно виключити зі сканування та додати до очищення.",
             "funscript_heatmap_draw_range": "Включити діапазон у згенеровані теплові карти",
-            "gallery_cover_regex_desc": "Регулярний вираз, що використовується для ідентифікації зображення як обкладинки галереї",
+            "gallery_cover_regex_desc": "Регулярний вираз, що використовується для ідентифікації зображення як обкладинки галереї.",
             "gallery_cover_regex_label": "Шаблон обкладинки галереї",
             "generated_file_naming_hash_head": "Геш імені згенерованого файлу",
             "include_audio_desc": "Включати аудіопотік під час створення попередніх переглядів.",
-            "maximum_streaming_transcode_size_desc": "Максимальний розмір для транскодованих потоків",
+            "maximum_streaming_transcode_size_desc": "Максимальний розмір для транскодованих потоків.",
             "logging": "Журналювання",
             "number_of_parallel_task_for_scan_generation_desc": "Встановіть 0 для автоматичного визначення. Увага: виконання більшої кількості завдань, ніж потрібно для досягнення 100% завантаження CPU, знижує продуктивність і може викликати інші проблеми.",
             "python_path": {
-                "description": "Шлях до виконуваного файлу python (а не лише до папки). Використовується для скриптів-збирачів та плагінів. Якщо залишити порожнім, python буде визначено з середовища",
+                "description": "Шлях до виконуваного файлу python (а не лише до папки). Використовується для скриптів-збирачів та плагінів. Якщо залишити порожнім, python буде визначено з середовища.",
                 "heading": "Шлях до виконуваного файлу Python"
             },
             "plugins_path": {
-                "description": "Розташування каталогу файлів конфігурації плагінів",
+                "description": "Розташування каталогу файлів конфігурації плагінів.",
                 "heading": "Шлях до плагінів"
             },
             "video_ext_head": "Розширення відео",
@@ -398,70 +416,87 @@
             "heatmap_generation": "Генерація теплової карти для Funscript",
             "maximum_streaming_transcode_size_head": "Максимальний розмір транскодування для стрімінгу",
             "video_head": "Відео",
-            "scraper_user_agent": "User Agent сканера",
-            "video_ext_desc": "Список розширень файлів, розділений комами, які будуть ідентифіковані як відео."
+            "scraper_user_agent": "Користувацький агент-скрейпер",
+            "video_ext_desc": "Список розширень файлів, розділений комами, які будуть ідентифіковані як відео.",
+            "delete_trash_path": {
+                "description": "Шлях, куди переміщуватимуться видалені файли замість остаточного видалення. Залиште порожнім, щоб видаляти файли назавжди.",
+                "heading": "Шлях до смітника"
+            },
+            "sprite_generation_head": "Генерація спрайтів",
+            "sprite_interval_desc": "Інтервал між кадрами спрайтів (у секундах).",
+            "sprite_interval_head": "Інтервал спрайтів",
+            "sprite_maximum_desc": "Максимальна кількість спрайтів, яку можна згенерувати для сцени. Встановіть значення 0, щоб вимкнути обмеження.",
+            "sprite_maximum_head": "Максимальна кількість спрайтів",
+            "sprite_minimum_desc": "Мінімальна кількість спрайтів, яку потрібно згенерувати для сцени",
+            "sprite_minimum_head": "Мінімальна кількість спрайтів",
+            "sprite_screenshot_size_desc": "Бажаний розмір кожного спрайта в пікселях.",
+            "sprite_screenshot_size_head": "Розмір спрайта",
+            "use_custom_sprite_interval_head": "Використовувати власний інтервал спрайтів",
+            "use_custom_sprite_interval_desc": "Увімкніть користувацький інтервал спрайтів відповідно до налаштувань нижче."
         },
         "advanced_mode": "Розширений режим",
         "tasks": {
             "identify": {
-                "source_options": "{source} Опції",
+                "source_options": "Опції {source}",
                 "strategy": "Стратегія",
-                "and_create_missing": "і створити відсутні",
-                "description": "Автоматично налаштовувати метадані сцени за допомогою stash-box та джерел сканера.",
+                "and_create_missing": "та створити відсутні",
+                "description": "Автоматично встановлювати метадані сцени, використовуючи джерела Stash-box та скрейперів.",
                 "create_missing": "Створити відсутні",
                 "default_options": "Опції за замовчуванням",
-                "explicit_set_description": "Наступні параметри будуть використані, якщо не перевизначені в параметрах, що стосуються конкретного джерела.",
+                "explicit_set_description": "Наступні параметри будуть використані там, де вони не перевизначені в налаштуваннях конкретного джерела.",
                 "field": "Поле",
-                "heading": "Ідентифікувати",
+                "heading": "Ідентифікація",
                 "identifying_from_paths": "Ідентифікація сцен за наступними шляхами",
                 "identifying_scenes": "Ідентифікація {num} {scene}",
-                "include_male_performers": "Включати чоловічих виконавців",
-                "skip_multiple_matches_tooltip": "Якщо це не ввімкнено і повертається більше одного результату, буде випадково вибрано один для відповідності",
-                "skip_multiple_matches": "Пропустити збіги, які мають більше ніж один результат",
+                "include_male_performers": "Включати виконавців-чоловіків",
+                "skip_multiple_matches_tooltip": "Якщо вимкнено і знайдено більше одного результату, буде випадково обрано один для зіставлення",
+                "skip_multiple_matches": "Пропускати збіги, які мають більше одного результату",
                 "source": "Джерело",
-                "skip_single_name_performers_tooltip": "Якщо це не ввімкнено, виконавці з поширеними іменами, такими як Samantha або Olga, будуть співставлятися",
-                "skip_single_name_performers": "Пропустити виконавців з одним ім'ям без уточнень",
-                "tag_skipped_matches_tooltip": "Створіть тег на кшталт 'Identify: Multiple Matches', який можна відфільтрувати у перегляді Scene Tagger і вручну вибрати правильний збіг",
-                "tag_skipped_performer_tooltip": "Створіть тег на кшталт 'Identify: Single Name Performer', який можна відфільтрувати у перегляді Scene Tagger і вибрати, як обробляти таких виконавців",
+                "skip_single_name_performers_tooltip": "Якщо вимкнено, виконавці з поширеними іменами (наприклад, Samantha або Olga) будуть зіставлені",
+                "skip_single_name_performers": "Пропускати виконавців з одним ім'ям без уточнень",
+                "tag_skipped_matches_tooltip": "Створіть тег (наприклад, 'Identify: Multiple Matches'), за яким можна фільтрувати у Scene Tagger для ручного вибору правильного збігу",
+                "tag_skipped_performer_tooltip": "Створіть тег (наприклад, 'Identify: Single Name Performer'), за яким можна фільтрувати у Scene Tagger для вибору способу обробки таких виконавців",
                 "sources": "Джерела",
                 "field_behaviour": "{strategy} {field}",
                 "field_options": "Опції полів",
-                "tag_skipped_matches": "Позначити пропущені збіги як",
-                "set_organized": "Встановити прапорець впорядкованості",
+                "tag_skipped_matches": "Позначити пропущені збіги тегом",
+                "set_organized": "Встановити мітку \"Впорядковано\"",
                 "set_cover_images": "Встановити обкладинки",
-                "tag_skipped_performers": "Позначити пропущених виконавців як"
+                "tag_skipped_performers": "Позначити пропущених виконавців тегом",
+                "performer_genders": "Стать виконавців",
+                "performer_genders_desc": "Виконавців вибраної статі буде включено під час ідентифікації."
             },
-            "generate_previews_during_scan_tooltip": "Також створюйте анімовані (webp) прев’ю, необхідні лише тоді, коли тип прев’ю для стінки сцен/маркерів встановлено як анімоване зображення. Під час перегляду вони використовують менше ресурсів CPU, ніж відео-прев’ю, але створюються додатково до них і займають більше місця.",
-            "anonymise_database": "Створює копію бази даних у директорії резервних копій (backups), анонімізуючи всі конфіденційні дані. Цю копію можна надати іншим для вирішення проблем та налагодження. Оригінальна база даних не змінюється. Анонімізована база даних використовує формат імені файлу {filename_format}.",
+            "generate_previews_during_scan_tooltip": "Також генерувати анімовані (webp) попередні перегляди. Це потрібно лише тоді, коли тип попереднього перегляду для стіни сцен/позначок встановлено як \"Анімоване зображення\". Під час перегляду вони використовують менше ресурсів ЦП, ніж відео-прев’ю, але створюються додатково до них і займають більше місця.",
+            "anonymise_database": "Створює копію бази даних у каталозі резервних копій, анонімізуючи всі чутливі дані. Цю копію можна надати іншим для діагностики та налагодження. Оригінальна база даних не змінюється. Анонімізована база даних використовує формат імені файлу {filename_format}.",
             "generate_video_previews_during_scan": "Генерувати попередні перегляди",
-            "generate_sprites_during_scan_tooltip": "Набір зображень, що відображаються нижче відеоплеєра для зручної навігації.",
-            "set_name_date_details_from_metadata_if_present": "Встановити ім'я, дату, деталі з вбудованих метаданих файлу",
+            "generate_sprites_during_scan_tooltip": "Набір зображень, що відображаються під відеоплеєром для зручної навігації.",
+            "set_name_date_details_from_metadata_if_present": "Встановити назву, дату та деталі з вбудованих метаданих файлу",
             "anonymise_and_download": "Створює анонімізовану копію бази даних та завантажує отриманий файл.",
             "added_job_to_queue": "Додано {operation_name} до черги завдань",
             "anonymising_database": "Анонімізація бази даних",
-            "auto_tag_based_on_filenames": "Автоматично додавати мітки до контенту на основі шляхів до файлів.",
+            "auto_tag_based_on_filenames": "Автоматично тегувати контент на основі шляхів до файлів.",
             "auto_tag": {
-                "auto_tagging_paths": "Автоматичне додавання міток для наступних шляхів",
-                "auto_tagging_all_paths": "Автоматичне додавання міток для всіх шляхів"
+                "auto_tagging_paths": "Автотегування наступних шляхів",
+                "auto_tagging_all_paths": "Автотегування всіх шляхів"
             },
-            "auto_tagging": "Автоматичне додавання міток",
+            "auto_tagging": "Автотегування",
             "backing_up_database": "Резервне копіювання бази даних",
             "backup_and_download": "Виконує резервне копіювання бази даних і завантажує отриманий файл.",
             "clean_generated": {
-                "description": "Видаляє згенеровані файли без відповідного запису в базі даних.",
-                "blob_files": "Blob файли",
-                "image_thumbnails": "Ескізи зображень",
+                "description": "Видаляє згенеровані файли, які не мають відповідного запису в базі даних.",
+                "blob_files": "Blob-файли",
+                "image_thumbnails": "Мініатюри зображень",
                 "markers": "Попередні перегляди позначок",
-                "image_thumbnails_desc": "Ескізи зображень та кліпи",
+                "image_thumbnails_desc": "Мініатюри зображень та кліпи",
                 "sprites": "Спрайти сцен",
-                "previews_desc": "Попередні перегляди сцен та ескізи",
+                "previews_desc": "Попередні перегляди сцен та мініатюри",
                 "previews": "Попередні перегляди сцен",
-                "transcodes": "Транскодування сцен"
+                "transcodes": "Транскодовані файли сцен"
             },
-            "cleanup_desc": "Перевірте відсутні файли та видаліть їх з бази даних. Це необоротна дія.",
-            "defaults_set": "Параметри за замовчуванням встановлені та будуть використовуватися при натисканні кнопки {action} на сторінці Завдань.",
-            "empty_queue": "Наразі жодне завдання не виконується.",
-            "dont_include_file_extension_as_part_of_the_title": "Не включати розширення файлу як частину заголовка",
+            "cleanup_desc": "Перевірити наявність відсутніх файлів та видалити їх з бази даних. Це необоротна дія.",
+            "defaults_set": "Налаштування за замовчуванням збережено. Вони будуть використані при натисканні кнопки {action} на сторінці завдань.",
+            "empty_queue": "Наразі немає активних завдань.",
+            "dont_include_file_extension_as_part_of_the_title": "Не включати розширення файлу до заголовка",
             "export_to_json": "Експортує вміст бази даних у формат JSON у каталозі метаданих.",
             "generate": {
                 "generating_from_paths": "Генерація для сцен із наступних шляхів",
@@ -469,42 +504,54 @@
             },
             "generate_clip_previews_during_scan": "Генерувати попередній перегляд для кліпів із зображеннями",
             "generate_desc": "Генерувати допоміжні зображення, спрайти, відео, vtt та інші файли.",
-            "generate_phashes_during_scan": "Генерувати перцептуальні геші",
+            "generate_phashes_during_scan": "Генерувати перцептуальні хеші відео",
             "generate_phashes_during_scan_tooltip": "Для дедуплікації та ідентифікації сцен.",
-            "generate_previews_during_scan": "Генерувати анімовані попередні перегляди зображень",
-            "generate_sprites_during_scan": "Генерувати спрайти для скрубера",
+            "generate_previews_during_scan": "Генерувати анімований попередній перегляд зображень",
+            "generate_sprites_during_scan": "Генерувати спрайти для смуги прокрутки",
             "generate_video_covers_during_scan": "Генерувати обкладинки сцен",
             "generate_video_previews_during_scan_tooltip": "Генерувати попередні перегляди відео, які відтворюються при наведенні на сцену",
-            "generate_thumbnails_during_scan": "Генерувати ескізи для зображень",
+            "generate_thumbnails_during_scan": "Генерувати мініатюри для зображень",
             "generated_content": "Згенерований контент",
             "maintenance": "Обслуговування",
-            "incremental_import": "Інкрементальний імпорт з наданого ZIP-файлу експорту.",
-            "import_from_exported_json": "Імпорт з експортованого JSON у каталозі метаданих. Очищає наявну базу даних.",
-            "migrate_hash_files": "Використовується після зміни гешу іменування згенерованих файлів для перейменування існуючих згенерованих файлів у новий формат гешу.",
+            "incremental_import": "Інкрементальний імпорт із наданого ZIP-архіву експорту.",
+            "import_from_exported_json": "Імпорт з експортованого JSON у каталозі метаданих. Повністю очищає існуючу базу даних.",
+            "migrate_hash_files": "Використовується після зміни налаштувань хешування імен файлів для перейменування існуючих файлів у новий формат.",
             "migrate_scene_screenshots": {
-                "description": "Перенесіть скріншоти сцен у нову систему зберігання блобів. Цю міграцію слід виконати після оновлення існуючої системи до версії 0.20. За бажанням можна видалити старі скріншоти після міграції.",
-                "overwrite_existing": "Перезаписати існуючі blobs даними скриншотів",
-                "delete_files": "Видалити файли знімків екрана"
+                "description": "Міграція скріншотів сцен до нової системи зберігання blobs. Слід виконати після оновлення системи до версії 0.20. Опціонально можна видалити старі скріншоти після міграції.",
+                "overwrite_existing": "Перезаписати існуючі blobs даними скріншотів",
+                "delete_files": "Видалити файли скріншотів"
             },
             "migrations": "Міграції",
-            "optimise_database": "Спробувати покращити продуктивність, аналізуючи та потім перебудовуючи весь файл бази даних.",
-            "only_dry_run": "Виконати лише тестовий прогон. Нічого не видаляти.",
-            "optimise_database_warning": "Увага: під час виконання цього завдання будь-які операції, які змінюють базу даних, зазнають невдачі, і залежно від розміру вашої бази даних, це може зайняти кілька хвилин. Також потрібно щонайменше стільки ж вільного місця на диску, скільки займає ваша база даних, але рекомендується мати 1.5x від цього обсягу.",
-            "scan_for_content_desc": "Сканувати на наявність нового контенту та додавати його до бази даних.",
-            "rescan_tooltip": "Пересканувати кожен файл у вказаному шляху. Використовується для примусового оновлення метаданих файлів і пересканування zip-файлів.",
+            "optimise_database": "Спроба покращити продуктивність шляхом аналізу та повної перебудови файлу бази даних.",
+            "only_dry_run": "Виконати лише тестовий запуск (Dry run). Нічого не видаляти",
+            "optimise_database_warning": "Увага: під час виконання цього завдання будь-які операції зміни бази даних будуть недоступні. Це може зайняти кілька хвилин. Необхідно мати вільного місця на диску щонайменше як розмір вашої БД (рекомендовано 1.5x).",
+            "scan_for_content_desc": "Сканувати новий контент та додати його до бази даних.",
+            "rescan_tooltip": "Пересканувати кожен файл у вказаному шляху. Використовується для примусового оновлення метаданих та пересканування ZIP-архівів.",
             "migrate_blobs": {
-                "description": "Мігруйте блоби до поточної системи зберігання блобів. Цю міграцію слід виконати після зміни системи зберігання блобів. За бажанням можна видалити старі дані після міграції.",
+                "description": "Міграція blobs до поточної системи зберігання. Слід виконати після зміни системи зберігання blobs. Опціонально можна видалити старі дані після міграції.",
                 "delete_old": "Видалити старі дані"
             },
-            "backup_database": "Виконує резервне копіювання бази даних у каталог резервних копій із форматом імені файлу {filename_format}",
-            "data_management": "Управління даними",
-            "job_queue": "Черга Завдань",
+            "data_management": "Керування даними",
+            "job_queue": "Черга завдань",
             "scan": {
                 "scanning_all_paths": "Сканування всіх шляхів",
                 "scanning_paths": "Сканування наступних шляхів"
             },
-            "plugin_tasks": "Завдання Плагінів",
-            "rescan": "Пересканувати файли"
+            "plugin_tasks": "Завдання плагінів",
+            "rescan": "Пересканувати файли",
+            "generate_image_phashes_during_scan": "Генерувати перцептуальні хеші зображень",
+            "generate_image_phashes_during_scan_tooltip": "Для дедуплікації та ідентифікації.",
+            "backup_database": {
+                "description": "Виконує резервне копіювання бази даних та BLOB-файлів.",
+                "destination": "Місце призначення",
+                "download": "Завантажити резервну копію",
+                "include_blobs": "Включити блоби до резервної копії",
+                "include_blobs_desc": "Вимкнути, щоб створювати резервну копію лише файлу бази даних SQLite.",
+                "sqlite": "Файл резервної копії буде копією файлу бази даних SQLite з назвою файлу {filename_format}",
+                "to_directory": "До {каталогу}",
+                "warning_blobs": "Blob-файли не будуть включені до резервної копії. Це означає, що для успішного відновлення з резервної копії blob-файли мають бути присутніми в місці сховища blob-об'єктів.",
+                "zip": "Файл бази даних SQLite та blob-файли будуть стиснуті в один файл з назвою {filename_format}"
+            }
         },
         "library": {
             "exclusions": "Виключення",
@@ -513,63 +560,63 @@
         },
         "tools": {
             "scene_filename_parser": {
-                "escape_chars": "Використовуйте \\ для екранування літеральних символів",
+                "escape_chars": "Використовуйте \\ для екранування літералів",
                 "filename": "Ім'я файлу",
                 "whitespace_chars_desc": "Ці символи будуть замінені на пробіли в заголовку",
-                "capitalize_title": "Зробити Заголовок з Великої Літери",
-                "display_fields": "Відображення Полів",
-                "add_field": "Додати Поле",
-                "filename_pattern": "Шаблон Імені Файлу",
+                "capitalize_title": "Заголовок з великої літери",
+                "display_fields": "Відображати поля",
+                "add_field": "Додати поле",
+                "filename_pattern": "Шаблон імені файлу",
                 "ignore_organized": "Ігнорувати впорядковані сцени",
-                "ignored_words": "Проігноровані слова",
-                "whitespace_chars": "Символи Пробілів",
-                "matches_with": "Збіги з {i}",
-                "select_parser_recipe": "Вибрати Рецепт Парсера",
-                "title": "Парсер Імені Файлу Сцени"
+                "ignored_words": "Ігноровані слова",
+                "whitespace_chars": "Символи пробілу",
+                "matches_with": "Збігається з {i}",
+                "select_parser_recipe": "Вибрати рецепт парсера",
+                "title": "Парсер імен файлів сцен"
             },
-            "scene_tools": "Інструменти Сцени",
-            "scene_duplicate_checker": "Перевірка сцен на дублікати",
-            "graphql_playground": "GraphQL ігровий майданчик",
-            "heading": "Начиння"
+            "scene_tools": "Інструменти сцен",
+            "scene_duplicate_checker": "Пошук дублікатів сцен",
+            "graphql_playground": "GraphQL Playground",
+            "heading": "Інструменти"
         },
         "ui": {
             "scene_player": {
                 "options": {
                     "continue_playlist_default": {
-                        "description": "Відтворювати наступну сцену в черзі після завершення відео",
-                        "heading": "Продовжити відтворення плейлиста за замовчуванням"
+                        "description": "Відтворювати наступну сцену в черзі після завершення відео.",
+                        "heading": "Продовжувати плейлист за замовчуванням"
                     },
                     "auto_start_video_on_play_selected": {
-                        "description": "Автоматично запускати відтворення відео сцени при відтворенні з черги, або при відтворенні вибраних чи випадкових сцен зі сторінки Scenes",
-                        "heading": "Автоматично запускати відео при виборі відтворення"
+                        "description": "Автозапуск відео при відтворенні з черги, або при відтворенні обраних чи випадкових сцен.",
+                        "heading": "Автозапуск при відтворенні обраного"
                     },
-                    "disable_mobile_media_auto_rotate": "Вимкнути автоматичне обертання медіа у повноекранному режимі на мобільних пристроях",
-                    "show_ab_loop_controls": "Показувати елементи керування плагіна AB Loop",
+                    "disable_mobile_media_auto_rotate": "Вимкнути автоповорот медіа в повноекранному режимі на мобільних",
+                    "show_ab_loop_controls": "Показувати керування плагіном AB Loop",
                     "vr_tag": {
-                        "description": "Кнопка VR буде відображатися лише для сцен з цією міткою.",
+                        "description": "Кнопка VR відображатиметься лише для сцен із цим тегом.",
                         "heading": "Тег VR"
                     },
-                    "always_start_from_beginning": "Завжди починати відтворення відео з початку",
+                    "always_start_from_beginning": "Завжди починати відео з початку",
                     "enable_chromecast": "Увімкнути Chromecast",
-                    "show_scrubber": "Показати скруббер",
-                    "track_activity": "Увімкнути історію відтворення сцен",
+                    "show_scrubber": "Показати смугу прокрутки",
+                    "track_activity": "Увімкнути історію перегляду сцен",
                     "auto_start_video": "Автозапуск відео",
-                    "show_range_markers": "Виявити Позначки Охоплення"
+                    "show_range_markers": "Показати маркери діапазону"
                 },
-                "heading": "Плеєр сцени"
+                "heading": "Програвач сцени"
             },
             "handy_connection_key": {
-                "description": "Зручний ключ підключення для використання з інтерактивними сценами. Встановлення цього ключа дозволить Stash ділитися інформацією про поточну сцену з handyfeeling.com",
-                "heading": "Ключ з'єднання Handy"
+                "description": "Ключ підключення Handy для інтерактивних сцен. Встановлення цього ключа дозволить Stash ділитися інформацією про поточну сцену з handyfeeling.com.",
+                "heading": "Ключ підключення Handy"
             },
             "scroll_attempts_before_change": {
                 "description": "Кількість спроб прокрутки перед переходом до наступного/попереднього елемента. Застосовується лише для режиму прокрутки Pan Y.",
                 "heading": "Спроби прокрутки перед переходом"
             },
             "custom_locales": {
-                "description": "Замініть окремі рядки локалі. Дивіться https://github.com/stashapp/stash/blob/develop/ui/v2.5/src/locales/en-GB.json для основного списку. Сторінку потрібно перезавантажити, щоб зміни набрали чинності.",
-                "heading": "Користувацька Локалізація",
-                "option_label": "Увімкнено Користувацьку Локалізацію"
+                "description": "Перевизначення окремих рядків локалізації. Див. список за посиланням. Потрібне перезавантаження сторінки.",
+                "heading": "Власна локалізація",
+                "option_label": "Увімкнути власну локалізацію"
             },
             "scene_list": {
                 "options": {
@@ -579,16 +626,16 @@
             },
             "editing": {
                 "max_options_shown": {
-                    "label": "Максимальна кількість елементів для відображення у випадаючих списках"
+                    "label": "Максимальна кількість елементів у випадаючих списках"
                 },
                 "disable_dropdown_create": {
-                    "description": "Видалити можливість створювати нові об'єкти з випадаючих списків",
-                    "heading": "Вимкнути створення через випадаюче меню"
+                    "description": "Вимкнути можливість створювати нові об'єкти з випадаючих списків.",
+                    "heading": "Вимкнути створення у випадаючому списку"
                 },
                 "heading": "Редагування",
                 "rating_system": {
                     "type": {
-                        "label": "Тип Системи Оцінювання",
+                        "label": "Тип системи оцінювання",
                         "options": {
                             "decimal": "Десяткова",
                             "stars": "Зірки"
@@ -596,20 +643,20 @@
                     },
                     "star_precision": {
                         "options": {
-                            "tenth": "0.1",
+                            "tenth": "Десята (0.1)",
                             "half": "Половина",
-                            "full": "Повний",
+                            "full": "Ціла",
                             "quarter": "Чверть"
                         },
-                        "label": "Точність Зірок Оцінки"
+                        "label": "Точність рейтингу (зірки)"
                     }
                 }
             },
             "studio_panel": {
                 "options": {
                     "show_child_studio_content": {
-                        "description": "У перегляді студії відображати контент з підстудій також",
-                        "heading": "Відображати вміст підстудій"
+                        "description": "У перегляді студії відображати контент також з підстудій.",
+                        "heading": "Відображати контент підстудій"
                     }
                 },
                 "heading": "Перегляд студії"
@@ -617,12 +664,12 @@
             "images": {
                 "options": {
                     "create_image_clips_from_videos": {
-                        "heading": "Сканувати відеофайли з розширеннями як кліпи зображень",
-                        "description": "Коли у бібліотеці вимкнено Відео, відеофайли (файли з розширеннями відео) будуть скануватися як кліпи зображень."
+                        "heading": "Сканувати відеофайли як кліпи зображень",
+                        "description": "Коли у бібліотеці вимкнено Відео, відеофайли (файли з відеорозширеннями) будуть скануватися як кліпи зображень."
                     },
                     "write_image_thumbnails": {
-                        "description": "Записувати ескізи зображень на диск під час їх генерації в реальному часі",
-                        "heading": "Записати ескізи зображень"
+                        "description": "Записувати мініатюри зображень на диск при генерації \"на льоту\".",
+                        "heading": "Записувати мініатюри зображень"
                     }
                 },
                 "heading": "Зображення"
@@ -632,80 +679,80 @@
                     "delete_generated_supporting_files": "Видаляти згенеровані допоміжні файли за замовчуванням",
                     "delete_file": "Видаляти файл за замовчуванням"
                 },
-                "description": "Налаштування за замовчуванням при видаленні зображень, галерей та сцен.",
-                "heading": "Видалити Опції"
+                "description": "Налаштування за замовчуванням для видалення зображень, галерей та сцен.",
+                "heading": "Налаштування видалення"
             },
             "funscript_offset": {
-                "description": "Зміщення часу в мілісекундах для відтворення інтерактивних скриптів.",
-                "heading": "Зміщення Funscript (мс)"
+                "description": "Зсув часу в мілісекундах для відтворення інтерактивних скриптів.",
+                "heading": "Зсув Funscript (мс)"
             },
             "abbreviate_counters": {
-                "description": "Скорочувати лічильники на картках і сторінках перегляду деталей, наприклад, \"1831\" буде відформатовано до \"1.8K\".",
-                "heading": "Скоротити Лічильники"
+                "description": "Скорочувати лічильники на картках і в деталях (наприклад, \"1831\" буде показано як \"1.8K\").",
+                "heading": "Скорочувати лічильники"
             },
             "custom_javascript": {
-                "description": "Сторінку потрібно перезавантажити, щоб зміни набрали чинності. Сумісність між власним Javascript і майбутніми версіями Stash не гарантується.",
-                "heading": "Користувацький Javascript",
-                "option_label": "Увімкнено Користувацький Javascript"
+                "description": "Перезавантажте сторінку для застосування змін. Сумісність власного Javascript з майбутніми версіями Stash не гарантується.",
+                "heading": "Власний Javascript",
+                "option_label": "Увімкнути власний Javascript"
             },
             "minimum_play_percent": {
-                "description": "Відсоток часу, який сцена повинна бути відтворена, щоб її кількість переглядів була збільшена.",
+                "description": "Відсоток часу, протягом якого сцена має бути відтворена, щоб лічильник переглядів збільшився.",
                 "heading": "Мінімальний відсоток відтворення"
             },
             "show_tag_card_on_hover": {
-                "description": "Показувати картку мітки при наведенні на бейджі міток",
-                "heading": "Підказки інструменту картки тегів"
+                "description": "Показувати картку тегу при наведенні на значок тегу.",
+                "heading": "Підказки карток тегів"
             },
             "use_stash_hosted_funscript": {
-                "description": "Коли ця опція ввімкнена, funscripts будуть передаватися безпосередньо зі Stash на ваш пристрій Handy без використання стороннього сервера Handy. Це вимагає, щоб Stash був доступний з вашого пристрою Handy, а також щоб було згенеровано API-ключ, якщо для Stash налаштовані облікові дані.",
-                "heading": "Безпосередньо подавати funscripts"
+                "description": "Якщо ввімкнено, funscripts передаватимуться безпосередньо зі Stash на ваш пристрій Handy без використання стороннього сервера Handy. Вимагає, щоб Stash був доступний з вашого пристрою Handy, а також згенерованого API-ключа, якщо у Stash налаштована авторизація.",
+                "heading": "Роздавати funscripts напряму"
             },
             "slideshow_delay": {
-                "description": "Слайдшоу доступне в галереях під час перегляду в режимі стіни",
-                "heading": "Затримка слайд-шоу (секунди)"
+                "description": "Слайд-шоу доступне в галереях у режимі перегляду стіни.",
+                "heading": "Затримка слайд-шоу (сек)"
             },
             "custom_css": {
-                "description": "Сторінку потрібно перезавантажити, щоб зміни набрали чинності. Сумісність між власним CSS і майбутніми версіями Stash не гарантується.",
-                "heading": "Користувацький CSS",
-                "option_label": "Увімкнено Користувацький CSS"
+                "description": "Перезавантажте сторінку для застосування змін. Сумісність власного CSS з майбутніми версіями Stash не гарантується.",
+                "heading": "Власний CSS",
+                "option_label": "Увімкнути власний CSS"
             },
             "desktop_integration": {
-                "send_desktop_notifications_for_events": "Надсилати сповіщення на робочий стіл про події",
-                "skip_opening_browser_on_startup": "Пропустити автоматичне відкриття браузера під час запуску",
-                "desktop_integration": "Інтеграція з Робочим Столом",
-                "notifications_enabled": "Увімкнути Сповіщення",
-                "skip_opening_browser": "Пропустити Відкриття Браузера"
+                "send_desktop_notifications_for_events": "Надсилати сповіщення на робочий стіл про події.",
+                "skip_opening_browser_on_startup": "Не відкривати браузер автоматично під час запуску.",
+                "desktop_integration": "Інтеграція з робочим столом",
+                "notifications_enabled": "Увімкнути сповіщення",
+                "skip_opening_browser": "Не відкривати браузер"
             },
             "menu_items": {
-                "description": "Показати або приховати різні типи контенту на панелі навігації",
+                "description": "Показати або приховати різні типи контенту на панелі навігації.",
                 "heading": "Пункти меню"
             },
             "tag_panel": {
                 "options": {
                     "show_child_tagged_content": {
-                        "description": "У перегляді міток відображати контент з підміток також",
-                        "heading": "Відображати вміст підтега"
+                        "description": "У перегляді тегів відображати контент також з підтегів.",
+                        "heading": "Відображати контент підтегів"
                     }
                 },
                 "heading": "Перегляд тегів"
             },
             "detail": {
                 "show_all_details": {
-                    "description": "Якщо увімкнено, всі деталі контенту будуть відображатися за замовчуванням, і кожен елемент деталей буде поміщатися в один стовпець",
+                    "description": "Якщо увімкнено, всі деталі контенту будуть показані за замовчуванням в одну колонку.",
                     "heading": "Показати всі деталі"
                 },
                 "compact_expanded_details": {
-                    "description": "При увімкненні ця опція відображатиме розширені деталі, зберігаючи компактне представлення",
-                    "heading": "Компактні розгорнуті деталі"
+                    "description": "Якщо увімкнено, розширені деталі будуть відображатися в компактному вигляді.",
+                    "heading": "Компактні розширені деталі"
                 },
                 "enable_background_image": {
                     "description": "Відображати фонове зображення на сторінці деталей.",
                     "heading": "Увімкнути фонове зображення"
                 },
-                "heading": "Сторінка Деталей"
+                "heading": "Сторінка деталей"
             },
             "preview_type": {
-                "description": "За замовчуванням використовуються відео-прев’ю (mp4). Для меншого навантаження на CPU під час перегляду можна використовувати анімовані зображення (webp) як прев’ю. Однак їх потрібно генерувати додатково до відео-прев’ю, і вони займають більше місця на диску.",
+                "description": "За замовчуванням використовуються відео (mp4). Для зменшення навантаження на ЦП можна використовувати анімовані зображення (webp). Однак їх потрібно генерувати додатково, і вони займають більше місця.",
                 "options": {
                     "animated": "Анімоване зображення",
                     "static": "Статичне зображення",
@@ -714,14 +761,14 @@
                 "heading": "Тип попереднього перегляду"
             },
             "max_loop_duration": {
-                "description": "Максимальна тривалість сцени, за якої програвач сцени буде зациклювати відео – 0 для вимкнення",
-                "heading": "Максимальна тривалість повторюваного сегмента"
+                "description": "Максимальна тривалість сцени, яку програвач буде зациклювати. 0 — вимкнути.",
+                "heading": "Макс. тривалість зациклення"
             },
             "performers": {
                 "options": {
                     "image_location": {
-                        "description": "Користувацький шлях для зображень виконавців за замовчуванням. Залиште порожнім, щоб використовувати вбудовані значення за замовчуванням",
-                        "heading": "Користувацький шлях до зображення виконавця"
+                        "description": "Власний шлях для зображень виконавців за замовчуванням. Залиште порожнім, щоб використовувати вбудовані.",
+                        "heading": "Власний шлях до зображень виконавців"
                     }
                 }
             },
@@ -731,16 +778,16 @@
             "image_wall": {
                 "direction": "Напрямок",
                 "heading": "Стіна зображень",
-                "margin": "Поле (пікселі)"
+                "margin": "Відступ (пікселі)"
             },
-            "interactive_options": "Інтерактивні Опції",
+            "interactive_options": "Інтерактивні опції",
             "language": {
                 "heading": "Мова"
             },
-            "basic_settings": "Основні Налаштування",
+            "basic_settings": "Основні налаштування",
             "handy_connection": {
                 "server_offset": {
-                    "heading": "Зміщення сервера"
+                    "heading": "Зсув сервера"
                 },
                 "connect": "Підключити",
                 "status": {
@@ -749,20 +796,42 @@
                 "sync": "Синхронізувати"
             },
             "scene_wall": {
-                "heading": "Стіна Сцен / Маркерів",
+                "heading": "Стіна сцен / маркерів",
                 "options": {
-                    "display_title": "Відображати заголовок та теги",
+                    "display_title": "Відображати заголовок і теги",
                     "toggle_sound": "Увімкнути звук"
                 }
             },
-            "title": "Користувацький інтерфейс",
+            "title": "Інтерфейс користувача",
             "performer_list": {
-                "heading": "Перелік виконавців",
+                "heading": "Список виконавців",
                 "options": {
                     "show_links_on_grid_card": {
-                        "heading": "Відображати посилання на картки виконавців"
+                        "heading": "Відображати посилання на картках виконавців"
                     }
                 }
+            },
+            "custom_title": {
+                "description": "Власний текст для заголовка сторінки. Якщо порожньо, використовується 'Stash'.",
+                "heading": "Власний заголовок"
+            },
+            "sfw_mode": {
+                "description": "Увімкніть, якщо використовуєте Stash для SFW-контенту. Приховує або змінює деякі аспекти інтерфейсу, пов'язані з дорослим контентом.",
+                "heading": "Режим SFW-контенту"
+            },
+            "troubleshooting_mode": {
+                "button": "Режим діагностики",
+                "dialog_title": "Увімкнути режим діагностики",
+                "dialog_description": "Це тимчасово вимкне всі власні налаштування, щоб допомогти діагностувати проблеми:",
+                "dialog_item_plugins": "Всі плагіни",
+                "dialog_item_css": "Власний CSS",
+                "dialog_item_js": "Власний JavaScript",
+                "dialog_item_locales": "Власна локалізація",
+                "dialog_log_level": "Рівень журналу буде встановлено на Debug для детальної діагностики.",
+                "dialog_reload_note": "Сторінка автоматично перезавантажиться.",
+                "enable": "Увімкнути та перезавантажити",
+                "overlay_message": "Режим діагностики активний — всі власні налаштування вимкнено",
+                "exit": "Вийти"
             }
         },
         "plugins": {
@@ -775,7 +844,7 @@
             "log_level": "Рівень журналу"
         },
         "scraping": {
-            "excluded_tag_patterns_desc": "Регулярні вирази імен тегів для виключення з результатів збирання даних",
+            "excluded_tag_patterns_desc": "Регулярні вирази імен тегів для виключення з результатів збирання даних.",
             "available_scrapers": "Доступні сканери",
             "entity_metadata": "Метадані {entityType}",
             "entity_scrapers": "Сканери {entityType}",
@@ -802,10 +871,13 @@
             "transcoding": "Транскодування"
         },
         "application_paths": {
-            "heading": "Шляхи до програм"
+            "heading": "Шляхи до застосунків"
+        },
+        "changelog": {
+            "header": "Список змін"
         }
     },
-    "video_codec": "Відео кодек",
+    "video_codec": "Відеокодек",
     "videos": "Відео",
     "weight": "Вага",
     "average_resolution": "Середня роздільна здатність",
@@ -816,29 +888,33 @@
         "database": "База даних",
         "filesystem": "Файлова система"
     },
-    "captions": "Заголовки",
-    "sub_tag_of": "Вкладені мітки {parent}",
+    "captions": "Субтитри",
+    "sub_tag_of": "Підтег для {parent}",
     "dupe_check": {
         "options": {
-            "exact": "Точний",
+            "exact": "Точна",
             "high": "Висока",
             "low": "Низька",
-            "medium": "Середнє"
+            "medium": "Середня"
         },
         "only_select_matching_codecs": "Вибирати тільки якщо всі кодеки збігаються в групі дублікатів",
-        "select_oldest": "Виберіть найстарший файл у групі дублікатів",
-        "description": "Рівні нижче 'Exact' можуть вимагати більше часу для обчислення. На рівнях з нижчою точністю також можуть виникати хибні спрацьовування.",
-        "found_sets": "{setCount, plural, one{Знайдений # набір дублікатів.} other {Знайдено # наборів дублікатів.}}",
-        "select_all_but_largest_resolution": "Виберіть кожен файл у кожній групі дублікатів, крім файлу з найвищою роздільною здатністю",
-        "select_youngest": "Виберіть найновіший файл у групі дублікатів",
+        "select_oldest": "Вибрати найстаріший файл у групі дублікатів",
+        "description": "Рівні нижче \"Точна\" можуть вимагати більше часу для обчислення. На рівнях з нижчою точністю також можуть виникати хибні збіги.",
+        "found_sets": "{setCount, plural, one{Знайдено # набір дублікатів.} other {Знайдено # наборів дублікатів.}}",
+        "select_all_but_largest_resolution": "Вибрати всі файли в кожній групі дублікатів, крім файлу з найвищою роздільною здатністю",
+        "select_youngest": "Вибрати найновіший файл у групі дублікатів",
         "select_all_but_largest_file": "Вибрати всі файли в кожній групі дублікатів, крім найбільшого файлу",
         "select_options": "Опції вибору…",
-        "select_none": "Зняти вибір",
-        "duration_diff": "Максимальна різниця в тривалості",
+        "select_none": "Зняти виділення",
+        "duration_diff": "Максимальна різниця тривалості",
         "search_accuracy_label": "Точність пошуку",
-        "title": "Дубльовані сцени"
+        "title": "Дублікати сцен",
+        "duration_options": {
+            "any": "Будь-яка",
+            "equal": "Однакова"
+        }
     },
-    "sub_tags": "Вкладені мітки",
+    "sub_tags": "Підтеги",
     "package_manager": {
         "uninstall": "Видалити",
         "description": "Опис",
@@ -850,19 +926,28 @@
         "source": {
             "name": "Назва",
             "local_path": {
-                "description": "Відносний шлях для зберігання пакетів для цього джерела. Зверніть увагу, що зміна цього параметра вимагає ручного переміщення пакетів."
-            }
+                "description": "Відносний шлях для зберігання пакунків для цього джерела. Зверніть увагу, що зміна цього параметра вимагає переміщення пакунків вручну.",
+                "heading": "Локальний шлях"
+            },
+            "url": "URL джерела"
         },
         "confirm_uninstall": "Ви впевнені, що хочете видалити {number} пакунків?",
         "confirm_delete_source": "Ви впевнені, що хочете видалити джерело {name} ({url})?",
-        "no_upgradable": "Не знайдено пакунків для оновлення",
+        "no_upgradable": "Пакунків для оновлення не знайдено",
         "no_packages": "Пакунків не знайдено",
         "no_sources": "Джерела не налаштовані",
-        "required_by": "Необхідно для {packages}",
-        "check_for_updates": "Перевірити наявність оновлень"
+        "required_by": "Вимагається для {packages}",
+        "check_for_updates": "Перевірити наявність оновлень",
+        "add_source": "Додати джерело",
+        "edit_source": "Редагувати джерело",
+        "hide_unselected": "Приховати невибрані",
+        "installed_version": "Встановлена версія",
+        "latest_version": "Остання версія",
+        "selected_only": "Лише вибрані",
+        "show_all": "Показати всі"
     },
     "effect_filters": {
-        "name_transforms": "Перетворення",
+        "name_transforms": "Трансформації",
         "red": "Червоний",
         "rotate": "Поворот",
         "hue": "Відтінок",
@@ -873,27 +958,28 @@
         "blur": "Розмиття",
         "brightness": "Яскравість",
         "contrast": "Контраст",
-        "gamma": "Гамма",
+        "gamma": "Гама",
         "green": "Зелений",
         "blue": "Синій",
         "rotate_left_and_scale": "Повернути ліворуч і масштабувати",
         "rotate_right_and_scale": "Повернути праворуч і масштабувати",
         "reset_filters": "Скинути фільтри",
-        "reset_transforms": "Скинути трансформації"
+        "reset_transforms": "Скинути трансформації",
+        "aspect": "Пропорції"
     },
     "duration": "Тривалість",
     "errors": {
         "header": "Помилка",
-        "image_index_greater_than_zero": "Індекс зображення має бути більшим за 0",
-        "lazy_component_error_help": "Якщо ви нещодавно оновили Stash, будь ласка, перезавантажте сторінку або очистіть кеш браузера.",
+        "image_index_greater_than_zero": "Індекс зображення має бути більше 0",
+        "lazy_component_error_help": "Якщо ви нещодавно оновили Stash, перезавантажте сторінку або очистіть кеш браузера.",
         "custom_fields": {
-            "field_name_whitespace": "Назва поля не може містити пробіли на початку або в кінці",
-            "field_name_required": "Назва поля є обов'язковою",
-            "field_name_length": "Назва поля повинна містити менше ніж 65 символів",
-            "duplicate_field": "Назва поля повинна бути унікальною"
+            "field_name_whitespace": "Назва поля не може мати пробіли на початку або в кінці",
+            "field_name_required": "Назва поля обов'язкова",
+            "field_name_length": "Назва поля має містити менше 65 символів",
+            "duplicate_field": "Назва поля має бути унікальною"
         },
-        "invalid_javascript_string": "Невірний код JavaScript: {error}",
-        "invalid_json_string": "Невірний рядок JSON: {error}",
+        "invalid_javascript_string": "Недійсний код Javascript: {error}",
+        "invalid_json_string": "Недійсний рядок JSON: {error}",
         "loading_type": "Помилка завантаження {type}",
         "something_went_wrong": "Щось пішло не так."
     },
@@ -904,51 +990,66 @@
         "last": "Остання",
         "current_total": "{current} з {total}"
     },
-    "ethnicity": "Етнічність",
+    "ethnicity": "Етнічна приналежність",
     "false": "Ні",
     "favourite": "Улюблене",
     "file": "файл",
     "files": "файли",
-    "filter": "Фільтрувати",
+    "filter": "Фільтр",
     "filters": "Фільтри",
-    "folder": "Тека",
+    "folder": "Папка",
     "galleries": "Галереї",
     "gallery": "Галерея",
     "gender": "Стать",
     "gender_types": {
         "FEMALE": "Жіноча",
         "MALE": "Чоловіча",
-        "INTERSEX": "Інтерсекс"
+        "INTERSEX": "Інтерсекс",
+        "NON_BINARY": "Небінарна",
+        "TRANSGENDER_FEMALE": "Транс-жінка",
+        "TRANSGENDER_MALE": "Транс-чоловік"
     },
     "groups": "Групи",
     "handy_connection_status": {
         "connecting": "Підключення",
-        "disconnected": "Роз'єднано",
+        "disconnected": "Відключено",
         "ready": "Готово",
         "error": "Помилка підключення до Handy",
-        "syncing": "Синхронізація з сервером"
+        "syncing": "Синхронізація з сервером",
+        "missing": "Відсутній",
+        "uploading": "Завантаження скрипту"
     },
     "height": "Зріст",
     "help": "Допомога",
     "history": "Історія",
     "images": "Зображення",
-    "interactive": "Інтерактивне",
+    "interactive": "Інтерактив",
     "library": "Бібліотека",
     "markers": "Позначки",
-    "measurements": "Виміри",
+    "measurements": "Параметри",
     "media_info": {
-        "phash": "PHash",
+        "phash": "Перцептивний хеш",
         "stream": "Потік",
-        "checksum": "Контрольна сума",
-        "hash": "Геш",
         "performer_card": {
-            "age_context": "{age} {years_old} у цій сцені"
-        }
+            "age_context": "{age} {years_old} на момент зйомок",
+            "age": "{age} {years_old}"
+        },
+        "audio_codec": "Аудіокодек",
+        "downloaded_from": "Завантажено з",
+        "interactive_speed": "Швидкість інтерактиву",
+        "o_count": "Кількість оргазмів",
+        "play_count": "Кількість переглядів",
+        "play_duration": "Тривалість відтворення",
+        "video_codec": "Відеокодек",
+        "md5": "Контрольна сума MD5",
+        "phash_meaning": "Перцептивний хеш",
+        "oshash_meaning": "Хеш OpenSubtitles",
+        "oshash": "Хеш OSHash"
     },
     "metadata": "Метадані",
-    "new": "Нове",
-    "name": "Імʼя",
-    "none": "Відсутньо",
+    "new": "Новий",
+    "name": "Ім'я",
+    "none": "Нічого",
     "operations": "Операції",
     "orientation": "Орієнтація",
     "path": "Шлях",
@@ -963,50 +1064,45 @@
     "scenes": "Сцени",
     "statistics": "Статистика",
     "studio_tagger": {
-        "tag_status": "Статус мітки",
+        "tag_status": "Статус тегу",
         "update_studios": "Оновити студії",
         "update_studio": "Оновити студію",
-        "to_use_the_studio_tagger": "Для використання тегера студій необхідно налаштувати екземпляр stash-box.",
-        "any_names_entered_will_be_queried": "Будь-які введені імена будуть запитані з віддаленого екземпляра Stash-Box і додані, якщо знайдено. Будуть враховуватися лише точні збіги.",
+        "to_use_the_studio_tagger": "Для використання тегера студій необхідно налаштувати екземпляр Stash-Box.",
+        "any_names_entered_will_be_queried": "Будь-які введені імена будуть запитані у віддаленому екземплярі Stash-Box і додані, якщо знайдені. Враховуються лише точні збіги.",
         "config": {
-            "create_parent_desc": "Створити відсутні батьківські студії або позначити та оновити дані/зображення для існуючих батьківських студій з точним збігом імен",
-            "these_fields_will_not_be_changed_when_updating_studios": "Ці поля не будуть змінені під час оновлення студій.",
-            "no_instances_found": "Інстанцій не знайдено",
-            "no_fields_are_excluded": "Жодне поле не виключено",
-            "excluded_fields": "Виключені поля:",
-            "edit_excluded_fields": "Редагувати виключені поля",
-            "create_parent_label": "Створити батьківські студії",
-            "active_stash-box_instance": "Активний екземпляр stash-box:"
+            "create_parent_desc": "Створити відсутні батьківські студії або тегувати та оновити дані/зображення для існуючих при повному збігу імен",
+            "create_parent_label": "Створити батьківські студії"
         },
-        "updating_untagged_studios_description": "Оновлення невідмічених студій спробує знайти відповідність для студій без stashid і оновити метадані.",
-        "refreshing_will_update_the_data": "Оновлення оновить дані будь-яких студій, позначених мітками, з екземпляра stash-box.",
-        "create_or_tag_parent_studios": "Створити відсутні або позначити існуючі батьківські студії",
+        "updating_untagged_studios_description": "Оновлення спробує знайти відповідність для студій без StashID та оновити їх метадані.",
+        "refreshing_will_update_the_data": "Оновлення оновить дані будь-яких тегованих студій з екземпляра Stash-Box.",
+        "create_or_tag_parent_studios": "Створити відсутні або тегувати існуючі батьківські студії",
         "failed_to_save_studio": "Не вдалося зберегти студію \"{studio}\"",
-        "number_of_studios_will_be_processed": "Будуть оброблені {studio_count} студії",
+        "number_of_studios_will_be_processed": "Буде оброблено {studio_count} студій",
         "query_all_studios_in_the_database": "Усі студії в базі даних",
         "add_new_studios": "Додати нові студії",
         "name_already_exists": "Ім'я вже існує",
-        "refresh_tagged_studios": "Оновити затеговані студії",
-        "studio_successfully_tagged": "Студію успішно затеговано",
+        "refresh_tagged_studios": "Оновити теговані студії",
+        "studio_successfully_tagged": "Студію успішно теговано",
         "network_error": "Помилка мережі",
         "current_page": "Поточна сторінка",
-        "untagged_studios": "Не затеговані студії",
+        "untagged_studios": "Нетеговані студії",
         "studio_selection": "Вибір студії",
-        "studio_already_tagged": "Студія вже затегована",
+        "studio_already_tagged": "Студія вже має тег",
         "batch_update_studios": "Пакетне оновлення студій",
         "batch_add_studios": "Пакетне додавання студій",
         "status_tagging_studios": "Статус: Тегування студій",
-        "status_tagging_job_queued": "Статус: Завдання тегування додано до черги",
-        "no_results_found": "Результатів не знайдено."
+        "status_tagging_job_queued": "Статус: Завдання тегування в черзі",
+        "no_results_found": "Результатів не знайдено.",
+        "studio_names_or_stashids_separated_by_comma": "Назви студій або StashID, розділені комами"
     },
-    "sub_tag_count": "Кількість вкладених міток",
+    "sub_tag_count": "Кількість підтегів",
     "studios": "Студії",
-    "studio_tags": "Мітки студії",
+    "studio_tags": "Теги студії",
     "time": "Час",
     "title": "Заголовок",
-    "tag_sub_tag_tooltip": "Має вкладені мітки",
+    "tag_sub_tag_tooltip": "Має підтеги",
     "tattoos": "Татуювання",
-    "tags": "Мітки",
+    "tags": "Теги",
     "group": "Група",
     "image": "Зображення",
     "loading": {
@@ -1014,22 +1110,14 @@
         "plugins": "Завантаження плагінів…"
     },
     "performer_tagger": {
-        "status_tagging_job_queued": "Статус: Задача проставлення міток в черзі",
-        "number_of_performers_will_be_processed": "Будуть оброблені {performer_count} виконавців",
-        "any_names_entered_will_be_queried": "Будь-які введені імена будуть запитані з віддаленого екземпляра Stash-Box і додані, якщо знайдено. Будуть враховуватися лише точні збіги.",
-        "config": {
-            "these_fields_will_not_be_changed_when_updating_performers": "Ці поля не будуть змінені під час оновлення виконавців.",
-            "active_stash-box_instance": "Активний екземпляр stash-box:",
-            "edit_excluded_fields": "Редагувати виключені поля",
-            "excluded_fields": "Виключені поля:",
-            "no_instances_found": "Екземпляри не знайдено",
-            "no_fields_are_excluded": "Жодне поле не виключено"
-        },
+        "status_tagging_job_queued": "Статус: Завдання тегування в черзі",
+        "number_of_performers_will_be_processed": "Буде оброблено {performer_count} виконавців",
+        "any_names_entered_will_be_queried": "Будь-які введені імена будуть запитані у віддаленому екземплярі Stash-Box і додані, якщо знайдені. Враховуються лише точні збіги.",
         "failed_to_save_performer": "Не вдалося зберегти виконавця \"{performer}\"",
-        "refreshing_will_update_the_data": "Оновлення оновить дані будь-яких виконавців, позначених мітками, з екземпляра stash-box.",
+        "refreshing_will_update_the_data": "Оновлення оновить дані будь-яких тегованих виконавців з екземпляра Stash-Box.",
         "query_all_performers_in_the_database": "Усі виконавці в базі даних",
-        "updating_untagged_performers_description": "Оновлення невідмічених виконавців спробує знайти відповідність для виконавців без stashid і оновити метадані.",
-        "to_use_the_performer_tagger": "Для використання тегера виконавців необхідно налаштувати екземпляр stash-box.",
+        "updating_untagged_performers_description": "Оновлення спробує знайти відповідність для виконавців без StashID та оновити їх метадані.",
+        "to_use_the_performer_tagger": "Для використання тегера виконавців необхідно налаштувати екземпляр Stash-Box.",
         "update_performers": "Оновити виконавців",
         "add_new_performers": "Додати нових виконавців",
         "batch_update_performers": "Пакетне оновлення виконавців",
@@ -1039,13 +1127,14 @@
         "network_error": "Помилка мережі",
         "no_results_found": "Результатів не знайдено.",
         "performer_selection": "Вибір виконавця",
-        "refresh_tagged_performers": "Оновити затегованих виконавців",
-        "tag_status": "Статус тегування",
+        "refresh_tagged_performers": "Оновити тегованих виконавців",
+        "tag_status": "Статус тегу",
         "status_tagging_performers": "Статус: Тегування виконавців",
         "update_performer": "Оновити виконавця",
-        "untagged_performers": "Не затеговані виконавці",
-        "performer_successfully_tagged": "Виконавець успішно затегований:",
-        "performer_already_tagged": "Виконавець вже затегований"
+        "untagged_performers": "Нетеговані виконавці",
+        "performer_successfully_tagged": "Виконавця успішно теговано:",
+        "performer_already_tagged": "Виконавець вже має тег",
+        "performer_names_or_stashids_separated_by_comma": "Імена виконавців або StashID, розділені комою"
     },
     "resolution": "Роздільна здатність",
     "scene": "Сцена",
@@ -1053,69 +1142,75 @@
         "name": "Фільтр",
         "saved_filters": "Збережені фільтри",
         "edit_filter": "Редагувати фільтр",
-        "update_filter": "Оновити фільтр"
+        "update_filter": "Оновити фільтр",
+        "search_term": "Пошуковий запит",
+        "more_filter_criteria": "ще +{count}"
     },
     "studio": "Студія",
     "total": "Всього",
     "true": "Так",
     "twitter": "Twitter",
     "type": "Тип",
-    "url": "Посилання",
-    "urls": "Посилання",
-    "sub_groups": "Вкладені групи",
-    "tag_parent_tooltip": "Має батьківські мітки",
-    "tag_count": "Кількість міток",
+    "url": "URL",
+    "urls": "URL-адреси",
+    "sub_groups": "Підгрупи",
+    "tag_parent_tooltip": "Має батьківські теги",
+    "tag_count": "Кількість тегів",
     "instagram": "Instagram",
-    "sub_group": "Вкладена група",
+    "sub_group": "Підгрупа",
     "criterion_modifier_values": {
         "only": "Лише",
-        "any": "Будь яке",
+        "any": "Будь-яке",
         "none": "Жодного",
         "any_of": "Будь-який з"
     },
     "second": "Секунда",
     "seconds": "Секунди",
     "settings": "Налаштування",
-    "tag": "Мітка",
+    "tag": "Тег",
     "synopsis": "Синопсис",
     "dialogs": {
         "delete_gallery_files": "Видалити папку галереї/zip-файл та всі зображення, які не прив'язані до жодної іншої галереї.",
         "scene_gen": {
-            "marker_image_previews_tooltip": "Також створюйте анімовані (webp) прев’ю, які необхідні лише тоді, коли тип прев’ю для стіни сцен/маркерів встановлено на Анімоване зображення. Під час перегляду вони споживають менше ресурсів CPU, ніж відео-прев’ю, але генеруються додатково до них і займають більше місця на диску.",
-            "transcodes_tooltip": "MP4-транскоди будуть попередньо згенеровані для всього контенту; корисно для повільних процесорів, але вимагає набагато більше дискового простору",
-            "preview_preset_desc": "Пресет регулює розмір, якість і час кодування під час створення попереднього перегляду. Пресети, повільніші за «slow», мають зменшену віддачу і не рекомендуються.",
-            "override_preview_generation_options_desc": "Перевизначити параметри генерації попереднього перегляду для цієї операції. Параметри за замовчуванням встановлені в Система -> Генерація попереднього перегляду.",
+            "marker_image_previews_tooltip": "Також генерувати анімовані (webp) попередні перегляди. Потрібно, лише якщо тип перегляду для стіни встановлено на \"Анімоване зображення\". Використовують менше ЦП, але займають більше місця.",
+            "transcodes_tooltip": "MP4-транскодування будуть попередньо згенеровані для всього контенту; корисно для повільних ЦП, але потребує значно більше місця на диску",
+            "preview_preset_desc": "Шаблон регулює розмір, якість та час кодування генерації попереднього перегляду. Шаблони повільніші за \"slow\" не рекомендуються через низьку ефективність.",
+            "override_preview_generation_options_desc": "Перевизначити параметри генерації попереднього перегляду для цієї операції. Стандартні налаштування знаходяться в Система -> Генерація попереднього перегляду.",
             "phash_tooltip": "Для дедуплікації та ідентифікації сцен",
-            "preview_seg_duration_desc": "Тривалість кожного сегмента попереднього перегляду, у секундах.",
-            "video_previews_tooltip": "Попередні перегляди відео, які відтворюються при наведенні на сцену",
-            "markers": "Попередні перегляди позначок",
-            "preview_exclude_start_time_desc": "Виключити перші x секунд із попереднього перегляду сцени. Це може бути значення в секундах або відсоток (наприклад, 2%) від загальної тривалості сцени.",
-            "image_previews_tooltip": "Також генеруйте анімовані (webp) прев’ю, які потрібні лише в тому випадку, якщо тип прев’ю для стіни сцен/маркерів встановлено як Анімоване зображення. Під час перегляду вони споживають менше ресурсів CPU, ніж відео-прев’ю, але створюються додатково до них і займають більше місця.",
-            "force_transcodes_tooltip": "За замовчуванням перекодування створюються лише тоді, коли відеофайл не підтримується браузером. Якщо цю опцію увімкнено, перекодування будуть створюватися навіть тоді, коли відеофайл, здається, підтримується браузером.",
-            "interactive_heatmap_speed": "Генерувати теплові карти та швидкості для інтерактивних сцен",
-            "preview_exclude_end_time_desc": "Виключити останні x секунд із попереднього перегляду сцени. Це може бути значення в секундах або відсоток (наприклад, 2%) від загальної тривалості сцени.",
+            "preview_seg_duration_desc": "Тривалість кожного сегмента попереднього перегляду в секундах.",
+            "video_previews_tooltip": "Відео-прев'ю, що відтворюються при наведенні на сцену",
+            "markers": "Попередні перегляди маркерів",
+            "preview_exclude_start_time_desc": "Виключити перші X секунд із попереднього перегляду сцени. Це може бути значення в секундах або відсоток (наприклад, 2%) від загальної тривалості.",
+            "image_previews_tooltip": "Також генерувати анімовані (webp) попередні перегляди. Потрібно, лише якщо тип перегляду для стіни встановлено на \"Анімоване зображення\". Вони використовують менше ЦП при перегляді, але генеруються додатково і займають більше місця.",
+            "force_transcodes_tooltip": "За замовчуванням транскодування відбувається лише тоді, коли відеофайл не підтримується браузером. Якщо увімкнено, транскодування відбуватиметься навіть якщо файл начебто підтримується.",
+            "interactive_heatmap_speed": "Генерувати теплові карти та швидкість для інтерактивних сцен",
+            "preview_exclude_end_time_desc": "Виключити останні X секунд із попереднього перегляду сцени. Це може бути значення в секундах або відсоток (наприклад, 2%) від загальної тривалості.",
             "preview_seg_count_desc": "Кількість сегментів у файлах попереднього перегляду.",
-            "markers_tooltip": "20-секундні відео, які починаються з вказаного таймкоду.",
-            "sprites_tooltip": "Набір зображень, що відображаються під відеоплеєром для зручної навігації.",
+            "markers_tooltip": "20-секундні відео, що починаються з вказаного таймкоду.",
+            "sprites_tooltip": "Набір зображень під відеоплеєром для зручної навігації.",
             "preview_seg_count_head": "Кількість сегментів у попередньому перегляді",
-            "override_preview_generation_options": "Перезаписати параметри генерації попереднього перегляду",
-            "phash": "Перцептивні геші",
-            "marker_screenshots_tooltip": "Статичні зображення маркерів у форматі JPG",
-            "preview_exclude_start_time_head": "Виключити час початку",
+            "override_preview_generation_options": "Перевизначити параметри генерації перегляду",
+            "phash": "Перцептуальні хеші відео",
+            "marker_screenshots_tooltip": "Статичні JPG зображення маркерів",
+            "preview_exclude_start_time_head": "Виключити час на початку",
             "preview_seg_duration_head": "Тривалість сегмента попереднього перегляду",
-            "sprites": "Спрайти скрубера сцени",
+            "sprites": "Спрайти смуги прокрутки",
             "overwrite": "Перезаписати існуючі файли",
             "covers": "Обкладинки сцен",
-            "preview_options": "Параметри попереднього перегляду",
-            "image_thumbnails": "Ескізи зображень",
-            "marker_image_previews": "Попередні перегляди анімованих зображень маркерів",
-            "clip_previews": "Попередні перегляди вирізів зображень",
+            "preview_options": "Параметри перегляду",
+            "image_thumbnails": "Мініатюри зображень",
+            "marker_image_previews": "Анімовані попередні перегляди маркерів",
+            "clip_previews": "Попередні перегляди кліпів зображень",
             "force_transcodes": "Примусова генерація транскодування",
             "image_previews": "Попередні перегляди анімованих зображень",
-            "preview_exclude_end_time_head": "Виключити час завершення",
+            "preview_exclude_end_time_head": "Виключити час у кінці",
             "preview_generation_options": "Параметри генерації попереднього перегляду",
-            "preview_preset_head": "Налаштування попереднього перегляду кодування",
-            "marker_screenshots": "Знімки екрана маркерів"
+            "preview_preset_head": "Шаблон кодування попереднього перегляду",
+            "marker_screenshots": "Скріншоти маркерів",
+            "transcodes": "Транскодування",
+            "video_previews": "Попередні перегляди",
+            "image_phash": "Перцептуальні хеші зображень",
+            "image_phash_tooltip": "Для дедуплікації та ідентифікації"
         },
         "delete_entity_simple_desc": "{count, plural, one {Ви впевнені, що хочете видалити цей {singularEntity}?} other {Ви впевнені, що хочете видалити ці {pluralEntity}?}}",
         "delete_object_desc": "Ви впевнені, що хочете видалити {count, plural, one {цей {singularEntity}} other {ці {pluralEntity}}}?",
@@ -1123,135 +1218,160 @@
         "delete_galleries_extra": "…плюс будь-які зображення, які не прикріплені до жодної іншої галереї.",
         "clear_play_history_confirm": "Ви впевнені, що хочете очистити історію переглядів?",
         "edit_entity_title": "Редагувати {count, plural, one {{singularEntity}} other {{pluralEntity}}}",
-        "export_include_related_objects": "Включати пов'язані об'єкти в експорт",
+        "export_include_related_objects": "Включити пов'язані об'єкти в експорт",
         "imagewall": {
             "margin_desc": "Кількість пікселів відступу навколо кожного зображення.",
             "direction": {
-                "description": "Макет на основі стовпців або рядків."
+                "description": "Макет на основі стовпців або рядків.",
+                "column": "Стовпець",
+                "row": "Рядок"
             }
         },
         "lightbox": {
             "scale_up": {
-                "description": "Масштабувати менші зображення для заповнення екрана",
-                "label": "Масштабувати для відповідності"
+                "description": "Масштабувати менші зображення для заповнення екрана.",
+                "label": "Збільшити, щоб вписати"
             },
             "scroll_mode": {
-                "description": "Утримуйте Shift, щоб тимчасово використовувати інший режим.",
-                "label": "Режим прокручування",
-                "pan_y": "Нахил по осі Y"
+                "description": "Утримуйте Shift, щоб тимчасово використати інший режим.",
+                "label": "Режим прокрутки",
+                "pan_y": "Прокрутка по Y",
+                "zoom": "Масштабування"
             },
-            "reset_zoom_on_nav": "Скинути рівень масштабу під час зміни зображення",
+            "reset_zoom_on_nav": "Скинути рівень масштабування при зміні зображення",
             "delay": "Затримка (сек)",
             "display_mode": {
                 "label": "Режим відображення",
-                "fit_to_screen": "Підігнати до екрану",
-                "fit_horizontally": "Підігнати по горизонталі"
+                "fit_to_screen": "Підігнати до екрана",
+                "fit_horizontally": "Підігнати по горизонталі",
+                "original": "Оригінал"
             },
-            "page_header": "Сторінка {page} / {total}"
+            "page_header": "Сторінка {page} / {total}",
+            "disable_animation": "Вимкнути анімацію переходу між зображеннями",
+            "options": "Опції"
         },
-        "unsaved_changes": "Незбережені зміни. Ви впевнені, що хочете покинути сторінку?",
+        "unsaved_changes": "Незбережені зміни. Ви впевнені, що хочете піти?",
         "delete_alert": "Наступні {count, plural, one {{singularEntity}} other {{pluralEntity}}} будуть видалені назавжди:",
         "reassign_entity_title": "{count, plural, one {Перепризначити {singularEntity}} other {Перепризначити {pluralEntity}}}",
         "merge": {
-            "empty_results": "Значення поля призначення залишаться без змін."
+            "empty_results": "Значення поля призначення залишаться без змін.",
+            "destination": "Призначення",
+            "source": "Джерело"
         },
-        "clear_o_history_confirm": "Ви впевнені, що хочете очистити історію O?",
-        "delete_entity_desc": "{count, plural, one {Ви впевнені, що хочете видалити цей {singularEntity}? Якщо файл також не буде видалено, цей {singularEntity} буде повторно додано під час сканування.} other {Ви впевнені, що хочете видалити ці {pluralEntity}? Якщо файли також не будуть видалені, ці {pluralEntity} будуть повторно додані під час сканування.}}",
+        "clear_o_history_confirm": "Ви впевнені, що хочете очистити історію оргазмів?",
+        "delete_entity_desc": "{count, plural, one {Ви впевнені, що хочете видалити цей {singularEntity}? Якщо файл також не видалено, цей {singularEntity} буде знову додано під час сканування.} other {Ви впевнені, що хочете видалити ці {pluralEntity}? Якщо файли також не видалені, ці {pluralEntity} будуть знову додані під час сканування.}}",
         "delete_confirm": "Ви впевнені, що хочете видалити {entityName}?",
         "dont_show_until_updated": "Не показувати до наступного оновлення",
         "performers_found": "Знайдено {count} виконавців",
         "create_new_entity": "Створити новий {entity}",
         "set_image_url_title": "URL зображення",
         "reassign_files": {
-            "destination": "Переназначити на"
+            "destination": "Перепризначити на"
         },
         "scenes_found": "Знайдено {count} сцен",
         "scrape_entity_query": "Запит на скрейпінг {entity_type}",
-        "scrape_entity_title": "Результати скрейпінгу {entity_type}"
+        "scrape_entity_title": "Результати скрейпінгу {entity_type}",
+        "clear_o_history_confirm_sfw": "Ви впевнені, що хочете очистити історію вподобань?",
+        "delete_alert_to_trash": "Наступні {count, plural, one {{singularEntity}} other {{pluralEntity}}} будуть переміщені до смітника:",
+        "delete_entity_title": "{count, plural, one {Видалити {singularEntity}} other {Видалити {pluralEntity}}}",
+        "delete_object_overflow": "…та {count} інших {count, plural, one {{singularEntity}} other {{pluralEntity}}}.",
+        "export_title": "Експорт",
+        "overwrite_filter_warning": "Збережений фільтр \"{entityName}\" буде перезаписано.",
+        "stashid_exists_warning": "Наявний Stash ID для цього Stash-box буде замінено.",
+        "studios_found": "Знайдено {count} студій",
+        "tags_found": "Знайдено {count} тегів",
+        "scrape_results_existing": "Наявні",
+        "scrape_results_missing": "Відсутні",
+        "scrape_results_scraped": "Отримані",
+        "set_default_filter_confirm": "Ви впевнені, що хочете встановити цей фільтр як типовий?",
+        "edit_entity_count_title": "Редагувати {count} {count, plural, one {{singularEntity}} інший {{pluralEntity}}}"
     },
     "setup": {
         "errors": {
             "unable_to_retrieve_system_status": "Не вдалося отримати стан системи: {error}",
-            "unexpected_error": "Сталася непередбачена помилка: {error}",
-            "something_went_wrong_description": "Якщо це схоже на проблему з вашими введеними даними, натисніть «Назад», щоб виправити їх. В іншому випадку повідомте про помилку на {githubLink} або зверніться за допомогою до {discordLink}.",
+            "unexpected_error": "Сталася несподівана помилка: {error}",
+            "something_went_wrong_description": "Якщо це схоже на помилку введення, натисніть «Назад», щоб виправити її. В іншому випадку створіть звіт про помилку на {githubLink} або зверніться за допомогою в {discordLink}.",
             "something_went_wrong": "Ой ні! Щось пішло не так!",
-            "something_went_wrong_while_setting_up_your_system": "Щось пішло не так під час налаштування вашої системи. Ось отримана помилка: {error}"
+            "something_went_wrong_while_setting_up_your_system": "Щось пішло не так під час налаштування системи. Отримана помилка: {error}"
         },
         "paths": {
-            "where_can_stash_store_blobs_description": "Stash може зберігати двійкові дані, такі як обкладинки сцен, зображення виконавців, студій і тегів, або в базі даних, або у файловій системі. За замовчуванням ці дані зберігатимуться у файловій системі в підкаталозі <code>blobs</code>, розташованому в директорії з вашим конфігураційним файлом. Якщо ви хочете змінити цей шлях, введіть абсолютний або відносний (щодо поточної робочої директорії) шлях. Stash створить цю директорію, якщо вона ще не існує.",
-            "where_can_stash_store_its_generated_content_description": "Для створення ескізів, прев’ю та спрайтів Stash генерує зображення і відео. Це також включає перекодування для форматів файлів, які не підтримуються. За замовчуванням Stash створює директорію <code>generated</code> у каталозі з вашим конфігураційним файлом. Якщо ви хочете змінити місце зберігання згенерованих медіафайлів, введіть абсолютний або відносний (щодо поточної робочої директорії) шлях. Stash створить цю директорію, якщо вона ще не існує.",
-            "where_can_stash_store_its_database_warning": "УВАГА: зберігання бази даних на іншій системі, ніж та, з якої запущено Stash (наприклад, зберігання бази даних на NAS при запуску сервера Stash на іншому комп’ютері), є <strong>непідтримуваним</strong>! SQLite не призначена для використання в мережі, і спроба зробити це може дуже легко призвести до пошкодження всієї вашої бази даних.",
-            "stash_alert": "Не вибрано жодних шляхів бібліотеки. Жодний медіаконтент не зможе бути відсканований у Stash. Ви впевнені?",
-            "database_filename_empty_for_default": "Ім'я файлу бази даних (залиште порожнім для значення за замовчуванням)",
-            "description": "Тепер нам потрібно визначити, де знаходиться ваша колекція, а також де зберігати базу даних Stash, згенеровані файли та файли кешу. Ці налаштування можна змінити пізніше, якщо це буде потрібно.",
-            "path_to_blobs_directory_empty_for_default": "шлях до каталогу blobs (залиште порожнім для значення за замовчуванням)",
-            "path_to_cache_directory_empty_for_default": "шлях до каталогу кешу (залиште порожнім для значення за замовчуванням)",
-            "path_to_generated_directory_empty_for_default": "шлях до каталогу generated (залиште порожнім для значення за замовчуванням)",
+            "where_can_stash_store_blobs_description": "Stash може зберігати бінарні дані, такі як обкладинки сцен, зображення виконавців, студій і тегів, або в базі даних, або у файловій системі. За замовчуванням ці дані зберігатимуться у файловій системі в підкаталозі <code>blobs</code>, розташованому в каталозі з вашим конфігураційним файлом. Якщо ви хочете змінити це, введіть абсолютний або відносний (щодо поточного робочого каталогу) шлях. Stash створить цей каталог, якщо він ще не існує.",
+            "where_can_stash_store_its_generated_content_description": "Для створення мініатюр, попередніх переглядів і спрайтів Stash генерує зображення та відео. Це також включає транскодування для непідтримуваних форматів файлів. За замовчуванням Stash створить каталог <code>generated</code> у директорії з вашим конфігураційним файлом. Якщо ви хочете змінити місце зберігання цього згенерованого контенту, введіть абсолютний або відносний (щодо поточного робочого каталогу) шлях. Stash створить цей каталог, якщо він ще не існує.",
+            "where_can_stash_store_its_database_warning": "УВАГА: зберігання бази даних на іншій системі, ніж та, на якій запущено Stash (наприклад, зберігання бази даних на NAS при запуску сервера Stash на іншому комп’ютері), <strong>не підтримується</strong>! SQLite не призначена для використання в мережі, і спроба зробити це може дуже легко призвести до пошкодження всієї вашої бази даних.",
+            "stash_alert": "Не вибрано жодного шляху до бібліотеки. Медіафайли не будуть скануватися в Stash. Ви впевнені?",
+            "database_filename_empty_for_default": "ім'я файлу бази даних (пусто — за замовчуванням)",
+            "description": "Далі нам потрібно визначити, де знаходиться ваш контент, а також де зберігати базу даних Stash, згенеровані файли та кеш. Ці налаштування можна змінити пізніше.",
+            "path_to_blobs_directory_empty_for_default": "шлях до каталогу blobs (пусто — за замовчуванням)",
+            "path_to_cache_directory_empty_for_default": "шлях до каталогу cache (пусто — за замовчуванням)",
+            "path_to_generated_directory_empty_for_default": "шлях до каталогу generated (пусто — за замовчуванням)",
             "where_can_stash_store_blobs_description_addendum": "Альтернативно ви можете зберігати ці дані в базі даних. <strong>Примітка:</strong> Це збільшить розмір файлу бази даних і час міграції бази даних.",
-            "where_can_stash_store_blobs": "Де Stash може зберігати бінарні дані бази даних?",
+            "where_can_stash_store_blobs": "Де Stash може зберігати бінарні дані?",
             "where_can_stash_store_cache_files": "Де Stash може зберігати файли кешу?",
             "where_can_stash_store_its_database": "Де Stash може зберігати свою базу даних?",
             "where_can_stash_store_its_database_description": "Stash використовує базу даних SQLite для зберігання метаданих вашої колекції. За замовчуванням вона буде створена як <code>stash-go.sqlite</code> у каталозі, що містить ваш конфігураційний файл. Якщо ви хочете змінити це, введіть абсолютне або відносне (щодо поточної робочої директорії) ім'я файлу.",
-            "where_is_your_porn_located": "Де знаходиться ваше порно?",
-            "where_is_your_porn_located_description": "Додайте каталоги, що містять ваші порно-відео та зображення. Stash використовуватиме ці каталоги для пошуку відео та зображень під час сканування.",
-            "where_can_stash_store_cache_files_description": "Для роботи деяких функцій, таких як HLS/DASH трансляція в реальному часі, Stash потребує кеш-директорію для тимчасових файлів. За замовчуванням Stash створює директорію <code>cache</code> у каталозі з вашим конфігураційним файлом. Якщо ви хочете змінити це розташування, введіть абсолютний або відносний (щодо поточної робочої директорії) шлях. Stash створить цю директорію, якщо вона ще не існує.",
-            "where_can_stash_store_its_generated_content": "Де Stash може зберігати свій згенерований контент?",
+            "where_is_your_porn_located": "Де знаходиться ваш контент?",
+            "where_is_your_porn_located_description": "Додайте каталоги з вашими відео та зображеннями. Stash використовуватиме їх для пошуку медіафайлів під час сканування.",
+            "where_can_stash_store_cache_files_description": "Для роботи деяких функцій, таких як HLS/DASH транскодування в реальному часі, Stash потребує каталог кешу для тимчасових файлів. За замовчуванням Stash створює каталог <code>cache</code> у директорії з вашим конфігураційним файлом. Якщо ви хочете змінити це, введіть абсолютний або відносний (щодо поточної робочої директорії) шлях. Stash створить цей каталог, якщо він ще не існує.",
+            "where_can_stash_store_its_generated_content": "Де Stash може зберігати згенерований контент?",
             "store_blobs_in_database": "Зберігати блоби в базі даних",
-            "set_up_your_paths": "Налаштуйте ваші шляхи"
+            "set_up_your_paths": "Налаштуйте ваші шляхи",
+            "sfw_content_settings": "Використовувати Stash для SFW-контенту?",
+            "sfw_content_settings_description": "stash можна використовувати для керування SFW-контентом, таким як фотографії, арт, комікси тощо. Увімкнення цієї опції адаптує інтерфейс для SFW-контенту.",
+            "use_sfw_content_mode": "Використовувати режим SFW-контенту"
         },
         "success": {
-            "in_app_manual_explained": "Ми рекомендуємо вам ознайомитися з вбудованим посібником, який можна відкрити, натиснувши на іконку у верхньому правому куті екрана, що виглядає так: {icon}",
+            "in_app_manual_explained": "Рекомендуємо переглянути вбудований посібник, доступний через іконку у верхньому правому куті екрана: {icon}",
             "next_config_step_two": "Коли ви будете задоволені цими налаштуваннями, ви можете почати сканування вашого контенту в Stash, натиснувши <code>{localized_task}</code>, а потім <code>{localized_scan}</code>.",
-            "open_collective": "Перегляньте наш {open_collective_link}, щоб дізнатися, як ви можете сприяти подальшому розвитку Stash.",
-            "welcome_contrib": "Ми також вітаємо внески у вигляді коду (виправлення помилок, покращення та нові функції), тестування, звітів про помилки, пропозицій щодо покращень і нових функцій, а також підтримки користувачів. Деталі можна знайти в розділі \"Contribution\" у вбудованому посібнику.",
-            "your_system_has_been_created": "Успіх! Вашу систему було створено!",
+            "open_collective": "Перегляньте {open_collective_link}, щоб дізнатися, як підтримати подальший розвиток Stash.",
+            "welcome_contrib": "Ми також вітаємо внесок у вигляді коду (виправлення помилок, нові функції), тестування, звітів про баги, запитів на покращення та підтримки користувачів. Деталі у розділі \"Contribution\" вбудованого посібника.",
+            "your_system_has_been_created": "Успіх! Вашу систему створено!",
             "missing_ffmpeg": "Відсутній необхідний двійковий файл <code>ffmpeg</code>. Ви можете автоматично завантажити його у вашу конфігураційну директорію, відзначивши прапорець нижче. Альтернативно, ви можете вказати шляхи до двійкових файлів <code>ffmpeg</code> та <code>ffprobe</code> у системних налаштуваннях. Ці файли повинні бути присутніми для коректної роботи Stash.",
-            "help_links": "Якщо у вас виникнуть проблеми, запитання чи пропозиції, не соромтеся відкрити проблему у {githubLink} або звернутися до спільноти у {discordLink}.",
-            "next_config_step_one": "Далі ви перейдете на сторінку Налаштувань. На цій сторінці ви зможете налаштувати, які файли включати та виключати, встановити ім’я користувача та пароль для захисту вашої системи, а також налаштувати багато інших параметрів.",
+            "help_links": "Якщо виникнуть проблеми або питання, не соромтеся створити запит на {githubLink} або запитати спільноту в {discordLink}.",
+            "next_config_step_one": "Далі ви перейдете на сторінку Конфігурації. Там можна налаштувати фільтри файлів, встановити логін і пароль для захисту системи та багато іншого.",
             "download_ffmpeg": "Завантажити ffmpeg",
-            "getting_help": "Отримати допомогу",
+            "getting_help": "Отримання допомоги",
             "support_us": "Підтримайте нас",
-            "thanks_for_trying_stash": "Дякуємо що спробували Stash!"
+            "thanks_for_trying_stash": "Дякуємо, що спробували Stash!"
         },
         "welcome_specific_config": {
             "config_path": "Stash буде використовувати наступний шлях до файлу конфігурації: <code>{path}</code>",
-            "unable_to_locate_specified_config": "Якщо ви читаєте це, значить, Stash не зміг знайти конфігураційний файл, вказаний у командному рядку або середовищі. Цей майстер допоможе вам у процесі налаштування нового конфігураційного файлу.",
-            "next_step": "Коли будете готові продовжити налаштування нової системи, натисніть Далі."
+            "unable_to_locate_specified_config": "Stash не знайшов файл конфігурації, вказаний у командному рядку або середовищі. Цей майстер допоможе вам налаштувати нову конфігурацію.",
+            "next_step": "Коли будете готові налаштувати нову систему, натисніть Далі."
         },
         "migrate": {
-            "backup_database_path_leave_empty_to_disable_backup": "Шлях до резервної копії бази даних (залиште порожнім, щоб вимкнути резервне копіювання):",
+            "backup_database_path_leave_empty_to_disable_backup": "Шлях для резервної копії БД (пусто — не створювати):",
             "backup_recommended": "Рекомендується зробити резервну копію вашої існуючої бази даних перед міграцією. Ми можемо зробити це за вас, створивши копію вашої бази даних у <code>{defaultBackupPath}</code>.",
-            "migration_failed_help": "Будь ласка, внесіть необхідні виправлення та спробуйте ще раз. Інакше створіть звіт про помилку у {githubLink} або зверніться за допомогою до {discordLink}.",
-            "migration_irreversible_warning": "Процес міграції схеми не є зворотним. Після виконання міграції ваша база даних буде несумісна з попередніми версіями Stash.",
-            "schema_too_old": "Ваша поточна база даних Stash має версію схеми <strong>{databaseSchema}</strong> і потребує оновлення до версії <strong>{appSchema}</strong>. Ця версія Stash не працюватиме без оновлення бази даних. Якщо ви не бажаєте виконувати міграцію, вам доведеться перейти на версію, яка відповідає версії вашої схеми бази даних.",
-            "migration_failed_error": "Під час міграції бази даних сталася наступна помилка:",
+            "migration_failed_help": "Будь ласка, внесіть необхідні виправлення та спробуйте ще раз. Інакше повідомте про помилку на {githubLink} або зверніться за допомогою до {discordLink}.",
+            "migration_irreversible_warning": "Процес міграції схеми незворотний. Після виконання міграції ваша база даних буде несумісна з попередніми версіями Stash.",
+            "schema_too_old": "Ваша поточна база даних Stash має версію схеми <strong>{databaseSchema}</strong> і потребує міграції до версії <strong>{appSchema}</strong>. Ця версія Stash не працюватиме без міграції бази даних. Якщо ви не бажаєте виконувати міграцію, вам доведеться повернутися до версії, яка відповідає схемі вашої бази даних.",
+            "migration_failed_error": "Під час міграції бази даних сталася така помилка:",
             "perform_schema_migration": "Виконати міграцію схеми",
-            "migration_required": "Необхідна міграція",
+            "migration_required": "Потрібна міграція",
             "migration_notes": "Примітки до міграції",
             "migrating_database": "Міграція бази даних",
             "migration_failed": "Міграція не вдалася"
         },
         "welcome": {
-            "config_path_logic_explained": "Stash спочатку намагається знайти свій конфігураційний файл (config.yml) у поточній робочій директорії, і якщо не знаходить його там, використовує резервний шлях {fallback_path}. Ви також можете змусити Stash використовувати конкретний конфігураційний файл, запустивши його з опціями -c '<path to config file>' або --config '<path to config file>'.",
+            "config_path_logic_explained": "Stash спочатку шукає файл конфігурації (<code>config.yml</code>) у поточному робочому каталозі. Якщо не знаходить, використовує <code>{fallback_path}</code>. Ви можете вказати конкретний файл, запустивши Stash з параметром <code>-c '<шлях до файлу>'</code> або <code>--config '<шлях до файлу>'</code>.",
             "in_the_current_working_directory": "У <code>{path}</code>, робочий каталог, наразі:",
-            "next_step": "Тепер, коли все налаштовано, якщо ви готові продовжити налаштування нової системи, будь ласка, виберіть місце, де ви хочете зберігати свій конфігураційний файл.",
+            "next_step": "Тепер, якщо ви готові продовжити налаштування нової системи, оберіть місце для збереження файлу конфігурації.",
             "in_the_current_working_directory_disabled_macos": "Не підтримується під час запуску <code>Stash.app</code>,<br></br>запустіть <code>stash-macos</code>, щоб налаштувати в робочому каталозі",
             "store_stash_config": "Де ви хочете зберігати конфігурацію Stash?",
             "in_the_current_working_directory_disabled": "У <code>{path}</code>, робочий каталог:",
-            "unable_to_locate_config": "Якщо ви це читаєте, значить Stash не зміг знайти існуючу конфігурацію. Цей майстер допоможе вам у процесі налаштування нової конфігурації.",
+            "unable_to_locate_config": "Якщо ви це читаєте, Stash не знайшов існуючої конфігурації. Цей майстер допоможе вам налаштувати нову.",
             "unexpected_explained": "Якщо цей екран з'явився несподівано, спробуйте перезапустити Stash у правильному робочому каталозі або з прапором <code>-c</code>.",
             "in_current_stash_directory": "У директорії <code>{path}</code>:"
         },
         "confirm": {
-            "almost_ready": "Ми майже готові завершити налаштування. Будь ласка, підтвердіть наступні параметри. Ви можете натиснути «Назад», щоб змінити щось некоректне. Якщо все виглядає правильно, натисніть «Підтвердити», щоб створити вашу систему.",
-            "blobs_directory": "Директорія бінарних даних",
-            "cache_directory": "Директорія кешу",
-            "configuration_file_location": "Місцезнаходження файлу конфігурації:",
-            "stash_library_directories": "Директорії бібліотеки Stash",
+            "almost_ready": "Ми майже готові завершити налаштування. Будь ласка, перевірте наступні параметри. Ви можете натиснути «Назад», щоб виправити помилки. Якщо все вірно, натисніть «Підтвердити» для створення вашої системи.",
+            "blobs_directory": "Каталог бінарних даних",
+            "cache_directory": "Каталог кешу",
+            "configuration_file_location": "Розташування файлу конфігурації:",
+            "stash_library_directories": "Каталоги бібліотеки Stash",
             "nearly_there": "Майже готово!",
-            "generated_directory": "Папка згенерованих допоміжних файлів",
+            "generated_directory": "Каталог згенерованих файлів",
             "database_file_path": "Шлях до файлу бази даних",
-            "blobs_use_database": "<використовувана база даних>"
+            "blobs_use_database": "<використовується база даних>"
         },
         "stash_setup_wizard": "Майстер налаштування Stash",
         "creating": {
@@ -1259,22 +1379,22 @@
         },
         "folder": {
             "file_path": "Шлях до файлу",
-            "up_dir": "На один рівень вище"
+            "up_dir": "На рівень вище"
         },
         "welcome_to_stash": "Ласкаво просимо до Stash",
         "github_repository": "Репозиторій Github"
     },
     "validation": {
         "required": "${path} є обов'язковим полем",
-        "date_invalid_form": "${path} має бути у форматі YYYY-MM-DD",
+        "date_invalid_form": "${path} має бути у форматі YYYY, YYYY-MM або YYYY-MM-DD",
         "end_time_before_start_time": "Час завершення має бути більшим або рівним часу початку",
         "blank": "${path} не може бути порожнім",
-        "unique": "${path} повинен бути унікальним"
+        "unique": "${path} має бути унікальним"
     },
     "countables": {
         "performers": "{count, plural, one {Виконавець} other {Виконавці}}",
         "studios": "{count, plural, one {Студія} other {Студії}}",
-        "tags": "{count, plural, one {Мітка} other {Мітки}}",
+        "tags": "{count, plural, one {Тег} other {Теги}}",
         "galleries": "{count, plural, one {Галерея} other {Галереї}}",
         "groups": "{count, plural, one {Група} other {Групи}}",
         "scenes": "{count, plural, one {Сцена} other {Сцени}}",
@@ -1283,44 +1403,49 @@
         "markers": "{count, plural, one {Позначка} other {Позначки}}"
     },
     "criterion_modifier": {
-        "format_string_depth": "{criterion} {modifierString} {valueString} (+{глибина, plural, =-1 {all} other {{глибина}}})",
+        "format_string_depth": "{criterion} {modifierString} {valueString} (+{depth, plural, =-1 {всі} other {{depth}}})",
         "format_string": "{criterion} {modifierString} {valueString}",
         "matches_regex": "відповідає регулярному виразу",
         "not_between": "не між",
         "less_than": "менше ніж",
-        "not_null": "не є null",
+        "not_null": "не порожнє",
         "not_matches_regex": "не відповідає регулярному виразу",
-        "not_equals": "не є",
+        "not_equals": "не дорівнює",
         "greater_than": "більше ніж",
-        "includes_all": "включає все",
-        "is_null": "є null",
-        "between": "поміж",
-        "excludes": "виключення",
-        "format_string_excludes": "{criterion} {modifierString} {valueString} (за виключенням {excludedString})",
-        "format_string_excludes_depth": "{criterion} {modifierString} {valueString} (за виключенням {excludedString}) (+{глибина, множина, =-1 {all} інші {{depth}}})",
-        "includes": "включно"
+        "includes_all": "містить всі",
+        "is_null": "порожнє",
+        "between": "між",
+        "excludes": "не містить",
+        "format_string_excludes": "{criterion} {modifierString} {valueString} (крім {excludedString})",
+        "format_string_excludes_depth": "{criterion} {modifierString} {valueString} (крім {excludedString}) (+{depth, plural, =-1 {all} other {{depth}}})",
+        "includes": "містить",
+        "equals": "дорівнює"
     },
     "toast": {
-        "rescanning_entity": "Повторне сканування {count, plural, one {{singularEntity}} other {{pluralEntity}}}…",
+        "rescanning_entity": "Пересканування {count, plural, one {{singularEntity}} other {{pluralEntity}}}…",
         "added_entity": "Додано {count, plural, one {{singularEntity}} other {{pluralEntity}}}",
-        "added_generation_job_to_queue": "Додано завдання на генерацію до черги",
-        "image_index_too_large": "Помилка: Індекс зображення більший за кількість зображень у галереї",
+        "added_generation_job_to_queue": "Додано завдання генерації в чергу",
+        "image_index_too_large": "Помилка: Індекс зображення більший за кількість зображень у Галереї",
         "delete_past_tense": "Видалено {count, plural, one {{singularEntity}} other {{pluralEntity}}}",
         "removed_entity": "Вилучено {count, plural, one {{singularEntity}} other {{pluralEntity}}}",
         "created_entity": "Створено {entity}",
-        "started_auto_tagging": "Розпочато автоматичне тегування",
-        "started_generating": "Розпочато генерування",
+        "started_auto_tagging": "Розпочато автотегування",
+        "started_generating": "Розпочато генерацію",
         "saved_entity": "Збережено {entity}",
         "reassign_past_tense": "Файл перепризначено",
         "merged_tags": "Теги об'єднано",
         "started_importing": "Розпочато імпорт",
         "updated_entity": "Оновлено {entity}",
         "merged_scenes": "Сцени об'єднано",
-        "generating_screenshot": "Генерація знімка екрана…",
-        "default_filter_set": "Встановлено фільтр за замовчуванням"
+        "generating_screenshot": "Генерація скріншоту…",
+        "default_filter_set": "Встановлено типовий фільтр",
+        "merged_performers": "Виконавців об'єднано",
+        "clipboard_access_denied": "Доступ до буфера обміну заборонено. Перевірте дозволи браузера",
+        "clipboard_image_pasted": "Зображення вставлено з буфера обміну",
+        "clipboard_no_image": "У буфері обміну не знайдено зображення"
     },
-    "empty_server": "Додайте кілька сцен на ваш сервер, щоб переглядати рекомендації на цій сторінці.",
-    "appears_with": "З'являється з",
+    "empty_server": "Додайте кілька сцен на свій сервер, щоб побачити рекомендації на цій сторінці.",
+    "appears_with": "З'являється разом із",
     "chapters": "Розділи",
     "circumcised_types": {
         "CUT": "Обрізаний",
@@ -1328,71 +1453,74 @@
     },
     "circumcised": "Обрізаний",
     "career_length": "Тривалість кар'єри",
-    "hasMarkers": "Має позначки",
+    "hasMarkers": "Має маркери",
     "stashbox": {
         "go_review_draft": "Перейдіть до {endpoint_name}, щоб переглянути чернетку.",
-        "selected_stash_box": "Вибраний ендпоінт Stash-Box",
-        "source": "Stash-Box джерело",
+        "selected_stash_box": "Вибрана кінцева точка Stash-Box",
+        "source": "Джерело Stash-Box",
         "submission_successful": "Надсилання успішне",
         "submit_update": "Вже існує в {endpoint_name}",
-        "submission_failed": "Надсилання не вдалося"
+        "submission_failed": "Не вдалося надіслати"
     },
     "connection_monitor": {
-        "websocket_connection_failed": "Не вдалося встановити з'єднання через websocket: дивіться консоль браузера для деталей",
-        "websocket_connection_reestablished": "З'єднання Websocket відновлено"
+        "websocket_connection_failed": "Не вдалося встановити з'єднання websocket: дивіться консоль браузера для деталей",
+        "websocket_connection_reestablished": "З'єднання websocket відновлено"
     },
     "time_end": "Час завершення",
     "created_at": "Створено",
     "criterion": {
         "greater_than": "Більше ніж",
         "less_than": "Менше ніж",
-        "value": "Значення"
+        "value": "Значення",
+        "unsupported": "{type} (непідтримуваний)"
     },
-    "containing_group": "Група, що містить",
-    "cover_image": "Обкладинка зображення",
+    "containing_group": "Батьківська група",
+    "cover_image": "Обкладинка",
     "duplicated_phash": "Дубльовано (pHash)",
     "custom_fields": {
         "title": "Користувацькі поля",
         "field": "Поле",
         "value": "Значення",
-        "criteria_format_string": "{criterion} (своє поле) {modifierString} {valueString}"
+        "criteria_format_string": "{criterion} (користувацьке поле) {modifierString} {valueString}",
+        "criteria_format_string_others": "{criterion} (користувацьке поле) {modifierString} {valueString} (+{others} інших)"
     },
     "death_date": "Дата смерті",
-    "developmentVersion": "Розробницька версія",
+    "developmentVersion": "Версія для розробників",
     "datetime_format": "РРРР-ММ-ДД ГГ:ХХ",
-    "existing_value": "існуюче значення",
-    "ignore_auto_tag": "Ігнорувати автоматичне тегування",
+    "existing_value": "наявне значення",
+    "ignore_auto_tag": "Ігнорувати авто тегування",
     "performer_image": "Зображення виконавця",
     "sceneTagger": "Тегувальник сцен",
     "stats": {
-        "total_play_count": "Загальна кількість відтворень",
-        "total_o_count": "Загальна кількість O",
+        "total_play_count": "Загальна кількість переглядів",
+        "total_o_count": "Всього оргазмів",
         "scenes_size": "Розмір сцен",
-        "scenes_played": "Відтворені сцени",
+        "scenes_played": "Переглянуто сцен",
         "scenes_duration": "Тривалість сцен",
         "image_size": "Розмір зображень",
-        "total_play_duration": "Загальна тривалість відтворення"
+        "total_play_duration": "Загальна тривалість перегляду",
+        "total_o_count_sfw": "Всього лайків"
     },
-    "studio_depth": "Рівні (залиште порожнім для всіх)",
+    "studio_depth": "Рівні (пусто — усі)",
     "studio_count": "Кількість студій",
-    "studio_and_parent": "Студія та батьківська студія",
+    "studio_and_parent": "Студія та батьківська компанія",
     "sub_group_of": "Підгрупа {parent}",
     "sub_group_count": "Кількість підгруп",
-    "updated_at": "Оновлено в",
+    "updated_at": "Оновлено",
     "unknown_date": "Невідома дата",
     "years_old": "років",
     "weight_kg": "Вага (кг)",
     "view_all": "Переглянути все",
-    "zip_file_count": "Кількість файлів ZIP",
+    "zip_file_count": "Кількість Zip-файлів",
     "eye_color": "Колір очей",
     "fake_tits": "Штучні груди",
     "file_count": "Кількість файлів",
-    "file_mod_time": "Час модифікації файлу",
+    "file_mod_time": "Час зміни файлу",
     "files_amount": "{value} файлів",
-    "include_parent_tags": "Включити батьківські теги",
-    "include_sub_studios": "Включити дочірні студії",
-    "last_o_at": "Останній O о",
-    "last_played_at": "Останнє відтворення",
+    "include_parent_tags": "Включати батьківські теги",
+    "include_sub_studios": "Включати дочірні студії",
+    "last_o_at": "Останній оргазм",
+    "last_played_at": "Останній перегляд",
     "parent_studio": "Батьківська студія",
     "parent_studios": "Батьківські студії",
     "parent_tag_count": "Кількість батьківських тегів",
@@ -1403,47 +1531,166 @@
     "performer_age": "Вік виконавця",
     "perceptual_similarity": "Перцептивна схожість (pHash)",
     "performer_count": "Кількість виконавців",
-    "performer_favorite": "Виконавець у вибраних",
+    "performer_favorite": "Улюблений виконавець",
     "performer_tags": "Теги виконавця",
-    "playdate_recorded_no": "Дата відтворення не зафіксована",
+    "playdate_recorded_no": "Дата відтворення не записана",
     "play_history": "Історія відтворень",
     "play_duration": "Тривалість відтворення",
-    "recently_added_objects": "Нещодавно додано {objects}",
+    "recently_added_objects": "Нещодавно додані {objects}",
     "primary_tag": "Основний тег",
     "scene_tags": "Теги сцени",
-    "stash_id_endpoint": "Кінцева точка Stash ID",
+    "stash_id_endpoint": "URL кінцевої точки Stash ID",
     "stash_id": "Stash ID",
-    "stash_ids": "Stash ідентифікатори",
+    "stash_ids": "Ідентифікатори Stash",
     "include_sub_group_content": "Включати вміст підгрупи",
-    "parent_of": "Батько {children}",
-    "scene_updated_at": "Оновлено сцену",
-    "scenes_updated_at": "Сцена оновлена в",
-    "include_sub_tag_content": "Включати вміст підтега",
+    "parent_of": "Батьківський для {children}",
+    "scene_updated_at": "Сцену оновлено",
+    "scenes_updated_at": "Сцена оновлена",
+    "include_sub_tag_content": "Включати вміст підтегів",
     "include_sub_studio_content": "Включати вміст підстудії",
-    "containing_groups": "Містить групи",
-    "containing_group_count": "Кількість груп, що містять",
+    "containing_groups": "Батьківські групи",
+    "containing_group_count": "Кількість батьківських груп",
     "death_year": "Рік смерті",
     "file_info": "Інформація про файл",
     "resume_time": "Час відновлення",
-    "release_notes": "Примітки до релізу",
-    "recently_released_objects": "Нещодавно випущено {objects}",
+    "release_notes": "Примітки до випуску",
+    "recently_released_objects": "Нещодавно випущені {objects}",
     "play_count": "Кількість відтворень",
-    "scene_created_at": "Сцена створена",
+    "scene_created_at": "Сцену створено",
     "scene_count": "Кількість сцен",
     "scene_code": "Код студії",
     "status": "Статус: {statusText}",
     "sub_group_order": "Порядок підгрупи",
     "index_of_total": "{index} з {total}",
     "include_sub_groups": "Включати підгрупи",
-    "odate_recorded_no": "Дата O не зафіксована",
+    "odate_recorded_no": "Дата оргазму не записана",
     "scene_id": "ID сцени",
     "scene_date": "Дата сцени",
     "primary_file": "Основний файл",
     "plays": "{value} відтворень",
     "subsidiary_studios": "Дочірні студії",
     "subsidiary_studio_count": "Кількість дочірніх студій",
-    "age_on_date": "{age} років під час зйомок",
-    "configuration": "Обрис",
+    "age_on_date": "{age} років на момент зйомок",
+    "configuration": "Конфігурація",
     "country": "Країна",
-    "custom": "Свій"
+    "custom": "Користувацьке",
+    "date": "Дата",
+    "date_format": "РРРР-ММ-ДД",
+    "descending": "За спаданням",
+    "description": "Опис",
+    "detail": "Деталі",
+    "details": "Деталі",
+    "dimensions": "Розміри",
+    "director": "Режисер",
+    "disambiguation": "Уточнення",
+    "display_mode": {
+        "grid": "Сітка",
+        "label_current": "Режим відображення: {current}",
+        "list": "Список",
+        "tagger": "Тегувальник",
+        "unknown": "Невідомо",
+        "wall": "Стіна"
+    },
+    "distance": "Відстань",
+    "donate": "Підтримати",
+    "eta": "Розрахунковий час",
+    "filesize": "Розмір файлу",
+    "filter_name": "Назва фільтру",
+    "framerate": "Частота кадрів",
+    "frames_per_second": "{value} к/с",
+    "front_page": {
+        "types": {
+            "premade_filter": "Готовий фільтр",
+            "saved_filter": "Збережений фільтр"
+        }
+    },
+    "gallery_count": "Кількість галерей",
+    "group_count": "Кількість груп",
+    "group_scene_number": "Номер сцени",
+    "hair_color": "Колір волосся",
+    "hasChapters": "Має розділи",
+    "height_cm": "Зріст (см)",
+    "image_count": "Кількість зображень",
+    "image_index": "№ зображення",
+    "include_sub_tags": "Включати підтеги",
+    "interactive_speed": "Швидкість інтерактиву",
+    "isMissing": "Відсутній",
+    "last_o_at_sfw": "Останній лайк",
+    "login": {
+        "login": "Вхід",
+        "username": "Ім'я користувача",
+        "password": "Пароль",
+        "invalid_credentials": "Невірне ім'я користувача або пароль",
+        "internal_error": "Неочікувана внутрішня помилка. Дивіться журнал для деталей"
+    },
+    "marker_count": "Кількість позначок",
+    "megabits_per_second": "{value} Мбіт/с",
+    "sort_name": "Назва для сортування",
+    "o_count": "Кількість оргазмів",
+    "o_count_sfw": "Лайки",
+    "o_history": "Історія оргазмів",
+    "o_history_sfw": "Історія лайків",
+    "odate_recorded_no_sfw": "Дата лайку не записана",
+    "organized": "Впорядковано",
+    "scenes_duration": "Тривалість сцени",
+    "stashbox_search": {
+        "header": "Пошук {entityType} у StashBox",
+        "no_results": "Результатів не знайдено.",
+        "placeholder_name_or_id": "Ім'я {entityType} або StashID...",
+        "select_stashbox": "Оберіть StashBox..."
+    },
+    "latest_scene": "Остання сцена",
+    "stash_id_count": "Кількість Stash ID",
+    "duplicated_stash_id": "Дубльований (ідентифікатор Stash)",
+    "duplicated_title": "Дубльовано (Назва)",
+    "duplicated": "Дубльовано",
+    "career_end": "Кінець кар'єри",
+    "career_start": "Початок кар'єри",
+    "tag_tagger": {
+        "add_new_tags": "Додати нові теги",
+        "any_names_entered_will_be_queried": "Будь-які введені імена будуть запитуватися з віддаленого екземпляра Stash-Box та додаватися, якщо будуть знайдені. Збігом вважатимуться лише точні збіги.",
+        "batch_add_tags": "Додавання тегів пакетом",
+        "no_results_found": "Результатів не знайдено.",
+        "query_all_tags_in_the_database": "Усі теги в базі даних",
+        "refresh_tagged_tags": "Оновити позначені теги",
+        "current_page": "Поточна сторінка",
+        "failed_to_save_tag": "Не вдалося зберегти тег \"{tag}\"",
+        "name_already_exists": "Ім'я вже існує",
+        "network_error": "Помилка мережі",
+        "number_of_tags_will_be_processed": "{tag_count} теги будуть оброблені",
+        "refreshing_will_update_the_data": "Оновлення оновить дані будь-яких позначених тегами з екземпляра stash-box.",
+        "status_tagging_job_queued": "Статус: Завдання додавання тегів поставлено в чергу",
+        "status_tagging_tags": "Статус: Позначення тегами",
+        "tag_already_tagged": "Тег уже позначено",
+        "tag_names_or_stashids_separated_by_comma": "Назви тегів або StashID, розділені комами",
+        "tag_selection": "Вибір тегу",
+        "tag_successfully_tagged": "Тег успішно позначено тегом",
+        "tag_status": "Стан тегу",
+        "to_use_the_tag_tagger": "Щоб використовувати теґер, потрібно налаштувати екземпляр stash-box.",
+        "untagged_tags": "Нетеговані теги",
+        "update_tags": "Оновити теги",
+        "updating_untagged_tags_description": "Оновлення нетегованих тегів спробує знайти будь-які теги, яким бракує stashid, та оновити метадані.",
+        "batch_update_tags": "Теги пакетного оновлення",
+        "config": {
+            "create_parent_desc": "Створити відсутні головні теги з категорій stash-box або прив'язати наявні головні теги за точним збігом назви",
+            "create_parent_label": "Створити головні теги"
+        },
+        "create_or_tag_parent_tags": "Створити відсутні або прив'язати наявні головні теги"
+    },
+    "tagger": {
+        "config": {
+            "active_stash-box_instance": "Активний екземпляр сховища:",
+            "edit_excluded_fields": "Редагувати виключені поля",
+            "excluded_fields": "Виключені поля:",
+            "fields_will_not_be_changed": "Ці поля не будуть змінені під час оновлення {entity}.",
+            "no_fields_are_excluded": "Жодне поле не виключено",
+            "no_instances_found": "Не знайдено жодних екземплярів"
+        }
+    },
+    "unsupported_criteria": "Непідтримувані критерії: {criteria}",
+    "include_sub_folders": "Включити підпапки",
+    "sub_folder_depth": "Глибина підпапок (порожня для всіх)",
+    "sub_folders": "Підпапки",
+    "parent_folder": "Основна папка",
+    "empty_value": "порожній"
 }
diff --git a/ui/v2.5/src/locales/vi-VN.json b/ui/v2.5/src/locales/vi-VN.json
index 6ba70eefc..ac6fac5be 100644
--- a/ui/v2.5/src/locales/vi-VN.json
+++ b/ui/v2.5/src/locales/vi-VN.json
@@ -70,8 +70,6 @@
         "logout": "Đăng xuất",
         "make_primary": "Chính",
         "merge": "Nối",
-        "merge_from": "Nối từ",
-        "merge_into": "Nối vào",
         "migrate_blobs": "Nối Blobs",
         "next_action": "Kế tiếp",
         "not_running": "không khởi chạy",
@@ -445,7 +443,6 @@
             },
             "backing_up_database": "Sao lưu dữ liệu",
             "backup_and_download": "Thực hiện sao lưu cơ sở dữ liệu và tải xuống tệp kết quả.",
-            "backup_database": "Thực hiện sao lưu cơ sở dữ liệu vào thư mục sao lưu (backups), với định dạng tên tệp là {filename_format}",
             "cleanup_desc": "Kiểm tra các tệp bị thiếu và xóa chúng khỏi cơ sở dữ liệu. Đây là hành động có tính phá hủy.",
             "clean_generated": {
                 "blob_files": "Tệp nhị phân (blob)",
@@ -916,10 +913,6 @@
             "source": "Nguồn",
             "empty_results": "Giá trị điền vào mục Đích đến sẽ không bị thay đổi."
         },
-        "merge_tags": {
-            "destination": "Đích đến",
-            "source": "Nguồn"
-        },
         "performers_found": "Đã tìm thấy {count} diễn viên",
         "reassign_entity_title": "{count, plural, one {Chỉnh lại {singularEntity}} other {Chỉnh lại {pluralEntity}}}",
         "reassign_files": {
diff --git a/ui/v2.5/src/locales/zh-CN.json b/ui/v2.5/src/locales/zh-CN.json
index 29e92b049..283546e79 100644
--- a/ui/v2.5/src/locales/zh-CN.json
+++ b/ui/v2.5/src/locales/zh-CN.json
@@ -58,10 +58,8 @@
         "logout": "登出",
         "make_primary": "作为主要文件",
         "merge": "合并",
-        "merge_from": "与其他项目合并",
-        "merge_into": "合并至其他项目",
         "migrate_blobs": "迁移数据",
-        "migrate_scene_screenshots": "迁移截图",
+        "migrate_scene_screenshots": "迁移场景截图",
         "next_action": "下一步",
         "not_running": "未运行",
         "open_in_external_player": "由外部播放器打开",
@@ -131,7 +129,7 @@
         "choose_date": "选择一个日期",
         "add_play": "添加播放记录",
         "add_manual_date": "添加手动日期",
-        "copy_to_clipboard": "复制到剪切板",
+        "copy_to_clipboard": "复制到剪贴板",
         "remove_date": "去除日期",
         "add_o": "添加高潮记录",
         "clean_generated": "清除已生成的文件",
@@ -153,7 +151,14 @@
         "load": "加载",
         "load_filter": "加载过滤器",
         "add_stash_id": "添加Stash编号",
-        "create_new": "新建"
+        "create_new": "新建",
+        "save_and_new": "保存并新建",
+        "invert_selection": "反向选择",
+        "select_directory": "选择目录",
+        "reveal_in_file_manager": "在文件管理器中显示",
+        "exclude_lowercase": "排除",
+        "from_clipboard": "来自剪贴板",
+        "selective_generate": "选择性生成"
     },
     "actions_name": "操作",
     "age": "年龄",
@@ -232,7 +237,8 @@
         "verb_toggle_unmatched": "{toggle} 未匹配的短片",
         "verb_add_as_alias": "添加刮削到的名字作为别名",
         "verb_link_existing": "链接到已存在的",
-        "verb_match_tag": "匹配标签"
+        "verb_match_tag": "匹配标签",
+        "verb_scrape_selected": "已选刮削器"
     },
     "config": {
         "about": {
@@ -295,7 +301,7 @@
                 "authentication": "认证设置",
                 "clear_api_key": "清除 API 密钥",
                 "credentials": {
-                    "description": "用以限制使用Stash的账户凭证.",
+                    "description": "用以限制使用Stash的账户凭证。",
                     "heading": "账户凭证"
                 },
                 "generate_api_key": "生成 API 密钥",
@@ -316,7 +322,7 @@
                 "log_file_max_size_desc": "日志文件压缩前的最大大小（以兆字节为单位）。0MB 表示禁用此功能。需要重启。"
             },
             "backup_directory_path": {
-                "description": "备份SQLite 数据库文件的目录路径",
+                "description": "备份 SQLite 数据库文件的目录路径。",
                 "heading": "备份用的路径"
             },
             "blobs_path": {
@@ -332,17 +338,17 @@
             "calculate_md5_and_ohash_desc": "除了快搜码外还计算 MD5 值。如果开启，初次扫描时速度会较慢。如果关闭 MD5 值计算，则必须将文件名识别码算法设置为快搜码.",
             "calculate_md5_and_ohash_label": "计算影片MD5值",
             "check_for_insecure_certificates": "检查证书安全性",
-            "check_for_insecure_certificates_desc": "某些网站所使用的证书可能有安全问题。取消勾选之后挖掘器会跳过证书安全性检查，如果你遇到了证书错误的问题，可以取消此选项。",
+            "check_for_insecure_certificates_desc": "某些网站所使用的 SSL 证书可能有安全问题。取消勾选之后挖掘器会跳过证书安全性检查，如果你遇到了证书错误的问题，可以取消此选项。",
             "chrome_cdp_path": "谷歌浏览器 CDP 路径",
             "chrome_cdp_path_desc": "谷歌浏览器 可执行文件的路径, 或者远端地址 (以 http:// 或 https:// 开头, 比如 http://localhost:9222/json/version)。",
-            "create_galleries_from_folders_desc": "如果勾选，则默认从包含图片的文件夹中创建画廊。在文件夹中创建一个名为 .forcegallery 或 .nogallery 的文件来强制/防止这种情况。",
+            "create_galleries_from_folders_desc": "如果勾选，则默认从包含图片的文件夹中创建画廊。在文件夹中创建一个名为 .forcegallery 或 .nogallery 的文件来覆盖此设置。",
             "create_galleries_from_folders_label": "从包含图片的文件夹建立图库",
             "database": "数据库",
             "db_path_head": "数据库所在路径",
             "directory_locations_to_your_content": "你的影片等收藏的路径",
-            "excluded_image_gallery_patterns_desc": "要从扫描中排除并会被[清除]功能所移除的图片及图库文件/路径的正则表达式",
+            "excluded_image_gallery_patterns_desc": "要从扫描中排除并会被[清除]功能所移除的图片及图库文件/路径的正则表达式。",
             "excluded_image_gallery_patterns_head": "图片/图库排除规则",
-            "excluded_video_patterns_desc": "要从扫描中排除并会被[清除]功能所移除的视频文件/路径的正则表达式",
+            "excluded_video_patterns_desc": "要从扫描中排除并会被[清除]功能所移除的视频文件/路径的正则表达式。",
             "excluded_video_patterns_head": "视频排除规则",
             "ffmpeg": {
                 "hardware_acceleration": {
@@ -371,11 +377,11 @@
                 },
                 "ffmpeg_path": {
                     "heading": "FFmpeg可执行路径",
-                    "description": "ffmpeg可执行文件（不仅仅是文件夹）的路径。如果为空，ffmpeg将通过$PATH、配置目录或$HOME/. stash从环境中解析"
+                    "description": "ffmpeg可执行文件（不仅仅是文件夹）的路径。如果为空，ffmpeg将通过$PATH、配置目录或$HOME/. stash从环境中解析。"
                 },
                 "ffprobe_path": {
                     "heading": "FFprobe 可执行路径",
-                    "description": "ffprobe可执行文件的路径（不仅仅是文件夹）。如果为空，ffprobe将通过$PATH、配置目录或$HOME/. stash从环境中解析"
+                    "description": "ffprobe可执行文件的路径（不仅仅是文件夹）。如果为空，ffprobe将通过$PATH、配置目录或$HOME/. stash从环境中解析。"
                 },
                 "download_ffmpeg": {
                     "heading": "下载FFmpeg",
@@ -384,13 +390,13 @@
             },
             "funscript_heatmap_draw_range": "在生成的热图中包括范围",
             "funscript_heatmap_draw_range_desc": "在生成的热图的y轴上绘制运动范围。更改后需要重新生成现有热图。",
-            "gallery_cover_regex_desc": "正则表达式用于将图像识别为图库封面",
+            "gallery_cover_regex_desc": "正则表达式用于将图像识别为图库封面。",
             "gallery_cover_regex_label": "图库封面模式",
-            "gallery_ext_desc": "逗号(半角)分隔的文件扩展名列表，将被标识为图库或图包。",
+            "gallery_ext_desc": "逗号(半角)分隔的文件扩展名列表，将被标识为基于压缩文件的图库。",
             "gallery_ext_head": "图库压缩包扩展名",
             "generated_file_naming_hash_desc": "使用 MD5 或快搜码为生成的文件命名。 更改此设置要求所有短片都有对应的 MD5/快搜码 值。 更改此值后，之前生成的数据需要迁移或重新生成。 请参阅 [迁移] 页面。",
             "generated_file_naming_hash_head": "生成文件名识别码",
-            "generated_files_location": "生成数据的存储目录（短片标记，短片预览，预览图等）",
+            "generated_files_location": "生成数据的存储目录（短片标记，短片预览，预览图等）。",
             "generated_path_head": "生成数据的存储路径",
             "hashing": "识别码设置",
             "heatmap_generation": "Funscript 热图生成",
@@ -399,26 +405,26 @@
             "include_audio_desc": "生成预览时包括音频流.",
             "include_audio_head": "包括声音",
             "logging": "日志设置",
-            "maximum_streaming_transcode_size_desc": "转码生成的串流最大值",
+            "maximum_streaming_transcode_size_desc": "转码生成的串流最大值。",
             "maximum_streaming_transcode_size_head": "转码生成的串流的最大清晰度",
-            "maximum_transcode_size_desc": "转码生成的影片的最大大小",
+            "maximum_transcode_size_desc": "转码生成的影片的最大大小。",
             "maximum_transcode_size_head": "最大的转码清晰度",
             "metadata_path": {
-                "description": "整体导出或者导入时使用的路径",
+                "description": "整体导出或者导入时使用的路径。",
                 "heading": "元数据存储路径"
             },
-            "number_of_parallel_task_for_scan_generation_desc": "设置为 0 以进行自动检测。 警告，当运行超过需要的多个任务使得 cpu 达到满负荷时，将降低性能并可能导致其他问题。",
+            "number_of_parallel_task_for_scan_generation_desc": "设置为 0 以进行自动检测。 警告，当运行超过需要的多个任务使得 CPU 达到满负荷时，将降低性能并可能导致其他问题。",
             "number_of_parallel_task_for_scan_generation_head": "扫描/生成的并行任务数量",
             "parallel_scan_head": "并行扫描/生成",
             "preview_generation": "生成预览",
             "python_path": {
-                "description": "Python 执行程序的路径。（不限于文件夹）给网页挖掘器和插件的源文件使用。如果没有，python会从环境变量找到",
+                "description": "Python 执行程序的路径。（不限于文件夹）给网页挖掘器和插件的源文件使用。如果没有，Python会从环境变量找到。",
                 "heading": "Python 可执行文件路径"
             },
             "scraper_user_agent": "刮削器用户代理 (User Agent)",
-            "scraper_user_agent_desc": "刮削器运行时的用户代理 (User Agent)",
+            "scraper_user_agent_desc": "刮削器运行HTTP请求时的用户代理 (User Agent)。",
             "scrapers_path": {
-                "description": "含有刮削器配置文件的路径",
+                "description": "含有刮削器配置文件的路径。",
                 "heading": "刮削器路径"
             },
             "scraping": "刮削器设置",
@@ -428,12 +434,23 @@
             "video_head": "视频设置",
             "plugins_path": {
                 "heading": "插件文件路径",
-                "description": "插件配置文件目录"
+                "description": "插件配置文件目录。"
             },
             "delete_trash_path": {
                 "description": "删除的文件将被移动到的路径，而不是永久删除。留空将永久删除文件。",
                 "heading": "回收站路径"
-            }
+            },
+            "sprite_generation_head": "时间轴缩略图生成",
+            "sprite_interval_desc": "时间轴缩略图之间的时间间隔（秒）。",
+            "sprite_interval_head": "时间轴缩略图间隔",
+            "sprite_maximum_desc": "短片中可生成的最大时间轴缩略图数量。设置为 0 可禁用此限制。",
+            "sprite_maximum_head": "时间轴缩略图最大数量",
+            "sprite_minimum_desc": "一个短片中最少生成的时间轴缩略图数量",
+            "sprite_minimum_head": "时间轴缩略图最少数量",
+            "sprite_screenshot_size_desc": "每个时间轴缩略图所需像素大小。",
+            "sprite_screenshot_size_head": "时间轴缩略图尺寸",
+            "use_custom_sprite_interval_head": "使用自定义时间轴缩略图间隔",
+            "use_custom_sprite_interval_desc": "根据以下设置启用自定义时间轴缩略图间隔。"
         },
         "library": {
             "exclusions": "不包括",
@@ -452,7 +469,7 @@
         "scraping": {
             "entity_metadata": "{entityType}元数据",
             "entity_scrapers": "{entityType}刮削器",
-            "excluded_tag_patterns_desc": "从刮削结果中排除的标签名称的正则表达式",
+            "excluded_tag_patterns_desc": "从刮削结果中排除的标签名称的正则表达式。",
             "excluded_tag_patterns_head": "排除标签的正则表达式",
             "scraper": "刮削器",
             "scrapers": "刮削器",
@@ -489,7 +506,6 @@
             "auto_tagging": "自动标签",
             "backing_up_database": "自动备份数据中",
             "backup_and_download": "备份数据库并下载其文件.",
-            "backup_database": "将数据库备份到backups目录，文件名格式为 {filename_format}",
             "cleanup_desc": "检查缺失的文件并将它们的数据从数据库中删除。 注意，这是一个破坏性的动作。",
             "data_management": "数据管理",
             "defaults_set": "预设值已经设定好，将会在按下任务页面里的{action}按钮后生效.",
@@ -538,7 +554,9 @@
                 "tag_skipped_matches": "标记跳过的匹配项",
                 "skip_single_name_performers_tooltip": "如果未启用此选项，则将匹配 Samantha 或 Olga 等经常被通用的表演者",
                 "tag_skipped_performer_tooltip": "创建类似“识别：单名表演者”的标签，您可以在短片标签视图中进行筛选，并选择如何处理这些表演者",
-                "tag_skipped_matches_tooltip": "创建类似“识别：多个匹配项”的标签，您可以在短片标签视图中进行筛选，并手动选择正确的匹配项"
+                "tag_skipped_matches_tooltip": "创建类似“识别：多个匹配项”的标签，您可以在短片标签视图中进行筛选，并手动选择正确的匹配项",
+                "performer_genders": "表演者性别",
+                "performer_genders_desc": "识别时将包含选中性别的表演者。"
             },
             "import_from_exported_json": "导入之前导出的json格式元数据。 删除现有数据库内容。",
             "incremental_import": "从导出的 zip 文件增量导入。",
@@ -574,11 +592,24 @@
                 "markers": "标记预览",
                 "previews": "短片预览",
                 "previews_desc": "短片预览和缩略图",
-                "sprites": "短片精灵",
+                "sprites": "短片时间轴缩略图",
                 "transcodes": "短片转码"
             },
             "rescan": "重新扫描文件",
-            "rescan_tooltip": "重新扫描路径中的每个文件。用于强制更新文件元数据和重新扫描zip文件。"
+            "rescan_tooltip": "重新扫描路径中的每个文件。用于强制更新文件元数据和重新扫描zip文件。",
+            "generate_image_phashes_during_scan": "生成图像感知哈希值",
+            "generate_image_phashes_during_scan_tooltip": "用于去重和识别。",
+            "backup_database": {
+                "description": "执行数据库和 blob 文件的备份。",
+                "destination": "目标位置",
+                "download": "下载备份",
+                "include_blobs": "在备份中包含blobs",
+                "include_blobs_desc": "禁用此功能后，仅备份 SQLite 数据库文件。",
+                "sqlite": "备份文件将是 SQLite 数据库文件的副本，文件名格式为 {filename_format}",
+                "to_directory": "到 {directory}",
+                "warning_blobs": "备份中不会包含 Blob 文件。这意味着，要成功从备份中恢复，Blob 文件必须存在于 Blob 存储位置。",
+                "zip": "SQLite 数据库文件和 blob 文件将被压缩到一个文件中，文件名格式为 {filename_format}"
+            }
         },
         "tools": {
             "scene_duplicate_checker": "短片重复性检查工具",
@@ -613,7 +644,7 @@
                 "option_label": "自定义样式已启用"
             },
             "custom_javascript": {
-                "description": "必须重新加载页面才能生效。不保证未来的Stash和客制的Javascript会兼容。",
+                "description": "必须重新加载页面才能生效。不保证未来的Stash和客制的JavaScript会兼容。",
                 "heading": "自定义 JavaScript",
                 "option_label": "自定义 JavaScript 已启用"
             },
@@ -633,13 +664,13 @@
             "desktop_integration": {
                 "desktop_integration": "桌面一体化",
                 "notifications_enabled": "允许通知",
-                "send_desktop_notifications_for_events": "传送事件给桌面通知",
-                "skip_opening_browser": "不打开浏览器",
-                "skip_opening_browser_on_startup": "启动时不自动打开浏览器"
+                "send_desktop_notifications_for_events": "作为事件发送桌面通知。",
+                "skip_opening_browser": "跳过打开浏览器",
+                "skip_opening_browser_on_startup": "启动时不自动打开浏览器。"
             },
             "editing": {
                 "disable_dropdown_create": {
-                    "description": "禁止下拉的选择器建立新的对象",
+                    "description": "禁止下拉的选择器建立新的对象。",
                     "heading": "禁止下拉菜单建立"
                 },
                 "heading": "编辑",
@@ -680,8 +711,8 @@
                 "sync": "同步"
             },
             "handy_connection_key": {
-                "description": "用于互动场景的快速连接密钥。设定此密匙会允许Stash分享你当前的短片资料到handyfeeling.com",
-                "heading": "快速连接密钥"
+                "description": "用于互动场景的快速连接密钥。设定此密匙会允许Stash分享你当前的短片资料到handyfeeling.com。",
+                "heading": "Handy 连接密钥"
             },
             "image_lightbox": {
                 "heading": "图片灯箱"
@@ -695,12 +726,12 @@
                 "heading": "图片",
                 "options": {
                     "write_image_thumbnails": {
-                        "description": "即时生成时把图片缩略写入硬盘",
+                        "description": "即时生成时把图片缩略写入硬盘。",
                         "heading": "写图片缩略"
                     },
                     "create_image_clips_from_videos": {
-                        "heading": "将视频格式扫描为图像片段",
-                        "description": "当某个库中存在不可用视频，视频文件（扩展名为视频格式）将被扫描为图像片段。"
+                        "heading": "将视频扩展名的文件扫描为图像片段",
+                        "description": "当某个库中存在不可用视频，视频文件（可见视频扩展名）将被扫描为图像片段。"
                     }
                 }
             },
@@ -709,12 +740,12 @@
                 "heading": "语言"
             },
             "max_loop_duration": {
-                "description": "播放器自动循环的最大短片长度 - 设置为0可以关闭此功能",
+                "description": "播放器自动循环的最大短片长度。设置为0可以关闭此功能。",
                 "heading": "自动重播最大时长"
             },
             "menu_items": {
-                "description": "在导航栏上显示或隐藏不同类型的内容",
-                "heading": "菜单列表"
+                "description": "在导航栏上显示或隐藏不同类型的内容。",
+                "heading": "菜单项目"
             },
             "minimum_play_percent": {
                 "description": "在播放量增加前短片必须要播放的百分比。",
@@ -723,7 +754,7 @@
             "performers": {
                 "options": {
                     "image_location": {
-                        "description": "默认演员图像的自定义路径。 留空以使用内置默认值",
+                        "description": "默认演员图像的自定义路径。 留空以使用内置默认值。",
                         "heading": "自定义演员图像路径"
                     }
                 }
@@ -749,11 +780,11 @@
                     "always_start_from_beginning": "视频一定从头开始播放",
                     "auto_start_video": "自动播放",
                     "auto_start_video_on_play_selected": {
-                        "description": "从视频序列，或从短片页面播放选择或随机视频时自动开始放视频",
+                        "description": "从视频序列，或从场景页面播放选择或随机视频时自动开始放视频。",
                         "heading": "当播放选择视频时自动开始"
                     },
                     "continue_playlist_default": {
-                        "description": "当视频结束时播放下一短片",
+                        "description": "当视频结束时播放下一短片。",
                         "heading": "默认继续播放清单"
                     },
                     "show_scrubber": "显示预览轴",
@@ -762,7 +793,7 @@
                         "description": "VR按钮仅在短片存在此标签时显示。",
                         "heading": "VR标签"
                     },
-                    "show_ab_loop_controls": "显示 AB 循环控制组件",
+                    "show_ab_loop_controls": "显示 AB 循环控制",
                     "disable_mobile_media_auto_rotate": "在移动设备中针对全屏幕媒体禁用自动旋转",
                     "enable_chromecast": "启用Chromecast",
                     "show_range_markers": "展示范围标记"
@@ -780,18 +811,18 @@
                 "heading": "转变所需的滑动尝试次数"
             },
             "show_tag_card_on_hover": {
-                "description": "当鼠标位于标签徽章上时显示标签牌",
+                "description": "当鼠标位于标签徽章上时显示标签牌。",
                 "heading": "标签牌的提示"
             },
             "slideshow_delay": {
-                "description": "在影音墙模式下，图库可用幻灯片功能",
+                "description": "在影音墙模式下，图库可用幻灯片功能。",
                 "heading": "幻灯片延迟（秒）"
             },
             "studio_panel": {
                 "heading": "工作室显示",
                 "options": {
                     "show_child_studio_content": {
-                        "description": "在工作室显示里，同时显示副工作室的内容",
+                        "description": "在工作室显示里，同时显示副工作室的内容。",
                         "heading": "显示副工作室内容"
                     }
                 }
@@ -800,7 +831,7 @@
                 "heading": "标签显示",
                 "options": {
                     "show_child_tagged_content": {
-                        "description": "在标签页面中，同时显示子标签的内容",
+                        "description": "在标签页面中，同时显示子标签的内容。",
                         "heading": "显示子标签内容"
                     }
                 }
@@ -810,11 +841,11 @@
                 "heading": "详情页面",
                 "show_all_details": {
                     "heading": "显示所有详情",
-                    "description": "启用后，默认情况下将显示所有详情，每个详情项目都将显示在一栏中"
+                    "description": "启用后，默认情况下将显示所有详情，每个详情项目都将显示在单独一栏中。"
                 },
                 "compact_expanded_details": {
                     "heading": "紧凑型扩展详情",
-                    "description": "启用后，该选项将显示扩展的详情，同时保持紧凑的显示效果"
+                    "description": "启用后，该选项将显示扩展的详情，同时保持紧凑的显示效果。"
                 },
                 "enable_background_image": {
                     "heading": "启用背景图像",
@@ -826,7 +857,7 @@
                 "heading": "直接提供funscripts服务"
             },
             "performer_list": {
-                "heading": "演员列表",
+                "heading": "表演者列表",
                 "options": {
                     "show_links_on_grid_card": {
                         "heading": "在演员网格卡片上显示链接"
@@ -836,9 +867,30 @@
             "sfw_mode": {
                 "description": "如果使用 stash 存储SFW(工作场合安全)内容，请启用。它隐藏或更改了 UI 中与成人内容相关的某些方面。",
                 "heading": "SFW(工作场合安全)内容模式"
+            },
+            "custom_title": {
+                "description": "附加在页面标题后的自定义文本。如果是空的，默认是“Stash”。",
+                "heading": "用户标题"
+            },
+            "troubleshooting_mode": {
+                "button": "故障排查模式",
+                "dialog_title": "启用故障排查模式",
+                "dialog_description": "这将暂时禁用所有自定义功能，以帮助诊断问题：",
+                "dialog_item_plugins": "所有插件",
+                "dialog_item_css": "自定义CSS样式",
+                "dialog_item_js": "自定义JavaScript脚本",
+                "dialog_item_locales": "自定义本地化",
+                "dialog_log_level": "日志级别将设置为Debug（调试），以便进行详细诊断。",
+                "dialog_reload_note": "页面将自动重新加载。",
+                "enable": "启用并刷新",
+                "overlay_message": "故障排查模式已激活——所有自定义功能均被禁用",
+                "exit": "退出"
             }
         },
-        "advanced_mode": "高级模式"
+        "advanced_mode": "高级模式",
+        "changelog": {
+            "header": "变更日志"
+        }
     },
     "configuration": "设置",
     "countables": {
@@ -858,7 +910,8 @@
     "criterion": {
         "greater_than": "大于",
         "less_than": "小于",
-        "value": "值"
+        "value": "值",
+        "unsupported": "{type} (未受支持)"
     },
     "criterion_modifier": {
         "between": "介于…之间",
@@ -926,7 +979,7 @@
             "page_header": "第 {page} 页，共 {total} 页",
             "reset_zoom_on_nav": "图片改动时重设缩放度",
             "scale_up": {
-                "description": "放大小图到整屏",
+                "description": "放大小图到整屏。",
                 "label": "放大图片以适应"
             },
             "scroll_mode": {
@@ -942,10 +995,6 @@
             "empty_results": "目标字段值将不变。",
             "source": "源"
         },
-        "merge_tags": {
-            "destination": "目标",
-            "source": "源"
-        },
         "reassign_entity_title": "{count, plural, one {Reassign {singularEntity}} 其它 {Reassign {pluralEntity}}}",
         "reassign_files": {
             "destination": "重新指定至"
@@ -966,7 +1015,7 @@
             "override_preview_generation_options": "覆盖预览生成选项",
             "override_preview_generation_options_desc": "覆盖此操作的“预览生成选项”。默认设置在“系统”->“生成预览”中。",
             "overwrite": "覆盖现有文件",
-            "phash": "感知识别码PHash",
+            "phash": "视频感知哈希值",
             "preview_exclude_end_time_desc": "从短片预览中排除最后 x 秒。可以是一个以秒为单位的值，也可以是百分比（比如2%）。",
             "preview_exclude_end_time_head": "排除结束时间",
             "preview_exclude_start_time_desc": "从短片预览中排除最开始 x 秒。可以是一个以秒为单位的值，也可以是百分比（比如2%）。",
@@ -987,7 +1036,9 @@
             "video_previews_tooltip": "鼠标悬停在短片上时播放的预览短片",
             "phash_tooltip": "针对去重和短片识别",
             "image_thumbnails": "图像缩略图",
-            "clip_previews": "图像片段预览"
+            "clip_previews": "图像片段预览",
+            "image_phash": "图像感知哈希值",
+            "image_phash_tooltip": "用于去重和识别"
         },
         "scenes_found": "找到 {count} 个短片",
         "scrape_entity_query": "{entity_type} 挖掘 查询指令",
@@ -1158,9 +1209,7 @@
     "measurements": "三围",
     "media_info": {
         "audio_codec": "声音编码",
-        "checksum": "校验值",
         "downloaded_from": "下载地址",
-        "hash": "识别码",
         "interactive_speed": "互动速度",
         "performer_card": {
             "age": "{age} {years_old}",
@@ -1171,7 +1220,11 @@
         "play_duration": "播放长度",
         "stream": "视频流地址",
         "video_codec": "视频编码",
-        "o_count": "高潮次数"
+        "o_count": "高潮次数",
+        "md5": "MD5 校验值",
+        "oshash": "oshash值",
+        "oshash_meaning": "OpenSubtitles 哈希值",
+        "phash_meaning": "感知哈希值"
     },
     "megabits_per_second": "{value} Mbps",
     "metadata": "元数据",
@@ -1204,14 +1257,6 @@
         "any_names_entered_will_be_queried": "任何输入的名字将会从远程的Stash-Box实例查询并且加入（如果找到）。只有完全符合的名字才会视为匹配。",
         "batch_add_performers": "批量添加演员",
         "batch_update_performers": "批量更新演员",
-        "config": {
-            "active_stash-box_instance": "当前使用的stash-box：",
-            "edit_excluded_fields": "编辑不包括的域名",
-            "excluded_fields": "不包括的域名：",
-            "no_fields_are_excluded": "没有不包括的域名",
-            "no_instances_found": "没有找到端点",
-            "these_fields_will_not_be_changed_when_updating_performers": "以下的域名在演员资料更新时不会被改变。"
-        },
         "current_page": "当前页面",
         "failed_to_save_performer": "保存演员 \"{performer}\" 失败",
         "name_already_exists": "演员名字已存在",
@@ -1387,7 +1432,8 @@
         "total_play_count": "总播放次数",
         "total_play_duration": "总播放时长",
         "scenes_played": "已播放的短片",
-        "total_o_count": "高潮总计"
+        "total_o_count": "高潮总计",
+        "total_o_count_sfw": "总点赞数"
     },
     "status": "状态：{statusText}",
     "studio": "工作室",
@@ -1420,7 +1466,11 @@
         "started_auto_tagging": "自动生成标签中",
         "started_generating": "生成资料中",
         "started_importing": "导入中",
-        "updated_entity": "已更新{entity}"
+        "updated_entity": "已更新{entity}",
+        "merged_performers": "合并的表演者",
+        "clipboard_access_denied": "剪贴板访问受阻。检查你浏览器的权限",
+        "clipboard_image_pasted": "粘贴剪贴板图像",
+        "clipboard_no_image": "没有图像在剪贴板中找到"
     },
     "total": "总计",
     "true": "是",
@@ -1446,14 +1496,8 @@
         "add_new_studios": "添加工作室",
         "updating_untagged_studios_description": "更新未标记的工作室将尝试匹配缺少Stash ID的工作室，并更新元数据。",
         "config": {
-            "edit_excluded_fields": "编辑排除字段",
             "create_parent_desc": "对于已存在且名称完全匹配的父（母）工作室创建缺失的父（母）工作室，或者标记并更新数据/图片",
-            "excluded_fields": "排除字段：",
-            "no_fields_are_excluded": "无已排除字段",
-            "create_parent_label": "创建上级工作室",
-            "active_stash-box_instance": "目前使用的 Stash-box 实例：",
-            "no_instances_found": "未找到实例",
-            "these_fields_will_not_be_changed_when_updating_studios": "更新工作室时不改变这些字段。"
+            "create_parent_label": "创建上级工作室"
         },
         "batch_add_studios": "批量添加工作室",
         "batch_update_studios": "批量更新工作室",
@@ -1592,5 +1636,53 @@
         "no_results": "没有结果被找到。",
         "placeholder_name_or_id": "{entityType} 名称或Stash编号……",
         "select_stashbox": "选择StashBox……"
-    }
+    },
+    "latest_scene": "最近的场景",
+    "stash_id_count": "Stash ID 统计",
+    "duplicated": "重复",
+    "duplicated_stash_id": "重复（Stash ID）",
+    "duplicated_title": "重复（标题）",
+    "career_end": "引退时间",
+    "career_start": "入行时间",
+    "tag_tagger": {
+        "add_new_tags": "增加新标签",
+        "any_names_entered_will_be_queried": "输入的任何名字都会从远程 Stash-Box 实例查询，并在找到后添加。只有完全匹配才算匹配。",
+        "batch_add_tags": "批量添加标签",
+        "batch_update_tags": "批量更新标签",
+        "current_page": "当前页面",
+        "failed_to_save_tag": "保存标签 \"{tag}\" 失败",
+        "name_already_exists": "名字已存在",
+        "network_error": "网络错误",
+        "no_results_found": "没有结果被找到。",
+        "number_of_tags_will_be_processed": "{tag_count} 个标签将被处理",
+        "query_all_tags_in_the_database": "数据库中的所有标签",
+        "refresh_tagged_tags": "刷新已标记的标签",
+        "refreshing_will_update_the_data": "刷新操作将会更新来自此 stash-box 实例中任何已被标记的标签。",
+        "status_tagging_job_queued": "状态：标记作业已入队列",
+        "status_tagging_tags": "状态：标记标签中",
+        "tag_already_tagged": "标签已被标记",
+        "tag_names_or_stashids_separated_by_comma": "英文逗号分隔的标签名称或StashID(可以是多个)",
+        "tag_selection": "标签选择",
+        "tag_successfully_tagged": "标签已被成功标记",
+        "tag_status": "标签状态",
+        "to_use_the_tag_tagger": "使用标记标签的功能，需要配置一个stash-box实例。",
+        "untagged_tags": "未标记的标签",
+        "update_tags": "更新标签",
+        "updating_untagged_tags_description": "更新未标记的标签时，会尝试匹配那些没有 stashid 的标签并更新元数据。"
+    },
+    "tagger": {
+        "config": {
+            "active_stash-box_instance": "使用中的 stash-box 实例：",
+            "edit_excluded_fields": "编辑被排除的字段",
+            "excluded_fields": "被排除的字段：",
+            "fields_will_not_be_changed": "更新 {entity} 时这些字段将不变。",
+            "no_fields_are_excluded": "没有字段被排除",
+            "no_instances_found": "没有找到实例"
+        }
+    },
+    "unsupported_criteria": "未支持标准：{criteria}",
+    "include_sub_folders": "包含自文件夹",
+    "parent_folder": "父母文件夹",
+    "sub_folder_depth": "子文件夹深度(留空为全部)",
+    "sub_folders": "子文件夹"
 }
diff --git a/ui/v2.5/src/locales/zh-TW.json b/ui/v2.5/src/locales/zh-TW.json
index 317d66f61..2c18d8907 100644
--- a/ui/v2.5/src/locales/zh-TW.json
+++ b/ui/v2.5/src/locales/zh-TW.json
@@ -58,8 +58,6 @@
         "logout": "登出",
         "make_primary": "設定為主檔案",
         "merge": "合併",
-        "merge_from": "與其他項目合併",
-        "merge_into": "合併至其他項目",
         "migrate_blobs": "遷移物件檔案",
         "migrate_scene_screenshots": "遷移短片截圖",
         "next_action": "下一步",
@@ -468,7 +466,6 @@
             "auto_tagging": "自動套用標籤",
             "backing_up_database": "備份資料庫中",
             "backup_and_download": "執行資料庫備份，並下載其生成的檔案。",
-            "backup_database": "將整個資料庫備份至與資料庫相同的目錄下，該匯出的名稱格式為 {filename_format}",
             "cleanup_desc": "檢查缺失的檔案，並將它們從資料庫中刪除。此動作具無法復原。",
             "data_management": "資料管理",
             "defaults_set": "已設定預設值；以後按下「{action}」按鈕時將會使用這些設定。",
@@ -906,10 +903,6 @@
             "empty_results": "目標值將保持不變。",
             "source": "源頭"
         },
-        "merge_tags": {
-            "destination": "目的地",
-            "source": "來源"
-        },
         "reassign_entity_title": "{count, plural, one {重新指定{singularEntity}}}",
         "reassign_files": {
             "destination": "重新指定至"
@@ -1107,9 +1100,7 @@
     "measurements": "三圍",
     "media_info": {
         "audio_codec": "音效編碼",
-        "checksum": "校驗值",
         "downloaded_from": "下載於",
-        "hash": "雜湊值",
         "interactive_speed": "互動速度",
         "performer_card": {
             "age": "{age} {years_old}",
@@ -1153,14 +1144,6 @@
         "any_names_entered_will_be_queried": "如果輸入的名稱有在設定的 Stash-Box 端點上找到的話，則相對應的結果將會被自動新增。只有完全符合的結果才會被視為匹配。",
         "batch_add_performers": "大量新增演員",
         "batch_update_performers": "大量更新演員",
-        "config": {
-            "active_stash-box_instance": "目前使用的 Stash-box：",
-            "edit_excluded_fields": "編輯排除的種類",
-            "excluded_fields": "已排除種類：",
-            "no_fields_are_excluded": "尚無排除任何種類",
-            "no_instances_found": "尚未設定端點",
-            "these_fields_will_not_be_changed_when_updating_performers": "以下種類的資訊將不會於更新演員時更動。"
-        },
         "current_page": "目前頁面",
         "failed_to_save_performer": "無法新增演員「{performer}」",
         "name_already_exists": "名稱已存在",
@@ -1457,14 +1440,8 @@
         "add_new_studios": "新增工作室",
         "batch_update_studios": "批量更新工作室",
         "config": {
-            "active_stash-box_instance": "目前使用的 Stash-box：",
             "create_parent_desc": "建立缺失的母工作室，或使用確切的名稱匹配標記和更新現有母工作室的資料/影象",
-            "create_parent_label": "建立家長工作室",
-            "edit_excluded_fields": "編輯排除的欄位",
-            "excluded_fields": "已排除欄位：",
-            "no_instances_found": "尚未設定端點",
-            "these_fields_will_not_be_changed_when_updating_studios": "更新工作室時不會更改這些欄位。",
-            "no_fields_are_excluded": "尚無排除任何欄位"
+            "create_parent_label": "建立家長工作室"
         },
         "any_names_entered_will_be_queried": "如果輸入的名稱有在設定的 Stash-Box 端點上找到的話，則相對應的結果將會被自動新增。只有完全符合的結果才會被視為匹配。",
         "batch_add_studios": "批量添加工作室",

From 679f49e400cb845e95a524b392d734a33eed3d08 Mon Sep 17 00:00:00 2001
From: feederbox826 <me@feederbox.cc>
Date: Wed, 18 Mar 2026 00:46:52 -0400
Subject: [PATCH 361/405] add {phash} argument to queryURLParameters (#6701)

---
 pkg/scraper/query_url.go                         | 6 ++++++
 ui/v2.5/src/docs/en/Manual/ScraperDevelopment.md | 1 +
 2 files changed, 7 insertions(+)

diff --git a/pkg/scraper/query_url.go b/pkg/scraper/query_url.go
index 2cd9f683e..7fe874947 100644
--- a/pkg/scraper/query_url.go
+++ b/pkg/scraper/query_url.go
@@ -17,6 +17,12 @@ func queryURLParametersFromScene(scene *models.Scene) queryURLParameters {
 	ret["oshash"] = scene.OSHash
 	ret["filename"] = filepath.Base(scene.Path)
 
+	// pull phash from primary file
+	phashFingerprints := scene.Files.Primary().Base().Fingerprints.Filter(models.FingerprintTypePhash)
+	if len(phashFingerprints) > 0 {
+		ret["phash"] = phashFingerprints[0].Value()
+	}
+
 	if scene.Title != "" {
 		ret["title"] = scene.Title
 	}
diff --git a/ui/v2.5/src/docs/en/Manual/ScraperDevelopment.md b/ui/v2.5/src/docs/en/Manual/ScraperDevelopment.md
index 4c97e3fcf..ca729c5a7 100644
--- a/ui/v2.5/src/docs/en/Manual/ScraperDevelopment.md
+++ b/ui/v2.5/src/docs/en/Manual/ScraperDevelopment.md
@@ -214,6 +214,7 @@ For `sceneByFragment` and `sceneByQueryFragment`, the `queryURL` field must also
 
 * `{checksum}` - the MD5 checksum of the scene
 * `{oshash}` - the oshash of the scene
+* `{phash}` - the phash of the scene
 * `{filename}` - the base filename of the scene
 * `{title}` - the title of the scene
 * `{url}` - the url of the scene

From f7b66c7ff9cf19955b308e03adde21214a82188e Mon Sep 17 00:00:00 2001
From: dev-null-life <dev-null-life@proton.me>
Date: Tue, 17 Mar 2026 23:57:54 -0500
Subject: [PATCH 362/405] Keep tag/entity select input focused after creating a
 new item (#6697)

* Keep creatable select input focused after creating a new item

When onCreateOption fires, setLoading(true) sets isDisabled on
AsyncCreatableSelect, which triggers a blur and the user loses focus.
Remove isLoading from the isDisabled condition so the input stays
interactive during the async creation; the loading spinner still shows.

Fixes #3998

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* Remove unused isLoading destructure in SelectComponent

isLoading flows through via ...props spread in componentProps and
no longer needs to be explicitly destructured.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* Apply Prettier formatting to FilterSelect.tsx

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 ui/v2.5/src/components/Shared/FilterSelect.tsx | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/ui/v2.5/src/components/Shared/FilterSelect.tsx b/ui/v2.5/src/components/Shared/FilterSelect.tsx
index 732b1cffb..e1c117aac 100644
--- a/ui/v2.5/src/components/Shared/FilterSelect.tsx
+++ b/ui/v2.5/src/components/Shared/FilterSelect.tsx
@@ -58,7 +58,6 @@ const SelectComponent = <T, IsMulti extends boolean>(
 ) => {
   const {
     selectedOptions,
-    isLoading,
     isDisabled = false,
     creatable = false,
     components,
@@ -101,10 +100,7 @@ const SelectComponent = <T, IsMulti extends boolean>(
   };
 
   return creatable ? (
-    <AsyncCreatableSelect
-      {...componentProps}
-      isDisabled={isLoading || isDisabled}
-    />
+    <AsyncCreatableSelect {...componentProps} isDisabled={isDisabled} />
   ) : (
     <AsyncSelect {...componentProps} />
   );

From 93fbb4be80e3027b013118eb81aa0fa5863a4f64 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Wed, 18 Mar 2026 15:58:32 +1100
Subject: [PATCH 363/405] Add option to ignore zip contents during clean
 (#6700)

* Add option to ignore zip file contents while cleaning

Speeds up the clean process with the assumption that files within zip files are not deleted.

* Add UI for new option
---
 graphql/schema/types/metadata.graphql              |  8 ++++++++
 internal/manager/manager_tasks.go                  |  2 ++
 internal/manager/task_clean.go                     |  7 ++++---
 pkg/file/clean.go                                  | 14 ++++++++++++--
 pkg/models/mocks/FileReaderWriter.go               | 14 +++++++-------
 pkg/models/mocks/FolderReaderWriter.go             | 14 +++++++-------
 pkg/models/repository_file.go                      |  2 +-
 pkg/models/repository_folder.go                    |  2 +-
 pkg/sqlite/file.go                                 |  6 +++++-
 pkg/sqlite/folder.go                               |  6 +++++-
 .../Settings/Tasks/DataManagementTasks.tsx         |  7 +++++++
 ui/v2.5/src/locales/en-GB.json                     |  2 ++
 12 files changed, 61 insertions(+), 23 deletions(-)

diff --git a/graphql/schema/types/metadata.graphql b/graphql/schema/types/metadata.graphql
index e2601150b..6ad620dbe 100644
--- a/graphql/schema/types/metadata.graphql
+++ b/graphql/schema/types/metadata.graphql
@@ -131,6 +131,14 @@ type ScanMetadataOptions {
 input CleanMetadataInput {
   paths: [String!]
 
+  """
+  Don't check zip file contents when determining whether to clean a file.
+  This can significantly speed up the clean process, but will potentially miss removed files within zip files.
+  Where users do not modify zip files contents directly, this should be safe to use.
+  Defaults to false.
+  """
+  ignoreZipFileContents: Boolean
+
   "Do a dry run. Don't delete any files"
   dryRun: Boolean!
 }
diff --git a/internal/manager/manager_tasks.go b/internal/manager/manager_tasks.go
index e3529c0b8..76938e9ff 100644
--- a/internal/manager/manager_tasks.go
+++ b/internal/manager/manager_tasks.go
@@ -314,6 +314,8 @@ type CleanMetadataInput struct {
 	Paths []string `json:"paths"`
 	// Do a dry run. Don't delete any files
 	DryRun bool `json:"dryRun"`
+
+	IgnoreZipFileContents bool `json:"ignoreZipFileContents"`
 }
 
 func (s *Manager) Clean(ctx context.Context, input CleanMetadataInput) int {
diff --git a/internal/manager/task_clean.go b/internal/manager/task_clean.go
index 6221d7d5f..67b7038b6 100644
--- a/internal/manager/task_clean.go
+++ b/internal/manager/task_clean.go
@@ -40,9 +40,10 @@ func (j *cleanJob) Execute(ctx context.Context, progress *job.Progress) error {
 	}
 
 	j.cleaner.Clean(ctx, file.CleanOptions{
-		Paths:      j.input.Paths,
-		DryRun:     j.input.DryRun,
-		PathFilter: newCleanFilter(instance.Config),
+		Paths:                 j.input.Paths,
+		DryRun:                j.input.DryRun,
+		IgnoreZipFileContents: j.input.IgnoreZipFileContents,
+		PathFilter:            newCleanFilter(instance.Config),
 	}, progress)
 
 	if job.IsCancelled(ctx) {
diff --git a/pkg/file/clean.go b/pkg/file/clean.go
index 111d5425c..369600f4c 100644
--- a/pkg/file/clean.go
+++ b/pkg/file/clean.go
@@ -33,6 +33,11 @@ type cleanJob struct {
 type CleanOptions struct {
 	Paths []string
 
+	// IgnoreZipFileContents will skip checking the contents of zip files when determining whether to clean a file.
+	// This can significantly speed up the clean process, but will potentially miss removed files within zip files.
+	// Where users do not modify zip files contents directly, this should be safe to use.
+	IgnoreZipFileContents bool
+
 	// Do a dry run. Don't delete any files
 	DryRun bool
 
@@ -174,13 +179,16 @@ func (j *cleanJob) assessFiles(ctx context.Context, toDelete *deleteSet) error {
 
 	more := true
 	r := j.Repository
+
+	includeZipContents := !j.options.IgnoreZipFileContents
+
 	if err := r.WithReadTxn(ctx, func(ctx context.Context) error {
 		for more {
 			if job.IsCancelled(ctx) {
 				return nil
 			}
 
-			files, err := r.File.FindAllInPaths(ctx, j.options.Paths, batchSize, offset)
+			files, err := r.File.FindAllInPaths(ctx, j.options.Paths, includeZipContents, batchSize, offset)
 			if err != nil {
 				return fmt.Errorf("error querying for files: %w", err)
 			}
@@ -258,6 +266,8 @@ func (j *cleanJob) assessFolders(ctx context.Context, toDelete *deleteSet) error
 	offset := 0
 	progress := j.progress
 
+	includeZipContents := !j.options.IgnoreZipFileContents
+
 	more := true
 	r := j.Repository
 	if err := r.WithReadTxn(ctx, func(ctx context.Context) error {
@@ -266,7 +276,7 @@ func (j *cleanJob) assessFolders(ctx context.Context, toDelete *deleteSet) error
 				return nil
 			}
 
-			folders, err := r.Folder.FindAllInPaths(ctx, j.options.Paths, batchSize, offset)
+			folders, err := r.Folder.FindAllInPaths(ctx, j.options.Paths, includeZipContents, batchSize, offset)
 			if err != nil {
 				return fmt.Errorf("error querying for folders: %w", err)
 			}
diff --git a/pkg/models/mocks/FileReaderWriter.go b/pkg/models/mocks/FileReaderWriter.go
index 97a0136e6..4b370459e 100644
--- a/pkg/models/mocks/FileReaderWriter.go
+++ b/pkg/models/mocks/FileReaderWriter.go
@@ -153,13 +153,13 @@ func (_m *FileReaderWriter) FindAllByPath(ctx context.Context, path string, case
 	return r0, r1
 }
 
-// FindAllInPaths provides a mock function with given fields: ctx, p, limit, offset
-func (_m *FileReaderWriter) FindAllInPaths(ctx context.Context, p []string, limit int, offset int) ([]models.File, error) {
-	ret := _m.Called(ctx, p, limit, offset)
+// FindAllInPaths provides a mock function with given fields: ctx, p, includeZipContents, limit, offset
+func (_m *FileReaderWriter) FindAllInPaths(ctx context.Context, p []string, includeZipContents bool, limit int, offset int) ([]models.File, error) {
+	ret := _m.Called(ctx, p, includeZipContents, limit, offset)
 
 	var r0 []models.File
-	if rf, ok := ret.Get(0).(func(context.Context, []string, int, int) []models.File); ok {
-		r0 = rf(ctx, p, limit, offset)
+	if rf, ok := ret.Get(0).(func(context.Context, []string, bool, int, int) []models.File); ok {
+		r0 = rf(ctx, p, includeZipContents, limit, offset)
 	} else {
 		if ret.Get(0) != nil {
 			r0 = ret.Get(0).([]models.File)
@@ -167,8 +167,8 @@ func (_m *FileReaderWriter) FindAllInPaths(ctx context.Context, p []string, limi
 	}
 
 	var r1 error
-	if rf, ok := ret.Get(1).(func(context.Context, []string, int, int) error); ok {
-		r1 = rf(ctx, p, limit, offset)
+	if rf, ok := ret.Get(1).(func(context.Context, []string, bool, int, int) error); ok {
+		r1 = rf(ctx, p, includeZipContents, limit, offset)
 	} else {
 		r1 = ret.Error(1)
 	}
diff --git a/pkg/models/mocks/FolderReaderWriter.go b/pkg/models/mocks/FolderReaderWriter.go
index 5d4d95027..bcca0acd1 100644
--- a/pkg/models/mocks/FolderReaderWriter.go
+++ b/pkg/models/mocks/FolderReaderWriter.go
@@ -86,13 +86,13 @@ func (_m *FolderReaderWriter) Find(ctx context.Context, id models.FolderID) (*mo
 	return r0, r1
 }
 
-// FindAllInPaths provides a mock function with given fields: ctx, p, limit, offset
-func (_m *FolderReaderWriter) FindAllInPaths(ctx context.Context, p []string, limit int, offset int) ([]*models.Folder, error) {
-	ret := _m.Called(ctx, p, limit, offset)
+// FindAllInPaths provides a mock function with given fields: ctx, p, includeZipContents, limit, offset
+func (_m *FolderReaderWriter) FindAllInPaths(ctx context.Context, p []string, includeZipContents bool, limit int, offset int) ([]*models.Folder, error) {
+	ret := _m.Called(ctx, p, includeZipContents, limit, offset)
 
 	var r0 []*models.Folder
-	if rf, ok := ret.Get(0).(func(context.Context, []string, int, int) []*models.Folder); ok {
-		r0 = rf(ctx, p, limit, offset)
+	if rf, ok := ret.Get(0).(func(context.Context, []string, bool, int, int) []*models.Folder); ok {
+		r0 = rf(ctx, p, includeZipContents, limit, offset)
 	} else {
 		if ret.Get(0) != nil {
 			r0 = ret.Get(0).([]*models.Folder)
@@ -100,8 +100,8 @@ func (_m *FolderReaderWriter) FindAllInPaths(ctx context.Context, p []string, li
 	}
 
 	var r1 error
-	if rf, ok := ret.Get(1).(func(context.Context, []string, int, int) error); ok {
-		r1 = rf(ctx, p, limit, offset)
+	if rf, ok := ret.Get(1).(func(context.Context, []string, bool, int, int) error); ok {
+		r1 = rf(ctx, p, includeZipContents, limit, offset)
 	} else {
 		r1 = ret.Error(1)
 	}
diff --git a/pkg/models/repository_file.go b/pkg/models/repository_file.go
index c851ce08c..e1ac0b213 100644
--- a/pkg/models/repository_file.go
+++ b/pkg/models/repository_file.go
@@ -14,7 +14,7 @@ type FileGetter interface {
 type FileFinder interface {
 	FileGetter
 	FindAllByPath(ctx context.Context, path string, caseSensitive bool) ([]File, error)
-	FindAllInPaths(ctx context.Context, p []string, limit, offset int) ([]File, error)
+	FindAllInPaths(ctx context.Context, p []string, includeZipContents bool, limit, offset int) ([]File, error)
 	FindByPath(ctx context.Context, path string, caseSensitive bool) (File, error)
 	FindByFingerprint(ctx context.Context, fp Fingerprint) ([]File, error)
 	FindByZipFileID(ctx context.Context, zipFileID FileID) ([]File, error)
diff --git a/pkg/models/repository_folder.go b/pkg/models/repository_folder.go
index 539d51cb9..67e3b141e 100644
--- a/pkg/models/repository_folder.go
+++ b/pkg/models/repository_folder.go
@@ -11,7 +11,7 @@ type FolderGetter interface {
 // FolderFinder provides methods to find folders.
 type FolderFinder interface {
 	FolderGetter
-	FindAllInPaths(ctx context.Context, p []string, limit, offset int) ([]*Folder, error)
+	FindAllInPaths(ctx context.Context, p []string, includeZipContents bool, limit, offset int) ([]*Folder, error)
 	FindByPath(ctx context.Context, path string, caseSensitive bool) (*Folder, error)
 	FindByZipFileID(ctx context.Context, zipFileID FileID) ([]*Folder, error)
 	FindByParentFolderID(ctx context.Context, parentFolderID FolderID) ([]*Folder, error)
diff --git a/pkg/sqlite/file.go b/pkg/sqlite/file.go
index ba925a448..b8e807e37 100644
--- a/pkg/sqlite/file.go
+++ b/pkg/sqlite/file.go
@@ -695,7 +695,7 @@ func (qb *FileStore) allInPaths(q *goqu.SelectDataset, p []string) *goqu.SelectD
 // FindAllByPaths returns the all files that are within any of the given paths.
 // Returns all if limit is < 0.
 // Returns all files if p is empty.
-func (qb *FileStore) FindAllInPaths(ctx context.Context, p []string, limit, offset int) ([]models.File, error) {
+func (qb *FileStore) FindAllInPaths(ctx context.Context, p []string, includeZipContents bool, limit, offset int) ([]models.File, error) {
 	table := qb.table()
 	folderTable := folderTableMgr.table
 
@@ -706,6 +706,10 @@ func (qb *FileStore) FindAllInPaths(ctx context.Context, p []string, limit, offs
 
 	q = qb.allInPaths(q, p)
 
+	if !includeZipContents {
+		q = q.Where(table.Col("zip_file_id").IsNull())
+	}
+
 	if limit > -1 {
 		q = q.Limit(uint(limit))
 	}
diff --git a/pkg/sqlite/folder.go b/pkg/sqlite/folder.go
index 549b40d31..83308d39a 100644
--- a/pkg/sqlite/folder.go
+++ b/pkg/sqlite/folder.go
@@ -427,10 +427,14 @@ func (qb *FolderStore) allInPaths(q *goqu.SelectDataset, p []string) *goqu.Selec
 // FindAllInPaths returns the all folders that are or are within any of the given paths.
 // Returns all if limit is < 0.
 // Returns all folders if p is empty.
-func (qb *FolderStore) FindAllInPaths(ctx context.Context, p []string, limit, offset int) ([]*models.Folder, error) {
+func (qb *FolderStore) FindAllInPaths(ctx context.Context, p []string, includeZipContents bool, limit, offset int) ([]*models.Folder, error) {
 	q := qb.selectDataset().Prepared(true)
 	q = qb.allInPaths(q, p)
 
+	if !includeZipContents {
+		q = q.Where(qb.table().Col("zip_file_id").IsNull())
+	}
+
 	if limit > -1 {
 		q = q.Limit(uint(limit))
 	}
diff --git a/ui/v2.5/src/components/Settings/Tasks/DataManagementTasks.tsx b/ui/v2.5/src/components/Settings/Tasks/DataManagementTasks.tsx
index a6bda7c09..0490a0f9d 100644
--- a/ui/v2.5/src/components/Settings/Tasks/DataManagementTasks.tsx
+++ b/ui/v2.5/src/components/Settings/Tasks/DataManagementTasks.tsx
@@ -145,6 +145,13 @@ const CleanOptions: React.FC<ICleanOptions> = ({
 
   return (
     <>
+      <BooleanSetting
+        id="clean-ignore-zip-contents"
+        checked={options.ignoreZipFileContents ?? false}
+        headingID="config.tasks.clean_ignore_zip_contents"
+        subHeadingID="config.tasks.clean_ignore_zip_contents_desc"
+        onChange={(v) => setOptions({ ignoreZipFileContents: v })}
+      />
       <BooleanSetting
         id="clean-dryrun"
         checked={options.dryRun}
diff --git a/ui/v2.5/src/locales/en-GB.json b/ui/v2.5/src/locales/en-GB.json
index b52697fc3..7ae381d70 100644
--- a/ui/v2.5/src/locales/en-GB.json
+++ b/ui/v2.5/src/locales/en-GB.json
@@ -527,6 +527,8 @@
         "zip": "SQLite database file and blob files will be zipped into a single file, with the filename {filename_format}"
       },
       "cleanup_desc": "Check for missing files and remove them from the database. This is a destructive action.",
+      "clean_ignore_zip_contents": "Ignore zip file contents",
+      "clean_ignore_zip_contents_desc": "Faster but will miss files removed inside zip files. Safe to enable if you don't delete files within zips.",
       "clean_generated": {
         "blob_files": "Blob files",
         "description": "Removes generated files without a corresponding database entry.",

From b76dd089f5042850eea83d5fdc54535d0e5f40fd Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Wed, 18 Mar 2026 16:04:18 +1100
Subject: [PATCH 364/405] Update changelog

---
 ui/v2.5/src/docs/en/Changelog/v0310.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ui/v2.5/src/docs/en/Changelog/v0310.md b/ui/v2.5/src/docs/en/Changelog/v0310.md
index c3fd89a40..af7ed159b 100644
--- a/ui/v2.5/src/docs/en/Changelog/v0310.md
+++ b/ui/v2.5/src/docs/en/Changelog/v0310.md
@@ -21,6 +21,7 @@
 * Extended duplicate criterion to filter by duplicated titles and stash IDs. ([#6344](https://github.com/stashapp/stash/pull/6344))
 * Extended missing criterion to add full coverage of fields. ([#6565](https://github.com/stashapp/stash/pull/6565))
 * Identify settings now allows for selecting included genders. ([#6557](https://github.com/stashapp/stash/pull/6557))
+* Added option to ignore files in zip files while cleaning. ([#6700](https://github.com/stashapp/stash/pull/6700))
 * Backup now provides an option to include blobs in a backup zip. ([#6586](https://github.com/stashapp/stash/pull/6586))
 * Added checkbox selection on wall and tagger views. ([#6476](https://github.com/stashapp/stash/pull/6476))
 * Performer career length field has been replaced with career start and end fields. ([#6449](https://github.com/stashapp/stash/pull/6449))
@@ -49,6 +50,7 @@
 * Installed plugins/scrapers no longer show in the available list. ([#6443](https://github.com/stashapp/stash/pull/6443))
 * Name is now populated when searching by stash-box. ([#6447](https://github.com/stashapp/stash/pull/6447))
 * Improved performance of group queries on large systems. ([#6478](https://github.com/stashapp/stash/pull/6478))
+* Added support for `{phash}` in `queryURL` scraper field. ([#6701](https://github.com/stashapp/stash/pull/6701))
 * Systray notification now shows the port stash is running on. ([#6448](https://github.com/stashapp/stash/pull/6448))
 
 ### 🐛 Bug fixes
@@ -61,6 +63,7 @@
 * Scanning no longer scans zip contents when the zip file is unchanged. ([#6633](https://github.com/stashapp/stash/pull/6633))
 * Captions are now correctly detected in a single scan. ([#6634](https://github.com/stashapp/stash/pull/6634))
 * Fixed mis-clicks on cards navigating to new page when selecting items. ([#6599](https://github.com/stashapp/stash/pull/6599), [#6649](https://github.com/stashapp/stash/pull/6649))
+* Select dropdown now retains focus after creating a new option. ([#6697](https://github.com/stashapp/stash/pull/6697))
 * Fixed custom field filtering not working correctly when query value was provided. ([#6614](https://github.com/stashapp/stash/pull/6614))
 * Fixed stale thumbnails after file content is changed. ([#6622](https://github.com/stashapp/stash/pull/6622))
 * Clicking on the scrubber in the scene player no longer pauses the video. ([#6336](https://github.com/stashapp/stash/pull/6336))

From 208c19a81d2d236f5aa26243d3216a2c45f37828 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Thu, 19 Mar 2026 08:50:42 +1100
Subject: [PATCH 365/405] Replace tag list view with tag list table (#6703)

* Replace tag list view with tag list table

Uses same styling as performer list table

* Remove "count" suffix from count headers in performer list
---
 .../Performers/PerformerListTable.tsx         |   6 +-
 ui/v2.5/src/components/Tags/TagList.tsx       | 123 +---------
 ui/v2.5/src/components/Tags/TagListTable.tsx  | 230 ++++++++++++++++++
 3 files changed, 244 insertions(+), 115 deletions(-)
 create mode 100644 ui/v2.5/src/components/Tags/TagListTable.tsx

diff --git a/ui/v2.5/src/components/Performers/PerformerListTable.tsx b/ui/v2.5/src/components/Performers/PerformerListTable.tsx
index 3b500cee6..c155d1298 100644
--- a/ui/v2.5/src/components/Performers/PerformerListTable.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerListTable.tsx
@@ -334,19 +334,19 @@ export const PerformerListTable: React.FC<IPerformerListTableProps> = (
     },
     {
       value: "scene_count",
-      label: intl.formatMessage({ id: "scene_count" }),
+      label: intl.formatMessage({ id: "scenes" }),
       defaultShow: true,
       render: SceneCountCell,
     },
     {
       value: "gallery_count",
-      label: intl.formatMessage({ id: "gallery_count" }),
+      label: intl.formatMessage({ id: "galleries" }),
       defaultShow: true,
       render: GalleryCountCell,
     },
     {
       value: "image_count",
-      label: intl.formatMessage({ id: "image_count" }),
+      label: intl.formatMessage({ id: "images" }),
       defaultShow: true,
       render: ImageCountCell,
     },
diff --git a/ui/v2.5/src/components/Tags/TagList.tsx b/ui/v2.5/src/components/Tags/TagList.tsx
index 38cc13141..8d6cbbeee 100644
--- a/ui/v2.5/src/components/Tags/TagList.tsx
+++ b/ui/v2.5/src/components/Tags/TagList.tsx
@@ -5,22 +5,17 @@ import { ListFilterModel } from "src/models/list-filter/filter";
 import { DisplayMode } from "src/models/list-filter/types";
 import { useFilteredItemList } from "../List/ItemList";
 import { Button } from "react-bootstrap";
-import { Link, useHistory } from "react-router-dom";
+import { useHistory } from "react-router-dom";
 import * as GQL from "src/core/generated-graphql";
 import {
   queryFindTagsForList,
-  mutateMetadataAutoTag,
   useFindTagsForList,
   useTagsDestroy,
 } from "src/core/StashService";
-import { useToast } from "src/hooks/Toast";
-import { FormattedMessage, FormattedNumber, useIntl } from "react-intl";
-import NavUtils from "src/utils/navigation";
-import { Icon } from "../Shared/Icon";
+import { FormattedMessage, useIntl } from "react-intl";
 import { DeleteEntityDialog } from "../Shared/DeleteEntityDialog";
 import { ExportDialog } from "../Shared/ExportDialog";
 import { tagRelationHook } from "../../core/tags";
-import { faTrashAlt } from "@fortawesome/free-solid-svg-icons";
 import { TagMergeModal } from "./TagMergeDialog";
 import { TagCardGrid } from "./TagCardGrid";
 import { EditTagsDialog } from "./EditTagsDialog";
@@ -51,17 +46,16 @@ import { Pagination, PaginationIndex } from "../List/Pagination";
 import { LoadedContent } from "../List/PagedList";
 import { SidebarBooleanFilter } from "../List/Filters/BooleanFilter";
 import { FavoriteTagCriterionOption } from "src/models/list-filter/criteria/favorite";
+import { TagListTable } from "./TagListTable";
 
 const TagList: React.FC<{
   tags: GQL.TagListDataFragment[];
   filter: ListFilterModel;
   selectedIds: Set<string>;
   onSelectChange: (id: string, selected: boolean, shiftKey: boolean) => void;
-  onDelete: (tag: GQL.TagListDataFragment) => void;
-  onAutoTag: (tag: GQL.TagListDataFragment) => void;
 }> = PatchComponent(
   "TagList",
-  ({ tags, filter, selectedIds, onSelectChange, onDelete, onAutoTag }) => {
+  ({ tags, filter, selectedIds, onSelectChange }) => {
     if (tags.length === 0 && filter.displayMode !== DisplayMode.Tagger) {
       return null;
     }
@@ -77,95 +71,13 @@ const TagList: React.FC<{
       );
     }
     if (filter.displayMode === DisplayMode.List) {
-      const tagElements = tags.map((tag) => {
-        return (
-          <div key={tag.id} className="tag-list-row row">
-            <Link to={`/tags/${tag.id}`}>{tag.name}</Link>
-
-            <div className="ml-auto">
-              <Button
-                variant="secondary"
-                className="tag-list-button"
-                onClick={() => onAutoTag(tag)}
-              >
-                <FormattedMessage id="actions.auto_tag" />
-              </Button>
-              <Button variant="secondary" className="tag-list-button">
-                <Link
-                  to={NavUtils.makeTagScenesUrl(tag)}
-                  className="tag-list-anchor"
-                >
-                  <FormattedMessage
-                    id="countables.scenes"
-                    values={{
-                      count: tag.scene_count ?? 0,
-                    }}
-                  />
-                  : <FormattedNumber value={tag.scene_count ?? 0} />
-                </Link>
-              </Button>
-              <Button variant="secondary" className="tag-list-button">
-                <Link
-                  to={NavUtils.makeTagImagesUrl(tag)}
-                  className="tag-list-anchor"
-                >
-                  <FormattedMessage
-                    id="countables.images"
-                    values={{
-                      count: tag.image_count ?? 0,
-                    }}
-                  />
-                  : <FormattedNumber value={tag.image_count ?? 0} />
-                </Link>
-              </Button>
-              <Button variant="secondary" className="tag-list-button">
-                <Link
-                  to={NavUtils.makeTagGalleriesUrl(tag)}
-                  className="tag-list-anchor"
-                >
-                  <FormattedMessage
-                    id="countables.galleries"
-                    values={{
-                      count: tag.gallery_count ?? 0,
-                    }}
-                  />
-                  : <FormattedNumber value={tag.gallery_count ?? 0} />
-                </Link>
-              </Button>
-              <Button variant="secondary" className="tag-list-button">
-                <Link
-                  to={NavUtils.makeTagSceneMarkersUrl(tag)}
-                  className="tag-list-anchor"
-                >
-                  <FormattedMessage
-                    id="countables.markers"
-                    values={{
-                      count: tag.scene_marker_count ?? 0,
-                    }}
-                  />
-                  : <FormattedNumber value={tag.scene_marker_count ?? 0} />
-                </Link>
-              </Button>
-              <span className="tag-list-count">
-                <FormattedMessage id="total" />:{" "}
-                <FormattedNumber
-                  value={
-                    (tag.scene_count || 0) +
-                    (tag.scene_marker_count || 0) +
-                    (tag.image_count || 0) +
-                    (tag.gallery_count || 0)
-                  }
-                />
-              </span>
-              <Button variant="danger" onClick={() => onDelete(tag)}>
-                <Icon icon={faTrashAlt} color="danger" />
-              </Button>
-            </div>
-          </div>
-        );
-      });
-
-      return <div className="col col-sm-8 m-auto">{tagElements}</div>;
+      return (
+        <TagListTable
+          tags={tags}
+          selectedIds={selectedIds}
+          onSelectChange={onSelectChange}
+        />
+      );
     }
     if (filter.displayMode === DisplayMode.Tagger) {
       return <TagTagger tags={tags} />;
@@ -287,7 +199,6 @@ export const FilteredTagList = PatchComponent(
   (props: ITagList) => {
     const intl = useIntl();
     const history = useHistory();
-    const Toast = useToast();
 
     const searchFocus = useFocus();
 
@@ -433,16 +344,6 @@ export const FilteredTagList = PatchComponent(
       );
     }
 
-    async function onAutoTag(tag: GQL.TagListDataFragment) {
-      if (!tag) return;
-      try {
-        await mutateMetadataAutoTag({ tags: [tag.id] });
-        Toast.success(intl.formatMessage({ id: "toast.started_auto_tagging" }));
-      } catch (e) {
-        Toast.error(e);
-      }
-    }
-
     const convertedExtraOperations = extraOperations.map((op) => ({
       text: op.text,
       onClick: () => op.onClick(result, filter, selectedIds),
@@ -566,8 +467,6 @@ export const FilteredTagList = PatchComponent(
                   tags={items}
                   selectedIds={selectedIds}
                   onSelectChange={onSelectChange}
-                  onDelete={(tag) => onDelete(tag)}
-                  onAutoTag={(tag) => onAutoTag(tag)}
                 />
               </LoadedContent>
 
diff --git a/ui/v2.5/src/components/Tags/TagListTable.tsx b/ui/v2.5/src/components/Tags/TagListTable.tsx
new file mode 100644
index 000000000..f593c0d1f
--- /dev/null
+++ b/ui/v2.5/src/components/Tags/TagListTable.tsx
@@ -0,0 +1,230 @@
+/* eslint-disable jsx-a11y/control-has-associated-label */
+
+import React from "react";
+import { useIntl } from "react-intl";
+import { Button } from "react-bootstrap";
+import { Link } from "react-router-dom";
+import * as GQL from "src/core/generated-graphql";
+import { Icon } from "../Shared/Icon";
+import NavUtils from "src/utils/navigation";
+import { faHeart } from "@fortawesome/free-solid-svg-icons";
+import { useTagUpdate } from "src/core/StashService";
+import { useTableColumns } from "src/hooks/useTableColumns";
+import cx from "classnames";
+import { IColumn, ListTable } from "../List/ListTable";
+
+interface ITagListTableProps {
+  tags: GQL.TagListDataFragment[];
+  selectedIds: Set<string>;
+  onSelectChange: (id: string, selected: boolean, shiftKey: boolean) => void;
+}
+
+const TABLE_NAME = "tags";
+
+export const TagListTable: React.FC<ITagListTableProps> = (
+  props: ITagListTableProps
+) => {
+  const intl = useIntl();
+
+  const [updateTag] = useTagUpdate();
+
+  function setFavorite(v: boolean, tagId: string) {
+    if (tagId) {
+      updateTag({
+        variables: {
+          input: {
+            id: tagId,
+            favorite: v,
+          },
+        },
+      });
+    }
+  }
+
+  const ImageCell = (tag: GQL.TagListDataFragment) => (
+    <Link to={`/tags/${tag.id}`}>
+      <img
+        loading="lazy"
+        className="image-thumbnail"
+        alt={tag.name ?? ""}
+        src={tag.image_path ?? ""}
+      />
+    </Link>
+  );
+
+  const NameCell = (tag: GQL.TagListDataFragment) => (
+    <Link to={`/tags/${tag.id}`}>
+      <div className="ellips-data" title={tag.name}>
+        {tag.name}
+      </div>
+    </Link>
+  );
+
+  const AliasesCell = (tag: GQL.TagListDataFragment) => {
+    let aliases = tag.aliases ? tag.aliases.join(", ") : "";
+    return (
+      <span className="ellips-data" title={aliases}>
+        {aliases}
+      </span>
+    );
+  };
+
+  const FavoriteCell = (tag: GQL.TagListDataFragment) => (
+    <Button
+      className={cx("minimal", tag.favorite ? "favorite" : "not-favorite")}
+      onClick={() => setFavorite(!tag.favorite, tag.id)}
+    >
+      <Icon icon={faHeart} />
+    </Button>
+  );
+
+  const SceneCountCell = (tag: GQL.TagListDataFragment) => (
+    <Link to={NavUtils.makeTagScenesUrl(tag)}>
+      <span>{tag.scene_count}</span>
+    </Link>
+  );
+
+  const GalleryCountCell = (tag: GQL.TagListDataFragment) => (
+    <Link to={NavUtils.makeTagGalleriesUrl(tag)}>
+      <span>{tag.gallery_count}</span>
+    </Link>
+  );
+
+  const ImageCountCell = (tag: GQL.TagListDataFragment) => (
+    <Link to={NavUtils.makeTagImagesUrl(tag)}>
+      <span>{tag.image_count}</span>
+    </Link>
+  );
+
+  const GroupCountCell = (tag: GQL.TagListDataFragment) => (
+    <Link to={NavUtils.makeTagGroupsUrl(tag)}>
+      <span>{tag.group_count}</span>
+    </Link>
+  );
+
+  const StudioCountCell = (tag: GQL.TagListDataFragment) => (
+    <Link to={NavUtils.makeTagStudiosUrl(tag)}>
+      <span>{tag.studio_count}</span>
+    </Link>
+  );
+
+  const PerformerCountCell = (tag: GQL.TagListDataFragment) => (
+    <Link to={NavUtils.makeTagPerformersUrl(tag)}>
+      <span>{tag.performer_count}</span>
+    </Link>
+  );
+
+  interface IColumnSpec {
+    value: string;
+    label: string;
+    defaultShow?: boolean;
+    mandatory?: boolean;
+    render?: (tag: GQL.TagListDataFragment, index: number) => React.ReactNode;
+  }
+
+  const allColumns: IColumnSpec[] = [
+    {
+      value: "image",
+      label: intl.formatMessage({ id: "image" }),
+      defaultShow: true,
+      render: ImageCell,
+    },
+    {
+      value: "name",
+      label: intl.formatMessage({ id: "name" }),
+      mandatory: true,
+      defaultShow: true,
+      render: NameCell,
+    },
+    {
+      value: "aliases",
+      label: intl.formatMessage({ id: "aliases" }),
+      defaultShow: true,
+      render: AliasesCell,
+    },
+    {
+      value: "favourite",
+      label: intl.formatMessage({ id: "favourite" }),
+      defaultShow: true,
+      render: FavoriteCell,
+    },
+    {
+      value: "scene_count",
+      label: intl.formatMessage({ id: "scenes" }),
+      defaultShow: true,
+      render: SceneCountCell,
+    },
+    {
+      value: "gallery_count",
+      label: intl.formatMessage({ id: "galleries" }),
+      defaultShow: true,
+      render: GalleryCountCell,
+    },
+    {
+      value: "image_count",
+      label: intl.formatMessage({ id: "images" }),
+      defaultShow: true,
+      render: ImageCountCell,
+    },
+    {
+      value: "group_count",
+      label: intl.formatMessage({ id: "groups" }),
+      defaultShow: true,
+      render: GroupCountCell,
+    },
+    {
+      value: "performer_count",
+      label: intl.formatMessage({ id: "performers" }),
+      defaultShow: true,
+      render: PerformerCountCell,
+    },
+    {
+      value: "studio_count",
+      label: intl.formatMessage({ id: "studios" }),
+      defaultShow: true,
+      render: StudioCountCell,
+    },
+  ];
+
+  const defaultColumns = allColumns
+    .filter((col) => col.defaultShow)
+    .map((col) => col.value);
+
+  const { selectedColumns, saveColumns } = useTableColumns(
+    TABLE_NAME,
+    defaultColumns
+  );
+
+  const columnRenderFuncs: Record<
+    string,
+    (tag: GQL.TagListDataFragment, index: number) => React.ReactNode
+  > = {};
+  allColumns.forEach((col) => {
+    if (col.render) {
+      columnRenderFuncs[col.value] = col.render;
+    }
+  });
+
+  function renderCell(
+    column: IColumn,
+    tag: GQL.TagListDataFragment,
+    index: number
+  ) {
+    const render = columnRenderFuncs[column.value];
+
+    if (render) return render(tag, index);
+  }
+
+  return (
+    <ListTable
+      className="tag-table"
+      items={props.tags}
+      allColumns={allColumns}
+      columns={selectedColumns}
+      setColumns={(c) => saveColumns(c)}
+      selectedIds={props.selectedIds}
+      onSelectChange={props.onSelectChange}
+      renderCell={renderCell}
+    />
+  );
+};

From b47134112a8c7fb078fd70438e916e890daba2a0 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Thu, 19 Mar 2026 08:51:04 +1100
Subject: [PATCH 366/405] Focus search field when clicking on scraper menu
 (#6704)

* Focus search field when opening scraper menu
* Improve styling of search header in scraper menu
---
 ui/v2.5/src/components/Shared/ScraperMenu.tsx | 36 +++++++++++--------
 ui/v2.5/src/components/Shared/styles.scss     |  7 ++--
 2 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/ui/v2.5/src/components/Shared/ScraperMenu.tsx b/ui/v2.5/src/components/Shared/ScraperMenu.tsx
index 4cc38b6f8..9bdb84d45 100644
--- a/ui/v2.5/src/components/Shared/ScraperMenu.tsx
+++ b/ui/v2.5/src/components/Shared/ScraperMenu.tsx
@@ -6,6 +6,8 @@ import { stashboxDisplayName } from "src/utils/stashbox";
 import { ScraperSourceInput, StashBox } from "src/core/generated-graphql";
 import { faSyncAlt } from "@fortawesome/free-solid-svg-icons";
 import { ClearableInput } from "./ClearableInput";
+import useFocus from "src/utils/focus";
+import ScreenUtils from "src/utils/screen";
 
 export const ScraperMenu: React.FC<{
   toggle: React.ReactNode;
@@ -25,6 +27,10 @@ export const ScraperMenu: React.FC<{
   const intl = useIntl();
   const [filter, setFilter] = useState("");
 
+  const focusOnOpen = !ScreenUtils.isTouch();
+  const focusRef = useFocus();
+  const [, setFocus] = focusRef;
+
   const filteredStashboxes = useMemo(() => {
     if (!stashBoxes) return [];
     if (!filter) return stashBoxes;
@@ -48,25 +54,27 @@ export const ScraperMenu: React.FC<{
     <Dropdown
       className="scraper-menu"
       title={intl.formatMessage({ id: "actions.scrape_query" })}
+      onToggle={(v) => {
+        if (focusOnOpen && v) setTimeout(() => setFocus(true), 0);
+      }}
     >
       <Dropdown.Toggle variant={variant}>{toggle}</Dropdown.Toggle>
 
       <Dropdown.Menu>
         <div className="scraper-filter-container">
-          <div className="btn-group">
-            <ClearableInput
-              placeholder={`${intl.formatMessage({ id: "filter" })}...`}
-              value={filter}
-              setValue={setFilter}
-            />
-            <Button
-              onClick={onReloadScrapers}
-              className="reload-button"
-              title={intl.formatMessage({ id: "actions.reload_scrapers" })}
-            >
-              <Icon icon={faSyncAlt} />
-            </Button>
-          </div>
+          <ClearableInput
+            placeholder={`${intl.formatMessage({ id: "filter" })}...`}
+            value={filter}
+            setValue={setFilter}
+            focus={focusRef}
+          />
+          <Button
+            onClick={onReloadScrapers}
+            className="reload-button"
+            title={intl.formatMessage({ id: "actions.reload_scrapers" })}
+          >
+            <Icon icon={faSyncAlt} />
+          </Button>
         </div>
 
         {filteredStashboxes.map((s, index) => (
diff --git a/ui/v2.5/src/components/Shared/styles.scss b/ui/v2.5/src/components/Shared/styles.scss
index 709712231..21e6eb696 100644
--- a/ui/v2.5/src/components/Shared/styles.scss
+++ b/ui/v2.5/src/components/Shared/styles.scss
@@ -766,15 +766,14 @@ button.btn.favorite-button {
   .scraper-filter-container {
     background-color: $secondary;
     border-bottom: solid 1px $textfield-bg;
+    display: flex;
     padding: 5px;
     position: sticky;
     top: 0;
     z-index: 1;
 
-    .btn-group {
-      border: solid 1px $textfield-bg;
-      border-radius: 5px;
-      width: 100%;
+    .clearable-input-group {
+      flex-grow: 1;
     }
 
     .clearable-text-field {

From 8f3188ff743d2f02e1900a3715ce2c70d120f126 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Thu, 19 Mar 2026 08:54:44 +1100
Subject: [PATCH 367/405] Make gallery/scene association during scan more
 consistent (#6705)

---
 internal/manager/task_scan.go           | 12 ++++----
 pkg/gallery/scan.go                     |  1 -
 pkg/image/scan.go                       | 39 ++++++++++++++++++++++--
 pkg/models/mocks/GalleryReaderWriter.go | 14 +++++++++
 pkg/models/repository_gallery.go        |  1 +
 pkg/scene/scan.go                       | 40 ++++++++++++++++++++++++-
 pkg/sqlite/gallery.go                   |  4 +++
 7 files changed, 102 insertions(+), 9 deletions(-)

diff --git a/internal/manager/task_scan.go b/internal/manager/task_scan.go
index 53e6944b5..22849124c 100644
--- a/internal/manager/task_scan.go
+++ b/internal/manager/task_scan.go
@@ -660,8 +660,9 @@ func getScanHandlers(options ScanMetadataInput, taskQueue *job.TaskQueue, progre
 		&file.FilteredHandler{
 			Filter: file.FilterFunc(imageFileFilter),
 			Handler: &image.ScanHandler{
-				CreatorUpdater: r.Image,
-				GalleryFinder:  r.Gallery,
+				CreatorUpdater:     r.Image,
+				GalleryFinder:      r.Gallery,
+				SceneFinderUpdater: r.Scene,
 				ScanGenerator: &imageGenerators{
 					input:              options,
 					taskQueue:          taskQueue,
@@ -690,9 +691,10 @@ func getScanHandlers(options ScanMetadataInput, taskQueue *job.TaskQueue, progre
 		&file.FilteredHandler{
 			Filter: file.FilterFunc(videoFileFilter),
 			Handler: &scene.ScanHandler{
-				CreatorUpdater: r.Scene,
-				CaptionUpdater: r.File,
-				PluginCache:    pluginCache,
+				CreatorUpdater:       r.Scene,
+				GalleryFinderUpdater: r.Gallery,
+				CaptionUpdater:       r.File,
+				PluginCache:          pluginCache,
 				ScanGenerator: &sceneGenerators{
 					input:               options,
 					taskQueue:           taskQueue,
diff --git a/pkg/gallery/scan.go b/pkg/gallery/scan.go
index b3e5d2c3c..7689bb9b6 100644
--- a/pkg/gallery/scan.go
+++ b/pkg/gallery/scan.go
@@ -24,7 +24,6 @@ type ScanCreatorUpdater interface {
 
 type ScanSceneFinderUpdater interface {
 	FindByPath(ctx context.Context, p string) ([]*models.Scene, error)
-	Update(ctx context.Context, updatedScene *models.Scene) error
 	AddGalleryIDs(ctx context.Context, sceneID int, galleryIDs []int) error
 }
 
diff --git a/pkg/image/scan.go b/pkg/image/scan.go
index 99b31f698..682641e66 100644
--- a/pkg/image/scan.go
+++ b/pkg/image/scan.go
@@ -7,6 +7,7 @@ import (
 	"os"
 	"path/filepath"
 	"slices"
+	"strings"
 
 	"github.com/stashapp/stash/pkg/logger"
 	"github.com/stashapp/stash/pkg/models"
@@ -39,6 +40,11 @@ type GalleryFinderCreator interface {
 	UpdatePartial(ctx context.Context, id int, updatedGallery models.GalleryPartial) (*models.Gallery, error)
 }
 
+type ScanSceneFinderUpdater interface {
+	FindByPath(ctx context.Context, p string) ([]*models.Scene, error)
+	AddGalleryIDs(ctx context.Context, sceneID int, galleryIDs []int) error
+}
+
 type ScanConfig interface {
 	GetCreateGalleriesFromFolders() bool
 }
@@ -48,8 +54,9 @@ type ScanGenerator interface {
 }
 
 type ScanHandler struct {
-	CreatorUpdater ScanCreatorUpdater
-	GalleryFinder  GalleryFinderCreator
+	CreatorUpdater     ScanCreatorUpdater
+	GalleryFinder      GalleryFinderCreator
+	SceneFinderUpdater ScanSceneFinderUpdater
 
 	ScanGenerator ScanGenerator
 
@@ -322,11 +329,39 @@ func (h *ScanHandler) getOrCreateZipBasedGallery(ctx context.Context, zipFile mo
 		return nil, fmt.Errorf("creating zip-based gallery: %w", err)
 	}
 
+	// try to associate with scene
+	if err := h.associateScene(ctx, &newGallery, zipFile); err != nil {
+		return nil, fmt.Errorf("associating scene: %w", err)
+	}
+
 	h.PluginCache.RegisterPostHooks(ctx, newGallery.ID, hook.GalleryCreatePost, nil, nil)
 
 	return &newGallery, nil
 }
 
+func (h *ScanHandler) associateScene(ctx context.Context, existing *models.Gallery, zipFile models.File) error {
+	galleryIDs := []int{existing.ID}
+
+	path := zipFile.Base().Path
+	withoutExt := strings.TrimSuffix(path, filepath.Ext(path)) + ".*"
+
+	// find scenes with a file that matches
+	scenes, err := h.SceneFinderUpdater.FindByPath(ctx, withoutExt)
+	if err != nil {
+		return err
+	}
+
+	for _, scene := range scenes {
+		// found related Scene
+		logger.Infof("associate: Gallery %s is related to scene: %d", path, scene.ID)
+		if err := h.SceneFinderUpdater.AddGalleryIDs(ctx, scene.ID, galleryIDs); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
 func (h *ScanHandler) getOrCreateGallery(ctx context.Context, f models.File) (*models.Gallery, error) {
 	// don't create folder-based galleries for files in zip file
 	if f.Base().ZipFile != nil {
diff --git a/pkg/models/mocks/GalleryReaderWriter.go b/pkg/models/mocks/GalleryReaderWriter.go
index f20d9f76e..e835ea2bc 100644
--- a/pkg/models/mocks/GalleryReaderWriter.go
+++ b/pkg/models/mocks/GalleryReaderWriter.go
@@ -49,6 +49,20 @@ func (_m *GalleryReaderWriter) AddImages(ctx context.Context, galleryID int, ima
 	return r0
 }
 
+// AddSceneIDs provides a mock function with given fields: ctx, galleryID, sceneIDs
+func (_m *GalleryReaderWriter) AddSceneIDs(ctx context.Context, galleryID int, sceneIDs []int) error {
+	ret := _m.Called(ctx, galleryID, sceneIDs)
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context, int, []int) error); ok {
+		r0 = rf(ctx, galleryID, sceneIDs)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
 // All provides a mock function with given fields: ctx
 func (_m *GalleryReaderWriter) All(ctx context.Context) ([]*models.Gallery, error) {
 	ret := _m.Called(ctx)
diff --git a/pkg/models/repository_gallery.go b/pkg/models/repository_gallery.go
index b8f1452f3..8fc3b29d5 100644
--- a/pkg/models/repository_gallery.go
+++ b/pkg/models/repository_gallery.go
@@ -83,6 +83,7 @@ type GalleryWriter interface {
 
 	CustomFieldsWriter
 
+	AddSceneIDs(ctx context.Context, galleryID int, sceneIDs []int) error
 	AddFileID(ctx context.Context, id int, fileID FileID) error
 	AddImages(ctx context.Context, galleryID int, imageIDs ...int) error
 	RemoveImages(ctx context.Context, galleryID int, imageIDs ...int) error
diff --git a/pkg/scene/scan.go b/pkg/scene/scan.go
index c70c44a9e..c9cc2c567 100644
--- a/pkg/scene/scan.go
+++ b/pkg/scene/scan.go
@@ -4,6 +4,8 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"path/filepath"
+	"strings"
 
 	"github.com/stashapp/stash/pkg/file/video"
 	"github.com/stashapp/stash/pkg/logger"
@@ -32,12 +34,18 @@ type ScanCreatorUpdater interface {
 	AddFileID(ctx context.Context, id int, fileID models.FileID) error
 }
 
+type ScanGalleryFinderUpdater interface {
+	FindByPath(ctx context.Context, p string) ([]*models.Gallery, error)
+	AddSceneIDs(ctx context.Context, galleryID int, sceneIDs []int) error
+}
+
 type ScanGenerator interface {
 	Generate(ctx context.Context, s *models.Scene, f *models.VideoFile) error
 }
 
 type ScanHandler struct {
-	CreatorUpdater ScanCreatorUpdater
+	CreatorUpdater       ScanCreatorUpdater
+	GalleryFinderUpdater ScanGalleryFinderUpdater
 
 	ScanGenerator  ScanGenerator
 	CaptionUpdater video.CaptionUpdater
@@ -127,6 +135,10 @@ func (h *ScanHandler) Handle(ctx context.Context, f models.File, oldFile models.
 		}
 	}
 
+	if err := h.associateGallery(ctx, existing, f); err != nil {
+		return err
+	}
+
 	// do this after the commit so that cover generation doesn't hold up the transaction
 	txn.AddPostCommitHook(ctx, func(ctx context.Context) {
 		for _, s := range existing {
@@ -175,3 +187,29 @@ func (h *ScanHandler) associateExisting(ctx context.Context, existing []*models.
 
 	return nil
 }
+
+func (h *ScanHandler) associateGallery(ctx context.Context, existing []*models.Scene, f models.File) error {
+	sceneIDs := make([]int, len(existing))
+	for i, s := range existing {
+		sceneIDs[i] = s.ID
+	}
+
+	path := f.Base().Path
+	zipPath := strings.TrimSuffix(path, filepath.Ext(path)) + ".zip"
+
+	// find galleries with a file that matches
+	galleries, err := h.GalleryFinderUpdater.FindByPath(ctx, zipPath)
+	if err != nil {
+		return err
+	}
+
+	for _, gallery := range galleries {
+		// found related Scene
+		logger.Infof("associate: Scene %s is related to gallery: %d", path, gallery.ID)
+		if err := h.GalleryFinderUpdater.AddSceneIDs(ctx, gallery.ID, sceneIDs); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
diff --git a/pkg/sqlite/gallery.go b/pkg/sqlite/gallery.go
index 305b1fe09..ad7a94b04 100644
--- a/pkg/sqlite/gallery.go
+++ b/pkg/sqlite/gallery.go
@@ -926,3 +926,7 @@ func (qb *GalleryStore) ResetCover(ctx context.Context, galleryID int) error {
 func (qb *GalleryStore) GetSceneIDs(ctx context.Context, id int) ([]int, error) {
 	return galleryRepository.scenes.getIDs(ctx, id)
 }
+
+func (qb *GalleryStore) AddSceneIDs(ctx context.Context, galleryID int, sceneIDs []int) error {
+	return galleriesScenesTableMgr.insertJoins(ctx, galleryID, sceneIDs)
+}

From 4167224107e8749347601854b5c8da953a0ae0f0 Mon Sep 17 00:00:00 2001
From: Stash-KennyG <138793998+Stash-KennyG@users.noreply.github.com>
Date: Wed, 18 Mar 2026 20:03:36 -0400
Subject: [PATCH 368/405] Feature: Add StashID guid consideration into select
 boxes (#6709)

* Add GUID search for performers in PerformerSelect component
* Refactor and apply to all objects with stash ids
---------
Co-authored-by: KennyG <kennyg@kennyg.com>
Co-authored-by: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
---
 .../components/Performers/PerformerSelect.tsx | 26 ++++++++---
 ui/v2.5/src/components/Scenes/SceneSelect.tsx | 44 +++++++++++++------
 .../src/components/Shared/FilterSelect.tsx    |  7 +++
 .../src/components/Studios/StudioSelect.tsx   | 41 ++++++++++++-----
 ui/v2.5/src/components/Tags/TagSelect.tsx     | 41 ++++++++++++-----
 ui/v2.5/src/models/list-filter/utils.ts       | 12 +++++
 ui/v2.5/src/utils/stashIds.ts                 |  6 ++-
 7 files changed, 136 insertions(+), 41 deletions(-)
 create mode 100644 ui/v2.5/src/models/list-filter/utils.ts

diff --git a/ui/v2.5/src/components/Performers/PerformerSelect.tsx b/ui/v2.5/src/components/Performers/PerformerSelect.tsx
index f10519897..133ffd854 100644
--- a/ui/v2.5/src/components/Performers/PerformerSelect.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerSelect.tsx
@@ -23,6 +23,7 @@ import {
   IFilterProps,
   IFilterValueProps,
   Option as SelectOption,
+  toOption,
 } from "../Shared/FilterSelect";
 import { useCompare } from "src/hooks/state";
 import { Link } from "react-router-dom";
@@ -32,6 +33,8 @@ import { TruncatedText } from "../Shared/TruncatedText";
 import TextUtils from "src/utils/text";
 import { PerformerPopover } from "./PerformerPopover";
 import { Placement } from "react-bootstrap/esm/Overlay";
+import { isUUID } from "src/utils/stashIds";
+import { filterByStashID } from "src/models/list-filter/utils";
 
 export type SelectObject = {
   id: string;
@@ -91,19 +94,32 @@ const _PerformerSelect: React.FC<
 
   async function loadPerformers(input: string): Promise<Option[]> {
     const filter = new ListFilterModel(GQL.FilterMode.Performers);
-    filter.searchTerm = input;
     filter.currentPage = 1;
     filter.itemsPerPage = maxOptionsShown;
     filter.sortBy = "name";
     filter.sortDirection = GQL.SortDirectionEnum.Asc;
+
+    // If the input looks like a GUID, search for stash_id first and return match immediately
+    if (isUUID(input)) {
+      filterByStashID(filter, input);
+
+      const query = await queryFindPerformersForSelect(filter);
+      const matches = query.data.findPerformers.performers.slice();
+      if (matches.length > 0) {
+        // Matches found, return them immediately.
+        return matches.map(toOption);
+      }
+      // If no stash_id matches found, continue with standard name/alias search.
+      filter.criteria = []; // Clear stash_id criterion to search by name/alias below.
+    }
+
+    filter.searchTerm = input;
+
     const query = await queryFindPerformersForSelect(filter);
     return performerSelectSort(
       input,
       query.data.findPerformers.performers.slice()
-    ).map((performer) => ({
-      value: performer.id,
-      object: performer,
-    }));
+    ).map(toOption);
   }
 
   const PerformerOption: React.FC<OptionProps<Option, boolean>> = (
diff --git a/ui/v2.5/src/components/Scenes/SceneSelect.tsx b/ui/v2.5/src/components/Scenes/SceneSelect.tsx
index 8ab32b753..fed72dd53 100644
--- a/ui/v2.5/src/components/Scenes/SceneSelect.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneSelect.tsx
@@ -22,6 +22,7 @@ import {
   IFilterProps,
   IFilterValueProps,
   Option as SelectOption,
+  toOption,
 } from "../Shared/FilterSelect";
 import { useCompare } from "src/hooks/state";
 import { Placement } from "react-bootstrap/esm/Overlay";
@@ -33,6 +34,8 @@ import {
   CriterionValue,
 } from "src/models/list-filter/criteria/criterion";
 import { TruncatedText } from "../Shared/TruncatedText";
+import { isUUID } from "src/utils/stashIds";
+import { filterByStashID } from "src/models/list-filter/utils";
 
 export type Scene = Pick<GQL.Scene, "id" | "title" | "date" | "code"> & {
   studio?: Pick<GQL.Studio, "name"> | null;
@@ -73,29 +76,44 @@ const _SceneSelect: React.FC<
 
   const exclude = useMemo(() => props.excludeIds ?? [], [props.excludeIds]);
 
+  function filterExcluded(scene: Scene) {
+    // HACK - we should probably exclude these in the backend query, but
+    // this will do in the short-term
+    return !exclude.includes(scene.id.toString());
+  }
+
   async function loadScenes(input: string): Promise<Option[]> {
     const filter = new ListFilterModel(GQL.FilterMode.Scenes);
-    filter.searchTerm = input;
     filter.currentPage = 1;
     filter.itemsPerPage = maxOptionsShown;
     filter.sortBy = "title";
     filter.sortDirection = GQL.SortDirectionEnum.Asc;
 
-    if (props.extraCriteria) {
-      filter.criteria = [...props.extraCriteria];
+    filter.criteria = [...(props.extraCriteria ?? [])];
+
+    if (isUUID(input)) {
+      const oldCriteria = filter.criteria;
+
+      filterByStashID(filter, input);
+
+      const query = await queryFindScenesForSelect(filter);
+      const matches = query.data.findScenes.scenes.filter(filterExcluded);
+
+      if (matches.length > 0) {
+        // Matches found, return them immediately.
+        return matches.map(toOption);
+      }
+
+      // If no stash_id matches found, continue with standard name/alias search.
+      filter.criteria = oldCriteria; // Clear stash_id criterion to search by name/alias below.
     }
 
-    const query = await queryFindScenesForSelect(filter);
-    let ret = query.data.findScenes.scenes.filter((scene) => {
-      // HACK - we should probably exclude these in the backend query, but
-      // this will do in the short-term
-      return !exclude.includes(scene.id.toString());
-    });
+    filter.searchTerm = input;
 
-    return sceneSelectSort(input, ret).map((scene) => ({
-      value: scene.id,
-      object: scene,
-    }));
+    const query = await queryFindScenesForSelect(filter);
+    const ret = query.data.findScenes.scenes.filter(filterExcluded);
+
+    return sceneSelectSort(input, ret).map(toOption);
   }
 
   const SceneOption: React.FC<OptionProps<Option, boolean>> = (optionProps) => {
diff --git a/ui/v2.5/src/components/Shared/FilterSelect.tsx b/ui/v2.5/src/components/Shared/FilterSelect.tsx
index e1c117aac..fbe786522 100644
--- a/ui/v2.5/src/components/Shared/FilterSelect.tsx
+++ b/ui/v2.5/src/components/Shared/FilterSelect.tsx
@@ -256,3 +256,10 @@ export interface IFilterIDProps<T> {
   ids?: string[];
   onSelect?: (item: T[]) => void;
 }
+
+export function toOption<T extends IHasID>(item: T): Option<T> {
+  return {
+    value: item.id,
+    object: item,
+  };
+}
diff --git a/ui/v2.5/src/components/Studios/StudioSelect.tsx b/ui/v2.5/src/components/Studios/StudioSelect.tsx
index 7305aa60d..b80834c84 100644
--- a/ui/v2.5/src/components/Studios/StudioSelect.tsx
+++ b/ui/v2.5/src/components/Studios/StudioSelect.tsx
@@ -23,11 +23,14 @@ import {
   IFilterProps,
   IFilterValueProps,
   Option as SelectOption,
+  toOption,
 } from "../Shared/FilterSelect";
 import { useCompare } from "src/hooks/state";
 import { Placement } from "react-bootstrap/esm/Overlay";
 import { sortByRelevance } from "src/utils/query";
 import { PatchComponent, PatchFunction } from "src/patch";
+import { isUUID } from "src/utils/stashIds";
+import { filterByStashID } from "src/models/list-filter/utils";
 
 export type SelectObject = {
   id: string;
@@ -74,24 +77,40 @@ const _StudioSelect: React.FC<
 
   const exclude = useMemo(() => props.excludeIds ?? [], [props.excludeIds]);
 
+  function filterExcluded(studio: Studio) {
+    // HACK - we should probably exclude these in the backend query, but
+    // this will do in the short-term
+    return !exclude.includes(studio.id.toString());
+  }
+
   async function loadStudios(input: string): Promise<Option[]> {
     const filter = new ListFilterModel(GQL.FilterMode.Studios);
-    filter.searchTerm = input;
     filter.currentPage = 1;
     filter.itemsPerPage = maxOptionsShown;
     filter.sortBy = "name";
     filter.sortDirection = GQL.SortDirectionEnum.Asc;
-    const query = await queryFindStudiosForSelect(filter);
-    let ret = query.data.findStudios.studios.filter((studio) => {
-      // HACK - we should probably exclude these in the backend query, but
-      // this will do in the short-term
-      return !exclude.includes(studio.id.toString());
-    });
 
-    return studioSelectSort(input, ret).map((studio) => ({
-      value: studio.id,
-      object: studio,
-    }));
+    if (isUUID(input)) {
+      filterByStashID(filter, input);
+
+      const query = await queryFindStudiosForSelect(filter);
+      const matches = query.data.findStudios.studios.filter(filterExcluded);
+
+      if (matches.length > 0) {
+        // Matches found, return them immediately.
+        return matches.map(toOption);
+      }
+
+      // If no stash_id matches found, continue with standard name/alias search.
+      filter.criteria = []; // Clear stash_id criterion to search by name/alias below.
+    }
+
+    filter.searchTerm = input;
+
+    const query = await queryFindStudiosForSelect(filter);
+    const ret = query.data.findStudios.studios.filter(filterExcluded);
+
+    return studioSelectSort(input, ret).map(toOption);
   }
 
   const StudioOption: React.FC<OptionProps<Option, boolean>> = (
diff --git a/ui/v2.5/src/components/Tags/TagSelect.tsx b/ui/v2.5/src/components/Tags/TagSelect.tsx
index c9ed83fea..b79915261 100644
--- a/ui/v2.5/src/components/Tags/TagSelect.tsx
+++ b/ui/v2.5/src/components/Tags/TagSelect.tsx
@@ -23,12 +23,15 @@ import {
   IFilterProps,
   IFilterValueProps,
   Option as SelectOption,
+  toOption,
 } from "../Shared/FilterSelect";
 import { useCompare } from "src/hooks/state";
 import { TagPopover } from "./TagPopover";
 import { Placement } from "react-bootstrap/esm/Overlay";
 import { sortByRelevance } from "src/utils/query";
 import { PatchComponent, PatchFunction } from "src/patch";
+import { isUUID } from "src/utils/stashIds";
+import { filterByStashID } from "src/models/list-filter/utils";
 
 export type SelectObject = {
   id: string;
@@ -75,24 +78,40 @@ const _TagSelect: React.FC<TagSelectProps> = (props) => {
 
   const exclude = useMemo(() => props.excludeIds ?? [], [props.excludeIds]);
 
+  function filterExcluded(tag: Tag) {
+    // HACK - we should probably exclude these in the backend query, but
+    // this will do in the short-term
+    return !exclude.includes(tag.id.toString());
+  }
+
   async function loadTags(input: string): Promise<Option[]> {
     const filter = new ListFilterModel(GQL.FilterMode.Tags);
-    filter.searchTerm = input;
     filter.currentPage = 1;
     filter.itemsPerPage = maxOptionsShown;
     filter.sortBy = "name";
     filter.sortDirection = GQL.SortDirectionEnum.Asc;
-    const query = await queryFindTagsForSelect(filter);
-    let ret = query.data.findTags.tags.filter((tag) => {
-      // HACK - we should probably exclude these in the backend query, but
-      // this will do in the short-term
-      return !exclude.includes(tag.id.toString());
-    });
 
-    return tagSelectSort(input, ret).map((tag) => ({
-      value: tag.id,
-      object: tag,
-    }));
+    if (isUUID(input)) {
+      filterByStashID(filter, input);
+
+      const query = await queryFindTagsForSelect(filter);
+      const matches = query.data.findTags.tags.filter(filterExcluded);
+
+      if (matches.length > 0) {
+        // Matches found, return them immediately.
+        return matches.map(toOption);
+      }
+
+      // If no stash_id matches found, continue with standard name/alias search.
+      filter.criteria = []; // Clear stash_id criterion to search by name/alias below.
+    }
+
+    filter.searchTerm = input;
+
+    const query = await queryFindTagsForSelect(filter);
+    const ret = query.data.findTags.tags.filter(filterExcluded);
+
+    return tagSelectSort(input, ret).map(toOption);
   }
 
   const TagOption: React.FC<OptionProps<Option, boolean>> = (optionProps) => {
diff --git a/ui/v2.5/src/models/list-filter/utils.ts b/ui/v2.5/src/models/list-filter/utils.ts
new file mode 100644
index 000000000..5c63b1214
--- /dev/null
+++ b/ui/v2.5/src/models/list-filter/utils.ts
@@ -0,0 +1,12 @@
+import { CriterionModifier } from "src/core/generated-graphql";
+import { ModifierCriterion } from "./criteria/criterion";
+import { ListFilterModel } from "./filter";
+
+export function filterByStashID(filter: ListFilterModel, stashID: string) {
+  const stashCriterion = filter.makeCriterion(
+    "stash_id_endpoint"
+  ) as ModifierCriterion<{ endpoint: string; stashID: string }>;
+  stashCriterion.modifier = CriterionModifier.Equals;
+  stashCriterion.value = { endpoint: "", stashID: stashID.trim() };
+  filter.criteria = [stashCriterion];
+}
diff --git a/ui/v2.5/src/utils/stashIds.ts b/ui/v2.5/src/utils/stashIds.ts
index 10e3835b8..635db3600 100644
--- a/ui/v2.5/src/utils/stashIds.ts
+++ b/ui/v2.5/src/utils/stashIds.ts
@@ -13,6 +13,10 @@ export const getStashIDs = (
 const UUID_PATTERN =
   /^[0-9a-f]{8}-[0-9a-f]{4}-[47][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
 
+export function isUUID(input: string): boolean {
+  return UUID_PATTERN.test(input.trim());
+}
+
 /**
  * Separates a list of inputs into names and StashIDs based on UUID pattern matching
  * @param inputs - Array of strings that could be either names or StashIDs
@@ -25,7 +29,7 @@ export const separateNamesAndStashIds = (
   const stashIds: string[] = [];
 
   inputs.forEach((input) => {
-    if (UUID_PATTERN.test(input)) {
+    if (isUUID(input)) {
       stashIds.push(input);
     } else {
       names.push(input);

From c583e88caf026fe619c2cca888b3aa1e34eec380 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Thu, 19 Mar 2026 12:10:42 +1100
Subject: [PATCH 369/405] Replace "Source" with "Combined" in merge dialogs
 (#6711)

---
 ui/v2.5/src/components/Performers/PerformerMergeDialog.tsx | 2 +-
 ui/v2.5/src/components/Scenes/SceneMergeDialog.tsx         | 2 +-
 ui/v2.5/src/components/Tags/TagMergeDialog.tsx             | 2 +-
 ui/v2.5/src/locales/en-GB.json                             | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ui/v2.5/src/components/Performers/PerformerMergeDialog.tsx b/ui/v2.5/src/components/Performers/PerformerMergeDialog.tsx
index 0d42dd6ed..ce5b50b0c 100644
--- a/ui/v2.5/src/components/Performers/PerformerMergeDialog.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerMergeDialog.tsx
@@ -700,7 +700,7 @@ const PerformerMergeDetails: React.FC<IPerformerMergeDetailsProps> = ({
     : intl.formatMessage({ id: "dialogs.merge.destination" });
   const sourceLabel = !hasValues
     ? ""
-    : intl.formatMessage({ id: "dialogs.merge.source" });
+    : intl.formatMessage({ id: "dialogs.merge.combined" });
 
   return (
     <ScrapeDialog
diff --git a/ui/v2.5/src/components/Scenes/SceneMergeDialog.tsx b/ui/v2.5/src/components/Scenes/SceneMergeDialog.tsx
index 29ae93143..cbb718411 100644
--- a/ui/v2.5/src/components/Scenes/SceneMergeDialog.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneMergeDialog.tsx
@@ -670,7 +670,7 @@ const SceneMergeDetails: React.FC<ISceneMergeDetailsProps> = ({
     : intl.formatMessage({ id: "dialogs.merge.destination" });
   const sourceLabel = !hasValues
     ? ""
-    : intl.formatMessage({ id: "dialogs.merge.source" });
+    : intl.formatMessage({ id: "dialogs.merge.combined" });
 
   return (
     <ScrapeDialog
diff --git a/ui/v2.5/src/components/Tags/TagMergeDialog.tsx b/ui/v2.5/src/components/Tags/TagMergeDialog.tsx
index b155f46e2..be16dda33 100644
--- a/ui/v2.5/src/components/Tags/TagMergeDialog.tsx
+++ b/ui/v2.5/src/components/Tags/TagMergeDialog.tsx
@@ -382,7 +382,7 @@ const TagMergeDetails: React.FC<ITagMergeDetailsProps> = ({
     : intl.formatMessage({ id: "dialogs.merge.destination" });
   const sourceLabel = !hasValues
     ? ""
-    : intl.formatMessage({ id: "dialogs.merge.source" });
+    : intl.formatMessage({ id: "dialogs.merge.combined" });
 
   return (
     <ScrapeDialog
diff --git a/ui/v2.5/src/locales/en-GB.json b/ui/v2.5/src/locales/en-GB.json
index 7ae381d70..063c679cc 100644
--- a/ui/v2.5/src/locales/en-GB.json
+++ b/ui/v2.5/src/locales/en-GB.json
@@ -1023,6 +1023,7 @@
       }
     },
     "merge": {
+      "combined": "Combined",
       "destination": "Destination",
       "empty_results": "Destination field values will be unchanged.",
       "source": "Source"

From 5fd0d7bd6861bd9ed96cd5973c563fd6456d154e Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Thu, 19 Mar 2026 13:16:20 +1100
Subject: [PATCH 370/405] Make hover volume configurable (#6712)

---
 ui/v2.5/src/components/Scenes/SceneCard.tsx   |  8 ++-
 .../src/components/Scenes/SceneWallPanel.tsx  | 59 ++++++++++++-------
 .../SettingsInterfacePanel.tsx                | 35 ++++++++---
 ui/v2.5/src/core/config.ts                    |  3 +
 ui/v2.5/src/locales/en-GB.json                | 11 +++-
 5 files changed, 85 insertions(+), 31 deletions(-)

diff --git a/ui/v2.5/src/components/Scenes/SceneCard.tsx b/ui/v2.5/src/components/Scenes/SceneCard.tsx
index 0a80880f1..55124e9b0 100644
--- a/ui/v2.5/src/components/Scenes/SceneCard.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneCard.tsx
@@ -30,12 +30,14 @@ import { StudioOverlay } from "../Shared/GridCard/StudioOverlay";
 import { GroupTag } from "../Groups/GroupTag";
 import { FileSize } from "../Shared/FileSize";
 import { OCounterButton } from "../Shared/CountButton";
+import { defaultPreviewVolume } from "src/core/config";
 
 interface IScenePreviewProps {
   isPortrait: boolean;
   image?: string;
   video?: string;
   soundActive: boolean;
+  volume?: number;
   vttPath?: string;
   onScrubberClick?: (timestamp: number) => void;
   disabled?: boolean;
@@ -49,6 +51,7 @@ export const ScenePreview: React.FC<IScenePreviewProps> = ({
   vttPath,
   onScrubberClick,
   disabled,
+  volume,
 }) => {
   const videoEl = useRef<HTMLVideoElement>(null);
 
@@ -67,8 +70,8 @@ export const ScenePreview: React.FC<IScenePreviewProps> = ({
 
   useEffect(() => {
     if (videoEl?.current?.volume)
-      videoEl.current.volume = soundActive ? 0.05 : 0;
-  }, [soundActive]);
+      videoEl.current.volume = soundActive ? (volume ?? 0) / 100 : 0;
+  }, [volume, soundActive]);
 
   return (
     <div className={cx("scene-card-preview", { portrait: isPortrait })}>
@@ -431,6 +434,7 @@ const SceneCardImage = PatchComponent(
           video={props.scene.paths.preview ?? undefined}
           isPortrait={isPortrait()}
           soundActive={configuration?.interface?.soundOnPreview ?? false}
+          volume={configuration?.ui.previewVolume ?? defaultPreviewVolume}
           vttPath={props.scene.paths.vtt ?? undefined}
           onScrubberClick={onScrubberClick}
           disabled={props.selecting}
diff --git a/ui/v2.5/src/components/Scenes/SceneWallPanel.tsx b/ui/v2.5/src/components/Scenes/SceneWallPanel.tsx
index d960db31f..d49d9b73e 100644
--- a/ui/v2.5/src/components/Scenes/SceneWallPanel.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneWallPanel.tsx
@@ -1,4 +1,10 @@
-import React, { useCallback, useEffect, useMemo, useState } from "react";
+import React, {
+  useCallback,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+} from "react";
 import { Form } from "react-bootstrap";
 import * as GQL from "src/core/generated-graphql";
 import { SceneQueue } from "src/models/sceneQueue";
@@ -15,6 +21,7 @@ import TextUtils from "src/utils/text";
 import { useIntl } from "react-intl";
 import { useDragMoveSelect } from "../Shared/GridCard/dragMoveSelect";
 import cx from "classnames";
+import { defaultPreviewVolume } from "src/core/config";
 
 interface IScenePhoto {
   scene: GQL.SlimSceneDataFragment;
@@ -42,6 +49,7 @@ export const SceneWallItem: React.FC<
 
   const { configuration } = useConfigurationContext();
   const playSound = configuration?.interface.soundOnPreview ?? false;
+  const volume = configuration?.ui.previewVolume ?? defaultPreviewVolume;
   const showTitle = configuration?.interface.wallShowTitle ?? false;
 
   const height = Math.min(props.maxHeight, props.photo.height);
@@ -75,7 +83,31 @@ export const SceneWallItem: React.FC<
   };
 
   const video = props.photo.src.includes("preview");
-  const ImagePreview = video ? "video" : "img";
+  const previewProps = {
+    loading: "lazy",
+    loop: video,
+    muted: !video || !playSound || !active,
+    autoPlay: video,
+    playsInline: video,
+    key: props.photo.key,
+    src: props.photo.src,
+    width,
+    height,
+    alt: props.photo.alt,
+    onMouseEnter: () => setActive(true),
+    onMouseLeave: () => setActive(false),
+    onClick: handleClick,
+    onError: () => {
+      props.photo.onError?.(props.photo);
+    },
+  };
+
+  const videoEl = useRef<HTMLVideoElement>(null);
+
+  useEffect(() => {
+    if (video && videoEl?.current?.volume)
+      videoEl.current.volume = playSound ? volume / 100 : 0;
+  }, [video, playSound, volume]);
 
   const { scene } = props.photo;
   const title = objectTitle(scene);
@@ -111,24 +143,11 @@ export const SceneWallItem: React.FC<
           }}
         />
       )}
-      <ImagePreview
-        loading="lazy"
-        loop={video}
-        muted={!video || !playSound || !active}
-        autoPlay={video}
-        playsInline={video}
-        key={props.photo.key}
-        src={props.photo.src}
-        width={width}
-        height={height}
-        alt={props.photo.alt}
-        onMouseEnter={() => setActive(true)}
-        onMouseLeave={() => setActive(false)}
-        onClick={handleClick}
-        onError={() => {
-          props.photo.onError?.(props.photo);
-        }}
-      />
+      {video ? (
+        <video {...previewProps} ref={videoEl} />
+      ) : (
+        <img {...previewProps} loading="lazy" />
+      )}
       <div className="lineargradient">
         <footer className="wall-item-footer">
           <Link
diff --git a/ui/v2.5/src/components/Settings/SettingsInterfacePanel/SettingsInterfacePanel.tsx b/ui/v2.5/src/components/Settings/SettingsInterfacePanel/SettingsInterfacePanel.tsx
index 85af31a4a..84608107d 100644
--- a/ui/v2.5/src/components/Settings/SettingsInterfacePanel/SettingsInterfacePanel.tsx
+++ b/ui/v2.5/src/components/Settings/SettingsInterfacePanel/SettingsInterfacePanel.tsx
@@ -42,7 +42,7 @@ import {
   defaultImageWallDirection,
   defaultImageWallMargin,
 } from "src/utils/imageWall";
-import { defaultMaxOptionsShown } from "src/core/config";
+import { defaultMaxOptionsShown, defaultPreviewVolume } from "src/core/config";
 import { PatchComponent } from "src/patch";
 
 const allMenuItems = [
@@ -309,6 +309,32 @@ export const SettingsInterfacePanel: React.FC = PatchComponent(
           />
         </SettingSection>
 
+        <SettingSection headingID="config.ui.scene_view.heading">
+          <BooleanSetting
+            id="sound-on-hover"
+            headingID="config.ui.scene_wall.options.toggle_sound"
+            checked={iface.soundOnPreview ?? undefined}
+            onChange={(v) => saveInterface({ soundOnPreview: v })}
+          />
+          <ModalSetting<number>
+            id="preview-volume"
+            headingID="config.ui.scene_view.options.preview_volume.heading"
+            subHeadingID="config.ui.scene_view.options.preview_volume.description"
+            value={ui.previewVolume ?? defaultPreviewVolume}
+            onChange={(v) => saveUI({ previewVolume: v })}
+            disabled={!iface.soundOnPreview}
+            renderField={(value, setValue) => (
+              <PercentInput
+                numericValue={value}
+                onValueChange={(v) => setValue(v ?? 0)}
+              />
+            )}
+            renderValue={(v) => {
+              return <span>{v}%</span>;
+            }}
+          />
+        </SettingSection>
+
         <SettingSection headingID="config.ui.scene_wall.heading">
           <BooleanSetting
             id="wall-show-title"
@@ -316,13 +342,6 @@ export const SettingsInterfacePanel: React.FC = PatchComponent(
             checked={iface.wallShowTitle ?? undefined}
             onChange={(v) => saveInterface({ wallShowTitle: v })}
           />
-          <BooleanSetting
-            id="wall-sound-enabled"
-            headingID="config.ui.scene_wall.options.toggle_sound"
-            checked={iface.soundOnPreview ?? undefined}
-            onChange={(v) => saveInterface({ soundOnPreview: v })}
-          />
-
           <SelectSetting
             advanced
             id="wall-preview"
diff --git a/ui/v2.5/src/core/config.ts b/ui/v2.5/src/core/config.ts
index b0dc15c9d..a757c7a06 100644
--- a/ui/v2.5/src/core/config.ts
+++ b/ui/v2.5/src/core/config.ts
@@ -38,6 +38,7 @@ export type DefaultFilters = {
 export type FrontPageContent = ISavedFilterRow | ICustomFilter;
 
 export const defaultMaxOptionsShown = 200;
+export const defaultPreviewVolume = 25;
 
 export interface IUIConfig {
   // unknown to prevent direct access - use getFrontPageContent
@@ -48,6 +49,8 @@ export interface IUIConfig {
   showLinksOnPerformerCard?: boolean;
   showTagCardOnHover?: boolean;
 
+  previewVolume?: number;
+
   abbreviateCounters?: boolean;
 
   ratingSystemOptions?: RatingSystemOptions;
diff --git a/ui/v2.5/src/locales/en-GB.json b/ui/v2.5/src/locales/en-GB.json
index 063c679cc..46de0e8b7 100644
--- a/ui/v2.5/src/locales/en-GB.json
+++ b/ui/v2.5/src/locales/en-GB.json
@@ -843,11 +843,20 @@
           }
         }
       },
+      "scene_view": {
+        "heading": "Scene View",
+        "options": {
+          "preview_volume": {
+            "description": "Volume of the preview when hovering over a scene. Set to 0 to mute.",
+            "heading": "Preview volume"
+          }
+        }
+      },
       "scene_wall": {
         "heading": "Scene / Marker Wall",
         "options": {
           "display_title": "Display title and tags",
-          "toggle_sound": "Enable sound"
+          "toggle_sound": "Enable sound on preview hover"
         }
       },
       "scroll_attempts_before_change": {

From 18eda319335f0dbc61bc3cc49d639bc5545a3e71 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Thu, 19 Mar 2026 13:35:18 +1100
Subject: [PATCH 371/405] Make tagger views consistent (#6713)

* Show performer/studio tagger when no results
* Separate stash-box selector and config buttons
---
 .../components/Performers/PerformerList.tsx   |   2 +-
 ui/v2.5/src/components/Studios/StudioList.tsx |   2 +-
 .../components/Tagger/StashBoxSelector.tsx    |  51 +++++
 .../src/components/Tagger/TaggerConfig.tsx    |  70 +++----
 .../Tagger/performers/PerformerTagger.tsx     | 136 ++++++-------
 .../components/Tagger/scenes/SceneTagger.tsx  |  20 +-
 .../Tagger/studios/StudioTagger.tsx           | 180 +++++++++---------
 .../src/components/Tagger/tags/TagTagger.tsx  | 180 +++++++++---------
 ui/v2.5/src/locales/en-GB.json                |   1 +
 9 files changed, 336 insertions(+), 306 deletions(-)
 create mode 100644 ui/v2.5/src/components/Tagger/StashBoxSelector.tsx

diff --git a/ui/v2.5/src/components/Performers/PerformerList.tsx b/ui/v2.5/src/components/Performers/PerformerList.tsx
index 85531e0db..c2db288bc 100644
--- a/ui/v2.5/src/components/Performers/PerformerList.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerList.tsx
@@ -208,7 +208,7 @@ const PerformerList: React.FC<{
 }> = PatchComponent(
   "PerformerList",
   ({ performers, filter, selectedIds, onSelectChange, extraCriteria }) => {
-    if (performers.length === 0) {
+    if (performers.length === 0 && filter.displayMode !== DisplayMode.Tagger) {
       return null;
     }
 
diff --git a/ui/v2.5/src/components/Studios/StudioList.tsx b/ui/v2.5/src/components/Studios/StudioList.tsx
index 6067fb7fd..b75e9782b 100644
--- a/ui/v2.5/src/components/Studios/StudioList.tsx
+++ b/ui/v2.5/src/components/Studios/StudioList.tsx
@@ -56,7 +56,7 @@ const StudioList: React.FC<{
 }> = PatchComponent(
   "StudioList",
   ({ studios, filter, selectedIds, onSelectChange, fromParent }) => {
-    if (studios.length === 0) {
+    if (studios.length === 0 && filter.displayMode !== DisplayMode.Tagger) {
       return null;
     }
 
diff --git a/ui/v2.5/src/components/Tagger/StashBoxSelector.tsx b/ui/v2.5/src/components/Tagger/StashBoxSelector.tsx
new file mode 100644
index 000000000..3f5f103a6
--- /dev/null
+++ b/ui/v2.5/src/components/Tagger/StashBoxSelector.tsx
@@ -0,0 +1,51 @@
+import { Form } from "react-bootstrap";
+import { FormattedMessage } from "react-intl";
+import { StashBox } from "src/core/generated-graphql";
+
+interface IStashBoxSelectorProps {
+  stashBoxes: StashBox[];
+  selectedEndpoint: string;
+  onEndpointChange: (endpoint: string) => void;
+}
+
+export const StashBoxSelector: React.FC<IStashBoxSelectorProps> = ({
+  stashBoxes,
+  selectedEndpoint,
+  onEndpointChange,
+}) => {
+  return (
+    <Form.Control
+      as="select"
+      value={selectedEndpoint}
+      className="input-control"
+      disabled={stashBoxes.length < 2}
+      onChange={(e) => onEndpointChange(e.target.value)}
+    >
+      {!stashBoxes.length && (
+        <option>
+          <FormattedMessage id="tagger.config.no_instances_found" />
+        </option>
+      )}
+      {stashBoxes.map((i) => (
+        <option value={i.endpoint} key={i.endpoint}>
+          {i.endpoint}
+        </option>
+      ))}
+    </Form.Control>
+  );
+};
+
+export const StashBoxSelectorField: React.FC<IStashBoxSelectorProps> = (
+  props
+) => {
+  return (
+    <Form.Group controlId="scraper">
+      <Form.Label>
+        <FormattedMessage id="component_tagger.config.source" />
+      </Form.Label>
+      <div>
+        <StashBoxSelector {...props} />
+      </div>
+    </Form.Group>
+  );
+};
diff --git a/ui/v2.5/src/components/Tagger/TaggerConfig.tsx b/ui/v2.5/src/components/Tagger/TaggerConfig.tsx
index c578d58c4..45445f147 100644
--- a/ui/v2.5/src/components/Tagger/TaggerConfig.tsx
+++ b/ui/v2.5/src/components/Tagger/TaggerConfig.tsx
@@ -1,15 +1,12 @@
-import React, { Dispatch, useState } from "react";
+import React, { useState } from "react";
 import { Badge, Button, Card, Collapse, Form } from "react-bootstrap";
-import { FormattedMessage } from "react-intl";
-import { useConfigurationContext } from "src/hooks/Config";
-
-import { ITaggerConfig } from "./constants";
+import { FormattedMessage, useIntl } from "react-intl";
 import FieldSelector from "./FieldSelector";
+import { Icon } from "../Shared/Icon";
+import { faCog } from "@fortawesome/free-solid-svg-icons";
 
 interface ITaggerConfigProps {
   show: boolean;
-  config: ITaggerConfig;
-  setConfig: Dispatch<ITaggerConfig>;
   excludedFields: string[];
   onFieldsChange: (fields: string[]) => void;
   fields: string[];
@@ -19,27 +16,14 @@ interface ITaggerConfigProps {
 
 const TaggerConfig: React.FC<ITaggerConfigProps> = ({
   show,
-  config,
-  setConfig,
   excludedFields,
   onFieldsChange,
   fields,
   entityName,
   extraConfig,
 }) => {
-  const { configuration: stashConfig } = useConfigurationContext();
   const [showExclusionModal, setShowExclusionModal] = useState(false);
 
-  const handleInstanceSelect = (e: React.ChangeEvent<HTMLSelectElement>) => {
-    const selectedEndpoint = e.currentTarget.value;
-    setConfig({
-      ...config,
-      selectedEndpoint,
-    });
-  };
-
-  const stashBoxes = stashConfig?.general.stashBoxes ?? [];
-
   const handleFieldSelect = (selectedFields: string[]) => {
     onFieldsChange(selectedFields);
     setShowExclusionModal(false);
@@ -84,32 +68,6 @@ const TaggerConfig: React.FC<ITaggerConfigProps> = ({
                   <FormattedMessage id="tagger.config.edit_excluded_fields" />
                 </Button>
               </Form.Group>
-              <Form.Group
-                controlId="stash-box-endpoint"
-                className="align-items-center row no-gutters mt-4"
-              >
-                <Form.Label className="mr-4">
-                  <FormattedMessage id="tagger.config.active_stash-box_instance" />
-                </Form.Label>
-                <Form.Control
-                  as="select"
-                  value={config.selectedEndpoint}
-                  className="col-md-4 col-6 input-control"
-                  disabled={!stashBoxes.length}
-                  onChange={handleInstanceSelect}
-                >
-                  {!stashBoxes.length && (
-                    <option>
-                      <FormattedMessage id="tagger.config.no_instances_found" />
-                    </option>
-                  )}
-                  {stashConfig?.general.stashBoxes.map((i) => (
-                    <option value={i.endpoint} key={i.endpoint}>
-                      {i.endpoint}
-                    </option>
-                  ))}
-                </Form.Control>
-              </Form.Group>
             </div>
           </div>
         </Card>
@@ -125,3 +83,23 @@ const TaggerConfig: React.FC<ITaggerConfigProps> = ({
 };
 
 export default TaggerConfig;
+
+export const ConfigButton: React.FC<{
+  onClick: () => void;
+  showConfig: boolean;
+}> = ({ onClick, showConfig }) => {
+  const intl = useIntl();
+
+  const showHideConfigId = showConfig
+    ? "actions.hide_configuration"
+    : "actions.show_configuration";
+
+  return (
+    <Button
+      onClick={onClick}
+      title={intl.formatMessage({ id: showHideConfigId })}
+    >
+      <Icon className="fa-fw" icon={faCog} />
+    </Button>
+  );
+};
diff --git a/ui/v2.5/src/components/Tagger/performers/PerformerTagger.tsx b/ui/v2.5/src/components/Tagger/performers/PerformerTagger.tsx
index 8106d6a44..4391ba783 100755
--- a/ui/v2.5/src/components/Tagger/performers/PerformerTagger.tsx
+++ b/ui/v2.5/src/components/Tagger/performers/PerformerTagger.tsx
@@ -15,11 +15,10 @@ import {
   evictQueries,
   performerMutationImpactedQueries,
 } from "src/core/StashService";
-import { Manual } from "src/components/Help/Manual";
 import { useConfigurationContext } from "src/hooks/Config";
 
 import StashSearchResult from "./StashSearchResult";
-import TaggerConfig from "../TaggerConfig";
+import TaggerConfig, { ConfigButton } from "../TaggerConfig";
 import { ITaggerConfig, PERFORMER_FIELDS } from "../constants";
 import PerformerModal from "../PerformerModal";
 import { useUpdatePerformer } from "../queries";
@@ -28,6 +27,7 @@ import { mergeStashIDs } from "src/utils/stashbox";
 import { separateNamesAndStashIds } from "src/utils/stashIds";
 import { ExternalLink } from "src/components/Shared/ExternalLink";
 import { useTaggerConfig } from "../config";
+import { StashBoxSelectorField } from "../StashBoxSelector";
 
 type JobFragment = Pick<
   GQL.Job,
@@ -620,11 +620,9 @@ interface ITaggerProps {
 
 export const PerformerTagger: React.FC<ITaggerProps> = ({ performers }) => {
   const jobsSubscribe = useJobsSubscribe();
-  const intl = useIntl();
   const { configuration: stashConfig } = useConfigurationContext();
   const { config, setConfig } = useTaggerConfig();
   const [showConfig, setShowConfig] = useState(false);
-  const [showManual, setShowManual] = useState(false);
 
   const [batchJobID, setBatchJobID] = useState<string | undefined | null>();
   const [batchJob, setBatchJob] = useState<JobFragment | undefined>();
@@ -742,76 +740,80 @@ export const PerformerTagger: React.FC<ITaggerProps> = ({ performers }) => {
     }
   }
 
-  const showHideConfigId = showConfig
-    ? "actions.hide_configuration"
-    : "actions.show_configuration";
+  if (selectedEndpointIndex === -1 || !selectedEndpoint) {
+    return (
+      <div className="my-4">
+        <h3 className="text-center mt-4">
+          <FormattedMessage id="performer_tagger.to_use_the_performer_tagger" />
+        </h3>
+        <h5 className="text-center">
+          <FormattedMessage
+            id="refer_to"
+            values={{
+              link: (
+                <HashLink
+                  to="/settings?tab=metadata-providers#stash-boxes"
+                  scroll={(el) =>
+                    el.scrollIntoView({ behavior: "smooth", block: "center" })
+                  }
+                >
+                  <FormattedMessage id="config.stashbox.title" />
+                </HashLink>
+              ),
+            }}
+          />
+        </h5>
+      </div>
+    );
+  }
 
   return (
     <>
-      <Manual
-        show={showManual}
-        onClose={() => setShowManual(false)}
-        defaultActiveTab="Tagger.md"
-      />
       {renderStatus()}
       <div className="tagger-container mx-md-auto">
-        {selectedEndpointIndex !== -1 && selectedEndpoint ? (
-          <>
-            <div className="row mb-2 no-gutters">
-              <Button onClick={() => setShowConfig(!showConfig)} variant="link">
-                {intl.formatMessage({ id: showHideConfigId })}
-              </Button>
-              <Button
-                className="ml-auto"
-                onClick={() => setShowManual(true)}
-                title={intl.formatMessage({ id: "help" })}
-                variant="link"
-              >
-                <FormattedMessage id="help" />
-              </Button>
-            </div>
-
-            <TaggerConfig
-              config={config}
-              setConfig={setConfig}
-              show={showConfig}
-              excludedFields={config.excludedPerformerFields ?? []}
-              onFieldsChange={(fields) =>
-                setConfig({ ...config, excludedPerformerFields: fields })
-              }
-              fields={PERFORMER_FIELDS}
-              entityName="performers"
-            />
-            <PerformerTaggerList
-              performers={performers}
-              selectedEndpoint={{
-                endpoint: selectedEndpoint.endpoint,
-                index: selectedEndpointIndex,
-              }}
-              isIdle={batchJobID === undefined}
-              config={config}
-              onBatchAdd={batchAdd}
-              onBatchUpdate={batchUpdate}
-            />
-          </>
-        ) : (
-          <div className="my-4">
-            <h3 className="text-center mt-4">
-              <FormattedMessage id="performer_tagger.to_use_the_performer_tagger" />
-            </h3>
-            <h5 className="text-center">
-              Please see{" "}
-              <HashLink
-                to="/settings?tab=metadata-providers#stash-boxes"
-                scroll={(el) =>
-                  el.scrollIntoView({ behavior: "smooth", block: "center" })
+        <div className="tagger-container-header">
+          <div className="d-flex justify-content-between align-items-center flex-wrap">
+            <div className="w-auto">
+              <StashBoxSelectorField
+                stashBoxes={stashConfig?.general.stashBoxes ?? []}
+                selectedEndpoint={selectedEndpoint.endpoint}
+                onEndpointChange={(endpoint) =>
+                  setConfig({ ...config, selectedEndpoint: endpoint })
                 }
-              >
-                Settings.
-              </HashLink>
-            </h5>
+              />
+            </div>
+            <div className="d-flex">
+              <div className="ml-2">
+                <ConfigButton
+                  showConfig={showConfig}
+                  onClick={() => setShowConfig(!showConfig)}
+                />
+              </div>
+            </div>
           </div>
-        )}
+
+          <TaggerConfig
+            show={showConfig}
+            excludedFields={config.excludedPerformerFields ?? []}
+            onFieldsChange={(fields) =>
+              setConfig({ ...config, excludedPerformerFields: fields })
+            }
+            fields={PERFORMER_FIELDS}
+            entityName="performers"
+          />
+        </div>
+
+        <PerformerTaggerList
+          performers={performers}
+          selectedEndpoint={{
+            endpoint: selectedEndpoint.endpoint,
+            index: selectedEndpointIndex,
+          }}
+          isIdle={batchJobID === undefined}
+          config={config}
+          onBatchAdd={batchAdd}
+          onBatchUpdate={batchUpdate}
+        />
       </div>
     </>
   );
diff --git a/ui/v2.5/src/components/Tagger/scenes/SceneTagger.tsx b/ui/v2.5/src/components/Tagger/scenes/SceneTagger.tsx
index 76a67e306..a0ee46733 100755
--- a/ui/v2.5/src/components/Tagger/scenes/SceneTagger.tsx
+++ b/ui/v2.5/src/components/Tagger/scenes/SceneTagger.tsx
@@ -4,7 +4,6 @@ import { SceneQueue } from "src/models/sceneQueue";
 import { Button, Form } from "react-bootstrap";
 import { FormattedMessage, useIntl } from "react-intl";
 
-import { Icon } from "src/components/Shared/Icon";
 import { LoadingIndicator } from "src/components/Shared/LoadingIndicator";
 import { OperationButton } from "src/components/Shared/OperationButton";
 import { ISceneQueryResult, TaggerStateContext } from "../context";
@@ -13,8 +12,8 @@ import { TaggerScene } from "./TaggerScene";
 import { SceneTaggerModals } from "./sceneTaggerModals";
 import { SceneSearchResults } from "./StashSearchResult";
 import { useConfigurationContext } from "src/hooks/Config";
-import { faCog } from "@fortawesome/free-solid-svg-icons";
 import { useLightbox } from "src/hooks/Lightbox/hooks";
+import { ConfigButton } from "../TaggerConfig";
 
 const Scene: React.FC<{
   scene: GQL.SlimSceneDataFragment;
@@ -154,16 +153,6 @@ export const Tagger: React.FC<ITaggerProps> = ({
     );
   }
 
-  function renderConfigButton() {
-    return (
-      <div className="ml-2">
-        <Button onClick={() => setShowConfig(!showConfig)}>
-          <Icon className="fa-fw" icon={faCog} />
-        </Button>
-      </div>
-    );
-  }
-
   const [spriteImage, setSpriteImage] = useState<string | null>(null);
   const lightboxImage = useMemo(
     () => [{ paths: { thumbnail: spriteImage, image: spriteImage } }],
@@ -293,7 +282,12 @@ export const Tagger: React.FC<ITaggerProps> = ({
               {maybeRenderShowHideUnmatchedButton()}
               {maybeRenderSubmitFingerprintsButton()}
               {renderFragmentScrapeButton()}
-              {renderConfigButton()}
+              <div className="ml-2">
+                <ConfigButton
+                  showConfig={showConfig}
+                  onClick={() => setShowConfig(!showConfig)}
+                />
+              </div>
             </div>
           </div>
           <Config show={showConfig} />
diff --git a/ui/v2.5/src/components/Tagger/studios/StudioTagger.tsx b/ui/v2.5/src/components/Tagger/studios/StudioTagger.tsx
index adc58cc04..645fb19c2 100644
--- a/ui/v2.5/src/components/Tagger/studios/StudioTagger.tsx
+++ b/ui/v2.5/src/components/Tagger/studios/StudioTagger.tsx
@@ -15,11 +15,10 @@ import {
   useStudioCreate,
   evictQueries,
 } from "src/core/StashService";
-import { Manual } from "src/components/Help/Manual";
 import { useConfigurationContext } from "src/hooks/Config";
 
 import StashSearchResult from "./StashSearchResult";
-import TaggerConfig from "../TaggerConfig";
+import TaggerConfig, { ConfigButton } from "../TaggerConfig";
 import { ITaggerConfig, STUDIO_FIELDS } from "../constants";
 import StudioModal from "../scenes/StudioModal";
 import { useUpdateStudio } from "../queries";
@@ -33,6 +32,7 @@ import {
   BatchUpdateModal,
   BatchAddModal,
 } from "src/components/Shared/BatchModals";
+import { StashBoxSelectorField } from "../StashBoxSelector";
 
 type JobFragment = Pick<
   GQL.Job,
@@ -471,11 +471,9 @@ interface ITaggerProps {
 
 export const StudioTagger: React.FC<ITaggerProps> = ({ studios }) => {
   const jobsSubscribe = useJobsSubscribe();
-  const intl = useIntl();
   const { configuration: stashConfig } = useConfigurationContext();
   const { config, setConfig } = useTaggerConfig();
   const [showConfig, setShowConfig] = useState(false);
-  const [showManual, setShowManual] = useState(false);
 
   const [batchJobID, setBatchJobID] = useState<string | undefined | null>();
   const [batchJob, setBatchJob] = useState<JobFragment | undefined>();
@@ -598,98 +596,102 @@ export const StudioTagger: React.FC<ITaggerProps> = ({ studios }) => {
     }
   }
 
-  const showHideConfigId = showConfig
-    ? "actions.hide_configuration"
-    : "actions.show_configuration";
+  if (selectedEndpointIndex === -1 || !selectedEndpoint) {
+    return (
+      <div className="my-4">
+        <h3 className="text-center mt-4">
+          <FormattedMessage id="studio_tagger.to_use_the_studio_tagger" />
+        </h3>
+        <h5 className="text-center">
+          <FormattedMessage
+            id="refer_to"
+            values={{
+              link: (
+                <HashLink
+                  to="/settings?tab=metadata-providers#stash-boxes"
+                  scroll={(el) =>
+                    el.scrollIntoView({ behavior: "smooth", block: "center" })
+                  }
+                >
+                  <FormattedMessage id="config.stashbox.title" />
+                </HashLink>
+              ),
+            }}
+          />
+        </h5>
+      </div>
+    );
+  }
 
   return (
     <>
-      <Manual
-        show={showManual}
-        onClose={() => setShowManual(false)}
-        defaultActiveTab="Tagger.md"
-      />
       {renderStatus()}
       <div className="tagger-container mx-md-auto">
-        {selectedEndpointIndex !== -1 && selectedEndpoint ? (
-          <>
-            <div className="row mb-2 no-gutters">
-              <Button onClick={() => setShowConfig(!showConfig)} variant="link">
-                {intl.formatMessage({ id: showHideConfigId })}
-              </Button>
-              <Button
-                className="ml-auto"
-                onClick={() => setShowManual(true)}
-                title={intl.formatMessage({ id: "help" })}
-                variant="link"
-              >
-                <FormattedMessage id="help" />
-              </Button>
-            </div>
-
-            <TaggerConfig
-              config={config}
-              setConfig={setConfig}
-              show={showConfig}
-              excludedFields={config.excludedStudioFields ?? []}
-              onFieldsChange={(fields) =>
-                setConfig({ ...config, excludedStudioFields: fields })
-              }
-              fields={STUDIO_FIELDS}
-              entityName="studios"
-              extraConfig={
-                <Form.Group
-                  controlId="create-parent"
-                  className="align-items-center"
-                >
-                  <Form.Check
-                    label={
-                      <FormattedMessage id="studio_tagger.config.create_parent_label" />
-                    }
-                    checked={config.createParentStudios}
-                    onChange={(e: React.ChangeEvent<HTMLInputElement>) =>
-                      setConfig({
-                        ...config,
-                        createParentStudios: e.currentTarget.checked,
-                      })
-                    }
-                  />
-                  <Form.Text>
-                    <FormattedMessage id="studio_tagger.config.create_parent_desc" />
-                  </Form.Text>
-                </Form.Group>
-              }
-            />
-            <StudioTaggerList
-              studios={studios}
-              selectedEndpoint={{
-                endpoint: selectedEndpoint.endpoint,
-                index: selectedEndpointIndex,
-              }}
-              isIdle={batchJobID === undefined}
-              config={config}
-              onBatchAdd={batchAdd}
-              onBatchUpdate={batchUpdate}
-            />
-          </>
-        ) : (
-          <div className="my-4">
-            <h3 className="text-center mt-4">
-              <FormattedMessage id="studio_tagger.to_use_the_studio_tagger" />
-            </h3>
-            <h5 className="text-center">
-              Please see{" "}
-              <HashLink
-                to="/settings?tab=metadata-providers#stash-boxes"
-                scroll={(el) =>
-                  el.scrollIntoView({ behavior: "smooth", block: "center" })
+        <div className="tagger-container-header">
+          <div className="d-flex justify-content-between align-items-center flex-wrap">
+            <div className="w-auto">
+              <StashBoxSelectorField
+                stashBoxes={stashConfig?.general.stashBoxes ?? []}
+                selectedEndpoint={selectedEndpoint.endpoint}
+                onEndpointChange={(endpoint) =>
+                  setConfig({ ...config, selectedEndpoint: endpoint })
                 }
-              >
-                Settings.
-              </HashLink>
-            </h5>
+              />
+            </div>
+            <div className="d-flex">
+              <div className="ml-2">
+                <ConfigButton
+                  showConfig={showConfig}
+                  onClick={() => setShowConfig(!showConfig)}
+                />
+              </div>
+            </div>
           </div>
-        )}
+
+          <TaggerConfig
+            show={showConfig}
+            excludedFields={config.excludedStudioFields ?? []}
+            onFieldsChange={(fields) =>
+              setConfig({ ...config, excludedStudioFields: fields })
+            }
+            fields={STUDIO_FIELDS}
+            entityName="studios"
+            extraConfig={
+              <Form.Group
+                controlId="create-parent"
+                className="align-items-center"
+              >
+                <Form.Check
+                  label={
+                    <FormattedMessage id="studio_tagger.config.create_parent_label" />
+                  }
+                  checked={config.createParentStudios}
+                  onChange={(e: React.ChangeEvent<HTMLInputElement>) =>
+                    setConfig({
+                      ...config,
+                      createParentStudios: e.currentTarget.checked,
+                    })
+                  }
+                />
+                <Form.Text>
+                  <FormattedMessage id="studio_tagger.config.create_parent_desc" />
+                </Form.Text>
+              </Form.Group>
+            }
+          />
+        </div>
+
+        <StudioTaggerList
+          studios={studios}
+          selectedEndpoint={{
+            endpoint: selectedEndpoint.endpoint,
+            index: selectedEndpointIndex,
+          }}
+          isIdle={batchJobID === undefined}
+          config={config}
+          onBatchAdd={batchAdd}
+          onBatchUpdate={batchUpdate}
+        />
       </div>
     </>
   );
diff --git a/ui/v2.5/src/components/Tagger/tags/TagTagger.tsx b/ui/v2.5/src/components/Tagger/tags/TagTagger.tsx
index 21891724c..8b22a5920 100644
--- a/ui/v2.5/src/components/Tagger/tags/TagTagger.tsx
+++ b/ui/v2.5/src/components/Tagger/tags/TagTagger.tsx
@@ -12,11 +12,10 @@ import {
   mutateStashBoxBatchTagTag,
   getClient,
 } from "src/core/StashService";
-import { Manual } from "src/components/Help/Manual";
 import { useConfigurationContext } from "src/hooks/Config";
 
 import StashSearchResult from "./StashSearchResult";
-import TaggerConfig from "../TaggerConfig";
+import TaggerConfig, { ConfigButton } from "../TaggerConfig";
 import { ITaggerConfig, TAG_FIELDS } from "../constants";
 import { useUpdateTag } from "../queries";
 import { ExternalLink } from "src/components/Shared/ExternalLink";
@@ -27,6 +26,7 @@ import {
   BatchUpdateModal,
   BatchAddModal,
 } from "src/components/Shared/BatchModals";
+import { StashBoxSelectorField } from "../StashBoxSelector";
 
 type JobFragment = Pick<
   GQL.Job,
@@ -414,11 +414,9 @@ interface ITaggerProps {
 
 export const TagTagger: React.FC<ITaggerProps> = ({ tags }) => {
   const jobsSubscribe = useJobsSubscribe();
-  const intl = useIntl();
   const { configuration: stashConfig } = useConfigurationContext();
   const { config, setConfig } = useTaggerConfig();
   const [showConfig, setShowConfig] = useState(false);
-  const [showManual, setShowManual] = useState(false);
 
   const [batchJobID, setBatchJobID] = useState<string | undefined | null>();
   const [batchJob, setBatchJob] = useState<JobFragment | undefined>();
@@ -533,98 +531,102 @@ export const TagTagger: React.FC<ITaggerProps> = ({ tags }) => {
     }
   }
 
-  const showHideConfigId = showConfig
-    ? "actions.hide_configuration"
-    : "actions.show_configuration";
+  if (selectedEndpointIndex === -1 || !selectedEndpoint) {
+    return (
+      <div className="my-4">
+        <h3 className="text-center mt-4">
+          <FormattedMessage id="tag_tagger.to_use_the_tag_tagger" />
+        </h3>
+        <h5 className="text-center">
+          <FormattedMessage
+            id="refer_to"
+            values={{
+              link: (
+                <HashLink
+                  to="/settings?tab=metadata-providers#stash-boxes"
+                  scroll={(el) =>
+                    el.scrollIntoView({ behavior: "smooth", block: "center" })
+                  }
+                >
+                  <FormattedMessage id="config.stashbox.title" />
+                </HashLink>
+              ),
+            }}
+          />
+        </h5>
+      </div>
+    );
+  }
 
   return (
     <>
-      <Manual
-        show={showManual}
-        onClose={() => setShowManual(false)}
-        defaultActiveTab="Tagger.md"
-      />
       {renderStatus()}
       <div className="tagger-container mx-md-auto">
-        {selectedEndpointIndex !== -1 && selectedEndpoint ? (
-          <>
-            <div className="row mb-2 no-gutters">
-              <Button onClick={() => setShowConfig(!showConfig)} variant="link">
-                {intl.formatMessage({ id: showHideConfigId })}
-              </Button>
-              <Button
-                className="ml-auto"
-                onClick={() => setShowManual(true)}
-                title={intl.formatMessage({ id: "help" })}
-                variant="link"
-              >
-                <FormattedMessage id="help" />
-              </Button>
-            </div>
-
-            <TaggerConfig
-              config={config}
-              setConfig={setConfig}
-              show={showConfig}
-              excludedFields={config.excludedTagFields ?? []}
-              onFieldsChange={(fields) =>
-                setConfig({ ...config, excludedTagFields: fields })
-              }
-              fields={TAG_FIELDS}
-              entityName="tags"
-              extraConfig={
-                <Form.Group
-                  controlId="create-parent"
-                  className="align-items-center"
-                >
-                  <Form.Check
-                    label={
-                      <FormattedMessage id="tag_tagger.config.create_parent_label" />
-                    }
-                    checked={config.createParentTags}
-                    onChange={(e: React.ChangeEvent<HTMLInputElement>) =>
-                      setConfig({
-                        ...config,
-                        createParentTags: e.currentTarget.checked,
-                      })
-                    }
-                  />
-                  <Form.Text>
-                    <FormattedMessage id="tag_tagger.config.create_parent_desc" />
-                  </Form.Text>
-                </Form.Group>
-              }
-            />
-            <TagTaggerList
-              tags={tags}
-              selectedEndpoint={{
-                endpoint: selectedEndpoint.endpoint,
-                index: selectedEndpointIndex,
-              }}
-              isIdle={batchJobID === undefined}
-              config={config}
-              onBatchAdd={batchAdd}
-              onBatchUpdate={batchUpdate}
-            />
-          </>
-        ) : (
-          <div className="my-4">
-            <h3 className="text-center mt-4">
-              <FormattedMessage id="tag_tagger.to_use_the_tag_tagger" />
-            </h3>
-            <h5 className="text-center">
-              Please see{" "}
-              <HashLink
-                to="/settings?tab=metadata-providers#stash-boxes"
-                scroll={(el) =>
-                  el.scrollIntoView({ behavior: "smooth", block: "center" })
+        <div className="tagger-container-header">
+          <div className="d-flex justify-content-between align-items-center flex-wrap">
+            <div className="w-auto">
+              <StashBoxSelectorField
+                stashBoxes={stashConfig?.general.stashBoxes ?? []}
+                selectedEndpoint={selectedEndpoint.endpoint}
+                onEndpointChange={(endpoint) =>
+                  setConfig({ ...config, selectedEndpoint: endpoint })
                 }
-              >
-                Settings.
-              </HashLink>
-            </h5>
+              />
+            </div>
+            <div className="d-flex">
+              <div className="ml-2">
+                <ConfigButton
+                  showConfig={showConfig}
+                  onClick={() => setShowConfig(!showConfig)}
+                />
+              </div>
+            </div>
           </div>
-        )}
+
+          <TaggerConfig
+            show={showConfig}
+            excludedFields={config.excludedTagFields ?? []}
+            onFieldsChange={(fields) =>
+              setConfig({ ...config, excludedTagFields: fields })
+            }
+            fields={TAG_FIELDS}
+            entityName="tags"
+            extraConfig={
+              <Form.Group
+                controlId="create-parent"
+                className="align-items-center"
+              >
+                <Form.Check
+                  label={
+                    <FormattedMessage id="tag_tagger.config.create_parent_label" />
+                  }
+                  checked={config.createParentTags}
+                  onChange={(e: React.ChangeEvent<HTMLInputElement>) =>
+                    setConfig({
+                      ...config,
+                      createParentTags: e.currentTarget.checked,
+                    })
+                  }
+                />
+                <Form.Text>
+                  <FormattedMessage id="tag_tagger.config.create_parent_desc" />
+                </Form.Text>
+              </Form.Group>
+            }
+          />
+        </div>
+
+        <TagTaggerList
+          tags={tags}
+          selectedEndpoint={{
+            endpoint: selectedEndpoint.endpoint,
+            index: selectedEndpointIndex,
+          }}
+          isIdle={batchJobID === undefined}
+          config={config}
+          onBatchAdd={batchAdd}
+          onBatchUpdate={batchUpdate}
+        />
       </div>
     </>
   );
diff --git a/ui/v2.5/src/locales/en-GB.json b/ui/v2.5/src/locales/en-GB.json
index 46de0e8b7..048a7d7d0 100644
--- a/ui/v2.5/src/locales/en-GB.json
+++ b/ui/v2.5/src/locales/en-GB.json
@@ -1404,6 +1404,7 @@
   "rating": "Rating",
   "recently_added_objects": "Recently Added {objects}",
   "recently_released_objects": "Recently Released {objects}",
+  "refer_to": "Please see {link}.",
   "release_notes": "Release Notes",
   "resolution": "Resolution",
   "resume_time": "Resume Time",

From 79b6cb6fd28ee28d463696bd1a330aa841cfeea2 Mon Sep 17 00:00:00 2001
From: feederbox826 <me@feederbox.cc>
Date: Wed, 18 Mar 2026 22:36:58 -0400
Subject: [PATCH 372/405] Lint + build update and retooling (#6638)

* update compiler and build process

- assemble cross-builds in multi-build steps
- clean up unnecessary dependences
- use node docker image instead of nodesource (unsupported)
- downgrade to freebsd12 to match compiler

Co-authored-by: Gykes <Gykes@pm.me>

* [compiler] use new image instead of placeholder

removes .gitignore, update README

* [CI] lock pnpm action-setup to SHA hash

* bump @actions/upload-artifact
---------
Co-authored-by: feederbox826 <feederbox826@users.noreply.github.com>
Co-authored-by: Gykes <Gykes@pm.me>
Co-authored-by: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
---
 .github/workflows/build-compiler.yml |  28 +++
 .github/workflows/build.yml          | 257 +++++++++++++++++++--------
 .github/workflows/golangci-lint.yml  |  61 +------
 Makefile                             |   2 +-
 docker/compiler/.gitignore           |   1 -
 docker/compiler/Dockerfile           | 138 +++++++-------
 docker/compiler/Makefile             |  20 ++-
 docker/compiler/README.md            |   2 +-
 docs/DEVELOPMENT.md                  |   4 +-
 ui/v2.5/package.json                 |   1 +
 10 files changed, 310 insertions(+), 204 deletions(-)
 create mode 100644 .github/workflows/build-compiler.yml
 delete mode 100644 docker/compiler/.gitignore

diff --git a/.github/workflows/build-compiler.yml b/.github/workflows/build-compiler.yml
new file mode 100644
index 000000000..e7881720b
--- /dev/null
+++ b/.github/workflows/build-compiler.yml
@@ -0,0 +1,28 @@
+name: Compiler Build
+
+on:
+  workflow_dispatch:
+
+env:
+  COMPILER_IMAGE: ghcr.io/stashapp/compiler:13
+
+jobs:
+  build-compiler:
+    runs-on: ubuntu-24.04
+    steps:
+    - uses: actions/checkout@v6
+    - uses: docker/login-action@v3
+      with:
+        registry: ghcr.io
+        username: ${{ github.repository_owner }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+    - uses: docker/setup-buildx-action@v3
+    - uses: docker/build-push-action@v6
+      with:
+        push: true
+        context: "{{defaultContext}}:docker/compiler"
+        tags: |
+          ${{ env.COMPILER_IMAGE }}
+          ghcr.io/stashapp/compiler:latest
+        cache-from: type=gha,scope=all,mode=max
+        cache-to: type=gha,scope=all,mode=max
\ No newline at end of file
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1e46ecd69..1dcde9f83 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -2,7 +2,7 @@ name: Build
 
 on:
   push:
-    branches: 
+    branches:
       - develop
       - master
       - 'releases/**'
@@ -15,50 +15,160 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  COMPILER_IMAGE: stashapp/compiler:12
+  COMPILER_IMAGE: ghcr.io/stashapp/compiler:13
 
 jobs:
-  build:
-    runs-on: ubuntu-22.04
+  # Job 1: Generate code and build UI
+  # Runs natively (no Docker) — go generate/gqlgen and node don't need cross-compilers.
+  # Produces artifacts (generated Go files + UI build) consumed by test and build jobs.
+  generate:
+    runs-on: ubuntu-24.04
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v6
+    - name: Setup Go
+      uses: actions/setup-go@v6
 
-    - name: Checkout
-      run: git fetch --prune --unshallow --tags
+    # pnpm version is read from the packageManager field in package.json
+    # very broken (4.3, 4.4)
+    - name: Install pnpm
+      uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061
+      with:
+        package_json_file: ui/v2.5/package.json
+
+    - name: Setup Node.js
+      uses: actions/setup-node@v6
+      with:
+        node-version: '20'
+        cache: 'pnpm'
+        cache-dependency-path: ui/v2.5/pnpm-lock.yaml
+
+    - name: Install UI dependencies
+      run: cd ui/v2.5 && pnpm install --frozen-lockfile
+
+    - name: Generate
+      run: make generate
+
+    - name: Cache UI build
+      uses: actions/cache@v5
+      id: cache-ui
+      with:
+        path: ui/v2.5/build
+        key: ${{ runner.os }}-ui-build-${{ hashFiles('ui/v2.5/pnpm-lock.yaml', 'ui/v2.5/public/**', 'ui/v2.5/src/**', 'graphql/**/*.graphql') }}
+
+    - name: Validate UI
+      # skip UI validation for pull requests if UI is unchanged
+      if: ${{ github.event_name != 'pull_request' || steps.cache-ui.outputs.cache-hit != 'true' }}
+      run: make validate-ui
+
+    - name: Build UI
+      # skip UI build for pull requests if UI is unchanged (UI was cached)
+      if: ${{ github.event_name != 'pull_request' || steps.cache-ui.outputs.cache-hit != 'true' }}
+      run: make ui
+
+    # Bundle generated Go files + UI build for downstream jobs (test + build)
+    - name: Upload generated artifacts
+      uses: actions/upload-artifact@v7
+      with:
+        name: generated
+        retention-days: 1
+        path: |
+          internal/api/generated_exec.go
+          internal/api/generated_models.go
+          ui/v2.5/build/
+          ui/login/locales/
+
+  # Job 2: Integration tests
+  # Runs natively (no Docker) — only needs Go + GCC (for CGO/SQLite), both on ubuntu-22.04.
+  # Runs in parallel with the build matrix jobs.
+  test:
+    needs: generate
+    runs-on: ubuntu-24.04
+    steps:
+    - uses: actions/checkout@v6
 
     - name: Setup Go
-      uses: actions/setup-go@v5
+      uses: actions/setup-go@v6
       with:
         go-version-file: 'go.mod'
 
-    - name: Pull compiler image
-      run: docker pull $COMPILER_IMAGE
-
-    - name: Cache node modules
-      uses: actions/cache@v3
-      env:
-        cache-name: cache-node_modules
+    # Places generated Go files + UI build into the working tree so the build compiles
+    - name: Download generated artifacts
+      uses: actions/download-artifact@v8
       with:
-        path: ui/v2.5/node_modules
-        key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('ui/v2.5/pnpm-lock.yaml') }}
+        name: generated
 
-    - name: Cache UI build
-      uses: actions/cache@v3
-      id: cache-ui
-      env:
-        cache-name: cache-ui
+    - name: Test Backend
+      run: make it
+
+  # Job 3: Cross-compile for all platforms
+  # Each platform gets its own runner and Docker container (ghcr.io/stashapp/compiler:13).
+  # Each build-cc-* make target is self-contained (sets its own GOOS/GOARCH/CC),
+  # so running them in separate containers is functionally identical to one container.
+  # Runs in parallel with the test job.
+  build:
+    needs: generate
+    runs-on: ubuntu-24.04
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+        - platform: windows
+          make-target: build-cc-windows
+          artifact-paths: |
+            dist/stash-win.exe
+          tag: win
+        - platform: macos
+          make-target: build-cc-macos
+          artifact-paths: |
+            dist/stash-macos
+            dist/Stash.app.zip
+          tag: osx
+        - platform: linux
+          make-target: build-cc-linux
+          artifact-paths: |
+            dist/stash-linux
+          tag: linux
+        - platform: linux-arm64v8
+          make-target: build-cc-linux-arm64v8
+          artifact-paths: |
+            dist/stash-linux-arm64v8
+          tag: arm
+        - platform: linux-arm32v7
+          make-target: build-cc-linux-arm32v7
+          artifact-paths: |
+            dist/stash-linux-arm32v7
+          tag: arm
+        - platform: linux-arm32v6
+          make-target: build-cc-linux-arm32v6
+          artifact-paths: |
+            dist/stash-linux-arm32v6
+          tag: arm
+        - platform: freebsd
+          make-target: build-cc-freebsd
+          artifact-paths: |
+            dist/stash-freebsd
+          tag: freebsd
+
+    steps:
+    - uses: actions/checkout@v6
       with:
-        path: ui/v2.5/build
-        key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('ui/v2.5/pnpm-lock.yaml', 'ui/v2.5/public/**', 'ui/v2.5/src/**', 'graphql/**/*.graphql') }}
+        fetch-depth: 1
+        fetch-tags: true
 
-    - name: Cache go build
-      uses: actions/cache@v3
-      env:
-        # increment the number suffix to bump the cache
-        cache-name: cache-go-cache-1
+    - name: Download generated artifacts
+      uses: actions/download-artifact@v8
+      with:
+        name: generated
+
+    - name: Cache Go build
+      uses: actions/cache@v5
       with:
         path: .go-cache
-        key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('go.mod', '**/go.sum') }}
+        key: ${{ runner.os }}-go-cache-${{ matrix.platform }}-${{ hashFiles('go.mod', '**/go.sum') }}
+
+    # kept seperate to test timings
+    - name: pull compiler image
+      run: docker pull $COMPILER_IMAGE
 
     - name: Start build container
       env:
@@ -67,45 +177,48 @@ jobs:
         mkdir -p .go-cache
         docker run -d --name build --mount type=bind,source="$(pwd)",target=/stash,consistency=delegated --mount type=bind,source="$(pwd)/.go-cache",target=/root/.cache/go-build,consistency=delegated --env OFFICIAL_BUILD=${{ env.official-build }} -w /stash $COMPILER_IMAGE tail -f /dev/null
 
-    - name: Pre-install
-      run: docker exec -t build /bin/bash -c "make CI=1 pre-ui"
-
-    - name: Generate
-      run: docker exec -t build /bin/bash -c "make generate"
-
-    - name: Validate UI
-      # skip UI validation for pull requests if UI is unchanged
-      if: ${{ github.event_name != 'pull_request' || steps.cache-ui.outputs.cache-hit != 'true' }}
-      run: docker exec -t build /bin/bash -c "make validate-ui"
-
-    # Static validation happens in the linter workflow in parallel to this workflow
-    # Run Dynamic validation here, to make sure we pass all the projects integration tests
-    - name: Test Backend
-      run: docker exec -t build /bin/bash -c "make it"
-
-    - name: Build UI
-      # skip UI build for pull requests if UI is unchanged (UI was cached)
-      # this means that the build version/time may be incorrect if the UI is
-      # not changed in a pull request
-      if: ${{ github.event_name != 'pull_request' || steps.cache-ui.outputs.cache-hit != 'true' }}
-      run: docker exec -t build /bin/bash -c "make ui"
-
-    - name: Compile for all supported platforms
-      run: |
-        docker exec -t build /bin/bash -c "make build-cc-windows"
-        docker exec -t build /bin/bash -c "make build-cc-macos"
-        docker exec -t build /bin/bash -c "make build-cc-linux"
-        docker exec -t build /bin/bash -c "make build-cc-linux-arm64v8"
-        docker exec -t build /bin/bash -c "make build-cc-linux-arm32v7"
-        docker exec -t build /bin/bash -c "make build-cc-linux-arm32v6"
-        docker exec -t build /bin/bash -c "make build-cc-freebsd"
-
-    - name: Zip UI
-      run: docker exec -t build /bin/bash -c "make zip-ui"
+    - name: Build (${{ matrix.platform }})
+      run: docker exec -t build /bin/bash -c "make ${{ matrix.make-target }}"
 
     - name: Cleanup build container
       run: docker rm -f -v build
 
+    - name: Upload build artifact
+      uses: actions/upload-artifact@v7
+      with:
+        name: build-${{ matrix.platform }}
+        retention-days: 1
+        path: ${{ matrix.artifact-paths }}
+
+  # Job 4: Release
+  # Waits for both test and build to pass, then collects all platform artifacts
+  # into dist/ for checksums, GitHub releases, and multi-arch Docker push.
+  release:
+    needs: [test, build]
+    runs-on: ubuntu-24.04
+    steps:
+    - uses: actions/checkout@v6
+      with:
+        fetch-depth: 0
+        fetch-tags: true
+
+    # Downloads all artifacts (generated + 7 platform builds) into artifacts/ subdirectories
+    - name: Download all build artifacts
+      uses: actions/download-artifact@v8
+      with:
+        path: artifacts
+
+    # Reassemble platform binaries from matrix job artifacts into a single dist/ directory
+    # upload-artifact@v4 strips the common path prefix (dist/), so files are at the artifact root
+    - name: Collect binaries
+      run: |
+        mkdir -p dist
+        cp artifacts/build-*/* dist/
+
+    - name: Zip UI
+      run: |
+        cd artifacts/generated/ui/v2.5/build && zip -r ../../../../../dist/stash-ui.zip .
+
     - name: Generate checksums
       run: |
         git describe --tags --exclude latest_develop | tee CHECKSUMS_SHA1
@@ -116,7 +229,7 @@ jobs:
     - name: Upload Windows binary
       # only upload binaries for pull requests
       if: ${{ github.event_name == 'pull_request' && github.base_ref != 'refs/heads/develop' && github.base_ref != 'refs/heads/master'}}
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         name: stash-win.exe
         path: dist/stash-win.exe
@@ -124,7 +237,7 @@ jobs:
     - name: Upload macOS binary
       # only upload binaries for pull requests
       if: ${{ github.event_name == 'pull_request' && github.base_ref != 'refs/heads/develop' && github.base_ref != 'refs/heads/master'}}
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         name: stash-macos
         path: dist/stash-macos
@@ -132,7 +245,7 @@ jobs:
     - name: Upload Linux binary
       # only upload binaries for pull requests
       if: ${{ github.event_name == 'pull_request' && github.base_ref != 'refs/heads/develop' && github.base_ref != 'refs/heads/master'}}
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         name: stash-linux
         path: dist/stash-linux
@@ -140,14 +253,14 @@ jobs:
     - name: Upload UI
       # only upload for pull requests
       if: ${{ github.event_name == 'pull_request' && github.base_ref != 'refs/heads/develop' && github.base_ref != 'refs/heads/master'}}
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         name: stash-ui.zip
         path: dist/stash-ui.zip
 
     - name: Update latest_develop tag
       if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/develop' }}
-      run : git tag -f latest_develop; git push -f --tags
+      run: git tag -f latest_develop; git push -f --tags
 
     - name: Development Release
       if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/develop' }}
@@ -197,7 +310,7 @@ jobs:
         DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
         DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
       run: |
-        docker run --rm --privileged docker/binfmt:a7996909642ee92942dcd6cff44b9b95f08dad64
+        docker run --rm --privileged tonistiigi/binfmt
         docker info
         docker buildx create --name builder --use
         docker buildx inspect --bootstrap
@@ -213,7 +326,7 @@ jobs:
         DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
         DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
       run: |
-        docker run --rm --privileged docker/binfmt:a7996909642ee92942dcd6cff44b9b95f08dad64
+        docker run --rm --privileged tonistiigi/binfmt
         docker info
         docker buildx create --name builder --use
         docker buildx inspect --bootstrap
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
index 71c743ced..19a6d62bd 100644
--- a/.github/workflows/golangci-lint.yml
+++ b/.github/workflows/golangci-lint.yml
@@ -9,65 +9,20 @@ on:
       - 'releases/**'
   pull_request:
 
-env:
-  COMPILER_IMAGE: stashapp/compiler:12
-
 jobs:
   golangci:
     name: lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-
-      - name: Checkout
-        run: git fetch --prune --unshallow --tags
-
-      - name: Setup Go
-        uses: actions/setup-go@v5
-        with:
-          go-version-file: 'go.mod'
-
-      - name: Pull compiler image
-        run: docker pull $COMPILER_IMAGE
-
-      - name: Start build container
-        run: |
-          mkdir -p .go-cache
-          docker run -d --name build --mount type=bind,source="$(pwd)",target=/stash,consistency=delegated --mount type=bind,source="$(pwd)/.go-cache",target=/root/.cache/go-build,consistency=delegated -w /stash $COMPILER_IMAGE tail -f /dev/null
+      # no tags or depth needed for lint
+      - uses: actions/checkout@v6
+      - uses: actions/setup-go@v6
 
+      # generate-backend runs natively (just go generate + touch-ui) — no Docker needed
       - name: Generate Backend
-        run: docker exec -t build /bin/bash -c "make generate-backend"
+        run: make generate-backend
 
+      ## WARN
+      ## using v1, update in a later PR
       - name: Run golangci-lint
-        uses: golangci/golangci-lint-action@v6
-        with:
-          # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
-          version: latest
-
-          # Optional: working directory, useful for monorepos
-          # working-directory: somedir
-
-          # Optional: golangci-lint command line arguments.
-          #
-          # Note: By default, the `.golangci.yml` file should be at the root of the repository.
-          # The location of the configuration file can be changed by using `--config=`
-          args: --timeout=5m
-
-          # Optional: show only new issues if it's a pull request. The default value is `false`.
-          # only-new-issues: true
-
-          # Optional: if set to true, then all caching functionality will be completely disabled,
-          #           takes precedence over all other caching options.
-          # skip-cache: true
-
-          # Optional: if set to true, then the action won't cache or restore ~/go/pkg.
-          # skip-pkg-cache: true
-
-          # Optional: if set to true, then the action won't cache or restore ~/.cache/go-build.
-          # skip-build-cache: true
-
-          # Optional: The mode to install golangci-lint. It can be 'binary' or 'goinstall'.
-          # install-mode: "goinstall"
-
-      - name: Cleanup build container
-        run: docker rm -f -v build
+        uses: golangci/golangci-lint-action@v6
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 7e19063a3..4f8d9cadd 100644
--- a/Makefile
+++ b/Makefile
@@ -50,7 +50,7 @@ export CGO_ENABLED := 1
 
 # define COMPILER_IMAGE for cross-compilation docker container
 ifndef COMPILER_IMAGE
-  COMPILER_IMAGE := stashapp/compiler:latest
+  COMPILER_IMAGE := ghcr.io/stashapp/compiler:latest
 endif
 
 .PHONY: release
diff --git a/docker/compiler/.gitignore b/docker/compiler/.gitignore
deleted file mode 100644
index 7012bfd63..000000000
--- a/docker/compiler/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.sdk.tar.*
\ No newline at end of file
diff --git a/docker/compiler/Dockerfile b/docker/compiler/Dockerfile
index 0154d7e61..c9dfb9c7c 100644
--- a/docker/compiler/Dockerfile
+++ b/docker/compiler/Dockerfile
@@ -1,82 +1,86 @@
-FROM golang:1.24.3
+### OSXCROSS
+FROM debian:bookworm AS osxcross
+# add osxcross
+WORKDIR /tmp/osxcross
+ARG OSXCROSS_REVISION=5e1b71fcceb23952f3229995edca1b6231525b5b
+ADD --checksum=sha256:d3f771bbc20612fea577b18a71be3af2eb5ad2dd44624196cf55de866d008647 https://codeload.github.com/tpoechtrager/osxcross/tar.gz/${OSXCROSS_REVISION} /tmp/osxcross.tar.gz
 
-LABEL maintainer="https://discord.gg/2TsNFKt"
+ARG OSX_SDK_VERSION=11.3
+ARG OSX_SDK_DOWNLOAD_FILE=MacOSX${OSX_SDK_VERSION}.sdk.tar.xz
+ARG OSX_SDK_DOWNLOAD_URL=https://github.com/phracker/MacOSX-SDKs/releases/download/${OSX_SDK_VERSION}/${OSX_SDK_DOWNLOAD_FILE}
+ADD --checksum=sha256:cd4f08a75577145b8f05245a2975f7c81401d75e9535dcffbb879ee1deefcbf4 ${OSX_SDK_DOWNLOAD_URL} /tmp/osxcross/tarballs/${OSX_SDK_DOWNLOAD_FILE}
 
-RUN apt-get update && apt-get install -y apt-transport-https ca-certificates gnupg
+ENV UNATTENDED=yes \
+    SDK_VERSION=${OSX_SDK_VERSION} \
+    OSX_VERSION_MIN=10.10
+RUN apt update && \
+  apt install -y --no-install-recommends \
+  bash ca-certificates clang cmake git patch libssl-dev bzip2 cpio libbz2-dev libxml2-dev make python3 xz-utils zlib1g-dev
+# lzma-dev libxml2-dev xz
+RUN tar --strip=1 -C /tmp/osxcross -xf /tmp/osxcross.tar.gz
+RUN ./build.sh
 
-RUN mkdir -p /etc/apt/keyrings
+### FREEBSD cross-compilation stage
+# use alpine for cacheable image since apt is notorous for not caching
+FROM alpine:3 AS freebsd
+# match golang latest
+# https://go.dev/wiki/FreeBSD
+ARG FREEBSD_VERSION=12.4
+ADD --checksum=sha256:581c7edacfd2fca2bdf5791f667402d22fccd8a5e184635e0cac075564d57aa8 \
+  http://ftp-archive.freebsd.org/mirror/FreeBSD-Archive/old-releases/amd64/${FREEBSD_VERSION}-RELEASE/base.txz \
+  /tmp/base.txz
 
-ADD https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key nodesource.gpg.key
-RUN cat nodesource.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && rm nodesource.gpg.key
-RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_24.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
+WORKDIR /opt/cross-freebsd
+RUN apk add --no-cache tar xz
+RUN tar -xf /tmp/base.txz --strip-components=1 ./usr/lib ./usr/include ./lib
+RUN cd /opt/cross-freebsd/usr/lib && \
+    find . -type l -exec sh -c ' \
+      for link; do \
+        target=$(readlink "$link"); \
+        case "$target" in \
+          /lib/*) ln -sf "/opt/cross-freebsd$target" "$link";; \
+        esac; \
+      done \
+    ' sh {} + && \
+    ln -s libc++.a libstdc++.a && \
+    ln -s libc++.so libstdc++.so
 
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends \
-        git make tar bash nodejs zip \
-        clang llvm-dev cmake patch libxml2-dev uuid-dev libssl-dev xz-utils \
-        bzip2 gzip sed cpio libbz2-dev zlib1g-dev \
-        gcc-mingw-w64 \
-        gcc-arm-linux-gnueabi libc-dev-armel-cross linux-libc-dev-armel-cross \
-        gcc-aarch64-linux-gnu libc-dev-arm64-cross && \
-    rm -rf /var/lib/apt/lists/*;
+### BUILDER
+FROM golang:1.24.3 AS builder
+ENV PATH=/opt/osx-ndk-x86/bin:$PATH
+
+# copy in nodejs instead of using nodesource :thumbsup:
+COPY --from=docker.io/library/node:24-bookworm /usr/local /usr/local
+# copy in osxcross
+COPY --from=osxcross /tmp/osxcross/target/lib /usr/lib
+COPY --from=osxcross /tmp/osxcross/target /opt/osx-ndk-x86
+# copy in cross-freebsd 
+COPY --from=freebsd /opt/cross-freebsd /opt/cross-freebsd
 
 # pnpm install with npm
 RUN npm install -g pnpm
 
-# FreeBSD cross-compilation setup
-# https://github.com/smartmontools/docker-build/blob/6b8c92560d17d325310ba02d9f5a4b250cb0764a/Dockerfile#L66
-ENV FREEBSD_VERSION       13.4
-ENV FREEBSD_DOWNLOAD_URL  http://ftp.plusline.de/FreeBSD/releases/amd64/${FREEBSD_VERSION}-RELEASE/base.txz
-ENV FREEBSD_SHA           8e13b0a93daba349b8d28ad246d7beb327659b2ef4fe44d89f447392daec5a7c
+# git for getting hash
+# make and bash for building
 
-RUN cd /tmp && \
-    curl -o base.txz $FREEBSD_DOWNLOAD_URL && \
-    echo "$FREEBSD_SHA base.txz" | sha256sum -c - && \
-    mkdir -p /opt/cross-freebsd && \
-    cd /opt/cross-freebsd && \
-    tar -xf /tmp/base.txz ./lib/ ./usr/lib/ ./usr/include/ && \
-    rm -f /tmp/base.txz && \
-    cd /opt/cross-freebsd/usr/lib && \
-    find . -xtype l | xargs ls -l | grep ' /lib/' | awk '{print "ln -sf /opt/cross-freebsd"$11 " " $9}' | /bin/sh && \
-    ln -s libc++.a libstdc++.a && \
-    ln -s libc++.so libstdc++.so
-
-# macOS cross-compilation setup
-ENV OSX_SDK_VERSION 	   11.3
-ENV OSX_SDK_DOWNLOAD_FILE  MacOSX${OSX_SDK_VERSION}.sdk.tar.xz
-ENV OSX_SDK_DOWNLOAD_URL   https://github.com/phracker/MacOSX-SDKs/releases/download/${OSX_SDK_VERSION}/${OSX_SDK_DOWNLOAD_FILE}
-ENV OSX_SDK_SHA            cd4f08a75577145b8f05245a2975f7c81401d75e9535dcffbb879ee1deefcbf4
-ENV OSXCROSS_REVISION      5e1b71fcceb23952f3229995edca1b6231525b5b
-ENV OSXCROSS_DOWNLOAD_URL  https://codeload.github.com/tpoechtrager/osxcross/tar.gz/${OSXCROSS_REVISION}
-ENV OSXCROSS_SHA           d3f771bbc20612fea577b18a71be3af2eb5ad2dd44624196cf55de866d008647
-
-RUN cd /tmp && \
-    curl -o osxcross.tar.gz $OSXCROSS_DOWNLOAD_URL && \
-    echo "$OSXCROSS_SHA osxcross.tar.gz" | sha256sum -c - && \
-    mkdir osxcross && \
-    tar --strip=1 -C osxcross -xf osxcross.tar.gz && \
-    rm -f osxcross.tar.gz && \
-    curl -Lo $OSX_SDK_DOWNLOAD_FILE $OSX_SDK_DOWNLOAD_URL && \
-    echo "$OSX_SDK_SHA $OSX_SDK_DOWNLOAD_FILE" | sha256sum -c - && \
-    mv $OSX_SDK_DOWNLOAD_FILE osxcross/tarballs/ && \
-    UNATTENDED=yes SDK_VERSION=$OSX_SDK_VERSION OSX_VERSION_MIN=10.10 osxcross/build.sh && \
-    cp osxcross/target/lib/* /usr/lib/ && \
-    mv osxcross/target /opt/osx-ndk-x86 && \
-    rm -rf /tmp/osxcross
-
-ENV PATH /opt/osx-ndk-x86/bin:$PATH
-
-RUN mkdir -p /root/.ssh && \
-    chmod 0700 /root/.ssh && \
-    ssh-keyscan github.com > /root/.ssh/known_hosts
-
-# ignore "dubious ownership" errors
+# clang for macos
+# zip for stashapp.zip
+# gcc-extensions for cross-arch build
+# we still target arm soft float?
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends \
+        git make bash \
+        clang zip \
+        gcc-mingw-w64 \
+        gcc-arm-linux-gnueabi \
+        libc-dev-armel-cross linux-libc-dev-armel-cross \
+        gcc-aarch64-linux-gnu libc-dev-arm64-cross && \
+    rm -rf /var/lib/apt/lists/*;
 RUN git config --global safe.directory '*'
-
 # To test locally:
 # make generate
 # make ui
 # cd docker/compiler
-# make build
-# docker run --rm -v /PATH_TO_STASH:/stash -w /stash -i -t stashapp/compiler:latest make build-cc-all
-# # binaries will show up in /dist
+# docker build . -t ghcr.io/stashapp/compiler:latest
+# docker run --rm -v /PATH_TO_STASH:/stash -w /stash -i -t ghcr.io/stashapp/compiler:latest make build-cc-all
+# # binaries will show up in /dist
\ No newline at end of file
diff --git a/docker/compiler/Makefile b/docker/compiler/Makefile
index ed6a9a285..66f19f5d6 100644
--- a/docker/compiler/Makefile
+++ b/docker/compiler/Makefile
@@ -1,16 +1,22 @@
+host=ghcr.io
 user=stashapp
 repo=compiler
-version=12
+version=13
+
+VERSION_IMAGE = ${host}/${user}/${repo}:${version}
+LATEST_IMAGE = ${host}/${user}/${repo}:latest
 
 latest:
-	docker build -t ${user}/${repo}:latest .
+	docker build -t ${LATEST_IMAGE} .
 
 build:
-	docker build -t ${user}/${repo}:${version} -t ${user}/${repo}:latest .
+	docker build -t ${VERSION_IMAGE} -t ${LATEST_IMAGE} .
 
 build-no-cache:
-	docker build --no-cache -t ${user}/${repo}:${version} -t ${user}/${repo}:latest .
+	docker build --no-cache -t ${VERSION_IMAGE} -t ${LATEST_IMAGE} .
 
-install: build
-	docker push ${user}/${repo}:${version}
-	docker push ${user}/${repo}:latest
+# requires docker login ghcr.io
+# echo $CR_PAT | docker login ghcr.io -u USERNAME --password-stdin
+push:
+	docker push ${VERSION_IMAGE}
+	docker push ${LATEST_IMAGE}
\ No newline at end of file
diff --git a/docker/compiler/README.md b/docker/compiler/README.md
index 6bb7d8d99..c7b4840f9 100644
--- a/docker/compiler/README.md
+++ b/docker/compiler/README.md
@@ -1,3 +1,3 @@
 Modified from https://github.com/bep/dockerfiles/tree/master/ci-goreleaser
 
-When the Dockerfile is changed, the version number should be incremented in the Makefile and the new version tag should be pushed to Docker Hub. The GitHub workflow files also need to be updated to pull the correct image tag.
+When the Dockerfile is changed, the version number should be incremented in [.github/workflows/build-compiler.yml](../../.github/workflows/build-compiler.yml) and the workflow [manually ran](). `env: COMPILER_IMAGE` in [.github/workflows/build.yml](../../.github/workflows/build.yml) also needs to be updated to pull the correct image tag.
\ No newline at end of file
diff --git a/docs/DEVELOPMENT.md b/docs/DEVELOPMENT.md
index 85c2f6f23..a26ce6817 100644
--- a/docs/DEVELOPMENT.md
+++ b/docs/DEVELOPMENT.md
@@ -118,8 +118,8 @@ This project uses a modification of the [CI-GoReleaser](https://github.com/bep/d
 To cross-compile the app yourself:
 
 1. Run `make pre-ui`, `make generate` and `make ui` outside the container, to generate files and build the UI.
-2. Pull the latest compiler image from Docker Hub: `docker pull stashapp/compiler`
-3. Run `docker run --rm --mount type=bind,source="$(pwd)",target=/stash -w /stash -it stashapp/compiler /bin/bash` to open a shell inside the container.
+2. Pull the latest compiler image from GHCR: `docker pull ghcr.io/stashapp/compiler`
+3. Run `docker run --rm --mount type=bind,source="$(pwd)",target=/stash -w /stash -it ghcr.io/stashapp/compiler /bin/bash` to open a shell inside the container.
 4. From inside the container, run `make build-cc-all` to build for all platforms, or run `make build-cc-{platform}` to build for a specific platform (have a look at the `Makefile` for the list of targets).
 5. You will find the compiled binaries in `dist/`.
 
diff --git a/ui/v2.5/package.json b/ui/v2.5/package.json
index e024a0053..001e7fb60 100644
--- a/ui/v2.5/package.json
+++ b/ui/v2.5/package.json
@@ -3,6 +3,7 @@
   "private": true,
   "homepage": "./",
   "type": "module",
+  "packageManager": "pnpm@10.30.3+sha512.c961d1e0a2d8e354ecaa5166b822516668b7f44cb5bd95122d590dd81922f606f5473b6d23ec4a5be05e7fcd18e8488d47d978bbe981872f1145d06e9a740017",
   "scripts": {
     "start": "vite",
     "build": "vite build",

From 58cf6307cb28cebfb667711a871f72615ac1f157 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Thu, 19 Mar 2026 13:59:42 +1100
Subject: [PATCH 373/405] Update changelog

---
 ui/v2.5/src/docs/en/Changelog/v0310.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ui/v2.5/src/docs/en/Changelog/v0310.md b/ui/v2.5/src/docs/en/Changelog/v0310.md
index af7ed159b..afb618507 100644
--- a/ui/v2.5/src/docs/en/Changelog/v0310.md
+++ b/ui/v2.5/src/docs/en/Changelog/v0310.md
@@ -37,6 +37,8 @@
 * Added button to delete scene cover. ([#6444](https://github.com/stashapp/stash/pull/6444))
 * Duplicate aliases are now silently removed. ([#6514](https://github.com/stashapp/stash/pull/6514))
 * Image query now includes image details field. ([#6673](https://github.com/stashapp/stash/pull/6673))
+* Select scene/performer/studio/tag dropdowns now accept stash-ids as input. ([#6709](https://github.com/stashapp/stash/pull/6709)) 
+* Volume when hovering over a scene preview is now configurable. ([#6712](https://github.com/stashapp/stash/pull/6712))
 * Added non-binary gender icon. ([#6489](https://github.com/stashapp/stash/pull/6489))
 * Transgender icons are now coloured by their presented gender. ([#6489](https://github.com/stashapp/stash/pull/6489))
 * It is now possible to add a library path to a non-existing directory (useful for disconnected network paths). ([#6644](https://github.com/stashapp/stash/pull/6644))
@@ -47,9 +49,11 @@
 * Added support for sorting performers, studios and tags by total scene file size. ([#6642](https://github.com/stashapp/stash/pull/6642))
 * Added support for filtering by stash ID count. ([#6437](https://github.com/stashapp/stash/pull/6437))
 * Added support for filtering group by scene count. ([#6593](https://github.com/stashapp/stash/pull/6593))
+* Updated Tag list view to be consistent with other list views. ([#6703](https://github.com/stashapp/stash/pull/6703))
 * Installed plugins/scrapers no longer show in the available list. ([#6443](https://github.com/stashapp/stash/pull/6443))
 * Name is now populated when searching by stash-box. ([#6447](https://github.com/stashapp/stash/pull/6447))
 * Improved performance of group queries on large systems. ([#6478](https://github.com/stashapp/stash/pull/6478))
+* Search input is now focused when opening the scraper menu. ([#6704](https://github.com/stashapp/stash/pull/6704))
 * Added support for `{phash}` in `queryURL` scraper field. ([#6701](https://github.com/stashapp/stash/pull/6701))
 * Systray notification now shows the port stash is running on. ([#6448](https://github.com/stashapp/stash/pull/6448))
 
@@ -62,6 +66,7 @@
 * Improved scanning algorithm to prevent creation of orphaned folders and handle missing parent folders. ([#6608](https://github.com/stashapp/stash/pull/6608))
 * Scanning no longer scans zip contents when the zip file is unchanged. ([#6633](https://github.com/stashapp/stash/pull/6633))
 * Captions are now correctly detected in a single scan. ([#6634](https://github.com/stashapp/stash/pull/6634))
+* Fixed galleries not being linked to scenes when scanning a matching file. ([#6705](https://github.com/stashapp/stash/pull/6705))
 * Fixed mis-clicks on cards navigating to new page when selecting items. ([#6599](https://github.com/stashapp/stash/pull/6599), [#6649](https://github.com/stashapp/stash/pull/6649))
 * Select dropdown now retains focus after creating a new option. ([#6697](https://github.com/stashapp/stash/pull/6697))
 * Fixed custom field filtering not working correctly when query value was provided. ([#6614](https://github.com/stashapp/stash/pull/6614))

From 640d62cf59868951109c6a54207d8171a44b873f Mon Sep 17 00:00:00 2001
From: feederbox826 <me@feederbox.cc>
Date: Thu, 19 Mar 2026 00:10:04 -0400
Subject: [PATCH 374/405] [CI] ensure artifacts have +x bit set (#6715)

---
 .github/workflows/build.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1dcde9f83..556df6be4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -209,11 +209,13 @@ jobs:
         path: artifacts
 
     # Reassemble platform binaries from matrix job artifacts into a single dist/ directory
+    # make sure that artifacts have executable bit set
     # upload-artifact@v4 strips the common path prefix (dist/), so files are at the artifact root
     - name: Collect binaries
       run: |
         mkdir -p dist
         cp artifacts/build-*/* dist/
+        chmod +x dist/*
 
     - name: Zip UI
       run: |

From ee9a852ec9ec864c2d12f2f139961f63ff207078 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Thu, 19 Mar 2026 16:35:12 +1100
Subject: [PATCH 375/405] Remove phasher from build target [skip ci]

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 4f8d9cadd..5a56df3ea 100644
--- a/Makefile
+++ b/Makefile
@@ -129,7 +129,7 @@ phasher: build-flags
 
 # builds dynamically-linked debug binaries
 .PHONY: build
-build: stash phasher
+build: stash
 
 # builds dynamically-linked PIE release binaries
 .PHONY: build-release

From c832e1a8a29250cd2720bac3b3b042b0b62aee49 Mon Sep 17 00:00:00 2001
From: feederbox826 <me@feederbox.cc>
Date: Thu, 19 Mar 2026 03:31:14 -0400
Subject: [PATCH 376/405] remove phasher target from bundle (#6717) [skip ci]

---
 Makefile | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 5a56df3ea..d9caf0ee5 100644
--- a/Makefile
+++ b/Makefile
@@ -187,8 +187,6 @@ build-cc-macos:
 	# Combine into universal binaries
 	lipo -create -output dist/stash-macos dist/stash-macos-intel dist/stash-macos-arm
 	rm dist/stash-macos-intel dist/stash-macos-arm
-	lipo -create -output dist/phasher-macos dist/phasher-macos-intel dist/phasher-macos-arm
-	rm dist/phasher-macos-intel dist/phasher-macos-arm
 
 	# Place into bundle and zip up
 	rm -rf dist/Stash.app
@@ -198,6 +196,16 @@ build-cc-macos:
 	cd dist && rm -f Stash.app.zip && zip -r Stash.app.zip Stash.app
 	rm -rf dist/Stash.app
 
+.PHONY: build-cc-macos-phasher
+build-cc-macos-phasher:
+	make build-cc-macos-arm
+	make build-cc-macos-intel
+
+	# Combine into universal binaries
+	lipo -create -output dist/phasher-macos dist/phasher-macos-intel dist/phasher-macos-arm
+	rm dist/phasher-macos-intel dist/phasher-macos-arm
+	# do not bundle phasher
+
 .PHONY: build-cc-freebsd
 build-cc-freebsd: export GOOS := freebsd
 build-cc-freebsd: export GOARCH := amd64

From 865c50d615c0c7b60509f9fa0345a544c3c601f9 Mon Sep 17 00:00:00 2001
From: feederbox826 <me@feederbox.cc>
Date: Sun, 22 Mar 2026 18:02:38 -0400
Subject: [PATCH 377/405] [ui] Fix Tag Modal cutting off (#6734)

---
 ui/v2.5/src/components/Tagger/tags/TagModal.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/v2.5/src/components/Tagger/tags/TagModal.tsx b/ui/v2.5/src/components/Tagger/tags/TagModal.tsx
index d9a7d99b8..804e5b55c 100644
--- a/ui/v2.5/src/components/Tagger/tags/TagModal.tsx
+++ b/ui/v2.5/src/components/Tagger/tags/TagModal.tsx
@@ -103,7 +103,7 @@ const TagModal: React.FC<ITagModalProps> = ({
             <FormattedMessage id={id} />:
           </strong>
         </div>
-        <TruncatedText className="col-7" text={text} />
+        <TruncatedText className="col-7" text={text} lineCount={3} />
       </div>
     );
   }
@@ -147,7 +147,7 @@ const TagModal: React.FC<ITagModalProps> = ({
             <FormattedMessage id={id} />:
           </strong>
         </div>
-        <TruncatedText className="col-7" text={text} />
+        <TruncatedText className="col-7" text={text} lineCount={3} />
       </div>
     );
   }

From 7a18b5310b6fdb408b2d183be4c3264a277720c0 Mon Sep 17 00:00:00 2001
From: DogmaDragon <103123951+DogmaDragon@users.noreply.github.com>
Date: Mon, 23 Mar 2026 00:06:20 +0200
Subject: [PATCH 378/405] Add GitHub Sponsors and forum links to about section
 (#6718)

* Add GitHub sponsors link to about section
* Add forum link to about section
* Fix casing in 'latest_version_build_hash' string in localization file
---
 .../Settings/SettingsAboutPanel.tsx           | 20 ++++++++++++++-----
 ui/v2.5/src/locales/en-GB.json                | 10 +++++-----
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/ui/v2.5/src/components/Settings/SettingsAboutPanel.tsx b/ui/v2.5/src/components/Settings/SettingsAboutPanel.tsx
index 9d9922330..316f471be 100644
--- a/ui/v2.5/src/components/Settings/SettingsAboutPanel.tsx
+++ b/ui/v2.5/src/components/Settings/SettingsAboutPanel.tsx
@@ -129,7 +129,7 @@ export const SettingsAboutPanel: React.FC = () => {
                 {
                   url: (
                     <ExternalLink href="https://docs.stashapp.cc">
-                      Documentation
+                      documentation
                     </ExternalLink>
                   ),
                 }
@@ -137,9 +137,14 @@ export const SettingsAboutPanel: React.FC = () => {
             </p>
             <p>
               {intl.formatMessage(
-                { id: "config.about.stash_discord" },
+                { id: "config.about.stash_community" },
                 {
-                  url: (
+                  forumUrl: (
+                    <ExternalLink href="https://discourse.stashapp.cc">
+                      forum
+                    </ExternalLink>
+                  ),
+                  discordUrl: (
                     <ExternalLink href="https://discord.gg/2TsNFKt">
                       Discord
                     </ExternalLink>
@@ -149,13 +154,18 @@ export const SettingsAboutPanel: React.FC = () => {
             </p>
             <p>
               {intl.formatMessage(
-                { id: "config.about.stash_open_collective" },
+                { id: "config.about.support_us" },
                 {
-                  url: (
+                  openCollectiveUrl: (
                     <ExternalLink href="https://opencollective.com/stashapp">
                       Open Collective
                     </ExternalLink>
                   ),
+                  githubSponsorsUrl: (
+                    <ExternalLink href="https://github.com/sponsors/stashapp">
+                      GitHub Sponsors
+                    </ExternalLink>
+                  ),
                 }
               )}
             </p>
diff --git a/ui/v2.5/src/locales/en-GB.json b/ui/v2.5/src/locales/en-GB.json
index 048a7d7d0..e27d51310 100644
--- a/ui/v2.5/src/locales/en-GB.json
+++ b/ui/v2.5/src/locales/en-GB.json
@@ -251,13 +251,13 @@
       "build_time": "Build time:",
       "check_for_new_version": "Check for new version",
       "latest_version": "Latest Version",
-      "latest_version_build_hash": "Latest Version Build Hash:",
+      "latest_version_build_hash": "Latest version build hash:",
       "new_version_notice": "[NEW]",
       "release_date": "Release date:",
-      "stash_discord": "Join our {url} channel",
-      "stash_home": "Stash home at {url}",
-      "stash_open_collective": "Support us through {url}",
-      "stash_wiki": "Stash {url} page",
+      "stash_home": "Visit Stash on {url}.",
+      "stash_wiki": "Check out Stash {url} website.",
+      "stash_community": "Join our {forumUrl} or {discordUrl} community server.",
+      "support_us": "Support us through {openCollectiveUrl} or {githubSponsorsUrl}.",
       "version": "Version"
     },
     "advanced_mode": "Advanced mode",

From b11be4807ad11bcc23db35188c703af7714521de Mon Sep 17 00:00:00 2001
From: feederbox826 <me@feederbox.cc>
Date: Sun, 22 Mar 2026 18:07:13 -0400
Subject: [PATCH 379/405] fetch full depth of git history for compiler (#6726)

[ci] run generate with fetch depth
---
 .github/workflows/build.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 556df6be4..46346136c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -25,6 +25,9 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
     - uses: actions/checkout@v6
+      with:
+        fetch-depth: 0
+        fetch-tags: true
     - name: Setup Go
       uses: actions/setup-go@v6
 
@@ -152,7 +155,7 @@ jobs:
     steps:
     - uses: actions/checkout@v6
       with:
-        fetch-depth: 1
+        fetch-depth: 0
         fetch-tags: true
 
     - name: Download generated artifacts

From 11f9e7ac51d888e7a0da8a9f4255941ad0493c37 Mon Sep 17 00:00:00 2001
From: feederbox826 <me@feederbox.cc>
Date: Sun, 22 Mar 2026 18:07:47 -0400
Subject: [PATCH 380/405] [ci] add macos bundle (#6727)

---
 .github/workflows/build.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 46346136c..c068b46f0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -247,6 +247,14 @@ jobs:
         name: stash-macos
         path: dist/stash-macos
 
+    - name: Upload macOS bundle
+      # only upload binaries for pull requests
+      if: ${{ github.event_name == 'pull_request' && github.base_ref != 'refs/heads/develop' && github.base_ref != 'refs/heads/master'}}
+      uses: actions/upload-artifact@v7
+      with:
+        name: Stash.app.zip
+        path: dist/Stash.app.zip
+
     - name: Upload Linux binary
       # only upload binaries for pull requests
       if: ${{ github.event_name == 'pull_request' && github.base_ref != 'refs/heads/develop' && github.base_ref != 'refs/heads/master'}}

From feb4346e13b8f19af79a20e3582ddd6d02074184 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Mon, 23 Mar 2026 12:31:48 +1100
Subject: [PATCH 381/405] Maintain sub-folders selection when reselecting
 folder in filter

---
 ui/v2.5/src/components/List/Filters/FolderFilter.tsx | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/ui/v2.5/src/components/List/Filters/FolderFilter.tsx b/ui/v2.5/src/components/List/Filters/FolderFilter.tsx
index 38e9d21ec..bf09af9cb 100644
--- a/ui/v2.5/src/components/List/Filters/FolderFilter.tsx
+++ b/ui/v2.5/src/components/List/Filters/FolderFilter.tsx
@@ -487,16 +487,21 @@ export const SidebarFolderFilter: React.FC<
     return newCriterion;
   }, [option.type, filter]);
 
+  const subDirsSelected = criterion.value?.depth === -1;
+
   // if there are multiple values or excluded values, then we show none of the
   // current values
   const multipleSelected =
     criterion.value.items.length > 1 || criterion.value.excluded.length > 0;
 
   function onSelect(folder: IFolder) {
+    // maintain sub-folder select if present
+    const depth = subDirsSelected ? -1 : 0;
+
     const c = criterion.clone() as FolderCriterion;
     c.value = {
       items: [{ id: folder.id, label: folder.path }],
-      depth: 0,
+      depth,
       excluded: [],
     };
 
@@ -550,8 +555,6 @@ export const SidebarFolderFilter: React.FC<
     }
   }
 
-  const subDirsSelected = criterion.value?.depth === -1;
-
   const selectedList = useMemo(() => {
     if (multipleSelected) {
       return null;

From 2bb1df84437d09775cf859644826aacafc9de99e Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Mon, 23 Mar 2026 13:45:31 +1100
Subject: [PATCH 382/405] Fix incorrect where clause for gallery parent folder
 filter (#6737)

---
 pkg/sqlite/gallery_filter.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkg/sqlite/gallery_filter.go b/pkg/sqlite/gallery_filter.go
index 28f3b8fac..0435f3f57 100644
--- a/pkg/sqlite/gallery_filter.go
+++ b/pkg/sqlite/gallery_filter.go
@@ -285,7 +285,7 @@ func (qb *galleryFilterHandler) parentFolderCriterionHandler(folder *models.Hier
 			return
 		}
 
-		galleryRepository.addFoldersTable(f)
+		galleryRepository.addFilesTable(f)
 		f.addLeftJoin(folderTable, "gallery_folder", "galleries.folder_id = gallery_folder.id")
 
 		criterion := *folder
@@ -320,7 +320,7 @@ func (qb *galleryFilterHandler) parentFolderCriterionHandler(folder *models.Hier
 			}
 
 			// combine clauses with OR to handle zip file or folder
-			c1 := makeClause(fmt.Sprintf("folders.parent_folder_id IN (SELECT column2 FROM (%s))", valuesClause))
+			c1 := makeClause(fmt.Sprintf("files.parent_folder_id IN (SELECT column2 FROM (%s))", valuesClause))
 			c2 := makeClause(fmt.Sprintf("gallery_folder.parent_folder_id IN (SELECT column2 FROM (%s))", valuesClause))
 			f.whereClauses = append(f.whereClauses, orClauses(c1, c2))
 		}
@@ -332,7 +332,7 @@ func (qb *galleryFilterHandler) parentFolderCriterionHandler(folder *models.Hier
 				return
 			}
 
-			f.addWhere(fmt.Sprintf("folders.parent_folder_id NOT IN (SELECT column2 FROM (%s)) OR folders.parent_folder_id IS NULL", valuesClause))
+			f.addWhere(fmt.Sprintf("files.parent_folder_id NOT IN (SELECT column2 FROM (%s)) OR folders.parent_folder_id IS NULL", valuesClause))
 			f.addWhere(fmt.Sprintf("gallery_folder.parent_folder_id NOT IN (SELECT column2 FROM (%s)) OR gallery_folder.parent_folder_id IS NULL", valuesClause))
 		}
 	}

From 3dbb0fcfc9bcad4b0ef2d8b898425b151ad474d8 Mon Sep 17 00:00:00 2001
From: feederbox826 <me@feederbox.cc>
Date: Mon, 23 Mar 2026 01:10:22 -0400
Subject: [PATCH 383/405] [hwaccel] add envvar for /dev/dri device (#6728)

---
 pkg/ffmpeg/codec_hardware.go                | 8 +++++++-
 ui/v2.5/src/docs/en/Manual/Configuration.md | 2 ++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkg/ffmpeg/codec_hardware.go b/pkg/ffmpeg/codec_hardware.go
index aa8c75dcc..66480c5bb 100644
--- a/pkg/ffmpeg/codec_hardware.go
+++ b/pkg/ffmpeg/codec_hardware.go
@@ -185,6 +185,12 @@ func (f *FFMpeg) hwCanFullHWTranscode(ctx context.Context, codec VideoCodec, vf
 
 // Prepend input for hardware encoding only
 func (f *FFMpeg) hwDeviceInit(args Args, toCodec VideoCodec, fullhw bool) Args {
+	// check for custom /dev/dri device #6435
+	driDevice := os.Getenv("STASH_HW_DRI_DEVICE")
+	if driDevice == "" {
+		driDevice = "/dev/dri/renderD128"
+	}
+
 	switch toCodec {
 	case VideoCodecN264,
 		VideoCodecN264H:
@@ -201,7 +207,7 @@ func (f *FFMpeg) hwDeviceInit(args Args, toCodec VideoCodec, fullhw bool) Args {
 	case VideoCodecV264,
 		VideoCodecVVP9:
 		args = append(args, "-vaapi_device")
-		args = append(args, "/dev/dri/renderD128")
+		args = append(args, driDevice)
 		if fullhw {
 			args = append(args, "-hwaccel")
 			args = append(args, "vaapi")
diff --git a/ui/v2.5/src/docs/en/Manual/Configuration.md b/ui/v2.5/src/docs/en/Manual/Configuration.md
index 2d08f9750..3a856b2d4 100644
--- a/ui/v2.5/src/docs/en/Manual/Configuration.md
+++ b/ui/v2.5/src/docs/en/Manual/Configuration.md
@@ -194,6 +194,8 @@ The following environment variables are also supported:
 | Environment variable | Remarks |
 |----------------------|---------|
 | `STASH_SQLITE_CACHE_SIZE` | Sets the SQLite cache size. See https://www.sqlite.org/pragma.html#pragma_cache_size. Default is `-2000` which is 2MB. |
+| `STASH_HW_TEST_TIMEOUT` | Sets the Hardware Acceleration test timeout in seconds. Default is 10 seconds
+| `STASH_HW_DRI_DEVICE` | Overrides the default `/dev/dri` device used for VAAPI hardware acceleration. Default is `/dev/dri/renderD128`
 
 ### Custom favicon
 

From c9d0afee56d4bff5d1049b8e81ef6a200dc411d7 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Mon, 23 Mar 2026 16:14:25 +1100
Subject: [PATCH 384/405] Fix tagger modal issues (#6736)

* Make modal field/value styling consistent

Fixes URL list in studio list styling

* Add stash id pill to studio and tag modals

* Fix create parent check box

* Allow excluding parent studio

Disabled the create checkbox if parent studio is not excluded and does not exist.

* Don't render modal on every studio

* Show dialog when refreshing tags
---
 .../src/components/Tagger/PerformerModal.tsx  |  10 +-
 .../components/Tagger/scenes/StudioModal.tsx  |  69 ++++----
 .../Tagger/studios/StudioTagger.tsx           |  30 ++--
 ui/v2.5/src/components/Tagger/styles.scss     |  57 +++---
 .../src/components/Tagger/tags/TagModal.tsx   |  59 ++++---
 .../src/components/Tagger/tags/TagTagger.tsx  | 165 ++++++++++++------
 6 files changed, 232 insertions(+), 158 deletions(-)

diff --git a/ui/v2.5/src/components/Tagger/PerformerModal.tsx b/ui/v2.5/src/components/Tagger/PerformerModal.tsx
index 9b2434165..b872bcd31 100755
--- a/ui/v2.5/src/components/Tagger/PerformerModal.tsx
+++ b/ui/v2.5/src/components/Tagger/PerformerModal.tsx
@@ -92,7 +92,7 @@ const PerformerModal: React.FC<IPerformerModalProps> = ({
 
     return (
       <div className="row no-gutters">
-        <div className="col-5 performer-create-modal-field" key={name}>
+        <div className="col-5 create-modal-field" key={name}>
           {!create && (
             <Button
               onClick={() => toggleField(name)}
@@ -107,11 +107,11 @@ const PerformerModal: React.FC<IPerformerModalProps> = ({
           </strong>
         </div>
         {truncate ? (
-          <div className="col-7 performer-create-modal-value">
+          <div className="col-7 create-modal-value">
             <TruncatedText text={text} />
           </div>
         ) : (
-          <span className="col-7 performer-create-modal-value">{text}</span>
+          <span className="col-7 create-modal-value">{text}</span>
         )}
       </div>
     );
@@ -126,7 +126,7 @@ const PerformerModal: React.FC<IPerformerModalProps> = ({
 
     return (
       <div className="row no-gutters">
-        <div className="col-5 performer-create-modal-field" key={name}>
+        <div className="col-5 create-modal-field" key={name}>
           {!create && (
             <Button
               onClick={() => toggleField(name)}
@@ -140,7 +140,7 @@ const PerformerModal: React.FC<IPerformerModalProps> = ({
             <FormattedMessage id={name} />:
           </strong>
         </div>
-        <div className="col-7 performer-create-modal-value">
+        <div className="col-7 create-modal-value">
           <ul>
             {text.map((t, i) => (
               <li key={i}>
diff --git a/ui/v2.5/src/components/Tagger/scenes/StudioModal.tsx b/ui/v2.5/src/components/Tagger/scenes/StudioModal.tsx
index a77025d57..1d5149b79 100644
--- a/ui/v2.5/src/components/Tagger/scenes/StudioModal.tsx
+++ b/ui/v2.5/src/components/Tagger/scenes/StudioModal.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from "react";
+import React, { useEffect, useState } from "react";
 import { FormattedMessage, useIntl } from "react-intl";
 import cx from "classnames";
 import { IconDefinition } from "@fortawesome/fontawesome-svg-core";
@@ -7,19 +7,16 @@ import * as GQL from "src/core/generated-graphql";
 import { useFindStudio } from "src/core/StashService";
 import { Icon } from "src/components/Shared/Icon";
 import { ModalComponent } from "src/components/Shared/Modal";
-import {
-  faCheck,
-  faExternalLinkAlt,
-  faTimes,
-} from "@fortawesome/free-solid-svg-icons";
+import { faCheck, faTimes } from "@fortawesome/free-solid-svg-icons";
 import { Button, Form } from "react-bootstrap";
 import { TruncatedText } from "src/components/Shared/TruncatedText";
 import { excludeFields } from "src/utils/data";
 import { ExternalLink } from "src/components/Shared/ExternalLink";
+import { StashIDPill } from "src/components/Shared/StashID";
 
 interface IStudioDetailsProps {
   studio: GQL.ScrapedSceneStudioDataFragment;
-  link?: string;
+  endpoint?: string;
   excluded: Record<string, boolean>;
   toggleField: (field: string) => void;
   isNew?: boolean;
@@ -27,7 +24,7 @@ interface IStudioDetailsProps {
 
 const StudioDetails: React.FC<IStudioDetailsProps> = ({
   studio,
-  link,
+  endpoint,
   excluded,
   toggleField,
   isNew = false,
@@ -59,13 +56,15 @@ const StudioDetails: React.FC<IStudioDetailsProps> = ({
   function maybeRenderField(
     id: string,
     text: string | null | undefined,
-    isSelectable: boolean = true
+    isSelectable: boolean = true,
+    messageId?: string
   ) {
     if (!text) return;
+    if (!messageId) messageId = id;
 
     return (
       <div className="row no-gutters">
-        <div className="col-5 studio-create-modal-field" key={id}>
+        <div className="col-5 create-modal-field" key={id}>
           {isSelectable && (
             <Button
               onClick={() => toggleField(id)}
@@ -76,7 +75,7 @@ const StudioDetails: React.FC<IStudioDetailsProps> = ({
             </Button>
           )}
           <strong>
-            <FormattedMessage id={id} />:
+            <FormattedMessage id={messageId} />:
           </strong>
         </div>
         <TruncatedText className="col-7" text={text} />
@@ -93,7 +92,7 @@ const StudioDetails: React.FC<IStudioDetailsProps> = ({
 
     return (
       <div className="row no-gutters">
-        <div className="col-5 studio-create-modal-field" key={name}>
+        <div className="col-5 create-modal-field" key={name}>
           {!isNew && (
             <Button
               onClick={() => toggleField(name)}
@@ -107,7 +106,7 @@ const StudioDetails: React.FC<IStudioDetailsProps> = ({
             <FormattedMessage id={name} />:
           </strong>
         </div>
-        <div className="col-7 studio-create-modal-value">
+        <div className="col-7 create-modal-value">
           <ul>
             {text.map((t, i) => (
               <li key={i}>
@@ -123,15 +122,14 @@ const StudioDetails: React.FC<IStudioDetailsProps> = ({
   }
 
   function maybeRenderStashBoxLink() {
-    if (!link) return;
+    const base = endpoint?.match(/https?:\/\/.*?\//)?.[0];
+    if (!base || !studio.remote_site_id) return;
 
     return (
-      <h6 className="mt-2">
-        <ExternalLink href={link}>
-          <FormattedMessage id="stashbox.source" />
-          <Icon icon={faExternalLinkAlt} className="ml-2" />
-        </ExternalLink>
-      </h6>
+      <StashIDPill
+        linkType="studios"
+        stashID={{ endpoint: endpoint, stash_id: studio.remote_site_id }}
+      />
     );
   }
 
@@ -145,7 +143,12 @@ const StudioDetails: React.FC<IStudioDetailsProps> = ({
           {maybeRenderField("details", studio.details)}
           {maybeRenderField("aliases", studio.aliases)}
           {maybeRenderField("tags", studio.tags?.map((t) => t.name).join(", "))}
-          {maybeRenderField("parent_studio", studio.parent?.name, false)}
+          {maybeRenderField(
+            "parent_id",
+            studio.parent?.name,
+            true,
+            "parent_studio"
+          )}
           {maybeRenderStashBoxLink()}
         </div>
       </div>
@@ -207,6 +210,10 @@ const StudioModal: React.FC<IStudioModalProps> = ({
     !!studio.parent
   );
 
+  useEffect(() => {
+    setCreateParentStudio(!excluded.parent_id && !!studio.parent);
+  }, [excluded.parent_id, studio.parent]);
+
   let sendParentStudio = true;
   // The parent studio exists, need to check if it has a Stash ID.
   const queryResult = useFindStudio(studio.parent?.stored_id ?? "");
@@ -303,30 +310,28 @@ const StudioModal: React.FC<IStudioModalProps> = ({
     handleStudioCreate(studioData, parentData);
   }
 
-  const base = endpoint?.match(/https?:\/\/.*?\//)?.[0];
-  const link = base ? `${base}studios/${studio.remote_site_id}` : undefined;
-  const parentLink = base
-    ? `${base}studios/${studio.parent?.remote_site_id}`
-    : undefined;
-
   function maybeRenderParentStudio() {
     // There is no parent studio or it already has a Stash ID
-    if (!studio.parent || !sendParentStudio) {
+    if (!studio.parent || !sendParentStudio || excluded.parent_id) {
       return;
     }
 
+    // force create if there is no current parent studio and parent studio is not excluded
+    const mustCreateParent = !studio.parent.stored_id;
+
     return (
       <div>
-        <div className="mb-4 mt-4">
+        <Form.Group className="mb-4 mt-4">
           <Form.Check
             id="create-parent"
             checked={createParentStudio}
             label={intl.formatMessage({
               id: parentStudioCreateText(),
             })}
+            disabled={mustCreateParent}
             onChange={() => setCreateParentStudio(!createParentStudio)}
           />
-        </div>
+        </Form.Group>
         {maybeRenderParentStudioDetails()}
       </div>
     );
@@ -342,7 +347,7 @@ const StudioModal: React.FC<IStudioModalProps> = ({
         studio={studio.parent}
         excluded={parentExcluded}
         toggleField={(field) => toggleParentField(field)}
-        link={parentLink}
+        endpoint={endpoint}
         isNew
       />
     );
@@ -365,7 +370,7 @@ const StudioModal: React.FC<IStudioModalProps> = ({
         studio={studio}
         excluded={excluded}
         toggleField={(field) => toggleField(field)}
-        link={link}
+        endpoint={endpoint}
       />
 
       {maybeRenderParentStudio()}
diff --git a/ui/v2.5/src/components/Tagger/studios/StudioTagger.tsx b/ui/v2.5/src/components/Tagger/studios/StudioTagger.tsx
index 645fb19c2..b7b717f7b 100644
--- a/ui/v2.5/src/components/Tagger/studios/StudioTagger.tsx
+++ b/ui/v2.5/src/components/Tagger/studios/StudioTagger.tsx
@@ -385,20 +385,6 @@ const StudioTaggerList: React.FC<IStudioTaggerListProps> = ({
 
       return (
         <div key={studio.id} className={`${CLASSNAME}-studio`}>
-          {modalStudio && (
-            <StudioModal
-              closeModal={() => setModalStudio(undefined)}
-              modalVisible={modalStudio.stored_id === studio.id}
-              studio={modalStudio}
-              handleStudioCreate={handleStudioUpdate}
-              excludedStudioFields={config.excludedStudioFields}
-              icon={faTags}
-              header={intl.formatMessage({
-                id: "studio_tagger.update_studio",
-              })}
-              endpoint={selectedEndpoint.endpoint}
-            />
-          )}
           <div className={`${CLASSNAME}-details`}>
             <div></div>
             <div>
@@ -452,6 +438,20 @@ const StudioTaggerList: React.FC<IStudioTaggerListProps> = ({
           entityName="studio"
         />
       )}
+      {modalStudio && (
+        <StudioModal
+          closeModal={() => setModalStudio(undefined)}
+          modalVisible={!!modalStudio.stored_id}
+          studio={modalStudio}
+          handleStudioCreate={handleStudioUpdate}
+          excludedStudioFields={config.excludedStudioFields}
+          icon={faTags}
+          header={intl.formatMessage({
+            id: "studio_tagger.update_studio",
+          })}
+          endpoint={selectedEndpoint.endpoint}
+        />
+      )}
       <div className="ml-auto mb-3">
         <Button onClick={() => setShowBatchAdd(true)}>
           <FormattedMessage id="studio_tagger.batch_add_studios" />
@@ -658,7 +658,7 @@ export const StudioTagger: React.FC<ITaggerProps> = ({ studios }) => {
             entityName="studios"
             extraConfig={
               <Form.Group
-                controlId="create-parent"
+                controlId="config-create-parent"
                 className="align-items-center"
               >
                 <Form.Check
diff --git a/ui/v2.5/src/components/Tagger/styles.scss b/ui/v2.5/src/components/Tagger/styles.scss
index 1c05e574f..628889ab9 100644
--- a/ui/v2.5/src/components/Tagger/styles.scss
+++ b/ui/v2.5/src/components/Tagger/styles.scss
@@ -131,6 +131,24 @@
   font-weight: 500;
 }
 
+.create-modal-field {
+  margin-bottom: 5px;
+
+  .btn {
+    margin-right: 5px;
+  }
+
+  .fa-icon {
+    width: 12px;
+  }
+}
+
+.create-modal-value ul {
+  font-size: 0.8em;
+  list-style-type: none;
+  padding-inline-start: 0;
+}
+
 .performer-create-modal {
   font-size: 1.2rem;
   max-width: 800px;
@@ -159,24 +177,6 @@
   .LoadingIndicator {
     height: 100%;
   }
-
-  &-field {
-    margin-bottom: 5px;
-
-    .btn {
-      margin-right: 5px;
-    }
-
-    .fa-icon {
-      width: 12px;
-    }
-  }
-
-  &-value ul {
-    font-size: 0.8em;
-    list-style-type: none;
-    padding-inline-start: 0;
-  }
 }
 
 .PerformerTagger {
@@ -246,7 +246,8 @@
   }
 }
 
-.studio-create-modal {
+.studio-create-modal,
+.tag-create-modal {
   font-size: 1.2rem;
   max-width: 800px;
 
@@ -274,16 +275,8 @@
     height: 100%;
   }
 
-  &-field {
-    margin-bottom: 5px;
-
-    .btn {
-      margin-right: 5px;
-    }
-
-    .fa-icon {
-      width: 12px;
-    }
+  .form-check {
+    font-size: 1rem;
   }
 }
 
@@ -302,7 +295,8 @@
     }
   }
 
-  &-studio {
+  &-studio,
+  &-tag {
     background-color: #495b68;
     border-radius: 3px;
     display: flex;
@@ -310,7 +304,8 @@
     max-width: 100%;
     padding: 1rem;
 
-    .studio-card {
+    .studio-card,
+    .tag-card {
       box-shadow: none;
       flex-shrink: 0;
       margin: 0;
diff --git a/ui/v2.5/src/components/Tagger/tags/TagModal.tsx b/ui/v2.5/src/components/Tagger/tags/TagModal.tsx
index 804e5b55c..ed174e907 100644
--- a/ui/v2.5/src/components/Tagger/tags/TagModal.tsx
+++ b/ui/v2.5/src/components/Tagger/tags/TagModal.tsx
@@ -1,19 +1,15 @@
-import React, { useState } from "react";
+import React, { useEffect, useState } from "react";
 import { FormattedMessage, useIntl } from "react-intl";
 import { IconDefinition } from "@fortawesome/fontawesome-svg-core";
 
 import * as GQL from "src/core/generated-graphql";
 import { Icon } from "src/components/Shared/Icon";
 import { ModalComponent } from "src/components/Shared/Modal";
-import {
-  faCheck,
-  faExternalLinkAlt,
-  faTimes,
-} from "@fortawesome/free-solid-svg-icons";
+import { faCheck, faTimes } from "@fortawesome/free-solid-svg-icons";
 import { Button, Form } from "react-bootstrap";
 import { TruncatedText } from "src/components/Shared/TruncatedText";
 import { excludeFields } from "src/utils/data";
-import { ExternalLink } from "src/components/Shared/ExternalLink";
+import { StashIDPill } from "src/components/Shared/StashID";
 
 interface ITagModalProps {
   tag: GQL.ScrapedSceneTagDataFragment;
@@ -51,6 +47,10 @@ const TagModal: React.FC<ITagModalProps> = ({
     !!tag.parent && !tag.parent.stored_id
   );
 
+  useEffect(() => {
+    setCreateParentTag(!excluded.parent_ids && !!tag.parent);
+  }, [excluded.parent_ids, tag.parent]);
+
   // Check if a tag with the parent name already exists locally.
   // Categories don't have stash IDs, so stored_id may be null even when the
   // parent tag has already been created (e.g. by tagging a sibling tag first).
@@ -74,6 +74,7 @@ const TagModal: React.FC<ITagModalProps> = ({
   const [parentExcluded, setParentExcluded] = useState<Record<string, boolean>>(
     excludedTagFields.reduce((dict, field) => ({ ...dict, [field]: true }), {})
   );
+
   const toggleParentField = (name: string) =>
     setParentExcluded({
       ...parentExcluded,
@@ -83,13 +84,15 @@ const TagModal: React.FC<ITagModalProps> = ({
   function maybeRenderField(
     id: string,
     text: string | null | undefined,
-    isSelectable: boolean = true
+    isSelectable: boolean = true,
+    messageId?: string
   ) {
     if (!text) return;
+    if (!messageId) messageId = id;
 
     return (
       <div className="row no-gutters">
-        <div className="col-5 studio-create-modal-field" key={id}>
+        <div className="col-5 create-modal-field" key={id}>
           {isSelectable && (
             <Button
               onClick={() => toggleField(id)}
@@ -100,7 +103,7 @@ const TagModal: React.FC<ITagModalProps> = ({
             </Button>
           )}
           <strong>
-            <FormattedMessage id={id} />:
+            <FormattedMessage id={messageId} />:
           </strong>
         </div>
         <TruncatedText className="col-7" text={text} lineCount={3} />
@@ -110,17 +113,13 @@ const TagModal: React.FC<ITagModalProps> = ({
 
   function maybeRenderStashBoxLink() {
     const base = endpoint?.match(/https?:\/\/.*?\//)?.[0];
-    const link = base ? `${base}tags/${tag.remote_site_id}` : undefined;
-
-    if (!link) return;
+    if (!base || !tag.remote_site_id) return;
 
     return (
-      <h6 className="mt-2">
-        <ExternalLink href={link}>
-          <FormattedMessage id="stashbox.source" />
-          <Icon icon={faExternalLinkAlt} className="ml-2" />
-        </ExternalLink>
-      </h6>
+      <StashIDPill
+        linkType="tags"
+        stashID={{ endpoint: endpoint, stash_id: tag.remote_site_id }}
+      />
     );
   }
 
@@ -133,7 +132,7 @@ const TagModal: React.FC<ITagModalProps> = ({
 
     return (
       <div className="row no-gutters">
-        <div className="col-5 studio-create-modal-field" key={id}>
+        <div className="col-5 create-modal-field" key={id}>
           {isSelectable && (
             <Button
               onClick={() => toggleParentField(id)}
@@ -167,10 +166,18 @@ const TagModal: React.FC<ITagModalProps> = ({
 
   function maybeRenderParentTag() {
     // No parent tag, or parent already exists locally
-    if (!tag.parent || tag.parent.stored_id || !sendParentTag) {
+    if (
+      !tag.parent ||
+      tag.parent.stored_id ||
+      !sendParentTag ||
+      excluded.parent_ids
+    ) {
       return;
     }
 
+    // force create if there is no current parent tag and parent tag is not excluded
+    const mustCreateParent = true;
+
     return (
       <div>
         <div className="mb-4 mt-4">
@@ -180,6 +187,7 @@ const TagModal: React.FC<ITagModalProps> = ({
             label={intl.formatMessage({
               id: "actions.create_parent_tag",
             })}
+            disabled={mustCreateParent}
             onChange={() => setCreateParentTag(!createParentTag)}
           />
         </div>
@@ -249,7 +257,7 @@ const TagModal: React.FC<ITagModalProps> = ({
       }}
       cancel={{ onClick: () => closeModal(), variant: "secondary" }}
       onHide={() => closeModal()}
-      dialogClassName="studio-create-modal"
+      dialogClassName="tag-create-modal"
       icon={icon}
       header={header}
     >
@@ -259,7 +267,12 @@ const TagModal: React.FC<ITagModalProps> = ({
             {maybeRenderField("name", tag.name)}
             {maybeRenderField("description", tag.description)}
             {maybeRenderField("aliases", tag.alias_list?.join(", "))}
-            {maybeRenderField("parent_tags", tag.parent?.name, false)}
+            {maybeRenderField(
+              "parent_ids",
+              tag.parent?.name,
+              true,
+              "parent_tags"
+            )}
             {maybeRenderStashBoxLink()}
           </div>
         </div>
diff --git a/ui/v2.5/src/components/Tagger/tags/TagTagger.tsx b/ui/v2.5/src/components/Tagger/tags/TagTagger.tsx
index 8b22a5920..e3674635d 100644
--- a/ui/v2.5/src/components/Tagger/tags/TagTagger.tsx
+++ b/ui/v2.5/src/components/Tagger/tags/TagTagger.tsx
@@ -11,6 +11,7 @@ import {
   useJobsSubscribe,
   mutateStashBoxBatchTagTag,
   getClient,
+  useTagCreate,
 } from "src/core/StashService";
 import { useConfigurationContext } from "src/hooks/Config";
 
@@ -27,6 +28,10 @@ import {
   BatchAddModal,
 } from "src/components/Shared/BatchModals";
 import { StashBoxSelectorField } from "../StashBoxSelector";
+import { apolloError } from "src/utils";
+import TagModal from "./TagModal";
+import { faTags } from "@fortawesome/free-solid-svg-icons";
+import { uniq } from "lodash-es";
 
 type JobFragment = Pick<
   GQL.Job,
@@ -59,6 +64,7 @@ const TagTaggerList: React.FC<ITagTaggerListProps> = ({
   const intl = useIntl();
 
   const [loading, setLoading] = useState(false);
+
   const [searchResults, setSearchResults] = useState<
     Record<string, GQL.ScrapedSceneTagDataFragment[]>
   >({});
@@ -94,6 +100,13 @@ const TagTaggerList: React.FC<ITagTaggerListProps> = ({
     },
   });
 
+  const [modalTag, setModalTag] = useState<
+    | {
+        existingTag: GQL.TagListDataFragment;
+        scrapedTag: GQL.ScrapedSceneTagDataFragment;
+      }
+    | undefined
+  >();
   const [error, setError] = useState<
     Record<string, { message?: string; details?: string } | undefined>
   >({});
@@ -128,64 +141,30 @@ const TagTaggerList: React.FC<ITagTaggerListProps> = ({
     setLoading(true);
   };
 
+  const [createTag] = useTagCreate();
   const updateTag = useUpdateTag();
 
-  const doBoxUpdate = (tagID: string, stashID: string, endpoint: string) => {
+  const doBoxUpdate = (
+    tag: GQL.TagListDataFragment,
+    stashID: string,
+    endpoint: string
+  ) => {
     setLoadingUpdate(stashID);
     setError({
       ...error,
-      [tagID]: undefined,
+      [tag.id]: undefined,
     });
     stashBoxTagQuery(stashID, endpoint)
       .then(async (queryData) => {
         const data = queryData.data?.scrapeSingleTag ?? [];
         if (data.length > 0) {
-          const stashboxTag = data[0];
-          const updateData: GQL.TagUpdateInput = {
-            id: tagID,
-          };
-
-          if (
-            !(config.excludedTagFields ?? []).includes("name") &&
-            stashboxTag.name
-          ) {
-            updateData.name = stashboxTag.name;
-          }
-
-          if (
-            stashboxTag.description &&
-            !(config.excludedTagFields ?? []).includes("description")
-          ) {
-            updateData.description = stashboxTag.description;
-          }
-
-          if (
-            stashboxTag.alias_list &&
-            stashboxTag.alias_list.length > 0 &&
-            !(config.excludedTagFields ?? []).includes("aliases")
-          ) {
-            updateData.aliases = stashboxTag.alias_list;
-          }
-
-          if (stashboxTag.remote_site_id) {
-            updateData.stash_ids = await mergeTagStashIDs(tagID, [
-              {
-                endpoint,
-                stash_id: stashboxTag.remote_site_id,
-              },
-            ]);
-          }
-
-          const res = await updateTag(updateData);
-          if (!res?.data?.tagUpdate) {
-            setError({
-              ...error,
-              [tagID]: {
-                message: `Failed to update tag`,
-                details: res?.errors?.[0]?.message ?? "",
-              },
-            });
-          }
+          setModalTag({
+            scrapedTag: {
+              ...data[0],
+              stored_id: tag.id,
+            },
+            existingTag: tag,
+          });
         }
       })
       .finally(() => setLoadingUpdate(undefined));
@@ -205,6 +184,75 @@ const TagTaggerList: React.FC<ITagTaggerListProps> = ({
     setShowBatchUpdate(false);
   };
 
+  function handleSaveError(tagID: string, name: string, message: string) {
+    setError({
+      ...error,
+      [tagID]: {
+        message: intl.formatMessage(
+          { id: "tag_tagger.failed_to_save_tag" },
+          { tag: name }
+        ),
+        details:
+          message === "UNIQUE constraint failed: tags.name"
+            ? intl.formatMessage({
+                id: "tag_tagger.name_already_exists",
+              })
+            : message,
+      },
+    });
+  }
+
+  const handleTagUpdate = async (
+    input: GQL.TagCreateInput,
+    parentInput?: GQL.TagCreateInput
+  ) => {
+    const { existingTag, scrapedTag: tag } = modalTag!;
+    const tagID = existingTag.id;
+    setModalTag(undefined);
+
+    if (tagID) {
+      if (parentInput) {
+        try {
+          // cannot update parent tags, since there may be many
+          if (!!input.parent_ids?.length) {
+            // ignore
+          } else {
+            const parentRes = await createTag({
+              variables: { input: parentInput },
+            });
+            const parentID = parentRes.data?.tagCreate?.id;
+            if (parentID) {
+              // merge parent ids below
+              input.parent_ids = [parentID];
+            }
+          }
+        } catch (e) {
+          handleSaveError(tagID, parentInput.name, apolloError(e));
+        }
+      }
+
+      // always merge parent ids if included
+      if (input.parent_ids) {
+        input.parent_ids = uniq(
+          existingTag.parents.map((p) => p.id).concat(input.parent_ids)
+        );
+      }
+
+      const updateData: GQL.TagUpdateInput = {
+        ...input,
+        id: tagID,
+      };
+      updateData.stash_ids = await mergeTagStashIDs(
+        tagID,
+        input.stash_ids ?? []
+      );
+
+      const res = await updateTag(updateData);
+      if (!res?.data?.tagUpdate)
+        handleSaveError(tagID, tag.name ?? "", res?.errors?.[0]?.message ?? "");
+    }
+  };
+
   const handleTaggedTag = (
     tag: Pick<GQL.TagListDataFragment, "id"> &
       Partial<Omit<GQL.TagListDataFragment, "id">>
@@ -292,7 +340,7 @@ const TagTaggerList: React.FC<ITagTaggerListProps> = ({
               <InputGroup.Append>
                 <Button
                   onClick={() =>
-                    doBoxUpdate(tag.id, stashID.stash_id, stashID.endpoint)
+                    doBoxUpdate(tag, stashID.stash_id, stashID.endpoint)
                   }
                   disabled={!!loadingUpdate}
                 >
@@ -344,11 +392,11 @@ const TagTaggerList: React.FC<ITagTaggerListProps> = ({
       }
 
       return (
-        <div key={tag.id} className={`${CLASSNAME}-studio`}>
+        <div key={tag.id} className={`${CLASSNAME}-tag`}>
           <div className={`${CLASSNAME}-details`}>
             <div></div>
             <div>
-              <Card className="studio-card">
+              <Card className="tag-card">
                 <img loading="lazy" src={tag.image_path ?? ""} alt="" />
               </Card>
             </div>
@@ -395,6 +443,19 @@ const TagTaggerList: React.FC<ITagTaggerListProps> = ({
           entityName="tag"
         />
       )}
+
+      {modalTag && (
+        <TagModal
+          closeModal={() => setModalTag(undefined)}
+          modalVisible={modalTag !== undefined}
+          tag={modalTag.scrapedTag}
+          onSave={handleTagUpdate}
+          icon={faTags}
+          header="Update Tag"
+          excludedTagFields={config.excludedTagFields}
+          endpoint={selectedEndpoint.endpoint}
+        />
+      )}
       <div className="ml-auto mb-3">
         <Button onClick={() => setShowBatchAdd(true)}>
           <FormattedMessage id="tag_tagger.batch_add_tags" />
@@ -593,7 +654,7 @@ export const TagTagger: React.FC<ITaggerProps> = ({ tags }) => {
             entityName="tags"
             extraConfig={
               <Form.Group
-                controlId="create-parent"
+                controlId="config-create-parent"
                 className="align-items-center"
               >
                 <Form.Check

From c5034422cb6c431b383782df15dfbbd4e8bd6110 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Mon, 23 Mar 2026 16:15:23 +1100
Subject: [PATCH 385/405] Expand folder select hierarchy based on initial
 selected folder (#6738)

* Add sub_folders field to Folder type
* Expand folder select for the initial value
---
 graphql/schema/types/file.graphql             |   3 +
 internal/api/loaders/dataloaders.go           |  23 +++-
 ...go => folderrelatedfolderidsloader_gen.go} |  28 ++--
 internal/api/resolver_model_folder.go         |  11 ++
 pkg/models/mocks/FolderReaderWriter.go        |  23 ++++
 pkg/models/repository_folder.go               |   1 +
 pkg/sqlite/folder.go                          |  36 ++++++
 pkg/sqlite/table.go                           |   8 ++
 ui/v2.5/graphql/queries/folder.graphql        |  17 +++
 .../components/List/Filters/FolderFilter.tsx  | 121 +++++++++++++++++-
 10 files changed, 249 insertions(+), 22 deletions(-)
 rename internal/api/loaders/{folderparentfolderidsloader_gen.go => folderrelatedfolderidsloader_gen.go} (81%)

diff --git a/graphql/schema/types/file.graphql b/graphql/schema/types/file.graphql
index 07fa473bc..fcc2a58c8 100644
--- a/graphql/schema/types/file.graphql
+++ b/graphql/schema/types/file.graphql
@@ -16,6 +16,9 @@ type Folder {
   parent_folders: [Folder!]!
   zip_file: BasicFile
 
+  "Returns direct sub-folders"
+  sub_folders: [Folder!]!
+
   mod_time: Time!
 
   created_at: Time!
diff --git a/internal/api/loaders/dataloaders.go b/internal/api/loaders/dataloaders.go
index 2ba650962..c1faf61ed 100644
--- a/internal/api/loaders/dataloaders.go
+++ b/internal/api/loaders/dataloaders.go
@@ -11,7 +11,7 @@
 //go:generate go run github.com/vektah/dataloaden GroupLoader int *github.com/stashapp/stash/pkg/models.Group
 //go:generate go run github.com/vektah/dataloaden FileLoader github.com/stashapp/stash/pkg/models.FileID github.com/stashapp/stash/pkg/models.File
 //go:generate go run github.com/vektah/dataloaden FolderLoader github.com/stashapp/stash/pkg/models.FolderID *github.com/stashapp/stash/pkg/models.Folder
-//go:generate go run github.com/vektah/dataloaden FolderParentFolderIDsLoader github.com/stashapp/stash/pkg/models.FolderID []github.com/stashapp/stash/pkg/models.FolderID
+//go:generate go run github.com/vektah/dataloaden FolderRelatedFolderIDsLoader github.com/stashapp/stash/pkg/models.FolderID []github.com/stashapp/stash/pkg/models.FolderID
 //go:generate go run github.com/vektah/dataloaden SceneFileIDsLoader int []github.com/stashapp/stash/pkg/models.FileID
 //go:generate go run github.com/vektah/dataloaden ImageFileIDsLoader int []github.com/stashapp/stash/pkg/models.FileID
 //go:generate go run github.com/vektah/dataloaden GalleryFileIDsLoader int []github.com/stashapp/stash/pkg/models.FileID
@@ -75,7 +75,8 @@ type Loaders struct {
 	FileByID *FileLoader
 
 	FolderByID            *FolderLoader
-	FolderParentFolderIDs *FolderParentFolderIDsLoader
+	FolderParentFolderIDs *FolderRelatedFolderIDsLoader
+	FolderSubFolderIDs    *FolderRelatedFolderIDsLoader
 }
 
 type Middleware struct {
@@ -166,11 +167,16 @@ func (m Middleware) Middleware(next http.Handler) http.Handler {
 				maxBatch: maxBatch,
 				fetch:    m.fetchFolders(ctx),
 			},
-			FolderParentFolderIDs: &FolderParentFolderIDsLoader{
+			FolderParentFolderIDs: &FolderRelatedFolderIDsLoader{
 				wait:     wait,
 				maxBatch: maxBatch,
 				fetch:    m.fetchFoldersParentFolderIDs(ctx),
 			},
+			FolderSubFolderIDs: &FolderRelatedFolderIDsLoader{
+				wait:     wait,
+				maxBatch: maxBatch,
+				fetch:    m.fetchFoldersSubFolderIDs(ctx),
+			},
 			SceneFiles: &SceneFileIDsLoader{
 				wait:     wait,
 				maxBatch: maxBatch,
@@ -427,6 +433,17 @@ func (m Middleware) fetchFoldersParentFolderIDs(ctx context.Context) func(keys [
 	}
 }
 
+func (m Middleware) fetchFoldersSubFolderIDs(ctx context.Context) func(keys []models.FolderID) ([][]models.FolderID, []error) {
+	return func(keys []models.FolderID) (ret [][]models.FolderID, errs []error) {
+		err := m.Repository.WithDB(ctx, func(ctx context.Context) error {
+			var err error
+			ret, err = m.Repository.Folder.GetManySubFolderIDs(ctx, keys)
+			return err
+		})
+		return ret, toErrorSlice(err)
+	}
+}
+
 func (m Middleware) fetchScenesFileIDs(ctx context.Context) func(keys []int) ([][]models.FileID, []error) {
 	return func(keys []int) (ret [][]models.FileID, errs []error) {
 		err := m.Repository.WithDB(ctx, func(ctx context.Context) error {
diff --git a/internal/api/loaders/folderparentfolderidsloader_gen.go b/internal/api/loaders/folderrelatedfolderidsloader_gen.go
similarity index 81%
rename from internal/api/loaders/folderparentfolderidsloader_gen.go
rename to internal/api/loaders/folderrelatedfolderidsloader_gen.go
index c9eca3a3d..d0edb92f4 100644
--- a/internal/api/loaders/folderparentfolderidsloader_gen.go
+++ b/internal/api/loaders/folderrelatedfolderidsloader_gen.go
@@ -22,16 +22,16 @@ type FolderParentFolderIDsLoaderConfig struct {
 }
 
 // NewFolderParentFolderIDsLoader creates a new FolderParentFolderIDsLoader given a fetch, wait, and maxBatch
-func NewFolderParentFolderIDsLoader(config FolderParentFolderIDsLoaderConfig) *FolderParentFolderIDsLoader {
-	return &FolderParentFolderIDsLoader{
+func NewFolderParentFolderIDsLoader(config FolderParentFolderIDsLoaderConfig) *FolderRelatedFolderIDsLoader {
+	return &FolderRelatedFolderIDsLoader{
 		fetch:    config.Fetch,
 		wait:     config.Wait,
 		maxBatch: config.MaxBatch,
 	}
 }
 
-// FolderParentFolderIDsLoader batches and caches requests
-type FolderParentFolderIDsLoader struct {
+// FolderRelatedFolderIDsLoader batches and caches requests
+type FolderRelatedFolderIDsLoader struct {
 	// this method provides the data for the loader
 	fetch func(keys []models.FolderID) ([][]models.FolderID, []error)
 
@@ -63,14 +63,14 @@ type folderParentFolderIDsLoaderBatch struct {
 }
 
 // Load a FolderID by key, batching and caching will be applied automatically
-func (l *FolderParentFolderIDsLoader) Load(key models.FolderID) ([]models.FolderID, error) {
+func (l *FolderRelatedFolderIDsLoader) Load(key models.FolderID) ([]models.FolderID, error) {
 	return l.LoadThunk(key)()
 }
 
 // LoadThunk returns a function that when called will block waiting for a FolderID.
 // This method should be used if you want one goroutine to make requests to many
 // different data loaders without blocking until the thunk is called.
-func (l *FolderParentFolderIDsLoader) LoadThunk(key models.FolderID) func() ([]models.FolderID, error) {
+func (l *FolderRelatedFolderIDsLoader) LoadThunk(key models.FolderID) func() ([]models.FolderID, error) {
 	l.mu.Lock()
 	if it, ok := l.cache[key]; ok {
 		l.mu.Unlock()
@@ -113,7 +113,7 @@ func (l *FolderParentFolderIDsLoader) LoadThunk(key models.FolderID) func() ([]m
 
 // LoadAll fetches many keys at once. It will be broken into appropriate sized
 // sub batches depending on how the loader is configured
-func (l *FolderParentFolderIDsLoader) LoadAll(keys []models.FolderID) ([][]models.FolderID, []error) {
+func (l *FolderRelatedFolderIDsLoader) LoadAll(keys []models.FolderID) ([][]models.FolderID, []error) {
 	results := make([]func() ([]models.FolderID, error), len(keys))
 
 	for i, key := range keys {
@@ -131,7 +131,7 @@ func (l *FolderParentFolderIDsLoader) LoadAll(keys []models.FolderID) ([][]model
 // LoadAllThunk returns a function that when called will block waiting for a FolderIDs.
 // This method should be used if you want one goroutine to make requests to many
 // different data loaders without blocking until the thunk is called.
-func (l *FolderParentFolderIDsLoader) LoadAllThunk(keys []models.FolderID) func() ([][]models.FolderID, []error) {
+func (l *FolderRelatedFolderIDsLoader) LoadAllThunk(keys []models.FolderID) func() ([][]models.FolderID, []error) {
 	results := make([]func() ([]models.FolderID, error), len(keys))
 	for i, key := range keys {
 		results[i] = l.LoadThunk(key)
@@ -149,7 +149,7 @@ func (l *FolderParentFolderIDsLoader) LoadAllThunk(keys []models.FolderID) func(
 // Prime the cache with the provided key and value. If the key already exists, no change is made
 // and false is returned.
 // (To forcefully prime the cache, clear the key first with loader.clear(key).prime(key, value).)
-func (l *FolderParentFolderIDsLoader) Prime(key models.FolderID, value []models.FolderID) bool {
+func (l *FolderRelatedFolderIDsLoader) Prime(key models.FolderID, value []models.FolderID) bool {
 	l.mu.Lock()
 	var found bool
 	if _, found = l.cache[key]; !found {
@@ -164,13 +164,13 @@ func (l *FolderParentFolderIDsLoader) Prime(key models.FolderID, value []models.
 }
 
 // Clear the value at key from the cache, if it exists
-func (l *FolderParentFolderIDsLoader) Clear(key models.FolderID) {
+func (l *FolderRelatedFolderIDsLoader) Clear(key models.FolderID) {
 	l.mu.Lock()
 	delete(l.cache, key)
 	l.mu.Unlock()
 }
 
-func (l *FolderParentFolderIDsLoader) unsafeSet(key models.FolderID, value []models.FolderID) {
+func (l *FolderRelatedFolderIDsLoader) unsafeSet(key models.FolderID, value []models.FolderID) {
 	if l.cache == nil {
 		l.cache = map[models.FolderID][]models.FolderID{}
 	}
@@ -179,7 +179,7 @@ func (l *FolderParentFolderIDsLoader) unsafeSet(key models.FolderID, value []mod
 
 // keyIndex will return the location of the key in the batch, if its not found
 // it will add the key to the batch
-func (b *folderParentFolderIDsLoaderBatch) keyIndex(l *FolderParentFolderIDsLoader, key models.FolderID) int {
+func (b *folderParentFolderIDsLoaderBatch) keyIndex(l *FolderRelatedFolderIDsLoader, key models.FolderID) int {
 	for i, existingKey := range b.keys {
 		if key == existingKey {
 			return i
@@ -203,7 +203,7 @@ func (b *folderParentFolderIDsLoaderBatch) keyIndex(l *FolderParentFolderIDsLoad
 	return pos
 }
 
-func (b *folderParentFolderIDsLoaderBatch) startTimer(l *FolderParentFolderIDsLoader) {
+func (b *folderParentFolderIDsLoaderBatch) startTimer(l *FolderRelatedFolderIDsLoader) {
 	time.Sleep(l.wait)
 	l.mu.Lock()
 
@@ -219,7 +219,7 @@ func (b *folderParentFolderIDsLoaderBatch) startTimer(l *FolderParentFolderIDsLo
 	b.end(l)
 }
 
-func (b *folderParentFolderIDsLoaderBatch) end(l *FolderParentFolderIDsLoader) {
+func (b *folderParentFolderIDsLoaderBatch) end(l *FolderRelatedFolderIDsLoader) {
 	b.data, b.error = l.fetch(b.keys)
 	close(b.done)
 }
diff --git a/internal/api/resolver_model_folder.go b/internal/api/resolver_model_folder.go
index c203a3f82..1fcc144f3 100644
--- a/internal/api/resolver_model_folder.go
+++ b/internal/api/resolver_model_folder.go
@@ -31,6 +31,17 @@ func (r *folderResolver) ParentFolders(ctx context.Context, obj *models.Folder)
 	return ret, firstError(errs)
 }
 
+func (r *folderResolver) SubFolders(ctx context.Context, obj *models.Folder) ([]*models.Folder, error) {
+	ids, err := loaders.From(ctx).FolderSubFolderIDs.Load(obj.ID)
+	if err != nil {
+		return nil, err
+	}
+
+	var errs []error
+	ret, errs := loaders.From(ctx).FolderByID.LoadAll(ids)
+	return ret, firstError(errs)
+}
+
 func (r *folderResolver) ZipFile(ctx context.Context, obj *models.Folder) (*BasicFile, error) {
 	return zipFileResolver(ctx, obj.ZipFileID)
 }
diff --git a/pkg/models/mocks/FolderReaderWriter.go b/pkg/models/mocks/FolderReaderWriter.go
index bcca0acd1..d2230c645 100644
--- a/pkg/models/mocks/FolderReaderWriter.go
+++ b/pkg/models/mocks/FolderReaderWriter.go
@@ -224,6 +224,29 @@ func (_m *FolderReaderWriter) GetManyParentFolderIDs(ctx context.Context, folder
 	return r0, r1
 }
 
+// GetManySubFolderIDs provides a mock function with given fields: ctx, folderIDs
+func (_m *FolderReaderWriter) GetManySubFolderIDs(ctx context.Context, folderIDs []models.FolderID) ([][]models.FolderID, error) {
+	ret := _m.Called(ctx, folderIDs)
+
+	var r0 [][]models.FolderID
+	if rf, ok := ret.Get(0).(func(context.Context, []models.FolderID) [][]models.FolderID); ok {
+		r0 = rf(ctx, folderIDs)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).([][]models.FolderID)
+		}
+	}
+
+	var r1 error
+	if rf, ok := ret.Get(1).(func(context.Context, []models.FolderID) error); ok {
+		r1 = rf(ctx, folderIDs)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
 // Query provides a mock function with given fields: ctx, options
 func (_m *FolderReaderWriter) Query(ctx context.Context, options models.FolderQueryOptions) (*models.FolderQueryResult, error) {
 	ret := _m.Called(ctx, options)
diff --git a/pkg/models/repository_folder.go b/pkg/models/repository_folder.go
index 67e3b141e..1169e53ac 100644
--- a/pkg/models/repository_folder.go
+++ b/pkg/models/repository_folder.go
@@ -16,6 +16,7 @@ type FolderFinder interface {
 	FindByZipFileID(ctx context.Context, zipFileID FileID) ([]*Folder, error)
 	FindByParentFolderID(ctx context.Context, parentFolderID FolderID) ([]*Folder, error)
 	GetManyParentFolderIDs(ctx context.Context, folderIDs []FolderID) ([][]FolderID, error)
+	GetManySubFolderIDs(ctx context.Context, folderIDs []FolderID) ([][]FolderID, error)
 }
 
 type FolderQueryer interface {
diff --git a/pkg/sqlite/folder.go b/pkg/sqlite/folder.go
index 83308d39a..6cd1e0ade 100644
--- a/pkg/sqlite/folder.go
+++ b/pkg/sqlite/folder.go
@@ -409,6 +409,42 @@ func (qb *FolderStore) GetManyParentFolderIDs(ctx context.Context, folderIDs []m
 	return ret, nil
 }
 
+func (qb *FolderStore) GetManySubFolderIDs(ctx context.Context, parentFolderIDs []models.FolderID) ([][]models.FolderID, error) {
+	table := qb.table()
+	q := dialect.From(table).Select(
+		table.Col(idColumn),
+		table.Col("parent_folder_id"),
+	).Where(qb.table().Col("parent_folder_id").In(parentFolderIDs))
+
+	sql, args, err := q.ToSQL()
+	if err != nil {
+		return nil, fmt.Errorf("building query: %w", err)
+	}
+
+	var results []struct {
+		FolderID       int             `db:"id"`
+		ParentFolderID models.FolderID `db:"parent_folder_id"`
+	}
+
+	if err := querySelect(ctx, sql, args, &results); err != nil {
+		return nil, fmt.Errorf("getting folders by parent folder ids %v: %w", parentFolderIDs, err)
+	}
+
+	retMap := make(map[models.FolderID][]models.FolderID)
+
+	for _, v := range results {
+		retMap[v.ParentFolderID] = append(retMap[v.ParentFolderID], models.FolderID(v.FolderID))
+	}
+
+	ret := make([][]models.FolderID, len(parentFolderIDs))
+
+	for i, parentID := range parentFolderIDs {
+		ret[i] = retMap[parentID]
+	}
+
+	return ret, nil
+}
+
 func (qb *FolderStore) allInPaths(q *goqu.SelectDataset, p []string) *goqu.SelectDataset {
 	table := qb.table()
 
diff --git a/pkg/sqlite/table.go b/pkg/sqlite/table.go
index 790e84e94..3f8dfb70f 100644
--- a/pkg/sqlite/table.go
+++ b/pkg/sqlite/table.go
@@ -1209,6 +1209,14 @@ func querySimple(ctx context.Context, query *goqu.SelectDataset, out interface{}
 	return nil
 }
 
+func querySelect(ctx context.Context, query string, args []interface{}, dest interface{}) error {
+	if err := dbWrapper.Select(ctx, dest, query, args...); err != nil && !errors.Is(err, sql.ErrNoRows) {
+		return fmt.Errorf("running query: %s [%v]: %w", query, args, err)
+	}
+
+	return nil
+}
+
 // func cols(table exp.IdentifierExpression, cols []string) []interface{} {
 // 	var ret []interface{}
 // 	for _, c := range cols {
diff --git a/ui/v2.5/graphql/queries/folder.graphql b/ui/v2.5/graphql/queries/folder.graphql
index a42f5eb84..81f431786 100644
--- a/ui/v2.5/graphql/queries/folder.graphql
+++ b/ui/v2.5/graphql/queries/folder.graphql
@@ -22,3 +22,20 @@ query FindFoldersForQuery(
     }
   }
 }
+
+query FindFolderHierarchyForIDs($ids: [ID!]!) {
+  findFolders(ids: $ids) {
+    count
+    folders {
+      ...SelectFolderData
+
+      parent_folders {
+        ...SelectFolderData
+        # the parent folders will be expanded, so we need the child folders
+        sub_folders {
+          ...SelectFolderData
+        }
+      }
+    }
+  }
+}
diff --git a/ui/v2.5/src/components/List/Filters/FolderFilter.tsx b/ui/v2.5/src/components/List/Filters/FolderFilter.tsx
index bf09af9cb..95b5121f9 100644
--- a/ui/v2.5/src/components/List/Filters/FolderFilter.tsx
+++ b/ui/v2.5/src/components/List/Filters/FolderFilter.tsx
@@ -1,6 +1,7 @@
 import React, { useCallback, useEffect, useMemo, useState } from "react";
 import {
   FolderDataFragment,
+  useFindFolderHierarchyForIDsQuery,
   useFindFoldersForQueryQuery,
   useFindRootFoldersForSelectQuery,
 } from "src/core/generated-graphql";
@@ -141,7 +142,30 @@ function replaceFolder(folder: IFolder): (f: IFolder) => IFolder {
   };
 }
 
-function useFolderMap(query: string, skip?: boolean) {
+function mergeFolderMaps(base: IFolder[], update: IFolder[]): IFolder[] {
+  const ret = [...base];
+
+  update.forEach((updateFolder) => {
+    const existingIndex = ret.findIndex((f) => f.id === updateFolder.id);
+    if (existingIndex === -1) {
+      // not found, add to the end
+      ret.push(updateFolder);
+    } else {
+      // found, replace
+      ret[existingIndex] = updateFolder;
+    }
+  });
+
+  return ret;
+}
+
+function useFolderMap(
+  query: string,
+  skip?: boolean,
+  initialSelected?: string[]
+) {
+  const [cachedInitialSelected] = useState<string[]>(initialSelected ?? []);
+
   const { data: rootFoldersResult } = useFindRootFoldersForSelectQuery({
     skip,
   });
@@ -153,11 +177,94 @@ function useFolderMap(query: string, skip?: boolean) {
     },
   });
 
+  const { data: initialSelectedResult } = useFindFolderHierarchyForIDsQuery({
+    skip: !initialSelected || cachedInitialSelected.length === 0,
+    variables: {
+      ids: cachedInitialSelected ?? [],
+    },
+  });
+
   const rootFolders: IFolder[] = useMemo(() => {
     const ret = rootFoldersResult?.findFolders.folders ?? [];
     return ret.map((f) => ({ ...f, expanded: false, children: undefined }));
   }, [rootFoldersResult]);
 
+  const initialSelectedFolders: IFolder[] = useMemo(() => {
+    const ret: IFolder[] = [];
+    (initialSelectedResult?.findFolders.folders ?? []).forEach((folder) => {
+      if (!folder.parent_folders.length) {
+        // add root folder if not present
+        if (!ret.find((f) => f.id === folder.id)) {
+          ret.push({ ...folder, expanded: true, children: [] });
+        }
+        return;
+      }
+
+      let currentParent: IFolder | undefined;
+
+      for (let i = folder.parent_folders.length - 1; i >= 0; i--) {
+        const thisFolder = folder.parent_folders[i];
+        let existing: IFolder | undefined;
+
+        if (i === folder.parent_folders.length - 1) {
+          // last parent, add the folder as root if not present
+          existing = ret.find((f) => f.id === thisFolder.id);
+          if (!existing) {
+            existing = {
+              ...folder.parent_folders[i],
+              expanded: true,
+              children: folder.parent_folders[i].sub_folders.map((f) => ({
+                ...f,
+                expanded: false,
+                children: undefined,
+              })),
+            };
+            ret.push(existing);
+          }
+          currentParent = existing;
+          continue;
+        }
+
+        const existingIndex =
+          currentParent!.children?.findIndex((f) => f.id === thisFolder.id) ??
+          -1;
+        if (existingIndex === -1) {
+          // should be guaranteed
+          throw new Error(
+            `Parent folder ${thisFolder.id} not found in children of ${
+              currentParent!.id
+            }`
+          );
+        }
+
+        existing = currentParent!.children![existingIndex];
+
+        // replace children
+        existing = {
+          ...existing,
+          expanded: true,
+          children: thisFolder.sub_folders.map((f) => ({
+            ...f,
+            expanded: false,
+            children: undefined,
+          })),
+        };
+
+        currentParent!.children![existingIndex] = existing;
+        currentParent = existing;
+      }
+    });
+    return ret;
+  }, [initialSelectedResult]);
+
+  const mergedRootFolders = useMemo(() => {
+    if (query) {
+      return rootFolders;
+    }
+
+    return mergeFolderMaps(rootFolders, initialSelectedFolders);
+  }, [rootFolders, initialSelectedFolders, query]);
+
   const queryFolders: IFolder[] = useMemo(() => {
     // construct the folder list from the query result
     const ret: IFolder[] = [];
@@ -229,11 +336,11 @@ function useFolderMap(query: string, skip?: boolean) {
 
   useEffect(() => {
     if (!query) {
-      setFolderMap(rootFolders);
+      setFolderMap(mergedRootFolders);
     } else {
       setFolderMap(queryFolders);
     }
-  }, [query, rootFolders, queryFolders]);
+  }, [query, mergedRootFolders, queryFolders]);
 
   async function onToggleExpanded(folder: IFolder) {
     setFolderMap(folderMap.map(toggleExpandedFn(folder)));
@@ -472,8 +579,6 @@ export const SidebarFolderFilter: React.FC<
     props.onOpen?.();
   }
 
-  const { folderMap, onToggleExpanded } = useFolderMap(query, skip);
-
   const option = props.criterionOption ?? FolderCriterionOption;
   const { filter, setFilter } = props;
 
@@ -494,6 +599,12 @@ export const SidebarFolderFilter: React.FC<
   const multipleSelected =
     criterion.value.items.length > 1 || criterion.value.excluded.length > 0;
 
+  const { folderMap, onToggleExpanded } = useFolderMap(
+    query,
+    skip,
+    criterion.value.items.map((i) => i.id)
+  );
+
   function onSelect(folder: IFolder) {
     // maintain sub-folder select if present
     const depth = subDirsSelected ? -1 : 0;

From e0f2c8e96d000d5cc091a2575401e680b5771987 Mon Sep 17 00:00:00 2001
From: Gykes <24581046+Gykes@users.noreply.github.com>
Date: Sun, 22 Mar 2026 22:16:59 -0700
Subject: [PATCH 386/405] FR: Auto Tag Confirmation Modal (#6735)

* Improve folder list styling
---------
Co-authored-by: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
---
 .../Tasks/DirectorySelectionDialog.tsx        | 10 +++-
 .../Settings/Tasks/LibraryTasks.tsx           | 29 +++++++++--
 .../Shared/AutoTagConfirmDialog.tsx           | 52 +++++++++++++++++++
 .../components/Shared/DetailsEditNavbar.tsx   | 16 ++++--
 ui/v2.5/src/components/Shared/styles.scss     |  6 ++-
 ui/v2.5/src/locales/en-GB.json                |  2 +
 6 files changed, 106 insertions(+), 9 deletions(-)
 create mode 100644 ui/v2.5/src/components/Shared/AutoTagConfirmDialog.tsx

diff --git a/ui/v2.5/src/components/Settings/Tasks/DirectorySelectionDialog.tsx b/ui/v2.5/src/components/Settings/Tasks/DirectorySelectionDialog.tsx
index 87a58f292..2310ab3fc 100644
--- a/ui/v2.5/src/components/Settings/Tasks/DirectorySelectionDialog.tsx
+++ b/ui/v2.5/src/components/Settings/Tasks/DirectorySelectionDialog.tsx
@@ -20,7 +20,13 @@ interface IDirectorySelectionDialogProps {
 
 export const DirectorySelectionDialog: React.FC<
   IDirectorySelectionDialogProps
-> = ({ animation, allowEmpty = false, initialPaths = [], onClose }) => {
+> = ({
+  animation,
+  allowEmpty = false,
+  initialPaths = [],
+  onClose,
+  children,
+}) => {
   const intl = useIntl();
   const { configuration } = useConfigurationContext();
 
@@ -91,6 +97,8 @@ export const DirectorySelectionDialog: React.FC<
             </Button>
           }
         />
+
+        {children}
       </div>
     </ModalComponent>
   );
diff --git a/ui/v2.5/src/components/Settings/Tasks/LibraryTasks.tsx b/ui/v2.5/src/components/Settings/Tasks/LibraryTasks.tsx
index 6e9c13ea4..eace4b7dc 100644
--- a/ui/v2.5/src/components/Settings/Tasks/LibraryTasks.tsx
+++ b/ui/v2.5/src/components/Settings/Tasks/LibraryTasks.tsx
@@ -19,6 +19,10 @@ import { BooleanSetting, Setting, SettingGroup } from "../Inputs";
 import { ManualLink } from "src/components/Help/context";
 import { Icon } from "src/components/Shared/Icon";
 import { faQuestionCircle } from "@fortawesome/free-solid-svg-icons";
+import {
+  AutoTagConfirmDialog,
+  AutoTagWarning,
+} from "src/components/Shared/AutoTagConfirmDialog";
 import { useSettings } from "../context";
 
 interface IAutoTagOptions {
@@ -78,6 +82,7 @@ export const LibraryTasks: React.FC = () => {
   const [dialogOpen, setDialogOpenState] = useState({
     scan: false,
     autoTag: false,
+    autoTagAlert: false,
     identify: false,
     generate: false,
   });
@@ -224,12 +229,29 @@ export const LibraryTasks: React.FC = () => {
     }
   }
 
+  function renderAutoTagAlert() {
+    return (
+      <AutoTagConfirmDialog
+        show={dialogOpen.autoTagAlert}
+        onConfirm={() => {
+          setDialogOpen({ autoTagAlert: false });
+          runAutoTag();
+        }}
+        onCancel={() => setDialogOpen({ autoTagAlert: false })}
+      />
+    );
+  }
+
   function renderAutoTagDialog() {
     if (!dialogOpen.autoTag) {
       return;
     }
 
-    return <DirectorySelectionDialog onClose={onAutoTagDialogClosed} />;
+    return (
+      <DirectorySelectionDialog onClose={onAutoTagDialogClosed}>
+        <AutoTagWarning />
+      </DirectorySelectionDialog>
+    );
   }
 
   function onAutoTagDialogClosed(paths?: string[]) {
@@ -341,6 +363,7 @@ export const LibraryTasks: React.FC = () => {
   return (
     <Form.Group>
       {renderScanDialog()}
+      {renderAutoTagAlert()}
       {renderAutoTagDialog()}
       {maybeRenderIdentifyDialog()}
       {renderGenerateDialog()}
@@ -426,9 +449,9 @@ export const LibraryTasks: React.FC = () => {
                 variant="secondary"
                 type="submit"
                 className="mr-2"
-                onClick={() => runAutoTag()}
+                onClick={() => setDialogOpen({ autoTagAlert: true })}
               >
-                <FormattedMessage id="actions.auto_tag" />
+                <FormattedMessage id="actions.auto_tag" />…
               </Button>
               <Button
                 variant="secondary"
diff --git a/ui/v2.5/src/components/Shared/AutoTagConfirmDialog.tsx b/ui/v2.5/src/components/Shared/AutoTagConfirmDialog.tsx
new file mode 100644
index 000000000..0290c7e07
--- /dev/null
+++ b/ui/v2.5/src/components/Shared/AutoTagConfirmDialog.tsx
@@ -0,0 +1,52 @@
+import React from "react";
+import { FormattedMessage, useIntl } from "react-intl";
+import { faExclamationTriangle } from "@fortawesome/free-solid-svg-icons";
+import { ModalComponent } from "./Modal";
+import { Icon } from "./Icon";
+
+interface IAutoTagConfirmDialog {
+  show: boolean;
+  onConfirm: () => void;
+  onCancel: () => void;
+}
+
+export const AutoTagWarning = () => (
+  <>
+    <p>
+      <FormattedMessage id="config.tasks.auto_tag_based_on_filenames" />
+    </p>
+    <p>
+      <FormattedMessage id="config.tasks.auto_tag_confirm" />
+    </p>
+    <p className="lead">
+      <Icon icon={faExclamationTriangle} className="text-warning" />
+      <FormattedMessage id="config.tasks.auto_tag_warning" />
+    </p>
+  </>
+);
+
+export const AutoTagConfirmDialog: React.FC<IAutoTagConfirmDialog> = ({
+  show,
+  onConfirm,
+  onCancel,
+}) => {
+  const intl = useIntl();
+
+  return (
+    <ModalComponent
+      show={show}
+      icon={faExclamationTriangle}
+      header={intl.formatMessage({ id: "actions.auto_tag" })}
+      accept={{
+        text: intl.formatMessage({ id: "actions.confirm" }),
+        variant: "danger",
+        onClick: onConfirm,
+      }}
+      cancel={{
+        onClick: onCancel,
+      }}
+    >
+      <AutoTagWarning />
+    </ModalComponent>
+  );
+};
diff --git a/ui/v2.5/src/components/Shared/DetailsEditNavbar.tsx b/ui/v2.5/src/components/Shared/DetailsEditNavbar.tsx
index cea415db7..159bb9f09 100644
--- a/ui/v2.5/src/components/Shared/DetailsEditNavbar.tsx
+++ b/ui/v2.5/src/components/Shared/DetailsEditNavbar.tsx
@@ -2,6 +2,7 @@ import { Button, Dropdown, Modal, SplitButton } from "react-bootstrap";
 import React, { useState } from "react";
 import { FormattedMessage, useIntl } from "react-intl";
 import { ImageInput } from "./ImageInput";
+import { AutoTagConfirmDialog } from "./AutoTagConfirmDialog";
 import cx from "classnames";
 
 interface IProps {
@@ -30,6 +31,7 @@ interface IProps {
 export const DetailsEditNavbar: React.FC<IProps> = (props: IProps) => {
   const intl = useIntl();
   const [isDeleteAlertOpen, setIsDeleteAlertOpen] = useState<boolean>(false);
+  const [isAutoTagAlertOpen, setIsAutoTagAlertOpen] = useState<boolean>(false);
 
   function renderEditButton() {
     if (props.isNew) return;
@@ -114,14 +116,20 @@ export const DetailsEditNavbar: React.FC<IProps> = (props: IProps) => {
           <Button
             variant="secondary"
             disabled={props.autoTagDisabled}
-            onClick={() => {
+            onClick={() => setIsAutoTagAlertOpen(true)}
+          >
+            <FormattedMessage id="actions.auto_tag" />…
+          </Button>
+          <AutoTagConfirmDialog
+            show={isAutoTagAlertOpen}
+            onConfirm={() => {
+              setIsAutoTagAlertOpen(false);
               if (props.onAutoTag) {
                 props.onAutoTag();
               }
             }}
-          >
-            <FormattedMessage id="actions.auto_tag" />
-          </Button>
+            onCancel={() => setIsAutoTagAlertOpen(false)}
+          />
         </div>
       );
     }
diff --git a/ui/v2.5/src/components/Shared/styles.scss b/ui/v2.5/src/components/Shared/styles.scss
index 21e6eb696..024cf1ff5 100644
--- a/ui/v2.5/src/components/Shared/styles.scss
+++ b/ui/v2.5/src/components/Shared/styles.scss
@@ -127,11 +127,15 @@
 .folder-list {
   list-style-type: none;
   margin: 0;
-  max-height: 30vw;
+  max-height: 300px;
   overflow-x: auto;
   padding-bottom: 0.5rem;
   padding-top: 1rem;
 
+  &:not(:last-child) {
+    margin-bottom: 1rem;
+  }
+
   &-item {
     white-space: nowrap;
 
diff --git a/ui/v2.5/src/locales/en-GB.json b/ui/v2.5/src/locales/en-GB.json
index e27d51310..cafbb87dc 100644
--- a/ui/v2.5/src/locales/en-GB.json
+++ b/ui/v2.5/src/locales/en-GB.json
@@ -512,6 +512,8 @@
         "auto_tagging_paths": "Auto tagging the following paths"
       },
       "auto_tag_based_on_filenames": "Auto tag content based on file paths.",
+      "auto_tag_confirm": "This will attempt to match your content against existing metadata.",
+      "auto_tag_warning": "This process cannot be undone and may produce incorrect matches.",
       "auto_tagging": "Auto tagging",
       "backing_up_database": "Backing up database",
       "backup_and_download": "Performs a backup of the database and downloads the resulting file.",

From b4c7ad4b8120f28364ae9d7d6a5858cf5994d8f0 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Mon, 23 Mar 2026 16:29:49 +1100
Subject: [PATCH 387/405] Match exact tag names for batch tagger and show exact
 matches first for query (#6739)

* Enforce exact name matching for tag batch tagger
* Sort exact matches first for tag stashbox query
---
 internal/api/resolver_query_scraper.go | 20 +++++++++++++++++++-
 internal/manager/task_stash_box_tag.go | 23 ++++++++++++++++++++++-
 2 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/internal/api/resolver_query_scraper.go b/internal/api/resolver_query_scraper.go
index 86d449921..353bb1a32 100644
--- a/internal/api/resolver_query_scraper.go
+++ b/internal/api/resolver_query_scraper.go
@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"slices"
 	"strconv"
+	"strings"
 
 	"github.com/stashapp/stash/pkg/match"
 	"github.com/stashapp/stash/pkg/models"
@@ -363,7 +364,8 @@ func (r *queryResolver) ScrapeSingleTag(ctx context.Context, source scraper.Sour
 		client := r.newStashBoxClient(*b)
 
 		var ret []*models.ScrapedTag
-		out, err := client.QueryTag(ctx, *input.Query)
+		query := *input.Query
+		out, err := client.QueryTag(ctx, query)
 
 		if err != nil {
 			return nil, err
@@ -383,6 +385,22 @@ func (r *queryResolver) ScrapeSingleTag(ctx context.Context, source scraper.Sour
 			}); err != nil {
 				return nil, err
 			}
+
+			// tag name query returns results that may not match the query exactly.
+			// if there is an exact match, it should be first
+			if query != "" {
+				for i, result := range ret {
+					if strings.EqualFold(result.Name, query) {
+						// prepend exact match to the front of the slice
+						if i != 0 {
+							ret = append([]*models.ScrapedTag{result}, append(ret[:i], ret[i+1:]...)...)
+						}
+
+						break
+					}
+				}
+			}
+
 			return ret, nil
 		}
 
diff --git a/internal/manager/task_stash_box_tag.go b/internal/manager/task_stash_box_tag.go
index ec17fac06..264e7e96c 100644
--- a/internal/manager/task_stash_box_tag.go
+++ b/internal/manager/task_stash_box_tag.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"strconv"
+	"strings"
 
 	"github.com/stashapp/stash/pkg/logger"
 	"github.com/stashapp/stash/pkg/match"
@@ -589,8 +590,11 @@ func (t *stashBoxBatchTagTagTask) findStashBoxTag(ctx context.Context) (*models.
 
 	client := stashbox.NewClient(*t.box, stashbox.ExcludeTagPatterns(instance.Config.GetScraperExcludeTagPatterns()))
 
+	nameQuery := ""
+
 	switch {
 	case t.name != nil:
+		nameQuery = *t.name
 		results, err = client.QueryTag(ctx, *t.name)
 	case t.stashID != nil:
 		results, err = client.QueryTag(ctx, *t.stashID)
@@ -616,6 +620,7 @@ func (t *stashBoxBatchTagTagTask) findStashBoxTag(ctx context.Context) (*models.
 		if remoteID != "" {
 			results, err = client.QueryTag(ctx, remoteID)
 		} else {
+			nameQuery = t.tag.Name
 			results, err = client.QueryTag(ctx, t.tag.Name)
 		}
 	}
@@ -628,7 +633,23 @@ func (t *stashBoxBatchTagTagTask) findStashBoxTag(ctx context.Context) (*models.
 		return nil, nil
 	}
 
-	result := results[0]
+	var result *models.ScrapedTag
+
+	// QueryTag returns tags that partially match the name, so find the exact match if searching by name
+	if nameQuery != "" {
+		for _, r := range results {
+			if strings.EqualFold(r.Name, nameQuery) {
+				result = r
+				break
+			}
+		}
+	} else {
+		result = results[0]
+	}
+
+	if result == nil {
+		return nil, nil
+	}
 
 	if err := r.WithReadTxn(ctx, func(ctx context.Context) error {
 		return match.ScrapedTagHierarchy(ctx, r.Tag, result, t.box.Endpoint)

From 87eabf08710b36d8304b5b0ab3183430c256e702 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Mon, 23 Mar 2026 17:13:34 +1100
Subject: [PATCH 388/405] Show studio name if studio image not set on detail
 pages (#6716)

* Add StudioLogo component

If no studio image is set, shows the studio icon with the studio name.

* Add option to always show studio text
* Implement studio as text option
* Add studio logo to image
* Clarify existing show studio as text option
---
 .../Galleries/GalleryDetails/Gallery.tsx      | 21 +++--------
 ui/v2.5/src/components/Galleries/styles.scss  |  2 +-
 .../components/Images/ImageDetails/Image.tsx  | 16 +++------
 ui/v2.5/src/components/Images/styles.scss     |  2 +-
 .../components/Scenes/SceneDetails/Scene.tsx  | 16 +++------
 ui/v2.5/src/components/Scenes/styles.scss     |  2 +-
 .../SettingsInterfacePanel.tsx                |  8 +++++
 ui/v2.5/src/components/Shared/StudioLogo.tsx  | 35 +++++++++++++++++++
 ui/v2.5/src/components/Shared/styles.scss     | 12 +++++++
 ui/v2.5/src/core/config.ts                    |  2 ++
 ui/v2.5/src/docs/en/Manual/Interface.md       |  4 +--
 ui/v2.5/src/locales/en-GB.json                |  7 +++-
 12 files changed, 80 insertions(+), 47 deletions(-)
 create mode 100644 ui/v2.5/src/components/Shared/StudioLogo.tsx

diff --git a/ui/v2.5/src/components/Galleries/GalleryDetails/Gallery.tsx b/ui/v2.5/src/components/Galleries/GalleryDetails/Gallery.tsx
index 18cbeff96..1fce02b32 100644
--- a/ui/v2.5/src/components/Galleries/GalleryDetails/Gallery.tsx
+++ b/ui/v2.5/src/components/Galleries/GalleryDetails/Gallery.tsx
@@ -1,11 +1,6 @@
 import { Button, Tab, Nav, Dropdown } from "react-bootstrap";
 import React, { useEffect, useMemo, useState } from "react";
-import {
-  useHistory,
-  Link,
-  RouteComponentProps,
-  Redirect,
-} from "react-router-dom";
+import { useHistory, RouteComponentProps, Redirect } from "react-router-dom";
 import { FormattedMessage, useIntl } from "react-intl";
 import { Helmet } from "react-helmet";
 import * as GQL from "src/core/generated-graphql";
@@ -50,6 +45,7 @@ import { useConfigurationContext } from "src/hooks/Config";
 import { TruncatedText } from "src/components/Shared/TruncatedText";
 import { goBackOrReplace } from "src/utils/history";
 import { FormattedDate } from "src/components/Shared/Date";
+import { StudioLogo } from "src/components/Shared/StudioLogo";
 
 interface IProps {
   gallery: GQL.GalleryDataFragment;
@@ -66,6 +62,7 @@ export const GalleryPage: React.FC<IProps> = ({ gallery, add }) => {
   const Toast = useToast();
   const intl = useIntl();
   const { configuration } = useConfigurationContext();
+  const { showStudioText } = configuration?.ui ?? {};
   const showLightbox = useGalleryLightbox(gallery.id, gallery.chapters);
 
   const [collapsed, setCollapsed] = useState(false);
@@ -415,17 +412,7 @@ export const GalleryPage: React.FC<IProps> = ({ gallery, add }) => {
       <div className={`gallery-tabs ${collapsed ? "collapsed" : ""}`}>
         <div>
           <div className="gallery-header-container">
-            {gallery.studio && (
-              <h1 className="text-center gallery-studio-image">
-                <Link to={`/studios/${gallery.studio.id}`}>
-                  <img
-                    src={gallery.studio.image_path ?? ""}
-                    alt={`${gallery.studio.name} logo`}
-                    className="studio-logo"
-                  />
-                </Link>
-              </h1>
-            )}
+            <StudioLogo studio={gallery.studio} showText={showStudioText} />
             <h3
               className={cx("gallery-header", { "no-studio": !gallery.studio })}
             >
diff --git a/ui/v2.5/src/components/Galleries/styles.scss b/ui/v2.5/src/components/Galleries/styles.scss
index b59da415e..b05be7856 100644
--- a/ui/v2.5/src/components/Galleries/styles.scss
+++ b/ui/v2.5/src/components/Galleries/styles.scss
@@ -17,7 +17,7 @@
       order: 1;
     }
 
-    .gallery-studio-image {
+    .studio-logo {
       flex: 0 0 25%;
       order: 2;
     }
diff --git a/ui/v2.5/src/components/Images/ImageDetails/Image.tsx b/ui/v2.5/src/components/Images/ImageDetails/Image.tsx
index f79d95fca..f885c21bb 100644
--- a/ui/v2.5/src/components/Images/ImageDetails/Image.tsx
+++ b/ui/v2.5/src/components/Images/ImageDetails/Image.tsx
@@ -1,7 +1,7 @@
 import { Tab, Nav, Dropdown } from "react-bootstrap";
 import React, { useEffect, useMemo, useState } from "react";
 import { FormattedMessage, useIntl } from "react-intl";
-import { useHistory, Link, RouteComponentProps } from "react-router-dom";
+import { useHistory, RouteComponentProps } from "react-router-dom";
 import { Helmet } from "react-helmet";
 import {
   useFindImage,
@@ -37,6 +37,7 @@ import { TruncatedText } from "src/components/Shared/TruncatedText";
 import { goBackOrReplace } from "src/utils/history";
 import { FormattedDate } from "src/components/Shared/Date";
 import { GenerateDialog } from "src/components/Dialogs/GenerateDialog";
+import { StudioLogo } from "src/components/Shared/StudioLogo";
 
 interface IProps {
   image: GQL.ImageDataFragment;
@@ -51,6 +52,7 @@ const ImagePage: React.FC<IProps> = ({ image }) => {
   const Toast = useToast();
   const intl = useIntl();
   const { configuration } = useConfigurationContext();
+  const { showStudioText } = configuration?.ui ?? {};
 
   const [incrementO] = useImageIncrementO(image.id);
   const [decrementO] = useImageDecrementO(image.id);
@@ -326,17 +328,7 @@ const ImagePage: React.FC<IProps> = ({ image }) => {
       <div className="image-tabs order-xl-first order-last">
         <div>
           <div className="image-header-container">
-            {image.studio && (
-              <h1 className="text-center image-studio-image">
-                <Link to={`/studios/${image.studio.id}`}>
-                  <img
-                    src={image.studio.image_path ?? ""}
-                    alt={`${image.studio.name} logo`}
-                    className="studio-logo"
-                  />
-                </Link>
-              </h1>
-            )}
+            <StudioLogo studio={image.studio} showText={showStudioText} />
             <h3 className={cx("image-header", { "no-studio": !image.studio })}>
               <TruncatedText lineCount={2} text={title} />
             </h3>
diff --git a/ui/v2.5/src/components/Images/styles.scss b/ui/v2.5/src/components/Images/styles.scss
index 43ac56590..0a8ca760e 100644
--- a/ui/v2.5/src/components/Images/styles.scss
+++ b/ui/v2.5/src/components/Images/styles.scss
@@ -9,7 +9,7 @@
       order: 1;
     }
 
-    .image-studio-image {
+    .studio-logo {
       flex: 0 0 25%;
       order: 2;
     }
diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx
index 435b9dce2..35bef7efb 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx
@@ -7,7 +7,7 @@ import React, {
   useLayoutEffect,
 } from "react";
 import { FormattedMessage, useIntl } from "react-intl";
-import { useHistory, Link, RouteComponentProps } from "react-router-dom";
+import { useHistory, RouteComponentProps } from "react-router-dom";
 import { Helmet } from "react-helmet";
 import * as GQL from "src/core/generated-graphql";
 import {
@@ -56,6 +56,7 @@ import { PatchComponent, PatchContainerComponent } from "src/patch";
 import { SceneMergeModal } from "../SceneMergeDialog";
 import { goBackOrReplace } from "src/utils/history";
 import { FormattedDate } from "src/components/Shared/Date";
+import { StudioLogo } from "src/components/Shared/StudioLogo";
 
 const SubmitStashBoxDraft = lazyComponent(
   () => import("src/components/Dialogs/SubmitDraft")
@@ -190,6 +191,7 @@ const ScenePage: React.FC<IProps> = PatchComponent("ScenePage", (props) => {
   const [updateScene] = useSceneUpdate();
   const [generateScreenshot] = useSceneGenerateScreenshot();
   const { configuration } = useConfigurationContext();
+  const { showStudioText } = configuration?.ui ?? {};
 
   const [showDraftModal, setShowDraftModal] = useState(false);
   const boxes = configuration?.general?.stashBoxes ?? [];
@@ -674,17 +676,7 @@ const ScenePage: React.FC<IProps> = PatchComponent("ScenePage", (props) => {
       >
         <div>
           <div className="scene-header-container">
-            {scene.studio && (
-              <h1 className="text-center scene-studio-image">
-                <Link to={`/studios/${scene.studio.id}`}>
-                  <img
-                    src={scene.studio.image_path ?? ""}
-                    alt={`${scene.studio.name} logo`}
-                    className="studio-logo"
-                  />
-                </Link>
-              </h1>
-            )}
+            <StudioLogo studio={scene.studio} showText={showStudioText} />
             <h3 className={cx("scene-header", { "no-studio": !scene.studio })}>
               <TruncatedText lineCount={2} text={title} />
             </h3>
diff --git a/ui/v2.5/src/components/Scenes/styles.scss b/ui/v2.5/src/components/Scenes/styles.scss
index 8eb63f378..dda699744 100644
--- a/ui/v2.5/src/components/Scenes/styles.scss
+++ b/ui/v2.5/src/components/Scenes/styles.scss
@@ -74,7 +74,7 @@
       order: 1;
     }
 
-    .scene-studio-image {
+    .studio-logo {
       flex: 0 0 25%;
       order: 2;
     }
diff --git a/ui/v2.5/src/components/Settings/SettingsInterfacePanel/SettingsInterfacePanel.tsx b/ui/v2.5/src/components/Settings/SettingsInterfacePanel/SettingsInterfacePanel.tsx
index 84608107d..5b4e8c5de 100644
--- a/ui/v2.5/src/components/Settings/SettingsInterfacePanel/SettingsInterfacePanel.tsx
+++ b/ui/v2.5/src/components/Settings/SettingsInterfacePanel/SettingsInterfacePanel.tsx
@@ -372,6 +372,7 @@ export const SettingsInterfacePanel: React.FC = PatchComponent(
           <BooleanSetting
             id="show-text-studios"
             headingID="config.ui.scene_list.options.show_studio_as_text"
+            subHeadingID="config.ui.scene_list.options.show_studio_as_text_desc"
             checked={iface.showStudioAsText ?? undefined}
             onChange={(v) => saveInterface({ showStudioAsText: v })}
           />
@@ -692,6 +693,13 @@ export const SettingsInterfacePanel: React.FC = PatchComponent(
             checked={ui.compactExpandedDetails ?? undefined}
             onChange={(v) => saveUI({ compactExpandedDetails: v })}
           />
+          <BooleanSetting
+            id="show_studio_text"
+            headingID="config.ui.detail.show_studio_text.heading"
+            subHeadingID="config.ui.detail.show_studio_text.description"
+            checked={ui.showStudioText ?? false}
+            onChange={(v) => saveUI({ showStudioText: v })}
+          />
         </SettingSection>
 
         <SettingSection headingID="config.ui.editing.heading">
diff --git a/ui/v2.5/src/components/Shared/StudioLogo.tsx b/ui/v2.5/src/components/Shared/StudioLogo.tsx
new file mode 100644
index 000000000..0da9d692a
--- /dev/null
+++ b/ui/v2.5/src/components/Shared/StudioLogo.tsx
@@ -0,0 +1,35 @@
+import { Link } from "react-router-dom";
+import { Studio } from "src/core/generated-graphql";
+import { Icon } from "./Icon";
+import { faVideo } from "@fortawesome/free-solid-svg-icons";
+
+export const StudioLogo: React.FC<{
+  studio: Pick<Studio, "id" | "image_path" | "name"> | undefined | null;
+  showText?: boolean;
+}> = ({ studio, showText = false }) => {
+  if (!studio) return null;
+
+  const hasLogo =
+    !showText &&
+    studio.image_path &&
+    !studio.image_path.endsWith("default=true");
+
+  return (
+    <h1 className="text-center studio-logo">
+      <Link to={`/studios/${studio.id}`}>
+        {hasLogo ? (
+          <img
+            src={studio.image_path ?? ""}
+            alt={`${studio.name} logo`}
+            className="studio-logo"
+          />
+        ) : (
+          <span className="studio-name">
+            <Icon icon={faVideo} />
+            {studio.name}
+          </span>
+        )}
+      </Link>
+    </h1>
+  );
+};
diff --git a/ui/v2.5/src/components/Shared/styles.scss b/ui/v2.5/src/components/Shared/styles.scss
index 024cf1ff5..acc8556eb 100644
--- a/ui/v2.5/src/components/Shared/styles.scss
+++ b/ui/v2.5/src/components/Shared/styles.scss
@@ -1256,3 +1256,15 @@ input[type="range"].double-range-slider-max {
 .text-input + .input-group-append .btn.minimal {
   background-color: $textfield-bg;
 }
+
+.studio-logo a:hover {
+  color: inherit;
+}
+
+.studio-logo .studio-name {
+  color: $text-color;
+  font-size: 1.5rem;
+  font-weight: 500;
+  margin-top: 0.5rem;
+  text-align: center;
+}
diff --git a/ui/v2.5/src/core/config.ts b/ui/v2.5/src/core/config.ts
index a757c7a06..e0cf008b5 100644
--- a/ui/v2.5/src/core/config.ts
+++ b/ui/v2.5/src/core/config.ts
@@ -49,6 +49,8 @@ export interface IUIConfig {
   showLinksOnPerformerCard?: boolean;
   showTagCardOnHover?: boolean;
 
+  showStudioText?: boolean;
+
   previewVolume?: number;
 
   abbreviateCounters?: boolean;
diff --git a/ui/v2.5/src/docs/en/Manual/Interface.md b/ui/v2.5/src/docs/en/Manual/Interface.md
index 951fb3323..a045421a3 100644
--- a/ui/v2.5/src/docs/en/Manual/Interface.md
+++ b/ui/v2.5/src/docs/en/Manual/Interface.md
@@ -19,9 +19,9 @@ The Scene Wall and Marker pages display scene preview videos (mp4) by default. T
 
 > **⚠️ Note:** scene/marker preview videos must be generated to see them in the applicable wall page if Video preview type is selected. Likewise, if Animated image is selected, then Image Previews must be generated.
 
-## Show Studios as text
+## Show studio overlay as text
 
-By default, a scene's studio will be shown as an image overlay. Checking this option changes this to display studios as a text name instead.
+By default, in the grid card view the studio will be shown as an image overlay of the studio logo. Checking this option changes this to display studios as a text name instead.
 
 ## Scene Player options
 
diff --git a/ui/v2.5/src/locales/en-GB.json b/ui/v2.5/src/locales/en-GB.json
index cafbb87dc..37b6b6d44 100644
--- a/ui/v2.5/src/locales/en-GB.json
+++ b/ui/v2.5/src/locales/en-GB.json
@@ -712,6 +712,10 @@
         "show_all_details": {
           "description": "When enabled, all content details will be shown by default and each detail item will fit under a single column.",
           "heading": "Show all details"
+        },
+        "show_studio_text": {
+          "description": "Always display studio name as text on details views instead of an icon.",
+          "heading": "Show studio as text"
         }
       },
       "editing": {
@@ -817,7 +821,8 @@
       "scene_list": {
         "heading": "Grid View",
         "options": {
-          "show_studio_as_text": "Display studio overlay as text"
+          "show_studio_as_text": "Display studio overlay as text",
+          "show_studio_as_text_desc": "By default, the studio logo is shown on cards in the grid. Enable this option to always show the studio name as text instead."
         }
       },
       "scene_player": {

From 2e48dbfc634b29805e7a784fc095db0c1815a70b Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Mon, 23 Mar 2026 17:32:30 +1100
Subject: [PATCH 389/405] Update changelog

---
 ui/v2.5/src/docs/en/Changelog/v0310.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ui/v2.5/src/docs/en/Changelog/v0310.md b/ui/v2.5/src/docs/en/Changelog/v0310.md
index afb618507..d7403c3b7 100644
--- a/ui/v2.5/src/docs/en/Changelog/v0310.md
+++ b/ui/v2.5/src/docs/en/Changelog/v0310.md
@@ -50,10 +50,13 @@
 * Added support for filtering by stash ID count. ([#6437](https://github.com/stashapp/stash/pull/6437))
 * Added support for filtering group by scene count. ([#6593](https://github.com/stashapp/stash/pull/6593))
 * Updated Tag list view to be consistent with other list views. ([#6703](https://github.com/stashapp/stash/pull/6703))
+* Added confirmation dialog to Auto Tag task. ([#6735](https://github.com/stashapp/stash/pull/6735))
+* Studio now shows the studio name instead of the studio image if the image is not set or if (new) `Show studio as text` is true. ([#6716](https://github.com/stashapp/stash/pull/6716))
 * Installed plugins/scrapers no longer show in the available list. ([#6443](https://github.com/stashapp/stash/pull/6443))
 * Name is now populated when searching by stash-box. ([#6447](https://github.com/stashapp/stash/pull/6447))
 * Improved performance of group queries on large systems. ([#6478](https://github.com/stashapp/stash/pull/6478))
 * Search input is now focused when opening the scraper menu. ([#6704](https://github.com/stashapp/stash/pull/6704))
+* VAAPI dri device can now be overridden using `STASH_HW_DRI_DEVICE` environment variable. ([#6728](https://github.com/stashapp/stash/pull/6728))
 * Added support for `{phash}` in `queryURL` scraper field. ([#6701](https://github.com/stashapp/stash/pull/6701))
 * Systray notification now shows the port stash is running on. ([#6448](https://github.com/stashapp/stash/pull/6448))
 

From fd480c5a3ef60e5b9545d39c70e9f3c301be53d8 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Tue, 24 Mar 2026 15:03:58 +1100
Subject: [PATCH 390/405] Exclude zip folders when browsing scenes and
 galleries (#6740)

* Add short cuts when only getting zip/folder ids
* Don't show zip folders when viewing scenes and galleries.

Zip folders have no results for scenes and galleries, but will for images.
---
 internal/api/resolver.go                      |  8 ++
 internal/api/resolver_model_folder.go         | 31 +++++++
 ui/v2.5/graphql/queries/folder.graphql        | 11 ++-
 .../components/List/Filters/FolderFilter.tsx  | 83 ++++++++++++++-----
 ui/v2.5/src/core/StashService.ts              |  5 +-
 5 files changed, 114 insertions(+), 24 deletions(-)

diff --git a/internal/api/resolver.go b/internal/api/resolver.go
index 061d0e1a9..b1cec1c9d 100644
--- a/internal/api/resolver.go
+++ b/internal/api/resolver.go
@@ -7,6 +7,7 @@ import (
 	"sort"
 	"strconv"
 
+	"github.com/99designs/gqlgen/graphql"
 	"github.com/stashapp/stash/internal/build"
 	"github.com/stashapp/stash/internal/manager"
 	"github.com/stashapp/stash/pkg/logger"
@@ -145,6 +146,13 @@ func (r *Resolver) withReadTxn(ctx context.Context, fn func(ctx context.Context)
 	return r.repository.WithReadTxn(ctx, fn)
 }
 
+// idOnly returns true if the query is only asking for the id field.
+// This can be used to optimize certain queries where we don't need to load the full object if we're only getting the id.
+func (r *Resolver) idOnly(ctx context.Context) bool {
+	fields := graphql.CollectAllFields(ctx)
+	return len(fields) == 1 && fields[0] == "id"
+}
+
 func (r *queryResolver) MarkerWall(ctx context.Context, q *string) (ret []*models.SceneMarker, err error) {
 	if err := r.withReadTxn(ctx, func(ctx context.Context) error {
 		ret, err = r.repository.SceneMarker.Wall(ctx, q)
diff --git a/internal/api/resolver_model_folder.go b/internal/api/resolver_model_folder.go
index 1fcc144f3..725ca34f8 100644
--- a/internal/api/resolver_model_folder.go
+++ b/internal/api/resolver_model_folder.go
@@ -17,15 +17,31 @@ func (r *folderResolver) ParentFolder(ctx context.Context, obj *models.Folder) (
 		return nil, nil
 	}
 
+	if r.idOnly(ctx) {
+		return &models.Folder{ID: *obj.ParentFolderID}, nil
+	}
+
 	return loaders.From(ctx).FolderByID.Load(*obj.ParentFolderID)
 }
 
+func foldersFromIDs(ids []models.FolderID) []*models.Folder {
+	ret := make([]*models.Folder, len(ids))
+	for i, id := range ids {
+		ret[i] = &models.Folder{ID: id}
+	}
+	return ret
+}
+
 func (r *folderResolver) ParentFolders(ctx context.Context, obj *models.Folder) ([]*models.Folder, error) {
 	ids, err := loaders.From(ctx).FolderParentFolderIDs.Load(obj.ID)
 	if err != nil {
 		return nil, err
 	}
 
+	if r.idOnly(ctx) {
+		return foldersFromIDs(ids), nil
+	}
+
 	var errs []error
 	ret, errs := loaders.From(ctx).FolderByID.LoadAll(ids)
 	return ret, firstError(errs)
@@ -37,11 +53,26 @@ func (r *folderResolver) SubFolders(ctx context.Context, obj *models.Folder) ([]
 		return nil, err
 	}
 
+	if r.idOnly(ctx) {
+		return foldersFromIDs(ids), nil
+	}
+
 	var errs []error
 	ret, errs := loaders.From(ctx).FolderByID.LoadAll(ids)
 	return ret, firstError(errs)
 }
 
 func (r *folderResolver) ZipFile(ctx context.Context, obj *models.Folder) (*BasicFile, error) {
+	// shortcut for id only queries
+	if r.idOnly(ctx) {
+		if obj.ZipFileID == nil {
+			return nil, nil
+		}
+
+		return &BasicFile{
+			BaseFile: &models.BaseFile{ID: *obj.ZipFileID},
+		}, nil
+	}
+
 	return zipFileResolver(ctx, obj.ZipFileID)
 }
diff --git a/ui/v2.5/graphql/queries/folder.graphql b/ui/v2.5/graphql/queries/folder.graphql
index 81f431786..b1119cd61 100644
--- a/ui/v2.5/graphql/queries/folder.graphql
+++ b/ui/v2.5/graphql/queries/folder.graphql
@@ -1,7 +1,10 @@
-query FindRootFoldersForSelect {
+query FindRootFoldersForSelect($zip_file_filter: MultiCriterionInput) {
   findFolders(
     filter: { per_page: -1, sort: "path", direction: ASC }
-    folder_filter: { parent_folder: { modifier: IS_NULL } }
+    folder_filter: {
+      parent_folder: { modifier: IS_NULL }
+      zip_file: $zip_file_filter
+    }
   ) {
     count
     folders {
@@ -34,6 +37,10 @@ query FindFolderHierarchyForIDs($ids: [ID!]!) {
         # the parent folders will be expanded, so we need the child folders
         sub_folders {
           ...SelectFolderData
+          # get zip file so we can filter out zip folders if needed
+          zip_file {
+            id
+          }
         }
       }
     }
diff --git a/ui/v2.5/src/components/List/Filters/FolderFilter.tsx b/ui/v2.5/src/components/List/Filters/FolderFilter.tsx
index 95b5121f9..3eaaf0427 100644
--- a/ui/v2.5/src/components/List/Filters/FolderFilter.tsx
+++ b/ui/v2.5/src/components/List/Filters/FolderFilter.tsx
@@ -1,6 +1,9 @@
 import React, { useCallback, useEffect, useMemo, useState } from "react";
 import {
+  CriterionModifier,
+  FilterMode,
   FolderDataFragment,
+  MultiCriterionInput,
   useFindFolderHierarchyForIDsQuery,
   useFindFoldersForQueryQuery,
   useFindRootFoldersForSelectQuery,
@@ -159,21 +162,47 @@ function mergeFolderMaps(base: IFolder[], update: IFolder[]): IFolder[] {
   return ret;
 }
 
-function useFolderMap(
-  query: string,
-  skip?: boolean,
-  initialSelected?: string[]
-) {
+function useFolderMap(props: {
+  query: string;
+  skip?: boolean;
+  initialSelected?: string[];
+  mode?: FilterMode;
+}) {
+  const { query, skip = false, initialSelected, mode } = props;
+
   const [cachedInitialSelected] = useState<string[]>(initialSelected ?? []);
 
+  // exclude zip folders for scenes and galleries
+  const excludeZipFolders =
+    mode === FilterMode.Scenes || mode === FilterMode.Galleries;
+
+  const zipFileFilter: MultiCriterionInput | undefined = useMemo(
+    () =>
+      excludeZipFolders
+        ? {
+            modifier: CriterionModifier.IsNull,
+          }
+        : undefined,
+    [excludeZipFolders]
+  );
+
+  const folderFilterForQuery = useMemo(
+    () => (zipFileFilter ? { zip_file: zipFileFilter } : undefined),
+    [zipFileFilter]
+  );
+
   const { data: rootFoldersResult } = useFindRootFoldersForSelectQuery({
     skip,
+    variables: {
+      zip_file_filter: zipFileFilter,
+    },
   });
 
   const { data: queryFoldersResult } = useFindFoldersForQueryQuery({
     skip: !query,
     variables: {
       filter: { q: query, per_page: 200 },
+      folder_filter: folderFilterForQuery,
     },
   });
 
@@ -213,11 +242,14 @@ function useFolderMap(
             existing = {
               ...folder.parent_folders[i],
               expanded: true,
-              children: folder.parent_folders[i].sub_folders.map((f) => ({
-                ...f,
-                expanded: false,
-                children: undefined,
-              })),
+              children: folder.parent_folders[i].sub_folders
+                // filter out zip folders if needed
+                .filter((f) => f.zip_file === null || !excludeZipFolders)
+                .map((f) => ({
+                  ...f,
+                  expanded: false,
+                  children: undefined,
+                })),
             };
             ret.push(existing);
           }
@@ -243,11 +275,14 @@ function useFolderMap(
         existing = {
           ...existing,
           expanded: true,
-          children: thisFolder.sub_folders.map((f) => ({
-            ...f,
-            expanded: false,
-            children: undefined,
-          })),
+          // filter out zip folders if needed
+          children: thisFolder.sub_folders
+            .filter((f) => f.zip_file === null || !excludeZipFolders)
+            .map((f) => ({
+              ...f,
+              expanded: false,
+              children: undefined,
+            })),
         };
 
         currentParent!.children![existingIndex] = existing;
@@ -255,7 +290,7 @@ function useFolderMap(
       }
     });
     return ret;
-  }, [initialSelectedResult]);
+  }, [initialSelectedResult, excludeZipFolders]);
 
   const mergedRootFolders = useMemo(() => {
     if (query) {
@@ -347,7 +382,10 @@ function useFolderMap(
 
     // query children folders if not already loaded
     if (folder.children === undefined) {
-      const subFolderResult = await queryFindSubFolders(folder.id);
+      const subFolderResult = await queryFindSubFolders(
+        folder.id,
+        excludeZipFolders
+      );
       setFolderMap((current) =>
         current.map(
           replaceFolder({
@@ -419,17 +457,19 @@ export const FolderSelector: React.FC<{
 interface IInputFilterProps {
   criterion: FolderCriterion;
   setCriterion: (c: FolderCriterion) => void;
+  mode?: FilterMode;
 }
 
 export const FolderFilter: React.FC<IInputFilterProps> = ({
   criterion,
   setCriterion,
+  mode,
 }) => {
   const intl = useIntl();
   const [query, setQuery] = useState("");
   const [displayQuery, onQueryChange] = useDebouncedState(query, setQuery, 250);
 
-  const { folderMap, onToggleExpanded } = useFolderMap(query);
+  const { folderMap, onToggleExpanded } = useFolderMap({ query, mode });
 
   const messages = defineMessages({
     sub_folder_depth: {
@@ -599,11 +639,12 @@ export const SidebarFolderFilter: React.FC<
   const multipleSelected =
     criterion.value.items.length > 1 || criterion.value.excluded.length > 0;
 
-  const { folderMap, onToggleExpanded } = useFolderMap(
+  const { folderMap, onToggleExpanded } = useFolderMap({
     query,
     skip,
-    criterion.value.items.map((i) => i.id)
-  );
+    initialSelected: criterion.value.items.map((i) => i.id),
+    mode: filter.mode,
+  });
 
   function onSelect(folder: IFolder) {
     // maintain sub-folder select if present
diff --git a/ui/v2.5/src/core/StashService.ts b/ui/v2.5/src/core/StashService.ts
index bfd76f7ee..33b778343 100644
--- a/ui/v2.5/src/core/StashService.ts
+++ b/ui/v2.5/src/core/StashService.ts
@@ -515,12 +515,15 @@ export const useFindSavedFilters = (mode?: GQL.FilterMode) =>
     variables: { mode },
   });
 
-export const queryFindSubFolders = (id: string) =>
+export const queryFindSubFolders = (id: string, excludeZipFolders?: boolean) =>
   client.query<GQL.FindFoldersForQueryQuery>({
     query: GQL.FindFoldersForQueryDocument,
     variables: {
       folder_filter: {
         parent_folder: { value: id, modifier: GQL.CriterionModifier.Equals },
+        zip_file: excludeZipFolders
+          ? { modifier: GQL.CriterionModifier.IsNull }
+          : undefined,
       },
       filter: {
         per_page: -1,

From eeee081eb7d6979be5a8f399e5cce136882be06e Mon Sep 17 00:00:00 2001
From: DogmaDragon <103123951+DogmaDragon@users.noreply.github.com>
Date: Wed, 25 Mar 2026 13:36:31 +0200
Subject: [PATCH 391/405] Refactor README.md for better clarity and structure

---
 README.md | 58 ++++++++++++++++++++++++++++---------------------------
 1 file changed, 30 insertions(+), 28 deletions(-)

diff --git a/README.md b/README.md
index 5ccefe4bc..2d90a76ea 100644
--- a/README.md
+++ b/README.md
@@ -13,10 +13,10 @@
 
 ![Screenshot of Stash web application interface](docs/readme_assets/demo_image.png)
 
-* Stash gathers information about videos in your collection from the internet, and is extensible through the use of community-built plugins for a large number of content producers and sites.
-* Stash supports a wide variety of both video and image formats.
-* You can tag videos and find them later.
-* Stash provides statistics about performers, tags, studios and more.
+- Stash gathers information about videos in your collection from the internet, and is extensible through the use of community-built plugins for a large number of content producers and sites.
+- Stash supports a wide variety of both video and image formats.
+- You can tag videos and find them later.
+- Stash provides statistics about performers, tags, studios and more.
 
 You can [watch a SFW demo video](https://vimeo.com/545323354) to see it in action.
 
@@ -24,17 +24,19 @@ For further information you can consult the [documentation](https://docs.stashap
 
 # Installing Stash
 
+> [!tip]
 Step-by-step instructions are available at [docs.stashapp.cc/installation](https://docs.stashapp.cc/installation/).
 
-#### Windows Users:
-
-As of version 0.27.0, Stash no longer supports _Windows 7, 8, Server 2008 and Server 2012._  
-At least Windows 10 or Server 2016 is required.
-
-#### Mac Users:
-
-As of version 0.29.0, Stash requires _macOS 11 Big Sur_ or later.  
-Stash can still be run through docker on older versions of macOS.
+> [!important]
+>**Windows Users**
+>
+>As of version 0.27.0, Stash no longer supports _Windows 7, 8, Server 2008 and Server 2012._  
+>At least Windows 10 or Server 2016 is required.
+>
+>**macOS Users**
+>
+> As of version 0.29.0, Stash requires _macOS 11 Big Sur_ or later.  
+> Stash can still be run through docker on older versions of macOS.
 
 <img src="docs/readme_assets/windows_logo.svg" width="100%" height="75"> Windows | <img src="docs/readme_assets/mac_logo.svg" width="100%" height="75"> macOS | <img src="docs/readme_assets/linux_logo.svg" width="100%" height="75"> Linux | <img src="docs/readme_assets/docker_logo.svg" width="100%" height="75"> Docker
 :---:|:---:|:---:|:---:
@@ -85,23 +87,23 @@ The badge below shows the current translation status of Stash across all support
 
 Need help or want to get involved? Start with the documentation, then reach out to the community if you need further assistance.
 
-- Documentation
-  - Official docs: https://docs.stashapp.cc - official guides guides and troubleshooting.
-  - In-app manual: press <kbd>Shift</kbd> + <kbd>?</kbd> in the app or view the manual online: https://docs.stashapp.cc/in-app-manual.
-  - FAQ: https://discourse.stashapp.cc/c/support/faq/28 - common questions and answers.
-  - Community wiki: https://discourse.stashapp.cc/tags/c/community-wiki/22/stash - guides, how-to’s and tips.
+### Documentation
+- [Official documentation](https://docs.stashapp.cc) - official guides guides and troubleshooting.
+- [In-app manual](https://docs.stashapp.cc/in-app-manual) press <kbd>Shift</kbd> + <kbd>?</kbd> in the app or view the manual online.
+- [FAQ](https://discourse.stashapp.cc/c/support/faq/28) - common questions and answers.
+- [Community wiki](https://discourse.stashapp.cc/tags/c/community-wiki/22/stash) - guides, how-to’s and tips.
   
-- Community & discussion
-  - Community forum: https://discourse.stashapp.cc - community support, feature requests and discussions.
-  - Discord: https://discord.gg/2TsNFKt - real-time chat and community support.
-  - GitHub discussions: https://github.com/stashapp/stash/discussions - community support and feature discussions.
-  - Lemmy community: https://discuss.online/c/stashapp - Reddit-style community space.
+### Community & discussion
+- [Community forum](https://discourse.stashapp.cc) - community support, feature requests and discussions.
+- [Discord](https://discord.gg/2TsNFKt) - real-time chat and community support.
+- [GitHub discussions](https://github.com/stashapp/stash/discussions) - community support and feature discussions.
+- [Lemmy community](https://discuss.online/c/stashapp) - board-style community space.
 
-- Community scrapers & plugins
-  - Metadata sources: https://docs.stashapp.cc/metadata-sources/
-  - Plugins: https://docs.stashapp.cc/plugins/
-  - Themes: https://docs.stashapp.cc/themes/
-  - Other projects: https://docs.stashapp.cc/other-projects/
+### Community scrapers & plugins
+- [Metadata sources](https://docs.stashapp.cc/metadata-sources/)
+- [Plugins](https://docs.stashapp.cc/plugins/)
+- [Themes](https://docs.stashapp.cc/themes/)
+- [Other projects](https://docs.stashapp.cc/other-projects/)
 
 # For Developers
 

From c861d3991a9aa4404ff6739b2515343957340355 Mon Sep 17 00:00:00 2001
From: "(Moai Emoji)" <25407129+SandiyosDev@users.noreply.github.com>
Date: Wed, 25 Mar 2026 17:01:43 -0500
Subject: [PATCH 392/405] Fix 'not equals' custom field to include unset
 objects (#6742)

* Fix custom field 'not equals' to include unset objects
* also fix Excludes and NotBetween null handling
---
 pkg/sqlite/custom_fields.go | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkg/sqlite/custom_fields.go b/pkg/sqlite/custom_fields.go
index d78e3f9ab..22dbbfeb2 100644
--- a/pkg/sqlite/custom_fields.go
+++ b/pkg/sqlite/custom_fields.go
@@ -261,8 +261,8 @@ func (h *customFieldsFilterHandler) handleCriterion(f *filterBuilder, joinAs str
 		h.innerJoin(f, joinAs, cc.Field)
 		f.addWhere(fmt.Sprintf("%[1]s.value IN %s", joinAs, getInBinding(len(cv))), cv...)
 	case models.CriterionModifierNotEquals:
-		h.innerJoin(f, joinAs, cc.Field)
-		f.addWhere(fmt.Sprintf("%[1]s.value NOT IN %s", joinAs, getInBinding(len(cv))), cv...)
+		h.leftJoin(f, joinAs, cc.Field)
+		f.addWhere(fmt.Sprintf("(%[1]s.value NOT IN %s OR %[1]s.value IS NULL)", joinAs, getInBinding(len(cv))), cv...)
 	case models.CriterionModifierIncludes:
 		clauses := make([]sqlClause, len(cv))
 		for i, v := range cv {
@@ -272,7 +272,7 @@ func (h *customFieldsFilterHandler) handleCriterion(f *filterBuilder, joinAs str
 		f.whereClauses = append(f.whereClauses, clauses...)
 	case models.CriterionModifierExcludes:
 		for _, v := range cv {
-			f.addWhere(fmt.Sprintf("%[1]s.value NOT LIKE ?", joinAs), fmt.Sprintf("%%%v%%", v))
+			f.addWhere(fmt.Sprintf("(%[1]s.value NOT LIKE ? OR %[1]s.value IS NULL)", joinAs), fmt.Sprintf("%%%v%%", v))
 		}
 		h.leftJoin(f, joinAs, cc.Field)
 	case models.CriterionModifierMatchesRegex:
@@ -315,8 +315,8 @@ func (h *customFieldsFilterHandler) handleCriterion(f *filterBuilder, joinAs str
 		h.innerJoin(f, joinAs, cc.Field)
 		f.addWhere(fmt.Sprintf("%s.value BETWEEN ? AND ?", joinAs), cv[0], cv[1])
 	case models.CriterionModifierNotBetween:
-		h.innerJoin(f, joinAs, cc.Field)
-		f.addWhere(fmt.Sprintf("%s.value NOT BETWEEN ? AND ?", joinAs), cv[0], cv[1])
+		h.leftJoin(f, joinAs, cc.Field)
+		f.addWhere(fmt.Sprintf("(%s.value NOT BETWEEN ? AND ? OR %[1]s.value IS NULL)", joinAs), cv[0], cv[1])
 	case models.CriterionModifierLessThan:
 		if len(cv) != 1 {
 			f.setError(fmt.Errorf("expected 1 value for custom field criterion modifier LESS_THAN, got %d", len(cv)))

From 020c242ea6c42cec7e0b38ce37c57a0af76a9bfe Mon Sep 17 00:00:00 2001
From: Gykes <24581046+Gykes@users.noreply.github.com>
Date: Sun, 29 Mar 2026 15:07:54 -0700
Subject: [PATCH 393/405] Fix: Remove padFuzzyDate From Performer (#6757)

---
 pkg/stashbox/performer.go | 21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/pkg/stashbox/performer.go b/pkg/stashbox/performer.go
index 589fd29b6..5b25b4a59 100644
--- a/pkg/stashbox/performer.go
+++ b/pkg/stashbox/performer.go
@@ -242,11 +242,11 @@ func performerFragmentToScrapedPerformer(p graphql.PerformerFragment) *models.Sc
 	}
 
 	if p.BirthDate != nil {
-		sp.Birthdate = padFuzzyDate(p.BirthDate)
+		sp.Birthdate = p.BirthDate
 	}
 
 	if p.DeathDate != nil {
-		sp.DeathDate = padFuzzyDate(p.DeathDate)
+		sp.DeathDate = p.DeathDate
 	}
 
 	if p.Gender != nil {
@@ -290,23 +290,6 @@ func performerFragmentToScrapedPerformer(p graphql.PerformerFragment) *models.Sc
 	return sp
 }
 
-func padFuzzyDate(date *string) *string {
-	if date == nil {
-		return nil
-	}
-
-	var paddedDate string
-	switch len(*date) {
-	case 10:
-		paddedDate = *date
-	case 7:
-		paddedDate = fmt.Sprintf("%s-01", *date)
-	case 4:
-		paddedDate = fmt.Sprintf("%s-01-01", *date)
-	}
-	return &paddedDate
-}
-
 // FindPerformerByID queries stash-box for a performer by ID.
 func (c Client) FindPerformerByID(ctx context.Context, id string) (*models.ScrapedPerformer, error) {
 	performer, err := c.client.FindPerformerByID(ctx, id)

From 8af2cfe5255f70d8bc0864e3a275571d2db96de0 Mon Sep 17 00:00:00 2001
From: "(Moai Emoji)" <25407129+SandiyosDev@users.noreply.github.com>
Date: Sun, 29 Mar 2026 17:09:28 -0500
Subject: [PATCH 394/405] Add mutex to repositoryCache for thread safety
 (#6741)

* Add mutex to package cache to prevent concurrent map write crash
* use sync.Once for cache init
---
 pkg/pkg/cache.go   | 32 +++++++++++++++++++++++---------
 pkg/pkg/manager.go |  8 +++++---
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/pkg/pkg/cache.go b/pkg/pkg/cache.go
index 9d36bdd1d..e94b2cb41 100644
--- a/pkg/pkg/cache.go
+++ b/pkg/pkg/cache.go
@@ -1,6 +1,7 @@
 package pkg
 
 import (
+	"sync"
 	"time"
 )
 
@@ -10,22 +11,23 @@ type cacheEntry struct {
 }
 
 type repositoryCache struct {
+	mu sync.RWMutex
 	// cache maps the URL to the last modified time and the data
 	cache map[string]cacheEntry
 }
 
-func (c *repositoryCache) ensureCache() {
-	if c.cache == nil {
-		c.cache = make(map[string]cacheEntry)
-	}
-}
-
 func (c *repositoryCache) lastModified(url string) *time.Time {
 	if c == nil {
 		return nil
 	}
 
-	c.ensureCache()
+	c.mu.RLock()
+	defer c.mu.RUnlock()
+
+	if c.cache == nil {
+		return nil
+	}
+
 	e, found := c.cache[url]
 
 	if !found {
@@ -36,7 +38,13 @@ func (c *repositoryCache) lastModified(url string) *time.Time {
 }
 
 func (c *repositoryCache) getPackageList(url string) []RemotePackage {
-	c.ensureCache()
+	c.mu.RLock()
+	defer c.mu.RUnlock()
+
+	if c.cache == nil {
+		return nil
+	}
+
 	e, found := c.cache[url]
 
 	if !found {
@@ -51,7 +59,13 @@ func (c *repositoryCache) cacheList(url string, lastModified time.Time, data []R
 		return
 	}
 
-	c.ensureCache()
+	c.mu.Lock()
+	defer c.mu.Unlock()
+
+	if c.cache == nil {
+		c.cache = make(map[string]cacheEntry)
+	}
+
 	c.cache[url] = cacheEntry{
 		lastModified: lastModified,
 		data:         data,
diff --git a/pkg/pkg/manager.go b/pkg/pkg/manager.go
index 18fa4e0d1..4024191ad 100644
--- a/pkg/pkg/manager.go
+++ b/pkg/pkg/manager.go
@@ -10,6 +10,7 @@ import (
 	"net/http"
 	"net/url"
 	"path/filepath"
+	"sync"
 
 	"github.com/stashapp/stash/pkg/logger"
 	"github.com/stashapp/stash/pkg/models"
@@ -31,13 +32,14 @@ type Manager struct {
 
 	Client *http.Client
 
-	cache *repositoryCache
+	cacheOnce sync.Once
+	cache     *repositoryCache
 }
 
 func (m *Manager) getCache() *repositoryCache {
-	if m.cache == nil {
+	m.cacheOnce.Do(func() {
 		m.cache = &repositoryCache{}
-	}
+	})
 
 	return m.cache
 }

From af07fea2890003fc2e7ad05ec1ebc5af28d51cdf Mon Sep 17 00:00:00 2001
From: feederbox826 <me@feederbox.cc>
Date: Sun, 29 Mar 2026 19:57:16 -0400
Subject: [PATCH 395/405] [CI] add vips-heif (#6765)

---
 docker/ci/x86_64/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/ci/x86_64/Dockerfile b/docker/ci/x86_64/Dockerfile
index 6a9c6b76d..2161cb6af 100644
--- a/docker/ci/x86_64/Dockerfile
+++ b/docker/ci/x86_64/Dockerfile
@@ -12,7 +12,7 @@ RUN if [ "$TARGETPLATFORM" = "linux/arm/v6" ];   then BIN=stash-linux-arm32v6; \
 FROM --platform=$TARGETPLATFORM alpine:latest AS app
 COPY --from=binary /stash /usr/bin/
 
-RUN apk add --no-cache ca-certificates python3 py3-requests py3-requests-toolbelt py3-lxml py3-pip ffmpeg tzdata vips vips-tools \
+RUN apk add --no-cache ca-certificates python3 py3-requests py3-requests-toolbelt py3-lxml py3-pip ffmpeg tzdata vips vips-tools vips-heif \
     && pip install --break-system-packages mechanicalsoup cloudscraper stashapp-tools
 ENV STASH_CONFIG_FILE=/root/.stash/config.yml
 

From fe2a8eb0fdeb1180e5377bc28f4161abd7ac515a Mon Sep 17 00:00:00 2001
From: eb2292 <46068962+eb2292@users.noreply.github.com>
Date: Sun, 29 Mar 2026 20:04:10 -0400
Subject: [PATCH 396/405] Add keyboard shortcut "d d" to delete scene (#6755)

Co-authored-by: DogmaDragon <103123951+DogmaDragon@users.noreply.github.com>
---
 ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx | 2 ++
 ui/v2.5/src/docs/en/Manual/KeyboardShortcuts.md      | 1 +
 2 files changed, 3 insertions(+)

diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx
index 35bef7efb..7d1b245fc 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx
@@ -256,6 +256,7 @@ const ScenePage: React.FC<IProps> = PatchComponent("ScenePage", (props) => {
     Mousetrap.bind("p p", () => onQueuePrevious());
     Mousetrap.bind("p r", () => onQueueRandom());
     Mousetrap.bind(",", () => setCollapsed(!collapsed));
+    Mousetrap.bind("d d", () => setIsDeleteAlertOpen(true));
     Mousetrap.bind("c c", () => {
       onGenerateScreenshot(getPlayerPosition());
     });
@@ -271,6 +272,7 @@ const ScenePage: React.FC<IProps> = PatchComponent("ScenePage", (props) => {
       Mousetrap.unbind("i");
       Mousetrap.unbind("h");
       Mousetrap.unbind("o");
+      Mousetrap.unbind("d d");
       Mousetrap.unbind("p n");
       Mousetrap.unbind("p p");
       Mousetrap.unbind("p r");
diff --git a/ui/v2.5/src/docs/en/Manual/KeyboardShortcuts.md b/ui/v2.5/src/docs/en/Manual/KeyboardShortcuts.md
index f6cd29334..93ba817f6 100644
--- a/ui/v2.5/src/docs/en/Manual/KeyboardShortcuts.md
+++ b/ui/v2.5/src/docs/en/Manual/KeyboardShortcuts.md
@@ -64,6 +64,7 @@
 | `,` | Hide/Show sidebar |
 | `.` | Hide/Show scene scrubber |
 | `o` | Increment O-Counter |
+| `d d` | Delete scene |
 | Ratings ||
 | `r {1-5}` | Set rating (stars) |
 | `r 0` | Unset rating (stars) |

From 86188e5ff7067c6fe78d7ad5785555cf0b15d5ef Mon Sep 17 00:00:00 2001
From: smith113-p <205463041+smith113-p@users.noreply.github.com>
Date: Mon, 30 Mar 2026 01:07:04 +0100
Subject: [PATCH 397/405] Use StashIDPill for displaying the scraped stash ID
 (#6761)

This is more consistent with other places that stash IDs are shown,
simplifies the code a bit, and lets you see at a glance which stash
box is being used.
---
 .../Tagger/scenes/StashSearchResult.tsx       | 23 ++++++++-----------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/ui/v2.5/src/components/Tagger/scenes/StashSearchResult.tsx b/ui/v2.5/src/components/Tagger/scenes/StashSearchResult.tsx
index f39fef103..add295c49 100755
--- a/ui/v2.5/src/components/Tagger/scenes/StashSearchResult.tsx
+++ b/ui/v2.5/src/components/Tagger/scenes/StashSearchResult.tsx
@@ -29,9 +29,9 @@ import { SceneTaggerModalsState } from "./sceneTaggerModals";
 import PerformerResult from "./PerformerResult";
 import StudioResult from "./StudioResult";
 import { useInitialState } from "src/hooks/state";
-import { getStashboxBase } from "src/utils/stashbox";
 import { ExternalLink } from "src/components/Shared/ExternalLink";
 import { compareScenesForSort } from "./utils";
+import { StashIDPill } from "src/components/Shared/StashID";
 
 const getDurationIcon = (matchPercentage: number) => {
   if (matchPercentage > 65)
@@ -325,15 +325,6 @@ const StashSearchResult: React.FC<IStashSearchResultProps> = ({
     }
   }, [isActive, loading, stashScene, index, resolveScene, scene]);
 
-  const stashBoxBaseURL = currentSource?.sourceInput.stash_box_endpoint
-    ? getStashboxBase(currentSource.sourceInput.stash_box_endpoint)
-    : undefined;
-  const stashBoxURL = useMemo(() => {
-    if (stashBoxBaseURL) {
-      return `${stashBoxBaseURL}scenes/${scene.remote_site_id}`;
-    }
-  }, [scene, stashBoxBaseURL]);
-
   const setExcludedField = (name: string, value: boolean) =>
     setExcludedFields({
       ...excludedFields,
@@ -680,16 +671,20 @@ const StashSearchResult: React.FC<IStashSearchResultProps> = ({
   };
 
   const maybeRenderStashBoxID = () => {
-    if (scene.remote_site_id && stashBoxURL) {
+    if (scene.remote_site_id && currentSource?.sourceInput.stash_box_endpoint) {
       return (
         <div className="scene-details">
           <OptionalField
             exclude={excludedFields[fields.stash_ids]}
             setExclude={(v) => setExcludedField(fields.stash_ids, v)}
           >
-            <ExternalLink href={stashBoxURL}>
-              {scene.remote_site_id}
-            </ExternalLink>
+            <StashIDPill
+              linkType="scenes"
+              stashID={{
+                endpoint: currentSource?.sourceInput.stash_box_endpoint,
+                stash_id: scene.remote_site_id,
+              }}
+            />
           </OptionalField>
         </div>
       );

From 0a4b427e1df109ae0092f9c2e0a84d8f272f5f1a Mon Sep 17 00:00:00 2001
From: smith113-p <205463041+smith113-p@users.noreply.github.com>
Date: Mon, 30 Mar 2026 01:09:17 +0100
Subject: [PATCH 398/405] Show stash-box name in studio/performer tagger
 (#6759)

---
 ui/v2.5/src/components/Tagger/StashBoxSelector.tsx | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/ui/v2.5/src/components/Tagger/StashBoxSelector.tsx b/ui/v2.5/src/components/Tagger/StashBoxSelector.tsx
index 3f5f103a6..c47bc73f1 100644
--- a/ui/v2.5/src/components/Tagger/StashBoxSelector.tsx
+++ b/ui/v2.5/src/components/Tagger/StashBoxSelector.tsx
@@ -1,6 +1,7 @@
 import { Form } from "react-bootstrap";
 import { FormattedMessage } from "react-intl";
 import { StashBox } from "src/core/generated-graphql";
+import { useConfigurationContext } from "src/hooks/Config";
 
 interface IStashBoxSelectorProps {
   stashBoxes: StashBox[];
@@ -13,6 +14,15 @@ export const StashBoxSelector: React.FC<IStashBoxSelectorProps> = ({
   selectedEndpoint,
   onEndpointChange,
 }) => {
+  const { configuration } = useConfigurationContext();
+
+  function stashboxNameForEndpoint(endpoint: string) {
+    let box = configuration?.general.stashBoxes.find(
+      (sb) => sb.endpoint === endpoint
+    );
+    return `stash-box: ${box?.name ?? endpoint}`;
+  }
+
   return (
     <Form.Control
       as="select"
@@ -28,7 +38,7 @@ export const StashBoxSelector: React.FC<IStashBoxSelectorProps> = ({
       )}
       {stashBoxes.map((i) => (
         <option value={i.endpoint} key={i.endpoint}>
-          {i.endpoint}
+          {stashboxNameForEndpoint(i.endpoint)}
         </option>
       ))}
     </Form.Control>

From 1e0b9902a34bc3324f0b052987ff0d9b3ab44524 Mon Sep 17 00:00:00 2001
From: "(Moai Emoji)" <25407129+SandiyosDev@users.noreply.github.com>
Date: Sun, 29 Mar 2026 19:18:45 -0500
Subject: [PATCH 399/405] Fix lightbox not reading scale-up setting from config
 (#6743)

---
 ui/v2.5/src/hooks/Lightbox/Lightbox.tsx | 43 ++++++++++++++++---------
 1 file changed, 27 insertions(+), 16 deletions(-)

diff --git a/ui/v2.5/src/hooks/Lightbox/Lightbox.tsx b/ui/v2.5/src/hooks/Lightbox/Lightbox.tsx
index 65c15024c..41c6d4fad 100644
--- a/ui/v2.5/src/hooks/Lightbox/Lightbox.tsx
+++ b/ui/v2.5/src/hooks/Lightbox/Lightbox.tsx
@@ -206,8 +206,25 @@ export const LightboxComponent: React.FC<IProps> = ({
     setLightboxSettings({ slideshowDelay: v });
   }
 
+  const scaleUp =
+    lightboxSettings?.scaleUp ??
+    config?.interface.imageLightbox.scaleUp ??
+    false;
+
+  const resetZoomOnNav =
+    lightboxSettings?.resetZoomOnNav ??
+    config?.interface.imageLightbox.resetZoomOnNav ??
+    false;
+
+  const scrollMode =
+    lightboxSettings?.scrollMode ??
+    config?.interface.imageLightbox.scrollMode ??
+    GQL.ImageLightboxScrollMode.Zoom;
+
   const displayMode =
-    lightboxSettings?.displayMode ?? GQL.ImageLightboxDisplayMode.FitXy;
+    lightboxSettings?.displayMode ??
+    config?.interface.imageLightbox.displayMode ??
+    GQL.ImageLightboxDisplayMode.FitXy;
   const oldDisplayMode = useRef(displayMode);
 
   function setDisplayMode(v: GQL.ImageLightboxDisplayMode) {
@@ -250,13 +267,13 @@ export const LightboxComponent: React.FC<IProps> = ({
     // reset zoom status
     // setResetZoom((r) => !r);
     // setZoomed(false);
-    if (lightboxSettings?.resetZoomOnNav) {
+    if (resetZoomOnNav) {
       setZoom(1);
     }
     setResetPosition((r) => !r);
 
     oldIndex.current = index;
-  }, [index, images.length, lightboxSettings?.resetZoomOnNav]);
+  }, [index, images.length, resetZoomOnNav]);
 
   const getNavOffset = useCallback(() => {
     if (images.length < 2) return;
@@ -288,13 +305,13 @@ export const LightboxComponent: React.FC<IProps> = ({
       // reset zoom status
       // setResetZoom((r) => !r);
       // setZoomed(false);
-      if (lightboxSettings?.resetZoomOnNav) {
+      if (resetZoomOnNav) {
         setZoom(1);
       }
       setResetPosition((r) => !r);
     }
     oldDisplayMode.current = displayMode;
-  }, [displayMode, lightboxSettings?.resetZoomOnNav]);
+  }, [displayMode, resetZoomOnNav]);
 
   const selectIndex = (e: React.MouseEvent, i: number) => {
     setIndex(i);
@@ -635,7 +652,7 @@ export const LightboxComponent: React.FC<IProps> = ({
                 label={intl.formatMessage({
                   id: "dialogs.lightbox.scale_up.label",
                 })}
-                checked={lightboxSettings?.scaleUp ?? false}
+                checked={scaleUp}
                 disabled={displayMode === GQL.ImageLightboxDisplayMode.Original}
                 onChange={(v) => setScaleUp(v.currentTarget.checked)}
               />
@@ -655,7 +672,7 @@ export const LightboxComponent: React.FC<IProps> = ({
                 label={intl.formatMessage({
                   id: "dialogs.lightbox.reset_zoom_on_nav",
                 })}
-                checked={lightboxSettings?.resetZoomOnNav ?? false}
+                checked={resetZoomOnNav}
                 onChange={(v) => setResetZoomOnNav(v.currentTarget.checked)}
               />
             </Col>
@@ -674,10 +691,7 @@ export const LightboxComponent: React.FC<IProps> = ({
                 onChange={(e) =>
                   setScrollMode(e.target.value as GQL.ImageLightboxScrollMode)
                 }
-                value={
-                  lightboxSettings?.scrollMode ??
-                  GQL.ImageLightboxScrollMode.Zoom
-                }
+                value={scrollMode}
                 className="btn-secondary mx-1 mb-1"
               >
                 <option
@@ -885,11 +899,8 @@ export const LightboxComponent: React.FC<IProps> = ({
                     width={image.visual_files?.[0]?.width ?? 0}
                     height={image.visual_files?.[0]?.height ?? 0}
                     displayMode={displayMode}
-                    scaleUp={lightboxSettings?.scaleUp ?? false}
-                    scrollMode={
-                      lightboxSettings?.scrollMode ??
-                      GQL.ImageLightboxScrollMode.Zoom
-                    }
+                    scaleUp={scaleUp}
+                    scrollMode={scrollMode}
                     resetPosition={resetPosition}
                     zoom={i === currentIndex ? zoom : 1}
                     scrollAttemptsBeforeChange={scrollAttemptsBeforeChange}

From 48ba26e17b22241b5de935138c19a0288212c44a Mon Sep 17 00:00:00 2001
From: "(Moai Emoji)" <25407129+SandiyosDev@users.noreply.github.com>
Date: Sun, 29 Mar 2026 19:38:20 -0500
Subject: [PATCH 400/405] Allow unicode characters when stripping filenames for
 json export (#6748)

---
 pkg/fsutil/file.go      | 2 +-
 pkg/fsutil/file_test.go | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkg/fsutil/file.go b/pkg/fsutil/file.go
index 1d0c0c473..05a127129 100644
--- a/pkg/fsutil/file.go
+++ b/pkg/fsutil/file.go
@@ -148,7 +148,7 @@ func Touch(path string) error {
 
 var (
 	replaceCharsRE = regexp.MustCompile(`[&=\\/:*"?_ ]`)
-	removeCharsRE  = regexp.MustCompile(`[^[:alnum:]-.]`)
+	removeCharsRE  = regexp.MustCompile(`[^\p{L}\p{N}\-.]`)
 	multiHyphenRE  = regexp.MustCompile(`\-+`)
 )
 
diff --git a/pkg/fsutil/file_test.go b/pkg/fsutil/file_test.go
index 4d84f8a47..df1077df2 100644
--- a/pkg/fsutil/file_test.go
+++ b/pkg/fsutil/file_test.go
@@ -15,6 +15,9 @@ func TestSanitiseBasename(t *testing.T) {
 		{"multi-hyphen", `hyphened--name`, "hyphened-name-2da2a58f"},
 		{"replaced characters", `a&b=c\d/:e*"f?_ g`, "a-b-c-d-e-f-g-ffca6fb0"},
 		{"removed characters", `foo!!bar@@and, more`, "foobarand-more-7cee02ab"},
+		{"unicode cjk", `テスト`, "テスト-63b560db"},
+		{"unicode korean", `시험`, "시험-3fcc7beb"},
+		{"mixed unicode", `Test テスト`, "Test-テスト-366aff1e"},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {

From e755b2c24c9f9d9cc48d262e9e3dc4a359db8db9 Mon Sep 17 00:00:00 2001
From: "(Moai Emoji)" <25407129+SandiyosDev@users.noreply.github.com>
Date: Sun, 29 Mar 2026 19:38:46 -0500
Subject: [PATCH 401/405] guard heatmap display on interactive_speed (#6746)

---
 ui/v2.5/src/components/ScenePlayer/ScenePlayerScrubber.tsx | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ui/v2.5/src/components/ScenePlayer/ScenePlayerScrubber.tsx b/ui/v2.5/src/components/ScenePlayer/ScenePlayerScrubber.tsx
index 196bc9bd0..8fb3fed67 100644
--- a/ui/v2.5/src/components/ScenePlayer/ScenePlayerScrubber.tsx
+++ b/ui/v2.5/src/components/ScenePlayer/ScenePlayerScrubber.tsx
@@ -349,9 +349,10 @@ export const ScenePlayerScrubber: React.FC<IScenePlayerScrubberProps> = ({
         <div
           className="scrubber-heatmap"
           style={{
-            backgroundImage: scene.paths.interactive_heatmap
-              ? `url(${scene.paths.interactive_heatmap})`
-              : undefined,
+            backgroundImage:
+              scene.interactive_speed && scene.paths.interactive_heatmap
+                ? `url(${scene.paths.interactive_heatmap})`
+                : undefined,
           }}
         />
         <div ref={indicatorEl} id="scrubber-position-indicator" />

From a4b0a7a1943abe3610f786078fe3f81ad61b4f84 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Mon, 30 Mar 2026 11:43:06 +1100
Subject: [PATCH 402/405] Exclude source objects from destination select and
 vice versa in merge dialogs (#6764)

* Add excludeIDs to PerformerSelect
* Exclude src from dest select and vice versa in merge dialogs
---
 .../Performers/PerformerMergeDialog.tsx          | 11 +++++++++++
 .../components/Performers/PerformerSelect.tsx    | 16 +++++++++++++---
 .../src/components/Scenes/SceneMergeDialog.tsx   |  8 ++++++++
 ui/v2.5/src/components/Tags/TagMergeDialog.tsx   |  5 +++++
 4 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/ui/v2.5/src/components/Performers/PerformerMergeDialog.tsx b/ui/v2.5/src/components/Performers/PerformerMergeDialog.tsx
index ce5b50b0c..c44a65a8f 100644
--- a/ui/v2.5/src/components/Performers/PerformerMergeDialog.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerMergeDialog.tsx
@@ -754,6 +754,15 @@ export const PerformerMergeModal: React.FC<IPerformerMergeModalProps> = ({
     id: "actions.merge",
   });
 
+  const srcIDs = useMemo(
+    () => sourcePerformers.map((s) => s.id),
+    [sourcePerformers]
+  );
+  const destID = useMemo(
+    () => (destPerformer[0] ? [destPerformer[0].id] : []),
+    [destPerformer]
+  );
+
   useEffect(() => {
     if (performers.length > 0) {
       // set the first performer as the destination, others as source
@@ -862,6 +871,7 @@ export const PerformerMergeModal: React.FC<IPerformerMergeModalProps> = ({
                 onSelect={(items) => setSourcePerformers(items)}
                 values={sourcePerformers}
                 menuPortalTarget={document.body}
+                excludeIds={destID}
               />
             </Col>
           </Form.Group>
@@ -895,6 +905,7 @@ export const PerformerMergeModal: React.FC<IPerformerMergeModalProps> = ({
                 onSelect={(items) => setDestPerformer(items)}
                 values={destPerformer}
                 menuPortalTarget={document.body}
+                excludeIds={srcIDs}
               />
             </Col>
           </Form.Group>
diff --git a/ui/v2.5/src/components/Performers/PerformerSelect.tsx b/ui/v2.5/src/components/Performers/PerformerSelect.tsx
index 133ffd854..fbb6fe785 100644
--- a/ui/v2.5/src/components/Performers/PerformerSelect.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerSelect.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from "react";
+import React, { useEffect, useMemo, useState } from "react";
 import {
   OptionProps,
   components as reactSelectComponents,
@@ -81,6 +81,7 @@ const _PerformerSelect: React.FC<
       ageFromDate?: string | null;
       hoverPlacementLabel?: Placement;
       hoverPlacementOptions?: Placement;
+      excludeIds?: string[];
     }
 > = (props) => {
   const [createPerformer] = usePerformerCreate();
@@ -92,6 +93,14 @@ const _PerformerSelect: React.FC<
   const defaultCreatable =
     !configuration?.interface.disableDropdownCreate.performer;
 
+  const exclude = useMemo(() => props.excludeIds ?? [], [props.excludeIds]);
+
+  function filterExcluded(performer: Performer) {
+    // HACK - we should probably exclude these in the backend query, but
+    // this will do in the short-term
+    return !exclude.includes(performer.id.toString());
+  }
+
   async function loadPerformers(input: string): Promise<Option[]> {
     const filter = new ListFilterModel(GQL.FilterMode.Performers);
     filter.currentPage = 1;
@@ -104,7 +113,8 @@ const _PerformerSelect: React.FC<
       filterByStashID(filter, input);
 
       const query = await queryFindPerformersForSelect(filter);
-      const matches = query.data.findPerformers.performers.slice();
+      const matches =
+        query.data.findPerformers.performers.filter(filterExcluded);
       if (matches.length > 0) {
         // Matches found, return them immediately.
         return matches.map(toOption);
@@ -118,7 +128,7 @@ const _PerformerSelect: React.FC<
     const query = await queryFindPerformersForSelect(filter);
     return performerSelectSort(
       input,
-      query.data.findPerformers.performers.slice()
+      query.data.findPerformers.performers.filter(filterExcluded)
     ).map(toOption);
   }
 
diff --git a/ui/v2.5/src/components/Scenes/SceneMergeDialog.tsx b/ui/v2.5/src/components/Scenes/SceneMergeDialog.tsx
index cbb718411..273de1f09 100644
--- a/ui/v2.5/src/components/Scenes/SceneMergeDialog.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneMergeDialog.tsx
@@ -719,6 +719,12 @@ export const SceneMergeModal: React.FC<ISceneMergeModalProps> = ({
     id: "actions.merge",
   });
 
+  const srcIDs = useMemo(() => sourceScenes.map((s) => s.id), [sourceScenes]);
+  const destID = useMemo(
+    () => (destScene[0] ? [destScene[0].id] : []),
+    [destScene]
+  );
+
   useEffect(() => {
     if (scenes.length > 0) {
       // set the first scene as the destination, others as source
@@ -826,6 +832,7 @@ export const SceneMergeModal: React.FC<ISceneMergeModalProps> = ({
                 onSelect={(items) => setSourceScenes(items)}
                 values={sourceScenes}
                 menuPortalTarget={document.body}
+                excludeIds={destID}
               />
             </Col>
           </Form.Group>
@@ -859,6 +866,7 @@ export const SceneMergeModal: React.FC<ISceneMergeModalProps> = ({
                 onSelect={(items) => setDestScene(items)}
                 values={destScene}
                 menuPortalTarget={document.body}
+                excludeIds={srcIDs}
               />
             </Col>
           </Form.Group>
diff --git a/ui/v2.5/src/components/Tags/TagMergeDialog.tsx b/ui/v2.5/src/components/Tags/TagMergeDialog.tsx
index be16dda33..c468861d0 100644
--- a/ui/v2.5/src/components/Tags/TagMergeDialog.tsx
+++ b/ui/v2.5/src/components/Tags/TagMergeDialog.tsx
@@ -433,6 +433,9 @@ export const TagMergeModal: React.FC<ITagMergeModalProps> = ({
     id: "actions.merge",
   });
 
+  const srcIDs = useMemo(() => src.map((s) => s.id), [src]);
+  const destID = useMemo(() => (dest ? [dest.id] : []), [dest]);
+
   useEffect(() => {
     if (tags.length > 0) {
       setDest(tags[0]);
@@ -544,6 +547,7 @@ export const TagMergeModal: React.FC<ITagMergeModalProps> = ({
                 creatable={false}
                 onSelect={(items) => setSrc(items)}
                 values={src}
+                excludeIds={destID}
                 menuPortalTarget={document.body}
               />
             </Col>
@@ -579,6 +583,7 @@ export const TagMergeModal: React.FC<ITagMergeModalProps> = ({
                 creatable={false}
                 onSelect={(items) => setDest(items[0])}
                 values={dest ? [dest] : undefined}
+                excludeIds={srcIDs}
                 menuPortalTarget={document.body}
               />
             </Col>

From 0d9ad38bfeb6f16b017afef00786fa2fdb068a98 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Mon, 30 Mar 2026 11:43:39 +1100
Subject: [PATCH 403/405] Clear search results and states from taggers when
 source changes (#6766)

---
 .../Tagger/performers/PerformerTagger.tsx     | 24 ++++++++++++-----
 .../Tagger/studios/StudioTagger.tsx           | 26 ++++++++++++++-----
 .../src/components/Tagger/tags/TagTagger.tsx  | 26 ++++++++++++++-----
 3 files changed, 56 insertions(+), 20 deletions(-)

diff --git a/ui/v2.5/src/components/Tagger/performers/PerformerTagger.tsx b/ui/v2.5/src/components/Tagger/performers/PerformerTagger.tsx
index 4391ba783..0e5ac2d9d 100755
--- a/ui/v2.5/src/components/Tagger/performers/PerformerTagger.tsx
+++ b/ui/v2.5/src/components/Tagger/performers/PerformerTagger.tsx
@@ -348,6 +348,13 @@ const PerformerTaggerList: React.FC<IPerformerTaggerListProps> = ({
     });
   };
 
+  // clear tagged performers when source is changed
+  useEffect(() => {
+    setTaggedPerformers({});
+    setSearchResults({});
+    setSearchErrors({});
+  }, [selectedEndpoint]);
+
   const updatePerformer = useUpdatePerformer();
 
   function handleSaveError(performerID: string, name: string, message: string) {
@@ -650,8 +657,6 @@ export const PerformerTagger: React.FC<ITaggerProps> = ({ performers }) => {
     }
   }, [jobsSubscribe, batchJobID]);
 
-  if (!config) return <LoadingIndicator />;
-
   const savedEndpointIndex =
     stashConfig?.general.stashBoxes.findIndex(
       (s) => s.endpoint === config.selectedEndpoint
@@ -663,6 +668,16 @@ export const PerformerTagger: React.FC<ITaggerProps> = ({ performers }) => {
   const selectedEndpoint =
     stashConfig?.general.stashBoxes[selectedEndpointIndex];
 
+  const selectedEndpointInput = useMemo(
+    () => ({
+      endpoint: selectedEndpoint.endpoint,
+      index: selectedEndpointIndex,
+    }),
+    [selectedEndpoint, selectedEndpointIndex]
+  );
+
+  if (!config) return <LoadingIndicator />;
+
   async function batchAdd(performerInput: string) {
     if (performerInput && selectedEndpoint) {
       const inputs = performerInput
@@ -805,10 +820,7 @@ export const PerformerTagger: React.FC<ITaggerProps> = ({ performers }) => {
 
         <PerformerTaggerList
           performers={performers}
-          selectedEndpoint={{
-            endpoint: selectedEndpoint.endpoint,
-            index: selectedEndpointIndex,
-          }}
+          selectedEndpoint={selectedEndpointInput}
           isIdle={batchJobID === undefined}
           config={config}
           onBatchAdd={batchAdd}
diff --git a/ui/v2.5/src/components/Tagger/studios/StudioTagger.tsx b/ui/v2.5/src/components/Tagger/studios/StudioTagger.tsx
index b7b717f7b..968b66b57 100644
--- a/ui/v2.5/src/components/Tagger/studios/StudioTagger.tsx
+++ b/ui/v2.5/src/components/Tagger/studios/StudioTagger.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from "react";
+import React, { useEffect, useMemo, useState } from "react";
 import { Button, Card, Form, InputGroup, ProgressBar } from "react-bootstrap";
 import { FormattedMessage, useIntl } from "react-intl";
 import { Link } from "react-router-dom";
@@ -181,6 +181,13 @@ const StudioTaggerList: React.FC<IStudioTaggerListProps> = ({
     });
   };
 
+  // clear tagged studios when source is changed
+  useEffect(() => {
+    setTaggedStudios({});
+    setSearchResults({});
+    setSearchErrors({});
+  }, [selectedEndpoint]);
+
   const [createStudio] = useStudioCreate();
   const updateStudio = useUpdateStudio();
 
@@ -501,8 +508,6 @@ export const StudioTagger: React.FC<ITaggerProps> = ({ studios }) => {
     }
   }, [jobsSubscribe, batchJobID]);
 
-  if (!config) return <LoadingIndicator />;
-
   const savedEndpointIndex =
     stashConfig?.general.stashBoxes.findIndex(
       (s) => s.endpoint === config.selectedEndpoint
@@ -514,6 +519,16 @@ export const StudioTagger: React.FC<ITaggerProps> = ({ studios }) => {
   const selectedEndpoint =
     stashConfig?.general.stashBoxes[selectedEndpointIndex];
 
+  const selectedEndpointInput = useMemo(
+    () => ({
+      endpoint: selectedEndpoint.endpoint,
+      index: selectedEndpointIndex,
+    }),
+    [selectedEndpoint, selectedEndpointIndex]
+  );
+
+  if (!config) return <LoadingIndicator />;
+
   async function batchAdd(studioInput: string, createParent: boolean) {
     if (studioInput && selectedEndpoint) {
       const inputs = studioInput
@@ -683,10 +698,7 @@ export const StudioTagger: React.FC<ITaggerProps> = ({ studios }) => {
 
         <StudioTaggerList
           studios={studios}
-          selectedEndpoint={{
-            endpoint: selectedEndpoint.endpoint,
-            index: selectedEndpointIndex,
-          }}
+          selectedEndpoint={selectedEndpointInput}
           isIdle={batchJobID === undefined}
           config={config}
           onBatchAdd={batchAdd}
diff --git a/ui/v2.5/src/components/Tagger/tags/TagTagger.tsx b/ui/v2.5/src/components/Tagger/tags/TagTagger.tsx
index e3674635d..4db71de0c 100644
--- a/ui/v2.5/src/components/Tagger/tags/TagTagger.tsx
+++ b/ui/v2.5/src/components/Tagger/tags/TagTagger.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from "react";
+import React, { useEffect, useMemo, useState } from "react";
 import { Button, Card, Form, InputGroup, ProgressBar } from "react-bootstrap";
 import { FormattedMessage, useIntl } from "react-intl";
 import { Link } from "react-router-dom";
@@ -263,6 +263,13 @@ const TagTaggerList: React.FC<ITagTaggerListProps> = ({
     });
   };
 
+  // clear tagged tags when source is changed
+  useEffect(() => {
+    setTaggedTags({});
+    setSearchResults({});
+    setSearchErrors({});
+  }, [selectedEndpoint]);
+
   const renderTags = () =>
     tags.map((tag) => {
       const isTagged = taggedTags[tag.id];
@@ -504,8 +511,6 @@ export const TagTagger: React.FC<ITaggerProps> = ({ tags }) => {
     }
   }, [jobsSubscribe, batchJobID]);
 
-  if (!config) return <LoadingIndicator />;
-
   const savedEndpointIndex =
     stashConfig?.general.stashBoxes.findIndex(
       (s) => s.endpoint === config.selectedEndpoint
@@ -517,6 +522,16 @@ export const TagTagger: React.FC<ITaggerProps> = ({ tags }) => {
   const selectedEndpoint =
     stashConfig?.general.stashBoxes[selectedEndpointIndex];
 
+  const selectedEndpointInput = useMemo(
+    () => ({
+      endpoint: selectedEndpoint.endpoint,
+      index: selectedEndpointIndex,
+    }),
+    [selectedEndpoint, selectedEndpointIndex]
+  );
+
+  if (!config) return <LoadingIndicator />;
+
   async function batchAdd(tagInput: string, createParent: boolean) {
     if (tagInput && selectedEndpoint) {
       const inputs = tagInput
@@ -679,10 +694,7 @@ export const TagTagger: React.FC<ITaggerProps> = ({ tags }) => {
 
         <TagTaggerList
           tags={tags}
-          selectedEndpoint={{
-            endpoint: selectedEndpoint.endpoint,
-            index: selectedEndpointIndex,
-          }}
+          selectedEndpoint={selectedEndpointInput}
           isIdle={batchJobID === undefined}
           config={config}
           onBatchAdd={batchAdd}

From b70922488b6d10b138f9aaf6cdef3a34e494844c Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Mon, 30 Mar 2026 11:57:28 +1100
Subject: [PATCH 404/405] Update changelog

---
 ui/v2.5/src/docs/en/Changelog/v0310.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/ui/v2.5/src/docs/en/Changelog/v0310.md b/ui/v2.5/src/docs/en/Changelog/v0310.md
index d7403c3b7..a2d7b6a28 100644
--- a/ui/v2.5/src/docs/en/Changelog/v0310.md
+++ b/ui/v2.5/src/docs/en/Changelog/v0310.md
@@ -56,6 +56,7 @@
 * Name is now populated when searching by stash-box. ([#6447](https://github.com/stashapp/stash/pull/6447))
 * Improved performance of group queries on large systems. ([#6478](https://github.com/stashapp/stash/pull/6478))
 * Search input is now focused when opening the scraper menu. ([#6704](https://github.com/stashapp/stash/pull/6704))
+* Added `d d` keyboard shortcut to delete scene in scene details page. ([#6755](https://github.com/stashapp/stash/pull/6755))
 * VAAPI dri device can now be overridden using `STASH_HW_DRI_DEVICE` environment variable. ([#6728](https://github.com/stashapp/stash/pull/6728))
 * Added support for `{phash}` in `queryURL` scraper field. ([#6701](https://github.com/stashapp/stash/pull/6701))
 * Systray notification now shows the port stash is running on. ([#6448](https://github.com/stashapp/stash/pull/6448))
@@ -73,10 +74,17 @@
 * Fixed mis-clicks on cards navigating to new page when selecting items. ([#6599](https://github.com/stashapp/stash/pull/6599), [#6649](https://github.com/stashapp/stash/pull/6649))
 * Select dropdown now retains focus after creating a new option. ([#6697](https://github.com/stashapp/stash/pull/6697))
 * Fixed custom field filtering not working correctly when query value was provided. ([#6614](https://github.com/stashapp/stash/pull/6614))
+* Fixed `not equals` custom field filtering to include results where the field is not set. ([#6742](https://github.com/stashapp/stash/pull/6742))
+* Fixed `Scale up to fit` lightbox option not persisting correctly in some circumstances. ([#6743](https://github.com/stashapp/stash/pull/6743))
 * Fixed stale thumbnails after file content is changed. ([#6622](https://github.com/stashapp/stash/pull/6622))
 * Clicking on the scrubber in the scene player no longer pauses the video. ([#6336](https://github.com/stashapp/stash/pull/6336))
+* Tagger search results and states are now refreshed when changing the selected source in the tagger views. ([#6766](https://github.com/stashapp/stash/pull/6766))
+* Current selected source items are now excluded from the destination selector and vice versa in the merge dialogs. ([#6764](https://github.com/stashapp/stash/pull/6764))
+* Fixed heatmap still appearing in the scene detail page after associated funscript was removed from scene. ([#6746](https://github.com/stashapp/stash/pull/6746))
 * Fixed string-based hash filtering not functioning correctly. ([#6654](https://github.com/stashapp/stash/pull/6654))
 * Fixed hardware decoding detection for 10-bit videos on rkmpp. ([#6420](https://github.com/stashapp/stash/pull/6420))
+* Fixed race condition in package cache initialisation. ([#6741](https://github.com/stashapp/stash/pull/6741))
+* Unicode characters are no longer stripped when performing a metadata export. ([#6748](https://github.com/stashapp/stash/pull/6748))
 
 ### Api Changes
 

From 2da8074316f4f362eeb95bd7d33053e843a117e7 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Mon, 30 Mar 2026 12:26:04 +1100
Subject: [PATCH 405/405] Codeberg weblate translation update (#6767)

* Translated using Weblate (French)

Currently translated at 100.0% (1341 of 1341 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/fr/

* Translated using Weblate (Turkish)

Currently translated at 75.3% (1010 of 1341 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/tr/

* Translated using Weblate (Ukrainian)

Currently translated at 100.0% (1341 of 1341 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/uk/

* Translated using Weblate (French)

Currently translated at 99.9% (1345 of 1346 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/fr/

* Translated using Weblate (Korean)

Currently translated at 100.0% (1346 of 1346 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/ko/

* Translated using Weblate (French)

Currently translated at 100.0% (1346 of 1346 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/fr/

* Translated using Weblate (Ukrainian)

Currently translated at 100.0% (1346 of 1346 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/uk/

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (1346 of 1346 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/zh_Hans/

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 67.3% (906 of 1346 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/pt_BR/

* Update translation files

Updated by "Cleanup translation files" add-on in Weblate.

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/

* Translated using Weblate (French)

Currently translated at 100.0% (1348 of 1348 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/fr/

* Translated using Weblate (Czech)

Currently translated at 100.0% (1351 of 1351 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/cs/

* Translated using Weblate (Spanish)

Currently translated at 100.0% (1351 of 1351 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/es/

* Translated using Weblate (Korean)

Currently translated at 100.0% (1351 of 1351 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/ko/

* Translated using Weblate (Ukrainian)

Currently translated at 100.0% (1351 of 1351 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/uk/

* Translated using Weblate (French)

Currently translated at 100.0% (1351 of 1351 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/fr/

* Translated using Weblate (Spanish)

Currently translated at 100.0% (1351 of 1351 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/es/

* Translated using Weblate (Arabic)

Currently translated at 56.9% (769 of 1351 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/ar/

* Translated using Weblate (Polish)

Currently translated at 80.1% (1083 of 1351 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/pl/

* Translated using Weblate (Ukrainian)

Currently translated at 100.0% (1351 of 1351 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/uk/

* Translated using Weblate (Arabic)

Currently translated at 58.0% (784 of 1351 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/ar/

---------

Co-authored-by: doodoo <doodoo@noreply.codeberg.org>
Co-authored-by: slickdaddy <slickdaddy@noreply.codeberg.org>
Co-authored-by: Saenko <saenko@noreply.codeberg.org>
Co-authored-by: lugged9922 <lugged9922@noreply.codeberg.org>
Co-authored-by: wql219 <wql219@noreply.codeberg.org>
Co-authored-by: tiagodamian <tiagodamian@noreply.codeberg.org>
Co-authored-by: Codeberg Translate <translate@codeberg.org>
Co-authored-by: NymeriaCZ <nymeriacz@noreply.codeberg.org>
Co-authored-by: donlothario <donlothario@noreply.codeberg.org>
Co-authored-by: gallegonovato <gallegonovato@noreply.codeberg.org>
Co-authored-by: interj4 <interj4@noreply.codeberg.org>
Co-authored-by: brnd <brnd@noreply.codeberg.org>
---
 ui/v2.5/src/locales/ar.json    | 422 ++++++++++++++++++++++++++++++++-
 ui/v2.5/src/locales/bg-BG.json |   2 -
 ui/v2.5/src/locales/bn-BD.json |   2 -
 ui/v2.5/src/locales/ca-ES.json |   2 -
 ui/v2.5/src/locales/cs-CZ.json | 275 ++++++++++++++-------
 ui/v2.5/src/locales/da-DK.json |   2 -
 ui/v2.5/src/locales/de-DE.json |   2 -
 ui/v2.5/src/locales/es-ES.json |  55 +++--
 ui/v2.5/src/locales/et-EE.json |   2 -
 ui/v2.5/src/locales/fi-FI.json |   2 -
 ui/v2.5/src/locales/fr-FR.json |  41 +++-
 ui/v2.5/src/locales/hr-HR.json |   2 -
 ui/v2.5/src/locales/hu-HU.json |   3 +-
 ui/v2.5/src/locales/id-ID.json |   2 -
 ui/v2.5/src/locales/it-IT.json |   2 -
 ui/v2.5/src/locales/ja-JP.json |   2 -
 ui/v2.5/src/locales/ko-KR.json |  41 +++-
 ui/v2.5/src/locales/nb-NO.json |   2 -
 ui/v2.5/src/locales/nl-NL.json |   2 -
 ui/v2.5/src/locales/pl-PL.json |  57 ++++-
 ui/v2.5/src/locales/pt-BR.json | 112 ++++++---
 ui/v2.5/src/locales/ro-RO.json |   2 -
 ui/v2.5/src/locales/ru-RU.json |   2 -
 ui/v2.5/src/locales/sv-SE.json |   2 -
 ui/v2.5/src/locales/th-TH.json |   2 -
 ui/v2.5/src/locales/tr-TR.json |  21 +-
 ui/v2.5/src/locales/uk-UA.json |  59 +++--
 ui/v2.5/src/locales/vi-VN.json |   2 -
 ui/v2.5/src/locales/zh-CN.json |  38 ++-
 ui/v2.5/src/locales/zh-TW.json |   2 -
 30 files changed, 916 insertions(+), 246 deletions(-)

diff --git a/ui/v2.5/src/locales/ar.json b/ui/v2.5/src/locales/ar.json
index 41718177d..af98b4054 100644
--- a/ui/v2.5/src/locales/ar.json
+++ b/ui/v2.5/src/locales/ar.json
@@ -253,12 +253,12 @@
             "latest_version": "أحدث إصدار",
             "latest_version_build_hash": "أحدث إصدار من رقم البناء:",
             "release_date": "تاريخ الاصدار:",
-            "stash_discord": "انضم إلى {url} قناتنا",
             "stash_home": "صفحة ستاش {url}",
-            "stash_open_collective": "ادعمونا من خلال {url}",
             "stash_wiki": "موقع ستاش {url}",
             "version": "إصدار",
-            "new_version_notice": "[NEW]"
+            "new_version_notice": "[NEW]",
+            "stash_community": "انضم إلى سيرفر مجتمعنا {forumUrl} أو {discordUrl}.",
+            "support_us": "ادعمونا من خلال {openCollectiveUrl} أو {githubSponsorsUrl}."
         },
         "advanced_mode": "الوضع المتقدم",
         "application_paths": {
@@ -267,7 +267,7 @@
         "categories": {
             "about": "حول",
             "changelog": "سجل التغييرات",
-            "interface": "واجهة المستخدم",
+            "interface": "الواجهة",
             "logs": "سجلات",
             "metadata_providers": "موفرو البيانات الوصفية",
             "plugins": "الإضافات",
@@ -618,7 +618,11 @@
                 "scanning_paths": "مسح المسارات التالية"
             },
             "scan_for_content_desc": "قم بمسح المحتوى الجديد وإضافته إلى قاعدة البيانات.",
-            "set_name_date_details_from_metadata_if_present": "قم بتعيين الاسم والتاريخ والتفاصيل من بيانات تعريف الملف المضمنة"
+            "set_name_date_details_from_metadata_if_present": "قم بتعيين الاسم والتاريخ والتفاصيل من بيانات تعريف الملف المضمنة",
+            "auto_tag_confirm": "سيحاول هذا مطابقة المحتوى الخاص بك مع البيانات الوصفية الموجودة.",
+            "auto_tag_warning": "لا يمكن التراجع عن هذه العملية وقد ينتج عنها تطابقات غير صحيحة.",
+            "clean_ignore_zip_contents": "تجاهل محتويات ملف zip",
+            "clean_ignore_zip_contents_desc": "أسرع، لكنه قد لا يتعرف على الملفات المحذوفة داخل ملفات zip. يُنصح بتفعيله إذا لم تقم بحذف الملفات داخل ملفات zip."
         },
         "tools": {
             "graphql_playground": "بيئة اختبار GraphQL",
@@ -653,8 +657,414 @@
                 "option_label": "تم تفعيل CSS المخصص"
             },
             "troubleshooting_mode": {
-                "button": "وضع استكشاف الأخطاء وإصلاحها"
+                "button": "وضع استكشاف الأخطاء وإصلاحها",
+                "dialog_title": "تفعيل وضع استكشاف الأخطاء وإصلاحها",
+                "dialog_description": "سيؤدي هذا إلى تعطيل جميع التخصيصات مؤقتًا للمساعدة في تشخيص المشكلات:",
+                "dialog_item_plugins": "جميع الإضافات",
+                "dialog_item_css": "CSS مخصص",
+                "dialog_item_js": "جافا سكريبت مخصصة",
+                "dialog_item_locales": "لغات مخصصة",
+                "dialog_log_level": "سيتم ضبط مستوى التسجيل على وضع التصحيح لإجراء تشخيصات مفصلة.",
+                "dialog_reload_note": "ستتم إعادة تحميل الصفحة تلقائيًا.",
+                "enable": "تفعيل وإعادة تحميل",
+                "overlay_message": "وضع استكشاف الأخطاء وإصلاحها مُفعّل - جميع التخصيصات مُعطّلة",
+                "exit": "خروج"
+            },
+            "custom_javascript": {
+                "description": "يجب إعادة تحميل الصفحة لتطبيق التغييرات. لا يوجد ضمان للتوافق بين جافا سكريبت المخصصة والإصدارات المستقبلية من Stash.",
+                "heading": "جافا سكريبت مخصصة",
+                "option_label": "تم تفعيل جافا سكريبت المخصصة"
+            },
+            "custom_locales": {
+                "description": "يمكنك تجاوز سلاسل اللغة الفردية. راجع https://github.com/stashapp/stash/blob/develop/ui/v2.5/src/locales/en-GB.json للاطلاع على القائمة الرئيسية. يجب إعادة تحميل الصفحة لتطبيق التغييرات.",
+                "heading": "توطين مخصص",
+                "option_label": "تم تفعيل التوطين المخصص"
+            },
+            "custom_title": {
+                "description": "نص مخصص يُضاف إلى عنوان الصفحة. إذا كان فارغًا، فسيتم استخدام كلمة 'Stash' افتراضيًا.",
+                "heading": "عنوان مخصص"
+            },
+            "delete_options": {
+                "description": "الإعدادات الافتراضية عند حذف الصور والمعارض والمشاهد.",
+                "heading": "حذف الخيارات",
+                "options": {
+                    "delete_file": "حذف الملف افتراضيًا",
+                    "delete_generated_supporting_files": "حذف الملفات الداعمة التي تم إنشاؤها افتراضيًا"
+                }
+            },
+            "desktop_integration": {
+                "desktop_integration": "تكامل سطح المكتب",
+                "notifications_enabled": "تفعيل الإشعارات",
+                "send_desktop_notifications_for_events": "إرسال إشعارات سطح المكتب للأحداث.",
+                "skip_opening_browser": "تخطَّ فتح المتصفح",
+                "skip_opening_browser_on_startup": "تخطّي فتح المتصفح تلقائيًا أثناء بدء التشغيل."
+            },
+            "detail": {
+                "compact_expanded_details": {
+                    "description": "عند تفعيل هذا الخيار، سيتم عرض تفاصيل موسعة مع الحفاظ على عرض موجز.",
+                    "heading": "تفاصيل موسعة مختصرة"
+                },
+                "enable_background_image": {
+                    "description": "عرض صورة الخلفية في صفحة التفاصيل.",
+                    "heading": "تفعيل صورة الخلفية"
+                },
+                "heading": "صفحة التفاصيل",
+                "show_all_details": {
+                    "description": "عند التفعيل، ستظهر جميع تفاصيل المحتوى بشكل افتراضي، وسيتم وضع كل عنصر من عناصر التفاصيل تحت عمود واحد.",
+                    "heading": "عرض جميع التفاصيل"
+                },
+                "show_studio_text": {
+                    "description": "اعرض اسم الاستوديو دائمًا كنص في صفحات التفاصيل بدلاً من رمز.",
+                    "heading": "عرض الاستوديو كنص"
+                }
+            },
+            "editing": {
+                "disable_dropdown_create": {
+                    "description": "قم بإزالة إمكانية إنشاء كائنات جديدة من محددات القائمة المنسدلة.",
+                    "heading": "تعطيل إنشاء القائمة المنسدلة"
+                },
+                "heading": "تحرير",
+                "max_options_shown": {
+                    "label": "الحد الأقصى لعدد العناصر التي ستظهر في القوائم المنسدلة المختارة"
+                },
+                "rating_system": {
+                    "star_precision": {
+                        "label": "دقة تصنيف النجوم",
+                        "options": {
+                            "full": "كامل",
+                            "half": "نصف",
+                            "quarter": "ربع",
+                            "tenth": "عشر"
+                        }
+                    },
+                    "type": {
+                        "label": "نوع نظام التصنيف",
+                        "options": {
+                            "decimal": "عشري",
+                            "stars": "النجوم"
+                        }
+                    }
+                }
+            },
+            "funscript_offset": {
+                "description": "إزاحة زمنية بالمللي ثانية لتشغيل النصوص التفاعلية.",
+                "heading": "إزاحة Funscript (مللي ثانية)"
+            },
+            "handy_connection": {
+                "connect": "اتصل",
+                "server_offset": {
+                    "heading": "إزاحة الخادم"
+                },
+                "status": {
+                    "heading": "حالة اتصال سهلة الاستخدام"
+                },
+                "sync": "مزامنة"
+            },
+            "handy_connection_key": {
+                "description": "مفتاح اتصال عملي يُستخدم للمشاهد التفاعلية. سيسمح ضبط هذا المفتاح لبرنامج Stash بمشاركة معلومات المشهد الحالي مع موقع handyfeeling.com.",
+                "heading": "مفتاح توصيل عملي"
+            },
+            "image_lightbox": {
+                "heading": "معرض الصور"
+            },
+            "image_wall": {
+                "direction": "اتجاه",
+                "heading": "جدار الصور",
+                "margin": "الهامش (بالبكسل)"
+            },
+            "images": {
+                "heading": "صور",
+                "options": {
+                    "create_image_clips_from_videos": {
+                        "description": "عندما تكون مقاطع الفيديو معطلة في مكتبة ما، سيتم فحص ملفات الفيديو (انظر ملحقات الفيديو) كمقاطع صور.",
+                        "heading": "قم بمسح امتدادات الفيديو كمقاطع صور"
+                    },
+                    "write_image_thumbnails": {
+                        "description": "كتابة الصور المصغرة على القرص عند إنشائها أثناء التشغيل.",
+                        "heading": "اكتب صورًا مصغرة"
+                    }
+                }
+            },
+            "interactive_options": "خيارات تفاعلية",
+            "language": {
+                "heading": "الغة"
+            },
+            "max_loop_duration": {
+                "description": "أقصى مدة عرض للمشهد حيث يقوم مشغل المشهد بتكرار الفيديو. اضبط القيمة على 0 لتعطيل هذه الخاصية.",
+                "heading": "أقصى مدة للتكرار"
+            },
+            "menu_items": {
+                "description": "إظهار أو إخفاء أنواع مختلفة من المحتوى على شريط التنقل.",
+                "heading": "أصناف القائمة"
+            },
+            "minimum_play_percent": {
+                "description": "النسبة المئوية للوقت الذي يجب فيه تشغيل مشهد ما قبل زيادة عدد مرات تشغيله.",
+                "heading": "الحد الأدنى لنسبة التشغيل"
+            },
+            "performers": {
+                "options": {
+                    "image_location": {
+                        "description": "مسار مخصص لصور المؤدي الافتراضية. اتركه فارغًا لاستخدام الإعدادات الافتراضية المدمجة.",
+                        "heading": "مسار صورة المؤدي المخصص"
+                    }
+                }
+            },
+            "preview_type": {
+                "description": "الخيار الافتراضي هو معاينات الفيديو (mp4). لتقليل استهلاك وحدة المعالجة المركزية أثناء التصفح، يمكنك استخدام معاينات الصور المتحركة (webp). مع ذلك، يجب إنشاء هذه المعاينات بشكل منفصل عن معاينات الفيديو، وهي ملفات أكبر حجمًا.",
+                "heading": "نوع المعاينة",
+                "options": {
+                    "animated": "صورة متحركة",
+                    "static": "صورة ثابتة",
+                    "video": "فيديو"
+                }
+            },
+            "scene_list": {
+                "heading": "عرض شبكي",
+                "options": {
+                    "show_studio_as_text": "عرض طبقة الاستوديو كنص",
+                    "show_studio_as_text_desc": "يظهر شعار الاستوديو افتراضيًا على البطاقات في العرض الشبكي. فعّل هذا الخيار لعرض اسم الاستوديو كنص دائمًا."
+                }
+            },
+            "scene_player": {
+                "heading": "مشغل المشهد",
+                "options": {
+                    "always_start_from_beginning": "ابدأ تشغيل الفيديو دائمًا من البداية",
+                    "auto_start_video": "تشغيل الفيديو تلقائيًا",
+                    "auto_start_video_on_play_selected": {
+                        "description": "تشغيل مقاطع الفيديو تلقائيًا عند التشغيل من قائمة الانتظار، أو عند تشغيل مقاطع فيديو محددة أو عشوائية من صفحة المشاهد.",
+                        "heading": "بدء تشغيل الفيديو تلقائيًا عند تشغيل الفيديو المحدد"
+                    },
+                    "continue_playlist_default": {
+                        "description": "قم بتشغيل المشهد التالي في قائمة الانتظار عند انتهاء الفيديو.",
+                        "heading": "متابعة قائمة التشغيل افتراضيًا"
+                    },
+                    "disable_mobile_media_auto_rotate": "تعطيل خاصية التدوير التلقائي للوسائط بملء الشاشة على الهاتف المحمول",
+                    "enable_chromecast": "تفعيل Chromecast",
+                    "show_ab_loop_controls": "عرض عناصر التحكم في حلقة AB",
+                    "show_scrubber": "اظهر مستخرج البيانات",
+                    "show_range_markers": "إظهار علامات المدى",
+                    "track_activity": "تفعيل سجل تشغيل المشهد",
+                    "vr_tag": {
+                        "description": "لن يظهر زر الواقع الافتراضي إلا للمشاهد التي تحمل هذه العلامة.",
+                        "heading": "علامة الواقع الافتراضي"
+                    }
+                }
+            },
+            "scene_view": {
+                "heading": "عرض المشهد",
+                "options": {
+                    "preview_volume": {
+                        "description": "مستوى صوت المعاينة عند تمرير المؤشر فوق المشهد. اضبطه على 0 لكتم الصوت.",
+                        "heading": "مستوى صوت المعاينة"
+                    }
+                }
+            },
+            "scene_wall": {
+                "heading": "جدار مشهد / العلامات",
+                "options": {
+                    "display_title": "عرض العنوان والوسوم",
+                    "toggle_sound": "تفعيل الصوت عند تمرير المؤشر فوق المعاينة"
+                }
+            },
+            "scroll_attempts_before_change": {
+                "description": "عدد مرات محاولة التمرير قبل الانتقال إلى العنصر التالي/السابق. ينطبق هذا فقط على وضع التمرير Pan Y.",
+                "heading": "محاولات التمرير قبل الانتقال"
+            },
+            "sfw_mode": {
+                "description": "فعّل هذا الخيار إذا كنت تستخدم خاصية التخزين المؤقت لحفظ المحتوى المناسب لجميع الأعمار. يُخفي هذا الخيار أو يُغيّر بعض جوانب واجهة المستخدم المتعلقة بالمحتوى المخصص للبالغين.",
+                "heading": "وضع المحتوى الآمن للعمل"
+            },
+            "show_tag_card_on_hover": {
+                "description": "أظهر بطاقة التعريف عند تمرير مؤشر الماوس فوق شارات التعريف.",
+                "heading": "تلميحات أدوات بطاقة العلامة"
+            },
+            "slideshow_delay": {
+                "description": "تتوفر خاصية عرض الشرائح في المعارض عند استخدام وضع عرض الحائط.",
+                "heading": "تأخير عرض الشرائح (بالثواني)"
+            },
+            "studio_panel": {
+                "heading": "عرض الاستوديو",
+                "options": {
+                    "show_child_studio_content": {
+                        "description": "في عرض الاستوديو، اعرض المحتوى من الاستوديوهات الفرعية أيضًا.",
+                        "heading": "عرض محتوى الاستوديوهات الفرعية"
+                    }
+                }
+            },
+            "performer_list": {
+                "heading": "قائمة المؤدين",
+                "options": {
+                    "show_links_on_grid_card": {
+                        "heading": "عرض الروابط على بطاقات شبكة المؤدي"
+                    }
+                }
+            },
+            "tag_panel": {
+                "heading": "عرض الوسوم",
+                "options": {
+                    "show_child_tagged_content": {
+                        "description": "في عرض الوسوم، اعرض المحتوى من الوسوم الفرعية أيضًا.",
+                        "heading": "عرض محتوى العلامات الفرعية"
+                    }
+                }
+            },
+            "title": "واجهة المستخدم",
+            "use_stash_hosted_funscript": {
+                "description": "عند تفعيل هذه الميزة، سيتم تقديم البرامج النصية مباشرةً من Stash إلى جهاز Handy الخاص بك دون استخدام خادم Handy تابع لجهة خارجية. يتطلب ذلك إمكانية الوصول إلى Stash من جهاز Handy الخاص بك، وإنشاء مفتاح API إذا كانت بيانات اعتماد Stash مُهيأة.",
+                "heading": "قم بتشغيل البرامج النصية الوظيفية مباشرة"
             }
         }
+    },
+    "configuration": "إعدادات",
+    "connection_monitor": {
+        "websocket_connection_failed": "تعذر إنشاء اتصال WebSocket: راجع وحدة تحكم المتصفح لمزيد من التفاصيل",
+        "websocket_connection_reestablished": "تمت إعادة إنشاء اتصال Websocket"
+    },
+    "containing_group": "مجموعة احتواء",
+    "containing_group_count": "عدد المجموعات المحتوية",
+    "containing_groups": "مجموعات تحتوي",
+    "country": "دولة",
+    "cover_image": "صورة الغلاف",
+    "created_at": "تم الإنشاء في",
+    "criterion": {
+        "greater_than": "أكبر من",
+        "less_than": "أقل من",
+        "value": "قيمة"
+    },
+    "criterion_modifier": {
+        "between": "بين",
+        "equals": "يكون",
+        "excludes": "استبعد",
+        "greater_than": "يكون أكبر من",
+        "includes": "يشمل",
+        "includes_all": "يشمل كل شيء",
+        "is_null": "يكون فارغ",
+        "less_than": "يكون أقل من",
+        "matches_regex": "يطابق التعبير النمطي",
+        "not_between": "ليس بين",
+        "not_equals": "ليس",
+        "not_matches_regex": "لا يتطابق مع التعبير النمطي",
+        "not_null": "ليس فارغًا"
+    },
+    "criterion_modifier_values": {
+        "any": "أي",
+        "any_of": "أي من",
+        "none": "لا شيء",
+        "only": "فقط"
+    },
+    "custom": "مخصص",
+    "custom_fields": {
+        "field": "حقل",
+        "title": "الحقول المخصصة",
+        "value": "قيمة"
+    },
+    "date": "تاريخ",
+    "date_format": "سنة-شهر-يوم",
+    "datetime_format": "سنة-شهر-يوم ساعة:دقيقة",
+    "death_date": "تاريخ الوفاة",
+    "death_year": "سنة الوفاة",
+    "descending": "تنازلي",
+    "description": "وصف",
+    "detail": "التفاصيل",
+    "details": "تفاصيل",
+    "developmentVersion": "نسخة التطوير",
+    "dialogs": {
+        "clear_o_history_confirm": "هل أنت متأكد من رغبتك في مسح سجل الاستمناء؟",
+        "clear_o_history_confirm_sfw": "هل أنت متأكد من رغبتك في مسح سجل الإعجابات؟",
+        "clear_play_history_confirm": "هل أنت متأكد من رغبتك في مسح سجل التشغيل؟",
+        "create_new_entity": "إنشاء كيان جديد {entity}",
+        "delete_alert": "سيتم حذف {count, plural, one {{singularEntity}} other {{pluralEntity}}} نهائياً:",
+        "delete_alert_to_trash": "سيتم نقل {count, plural, one {{singularEntity}} other {{pluralEntity}}} إلى سلة المهملات:",
+        "delete_confirm": "هل أنت متأكد من رغبتك في حذف {entityName}؟",
+        "delete_galleries_extra": "...بالإضافة إلى أي ملفات صور غير مرفقة بأي معرض آخر.",
+        "delete_gallery_files": "احذف مجلد المعرض/ملف zip وأي صور غير مرفقة بأي معرض آخر.",
+        "delete_object_desc": "هل أنت متأكد من رغبتك في حذف {count, plural, one {this {singularEntity}} other {these {pluralEntity}}}؟",
+        "delete_object_overflow": "…و {count} غير {count, plural, one {{singularEntity}} other {{pluralEntity}}}.",
+        "delete_object_title": "حذف {count, plural, one {{singularEntity}} other {{pluralEntity}}}",
+        "dont_show_until_updated": "لا يظهر حتى التحديث التالي",
+        "edit_entity_title": "تعديل {count, plural, one {{singularEntity}} other {{pluralEntity}}}",
+        "edit_entity_count_title": "تعديل {count} {count, plural, one {{singularEntity}} other {{pluralEntity}}}",
+        "export_include_related_objects": "قم بتضمين الكائنات ذات الصلة في عملية التصدير",
+        "export_title": "تصدير",
+        "imagewall": {
+            "direction": {
+                "column": "عمود",
+                "description": "تخطيط قائم على الأعمدة أو الصفوف.",
+                "row": "صف"
+            },
+            "margin_desc": "عدد وحدات البكسل الهامشية حول كل صورة بالكامل."
+        },
+        "lightbox": {
+            "delay": "التأخير (ثانية)",
+            "disable_animation": "تعطيل حركة الانتقال بين الصور",
+            "display_mode": {
+                "fit_horizontally": "مناسب أفقيا",
+                "fit_to_screen": "مناسب للشاشة",
+                "label": "وضع العرض",
+                "original": "أصلي"
+            },
+            "options": "خيارات",
+            "page_header": "الصفحة {page} / {total}",
+            "reset_zoom_on_nav": "أعد ضبط مستوى التكبير عند تغيير الصورة",
+            "scale_up": {
+                "description": "قم بتكبير الصور الصغيرة لملء الشاشة.",
+                "label": "قم بتكبيره ليناسب"
+            },
+            "scroll_mode": {
+                "description": "اضغط باستمرار على مفتاح Shift لاستخدام وضع آخر مؤقتًا.",
+                "label": "وضع التمرير",
+                "zoom": "تكبير"
+            }
+        },
+        "merge": {
+            "combined": "مركب",
+            "destination": "وجهة",
+            "empty_results": "ستبقى قيم حقل الوجهة دون تغيير.",
+            "source": "مصدر"
+        },
+        "overwrite_filter_warning": "سيتم استبدال عامل التصفية المحفوظ \"{entityName}\".",
+        "performers_found": "تم العثور على {count} مؤدي",
+        "stashid_exists_warning": "سيتم استبدال معرف لهذا stash-box.",
+        "reassign_files": {
+            "destination": "إعادة التعيين إلى"
+        },
+        "scene_gen": {
+            "clip_previews": "معاينات مقاطع الصور",
+            "covers": "مشاهد الغلاف",
+            "force_transcodes": "توليد رمز التحويل القسري",
+            "force_transcodes_tooltip": "افتراضياً، لا يتم إنشاء عمليات إعادة الترميز إلا عندما يكون ملف الفيديو غير مدعوم في المتصفح. عند التفعيل، سيتم إنشاء عمليات إعادة الترميز حتى عندما يبدو أن ملف الفيديو مدعوم في المتصفح.",
+            "image_phash": "تجزئات الإدراك البصري للصور",
+            "image_phash_tooltip": "لأغراض إزالة التكرار والتعرف على البيانات",
+            "image_previews": "معاينات الصور المتحركة",
+            "image_previews_tooltip": "كما يُمكن إنشاء معاينات متحركة (webp)، وهي مطلوبة فقط عند ضبط نوع معاينة المشهد/جدار العلامة على صورة متحركة. تستهلك هذه المعاينات موارد أقل من وحدة المعالجة المركزية مقارنةً بمعاينات الفيديو أثناء التصفح، ولكنها تُنشأ بالإضافة إليها وتكون ملفاتها أكبر حجمًا.",
+            "image_thumbnails": "صور مصغرة",
+            "interactive_heatmap_speed": "إنشاء خرائط حرارية وسرعات للمشاهد التفاعلية",
+            "marker_image_previews": "معاينات الصور المتحركة باستخدام العلامات",
+            "marker_image_previews_tooltip": "كما يُمكن إنشاء معاينات متحركة (webp)، وهي مطلوبة فقط عند ضبط نوع معاينة المشهد/جدار العلامة على صورة متحركة. تستهلك هذه المعاينات موارد أقل من وحدة المعالجة المركزية مقارنةً بمعاينات الفيديو أثناء التصفح، ولكنها تُنشأ بالإضافة إليها وتكون ملفاتها أكبر حجمًا.",
+            "marker_screenshots": "لقطات شاشة العلامات",
+            "marker_screenshots_tooltip": "صور JPG ثابتة للعلامات",
+            "markers": "معاينات العلامات",
+            "markers_tooltip": "مقاطع فيديو مدتها 20 ثانية تبدأ عند رمز الوقت المحدد.",
+            "override_preview_generation_options": "تجاوز خيارات إنشاء المعاينة",
+            "override_preview_generation_options_desc": "يمكنك تجاوز خيارات إنشاء المعاينة لهذه العملية. يتم تعيين الإعدادات الافتراضية في النظام -> إنشاء المعاينة.",
+            "overwrite": "استبدال الملفات الموجودة",
+            "phash": "التجزئة الإدراكية للفيديو",
+            "phash_tooltip": "لإزالة التكرارات وتحديد المشهد",
+            "preview_exclude_end_time_desc": "استبعد آخر x ثانية من معاينات المشاهد. يمكن أن تكون هذه القيمة بالثواني، أو نسبة مئوية (مثلاً 2%) من إجمالي مدة المشهد.",
+            "preview_exclude_end_time_head": "استبعاد وقت الانتهاء",
+            "preview_exclude_start_time_desc": "استبعد أول x ثانية من معاينات المشاهد. يمكن أن تكون هذه القيمة بالثواني، أو نسبة مئوية (مثلاً 2%) من إجمالي مدة المشهد.",
+            "preview_exclude_start_time_head": "استبعاد وقت البدء",
+            "preview_generation_options": "خيارات إنشاء المعاينة",
+            "preview_options": "خيارات المعاينة",
+            "preview_preset_desc": "يتحكم الإعداد المسبق في حجم وجودة ووقت ترميز معاينة الصور. أما الإعدادات المسبقة التي تتجاوز \"البطيء\" فتؤدي إلى نتائج متناقصة، لذا لا يُنصح باستخدامها.",
+            "preview_preset_head": "معاينة إعدادات الترميز المسبقة",
+            "preview_seg_count_desc": "عدد المقاطع في ملفات المعاينة.",
+            "preview_seg_count_head": "عدد المقاطع في المعاينة",
+            "preview_seg_duration_desc": "مدة كل مقطع معاينة، بالثواني.",
+            "preview_seg_duration_head": "مدة مقطع المعاينة",
+            "sprites": "رسومات مستخرج البيانات المشهد",
+            "sprites_tooltip": "مجموعة الصور المعروضة أسفل مشغل الفيديو لتسهيل التصفح.",
+            "transcodes": "محولات الترميز"
+        }
     }
 }
diff --git a/ui/v2.5/src/locales/bg-BG.json b/ui/v2.5/src/locales/bg-BG.json
index 2b056a0d6..595117899 100644
--- a/ui/v2.5/src/locales/bg-BG.json
+++ b/ui/v2.5/src/locales/bg-BG.json
@@ -232,9 +232,7 @@
             "latest_version_build_hash": "Хеш на билда на Последна Версия:",
             "new_version_notice": "[НОВО]",
             "release_date": "Дана за издаване:",
-            "stash_discord": "Присъедини се към нашият {url} канал",
             "stash_home": "Stash home на {url}",
-            "stash_open_collective": "Подкрепи ни чрез {url}",
             "stash_wiki": "Stash {url} страница",
             "version": "Версия"
         },
diff --git a/ui/v2.5/src/locales/bn-BD.json b/ui/v2.5/src/locales/bn-BD.json
index 6fed1cc7e..bd0efafed 100644
--- a/ui/v2.5/src/locales/bn-BD.json
+++ b/ui/v2.5/src/locales/bn-BD.json
@@ -192,9 +192,7 @@
             "latest_version": "সর্বশেষ সংস্করণ",
             "latest_version_build_hash": "সর্বশেষ সংস্করণের হ্যাশ নির্মাণ:",
             "new_version_notice": "{ নতুন }",
-            "stash_discord": "আমাদের {url} চ্যানেলে যুক্ত থাকুন",
             "stash_home": "স্টাস এর হোম {url} তে",
-            "stash_open_collective": "{url} এর মাধ্যমে আমাদের সাহায্য করুন",
             "stash_wiki": "স্টাস {url} এর পাতা",
             "version": "সংস্করণ",
             "release_date": "মুক্তির তারিখ:"
diff --git a/ui/v2.5/src/locales/ca-ES.json b/ui/v2.5/src/locales/ca-ES.json
index 68df3a33c..85cb9954e 100644
--- a/ui/v2.5/src/locales/ca-ES.json
+++ b/ui/v2.5/src/locales/ca-ES.json
@@ -370,9 +370,7 @@
             "latest_version_build_hash": "Hash de l'última versió:",
             "new_version_notice": "[NOVA]",
             "release_date": "Data de llançament:",
-            "stash_discord": "Uneix-te al nostre canal {url}",
             "stash_home": "Pàgina principal del projecte en {url}",
-            "stash_open_collective": "Donacions al projecte a través de {url}",
             "stash_wiki": "Pàgina web {url}",
             "version": "Versió"
         },
diff --git a/ui/v2.5/src/locales/cs-CZ.json b/ui/v2.5/src/locales/cs-CZ.json
index 7da949a9d..0b4b2b16e 100644
--- a/ui/v2.5/src/locales/cs-CZ.json
+++ b/ui/v2.5/src/locales/cs-CZ.json
@@ -7,7 +7,7 @@
         "allow": "Povolit",
         "allow_temporarily": "Povolit dočasně",
         "apply": "Použít",
-        "auto_tag": "Auto Tag",
+        "auto_tag": "Auto tag",
         "backup": "Záloha",
         "browse_for_image": "Vybrat obrázek…",
         "cancel": "Zrušit",
@@ -87,9 +87,9 @@
         "select_entity": "Vybrat {entityType}",
         "select_folders": "Vybrat složky",
         "select_none": "Vybrat nic",
-        "selective_auto_tag": "Selektivní Auto Tag",
+        "selective_auto_tag": "Selektivní auto tag",
         "selective_clean": "Selektivní čištění",
-        "selective_scan": "Selektivní Scan",
+        "selective_scan": "Selektivní scan",
         "set_as_default": "Nastavit jako výchozí",
         "set_back_image": "Zadní obrázek…",
         "set_front_image": "Přední obrázek…",
@@ -153,7 +153,13 @@
         "add_stash_id": "Přidat Stash ID",
         "create_new": "Vytvořit nový",
         "save_and_new": "Ulož & Nový",
-        "invert_selection": "Obrátit výběr"
+        "invert_selection": "Obrátit výběr",
+        "create_parent_tag": "Vytvořit nadřazený tag",
+        "exclude_lowercase": "vyloučit",
+        "from_clipboard": "Ze schránky",
+        "reveal_in_file_manager": "Zobrazit ve Správci souborů",
+        "select_directory": "Vyberte adresář",
+        "selective_generate": "Selektivní generování"
     },
     "actions_name": "Akce",
     "age": "Věk",
@@ -232,12 +238,12 @@
             "latest_version": "Nejnovější verze",
             "latest_version_build_hash": "Hash sestavení poslední verze:",
             "new_version_notice": "[NOVÝ]",
-            "stash_discord": "Připojte se na náš {url} kanál",
-            "stash_home": "Stash domovská stránka na {url}",
-            "stash_open_collective": "Podpořte nás skrze {url}",
-            "stash_wiki": "Stash {url} stránka",
+            "stash_home": "Navštivte Stash na {url}.",
+            "stash_wiki": "Podívejte se na webové stránky Stash {url}.",
             "version": "Verze",
-            "release_date": "Datum vydání:"
+            "release_date": "Datum vydání:",
+            "stash_community": "Připojte se k našemu komunitnímu serveru {forumUrl} nebo {discordUrl}.",
+            "support_us": "Podpořte nás prostřednictvím {openCollectiveUrl} nebo {githubSponsorsUrl}."
         },
         "application_paths": {
             "heading": "Cesta k aplikaci"
@@ -291,11 +297,11 @@
                 "generate_api_key": "Generovat API klíč",
                 "log_file": "Log soubor",
                 "log_file_desc": "Ceska k log souboru. Nechte prázdné pro zakázání logování. Vyžaduje restart.",
-                "log_http": "Zaznamenávat http přístup",
-                "log_http_desc": "Zaznamenávat http přístup do příkazové řádky. Vyžaduje restart.",
+                "log_http": "Zaznamenávat HTTP přístup",
+                "log_http_desc": "Zaznamenávat HTTP přístup do příkazové řádky. Vyžaduje restart.",
                 "log_to_terminal": "Logovat do příkazové řádky",
                 "log_to_terminal_desc": "Logovat do příkazové řádky kromě logování do terminálu. Vždy zapnuto pokud logování do souboru je zakázané. Vyžaduje restart.",
-                "maximum_session_age": "Maximální věk relace",
+                "maximum_session_age": "Maximální doba relace",
                 "maximum_session_age_desc": "Maximální doba nečinnosti před vypršením relace přihlášení, v sekundách. Vyžaduje restart.",
                 "password": "Heslo",
                 "password_desc": "Heslo pro přístup do aplikace. Ponechte prázdné pro vypnutí autentizace",
@@ -306,7 +312,7 @@
                 "log_file_max_size_desc": "Maximální velikost logu v megabytech před kompresí. 0MB pro deaktivaci. Vyžaduje restart."
             },
             "backup_directory_path": {
-                "description": "Adresář umístění záloh databáze SQLite",
+                "description": "Adresář umístění záloh databáze SQLite.",
                 "heading": "Cesta k adresáři záloh"
             },
             "cache_location": "Umístění adresáře mezipaměti. Vyžaduje se při streamování pomocí HLS (například na zařízeních Apple) nebo DASH.",
@@ -314,22 +320,22 @@
             "calculate_md5_and_ohash_desc": "Spočítat MD5 kontrolní součet kromě oshashe. Zapnutí zpomalí následující skenování. Hash dle názvu souboru musí být nastaven na oshash pro zrušení výpočtu MD5.",
             "calculate_md5_and_ohash_label": "Spočíst MD5 pro videa",
             "check_for_insecure_certificates": "Zkontrolujte nezabezpečené certifikáty",
-            "check_for_insecure_certificates_desc": "Některé weby používají nezabezpečené ssl certifikáty. Pokud není zaškrtnuto, scraper přeskočí kontrolu nezabezpečených certifikátů a povolí scraping těchto stránek. Pokud je při scrapingu zobrazena chyba certifikátu, zrušte zaškrtnutí.",
+            "check_for_insecure_certificates_desc": "Některé weby používají nezabezpečené SSL certifikáty. Pokud není zaškrtnuto, scraper přeskočí kontrolu nezabezpečených certifikátů a povolí scraping těchto stránek. Pokud je při scrapingu zobrazena chyba certifikátu, zrušte zaškrtnutí.",
             "chrome_cdp_path": "Cesta k Chrome CDP",
             "chrome_cdp_path_desc": "Cesta k exe souboru aplikace Chrome nebo vzdálená adresa (začínající http:// nebo https://, například http://localhost:9222/json/version) k instanci Chrome.",
             "create_galleries_from_folders_desc": "Je-li vybráno, budou vytvořeny galerie ze složek obsahující obrázky.",
             "create_galleries_from_folders_label": "Vytvářet galerie ze složek obsahující obrázky",
             "db_path_head": "Cesta k databázi",
             "directory_locations_to_your_content": "Adresa k Vašemu obsahu",
-            "excluded_image_gallery_patterns_desc": "Regulární výrazy obrázků a galerií (souborů / cest) pro výjimku ze skenování a přidání k čištění",
+            "excluded_image_gallery_patterns_desc": "Regexps souborů/cest obrázků a galerií pro výjimku ze skenování a přidání do úloh čištění.",
             "excluded_image_gallery_patterns_head": "Vyloučené vzory obrázků/galerií",
-            "excluded_video_patterns_desc": "Regulární výrazy video (souborů / cest) pro výjimku ze skenování a přidání k čištění",
+            "excluded_video_patterns_desc": "Regexps souborů/cest videí pro výjimku ze skenování a přidání do úloh čištění.",
             "excluded_video_patterns_head": "Vyloučené video patterny",
-            "gallery_ext_desc": "Seznam souborových koncovek, oddělených čárkou, definující zip soubory galerií.",
-            "gallery_ext_head": "Koncovky zip souborů galerií",
+            "gallery_ext_desc": "Seznam souborových koncovek, oddělených čárkou, definující ZIP soubory galerií.",
+            "gallery_ext_head": "Koncovky ZIP souborů galerií",
             "generated_file_naming_hash_desc": "Použít MD5 nebo oshash pro pojmenování generovaných souborů. Úprava tohoto nastavení vyžaduje aby všechny scény měly vyplněnou hodnotu MD5/oshash. Po úpravě této hodnoty je nezbytné přemigrovat nebo přegenerovat existující generované soubory. Navštivte stránku Úlohy pro migraci.",
             "generated_file_naming_hash_head": "Typ hashe používaný pro pojmenování generovaných souborů",
-            "generated_files_location": "Umístění adresáře pro generované soubory (značky scén, náhledy scén, sprajty atd.)",
+            "generated_files_location": "Umístění adresáře pro generované soubory (značky scén, náhledy scén, sprajty atd.).",
             "generated_path_head": "Generovaná cesta",
             "hashing": "Hashování",
             "image_ext_desc": "Seznam koncovek souborů, oddělený čárkou, které budou identifikovány jako obrázky.",
@@ -337,12 +343,12 @@
             "include_audio_desc": "Zahrnout zvuk při generování náhledů.",
             "include_audio_head": "Zahrnout zvuk",
             "logging": "Logování",
-            "maximum_streaming_transcode_size_desc": "Maximální velikost překódovaných streamů",
+            "maximum_streaming_transcode_size_desc": "Maximální velikost překódovaných streamů.",
             "maximum_streaming_transcode_size_head": "Maximální velikost streamovaného překódovaného souboru",
-            "maximum_transcode_size_desc": "Maximální velikost pro generované překódované soubory",
+            "maximum_transcode_size_desc": "Maximální velikost pro generované překódované soubory.",
             "maximum_transcode_size_head": "Maximální velikost překódovaného souboru",
             "metadata_path": {
-                "description": "Složka použita při kompletním exportu / importu",
+                "description": "Složka použita při kompletním exportu / importu.",
                 "heading": "Cesta k metadatům"
             },
             "number_of_parallel_task_for_scan_generation_desc": "Nastavte na 0 pro autodetekci. Upozornění: běh vícero úloh než je vyžadováno pro dosažení 100% využítí CPU snižuje výkon a může potenciálně způsobit další problémy.",
@@ -350,13 +356,13 @@
             "parallel_scan_head": "Paralelní skenování / generování",
             "preview_generation": "Generování náhledů",
             "python_path": {
-                "description": "Cesta ke spustitelnému souboru pythonu (nejen ke složce). Používá se pro script scrappery a pluginy. Pokud je prázdné, python bude vyřešen z prostředí",
+                "description": "Cesta ke spustitelnému souboru pythonu (nejen ke složce). Používá se pro script scrappery a pluginy. Pokud je prázdné, Python bude vyřešen z prostředí.",
                 "heading": "Cesta k Pythonu"
             },
-            "scraper_user_agent": "User Agent Scraperu",
-            "scraper_user_agent_desc": "User-Agent řetězec používaný při scrapování http požadavků",
+            "scraper_user_agent": "User-Agent Scraperu",
+            "scraper_user_agent_desc": "User-Agent řetězec používaný při scrapování HTTP požadavků.",
             "scrapers_path": {
-                "description": "Adresář konfiguračních souborů scraperů",
+                "description": "Adresář konfiguračních souborů scraperů.",
                 "heading": "Cesta ke scraperům"
             },
             "scraping": "Scrapování",
@@ -386,7 +392,7 @@
                 },
                 "ffprobe_path": {
                     "heading": "Cesta ke spustitelnému souboru FFprobe",
-                    "description": "Cesta ke spustitelnému souboru ffprobe (nejen ke složce). Pokud je prázdný, ffprobe bude použit ze složky přes $PATH, konfigurační adresář nebo z $HOME/.stash"
+                    "description": "Cesta ke spustitelnému souboru ffprobe (nejen ke složce). Pokud je prázdný, ffprobe bude použit ze složky přes $PATH, konfigurační adresář nebo z $HOME/.stash."
                 },
                 "live_transcode": {
                     "input_args": {
@@ -399,14 +405,14 @@
                     }
                 },
                 "ffmpeg_path": {
-                    "description": "Cesta ke spustitelnému souboru ffmpeg (nejen ke složce). Pokud je prázdný, ffmpeg bude použit ze složky přes $PATH, konfiguračního adresáře nebo z $HOME/.stash",
+                    "description": "Cesta ke spustitelnému souboru ffmpeg (nejen ke složce). Pokud je prázdný, ffmpeg bude použit ze složky přes $PATH, konfiguračního adresáře nebo z $HOME/.stash.",
                     "heading": "Cesta ke spustitelnému souboru FFmpeg"
                 }
             },
-            "gallery_cover_regex_desc": "Regexp používaný k identifikaci obrázku jako obalu galerie",
+            "gallery_cover_regex_desc": "Regexp používaný k identifikaci obrázku jako obalu galerie.",
             "plugins_path": {
                 "heading": "Cesty pluginů",
-                "description": "Umístění adresáře konfiguračních souborů pluginu"
+                "description": "Umístění adresáře konfiguračních souborů pluginu."
             },
             "funscript_heatmap_draw_range": "Zahrnout rozsah do vygenerovaných heatmap",
             "funscript_heatmap_draw_range_desc": "Nakreslete rozsah pohybu na ose y vygenerované heatmapy. Stávající heatmapy bude nutné po změně zregenerovat.",
@@ -423,7 +429,18 @@
             "delete_trash_path": {
                 "description": "Cesta, kam budou smazané soubory přesunuty, místo aby byly trvale smazány. Pro trvalé smazání souborů ponechte pole prázdné.",
                 "heading": "Cesta koše"
-            }
+            },
+            "sprite_generation_head": "Generování spritů",
+            "sprite_interval_desc": "Čas mezi jednotlivými vygenerovanými sprity v sekundách.",
+            "sprite_interval_head": "Interval spritů",
+            "sprite_maximum_desc": "Maximální počet spritů, které lze pro scénu vygenerovat. Nastavením na 0 limit deaktivujete.",
+            "sprite_maximum_head": "Maximální počet spritů",
+            "sprite_minimum_desc": "Minimální počet spritů, které mají být vygenerovány pro scénu",
+            "sprite_minimum_head": "Minimální počet spritů",
+            "sprite_screenshot_size_desc": "Požadovaná velikost každého spritu v pixelech.",
+            "sprite_screenshot_size_head": "Velikost spritu",
+            "use_custom_sprite_interval_head": "Použít vlastní interval spritu",
+            "use_custom_sprite_interval_desc": "Povolte vlastní interval spritu podle níže uvedených nastavení."
         },
         "library": {
             "exclusions": "Výjimky",
@@ -442,7 +459,7 @@
         "scraping": {
             "entity_metadata": "{entityType} Metadata",
             "entity_scrapers": "{entityType} scrapery",
-            "excluded_tag_patterns_desc": "Regulární výrazy názvu tagů vyjmutých z výsledků scrapování",
+            "excluded_tag_patterns_desc": "Regulární výrazy názvu tagů vyjmutých z výsledků scrapování.",
             "excluded_tag_patterns_head": "Vyjmuté tag patterny",
             "scraper": "Scraper",
             "scrapers": "Scrapery",
@@ -490,7 +507,7 @@
             "generate_phashes_during_scan": "Generovat percepční hashe (phash) videa",
             "generate_phashes_during_scan_tooltip": "Pro deduplikaci a identifikaci scén.",
             "generate_previews_during_scan": "Generovat animované náhledy",
-            "generate_previews_during_scan_tooltip": "Vytvářet také animované (webp) náhledy, které jsou vyžadovány pouze v případě, že je Typ náhledu scény/značky nastaven na Animovaný obrázek. Při procházení nevytěžují tolik procesor než náhledy videí, ale jsou generovány navíc a jsou to větší soubory.",
+            "generate_previews_during_scan_tooltip": "Vytvářet také animované (webp) náhledy, které jsou vyžadovány pouze v případě, že je typ náhledu scény/značky nastaven na Animovaný obrázek. Při procházení nevytěžují tolik procesor než náhledy videí, ale jsou generovány navíc a jsou to větší soubory.",
             "generate_sprites_during_scan": "Generovat sprity scrubberu",
             "generate_thumbnails_during_scan": "Generovat náhledy obrázků",
             "generate_video_previews_during_scan": "Generovat náhledy videí",
@@ -522,7 +539,9 @@
                 "skip_multiple_matches_tooltip": "Pokud toto není povoleno a vrátí se více než jeden výsledek, bude náhodně jeden vybrán ke shodě",
                 "tag_skipped_matches": "Označte přeskočené shody pomocí",
                 "skip_single_name_performers_tooltip": "Pokud toto není povoleno, budou přiřazeni účinkující, kteří jsou často generičtí jako Samantha nebo Olga",
-                "tag_skipped_matches_tooltip": "Vytvořte značku jako „Identifikuj: Více shod“, kterou můžete filtrovat taggeru scén a ručně vybrat správnou shodu"
+                "tag_skipped_matches_tooltip": "Vytvořte značku jako „Identifikuj: Více shod“, kterou můžete filtrovat taggeru scén a ručně vybrat správnou shodu",
+                "performer_genders": "Pohlaví účinkujících",
+                "performer_genders_desc": "Účinkující s vybraným pohlavím budou zahrnuti během identifikace."
             },
             "import_from_exported_json": "Importovat z exportovaného JSONu z metadata složky. Přemaže existující databázi.",
             "incremental_import": "Inkrementální import z dodaného exportního zip souboru.",
@@ -554,8 +573,8 @@
                 "description": "Odstraní vygenerované soubory bez odpovídající položky databáze.",
                 "image_thumbnails": "Náhledy obrázků",
                 "image_thumbnails_desc": "Náhledy obrázků a klipy",
-                "markers": "Náhledy Značek",
-                "previews": "Náhledy Scén",
+                "markers": "Náhledy značek",
+                "previews": "Náhledy scén",
                 "previews_desc": "Náhledy scén a miniatury",
                 "sprites": "Sprity scén",
                 "transcodes": "Transkódy scén"
@@ -569,7 +588,22 @@
             "rescan": "Znovu skenovat soubory",
             "rescan_tooltip": "Znovu skenovat každý soubor v cestě. Používá se k vynucení aktualizace metadat souboru a opětovnému skenování zip souborů.",
             "generate_image_phashes_during_scan": "Generovat percepční hashe (phash) obrazu",
-            "generate_image_phashes_during_scan_tooltip": "Pro deduplikaci a identifikaci."
+            "generate_image_phashes_during_scan_tooltip": "Pro deduplikaci a identifikaci.",
+            "auto_tag_confirm": "Toto se pokusí porovnat váš obsah s existujícími metadaty.",
+            "auto_tag_warning": "Tento proces nelze vrátit zpět a může vést k nesprávným shodám.",
+            "backup_database": {
+                "description": "Provede zálohu databáze a souborů s bloby.",
+                "destination": "Cíl",
+                "download": "Stáhnout zálohu",
+                "include_blobs": "Zahrnout bloby do zálohy",
+                "include_blobs_desc": "Zakažte pro pouhou zálohu souboru databáze SQLite.",
+                "sqlite": "Záložní soubor bude kopií souboru databáze SQLite s názvem souboru {filename_format}",
+                "to_directory": "Do {directory}",
+                "warning_blobs": "Soubory blob nebudou zahrnuty do zálohy. To znamená, že pro úspěšné obnovení ze zálohy musí být soubory blob přítomny ve složce pro ukládání blobů.",
+                "zip": "Soubor databáze SQLite a soubory blob budou zazipovány do jednoho souboru s názvem {filename_format}"
+            },
+            "clean_ignore_zip_contents": "Ignorovat obsah zip souborů",
+            "clean_ignore_zip_contents_desc": "Rychlejší, ale přehlédne soubory odstraněné uvnitř zip souborů. Zapnutí je bezpečné, pokud soubory uvnitř zipů nemažete."
         },
         "tools": {
             "scene_duplicate_checker": "Detektor duplicitních scén",
@@ -605,8 +639,8 @@
             },
             "custom_javascript": {
                 "description": "Stránka musí být znovu načtena, aby byly viditelné změny.",
-                "heading": "Vlastní Javascript",
-                "option_label": "Vlastní Javascript povolen"
+                "heading": "Vlastní JavaScript",
+                "option_label": "Vlastní JavaScript povolen"
             },
             "custom_locales": {
                 "description": "Přepsat individuální jazykovou lokalizaci. Navštivte https://github.com/stashapp/stash/blob/develop/ui/v2.5/src/locales/en-GB.json pro zobrazení seznamu. Stránka musí být obnovena, aby byly změny viditelné.",
@@ -624,13 +658,13 @@
             "desktop_integration": {
                 "desktop_integration": "Integrace na plochu",
                 "notifications_enabled": "Aktivovat upozornění / notifikace",
-                "send_desktop_notifications_for_events": "Zasílat notifikace na plochu pro události",
+                "send_desktop_notifications_for_events": "Zasílat notifikace na plochu pro události.",
                 "skip_opening_browser": "Přeskočit otevření prohlížeče",
-                "skip_opening_browser_on_startup": "Přeskočit automatické otevření prohlížeče při spuštění"
+                "skip_opening_browser_on_startup": "Přeskočit automatické otevření prohlížeče při spuštění."
             },
             "editing": {
                 "disable_dropdown_create": {
-                    "description": "Zakázat funkčnost tvorby nových objektů z rozbalovacích seznamů",
+                    "description": "Zakázat funkčnost tvorby nových objektů z rozbalovacích seznamů.",
                     "heading": "Zakázat vytvoření z rozbalovacího seznamu"
                 },
                 "heading": "Editace",
@@ -671,8 +705,8 @@
                 "sync": "Synchronizovat"
             },
             "handy_connection_key": {
-                "description": "Connection Key k Handy pro použití v interaktivních scénách. Nastavení tohoto klíče umožní Stash ke sdílení aktuální scény s handyfeeling.com",
-                "heading": "Handy Connection klíč"
+                "description": "Connection Key k Handy pro použití v interaktivních scénách. Nastavení tohoto klíče umožní Stash ke sdílení aktuální scény s handyfeeling.com.",
+                "heading": "Handy connection klíč"
             },
             "image_lightbox": {
                 "heading": "Lightbox pro obrázek"
@@ -681,12 +715,12 @@
                 "heading": "Obrázky",
                 "options": {
                     "write_image_thumbnails": {
-                        "description": "Zapsat miniatury obrázků na disk, když jsou generovány za běhu",
+                        "description": "Zapsat miniatury obrázků na disk, když jsou generovány za běhu.",
                         "heading": "Zapsat miniatury obrázků"
                     },
                     "create_image_clips_from_videos": {
-                        "description": "Když má knihovna vypnutá videa, soubory videa (soubory končící s video příponou) budou naskenovány jako obrázkový klip.",
-                        "heading": "Skenujte rozšíření videa jako obrázkový klip"
+                        "description": "Pokud je v knihovně zakázána možnost Videa, budou videosoubory (viz přípony videa) naskenovány jako obrazové klipy.",
+                        "heading": "Skenujte videa jako obrázkové klipy"
                     }
                 }
             },
@@ -695,11 +729,11 @@
                 "heading": "Jazyk"
             },
             "max_loop_duration": {
-                "description": "Maximální doba trvání scény, při které bude přehrávač scén opakovat video – 0 pro deaktivaci",
+                "description": "Maximální doba trvání scény, při které bude přehrávač scén opakovat video - Nastavením 0 fuknci zakážete.",
                 "heading": "Maximální doba trvání smyčky"
             },
             "menu_items": {
-                "description": "Zobrazit nebo skrýt různé typy obsahu na navigační liště",
+                "description": "Zobrazit nebo skrýt různé typy obsahu na navigační liště.",
                 "heading": "Menu položky"
             },
             "minimum_play_percent": {
@@ -709,7 +743,7 @@
             "performers": {
                 "options": {
                     "image_location": {
-                        "description": "Vlastní cesta pro výchozí obrázky účinkujících. Chcete-li použít vestavěné výchozí hodnoty, ponechte prázdné",
+                        "description": "Vlastní cesta pro výchozí obrázky účinkujících. Chcete-li použít vestavěné výchozí hodnoty, ponechte prázdné.",
                         "heading": "Cesta pro výchozí obrázky účinkujících"
                     }
                 }
@@ -726,7 +760,8 @@
             "scene_list": {
                 "heading": "Zobrazení v mřížce",
                 "options": {
-                    "show_studio_as_text": "Zobrazit studiové překrytí jako text"
+                    "show_studio_as_text": "Zobrazit studiové překrytí jako text",
+                    "show_studio_as_text_desc": "Ve výchozím nastavení se na kartách v mřížce zobrazuje logo studia. Povolte tuto možnost, pokud chcete, aby se název studia vždy zobrazoval jako text."
                 }
             },
             "scene_player": {
@@ -735,21 +770,21 @@
                     "always_start_from_beginning": "Vždy spustit video od začátku",
                     "auto_start_video": "Automaticky spustit video",
                     "auto_start_video_on_play_selected": {
-                        "description": "Automaticky spustit video pokud je přehráváno vybrané nebo náhodné video ze stránky scén",
+                        "description": "Automaticky spustit video pokud je přehráváno vybrané nebo náhodné video ze stránky scén.",
                         "heading": "Automaticky spustit video při přehrávání vybraného"
                     },
                     "continue_playlist_default": {
-                        "description": "Přehrát následující scénu na seznamu při skončení videa",
+                        "description": "Přehrát následující scénu na seznamu při skončení videa.",
                         "heading": "(Výchozí nastavení) Pokračovat v playlistu"
                     },
-                    "show_scrubber": "Zobrazit Scrubber",
+                    "show_scrubber": "Zobrazit scrubber",
                     "track_activity": "Povolit historii přehrávání scén",
                     "disable_mobile_media_auto_rotate": "Zakázat automatické otáčení médií na celou obrazovku v mobilu",
                     "enable_chromecast": "Povolit Chromecast",
-                    "show_ab_loop_controls": "Zobrazit ovládací prvky pluginu AB Loop",
+                    "show_ab_loop_controls": "Zobrazit ovládací prvky smyčky AB",
                     "vr_tag": {
                         "description": "Tlačítko VR se zobrazí pouze u scén s tímto tagem.",
-                        "heading": "VR Tag"
+                        "heading": "VR tag"
                     },
                     "show_range_markers": "Zobrazit značky s rozsahem"
                 }
@@ -758,7 +793,7 @@
                 "heading": "Scéna / Marker zeď",
                 "options": {
                     "display_title": "Zobrazit titul a tagy",
-                    "toggle_sound": "Povolit zvuk"
+                    "toggle_sound": "Povolit zvuk při najetí myší na náhled"
                 }
             },
             "scroll_attempts_before_change": {
@@ -766,19 +801,19 @@
                 "heading": "Počet pokusů o rolování před přechodem"
             },
             "show_tag_card_on_hover": {
-                "description": "Zobrazit přehledku tagu při přejetí přes štítek tagu",
+                "description": "Zobrazit přehledku tagu při přejetí přes štítek tagu.",
                 "heading": "Popisky tagových štítků"
             },
             "slideshow_delay": {
-                "description": "Slideshow je k dispozici v galeriích v režimu zobrazení stěny",
+                "description": "Slideshow je k dispozici v galeriích v režimu zobrazení stěny.",
                 "heading": "Zpoždění prezentace (sekundy)"
             },
             "studio_panel": {
-                "heading": "Pohled studií",
+                "heading": "Pohled Studií",
                 "options": {
                     "show_child_studio_content": {
                         "heading": "Zobrazit obsah dílčích studií",
-                        "description": "V zobrazení studia zobrazte také obsah z dílčích studií"
+                        "description": "V zobrazení studia zobrazte také obsah z dílčích studií."
                     }
                 }
             },
@@ -791,11 +826,15 @@
                 "heading": "Stránka s podrobnostmi",
                 "compact_expanded_details": {
                     "heading": "Rozšířené kompaktní detaily",
-                    "description": "Pokud je tato možnost povolena, zobrazí rozšířené detaily a přitom zachovává kompaktní prezentaci"
+                    "description": "Pokud je tato možnost povolena, zobrazí rozšířené detaily a přitom zachovává kompaktní prezentaci."
                 },
                 "show_all_details": {
-                    "description": "Když je tato možnost povolena, všechny detaily obsahu budou zobrazeny s výchozím nastavením a detail každé položky bude pod jedním sloupcem",
+                    "description": "Když je tato možnost povolena, všechny detaily obsahu budou zobrazeny s výchozím nastavením a detail každé položky bude pod jedním sloupcem.",
                     "heading": "Zobrazit všechny detaily"
+                },
+                "show_studio_text": {
+                    "description": "V detailních zobrazeních vždy zobrazovat název studia jako text, nikoli jako ikonu.",
+                    "heading": "Zobrazit studio jako text"
                 }
             },
             "image_wall": {
@@ -806,14 +845,14 @@
             "tag_panel": {
                 "options": {
                     "show_child_tagged_content": {
-                        "heading": "Zobrazit obsah dílčích tagů",
-                        "description": "V zobrazení tagů, zobraz obsah také obsah z dílčích tagů"
+                        "heading": "Zobrazit obsah pod-tagů",
+                        "description": "V zobrazení tagů, zobraz obsah také obsah z pod-tagů."
                     }
                 },
-                "heading": "Zobrazení tagů"
+                "heading": "Zobrazení Tagů"
             },
             "use_stash_hosted_funscript": {
-                "description": "Je-li povoleno, budou funscripty poskytovány přímo ze Stash do vašeho zařízení Handy bez použití serveru Handy třetí strany. Vyžaduje, aby byl Stash dostupný z vašeho zařízení Handy a vygenerovaný API klíč, pokud má stash nakonfigurované údaje.",
+                "description": "Je-li povoleno, budou funscripty poskytovány přímo ze Stash do vašeho zařízení Handy bez použití serveru Handy třetí strany. Vyžaduje, aby byl Stash dostupný z vašeho zařízení Handy a vygenerovaný API klíč, pokud má Stash nakonfigurované údaje.",
                 "heading": "Funscripty podávejte přímo"
             },
             "sfw_mode": {
@@ -845,9 +884,21 @@
             "custom_title": {
                 "description": "Vlastní text, který se přidá k názvu stránky. Pokud je prázdný, výchozí nastavení je 'Stash'.",
                 "heading": "Vlastní název"
+            },
+            "scene_view": {
+                "heading": "Zobrazení scény",
+                "options": {
+                    "preview_volume": {
+                        "description": "Hlasitost náhledu při najetí myší na scénu. Nastavením na 0 ztlumíte zvuk.",
+                        "heading": "Hlasitost náhledu"
+                    }
+                }
             }
         },
-        "advanced_mode": "Pokročilý mód"
+        "advanced_mode": "Pokročilý mód",
+        "changelog": {
+            "header": "Seznam změn"
+        }
     },
     "configuration": "Konfigurace",
     "countables": {
@@ -867,7 +918,8 @@
     "criterion": {
         "greater_than": "Větší než",
         "less_than": "Méně než",
-        "value": "Hodnota"
+        "value": "Hodnota",
+        "unsupported": "{type} (unsupported)"
     },
     "criterion_modifier": {
         "between": "mezi",
@@ -922,12 +974,12 @@
             "options": "Možnosti",
             "reset_zoom_on_nav": "Resetovat zoom po změně obrázku",
             "scale_up": {
-                "description": "Škálovat menší obrázky tak, aby vyplnily obrazovku",
+                "description": "Škálovat menší obrázky tak, aby vyplnily obrazovku.",
                 "label": "Zvětšit, aby se vešly"
             },
             "scroll_mode": {
                 "description": "Držet shift pro dočasné použití druhého módu.",
-                "label": "Rolovací mód",
+                "label": "Režim posouvání",
                 "pan_y": "Náklon Y",
                 "zoom": "Zvětšit"
             },
@@ -938,11 +990,11 @@
             "force_transcodes": "Vynutit generování Transkódu",
             "force_transcodes_tooltip": "Ve výchozím nastavení, transkódy jsou generovány pouze tehdy, když video soubor není podporován prohlížečem. V případě aktivování, transkódy budou generovány i v ostatních případech.",
             "image_previews": "Animované náhledy obrázků",
-            "image_previews_tooltip": "Vytvářejte také animované (webp) náhledy, které jsou vyžadovány pouze v případě, že je Typ náhledu scény/značky nastaven na Animovaný obrázek. Při procházení využívají zatěžují procesor méně než náhledy videí, ale jsou generovány navíc a jsou to větší soubory.",
+            "image_previews_tooltip": "Vytvářejte také animované (webp) náhledy, které jsou vyžadovány pouze v případě, že je typ náhledu scény/značky nastaven na Animovaný Obrázek. Při procházení využívají zatěžují procesor méně než náhledy videí, ale jsou generovány navíc a jsou to větší soubory.",
             "interactive_heatmap_speed": "Generovat heatmapy a rychlosti pro interaktivní scény",
-            "marker_image_previews": "Animované náhledy markerů",
-            "marker_image_previews_tooltip": "Vytvářejte také animované (webp) náhledy, které jsou vyžadovány pouze v případě, že je Typ náhledu scény/značky nastaven na Animovaný obrázek. Při procházení využívají zatěžují procesor méně než náhledy videí, ale jsou generovány navíc a jsou to větší soubory.",
-            "marker_screenshots": "Screenshoty markerů",
+            "marker_image_previews": "Animované náhledy značek",
+            "marker_image_previews_tooltip": "Vytvářejte také animované (webp) náhledy, které jsou vyžadovány pouze v případě, že je typ náhledu scény/značky nastaven na Animovaný Obrázek. Při procházení využívají zatěžují procesor méně než náhledy videí, ale jsou generovány navíc a jsou to větší soubory.",
+            "marker_screenshots": "Screenshoty značek",
             "preview_exclude_start_time_desc": "Vyloučit prvních x sekund z náhledů scén. Může to být hodnota v sekundách nebo procentech (např. 2 %) z celkové doby trvání scény.",
             "preview_exclude_start_time_head": "Vyloučit čas zahájení",
             "preview_generation_options": "Možnosti generování náhledů",
@@ -985,7 +1037,8 @@
         "merge": {
             "destination": "Destinace",
             "source": "Zdroj",
-            "empty_results": "Hodnoty cílového pole zůstanou nezměněny."
+            "empty_results": "Hodnoty cílového pole zůstanou nezměněny.",
+            "combined": "Kombinovaný"
         },
         "create_new_entity": "Vytvořit novou {entity}",
         "imagewall": {
@@ -1011,7 +1064,8 @@
         "stashid_exists_warning": "Stávající stash id pro tento stash-box bude nahrazeno.",
         "studios_found": "{count} studií nalezeno",
         "tags_found": "{count} tagů nalezeno",
-        "scrape_results_missing": "Chybějící"
+        "scrape_results_missing": "Chybějící",
+        "edit_entity_count_title": "Upravit {count} {count, plural, one {{singularEntity}} other {{pluralEntity}}}"
     },
     "chapters": "Kapitoly",
     "circumcised": "Obřezán",
@@ -1035,7 +1089,10 @@
         "removed_entity": "Odebráno {count, plural, one {{singularEntity}} other {{pluralEntity}}}",
         "image_index_too_large": "Chyba: Index obrázku je větší než počet obrázků v galerii",
         "reassign_past_tense": "Soubor byl znovu přidělen",
-        "merged_performers": "Sloučení účinkující"
+        "merged_performers": "Sloučení účinkující",
+        "clipboard_access_denied": "Přístup ke schránce byl zamítnut. Zkontrolujte oprávnění prohlížeče",
+        "clipboard_image_pasted": "Obrázek vložen ze schránky",
+        "clipboard_no_image": "Ve schránce nebyl nalezen žádný obrázek"
     },
     "urls": "Odkazy",
     "url": "Odkaz",
@@ -1351,7 +1408,11 @@
         "interactive_speed": "Interaktivní rychlost",
         "phash": "PHash",
         "play_count": "Počet přehrání",
-        "o_count": "Počet O"
+        "o_count": "Počet O",
+        "md5": "Kontrolní součet MD5",
+        "oshash": "oshash",
+        "oshash_meaning": "Hash OpenSubtitles",
+        "phash_meaning": "Percepční hash"
     },
     "megabits_per_second": "{value} mbps",
     "none": "Žádný",
@@ -1598,5 +1659,59 @@
         "select_stashbox": "Vybrat StashBox..."
     },
     "latest_scene": "Nejnovější scéna",
-    "stash_id_count": "Počet Stash ID"
+    "stash_id_count": "Počet Stash ID",
+    "career_end": "Konec kariéry",
+    "career_start": "Začátek kariéry",
+    "duplicated": "Duplikovaný",
+    "duplicated_stash_id": "Duplikováno (Stash ID)",
+    "duplicated_title": "Duplikováno (Title)",
+    "empty_value": "prázdný",
+    "include_sub_folders": "Zahrnout podsložky",
+    "parent_folder": "Nadřazená složka",
+    "refer_to": "Viz {odkaz}.",
+    "scenes_size": "Velikost scény",
+    "sub_folder_depth": "Hloubka podsložky (empty for all)",
+    "sub_folders": "Podsložky",
+    "tag_tagger": {
+        "add_new_tags": "Přidat nové tagy",
+        "any_names_entered_will_be_queried": "Všechna zadaná jména budou hledána ze vzdálené instance Stash-Box a v případě nalezení budou přidána. Za shodu budou považovány pouze přesné shody.",
+        "batch_add_tags": "Hromadné přidání tagů",
+        "batch_update_tags": "Hromadné aktualizování tagů",
+        "config": {
+            "create_parent_desc": "Vytvořte chybějící nadřazené tagy z kategorií stash-box nebo označte existující nadřazené štítky přesnými shodami názvů",
+            "create_parent_label": "Vytvořit nadřazené tagy"
+        },
+        "create_or_tag_parent_tags": "Vytvořit chybějící nebo označit existující nadřazené tagy",
+        "current_page": "Aktuální stránka",
+        "failed_to_save_tag": "Nepodařilo se uložit tag „{tag}“",
+        "name_already_exists": "Jméno již existuje",
+        "network_error": "Chyba sítě",
+        "no_results_found": "Nebyly nalezeny žádné výsledky.",
+        "number_of_tags_will_be_processed": "Bude zpracováno {tag_count} tagů",
+        "query_all_tags_in_the_database": "Všechny tagy v databázi",
+        "refresh_tagged_tags": "Obnovit označené tagy",
+        "refreshing_will_update_the_data": "Obnovením se aktualizují data všech označených tagů z instance stash-box.",
+        "status_tagging_job_queued": "Stav: Úloha tagování je zařazena do fronty",
+        "status_tagging_tags": "Stav: Označování tagů",
+        "tag_already_tagged": "Tag již označen",
+        "tag_names_or_stashids_separated_by_comma": "Názvy tagů nebo StashID oddělené čárkou",
+        "tag_selection": "Výběr tagů",
+        "tag_successfully_tagged": "Tag byl úspěšně označen",
+        "tag_status": "Stav tagu",
+        "to_use_the_tag_tagger": "Pro použití tag taggeru je nutné nakonfigurovat instanci stash-box.",
+        "untagged_tags": "Neoznačené tagy",
+        "update_tags": "Aktualizovat tagy",
+        "updating_untagged_tags_description": "Aktualizace neoznačených tagů se pokusí najít všechny tagy, které nemají stashid, a aktualizovat metadata."
+    },
+    "tagger": {
+        "config": {
+            "active_stash-box_instance": "Aktivní instance stash-box:",
+            "edit_excluded_fields": "Upravit vyloučená pole",
+            "excluded_fields": "Vyloučená pole:",
+            "fields_will_not_be_changed": "Tato pole nebudou změněna při aktualizaci {entity}.",
+            "no_fields_are_excluded": "Žádná pole nejsou vyloučena",
+            "no_instances_found": "Nenalezeny žádné instance"
+        }
+    },
+    "unsupported_criteria": "Nepodporovaná kritéria: {criteria}"
 }
diff --git a/ui/v2.5/src/locales/da-DK.json b/ui/v2.5/src/locales/da-DK.json
index ea62c977a..50f4ff8cf 100644
--- a/ui/v2.5/src/locales/da-DK.json
+++ b/ui/v2.5/src/locales/da-DK.json
@@ -236,9 +236,7 @@
             "latest_version_build_hash": "Seneste version Byg Hash:",
             "new_version_notice": "[NY]",
             "release_date": "Udgivelsesdato:",
-            "stash_discord": "Tilmeld dig vores {url} kanal",
             "stash_home": "Stash hjem på {url}",
-            "stash_open_collective": "Støt os gennem {url}",
             "stash_wiki": "Stash {url} side",
             "version": "Version"
         },
diff --git a/ui/v2.5/src/locales/de-DE.json b/ui/v2.5/src/locales/de-DE.json
index 50f4c8827..66315581a 100644
--- a/ui/v2.5/src/locales/de-DE.json
+++ b/ui/v2.5/src/locales/de-DE.json
@@ -248,9 +248,7 @@
             "latest_version_build_hash": "Neuester Build Hash:",
             "new_version_notice": "[NEU]",
             "release_date": "Veröffentlichungsdatum:",
-            "stash_discord": "Komm in unseren {url} Kanal",
             "stash_home": "Stash ist beheimatet auf {url}",
-            "stash_open_collective": "Unterstütze uns über {url}",
             "stash_wiki": "Stash {url} Seite",
             "version": "Version"
         },
diff --git a/ui/v2.5/src/locales/es-ES.json b/ui/v2.5/src/locales/es-ES.json
index f8d447037..759ffdbb4 100644
--- a/ui/v2.5/src/locales/es-ES.json
+++ b/ui/v2.5/src/locales/es-ES.json
@@ -244,11 +244,11 @@
             "latest_version_build_hash": "Hash de la última versión:",
             "new_version_notice": "[NUEVA]",
             "release_date": "Fecha de publicación:",
-            "stash_discord": "Únete a nuestro canal {url}",
-            "stash_home": "Página principal del proyecto en {url}",
-            "stash_open_collective": "Donaciones al proyecto a través de {url}",
-            "stash_wiki": "Documentación del proyecto en nuestro {url}",
-            "version": "Versión"
+            "stash_home": "Visita Stash en {url}.",
+            "stash_wiki": "Echa un vistazo a la página web de Stash {url}.",
+            "version": "Versión",
+            "stash_community": "Únete a nuestro foro {forumUrl} o a nuestro servidor de Discord {discordUrl}.",
+            "support_us": "Apóyanos a través de {openCollectiveUrl} o {githubSponsorsUrl}."
         },
         "application_paths": {
             "heading": "Rutas de la Aplicación"
@@ -501,7 +501,7 @@
             "auto_tagging": "Etiquetado automático",
             "backing_up_database": "Guardando respaldo de la base de datos",
             "backup_and_download": "Lleva a cabo una copia de seguridad de la base de datos y la guarda en un fichero de respaldo.",
-            "cleanup_desc": "Buscar ficheros eliminados del sistema de archivos y eliminarlos de la base de datos. PRECAUCIÓN: esta es una acción destructiva.",
+            "cleanup_desc": "Verifique si hay archivos faltantes y elimínelos de la base de datos. Esta es una acción destructiva.",
             "data_management": "Gestión de datos",
             "defaults_set": "Las opciones por defecto se han guardado y serán usadas cada vez que pulses el botoón de {action} en la página de Tareas.",
             "dont_include_file_extension_as_part_of_the_title": "No incluir la extensión del archivo como parte del título",
@@ -567,7 +567,7 @@
                 "overwrite_existing": "Sobreescribir blobs existentes con datos de capturas de pantalla"
             },
             "migrations": "Migraciones",
-            "only_dry_run": "Marca esta casilla para ejecutar en MODO DE SIMULACIÓN. No se eliminará información alguna, solo se mostrarán en el registro las acciones a realizar",
+            "only_dry_run": "Realiza únicamente una prueba. No se eliminará nada",
             "plugin_tasks": "Tareas de complementos",
             "scan": {
                 "scanning_all_paths": "Escaneando todas las rutas",
@@ -590,7 +590,7 @@
             "generate_sprites_during_scan_tooltip": "El conjunto de imágenes que se muestra bajo el reproductor de vídeo para facilitar la navegación.",
             "optimise_database_warning": "Advertencia: mientras se esté ejecutando esta tarea, cualquier operación que modifique la base de datos fallará, y dependiendo del tamaño de su base de datos, podría tardar varios minutos en completarse. También requiere como mínimo tanto espacio libre en disco como grande sea su base de datos, pero se recomienda 1.5 veces más.",
             "optimise_database": "Intentar mejorar el rendimiento mediante el análisis y posterior reconstrucción del archivo de base de datos completo.",
-            "rescan_tooltip": "Volver a analizar todos los archivos en la ruta. Se usa para forzar la actualización de metadatos y contenidos de archivos ZIP.",
+            "rescan_tooltip": "Volver a escanear cada archivo en la ruta.  Se utiliza para forzar la actualización de los metadatos de los archivos y volver a escanear los archivos zip.",
             "rescan": "Reanalizar archivos",
             "generate_image_phashes_during_scan": "Generar hash perceptuales de imágenes",
             "generate_image_phashes_during_scan_tooltip": "Para la deduplicación y la identificación.",
@@ -604,7 +604,11 @@
                 "to_directory": "A {directory}",
                 "warning_blobs": "Los archivos blob no se incluirán en la copia de seguridad. Esto significa que, para restaurar correctamente desde la copia de seguridad, los archivos blob deben estar presentes en la ubicación de almacenamiento de blobs.",
                 "zip": "El archivo de base de datos SQLite y los archivos blob se comprimirán en un único archivo, con el nombre de archivo {filename_format}"
-            }
+            },
+            "auto_tag_confirm": "Esto intentará comparar tu contenido con los metadatos existentes.",
+            "auto_tag_warning": "Este proceso es irreversible y puede dar lugar a coincidencias erróneas.",
+            "clean_ignore_zip_contents": "Ignorar el contenido del archivo zip",
+            "clean_ignore_zip_contents_desc": "Es más rápido, pero no detectará los archivos eliminados dentro de los archivos zip. Se puede activar sin problema si no se borran archivos dentro de los archivos zip."
         },
         "tools": {
             "scene_duplicate_checker": "Comprobación de escenas duplicadas",
@@ -766,7 +770,8 @@
             "scene_list": {
                 "heading": "Vista de cuadrícula",
                 "options": {
-                    "show_studio_as_text": "Mostrar superposición de estudio como texto"
+                    "show_studio_as_text": "Mostrar superposición de estudio como texto",
+                    "show_studio_as_text_desc": "De forma predeterminada, el logotipo del estudio aparece en las fichas de la cuadrícula. Activa esta opción para que, en su lugar, siempre se muestre el nombre del estudio en forma de texto."
                 }
             },
             "scene_player": {
@@ -798,7 +803,7 @@
                 "heading": "Muro de escenas/Marcadores",
                 "options": {
                     "display_title": "Mostrar título y etiquetas",
-                    "toggle_sound": "Habilitar sonido"
+                    "toggle_sound": "Activar el sonido al pasar el cursor por la vista previa"
                 }
             },
             "slideshow_delay": {
@@ -832,7 +837,11 @@
                     "heading": "Habilitar imagen de fondo",
                     "description": "Mostrar la imagen de fondo en la página de detalles."
                 },
-                "heading": "Página de detalle"
+                "heading": "Página de detalle",
+                "show_studio_text": {
+                    "description": "Mostrar siempre el nombre del estudio como texto en las vistas detalladas, en lugar de como icono.",
+                    "heading": "Mostrar «estudio» como texto"
+                }
             },
             "use_stash_hosted_funscript": {
                 "description": "Cuando se activa, los funscripts se servirán directamente desde Stash a tu dispositivo Handy sin utilizar el servidor Handy de terceros. Requiere que Stash sea accesible desde tu dispositivo Handy, y que se genere una clave API si Stash tiene las credenciales configuradas.",
@@ -880,6 +889,15 @@
                 "enable": "Habilitar y recargar",
                 "overlay_message": "El modo de resolución de problemas está activo: todas las personalizaciones están desactivadas",
                 "exit": "Salir"
+            },
+            "scene_view": {
+                "heading": "Vista de escena",
+                "options": {
+                    "preview_volume": {
+                        "description": "Volumen de la vista previa al pasar el cursor por encima de una escena. Establece el valor en 0 para silenciarlo.",
+                        "heading": "Volumen de vista previa"
+                    }
+                }
             }
         },
         "advanced_mode": "Modo avanzado",
@@ -1023,7 +1041,8 @@
         "merge": {
             "destination": "Destino",
             "empty_results": "Los valores del campo de destino permanecerán sin cambios.",
-            "source": "Fuente"
+            "source": "Fuente",
+            "combined": "Combinado"
         },
         "create_new_entity": "Crear nuevo {entity}",
         "imagewall": {
@@ -1239,7 +1258,7 @@
         "untagged_performers": "Actrices/actores no etiquetadas/os",
         "update_performer": "Actualizar actriz/actor",
         "update_performers": "Actualizar actrices/actores",
-        "updating_untagged_performers_description": "Actualizar las actrices/actores no etiquetados intentará seleccionar cualquier actriz/actor que carecen de un StashID y actualizará los metadatos.",
+        "updating_untagged_performers_description": "Actualizar a los artistas sin etiqueta intentará emparejar a cualquier artista que carezca de un stashid y actualizar los metadatos.",
         "performer_names_or_stashids_separated_by_comma": "Nombres de actores o StashIDs separados por comas"
     },
     "performer_tags": "Etiquetas de actriz/actor",
@@ -1282,7 +1301,7 @@
             "creating_your_system": "Creando tu nuevo entorno"
         },
         "errors": {
-            "something_went_wrong": "¡OH NO! ¡Algo ha ido mal!",
+            "something_went_wrong": "¡Oh no!. ¡Algo salió mal!",
             "something_went_wrong_description": "Si sospechas que puede haber un error con los datos aportados, por favor, haz clic en volver para arreglarlos. De lo contrario, abre una incidencia en {githubLink} o busca ayuda en {discordLink}.",
             "something_went_wrong_while_setting_up_your_system": "Algo ha salido mal mientras configurábamos tu entorno. Éste es el mensaje de error recibido: {error}",
             "unable_to_retrieve_system_status": "No se puede recuperar el estado del sistema: {error}",
@@ -1368,7 +1387,7 @@
     "stash_ids": "Stash IDs",
     "stashbox": {
         "go_review_draft": "Ir a {endpoint_name} para revisar el borrador.",
-        "selected_stash_box": "URL de la entidad Stash-Box seleccionada",
+        "selected_stash_box": "Punto final de Stash-Box seleccionado",
         "submission_failed": "Envío fallido",
         "submission_successful": "Enviado correctamente",
         "source": "Fuente para el Stash-Box",
@@ -1692,5 +1711,7 @@
     "parent_folder": "Carpeta principal",
     "sub_folder_depth": "Profundidad de la subcarpeta (vacía para todas)",
     "sub_folders": "Subcarpetas",
-    "empty_value": "vacío"
+    "empty_value": "vacío",
+    "refer_to": "Consulte {enlace}.",
+    "scenes_size": "Tamaño de la escena"
 }
diff --git a/ui/v2.5/src/locales/et-EE.json b/ui/v2.5/src/locales/et-EE.json
index 0e6431cd5..83ea9533c 100644
--- a/ui/v2.5/src/locales/et-EE.json
+++ b/ui/v2.5/src/locales/et-EE.json
@@ -245,9 +245,7 @@
             "latest_version_build_hash": "Uusima Versiooni Ehituse Räsi:",
             "new_version_notice": "[UUS]",
             "release_date": "Väljalaskekuupäev:",
-            "stash_discord": "Liitu meie {url}i kanaliga",
             "stash_home": "Stashi kodu {url}-is",
-            "stash_open_collective": "Toeta meid läbi {url}-i",
             "stash_wiki": "Stashi {url} leht",
             "version": "Versioon"
         },
diff --git a/ui/v2.5/src/locales/fi-FI.json b/ui/v2.5/src/locales/fi-FI.json
index 05e927fd5..11822c451 100644
--- a/ui/v2.5/src/locales/fi-FI.json
+++ b/ui/v2.5/src/locales/fi-FI.json
@@ -240,9 +240,7 @@
             "latest_version_build_hash": "Uusimman version tiiviste:",
             "new_version_notice": "[UUSI]",
             "release_date": "Julkaisupäivä:",
-            "stash_discord": "Liity {url} kanavallemme",
             "stash_home": "Stashin kotisivut {url}",
-            "stash_open_collective": "Tue meitä {url}",
             "stash_wiki": "Stashin {url} -sivu",
             "version": "Versio"
         },
diff --git a/ui/v2.5/src/locales/fr-FR.json b/ui/v2.5/src/locales/fr-FR.json
index 9f7c6d323..adbeea60f 100644
--- a/ui/v2.5/src/locales/fr-FR.json
+++ b/ui/v2.5/src/locales/fr-FR.json
@@ -251,11 +251,11 @@
             "latest_version_build_hash": "Empreinte de construction de la dernière version :",
             "new_version_notice": "[Nouveautés]",
             "release_date": "Date de sortie :",
-            "stash_discord": "Rejoignez notre chaine {url}",
-            "stash_home": "Accueil de Stash sur {url}",
-            "stash_open_collective": "Soutenez-nous via {url}",
-            "stash_wiki": "{url} de Stash",
-            "version": "Version actuelle"
+            "stash_home": "Découvrez Stash sur {url}.",
+            "stash_wiki": "Consultez le site web de Stash {url}.",
+            "version": "Version actuelle",
+            "stash_community": "Rejoignez notre forum {forumUrl} ou notre serveur communautaire {discordUrl}.",
+            "support_us": "Soutenez-nous via {openCollectiveUrl} ou {githubSponsorsUrl}."
         },
         "application_paths": {
             "heading": "Chemins de l'application"
@@ -611,7 +611,11 @@
                 "to_directory": "Vers {directory}",
                 "warning_blobs": "Les fichiers blob ne seront pas inclus dans la sauvegarde. Cela signifie que pour réussir une restauration à partir de sauvegarde, les fichiers blob doivent être présents dans l'emplacement de stockage blob.",
                 "zip": "Les fichiers de base de données SQLite et les fichiers blob seront compressés en un seul fichier, avec comme nom de fichier {filename_format}"
-            }
+            },
+            "clean_ignore_zip_contents": "Ignorer le contenu du fichier zip",
+            "clean_ignore_zip_contents_desc": "Plus rapide, mais les fichiers supprimés à l'intérieur des archives zip seront ignorés. Vous pouvez l'activer sans risque si vous ne supprimez pas de fichiers dans les archives zip.",
+            "auto_tag_confirm": "Cela permettra de faire correspondre votre contenu aux métadonnées existantes.",
+            "auto_tag_warning": "Cette opération est irréversible et peut produire des correspondances erronées."
         },
         "tools": {
             "scene_duplicate_checker": "Vérificateur de doublons de scènes",
@@ -683,6 +687,10 @@
                 "show_all_details": {
                     "description": "Activée, tous les détails du contenu seront affichés par défaut et chaque élément détaillé tiendra dans une seule colonne.",
                     "heading": "Montrer tous les détails"
+                },
+                "show_studio_text": {
+                    "description": "Toujours afficher le nom du studio au format texte dans les vues détaillées, plutôt qu'une icône.",
+                    "heading": "Afficher le studio au format texte"
                 }
             },
             "editing": {
@@ -788,7 +796,8 @@
             "scene_list": {
                 "heading": "Vue en grille",
                 "options": {
-                    "show_studio_as_text": "Afficher en texte la superposition du studio"
+                    "show_studio_as_text": "Afficher en texte la superposition du studio",
+                    "show_studio_as_text_desc": "Par défaut, le logo du studio apparaît sur les fiches de la grille. Activez cette option pour toujours afficher le nom du studio au format texte à la place."
                 }
             },
             "scene_player": {
@@ -820,7 +829,7 @@
                 "heading": "Mur de scènes et marqueurs",
                 "options": {
                     "display_title": "Afficher le titre et étiquettes",
-                    "toggle_sound": "Activer le son"
+                    "toggle_sound": "Activer le son lors du survol de l'aperçu"
                 }
             },
             "scroll_attempts_before_change": {
@@ -887,6 +896,15 @@
                 "enable": "Activer et actualiser",
                 "overlay_message": "Le mode dépannage est actif. Toutes les personnalisations sont désactivées.",
                 "exit": "Sortir"
+            },
+            "scene_view": {
+                "heading": "Vu de la scène",
+                "options": {
+                    "preview_volume": {
+                        "description": "Volume de l'aperçu lorsque vous passez la souris sur une scène. Définir sur 0 pour couper le son.",
+                        "heading": "Volume des aperçus"
+                    }
+                }
             }
         },
         "advanced_mode": "Mode avancé",
@@ -995,7 +1013,8 @@
         "merge": {
             "destination": "Destination",
             "empty_results": "Les valeurs des champs de destination seront inchangées.",
-            "source": "Source"
+            "source": "Source",
+            "combined": "Combiné"
         },
         "performers_found": "{count} performeurs trouvés",
         "reassign_entity_title": "{count, plural, one {Réaffecté {singularEntity}} other {Réaffectés {pluralEntity}}}",
@@ -1692,5 +1711,7 @@
     "parent_folder": "Répertoire parent",
     "sub_folder_depth": "Profondeur des sous-répertoires (vide pour tous)",
     "sub_folders": "Sous-répertoires",
-    "empty_value": "vide"
+    "empty_value": "vide",
+    "scenes_size": "Taille de la scène",
+    "refer_to": "Merci de consulter {link}."
 }
diff --git a/ui/v2.5/src/locales/hr-HR.json b/ui/v2.5/src/locales/hr-HR.json
index 2f9e4134b..48aba0e25 100644
--- a/ui/v2.5/src/locales/hr-HR.json
+++ b/ui/v2.5/src/locales/hr-HR.json
@@ -222,9 +222,7 @@
             "latest_version_build_hash": "Izrađen Hash Zadnje Verzije:",
             "new_version_notice": "[NOVO]",
             "release_date": "Datum izdanja:",
-            "stash_discord": "Pridruži se našem {url} kanalu",
             "stash_home": "Stash početna stranica na {url}",
-            "stash_open_collective": "Podrži nas kroz {url}",
             "stash_wiki": "Stash {url} stranica",
             "version": "Verzija"
         },
diff --git a/ui/v2.5/src/locales/hu-HU.json b/ui/v2.5/src/locales/hu-HU.json
index 62f19cbdd..9419776e0 100644
--- a/ui/v2.5/src/locales/hu-HU.json
+++ b/ui/v2.5/src/locales/hu-HU.json
@@ -187,8 +187,7 @@
             "latest_version_build_hash": "Legújabb verzió build hash-e:",
             "check_for_new_version": "Új verzió keresése",
             "new_version_notice": "[ÚJ]",
-            "release_date": "Megjelenés dátuma:",
-            "stash_discord": "Csatlakozz a csatornához {url}"
+            "release_date": "Megjelenés dátuma:"
         },
         "categories": {
             "logs": "Logok",
diff --git a/ui/v2.5/src/locales/id-ID.json b/ui/v2.5/src/locales/id-ID.json
index d408aec7c..8bfce8253 100644
--- a/ui/v2.5/src/locales/id-ID.json
+++ b/ui/v2.5/src/locales/id-ID.json
@@ -526,9 +526,7 @@
             "latest_version": "Versi Mutakhir",
             "release_date": "Tanggal rilis:",
             "new_version_notice": "[BARU]",
-            "stash_discord": "Gabung ke saluran {url} kami",
             "stash_home": "Beranda Stash di {url}",
-            "stash_open_collective": "Dukung kami melalui {url}",
             "version": "Versi",
             "check_for_new_version": "Periksa versi terbaru",
             "build_time": "Waktu dibangun::",
diff --git a/ui/v2.5/src/locales/it-IT.json b/ui/v2.5/src/locales/it-IT.json
index 08f3b9ca3..3a0673567 100644
--- a/ui/v2.5/src/locales/it-IT.json
+++ b/ui/v2.5/src/locales/it-IT.json
@@ -237,9 +237,7 @@
             "latest_version_build_hash": "Hash dell'ultima Versione:",
             "new_version_notice": "[NUOVA]",
             "release_date": "Data di rilascio:",
-            "stash_discord": "Unisciti al nostro canale {url}",
             "stash_home": "Stash homepage su {url}",
-            "stash_open_collective": "Supportaci attraverso {url}",
             "stash_wiki": "Pagina {url} di Stash",
             "version": "Versione"
         },
diff --git a/ui/v2.5/src/locales/ja-JP.json b/ui/v2.5/src/locales/ja-JP.json
index e6519f7d8..a541771ed 100644
--- a/ui/v2.5/src/locales/ja-JP.json
+++ b/ui/v2.5/src/locales/ja-JP.json
@@ -229,9 +229,7 @@
             "latest_version_build_hash": "最新バージョンのビルドハッシュ:",
             "new_version_notice": "[NEW]",
             "release_date": "リリース日:",
-            "stash_discord": "私たちの{url}チャンネルへ参加しませんか",
             "stash_home": "Stashのすべては{url}にあります",
-            "stash_open_collective": "{url}からStashの開発を支援",
             "stash_wiki": "Stashの{url}で疑問を解決",
             "version": "バージョン"
         },
diff --git a/ui/v2.5/src/locales/ko-KR.json b/ui/v2.5/src/locales/ko-KR.json
index 038b870cb..824f5774a 100644
--- a/ui/v2.5/src/locales/ko-KR.json
+++ b/ui/v2.5/src/locales/ko-KR.json
@@ -250,11 +250,11 @@
             "latest_version_build_hash": "최신 버전 빌드 해쉬:",
             "new_version_notice": "[새 버전]",
             "release_date": "출시일:",
-            "stash_discord": "디스코드: {url}",
-            "stash_home": "깃허브: {url}",
-            "stash_open_collective": "후원: {url}",
-            "stash_wiki": "Stash 위키: {url}",
-            "version": "버전"
+            "stash_home": "{url}에서 Stash를 방문해 보세요.",
+            "stash_wiki": "Stash {url} 웹사이트를 확인해 보세요.",
+            "version": "버전",
+            "stash_community": "{forumUrl} 또는 {discordUrl} 커뮤니티 서버에 가입하세요.",
+            "support_us": "{openCollectiveUrl} 또는 {githubSponsorsUrl}를 통해 저희를 지원해 주세요."
         },
         "application_paths": {
             "heading": "앱 경로"
@@ -610,7 +610,11 @@
                 "to_directory": "{directory} 경로로",
                 "warning_blobs": "blob 파일들은 백업 파일에 포함되지 않을 것입니다. 이는, 백업을 완전히 복원하려면 blob 저장 위치에 blob 파일이 존재해야 함을 의미합니다.",
                 "zip": "SQLite 데이터베이스 파일과 blob 파일은 하나의 파일로 압축될 것입니다. (압축 파일 이름: {filename_format})"
-            }
+            },
+            "clean_ignore_zip_contents": "zip 파일 컨텐츠 무시",
+            "clean_ignore_zip_contents_desc": "더 빠르지만 zip 파일 내부에서 제거된 파일이 누락될 수 있습니다. zip 파일 내에서 파일을 삭제하지 않으면 안전하게 활성화할 수 있습니다.",
+            "auto_tag_confirm": "컨텐츠를 기존 메타데이터와 매칭하려 시도합니다.",
+            "auto_tag_warning": "실행하면 되돌릴 수 없으며 잘못 매칭될 수 있습니다."
         },
         "tools": {
             "scene_duplicate_checker": "영상 중복 체크 도구",
@@ -772,7 +776,8 @@
             "scene_list": {
                 "heading": "그리드 뷰",
                 "options": {
-                    "show_studio_as_text": "스튜디오 로고를 텍스트로 표시"
+                    "show_studio_as_text": "스튜디오 로고를 텍스트로 표시",
+                    "show_studio_as_text_desc": "기본적으로 스튜디오 로고는 그리드 카드에 표시됩니다. 스튜디오 이름을 항상 텍스트로 표시하려면 이 옵션을 활성화하십시오."
                 }
             },
             "scene_player": {
@@ -804,7 +809,7 @@
                 "heading": "영상 / 마커 미리보기",
                 "options": {
                     "display_title": "제목과 태그 표시",
-                    "toggle_sound": "소리 켜기"
+                    "toggle_sound": "미리보기 호버에서 소리 재생"
                 }
             },
             "scroll_attempts_before_change": {
@@ -855,6 +860,10 @@
                 "show_all_details": {
                     "description": "활성화되면, 모든 컨텐츠 세부사항이 기본값으로 보여지게 되고, 각각의 세부사항들이 하나의 열에 위아래로 정렬됩니다.",
                     "heading": "모든 세부사항 보여주기"
+                },
+                "show_studio_text": {
+                    "description": "스튜디오 이름을 아이콘 대신 세부 정보에 텍스트로 표시합니다.",
+                    "heading": "스튜디오 텍스트 표시"
                 }
             },
             "performer_list": {
@@ -886,6 +895,15 @@
                 "enable": "활성화 & 다시 불러오기",
                 "overlay_message": "트러블슈팅 모드 활성화 - 모든 사용자 지정 설정이 비활성화됨",
                 "exit": "나가기"
+            },
+            "scene_view": {
+                "heading": "영상 표시",
+                "options": {
+                    "preview_volume": {
+                        "description": "영상을 호버링할 때 표시되는 미리보기의 음량. 0으로 설정하면 음소거.",
+                        "heading": "미리보기 음량"
+                    }
+                }
             }
         },
         "advanced_mode": "고급 설정 모드",
@@ -1046,7 +1064,8 @@
         "merge": {
             "destination": "~으로 병합 (병합 결과)",
             "source": "~을 (병합 대상)",
-            "empty_results": "병합 결과 값이 바뀌지 않을 것입니다."
+            "empty_results": "병합 결과 값이 바뀌지 않을 것입니다.",
+            "combined": "병합됨"
         },
         "reassign_files": {
             "destination": "~으로 재지정"
@@ -1692,5 +1711,7 @@
     "parent_folder": "상위 폴더",
     "sub_folder_depth": "하위 폴더 깊이 (전체일 경우 비워둠)",
     "sub_folders": "하위 폴더",
-    "empty_value": "공백"
+    "empty_value": "공백",
+    "refer_to": "{link}를 참조해 주십시오.",
+    "scenes_size": "영상 크기"
 }
diff --git a/ui/v2.5/src/locales/nb-NO.json b/ui/v2.5/src/locales/nb-NO.json
index 44cf2e6e2..48d5bc411 100644
--- a/ui/v2.5/src/locales/nb-NO.json
+++ b/ui/v2.5/src/locales/nb-NO.json
@@ -221,11 +221,9 @@
             "video_sort_order": "Standard videosortering"
         },
         "about": {
-            "stash_open_collective": "Støtt oss gjennom {url}",
             "version": "Versjon",
             "new_version_notice": "[NY]",
             "release_date": "Utgivelsesdato:",
-            "stash_discord": "Bli med på vår {url} kanal",
             "check_for_new_version": "Sjekk for ny versjon",
             "latest_version": "Siste versjon",
             "latest_version_build_hash": "Siste Versjon Build Hash:",
diff --git a/ui/v2.5/src/locales/nl-NL.json b/ui/v2.5/src/locales/nl-NL.json
index fc44475e2..e937cc33b 100644
--- a/ui/v2.5/src/locales/nl-NL.json
+++ b/ui/v2.5/src/locales/nl-NL.json
@@ -220,9 +220,7 @@
             "latest_version": "Nieuwste versie",
             "latest_version_build_hash": "Controlesome van nieuwste versie:",
             "new_version_notice": "[NIEUW]",
-            "stash_discord": "Neem deel aan ons {url}-kanaal",
             "stash_home": "Stash thuis bij {url}",
-            "stash_open_collective": "Steun ons via {url}",
             "stash_wiki": "Stash {url}-pagina",
             "version": "Versie",
             "release_date": "Uitgebracht op:"
diff --git a/ui/v2.5/src/locales/pl-PL.json b/ui/v2.5/src/locales/pl-PL.json
index 800ab7842..65648f7b8 100644
--- a/ui/v2.5/src/locales/pl-PL.json
+++ b/ui/v2.5/src/locales/pl-PL.json
@@ -138,7 +138,7 @@
         "set_cover": "Ustaw jako okładkę",
         "remove_from_containing_group": "Usuń z grupy",
         "reset_cover": "Przywróć domyślną okładkę",
-        "add_sub_groups": "Dodaj podgrupy",
+        "add_sub_groups": "Dodaj podgrupę",
         "view_history": "Zobacz historię",
         "play": "Odtwarzaj",
         "show_results": "Pokaż wyniki",
@@ -150,7 +150,13 @@
             "close": "Zamknij pasek boczny",
             "open": "Otwórz pasek boczny",
             "toggle": "Przełącz pasek boczny"
-        }
+        },
+        "exclude_lowercase": "wyklucz",
+        "from_clipboard": "Ze schowka",
+        "reveal_in_file_manager": "Pokaż w Menedżerze plików",
+        "select_directory": "Wybierz katalog",
+        "invert_selection": "Odwróć zaznaczenie",
+        "selective_generate": "Generowanie selektywne"
     },
     "actions_name": "Działania",
     "age": "Wiek",
@@ -228,7 +234,8 @@
         "verb_toggle_config": "{toggle} {configuration}",
         "verb_toggle_unmatched": "{toggle} niedopasowane sceny",
         "verb_add_as_alias": "Dodaj zebraną nazwę jako alias",
-        "verb_link_existing": "Połącz z istniejącym"
+        "verb_link_existing": "Połącz z istniejącym",
+        "verb_match_tag": "Dopasuj tag"
     },
     "config": {
         "about": {
@@ -239,9 +246,7 @@
             "latest_version_build_hash": "Hash kompilacji najnowszej wersji:",
             "new_version_notice": "[NOWA]",
             "release_date": "Data wydania:",
-            "stash_discord": "Dołącz do naszego kanału {url}",
             "stash_home": "Dom Stasha na stronie {url}",
-            "stash_open_collective": "Wesprzyj nas poprzez {url}",
             "stash_wiki": "Strona Stash {url}",
             "version": "Wersja"
         },
@@ -297,8 +302,8 @@
                 "generate_api_key": "Wygeneruj klucz API",
                 "log_file": "Plik dziennika",
                 "log_file_desc": "Ścieżka do pliku, do którego mają być zapisywane logi. Puste, aby wyłączyć zapisywanie do pliku. Wymaga ponownego uruchomienia.",
-                "log_http": "Logi dostępu http",
-                "log_http_desc": "Loguje dostęp http do terminala. Wymaga ponownego uruchomienia.",
+                "log_http": "Logi dostępu HTTP",
+                "log_http_desc": "Loguje dostęp HTTP do terminala. Wymaga ponownego uruchomienia.",
                 "log_to_terminal": "Logi do terminala",
                 "log_to_terminal_desc": "Przekazuje logi do terminala oprócz logów do pliku. Zawsze prawdziwe, jeśli logowanie do pliku jest wyłączone. Wymaga ponownego uruchomienia.",
                 "maximum_session_age": "Maksymalny czas trwania sesji",
@@ -531,7 +536,9 @@
                 "skip_single_name_performers": "Pomiń wykonawców z jedną nazwą bez dodatkowego rozróżnienia",
                 "tag_skipped_matches": "Otaguj pominięte dopasowania",
                 "tag_skipped_performers": "Otaguj pominiętych wykonawców",
-                "skip_single_name_performers_tooltip": "Bez włączenia tej opcji wykonawcy o popularnych imionach (np. Samantha, Olga) będą dopasowywani"
+                "skip_single_name_performers_tooltip": "Bez włączenia tej opcji wykonawcy o popularnych imionach (np. Samantha, Olga) będą dopasowywani",
+                "performer_genders": "Płeć wykonawcy",
+                "performer_genders_desc": "Wykonawcy o wybranych płciach zostaną uwzględnieni podczas identyfikacji."
             },
             "import_from_exported_json": "Import z wyeksportowanego pliku JSON w katalogu metadanych. Wymazuje istniejącą bazę danych.",
             "incremental_import": "Import przyrostowy z dostarczonego wyeksportowanego pliku zip.",
@@ -570,7 +577,18 @@
             "generate_sprites_during_scan_tooltip": "Obrazy wyświetlane pod odtwarzaczem wideo ułatwiające nawigację.",
             "optimise_database": "Popraw wydajność, analizując i przebudowując całą bazę danych.",
             "rescan": "Przeskanuj pliki ponownie",
-            "rescan_tooltip": "Przeskanuj ponownie każdy plik w ścieżce. Używane do wymuszenia aktualizacji metadanych plików i ponownego skanowania plików ZIP."
+            "rescan_tooltip": "Przeskanuj ponownie każdy plik w ścieżce. Używane do wymuszenia aktualizacji metadanych plików i ponownego skanowania plików ZIP.",
+            "auto_tag_warning": "Tego procesu nie można cofnąć i może on powodować wygenerowanie nieprawidłowych wyników.",
+            "backup_database": {
+                "destination": "Miejsce docelowe",
+                "download": "Pobierz kopię zapasową",
+                "include_blobs": "Uwzględnij bloby w kopii zapasowej",
+                "to_directory": "Do {katalog}"
+            },
+            "clean_ignore_zip_contents": "Ignoruj zawartość pliku zip",
+            "generate_image_phashes_during_scan": "Wygeneruj skróty percepcyjne obrazów",
+            "generate_image_phashes_during_scan_tooltip": "Do deduplikacji i identyfikacji.",
+            "optimise_database_warning": "**Ostrzeżenie:** podczas wykonywania tego zadania wszelkie operacje modyfikujące bazę danych nie powiodą się. W zależności od rozmiaru bazy danych proces może potrwać kilka minut. Wymagane jest co najmniej tyle wolnego miejsca na dysku, ile wynosi rozmiar bazy danych, jednak zalecane jest 1,5 razy więcej."
         },
         "tools": {
             "scene_duplicate_checker": "Sprawdzacz duplikatów scen",
@@ -820,9 +838,22 @@
             },
             "sfw_mode": {
                 "heading": "Tryb treści SFW"
+            },
+            "troubleshooting_mode": {
+                "button": "Tryb rozwiązywania problemów",
+                "dialog_title": "Włącz tryb rozwiązywania problemów",
+                "dialog_description": "To tymczasowo wyłączy wszystkie dostosowania, aby ułatwić diagnozowanie problemów:",
+                "dialog_item_plugins": "Wszystkie wtyczki",
+                "dialog_item_css": "Własny CSS",
+                "dialog_item_js": "Własny JavaScript",
+                "dialog_reload_note": "Strona zostanie automatycznie odświeżona.",
+                "enable": "Włącz i odśwież"
             }
         },
-        "advanced_mode": "Tryb zaawansowany"
+        "advanced_mode": "Tryb zaawansowany",
+        "changelog": {
+            "header": "Lista zmian"
+        }
     },
     "configuration": "Konfiguracja",
     "countables": {
@@ -1016,7 +1047,7 @@
         "only_select_matching_codecs": "Zaznacz tylko wtedy, gdy wszystkie kodeki w grupie duplikatów się zgadzają",
         "select_oldest": "Zaznacz najstarszy plik w grupie duplikatów",
         "select_none": "Odznacz wszystko",
-        "select_options": "Ustawienia zaznaczania…",
+        "select_options": "Wybierz opcje…",
         "select_youngest": "Zaznacz najmłodszy plik w grupie duplikatów"
     },
     "duplicated_phash": "Duplikaty (phash)",
@@ -1523,5 +1554,7 @@
     },
     "include_sub_studio_content": "Uwzględnij zawartość podstudia",
     "include_sub_tag_content": "Uwzględnij zawartość podtaga",
-    "odate_recorded_no_sfw": "Nie zarejestrowano polubień"
+    "odate_recorded_no_sfw": "Nie zarejestrowano polubień",
+    "career_end": "Koniec kariery",
+    "career_start": "Początek kariery"
 }
diff --git a/ui/v2.5/src/locales/pt-BR.json b/ui/v2.5/src/locales/pt-BR.json
index 3b5856ca5..18370c774 100644
--- a/ui/v2.5/src/locales/pt-BR.json
+++ b/ui/v2.5/src/locales/pt-BR.json
@@ -1,7 +1,7 @@
 {
     "actions": {
         "add": "Adicionar",
-        "add_directory": "Adicionar diretório",
+        "add_directory": "Adicionar  Pasta",
         "add_entity": "Adicionar {entityType}",
         "add_to_entity": "Adicionar em {entityType}",
         "allow": "Permitir",
@@ -152,7 +152,14 @@
             "open": "Abrir barra lateral",
             "toggle": "Alternar barra lateral"
         },
-        "invert_selection": "Inverter Seleção"
+        "invert_selection": "Inverter Seleção",
+        "create_parent_tag": "Criar Tag Pai",
+        "exclude_lowercase": "Deletar",
+        "from_clipboard": "Colar da Área de Transferência",
+        "reveal_in_file_manager": "Mostrar no Explorer",
+        "save_and_new": "Salvar & Abrir Novo",
+        "select_directory": "Selecione a Pasta",
+        "selective_generate": "Generação Seletiva"
     },
     "actions_name": "Ações",
     "age": "Idade",
@@ -206,7 +213,8 @@
                 "blacklist_duplicate": "Lista negra duplicada"
             },
             "performer_genders": {
-                "heading": "Gêneros de artistas"
+                "heading": "Gêneros de artistas",
+                "description": "Atores e atrizes com estes gêneros aparecerão quando realizar a tagging das cenas."
             }
         },
         "noun_query": "Query",
@@ -228,7 +236,11 @@
         "verb_scrape_all": "Buscar tudo",
         "verb_submit_fp": "Enviar {fpCount, plural, one{# impressão digital} other{# impressões digitais}}",
         "verb_toggle_config": "{toggle} {configuration}",
-        "verb_toggle_unmatched": "{toggle} cenas incomparáveis"
+        "verb_toggle_unmatched": "{toggle} cenas incomparáveis",
+        "verb_add_as_alias": "Adicionar o Nome Baixado como um Alias",
+        "verb_match_tag": "Match com a  Tag",
+        "verb_scrape_selected": "Scrapping selecionado",
+        "verb_link_existing": "Link ao existente"
     },
     "config": {
         "about": {
@@ -239,9 +251,7 @@
             "latest_version_build_hash": "Hash do executável da última versão:",
             "new_version_notice": "[NOVA]",
             "release_date": "Data de Lançamento:",
-            "stash_discord": "Junte-se ao nosso servidor no {url}",
             "stash_home": "Stash home no {url}",
-            "stash_open_collective": "Apoie-nos através de {url}",
             "stash_wiki": "Página da Stash {url}",
             "version": "Versão"
         },
@@ -281,7 +291,8 @@
             "until_restart": "até reiniciar",
             "video_sort_order": "Ordem de classificação de vídeo padrão",
             "video_sort_order_desc": "Ordem para classificar os vídeos por padrão.",
-            "server_port": "Porta do Servidor"
+            "server_port": "Porta do Servidor",
+            "server_port_desc": "Qual a porta que o servidor DLNA deve utilizar?\nRequer o restart do serviço depois de alterar o valor."
         },
         "general": {
             "auth": {
@@ -306,7 +317,9 @@
                 "password_desc": "Senha para acesso Stash. Deixe em branco para desativar a autenticação do usuário",
                 "stash-box_integration": "Integração com Stash-box",
                 "username": "Usuário",
-                "username_desc": "Username para acessar o Stash. Deixe em branco para desativar a autenticação do usuário"
+                "username_desc": "Username para acessar o Stash. Deixe em branco para desativar a autenticação do usuário",
+                "log_file_max_size": "Tamanho máximo do log a manter",
+                "log_file_max_size_desc": "Tamanho máximo (em MB) do arquivo de log, amtes do mesmo ser comprimido. O valor 0 desbilita a função. Após alterar, reinicialize o software"
             },
             "backup_directory_path": {
                 "description": "Ditetório para aquivos de backup do banco de dados SQLite",
@@ -320,15 +333,15 @@
                 "description": "Onde armazenar dados binários, como capas de cenas, artista, estúdio e imagens de tags. Após alterar esse valor, os dados existentes devem ser migrados usando as tarefas Migração de blobs. Consulte a página Tarefas para migração.",
                 "heading": "Tipo de armazenamento de dados binários"
             },
-            "cache_location": "Localização do diretório do cache",
+            "cache_location": "Localização do diretório do cache. NECESSÁRIO se estiver fazendo streaming via HLS ou DASH.",
             "cache_path_head": "Caminho do cache",
             "calculate_md5_and_ohash_desc": "Calcular MD5 checksum além do oshash. A ativação fará com que as escaneamentos iniciais sejam mais lentos. Nomeação de arquivo Hash deve ser definido para oshash para desabilitar o cálculo MD5.",
             "calculate_md5_and_ohash_label": "Calcular MD5 para vídeos",
             "check_for_insecure_certificates": "Verifique se há certificados inseguros",
-            "check_for_insecure_certificates_desc": "Alguns sites usam ssl certificados inseguros. Quando desmarcado o scraper pula a verificação de certificados inseguros e permite o scraping desses sites. Se você receber um erro de certificado quando scraping desmarque isto.",
+            "check_for_insecure_certificates_desc": "Alguns sites usam SSL certificados inseguros. Quando desmarcado o scraper pula a verificação de certificados inseguros e permite o scraping desses sites. Se você receber um erro de certificado quando scraping desmarque isto.",
             "chrome_cdp_path": "Caminho do Chrome CDP",
             "chrome_cdp_path_desc": "Caminho do arquivo para o executavel do Chrome, ou um endereço remoto (começando com http:// ou https://, por exemplo http://localhost:9222/json/version) para uma instância do Chrome.",
-            "create_galleries_from_folders_desc": "Se marcado, cria galerias de pastas contendo imagens.",
+            "create_galleries_from_folders_desc": "Se marcado, cria galerias A partir de pastas contendo imagens. Para excluir pastas, crie um arquivo sem extensão chamado .nogallery na pasta. Para adicionar sobrepondo a esta opção,  crie um arquivo sem extensão chamado .forcegallery na pasta.",
             "create_galleries_from_folders_label": "Crie galerias de pastas contendo imagens",
             "database": "Banco de Dados",
             "db_path_head": "Caminho do banco de dados",
@@ -344,18 +357,37 @@
                 },
                 "live_transcode": {
                     "input_args": {
-                        "desc": "Avançado: Argumentos adicionais para passar para o ffmpeg antes do campo de entrada ao transcodificar vídeo ao vivo."
+                        "desc": "Avançado: Argumentos adicionais para passar para o ffmpeg antes do campo de entrada ao transcodificar vídeo ao vivo.",
+                        "heading": "Argumentos de Entrada para Transcodificação ao Vivo com FFmpeg"
+                    },
+                    "output_args": {
+                        "desc": "Avançado: Argumentos adicionais a serem passados para o ffmpeg antes do campo de saída ao transcodificar vídeo ao vivo.",
+                        "heading": "Argumentos de Saída para Transcodificação ao Vivo com FFmpeg"
                     }
                 },
                 "download_ffmpeg": {
-                    "heading": "Baixar o FFmpeg"
+                    "heading": "Baixar o FFmpeg",
+                    "description": "Faz o download do FFmpeg para o diretório de configuração e limpa os caminhos do ffmpeg e ffprobe para que sejam localizados a partir do diretório de configuração."
+                },
+                "ffmpeg_path": {
+                    "description": "Caminho para o executável do ffmpeg (não apenas a pasta). Se vazio, o ffmpeg será localizado a partir do ambiente via $PATH, do diretório de configuração, ou de $HOME/.stash.",
+                    "heading": "Caminho para o executável do FFmpeg"
+                },
+                "ffprobe_path": {
+                    "description": "Caminho para o executável do ffprobe (não apenas a pasta). Se vazio, o ffprobe será localizado a partir do ambiente via $PATH, do diretório de configuração, ou de $HOME/.stash.",
+                    "heading": "Caminho do executável do FFprobe."
+                },
+                "transcode": {
+                    "input_args": {
+                        "desc": "Avançado: Argumentos adicionais a serem passados para o ffmpeg antes do campo de entrada ao gerar vídeo."
+                    }
                 }
             },
-            "gallery_ext_desc": "Lista delimitada por vírgulas de extensões de arquivo que serão identificadas como arquivos ZIP da galeria.",
+            "gallery_ext_desc": "Lista delimitada por vírgulas (.csv) de extensões de arquivo que serão identificadas como arquivos ZIP da galeria.",
             "gallery_ext_head": "Extensões zip da galeria",
             "generated_file_naming_hash_desc": "Use MD5 ou oshash para nomeação de arquivos gerados. Mudando isso requer que todas as cenas tenham o valor MD5/oshash populado. Depois de alterar este valor, arquivos gerados existentes precisarão ser migrados ou regenerados. Veja a página de tarefas para migração.",
             "generated_file_naming_hash_head": "Hash de nomeação de arquivo gerado",
-            "generated_files_location": "Local de diretório para os arquivos gerados (marcadores de cena, pré visualizações de cena, sprites, etc)",
+            "generated_files_location": "Local de diretório para os arquivos gerados (marcadores de cena, pré visualizações de cena, sprites, etc).",
             "generated_path_head": "Caminho gerado",
             "hashing": "Criação de Hash",
             "image_ext_desc": "Lista delimitada por vírgulas de extensões de arquivo que serão identificadas como imagens.",
@@ -363,9 +395,9 @@
             "include_audio_desc": "Inclui stream de áudio quando gerar pré-visualizações.",
             "include_audio_head": "Incluir áudio",
             "logging": "Registro",
-            "maximum_streaming_transcode_size_desc": "Tamanho máximo para streams transcodificadas",
+            "maximum_streaming_transcode_size_desc": "Tamanho máximo para streams transcodificadas.",
             "maximum_streaming_transcode_size_head": "Tamanho máximo de transcodação de streaming",
-            "maximum_transcode_size_desc": "Tamanho máximo para transcodificações geradas",
+            "maximum_transcode_size_desc": "Tamanho máximo para transcodificações geradas.",
             "maximum_transcode_size_head": "Tamanho máximo de transcodificação",
             "metadata_path": {
                 "description": "Localização do diretório usado durante importação ou exportação completa dos meta-dados",
@@ -376,20 +408,23 @@
             "parallel_scan_head": "Escaneamento/geração paralela",
             "preview_generation": "Geração de pré-visualização",
             "python_path": {
-                "description": "Caminho do executável do Python. Utilizado para scripts de scrape e plugins. Se em branco, o caminho do Python será resolvido a partir do ambiente",
+                "description": "Caminho do executável do Python. Utilizado para scripts de scrape e plugins. Se em branco, o caminho do Python será resolvido a partir do PATH do sistema",
                 "heading": "Caminho do Python"
             },
-            "scraper_user_agent": "Agente de Usuário do Extrator",
-            "scraper_user_agent_desc": "User-Agent string usado durante solicitações http do scrape",
+            "scraper_user_agent": "Agente de Usuário do Scraper",
+            "scraper_user_agent_desc": "User-Agent string usado durante solicitações http dos Scrapers.",
             "scrapers_path": {
                 "description": "Caminho para o diretório para os arquivos de configuração de scrapers",
                 "heading": "Caminho dos scrapers"
             },
             "scraping": "Extração",
-            "sqlite_location": "Localização do arquivo para o banco de dados SQLite (requer reinicialização)",
+            "sqlite_location": "Localização do arquivo para o banco de dados SQLite (requer reinicialização). AVISO - Armazenar a database em um sistema físco diferente do qual o Stash server está rodando é terminantemente não suportado.",
             "video_ext_desc": "Lista delimitada por vírgulas de extensões de arquivo que serão identificadas como vídeos.",
             "video_ext_head": "Extensões de vídeo",
-            "video_head": "Vídeo"
+            "video_head": "Vídeo",
+            "sprite_generation_head": "Generaçao de sprite",
+            "sprite_interval_desc": "Tempo entre cada generação de sprites (em segundos).",
+            "sprite_interval_head": "Intervalo de sprite"
         },
         "library": {
             "exclusions": "Exclusões",
@@ -577,7 +612,7 @@
                 "heading": "Idioma"
             },
             "max_loop_duration": {
-                "description": "Duração máxima da cena onde o player realizará o loop do vídeo - 0 para desabilitar",
+                "description": "Duração máxima da cena onde o player realizará o loop do vídeo.  Utilize - 0 para desabilitar a função.",
                 "heading": "Duração máxima do loop"
             },
             "menu_items": {
@@ -626,7 +661,7 @@
                 "heading": "Muro de cenas/marcadores",
                 "options": {
                     "display_title": "Exibir título e etiquetas",
-                    "toggle_sound": "Habilitar som"
+                    "toggle_sound": "Habilitar som quando estiver sobre a imagem de previsão"
                 }
             },
             "scroll_attempts_before_change": {
@@ -640,9 +675,19 @@
             "title": "Interface de usuário",
             "performer_list": {
                 "heading": "Lista de artistas"
+            },
+            "custom_javascript": {
+                "heading": "Custom  JavaScript",
+                "option_label": "Custom JavaScript ativado"
+            },
+            "custom_locales": {
+                "description": "Substituir individualmente as strings de local. Visite o link https://github.com/stashapp/stash/blob/develop/ui/v2.5/src/locales/en-GB.json para acessar a Master list. A página deve ser recarregada para as alterações surtirem efeito."
             }
         },
-        "advanced_mode": "Modo Avançado"
+        "advanced_mode": "Modo Avançado",
+        "changelog": {
+            "header": "Revisões"
+        }
     },
     "configuration": "Configuração",
     "countables": {
@@ -729,9 +774,9 @@
             "image_previews_tooltip": "Pré-visualizações WebP animadas, necessárias somente se o Tipo de Pré-visualização estiver configurado para Imagem Animada.",
             "interactive_heatmap_speed": "Gerar heatmaps e velocidades para cenas interativas",
             "marker_image_previews": "Pré-visualizações de Imagem Animada para Marcadores",
-            "marker_image_previews_tooltip": "Pré-visualizações WebP animadas para marcadores, necessário apenas de o Tipo de Pré-visualização estiver configurado para Imagem Animada.",
+            "marker_image_previews_tooltip": "Pré-visualizações WebP animadas para marcadores, necessário apenas de o Tipo de Pré-visualização estiver configurado para Imagem Animada.  WEBP utiliza menos CPU do que as pré-visualização de vídeo, mas são geradas em sua adição, e por isso ocupam mais espaço.",
             "marker_screenshots": "Capturas de tela de Marcadores",
-            "marker_screenshots_tooltip": "Imagens JPG estáticas para marcadores, necessário apenas se o Tipo de Pré-visualização estiver configurado para Imagem Estática.",
+            "marker_screenshots_tooltip": "Imagens JPG estáticas para marcadores.",
             "markers": "Pré-visualizações de Marcadores",
             "markers_tooltip": "Vídeos de 20 segundos que iniciam em dado código de tempo.",
             "override_preview_generation_options": "Sobrepor as opções da geração de pré-visualização",
@@ -1003,7 +1048,7 @@
         },
         "paths": {
             "database_filename_empty_for_default": "nome do arquivo do banco de dados (em branco para usar padrão)",
-            "description": "A seguir, precisamos determinar onde achar sua coleção pornô, onde armazenar o banco de dados do Stash e arquivos de suporte gerados. Estas configurações podem ser alteradas posteriormente se necessário.",
+            "description": "A seguir, precisamos determinar onde achar sua coleção de conteúdos, onde armazenar o banco de dados do Stash e arquivos de suporte gerados. Estas configurações podem ser alteradas posteriormente se necessário.",
             "path_to_generated_directory_empty_for_default": "caminho para o diretório de arquivos de suporte gerados (deixar em branco para usar padrão)",
             "set_up_your_paths": "Configure seus diretórios",
             "stash_alert": "Nenhum caminho para sua biblioteca foi selecionado. Nenhum arquivo poderá ser escaneado para o Stash. Tem certeza?",
@@ -1011,8 +1056,8 @@
             "where_can_stash_store_its_database_description": "Stash usa um banco de dados sqlite para armazenar os meta-dados de sua coleção. Por padrão ele será criado como <code>stash-go.sqlite</code> no diretório contendo seu arquivo de configuração. Se deseja alterar isto, por favor indique um arquivo com caminho absoluto ou relativo ao diretório de trabalho atual.",
             "where_can_stash_store_its_generated_content": "Onde o Stash pode armazenar os arquivos de suporte que forem gerados?",
             "where_can_stash_store_its_generated_content_description": "A fim de fornecer miniaturas, pré-visualizações e sprites, Stash gera imagens e vídeos. Isto também inclui transcodificações para formatos de arquivos não suportados. Por padrão, o Stash irá criar o diretório <code>generated</code> no diretório contento seu arquivo de configuração. Se deseja alterar onde esses arquivos gerados serão armazenados, por favor indique um caminho absoluto ou relativo ao diretório de trabalho atual. O stash irá criar este diretório caso ele já não exista.",
-            "where_is_your_porn_located": "Onde seu pornô está localizado?",
-            "where_is_your_porn_located_description": "Adicione diretórios contendo seus vídeos e imagens pornô. O Stash irá usar esses diretórios para encontrar vídeos e imagens durante o scan."
+            "where_is_your_porn_located": "Onde seu conteúdo está localizado?",
+            "where_is_your_porn_located_description": "Adicione diretórios contendo seus vídeos e imagens . O Stash irá usar esses diretórios para encontrar vídeos e imagens durante o scan."
         },
         "stash_setup_wizard": "Assistente de configuração Stash",
         "success": {
@@ -1030,7 +1075,7 @@
         "welcome": {
             "config_path_logic_explained": "Stash tenta encontrar o arquivo de configuração (<code>config.yml</code>) a partir do diretório de trabalho atual, caso não o encontre lá, tentará encontra-lo em <code>$HOME/.stash/config.yml</code> (no Windows, será <code>%USERPROFILE%\\.stash\\config.yml</code>). Você também pode fazer o Stash ler um arquivo de configuração específico ao executar a aplicação com as opções <code>-c '<caminho para o arquivo de configuração>'</code> ou <code>--config '<caminho para o arquivo de configuração>'</code>.",
             "in_current_stash_directory": "No diretório <code>$HOME/.stash</code>",
-            "in_the_current_working_directory": "No diretório de trabalho atual",
+            "in_the_current_working_directory": "No <code>{path}</code>, o caminho de trabalho, atualmente é:",
             "next_step": "Caso esteja pronto para criar um novo sistema, escolha onde você deseja armazenar seu arquivo de configuração e clique Próximo.",
             "store_stash_config": "Onde quer armazenar a configuração do Stash?",
             "unable_to_locate_config": "Caso esteja lendo isto, então o Stash não pôde encontrar uma configuração existente. Este assistente te guiará durante o processo de criar uma nova configuração.",
@@ -1101,5 +1146,8 @@
     "age_on_date": "{age} na produção",
     "weight_kg": "Peso (kg)",
     "unknown_date": "Data desconhecida",
-    "urls": "URLs"
+    "urls": "URLs",
+    "career_end": "Ano Final",
+    "career_start": "Ano Inicial",
+    "zip_file_count": "Contagem de Arquivos Zip"
 }
diff --git a/ui/v2.5/src/locales/ro-RO.json b/ui/v2.5/src/locales/ro-RO.json
index 293d85c70..ec2c714e6 100644
--- a/ui/v2.5/src/locales/ro-RO.json
+++ b/ui/v2.5/src/locales/ro-RO.json
@@ -197,8 +197,6 @@
             "check_for_new_version": "Verifică pentru o versiune nouă",
             "latest_version": "Ultima Versiune",
             "new_version_notice": "[NOU]",
-            "stash_discord": "Alăturați-vă {url} canalului nostru",
-            "stash_open_collective": "Susține-ne prin {url}",
             "version": "Versiune"
         },
         "application_paths": {
diff --git a/ui/v2.5/src/locales/ru-RU.json b/ui/v2.5/src/locales/ru-RU.json
index ccc28b459..6adf13e0d 100644
--- a/ui/v2.5/src/locales/ru-RU.json
+++ b/ui/v2.5/src/locales/ru-RU.json
@@ -227,9 +227,7 @@
             "latest_version": "Последняя версия",
             "latest_version_build_hash": "Контрольная сумма последний версии сборки:",
             "new_version_notice": "[НОВЫЙ]",
-            "stash_discord": "Присоединяйтесь к нашему {url} серверу",
             "stash_home": "Stash страница на {url}",
-            "stash_open_collective": "Поддержи нас через {url}",
             "stash_wiki": "Stash {url} страница",
             "version": "Версия",
             "release_date": "Дата выхода:"
diff --git a/ui/v2.5/src/locales/sv-SE.json b/ui/v2.5/src/locales/sv-SE.json
index d5f1a46a7..0b7822842 100644
--- a/ui/v2.5/src/locales/sv-SE.json
+++ b/ui/v2.5/src/locales/sv-SE.json
@@ -247,9 +247,7 @@
             "latest_version_build_hash": "Senaste versionens bygghash:",
             "new_version_notice": "[Ny]",
             "release_date": "Utgivningsdatum:",
-            "stash_discord": "Gå med i vår {url}-kanal",
             "stash_home": "Stash hemma vid {url}",
-            "stash_open_collective": "Stötta oss genom {url}",
             "stash_wiki": "Stash {url}-sida",
             "version": "Version"
         },
diff --git a/ui/v2.5/src/locales/th-TH.json b/ui/v2.5/src/locales/th-TH.json
index 592f838c6..8e16ea646 100644
--- a/ui/v2.5/src/locales/th-TH.json
+++ b/ui/v2.5/src/locales/th-TH.json
@@ -200,9 +200,7 @@
             "latest_version": "เวอร์ชันล่าสุด",
             "latest_version_build_hash": "เวอร์ชันล่าสุด Hash:",
             "new_version_notice": "[ใหม่]",
-            "stash_discord": "เข้าร่วมดิสคอร์ดของเรา {url}",
             "stash_home": "หน้าเว็บหลักของ Stash {url}",
-            "stash_open_collective": "สนับสนุนเราได้ที่ {url}",
             "stash_wiki": "หน้าเว็บ {url}",
             "version": "เวอร์ชัน",
             "release_date": "วันที่วางขาย:"
diff --git a/ui/v2.5/src/locales/tr-TR.json b/ui/v2.5/src/locales/tr-TR.json
index 3f19cd59c..c26536d01 100644
--- a/ui/v2.5/src/locales/tr-TR.json
+++ b/ui/v2.5/src/locales/tr-TR.json
@@ -1,7 +1,7 @@
 {
     "actions": {
         "add": "Ekle",
-        "add_directory": "Dizin Ekle",
+        "add_directory": "Dizin ekle",
         "add_entity": "{entityType} Ekle",
         "add_to_entity": "Buraya Ekle: {entityType}",
         "allow": "İzin Ver",
@@ -148,7 +148,8 @@
         "show_results": "Sonuçları göster",
         "show_count_results": "{count} sonucu göster",
         "load": "Yükle",
-        "load_filter": "Filtre yükle"
+        "load_filter": "Filtre yükle",
+        "select_directory": "Dizin seç"
     },
     "actions_name": "Eylemler",
     "age": "Yaş",
@@ -215,9 +216,7 @@
             "latest_version": "Son Sürüm",
             "latest_version_build_hash": "Son Sürüm İmzası:",
             "new_version_notice": "[YENİ]",
-            "stash_discord": "{url} kanalımıza katılın",
             "stash_home": "{url} üzerinde Stash sayfası",
-            "stash_open_collective": "Bizi {url} aracılığıyla destekleyin",
             "stash_wiki": "Stash {url} sayfası",
             "version": "Sürüm",
             "release_date": "Yayın tarihi:"
@@ -253,8 +252,8 @@
             "until_restart": "yeniden başlatana kadar",
             "disallowed_ip": "İzin verilmeyen IP",
             "successfully_cancelled_temporary_behaviour": "Geçici davranış başarıyla iptal edildi",
-            "video_sort_order": "Varsayılan Video Sıralama Düzeni",
-            "server_port": "Sunucu Bağlantı Noktası",
+            "video_sort_order": "Varsayılan video sıralama düzeni",
+            "server_port": "Sunucu bağlantı noktası",
             "disabled_dlna_temporarily": "DLNA geçici olarak devre dışı bırakıldı",
             "enabled_dlna_temporarily": "DLNA geçici olarak etkinleştirildi",
             "video_sort_order_desc": "Videoları varsayılan olarak sıralayın.",
@@ -262,7 +261,7 @@
         },
         "general": {
             "auth": {
-                "api_key": "API Anahtarı",
+                "api_key": "API anahtarı",
                 "api_key_desc": "Harici sistemler için API anahtarı. Yalnızca kullanıcı adı ya da şifre yapılandırıldığında gereklidir. API anahtarı oluşturulmadan önce kullanıcı adı kaydedilmelidir.",
                 "authentication": "Kimlik Doğrulama",
                 "clear_api_key": "API anahtarını temizle",
@@ -286,7 +285,7 @@
                 "username_desc": "Stash'e erişim için kullanıcı adı. Kullanıcı kimlik doğrulamasını devre dışı bırakmak için boş bırakın"
             },
             "cache_location": "Önbellek dizininin konumudur. HLS (Apple cihazlarında olduğu gibi) veya DASH kullanılarak akış yapılıyorsa gereklidir.",
-            "cache_path_head": "Önbellek Yolu",
+            "cache_path_head": "Önbellek yolu",
             "calculate_md5_and_ohash_desc": "oshash'in yanısıra MD5 checksum'ı da hesapla. Bu özelliği etkinleştirmek tarama işlemini yavaşlatacaktır. MD5 hesaplamasını devre dışı bırakmak için dosya adı imzası (hash) oshash olarak ayarlanmalıdır.",
             "calculate_md5_and_ohash_label": "Videolar için MD5 hesapla",
             "check_for_insecure_certificates": "Güvensiz sertifikaları kontrol et",
@@ -295,7 +294,7 @@
             "chrome_cdp_path_desc": "Chrome yürütülebilir dosyasının dosya yolu veya bir Chrome örneğinin uzak adresi (http:// veya https:// ile başlayan, örneğin http://localhost:9222/json/version).",
             "create_galleries_from_folders_desc": "Seçili ise resim içeren dizinlerden galeriler oluşturur.",
             "create_galleries_from_folders_label": "Resim içeren dizinlerden galeri oluştur",
-            "db_path_head": "Veritabanı Yolu",
+            "db_path_head": "Veritabanı yolu",
             "directory_locations_to_your_content": "İçeriğiniz için dizin konumları",
             "excluded_image_gallery_patterns_desc": "Tarama ve Temizleme işlemine eklenmeyecek Resim ve Galeri dosyaları/dosya konumları için kurallı ifadeler (Regexp)",
             "excluded_image_gallery_patterns_head": "Dışta tutulan Resim/Galeri Kuralları",
@@ -389,8 +388,8 @@
             },
             "gallery_cover_regex_desc": "Regexp, bir resmi galeri kapağı olarak tanımlamak için kullanılır",
             "backup_directory_path": {
-                "heading": "Yedek Dizin Yolu",
-                "description": "SQLite veritabanı dosya yedekleri için dizin konumu"
+                "heading": "Yedek dizin yolu",
+                "description": "SQLite veritabanı dosya yedekleri için dizin konumu."
             },
             "python_path": {
                 "heading": "Python Yürütülebilir Yolu",
diff --git a/ui/v2.5/src/locales/uk-UA.json b/ui/v2.5/src/locales/uk-UA.json
index 376311012..da4453a9d 100644
--- a/ui/v2.5/src/locales/uk-UA.json
+++ b/ui/v2.5/src/locales/uk-UA.json
@@ -229,16 +229,16 @@
         "about": {
             "check_for_new_version": "Перевірити наявність нової версії",
             "latest_version": "Остання Версія",
-            "stash_discord": "Приєднуйтесь до нашого каналу в {url}",
-            "stash_open_collective": "Підтримайте нас через {url}",
             "version": "Версія",
             "release_date": "Дата випуску:",
-            "stash_home": "Домашня сторінка Stash: {url}",
+            "stash_home": "Домашня сторінка Stash: {url}.",
             "build_time": "Час збірки:",
             "build_hash": "Хеш збірки:",
             "latest_version_build_hash": "Хеш збірки останньої версії:",
             "new_version_notice": "[НОВЕ]",
-            "stash_wiki": "Сторінка Stash на {url}"
+            "stash_wiki": "Сторінка Stash на {url}.",
+            "stash_community": "Приєднуйтесь до нашого спільнотного сервера {forumUrl} або {discordUrl}.",
+            "support_us": "Підтримайте нас через {openCollectiveUrl} або {githubSponsorsUrl}."
         },
         "categories": {
             "changelog": "Список змін",
@@ -513,7 +513,7 @@
             "generate_thumbnails_during_scan": "Генерувати мініатюри для зображень",
             "generated_content": "Згенерований контент",
             "maintenance": "Обслуговування",
-            "incremental_import": "Інкрементальний імпорт із наданого ZIP-архіву експорту.",
+            "incremental_import": "Інкрементальний імпорт із наданого zip-архіву експорту.",
             "import_from_exported_json": "Імпорт з експортованого JSON у каталозі метаданих. Повністю очищає існуючу базу даних.",
             "migrate_hash_files": "Використовується після зміни налаштувань хешування імен файлів для перейменування існуючих файлів у новий формат.",
             "migrate_scene_screenshots": {
@@ -524,9 +524,9 @@
             "migrations": "Міграції",
             "optimise_database": "Спроба покращити продуктивність шляхом аналізу та повної перебудови файлу бази даних.",
             "only_dry_run": "Виконати лише тестовий запуск (Dry run). Нічого не видаляти",
-            "optimise_database_warning": "Увага: під час виконання цього завдання будь-які операції зміни бази даних будуть недоступні. Це може зайняти кілька хвилин. Необхідно мати вільного місця на диску щонайменше як розмір вашої БД (рекомендовано 1.5x).",
+            "optimise_database_warning": "Увага: під час виконання цього завдання будь-які операції зміни бази даних будуть недоступні. Це може зайняти кілька хвилин. Необхідно мати вільного місця на диску щонайменше як розмір вашої бази даних (рекомендовано 1.5x).",
             "scan_for_content_desc": "Сканувати новий контент та додати його до бази даних.",
-            "rescan_tooltip": "Пересканувати кожен файл у вказаному шляху. Використовується для примусового оновлення метаданих та пересканування ZIP-архівів.",
+            "rescan_tooltip": "Пересканувати кожен файл у вказаному шляху. Використовується для примусового оновлення метаданих та пересканування zip-архівів.",
             "migrate_blobs": {
                 "description": "Міграція blobs до поточної системи зберігання. Слід виконати після зміни системи зберігання blobs. Опціонально можна видалити старі дані після міграції.",
                 "delete_old": "Видалити старі дані"
@@ -542,7 +542,7 @@
             "generate_image_phashes_during_scan": "Генерувати перцептуальні хеші зображень",
             "generate_image_phashes_during_scan_tooltip": "Для дедуплікації та ідентифікації.",
             "backup_database": {
-                "description": "Виконує резервне копіювання бази даних та BLOB-файлів.",
+                "description": "Виконує резервне копіювання бази даних та blob - файлів.",
                 "destination": "Місце призначення",
                 "download": "Завантажити резервну копію",
                 "include_blobs": "Включити блоби до резервної копії",
@@ -551,7 +551,11 @@
                 "to_directory": "До {каталогу}",
                 "warning_blobs": "Blob-файли не будуть включені до резервної копії. Це означає, що для успішного відновлення з резервної копії blob-файли мають бути присутніми в місці сховища blob-об'єктів.",
                 "zip": "Файл бази даних SQLite та blob-файли будуть стиснуті в один файл з назвою {filename_format}"
-            }
+            },
+            "clean_ignore_zip_contents": "Ігнорувати вміст zip-файлу",
+            "clean_ignore_zip_contents_desc": "Швидше, але файли, видалені всередині zip-архівів, будуть пропущені. Можна ввімкнути, якщо ви не видаляєте файли всередині zip-архівів.",
+            "auto_tag_confirm": "Це спробує зіставити ваш контент з існуючими метаданими.",
+            "auto_tag_warning": "Цей процес не можна скасувати, і він може призвести до неправильних збігів."
         },
         "library": {
             "exclusions": "Виключення",
@@ -620,7 +624,8 @@
             },
             "scene_list": {
                 "options": {
-                    "show_studio_as_text": "Відображати накладення студії як текст"
+                    "show_studio_as_text": "Відображати накладення студії як текст",
+                    "show_studio_as_text_desc": "За замовчуванням логотип студії відображається на картках у сітці. Увімкніть цю опцію, щоб завжди відображати назву студії як текст."
                 },
                 "heading": "Вигляд сітки"
             },
@@ -749,7 +754,11 @@
                     "description": "Відображати фонове зображення на сторінці деталей.",
                     "heading": "Увімкнути фонове зображення"
                 },
-                "heading": "Сторінка деталей"
+                "heading": "Сторінка деталей",
+                "show_studio_text": {
+                    "description": "Завжди відображати назву студії як текст у вікні перегляду деталей, а не як значок.",
+                    "heading": "Показати студію як текст"
+                }
             },
             "preview_type": {
                 "description": "За замовчуванням використовуються відео (mp4). Для зменшення навантаження на ЦП можна використовувати анімовані зображення (webp). Однак їх потрібно генерувати додатково, і вони займають більше місця.",
@@ -799,7 +808,7 @@
                 "heading": "Стіна сцен / маркерів",
                 "options": {
                     "display_title": "Відображати заголовок і теги",
-                    "toggle_sound": "Увімкнути звук"
+                    "toggle_sound": "Увімкнути звук під час попереднього перегляду під час наведення курсора"
                 }
             },
             "title": "Інтерфейс користувача",
@@ -832,6 +841,15 @@
                 "enable": "Увімкнути та перезавантажити",
                 "overlay_message": "Режим діагностики активний — всі власні налаштування вимкнено",
                 "exit": "Вийти"
+            },
+            "scene_view": {
+                "heading": "Перегляд сцени",
+                "options": {
+                    "preview_volume": {
+                        "description": "Гучність попереднього перегляду під час наведення курсора на сцену. Встановіть значення 0, щоб вимкнути звук.",
+                        "heading": "Попередній перегляд гучності"
+                    }
+                }
             }
         },
         "plugins": {
@@ -1044,7 +1062,7 @@
         "md5": "Контрольна сума MD5",
         "phash_meaning": "Перцептивний хеш",
         "oshash_meaning": "Хеш OpenSubtitles",
-        "oshash": "Хеш OSHash"
+        "oshash": "Хеш oshash"
     },
     "metadata": "Метадані",
     "new": "Новий",
@@ -1073,7 +1091,7 @@
             "create_parent_desc": "Створити відсутні батьківські студії або тегувати та оновити дані/зображення для існуючих при повному збігу імен",
             "create_parent_label": "Створити батьківські студії"
         },
-        "updating_untagged_studios_description": "Оновлення спробує знайти відповідність для студій без StashID та оновити їх метадані.",
+        "updating_untagged_studios_description": "Оновлення спробує знайти відповідність для студій без stash id та оновити їх метадані.",
         "refreshing_will_update_the_data": "Оновлення оновить дані будь-яких тегованих студій з екземпляра Stash-Box.",
         "create_or_tag_parent_studios": "Створити відсутні або тегувати існуючі батьківські студії",
         "failed_to_save_studio": "Не вдалося зберегти студію \"{studio}\"",
@@ -1116,7 +1134,7 @@
         "failed_to_save_performer": "Не вдалося зберегти виконавця \"{performer}\"",
         "refreshing_will_update_the_data": "Оновлення оновить дані будь-яких тегованих виконавців з екземпляра Stash-Box.",
         "query_all_performers_in_the_database": "Усі виконавці в базі даних",
-        "updating_untagged_performers_description": "Оновлення спробує знайти відповідність для виконавців без StashID та оновити їх метадані.",
+        "updating_untagged_performers_description": "Оновлення спробує знайти відповідність для виконавців без stash id та оновити їх метадані.",
         "to_use_the_performer_tagger": "Для використання тегера виконавців необхідно налаштувати екземпляр Stash-Box.",
         "update_performers": "Оновити виконавців",
         "add_new_performers": "Додати нових виконавців",
@@ -1256,7 +1274,8 @@
         "merge": {
             "empty_results": "Значення поля призначення залишаться без змін.",
             "destination": "Призначення",
-            "source": "Джерело"
+            "source": "Джерело",
+            "combined": "Комбінований"
         },
         "clear_o_history_confirm": "Ви впевнені, що хочете очистити історію оргазмів?",
         "delete_entity_desc": "{count, plural, one {Ви впевнені, що хочете видалити цей {singularEntity}? Якщо файл також не видалено, цей {singularEntity} буде знову додано під час сканування.} other {Ви впевнені, що хочете видалити ці {pluralEntity}? Якщо файли також не видалені, ці {pluralEntity} будуть знову додані під час сканування.}}",
@@ -1277,7 +1296,7 @@
         "delete_object_overflow": "…та {count} інших {count, plural, one {{singularEntity}} other {{pluralEntity}}}.",
         "export_title": "Експорт",
         "overwrite_filter_warning": "Збережений фільтр \"{entityName}\" буде перезаписано.",
-        "stashid_exists_warning": "Наявний Stash ID для цього Stash-box буде замінено.",
+        "stashid_exists_warning": "Наявний stash id для цього stash-box буде замінено.",
         "studios_found": "Знайдено {count} студій",
         "tags_found": "Знайдено {count} тегів",
         "scrape_results_existing": "Наявні",
@@ -1339,7 +1358,7 @@
             "next_step": "Коли будете готові налаштувати нову систему, натисніть Далі."
         },
         "migrate": {
-            "backup_database_path_leave_empty_to_disable_backup": "Шлях для резервної копії БД (пусто — не створювати):",
+            "backup_database_path_leave_empty_to_disable_backup": "Шлях для резервної копії бази даних (пусто — не створювати):",
             "backup_recommended": "Рекомендується зробити резервну копію вашої існуючої бази даних перед міграцією. Ми можемо зробити це за вас, створивши копію вашої бази даних у <code>{defaultBackupPath}</code>.",
             "migration_failed_help": "Будь ласка, внесіть необхідні виправлення та спробуйте ще раз. Інакше повідомте про помилку на {githubLink} або зверніться за допомогою до {discordLink}.",
             "migration_irreversible_warning": "Процес міграції схеми незворотний. Після виконання міграції ваша база даних буде несумісна з попередніми версіями Stash.",
@@ -1692,5 +1711,7 @@
     "sub_folder_depth": "Глибина підпапок (порожня для всіх)",
     "sub_folders": "Підпапки",
     "parent_folder": "Основна папка",
-    "empty_value": "порожній"
+    "empty_value": "порожній",
+    "scenes_size": "Розмір сцени",
+    "refer_to": "Будь ласка, дивіться {link}."
 }
diff --git a/ui/v2.5/src/locales/vi-VN.json b/ui/v2.5/src/locales/vi-VN.json
index ac6fac5be..e81c5413b 100644
--- a/ui/v2.5/src/locales/vi-VN.json
+++ b/ui/v2.5/src/locales/vi-VN.json
@@ -232,8 +232,6 @@
             "latest_version": "Phiên bản mới nhất",
             "latest_version_build_hash": "Mã bản dựng mới nhất:",
             "release_date": "Ngày phát hành:",
-            "stash_discord": "Tham gia vào kênh {url} của chúng tôi",
-            "stash_open_collective": "Giúp đỡ chúng tôi qua {url}",
             "version": "Phiên bản",
             "build_time": "Thời điểm tạo:",
             "stash_wiki": "Trang {url} của Stash",
diff --git a/ui/v2.5/src/locales/zh-CN.json b/ui/v2.5/src/locales/zh-CN.json
index 283546e79..a69f7bb43 100644
--- a/ui/v2.5/src/locales/zh-CN.json
+++ b/ui/v2.5/src/locales/zh-CN.json
@@ -158,7 +158,8 @@
         "reveal_in_file_manager": "在文件管理器中显示",
         "exclude_lowercase": "排除",
         "from_clipboard": "来自剪贴板",
-        "selective_generate": "选择性生成"
+        "selective_generate": "选择性生成",
+        "create_parent_tag": "创建上级标签"
     },
     "actions_name": "操作",
     "age": "年龄",
@@ -249,9 +250,7 @@
             "latest_version_build_hash": "最新版本识别码:",
             "new_version_notice": "[新版本]",
             "release_date": "发布日期：",
-            "stash_discord": "加入我们的 {url} 频道",
             "stash_home": "Stash 主页在 {url}",
-            "stash_open_collective": "通过 {url} 支持我们",
             "stash_wiki": "Stash {url} 页面",
             "version": "版本"
         },
@@ -609,7 +608,9 @@
                 "to_directory": "到 {directory}",
                 "warning_blobs": "备份中不会包含 Blob 文件。这意味着，要成功从备份中恢复，Blob 文件必须存在于 Blob 存储位置。",
                 "zip": "SQLite 数据库文件和 blob 文件将被压缩到一个文件中，文件名格式为 {filename_format}"
-            }
+            },
+            "clean_ignore_zip_contents": "忽略 zip 文件内容",
+            "clean_ignore_zip_contents_desc": "速度更快，但会遗漏在 zip 压缩文件中删除的文件。如果不在压缩文件中删除文件，启用它是安全的。"
         },
         "tools": {
             "scene_duplicate_checker": "短片重复性检查工具",
@@ -803,7 +804,7 @@
                 "heading": "短片/标记 预览墙",
                 "options": {
                     "display_title": "显示标题和标签",
-                    "toggle_sound": "播放声音"
+                    "toggle_sound": "预览悬停时播放声音"
                 }
             },
             "scroll_attempts_before_change": {
@@ -885,6 +886,15 @@
                 "enable": "启用并刷新",
                 "overlay_message": "故障排查模式已激活——所有自定义功能均被禁用",
                 "exit": "退出"
+            },
+            "scene_view": {
+                "heading": "场景视图",
+                "options": {
+                    "preview_volume": {
+                        "description": "当鼠标悬停在场景上时预览的音量。设置为0以静音。",
+                        "heading": "预览音量"
+                    }
+                }
             }
         },
         "advanced_mode": "高级模式",
@@ -993,7 +1003,8 @@
         "merge": {
             "destination": "目标",
             "empty_results": "目标字段值将不变。",
-            "source": "源"
+            "source": "源",
+            "combined": "已合并"
         },
         "reassign_entity_title": "{count, plural, one {Reassign {singularEntity}} 其它 {Reassign {pluralEntity}}}",
         "reassign_files": {
@@ -1057,7 +1068,8 @@
         "stashid_exists_warning": "此stash-box已存在的stash编号将会被取代。",
         "studios_found": "找到{count} 个工作室",
         "tags_found": "找到{count} 个标签",
-        "scrape_results_missing": "丢失"
+        "scrape_results_missing": "丢失",
+        "edit_entity_count_title": "编辑{count} {count, plural, one {{singularEntity}} other {{pluralEntity}}}"
     },
     "dimensions": "大小",
     "director": "导演",
@@ -1668,7 +1680,12 @@
         "to_use_the_tag_tagger": "使用标记标签的功能，需要配置一个stash-box实例。",
         "untagged_tags": "未标记的标签",
         "update_tags": "更新标签",
-        "updating_untagged_tags_description": "更新未标记的标签时，会尝试匹配那些没有 stashid 的标签并更新元数据。"
+        "updating_untagged_tags_description": "更新未标记的标签时，会尝试匹配那些没有 stashid 的标签并更新元数据。",
+        "config": {
+            "create_parent_desc": "从 stash-box 类别中创建缺失的父母标签，或用完全匹配的名称为现有的父母标签添加标签",
+            "create_parent_label": "创建父母标签"
+        },
+        "create_or_tag_parent_tags": "创建缺失或标记已存在的父母标签"
     },
     "tagger": {
         "config": {
@@ -1684,5 +1701,8 @@
     "include_sub_folders": "包含自文件夹",
     "parent_folder": "父母文件夹",
     "sub_folder_depth": "子文件夹深度(留空为全部)",
-    "sub_folders": "子文件夹"
+    "sub_folders": "子文件夹",
+    "empty_value": "空的",
+    "refer_to": "请看 {link}。",
+    "scenes_size": "场景大小"
 }
diff --git a/ui/v2.5/src/locales/zh-TW.json b/ui/v2.5/src/locales/zh-TW.json
index 2c18d8907..97824e48c 100644
--- a/ui/v2.5/src/locales/zh-TW.json
+++ b/ui/v2.5/src/locales/zh-TW.json
@@ -226,9 +226,7 @@
             "latest_version_build_hash": "最新版本的雜湊值：",
             "new_version_notice": "[新版本]",
             "release_date": "發布日期：",
-            "stash_discord": "加入我們的 {url} 頻道",
             "stash_home": "Stash 的 {url} 專案",
-            "stash_open_collective": "透過 {url} 來支持本計畫的開發",
             "stash_wiki": "Stash 的 {url} 頁面",
             "version": "版本"
         },