From 49836bbeef3bd7ee960708af6748fb8496fe2e99 Mon Sep 17 00:00:00 2001
From: medievalshell <medievalshell@gmail.com>
Date: Thu, 28 May 2026 15:31:24 +0200
Subject: [PATCH 01/19] feat: branding furni image position editor (move +
 scale)

Adds an "Editor Posizione" button to the furni infostand action bar for
branding / MPU furni, opening a dialog to position and zoom the image:
- draggable dot moves offsetX/Y (live, local preview only)
- slider zooms the image (scale, via the renderer's per-sprite scale)
- offsetZ kept as z-index; Save persists + broadcasts via SetObjectData
- radio "Live" + all editor labels go through LocalizeText (external texts)

Pairs with the renderer branding scale/offset support and Arcturus' `scale`
default on InteractionRoomAds.
---
 src/components/radio/RadioView.tsx            |   2 +-
 .../infostand/ImagePositionEditorView.tsx     | 147 ++++++++++++++++++
 .../infostand/InfoStandWidgetFurniView.tsx    |  56 +++++++
 3 files changed, 204 insertions(+), 1 deletion(-)
 create mode 100644 src/components/room/widgets/avatar-info/infostand/ImagePositionEditorView.tsx

diff --git a/src/components/radio/RadioView.tsx b/src/components/radio/RadioView.tsx
index 15e7c95..6cd825b 100644
--- a/src/components/radio/RadioView.tsx
+++ b/src/components/radio/RadioView.tsx
@@ -76,7 +76,7 @@ export const RadioView: FC<{}> = () =>
                     <div className="mt-0.5 flex items-center gap-1.5">
                         { selectedPlaying &&
                             <span className="flex items-center gap-1 text-[9px] font-bold uppercase tracking-wide text-sky-400">
-                                <span className="h-1.5 w-1.5 rounded-full bg-sky-400" /> Live
+                                <span className="h-1.5 w-1.5 rounded-full bg-sky-400" /> { LocalizeText('radio.live') }
                             </span> }
                         { selected?.genre &&
                             <span className="truncate text-[10px] text-white/45">{ selected.genre }</span> }
diff --git a/src/components/room/widgets/avatar-info/infostand/ImagePositionEditorView.tsx b/src/components/room/widgets/avatar-info/infostand/ImagePositionEditorView.tsx
new file mode 100644
index 0000000..1362ae0
--- /dev/null
+++ b/src/components/room/widgets/avatar-info/infostand/ImagePositionEditorView.tsx
@@ -0,0 +1,147 @@
+import { GetRoomEngine, RoomObjectCategory, RoomObjectVariable } from '@nitrots/nitro-renderer';
+import { FC, PointerEvent as ReactPointerEvent, useCallback, useEffect, useRef, useState } from 'react';
+import { LocalizeText } from '../../../../../api';
+import { Button, NitroCardContentView, NitroCardHeaderView, NitroCardView } from '../../../../../common';
+
+const PAD_W = 230;
+const PAD_H = 150;
+// How many offset units one pixel of drag represents.
+const UNITS_PER_PX = 1.5;
+
+interface Props
+{
+    roomId: number;
+    objectId: number;
+    isWallItem: boolean;
+    initialX: number;
+    initialY: number;
+    initialZ: number;
+    initialScale: number;
+    onClose: () => void;
+    onSave: (x: number, y: number, z: number, scale: number) => void;
+}
+
+export const ImagePositionEditorView: FC<Props> = props =>
+{
+    const { roomId, objectId, isWallItem, initialX, initialY, initialZ, initialScale, onClose, onSave } = props;
+    const [ x, setX ] = useState(initialX);
+    const [ y, setY ] = useState(initialY);
+    const [ z, setZ ] = useState(initialZ);
+    const [ scale, setScale ] = useState(initialScale || 100);
+    const padRef = useRef<HTMLDivElement>(null);
+    const draggingRef = useRef(false);
+
+    const category = isWallItem ? RoomObjectCategory.WALL : RoomObjectCategory.FLOOR;
+
+    // Local-only live preview: set the branding model values directly. The model
+    // bumps its update counter so the visualization re-renders next frame.
+    // Nothing is sent to the server until Save.
+    const applyLive = useCallback((nx: number, ny: number, nz: number, nScale: number) =>
+    {
+        const roomObject = GetRoomEngine().getRoomObject(roomId, objectId, category);
+        if(!roomObject?.model) return;
+
+        roomObject.model.setValue(RoomObjectVariable.FURNITURE_BRANDING_OFFSET_X, nx);
+        roomObject.model.setValue(RoomObjectVariable.FURNITURE_BRANDING_OFFSET_Y, ny);
+        roomObject.model.setValue(RoomObjectVariable.FURNITURE_BRANDING_OFFSET_Z, nz);
+        roomObject.model.setValue(RoomObjectVariable.FURNITURE_BRANDING_SCALE, nScale);
+    }, [ roomId, objectId, category ]);
+
+    useEffect(() => { applyLive(x, y, z, scale); }, [ x, y, z, scale, applyLive ]);
+
+    const setFromPointer = useCallback((clientX: number, clientY: number) =>
+    {
+        const rect = padRef.current?.getBoundingClientRect();
+        if(!rect) return;
+
+        const cx = rect.left + (rect.width / 2);
+        const cy = rect.top + (rect.height / 2);
+
+        setX(Math.round((clientX - cx) * UNITS_PER_PX));
+        setY(Math.round((clientY - cy) * UNITS_PER_PX));
+    }, []);
+
+    const onPointerDown = (event: ReactPointerEvent<HTMLDivElement>) =>
+    {
+        draggingRef.current = true;
+        padRef.current?.setPointerCapture(event.pointerId);
+        setFromPointer(event.clientX, event.clientY);
+    };
+
+    const onPointerMove = (event: ReactPointerEvent<HTMLDivElement>) =>
+    {
+        if(draggingRef.current) setFromPointer(event.clientX, event.clientY);
+    };
+
+    const onPointerUp = (event: ReactPointerEvent<HTMLDivElement>) =>
+    {
+        draggingRef.current = false;
+        padRef.current?.releasePointerCapture?.(event.pointerId);
+    };
+
+    const cancel = () =>
+    {
+        applyLive(initialX, initialY, initialZ, initialScale || 100);
+        onClose();
+    };
+
+    const save = () =>
+    {
+        onSave(x, y, z, scale);
+        onClose();
+    };
+
+    const dotLeft = (PAD_W / 2) + (x / UNITS_PER_PX);
+    const dotTop = (PAD_H / 2) + (y / UNITS_PER_PX);
+    const clampedLeft = Math.max(0, Math.min(PAD_W, dotLeft));
+    const clampedTop = Math.max(0, Math.min(PAD_H, dotTop));
+
+    return (
+        <NitroCardView className="no-resize" uniqueKey="image-position-editor" theme="primary-slim">
+            <NitroCardHeaderView headerText={ LocalizeText('image.position.editor.title') } onCloseClick={ cancel } />
+            <NitroCardContentView>
+                <div className="flex flex-col gap-2">
+                    <span className="text-[11px] text-black/60">{ LocalizeText('image.position.editor.hint') }</span>
+                    <div
+                        ref={ padRef }
+                        onPointerDown={ onPointerDown }
+                        onPointerMove={ onPointerMove }
+                        onPointerUp={ onPointerUp }
+                        className="relative cursor-crosshair self-center rounded border border-black/30 bg-[#1b2733]"
+                        style={ { width: PAD_W, height: PAD_H } }>
+                        { /* center crosshair */ }
+                        <div className="pointer-events-none absolute left-1/2 top-0 h-full w-px -translate-x-1/2 bg-white/10" />
+                        <div className="pointer-events-none absolute left-0 top-1/2 h-px w-full -translate-y-1/2 bg-white/10" />
+                        { /* draggable dot */ }
+                        <div
+                            className="pointer-events-none absolute h-3 w-3 -translate-x-1/2 -translate-y-1/2 rounded-full bg-sky-400 shadow-[0_0_6px_rgba(56,189,248,0.8)] ring-2 ring-white/70"
+                            style={ { left: clampedLeft, top: clampedTop } } />
+                    </div>
+
+                    <div className="flex items-center gap-2">
+                        <span className="w-12 text-[11px] text-black/70">{ LocalizeText('image.position.editor.scale') }</span>
+                        <input type="range" min={ 10 } max={ 500 } step={ 1 } value={ scale } onChange={ e => setScale(e.target.valueAsNumber || 100) } className="grow" />
+                        <span className="w-12 text-right text-[11px] tabular-nums text-black/70">{ (scale / 100).toFixed(2) }x</span>
+                    </div>
+
+                    <div className="grid grid-cols-3 gap-2">
+                        <label className="flex flex-col gap-0.5 text-[11px] text-black/70">{ LocalizeText('image.position.editor.offsetx') }
+                            <input type="number" value={ x } onChange={ e => setX(e.target.valueAsNumber || 0) } className="form-control form-control-sm" />
+                        </label>
+                        <label className="flex flex-col gap-0.5 text-[11px] text-black/70">{ LocalizeText('image.position.editor.offsety') }
+                            <input type="number" value={ y } onChange={ e => setY(e.target.valueAsNumber || 0) } className="form-control form-control-sm" />
+                        </label>
+                        <label className="flex flex-col gap-0.5 text-[11px] text-black/70">{ LocalizeText('image.position.editor.offsetz') }
+                            <input type="number" value={ z } onChange={ e => setZ(e.target.valueAsNumber || 0) } className="form-control form-control-sm" />
+                        </label>
+                    </div>
+
+                    <div className="flex justify-end gap-2">
+                        <Button variant="secondary" onClick={ cancel }>{ LocalizeText('image.position.editor.cancel') }</Button>
+                        <Button variant="success" onClick={ save }>{ LocalizeText('save') }</Button>
+                    </div>
+                </div>
+            </NitroCardContentView>
+        </NitroCardView>
+    );
+};
diff --git a/src/components/room/widgets/avatar-info/infostand/InfoStandWidgetFurniView.tsx b/src/components/room/widgets/avatar-info/infostand/InfoStandWidgetFurniView.tsx
index d2a861c..40b458f 100644
--- a/src/components/room/widgets/avatar-info/infostand/InfoStandWidgetFurniView.tsx
+++ b/src/components/room/widgets/avatar-info/infostand/InfoStandWidgetFurniView.tsx
@@ -6,6 +6,7 @@ import { AvatarInfoFurni, GetGroupInformation, LocalizeText, SendMessageComposer
 import { Button, Column, Flex, LayoutBadgeImageView, LayoutCurrencyIcon, LayoutLimitedEditionCompactPlateView, LayoutRarityLevelView, LayoutRoomObjectImageView, Text, UserProfileIconView } from '../../../../../common';
 import { useHasPermission, useMessageEvent, useNitroEvent, useRareValues, useRoom, useWiredTools } from '../../../../../hooks';
 import { NitroInput } from '../../../../../layout';
+import { ImagePositionEditorView } from './ImagePositionEditorView';
 
 interface InfoStandWidgetFurniViewProps
 {
@@ -43,6 +44,7 @@ export const InfoStandWidgetFurniView: FC<InfoStandWidgetFurniViewProps> = props
     const [ isJukeBox, setIsJukeBox ] = useState<boolean>(false);
     const [ isSongDisk, setIsSongDisk ] = useState<boolean>(false);
     const [ isBranded, setIsBranded ] = useState<boolean>(false);
+    const [ showPositionEditor, setShowPositionEditor ] = useState<boolean>(false);
     const [ songId, setSongId ] = useState<number>(-1);
     const [ songName, setSongName ] = useState<string>('');
     const [ songCreator, setSongCreator ] = useState<string>('');
@@ -393,6 +395,45 @@ export const InfoStandWidgetFurniView: FC<InfoStandWidgetFurniViewProps> = props
         return data;
     }, [ furniKeys, furniValues ]);
 
+    const getBrandingOffset = useCallback((key: string): number =>
+    {
+        const index = furniKeys.indexOf(key);
+        if(index < 0) return 0;
+        const value = parseInt(furniValues[index]);
+        return isNaN(value) ? 0 : value;
+    }, [ furniKeys, furniValues ]);
+
+    const hasBrandingOffsets = isBranded && (furniKeys.indexOf('offsetX') >= 0);
+
+    // Persist the position from the editor: rebuild the branding map with the
+    // new offsets and send it (same path as Save), then reflect it in the fields.
+    const savePositionEditor = useCallback((x: number, y: number, z: number, scale: number) =>
+    {
+        const map = new Map<string, string>();
+        const clone = Array.from(furniValues);
+        let hasScale = false;
+
+        for(let i = 0; i < furniKeys.length; i++)
+        {
+            const key = furniKeys[i];
+            let value = furniValues[i];
+
+            if(key === 'offsetX') value = String(x);
+            else if(key === 'offsetY') value = String(y);
+            else if(key === 'offsetZ') value = String(z);
+            else if(key === 'scale') { value = String(scale); hasScale = true; }
+
+            clone[i] = value;
+            map.set(key, value);
+        }
+
+        // older branding furni may not carry a scale key yet — always send it
+        if(!hasScale) map.set('scale', String(scale));
+
+        GetRoomEngine().modifyRoomObjectDataWithMap(avatarInfo.id, avatarInfo.category, RoomObjectOperationType.OBJECT_SAVE_STUFF_DATA, map);
+        setFurniValues(clone);
+    }, [ avatarInfo, furniKeys, furniValues ]);
+
     const processButtonAction = useCallback((action: string) =>
     {
         if(!action || (action === '')) return;
@@ -749,6 +790,10 @@ export const InfoStandWidgetFurniView: FC<InfoStandWidgetFurniViewProps> = props
                     <Button variant="dark" onClick={ event => processButtonAction('use') }>
                         { LocalizeText('infostand.button.use') }
                     </Button> }
+                { hasBrandingOffsets &&
+                    <Button variant="dark" onClick={ () => setShowPositionEditor(true) }>
+                        { LocalizeText('image.position.editor.button') }
+                    </Button> }
                 { ((furniKeys.length > 0 && furniValues.length > 0) && (furniKeys.length === furniValues.length)) &&
                     <Button variant="dark" onClick={ () => processButtonAction('save_branding_configuration') }>
                         { LocalizeText('save') }
@@ -758,6 +803,17 @@ export const InfoStandWidgetFurniView: FC<InfoStandWidgetFurniViewProps> = props
                         { LocalizeText('save') }
                     </Button> }
             </Flex>
+            { showPositionEditor &&
+                <ImagePositionEditorView
+                    roomId={ roomSession.roomId }
+                    objectId={ avatarInfo.id }
+                    isWallItem={ avatarInfo.isWallItem }
+                    initialX={ getBrandingOffset('offsetX') }
+                    initialY={ getBrandingOffset('offsetY') }
+                    initialZ={ getBrandingOffset('offsetZ') }
+                    initialScale={ getBrandingOffset('scale') || 100 }
+                    onClose={ () => setShowPositionEditor(false) }
+                    onSave={ savePositionEditor } /> }
         </Column>
     );
 };

From 7a0b57e26785e0bff2087e16622e0bf97176a954 Mon Sep 17 00:00:00 2001
From: medievalshell <medievalshell@gmail.com>
Date: Thu, 28 May 2026 15:39:46 +0200
Subject: [PATCH 02/19] fix(navigator): ignore search events while disabled +
 invalidate on FlatCreated

useNavigatorSearch had two gaps its tests cover:
- with no active tab the query is disabled, but a NavigatorSearchEvent still
  updated the data; now such events are ignored until a tab is active
- a newly created room (FlatCreatedEvent) now invalidates the
  ['navigator','search'] query and refetches the current search

Fixes the 2 failing useNavigatorSearch tests; full suite 472/472.
---
 src/hooks/navigator/useNavigatorSearch.ts | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/hooks/navigator/useNavigatorSearch.ts b/src/hooks/navigator/useNavigatorSearch.ts
index ab3744d..7f55479 100644
--- a/src/hooks/navigator/useNavigatorSearch.ts
+++ b/src/hooks/navigator/useNavigatorSearch.ts
@@ -1,4 +1,5 @@
-import { NavigatorSearchComposer, NavigatorSearchEvent, NavigatorSearchResultSet } from '@nitrots/nitro-renderer';
+import { FlatCreatedEvent, NavigatorSearchComposer, NavigatorSearchEvent, NavigatorSearchResultSet } from '@nitrots/nitro-renderer';
+import { useQueryClient } from '@tanstack/react-query';
 import { useEffect, useState } from 'react';
 import { SendMessageComposer } from '../../api';
 import { useMessageEvent } from '../events';
