@videojs/react 10.0.0-beta.25 → 10.0.0-beta.27

package/docs/concepts/skins.md

@@ -9,12 +9,12 @@ In prior versions of Video.js, skins were CSS-only themes applied to the same se
 tsx
 
 ```
-<Player.Provider>
+<VideoPlayer>
   <VideoSkin>
     {/* wraps the Media component */}
     <Video src="video.mp4"></Video>
   </VideoSkin>
-</Player.Provider>
+</VideoPlayer>
 ```
 
 ## Packaged vs. ejected
@@ -46,16 +46,18 @@ Future design updates manually applied, or intentionally ignored
 tsx
 
   ```
-  <Player.Provider>
+  <VideoPlayer>
     <VideoSkin>
       {/* ...Media... */}
     </VideoSkin>
-  </Player.Provider>
+  </VideoPlayer>
 ```
 
 ### Example of ejected
 
-Skin.tsx
+VideoPlayer.tsx
+
+player.ts
 
 skin.css
 
@@ -63,10 +65,12 @@ skin.css
 'use client';
 
 import { type CSSProperties, type ComponentProps, forwardRef, type ReactNode, isValidElement } from 'react';
-import { AirPlayEnterIcon, AirPlayExitIcon, CaptionsOffIcon, CaptionsOnIcon, CastEnterIcon, CastExitIcon, CheckIcon, ChevronIcon, FullscreenEnterIcon, FullscreenExitIcon, GearIcon, PauseIcon, PipEnterIcon, PipExitIcon, PlayIcon, QualityIcon, RestartIcon, SeekIcon, SpeechIcon, SpeedIcon, SpinnerIcon, VolumeHighIcon, VolumeLowIcon, VolumeOffIcon } from '@videojs/react/icons';
-import { createPlayer, Poster, Container, usePlayer, AirPlayButton, useAudioTrackOptions, BufferingIndicator, useCaptionsOptions, CastButton, Controls, ErrorDialog, FullscreenButton, Gesture, Hotkey, Menu, MuteButton, PiPButton, PlayButton, usePlaybackRateOptions, Popover, useQualityOptions, SeekButton, SeekIndicator, Slider, StatusAnnouncer, StatusIndicator, Time, TimeSlider, Tooltip, VolumeIndicator, VolumeSlider, type RenderProp } from '@videojs/react';
-import { Video, videoFeatures } from '@videojs/react/video';
+import { audioText, captionsText, playbackRateText, qualityText, settingsText, speedText } from '@videojs/core/i18n/text/menu';
+import { AirPlayEnterIcon, AirPlayExitIcon, CaptionsOffIcon, CaptionsOnIcon, CastEnterIcon, CastExitIcon, CheckIcon, ChevronIcon, FullscreenEnterIcon, FullscreenExitIcon, GearIcon, PauseIcon, PipEnterIcon, PipExitIcon, PlayIcon, QualityIcon, RestartIcon, SpeechIcon, SpeedIcon, SpinnerIcon, VolumeHighIcon, VolumeLowIcon, VolumeOffIcon } from '@videojs/react/icons';
+import { Poster, useTranslator, Container, usePlayer, AirPlayButton, useAudioTrackOptions, AudioTrackRadioGroup, BufferingIndicator, CaptionsButton, CaptionsRadioGroup, useCaptionsOptions, CastButton, Controls, ErrorDialog, FullscreenButton, Gesture, Hotkey, Menu, MuteButton, PiPButton, PlayButton, usePlaybackRateOptions, PlaybackRateRadioGroup, Popover, useQualityOptions, QualityRadioGroup, SeekIndicator, Slider, StatusAnnouncer, StatusIndicator, Time, TimeSlider, Tooltip, VolumeIndicator, VolumeSlider, type RenderProp } from '@videojs/react';
+import { Video } from '@videojs/react/video';
 import './player.css';
+import { Player } from './player';
 
 const TOP_STATUS_ACTIONS = ['toggleSubtitles', 'toggleFullscreen', 'togglePictureInPicture'] as const;
 
