Merge remote-tracking branch 'upstream/Dev' into Dev

# Conflicts:
#	src/hooks/navigator/useNavigatorSearch.ts

src/components/catalog/CatalogClassicView.tsx

@@ -1,9 +1,9 @@
 import { AddLinkEventTracker, ILinkEventTracker, RemoveLinkEventTracker } from '@nitrots/nitro-renderer';
-import { FC, useEffect } from 'react';
-import { FaCog, FaEdit, FaEye, FaEyeSlash, FaPlus, FaTrash } from 'react-icons/fa';
-import { CatalogType, GetConfigurationValue, LocalizeText } from '../../api';
-import { Column, Grid, NitroCardContentView, NitroCardHeaderView, NitroCardTabsItemView, NitroCardTabsView, NitroCardView } from '../../common';
-import { useCatalogActions, useCatalogData, useCatalogUiState, useHasPermission } from '../../hooks';
+import { FC, useEffect, useState } from 'react';
+import { FaBars, FaCog, FaEdit, FaEye, FaEyeSlash, FaPlus, FaTrash } from 'react-icons/fa';
+import { CatalogType, GetConfigurationValue, LocalizeShortNumber, LocalizeText } from '../../api';
+import { Column, Grid, LayoutCurrencyIcon, NitroCardContentView, NitroCardHeaderView, NitroCardTabsItemView, NitroCardTabsView, NitroCardView } from '../../common';
+import { useCatalogActions, useCatalogData, useCatalogUiState, useHasPermission, usePurse } from '../../hooks';
 import { CatalogAdminProvider, useCatalogAdmin } from './CatalogAdminContext';
 import { CatalogAdminOfferEditView } from './views/admin/CatalogAdminOfferEditView';
 import { CatalogAdminPageEditView } from './views/admin/CatalogAdminPageEditView';
@@ -31,6 +31,9 @@ const CatalogClassicViewInner: FC<{}> = () =>
     const loading = catalogAdmin?.loading ?? false;
 
     const isMod = useHasPermission('acc_catalogfurni');
+    const [ mobileMenuOpen, setMobileMenuOpen ] = useState(false);
+    const { purse = null } = usePurse();
+    const displayedCurrencies = GetConfigurationValue<number[]>('system.currency.types', []);
     const buildersClubHeaderStyle = (currentType === CatalogType.BUILDER)
         ? { borderColor: '#d79d2e', borderBottomColor: '#000', background: 'linear-gradient(180deg, #d89f2d 0%, #c68515 100%)' }
         : undefined;
@@ -121,6 +124,42 @@ const CatalogClassicViewInner: FC<{}> = () =>
             { isVisible &&
                 <NitroCardView classNames={ [ 'nitro-catalog-classic-window' ] } isResizable={ false } uniqueKey="catalog">
                     <NitroCardHeaderView className={ currentType === CatalogType.BUILDER ? 'builders-club-card-header' : '' } headerText={ LocalizeText('catalog.title') } onCloseClick={ () => setIsVisible(false) } style={ buildersClubHeaderStyle } />
+                    <div className="nitro-catalog-classic-mobile-header">
+                        { isMod &&
+                            <div className="nitro-catalog-classic-mobile-burger">
+                                <button className="nitro-catalog-classic-burger-btn" onClick={ () => setMobileMenuOpen(value => !value) }>
+                                    <FaBars />
+                                </button>
+                                { mobileMenuOpen &&
+                                    <div className="nitro-catalog-classic-burger-menu">
+                                        <button onClick={ () =>
+                                        {
+                                            setAdminMode(!adminMode); setMobileMenuOpen(false);
+                                        } }>
+                                            { adminMode ? 'Exit Admin' : 'Admin' }
+                                        </button>
+                                        { adminMode &&
+                                            <button disabled={ loading } onClick={ () =>
+                                            {
+                                                publishCatalog(); setMobileMenuOpen(false);
+                                            } }>
+                                                { loading ? '...' : 'Publish' }
+                                            </button> }
+                                    </div> }
+                            </div> }
+                        <div className="nitro-catalog-classic-mobile-currency">
+                            <div className="nitro-catalog-classic-coin">
+                                <span>{ LocalizeShortNumber(purse?.credits ?? 0) }</span>
+                                <LayoutCurrencyIcon type={ -1 } />
+                            </div>
+                            { displayedCurrencies.map(type => (
+                                <div key={ type } className="nitro-catalog-classic-coin">
+                                    <span>{ LocalizeShortNumber(purse?.activityPoints?.get(type) ?? 0) }</span>
+                                    <LayoutCurrencyIcon type={ type } />
+                                </div>
+                            )) }
+                        </div>
+                    </div>
                     { adminMode &&
                         <div className="nitro-catalog-classic-admin-banner flex items-center justify-between text-[10px] font-bold px-3 py-0.5 uppercase tracking-wider">
                             <span>Admin Mode</span>
@@ -148,7 +187,7 @@ const CatalogClassicViewInner: FC<{}> = () =>
                                 } }>
                                     <div className={ `flex items-center gap-1 ${ isHidden ? 'opacity-40' : '' }` }>
                                         <CatalogIconView icon={ child.iconId } />
-                                        <span className="truncate">{ child.localization }</span>
+                                        <span className="nitro-catalog-classic-tab-label truncate">{ child.localization }</span>
                                         { adminMode && isHidden && <FaEyeSlash className="text-[8px] text-danger ml-1" /> }
                                         { adminMode &&
                                             <div className="flex items-center gap-0.5 ml-1" onClick={ e => e.stopPropagation() }>
@@ -172,7 +211,7 @@ const CatalogClassicViewInner: FC<{}> = () =>
                             );
                         }) }
                         { isMod &&
-                            <NitroCardTabsItemView isActive={ adminMode } onClick={ () => setAdminMode(!adminMode) }>
+                            <NitroCardTabsItemView classNames={ [ 'nitro-catalog-classic-admin-tab' ] } isActive={ adminMode } onClick={ () => setAdminMode(!adminMode) }>
                                 <FaCog className={ `text-[10px] ${ adminMode ? 'animate-spin' : '' }` } style={ adminMode ? { animationDuration: '3s' } : {} } />
                             </NitroCardTabsItemView> }
                     </NitroCardTabsView>

src/components/catalog/CatalogModernView.tsx

