diff --git a/src/apps/experimental/components/library/GenresItemsContainer.tsx b/src/apps/experimental/components/library/GenresItemsContainer.tsx
index b3f3b5f7bf..a676a0c78b 100644
--- a/src/apps/experimental/components/library/GenresItemsContainer.tsx
+++ b/src/apps/experimental/components/library/GenresItemsContainer.tsx
@@ -1,11 +1,11 @@
-import { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind';
+import type { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind';
+import type { CollectionType } from '@jellyfin/sdk/lib/generated-client/models/collection-type';
 import React, { FC } from 'react';
 import { useGetGenres } from 'hooks/useFetchItems';
 import globalize from 'scripts/globalize';
 import Loading from 'components/loading/LoadingComponent';
 import GenresSectionContainer from './GenresSectionContainer';
-import { CollectionType } from '@jellyfin/sdk/lib/generated-client/models/collection-type';
-import { ParentId } from 'types/library';
+import type { ParentId } from 'types/library';
 
 interface GenresItemsContainerProps {
     parentId: ParentId;
diff --git a/src/apps/experimental/components/library/GenresView.tsx b/src/apps/experimental/components/library/GenresView.tsx
index 9076c28c6d..50d8c68507 100644
--- a/src/apps/experimental/components/library/GenresView.tsx
+++ b/src/apps/experimental/components/library/GenresView.tsx
@@ -1,8 +1,8 @@
-import { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind';
+import type { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind';
+import type { CollectionType } from '@jellyfin/sdk/lib/generated-client/models/collection-type';
 import React, { FC } from 'react';
 import GenresItemsContainer from './GenresItemsContainer';
-import { ParentId } from 'types/library';
-import { CollectionType } from '@jellyfin/sdk/lib/generated-client/models/collection-type';
+import type { ParentId } from 'types/library';
 
 interface GenresViewProps {
     parentId: ParentId;
diff --git a/src/apps/experimental/components/library/PageTabContent.tsx b/src/apps/experimental/components/library/PageTabContent.tsx
index 9726f2ffa5..6cd99c5575 100644
--- a/src/apps/experimental/components/library/PageTabContent.tsx
+++ b/src/apps/experimental/components/library/PageTabContent.tsx
@@ -1,13 +1,13 @@
-import React, { FC } from 'react';
+import React, { type FC } from 'react';
 import SuggestionsSectionView from './SuggestionsSectionView';
 import UpcomingView from './UpcomingView';
 import GenresView from './GenresView';
 import ItemsView from './ItemsView';
-import { LibraryTab } from 'types/libraryTab';
-import { ParentId } from 'types/library';
-import { LibraryTabContent } from 'types/libraryTabContent';
 import GuideView from './GuideView';
 import ProgramsSectionView from './ProgramsSectionView';
+import { LibraryTab } from 'types/libraryTab';
+import type { ParentId } from 'types/library';
+import type { LibraryTabContent } from 'types/libraryTabContent';
 
 interface PageTabContentProps {
     parentId: ParentId;
diff --git a/src/components/common/DefaultIconText.tsx b/src/components/common/DefaultIconText.tsx
index 60b1aa3fb9..f6af526c07 100644
--- a/src/components/common/DefaultIconText.tsx
+++ b/src/components/common/DefaultIconText.tsx
@@ -1,4 +1,4 @@
-import { BaseItemKind } from '@jellyfin/sdk/lib/generated-client';
+import { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind';
 import React, { type FC } from 'react';
 import Icon from '@mui/material/Icon';
 import imageHelper from 'utils/image';
diff --git a/src/components/indicators/useIndicator.tsx b/src/components/indicators/useIndicator.tsx
index d6e3df180e..f54d76d9cd 100644
--- a/src/components/indicators/useIndicator.tsx
+++ b/src/components/indicators/useIndicator.tsx
@@ -1,5 +1,5 @@
 import { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind';
-import { LocationType } from '@jellyfin/sdk/lib/generated-client';
+import { LocationType } from '@jellyfin/sdk/lib/generated-client/models/location-type';
 import React from 'react';
 import Box from '@mui/material/Box';
 import LinearProgress, {
diff --git a/src/components/listview/List/ListContent.tsx b/src/components/listview/List/ListContent.tsx
index f9081f0b8a..0cf2160ca6 100644
--- a/src/components/listview/List/ListContent.tsx
+++ b/src/components/listview/List/ListContent.tsx
@@ -1,4 +1,4 @@
-import { BaseItemKind } from '@jellyfin/sdk/lib/generated-client';
+import { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind';
 import React, { type FC } from 'react';
 import DragHandleIcon from '@mui/icons-material/DragHandle';
 import Box from '@mui/material/Box';
diff --git a/src/components/listview/List/useListTextlines.tsx b/src/components/listview/List/useListTextlines.tsx
index cb5f7ceeb8..da66673a5a 100644
--- a/src/components/listview/List/useListTextlines.tsx
+++ b/src/components/listview/List/useListTextlines.tsx
@@ -1,5 +1,5 @@
+import { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind';
 import React from 'react';
-import { BaseItemKind } from '@jellyfin/sdk/lib/generated-client';
 import itemHelper from '../../itemHelper';
 import datetime from 'scripts/datetime';
 import ListTextWrapper from './ListTextWrapper';
diff --git a/src/components/mediainfo/usePrimaryMediaInfo.tsx b/src/components/mediainfo/usePrimaryMediaInfo.tsx
index 480f31dbbc..b702bc42ce 100644
--- a/src/components/mediainfo/usePrimaryMediaInfo.tsx
+++ b/src/components/mediainfo/usePrimaryMediaInfo.tsx
@@ -1,4 +1,4 @@
-import { BaseItemKind } from '@jellyfin/sdk/lib/generated-client';
+import { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind';
 import * as userSettings from 'scripts/settings/userSettings';
 import datetime from 'scripts/datetime';
 import globalize from 'scripts/globalize';
diff --git a/src/elements/emby-itemscontainer/ItemsContainer.tsx b/src/elements/emby-itemscontainer/ItemsContainer.tsx
index 75f0df99ed..779e718271 100644
--- a/src/elements/emby-itemscontainer/ItemsContainer.tsx
+++ b/src/elements/emby-itemscontainer/ItemsContainer.tsx
@@ -174,7 +174,7 @@ const ItemsContainer: FC<ItemsContainerProps> = ({
 
     const invalidateQueries = useCallback(async () => {
         await queryClient.invalidateQueries({
-            queryKey: queryKey,
+            queryKey,
             type: 'all',
             refetchType: 'active'
         });
diff --git a/src/elements/emby-playstatebutton/PlayedButton.tsx b/src/elements/emby-playstatebutton/PlayedButton.tsx
index 25434a0912..6a15940686 100644
--- a/src/elements/emby-playstatebutton/PlayedButton.tsx
+++ b/src/elements/emby-playstatebutton/PlayedButton.tsx
@@ -1,4 +1,4 @@
-import { BaseItemKind } from '@jellyfin/sdk/lib/generated-client';
+import { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind';
 import { useQueryClient } from '@tanstack/react-query';
 import React, { type FC, useCallback } from 'react';
 import CheckIcon from '@mui/icons-material/Check';
@@ -48,7 +48,7 @@ const PlayedButton: FC<PlayedButtonProps> = ({
             },
             { onSuccess: async() => {
                 await queryClient.invalidateQueries({
-                    queryKey: queryKey,
+                    queryKey,
                     type: 'all',
                     refetchType: 'active'
                 });
diff --git a/src/elements/emby-ratingbutton/FavoriteButton.tsx b/src/elements/emby-ratingbutton/FavoriteButton.tsx
index 2d97fc2747..2bbdeef4ab 100644
--- a/src/elements/emby-ratingbutton/FavoriteButton.tsx
+++ b/src/elements/emby-ratingbutton/FavoriteButton.tsx
@@ -34,7 +34,7 @@ const FavoriteButton: FC<FavoriteButtonProps> = ({
             },
             { onSuccess: async() => {
                 await queryClient.invalidateQueries({
-                    queryKey: queryKey,
+                    queryKey,
                     type: 'all',
                     refetchType: 'active'
                 });
diff --git a/src/types/libraryTabContent.ts b/src/types/libraryTabContent.ts
index 433744cd22..547d025134 100644
--- a/src/types/libraryTabContent.ts
+++ b/src/types/libraryTabContent.ts
@@ -1,7 +1,7 @@
-import { BaseItemKind } from '@jellyfin/sdk/lib/generated-client';
-import { LibraryTab } from './libraryTab';
-import { CollectionType } from '@jellyfin/sdk/lib/generated-client/models/collection-type';
-import { SectionType } from './sections';
+import type { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind';
+import type { CollectionType } from '@jellyfin/sdk/lib/generated-client/models/collection-type';
+import type { LibraryTab } from './libraryTab';
+import type { SectionType } from './sections';
 
 export interface SectionsView {
     suggestionSections?: SectionType[];
diff --git a/src/utils/image.ts b/src/utils/image.ts
index 3819f865df..dc32e87973 100644
--- a/src/utils/image.ts
+++ b/src/utils/image.ts
@@ -1,4 +1,4 @@
-import { BaseItemKind } from '@jellyfin/sdk/lib/generated-client';
+import { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind';
 import type { DeviceInfo } from '@jellyfin/sdk/lib/generated-client/models/device-info';
 import type { SessionInfo } from '@jellyfin/sdk/lib/generated-client/models/session-info';
 
diff --git a/src/utils/sections.ts b/src/utils/sections.ts
index ce78417da8..70c74b598e 100644
--- a/src/utils/sections.ts
+++ b/src/utils/sections.ts
@@ -1,10 +1,12 @@
-import { ImageType, ItemFields, ItemFilter } from '@jellyfin/sdk/lib/generated-client';
 import { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind';
+import { ItemFields } from '@jellyfin/sdk/lib/generated-client/models/item-fields';
+import { ItemFilter } from '@jellyfin/sdk/lib/generated-client/models/item-filter';
+import { ImageType } from '@jellyfin/sdk/lib/generated-client/models/image-type';
 import { ItemSortBy } from '@jellyfin/sdk/lib/models/api/item-sort-by';
 import { SortOrder } from '@jellyfin/sdk/lib/generated-client/models/sort-order';
 import * as userSettings from 'scripts/settings/userSettings';
 import { CardShape } from 'utils/card';
-import { Section, SectionType, SectionApiMethod } from 'types/sections';
+import { type Section, SectionType, SectionApiMethod } from 'types/sections';
 
 export const getSuggestionSections = (): Section[] => {
     const parametersOptions = {