@@ -9,6 +10,7 @@ export const useNavigatorSearch = () =>
 {
     const tabCode = useNavigatorUiStore(s => s.currentTabCode);
     const filter  = useNavigatorUiStore(s => s.currentFilter);
+    const queryClient = useQueryClient();
 
     const [ searchResult, setSearchResult ] = useState<NavigatorSearchResultSet | null>(null);
     const [ isFetching, setIsFetching ] = useState(false);
@@ -26,12 +28,25 @@ export const useNavigatorSearch = () =>
         const result = event.getParser()?.result;
         if(!result) return;
 
-        if(tabCode && result.code !== tabCode) return;
+        // No active tab → the search query is disabled, ignore any event.
+        // Otherwise only accept the event whose code matches the active tab.
+        if(!tabCode || (result.code !== tabCode)) return;
 
         setSearchResult(result);
         setIsFetching(false);
     });
 
+    // A newly created room invalidates the current search so it refetches.
+    useMessageEvent<FlatCreatedEvent>(FlatCreatedEvent, () =>
+    {
+        queryClient.invalidateQueries({ queryKey: [ 'navigator', 'search' ] });
+
+        if(!tabCode) return;
+
+        setIsFetching(true);
+        SendMessageComposer(new NavigatorSearchComposer(tabCode, filter));
+    });
+
     return {
         searchResult,
         isFetching,

From dc0a8f965e7fcea0b5ec5ba4083ddf0e9a3dfdca Mon Sep 17 00:00:00 2001
From: medievalshell <medievalshell@gmail.com>
Date: Fri, 29 May 2026 23:36:06 +0200
Subject: [PATCH 03/19] feat(catalog): toggle stile catalogo classico/moderno

Aggiunge un checkbox nelle impostazioni utente per scegliere lo stile del
catalogo (classico vs moderno) + flag globale catalog.classic.style in
ui-config.json come default per tutti. Override per-utente in localStorage.
---
 public/configuration/ui-config.example            |  1 +
 src/api/utils/LocalStorageKeys.ts                 |  1 +
 src/components/catalog/CatalogClassicView.tsx     |  8 +++++---
 src/components/user-settings/UserSettingsView.tsx |  7 ++++++-
 src/hooks/catalog/index.ts                        |  1 +
 src/hooks/catalog/useCatalogClassicStyle.ts       | 14 ++++++++++++++
 6 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100644 src/hooks/catalog/useCatalogClassicStyle.ts

diff --git a/public/configuration/ui-config.example b/public/configuration/ui-config.example
index e65c501..796ac12 100644
--- a/public/configuration/ui-config.example
+++ b/public/configuration/ui-config.example
@@ -28,6 +28,7 @@
 	"housekeeping.enabled": true,
     "toolbar.hide.quests": true,
     "show.google.ads": false,
+    "catalog.classic.style": false,
     "loginview": {
         "images": {
             "background": "${asset.url}/c_images/reception/stretch_blue.png",
diff --git a/src/api/utils/LocalStorageKeys.ts b/src/api/utils/LocalStorageKeys.ts
index 847f3aa..75ecfe8 100644
--- a/src/api/utils/LocalStorageKeys.ts
+++ b/src/api/utils/LocalStorageKeys.ts
@@ -4,4 +4,5 @@ export class LocalStorageKeys
     public static CATALOG_SKIP_PURCHASE_CONFIRMATION: string = 'catalogSkipPurchaseConfirmation';
     public static CHAT_WINDOW_ENABLED: string = 'chatWindowEnabled';
     public static CHAT_TRANSLATION_SETTINGS: string = 'chatTranslationSettings';
+    public static CATALOG_CLASSIC_STYLE: string = 'catalogClassicStyle';
 }
diff --git a/src/components/catalog/CatalogClassicView.tsx b/src/components/catalog/CatalogClassicView.tsx
index 1ee04f2..7153c22 100644
--- a/src/components/catalog/CatalogClassicView.tsx
+++ b/src/components/catalog/CatalogClassicView.tsx
@@ -3,7 +3,7 @@ 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 { useCatalogActions, useCatalogClassicStyle, 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,7 @@ const CatalogClassicViewInner: FC<{}> = () =>
     const loading = catalogAdmin?.loading ?? false;
 
     const isMod = useHasPermission('acc_catalogfurni');
+    const [ catalogClassicStyle ] = useCatalogClassicStyle();
     const [ mobileMenuOpen, setMobileMenuOpen ] = useState(false);
     const { purse = null } = usePurse();
     const displayedCurrencies = GetConfigurationValue<number[]>('system.currency.types', []);
@@ -122,8 +123,9 @@ const CatalogClassicViewInner: FC<{}> = () =>
     return (
         <>
             { isVisible &&
-                <NitroCardView classNames={ [ 'nitro-catalog-classic-window' ] } isResizable={ false } uniqueKey="catalog">
+                <NitroCardView classNames={ [ 'nitro-catalog-classic-window', catalogClassicStyle ? 'catalog-skin-legacy' : 'catalog-skin-modern' ] } isResizable={ false } uniqueKey="catalog">
                     <NitroCardHeaderView className={ currentType === CatalogType.BUILDER ? 'builders-club-card-header' : '' } headerText={ LocalizeText('catalog.title') } onCloseClick={ () => setIsVisible(false) } style={ buildersClubHeaderStyle } />
+                    { !catalogClassicStyle &&
                     <div className="nitro-catalog-classic-mobile-header">
                         { isMod &&
                             <div className="nitro-catalog-classic-mobile-burger">
@@ -159,7 +161,7 @@ const CatalogClassicViewInner: FC<{}> = () =>
                                 </div>
                             )) }
                         </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>
diff --git a/src/components/user-settings/UserSettingsView.tsx b/src/components/user-settings/UserSettingsView.tsx
index 8857e1a..999ac3b 100644
--- a/src/components/user-settings/UserSettingsView.tsx
+++ b/src/components/user-settings/UserSettingsView.tsx
@@ -3,7 +3,7 @@ import { FC, useEffect, useState } from 'react';
 import { FaUserCog, FaVolumeDown, FaVolumeMute, FaVolumeUp } from 'react-icons/fa';
 import { DispatchMainEvent, DispatchUiEvent, LocalizeText, SendMessageComposer } from '../../api';
 import { NitroCardContentView, NitroCardHeaderView, NitroCardView, Text } from '../../common';
-import { useCatalogPlaceMultipleItems, useCatalogSkipPurchaseConfirmation, useChatWindow, useMessageEvent } from '../../hooks';
+import { useCatalogClassicStyle, useCatalogPlaceMultipleItems, useCatalogSkipPurchaseConfirmation, useChatWindow, useMessageEvent } from '../../hooks';
 import { classNames } from '../../layout';
 
 export const UserSettingsView: FC<{}> = props =>
@@ -13,6 +13,7 @@ export const UserSettingsView: FC<{}> = props =>
     const [ catalogPlaceMultipleObjects, setCatalogPlaceMultipleObjects ] = useCatalogPlaceMultipleItems();
     const [ catalogSkipPurchaseConfirmation, setCatalogSkipPurchaseConfirmation ] = useCatalogSkipPurchaseConfirmation();
     const [ chatWindowEnabled, setChatWindowEnabled ] = useChatWindow();
+    const [ catalogClassicStyle, setCatalogClassicStyle ] = useCatalogClassicStyle();
 
     const processAction = (type: string, value?: boolean | number | string) =>
     {
@@ -156,6 +157,10 @@ export const UserSettingsView: FC<{}> = props =>
                         <input checked={ chatWindowEnabled } className="form-check-input" type="checkbox" onChange={ event => setChatWindowEnabled(event.target.checked) } />
                         <Text>Enable chat window</Text>
                     </div>
+                    <div className="flex items-center gap-1">
+                        <input checked={ catalogClassicStyle } className="form-check-input" type="checkbox" onChange={ event => setCatalogClassicStyle(event.target.checked) } />
+                        <Text>Catalogo: stile classico</Text>
+                    </div>
                 </div>
                 <div className="flex flex-col">
                     <Text bold>{ LocalizeText('widget.memenu.settings.volume') }</Text>
diff --git a/src/hooks/catalog/index.ts b/src/hooks/catalog/index.ts
index 2a817fa..1b4b9bc 100644
--- a/src/hooks/catalog/index.ts
+++ b/src/hooks/catalog/index.ts
@@ -1,4 +1,5 @@
 export * from './useCatalog';
+export * from './useCatalogClassicStyle';
 export * from './useCatalogFavorites';
 export * from './useCatalogPlaceMultipleItems';
 export * from './useCatalogSkipPurchaseConfirmation';
diff --git a/src/hooks/catalog/useCatalogClassicStyle.ts b/src/hooks/catalog/useCatalogClassicStyle.ts
new file mode 100644
index 0000000..a239a60
--- /dev/null
+++ b/src/hooks/catalog/useCatalogClassicStyle.ts
@@ -0,0 +1,14 @@
+import { useBetween } from 'use-between';
+import { GetConfigurationValue, LocalStorageKeys } from '../../api';
+import { useLocalStorage } from '../useLocalStorage';
+
+// Per-user toggle for the catalog visual style.
+//  - true  => classic (old) catalog look
+//  - false => modern (rebuilt) catalog look
+// The default for users who never touched the toggle comes from the global
+// `catalog.classic.style` flag in ui-config.json, so an admin can flip the
+// default for everyone (true = classic for all, false = modern for all)
+// while still letting each user override it from the settings panel.
+const useCatalogClassicStyleState = () => useLocalStorage<boolean>(LocalStorageKeys.CATALOG_CLASSIC_STYLE, GetConfigurationValue<boolean>('catalog.classic.style', false));
+
+export const useCatalogClassicStyle = () => useBetween(useCatalogClassicStyleState);

From 32dcbaf265146d985b3168ce06dfc0da8c32035b Mon Sep 17 00:00:00 2001
From: medievalshell <medievalshell@gmail.com>
Date: Fri, 29 May 2026 23:40:37 +0200
Subject: [PATCH 04/19] feat(catalog): stile classico completo via skin legacy

Ripristina il look del catalogo pre-merge come CSS scoped sotto
body.catalog-skin-legacy (CatalogClassicLegacy.css), attivato dal toggle
'stile classico'. CatalogView mette/toglie la classe sul body.
---
 src/components/catalog/CatalogView.tsx   |  15 +-
 src/css/catalog/CatalogClassicLegacy.css | 354 +++++++++++++++++++++++
 src/index.tsx                            |   1 +
 3 files changed, 368 insertions(+), 2 deletions(-)
 create mode 100644 src/css/catalog/CatalogClassicLegacy.css

diff --git a/src/components/catalog/CatalogView.tsx b/src/components/catalog/CatalogView.tsx
index fbc700e..2859f24 100644
--- a/src/components/catalog/CatalogView.tsx
+++ b/src/components/catalog/CatalogView.tsx
@@ -1,10 +1,21 @@
-import { FC } from 'react';
-import { useCatalogData } from '../../hooks';
+import { FC, useEffect } from 'react';
+import { useCatalogClassicStyle, useCatalogData } from '../../hooks';
 import { CatalogClassicView } from './CatalogClassicView';
 
 export const CatalogView: FC<{}> = () =>
 {
     const { catalogLocalizationVersion = 0 } = useCatalogData();
+    const [ catalogClassicStyle ] = useCatalogClassicStyle();
+
+    // Toggle the legacy-skin marker on <body> so the scoped overrides in
+    // CatalogClassicLegacy.css (the pre-merge catalog look) take effect for
+    // every catalog element without touching the modern stylesheet.
+    useEffect(() =>
+    {
+        document.body.classList.toggle('catalog-skin-legacy', !!catalogClassicStyle);
+
+        return () => document.body.classList.remove('catalog-skin-legacy');
+    }, [ catalogClassicStyle ]);
 
     return (
         <>
diff --git a/src/css/catalog/CatalogClassicLegacy.css b/src/css/catalog/CatalogClassicLegacy.css
new file mode 100644
index 0000000..db5c6ef
--- /dev/null
+++ b/src/css/catalog/CatalogClassicLegacy.css
@@ -0,0 +1,354 @@
+/* Auto-generated: pre-merge catalog CSS scoped under .catalog-skin-legacy (classic style toggle). Source: CatalogClassicView.css @ b360595. Do not edit by hand. */
+body.catalog-skin-legacy .nitro-catalog-classic-window {
+    width: 640px !important;
+    height: 600px !important;
+    max-width: 640px !important;
+    min-width: 640px !important;
+    min-height: 600px !important;
+    max-height: 600px !important;
+}
+body.catalog-skin-legacy .nitro-catalog-classic-window .nitro-card-title {
+    font-size: 18px;
+    letter-spacing: 0.2px;
+}
+body.catalog-skin-legacy .nitro-catalog-classic-window .nitro-card-header-shell {
+    min-height: 38px;
+    max-height: 38px;
+}
+body.catalog-skin-legacy .nitro-catalog-classic-admin-banner {
+    border-bottom: 1px solid rgba(0, 0, 0, 0.18);
+    background: linear-gradient(180deg, #f4d45d 0%, #d8b43e 100%);
+}
+body.catalog-skin-legacy .nitro-catalog-classic-tabs-shell {
+    flex-wrap: nowrap;
+    gap: 1px;
+    min-height: 30px;
+    max-height: 30px;
+    padding: 0 6px;
+    overflow-x: auto;
+    overflow-y: hidden;
+    align-items: end;
+    background: #e7e8df;
+    border-bottom: 1px solid #b8beb4;
+}
+body.catalog-skin-legacy .nitro-catalog-classic-tabs-shell .nitro-card-tab-item {
+    min-height: 28px;
+    padding: 5px 10px 4px;
+    border: 1px solid #8f8f8b;
+    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);
+    white-space: nowrap;
+}
+body.catalog-skin-legacy .nitro-catalog-classic-tabs-shell .nitro-card-tab-item:hover {
+    background: linear-gradient(180deg, #ffffff 0%, #e7ece4 100%);
+}
+body.catalog-skin-legacy .nitro-catalog-classic-tabs-shell .nitro-card-tab-item-active {
+    background: #f2f2eb;
+    transform: translateY(0);
+    position: relative;
+    top: 1px;
+}
+body.catalog-skin-legacy .nitro-catalog-classic-content-shell {
+    padding: 6px 8px 8px !important;
+}
+body.catalog-skin-legacy .nitro-catalog-classic-stage {
+    display: grid;
+    grid-template-columns: 196px minmax(0, 1fr);
+    gap: 8px;
+    min-height: 0;
+    height: 100%;
+}
+body.catalog-skin-legacy .nitro-catalog-classic-stage.is-navigation-hidden {
+    grid-template-columns: minmax(0, 1fr);
+}
+body.catalog-skin-legacy .nitro-catalog-classic-sidebar {
+    display: flex;
+    flex-direction: column;
+    gap: 4px;
+    min-height: 0;
+    height: 100%;
+}
+body.catalog-skin-legacy .nitro-catalog-classic-search-shell {
+    padding: 3px;
+    border: 1px solid #a7aba1;
+    border-radius: 4px;
+    background: linear-gradient(180deg, #f9f8f2 0%, #eaede5 100%);
+}
+body.catalog-skin-legacy .nitro-catalog-classic-search-shell input {
+    height: 18px;
+    padding-top: 0 !important;
+    padding-bottom: 0 !important;
+    border-width: 1px !important;
+    border-color: #8f9588 !important;
+    border-radius: 3px !important;
+    background: #fff !important;
+    box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.08);
+}
+body.catalog-skin-legacy .nitro-catalog-classic-search-shell svg {
+    color: #61645b !important;
+}
+body.catalog-skin-legacy .nitro-catalog-classic-navigation-shell {
+    flex: 1 1 auto;
+    min-height: 0;
+    padding: 3px 2px 3px 3px;
+    border: 1px solid #a7aba1;
+    border-radius: 4px;
+    background: linear-gradient(180deg, #f1f2ec 0%, #d8ddd3 100%);
+    overflow: auto;
+}
+body.catalog-skin-legacy .nitro-catalog-classic-navigation-list {
+    display: flex;
+    flex-direction: column;
+    gap: 2px;
+}
+body.catalog-skin-legacy .nitro-catalog-classic-navigation-node.is-child {
+    margin-left: 10px;
+}
+body.catalog-skin-legacy .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;
+    cursor: pointer;
+    transition: background-color 0.12s ease, border-color 0.12s ease;
+}
+body.catalog-skin-legacy .nitro-catalog-classic-navigation-item:hover {
+    background: linear-gradient(180deg, #ffffff 0%, #ebeee6 100%);
+    border-color: #9ea79b;
+}
+body.catalog-skin-legacy .nitro-catalog-classic-navigation-item.is-active {
+    background: linear-gradient(180deg, #dae7f0 0%, #c4d2de 100%);
+    border-color: #8e9ba5;
+    font-weight: 700;
+}
+body.catalog-skin-legacy .nitro-catalog-classic-navigation-item.is-drag-over {
+    outline: 2px solid rgba(48, 114, 140, 0.35);
+    outline-offset: 1px;
+}
+body.catalog-skin-legacy .nitro-catalog-classic-navigation-icon {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 18px;
+    min-width: 18px;
+    height: 18px;
+}
+body.catalog-skin-legacy .nitro-catalog-classic-navigation-icon img,
+body.catalog-skin-legacy .nitro-catalog-classic-navigation-icon canvas {
+    width: auto;
+    height: auto;
+    max-width: 18px;
+    max-height: 18px;
+}
+body.catalog-skin-legacy .nitro-catalog-classic-navigation-label {
+    flex: 1 1 auto;
+    min-width: 0;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    font-size: 11px;
+    line-height: 1;
+}
+body.catalog-skin-legacy .nitro-catalog-classic-navigation-caret,
+body.catalog-skin-legacy .nitro-catalog-classic-navigation-favorite,
+body.catalog-skin-legacy .nitro-catalog-classic-navigation-admin,
+body.catalog-skin-legacy .nitro-catalog-classic-navigation-drag {
+    flex-shrink: 0;
+}
+body.catalog-skin-legacy .nitro-catalog-classic-navigation-caret {
+    color: #676d66 !important;
+}
+body.catalog-skin-legacy .nitro-catalog-classic-layout-shell {
+    display: flex;
+    flex-direction: column;
+    min-width: 0;
+    min-height: 0;
+    height: 100%;
+    border: 1px solid #a7aba1;
+    border-radius: 4px;
+    background: linear-gradient(180deg, #eceee7 0%, #dfe4da 100%);
+    overflow: hidden;
+}
+body.catalog-skin-legacy .nitro-catalog-classic-layout-header-shell {
+    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%);
+}
+body.catalog-skin-legacy .nitro-catalog-classic-layout-hero {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex: 1 1 auto;
+    min-height: 32px;
+    overflow: hidden;
+}
+body.catalog-skin-legacy .nitro-catalog-classic-layout-hero img {
+    max-width: 100%;
+    max-height: 32px;
+    width: auto;
+    height: auto;
+    object-fit: contain;
+}
+body.catalog-skin-legacy .nitro-catalog-classic-layout-container {
+    flex: 1 1 auto;
+    min-height: 0;
+    padding: 6px;
+    background: #f2f2eb;
+    overflow: hidden;
+}
+body.catalog-skin-legacy .nitro-catalog-classic-default-layout {
+    gap: 8px;
+}
+body.catalog-skin-legacy .nitro-catalog-classic-offer-panel,
+body.catalog-skin-legacy .nitro-catalog-classic-welcome {
+    border: 1px solid #bfc4bc;
+    border-radius: 6px;
+    background: linear-gradient(180deg, #ffffff 0%, #f3f3ed 100%);
+    box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.92);
+}
+body.catalog-skin-legacy .nitro-catalog-classic-offer-preview {
+    width: 136px;
+    min-width: 136px;
+    padding: 8px;
+    border-right: 1px solid #c9cec5;
+    background: linear-gradient(180deg, #eef2ea 0%, #dde3d8 100%);
+}
+body.catalog-skin-legacy .nitro-catalog-classic-offer-info {
+    padding: 10px;
+}
+body.catalog-skin-legacy .nitro-catalog-classic-welcome {
+    min-height: 128px;
+    padding: 10px;
+}
+body.catalog-skin-legacy .nitro-catalog-classic-grid-shell {
+    min-height: 150px;
+    padding: 4px;
+    border: 1px solid #bcc2b8;
+    border-radius: 6px;
+    background: linear-gradient(180deg, #f5f5f0 0%, #e4e7de 100%);
+    height: auto;
+    flex: 1 1 auto;
+}
+body.catalog-skin-legacy .nitro-catalog-classic-grid {
+    gap: 4px !important;
+    align-content: start;
+}
+body.catalog-skin-legacy .nitro-catalog-classic-window .layout-grid-item {
+    height: 54px;
+    border: 1px solid #b8beb6 !important;
+    border-radius: 6px !important;
+    background-color: #d7dde2;
+    background-image: none;
+    box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.55);
+}
+body.catalog-skin-legacy .nitro-catalog-classic-window .layout-grid-item.is-active {
+    background-color: #e5ebef !important;
+    border-color: #8f978b !important;
+}
+body.catalog-skin-legacy .nitro-catalog-classic-grid-offer-icon {
+    position: absolute;
+    inset: 4px;
+    background-repeat: no-repeat;
+    background-position: center;
+    pointer-events: none;
+}
+body.catalog-skin-legacy .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%);
+}
+body.catalog-skin-legacy .nitro-catalog-classic-window .nitro-catalog-header img {
+    max-width: 100%;
+    max-height: 48px;
+    width: auto;
+    height: auto;
+    object-fit: contain;
+}
+body.catalog-skin-legacy .nitro-catalog-classic-breadcrumb {
+    display: flex;
+    align-items: center;
+    gap: 5px;
+    min-height: 16px;
+    overflow: hidden;
+    color: #666a63;
+    font-size: 10px;
+    line-height: 1;
+    white-space: nowrap;
+}
+body.catalog-skin-legacy .nitro-catalog-classic-breadcrumb-segment {
+    display: inline-flex;
+    align-items: center;
+    gap: 5px;
+    min-width: 0;
+}
+body.catalog-skin-legacy .nitro-catalog-classic-breadcrumb-separator {
+    color: #9ea395;
+}
+body.catalog-skin-legacy .nitro-catalog-classic-navigation-shell::-webkit-scrollbar,
+body.catalog-skin-legacy .nitro-catalog-classic-layout-container :is(.overflow-auto,
+body.catalog-skin-legacy .nitro-card-content-shell,
+body.catalog-skin-legacy .nitro-catalog-classic-grid-shell)::-webkit-scrollbar {
+    width: 12px;
+}
+body.catalog-skin-legacy .nitro-catalog-classic-navigation-shell::-webkit-scrollbar-track,
+body.catalog-skin-legacy .nitro-catalog-classic-layout-container :is(.overflow-auto,
+body.catalog-skin-legacy .nitro-card-content-shell,
+body.catalog-skin-legacy .nitro-catalog-classic-grid-shell)::-webkit-scrollbar-track {
+    border-left: 1px solid #c2c6be;
+    background: #dde2d8;
+}
+body.catalog-skin-legacy .nitro-catalog-classic-navigation-shell::-webkit-scrollbar-thumb,
+body.catalog-skin-legacy .nitro-catalog-classic-layout-container :is(.overflow-auto,
+body.catalog-skin-legacy .nitro-card-content-shell,
+body.catalog-skin-legacy .nitro-catalog-classic-grid-shell)::-webkit-scrollbar-thumb {
+    border: 1px solid #7d8680;
+    border-radius: 6px;
+    background: linear-gradient(180deg, #a8b3ae 0%, #89948f 100%);
+}
+body.catalog-skin-legacy .nitro-catalog-classic-navigation-shell::-webkit-scrollbar-button:single-button:vertical:decrement,
+body.catalog-skin-legacy .nitro-catalog-classic-layout-container :is(.overflow-auto,
+body.catalog-skin-legacy .nitro-card-content-shell,
+body.catalog-skin-legacy .nitro-catalog-classic-grid-shell)::-webkit-scrollbar-button:single-button:vertical:decrement {
+    height: 12px;
+    background: #dde2d8;
+}
+body.catalog-skin-legacy .nitro-catalog-classic-navigation-shell::-webkit-scrollbar-button:single-button:vertical:increment,
+body.catalog-skin-legacy .nitro-catalog-classic-layout-container :is(.overflow-auto,
+body.catalog-skin-legacy .nitro-card-content-shell,
+body.catalog-skin-legacy .nitro-catalog-classic-grid-shell)::-webkit-scrollbar-button:single-button:vertical:increment {
+    height: 12px;
+    background: #dde2d8;
+}
+@media (max-width: 991.98px) {
+body.catalog-skin-legacy .nitro-catalog-classic-window {
+        width: min(calc(100vw - 16px), 570px) !important;
+        min-width: 0 !important;
+        height: min(calc(100vh - 16px), 635px) !important;
+        min-height: 0 !important;
+        max-width: calc(100vw - 16px) !important;
+    }
+body.catalog-skin-legacy .nitro-catalog-classic-stage {
+        grid-template-columns: minmax(0, 1fr);
+    }
+body.catalog-skin-legacy .nitro-catalog-classic-sidebar {
+        max-height: 180px;
+    }
+
+
+}
+
diff --git a/src/index.tsx b/src/index.tsx
index 3825168..a9dacf1 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -20,6 +20,7 @@ import './css/index.css';
 import './css/backgrounds/BackgroundsView.css';
 import './css/badges/BadgeLeaderboardView.css';
 import './css/catalog/CatalogClassicView.css';
+import './css/catalog/CatalogClassicLegacy.css';
 import './css/emustats/EmuStatsView.css';
 
 import './css/chat/Chats.css';

From 2b8aca23b6f8fe1645d679f2bf869155d50917b6 Mon Sep 17 00:00:00 2001
From: medievalshell <medievalshell@gmail.com>
Date: Fri, 29 May 2026 23:49:10 +0200
Subject: [PATCH 05/19] revert(catalog): ripristina catalogo Hippiehotel.nl
 (Modern+Classic)

Rimpiazza il catalogo del rebuild upstream con quello originale di
Hippiehotel.nl Nitro-V3 (CatalogModernView ripristinato, ClassicView/
sub-views/CSS pre-merge). CatalogView sceglie Modern (default) o Classic
via il toggle 'stile classico'. Rimosso l'hack CatalogClassicLegacy.css.
---
 src/components/catalog/CatalogClassicView.tsx |  57 +-
 src/components/catalog/CatalogModernView.tsx  | 331 ++++++++++++
 src/components/catalog/CatalogView.tsx        |  25 +-
 .../page/layout/CatalogLayoutDefaultView.tsx  |  25 +-
 .../page/layout/CatalogLayoutTrophiesView.tsx |   8 +-
 .../widgets/CatalogPurchaseWidgetView.tsx     |   2 +-
 .../widgets/CatalogViewProductWidgetView.tsx  |   4 -
 src/css/catalog/CatalogClassicLegacy.css      | 354 ------------
 src/css/catalog/CatalogClassicView.css        | 510 ++++--------------
 src/index.tsx                                 |   1 -
 10 files changed, 465 insertions(+), 852 deletions(-)
 create mode 100644 src/components/catalog/CatalogModernView.tsx
 delete mode 100644 src/css/catalog/CatalogClassicLegacy.css

diff --git a/src/components/catalog/CatalogClassicView.tsx b/src/components/catalog/CatalogClassicView.tsx
index 7153c22..a3f2a73 100644
--- a/src/components/catalog/CatalogClassicView.tsx
+++ b/src/components/catalog/CatalogClassicView.tsx
@@ -1,9 +1,9 @@
 import { AddLinkEventTracker, ILinkEventTracker, RemoveLinkEventTracker } from '@nitrots/nitro-renderer';
-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, useCatalogClassicStyle, useCatalogData, useCatalogUiState, useHasPermission, usePurse } from '../../hooks';
+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 { CatalogAdminProvider, useCatalogAdmin } from './CatalogAdminContext';
 import { CatalogAdminOfferEditView } from './views/admin/CatalogAdminOfferEditView';
 import { CatalogAdminPageEditView } from './views/admin/CatalogAdminPageEditView';
@@ -31,10 +31,6 @@ const CatalogClassicViewInner: FC<{}> = () =>
     const loading = catalogAdmin?.loading ?? false;
 
     const isMod = useHasPermission('acc_catalogfurni');
-    const [ catalogClassicStyle ] = useCatalogClassicStyle();
-    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;
@@ -123,45 +119,8 @@ const CatalogClassicViewInner: FC<{}> = () =>
     return (
         <>
             { isVisible &&
-                <NitroCardView classNames={ [ 'nitro-catalog-classic-window', catalogClassicStyle ? 'catalog-skin-legacy' : 'catalog-skin-modern' ] } isResizable={ false } uniqueKey="catalog">
+                <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 } />
-                    { !catalogClassicStyle &&
-                    <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>
@@ -189,7 +148,7 @@ const CatalogClassicViewInner: FC<{}> = () =>
                                 } }>
                                     <div className={ `flex items-center gap-1 ${ isHidden ? 'opacity-40' : '' }` }>
                                         <CatalogIconView icon={ child.iconId } />
-                                        <span className="nitro-catalog-classic-tab-label truncate">{ child.localization }</span>
+                                        <span className="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() }>
@@ -213,7 +172,7 @@ const CatalogClassicViewInner: FC<{}> = () =>
                             );
                         }) }
                         { isMod &&
-                            <NitroCardTabsItemView classNames={ [ 'nitro-catalog-classic-admin-tab' ] } isActive={ adminMode } onClick={ () => setAdminMode(!adminMode) }>
+                            <NitroCardTabsItemView isActive={ adminMode } onClick={ () => setAdminMode(!adminMode) }>
                                 <FaCog className={ `text-[10px] ${ adminMode ? 'animate-spin' : '' }` } style={ adminMode ? { animationDuration: '3s' } : {} } />
                             </NitroCardTabsItemView> }
                     </NitroCardTabsView>
diff --git a/src/components/catalog/CatalogModernView.tsx b/src/components/catalog/CatalogModernView.tsx
new file mode 100644
index 0000000..1c4af9a
--- /dev/null
+++ b/src/components/catalog/CatalogModernView.tsx
@@ -0,0 +1,331 @@
+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>
+    );
+};
diff --git a/src/components/catalog/CatalogView.tsx b/src/components/catalog/CatalogView.tsx
index 2859f24..a1d2d8b 100644
--- a/src/components/catalog/CatalogView.tsx
+++ b/src/components/catalog/CatalogView.tsx
@@ -1,26 +1,27 @@
-import { FC, useEffect } from 'react';
+import { FC } from 'react';
 import { useCatalogClassicStyle, useCatalogData } from '../../hooks';
 import { CatalogClassicView } from './CatalogClassicView';
+import { CatalogModernView } from './CatalogModernView';
 
 export const CatalogView: FC<{}> = () =>
 {
     const { catalogLocalizationVersion = 0 } = useCatalogData();
     const [ catalogClassicStyle ] = useCatalogClassicStyle();
 
-    // Toggle the legacy-skin marker on <body> so the scoped overrides in
-    // CatalogClassicLegacy.css (the pre-merge catalog look) take effect for
-    // every catalog element without touching the modern stylesheet.
-    useEffect(() =>
-    {
-        document.body.classList.toggle('catalog-skin-legacy', !!catalogClassicStyle);
-
-        return () => document.body.classList.remove('catalog-skin-legacy');
-    }, [ catalogClassicStyle ]);
-
-    return (
+    // Modern (Hippiehotel style) is the default; the "stile classico" toggle in
+    // user settings (or the global catalog.classic.style flag) switches to the
+    // classic catalog. Both views are the Hippiehotel.nl Nitro-V3 originals.
+    if(catalogClassicStyle) return (
         <>
             <div className="hidden" data-catalog-localization-version={ catalogLocalizationVersion } />
             <CatalogClassicView />
         </>
     );
+
+    return (
+        <>
+            <div className="hidden" data-catalog-localization-version={ catalogLocalizationVersion } />
+            <CatalogModernView />
+        </>
+    );
 };
diff --git a/src/components/catalog/views/page/layout/CatalogLayoutDefaultView.tsx b/src/components/catalog/views/page/layout/CatalogLayoutDefaultView.tsx
index 09411d1..3490e60 100644
--- a/src/components/catalog/views/page/layout/CatalogLayoutDefaultView.tsx
+++ b/src/components/catalog/views/page/layout/CatalogLayoutDefaultView.tsx
@@ -1,5 +1,5 @@
 import { FC } from 'react';
-import { FaEdit, FaPlus, FaPowerOff, FaSyncAlt } from 'react-icons/fa';
+import { FaEdit, FaPlus } from 'react-icons/fa';
 import { GetConfigurationValue, LocalizeText, ProductTypeEnum, SanitizeHtml } from '../../../../../api';
 import { Text } from '../../../../../common';
 import { useCatalogData } from '../../../../../hooks';
@@ -17,12 +17,13 @@ import { CatalogLayoutProps } from './CatalogLayout.types';
 export const CatalogLayoutDefaultView: FC<CatalogLayoutProps> = props =>
 {
     const { page = null } = props;
-    const { currentOffer = null, currentPage = null, roomPreviewer = null } = useCatalogData();
+    const { currentOffer = null, currentPage = 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
@@ -41,24 +42,23 @@ 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 shrink-0">
+                <div className="nitro-catalog-classic-offer-panel flex gap-0 overflow-hidden">
+                    { /* Preview area */ }
                     <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,16 +77,19 @@ export const CatalogLayoutDefaultView: FC<CatalogLayoutProps> = props =>
                                 </div> }
                             <CatalogLimitedItemWidgetView />
                         </div>
+                        { /* Price */ }
                         <CatalogTotalPriceWidget />
+                        { /* Spinner */ }
                         <CatalogSpinnerWidgetView />
-                        <div className="nitro-catalog-classic-offer-actions flex gap-1.5">
+                        { /* Actions */ }
+                        <div className="flex gap-1.5 mt-auto">
                             <CatalogPurchaseWidgetView />
                         </div>
                     </div>
                 </div> }
 
             { !currentOffer &&
-                <div className="nitro-catalog-classic-welcome flex items-center gap-3 shrink-0">
+                <div className="nitro-catalog-classic-welcome flex items-center gap-3">
                     { !!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)) } } />
diff --git a/src/components/catalog/views/page/layout/CatalogLayoutTrophiesView.tsx b/src/components/catalog/views/page/layout/CatalogLayoutTrophiesView.tsx
index 6bc187c..31299a0 100644
--- a/src/components/catalog/views/page/layout/CatalogLayoutTrophiesView.tsx
+++ b/src/components/catalog/views/page/layout/CatalogLayoutTrophiesView.tsx
@@ -58,11 +58,9 @@ export const CatalogLayoutTrophiesView: FC<CatalogLayoutProps> = props =>
                     </button>
                 </div> }
 
-            { /* Selected trophy card. shrink-0 + no overflow-hidden so the
-                 Buy button stays inside the panel even when the grid below
-                 holds many trophies. */ }
+            { /* Selected trophy card */ }
             { currentOffer
-                ? <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)' } }>
+                ? <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)' } }>
                     { /* 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)
@@ -92,7 +90,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">
+                        <div className="flex gap-1.5 mt-auto">
                             <CatalogPurchaseWidgetView />
                         </div>
                     </div>
diff --git a/src/components/catalog/views/page/widgets/CatalogPurchaseWidgetView.tsx b/src/components/catalog/views/page/widgets/CatalogPurchaseWidgetView.tsx
index e04cac0..5fe8ef8 100644
--- a/src/components/catalog/views/page/widgets/CatalogPurchaseWidgetView.tsx
+++ b/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 variant="success" disabled={ (purchaseOptions.extraParamRequired && (!purchaseOptions.extraData || !purchaseOptions.extraData.length)) } onClick={ event => setPurchaseState(CatalogPurchaseState.CONFIRM) }>{ LocalizeText('catalog.purchase_confirmation.' + (currentOffer.isRentOffer ? 'rent' : 'buy')) }</Button>;
+                return <Button disabled={ (purchaseOptions.extraParamRequired && (!purchaseOptions.extraData || !purchaseOptions.extraData.length)) } onClick={ event => setPurchaseState(CatalogPurchaseState.CONFIRM) }>{ LocalizeText('catalog.purchase_confirmation.' + (currentOffer.isRentOffer ? 'rent' : 'buy')) }</Button>;
         }
     };
 
diff --git a/src/components/catalog/views/page/widgets/CatalogViewProductWidgetView.tsx b/src/components/catalog/views/page/widgets/CatalogViewProductWidgetView.tsx
index f63f721..027aa36 100644
--- a/src/components/catalog/views/page/widgets/CatalogViewProductWidgetView.tsx
+++ b/src/components/catalog/views/page/widgets/CatalogViewProductWidgetView.tsx
@@ -19,8 +19,6 @@ export const CatalogViewProductWidgetView: FC<{}> = props =>
         if(!product) return;
 
         roomPreviewer.reset(false);
-        roomPreviewer.updateObjectRoom('default', 'default', 'default');
-        roomPreviewer.updateRoomWallsAndFloorVisibility(true, true);
 
         switch(product.productType)
         {
@@ -70,8 +68,6 @@ export const CatalogViewProductWidgetView: FC<{}> = props =>
             case ProductTypeEnum.WALL: {
                 if(!product.furnitureData) return;
 
-                roomPreviewer.updateRoomWallsAndFloorVisibility(true, true);
-
                 switch(product.furnitureData.specialType)
                 {
                     case FurniCategory.FLOOR:
diff --git a/src/css/catalog/CatalogClassicLegacy.css b/src/css/catalog/CatalogClassicLegacy.css
deleted file mode 100644
index db5c6ef..0000000
--- a/src/css/catalog/CatalogClassicLegacy.css
+++ /dev/null
@@ -1,354 +0,0 @@
-/* Auto-generated: pre-merge catalog CSS scoped under .catalog-skin-legacy (classic style toggle). Source: CatalogClassicView.css @ b360595. Do not edit by hand. */
-body.catalog-skin-legacy .nitro-catalog-classic-window {
-    width: 640px !important;
-    height: 600px !important;
-    max-width: 640px !important;
-    min-width: 640px !important;
-    min-height: 600px !important;
-    max-height: 600px !important;
-}
-body.catalog-skin-legacy .nitro-catalog-classic-window .nitro-card-title {
-    font-size: 18px;
-    letter-spacing: 0.2px;
-}
-body.catalog-skin-legacy .nitro-catalog-classic-window .nitro-card-header-shell {
-    min-height: 38px;
-    max-height: 38px;
-}
-body.catalog-skin-legacy .nitro-catalog-classic-admin-banner {
-    border-bottom: 1px solid rgba(0, 0, 0, 0.18);
-    background: linear-gradient(180deg, #f4d45d 0%, #d8b43e 100%);
-}
-body.catalog-skin-legacy .nitro-catalog-classic-tabs-shell {
-    flex-wrap: nowrap;
-    gap: 1px;
-    min-height: 30px;
-    max-height: 30px;
-    padding: 0 6px;
-    overflow-x: auto;
-    overflow-y: hidden;
-    align-items: end;
-    background: #e7e8df;
-    border-bottom: 1px solid #b8beb4;
-}
-body.catalog-skin-legacy .nitro-catalog-classic-tabs-shell .nitro-card-tab-item {
-    min-height: 28px;
-    padding: 5px 10px 4px;
-    border: 1px solid #8f8f8b;
-    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);
-    white-space: nowrap;
-}
-body.catalog-skin-legacy .nitro-catalog-classic-tabs-shell .nitro-card-tab-item:hover {
-    background: linear-gradient(180deg, #ffffff 0%, #e7ece4 100%);
-}
-body.catalog-skin-legacy .nitro-catalog-classic-tabs-shell .nitro-card-tab-item-active {
-    background: #f2f2eb;
-    transform: translateY(0);
-    position: relative;
-    top: 1px;
-}
-body.catalog-skin-legacy .nitro-catalog-classic-content-shell {
-    padding: 6px 8px 8px !important;
-}
-body.catalog-skin-legacy .nitro-catalog-classic-stage {
-    display: grid;
-    grid-template-columns: 196px minmax(0, 1fr);
-    gap: 8px;
-    min-height: 0;
-    height: 100%;
-}
-body.catalog-skin-legacy .nitro-catalog-classic-stage.is-navigation-hidden {
-    grid-template-columns: minmax(0, 1fr);
-}
-body.catalog-skin-legacy .nitro-catalog-classic-sidebar {
-    display: flex;
-    flex-direction: column;
-    gap: 4px;
-    min-height: 0;
-    height: 100%;
-}
-body.catalog-skin-legacy .nitro-catalog-classic-search-shell {
-    padding: 3px;
-    border: 1px solid #a7aba1;
-    border-radius: 4px;
-    background: linear-gradient(180deg, #f9f8f2 0%, #eaede5 100%);
-}
-body.catalog-skin-legacy .nitro-catalog-classic-search-shell input {
-    height: 18px;
-    padding-top: 0 !important;
-    padding-bottom: 0 !important;
-    border-width: 1px !important;
-    border-color: #8f9588 !important;
-    border-radius: 3px !important;
-    background: #fff !important;
-    box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.08);
-}
-body.catalog-skin-legacy .nitro-catalog-classic-search-shell svg {
-    color: #61645b !important;
-}
-body.catalog-skin-legacy .nitro-catalog-classic-navigation-shell {
-    flex: 1 1 auto;
-    min-height: 0;
-    padding: 3px 2px 3px 3px;
-    border: 1px solid #a7aba1;
-    border-radius: 4px;
-    background: linear-gradient(180deg, #f1f2ec 0%, #d8ddd3 100%);
-    overflow: auto;
-}
-body.catalog-skin-legacy .nitro-catalog-classic-navigation-list {
-    display: flex;
-    flex-direction: column;
-    gap: 2px;
-}
-body.catalog-skin-legacy .nitro-catalog-classic-navigation-node.is-child {
-    margin-left: 10px;
-}
-body.catalog-skin-legacy .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;
-    cursor: pointer;
-    transition: background-color 0.12s ease, border-color 0.12s ease;
-}
-body.catalog-skin-legacy .nitro-catalog-classic-navigation-item:hover {
-    background: linear-gradient(180deg, #ffffff 0%, #ebeee6 100%);
-    border-color: #9ea79b;
-}
-body.catalog-skin-legacy .nitro-catalog-classic-navigation-item.is-active {
-    background: linear-gradient(180deg, #dae7f0 0%, #c4d2de 100%);
-    border-color: #8e9ba5;
-    font-weight: 700;
-}
-body.catalog-skin-legacy .nitro-catalog-classic-navigation-item.is-drag-over {
-    outline: 2px solid rgba(48, 114, 140, 0.35);
-    outline-offset: 1px;
-}
-body.catalog-skin-legacy .nitro-catalog-classic-navigation-icon {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    width: 18px;
-    min-width: 18px;
-    height: 18px;
-}
-body.catalog-skin-legacy .nitro-catalog-classic-navigation-icon img,
-body.catalog-skin-legacy .nitro-catalog-classic-navigation-icon canvas {
-    width: auto;
-    height: auto;
-    max-width: 18px;
-    max-height: 18px;
-}
-body.catalog-skin-legacy .nitro-catalog-classic-navigation-label {
-    flex: 1 1 auto;
-    min-width: 0;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    font-size: 11px;
-    line-height: 1;
-}
-body.catalog-skin-legacy .nitro-catalog-classic-navigation-caret,
-body.catalog-skin-legacy .nitro-catalog-classic-navigation-favorite,
-body.catalog-skin-legacy .nitro-catalog-classic-navigation-admin,
-body.catalog-skin-legacy .nitro-catalog-classic-navigation-drag {
-    flex-shrink: 0;
-}
-body.catalog-skin-legacy .nitro-catalog-classic-navigation-caret {
-    color: #676d66 !important;
-}
-body.catalog-skin-legacy .nitro-catalog-classic-layout-shell {
-    display: flex;
-    flex-direction: column;
-    min-width: 0;
-    min-height: 0;
-    height: 100%;
-    border: 1px solid #a7aba1;
-    border-radius: 4px;
-    background: linear-gradient(180deg, #eceee7 0%, #dfe4da 100%);
-    overflow: hidden;
-}
-body.catalog-skin-legacy .nitro-catalog-classic-layout-header-shell {
-    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%);
-}
-body.catalog-skin-legacy .nitro-catalog-classic-layout-hero {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    flex: 1 1 auto;
-    min-height: 32px;
-    overflow: hidden;
-}
-body.catalog-skin-legacy .nitro-catalog-classic-layout-hero img {
-    max-width: 100%;
-    max-height: 32px;
-    width: auto;
-    height: auto;
-    object-fit: contain;
-}
-body.catalog-skin-legacy .nitro-catalog-classic-layout-container {
-    flex: 1 1 auto;
-    min-height: 0;
-    padding: 6px;
-    background: #f2f2eb;
-    overflow: hidden;
-}
-body.catalog-skin-legacy .nitro-catalog-classic-default-layout {
-    gap: 8px;
-}
-body.catalog-skin-legacy .nitro-catalog-classic-offer-panel,
-body.catalog-skin-legacy .nitro-catalog-classic-welcome {
-    border: 1px solid #bfc4bc;
-    border-radius: 6px;
-    background: linear-gradient(180deg, #ffffff 0%, #f3f3ed 100%);
-    box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.92);
-}
-body.catalog-skin-legacy .nitro-catalog-classic-offer-preview {
-    width: 136px;
-    min-width: 136px;
-    padding: 8px;
-    border-right: 1px solid #c9cec5;
-    background: linear-gradient(180deg, #eef2ea 0%, #dde3d8 100%);
-}
-body.catalog-skin-legacy .nitro-catalog-classic-offer-info {
-    padding: 10px;
-}
-body.catalog-skin-legacy .nitro-catalog-classic-welcome {
-    min-height: 128px;
-    padding: 10px;
-}
-body.catalog-skin-legacy .nitro-catalog-classic-grid-shell {
-    min-height: 150px;
-    padding: 4px;
-    border: 1px solid #bcc2b8;
-    border-radius: 6px;
-    background: linear-gradient(180deg, #f5f5f0 0%, #e4e7de 100%);
-    height: auto;
-    flex: 1 1 auto;
-}
-body.catalog-skin-legacy .nitro-catalog-classic-grid {
-    gap: 4px !important;
-    align-content: start;
-}
-body.catalog-skin-legacy .nitro-catalog-classic-window .layout-grid-item {
-    height: 54px;
-    border: 1px solid #b8beb6 !important;
-    border-radius: 6px !important;
-    background-color: #d7dde2;
-    background-image: none;
-    box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.55);
-}
-body.catalog-skin-legacy .nitro-catalog-classic-window .layout-grid-item.is-active {
-    background-color: #e5ebef !important;
-    border-color: #8f978b !important;
-}
-body.catalog-skin-legacy .nitro-catalog-classic-grid-offer-icon {
-    position: absolute;
-    inset: 4px;
-    background-repeat: no-repeat;
-    background-position: center;
-    pointer-events: none;
-}
-body.catalog-skin-legacy .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%);
-}
-body.catalog-skin-legacy .nitro-catalog-classic-window .nitro-catalog-header img {
-    max-width: 100%;
-    max-height: 48px;
-    width: auto;
-    height: auto;
-    object-fit: contain;
-}
-body.catalog-skin-legacy .nitro-catalog-classic-breadcrumb {
-    display: flex;
-    align-items: center;
-    gap: 5px;
-    min-height: 16px;
-    overflow: hidden;
-    color: #666a63;
-    font-size: 10px;
-    line-height: 1;
-    white-space: nowrap;
-}
-body.catalog-skin-legacy .nitro-catalog-classic-breadcrumb-segment {
-    display: inline-flex;
-    align-items: center;
-    gap: 5px;
-    min-width: 0;
-}
-body.catalog-skin-legacy .nitro-catalog-classic-breadcrumb-separator {
-    color: #9ea395;
-}
-body.catalog-skin-legacy .nitro-catalog-classic-navigation-shell::-webkit-scrollbar,
-body.catalog-skin-legacy .nitro-catalog-classic-layout-container :is(.overflow-auto,
-body.catalog-skin-legacy .nitro-card-content-shell,
-body.catalog-skin-legacy .nitro-catalog-classic-grid-shell)::-webkit-scrollbar {
-    width: 12px;
-}
-body.catalog-skin-legacy .nitro-catalog-classic-navigation-shell::-webkit-scrollbar-track,
-body.catalog-skin-legacy .nitro-catalog-classic-layout-container :is(.overflow-auto,
-body.catalog-skin-legacy .nitro-card-content-shell,
-body.catalog-skin-legacy .nitro-catalog-classic-grid-shell)::-webkit-scrollbar-track {
-    border-left: 1px solid #c2c6be;
-    background: #dde2d8;
-}
-body.catalog-skin-legacy .nitro-catalog-classic-navigation-shell::-webkit-scrollbar-thumb,
-body.catalog-skin-legacy .nitro-catalog-classic-layout-container :is(.overflow-auto,
-body.catalog-skin-legacy .nitro-card-content-shell,
-body.catalog-skin-legacy .nitro-catalog-classic-grid-shell)::-webkit-scrollbar-thumb {
-    border: 1px solid #7d8680;
-    border-radius: 6px;
-    background: linear-gradient(180deg, #a8b3ae 0%, #89948f 100%);
-}
-body.catalog-skin-legacy .nitro-catalog-classic-navigation-shell::-webkit-scrollbar-button:single-button:vertical:decrement,
-body.catalog-skin-legacy .nitro-catalog-classic-layout-container :is(.overflow-auto,
-body.catalog-skin-legacy .nitro-card-content-shell,
-body.catalog-skin-legacy .nitro-catalog-classic-grid-shell)::-webkit-scrollbar-button:single-button:vertical:decrement {
-    height: 12px;
-    background: #dde2d8;
-}
-body.catalog-skin-legacy .nitro-catalog-classic-navigation-shell::-webkit-scrollbar-button:single-button:vertical:increment,
-body.catalog-skin-legacy .nitro-catalog-classic-layout-container :is(.overflow-auto,
-body.catalog-skin-legacy .nitro-card-content-shell,
-body.catalog-skin-legacy .nitro-catalog-classic-grid-shell)::-webkit-scrollbar-button:single-button:vertical:increment {
-    height: 12px;
-    background: #dde2d8;
-}
-@media (max-width: 991.98px) {
-body.catalog-skin-legacy .nitro-catalog-classic-window {
-        width: min(calc(100vw - 16px), 570px) !important;
-        min-width: 0 !important;
-        height: min(calc(100vh - 16px), 635px) !important;
-        min-height: 0 !important;
-        max-width: calc(100vw - 16px) !important;
-    }
-body.catalog-skin-legacy .nitro-catalog-classic-stage {
-        grid-template-columns: minmax(0, 1fr);
-    }
-body.catalog-skin-legacy .nitro-catalog-classic-sidebar {
-        max-height: 180px;
-    }
-
-
-}
-
diff --git a/src/css/catalog/CatalogClassicView.css b/src/css/catalog/CatalogClassicView.css
index 48a6100..b1dff1b 100644
--- a/src/css/catalog/CatalogClassicView.css
+++ b/src/css/catalog/CatalogClassicView.css
@@ -1,29 +1,10 @@
 .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 {
@@ -36,12 +17,6 @@
     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%);
@@ -49,47 +24,41 @@
 
 .nitro-catalog-classic-tabs-shell {
     flex-wrap: nowrap;
-    gap: 2px;
-    min-height: 32px;
-    max-height: 32px;
-    padding: 4px 6px 0;
+    gap: 1px;
+    min-height: 30px;
+    max-height: 30px;
+    padding: 0 6px;
     overflow-x: auto;
     overflow-y: hidden;
     align-items: end;
-    background: var(--cat-strip);
-    border-bottom: 2px solid var(--cat-ink);
+    background: #e7e8df;
+    border-bottom: 1px solid #b8beb4;
 }
 
 .nitro-catalog-classic-tabs-shell .nitro-card-tab-item {
     min-height: 28px;
-    padding: 5px 12px 4px;
-    border: 1px solid var(--cat-tab-border);
+    padding: 5px 10px 4px;
+    border: 1px solid #8f8f8b;
     border-bottom: 0;
     border-radius: 5px 5px 0 0;
-    background: var(--cat-tab);
-    color: var(--cat-ink);
-    box-shadow: none;
+    background: linear-gradient(180deg, #fafaf7 0%, #dde2d9 100%);
+    box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.9);
     white-space: nowrap;
-    font-weight: 700;
 }
 
 .nitro-catalog-classic-tabs-shell .nitro-card-tab-item:hover {
-    background: #c7d4dd;
+    background: linear-gradient(180deg, #ffffff 0%, #e7ece4 100%);
 }
 
 .nitro-catalog-classic-tabs-shell .nitro-card-tab-item-active {
-    background: #ffffff;
-    color: #000000;
+    background: #f2f2eb;
+    transform: translateY(0);
     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 {
@@ -113,82 +82,75 @@
 }
 
 .nitro-catalog-classic-search-shell {
-    padding: 4px;
-    border: 1px solid var(--cat-line);
+    padding: 3px;
+    border: 1px solid #a7aba1;
     border-radius: 4px;
-    background: var(--cat-panel);
+    background: linear-gradient(180deg, #f9f8f2 0%, #eaede5 100%);
 }
 
 .nitro-catalog-classic-search-shell input {
-    height: 20px;
+    height: 18px;
     padding-top: 0 !important;
     padding-bottom: 0 !important;
     border-width: 1px !important;
-    border-color: var(--cat-tab-border) !important;
+    border-color: #8f9588 !important;
     border-radius: 3px !important;
     background: #fff !important;
-    box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.06);
+    box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.08);
 }
 
 .nitro-catalog-classic-search-shell svg {
-    color: #5b7080 !important;
+    color: #61645b !important;
 }
 
 .nitro-catalog-classic-navigation-shell {
     flex: 1 1 auto;
     min-height: 0;
-    padding: 4px 0;
-    border: 1px solid var(--cat-line);
+    padding: 3px 2px 3px 3px;
+    border: 1px solid #a7aba1;
     border-radius: 4px;
-    background: var(--cat-panel);
+    background: linear-gradient(180deg, #f1f2ec 0%, #d8ddd3 100%);
     overflow: auto;
 }
 
 .nitro-catalog-classic-navigation-list {
     display: flex;
     flex-direction: column;
-    gap: 0;
+    gap: 2px;
 }
 
-.nitro-catalog-classic-navigation-node.is-child .nitro-catalog-classic-navigation-item {
-    padding-left: 22px;
-    background: var(--cat-sub);
+.nitro-catalog-classic-navigation-node.is-child {
+    margin-left: 10px;
 }
 
 .nitro-catalog-classic-navigation-item {
     display: flex;
     align-items: center;
-    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;
+    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;
     cursor: pointer;
-    transition: background-color 0.12s ease;
-}
-
-.nitro-catalog-classic-navigation-node.is-child .nitro-catalog-classic-navigation-item {
-    font-weight: 400;
+    transition: background-color 0.12s ease, border-color 0.12s ease;
 }
 
 .nitro-catalog-classic-navigation-item:hover {
-    background: #dde6ec;
+    background: linear-gradient(180deg, #ffffff 0%, #ebeee6 100%);
+    border-color: #9ea79b;
 }
 
 .nitro-catalog-classic-navigation-item.is-active {
-    background: #ffffff;
-    border-left-color: var(--cat-blue);
-    color: #000000;
+    background: linear-gradient(180deg, #dae7f0 0%, #c4d2de 100%);
+    border-color: #8e9ba5;
     font-weight: 700;
 }
 
 .nitro-catalog-classic-navigation-item.is-drag-over {
-    outline: 2px solid rgba(58, 130, 167, 0.4);
-    outline-offset: -2px;
+    outline: 2px solid rgba(48, 114, 140, 0.35);
+    outline-offset: 1px;
 }
 
 .nitro-catalog-classic-navigation-icon {
@@ -226,7 +188,7 @@
 }
 
 .nitro-catalog-classic-navigation-caret {
-    color: #5b7080 !important;
+    color: #676d66 !important;
 }
 
 .nitro-catalog-classic-layout-shell {
@@ -235,9 +197,9 @@
     min-width: 0;
     min-height: 0;
     height: 100%;
-    border: 1px solid var(--cat-line);
+    border: 1px solid #a7aba1;
     border-radius: 4px;
-    background: #ffffff;
+    background: linear-gradient(180deg, #eceee7 0%, #dfe4da 100%);
     overflow: hidden;
 }
 
@@ -245,28 +207,26 @@
     display: flex;
     flex-direction: column;
     gap: 3px;
-    flex-shrink: 0;
-    min-height: 0;
-    padding: 6px 8px;
-    border-bottom: 1px solid var(--cat-line);
-    background: #ffffff;
+    min-height: 66px;
+    padding: 5px 7px;
+    border-bottom: 1px solid #c8cdc3;
+    background: linear-gradient(180deg, #f6f6f2 0%, #e9ece4 100%);
 }
 
 .nitro-catalog-classic-layout-hero {
     display: flex;
     align-items: center;
     justify-content: center;
-    flex: 0 0 auto;
+    flex: 1 1 auto;
     min-height: 32px;
-    overflow: visible;
+    overflow: hidden;
 }
 
 .nitro-catalog-classic-layout-hero img {
-    display: block;
+    max-width: 100%;
+    max-height: 32px;
     width: auto;
     height: auto;
-    max-width: 100%;
-    max-height: none;
     object-fit: contain;
 }
 
@@ -274,7 +234,7 @@
     flex: 1 1 auto;
     min-height: 0;
     padding: 6px;
-    background: #ffffff;
+    background: #f2f2eb;
     overflow: hidden;
 }
 
@@ -284,42 +244,24 @@
 
 .nitro-catalog-classic-offer-panel,
 .nitro-catalog-classic-welcome {
-    border: 1px solid var(--cat-line);
+    border: 1px solid #bfc4bc;
     border-radius: 6px;
-    background: #ffffff;
-}
-
-.nitro-catalog-classic-offer-panel {
-    min-height: 132px;
-    overflow: hidden;
+    background: linear-gradient(180deg, #ffffff 0%, #f3f3ed 100%);
+    box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.92);
 }
 
 .nitro-catalog-classic-offer-preview {
-    width: 190px;
-    min-width: 190px;
+    width: 136px;
+    min-width: 136px;
     padding: 8px;
-    border-right: 1px solid var(--cat-line);
-    background-color: var(--cat-canvas);
+    border-right: 1px solid #c9cec5;
+    background: linear-gradient(180deg, #eef2ea 0%, #dde3d8 100%);
 }
 
 .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;
@@ -327,40 +269,31 @@
 
 .nitro-catalog-classic-grid-shell {
     min-height: 150px;
-    padding: 6px;
-    border: 1px solid var(--cat-line);
+    padding: 4px;
+    border: 1px solid #bcc2b8;
     border-radius: 6px;
-    background: #ffffff;
+    background: linear-gradient(180deg, #f5f5f0 0%, #e4e7de 100%);
     height: auto;
     flex: 1 1 auto;
 }
 
 .nitro-catalog-classic-grid {
-    gap: 6px !important;
+    gap: 4px !important;
     align-content: start;
 }
 
 .nitro-catalog-classic-window .layout-grid-item {
     height: 54px;
-    border: 1px solid var(--cat-line) !important;
-    border-radius: 4px !important;
-    background-color: #ffffff;
+    border: 1px solid #b8beb6 !important;
+    border-radius: 6px !important;
+    background-color: #d7dde2;
     background-image: none;
-    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);
+    box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.55);
 }
 
 .nitro-catalog-classic-window .layout-grid-item.is-active {
-    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);
+    background-color: #e5ebef !important;
+    border-color: #8f978b !important;
 }
 
 .nitro-catalog-classic-grid-offer-icon {
@@ -372,12 +305,21 @@
 }
 
 .nitro-catalog-classic-window .nitro-catalog-header {
-    display: none;
+    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%);
 }
 
-.nitro-catalog-classic-offer-info .bg-\[\#00800b\] {
-    background-color: var(--cat-buy) !important;
-    border-color: #007a00 !important;
+.nitro-catalog-classic-window .nitro-catalog-header img {
+    max-width: 100%;
+    max-height: 48px;
+    width: auto;
+    height: auto;
+    object-fit: contain;
 }
 
 .nitro-catalog-classic-breadcrumb {
@@ -386,7 +328,7 @@
     gap: 5px;
     min-height: 16px;
     overflow: hidden;
-    color: #5b7080;
+    color: #666a63;
     font-size: 10px;
     line-height: 1;
     white-space: nowrap;
@@ -400,7 +342,7 @@
 }
 
 .nitro-catalog-classic-breadcrumb-separator {
-    color: #94a7b3;
+    color: #9ea395;
 }
 
 .nitro-catalog-classic-navigation-shell::-webkit-scrollbar,
@@ -410,37 +352,36 @@
 
 .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 var(--cat-line);
-    background: var(--cat-panel);
+    border-left: 1px solid #c2c6be;
+    background: #dde2d8;
 }
 
 .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 var(--cat-tab-border);
+    border: 1px solid #7d8680;
     border-radius: 6px;
-    background: linear-gradient(180deg, #a9bcc9 0%, #89a0ae 100%);
+    background: linear-gradient(180deg, #a8b3ae 0%, #89948f 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: var(--cat-panel);
+    background: #dde2d8;
 }
 
 .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: var(--cat-panel);
+    background: #dde2d8;
 }
 
-@media (max-width: 1024px) and (min-width: 641px) {
+@media (max-width: 991.98px) {
     .nitro-catalog-classic-window {
-        width: min(calc(100vw - 24px), 720px) !important;
+        width: min(calc(100vw - 16px), 570px) !important;
         min-width: 0 !important;
-        max-width: calc(100vw - 24px) !important;
-        height: min(calc(100vh - 24px), 720px) !important;
+        height: min(calc(100vh - 16px), 635px) !important;
         min-height: 0 !important;
-        max-height: calc(100vh - 24px) !important;
+        max-width: calc(100vw - 16px) !important;
     }
 
     .nitro-catalog-classic-stage {
@@ -448,267 +389,6 @@
     }
 
     .nitro-catalog-classic-sidebar {
-        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;
+        max-height: 180px;
     }
 }
diff --git a/src/index.tsx b/src/index.tsx
index a9dacf1..3825168 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -20,7 +20,6 @@ import './css/index.css';
 import './css/backgrounds/BackgroundsView.css';
 import './css/badges/BadgeLeaderboardView.css';
 import './css/catalog/CatalogClassicView.css';
-import './css/catalog/CatalogClassicLegacy.css';
 import './css/emustats/EmuStatsView.css';
 
 import './css/chat/Chats.css';

From 4f133abe33bffe31b89ef55c53b57b1996b2e43b Mon Sep 17 00:00:00 2001
From: medievalshell <medievalshell@gmail.com>
Date: Fri, 29 May 2026 23:55:36 +0200
Subject: [PATCH 06/19] feat(catalog): default upstream, toggle classico =
 Hippiehotel

Default catalog = rebuild upstream ultima release (CatalogClassicView).
Il toggle 'stile classico' mostra il catalogo Hippiehotel (CatalogModernView).
---
 src/components/catalog/CatalogClassicView.tsx |  53 +-
 src/components/catalog/CatalogView.tsx        |  10 +-
 .../page/layout/CatalogLayoutDefaultView.tsx  |  25 +-
 .../page/layout/CatalogLayoutTrophiesView.tsx |   8 +-
 .../widgets/CatalogPurchaseWidgetView.tsx     |   2 +-
 .../widgets/CatalogViewProductWidgetView.tsx  |   4 +
 src/css/catalog/CatalogClassicView.css        | 510 ++++++++++++++----
 7 files changed, 487 insertions(+), 125 deletions(-)

diff --git a/src/components/catalog/CatalogClassicView.tsx b/src/components/catalog/CatalogClassicView.tsx
index a3f2a73..1ee04f2 100644
--- a/src/components/catalog/CatalogClassicView.tsx
+++ b/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>
diff --git a/src/components/catalog/CatalogView.tsx b/src/components/catalog/CatalogView.tsx
index a1d2d8b..600264b 100644
--- a/src/components/catalog/CatalogView.tsx
+++ b/src/components/catalog/CatalogView.tsx
@@ -8,20 +8,20 @@ export const CatalogView: FC<{}> = () =>
     const { catalogLocalizationVersion = 0 } = useCatalogData();
     const [ catalogClassicStyle ] = useCatalogClassicStyle();
 
-    // Modern (Hippiehotel style) is the default; the "stile classico" toggle in
-    // user settings (or the global catalog.classic.style flag) switches to the
-    // classic catalog. Both views are the Hippiehotel.nl Nitro-V3 originals.
+    // Default = upstream rebuilt catalog (CatalogClassicView, latest release theme).
+    // The "stile classico" toggle (or global catalog.classic.style flag) switches
+    // to the Hippiehotel.nl catalog (CatalogModernView, self-contained tailwind).
     if(catalogClassicStyle) return (
         <>
             <div className="hidden" data-catalog-localization-version={ catalogLocalizationVersion } />
-            <CatalogClassicView />
+            <CatalogModernView />
         </>
     );
 
     return (
         <>
             <div className="hidden" data-catalog-localization-version={ catalogLocalizationVersion } />
-            <CatalogModernView />
+            <CatalogClassicView />
         </>
     );
 };
diff --git a/src/components/catalog/views/page/layout/CatalogLayoutDefaultView.tsx b/src/components/catalog/views/page/layout/CatalogLayoutDefaultView.tsx
index 3490e60..09411d1 100644
--- a/src/components/catalog/views/page/layout/CatalogLayoutDefaultView.tsx
+++ b/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)) } } />
diff --git a/src/components/catalog/views/page/layout/CatalogLayoutTrophiesView.tsx b/src/components/catalog/views/page/layout/CatalogLayoutTrophiesView.tsx
index 31299a0..6bc187c 100644
--- a/src/components/catalog/views/page/layout/CatalogLayoutTrophiesView.tsx
+++ b/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>
diff --git a/src/components/catalog/views/page/widgets/CatalogPurchaseWidgetView.tsx b/src/components/catalog/views/page/widgets/CatalogPurchaseWidgetView.tsx
index 5fe8ef8..e04cac0 100644
--- a/src/components/catalog/views/page/widgets/CatalogPurchaseWidgetView.tsx
+++ b/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>;
         }
     };
 
diff --git a/src/components/catalog/views/page/widgets/CatalogViewProductWidgetView.tsx b/src/components/catalog/views/page/widgets/CatalogViewProductWidgetView.tsx
index 027aa36..f63f721 100644
--- a/src/components/catalog/views/page/widgets/CatalogViewProductWidgetView.tsx
+++ b/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:
diff --git a/src/css/catalog/CatalogClassicView.css b/src/css/catalog/CatalogClassicView.css
index b1dff1b..48a6100 100644
--- a/src/css/catalog/CatalogClassicView.css
+++ b/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;
     }
 }