@@ -77,6 +81,7 @@ function MenuChevron({ flipped = false }: { flipped?: boolean }): ReactNode {
 }
 
 function SettingsMenu(): ReactNode {
+  const t = useTranslator();
   const playbackRate = usePlaybackRateOptions();
   const quality = useQualityOptions();
   const audioTrack = useAudioTrackOptions();
@@ -90,230 +95,259 @@ function SettingsMenu(): ReactNode {
 
   return (
     <Menu.Root side="top" align="center">
-      <Menu.Trigger aria-label="Settings" className="media-button--settings" render={<Button />}>
-        <GearIcon className="media-icon media-icon--settings" />
-      </Menu.Trigger>
+      <Tooltip.Root side="top">
+        <Tooltip.Trigger
+          render={
+            <Menu.Trigger aria-label={t(settingsText)} className="media-button--settings" render={<Button />}>
+              <GearIcon className="media-icon media-icon--settings" />
+            </Menu.Trigger>
+          }
+        />
+        <Tooltip.Popup className="media-surface media-tooltip">
+          <Tooltip.Label>{t(settingsText)}</Tooltip.Label>
+        </Tooltip.Popup>
+      </Tooltip.Root>
       <Menu.Content className="media-surface media-popover media-menu media-menu--settings">
-        <Menu.View className="media-menu__panel">
-          <div className="media-menu__group">
-            {hasQuality ? (
-              <Menu.Root>
-                <Menu.Trigger
-                  type="quality"
-                  className="media-menu__item media-menu__item--submenu"
-                  render={(props) => (
-                    <div {...props}>
-                      <QualityIcon className="media-icon" />
-                      <span>Quality</span>
-                      <span className="media-menu__hint">
-                        <Menu.ItemValue className="media-menu__hint-label" />
-                        <MenuChevron />
+        <div className="media-menu__group">
+          {hasQuality ? (
+            <Menu.Root>
+              <Menu.Trigger
+                className="media-menu__item media-menu__item--submenu"
+                render={(props) => (
+                  <div {...props}>
+                    <QualityIcon className="media-icon" />
+                    <span>{t(qualityText)}</span>
+                    <span className="media-menu__hint">
+                      <span className="media-menu__hint-label">{quality.selectedLabel}</span>
+                      <MenuChevron />
+                    </span>
+                  </div>
+                )}
+              />
+              <Menu.Content className="media-menu__panel">
+                <Menu.Item className="media-menu__back">
+                  <MenuChevron flipped />
+                  {t(qualityText)}
+                </Menu.Item>
+                <Menu.Separator className="media-menu__separator" />
+                <QualityRadioGroup
+                  className="media-menu__group"
+                  aria-label={t(qualityText)}
+                  renderItem={(props, item) => (
+                    <Menu.RadioItem {...props} className="media-menu__item">
+                      <span>
+                        {item.label}
+                        {item.tier ? <sup className="media-menu__tier">{item.tier}</sup> : null}
                       </span>
-                    </div>
+                      {item.badge ? <span className="media-badge">{item.badge}</span> : null}
+                      <Menu.ItemIndicator checked={item.checked} forceMount className="media-menu__indicator">
+                        <CheckIcon className="media-icon" />
+                      </Menu.ItemIndicator>
+                    </Menu.RadioItem>
                   )}
                 />
-                <Menu.Content className="media-menu__panel">
-                  <Menu.Back className="media-menu__back">
-                    <MenuChevron flipped />
-                    Quality
-                  </Menu.Back>
-                  <Menu.Separator className="media-menu__separator" />
-                  <Menu.RadioGroup
-                    className="media-menu__group"
-                    value={quality.value}
-                    onValueChange={quality.setValue}
-                    aria-label="Quality"
-                  >
-                    {quality.options.map((option) => (
-                      <Menu.RadioItem
-                        key={option.value}
-                        className="media-menu__item"
-                        value={option.value}
-                        disabled={option.disabled}
-                      >
-                        <span>
-                          {option.label}
-                          {option.tier ? <sup className="media-menu__tier">{option.tier}</sup> : null}
-                        </span>
-                        {option.badge ? <span className="media-badge">{option.badge}</span> : null}
-                        <Menu.ItemIndicator
-                          checked={option.value === quality.value}
-                          forceMount
-                          className="media-menu__indicator"
-                        >
-                          <CheckIcon className="media-icon" />
-                        </Menu.ItemIndicator>
-                      </Menu.RadioItem>
-                    ))}
-                  </Menu.RadioGroup>
-                </Menu.Content>
-              </Menu.Root>
-            ) : null}
-
-            {hasAudioTrack ? (
-              <Menu.Root>
-                <Menu.Trigger
-                  type="audio-track"
-                  className="media-menu__item media-menu__item--submenu"
-                  render={(props) => (
-                    <div {...props}>
-                      <SpeechIcon className="media-icon" />
-                      <span>Audio</span>
-                      <span className="media-menu__hint">
-                        <Menu.ItemValue className="media-menu__hint-label" />
-                        <MenuChevron />
-                      </span>
-                    </div>
+              </Menu.Content>
+            </Menu.Root>
+          ) : null}
+
+          {hasAudioTrack ? (
+            <Menu.Root>
+              <Menu.Trigger
+                className="media-menu__item media-menu__item--submenu"
+                render={(props) => (
+                  <div {...props}>
+                    <SpeechIcon className="media-icon" />
+                    <span>{t(audioText)}</span>
+                    <span className="media-menu__hint">
+                      <span className="media-menu__hint-label">{audioTrack.selectedLabel}</span>
+                      <MenuChevron />
+                    </span>
+                  </div>
+                )}
+              />
+              <Menu.Content className="media-menu__panel">
+                <Menu.Item className="media-menu__back">
+                  <MenuChevron flipped />
+                  {t(audioText)}
+                </Menu.Item>
+                <Menu.Separator className="media-menu__separator" />
+                <AudioTrackRadioGroup
+                  className="media-menu__group"
+                  aria-label={t(audioText)}
+                  renderItem={(props, item) => (
+                    <Menu.RadioItem {...props} className="media-menu__item">
+                      <span>{item.label}</span>
+                      <Menu.ItemIndicator checked={item.checked} forceMount className="media-menu__indicator">
+                        <CheckIcon className="media-icon" />
+                      </Menu.ItemIndicator>
+                    </Menu.RadioItem>
                   )}
                 />
-                <Menu.Content className="media-menu__panel">
-                  <Menu.Back className="media-menu__back">
-                    <MenuChevron flipped />
-                    Audio
-                  </Menu.Back>
-                  <Menu.Separator className="media-menu__separator" />
-                  <Menu.RadioGroup
-                    className="media-menu__group"
-                    value={audioTrack.value}
-                    onValueChange={audioTrack.setValue}
-                    aria-label="Audio tracks"
-                  >
-                    {audioTrack.options.map((option) => (
-                      <Menu.RadioItem
-                        key={option.value}
-                        className="media-menu__item"
-                        value={option.value}
-                        disabled={option.disabled}
-                      >
-                        <span>{option.label}</span>
-                        <Menu.ItemIndicator
-                          checked={option.value === audioTrack.value}
-                          forceMount
-                          className="media-menu__indicator"
-                        >
-                          <CheckIcon className="media-icon" />
-                        </Menu.ItemIndicator>
-                      </Menu.RadioItem>
-                    ))}
-                  </Menu.RadioGroup>
-                </Menu.Content>
-              </Menu.Root>
-            ) : null}
-
-            {hasPlaybackRate ? (
-              <Menu.Root>
-                <Menu.Trigger
-                  type="playback-rate"
-                  className="media-menu__item media-menu__item--submenu"
-                  render={(props) => (
-                    <div {...props}>
-                      <SpeedIcon className="media-icon" />
-                      <span>Speed</span>
-                      <span className="media-menu__hint">
-                        <Menu.ItemValue className="media-menu__hint-label" />
-                        <MenuChevron />
-                      </span>
-                    </div>
+              </Menu.Content>
+            </Menu.Root>
+          ) : null}
+
+          {hasPlaybackRate ? (
+            <Menu.Root>
+              <Menu.Trigger
+                className="media-menu__item media-menu__item--submenu"
+                render={(props) => (
+                  <div {...props}>
+                    <SpeedIcon className="media-icon" />
+                    <span>{t(speedText)}</span>
+                    <span className="media-menu__hint">
+                      <span className="media-menu__hint-label">{playbackRate.selectedLabel}</span>
+                      <MenuChevron />
+                    </span>
+                  </div>
+                )}
+              />
+              <Menu.Content className="media-menu__panel">
+                <Menu.Item className="media-menu__back">
+                  <MenuChevron flipped />
+                  {t(speedText)}
+                </Menu.Item>
+                <Menu.Separator className="media-menu__separator" />
+                <PlaybackRateRadioGroup
+                  className="media-menu__group"
+                  aria-label={t(playbackRateText)}
+                  renderItem={(props, item) => (
+                    <Menu.RadioItem {...props} className="media-menu__item">
+                      <span>{item.label}</span>
+                      <Menu.ItemIndicator checked={item.checked} forceMount className="media-menu__indicator">
+                        <CheckIcon className="media-icon" />
+                      </Menu.ItemIndicator>
+                    </Menu.RadioItem>
                   )}
                 />
-                <Menu.Content className="media-menu__panel">
-                  <Menu.Back className="media-menu__back">
-                    <MenuChevron flipped />
-                    Speed
-                  </Menu.Back>
-                  <Menu.Separator className="media-menu__separator" />
-                  <Menu.RadioGroup
-                    className="media-menu__group"
-                    value={playbackRate.value}
-                    onValueChange={playbackRate.setValue}
-                    aria-label="Playback rate"
-                  >
-                    {playbackRate.options.map((option) => (
-                      <Menu.RadioItem
-                        key={option.value}
-                        className="media-menu__item"
-                        value={option.value}
-                        disabled={option.disabled}
-                      >
-                        <span>{option.label}</span>
-                        <Menu.ItemIndicator
-                          checked={option.value === playbackRate.value}
-                          forceMount
-                          className="media-menu__indicator"
-                        >
-                          <CheckIcon className="media-icon" />
-                        </Menu.ItemIndicator>
-                      </Menu.RadioItem>
-                    ))}
-                  </Menu.RadioGroup>
-                </Menu.Content>
-              </Menu.Root>
-            ) : null}
-
-            {hasCaptions ? (
-              <Menu.Root>
-                <Menu.Trigger
-                  type="captions"
-                  className="media-menu__item media-menu__item--submenu"
-                  render={(props) => (
-                    <div {...props}>
-                      <CaptionsOffIcon className="media-icon" />
-                      <span>Captions</span>
-                      <span className="media-menu__hint">
-                        <Menu.ItemValue className="media-menu__hint-label" />
-                        <MenuChevron />
-                      </span>
-                    </div>
+              </Menu.Content>
+            </Menu.Root>
+          ) : null}
+
+          {hasCaptions ? (
+            <Menu.Root>
+              <Menu.Trigger
+                className="media-menu__item media-menu__item--submenu"
+                render={(props) => (
+                  <div {...props}>
+                    <CaptionsOffIcon className="media-icon" />
+                    <span>{t(captionsText)}</span>
+                    <span className="media-menu__hint">
+                      <span className="media-menu__hint-label">{captions.selectedLabel}</span>
+                      <MenuChevron />
+                    </span>
+                  </div>
+                )}
+              />
+              <Menu.Content className="media-menu__panel">
+                <Menu.Item className="media-menu__back">
+                  <MenuChevron flipped />
+                  {t(captionsText)}
+                </Menu.Item>
+                <Menu.Separator className="media-menu__separator" />
+                <CaptionsRadioGroup
+                  className="media-menu__group"
+                  aria-label={t(captionsText)}
+                  renderItem={(props, item) => (
+                    <Menu.RadioItem {...props} className="media-menu__item">
+                      <span>{item.label}</span>
+                      <Menu.ItemIndicator checked={item.checked} forceMount className="media-menu__indicator">
+                        <CheckIcon className="media-icon" />
+                      </Menu.ItemIndicator>
+                    </Menu.RadioItem>
                   )}
                 />
-                <Menu.Content className="media-menu__panel">
-                  <Menu.Back className="media-menu__back">
-                    <MenuChevron flipped />
-                    Captions
-                  </Menu.Back>
-                  <Menu.Separator className="media-menu__separator" />
-                  <Menu.RadioGroup
-                    className="media-menu__group"
-                    value={captions.value}
-                    onValueChange={captions.setValue}
-                    aria-label="Captions"
-                  >
-                    {captions.options.map((option) => (
-                      <Menu.RadioItem
-                        key={option.value}
-                        className="media-menu__item"
-                        value={option.value}
-                        disabled={option.disabled}
-                      >
-                        <span>{option.label}</span>
-                        <Menu.ItemIndicator
-                          checked={option.value === captions.value}
-                          forceMount
-                          className="media-menu__indicator"
-                        >
-                          <CheckIcon className="media-icon" />
-                        </Menu.ItemIndicator>
-                      </Menu.RadioItem>
-                    ))}
-                  </Menu.RadioGroup>
-                </Menu.Content>
-              </Menu.Root>
-            ) : null}
-          </div>
-        </Menu.View>
+              </Menu.Content>
+            </Menu.Root>
+          ) : null}
+        </div>
       </Menu.Content>
     </Menu.Root>
   );
 }
 
+function CastControl() {
+  return (
+    <Tooltip.Root side="top">
+      <Tooltip.Trigger
+        render={
+          <CastButton className="media-button--cast" render={<Button />}>
+            <CastEnterIcon className="media-icon media-icon--cast-enter" />
+            <CastExitIcon className="media-icon media-icon--cast-exit" />
+          </CastButton>
+        }
+      />
+      <Tooltip.Popup className="media-surface media-tooltip">
+        <Tooltip.Label />
+        <Tooltip.Shortcut className="media-tooltip__kbd" />
+      </Tooltip.Popup>
+    </Tooltip.Root>
+  );
+}
+
+function AirPlayControl() {
+  return (
+    <Tooltip.Root side="top">
+      <Tooltip.Trigger
+        render={
+          <AirPlayButton className="media-button--airplay" render={<Button />}>
+            <AirPlayEnterIcon className="media-icon media-icon--airplay-enter" />
+            <AirPlayExitIcon className="media-icon media-icon--airplay-exit" />
+          </AirPlayButton>
+        }
+      />
+      <Tooltip.Popup className="media-surface media-tooltip">
+        <Tooltip.Label />
+        <Tooltip.Shortcut className="media-tooltip__kbd" />
+      </Tooltip.Popup>
+    </Tooltip.Root>
+  );
+}
+
+function PiPControl() {
+  return (
+    <Tooltip.Root side="top">
+      <Tooltip.Trigger
+        render={
+          <PiPButton className="media-button--pip" render={<Button />}>
+            <PipEnterIcon className="media-icon media-icon--pip-enter" />
+            <PipExitIcon className="media-icon media-icon--pip-exit" />
+          </PiPButton>
+        }
+      />
+      <Tooltip.Popup className="media-surface media-tooltip">
+        <Tooltip.Label />
+        <Tooltip.Shortcut className="media-tooltip__kbd" />
+      </Tooltip.Popup>
+    </Tooltip.Root>
+  );
+}
+
+function FullscreenControl() {
+  return (
+    <Tooltip.Root side="top">
+      <Tooltip.Trigger
+        render={
+          <FullscreenButton className="media-button--fullscreen" render={<Button />}>
+            <FullscreenEnterIcon className="media-icon media-icon--fullscreen-enter" />
+            <FullscreenExitIcon className="media-icon media-icon--fullscreen-exit" />
+          </FullscreenButton>
+        }
+      />
+      <Tooltip.Popup className="media-surface media-tooltip">
+        <Tooltip.Label />
+        <Tooltip.Shortcut className="media-tooltip__kbd" />
+      </Tooltip.Popup>
+    </Tooltip.Root>
+  );
+}
+
 // ================================================================
 // Player
 // ================================================================
 
 const SEEK_TIME = 10;
 
-export const Player = createPlayer({ features: videoFeatures });
-
 export interface VideoPlayerProps {
   src: string;
   style?: CSSProperties;
@@ -336,7 +370,7 @@ export function VideoPlayer({ src, className, poster, placeholder, style, ...res
     : style;
 
   return (
-    <Player.Provider>
+    <Player>
       <Container
         className={`media-default-skin media-default-skin--video ${className ?? ''}`}
         style={containerStyle}
@@ -360,155 +394,96 @@ export function VideoPlayer({ src, className, poster, placeholder, style, ...res
           <ErrorDialog.Popup className="media-error">
             <div className="media-error__dialog media-surface">
               <div className="media-error__content">
-                <ErrorDialog.Title className="media-error__title">Something went wrong.</ErrorDialog.Title>
+                <ErrorDialog.Title className="media-error__title"></ErrorDialog.Title>
                 <ErrorDialog.Description className="media-error__description" />
               </div>
               <div className="media-error__actions">
-                <ErrorDialog.Close className="media-button media-button--primary">OK</ErrorDialog.Close>
+                <ErrorDialog.Close className="media-button media-button--primary"></ErrorDialog.Close>
               </div>
             </div>
           </ErrorDialog.Popup>
         </ErrorDialog.Root>
 
-        <Controls.Root className="media-surface media-controls">
+        <Controls.Root className="media-surface media-controls media-controls--root">
           <Tooltip.Provider>
-            <div className="media-button-group">
-              <Tooltip.Root side="top">
-                <Tooltip.Trigger
-                  render={
-                    <PlayButton className="media-button--play" render={<Button />}>
-                      <RestartIcon className="media-icon media-icon--restart" />
-                      <PlayIcon className="media-icon media-icon--play" />
-                      <PauseIcon className="media-icon media-icon--pause" />
-                    </PlayButton>
-                  }
-                />
-                <Tooltip.Popup className="media-surface media-tooltip">
-                  <Tooltip.Label />
-                  <Tooltip.Shortcut className="media-tooltip__kbd" />
-                </Tooltip.Popup>
-              </Tooltip.Root>
-
-              <Tooltip.Root side="top">
-                <Tooltip.Trigger
-                  render={
-                    <SeekButton seconds={-SEEK_TIME} className="media-button--seek" render={<Button />}>
-                      <span className="media-icon__container">
-                        <SeekIcon className="media-icon media-icon--seek media-icon--flipped" />
-                        <span className="media-icon__label">{SEEK_TIME}</span>
-                      </span>
-                    </SeekButton>
-                  }
-                />
-                <Tooltip.Popup className="media-surface media-tooltip">
-                  <Tooltip.Label />
-                  <Tooltip.Shortcut className="media-tooltip__kbd" />
-                </Tooltip.Popup>
-              </Tooltip.Root>
-
-              <Tooltip.Root side="top">
-                <Tooltip.Trigger
-                  render={
-                    <SeekButton seconds={SEEK_TIME} className="media-button--seek" render={<Button />}>
-                      <span className="media-icon__container">
-                        <SeekIcon className="media-icon media-icon--seek" />
-                        <span className="media-icon__label">{SEEK_TIME}</span>
-                      </span>
-                    </SeekButton>
-                  }
-                />
-                <Tooltip.Popup className="media-surface media-tooltip">
-                  <Tooltip.Label />
-                  <Tooltip.Shortcut className="media-tooltip__kbd" />
-                </Tooltip.Popup>
-              </Tooltip.Root>
-            </div>
-
-            <div className="media-time-controls">
-              <Time.Value type="current" className="media-time" />
-              <TimeSlider.Root className="media-slider">
-                <TimeSlider.Track className="media-slider__track">
-                  <TimeSlider.Fill className="media-slider__fill" />
-                  <TimeSlider.Buffer className="media-slider__buffer" />
-                </TimeSlider.Track>
-                <TimeSlider.Thumb className="media-slider__thumb" />
-
-                <div className="media-surface media-thumbnail media-slider__thumbnail">
-                  <Slider.Thumbnail className="media-thumbnail__image" />
-                  <TimeSlider.Value type="pointer" className="media-time media-thumbnail__time" />
-                  <SpinnerIcon className="media-thumbnail__spinner media-icon" />
-                </div>
-                <TimeSlider.Preview className="media-slider__preview">
-                  <TimeSlider.Value type="pointer" className="media-time media-slider__value" />
-                </TimeSlider.Preview>
-              </TimeSlider.Root>
-              <Time.Value toggle type="remaining" className="media-time" />
-            </div>
+            <div className="media-surface media-controls media-controls--primary">
+              <div className="media-button-group">
+                <Tooltip.Root side="top">
+                  <Tooltip.Trigger
+                    render={
+                      <PlayButton className="media-button--play" render={<Button />}>
+                        <RestartIcon className="media-icon media-icon--restart" />
+                        <PlayIcon className="media-icon media-icon--play" />
+                        <PauseIcon className="media-icon media-icon--pause" />
+                      </PlayButton>
+                    }
+                  />
+                  <Tooltip.Popup className="media-surface media-tooltip">
+                    <Tooltip.Label />
+                    <Tooltip.Shortcut className="media-tooltip__kbd" />
+                  </Tooltip.Popup>
+                </Tooltip.Root>
+
+                <VolumePopover />
+              </div>
 
-            <div className="media-button-group">
-              <VolumePopover />
+              <div className="media-time-controls">
+                <Time.Value type="current" className="media-time" />
+                <TimeSlider.Root className="media-slider">
+                  <TimeSlider.Chapters
+                    className="media-slider__chapters"
+                    renderChapter={(props) => (
+                      <div {...props} className={`${props.className} media-slider__chapter`}>
+                        <TimeSlider.Track className="media-slider__track media-slider__chapter-track">
+                          <TimeSlider.Buffer className="media-slider__buffer" />
+                          <TimeSlider.Fill className="media-slider__fill" />
+                        </TimeSlider.Track>
+                      </div>
+                    )}
+                  />
+                  <TimeSlider.Thumb className="media-slider__thumb" />
+
+                  <TimeSlider.Preview overflow="visible" className="media-slider__preview">
+                    <div className="media-surface media-thumbnail media-slider__thumbnail">
+                      <Slider.Thumbnail className="media-thumbnail__image" />
+                      <SpinnerIcon className="media-thumbnail__spinner media-icon" />
+                    </div>
+                    <div className="media-slider__value">
+                      <TimeSlider.ChapterTitle className="media-slider__chapter-title" />
+                      <TimeSlider.Value type="pointer" className="media-time" />
+                    </div>
+                  </TimeSlider.Preview>
+                </TimeSlider.Root>
+                <Time.Value toggle type="remaining" className="media-time" />
+              </div>
 
-              <SettingsMenu />
+              <div className="media-button-group">
+                <Tooltip.Root side="top">
+                  <Tooltip.Trigger
+                    render={
+                      <CaptionsButton className="media-button--captions" render={<Button />}>
+                        <CaptionsOffIcon className="media-icon media-icon--captions-off" />
+                        <CaptionsOnIcon className="media-icon media-icon--captions-on" />
+                      </CaptionsButton>
+                    }
+                  />
+                  <Tooltip.Popup className="media-surface media-tooltip">
+                    <Tooltip.Label />
+                    <Tooltip.Shortcut className="media-tooltip__kbd" />
+                  </Tooltip.Popup>
+                </Tooltip.Root>
+
+                <SettingsMenu />
+              </div>
+            </div>
 
-              <Tooltip.Root side="top">
-                <Tooltip.Trigger
-                  render={
-                    <CastButton className="media-button--cast" render={<Button />}>
-                      <CastEnterIcon className="media-icon media-icon--cast-enter" />
-                      <CastExitIcon className="media-icon media-icon--cast-exit" />
-                    </CastButton>
-                  }
-                />
-                <Tooltip.Popup className="media-surface media-tooltip">
-                  <Tooltip.Label />
-                  <Tooltip.Shortcut className="media-tooltip__kbd" />
-                </Tooltip.Popup>
-              </Tooltip.Root>
-
-              <Tooltip.Root side="top">
-                <Tooltip.Trigger
-                  render={
-                    <AirPlayButton className="media-button--airplay" render={<Button />}>
-                      <AirPlayEnterIcon className="media-icon media-icon--airplay-enter" />
-                      <AirPlayExitIcon className="media-icon media-icon--airplay-exit" />
-                    </AirPlayButton>
-                  }
-                />
-                <Tooltip.Popup className="media-surface media-tooltip">
-                  <Tooltip.Label />
-                  <Tooltip.Shortcut className="media-tooltip__kbd" />
-                </Tooltip.Popup>
-              </Tooltip.Root>
-
-              <Tooltip.Root side="top">
-                <Tooltip.Trigger
-                  render={
-                    <PiPButton className="media-button--pip" render={<Button />}>
-                      <PipEnterIcon className="media-icon media-icon--pip-enter" />
-                      <PipExitIcon className="media-icon media-icon--pip-exit" />
-                    </PiPButton>
-                  }
-                />
-                <Tooltip.Popup className="media-surface media-tooltip">
-                  <Tooltip.Label />
-                  <Tooltip.Shortcut className="media-tooltip__kbd" />
-                </Tooltip.Popup>
-              </Tooltip.Root>
-
-              <Tooltip.Root side="top">
-                <Tooltip.Trigger
-                  render={
-                    <FullscreenButton className="media-button--fullscreen" render={<Button />}>
-                      <FullscreenEnterIcon className="media-icon media-icon--fullscreen-enter" />
-                      <FullscreenExitIcon className="media-icon media-icon--fullscreen-exit" />
-                    </FullscreenButton>
-                  }
-                />
-                <Tooltip.Popup className="media-surface media-tooltip">
-                  <Tooltip.Label />
-                  <Tooltip.Shortcut className="media-tooltip__kbd" />
-                </Tooltip.Popup>
-              </Tooltip.Root>
+            <div className="media-surface media-controls media-controls--secondary">
+              <div className="media-button-group">
+                <CastControl />
+                <AirPlayControl />
+                <PiPControl />
+                <FullscreenControl />
+              </div>
             </div>
           </Tooltip.Provider>
         </Controls.Root>
@@ -541,46 +516,49 @@ export function VideoPlayer({ src, className, poster, placeholder, style, ...res
         <Gesture type="doubletap" action="toggleFullscreen" region="center" />
         <Gesture type="doubletap" action="seekStep" value={SEEK_TIME} region="right" />
 
-        {/* Input Feedback */}
-        <StatusAnnouncer />
-        <div className="media-input-feedback">
-          <VolumeIndicator.Root className="media-surface media-input-feedback-island media-input-feedback-island--volume">
-            <VolumeIndicator.Fill className="media-input-feedback-island__content">
+        {/* Input Indicators */}
+        <StatusAnnouncer className="media-sr-only" />
+        <div className="media-input-indicator-overlay">
+          <VolumeIndicator.Root className="media-surface media-volume-indicator">
+            <VolumeIndicator.Fill className="media-volume-indicator__content">
               <VolumeHighIcon className="media-icon media-icon--volume-high" />
               <VolumeLowIcon className="media-icon media-icon--volume-low" />
               <VolumeOffIcon className="media-icon media-icon--volume-off" />
-              <VolumeIndicator.Value className="media-input-feedback-island__value" />
+              <VolumeIndicator.Value className="media-volume-indicator__value" />
             </VolumeIndicator.Fill>
           </VolumeIndicator.Root>
 
           <StatusIndicator.Root
             actions={TOP_STATUS_ACTIONS}
-            className="media-surface media-input-feedback-island media-input-feedback-island--status"
+            className="media-surface media-status-indicator media-status-indicator--state"
           >
-            <div className="media-input-feedback-island__content">
+            <div className="media-status-indicator__content">
               <CaptionsOnIcon className="media-icon media-icon--captions-on" />
               <CaptionsOffIcon className="media-icon media-icon--captions-off" />
               <FullscreenEnterIcon className="media-icon media-icon--fullscreen-enter" />
               <FullscreenExitIcon className="media-icon media-icon--fullscreen-exit" />
               <PipEnterIcon className="media-icon media-icon--pip-enter" />
               <PipExitIcon className="media-icon media-icon--pip-exit" />
-              <StatusIndicator.Value className="media-input-feedback-island__value" />
+              <StatusIndicator.Value className="media-status-indicator__value" />
             </div>
           </StatusIndicator.Root>
 
-          <SeekIndicator.Root className="media-input-feedback-bubble">
+          <SeekIndicator.Root className="media-seek-indicator">
             <ChevronIcon className="media-icon media-icon--seek" />
-            <SeekIndicator.Value className="media-time" />
+            <SeekIndicator.Value className="media-seek-indicator__value" />
           </SeekIndicator.Root>
 
-          <StatusIndicator.Root actions={CENTER_STATUS_ACTIONS} className="media-input-feedback-bubble">
+          <StatusIndicator.Root
+            actions={CENTER_STATUS_ACTIONS}
+            className="media-status-indicator media-status-indicator--playback"
+          >
             <PlayIcon className="media-icon media-icon--play" />
             <PauseIcon className="media-icon media-icon--pause" />
           </StatusIndicator.Root>
         </div>
       </Container>
 
-    </Player.Provider>
+    </Player>
   );
 }
 
@@ -600,7 +578,7 @@ const Button = forwardRef<HTMLButtonElement, ComponentProps<'button'>>(function
 });
 
 function VolumePopover(): ReactNode {
-  const volumeUnsupported = usePlayer((s) => s.volumeAvailability === 'unsupported');
+  const volumeUnavailable = usePlayer((s) => s.volumeAvailability !== 'available');
 
   const muteButton = (
     <MuteButton className="media-button--mute" render={<Button />}>
@@ -610,7 +588,7 @@ function VolumePopover(): ReactNode {
     </MuteButton>
   );
 
-  if (volumeUnsupported) return muteButton;
+  if (volumeUnavailable) return muteButton;
 
   return (
     <Popover.Root openOnHover delay={200} closeDelay={100} side="top">
@@ -640,9 +618,24 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
 }
 ```
 ```
-/* ==========================================================================
-   Reset
-   ========================================================================== */
+import { createPlayer } from '@videojs/react';
+import { videoFeatures } from '@videojs/react/video';
+
+export const { Player } = createPlayer({ features: videoFeatures });
+```
+```
+.media-sr-only {
+  position: absolute;
+  width: 1px;
+  height: 1px;
+  padding: 0;
+  margin: -1px;
+  overflow: hidden;
+  white-space: nowrap;
+  border: 0;
+  clip: rect(0, 0, 0, 0);
+}
+
 
 .media-default-skin *,
 .media-default-skin *::before,
@@ -668,15 +661,37 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
   }
 }
 
-/* ==========================================================================
-   Root Container
-   ========================================================================== */
-
 .media-default-skin {
-  --media-current-shadow-color: oklch(from currentColor 0 0 0 / clamp(0, calc((l - 0.5) * 0.5), 0.15));
-  --media-current-shadow-color-subtle: oklch(from var(--media-current-shadow-color) l c h / calc(alpha * 0.4));
-  --media-icon-size: 18px;
-  --media-color-scrollbar-thumb: oklch(from currentColor l c h / 0.3);
+  /* Colors */
+  --accent-color: var(--media-accent-color, var(--default-accent-color));
+  --accent-contrast-color: contrast-color(var(--accent-color));
+  --accent-background-color: var(
+    --media-accent-color,
+    oklch(from var(--default-accent-color) l c h / calc(alpha * 0.1))
+  );
+  --accent-text-color: var(--media-accent-text-color, contrast-color(var(--media-accent-color, oklch(0 0 0))));
+  --shadow-current-color: oklch(from currentColor 0 0 0 / clamp(0, calc((l - 0.5) * 0.5), 0.15));
+  --shadow-subtle-current-color: oklch(from var(--shadow-current-color) l c h / calc(alpha * 0.4));
+  --scrollbar-thumb-color: oklch(from currentColor l c h / 0.3);
+
+  /* Scaling - used in video fullscreen to scale the UI. */
+  --scale: 1;
+  /* Fixed scaling unit to avoid inheriting the document's root font size. This must be a CSS <length>. */
+  --scale-unit: var(--media-scale-unit, 16px);
+  --size: calc(var(--scale-unit) * var(--scale));
+  /* Create a Tailwind-like spacing unit where 1 equals 4px with default scaling. */
+  --spacing: calc(var(--size) / 4);
+
+  /* Font sizes */
+  --font-size-medium: calc(0.9375 * var(--size)); /* 15px */
+  --font-size-base: calc(0.8125 * var(--size)); /* 13px */
+  --font-size-small: calc(0.6875 * var(--size)); /* 11px */
+  --font-size-tiny: calc(0.5625 * var(--size)); /* 9px */
+  --media-icon-size: calc(1.125 * var(--size)); /* 18px */
+
+  /* Radii */
+  --container-border-radius: var(--media-border-radius, 1.75rem);
+
   position: relative;
   display: block;
   width: 100%;
@@ -688,48 +703,44 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
     ui-sans-serif,
     system-ui,
     sans-serif;
-  font-size: 0.8125rem; /* 13px at 100% font size */
+  font-size: var(--font-size-base);
   -webkit-font-smoothing: auto;
   -moz-osx-font-smoothing: auto;
   line-height: 1.5;
   letter-spacing: normal;
   outline: 2px solid transparent;
   outline-offset: -4px;
-  scrollbar-color: var(--media-color-scrollbar-thumb) transparent;
+  scrollbar-color: var(--scrollbar-thumb-color) transparent;
   scrollbar-width: thin;
-  border-radius: var(--media-border-radius, 2rem);
+  border-radius: var(--container-border-radius, 1.75rem);
   isolation: isolate;
   transition-timing-function: ease-out;
   transition-duration: 100ms;
   transition-property: outline-offset, outline-color;
 
   &:focus-visible {
-    outline-color: currentColor;
+    outline-color: var(--focus-ring-color);
     outline-offset: 2px;
   }
 
   &::-webkit-scrollbar-thumb {
-    background: var(--media-color-scrollbar-thumb);
+    background: var(--scrollbar-thumb-color);
     border-radius: 9999px;
   }
 
   @media (prefers-reduced-transparency: reduce) or (prefers-contrast: more) {
-    --media-color-scrollbar-thumb: oklch(from currentColor l c h / 0.8);
+    --scrollbar-thumb-color: oklch(from currentColor l c h / 0.8);
     scrollbar-width: auto;
   }
 }
 
-/* ==========================================================================
-   Surface (shared glass effect for tooltips, popovers, controls)
-   ========================================================================== */
-
 .media-default-skin .media-surface {
-  background-color: var(--media-surface-background-color);
+  background-color: var(--surface-background-color);
   box-shadow:
-    0 0 0 1px var(--media-surface-outer-border-color),
-    0 1px 3px 0 var(--media-surface-shadow-color),
-    0 1px 2px -1px var(--media-surface-shadow-color);
-  backdrop-filter: var(--media-surface-backdrop-filter);
+    0 0 0 1px var(--surface-outer-border-color),
+    0 1px 3px 0 var(--surface-shadow-color),
+    0 1px 2px -1px var(--surface-shadow-color);
+  backdrop-filter: var(--surface-backdrop-filter);
 
   /* Inner border ring */
   &::after {
@@ -739,14 +750,12 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
     pointer-events: none;
     content: "";
     border-radius: inherit;
-    box-shadow: inset 0 0 0 1px var(--media-surface-inner-border-color);
+    box-shadow:
+      inset 0 1px 0 0 var(--surface-inner-border-color),
+      inset 0 0 0 1px oklch(from var(--surface-inner-border-color) l c h / calc(alpha * 0.5));
   }
 }
 
-/* ==========================================================================
-   Media Element
-   ========================================================================== */
-
 .media-default-skin ::slotted(video),
 .media-default-skin video {
   display: block;
@@ -756,7 +765,7 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
   object-position: var(--media-object-position, center);
 }
 .media-default-skin ::slotted(video) {
-  border-radius: var(--media-video-border-radius);
+  border-radius: var(--container-border-radius);
 }
 .media-default-skin video {
   border-radius: inherit;
@@ -767,10 +776,6 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
   object-fit: contain;
 }
 
-/* ==========================================================================
-   Overlay / Scrim
-   ========================================================================== */
-
 .media-default-skin .media-overlay {
   position: absolute;
   inset: 0;
@@ -780,13 +785,13 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
   opacity: 0;
   backdrop-filter: blur(0) saturate(1);
   transition-timing-function: ease-out;
-  transition-duration: var(--media-controls-transition-duration);
+  transition-duration: var(--controls-transition-duration);
   transition-property: opacity, backdrop-filter;
 }
 
 .media-default-skin .media-error ~ .media-overlay {
-  transition-delay: var(--media-error-dialog-transition-delay);
-  transition-duration: var(--media-error-dialog-transition-duration);
+  transition-delay: var(--error-dialog-transition-delay);
+  transition-duration: var(--error-dialog-transition-duration);
 }
 
 .media-default-skin .media-controls[data-visible] ~ .media-overlay,
@@ -804,10 +809,6 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
   backdrop-filter: blur(16px) saturate(1.5);
 }
 
-/* ==========================================================================
-   Buffering Indicator
-   ========================================================================== */
-
 .media-default-skin .media-buffering-indicator {
   position: absolute;
   inset: 0;
@@ -824,11 +825,11 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
   &[data-visible] {
     display: grid;
   }
-}
 
-/* ==========================================================================
-   Error Dialog
-   ========================================================================== */
+  @media (prefers-reduced-motion: reduce) {
+    --media-spinner-animation: none;
+  }
+}
 
 .media-default-skin .media-error {
   outline: none;
@@ -850,9 +851,9 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
 
 .media-default-skin .media-error__actions {
   display: flex;
-  gap: 0.5rem;
+  gap: calc(var(--spacing) * 2);
 
-  & > * {
+  > * {
     flex: 1;
   }
 }
@@ -861,31 +862,32 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
   visibility: hidden;
 }
 
-/* ==========================================================================
-   Controls
-   ========================================================================== */
-
 .media-default-skin .media-controls {
+  --media-popover-side-offset: calc(var(--spacing) * (var(--base-side-offset, 2) + 1));
+  --media-tooltip-side-offset: var(--media-popover-side-offset);
+  --media-popover-boundary-offset: calc(var(--spacing) * var(--base-boundary-offset, 2));
+  --media-tooltip-boundary-offset: var(--media-popover-boundary-offset);
+
   display: flex;
-  column-gap: 0.075rem;
   align-items: center;
-  padding: 0.375rem;
+  padding: calc(var(--spacing) * 1);
   container: media-controls / inline-size;
-  text-shadow: 0 1px 0 var(--media-current-shadow-color);
-  border-radius: 1.5rem;
+  text-shadow: 0 1px 0 var(--shadow-current-color);
+  border-radius: calc(Infinity * 1px);
 }
 
-/* ==========================================================================
-   Time Display
-   ========================================================================== */
-
 .media-default-skin .media-time-controls {
   display: flex;
   flex: 1;
-  gap: 0.75rem;
+  gap: calc(var(--spacing) * 2.5);
   align-items: center;
-  padding-inline: 0.5rem;
   container: media-time-controls / inline-size;
+
+  > .media-time:last-child {
+    @container media-time-controls (width < 16rem) {
+      display: none;
+    }
+  }
 }
 
 .media-default-skin .media-time {
@@ -896,29 +898,26 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
   cursor: pointer;
   outline: 2px solid transparent;
   outline-offset: -2px;
-  border-radius: 0.25rem;
+  border-radius: calc(var(--spacing) * 1);
   transition-timing-function: ease-out;
   transition-duration: 100ms;
   transition-property: outline-color, outline-offset;
 
   &:focus-visible {
-    outline-color: currentColor;
+    outline-color: var(--focus-ring-color);
     outline-offset: 2px;
   }
 }
 
-/* ==========================================================================
-   Buttons
-   ========================================================================== */
-
 /* Base button */
 .media-default-skin .media-button {
   display: flex;
   flex-shrink: 0;
   align-items: center;
   justify-content: center;
+  height: calc(var(--spacing) * 9);
   min-height: 0;
-  padding: 0.5rem 1rem;
+  padding: calc(var(--spacing) * 2) calc(var(--spacing) * 4);
   text-align: center;
   touch-action: manipulation;
   cursor: pointer;
@@ -926,40 +925,34 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
   outline: 2px solid transparent;
   outline-offset: -2px;
   border: none;
-  border-radius: calc(infinity * 1px);
+  border-radius: calc(Infinity * 1px);
   transition-timing-function: ease-out;
   transition-duration: 150ms;
-  transition-property: background-color, outline-offset, scale;
+  transition-property: background-color, color, outline-offset, scale;
   /* Fix weird jumping when clicking on the buttons in Safari. */
   will-change: scale;
 
   &:focus-visible {
-    outline-color: currentColor;
+    outline-color: var(--focus-ring-color);
     outline-offset: 2px;
   }
 
-  &:active {
-    scale: 0.98;
+  &:active:not([aria-disabled="true"]) {
+    scale: 0.97;
   }
 
-  &[disabled] {
+  &[aria-disabled="true"] {
     cursor: not-allowed;
     opacity: 0.5;
-    filter: grayscale(1);
-  }
-
-  &[data-availability="unavailable"],
-  &[data-availability="unsupported"] {
-    display: none;
   }
 }
 
 /* Primary button variant */
 .media-default-skin .media-button--primary {
   font-weight: 500;
-  color: oklch(0 0 0);
+  color: var(--accent-contrast-color);
   text-shadow: none;
-  background: oklch(1 0 0);
+  background: var(--accent-color);
 }
 
 /* Subtle button variant */
@@ -968,46 +961,47 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
   text-shadow: inherit;
   background: transparent;
 
-  &:hover,
-  &:focus-visible,
-  &[aria-expanded="true"] {
-    text-decoration: none;
-    background-color: oklch(from currentColor l c h / 0.1);
+  &:not([aria-disabled="true"]) {
+    &:hover,
+    &:focus-visible,
+    &[aria-expanded="true"] {
+      color: var(--accent-text-color);
+      text-decoration: none;
+      background-color: var(--accent-background-color);
+    }
   }
 }
 
 /* Icon button variant */
 .media-default-skin .media-button--icon {
   display: grid;
-  width: 2.25rem;
   aspect-ratio: 1;
   padding: 0;
 
-  &:active {
-    scale: 0.9;
+  &:active:not([aria-disabled="true"]) {
+    scale: 0.97;
   }
 
-  & .media-icon__container {
+  .media-icon__container {
     display: grid;
   }
 
-  & .media-icon {
+  .media-icon {
     grid-area: 1 / 1;
-    transition-behavior: allow-discrete;
-    transition-property: display, opacity;
-    transition-duration: 150ms;
+    filter: drop-shadow(0 1px 0 var(--shadow-current-color));
     transition-timing-function: ease-out;
-    filter: drop-shadow(0 1px 0 var(--media-current-shadow-color));
+    transition-duration: 150ms;
+    transition-property: opacity, scale;
   }
 }
 
 /* Seek button */
 .media-default-skin .media-button--seek {
-  & .media-icon__label {
+  .media-icon__label {
     position: absolute;
     right: -1px;
     bottom: -3px;
-    font-size: 10px;
+    font-size: 0.715em; /* 10px */
     font-weight: 500;
     font-variant-numeric: tabular-nums;
     letter-spacing: -0.05em;
@@ -1036,9 +1030,7 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
 
 /* Settings button */
 .media-default-skin .media-button--settings {
-  display: none;
-
-  & .media-icon--settings {
+  .media-icon--settings {
     transition: transform 150ms ease-in-out;
 
     @media (prefers-reduced-motion: reduce) {
@@ -1051,21 +1043,17 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
   }
 }
 
-.media-default-skin .media-button-group:has([data-availability="available"]) .media-button--settings {
-  display: grid;
-}
-
 /* Live button — wide pill button with a status dot (gray → red at the live
    edge) rendered via ::before, and "LIVE" text rendered as the button's own
    text content. */
 .media-default-skin .media-button--live {
   display: inline-flex;
-  gap: 0.4rem;
+  gap: calc(var(--spacing) * 1.5);
   align-items: center;
   width: auto;
   aspect-ratio: auto;
-  padding: 0.5rem 0.75rem;
-  font-size: 0.75rem;
+  padding: calc(var(--spacing) * 2) calc(var(--spacing) * 3);
+  font-size: var(--font-size-small);
   font-weight: 600;
   line-height: 1;
   text-transform: uppercase;
@@ -1074,8 +1062,8 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
   &::before {
     display: inline-block;
     flex-shrink: 0;
-    width: 0.5rem;
-    height: 0.5rem;
+    width: calc(var(--spacing) * 2);
+    height: calc(var(--spacing) * 2);
     content: "";
     background-color: oklch(from currentColor l c h / 0.4);
     border-radius: 50%;
@@ -1087,39 +1075,31 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
   }
 }
 
-/* ==========================================================================
-   Button Groups
-   ========================================================================== */
+@media (prefers-reduced-motion: reduce) {
+  .media-default-skin .media-button {
+    scale: 1;
+    transition-property: background-color, color, outline-offset;
+    will-change: auto;
+  }
+}
 
 .media-default-skin .media-button-group {
   display: flex;
-  gap: 0.075rem;
+  gap: 1px;
   align-items: center;
-
-  @container media-root (width > 42rem) {
-    gap: 0.125rem;
-  }
 }
 
-/* ==========================================================================
-   Badge
-   ========================================================================== */
-
 .media-default-skin .media-badge {
-  padding: 0.125rem 0.375rem;
-  font-size: 0.6875rem;
+  padding: calc(var(--spacing) * 0.5) calc(var(--spacing) * 1.5);
+  font-size: var(--font-size-small);
   font-weight: 500;
   line-height: 1;
   color: oklch(from currentColor l c h / 0.85);
   white-space: nowrap;
   background-color: oklch(from currentColor l c h / 0.1);
-  border-radius: calc(infinity * 1px);
+  border-radius: calc(Infinity * 1px);
 }
 
-/* ==========================================================================
-   Icons
-   ========================================================================== */
-
 .media-default-skin .media-icon__container {
   position: relative;
 }
@@ -1133,10 +1113,6 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
   scale: -1 1;
 }
 
-/* ==========================================================================
-   Poster Image
-   ========================================================================== */
-
 .media-default-skin media-poster,
 .media-default-skin > img {
   position: absolute;
@@ -1159,7 +1135,7 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
   height: 100%;
   object-fit: var(--media-object-fit, contain);
   object-position: var(--media-object-position, center);
-  border-radius: var(--media-video-border-radius);
+  border-radius: var(--container-border-radius);
 }
 .media-default-skin > img {
   object-fit: var(--media-object-fit, contain);
@@ -1197,18 +1173,17 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
   object-fit: contain;
 }
 
-/* ==========================================================================
-   Media thumbnail
-   ========================================================================== */
-
 .media-default-skin .media-thumbnail {
+  position: relative;
   pointer-events: none;
   background-color: oklch(0 0 0 / 0.9);
-  border-radius: 0.75rem;
+  border-radius: calc(var(--spacing) * 3);
 
-  & .media-thumbnail__image {
+  .media-thumbnail__image {
     position: relative;
     display: block;
+    max-width: var(--thumbnail-max-width);
+    max-height: var(--max-height);
     overflow: clip;
     border-radius: inherit;
 
@@ -1216,19 +1191,12 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
       position: absolute;
       inset: 0;
       content: "";
-      background-image: linear-gradient(to top, oklch(0 0 0 / 0.8), oklch(0 0 0 / 0.3), oklch(0 0 0 / 0));
+      background-image: linear-gradient(to top, oklch(0 0 0 / 0.5), oklch(0 0 0 / 0.1), oklch(0 0 0 / 0));
       border-radius: inherit;
     }
   }
 
-  & .media-thumbnail__time {
-    position: absolute;
-    inset-inline: 0;
-    bottom: 0.5rem;
-    text-align: center;
-  }
-
-  & .media-thumbnail__spinner {
+  .media-thumbnail__spinner {
     position: absolute;
     top: 50%;
     left: 50%;
@@ -1236,32 +1204,41 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
     translate: -50% -50%;
   }
 
-  & .media-thumbnail__image,
-  & .media-thumbnail__spinner {
+  .media-thumbnail__image,
+  .media-thumbnail__spinner {
     transition: opacity 150ms ease-out;
   }
 
   &:not(:has(.media-thumbnail__image[data-loading])) {
-    & .media-thumbnail__spinner {
+    .media-thumbnail__spinner {
       --media-spinner-animation: none;
     }
   }
 
+  @media (prefers-reduced-motion: reduce) {
+    --media-spinner-animation: none;
+  }
+
   &:has(.media-thumbnail__image[data-loading]) {
-    & .media-thumbnail__image {
+    width: var(--thumbnail-max-width);
+    max-width: 100%;
+    aspect-ratio: 16 / 9;
+    overflow: hidden;
+
+    .media-thumbnail__image {
       opacity: 0;
     }
-    & .media-thumbnail__spinner {
+    .media-thumbnail__spinner {
       opacity: 1;
     }
   }
 }
 
-/* ==========================================================================
-   Slider
-   ========================================================================== */
-
 .media-default-skin .media-slider {
+  --thumb-size: calc(var(--spacing) * 2.5);
+  --thumb-active-size: calc(var(--spacing) * 3);
+  --track-border-radius: calc(Infinity * 1px);
+
   position: relative;
   display: flex;
   flex: 1;
@@ -1269,235 +1246,383 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
   justify-content: center;
   cursor: pointer;
   outline: none;
-  border-radius: calc(infinity * 1px);
 
   &[data-orientation="horizontal"] {
-    width: 100%;
-    min-width: 5rem;
-    height: 2rem;
+    width: var(--slider-width, 100%);
+    min-width: calc(var(--spacing) * 20);
+    height: var(--slider-height, calc(var(--spacing) * 8));
   }
-
   &[data-orientation="vertical"] {
-    width: 2rem;
-    height: 5rem;
+    width: var(--slider-width, calc(var(--spacing) * 8));
+    height: var(--slider-height, calc(var(--spacing) * 20));
   }
-}
 
-/* Track */
-.media-default-skin .media-slider__track {
-  position: relative;
-  overflow: hidden;
-  user-select: none;
-  border-radius: inherit;
-  isolation: isolate;
+  /* Track */
+  .media-slider__track {
+    position: relative;
+    overflow: hidden;
+    user-select: none;
+    background-color: oklch(from currentColor l c h / 0.2);
+    border-radius: var(--track-border-radius);
+    isolation: isolate;
 
-  &[data-orientation="horizontal"] {
-    width: 100%;
-    height: 0.25rem;
+    &[data-orientation="horizontal"] {
+      width: 100%;
+      height: calc(var(--spacing) * 1);
+    }
+    &[data-orientation="vertical"] {
+      width: calc(var(--spacing) * 1);
+      height: 100%;
+    }
   }
 
-  &[data-orientation="vertical"] {
-    width: 0.25rem;
-    height: 100%;
+  /* Shared track fills */
+  .media-slider__buffer,
+  .media-slider__fill {
+    position: absolute;
+    pointer-events: none;
+    border-radius: inherit;
+
+    &[data-orientation="horizontal"] {
+      inset-block: 0;
+      left: 0;
+      width: 100%;
+      transition-property: clip-path;
+    }
+    &[data-orientation="vertical"] {
+      inset-inline: 0;
+      bottom: 0;
+      height: 100%;
+      transition-property: clip-path;
+    }
   }
-}
 
-/* Thumb */
-.media-default-skin .media-slider__thumb {
-  position: absolute;
-  z-index: 10;
-  width: 0.625rem;
-  height: 0.625rem;
-  user-select: none;
-  outline: 4px solid transparent;
-  outline-offset: -4px;
-  background-color: currentColor;
-  border-radius: calc(infinity * 1px);
-  box-shadow:
-    0 0 0 1px var(--media-current-shadow-color, oklch(0 0 0 / 0.1)),
-    0 1px 3px 0 oklch(0 0 0 / 0.35),
-    0 1px 2px -1px oklch(0 0 0 / 0.35);
-  opacity: 0;
-  translate: -50% -50%;
-  transition-timing-function: ease-out;
-  transition-duration: 150ms;
-  transition-property: opacity, height, width, outline-offset;
+  /* Buffer */
+  .media-slider__buffer {
+    background-color: oklch(from currentColor l c h / 0.2);
 
-  &[data-orientation="horizontal"] {
-    top: 50%;
-    left: var(--media-slider-fill);
+    &[data-orientation="horizontal"] {
+      clip-path: inset(0 calc(100% - var(--media-slider-buffer)) 0 0 round var(--track-border-radius));
+    }
+    &[data-orientation="vertical"] {
+      clip-path: inset(calc(100% - var(--media-slider-buffer)) 0 0 0 round var(--track-border-radius));
+    }
   }
 
-  &[data-orientation="vertical"] {
-    top: calc(100% - var(--media-slider-fill));
-    left: 50%;
-  }
+  /* Fill */
+  .media-slider__fill {
+    background-color: var(--accent-color);
 
-  &:hover,
-  &:focus {
-    outline-color: oklch(from currentColor l c h / 0.15);
-    outline-offset: 0;
+    &[data-orientation="horizontal"] {
+      clip-path: inset(0 calc(100% - var(--media-slider-fill)) 0 0 round var(--track-border-radius));
+    }
+    &[data-orientation="vertical"] {
+      clip-path: inset(calc(100% - var(--media-slider-fill)) 0 0 0 round var(--track-border-radius));
+    }
   }
 
-  &::after {
-    position: absolute;
-    inset: -4px;
-    content: "";
+  /* Chapters */
+  .media-slider__chapters {
+    position: relative;
+    display: flex;
+    flex: 1;
+    align-items: center;
+    min-width: 0;
+    min-height: 0;
     border-radius: inherit;
-    box-shadow: 0 0 0 2px currentColor;
-    transition-timing-function: ease-out;
-    transition-duration: 150ms;
-    transition-property: opacity, scale;
-  }
 
-  &:not(:focus-visible)::after {
-    opacity: 0;
-    scale: 0.5;
+    &[data-orientation="horizontal"] {
+      width: 100%;
+      height: 100%;
+    }
+    &[data-orientation="vertical"] {
+      flex-direction: column-reverse;
+      width: 100%;
+      height: 100%;
+    }
   }
-}
 
-.media-default-skin .media-slider:active .media-slider__thumb,
-.media-default-skin .media-slider__thumb--persistent {
-  width: 0.75rem;
-  height: 0.75rem;
-}
+  .media-slider__chapter {
+    --chapter-gap: calc(var(--spacing) * 1);
+    --chapter-inset-start: 0.5;
+    --chapter-inset-end: 0.5;
 
-.media-default-skin .media-slider:hover .media-slider__thumb,
-.media-default-skin .media-slider__thumb:focus-visible,
-.media-default-skin .media-slider__thumb--persistent {
-  opacity: 1;
-}
+    position: absolute;
+    inset: 0;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    min-width: 0;
+    min-height: 0;
+    border-radius: inherit;
 
-/* Preview */
-.media-default-skin .media-slider__preview {
-  & .media-slider__value,
-  &::before {
-    opacity: 0;
-    scale: 0.5;
-    transition-timing-function: ease-out;
-    transition-duration: 200ms;
-    transition-property: opacity, scale;
-  }
+    &:first-child {
+      --chapter-inset-start: 0;
+    }
+    &:last-child {
+      --chapter-inset-end: 0;
+    }
 
-  & .media-slider__value {
-    position: absolute;
-    bottom: 2.25rem;
-    text-shadow: 0 1px 0 var(--media-current-shadow-color);
-    filter: blur(8px);
-    translate: -50% 0.5rem;
-    transition-property: filter, opacity, scale, translate;
-  }
+    .media-slider__chapter-track {
+      --chapter-track-size: calc(var(--spacing) * 1);
+      --chapter-track-highlighted-size: calc(var(--spacing) * 1.75);
 
-  &::before {
-    display: block;
-    min-width: 0.25rem;
-    height: 0.25rem;
-    content: "";
-    background-color: currentColor;
-    border-radius: 100%;
-    box-shadow:
-      0 0 0 1px var(--media-current-shadow-color, oklch(0 0 0 / 0.15)),
-      0 1px 2px 0 oklch(0 0 0 / 0.35);
-  }
+      border-radius: inherit;
 
-  &[data-pointing] .media-slider__value,
-  &[data-pointing]:not([data-dragging])::before {
-    opacity: 1;
-    scale: 1;
-  }
-  &[data-pointing] .media-slider__value {
-    filter: blur(0);
-    translate: -50% 0;
-  }
-}
+      @media (prefers-reduced-motion: no-preference) {
+        transition: 200ms ease-out;
+        transition-property: height, width;
+      }
+    }
 
-/* Shared track fills */
-.media-default-skin .media-slider__buffer,
-.media-default-skin .media-slider__fill {
-  position: absolute;
-  pointer-events: none;
-  border-radius: inherit;
-}
+    &[data-orientation="horizontal"] {
+      clip-path: inset(0 calc(100% - var(--media-slider-chapter-end)) 0 var(--media-slider-chapter-start));
 
-.media-default-skin .media-slider__buffer[data-orientation="horizontal"],
-.media-default-skin .media-slider__fill[data-orientation="horizontal"] {
-  inset-block: 0;
-  left: 0;
-}
+      .media-slider__chapter-track {
+        height: var(--chapter-track-size);
+        clip-path: inset(
+          0 calc(100% - var(--media-slider-chapter-end) + var(--chapter-gap) * var(--chapter-inset-end)) 0
+            calc(var(--media-slider-chapter-start) + var(--chapter-gap) * var(--chapter-inset-start)) round
+            var(--track-border-radius)
+        );
+      }
 
-.media-default-skin .media-slider__buffer[data-orientation="vertical"],
-.media-default-skin .media-slider__fill[data-orientation="vertical"] {
-  inset-inline: 0;
-  bottom: 0;
-}
+      &[data-highlighted] .media-slider__chapter-track {
+        height: var(--chapter-track-highlighted-size);
+      }
+    }
 
-/* Buffer */
-.media-default-skin .media-slider__buffer {
-  background-color: oklch(from currentColor l c h / 0.2);
-  transition-timing-function: ease-out;
-  transition-duration: 0.25s;
+    &[data-orientation="vertical"] {
+      clip-path: inset(calc(100% - var(--media-slider-chapter-end)) 0 var(--media-slider-chapter-start) 0);
 
-  &[data-orientation="horizontal"] {
-    width: var(--media-slider-buffer);
-    transition-property: width;
-  }
+      .media-slider__chapter-track {
+        width: var(--chapter-track-size);
+        clip-path: inset(
+          calc(100% - var(--media-slider-chapter-end) + var(--chapter-gap) * var(--chapter-inset-end)) 0
+            calc(var(--media-slider-chapter-start) + var(--chapter-gap) * var(--chapter-inset-start)) 0 round
+            var(--track-border-radius)
+        );
+      }
 
-  &[data-orientation="vertical"] {
-    height: var(--media-slider-buffer);
-    transition-property: height;
+      &[data-highlighted] .media-slider__chapter-track {
+        width: var(--chapter-track-highlighted-size);
+      }
+    }
   }
-}
 
-/* Fill */
-.media-default-skin .media-slider__fill {
-  background-color: currentColor;
+  /* Dragging — thumb and fill follow the pointer position */
+  &[data-dragging] {
+    .media-slider__thumb[data-orientation="horizontal"] {
+      left: var(--media-slider-pointer);
+    }
+    .media-slider__thumb[data-orientation="vertical"] {
+      top: calc(100% - var(--media-slider-pointer));
+    }
+    .media-slider__fill[data-orientation="horizontal"] {
+      clip-path: inset(0 calc(100% - var(--media-slider-pointer)) 0 0 round var(--track-border-radius));
+    }
+    .media-slider__fill[data-orientation="vertical"] {
+      clip-path: inset(calc(100% - var(--media-slider-pointer)) 0 0 0 round var(--track-border-radius));
+    }
+  }
 
-  &[data-orientation="horizontal"] {
-    width: var(--media-slider-fill);
+  @media (prefers-reduced-motion: no-preference) {
+    .media-slider__thumb {
+      transition-property: opacity, height, width, outline-offset, left, top;
+    }
+    .media-slider__fill {
+      transition-timing-function: linear;
+      transition-duration: 200ms;
+    }
+    .media-slider__buffer {
+      transition-timing-function: ease-out;
+      transition-duration: 250ms;
+    }
   }
 
-  &[data-orientation="vertical"] {
-    height: var(--media-slider-fill);
+  &[data-dragging],
+  &[data-seeking] {
+    .media-slider__thumb,
+    .media-slider__fill,
+    .media-slider__buffer {
+      transition-duration: 0ms;
+    }
   }
-}
 
-/* Dragging — thumb and fill follow the pointer position */
-.media-default-skin .media-slider[data-dragging] .media-slider__thumb[data-orientation="horizontal"] {
-  left: var(--media-slider-pointer);
-}
+  /* Thumb */
+  .media-slider__thumb {
+    position: absolute;
+    z-index: 10;
+    width: var(--thumb-size);
+    height: var(--thumb-size);
+    user-select: none;
+    outline: 4px solid transparent;
+    outline-offset: -4px;
+    background-color: currentColor;
+    border-radius: calc(Infinity * 1px);
+    box-shadow:
+      0 0 0 1px var(--shadow-current-color, oklch(0 0 0 / 0.1)),
+      0 1px 3px 0 oklch(0 0 0 / 0.35),
+      0 1px 2px -1px oklch(0 0 0 / 0.35);
+    opacity: 0;
+    translate: -50% -50%;
+    transition-timing-function: ease-out;
+    transition-duration: 150ms;
+    transition-property: opacity, height, width, outline-offset;
 
-.media-default-skin .media-slider[data-dragging] .media-slider__thumb[data-orientation="vertical"] {
-  top: calc(100% - var(--media-slider-pointer));
-}
+    &[data-orientation="horizontal"] {
+      top: 50%;
+      left: var(--media-slider-fill);
+    }
+    &[data-orientation="vertical"] {
+      top: calc(100% - var(--media-slider-fill));
+      left: 50%;
+    }
 
-.media-default-skin .media-slider[data-dragging] .media-slider__fill[data-orientation="horizontal"] {
-  width: var(--media-slider-pointer);
-}
+    &:focus-visible {
+      outline-color: oklch(from currentColor l c h / 0.15);
+      outline-offset: 0;
+      opacity: 1;
+    }
 
-.media-default-skin .media-slider[data-dragging] .media-slider__fill[data-orientation="vertical"] {
-  height: var(--media-slider-pointer);
-}
+    @media (hover: hover) and (pointer: fine) {
+      &:hover {
+        outline-color: oklch(from currentColor l c h / 0.15);
+        outline-offset: 0;
+      }
+    }
 
-/* ==========================================================================
-   Popups & Tooltips
-   ========================================================================== */
+    &::after {
+      position: absolute;
+      inset: -4px;
+      content: "";
+      border-radius: inherit;
+      box-shadow: 0 0 0 2px currentColor;
+      transition-timing-function: ease-out;
+      transition-duration: 150ms;
+      transition-property: opacity, scale;
+    }
+
+    &:not(:focus-visible)::after {
+      opacity: 0;
+      scale: 0.5;
+    }
+
+    &.media-slider__thumb--persistent {
+      width: var(--thumb-active-size);
+      height: var(--thumb-active-size);
+      opacity: 1;
+    }
+  }
+
+  &:active .media-slider__thumb,
+  &:focus-within .media-slider__thumb {
+    width: var(--thumb-active-size);
+    height: var(--thumb-active-size);
+  }
+
+  @media (hover: hover) and (pointer: fine) {
+    &:hover .media-slider__thumb {
+      opacity: 1;
+    }
+  }
+
+  /* Preview */
+  .media-slider__preview {
+    --max-width: min(calc(var(--spacing) * 48), 100cqi);
+    --max-height: calc(var(--spacing) * 32);
+
+    min-width: var(--max-width);
+    height: calc(var(--spacing) * 1);
+
+    .media-slider__thumbnail,
+    .media-slider__value {
+      position: absolute;
+      left: 50%;
+      max-width: var(--max-width);
+      opacity: 0;
+      filter: blur(8px);
+      transform-origin: bottom;
+      scale: 0.8;
+      translate: -50% calc(var(--spacing) * 2);
+      transition-timing-function: ease-out;
+      transition-duration: 150ms;
+    }
+
+    .media-slider__thumbnail {
+      --thumbnail-max-width: var(--max-width);
+      bottom: calc(100% + (var(--spacing) * 9));
+    }
+
+    .media-slider__value {
+      bottom: calc(100% + (var(--spacing) * 10.5));
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      text-shadow: 0 1px 0 var(--shadow-current-color);
+    }
+
+    .media-slider__chapter-title {
+      min-width: 0;
+      max-width: var(--max-width);
+      padding-inline: calc(var(--spacing) * 3);
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+
+      &:empty {
+        display: none;
+      }
+    }
+
+    &::before {
+      position: absolute;
+      top: 50%;
+      left: 50%;
+      z-index: 1;
+      width: calc(var(--spacing) * 1);
+      height: calc(var(--spacing) * 1);
+      pointer-events: none;
+      content: "";
+      background-color: currentColor;
+      border-radius: 100%;
+      box-shadow:
+        0 0 0 1px var(--shadow-current-color, oklch(0 0 0 / 0.15)),
+        0 1px 2px 0 oklch(0 0 0 / 0.35);
+      opacity: 0;
+      scale: 0.5;
+      translate: -50% -50%;
+      transition-timing-function: ease-out;
+      transition-duration: 200ms;
+      transition-property: opacity, scale;
+    }
+
+    &[data-pointing]:not([data-dragging])::before,
+    &[data-pointing] :is(.media-slider__thumbnail, .media-slider__value),
+    &[data-interactive]:not([data-pointing]):not([data-dragging]) :is(.media-slider__value, .media-slider__thumbnail) {
+      opacity: 1;
+      filter: blur(0);
+      scale: 1;
+    }
+  }
+}
 
 .media-default-skin {
-  --media-popup-transition:
-    opacity var(--media-popup-transition-timing-function) var(--media-popup-transition-duration),
-    filter var(--media-popup-transition-timing-function) var(--media-popup-transition-duration),
-    transform var(--media-popup-transition-timing-function) var(--media-popup-transition-duration),
-    scale var(--media-popup-transition-timing-function) var(--media-popup-transition-duration);
+  --popup-transition:
+    opacity var(--popup-transition-timing-function) var(--popup-transition-duration),
+    filter var(--popup-transition-timing-function) var(--popup-transition-duration),
+    transform var(--popup-transition-timing-function) var(--popup-transition-duration),
+    scale var(--popup-transition-timing-function) var(--popup-transition-duration);
 }
 
 .media-default-skin .media-popover,
 .media-default-skin .media-tooltip {
-  --popup-translate-distance: 0.5rem;
+  --popup-translate-distance: calc(0.5 * var(--scale-unit));
   margin: 0;
   overflow: visible;
   color: inherit;
   border: 0;
-  transition: var(--media-popup-transition);
+  transition: var(--popup-transition);
 
   &[data-starting-style],
   &[data-ending-style] {
@@ -1511,7 +1636,7 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
   &[data-ending-style] {
     transform: none;
     /* Speed up the exit transition. */
-    transition-duration: max(0ms, calc(var(--media-popup-transition-duration) - 50ms));
+    transition-duration: max(0ms, calc(var(--popup-transition-duration) - 50ms));
   }
 
   &[data-side="top"] {
@@ -1574,24 +1699,24 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
   }
 }
 .media-default-skin .media-popover--volume {
-  padding: 0.75rem 0;
-  border-radius: calc(infinity * 1px);
+  padding: calc(var(--spacing) * 3) 0;
+  border-radius: calc(Infinity * 1px);
 
-  &:has(media-volume-slider[data-availability="unsupported"]) {
+  &:has(media-volume-slider[data-hidden]) {
     display: none;
   }
 }
 
 .media-default-skin .media-tooltip {
-  padding: 0.25rem 0.625rem;
-  font-size: 0.75rem;
+  padding: calc(var(--spacing) * 1) calc(var(--spacing) * 2.5);
+  font-size: var(--font-size-base);
   white-space: nowrap;
-  border-radius: calc(infinity * 1px);
+  border-radius: calc(Infinity * 1px);
 
   /* `display: flex` must not apply while closed — it overrides UA `[popover]` hiding. */
   &[data-open] {
     display: flex;
-    column-gap: 0.25rem;
+    column-gap: calc(var(--spacing) * 1);
     align-items: center;
   }
 
@@ -1604,31 +1729,27 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
     width: var(--media-tooltip-side-offset);
   }
 
-  & .media-tooltip__kbd {
+  .media-tooltip__kbd {
     min-width: 1.5em;
     padding: 0.1em;
     font-family: inherit;
-    font-size: 90%;
+    font-size: var(--font-size-small);
     font-weight: 600;
     line-height: 1.25;
     text-align: center;
     background-color: oklch(from currentColor l c h / 0.3);
-    border-radius: 0.25rem;
+    border-radius: calc(var(--spacing) * 1);
   }
 }
 
-/* ==========================================================================
-   Menus
-   Note: Menus use `.media-popover` styles for positioning and transitions.
-   ========================================================================== */
-
 .media-default-skin .media-menu {
   --menu-transition-duration: 250ms;
-  --menu-max-height: 14rem;
-  --menu-padding: 0.25rem;
-  --menu-border-radius: 0.75rem;
+  --menu-max-height: calc(var(--spacing) * 56);
+  --menu-padding: calc(var(--spacing) * 1);
+  --menu-border-radius: calc(var(--spacing) * 3);
   --menu-item-border-radius: calc(var(--menu-border-radius) - var(--menu-padding));
   box-sizing: border-box;
+  min-width: max-content;
   max-width: var(--media-popover-available-width, none);
   max-height: min(var(--media-popover-available-height, var(--menu-max-height)), var(--menu-max-height));
   padding: var(--menu-padding);
@@ -1640,138 +1761,124 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
     --menu-transition-duration: 0ms;
   }
 
-  & .media-menu__panel {
+  & > .media-menu__panel {
     position: absolute;
-    inset: 0;
+    inset-inline: 0;
+    top: 0;
+    z-index: 10;
+    max-height: inherit;
     padding: var(--menu-padding);
     overflow: auto;
     overscroll-behavior: none;
     outline: none;
     translate: 0 0;
-    transition-timing-function: ease-in-out;
+    transition-timing-function: ease-out;
     transition-duration: var(--menu-transition-duration);
     transition-property: translate, filter;
     will-change: translate, filter;
 
-    &[data-starting-style],
-    &[data-ending-style] {
+    &:where([data-starting-style], [data-ending-style]) {
       overflow: hidden;
-    }
-
-    /* Root settings view — slides out when a submenu is active */
-    &[data-menu-root-view][data-menu-view-state="inactive"] {
+      pointer-events: none;
       filter: blur(8px);
-      translate: -100% 0;
-
-      /* Hide the indicator while transitioning */
-      & .media-menu__group::before {
-        display: none;
-      }
-    }
-
-    /* Submenu panels — slide in/out alongside the root view */
-    &[data-submenu] {
-      z-index: 10;
-
-      &:not([data-open], [data-ending-style]) {
-        translate: -100% 0;
-        transition-property: none;
-      }
-
-      &[data-starting-style],
-      &[data-ending-style] {
-        pointer-events: none;
-        filter: blur(8px);
-      }
-
-      &[data-starting-style][data-direction="forward"],
-      &[data-ending-style][data-direction="back"] {
-        translate: 100% 0;
-      }
-
-      &[data-ending-style][data-direction="forward"],
-      &[data-starting-style][data-direction="back"] {
-        translate: -100% 0;
-      }
+      translate: 100% 0;
     }
   }
 
-  & .media-menu__separator {
-    margin-block: 0.25rem;
+  .media-menu__separator {
+    margin-block: calc(var(--spacing) * 1);
     border-bottom: 1px solid oklch(0 0 0 / 0.1);
     box-shadow: 0 1px 0 0 oklch(1 0 0 / 0.075);
   }
 
-  & .media-menu__group {
+  .media-menu__group {
+    anchor-scope: --menu-item-highlight-anchor;
     display: flex;
     flex-direction: column;
-    gap: 0.125rem;
+    gap: calc(var(--spacing) * 0.5);
 
     @supports (top: anchor(top)) {
       &::before {
         position: absolute;
-        position-anchor: --media-menu-item-highlight-anchor;
+        position-anchor: --menu-item-highlight-anchor;
         inset: anchor(inside);
+        /* Firefox treats the moving highlight as a content shift and re-scrolls
+           the menu while hovering. Exclude it from scroll anchoring. */
+        overflow-anchor: none;
         pointer-events: none;
         content: "";
-        background-color: oklch(from currentColor l c h / 0.1);
+        background-color: var(--accent-background-color);
         border-radius: var(--menu-item-border-radius);
-        transition: inset ease-in-out 100ms;
+        transition: inset 100ms ease-in-out;
+      }
+
+      &:has([data-highlighted=""])::before {
+        transition-duration: 0ms;
       }
     }
   }
 
-  & .media-menu__item,
-  & .media-menu__back {
+  .media-menu__item,
+  .media-menu__back {
+    position: relative;
     display: flex;
-    gap: 0.375rem;
+    gap: calc(var(--spacing) * 1.5);
     align-items: center;
-    padding: 0.375rem 0.5rem;
+    padding: calc(var(--spacing) * 1.5) calc(var(--spacing) * 2);
     text-align: left;
-    text-shadow: 0 1px 0 var(--media-current-shadow-color);
+    text-shadow: 0 1px 0 var(--shadow-current-color);
     cursor: pointer;
     user-select: none;
     outline: 2px solid transparent;
     outline-offset: -2px;
     border-radius: var(--menu-item-border-radius);
     transition: background-color, color;
-    transition-timing-function: ease-out;
+    transition-timing-function: ease-in-out;
     transition-duration: 100ms;
 
+    .media-icon {
+      flex-shrink: 0;
+      color: oklch(from currentColor l c h / 0.65);
+      filter: drop-shadow(0 1px 0 var(--shadow-current-color));
+    }
+
     &:focus-visible {
-      outline-color: currentColor;
+      outline-color: var(--focus-ring-color);
       outline-offset: 2px;
     }
 
     &:hover,
     &[data-highlighted] {
-      background-color: oklch(from currentColor l c h / 0.1);
+      color: var(--accent-text-color);
+      background-color: var(--accent-background-color);
 
-      @supports (top: anchor(top)) {
-        anchor-name: --media-menu-item-highlight-anchor;
-        background-color: transparent;
+      .media-icon {
+        color: inherit;
       }
     }
 
-    & .media-icon {
-      flex-shrink: 0;
-      color: oklch(from currentColor l c h / 0.65);
-      filter: drop-shadow(0 1px 0 var(--media-current-shadow-color));
+    @supports (top: anchor(top)) {
+      transition-duration: 50ms;
+
+      &:hover,
+      &[data-highlighted] {
+        transition-duration: 200ms;
+      }
     }
   }
 
-  & .media-menu__indicator {
+  .media-menu__indicator {
     flex-shrink: 0;
-    margin-right: -0.25rem;
+    margin-right: calc(var(--spacing) * -1);
     margin-left: auto;
     opacity: 0;
 
-    & .media-icon {
-      filter: drop-shadow(0 1px 0 var(--media-current-shadow-color));
+    .media-icon {
+      filter: drop-shadow(0 1px 0 var(--shadow-current-color));
     }
   }
 
-  & .media-menu__item {
+  .media-menu__item {
     justify-content: space-between;
     font-variant-numeric: tabular-nums;
     color: inherit;
@@ -1790,82 +1897,97 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
     &[data-availability="unsupported"] {
       display: none;
     }
+
+    &[data-highlighted] {
+      @supports (top: anchor(top)) {
+        anchor-name: --menu-item-highlight-anchor;
+        background-color: transparent;
+      }
+    }
   }
 
-  & .media-menu__tier {
+  .media-menu__tier {
     padding-top: 1px;
-    padding-left: 0.125rem;
-    font-size: 0.5625rem;
+    padding-left: calc(var(--spacing) * 0.5);
+    font-size: var(--font-size-tiny);
     font-weight: 600;
     line-height: 1;
     color: oklch(from currentColor l c h / 0.7);
   }
 
-  & .media-menu__back {
+  .media-menu__back {
     width: 100%;
-    margin-bottom: 0.125rem;
+    margin-bottom: calc(var(--spacing) * 0.5);
   }
 
-  & .media-menu__hint {
+  .media-menu__hint {
     display: inline-flex;
-    gap: 0.25rem;
+    gap: calc(var(--spacing) * 1);
     align-items: center;
     min-width: 0;
-    padding-left: 0.5rem;
+    padding-left: calc(var(--spacing) * 2);
     margin-left: auto;
-    font-size: 0.75rem;
     color: oklch(from currentColor l c h / 0.65);
   }
 
-  & .media-menu__hint-label {
-    max-width: 6rem;
+  .media-menu__hint-label {
+    max-width: calc(var(--spacing) * 24);
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
   }
 
-  & .media-menu__chevron {
-    width: 0.875rem;
-    height: 0.875rem;
+  .media-menu__chevron {
+    width: calc(var(--spacing) * 3.5);
+    height: calc(var(--spacing) * 3.5);
   }
 
   /* Settings menu */
   &.media-menu--settings {
     width: var(--media-menu-width);
-    min-width: 12rem;
+    min-width: calc(var(--spacing) * 48);
     height: var(--media-menu-height);
     overflow: hidden;
-    /* Add height and width transitions. */
+    /* Only the menu size changes between panels. */
     transition:
-      var(--media-popup-transition),
-      height var(--media-popup-transition-timing-function) var(--menu-transition-duration),
-      width var(--media-popup-transition-timing-function) var(--menu-transition-duration);
+      var(--popup-transition),
+      width var(--popup-transition-timing-function) var(--menu-transition-duration),
+      height var(--popup-transition-timing-function) var(--menu-transition-duration);
+
+    & > :not([data-submenu]) {
+      translate: 0 0;
+      transition:
+        translate var(--menu-transition-duration) ease-out,
+        filter var(--menu-transition-duration) ease-out;
+      will-change: translate, filter;
+    }
+
+    &[data-submenu-expanded="true"] > :not([data-submenu]) {
+      filter: blur(8px);
+      translate: -100% 0;
+    }
+
+    /* WebKit can restart the covered-content transition while the
+       anchor-positioned highlight remains active. */
+    &[data-submenu-expanded] > :not([data-submenu])::before {
+      display: none;
+    }
 
-    /* Don't transition width and height on open/close. */
+    /* Don't transition size on open/close. */
     &[data-starting-style],
     &[data-ending-style] {
-      transition: var(--media-popup-transition);
+      transition: var(--popup-transition);
     }
   }
 }
 
-/* ==========================================================================
-   Native Caption Track
-   ========================================================================== */
-
 .media-default-skin {
-  --media-caption-track-duration: var(--media-controls-transition-duration);
+  --media-caption-track-duration: var(--controls-transition-duration);
   --media-caption-track-delay: 25ms;
-  --media-caption-track-y: -0.5rem;
+  --media-caption-track-y: calc(var(--spacing) * -2);
 
   &:has(.media-controls[data-visible]) {
-    --media-caption-track-y: -5.5rem;
-  }
-
-  @container media-root (width > 42rem) {
-    &:has(.media-controls[data-visible]) > * {
-      --media-caption-track-y: -3.5rem;
-    }
+    --media-caption-track-y: calc(var(--spacing) * -14);
   }
 }
 
@@ -1878,112 +2000,110 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
   transition-delay: var(--media-caption-track-delay);
 }
 
-/* ==========================================================================
-   Input Feedback
-   ========================================================================== */
-
-.media-default-skin .media-input-feedback {
+.media-default-skin .media-input-indicator-overlay {
   position: absolute;
-  inset-inline: 0;
-  top: 0;
-  bottom: 3.5rem; /* Shift up a little in smaller containers */
+  inset: 0;
   display: grid;
   grid-template-columns: 1fr 1fr 1fr;
   align-items: center;
   justify-items: center;
-  color: var(--media-color-primary, oklch(1 0 0));
+  color: oklch(1 0 0);
   pointer-events: none;
-
-  @container media-root (width > 24rem) {
-    bottom: 0;
-  }
 }
 
-/* --- Feedback islands ------------------------------------------------------- */
-
-.media-default-skin .media-input-feedback-island {
-  --media-surface-background-color: oklch(0 0 0 / 0.25);
-  position: absolute;
-  top: 0.75rem;
-  font-weight: 500;
-  color: inherit;
-  pointer-events: none;
-  border-radius: calc(Infinity * 1px);
-  transform-origin: top center;
-  transition-timing-function: ease-out;
-  transition-duration: 100ms;
-
-  .media-input-feedback-island__content {
-    display: flex;
-    gap: 0.5rem;
-    align-items: center;
-    justify-content: space-between;
-    width: 100%;
-    padding: 0.25rem 0.625rem;
+.media-default-skin {
+  .media-volume-indicator,
+  .media-status-indicator--state {
+    --surface-background-color: oklch(0 0 0 / 0.25);
+    position: absolute;
+    top: calc(var(--spacing) * 3);
+    font-weight: 500;
+    color: inherit;
+    pointer-events: none;
+    border-radius: calc(Infinity * 1px);
+    transform-origin: top center;
+    transition-timing-function: ease-out;
+    transition-duration: 100ms;
 
-    /* Increase contrast of the content */
-    * {
-      mix-blend-mode: difference;
+    .media-volume-indicator__content,
+    .media-status-indicator__content {
+      display: flex;
+      gap: calc(var(--spacing) * 2);
+      align-items: center;
+      justify-content: space-between;
+      width: 100%;
+      padding: calc(var(--spacing) * 1) calc(var(--spacing) * 2.5);
+
+      * {
+        mix-blend-mode: difference;
+      }
     }
-  }
 
-  .media-icon {
-    display: none;
-    flex-shrink: 0;
-  }
+    .media-icon {
+      display: none;
+      flex-shrink: 0;
+    }
 
-  .media-input-feedback-island__value {
-    margin-left: auto;
-  }
+    .media-volume-indicator__value,
+    .media-status-indicator__value {
+      margin-left: auto;
+    }
 
-  @media (pointer: coarse) {
-    transition-property: scale, translate, opacity;
-    will-change: scale, translate, opacity;
-  }
+    @media (pointer: coarse) {
+      transition-property: scale, translate, opacity;
+      will-change: scale, translate, opacity;
+    }
 
-  @media (pointer: fine) and (prefers-reduced-motion: no-preference) {
-    transition-property: scale, translate, filter, opacity;
-    will-change: scale, translate, filter, opacity;
-  }
+    @media (pointer: fine) and (prefers-reduced-motion: no-preference) {
+      transition-property: scale, translate, filter, opacity;
+      will-change: scale, translate, filter, opacity;
+    }
 
-  @media (prefers-reduced-transparency: reduce) or (prefers-contrast: more) {
-    --media-surface-background-color: oklch(0 0 0);
-  }
+    @media (prefers-reduced-transparency: reduce) or (prefers-contrast: more) {
+      --surface-background-color: oklch(0 0 0);
+    }
 
-  /* Default hidden state */
-  &[data-starting-style],
-  &[data-ending-style] {
-    opacity: 0;
-    transition-timing-function: ease-in;
-    transition-duration: 250ms;
+    &[data-starting-style],
+    &[data-ending-style] {
+      opacity: 0;
+      transition-timing-function: ease-in;
+      transition-duration: 250ms;
 
-    @media (pointer: fine) and (prefers-reduced-motion: no-preference) {
-      filter: blur(8px);
-      scale: 0.9;
+      @media (pointer: fine) and (prefers-reduced-motion: no-preference) {
+        filter: blur(8px);
+        scale: 0.9;
+      }
     }
 
-    @media (prefers-reduced-motion: no-preference) {
-      &[data-ending-style] {
+    &[data-ending-style] {
+      @media (prefers-reduced-motion: no-preference) {
         translate: 0 -25%;
       }
     }
   }
+
+  .media-seek-indicator,
+  .media-status-indicator--playback {
+    display: grid;
+    grid-row: 1;
+    grid-column: 2;
+    place-content: center;
+    padding: calc(var(--spacing) * 4);
+    text-align: center;
+  }
 }
 
-.media-default-skin .media-input-feedback-island--volume {
-  width: min(80%, 12rem);
+.media-default-skin .media-volume-indicator {
+  width: min(80%, calc(var(--spacing) * 48));
+  transform: translateX(0);
 
-  .media-input-feedback-island__content {
-    --media-progress-fill: var(--media-volume-fill);
-    background-image: linear-gradient(
-      to right,
-      currentColor 0%,
-      currentColor var(--media-progress-fill),
-      transparent var(--media-progress-fill),
-      transparent 100%
-    );
+  .media-volume-indicator__content {
+    background-image: linear-gradient(currentColor, currentColor);
+    background-repeat: no-repeat;
+    background-position: left;
+    background-size: var(--media-volume-fill, 0%) 100%;
     border-radius: inherit;
-    transition: --media-progress-fill 200ms linear;
+    transition: background-size 200ms linear;
   }
 
   &[data-level="high"] .media-icon--volume-high,
@@ -1993,14 +2113,15 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
   }
 
   @media (prefers-reduced-motion: no-preference) {
-    &[data-min],
-    &[data-max] {
-      animation: media-shake 300ms ease-in-out;
+    &[data-min]:not([data-starting-style], [data-ending-style]),
+    &[data-max]:not([data-starting-style], [data-ending-style]) {
+      transform: translateX(0.25px);
+      transition: transform 300ms linear(0, -24 20%, 16 40%, -8 60%, 4 80%, 1);
     }
   }
 }
 
-.media-default-skin .media-input-feedback-island--status {
+.media-default-skin .media-status-indicator--state {
   &[data-status="captions-on"] .media-icon--captions-on,
   &[data-status="captions-off"] .media-icon--captions-off,
   &[data-status="fullscreen"] .media-icon--fullscreen-enter,
@@ -2011,49 +2132,72 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
   }
 }
 
-/* --- Bubble ---------------------------------------------------------------- */
-
-.media-default-skin .media-input-feedback-bubble {
-  display: grid;
-  grid-row: 1;
-  grid-column: 2;
-  place-content: center;
-  padding: 1rem;
-  text-align: center;
+.media-default-skin .media-status-indicator--playback {
+  background: oklch(0 0 0 / 0.35);
+  border-radius: 100%;
+  backdrop-filter: blur(8px);
+  transition-timing-function: ease-out;
+  transition-duration: 200ms;
+  transition-property: opacity, scale;
 
-  /* Central bubble (play, pause) */
-  &:not([data-direction]) {
-    background: oklch(0 0 0 / 0.35);
-    border-radius: 100%;
-    backdrop-filter: blur(8px);
+  .media-icon {
+    grid-area: 1 / 1;
+    width: calc(var(--media-icon-size) * 1.5);
+    height: calc(var(--media-icon-size) * 1.5);
+    opacity: 0;
+    scale: 0;
     transition-timing-function: ease-out;
-    transition-duration: 200ms;
+    transition-duration: 150ms;
     transition-property: opacity, scale;
 
-    &[data-starting-style],
-    &[data-ending-style] {
-      opacity: 0;
-      scale: 0.85;
+    &.media-icon--play {
+      translate: 1px 0;
     }
+  }
 
-    &[data-ending-style] {
-      transition-timing-function: ease-in;
-      transition-duration: 100ms;
+  &[data-status="pause"] .media-icon--pause,
+  &[data-status="play"] .media-icon--play {
+    opacity: 1;
+    scale: 1;
+  }
+
+  &[data-starting-style],
+  &[data-ending-style] {
+    opacity: 0;
+    scale: 0.85;
+  }
+
+  &[data-ending-style] {
+    transition-timing-function: ease-in;
+    transition-duration: 100ms;
+  }
+
+  @media (prefers-reduced-motion: reduce) {
+    transition-duration: 50ms;
+    transition-property: opacity;
+
+    &[data-starting-style],
+    &[data-ending-style],
+    .media-icon {
+      scale: 1;
     }
 
-    @media (prefers-reduced-motion: reduce) {
+    .media-icon {
       transition-duration: 50ms;
       transition-property: opacity;
     }
   }
+}
 
-  /* Directional bubbles (seek) */
-  &[data-direction] {
-    gap: 0.25rem;
+.media-default-skin .media-seek-indicator {
+  gap: calc(var(--spacing) * 1);
 
-    @container media-root (width > 24rem) {
-      padding: 1.5rem;
-    }
+  .media-seek-indicator__value {
+    font-variant-numeric: tabular-nums;
+  }
+
+  @container media-root (width > 24rem) {
+    padding: calc(var(--spacing) * 6);
   }
 
   &[data-direction="backward"] {
@@ -2066,21 +2210,10 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
     justify-self: right;
   }
 
-  /* Icons */
-  .media-icon {
-    display: none;
+  .media-icon--seek {
+    display: block;
     width: calc(var(--media-icon-size) * 1.5);
     height: calc(var(--media-icon-size) * 1.5);
-
-    &.media-icon--play {
-      translate: 1px 0;
-    }
-  }
-
-  &[data-direction] .media-icon--seek,
-  &[data-status="pause"] .media-icon--pause,
-  &[data-status="play"] .media-icon--play {
-    display: block;
   }
 
   &[data-direction="backward"] .media-icon--seek {
@@ -2102,6 +2235,7 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
     &[data-direction="forward"][data-starting-style] .media-icon--seek {
       translate: -60% 0;
     }
+
     &[data-direction="backward"][data-starting-style] .media-icon--seek {
       translate: 60% 0;
     }
@@ -2111,32 +2245,24 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
 /* ==========================================================================
    Icon State Visibility for Video Skins
 
-   Data-attribute-driven visibility rules for multi-state icon buttons.
-   Uses :is() with both element selectors (for HTML custom element wrappers)
-   and class selectors (for React rendered SVG elements).
+   Data-attribute-driven visibility rules for multi-state icon buttons shared
+   by the HTML and React skins.
    ========================================================================== */
 
 /* --- All icons hidden by default --- */
 
-.media-button--play .media-icon--restart,
-.media-button--play .media-icon--play,
-.media-button--play .media-icon--pause,
-.media-button--mute .media-icon--volume-off,
-.media-button--mute .media-icon--volume-low,
-.media-button--mute .media-icon--volume-high,
-.media-button--fullscreen .media-icon--fullscreen-enter,
-.media-button--fullscreen .media-icon--fullscreen-exit,
-.media-button--pip .media-icon--pip-enter,
-.media-button--pip .media-icon--pip-exit,
-.media-button--cast .media-icon--cast-enter,
-.media-button--cast .media-icon--cast-exit,
-.media-button--airplay .media-icon--airplay-enter,
-.media-button--airplay .media-icon--airplay-exit,
-.media-button--captions .media-icon--captions-off,
-.media-button--captions .media-icon--captions-on {
-  display: none;
+.media-button--play .media-icon,
+.media-button--mute .media-icon,
+.media-button--fullscreen .media-icon,
+.media-button--pip .media-icon,
+.media-button--cast .media-icon,
+.media-button--airplay .media-icon,
+.media-button--captions .media-icon {
   opacity: 0;
 }
+.media-button--play .media-icon {
+  scale: 0;
+}
 
 /* --- Active icon per state --- */
 
@@ -2173,8 +2299,8 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
 .media-button--captions:not([data-active]) .media-icon--captions-off,
 /* Captions: active → captions on */
 .media-button--captions[data-active] .media-icon--captions-on {
-  display: block;
   opacity: 1;
+  scale: 1;
 }
 
 /* --- Pause keyframe animations on inactive icons --- */
@@ -2188,104 +2314,68 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
   --media-icon--airplay__triangle-animation: none;
 }
 
-/* -------------------------------------------------------------------------- */
-/* Global @keyframes for all video skins (CSS & Tailwind)                     */
-/* -------------------------------------------------------------------------- */
-
-@keyframes media-shake {
-  0%,
-  100% {
-    translate: 0 0;
-  }
-  20% {
-    translate: -6px 0;
-  }
-  40% {
-    translate: 4px 0;
-  }
-  60% {
-    translate: -2px 0;
-  }
-  80% {
-    translate: 1px 0;
+@media (prefers-reduced-motion: reduce) {
+  .media-button--airplay {
+    --media-icon--airplay__fill-animation: none;
+    --media-icon--airplay__triangle-animation: none;
   }
 }
 
-/* -------------------------------------------------------------------------- */
-/* Global @properties for all video skins (CSS & Tailwind)                    */
-/* -------------------------------------------------------------------------- */
 
-@property --media-progress-fill {
-  syntax: "<percentage>";
-  inherits: true;
-  initial-value: 0%;
-}
+/* Video-specific container styles */
 
+.media-default-skin--video {
+  --default-accent-color: oklch(1 0 0);
+  --border-color: light-dark(oklch(0 0 0 / 0.1), oklch(1 0 0 / 0.15));
+  --focus-ring-color: light-dark(oklch(0 0 0), oklch(1 0 0));
+  --media-video-border-radius: var(--container-border-radius);
 
-/* ==========================================================================
-   Root
-   ========================================================================== */
+  --surface-background-color: oklch(1 0 0 / 0.1);
+  --surface-inner-border-color: oklch(1 0 0 / 0.1);
+  --surface-outer-border-color: oklch(0 0 0 / 0.1);
+  --surface-shadow-color: oklch(0 0 0 / 0.15);
+  --surface-backdrop-filter: blur(16px) saturate(1.5);
+
+  --controls-transition-duration: 100ms;
+  --controls-transition-timing-function: ease-out;
+
+  --error-dialog-transition-duration: 350ms;
+  --error-dialog-transition-delay: 100ms;
+  --error-dialog-transition-timing-function: ease-out;
+
+  --popup-transition-duration: 100ms;
+  --popup-transition-timing-function: ease-out;
 
-.media-default-skin--video {
-  --media-spring-timing-function: linear(
-    0,
-    0.034 1.5%,
-    0.763 9.7%,
-    1.066 13.9%,
-    1.198 19.9%,
-    1.184 21.8%,
-    0.963 37.5%,
-    0.997 50.9%,
-    1
-  );
-  --media-border-color: oklch(0 0 0 / 0.1);
-  --media-surface-background-color: oklch(1 0 0 / 0.1);
-  --media-surface-inner-border-color: oklch(1 0 0 / 0.05);
-  --media-surface-outer-border-color: oklch(0 0 0 / 0.1);
-  --media-surface-shadow-color: oklch(0 0 0 / 0.15);
-  --media-surface-backdrop-filter: blur(16px) saturate(1.5);
-  --media-video-border-radius: var(--media-border-radius, 2rem);
-  --media-controls-transition-duration: 100ms;
-  --media-controls-transition-timing-function: ease-out;
-  --media-error-dialog-transition-duration: 350ms;
-  --media-error-dialog-transition-delay: 100ms;
-  --media-error-dialog-transition-timing-function: var(--media-spring-timing-function);
-  --media-popup-transition-duration: 100ms;
-  --media-popup-transition-timing-function: ease-out;
-  --media-tooltip-side-offset: 0.75rem;
-  --media-tooltip-boundary-offset: 0.5rem;
-  --media-popover-side-offset: 0.5rem;
-  --media-popover-boundary-offset: 0.5rem;
   overflow: clip;
   background: oklch(0 0 0);
 
   @media (prefers-reduced-motion: reduce) {
-    --media-error-dialog-transition-duration: 50ms;
-    --media-error-dialog-transition-delay: 0ms;
-    --media-error-dialog-transition-timing-function: ease-out;
-    --media-popup-transition-duration: 0ms;
-  }
+    --error-dialog-transition-duration: 50ms;
+    --error-dialog-transition-delay: 0ms;
+    --popup-transition-duration: 0ms;
 
-  @media (prefers-color-scheme: dark) {
-    --media-border-color: oklch(1 0 0 / 0.15);
+    .media-error__dialog {
+      scale: 1;
+      transition-property: opacity;
+    }
   }
 
   @media (prefers-reduced-transparency: reduce) or (prefers-contrast: more) {
-    --media-surface-background-color: oklch(0 0 0);
-    --media-surface-inner-border-color: oklch(1 0 0 / 0.25);
-    --media-surface-outer-border-color: transparent;
+    --surface-background-color: oklch(0 0 0);
+    --surface-inner-border-color: oklch(1 0 0 / 0.25);
+    --surface-outer-border-color: transparent;
   }
 
-  &:has(.media-controls:not([data-visible])) {
+  &:has(.media-controls--root:not([data-visible])) {
     /* Slight delay to hide controls on non-touch devices after interaction */
     @media (pointer: fine) {
-      --media-controls-transition-duration: 300ms;
+      --controls-transition-duration: 300ms;
     }
     @media (pointer: coarse) {
-      --media-controls-transition-duration: 150ms;
+      --controls-transition-duration: 150ms;
     }
     @media (prefers-reduced-motion: reduce) {
-      --media-controls-transition-duration: 50ms;
+      --controls-transition-duration: 50ms;
     }
   }
 
@@ -2297,17 +2387,29 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
     pointer-events: none;
     content: "";
     border-radius: inherit;
-    box-shadow: inset 0 0 0 1px var(--media-border-color);
+    box-shadow: inset 0 0 0 1px var(--border-color);
   }
 
   &:fullscreen {
-    --media-border-radius: 0;
+    --container-border-radius: 0;
+
+    &::after {
+      display: none;
+    }
+
+    @media (width >= 1280px) {
+      --scale: 1.25;
+    }
+    @media (width >= 1536px) {
+      --scale: 1.5;
+    }
+    @media (width >= 1920px) {
+      --scale: 1.75;
+    }
   }
 }
 
-/* ==========================================================================
-   Error Dialog
-   ========================================================================== */
+/* Error Dialog  */
 
 .media-default-skin--video .media-error {
   position: absolute;
@@ -2321,22 +2423,23 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
 .media-default-skin--video .media-error__dialog {
   display: flex;
   flex-direction: column;
-  gap: 0.75rem;
-  max-width: 18rem;
-  padding: 0.75rem;
+  gap: calc(var(--spacing) * 3);
+  width: 100%;
+  max-width: calc(var(--spacing) * 72);
+  padding: calc(var(--spacing) * 3);
   color: oklch(1 0 0);
   text-shadow: 0 1px 0 oklch(0 0 0 / 0.25);
-  border-radius: 1.75rem;
-  transition-delay: var(--media-error-dialog-transition-delay);
-  transition-timing-function: var(--media-error-dialog-transition-timing-function);
-  transition-duration: var(--media-error-dialog-transition-duration);
+  border-radius: calc(var(--spacing) * 7);
+  transition-delay: var(--error-dialog-transition-delay);
+  transition-timing-function: var(--error-dialog-transition-timing-function);
+  transition-duration: var(--error-dialog-transition-duration);
   transition-property: opacity, scale;
 }
 
 .media-default-skin--video .media-error[data-starting-style] .media-error__dialog,
 .media-default-skin--video .media-error[data-ending-style] .media-error__dialog {
   opacity: 0;
-  scale: 0.5;
+  scale: 0.95;
 }
 .media-default-skin--video .media-error[data-ending-style] .media-error__dialog {
   transition-delay: 0ms;
@@ -2345,86 +2448,153 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
 .media-default-skin--video .media-error__content {
   display: flex;
   flex-direction: column;
-  gap: 0.5rem;
-  padding: 0.5rem 0.5rem 0.375rem;
+  gap: calc(var(--spacing) * 2);
+  padding: calc(var(--spacing) * 2) calc(var(--spacing) * 2) calc(var(--spacing) * 1.5);
   text-shadow: inherit;
 }
 
 .media-default-skin--video .media-error__title {
-  font-size: 1rem;
+  font-size: var(--font-size-medium);
 }
 
-/* ==========================================================================
-   Controls (hide/show behavior)
-   ========================================================================== */
+/* Controls (hide/show behavior) */
+
+.media-default-skin--video .media-controls--root {
+  --inset-factor: 2;
+  --inset: calc(var(--spacing) * var(--inset-factor));
+  --base-boundary-offset: var(--inset-factor);
 
-.media-default-skin--video .media-controls {
-  position: absolute;
-  inset-inline: 0.5rem;
-  bottom: 0.5rem;
   z-index: 10;
-  flex-wrap: wrap;
-  color: var(--media-color-primary, oklch(1 0 0));
-  transform-origin: bottom;
-  transition-timing-function: var(--media-controls-transition-timing-function);
-  transition-duration: var(--media-controls-transition-duration);
+  display: contents;
+  color: oklch(1 0 0);
+  transition-timing-function: var(--controls-transition-timing-function);
+  /* Speed up the entry transition */
+  transition-duration: calc(var(--controls-transition-duration) / 2);
 
-  @media (pointer: fine) {
-    transition-property: scale, filter, opacity;
-    will-change: scale, filter, opacity;
+  .media-controls--primary,
+  .media-controls--secondary {
+    position: absolute;
+    z-index: 10;
   }
 
-  @media (pointer: coarse) {
-    transition-property: scale, opacity;
-    will-change: scale, opacity;
+  .media-controls--primary {
+    inset-inline: var(--inset);
+    bottom: var(--inset);
+    transform-origin: bottom;
   }
 
-  &:not([data-visible]) {
-    pointer-events: none;
-    opacity: 0;
-    scale: 0.95;
+  .media-controls--secondary {
+    top: var(--inset);
+    right: var(--inset);
+    container-type: normal;
+    transform-origin: top;
+  }
 
-    @media (pointer: fine) and (prefers-reduced-motion: no-preference) {
-      filter: blur(8px);
+  @container media-root (width < 32rem) {
+    .media-controls--primary,
+    .media-controls--secondary {
+      transition-timing-function: inherit;
+      transition-duration: inherit;
+
+      @media (pointer: fine) {
+        transition-property: filter, opacity, scale, translate;
+        will-change: filter, opacity, scale, translate;
+      }
+
+      @media (pointer: coarse) {
+        transition-property: opacity, scale, translate;
+        will-change: opacity, scale, translate;
+      }
     }
 
-    @media (prefers-reduced-motion: reduce) {
-      scale: 1;
+    &:after {
+      display: none;
     }
-  }
 
-  & .media-time-controls {
-    flex: 0 0 100%;
-    order: -1;
-    padding-inline: 0.625rem;
+    &:not([data-visible]) {
+      .media-controls--primary,
+      .media-controls--secondary {
+        pointer-events: none;
+        opacity: 0;
+        scale: 0.95;
+        transition-duration: var(--controls-transition-duration);
+
+        @media (pointer: fine) and (prefers-reduced-motion: no-preference) {
+          filter: blur(8px);
+        }
+
+        @media (prefers-reduced-motion: reduce) {
+          scale: 1;
+        }
+      }
+
+      .media-controls--primary {
+        @media (prefers-reduced-motion: no-preference) {
+          translate: 0 4px;
+        }
+      }
+
+      .media-controls--secondary {
+        @media (prefers-reduced-motion: no-preference) {
+          translate: 0 -4px;
+        }
+      }
+    }
   }
 
-  & .media-button-group:first-child {
-    flex: 1;
-    text-align: left;
+  @container media-root (width >= 32rem) {
+    position: absolute;
+    inset-inline: var(--inset);
+    bottom: var(--inset);
+    display: flex;
+    transform-origin: bottom;
+
+    .media-controls--primary,
+    .media-controls--secondary {
+      display: contents;
+
+      &::after {
+        display: none;
+      }
+    }
+
+    &:not([data-visible]) {
+      pointer-events: none;
+      opacity: 0;
+      scale: 0.95;
+      transition-duration: var(--controls-transition-duration);
+
+      @media (pointer: fine) and (prefers-reduced-motion: no-preference) {
+        filter: blur(8px);
+      }
+
+      @media (prefers-reduced-motion: reduce) {
+        scale: 1;
+      }
+
+      @media (prefers-reduced-motion: no-preference) {
+        translate: 0 4px;
+      }
+    }
   }
 
-  & .media-button-group:last-child {
+  .media-time-controls {
     flex: 1;
-    justify-content: end;
+    padding-inline: calc(var(--spacing) * 3);
   }
 
-  @container media-root (width > 42rem) {
-    inset-inline: 0.75rem;
-    bottom: 0.75rem;
-    flex-wrap: nowrap;
-    column-gap: 0.125rem;
-    padding: 0.25rem;
+  @media (pointer: fine) {
+    transition-property: filter, opacity, scale, translate;
+    will-change: filter, opacity, scale, translate;
+  }
 
-    & .media-time-controls {
-      flex: 1;
-      order: unset;
-    }
+  @media (pointer: coarse) {
+    transition-property: opacity, scale, translate;
+    will-change: opacity, scale, translate;
+  }
 
-    & .media-button-group:first-child,
-    & .media-button-group:last-child {
-      flex: 0 0 auto;
-    }
+  @container media-root (width > 42rem) {
+    --inset-factor: 3;
   }
 }
 
@@ -2433,72 +2603,14 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
 }
 
 /* Hide cursor when controls are hidden */
-.media-default-skin--video:has(.media-controls:not([data-visible])) {
+.media-default-skin--video:has(.media-controls--root:not([data-visible])) {
   cursor: none;
 }
 
-/* ==========================================================================
-   Sliders
-   ========================================================================== */
+/* Sliders */
 
 .media-default-skin--video .media-slider__track {
   background-color: oklch(1 0 0 / 0.2);
-  box-shadow: 0 0 0 1px oklch(0 0 0 / 0.05);
-}
-
-.media-default-skin--video .media-slider__thumbnail {
-  --media-slider-thumbnail-max-width: 11rem;
-  --media-slider-thumbnail-max-height: 8rem;
-  --media-slider-thumbnail-padding: -1.125rem;
-  /**
-    Inset is the difference between the container width and the slider (100%) width.
-    Divided by 2 as we render the time on both sides.
-  */
-  --media-slider-thumbnail-inset: calc((100cqi - 100%) / 2);
-
-  position: absolute;
-  bottom: calc(100% + 1.2rem);
-  left: clamp(
-    calc(
-      var(--media-slider-thumbnail-max-width) /
-      2 +
-      var(--media-slider-thumbnail-padding) -
-      var(--media-slider-thumbnail-inset)
-    ),
-    var(--media-slider-pointer),
-    calc(
-      100% -
-      var(--media-slider-thumbnail-max-width) /
-      2 -
-      var(--media-slider-thumbnail-padding) +
-      var(--media-slider-thumbnail-inset)
-    )
-  );
-  pointer-events: none;
-  opacity: 0;
-  filter: blur(8px);
-  transform-origin: bottom;
-  scale: 0.8;
-  translate: -50%;
-  transition-timing-function: ease-out;
-  transition-duration: 150ms;
-  transition-property: scale, opacity, filter;
-
-  & .media-thumbnail__image {
-    max-width: var(--media-slider-thumbnail-max-width);
-    max-height: var(--media-slider-thumbnail-max-height);
-  }
-}
-.media-default-skin--video .media-slider[data-pointing] .media-slider__thumbnail:has([role="img"]:not([data-hidden])) {
-  opacity: 1;
-  filter: blur(0);
-  scale: 1;
-}
-.media-default-skin--video
-  .media-slider__thumbnail:has([role="img"]:not([data-hidden]))
-  + .media-slider__preview
-  .media-slider__value {
-  display: none;
 }
 
 ```
@@ -2507,7 +2619,7 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
 
 Each skin is built with specific [features](./features.md) in mind. For example, a video skin renders fullscreen and picture-in-picture controls. An audio skin doesn’t.
 
-You’ll find both a skin and the feature bundle it expects exported from the same path. We call these paths **presets**.
+You’ll find a preconfigured player, its typed hook, a skin, and the matching feature bundle exported from the same path. We call these paths **presets**.
 
 Import
 
@@ -2527,7 +2639,7 @@ Feature bundle
 
 Features
 
-[playback](../reference/feature-playback.md), [playbackRate](../reference/feature-playback-rate.md), [quality](../reference/feature-quality.md), [audioTrack](../reference/feature-audio-track.md), [volume](../reference/feature-volume.md), [time](../reference/feature-time.md), [source](../reference/feature-source.md), [buffer](../reference/feature-buffer.md), [fullscreen](../reference/feature-fullscreen.md), [pip](../reference/feature-pip.md), [remotePlayback](../reference/feature-remote-playback.md), [controls](../reference/feature-controls.md), [textTrack](../reference/feature-text-tracks.md), [error](../reference/feature-error.md)
+[playback](../reference/feature-playback.md), [playbackRate](../reference/feature-playback-rate.md), [quality](../reference/feature-quality.md), [audioTrack](../reference/feature-audio-track.md), [volume](../reference/feature-volume.md), [time](../reference/feature-time.md), [source](../reference/feature-source.md), [buffer](../reference/feature-buffer.md), [fullscreen](../reference/feature-fullscreen.md), [pip](../reference/feature-pip.md), [remotePlayback](../reference/feature-remote-playback.md), [controls](../reference/feature-controls.md), [textTrack](../reference/feature-text-tracks.md), [error](../reference/feature-error.md), metadata
 
 Skins
 
@@ -2555,7 +2667,7 @@ Feature bundle
 
 Features
 
-[playback](../reference/feature-playback.md), [playbackRate](../reference/feature-playback-rate.md), [volume](../reference/feature-volume.md), [time](../reference/feature-time.md), [source](../reference/feature-source.md), [buffer](../reference/feature-buffer.md), [error](../reference/feature-error.md)
+[playback](../reference/feature-playback.md), [playbackRate](../reference/feature-playback-rate.md), [volume](../reference/feature-volume.md), [time](../reference/feature-time.md), [source](../reference/feature-source.md), [buffer](../reference/feature-buffer.md), [error](../reference/feature-error.md), metadata
 
 Skins
 
@@ -2607,7 +2719,7 @@ Feature bundle
 
 Features
 
-[playback](../reference/feature-playback.md), [volume](../reference/feature-volume.md), [time](../reference/feature-time.md), [source](../reference/feature-source.md), [buffer](../reference/feature-buffer.md), [error](../reference/feature-error.md), [live](../reference/feature-live.md)
+[playback](../reference/feature-playback.md), [volume](../reference/feature-volume.md), [time](../reference/feature-time.md), [source](../reference/feature-source.md), [buffer](../reference/feature-buffer.md), [error](../reference/feature-error.md), [live](../reference/feature-live.md), metadata
 
 Skins
 
@@ -2635,7 +2747,7 @@ Feature bundle
 
 Features
 
-[playback](../reference/feature-playback.md), [volume](../reference/feature-volume.md), [time](../reference/feature-time.md), [source](../reference/feature-source.md), [buffer](../reference/feature-buffer.md), [fullscreen](../reference/feature-fullscreen.md), [pip](../reference/feature-pip.md), [remotePlayback](../reference/feature-remote-playback.md), [controls](../reference/feature-controls.md), [textTrack](../reference/feature-text-tracks.md), [error](../reference/feature-error.md), [live](../reference/feature-live.md)
+[playback](../reference/feature-playback.md), [volume](../reference/feature-volume.md), [time](../reference/feature-time.md), [source](../reference/feature-source.md), [buffer](../reference/feature-buffer.md), [fullscreen](../reference/feature-fullscreen.md), [pip](../reference/feature-pip.md), [remotePlayback](../reference/feature-remote-playback.md), [controls](../reference/feature-controls.md), [textTrack](../reference/feature-text-tracks.md), [error](../reference/feature-error.md), [live](../reference/feature-live.md), metadata
 
 Skins