Merge branch 'master' into EnableLibrary

src/apps/dashboard/components/drawer/sections/DevicesDrawerSection.tsx

@@ -1,26 +1,15 @@
-import { Devices, Analytics, Input, ExpandLess, ExpandMore } from '@mui/icons-material';
-import Collapse from '@mui/material/Collapse';
+import { Devices, Analytics, Input } from '@mui/icons-material';
 import List from '@mui/material/List';
 import ListItem from '@mui/material/ListItem';
 import ListItemIcon from '@mui/material/ListItemIcon';
 import ListItemText from '@mui/material/ListItemText';
 import ListSubheader from '@mui/material/ListSubheader';
 import React from 'react';
-import { useLocation } from 'react-router-dom';
 
 import ListItemLink from 'components/ListItemLink';
 import globalize from 'scripts/globalize';
 
-const DLNA_PATHS = [
-    '/dashboard/dlna',
-    '/dashboard/dlna/profiles'
-];
-
 const DevicesDrawerSection = () => {
-    const location = useLocation();
-
-    const isDlnaSectionOpen = DLNA_PATHS.includes(location.pathname);
-
     return (
         <List
             aria-labelledby='devices-subheader'
@@ -47,24 +36,13 @@ const DevicesDrawerSection = () => {
                 </ListItemLink>
             </ListItem>
             <ListItem disablePadding>
-                <ListItemLink to='/dashboard/dlna' selected={false}>
+                <ListItemLink to='/dashboard/dlna'>
                     <ListItemIcon>
                         <Input />
                     </ListItemIcon>
                     <ListItemText primary={'DLNA'} />
-                    {isDlnaSectionOpen ? <ExpandLess /> : <ExpandMore />}
                 </ListItemLink>
             </ListItem>
-            <Collapse in={isDlnaSectionOpen} timeout='auto' unmountOnExit>
-                <List component='div' disablePadding>
-                    <ListItemLink to='/dashboard/dlna' sx={{ pl: 4 }}>
-                        <ListItemText inset primary={globalize.translate('Settings')} />
-                    </ListItemLink>
-                    <ListItemLink to='/dashboard/dlna/profiles' sx={{ pl: 4 }}>
-                        <ListItemText inset primary={globalize.translate('TabProfiles')} />
-                    </ListItemLink>
-                </List>
-            </Collapse>
         </List>
     );
 };

src/apps/dashboard/components/drawer/sections/ServerDrawerSection.tsx

@@ -21,7 +21,8 @@ const LIBRARY_PATHS = [
 const PLAYBACK_PATHS = [
     '/dashboard/playback/transcoding',
     '/dashboard/playback/resume',
-    '/dashboard/playback/streaming'
+    '/dashboard/playback/streaming',
+    '/dashboard/playback/trickplay'
 ];
 
 const ServerDrawerSection = () => {
@@ -108,6 +109,9 @@ const ServerDrawerSection = () => {
                     <ListItemLink to='/dashboard/playback/streaming' sx={{ pl: 4 }}>
                         <ListItemText inset primary={globalize.translate('TabStreaming')} />
                     </ListItemLink>
+                    <ListItemLink to='/dashboard/playback/trickplay' sx={{ pl: 4 }}>
+                        <ListItemText inset primary={globalize.translate('Trickplay')} />
+                    </ListItemLink>
                 </List>
             </Collapse>
         </List>

src/apps/dashboard/routes/_asyncRoutes.ts

@@ -2,11 +2,13 @@ import { AsyncRouteType, type AsyncRoute } from 'components/router/AsyncRoute';
 
 export const ASYNC_ADMIN_ROUTES: AsyncRoute[] = [
     { path: 'activity', type: AsyncRouteType.Dashboard },
+    { path: 'dlna', type: AsyncRouteType.Dashboard },
     { path: 'notifications', type: AsyncRouteType.Dashboard },
     { path: 'users', type: AsyncRouteType.Dashboard },
     { path: 'users/access', type: AsyncRouteType.Dashboard },
     { path: 'users/add', type: AsyncRouteType.Dashboard },
     { path: 'users/parentalcontrol', type: AsyncRouteType.Dashboard },
     { path: 'users/password', type: AsyncRouteType.Dashboard },
-    { path: 'users/profile', type: AsyncRouteType.Dashboard }
+    { path: 'users/profile', type: AsyncRouteType.Dashboard },
+    { path: 'playback/trickplay', type: AsyncRouteType.Dashboard }
 ];

src/apps/dashboard/routes/_legacyRoutes.ts

@@ -31,24 +31,6 @@ export const LEGACY_ADMIN_ROUTES: LegacyRoute[] = [
             controller: 'dashboard/devices/device',
             view: 'dashboard/devices/device.html'
         }
-    }, {
-        path: 'dlna/profiles/edit',
-        pageProps: {
-            controller: 'dashboard/dlna/profile',
-            view: 'dashboard/dlna/profile.html'
-        }
-    }, {
-        path: 'dlna/profiles',
-        pageProps: {
-            controller: 'dashboard/dlna/profiles',
-            view: 'dashboard/dlna/profiles.html'
-        }
-    }, {
-        path: 'dlna',
-        pageProps: {
-            controller: 'dashboard/dlna/settings',
-            view: 'dashboard/dlna/settings.html'
-        }
     }, {
         path: 'plugins/add',
         pageProps: {

src/apps/dashboard/routes/_redirects.ts

@@ -8,8 +8,8 @@ export const REDIRECTS: Redirect[] = [
     { from: 'dashboardgeneral.html', to: '/dashboard/settings' },
     { from: 'device.html', to: '/dashboard/devices/edit' },
     { from: 'devices.html', to: '/dashboard/devices' },
-    { from: 'dlnaprofile.html', to: '/dashboard/dlna/profiles/edit' },
-    { from: 'dlnaprofiles.html', to: '/dashboard/dlna/profiles' },
+    { from: 'dlnaprofile.html', to: '/dashboard/dlna' },
+    { from: 'dlnaprofiles.html', to: '/dashboard/dlna' },
     { from: 'dlnasettings.html', to: '/dashboard/dlna' },
     { from: 'edititemmetadata.html', to: '/metadata' },
     { from: 'encodingsettings.html', to: '/dashboard/playback/transcoding' },

src/apps/dashboard/routes/dlna.tsx

@@ -0,0 +1,33 @@
+import Alert from '@mui/material/Alert/Alert';
+import Box from '@mui/material/Box/Box';
+import Button from '@mui/material/Button/Button';
+import React from 'react';
+import { Link } from 'react-router-dom';
+
+import Page from 'components/Page';
+import globalize from 'scripts/globalize';
+
+const DlnaPage = () => (
+    <Page
+        id='dlnaSettingsPage'
+        title='DLNA'
+        className='mainAnimatedPage type-interior'
+    >
+        <div className='content-primary'>
+            <h2>DLNA</h2>
+            <Alert severity='info'>
+                <Box sx={{ marginBottom: 2 }}>
+                    {globalize.translate('DlnaMovedMessage')}
+                </Box>
+                <Button
+                    component={Link}
+                    to='/dashboard/plugins/add?name=DLNA&guid=33eba9cd7da14720967fdd7dae7b74a1'
+                >
+                    {globalize.translate('GetThePlugin')}
+                </Button>
+            </Alert>
+        </div>
+    </Page>
+);
+
+export default DlnaPage;

src/apps/dashboard/routes/notifications.tsx

@@ -1,23 +1,13 @@
+import Alert from '@mui/material/Alert/Alert';
+import Box from '@mui/material/Box/Box';
+import Button from '@mui/material/Button/Button';
 import React from 'react';
+import { Link } from 'react-router-dom';
 
 import Page from 'components/Page';
 import globalize from 'scripts/globalize';
 
-const PluginLink = () => (
-    <div
-        dangerouslySetInnerHTML={{
-            __html: `<a
-                is='emby-linkbutton'
-                class='button-link'
-                href='#/dashboard/plugins/add?name=Webhook&guid=71552a5a5c5c4350a2aeebe451a30173'
-            >
-                ${globalize.translate('GetThePlugin')}
-            </a>`
-        }}
-    />
-);
-
-const Notifications = () => (
+const NotificationsPage = () => (
     <Page
         id='notificationSettingPage'
         title={globalize.translate('Notifications')}
@@ -25,12 +15,20 @@ const Notifications = () => (
     >
         <div className='content-primary'>
             <h2>{globalize.translate('Notifications')}</h2>
-            <p>
-                {globalize.translate('NotificationsMovedMessage')}
-            </p>
-            <PluginLink />
+
+            <Alert severity='info'>
+                <Box sx={{ marginBottom: 2 }}>
+                    {globalize.translate('NotificationsMovedMessage')}
+                </Box>
+                <Button
+                    component={Link}
+                    to='/dashboard/plugins/add?name=Webhook&guid=71552a5a5c5c4350a2aeebe451a30173'
+                >
+                    {globalize.translate('GetThePlugin')}
+                </Button>
+            </Alert>
         </div>
     </Page>
 );
 
-export default Notifications;
+export default NotificationsPage;

src/apps/dashboard/routes/playback/trickplay.tsx

@@ -0,0 +1,305 @@
+import type { ProcessPriorityClass, ServerConfiguration, TrickplayScanBehavior } from '@jellyfin/sdk/lib/generated-client';
+import React, { type FunctionComponent, useCallback, useEffect, useRef } from 'react';
+
+import globalize from '../../../../scripts/globalize';
+import Page from '../../../../components/Page';
+import SectionTitleContainer from '../../../../elements/SectionTitleContainer';
+import ButtonElement from '../../../../elements/ButtonElement';
+import CheckBoxElement from '../../../../elements/CheckBoxElement';
+import SelectElement from '../../../../elements/SelectElement';
+import InputElement from '../../../../elements/InputElement';
+import LinkTrickplayAcceleration from '../../../../components/dashboard/playback/trickplay/LinkTrickplayAcceleration';
+import loading from '../../../../components/loading/loading';
+import toast from '../../../../components/toast/toast';
+import ServerConnections from '../../../../components/ServerConnections';
+
+function onSaveComplete() {
+    loading.hide();
+    toast(globalize.translate('SettingsSaved'));
+}
+
+const PlaybackTrickplay: FunctionComponent = () => {
+    const element = useRef<HTMLDivElement>(null);
+
+    const loadConfig = useCallback((config) => {
+        const page = element.current;
+        const options = config.TrickplayOptions;
+
+        if (!page) {
+            console.error('Unexpected null reference');
+            return;
+        }
+
+        (page.querySelector('.chkEnableHwAcceleration') as HTMLInputElement).checked = options.EnableHwAcceleration;
+        (page.querySelector('#selectScanBehavior') as HTMLSelectElement).value = options.ScanBehavior;
+        (page.querySelector('#selectProcessPriority') as HTMLSelectElement).value = options.ProcessPriority;
+        (page.querySelector('#txtInterval') as HTMLInputElement).value = options.Interval;
+        (page.querySelector('#txtWidthResolutions') as HTMLInputElement).value = options.WidthResolutions.join(',');
+        (page.querySelector('#txtTileWidth') as HTMLInputElement).value = options.TileWidth;
+        (page.querySelector('#txtTileHeight') as HTMLInputElement).value = options.TileHeight;
+        (page.querySelector('#txtQscale') as HTMLInputElement).value = options.Qscale;
+        (page.querySelector('#txtJpegQuality') as HTMLInputElement).value = options.JpegQuality;
+        (page.querySelector('#txtProcessThreads') as HTMLInputElement).value = options.ProcessThreads;
+
+        loading.hide();
+    }, []);
+
+    const loadData = useCallback(() => {
+        loading.show();
+
+        ServerConnections.currentApiClient()?.getServerConfiguration().then(function (config) {
+            loadConfig(config);
+        }).catch(err => {
+            console.error('[PlaybackTrickplay] failed to fetch server config', err);
+        });
+    }, [loadConfig]);
+
+    useEffect(() => {
+        const page = element.current;
+
+        if (!page) {
+            console.error('Unexpected null reference');
+            return;
+        }
+
+        const saveConfig = (config: ServerConfiguration) => {
+            const apiClient = ServerConnections.currentApiClient();
+
+            if (!apiClient) {
+                console.error('[PlaybackTrickplay] No current apiclient instance');
+                return;
+            }
+
+            if (!config.TrickplayOptions) {
+                throw new Error('Unexpected null TrickplayOptions');
+            }
+
+            const options = config.TrickplayOptions;
+            options.EnableHwAcceleration = (page.querySelector('.chkEnableHwAcceleration') as HTMLInputElement).checked;
+            options.ScanBehavior = (page.querySelector('#selectScanBehavior') as HTMLSelectElement).value as TrickplayScanBehavior;
+            options.ProcessPriority = (page.querySelector('#selectProcessPriority') as HTMLSelectElement).value as ProcessPriorityClass;
+            options.Interval = Math.max(1, parseInt((page.querySelector('#txtInterval') as HTMLInputElement).value || '10000', 10));
+            options.WidthResolutions = (page.querySelector('#txtWidthResolutions') as HTMLInputElement).value.replace(' ', '').split(',').map(Number);
+            options.TileWidth = Math.max(1, parseInt((page.querySelector('#txtTileWidth') as HTMLInputElement).value || '10', 10));
+            options.TileHeight = Math.max(1, parseInt((page.querySelector('#txtTileHeight') as HTMLInputElement).value || '10', 10));
+            options.Qscale = Math.min(31, parseInt((page.querySelector('#txtQscale') as HTMLInputElement).value || '4', 10));
+            options.JpegQuality = Math.min(100, parseInt((page.querySelector('#txtJpegQuality') as HTMLInputElement).value || '90', 10));
+            options.ProcessThreads = parseInt((page.querySelector('#txtProcessThreads') as HTMLInputElement).value || '1', 10);
+
+            apiClient.updateServerConfiguration(config).then(() => {
+                onSaveComplete();
+            }).catch(err => {
+                console.error('[PlaybackTrickplay] failed to update config', err);
+            });
+        };
+
+        const onSubmit = (e: Event) => {
+            const apiClient = ServerConnections.currentApiClient();
+
+            if (!apiClient) {
+                console.error('[PlaybackTrickplay] No current apiclient instance');
+                return;
+            }
+
+            loading.show();
+            apiClient.getServerConfiguration().then(function (config) {
+                saveConfig(config);
+            }).catch(err => {
+                console.error('[PlaybackTrickplay] failed to fetch server config', err);
+            });
+
+            e.preventDefault();
+            e.stopPropagation();
+            return false;
+        };
+
+        (page.querySelector('.trickplayConfigurationForm') as HTMLFormElement).addEventListener('submit', onSubmit);
+
+        loadData();
+    }, [loadData]);
+
+    const optionScanBehavior = () => {
+        let content = '';
+        content += `<option value='NonBlocking'>${globalize.translate('NonBlockingScan')}</option>`;
+        content += `<option value='Blocking'>${globalize.translate('BlockingScan')}</option>`;
+        return content;
+    };
+
+    const optionProcessPriority = () => {
+        let content = '';
+        content += `<option value='High'>${globalize.translate('PriorityHigh')}</option>`;
+        content += `<option value='AboveNormal'>${globalize.translate('PriorityAboveNormal')}</option>`;
+        content += `<option value='Normal'>${globalize.translate('PriorityNormal')}</option>`;
+        content += `<option value='BelowNormal'>${globalize.translate('PriorityBelowNormal')}</option>`;
+        content += `<option value='Idle'>${globalize.translate('PriorityIdle')}</option>`;
+        return content;
+    };
+
+    return (
+        <Page
+            id='trickplayConfigurationPage'
+            className='mainAnimatedPage type-interior playbackConfigurationPage'
+        >
+            <div ref={element} className='content-primary'>
+                <div className='verticalSection'>
+                    <SectionTitleContainer
+                        title={globalize.translate('Trickplay')}
+                        isLinkVisible={false}
+                    />
+                </div>
+
+                <form className='trickplayConfigurationForm'>
+                    <div className='checkboxContainer checkboxContainer-withDescription'>
+                        <CheckBoxElement
+                            className='chkEnableHwAcceleration'
+                            title='LabelTrickplayAccel'
+                        />
+                        <div className='fieldDescription checkboxFieldDescription'>
+                            <LinkTrickplayAcceleration
+                                title='LabelTrickplayAccelHelp'
+                                href='#/dashboard/playback/transcoding'
+                                className='button-link'
+                            />
+                        </div>
+                    </div>
+
+                    <div className='verticalSection'>
+                        <div className='selectContainer fldSelectScanBehavior'>
+                            <SelectElement
+                                id='selectScanBehavior'
+                                label='LabelScanBehavior'
+                            >
+                                {optionScanBehavior()}
+                            </SelectElement>
+                            <div className='fieldDescription'>
+                                {globalize.translate('LabelScanBehaviorHelp')}
+                            </div>
+                        </div>
+                    </div>
+
+                    <div className='verticalSection'>
+                        <div className='selectContainer fldSelectProcessPriority'>
+                            <SelectElement
+                                id='selectProcessPriority'
+                                label='LabelProcessPriority'
+                            >
+                                {optionProcessPriority()}
+                            </SelectElement>
+                            <div className='fieldDescription'>
+                                {globalize.translate('LabelProcessPriorityHelp')}
+                            </div>
+                        </div>
+                    </div>
+
+                    <div className='verticalSection'>
+                        <div className='inputContainer'>
+                            <InputElement
+                                type='number'
+                                id='txtInterval'
+                                label='LabelImageInterval'
+                                options={'required inputMode="numeric" pattern="[0-9]*" min="1"'}
+                            />
+                            <div className='fieldDescription'>
+                                {globalize.translate('LabelImageIntervalHelp')}
+                            </div>
+                        </div>
+                    </div>
+
+                    <div className='verticalSection'>
+                        <div className='inputContainer'>
+                            <InputElement
+                                type='text'
+                                id='txtWidthResolutions'
+                                label='LabelWidthResolutions'
+                                options={'required pattern="[0-9,]*"'}
+                            />
+                            <div className='fieldDescription'>
+                                {globalize.translate('LabelWidthResolutionsHelp')}
+                            </div>
+                        </div>
+                    </div>
+
+                    <div className='verticalSection'>
+                        <div className='inputContainer'>
+                            <InputElement
+                                type='number'
+                                id='txtTileWidth'
+                                label='LabelTileWidth'
+                                options={'required inputMode="numeric" pattern="[0-9]*" min="1"'}
+                            />
+                            <div className='fieldDescription'>
+                                {globalize.translate('LabelTileWidthHelp')}
+                            </div>
+                        </div>
+                    </div>
+
+                    <div className='verticalSection'>
+                        <div className='inputContainer'>
+                            <InputElement
+                                type='number'
+                                id='txtTileHeight'
+                                label='LabelTileHeight'
+                                options={'required inputMode="numeric" pattern="[0-9]*" min="1"'}
+                            />
+                            <div className='fieldDescription'>
+                                {globalize.translate('LabelTileHeightHelp')}
+                            </div>
+                        </div>
+                    </div>
+
+                    <div className='verticalSection'>
+                        <div className='inputContainer'>
+                            <InputElement
+                                type='number'
+                                id='txtJpegQuality'
+                                label='LabelJpegQuality'
+                                options={'required inputMode="numeric" pattern="[0-9]*" min="1" max="100"'}
+                            />
+                            <div className='fieldDescription'>
+                                {globalize.translate('LabelJpegQualityHelp')}
+                            </div>
+                        </div>
+                    </div>
+
+                    <div className='verticalSection'>
+                        <div className='inputContainer'>
+                            <InputElement
+                                type='number'
+                                id='txtQscale'
+                                label='LabelQscale'
+                                options={'required inputMode="numeric" pattern="[0-9]*" min="2" max="31"'}
+                            />
+                            <div className='fieldDescription'>
+                                {globalize.translate('LabelQscaleHelp')}
+                            </div>
+                        </div>
+                    </div>
+
+                    <div className='verticalSection'>
+                        <div className='inputContainer'>
+                            <InputElement
+                                type='number'
+                                id='txtProcessThreads'
+                                label='LabelTrickplayThreads'
+                                options={'required inputMode="numeric" pattern="[0-9]*" min="0"'}
+                            />
+                            <div className='fieldDescription'>
+                                {globalize.translate('LabelTrickplayThreadsHelp')}
+                            </div>
+                        </div>
+                    </div>
+
+                    <div>
+                        <ButtonElement
+                            type='submit'
+                            className='raised button-submit block'
+                            title='Save'
+                        />
+                    </div>
+                </form>
+            </div>
+        </Page>
+    );
+};
+
+export default PlaybackTrickplay;

src/apps/dashboard/routes/users/index.tsx

@@ -49,6 +49,7 @@ const UserProfiles: FunctionComponent = () => {
         const showUserMenu = (elem: HTMLElement) => {
             const card = dom.parentWithClass(elem, 'card');
             const userId = card?.getAttribute('data-userid');
+            const username = card?.getAttribute('data-username');
 
             if (!userId) {
                 console.error('Unexpected null user id');
@@ -58,7 +59,7 @@ const UserProfiles: FunctionComponent = () => {
             const menuItems: MenuEntry[] = [];
 
             menuItems.push({
-                name: globalize.translate('ButtonOpen'),
+                name: globalize.translate('ButtonEditUser'),
                 id: 'open',
                 icon: 'mode_edit'
             });
@@ -106,7 +107,7 @@ const UserProfiles: FunctionComponent = () => {
                                 break;
 
                             case 'delete':
-                                deleteUser(userId);
+                                deleteUser(userId, username);
                         }
                     }
                 }).catch(() => {
@@ -117,12 +118,13 @@ const UserProfiles: FunctionComponent = () => {
             });
         };
 
-        const deleteUser = (id: string) => {
-            const msg = globalize.translate('DeleteUserConfirmation');
+        const deleteUser = (id: string, username?: string | null) => {
+            const title = username ? globalize.translate('DeleteName', username) : globalize.translate('DeleteUser');
+            const text = globalize.translate('DeleteUserConfirmation');
 
             confirm({
-                title: globalize.translate('DeleteUser'),
-                text: msg,
+                title,
+                text,
                 confirmText: globalize.translate('Delete'),
                 primary: 'delete'
             }).then(function () {

src/apps/dashboard/routes/users/parentalcontrol.tsx

@@ -6,7 +6,7 @@ import escapeHTML from 'escape-html';
 import globalize from '../../../../scripts/globalize';
 import LibraryMenu from '../../../../scripts/libraryMenu';
 import AccessScheduleList from '../../../../components/dashboard/users/AccessScheduleList';
-import BlockedTagList from '../../../../components/dashboard/users/BlockedTagList';
+import TagList from '../../../../components/dashboard/users/TagList';
 import ButtonElement from '../../../../elements/ButtonElement';
 import SectionTitleContainer from '../../../../elements/SectionTitleContainer';
 import SectionTabs from '../../../../components/dashboard/users/SectionTabs';
@@ -16,6 +16,8 @@ import { getParameterByName } from '../../../../utils/url';
 import CheckBoxElement from '../../../../elements/CheckBoxElement';
 import SelectElement from '../../../../elements/SelectElement';
 import Page from '../../../../components/Page';
+import prompt from '../../../../components/prompt/prompt';
+import ServerConnections from 'components/ServerConnections';
 
 type UnratedItem = {
     name: string;
@@ -23,12 +25,44 @@ type UnratedItem = {
     checkedAttribute: string
 };
 
+function handleSaveUser(
+    page: HTMLDivElement,
+    getSchedulesFromPage: () => AccessSchedule[],
+    getAllowedTagsFromPage: () => string[],
+    getBlockedTagsFromPage: () => string[],
+    onSaveComplete: () => void
+) {
+    return (user: UserDto) => {
+        const userId = user.Id;
+        const userPolicy = user.Policy;
+        if (!userId || !userPolicy) {
+            throw new Error('Unexpected null user id or policy');
+        }
+
+        const parentalRating = parseInt((page.querySelector('#selectMaxParentalRating') as HTMLSelectElement).value, 10);
+        userPolicy.MaxParentalRating = Number.isNaN(parentalRating) ? null : parentalRating;
+        userPolicy.BlockUnratedItems = Array.prototype.filter
+            .call(page.querySelectorAll('.chkUnratedItem'), i => i.checked)
+            .map(i => i.getAttribute('data-itemtype'));
+        userPolicy.AccessSchedules = getSchedulesFromPage();
+        userPolicy.AllowedTags = getAllowedTagsFromPage();
+        userPolicy.BlockedTags = getBlockedTagsFromPage();
+        ServerConnections.getCurrentApiClientAsync()
+            .then(apiClient => apiClient.updateUserPolicy(userId, userPolicy))
+            .then(() => onSaveComplete())
+            .catch(err => {
+                console.error('[userparentalcontrol] failed to update user policy', err);
+            });
+    };
+}
+
 const UserParentalControl: FunctionComponent = () => {
     const [ userName, setUserName ] = useState('');
     const [ parentalRatings, setParentalRatings ] = useState<ParentalRating[]>([]);
     const [ unratedItems, setUnratedItems ] = useState<UnratedItem[]>([]);
     const [ accessSchedules, setAccessSchedules ] = useState<AccessSchedule[]>([]);
-    const [ blockedTags, setBlockedTags ] = useState([]);
+    const [ allowedTags, setAllowedTags ] = useState<string[]>([]);
+    const [ blockedTags, setBlockedTags ] = useState<string[]>([]);
 
     const element = useRef<HTMLDivElement>(null);
 
@@ -106,7 +140,28 @@ const UserParentalControl: FunctionComponent = () => {
         blockUnratedItems.dispatchEvent(new CustomEvent('create'));
     }, []);
 
-    const loadBlockedTags = useCallback((tags) => {
+    const loadAllowedTags = useCallback((tags: string[]) => {
+        const page = element.current;
+
+        if (!page) {
+            console.error('Unexpected null reference');
+            return;
+        }
+
+        setAllowedTags(tags);
+
+        const allowedTagsElem = page.querySelector('.allowedTags') as HTMLDivElement;
+
+        for (const btnDeleteTag of allowedTagsElem.querySelectorAll('.btnDeleteTag')) {
+            btnDeleteTag.addEventListener('click', function () {
+                const tag = btnDeleteTag.getAttribute('data-tag');
+                const newTags = tags.filter(t => t !== tag);
+                loadAllowedTags(newTags);
+            });
+        }
+    }, []);
+
+    const loadBlockedTags = useCallback((tags: string[]) => {
         const page = element.current;
 
         if (!page) {
@@ -121,9 +176,7 @@ const UserParentalControl: FunctionComponent = () => {
         for (const btnDeleteTag of blockedTagsElem.querySelectorAll('.btnDeleteTag')) {
             btnDeleteTag.addEventListener('click', function () {
                 const tag = btnDeleteTag.getAttribute('data-tag');
-                const newTags = tags.filter(function (t: string) {
-                    return t != tag;
-                });
+                const newTags = tags.filter(t => t !== tag);
                 loadBlockedTags(newTags);
             });
         }
@@ -145,15 +198,13 @@ const UserParentalControl: FunctionComponent = () => {
             btnDelete.addEventListener('click', function () {
                 const index = parseInt(btnDelete.getAttribute('data-index') ?? '0', 10);
                 schedules.splice(index, 1);
-                const newindex = schedules.filter(function (i: number) {
-                    return i != index;
-                });
+                const newindex = schedules.filter((i: number) => i != index);
                 renderAccessSchedule(newindex);
             });
         }
     }, []);
 
-    const loadUser = useCallback((user, allParentalRatings) => {
+    const loadUser = useCallback((user: UserDto, allParentalRatings: ParentalRating[]) => {
         const page = element.current;
 
         if (!page) {
@@ -161,34 +212,33 @@ const UserParentalControl: FunctionComponent = () => {
             return;
         }
 
-        setUserName(user.Name);
+        setUserName(user.Name || '');
         LibraryMenu.setTitle(user.Name);
         loadUnratedItems(user);
 
-        loadBlockedTags(user.Policy.BlockedTags);
+        loadAllowedTags(user.Policy?.AllowedTags || []);
+        loadBlockedTags(user.Policy?.BlockedTags || []);
         populateRatings(allParentalRatings);
+
         let ratingValue = '';
-
-        if (user.Policy.MaxParentalRating != null) {
-            for (let i = 0, length = allParentalRatings.length; i < length; i++) {
-                const rating = allParentalRatings[i];
-
-                if (user.Policy.MaxParentalRating >= rating.Value) {
-                    ratingValue = rating.Value;
+        if (user.Policy?.MaxParentalRating) {
+            allParentalRatings.forEach(rating => {
+                if (rating.Value && user.Policy?.MaxParentalRating && user.Policy.MaxParentalRating >= rating.Value) {
+                    ratingValue = `${rating.Value}`;
                 }
-            }
+            });
         }
 
         (page.querySelector('#selectMaxParentalRating') as HTMLSelectElement).value = ratingValue;
 
-        if (user.Policy.IsAdministrator) {
+        if (user.Policy?.IsAdministrator) {
             (page.querySelector('.accessScheduleSection') as HTMLDivElement).classList.add('hide');
         } else {
             (page.querySelector('.accessScheduleSection') as HTMLDivElement).classList.remove('hide');
         }
-        renderAccessSchedule(user.Policy.AccessSchedules || []);
+        renderAccessSchedule(user.Policy?.AccessSchedules || []);
         loading.hide();
-    }, [loadBlockedTags, loadUnratedItems, populateRatings, renderAccessSchedule]);
+    }, [loadAllowedTags, loadBlockedTags, loadUnratedItems, populateRatings, renderAccessSchedule]);
 
     const loadData = useCallback(() => {
         loading.show();
@@ -212,32 +262,6 @@ const UserParentalControl: FunctionComponent = () => {
 
         loadData();
 
-        const onSaveComplete = () => {
-            loading.hide();
-            toast(globalize.translate('SettingsSaved'));
-        };
-
-        const saveUser = (user: UserDto) => {
-            if (!user.Id || !user.Policy) {
-                throw new Error('Unexpected null user id or policy');
-            }
-
-            const parentalRating = parseInt((page.querySelector('#selectMaxParentalRating') as HTMLSelectElement).value, 10);
-            user.Policy.MaxParentalRating = Number.isNaN(parentalRating) ? null : parentalRating;
-            user.Policy.BlockUnratedItems = Array.prototype.filter.call(page.querySelectorAll('.chkUnratedItem'), function (i) {
-                return i.checked;
-            }).map(function (i) {
-                return i.getAttribute('data-itemtype');
-            });
-            user.Policy.AccessSchedules = getSchedulesFromPage();
-            user.Policy.BlockedTags = getBlockedTagsFromPage();
-            window.ApiClient.updateUserPolicy(user.Id, user.Policy).then(function () {
-                onSaveComplete();
-            }).catch(err => {
-                console.error('[userparentalcontrol] failed to update user policy', err);
-            });
-        };
-
         const showSchedulePopup = (schedule: AccessSchedule, index: number) => {
             schedule = schedule || {};
             import('../../../../components/accessSchedule/accessSchedule').then(({ default: accessschedule }) => {
@@ -270,6 +294,27 @@ const UserParentalControl: FunctionComponent = () => {
             }) as AccessSchedule[];
         };
 
+        const getAllowedTagsFromPage = () => {
+            return Array.prototype.map.call(page.querySelectorAll('.allowedTag'), function (elem) {
+                return elem.getAttribute('data-tag');
+            }) as string[];
+        };
+
+        const showAllowedTagPopup = () => {
+            prompt({
+                label: globalize.translate('LabelTag')
+            }).then(function (value) {
+                const tags = getAllowedTagsFromPage();
+
+                if (tags.indexOf(value) == -1) {
+                    tags.push(value);
+                    loadAllowedTags(tags);
+                }
+            }).catch(() => {
+                // prompt closed
+            });
+        };
+
         const getBlockedTagsFromPage = () => {
             return Array.prototype.map.call(page.querySelectorAll('.blockedTag'), function (elem) {
                 return elem.getAttribute('data-tag');
@@ -277,24 +322,27 @@ const UserParentalControl: FunctionComponent = () => {
         };
 
         const showBlockedTagPopup = () => {
-            import('../../../../components/prompt/prompt').then(({ default: prompt }) => {
-                prompt({
-                    label: globalize.translate('LabelTag')
-                }).then(function (value) {
-                    const tags = getBlockedTagsFromPage();
+            prompt({
+                label: globalize.translate('LabelTag')
+            }).then(function (value) {
+                const tags = getBlockedTagsFromPage();
 
-                    if (tags.indexOf(value) == -1) {
-                        tags.push(value);
-                        loadBlockedTags(tags);
-                    }
-                }).catch(() => {
-                    // prompt closed
-                });
-            }).catch(err => {
-                console.error('[userparentalcontrol] failed to load prompt', err);
+                if (tags.indexOf(value) == -1) {
+                    tags.push(value);
+                    loadBlockedTags(tags);
+                }
+            }).catch(() => {
+                // prompt closed
             });
         };
 
+        const onSaveComplete = () => {
+            loading.hide();
+            toast(globalize.translate('SettingsSaved'));
+        };
+
+        const saveUser = handleSaveUser(page, getSchedulesFromPage, getAllowedTagsFromPage, getBlockedTagsFromPage, onSaveComplete);
+
         const onSubmit = (e: Event) => {
             loading.show();
             const userId = getParameterByName('userId');
@@ -318,12 +366,16 @@ const UserParentalControl: FunctionComponent = () => {
             }, -1);
         });
 
+        (page.querySelector('#btnAddAllowedTag') as HTMLButtonElement).addEventListener('click', function () {
+            showAllowedTagPopup();
+        });
+
         (page.querySelector('#btnAddBlockedTag') as HTMLButtonElement).addEventListener('click', function () {
             showBlockedTagPopup();
         });
 
         (page.querySelector('.userParentalControlForm') as HTMLFormElement).addEventListener('submit', onSubmit);
-    }, [loadBlockedTags, loadData, renderAccessSchedule]);
+    }, [loadAllowedTags, loadBlockedTags, loadData, renderAccessSchedule]);
 
     const optionMaxParentalRating = () => {
         let content = '';
@@ -378,6 +430,27 @@ const UserParentalControl: FunctionComponent = () => {
                         </div>
                     </div>
                     <br />
+                    <div className='verticalSection' style={{ marginBottom: '2em' }}>
+                        <SectionTitleContainer
+                            SectionClassName='detailSectionHeader'
+                            title={globalize.translate('LabelAllowContentWithTags')}
+                            isBtnVisible={true}
+                            btnId='btnAddAllowedTag'
+                            btnClassName='fab submit sectionTitleButton'
+                            btnTitle='Add'
+                            btnIcon='add'
+                            isLinkVisible={false}
+                        />
+                        <div className='allowedTags' style={{ marginTop: '.5em' }}>
+                            {allowedTags?.map(tag => {
+                                return <TagList
+                                    key={tag}
+                                    tag={tag}
+                                    tagType='allowedTag'
+                                />;
+                            })}
+                        </div>
+                    </div>
                     <div className='verticalSection' style={{ marginBottom: '2em' }}>
                         <SectionTitleContainer
                             SectionClassName='detailSectionHeader'
@@ -391,9 +464,10 @@ const UserParentalControl: FunctionComponent = () => {
                         />
                         <div className='blockedTags' style={{ marginTop: '.5em' }}>
                             {blockedTags.map(tag => {
-                                return <BlockedTagList
+                                return <TagList
                                     key={tag}
                                     tag={tag}
+                                    tagType='blockedTag'
                                 />;
                             })}
                         </div>

src/apps/dashboard/routes/users/profile.tsx

@@ -182,6 +182,7 @@ const UserEdit: FunctionComponent = () => {
         (page.querySelector('.chkDisabled') as HTMLInputElement).checked = user.Policy.IsDisabled;
         (page.querySelector('.chkIsHidden') as HTMLInputElement).checked = user.Policy.IsHidden;
         (page.querySelector('.chkEnableCollectionManagement') as HTMLInputElement).checked = user.Policy.EnableCollectionManagement;
+        (page.querySelector('.chkEnableSubtitleManagement') as HTMLInputElement).checked = user.Policy.EnableSubtitleManagement;
         (page.querySelector('.chkRemoteControlSharedDevices') as HTMLInputElement).checked = user.Policy.EnableSharedDeviceControl;
         (page.querySelector('.chkEnableRemoteControlOtherUsers') as HTMLInputElement).checked = user.Policy.EnableRemoteControlOfOtherUsers;
         (page.querySelector('.chkEnableDownloading') as HTMLInputElement).checked = user.Policy.EnableContentDownloading;
@@ -240,6 +241,7 @@ const UserEdit: FunctionComponent = () => {
             user.Policy.EnableVideoPlaybackTranscoding = (page.querySelector('.chkEnableVideoPlaybackTranscoding') as HTMLInputElement).checked;
             user.Policy.EnablePlaybackRemuxing = (page.querySelector('.chkEnableVideoPlaybackRemuxing') as HTMLInputElement).checked;
             user.Policy.EnableCollectionManagement = (page.querySelector('.chkEnableCollectionManagement') as HTMLInputElement).checked;
+            user.Policy.EnableSubtitleManagement = (page.querySelector('.chkEnableSubtitleManagement') as HTMLInputElement).checked;
             user.Policy.ForceRemoteSourceTranscoding = (page.querySelector('.chkForceRemoteSourceTranscoding') as HTMLInputElement).checked;
             user.Policy.EnableContentDownloading = (page.querySelector('.chkEnableDownloading') as HTMLInputElement).checked;
             user.Policy.EnableRemoteAccess = (page.querySelector('.chkRemoteAccess') as HTMLInputElement).checked;
@@ -392,6 +394,11 @@ const UserEdit: FunctionComponent = () => {
                         className='chkEnableCollectionManagement'
                         title='AllowCollectionManagement'
                     />
+                    <CheckBoxElement
+                        labelClassName='checkboxContainer'
+                        className='chkEnableSubtitleManagement'
+                        title='AllowSubtitleManagement'
+                    />
                     <div id='featureAccessFields' className='verticalSection'>
                         <h2 className='paperListLabel'>
                             {globalize.translate('HeaderFeatureAccess')}

src/apps/experimental/components/drawers/DrawerHeaderLink.tsx

@@ -3,15 +3,13 @@ import ListItemIcon from '@mui/material/ListItemIcon';
 import ListItemText from '@mui/material/ListItemText';
 import React from 'react';
 
-import { useApi } from 'hooks/useApi';
 import { useSystemInfo } from 'hooks/useSystemInfo';
 import ListItemLink from 'components/ListItemLink';
 
 import appIcon from 'assets/img/icon-transparent.png';
 
 const DrawerHeaderLink = () => {
-    const { api } = useApi();
-    const { data: systemInfo } = useSystemInfo(api);
+    const { data: systemInfo } = useSystemInfo();
 
     return (
         <ListItemLink to='/'>

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;

src/apps/experimental/components/library/GenresSectionContainer.tsx

@@ -1,18 +1,17 @@
 import type { BaseItemDto } from '@jellyfin/sdk/lib/generated-client';
+import { CollectionType } from '@jellyfin/sdk/lib/generated-client/models/collection-type';
 import { ItemFields } from '@jellyfin/sdk/lib/generated-client/models/item-fields';
 import { ImageType } from '@jellyfin/sdk/lib/generated-client/models/image-type';
 import { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind';
 import { ItemSortBy } from '@jellyfin/sdk/lib/models/api/item-sort-by';
 import { SortOrder } from '@jellyfin/sdk/lib/generated-client/models/sort-order';
-import escapeHTML from 'escape-html';
-import React, { FC } from 'react';
-
+import React, { type FC } from 'react';
 import { useGetItems } from 'hooks/useFetchItems';
 import Loading from 'components/loading/LoadingComponent';
 import { appRouter } from 'components/router/appRouter';
 import SectionContainer from './SectionContainer';
-import { CollectionType } from '@jellyfin/sdk/lib/generated-client/models/collection-type';
-import { ParentId } from 'types/library';
+import { CardShape } from 'utils/card';
+import type { ParentId } from 'types/library';
 
 interface GenresSectionContainerProps {
     parentId: ParentId;
@@ -60,7 +59,7 @@ const GenresSectionContainer: FC<GenresSectionContainerProps> = ({
     }
 
     return <SectionContainer
-        sectionTitle={escapeHTML(genre.Name)}
+        sectionTitle={genre.Name || ''}
         items={itemsResult?.Items || []}
         url={getRouteUrl(genre)}
         cardOptions={{
@@ -69,7 +68,7 @@ const GenresSectionContainer: FC<GenresSectionContainerProps> = ({
             showTitle: true,
             centerText: true,
             cardLayout: false,
-            shape: collectionType === CollectionType.Music ? 'overflowSquare' : 'overflowPortrait',
+            shape: collectionType === CollectionType.Music ? CardShape.SquareOverflow : CardShape.PortraitOverflow,
             showParentTitle: collectionType === CollectionType.Music,
             showYear: collectionType !== CollectionType.Music
         }}

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;

src/apps/experimental/components/library/ItemsView.tsx

@@ -1,17 +1,16 @@
 import type { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind';
+import { CollectionType } from '@jellyfin/sdk/lib/generated-client/models/collection-type';
 import { ImageType } from '@jellyfin/sdk/lib/generated-client';
 import { ItemSortBy } from '@jellyfin/sdk/lib/models/api/item-sort-by';
-import React, { FC, useCallback } from 'react';
+import React, { type FC, useCallback } from 'react';
 import Box from '@mui/material/Box';
 import classNames from 'classnames';
 import { useLocalStorage } from 'hooks/useLocalStorage';
 import { useGetItem, useGetItemsViewByType } from 'hooks/useFetchItems';
 import { getDefaultLibraryViewSettings, getSettingsKey } from 'utils/items';
+import { CardShape } from 'utils/card';
 import Loading from 'components/loading/LoadingComponent';
-import listview from 'components/listview/listview';
-import cardBuilder from 'components/cardbuilder/cardBuilder';
 import { playbackManager } from 'components/playback/playbackmanager';
-import globalize from 'scripts/globalize';
 import ItemsContainer from 'elements/emby-itemscontainer/ItemsContainer';
 import AlphabetPicker from './AlphabetPicker';
 import FilterButton from './filter/FilterButton';
@@ -22,12 +21,13 @@ import QueueButton from './QueueButton';
 import ShuffleButton from './ShuffleButton';
 import SortButton from './SortButton';
 import GridListViewButton from './GridListViewButton';
-import { LibraryViewSettings, ParentId, ViewMode } from 'types/library';
-import { CollectionType } from '@jellyfin/sdk/lib/generated-client/models/collection-type';
+import NoItemsMessage from 'components/common/NoItemsMessage';
+import Lists from 'components/listview/List/Lists';
+import Cards from 'components/cardbuilder/Card/Cards';
 import { LibraryTab } from 'types/libraryTab';
-
-import { CardOptions } from 'types/cardOptions';
-import { ListOptions } from 'types/listOptions';
+import { type LibraryViewSettings, type ParentId, ViewMode } from 'types/library';
+import type { CardOptions } from 'types/cardOptions';
+import type { ListOptions } from 'types/listOptions';
 
 interface ItemsViewProps {
     viewType: LibraryTab;
@@ -110,18 +110,18 @@ const ItemsView: FC<ItemsViewProps> = ({
         let preferLogo;
 
         if (libraryViewSettings.ImageType === ImageType.Banner) {
-            shape = 'banner';
+            shape = CardShape.Banner;
         } else if (libraryViewSettings.ImageType === ImageType.Disc) {
-            shape = 'square';
+            shape = CardShape.Square;
             preferDisc = true;
         } else if (libraryViewSettings.ImageType === ImageType.Logo) {
-            shape = 'backdrop';
+            shape = CardShape.Backdrop;
             preferLogo = true;
         } else if (libraryViewSettings.ImageType === ImageType.Thumb) {
-            shape = 'backdrop';
+            shape = CardShape.Backdrop;
             preferThumb = true;
         } else {
-            shape = 'auto';
+            shape = CardShape.Auto;
         }
 
         const cardOptions: CardOptions = {
@@ -135,9 +135,9 @@ const ItemsView: FC<ItemsViewProps> = ({
             preferThumb: preferThumb,
             preferDisc: preferDisc,
             preferLogo: preferLogo,
-            overlayPlayButton: false,
-            overlayMoreButton: true,
-            overlayText: !libraryViewSettings.ShowTitle
+            overlayText: !libraryViewSettings.ShowTitle,
+            imageType: libraryViewSettings.ImageType,
+            queryKey: ['ItemsViewByType']
         };
 
         if (
@@ -146,20 +146,26 @@ const ItemsView: FC<ItemsViewProps> = ({
             || viewType === LibraryTab.Episodes
         ) {
             cardOptions.showParentTitle = libraryViewSettings.ShowTitle;
+            cardOptions.overlayPlayButton = true;
         } else if (viewType === LibraryTab.Artists) {
             cardOptions.lines = 1;
             cardOptions.showYear = false;
+            cardOptions.overlayPlayButton = true;
         } else if (viewType === LibraryTab.Channels) {
-            cardOptions.shape = 'square';
+            cardOptions.shape = CardShape.Square;
             cardOptions.showDetailsMenu = true;
             cardOptions.showCurrentProgram = true;
             cardOptions.showCurrentProgramTime = true;
         } else if (viewType === LibraryTab.SeriesTimers) {
-            cardOptions.defaultShape = 'portrait';
-            cardOptions.preferThumb = 'auto';
+            cardOptions.shape = CardShape.Backdrop;
             cardOptions.showSeriesTimerTime = true;
             cardOptions.showSeriesTimerChannel = true;
+            cardOptions.overlayMoreButton = true;
             cardOptions.lines = 3;
+        } else if (viewType === LibraryTab.Movies) {
+            cardOptions.overlayPlayButton = true;
+        } else if (viewType === LibraryTab.Series || viewType === LibraryTab.Networks) {
+            cardOptions.overlayMoreButton = true;
         }
 
         return cardOptions;
@@ -172,27 +178,32 @@ const ItemsView: FC<ItemsViewProps> = ({
         viewType
     ]);
 
-    const getItemsHtml = useCallback(() => {
-        let html = '';
+    const getItems = useCallback(() => {
+        if (!itemsResult?.Items?.length) {
+            return <NoItemsMessage noItemsMessage={noItemsMessage} />;
+        }
 
         if (libraryViewSettings.ViewMode === ViewMode.ListView) {
-            html = listview.getListViewHtml(getListOptions());
-        } else {
-            html = cardBuilder.getCardsHtml(
-                itemsResult?.Items ?? [],
-                getCardOptions()
+            return (
+                <Lists
+                    items={itemsResult?.Items ?? []}
+                    listOptions={getListOptions()}
+                />
             );
         }
-
-        if (!itemsResult?.Items?.length) {
-            html += '<div class="noItemsMessage centerMessage">';
-            html += '<h1>' + globalize.translate('MessageNothingHere') + '</h1>';
-            html += '<p>' + globalize.translate(noItemsMessage) + '</p>';
-            html += '</div>';
-        }
-
-        return html;
-    }, [libraryViewSettings.ViewMode, itemsResult?.Items, getListOptions, getCardOptions, noItemsMessage]);
+        return (
+            <Cards
+                items={itemsResult?.Items ?? []}
+                cardOptions={getCardOptions()}
+            />
+        );
+    }, [
+        libraryViewSettings.ViewMode,
+        itemsResult?.Items,
+        getListOptions,
+        getCardOptions,
+        noItemsMessage
+    ]);
 
     const totalRecordCount = itemsResult?.TotalRecordCount ?? 0;
     const items = itemsResult?.Items ?? [];
@@ -289,8 +300,10 @@ const ItemsView: FC<ItemsViewProps> = ({
                     className={itemsContainerClass}
                     parentId={parentId}
                     reloadItems={refetch}
-                    getItemsHtml={getItemsHtml}
-                />
+                    queryKey={['ItemsViewByType']}
+                >
+                    {getItems()}
+                </ItemsContainer>
             )}
 
             {isPaginationEnabled && (

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;

src/apps/experimental/components/library/ProgramsSectionView.tsx

@@ -1,11 +1,12 @@
-import React, { FC } from 'react';
+import React, { type FC } from 'react';
 import { useGetProgramsSectionsWithItems, useGetTimers } from 'hooks/useFetchItems';
 import { appRouter } from 'components/router/appRouter';
 import globalize from 'scripts/globalize';
 import Loading from 'components/loading/LoadingComponent';
 import SectionContainer from './SectionContainer';
-import { ParentId } from 'types/library';
-import { Section, SectionType } from 'types/sections';
+import { CardShape } from 'utils/card';
+import type { ParentId } from 'types/library';
+import type { Section, SectionType } from 'types/sections';
 
 interface ProgramsSectionViewProps {
     parentId: ParentId;
@@ -18,7 +19,7 @@ const ProgramsSectionView: FC<ProgramsSectionViewProps> = ({
     sectionType,
     isUpcomingRecordingsEnabled = false
 }) => {
-    const { isLoading, data: sectionsWithItems } = useGetProgramsSectionsWithItems(parentId, sectionType);
+    const { isLoading, data: sectionsWithItems, refetch } = useGetProgramsSectionsWithItems(parentId, sectionType);
     const {
         isLoading: isUpcomingRecordingsLoading,
         data: upcomingRecordings
@@ -60,8 +61,10 @@ const ProgramsSectionView: FC<ProgramsSectionViewProps> = ({
                     sectionTitle={globalize.translate(section.name)}
                     items={items ?? []}
                     url={getRouteUrl(section)}
+                    reloadItems={refetch}
                     cardOptions={{
-                        ...section.cardOptions
+                        ...section.cardOptions,
+                        queryKey: ['ProgramSectionWithItems']
                     }}
                 />
 
@@ -73,7 +76,8 @@ const ProgramsSectionView: FC<ProgramsSectionViewProps> = ({
                     sectionTitle={group.name}
                     items={group.timerInfo ?? []}
                     cardOptions={{
-                        shape: 'overflowBackdrop',
+                        queryKey: ['Timers'],
+                        shape: CardShape.BackdropOverflow,
                         showTitle: true,
                         showParentTitleOrTitle: true,
                         showAirTime: true,

src/apps/experimental/components/library/SectionContainer.tsx

@@ -1,43 +1,29 @@
 import type { BaseItemDto, TimerInfoDto } from '@jellyfin/sdk/lib/generated-client';
-import React, { FC, useEffect, useRef } from 'react';
+import React, { FC } from 'react';
 
-import cardBuilder from 'components/cardbuilder/cardBuilder';
 import ItemsContainer from 'elements/emby-itemscontainer/ItemsContainer';
 import Scroller from 'elements/emby-scroller/Scroller';
 import LinkButton from 'elements/emby-button/LinkButton';
-import imageLoader from 'components/images/imageLoader';
-
-import { CardOptions } from 'types/cardOptions';
+import Cards from 'components/cardbuilder/Card/Cards';
+import type { CardOptions } from 'types/cardOptions';
 
 interface SectionContainerProps {
     url?: string;
     sectionTitle: string;
     items: BaseItemDto[] | TimerInfoDto[];
     cardOptions: CardOptions;
+    reloadItems?: () => void;
 }
 
 const SectionContainer: FC<SectionContainerProps> = ({
     sectionTitle,
     url,
     items,
-    cardOptions
+    cardOptions,
+    reloadItems
 }) => {
-    const element = useRef<HTMLDivElement>(null);
-
-    useEffect(() => {
-        const itemsContainer = element.current?.querySelector('.itemsContainer');
-        cardBuilder.buildCards(items, {
-            itemsContainer: itemsContainer,
-            parentContainer: element.current,
-
-            ...cardOptions
-        });
-
-        imageLoader.lazyChildren(itemsContainer);
-    }, [cardOptions, items]);
-
     return (
-        <div ref={element} className='verticalSection hide'>
+        <div className='verticalSection'>
             <div className='sectionTitleContainer sectionTitleContainer-cards padded-left'>
                 {url && items.length > 5 ? (
                     <LinkButton
@@ -66,7 +52,11 @@ const SectionContainer: FC<SectionContainerProps> = ({
             >
                 <ItemsContainer
                     className='itemsContainer scrollSlider focuscontainer-x'
-                />
+                    reloadItems={reloadItems}
+                    queryKey={cardOptions.queryKey}
+                >
+                    <Cards items={items} cardOptions={cardOptions} />
+                </ItemsContainer>
             </Scroller>
         </div>
     );

src/apps/experimental/components/library/SuggestionsSectionView.tsx

@@ -1,9 +1,8 @@
 import {
-    RecommendationDto,
+    type RecommendationDto,
     RecommendationType
 } from '@jellyfin/sdk/lib/generated-client';
-import React, { FC } from 'react';
-import escapeHTML from 'escape-html';
+import React, { type FC } from 'react';
 import {
     useGetMovieRecommendations,
     useGetSuggestionSectionsWithItems
@@ -12,8 +11,9 @@ import { appRouter } from 'components/router/appRouter';
 import globalize from 'scripts/globalize';
 import Loading from 'components/loading/LoadingComponent';
 import SectionContainer from './SectionContainer';
-import { ParentId } from 'types/library';
-import { Section, SectionType } from 'types/sections';
+import { CardShape } from 'utils/card';
+import type { ParentId } from 'types/library';
+import type { Section, SectionType } from 'types/sections';
 
 interface SuggestionsSectionViewProps {
     parentId: ParentId;
@@ -89,7 +89,7 @@ const SuggestionsSectionView: FC<SuggestionsSectionViewProps> = ({
                 );
                 break;
         }
-        return escapeHTML(title);
+        return title;
     };
 
     return (
@@ -102,6 +102,7 @@ const SuggestionsSectionView: FC<SuggestionsSectionViewProps> = ({
                     url={getRouteUrl(section)}
                     cardOptions={{
                         ...section.cardOptions,
+                        queryKey: ['SuggestionSectionWithItems'],
                         showTitle: true,
                         centerText: true,
                         cardLayout: false,
@@ -117,7 +118,8 @@ const SuggestionsSectionView: FC<SuggestionsSectionViewProps> = ({
                     sectionTitle={getRecommendationTittle(recommendation)}
                     items={recommendation.Items ?? []}
                     cardOptions={{
-                        shape: 'overflowPortrait',
+                        queryKey: ['MovieRecommendations'],
+                        shape: CardShape.PortraitOverflow,
                         showYear: true,
                         scalable: true,
                         overlayPlayButton: true,

src/apps/experimental/components/library/UpcomingView.tsx

@@ -1,10 +1,11 @@
-import React, { FC } from 'react';
+import React, { type FC } from 'react';
 import Box from '@mui/material/Box';
 import { useGetGroupsUpcomingEpisodes } from 'hooks/useFetchItems';
 import Loading from 'components/loading/LoadingComponent';
 import globalize from 'scripts/globalize';
 import SectionContainer from './SectionContainer';
-import { LibraryViewProps } from 'types/library';
+import { CardShape } from 'utils/card';
+import type { LibraryViewProps } from 'types/library';
 
 const UpcomingView: FC<LibraryViewProps> = ({ parentId }) => {
     const { isLoading, data: groupsUpcomingEpisodes } = useGetGroupsUpcomingEpisodes(parentId);
@@ -29,7 +30,7 @@ const UpcomingView: FC<LibraryViewProps> = ({ parentId }) => {
                         sectionTitle={group.name}
                         items={group.items ?? []}
                         cardOptions={{
-                            shape: 'overflowBackdrop',
+                            shape: CardShape.BackdropOverflow,
                             showLocationTypeIndicator: false,
                             showParentTitle: true,
                             preferThumb: true,

src/apps/experimental/routes/asyncRoutes/user.ts

@@ -8,5 +8,6 @@ export const ASYNC_USER_ROUTES: AsyncRoute[] = [
     { path: 'movies.html', page: 'movies', type: AsyncRouteType.Experimental },
     { path: 'tv.html', page: 'shows', type: AsyncRouteType.Experimental },
     { path: 'music.html', page: 'music', type: AsyncRouteType.Experimental },
-    { path: 'livetv.html', page: 'livetv', type: AsyncRouteType.Experimental }
+    { path: 'livetv.html', page: 'livetv', type: AsyncRouteType.Experimental },
+    { path: 'mypreferencesdisplay.html', page: 'user/display', type: AsyncRouteType.Experimental }
 ];

src/apps/experimental/routes/legacyRoutes/user.ts

@@ -25,12 +25,6 @@ export const LEGACY_USER_ROUTES: LegacyRoute[] = [
             controller: 'user/controls/index',
             view: 'user/controls/index.html'
         }
-    }, {
-        path: 'mypreferencesdisplay.html',
-        pageProps: {
-            controller: 'user/display/index',
-            view: 'user/display/index.html'
-        }
     }, {
         path: 'mypreferenceshome.html',
         pageProps: {

src/apps/experimental/routes/user/display/DisplayPreferences.tsx

@@ -0,0 +1,203 @@
+import Checkbox from '@mui/material/Checkbox';
+import FormControl from '@mui/material/FormControl';
+import FormControlLabel from '@mui/material/FormControlLabel';
+import FormHelperText from '@mui/material/FormHelperText';
+import InputLabel from '@mui/material/InputLabel';
+import MenuItem from '@mui/material/MenuItem';
+import Select, { SelectChangeEvent } from '@mui/material/Select';
+import Stack from '@mui/material/Stack';
+import TextField from '@mui/material/TextField';
+import Typography from '@mui/material/Typography';
+import React, { Fragment } from 'react';
+
+import { appHost } from 'components/apphost';
+import { useApi } from 'hooks/useApi';
+import globalize from 'scripts/globalize';
+import { DisplaySettingsValues } from './types';
+import { useScreensavers } from './hooks/useScreensavers';
+import { useServerThemes } from './hooks/useServerThemes';
+
+interface DisplayPreferencesProps {
+    onChange: (event: SelectChangeEvent | React.SyntheticEvent) => void;
+    values: DisplaySettingsValues;
+}
+
+export function DisplayPreferences({ onChange, values }: Readonly<DisplayPreferencesProps>) {
+    const { user } = useApi();
+    const { screensavers } = useScreensavers();
+    const { themes } = useServerThemes();
+
+    return (
+        <Stack spacing={3}>
+            <Typography variant='h2'>{globalize.translate('Display')}</Typography>
+
+            { appHost.supports('displaymode') && (
+                <FormControl fullWidth>
+                    <InputLabel id='display-settings-layout-label'>{globalize.translate('LabelDisplayMode')}</InputLabel>
+                    <Select
+                        aria-describedby='display-settings-layout-description'
+                        inputProps={{
+                            name: 'layout'
+                        }}
+                        labelId='display-settings-layout-label'
+                        onChange={onChange}
+                        value={values.layout}
+                    >
+                        <MenuItem value='auto'>{globalize.translate('Auto')}</MenuItem>
+                        <MenuItem value='desktop'>{globalize.translate('Desktop')}</MenuItem>
+                        <MenuItem value='mobile'>{globalize.translate('Mobile')}</MenuItem>
+                        <MenuItem value='tv'>{globalize.translate('TV')}</MenuItem>
+                        <MenuItem value='experimental'>{globalize.translate('Experimental')}</MenuItem>
+                    </Select>
+                    <FormHelperText component={Stack} id='display-settings-layout-description'>
+                        <span>{globalize.translate('DisplayModeHelp')}</span>
+                        <span>{globalize.translate('LabelPleaseRestart')}</span>
+                    </FormHelperText>
+                </FormControl>
+            ) }
+
+            { themes.length > 0 && (
+                <FormControl fullWidth>
+                    <InputLabel id='display-settings-theme-label'>{globalize.translate('LabelTheme')}</InputLabel>
+                    <Select
+                        inputProps={{
+                            name: 'theme'
+                        }}
+                        labelId='display-settings-theme-label'
+                        onChange={onChange}
+                        value={values.theme}
+                    >
+                        { ...themes.map(({ id, name }) => (
+                            <MenuItem key={id} value={id}>{name}</MenuItem>
+                        ))}
+                    </Select>
+                </FormControl>
+            ) }
+
+            <FormControl fullWidth>
+                <FormControlLabel
+                    aria-describedby='display-settings-disable-css-description'
+                    control={
+                        <Checkbox
+                            checked={values.disableCustomCss}
+                            onChange={onChange}
+                        />
+                    }
+                    label={globalize.translate('DisableCustomCss')}
+                    name='disableCustomCss'
+                />
+                <FormHelperText id='display-settings-disable-css-description'>
+                    {globalize.translate('LabelDisableCustomCss')}
+                </FormHelperText>
+            </FormControl>
+
+            <FormControl fullWidth>
+                <TextField
+                    aria-describedby='display-settings-custom-css-description'
+                    value={values.customCss}
+                    label={globalize.translate('LabelCustomCss')}
+                    multiline
+                    name='customCss'
+                    onChange={onChange}
+                />
+                <FormHelperText id='display-settings-custom-css-description'>
+                    {globalize.translate('LabelLocalCustomCss')}
+                </FormHelperText>
+            </FormControl>
+
+            { themes.length > 0 && user?.Policy?.IsAdministrator && (
+                <FormControl fullWidth>
+                    <InputLabel id='display-settings-dashboard-theme-label'>{globalize.translate('LabelDashboardTheme')}</InputLabel>
+                    <Select
+                        inputProps={{
+                            name: 'dashboardTheme'
+                        }}
+                        labelId='display-settings-dashboard-theme-label'
+                        onChange={ onChange }
+                        value={ values.dashboardTheme }
+                    >
+                        { ...themes.map(({ id, name }) => (
+                            <MenuItem key={ id } value={ id }>{ name }</MenuItem>
+                        )) }
+                    </Select>
+                </FormControl>
+            ) }
+
+            { screensavers.length > 0 && appHost.supports('screensaver') && (
+                <Fragment>
+                    <FormControl fullWidth>
+                        <InputLabel id='display-settings-screensaver-label'>{globalize.translate('LabelScreensaver')}</InputLabel>
+                        <Select
+                            inputProps={{
+                                name: 'screensaver'
+                            }}
+                            labelId='display-settings-screensaver-label'
+                            onChange={onChange}
+                            value={values.screensaver}
+                        >
+                            { ...screensavers.map(({ id, name }) => (
+                                <MenuItem key={id} value={id}>{name}</MenuItem>
+                            ))}
+                        </Select>
+                    </FormControl>
+
+                    <FormControl fullWidth>
+                        <TextField
+                            aria-describedby='display-settings-screensaver-interval-description'
+                            value={values.screensaverInterval}
+                            inputProps={{
+                                inputMode: 'numeric',
+                                max: '3600',
+                                min: '1',
+                                pattern: '[0-9]',
+                                required: true,
+                                step: '1',
+                                type: 'number'
+                            }}
+                            label={globalize.translate('LabelBackdropScreensaverInterval')}
+                            name='screensaverInterval'
+                            onChange={onChange}
+                        />
+                        <FormHelperText id='display-settings-screensaver-interval-description'>
+                            {globalize.translate('LabelBackdropScreensaverIntervalHelp')}
+                        </FormHelperText>
+                    </FormControl>
+                </Fragment>
+            ) }
+
+            <FormControl fullWidth>
+                <FormControlLabel
+                    aria-describedby='display-settings-faster-animations-description'
+                    control={
+                        <Checkbox
+                            checked={values.enableFasterAnimation}
+                            onChange={onChange}
+                        />
+                    }
+                    label={globalize.translate('EnableFasterAnimations')}
+                    name='enableFasterAnimation'
+                />
+                <FormHelperText id='display-settings-faster-animations-description'>
+                    {globalize.translate('EnableFasterAnimationsHelp')}
+                </FormHelperText>
+            </FormControl>
+
+            <FormControl fullWidth>
+                <FormControlLabel
+                    aria-describedby='display-settings-blurhash-description'
+                    control={
+                        <Checkbox
+                            checked={values.enableBlurHash}
+                            onChange={onChange}
+                        />
+                    }
+                    label={globalize.translate('EnableBlurHash')}
+                    name='enableBlurHash'
+                />
+                <FormHelperText id='display-settings-blurhash-description'>
+                    {globalize.translate('EnableBlurHashHelp')}
+                </FormHelperText>
+            </FormControl>
+        </Stack>
+    );
+}

src/apps/experimental/routes/user/display/ItemDetailPreferences.tsx

@@ -0,0 +1,40 @@
+import Checkbox from '@mui/material/Checkbox';
+import FormControl from '@mui/material/FormControl';
+import FormControlLabel from '@mui/material/FormControlLabel';
+import FormHelperText from '@mui/material/FormHelperText';
+import Stack from '@mui/material/Stack';
+import Typography from '@mui/material/Typography';
+import React from 'react';
+
+import globalize from 'scripts/globalize';
+import { DisplaySettingsValues } from './types';
+
+interface ItemDetailPreferencesProps {
+    onChange: (event: React.SyntheticEvent) => void;
+    values: DisplaySettingsValues;
+}
+
+export function ItemDetailPreferences({ onChange, values }: Readonly<ItemDetailPreferencesProps>) {
+    return (
+        <Stack spacing={2}>
+            <Typography variant='h2'>{globalize.translate('ItemDetails')}</Typography>
+
+            <FormControl fullWidth>
+                <FormControlLabel
+                    aria-describedby='display-settings-item-details-banner-description'
+                    control={
+                        <Checkbox
+                            checked={values.enableItemDetailsBanner}
+                            onChange={onChange}
+                        />
+                    }
+                    label={globalize.translate('EnableDetailsBanner')}
+                    name='enableItemDetailsBanner'
+                />
+                <FormHelperText id='display-settings-item-details-banner-description'>
+                    {globalize.translate('EnableDetailsBannerHelp')}
+                </FormHelperText>
+            </FormControl>
+        </Stack>
+    );
+}

src/apps/experimental/routes/user/display/LibraryPreferences.tsx

@@ -0,0 +1,114 @@
+import Checkbox from '@mui/material/Checkbox';
+import FormControl from '@mui/material/FormControl';
+import FormControlLabel from '@mui/material/FormControlLabel';
+import FormHelperText from '@mui/material/FormHelperText';
+import Stack from '@mui/material/Stack';
+import TextField from '@mui/material/TextField';
+import Typography from '@mui/material/Typography';
+import React from 'react';
+
+import globalize from 'scripts/globalize';
+import { DisplaySettingsValues } from './types';
+
+interface LibraryPreferencesProps {
+    onChange: (event: React.SyntheticEvent) => void;
+    values: DisplaySettingsValues;
+}
+
+export function LibraryPreferences({ onChange, values }: Readonly<LibraryPreferencesProps>) {
+    return (
+        <Stack spacing={3}>
+            <Typography variant='h2'>{globalize.translate('HeaderLibraries')}</Typography>
+
+            <FormControl fullWidth>
+                <TextField
+                    aria-describedby='display-settings-lib-pagesize-description'
+                    inputProps={{
+                        type: 'number',
+                        inputMode: 'numeric',
+                        max: '1000',
+                        min: '0',
+                        pattern: '[0-9]',
+                        required: true,
+                        step: '1'
+                    }}
+                    value={values.libraryPageSize}
+                    label={globalize.translate('LabelLibraryPageSize')}
+                    name='libraryPageSize'
+                    onChange={onChange}
+                />
+                <FormHelperText id='display-settings-lib-pagesize-description'>
+                    {globalize.translate('LabelLibraryPageSizeHelp')}
+                </FormHelperText>
+            </FormControl>
+
+            <FormControl fullWidth>
+                <FormControlLabel
+                    aria-describedby='display-settings-lib-backdrops-description'
+                    control={
+                        <Checkbox
+                            checked={values.enableLibraryBackdrops}
+                            onChange={onChange}
+                        />
+                    }
+                    label={globalize.translate('Backdrops')}
+                    name='enableLibraryBackdrops'
+                />
+                <FormHelperText id='display-settings-lib-backdrops-description'>
+                    {globalize.translate('EnableBackdropsHelp')}
+                </FormHelperText>
+            </FormControl>
+
+            <FormControl fullWidth>
+                <FormControlLabel
+                    aria-describedby='display-settings-lib-theme-songs-description'
+                    control={
+                        <Checkbox
+                            checked={values.enableLibraryThemeSongs}
+                            onChange={onChange}
+                        />
+                    }
+                    label={globalize.translate('ThemeSongs')}
+                    name='enableLibraryThemeSongs'
+                />
+                <FormHelperText id='display-settings-lib-theme-songs-description'>
+                    {globalize.translate('EnableThemeSongsHelp')}
+                </FormHelperText>
+            </FormControl>
+
+            <FormControl fullWidth>
+                <FormControlLabel
+                    aria-describedby='display-settings-lib-theme-videos-description'
+                    control={
+                        <Checkbox
+                            checked={values.enableLibraryThemeVideos}
+                            onChange={onChange}
+                        />
+                    }
+                    label={globalize.translate('ThemeVideos')}
+                    name='enableLibraryThemeVideos'
+                />
+                <FormHelperText id='display-settings-lib-theme-videos-description'>
+                    {globalize.translate('EnableThemeVideosHelp')}
+                </FormHelperText>
+            </FormControl>
+
+            <FormControl fullWidth>
+                <FormControlLabel
+                    aria-describedby='display-settings-show-missing-episodes-description'
+                    control={
+                        <Checkbox
+                            checked={values.displayMissingEpisodes}
+                            onChange={onChange}
+                        />
+                    }
+                    label={globalize.translate('DisplayMissingEpisodesWithinSeasons')}
+                    name='displayMissingEpisodes'
+                />
+                <FormHelperText id='display-settings-show-missing-episodes-description'>
+                    {globalize.translate('DisplayMissingEpisodesWithinSeasonsHelp')}
+                </FormHelperText>
+            </FormControl>
+        </Stack>
+    );
+}

src/apps/experimental/routes/user/display/LocalizationPreferences.tsx

@@ -0,0 +1,80 @@
+import FormControl from '@mui/material/FormControl';
+import FormHelperText from '@mui/material/FormHelperText';
+import InputLabel from '@mui/material/InputLabel';
+import Link from '@mui/material/Link';
+import MenuItem from '@mui/material/MenuItem';
+import Select, { SelectChangeEvent } from '@mui/material/Select';
+import Stack from '@mui/material/Stack';
+import Typography from '@mui/material/Typography';
+import React from 'react';
+
+import { appHost } from 'components/apphost';
+import datetime from 'scripts/datetime';
+import globalize from 'scripts/globalize';
+import { DATE_LOCALE_OPTIONS, LANGUAGE_OPTIONS } from './constants';
+import { DisplaySettingsValues } from './types';
+
+interface LocalizationPreferencesProps {
+    onChange: (event: SelectChangeEvent) => void;
+    values: DisplaySettingsValues;
+}
+
+export function LocalizationPreferences({ onChange, values }: Readonly<LocalizationPreferencesProps>) {
+    if (!appHost.supports('displaylanguage') && !datetime.supportsLocalization()) {
+        return null;
+    }
+    return (
+        <Stack spacing={3}>
+            <Typography variant='h2'>{globalize.translate('Localization')}</Typography>
+
+            { appHost.supports('displaylanguage') && (
+                <FormControl fullWidth>
+                    <InputLabel id='display-settings-language-label'>{globalize.translate('LabelDisplayLanguage')}</InputLabel>
+                    <Select
+                        aria-describedby='display-settings-language-description'
+                        inputProps={{
+                            name: 'language'
+                        }}
+                        labelId='display-settings-language-label'
+                        onChange={onChange}
+                        value={values.language}
+                    >
+                        { ...LANGUAGE_OPTIONS.map(({ value, label }) => (
+                            <MenuItem key={value } value={value}>{ label }</MenuItem>
+                        ))}
+                    </Select>
+                    <FormHelperText component={Stack} id='display-settings-language-description'>
+                        <span>{globalize.translate('LabelDisplayLanguageHelp')}</span>
+                        { appHost.supports('externallinks') && (
+                            <Link
+                                href='https://github.com/jellyfin/jellyfin'
+                                rel='noopener noreferrer'
+                                target='_blank'
+                            >
+                                {globalize.translate('LearnHowYouCanContribute')}
+                            </Link>
+                        ) }
+                    </FormHelperText>
+                </FormControl>
+            ) }
+
+            { datetime.supportsLocalization() && (
+                <FormControl fullWidth>
+                    <InputLabel id='display-settings-locale-label'>{globalize.translate('LabelDateTimeLocale')}</InputLabel>
+                    <Select
+                        inputProps={{
+                            name: 'dateTimeLocale'
+                        }}
+                        labelId='display-settings-locale-label'
+                        onChange={onChange}
+                        value={values.dateTimeLocale}
+                    >
+                        {...DATE_LOCALE_OPTIONS.map(({ value, label }) => (
+                            <MenuItem key={value} value={value}>{label}</MenuItem>
+                        ))}
+                    </Select>
+                </FormControl>
+            ) }
+        </Stack>
+    );
+}

src/apps/experimental/routes/user/display/NextUpPreferences.tsx

@@ -0,0 +1,80 @@
+import Checkbox from '@mui/material/Checkbox';
+import FormControl from '@mui/material/FormControl';
+import FormControlLabel from '@mui/material/FormControlLabel';
+import FormHelperText from '@mui/material/FormHelperText';
+import Stack from '@mui/material/Stack';
+import TextField from '@mui/material/TextField';
+import Typography from '@mui/material/Typography';
+import React from 'react';
+
+import globalize from 'scripts/globalize';
+import { DisplaySettingsValues } from './types';
+
+interface NextUpPreferencesProps {
+    onChange: (event: React.SyntheticEvent) => void;
+    values: DisplaySettingsValues;
+}
+
+export function NextUpPreferences({ onChange, values }: Readonly<NextUpPreferencesProps>) {
+    return (
+        <Stack spacing={3}>
+            <Typography variant='h2'>{globalize.translate('NextUp')}</Typography>
+
+            <FormControl fullWidth>
+                <TextField
+                    aria-describedby='display-settings-max-days-next-up-description'
+                    value={values.maxDaysForNextUp}
+                    inputProps={{
+                        type: 'number',
+                        inputMode: 'numeric',
+                        max: '1000',
+                        min: '0',
+                        pattern: '[0-9]',
+                        required: true,
+                        step: '1'
+                    }}
+                    label={globalize.translate('LabelMaxDaysForNextUp')}
+                    name='maxDaysForNextUp'
+                    onChange={onChange}
+                />
+                <FormHelperText id='display-settings-max-days-next-up-description'>
+                    {globalize.translate('LabelMaxDaysForNextUpHelp')}
+                </FormHelperText>
+            </FormControl>
+
+            <FormControl fullWidth>
+                <FormControlLabel
+                    aria-describedby='display-settings-next-up-rewatching-description'
+                    control={
+                        <Checkbox
+                            checked={values.enableRewatchingInNextUp}
+                            onChange={onChange}
+                        />
+                    }
+                    label={globalize.translate('EnableRewatchingNextUp')}
+                    name='enableRewatchingInNextUp'
+                />
+                <FormHelperText id='display-settings-next-up-rewatching-description'>
+                    {globalize.translate('EnableRewatchingNextUpHelp')}
+                </FormHelperText>
+            </FormControl>
+
+            <FormControl fullWidth>
+                <FormControlLabel
+                    aria-describedby='display-settings-next-up-images-description'
+                    control={
+                        <Checkbox
+                            checked={values.episodeImagesInNextUp}
+                            onChange={onChange}
+                        />
+                    }
+                    label={globalize.translate('UseEpisodeImagesInNextUp')}
+                    name='episodeImagesInNextUp'
+                />
+                <FormHelperText id='display-settings-next-up-images-description'>
+                    {globalize.translate('UseEpisodeImagesInNextUpHelp')}
+                </FormHelperText>
+            </FormControl>
+        </Stack>
+    );
+}

src/apps/experimental/routes/user/display/constants.ts

@@ -0,0 +1,79 @@
+import globalize from 'scripts/globalize';
+
+export const LANGUAGE_OPTIONS = [
+    { value: 'auto', label: globalize.translate('Auto') },
+    { value: 'af', label: 'Afrikaans' },
+    { value: 'ar', label: 'العربية' },
+    { value: 'be-BY', label: 'Беларуская' },
+    { value: 'bg-BG', label: 'Български' },
+    { value: 'bn_BD', label: 'বাংলা (বাংলাদেশ)' },
+    { value: 'ca', label: 'Català' },
+    { value: 'cs', label: 'Čeština' },
+    { value: 'cy', label: 'Cymraeg' },
+    { value: 'da', label: 'Dansk' },
+    { value: 'de', label: 'Deutsch' },
+    { value: 'el', label: 'Ελληνικά' },
+    { value: 'en-GB', label: 'English (United Kingdom)' },
+    { value: 'en-US', label: 'English' },
+    { value: 'eo', label: 'Esperanto' },
+    { value: 'es', label: 'Español' },
+    { value: 'es_419', label: 'Español americano' },
+    { value: 'es-AR', label: 'Español (Argentina)' },
+    { value: 'es_DO', label: 'Español (Dominicana)' },
+    { value: 'es-MX', label: 'Español (México)' },
+    { value: 'et', label: 'Eesti' },
+    { value: 'eu', label: 'Euskara' },
+    { value: 'fa', label: 'فارسی' },
+    { value: 'fi', label: 'Suomi' },
+    { value: 'fil', label: 'Filipino' },
+    { value: 'fr', label: 'Français' },
+    { value: 'fr-CA', label: 'Français (Canada)' },
+    { value: 'gl', label: 'Galego' },
+    { value: 'gsw', label: 'Schwiizerdütsch' },
+    { value: 'he', label: 'עִבְרִית' },
+    { value: 'hi-IN', label: 'हिन्दी' },
+    { value: 'hr', label: 'Hrvatski' },
+    { value: 'hu', label: 'Magyar' },
+    { value: 'id', label: 'Bahasa Indonesia' },
+    { value: 'is-IS', label: 'Íslenska' },
+    { value: 'it', label: 'Italiano' },
+    { value: 'ja', label: '日本語' },
+    { value: 'kk', label: 'Qazaqşa' },
+    { value: 'ko', label: '한국어' },
+    { value: 'lt-LT', label: 'Lietuvių' },
+    { value: 'lv', label: 'Latviešu' },
+    { value: 'mk', label: 'Македонски' },
+    { value: 'ml', label: 'മലയാളം' },
+    { value: 'mr', label: 'मराठी' },
+    { value: 'ms', label: 'Bahasa Melayu' },
+    { value: 'nb', label: 'Norsk bokmål' },
+    { value: 'ne', label: 'नेपाली' },
+    { value: 'nl', label: 'Nederlands' },
+    { value: 'nn', label: 'Norsk nynorsk' },
+    { value: 'pa', label: 'ਪੰਜਾਬੀ' },
+    { value: 'pl', label: 'Polski' },
+    { value: 'pr', label: 'Pirate' },
+    { value: 'pt', label: 'Português' },
+    { value: 'pt-BR', label: 'Português (Brasil)' },
+    { value: 'pt-PT', label: 'Português (Portugal)' },
+    { value: 'ro', label: 'Românește' },
+    { value: 'ru', label: 'Русский' },
+    { value: 'sk', label: 'Slovenčina' },
+    { value: 'sl-SI', label: 'Slovenščina' },
+    { value: 'sq', label: 'Shqip' },
+    { value: 'sr', label: 'Српски' },
+    { value: 'sv', label: 'Svenska' },
+    { value: 'ta', label: 'தமிழ்' },
+    { value: 'te', label: 'తెలుగు' },
+    { value: 'th', label: 'ภาษาไทย' },
+    { value: 'tr', label: 'Türkçe' },
+    { value: 'uk', label: 'Українська' },
+    { value: 'ur_PK', label: ' اُردُو' },
+    { value: 'vi', label: 'Tiếng Việt' },
+    { value: 'zh-CN', label: '汉语 (简化字)' },
+    { value: 'zh-TW', label: '漢語 (繁体字)' },
+    { value: 'zh-HK', label: '廣東話 (香港)' }
+];
+
+// NOTE: Option `Euskara` (eu) does not exist in legacy date locale options.
+export const DATE_LOCALE_OPTIONS = LANGUAGE_OPTIONS.filter(({ value }) => value !== 'eu');

src/apps/experimental/routes/user/display/hooks/useDisplaySettingForm.ts

@@ -0,0 +1,46 @@
+import { useCallback, useEffect, useState } from 'react';
+import { useSearchParams } from 'react-router-dom';
+
+import toast from 'components/toast/toast';
+import globalize from 'scripts/globalize';
+import { DisplaySettingsValues } from '../types';
+import { useDisplaySettings } from './useDisplaySettings';
+
+export function useDisplaySettingForm() {
+    const [urlParams] = useSearchParams();
+    const {
+        displaySettings,
+        loading,
+        saveDisplaySettings
+    } = useDisplaySettings({ userId: urlParams.get('userId') });
+    const [formValues, setFormValues] = useState<DisplaySettingsValues>();
+
+    useEffect(() => {
+        if (!loading && displaySettings && !formValues) {
+            setFormValues(displaySettings);
+        }
+    }, [formValues, loading, displaySettings]);
+
+    const updateField = useCallback(({ name, value }) => {
+        if (formValues) {
+            setFormValues({
+                ...formValues,
+                [name]: value
+            });
+        }
+    }, [formValues, setFormValues]);
+
+    const submitChanges = useCallback(async () => {
+        if (formValues) {
+            await saveDisplaySettings(formValues);
+            toast(globalize.translate('SettingsSaved'));
+        }
+    }, [formValues, saveDisplaySettings]);
+
+    return {
+        loading,
+        values: formValues,
+        submitChanges,
+        updateField
+    };
+}

src/apps/experimental/routes/user/display/hooks/useDisplaySettings.ts

@@ -0,0 +1,159 @@
+import { UserDto } from '@jellyfin/sdk/lib/generated-client';
+import { ApiClient } from 'jellyfin-apiclient';
+import { useCallback, useEffect, useState } from 'react';
+
+import { appHost } from 'components/apphost';
+import layoutManager from 'components/layoutManager';
+import { useApi } from 'hooks/useApi';
+import themeManager from 'scripts/themeManager';
+import { currentSettings, UserSettings } from 'scripts/settings/userSettings';
+import { DisplaySettingsValues } from '../types';
+
+interface UseDisplaySettingsParams {
+  userId?: string | null;
+}
+
+export function useDisplaySettings({ userId }: UseDisplaySettingsParams) {
+    const [loading, setLoading] = useState(true);
+    const [userSettings, setUserSettings] = useState<UserSettings>();
+    const [displaySettings, setDisplaySettings] = useState<DisplaySettingsValues>();
+    const { __legacyApiClient__, user: currentUser } = useApi();
+
+    useEffect(() => {
+        if (!userId || !currentUser || !__legacyApiClient__) {
+            return;
+        }
+
+        setLoading(true);
+
+        void (async () => {
+            const loadedSettings = await loadDisplaySettings({ api: __legacyApiClient__, currentUser, userId });
+
+            setDisplaySettings(loadedSettings.displaySettings);
+            setUserSettings(loadedSettings.userSettings);
+
+            setLoading(false);
+        })();
+
+        return () => {
+            setLoading(false);
+        };
+    }, [__legacyApiClient__, currentUser, userId]);
+
+    const saveSettings = useCallback(async (newSettings: DisplaySettingsValues) => {
+        if (!userId || !userSettings || !__legacyApiClient__) {
+            return;
+        }
+        return saveDisplaySettings({
+            api: __legacyApiClient__,
+            newDisplaySettings: newSettings,
+            userSettings,
+            userId
+        });
+    }, [__legacyApiClient__, userSettings, userId]);
+
+    return {
+        displaySettings,
+        loading,
+        saveDisplaySettings: saveSettings
+    };
+}
+
+interface LoadDisplaySettingsParams {
+    currentUser: UserDto;
+    userId?: string;
+    api: ApiClient;
+}
+
+async function loadDisplaySettings({
+    currentUser,
+    userId,
+    api
+}: LoadDisplaySettingsParams) {
+    const settings = (!userId || userId === currentUser?.Id) ? currentSettings : new UserSettings();
+    const user = (!userId || userId === currentUser?.Id) ? currentUser : await api.getUser(userId);
+
+    await settings.setUserInfo(userId, api);
+
+    const displaySettings = {
+        customCss: settings.customCss(),
+        dashboardTheme: settings.dashboardTheme() || 'auto',
+        dateTimeLocale: settings.dateTimeLocale() || 'auto',
+        disableCustomCss: Boolean(settings.disableCustomCss()),
+        displayMissingEpisodes: user?.Configuration?.DisplayMissingEpisodes ?? false,
+        enableBlurHash: Boolean(settings.enableBlurhash()),
+        enableFasterAnimation: Boolean(settings.enableFastFadein()),
+        enableItemDetailsBanner: Boolean(settings.detailsBanner()),
+        enableLibraryBackdrops: Boolean(settings.enableBackdrops()),
+        enableLibraryThemeSongs: Boolean(settings.enableThemeSongs()),
+        enableLibraryThemeVideos: Boolean(settings.enableThemeVideos()),
+        enableRewatchingInNextUp: Boolean(settings.enableRewatchingInNextUp()),
+        episodeImagesInNextUp: Boolean(settings.useEpisodeImagesInNextUpAndResume()),
+        language: settings.language() || 'auto',
+        layout: layoutManager.getSavedLayout() || 'auto',
+        libraryPageSize: settings.libraryPageSize(),
+        maxDaysForNextUp: settings.maxDaysForNextUp(),
+        screensaver: settings.screensaver() || 'none',
+        screensaverInterval: settings.backdropScreensaverInterval(),
+        theme: settings.theme()
+    };
+
+    return {
+        displaySettings,
+        userSettings: settings
+    };
+}
+
+interface SaveDisplaySettingsParams {
+    api: ApiClient;
+    newDisplaySettings: DisplaySettingsValues
+    userSettings: UserSettings;
+    userId: string;
+}
+
+async function saveDisplaySettings({
+    api,
+    newDisplaySettings,
+    userSettings,
+    userId
+}: SaveDisplaySettingsParams) {
+    const user = await api.getUser(userId);
+
+    if (appHost.supports('displaylanguage')) {
+        userSettings.language(normalizeValue(newDisplaySettings.language));
+    }
+    userSettings.customCss(normalizeValue(newDisplaySettings.customCss));
+    userSettings.dashboardTheme(normalizeValue(newDisplaySettings.dashboardTheme));
+    userSettings.dateTimeLocale(normalizeValue(newDisplaySettings.dateTimeLocale));
+    userSettings.disableCustomCss(newDisplaySettings.disableCustomCss);
+    userSettings.enableBlurhash(newDisplaySettings.enableBlurHash);
+    userSettings.enableFastFadein(newDisplaySettings.enableFasterAnimation);
+    userSettings.detailsBanner(newDisplaySettings.enableItemDetailsBanner);
+    userSettings.enableBackdrops(newDisplaySettings.enableLibraryBackdrops);
+    userSettings.enableThemeSongs(newDisplaySettings.enableLibraryThemeSongs);
+    userSettings.enableThemeVideos(newDisplaySettings.enableLibraryThemeVideos);
+    userSettings.enableRewatchingInNextUp(newDisplaySettings.enableRewatchingInNextUp);
+    userSettings.useEpisodeImagesInNextUpAndResume(newDisplaySettings.episodeImagesInNextUp);
+    userSettings.libraryPageSize(newDisplaySettings.libraryPageSize);
+    userSettings.maxDaysForNextUp(newDisplaySettings.maxDaysForNextUp);
+    userSettings.screensaver(normalizeValue(newDisplaySettings.screensaver));
+    userSettings.backdropScreensaverInterval(newDisplaySettings.screensaverInterval);
+    userSettings.theme(newDisplaySettings.theme);
+
+    layoutManager.setLayout(normalizeValue(newDisplaySettings.layout));
+
+    const promises = [
+        themeManager.setTheme(userSettings.theme())
+    ];
+
+    if (user.Id && user.Configuration) {
+        user.Configuration.DisplayMissingEpisodes = newDisplaySettings.displayMissingEpisodes;
+        promises.push(api.updateUserConfiguration(user.Id, user.Configuration));
+    }
+
+    await Promise.all(promises);
+}
+
+function normalizeValue(value: string) {
+    return /^(auto|none)$/.test(value) ? '' : value;
+}

src/apps/experimental/routes/user/display/hooks/useScreensavers.ts

@@ -0,0 +1,29 @@
+import { useMemo } from 'react';
+
+import { pluginManager } from 'components/pluginManager';
+import { Plugin, PluginType } from 'types/plugin';
+import globalize from 'scripts/globalize';
+
+export function useScreensavers() {
+    const screensavers = useMemo<Plugin[]>(() => {
+        const installedScreensaverPlugins = pluginManager
+            .ofType(PluginType.Screensaver)
+            .map((plugin: Plugin) => ({
+                ...plugin,
+                name: globalize.translate(plugin.name) as string
+            }));
+
+        return [
+            {
+                id: 'none',
+                name: globalize.translate('None') as string,
+                type: PluginType.Screensaver
+            },
+            ...installedScreensaverPlugins
+        ];
+    }, []);
+
+    return {
+        screensavers: screensavers ?? []
+    };
+}

src/apps/experimental/routes/user/display/hooks/useServerThemes.ts

@@ -0,0 +1,32 @@
+import { useEffect, useMemo, useState } from 'react';
+
+import themeManager from 'scripts/themeManager';
+import { Theme } from 'types/webConfig';
+
+export function useServerThemes() {
+    const [themes, setThemes] = useState<Theme[]>();
+
+    useEffect(() => {
+        async function getServerThemes() {
+            const loadedThemes = await themeManager.getThemes();
+
+            setThemes(loadedThemes ?? []);
+        }
+
+        if (!themes) {
+            void getServerThemes();
+        }
+    // We've intentionally left the dependency array here to ensure that the effect happens only once.
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, []);
+
+    const defaultTheme = useMemo(() => {
+        if (!themes) return null;
+        return themes.find((theme) => theme.default);
+    }, [themes]);
+
+    return {
+        themes: themes ?? [],
+        defaultTheme
+    };
+}

src/apps/experimental/routes/user/display/index.tsx

@@ -0,0 +1,96 @@
+import Button from '@mui/material/Button';
+import { SelectChangeEvent } from '@mui/material/Select';
+import Stack from '@mui/material/Stack';
+import React, { useCallback } from 'react';
+
+import Page from 'components/Page';
+import globalize from 'scripts/globalize';
+import theme from 'themes/theme';
+import { DisplayPreferences } from './DisplayPreferences';
+import { ItemDetailPreferences } from './ItemDetailPreferences';
+import { LibraryPreferences } from './LibraryPreferences';
+import { LocalizationPreferences } from './LocalizationPreferences';
+import { NextUpPreferences } from './NextUpPreferences';
+import { useDisplaySettingForm } from './hooks/useDisplaySettingForm';
+import { DisplaySettingsValues } from './types';
+import LoadingComponent from 'components/loading/LoadingComponent';
+
+export default function UserDisplayPreferences() {
+    const {
+        loading,
+        submitChanges,
+        updateField,
+        values
+    } = useDisplaySettingForm();
+
+    const handleSubmitForm = useCallback((e: React.FormEvent<HTMLFormElement>) => {
+        e.preventDefault();
+        void submitChanges();
+    }, [submitChanges]);
+
+    const handleFieldChange = useCallback((e: SelectChangeEvent | React.SyntheticEvent) => {
+        const target = e.target as HTMLInputElement;
+        const fieldName = target.name as keyof DisplaySettingsValues;
+        const fieldValue = target.type === 'checkbox' ? target.checked : target.value;
+
+        if (values?.[fieldName] !== fieldValue) {
+            updateField({
+                name: fieldName,
+                value: fieldValue
+            });
+        }
+    }, [updateField, values]);
+
+    if (loading || !values) {
+        return <LoadingComponent />;
+    }
+
+    return (
+        <Page
+            className='libraryPage userPreferencesPage noSecondaryNavPage'
+            id='displayPreferencesPage'
+            title={globalize.translate('Display')}
+        >
+            <div className='settingsContainer padded-left padded-right padded-bottom-page'>
+                <form
+                    onSubmit={handleSubmitForm}
+                    style={{ margin: 'auto' }}
+                >
+                    <Stack spacing={4}>
+                        <LocalizationPreferences
+                            onChange={handleFieldChange}
+                            values={values}
+                        />
+                        <DisplayPreferences
+                            onChange={handleFieldChange}
+                            values={values}
+                        />
+                        <LibraryPreferences
+                            onChange={handleFieldChange}
+                            values={values}
+                        />
+                        <NextUpPreferences
+                            onChange={handleFieldChange}
+                            values={values}
+                        />
+                        <ItemDetailPreferences
+                            onChange={handleFieldChange}
+                            values={values}
+                        />
+
+                        <Button
+                            type='submit'
+                            sx={{
+                                color: theme.palette.text.primary,
+                                fontSize: theme.typography.htmlFontSize,
+                                fontWeight: theme.typography.fontWeightBold
+                            }}
+                        >
+                            {globalize.translate('Save')}
+                        </Button>
+                    </Stack>
+                </form>
+            </div>
+        </Page>
+    );
+}

src/apps/experimental/routes/user/display/types.ts

@@ -0,0 +1,22 @@
+export interface DisplaySettingsValues {
+    customCss: string;
+    dashboardTheme: string;
+    dateTimeLocale: string;
+    disableCustomCss: boolean;
+    displayMissingEpisodes: boolean;
+    enableBlurHash: boolean;
+    enableFasterAnimation: boolean;
+    enableItemDetailsBanner: boolean;
+    enableLibraryBackdrops: boolean;
+    enableLibraryThemeSongs: boolean;
+    enableLibraryThemeVideos: boolean;
+    enableRewatchingInNextUp: boolean;
+    episodeImagesInNextUp: boolean;
+    language: string;
+    layout: string;
+    libraryPageSize: number;
+    maxDaysForNextUp: number;
+    screensaver: string;
+    screensaverInterval: number;
+    theme: string;
+}

src/apps/stable/routes/search.tsx

@@ -1,16 +1,46 @@
-import React, { FunctionComponent, useState } from 'react';
+import React, { type FC, useEffect, useState } from 'react';
 import { useSearchParams } from 'react-router-dom';
 
-import Page from '../../../components/Page';
-import SearchFields from '../../../components/search/SearchFields';
-import SearchResults from '../../../components/search/SearchResults';
-import SearchSuggestions from '../../../components/search/SearchSuggestions';
-import LiveTVSearchResults from '../../../components/search/LiveTVSearchResults';
-import globalize from '../../../scripts/globalize';
+import Page from 'components/Page';
+import SearchFields from 'components/search/SearchFields';
+import SearchResults from 'components/search/SearchResults';
+import SearchSuggestions from 'components/search/SearchSuggestions';
+import LiveTVSearchResults from 'components/search/LiveTVSearchResults';
+import { usePrevious } from 'hooks/usePrevious';
+import globalize from 'scripts/globalize';
 
-const Search: FunctionComponent = () => {
-    const [ query, setQuery ] = useState<string>();
-    const [ searchParams ] = useSearchParams();
+const COLLECTION_TYPE_PARAM = 'collectionType';
+const PARENT_ID_PARAM = 'parentId';
+const QUERY_PARAM = 'query';
+const SERVER_ID_PARAM = 'serverId';
+
+const Search: FC = () => {
+    const [ searchParams, setSearchParams ] = useSearchParams();
+    const urlQuery = searchParams.get(QUERY_PARAM) || '';
+    const [ query, setQuery ] = useState(urlQuery);
+    const prevQuery = usePrevious(query, '');
+
+    useEffect(() => {
+        if (query !== prevQuery) {
+            if (query === '' && urlQuery !== '') {
+                // The query input has been cleared; remove the url param
+                searchParams.delete(QUERY_PARAM);
+                setSearchParams(searchParams, { replace: true });
+            } else if (query !== urlQuery) {
+                // Update the query url param value
+                searchParams.set(QUERY_PARAM, query);
+                setSearchParams(searchParams, { replace: true });
+            }
+        } else if (query !== urlQuery) {
+            // Update the query if the query url param has changed
+            if (!urlQuery) {
+                searchParams.delete(QUERY_PARAM);
+                setSearchParams(searchParams, { replace: true });
+            }
+
+            setQuery(urlQuery);
+        }
+    }, [query, prevQuery, searchParams, setSearchParams, urlQuery]);
 
     return (
         <Page
@@ -18,22 +48,22 @@ const Search: FunctionComponent = () => {
             title={globalize.translate('Search')}
             className='mainAnimatedPage libraryPage allLibraryPage noSecondaryNavPage'
         >
-            <SearchFields onSearch={setQuery} />
+            <SearchFields query={query} onSearch={setQuery} />
             {!query
                 && <SearchSuggestions
-                    parentId={searchParams.get('parentId')}
+                    parentId={searchParams.get(PARENT_ID_PARAM)}
                 />
             }
             <SearchResults
-                serverId={searchParams.get('serverId') || window.ApiClient.serverId()}
-                parentId={searchParams.get('parentId')}
-                collectionType={searchParams.get('collectionType')}
+                serverId={searchParams.get(SERVER_ID_PARAM) || window.ApiClient.serverId()}
+                parentId={searchParams.get(PARENT_ID_PARAM)}
+                collectionType={searchParams.get(COLLECTION_TYPE_PARAM)}
                 query={query}
             />
             <LiveTVSearchResults
-                serverId={searchParams.get('serverId') || window.ApiClient.serverId()}
-                parentId={searchParams.get('parentId')}
-                collectionType={searchParams.get('collectionType')}
+                serverId={searchParams.get(SERVER_ID_PARAM) || window.ApiClient.serverId()}
+                parentId={searchParams.get(PARENT_ID_PARAM)}
+                collectionType={searchParams.get(COLLECTION_TYPE_PARAM)}
                 query={query}
             />
         </Page>

src/components/ServerConnections.js

@@ -104,6 +104,18 @@ class ServerConnections extends ConnectionManager {
         return apiClient;
     }
 
+    /**
+     * Gets the ApiClient that is currently connected or throws if not defined.
+     * @async
+     * @returns {Promise<ApiClient>} The current ApiClient instance.
+     */
+    async getCurrentApiClientAsync() {
+        const apiClient = this.currentApiClient();
+        if (!apiClient) throw new Error('[ServerConnection] No current ApiClient instance');
+
+        return apiClient;
+    }
+
     onLocalUserSignedIn(user) {
         const apiClient = this.getApiClient(user.ServerId);
         this.setLocalApiClient(apiClient);

src/components/actionSheet/actionSheet.ts

@@ -9,8 +9,64 @@ import 'material-design-icons-iconfont';
 import '../../styles/scrollstyles.scss';
 import '../../components/listview/listview.scss';
 
-function getOffsets(elems) {
-    const results = [];
+interface OptionItem {
+    asideText?: string;
+    divider?: boolean;
+    icon?: string;
+    id?: string;
+    innerText?: string;
+    name?: string;
+    secondaryText?: string;
+    selected?: boolean;
+    textContent?: string;
+    value?: string;
+}
+
+interface Options {
+    items: OptionItem[];
+    border?: boolean;
+    callback?: (id: string) => void;
+    dialogClass?: string;
+    enableHistory?: boolean;
+    entryAnimationDuration?: number;
+    entryAnimation?: string;
+    exitAnimationDuration?: number;
+    exitAnimation?: string;
+    menuItemClass?: string;
+    offsetLeft?: number;
+    offsetTop?: number;
+    positionTo?: Element | null;
+    positionY?: string;
+    resolveOnClick?: boolean | (string | null)[];
+    shaded?: boolean;
+    showCancel?: boolean;
+    text?: string;
+    timeout?: number;
+    title?: string;
+}
+
+interface Offset {
+    top: number;
+    left: number;
+    width: number;
+    height: number;
+}
+
+interface DialogOptions {
+    autoFocus?: boolean;
+    enableHistory?: boolean;
+    entryAnimationDuration?: number;
+    entryAnimation?: string;
+    exitAnimationDuration?: number;
+    exitAnimation?: string;
+    modal?: boolean;
+    removeOnClose?: boolean;
+    scrollY?: boolean;
+    size?: string;
+}
+
+function getOffsets(elems: Element[]): Offset[] {
+    const results: Offset[] = [];
 
     if (!document) {
         return results;
@@ -30,12 +86,12 @@ function getOffsets(elems) {
     return results;
 }
 
-function getPosition(options, dlg) {
+function getPosition(positionTo: Element, options: Options, dlg: HTMLElement) {
     const windowSize = dom.getWindowSize();
     const windowHeight = windowSize.innerHeight;
     const windowWidth = windowSize.innerWidth;
 
-    const pos = getOffsets([options.positionTo])[0];
+    const pos = getOffsets([positionTo])[0];
 
     if (options.positionY !== 'top') {
         pos.top += (pos.height || 0) / 2;
@@ -71,19 +127,22 @@ function getPosition(options, dlg) {
     return pos;
 }
 
-function centerFocus(elem, horiz, on) {
+function centerFocus(elem: Element, horiz: boolean, on: boolean) {
     import('../../scripts/scrollHelper').then((scrollHelper) => {
         const fn = on ? 'on' : 'off';
         scrollHelper.centerFocus[fn](elem, horiz);
+    }).catch(e => {
+        console.warn('Error in centerFocus', e);
     });
 }
 
-export function show(options) {
+/* eslint-disable-next-line sonarjs/cognitive-complexity */
+export function show(options: Options) {
     // items
     // positionTo
     // showCancel
     // title
-    const dialogOptions = {
+    const dialogOptions: DialogOptions = {
         removeOnClose: true,
         enableHistory: options.enableHistory,
         scrollY: false
@@ -239,7 +298,10 @@ export function show(options) {
     dlg.innerHTML = html;
 
     if (layoutManager.tv) {
-        centerFocus(dlg.querySelector('.actionSheetScroller'), false, true);
+        const scroller = dlg.querySelector('.actionSheetScroller');
+        if (scroller) {
+            centerFocus(scroller, false, true);
+        }
     }
 
     const btnCloseActionSheet = dlg.querySelector('.btnCloseActionSheet');
@@ -249,9 +311,9 @@ export function show(options) {
         });
     }
 
-    let selectedId;
+    let selectedId: string | null = null;
 
-    let timeout;
+    let timeout: ReturnType<typeof setTimeout> | undefined;
     if (options.timeout) {
         timeout = setTimeout(function () {
             dialogHelper.close(dlg);
@@ -259,16 +321,16 @@ export function show(options) {
     }
 
     return new Promise(function (resolve, reject) {
-        let isResolved;
+        let isResolved = false;
 
         dlg.addEventListener('click', function (e) {
-            const actionSheetMenuItem = dom.parentWithClass(e.target, 'actionSheetMenuItem');
+            const actionSheetMenuItem = dom.parentWithClass(e.target as HTMLElement, 'actionSheetMenuItem');
 
             if (actionSheetMenuItem) {
                 selectedId = actionSheetMenuItem.getAttribute('data-id');
 
                 if (options.resolveOnClick) {
-                    if (options.resolveOnClick.indexOf) {
+                    if (Array.isArray(options.resolveOnClick)) {
                         if (options.resolveOnClick.indexOf(selectedId) !== -1) {
                             resolve(selectedId);
                             isResolved = true;
@@ -285,12 +347,15 @@ export function show(options) {
 
         dlg.addEventListener('close', function () {
             if (layoutManager.tv) {
-                centerFocus(dlg.querySelector('.actionSheetScroller'), false, false);
+                const scroller = dlg.querySelector('.actionSheetScroller');
+                if (scroller) {
+                    centerFocus(scroller, false, false);
+                }
             }
 
             if (timeout) {
                 clearTimeout(timeout);
-                timeout = null;
+                timeout = undefined;
             }
 
             if (!isResolved) {
@@ -306,13 +371,15 @@ export function show(options) {
             }
         });
 
-        dialogHelper.open(dlg);
+        dialogHelper.open(dlg).catch(e => {
+            console.warn('DialogHelper.open error', e);
+        });
 
-        const pos = options.positionTo && dialogOptions.size !== 'fullscreen' ? getPosition(options, dlg) : null;
+        const pos = options.positionTo && dialogOptions.size !== 'fullscreen' ? getPosition(options.positionTo, options, dlg) : null;
 
         if (pos) {
             dlg.style.position = 'fixed';
-            dlg.style.margin = 0;
+            dlg.style.margin = '0';
             dlg.style.left = pos.left + 'px';
             dlg.style.top = pos.top + 'px';
         }

src/components/apphost.js

@@ -1,4 +1,3 @@
-import Package from '../../package.json';
 import appSettings from '../scripts/settings/appSettings';
 import browser from '../scripts/browser';
 import Events from '../utils/events.ts';
@@ -36,7 +35,7 @@ function getDeviceProfile(item) {
         let profile;
 
         if (window.NativeShell) {
-            profile = window.NativeShell.AppHost.getDeviceProfile(profileBuilder, Package.version);
+            profile = window.NativeShell.AppHost.getDeviceProfile(profileBuilder, __PACKAGE_JSON_VERSION__);
         } else {
             const builderOpts = getBaseProfileOptions(item);
             profile = profileBuilder(builderOpts);
@@ -46,18 +45,27 @@ function getDeviceProfile(item) {
         const maxTranscodingVideoWidth = maxVideoWidth < 0 ? appHost.screen()?.maxAllowedWidth : maxVideoWidth;
 
         if (maxTranscodingVideoWidth) {
+            const conditionWidth = {
+                Condition: 'LessThanEqual',
+                Property: 'Width',
+                Value: maxTranscodingVideoWidth.toString(),
+                IsRequired: false
+            };
+
+            if (appSettings.limitSupportedVideoResolution()) {
+                profile.CodecProfiles.push({
+                    Type: 'Video',
+                    Conditions: [conditionWidth]
+                });
+            }
+
             profile.TranscodingProfiles.forEach((transcodingProfile) => {
                 if (transcodingProfile.Type === 'Video') {
                     transcodingProfile.Conditions = (transcodingProfile.Conditions || []).filter((condition) => {
                         return condition.Property !== 'Width';
                     });
 
-                    transcodingProfile.Conditions.push({
-                        Condition: 'LessThanEqual',
-                        Property: 'Width',
-                        Value: maxTranscodingVideoWidth.toString(),
-                        IsRequired: false
-                    });
+                    transcodingProfile.Conditions.push(conditionWidth);
                 }
             });
         }
@@ -378,7 +386,7 @@ export const appHost = {
     },
     appVersion: function () {
         return window.NativeShell?.AppHost?.appVersion ?
-            window.NativeShell.AppHost.appVersion() : Package.version;
+            window.NativeShell.AppHost.appVersion() : __PACKAGE_JSON_VERSION__;
     },
     getPushTokenInfo: function () {
         return {};

src/components/cardbuilder/Card/Card.tsx

@@ -0,0 +1,25 @@
+import React, { type FC } from 'react';
+import useCard from './useCard';
+import CardWrapper from './CardWrapper';
+import CardBox from './CardBox';
+
+import type { CardOptions } from 'types/cardOptions';
+import type { ItemDto } from 'types/base/models/item-dto';
+
+interface CardProps {
+    item?: ItemDto;
+    cardOptions: CardOptions;
+}
+
+const Card: FC<CardProps> = ({ item = {}, cardOptions }) => {
+    const { getCardWrapperProps, getCardBoxProps } = useCard({ item, cardOptions } );
+    const cardWrapperProps = getCardWrapperProps();
+    const cardBoxProps = getCardBoxProps();
+    return (
+        <CardWrapper {...cardWrapperProps}>
+            <CardBox {...cardBoxProps} />
+        </CardWrapper>
+    );
+};
+
+export default Card;

src/components/cardbuilder/Card/CardBox.tsx

@@ -0,0 +1,78 @@
+import React, { type FC } from 'react';
+import layoutManager from 'components/layoutManager';
+
+import CardOverlayButtons from './CardOverlayButtons';
+import CardHoverMenu from './CardHoverMenu';
+import CardOuterFooter from './CardOuterFooter';
+import CardContent from './CardContent';
+import { CardShape } from 'utils/card';
+import type { ItemDto } from 'types/base/models/item-dto';
+import type { CardOptions } from 'types/cardOptions';
+
+interface CardBoxProps {
+    item: ItemDto;
+    cardOptions: CardOptions;
+    className: string;
+    shape: CardShape | undefined;
+    imgUrl: string | undefined;
+    blurhash: string | undefined;
+    forceName: boolean;
+    coveredImage: boolean;
+    overlayText: boolean | undefined;
+}
+
+const CardBox: FC<CardBoxProps> = ({
+    item,
+    cardOptions,
+    className,
+    shape,
+    imgUrl,
+    blurhash,
+    forceName,
+    coveredImage,
+    overlayText
+}) => {
+    return (
+        <div className={className}>
+            <div className='cardScalable'>
+                <div className={`cardPadder cardPadder-${shape}`}></div>
+                <CardContent
+                    item={item}
+                    cardOptions={cardOptions}
+                    coveredImage={coveredImage}
+
+                    overlayText={overlayText}
+                    imgUrl={imgUrl}
+                    blurhash={blurhash}
+                    forceName={forceName}
+                />
+                {layoutManager.mobile && (
+                    <CardOverlayButtons
+                        item={item}
+                        cardOptions={cardOptions}
+                    />
+                )}
+
+                {layoutManager.desktop
+                        && !cardOptions.disableHoverMenu && (
+                    <CardHoverMenu
+                        item={item}
+                        cardOptions={cardOptions}
+                    />
+                )}
+            </div>
+            {!overlayText && (
+                <CardOuterFooter
+                    item={item}
+                    cardOptions={cardOptions}
+                    forceName={forceName}
+                    overlayText={overlayText}
+                    imgUrl={imgUrl}
+                />
+            )}
+        </div>
+    );
+};
+
+export default CardBox;
+

src/components/cardbuilder/Card/CardContent.tsx

@@ -0,0 +1,50 @@
+import React, { type FC } from 'react';
+import classNames from 'classnames';
+import { getDefaultBackgroundClass } from '../cardBuilderUtils';
+import CardImageContainer from './CardImageContainer';
+
+import type { ItemDto } from 'types/base/models/item-dto';
+import type { CardOptions } from 'types/cardOptions';
+
+interface CardContentProps {
+    item: ItemDto;
+    cardOptions: CardOptions;
+    coveredImage: boolean;
+    overlayText: boolean | undefined;
+    imgUrl: string | undefined;
+    blurhash: string | undefined;
+    forceName: boolean;
+}
+
+const CardContent: FC<CardContentProps> = ({
+    item,
+    cardOptions,
+    coveredImage,
+    overlayText,
+    imgUrl,
+    blurhash,
+    forceName
+}) => {
+    const cardContentClass = classNames(
+        'cardContent',
+        { [getDefaultBackgroundClass(item.Name)]: !imgUrl }
+    );
+
+    return (
+        <div
+            className={cardContentClass}
+        >
+            <CardImageContainer
+                item={item}
+                cardOptions={cardOptions}
+                coveredImage={coveredImage}
+                overlayText={overlayText}
+                imgUrl={imgUrl}
+                blurhash={blurhash}
+                forceName={forceName}
+            />
+        </div>
+    );
+};
+
+export default CardContent;

src/components/cardbuilder/Card/CardFooterText.tsx

@@ -0,0 +1,87 @@
+import React, { type FC } from 'react';
+import Box from '@mui/material/Box';
+import useCardText from './useCardText';
+import layoutManager from 'components/layoutManager';
+import MoreVertIconButton from '../../common/MoreVertIconButton';
+import type { ItemDto } from 'types/base/models/item-dto';
+import type { CardOptions } from 'types/cardOptions';
+import Image from 'components/common/Image';
+
+const shouldShowDetailsMenu = (
+    cardOptions: CardOptions,
+    isOuterFooter: boolean
+) => {
+    return (
+        cardOptions.showDetailsMenu
+        && isOuterFooter
+        && cardOptions.cardLayout
+        && layoutManager.mobile
+        && cardOptions.cardFooterAside !== 'none'
+    );
+};
+
+interface LogoComponentProps {
+    logoUrl: string;
+}
+
+const LogoComponent: FC<LogoComponentProps> = ({ logoUrl }) => (
+    <Box className='cardFooterLogo'>
+        <Image
+            imgUrl={logoUrl}
+            containImage
+        />
+    </Box>
+);
+
+interface CardFooterTextProps {
+    item: ItemDto;
+    cardOptions: CardOptions;
+    forceName: boolean;
+    overlayText: boolean | undefined;
+    imgUrl: string | undefined;
+    footerClass: string | undefined;
+    progressBar?: React.JSX.Element | null;
+    logoUrl?: string;
+    isOuterFooter: boolean;
+}
+
+const CardFooterText: FC<CardFooterTextProps> = ({
+    item,
+    cardOptions,
+    forceName,
+    imgUrl,
+    footerClass,
+    overlayText,
+    progressBar,
+    logoUrl,
+    isOuterFooter
+}) => {
+    const { cardTextLines } = useCardText({
+        item: item.ProgramInfo || item,
+        cardOptions,
+        forceName,
+        imgUrl,
+        overlayText,
+        isOuterFooter,
+        cssClass: cardOptions.centerText ?
+            'cardText cardTextCentered' :
+            'cardText',
+        forceLines: !cardOptions.overlayText,
+        maxLines: cardOptions.lines
+    });
+
+    return (
+        <Box className={footerClass}>
+            {logoUrl && <LogoComponent logoUrl={logoUrl} />}
+            {shouldShowDetailsMenu(cardOptions, isOuterFooter) && (
+                <MoreVertIconButton className='itemAction btnCardOptions' />
+            )}
+
+            {cardTextLines}
+
+            {progressBar}
+        </Box>
+    );
+};
+
+export default CardFooterText;

src/components/cardbuilder/Card/CardHoverMenu.tsx

@@ -0,0 +1,82 @@
+import React, { type FC } from 'react';
+import Box from '@mui/material/Box';
+import ButtonGroup from '@mui/material/ButtonGroup';
+import classNames from 'classnames';
+import { appRouter } from 'components/router/appRouter';
+import itemHelper from 'components/itemHelper';
+import { playbackManager } from 'components/playback/playbackmanager';
+
+import PlayedButton from 'elements/emby-playstatebutton/PlayedButton';
+import FavoriteButton from 'elements/emby-ratingbutton/FavoriteButton';
+import PlayArrowIconButton from '../../common/PlayArrowIconButton';
+import MoreVertIconButton from '../../common/MoreVertIconButton';
+
+import type { ItemDto } from 'types/base/models/item-dto';
+import type { CardOptions } from 'types/cardOptions';
+
+interface CardHoverMenuProps {
+	item: ItemDto;
+	cardOptions: CardOptions;
+}
+
+const CardHoverMenu: FC<CardHoverMenuProps> = ({
+    item,
+    cardOptions
+}) => {
+    const url = appRouter.getRouteUrl(item, {
+        parentId: cardOptions.parentId
+    });
+    const btnCssClass =
+		'paper-icon-button-light cardOverlayButton cardOverlayButton-hover itemAction';
+
+    const centerPlayButtonClass = classNames(
+        btnCssClass,
+        'cardOverlayFab-primary'
+    );
+    const { IsFavorite, Played } = item.UserData ?? {};
+
+    return (
+        <Box
+            className='cardOverlayContainer'
+        >
+            <a
+                href={url}
+                aria-label={item.Name || ''}
+                className='cardImageContainer'
+            ></a>
+
+            {playbackManager.canPlay(item) && (
+                <PlayArrowIconButton
+                    className={centerPlayButtonClass}
+                    action='play'
+                    title='Play'
+                />
+            )}
+
+            <ButtonGroup className='cardOverlayButton-br flex'>
+                {itemHelper.canMarkPlayed(item) && cardOptions.enablePlayedButton !== false && (
+                    <PlayedButton
+                        className={btnCssClass}
+                        isPlayed={Played}
+                        itemId={item.Id}
+                        itemType={item.Type}
+                        queryKey={cardOptions.queryKey}
+                    />
+                )}
+
+                {itemHelper.canRate(item) && cardOptions.enableRatingButton !== false && (
+                    <FavoriteButton
+                        className={btnCssClass}
+                        isFavorite={IsFavorite}
+                        itemId={item.Id}
+                        queryKey={cardOptions.queryKey}
+                    />
+                )}
+
+                <MoreVertIconButton className={btnCssClass} />
+            </ButtonGroup>
+        </Box>
+    );
+};
+
+export default CardHoverMenu;

src/components/cardbuilder/Card/CardImageContainer.tsx

@@ -0,0 +1,83 @@
+import { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind';
+import React, { type FC } from 'react';
+import Box from '@mui/material/Box';
+import classNames from 'classnames';
+import useIndicator from 'components/indicators/useIndicator';
+import RefreshIndicator from 'elements/emby-itemrefreshindicator/RefreshIndicator';
+import Media from '../../common/Media';
+import CardInnerFooter from './CardInnerFooter';
+
+import type { ItemDto } from 'types/base/models/item-dto';
+import type { CardOptions } from 'types/cardOptions';
+
+interface CardImageContainerProps {
+    item: ItemDto;
+    cardOptions: CardOptions;
+    coveredImage: boolean;
+    overlayText: boolean | undefined;
+    imgUrl: string | undefined;
+    blurhash: string | undefined;
+    forceName: boolean;
+}
+
+const CardImageContainer: FC<CardImageContainerProps> = ({
+    item,
+    cardOptions,
+    coveredImage,
+    overlayText,
+    imgUrl,
+    blurhash,
+    forceName
+}) => {
+    const indicator = useIndicator(item);
+    const cardImageClass = classNames(
+        'cardImageContainer',
+        { coveredImage: coveredImage },
+        { 'coveredImage-contain': coveredImage && item.Type === BaseItemKind.TvChannel }
+    );
+
+    return (
+        <div className={cardImageClass}>
+            {cardOptions.disableIndicators !== true && (
+                <Box className='indicators'>
+                    {indicator.getMediaSourceIndicator()}
+
+                    <Box className='cardIndicators'>
+                        {cardOptions.missingIndicator !== false
+                            && indicator.getMissingIndicator()}
+
+                        {indicator.getTimerIndicator()}
+                        {indicator.getTypeIndicator()}
+
+                        {cardOptions.showGroupCount ?
+                            indicator.getChildCountIndicator() :
+                            indicator.getPlayedIndicator()}
+
+                        {(item.Type === BaseItemKind.CollectionFolder
+                            || item.CollectionType)
+                            && item.RefreshProgress && (
+                            <RefreshIndicator item={item} />
+                        )}
+                    </Box>
+                </Box>
+            )}
+
+            <Media item={item} imgUrl={imgUrl} blurhash={blurhash} imageType={cardOptions.imageType} />
+
+            {overlayText && (
+                <CardInnerFooter
+                    item={item}
+                    cardOptions={cardOptions}
+                    forceName={forceName}
+                    overlayText={overlayText}
+                    imgUrl={imgUrl}
+                    progressBar={indicator.getProgressBar()}
+                />
+            )}
+
+            {!overlayText && indicator.getProgressBar()}
+        </div>
+    );
+};
+
+export default CardImageContainer;

src/components/cardbuilder/Card/CardInnerFooter.tsx

@@ -0,0 +1,42 @@
+import React, { type FC } from 'react';
+import classNames from 'classnames';
+import CardFooterText from './CardFooterText';
+import type { ItemDto } from 'types/base/models/item-dto';
+import type { CardOptions } from 'types/cardOptions';
+
+interface CardInnerFooterProps {
+    item: ItemDto;
+    cardOptions: CardOptions;
+    imgUrl: string | undefined;
+    progressBar?: React.JSX.Element | null;
+    forceName: boolean;
+    overlayText: boolean | undefined;
+}
+
+const CardInnerFooter: FC<CardInnerFooterProps> = ({
+    item,
+    cardOptions,
+    imgUrl,
+    overlayText,
+    progressBar,
+    forceName
+}) => {
+    const footerClass = classNames('innerCardFooter', {
+        fullInnerCardFooter: progressBar
+    });
+
+    return (
+        <CardFooterText
+            item={item}
+            cardOptions={cardOptions}
+            forceName={forceName}
+            overlayText={overlayText}
+            imgUrl={imgUrl}
+            footerClass={footerClass}
+            progressBar={progressBar}
+            isOuterFooter={false}
+        />
+    );
+};
+
+export default CardInnerFooter;

src/components/cardbuilder/Card/CardOuterFooter.tsx

@@ -0,0 +1,45 @@
+import React, { type FC } from 'react';
+import classNames from 'classnames';
+import { useApi } from 'hooks/useApi';
+import { getCardLogoUrl } from './cardHelper';
+import CardFooterText from './CardFooterText';
+
+import type { ItemDto } from 'types/base/models/item-dto';
+import type { CardOptions } from 'types/cardOptions';
+
+interface CardOuterFooterProps {
+    item: ItemDto
+    cardOptions: CardOptions;
+    imgUrl: string | undefined;
+    forceName: boolean;
+    overlayText: boolean | undefined
+}
+
+const CardOuterFooter: FC<CardOuterFooterProps> = ({ item, cardOptions, overlayText, imgUrl, forceName }) => {
+    const { api } = useApi();
+    const logoInfo = getCardLogoUrl(item, api, cardOptions);
+    const logoUrl = logoInfo.logoUrl;
+
+    const footerClass = classNames(
+        'cardFooter',
+        { 'cardFooter-transparent': cardOptions.cardLayout },
+        { 'cardFooter-withlogo': logoUrl }
+    );
+
+    return (
+        <CardFooterText
+            item={item}
+            cardOptions={cardOptions}
+            forceName={forceName}
+            overlayText={overlayText}
+            imgUrl={imgUrl}
+            footerClass={footerClass}
+            progressBar={undefined}
+            logoUrl={logoUrl}
+            isOuterFooter={true}
+        />
+
+    );
+};
+
+export default CardOuterFooter;

src/components/cardbuilder/Card/CardOverlayButtons.tsx

@@ -0,0 +1,104 @@
+import { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind';
+import { LocationType } from '@jellyfin/sdk/lib/generated-client/models/location-type';
+import React, { type FC } from 'react';
+import ButtonGroup from '@mui/material/ButtonGroup';
+import classNames from 'classnames';
+import { appRouter } from 'components/router/appRouter';
+import PlayArrowIconButton from '../../common/PlayArrowIconButton';
+import MoreVertIconButton from '../../common/MoreVertIconButton';
+
+import type { ItemDto } from 'types/base/models/item-dto';
+import type { CardOptions } from 'types/cardOptions';
+
+const sholudShowOverlayPlayButton = (
+    overlayPlayButton: boolean | undefined,
+    item: ItemDto
+) => {
+    return (
+        overlayPlayButton
+        && !item.IsPlaceHolder
+        && (item.LocationType !== LocationType.Virtual
+            || !item.MediaType
+            || item.Type === BaseItemKind.Program)
+        && item.Type !== BaseItemKind.Person
+    );
+};
+
+interface CardOverlayButtonsProps {
+    item: ItemDto;
+    cardOptions: CardOptions;
+}
+
+const CardOverlayButtons: FC<CardOverlayButtonsProps> = ({
+    item,
+    cardOptions
+}) => {
+    let overlayPlayButton = cardOptions.overlayPlayButton;
+
+    if (
+        overlayPlayButton == null
+        && !cardOptions.overlayMoreButton
+        && !cardOptions.overlayInfoButton
+        && !cardOptions.cardLayout
+    ) {
+        overlayPlayButton = item.MediaType === 'Video';
+    }
+
+    const url = appRouter.getRouteUrl(item, {
+        parentId: cardOptions.parentId
+    });
+
+    const btnCssClass = classNames(
+        'paper-icon-button-light',
+        'cardOverlayButton',
+        'itemAction'
+    );
+
+    const centerPlayButtonClass = classNames(
+        btnCssClass,
+        'cardOverlayButton-centered'
+    );
+
+    return (
+        <a
+            href={url}
+            aria-label={item.Name || ''}
+            style={{
+                position: 'absolute',
+                top: 0,
+                left: 0,
+                bottom: 0,
+                right: 0,
+                userSelect: 'none',
+                borderRadius: '0.2em'
+            }}
+        >
+
+            {cardOptions.centerPlayButton && (
+                <PlayArrowIconButton
+                    className={centerPlayButtonClass}
+                    action='play'
+                    title='Play'
+                />
+            )}
+
+            <ButtonGroup className='cardOverlayButton-br'>
+                {sholudShowOverlayPlayButton(overlayPlayButton, item) && (
+                    <PlayArrowIconButton
+                        className={btnCssClass}
+                        action='play'
+                        title='Play'
+                    />
+                )}
+
+                {cardOptions.overlayMoreButton && (
+                    <MoreVertIconButton
+                        className={btnCssClass}
+                    />
+                )}
+            </ButtonGroup>
+        </a>
+    );
+};
+
+export default CardOverlayButtons;

src/components/cardbuilder/Card/CardText.tsx

@@ -0,0 +1,32 @@
+import React, { type FC } from 'react';
+import Box from '@mui/material/Box';
+import type { TextLine } from './cardHelper';
+
+interface CardTextProps {
+    className?: string;
+    textLine: TextLine;
+}
+
+const CardText: FC<CardTextProps> = ({ className, textLine }) => {
+    const { title, titleAction } = textLine;
+    const renderCardText = () => {
+        if (titleAction) {
+            return (
+                <a
+                    className='itemAction textActionButton'
+                    href={titleAction.url}
+                    title={titleAction.title}
+                    {...titleAction.dataAttributes}
+                >
+                    {titleAction.title}
+                </a>
+            );
+        } else {
+            return title;
+        }
+    };
+
+    return <Box className={className}>{renderCardText()}</Box>;
+};
+
+export default CardText;

src/components/cardbuilder/Card/CardWrapper.tsx

@@ -0,0 +1,30 @@
+import React, { type FC } from 'react';
+import layoutManager from 'components/layoutManager';
+import type { DataAttributes } from 'types/dataAttributes';
+
+interface CardWrapperProps {
+    className: string;
+    dataAttributes: DataAttributes;
+}
+
+const CardWrapper: FC<CardWrapperProps> = ({
+    className,
+    dataAttributes,
+    children
+}) => {
+    if (layoutManager.tv) {
+        return (
+            <button className={className} {...dataAttributes}>
+                {children}
+            </button>
+        );
+    } else {
+        return (
+            <div className={className} {...dataAttributes}>
+                {children}
+            </div>
+        );
+    }
+};
+
+export default CardWrapper;

src/components/cardbuilder/Card/Cards.tsx

@@ -0,0 +1,24 @@
+import React, { type FC } from 'react';
+import { setCardData } from '../cardBuilder';
+import Card from './Card';
+import type { ItemDto } from 'types/base/models/item-dto';
+import type { CardOptions } from 'types/cardOptions';
+import '../card.scss';
+
+interface CardsProps {
+    items: ItemDto[];
+    cardOptions: CardOptions;
+}
+
+const Cards: FC<CardsProps> = ({ items, cardOptions }) => {
+    setCardData(items, cardOptions);
+
+    const renderCards = () =>
+        items.map((item) => (
+            <Card key={item.Id} item={item} cardOptions={cardOptions} />
+        ));
+
+    return <>{renderCards()}</>;
+};
+
+export default Cards;

src/components/cardbuilder/Card/cardHelper.ts

@@ -0,0 +1,718 @@
+import {
+    BaseItemDto,
+    BaseItemKind,
+    BaseItemPerson,
+    ImageType
+} from '@jellyfin/sdk/lib/generated-client';
+import { Api } from '@jellyfin/sdk';
+import { getImageApi } from '@jellyfin/sdk/lib/utils/api/image-api';
+
+import { appRouter } from 'components/router/appRouter';
+import layoutManager from 'components/layoutManager';
+import itemHelper from 'components/itemHelper';
+import globalize from 'scripts/globalize';
+import datetime from 'scripts/datetime';
+
+import { isUsingLiveTvNaming } from '../cardBuilderUtils';
+
+import type { NullableNumber, NullableString } from 'types/base/common/shared/types';
+import type { ItemDto } from 'types/base/models/item-dto';
+import type { CardOptions } from 'types/cardOptions';
+import type { DataAttributes } from 'types/dataAttributes';
+import { getDataAttributes } from 'utils/items';
+
+export function getCardLogoUrl(
+    item: ItemDto,
+    api: Api | undefined,
+    cardOptions: CardOptions
+) {
+    let imgType;
+    let imgTag;
+    let itemId;
+    const logoHeight = 40;
+
+    if (cardOptions.showChannelLogo && item.ChannelPrimaryImageTag) {
+        imgType = ImageType.Primary;
+        imgTag = item.ChannelPrimaryImageTag;
+        itemId = item.ChannelId;
+    } else if (cardOptions.showLogo && item.ParentLogoImageTag) {
+        imgType = ImageType.Logo;
+        imgTag = item.ParentLogoImageTag;
+        itemId = item.ParentLogoItemId;
+    }
+
+    if (!itemId) {
+        itemId = item.Id;
+    }
+
+    if (api && imgTag && imgType && itemId) {
+        const response = getImageApi(api).getItemImageUrlById(itemId, imgType, {
+            height: logoHeight,
+            tag: imgTag
+        });
+
+        return {
+            logoUrl: response
+        };
+    }
+
+    return {
+        logoUrl: undefined
+    };
+}
+
+interface TextAction {
+    url: string;
+    title: string;
+    dataAttributes: DataAttributes
+}
+
+export interface TextLine {
+    title?: NullableString;
+    titleAction?: TextAction;
+}
+
+export function getTextActionButton(
+    item: ItemDto,
+    text?: NullableString,
+    serverId?: NullableString
+): TextLine {
+    const title = text || itemHelper.getDisplayName(item);
+
+    if (layoutManager.tv) {
+        return {
+            title
+        };
+    }
+
+    const url = appRouter.getRouteUrl(item);
+
+    const dataAttributes = getDataAttributes(
+        {
+            action: 'link',
+            itemServerId: serverId ?? item.ServerId,
+            itemId: item.Id,
+            itemChannelId: item.ChannelId,
+            itemType: item.Type,
+            itemMediaType: item.MediaType,
+            itemCollectionType: item.CollectionType,
+            itemIsFolder: item.IsFolder
+        }
+    );
+
+    return {
+        titleAction: {
+            url,
+            title,
+            dataAttributes
+        }
+    };
+}
+
+export function getAirTimeText(
+    item: ItemDto,
+    showAirDateTime: boolean | undefined,
+    showAirEndTime: boolean | undefined
+) {
+    let airTimeText = '';
+
+    if (item.StartDate) {
+        try {
+            let date = datetime.parseISO8601Date(item.StartDate);
+
+            if (showAirDateTime) {
+                airTimeText
+                    += datetime.toLocaleDateString(date, {
+                        weekday: 'short',
+                        month: 'short',
+                        day: 'numeric'
+                    }) + ' ';
+            }
+
+            airTimeText += datetime.getDisplayTime(date);
+
+            if (item.EndDate && showAirEndTime) {
+                date = datetime.parseISO8601Date(item.EndDate);
+                airTimeText += ' - ' + datetime.getDisplayTime(date);
+            }
+        } catch (e) {
+            console.error('error parsing date: ' + item.StartDate);
+        }
+    }
+    return airTimeText;
+}
+
+function isGenreOrStudio(itemType: NullableString) {
+    return itemType === BaseItemKind.Genre || itemType === BaseItemKind.Studio;
+}
+
+function isMusicGenreOrMusicArtist(
+    itemType: NullableString,
+    context: NullableString
+) {
+    return itemType === BaseItemKind.MusicGenre || context === 'MusicArtist';
+}
+
+function getMovieCount(itemMovieCount: NullableNumber) {
+    if (itemMovieCount) {
+        return itemMovieCount === 1 ?
+            globalize.translate('ValueOneMovie') :
+            globalize.translate('ValueMovieCount', itemMovieCount);
+    }
+}
+
+function getSeriesCount(itemSeriesCount: NullableNumber) {
+    if (itemSeriesCount) {
+        return itemSeriesCount === 1 ?
+            globalize.translate('ValueOneSeries') :
+            globalize.translate('ValueSeriesCount', itemSeriesCount);
+    }
+}
+
+function getEpisodeCount(itemEpisodeCount: NullableNumber) {
+    if (itemEpisodeCount) {
+        return itemEpisodeCount === 1 ?
+            globalize.translate('ValueOneEpisode') :
+            globalize.translate('ValueEpisodeCount', itemEpisodeCount);
+    }
+}
+
+function getAlbumCount(itemAlbumCount: NullableNumber) {
+    if (itemAlbumCount) {
+        return itemAlbumCount === 1 ?
+            globalize.translate('ValueOneAlbum') :
+            globalize.translate('ValueAlbumCount', itemAlbumCount);
+    }
+}
+
+function getSongCount(itemSongCount: NullableNumber) {
+    if (itemSongCount) {
+        return itemSongCount === 1 ?
+            globalize.translate('ValueOneSong') :
+            globalize.translate('ValueSongCount', itemSongCount);
+    }
+}
+
+function getMusicVideoCount(itemMusicVideoCount: NullableNumber) {
+    if (itemMusicVideoCount) {
+        return itemMusicVideoCount === 1 ?
+            globalize.translate('ValueOneMusicVideo') :
+            globalize.translate('ValueMusicVideoCount', itemMusicVideoCount);
+    }
+}
+
+function getRecursiveItemCount(itemRecursiveItemCount: NullableNumber) {
+    return itemRecursiveItemCount === 1 ?
+        globalize.translate('ValueOneEpisode') :
+        globalize.translate('ValueEpisodeCount', itemRecursiveItemCount);
+}
+
+function getParentTitle(
+    isOuterFooter: boolean,
+    serverId: NullableString,
+    item: ItemDto
+) {
+    if (isOuterFooter && item.AlbumArtists?.length) {
+        (item.AlbumArtists[0] as BaseItemDto).Type = BaseItemKind.MusicArtist;
+        (item.AlbumArtists[0] as BaseItemDto).IsFolder = true;
+        return getTextActionButton(item.AlbumArtists[0], null, serverId);
+    } else {
+        return {
+            title: isUsingLiveTvNaming(item.Type) ?
+                item.Name :
+                item.SeriesName
+                  || item.Series
+                  || item.Album
+                  || item.AlbumArtist
+                  || ''
+        };
+    }
+}
+
+function getRunTimeTicks(itemRunTimeTicks: NullableNumber) {
+    if (itemRunTimeTicks) {
+        let minutes = itemRunTimeTicks / 600000000;
+
+        minutes = minutes || 1;
+
+        return globalize.translate('ValueMinutes', Math.round(minutes));
+    } else {
+        return globalize.translate('ValueMinutes', 0);
+    }
+}
+
+export function getItemCounts(cardOptions: CardOptions, item: ItemDto) {
+    const counts: string[] = [];
+
+    const addCount = (text: NullableString) => {
+        if (text) {
+            counts.push(text);
+        }
+    };
+
+    if (item.Type === BaseItemKind.Playlist) {
+        const runTimeTicksText = getRunTimeTicks(item.RunTimeTicks);
+        addCount(runTimeTicksText);
+    } else if (isGenreOrStudio(item.Type)) {
+        const movieCountText = getMovieCount(item.MovieCount);
+        addCount(movieCountText);
+
+        const seriesCountText = getSeriesCount(item.SeriesCount);
+        addCount(seriesCountText);
+
+        const episodeCountText = getEpisodeCount(item.EpisodeCount);
+        addCount(episodeCountText);
+    } else if (isMusicGenreOrMusicArtist(item.Type, cardOptions.context)) {
+        const albumCountText = getAlbumCount(item.AlbumCount);
+        addCount(albumCountText);
+
+        const songCountText = getSongCount(item.SongCount);
+        addCount(songCountText);
+
+        const musicVideoCountText = getMusicVideoCount(item.MusicVideoCount);
+        addCount(musicVideoCountText);
+    } else if (item.Type === BaseItemKind.Series) {
+        const recursiveItemCountText = getRecursiveItemCount(
+            item.RecursiveItemCount
+        );
+        addCount(recursiveItemCountText);
+    }
+
+    return counts.join(', ');
+}
+
+export function shouldShowTitle(
+    showTitle: boolean | string | undefined,
+    itemType: NullableString
+) {
+    return (
+        Boolean(showTitle)
+        || itemType === BaseItemKind.PhotoAlbum
+        || itemType === BaseItemKind.Folder
+    );
+}
+
+export function shouldShowOtherText(
+    isOuterFooter: boolean,
+    overlayText: boolean | undefined
+) {
+    return isOuterFooter ? !overlayText : overlayText;
+}
+
+export function shouldShowParentTitleUnderneath(
+    itemType: NullableString
+) {
+    return (
+        itemType === BaseItemKind.MusicAlbum
+        || itemType === BaseItemKind.Audio
+        || itemType === BaseItemKind.MusicVideo
+    );
+}
+
+function shouldShowMediaTitle(
+    titleAdded: boolean,
+    showTitle: boolean,
+    forceName: boolean,
+    cardOptions: CardOptions,
+    textLines: TextLine[]
+) {
+    let showMediaTitle =
+        (showTitle && !titleAdded)
+        || (cardOptions.showParentTitleOrTitle && !textLines.length);
+    if (!showMediaTitle && !titleAdded && (showTitle || forceName)) {
+        showMediaTitle = true;
+    }
+    return showMediaTitle;
+}
+
+function shouldShowExtraType(itemExtraType: NullableString) {
+    return itemExtraType && itemExtraType !== 'Unknown';
+}
+
+function shouldShowSeriesYearOrYear(
+    showYear: string | boolean | undefined,
+    showSeriesYear: boolean | undefined
+) {
+    return Boolean(showYear) || showSeriesYear;
+}
+
+function shouldShowCurrentProgram(
+    showCurrentProgram: boolean | undefined,
+    itemType: NullableString
+) {
+    return showCurrentProgram && itemType === BaseItemKind.TvChannel;
+}
+
+function shouldShowCurrentProgramTime(
+    showCurrentProgramTime: boolean | undefined,
+    itemType: NullableString
+) {
+    return showCurrentProgramTime && itemType === BaseItemKind.TvChannel;
+}
+
+function shouldShowPersonRoleOrType(
+    showPersonRoleOrType: boolean | undefined,
+    item: ItemDto
+) {
+    return showPersonRoleOrType && (item as BaseItemPerson).Role;
+}
+
+function shouldShowParentTitle(
+    showParentTitle: boolean | undefined,
+    parentTitleUnderneath: boolean
+) {
+    return showParentTitle && parentTitleUnderneath;
+}
+
+function addOtherText(
+    cardOptions: CardOptions,
+    parentTitleUnderneath: boolean,
+    isOuterFooter: boolean,
+    item: ItemDto,
+    addTextLine: (val: TextLine) => void,
+    serverId: NullableString
+) {
+    if (
+        shouldShowParentTitle(
+            cardOptions.showParentTitle,
+            parentTitleUnderneath
+        )
+    ) {
+        addTextLine(getParentTitle(isOuterFooter, serverId, item));
+    }
+
+    if (shouldShowExtraType(item.ExtraType)) {
+        addTextLine({ title: globalize.translate(item.ExtraType) });
+    }
+
+    if (cardOptions.showItemCounts) {
+        addTextLine({ title: getItemCounts(cardOptions, item) });
+    }
+
+    if (cardOptions.textLines) {
+        addTextLine({ title: getAdditionalLines(cardOptions.textLines, item) });
+    }
+
+    if (cardOptions.showSongCount) {
+        addTextLine({ title: getSongCount(item.SongCount) });
+    }
+
+    if (cardOptions.showPremiereDate) {
+        addTextLine({ title: getPremiereDate(item.PremiereDate) });
+    }
+
+    if (
+        shouldShowSeriesYearOrYear(
+            cardOptions.showYear,
+            cardOptions.showSeriesYear
+        )
+    ) {
+        addTextLine({ title: getProductionYear(item) });
+    }
+
+    if (cardOptions.showRuntime) {
+        addTextLine({ title: getRunTime(item.RunTimeTicks) });
+    }
+
+    if (cardOptions.showAirTime) {
+        addTextLine({
+            title: getAirTimeText(
+                item,
+                cardOptions.showAirDateTime,
+                cardOptions.showAirEndTime
+            )
+        });
+    }
+
+    if (cardOptions.showChannelName) {
+        addTextLine(getChannelName(item));
+    }
+
+    if (shouldShowCurrentProgram(cardOptions.showCurrentProgram, item.Type)) {
+        addTextLine({ title: getCurrentProgramName(item.CurrentProgram) });
+    }
+
+    if (
+        shouldShowCurrentProgramTime(
+            cardOptions.showCurrentProgramTime,
+            item.Type
+        )
+    ) {
+        addTextLine({ title: getCurrentProgramTime(item.CurrentProgram) });
+    }
+
+    if (cardOptions.showSeriesTimerTime) {
+        addTextLine({ title: getSeriesTimerTime(item) });
+    }
+
+    if (cardOptions.showSeriesTimerChannel) {
+        addTextLine({ title: getSeriesTimerChannel(item) });
+    }
+
+    if (shouldShowPersonRoleOrType(cardOptions.showCurrentProgramTime, item)) {
+        addTextLine({
+            title: globalize.translate(
+                'PersonRole',
+                (item as BaseItemPerson).Role
+            )
+        });
+    }
+}
+
+function getSeriesTimerChannel(item: ItemDto) {
+    if (item.RecordAnyChannel) {
+        return globalize.translate('AllChannels');
+    } else {
+        return item.ChannelName || '' || globalize.translate('OneChannel');
+    }
+}
+
+function getSeriesTimerTime(item: ItemDto) {
+    if (item.RecordAnyTime) {
+        return globalize.translate('Anytime');
+    } else {
+        return datetime.getDisplayTime(item.StartDate);
+    }
+}
+
+function getCurrentProgramTime(CurrentProgram: BaseItemDto | undefined) {
+    if (CurrentProgram) {
+        return getAirTimeText(CurrentProgram, false, true) || '';
+    } else {
+        return '';
+    }
+}
+
+function getCurrentProgramName(CurrentProgram: BaseItemDto | undefined) {
+    if (CurrentProgram) {
+        return CurrentProgram.Name;
+    } else {
+        return '';
+    }
+}
+
+function getChannelName(item: ItemDto) {
+    if (item.ChannelId) {
+        return getTextActionButton(
+            {
+                Id: item.ChannelId,
+                ServerId: item.ServerId,
+                Name: item.ChannelName,
+                Type: BaseItemKind.TvChannel,
+                MediaType: item.MediaType,
+                IsFolder: false
+            },
+            item.ChannelName
+        );
+    } else {
+        return { title: item.ChannelName || '\u00A0' };
+    }
+}
+
+function getRunTime(itemRunTimeTicks: NullableNumber) {
+    if (itemRunTimeTicks) {
+        return datetime.getDisplayRunningTime(itemRunTimeTicks);
+    } else {
+        return '';
+    }
+}
+
+function getPremiereDate(PremiereDate: string | null | undefined) {
+    if (PremiereDate) {
+        try {
+            return datetime.toLocaleDateString(
+                datetime.parseISO8601Date(PremiereDate),
+                { weekday: 'long', month: 'long', day: 'numeric' }
+            );
+        } catch (err) {
+            return '';
+        }
+    } else {
+        return '';
+    }
+}
+
+function getAdditionalLines(
+    textLines: (item: ItemDto) => (string | undefined)[],
+    item: ItemDto
+) {
+    const additionalLines = textLines(item);
+    for (const additionalLine of additionalLines) {
+        return additionalLine;
+    }
+}
+
+function getProductionYear(item: ItemDto) {
+    const productionYear =
+        item.ProductionYear
+        && datetime.toLocaleString(item.ProductionYear, {
+            useGrouping: false
+        });
+    if (item.Type === BaseItemKind.Series) {
+        if (item.Status === 'Continuing') {
+            return globalize.translate(
+                'SeriesYearToPresent',
+                productionYear || ''
+            );
+        } else if (item.EndDate && item.ProductionYear) {
+            const endYear = datetime.toLocaleString(
+                datetime.parseISO8601Date(item.EndDate).getFullYear(),
+                { useGrouping: false }
+            );
+            return (
+                productionYear
+                + (endYear === productionYear ? '' : ' - ' + endYear)
+            );
+        } else {
+            return productionYear || '';
+        }
+    } else {
+        return productionYear || '';
+    }
+}
+
+function getMediaTitle(cardOptions: CardOptions, item: ItemDto): TextLine {
+    const name =
+        cardOptions.showTitle === 'auto'
+        && !item.IsFolder
+        && item.MediaType === 'Photo' ?
+            '' :
+            itemHelper.getDisplayName(item, {
+                includeParentInfo: cardOptions.includeParentInfoInTitle
+            });
+
+    return getTextActionButton({
+        Id: item.Id,
+        ServerId: item.ServerId,
+        Name: name,
+        Type: item.Type,
+        CollectionType: item.CollectionType,
+        IsFolder: item.IsFolder
+    });
+}
+
+function getParentTitleOrTitle(
+    isOuterFooter: boolean,
+    item: ItemDto,
+    setTitleAdded: (val: boolean) => void,
+    showTitle: boolean
+): TextLine {
+    if (
+        isOuterFooter
+        && item.Type === BaseItemKind.Episode
+        && item.SeriesName
+    ) {
+        if (item.SeriesId) {
+            return getTextActionButton({
+                Id: item.SeriesId,
+                ServerId: item.ServerId,
+                Name: item.SeriesName,
+                Type: BaseItemKind.Series,
+                IsFolder: true
+            });
+        } else {
+            return { title: item.SeriesName };
+        }
+    } else if (isUsingLiveTvNaming(item.Type)) {
+        if (!item.EpisodeTitle && !item.IndexNumber) {
+            setTitleAdded(true);
+        }
+        return { title: item.Name };
+    } else {
+        const parentTitle =
+            item.SeriesName
+            || item.Series
+            || item.Album
+            || item.AlbumArtist
+            || '';
+
+        if (parentTitle || showTitle) {
+            return { title: parentTitle };
+        }
+
+        return { title: '' };
+    }
+}
+
+interface TextLinesOpts {
+    isOuterFooter: boolean;
+    overlayText: boolean | undefined;
+    forceName: boolean;
+    item: ItemDto;
+    cardOptions: CardOptions;
+    imgUrl: string | undefined;
+}
+
+export function getCardTextLines({
+    isOuterFooter,
+    overlayText,
+    forceName,
+    item,
+    cardOptions,
+    imgUrl
+}: TextLinesOpts) {
+    const showTitle = shouldShowTitle(cardOptions.showTitle, item.Type);
+    const showOtherText = shouldShowOtherText(isOuterFooter, overlayText);
+    const serverId = item.ServerId || cardOptions.serverId;
+    let textLines: TextLine[] = [];
+    const parentTitleUnderneath = shouldShowParentTitleUnderneath(item.Type);
+
+    let titleAdded = false;
+    const addTextLine = (val: TextLine) => {
+        textLines.push(val);
+    };
+
+    const setTitleAdded = (val: boolean) => {
+        titleAdded = val;
+    };
+
+    if (
+        showOtherText
+        && (cardOptions.showParentTitle || cardOptions.showParentTitleOrTitle)
+        && !parentTitleUnderneath
+    ) {
+        addTextLine(
+            getParentTitleOrTitle(isOuterFooter, item, setTitleAdded, showTitle)
+        );
+    }
+
+    const showMediaTitle = shouldShowMediaTitle(
+        titleAdded,
+        showTitle,
+        forceName,
+        cardOptions,
+        textLines
+    );
+
+    if (showMediaTitle) {
+        addTextLine(getMediaTitle(cardOptions, item));
+    }
+
+    if (showOtherText) {
+        addOtherText(
+            cardOptions,
+            parentTitleUnderneath,
+            isOuterFooter,
+            item,
+            addTextLine,
+            serverId
+        );
+    }
+
+    if (
+        (showTitle || !imgUrl)
+        && forceName
+        && overlayText
+        && textLines.length === 1
+    ) {
+        textLines = [];
+    }
+
+    if (overlayText && showTitle) {
+        textLines = [{ title: item.Name }];
+    }
+
+    return {
+        textLines
+    };
+}

src/components/cardbuilder/Card/useCard.ts

@@ -0,0 +1,123 @@
+import { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind';
+import classNames from 'classnames';
+import useCardImageUrl from './useCardImageUrl';
+import {
+    resolveAction,
+    resolveMixedShapeByAspectRatio
+} from '../cardBuilderUtils';
+import { getDataAttributes } from 'utils/items';
+import { CardShape } from 'utils/card';
+import layoutManager from 'components/layoutManager';
+
+import type { ItemDto } from 'types/base/models/item-dto';
+import type { CardOptions } from 'types/cardOptions';
+
+interface UseCardProps {
+    item: ItemDto;
+    cardOptions: CardOptions;
+}
+
+function useCard({ item, cardOptions }: UseCardProps) {
+    const action = resolveAction({
+        defaultAction: cardOptions.action ?? 'link',
+        isFolder: item.IsFolder ?? false,
+        isPhoto: item.MediaType === 'Photo'
+    });
+
+    let shape = cardOptions.shape;
+
+    if (shape === CardShape.Mixed) {
+        shape = resolveMixedShapeByAspectRatio(item.PrimaryImageAspectRatio);
+    }
+
+    const imgInfo = useCardImageUrl({
+        item: item.ProgramInfo ?? item,
+        cardOptions,
+        shape
+    });
+    const imgUrl = imgInfo.imgUrl;
+    const blurhash = imgInfo.blurhash;
+    const forceName = imgInfo.forceName;
+    const coveredImage = cardOptions.coverImage ?? imgInfo.coverImage;
+    const overlayText = cardOptions.overlayText;
+
+    const nameWithPrefix = item.SortName ?? item.Name ?? '';
+    let prefix = nameWithPrefix.substring(
+        0,
+        Math.min(3, nameWithPrefix.length)
+    );
+
+    if (prefix) {
+        prefix = prefix.toUpperCase();
+    }
+
+    const dataAttributes = getDataAttributes(
+        {
+            action,
+            itemServerId: item.ServerId ?? cardOptions.serverId,
+            context: cardOptions.context,
+            parentId: cardOptions.parentId,
+            collectionId: cardOptions.collectionId,
+            playlistId: cardOptions.playlistId,
+            itemId: item.Id,
+            itemTimerId: item.TimerId,
+            itemSeriesTimerId: item.SeriesTimerId,
+            itemChannelId: item.ChannelId,
+            itemType: item.Type,
+            itemMediaType: item.MediaType,
+            itemCollectionType: item.CollectionType,
+            itemIsFolder: item.IsFolder,
+            itemPath: item.Path,
+            itemStartDate: item.StartDate,
+            itemEndDate: item.EndDate,
+            itemUserData: item.UserData,
+            prefix
+        }
+    );
+
+    const cardClass = classNames(
+        'card',
+        { [`${shape}Card`]: shape },
+        cardOptions.cardCssClass,
+        cardOptions.cardClass,
+        { 'card-hoverable': layoutManager.desktop },
+        { groupedCard: cardOptions.showChildCountIndicator && item.ChildCount },
+        {
+            'card-withuserdata':
+                item.Type !== BaseItemKind.MusicAlbum
+                && item.Type !== BaseItemKind.MusicArtist
+                && item.Type !== BaseItemKind.Audio
+        },
+        { itemAction: layoutManager.tv }
+    );
+
+    const cardBoxClass = classNames(
+        'cardBox',
+        { visualCardBox: cardOptions.cardLayout },
+        { 'cardBox-bottompadded': !cardOptions.cardLayout }
+    );
+
+    const getCardWrapperProps = () => ({
+        className: cardClass,
+        dataAttributes
+    });
+
+    const getCardBoxProps = () => ({
+        item,
+        cardOptions,
+        className: cardBoxClass,
+        shape,
+        imgUrl,
+        blurhash,
+        forceName,
+        coveredImage,
+        overlayText
+    });
+
+    return {
+        getCardWrapperProps,
+        getCardBoxProps
+    };
+}
+
+export default useCard;

src/components/cardbuilder/Card/useCardImageUrl.ts

@@ -0,0 +1,298 @@
+import { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind';
+import { ImageType } from '@jellyfin/sdk/lib/generated-client/models/image-type';
+import { getImageApi } from '@jellyfin/sdk/lib/utils/api/image-api';
+import { useApi } from 'hooks/useApi';
+import { getDesiredAspect } from '../cardBuilderUtils';
+import { CardShape } from 'utils/card';
+import type { NullableNumber, NullableString } from 'types/base/common/shared/types';
+import type { ItemDto } from 'types/base/models/item-dto';
+import type { CardOptions } from 'types/cardOptions';
+
+function getPreferThumbInfo(item: ItemDto, cardOptions: CardOptions) {
+    let imgType;
+    let itemId;
+    let imgTag;
+    let forceName = false;
+
+    if (item.ImageTags?.Thumb) {
+        imgType = ImageType.Thumb;
+        imgTag = item.ImageTags.Thumb;
+        itemId = item.Id;
+    } else if (item.SeriesThumbImageTag && cardOptions.inheritThumb !== false) {
+        imgType = ImageType.Thumb;
+        imgTag = item.SeriesThumbImageTag;
+        itemId = item.SeriesId;
+    } else if (
+        item.ParentThumbItemId
+        && cardOptions.inheritThumb !== false
+        && item.MediaType !== 'Photo'
+    ) {
+        imgType = ImageType.Thumb;
+        imgTag = item.ParentThumbImageTag;
+        itemId = item.ParentThumbItemId;
+    } else if (item.BackdropImageTags?.length) {
+        imgType = ImageType.Backdrop;
+        imgTag = item.BackdropImageTags[0];
+        itemId = item.Id;
+        forceName = true;
+    } else if (
+        item.ParentBackdropImageTags?.length
+        && cardOptions.inheritThumb !== false
+        && item.Type === BaseItemKind.Episode
+    ) {
+        imgType = ImageType.Backdrop;
+        imgTag = item.ParentBackdropImageTags[0];
+        itemId = item.ParentBackdropItemId;
+    }
+    return {
+        itemId: itemId,
+        imgTag: imgTag,
+        imgType: imgType,
+        forceName: forceName
+    };
+}
+
+function getPreferLogoInfo(item: ItemDto) {
+    let imgType;
+    let itemId;
+    let imgTag;
+
+    if (item.ImageTags?.Logo) {
+        imgType = ImageType.Logo;
+        imgTag = item.ImageTags.Logo;
+        itemId = item.Id;
+    } else if (item.ParentLogoImageTag && item.ParentLogoItemId) {
+        imgType = ImageType.Logo;
+        imgTag = item.ParentLogoImageTag;
+        itemId = item.ParentLogoItemId;
+    }
+    return {
+        itemId: itemId,
+        imgTag: imgTag,
+        imgType: imgType
+    };
+}
+
+function getCalculatedHeight(
+    itemWidth: NullableNumber,
+    itemPrimaryImageAspectRatio: NullableNumber
+) {
+    if (itemWidth && itemPrimaryImageAspectRatio) {
+        return Math.round(itemWidth / itemPrimaryImageAspectRatio);
+    }
+}
+
+function isForceName(cardOptions: CardOptions) {
+    return !!(cardOptions.preferThumb && cardOptions.showTitle !== false);
+}
+
+function isCoverImage(
+    itemPrimaryImageAspectRatio: NullableNumber,
+    uiAspect: NullableNumber
+) {
+    if (itemPrimaryImageAspectRatio && uiAspect) {
+        return Math.abs(itemPrimaryImageAspectRatio - uiAspect) / uiAspect <= 0.2;
+    }
+
+    return false;
+}
+
+function shouldShowPreferBanner(
+    imageTagsBanner: NullableString,
+    cardOptions: CardOptions,
+    shape: CardShape | undefined
+): boolean {
+    return (
+        (cardOptions.preferBanner || shape === CardShape.Banner)
+        && Boolean(imageTagsBanner)
+    );
+}
+
+function shouldShowPreferDisc(
+    imageTagsDisc: string | undefined,
+    cardOptions: CardOptions
+): boolean {
+    return cardOptions.preferDisc === true && Boolean(imageTagsDisc);
+}
+
+function shouldShowImageTagsPrimary(item: ItemDto): boolean {
+    return (
+        Boolean(item.ImageTags?.Primary) && (item.Type !== BaseItemKind.Episode || item.ChildCount !== 0)
+    );
+}
+
+function shouldShowImageTagsThumb(item: ItemDto): boolean {
+    return item.Type === BaseItemKind.Season && Boolean(item.ImageTags?.Thumb);
+}
+
+function shouldShowSeriesThumbImageTag(
+    itemSeriesThumbImageTag: NullableString,
+    cardOptions: CardOptions
+): boolean {
+    return (
+        Boolean(itemSeriesThumbImageTag) && cardOptions.inheritThumb !== false
+    );
+}
+
+function shouldShowParentThumbImageTag(
+    itemParentThumbItemId: NullableString,
+    cardOptions: CardOptions
+): boolean {
+    return (
+        Boolean(itemParentThumbItemId) && cardOptions.inheritThumb !== false
+    );
+}
+
+function shouldShowParentBackdropImageTags(item: ItemDto): boolean {
+    return Boolean(item.AlbumId) && Boolean(item.AlbumPrimaryImageTag);
+}
+
+function shouldShowPreferThumb(itemType: NullableString, cardOptions: CardOptions): boolean {
+    return Boolean(cardOptions.preferThumb) && !(itemType === BaseItemKind.Program || itemType === BaseItemKind.Episode);
+}
+
+function getCardImageInfo(
+    item: ItemDto,
+    cardOptions: CardOptions,
+    shape: CardShape | undefined
+) {
+    const width = cardOptions.width;
+    let height;
+    const primaryImageAspectRatio = item.PrimaryImageAspectRatio;
+    let forceName = false;
+    let imgTag;
+    let coverImage = false;
+    const uiAspect = getDesiredAspect(shape);
+    let imgType;
+    let itemId;
+
+    if (shouldShowPreferThumb(item.Type, cardOptions)) {
+        const preferThumbInfo = getPreferThumbInfo(item, cardOptions);
+        imgType = preferThumbInfo.imgType;
+        imgTag = preferThumbInfo.imgTag;
+        itemId = preferThumbInfo.itemId;
+        forceName = preferThumbInfo.forceName;
+    } else if (shouldShowPreferBanner(item.ImageTags?.Banner, cardOptions, shape)) {
+        imgType = ImageType.Banner;
+        imgTag = item.ImageTags?.Banner;
+        itemId = item.Id;
+    } else if (shouldShowPreferDisc(item.ImageTags?.Disc, cardOptions)) {
+        imgType = ImageType.Disc;
+        imgTag = item.ImageTags?.Disc;
+        itemId = item.Id;
+    } else if (cardOptions.preferLogo) {
+        const preferLogoInfo = getPreferLogoInfo(item);
+        imgType = preferLogoInfo.imgType;
+        imgTag = preferLogoInfo.imgType;
+        itemId = preferLogoInfo.itemId;
+    } else if (shouldShowImageTagsPrimary(item)) {
+        imgType = ImageType.Primary;
+        imgTag = item.ImageTags?.Primary;
+        itemId = item.Id;
+        height = getCalculatedHeight(width, primaryImageAspectRatio);
+        forceName = isForceName(cardOptions);
+        coverImage = isCoverImage(primaryImageAspectRatio, uiAspect);
+    } else if (item.SeriesPrimaryImageTag) {
+        imgType = ImageType.Primary;
+        imgTag = item.SeriesPrimaryImageTag;
+        itemId = item.SeriesId;
+    } else if (item.PrimaryImageTag) {
+        imgType = ImageType.Primary;
+        imgTag = item.PrimaryImageTag;
+        itemId = item.PrimaryImageItemId;
+        height = getCalculatedHeight(width, primaryImageAspectRatio);
+        forceName = isForceName(cardOptions);
+        coverImage = isCoverImage(primaryImageAspectRatio, uiAspect);
+    } else if (item.ParentPrimaryImageTag) {
+        imgType = ImageType.Primary;
+        imgTag = item.ParentPrimaryImageTag;
+        itemId = item.ParentPrimaryImageItemId;
+    } else if (shouldShowParentBackdropImageTags(item)) {
+        imgType = ImageType.Primary;
+        imgTag = item.AlbumPrimaryImageTag;
+        itemId = item.AlbumId;
+        height = getCalculatedHeight(width, primaryImageAspectRatio);
+        forceName = isForceName(cardOptions);
+        coverImage = isCoverImage(primaryImageAspectRatio, uiAspect);
+    } else if (shouldShowImageTagsThumb(item)) {
+        imgType = ImageType.Thumb;
+        imgTag = item.ImageTags?.Thumb;
+        itemId = item.Id;
+    } else if (item.BackdropImageTags?.length) {
+        imgType = ImageType.Backdrop;
+        imgTag = item.BackdropImageTags[0];
+        itemId = item.Id;
+    } else if (shouldShowSeriesThumbImageTag(item.SeriesThumbImageTag, cardOptions)) {
+        imgType = ImageType.Thumb;
+        imgTag = item.SeriesThumbImageTag;
+        itemId = item.SeriesId;
+    } else if (shouldShowParentThumbImageTag(item.ParentThumbItemId, cardOptions)) {
+        imgType = ImageType.Thumb;
+        imgTag = item.ParentThumbImageTag;
+        itemId = item.ParentThumbItemId;
+    } else if (
+        item.ParentBackdropImageTags?.length
+        && cardOptions.inheritThumb !== false
+    ) {
+        imgType = ImageType.Backdrop;
+        imgTag = item.ParentBackdropImageTags[0];
+        itemId = item.ParentBackdropItemId;
+    }
+
+    return {
+        imgType,
+        imgTag,
+        itemId,
+        width,
+        height,
+        forceName,
+        coverImage
+    };
+}
+
+interface UseCardImageUrlProps {
+    item: ItemDto;
+    cardOptions: CardOptions;
+    shape: CardShape | undefined;
+}
+
+function useCardImageUrl({ item, cardOptions, shape }: UseCardImageUrlProps) {
+    const { api } = useApi();
+    const imgInfo = getCardImageInfo(item, cardOptions, shape);
+
+    let width = imgInfo.width;
+    let height = imgInfo.height;
+    const imgTag = imgInfo.imgTag;
+    const imgType = imgInfo.imgType;
+    const itemId = imgInfo.itemId;
+    const ratio = window.devicePixelRatio || 1;
+    let imgUrl;
+    let blurhash;
+
+    if (api && imgTag && imgType && itemId) {
+        if (width) {
+            width = Math.round(width * ratio);
+        }
+
+        if (height) {
+            height = Math.round(height * ratio);
+        }
+        imgUrl = getImageApi(api).getItemImageUrlById(itemId, imgType, {
+            quality: 96,
+            fillWidth: width,
+            fillHeight: height,
+            tag: imgTag
+        });
+
+        blurhash = item?.ImageBlurHashes?.[imgType]?.[imgTag];
+    }
+
+    return {
+        imgUrl: imgUrl,
+        blurhash: blurhash,
+        forceName: imgInfo.forceName,
+        coverImage: imgInfo.coverImage
+    };
+}
+
+export default useCardImageUrl;

src/components/cardbuilder/Card/useCardText.tsx

@@ -0,0 +1,113 @@
+import React from 'react';
+import Box from '@mui/material/Box';
+import classNames from 'classnames';
+import layoutManager from 'components/layoutManager';
+import CardText from './CardText';
+import { getCardTextLines } from './cardHelper';
+
+import type { ItemDto } from 'types/base/models/item-dto';
+import type { CardOptions } from 'types/cardOptions';
+
+const enableRightMargin = (
+    isOuterFooter: boolean,
+    cardLayout: boolean | null | undefined,
+    centerText: boolean | undefined,
+    cardFooterAside: string | undefined
+) => {
+    return (
+        isOuterFooter
+        && cardLayout
+        && !centerText
+        && cardFooterAside !== 'none'
+        && layoutManager.mobile
+    );
+};
+
+interface UseCardTextProps {
+    item: ItemDto;
+    cardOptions: CardOptions;
+    forceName: boolean;
+    overlayText: boolean | undefined;
+    imgUrl: string | undefined;
+    isOuterFooter: boolean;
+    cssClass: string;
+    forceLines: boolean;
+    maxLines: number | undefined;
+}
+
+function useCardText({
+    item,
+    cardOptions,
+    forceName,
+    imgUrl,
+    overlayText,
+    isOuterFooter,
+    cssClass,
+    forceLines,
+    maxLines
+}: UseCardTextProps) {
+    const { textLines } = getCardTextLines({
+        isOuterFooter,
+        overlayText,
+        forceName,
+        item,
+        cardOptions,
+        imgUrl
+    });
+
+    const addRightMargin = enableRightMargin(
+        isOuterFooter,
+        cardOptions.cardLayout,
+        cardOptions.centerText,
+        cardOptions.cardFooterAside
+    );
+
+    const renderCardTextLines = () => {
+        const components: React.ReactNode[] = [];
+        let valid = 0;
+        for (const textLine of textLines) {
+            const currentCssClass = classNames(
+                cssClass,
+                {
+                    'cardText-secondary':
+                    valid > 0 && isOuterFooter
+                },
+                { 'cardText-first': valid === 0 && isOuterFooter },
+                { 'cardText-rightmargin': addRightMargin }
+            );
+
+            if (textLine) {
+                components.push(
+                    <CardText key={valid} className={currentCssClass} textLine={textLine} />
+                );
+
+                valid++;
+                if (maxLines && valid >= maxLines) {
+                    break;
+                }
+            }
+        }
+
+        if (forceLines) {
+            const linesLength = maxLines ?? Math.min(textLines.length, maxLines ?? textLines.length);
+            while (valid < linesLength) {
+                components.push(
+                    <Box key={valid} className={cssClass}>
+                        &nbsp;
+                    </Box>
+                );
+                valid++;
+            }
+        }
+
+        return components;
+    };
+
+    const cardTextLines = renderCardTextLines();
+
+    return {
+        cardTextLines
+    };
+}
+
+export default useCardText;

src/components/cardbuilder/card.scss

@@ -378,7 +378,7 @@ button::-moz-focus-inner {
     margin-right: 2em;
 }
 
-.cardDefaultText {
+.cardImageContainer > .cardDefaultText {
     white-space: normal;
     text-align: center;
     font-size: 2em;
@@ -408,6 +408,7 @@ button::-moz-focus-inner {
     display: flex;
     align-items: center;
     contain: layout style;
+    z-index: 1;
 
     [dir="ltr"] & {
         right: 0.225em;
@@ -852,7 +853,7 @@ button::-moz-focus-inner {
     opacity: 1;
 }
 
-.cardOverlayFab-primary {
+.cardOverlayContainer > .cardOverlayFab-primary {
     background-color: rgba(0, 0, 0, 0.7);
     font-size: 130%;
     padding: 0;
@@ -865,7 +866,7 @@ button::-moz-focus-inner {
     left: 50%;
 }
 
-.cardOverlayFab-primary:hover {
+.cardOverlayContainer > .cardOverlayFab-primary:hover {
     transform: scale(1.4, 1.4);
     transition: 0.2s;
 }

src/components/cardbuilder/cardBuilder.js

@@ -73,7 +73,7 @@ function getImageWidth(shape, screenWidth, isOrientationLandscape) {
  * @param {Object} items - A set of items.
  * @param {Object} options - Options for handling the items.
  */
-function setCardData(items, options) {
+export function setCardData(items, options) {
     options.shape = options.shape || 'auto';
 
     const primaryImageAspectRatio = imageLoader.getPrimaryImageAspectRatio(items);

src/components/cardbuilder/cardBuilderUtils.ts

@@ -1,3 +1,4 @@
+import { CardShape } from '../../utils/card';
 import { randomInt } from '../../utils/number';
 import classNames from 'classnames';
 
@@ -10,10 +11,10 @@ const ASPECT_RATIOS = {
 
 /**
  * Determines if the item is live TV.
- * @param {string} itemType - Item type to use for the check.
+ * @param {string | null | undefined} itemType - Item type to use for the check.
  * @returns {boolean} Flag showing if the item is live TV.
  */
-export const isUsingLiveTvNaming = (itemType: string): boolean => itemType === 'Program' || itemType === 'Timer' || itemType === 'Recording';
+export const isUsingLiveTvNaming = (itemType: string | null | undefined): boolean => itemType === 'Program' || itemType === 'Timer' || itemType === 'Recording';
 
 /**
  * Resolves Card action to display
@@ -54,15 +55,15 @@ export const isResizable = (windowWidth: number): boolean => {
  */
 export const resolveMixedShapeByAspectRatio = (primaryImageAspectRatio: number | null | undefined) => {
     if (primaryImageAspectRatio === undefined || primaryImageAspectRatio === null) {
-        return 'mixedSquare';
+        return CardShape.MixedSquare;
     }
 
     if (primaryImageAspectRatio >= 1.33) {
-        return 'mixedBackdrop';
+        return CardShape.MixedBackdrop;
     } else if (primaryImageAspectRatio > 0.71) {
-        return 'mixedSquare';
+        return CardShape.MixedSquare;
     } else {
-        return 'mixedPortrait';
+        return CardShape.MixedPortrait;
     }
 };
 

src/components/common/DefaultIconText.tsx

@@ -0,0 +1,56 @@
+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';
+import DefaultName from './DefaultName';
+import type { ItemDto } from 'types/base/models/item-dto';
+
+interface DefaultIconTextProps {
+    item: ItemDto;
+    defaultCardImageIcon?: string;
+}
+
+const DefaultIconText: FC<DefaultIconTextProps> = ({
+    item,
+    defaultCardImageIcon
+}) => {
+    if (item.CollectionType) {
+        return (
+            <Icon
+                className='cardImageIcon'
+                sx={{ color: 'inherit', fontSize: '5em' }}
+                aria-hidden='true'
+            >
+                {imageHelper.getLibraryIcon(item.CollectionType)}
+            </Icon>
+        );
+    }
+
+    if (item.Type && !(item.Type === BaseItemKind.TvChannel || item.Type === BaseItemKind.Studio )) {
+        return (
+            <Icon
+                className='cardImageIcon'
+                sx={{ color: 'inherit', fontSize: '5em' }}
+                aria-hidden='true'
+            >
+                {imageHelper.getItemTypeIcon(item.Type)}
+            </Icon>
+        );
+    }
+
+    if (defaultCardImageIcon) {
+        return (
+            <Icon
+                className='cardImageIcon'
+                sx={{ color: 'inherit', fontSize: '5em' }}
+                aria-hidden='true'
+            >
+                {defaultCardImageIcon}
+            </Icon>
+        );
+    }
+
+    return <DefaultName item={item} />;
+};
+
+export default DefaultIconText;

src/components/common/DefaultName.tsx

@@ -0,0 +1,22 @@
+import React, { type FC } from 'react';
+import Box from '@mui/material/Box';
+import itemHelper from 'components/itemHelper';
+import { isUsingLiveTvNaming } from '../cardbuilder/cardBuilderUtils';
+import type { ItemDto } from 'types/base/models/item-dto';
+
+interface DefaultNameProps {
+    item: ItemDto;
+}
+
+const DefaultName: FC<DefaultNameProps> = ({ item }) => {
+    const defaultName = isUsingLiveTvNaming(item.Type) ?
+        item.Name :
+        itemHelper.getDisplayName(item);
+    return (
+        <Box className='cardText cardDefaultText'>
+            {defaultName}
+        </Box>
+    );
+};
+
+export default DefaultName;

src/components/common/Image.tsx

@@ -0,0 +1,67 @@
+import React, { type FC, useCallback, useState } from 'react';
+import { BlurhashCanvas } from 'react-blurhash';
+import { LazyLoadImage } from 'react-lazy-load-image-component';
+
+const imageStyle: React.CSSProperties = {
+    position: 'absolute',
+    top: 0,
+    bottom: 0,
+    left: 0,
+    right: 0,
+    width: '100%',
+    height: '100%',
+    zIndex: 0
+};
+
+interface ImageProps {
+    imgUrl: string;
+    blurhash?: string;
+    containImage: boolean;
+}
+
+const Image: FC<ImageProps> = ({
+    imgUrl,
+    blurhash,
+    containImage
+}) => {
+    const [isLoaded, setIsLoaded] = useState(false);
+    const [isLoadStarted, setIsLoadStarted] = useState(false);
+    const handleLoad = useCallback(() => {
+        setIsLoaded(true);
+    }, []);
+
+    const handleLoadStarted = useCallback(() => {
+        setIsLoadStarted(true);
+    }, []);
+
+    return (
+        <div>
+            {!isLoaded && isLoadStarted && blurhash && (
+                <BlurhashCanvas
+                    hash={blurhash}
+                    width= {20}
+                    height={20}
+                    punch={1}
+                    style={{
+                        ...imageStyle,
+                        borderRadius: '0.2em',
+                        pointerEvents: 'none'
+                    }}
+                />
+            )}
+            <LazyLoadImage
+                key={imgUrl}
+                src={imgUrl}
+                style={{
+                    ...imageStyle,
+                    objectFit: containImage ? 'contain' : 'cover'
+                }}
+                onLoad={handleLoad}
+                beforeLoad={handleLoadStarted}
+            />
+
+        </div>
+    );
+};
+
+export default Image;

src/components/common/InfoIconButton.tsx

@@ -0,0 +1,22 @@
+import React, { type FC } from 'react';
+import IconButton from '@mui/material/IconButton';
+import InfoIcon from '@mui/icons-material/Info';
+import globalize from 'scripts/globalize';
+
+interface InfoIconButtonProps {
+    className?: string;
+}
+
+const InfoIconButton: FC<InfoIconButtonProps> = ({ className }) => {
+    return (
+        <IconButton
+            className={className}
+            data-action='link'
+            title={globalize.translate('ButtonInfo')}
+        >
+            <InfoIcon />
+        </IconButton>
+    );
+};
+
+export default InfoIconButton;

src/components/common/Media.tsx

@@ -0,0 +1,36 @@
+import { BaseItemKind, ImageType } from '@jellyfin/sdk/lib/generated-client';
+import React, { type FC } from 'react';
+import Image from './Image';
+import DefaultIconText from './DefaultIconText';
+import type { ItemDto } from 'types/base/models/item-dto';
+
+interface MediaProps {
+    item: ItemDto;
+    imgUrl: string | undefined;
+    blurhash: string | undefined;
+    imageType?: ImageType
+    defaultCardImageIcon?: string
+}
+
+const Media: FC<MediaProps> = ({
+    item,
+    imgUrl,
+    blurhash,
+    imageType,
+    defaultCardImageIcon
+}) => {
+    return imgUrl ? (
+        <Image
+            imgUrl={imgUrl}
+            blurhash={blurhash}
+            containImage={item.Type === BaseItemKind.TvChannel || imageType === ImageType.Logo}
+        />
+    ) : (
+        <DefaultIconText
+            item={item}
+            defaultCardImageIcon={defaultCardImageIcon}
+        />
+    );
+};
+
+export default Media;

src/components/common/MoreVertIconButton.tsx

@@ -0,0 +1,23 @@
+import React, { type FC } from 'react';
+import IconButton from '@mui/material/IconButton';
+import MoreVertIcon from '@mui/icons-material/MoreVert';
+import globalize from 'scripts/globalize';
+
+interface MoreVertIconButtonProps {
+    className?: string;
+    iconClassName?: string;
+}
+
+const MoreVertIconButton: FC<MoreVertIconButtonProps> = ({ className, iconClassName }) => {
+    return (
+        <IconButton
+            className={className}
+            data-action='menu'
+            title={globalize.translate('ButtonMore')}
+        >
+            <MoreVertIcon className={iconClassName} />
+        </IconButton>
+    );
+};
+
+export default MoreVertIconButton;

src/components/common/NoItemsMessage.tsx

@@ -0,0 +1,25 @@
+import React, { type FC } from 'react';
+import Box from '@mui/material/Box';
+import Typography from '@mui/material/Typography';
+import globalize from 'scripts/globalize';
+
+interface NoItemsMessageProps {
+    noItemsMessage?: string;
+}
+
+const NoItemsMessage: FC<NoItemsMessageProps> = ({
+    noItemsMessage = 'MessageNoItemsAvailable'
+}) => {
+    return (
+        <Box className='noItemsMessage centerMessage'>
+            <Typography variant='h2'>
+                {globalize.translate('MessageNothingHere')}
+            </Typography>
+            <Typography paragraph variant='h2'>
+                {globalize.translate(noItemsMessage)}
+            </Typography>
+        </Box>
+    );
+};
+
+export default NoItemsMessage;

src/components/common/PlayArrowIconButton.tsx

@@ -0,0 +1,25 @@
+import React, { type FC } from 'react';
+import IconButton from '@mui/material/IconButton';
+import PlayArrowIcon from '@mui/icons-material/PlayArrow';
+import globalize from 'scripts/globalize';
+
+interface PlayArrowIconButtonProps {
+    className: string;
+    action: string;
+    title: string;
+    iconClassName?: string;
+}
+
+const PlayArrowIconButton: FC<PlayArrowIconButtonProps> = ({ className, action, title, iconClassName }) => {
+    return (
+        <IconButton
+            className={className}
+            data-action={action}
+            title={globalize.translate(title)}
+        >
+            <PlayArrowIcon className={iconClassName} />
+        </IconButton>
+    );
+};
+
+export default PlayArrowIconButton;

src/components/common/PlaylistAddIconButton.tsx

@@ -0,0 +1,22 @@
+import React, { type FC } from 'react';
+import IconButton from '@mui/material/IconButton';
+import PlaylistAddIcon from '@mui/icons-material/PlaylistAdd';
+import globalize from 'scripts/globalize';
+
+interface PlaylistAddIconButtonProps {
+    className?: string;
+}
+
+const PlaylistAddIconButton: FC<PlaylistAddIconButtonProps> = ({ className }) => {
+    return (
+        <IconButton
+            className={className}
+            data-action='addtoplaylist'
+            title={globalize.translate('AddToPlaylist')}
+        >
+            <PlaylistAddIcon />
+        </IconButton>
+    );
+};
+
+export default PlaylistAddIconButton;

src/components/common/RightIconButtons.tsx

@@ -0,0 +1,24 @@
+import React, { type FC } from 'react';
+import IconButton from '@mui/material/IconButton';
+
+interface RightIconButtonsProps {
+    className?: string;
+    id: string;
+    icon: string;
+    title: string;
+}
+
+const RightIconButtons: FC<RightIconButtonsProps> = ({ className, id, title, icon }) => {
+    return (
+        <IconButton
+            className={className}
+            data-action='custom'
+            data-customaction={id}
+            title={title}
+        >
+            {icon}
+        </IconButton>
+    );
+};
+
+export default RightIconButtons;

src/components/dashboard/playback/trickplay/LinkTrickplayAcceleration.tsx

@@ -0,0 +1,33 @@
+import React, { type FunctionComponent } from 'react';
+import globalize from '../../../../scripts/globalize';
+
+type IProps = {
+    title?: string;
+    className?: string;
+    href?: string;
+};
+
+const createLinkElement = ({ className, title, href }: IProps) => ({
+    __html: `<a
+        is="emby-linkbutton"
+        rel="noopener noreferrer"
+        class="${className}"
+        href="${href}"
+        >
+        ${title}
+    </a>`
+});
+
+const LinkTrickplayAcceleration: FunctionComponent<IProps> = ({ className, title, href }: IProps) => {
+    return (
+        <div
+            dangerouslySetInnerHTML={createLinkElement({
+                className,
+                title: globalize.translate(title),
+                href
+            })}
+        />
+    );
+};
+
+export default LinkTrickplayAcceleration;

src/components/dashboard/users/TagList.tsx

@@ -2,10 +2,11 @@ import React, { FunctionComponent } from 'react';
 import IconButtonElement from '../../../elements/IconButtonElement';
 
 type IProps = {
-    tag?: string;
+    tag?: string,
+    tagType?: string;
 };
 
-const BlockedTagList: FunctionComponent<IProps> = ({ tag }: IProps) => {
+const TagList: FunctionComponent<IProps> = ({ tag, tagType }: IProps) => {
     return (
         <div className='paperList'>
             <div className='listItem'>
@@ -16,7 +17,7 @@ const BlockedTagList: FunctionComponent<IProps> = ({ tag }: IProps) => {
                 </div>
                 <IconButtonElement
                     is='paper-icon-button-light'
-                    className='blockedTag btnDeleteTag listItemButton'
+                    className={`${tagType} btnDeleteTag listItemButton`}
                     title='Delete'
                     icon='delete'
                     dataTag={tag}
@@ -26,4 +27,4 @@ const BlockedTagList: FunctionComponent<IProps> = ({ tag }: IProps) => {
     );
 };
 
-export default BlockedTagList;
+export default TagList;

src/components/dashboard/users/UserCardBox.tsx

@@ -61,7 +61,7 @@ const UserCardBox: FunctionComponent<IProps> = ({ user = {} }: IProps) => {
         </div>`;
 
     return (
-        <div data-userid={user.Id} className={cssClass}>
+        <div data-userid={user.Id} data-username={user.Name} className={cssClass}>
             <div className='cardBox visualCardBox'>
                 <div className='cardScalable visualCardBox-cardScalable'>
                     <div className='cardPadder cardPadder-square'></div>

src/components/htmlMediaHelper.js

@@ -1,6 +1,7 @@
 import appSettings from '../scripts/settings/appSettings' ;
 import browser from '../scripts/browser';
 import Events from '../utils/events.ts';
+import { MediaError } from 'types/mediaError';
 
 export function getSavedVolume() {
     return appSettings.get('volume') || 1;
@@ -87,7 +88,7 @@ export function handleHlsJsMediaError(instance, reject) {
         if (reject) {
             reject();
         } else {
-            onErrorInternal(instance, 'mediadecodeerror');
+            onErrorInternal(instance, MediaError.FATAL_HLS_ERROR);
         }
     }
 }
@@ -98,11 +99,7 @@ export function onErrorInternal(instance, type) {
         instance.destroyCustomTrack(instance._mediaElement);
     }
 
-    Events.trigger(instance, 'error', [
-        {
-            type: type
-        }
-    ]);
+    Events.trigger(instance, 'error', [{ type }]);
 }
 
 export function isValidDuration(duration) {
@@ -193,7 +190,7 @@ export function playWithPromise(elem, onErrorFn) {
                     // swallow this error because the user can still click the play button on the video element
                     return Promise.resolve();
                 }
-                return Promise.reject();
+                return Promise.reject(e);
             })
             .then(() => {
                 onSuccessfulPlay(elem, onErrorFn);
@@ -269,10 +266,10 @@ export function bindEventsToHlsPlayer(instance, hls, elem, onErrorFn, resolve, r
             hls.destroy();
 
             if (reject) {
-                reject('servererror');
+                reject(MediaError.SERVER_ERROR);
                 reject = null;
             } else {
-                onErrorInternal(instance, 'servererror');
+                onErrorInternal(instance, MediaError.SERVER_ERROR);
             }
 
             return;
@@ -291,10 +288,10 @@ export function bindEventsToHlsPlayer(instance, hls, elem, onErrorFn, resolve, r
                         hls.destroy();
 
                         if (reject) {
-                            reject('network');
+                            reject(MediaError.NETWORK_ERROR);
                             reject = null;
                         } else {
-                            onErrorInternal(instance, 'network');
+                            onErrorInternal(instance, MediaError.NETWORK_ERROR);
                         }
                     } else {
                         console.debug('fatal network error encountered, try to recover');
@@ -318,7 +315,7 @@ export function bindEventsToHlsPlayer(instance, hls, elem, onErrorFn, resolve, r
                         reject();
                         reject = null;
                     } else {
-                        onErrorInternal(instance, 'mediadecodeerror');
+                        onErrorInternal(instance, MediaError.FATAL_HLS_ERROR);
                     }
                     break;
             }

src/components/indicators/indicators.scss

@@ -5,6 +5,14 @@
     height: 0.28em;
 }
 
+.itemLinearProgress {
+    width: 100%;
+    position: absolute;
+    left: 0;
+    bottom: 0;
+    border-radius: 100px;
+}
+
 .itemProgressBarForeground {
     position: absolute;
     top: 0;

src/components/indicators/useIndicator.tsx

@@ -0,0 +1,261 @@
+import { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind';
+import { LocationType } from '@jellyfin/sdk/lib/generated-client/models/location-type';
+import React from 'react';
+import Box from '@mui/material/Box';
+import LinearProgress, {
+    linearProgressClasses
+} from '@mui/material/LinearProgress';
+import FiberSmartRecordIcon from '@mui/icons-material/FiberSmartRecord';
+import FiberManualRecordIcon from '@mui/icons-material/FiberManualRecord';
+import CheckIcon from '@mui/icons-material/Check';
+import VideocamIcon from '@mui/icons-material/Videocam';
+import FolderIcon from '@mui/icons-material/Folder';
+import PhotoAlbumIcon from '@mui/icons-material/PhotoAlbum';
+import PhotoIcon from '@mui/icons-material/Photo';
+import classNames from 'classnames';
+import datetime from 'scripts/datetime';
+import itemHelper from 'components/itemHelper';
+import AutoTimeProgressBar from 'elements/emby-progressbar/AutoTimeProgressBar';
+import type { NullableString } from 'types/base/common/shared/types';
+import type { ItemDto } from 'types/base/models/item-dto';
+import type { ProgressOptions } from 'types/progressOptions';
+
+const TypeIcon = {
+    Video: <VideocamIcon className='indicatorIcon' />,
+    Folder: <FolderIcon className='indicatorIcon' />,
+    PhotoAlbum: <PhotoAlbumIcon className='indicatorIcon' />,
+    Photo: <PhotoIcon className='indicatorIcon' />
+};
+
+const getTypeIcon = (itemType: NullableString) => {
+    return TypeIcon[itemType as keyof typeof TypeIcon];
+};
+
+const enableProgressIndicator = (
+    itemType: NullableString,
+    itemMediaType: NullableString
+) => {
+    return (
+        (itemMediaType === 'Video' && itemType !== BaseItemKind.TvChannel)
+        || itemType === BaseItemKind.AudioBook
+        || itemType === 'AudioPodcast'
+    );
+};
+
+const enableAutoTimeProgressIndicator = (
+    itemType: NullableString,
+    itemStartDate: NullableString,
+    itemEndDate: NullableString
+) => {
+    return (
+        (itemType === BaseItemKind.Program
+            || itemType === 'Timer'
+            || itemType === BaseItemKind.Recording)
+        && Boolean(itemStartDate)
+        && Boolean(itemEndDate)
+    );
+};
+
+const enablePlayedIndicator = (item: ItemDto) => {
+    return itemHelper.canMarkPlayed(item);
+};
+
+const useIndicator = (item: ItemDto) => {
+    const getMediaSourceIndicator = () => {
+        const mediaSourceCount = item.MediaSourceCount ?? 0;
+        if (mediaSourceCount > 1) {
+            return <Box className='mediaSourceIndicator'>{mediaSourceCount}</Box>;
+        }
+
+        return null;
+    };
+
+    const getMissingIndicator = () => {
+        if (
+            item.Type === BaseItemKind.Episode
+            && item.LocationType === LocationType.Virtual
+        ) {
+            if (item.PremiereDate) {
+                try {
+                    const premiereDate = datetime
+                        .parseISO8601Date(item.PremiereDate)
+                        .getTime();
+                    if (premiereDate > new Date().getTime()) {
+                        return <Box className='unairedIndicator'>Unaired</Box>;
+                    }
+                } catch (err) {
+                    console.error(err);
+                }
+            }
+            return <Box className='missingIndicator'>Missing</Box>;
+        }
+
+        return null;
+    };
+
+    const getTimerIndicator = (className?: string) => {
+        const indicatorIconClass = classNames('timerIndicator', className);
+
+        let status;
+
+        if (item.Type === 'SeriesTimer') {
+            return <FiberSmartRecordIcon className={indicatorIconClass} />;
+        } else if (item.TimerId || item.SeriesTimerId) {
+            status = item.Status || 'Cancelled';
+        } else if (item.Type === 'Timer') {
+            status = item.Status;
+        } else {
+            return null;
+        }
+
+        if (item.SeriesTimerId) {
+            return (
+                <FiberSmartRecordIcon
+                    className={`${indicatorIconClass} ${
+                        status === 'Cancelled' ? 'timerIndicator-inactive' : ''
+                    }`}
+                />
+            );
+        }
+
+        return <FiberManualRecordIcon className={indicatorIconClass} />;
+    };
+
+    const getTypeIndicator = () => {
+        const icon = getTypeIcon(item.Type);
+        if (icon) {
+            return <Box className='indicator videoIndicator'>{icon}</Box>;
+        }
+        return null;
+    };
+
+    const getChildCountIndicator = () => {
+        const childCount = item.ChildCount ?? 0;
+
+        if (childCount > 1) {
+            return (
+                <Box className='countIndicator indicator childCountIndicator'>
+                    {datetime.toLocaleString(item.ChildCount)}
+                </Box>
+            );
+        }
+
+        return null;
+    };
+
+    const getPlayedIndicator = () => {
+        if (enablePlayedIndicator(item)) {
+            const userData = item.UserData || {};
+            if (userData.UnplayedItemCount) {
+                return (
+                    <Box className='countIndicator indicator unplayedItemCount'>
+                        {datetime.toLocaleString(userData.UnplayedItemCount)}
+                    </Box>
+                );
+            }
+
+            if (
+                (userData.PlayedPercentage
+                    && userData.PlayedPercentage >= 100)
+                || userData.Played
+            ) {
+                return (
+                    <Box className='playedIndicator indicator'>
+                        <CheckIcon className='indicatorIcon' />
+                    </Box>
+                );
+            }
+        }
+
+        return null;
+    };
+
+    const getProgress = (pct: number, progressOptions?: ProgressOptions) => {
+        const progressBarClass = classNames(
+            'itemLinearProgress',
+            progressOptions?.containerClass
+        );
+
+        return (
+            <LinearProgress
+                className={progressBarClass}
+                variant='determinate'
+                value={pct}
+                sx={{
+                    [`& .${linearProgressClasses.bar}`]: {
+                        borderRadius: 5,
+                        backgroundColor: '#00a4dc'
+                    }
+                }}
+            />
+        );
+    };
+
+    const getProgressBar = (progressOptions?: ProgressOptions) => {
+        if (
+            enableProgressIndicator(item.Type, item.MediaType)
+            && item.Type !== BaseItemKind.Recording
+        ) {
+            const playedPercentage = progressOptions?.userData?.PlayedPercentage ?
+                progressOptions.userData.PlayedPercentage :
+                item?.UserData?.PlayedPercentage;
+            if (playedPercentage && playedPercentage < 100) {
+                return getProgress(playedPercentage);
+            }
+        }
+
+        if (
+            enableAutoTimeProgressIndicator(
+                item.Type,
+                item.StartDate,
+                item.EndDate
+            )
+        ) {
+            let startDate = 0;
+            let endDate = 1;
+
+            try {
+                startDate = datetime.parseISO8601Date(item.StartDate).getTime();
+                endDate = datetime.parseISO8601Date(item.EndDate).getTime();
+            } catch (err) {
+                console.error(err);
+            }
+
+            const now = new Date().getTime();
+            const total = endDate - startDate;
+            const pct = 100 * ((now - startDate) / total);
+
+            if (pct > 0 && pct < 100) {
+                const isRecording =
+                    item.Type === 'Timer'
+                    || item.Type === BaseItemKind.Recording
+                    || Boolean(item.TimerId);
+                return (
+                    <AutoTimeProgressBar
+                        pct={pct}
+                        progressOptions={progressOptions}
+                        isRecording={isRecording}
+                        starTtime={startDate}
+                        endTtime={endDate}
+                        dataAutoMode='time'
+                    />
+                );
+            }
+        }
+
+        return null;
+    };
+
+    return {
+        getProgress,
+        getProgressBar,
+        getMediaSourceIndicator,
+        getMissingIndicator,
+        getTimerIndicator,
+        getTypeIndicator,
+        getChildCountIndicator,
+        getPlayedIndicator
+    };
+};
+
+export default useIndicator;

src/components/itemContextMenu.js

@@ -10,6 +10,24 @@ import { playbackManager } from './playback/playbackmanager';
 import ServerConnections from './ServerConnections';
 import toast from './toast/toast';
 import * as userSettings from '../scripts/settings/userSettings';
+import { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind';
+
+function getDeleteLabel(type) {
+    switch (type) {
+        case BaseItemKind.Series:
+            return globalize.translate('DeleteSeries');
+
+        case BaseItemKind.Episode:
+            return globalize.translate('DeleteEpisode');
+
+        case BaseItemKind.Playlist:
+        case BaseItemKind.BoxSet:
+            return globalize.translate('Delete');
+
+        default:
+            return globalize.translate('DeleteMedia');
+    }
+}
 
 export function getCommands(options) {
     const item = options.item;
@@ -160,19 +178,11 @@ export function getCommands(options) {
     }
 
     if (item.CanDelete && options.deleteItem !== false) {
-        if (item.Type === 'Playlist' || item.Type === 'BoxSet') {
-            commands.push({
-                name: globalize.translate('Delete'),
-                id: 'delete',
-                icon: 'delete'
-            });
-        } else {
-            commands.push({
-                name: globalize.translate('DeleteMedia'),
-                id: 'delete',
-                icon: 'delete'
-            });
-        }
+        commands.push({
+            name: getDeleteLabel(item.Type),
+            id: 'delete',
+            icon: 'delete'
+        });
     }
 
     // Books are promoted to major download Button and therefor excluded in the context menu
@@ -214,11 +224,7 @@ export function getCommands(options) {
         });
     }
 
-    if (canEdit && item.MediaType === 'Video' && item.Type !== 'TvChannel' && item.Type !== 'Program'
-            && item.LocationType !== 'Virtual'
-            && !(item.Type === 'Recording' && item.Status !== 'Completed')
-            && options.editSubtitles !== false
-    ) {
+    if (itemHelper.canEditSubtitles(user, item) && options.editSubtitles !== false) {
         commands.push({
             name: globalize.translate('EditSubtitles'),
             id: 'editsubtitles',
@@ -339,7 +345,8 @@ function executeCommand(item, id, options) {
                 break;
             case 'addtoplaylist':
                 import('./playlisteditor/playlisteditor').then(({ default: PlaylistEditor }) => {
-                    new PlaylistEditor({
+                    const playlistEditor = new PlaylistEditor();
+                    playlistEditor.show({
                         items: [itemId],
                         serverId: serverId
                     }).then(getResolveFunction(resolve, id, true), getResolveFunction(resolve, id));

src/components/itemHelper.js

@@ -1,6 +1,10 @@
 import { appHost } from './apphost';
 import globalize from '../scripts/globalize';
 import { CollectionType } from '@jellyfin/sdk/lib/generated-client/models/collection-type';
+import { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind';
+import { LocationType } from '@jellyfin/sdk/lib/generated-client/models/location-type';
+import { RecordingStatus } from '@jellyfin/sdk/lib/generated-client/models/recording-status';
+import { MediaType } from '@jellyfin/sdk/lib/generated-client/models/media-type';
 
 export function getDisplayName(item, options = {}) {
     if (!item) {
@@ -155,6 +159,33 @@ export function canEditImages (user, item) {
     return itemType !== 'Timer' && itemType !== 'SeriesTimer' && canEdit(user, item) && !isLocalItem(item);
 }
 
+export function canEditSubtitles (user, item) {
+    if (item.MediaType !== MediaType.Video) {
+        return false;
+    }
+    const itemType = item.Type;
+    if (itemType === BaseItemKind.Recording && item.Status !== RecordingStatus.Completed) {
+        return false;
+    }
+    if (itemType === BaseItemKind.TvChannel
+        || itemType === BaseItemKind.Program
+        || itemType === 'Timer'
+        || itemType === 'SeriesTimer'
+        || itemType === BaseItemKind.UserRootFolder
+        || itemType === BaseItemKind.UserView
+    ) {
+        return false;
+    }
+    if (isLocalItem(item)) {
+        return false;
+    }
+    if (item.LocationType === LocationType.Virtual) {
+        return false;
+    }
+    return user.Policy.EnableSubtitleManagement
+           || user.Policy.IsAdministrator;
+}
+
 export function canShare (item, user) {
     if (item.Type === 'Program') {
         return false;
@@ -300,6 +331,7 @@ export default {
     canIdentify: canIdentify,
     canEdit: canEdit,
     canEditImages: canEditImages,
+    canEditSubtitles,
     canShare: canShare,
     enableDateAddedDisplay: enableDateAddedDisplay,
     canMarkPlayed: canMarkPlayed,

src/components/itemMediaInfo/itemMediaInfo.js

@@ -84,6 +84,7 @@ function getMediaSourceHtml(user, item, version) {
             case 'Data':
             case 'Subtitle':
             case 'Video':
+            case 'Lyric':
                 translateString = stream.Type;
                 break;
             case 'EmbeddedImage':
@@ -145,10 +146,10 @@ function getMediaSourceHtml(user, item, version) {
         if (stream.BitDepth) {
             attributes.push(createAttribute(globalize.translate('MediaInfoBitDepth'), `${stream.BitDepth} bit`));
         }
-        if (stream.VideoRange) {
+        if (stream.VideoRange && stream.Type === 'Video') {
             attributes.push(createAttribute(globalize.translate('MediaInfoVideoRange'), stream.VideoRange));
         }
-        if (stream.VideoRangeType) {
+        if (stream.VideoRangeType && stream.Type === 'Video') {
             attributes.push(createAttribute(globalize.translate('MediaInfoVideoRangeType'), stream.VideoRangeType));
         }
         if (stream.VideoDoViTitle) {

src/components/libraryoptionseditor/libraryoptionseditor.js

@@ -391,8 +391,10 @@ export function setContentType(parent, contentType) {
     }
 
     if (contentType !== 'tvshows' && contentType !== 'movies' && contentType !== 'homevideos' && contentType !== 'musicvideos' && contentType !== 'mixed') {
+        parent.querySelector('.trickplaySettingsSection').classList.add('hide');
         parent.querySelector('.chapterSettingsSection').classList.add('hide');
     } else {
+        parent.querySelector('.trickplaySettingsSection').classList.remove('hide');
         parent.querySelector('.chapterSettingsSection').classList.remove('hide');
     }
 
@@ -416,6 +418,8 @@ export function setContentType(parent, contentType) {
         }
     }
 
+    parent.querySelector('.chkUseReplayGainTagsContainer').classList.toggle('hide', contentType !== 'music');
+
     parent.querySelector('.chkEnableLUFSScanContainer').classList.toggle('hide', contentType !== 'music');
 
     if (contentType === 'tvshows') {
@@ -516,6 +520,9 @@ export function getLibraryOptions(parent) {
         EnablePhotos: parent.querySelector('.chkEnablePhotos').checked,
         EnableRealtimeMonitor: parent.querySelector('.chkEnableRealtimeMonitor').checked,
         EnableLUFSScan: parent.querySelector('.chkEnableLUFSScan').checked,
+        ExtractTrickplayImagesDuringLibraryScan: parent.querySelector('.chkExtractTrickplayDuringLibraryScan').checked,
+        EnableTrickplayImageExtraction: parent.querySelector('.chkExtractTrickplayImages').checked,
+        UseReplayGainTags: parent.querySelector('.chkUseReplayGainTags').checked,
         ExtractChapterImagesDuringLibraryScan: parent.querySelector('.chkExtractChaptersDuringLibraryScan').checked,
         EnableChapterImageExtraction: parent.querySelector('.chkExtractChapterImages').checked,
         EnableInternetProviders: true,
@@ -579,6 +586,9 @@ export function setLibraryOptions(parent, options) {
     parent.querySelector('.chkEnablePhotos').checked = options.EnablePhotos;
     parent.querySelector('.chkEnableRealtimeMonitor').checked = options.EnableRealtimeMonitor;
     parent.querySelector('.chkEnableLUFSScan').checked = options.EnableLUFSScan;
+    parent.querySelector('.chkExtractTrickplayDuringLibraryScan').checked = options.ExtractTrickplayImagesDuringLibraryScan;
+    parent.querySelector('.chkExtractTrickplayImages').checked = options.EnableTrickplayImageExtraction;
+    parent.querySelector('.chkUseReplayGainTags').checked = options.UseReplayGainTags;
     parent.querySelector('.chkExtractChaptersDuringLibraryScan').checked = options.ExtractChapterImagesDuringLibraryScan;
     parent.querySelector('.chkExtractChapterImages').checked = options.EnableChapterImageExtraction;
     parent.querySelector('#chkSaveLocal').checked = options.SaveLocalMetadata;

src/components/libraryoptionseditor/libraryoptionseditor.template.html

@@ -63,6 +63,14 @@
     <div class="fieldDescription checkboxFieldDescription">${LabelEnableRealtimeMonitorHelp}</div>
 </div>
 
+<div class="checkboxContainer checkboxContainer-withDescription chkUseReplayGainTagsContainer advanced">
+    <label>
+        <input type="checkbox" is="emby-checkbox" class="chkUseReplayGainTags" checked />
+        <span>${LabelUseReplayGainTags}</span>
+    </label>
+    <div class="fieldDescription checkboxFieldDescription">${LabelUseReplayGainTagsHelp}</div>
+</div>
+
 <div class="checkboxContainer checkboxContainer-withDescription chkEnableLUFSScanContainer advanced">
     <label>
         <input type="checkbox" is="emby-checkbox" class="chkEnableLUFSScan" checked />
@@ -112,6 +120,25 @@
     <div class="fieldDescription checkboxFieldDescription">${OptionAutomaticallyGroupSeriesHelp}</div>
 </div>
 
+<div class="trickplaySettingsSection hide">
+    <h2>${Trickplay}</h2>
+    <div class="checkboxContainer checkboxContainer-withDescription fldExtractTrickplayImages">
+        <label>
+            <input type="checkbox" is="emby-checkbox" class="chkExtractTrickplayImages" />
+            <span>${OptionExtractTrickplayImage}</span>
+        </label>
+        <div class="fieldDescription checkboxFieldDescription">${ExtractTrickplayImagesHelp}</div>
+    </div>
+
+    <div class="checkboxContainer checkboxContainer-withDescription fldExtractTrickplayDuringLibraryScan advanced">
+        <label>
+            <input type="checkbox" is="emby-checkbox" class="chkExtractTrickplayDuringLibraryScan" />
+            <span>${LabelExtractTrickplayDuringLibraryScan}</span>
+        </label>
+        <div class="fieldDescription checkboxFieldDescription">${LabelExtractTrickplayDuringLibraryScanHelp}</div>
+    </div>
+</div>
+
 <div class="chapterSettingsSection hide">
     <h2>${HeaderChapterImages}</h2>
     <div class="checkboxContainer checkboxContainer-withDescription fldExtractChapterImages">

src/components/listview/List/List.tsx

@@ -0,0 +1,32 @@
+import React, { type FC } from 'react';
+import useList from './useList';
+import ListContent from './ListContent';
+import ListWrapper from './ListWrapper';
+import type { ItemDto } from 'types/base/models/item-dto';
+import type { ListOptions } from 'types/listOptions';
+import '../../mediainfo/mediainfo.scss';
+import '../../guide/programs.scss';
+
+interface ListProps {
+    index: number;
+    item: ItemDto;
+    listOptions?: ListOptions;
+}
+
+const List: FC<ListProps> = ({ index, item, listOptions = {} }) => {
+    const { getListdWrapperProps, getListContentProps } = useList({ item, listOptions } );
+    const listWrapperProps = getListdWrapperProps();
+    const listContentProps = getListContentProps();
+
+    return (
+        <ListWrapper
+            key={index}
+            index={index}
+            {...listWrapperProps}
+        >
+            <ListContent {...listContentProps} />
+        </ListWrapper>
+    );
+};
+
+export default List;

src/components/listview/List/ListContent.tsx

@@ -0,0 +1,106 @@
+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';
+
+import useIndicator from 'components/indicators/useIndicator';
+import PrimaryMediaInfo from '../../mediainfo/PrimaryMediaInfo';
+import ListContentWrapper from './ListContentWrapper';
+import ListItemBody from './ListItemBody';
+import ListImageContainer from './ListImageContainer';
+import ListViewUserDataButtons from './ListViewUserDataButtons';
+
+import type { ItemDto } from 'types/base/models/item-dto';
+import type { ListOptions } from 'types/listOptions';
+
+interface ListContentProps {
+    item: ItemDto;
+    listOptions: ListOptions;
+    enableContentWrapper?: boolean;
+    enableOverview?: boolean;
+    enableSideMediaInfo?: boolean;
+    clickEntireItem?: boolean;
+    action?: string;
+    isLargeStyle: boolean;
+    downloadWidth?: number;
+}
+
+const ListContent: FC<ListContentProps> = ({
+    item,
+    listOptions,
+    enableContentWrapper,
+    enableOverview,
+    enableSideMediaInfo,
+    clickEntireItem,
+    action,
+    isLargeStyle,
+    downloadWidth
+}) => {
+    const indicator = useIndicator(item);
+    return (
+        <ListContentWrapper
+            itemOverview={item.Overview}
+            enableContentWrapper={enableContentWrapper}
+            enableOverview={enableOverview}
+        >
+
+            {!clickEntireItem && listOptions.dragHandle && (
+                <DragHandleIcon className='listViewDragHandle listItemIcon listItemIcon-transparent' />
+            )}
+
+            {listOptions.image !== false && (
+                <ListImageContainer
+                    item={item}
+                    listOptions={listOptions}
+                    action={action}
+                    isLargeStyle={isLargeStyle}
+                    clickEntireItem={clickEntireItem}
+                    downloadWidth={downloadWidth}
+                />
+            )}
+
+            {listOptions.showIndexNumberLeft && (
+                <Box className='listItem-indexnumberleft'>
+                    {item.IndexNumber ?? <span>&nbsp;</span>}
+                </Box>
+            )}
+
+            <ListItemBody
+                item={item}
+                listOptions={listOptions}
+                action={action}
+                enableContentWrapper={enableContentWrapper}
+                enableOverview={enableOverview}
+                enableSideMediaInfo={enableSideMediaInfo}
+                getMissingIndicator={indicator.getMissingIndicator}
+            />
+
+            {listOptions.mediaInfo !== false && enableSideMediaInfo && (
+                <PrimaryMediaInfo
+                    className='secondary listItemMediaInfo'
+                    item={item}
+                    isRuntimeEnabled={true}
+                    isStarRatingEnabled={true}
+                    isCaptionIndicatorEnabled={true}
+                    isEpisodeTitleEnabled={true}
+                    isOfficialRatingEnabled={true}
+                    getMissingIndicator={indicator.getMissingIndicator}
+                />
+            )}
+
+            {listOptions.recordButton
+                && (item.Type === 'Timer' || item.Type === BaseItemKind.Program) && (
+                indicator.getTimerIndicator('listItemAside')
+            )}
+
+            {!clickEntireItem && (
+                <ListViewUserDataButtons
+                    item={item}
+                    listOptions={listOptions}
+                />
+            )}
+        </ListContentWrapper>
+    );
+};
+
+export default ListContent;

src/components/listview/List/ListContentWrapper.tsx

@@ -0,0 +1,34 @@
+import React, { type FC } from 'react';
+import Box from '@mui/material/Box';
+
+interface ListContentWrapperProps {
+    itemOverview: string | null | undefined;
+    enableContentWrapper?: boolean;
+    enableOverview?: boolean;
+}
+
+const ListContentWrapper: FC<ListContentWrapperProps> = ({
+    itemOverview,
+    enableContentWrapper,
+    enableOverview,
+    children
+}) => {
+    if (enableContentWrapper) {
+        return (
+            <>
+                <Box className='listItem-content'>{children}</Box>
+
+                {enableOverview && itemOverview && (
+                    <Box className='listItem-bottomoverview secondary'>
+                        <bdi>{itemOverview}</bdi>
+                    </Box>
+                )}
+            </>
+        );
+    } else {
+        // eslint-disable-next-line react/jsx-no-useless-fragment
+        return <>{children}</>;
+    }
+};
+
+export default ListContentWrapper;

src/components/listview/List/ListGroupHeaderWrapper.tsx

@@ -0,0 +1,30 @@
+import React, { type FC } from 'react';
+import Typography from '@mui/material/Typography';
+
+interface ListGroupHeaderWrapperProps {
+    index?: number;
+}
+
+const ListGroupHeaderWrapper: FC<ListGroupHeaderWrapperProps> = ({
+    index,
+    children
+}) => {
+    if (index === 0) {
+        return (
+            <Typography
+                className='listGroupHeader listGroupHeader-first'
+                variant='h2'
+            >
+                {children}
+            </Typography>
+        );
+    } else {
+        return (
+            <Typography className='listGroupHeader' variant='h2'>
+                {children}
+            </Typography>
+        );
+    }
+};
+
+export default ListGroupHeaderWrapper;

src/components/listview/List/ListImageContainer.tsx

@@ -0,0 +1,103 @@
+import React, { type FC } from 'react';
+import classNames from 'classnames';
+import Box from '@mui/material/Box';
+import { useApi } from 'hooks/useApi';
+import useIndicator from '../../indicators/useIndicator';
+import layoutManager from '../../layoutManager';
+import { getDefaultBackgroundClass } from '../../cardbuilder/cardBuilderUtils';
+import {
+    canResume,
+    getChannelImageUrl,
+    getImageUrl
+} from './listHelper';
+
+import Media from 'components/common/Media';
+import PlayArrowIconButton from 'components/common/PlayArrowIconButton';
+import type { ItemDto } from 'types/base/models/item-dto';
+import type { ListOptions } from 'types/listOptions';
+
+interface ListImageContainerProps {
+    item: ItemDto;
+    listOptions: ListOptions;
+    action?: string | null;
+    isLargeStyle: boolean;
+    clickEntireItem?: boolean;
+    downloadWidth?: number;
+}
+
+const ListImageContainer: FC<ListImageContainerProps> = ({
+    item = {},
+    listOptions,
+    action,
+    isLargeStyle,
+    clickEntireItem,
+    downloadWidth
+}) => {
+    const { api } = useApi();
+    const { getMediaSourceIndicator, getProgressBar, getPlayedIndicator } = useIndicator(item);
+    const imgInfo = listOptions.imageSource === 'channel' ?
+        getChannelImageUrl(item, api, downloadWidth) :
+        getImageUrl(item, api, downloadWidth);
+
+    const defaultCardImageIcon = listOptions.defaultCardImageIcon;
+    const disableIndicators = listOptions.disableIndicators;
+    const imgUrl = imgInfo?.imgUrl;
+    const blurhash = imgInfo.blurhash;
+
+    const imageClass = classNames(
+        'listItemImage',
+        { 'listItemImage-large': isLargeStyle },
+        { 'listItemImage-channel': listOptions.imageSource === 'channel' },
+        { 'listItemImage-large-tv': isLargeStyle && layoutManager.tv },
+        { itemAction: !clickEntireItem },
+        { [getDefaultBackgroundClass(item.Name)]: !imgUrl }
+    );
+
+    const playOnImageClick = listOptions.imagePlayButton && !layoutManager.tv;
+
+    const imageAction = playOnImageClick ? 'link' : action;
+
+    const btnCssClass =
+        'paper-icon-button-light listItemImageButton itemAction';
+
+    const mediaSourceIndicator = getMediaSourceIndicator();
+    const playedIndicator = getPlayedIndicator();
+    const progressBar = getProgressBar();
+    const playbackPositionTicks = item?.UserData?.PlaybackPositionTicks;
+
+    return (
+        <Box
+            data-action={imageAction}
+            className={imageClass}
+        >
+
+            <Media item={item} imgUrl={imgUrl} blurhash={blurhash} defaultCardImageIcon={defaultCardImageIcon} />
+
+            {disableIndicators !== true && mediaSourceIndicator}
+
+            {playedIndicator && (
+                <Box className='indicators listItemIndicators'>
+                    {playedIndicator}
+                </Box>
+            )}
+
+            {playOnImageClick && (
+                <PlayArrowIconButton
+                    className={btnCssClass}
+                    action={
+                        canResume(playbackPositionTicks) ? 'resume' : 'play'
+                    }
+                    title={
+                        canResume(playbackPositionTicks) ?
+                            'ButtonResume' :
+                            'Play'
+                    }
+                />
+            )}
+
+            {progressBar}
+        </Box>
+    );
+};
+
+export default ListImageContainer;

src/components/listview/List/ListItemBody.tsx

@@ -0,0 +1,65 @@
+import React, { type FC } from 'react';
+import classNames from 'classnames';
+import Box from '@mui/material/Box';
+import useListTextlines from './useListTextlines';
+import PrimaryMediaInfo from '../../mediainfo/PrimaryMediaInfo';
+
+import type { ItemDto } from 'types/base/models/item-dto';
+import type { ListOptions } from 'types/listOptions';
+
+interface ListItemBodyProps {
+    item: ItemDto;
+    listOptions: ListOptions;
+    action?: string | null;
+    isLargeStyle?: boolean;
+    clickEntireItem?: boolean;
+    enableContentWrapper?: boolean;
+    enableOverview?: boolean;
+    enableSideMediaInfo?: boolean;
+    getMissingIndicator: () => React.JSX.Element | null
+}
+
+const ListItemBody: FC<ListItemBodyProps> = ({
+    item = {},
+    listOptions = {},
+    action,
+    isLargeStyle,
+    clickEntireItem,
+    enableContentWrapper,
+    enableOverview,
+    enableSideMediaInfo,
+    getMissingIndicator
+}) => {
+    const { listTextLines } = useListTextlines({ item, listOptions, isLargeStyle });
+    const cssClass = classNames(
+        'listItemBody',
+        { 'itemAction': !clickEntireItem },
+        { 'listItemBody-noleftpadding': listOptions.image === false }
+    );
+
+    return (
+        <Box data-action={action} className={cssClass}>
+
+            {listTextLines}
+
+            {listOptions.mediaInfo !== false && !enableSideMediaInfo && (
+                <PrimaryMediaInfo
+                    className='secondary listItemMediaInfo listItemBodyText'
+                    item={item}
+                    isEpisodeTitleEnabled={true}
+                    isOriginalAirDateEnabled={true}
+                    isCaptionIndicatorEnabled={true}
+                    getMissingIndicator={getMissingIndicator}
+                />
+            )}
+
+            {!enableContentWrapper && enableOverview && item.Overview && (
+                <Box className='secondary listItem-overview listItemBodyText'>
+                    <bdi>{item.Overview}</bdi>
+                </Box>
+            )}
+        </Box>
+    );
+};
+
+export default ListItemBody;

src/components/listview/List/ListTextWrapper.tsx

@@ -0,0 +1,30 @@
+import React, { type FC } from 'react';
+import Box from '@mui/material/Box';
+import Typography from '@mui/material/Typography';
+
+interface ListTextWrapperProps {
+    index?: number;
+    isLargeStyle?: boolean;
+}
+
+const ListTextWrapper: FC<ListTextWrapperProps> = ({
+    index,
+    isLargeStyle,
+    children
+}) => {
+    if (index === 0) {
+        if (isLargeStyle) {
+            return (
+                <Typography className='listItemBodyText' variant='h2'>
+                    {children}
+                </Typography>
+            );
+        } else {
+            return <Box className='listItemBodyText'>{children}</Box>;
+        }
+    } else {
+        return <Box className='secondary listItemBodyText'>{children}</Box>;
+    }
+};
+
+export default ListTextWrapper;

src/components/listview/List/ListViewUserDataButtons.tsx

@@ -0,0 +1,87 @@
+import React, { type FC } from 'react';
+import { Box } from '@mui/material';
+import itemHelper from '../../itemHelper';
+import PlayedButton from 'elements/emby-playstatebutton/PlayedButton';
+import FavoriteButton from 'elements/emby-ratingbutton/FavoriteButton';
+import PlaylistAddIconButton from '../../common/PlaylistAddIconButton';
+import InfoIconButton from '../../common/InfoIconButton';
+import RightIconButtons from '../../common/RightIconButtons';
+import MoreVertIconButton from '../../common/MoreVertIconButton';
+
+import type { ItemDto } from 'types/base/models/item-dto';
+import type { ListOptions } from 'types/listOptions';
+
+interface ListViewUserDataButtonsProps {
+    item: ItemDto;
+    listOptions: ListOptions;
+}
+
+const ListViewUserDataButtons: FC<ListViewUserDataButtonsProps> = ({
+    item = {},
+    listOptions
+}) => {
+    const { IsFavorite, Played } = item.UserData ?? {};
+
+    const renderRightButtons = () => {
+        return listOptions.rightButtons?.map((button, index) => (
+            <RightIconButtons
+                // eslint-disable-next-line react/no-array-index-key
+                key={index}
+                className='listItemButton itemAction'
+                id={button.id}
+                title={button.title}
+                icon={button.icon}
+            />
+        ));
+    };
+
+    return (
+        <Box className='listViewUserDataButtons'>
+            {listOptions.addToListButton && (
+                <PlaylistAddIconButton
+                    className='paper-icon-button-light listItemButton itemAction'
+                />
+
+            )}
+            {listOptions.infoButton && (
+                <InfoIconButton
+                    className='paper-icon-button-light listItemButton itemAction'
+                />
+
+            ) }
+
+            {listOptions.rightButtons && renderRightButtons()}
+
+            {listOptions.enableUserDataButtons !== false && (
+                <>
+                    {itemHelper.canMarkPlayed(item)
+                        && listOptions.enablePlayedButton !== false && (
+                        <PlayedButton
+                            className='listItemButton'
+                            isPlayed={Played}
+                            itemId={item.Id}
+                            itemType={item.Type}
+                        />
+                    )}
+
+                    {itemHelper.canRate(item)
+                        && listOptions.enableRatingButton !== false && (
+                        <FavoriteButton
+                            className='listItemButton'
+                            isFavorite={IsFavorite}
+                            itemId={item.Id}
+                        />
+                    )}
+                </>
+            )}
+
+            {listOptions.moreButton !== false && (
+                <MoreVertIconButton
+                    className='paper-icon-button-light listItemButton itemAction'
+                />
+            )}
+        </Box>
+    );
+};
+
+export default ListViewUserDataButtons;

src/components/listview/List/ListWrapper.tsx

@@ -0,0 +1,48 @@
+import classNames from 'classnames';
+import React, { type FC } from 'react';
+import Box from '@mui/material/Box';
+import Button from '@mui/material/Button';
+import layoutManager from '../../layoutManager';
+import type { DataAttributes } from 'types/dataAttributes';
+
+interface ListWrapperProps {
+    index: number | undefined;
+    title?: string | null;
+    action?: string | null;
+    dataAttributes?: DataAttributes;
+    className?: string;
+}
+
+const ListWrapper: FC<ListWrapperProps> = ({
+    index,
+    action,
+    title,
+    className,
+    dataAttributes,
+    children
+}) => {
+    if (layoutManager.tv) {
+        return (
+            <Button
+                data-index={index}
+                className={classNames(
+                    className,
+                    'itemAction listItem-button listItem-focusscale'
+                )}
+                data-action={action}
+                aria-label={title || ''}
+                {...dataAttributes}
+            >
+                {children}
+            </Button>
+        );
+    } else {
+        return (
+            <Box data-index={index} className={className} {...dataAttributes}>
+                {children}
+            </Box>
+        );
+    }
+};
+
+export default ListWrapper;

src/components/listview/List/Lists.tsx

@@ -0,0 +1,56 @@
+import React, { type FC } from 'react';
+import { groupBy } from 'lodash-es';
+import Box from '@mui/material/Box';
+import { getIndex } from './listHelper';
+import ListGroupHeaderWrapper from './ListGroupHeaderWrapper';
+import List from './List';
+
+import type { ItemDto } from 'types/base/models/item-dto';
+import type { ListOptions } from 'types/listOptions';
+import '../listview.scss';
+
+interface ListsProps {
+    items: ItemDto[];
+    listOptions?: ListOptions;
+}
+
+const Lists: FC<ListsProps> = ({ items = [], listOptions = {} }) => {
+    const groupedData = groupBy(items, (item) => {
+        if (listOptions.showIndex) {
+            return getIndex(item, listOptions);
+        }
+        return '';
+    });
+
+    const renderListItem = (item: ItemDto, index: number) => {
+        return (
+            <List
+                // eslint-disable-next-line react/no-array-index-key
+                key={`${item.Id}-${index}`}
+                index={index}
+                item={item}
+                listOptions={listOptions}
+            />
+        );
+    };
+
+    return (
+        <>
+            {Object.entries(groupedData).map(
+                ([itemGroupTitle, getItems], index) => (
+                    // eslint-disable-next-line react/no-array-index-key
+                    <Box key={index}>
+                        {itemGroupTitle && (
+                            <ListGroupHeaderWrapper index={index}>
+                                {itemGroupTitle}
+                            </ListGroupHeaderWrapper>
+                        )}
+                        {getItems.map((item) => renderListItem(item, index))}
+                    </Box>
+                )
+            )}
+        </>
+    );
+};
+
+export default Lists;

src/components/listview/List/listHelper.ts

@@ -0,0 +1,172 @@
+import { Api } from '@jellyfin/sdk';
+import { BaseItemKind, ImageType } from '@jellyfin/sdk/lib/generated-client';
+import { getImageApi } from '@jellyfin/sdk/lib/utils/api/image-api';
+import globalize from 'scripts/globalize';
+
+import type { ItemDto } from 'types/base/models/item-dto';
+import type { ListOptions } from 'types/listOptions';
+
+const sortBySortName = (item: ItemDto): string => {
+    if (item.Type === BaseItemKind.Episode) {
+        return '';
+    }
+
+    // SortName
+    const name = (item.SortName ?? item.Name ?? '?')[0].toUpperCase();
+
+    const code = name.charCodeAt(0);
+    if (code < 65 || code > 90) {
+        return '#';
+    }
+
+    return name.toUpperCase();
+};
+
+const sortByOfficialrating = (item: ItemDto): string => {
+    return item.OfficialRating ?? globalize.translate('Unrated');
+};
+
+const sortByCommunityRating = (item: ItemDto): string => {
+    if (item.CommunityRating == null) {
+        return globalize.translate('Unrated');
+    }
+
+    return String(Math.floor(item.CommunityRating));
+};
+
+const sortByCriticRating = (item: ItemDto): string => {
+    if (item.CriticRating == null) {
+        return globalize.translate('Unrated');
+    }
+
+    return String(Math.floor(item.CriticRating));
+};
+
+const sortByAlbumArtist = (item: ItemDto): string => {
+    // SortName
+    if (!item.AlbumArtist) {
+        return '';
+    }
+
+    const name = item.AlbumArtist[0].toUpperCase();
+
+    const code = name.charCodeAt(0);
+    if (code < 65 || code > 90) {
+        return '#';
+    }
+
+    return name.toUpperCase();
+};
+
+export function getIndex(item: ItemDto, listOptions: ListOptions): string {
+    if (listOptions.index === 'disc') {
+        return item.ParentIndexNumber == null ?
+            '' :
+            globalize.translate('ValueDiscNumber', item.ParentIndexNumber);
+    }
+
+    const sortBy = (listOptions.sortBy ?? '').toLowerCase();
+
+    if (sortBy.startsWith('sortname')) {
+        return sortBySortName(item);
+    }
+    if (sortBy.startsWith('officialrating')) {
+        return sortByOfficialrating(item);
+    }
+    if (sortBy.startsWith('communityrating')) {
+        return sortByCommunityRating(item);
+    }
+    if (sortBy.startsWith('criticrating')) {
+        return sortByCriticRating(item);
+    }
+    if (sortBy.startsWith('albumartist')) {
+        return sortByAlbumArtist(item);
+    }
+    return '';
+}
+
+export function getImageUrl(
+    item: ItemDto,
+    api: Api | undefined,
+    size: number | undefined
+) {
+    let imgTag;
+    let itemId;
+    const fillWidth = size;
+    const fillHeight = size;
+    const imgType = ImageType.Primary;
+
+    if (item.ImageTags?.Primary) {
+        imgTag = item.ImageTags.Primary;
+        itemId = item.Id;
+    } else if (item.AlbumId && item.AlbumPrimaryImageTag) {
+        imgTag = item.AlbumPrimaryImageTag;
+        itemId = item.AlbumId;
+    } else if (item.SeriesId && item.SeriesPrimaryImageTag) {
+        imgTag = item.SeriesPrimaryImageTag;
+        itemId = item.SeriesId;
+    } else if (item.ParentPrimaryImageTag) {
+        imgTag = item.ParentPrimaryImageTag;
+        itemId = item.ParentPrimaryImageItemId;
+    }
+
+    if (api && imgTag && imgType && itemId) {
+        const response = getImageApi(api).getItemImageUrlById(itemId, imgType, {
+            fillWidth: fillWidth,
+            fillHeight: fillHeight,
+            tag: imgTag
+        });
+
+        return {
+            imgUrl: response,
+            blurhash: item.ImageBlurHashes?.[imgType]?.[imgTag]
+        };
+    }
+
+    return {
+        imgUrl: undefined,
+        blurhash: undefined
+    };
+}
+
+export function getChannelImageUrl(
+    item: ItemDto,
+    api: Api | undefined,
+    size: number | undefined
+) {
+    let imgTag;
+    let itemId;
+    const fillWidth = size;
+    const fillHeight = size;
+    const imgType = ImageType.Primary;
+
+    if (item.ChannelId && item.ChannelPrimaryImageTag) {
+        imgTag = item.ChannelPrimaryImageTag;
+        itemId = item.ChannelId;
+    }
+
+    if (api && imgTag && imgType && itemId) {
+        const response = api.getItemImageUrl(itemId, imgType, {
+            fillWidth: fillWidth,
+            fillHeight: fillHeight,
+            tag: imgTag
+        });
+
+        return {
+            imgUrl: response,
+            blurhash: item.ImageBlurHashes?.[imgType]?.[imgTag]
+        };
+    }
+
+    return {
+        imgUrl: undefined,
+        blurhash: undefined
+    };
+}
+
+export function canResume(PlaybackPositionTicks: number | undefined): boolean {
+    return Boolean(
+        PlaybackPositionTicks
+            && PlaybackPositionTicks > 0
+    );
+}

src/components/listview/List/useList.ts

@@ -0,0 +1,77 @@
+import classNames from 'classnames';
+import { getDataAttributes } from 'utils/items';
+import layoutManager from 'components/layoutManager';
+
+import type { ItemDto } from 'types/base/models/item-dto';
+import type { ListOptions } from 'types/listOptions';
+
+interface UseListProps {
+    item: ItemDto;
+    listOptions: ListOptions;
+}
+
+function useList({ item, listOptions }: UseListProps) {
+    const action = listOptions.action ?? 'link';
+    const isLargeStyle = listOptions.imageSize === 'large';
+    const enableOverview = listOptions.enableOverview;
+    const clickEntireItem = !!layoutManager.tv;
+    const enableSideMediaInfo = listOptions.enableSideMediaInfo ?? true;
+    const enableContentWrapper =
+        listOptions.enableOverview && !layoutManager.tv;
+    const downloadWidth = isLargeStyle ? 500 : 80;
+
+    const dataAttributes = getDataAttributes(
+        {
+            action,
+            itemServerId: item.ServerId,
+            itemId: item.Id,
+            collectionId: listOptions.collectionId,
+            playlistId: listOptions.playlistId,
+            itemChannelId: item.ChannelId,
+            itemType: item.Type,
+            itemMediaType: item.MediaType,
+            itemCollectionType: item.CollectionType,
+            itemIsFolder: item.IsFolder,
+            itemPlaylistItemId: item.PlaylistItemId
+        }
+    );
+
+    const listWrapperClass = classNames(
+        'listItem',
+        {
+            'listItem-border':
+                listOptions.border
+                ?? (listOptions.highlight !== false && !layoutManager.tv)
+        },
+        { 'itemAction listItem-button': clickEntireItem },
+        { 'listItem-focusscale': layoutManager.tv },
+        { 'listItem-largeImage': isLargeStyle },
+        { 'listItem-withContentWrapper': enableContentWrapper }
+    );
+
+    const getListdWrapperProps = () => ({
+        className: listWrapperClass,
+        title: item.Name,
+        action,
+        dataAttributes
+    });
+
+    const getListContentProps = () => ({
+        item,
+        listOptions,
+        enableContentWrapper,
+        enableOverview,
+        enableSideMediaInfo,
+        clickEntireItem,
+        action,
+        isLargeStyle,
+        downloadWidth
+    });
+
+    return {
+        getListdWrapperProps,
+        getListContentProps
+    };
+}
+
+export default useList;

src/components/listview/List/useListTextlines.tsx

@@ -0,0 +1,167 @@
+import { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind';
+import React from 'react';
+import itemHelper from '../../itemHelper';
+import datetime from 'scripts/datetime';
+import ListTextWrapper from './ListTextWrapper';
+import type { ItemDto } from 'types/base/models/item-dto';
+import type { ListOptions } from 'types/listOptions';
+
+function getParentTitle(
+    showParentTitle: boolean | undefined,
+    item: ItemDto,
+    parentTitleWithTitle: boolean | undefined,
+    displayName: string | null | undefined
+) {
+    let parentTitle = null;
+    if (showParentTitle) {
+        if (item.Type === BaseItemKind.Episode) {
+            parentTitle = item.SeriesName;
+        } else if (item.IsSeries || (item.EpisodeTitle && item.Name)) {
+            parentTitle = item.Name;
+        }
+    }
+    if (showParentTitle && parentTitleWithTitle) {
+        if (displayName) {
+            parentTitle += ' - ';
+        }
+        parentTitle = (parentTitle ?? '') + displayName;
+    }
+    return parentTitle;
+}
+
+function getNameOrIndexWithName(
+    item: ItemDto,
+    listOptions: ListOptions,
+    showIndexNumber: boolean | undefined
+) {
+    let displayName = itemHelper.getDisplayName(item, {
+        includeParentInfo: listOptions.includeParentInfoInTitle
+    });
+
+    if (showIndexNumber && item.IndexNumber != null) {
+        displayName = `${item.IndexNumber}. ${displayName}`;
+    }
+    return displayName;
+}
+
+interface UseListTextlinesProps {
+    item: ItemDto;
+    listOptions?: ListOptions;
+    isLargeStyle?: boolean;
+}
+
+function useListTextlines({ item = {}, listOptions = {}, isLargeStyle }: UseListTextlinesProps) {
+    const {
+        showProgramDateTime,
+        showProgramTime,
+        showChannel,
+        showParentTitle,
+        showIndexNumber,
+        parentTitleWithTitle,
+        artist
+    } = listOptions;
+    const textLines: string[] = [];
+
+    const addTextLine = (text: string | null) => {
+        if (text) {
+            textLines.push(text);
+        }
+    };
+
+    const addProgramDateTime = () => {
+        if (showProgramDateTime) {
+            const programDateTime = datetime.toLocaleString(
+                datetime.parseISO8601Date(item.StartDate),
+                {
+                    weekday: 'long',
+                    month: 'short',
+                    day: 'numeric',
+                    hour: 'numeric',
+                    minute: '2-digit'
+                }
+            );
+            addTextLine(programDateTime);
+        }
+    };
+
+    const addProgramTime = () => {
+        if (showProgramTime) {
+            const programTime = datetime.getDisplayTime(
+                datetime.parseISO8601Date(item.StartDate)
+            );
+            addTextLine(programTime);
+        }
+    };
+
+    const addChannelName = () => {
+        if (showChannel && item.ChannelName) {
+            addTextLine(item.ChannelName);
+        }
+    };
+
+    const displayName = getNameOrIndexWithName(item, listOptions, showIndexNumber);
+
+    const parentTitle = getParentTitle(showParentTitle, item, parentTitleWithTitle, displayName );
+
+    const addParentTitle = () => {
+        addTextLine(parentTitle ?? '');
+    };
+
+    const addDisplayName = () => {
+        if (displayName && !parentTitleWithTitle) {
+            addTextLine(displayName);
+        }
+    };
+
+    const addAlbumArtistOrArtists = () => {
+        if (item.IsFolder && artist !== false) {
+            if (item.AlbumArtist && item.Type === BaseItemKind.MusicAlbum) {
+                addTextLine(item.AlbumArtist);
+            }
+        } else if (artist) {
+            const artistItems = item.ArtistItems;
+            if (artistItems && item.Type !== BaseItemKind.MusicAlbum) {
+                const artists = artistItems.map((a) => a.Name).join(', ');
+                addTextLine(artists);
+            }
+        }
+    };
+
+    const addCurrentProgram = () => {
+        if (item.Type === BaseItemKind.TvChannel && item.CurrentProgram) {
+            const currentProgram = itemHelper.getDisplayName(
+                item.CurrentProgram
+            );
+            addTextLine(currentProgram);
+        }
+    };
+
+    addProgramDateTime();
+    addProgramTime();
+    addChannelName();
+    addParentTitle();
+    addDisplayName();
+    addAlbumArtistOrArtists();
+    addCurrentProgram();
+
+    const renderTextlines = (text: string, index: number) => {
+        return (
+            <ListTextWrapper
+                // eslint-disable-next-line react/no-array-index-key
+                key={index}
+                index={index}
+                isLargeStyle={isLargeStyle}
+            >
+                <bdi>{text}</bdi>
+            </ListTextWrapper>
+        );
+    };
+
+    const listTextLines = textLines?.map((text, index) => renderTextlines(text, index));
+
+    return {
+        listTextLines
+    };
+}
+
+export default useListTextlines;

src/components/listview/listview.scss

@@ -183,6 +183,7 @@
 }
 
 .listItemImage .cardImageIcon {
+    margin: auto;
     font-size: 3em;
 }
 

src/components/mediainfo/CaptionMediaInfo.tsx

@@ -0,0 +1,25 @@
+import React, { type FC } from 'react';
+import classNames from 'classnames';
+import ClosedCaptionIcon from '@mui/icons-material/ClosedCaption';
+import Box from '@mui/material/Box';
+
+interface CaptionMediaInfoProps {
+    className?: string;
+}
+
+const CaptionMediaInfo: FC<CaptionMediaInfoProps> = ({ className }) => {
+    const cssClass = classNames(
+        'mediaInfoItem',
+        'mediaInfoText',
+        'closedCaptionMediaInfoText',
+        className
+    );
+
+    return (
+        <Box className={cssClass}>
+            <ClosedCaptionIcon fontSize={'small'} />
+        </Box>
+    );
+};
+
+export default CaptionMediaInfo;

src/components/mediainfo/CriticRatingMediaInfo.tsx

@@ -0,0 +1,25 @@
+import React, { type FC } from 'react';
+import classNames from 'classnames';
+import Box from '@mui/material/Box';
+
+interface CriticRatingMediaInfoProps {
+    className?: string;
+    criticRating: number;
+}
+
+const CriticRatingMediaInfo: FC<CriticRatingMediaInfoProps> = ({
+    className,
+    criticRating
+}) => {
+    const cssClass = classNames(
+        'mediaInfoCriticRating',
+        'mediaInfoItem',
+        criticRating >= 60 ?
+            'mediaInfoCriticRatingFresh' :
+            'mediaInfoCriticRatingRotten',
+        className
+    );
+    return <Box className={cssClass}>{criticRating}</Box>;
+};
+
+export default CriticRatingMediaInfo;

src/components/mediainfo/EndsAt.tsx

@@ -0,0 +1,31 @@
+import React, { type FC } from 'react';
+import classNames from 'classnames';
+import Box from '@mui/material/Box';
+import datetime from 'scripts/datetime';
+import globalize from 'scripts/globalize';
+
+interface EndsAtProps {
+    className?: string;
+    runTimeTicks: number
+}
+
+const EndsAt: FC<EndsAtProps> = ({ runTimeTicks, className }) => {
+    const cssClass = classNames(
+        'mediaInfoItem',
+        'mediaInfoText',
+        'endsAt',
+        className
+    );
+
+    const endTime = new Date().getTime() + (runTimeTicks / 10000);
+    const endDate = new Date(endTime);
+    const displayTime = datetime.getDisplayTime(endDate);
+
+    return (
+        <Box className={cssClass}>
+            {globalize.translate('EndsAtValue', displayTime)}
+        </Box>
+    );
+};
+
+export default EndsAt;

src/components/mediainfo/MediaInfoItem.tsx

@@ -0,0 +1,27 @@
+import React, { type FC } from 'react';
+import Box from '@mui/material/Box';
+import classNames from 'classnames';
+import type { MiscInfo } from 'types/mediaInfoItem';
+
+interface MediaInfoItemProps {
+    className?: string;
+    miscInfo?: MiscInfo ;
+
+}
+
+const MediaInfoItem: FC<MediaInfoItemProps> = ({ className, miscInfo }) => {
+    const cssClass = classNames(
+        'mediaInfoItem',
+        'mediaInfoText',
+        className,
+        miscInfo?.cssClass
+    );
+
+    return (
+        <Box className={cssClass}>
+            {miscInfo?.text}
+        </Box>
+    );
+};
+
+export default MediaInfoItem;

src/components/mediainfo/PrimaryMediaInfo.tsx

@@ -0,0 +1,103 @@
+import React, { type FC } from 'react';
+import classNames from 'classnames';
+import Box from '@mui/material/Box';
+import usePrimaryMediaInfo from './usePrimaryMediaInfo';
+
+import MediaInfoItem from './MediaInfoItem';
+import StarIcons from './StarIcons';
+import CaptionMediaInfo from './CaptionMediaInfo';
+import CriticRatingMediaInfo from './CriticRatingMediaInfo';
+import EndsAt from './EndsAt';
+import type { ItemDto } from 'types/base/models/item-dto';
+import type { MiscInfo } from 'types/mediaInfoItem';
+
+interface PrimaryMediaInfoProps {
+    className?: string;
+    item: ItemDto;
+    isYearEnabled?: boolean;
+    isContainerEnabled?: boolean;
+    isEpisodeTitleEnabled?: boolean;
+    isCriticRatingEnabled?: boolean;
+    isEndsAtEnabled?: boolean;
+    isOriginalAirDateEnabled?: boolean;
+    isRuntimeEnabled?: boolean;
+    isProgramIndicatorEnabled?: boolean;
+    isEpisodeTitleIndexNumberEnabled?: boolean;
+    isOfficialRatingEnabled?: boolean;
+    isStarRatingEnabled?: boolean;
+    isCaptionIndicatorEnabled?: boolean;
+    isMissingIndicatorEnabled?: boolean;
+    getMissingIndicator: () => React.JSX.Element | null
+}
+
+const PrimaryMediaInfo: FC<PrimaryMediaInfoProps> = ({
+    className,
+    item,
+    isYearEnabled = false,
+    isContainerEnabled = false,
+    isEpisodeTitleEnabled = false,
+    isCriticRatingEnabled = false,
+    isEndsAtEnabled = false,
+    isOriginalAirDateEnabled = false,
+    isRuntimeEnabled = false,
+    isProgramIndicatorEnabled = false,
+    isEpisodeTitleIndexNumberEnabled = false,
+    isOfficialRatingEnabled = false,
+    isStarRatingEnabled = false,
+    isCaptionIndicatorEnabled = false,
+    isMissingIndicatorEnabled = false,
+    getMissingIndicator
+}) => {
+    const miscInfo = usePrimaryMediaInfo({
+        item,
+        isYearEnabled,
+        isContainerEnabled,
+        isEpisodeTitleEnabled,
+        isOriginalAirDateEnabled,
+        isRuntimeEnabled,
+        isProgramIndicatorEnabled,
+        isEpisodeTitleIndexNumberEnabled,
+        isOfficialRatingEnabled
+    });
+    const {
+        StartDate,
+        HasSubtitles,
+        MediaType,
+        RunTimeTicks,
+        CommunityRating,
+        CriticRating
+    } = item;
+
+    const cssClass = classNames(className);
+
+    const renderMediaInfo = (info: MiscInfo | undefined, index: number) => (
+        <MediaInfoItem key={index} miscInfo={info} />
+    );
+
+    return (
+        <Box className={cssClass}>
+            {miscInfo.map((info, index) => renderMediaInfo(info, index))}
+
+            {isStarRatingEnabled && CommunityRating && (
+                <StarIcons communityRating={CommunityRating} />
+            )}
+
+            {HasSubtitles && isCaptionIndicatorEnabled && <CaptionMediaInfo />}
+
+            {CriticRating && isCriticRatingEnabled && (
+                <CriticRatingMediaInfo criticRating={CriticRating} />
+            )}
+
+            {isEndsAtEnabled
+                && MediaType === 'Video'
+                && RunTimeTicks
+                && !StartDate && <EndsAt runTimeTicks={RunTimeTicks} />}
+
+            {isMissingIndicatorEnabled && (
+                getMissingIndicator()
+            )}
+        </Box>
+    );
+};
+
+export default PrimaryMediaInfo;

src/components/mediainfo/StarIcons.tsx

@@ -0,0 +1,31 @@
+import React, { type FC } from 'react';
+import classNames from 'classnames';
+import StarIcon from '@mui/icons-material/Star';
+import Box from '@mui/material/Box';
+import { useTheme } from '@mui/material/styles';
+
+interface StarIconsProps {
+    className?: string;
+    communityRating: number;
+}
+
+const StarIcons: FC<StarIconsProps> = ({ className, communityRating }) => {
+    const theme = useTheme();
+    const cssClass = classNames(
+        'mediaInfoItem',
+        'mediaInfoText',
+        'starRatingContainer',
+        className
+    );
+
+    return (
+        <Box className={cssClass}>
+            <StarIcon fontSize={'small'} sx={{
+                color: theme.palette.starIcon.main
+            }} />
+            {communityRating.toFixed(1)}
+        </Box>
+    );
+};
+
+export default StarIcons;

src/components/mediainfo/usePrimaryMediaInfo.tsx

@@ -0,0 +1,523 @@
+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';
+import itemHelper from '../itemHelper';
+import type { NullableNumber, NullableString } from 'types/base/common/shared/types';
+import type { ItemDto } from 'types/base/models/item-dto';
+import type { MiscInfo } from 'types/mediaInfoItem';
+
+function shouldShowFolderRuntime(
+    itemType: NullableString,
+    itemMediaType: NullableString
+): boolean {
+    return (
+        itemType === BaseItemKind.MusicAlbum
+        || itemMediaType === 'MusicArtist'
+        || itemType === BaseItemKind.Playlist
+        || itemMediaType === 'Playlist'
+        || itemMediaType === 'MusicGenre'
+    );
+}
+
+function addTrackCountOrItemCount(
+    showFolderRuntime: boolean,
+    itemSongCount: NullableNumber,
+    itemChildCount: NullableNumber,
+    itemRunTimeTicks: NullableNumber,
+    itemType: NullableString,
+    addMiscInfo: (val: MiscInfo) => void
+): void {
+    if (showFolderRuntime) {
+        const count = itemSongCount ?? itemChildCount;
+        if (count) {
+            addMiscInfo({ text: globalize.translate('TrackCount', count) });
+        }
+
+        if (itemRunTimeTicks) {
+            addMiscInfo({ text: datetime.getDisplayDuration(itemRunTimeTicks) });
+        }
+    } else if (itemType === BaseItemKind.PhotoAlbum || itemType === BaseItemKind.BoxSet) {
+        const count = itemChildCount;
+        if (count) {
+            addMiscInfo({ text: globalize.translate('ItemCount', count) });
+        }
+    }
+}
+
+function addOriginalAirDateInfo(
+    itemType: NullableString,
+    itemMediaType: NullableString,
+    isOriginalAirDateEnabled: boolean,
+    itemPremiereDate: NullableString,
+    addMiscInfo: (val: MiscInfo) => void
+): void {
+    if (
+        itemPremiereDate
+        && (itemType === BaseItemKind.Episode || itemMediaType === 'Photo')
+        && isOriginalAirDateEnabled
+    ) {
+        try {
+            //don't modify date to locale if episode. Only Dates (not times) are stored, or editable in the edit metadata dialog
+            const date = datetime.parseISO8601Date(
+                itemPremiereDate,
+                itemType !== BaseItemKind.Episode
+            );
+            addMiscInfo({ text: datetime.toLocaleDateString(date) });
+        } catch (e) {
+            console.error('error parsing date:', itemPremiereDate);
+        }
+    }
+}
+
+function addSeriesTimerInfo(
+    itemType: NullableString,
+    itemRecordAnyTime: boolean | undefined,
+    itemStartDate: NullableString,
+    itemRecordAnyChannel: boolean | undefined,
+    itemChannelName: NullableString,
+    addMiscInfo: (val: MiscInfo) => void
+): void {
+    if (itemType === 'SeriesTimer') {
+        if (itemRecordAnyTime) {
+            addMiscInfo({ text: globalize.translate('Anytime') });
+        } else {
+            addMiscInfo({ text: datetime.getDisplayTime(itemStartDate) });
+        }
+
+        if (itemRecordAnyChannel) {
+            addMiscInfo({ text: globalize.translate('AllChannels') });
+        } else {
+            addMiscInfo({
+                text: itemChannelName ?? globalize.translate('OneChannel')
+            });
+        }
+    }
+}
+
+function addProgramIndicatorInfo(
+    program: ItemDto | undefined,
+    addMiscInfo: (val: MiscInfo) => void
+): void {
+    if (
+        program?.IsLive
+        && userSettings.get('guide-indicator-live', false) === 'true'
+    ) {
+        addMiscInfo({
+            text: globalize.translate('Live'),
+            cssClass: 'mediaInfoProgramAttribute liveTvProgram'
+        });
+    } else if (
+        program?.IsPremiere
+        && userSettings.get('guide-indicator-premiere', false) === 'true'
+    ) {
+        addMiscInfo({
+            text: globalize.translate('Premiere'),
+            cssClass: 'mediaInfoProgramAttribute premiereTvProgram'
+        });
+    } else if (
+        program?.IsSeries
+        && !program?.IsRepeat
+        && userSettings.get('guide-indicator-new', false) === 'true'
+    ) {
+        addMiscInfo({
+            text: globalize.translate('New'),
+            cssClass: 'mediaInfoProgramAttribute newTvProgram'
+        });
+    } else if (
+        program?.IsSeries
+        && program?.IsRepeat
+        && userSettings.get('guide-indicator-repeat', false) === 'true'
+    ) {
+        addMiscInfo({
+            text: globalize.translate('Repeat'),
+            cssClass: 'mediaInfoProgramAttribute repeatTvProgram'
+        });
+    }
+}
+
+function addProgramIndicators(
+    item: ItemDto,
+    isYearEnabled: boolean,
+    isEpisodeTitleEnabled: boolean,
+    isOriginalAirDateEnabled: boolean,
+    isProgramIndicatorEnabled: boolean,
+    isEpisodeTitleIndexNumberEnabled: boolean,
+    addMiscInfo: (val: MiscInfo) => void
+): void {
+    if (item.Type === BaseItemKind.Program || item.Type === 'Timer') {
+        let program = item;
+        if (item.Type === 'Timer' && item.ProgramInfo) {
+            program = item.ProgramInfo;
+        }
+
+        if (isProgramIndicatorEnabled !== false) {
+            addProgramIndicatorInfo(program, addMiscInfo);
+        }
+
+        addProgramTextInfo(
+            program,
+            isEpisodeTitleEnabled,
+            isEpisodeTitleIndexNumberEnabled,
+            isOriginalAirDateEnabled,
+            isYearEnabled,
+            addMiscInfo
+        );
+    }
+}
+
+function addProgramTextInfo(
+    program: ItemDto,
+    isEpisodeTitleEnabled: boolean,
+    isEpisodeTitleIndexNumberEnabled: boolean,
+    isOriginalAirDateEnabled: boolean,
+    isYearEnabled: boolean,
+    addMiscInfo: (val: MiscInfo) => void
+): void {
+    if ((program?.IsSeries || program?.EpisodeTitle)
+    && isEpisodeTitleEnabled !== false) {
+        const text = itemHelper.getDisplayName(program, {
+            includeIndexNumber: isEpisodeTitleIndexNumberEnabled
+        });
+
+        if (text) {
+            addMiscInfo({ text: text });
+        }
+    } else if (
+        program?.ProductionYear
+        && ((program?.IsMovie && isOriginalAirDateEnabled !== false)
+            || isYearEnabled !== false)
+    ) {
+        addMiscInfo({ text: program.ProductionYear });
+    } else if (program?.PremiereDate && isOriginalAirDateEnabled !== false) {
+        try {
+            const date = datetime.parseISO8601Date(program.PremiereDate);
+            const text = globalize.translate(
+                'OriginalAirDateValue',
+                datetime.toLocaleDateString(date)
+            );
+            addMiscInfo({ text: text });
+        } catch (e) {
+            console.error('error parsing date:', program.PremiereDate);
+        }
+    }
+}
+
+function addStartDateInfo(
+    itemStartDate: NullableString,
+    itemType: NullableString,
+    addMiscInfo: (val: MiscInfo) => void
+): void {
+    if (
+        itemStartDate
+        && itemType !== BaseItemKind.Program
+        && itemType !== 'SeriesTimer'
+        && itemType !== 'Timer'
+    ) {
+        try {
+            const date = datetime.parseISO8601Date(itemStartDate);
+            addMiscInfo({ text: datetime.toLocaleDateString(date) });
+
+            if (itemType !== BaseItemKind.Recording) {
+                addMiscInfo({ text: datetime.getDisplayTime(date) });
+            }
+        } catch (e) {
+            console.error('error parsing date:', itemStartDate);
+        }
+    }
+}
+
+function addSeriesProductionYearInfo(
+    itemProductionYear: NullableNumber,
+    itemType: NullableString,
+    isYearEnabled: boolean,
+    itemStatus: NullableString,
+    itemEndDate: NullableString,
+    addMiscInfo: (val: MiscInfo) => void
+): void {
+    if (itemProductionYear && isYearEnabled && itemType === BaseItemKind.Series) {
+        if (itemStatus === 'Continuing') {
+            addMiscInfo({
+                text: globalize.translate(
+                    'SeriesYearToPresent',
+                    datetime.toLocaleString(itemProductionYear, {
+                        useGrouping: false
+                    })
+                )
+            });
+        } else {
+            addproductionYearWithEndDate(itemProductionYear, itemEndDate, addMiscInfo);
+        }
+    }
+}
+
+function addproductionYearWithEndDate(
+    itemProductionYear: number,
+    itemEndDate: NullableString,
+    addMiscInfo: (val: MiscInfo) => void
+): void {
+    let productionYear = datetime.toLocaleString(itemProductionYear, {
+        useGrouping: false
+    });
+
+    if (itemEndDate) {
+        try {
+            const endYear = datetime.toLocaleString(
+                datetime.parseISO8601Date(itemEndDate).getFullYear(),
+                { useGrouping: false }
+            );
+            /* At this point, text will contain only the start year */
+            if (endYear !== itemProductionYear) {
+                productionYear += `-${endYear}`;
+            }
+        } catch (e) {
+            console.error('error parsing date:', itemEndDate);
+        }
+    }
+    addMiscInfo({ text: productionYear });
+}
+
+function addYearInfo(
+    isYearEnabled: boolean,
+    itemType: NullableString,
+    itemMediaType: NullableString,
+    itemProductionYear: NullableNumber,
+    itemPremiereDate: NullableString,
+    addMiscInfo: (val: MiscInfo) => void
+): void {
+    if (
+        isYearEnabled
+        && itemType !== BaseItemKind.Series
+        && itemType !== BaseItemKind.Episode
+        && itemType !== BaseItemKind.Person
+        && itemMediaType !== 'Photo'
+        && itemType !== BaseItemKind.Program
+        && itemType !== BaseItemKind.Season
+    ) {
+        if (itemProductionYear) {
+            addMiscInfo({ text: itemProductionYear });
+        } else if (itemPremiereDate) {
+            try {
+                const text = datetime.toLocaleString(
+                    datetime.parseISO8601Date(itemPremiereDate).getFullYear(),
+                    { useGrouping: false }
+                );
+                addMiscInfo({ text: text });
+            } catch (e) {
+                console.error('error parsing date:', itemPremiereDate);
+            }
+        }
+    }
+}
+
+function addVideo3DFormat(
+    itemVideo3DFormat: NullableString,
+    addMiscInfo: (val: MiscInfo) => void
+): void {
+    if (itemVideo3DFormat) {
+        addMiscInfo({ text: '3D' });
+    }
+}
+
+function addRunTimeInfo(
+    itemRunTimeTicks: NullableNumber,
+    itemType: NullableString,
+    showFolderRuntime: boolean,
+    isRuntimeEnabled: boolean,
+    addMiscInfo: (val: MiscInfo) => void
+): void {
+    if (
+        itemRunTimeTicks
+        && itemType !== BaseItemKind.Series
+        && itemType !== BaseItemKind.Program
+        && itemType !== 'Timer'
+        && itemType !== BaseItemKind.Book
+        && !showFolderRuntime
+        && isRuntimeEnabled
+    ) {
+        if (itemType === BaseItemKind.Audio) {
+            addMiscInfo({ text: datetime.getDisplayRunningTime(itemRunTimeTicks) });
+        } else {
+            addMiscInfo({ text: datetime.getDisplayDuration(itemRunTimeTicks) });
+        }
+    }
+}
+
+function addOfficialRatingInfo(
+    itemOfficialRating: NullableString,
+    itemType: NullableString,
+    isOfficialRatingEnabled: boolean,
+    addMiscInfo: (val: MiscInfo) => void
+): void {
+    if (
+        itemOfficialRating
+        && isOfficialRatingEnabled
+        && itemType !== BaseItemKind.Season
+        && itemType !== BaseItemKind.Episode
+    ) {
+        addMiscInfo({
+            text: itemOfficialRating,
+            cssClass: 'mediaInfoOfficialRating'
+        });
+    }
+}
+
+function addAudioContainer(
+    itemContainer: NullableString,
+    isContainerEnabled: boolean,
+    itemType: NullableString,
+    addMiscInfo: (val: MiscInfo) => void
+): void {
+    if (itemContainer && isContainerEnabled && itemType === BaseItemKind.Audio) {
+        addMiscInfo({ text: itemContainer });
+    }
+}
+
+function addPhotoSize(
+    itemMediaType: NullableString,
+    itemWidth: NullableNumber,
+    itemHeight: NullableNumber,
+    addMiscInfo: (val: MiscInfo) => void
+): void {
+    if (itemMediaType === 'Photo' && itemWidth && itemHeight) {
+        const size = `${itemWidth}x${itemHeight}`;
+
+        addMiscInfo({ text: size });
+    }
+}
+
+interface UsePrimaryMediaInfoProps {
+    item: ItemDto;
+    isYearEnabled: boolean;
+    isContainerEnabled: boolean;
+    isEpisodeTitleEnabled: boolean;
+    isOriginalAirDateEnabled: boolean;
+    isRuntimeEnabled: boolean;
+    isProgramIndicatorEnabled: boolean;
+    isEpisodeTitleIndexNumberEnabled: boolean;
+    isOfficialRatingEnabled: boolean;
+}
+
+function usePrimaryMediaInfo({
+    item,
+    isYearEnabled = false,
+    isContainerEnabled = false,
+    isEpisodeTitleEnabled = false,
+    isOriginalAirDateEnabled = false,
+    isRuntimeEnabled = false,
+    isProgramIndicatorEnabled = false,
+    isEpisodeTitleIndexNumberEnabled = false,
+    isOfficialRatingEnabled = false
+}: UsePrimaryMediaInfoProps) {
+    const {
+        EndDate,
+        Status,
+        StartDate,
+        ProductionYear,
+        Video3DFormat,
+        Type,
+        Width,
+        Height,
+        MediaType,
+        SongCount,
+        RecordAnyTime,
+        RecordAnyChannel,
+        ChannelName,
+        ChildCount,
+        RunTimeTicks,
+        PremiereDate,
+        OfficialRating,
+        Container
+    } = item;
+
+    const miscInfo: MiscInfo[] = [];
+
+    const addMiscInfo = (val: MiscInfo) => {
+        if (val) {
+            miscInfo.push(val);
+        }
+    };
+
+    const showFolderRuntime = shouldShowFolderRuntime(Type, MediaType);
+
+    addTrackCountOrItemCount(
+        showFolderRuntime,
+        SongCount,
+        ChildCount,
+        RunTimeTicks,
+        Type,
+        addMiscInfo
+    );
+
+    addOriginalAirDateInfo(
+        Type,
+        MediaType,
+        isOriginalAirDateEnabled,
+        PremiereDate,
+        addMiscInfo
+    );
+
+    addSeriesTimerInfo(
+        Type,
+        RecordAnyTime,
+        StartDate,
+        RecordAnyChannel,
+        ChannelName,
+        addMiscInfo
+    );
+
+    addStartDateInfo(StartDate, Type, addMiscInfo);
+
+    addSeriesProductionYearInfo(
+        ProductionYear,
+        Type,
+        isYearEnabled,
+        Status,
+        EndDate,
+        addMiscInfo
+    );
+
+    addProgramIndicators(
+        item,
+        isProgramIndicatorEnabled,
+        isEpisodeTitleEnabled,
+        isEpisodeTitleIndexNumberEnabled,
+        isOriginalAirDateEnabled,
+        isYearEnabled,
+        addMiscInfo
+    );
+
+    addYearInfo(
+        isYearEnabled,
+        Type,
+        MediaType,
+        ProductionYear,
+        PremiereDate,
+        addMiscInfo
+    );
+
+    addRunTimeInfo(
+        RunTimeTicks,
+        Type,
+        showFolderRuntime,
+        isRuntimeEnabled,
+        addMiscInfo
+    );
+
+    addOfficialRatingInfo(
+        OfficialRating,
+        Type,
+        isOfficialRatingEnabled,
+        addMiscInfo
+    );
+
+    addVideo3DFormat(Video3DFormat, addMiscInfo);
+
+    addPhotoSize(MediaType, Width, Height, addMiscInfo);
+
+    addAudioContainer(Container, isContainerEnabled, Type, addMiscInfo);
+
+    return miscInfo;
+}
+
+export default usePrimaryMediaInfo;