Merge branch 'refactor/color-constants'

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Merge branch 'refactor/mainwindow-setup'
2026-03-31 11:19:50 +02:00 · 2026-03-31 11:19:50 +02:00 · 2026-03-31 11:19:50 +02:00 · 2026-03-31 11:17:23 +02:00 · 2026-03-31 11:01:45 +02:00 · 2026-03-31 11:00:19 +02:00
52 changed files with 14936 additions and 924 deletions
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -0,0 +1,49 @@
+name: Build for Windows
+
+on:
+  push:
+    branches: [ "main", "feature/cross-platform" ]
+  pull_request:
+    branches: [ "main" ]
+  workflow_dispatch:
+
+jobs:
+  build-windows:
+    runs-on: windows-latest
+    
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+
+    - name: Setup Rust toolchain
+      uses: dtolnay/rust-toolchain@stable
+      with:
+        toolchain: stable
+        target: x86_64-pc-windows-msvc
+
+    - name: Install Qt 6
+      uses: jurplel/install-qt-action@v4
+      with:
+        version: '6.5.3'
+        host: 'windows'
+        target: 'desktop'
+        arch: 'win64_msvc2019_64'
+
+    - name: Configure CMake
+      run: cmake -B build -S . -DCMAKE_BUILD_TYPE=Release
+
+    - name: Build Application
+      run: cmake --build build --config Release -j %NUMBER_OF_PROCESSORS%
+
+    - name: Bundle Executable (windeployqt)
+      run: |
+        mkdir release
+        copy build\Release\qobuz-qt.exe release\
+        windeployqt release\qobuz-qt.exe
+      shell: cmd
+
+    - name: Upload Artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: qobuz-qt-windows-x64
+        path: release/
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,7 @@
 build/
+build-*/
 target/
+src/visualizer/
 .cache/
 *.user
 *.autosave
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,7 +38,11 @@ else()
    set(CARGO_PROFILE_FLAG "")
 endif()

+if(WIN32 AND MSVC)
+    set(RUST_LIB "${CMAKE_SOURCE_DIR}/target/${CARGO_PROFILE}/qobuz_backend.lib")
+else()
    set(RUST_LIB "${CMAKE_SOURCE_DIR}/target/${CARGO_PROFILE}/libqobuz_backend.a")
+endif()

 add_custom_target(rust_backend ALL
    COMMAND ${CARGO_CMD} build ${CARGO_PROFILE_FLAG}
@@ -83,14 +87,39 @@ target_link_libraries(qobuz-qt PRIVATE
    qobuz_backend_lib
 )

-# Platform-specific system libs needed by the Rust audio stack (cpal/ALSA)
+# Platform-specific system libs needed by the Rust audio stack (cpal/backend internals)
 if (UNIX AND NOT APPLE)
    target_link_libraries(qobuz-qt PRIVATE asound)
+elseif (APPLE)
+    find_library(COREAUDIO CoreAudio)
+    find_library(AUDIOTOOLBOX AudioToolbox)
+    find_library(SECURITY Security)
+    find_library(COREFOUNDATION CoreFoundation)
+    target_link_libraries(qobuz-qt PRIVATE ${COREAUDIO} ${AUDIOTOOLBOX} ${SECURITY} ${COREFOUNDATION})
+elseif (WIN32)
+    target_link_libraries(qobuz-qt PRIVATE ws2_32 userenv bcrypt advapi32 ntdll ole32)
 endif ()

-# Compiler warnings
+# Compiler warnings + hardening
 if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    target_compile_options(qobuz-qt PRIVATE -Wall -Wextra -Wno-unused-parameter)
+    target_compile_options(qobuz-qt PRIVATE
+        -Wall -Wextra -Wno-unused-parameter
+    )
+    if (UNIX AND NOT APPLE)
+        target_compile_options(qobuz-qt PRIVATE
+            -fstack-protector-strong
+            -fPIE
+            # _FORTIFY_SOURCE needs optimized builds; in Debug it causes warning spam.
+            $<$<OR:$<CONFIG:Release>,$<CONFIG:RelWithDebInfo>,$<CONFIG:MinSizeRel>>:-D_FORTIFY_SOURCE=2>
+            $<$<CONFIG:Debug>:-U_FORTIFY_SOURCE>
+        )
+        target_link_options(qobuz-qt PRIVATE
+            -pie
+            -Wl,-z,relro,-z,now
+        )
+    endif ()
+elseif (MSVC)
+    target_compile_options(qobuz-qt PRIVATE /W3 /Zc:__cplusplus /permissive-)
 endif ()

 # D-Bus
@@ -109,7 +138,7 @@ if (USE_LTO)
 endif ()

 # Install
-if (UNIX)
+if (UNIX AND NOT APPLE)
    install(FILES res/logo/qobuz-qt.svg DESTINATION share/icons/hicolor/scalable/apps)
    install(FILES res/app/qobuz-qt.desktop DESTINATION share/applications)
    install(TARGETS qobuz-qt RUNTIME DESTINATION bin)
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,6 +2,17 @@
 # It is not intended for manual editing.
 version = 4

+[[package]]
+name = "aes"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0"
+dependencies = [
+ "cfg-if",
+ "cipher",
+ "cpufeatures",
+]
+
 [[package]]
 name = "aho-corasick"
 version = "1.1.4"
@@ -93,6 +104,24 @@ version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "843867be96c8daad0d758b57df9392b6d8d271134fce549de6ce169ff98a92af"

+[[package]]
+name = "block-buffer"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "block-padding"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93"
+dependencies = [
+ "generic-array",
+]
+
 [[package]]
 name = "bumpalo"
 version = "3.20.2"
@@ -111,6 +140,15 @@ version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33"

+[[package]]
+name = "cbc"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6"
+dependencies = [
+ "cipher",
+]
+
 [[package]]
 name = "cc"
 version = "1.2.57"
@@ -150,6 +188,16 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"

+[[package]]
+name = "cipher"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
+dependencies = [
+ "crypto-common",
+ "inout",
+]
+
 [[package]]
 name = "clang-sys"
 version = "1.8.1"
@@ -221,12 +269,51 @@ dependencies = [
 "windows",
 ]

+[[package]]
+name = "cpufeatures"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "crypto-common"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a"
+dependencies = [
+ "generic-array",
+ "typenum",
+]
+
+[[package]]
+name = "ctr"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835"
+dependencies = [
+ "cipher",
+]
+
 [[package]]
 name = "dasp_sample"
 version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f"

+[[package]]
+name = "digest"
+version = "0.10.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+dependencies = [
+ "block-buffer",
+ "crypto-common",
+ "subtle",
+]
+
 [[package]]
 name = "dirs"
 version = "5.0.1"
@@ -372,6 +459,16 @@ dependencies = [
 "slab",
 ]

+[[package]]
+name = "generic-array"
+version = "0.14.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+dependencies = [
+ "typenum",
+ "version_check",
+]
+
 [[package]]
 name = "getrandom"
 version = "0.2.17"
@@ -411,6 +508,30 @@ version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"

+[[package]]
+name = "hex"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
+[[package]]
+name = "hkdf"
+version = "0.12.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7"
+dependencies = [
+ "hmac",
+]
+
+[[package]]
+name = "hmac"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
+dependencies = [
+ "digest",
+]
+
 [[package]]
 name = "http"
 version = "1.4.0"
@@ -623,6 +744,16 @@ dependencies = [
 "hashbrown",
 ]

+[[package]]
+name = "inout"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01"
+dependencies = [
+ "block-padding",
+ "generic-array",
+]
+
 [[package]]
 name = "ipnet"
 version = "2.12.0"
@@ -1054,14 +1185,21 @@ dependencies = [
 name = "qobuz-backend"
 version = "0.1.0"
 dependencies = [
+ "aes",
 "anyhow",
+ "base64",
+ "cbc",
 "cpal",
+ "ctr",
 "dirs",
+ "hex",
+ "hkdf",
 "md5",
 "rb",
 "reqwest",
 "serde",
 "serde_json",
+ "sha2",
 "symphonia",
 "thiserror 2.0.18",
 "tokio",
@@ -1410,6 +1548,17 @@ dependencies = [
 "serde",
 ]

+[[package]]
+name = "sha2"
+version = "0.10.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
 [[package]]
 name = "shlex"
 version = "1.3.0"
@@ -1943,6 +2092,12 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"

+[[package]]
+name = "typenum"
+version = "1.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb"
+
 [[package]]
 name = "unicode-ident"
 version = "1.0.24"
@@ -1973,6 +2128,12 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"

+[[package]]
+name = "version_check"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
+
 [[package]]
 name = "walkdir"
 version = "2.5.0"
--- a/openapi.json
+++ b/openapi.json
--- a/rust/Cargo.toml
+++ b/rust/Cargo.toml
@@ -28,6 +28,16 @@ md5 = "0.7"
 dirs = "5"
 toml = "0.8"

+# Crypto — qbz-1 key derivation + segment decryption
+aes   = "0.8"
+cbc   = { version = "0.1", features = ["alloc"] }
+ctr   = "0.9"
+hkdf  = "0.12"
+sha2  = "0.10"
+hex   = "0.4"
+base64 = "0.22"
+
 [profile.release]
 lto = "thin"
 opt-level = 3
+overflow-checks = true
--- a/rust/include/qobuz_backend.h
+++ b/rust/include/qobuz_backend.h
@@ -31,6 +31,21 @@ enum QobuzEvent {
    EV_TRACK_URL_OK   = 17,
    EV_TRACK_URL_ERR  = 18,
    EV_GENERIC_ERR      = 19,
+    EV_PLAYLIST_CREATED      = 20,
+    EV_PLAYLIST_DELETED      = 21,
+    EV_PLAYLIST_TRACK_ADDED  = 22,
+    EV_USER_OK               = 23,
+    EV_ARTIST_RELEASES_OK    = 24,
+    EV_DEEP_SHUFFLE_OK       = 25,
+    EV_MOST_POPULAR_OK       = 26,
+    EV_GENRES_OK             = 27,
+    EV_FEATURED_ALBUMS_OK    = 28,
+    EV_DYNAMIC_SUGGEST_OK    = 29,
+    EV_FEATURED_PLAYLISTS_OK = 30,
+    EV_DISCOVER_PLAYLISTS_OK = 31,
+    EV_PLAYLIST_SEARCH_OK    = 32,
+    EV_PLAYLIST_SUBSCRIBED   = 33,
+    EV_PLAYLIST_UNSUBSCRIBED = 34,
 };

 // Callback signature
@@ -43,12 +58,16 @@ void                qobuz_backend_free(QobuzBackendOpaque *backend);
 // Auth
 void qobuz_backend_login(QobuzBackendOpaque *backend, const char *email, const char *password);
 void qobuz_backend_set_token(QobuzBackendOpaque *backend, const char *token);
+void qobuz_backend_get_user(QobuzBackendOpaque *backend);

 // Catalog
 void qobuz_backend_search(QobuzBackendOpaque *backend, const char *query, uint32_t offset, uint32_t limit);
+void qobuz_backend_most_popular_search(QobuzBackendOpaque *backend, const char *query, uint32_t limit);
+void qobuz_backend_get_dynamic_suggestions(QobuzBackendOpaque *backend, const char *listened_track_ids_json, const char *tracks_to_analyze_json, uint32_t limit);
 void qobuz_backend_get_album(QobuzBackendOpaque *backend, const char *album_id);
 void qobuz_backend_get_artist(QobuzBackendOpaque *backend, int64_t artist_id);
 void qobuz_backend_get_playlist(QobuzBackendOpaque *backend, int64_t playlist_id, uint32_t offset, uint32_t limit);
+void qobuz_backend_get_playlist_all(QobuzBackendOpaque *backend, int64_t playlist_id);

 // Favorites
 void qobuz_backend_get_fav_tracks(QobuzBackendOpaque *backend, uint32_t offset, uint32_t limit);
@@ -68,12 +87,41 @@ uint64_t qobuz_backend_get_duration(const QobuzBackendOpaque *backend);
 uint8_t  qobuz_backend_get_volume(const QobuzBackendOpaque *backend);
 int      qobuz_backend_get_state(const QobuzBackendOpaque *backend);
 int      qobuz_backend_take_track_finished(QobuzBackendOpaque *backend);
+int      qobuz_backend_take_track_transitioned(QobuzBackendOpaque *backend);
+
+// ReplayGain / Gapless
+void qobuz_backend_set_replaygain(QobuzBackendOpaque *backend, bool enabled);
+void qobuz_backend_set_gapless(QobuzBackendOpaque *backend, bool enabled);
+void qobuz_backend_prefetch_track(QobuzBackendOpaque *backend, int64_t track_id, int32_t format_id);
+
+// Artist releases (auto-paginates to fetch all)
+void qobuz_backend_get_artist_releases(QobuzBackendOpaque *backend, int64_t artist_id, const char *release_type, uint32_t limit, uint32_t offset);
+
+// Deep shuffle: fetch tracks from multiple albums (album_ids_json is a JSON array of strings)
+void qobuz_backend_get_albums_tracks(QobuzBackendOpaque *backend, const char *album_ids_json);
+
+// Browse
+void qobuz_backend_get_genres(QobuzBackendOpaque *backend);
+void qobuz_backend_get_featured_albums(QobuzBackendOpaque *backend, const char *genre_ids, const char *kind, uint32_t limit, uint32_t offset);
+void qobuz_backend_get_featured_playlists(QobuzBackendOpaque *backend, const char *genre_ids, const char *kind, uint32_t limit, uint32_t offset);
+void qobuz_backend_discover_playlists(QobuzBackendOpaque *backend, const char *genre_ids, const char *tags, uint32_t limit, uint32_t offset);
+void qobuz_backend_search_playlists(QobuzBackendOpaque *backend, const char *query, uint32_t limit, uint32_t offset);
+
+// Playlist management
+void qobuz_backend_create_playlist(QobuzBackendOpaque *backend, const char *name);
+void qobuz_backend_delete_playlist(QobuzBackendOpaque *backend, int64_t playlist_id);
+void qobuz_backend_add_track_to_playlist(QobuzBackendOpaque *backend, int64_t playlist_id, int64_t track_id);
+void qobuz_backend_delete_track_from_playlist(QobuzBackendOpaque *backend, int64_t playlist_id, int64_t playlist_track_id);
+void qobuz_backend_subscribe_playlist(QobuzBackendOpaque *backend, int64_t playlist_id);
+void qobuz_backend_unsubscribe_playlist(QobuzBackendOpaque *backend, int64_t playlist_id);

 // Favorites modification
 void qobuz_backend_add_fav_track(QobuzBackendOpaque *backend, int64_t track_id);
 void qobuz_backend_remove_fav_track(QobuzBackendOpaque *backend, int64_t track_id);
 void qobuz_backend_add_fav_album(QobuzBackendOpaque *backend, const char *album_id);
 void qobuz_backend_remove_fav_album(QobuzBackendOpaque *backend, const char *album_id);
+void qobuz_backend_add_fav_artist(QobuzBackendOpaque *backend, int64_t artist_id);
+void qobuz_backend_remove_fav_artist(QobuzBackendOpaque *backend, int64_t artist_id);

 #ifdef __cplusplus
 }
--- a/rust/src/api/client.rs
+++ b/rust/src/api/client.rs
@@ -1,6 +1,10 @@
 use anyhow::{bail, Result};
+use base64::{engine::general_purpose::URL_SAFE_NO_PAD, Engine};
+use cbc::cipher::{block_padding::NoPadding, BlockDecryptMut, KeyIvInit};
+use hkdf::Hkdf;
 use reqwest::Client;
 use serde_json::Value;
+use sha2::Sha256;
 use std::time::{SystemTime, UNIX_EPOCH};

 use super::models::*;
@@ -15,10 +19,74 @@ pub const DEFAULT_APP_SECRET: &str = "e79f8b9be485692b0e5f9dd895826368";
 pub struct QobuzClient {
    http: Client,
    pub auth_token: Option<String>,
+    /// Playback session ID from POST /session/start — sent as X-Session-Id for /file/url.
+    session_id: Option<String>,
+    session_expires_at: Option<u64>,
+    /// `infos` field from the session/start response — used to derive the KEK for track key unwrapping.
+    session_infos: Option<String>,
    app_id: String,
    app_secret: String,
 }

+// ── qbz-1 key derivation helpers ─────────────────────────────────────────────
+
+type Aes128CbcDec = cbc::Decryptor<aes::Aes128>;
+
+/// Decode a base64url string (with or without padding).
+fn b64url_decode(s: &str) -> Result<Vec<u8>> {
+    Ok(URL_SAFE_NO_PAD.decode(s.trim_end_matches('='))?)
+}
+
+/// Full qbz-1 key derivation:
+///   Phase 1: HKDF-SHA256(ikm=hex(app_secret), salt=b64url(infos[0]), info=b64url(infos[1])) → 16-byte KEK
+///   Phase 2: AES-128-CBC/NoPadding(key=KEK, iv=b64url(key_field[2])).decrypt(b64url(key_field[1]))[..16]
+fn derive_track_key(
+    session_infos: &str,
+    app_secret_hex: &str,
+    key_field: &str,
+) -> Result<[u8; 16]> {
+    // Phase 1: HKDF
+    let infos_parts: Vec<&str> = session_infos.splitn(2, '.').collect();
+    if infos_parts.len() != 2 {
+        bail!("session_infos must be '<salt_b64>.<info_b64>', got: {session_infos}");
+    }
+    let salt = b64url_decode(infos_parts[0])?;
+    let info = b64url_decode(infos_parts[1])?;
+    let ikm = hex::decode(app_secret_hex)?;
+
+    let hk = Hkdf::<Sha256>::new(Some(&salt), &ikm);
+    let mut kek = [0u8; 16];
+    hk.expand(&info, &mut kek)
+        .map_err(|e| anyhow::anyhow!("HKDF expand failed: {e:?}"))?;
+
+    // Phase 2: AES-128-CBC/NoPadding
+    let key_parts: Vec<&str> = key_field.splitn(3, '.').collect();
+    if key_parts.len() != 3 || key_parts[0] != "qbz-1" {
+        bail!("unexpected key field format: {key_field}");
+    }
+    let ct = b64url_decode(key_parts[1])?;
+    let iv_bytes = b64url_decode(key_parts[2])?;
+    if ct.len() < 16 || iv_bytes.len() < 16 {
+        bail!(
+            "key field ciphertext/iv too short ({} / {} bytes)",
+            ct.len(),
+            iv_bytes.len()
+        );
+    }
+
+    let iv: [u8; 16] = iv_bytes[..16].try_into()?;
+    let mut buf = ct;
+    let decrypted = Aes128CbcDec::new(&kek.into(), &iv.into())
+        .decrypt_padded_mut::<NoPadding>(&mut buf)
+        .map_err(|e| anyhow::anyhow!("AES-CBC decrypt failed: {e:?}"))?;
+
+    let mut track_key = [0u8; 16];
+    track_key.copy_from_slice(&decrypted[..16]);
+    Ok(track_key)
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+
 impl QobuzClient {
    pub fn new() -> Result<Self> {
        Self::new_with_config(None, None)
@@ -44,6 +112,9 @@ impl QobuzClient {
        Ok(Self {
            http,
            auth_token: None,
+            session_id: None,
+            session_expires_at: None,
+            session_infos: None,
            app_id,
            app_secret,
        })
@@ -60,6 +131,8 @@ impl QobuzClient {
            .as_secs()
    }

+    /// Compute the request signature required by the Qobuz API.
+    /// NOTE: MD5 is mandated by the Qobuz API protocol — not our choice.
    fn request_sig(&self, method: &str, params: &mut Vec<(&str, String)>, ts: u64) -> String {
        params.sort_by_key(|(k, _)| *k);
        let mut s = method.replace('/', "");
@@ -89,8 +162,8 @@ impl QobuzClient {
        Ok(body)
    }

-    fn get_request(&self, method: &str) -> reqwest::RequestBuilder {
-        let mut builder = self.http.get(self.url(method));
+    fn post_request(&self, method: &str) -> reqwest::RequestBuilder {
+        let mut builder = self.http.post(self.url(method));
        builder = builder.query(&[("app_id", self.app_id.as_str())]);
        if let Some(token) = &self.auth_token {
            builder = builder.header("Authorization", format!("Bearer {}", token));
@@ -98,16 +171,22 @@ impl QobuzClient {
        builder
    }

+    fn get_request(&self, method: &str) -> reqwest::RequestBuilder {
+        let mut builder = self.http.get(self.url(method));
+        builder = builder.query(&[("app_id", self.app_id.as_str())]);
+        if let Some(token) = &self.auth_token {
+            builder = builder.header("Authorization", format!("Bearer {}", token));
+        }
+        if let Some(sid) = &self.session_id {
+            builder = builder.header("X-Session-Id", sid.as_str());
+        }
+        builder
+    }
+
    // --- Auth ---

+    /// NOTE: Qobuz API requires credentials as GET query params — not our choice.
    pub async fn login(&mut self, email: &str, password: &str) -> Result<OAuthLoginResponse> {
-        match self.oauth2_login(email, password).await {
-            Ok(r) => Ok(r),
-            Err(_) => self.legacy_login(email, password).await,
-        }
-    }
-
-    async fn oauth2_login(&mut self, email: &str, password: &str) -> Result<OAuthLoginResponse> {
        let ts = Self::ts();
        let mut sign_params: Vec<(&str, String)> = vec![
            ("password", password.to_string()),
@@ -131,45 +210,18 @@ impl QobuzClient {
        let status = resp.status();
        let body: Value = resp.json().await?;
        if !status.is_success() {
-            let msg = body.get("message").and_then(|m| m.as_str()).unwrap_or("login failed");
-            bail!("oauth2 login failed ({}): {}", status, msg);
-        }
-
-        self.extract_and_store_token(serde_json::from_value(body)?)
-    }
-
-    async fn legacy_login(&mut self, email: &str, password: &str) -> Result<OAuthLoginResponse> {
-        let ts = Self::ts();
-        let mut sign_params: Vec<(&str, String)> = vec![
-            ("email", email.to_string()),
-            ("password", password.to_string()),
-        ];
-        let sig = self.request_sig("userlogin", &mut sign_params, ts);
-
-        let resp = self
-            .http
-            .get(self.url("user/login"))
-            .query(&[
-                ("app_id", self.app_id.as_str()),
-                ("email", email),
-                ("password", password),
-                ("request_ts", ts.to_string().as_str()),
-                ("request_sig", sig.as_str()),
-            ])
-            .send()
-            .await?;
-
-        let status = resp.status();
-        let body: Value = resp.json().await?;
-        if !status.is_success() {
-            let msg = body.get("message").and_then(|m| m.as_str()).unwrap_or("login failed");
-            bail!("user login failed ({}): {}", status, msg);
+            let msg = body
+                .get("message")
+                .and_then(|m| m.as_str())
+                .unwrap_or("login failed");
+            bail!("login failed ({}): {}", status, msg);
        }

        self.extract_and_store_token(serde_json::from_value(body)?)
    }

    fn extract_and_store_token(&mut self, login: OAuthLoginResponse) -> Result<OAuthLoginResponse> {
+        // auth_token = OAuth2 bearer (preferred) or legacy session token
        if let Some(token) = login
            .oauth2
            .as_ref()
@@ -178,9 +230,63 @@ impl QobuzClient {
        {
            self.auth_token = Some(token);
        }
+        // Reset any cached playback session — it belongs to a different auth context.
+        self.session_id = None;
+        self.session_expires_at = None;
+        self.session_infos = None;
        Ok(login)
    }

+    /// Start a playback session via POST /session/start.
+    /// The returned session_id is required as X-Session-Id when calling /file/url.
+    /// Sessions expire; we cache and reuse until 60s before expiry.
+    async fn ensure_session(&mut self) -> Result<()> {
+        let now = Self::ts();
+        if let (Some(_), Some(exp)) = (&self.session_id, self.session_expires_at) {
+            if now + 60 < exp {
+                return Ok(()); // still valid
+            }
+        }
+
+        let ts = Self::ts();
+        let mut sign_params: Vec<(&str, String)> = vec![("profile", "qbz-1".to_string())];
+        let sig = self.request_sig("sessionstart", &mut sign_params, ts);
+
+        let resp = self
+            .http
+            .post(self.url("session/start"))
+            .query(&[
+                ("app_id", self.app_id.as_str()),
+                ("request_ts", ts.to_string().as_str()),
+                ("request_sig", sig.as_str()),
+            ])
+            .header(
+                "Authorization",
+                format!("Bearer {}", self.auth_token.as_deref().unwrap_or("")),
+            )
+            .form(&[("profile", "qbz-1")])
+            .send()
+            .await?;
+
+        let body = Self::check_response(resp).await?;
+        let session_id = body["session_id"]
+            .as_str()
+            .ok_or_else(|| anyhow::anyhow!("session/start: no session_id in response"))?
+            .to_string();
+        let expires_at = body["expires_at"].as_u64().unwrap_or(now + 3600);
+        let infos = body["infos"].as_str().map(|s| s.to_string());
+        eprintln!(
+            "[session] started session_id={}... expires_at={} infos={:?}",
+            &session_id[..session_id.len().min(8)],
+            expires_at,
+            infos
+        );
+        self.session_id = Some(session_id);
+        self.session_expires_at = Some(expires_at);
+        self.session_infos = infos;
+        Ok(())
+    }
+
    // --- User ---

    pub async fn get_user(&self) -> Result<UserDto> {
@@ -203,7 +309,13 @@ impl QobuzClient {
        Ok(serde_json::from_value(body)?)
    }

-    pub async fn get_track_url(&self, track_id: i64, format: Format) -> Result<TrackFileUrlDto> {
+    pub async fn get_track_url(
+        &mut self,
+        track_id: i64,
+        format: Format,
+    ) -> Result<TrackFileUrlDto> {
+        self.ensure_session().await?;
+
        let ts = Self::ts();
        let intent = "stream";
        let mut sign_params: Vec<(&str, String)> = vec![
@@ -211,10 +323,10 @@ impl QobuzClient {
            ("intent", intent.to_string()),
            ("track_id", track_id.to_string()),
        ];
-        let sig = self.request_sig("trackgetFileUrl", &mut sign_params, ts);
+        let sig = self.request_sig("fileurl", &mut sign_params, ts);

        let resp = self
-            .get_request("track/getFileUrl")
+            .get_request("file/url")
            .query(&[
                ("track_id", track_id.to_string()),
                ("format_id", format.id().to_string()),
@@ -226,7 +338,28 @@ impl QobuzClient {
            .await?;

        let body = Self::check_response(resp).await?;
-        Ok(serde_json::from_value(body)?)
+        eprintln!(
+            "[file/url] response: {}",
+            serde_json::to_string(&body).unwrap_or_default()
+        );
+        let mut url_dto: TrackFileUrlDto = serde_json::from_value(body)?;
+
+        // Unwrap the per-track key: decrypt the CBC-wrapped key using HKDF-derived KEK.
+        if let (Some(key_field), Some(infos)) = (url_dto.key.clone(), self.session_infos.as_deref())
+        {
+            match derive_track_key(infos, &self.app_secret, &key_field) {
+                Ok(track_key) => {
+                    url_dto.key = Some(hex::encode(track_key));
+                    eprintln!("[key] track key unwrapped OK");
+                }
+                Err(e) => {
+                    eprintln!("[key] track key unwrap failed: {e}");
+                    url_dto.key = None; // disable decryption rather than play garbage
+                }
+            }
+        }
+
+        Ok(url_dto)
    }

    // --- Album ---
@@ -243,24 +376,184 @@ impl QobuzClient {

    // --- Artist ---

-    pub async fn get_artist(&self, artist_id: i64) -> Result<ArtistDto> {
+    pub async fn get_artist_page(&self, artist_id: i64) -> Result<Value> {
        let resp = self
-            .get_request("artist/get")
+            .get_request("artist/page")
+            .query(&[("artist_id", artist_id.to_string())])
+            .send()
+            .await?;
+        Self::check_response(resp).await
+    }
+
+    pub async fn get_artist_releases_list(
+        &self,
+        artist_id: i64,
+        release_type: &str,
+        limit: u32,
+        offset: u32,
+    ) -> Result<Value> {
+        let resp = self
+            .get_request("artist/getReleasesList")
            .query(&[
                ("artist_id", artist_id.to_string()),
-                ("extra", "albums".to_string()),
+                ("release_type", release_type.to_string()),
+                ("sort", "release_date".to_string()),
+                ("order", "desc".to_string()),
+                ("limit", limit.to_string()),
+                ("offset", offset.to_string()),
            ])
            .send()
            .await?;
-        let body = Self::check_response(resp).await?;
-        Ok(serde_json::from_value(body)?)
+        Self::check_response(resp).await
+    }
+
+    // --- Browse ---
+
+    pub async fn get_genres(&self) -> Result<Value> {
+        let resp = self.get_request("genre/list").send().await?;
+        Self::check_response(resp).await
+    }
+
+    pub async fn get_featured_albums(
+        &self,
+        genre_ids: &str,
+        kind: &str,
+        limit: u32,
+        offset: u32,
+    ) -> Result<Value> {
+        let resp = self
+            .get_request("album/getFeatured")
+            .query(&[
+                ("type", kind.to_string()),
+                ("genre_id", genre_ids.to_string()),
+                ("limit", limit.to_string()),
+                ("offset", offset.to_string()),
+            ])
+            .send()
+            .await?;
+        Self::check_response(resp).await
+    }
+
+    pub async fn get_featured_playlists(
+        &self,
+        genre_ids: &str,
+        kind: &str,
+        limit: u32,
+        offset: u32,
+    ) -> Result<Value> {
+        let resp = self
+            .get_request("playlist/getFeatured")
+            .query(&[
+                ("type", kind.to_string()),
+                ("genre_ids", genre_ids.to_string()),
+                ("limit", limit.to_string()),
+                ("offset", offset.to_string()),
+            ])
+            .send()
+            .await?;
+        Self::check_response(resp).await
+    }
+
+    pub async fn discover_playlists(
+        &self,
+        genre_ids: &str,
+        tags: &str,
+        limit: u32,
+        offset: u32,
+    ) -> Result<Value> {
+        let mut query = vec![
+            ("genre_ids", genre_ids.to_string()),
+            ("limit", limit.to_string()),
+            ("offset", offset.to_string()),
+        ];
+        if !tags.is_empty() {
+            query.push(("tags", tags.to_string()));
+        }
+
+        let resp = self
+            .get_request("discover/playlists")
+            .query(&query)
+            .send()
+            .await?;
+        Self::check_response(resp).await
+    }
+
+    pub async fn search_playlists(&self, query: &str, limit: u32, offset: u32) -> Result<Value> {
+        let resp = self
+            .get_request("playlist/search")
+            .query(&[
+                ("query", query.to_string()),
+                ("limit", limit.to_string()),
+                ("offset", offset.to_string()),
+            ])
+            .send()
+            .await?;
+        Self::check_response(resp).await
    }

    // --- Search ---

    pub async fn search(&self, query: &str, offset: u32, limit: u32) -> Result<SearchCatalogDto> {
+        let (tracks_res, albums_res, artists_res) = tokio::join!(
+            self.search_tracks(query, offset, limit),
+            self.search_albums(query, offset, limit),
+            self.search_artists(query, offset, limit),
+        );
+
+        // Convert successful Results into Some(value) and Errors into None
+        Ok(SearchCatalogDto {
+            query: Some(query.to_string()),
+            tracks: tracks_res.ok(),
+            albums: albums_res.ok(),
+            artists: artists_res.ok(),
+            playlists: None,
+        })
+    }
+
+    pub async fn get_most_popular(
+        &self,
+        query: &str,
+        offset: u32,
+        limit: u32,
+    ) -> Result<Value> {
        let resp = self
-            .get_request("catalog/search")
+            .get_request("most-popular/get")
+            .query(&[
+                ("query", query.to_string()),
+                ("offset", offset.to_string()),
+                ("limit", limit.to_string()),
+            ])
+            .send()
+            .await?;
+        Self::check_response(resp).await
+    }
+
+    pub async fn get_dynamic_suggestions(
+        &self,
+        limit: u32,
+        listened_tracks_ids: Value,
+        tracks_to_analyze: Value,
+    ) -> Result<Value> {
+        let resp = self
+            .post_request("dynamic/suggest")
+            .json(&serde_json::json!({
+                "limit": limit,
+                "listened_tracks_ids": listened_tracks_ids,
+                "track_to_analysed": tracks_to_analyze,
+            }))
+            .send()
+            .await?;
+        Self::check_response(resp).await
+    }
+
+    async fn search_tracks(
+        &self,
+        query: &str,
+        offset: u32,
+        limit: u32,
+    ) -> Result<SearchResultItems<TrackDto>> {
+        let resp = self
+            .get_request("track/search")
            .query(&[
                ("query", query),
                ("offset", &offset.to_string()),
@@ -269,22 +562,69 @@ impl QobuzClient {
            .send()
            .await?;
        let body = Self::check_response(resp).await?;
+        Ok(serde_json::from_value(body["tracks"].clone())?)
+    }
+
+    async fn search_albums(
+        &self,
+        query: &str,
+        offset: u32,
+        limit: u32,
+    ) -> Result<SearchResultItems<AlbumDto>> {
+        let resp = self
+            .get_request("album/search")
+            .query(&[
+                ("query", query),
+                ("offset", &offset.to_string()),
+                ("limit", &limit.to_string()),
+            ])
+            .send()
+            .await?;
+        let body = Self::check_response(resp).await?;
+        Ok(serde_json::from_value(body["albums"].clone())?)
+    }
+
+    async fn search_artists(
+        &self,
+        query: &str,
+        offset: u32,
+        limit: u32,
+    ) -> Result<SearchResultItems<ArtistDto>> {
+        let resp = self
+            .get_request("artist/search")
+            .query(&[
+                ("query", query),
+                ("offset", &offset.to_string()),
+                ("limit", &limit.to_string()),
+            ])
+            .send()
+            .await?;
+        let body = Self::check_response(resp).await?;
+        Ok(serde_json::from_value(body["artists"].clone())?)
+    }
+
+    // --- Favorites / Library ---
+
+    pub async fn get_user_playlists(&self, offset: u32, limit: u32) -> Result<UserPlaylistsDto> {
+        let resp = self
+            .get_request("playlist/getUserPlaylists")
+            .query(&[
+                ("filter", "owner,subscriber"),
+                ("offset", &offset.to_string()),
+                ("limit", &limit.to_string()),
+            ])
+            .send()
+            .await?;
+        let body = Self::check_response(resp).await?;
        Ok(serde_json::from_value(body)?)
    }

-    // --- Favorites / Library ---
-
-    pub async fn get_user_playlists(&self, offset: u32, limit: u32) -> Result<UserPlaylistsDto> {
-        let resp = self
-            .get_request("playlist/getUserPlaylists")
-            .query(&[("offset", &offset.to_string()), ("limit", &limit.to_string())])
-            .send()
-            .await?;
-        let body = Self::check_response(resp).await?;
-        Ok(serde_json::from_value(body)?)
-    }
-
-    pub async fn get_playlist(&self, playlist_id: i64, offset: u32, limit: u32) -> Result<PlaylistDto> {
+    pub async fn get_playlist(
+        &self,
+        playlist_id: i64,
+        offset: u32,
+        limit: u32,
+    ) -> Result<PlaylistDto> {
        let resp = self
            .get_request("playlist/get")
            .query(&[
@@ -299,34 +639,267 @@ impl QobuzClient {
        Ok(serde_json::from_value(body)?)
    }

-    pub async fn get_fav_tracks(&self, offset: u32, limit: u32) -> Result<SearchResultItems<TrackDto>> {
-        let resp = self
-            .get_request("favorite/getUserFavorites")
-            .query(&[("type", "tracks"), ("offset", &offset.to_string()), ("limit", &limit.to_string())])
-            .send()
-            .await?;
-        let body = Self::check_response(resp).await?;
-        Ok(serde_json::from_value(body["tracks"].clone())?)
+    pub async fn get_playlist_all(&self, playlist_id: i64) -> Result<PlaylistDto> {
+        const PAGE_LIMIT: u32 = 500;
+
+        let mut playlist = self.get_playlist(playlist_id, 0, PAGE_LIMIT).await?;
+
+        let mut all_items = playlist
+            .tracks
+            .as_ref()
+            .and_then(|t| t.items.clone())
+            .unwrap_or_default();
+
+        let mut total = playlist
+            .tracks
+            .as_ref()
+            .and_then(|t| t.total)
+            .unwrap_or(all_items.len() as i32);
+        if total < all_items.len() as i32 {
+            total = all_items.len() as i32;
        }

-    pub async fn get_fav_albums(&self, offset: u32, limit: u32) -> Result<SearchResultItems<AlbumDto>> {
-        let resp = self
-            .get_request("favorite/getUserFavorites")
-            .query(&[("type", "albums"), ("offset", &offset.to_string()), ("limit", &limit.to_string())])
-            .send()
-            .await?;
-        let body = Self::check_response(resp).await?;
-        Ok(serde_json::from_value(body["albums"].clone())?)
+        let mut offset = all_items.len() as u32;
+        while (offset as i32) < total {
+            let page = self.get_playlist(playlist_id, offset, PAGE_LIMIT).await?;
+            let mut page_items = page
+                .tracks
+                .as_ref()
+                .and_then(|t| t.items.clone())
+                .unwrap_or_default();
+            if page_items.is_empty() {
+                break;
+            }
+            all_items.append(&mut page_items);
+            offset = all_items.len() as u32;
        }

-    pub async fn get_fav_artists(&self, offset: u32, limit: u32) -> Result<SearchResultItems<FavArtistDto>> {
+        if let Some(tracks) = playlist.tracks.as_mut() {
+            tracks.items = Some(all_items);
+            tracks.total = Some(total);
+            tracks.offset = Some(0);
+            tracks.limit = Some(PAGE_LIMIT as i32);
+        }
+
+        Ok(playlist)
+    }
+
+    /// Fetch all favorite IDs (tracks, albums, artists) in one call.
+    async fn get_fav_ids(&self) -> Result<FavIdsDto> {
        let resp = self
-            .get_request("favorite/getUserFavorites")
-            .query(&[("type", "artists"), ("offset", &offset.to_string()), ("limit", &limit.to_string())])
+            .get_request("favorite/getUserFavoriteIds")
            .send()
            .await?;
        let body = Self::check_response(resp).await?;
-        Ok(serde_json::from_value(body["artists"].clone())?)
+        Ok(serde_json::from_value(body)?)
+    }
+
+    /// Batch-fetch tracks by ID via POST /track/getList.
+    async fn get_tracks_by_ids(&self, ids: &[i64]) -> Result<Vec<TrackDto>> {
+        if ids.is_empty() {
+            return Ok(vec![]);
+        }
+        let resp = self
+            .post_request("track/getList")
+            .json(&serde_json::json!({ "tracks_id": ids }))
+            .send()
+            .await?;
+        let body = Self::check_response(resp).await?;
+        let items: Vec<TrackDto> =
+            serde_json::from_value(body["tracks"]["items"].clone()).unwrap_or_default();
+        Ok(items)
+    }
+
+    pub async fn get_fav_tracks(
+        &self,
+        offset: u32,
+        limit: u32,
+    ) -> Result<SearchResultItems<TrackDto>> {
+        let ids = self.get_fav_ids().await?;
+        let all_ids = ids.tracks.unwrap_or_default();
+        let total = all_ids.len() as i32;
+        let page: Vec<i64> = all_ids
+            .into_iter()
+            .skip(offset as usize)
+            .take(limit as usize)
+            .collect();
+        let items = self.get_tracks_by_ids(&page).await?;
+        Ok(SearchResultItems {
+            items: Some(items),
+            total: Some(total),
+            offset: Some(offset as i32),
+            limit: Some(limit as i32),
+        })
+    }
+
+    pub async fn get_fav_albums(
+        &self,
+        offset: u32,
+        limit: u32,
+    ) -> Result<SearchResultItems<AlbumDto>> {
+        let ids = self.get_fav_ids().await?;
+        let all_ids = ids.albums.unwrap_or_default();
+        let total = all_ids.len() as i32;
+        let page: Vec<&str> = all_ids
+            .iter()
+            .skip(offset as usize)
+            .take(limit as usize)
+            .map(|s| s.as_str())
+            .collect();
+        let mut items = Vec::with_capacity(page.len());
+        for album_id in page {
+            match self.get_album(album_id).await {
+                Ok(a) => items.push(a),
+                Err(e) => eprintln!("[fav] failed to fetch album {}: {}", album_id, e),
+            }
+        }
+        Ok(SearchResultItems {
+            items: Some(items),
+            total: Some(total),
+            offset: Some(offset as i32),
+            limit: Some(limit as i32),
+        })
+    }
+
+    pub async fn get_fav_artists(
+        &self,
+        offset: u32,
+        limit: u32,
+    ) -> Result<SearchResultItems<FavArtistDto>> {
+        let ids = self.get_fav_ids().await?;
+        let all_ids = ids.artists.unwrap_or_default();
+        let total = all_ids.len() as i32;
+        let page: Vec<i64> = all_ids
+            .into_iter()
+            .skip(offset as usize)
+            .take(limit as usize)
+            .collect();
+        let mut items = Vec::with_capacity(page.len());
+        for artist_id in page {
+            match self.get_artist_page(artist_id).await {
+                Ok(v) => {
+                    let id = v.get("id").and_then(|i| i.as_i64());
+                    let name = v
+                        .get("name")
+                        .and_then(|n| n.get("display"))
+                        .and_then(|d| d.as_str())
+                        .map(|s| s.to_string());
+
+                    let mut image_dto = None;
+                    if let Some(imgs) = v.get("images") {
+                        if let Some(portrait) = imgs.get("portrait") {
+                            if let (Some(hash), Some(format)) = (
+                                portrait.get("hash").and_then(|h| h.as_str()),
+                                portrait.get("format").and_then(|f| f.as_str()),
+                            ) {
+                                image_dto = Some(ImageDto {
+                                    small: Some(format!("https://static.qobuz.com/images/artists/covers/small/{}.{}", hash, format)),
+                                    thumbnail: Some(format!("https://static.qobuz.com/images/artists/covers/small/{}.{}", hash, format)),
+                                    large: Some(format!("https://static.qobuz.com/images/artists/covers/large/{}.{}", hash, format)),
+                                    back: None,
+                                });
+                            }
+                        }
+                    }
+
+                    if id.is_some() && name.is_some() {
+                        items.push(FavArtistDto {
+                            id,
+                            name,
+                            albums_count: v
+                                .get("albums_count")
+                                .and_then(|c| c.as_i64())
+                                .map(|c| c as i32),
+                            image: image_dto,
+                        });
+                    }
+                }
+                Err(e) => eprintln!("[fav] failed to fetch artist {}: {}", artist_id, e),
+            }
+        }
+        Ok(SearchResultItems {
+            items: Some(items),
+            total: Some(total),
+            offset: Some(offset as i32),
+            limit: Some(limit as i32),
+        })
+    }
+
+    // --- Playlist management ---
+
+    pub async fn create_playlist(&self, name: &str) -> Result<PlaylistDto> {
+        let resp = self
+            .post_request("playlist/create")
+            .form(&[
+                ("name", name),
+                ("is_public", "false"),
+                ("is_collaborative", "false"),
+            ])
+            .send()
+            .await?;
+        let body = Self::check_response(resp).await?;
+        Ok(serde_json::from_value(body)?)
+    }
+
+    pub async fn add_track_to_playlist(&self, playlist_id: i64, track_id: i64) -> Result<()> {
+        let resp = self
+            .post_request("playlist/addTracks")
+            .form(&[
+                ("playlist_id", playlist_id.to_string()),
+                ("track_ids", track_id.to_string()),
+                ("no_duplicate", "true".to_string()),
+            ])
+            .send()
+            .await?;
+        Self::check_response(resp).await?;
+        Ok(())
+    }
+
+    pub async fn delete_playlist(&self, playlist_id: i64) -> Result<()> {
+        let resp = self
+            .get_request("playlist/delete")
+            .query(&[("playlist_id", &playlist_id.to_string())])
+            .send()
+            .await?;
+        Self::check_response(resp).await?;
+        Ok(())
+    }
+
+    pub async fn delete_track_from_playlist(
+        &self,
+        playlist_id: i64,
+        playlist_track_id: i64,
+    ) -> Result<()> {
+        let resp = self
+            .post_request("playlist/deleteTracks")
+            .form(&[
+                ("playlist_id", playlist_id.to_string()),
+                ("playlist_track_ids", playlist_track_id.to_string()),
+            ])
+            .send()
+            .await?;
+        Self::check_response(resp).await?;
+        Ok(())
+    }
+
+    pub async fn subscribe_playlist(&self, playlist_id: i64) -> Result<()> {
+        let resp = self
+            .get_request("playlist/subscribe")
+            .query(&[("playlist_id", playlist_id.to_string())])
+            .send()
+            .await?;
+        Self::check_response(resp).await?;
+        Ok(())
+    }
+
+    pub async fn unsubscribe_playlist(&self, playlist_id: i64) -> Result<()> {
+        let resp = self
+            .get_request("playlist/unsubscribe")
+            .query(&[("playlist_id", playlist_id.to_string())])
+            .send()
+            .await?;
+        Self::check_response(resp).await?;
+        Ok(())
    }

    pub async fn add_fav_track(&self, track_id: i64) -> Result<()> {
@@ -368,4 +941,24 @@ impl QobuzClient {
        Self::check_response(resp).await?;
        Ok(())
    }
+
+    pub async fn add_fav_artist(&self, artist_id: i64) -> Result<()> {
+        let resp = self
+            .get_request("favorite/create")
+            .query(&[("type", "artists"), ("artist_ids", &artist_id.to_string())])
+            .send()
+            .await?;
+        Self::check_response(resp).await?;
+        Ok(())
+    }
+
+    pub async fn remove_fav_artist(&self, artist_id: i64) -> Result<()> {
+        let resp = self
+            .get_request("favorite/delete")
+            .query(&[("type", "artists"), ("artist_ids", &artist_id.to_string())])
+            .send()
+            .await?;
+        Self::check_response(resp).await?;
+        Ok(())
+    }
 }
--- a/rust/src/api/models.rs
+++ b/rust/src/api/models.rs
@@ -46,8 +46,10 @@ pub struct SubscriptionDto {
 pub struct TrackDto {
    pub id: i64,
    pub title: Option<String>,
+    pub version: Option<String>,
    pub duration: Option<i64>,
    pub track_number: Option<i32>,
+    pub playlist_track_id: Option<i64>,
    pub album: Option<AlbumDto>,
    pub performer: Option<ArtistDto>,
    pub composer: Option<ArtistDto>,
@@ -72,12 +74,16 @@ pub struct AudioInfoDto {
 #[derive(Debug, Deserialize, Clone, Serialize)]
 pub struct TrackFileUrlDto {
    pub track_id: Option<i64>,
-    pub duration: Option<i64>,
+    pub duration: Option<f64>,
    pub url: Option<String>,
+    pub url_template: Option<String>,
+    pub n_segments: Option<u32>,
    pub format_id: Option<i32>,
    pub mime_type: Option<String>,
    pub sampling_rate: Option<f64>,
    pub bit_depth: Option<i32>,
+    /// qbz-1 encryption key: "qbz-1.<base64url_aes_key>.<base64url_iv>"
+    pub key: Option<String>,
 }

 // --- Album ---
@@ -97,6 +103,7 @@ pub struct AlbumDto {
    pub maximum_sampling_rate: Option<f64>,
    pub hires_streamable: Option<bool>,
    pub streamable: Option<bool>,
+    pub release_type: Option<String>,
    pub tracks: Option<TracksWrapper>,
 }

@@ -118,6 +125,10 @@ pub struct ArtistDto {
    pub image: Option<ImageDto>,
    pub biography: Option<BiographyDto>,
    pub albums: Option<SearchResultItems<AlbumDto>>,
+    #[serde(rename = "epSingles")]
+    pub ep_singles: Option<SearchResultItems<AlbumDto>>,
+    #[serde(rename = "liveAlbums")]
+    pub live_albums: Option<SearchResultItems<AlbumDto>>,
 }

 #[derive(Debug, Deserialize, Clone, Serialize)]
@@ -182,7 +193,12 @@ pub struct PlaylistDto {
    pub duration: Option<i64>,
    pub description: Option<String>,
    pub owner: Option<PlaylistOwnerDto>,
-    pub image_rectangle: Option<Vec<String>>,
+    /// 4-cover mosaic at 300 px (preferred)
+    pub images300: Option<Vec<String>>,
+    /// 4-cover mosaic at 150 px (fallback)
+    pub images150: Option<Vec<String>>,
+    /// 4-cover mosaic at 50 px (last resort)
+    pub images: Option<Vec<String>>,
    pub tracks: Option<TracksWrapper>,
 }

@@ -207,6 +223,15 @@ pub struct FavArtistDto {
    pub image: Option<ImageDto>,
 }

+// --- Favorite IDs ---
+
+#[derive(Debug, Deserialize, Serialize)]
+pub struct FavIdsDto {
+    pub tracks: Option<Vec<i64>>,
+    pub albums: Option<Vec<String>>,
+    pub artists: Option<Vec<i64>>,
+}
+
 // --- Format ---

 #[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
@@ -232,30 +257,5 @@ impl Format {
        }
    }

-    pub fn label(self) -> &'static str {
-        match self {
-            Format::Mp3 => "MP3 320",
-            Format::Cd => "CD 16-bit",
-            Format::HiRes96 => "Hi-Res 24-bit/96kHz",
-            Format::HiRes192 => "Hi-Res 24-bit/192kHz",
-        }
 }

-    pub fn all() -> &'static [Format] {
-        &[Format::HiRes192, Format::HiRes96, Format::Cd, Format::Mp3]
-    }
-}
-
-// --- QWS ---
-
-#[derive(Debug, Deserialize, Clone, Serialize)]
-pub struct QwsTokenResponse {
-    pub jwt_qws: Option<QwsToken>,
-}
-
-#[derive(Debug, Deserialize, Clone, Serialize)]
-pub struct QwsToken {
-    pub exp: Option<i64>,
-    pub jwt: Option<String>,
-    pub endpoint: Option<String>,
-}
--- a/rust/src/lib.rs
+++ b/rust/src/lib.rs
--- a/rust/src/player/decoder.rs
+++ b/rust/src/player/decoder.rs
--- a/rust/src/player/mod.rs
+++ b/rust/src/player/mod.rs
@@ -1,4 +1,4 @@
-mod decoder;
+pub mod decoder;
 pub mod output;

 use std::sync::{
@@ -7,23 +7,27 @@ use std::sync::{
 };
 use std::time::Duration;

-use crate::api::{Format, TrackDto};
+use crate::api::TrackDto;
+use decoder::NextAction;

-#[derive(Debug, Clone)]
+#[derive(Clone)]
 pub enum PlayerCommand {
    Play(TrackInfo),
+    QueueNext(TrackInfo),
    Pause,
    Resume,
    Stop,
-    Seek(u64),
    SetVolume(u8),
 }

-#[derive(Debug, Clone)]
+#[derive(Clone)]
 pub struct TrackInfo {
    pub track: TrackDto,
    pub url: String,
-    pub format: Format,
+    pub n_segments: u32,
+    pub encryption_key: Option<String>,
+    pub replaygain_db: Option<f64>,
+    pub prefetch_data: Option<decoder::PrefetchData>,
 }

 #[derive(Debug, Clone, PartialEq)]
@@ -31,7 +35,6 @@ pub enum PlayerState {
    Idle,
    Playing,
    Paused,
-    Stopped,
    Error(String),
 }

@@ -42,11 +45,12 @@ pub struct PlayerStatus {
    pub duration_secs: Arc<AtomicU64>,
    pub volume: Arc<AtomicU8>,
    pub current_track: Arc<std::sync::Mutex<Option<TrackDto>>>,
-    /// Set to true by the decode thread when a track finishes naturally.
    pub track_finished: Arc<AtomicBool>,
-    /// Set by the player loop when a seek command arrives; cleared by the decode thread.
+    pub track_transitioned: Arc<AtomicBool>,
    pub seek_requested: Arc<AtomicBool>,
    pub seek_target_secs: Arc<AtomicU64>,
+    pub replaygain_gain: Arc<std::sync::Mutex<f32>>,
+    pub gapless: Arc<AtomicBool>,
 }

 impl PlayerStatus {
@@ -58,30 +62,26 @@ impl PlayerStatus {
            volume: Arc::new(AtomicU8::new(80)),
            current_track: Arc::new(std::sync::Mutex::new(None)),
            track_finished: Arc::new(AtomicBool::new(false)),
+            track_transitioned: Arc::new(AtomicBool::new(false)),
            seek_requested: Arc::new(AtomicBool::new(false)),
            seek_target_secs: Arc::new(AtomicU64::new(0)),
+            replaygain_gain: Arc::new(std::sync::Mutex::new(1.0)),
+            gapless: Arc::new(AtomicBool::new(false)),
        }
    }

    pub fn get_state(&self) -> PlayerState {
        self.state.lock().unwrap().clone()
    }
-
    pub fn get_position(&self) -> u64 {
        self.position_secs.load(Ordering::Relaxed)
    }
-
    pub fn get_duration(&self) -> u64 {
        self.duration_secs.load(Ordering::Relaxed)
    }
-
    pub fn get_volume(&self) -> u8 {
        self.volume.load(Ordering::Relaxed)
    }
-
-    pub fn get_current_track(&self) -> Option<TrackDto> {
-        self.current_track.lock().unwrap().clone()
-    }
 }

 pub struct Player {
@@ -105,28 +105,19 @@ impl Player {
    pub fn send(&self, cmd: PlayerCommand) {
        self.cmd_tx.send(cmd).ok();
    }
-
-    pub fn play_track(&self, track: TrackDto, url: String, format: Format) {
-        self.send(PlayerCommand::Play(TrackInfo { track, url, format }));
-    }
-
    pub fn pause(&self) {
        self.send(PlayerCommand::Pause);
    }
-
    pub fn resume(&self) {
        self.send(PlayerCommand::Resume);
    }
-
    pub fn stop(&self) {
        self.send(PlayerCommand::Stop);
    }
-
    pub fn set_volume(&self, vol: u8) {
        self.status.volume.store(vol, Ordering::Relaxed);
        self.send(PlayerCommand::SetVolume(vol));
    }
-
    pub fn seek(&self, secs: u64) {
        self.status.seek_target_secs.store(secs, Ordering::Relaxed);
        self.status.seek_requested.store(true, Ordering::SeqCst);
@@ -134,16 +125,48 @@ impl Player {
 }

 fn player_loop(rx: std::sync::mpsc::Receiver<PlayerCommand>, status: PlayerStatus) {
-    let mut stop_flag = Arc::new(AtomicBool::new(true));
-    let paused = Arc::new(AtomicBool::new(false));
+    use std::sync::mpsc::RecvTimeoutError;

+    let mut audio_output: Option<output::AudioOutput> = None;
+    let paused = Arc::new(AtomicBool::new(false));
+    let mut pending_action: Option<NextAction> = None;
+
+    'outer: loop {
+        let info = if let Some(action) = pending_action.take() {
+            match action {
+                NextAction::Play(info) | NextAction::Transition(info) => info,
+            }
+        } else {
            loop {
                match rx.recv_timeout(Duration::from_millis(100)) {
-            Ok(cmd) => match cmd {
-                PlayerCommand::Play(info) => {
-                    stop_flag.store(true, Ordering::SeqCst);
-                    stop_flag = Arc::new(AtomicBool::new(false));
+                    Ok(PlayerCommand::Play(info)) => break info,
+                    Ok(PlayerCommand::QueueNext(info)) => {
+                        // If we are completely idle and get QueueNext, treat as Play
+                        break info;
+                    }
+                    Ok(PlayerCommand::Stop) => {
+                        audio_output = None;
                        paused.store(false, Ordering::SeqCst);
+                        *status.state.lock().unwrap() = PlayerState::Idle;
+                        *status.current_track.lock().unwrap() = None;
+                        status.position_secs.store(0, Ordering::Relaxed);
+                        status.duration_secs.store(0, Ordering::Relaxed);
+                    }
+                    Ok(PlayerCommand::SetVolume(v)) => {
+                        status.volume.store(v, Ordering::Relaxed);
+                    }
+                    Ok(_) => {} // Ignore Pause/Resume when idle
+                    Err(RecvTimeoutError::Timeout) => {}
+                    Err(RecvTimeoutError::Disconnected) => break 'outer,
+                }
+            }
+        };
+
+        let rg_factor = info
+            .replaygain_db
+            .map(|db| 10f32.powf(db as f32 / 20.0))
+            .unwrap_or(1.0);
+        *status.replaygain_gain.lock().unwrap() = rg_factor;

        *status.state.lock().unwrap() = PlayerState::Playing;
        *status.current_track.lock().unwrap() = Some(info.track.clone());
@@ -151,50 +174,30 @@ fn player_loop(rx: std::sync::mpsc::Receiver<PlayerCommand>, status: PlayerStatu
            status.duration_secs.store(dur as u64, Ordering::Relaxed);
        }
        status.position_secs.store(0, Ordering::Relaxed);
+        paused.store(false, Ordering::SeqCst);

-                    let status_c = status.clone();
-                    let stop_c = stop_flag.clone();
-                    let paused_c = paused.clone();
-
-                    std::thread::spawn(move || {
-                        match decoder::play_track(&info.url, &status_c, &stop_c, &paused_c) {
-                            Ok(()) => {
-                                if !stop_c.load(Ordering::SeqCst) {
-                                    *status_c.state.lock().unwrap() = PlayerState::Idle;
-                                    status_c.track_finished.store(true, Ordering::SeqCst);
+        // TrackInfo now directly passes the prefetch_data (if it exists) to the decoder
+        match decoder::play_track_inline(info, &status, &paused, &mut audio_output, &rx) {
+            Ok(Some(NextAction::Play(next_track))) => {
+                pending_action = Some(NextAction::Play(next_track));
+                // Interrupted by a manual play, no need to tell C++ to advance the queue
            }
+            Ok(Some(NextAction::Transition(next_track))) => {
+                pending_action = Some(NextAction::Play(next_track));
+                status.track_transitioned.store(true, Ordering::SeqCst);
+            }
+            Ok(None) => {
+                if !status.gapless.load(Ordering::Relaxed) {
+                    audio_output = None;
+                }
+                *status.state.lock().unwrap() = PlayerState::Idle;
+                status.track_finished.store(true, Ordering::SeqCst);
            }
            Err(e) => {
                eprintln!("playback error: {e}");
-                                *status_c.state.lock().unwrap() =
-                                    PlayerState::Error(e.to_string());
-                            }
-                        }
-                    });
-                }
-                PlayerCommand::Pause => {
-                    paused.store(true, Ordering::SeqCst);
-                    *status.state.lock().unwrap() = PlayerState::Paused;
-                }
-                PlayerCommand::Resume => {
-                    paused.store(false, Ordering::SeqCst);
-                    *status.state.lock().unwrap() = PlayerState::Playing;
-                }
-                PlayerCommand::Stop => {
-                    stop_flag.store(true, Ordering::SeqCst);
-                    *status.state.lock().unwrap() = PlayerState::Idle;
-                    *status.current_track.lock().unwrap() = None;
-                    status.position_secs.store(0, Ordering::Relaxed);
-                    status.duration_secs.store(0, Ordering::Relaxed);
-                }
-                PlayerCommand::SetVolume(_) => {}
-                PlayerCommand::Seek(secs) => {
-                    status.seek_target_secs.store(secs, Ordering::Relaxed);
-                    status.seek_requested.store(true, Ordering::SeqCst);
-                }
-            },
-            Err(std::sync::mpsc::RecvTimeoutError::Timeout) => {}
-            Err(std::sync::mpsc::RecvTimeoutError::Disconnected) => break,
+                *status.state.lock().unwrap() = PlayerState::Error(e.to_string());
+                status.track_finished.store(true, Ordering::SeqCst);
+            }
        }
    }
 }
--- a/rust/src/player/output.rs
+++ b/rust/src/player/output.rs
@@ -3,7 +3,7 @@ use cpal::{
    traits::{DeviceTrait, HostTrait, StreamTrait},
    StreamConfig,
 };
-use rb::{RbConsumer, RbProducer, SpscRb, RB};
+use rb::{RbConsumer, RbInspector, RbProducer, SpscRb, RB};
 use std::sync::{
    atomic::{AtomicBool, Ordering},
    Arc,
@@ -13,8 +13,11 @@ use symphonia::core::audio::AudioBufferRef;
 const RING_BUFFER_SIZE: usize = 32 * 1024;

 pub struct AudioOutput {
+    _ring: SpscRb<f32>,
    ring_buf_producer: rb::Producer<f32>,
    _stream: cpal::Stream,
+    pub sample_rate: u32,
+    pub channels: usize,
 }

 impl AudioOutput {
@@ -48,8 +51,11 @@ impl AudioOutput {
        stream.play()?;

        Ok(Self {
+            _ring: ring,
            ring_buf_producer: producer,
            _stream: stream,
+            sample_rate,
+            channels,
        })
    }

@@ -65,8 +71,13 @@ impl AudioOutput {
        );
        sample_buf.copy_interleaved_ref(decoded);
        let samples: Vec<f32> = sample_buf.samples().iter().map(|s| s * volume).collect();
+        self.write_samples(&samples, stop)
+    }

-        let mut remaining = &samples[..];
+    /// Write pre-converted interleaved f32 samples directly to the ring buffer.
+    /// Returns early (without error) if `stop` is set.
+    pub fn write_samples(&mut self, samples: &[f32], stop: &Arc<AtomicBool>) -> Result<()> {
+        let mut remaining = samples;
        while !remaining.is_empty() {
            if stop.load(Ordering::SeqCst) {
                return Ok(());
@@ -78,4 +89,14 @@ impl AudioOutput {
        }
        Ok(())
    }
+
+    #[allow(dead_code)]
+    pub fn flush(&self) {
+        // Wait until the ring buffer is fully emptied by cpal
+        while !self._ring.is_empty() {
+            std::thread::sleep(std::time::Duration::from_millis(10));
+        }
+        // Give the physical DAC an extra 100ms to output the last samples
+        std::thread::sleep(std::time::Duration::from_millis(100));
+    }
 }
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -6,8 +6,9 @@ target_sources(qobuz-qt PRIVATE
    mainwindow.hpp
    mainwindow.cpp

-    # Queue (header-only)
+    # Queue
    playqueue.hpp
+    playqueue.cpp

    # Backend (Qt wrapper around Rust FFI)
    backend/qobuzbackend.hpp
@@ -25,6 +26,9 @@ target_sources(qobuz-qt PRIVATE
    view/albumlistview.hpp
    view/artistlistview.hpp
    view/artistview.hpp
+    view/artistview.cpp
+    view/genrebrowser.hpp
+    view/genrebrowser.cpp
    view/sidepanel/view.hpp
    view/sidepanel/view.cpp

@@ -55,3 +59,10 @@ target_sources(qobuz-qt PRIVATE
    util/icon.hpp
    util/settings.hpp
 )
+
+if (USE_DBUS)
+    target_sources(qobuz-qt PRIVATE
+        backend/mpris.hpp
+        backend/mpris.cpp
+    )
+endif ()
--- a/src/backend/mpris.cpp
+++ b/src/backend/mpris.cpp
@@ -0,0 +1,29 @@
+#include "mpris.hpp"
+
+#include <QDBusConnection>
+#include <QCoreApplication>
+#include <QProcess>
+
+MprisRootAdaptor::MprisRootAdaptor(QObject *parent)
+    : QDBusAbstractAdaptor(parent)
+{
+}
+
+MprisPlayerAdaptor::MprisPlayerAdaptor(QObject *parent)
+    : QDBusAbstractAdaptor(parent)
+{
+}
+
+Mpris::Mpris(QObject *parent)
+    : QObject(parent)
+{
+    m_root = new MprisRootAdaptor(this);
+    m_player = new MprisPlayerAdaptor(this);
+
+    QDBusConnection dbus = QDBusConnection::sessionBus();
+    QString serviceName = QString("org.mpris.MediaPlayer2.qobuz_qt.instance%1").arg(QCoreApplication::applicationPid());
+    
+    dbus.registerService(serviceName);
+    dbus.registerObject("/org/mpris/MediaPlayer2", this, 
+                        QDBusConnection::ExportAdaptors);
+}
--- a/src/backend/mpris.hpp
+++ b/src/backend/mpris.hpp
@@ -0,0 +1,165 @@
+#pragma once
+
+#include <QObject>
+#include <QString>
+#include <QStringList>
+#include <QVariantMap>
+#include <QDBusAbstractAdaptor>
+#include <QDBusObjectPath>
+
+class MprisRootAdaptor : public QDBusAbstractAdaptor
+{
+    Q_OBJECT
+    Q_CLASSINFO("D-Bus Interface", "org.mpris.MediaPlayer2")
+    
+    Q_PROPERTY(bool CanQuit READ canQuit)
+    Q_PROPERTY(bool Fullscreen READ fullscreen WRITE setFullscreen)
+    Q_PROPERTY(bool CanSetFullscreen READ canSetFullscreen)
+    Q_PROPERTY(bool CanRaise READ canRaise)
+    Q_PROPERTY(bool HasTrackList READ hasTrackList)
+    Q_PROPERTY(QString Identity READ identity)
+    Q_PROPERTY(QString DesktopEntry READ desktopEntry)
+    Q_PROPERTY(QStringList SupportedUriSchemes READ supportedUriSchemes)
+    Q_PROPERTY(QStringList SupportedMimeTypes READ supportedMimeTypes)
+
+public:
+    explicit MprisRootAdaptor(QObject *parent);
+
+    bool canQuit() const { return true; }
+    bool fullscreen() const { return false; }
+    void setFullscreen(bool) {}
+    bool canSetFullscreen() const { return false; }
+    bool canRaise() const { return true; }
+    bool hasTrackList() const { return false; } 
+    QString identity() const { return "Qobuz"; }
+    QString desktopEntry() const { return "qobuz-qt"; }
+    QStringList supportedUriSchemes() const { return {}; }
+    QStringList supportedMimeTypes() const { return {}; }
+
+public slots:
+    void Quit() { emit quitRequested(); }
+    void Raise() { emit raiseRequested(); }
+
+signals:
+    void quitRequested();
+    void raiseRequested();
+};
+
+class MprisPlayerAdaptor : public QDBusAbstractAdaptor
+{
+    Q_OBJECT
+    Q_CLASSINFO("D-Bus Interface", "org.mpris.MediaPlayer2.Player")
+
+    Q_PROPERTY(QString PlaybackStatus READ playbackStatus NOTIFY playbackStatusChanged)
+    Q_PROPERTY(QString LoopStatus READ loopStatus WRITE setLoopStatus)
+    Q_PROPERTY(double Rate READ rate WRITE setRate)
+    Q_PROPERTY(bool Shuffle READ shuffle WRITE setShuffle)
+    Q_PROPERTY(QVariantMap Metadata READ metadata NOTIFY metadataChanged)
+    Q_PROPERTY(double Volume READ volume WRITE setVolume NOTIFY volumeChanged)
+    Q_PROPERTY(qlonglong Position READ position)
+    Q_PROPERTY(double MinimumRate READ minimumRate)
+    Q_PROPERTY(double MaximumRate READ maximumRate)
+    Q_PROPERTY(bool CanGoNext READ canGoNext)
+    Q_PROPERTY(bool CanGoPrevious READ canGoPrevious)
+    Q_PROPERTY(bool CanPlay READ canPlay)
+    Q_PROPERTY(bool CanPause READ canPause)
+    Q_PROPERTY(bool CanSeek READ canSeek)
+    Q_PROPERTY(bool CanControl READ canControl)
+
+public:
+    explicit MprisPlayerAdaptor(QObject *parent);
+
+    QString playbackStatus() const { return m_playbackStatus; }
+    void setPlaybackStatus(const QString &s) {
+        if (m_playbackStatus != s) {
+            m_playbackStatus = s;
+            emit playbackStatusChanged();
+        }
+    }
+
+    QString loopStatus() const { return "None"; }
+    void setLoopStatus(const QString &) {}
+
+    double rate() const { return 1.0; }
+    void setRate(double) {}
+
+    bool shuffle() const { return false; }
+    void setShuffle(bool) {}
+
+    QVariantMap metadata() const { return m_metadata; }
+    void setMetadata(const QVariantMap &m) { 
+        m_metadata = m; 
+        emit metadataChanged(); 
+    }
+
+    double volume() const { return m_volume; }
+    void setVolume(double v) { 
+        emit volumeChangeRequested(v); 
+    }
+    void updateVolume(double v) {
+        if (m_volume != v) {
+            m_volume = v;
+            emit volumeChanged();
+        }
+    }
+
+    qlonglong position() const { return m_positionMicro; }
+    void updatePosition(qlonglong posSecs) { m_positionMicro = posSecs * 1000000LL; }
+
+    double minimumRate() const { return 1.0; }
+    double maximumRate() const { return 1.0; }
+
+    bool canGoNext() const { return true; }
+    bool canGoPrevious() const { return true; }
+    bool canPlay() const { return true; }
+    bool canPause() const { return true; }
+    bool canSeek() const { return true; }
+    bool canControl() const { return true; }
+
+public slots:
+    void Next() { emit nextRequested(); }
+    void Previous() { emit previousRequested(); }
+    void Pause() { emit pauseRequested(); }
+    void PlayPause() { emit playPauseRequested(); }
+    void Stop() { emit stopRequested(); }
+    void Play() { emit playRequested(); }
+    void Seek(qlonglong offset) { emit seekRequested(offset); }
+    void SetPosition(const QDBusObjectPath &trackId, qlonglong position) { Q_UNUSED(trackId); emit seekToRequested(position); }
+    void OpenUri(const QString &uri) { Q_UNUSED(uri); }
+
+signals:
+    void playbackStatusChanged();
+    void metadataChanged();
+    void volumeChanged();
+
+    // Commands to MainWindow
+    void playRequested();
+    void pauseRequested();
+    void playPauseRequested();
+    void stopRequested();
+    void nextRequested();
+    void previousRequested();
+    void seekRequested(qlonglong offsetMicroseconds);
+    void seekToRequested(qlonglong positionMicroseconds);
+    void volumeChangeRequested(double volume);
+
+private:
+    QString m_playbackStatus = "Stopped";
+    QVariantMap m_metadata;
+    double m_volume = 1.0;
+    qlonglong m_positionMicro = 0;
+};
+
+class Mpris : public QObject
+{
+    Q_OBJECT
+public:
+    explicit Mpris(QObject *parent = nullptr);
+
+    MprisRootAdaptor *root() const { return m_root; }
+    MprisPlayerAdaptor *player() const { return m_player; }
+
+private:
+    MprisRootAdaptor *m_root;
+    MprisPlayerAdaptor *m_player;
+};
--- a/src/backend/qobuzbackend.cpp
+++ b/src/backend/qobuzbackend.cpp
@@ -8,9 +8,13 @@ QobuzBackend::QobuzBackend(QObject *parent)
    : QObject(parent)
 {
    m_backend = qobuz_backend_new(&QobuzBackend::eventTrampoline, this);
+    if (!m_backend) {
+        qCritical("Failed to initialize Qobuz backend");
+        return;
+    }

    m_positionTimer = new QTimer(this);
-    m_positionTimer->setInterval(500);
+    m_positionTimer->setInterval(50);
    connect(m_positionTimer, &QTimer::timeout, this, &QobuzBackend::onPositionTick);
    m_positionTimer->start();
 }
@@ -35,6 +39,11 @@ void QobuzBackend::setToken(const QString &token)
    qobuz_backend_set_token(m_backend, token.toUtf8().constData());
 }

+void QobuzBackend::getUser()
+{
+    qobuz_backend_get_user(m_backend);
+}
+
 // ---- catalog ----

 void QobuzBackend::search(const QString &query, quint32 offset, quint32 limit)
@@ -42,6 +51,22 @@ void QobuzBackend::search(const QString &query, quint32 offset, quint32 limit)
    qobuz_backend_search(m_backend, query.toUtf8().constData(), offset, limit);
 }

+void QobuzBackend::mostPopularSearch(const QString &query, quint32 limit)
+{
+    qobuz_backend_most_popular_search(m_backend, query.toUtf8().constData(), limit);
+}
+
+void QobuzBackend::getDynamicSuggestions(const QJsonArray &listenedTrackIds, const QJsonArray &tracksToAnalyze, quint32 limit)
+{
+    const QByteArray listened = QJsonDocument(listenedTrackIds).toJson(QJsonDocument::Compact);
+    const QByteArray analyze = QJsonDocument(tracksToAnalyze).toJson(QJsonDocument::Compact);
+    qobuz_backend_get_dynamic_suggestions(
+        m_backend,
+        listened.constData(),
+        analyze.constData(),
+        limit);
+}
+
 void QobuzBackend::getAlbum(const QString &albumId)
 {
    qobuz_backend_get_album(m_backend, albumId.toUtf8().constData());
@@ -52,11 +77,59 @@ void QobuzBackend::getArtist(qint64 artistId)
    qobuz_backend_get_artist(m_backend, artistId);
 }

+void QobuzBackend::getArtistReleases(qint64 artistId, const QString &releaseType, quint32 limit, quint32 offset)
+{
+    qobuz_backend_get_artist_releases(m_backend, artistId,
+                                      releaseType.toUtf8().constData(), limit, offset);
+}
+
+void QobuzBackend::getAlbumsTracks(const QStringList &albumIds)
+{
+    const QJsonArray arr = QJsonArray::fromStringList(albumIds);
+    const QByteArray json = QJsonDocument(arr).toJson(QJsonDocument::Compact);
+    qobuz_backend_get_albums_tracks(m_backend, json.constData());
+}
+
 void QobuzBackend::getPlaylist(qint64 playlistId, quint32 offset, quint32 limit)
 {
    qobuz_backend_get_playlist(m_backend, playlistId, offset, limit);
 }

+void QobuzBackend::getPlaylistAll(qint64 playlistId)
+{
+    qobuz_backend_get_playlist_all(m_backend, playlistId);
+}
+
+void QobuzBackend::getGenres()
+{
+    qobuz_backend_get_genres(m_backend);
+}
+
+void QobuzBackend::getFeaturedAlbums(const QString &genreIds, const QString &kind, quint32 limit, quint32 offset)
+{
+    qobuz_backend_get_featured_albums(m_backend, genreIds.toUtf8().constData(), kind.toUtf8().constData(), limit, offset);
+}
+
+void QobuzBackend::getFeaturedPlaylists(const QString &genreIds, const QString &kind, quint32 limit, quint32 offset)
+{
+    qobuz_backend_get_featured_playlists(m_backend, genreIds.toUtf8().constData(), kind.toUtf8().constData(), limit, offset);
+}
+
+void QobuzBackend::discoverPlaylists(const QString &genreIds, const QString &tags, quint32 limit, quint32 offset)
+{
+    qobuz_backend_discover_playlists(
+        m_backend,
+        genreIds.toUtf8().constData(),
+        tags.toUtf8().constData(),
+        limit,
+        offset);
+}
+
+void QobuzBackend::searchPlaylists(const QString &query, quint32 limit, quint32 offset)
+{
+    qobuz_backend_search_playlists(m_backend, query.toUtf8().constData(), limit, offset);
+}
+
 // ---- favorites ----

 void QobuzBackend::getFavTracks(quint32 offset, quint32 limit)
@@ -79,6 +152,55 @@ void QobuzBackend::getUserPlaylists(quint32 offset, quint32 limit)
    qobuz_backend_get_user_playlists(m_backend, offset, limit);
 }

+// ---- playback options ----
+
+void QobuzBackend::setReplayGain(bool enabled)
+{
+    qobuz_backend_set_replaygain(m_backend, enabled);
+}
+
+void QobuzBackend::setGapless(bool enabled)
+{
+    qobuz_backend_set_gapless(m_backend, enabled);
+}
+
+void QobuzBackend::prefetchTrack(qint64 trackId, int formatId)
+{
+    qobuz_backend_prefetch_track(m_backend, trackId, formatId);
+}
+
+// ---- playlist management ----
+
+void QobuzBackend::createPlaylist(const QString &name)
+{
+    qobuz_backend_create_playlist(m_backend, name.toUtf8().constData());
+}
+
+void QobuzBackend::deletePlaylist(qint64 playlistId)
+{
+    qobuz_backend_delete_playlist(m_backend, playlistId);
+}
+
+void QobuzBackend::addTrackToPlaylist(qint64 playlistId, qint64 trackId)
+{
+    qobuz_backend_add_track_to_playlist(m_backend, playlistId, trackId);
+}
+
+void QobuzBackend::deleteTrackFromPlaylist(qint64 playlistId, qint64 playlistTrackId)
+{
+    qobuz_backend_delete_track_from_playlist(m_backend, playlistId, playlistTrackId);
+}
+
+void QobuzBackend::subscribePlaylist(qint64 playlistId)
+{
+    qobuz_backend_subscribe_playlist(m_backend, playlistId);
+}
+
+void QobuzBackend::unsubscribePlaylist(qint64 playlistId)
+{
+    qobuz_backend_unsubscribe_playlist(m_backend, playlistId);
+}
+
 // ---- fav modification ----

 void QobuzBackend::addFavTrack(qint64 trackId)
@@ -101,6 +223,16 @@ void QobuzBackend::removeFavAlbum(const QString &albumId)
    qobuz_backend_remove_fav_album(m_backend, albumId.toUtf8().constData());
 }

+void QobuzBackend::addFavArtist(qint64 artistId)
+{
+    qobuz_backend_add_fav_artist(m_backend, artistId);
+}
+
+void QobuzBackend::removeFavArtist(qint64 artistId)
+{
+    qobuz_backend_remove_fav_artist(m_backend, artistId);
+}
+
 // ---- playback ----

 void QobuzBackend::playTrack(qint64 trackId, int formatId)
@@ -146,11 +278,19 @@ void QobuzBackend::onPositionTick()

    if (qobuz_backend_take_track_finished(m_backend))
        emit trackFinished();
+        
+    if (qobuz_backend_take_track_transitioned(m_backend))
+        emit trackTransitioned();
 }

 void QobuzBackend::onEvent(int eventType, const QString &json)
 {
-    const QJsonObject obj = QJsonDocument::fromJson(json.toUtf8()).object();
+    const QJsonDocument doc = QJsonDocument::fromJson(json.toUtf8());
+    if (!doc.isObject()) {
+        emit error(tr("Malformed response from backend"));
+        return;
+    }
+    const QJsonObject obj = doc.object();

    switch (eventType) {
    case EV_LOGIN_OK:
@@ -162,6 +302,9 @@ void QobuzBackend::onEvent(int eventType, const QString &json)
    case EV_SEARCH_OK:
        emit searchResult(obj);
        break;
+    case EV_MOST_POPULAR_OK:
+        emit mostPopularResult(obj);
+        break;
    case EV_SEARCH_ERR:
        emit error(obj["error"].toString());
        break;
@@ -174,6 +317,35 @@ void QobuzBackend::onEvent(int eventType, const QString &json)
    case EV_ARTIST_OK:
        emit artistLoaded(obj);
        break;
+    case EV_ARTIST_RELEASES_OK:
+        emit artistReleasesLoaded(
+            obj["release_type"].toString(),
+            obj["items"].toArray(),
+            obj["has_more"].toBool(),
+            obj["offset"].toInt()
+        );
+        break;
+    case EV_DEEP_SHUFFLE_OK:
+        emit deepShuffleTracksLoaded(obj["tracks"].toArray());
+        break;
+    case EV_DYNAMIC_SUGGEST_OK:
+        emit dynamicSuggestionsLoaded(obj);
+        break;
+    case EV_GENRES_OK:
+        emit genresLoaded(obj);
+        break;
+    case EV_FEATURED_ALBUMS_OK:
+        emit featuredAlbumsLoaded(obj);
+        break;
+    case EV_FEATURED_PLAYLISTS_OK:
+        emit featuredPlaylistsLoaded(obj);
+        break;
+    case EV_DISCOVER_PLAYLISTS_OK:
+        emit discoverPlaylistsLoaded(obj);
+        break;
+    case EV_PLAYLIST_SEARCH_OK:
+        emit playlistSearchLoaded(obj);
+        break;
    case EV_ARTIST_ERR:
        emit error(obj["error"].toString());
        break;
@@ -201,6 +373,24 @@ void QobuzBackend::onEvent(int eventType, const QString &json)
    case EV_STATE_CHANGED:
        emit stateChanged(obj["state"].toString());
        break;
+    case EV_PLAYLIST_CREATED:
+        emit playlistCreated(obj);
+        break;
+    case EV_PLAYLIST_DELETED:
+        emit playlistDeleted(obj);
+        break;
+    case EV_PLAYLIST_TRACK_ADDED:
+        emit playlistTrackAdded(static_cast<qint64>(obj["playlist_id"].toDouble()));
+        break;
+    case EV_PLAYLIST_SUBSCRIBED:
+        emit playlistSubscribed(static_cast<qint64>(obj["playlist_id"].toDouble()));
+        break;
+    case EV_PLAYLIST_UNSUBSCRIBED:
+        emit playlistUnsubscribed(static_cast<qint64>(obj["playlist_id"].toDouble()));
+        break;
+    case EV_USER_OK:
+        emit userLoaded(obj);
+        break;
    case EV_GENERIC_ERR:
    case EV_TRACK_URL_ERR:
        emit error(obj["error"].toString());
--- a/src/backend/qobuzbackend.hpp
+++ b/src/backend/qobuzbackend.hpp
@@ -4,6 +4,7 @@

 #include <QObject>
 #include <QString>
+#include <QJsonArray>
 #include <QJsonObject>
 #include <QTimer>

@@ -23,24 +24,50 @@ public:
    // --- auth ---
    void login(const QString &email, const QString &password);
    void setToken(const QString &token);
+    void getUser();

    // --- catalog ---
    void search(const QString &query, quint32 offset = 0, quint32 limit = 20);
+    void mostPopularSearch(const QString &query, quint32 limit = 8);
+    void getDynamicSuggestions(const QJsonArray &listenedTrackIds, const QJsonArray &tracksToAnalyze, quint32 limit = 50);
    void getAlbum(const QString &albumId);
    void getArtist(qint64 artistId);
+    void getArtistReleases(qint64 artistId, const QString &releaseType, quint32 limit = 50, quint32 offset = 0);
+    void getAlbumsTracks(const QStringList &albumIds);
    void getPlaylist(qint64 playlistId, quint32 offset = 0, quint32 limit = 500);
+    void getPlaylistAll(qint64 playlistId);
+    void getGenres();
+    void getFeaturedAlbums(const QString &genreIds, const QString &kind, quint32 limit = 50, quint32 offset = 0);
+    void getFeaturedPlaylists(const QString &genreIds, const QString &kind, quint32 limit = 25, quint32 offset = 0);
+    void discoverPlaylists(const QString &genreIds, const QString &tags = QString(), quint32 limit = 25, quint32 offset = 0);
+    void searchPlaylists(const QString &query, quint32 limit = 8, quint32 offset = 0);

    // --- favorites ---
    void getFavTracks(quint32 offset = 0, quint32 limit = 500);
    void getFavAlbums(quint32 offset = 0, quint32 limit = 200);
    void getFavArtists(quint32 offset = 0, quint32 limit = 200);
-    void getUserPlaylists(quint32 offset = 0, quint32 limit = 200);
+    void getUserPlaylists(quint32 offset = 0, quint32 limit = 350);
+
+    // --- playback options ---
+    void setReplayGain(bool enabled);
+    void setGapless(bool enabled);
+    void prefetchTrack(qint64 trackId, int formatId = 6);
+
+    // --- playlist management ---
+    void createPlaylist(const QString &name);
+    void deletePlaylist(qint64 playlistId);
+    void addTrackToPlaylist(qint64 playlistId, qint64 trackId);
+    void deleteTrackFromPlaylist(qint64 playlistId, qint64 playlistTrackId);
+    void subscribePlaylist(qint64 playlistId);
+    void unsubscribePlaylist(qint64 playlistId);

    // --- fav modification ---
    void addFavTrack(qint64 trackId);
    void removeFavTrack(qint64 trackId);
    void addFavAlbum(const QString &albumId);
    void removeFavAlbum(const QString &albumId);
+    void addFavArtist(qint64 artistId);
+    void removeFavArtist(qint64 artistId);

    // --- playback ---
    void playTrack(qint64 trackId, int formatId = 6);
@@ -60,12 +87,27 @@ signals:
    // auth
    void loginSuccess(const QString &token, const QJsonObject &user);
    void loginError(const QString &error);
+    void userLoaded(const QJsonObject &user);

    // catalog
    void searchResult(const QJsonObject &result);
+    void mostPopularResult(const QJsonObject &result);
    void albumLoaded(const QJsonObject &album);
    void artistLoaded(const QJsonObject &artist);
+    void artistReleasesLoaded(const QString &releaseType, const QJsonArray &items, bool hasMore, int offset);
+    void deepShuffleTracksLoaded(const QJsonArray &tracks);
+    void dynamicSuggestionsLoaded(const QJsonObject &result);
+    void genresLoaded(const QJsonObject &result);
+    void featuredAlbumsLoaded(const QJsonObject &result);
+    void featuredPlaylistsLoaded(const QJsonObject &result);
+    void discoverPlaylistsLoaded(const QJsonObject &result);
+    void playlistSearchLoaded(const QJsonObject &result);
    void playlistLoaded(const QJsonObject &playlist);
+    void playlistCreated(const QJsonObject &playlist);
+    void playlistDeleted(const QJsonObject &result);
+    void playlistTrackAdded(qint64 playlistId);
+    void playlistSubscribed(qint64 playlistId);
+    void playlistUnsubscribed(qint64 playlistId);

    // favorites
    void favTracksLoaded(const QJsonObject &result);
@@ -78,6 +120,7 @@ signals:
    void stateChanged(const QString &state);
    void positionChanged(quint64 position, quint64 duration);
    void trackFinished();
+    void trackTransitioned();

    // errors
    void error(const QString &message);
@@ -86,6 +129,11 @@ private slots:
    Q_INVOKABLE void onEvent(int eventType, const QString &json);
    void onPositionTick();

+public:
+    void manuallyEmitTrackChanged(const QJsonObject &track) {
+        emit trackChanged(track);
+    }
+
 private:
    QobuzBackendOpaque *m_backend = nullptr;
    QTimer *m_positionTimer = nullptr;
--- a/src/dialog/settings.cpp
+++ b/src/dialog/settings.cpp
@@ -36,6 +36,15 @@ SettingsDialog::SettingsDialog(QWidget *parent) : QDialog(parent)
        }
    }
    playLayout->addRow(tr("Preferred quality:"), m_formatBox);
+
+    m_replayGain = new QCheckBox(tr("Enable ReplayGain (track gain normalisation)"), playGroup);
+    m_replayGain->setChecked(AppSettings::instance().replayGainEnabled());
+    playLayout->addRow(m_replayGain);
+
+    m_gapless = new QCheckBox(tr("Gapless playback"), playGroup);
+    m_gapless->setChecked(AppSettings::instance().gaplessEnabled());
+    playLayout->addRow(m_gapless);
+
    layout->addWidget(playGroup);

    // --- Last.fm group ---
@@ -90,6 +99,8 @@ SettingsDialog::SettingsDialog(QWidget *parent) : QDialog(parent)
 void SettingsDialog::applyChanges()
 {
    AppSettings::instance().setPreferredFormat(m_formatBox->currentData().toInt());
+    AppSettings::instance().setReplayGainEnabled(m_replayGain->isChecked());
+    AppSettings::instance().setGaplessEnabled(m_gapless->isChecked());
    AppSettings::instance().setLastFmEnabled(m_lastFmEnabled->isChecked());
    AppSettings::instance().setLastFmApiKey(m_lastFmApiKey->text().trimmed());
    AppSettings::instance().setLastFmApiSecret(m_lastFmApiSecret->text().trimmed());
--- a/src/dialog/settings.hpp
+++ b/src/dialog/settings.hpp
@@ -18,6 +18,8 @@ public:
 private:
    // Playback
    QComboBox *m_formatBox      = nullptr;
+    QCheckBox *m_replayGain     = nullptr;
+    QCheckBox *m_gapless        = nullptr;

    // Last.fm
    QCheckBox  *m_lastFmEnabled    = nullptr;
--- a/src/list/library.cpp
+++ b/src/list/library.cpp
@@ -3,6 +3,9 @@
 #include <QHeaderView>
 #include <QJsonArray>
 #include <QJsonObject>
+#include <QInputDialog>
+#include <QMenu>
+#include <QMessageBox>

 namespace List
 {
@@ -10,12 +13,15 @@ namespace List
 static constexpr int TypeRole    = Qt::UserRole + 1;
 static constexpr int IdRole      = Qt::UserRole + 2;
 static constexpr int NameRole    = Qt::UserRole + 3;
+static constexpr int IsOwnerRole = Qt::UserRole + 4;

 enum NodeType {
    NodeFavTracks,
    NodeFavAlbums,
    NodeFavArtists,
    NodePlaylist,
+    NodeBrowseGenres,
+    NodeBrowsePlaylists,
 };

 Library::Library(QobuzBackend *backend, QWidget *parent)
@@ -24,16 +30,29 @@ Library::Library(QobuzBackend *backend, QWidget *parent)
 {
    setHeaderHidden(true);
    setRootIsDecorated(true);
-    setContextMenuPolicy(Qt::NoContextMenu);
+    setContextMenuPolicy(Qt::CustomContextMenu);

    buildStaticNodes();

    connect(m_backend, &QobuzBackend::userPlaylistsLoaded,
            this, &Library::onUserPlaylistsLoaded);
+    connect(m_backend, &QobuzBackend::playlistCreated,
+            this, [this](const QJsonObject &) { refresh(); });
+    connect(m_backend, &QobuzBackend::playlistDeleted,
+            this, [this](const QJsonObject &result) {
+        const qint64 deletedId = static_cast<qint64>(result["playlist_id"].toDouble());
+        if (deletedId == m_openPlaylistId) {
+            m_openPlaylistId = 0;
+            emit openPlaylistDeleted();
+        }
+        refresh();
+    });
    connect(this, &QTreeWidget::itemClicked,
            this, &Library::onItemClicked);
    connect(this, &QTreeWidget::itemDoubleClicked,
            this, &Library::onItemDoubleClicked);
+    connect(this, &QTreeWidget::customContextMenuRequested,
+            this, &Library::onContextMenuRequested);
 }

 void Library::buildStaticNodes()
@@ -54,6 +73,16 @@ void Library::buildStaticNodes()
    // Playlists
    m_playlistsNode = new QTreeWidgetItem(this, QStringList{tr("Playlists")});
    m_playlistsNode->setExpanded(true);
+
+    // Browse
+    m_browseNode = new QTreeWidgetItem(this, QStringList{tr("Browse")});
+    m_browseNode->setExpanded(true);
+
+    auto *genresItem = new QTreeWidgetItem(m_browseNode, QStringList{tr("Genres")});
+    genresItem->setData(0, TypeRole, NodeBrowseGenres);
+
+    auto *playlistsItem = new QTreeWidgetItem(m_browseNode, QStringList{tr("Playlists")});
+    playlistsItem->setData(0, TypeRole, NodeBrowsePlaylists);
 }

 void Library::refresh()
@@ -70,17 +99,80 @@ void Library::onUserPlaylistsLoaded(const QJsonObject &result)
    while (m_playlistsNode->childCount() > 0)
        delete m_playlistsNode->takeChild(0);

+    QSet<qint64> allPlaylistIds;
+    QVector<QPair<qint64, QString>> editablePlaylists;
+    const qint64 myUserId = AppSettings::instance().userId();
    const QJsonArray items = result["items"].toArray();
    for (const auto &v : items) {
        const QJsonObject pl    = v.toObject();
        const QString     name  = pl["name"].toString();
        const qint64      id    = static_cast<qint64>(pl["id"].toDouble());
+        const qint64      ownId = static_cast<qint64>(pl["owner"].toObject()["id"].toDouble());
+        const bool        isOwner = (myUserId > 0 && ownId == myUserId);
+
+        if (id > 0)
+            allPlaylistIds.insert(id);

        auto *item = new QTreeWidgetItem(m_playlistsNode, QStringList{name});
        item->setData(0, TypeRole,    NodePlaylist);
        item->setData(0, IdRole,      id);
        item->setData(0, NameRole,    name);
+        item->setData(0, IsOwnerRole, isOwner);
+
+        // Only include playlists we can edit in the "Add to playlist" submenu
+        if (isOwner)
+            editablePlaylists.append({id, name});
    }
+
+    emit userPlaylistIdsChanged(allPlaylistIds);
+    emit userPlaylistsChanged(editablePlaylists);
+}
+
+void Library::onContextMenuRequested(const QPoint &pos)
+{
+    QTreeWidgetItem *item = itemAt(pos);
+    if (!item) return;
+
+    const bool isHeader = (item == m_playlistsNode);
+    const bool isPlaylistItem = (!isHeader && item->parent() == m_playlistsNode &&
+                                  item->data(0, TypeRole).toInt() == NodePlaylist);
+
+    if (!isHeader && !isPlaylistItem) return;
+
+    QMenu menu(this);
+
+    auto *newPl = menu.addAction(tr("New Playlist…"));
+    connect(newPl, &QAction::triggered, this, [this] {
+        bool ok = false;
+        const QString name = QInputDialog::getText(
+            this, tr("New Playlist"), tr("Playlist name:"),
+            QLineEdit::Normal, QString(), &ok);
+        if (ok && !name.trimmed().isEmpty())
+            m_backend->createPlaylist(name.trimmed());
+    });
+
+    if (isPlaylistItem) {
+        const qint64  plId      = item->data(0, IdRole).toLongLong();
+        const QString plName    = item->data(0, NameRole).toString();
+        const bool    isOwner   = item->data(0, IsOwnerRole).toBool();
+
+        if (isOwner) {
+            menu.addSeparator();
+            auto *delPl = menu.addAction(tr("Delete \"%1\"…").arg(plName));
+            connect(delPl, &QAction::triggered, this, [this, plId, plName] {
+                const auto answer = QMessageBox::question(
+                    this,
+                    tr("Delete Playlist"),
+                    tr("Permanently delete \"%1\"? This cannot be undone.").arg(plName),
+                    QMessageBox::Yes | QMessageBox::Cancel,
+                    QMessageBox::Cancel);
+                if (answer == QMessageBox::Yes)
+                    m_backend->deletePlaylist(plId);
+            });
+        }
+    }
+
+    menu.exec(viewport()->mapToGlobal(pos));
 }

 void Library::onItemClicked(QTreeWidgetItem *item, int)
@@ -92,9 +184,12 @@ void Library::onItemClicked(QTreeWidgetItem *item, int)
    case NodeFavTracks:  emit favTracksRequested();  break;
    case NodeFavAlbums:  emit favAlbumsRequested();  break;
    case NodeFavArtists: emit favArtistsRequested(); break;
+    case NodeBrowseGenres: emit browseGenresRequested(); break;
+    case NodeBrowsePlaylists: emit browsePlaylistsRequested(); break;
    case NodePlaylist: {
        const qint64  id   = item->data(0, IdRole).toLongLong();
        const QString name = item->data(0, NameRole).toString();
+        m_openPlaylistId = id;
        emit playlistRequested(id, name);
        break;
    }
--- a/src/list/library.hpp
+++ b/src/list/library.hpp
@@ -1,8 +1,13 @@
 #pragma once

 #include "../backend/qobuzbackend.hpp"
+#include "../util/settings.hpp"

 #include <QTreeWidget>
+#include <QVector>
+#include <QPair>
+#include <QString>
+#include <QSet>

 namespace List
 {
@@ -22,18 +27,29 @@ namespace List
        void favTracksRequested();
        void favAlbumsRequested();
        void favArtistsRequested();
+        void browseGenresRequested();
+        void browsePlaylistsRequested();
        void playlistRequested(qint64 playlistId, const QString &name);
+        /// Emitted after playlists are loaded so others can cache the list.
+        void userPlaylistsChanged(const QVector<QPair<qint64, QString>> &playlists);
+        /// Emitted with all user playlist IDs (owned + subscribed).
+        void userPlaylistIdsChanged(const QSet<qint64> &playlistIds);
+        /// Emitted when the currently open playlist was deleted.
+        void openPlaylistDeleted();

    private slots:
        void onUserPlaylistsLoaded(const QJsonObject &result);
        void onItemClicked(QTreeWidgetItem *item, int column);
        void onItemDoubleClicked(QTreeWidgetItem *item, int column);
+        void onContextMenuRequested(const QPoint &pos);

    private:
        QobuzBackend *m_backend = nullptr;

        QTreeWidgetItem *m_myLibNode     = nullptr;
        QTreeWidgetItem *m_playlistsNode = nullptr;
+        QTreeWidgetItem *m_browseNode    = nullptr;
+        qint64           m_openPlaylistId = 0;

        void buildStaticNodes();
    };
--- a/src/list/tracks.cpp
+++ b/src/list/tracks.cpp
@@ -1,8 +1,11 @@
 #include "tracks.hpp"
+#include "../util/settings.hpp"
+#include "../util/trackinfo.hpp"

 #include <QHeaderView>
 #include <QMenu>
 #include <QAction>
+#include <QScrollBar>

 namespace List
 {
@@ -34,42 +37,221 @@ Tracks::Tracks(QobuzBackend *backend, PlayQueue *queue, QWidget *parent)
            this, &Tracks::onDoubleClicked);
    connect(this, &QTreeView::customContextMenuRequested,
            this, &Tracks::onContextMenu);
+    connect(m_model, &QAbstractItemModel::modelReset, this, [this] {
+        for (int row : m_model->discHeaderRows())
+            setFirstColumnSpanned(row, {}, true);
+        setSortingEnabled(!m_model->hasMultipleDiscs());
+    });
+    connect(verticalScrollBar(), &QScrollBar::valueChanged,
+            this, [this](int) { maybeLoadMorePlaylistTracks(); });
+
+    connect(m_backend, &QobuzBackend::playlistLoaded, this,
+            [this](const QJsonObject &playlist) {
+        if (!m_pendingPlayAll)
+            return;
+
+        const qint64 id = static_cast<qint64>(playlist["id"].toDouble());
+        if (id != m_playlistId)
+            return;
+
+        if (!playlist["full_load"].toBool())
+            return;
+
+        m_pendingPlayAll = false;
+        const bool shuffle = m_pendingPlayAllShuffle;
+        m_pendingPlayAllShuffle = false;
+
+        const QJsonArray items = playlist["tracks"].toObject()["items"].toArray();
+        if (items.isEmpty())
+            return;
+
+        m_queue->setContext(items, 0);
+        if (shuffle && !m_queue->shuffleEnabled())
+            m_queue->shuffleNow();
+
+        const qint64 firstId = static_cast<qint64>(m_queue->current()["id"].toDouble());
+        if (firstId > 0)
+            emit playTrackRequested(firstId);
+    });

 }

 void Tracks::loadTracks(const QJsonArray &tracks)
 {
+    setPlaylistContext(0);
+    m_pendingPlayAll = false;
+    m_pendingPlayAllShuffle = false;
+    setColumnHidden(TrackListModel::ColAlbum, false);
    m_model->setTracks(tracks, false, /*useSequential=*/true);
 }

 void Tracks::loadAlbum(const QJsonObject &album)
 {
+    setPlaylistContext(0);
+    m_pendingPlayAll = false;
+    m_pendingPlayAllShuffle = false;
+    setColumnHidden(TrackListModel::ColAlbum, true);
    const QJsonArray items = album["tracks"].toObject()["items"].toArray();
    m_model->setTracks(items); // album: use track_number
 }

 void Tracks::loadPlaylist(const QJsonObject &playlist)
 {
-    const QJsonArray items = playlist["tracks"].toObject()["items"].toArray();
+    setColumnHidden(TrackListModel::ColAlbum, false);
+    const qint64 id     = static_cast<qint64>(playlist["id"].toDouble());
+    const qint64 ownId  = static_cast<qint64>(playlist["owner"].toObject()["id"].toDouble());
+    const qint64 myId   = AppSettings::instance().userId();
+    const bool isOwned  = (myId > 0 && ownId == myId);
+    setPlaylistContext(id, isOwned);
+    const QJsonObject tracksObj = playlist["tracks"].toObject();
+    const QJsonArray items = tracksObj["items"].toArray();
+    const int offset = tracksObj["offset"].toInt(0);
+    m_playlistTrackTotal = tracksObj["total"].toInt(items.size());
+    m_playlistLoadedCount = offset + items.size();
+    m_playlistLoadingMore = false;
    m_model->setTracks(items, /*usePosition=*/true);
+    maybeLoadMorePlaylistTracks();
+}
+
+void Tracks::appendPlaylistPage(const QJsonObject &playlist)
+{
+    if (m_playlistId <= 0)
+        return;
+
+    const qint64 id = static_cast<qint64>(playlist["id"].toDouble());
+    if (id != m_playlistId)
+        return;
+
+    const QJsonObject tracksObj = playlist["tracks"].toObject();
+    const QJsonArray items = tracksObj["items"].toArray();
+    const int offset = tracksObj["offset"].toInt(m_playlistLoadedCount);
+    const int total = tracksObj["total"].toInt(m_playlistTrackTotal);
+
+    if (total > 0)
+        m_playlistTrackTotal = total;
+
+    // Ignore stale/duplicate pages.
+    if (offset < m_playlistLoadedCount) {
+        m_playlistLoadingMore = false;
+        return;
+    }
+
+    if (!items.isEmpty()) {
+        m_model->appendTracks(items, /*usePosition=*/true);
+        m_playlistLoadedCount = offset + items.size();
+    } else {
+        m_playlistLoadedCount = qMax(m_playlistLoadedCount, offset);
+    }
+
+    m_playlistLoadingMore = false;
+    maybeLoadMorePlaylistTracks();
 }

 void Tracks::loadSearchTracks(const QJsonArray &tracks)
 {
+    setPlaylistContext(0);
+    m_pendingPlayAll = false;
+    m_pendingPlayAllShuffle = false;
+    setColumnHidden(TrackListModel::ColAlbum, false);
    m_model->setTracks(tracks, false, /*useSequential=*/true);
 }

+void Tracks::setPlaylistContext(qint64 playlistId, bool isOwned)
+{
+    if (m_playlistId != playlistId) {
+        m_pendingPlayAll = false;
+        m_pendingPlayAllShuffle = false;
+        m_playlistLoadingMore = false;
+    }
+    m_playlistId = playlistId;
+    m_playlistIsOwned = isOwned;
+    if (playlistId <= 0) {
+        m_playlistTrackTotal = 0;
+        m_playlistLoadedCount = 0;
+    }
+}
+
+void Tracks::setUserPlaylists(const QVector<QPair<qint64, QString>> &playlists)
+{
+    m_userPlaylists = playlists;
+}
+
 void Tracks::setPlayingTrackId(qint64 id)
 {
    m_model->setPlayingId(id);
 }

+void Tracks::setFavTrackIds(const QSet<qint64> &ids)
+{
+    m_model->setFavIds(ids);
+}
+
+void Tracks::addFavTrackId(qint64 id)
+{
+    m_model->addFavId(id);
+}
+
+void Tracks::removeFavTrackId(qint64 id)
+{
+    m_model->removeFavId(id);
+}
+
+void Tracks::playAll(bool shuffle)
+{
+    const QJsonArray tracks = m_model->currentTracksJson();
+    if (tracks.isEmpty()) return;
+
+    if (m_playlistId > 0 && m_playlistTrackTotal > tracks.size()) {
+        m_pendingPlayAll = true;
+        m_pendingPlayAllShuffle = shuffle;
+        m_backend->getPlaylistAll(m_playlistId);
+        return;
+    }
+
+    m_queue->setContext(tracks, 0);
+    // Shuffle once without touching the global shuffle flag — so a subsequent
+    // double-click on a track plays in normal order (unless global shuffle is on).
+    if (shuffle && !m_queue->shuffleEnabled())
+        m_queue->shuffleNow();
+    const qint64 firstId = static_cast<qint64>(m_queue->current()["id"].toDouble());
+    if (firstId > 0)
+        emit playTrackRequested(firstId);
+}
+
+void Tracks::maybeLoadMorePlaylistTracks()
+{
+    if (m_playlistId <= 0)
+        return;
+    if (m_pendingPlayAll)
+        return;
+    if (m_playlistLoadingMore)
+        return;
+    if (m_playlistTrackTotal > 0 && m_playlistLoadedCount >= m_playlistTrackTotal)
+        return;
+
+    QScrollBar *bar = verticalScrollBar();
+    if (!bar)
+        return;
+
+    // Start prefetching before the absolute bottom so paging feels seamless.
+    constexpr int kPrefetchPx = 180;
+    if (bar->maximum() > 0 && bar->value() < (bar->maximum() - kPrefetchPx))
+        return;
+
+    m_playlistLoadingMore = true;
+    m_backend->getPlaylist(m_playlistId, static_cast<quint32>(m_playlistLoadedCount), 500);
+}
+

 void Tracks::onDoubleClicked(const QModelIndex &index)
 {
    const qint64 id = m_model->data(index, TrackListModel::TrackIdRole).toLongLong();
    if (id > 0) {
-        m_queue->setContext(m_model->currentTracksJson(), index.row());
+        // Compute filtered row (disc headers excluded from currentTracksJson)
+        int filteredRow = 0;
+        for (int r = 0; r < index.row(); ++r)
+            if (!m_model->trackAt(r).isDiscHeader) ++filteredRow;
+        m_queue->setContext(m_model->currentTracksJson(), filteredRow);
        emit playTrackRequested(id);
    }
 }
@@ -80,6 +262,7 @@ void Tracks::onContextMenu(const QPoint &pos)
    if (!index.isValid()) return;

    const qint64      id        = m_model->data(index, TrackListModel::TrackIdRole).toLongLong();
+    if (id <= 0) return;  // disc header row
    const QJsonObject trackJson = m_model->data(index, TrackListModel::TrackJsonRole).toJsonObject();

    QMenu menu(this);
@@ -88,12 +271,28 @@ void Tracks::onContextMenu(const QPoint &pos)
    auto *playNext = menu.addAction(QIcon(":/res/icons/media-skip-forward.svg"),   tr("Play next"));
    auto *addQueue = menu.addAction(QIcon(":/res/icons/media-playlist-append.svg"), tr("Add to queue"));
    menu.addSeparator();
-    auto *addFav   = menu.addAction(QIcon(":/res/icons/starred-symbolic.svg"),      tr("Add to favorites"));
-    auto *remFav   = menu.addAction(QIcon(":/res/icons/non-starred-symbolic.svg"),  tr("Remove from favorites"));

-    const int row = index.row();
-    connect(playNow, &QAction::triggered, this, [this, id, row] {
-        m_queue->setContext(m_model->currentTracksJson(), row);
+    const bool isFav = m_model->isFav(id);
+    if (isFav) {
+        auto *remFav = menu.addAction(QIcon(":/res/icons/non-starred-symbolic.svg"), tr("Remove from favorites"));
+        connect(remFav, &QAction::triggered, this, [this, id] {
+            m_backend->removeFavTrack(id);
+            m_model->removeFavId(id);
+        });
+    } else {
+        auto *addFav = menu.addAction(QIcon(":/res/icons/starred-symbolic.svg"), tr("Add to favorites"));
+        connect(addFav, &QAction::triggered, this, [this, id] {
+            m_backend->addFavTrack(id);
+            m_model->addFavId(id);
+        });
+    }
+
+    // Compute filtered row for multi-disc albums (disc headers excluded from currentTracksJson)
+    int filteredRow = 0;
+    for (int r = 0; r < index.row(); ++r)
+        if (!m_model->trackAt(r).isDiscHeader) ++filteredRow;
+    connect(playNow, &QAction::triggered, this, [this, id, filteredRow] {
+        m_queue->setContext(m_model->currentTracksJson(), filteredRow);
        emit playTrackRequested(id);
    });
    connect(playNext, &QAction::triggered, this, [this, trackJson] {
@@ -102,12 +301,6 @@ void Tracks::onContextMenu(const QPoint &pos)
    connect(addQueue, &QAction::triggered, this, [this, trackJson] {
        m_queue->addToQueue(trackJson);
    });
-    connect(addFav, &QAction::triggered, this, [this, id] {
-        m_backend->addFavTrack(id);
-    });
-    connect(remFav, &QAction::triggered, this, [this, id] {
-        m_backend->removeFavTrack(id);
-    });

    // Open album
    const QString albumId = m_model->trackAt(index.row()).albumId;
@@ -115,7 +308,7 @@ void Tracks::onContextMenu(const QPoint &pos)
        menu.addSeparator();
        auto *openAlbum = menu.addAction(
            QIcon(":/res/icons/view-media-album-cover.svg"),
-            tr("Open album: %1").arg(m_model->trackAt(index.row()).album));
+            tr("Open album: %1").arg(QString(m_model->trackAt(index.row()).album).replace(QLatin1Char('&'), QStringLiteral("&&"))));
        connect(openAlbum, &QAction::triggered, this, [this, albumId] {
            m_backend->getAlbum(albumId);
        });
@@ -128,12 +321,49 @@ void Tracks::onContextMenu(const QPoint &pos)
        const QString artistName = trackJson["performer"].toObject()["name"].toString();
        auto *openArtist = menu.addAction(
            QIcon(":/res/icons/view-media-artist.svg"),
-            tr("Open artist: %1").arg(artistName));
+            tr("Open artist: %1").arg(QString(artistName).replace(QLatin1Char('&'), QStringLiteral("&&"))));
        connect(openArtist, &QAction::triggered, this, [this, artistId] {
            m_backend->getArtist(artistId);
        });
    }

+    // Playlist management
+    if (!m_userPlaylists.isEmpty()) {
+        menu.addSeparator();
+        auto *addToPlMenu = menu.addMenu(
+            QIcon(":/res/icons/media-playlist-append.svg"), tr("Add to playlist"));
+        for (const auto &pl : m_userPlaylists) {
+            const qint64  plId   = pl.first;
+            const QString plName = pl.second;
+            auto *act = addToPlMenu->addAction(QString(plName).replace(QLatin1Char('&'), QStringLiteral("&&")));
+            connect(act, &QAction::triggered, this, [this, id, plId] {
+                emit addToPlaylistRequested(id, plId);
+            });
+        }
+    }
+
+    if (m_playlistId > 0 && m_playlistIsOwned) {
+        const qint64 playlistTrackId =
+            m_model->data(index, TrackListModel::PlaylistTrackIdRole).toLongLong();
+        if (playlistTrackId > 0) {
+            if (m_userPlaylists.isEmpty()) menu.addSeparator();
+            auto *remFromPl = menu.addAction(tr("Remove from this playlist"));
+            const qint64 curPlaylistId = m_playlistId;
+            const int    curRow        = index.row();
+            connect(remFromPl, &QAction::triggered, this, [this, curPlaylistId, playlistTrackId, curRow] {
+                emit removeFromPlaylistRequested(curPlaylistId, playlistTrackId);
+                m_model->removeTrack(curRow);  // optimistic: remove immediately from view
+            });
+        }
+    }
+
+    // Track info
+    menu.addSeparator();
+    auto *infoAction = menu.addAction(tr("Track info..."));
+    connect(infoAction, &QAction::triggered, this, [this, trackJson] {
+        TrackInfoDialog::show(trackJson, this);
+    });
+
    menu.exec(viewport()->mapToGlobal(pos));
 }

--- a/src/list/tracks.hpp
+++ b/src/list/tracks.hpp
@@ -7,6 +7,10 @@
 #include <QTreeView>
 #include <QJsonArray>
 #include <QJsonObject>
+#include <QVector>
+#include <QPair>
+#include <QString>
+#include <QSet>

 namespace List
 {
@@ -20,18 +24,47 @@ namespace List
        void loadTracks(const QJsonArray &tracks);
        void loadAlbum(const QJsonObject &album);
        void loadPlaylist(const QJsonObject &playlist);
+        void appendPlaylistPage(const QJsonObject &playlist);
        void loadSearchTracks(const QJsonArray &tracks);

        /// Called when the backend fires EV_TRACK_CHANGED so the playing row is highlighted.
        void setPlayingTrackId(qint64 id);

+        /// Populate favorite track IDs so the star indicator and context menu reflect fav status.
+        void setFavTrackIds(const QSet<qint64> &ids);
+        void addFavTrackId(qint64 id);
+        void removeFavTrackId(qint64 id);
+
+        /// Start playing all tracks in the current view from the beginning.
+        /// If shuffle is true, enables shuffle mode before starting.
+        void playAll(bool shuffle = false);
+
+        /// Set which playlist is currently displayed (0 = none).
+        /// isOwned controls whether "Remove from this playlist" is shown.
+        void setPlaylistContext(qint64 playlistId, bool isOwned = false);
+        qint64 playlistId() const { return m_playlistId; }
+        /// Provide the user's playlist list for the "Add to playlist" submenu.
+        void setUserPlaylists(const QVector<QPair<qint64, QString>> &playlists);
+
    signals:
        void playTrackRequested(qint64 trackId);
+        void addToPlaylistRequested(qint64 trackId, qint64 playlistId);
+        void removeFromPlaylistRequested(qint64 playlistId, qint64 playlistTrackId);

    private:
        TrackListModel *m_model   = nullptr;
        QobuzBackend   *m_backend = nullptr;
        PlayQueue      *m_queue   = nullptr;
+        qint64          m_playlistId = 0;
+        int             m_playlistTrackTotal = 0;
+        int             m_playlistLoadedCount = 0;
+        bool            m_playlistIsOwned = false;
+        bool            m_playlistLoadingMore = false;
+        bool            m_pendingPlayAll = false;
+        bool            m_pendingPlayAllShuffle = false;
+        QVector<QPair<qint64, QString>> m_userPlaylists;
+
+        void maybeLoadMorePlaylistTracks();

        void onDoubleClicked(const QModelIndex &index);
        void onContextMenu(const QPoint &pos);
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,5 +1,6 @@
 #include "mainwindow.hpp"
 #include "backend/qobuzbackend.hpp"
+#include "util/colors.hpp"

 #include <QApplication>
 #include <QStyleFactory>
@@ -11,27 +12,67 @@ int main(int argc, char *argv[])
    app.setOrganizationName(QStringLiteral("qobuz-qt"));
    app.setApplicationVersion(QStringLiteral("0.1.0"));

-    // Dark palette consistent with spotify-qt style
+    // Qobuz dark palette
+    // Accent: #FFB232 (yellow-orange), Blue: #46B3EE, Backgrounds: #191919 / #141414
    app.setStyle(QStyleFactory::create(QStringLiteral("Fusion")));
    QPalette darkPalette;
-    darkPalette.setColor(QPalette::Window,          QColor(35, 35, 35));
-    darkPalette.setColor(QPalette::WindowText,      Qt::white);
-    darkPalette.setColor(QPalette::Base,            QColor(25, 25, 25));
-    darkPalette.setColor(QPalette::AlternateBase,   QColor(45, 45, 45));
-    darkPalette.setColor(QPalette::ToolTipBase,     Qt::white);
-    darkPalette.setColor(QPalette::ToolTipText,     Qt::white);
-    darkPalette.setColor(QPalette::Text,            Qt::white);
-    darkPalette.setColor(QPalette::Button,          QColor(53, 53, 53));
-    darkPalette.setColor(QPalette::ButtonText,      Qt::white);
-    darkPalette.setColor(QPalette::BrightText,      Qt::red);
-    darkPalette.setColor(QPalette::Link,            QColor(42, 130, 218));
-    darkPalette.setColor(QPalette::Highlight,       QColor(42, 130, 218));
-    darkPalette.setColor(QPalette::HighlightedText, Qt::black);
-    darkPalette.setColor(QPalette::PlaceholderText,                QColor(140, 140, 140));
-    darkPalette.setColor(QPalette::Disabled, QPalette::Text,       QColor(127, 127, 127));
-    darkPalette.setColor(QPalette::Disabled, QPalette::ButtonText, QColor(127, 127, 127));
+    darkPalette.setColor(QPalette::Window,          Colors::WindowBg);
+    darkPalette.setColor(QPalette::WindowText,      Colors::LightText);
+    darkPalette.setColor(QPalette::Base,            Colors::BaseBg);
+    darkPalette.setColor(QPalette::AlternateBase,   Colors::AlternateBaseBg);
+    darkPalette.setColor(QPalette::ToolTipBase,     Colors::WindowBg);
+    darkPalette.setColor(QPalette::ToolTipText,     Colors::LightText);
+    darkPalette.setColor(QPalette::Text,            Colors::LightText);
+    darkPalette.setColor(QPalette::Button,          Colors::ButtonSurface);
+    darkPalette.setColor(QPalette::ButtonText,      Colors::LightText);
+    darkPalette.setColor(QPalette::BrightText,      Colors::QobuzOrange);
+    darkPalette.setColor(QPalette::Link,            Colors::QobuzBlue);
+    darkPalette.setColor(QPalette::Highlight,       Colors::QobuzOrange);
+    darkPalette.setColor(QPalette::HighlightedText, Colors::HighlightedFg);
+    darkPalette.setColor(QPalette::PlaceholderText,                Colors::PlaceholderText);
+    darkPalette.setColor(QPalette::Disabled, QPalette::Text,       Colors::DisabledText);
+    darkPalette.setColor(QPalette::Disabled, QPalette::ButtonText, Colors::DisabledText);
+    darkPalette.setColor(QPalette::Mid,             Colors::MidSurface);
+    darkPalette.setColor(QPalette::Dark,            Colors::DarkSurface);
    app.setPalette(darkPalette);

+    // Stylesheet tweaks: orange accent on scrollbars, focus rings, etc.
+    app.setStyleSheet(QStringLiteral(
+        "QScrollBar:vertical { width: 6px; background: #141414; border: none; }"
+        "QScrollBar::handle:vertical { background: #3a3a3a; border-radius: 3px; min-height: 20px; }"
+        "QScrollBar::handle:vertical:hover { background: #FFB232; }"
+        "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height: 0; }"
+        "QScrollBar:horizontal { height: 6px; background: #141414; border: none; }"
+        "QScrollBar::handle:horizontal { background: #3a3a3a; border-radius: 3px; min-width: 20px; }"
+        "QScrollBar::handle:horizontal:hover { background: #FFB232; }"
+        "QScrollBar::add-line:horizontal, QScrollBar::sub-line:horizontal { width: 0; }"
+        "QToolBar { background: #111111; border-bottom: 1px solid #2a2a2a; spacing: 4px; }"
+        "QDockWidget { border: none; }"
+        "QDockWidget::title { background: #1e1e1e; padding: 4px 8px; font-weight: bold; }"
+        "QTreeView, QTreeWidget { border: none; outline: none; }"
+        "QTreeView::item:selected, QTreeWidget::item:selected { color: #101010; }"
+        "QHeaderView::section { background: #1e1e1e; border: none;"
+        "  border-right: 1px solid #2a2a2a; padding: 4px 8px; }"
+        "QMenu { background: #1e1e1e; border: 1px solid #3a3a3a; }"
+        "QMenu::item:selected { background: #FFB232; color: #101010; }"
+        "QPushButton { background: #2a2a2a; border: 1px solid #3a3a3a; border-radius: 4px; padding: 4px 12px; }"
+        "QPushButton:hover { background: #333333; border-color: #FFB232; }"
+        "QPushButton:pressed { background: #FFB232; color: #101010; }"
+        "QComboBox { background: #2a2a2a; border: 1px solid #3a3a3a; border-radius: 4px; padding: 3px 8px; }"
+        "QComboBox:hover { border-color: #FFB232; }"
+        "QComboBox QAbstractItemView { background: #1e1e1e; selection-background-color: #FFB232; selection-color: #101010; }"
+        "QLineEdit { background: #1e1e1e; border: 1px solid #3a3a3a; border-radius: 4px; padding: 4px 8px; }"
+        "QLineEdit:focus { border-color: #FFB232; }"
+        "QGroupBox { border: 1px solid #2f2f2f; border-radius: 6px; margin-top: 8px; padding-top: 4px; }"
+        "QGroupBox::title { subcontrol-origin: margin; left: 8px; color: #FFB232; }"
+        "QCheckBox::indicator:checked { background: #FFB232; border: 1px solid #FFB232; border-radius: 2px; }"
+        "QSlider::groove:horizontal { height: 4px; background: #2a2a2a; border-radius: 2px; }"
+        "QSlider::handle:horizontal { background: #FFB232; width: 12px; height: 12px;"
+        "  margin: -4px 0; border-radius: 6px; }"
+        "QSlider::sub-page:horizontal { background: #FFB232; border-radius: 2px; }"
+        "QStatusBar { background: #111111; border-top: 1px solid #2a2a2a; }"
+    ));
+
    auto *backend = new QobuzBackend;
    MainWindow window(backend);
    window.show();
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -4,6 +4,10 @@
 #include "util/settings.hpp"
 #include "util/icon.hpp"

+#ifdef USE_DBUS
+#include "backend/mpris.hpp"
+#endif
+
 #include <QApplication>
 #include <QMenuBar>
 #include <QMenu>
@@ -34,13 +38,34 @@ MainWindow::MainWindow(QobuzBackend *backend, QWidget *parent)
    m_content = new MainContent(m_backend, m_queue, this);
    setCentralWidget(m_content);

+    setupDocks();
+    setupMenuBar();
+    statusBar()->showMessage(tr("Ready"));
+
+    setupScrobbler();
+    setupGapless();
+    setupMpris();
+    connectBackendSignals();
+    connectLibrarySignals();
+    connectContentSignals();
+    connectToolbarSignals();
+
+    // Apply playback options from saved settings
+    m_backend->setReplayGain(AppSettings::instance().replayGainEnabled());
+    m_backend->setGapless(AppSettings::instance().gaplessEnabled());
+
+    tryRestoreSession();
+}
+
+void MainWindow::setupDocks()
+{
    // ---- Library dock (left) ----
    m_library = new List::Library(m_backend, this);
    m_libraryDock = new QDockWidget(tr("Library"), this);
    m_libraryDock->setObjectName(QStringLiteral("libraryDock"));
    m_libraryDock->setFeatures(QDockWidget::DockWidgetMovable);
    m_libraryDock->setWidget(m_library);
-    m_libraryDock->setMinimumWidth(200);
+    m_libraryDock->setMinimumWidth(150);
    addDockWidget(Qt::LeftDockWidgetArea, m_libraryDock);

    // ---- Now-playing context dock (left, below library) ----
@@ -53,14 +78,13 @@ MainWindow::MainWindow(QobuzBackend *backend, QWidget *parent)
    addDockWidget(Qt::RightDockWidgetArea, m_queuePanel);

    // ---- Search side panel (right) ----
-    m_sidePanel = new SidePanel::View(m_backend, this);
+    m_sidePanel = new SidePanel::View(m_backend, m_queue, this);
    m_sidePanel->hide();
    addDockWidget(Qt::RightDockWidgetArea, m_sidePanel);
+}

-    setupMenuBar();
-    statusBar()->showMessage(tr("Ready"));
-
-    // ---- Scrobbler ----
+void MainWindow::setupScrobbler()
+{
    m_scrobbler = new LastFmScrobbler(this);
    connect(m_backend, &QobuzBackend::trackChanged,
            m_scrobbler, &LastFmScrobbler::onTrackStarted);
@@ -69,19 +93,148 @@ MainWindow::MainWindow(QobuzBackend *backend, QWidget *parent)
    connect(m_backend, &QobuzBackend::trackFinished,
            m_scrobbler, &LastFmScrobbler::onTrackFinished);

-    // ---- Backend signals ----
+    // Scrobble the finished track during a gapless transition
+    connect(m_backend, &QobuzBackend::trackTransitioned,
+            m_scrobbler, &LastFmScrobbler::onTrackFinished);
+}
+
+void MainWindow::setupGapless()
+{
+    connect(m_backend, &QobuzBackend::positionChanged, this, [this](quint64 pos, quint64 dur) {
+        if (!AppSettings::instance().gaplessEnabled() || dur == 0) return;
+
+        // Trigger prefetch if we pass the 50% mark OR are within 60 seconds of the end
+        if ((pos > dur / 2) || (dur > 60 && (dur - pos) <= 60)) {
+            if (!m_nextTrackPrefetched && m_queue->canGoNext()) {
+                m_nextTrackPrefetched = true; // Lock it so it only fires once
+
+                const auto upcoming = m_queue->upcomingTracks(1);
+                if (!upcoming.isEmpty()) {
+                    const qint64 nextId = static_cast<qint64>(upcoming.first()["id"].toDouble());
+                    if (nextId > 0) {
+                        m_backend->prefetchTrack(nextId, AppSettings::instance().preferredFormat());
+                    }
+                }
+            }
+        }
+    });
+}
+
+void MainWindow::setupMpris()
+{
+#ifdef USE_DBUS
+    m_mpris = new Mpris(this);
+    connect(m_mpris->player(), &MprisPlayerAdaptor::playRequested, m_backend, [this] {
+        if (m_backend->state() == 2) m_backend->resume();
+    });
+    connect(m_mpris->player(), &MprisPlayerAdaptor::pauseRequested, m_backend, &QobuzBackend::pause);
+    connect(m_mpris->player(), &MprisPlayerAdaptor::playPauseRequested, m_backend, [this] {
+        if (m_backend->state() == 1)
+            m_backend->pause();
+        else
+            m_backend->resume();
+    });
+    connect(m_mpris->player(), &MprisPlayerAdaptor::stopRequested, m_backend, &QobuzBackend::stop);
+    connect(m_mpris->player(), &MprisPlayerAdaptor::nextRequested, this, [this] {
+        if (!m_queue->canGoNext()) return;
+        const qint64 id = static_cast<qint64>(m_queue->advance()["id"].toDouble());
+        if (id > 0) m_backend->playTrack(id);
+    });
+    connect(m_mpris->player(), &MprisPlayerAdaptor::previousRequested, this, [this] {
+        if (!m_queue->canGoPrev()) return;
+        const qint64 id = static_cast<qint64>(m_queue->stepBack()["id"].toDouble());
+        if (id > 0) m_backend->playTrack(id);
+    });
+    connect(m_mpris->player(), &MprisPlayerAdaptor::seekRequested, m_backend, [this](qlonglong offsetMicroseconds) {
+        qint64 newPos = m_backend->position() + (offsetMicroseconds / 1000000LL);
+        if (newPos < 0) newPos = 0;
+        m_backend->seek(newPos);
+    });
+    connect(m_mpris->player(), &MprisPlayerAdaptor::seekToRequested, m_backend, [this](qlonglong positionMicroseconds) {
+        m_backend->seek(positionMicroseconds / 1000000LL);
+    });
+    connect(m_mpris->player(), &MprisPlayerAdaptor::volumeChangeRequested, m_backend, [this](double vol) {
+        m_backend->setVolume(vol * 100);
+    });
+
+    connect(m_backend, &QobuzBackend::stateChanged, this, [this](const QString &state) {
+        if (state == "playing") m_mpris->player()->setPlaybackStatus("Playing");
+        else if (state == "paused") m_mpris->player()->setPlaybackStatus("Paused");
+        else m_mpris->player()->setPlaybackStatus("Stopped");
+    });
+    connect(m_backend, &QobuzBackend::positionChanged, this, [this](quint64 pos) {
+        m_mpris->player()->updatePosition(pos);
+    });
+#endif
+}
+
+void MainWindow::connectBackendSignals()
+{
    connect(m_backend, &QobuzBackend::loginSuccess,   this, &MainWindow::onLoginSuccess);
    connect(m_backend, &QobuzBackend::loginError,     this, &MainWindow::onLoginError);
+    connect(m_backend, &QobuzBackend::userLoaded, this, [this](const QJsonObject &user) {
+        const qint64 id = static_cast<qint64>(user["id"].toDouble());
+        if (id > 0) {
+            AppSettings::instance().setUserId(id);
+            m_library->refresh();  // re-load playlists with correct ownership now
+        }
+    });
    connect(m_backend, &QobuzBackend::favTracksLoaded,  this, &MainWindow::onFavTracksLoaded);
    connect(m_backend, &QobuzBackend::favAlbumsLoaded,  this, &MainWindow::onFavAlbumsLoaded);
    connect(m_backend, &QobuzBackend::favArtistsLoaded, this, &MainWindow::onFavArtistsLoaded);
    connect(m_backend, &QobuzBackend::albumLoaded,      this, &MainWindow::onAlbumLoaded);
    connect(m_backend, &QobuzBackend::artistLoaded,     this, &MainWindow::onArtistLoaded);
+    connect(m_backend, &QobuzBackend::artistReleasesLoaded,
+            m_content, &MainContent::updateArtistReleases);
+    connect(m_backend, &QobuzBackend::deepShuffleTracksLoaded,
+            m_content, &MainContent::onDeepShuffleTracks);
    connect(m_backend, &QobuzBackend::playlistLoaded,   this, &MainWindow::onPlaylistLoaded);
+    connect(m_backend, &QobuzBackend::playlistCreated,   this, &MainWindow::onPlaylistCreated);
+    connect(m_backend, &QobuzBackend::playlistDeleted,   this, [this](const QJsonObject &) {
+        // status bar message is also shown by library's openPlaylistDeleted handler
+    });
+    connect(m_backend, &QobuzBackend::playlistTrackAdded, this, [this](qint64 playlistId) {
+        // Refresh the currently shown playlist if a track was added to it
+        if (m_content->tracksList()->playlistId() == playlistId)
+            m_backend->getPlaylist(playlistId);
+        statusBar()->showMessage(tr("Track added to playlist"), 3000);
+    });
+    connect(m_backend, &QobuzBackend::playlistSubscribed, this, [this](qint64 playlistId) {
+        m_userPlaylistIds.insert(playlistId);
+        m_library->refresh();
+        if (m_content->tracksList()->playlistId() == playlistId)
+            m_content->setCurrentPlaylistFollowed(true);
+        statusBar()->showMessage(tr("Playlist followed"), 3000);
+    });
+    connect(m_backend, &QobuzBackend::playlistUnsubscribed, this, [this](qint64 playlistId) {
+        m_userPlaylistIds.remove(playlistId);
+        m_library->refresh();
+        if (m_content->tracksList()->playlistId() == playlistId)
+            m_content->setCurrentPlaylistFollowed(false);
+        statusBar()->showMessage(tr("Playlist unfollowed"), 3000);
+    });
    connect(m_backend, &QobuzBackend::trackChanged,   this, &MainWindow::onTrackChanged);
    connect(m_backend, &QobuzBackend::error, this, [this](const QString &msg) {
        statusBar()->showMessage(tr("Error: %1").arg(msg), 6000);
    });
+}
+
+void MainWindow::connectLibrarySignals()
+{
+    connect(m_library, &List::Library::userPlaylistIdsChanged,
+            this, [this](const QSet<qint64> &playlistIds) {
+        m_userPlaylistIds = playlistIds;
+        const qint64 currentPlaylistId = m_content->tracksList()->playlistId();
+        if (currentPlaylistId > 0)
+            m_content->setCurrentPlaylistFollowed(m_userPlaylistIds.contains(currentPlaylistId));
+    });
+    connect(m_library, &List::Library::userPlaylistsChanged,
+            this, &MainWindow::onUserPlaylistsChanged);
+    connect(m_library, &List::Library::openPlaylistDeleted,
+            this, [this] {
+        m_content->showWelcome();
+        statusBar()->showMessage(tr("Playlist deleted"), 3000);
+    });

    // ---- Library → backend ----
    connect(m_library, &List::Library::favTracksRequested, this, [this] {
@@ -89,10 +242,12 @@ MainWindow::MainWindow(QobuzBackend *backend, QWidget *parent)
        statusBar()->showMessage(tr("Loading favorite tracks…"));
    });
    connect(m_library, &List::Library::favAlbumsRequested, this, [this] {
+        m_showFavAlbumsOnLoad = true;
        m_backend->getFavAlbums();
        statusBar()->showMessage(tr("Loading favorite albums…"));
    });
    connect(m_library, &List::Library::favArtistsRequested, this, [this] {
+        m_showFavArtistsOnLoad = true;
        m_backend->getFavArtists();
        statusBar()->showMessage(tr("Loading favorite artists…"));
    });
@@ -101,10 +256,31 @@ MainWindow::MainWindow(QobuzBackend *backend, QWidget *parent)
        m_backend->getPlaylist(id);
        statusBar()->showMessage(tr("Loading playlist: %1…").arg(name));
    });
+    connect(m_library, &List::Library::browseGenresRequested, this, [this] {
+        m_content->showGenreBrowser();
+        statusBar()->showMessage(tr("Browse Genres"));
+    });
+    connect(m_library, &List::Library::browsePlaylistsRequested, this, [this] {
+        m_content->showPlaylistBrowser();
+        statusBar()->showMessage(tr("Browse Playlists"));
+    });
+}

-    // ---- Track list → playback ----
+void MainWindow::connectContentSignals()
+{
+    // ---- Track list → playback / playlist management ----
    connect(m_content->tracksList(), &List::Tracks::playTrackRequested,
            this, &MainWindow::onPlayTrackRequested);
+    connect(m_content->tracksList(), &List::Tracks::addToPlaylistRequested,
+            this, [this](qint64 trackId, qint64 playlistId) {
+        m_backend->addTrackToPlaylist(playlistId, trackId);
+        statusBar()->showMessage(tr("Adding track to playlist…"), 3000);
+    });
+    connect(m_content->tracksList(), &List::Tracks::removeFromPlaylistRequested,
+            this, [this](qint64 playlistId, qint64 playlistTrackId) {
+        m_backend->deleteTrackFromPlaylist(playlistId, playlistTrackId);
+        statusBar()->showMessage(tr("Removing track from playlist…"), 3000);
+    });

    // ---- Search panel ----
    connect(m_sidePanel, &SidePanel::View::albumSelected,
@@ -113,23 +289,64 @@ MainWindow::MainWindow(QobuzBackend *backend, QWidget *parent)
            this, &MainWindow::onSearchArtistSelected);
    connect(m_sidePanel, &SidePanel::View::trackPlayRequested,
            this, &MainWindow::onPlayTrackRequested);
+    connect(m_sidePanel, &SidePanel::View::addToPlaylistRequested,
+            this, [this](qint64 trackId, qint64 playlistId) {
+        m_backend->addTrackToPlaylist(playlistId, trackId);
+        statusBar()->showMessage(tr("Adding track to playlist..."), 3000);
+    });

    // ---- Album / artist navigation from content views ----
    connect(m_content, &MainContent::albumRequested,
            this, &MainWindow::onSearchAlbumSelected);
    connect(m_content, &MainContent::artistRequested,
            this, &MainWindow::onSearchArtistSelected);
+    connect(m_content, &MainContent::albumFavoriteToggled,
+            this, [this](const QString &albumId, bool favorite) {
+        if (favorite) {
+            m_backend->addFavAlbum(albumId);
+            m_favAlbumIds.insert(albumId);
+            statusBar()->showMessage(tr("Added album to favorites"), 3000);
+        } else {
+            m_backend->removeFavAlbum(albumId);
+            m_favAlbumIds.remove(albumId);
+            statusBar()->showMessage(tr("Removed album from favorites"), 3000);
+        }
+        m_content->setFavAlbumIds(m_favAlbumIds);
+    });
+    connect(m_content, &MainContent::playlistRequested,
+            this, [this](qint64 playlistId) {
+        m_backend->getPlaylist(playlistId);
+        statusBar()->showMessage(tr("Loading playlist…"));
+    });
+    connect(m_content, &MainContent::playlistFollowToggled,
+            this, [this](qint64 playlistId, bool follow) {
+        if (follow)
+            m_backend->subscribePlaylist(playlistId);
+        else
+            m_backend->unsubscribePlaylist(playlistId);
+    });
+    connect(m_content, &MainContent::playTrackRequested,
+            this, &MainWindow::onPlayTrackRequested);

    // ---- Queue panel ----
    connect(m_queuePanel, &QueuePanel::skipToTrackRequested,
            this, &MainWindow::onPlayTrackRequested);
+}

-    // ---- Toolbar toggles ----
+void MainWindow::connectToolbarSignals()
+{
    connect(m_toolBar, &MainToolBar::searchToggled, this, &MainWindow::onSearchToggled);
    connect(m_toolBar, &MainToolBar::queueToggled,
            this, [this](bool v) { m_queuePanel->setVisible(v); });
+    connect(m_queuePanel, &QDockWidget::visibilityChanged,
+            m_toolBar, &MainToolBar::setQueueToggleChecked);
+    connect(m_sidePanel, &QDockWidget::visibilityChanged,
+            m_toolBar, &MainToolBar::setSearchToggleChecked);
+    m_toolBar->setQueueToggleChecked(m_queuePanel->isVisible());
+    m_toolBar->setSearchToggleChecked(m_sidePanel->isVisible());

-    tryRestoreSession();
+    connect(m_toolBar, &MainToolBar::albumRequested,  this, &MainWindow::onSearchAlbumSelected);
+    connect(m_toolBar, &MainToolBar::artistRequested, this, &MainWindow::onSearchArtistSelected);
 }

 void MainWindow::setupMenuBar()
@@ -166,7 +383,14 @@ void MainWindow::tryRestoreSession()
    const QString token = AppSettings::instance().authToken();
    if (!token.isEmpty()) {
        m_backend->setToken(token);
+        if (AppSettings::instance().userId() == 0)
+            m_backend->getUser();  // userLoaded will call m_library->refresh()
+        else
            m_library->refresh();
+        // Preload fav albums so the album page fav button is accurate immediately.
+        m_backend->getFavAlbums();
+        // Preload fav artists so the artist page fav button works immediately
+        m_backend->getFavArtists();
        const QString name = AppSettings::instance().displayName();
        statusBar()->showMessage(tr("Signed in as %1").arg(
            name.isEmpty() ? AppSettings::instance().userEmail() : name));
@@ -210,9 +434,14 @@ void MainWindow::onLoginSuccess(const QString &token, const QJsonObject &user)
    const QString email       = user["email"].toString();
    AppSettings::instance().setDisplayName(displayName);
    AppSettings::instance().setUserEmail(email);
+    const qint64 userId = static_cast<qint64>(user["id"].toDouble());
+    if (userId > 0)
+        AppSettings::instance().setUserId(userId);
    statusBar()->showMessage(tr("Signed in as %1").arg(
        displayName.isEmpty() ? email : displayName));
    m_library->refresh();
+    m_backend->getFavAlbums();
+    m_backend->getFavArtists();
 }

 void MainWindow::onLoginError(const QString &error)
@@ -222,6 +451,7 @@ void MainWindow::onLoginError(const QString &error)

 void MainWindow::onTrackChanged(const QJsonObject &track)
 {
+    m_nextTrackPrefetched = false;
    // Update playing row highlight in the track list
    const qint64 id = static_cast<qint64>(track["id"].toDouble());
    m_content->tracksList()->setPlayingTrackId(id);
@@ -233,10 +463,39 @@ void MainWindow::onTrackChanged(const QJsonObject &track)
        : track["performer"].toObject()["name"].toString();
    statusBar()->showMessage(
        artist.isEmpty() ? title : QStringLiteral("▶  %1 — %2").arg(artist, title));
+
+#ifdef USE_DBUS
+    QVariantMap metadata;
+    metadata["mpris:trackid"] = QVariant::fromValue(QDBusObjectPath(QString("/org/qobuz/track/%1").arg(id)));
+    metadata["mpris:length"] = QVariant::fromValue(qlonglong(track["duration"].toDouble() * 1000000LL));
+    metadata["xesam:title"]  = title;
+
+    QJsonObject album = track["album"].toObject();
+    metadata["xesam:album"]  = album["title"].toString();
+
+    if (!artist.isEmpty()) {
+        metadata["xesam:artist"] = QStringList{artist};
+    }
+
+    if (album.contains("image") && album["image"].toObject().contains("large")) {
+        metadata["mpris:artUrl"] = album["image"].toObject()["large"].toString();
+    }
+
+    m_mpris->player()->setMetadata(metadata);
+#endif
 }

 void MainWindow::onFavTracksLoaded(const QJsonObject &result)
 {
+    // Cache fav IDs so the star indicator and context menu stay in sync
+    QSet<qint64> ids;
+    const QJsonArray items = result["items"].toArray();
+    for (const QJsonValue &v : items) {
+        const qint64 id = static_cast<qint64>(v.toObject()["id"].toDouble());
+        if (id > 0) ids.insert(id);
+    }
+    m_content->tracksList()->setFavTrackIds(ids);
+
    m_content->showFavTracks(result);
    statusBar()->showMessage(
        tr("%1 favorite tracks").arg(result["total"].toInt()), 4000);
@@ -244,17 +503,47 @@ void MainWindow::onFavTracksLoaded(const QJsonObject &result)

 void MainWindow::onFavAlbumsLoaded(const QJsonObject &result)
 {
+    // Always cache fav album IDs (needed by the album page fav button)
+    m_favAlbumIds.clear();
+    const QJsonArray items = result["items"].toArray();
+    for (const QJsonValue &v : items) {
+        const QJsonObject album = v.toObject();
+        QString id = album["id"].toString();
+        if (id.isEmpty() && album["id"].isDouble())
+            id = QString::number(static_cast<qint64>(album["id"].toDouble()));
+        if (!id.isEmpty())
+            m_favAlbumIds.insert(id);
+    }
+    m_content->setFavAlbumIds(m_favAlbumIds);
+
+    // Only navigate to the fav albums page if the user explicitly requested it
+    if (m_showFavAlbumsOnLoad) {
+        m_showFavAlbumsOnLoad = false;
        m_content->showFavAlbums(result);
        statusBar()->showMessage(
            tr("%1 favorite albums").arg(result["total"].toInt()), 4000);
    }
+}

 void MainWindow::onFavArtistsLoaded(const QJsonObject &result)
 {
+    // Always cache fav artist IDs (needed by the artist page fav button)
+    m_favArtistIds.clear();
+    const QJsonArray items = result["items"].toArray();
+    for (const QJsonValue &v : items) {
+        const qint64 id = static_cast<qint64>(v.toObject()["id"].toDouble());
+        if (id > 0) m_favArtistIds.insert(id);
+    }
+    m_content->setFavArtistIds(m_favArtistIds);
+
+    // Only navigate to the fav artists page if the user explicitly requested it
+    if (m_showFavArtistsOnLoad) {
+        m_showFavArtistsOnLoad = false;
        m_content->showFavArtists(result);
        statusBar()->showMessage(
            tr("%1 favorite artists").arg(result["total"].toInt()), 4000);
    }
+}

 void MainWindow::onAlbumLoaded(const QJsonObject &album)
 {
@@ -266,13 +555,39 @@ void MainWindow::onAlbumLoaded(const QJsonObject &album)
 void MainWindow::onArtistLoaded(const QJsonObject &artist)
 {
    m_content->showArtist(artist);
+    // Fire release requests only after the artist page is shown — avoids the
+    // race where a fast-responding release request arrives before setArtist()
+    // clears the sections, causing setArtist() to wipe out the data.
+    const qint64 artistId = static_cast<qint64>(artist["id"].toDouble());
+    for (const char *type : {"album", "epSingle", "live", "compilation"})
+        m_backend->getArtistReleases(artistId, QString::fromLatin1(type));
    statusBar()->showMessage(
-        tr("Artist: %1").arg(artist["name"].toString()), 4000);
+        tr("Artist: %1").arg(artist["name"].toObject()["display"].toString()), 4000);
 }

 void MainWindow::onPlaylistLoaded(const QJsonObject &playlist)
 {
-    m_content->showPlaylist(playlist);
+    const bool fullLoad = playlist["full_load"].toBool(false);
+    const int trackOffset = playlist["tracks"].toObject()["offset"].toInt(0);
+    if (!fullLoad && trackOffset > 0) {
+        m_content->tracksList()->appendPlaylistPage(playlist);
+        return;
+    }
+
+    const qint64 id = static_cast<qint64>(playlist["id"].toDouble());
+    const qint64 ownerId = static_cast<qint64>(playlist["owner"].toObject()["id"].toDouble());
+    const qint64 myId = AppSettings::instance().userId();
+    const bool isOwned = (myId > 0 && ownerId == myId);
+
+    bool isFollowed = isOwned || m_userPlaylistIds.contains(id);
+    if (!isFollowed) {
+        if (playlist.contains("is_subscribed"))
+            isFollowed = playlist["is_subscribed"].toBool();
+        else if (playlist.contains("subscribed_at"))
+            isFollowed = !playlist["subscribed_at"].isNull();
+    }
+
+    m_content->showPlaylist(playlist, isFollowed, isOwned);
    statusBar()->showMessage(
        tr("Playlist: %1").arg(playlist["name"].toString()), 4000);
 }
@@ -298,3 +613,20 @@ void MainWindow::onSearchToggled(bool visible)
 {
    m_sidePanel->setVisible(visible);
 }
+
+void MainWindow::onPlaylistCreated(const QJsonObject &playlist)
+{
+    const QString name = playlist["name"].toString();
+    statusBar()->showMessage(tr("Playlist '%1' created").arg(name), 4000);
+    // Open the new playlist immediately
+    const qint64 id = static_cast<qint64>(playlist["id"].toDouble());
+    if (id > 0)
+        m_backend->getPlaylist(id);
+}
+
+void MainWindow::onUserPlaylistsChanged(const QVector<QPair<qint64, QString>> &playlists)
+{
+    m_userPlaylists = playlists;
+    m_content->tracksList()->setUserPlaylists(playlists);
+    m_sidePanel->searchTab()->setUserPlaylists(playlists);
+}
--- a/src/mainwindow.hpp
+++ b/src/mainwindow.hpp
@@ -13,6 +13,13 @@
 #include <QMainWindow>
 #include <QDockWidget>
 #include <QJsonObject>
+#include <QJsonArray>
+#include <QVector>
+#include <QSet>
+#include <QPair>
+#include <QString>
+
+class Mpris;

 class MainWindow : public QMainWindow
 {
@@ -38,6 +45,8 @@ private slots:
    void onSearchAlbumSelected(const QString &albumId);
    void onSearchArtistSelected(qint64 artistId);
    void onSearchToggled(bool visible);
+    void onPlaylistCreated(const QJsonObject &playlist);
+    void onUserPlaylistsChanged(const QVector<QPair<qint64, QString>> &playlists);

    void showLoginDialog();
    void showSettingsDialog();
@@ -45,6 +54,12 @@ private slots:
 private:
    QobuzBackend    *m_backend     = nullptr;
    PlayQueue       *m_queue       = nullptr;
+    QVector<QPair<qint64, QString>> m_userPlaylists;
+    QSet<qint64> m_userPlaylistIds;
+    QSet<QString> m_favAlbumIds;
+    QSet<qint64> m_favArtistIds;
+    bool m_showFavAlbumsOnLoad = false;
+    bool m_showFavArtistsOnLoad = false;
    MainToolBar     *m_toolBar     = nullptr;
    MainContent     *m_content     = nullptr;
    List::Library   *m_library     = nullptr;
@@ -53,7 +68,17 @@ private:
    SidePanel::View *m_sidePanel   = nullptr;
    QDockWidget     *m_libraryDock = nullptr;
    LastFmScrobbler *m_scrobbler   = nullptr;
+    Mpris           *m_mpris       = nullptr;
+    bool m_nextTrackPrefetched = false;

    void setupMenuBar();
+    void setupDocks();
+    void setupScrobbler();
+    void setupGapless();
+    void setupMpris();
+    void connectBackendSignals();
+    void connectLibrarySignals();
+    void connectContentSignals();
+    void connectToolbarSignals();
    void tryRestoreSession();
 };
--- a/src/model/tracklistmodel.cpp
+++ b/src/model/tracklistmodel.cpp
@@ -1,4 +1,5 @@
 #include "tracklistmodel.hpp"
+#include "../util/colors.hpp"

 #include <QJsonValue>
 #include <QColor>
@@ -9,25 +10,26 @@ TrackListModel::TrackListModel(QObject *parent)
    : QAbstractTableModel(parent)
 {}

-void TrackListModel::setTracks(const QJsonArray &tracks,
+TrackItem TrackListModel::parseTrackItem(const QJsonObject &t,
                                         bool usePosition,
-                               bool useSequential)
+                                         bool useSequential,
+                                         int &seq)
 {
-    beginResetModel();
-    m_tracks.clear();
-    m_tracks.reserve(tracks.size());
-
-    int seq = 1;
-    for (const QJsonValue &v : tracks) {
-        const QJsonObject t = v.toObject();
    TrackItem item;
    item.id               = static_cast<qint64>(t["id"].toDouble());
-        item.title      = t["title"].toString();
+    item.playlistTrackId  = static_cast<qint64>(t["playlist_track_id"].toDouble());
+    item.discNumber       = t["media_number"].toInt(1);
    item.duration         = static_cast<qint64>(t["duration"].toDouble());
-        item.hiRes      = t["hires_streamable"].toBool();
    item.streamable       = t["streamable"].toBool(true);
+    item.hiRes            = t["hires_streamable"].toBool();
    item.raw              = t;

+    // Combine title + version ("Melody" + "Vocal Remix" → "Melody (Vocal Remix)")
+    const QString base    = t["title"].toString();
+    const QString version = t["version"].toString().trimmed();
+    item.title = version.isEmpty() ? base
+               : base + QStringLiteral(" (") + version + QLatin1Char(')');
+
    if (useSequential) {
        item.number = seq++;
    } else if (usePosition) {
@@ -40,27 +42,125 @@ void TrackListModel::setTracks(const QJsonArray &tracks,

    const QJsonObject performer = t["performer"].toObject();
    item.artist = performer["name"].toString();
-        if (item.artist.isEmpty())
-            item.artist = t["album"].toObject()["artist"].toObject()["name"].toString();
+    if (item.artist.isEmpty()) {
+        // album.artist.name may be a plain string or {display:"..."} object
+        const QJsonValue n = t["album"].toObject()["artist"].toObject()["name"];
+        item.artist = n.isObject() ? n.toObject()["display"].toString() : n.toString();
+    }
+    if (item.artist.isEmpty()) {
+        // top_tracks format: artist.name.display
+        const QJsonValue n = t["artist"].toObject()["name"];
+        item.artist = n.isObject() ? n.toObject()["display"].toString() : n.toString();
+    }

    const QJsonObject album = t["album"].toObject();
    item.album   = album["title"].toString();
    item.albumId = album["id"].toString();

-        m_tracks.append(item);
+    return item;
 }

-    // Re-apply sort silently inside the reset (no layout signals needed here)
+void TrackListModel::setTracks(const QJsonArray &tracks,
+                               bool usePosition,
+                               bool useSequential)
+{
+    beginResetModel();
+    m_tracks.clear();
+    m_tracks.reserve(tracks.size());
+
+    // Parse into a temporary list first so we can detect multi-disc
+    QVector<TrackItem> parsed;
+    parsed.reserve(tracks.size());
+
+    int seq = 1;
+    for (const QJsonValue &v : tracks)
+        parsed.append(parseTrackItem(v.toObject(), usePosition, useSequential, seq));
+
+    // Multi-disc only makes sense for album context (not playlists / fav / search)
+    int maxDisc = 1;
+    if (!usePosition && !useSequential) {
+        for (const TrackItem &t : parsed)
+            maxDisc = qMax(maxDisc, t.discNumber);
+    }
+    m_hasMultipleDiscs = (maxDisc > 1);
+
+    if (m_hasMultipleDiscs) {
+        // Sort by disc then track number
+        std::stable_sort(parsed.begin(), parsed.end(), [](const TrackItem &a, const TrackItem &b) {
+            return a.discNumber != b.discNumber ? a.discNumber < b.discNumber
+                                               : a.number < b.number;
+        });
+        // Interleave disc header items
+        int currentDisc = -1;
+        for (const TrackItem &t : parsed) {
+            if (t.discNumber != currentDisc) {
+                TrackItem header;
+                header.isDiscHeader = true;
+                header.discNumber   = t.discNumber;
+                header.title        = tr("Disc %1").arg(t.discNumber);
+                m_tracks.append(header);
+                currentDisc = t.discNumber;
+            }
+            m_tracks.append(t);
+        }
+    } else {
+        m_tracks = parsed;
+        // Re-apply sort silently inside the reset
        if (m_sortColumn >= 0)
            sortData(m_sortColumn, m_sortOrder);
+    }

    endResetModel();

-    // Tell external listeners the sorted order is ready (e.g. PlayQueue sync)
-    if (m_sortColumn >= 0)
+    if (!m_hasMultipleDiscs && m_sortColumn >= 0)
        emit sortApplied();
 }

+void TrackListModel::appendTracks(const QJsonArray &tracks,
+                                  bool usePosition,
+                                  bool useSequential)
+{
+    if (tracks.isEmpty())
+        return;
+
+    // Keep append path simple and stable: disc-header mode is handled by reset path.
+    if (m_hasMultipleDiscs && !usePosition && !useSequential) {
+        QJsonArray all = currentTracksJson();
+        for (const QJsonValue &v : tracks)
+            all.append(v);
+        setTracks(all, usePosition, useSequential);
+        return;
+    }
+
+    int seq = 1;
+    if (useSequential || usePosition) {
+        for (const TrackItem &t : m_tracks)
+            if (!t.isDiscHeader)
+                ++seq;
+    }
+
+    QVector<TrackItem> parsed;
+    parsed.reserve(tracks.size());
+    for (const QJsonValue &v : tracks)
+        parsed.append(parseTrackItem(v.toObject(), usePosition, useSequential, seq));
+
+    if (parsed.isEmpty())
+        return;
+
+    const int first = m_tracks.size();
+    const int last  = first + parsed.size() - 1;
+    beginInsertRows({}, first, last);
+    m_tracks += parsed;
+    endInsertRows();
+
+    if (!m_hasMultipleDiscs && m_sortColumn >= 0) {
+        emit layoutAboutToBeChanged();
+        sortData(m_sortColumn, m_sortOrder);
+        emit layoutChanged();
+        emit sortApplied();
+    }
+}
+
 void TrackListModel::clear()
 {
    beginResetModel();
@@ -68,6 +168,44 @@ void TrackListModel::clear()
    endResetModel();
 }

+void TrackListModel::removeTrack(int row)
+{
+    if (row < 0 || row >= m_tracks.size()) return;
+    beginRemoveRows({}, row, row);
+    m_tracks.removeAt(row);
+    endRemoveRows();
+}
+
+void TrackListModel::notifyFavChanged(qint64 id)
+{
+    for (int r = 0; r < m_tracks.size(); ++r) {
+        if (m_tracks[r].id == id) {
+            const auto idx = index(r, ColTitle);
+            emit dataChanged(idx, idx, {Qt::DecorationRole});
+        }
+    }
+}
+
+void TrackListModel::setFavIds(const QSet<qint64> &ids)
+{
+    m_favIds = ids;
+    if (!m_tracks.isEmpty())
+        emit dataChanged(index(0, ColTitle), index(rowCount() - 1, ColTitle),
+                         {Qt::DecorationRole});
+}
+
+void TrackListModel::addFavId(qint64 id)
+{
+    m_favIds.insert(id);
+    notifyFavChanged(id);
+}
+
+void TrackListModel::removeFavId(qint64 id)
+{
+    m_favIds.remove(id);
+    notifyFavChanged(id);
+}
+
 void TrackListModel::setPlayingId(qint64 id)
 {
    m_playingId = id;
@@ -76,6 +214,23 @@ void TrackListModel::setPlayingId(qint64 id)
                         {Qt::FontRole, Qt::DecorationRole});
 }

+Qt::ItemFlags TrackListModel::flags(const QModelIndex &index) const
+{
+    if (!index.isValid() || index.row() >= m_tracks.size())
+        return Qt::NoItemFlags;
+    if (m_tracks.at(index.row()).isDiscHeader)
+        return Qt::ItemIsEnabled;
+    return Qt::ItemIsEnabled | Qt::ItemIsSelectable;
+}
+
+QVector<int> TrackListModel::discHeaderRows() const
+{
+    QVector<int> rows;
+    for (int i = 0; i < m_tracks.size(); ++i)
+        if (m_tracks[i].isDiscHeader) rows.append(i);
+    return rows;
+}
+
 int TrackListModel::rowCount(const QModelIndex &parent) const
 {
    return parent.isValid() ? 0 : m_tracks.size();
@@ -92,6 +247,19 @@ QVariant TrackListModel::data(const QModelIndex &index, int role) const
        return {};

    const TrackItem &t = m_tracks.at(index.row());
+
+    // Disc header rows: styled separator spanning all columns via setFirstColumnSpanned
+    if (t.isDiscHeader) {
+        if (role == Qt::DisplayRole && index.column() == ColNumber)
+            return t.title;
+        if (role == Qt::FontRole) {
+            QFont f; f.setBold(true); return f;
+        }
+        if (role == Qt::ForegroundRole)
+            return Colors::QobuzOrange;
+        return {};
+    }
+
    const bool isPlaying = (t.id == m_playingId && m_playingId != 0);

    if (role == Qt::DisplayRole) {
@@ -111,17 +279,22 @@ QVariant TrackListModel::data(const QModelIndex &index, int role) const
    }

    if (role == Qt::ForegroundRole) {
-        if (!t.streamable) return QColor(Qt::gray);
-        if (isPlaying)     return QColor(0x1d, 0xb9, 0x54); // Qobuz green
+        if (!t.streamable) return Colors::DisabledText;
+        if (isPlaying)     return Colors::QobuzOrange;
    }

    if (role == Qt::DecorationRole && index.column() == ColNumber && isPlaying) {
        return QIcon(QStringLiteral(":/res/icons/media-track-show-active.svg"));
    }

+    if (role == Qt::DecorationRole && index.column() == ColTitle && m_favIds.contains(t.id)) {
+        return QIcon(QStringLiteral(":/res/icons/starred-symbolic.svg"));
+    }
+
    if (role == TrackIdRole)         return t.id;
    if (role == TrackJsonRole)       return t.raw;
    if (role == HiResRole)           return t.hiRes;
+    if (role == PlaylistTrackIdRole) return t.playlistTrackId;

    return {};
 }
@@ -169,7 +342,8 @@ void TrackListModel::sort(int column, Qt::SortOrder order)
    m_sortColumn = column;
    m_sortOrder  = order;

-    if (m_tracks.isEmpty()) return;
+    // Multi-disc albums keep their disc-ordered layout; don't re-sort
+    if (m_hasMultipleDiscs || m_tracks.isEmpty()) return;

    emit layoutAboutToBeChanged();
    sortData(column, order);
@@ -180,7 +354,8 @@ void TrackListModel::sort(int column, Qt::SortOrder order)

 QString TrackListModel::formatDuration(qint64 secs)
 {
-    const int m = static_cast<int>(secs / 60);
-    const int s = static_cast<int>(secs % 60);
+    if (secs < 0) secs = 0;
+    const qint64 m = secs / 60;
+    const qint64 s = secs % 60;
    return QStringLiteral("%1:%2").arg(m).arg(s, 2, 10, QLatin1Char('0'));
 }
--- a/src/model/tracklistmodel.hpp
+++ b/src/model/tracklistmodel.hpp
@@ -4,11 +4,15 @@
 #include <QJsonArray>
 #include <QJsonObject>
 #include <QVector>
+#include <QSet>
 #include <QFont>

 struct TrackItem {
    qint64  id              = 0;
+    qint64  playlistTrackId = 0;
    int     number          = 0;
+    int     discNumber      = 1;
+    bool    isDiscHeader    = false;
    QString title;
    QString artist;
    QString album;
@@ -37,6 +41,7 @@ public:
        TrackIdRole         = Qt::UserRole + 1,
        TrackJsonRole       = Qt::UserRole + 2,
        HiResRole           = Qt::UserRole + 3,
+        PlaylistTrackIdRole = Qt::UserRole + 4,
    };

    explicit TrackListModel(QObject *parent = nullptr);
@@ -46,18 +51,34 @@ public:
    void setTracks(const QJsonArray &tracks,
                   bool usePosition   = false,
                   bool useSequential = false);
+    void appendTracks(const QJsonArray &tracks,
+                      bool usePosition   = false,
+                      bool useSequential = false);
    void clear();
    void setPlayingId(qint64 id);
    qint64 playingId() const { return m_playingId; }

+    void setFavIds(const QSet<qint64> &ids);
+    void addFavId(qint64 id);
+    void removeFavId(qint64 id);
+    bool isFav(qint64 id) const { return m_favIds.contains(id); }
+
+    bool hasMultipleDiscs() const { return m_hasMultipleDiscs; }
+    QVector<int> discHeaderRows() const;
+
+    Qt::ItemFlags flags(const QModelIndex &index) const override;
+
+    /// Optimistically remove a row (e.g. after deleting from playlist).
+    void removeTrack(int row);
+
    const TrackItem &trackAt(int row) const { return m_tracks.at(row); }

-    // Returns the current (possibly sorted) raw JSON objects in display order.
+    // Returns the current (possibly sorted) raw JSON objects in display order, skipping disc headers.
    QJsonArray currentTracksJson() const
    {
        QJsonArray out;
        for (const auto &t : m_tracks)
-            out.append(t.raw);
+            if (!t.isDiscHeader) out.append(t.raw);
        return out;
    }

@@ -76,10 +97,18 @@ signals:

 private:
    QVector<TrackItem> m_tracks;
+    QSet<qint64>       m_favIds;
    qint64 m_playingId        = 0;
+    bool   m_hasMultipleDiscs = false;
    int    m_sortColumn = -1;
    Qt::SortOrder m_sortOrder = Qt::AscendingOrder;

    // Sort m_tracks in-place without emitting any signals.
    void sortData(int column, Qt::SortOrder order);
+
+    // Parse a single JSON track object into a TrackItem.
+    static TrackItem parseTrackItem(const QJsonObject &t, bool usePosition, bool useSequential, int &seq);
+
+    // Emit dataChanged(DecorationRole) for all rows matching id.
+    void notifyFavChanged(qint64 id);
 };
--- a/src/playqueue.cpp
+++ b/src/playqueue.cpp
@@ -0,0 +1,238 @@
+#include "playqueue.hpp"
+
+#include <algorithm>
+#include <random>
+
+PlayQueue::PlayQueue(QObject *parent) : QObject(parent) {}
+
+void PlayQueue::setContext(const QJsonArray &tracks, int startIndex)
+{
+    m_queue.clear();
+    m_playNext.clear();
+
+    // Only queue streamable tracks; find the filtered index for startIndex
+    int filteredStart = 0;
+    int filteredIdx   = 0;
+    bool found        = false;
+    for (int orig = 0; orig < tracks.size(); ++orig) {
+        const QJsonObject t = tracks[orig].toObject();
+        if (!t["streamable"].toBool(true))
+            continue;
+        if (!found && orig >= startIndex) {
+            filteredStart = filteredIdx;
+            found = true;
+        }
+        m_queue.append(t);
+        ++filteredIdx;
+    }
+    m_index = qBound(0, filteredStart, qMax(0, m_queue.size() - 1));
+
+    if (m_shuffle)
+        shuffleQueue(m_index);
+
+    emit queueChanged();
+}
+
+void PlayQueue::reorderContext(const QJsonArray &tracks, qint64 currentId)
+{
+    m_queue.clear();
+    for (const auto &v : tracks) {
+        const QJsonObject t = v.toObject();
+        if (t["streamable"].toBool(true))
+            m_queue.append(t);
+    }
+
+    m_index = 0;
+    for (int i = 0; i < m_queue.size(); ++i) {
+        if (static_cast<qint64>(m_queue[i]["id"].toDouble()) == currentId) {
+            m_index = i;
+            break;
+        }
+    }
+    emit queueChanged();
+}
+
+void PlayQueue::clearUpcoming()
+{
+    m_playNext.clear();
+    if (m_index < m_queue.size())
+        m_queue.resize(m_index + 1); // keep up to and including current
+    emit queueChanged();
+}
+
+void PlayQueue::removeUpcoming(int upcomingIndex)
+{
+    if (upcomingIndex < m_playNext.size()) {
+        m_playNext.removeAt(upcomingIndex);
+    } else {
+        const int queueIdx = m_index + 1 + (upcomingIndex - m_playNext.size());
+        if (queueIdx < m_queue.size())
+            m_queue.removeAt(queueIdx);
+    }
+    emit queueChanged();
+}
+
+void PlayQueue::setShuffle(bool enabled)
+{
+    if (m_shuffle == enabled) return;
+    m_shuffle = enabled;
+    if (enabled && !m_queue.isEmpty())
+        shuffleQueue(m_index);
+    emit queueChanged();
+}
+
+void PlayQueue::shuffleNow()
+{
+    if (m_queue.isEmpty()) return;
+    shuffleQueue(m_index);
+    emit queueChanged();
+}
+
+void PlayQueue::addToQueue(const QJsonObject &track)
+{
+    m_playNext.append(track);
+    emit queueChanged();
+}
+
+void PlayQueue::playNext(const QJsonObject &track)
+{
+    m_playNext.prepend(track);
+    emit queueChanged();
+}
+
+bool PlayQueue::hasCurrent() const
+{
+    return (!m_playNext.isEmpty()) || (!m_queue.isEmpty());
+}
+
+QJsonObject PlayQueue::current() const
+{
+    if (!m_playNext.isEmpty()) return m_playNext.first();
+    if (m_index < m_queue.size()) return m_queue.at(m_index);
+    return {};
+}
+
+qint64 PlayQueue::currentId() const
+{
+    return static_cast<qint64>(current()["id"].toDouble());
+}
+
+QJsonObject PlayQueue::advance()
+{
+    if (!m_playNext.isEmpty()) {
+        // Return the playNext item directly — do NOT call current() after
+        // removal, as that would fall back to the already-playing m_index track.
+        const QJsonObject next = m_playNext.takeFirst();
+        emit queueChanged();
+        return next;
+    }
+    ++m_index;
+    emit queueChanged();
+    return current();
+}
+
+QJsonObject PlayQueue::stepBack()
+{
+    if (m_index > 0) --m_index;
+    emit queueChanged();
+    return current();
+}
+
+bool PlayQueue::canGoNext() const
+{
+    return !m_playNext.isEmpty() || (m_index + 1 < m_queue.size());
+}
+
+void PlayQueue::setCurrentById(qint64 id)
+{
+    m_playNext.clear();
+    for (int i = 0; i < m_queue.size(); ++i) {
+        if (static_cast<qint64>(m_queue[i]["id"].toDouble()) == id) {
+            m_index = i;
+            emit queueChanged();
+            return;
+        }
+    }
+}
+
+QVector<QJsonObject> PlayQueue::upcomingTracks(int maxCount) const
+{
+    QVector<QJsonObject> result;
+    result.append(m_playNext);
+    for (int i = m_index + 1; i < m_queue.size() && result.size() < maxCount; ++i)
+        result.append(m_queue.at(i));
+    return result;
+}
+
+QJsonObject PlayQueue::skipToUpcoming(int upcomingIndex)
+{
+    // Remove items 0..upcomingIndex-1 from the front of upcoming
+    for (int i = 0; i < upcomingIndex; ++i) {
+        if (!m_playNext.isEmpty())
+            m_playNext.removeFirst();
+        else if (m_index + 1 < m_queue.size())
+            ++m_index;
+    }
+    // Pop and return the target (now at upcoming[0])
+    if (!m_playNext.isEmpty()) {
+        const QJsonObject t = m_playNext.takeFirst();
+        emit queueChanged();
+        return t;
+    }
+    if (m_index + 1 < m_queue.size()) {
+        ++m_index;
+        emit queueChanged();
+        return m_queue.at(m_index);
+    }
+    emit queueChanged();
+    return {};
+}
+
+void PlayQueue::setUpcomingOrder(const QVector<QJsonObject> &newOrder)
+{
+    m_playNext = newOrder;
+    m_queue.resize(m_index + 1); // drop old main-queue tail
+    emit queueChanged();
+}
+
+void PlayQueue::appendToContext(const QJsonArray &tracks)
+{
+    for (const auto &v : tracks) {
+        const QJsonObject t = v.toObject();
+        if (t["streamable"].toBool(true))
+            m_queue.append(t);
+    }
+    emit queueChanged();
+}
+
+void PlayQueue::moveUpcomingToTop(int upcomingIndex)
+{
+    if (upcomingIndex < 0) return;
+    QJsonObject track;
+    if (upcomingIndex < m_playNext.size()) {
+        if (upcomingIndex == 0) return; // already at top
+        track = m_playNext.takeAt(upcomingIndex);
+    } else {
+        const int queueIdx = m_index + 1 + (upcomingIndex - m_playNext.size());
+        if (queueIdx >= m_queue.size()) return;
+        track = m_queue.takeAt(queueIdx);
+    }
+    m_playNext.prepend(track);
+    emit queueChanged();
+}
+
+void PlayQueue::shuffleQueue(int keepAtFront)
+{
+    if (m_queue.isEmpty()) return;
+    // Keep the current track at index 0 of the remaining queue
+    if (keepAtFront >= 0 && keepAtFront < m_queue.size()) {
+        QJsonObject current = m_queue.takeAt(keepAtFront);
+        std::mt19937 rng(std::random_device{}());
+        std::shuffle(m_queue.begin(), m_queue.end(), rng);
+        m_queue.prepend(current);
+    } else {
+        std::mt19937 rng(std::random_device{}());
+        std::shuffle(m_queue.begin(), m_queue.end(), rng);
+    }
+    m_index = 0;
+}
--- a/src/playqueue.hpp
+++ b/src/playqueue.hpp
@@ -4,8 +4,6 @@
 #include <QVector>
 #include <QJsonObject>
 #include <QJsonArray>
-#include <algorithm>
-#include <random>

 /// Local playback queue.  Holds the ordered list of tracks for the current
 /// context (album / playlist / search result / favourites) plus a separate
@@ -15,224 +13,83 @@ class PlayQueue : public QObject
    Q_OBJECT

 public:
-    explicit PlayQueue(QObject *parent = nullptr) : QObject(parent) {}
+    explicit PlayQueue(QObject *parent = nullptr);

    // ---- Loading a new context ----

    /// Replace the queue with all tracks from an album/playlist JSON context.
    /// @param startIndex  Index of the track to start playing (-1 = first).
-    void setContext(const QJsonArray &tracks, int startIndex = 0)
-    {
-        m_queue.clear();
-        m_playNext.clear();
-        for (const auto &v : tracks)
-            m_queue.append(v.toObject());
-        if (m_shuffle) {
-            shuffleQueue(startIndex);
-            // shuffleQueue moves the start track to index 0 and sets m_index = 0
-        } else {
-            m_index = qBound(0, startIndex, m_queue.size() - 1);
-        }
-        emit queueChanged();
-    }
+    void setContext(const QJsonArray &tracks, int startIndex = 0);

    // ---- Re-order after a sort (keeps m_playNext, updates m_index) ----

-    void reorderContext(const QJsonArray &tracks, qint64 currentId)
-    {
-        m_queue.clear();
-        for (const auto &v : tracks)
-            m_queue.append(v.toObject());
-
-        m_index = 0;
-        for (int i = 0; i < m_queue.size(); ++i) {
-            if (static_cast<qint64>(m_queue[i]["id"].toDouble()) == currentId) {
-                m_index = i;
-                break;
-            }
-        }
-        emit queueChanged();
-    }
+    void reorderContext(const QJsonArray &tracks, qint64 currentId);

    // ---- Clear / remove upcoming ----

    /// Remove all "up next" entries (playNext + remaining main queue after current).
-    void clearUpcoming()
-    {
-        m_playNext.clear();
-        if (m_index < m_queue.size())
-            m_queue.resize(m_index + 1); // keep up to and including current
-        emit queueChanged();
-    }
+    void clearUpcoming();

    /// Remove one upcoming track by its index in upcomingTracks().
-    void removeUpcoming(int upcomingIndex)
-    {
-        if (upcomingIndex < m_playNext.size()) {
-            m_playNext.removeAt(upcomingIndex);
-        } else {
-            const int queueIdx = m_index + 1 + (upcomingIndex - m_playNext.size());
-            if (queueIdx < m_queue.size())
-                m_queue.removeAt(queueIdx);
-        }
-        emit queueChanged();
-    }
+    void removeUpcoming(int upcomingIndex);

    // ---- Shuffle ----

    bool shuffleEnabled() const { return m_shuffle; }

-    void setShuffle(bool enabled)
-    {
-        if (m_shuffle == enabled) return;
-        m_shuffle = enabled;
-        if (enabled && !m_queue.isEmpty())
-            shuffleQueue(m_index);
-        emit queueChanged();
-    }
+    void setShuffle(bool enabled);
+
+    /// Shuffle the current queue once without changing the global shuffle flag.
+    void shuffleNow();

    // ---- Play-next prepend queue (like "Add to queue" ----

-    void addToQueue(const QJsonObject &track)
-    {
-        m_playNext.append(track);
-        emit queueChanged();
-    }
+    void addToQueue(const QJsonObject &track);

-    void playNext(const QJsonObject &track)
-    {
-        m_playNext.prepend(track);
-        emit queueChanged();
-    }
+    void playNext(const QJsonObject &track);

    // ---- Navigation ----

-    bool hasCurrent() const
-    {
-        return (!m_playNext.isEmpty()) || (!m_queue.isEmpty());
-    }
+    bool hasCurrent() const;

-    QJsonObject current() const
-    {
-        if (!m_playNext.isEmpty()) return m_playNext.first();
-        if (m_index < m_queue.size()) return m_queue.at(m_index);
-        return {};
-    }
+    QJsonObject current() const;

-    qint64 currentId() const
-    {
-        return static_cast<qint64>(current()["id"].toDouble());
-    }
+    qint64 currentId() const;

    /// Advance and return the track to play next.  Returns {} at end of queue.
-    QJsonObject advance()
-    {
-        if (!m_playNext.isEmpty()) {
-            // Return the playNext item directly — do NOT call current() after
-            // removal, as that would fall back to the already-playing m_index track.
-            const QJsonObject next = m_playNext.takeFirst();
-            emit queueChanged();
-            return next;
-        }
-        ++m_index;
-        emit queueChanged();
-        return current();
-    }
+    QJsonObject advance();

    /// Step backwards in the main queue (play-next is not affected).
-    QJsonObject stepBack()
-    {
-        if (m_index > 0) --m_index;
-        emit queueChanged();
-        return current();
-    }
+    QJsonObject stepBack();

-    bool canGoNext() const
-    {
-        return !m_playNext.isEmpty() || (m_index + 1 < m_queue.size());
-    }
+    bool canGoNext() const;

    bool canGoPrev() const { return m_index > 0; }

    // ---- Index lookup ----

    /// Set the current position by track id (after user double-clicks a row).
-    void setCurrentById(qint64 id)
-    {
-        m_playNext.clear();
-        for (int i = 0; i < m_queue.size(); ++i) {
-            if (static_cast<qint64>(m_queue[i]["id"].toDouble()) == id) {
-                m_index = i;
-                emit queueChanged();
-                return;
-            }
-        }
-    }
+    void setCurrentById(qint64 id);

    // ---- Accessors for queue panel ----

-    QVector<QJsonObject> upcomingTracks(int maxCount = 200) const
-    {
-        QVector<QJsonObject> result;
-        result.append(m_playNext);
-        for (int i = m_index + 1; i < m_queue.size() && result.size() < maxCount; ++i)
-            result.append(m_queue.at(i));
-        return result;
-    }
+    QVector<QJsonObject> upcomingTracks(int maxCount = 200) const;

    int playNextCount()  const { return m_playNext.size(); }
    int totalSize()      const { return m_playNext.size() + m_queue.size(); }
    int currentIndex()   const { return m_index; }

    /// Skip to upcoming[upcomingIndex]: removes everything before it, pops and returns it.
-    QJsonObject skipToUpcoming(int upcomingIndex)
-    {
-        // Remove items 0..upcomingIndex-1 from the front of upcoming
-        for (int i = 0; i < upcomingIndex; ++i) {
-            if (!m_playNext.isEmpty())
-                m_playNext.removeFirst();
-            else if (m_index + 1 < m_queue.size())
-                ++m_index;
-        }
-        // Pop and return the target (now at upcoming[0])
-        if (!m_playNext.isEmpty()) {
-            const QJsonObject t = m_playNext.takeFirst();
-            emit queueChanged();
-            return t;
-        }
-        if (m_index + 1 < m_queue.size()) {
-            ++m_index;
-            emit queueChanged();
-            return m_queue.at(m_index);
-        }
-        emit queueChanged();
-        return {};
-    }
+    QJsonObject skipToUpcoming(int upcomingIndex);

    /// Replace the upcoming list with a new order (used after drag-reorder in UI).
-    void setUpcomingOrder(const QVector<QJsonObject> &newOrder)
-    {
-        m_playNext = newOrder;
-        m_queue.resize(m_index + 1); // drop old main-queue tail
-        emit queueChanged();
-    }
+    void setUpcomingOrder(const QVector<QJsonObject> &newOrder);
+
+    /// Append tracks to the main queue tail (autoplay/discovery).
+    void appendToContext(const QJsonArray &tracks);

    /// Move an upcoming item (by its index in upcomingTracks()) to the front of playNext.
-    void moveUpcomingToTop(int upcomingIndex)
-    {
-        if (upcomingIndex < 0) return;
-        QJsonObject track;
-        if (upcomingIndex < m_playNext.size()) {
-            if (upcomingIndex == 0) return; // already at top
-            track = m_playNext.takeAt(upcomingIndex);
-        } else {
-            const int queueIdx = m_index + 1 + (upcomingIndex - m_playNext.size());
-            if (queueIdx >= m_queue.size()) return;
-            track = m_queue.takeAt(queueIdx);
-        }
-        m_playNext.prepend(track);
-        emit queueChanged();
-    }
+    void moveUpcomingToTop(int upcomingIndex);

 signals:
    void queueChanged();
@@ -243,19 +100,5 @@ private:
    int  m_index   = 0;
    bool m_shuffle = false;

-    void shuffleQueue(int keepAtFront)
-    {
-        if (m_queue.isEmpty()) return;
-        // Keep the current track at index 0 of the remaining queue
-        if (keepAtFront >= 0 && keepAtFront < m_queue.size()) {
-            QJsonObject current = m_queue.takeAt(keepAtFront);
-            std::mt19937 rng(std::random_device{}());
-            std::shuffle(m_queue.begin(), m_queue.end(), rng);
-            m_queue.prepend(current);
-        } else {
-            std::mt19937 rng(std::random_device{}());
-            std::shuffle(m_queue.begin(), m_queue.end(), rng);
-        }
-        m_index = 0;
-    }
+    void shuffleQueue(int keepAtFront);
 };
--- a/src/scrobbler/lastfm.hpp
+++ b/src/scrobbler/lastfm.hpp
@@ -80,6 +80,8 @@ public slots:
        m_duration = static_cast<qint64>(track["duration"].toDouble());
        m_startTime       = QDateTime::currentSecsSinceEpoch();
        m_playedSecs      = 0;
+        m_lastPosition    = 0;
+        m_accumulatedSecs = 0;
        m_scrobbled       = false;

        if (!isEnabled() || m_title.isEmpty() || m_duration < 30) return;
@@ -88,18 +90,29 @@ public slots:

    void onPositionChanged(quint64 positionSecs, quint64 /*duration*/)
    {
+        // Accumulate actual listening time to prevent false scrobbles from seeking
+        if (positionSecs > m_lastPosition && (positionSecs - m_lastPosition) <= 2) {
+            m_accumulatedSecs += (positionSecs - m_lastPosition);
+        }
+        m_lastPosition = positionSecs;
        m_playedSecs = positionSecs;
+
        if (!isEnabled() || m_scrobbled || m_title.isEmpty() || m_duration < 30) return;
+
        // Scrobble after 50% or 240 seconds played, whichever comes first, min 30 seconds.
        const quint64 threshold = static_cast<quint64>(qMin((qint64)240, m_duration / 2));
-        if (positionSecs >= 30 && positionSecs >= threshold)
+        if (m_accumulatedSecs >= 30 && m_accumulatedSecs >= threshold)
            scrobble();
    }

    void onTrackFinished()
    {
        if (!isEnabled() || m_scrobbled || m_title.isEmpty() || m_duration < 30) return;
-        if (m_playedSecs >= 30) scrobble();
+
+        const quint64 threshold = static_cast<quint64>(qMin((qint64)240, m_duration / 2));
+        if (m_accumulatedSecs >= 30 && m_accumulatedSecs >= threshold) {
+            scrobble();
+        }
    }

 private:
@@ -111,6 +124,8 @@ private:
    qint64  m_duration        = 0;
    qint64  m_startTime       = 0;
    quint64 m_playedSecs      = 0;
+    quint64 m_lastPosition    = 0;
+    quint64 m_accumulatedSecs = 0;
    bool    m_scrobbled       = false;

    void updateNowPlaying()
@@ -137,11 +152,13 @@ private:
        params["method"]       = QStringLiteral("track.scrobble");
        params["api_key"]      = AppSettings::instance().lastFmApiKey();
        params["sk"]           = AppSettings::instance().lastFmSessionKey();
-        params["artist"]    = m_artist;
-        params["track"]     = m_title;
-        params["album"]     = m_album;
-        params["timestamp"] = QString::number(m_startTime);
-        params["duration"]  = QString::number(m_duration);
+
+        params["artist[0]"]    = m_artist;
+        params["track[0]"]     = m_title;
+        params["album[0]"]     = m_album;
+        params["timestamp[0]"] = QString::number(m_startTime);
+        params["duration[0]"]  = QString::number(m_duration);
+
        params["api_sig"]      = buildSig(params, AppSettings::instance().lastFmApiSecret());
        params["format"]       = QStringLiteral("json");

--- a/src/util/colors.hpp
+++ b/src/util/colors.hpp
@@ -0,0 +1,32 @@
+#pragma once
+
+#include <QColor>
+
+namespace Colors {
+
+// Brand accents
+inline const QColor QobuzOrange{0xFF, 0xB2, 0x32};
+inline const QColor QobuzBlue  {0x46, 0xB3, 0xEE};
+
+// Badge / indicator colors used in tree-view item foregrounds
+inline const QColor BadgeGreen {QStringLiteral("#2FA84F")};
+inline const QColor BadgeBlue  {QStringLiteral("#2B7CD3")};
+inline const QColor BadgeGray  {QStringLiteral("#8E8E93")};
+
+// Text
+inline const QColor LightText      {0xe8, 0xe8, 0xe8};
+inline const QColor SubduedText    {0xaa, 0xaa, 0xaa};
+inline const QColor PlaceholderText{0x66, 0x66, 0x66};
+inline const QColor DisabledText   {0x55, 0x55, 0x55};
+
+// Surfaces / backgrounds
+inline const QColor WindowBg       {0x19, 0x19, 0x19};
+inline const QColor BaseBg         {0x14, 0x14, 0x14};
+inline const QColor AlternateBaseBg{0x1e, 0x1e, 0x1e};
+inline const QColor ButtonSurface  {0x2a, 0x2a, 0x2a};
+inline const QColor ContextBg      {0x1a, 0x1a, 0x1a};
+inline const QColor MidSurface     {0x2f, 0x2f, 0x2f};
+inline const QColor DarkSurface    {0x0e, 0x0e, 0x0e};
+inline const QColor HighlightedFg  {0x10, 0x10, 0x10};
+
+} // namespace Colors
--- a/src/util/icon.hpp
+++ b/src/util/icon.hpp
@@ -24,6 +24,7 @@ namespace Icon
    inline QIcon previous()   { return get("media-skip-backward"); }
    inline QIcon shuffle()    { return get("media-playlist-shuffle"); }
    inline QIcon repeat()     { return get("media-playlist-repeat"); }
+    inline QIcon autoplay()   { return get("media-track-show-active"); }

    // Volume
    inline QIcon volumeHigh() { return get("audio-volume-high"); }
--- a/src/util/settings.hpp
+++ b/src/util/settings.hpp
@@ -21,6 +21,9 @@ public:
    QString displayName() const      { return m_settings.value("user/display_name").toString(); }
    void setDisplayName(const QString &n) { m_settings.setValue("user/display_name", n); }

+    qint64 userId() const            { return m_settings.value("user/id", 0LL).toLongLong(); }
+    void setUserId(qint64 id)        { m_settings.setValue("user/id", id); }
+
    // 5 = MP3, 6 = CD, 7 = HiRes96, 27 = HiRes192
    int preferredFormat() const      { return m_settings.value("playback/format", 6).toInt(); }
    void setPreferredFormat(int f)   { m_settings.setValue("playback/format", f); }
@@ -31,6 +34,16 @@ public:
    bool rememberLogin() const       { return m_settings.value("auth/remember", true).toBool(); }
    void setRememberLogin(bool r)    { m_settings.setValue("auth/remember", r); }

+    // --- Playback extras ---
+    bool replayGainEnabled() const     { return m_settings.value("playback/replaygain", false).toBool(); }
+    void setReplayGainEnabled(bool v)  { m_settings.setValue("playback/replaygain", v); }
+
+    bool gaplessEnabled() const        { return m_settings.value("playback/gapless", false).toBool(); }
+    void setGaplessEnabled(bool v)     { m_settings.setValue("playback/gapless", v); }
+
+    bool autoplayEnabled() const       { return m_settings.value("playback/autoplay", false).toBool(); }
+    void setAutoplayEnabled(bool v)    { m_settings.setValue("playback/autoplay", v); }
+
    // --- Last.fm ---
    bool    lastFmEnabled()   const  { return m_settings.value("lastfm/enabled", false).toBool(); }
    void    setLastFmEnabled(bool v) { m_settings.setValue("lastfm/enabled", v); }
--- a/src/util/trackinfo.hpp
+++ b/src/util/trackinfo.hpp
@@ -0,0 +1,85 @@
+#pragma once
+
+#include <QDialog>
+#include <QFormLayout>
+#include <QDialogButtonBox>
+#include <QLabel>
+#include <QJsonObject>
+#include <QWidget>
+
+namespace TrackInfoDialog
+{
+
+inline void show(const QJsonObject &track, QWidget *parent)
+{
+    auto *dlg = new QDialog(parent);
+    dlg->setWindowTitle(QObject::tr("Track Info"));
+    dlg->setAttribute(Qt::WA_DeleteOnClose);
+    dlg->setMinimumWidth(360);
+
+    auto *form = new QFormLayout(dlg);
+
+    auto addRow = [&](const QString &label, const QString &value) {
+        if (value.isEmpty()) return;
+        auto *val = new QLabel(value, dlg);
+        val->setTextInteractionFlags(Qt::TextSelectableByMouse);
+        val->setWordWrap(true);
+        form->addRow(QStringLiteral("<b>%1</b>").arg(label), val);
+    };
+
+    const QString title   = track["title"].toString();
+    const QString version = track["version"].toString().trimmed();
+    addRow(QObject::tr("Title"),
+           version.isEmpty() ? title : title + QStringLiteral(" (%1)").arg(version));
+
+    addRow(QObject::tr("Performer"), track["performer"].toObject()["name"].toString());
+
+    const QJsonObject composer = track["composer"].toObject();
+    if (!composer.isEmpty())
+        addRow(QObject::tr("Composer"), composer["name"].toString());
+
+    const QJsonObject album = track["album"].toObject();
+    addRow(QObject::tr("Album"), album["title"].toString());
+    addRow(QObject::tr("Album artist"), album["artist"].toObject()["name"].toString());
+
+    const int trackNum = track["track_number"].toInt();
+    const int discNum  = track["media_number"].toInt();
+    if (trackNum > 0) {
+        const QString pos = discNum > 1
+            ? QStringLiteral("%1-%2").arg(discNum).arg(trackNum)
+            : QString::number(trackNum);
+        addRow(QObject::tr("Track #"), pos);
+    }
+
+    const qint64 dur = static_cast<qint64>(track["duration"].toDouble());
+    if (dur > 0) {
+        const int m = static_cast<int>(dur / 60);
+        const int s = static_cast<int>(dur % 60);
+        addRow(QObject::tr("Duration"),
+               QStringLiteral("%1:%2").arg(m).arg(s, 2, 10, QLatin1Char('0')));
+    }
+
+    const int bitDepth     = track["maximum_bit_depth"].toInt();
+    const double sampleRate = track["maximum_sampling_rate"].toDouble();
+    if (bitDepth > 0 && sampleRate > 0) {
+        addRow(QObject::tr("Quality"),
+               QStringLiteral("%1-bit / %2 kHz").arg(bitDepth).arg(sampleRate, 0, 'f', 1));
+    } else if (bitDepth > 0) {
+        addRow(QObject::tr("Bit depth"), QStringLiteral("%1-bit").arg(bitDepth));
+    }
+
+    const bool hiRes = track["hires_streamable"].toBool() || track["hires"].toBool();
+    addRow(QObject::tr("Hi-Res"), hiRes ? QObject::tr("Yes") : QObject::tr("No"));
+
+    const bool streamable = track["streamable"].toBool(true);
+    if (!streamable)
+        addRow(QObject::tr("Streamable"), QObject::tr("No"));
+
+    auto *buttons = new QDialogButtonBox(QDialogButtonBox::Close, dlg);
+    form->addRow(buttons);
+    QObject::connect(buttons, &QDialogButtonBox::rejected, dlg, &QDialog::close);
+
+    dlg->show();
+}
+
+} // namespace TrackInfoDialog
--- a/src/view/albumlistview.hpp
+++ b/src/view/albumlistview.hpp
@@ -1,5 +1,7 @@
 #pragma once

+#include "../util/colors.hpp"
+
 #include <QTreeWidget>
 #include <QTreeWidgetItem>
 #include <QHeaderView>
@@ -41,6 +43,25 @@ public:
    void setAlbums(const QJsonArray &albums)
    {
        clear();
+        addAlbums(albums);
+    }
+
+    /// Configure for artist page: hide Artist column, set fixed column widths
+    /// that match the Popular Tracks list for perfect vertical alignment.
+    void setArtistPageMode()
+    {
+        setColumnHidden(2, true); // Artist — redundant on artist page
+        header()->setSectionResizeMode(0, QHeaderView::Fixed);
+        header()->setSectionResizeMode(1, QHeaderView::Stretch);
+        header()->setSectionResizeMode(3, QHeaderView::Fixed);
+        header()->setSectionResizeMode(4, QHeaderView::Fixed);
+        header()->resizeSection(0, 40);
+        header()->resizeSection(3, 120);
+        header()->resizeSection(4, 70);
+    }
+
+    void addAlbums(const QJsonArray &albums)
+    {
        QFont hiResFont;
        hiResFont.setBold(true);
        hiResFont.setPointSizeF(hiResFont.pointSizeF() * 0.85);
@@ -48,17 +69,29 @@ public:
        for (const auto &v : albums) {
            const QJsonObject a  = v.toObject();
            const QString id      = a["id"].toString();
-            const QString title  = a["title"].toString();
-            const QString artist = a["artist"].toObject()["name"].toString();
+            const QString base    = a["title"].toString();
+            const QString ver     = a["version"].toString().trimmed();
+            const QString title   = ver.isEmpty() ? base : base + QStringLiteral(" (") + ver + QLatin1Char(')');
+
+            const QJsonValue artistNameVal = a["artist"].toObject()["name"];
+            const QString artist = artistNameVal.isObject()
+                ? artistNameVal.toObject()["display"].toString()
+                : artistNameVal.toString();
+
            const QString date = a["release_date_original"].toString();
-            const QString year   = date.left(4);
+            const QString year = date.isEmpty()
+                ? a["dates"].toObject()["original"].toString().left(4)
+                : date.left(4);
+            const qint64 artistId = static_cast<qint64>(a["artist"].toObject()["id"].toDouble());
+
            const int tracks  = a["tracks_count"].toInt();
-            const bool hiRes     = a["hires_streamable"].toBool();
+            const bool hiRes  = a["hires_streamable"].toBool()
+                             || a["rights"].toObject()["hires_streamable"].toBool();

            auto *item = new QTreeWidgetItem(this);
            if (hiRes) {
                item->setText(0, QStringLiteral("H"));
-                item->setForeground(0, QColor(QStringLiteral("#FFD700")));
+                item->setForeground(0, Colors::QobuzOrange);
                item->setFont(0, hiResFont);
                item->setTextAlignment(0, Qt::AlignCenter);
            }
@@ -67,6 +100,7 @@ public:
            item->setText(3, year);
            item->setText(4, tracks > 0 ? QString::number(tracks) : QString());
            item->setData(1, Qt::UserRole, id);
+            item->setData(2, Qt::UserRole, artistId);
        }
    }

--- a/src/view/artistview.cpp
+++ b/src/view/artistview.cpp
@@ -0,0 +1,427 @@
+#include "artistview.hpp"
+#include "albumlistview.hpp"
+#include "../model/tracklistmodel.hpp"
+
+#include <QVBoxLayout>
+#include <QHBoxLayout>
+#include <QScrollArea>
+#include <QHeaderView>
+#include <QNetworkAccessManager>
+#include <QNetworkReply>
+#include <QNetworkRequest>
+#include <QPixmap>
+#include <QUrl>
+#include <QFont>
+#include <QRegularExpression>
+
+// Shared button style (mirrors TrackContextHeader)
+static const QString kBtnBase = QStringLiteral(
+    "QPushButton { padding: 5px 16px; border-radius: 4px; font-weight: bold; }"
+);
+
+// Section-toggle style: flat QPushButton, truly left-aligned
+static const QString kToggleStyle = QStringLiteral(
+    "QPushButton { text-align: left; font-weight: bold; font-size: 13px;"
+    "  padding: 6px 8px; border: none; border-bottom: 1px solid #333;"
+    "  background: transparent; }"
+    "QPushButton:hover { background: #1e1e1e; }"
+);
+
+// ---------------------------------------------------------------------------
+// ArtistSection
+// ---------------------------------------------------------------------------
+
+ArtistSection::ArtistSection(const QString &title, const QString &releaseType, QWidget *parent)
+    : QWidget(parent)
+    , m_baseTitle(title)
+    , m_releaseType(releaseType)
+{
+    auto *layout = new QVBoxLayout(this);
+    layout->setContentsMargins(0, 0, 0, 0);
+    layout->setSpacing(0);
+
+    m_toggle = new QPushButton(this);
+    m_toggle->setCheckable(true);
+    m_toggle->setChecked(true);
+    m_toggle->setFlat(true);
+    m_toggle->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+    m_toggle->setStyleSheet(kToggleStyle);
+    layout->addWidget(m_toggle);
+
+    m_list = new AlbumListView(this);
+    layout->addWidget(m_list);
+
+    connect(m_toggle, &QPushButton::toggled, this, [this](bool checked) {
+        m_list->setVisible(checked);
+        updateToggleText();
+    });
+    connect(m_list, &AlbumListView::albumSelected, this, &ArtistSection::albumSelected);
+
+    updateToggleText();
+}
+
+void ArtistSection::setAlbums(const QJsonArray &albums)
+{
+    m_list->setAlbums(albums);
+    updateToggleText();
+}
+
+bool ArtistSection::isEmpty() const
+{
+    return m_list->topLevelItemCount() == 0;
+}
+
+QStringList ArtistSection::albumIds() const
+{
+    QStringList ids;
+    for (int i = 0; i < m_list->topLevelItemCount(); ++i) {
+        const QString id = m_list->topLevelItem(i)->data(1, Qt::UserRole).toString();
+        if (!id.isEmpty())
+            ids.append(id);
+    }
+    return ids;
+}
+
+void ArtistSection::setArtistPageMode()
+{
+    m_list->setArtistPageMode();
+}
+
+void ArtistSection::updateToggleText()
+{
+    const int count = m_list->topLevelItemCount();
+    const QString arrow = m_toggle->isChecked() ? QStringLiteral("▼ ") : QStringLiteral("▶ ");
+    const QString text  = count > 0
+        ? QStringLiteral("%1%2  (%3)").arg(arrow, m_baseTitle).arg(count)
+        : arrow + m_baseTitle;
+    m_toggle->setText(text);
+}
+
+// ---------------------------------------------------------------------------
+// ArtistView
+// ---------------------------------------------------------------------------
+
+ArtistView::ArtistView(QobuzBackend *backend, PlayQueue *queue, QWidget *parent)
+    : QWidget(parent)
+    , m_backend(backend)
+    , m_queue(queue)
+{
+    auto *outerLayout = new QVBoxLayout(this);
+    outerLayout->setContentsMargins(0, 0, 0, 0);
+    outerLayout->setSpacing(0);
+
+    // --- Artist header (same structure as TrackContextHeader) ---
+    auto *header = new QWidget(this);
+    header->setFixedHeight(148);
+    auto *hlay = new QHBoxLayout(header);
+    hlay->setContentsMargins(12, 8, 12, 8);
+    hlay->setSpacing(14);
+
+    m_artLabel = new QLabel(header);
+    m_artLabel->setFixedSize(120, 120);
+    m_artLabel->setScaledContents(true);
+    m_artLabel->setAlignment(Qt::AlignCenter);
+    m_artLabel->setStyleSheet(QStringLiteral("background: #1a1a1a; border-radius: 4px;"));
+    hlay->addWidget(m_artLabel, 0, Qt::AlignVCenter);
+
+    auto *info = new QWidget(header);
+    auto *vlay = new QVBoxLayout(info);
+    vlay->setContentsMargins(0, 0, 0, 0);
+    vlay->setSpacing(4);
+
+    m_nameLabel = new QLabel(info);
+    QFont f = m_nameLabel->font();
+    f.setPointSize(f.pointSize() + 5);
+    f.setBold(true);
+    m_nameLabel->setFont(f);
+    vlay->addWidget(m_nameLabel);
+
+    m_bioEdit = new QTextEdit(info);
+    m_bioEdit->setReadOnly(true);
+    m_bioEdit->setFrameShape(QFrame::NoFrame);
+    m_bioEdit->setMaximumHeight(56);
+    m_bioEdit->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
+    m_bioEdit->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    vlay->addWidget(m_bioEdit);
+
+    auto *btnRow = new QHBoxLayout;
+    btnRow->setSpacing(8);
+    btnRow->setContentsMargins(0, 4, 0, 0);
+
+    static const QString kOutlineBtn = kBtnBase +
+        QStringLiteral("QPushButton { background: #2a2a2a; color: #FFB232; border: 1px solid #FFB232; }"
+                       "QPushButton:pressed { background: #333; }");
+
+    m_playBtn = new QPushButton(tr("▶  Play"), info);
+    m_playBtn->setStyleSheet(kBtnBase +
+        QStringLiteral("QPushButton { background: #FFB232; color: #000; }"
+                       "QPushButton:pressed { background: #e09e28; }"));
+
+    m_shuffleTopBtn = new QPushButton(tr("⇄  Shuffle"), info);
+    m_shuffleTopBtn->setStyleSheet(kOutlineBtn);
+
+    m_shuffleBtn = new QPushButton(tr("⇄  Shuffle All"), info);
+    m_shuffleBtn->setStyleSheet(kOutlineBtn);
+
+    m_favBtn = new QPushButton(tr("♡  Favourite"), info);
+    m_favBtn->setStyleSheet(kBtnBase +
+        QStringLiteral("QPushButton { background: #2a2a2a; color: #ccc; border: 1px solid #555; }"
+                       "QPushButton:pressed { background: #333; }"));
+
+    btnRow->addWidget(m_playBtn);
+    btnRow->addWidget(m_shuffleTopBtn);
+    btnRow->addWidget(m_shuffleBtn);
+    btnRow->addWidget(m_favBtn);
+    btnRow->addStretch();
+    vlay->addLayout(btnRow);
+    vlay->addStretch(1);
+
+    hlay->addWidget(info, 1);
+    outerLayout->addWidget(header);
+
+    // --- Network manager for portrait ---
+    m_nam = new QNetworkAccessManager(this);
+    QObject::connect(m_nam, &QNetworkAccessManager::finished,
+                     this, [this](QNetworkReply *reply) {
+        reply->deleteLater();
+        if (reply->error() != QNetworkReply::NoError) return;
+        QPixmap pix;
+        if (pix.loadFromData(reply->readAll()))
+            m_artLabel->setPixmap(pix);
+    });
+
+    // --- Scrollable sections area ---
+    auto *scroll = new QScrollArea(this);
+    scroll->setWidgetResizable(true);
+    scroll->setFrameShape(QFrame::NoFrame);
+
+    auto *content = new QWidget(scroll);
+    auto *sectLayout = new QVBoxLayout(content);
+    sectLayout->setContentsMargins(0, 0, 0, 0);
+    sectLayout->setSpacing(0);
+
+    // Popular Tracks section — same toggle style as release sections
+    m_topTracksSection = new QWidget(content);
+    auto *ttLayout = new QVBoxLayout(m_topTracksSection);
+    ttLayout->setContentsMargins(0, 0, 0, 0);
+    ttLayout->setSpacing(0);
+
+    m_topTracksToggle = new QPushButton(m_topTracksSection);
+    m_topTracksToggle->setCheckable(true);
+    m_topTracksToggle->setChecked(true);
+    m_topTracksToggle->setFlat(true);
+    m_topTracksToggle->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+    m_topTracksToggle->setStyleSheet(kToggleStyle);
+    ttLayout->addWidget(m_topTracksToggle);
+
+    m_topTracks = new List::Tracks(backend, queue, m_topTracksSection);
+    m_topTracks->setMaximumHeight(320);
+    // Artist page column layout: hide Artist & Album, match album-section widths
+    m_topTracks->setColumnHidden(TrackListModel::ColArtist, true);
+    m_topTracks->setColumnHidden(TrackListModel::ColAlbum, true);
+    m_topTracks->header()->setSectionResizeMode(TrackListModel::ColNumber,   QHeaderView::Fixed);
+    m_topTracks->header()->setSectionResizeMode(TrackListModel::ColTitle,    QHeaderView::Stretch);
+    m_topTracks->header()->setSectionResizeMode(TrackListModel::ColDuration, QHeaderView::Fixed);
+    m_topTracks->header()->resizeSection(TrackListModel::ColNumber,   40);
+    m_topTracks->header()->resizeSection(TrackListModel::ColDuration, 70);
+    ttLayout->addWidget(m_topTracks);
+
+    connect(m_topTracksToggle, &QPushButton::toggled, m_topTracks, &QWidget::setVisible);
+    connect(m_topTracks, &List::Tracks::playTrackRequested, this, &ArtistView::playTrackRequested);
+
+    sectLayout->addWidget(m_topTracksSection);
+
+    // Release sections
+    m_secAlbums       = new ArtistSection(tr("Albums"),        QStringLiteral("album"),       content);
+    m_secEps          = new ArtistSection(tr("Singles & EPs"), QStringLiteral("epSingle"),    content);
+    m_secLive         = new ArtistSection(tr("Live"),          QStringLiteral("live"),        content);
+    m_secCompilations = new ArtistSection(tr("Compilations"),  QStringLiteral("compilation"), content);
+    m_secOther        = new ArtistSection(tr("Other"),         QStringLiteral("other"),       content);
+
+    // Uniform column layout: hide Artist column, match fixed widths across all sections
+    for (ArtistSection *sec : {m_secAlbums, m_secEps, m_secLive, m_secCompilations, m_secOther})
+        sec->setArtistPageMode();
+
+    sectLayout->addWidget(m_secAlbums);
+    sectLayout->addWidget(m_secEps);
+    sectLayout->addWidget(m_secLive);
+    sectLayout->addWidget(m_secCompilations);
+    sectLayout->addWidget(m_secOther);
+    sectLayout->addStretch();
+
+    scroll->setWidget(content);
+    outerLayout->addWidget(scroll, 1);
+
+    // Play / shuffle top tracks
+    connect(m_playBtn,       &QPushButton::clicked, m_topTracks, [this] { m_topTracks->playAll(false); });
+    connect(m_shuffleTopBtn, &QPushButton::clicked, m_topTracks, [this] { m_topTracks->playAll(true); });
+
+    // Deep shuffle: fetch all album tracks, combine, shuffle, play
+    connect(m_shuffleBtn, &QPushButton::clicked, this, [this] {
+        const QStringList ids = allAlbumIds();
+        if (ids.isEmpty()) return;
+        m_shuffleBtn->setEnabled(false);
+        m_shuffleBtn->setText(tr("Loading…"));
+        m_backend->getAlbumsTracks(ids);
+    });
+
+    // Favourite button
+    connect(m_favBtn, &QPushButton::clicked, this, [this] {
+        if (m_artistId <= 0) return;
+        m_isFaved = !m_isFaved;
+        if (m_isFaved) {
+            m_backend->addFavArtist(m_artistId);
+            m_favArtistIds.insert(m_artistId);
+        } else {
+            m_backend->removeFavArtist(m_artistId);
+            m_favArtistIds.remove(m_artistId);
+        }
+        setFaved(m_isFaved);
+    });
+
+    // Album section connections
+    connect(m_secAlbums,       &ArtistSection::albumSelected, this, &ArtistView::albumSelected);
+    connect(m_secEps,          &ArtistSection::albumSelected, this, &ArtistView::albumSelected);
+    connect(m_secLive,         &ArtistSection::albumSelected, this, &ArtistView::albumSelected);
+    connect(m_secCompilations, &ArtistSection::albumSelected, this, &ArtistView::albumSelected);
+    connect(m_secOther,        &ArtistSection::albumSelected, this, &ArtistView::albumSelected);
+}
+
+void ArtistView::setArtist(const QJsonObject &artist)
+{
+    m_artistId = static_cast<qint64>(artist["id"].toDouble());
+    setFaved(m_favArtistIds.contains(m_artistId));
+
+    m_nameLabel->setText(artist["name"].toObject()["display"].toString());
+
+    // Biography: strip HTML tags
+    const QString bioHtml = artist["biography"].toObject()["content"].toString();
+    if (!bioHtml.isEmpty()) {
+        QString plain = bioHtml;
+        plain.remove(QRegularExpression(QStringLiteral("<[^>]*>")));
+        plain.replace(QStringLiteral("&amp;"),  QStringLiteral("&"));
+        plain.replace(QStringLiteral("&lt;"),   QStringLiteral("<"));
+        plain.replace(QStringLiteral("&gt;"),   QStringLiteral(">"));
+        plain.replace(QStringLiteral("&quot;"), QStringLiteral("\""));
+        plain.replace(QStringLiteral("&#39;"),  QStringLiteral("'"));
+        plain.replace(QStringLiteral("&nbsp;"), QStringLiteral(" "));
+        plain = plain.trimmed();
+        m_bioEdit->setPlainText(plain);
+        m_bioEdit->setVisible(!plain.isEmpty());
+    } else {
+        m_bioEdit->setVisible(false);
+    }
+
+    // Artist portrait: images.portrait.hash + format → CDN URL
+    const QJsonObject portrait = artist["images"].toObject()["portrait"].toObject();
+    const QString hash   = portrait["hash"].toString();
+    const QString format = portrait["format"].toString();
+    QString artUrl;
+    if (!hash.isEmpty()) {
+        artUrl = QStringLiteral("https://static.qobuz.com/images/artists/covers/large/%1.%2")
+                     .arg(hash, format.isEmpty() ? QStringLiteral("jpg") : format);
+    } else {
+        const QJsonObject img = artist["image"].toObject();
+        artUrl = img["large"].toString();
+        if (artUrl.isEmpty()) artUrl = img["small"].toString();
+    }
+    if (!artUrl.isEmpty() && artUrl != m_currentArtUrl) {
+        m_currentArtUrl = artUrl;
+        m_nam->get(QNetworkRequest(QUrl(artUrl)));
+    } else if (artUrl.isEmpty()) {
+        m_artLabel->setPixmap(QPixmap());
+        m_currentArtUrl.clear();
+    }
+
+    // Popular tracks (flat array)
+    const QJsonArray topTracks = artist["top_tracks"].toArray();
+    m_topTracks->loadTracks(topTracks);
+
+    const int ttCount = topTracks.size();
+    disconnect(m_topTracksToggle, &QPushButton::toggled, nullptr, nullptr);
+    connect(m_topTracksToggle, &QPushButton::toggled, m_topTracks, &QWidget::setVisible);
+    connect(m_topTracksToggle, &QPushButton::toggled, this, [this, ttCount](bool open) {
+        const QString a = open ? QStringLiteral("▼ ") : QStringLiteral("▶ ");
+        m_topTracksToggle->setText(ttCount > 0
+            ? QStringLiteral("%1Popular Tracks  (%2)").arg(a).arg(ttCount)
+            : a + tr("Popular Tracks"));
+    });
+    m_topTracksToggle->setChecked(true);
+    m_topTracks->setVisible(true);
+    m_topTracksToggle->setText(ttCount > 0
+        ? QStringLiteral("▼ Popular Tracks  (%1)").arg(ttCount)
+        : QStringLiteral("▼ Popular Tracks"));
+    m_topTracksSection->setVisible(!topTracks.isEmpty());
+
+    // Reset shuffle button state
+    m_shuffleBtn->setEnabled(true);
+    m_shuffleBtn->setText(tr("⇄  Shuffle All"));
+
+    // Clear release sections
+    for (ArtistSection *sec : {m_secAlbums, m_secEps, m_secLive, m_secCompilations, m_secOther}) {
+        sec->setAlbums({});
+        sec->setVisible(false);
+    }
+}
+
+void ArtistView::setReleases(const QString &releaseType, const QJsonArray &items,
+                              bool /*hasMore*/, int /*offset*/)
+{
+    ArtistSection *sec = nullptr;
+    if      (releaseType == QStringLiteral("album"))       sec = m_secAlbums;
+    else if (releaseType == QStringLiteral("epSingle"))    sec = m_secEps;
+    else if (releaseType == QStringLiteral("live"))        sec = m_secLive;
+    else if (releaseType == QStringLiteral("compilation")) sec = m_secCompilations;
+    else                                                   sec = m_secOther;
+
+    // Rust auto-paginates, so we always get the full list at once
+    sec->setAlbums(items);
+    sec->setVisible(!sec->isEmpty());
+}
+
+void ArtistView::setFavArtistIds(const QSet<qint64> &ids)
+{
+    m_favArtistIds = ids;
+    if (m_artistId > 0)
+        setFaved(ids.contains(m_artistId));
+}
+
+void ArtistView::onDeepShuffleTracks(const QJsonArray &tracks)
+{
+    m_shuffleBtn->setEnabled(true);
+    m_shuffleBtn->setText(tr("⇄  Shuffle All"));
+
+    if (tracks.isEmpty()) return;
+
+    m_queue->setContext(tracks, 0);
+    m_queue->shuffleNow();
+
+    const QJsonObject first = m_queue->current();
+    const qint64 id = static_cast<qint64>(first["id"].toDouble());
+    if (id > 0)
+        emit playTrackRequested(id);
+}
+
+QStringList ArtistView::allAlbumIds() const
+{
+    QStringList ids;
+    for (const ArtistSection *sec : {m_secAlbums, m_secEps, m_secLive, m_secCompilations, m_secOther})
+        ids.append(sec->albumIds());
+    return ids;
+}
+
+void ArtistView::setFaved(bool faved)
+{
+    m_isFaved = faved;
+    if (faved) {
+        m_favBtn->setText(tr("♥  Favourited"));
+        m_favBtn->setStyleSheet(kBtnBase +
+            QStringLiteral("QPushButton { background: #2a2a2a; color: #FFB232; border: 1px solid #FFB232; }"
+                           "QPushButton:pressed { background: #333; }"));
+    } else {
+        m_favBtn->setText(tr("♡  Favourite"));
+        m_favBtn->setStyleSheet(kBtnBase +
+            QStringLiteral("QPushButton { background: #2a2a2a; color: #ccc; border: 1px solid #555; }"
+                           "QPushButton:pressed { background: #333; }"));
+    }
+}
--- a/src/view/artistview.hpp
+++ b/src/view/artistview.hpp
@@ -1,64 +1,93 @@
 #pragma once

 #include "albumlistview.hpp"
+#include "../list/tracks.hpp"
+#include "../backend/qobuzbackend.hpp"
+#include "../playqueue.hpp"

 #include <QWidget>
-#include <QVBoxLayout>
 #include <QLabel>
-#include <QFont>
+#include <QTextEdit>
+#include <QPushButton>
+#include <QNetworkAccessManager>
 #include <QJsonObject>
 #include <QJsonArray>
+#include <QSet>

-/// Artist detail page: name, biography summary, and their album list.
-class ArtistView : public QWidget
+class AlbumListView;
+
+/// One collapsible section (Albums / EPs / Live / etc.) inside ArtistView.
+class ArtistSection : public QWidget
 {
    Q_OBJECT
-
 public:
-    explicit ArtistView(QWidget *parent = nullptr) : QWidget(parent)
-    {
-        auto *layout = new QVBoxLayout(this);
-        layout->setContentsMargins(8, 8, 8, 8);
-        layout->setSpacing(6);
+    explicit ArtistSection(const QString &title, const QString &releaseType, QWidget *parent = nullptr);

-        m_nameLabel = new QLabel(this);
-        QFont f = m_nameLabel->font();
-        f.setPointSize(f.pointSize() + 4);
-        f.setBold(true);
-        m_nameLabel->setFont(f);
-
-        m_bioLabel = new QLabel(this);
-        m_bioLabel->setWordWrap(true);
-        m_bioLabel->setAlignment(Qt::AlignTop | Qt::AlignLeft);
-        m_bioLabel->setMaximumHeight(80);
-
-        m_albums = new AlbumListView(this);
-
-        layout->addWidget(m_nameLabel);
-        layout->addWidget(m_bioLabel);
-        layout->addWidget(m_albums, 1);
-
-        connect(m_albums, &AlbumListView::albumSelected,
-                this, &ArtistView::albumSelected);
-    }
-
-    void setArtist(const QJsonObject &artist)
-    {
-        m_nameLabel->setText(artist["name"].toString());
-
-        const QString summary = artist["biography"].toObject()["summary"].toString();
-        m_bioLabel->setText(summary);
-        m_bioLabel->setVisible(!summary.isEmpty());
-
-        const QJsonArray albums = artist["albums"].toObject()["items"].toArray();
-        m_albums->setAlbums(albums);
-    }
+    void setAlbums(const QJsonArray &albums);
+    bool isEmpty() const;
+    QStringList albumIds() const;
+    void setArtistPageMode();

 signals:
    void albumSelected(const QString &albumId);

 private:
-    QLabel        *m_nameLabel = nullptr;
-    QLabel        *m_bioLabel  = nullptr;
-    AlbumListView *m_albums    = nullptr;
+    QString        m_baseTitle;
+    QString        m_releaseType;
+    QPushButton   *m_toggle       = nullptr;
+    AlbumListView *m_list         = nullptr;
+
+    void updateToggleText();
+};
+
+/// Artist detail page.
+class ArtistView : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit ArtistView(QobuzBackend *backend, PlayQueue *queue, QWidget *parent = nullptr);
+
+    void setArtist(const QJsonObject &artist);
+    void setReleases(const QString &releaseType, const QJsonArray &items,
+                     bool hasMore = false, int offset = 0);
+    void setFavArtistIds(const QSet<qint64> &ids);
+    void onDeepShuffleTracks(const QJsonArray &tracks);
+
+signals:
+    void albumSelected(const QString &albumId);
+    void playTrackRequested(qint64 trackId);
+
+private:
+    QobuzBackend *m_backend    = nullptr;
+    PlayQueue    *m_queue      = nullptr;
+    qint64        m_artistId   = 0;
+
+    // Header widgets
+    QLabel                *m_artLabel   = nullptr;
+    QLabel                *m_nameLabel  = nullptr;
+    QTextEdit             *m_bioEdit    = nullptr;
+    QPushButton           *m_playBtn       = nullptr;
+    QPushButton           *m_shuffleTopBtn = nullptr;
+    QPushButton           *m_shuffleBtn    = nullptr;
+    QPushButton           *m_favBtn        = nullptr;
+    QNetworkAccessManager *m_nam        = nullptr;
+    QString                m_currentArtUrl;
+    bool                   m_isFaved    = false;
+    QSet<qint64>           m_favArtistIds;
+
+    // Popular tracks section
+    QWidget      *m_topTracksSection = nullptr;
+    QPushButton  *m_topTracksToggle  = nullptr;
+    List::Tracks *m_topTracks        = nullptr;
+
+    // Release sections
+    ArtistSection *m_secAlbums       = nullptr;
+    ArtistSection *m_secEps          = nullptr;
+    ArtistSection *m_secLive         = nullptr;
+    ArtistSection *m_secCompilations = nullptr;
+    ArtistSection *m_secOther        = nullptr;
+
+    QStringList allAlbumIds() const;
+    void setFaved(bool faved);
 };
--- a/src/view/context/view.cpp
+++ b/src/view/context/view.cpp
@@ -7,8 +7,6 @@
 namespace Context
 {

-static constexpr int ArtSize = 96;
-
 View::View(QobuzBackend *backend, QWidget *parent)
    : QDockWidget(tr("Now Playing"), parent)
    , m_backend(backend)
@@ -24,13 +22,8 @@ View::View(QobuzBackend *backend, QWidget *parent)
    layout->setContentsMargins(8, 8, 8, 8);
    layout->setSpacing(6);

-    m_albumArt = new QLabel(container);
-    m_albumArt->setFixedSize(ArtSize, ArtSize);
-    m_albumArt->setScaledContents(true);
-    m_albumArt->setAlignment(Qt::AlignCenter);
-    m_albumArt->setStyleSheet(QStringLiteral(
-        "background: #1a1a1a; border-radius: 4px;"));
-    layout->addWidget(m_albumArt, 0, Qt::AlignCenter);
+    m_albumArt = new ArtWidget(container);
+    layout->addWidget(m_albumArt);

    m_title = new QLabel(tr("Not playing"), container);
    m_title->setAlignment(Qt::AlignCenter);
@@ -48,7 +41,6 @@ View::View(QobuzBackend *backend, QWidget *parent)

    layout->addStretch();
    setWidget(container);
-    setMinimumWidth(160);

    connect(m_backend, &QobuzBackend::trackChanged, this, &View::onTrackChanged);
 }
@@ -63,7 +55,6 @@ void View::onTrackChanged(const QJsonObject &track)
    m_title->setText(title.isEmpty() ? tr("Not playing") : title);
    m_artist->setText(artist);

-    // Prefer "large" image, fall back to "small"
    const QJsonObject img = track["album"].toObject()["image"].toObject();
    QString artUrl = img["large"].toString();
    if (artUrl.isEmpty())
--- a/src/view/context/view.hpp
+++ b/src/view/context/view.hpp
@@ -1,15 +1,52 @@
 #pragma once

 #include "../../backend/qobuzbackend.hpp"
+#include "../../util/colors.hpp"

 #include <QDockWidget>
+#include <QWidget>
 #include <QLabel>
+#include <QPixmap>
+#include <QPainter>
+#include <QPaintEvent>
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QJsonObject>

 namespace Context
 {
+    /// Square art widget: always as wide as its parent allows, height follows width.
+    class ArtWidget : public QWidget
+    {
+    public:
+        explicit ArtWidget(QWidget *parent = nullptr) : QWidget(parent)
+        {
+            setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+        }
+
+        void setPixmap(const QPixmap &px) { m_pix = px; update(); }
+        bool hasHeightForWidth() const override { return true; }
+        int  heightForWidth(int w) const override { return w; }
+
+    protected:
+        void paintEvent(QPaintEvent *) override
+        {
+            QPainter p(this);
+            if (m_pix.isNull()) {
+                p.fillRect(rect(), Colors::ContextBg);
+                return;
+            }
+            const QPixmap scaled = m_pix.scaled(size(), Qt::KeepAspectRatio, Qt::SmoothTransformation);
+            p.fillRect(rect(), Colors::ContextBg);
+            p.drawPixmap((width()  - scaled.width())  / 2,
+                         (height() - scaled.height()) / 2,
+                         scaled);
+        }
+
+    private:
+        QPixmap m_pix;
+    };
+
    class View : public QDockWidget
    {
        Q_OBJECT
@@ -23,7 +60,7 @@ namespace Context

    private:
        QobuzBackend          *m_backend       = nullptr;
-        QLabel                *m_albumArt      = nullptr;
+        ArtWidget             *m_albumArt      = nullptr;
        QLabel                *m_title         = nullptr;
        QLabel                *m_artist        = nullptr;
        QNetworkAccessManager *m_nam           = nullptr;
--- a/src/view/genrebrowser.cpp
+++ b/src/view/genrebrowser.cpp
@@ -0,0 +1,795 @@
+#include "genrebrowser.hpp"
+#include "../util/colors.hpp"
+
+#include <QAction>
+#include <QDialog>
+#include <QDialogButtonBox>
+#include <QHeaderView>
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QListWidget>
+#include <QMenu>
+#include <QPushButton>
+#include <QScrollBar>
+#include <QSignalBlocker>
+#include <QTimer>
+#include <QTreeWidgetItem>
+#include <QVBoxLayout>
+
+#include <algorithm>
+
+GenreBrowserView::GenreBrowserView(QobuzBackend *backend, PlayQueue *queue, QWidget *parent)
+    : QWidget(parent)
+    , m_backend(backend)
+    , m_queue(queue)
+{
+    auto *layout = new QVBoxLayout(this);
+    layout->setContentsMargins(0, 0, 0, 0);
+    layout->setSpacing(0);
+
+    auto *topBar = new QWidget(this);
+    auto *topLayout = new QHBoxLayout(topBar);
+    topLayout->setContentsMargins(8, 6, 8, 6);
+    topLayout->setSpacing(6);
+
+    QFont topFont = topBar->font();
+    if (topFont.pointSize() > 0)
+        topFont.setPointSize(topFont.pointSize() + 1);
+    static constexpr int controlHeight = 30;
+
+    m_browseLabel = new QLabel(tr("Show:"), this);
+    m_browseLabel->setFont(topFont);
+    topLayout->addWidget(m_browseLabel);
+    m_kindCombo = new QComboBox(this);
+    m_kindCombo->addItem(tr("Albums"), QStringLiteral("albums"));
+    m_kindCombo->addItem(tr("Playlists"), QStringLiteral("playlists"));
+    m_kindCombo->setFont(topFont);
+    m_kindCombo->setMinimumWidth(110);
+    m_kindCombo->setFixedHeight(controlHeight);
+    topLayout->addWidget(m_kindCombo);
+
+    m_gapAfterKind = new QWidget(this);
+    m_gapAfterKind->setFixedWidth(6);
+    topLayout->addWidget(m_gapAfterKind);
+
+    m_genreLabel = new QLabel(tr("Genre:"), this);
+    m_genreLabel->setFont(topFont);
+    topLayout->addWidget(m_genreLabel);
+    m_genreCombo = new QComboBox(this);
+    m_genreCombo->setFont(topFont);
+    m_genreCombo->setMinimumWidth(180);
+    m_genreCombo->setFixedHeight(controlHeight);
+    topLayout->addWidget(m_genreCombo);
+
+    m_gapAfterGenre = new QWidget(this);
+    m_gapAfterGenre->setFixedWidth(10);
+    topLayout->addWidget(m_gapAfterGenre);
+
+    m_typeLabel = new QLabel(tr("Type:"), this);
+    m_typeLabel->setFont(topFont);
+    topLayout->addWidget(m_typeLabel);
+    m_typeCombo = new QComboBox(this);
+    m_typeCombo->setFont(topFont);
+    m_typeCombo->setMinimumWidth(180);
+    m_typeCombo->setFixedHeight(controlHeight);
+    topLayout->addWidget(m_typeCombo);
+
+    m_playlistSearchLabel = new QLabel(tr("Search:"), this);
+    m_playlistSearchLabel->setFont(topFont);
+    m_playlistSearchLabel->setVisible(false);
+    topLayout->addWidget(m_playlistSearchLabel);
+
+    m_playlistSearchBox = new QLineEdit(this);
+    m_playlistSearchBox->setFont(topFont);
+    m_playlistSearchBox->setPlaceholderText(tr("Search playlists..."));
+    m_playlistSearchBox->setClearButtonEnabled(true);
+    m_playlistSearchBox->setVisible(false);
+    m_playlistSearchBox->setMinimumWidth(220);
+    m_playlistSearchBox->setMaximumWidth(320);
+    m_playlistSearchBox->setFixedHeight(controlHeight);
+    topLayout->addWidget(m_playlistSearchBox);
+
+    m_playlistSearchBtn = new QPushButton(tr("Go"), this);
+    m_playlistSearchBtn->setFont(topFont);
+    m_playlistSearchBtn->setVisible(false);
+    m_playlistSearchBtn->setFixedHeight(controlHeight);
+    topLayout->addWidget(m_playlistSearchBtn);
+
+    m_deepShuffleBtn = new QPushButton(tr("⇄  Deep Shuffle"), this);
+    m_deepShuffleBtn->setFont(topFont);
+    m_deepShuffleBtn->setVisible(false);
+    m_deepShuffleBtn->setFixedHeight(controlHeight);
+    topLayout->addWidget(m_deepShuffleBtn);
+
+    topLayout->addStretch();
+    layout->addWidget(topBar);
+
+    m_resultsStack = new QStackedWidget(this);
+
+    m_albumList = new AlbumListView(this);
+    m_albumList->setContextMenuPolicy(Qt::CustomContextMenu);
+
+    m_playlistList = new QTreeWidget(this);
+    m_playlistList->setColumnCount(4);
+    m_playlistList->setHeaderLabels({tr(""), tr("Playlist"), tr("Owner"), tr("Tracks")});
+    m_playlistList->setRootIsDecorated(false);
+    m_playlistList->setAlternatingRowColors(true);
+    m_playlistList->setSelectionBehavior(QAbstractItemView::SelectRows);
+    m_playlistList->setSortingEnabled(true);
+    m_playlistList->setContextMenuPolicy(Qt::CustomContextMenu);
+    m_playlistList->header()->setSectionResizeMode(0, QHeaderView::ResizeToContents);
+    m_playlistList->header()->setSectionResizeMode(1, QHeaderView::Stretch);
+    m_playlistList->header()->setSectionResizeMode(2, QHeaderView::Stretch);
+    m_playlistList->header()->setSectionResizeMode(3, QHeaderView::ResizeToContents);
+    m_playlistList->header()->setStretchLastSection(false);
+
+    auto *playlistPage = new QWidget(this);
+    auto *playlistPageLayout = new QVBoxLayout(playlistPage);
+    playlistPageLayout->setContentsMargins(0, 0, 0, 0);
+    playlistPageLayout->setSpacing(0);
+    playlistPageLayout->addWidget(m_playlistList, 1);
+
+    m_loadMorePlaylistsBtn = new QPushButton(tr("Load more playlists…"), this);
+    m_loadMorePlaylistsBtn->hide();
+    playlistPageLayout->addWidget(m_loadMorePlaylistsBtn);
+
+    m_resultsStack->addWidget(m_albumList);
+    m_resultsStack->addWidget(playlistPage);
+    layout->addWidget(m_resultsStack, 1);
+
+    connect(m_backend, &QobuzBackend::genresLoaded,
+            this, &GenreBrowserView::onGenresLoaded);
+    connect(m_backend, &QobuzBackend::featuredAlbumsLoaded,
+            this, &GenreBrowserView::onFeaturedAlbumsLoaded);
+    connect(m_backend, &QobuzBackend::featuredPlaylistsLoaded,
+            this, &GenreBrowserView::onFeaturedPlaylistsLoaded);
+    connect(m_backend, &QobuzBackend::discoverPlaylistsLoaded,
+            this, &GenreBrowserView::onDiscoverPlaylistsLoaded);
+    connect(m_backend, &QobuzBackend::playlistSearchLoaded,
+            this, &GenreBrowserView::onPlaylistSearchLoaded);
+
+    connect(m_genreCombo, QOverload<int>::of(&QComboBox::currentIndexChanged),
+            this, [this](int index) {
+        const QString data = m_genreCombo->itemData(index).toString();
+        if (data == QStringLiteral("__multi__")) {
+            if (!chooseMultiGenres()) {
+                const QSignalBlocker blocker(m_genreCombo);
+                m_genreCombo->setCurrentIndex(m_lastGenreComboIndex);
+                return;
+            }
+            m_lastGenreComboIndex = index;
+            updateMultiGenreLabel();
+        } else {
+            m_lastGenreComboIndex = index;
+            if (data == QStringLiteral("__all__")) {
+                m_multiGenreIds.clear();
+                updateMultiGenreLabel();
+            }
+        }
+        onSelectionChanged();
+    });
+    connect(m_kindCombo, QOverload<int>::of(&QComboBox::currentIndexChanged),
+            this, [this](int) {
+        refreshGenreTypeChoices();
+        onSelectionChanged();
+    });
+    connect(m_typeCombo, QOverload<int>::of(&QComboBox::currentIndexChanged),
+            this, &GenreBrowserView::onSelectionChanged);
+    connect(m_playlistSearchBox, &QLineEdit::returnPressed,
+            this, &GenreBrowserView::onSelectionChanged);
+    connect(m_playlistSearchBtn, &QPushButton::clicked,
+            this, &GenreBrowserView::onSelectionChanged);
+    connect(m_deepShuffleBtn, &QPushButton::clicked,
+            this, &GenreBrowserView::onDeepShuffleClicked);
+    connect(m_albumList, &AlbumListView::albumSelected,
+            this, &GenreBrowserView::albumSelected);
+    connect(m_albumList, &QTreeWidget::customContextMenuRequested,
+            this, &GenreBrowserView::onAlbumContextMenu);
+    connect(m_playlistList, &QTreeWidget::itemDoubleClicked,
+            this, &GenreBrowserView::onPlaylistActivated);
+    connect(m_playlistList, &QTreeWidget::customContextMenuRequested,
+            this, &GenreBrowserView::onPlaylistContextMenu);
+    connect(m_albumList->verticalScrollBar(), &QScrollBar::valueChanged,
+            this, &GenreBrowserView::onAlbumScroll);
+    connect(m_playlistList->verticalScrollBar(), &QScrollBar::valueChanged,
+            this, &GenreBrowserView::onPlaylistScroll);
+    connect(m_loadMorePlaylistsBtn, &QPushButton::clicked, this, [this] {
+        m_loadMorePlaylistsBtn->hide();
+        requestPlaylistsPage(m_lastPlaylistGenreIds, m_lastPlaylistType,
+                             m_lastPlaylistTags, m_lastPlaylistQuery,
+                             m_playlistOffset, true);
+    });
+
+    m_kindCombo->setCurrentIndex(0);
+    refreshModeUi();
+}
+
+void GenreBrowserView::ensureGenresLoaded()
+{
+    if (!m_genresLoaded)
+        m_backend->getGenres();
+}
+
+void GenreBrowserView::setBrowseMode(BrowseMode mode)
+{
+    if (m_mode == mode)
+        return;
+
+    m_mode = mode;
+    refreshModeUi();
+    onSelectionChanged();
+}
+
+void GenreBrowserView::refreshModeUi()
+{
+    const bool genreMode = (m_mode == BrowseMode::Genres);
+
+    m_browseLabel->setVisible(genreMode);
+    m_kindCombo->setVisible(genreMode);
+    m_gapAfterKind->setVisible(genreMode);
+    m_genreLabel->setVisible(genreMode);
+    m_genreCombo->setVisible(genreMode);
+    m_gapAfterGenre->setVisible(genreMode);
+    m_typeLabel->setVisible(genreMode);
+    m_typeCombo->setVisible(genreMode);
+
+    if (genreMode) {
+        m_playlistSearchBox->setVisible(false);
+        m_playlistSearchLabel->setVisible(false);
+        m_playlistSearchBtn->setVisible(false);
+        m_deepShuffleBtn->setVisible(m_kindCombo->currentData().toString() == QStringLiteral("albums"));
+        refreshGenreTypeChoices();
+        return;
+    }
+
+    m_typeCombo->blockSignals(true);
+    m_typeCombo->clear();
+    m_typeCombo->addItem(tr("Search"), QStringLiteral("search"));
+    m_typeCombo->blockSignals(false);
+    m_playlistSearchLabel->setVisible(true);
+    m_playlistSearchBox->setVisible(true);
+    m_playlistSearchBtn->setVisible(true);
+    m_deepShuffleBtn->setVisible(false);
+    m_resultsStack->setCurrentIndex(1);
+}
+
+void GenreBrowserView::refreshGenreTypeChoices()
+{
+    m_typeCombo->blockSignals(true);
+    m_typeCombo->clear();
+
+    const QString kind = m_kindCombo->currentData().toString();
+    if (kind == QStringLiteral("playlists")) {
+        m_typeCombo->addItem(tr("Featured: Last Created"), QStringLiteral("last-created"));
+        m_typeCombo->addItem(tr("Discover: New"), QStringLiteral("discover-new"));
+        m_typeCombo->addItem(tr("Discover: Hi-Res"), QStringLiteral("discover-hires"));
+        m_typeCombo->addItem(tr("Discover: Focus"), QStringLiteral("discover-focus"));
+        m_typeCombo->addItem(tr("Discover: Qobuz Digs"), QStringLiteral("discover-qobuzdigs"));
+        m_resultsStack->setCurrentIndex(1);
+        m_deepShuffleBtn->setVisible(false);
+    } else {
+        m_typeCombo->addItem(tr("New Releases"), QStringLiteral("new-releases"));
+        m_typeCombo->addItem(tr("Best Sellers"), QStringLiteral("best-sellers"));
+        m_typeCombo->addItem(tr("Most Streamed"), QStringLiteral("most-streamed"));
+        m_typeCombo->addItem(tr("Editor Picks"), QStringLiteral("editor-picks"));
+        m_typeCombo->addItem(tr("Press Awards"), QStringLiteral("press-awards"));
+        m_resultsStack->setCurrentIndex(0);
+        m_deepShuffleBtn->setVisible(m_mode == BrowseMode::Genres);
+    }
+
+    m_typeCombo->blockSignals(false);
+}
+
+QString GenreBrowserView::currentGenreIds() const
+{
+    const QString data = m_genreCombo->currentData().toString();
+    if (data == QStringLiteral("__all__"))
+        return QString();
+
+    if (data == QStringLiteral("__multi__")) {
+        if (m_multiGenreIds.isEmpty())
+            return QString();
+
+        QList<qint64> ids = m_multiGenreIds.values();
+        std::sort(ids.begin(), ids.end());
+        QStringList out;
+        out.reserve(ids.size());
+        for (qint64 id : ids)
+            out.push_back(QString::number(id));
+        return out.join(QLatin1Char(','));
+    }
+
+    return data;
+}
+
+bool GenreBrowserView::chooseMultiGenres()
+{
+    QDialog dlg(this);
+    dlg.setWindowTitle(tr("Select genres"));
+    dlg.resize(320, 420);
+
+    auto *layout = new QVBoxLayout(&dlg);
+    auto *list = new QListWidget(&dlg);
+    list->setAlternatingRowColors(true);
+    layout->addWidget(list, 1);
+
+    for (int i = 0; i < m_genreCombo->count(); ++i) {
+        const QString data = m_genreCombo->itemData(i).toString();
+        if (data == QStringLiteral("__all__") || data == QStringLiteral("__multi__"))
+            continue;
+
+        auto *item = new QListWidgetItem(m_genreCombo->itemText(i), list);
+        item->setFlags(item->flags() | Qt::ItemIsUserCheckable);
+        const qint64 id = data.toLongLong();
+        item->setData(Qt::UserRole, id);
+        item->setCheckState(m_multiGenreIds.contains(id) ? Qt::Checked : Qt::Unchecked);
+    }
+
+    auto *buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, &dlg);
+    layout->addWidget(buttons);
+    connect(buttons, &QDialogButtonBox::accepted, &dlg, &QDialog::accept);
+    connect(buttons, &QDialogButtonBox::rejected, &dlg, &QDialog::reject);
+
+    if (dlg.exec() != QDialog::Accepted)
+        return false;
+
+    m_multiGenreIds.clear();
+    for (int i = 0; i < list->count(); ++i) {
+        QListWidgetItem *item = list->item(i);
+        if (item->checkState() == Qt::Checked)
+            m_multiGenreIds.insert(item->data(Qt::UserRole).toLongLong());
+    }
+    return true;
+}
+
+void GenreBrowserView::updateMultiGenreLabel()
+{
+    const int multiIndex = m_genreCombo->count() - 1;
+    if (multiIndex < 0)
+        return;
+
+    const QString text = m_multiGenreIds.isEmpty()
+        ? tr("Multiple...")
+        : tr("Multiple (%1)").arg(m_multiGenreIds.size());
+    m_genreCombo->setItemText(multiIndex, text);
+}
+
+void GenreBrowserView::onGenresLoaded(const QJsonObject &result)
+{
+    m_genresLoaded = true;
+    m_genreCombo->blockSignals(true);
+    m_genreCombo->clear();
+    m_genreCombo->addItem(tr("All genres"), QStringLiteral("__all__"));
+
+    const QJsonArray items = result["items"].toArray();
+    for (const auto &value : items) {
+        const QJsonObject genre = value.toObject();
+        m_genreCombo->addItem(
+            genre["name"].toString(),
+            static_cast<qint64>(genre["id"].toDouble()));
+    }
+
+    m_genreCombo->addItem(tr("Multiple..."), QStringLiteral("__multi__"));
+    updateMultiGenreLabel();
+    m_lastGenreComboIndex = 0;
+    m_genreCombo->setCurrentIndex(0);
+
+    m_genreCombo->blockSignals(false);
+    onSelectionChanged();
+}
+
+void GenreBrowserView::onFeaturedAlbumsLoaded(const QJsonObject &result)
+{
+    m_resultsStack->setCurrentIndex(0);
+    const QString genreIds = result["genre_ids"].toString();
+    const QString type = result["type"].toString();
+    const int offset = result["offset"].toInt();
+    if (genreIds != m_lastAlbumGenreIds || type != m_lastAlbumType)
+        return;
+
+    const QJsonArray items = result["items"].toArray();
+    if (offset <= 0)
+        m_albumList->setAlbums(items);
+    else
+        m_albumList->addAlbums(items);
+
+    m_albumTotal = result["total"].toInt();
+    m_albumOffset = offset + items.size();
+    if (items.isEmpty())
+        m_albumTotal = m_albumOffset;
+    m_loadingAlbums = false;
+
+    if (m_collectAlbumsForDeepShuffle) {
+        if (m_albumOffset < m_albumTotal) {
+            requestAlbumsPage(m_lastAlbumGenreIds, m_lastAlbumType, m_albumOffset, true);
+            return;
+        }
+        m_collectAlbumsForDeepShuffle = false;
+        startDeepShuffleFromLoadedAlbums();
+        return;
+    }
+
+    // If the viewport is not scrollable yet, eagerly fetch more pages.
+    // Deferred: the scrollbar maximum isn't updated until after layout runs.
+    QTimer::singleShot(0, this, [this] {
+        QScrollBar *bar = m_albumList->verticalScrollBar();
+        if (bar && bar->maximum() == 0 && m_albumOffset < m_albumTotal)
+            requestAlbumsPage(m_lastAlbumGenreIds, m_lastAlbumType, m_albumOffset, true);
+    });
+}
+
+void GenreBrowserView::onFeaturedPlaylistsLoaded(const QJsonObject &result)
+{
+    m_resultsStack->setCurrentIndex(1);
+    const QString genreIds = result["genre_ids"].toString();
+    const QString type = result["type"].toString();
+    const int offset = result["offset"].toInt();
+    if (genreIds != m_lastPlaylistGenreIds || type != m_lastPlaylistType)
+        return;
+
+    const QJsonArray items = result["items"].toArray();
+    setPlaylistItems(items, offset > 0);
+    m_playlistTotal = result["total"].toInt();
+    m_playlistOffset = offset + items.size();
+    if (items.isEmpty())
+        m_playlistTotal = m_playlistOffset;
+    m_loadingPlaylists = false;
+
+    QTimer::singleShot(0, this, [this] {
+        QScrollBar *bar = m_playlistList->verticalScrollBar();
+        if (bar && bar->maximum() == 0 && m_playlistOffset < m_playlistTotal)
+            requestPlaylistsPage(m_lastPlaylistGenreIds, m_lastPlaylistType, m_lastPlaylistTags, m_lastPlaylistQuery, m_playlistOffset, true);
+    });
+}
+
+void GenreBrowserView::onDiscoverPlaylistsLoaded(const QJsonObject &result)
+{
+    m_resultsStack->setCurrentIndex(1);
+    const QString genreIds = result["genre_ids"].toString();
+    const QString tags = result["tags"].toString();
+    const int offset = result["offset"].toInt();
+    if (genreIds != m_lastPlaylistGenreIds || tags != m_lastPlaylistTags)
+        return;
+
+    const QJsonArray items = result["items"].toArray();
+    setPlaylistItems(items, offset > 0);
+    m_playlistTotal = result["total"].toInt();
+    m_playlistOffset = offset + items.size();
+    if (items.isEmpty())
+        m_playlistTotal = m_playlistOffset;
+    m_loadingPlaylists = false;
+
+    QTimer::singleShot(0, this, [this] {
+        QScrollBar *bar = m_playlistList->verticalScrollBar();
+        if (bar && bar->maximum() == 0 && m_playlistOffset < m_playlistTotal)
+            requestPlaylistsPage(m_lastPlaylistGenreIds, m_lastPlaylistType, m_lastPlaylistTags, m_lastPlaylistQuery, m_playlistOffset, true);
+    });
+}
+
+void GenreBrowserView::onPlaylistSearchLoaded(const QJsonObject &result)
+{
+    m_resultsStack->setCurrentIndex(1);
+    const QString query = result["query"].toString();
+    const int offset = result["offset"].toInt();
+    if (query != m_lastPlaylistQuery)
+        return;
+
+    const QJsonArray items = result["items"].toArray();
+    setPlaylistItems(items, offset > 0);
+    m_playlistTotal = result["total"].toInt();
+    m_playlistOffset = offset + items.size();
+    if (items.isEmpty())
+        m_playlistTotal = m_playlistOffset;
+    m_loadingPlaylists = false;
+
+    // Eagerly fill the viewport, then switch to a manual "Load more" button.
+    if (m_playlistOffset >= m_playlistTotal) {
+        m_loadMorePlaylistsBtn->hide();
+        m_searchViewportFilled = true;
+    } else if (!m_searchViewportFilled) {
+        QTimer::singleShot(0, this, [this] {
+            QScrollBar *bar = m_playlistList->verticalScrollBar();
+            if (bar && bar->maximum() == 0 && m_playlistOffset < m_playlistTotal) {
+                requestPlaylistsPage(m_lastPlaylistGenreIds, m_lastPlaylistType,
+                                     m_lastPlaylistTags, m_lastPlaylistQuery,
+                                     m_playlistOffset, true);
+            } else {
+                m_searchViewportFilled = true;
+                m_loadMorePlaylistsBtn->setVisible(m_playlistOffset < m_playlistTotal);
+            }
+        });
+    } else {
+        m_loadMorePlaylistsBtn->setVisible(true);
+    }
+}
+
+void GenreBrowserView::onSelectionChanged()
+{
+    m_collectAlbumsForDeepShuffle = false;
+
+    if (m_mode == BrowseMode::PlaylistSearch) {
+        m_resultsStack->setCurrentIndex(1);
+        m_playlistSearchLabel->setVisible(true);
+        m_playlistSearchBox->setVisible(true);
+        m_playlistSearchBtn->setVisible(true);
+        m_deepShuffleBtn->setVisible(false);
+        m_deepShuffleBtn->setEnabled(true);
+        m_deepShuffleBtn->setText(tr("⇄  Deep Shuffle"));
+        const QString query = m_playlistSearchBox->text().trimmed();
+        if (query.size() < 2) {
+            m_playlistList->clear();
+            m_playlistOffset = 0;
+            m_playlistTotal = 0;
+            m_loadingPlaylists = false;
+        } else {
+            requestPlaylistsPage(QString(), QStringLiteral("search"), QString(), query, 0, false);
+        }
+        return;
+    }
+
+    if (m_genreCombo->count() == 0)
+        return;
+
+    const QString genreIds = currentGenreIds();
+    const QString type = m_typeCombo->currentData().toString();
+    const QString kind = m_kindCombo->currentData().toString();
+    m_playlistSearchLabel->setVisible(false);
+    m_playlistSearchBox->setVisible(false);
+    m_playlistSearchBtn->setVisible(false);
+
+    if (kind == QStringLiteral("playlists")) {
+        m_resultsStack->setCurrentIndex(1);
+        m_deepShuffleBtn->setVisible(false);
+        m_deepShuffleBtn->setEnabled(true);
+        m_deepShuffleBtn->setText(tr("⇄  Deep Shuffle"));
+        if (type == QStringLiteral("discover-new"))
+            requestPlaylistsPage(genreIds, type, QStringLiteral("new"), QString(), 0, false);
+        else if (type == QStringLiteral("discover-hires"))
+            requestPlaylistsPage(genreIds, type, QStringLiteral("hi-res"), QString(), 0, false);
+        else if (type == QStringLiteral("discover-focus"))
+            requestPlaylistsPage(genreIds, type, QStringLiteral("focus"), QString(), 0, false);
+        else if (type == QStringLiteral("discover-qobuzdigs"))
+            requestPlaylistsPage(genreIds, type, QStringLiteral("qobuzdigs"), QString(), 0, false);
+        else
+            requestPlaylistsPage(genreIds, type, QString(), QString(), 0, false);
+    } else {
+        m_resultsStack->setCurrentIndex(0);
+        m_deepShuffleBtn->setVisible(m_mode == BrowseMode::Genres);
+        m_deepShuffleBtn->setEnabled(true);
+        m_deepShuffleBtn->setText(tr("⇄  Deep Shuffle"));
+        requestAlbumsPage(genreIds, type, 0, false);
+    }
+}
+
+QStringList GenreBrowserView::currentAlbumIds() const
+{
+    QStringList ids;
+    for (int i = 0; i < m_albumList->topLevelItemCount(); ++i) {
+        const QString id = m_albumList->topLevelItem(i)->data(1, Qt::UserRole).toString();
+        if (!id.isEmpty())
+            ids.push_back(id);
+    }
+    return ids;
+}
+
+void GenreBrowserView::startDeepShuffleFromLoadedAlbums()
+{
+    const QStringList albumIds = currentAlbumIds();
+    if (albumIds.isEmpty()) {
+        m_deepShuffleBtn->setEnabled(true);
+        m_deepShuffleBtn->setText(tr("⇄  Deep Shuffle"));
+        return;
+    }
+
+    m_waitingDeepShuffle = true;
+    m_deepShuffleBtn->setEnabled(false);
+    m_deepShuffleBtn->setText(tr("Loading…"));
+    m_backend->getAlbumsTracks(albumIds);
+}
+
+void GenreBrowserView::requestAlbumsPage(const QString &genreIds, const QString &type, int offset, bool append)
+{
+    if (append && m_loadingAlbums)
+        return;
+
+    if (!append) {
+        m_loadingAlbums = false;
+        m_albumOffset = 0;
+        m_albumTotal = 0;
+    }
+
+    m_lastAlbumGenreIds = genreIds;
+    m_lastAlbumType = type;
+    m_loadingAlbums = true;
+    m_backend->getFeaturedAlbums(genreIds, type, 50, static_cast<quint32>(offset));
+}
+
+void GenreBrowserView::requestPlaylistsPage(const QString &genreIds, const QString &type, const QString &tags, const QString &query, int offset, bool append)
+{
+    if (append && m_loadingPlaylists)
+        return;
+
+    if (!append) {
+        m_loadingPlaylists = false;
+        m_playlistOffset = 0;
+        m_playlistTotal = 0;
+        m_loadMorePlaylistsBtn->hide();
+        if (type == QStringLiteral("search"))
+            m_searchViewportFilled = false;
+    }
+
+    m_lastPlaylistGenreIds = genreIds;
+    m_lastPlaylistType = type;
+    m_lastPlaylistTags = tags;
+    m_lastPlaylistQuery = query;
+    m_loadingPlaylists = true;
+
+    if (type == QStringLiteral("search")) {
+        m_backend->searchPlaylists(query, 25, static_cast<quint32>(offset));
+    } else if (type.startsWith(QStringLiteral("discover-"))) {
+        m_backend->discoverPlaylists(genreIds, tags, 25, static_cast<quint32>(offset));
+    } else {
+        m_backend->getFeaturedPlaylists(genreIds, type, 25, static_cast<quint32>(offset));
+    }
+}
+
+void GenreBrowserView::onAlbumScroll(int value)
+{
+    if (m_mode != BrowseMode::Genres)
+        return;
+    if (m_kindCombo->currentData().toString() != QStringLiteral("albums"))
+        return;
+    if (m_loadingAlbums)
+        return;
+    if (m_albumOffset >= m_albumTotal)
+        return;
+
+    QScrollBar *bar = m_albumList->verticalScrollBar();
+    if (!bar || value < (bar->maximum() - 12))
+        return;
+
+    requestAlbumsPage(m_lastAlbumGenreIds, m_lastAlbumType, m_albumOffset, true);
+}
+
+void GenreBrowserView::onPlaylistScroll(int value)
+{
+    // Search results use a manual "Load more" button instead of infinite scroll.
+    if (m_lastPlaylistType == QStringLiteral("search"))
+        return;
+    if (m_loadingPlaylists)
+        return;
+    if (m_playlistOffset >= m_playlistTotal)
+        return;
+
+    QScrollBar *bar = m_playlistList->verticalScrollBar();
+    if (!bar || value < (bar->maximum() - 12))
+        return;
+
+    requestPlaylistsPage(
+        m_lastPlaylistGenreIds,
+        m_lastPlaylistType,
+        m_lastPlaylistTags,
+        m_lastPlaylistQuery,
+        m_playlistOffset,
+        true);
+}
+
+void GenreBrowserView::onDeepShuffleClicked()
+{
+    m_deepShuffleBtn->setEnabled(false);
+    m_deepShuffleBtn->setText(tr("Loading…"));
+
+    if (m_loadingAlbums) {
+        m_collectAlbumsForDeepShuffle = true;
+        return;
+    }
+
+    if (m_albumOffset < m_albumTotal) {
+        m_collectAlbumsForDeepShuffle = true;
+        requestAlbumsPage(m_lastAlbumGenreIds, m_lastAlbumType, m_albumOffset, true);
+        return;
+    }
+
+    startDeepShuffleFromLoadedAlbums();
+}
+
+bool GenreBrowserView::tryHandleDeepShuffleTracks(const QJsonArray &tracks)
+{
+    if (!m_waitingDeepShuffle)
+        return false;
+
+    m_waitingDeepShuffle = false;
+    m_collectAlbumsForDeepShuffle = false;
+    m_deepShuffleBtn->setEnabled(true);
+    m_deepShuffleBtn->setText(tr("⇄  Deep Shuffle"));
+
+    if (tracks.isEmpty())
+        return true;
+
+    m_queue->setContext(tracks, 0);
+    m_queue->shuffleNow();
+    const QJsonObject first = m_queue->current();
+    const qint64 id = static_cast<qint64>(first["id"].toDouble());
+    if (id > 0)
+        emit playTrackRequested(id);
+    return true;
+}
+
+void GenreBrowserView::onAlbumContextMenu(const QPoint &pos)
+{
+    QTreeWidgetItem *item = m_albumList->itemAt(pos);
+    if (!item)
+        return;
+
+    const QString albumId = item->data(1, Qt::UserRole).toString();
+    const qint64 artistId = item->data(2, Qt::UserRole).toLongLong();
+
+    QMenu menu(this);
+
+    auto *openAlbum = menu.addAction(tr("Open Album"));
+    connect(openAlbum, &QAction::triggered, this, [this, albumId] {
+        emit albumSelected(albumId);
+    });
+
+    if (artistId > 0) {
+        auto *openArtist = menu.addAction(tr("Open Artist"));
+        connect(openArtist, &QAction::triggered, this, [this, artistId] {
+            emit artistSelected(artistId);
+        });
+    }
+
+    menu.exec(m_albumList->viewport()->mapToGlobal(pos));
+}
+
+void GenreBrowserView::onPlaylistActivated(QTreeWidgetItem *item, int)
+{
+    if (!item)
+        return;
+
+    const qint64 playlistId = item->data(0, Qt::UserRole).toLongLong();
+    if (playlistId > 0)
+        emit playlistSelected(playlistId);
+}
+
+void GenreBrowserView::onPlaylistContextMenu(const QPoint &pos)
+{
+    QTreeWidgetItem *item = m_playlistList->itemAt(pos);
+    if (!item)
+        return;
+
+    const qint64 playlistId = item->data(0, Qt::UserRole).toLongLong();
+    if (playlistId <= 0)
+        return;
+
+    QMenu menu(this);
+    auto *openPlaylist = menu.addAction(tr("Open Playlist"));
+    connect(openPlaylist, &QAction::triggered, this, [this, playlistId] {
+        emit playlistSelected(playlistId);
+    });
+    menu.exec(m_playlistList->viewport()->mapToGlobal(pos));
+}
+
+void GenreBrowserView::setPlaylistItems(const QJsonArray &items, bool append)
+{
+    if (!append)
+        m_playlistList->clear();
+
+    QFont tagFont;
+    tagFont.setBold(true);
+    tagFont.setPointSizeF(tagFont.pointSizeF() * 0.85);
+
+    for (const auto &value : items) {
+        const QJsonObject playlist = value.toObject();
+        const qint64 playlistId = static_cast<qint64>(playlist["id"].toDouble());
+        const QString name = playlist["name"].toString();
+        const QString owner = playlist["owner"].toObject()["name"].toString();
+        const int tracksCount = playlist["tracks_count"].toInt();
+
+        auto *item = new QTreeWidgetItem(m_playlistList,
+            QStringList{QStringLiteral("P"), name, owner, tracksCount > 0 ? QString::number(tracksCount) : QString()});
+        item->setData(0, Qt::UserRole, playlistId);
+        item->setForeground(0, Colors::BadgeBlue);
+        item->setFont(0, tagFont);
+        item->setTextAlignment(0, Qt::AlignCenter);
+    }
+}
--- a/src/view/genrebrowser.hpp
+++ b/src/view/genrebrowser.hpp
@@ -0,0 +1,104 @@
+#pragma once
+
+#include "../backend/qobuzbackend.hpp"
+#include "../playqueue.hpp"
+#include "albumlistview.hpp"
+
+#include <QComboBox>
+#include <QLabel>
+#include <QLineEdit>
+#include <QJsonArray>
+#include <QJsonObject>
+#include <QSet>
+#include <QPushButton>
+#include <QStackedWidget>
+#include <QTreeWidget>
+#include <QWidget>
+#include <QScrollBar>
+
+class GenreBrowserView : public QWidget
+{
+    Q_OBJECT
+
+public:
+    enum class BrowseMode {
+        Genres,
+        PlaylistSearch,
+    };
+
+    explicit GenreBrowserView(QobuzBackend *backend, PlayQueue *queue, QWidget *parent = nullptr);
+
+    void ensureGenresLoaded();
+    void setBrowseMode(BrowseMode mode);
+    bool tryHandleDeepShuffleTracks(const QJsonArray &tracks);
+
+signals:
+    void albumSelected(const QString &albumId);
+    void artistSelected(qint64 artistId);
+    void playlistSelected(qint64 playlistId);
+    void playTrackRequested(qint64 trackId);
+
+private slots:
+    void onGenresLoaded(const QJsonObject &result);
+    void onFeaturedAlbumsLoaded(const QJsonObject &result);
+    void onFeaturedPlaylistsLoaded(const QJsonObject &result);
+    void onDiscoverPlaylistsLoaded(const QJsonObject &result);
+    void onPlaylistSearchLoaded(const QJsonObject &result);
+    void onSelectionChanged();
+    void onAlbumContextMenu(const QPoint &pos);
+    void onPlaylistActivated(QTreeWidgetItem *item, int column);
+    void onPlaylistContextMenu(const QPoint &pos);
+    void onDeepShuffleClicked();
+    void onAlbumScroll(int value);
+    void onPlaylistScroll(int value);
+
+private:
+    QobuzBackend *m_backend = nullptr;
+    PlayQueue *m_queue = nullptr;
+    QLabel *m_browseLabel = nullptr;
+    QLabel *m_genreLabel = nullptr;
+    QLabel *m_typeLabel = nullptr;
+    QLabel *m_playlistSearchLabel = nullptr;
+    QWidget *m_gapAfterKind = nullptr;
+    QWidget *m_gapAfterGenre = nullptr;
+    QComboBox *m_kindCombo = nullptr;
+    QComboBox *m_genreCombo = nullptr;
+    QComboBox *m_typeCombo = nullptr;
+    QLineEdit *m_playlistSearchBox = nullptr;
+    QPushButton *m_playlistSearchBtn = nullptr;
+    QPushButton *m_deepShuffleBtn = nullptr;
+    QStackedWidget *m_resultsStack = nullptr;
+    AlbumListView *m_albumList = nullptr;
+    QTreeWidget *m_playlistList = nullptr;
+    QPushButton *m_loadMorePlaylistsBtn = nullptr;
+    bool m_searchViewportFilled = false;
+    BrowseMode m_mode = BrowseMode::Genres;
+    bool m_genresLoaded = false;
+    int m_lastGenreComboIndex = 0;
+    QSet<qint64> m_multiGenreIds;
+    bool m_waitingDeepShuffle = false;
+    bool m_collectAlbumsForDeepShuffle = false;
+    bool m_loadingAlbums = false;
+    bool m_loadingPlaylists = false;
+    int m_albumOffset = 0;
+    int m_albumTotal = 0;
+    int m_playlistOffset = 0;
+    int m_playlistTotal = 0;
+    QString m_lastAlbumGenreIds;
+    QString m_lastAlbumType;
+    QString m_lastPlaylistGenreIds;
+    QString m_lastPlaylistType;
+    QString m_lastPlaylistTags;
+    QString m_lastPlaylistQuery;
+
+    void refreshModeUi();
+    void refreshGenreTypeChoices();
+    QString currentGenreIds() const;
+    QStringList currentAlbumIds() const;
+    void startDeepShuffleFromLoadedAlbums();
+    void requestAlbumsPage(const QString &genreIds, const QString &type, int offset, bool append);
+    void requestPlaylistsPage(const QString &genreIds, const QString &type, const QString &tags, const QString &query, int offset, bool append);
+    bool chooseMultiGenres();
+    void updateMultiGenreLabel();
+    void setPlaylistItems(const QJsonArray &items, bool append = false);
+};
--- a/src/view/maincontent.cpp
+++ b/src/view/maincontent.cpp
@@ -1,6 +1,7 @@
 #include "maincontent.hpp"

 #include <QVBoxLayout>
+#include <QPushButton>

 MainContent::MainContent(QobuzBackend *backend, PlayQueue *queue, QWidget *parent)
    : QWidget(parent)
@@ -15,68 +16,161 @@ MainContent::MainContent(QobuzBackend *backend, PlayQueue *queue, QWidget *paren
    m_welcome = new QLabel(
        tr("<h2>Welcome to Qobuz</h2>"
           "<p>Select something from the library on the left to get started,<br>"
-           "or use the search panel (🔍) to find music.</p>"),
+           "or use the search panel to find music.</p>"),
        this);
    m_welcome->setAlignment(Qt::AlignCenter);

-    m_tracks     = new List::Tracks(m_backend, queue, this);
+    // Tracks page: context header + track list
+    auto *tracksPage = new QWidget(this);
+    auto *tracksLayout = new QVBoxLayout(tracksPage);
+    tracksLayout->setContentsMargins(0, 0, 0, 0);
+    tracksLayout->setSpacing(0);
+
+    m_header = new TrackContextHeader(tracksPage);
+    m_header->hide();
+    m_tracks = new List::Tracks(m_backend, queue, tracksPage);
+    tracksLayout->addWidget(m_header);
+    tracksLayout->addWidget(m_tracks, 1);
+
+    QObject::connect(m_header->playButton(),    &QPushButton::clicked,
+                     [this] { m_tracks->playAll(false); });
+    QObject::connect(m_header->shuffleButton(), &QPushButton::clicked,
+                     [this] { m_tracks->playAll(true); });
+    QObject::connect(m_header->subtitleButton(), &QPushButton::clicked,
+                     [this] {
+        const qint64 id = m_header->artistId();
+        if (id > 0) emit artistRequested(id);
+    });
+    QObject::connect(m_header->followButton(), &QPushButton::clicked,
+                     [this] {
+        const qint64 id = m_header->playlistId();
+        if (id <= 0 || m_header->playlistOwned())
+            return;
+        emit playlistFollowToggled(id, !m_header->playlistFollowed());
+    });
+    QObject::connect(m_header->favButton(), &QPushButton::clicked,
+                     [this] {
+        const QString albumId = m_header->albumId();
+        if (albumId.isEmpty())
+            return;
+        emit albumFavoriteToggled(albumId, !m_header->albumFaved());
+    });
+
    m_albumList  = new AlbumListView(this);
    m_artistList = new ArtistListView(this);
-    m_artistView = new ArtistView(this);
+    m_artistView = new ArtistView(backend, queue, this);
+    m_genreBrowser = new GenreBrowserView(backend, queue, this);

-    m_stack->addWidget(m_welcome);    // 0
-    m_stack->addWidget(m_tracks);     // 1
-    m_stack->addWidget(m_albumList);  // 2
-    m_stack->addWidget(m_artistList); // 3
-    m_stack->addWidget(m_artistView); // 4
+    m_stack->addWidget(m_welcome);      // PageWelcome
+    m_stack->addWidget(tracksPage);     // PageTracks
+    m_stack->addWidget(m_albumList);    // PageAlbumList
+    m_stack->addWidget(m_artistList);   // PageArtistList
+    m_stack->addWidget(m_artistView);   // PageArtistDetail
+    m_stack->addWidget(m_genreBrowser); // PageGenreBrowser

-    m_stack->setCurrentIndex(0);
+    m_stack->setCurrentIndex(PageWelcome);

    connect(m_albumList,  &AlbumListView::albumSelected,   this, &MainContent::albumRequested);
    connect(m_artistList, &ArtistListView::artistSelected, this, &MainContent::artistRequested);
    connect(m_artistView, &ArtistView::albumSelected,      this, &MainContent::albumRequested);
+    connect(m_artistView, &ArtistView::playTrackRequested, this, &MainContent::playTrackRequested);
+    connect(m_genreBrowser, &GenreBrowserView::albumSelected, this, &MainContent::albumRequested);
+    connect(m_genreBrowser, &GenreBrowserView::artistSelected, this, &MainContent::artistRequested);
+    connect(m_genreBrowser, &GenreBrowserView::playlistSelected, this, &MainContent::playlistRequested);
+    connect(m_genreBrowser, &GenreBrowserView::playTrackRequested, this, &MainContent::playTrackRequested);
 }

-void MainContent::showWelcome()       { m_stack->setCurrentIndex(0); }
+void MainContent::showWelcome()       { m_stack->setCurrentIndex(PageWelcome); }

 void MainContent::showAlbum(const QJsonObject &album)
 {
+    QString albumId = album["id"].toString();
+    if (albumId.isEmpty() && album["id"].isDouble())
+        albumId = QString::number(static_cast<qint64>(album["id"].toDouble()));
+    m_header->setAlbum(album, m_favAlbumIds.contains(albumId));
    m_tracks->loadAlbum(album);
-    m_stack->setCurrentIndex(1);
+    m_stack->setCurrentIndex(PageTracks);
 }

-void MainContent::showPlaylist(const QJsonObject &playlist)
+void MainContent::showPlaylist(const QJsonObject &playlist, bool isFollowed, bool isOwned)
 {
+    m_header->setPlaylist(playlist, isFollowed, isOwned);
    m_tracks->loadPlaylist(playlist);
-    m_stack->setCurrentIndex(1);
+    m_stack->setCurrentIndex(PageTracks);
 }

 void MainContent::showFavTracks(const QJsonObject &result)
 {
+    m_header->hide();
    m_tracks->loadTracks(result["items"].toArray());
-    m_stack->setCurrentIndex(1);
+    m_stack->setCurrentIndex(PageTracks);
 }

 void MainContent::showSearchTracks(const QJsonArray &tracks)
 {
+    m_header->hide();
    m_tracks->loadSearchTracks(tracks);
-    m_stack->setCurrentIndex(1);
+    m_stack->setCurrentIndex(PageTracks);
 }

 void MainContent::showFavAlbums(const QJsonObject &result)
 {
    m_albumList->setAlbums(result["items"].toArray());
-    m_stack->setCurrentIndex(2);
+    m_stack->setCurrentIndex(PageAlbumList);
 }

 void MainContent::showFavArtists(const QJsonObject &result)
 {
    m_artistList->setArtists(result["items"].toArray());
-    m_stack->setCurrentIndex(3);
+    m_stack->setCurrentIndex(PageArtistList);
 }

 void MainContent::showArtist(const QJsonObject &artist)
 {
    m_artistView->setArtist(artist);
-    m_stack->setCurrentIndex(4);
+    m_stack->setCurrentIndex(PageArtistDetail);
+}
+
+void MainContent::updateArtistReleases(const QString &releaseType, const QJsonArray &items, bool hasMore, int offset)
+{
+    m_artistView->setReleases(releaseType, items, hasMore, offset);
+}
+
+void MainContent::setFavArtistIds(const QSet<qint64> &ids)
+{
+    m_artistView->setFavArtistIds(ids);
+}
+
+void MainContent::setFavAlbumIds(const QSet<QString> &ids)
+{
+    m_favAlbumIds = ids;
+    const QString shownAlbumId = m_header->albumId();
+    if (!shownAlbumId.isEmpty())
+        m_header->setAlbumFaved(m_favAlbumIds.contains(shownAlbumId));
+}
+
+void MainContent::onDeepShuffleTracks(const QJsonArray &tracks)
+{
+    if (m_genreBrowser->tryHandleDeepShuffleTracks(tracks))
+        return;
+    m_artistView->onDeepShuffleTracks(tracks);
+}
+
+void MainContent::showGenreBrowser()
+{
+    m_genreBrowser->ensureGenresLoaded();
+    m_genreBrowser->setBrowseMode(GenreBrowserView::BrowseMode::Genres);
+    m_stack->setCurrentIndex(PageGenreBrowser);
+}
+
+void MainContent::showPlaylistBrowser()
+{
+    m_genreBrowser->ensureGenresLoaded();
+    m_genreBrowser->setBrowseMode(GenreBrowserView::BrowseMode::PlaylistSearch);
+    m_stack->setCurrentIndex(PageGenreBrowser);
+}
+
+void MainContent::setCurrentPlaylistFollowed(bool followed)
+{
+    m_header->setPlaylistFollowed(followed);
 }
--- a/src/view/maincontent.hpp
+++ b/src/view/maincontent.hpp
@@ -6,12 +6,15 @@
 #include "albumlistview.hpp"
 #include "artistlistview.hpp"
 #include "artistview.hpp"
+#include "genrebrowser.hpp"
+#include "trackcontextheader.hpp"

 #include <QWidget>
 #include <QLabel>
 #include <QStackedWidget>
 #include <QJsonObject>
 #include <QJsonArray>
+#include <QSet>

 class MainContent : public QWidget
 {
@@ -24,23 +27,48 @@ public:

    void showWelcome();
    void showAlbum(const QJsonObject &album);
-    void showPlaylist(const QJsonObject &playlist);
+    void showPlaylist(const QJsonObject &playlist, bool isFollowed, bool isOwned);
    void showFavTracks(const QJsonObject &result);
    void showSearchTracks(const QJsonArray &tracks);
    void showFavAlbums(const QJsonObject &result);
    void showFavArtists(const QJsonObject &result);
    void showArtist(const QJsonObject &artist);
+    void updateArtistReleases(const QString &releaseType, const QJsonArray &items, bool hasMore, int offset);
+    void setFavAlbumIds(const QSet<QString> &ids);
+    void setFavArtistIds(const QSet<qint64> &ids);
+    void onDeepShuffleTracks(const QJsonArray &tracks);
+    void showGenreBrowser();
+    void showPlaylistBrowser();
+    void setCurrentPlaylistFollowed(bool followed);
+
+    ArtistView *artistView() const { return m_artistView; }

 signals:
    void albumRequested(const QString &albumId);
    void artistRequested(qint64 artistId);
+    void albumFavoriteToggled(const QString &albumId, bool favorite);
+    void playlistRequested(qint64 playlistId);
+    void playlistFollowToggled(qint64 playlistId, bool follow);
+    void playTrackRequested(qint64 trackId);

 private:
+    enum StackPage {
+        PageWelcome      = 0,
+        PageTracks       = 1,
+        PageAlbumList    = 2,
+        PageArtistList   = 3,
+        PageArtistDetail = 4,
+        PageGenreBrowser = 5,
+    };
+
    QobuzBackend        *m_backend    = nullptr;
    QStackedWidget      *m_stack      = nullptr;
    QLabel              *m_welcome    = nullptr;
    List::Tracks        *m_tracks     = nullptr;
+    TrackContextHeader  *m_header     = nullptr;
    AlbumListView       *m_albumList  = nullptr;
    ArtistListView      *m_artistList = nullptr;
    ArtistView          *m_artistView = nullptr;
+    GenreBrowserView    *m_genreBrowser = nullptr;
+    QSet<QString>        m_favAlbumIds;
 };
--- a/src/view/maintoolbar.cpp
+++ b/src/view/maintoolbar.cpp
@@ -2,9 +2,11 @@
 #include "../util/settings.hpp"
 #include "../model/tracklistmodel.hpp"

-#include <QWidget>
-#include <QHBoxLayout>
 #include <QNetworkRequest>
+#include <QResizeEvent>
+#include <QMenu>
+#include <QDateTime>
+#include <QSignalBlocker>

 MainToolBar::MainToolBar(QobuzBackend *backend, PlayQueue *queue, QWidget *parent)
    : QToolBar(parent)
@@ -19,17 +21,41 @@ MainToolBar::MainToolBar(QobuzBackend *backend, PlayQueue *queue, QWidget *paren
    m_nam = new QNetworkAccessManager(this);
    connect(m_nam, &QNetworkAccessManager::finished, this, &MainToolBar::onAlbumArtReady);

-    // --- Album art thumbnail ---
+    // ---- Album art ----
    m_artLabel = new QLabel(this);
    m_artLabel->setFixedSize(36, 36);
    m_artLabel->setScaledContents(true);
-    m_artLabel->setStyleSheet("border: 1px solid #444; background: #1a1a1a;");
-    m_artLabel->setPixmap(QIcon(":/res/icons/view-media-album-cover.svg")
-                              .pixmap(32, 32));
+    m_artLabel->setStyleSheet("border: 1px solid #444; background: #1a1a1a; border-radius: 3px;");
+    m_artLabel->setPixmap(QIcon(":/res/icons/view-media-album-cover.svg").pixmap(32, 32));
    addWidget(m_artLabel);
+
+    // ---- Track label ----
+    m_trackLabel = new QLabel(tr("Not playing"), this);
+    m_trackLabel->setMinimumWidth(80);
+    m_trackLabel->setMaximumWidth(200);
+    m_trackLabel->setAlignment(Qt::AlignVCenter | Qt::AlignLeft);
+    m_trackLabel->setTextFormat(Qt::RichText);
+    addWidget(m_trackLabel);
+
+    m_trackLabel->setContextMenuPolicy(Qt::CustomContextMenu);
+    connect(m_trackLabel, &QLabel::customContextMenuRequested,
+            this, [this](const QPoint &pos) {
+        if (m_currentTrack.isEmpty()) return;
+        QMenu menu(this);
+        const QString albumId  = m_currentTrack["album"].toObject()["id"].toString();
+        const qint64  artistId = static_cast<qint64>(
+            m_currentTrack["performer"].toObject()["id"].toDouble());
+        if (!albumId.isEmpty())
+            menu.addAction(tr("Go to Album"),  this, [this, albumId]  { emit albumRequested(albumId);  });
+        if (artistId > 0)
+            menu.addAction(tr("Go to Artist"), this, [this, artistId] { emit artistRequested(artistId); });
+        if (!menu.isEmpty())
+            menu.exec(m_trackLabel->mapToGlobal(pos));
+    });
+
    addSeparator();

-    // --- Playback controls ---
+    // ---- Media controls ----
    m_previous = addAction(Icon::previous(), tr("Previous"));
    connect(m_previous, &QAction::triggered, this, &MainToolBar::onPrevious);

@@ -39,67 +65,82 @@ MainToolBar::MainToolBar(QobuzBackend *backend, PlayQueue *queue, QWidget *paren
    m_next = addAction(Icon::next(), tr("Next"));
    connect(m_next, &QAction::triggered, this, &MainToolBar::onNext);

-    addSeparator();
+    // ---- Left spacer (pushes progress toward center) ----
+    m_leftSpacer = new QWidget(this);
+    m_leftSpacer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
+    addWidget(m_leftSpacer);

-    // --- Track info label ---
-    m_trackLabel = new QLabel(tr("Not playing"), this);
-    m_trackLabel->setMinimumWidth(180);
-    m_trackLabel->setMaximumWidth(340);
-    m_trackLabel->setAlignment(Qt::AlignVCenter | Qt::AlignLeft);
-    addWidget(m_trackLabel);
-
-    addSeparator();
-
-    // --- Progress slider ---
+    // ---- Progress slider ----
    m_progress = new ClickableSlider(Qt::Horizontal, this);
    m_progress->setRange(0, 1000);
    m_progress->setValue(0);
-    m_progress->setMinimumWidth(160);
-    m_progress->setMaximumWidth(380);
+    m_progress->setMinimumWidth(200);
+    m_progress->setMaximumWidth(500);
    addWidget(m_progress);
-
    connect(m_progress, &QSlider::sliderPressed,  this, [this] { m_seeking = true; });
    connect(m_progress, &QSlider::sliderReleased, this, &MainToolBar::onProgressReleased);

-    m_timeLabel = new QLabel("0:00 / 0:00", this);
-    addWidget(m_timeLabel);
+    // ---- Position label ----
+    m_position = new QLabel(QStringLiteral("0:00 / 0:00"), this);
+    m_position->setAlignment(Qt::AlignVCenter | Qt::AlignLeft);
+    m_position->setMinimumWidth(80);
+    addWidget(m_position);

-    addSeparator();
+    // ---- Right spacer (mirrors left spacer) ----
+    m_rightSpacer = new QWidget(this);
+    m_rightSpacer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
+    addWidget(m_rightSpacer);

-    // --- Volume ---
-    m_volume = new VolumeButton(this);
-    m_volume->setValue(AppSettings::instance().volume());
-    addWidget(m_volume);
-    connect(m_volume, &VolumeButton::volumeChanged, this, &MainToolBar::onVolumeChanged);
-
-    addSeparator();
-
-    // --- Shuffle ---
+    // ---- Shuffle ----
    m_shuffle = addAction(Icon::get(QStringLiteral("media-playlist-shuffle")), tr("Shuffle"));
    m_shuffle->setCheckable(true);
    connect(m_shuffle, &QAction::toggled, this, &MainToolBar::onShuffleToggled);

-    addSeparator();
+    m_autoplay = addAction(Icon::autoplay(), tr("Autoplay"));
+    m_autoplay->setCheckable(true);
+    m_autoplay->setChecked(AppSettings::instance().autoplayEnabled());
+    connect(m_autoplay, &QAction::toggled, this, &MainToolBar::onAutoplayToggled);

-    // --- Queue toggle ---
+    // ---- Volume ----
+    m_volume = new VolumeButton(this);
+    addWidget(m_volume);
+    connect(m_volume, &VolumeButton::volumeChanged, this, &MainToolBar::onVolumeChanged);
+    // Set volume after connecting so the backend receives the initial value
+    m_volume->setValue(AppSettings::instance().volume());
+    m_backend->setVolume(AppSettings::instance().volume());
+
+    // ---- Queue toggle ----
    m_queueBtn = addAction(Icon::queue(), tr("Queue"));
    m_queueBtn->setCheckable(true);
    connect(m_queueBtn, &QAction::toggled, this, &MainToolBar::queueToggled);

-    // --- Search toggle ---
+    // ---- Search toggle ----
    m_search = addAction(Icon::search(), tr("Search"));
    m_search->setCheckable(true);
    connect(m_search, &QAction::toggled, this, &MainToolBar::searchToggled);

-    // --- Backend signals ---
+    // ---- Backend signals ----
    connect(m_backend, &QobuzBackend::stateChanged,    this, &MainToolBar::onBackendStateChanged);
    connect(m_backend, &QobuzBackend::trackChanged,    this, &MainToolBar::onTrackChanged);
    connect(m_backend, &QobuzBackend::positionChanged, this, &MainToolBar::onPositionChanged);
    connect(m_backend, &QobuzBackend::trackFinished,   this, &MainToolBar::onTrackFinished);
+    connect(m_backend, &QobuzBackend::trackTransitioned, this, &MainToolBar::onTrackTransitioned);
+    connect(m_backend, &QobuzBackend::dynamicSuggestionsLoaded,
+            this, &MainToolBar::onDynamicSuggestionsLoaded);

-    // --- Queue signals ---
+    // ---- Queue signals ----
    connect(m_queue, &PlayQueue::queueChanged, this, &MainToolBar::onQueueChanged);
-    onQueueChanged(); // initialise button states
+    onQueueChanged();
+}
+
+// ---- resize: keep spacers equal so progress stays centred ----
+
+void MainToolBar::resizeEvent(QResizeEvent *event)
+{
+    QToolBar::resizeEvent(event);
+    const int spacerWidth = event->size().width() / 6;
+    m_leftSpacer->setMinimumWidth(spacerWidth);
+    m_rightSpacer->setMinimumWidth(spacerWidth);
 }

 // ---- public ----
@@ -113,6 +154,7 @@ void MainToolBar::setPlaying(bool playing)

 void MainToolBar::setCurrentTrack(const QJsonObject &track)
 {
+    m_currentTrack = track;
    const QString title  = track["title"].toString();
    const QString artist = track["performer"].toObject()["name"].toString().isEmpty()
        ? track["album"].toObject()["artist"].toObject()["name"].toString()
@@ -121,12 +163,13 @@ void MainToolBar::setCurrentTrack(const QJsonObject &track)
    if (title.isEmpty()) {
        m_trackLabel->setText(tr("Not playing"));
    } else if (artist.isEmpty()) {
-        m_trackLabel->setText(title);
+        m_trackLabel->setText(title.toHtmlEscaped());
    } else {
-        m_trackLabel->setText(QStringLiteral("%1 — %2").arg(artist, title));
+        m_trackLabel->setText(QStringLiteral("<span style='font-weight:600;'>%1</span>"
+            "<br><span style='font-size:small; color:#aaa;'>%2</span>")
+            .arg(title.toHtmlEscaped(), artist.toHtmlEscaped()));
    }

-    // Album art
    const QString artUrl = track["album"].toObject()["image"].toObject()["small"].toString();
    if (!artUrl.isEmpty() && artUrl != m_currentArtUrl) {
        m_currentArtUrl = artUrl;
@@ -137,17 +180,29 @@ void MainToolBar::setCurrentTrack(const QJsonObject &track)
 void MainToolBar::updateProgress(quint64 position, quint64 duration)
 {
    if (m_seeking) return;
-    const int sliderPos = duration > 0
-        ? static_cast<int>(position * 1000 / duration) : 0;
+    const int sliderPos = (duration > 0)
+        ? static_cast<int>(qMin(position * 1000 / duration, quint64(1000))) : 0;
    m_progress->blockSignals(true);
    m_progress->setValue(sliderPos);
    m_progress->blockSignals(false);
-    m_timeLabel->setText(
+    m_position->setText(
        QStringLiteral("%1 / %2")
            .arg(TrackListModel::formatDuration(static_cast<qint64>(position)),
                 TrackListModel::formatDuration(static_cast<qint64>(duration))));
 }

+void MainToolBar::setQueueToggleChecked(bool checked)
+{
+    const QSignalBlocker blocker(m_queueBtn);
+    m_queueBtn->setChecked(checked);
+}
+
+void MainToolBar::setSearchToggleChecked(bool checked)
+{
+    const QSignalBlocker blocker(m_search);
+    m_search->setChecked(checked);
+}
+
 // ---- private slots ----

 void MainToolBar::onPlayPause()
@@ -180,6 +235,10 @@ void MainToolBar::onProgressReleased()
    const quint64 dur = m_backend->duration();
    if (dur > 0) {
        const quint64 target = dur * static_cast<quint64>(m_progress->value()) / 1000;
+        m_seekPending = true;
+        m_pendingSeekTarget = target;
+        m_pendingSeekStartedMs = QDateTime::currentMSecsSinceEpoch();
+        updateProgress(target, dur);
        m_backend->seek(target);
    }
 }
@@ -197,23 +256,64 @@ void MainToolBar::onBackendStateChanged(const QString &state)

 void MainToolBar::onTrackChanged(const QJsonObject &track)
 {
+    m_seekPending = false;
+    m_seeking = false;
    setCurrentTrack(track);
+
+    const qint64 trackId = static_cast<qint64>(track["id"].toDouble());
+    if (trackId <= 0)
+        return;
+
+    const qint64 artistId = static_cast<qint64>(
+        track["performer"].toObject()["id"].toDouble());
+    const qint64 genreId = static_cast<qint64>(
+        track["album"].toObject()["genre"].toObject()["id"].toDouble());
+    const qint64 labelId = static_cast<qint64>(
+        track["album"].toObject()["label"].toObject()["id"].toDouble());
+
+    m_recentTracks.append(RecentTrackSeed{trackId, artistId, genreId, labelId});
+    while (m_recentTracks.size() > 32)
+        m_recentTracks.removeFirst();
 }

 void MainToolBar::onPositionChanged(quint64 position, quint64 duration)
 {
+    if (m_seekPending) {
+        const qint64 nowMs = QDateTime::currentMSecsSinceEpoch();
+        const quint64 delta = (position > m_pendingSeekTarget)
+            ? (position - m_pendingSeekTarget)
+            : (m_pendingSeekTarget - position);
+
+        if (delta > 2 && (nowMs - m_pendingSeekStartedMs) < 1500)
+            return;
+
+        m_seekPending = false;
+    }
+
    updateProgress(position, duration);
 }

 void MainToolBar::onTrackFinished()
 {
-    // Auto-advance queue
    if (m_queue->canGoNext()) {
        onNext();
+    } else if (AppSettings::instance().autoplayEnabled()) {
+        requestAutoplaySuggestions();
    } else {
        setPlaying(false);
        m_progress->setValue(0);
-        m_timeLabel->setText("0:00 / 0:00");
+        m_position->setText(QStringLiteral("0:00 / 0:00"));
+    }
+}
+
+void MainToolBar::onTrackTransitioned()
+{
+    if (m_queue->canGoNext()) {
+        const QJsonObject track = m_queue->advance();
+        setCurrentTrack(track);
+        m_backend->manuallyEmitTrackChanged(track);
+    } else {
+        onTrackFinished();
    }
 }

@@ -228,6 +328,71 @@ void MainToolBar::onShuffleToggled(bool checked)
    m_queue->setShuffle(checked);
 }

+void MainToolBar::onAutoplayToggled(bool checked)
+{
+    AppSettings::instance().setAutoplayEnabled(checked);
+}
+
+void MainToolBar::requestAutoplaySuggestions()
+{
+    if (m_fetchingAutoplay)
+        return;
+
+    QJsonArray listenedIds;
+    QJsonArray analyze;
+
+    const int n = m_recentTracks.size();
+    for (int i = 0; i < n; ++i) {
+        const RecentTrackSeed &t = m_recentTracks.at(i);
+
+        listenedIds.append(t.trackId);
+
+        if (i < qMax(0, n - 5))
+            continue;
+
+        analyze.append(QJsonObject{
+            {"track_id", t.trackId},
+            {"artist_id", t.artistId},
+            {"genre_id", t.genreId},
+            {"label_id", t.labelId},
+        });
+    }
+
+    if (listenedIds.isEmpty() || analyze.isEmpty()) {
+        setPlaying(false);
+        m_progress->setValue(0);
+        m_position->setText(QStringLiteral("0:00 / 0:00"));
+        return;
+    }
+
+    m_fetchingAutoplay = true;
+    m_backend->getDynamicSuggestions(listenedIds, analyze, 50);
+}
+
+void MainToolBar::onDynamicSuggestionsLoaded(const QJsonObject &result)
+{
+    m_fetchingAutoplay = false;
+
+    QJsonArray items;
+    if (result["tracks"].isObject())
+        items = result["tracks"].toObject()["items"].toArray();
+    if (items.isEmpty() && result["dynamic"].isObject())
+        items = result["dynamic"].toObject()["items"].toArray();
+    if (items.isEmpty())
+        items = result["items"].toArray();
+
+    if (items.isEmpty()) {
+        setPlaying(false);
+        m_progress->setValue(0);
+        m_position->setText(QStringLiteral("0:00 / 0:00"));
+        return;
+    }
+
+    m_queue->appendToContext(items);
+    if (m_queue->canGoNext())
+        onNext();
+}
+
 void MainToolBar::fetchAlbumArt(const QString &url)
 {
    m_nam->get(QNetworkRequest(QUrl(url)));
--- a/src/view/maintoolbar.hpp
+++ b/src/view/maintoolbar.hpp
@@ -7,12 +7,12 @@
 #include "../util/icon.hpp"

 #include <QToolBar>
-#include <QToolButton>
 #include <QLabel>
 #include <QAction>
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QJsonObject>
+#include <QVector>

 class MainToolBar : public QToolBar
 {
@@ -24,10 +24,17 @@ public:
    void setPlaying(bool playing);
    void setCurrentTrack(const QJsonObject &track);
    void updateProgress(quint64 position, quint64 duration);
+    void setQueueToggleChecked(bool checked);
+    void setSearchToggleChecked(bool checked);

 signals:
    void searchToggled(bool visible);
    void queueToggled(bool visible);
+    void albumRequested(const QString &albumId);
+    void artistRequested(qint64 artistId);
+
+protected:
+    void resizeEvent(QResizeEvent *event) override;

 private slots:
    void onPlayPause();
@@ -40,31 +47,51 @@ private slots:
    void onTrackChanged(const QJsonObject &track);
    void onPositionChanged(quint64 position, quint64 duration);
    void onTrackFinished();
+    void onTrackTransitioned();
    void onQueueChanged();
    void onShuffleToggled(bool checked);
+    void onAutoplayToggled(bool checked);
+    void onDynamicSuggestionsLoaded(const QJsonObject &result);

    void fetchAlbumArt(const QString &url);
    void onAlbumArtReady(QNetworkReply *reply);

 private:
+    struct RecentTrackSeed {
+        qint64 trackId = 0;
+        qint64 artistId = 0;
+        qint64 genreId = 0;
+        qint64 labelId = 0;
+    };
+
    QobuzBackend *m_backend = nullptr;
    PlayQueue    *m_queue   = nullptr;

    QLabel          *m_artLabel    = nullptr;
    QLabel          *m_trackLabel  = nullptr;
-    ClickableSlider *m_progress   = nullptr;
-    QLabel          *m_timeLabel  = nullptr;
-    VolumeButton    *m_volume     = nullptr;
-
    QAction         *m_previous    = nullptr;
    QAction         *m_playPause   = nullptr;
    QAction         *m_next        = nullptr;
+    QWidget         *m_leftSpacer  = nullptr;
+    ClickableSlider *m_progress    = nullptr;
+    QLabel          *m_position    = nullptr;
+    QWidget         *m_rightSpacer = nullptr;
    QAction         *m_shuffle     = nullptr;
+    QAction         *m_autoplay    = nullptr;
+    VolumeButton    *m_volume      = nullptr;
    QAction         *m_queueBtn    = nullptr;
    QAction         *m_search      = nullptr;

    QNetworkAccessManager *m_nam = nullptr;
    QString     m_currentArtUrl;
+    QJsonObject m_currentTrack;
+    QVector<RecentTrackSeed> m_recentTracks;
    bool        m_playing = false;
    bool        m_seeking = false;
+    bool        m_seekPending = false;
+    quint64     m_pendingSeekTarget = 0;
+    qint64      m_pendingSeekStartedMs = 0;
+    bool        m_fetchingAutoplay = false;
+
+    void requestAutoplaySuggestions();
 };
--- a/src/view/queuepanel.cpp
+++ b/src/view/queuepanel.cpp
@@ -4,10 +4,118 @@
 #include <QHBoxLayout>
 #include <QMenu>
 #include <QAction>
+#include <QPainter>
+#include <QStyledItemDelegate>
+#include <QApplication>

 static constexpr int UpcomingIndexRole = Qt::UserRole + 1;
 static constexpr int IsPlayNextRole    = Qt::UserRole + 2;
-static constexpr int TrackJsonRole     = Qt::UserRole + 3;
+static constexpr int ArtistRole        = Qt::UserRole + 3;
+static constexpr int DurationRole      = Qt::UserRole + 4;
+
+// ---- Custom delegate -------------------------------------------------------
+
+class QueueDelegate : public QStyledItemDelegate
+{
+public:
+    explicit QueueDelegate(QObject *parent = nullptr) : QStyledItemDelegate(parent) {}
+
+    QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &) const override
+    {
+        return QSize(0, QFontMetrics(option.font).height() + 4);
+    }
+
+    void paint(QPainter *p, const QStyleOptionViewItem &option,
+               const QModelIndex &index) const override
+    {
+        p->save();
+
+        QStyle *style = option.widget ? option.widget->style() : QApplication::style();
+        style->drawPrimitive(QStyle::PE_PanelItemViewItem, &option, p, option.widget);
+
+        const bool    isPlayNext = index.data(IsPlayNextRole).toBool();
+        const QString title      = index.data(Qt::DisplayRole).toString();
+        const QString artist     = index.data(ArtistRole).toString();
+        const int     dur        = index.data(DurationRole).toInt();
+
+        const QRect r = option.rect.adjusted(10, 0, -10, 0);
+
+        // Duration right-aligned
+        QString durStr;
+        if (dur > 0) {
+            const int m = dur / 60, s = dur % 60;
+            durStr = QStringLiteral("%1:%2").arg(m).arg(s, 2, 10, QLatin1Char('0'));
+        }
+
+        const QPalette &pal = option.palette;
+        const bool selected = option.state & QStyle::State_Selected;
+        QColor titleColor   = selected ? pal.highlightedText().color() : pal.text().color();
+        QColor dimColor     = titleColor;
+        dimColor.setAlpha(150);
+
+        if (isPlayNext && !selected)
+            titleColor = titleColor.lighter(130);
+
+        QFont titleFont = option.font;
+        titleFont.setWeight(QFont::Medium);
+
+        QFont subFont = option.font;
+        subFont.setPointSizeF(option.font.pointSizeF() * 0.85);
+
+        // Draw duration on the far right
+        int durW = 0;
+        if (!durStr.isEmpty()) {
+            durW = QFontMetrics(subFont).horizontalAdvance(durStr) + 6;
+            p->setFont(subFont);
+            p->setPen(dimColor);
+            p->drawText(QRect(r.right() - durW, r.top(), durW, r.height()),
+                Qt::AlignRight | Qt::AlignVCenter, durStr);
+        }
+
+        // Available width for title + separator + artist
+        const int available = r.width() - durW;
+
+        const QFontMetrics titleFm(titleFont);
+        const QFontMetrics subFm(subFont);
+
+        const QString sep = artist.isEmpty() ? QString() : QStringLiteral("  ·  ");
+        const int sepW = sep.isEmpty() ? 0 : subFm.horizontalAdvance(sep);
+
+        // Title gets up to 60% of available, artist gets the rest
+        const int maxTitle  = qMax(0, available * 6 / 10 - sepW);
+        const int maxArtist = qMax(0, available - sepW
+            - qMin(titleFm.horizontalAdvance(title), maxTitle));
+
+        const QString elidedTitle = titleFm.elidedText(title, Qt::ElideRight, maxTitle);
+        const int drawnTitleW     = titleFm.horizontalAdvance(elidedTitle);
+
+        int x = r.left();
+
+        // Title
+        p->setFont(titleFont);
+        p->setPen(titleColor);
+        p->drawText(x, r.top(), drawnTitleW, r.height(),
+            Qt::AlignLeft | Qt::AlignVCenter, elidedTitle);
+        x += drawnTitleW;
+
+        // Separator + artist
+        if (!artist.isEmpty()) {
+            p->setFont(subFont);
+            p->setPen(dimColor);
+            p->drawText(x, r.top(), sepW, r.height(),
+                Qt::AlignLeft | Qt::AlignVCenter, sep);
+            x += sepW;
+
+            const QString elidedArtist = subFm.elidedText(artist, Qt::ElideRight, maxArtist);
+            p->drawText(x, r.top(), maxArtist, r.height(),
+                Qt::AlignLeft | Qt::AlignVCenter, elidedArtist);
+        }
+
+        p->restore();
+    }
+};
+
+// ---- QueuePanel ------------------------------------------------------------

 QueuePanel::QueuePanel(PlayQueue *queue, QWidget *parent)
    : QDockWidget(tr("Queue"), parent)
@@ -21,7 +129,6 @@ QueuePanel::QueuePanel(PlayQueue *queue, QWidget *parent)
    layout->setContentsMargins(4, 4, 4, 4);
    layout->setSpacing(4);

-    // Header row: count label + Clear button
    auto *headerRow = new QHBoxLayout;
    m_countLabel = new QLabel(tr("Up next: 0 tracks"), container);
    m_clearBtn   = new QPushButton(tr("Clear"), container);
@@ -35,21 +142,17 @@ QueuePanel::QueuePanel(PlayQueue *queue, QWidget *parent)
    m_list->setContextMenuPolicy(Qt::CustomContextMenu);
    m_list->setDragDropMode(QAbstractItemView::InternalMove);
    m_list->setDefaultDropAction(Qt::MoveAction);
+    m_list->setItemDelegate(new QueueDelegate(m_list));
    layout->addWidget(m_list, 1);

    setWidget(container);
    setMinimumWidth(200);

    connect(m_queue, &PlayQueue::queueChanged, this, &QueuePanel::refresh);
-    connect(m_clearBtn, &QPushButton::clicked, this, [this] {
-        m_queue->clearUpcoming();
-    });
-    connect(m_list, &QListWidget::itemDoubleClicked,
-            this, &QueuePanel::onItemDoubleClicked);
-    connect(m_list, &QListWidget::customContextMenuRequested,
-            this, &QueuePanel::onContextMenu);
-    connect(m_list->model(), &QAbstractItemModel::rowsMoved,
-            this, &QueuePanel::onRowsMoved);
+    connect(m_clearBtn, &QPushButton::clicked, this, [this] { m_queue->clearUpcoming(); });
+    connect(m_list, &QListWidget::itemDoubleClicked, this, &QueuePanel::onItemDoubleClicked);
+    connect(m_list, &QListWidget::customContextMenuRequested, this, &QueuePanel::onContextMenu);
+    connect(m_list->model(), &QAbstractItemModel::rowsMoved, this, &QueuePanel::onRowsMoved);

    refresh();
 }
@@ -69,26 +172,19 @@ void QueuePanel::refresh()

    for (int i = 0; i < upcoming.size(); ++i) {
        const QJsonObject &t = upcoming.at(i);
-        const QString title  = t["title"].toString();
+        const QString base    = t["title"].toString();
+        const QString ver     = t["version"].toString().trimmed();
+        const QString title   = ver.isEmpty() ? base : base + QStringLiteral(" (") + ver + QLatin1Char(')');
        const QString artist = t["performer"].toObject()["name"].toString().isEmpty()
            ? t["album"].toObject()["artist"].toObject()["name"].toString()
            : t["performer"].toObject()["name"].toString();
+        const int duration   = t["duration"].toInt();

-        const QString text = artist.isEmpty()
-            ? title
-            : QStringLiteral("%1 — %2").arg(artist, title);
-
-        auto *item = new QListWidgetItem(text, m_list);
+        auto *item = new QListWidgetItem(title, m_list);
        item->setData(UpcomingIndexRole, i);
        item->setData(IsPlayNextRole, i < playNextCount);
-        item->setData(TrackJsonRole, QVariant::fromValue(t));
-
-        // "Play Next" tracks shown slightly differently
-        if (i < playNextCount) {
-            QFont f = item->font();
-            f.setItalic(true);
-            item->setFont(f);
-        }
+        item->setData(ArtistRole, artist);
+        item->setData(DurationRole, duration);
    }

    m_refreshing = false;
@@ -107,11 +203,13 @@ void QueuePanel::onRowsMoved()
 {
    if (m_refreshing) return;

+    const QVector<QJsonObject> currentUpcoming = m_queue->upcomingTracks();
    QVector<QJsonObject> newOrder;
    newOrder.reserve(m_list->count());
    for (int i = 0; i < m_list->count(); ++i) {
-        const QVariant v = m_list->item(i)->data(TrackJsonRole);
-        newOrder.append(v.value<QJsonObject>());
+        const int prevIndex = m_list->item(i)->data(UpcomingIndexRole).toInt();
+        if (prevIndex >= 0 && prevIndex < currentUpcoming.size())
+            newOrder.append(currentUpcoming.at(prevIndex));
    }

    m_refreshing = true;
@@ -130,12 +228,8 @@ void QueuePanel::onContextMenu(const QPoint &pos)
    auto *removeAct = menu.addAction(tr("Remove from queue"));
    auto *toTopAct  = menu.addAction(tr("Move to top (play next)"));

-    connect(removeAct, &QAction::triggered, this, [this, idx] {
-        m_queue->removeUpcoming(idx);
-    });
-    connect(toTopAct, &QAction::triggered, this, [this, idx] {
-        m_queue->moveUpcomingToTop(idx);
-    });
+    connect(removeAct, &QAction::triggered, this, [this, idx] { m_queue->removeUpcoming(idx); });
+    connect(toTopAct,  &QAction::triggered, this, [this, idx] { m_queue->moveUpcomingToTop(idx); });

    menu.exec(m_list->viewport()->mapToGlobal(pos));
 }
--- a/src/view/sidepanel/view.cpp
+++ b/src/view/sidepanel/view.cpp
@@ -1,4 +1,6 @@
 #include "view.hpp"
+#include "../../util/colors.hpp"
+#include "../../util/trackinfo.hpp"

 #include <QVBoxLayout>
 #include <QHBoxLayout>
@@ -6,18 +8,21 @@
 #include <QHeaderView>
 #include <QFont>
 #include <QJsonArray>
+#include <QMenu>

 static constexpr int IdRole   = Qt::UserRole + 1;
 static constexpr int TypeRole = Qt::UserRole + 2;
+static constexpr int JsonRole = Qt::UserRole + 3;

 namespace SidePanel
 {

 // ---- SearchTab ----

-SearchTab::SearchTab(QobuzBackend *backend, QWidget *parent)
+SearchTab::SearchTab(QobuzBackend *backend, PlayQueue *queue, QWidget *parent)
    : QWidget(parent)
    , m_backend(backend)
+    , m_queue(queue)
 {
    auto *layout = new QVBoxLayout(this);
    layout->setContentsMargins(4, 4, 4, 4);
@@ -25,7 +30,7 @@ SearchTab::SearchTab(QobuzBackend *backend, QWidget *parent)
    // Search bar
    auto *barLayout = new QHBoxLayout;
    m_searchBox     = new QLineEdit(this);
-    m_searchBox->setPlaceholderText(tr("Search Qobuz…"));
+    m_searchBox->setPlaceholderText(tr("Search Qobuz..."));
    m_searchBox->setClearButtonEnabled(true);
    auto *searchBtn = new QPushButton(tr("Go"), this);
    barLayout->addWidget(m_searchBox);
@@ -35,9 +40,18 @@ SearchTab::SearchTab(QobuzBackend *backend, QWidget *parent)
    // Result tabs
    m_resultTabs = new QTabWidget(this);

+    m_topResults = new QTreeWidget(this);
+    m_topResults->setHeaderLabels({tr(""), tr("Top Result"), tr("Info")});
+    m_topResults->setRootIsDecorated(false);
+    m_topResults->header()->setSectionResizeMode(0, QHeaderView::ResizeToContents);
+    m_topResults->header()->setSectionResizeMode(1, QHeaderView::Stretch);
+    m_topResults->header()->setSectionResizeMode(2, QHeaderView::Stretch);
+    m_topResults->header()->setStretchLastSection(false);
+
    m_trackResults  = new QTreeWidget(this);
    m_trackResults->setHeaderLabels({tr("Title"), tr("Artist"), tr("Album")});
    m_trackResults->setRootIsDecorated(false);
+    m_trackResults->setContextMenuPolicy(Qt::CustomContextMenu);

    m_albumResults  = new QTreeWidget(this);
    m_albumResults->setHeaderLabels({tr(""), tr("Album"), tr("Artist")});
@@ -46,11 +60,13 @@ SearchTab::SearchTab(QobuzBackend *backend, QWidget *parent)
    m_albumResults->header()->setSectionResizeMode(1, QHeaderView::Stretch);
    m_albumResults->header()->setSectionResizeMode(2, QHeaderView::Stretch);
    m_albumResults->header()->setStretchLastSection(false);
+    m_albumResults->setContextMenuPolicy(Qt::CustomContextMenu);

    m_artistResults = new QTreeWidget(this);
    m_artistResults->setHeaderLabels({tr("Artist")});
    m_artistResults->setRootIsDecorated(false);

+    m_resultTabs->addTab(m_topResults, tr("Top Results"));
    m_resultTabs->addTab(m_trackResults,  tr("Tracks"));
    m_resultTabs->addTab(m_albumResults,  tr("Albums"));
    m_resultTabs->addTab(m_artistResults, tr("Artists"));
@@ -60,17 +76,89 @@ SearchTab::SearchTab(QobuzBackend *backend, QWidget *parent)
    connect(m_searchBox, &QLineEdit::returnPressed, this, &SearchTab::onSearchSubmit);

    connect(m_backend, &QobuzBackend::searchResult, this, &SearchTab::onSearchResult);
+    connect(m_backend, &QobuzBackend::mostPopularResult, this, &SearchTab::onMostPopularResult);

+    connect(m_topResults,   &QTreeWidget::itemDoubleClicked, this, &SearchTab::onItemDoubleClicked);
    connect(m_trackResults,  &QTreeWidget::itemDoubleClicked, this, &SearchTab::onItemDoubleClicked);
    connect(m_albumResults,  &QTreeWidget::itemDoubleClicked, this, &SearchTab::onItemDoubleClicked);
    connect(m_artistResults, &QTreeWidget::itemDoubleClicked, this, &SearchTab::onItemDoubleClicked);
+
+    // Context menus
+    connect(m_trackResults, &QTreeWidget::customContextMenuRequested,
+            this, &SearchTab::onTrackContextMenu);
+    connect(m_albumResults, &QTreeWidget::customContextMenuRequested,
+            this, &SearchTab::onAlbumContextMenu);
+}
+
+void SearchTab::setUserPlaylists(const QVector<QPair<qint64, QString>> &playlists)
+{
+    m_userPlaylists = playlists;
 }

 void SearchTab::onSearchSubmit()
 {
    const QString q = m_searchBox->text().trimmed();
-    if (!q.isEmpty())
+    if (!q.isEmpty()) {
+        m_backend->mostPopularSearch(q, 8);
        m_backend->search(q, 0, 20);
+        m_resultTabs->setCurrentIndex(0);
+    }
+}
+
+void SearchTab::onMostPopularResult(const QJsonObject &result)
+{
+    m_topResults->clear();
+
+    QFont badgeFont;
+    badgeFont.setBold(true);
+
+    const QJsonArray items = result["most_popular"].toObject()["items"].toArray();
+    for (const auto &value : items) {
+        const QJsonObject itemObj = value.toObject();
+        const QString type = itemObj["type"].toString();
+        const QJsonObject content = itemObj["content"].toObject();
+
+        auto *item = new QTreeWidgetItem(m_topResults);
+        item->setData(0, JsonRole, content);
+
+        if (type == QStringLiteral("tracks")) {
+            const QString title = content["title"].toString();
+            const QString artist = content["performer"].toObject()["name"].toString();
+            const QString album = content["album"].toObject()["title"].toString();
+            item->setText(0, QStringLiteral("T"));
+            item->setForeground(0, Colors::BadgeGreen);
+            item->setFont(0, badgeFont);
+            item->setTextAlignment(0, Qt::AlignCenter);
+            item->setText(1, title);
+            item->setText(2, artist.isEmpty() ? album : QStringLiteral("%1 - %2").arg(artist, album));
+            item->setData(0, TypeRole, QStringLiteral("track"));
+            item->setData(0, IdRole, static_cast<qint64>(content["id"].toDouble()));
+        } else if (type == QStringLiteral("albums")) {
+            const QString title = content["title"].toString();
+            const QString artist = content["artist"].toObject()["name"].toString();
+            const bool hiRes = content["hires_streamable"].toBool()
+                || content["rights"].toObject()["hires_streamable"].toBool();
+            item->setText(0, hiRes ? QStringLiteral("H") : QStringLiteral("A"));
+            item->setForeground(0, hiRes
+                ? Colors::QobuzOrange
+                : Colors::BadgeGray);
+            item->setFont(0, badgeFont);
+            item->setTextAlignment(0, Qt::AlignCenter);
+            item->setText(1, title);
+            item->setText(2, artist);
+            item->setData(0, TypeRole, QStringLiteral("album"));
+            item->setData(1, IdRole, content["id"].toString());
+        } else if (type == QStringLiteral("artists")) {
+            item->setText(0, QStringLiteral("A"));
+            item->setForeground(0, Colors::BadgeBlue);
+            item->setFont(0, badgeFont);
+            item->setTextAlignment(0, Qt::AlignCenter);
+            item->setText(1, content["name"].toString());
+            item->setText(2, tr("Artist"));
+            item->setData(0, TypeRole, QStringLiteral("artist"));
+            item->setData(0, IdRole, static_cast<qint64>(content["id"].toDouble()));
+        }
+    }
 }

 void SearchTab::onSearchResult(const QJsonObject &result)
@@ -86,6 +174,7 @@ void SearchTab::onSearchResult(const QJsonObject &result)
            QStringList{t["title"].toString(), performer, album});
        item->setData(0, IdRole,   static_cast<qint64>(t["id"].toDouble()));
        item->setData(0, TypeRole, QStringLiteral("track"));
+        item->setData(0, JsonRole, t);
    }

    // Populate albums
@@ -105,12 +194,13 @@ void SearchTab::onSearchResult(const QJsonObject &result)
                QStringList{QString(), a["title"].toString(), artist});
            if (hiRes) {
                item->setText(0, QStringLiteral("H"));
-                item->setForeground(0, QColor(QStringLiteral("#FFD700")));
+                item->setForeground(0, Colors::QobuzOrange);
                item->setFont(0, hiResFont);
                item->setTextAlignment(0, Qt::AlignCenter);
            }
-            item->setData(0, TypeRole, QStringLiteral("album")); // handler reads col 0
+            item->setData(0, TypeRole, QStringLiteral("album"));
            item->setData(1, IdRole,   a["id"].toString());
+            item->setData(0, JsonRole, a);
        }
    }

@@ -140,20 +230,135 @@ void SearchTab::onItemDoubleClicked(QTreeWidgetItem *item, int)
    }
 }

+void SearchTab::onTrackContextMenu(const QPoint &pos)
+{
+    auto *item = m_trackResults->itemAt(pos);
+    if (!item) return;
+
+    const qint64 trackId = item->data(0, IdRole).toLongLong();
+    const QJsonObject trackJson = item->data(0, JsonRole).toJsonObject();
+    if (trackId <= 0) return;
+
+    QMenu menu(this);
+
+    auto *playNow  = menu.addAction(tr("Play now"));
+    auto *playNext = menu.addAction(tr("Play next"));
+    auto *addQueue = menu.addAction(tr("Add to queue"));
+    menu.addSeparator();
+
+    auto *addFav = menu.addAction(tr("Add to favorites"));
+
+    // Open album / artist
+    const QString albumId = trackJson["album"].toObject()["id"].toString();
+    const qint64 artistId = static_cast<qint64>(
+        trackJson["performer"].toObject()["id"].toDouble());
+    const QString artistName = trackJson["performer"].toObject()["name"].toString();
+    const QString albumTitle = trackJson["album"].toObject()["title"].toString();
+
+    menu.addSeparator();
+    if (!albumId.isEmpty()) {
+        auto *openAlbum = menu.addAction(tr("Go to album: %1").arg(QString(albumTitle).replace(QLatin1Char('&'), QStringLiteral("&&"))));
+        connect(openAlbum, &QAction::triggered, this, [this, albumId] {
+            emit albumSelected(albumId);
+        });
+    }
+    if (artistId > 0) {
+        auto *openArtist = menu.addAction(tr("Go to artist: %1").arg(QString(artistName).replace(QLatin1Char('&'), QStringLiteral("&&"))));
+        connect(openArtist, &QAction::triggered, this, [this, artistId] {
+            emit artistSelected(artistId);
+        });
+    }
+
+    // Add to playlist submenu
+    if (!m_userPlaylists.isEmpty()) {
+        menu.addSeparator();
+        auto *plMenu = menu.addMenu(tr("Add to playlist"));
+        for (const auto &pl : m_userPlaylists) {
+            auto *act = plMenu->addAction(pl.second);
+            connect(act, &QAction::triggered, this, [this, trackId, plId = pl.first] {
+                emit addToPlaylistRequested(trackId, plId);
+            });
+        }
+    }
+
+    // Track info
+    menu.addSeparator();
+    auto *info = menu.addAction(tr("Track info..."));
+
+    connect(playNow, &QAction::triggered, this, [this, trackId] {
+        emit trackPlayRequested(trackId);
+    });
+    connect(playNext, &QAction::triggered, this, [this, trackJson] {
+        m_queue->playNext(trackJson);
+    });
+    connect(addQueue, &QAction::triggered, this, [this, trackJson] {
+        m_queue->addToQueue(trackJson);
+    });
+    connect(addFav, &QAction::triggered, this, [this, trackId] {
+        m_backend->addFavTrack(trackId);
+    });
+    connect(info, &QAction::triggered, this, [this, trackJson] {
+        showTrackInfo(trackJson);
+    });
+
+    menu.exec(m_trackResults->viewport()->mapToGlobal(pos));
+}
+
+void SearchTab::onAlbumContextMenu(const QPoint &pos)
+{
+    auto *item = m_albumResults->itemAt(pos);
+    if (!item) return;
+
+    const QString albumId = item->data(1, IdRole).toString();
+    const QJsonObject albumJson = item->data(0, JsonRole).toJsonObject();
+    if (albumId.isEmpty()) return;
+
+    QMenu menu(this);
+
+    auto *openAlbum = menu.addAction(tr("Open album"));
+    auto *addFav    = menu.addAction(tr("Add to favorites"));
+
+    const qint64 artistId = static_cast<qint64>(
+        albumJson["artist"].toObject()["id"].toDouble());
+    const QString artistName = albumJson["artist"].toObject()["name"].toString();
+    if (artistId > 0) {
+        menu.addSeparator();
+        auto *openArtist = menu.addAction(tr("Go to artist: %1").arg(QString(artistName).replace(QLatin1Char('&'), QStringLiteral("&&"))));
+        connect(openArtist, &QAction::triggered, this, [this, artistId] {
+            emit artistSelected(artistId);
+        });
+    }
+
+    connect(openAlbum, &QAction::triggered, this, [this, albumId] {
+        emit albumSelected(albumId);
+    });
+    connect(addFav, &QAction::triggered, this, [this, albumId] {
+        m_backend->addFavAlbum(albumId);
+    });
+
+    menu.exec(m_albumResults->viewport()->mapToGlobal(pos));
+}
+
+void SearchTab::showTrackInfo(const QJsonObject &track)
+{
+    TrackInfoDialog::show(track, this);
+}
+
 // ---- View ----

-View::View(QobuzBackend *backend, QWidget *parent)
+View::View(QobuzBackend *backend, PlayQueue *queue, QWidget *parent)
    : QDockWidget(tr("Search"), parent)
 {
    setObjectName(QStringLiteral("searchPanel"));
    setFeatures(QDockWidget::DockWidgetMovable | QDockWidget::DockWidgetClosable);

-    m_search = new SearchTab(backend, this);
+    m_search = new SearchTab(backend, queue, this);
    setWidget(m_search);

    connect(m_search, &SearchTab::albumSelected,           this, &View::albumSelected);
    connect(m_search, &SearchTab::artistSelected,          this, &View::artistSelected);
    connect(m_search, &SearchTab::trackPlayRequested,      this, &View::trackPlayRequested);
+    connect(m_search, &SearchTab::addToPlaylistRequested,  this, &View::addToPlaylistRequested);
 }

 } // namespace SidePanel
--- a/src/view/sidepanel/view.hpp
+++ b/src/view/sidepanel/view.hpp
@@ -1,6 +1,7 @@
 #pragma once

 #include "../../backend/qobuzbackend.hpp"
+#include "../../playqueue.hpp"

 #include <QWidget>
 #include <QDockWidget>
@@ -8,6 +9,8 @@
 #include <QLineEdit>
 #include <QTreeWidget>
 #include <QJsonObject>
+#include <QVector>
+#include <QPair>

 namespace SidePanel
 {
@@ -15,32 +18,43 @@ namespace SidePanel
    {
        Q_OBJECT
    public:
-        explicit SearchTab(QobuzBackend *backend, QWidget *parent = nullptr);
+        explicit SearchTab(QobuzBackend *backend, PlayQueue *queue, QWidget *parent = nullptr);
+
+        void setUserPlaylists(const QVector<QPair<qint64, QString>> &playlists);

    signals:
        void albumSelected(const QString &albumId);
        void artistSelected(qint64 artistId);
        void trackPlayRequested(qint64 trackId);
+        void addToPlaylistRequested(qint64 trackId, qint64 playlistId);

    private slots:
        void onSearchResult(const QJsonObject &result);
+        void onMostPopularResult(const QJsonObject &result);
        void onSearchSubmit();
        void onItemDoubleClicked(QTreeWidgetItem *item, int column);

    private:
        QobuzBackend *m_backend    = nullptr;
+        PlayQueue    *m_queue      = nullptr;
        QLineEdit    *m_searchBox  = nullptr;
        QTabWidget   *m_resultTabs = nullptr;
+        QTreeWidget  *m_topResults = nullptr;
        QTreeWidget  *m_trackResults  = nullptr;
        QTreeWidget  *m_albumResults  = nullptr;
        QTreeWidget  *m_artistResults = nullptr;
+        QVector<QPair<qint64, QString>> m_userPlaylists;
+
+        void onTrackContextMenu(const QPoint &pos);
+        void onAlbumContextMenu(const QPoint &pos);
+        void showTrackInfo(const QJsonObject &track);
    };

    class View : public QDockWidget
    {
        Q_OBJECT
    public:
-        explicit View(QobuzBackend *backend, QWidget *parent = nullptr);
+        explicit View(QobuzBackend *backend, PlayQueue *queue, QWidget *parent = nullptr);

        SearchTab *searchTab() const { return m_search; }

@@ -48,6 +62,7 @@ namespace SidePanel
        void albumSelected(const QString &albumId);
        void artistSelected(qint64 artistId);
        void trackPlayRequested(qint64 trackId);
+        void addToPlaylistRequested(qint64 trackId, qint64 playlistId);

    private:
        SearchTab *m_search = nullptr;
--- a/src/view/trackcontextheader.hpp
+++ b/src/view/trackcontextheader.hpp
@@ -0,0 +1,311 @@
+#pragma once
+
+#include "../util/colors.hpp"
+
+#include <QWidget>
+#include <QHBoxLayout>
+#include <QVBoxLayout>
+#include <QLabel>
+#include <QFont>
+#include <QPixmap>
+#include <QPushButton>
+#include <QStringList>
+#include <QJsonObject>
+#include <QJsonArray>
+#include <QNetworkAccessManager>
+#include <QNetworkReply>
+#include <QNetworkRequest>
+#include <QUrl>
+
+/// Header strip shown above the track list when an album or playlist is open.
+/// Displays album art, title, subtitle, metadata, and Play/Shuffle buttons.
+class TrackContextHeader : public QWidget
+{
+public:
+    explicit TrackContextHeader(QWidget *parent = nullptr)
+        : QWidget(parent)
+    {
+        setFixedHeight(148);
+
+        auto *hlay = new QHBoxLayout(this);
+        hlay->setContentsMargins(12, 8, 12, 8);
+        hlay->setSpacing(14);
+
+        m_art = new QLabel(this);
+        m_art->setFixedSize(120, 120);
+        m_art->setScaledContents(true);
+        m_art->setAlignment(Qt::AlignCenter);
+        m_art->setStyleSheet(QStringLiteral("background: #1a1a1a; border-radius: 4px;"));
+        hlay->addWidget(m_art, 0, Qt::AlignVCenter);
+
+        auto *info = new QWidget(this);
+        auto *vlay = new QVBoxLayout(info);
+        vlay->setContentsMargins(0, 0, 0, 0);
+        vlay->setSpacing(4);
+
+        m_title = new QLabel(info);
+        QFont tf = m_title->font();
+        tf.setPointSize(tf.pointSize() + 5);
+        tf.setBold(true);
+        m_title->setFont(tf);
+        m_title->setWordWrap(true);
+        vlay->addWidget(m_title);
+
+        m_subtitle = new QPushButton(info);
+        m_subtitle->setFlat(true);
+        m_subtitle->setStyleSheet(QStringLiteral(
+            "QPushButton { border: none; background: none; text-align: left; padding: 0; margin: 0; }"
+            "QPushButton:enabled:hover { color: #FFB232; }"
+            "QPushButton:!enabled { color: palette(text); }"
+        ));
+        QFont sf = m_subtitle->font();
+        sf.setPointSize(sf.pointSize() + 1);
+        m_subtitle->setFont(sf);
+        vlay->addWidget(m_subtitle);
+
+        m_meta = new QLabel(info);
+        QPalette mp = m_meta->palette();
+        mp.setColor(QPalette::WindowText, Colors::SubduedText);
+        m_meta->setPalette(mp);
+        vlay->addWidget(m_meta);
+
+        // Play / Shuffle buttons
+        auto *btnRow = new QHBoxLayout;
+        btnRow->setSpacing(8);
+        btnRow->setContentsMargins(0, 4, 0, 0);
+
+        static const QString btnBase = QStringLiteral(
+            "QPushButton {"
+            "  padding: 5px 16px;"
+            "  border-radius: 4px;"
+            "  font-weight: bold;"
+            "}"
+            "QPushButton:hover { opacity: 0.85; }"
+        );
+
+        m_playBtn = new QPushButton(tr("▶  Play"), info);
+        m_playBtn->setStyleSheet(btnBase +
+            QStringLiteral("QPushButton { background: #FFB232; color: #000; }"
+                           "QPushButton:pressed { background: #e09e28; }"));
+        btnRow->addWidget(m_playBtn);
+
+        m_shuffleBtn = new QPushButton(tr("⇄  Shuffle"), info);
+        m_shuffleBtn->setStyleSheet(btnBase +
+            QStringLiteral("QPushButton { background: #2a2a2a; color: #FFB232; border: 1px solid #FFB232; }"
+                           "QPushButton:pressed { background: #333; }"));
+        btnRow->addWidget(m_shuffleBtn);
+
+        m_favBtn = new QPushButton(tr("♡  Favourite"), info);
+        m_favBtn->setStyleSheet(btnBase +
+            QStringLiteral("QPushButton { background: #2a2a2a; color: #ccc; border: 1px solid #555; }"
+                           "QPushButton:pressed { background: #333; }"));
+        m_favBtn->hide();
+        btnRow->addWidget(m_favBtn);
+
+        m_followBtn = new QPushButton(tr("Follow"), info);
+        m_followBtn->setStyleSheet(btnBase +
+            QStringLiteral("QPushButton { background: #2a2a2a; color: #ddd; border: 1px solid #666; }"
+                           "QPushButton:pressed { background: #333; }"));
+        m_followBtn->hide();
+        btnRow->addWidget(m_followBtn);
+
+        btnRow->addStretch();
+        vlay->addLayout(btnRow);
+        vlay->addStretch(1);
+
+        hlay->addWidget(info, 1);
+
+        m_nam = new QNetworkAccessManager(this);
+        QObject::connect(m_nam, &QNetworkAccessManager::finished,
+                [this](QNetworkReply *reply) {
+            reply->deleteLater();
+            if (reply->error() != QNetworkReply::NoError)
+                return;
+            QPixmap pix;
+            if (pix.loadFromData(reply->readAll()))
+                m_art->setPixmap(pix);
+        });
+    }
+
+    QPushButton *playButton()    { return m_playBtn; }
+    QPushButton *shuffleButton() { return m_shuffleBtn; }
+    QPushButton *favButton()     { return m_favBtn; }
+    QPushButton *followButton()  { return m_followBtn; }
+
+    QPushButton *subtitleButton() { return m_subtitle; }
+    QString albumId() const      { return m_albumId; }
+    bool albumFaved() const      { return m_albumFaved; }
+    qint64 artistId() const      { return m_artistId; }
+    qint64 playlistId() const    { return m_playlistId; }
+    bool playlistFollowed() const { return m_playlistFollowed; }
+    bool playlistOwned() const    { return m_playlistOwned; }
+
+    void setAlbum(const QJsonObject &album, bool isFaved)
+    {
+        const QString base = album["title"].toString();
+        const QString ver  = album["version"].toString().trimmed();
+        m_title->setText(ver.isEmpty() ? base : base + QStringLiteral(" (") + ver + QLatin1Char(')'));
+        m_albumId = album["id"].toString();
+        if (m_albumId.isEmpty() && album["id"].isDouble())
+            m_albumId = QString::number(static_cast<qint64>(album["id"].toDouble()));
+        m_artistId = static_cast<qint64>(album["artist"].toObject()["id"].toDouble());
+        m_subtitle->setText(album["artist"].toObject()["name"].toString());
+        m_subtitle->setEnabled(m_artistId > 0);
+        m_subtitle->setCursor(m_artistId > 0 ? Qt::PointingHandCursor : Qt::ArrowCursor);
+        m_meta->setText(buildAlbumMeta(album));
+
+        setAlbumFaved(isFaved);
+        m_favBtn->setEnabled(!m_albumId.isEmpty());
+        m_favBtn->show();
+
+        m_followBtn->hide();
+        m_playlistId = 0;
+        m_playlistFollowed = false;
+        m_playlistOwned = false;
+        fetchArt(album["image"].toObject());
+        show();
+    }
+
+    void setPlaylist(const QJsonObject &playlist, bool isFollowed, bool isOwned)
+    {
+        m_title->setText(playlist["name"].toString());
+        m_artistId = 0;
+        m_playlistId = static_cast<qint64>(playlist["id"].toDouble());
+        m_playlistFollowed = isFollowed;
+        m_playlistOwned = isOwned;
+        const QString desc  = playlist["description"].toString();
+        const QString owner = playlist["owner"].toObject()["name"].toString();
+        m_subtitle->setText(desc.isEmpty() ? owner : desc);
+        m_subtitle->setEnabled(false);
+        m_subtitle->setCursor(Qt::ArrowCursor);
+        m_meta->setText(buildPlaylistMeta(playlist));
+
+        m_albumId.clear();
+        m_albumFaved = false;
+        m_favBtn->hide();
+
+        if (m_playlistOwned) {
+            m_followBtn->setText(tr("Owned"));
+            m_followBtn->setEnabled(false);
+            m_followBtn->show();
+        } else {
+            m_followBtn->setText(m_playlistFollowed ? tr("Unfollow") : tr("Follow"));
+            m_followBtn->setEnabled(m_playlistId > 0);
+            m_followBtn->show();
+        }
+
+        // Try images300 → images150 → images (API returns mosaic arrays, not image_rectangle)
+        const QJsonArray imgs300 = playlist["images300"].toArray();
+        const QJsonArray imgs150 = playlist["images150"].toArray();
+        const QJsonArray imgs    = playlist["images"].toArray();
+        const QJsonArray &best   = !imgs300.isEmpty() ? imgs300
+                                 : !imgs150.isEmpty() ? imgs150 : imgs;
+        if (!best.isEmpty())
+            fetchUrl(best.first().toString());
+        else
+            m_art->setPixmap(QPixmap());
+
+        show();
+    }
+
+    void setPlaylistFollowed(bool followed)
+    {
+        m_playlistFollowed = followed;
+        if (!m_playlistOwned)
+            m_followBtn->setText(m_playlistFollowed ? tr("Unfollow") : tr("Follow"));
+    }
+
+    void setAlbumFaved(bool faved)
+    {
+        m_albumFaved = faved;
+        if (faved) {
+            m_favBtn->setText(tr("♥  Favourited"));
+            m_favBtn->setStyleSheet(QStringLiteral(
+                "QPushButton { padding: 5px 16px; border-radius: 4px; font-weight: bold;"
+                "  background: #2a2a2a; color: #FFB232; border: 1px solid #FFB232; }"
+                "QPushButton:pressed { background: #333; }"));
+        } else {
+            m_favBtn->setText(tr("♡  Favourite"));
+            m_favBtn->setStyleSheet(QStringLiteral(
+                "QPushButton { padding: 5px 16px; border-radius: 4px; font-weight: bold;"
+                "  background: #2a2a2a; color: #ccc; border: 1px solid #555; }"
+                "QPushButton:pressed { background: #333; }"));
+        }
+    }
+
+private:
+    void fetchArt(const QJsonObject &img)
+    {
+        QString url = img["large"].toString();
+        if (url.isEmpty()) url = img["small"].toString();
+        fetchUrl(url);
+    }
+
+    void fetchUrl(const QString &url)
+    {
+        if (url.isEmpty()) {
+            m_art->setPixmap(QPixmap());
+            return;
+        }
+        if (url == m_currentArtUrl)
+            return;
+        m_currentArtUrl = url;
+        m_nam->get(QNetworkRequest(QUrl(url)));
+    }
+
+    static QString formatDuration(int totalSecs)
+    {
+        const int h = totalSecs / 3600;
+        const int m = (totalSecs % 3600) / 60;
+        if (h > 0)
+            return QStringLiteral("%1h %2m").arg(h).arg(m);
+        return QStringLiteral("%1 min").arg(m);
+    }
+
+    static QString buildAlbumMeta(const QJsonObject &album)
+    {
+        QStringList parts;
+        const QString year = album["release_date_original"].toString().left(4);
+        if (!year.isEmpty()) parts << year;
+        const int tracks = album["tracks_count"].toInt();
+        if (tracks > 0) parts << QStringLiteral("%1 tracks").arg(tracks);
+        const int dur = static_cast<int>(album["duration"].toDouble());
+        if (dur > 0) parts << formatDuration(dur);
+        const int    bits = album["maximum_bit_depth"].toInt();
+        const double rate = album["maximum_sampling_rate"].toDouble();
+        if (bits > 0 && rate > 0) {
+            const QString rateStr = (rate == static_cast<int>(rate))
+                ? QString::number(static_cast<int>(rate))
+                : QString::number(rate, 'g', 4);
+            parts << QStringLiteral("%1-bit / %2 kHz").arg(bits).arg(rateStr);
+        }
+        return parts.join(QStringLiteral("  ·  "));
+    }
+
+    static QString buildPlaylistMeta(const QJsonObject &playlist)
+    {
+        QStringList parts;
+        const int tracks = playlist["tracks_count"].toInt();
+        if (tracks > 0) parts << QStringLiteral("%1 tracks").arg(tracks);
+        const int dur = static_cast<int>(playlist["duration"].toDouble());
+        if (dur > 0) parts << formatDuration(dur);
+        return parts.join(QStringLiteral("  ·  "));
+    }
+
+    QLabel                *m_art        = nullptr;
+    QLabel                *m_title      = nullptr;
+    QPushButton           *m_subtitle   = nullptr;
+    QLabel                *m_meta       = nullptr;
+    QPushButton           *m_playBtn    = nullptr;
+    QPushButton           *m_shuffleBtn = nullptr;
+    QPushButton           *m_favBtn     = nullptr;
+    QPushButton           *m_followBtn  = nullptr;
+    QNetworkAccessManager *m_nam        = nullptr;
+    QString                m_currentArtUrl;
+    QString                m_albumId;
+    bool                   m_albumFaved = false;
+    qint64                 m_artistId   = 0;
+    qint64                 m_playlistId = 0;
+    bool                   m_playlistFollowed = false;
+    bool                   m_playlistOwned = false;
+};
--- a/src/widget/volumebutton.hpp
+++ b/src/widget/volumebutton.hpp
@@ -4,10 +4,9 @@
 #include "../util/icon.hpp"

 #include <QToolButton>
-#include <QWidgetAction>
-#include <QMenu>
-#include <QLabel>
+#include <QFrame>
 #include <QVBoxLayout>
+#include <QLabel>

 /// A toolbar button that shows a volume slider popup when clicked.
 class VolumeButton : public QToolButton
@@ -17,33 +16,36 @@ class VolumeButton : public QToolButton
 public:
    explicit VolumeButton(QWidget *parent = nullptr) : QToolButton(parent)
    {
-        setPopupMode(QToolButton::InstantPopup);
        setIcon(Icon::volumeHigh());

-        auto *menu   = new QMenu(this);
-        auto *widget = new QWidget(menu);
-        widget->setMinimumWidth(72);
-        auto *layout = new QVBoxLayout(widget);
-        layout->setContentsMargins(6, 6, 6, 6);
+        // Qt::Popup closes automatically when the user clicks outside.
+        m_popup = new QFrame(this, Qt::Popup);
+        m_popup->setFrameShape(QFrame::StyledPanel);
+        m_popup->setFrameShadow(QFrame::Raised);

-        m_label  = new QLabel("80%", widget);
+        auto *layout = new QVBoxLayout(m_popup);
+        layout->setContentsMargins(10, 10, 10, 10);
+        layout->setSpacing(6);
+
+        m_label = new QLabel(QStringLiteral("80%"), m_popup);
        m_label->setAlignment(Qt::AlignCenter);
+        layout->addWidget(m_label);

-        m_slider = new ClickableSlider(Qt::Vertical, widget);
+        m_slider = new ClickableSlider(Qt::Vertical, m_popup);
        m_slider->setRange(0, 100);
        m_slider->setValue(80);
        m_slider->setFixedHeight(120);
+        layout->addWidget(m_slider, 0, Qt::AlignHCenter);

-        layout->addWidget(m_label);
-        layout->addWidget(m_slider);
-
-        auto *action = new QWidgetAction(menu);
-        action->setDefaultWidget(widget);
-        menu->addAction(action);
-        setMenu(menu);
+        // Size the popup at its maximum (label = "100%") and lock it
+        m_label->setText(QStringLiteral("100%"));
+        m_popup->adjustSize();
+        m_popup->setFixedSize(m_popup->sizeHint());
+        m_label->setText(QStringLiteral("80%"));

+        connect(this, &QToolButton::clicked, this, &VolumeButton::togglePopup);
        connect(m_slider, &QSlider::valueChanged, this, [this](int v) {
-            m_label->setText(QString::number(v) + "%");
+            m_label->setText(QString::number(v) + QStringLiteral("%"));
            updateIcon(v);
            emit volumeChanged(v);
        });
@@ -56,14 +58,31 @@ public:
        m_slider->blockSignals(true);
        m_slider->setValue(v);
        m_slider->blockSignals(false);
-        m_label->setText(QString::number(v) + "%");
+        m_label->setText(QString::number(v) + QStringLiteral("%"));
        updateIcon(v);
    }

 signals:
    void volumeChanged(int volume);

+private slots:
+    void togglePopup()
+    {
+        if (m_popup->isVisible()) {
+            m_popup->hide();
+            return;
+        }
+        // Centre popup horizontally over button, place below it
+        const QPoint global = mapToGlobal(
+            QPoint(width() / 2 - m_popup->width() / 2,
+                   height() + 4));
+        m_popup->move(global);
+        m_popup->show();
+        m_popup->raise();
+    }
+
 private:
+    QFrame          *m_popup  = nullptr;
    ClickableSlider *m_slider = nullptr;
    QLabel          *m_label  = nullptr;