@@ -1,331 +0,0 @@
-import { AddLinkEventTracker, ILinkEventTracker, RemoveLinkEventTracker } from '@nitrots/nitro-renderer';
-import { FC, useEffect, useState } from 'react';
-import { FaCog, FaEdit, FaEye, FaEyeSlash, FaHeart, FaPlus, FaStar, FaTrash } from 'react-icons/fa';
-import { CatalogType, LocalizeText } from '../../api';
-import { NitroCardContentView, NitroCardHeaderView, NitroCardView } from '../../common';
-import { useCatalogActions, useCatalogData, useCatalogFavorites, useCatalogUiState, useHasPermission } from '../../hooks';
-import { CatalogAdminProvider, useCatalogAdmin } from './CatalogAdminContext';
-import { CatalogAdminOfferEditView } from './views/admin/CatalogAdminOfferEditView';
-import { CatalogAdminPageEditView } from './views/admin/CatalogAdminPageEditView';
-import { CatalogBuildersClubStatusView } from './views/catalog-header/CatalogBuildersClubStatusView';
-import { CatalogIconView } from './views/catalog-icon/CatalogIconView';
-import { CatalogFavoritesView } from './views/favorites/CatalogFavoritesView';
-import { CatalogGiftView } from './views/gift/CatalogGiftView';
-import { CatalogNavigationView } from './views/navigation/CatalogNavigationView';
-import { CatalogSearchView } from './views/page/common/CatalogSearchView';
-import { GetCatalogLayout } from './views/page/layout/GetCatalogLayout';
-import { MarketplacePostOfferView } from './views/page/layout/marketplace/MarketplacePostOfferView';
-
-const CatalogModernViewInner: FC<{}> = () =>
-{
-    const { rootNode = null, currentPage = null, searchResult = null } = useCatalogData();
-    const { isVisible = false, setIsVisible = null, navigationHidden = false, setNavigationHidden = null, activeNodes = [], setSearchResult = null, currentType = CatalogType.NORMAL } = useCatalogUiState();
-    const { openPageByName = null, openPageByOfferId = null, activateNode = null, openCatalogByType = null, toggleCatalogByType = null } = useCatalogActions();
-    const catalogAdmin = useCatalogAdmin();
-    const adminMode = catalogAdmin?.adminMode ?? false;
-    const setAdminMode = catalogAdmin?.setAdminMode ?? (() =>
-    {});
-    const hasPendingChanges = catalogAdmin?.hasPendingChanges ?? false;
-    const publishCatalog = catalogAdmin?.publishCatalog ?? (() =>
-    {});
-    const loading = catalogAdmin?.loading ?? false;
-    const { favoriteOfferIds, favoritePageIds } = useCatalogFavorites();
-    const [ showFavorites, setShowFavorites ] = useState(false);
-
-    const isMod = useHasPermission('acc_catalogfurni');
-    const totalFavs = favoriteOfferIds.length + favoritePageIds.length;
-    const buildersClubHeaderStyle = (currentType === CatalogType.BUILDER)
-        ? { borderColor: '#d79d2e', borderBottomColor: '#000', background: 'linear-gradient(180deg, #d89f2d 0%, #c68515 100%)' }
-        : undefined;
-
-    useEffect(() =>
-    {
-        const getCatalogTypeFromLink = (type?: string) =>
-        {
-            switch((type || '').toLowerCase())
-            {
-                case 'bc':
-                case 'builder':
-                case 'buildersclub':
-                case 'builders_club':
-                    return CatalogType.BUILDER;
-                default:
-                    return CatalogType.NORMAL;
-            }
-        };
-
-        const linkTracker: ILinkEventTracker = {
-            linkReceived: (url: string) =>
-            {
-                const parts = url.split('/');
-
-                if(parts.length < 2) return;
-
-                switch(parts[1])
-                {
-                    case 'show':
-                        if(parts.length > 2)
-                        {
-                            openCatalogByType(getCatalogTypeFromLink(parts[2]));
-
-                            return;
-                        }
-
-                        setIsVisible(true);
-                        return;
-                    case 'hide':
-                        setIsVisible(false);
-                        return;
-                    case 'toggle':
-                        if(parts.length > 2)
-                        {
-                            toggleCatalogByType(getCatalogTypeFromLink(parts[2]));
-
-                            return;
-                        }
-
-                        setIsVisible(prevValue => !prevValue);
-                        return;
-                    case 'open':
-                        if(parts.length > 2)
-                        {
-                            if(parts.length === 4)
-                            {
-                                switch(parts[2])
-                                {
-                                    case 'offerId':
-                                        openPageByOfferId(parseInt(parts[3]));
-                                        return;
-                                }
-                            }
-                            else
-                            {
-                                openPageByName(parts[2]);
-                            }
-                        }
-                        else
-                        {
-                            setIsVisible(true);
-                        }
-
-                        return;
-                }
-            },
-            eventUrlPrefix: 'catalog/'
-        };
-
-        AddLinkEventTracker(linkTracker);
-
-        return () => RemoveLinkEventTracker(linkTracker);
-    }, [ setIsVisible, openPageByOfferId, openPageByName, openCatalogByType, toggleCatalogByType ]);
-
-    return (
-        <>
-            { isVisible &&
-                <NitroCardView className="nitro-catalog w-[780px] h-[520px]" uniqueKey="catalog">
-                    <NitroCardHeaderView className={ currentType === CatalogType.BUILDER ? 'builders-club-card-header' : '' } headerText={ LocalizeText('catalog.title') } onCloseClick={ () => setIsVisible(false) } style={ buildersClubHeaderStyle } />
-                    <NitroCardContentView classNames={ [ 'p-0!', 'overflow-hidden!' ] }>
-                        { /* Admin banner */ }
-                        { adminMode &&
-                            <div className="flex items-center justify-between bg-warning text-dark text-[10px] font-bold px-3 py-0.5 uppercase tracking-wider" style={ { textShadow: '0 1px 0 rgba(255,255,255,0.3)' } }>
-                                <span>⚙ Admin Mode</span>
-                                <button
-                                    className={ `px-3 py-0.5 rounded text-[10px] font-bold uppercase cursor-pointer transition-all ${ hasPendingChanges ? 'bg-success text-white animate-pulse shadow-md' : 'bg-white/50 text-dark hover:bg-success hover:text-white' }` }
-                                    disabled={ loading }
-                                    onClick={ () => publishCatalog() }
-                                >
-                                    { loading ? '...' : hasPendingChanges ? '⬆ Publish' : '⬆ Publish' }
-                                </button>
-                            </div> }
-
-                        <CatalogBuildersClubStatusView />
-                        <div className="flex min-h-0 flex-1">
-                            { /* === LEFT SIDEBAR === */ }
-                            <div className="group/rail flex flex-col w-[52px] hover:w-[175px] min-w-[52px] bg-card-grid-item border-r-2 border-card-grid-item-border py-1.5 gap-px overflow-y-auto overflow-x-hidden transition-[width] duration-200 ease-in-out">
-
-                                { /* Favorites toggle */ }
-                                <div
-                                    className={ `flex items-center gap-2 mx-1 px-1.5 py-1.5 rounded cursor-pointer transition-all duration-150 ${ showFavorites ? 'bg-primary text-white' : 'hover:bg-card-grid-item-active' }` }
-                                    onClick={ () => setShowFavorites(!showFavorites) }
-                                >
-                                    <div className="w-7 h-6 flex items-center justify-center shrink-0 relative">
-                                        <FaHeart className={ `text-xs ${ showFavorites ? 'text-white' : totalFavs > 0 ? 'text-danger' : 'text-muted' }` } />
-                                        { totalFavs > 0 &&
-                                            <span className="absolute -top-1 -right-1 min-w-[14px] h-[14px] bg-danger text-white text-[8px] font-bold rounded-full flex items-center justify-center px-0.5 leading-none">
-                                                { totalFavs }
-                                            </span> }
-                                    </div>
-                                    <span className={ `text-[11px] font-bold whitespace-nowrap opacity-0 group-hover/rail:opacity-100 transition-opacity duration-200 ${ showFavorites ? 'text-white' : '' }` }>{ LocalizeText('catalog.favorites') }</span>
-                                </div>
-
-                                <div className="border-b border-card-grid-item-border mx-2 my-0.5" />
-
-                                { /* Admin: root page actions */ }
-                                { adminMode && rootNode &&
-                                    <div className="flex items-center gap-1 mx-1 px-1.5 py-1 opacity-0 group-hover/rail:opacity-100 transition-opacity">
-                                        <button
-                                            className="flex items-center gap-1 text-[9px] text-success hover:text-green-800 cursor-pointer transition-colors"
-                                            title={ LocalizeText('catalog.admin.new.root.category') }
-                                            onClick={ () => catalogAdmin.createPage({ caption: 'New Category', captionSave: 'New Category', catalogMode: currentType, pageLayout: 'default_3x3', iconImage: 0, minRank: 1, visible: '1', enabled: '1', orderNum: 99, parentId: rootNode.pageId }) }
-                                        >
-                                            <FaPlus className="text-[8px]" />
-                                            <span className="whitespace-nowrap">{ LocalizeText('catalog.admin.new') }</span>
-                                        </button>
-                                        <button
-                                            className="flex items-center gap-1 text-[9px] text-primary hover:text-dark cursor-pointer transition-colors"
-                                            title={ LocalizeText('catalog.admin.edit.root') }
-                                            onClick={ () =>
-                                            {
-                                                catalogAdmin.setEditingPageNode(null); catalogAdmin.setEditingRootPage(true); catalogAdmin.setEditingPageData(true);
-                                            } }
-                                        >
-                                            <FaEdit className="text-[8px]" />
-                                            <span className="whitespace-nowrap">{ LocalizeText('catalog.admin.root') }</span>
-                                        </button>
-                                    </div> }
-
-                                { /* Category icons */ }
-                                { rootNode && rootNode.children.length > 0 && rootNode.children.map((child, index) =>
-                                {
-                                    if(!adminMode && !child.isVisible) return null;
-
-                                    const isHidden = !child.isVisible;
-
-                                    return (
-                                        <div
-                                            key={ `${ child.pageId }-${ index }` }
-                                            className={ `group/cat flex items-center gap-2 mx-1 px-1.5 py-1 rounded cursor-pointer transition-all duration-150 ${ isHidden ? 'opacity-40' : '' } ${ child.isActive ? 'bg-card-grid-item-active border border-card-grid-item-border-active shadow-inner1px' : 'border border-transparent hover:bg-card-grid-item-active' }` }
-                                            title={ adminMode ? `${ child.localization } [ID: ${ child.pageId }]${ isHidden ? ` (${ LocalizeText('catalog.admin.hidden') })` : '' }` : child.localization }
-                                            onClick={ () =>
-                                            {
-                                                if(searchResult) setSearchResult(null);
-                                                if(showFavorites) setShowFavorites(false);
-                                                activateNode(child);
-                                            } }
-                                        >
-                                            <div className="w-7 h-6 flex items-center justify-center shrink-0 relative">
-                                                <CatalogIconView icon={ child.iconId } />
-                                                { isHidden && <FaEyeSlash className="absolute -bottom-0.5 -right-0.5 text-[7px] text-danger" /> }
-                                            </div>
-                                            <span className={ `text-[11px] whitespace-nowrap overflow-hidden truncate opacity-0 group-hover/rail:opacity-100 transition-opacity duration-200 flex-1 ${ child.isActive ? 'font-bold text-dark' : 'text-gray-700' }` }>
-                                                { child.localization }
-                                            </span>
-                                            { /* Admin actions on each root category */ }
-                                            { adminMode &&
-                                                <div className="flex items-center gap-1 opacity-0 group-hover/rail:opacity-100 transition-opacity shrink-0">
-                                                    <div
-                                                        className="w-[18px] h-[18px] rounded flex items-center justify-center hover:bg-primary/20 cursor-pointer transition-colors"
-                                                        title={ `${ LocalizeText('catalog.admin.edit.title') } "${ child.localization }"` }
-                                                        onClick={ e =>
-                                                        {
-                                                            e.stopPropagation();
-                                                            catalogAdmin.setEditingPageNode(child);
-                                                            catalogAdmin.setEditingRootPage(false);
-                                                            catalogAdmin.setEditingPageData(true);
-                                                        } }
-                                                    >
-                                                        <FaEdit className="text-[9px] text-primary" />
-                                                    </div>
-                                                    <div
-                                                        className="w-[18px] h-[18px] rounded flex items-center justify-center hover:bg-warning/20 cursor-pointer transition-colors"
-                                                        title={ isHidden ? LocalizeText('catalog.admin.show') : LocalizeText('catalog.admin.hide') }
-                                                        onClick={ e =>
-                                                        {
-                                                            e.stopPropagation();
-                                                            catalogAdmin.togglePageVisible(child.pageId);
-                                                        } }
-                                                    >
-                                                        { isHidden
-                                                            ? <FaEye className="text-[9px] text-success" />
-                                                            : <FaEyeSlash className="text-[9px] text-muted" /> }
-                                                    </div>
-                                                    <div
-                                                        className="w-[18px] h-[18px] rounded flex items-center justify-center hover:bg-danger/20 cursor-pointer transition-colors"
-                                                        title={ `${ LocalizeText('catalog.admin.delete.title') } "${ child.localization }"` }
-                                                        onClick={ e =>
-                                                        {
-                                                            e.stopPropagation();
-                                                            if(confirm(LocalizeText('catalog.admin.delete.category.confirm', [ 'name' ], [ child.localization ])))
-                                                            {
-                                                                catalogAdmin.deletePage(child.pageId);
-                                                            }
-                                                        } }
-                                                    >
-                                                        <FaTrash className="text-[9px] text-danger" />
-                                                    </div>
-                                                </div> }
-                                        </div>
-                                    );
-                                }) }
-                            </div>
-
-                            { /* === MAIN AREA === */ }
-                            <div className="flex flex-col flex-1 overflow-hidden bg-light">
-                                { /* Toolbar: search + admin */ }
-                                <div className="flex items-center gap-2 px-2 py-1.5 bg-card-tab-item border-b border-card-grid-item-border">
-                                    { /* Breadcrumb */ }
-                                    <div className="flex items-center gap-1 text-[11px] text-gray-600 min-w-0 flex-1">
-                                        <FaStar className="text-[9px] text-primary shrink-0" />
-                                        { activeNodes && activeNodes.length > 0
-                                            ? activeNodes.map((node, i) => (
-                                                <span key={ `${ node.pageId }-${ i }` } className="flex items-center gap-1 min-w-0">
-                                                    { i > 0 && <span className="text-[8px] opacity-30">›</span> }
-                                                    <span className={ `truncate ${ i === activeNodes.length - 1 ? 'font-bold text-dark' : 'cursor-pointer hover:text-primary' }` }
-                                                        onClick={ i < activeNodes.length - 1 ? () => activateNode(node) : undefined }>
-                                                        { node.localization }
-                                                    </span>
-                                                </span>
-                                            ))
-                                            : <span className="text-muted">{ LocalizeText('catalog.title') }</span> }
-                                    </div>
-
-                                    <div className="w-[180px] shrink-0">
-                                        <CatalogSearchView />
-                                    </div>
-
-                                    { isMod &&
-                                        <button
-                                            className={ `flex items-center gap-1 px-2 py-1 rounded text-[10px] font-bold cursor-pointer transition-all border ${ adminMode ? 'bg-warning text-dark border-warning shadow-inner1px' : 'bg-card-grid-item text-gray-600 border-card-grid-item-border hover:bg-primary hover:text-white hover:border-primary' }` }
-                                            onClick={ () => setAdminMode(!adminMode) }
-                                        >
-                                            <FaCog className={ `${ adminMode ? 'animate-spin' : '' }` } style={ adminMode ? { animationDuration: '3s' } : {} } />
-                                            { LocalizeText('catalog.admin') }
-                                        </button> }
-                                </div>
-
-                                { /* Content area */ }
-                                <div className="flex flex-1 overflow-hidden">
-                                    { showFavorites
-                                        ? <div className="flex-1 overflow-auto nitro-card-content-shell">
-                                            <CatalogFavoritesView onClose={ () => setShowFavorites(false) } />
-                                        </div>
-                                        : <>
-                                            { !navigationHidden && activeNodes && activeNodes.length > 0 &&
-                                                <div className="w-[170px] min-w-[170px] border-r-2 border-card-grid-item-border bg-card-grid-item overflow-y-auto py-1">
-                                                    <CatalogNavigationView node={ activeNodes[0] } />
-                                                </div> }
-                                            <div className="flex-1 overflow-auto p-2 nitro-card-content-shell">
-                                                { adminMode && <CatalogAdminPageEditView /> }
-                                                { GetCatalogLayout(currentPage, () => setNavigationHidden(true)) }
-                                            </div>
-                                        </> }
-                                </div>
-                            </div>
-                        </div>
-                    </NitroCardContentView>
-                </NitroCardView> }
-            <CatalogAdminOfferEditView />
-            <CatalogGiftView />
-            <MarketplacePostOfferView />
-        </>
-    );
-};
-
-export const CatalogModernView: FC<{}> = () =>
-{
-    return (
-        <CatalogAdminProvider>
-            <CatalogModernViewInner />
-        </CatalogAdminProvider>
-    );
-};