From 4e96355a948bd63eccfd9b0d88c73cd0d7f7d515 Mon Sep 17 00:00:00 2001
From: medievalshell <medievalshell@gmail.com>
Date: Sat, 30 May 2026 00:15:07 +0200
Subject: [PATCH 07/19] perf(boot): non pre-fetchare le URL gamedata directory

preloadUrl salta le URL che finiscono con '/' (le gamedata split sono
directory): prima 404avano e sprecavano connessioni all'avvio.
---
 src/App.tsx | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/App.tsx b/src/App.tsx
index 55fce02..4b799ef 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -31,6 +31,11 @@ const preloadUrl = async (url: string): Promise<void> =>
 {
     if(!url) return;
 
+    // Split gamedata URLs are directories (end with '/'); fetching them as a
+    // file just 404s and wastes a connection at startup. The real split loader
+    // handles those — only warm up actual file URLs here.
+    if(url.split('?')[0].split('#')[0].endsWith('/')) return;
+
     try
     {
         const response = await fetch(url, { cache: 'force-cache' });

From 72952318c0785a305f2fdd3b0b29eb878cab8fd5 Mon Sep 17 00:00:00 2001
From: medievalshell <medievalshell@gmail.com>
Date: Sat, 30 May 2026 00:26:59 +0200
Subject: [PATCH 08/19] fix(catalog-admin): non re-includere ' (pageId)' nella
 caption editata

Il form di modifica pagina precompilava la caption con la localization
che include il suffisso ' (id)' aggiunto dal server ai mod, e salvandola
l'id si accumulava (Wired (1114) (1114) ...). Ora striscia quel suffisso.
---
 .../catalog/views/admin/CatalogAdminPageEditView.tsx   | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/components/catalog/views/admin/CatalogAdminPageEditView.tsx b/src/components/catalog/views/admin/CatalogAdminPageEditView.tsx
index b85393a..94b2326 100644
--- a/src/components/catalog/views/admin/CatalogAdminPageEditView.tsx
+++ b/src/components/catalog/views/admin/CatalogAdminPageEditView.tsx
@@ -67,8 +67,14 @@ export const CatalogAdminPageEditView: FC<{}> = () =>
     {
         if(!editingPageData || !targetNode) return;
 
-        setCaption(targetNode.localization || '');
-        setCaptionSave(targetNode.pageName || targetNode.localization || '');
+        // The server appends " (pageId)" to the caption for mods/admins (see
+        // CatalogPagesListComposer). Strip that exact suffix before seeding the
+        // edit field, otherwise saving folds the id back into the stored
+        // caption and it multiplies on every edit ("Wired (1114) (1114) ...").
+        const rawCaption = (targetNode.localization || '').replace(new RegExp(`\\s*\\(${ targetNode.pageId }\\)\\s*$`), '');
+
+        setCaption(rawCaption);
+        setCaptionSave(targetNode.pageName || rawCaption);
         setCatalogMode(currentType === CatalogType.BUILDER ? 'BUILDER' : 'NORMAL');
         setPageLayout(currentPage?.layoutCode || 'default_3x3');
         setIconImage(targetNode.iconId ?? 0);

From 91f114bb3dd9e8657fc7dce59bbf0a57fbed6dc8 Mon Sep 17 00:00:00 2001
From: medievalshell <medievalshell@gmail.com>
Date: Sat, 30 May 2026 02:02:43 +0200
Subject: [PATCH 09/19] fix(config): pet.asset.url usa /pet/ non /pets/
 (cartella bundled e 'pet')

---
 public/configuration/renderer-config.example | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/configuration/renderer-config.example b/public/configuration/renderer-config.example
index c40cdee..8438c97 100644
--- a/public/configuration/renderer-config.example
+++ b/public/configuration/renderer-config.example
@@ -27,7 +27,7 @@
     "avatar.asset.effect.url": "${asset.url}/effect/%libname%.nitro",
     "furni.asset.url": "${asset.url}/furniture/%libname%.nitro",
     "furni.asset.icon.url": "${hof.furni.url}/icons/%libname%%param%_icon.png",
-    "pet.asset.url": "${asset.url}/pets/%libname%.nitro",
+    "pet.asset.url": "${asset.url}/pet/%libname%.nitro",
     "generic.asset.url": "${asset.url}/generic/%libname%.nitro",
     "badge.asset.url": "${image.library.url}album1584/%badgename%.gif",
 	"radio.url": "${gamedata.url}/radio-stations.json5?t=%timestamp%",

From 6db8d3e1910579e6e671f41852170eb29eb80297 Mon Sep 17 00:00:00 2001
From: medievalshell <medievalshell@gmail.com>
Date: Sat, 30 May 2026 02:34:25 +0200
Subject: [PATCH 10/19] feat(catalog): layout info BC (logo 70% + box testo
 nero) via info_duckets

---
 .../page/layout/CatalogLayoutBcInfoView.tsx   | 32 +++++++++++++++++++
 .../views/page/layout/GetCatalogLayout.tsx    |  3 ++
 2 files changed, 35 insertions(+)
 create mode 100644 src/components/catalog/views/page/layout/CatalogLayoutBcInfoView.tsx

diff --git a/src/components/catalog/views/page/layout/CatalogLayoutBcInfoView.tsx b/src/components/catalog/views/page/layout/CatalogLayoutBcInfoView.tsx
new file mode 100644
index 0000000..13c5aca
--- /dev/null
+++ b/src/components/catalog/views/page/layout/CatalogLayoutBcInfoView.tsx
@@ -0,0 +1,32 @@
+import { FC } from 'react';
+import { SanitizeHtml } from '../../../../../api';
+import { CatalogLayoutProps } from './CatalogLayout.types';
+
+// Info/landing layout: a big logo box (70% of the page height) on top and a
+// smaller box below holding the page text in black. Logo = page headline
+// image (getImage(0)), text = page text 1 (getText(0)). Set both from
+// catalog admin (Gestione -> Modifica pagina).
+export const CatalogLayoutBcInfoView: FC<CatalogLayoutProps> = props =>
+{
+    const { page = null } = props;
+
+    const logo = page?.localization?.getImage(0) || '';
+    const text = page?.localization?.getText(0) || '';
+
+    return (
+        <div className="flex flex-col h-full gap-2">
+            <div
+                className="bg-white rounded border border-card-grid-item-border flex items-center justify-center overflow-hidden"
+                style={ { height: '70%' } }>
+                { logo
+                    ? <img alt="" className="max-h-full max-w-full object-contain" src={ logo } />
+                    : <span className="text-muted text-[11px]">Logo — imposta l'immagine headline da Gestione</span> }
+            </div>
+            <div className="flex-1 min-h-0 bg-white rounded border border-card-grid-item-border p-3 overflow-auto">
+                <div
+                    className="text-black text-[12px] leading-snug"
+                    dangerouslySetInnerHTML={ { __html: SanitizeHtml(text) } } />
+            </div>
+        </div>
+    );
+};
diff --git a/src/components/catalog/views/page/layout/GetCatalogLayout.tsx b/src/components/catalog/views/page/layout/GetCatalogLayout.tsx
index 6ccf2a1..ce68f37 100644
--- a/src/components/catalog/views/page/layout/GetCatalogLayout.tsx
+++ b/src/components/catalog/views/page/layout/GetCatalogLayout.tsx
@@ -1,6 +1,7 @@
 import { ICatalogPage } from '../../../../../api';
 import { CatalogLayoutProps } from './CatalogLayout.types';
 import { CatalogLayoutBadgeDisplayView } from './CatalogLayoutBadgeDisplayView';
+import { CatalogLayoutBcInfoView } from './CatalogLayoutBcInfoView';
 import { CatalogLayoutBuildersClubBuyView } from './CatalogLayoutBuildersClubBuyView';
 import { CatalogLayoutColorGroupingView } from './CatalogLayoutColorGroupingView';
 import { CatalogLayoutCustomPrefixView } from './CatalogLayoutCustomPrefixView';
@@ -34,6 +35,8 @@ export const GetCatalogLayout = (page: ICatalogPage, hideNavigation: () => void)
     {
         case 'frontpage_featured':
             return null;
+        case 'info_duckets':
+            return <CatalogLayoutBcInfoView { ...layoutProps } />;
         case 'frontpage4':
             return <CatalogLayoutFrontpage4View { ...layoutProps } />;
         case 'pets':

From 552cd1f5387118ede8246963aac74a626165e96e Mon Sep 17 00:00:00 2001
From: medievalshell <medievalshell@gmail.com>
Date: Sat, 30 May 2026 02:43:07 +0200
Subject: [PATCH 11/19] fix(catalog): layout info BC nasconde la navigazione
 vuota a sinistra

---
 .../views/page/layout/CatalogLayoutBcInfoView.tsx    | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/components/catalog/views/page/layout/CatalogLayoutBcInfoView.tsx b/src/components/catalog/views/page/layout/CatalogLayoutBcInfoView.tsx
index 13c5aca..dee8094 100644
--- a/src/components/catalog/views/page/layout/CatalogLayoutBcInfoView.tsx
+++ b/src/components/catalog/views/page/layout/CatalogLayoutBcInfoView.tsx
@@ -1,18 +1,24 @@
-import { FC } from 'react';
+import { FC, useEffect } from 'react';
 import { SanitizeHtml } from '../../../../../api';
 import { CatalogLayoutProps } from './CatalogLayout.types';
 
 // Info/landing layout: a big logo box (70% of the page height) on top and a
 // smaller box below holding the page text in black. Logo = page headline
 // image (getImage(0)), text = page text 1 (getText(0)). Set both from
-// catalog admin (Gestione -> Modifica pagina).
+// catalog admin (Gestione -> Modifica pagina). Hides the (empty) navigation
+// sidebar so the content uses the full width.
 export const CatalogLayoutBcInfoView: FC<CatalogLayoutProps> = props =>
 {
-    const { page = null } = props;
+    const { page = null, hideNavigation = null } = props;
 
     const logo = page?.localization?.getImage(0) || '';
     const text = page?.localization?.getText(0) || '';
 
+    useEffect(() =>
+    {
+        hideNavigation?.();
+    }, [ page, hideNavigation ]);
+
     return (
         <div className="flex flex-col h-full gap-2">
             <div

From c9997f60499d8a4c326c02eed547a4d3c1ee866e Mon Sep 17 00:00:00 2001
From: medievalshell <medievalshell@gmail.com>
Date: Sat, 30 May 2026 03:03:28 +0200
Subject: [PATCH 12/19] fix(catalog): immagini pagina supportano URL completi e
 estensioni non-gif

---
 src/api/catalog/PageLocalization.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/api/catalog/PageLocalization.ts b/src/api/catalog/PageLocalization.ts
index f24ae87..824683d 100644
--- a/src/api/catalog/PageLocalization.ts
+++ b/src/api/catalog/PageLocalization.ts
@@ -27,8 +27,16 @@ export class PageLocalization implements IPageLocalization
 
         if(!imageName || !imageName.length) return null;
 
+        // Already a full URL (any extension) -> use it directly.
+        if(/^https?:\/\//i.test(imageName)) return imageName;
+
         let assetUrl = GetConfigurationValue<string>('catalog.asset.image.url');
 
+        // The template forces ".gif" (.../%name%.gif). If the image name
+        // already carries its own extension (png/jpg/webp/gif), don't append
+        // the forced .gif so non-gif catalog images work too.
+        if(/\.[a-z0-9]+$/i.test(imageName)) assetUrl = assetUrl.replace(/\.gif(?=$|\?)/i, '');
+
         assetUrl = assetUrl.replace('%name%', imageName);
 
         return assetUrl;

From 9f737c512984d144208145e74617fb87cff26980 Mon Sep 17 00:00:00 2001
From: medievalshell <medievalshell@gmail.com>
Date: Sat, 30 May 2026 03:08:44 +0200
Subject: [PATCH 13/19] style(catalog): logo info a tutta larghezza (no crop,
 no margini)

---
 .../page/layout/CatalogLayoutBcInfoView.tsx      | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/components/catalog/views/page/layout/CatalogLayoutBcInfoView.tsx b/src/components/catalog/views/page/layout/CatalogLayoutBcInfoView.tsx
index dee8094..750c638 100644
--- a/src/components/catalog/views/page/layout/CatalogLayoutBcInfoView.tsx
+++ b/src/components/catalog/views/page/layout/CatalogLayoutBcInfoView.tsx
@@ -2,11 +2,11 @@ import { FC, useEffect } from 'react';
 import { SanitizeHtml } from '../../../../../api';
 import { CatalogLayoutProps } from './CatalogLayout.types';
 
-// Info/landing layout: a big logo box (70% of the page height) on top and a
-// smaller box below holding the page text in black. Logo = page headline
-// image (getImage(0)), text = page text 1 (getText(0)). Set both from
-// catalog admin (Gestione -> Modifica pagina). Hides the (empty) navigation
-// sidebar so the content uses the full width.
+// Info/landing layout: a logo box on top (image fills the full width, natural
+// height, no crop) and a smaller box below with the page text in black.
+// Logo = page headline image (getImage(0)), text = page text 1 (getText(0)),
+// set from catalog admin (Gestione -> Modifica pagina). Hides the (empty)
+// navigation sidebar so the content uses the full width.
 export const CatalogLayoutBcInfoView: FC<CatalogLayoutProps> = props =>
 {
     const { page = null, hideNavigation = null } = props;
@@ -22,10 +22,10 @@ export const CatalogLayoutBcInfoView: FC<CatalogLayoutProps> = props =>
     return (
         <div className="flex flex-col h-full gap-2">
             <div
-                className="bg-white rounded border border-card-grid-item-border flex items-center justify-center overflow-hidden"
-                style={ { height: '70%' } }>
+                className="bg-white rounded border border-card-grid-item-border overflow-hidden flex items-center justify-center"
+                style={ logo ? undefined : { minHeight: '70%' } }>
                 { logo
-                    ? <img alt="" className="max-h-full max-w-full object-contain" src={ logo } />
+                    ? <img alt="" className="block w-full h-auto" src={ logo } />
                     : <span className="text-muted text-[11px]">Logo — imposta l'immagine headline da Gestione</span> }
             </div>
             <div className="flex-1 min-h-0 bg-white rounded border border-card-grid-item-border p-3 overflow-auto">

From 624a310c5946237ec61f7ae0a86ec2ce9e0a35ae Mon Sep 17 00:00:00 2001
From: medievalshell <medievalshell@gmail.com>
Date: Sat, 30 May 2026 03:14:36 +0200
Subject: [PATCH 14/19] style(catalog): logo info massimizzato senza crop,
 testo box piu piccolo

---
 .../views/page/layout/CatalogLayoutBcInfoView.tsx    | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/components/catalog/views/page/layout/CatalogLayoutBcInfoView.tsx b/src/components/catalog/views/page/layout/CatalogLayoutBcInfoView.tsx
index 750c638..793801f 100644
--- a/src/components/catalog/views/page/layout/CatalogLayoutBcInfoView.tsx
+++ b/src/components/catalog/views/page/layout/CatalogLayoutBcInfoView.tsx
@@ -2,8 +2,8 @@ import { FC, useEffect } from 'react';
 import { SanitizeHtml } from '../../../../../api';
 import { CatalogLayoutProps } from './CatalogLayout.types';
 
-// Info/landing layout: a logo box on top (image fills the full width, natural
-// height, no crop) and a smaller box below with the page text in black.
+// Info/landing layout: a logo box on top (image scaled to fit the available
+// space, no crop) and a smaller box below with the page text in black.
 // Logo = page headline image (getImage(0)), text = page text 1 (getText(0)),
 // set from catalog admin (Gestione -> Modifica pagina). Hides the (empty)
 // navigation sidebar so the content uses the full width.
@@ -21,14 +21,12 @@ export const CatalogLayoutBcInfoView: FC<CatalogLayoutProps> = props =>
 
     return (
         <div className="flex flex-col h-full gap-2">
-            <div
-                className="bg-white rounded border border-card-grid-item-border overflow-hidden flex items-center justify-center"
-                style={ logo ? undefined : { minHeight: '70%' } }>
+            <div className="flex-1 min-h-0 bg-white rounded border border-card-grid-item-border overflow-hidden flex items-center justify-center">
                 { logo
-                    ? <img alt="" className="block w-full h-auto" src={ logo } />
+                    ? <img alt="" className="max-w-full max-h-full object-contain" src={ logo } />
                     : <span className="text-muted text-[11px]">Logo — imposta l'immagine headline da Gestione</span> }
             </div>
-            <div className="flex-1 min-h-0 bg-white rounded border border-card-grid-item-border p-3 overflow-auto">
+            <div className="shrink-0 max-h-[32%] bg-white rounded border border-card-grid-item-border p-3 overflow-auto">
                 <div
                     className="text-black text-[12px] leading-snug"
                     dangerouslySetInnerHTML={ { __html: SanitizeHtml(text) } } />

From a034517143ea1d85992f719a3ea93682ce8ce2af Mon Sep 17 00:00:00 2001
From: medievalshell <medievalshell@gmail.com>
Date: Sat, 30 May 2026 03:17:32 +0200
Subject: [PATCH 15/19] style(catalog): logo info edge-to-edge (object-cover)

---
 .../catalog/views/page/layout/CatalogLayoutBcInfoView.tsx       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/catalog/views/page/layout/CatalogLayoutBcInfoView.tsx b/src/components/catalog/views/page/layout/CatalogLayoutBcInfoView.tsx
index 793801f..f7fc770 100644
--- a/src/components/catalog/views/page/layout/CatalogLayoutBcInfoView.tsx
+++ b/src/components/catalog/views/page/layout/CatalogLayoutBcInfoView.tsx
@@ -23,7 +23,7 @@ export const CatalogLayoutBcInfoView: FC<CatalogLayoutProps> = props =>
         <div className="flex flex-col h-full gap-2">
             <div className="flex-1 min-h-0 bg-white rounded border border-card-grid-item-border overflow-hidden flex items-center justify-center">
                 { logo
-                    ? <img alt="" className="max-w-full max-h-full object-contain" src={ logo } />
+                    ? <img alt="" className="w-full h-full object-cover" src={ logo } />
                     : <span className="text-muted text-[11px]">Logo — imposta l'immagine headline da Gestione</span> }
             </div>
             <div className="shrink-0 max-h-[32%] bg-white rounded border border-card-grid-item-border p-3 overflow-auto">

From 8e95ca9570f2082ff5ce0bdddb0ae1de7f0eccf0 Mon Sep 17 00:00:00 2001
From: medievalshell <medievalshell@gmail.com>
Date: Sat, 30 May 2026 03:22:48 +0200
Subject: [PATCH 16/19] style(catalog): logo info torna a contain (immagine
 intera con bordi)

---
 .../catalog/views/page/layout/CatalogLayoutBcInfoView.tsx       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/catalog/views/page/layout/CatalogLayoutBcInfoView.tsx b/src/components/catalog/views/page/layout/CatalogLayoutBcInfoView.tsx
index f7fc770..793801f 100644
--- a/src/components/catalog/views/page/layout/CatalogLayoutBcInfoView.tsx
+++ b/src/components/catalog/views/page/layout/CatalogLayoutBcInfoView.tsx
@@ -23,7 +23,7 @@ export const CatalogLayoutBcInfoView: FC<CatalogLayoutProps> = props =>
         <div className="flex flex-col h-full gap-2">
             <div className="flex-1 min-h-0 bg-white rounded border border-card-grid-item-border overflow-hidden flex items-center justify-center">
                 { logo
-                    ? <img alt="" className="w-full h-full object-cover" src={ logo } />
+                    ? <img alt="" className="max-w-full max-h-full object-contain" src={ logo } />
                     : <span className="text-muted text-[11px]">Logo — imposta l'immagine headline da Gestione</span> }
             </div>
             <div className="shrink-0 max-h-[32%] bg-white rounded border border-card-grid-item-border p-3 overflow-auto">

From 52a7dc16048f4ede87def7e736434c60adb5550a Mon Sep 17 00:00:00 2001
From: medievalshell <medievalshell@gmail.com>
Date: Sat, 30 May 2026 03:32:40 +0200
Subject: [PATCH 17/19] fix(catalog): scrollbar-gutter stable sulla nav,
 proporzioni costanti con/senza scroll

---
 src/css/catalog/CatalogClassicView.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/css/catalog/CatalogClassicView.css b/src/css/catalog/CatalogClassicView.css
index 48a6100..a595965 100644
--- a/src/css/catalog/CatalogClassicView.css
+++ b/src/css/catalog/CatalogClassicView.css
@@ -142,6 +142,10 @@
     border-radius: 4px;
     background: var(--cat-panel);
     overflow: auto;
+    /* Reserve the scrollbar space at all times so the rows (and the active
+       highlight) keep the same width/proportions whether or not the list
+       overflows into a scrollbar (e.g. many sub-pages). */
+    scrollbar-gutter: stable;
 }
 
 .nitro-catalog-classic-navigation-list {

From d79bdd33e1f09b095475f6a4cf379d0ac3146466 Mon Sep 17 00:00:00 2001
From: medievalshell <medievalshell@gmail.com>
Date: Sat, 30 May 2026 03:42:58 +0200
Subject: [PATCH 18/19] fix(catalog): scrollbar-gutter both-edges, icona nav
 centrata con/senza scroll

---
 src/css/catalog/CatalogClassicView.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/css/catalog/CatalogClassicView.css b/src/css/catalog/CatalogClassicView.css
index a595965..dc99550 100644
--- a/src/css/catalog/CatalogClassicView.css
+++ b/src/css/catalog/CatalogClassicView.css
@@ -142,10 +142,10 @@
     border-radius: 4px;
     background: var(--cat-panel);
     overflow: auto;
-    /* Reserve the scrollbar space at all times so the rows (and the active
-       highlight) keep the same width/proportions whether or not the list
+    /* Reserve the scrollbar space at all times (both edges) so the rows and
+       the active highlight stay centered/consistent whether or not the list
        overflows into a scrollbar (e.g. many sub-pages). */
-    scrollbar-gutter: stable;
+    scrollbar-gutter: stable both-edges;
 }
 
 .nitro-catalog-classic-navigation-list {

From f7e78674c697378329e4083607bcced24a01a5df Mon Sep 17 00:00:00 2001
From: medievalshell <medievalshell@gmail.com>
Date: Sat, 30 May 2026 05:49:04 +0200
Subject: [PATCH 19/19] fix(client): catalogo mobile,
 BC/navigator/profilo/amici

- Catalogo Hippiehotel responsive su mobile (finestra 96vw/72vh, rail
  tappabile, sotto-pannelli ristretti); duckie ripristinato come entita
  separata (revert modifiche scrollbar sul suo CSS)
- BC e catalogo normale seguono entrambi il toggle tema; il duckie non
  duplica piu il logo nelle pagine info_duckets
- Navigator: highlight della tab segue currentTabCode (era bloccato su
  Pubblici mentre il contenuto cambiava)
- Inventario: link inventory/show/<tab> per deep-link a una scheda
- User Profile: avatar visibile e allineato a bg/stand, finestra piu
  grande, bordi puliti, Created/Last login mostrano il valore, bottoni
  Change Looks/Rooms/Change Badges/Add friends/Achievement funzionanti
- Amici: header non piu sovradimensionati e teste avatar inquadrate
  (regole flat: quelle annidate .nitro-friends{&...} non si applicavano)
---
 src/components/catalog/CatalogClassicView.tsx |  3 +-
 src/components/catalog/CatalogModernView.tsx  | 12 ++--
 src/components/catalog/CatalogView.tsx        |  1 +
 src/components/inventory/InventoryView.tsx    |  9 +++
 src/components/navigator/NavigatorView.tsx    |  4 +-
 .../RelationshipsContainerView.tsx            |  6 +-
 .../user-profile/UserContainerView.tsx        | 26 ++++----
 .../user-profile/UserProfileView.tsx          | 15 ++---
 src/css/catalog/CatalogClassicView.css        |  4 --
 src/css/friends/FriendsView.css               | 50 +++++++++++++++-
 src/css/user-profile/UserProfileView.css      | 60 +++++++++++--------
 11 files changed, 125 insertions(+), 65 deletions(-)

diff --git a/src/components/catalog/CatalogClassicView.tsx b/src/components/catalog/CatalogClassicView.tsx
index 1ee04f2..9df060e 100644
--- a/src/components/catalog/CatalogClassicView.tsx
+++ b/src/components/catalog/CatalogClassicView.tsx
@@ -252,7 +252,8 @@ const CatalogClassicViewInner: FC<{}> = () =>
                                 <div className="nitro-catalog-classic-layout-header-shell">
                                     <CatalogBreadcrumbView />
                                     <div className="nitro-catalog-classic-layout-hero">
-                                        { !!currentPage?.localization?.getImage(0) && <img src={ currentPage.localization.getImage(0) } /> }
+                                        { /* info_duckets renders its own logo in the body (BcInfoView) — don't duplicate it in the hero */ }
+                                        { (currentPage?.layoutCode !== 'info_duckets') && !!currentPage?.localization?.getImage(0) && <img src={ currentPage.localization.getImage(0) } /> }
                                     </div>
                                 </div>
                                 <div className="nitro-catalog-classic-layout-container">
diff --git a/src/components/catalog/CatalogModernView.tsx b/src/components/catalog/CatalogModernView.tsx
index 1c4af9a..ea1c2de 100644
--- a/src/components/catalog/CatalogModernView.tsx
+++ b/src/components/catalog/CatalogModernView.tsx
@@ -37,6 +37,10 @@ const CatalogModernViewInner: FC<{}> = () =>
     const buildersClubHeaderStyle = (currentType === CatalogType.BUILDER)
         ? { borderColor: '#d79d2e', borderBottomColor: '#000', background: 'linear-gradient(180deg, #d89f2d 0%, #c68515 100%)' }
         : undefined;
+    // Desktop = fixed 780x520. On mobile the window clamps below the viewport so
+    // it reads as a dialog (with margins) instead of filling the whole phone
+    // screen — applies to both the normal catalog and the Builders Club.
+    const catalogCardSize = 'w-[780px] h-[520px] max-w-[96vw] max-h-[72vh] sm:max-w-[100vw] sm:max-h-[92vh]';
 
     useEffect(() =>
     {
@@ -122,7 +126,7 @@ const CatalogModernViewInner: FC<{}> = () =>
     return (
         <>
             { isVisible &&
-                <NitroCardView className="nitro-catalog w-[780px] h-[520px]" uniqueKey="catalog">
+                <NitroCardView className={ `nitro-catalog ${ catalogCardSize }` } 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 */ }
@@ -141,7 +145,7 @@ const CatalogModernViewInner: FC<{}> = () =>
                         <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">
+                            <div className="group/rail flex flex-col w-[52px] sm: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 [scrollbar-width:none] [&::-webkit-scrollbar]:hidden">
 
                                 { /* Favorites toggle */ }
                                 <div
@@ -279,7 +283,7 @@ const CatalogModernViewInner: FC<{}> = () =>
                                             : <span className="text-muted">{ LocalizeText('catalog.title') }</span> }
                                     </div>
 
-                                    <div className="w-[180px] shrink-0">
+                                    <div className="w-[110px] sm:w-[180px] shrink-0">
                                         <CatalogSearchView />
                                     </div>
 
@@ -301,7 +305,7 @@ const CatalogModernViewInner: FC<{}> = () =>
                                         </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">
+                                                <div className="w-[120px] min-w-[120px] sm:w-[170px] sm: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">
diff --git a/src/components/catalog/CatalogView.tsx b/src/components/catalog/CatalogView.tsx
index 600264b..87344fe 100644
--- a/src/components/catalog/CatalogView.tsx
+++ b/src/components/catalog/CatalogView.tsx
@@ -11,6 +11,7 @@ export const CatalogView: FC<{}> = () =>
     // Default = upstream rebuilt catalog (CatalogClassicView, latest release theme).
     // The "stile classico" toggle (or global catalog.classic.style flag) switches
     // to the Hippiehotel.nl catalog (CatalogModernView, self-contained tailwind).
+    // Both the normal catalog and the Builders Club follow this toggle.
     if(catalogClassicStyle) return (
         <>
             <div className="hidden" data-catalog-localization-version={ catalogLocalizationVersion } />
diff --git a/src/components/inventory/InventoryView.tsx b/src/components/inventory/InventoryView.tsx
index 4c95c35..881ddce 100644
--- a/src/components/inventory/InventoryView.tsx
+++ b/src/components/inventory/InventoryView.tsx
@@ -19,6 +19,13 @@ const TAB_PETS: string = 'inventory.furni.tab.pets';
 const TAB_BADGES: string = 'inventory.badges';
 const TAB_PREFIXES: string = 'inventory.prefixes';
 const TABS = [ TAB_FURNITURE, TAB_PETS, TAB_BADGES, TAB_PREFIXES, TAB_BOTS ];
+// Maps an optional link code (inventory/show/<code>) to a tab so other views
+// (e.g. the profile "Change Badges" button) can deep-link to a specific tab.
+const TAB_BY_CODE: Record<string, string> = {
+    furni: TAB_FURNITURE, furniture: TAB_FURNITURE,
+    pets: TAB_PETS, badges: TAB_BADGES,
+    prefixes: TAB_PREFIXES, bots: TAB_BOTS
+};
 const UNSEEN_CATEGORIES = [ UnseenItemCategory.FURNI, UnseenItemCategory.PET, UnseenItemCategory.BADGE, UnseenItemCategory.PREFIX, UnseenItemCategory.BOT ];
 const TAB_ICONS: Record<string, ReactNode> = {
     [TAB_FURNITURE]: <FaCouch />,
@@ -94,12 +101,14 @@ export const InventoryView: FC<{}> = props =>
                 {
                     case 'show':
                         setIsVisible(true);
+                        if(parts[2] && TAB_BY_CODE[parts[2]]) setCurrentTab(TAB_BY_CODE[parts[2]]);
                         return;
                     case 'hide':
                         setIsVisible(false);
                         return;
                     case 'toggle':
                         setIsVisible(prevValue => !prevValue);
+                        if(parts[2] && TAB_BY_CODE[parts[2]]) setCurrentTab(TAB_BY_CODE[parts[2]]);
                         return;
                 }
             },
diff --git a/src/components/navigator/NavigatorView.tsx b/src/components/navigator/NavigatorView.tsx
index b93b8d5..8daf79b 100644
--- a/src/components/navigator/NavigatorView.tsx
+++ b/src/components/navigator/NavigatorView.tsx
@@ -22,7 +22,7 @@ export const NavigatorView: FC<{}> = props =>
 {
     const { topLevelContext, topLevelContexts, navigatorData, navigatorSearches } = useNavigatorData();
     const { searchResult, isFetching } = useNavigatorSearch();
-    const { isVisible, isCreatorOpen, isRoomInfoOpen, isRoomLinkOpen, isOpenSavesSearches, needsInit } = useNavigatorUiState();
+    const { isVisible, isCreatorOpen, isRoomInfoOpen, isRoomLinkOpen, isOpenSavesSearches, needsInit, currentTabCode } = useNavigatorUiState();
     const elementRef = useRef<HTMLDivElement>(null);
 
     useNitroEvent<RoomSessionEvent>(RoomSessionEvent.CREATED, event =>
@@ -122,7 +122,7 @@ export const NavigatorView: FC<{}> = props =>
                         { topLevelContexts && topLevelContexts.length > 0 && topLevelContexts.map((context, index) =>
                             <NitroCard.TabItem
                                 key={ index }
-                                isActive={ topLevelContext === context && !isCreatorOpen }
+                                isActive={ (currentTabCode ? currentTabCode === context.code : topLevelContext === context) && !isCreatorOpen }
                                 onClick={ () => useNavigatorUiStore.getState().setTab(context.code) }>
                                 { LocalizeText('navigator.toplevelview.' + context.code) }
                             </NitroCard.TabItem>) }
diff --git a/src/components/user-profile/RelationshipsContainerView.tsx b/src/components/user-profile/RelationshipsContainerView.tsx
index 4de625a..204eb2b 100644
--- a/src/components/user-profile/RelationshipsContainerView.tsx
+++ b/src/components/user-profile/RelationshipsContainerView.tsx
@@ -1,6 +1,6 @@
 import { RelationshipStatusEnum, RelationshipStatusInfoMessageParser } from '@nitrots/nitro-renderer';
 import { FC } from 'react';
-import { GetUserProfile, LocalizeText } from '../../api';
+import { CreateLinkEvent, GetUserProfile, LocalizeText } from '../../api';
 import { Flex, LayoutAvatarImageView } from '../../common';
 
 interface RelationshipsContainerViewProps
@@ -29,7 +29,7 @@ export const RelationshipsContainerView: FC<RelationshipsContainerViewProps> = p
                 </Flex>
                 <div className="nitro-extended-profile__relationship-copy">
                     <div className="nitro-extended-profile__relationship-box">
-                        <p className="nitro-extended-profile__relationship-name" onClick={ event => (relationshipInfo && (relationshipInfo.randomFriendId >= 1) && GetUserProfile(relationshipInfo.randomFriendId)) }>
+                        <p className="nitro-extended-profile__relationship-name" onClick={ event => ((relationshipInfo && (relationshipInfo.randomFriendId >= 1)) ? GetUserProfile(relationshipInfo.randomFriendId) : CreateLinkEvent('friends/toggle')) }>
                             { (!relationshipInfo || (relationshipInfo.friendCount === 0)) &&
                                 LocalizeText('extendedprofile.add.friends') }
                             { (relationshipInfo && (relationshipInfo.friendCount >= 1)) &&
@@ -37,7 +37,7 @@ export const RelationshipsContainerView: FC<RelationshipsContainerViewProps> = p
                         </p>
                         { (relationshipInfo && (relationshipInfo.friendCount >= 1)) &&
                             <div className="nitro-extended-profile__relationship-head">
-                                <LayoutAvatarImageView direction={ 4 } figure={ relationshipInfo.randomFriendFigure } headOnly={ true } classNames={ [ '!w-auto', '!h-auto', '!left-0' ] } />
+                                <LayoutAvatarImageView direction={ 2 } figure={ relationshipInfo.randomFriendFigure } headOnly={ true } />
                             </div> }
                     </div>
                     <p className="nitro-extended-profile__relationship-subcopy">
diff --git a/src/components/user-profile/UserContainerView.tsx b/src/components/user-profile/UserContainerView.tsx
index 73b3ca2..e4e6b43 100644
--- a/src/components/user-profile/UserContainerView.tsx
+++ b/src/components/user-profile/UserContainerView.tsx
@@ -60,18 +60,12 @@ export const UserContainerView: FC<UserContainerViewProps> = props =>
                                 prefixText={ userProfile.prefixText }
                                 username={ userProfile.username } />
                             <p className="nitro-extended-profile__motto">{ userProfile.motto || '\u00A0' }</p>
-                            <p
-                                className="nitro-extended-profile__meta"
-                                dangerouslySetInnerHTML={ {
-                                    __html: LocalizeText('extendedprofile.created', [ 'created' ], [ userProfile.registration ])
-                                } }
-                            />
-                            <p
-                                className="nitro-extended-profile__meta"
-                                dangerouslySetInnerHTML={ {
-                                    __html: LocalizeText('extendedprofile.last.login', [ 'lastlogin' ], [ FriendlyTime.format(userProfile.secondsSinceLastVisit, '.ago', 2) ])
-                                } }
-                            />
+                            <p className="nitro-extended-profile__meta">
+                                <b>{ LocalizeText('extendedprofile.created').replace(/%\w+%/g, '').trim() }</b> { userProfile.registration }
+                            </p>
+                            <p className="nitro-extended-profile__meta">
+                                <b>{ LocalizeText('extendedprofile.last.login').replace(/%\w+%/g, '').trim() }</b> { FriendlyTime.format(userProfile.secondsSinceLastVisit, '.ago', 2) }
+                            </p>
                             <p className="nitro-extended-profile__meta nitro-extended-profile__meta--strong">
                                 <b>{ LocalizeText('extendedprofile.achievementscore') }</b> { userProfile.achievementPoints }
                             </p>
@@ -100,10 +94,10 @@ export const UserContainerView: FC<UserContainerViewProps> = props =>
 
                     { isOwnProfile &&
                         <div className="nitro-extended-profile__actions">
-                            <button className="nitro-extended-profile__link" type="button">
+                            <button className="nitro-extended-profile__link" type="button" onClick={ () => CreateLinkEvent('avatar-editor/show') }>
                                 { LocalizeText('extended.profile.change.looks') }
                             </button>
-                            <button className="nitro-extended-profile__link" type="button" onClick={ () => CreateLinkEvent('inventory/open/badges') }>
+                            <button className="nitro-extended-profile__link" type="button" onClick={ () => CreateLinkEvent('inventory/show/badges') }>
                                 { LocalizeText('extended.profile.change.badges') }
                             </button>
                         </div> }
@@ -148,11 +142,11 @@ export const UserContainerView: FC<UserContainerViewProps> = props =>
                     <span className="nitro-extended-profile__summary-label">{ LocalizeText('inventory.badges') }</span>
                     <span className="nitro-extended-profile__summary-value">{ totalBadges }</span>
                 </button>
-                <div className="nitro-extended-profile__summary-button">
+                <button className="nitro-extended-profile__summary-button nitro-extended-profile__summary-button--center" type="button" onClick={ () => CreateLinkEvent('achievements/toggle') }>
                     <img className="nitro-extended-profile__summary-icon" src={ profileLevelIcon } alt="" />
                     <span className="nitro-extended-profile__summary-label">{ LocalizeText('extendedprofile.achievementscore') }</span>
                     <span className="nitro-extended-profile__summary-value">{ userProfile.achievementPoints }</span>
-                </div>
+                </button>
             </div>
         </div>
     );
diff --git a/src/components/user-profile/UserProfileView.tsx b/src/components/user-profile/UserProfileView.tsx
index fd5a3b5..801fd4d 100644
--- a/src/components/user-profile/UserProfileView.tsx
+++ b/src/components/user-profile/UserProfileView.tsx
@@ -1,6 +1,6 @@
-import { ExtendedProfileChangedMessageEvent, GetSessionDataManager, NavigatorSearchComposer, RelationshipStatusInfoEvent, RelationshipStatusInfoMessageParser, RoomEngineObjectEvent, RoomObjectCategory, RoomObjectType, UserCurrentBadgesComposer, UserCurrentBadgesEvent, UserProfileEvent, UserProfileParser, UserRelationshipsComposer } from '@nitrots/nitro-renderer';
+import { ExtendedProfileChangedMessageEvent, GetSessionDataManager, RelationshipStatusInfoEvent, RelationshipStatusInfoMessageParser, RoomEngineObjectEvent, RoomObjectCategory, RoomObjectType, UserCurrentBadgesComposer, UserCurrentBadgesEvent, UserProfileEvent, UserProfileParser, UserRelationshipsComposer } from '@nitrots/nitro-renderer';
 import { FC, useState } from 'react';
-import { GetRoomSession, GetUserProfile, LocalizeText, SendMessageComposer } from '../../api';
+import { CreateLinkEvent, GetRoomSession, GetUserProfile, LocalizeText, SendMessageComposer } from '../../api';
 import { useMessageEvent, useNitroEvent } from '../../hooks';
 import { NitroCard } from '../../layout';
 import { GroupsContainerView } from './GroupsContainerView';
@@ -28,10 +28,11 @@ export const UserProfileView: FC<{}> = () =>
 
     const onOpenRooms = () =>
     {
-        if(userProfile)
-        {
-            SendMessageComposer(new NavigatorSearchComposer('hotel_view', `owner:${ userProfile.username }`));
-        }
+        if(!userProfile) return;
+
+        // Open the navigator AND run the owner search (the composer alone never
+        // showed the navigator window, so the button looked dead).
+        CreateLinkEvent(`navigator/search/hotel_view/owner:${ userProfile.username }`);
     };
 
     useMessageEvent<UserCurrentBadgesEvent>(UserCurrentBadgesEvent, event =>
@@ -100,7 +101,7 @@ export const UserProfileView: FC<{}> = () =>
     if(!userProfile) return null;
 
     return (
-        <NitroCard className="nitro-extended-profile-window w-[521px] h-[537px]" uniqueKey="nitro-user-profile">
+        <NitroCard className="nitro-extended-profile-window w-[600px] h-[600px] max-w-[96vw] max-h-[92vh]" uniqueKey="nitro-user-profile">
             <NitroCard.Header
                 headerText={ LocalizeText('extendedprofile.caption') }
                 onCloseClick={ onClose } />
diff --git a/src/css/catalog/CatalogClassicView.css b/src/css/catalog/CatalogClassicView.css
index dc99550..48a6100 100644
--- a/src/css/catalog/CatalogClassicView.css
+++ b/src/css/catalog/CatalogClassicView.css
@@ -142,10 +142,6 @@
     border-radius: 4px;
     background: var(--cat-panel);
     overflow: auto;
-    /* Reserve the scrollbar space at all times (both edges) so the rows and
-       the active highlight stay centered/consistent whether or not the list
-       overflows into a scrollbar (e.g. many sub-pages). */
-    scrollbar-gutter: stable both-edges;
 }
 
 .nitro-catalog-classic-navigation-list {
diff --git a/src/css/friends/FriendsView.css b/src/css/friends/FriendsView.css
index 2b2ea17..3786920 100644
--- a/src/css/friends/FriendsView.css
+++ b/src/css/friends/FriendsView.css
@@ -176,9 +176,15 @@
         border: 0 !important;
     }
 
-    & .nitro-card-accordion-set-header span {
-        font-size: 12px;
+    /* The header title is rendered by the shared <Text> component, which is a
+       <div> (not a <span>) — so target the div too, otherwise it keeps the app
+       default size and shows as oversized "testoni". */
+    & .nitro-card-accordion-set-header span,
+    & .nitro-card-accordion-set-header > div {
+        font-size: 12px !important;
+        font-weight: 700;
         color: #111 !important;
+        line-height: 1.1;
     }
 
     & .nitro-card-accordion-set-header .fa-icon {
@@ -800,3 +806,43 @@
         }
     }
 }
+
+/* ------------------------------------------------------------------ *
+ * Flat (non-nested) overrides. The rules above live inside a nested
+ * `.nitro-friends { & ... }` block; these are written flat so they
+ * apply reliably and win by source order. They fix two things the
+ * nested rules didn't: the oversized/overflowing friend-list heads and
+ * the oversized accordion section titles ("testoni").
+ * ------------------------------------------------------------------ */
+
+/* Friend-list avatar: clip a small box and centre the head, same proven
+   recipe as the messenger head. `inset: auto` cancels the component's
+   `inset-0`, otherwise the 130px head fills the row and overflows. */
+.nitro-friends .friends-list-avatar {
+    position: relative !important;
+    width: 34px;
+    height: 36px;
+    flex-shrink: 0;
+    overflow: hidden;
+}
+
+.nitro-friends .friends-list-avatar .avatar-image {
+    position: absolute !important;
+    inset: auto !important;
+    left: 50% !important;
+    top: 56% !important;
+    width: 54px !important;
+    height: 54px !important;
+    margin: 0 !important;
+    background-position: center center !important;
+    transform: translate(-50%, -50%) scale(.95) !important;
+}
+
+/* Accordion section titles are rendered by <Text> (a <div>, not a <span>),
+   so size the div too — otherwise they show oversized. */
+.nitro-friends .nitro-card-accordion-set-header > div,
+.nitro-friends .nitro-card-accordion-set-header span {
+    font-size: 12px !important;
+    font-weight: 700 !important;
+    line-height: 1.15 !important;
+}
diff --git a/src/css/user-profile/UserProfileView.css b/src/css/user-profile/UserProfileView.css
index 3f3e47b..66bbec6 100644
--- a/src/css/user-profile/UserProfileView.css
+++ b/src/css/user-profile/UserProfileView.css
@@ -1,7 +1,3 @@
-.nitro-extended-profile-window {
-  border-radius: 0 !important;
-}
-
 .nitro-extended-profile-window .nitro-card-header-shell {
   min-height: 34px;
   max-height: 34px;
@@ -46,32 +42,31 @@
 
 .nitro-extended-profile__identity {
   display: grid;
-  grid-template-columns: 56px minmax(0, 1fr);
-  gap: 8px;
+  grid-template-columns: 68px minmax(0, 1fr);
+  gap: 10px;
 }
 
+/* Mirror the room infostand exactly: a 68x135 flex column (= profile-background)
+   that centres the avatar horizontally and clips it; the stand/overlay sit on
+   top as absolute layers. The avatar keeps its component default classes
+   (relative w-[90px] h-[130px] left-[-2px]) so it lines up with bg + stand and
+   isn't crooked. Do NOT absolutely position or force width/height on it. */
 .nitro-extended-profile__avatar-shell {
-  width: 56px;
-  height: 113px;
+  width: 68px;
+  height: 135px;
   position: relative;
   overflow: hidden;
-  background-size: cover;
-  background-position: center;
+  border-radius: 3px;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
 }
 
 .nitro-extended-profile__avatar-stand,
 .nitro-extended-profile__avatar-overlay {
   position: absolute;
-  inset: 0;
-}
-
-.nitro-extended-profile__avatar-image {
-  position: absolute !important;
-  left: 50% !important;
-  bottom: -4px;
-  transform: translateX(-50%);
-  width: auto !important;
-  height: auto !important;
+  top: 0;
+  left: 0;
 }
 
 .nitro-extended-profile__identity-copy {
@@ -253,14 +248,27 @@
 
 .nitro-extended-profile__relationship-head {
   position: absolute;
-  right: -2px;
+  right: 3px;
   top: 50%;
-  width: 34px;
-  height: 34px;
+  width: 30px;
+  height: 32px;
   transform: translateY(-50%);
-  display: flex;
-  align-items: center;
-  justify-content: center;
+  overflow: hidden;
+}
+
+/* Same proven recipe as the messenger head: clip a small box and centre a
+   54x54 avatar in it. `inset: auto` cancels the component's `inset-0` so the
+   width/position take effect (otherwise the head overflows huge). */
+.nitro-extended-profile__relationship-head .avatar-image {
+  position: absolute !important;
+  inset: auto !important;
+  left: 50% !important;
+  top: 54% !important;
+  width: 50px !important;
+  height: 50px !important;
+  margin: 0 !important;
+  background-position: center center !important;
+  transform: translate(-50%, -50%) scale(.95) !important;
 }
 
 .nitro-extended-profile__relationship-subcopy {