src/components/catalog/CatalogView.tsx

@@ -1,20 +1,10 @@
 import { FC } from 'react';
-import { GetConfigurationValue } from '../../api';
 import { useCatalogData } from '../../hooks';
 import { CatalogClassicView } from './CatalogClassicView';
-import { CatalogModernView } from './CatalogModernView';
 
 export const CatalogView: FC<{}> = () =>
 {
     const { catalogLocalizationVersion = 0 } = useCatalogData();
-    const useNewStyle = GetConfigurationValue<boolean>('catalog.style.new', false);
-
-    if(useNewStyle) return (
-        <>
-            <div className="hidden" data-catalog-localization-version={ catalogLocalizationVersion } />
-            <CatalogModernView />
-        </>
-    );
 
     return (
         <>

src/components/catalog/views/page/layout/CatalogLayoutDefaultView.tsx

@@ -1,5 +1,5 @@
 import { FC } from 'react';
-import { FaEdit, FaPlus } from 'react-icons/fa';
+import { FaEdit, FaPlus, FaPowerOff, FaSyncAlt } from 'react-icons/fa';
 import { GetConfigurationValue, LocalizeText, ProductTypeEnum, SanitizeHtml } from '../../../../../api';
 import { Text } from '../../../../../common';
 import { useCatalogData } from '../../../../../hooks';
@@ -17,13 +17,12 @@ import { CatalogLayoutProps } from './CatalogLayout.types';
 export const CatalogLayoutDefaultView: FC<CatalogLayoutProps> = props =>
 {
     const { page = null } = props;
-    const { currentOffer = null, currentPage = null } = useCatalogData();
+    const { currentOffer = null, currentPage = null, roomPreviewer = null } = useCatalogData();
     const catalogAdmin = useCatalogAdmin();
     const adminMode = catalogAdmin?.adminMode ?? false;
 
     return (
         <div className="nitro-catalog-classic-default-layout flex flex-col h-full gap-2">
-            { /* Admin: quick actions */ }
             { adminMode && !catalogAdmin.editingPageData &&
                 <div className="flex gap-2 nitro-catalog-classic-default-admin">
                     <button
@@ -42,23 +41,24 @@ export const CatalogLayoutDefaultView: FC<CatalogLayoutProps> = props =>
                         <FaPlus className="text-[10px]" /> { LocalizeText('catalog.admin.offer.new') }
                     </button>
                 </div> }
-
-            { /* Product detail card */ }
             { currentOffer &&
-                <div className="nitro-catalog-classic-offer-panel flex gap-0 overflow-hidden">
-                    { /* Preview area */ }
+                <div className="nitro-catalog-classic-offer-panel flex gap-0 shrink-0">
                     <div className="nitro-catalog-classic-offer-preview relative flex items-center justify-center">
                         { (currentOffer.product.productType !== ProductTypeEnum.BADGE) &&
                             <>
+                                <button className="nitro-catalog-classic-preview-btn nitro-catalog-classic-preview-rotate" onClick={ () => roomPreviewer?.changeRoomObjectDirection() }>
+                                    <FaSyncAlt /> Rotate
+                                </button>
+                                <button className="nitro-catalog-classic-preview-btn nitro-catalog-classic-preview-state" onClick={ () => roomPreviewer?.changeRoomObjectState() }>
+                                    <FaPowerOff /> Toggle State
+                                </button>
                                 <CatalogViewProductWidgetView />
                                 <CatalogAddOnBadgeWidgetView className="bg-muted rounded bottom-1 right-1 absolute" />
                             </> }
                         { (currentOffer.product.productType === ProductTypeEnum.BADGE) &&
                             <CatalogAddOnBadgeWidgetView className="scale-2" /> }
                     </div>
-                    { /* Product info + purchase */ }
                     <div className="nitro-catalog-classic-offer-info flex flex-col flex-1 min-w-0 gap-2">
-                        { /* Title row */ }
                         <div>
                             <div className="flex items-start justify-between gap-2">
                                 <Text className="text-[13px]! font-bold text-dark leading-tight">{ currentOffer.localizationName }</Text>
@@ -77,19 +77,16 @@ export const CatalogLayoutDefaultView: FC<CatalogLayoutProps> = props =>
                                 </div> }
                             <CatalogLimitedItemWidgetView />
                         </div>
-                        { /* Price */ }
                         <CatalogTotalPriceWidget />
-                        { /* Spinner */ }
                         <CatalogSpinnerWidgetView />
-                        { /* Actions */ }
-                        <div className="flex gap-1.5 mt-auto">
+                        <div className="nitro-catalog-classic-offer-actions flex gap-1.5">
                             <CatalogPurchaseWidgetView />
                         </div>
                     </div>
                 </div> }
 
             { !currentOffer &&
-                <div className="nitro-catalog-classic-welcome flex items-center gap-3">
+                <div className="nitro-catalog-classic-welcome flex items-center gap-3 shrink-0">
                     { !!page.localization.getImage(1) &&
                         <img className="w-[70px] h-[70px] object-contain rounded shrink-0" src={ page.localization.getImage(1) } /> }
                     <Text className="text-[11px]! text-muted" dangerouslySetInnerHTML={ { __html: SanitizeHtml(page.localization.getText(0)) } } />

src/components/catalog/views/page/layout/CatalogLayoutTrophiesView.tsx

@@ -58,9 +58,11 @@ export const CatalogLayoutTrophiesView: FC<CatalogLayoutProps> = props =>
                     </button>
                 </div> }
 
-            { /* Selected trophy card */ }
+            { /* Selected trophy card. shrink-0 + no overflow-hidden so the
+                 Buy button stays inside the panel even when the grid below
+                 holds many trophies. */ }
             { currentOffer
-                ? <div className="flex gap-0 bg-white rounded border-2 border-warning/40 overflow-hidden" style={ { boxShadow: '0 0 8px rgba(255,193,7,0.15)' } }>
+                ? <div className="flex gap-0 bg-white rounded border-2 border-warning/40 shrink-0" style={ { boxShadow: '0 0 8px rgba(255,193,7,0.15)' } }>
                     { /* Preview */ }
                     <div className="w-[120px] min-w-[120px] relative flex items-center justify-center border-r-2 border-warning/30" style={ { background: 'linear-gradient(180deg, #fff9e6 0%, #fff3cc 100%)' } }>
                         { (currentOffer.product.productType !== ProductTypeEnum.BADGE)
@@ -90,7 +92,7 @@ export const CatalogLayoutTrophiesView: FC<CatalogLayoutProps> = props =>
                         <CatalogTotalPriceWidget />
                         { !canPurchase &&
                             <span className="text-[9px] text-warning italic">{ LocalizeText('catalog.trophies.write.hint') }</span> }
-                        <div className="flex gap-1.5 mt-auto">
+                        <div className="flex gap-1.5">
                             <CatalogPurchaseWidgetView />
                         </div>
                     </div>

src/components/catalog/views/page/widgets/CatalogPurchaseWidgetView.tsx

@@ -240,7 +240,7 @@ export const CatalogPurchaseWidgetView: FC<CatalogPurchaseWidgetViewProps> = pro
                 return <Button variant="danger">{ LocalizeText('generic.failed') + ' - ' + LocalizeText('catalog.alert.limited_edition_sold_out.title') }</Button>;
             case CatalogPurchaseState.NONE:
             default:
-                return <Button disabled={ (purchaseOptions.extraParamRequired && (!purchaseOptions.extraData || !purchaseOptions.extraData.length)) } onClick={ event => setPurchaseState(CatalogPurchaseState.CONFIRM) }>{ LocalizeText('catalog.purchase_confirmation.' + (currentOffer.isRentOffer ? 'rent' : 'buy')) }</Button>;
+                return <Button variant="success" disabled={ (purchaseOptions.extraParamRequired && (!purchaseOptions.extraData || !purchaseOptions.extraData.length)) } onClick={ event => setPurchaseState(CatalogPurchaseState.CONFIRM) }>{ LocalizeText('catalog.purchase_confirmation.' + (currentOffer.isRentOffer ? 'rent' : 'buy')) }</Button>;
         }
     };
 

src/components/catalog/views/page/widgets/CatalogViewProductWidgetView.tsx

@@ -19,6 +19,8 @@ export const CatalogViewProductWidgetView: FC<{}> = props =>
         if(!product) return;
 
         roomPreviewer.reset(false);
+        roomPreviewer.updateObjectRoom('default', 'default', 'default');
+        roomPreviewer.updateRoomWallsAndFloorVisibility(true, true);
 
         switch(product.productType)
         {
@@ -68,6 +70,8 @@ export const CatalogViewProductWidgetView: FC<{}> = props =>
             case ProductTypeEnum.WALL: {
                 if(!product.furnitureData) return;
 
+                roomPreviewer.updateRoomWallsAndFloorVisibility(true, true);
+
                 switch(product.furnitureData.specialType)
                 {
                     case FurniCategory.FLOOR:

src/components/inventory/InventoryView.tsx

@@ -1,5 +1,6 @@
 import { AddLinkEventTracker, BadgePointLimitsEvent, GetLocalizationManager, GetRoomEngine, ILinkEventTracker, IRoomSession, RemoveLinkEventTracker, RoomEngineObjectEvent, RoomEngineObjectPlacedEvent, RoomPreviewer, RoomSessionEvent } from '@nitrots/nitro-renderer';
-import { FC, useEffect, useState } from 'react';
+import { FC, ReactNode, useEffect, useState } from 'react';
+import { FaAward, FaCouch, FaPaw, FaRobot, FaTag } from 'react-icons/fa';
 import { GroupItem, LocalizeText, UnseenItemCategory, isObjectMoverRequested, setObjectMoverRequested } from '../../api';
 import { NitroCardHeaderView, NitroCardTabsItemView, NitroCardTabsView, NitroCardView } from '../../common';
 import { useInventoryBadges, useInventoryFurni, useInventoryPrefixes, useInventoryTrade, useInventoryUnseenTracker, useMessageEvent, useNitroEvent } from '../../hooks';
@@ -19,6 +20,13 @@ const TAB_BADGES: string = 'inventory.badges';
 const TAB_PREFIXES: string = 'inventory.prefixes';
 const TABS = [ TAB_FURNITURE, TAB_PETS, TAB_BADGES, TAB_PREFIXES, TAB_BOTS ];
 const UNSEEN_CATEGORIES = [ UnseenItemCategory.FURNI, UnseenItemCategory.PET, UnseenItemCategory.BADGE, UnseenItemCategory.PREFIX, UnseenItemCategory.BOT ];
+const TAB_ICONS: Record<string, ReactNode> = {
+    [TAB_FURNITURE]: <FaCouch />,
+    [TAB_PETS]: <FaPaw />,
+    [TAB_BADGES]: <FaAward />,
+    [TAB_PREFIXES]: <FaTag />,
+    [TAB_BOTS]: <FaRobot />
+};
 
 export const InventoryView: FC<{}> = props =>
 {
@@ -129,13 +137,13 @@ export const InventoryView: FC<{}> = props =>
 
     return (
         <>
-            <NitroCardView className="w-[528px] h-[420px] min-w-[528px] min-h-[420px]" uniqueKey="inventory">
+            <NitroCardView className="nitro-inventory-window w-[528px] h-[420px] min-w-[528px] min-h-[420px]" uniqueKey="inventory">
                 <NitroCardHeaderView
                     headerText={ LocalizeText('inventory.title') }
                     onCloseClick={ onClose } />
                 { !isTrading &&
                     <>
-                        <NitroCardTabsView>
+                        <NitroCardTabsView classNames={ [ 'nitro-inventory-tabs-shell' ] }>
                             { TABS.map((name, index) =>
                             {
                                 return (
@@ -144,12 +152,13 @@ export const InventoryView: FC<{}> = props =>
                                         count={ getCount(UNSEEN_CATEGORIES[index]) }
                                         isActive={ (currentTab === name) }
                                         onClick={ event => setCurrentTab(name) }>
-                                        { LocalizeText(name) }
+                                        <span className="nitro-inventory-tab-icon" title={ LocalizeText(name) }>{ TAB_ICONS[name] }</span>
+                                        <span className="nitro-inventory-tab-label">{ LocalizeText(name) }</span>
                                     </NitroCardTabsItemView>
                                 );
                             }) }
                         </NitroCardTabsView>
-                        <div className="flex flex-col overflow-hidden bg-[#DFDFDF] p-2 h-full gap-2">
+                        <div className="nitro-inventory-body flex flex-col overflow-hidden p-2 h-full gap-2">
                             { showFilter &&
                                 <InventoryCategoryFilterView
                                     badgeCodes={ badgeCodes }
@@ -175,7 +184,7 @@ export const InventoryView: FC<{}> = props =>
                         </div>
                     </> }
                 { isTrading &&
-                    <div className="flex flex-col overflow-hidden bg-[#DFDFDF] p-2 h-full">
+                    <div className="nitro-inventory-body flex flex-col overflow-hidden p-2 h-full">
                         <InventoryTradeView cancelTrade={ onClose } />
                     </div> }
             </NitroCardView>

src/components/inventory/views/InventoryCategoryFilterView.tsx

@@ -87,7 +87,7 @@ export const InventoryCategoryFilterView: FC<InventoryCategoryFilterViewProps> =
 
     return (
         <div
-            className="flex gap-1 rounded p-1 bg-[#C9C9C9] shrink-0"
+            className="nitro-inventory-filter-bar flex gap-1 rounded p-1 shrink-0"
             style={ { width: currentTab === TAB_BADGES ? '320px' : '100%' } }>
             <div className="relative flex flex-1 items-center">
                 <NitroInput

src/components/inventory/views/bot/InventoryBotView.tsx

@@ -69,8 +69,10 @@ export const InventoryBotView: FC<{
             <div className="flex flex-col col-span-7 gap-1 overflow-hidden">
                 <InfiniteGrid<IBotItem>
                     columnCount={ 4 }
+                    estimateSize={ 110 }
                     itemRender={ item => <InventoryBotItemView botItem={ item } /> }
-                    items={ botItems } />
+                    items={ botItems }
+                    rowGap={ 4 } />
             </div>
             <div className="flex flex-col col-span-5">
                 <div className="relative flex flex-col">
@@ -80,7 +82,7 @@ export const InventoryBotView: FC<{
                         <div className="flex flex-col justify-between gap-2 grow">
                             <span className="truncate grow">{ selectedBot.botData.name }</span>
                             { !!roomSession &&
-                                <NitroButton onClick={ event => attemptBotPlacement(selectedBot) }>
+                                <NitroButton className="nitro-inventory-btn-place" onClick={ event => attemptBotPlacement(selectedBot) }>
                                     { LocalizeText('inventory.furni.placetoroom') }
                                 </NitroButton> }
                         </div> }

src/components/inventory/views/furniture/InventoryFurnitureView.tsx

@@ -1,7 +1,7 @@
 import { InfiniteGrid } from '@layout/InfiniteGrid';
 import { GetRoomEngine, GetSessionDataManager, IRoomSession, RoomObjectVariable, RoomPreviewer, Vector3d } from '@nitrots/nitro-renderer';
 import { FC, useEffect, useState } from 'react';
-import { FaTrashAlt } from 'react-icons/fa';
+import { FaPowerOff, FaSyncAlt, FaTrashAlt } from 'react-icons/fa';
 import { DispatchUiEvent, FurniCategory, GroupItem, LocalizeText, UnseenItemCategory, attemptItemPlacement } from '../../../../api';
 import { LayoutLimitedEditionCompactPlateView, LayoutRarityLevelView, LayoutRoomPreviewerView } from '../../../../common';
 import { CatalogPostMarketplaceOfferEvent, DeleteItemConfirmEvent } from '../../../../events';
@@ -49,22 +49,24 @@ export const InventoryFurnitureView: FC<{
 
         if(!furnitureItem) return;
 
-        const roomEngine = GetRoomEngine();
-
-        let wallType = roomEngine.getRoomInstanceVariable<string>(roomEngine.activeRoomId, RoomObjectVariable.ROOM_WALL_TYPE);
-        let floorType = roomEngine.getRoomInstanceVariable<string>(roomEngine.activeRoomId, RoomObjectVariable.ROOM_FLOOR_TYPE);
-        let landscapeType = roomEngine.getRoomInstanceVariable<string>(roomEngine.activeRoomId, RoomObjectVariable.ROOM_LANDSCAPE_TYPE);
-
-        wallType = (wallType && wallType.length) ? wallType : '101';
-        floorType = (floorType && floorType.length) ? floorType : '101';
-        landscapeType = (landscapeType && landscapeType.length) ? landscapeType : '1.1';
-
         roomPreviewer.reset(false);
-        roomPreviewer.updateObjectRoom(floorType, wallType, landscapeType);
-        roomPreviewer.updateRoomWallsAndFloorVisibility(true, true);
 
-        if((furnitureItem.category === FurniCategory.WALL_PAPER) || (furnitureItem.category === FurniCategory.FLOOR) || (furnitureItem.category === FurniCategory.LANDSCAPE))
+        const isRoomDecoration = (furnitureItem.category === FurniCategory.WALL_PAPER) || (furnitureItem.category === FurniCategory.FLOOR) || (furnitureItem.category === FurniCategory.LANDSCAPE);
+
+        if(isRoomDecoration)
         {
+            const roomEngine = GetRoomEngine();
+
+            let wallType = roomEngine.getRoomInstanceVariable<string>(roomEngine.activeRoomId, RoomObjectVariable.ROOM_WALL_TYPE);
+            let floorType = roomEngine.getRoomInstanceVariable<string>(roomEngine.activeRoomId, RoomObjectVariable.ROOM_FLOOR_TYPE);
+            let landscapeType = roomEngine.getRoomInstanceVariable<string>(roomEngine.activeRoomId, RoomObjectVariable.ROOM_LANDSCAPE_TYPE);
+
+            wallType = (wallType && wallType.length) ? wallType : '101';
+            floorType = (floorType && floorType.length) ? floorType : '101';
+            landscapeType = (landscapeType && landscapeType.length) ? landscapeType : '1.1';
+
+            roomPreviewer.updateRoomWallsAndFloorVisibility(true, true);
+
             floorType = ((furnitureItem.category === FurniCategory.FLOOR) ? selectedItem.stuffData.getLegacyString() : floorType);
             wallType = ((furnitureItem.category === FurniCategory.WALL_PAPER) ? selectedItem.stuffData.getLegacyString() : wallType);
             landscapeType = ((furnitureItem.category === FurniCategory.LANDSCAPE) ? selectedItem.stuffData.getLegacyString() : landscapeType);
@@ -77,17 +79,20 @@ export const InventoryFurnitureView: FC<{
 
                 if(data) roomPreviewer.addWallItemIntoRoom(data.id, new Vector3d(90, 0, 0), data.customParams);
             }
+
+            return;
+        }
+
+        roomPreviewer.updateObjectRoom('default', 'default', 'default');
+        roomPreviewer.updateRoomWallsAndFloorVisibility(true, true);
+
+        if(selectedItem.isWallItem)
+        {
+            roomPreviewer.addWallItemIntoRoom(selectedItem.type, new Vector3d(90), furnitureItem.stuffData.getLegacyString());
         }
         else
         {
-            if(selectedItem.isWallItem)
-            {
-                roomPreviewer.addWallItemIntoRoom(selectedItem.type, new Vector3d(90), furnitureItem.stuffData.getLegacyString());
-            }
-            else
-            {
-                roomPreviewer.addFurnitureIntoRoom(selectedItem.type, new Vector3d(90), selectedItem.stuffData, (furnitureItem.extra.toString()));
-            }
+            roomPreviewer.addFurnitureIntoRoom(selectedItem.type, new Vector3d(90), selectedItem.stuffData, (furnitureItem.extra.toString()));
         }
     }, [ roomPreviewer, selectedItem ]);
 
@@ -129,6 +134,15 @@ export const InventoryFurnitureView: FC<{
             <div className="flex flex-col col-span-5">
                 <div className="relative flex flex-col">
                     <LayoutRoomPreviewerView height={ 140 } roomPreviewer={ roomPreviewer } />
+                    { selectedItem &&
+                        <>
+                            <button className="nitro-inventory-preview-btn nitro-inventory-preview-rotate" onClick={ () => roomPreviewer?.changeRoomObjectDirection() }>
+                                <FaSyncAlt /> Rotate
+                            </button>
+                            <button className="nitro-inventory-preview-btn nitro-inventory-preview-state" onClick={ () => roomPreviewer?.changeRoomObjectState() }>
+                                <FaPowerOff /> Toggle State
+                            </button>
+                        </> }
                     { selectedItem &&
                         <NitroButton
                             className="bg-danger! hover:bg-danger/80! absolute bottom-2 inset-e-2 p-1"
@@ -147,11 +161,11 @@ export const InventoryFurnitureView: FC<{
                             <span className="text-xs truncate">{ selectedItem.description }</span> }
                         <div className="flex flex-col gap-1">
                             { !!roomSession &&
-                                <NitroButton onClick={ event => attemptItemPlacement(selectedItem) }>
+                                <NitroButton className="nitro-inventory-btn-place" onClick={ event => attemptItemPlacement(selectedItem) }>
                                     { LocalizeText('inventory.furni.placetoroom') }
                                 </NitroButton> }
                             { selectedItem.isSellable &&
-                                <NitroButton onClick={ event => attemptPlaceMarketplaceOffer(selectedItem) }>
+                                <NitroButton className="nitro-inventory-btn-sell" onClick={ event => attemptPlaceMarketplaceOffer(selectedItem) }>
                                     { LocalizeText('inventory.marketplace.sell') }
                                 </NitroButton> }
                         </div>

src/components/inventory/views/pet/InventoryPetView.tsx

@@ -84,6 +84,8 @@ export const InventoryPetView: FC<{
             <div className="flex flex-col col-span-7 gap-1 overflow-hidden">
                 <InfiniteGrid<IPetItem>
                     columnCount={ 6 }
+                    estimateSize={ 46 }
+                    itemMinWidth={ 46 }
                     itemRender={ item => <InventoryPetItemView petItem={ item } /> }
                     items={ petItems } />
             </div>
@@ -101,7 +103,7 @@ export const InventoryPetView: FC<{
                         <div className="flex flex-col justify-between gap-2 grow">
                             <span className="text-sm truncate grow">{ selectedPet.petData.name }</span>
                             { !!roomSession &&
-                                <NitroButton onClick={ event => attemptPetPlacement(selectedPet) }>
+                                <NitroButton className="nitro-inventory-btn-place" onClick={ event => attemptPetPlacement(selectedPet) }>
                                     { LocalizeText('inventory.furni.placetoroom') }
                                 </NitroButton> }
                         </div> }

src/components/rare-values/RareValuesView.tsx

@@ -1,10 +1,12 @@
 import { AddLinkEventTracker, GetRoomEngine, GetSessionDataManager, ILinkEventTracker, IRareValue, RemoveLinkEventTracker } from '@nitrots/nitro-renderer';
-import { FC, useEffect, useMemo, useState } from 'react';
+import { FC, useEffect, useMemo, useRef, useState } from 'react';
 import { LocalizeFormattedNumber, LocalizeText } from '../../api';
 import { Column, Flex, LayoutCurrencyIcon, LayoutImage, Text } from '../../common';
 import { useRareValues } from '../../hooks';
 import { NitroCard, NitroInput } from '../../layout';
 
+const PAGE_SIZE = 50;
+
 interface RareValueRow
 {
     spriteId: number;
@@ -17,7 +19,10 @@ export const RareValuesView: FC<{}> = () =>
 {
     const [ isVisible, setIsVisible ] = useState(false);
     const [ searchValue, setSearchValue ] = useState('');
+    const [ visibleCount, setVisibleCount ] = useState(PAGE_SIZE);
     const { values = null, loaded = false } = useRareValues();
+    const scrollRef = useRef<HTMLDivElement>(null);
+    const sentinelRef = useRef<HTMLDivElement>(null);
 
     useEffect(() =>
     {
@@ -79,35 +84,94 @@ export const RareValuesView: FC<{}> = () =>
         return rows.filter(row => row.name.toLocaleLowerCase().includes(query));
     }, [ rows, searchValue ]);
 
+    // Reset paging when the underlying list changes (typed in search, data loaded).
+    useEffect(() =>
+    {
+        setVisibleCount(PAGE_SIZE);
+        if(scrollRef.current) scrollRef.current.scrollTop = 0;
+    }, [ filtered ]);
+
+    // Infinite scroll: grow visibleCount by PAGE_SIZE whenever the sentinel
+    // enters the viewport. The root is the scroll container so the trigger
+    // fires reliably inside an in-app modal (no document scroll).
+    useEffect(() =>
+    {
+        if(!isVisible) return;
+        if(visibleCount >= filtered.length) return;
+
+        const sentinel = sentinelRef.current;
+        const root = scrollRef.current;
+        if(!sentinel || !root) return;
+
+        const observer = new IntersectionObserver(entries =>
+        {
+            if(entries.some(entry => entry.isIntersecting))
+            {
+                setVisibleCount(prev => Math.min(prev + PAGE_SIZE, filtered.length));
+            }
+        }, { root, rootMargin: '120px 0px' });
+
+        observer.observe(sentinel);
+        return () => observer.disconnect();
+    }, [ isVisible, visibleCount, filtered.length ]);
+
     if(!isVisible) return null;
 
+    const visibleRows = filtered.slice(0, visibleCount);
+    const hasMore = visibleCount < filtered.length;
+
     return (
-        <NitroCard className="w-[420px] h-[480px]" uniqueKey="rare-values">
+        <NitroCard className="w-[460px] h-[520px]" uniqueKey="rare-values">
             <NitroCard.Header
                 headerText={ LocalizeText('rarevalues.title') }
                 onCloseClick={ () => setIsVisible(false) } />
             <NitroCard.Content>
-                <Column gap={ 2 } className="h-full p-1">
-                    <NitroInput
-                        placeholder={ LocalizeText('generic.search') }
-                        value={ searchValue }
-                        onChange={ event => setSearchValue(event.target.value) } />
-                    <Column gap={ 0 } overflow="auto" className="grow">
+                <Column gap={ 2 } className="h-full p-2">
+                    <Flex alignItems="center" gap={ 2 } className="rounded border border-black/10 bg-white px-2 py-1 shadow-inner">
+                        <span className="text-black/40">🔍</span>
+                        <NitroInput
+                            placeholder={ LocalizeText('generic.search') }
+                            value={ searchValue }
+                            onChange={ event => setSearchValue(event.target.value) }
+                            className="grow !border-0 !bg-transparent !p-0 !shadow-none focus:!ring-0" />
+                    </Flex>
+                    { loaded &&
+                        <Flex alignItems="center" justifyContent="between" className="px-1 text-[11px] text-black/55">
+                            <span>{ filtered.length } { LocalizeText('rarevalues.title').toLowerCase() }</span>
+                            { hasMore && <span>{ visibleRows.length } / { filtered.length }</span> }
+                        </Flex> }
+                    <div
+                        ref={ scrollRef }
+                        className="grow overflow-auto rounded border border-black/10 bg-gradient-to-b from-[#f6f8fb] to-[#eaf1f6] shadow-inner">
                         { !loaded &&
-                            <Text center className="mt-2 text-black/60">{ LocalizeText('rarevalues.loading') }</Text> }
+                            <div className="p-6 text-center">
+                                <Text className="text-black/55">{ LocalizeText('rarevalues.loading') }</Text>
+                            </div> }
                         { (loaded && !filtered.length) &&
-                            <Text center className="mt-2 text-black/60">{ LocalizeText('rarevalues.empty') }</Text> }
-                        { filtered.map(row => (
-                            <Flex key={ row.spriteId } alignItems="center" gap={ 2 } className="border-b border-black/10 py-1.5 hover:bg-black/5">
-                                <LayoutImage imageUrl={ row.iconUrl } className="h-10 w-10 shrink-0 bg-contain bg-center bg-no-repeat" />
-                                <Text truncate className="grow text-[#1f2d34]">{ row.name }</Text>
-                                <Flex alignItems="center" gap={ 1 } className="shrink-0">
-                                    <Text bold textEnd className="text-[#2f6f95]">{ LocalizeFormattedNumber(row.value.points) }</Text>
+                            <div className="p-6 text-center">
+                                <Text className="text-black/55">{ LocalizeText('rarevalues.empty') }</Text>
+                            </div> }
+                        { visibleRows.map((row, index) => (
+                            <Flex
+                                key={ row.spriteId }
+                                alignItems="center"
+                                gap={ 2 }
+                                className={ `border-b border-black/[0.06] px-2 py-1.5 transition-colors hover:bg-[#cfe4f1] ${ index % 2 ? 'bg-white/60' : 'bg-[#e9f1f7]' }` }>
+                                <div className="flex h-11 w-11 shrink-0 items-center justify-center rounded border border-black/10 bg-white shadow-sm">
+                                    <LayoutImage imageUrl={ row.iconUrl } className="h-9 w-9 bg-contain bg-center bg-no-repeat" />
+                                </div>
+                                <Text truncate className="grow text-[13px] font-medium text-[#1f2d34]">{ row.name }</Text>
+                                <Flex alignItems="center" gap={ 1 } className="shrink-0 rounded-full bg-white/80 px-2 py-0.5 shadow-sm">
+                                    <Text bold textEnd className="text-[13px] text-[#2f6f95]">{ LocalizeFormattedNumber(row.value.points) }</Text>
                                     <LayoutCurrencyIcon type={ row.value.pointsType } />
                                 </Flex>
                             </Flex>
                         )) }
-                    </Column>
+                        { hasMore &&
+                            <div ref={ sentinelRef } className="flex items-center justify-center py-3">
+                                <Text small className="text-black/45">{ LocalizeText('rarevalues.loading.more') }</Text>
+                            </div> }
+                    </div>
                 </Column>
             </NitroCard.Content>
         </NitroCard>

src/components/toolbar/ToolbarView.tsx

@@ -362,9 +362,6 @@ export const ToolbarView: FC<{ isInRoom: boolean }> = props =>
                         { (getTotalUnseen > 0) &&
                             <LayoutItemCountView count={ getTotalUnseen } className="pointer-events-none absolute -right-1 -top-1 z-10" /> }
                     </motion.div>
-                    <motion.div variants={ itemVariants }>
-                        <ToolbarItemView icon="buildersclub" onClick={ () => CreateLinkEvent('catalog/toggle/builder') } className="tb-icon" />
-                    </motion.div>
                     <motion.div variants={ itemVariants } className="relative">
                         <ToolbarItemView icon="inventory" onClick={ () => CreateLinkEvent('inventory/toggle') } className="tb-icon" />
                         { (getFullCount > 0) &&
@@ -384,10 +381,6 @@ export const ToolbarView: FC<{ isInRoom: boolean }> = props =>
                         <motion.div variants={ itemVariants }>
                             <ToolbarItemView icon="wired-tools" onClick={ openMonitor } className="tb-icon" />
                         </motion.div> }
-                    { isInRoom &&
-                        <motion.div variants={ itemVariants }>
-                            <ToolbarItemView icon="camera" onClick={ () => CreateLinkEvent('camera/toggle') } className="tb-icon" />
-                        </motion.div> }
                     { (isInRoom && youtubeEnabled) &&
                         <motion.div variants={ itemVariants }>
                             <ToolbarItemView icon="youtube" onClick={ openYouTubePlayer } className="tb-icon" />
@@ -396,20 +389,6 @@ export const ToolbarView: FC<{ isInRoom: boolean }> = props =>
                         <motion.div variants={ itemVariants }>
                             <ToolbarItemView icon="soundboard" onClick={ () => CreateLinkEvent('soundboard/toggle') } className="tb-icon" />
                         </motion.div> }
-                    { isMod &&
-                        <motion.div variants={ itemVariants } className="relative">
-                            <ToolbarItemView icon="modtools" onClick={ () => CreateLinkEvent('mod-tools/toggle') } className="tb-icon" />
-                            { (openTicketsCount > 0) &&
-                                <LayoutItemCountView count={ openTicketsCount } className="pointer-events-none absolute -right-1 -top-1 z-10" /> }
-                        </motion.div> }
-                    { (isHk && hkEnabled) &&
-                        <motion.div variants={ itemVariants }>
-                            <ToolbarItemView icon="housekeeping" onClick={ () => CreateLinkEvent('housekeeping/toggle') } className="tb-icon" />
-                        </motion.div> }
-                    { isMod &&
-                        <motion.div variants={ itemVariants }>
-                            <ToolbarItemView icon="furnieditor" onClick={ () => CreateLinkEvent('furni-editor/toggle') } className="tb-icon" />
-                        </motion.div> }
                     <motion.div variants={ itemVariants } className="relative">
                         <ToolbarItemView icon="friendall" onClick={ () => CreateLinkEvent('friends/toggle') } className="tb-icon" />
                         { (requests.length > 0) &&
@@ -417,6 +396,38 @@ export const ToolbarView: FC<{ isInRoom: boolean }> = props =>
                     </motion.div>
                 </motion.div>
             </motion.div>
+            { /* Mobile side tools — moved out of the bottom bar into a
+                 vertical pill stack on the left edge so the bottom bar has
+                 room. Always present (Builders Club), plus camera in-room
+                 and the staff-only tools when permitted. */ }
+            <motion.div
+                initial="hidden"
+                animate={ visibilityVariant }
+                variants={ mobileNavVariants }
+                transition={ NAV_TRANSITION }
+                className={ `fixed left-1 top-1/2 z-40 flex -translate-y-1/2 flex-col items-center gap-2 rounded-[12px] border border-white/8 bg-[rgba(10,10,12,0.58)] px-[4px] py-[6px] shadow-[0_6px_18px_rgba(0,0,0,0.18)] ${ mobileOnlyClasses }` }>
+                <motion.div variants={ itemVariants }>
+                    <ToolbarItemView icon="buildersclub" onClick={ () => CreateLinkEvent('catalog/toggle/builder') } className="tb-icon" />
+                </motion.div>
+                { isInRoom &&
+                    <motion.div variants={ itemVariants }>
+                        <ToolbarItemView icon="camera" onClick={ () => CreateLinkEvent('camera/toggle') } className="tb-icon" />
+                    </motion.div> }
+                { isMod &&
+                    <motion.div variants={ itemVariants } className="relative">
+                        <ToolbarItemView icon="modtools" onClick={ () => CreateLinkEvent('mod-tools/toggle') } className="tb-icon" />
+                        { (openTicketsCount > 0) &&
+                            <LayoutItemCountView count={ openTicketsCount } className="pointer-events-none absolute -right-1 -top-1 z-10" /> }
+                    </motion.div> }
+                { (isHk && hkEnabled) &&
+                    <motion.div variants={ itemVariants }>
+                        <ToolbarItemView icon="housekeeping" onClick={ () => CreateLinkEvent('housekeeping/toggle') } className="tb-icon" />
+                    </motion.div> }
+                { isMod &&
+                    <motion.div variants={ itemVariants }>
+                        <ToolbarItemView icon="furnieditor" onClick={ () => CreateLinkEvent('furni-editor/toggle') } className="tb-icon" />
+                    </motion.div> }
+            </motion.div>
         </>
     );
 };
@@ -494,6 +505,14 @@ const TOOLBAR_STYLES = `
     flex-wrap: nowrap;
   }
 
+  /* Keep each icon at its natural size so the mobile bar scrolls
+     horizontally instead of squashing the items into each other.
+     (Default flex-shrink:1 let the fixed-size icon backgrounds overlap
+     once enough icons were present to exceed the bar width.) */
+  .tb-bar-scroll > * {
+    flex-shrink: 0;
+  }
+
   .tb-bar-scroll::-webkit-scrollbar {
     display: none;
   }

src/css/catalog/CatalogClassicView.css

@@ -1,10 +1,29 @@
 .nitro-catalog-classic-window {
+    --cat-blue: #4b7a94;
+    --cat-blue-dark: #385d73;
+    --cat-ink: #233a47;
+    --cat-strip: #d9e2e8;
+    --cat-tab: #b7c7d1;
+    --cat-tab-border: #7a9cb0;
+    --cat-panel: #eef2f5;
+    --cat-sub: #e1e7ec;
+    --cat-line: #b7c7d1;
+    --cat-canvas: #d4dadf;
+    --cat-canvas-2: #c9cfd4;
+    --cat-select: #3a82a7;
+    --cat-select-bg: #f0f5f8;
+    --cat-gold: #f7d673;
+    --cat-gold-border: #d4af37;
+    --cat-gold-ink: #4a3300;
+    --cat-buy: #009900;
+
     width: 640px !important;
     height: 600px !important;
     max-width: 640px !important;
     min-width: 640px !important;
     min-height: 600px !important;
     max-height: 600px !important;
+    background: #ffffff !important;
 }
 
 .nitro-catalog-classic-window .nitro-card-title {
@@ -17,6 +36,12 @@
     max-height: 38px;
 }
 
+.nitro-catalog-classic-window .nitro-card-header {
+    background: var(--cat-blue);
+    border-color: var(--cat-blue);
+    border-bottom-color: var(--cat-ink);
+}
+
 .nitro-catalog-classic-admin-banner {
     border-bottom: 1px solid rgba(0, 0, 0, 0.18);
     background: linear-gradient(180deg, #f4d45d 0%, #d8b43e 100%);
@@ -24,41 +49,47 @@
 
 .nitro-catalog-classic-tabs-shell {
     flex-wrap: nowrap;
-    gap: 1px;
-    min-height: 30px;
-    max-height: 30px;
-    padding: 0 6px;
+    gap: 2px;
+    min-height: 32px;
+    max-height: 32px;
+    padding: 4px 6px 0;
     overflow-x: auto;
     overflow-y: hidden;
     align-items: end;
-    background: #e7e8df;
-    border-bottom: 1px solid #b8beb4;
+    background: var(--cat-strip);
+    border-bottom: 2px solid var(--cat-ink);
 }
 
 .nitro-catalog-classic-tabs-shell .nitro-card-tab-item {
     min-height: 28px;
-    padding: 5px 10px 4px;
-    border: 1px solid #8f8f8b;
+    padding: 5px 12px 4px;
+    border: 1px solid var(--cat-tab-border);
     border-bottom: 0;
     border-radius: 5px 5px 0 0;
-    background: linear-gradient(180deg, #fafaf7 0%, #dde2d9 100%);
-    box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.9);
+    background: var(--cat-tab);
+    color: var(--cat-ink);
+    box-shadow: none;
     white-space: nowrap;
+    font-weight: 700;
 }
 
 .nitro-catalog-classic-tabs-shell .nitro-card-tab-item:hover {
-    background: linear-gradient(180deg, #ffffff 0%, #e7ece4 100%);
+    background: #c7d4dd;
 }
 
 .nitro-catalog-classic-tabs-shell .nitro-card-tab-item-active {
-    background: #f2f2eb;
-    transform: translateY(0);
+    background: #ffffff;
+    color: #000000;
     position: relative;
     top: 1px;
+    border-color: var(--cat-ink);
+    box-shadow: inset 0 -1px 0 #ffffff;
+    font-weight: 700;
 }
 
 .nitro-catalog-classic-content-shell {
     padding: 6px 8px 8px !important;
+    background: #ffffff !important;
 }
 
 .nitro-catalog-classic-stage {
@@ -82,75 +113,82 @@
 }
 
 .nitro-catalog-classic-search-shell {
-    padding: 3px;
-    border: 1px solid #a7aba1;
+    padding: 4px;
+    border: 1px solid var(--cat-line);
     border-radius: 4px;
-    background: linear-gradient(180deg, #f9f8f2 0%, #eaede5 100%);
+    background: var(--cat-panel);
 }
 
 .nitro-catalog-classic-search-shell input {
-    height: 18px;
+    height: 20px;
     padding-top: 0 !important;
     padding-bottom: 0 !important;
     border-width: 1px !important;
-    border-color: #8f9588 !important;
+    border-color: var(--cat-tab-border) !important;
     border-radius: 3px !important;
     background: #fff !important;
-    box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.08);
+    box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.06);
 }
 
 .nitro-catalog-classic-search-shell svg {
-    color: #61645b !important;
+    color: #5b7080 !important;
 }
 
 .nitro-catalog-classic-navigation-shell {
     flex: 1 1 auto;
     min-height: 0;
-    padding: 3px 2px 3px 3px;
-    border: 1px solid #a7aba1;
+    padding: 4px 0;
+    border: 1px solid var(--cat-line);
     border-radius: 4px;
-    background: linear-gradient(180deg, #f1f2ec 0%, #d8ddd3 100%);
+    background: var(--cat-panel);
     overflow: auto;
 }
 
 .nitro-catalog-classic-navigation-list {
     display: flex;
     flex-direction: column;
-    gap: 2px;
+    gap: 0;
 }
 
-.nitro-catalog-classic-navigation-node.is-child {
-    margin-left: 10px;
+.nitro-catalog-classic-navigation-node.is-child .nitro-catalog-classic-navigation-item {
+    padding-left: 22px;
+    background: var(--cat-sub);
 }
 
 .nitro-catalog-classic-navigation-item {
     display: flex;
     align-items: center;
-    gap: 4px;
-    min-height: 21px;
-    padding: 1px 6px 1px 5px;
-    border: 1px solid #bdc2ba;
-    border-radius: 4px;
-    background: linear-gradient(180deg, #f6f7f2 0%, #e6e9e1 100%);
-    color: #2e2e2e;
+    gap: 6px;
+    min-height: 28px;
+    padding: 4px 10px;
+    border: 0;
+    border-left: 4px solid transparent;
+    border-radius: 0;
+    background: transparent;
+    color: var(--cat-ink);
+    font-weight: 700;
     cursor: pointer;
-    transition: background-color 0.12s ease, border-color 0.12s ease;
+    transition: background-color 0.12s ease;
+}
+
+.nitro-catalog-classic-navigation-node.is-child .nitro-catalog-classic-navigation-item {
+    font-weight: 400;
 }
 
 .nitro-catalog-classic-navigation-item:hover {
-    background: linear-gradient(180deg, #ffffff 0%, #ebeee6 100%);
-    border-color: #9ea79b;
+    background: #dde6ec;
 }
 
 .nitro-catalog-classic-navigation-item.is-active {
-    background: linear-gradient(180deg, #dae7f0 0%, #c4d2de 100%);
-    border-color: #8e9ba5;
+    background: #ffffff;
+    border-left-color: var(--cat-blue);
+    color: #000000;
     font-weight: 700;
 }
 
 .nitro-catalog-classic-navigation-item.is-drag-over {
-    outline: 2px solid rgba(48, 114, 140, 0.35);
-    outline-offset: 1px;
+    outline: 2px solid rgba(58, 130, 167, 0.4);
+    outline-offset: -2px;
 }
 
 .nitro-catalog-classic-navigation-icon {
@@ -188,7 +226,7 @@
 }
 
 .nitro-catalog-classic-navigation-caret {
-    color: #676d66 !important;
+    color: #5b7080 !important;
 }
 
 .nitro-catalog-classic-layout-shell {
@@ -197,9 +235,9 @@
     min-width: 0;
     min-height: 0;
     height: 100%;
-    border: 1px solid #a7aba1;
+    border: 1px solid var(--cat-line);
     border-radius: 4px;
-    background: linear-gradient(180deg, #eceee7 0%, #dfe4da 100%);
+    background: #ffffff;
     overflow: hidden;
 }
 
@@ -207,26 +245,28 @@
     display: flex;
     flex-direction: column;
     gap: 3px;
-    min-height: 66px;
-    padding: 5px 7px;
-    border-bottom: 1px solid #c8cdc3;
-    background: linear-gradient(180deg, #f6f6f2 0%, #e9ece4 100%);
+    flex-shrink: 0;
+    min-height: 0;
+    padding: 6px 8px;
+    border-bottom: 1px solid var(--cat-line);
+    background: #ffffff;
 }
 
 .nitro-catalog-classic-layout-hero {
     display: flex;
     align-items: center;
     justify-content: center;
-    flex: 1 1 auto;
+    flex: 0 0 auto;
     min-height: 32px;
-    overflow: hidden;
+    overflow: visible;
 }
 
 .nitro-catalog-classic-layout-hero img {
-    max-width: 100%;
-    max-height: 32px;
+    display: block;
     width: auto;
     height: auto;
+    max-width: 100%;
+    max-height: none;
     object-fit: contain;
 }
 
@@ -234,7 +274,7 @@
     flex: 1 1 auto;
     min-height: 0;
     padding: 6px;
-    background: #f2f2eb;
+    background: #ffffff;
     overflow: hidden;
 }
 
@@ -244,24 +284,42 @@
 
 .nitro-catalog-classic-offer-panel,
 .nitro-catalog-classic-welcome {
-    border: 1px solid #bfc4bc;
+    border: 1px solid var(--cat-line);
     border-radius: 6px;
-    background: linear-gradient(180deg, #ffffff 0%, #f3f3ed 100%);
-    box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.92);
+    background: #ffffff;
+}
+
+.nitro-catalog-classic-offer-panel {
+    min-height: 132px;
+    overflow: hidden;
 }
 
 .nitro-catalog-classic-offer-preview {
-    width: 136px;
-    min-width: 136px;
+    width: 190px;
+    min-width: 190px;
     padding: 8px;
-    border-right: 1px solid #c9cec5;
-    background: linear-gradient(180deg, #eef2ea 0%, #dde3d8 100%);
+    border-right: 1px solid var(--cat-line);
+    background-color: var(--cat-canvas);
 }
 
 .nitro-catalog-classic-offer-info {
     padding: 10px;
 }
 
+.nitro-catalog-classic-offer-actions {
+    justify-content: flex-end;
+}
+
+.nitro-catalog-classic-offer-info .rounded-full {
+    background: var(--cat-gold) !important;
+    border-color: var(--cat-gold-border) !important;
+}
+
+.nitro-catalog-classic-offer-info .rounded-full,
+.nitro-catalog-classic-offer-info .rounded-full * {
+    color: var(--cat-gold-ink) !important;
+}
+
 .nitro-catalog-classic-welcome {
     min-height: 128px;
     padding: 10px;
@@ -269,31 +327,40 @@
 
 .nitro-catalog-classic-grid-shell {
     min-height: 150px;
-    padding: 4px;
-    border: 1px solid #bcc2b8;
+    padding: 6px;
+    border: 1px solid var(--cat-line);
     border-radius: 6px;
-    background: linear-gradient(180deg, #f5f5f0 0%, #e4e7de 100%);
+    background: #ffffff;
     height: auto;
     flex: 1 1 auto;
 }
 
 .nitro-catalog-classic-grid {
-    gap: 4px !important;
+    gap: 6px !important;
     align-content: start;
 }
 
 .nitro-catalog-classic-window .layout-grid-item {
     height: 54px;
-    border: 1px solid #b8beb6 !important;
-    border-radius: 6px !important;
-    background-color: #d7dde2;
+    border: 1px solid var(--cat-line) !important;
+    border-radius: 4px !important;
+    background-color: #ffffff;
     background-image: none;
-    box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.55);
+    box-shadow: none;
+    transition: background-color 0.12s ease, border-color 0.12s ease, box-shadow 0.12s ease;
+}
+
+.nitro-catalog-classic-window .layout-grid-item:hover {
+    background-color: var(--cat-select-bg) !important;
+    border-color: var(--cat-select) !important;
+    box-shadow: 0 0 0 1px rgba(58, 130, 167, 0.2);
 }
 
 .nitro-catalog-classic-window .layout-grid-item.is-active {
-    background-color: #e5ebef !important;
-    border-color: #8f978b !important;
+    background-color: var(--cat-select-bg) !important;
+    border-color: var(--cat-select) !important;
+    border-width: 2px !important;
+    box-shadow: 0 0 0 1px rgba(58, 130, 167, 0.35);
 }
 
 .nitro-catalog-classic-grid-offer-icon {
@@ -305,21 +372,12 @@
 }
 
 .nitro-catalog-classic-window .nitro-catalog-header {
-    justify-content: flex-start;
-    min-height: 56px;
-    margin-bottom: 6px;
-    padding: 4px 6px;
-    border: 1px solid #bec3ba;
-    border-radius: 6px;
-    background: linear-gradient(180deg, #ffffff 0%, #f2f2ec 100%);
+    display: none;
 }
 
-.nitro-catalog-classic-window .nitro-catalog-header img {
-    max-width: 100%;
-    max-height: 48px;
-    width: auto;
-    height: auto;
-    object-fit: contain;
+.nitro-catalog-classic-offer-info .bg-\[\#00800b\] {
+    background-color: var(--cat-buy) !important;
+    border-color: #007a00 !important;
 }
 
 .nitro-catalog-classic-breadcrumb {
@@ -328,7 +386,7 @@
     gap: 5px;
     min-height: 16px;
     overflow: hidden;
-    color: #666a63;
+    color: #5b7080;
     font-size: 10px;
     line-height: 1;
     white-space: nowrap;
@@ -342,7 +400,7 @@
 }
 
 .nitro-catalog-classic-breadcrumb-separator {
-    color: #9ea395;
+    color: #94a7b3;
 }
 
 .nitro-catalog-classic-navigation-shell::-webkit-scrollbar,
@@ -352,36 +410,37 @@
 
 .nitro-catalog-classic-navigation-shell::-webkit-scrollbar-track,
 .nitro-catalog-classic-layout-container :is(.overflow-auto, .nitro-card-content-shell, .nitro-catalog-classic-grid-shell)::-webkit-scrollbar-track {
-    border-left: 1px solid #c2c6be;
-    background: #dde2d8;
+    border-left: 1px solid var(--cat-line);
+    background: var(--cat-panel);
 }
 
 .nitro-catalog-classic-navigation-shell::-webkit-scrollbar-thumb,
 .nitro-catalog-classic-layout-container :is(.overflow-auto, .nitro-card-content-shell, .nitro-catalog-classic-grid-shell)::-webkit-scrollbar-thumb {
-    border: 1px solid #7d8680;
+    border: 1px solid var(--cat-tab-border);
     border-radius: 6px;
-    background: linear-gradient(180deg, #a8b3ae 0%, #89948f 100%);
+    background: linear-gradient(180deg, #a9bcc9 0%, #89a0ae 100%);
 }
 
 .nitro-catalog-classic-navigation-shell::-webkit-scrollbar-button:single-button:vertical:decrement,
 .nitro-catalog-classic-layout-container :is(.overflow-auto, .nitro-card-content-shell, .nitro-catalog-classic-grid-shell)::-webkit-scrollbar-button:single-button:vertical:decrement {
     height: 12px;
-    background: #dde2d8;
+    background: var(--cat-panel);
 }
 
 .nitro-catalog-classic-navigation-shell::-webkit-scrollbar-button:single-button:vertical:increment,
 .nitro-catalog-classic-layout-container :is(.overflow-auto, .nitro-card-content-shell, .nitro-catalog-classic-grid-shell)::-webkit-scrollbar-button:single-button:vertical:increment {
     height: 12px;
-    background: #dde2d8;
+    background: var(--cat-panel);
 }
 
-@media (max-width: 991.98px) {
+@media (max-width: 1024px) and (min-width: 641px) {
     .nitro-catalog-classic-window {
-        width: min(calc(100vw - 16px), 570px) !important;
+        width: min(calc(100vw - 24px), 720px) !important;
         min-width: 0 !important;
-        height: min(calc(100vh - 16px), 635px) !important;
+        max-width: calc(100vw - 24px) !important;
+        height: min(calc(100vh - 24px), 720px) !important;
         min-height: 0 !important;
-        max-width: calc(100vw - 16px) !important;
+        max-height: calc(100vh - 24px) !important;
     }
 
     .nitro-catalog-classic-stage {
@@ -389,6 +448,267 @@
     }
 
     .nitro-catalog-classic-sidebar {
-        max-height: 180px;
+        max-height: 200px;
+    }
+}
+
+.nitro-catalog-classic-mobile-header {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    z-index: 5;
+    display: flex;
+    align-items: center;
+    height: 38px;
+    padding: 0 44px 0 8px;
+    pointer-events: none;
+}
+
+.nitro-catalog-classic-mobile-burger {
+    position: relative;
+    pointer-events: auto;
+}
+
+.nitro-catalog-classic-burger-btn {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 26px;
+    height: 26px;
+    border: 0;
+    border-radius: 5px;
+    background: rgba(0, 0, 0, 0.2);
+    color: #fff;
+    font-size: 13px;
+    cursor: pointer;
+}
+
+.nitro-catalog-classic-burger-btn:hover {
+    background: rgba(0, 0, 0, 0.3);
+}
+
+.nitro-catalog-classic-burger-btn:active {
+    background: rgba(0, 0, 0, 0.36);
+}
+
+.nitro-catalog-classic-burger-menu {
+    position: absolute;
+    top: 32px;
+    left: 0;
+    z-index: 60;
+    display: flex;
+    flex-direction: column;
+    gap: 4px;
+    min-width: 150px;
+    padding: 6px;
+    border: 1px solid var(--cat-line);
+    border-radius: 6px;
+    background: #fff;
+    box-shadow: 0 6px 18px rgba(0, 0, 0, 0.28);
+}
+
+.nitro-catalog-classic-burger-menu button {
+    padding: 8px 10px;
+    border: 0;
+    border-radius: 4px;
+    background: var(--cat-strip);
+    color: var(--cat-ink);
+    font-weight: 700;
+    text-align: left;
+    cursor: pointer;
+}
+
+.nitro-catalog-classic-burger-menu button:disabled {
+    opacity: 0.6;
+}
+
+.nitro-catalog-classic-mobile-currency {
+    margin-left: auto;
+    display: flex;
+    align-items: center;
+    gap: 5px;
+    pointer-events: auto;
+}
+
+.nitro-catalog-classic-coin {
+    display: flex;
+    align-items: center;
+    gap: 3px;
+    padding: 3px 7px;
+    border-radius: 11px;
+    background: rgba(0, 0, 0, 0.25);
+    color: #fff;
+    font-size: 10px;
+    font-weight: 700;
+}
+
+.nitro-catalog-classic-coin span {
+    color: #fff;
+}
+
+.nitro-catalog-classic-admin-tab {
+    display: none !important;
+}
+
+.nitro-catalog-classic-preview-btn {
+    position: absolute;
+    top: 8px;
+    z-index: 4;
+    display: inline-flex;
+    align-items: center;
+    gap: 5px;
+    padding: 5px 10px;
+    border: 1px solid #555;
+    border-radius: 5px;
+    background: rgba(0, 0, 0, 0.7);
+    color: #fff;
+    font-size: 11px;
+    font-weight: 700;
+    white-space: nowrap;
+    cursor: pointer;
+}
+
+.nitro-catalog-classic-preview-btn:hover {
+    background: rgba(0, 0, 0, 0.82);
+}
+
+.nitro-catalog-classic-preview-btn:active {
+    background: rgba(0, 0, 0, 0.9);
+}
+
+.nitro-catalog-classic-preview-rotate {
+    left: 8px;
+}
+
+.nitro-catalog-classic-preview-state {
+    right: 8px;
+}
+
+@media (max-width: 640px) {
+    .nitro-catalog-classic-window {
+        width: 100vw !important;
+        min-width: 0 !important;
+        max-width: 100vw !important;
+        height: 100vh !important;
+        min-height: 0 !important;
+        max-height: 100vh !important;
+        border-radius: 0 !important;
+    }
+
+    .draggable-window:has(> .nitro-catalog-classic-window) {
+        transform: none !important;
+        left: 0 !important;
+        top: 0 !important;
+    }
+
+    .nitro-catalog-classic-window .nitro-card-title {
+        display: none;
+    }
+
+    .nitro-catalog-classic-mobile-currency {
+        position: absolute;
+        left: 50%;
+        margin-left: 0;
+        transform: translateX(-50%);
+    }
+
+    .nitro-catalog-classic-tabs-shell {
+        min-height: 44px;
+        max-height: 44px;
+        padding: 4px 4px 0;
+        -webkit-overflow-scrolling: touch;
+    }
+
+    .nitro-catalog-classic-tabs-shell .nitro-card-tab-item {
+        min-height: 42px;
+        padding: 6px 12px;
+        font-size: 12px;
+        justify-content: center;
+    }
+
+    .nitro-catalog-classic-tab-label {
+        display: none;
+    }
+
+    .nitro-catalog-classic-content-shell {
+        padding: 6px !important;
+    }
+
+    .nitro-catalog-classic-layout-hero {
+        display: none;
+    }
+
+    .nitro-catalog-classic-offer-panel {
+        flex-direction: column;
+    }
+
+    .nitro-catalog-classic-offer-preview {
+        width: 100%;
+        min-width: 0;
+        border-right: 0;
+        border-bottom: 1px solid var(--cat-line);
+    }
+
+    .nitro-catalog-classic-stage {
+        grid-template-columns: minmax(0, 1fr);
+        gap: 6px;
+    }
+
+    .nitro-catalog-classic-sidebar {
+        max-height: 33vh;
+    }
+
+    .nitro-catalog-classic-search-shell input {
+        height: 28px;
+        font-size: 13px;
+    }
+
+    .nitro-catalog-classic-navigation-item {
+        min-height: 40px;
+        padding: 6px 12px;
+    }
+
+    .nitro-catalog-classic-navigation-label {
+        font-size: 13px;
+    }
+
+    .nitro-catalog-classic-window .layout-grid-item {
+        height: 64px;
+    }
+
+    .nitro-catalog-classic-window .nitro-card-header-shell,
+    .nitro-catalog-classic-window .nitro-card-content-shell {
+        border-radius: 0 !important;
+    }
+}
+
+@media (max-height: 480px) {
+    .nitro-catalog-classic-window {
+        height: 100vh !important;
+        max-height: 100vh !important;
+    }
+
+    .nitro-catalog-classic-window .nitro-card-header-shell {
+        min-height: 32px;
+        max-height: 32px;
+    }
+
+    .nitro-catalog-classic-tabs-shell {
+        min-height: 38px;
+        max-height: 38px;
+    }
+
+    .nitro-catalog-classic-layout-header-shell {
+        min-height: 0;
+        padding: 3px 6px;
+    }
+
+    .nitro-catalog-classic-layout-hero {
+        display: none;
+    }
+
+    .nitro-catalog-classic-sidebar {
+        max-height: 26vh;
     }
 }

src/css/inventory/InventoryView.css

@@ -0,0 +1,238 @@
+.nitro-inventory-window {
+    --inv-blue: #4a7d8c;
+    --inv-beige: #e2e0d6;
+    --inv-tab: #c7c5ba;
+    --inv-line: #919088;
+    --inv-accent: #4a7d8c;
+    --inv-place: #5ca843;
+    --inv-place-dark: #397025;
+    --inv-place-light: #8ee374;
+    --inv-sell: #d13e31;
+    --inv-sell-dark: #881e15;
+    --inv-sell-light: #f07e74;
+    --inv-border: #6b6f73;
+
+    background: var(--inv-beige) !important;
+}
+
+.nitro-inventory-window .nitro-card-header {
+    background: var(--inv-blue);
+    border-color: var(--inv-blue);
+    border-bottom-color: var(--inv-border);
+    box-shadow: inset 0 2px 0 #709da9, inset 0 -2px 0 #315863;
+}
+
+.nitro-inventory-window .nitro-inventory-tabs-shell {
+    background: var(--inv-beige);
+    gap: 4px;
+    padding: 6px 8px 0;
+    border-bottom: 1px solid #b9c4ca;
+}
+
+.nitro-inventory-window .nitro-inventory-tabs-shell .nitro-card-tab-item {
+    background: var(--inv-tab);
+    border: 1px solid #aeb9bf;
+    border-bottom: 0;
+    border-radius: 6px 6px 0 0;
+    color: #8a9aa2;
+    font-weight: 600;
+    box-shadow: inset 1px 1px 0 #fff;
+}
+
+.nitro-inventory-window .nitro-inventory-tabs-shell .nitro-card-tab-item:hover {
+    background: #d2d0c6;
+    color: #6b7d86;
+}
+
+.nitro-inventory-window .nitro-inventory-tabs-shell .nitro-card-tab-item-active {
+    background: #fff;
+    color: #566a74;
+    border-color: #93a1a8;
+    position: relative;
+    top: 1px;
+}
+
+.nitro-inventory-window .nitro-inventory-tab-icon {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    margin-right: 5px;
+    font-size: 14px;
+    line-height: 1;
+}
+
+.nitro-inventory-window .nitro-inventory-body {
+    background: var(--inv-beige);
+}
+
+.nitro-inventory-window .nitro-inventory-filter-bar {
+    background: #fff;
+    border: 2px solid var(--inv-border);
+    border-radius: 4px;
+}
+
+.nitro-inventory-window .nitro-inventory-filter-bar select {
+    background: var(--inv-beige);
+    border: 2px solid var(--inv-border) !important;
+    border-radius: 4px;
+    font-weight: 700;
+}
+
+.nitro-inventory-window .bg-card-grid-item {
+    background-color: var(--inv-beige) !important;
+}
+
+.nitro-inventory-window .border-card-grid-item-border {
+    border-color: var(--inv-line) !important;
+}
+
+.nitro-inventory-window .bg-card-grid-item-active {
+    background-color: #fff !important;
+}
+
+.nitro-inventory-window .border-card-grid-item-active {
+    border-color: var(--inv-border) !important;
+    box-shadow: 0 0 0 2px var(--inv-accent);
+}
+
+.nitro-inventory-window .bg-red-700 {
+    background-color: #fff !important;
+    color: var(--inv-accent) !important;
+    border-color: #75746e !important;
+}
+
+.nitro-inventory-window .shadow-room-previewer {
+    background-color: #fff;
+    border: 2px solid var(--inv-line);
+}
+
+.nitro-inventory-window .nitro-inventory-btn-place,
+.nitro-inventory-window .nitro-inventory-btn-sell {
+    border: 2px solid var(--inv-border) !important;
+    border-radius: 4px;
+    color: #fff !important;
+    font-weight: 700;
+    text-shadow: 1px 1px 0 rgba(0, 0, 0, 0.5);
+}
+
+.nitro-inventory-window .nitro-inventory-btn-place {
+    background: var(--inv-place) !important;
+    box-shadow: inset -2px -2px 0 var(--inv-place-dark), inset 2px 2px 0 var(--inv-place-light);
+}
+
+.nitro-inventory-window .nitro-inventory-btn-place:hover {
+    background: #67b94e !important;
+}
+
+.nitro-inventory-window .nitro-inventory-btn-sell {
+    background: var(--inv-sell) !important;
+    box-shadow: inset -2px -2px 0 var(--inv-sell-dark), inset 2px 2px 0 var(--inv-sell-light);
+}
+
+.nitro-inventory-window .nitro-inventory-btn-sell:hover {
+    background: #db4d40 !important;
+}
+
+.nitro-inventory-preview-btn {
+    display: none;
+}
+
+@media (max-width: 1024px) and (min-width: 641px) {
+    .nitro-inventory-window {
+        width: min(calc(100vw - 24px), 640px) !important;
+        min-width: 0 !important;
+        max-width: calc(100vw - 24px) !important;
+        height: min(calc(100vh - 24px), 560px) !important;
+        min-height: 0 !important;
+        max-height: calc(100vh - 24px) !important;
+    }
+}
+
+@media (max-width: 640px) {
+    .draggable-window:has(> .nitro-inventory-window) {
+        inset: 0 !important;
+        left: 0 !important;
+        right: 0 !important;
+        top: 0 !important;
+        bottom: 0 !important;
+        width: auto !important;
+        height: auto !important;
+        transform: none !important;
+    }
+
+    .nitro-card-shell.nitro-inventory-window {
+        width: calc(100% - 40px) !important;
+        min-width: 0 !important;
+        max-width: calc(100% - 40px) !important;
+        height: calc(100% - 76px) !important;
+        min-height: 0 !important;
+        max-height: calc(100% - 76px) !important;
+        margin: 8px auto 0 auto !important;
+    }
+
+    .nitro-inventory-window .nitro-inventory-tabs-shell {
+        flex-wrap: nowrap;
+        overflow: hidden;
+    }
+
+    .nitro-inventory-window .nitro-inventory-tabs-shell .nitro-card-tab-item {
+        flex: 1 1 0;
+        min-width: 0;
+        padding: 8px 0;
+        justify-content: center;
+    }
+
+    .nitro-inventory-window .nitro-inventory-tab-label {
+        display: none;
+    }
+
+    .nitro-inventory-window .nitro-inventory-tab-icon {
+        margin-right: 0;
+        font-size: 17px;
+    }
+
+    .nitro-inventory-window .grid.grid-cols-12 {
+        grid-template-columns: minmax(0, 1fr) !important;
+        grid-template-rows: minmax(0, 1fr) auto !important;
+    }
+
+    .nitro-inventory-window .grid.grid-cols-12 > .col-span-7,
+    .nitro-inventory-window .grid.grid-cols-12 > .col-span-5 {
+        grid-column: 1 / -1 !important;
+    }
+
+    .nitro-inventory-window .nitro-inventory-btn-place,
+    .nitro-inventory-window .nitro-inventory-btn-sell {
+        padding-top: 0.5rem;
+        padding-bottom: 0.5rem;
+    }
+
+    .nitro-inventory-window .nitro-inventory-preview-btn {
+        position: absolute;
+        top: 6px;
+        z-index: 4;
+        display: inline-flex;
+        align-items: center;
+        gap: 5px;
+        padding: 4px 8px;
+        border: 1px solid #555;
+        border-radius: 5px;
+        background: rgba(0, 0, 0, 0.7);
+        color: #fff;
+        font-size: 10px;
+        font-weight: 700;
+        cursor: pointer;
+    }
+
+    .nitro-inventory-window .nitro-inventory-preview-btn:active {
+        background: rgba(0, 0, 0, 0.85);
+    }
+
+    .nitro-inventory-window .nitro-inventory-preview-rotate {
+        left: 6px;
+    }
+
+    .nitro-inventory-window .nitro-inventory-preview-state {
+        right: 6px;
+    }
+}

src/css/nitrocard/NitroCardView.css

@@ -212,3 +212,11 @@
         }
     }
 }
+
+@media (max-width: 640px) {
+    .draggable-window {
+        left: 50% !important;
+        top: 50% !important;
+        transform: translate(-50%, -50%) !important;
+    }
+}

src/hooks/navigator/useNavigatorSearch.ts

@@ -5,7 +5,20 @@ import { SendMessageComposer } from '../../api';
 import { useMessageEvent } from '../events';
 import { useNavigatorUiStore } from './navigatorUiStore';
 
-
+/**
+ * Navigator search hook.
+ *
+ * Fires NavigatorSearchComposer(tabCode, filter) whenever the active tab
+ * or filter changes (skipped when tabCode is '' — initial state, before
+ * metadata arrives). Holds the latest NavigatorSearchResultSet that
+ * matches the active tab.
+ *
+ * The TanStack Query variant (see useNitroQuery) was tried earlier but
+ * its one-shot listener doesn't always reach NavigatorSearchEvent in
+ * production builds with older renderer SDKs; the persistent
+ * useMessageEvent listener used here matches the rest of the codebase
+ * and reliably catches every server push.
+ */
 export const useNavigatorSearch = () =>
 {
     const tabCode = useNavigatorUiStore(s => s.currentTabCode);

src/hooks/radio/useRadio.ts

@@ -31,7 +31,9 @@ const useRadioState = () =>
         if(loadStartedRef.current) return;
         loadStartedRef.current = true;
 
-        const url = GetConfigurationValue<string>('radio.stations.url') || 'configuration/radio-stations.json5';
+        const url = GetConfigurationValue<string>('radio.url')
+            || GetConfigurationValue<string>('radio.stations.url')
+            || 'configuration/radio-stations.json5';
 
         (async () =>
         {

src/hooks/rooms/widgets/useChatCommandSelector.ts

@@ -4,6 +4,9 @@ import { CommandDefinition, LocalizeText } from '../../../api';
 import { createNitroStore } from '../../../state/createNitroStore';
 import { useMessageEvent } from '../../events';
 
+// Client-only commands are static; safe to keep at module scope. The
+// `descriptionKey` is a LocalizeText slot resolved at merge time so
+// hotels in different locales see the right language.
 const CLIENT_COMMANDS: { key: string; descriptionKey: string }[] = [
     // Room effects
     { key: 'shake',       descriptionKey: 'chatcmd.client.shake' },

src/hooks/soundboard/useSoundboard.ts

@@ -65,7 +65,9 @@ const useSoundboardState = () =>
         if(!enabled || serverSounds.length || fileLoadStartedRef.current) return;
         fileLoadStartedRef.current = true;
 
-        const url = GetConfigurationValue<string>('soundboard.sounds.url') || 'configuration/soundboard-sounds.json5';
+        const url = GetConfigurationValue<string>('soundboard.url')
+            || GetConfigurationValue<string>('soundboard.sounds.url')
+            || 'configuration/soundboard-sounds.json5';
 
         (async () =>
         {

src/index.tsx

@@ -37,6 +37,8 @@ import './css/login/LoginView.css';
 
 import './css/icons/icons.css';
 
+import './css/inventory/InventoryView.css';
+
 
 import './css/layout/LayoutTrophy.css';