v3.7.1

- Feat: Minor styling improvements to the preview thumbnails (🚨 Requires a SCSS/CSS update 🚨) - Fix: fix invalid CSS @charset rule in Sass files (thanks @Hashen110!) - Chore: Replace deprecated KeyboardEvent `keyCode` references to use `key` instead (thanks @Hashen110!) - Various other code clean up and typo fixes (thanks @Hashen110!)
chore: syntax tweak
2022-04-20 15:02:17 +10:00 · 2022-04-20 14:52:39 +10:00 · 2022-04-20 14:50:59 +10:00 · 2022-04-20 14:50:29 +10:00 · 2022-04-20 14:50:14 +10:00 · 2022-04-20 14:31:42 +10:00
119 changed files with 7714 additions and 84433 deletions
@@ -1,30 +1,18 @@
 {
-    "parser": "babel-eslint",
-    "extends": ["airbnb-base", "prettier"],
-    "plugins": ["simple-import-sort", "import"],
-    "env": {
-        "browser": true,
-        "es6": true
-    },
-    "globals": {
-        "Plyr": false,
-        "jQuery": false
-    },
-    "rules": {
-        "import/no-cycle": "warn",
-        "padding-line-between-statements": [
-            "error",
-            {
-                "blankLine": "never",
-                "prev": ["singleline-const", "singleline-let", "singleline-var"],
-                "next": ["singleline-const", "singleline-let", "singleline-var"]
-            }
-        ],
-        "sort-imports": "off",
-        "import/order": "off",
-        "simple-import-sort/sort": "error"
-    },
-    "parserOptions": {
-        "sourceType": "module"
-    }
+  "parser": "babel-eslint",
+  "extends": ["@sampotts/eslint-config/es6"],
+  "env": {
+    "browser": true,
+    "es6": true
+  },
+  "globals": {
+    "Plyr": false,
+    "jQuery": false
+  },
+  "rules": {
+    "import/no-cycle": "warn"
+  },
+  "parserOptions": {
+    "sourceType": "module"
+  }
 }
@@ -1,8 +1,3 @@
 ### Link to related issue (if applicable)

 ### Summary of proposed changes
-
-### Checklist
- [ ] Use `develop` as the base branch
- [ ] Exclude the gulp build (`/dist` changes) from the PR
- [ ] Test on [supported browsers](https://github.com/sampotts/plyr#browser-support)
@@ -2,8 +2,8 @@ node_modules
 .DS_Store
 credentials.json
 *.mp4
-!dist/blank.mp4
 npm-debug.log
 yarn-error.log
 *.webm
 .idea/
+dist/
@@ -7,6 +7,6 @@ credentials.json
 deploy.json
 yarn.lock
 package-lock.json
-*.mp4
 *.webm
+*.mp4
 !dist/blank.mp4
@@ -1 +1 @@
-v13.8.0
+16
@@ -1,6 +1,7 @@
 {
-  "plugins": ["stylelint-selector-bem-pattern", "stylelint-scss"],
-  "extends": ["stylelint-config-recommended", "stylelint-config-sass-guidelines", "stylelint-config-prettier"],
+  "plugins": ["stylelint-selector-bem-pattern"],
+  "extends": ["stylelint-config-sass-guidelines", "stylelint-config-prettier"],
+  "customSyntax": "postcss-scss",
  "rules": {
    "selector-class-pattern": null,
    "selector-no-qualifying-type": [
@@ -9,10 +10,7 @@
        "ignore": ["attribute", "class"]
      }
    ],
-    "string-no-newline": null,
-    "indentation": 2,
-    "string-quotes": "single",
-    "max-nesting-depth": 2,
+    "max-nesting-depth": 4,
    "plugin/selector-bem-pattern": {
      "preset": "bem",
      "componentName": "(([a-z0-9]+(?!-$)-?)+)",
@@ -1,8 +0,0 @@
-language: node_js
-node_js: lts/*
-
-script:
- bash .travis/prevent-base-master.sh
- bash .travis/omit-dist.sh
- npm run lint
- npm run build
@@ -1,5 +0,0 @@
-#!/bin/bash
-if [ $TRAVIS_BRANCH == "develop" ] && $(git diff --name-only $TRAVIS_COMMIT_RANGE | grep -qE "^(demo/)?dist/"); then
-	echo 'Build output ("dist" and "demo/dist") not permitted in develop' >&2
-	exit 1
-fi
@@ -1,5 +0,0 @@
-#!/bin/bash
-if [ "$TRAVIS_PULL_REQUEST" != "false" ] && [ $TRAVIS_BRANCH == "master" ] && $(git diff --name-only $TRAVIS_COMMIT_RANGE | grep -q "^src/"); then
-	echo 'The base branch for pull requests must be "develop"' >&2
-	exit 1
-fi
@@ -1,3 +1,102 @@
+### v3.7.1
+
+- Feat: Minor styling improvements to the preview thumbnails (🚨 Requires a SCSS/CSS update 🚨)
+- Fix: fix invalid CSS @charset rule in Sass files (thanks @Hashen110!)
+- Chore: Replace deprecated KeyboardEvent `keyCode` references to use `key` instead (thanks @Hashen110!)
+- Various other code clean up and typo fixes (thanks @Hashen110!)
+
+## v3.7.0
+
+- Feat: Add markers support (🚨 Requires a SCSS/CSS update 🚨) (thanks @ForeverSc and @fengshuo!)
+- Feat: Add support for MediaMetadata (thanks @Hashen110!)
+- Fix: Pass this context to captions.setup (fixes #2352) (thanks @WilliamMHerring, @willherring and @zenyr!)
+- Fix: Modify vimeo parseHash to use non-named capture groups (fixes #2396) (thanks @fekle!)
+- Fix: Replace deprecated String.prototype.substr() (thanks @CommanderRoot!)
+- Docs: Update speed option default to match the source (thanks @ozgurg!)
+- Docs: SASS → Sass (thanks @toastal!)
+
+### v3.6.12
+
+- Fix: remove division logic from ads.scss (fixes #2370)
+
+### v3.6.11
+
+- Fix: Replace `list.slash` added in 3.6.10 with `calc`
+- Chore: Package upgrades
+- Chore: Sass clean up
+- Chore: Improvements to style linting
+
+### v3.6.10
+
+- Fix: Use `list.slash` instead of deprecated syntax
+- Chore: Clean up demo
+
+### v3.6.9
+
+- Fix: Sass issue with division (thanks @ROL4ND909 and @le0pard)
+- Fix: Captions when switching sources (thanks @zexingguo)
+- Fix: Icons loading within iframes (thanks @ajgagnon)
+- Chore: Update TypeScript types (thanks @Jackie1210 and @AntLevin)
+- Fix: iOS fullscreen centering (thanks @hemratna)
+- Feat: Added getter and setter for preview thumbnails (thanks @Benny739)
+- Fix: Change fullscreen element to player rootnode (thanks @Walter van den Houten)
+- Fix: Fixed errors when Plyr instance is destroyed before constructor setTimeout() functions execute (thanks @emilis-ideait)
+- Fix: Invalid CSS selector syntax (thanks @BjornBrandewallNaviga)
+- Fix: Video height issues
+- Feat: Improve support for Vimeo private videos (thanks @Frosch)
+- Fix: YouTube duration issues (thanks @liesahead)
+
+### v3.6.8
+
+- Typings: add FullscreenOptions.container to typing files (thanks @MeguminSama!)
+- Fix: added iPadOS detection to isIos util (thanks @Benny739!)
+- Fix: issues with Vimeo fullscreen
+
+### v3.6.7
+
+- Fix: remove regression caused by optional chaining and nullish coalescing in check for `window.CSS` check for aspect-ratio (fixes #2174)
+
+### v3.6.6
+
+- Improvements to how aspect ratio is handled. Use `aspect-ratio` CSS property instead of the legacy method (still used as fallback). Also automatically determined aspect ratios are rounded to the nearast standard ratio. This fixes issues with the YouTube embeds showing a 1-2px black bar.
+- Hide the YouTube poster image container when paused so that the controls underneath can be used.
+
+### v3.6.5
+
+- Migrate color formatting to colorette (thanks @jorgebucaran)
+- Fix: issue with IE detection
+- Fix: missing styles for embeds
+- Fix: regression regarding poster image
+- Add all required props to vimeo iframe allow attribute - fixes #2151 (thanks @didrip)
+
+### v3.6.4
+
+- Remove unnecessary calc from media query (thanks @naomiaz)
+- Enhance types (thanks @lunika)
+- Fix: Object.values for the providers must be used (thanks @syteknet-core)
+- Fix: Improve support inside iframes (thanks @ajgagnon)
+- Added --plyr-video-background for having control over the background of a video with alpha channel (webm) or a poster image with alpha channel (thanks @nepomuc)
+- Fix issue with not entering iosfullscreen of vimeo videos with playsinline=true (thanks @lordon and @Frosch)
+- fix: use new syntax for iframe allow attribute
+- chore: package updates
+- chore: add @babel/plugin-proposal-class-properties
+- fix: use bound arrow functions in classes
+
+### v3.6.3
+
+- Fix volume when unmuting from volume 0 using YouTube (thanks @stephanefbouchard)
+- Add missing unit to calc in media query (thanks @vincentorback)
+- Assigning player's lastSeekTime on rewind/fast forward to prevent immediate controls hide on mobile (thanks @trafium)
+- Fix for volume control overflowing in Firefox (thanks @dirkjf)
+- Force fullscreen events to trigger on plyr element (media element in iOS) and not fullscreen container (thanks @theprojectsomething)
+- TypeScript types improvements (thanks @akuma06 & @iwatakeshi)
+- Dash demo link fixed (thanks @jonathanarbely)
+- Fix "A `ReferenceError: _classCallCheck is not defined` error has occurred." error (thanks @hex-ci)
+- Fix issue with CSS custom property check (thanks @syedhusain-appspace)
+- Fix for slow loading videos not autoplaying (thanks @DanielHuntleySBG)
+- Fix for network requests are not cancelled after the player is destroyed (thanks @DanielHuntleySBG)
+- Added option to disable custom controls for YouTube and Vimeo
+
 ### v3.6.2

 - Fixes for CSS Custom Property related errors in some build tools (thanks @Bashev)
@@ -40,7 +139,7 @@
 ### v3.5.8

 - Added `flex-direction` property to fix some issues introduced in v3.5.7 when using custom CSS
- Cleaned up the organisation of some of the SCSS files (should not effect CSS output)
+- Cleaned up the organization of some of the SCSS files (should not effect CSS output)
 - Added `referrerPolicy` option for Vimeo to prevent an issue present in the demo site
 - Remove all Vimeo controls for Pro & Premium accounts
 - Improve thumbnail size calculations when size is set per css (thanks @ydylla)
@@ -55,7 +154,7 @@
 - Accessibility tweak for the play button (thanks @lunika)
 - Fix for ads configuration (thanks @SoftCreatR)
 - Fix handling listener return value (thanks @taion)
- Added localisation key for PIP (picture-in-picture) (thanks @lmislm)
+- Added localization key for PIP (picture-in-picture) (thanks @lmislm)
 - Preserve viewBox attribute in SVG sprite symbols (thanks @bseib)
 - Fix being unable to unmute autoplayed video on iOS (thanks @sumanbh)
 - Fixed Plyr container not resizing responsively (thanks @shravan2x)
@@ -89,7 +188,7 @@ _Note:_ This update contains CSS changes.
 ### v3.5.4

 - Added: Set download URL via new setter
- Improvement: The order of the `controls` option now effects the order in the DOM - i.e. you can re-order the controls - Note: this may break any custom CSS you have setup. Please see the changes in the PR to the default SASS
+- Improvement: The order of the `controls` option now effects the order in the DOM - i.e. you can re-order the controls - Note: this may break any custom CSS you have setup. Please see the changes in the PR to the default Sass
 - Fixed issue with empty controls and preview thumbs
 - Fixed issue with setGutter call (from Sentry)
 - Fixed issue with initial selected speed not working
@@ -452,7 +551,7 @@ This is a massive release. A _mostly_ complete rewrite in ES6. What started out

 ### Other stuff

- Now using SASS exclusively. Sorry, LESS folk it just made sense to maintain one method as SASS is what the cool kids use. It may come back if we work out an automated way to convert the SASS
+- Now using Sass exclusively. Sorry, LESS folk it just made sense to maintain one method as Sass is what the cool kids use. It may come back if we work out an automated way to convert the Sass
 - Moved to ES6. All the rage these days. You'll need to look at polyfills. The demo uses [polyfill.io](https://polyfill.io)
 - Added basic looping support
 - Added an aspect ratio option for those that can't leave the 90s and want 4:3
@@ -685,7 +784,7 @@ And some other changes and bug fixes:

 ## v1.7.0

- SASS cleanup (fixes #265)
+- Sass cleanup (fixes #265)
 - Docs tidy up to help quick start (fixes #253)
 - Fix for issues with data attribute options passing (fixes #257)
 - **_(Important)_** Removed the requirement for a wrapper div to setup Plyr and removed the dependency on the `plyr` classname as a JS hook. By default it will now look for `<video>`, `<audio>` and `[data-type]` elements. If you are just calling `setup()` with a `<div class="plyr">` you may want to give it a good test after upgrading. You can probably remove the wrapper div. The reason behind this is to make setup easier for newcomers and prevent the styling being used on unsupported players (because the plyr classname was used as a CSS and JS hook - which isn't ideal)
@@ -807,7 +906,7 @@ And some other changes and bug fixes:
 ### v1.5.18

 - Added 'ready' event for initial setup complete or source change occurs
- Fixed SASS stylesheet references to transparentize
+- Fixed Sass stylesheet references to transparentize
 - Added default font stack to controls
 - Docs fixes inc controls HTML (fixes #180)

@@ -844,7 +943,7 @@ And some other changes and bug fixes:

 - iOS embed bug fixes (fixes #166)
 - Hide IE/Edge <input type='range'> tooltip (since we have a styled one) (fixes #160)
- SASS bug fix for default values (fixes #158)
+- Sass bug fix for default values (fixes #158)

 ### v1.5.9

@@ -866,7 +965,7 @@ And some other changes and bug fixes:
 ### v1.5.6

 - Seek tooltip (option for tooltips changed, please check docs)
- SASS compile error fixes (fixes #148)
+- Sass compile error fixes (fixes #148)
 - Fullscreen fixes for controls not always hiding/showing (fixes #149)
 - Screen reader icon fixes (title was being read twice due to the tooltip/hidden label)

@@ -943,7 +1042,7 @@ And some other changes and bug fixes:

 ### v1.2.6

- SASS updates and fixes (cheers @ChristianPV)
+- Sass updates and fixes (cheers @ChristianPV)

 ### v1.2.5

@@ -1058,7 +1157,7 @@ And some other changes and bug fixes:

 ### v1.0.26

- Fixes for SASS (cheers @brunowego)
+- Fixes for Sass (cheers @brunowego)
 - Indentation reset to 4 spaces

 ### v1.0.25
@@ -1103,7 +1202,7 @@ And some other changes and bug fixes:

 ### v1.0.17

- SASS support added (thanks to @brunowego)
+- Sass support added (thanks to @brunowego)
 - Docs completely separated to avoid any confusion
 - New gulp tasks (will add more documentation for this)

@@ -36,8 +36,8 @@ Please follow the instructions in our issue templates. Don't use github issues t
 You can use Gitpod (a free online VS Code-like IDE) for contributing. With a single click it will launch a workspace and automatically:

 - clone the plyr repo.
- install the dependencies.
- run `gulp` to the start the server.
+- install the dependencies with `yarn install` in root directory and "demo" directory.
+- run `gulp` in root directory to start the dev server.

 So that you can start straight away.

@@ -49,6 +49,6 @@ So that you can start straight away.

 - If your modifications changes the documented behavior or add new features, document these changes in [README.md](README.md).

- When finished, push the changes to your GitHub repository and send a pull request to **develop**. Describe what your PR does.
+- When finished, push the changes to your GitHub repository and send a pull request. Describe what your PR does.

 - If the Travis build fails, or if you get a code review with change requests, you can fix these by pushing new or rebased commits to the branch.
@@ -2,11 +2,11 @@

 This is the markup that is rendered for the Plyr controls. You can use the default controls or provide a customized version of markup based on your needs. You can pass the following to the `controls` option:

-   `Array` of options (this builds the default controls based on your choices)
-   `Element` with the controls
-   `String` containing the desired HTML
-   `false` (or empty string or array) to disable all controls
-   `Function` that will be executed and should return one of the above
+- `Array` of options (this builds the default controls based on your choices)
+- `Element` with the controls
+- `String` containing the desired HTML
+- `false` (or empty string or array) to disable all controls
+- `Function` that will be executed and should return one of the above

 ## Using default controls

@@ -14,28 +14,28 @@ If you want to use the standard controls as they are, you don't need to pass any

 ```javascript
 controls: [
-    'play-large', // The large play button in the center
-    'restart', // Restart playback
-    'rewind', // Rewind by the seek time (default 10 seconds)
-    'play', // Play/pause playback
-    'fast-forward', // Fast forward by the seek time (default 10 seconds)
-    'progress', // The progress bar and scrubber for playback and buffering
-    'current-time', // The current time of playback
-    'duration', // The full duration of the media
-    'mute', // Toggle mute
-    'volume', // Volume control
-    'captions', // Toggle captions
-    'settings', // Settings menu
-    'pip', // Picture-in-picture (currently Safari only)
-    'airplay', // Airplay (currently Safari only)
-    'download', // Show a download button with a link to either the current source or a custom URL you specify in your options
-    'fullscreen', // Toggle fullscreen
+  'play-large', // The large play button in the center
+  'restart', // Restart playback
+  'rewind', // Rewind by the seek time (default 10 seconds)
+  'play', // Play/pause playback
+  'fast-forward', // Fast forward by the seek time (default 10 seconds)
+  'progress', // The progress bar and scrubber for playback and buffering
+  'current-time', // The current time of playback
+  'duration', // The full duration of the media
+  'mute', // Toggle mute
+  'volume', // Volume control
+  'captions', // Toggle captions
+  'settings', // Settings menu
+  'pip', // Picture-in-picture (currently Safari only)
+  'airplay', // Airplay (currently Safari only)
+  'download', // Show a download button with a link to either the current source or a custom URL you specify in your options
+  'fullscreen', // Toggle fullscreen
 ];
 ```

 ### Internationalization using default controls

-You can provide an `i18n` object as one of your options when initialising the plugin which we be used when rendering the controls.
+You can provide an `i18n` object as one of your options when initializing the plugin which we be used when rendering the controls.

 #### Example

@@ -84,14 +84,14 @@ The classes and data attributes used in your template should match the `selector

 You need to add several placeholders to your HTML template that are replaced when rendering:

-   `{id}` - the dynamically generated ID for the player (for form controls)
-   `{seektime}` - the seek time specified in options for fast forward and rewind
-   `{title}` - the title of your media, if specified
+- `{id}` - the dynamically generated ID for the player (for form controls)
+- `{seektime}` - the seek time specified in options for fast forward and rewind
+- `{title}` - the title of your media, if specified

 ### Limitations

-   Currently the settings menus are not supported with custom controls HTML
-   AirPlay and PiP buttons can be added but you will have to manage feature detection
+- Currently the settings menus are not supported with custom controls HTML
+- AirPlay and PiP buttons can be added but you will have to manage feature detection

 ### Example

@@ -1,3 +1,6 @@
+| 🎉  | [Plyr is merging into Vidstack](https://github.com/sampotts/plyr/issues/2408) | 🎉  |
+| :-: | :---------------------------------------------------------------------------: | :-- |
+
 Plyr is a simple, lightweight, accessible and customizable HTML5, YouTube and Vimeo media player that supports [_modern_](#browser-support) browsers.

 [Checkout the demo](https://plyr.io) - [Donate](#donate) - [Slack](https://bit.ly/plyr--chat)
@@ -27,11 +30,11 @@ Plyr is a simple, lightweight, accessible and customizable HTML5, YouTube and Vi
 - 🌎 **i18n support** - support for internationalization of controls
 - 👌 **[Preview thumbnails](#preview-thumbnails)** - support for displaying preview thumbnails
 - 🤟 **No frameworks** - written in "vanilla" ES6 JavaScript, no jQuery required
- 💁‍♀️ **SASS** - to include in your build processes
+- 💁‍♀️ **Sass** - to include in your build processes

 ### Demos

-You can try Plyr in Codepen using our minimal templates: [HTML5 video](https://codepen.io/pen?template=bKeqpr), [HTML5 audio](https://codepen.io/pen?template=rKLywR), [YouTube](https://codepen.io/pen?template=GGqbbJ), [Vimeo](https://codepen.io/pen?template=bKeXNq). For Streaming we also have example integrations with: [Dash.js](https://codepen.io/pen?template=zaBgBy), [Hls.js](https://codepen.io/pen?template=oyLKQb) and [Shaka Player](https://codepen.io/pen?template=ZRpzZO)
+You can try Plyr in Codepen using our minimal templates: [HTML5 video](https://codepen.io/pen?template=bKeqpr), [HTML5 audio](https://codepen.io/pen?template=rKLywR), [YouTube](https://codepen.io/pen?template=GGqbbJ), [Vimeo](https://codepen.io/pen?template=bKeXNq). For Streaming we also have example integrations with: [Dash.js](https://codepen.io/pen?template=GRoogML), [Hls.js](https://codepen.io/pen?template=oyLKQb) and [Shaka Player](https://codepen.io/pen?template=ZRpzZO)

 # Quick setup

@@ -131,21 +134,21 @@ Alternatively you can include the `plyr.js` script before the closing `</body>`

 See [initialising](#initialising) for more information on advanced setups.

-You can use our CDN (provided by [Fastly](https://www.fastly.com/)) for the JavaScript. There's 2 versions; one with and one without [polyfills](#polyfills). My recommendation would be to manage polyfills seperately as part of your application but to make life easier you can use the polyfilled build.
+You can use our CDN (provided by [Fastly](https://www.fastly.com/)) for the JavaScript. There's 2 versions; one with and one without [polyfills](#polyfills). My recommendation would be to manage polyfills separately as part of your application but to make life easier you can use the polyfilled build.

 ```html
-<script src="https://cdn.plyr.io/3.6.2/plyr.js"></script>
+<script src="https://cdn.plyr.io/3.7.1/plyr.js"></script>
 ```

 ...or...

 ```html
-<script src="https://cdn.plyr.io/3.6.2/plyr.polyfilled.js"></script>
+<script src="https://cdn.plyr.io/3.7.1/plyr.polyfilled.js"></script>
 ```

 ## CSS

-Include the `plyr.css` stylsheet into your `<head>`.
+Include the `plyr.css` stylesheet into your `<head>`.

 ```html
 <link rel="stylesheet" href="path/to/plyr.css" />
@@ -154,13 +157,13 @@ Include the `plyr.css` stylsheet into your `<head>`.
 If you want to use our CDN (provided by [Fastly](https://www.fastly.com/)) for the default CSS, you can use the following:

 ```html
-<link rel="stylesheet" href="https://cdn.plyr.io/3.6.2/plyr.css" />
+<link rel="stylesheet" href="https://cdn.plyr.io/3.7.1/plyr.css" />
 ```

 ## SVG Sprite

 The SVG sprite is loaded automatically from our CDN (provided by [Fastly](https://www.fastly.com/)). To change this, see the [options](#options) below. For
-reference, the CDN hosted SVG sprite can be found at `https://cdn.plyr.io/3.6.2/plyr.svg`.
+reference, the CDN hosted SVG sprite can be found at `https://cdn.plyr.io/3.7.1/plyr.svg`.

 # Ads

@@ -184,42 +187,43 @@ Here's a list of the properties and what they are used for:

 | Name                                           | Description                                                                                             | Default / Fallback                                                    |
 | ---------------------------------------------- | ------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------- |
-| `--plyr-color-main`                            | The primary UI color.                                                                                   | ![#f03c15](https://placehold.it/15/00b3ff/000000?text=+) `#00b3ff`    |
+| `--plyr-color-main`                            | The primary UI color.                                                                                   | ![#f03c15](https://place-hold.it/15/00b3ff/000000?text=+) `#00b3ff`   |
+| `--plyr-video-background`                      | The background color of video and poster wrappers for using alpha channel videos and poster images.     | `rgba(0, 0, 0, 1)`                                                    |
 | `--plyr-tab-focus-color`                       | The color used for the dotted outline when an element is `:focus-visible` (equivalent) keyboard focus.  | `--plyr-color-main`                                                   |
-| `--plyr-badge-background`                      | The background color for badges in the menu.                                                            | ![#4a5464](https://placehold.it/15/4a5464/000000?text=+) `#4a5464`    |
-| `--plyr-badge-text-color`                      | The text color for badges.                                                                              | ![#ffffff](https://placehold.it/15/ffffff/000000?text=+) `#ffffff`    |
+| `--plyr-badge-background`                      | The background color for badges in the menu.                                                            | ![#4a5464](https://place-hold.it/15/4a5464/000000?text=+) `#4a5464`   |
+| `--plyr-badge-text-color`                      | The text color for badges.                                                                              | ![#ffffff](https://place-hold.it/15/ffffff/000000?text=+) `#ffffff`   |
 | `--plyr-badge-border-radius`                   | The border radius used for badges.                                                                      | `2px`                                                                 |
 | `--plyr-tab-focus-color`                       | The color used to highlight tab (keyboard) focus.                                                       | `--plyr-color-main`                                                   |
 | `--plyr-captions-background`                   | The color for the background of captions.                                                               | `rgba(0, 0, 0, 0.8)`                                                  |
-| `--plyr-captions-text-color`                   | The color used for the captions text.                                                                   | ![#ffffff](https://placehold.it/15/ffffff/000000?text=+) `#ffffff`    |
+| `--plyr-captions-text-color`                   | The color used for the captions text.                                                                   | ![#ffffff](https://place-hold.it/15/ffffff/000000?text=+) `#ffffff`   |
 | `--plyr-control-icon-size`                     | The size of the icons used in the controls.                                                             | `18px`                                                                |
 | `--plyr-control-spacing`                       | The space between controls (sometimes used in a multiple - e.g. `10px / 2 = 5px`).                      | `10px`                                                                |
 | `--plyr-control-padding`                       | The padding inside controls.                                                                            | `--plyr-control-spacing * 0.7` (`7px`)                                |
 | `--plyr-control-radius`                        | The border radius used on controls.                                                                     | `3px`                                                                 |
 | `--plyr-control-toggle-checked-background`     | The background color used for checked menu items.                                                       | `--plyr-color-main`                                                   |
 | `--plyr-video-controls-background`             | The background for the video controls.                                                                  | `linear-gradient(rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.75))`              |
-| `--plyr-video-control-color`                   | The text/icon color for video controls.                                                                 | ![#ffffff](https://placehold.it/15/ffffff/000000?text=+) `#ffffff`    |
-| `--plyr-video-control-color-hover`             | The text/icon color used when video controls are `:hover`, `:focus` and `:focus-visible` (equivalent).  | ![#ffffff](https://placehold.it/15/ffffff/000000?text=+) `#ffffff`    |
+| `--plyr-video-control-color`                   | The text/icon color for video controls.                                                                 | ![#ffffff](https://place-hold.it/15/ffffff/000000?text=+) `#ffffff`   |
+| `--plyr-video-control-color-hover`             | The text/icon color used when video controls are `:hover`, `:focus` and `:focus-visible` (equivalent).  | ![#ffffff](https://place-hold.it/15/ffffff/000000?text=+) `#ffffff`   |
 | `--plyr-video-control-background-hover`        | The background color used when video controls are `:hover`, `:focus` and `:focus-visible` (equivalent). | `--plyr-color-main`                                                   |
-| `--plyr-audio-controls-background`             | The background for the audio controls.                                                                  | ![#ffffff](https://placehold.it/15/ffffff/000000?text=+) `#ffffff`    |
-| `--plyr-audio-control-color`                   | The text/icon color for audio controls.                                                                 | ![#4a5464](https://placehold.it/15/4a5464/000000?text=+) `#4a5464`    |
-| `--plyr-audio-control-color-hover`             | The text/icon color used when audio controls are `:hover`, `:focus` and `:focus-visible` (equivalent).  | ![#ffffff](https://placehold.it/15/ffffff/000000?text=+) `#ffffff`    |
+| `--plyr-audio-controls-background`             | The background for the audio controls.                                                                  | ![#ffffff](https://place-hold.it/15/ffffff/000000?text=+) `#ffffff`   |
+| `--plyr-audio-control-color`                   | The text/icon color for audio controls.                                                                 | ![#4a5464](https://place-hold.it/15/4a5464/000000?text=+) `#4a5464`   |
+| `--plyr-audio-control-color-hover`             | The text/icon color used when audio controls are `:hover`, `:focus` and `:focus-visible` (equivalent).  | ![#ffffff](https://place-hold.it/15/ffffff/000000?text=+) `#ffffff`   |
 | `--plyr-audio-control-background-hover`        | The background color used when video controls are `:hover`, `:focus` and `:focus-visible` (equivalent). | `--plyr-color-main`                                                   |
 | `--plyr-menu-background`                       | The background color for menus.                                                                         | `rgba(255, 255, 255, 0.9)`                                            |
-| `--plyr-menu-color`                            | The text/icon color for menu items.                                                                     | ![#4a5464](https://placehold.it/15/4a5464/000000?text=+) `#4a5464`    |
+| `--plyr-menu-color`                            | The text/icon color for menu items.                                                                     | ![#4a5464](https://place-hold.it/15/4a5464/000000?text=+) `#4a5464`   |
 | `--plyr-menu-shadow`                           | The shadow used on menus.                                                                               | `0 1px 2px rgba(0, 0, 0, 0.15)`                                       |
 | `--plyr-menu-radius`                           | The border radius on the menu.                                                                          | `4px`                                                                 |
 | `--plyr-menu-arrow-size`                       | The size of the arrow on the bottom of the menu.                                                        | `6px`                                                                 |
-| `--plyr-menu-item-arrow-color`                 | The color of the arrows in the menu.                                                                    | ![#728197](https://placehold.it/15/728197/000000?text=+) `#728197`    |
+| `--plyr-menu-item-arrow-color`                 | The color of the arrows in the menu.                                                                    | ![#728197](https://place-hold.it/15/728197/000000?text=+) `#728197`   |
 | `--plyr-menu-item-arrow-size`                  | The size of the arrows in the menu.                                                                     | `4px`                                                                 |
-| `--plyr-menu-border-color`                     | The border color for the bottom of the back button in the top of the sub menu pages.                    | ![#dcdfe5](https://placehold.it/15/dcdfe5/000000?text=+) `#dcdfe5`    |
-| `--plyr-menu-border-shadow-color`              | The shadow below the border of the back button in the top of the sub menu pages.                        | ![#ffffff](https://placehold.it/15/ffffff/000000?text=+) `#ffffff`    |
+| `--plyr-menu-border-color`                     | The border color for the bottom of the back button in the top of the sub menu pages.                    | ![#dcdfe5](https://place-hold.it/15/dcdfe5/000000?text=+) `#dcdfe5`   |
+| `--plyr-menu-border-shadow-color`              | The shadow below the border of the back button in the top of the sub menu pages.                        | ![#ffffff](https://place-hold.it/15/ffffff/000000?text=+) `#ffffff`   |
 | `--plyr-progress-loading-size`                 | The size of the stripes in the loading state in the scrubber.                                           | `25px`                                                                |
 | `--plyr-progress-loading-background`           | The background color on the loading state in the scrubber.                                              | `rgba(35, 40, 47, 0.6)`                                               |
 | `--plyr-video-progress-buffered-background`    | The fill color for the buffer indication in the scrubber for video.                                     | `rgba(255, 255, 255, 0.25)`                                           |
 | `--plyr-audio-progress-buffered-background`    | The fill color for the buffer indication in the scrubber for audio.                                     | `rgba(193, 200, 209, 0.6)`                                            |
 | `--plyr-range-thumb-height`                    | The height of the scrubber handle/thumb.                                                                | `13px`                                                                |
-| `--plyr-range-thumb-background`                | The background of the scrubber handle/thumb.                                                            | ![#ffffff](https://placehold.it/15/ffffff/000000?text=+) `#ffffff`    |
+| `--plyr-range-thumb-background`                | The background of the scrubber handle/thumb.                                                            | ![#ffffff](https://place-hold.it/15/ffffff/000000?text=+) `#ffffff`   |
 | `--plyr-range-thumb-shadow`                    | The shadow of the scrubber handle/thumb.                                                                | `0 1px 1px rgba(215, 26, 18, 0.15), 0 0 0 1px rgba(215, 26, 18, 0.2)` |
 | `--plyr-range-thumb-active-shadow-width`       | The width of the shadow when the scrubber handle/thumb is `:active` (pressed).                          | `3px`                                                                 |
 | `--plyr-range-track-height`                    | The height of the scrubber/progress track.                                                              | `5px`                                                                 |
@@ -229,7 +233,7 @@ Here's a list of the properties and what they are used for:
 | `--plyr-audio-range-track-background`          | The background of the scrubber/progress.                                                                | `--plyr-video-progress-buffered-background`                           |
 | `--plyr-audio-range-thumb-active-shadow-color` | The color of the shadow when the audio scrubber handle/thumb is `:active` (pressed).                    | `rgba(215, 26, 18, 0.1)`                                              |
 | `--plyr-tooltip-background`                    | The background color for tooltips.                                                                      | `rgba(255, 255, 255, 0.9)`                                            |
-| `--plyr-tooltip-color`                         | The text color for tooltips.                                                                            | ![#4a5464](https://placehold.it/15/4a5464/000000?text=+) `#4a5464`    |
+| `--plyr-tooltip-color`                         | The text color for tooltips.                                                                            | ![#4a5464](https://place-hold.it/15/4a5464/000000?text=+) `#4a5464`   |
 | `--plyr-tooltip-padding`                       | The padding for tooltips.                                                                               | `calc(var(--plyr-control-spacing) / 2))`                              |
 | `--plyr-tooltip-arrow-size`                    | The size of the arrow under tooltips.                                                                   | `4px`                                                                 |
 | `--plyr-tooltip-radius`                        | The border radius on tooltips.                                                                          | `3px`                                                                 |
@@ -266,14 +270,12 @@ You can set them in your CSS for all players:
 ...or in your HTML:

 ```html
-<video class="player" style="--plyr-color-main: #1ac266;">
-    ...
-</vieo>
+<video class="player" style="--plyr-color-main: #1ac266;">...</video>
 ```

-### SASS
+### Sass

-You can use `plyr.scss` file included in `/src/sass` as part of your build and change variables to suit your design. The SASS requires you to
+You can use `plyr.scss` file included in `/src/sass` as part of your build and change variables to suit your design. The Sass requires you to
 use [autoprefixer](https://www.npmjs.com/package/gulp-autoprefixer) (you should be already!) as all declarations use the W3C definitions.

 The HTML markup uses the BEM methodology with `plyr` as the block, e.g. `.plyr__controls`. You can change the class hooks in the options to match any custom CSS
@@ -343,7 +345,7 @@ The HTMLElement or string selector can be the target `<video>`, `<audio>`, or `<
 You have two choices here. You can either use a simple array loop to map the constructor:

 ```javascript
-const players = Array.from(document.querySelectorAll('.js-player')).map(p => new Plyr(p));
+const players = Array.from(document.querySelectorAll('.js-player')).map((p) => new Plyr(p));
 ```

 ...or use a static method where you can pass a [CSS string selector](https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Selectors), a [NodeList](https://developer.mozilla.org/en-US/docs/Web/API/NodeList), an [Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array) of [HTMLElement](https://developer.mozilla.org/en/docs/Web/API/HTMLElement), or a [JQuery](https://jquery.com) object:
@@ -399,11 +401,11 @@ Note the single quotes encapsulating the JSON and double quotes on the object ke
 | `invertTime`         | Boolean                    | `true`                                                                                                                         | Display the current time as a countdown rather than an incremental counter.                                                                                                                                                                                                                                                                                                                             |
 | `toggleInvert`       | Boolean                    | `true`                                                                                                                         | Allow users to click to toggle the above.                                                                                                                                                                                                                                                                                                                                                               |
 | `listeners`          | Object                     | `null`                                                                                                                         | Allows binding of event listeners to the controls before the default handlers. See the `defaults.js` for available listeners. If your handler prevents default on the event (`event.preventDefault()`), the default handler will not fire.                                                                                                                                                              |
-| `captions`           | Object                     | `{ active: false, language: 'auto', update: false }`                                                                           | `active`: Toggles if captions should be active by default. `language`: Sets the default language to load (if available). 'auto' uses the browser language. `update`: Listen to changes to tracks and update menu. This is needed for some streaming libraries, but can result in unselectable language options).                                                                                        |
+| `captions`           | Object                     | `{ active: false, language: 'auto', update: false }`                                                                           | `active`: Toggles if captions should be active by default. `language`: Sets the default language to load (if available). 'auto' uses the browser language. `update`: Listen to changes to tracks and update menu. This is needed for some streaming libraries, but can result in non-selectable language options).                                                                                      |
 | `fullscreen`         | Object                     | `{ enabled: true, fallback: true, iosNative: false, container: null }`                                                         | `enabled`: Toggles whether fullscreen should be enabled. `fallback`: Allow fallback to a full-window solution (`true`/`false`/`'force'`). `iosNative`: whether to use native iOS fullscreen when entering fullscreen (no custom controls). `container`: A selector for an ancestor of the player element, allows contextual content to remain visual in fullscreen mode. Non-ancestors are ignored.     |
 | `ratio`              | String                     | `null`                                                                                                                         | Force an aspect ratio for all videos. The format is `'w:h'` - e.g. `'16:9'` or `'4:3'`. If this is not specified then the default for HTML5 and Vimeo is to use the native resolution of the video. As dimensions are not available from YouTube via SDK, 16:9 is forced as a sensible default.                                                                                                         |
 | `storage`            | Object                     | `{ enabled: true, key: 'plyr' }`                                                                                               | `enabled`: Allow use of local storage to store user settings. `key`: The key name to use.                                                                                                                                                                                                                                                                                                               |
-| `speed`              | Object                     | `{ selected: 1, options: [0.5, 0.75, 1, 1.25, 1.5, 1.75, 2] }`                                                                 | `selected`: The default speed for playback. `options`: The speed options to display in the UI. YouTube and Vimeo will ignore any options outside of the 0.5-2 range, so options outside of this range will be hidden automatically.                                                                                                                                                                     |
+| `speed`              | Object                     | `{ selected: 1, options: [0.5, 0.75, 1, 1.25, 1.5, 1.75, 2, 4] }`                                                              | `selected`: The default speed for playback. `options`: The speed options to display in the UI. YouTube and Vimeo will ignore any options outside of the 0.5-2 range, so options outside of this range will be hidden automatically.                                                                                                                                                                     |
 | `quality`            | Object                     | `{ default: 576, options: [4320, 2880, 2160, 1440, 1080, 720, 576, 480, 360, 240] }`                                           | `default` is the default quality level (if it exists in your sources). `options` are the options to display. This is used to filter the available sources.                                                                                                                                                                                                                                              |
 | `loop`               | Object                     | `{ active: false }`                                                                                                            | `active`: Whether to loop the current video. If the `loop` attribute is present on a `<video>` or `<audio>` element, this will be automatically set to true This is an object to support future functionality.                                                                                                                                                                                          |
 | `ads`                | Object                     | `{ enabled: false, publisherId: '', tagUrl: '' }`                                                                              | `enabled`: Whether to enable advertisements. `publisherId`: Your unique [vi.ai](https://vi.ai/publisher-video-monetization/?aid=plyrio) publisher ID. `tagUrl` is a URL for a custom VAST tag if you're not using Vi.                                                                                                                                                                                   |
@@ -411,6 +413,8 @@ Note the single quotes encapsulating the JSON and double quotes on the object ke
 | `vimeo`              | Object                     | `{ byline: false, portrait: false, title: false, speed: true, transparent: false }`                                            | See [Vimeo embed options](https://github.com/vimeo/player.js/#embed-options). Some are set automatically based on other config options, namely: `loop`, `autoplay`, `muted`, `gesture`, `playsinline`                                                                                                                                                                                                   |
 | `youtube`            | Object                     | `{ noCookie: false, rel: 0, showinfo: 0, iv_load_policy: 3, modestbranding: 1 }`                                               | See [YouTube embed options](https://developers.google.com/youtube/player_parameters#Parameters). The only custom option is `noCookie` to use an alternative to YouTube that doesn't use cookies (useful for GDPR, etc). Some are set automatically based on other config options, namely: `autoplay`, `hl`, `controls`, `disablekb`, `playsinline`, `cc_load_policy`, `cc_lang_pref`, `widget_referrer` |
 | `previewThumbnails`  | Object                     | `{ enabled: false, src: '' }`                                                                                                  | `enabled`: Whether to enable the preview thumbnails (they must be generated by you). `src` must be either a string or an array of strings representing URLs for the VTT files containing the image URL(s). Learn more about [preview thumbnails](#preview-thumbnails) below.                                                                                                                            |
+| `mediaMetadata`      | Object                     | `{ title: '', artist: '', album: '', artwork: [] }`                                                                            | The [MediaMetadata](https://developer.mozilla.org/en-US/docs/Web/API/MediaMetadata) interface of the Media Session API allows a web page to provide rich media metadata for display in a platform UI.                                                                                                                                                                                                   |
+| `markers`            | Object                     | `{ enabled: false, points: [] }`                                                                                               | `enabled`: Whether to enable markers. `points` is an array of `{ time: number; label: string; }` objects where `time` represents the marker position in seconds and `label` is the HTML string to be displayed.                                                                                                                                                                                         |

 1.  Vimeo only
 2.  Autoplay is generally not recommended as it is seen as a negative user experience. It is also disabled in many browsers. Before raising issues, do your homework. More info can be found here:
@@ -436,7 +440,7 @@ const player = new Plyr('#player', {
 You can also access the object through any events:

 ```javascript
-element.addEventListener('ready', event => {
+element.addEventListener('ready', (event) => {
  const player = event.detail.plyr;
 });
 ```
@@ -450,28 +454,29 @@ player.play(); // Start playback
 player.fullscreen.enter(); // Enter fullscreen
 ```

-| Method                     | Parameters       | Description                                                                                                |
-| -------------------------- | ---------------- | ---------------------------------------------------------------------------------------------------------- |
-| `play()`&sup1;             | -                | Start playback.                                                                                            |
-| `pause()`                  | -                | Pause playback.                                                                                            |
-| `togglePlay(toggle)`&sup1; | Boolean          | Toggle playback, if no parameters are passed, it will toggle based on current status.                      |
-| `stop()`                   | -                | Stop playback and reset to start.                                                                          |
-| `restart()`                | -                | Restart playback.                                                                                          |
-| `rewind(seekTime)`         | Number           | Rewind playback by the specified seek time. If no parameter is passed, the default seek time will be used. |
-| `forward(seekTime)`        | Number           | Fast forward by the specified seek time. If no parameter is passed, the default seek time will be used.    |
-| `increaseVolume(step)`     | Number           | Increase volume by the specified step. If no parameter is passed, the default step will be used.           |
-| `decreaseVolume(step)`     | Number           | Increase volume by the specified step. If no parameter is passed, the default step will be used.           |
-| `toggleCaptions(toggle)`   | Boolean          | Toggle captions display. If no parameter is passed, it will toggle based on current status.                |
-| `fullscreen.enter()`       | -                | Enter fullscreen. If fullscreen is not supported, a fallback "full window/viewport" is used instead.       |
-| `fullscreen.exit()`        | -                | Exit fullscreen.                                                                                           |
-| `fullscreen.toggle()`      | -                | Toggle fullscreen.                                                                                         |
-| `airplay()`                | -                | Trigger the airplay dialog on supported devices.                                                           |
-| `toggleControls(toggle)`   | Boolean          | Toggle the controls (video only). Takes optional truthy value to force it on/off.                          |
-| `on(event, function)`      | String, Function | Add an event listener for the specified event.                                                             |
-| `once(event, function)`    | String, Function | Add an event listener for the specified event once.                                                        |
-| `off(event, function)`     | String, Function | Remove an event listener for the specified event.                                                          |
-| `supports(type)`           | String           | Check support for a mime type.                                                                             |
-| `destroy()`                | -                | Destroy the instance and garbage collect any elements.                                                     |
+| Method                                                   | Parameters       | Description                                                                                                |
+| -------------------------------------------------------- | ---------------- | ---------------------------------------------------------------------------------------------------------- |
+| `play()`&sup1;                                           | -                | Start playback.                                                                                            |
+| `pause()`                                                | -                | Pause playback.                                                                                            |
+| `togglePlay(toggle)`&sup1;                               | Boolean          | Toggle playback, if no parameters are passed, it will toggle based on current status.                      |
+| `stop()`                                                 | -                | Stop playback and reset to start.                                                                          |
+| `restart()`                                              | -                | Restart playback.                                                                                          |
+| `rewind(seekTime)`                                       | Number           | Rewind playback by the specified seek time. If no parameter is passed, the default seek time will be used. |
+| `forward(seekTime)`                                      | Number           | Fast forward by the specified seek time. If no parameter is passed, the default seek time will be used.    |
+| `increaseVolume(step)`                                   | Number           | Increase volume by the specified step. If no parameter is passed, the default step will be used.           |
+| `decreaseVolume(step)`                                   | Number           | Increase volume by the specified step. If no parameter is passed, the default step will be used.           |
+| `toggleCaptions(toggle)`                                 | Boolean          | Toggle captions display. If no parameter is passed, it will toggle based on current status.                |
+| `fullscreen.enter()`                                     | -                | Enter fullscreen. If fullscreen is not supported, a fallback "full window/viewport" is used instead.       |
+| `fullscreen.exit()`                                      | -                | Exit fullscreen.                                                                                           |
+| `fullscreen.toggle()`                                    | -                | Toggle fullscreen.                                                                                         |
+| `airplay()`                                              | -                | Trigger the airplay dialog on supported devices.                                                           |
+| `setPreviewThumbnails(source: PreviewThumbnailsOptions)` | -                | Sets the preview thumbnails for the current source.                                                        |
+| `toggleControls(toggle)`                                 | Boolean          | Toggle the controls (video only). Takes optional truthy value to force it on/off.                          |
+| `on(event, function)`                                    | String, Function | Add an event listener for the specified event.                                                             |
+| `once(event, function)`                                  | String, Function | Add an event listener for the specified event once.                                                        |
+| `off(event, function)`                                   | String, Function | Remove an event listener for the specified event.                                                          |
+| `supports(type)`                                         | String           | Check support for a mime type.                                                                             |
+| `destroy()`                                              | -                | Destroy the instance and garbage collect any elements.                                                     |

 1.  For HTML5 players, `play()` will return a [`Promise`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise) for most browsers - e.g. Chrome, Firefox, Opera, Safari and Edge [according to MDN](https://developer.mozilla.org/en-US/docs/Web/API/HTMLMediaElement/play) at time of writing.

@@ -512,6 +517,7 @@ player.fullscreen.active; // false;
 | `loop`               | ✓      | ✓      | Gets or sets the current loop state of the player. The setter accepts a boolean.                                                                                                                                                                                                                                                       |
 | `source`             | ✓      | ✓      | Gets or sets the current source for the player. The setter accepts an object. See [source setter](#the-source-setter) below for examples.                                                                                                                                                                                              |
 | `poster`             | ✓      | ✓      | Gets or sets the current poster image for the player. The setter accepts a string; the URL for the updated poster image.                                                                                                                                                                                                               |
+| `previewThumbnails`  | ✓      | ✓      | Gets or sets the current preview thumbnail source for the player. The setter accepts a string                                                                                                                                                                                                                                          |
 | `autoplay`           | ✓      | ✓      | Gets or sets the autoplay state of the player. The setter accepts a boolean.                                                                                                                                                                                                                                                           |
 | `currentTrack`       | ✓      | ✓      | Gets or sets the caption track by index. `-1` means the track is missing or captions is not active                                                                                                                                                                                                                                     |
 | `language`           | ✓      | ✓      | Gets or sets the preferred captions language for the player. The setter accepts an ISO two-letter language code. Support for the languages is dependent on the captions you include. If your captions don't have any language data, or if you have multiple tracks with the same language, you may want to use `currentTrack` instead. |
@@ -634,7 +640,7 @@ reference to the instance, you can use the `on()` API method or `addEventListene
 property. Here's an example:

 ```javascript
-player.on('ready', event => {
+player.on('ready', (event) => {
  const instance = event.detail.plyr;
 });
 ```
@@ -781,15 +787,16 @@ If a User Agent is disabled but supports `<video>` and `<audio>` natively, it wi

 Some awesome folks have made plugins for CMSs and Components for JavaScript frameworks:

-| Type      | Maintainer                                                                | Link                                                                                         |
-| --------- | ------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------- |
-| WordPress | Brandon Lavigne ([@drrobotnik](https://github.com/drrobotnik))            | [https://wordpress.org/plugins/plyr/](https://wordpress.org/plugins/plyr/)                   |
-| Angular   | Simon Bobrov ([@smnbbrv](https://github.com/smnbbrv))                     | [https://github.com/smnbbrv/ngx-plyr](https://github.com/smnbbrv/ngx-plyr)                   |
-| React     | Chintan Prajapati ([@chintan9](https://github.com/chintan9))              | [https://github.com/chintan9/plyr-react](https://github.com/chintan9/plyr-react)             |
-| Vue       | Gabe Dunn ([@redxtech](https://github.com/redxtech))                      | [https://github.com/redxtech/vue-plyr](https://github.com/redxtech/vue-plyr)                 |
-| Neos      | Jon Uhlmann ([@jonnitto](https://github.com/jonnitto))                    | [https://packagist.org/packages/jonnitto/plyr](https://packagist.org/packages/jonnitto/plyr) |
-| Kirby     | Dominik Pschenitschni ([@dpschen](https://github.com/dpschen))            | [https://github.com/dpschen/kirby-plyrtag](https://github.com/dpschen/kirby-plyrtag)         |
-| REDAXO    | FriendsOfRedaxo / skerbis ([@skerbis](https://friendsofredaxo.github.io)) | [https://github.com/FriendsOfREDAXO/plyr](https://github.com/FriendsOfREDAXO/plyr)           |
+| Type        | Maintainer                                                                  | Link                                                                                         |
+| ----------- | --------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------- |
+| WordPress   | Brandon Lavigne ([@drrobotnik](https://github.com/drrobotnik))              | [https://wordpress.org/plugins/plyr/](https://wordpress.org/plugins/plyr/)                   |
+| Angular     | Simon Bobrov ([@smnbbrv](https://github.com/smnbbrv))                       | [https://github.com/smnbbrv/ngx-plyr](https://github.com/smnbbrv/ngx-plyr)                   |
+| React       | Chintan Prajapati ([@chintan9](https://github.com/chintan9))                | [https://github.com/chintan9/plyr-react](https://github.com/chintan9/plyr-react)             |
+| Vue         | Gabe Dunn ([@redxtech](https://github.com/redxtech))                        | [https://github.com/redxtech/vue-plyr](https://github.com/redxtech/vue-plyr)                 |
+| Neos        | Jon Uhlmann ([@jonnitto](https://github.com/jonnitto))                      | [https://packagist.org/packages/jonnitto/plyr](https://packagist.org/packages/jonnitto/plyr) |
+| Kirby       | Dominik Pschenitschni ([@dpschen](https://github.com/dpschen))              | [https://github.com/dpschen/kirby-plyrtag](https://github.com/dpschen/kirby-plyrtag)         |
+| REDAXO      | FriendsOfRedaxo / skerbis ([@skerbis](https://friendsofredaxo.github.io))   | [https://github.com/FriendsOfREDAXO/plyr](https://github.com/FriendsOfREDAXO/plyr)           |
+| svelte-plyr | Ben Woodward / benwoodward ([@benwoodward](https://github.com/benwoodward)) | [https://github.com/benwoodward/svelte-plyr](https://github.com/benwoodward/svelte-plyr)     |

 # Issues

@@ -833,6 +840,12 @@ Plyr costs money to run, not only my time. I donate my time for free as I enjoy
 - [Oscar Radio](http://oscar-radio.xyz/)
 - [Sparkk TV](https://www.sparkktv.com/)
 - [@halfhalftravel](https://www.halfhalftravel.com/)
+- [BitChute](https://www.bitchute.com)
+- [Rutheneum-Bote](https://gymnasium-rutheneum.de/content/newspaper/kreativwettbewerb.php)
+- [pressakey.com | Blog-Magazin für Videospiele](https://pressakey.com)
+- [STROLLÿN: Work with a View](https://strollyn.com)
+- [CFDA Runway360](https://runway360.cfda.com/)
+- [NKLAV | Filmmaker](https://nklav.com)

 If you want to be added to the list, open a pull request. It'd be awesome to see how you're using Plyr 😎

@@ -0,0 +1,40 @@
+{
+  "version": "0.2",
+  "ignorePaths": [
+    "package.json",
+    "dist/*",
+    "demo/node_modules/*"
+  ],
+  "dictionaryDefinitions": [],
+  "dictionaries": [],
+  "words": [
+    "autopause",
+    "autoplay",
+    "bote",
+    "cfda",
+    "classname",
+    "digbmx",
+    "fastly",
+    "fullscreen",
+    "gordita",
+    "loadjs",
+    "magazin",
+    "menuitemradio",
+    "noupe",
+    "otransitionend",
+    "playsinline",
+    "plyr",
+    "rutheneum",
+    "seektime",
+    "selz",
+    "sparkk",
+    "srclang",
+    "strol",
+    "stylelint",
+    "unmute",
+    "videospiele",
+    "xywh"
+  ],
+  "ignoreWords": [],
+  "import": []
+}
@@ -105,14 +105,6 @@
          </button>
        </p>

-        <p>
-          Premium video monetization from
-          <a href="https://vi.ai/publisher-video-monetization/?aid=plyrio" target="_blank" class="no-border">
-            <img src="https://cdn.plyr.io/static/vi-logo-24x24.svg" alt="ai.vi" />
-            <span class="sr-only">ai.vi</span>
-          </a>
-        </p>
-
        <div class="call-to-action">
          <a href="https://github.com/sampotts/plyr" target="_blank" class="button js-shr">
            <svg class="icon" role="presentation">
@@ -5,10 +5,10 @@
  "homepage": "https://plyr.io",
  "author": "Sam Potts <sam@potts.es>",
  "dependencies": {
-    "@sentry/browser": "^5.15.5",
+    "@sentry/browser": "^5.22.3",
    "core-js": "^3.6.5",
    "custom-event-polyfill": "^1.0.7",
    "shr-buttons": "2.0.3",
-    "url-polyfill": "^1.1.8"
+    "url-polyfill": "^1.1.10"
  }
 }
@@ -17,12 +17,13 @@ import toggleClass from './toggle-class';

 (() => {
  const production = 'plyr.io';
+  const isProduction = window.location.host.includes(production);

  // Sentry for demo site (https://plyr.io) only
-  if (window.location.host === production) {
+  if (isProduction) {
    Sentry.init({
      dsn: 'https://d4ad9866ad834437a4754e23937071e4@sentry.io/305555',
-      whitelistUrls: [production].map(d => new RegExp(`https://(([a-z0-9])+(.))*${d}`)),
+      whitelistUrls: [production].map((d) => new RegExp(`https://(([a-z0-9])+(.))*${d}`)),
    });
  }

@@ -53,10 +54,10 @@ import toggleClass from './toggle-class';
      captions: {
        active: true,
      },
-      ads: {
-        enabled: window.location.host.includes(production),
+      /* ads: {
+        enabled: isProduction,
        publisherId: '918848828995742',
-      },
+      }, */
      previewThumbnails: {
        enabled: true,
        src: ['https://cdn.plyr.io/static/demo/thumbs/100p.vtt', 'https://cdn.plyr.io/static/demo/thumbs/240p.vtt'],
@@ -65,6 +66,34 @@ import toggleClass from './toggle-class';
        // Prevent Vimeo blocking plyr.io demo site
        referrerPolicy: 'no-referrer',
      },
+      mediaMetadata: {
+        title: 'View From A Blue Moon',
+        album: 'Sports',
+        artist: 'Brainfarm',
+        artwork: [
+          {
+            src: 'https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-HD.jpg',
+            type: 'image/jpeg',
+          },
+        ],
+      },
+      markers: {
+        enabled: true,
+        points: [
+          {
+            time: 10,
+            label: 'first marker',
+          },
+          {
+            time: 40,
+            label: 'second marker',
+          },
+          {
+            time: 120,
+            label: '<strong>third</strong> marker',
+          },
+        ],
+      },
    });

    // Expose for tinkering in the console
@@ -79,13 +108,13 @@ import toggleClass from './toggle-class';

    function render(type) {
      // Remove active classes
-      Array.from(buttons).forEach(button => toggleClass(button.parentElement, 'active', false));
+      Array.from(buttons).forEach((button) => toggleClass(button.parentElement, 'active', false));

      // Set active on parent
      toggleClass(document.querySelector(`[data-source="${type}"]`), 'active', true);

      // Show cite
-      Array.from(document.querySelectorAll('.plyr__cite')).forEach(cite => {
+      Array.from(document.querySelectorAll('.plyr__cite')).forEach((cite) => {
        // eslint-disable-next-line no-param-reassign
        cite.hidden = true;
      });
@@ -110,7 +139,7 @@ import toggleClass from './toggle-class';
    }

    // Bind to each button
-    Array.from(buttons).forEach(button => {
+    Array.from(buttons).forEach((button) => {
      button.addEventListener('click', () => {
        const type = button.getAttribute('data-source');

@@ -123,7 +152,7 @@ import toggleClass from './toggle-class';
    });

    // List for backwards/forwards
-    window.addEventListener('popstate', event => {
+    window.addEventListener('popstate', (event) => {
      if (event.state && Object.keys(event.state).includes('type')) {
        setSource(event.state.type);
      }
@@ -3,7 +3,7 @@ const container = document.getElementById('container');
 const tabClassName = 'tab-focus';

 // Remove class on blur
-document.addEventListener('focusout', event => {
+document.addEventListener('focusout', (event) => {
  if (!event.target.classList || container.contains(event.target)) {
    return;
  }
@@ -12,8 +12,8 @@ document.addEventListener('focusout', event => {
 });

 // Add classname to tabbed elements
-document.addEventListener('keydown', event => {
-  if (event.keyCode !== 9) {
+document.addEventListener('keydown', (event) => {
+  if (event.key !== 'Tab') {
    return;
  }

@@ -1,9 +1,11 @@
+@charset "UTF-8";
+
 // ==========================================================================
 // Plyr.io Demo Page
 // ==========================================================================
-@charset 'UTF-8';

@import '../../../../src/sass/lib/css-vars';
+
 $css-vars-use-native: true;

 // Settings
@@ -1,7 +1,8 @@
+@charset "UTF-8";
+
 // ==========================================================================
 // Plyr.io Error Page
 // ==========================================================================
-@charset 'UTF-8';

 // Settings
@import '../settings/colors';
@@ -45,7 +45,7 @@
  }

  &.tab-focus {
-    @include tab-focus();
+    @include tab-focus;
  }

  &:active {
@@ -64,7 +64,7 @@

 // Count bubble
 .button__count {
-  animation: fadein 0.2s ease;
+  animation: fade-in 0.2s ease;
  background: $color-button-count-background;
  color: $color-button-count-text;
  margin-left: ($spacing-base * 0.75);
@@ -7,7 +7,7 @@ header {
  text-align: center;

  h1 span {
-    animation: shrinkHide 1s cubic-bezier(0.175, 0.885, 0.32, 1.275) 2s forwards;
+    animation: shrink-hide 1s cubic-bezier(0.175, 0.885, 0.32, 1.275) 2s forwards;
    display: inline-block;
    font-weight: $font-weight-light;
    opacity: 0.5;
@@ -2,6 +2,8 @@
 // Icons
 // ==========================================================================

+@use 'sass:math';
+
 // Base size icon styles
 .icon {
  fill: currentColor;
@@ -19,5 +21,5 @@ label svg {

 a .icon,
 .btn .icon {
-  margin-right: ($spacing-base / 2);
+  margin-right: math.div($spacing-base, 4);
 }
@@ -5,7 +5,7 @@
 // Make a <button> look like an <a>
 button.faux-link {
  @extend a; // stylelint-disable-line
-  @include cancel-button-styles();
+  @include cancel-button-styles;
 }

 // Links
@@ -39,7 +39,7 @@ a {
  }

  &.tab-focus {
-    @include tab-focus();
+    @include tab-focus;
  }

  &.no-border::after {
@@ -2,9 +2,11 @@
 // Examples
 // ==========================================================================

+@use 'sass:math';
+
 // Example players
 .plyr {
-  border-radius: $border-radius-base;
+  border-radius: $border-radius-large;
  box-shadow: 0 2px 15px rgba(#000, 0.1);
  margin: $spacing-base auto;

@@ -31,6 +33,6 @@
  color: $color-gray-500;

  .icon {
-    margin-right: ceil($spacing-base / 6);
+    margin-right: math.div($spacing-base, 6);
  }
 }
@@ -2,6 +2,8 @@
 // Core
 // ==========================================================================

+@use 'sass:math';
+
 html,
 body {
  display: flex;
@@ -46,7 +48,7 @@ aside {

  .icon {
    fill: $color-twitter;
-    margin-right: ($spacing-base / 2);
+    margin-right: math.div($spacing-base, 2);
  }

  p {
@@ -3,23 +3,26 @@
 // ==========================================================================

 // Fade
-@keyframes fadein {
+@keyframes fade-in {
  0% {
    opacity: 0;
  }
+
  100% {
    opacity: 1;
  }
 }

-@keyframes shrinkHide {
+@keyframes shrink-hide {
  0% {
    opacity: 0.5;
    width: 38px;
  }
+
  20% {
    width: 45px;
  }
+
  100% {
    opacity: 0;
    width: 0;
@@ -4,7 +4,7 @@

@font-face {
  font-display: swap;
-  font-family: 'Gordita';
+  font-family: Gordita;
  font-style: normal;
  font-weight: $font-weight-light;
  src: url('https://cdn.plyr.io/static/fonts/gordita-light.woff2') format('woff2'),
@@ -13,7 +13,7 @@

@font-face {
  font-display: swap;
-  font-family: 'Gordita';
+  font-family: Gordita;
  font-style: normal;
  font-weight: $font-weight-regular;
  src: url('https://cdn.plyr.io/static/fonts/gordita-regular.woff2') format('woff2'),
@@ -22,7 +22,7 @@

@font-face {
  font-display: swap;
-  font-family: 'Gordita';
+  font-family: Gordita;
  font-style: normal;
  font-weight: $font-weight-medium;
  src: url('https://cdn.plyr.io/static/fonts/gordita-medium.woff2') format('woff2'),
@@ -31,7 +31,7 @@

@font-face {
  font-display: swap;
-  font-family: 'Gordita';
+  font-family: Gordita;
  font-style: normal;
  font-weight: $font-weight-bold;
  src: url('https://cdn.plyr.io/static/fonts/gordita-bold.woff2') format('woff2'),
@@ -40,7 +40,7 @@

@font-face {
  font-display: swap;
-  font-family: 'Gordita';
+  font-family: Gordita;
  font-style: normal;
  font-weight: $font-weight-black;
  src: url('https://cdn.plyr.io/static/fonts/gordita-black.woff2') format('woff2'),
@@ -2,6 +2,8 @@
 // Mixins
 // ==========================================================================

+@use 'sass:math';
+
 // Convert a <button> into an <a>
 // ---------------------------------------
@mixin cancel-button-styles() {
@@ -16,7 +18,7 @@
  position: relative;
  text-align: inherit;
  text-shadow: inherit;
-  -moz-user-select: text; // stylelint-disable-line
+  user-select: text;
  vertical-align: baseline;
  width: auto;
 }
@@ -32,7 +34,7 @@
 // Leave <body> at 100%/16px
 // ---------------------------------------
@function calculate-rem($size) {
-  $rem: $size / 16;
+  $rem: math.div($size, 16);
  @return #{$rem}rem;
 }

@@ -11,8 +11,7 @@

 html {
  line-height: 1.15; /* 1 */
-  -ms-text-size-adjust: 100%; /* 2 */
-  -webkit-text-size-adjust: 100%; /* 2 */
+  text-size-adjust: 100%; /* 2 */
 }

 /* Sections
@@ -89,7 +88,7 @@ hr {
   */

 pre {
-  font-family: monospace, monospace; /* 1 */
+  font-family: monospace; /* 1 */
  font-size: 1em; /* 2 */
 }

@@ -103,7 +102,7 @@ pre {

 a {
  background-color: transparent; /* 1 */
-  -webkit-text-decoration-skip: objects; /* 2 */
+  text-decoration-skip: objects; /* 2 */
 }

 /**
@@ -112,7 +111,7 @@ a {
   */

 abbr[title] {
-  border-bottom: none; /* 1 */
+  border-bottom: 0; /* 1 */
  text-decoration: underline; /* 2 */
  text-decoration: underline dotted; /* 2 */
 }
@@ -281,7 +280,7 @@ button,
 html [type='button'],
 [type='reset'],
 [type='submit'] {
-  -webkit-appearance: button; /* 2 */
+  appearance: button; /* 2 */
 }

 /**
@@ -375,7 +374,7 @@ textarea {
   */

 [type='search'] {
-  -webkit-appearance: textfield; /* 1 */
+  appearance: textfield; /* 1 */
  outline-offset: -2px; /* 2 */
 }

@@ -385,7 +384,7 @@ textarea {

 [type='search']::-webkit-search-cancel-button,
 [type='search']::-webkit-search-decoration {
-  -webkit-appearance: none;
+  appearance: none;
 }

 /**
@@ -394,7 +393,7 @@ textarea {
   */

 ::-webkit-file-upload-button {
-  -webkit-appearance: button; /* 1 */
+  appearance: button; /* 1 */
  font: inherit; /* 2 */
 }

@@ -3,7 +3,7 @@
 // ==========================================================================

 // Grayscale
-$color-gray-900: hsl(210, 15%, 16%);
+$color-gray-900: hsl(210deg 15% 16%);
 $color-gray-800: lighten($color-gray-900, 9%);
 $color-gray-700: lighten($color-gray-800, 9%);
 $color-gray-600: lighten($color-gray-700, 9%);
@@ -15,7 +15,7 @@ $color-gray-100: lighten($color-gray-200, 9%);
 $color-gray-50: lighten($color-gray-100, 9%);

 // Branding
-$color-brand-primary: hsl(198, 100%, 50%);
+$color-brand-primary: hsl(198deg 100% 50%);

 // Text
 $color-text: $color-gray-700;
@@ -28,13 +28,13 @@ $color-twitter: #4baaf4;
 $color-link: $color-brand-primary;

 // Background
-$color-background-from: hsl(198, 100%, 94%);
-$color-background-to: hsl(198, 100%, 98%);
+$color-background-from: hsl(198deg 100% 94%);
+$color-background-to: hsl(198deg 100% 98%);

 // Buttons
 $color-button-background: $color-brand-primary;
 $color-button-text: #fff;
-$color-button-background-hover: hsl(198, 100%, 55%);
+$color-button-background-hover: hsl(198deg 100% 55%);
 $color-button-count-background: #fff;
 $color-button-count-text: $color-gray-600;

@@ -7,6 +7,7 @@ $arrow-size: 5px;

 // Radii
 $border-radius-base: 4px;
+$border-radius-large: 8px;

 // Background
 $page-background: linear-gradient(to left top, $color-background-from, $color-background-to);
@@ -2,4 +2,4 @@
 // Layout
 // ==========================================================================

-$container-max-width: 1260px;
+$container-max-width: 1240px;
@@ -4,18 +4,14 @@

 $font-sans-serif: 'Gordita', 'Avenir', 'Helvetica Neue', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji',
  'Segoe UI Symbol';
-
 $font-size-base: 15;
 $font-size-small: 13;
 $font-size-large: 18;
 $font-size-h1: 64;
-
 $font-weight-light: 300;
 $font-weight-regular: 400;
 $font-weight-medium: 500;
 $font-weight-bold: 600;
 $font-weight-black: 900;
-
 $line-height-base: 1.75;
-
 $letter-spacing-headings: -0.025em;
@@ -8,8 +8,9 @@ html {
 }

 body {
-  @include font-smoothing();
+  @include font-smoothing;
  @include font-size($font-size-base);
+
  color: $color-text;
  font-family: $font-sans-serif;
  font-weight: $font-weight-medium;
@@ -30,5 +31,6 @@ small {

 small {
  @include font-size($font-size-small);
+
  display: block;
 }
@@ -4,6 +4,7 @@

 h1 {
  @include font-size($font-size-h1);
+
  color: $color-headings;
  font-weight: $font-weight-bold;
  letter-spacing: $letter-spacing-headings;
@@ -2,56 +2,56 @@
 # yarn lockfile v1


-"@sentry/browser@^5.15.5":
-  version "5.15.5"
-  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.15.5.tgz#d9a51f1388581067b50d30ed9b1aed2cbb333a36"
-  integrity sha512-rqDvjk/EvogfdbZ4TiEpxM/lwpPKmq23z9YKEO4q81+1SwJNua53H60dOk9HpRU8nOJ1g84TMKT2Ov8H7sqDWA==
+"@sentry/browser@^5.22.3":
+  version "5.22.3"
+  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.22.3.tgz#7a64bd1cf01bf393741a3e4bf35f82aa927f5b4e"
+  integrity sha512-2TzE/CoBa5ZkvxJizDdi1Iz1ldmXSJpFQ1mL07PIXBjCt0Wxf+WOuFSj5IP4L40XHfJE5gU8wEvSH0VDR8nXtA==
  dependencies:
-    "@sentry/core" "5.15.5"
-    "@sentry/types" "5.15.5"
-    "@sentry/utils" "5.15.5"
+    "@sentry/core" "5.22.3"
+    "@sentry/types" "5.22.3"
+    "@sentry/utils" "5.22.3"
    tslib "^1.9.3"

-"@sentry/core@5.15.5":
-  version "5.15.5"
-  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-5.15.5.tgz#40ea79bff5272d3fbbeeb4a98cdc59e1adbd2c92"
-  integrity sha512-enxBLv5eibBMqcWyr+vApqeix8uqkfn0iGsD3piKvoMXCgKsrfMwlb/qo9Ox0lKr71qIlZVt+9/A2vZohdgnlg==
+"@sentry/core@5.22.3":
+  version "5.22.3"
+  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-5.22.3.tgz#030f435f2b518f282ba8bd954dac90cd70888bd7"
+  integrity sha512-eGL5uUarw3o4i9QUb9JoFHnhriPpWCaqeaIBB06HUpdcvhrjoowcKZj1+WPec5lFg5XusE35vez7z/FPzmJUDw==
  dependencies:
-    "@sentry/hub" "5.15.5"
-    "@sentry/minimal" "5.15.5"
-    "@sentry/types" "5.15.5"
-    "@sentry/utils" "5.15.5"
+    "@sentry/hub" "5.22.3"
+    "@sentry/minimal" "5.22.3"
+    "@sentry/types" "5.22.3"
+    "@sentry/utils" "5.22.3"
    tslib "^1.9.3"

-"@sentry/hub@5.15.5":
-  version "5.15.5"
-  resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.15.5.tgz#f5abbcdbe656a70e2ff02c02a5a4cffa0f125935"
-  integrity sha512-zX9o49PcNIVMA4BZHe//GkbQ4Jx+nVofqU/Il32/IbwKhcpPlhGX3c1sOVQo4uag3cqd/JuQsk+DML9TKkN0Lw==
+"@sentry/hub@5.22.3":
+  version "5.22.3"
+  resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.22.3.tgz#08309a70d2ea8d5e313d05840c1711f34f2fffe5"
+  integrity sha512-INo47m6N5HFEs/7GMP9cqxOIt7rmRxdERunA3H2L37owjcr77MwHVeeJ9yawRS6FMtbWXplgWTyTIWIYOuqVbw==
  dependencies:
-    "@sentry/types" "5.15.5"
-    "@sentry/utils" "5.15.5"
+    "@sentry/types" "5.22.3"
+    "@sentry/utils" "5.22.3"
    tslib "^1.9.3"

-"@sentry/minimal@5.15.5":
-  version "5.15.5"
-  resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.15.5.tgz#a0e4e071f01d9c4d808094ae7203f6c4cca9348a"
-  integrity sha512-zQkkJ1l9AjmU/Us5IrOTzu7bic4sTPKCatptXvLSTfyKW7N6K9MPIIFeSpZf9o1yM2sRYdK7GV08wS2eCT3JYw==
+"@sentry/minimal@5.22.3":
+  version "5.22.3"
+  resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.22.3.tgz#706e4029ae5494123d3875c658ba8911aa5cc440"
+  integrity sha512-HoINpYnVYCpNjn2XIPIlqH5o4BAITpTljXjtAftOx6Hzj+Opjg8tR8PWliyKDvkXPpc4kXK9D6TpEDw8MO0wZA==
  dependencies:
-    "@sentry/hub" "5.15.5"
-    "@sentry/types" "5.15.5"
+    "@sentry/hub" "5.22.3"
+    "@sentry/types" "5.22.3"
    tslib "^1.9.3"

-"@sentry/types@5.15.5":
-  version "5.15.5"
-  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.15.5.tgz#16c97e464cf09bbd1d2e8ce90d130e781709076e"
-  integrity sha512-F9A5W7ucgQLJUG4LXw1ZIy4iLevrYZzbeZ7GJ09aMlmXH9PqGThm1t5LSZlVpZvUfQ2rYA8NU6BdKJSt7B5LPw==
+"@sentry/types@5.22.3":
+  version "5.22.3"
+  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.22.3.tgz#d1d547b30ee8bd7771fa893af74c4f3d71f0fd18"
+  integrity sha512-cv+VWK0YFgCVDvD1/HrrBWOWYG3MLuCUJRBTkV/Opdy7nkdNjhCAJQrEyMM9zX0sac8FKWKOHT0sykNh8KgmYw==

-"@sentry/utils@5.15.5":
-  version "5.15.5"
-  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.15.5.tgz#dec1d4c79037c4da08b386f5d34409234dcbfb15"
-  integrity sha512-Nl9gl/MGnzSkuKeo3QaefoD/OJrFLB8HmwQ7HUbTXb6E7yyEzNKAQMHXGkwNAjbdYyYbd42iABP6Y5F/h39NtA==
+"@sentry/utils@5.22.3":
+  version "5.22.3"
+  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.22.3.tgz#e3bda3e789239eb16d436f768daa12829f33d18f"
+  integrity sha512-AHNryXMBvIkIE+GQxTlmhBXD0Ksh+5w1SwM5qi6AttH+1qjWLvV6WB4+4pvVvEoS8t5F+WaVUZPQLmCCWp6zKw==
  dependencies:
-    "@sentry/types" "5.15.5"
+    "@sentry/types" "5.22.3"
    tslib "^1.9.3"

 core-js@^3.6.5:
@@ -74,7 +74,7 @@ tslib@^1.9.3:
  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz#eb15d128827fbee2841549e171f45ed338ac7e35"
  integrity sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==

-url-polyfill@^1.1.8:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/url-polyfill/-/url-polyfill-1.1.8.tgz#21eb58ad61192f52b77dcac8ab5293ae7bc67060"
-  integrity sha512-Ey61F4FEqhcu1vHSOMmjl0Vd/RPRLEjMj402qszD/dhMBrVfoUsnIj8KSZo2yj+eIlxJGKFdnm6ES+7UzMgZ3Q==
+url-polyfill@^1.1.10:
+  version "1.1.10"
+  resolved "https://registry.yarnpkg.com/url-polyfill/-/url-polyfill-1.1.10.tgz#fd5bbcf66c9491fa682b0cb6d6a855e1643a9281"
+  integrity sha512-vSaPpaRgBrf41+Uky1myiSh6gpcbw8FpwHYnEy0abxndojOBnIs+yh/49gKYFLtUMP9qoNWjn6j9aUVy23Ie2A==
@@ -1,6 +1,6 @@
 {
  "name": "plyr",
-  "version": "3.6.2",
+  "version": "3.7.1",
  "description": "A simple, accessible and customizable HTML5, YouTube and Vimeo media player",
  "homepage": "https://plyr.io",
  "author": "Sam Potts <sam@potts.es>",
@@ -31,70 +31,70 @@
  "browserslist": "> 1%",
  "scripts": {
    "build": "gulp build",
-    "lint": "eslint src/js && npm run-script remark",
-    "lint:fix": "eslint --fix src/js",
+    "lint": "eslint src/js && npm run remark && stylelint **/*.scss",
+    "lint:fix": "eslint --fix src/js && stylelint **/*.scss --fix",
    "remark": "remark -f --use 'validate-links=repository:\"sampotts/plyr\"' '{,!(node_modules),.?**/}*.md'",
    "deploy": "yarn lint && gulp version && gulp build && gulp deploy",
-    "format": "prettier --write \"./{src,demo/src}/**/*.{js,scss}\""
+    "format": "prettier --write \"./{src,demo/src}/**/*.{js,scss}\"",
+    "spellcheck": "cspell \"**/*.{js,md,scss,json}\" --no-must-find-files",
+    "start": "gulp"
  },
  "devDependencies": {
-    "ansi-colors": "^4.1.1",
-    "autoprefixer": "^9.7.6",
-    "aws-sdk": "^2.668.0",
-    "@babel/core": "^7.9.6",
-    "@babel/preset-env": "^7.9.6",
+    "@babel/core": "^7.17.9",
+    "@babel/plugin-proposal-class-properties": "^7.16.7",
+    "@babel/preset-env": "^7.16.11",
+    "@sampotts/eslint-config": "1.1.7",
+    "autoprefixer": "^10.4.4",
+    "aws-sdk": "^2.1116.0",
    "babel-eslint": "^10.1.0",
-    "browser-sync": "^2.26.7",
-    "del": "^5.1.0",
-    "eslint": "^6.8.0",
-    "eslint-config-airbnb-base": "^14.1.0",
-    "eslint-config-prettier": "^6.11.0",
-    "eslint-plugin-import": "^2.20.2",
-    "eslint-plugin-simple-import-sort": "^5.0.3",
-    "fancy-log": "^1.3.3",
-    "fastly-purge": "^1.0.1",
+    "browser-sync": "^2.27.9",
+    "colorette": "2.0.16",
+    "cspell": "^5.19.7",
+    "cssnano": "^5.1.7",
+    "del": "^6.0.0",
+    "eslint": "^7.23.0",
+    "fancy-log": "^2.0.0",
    "git-branch": "^2.0.1",
    "gulp": "^4.0.2",
-    "gulp-awspublish": "^4.1.1",
+    "gulp-awspublish": "^6.0.2",
    "gulp-better-rollup": "^4.0.1",
-    "gulp-filter": "^6.0.0",
+    "gulp-filter": "^7.0.0",
    "gulp-header": "^2.0.9",
    "gulp-hub": "^4.2.0",
+    "gulp-if": "^3.0.0",
    "gulp-imagemin": "^7.1.0",
    "gulp-open": "^3.0.1",
    "gulp-plumber": "^1.2.1",
-    "gulp-postcss": "^8.0.0",
+    "gulp-postcss": "^9.0.1",
    "gulp-rename": "^2.0.0",
-    "gulp-replace": "^1.0.0",
-    "gulp-sass": "^4.1.0",
-    "gulp-size": "^3.0.0",
-    "gulp-sourcemaps": "^2.6.5",
-    "gulp-svgstore": "^7.0.1",
-    "gulp-terser": "^1.2.0",
-    "postcss-clean": "^1.1.0",
-    "postcss-custom-properties": "^9.1.1",
-    "prettier-eslint": "^9.0.1",
+    "gulp-replace": "^1.1.3",
+    "gulp-sass": "^5.1.0",
+    "gulp-size": "^4.0.1",
+    "gulp-sourcemaps": "^3.0.0",
+    "gulp-svgstore": "^9.0.0",
+    "gulp-terser": "^2.1.0",
+    "postcss": "^8.4.12",
+    "postcss-custom-properties": "^12.1.7",
+    "postcss-scss": "^4.0.3",
+    "prettier-eslint": "^12.0.0",
    "prettier-stylelint": "^0.4.2",
-    "remark-cli": "^8.0.0",
-    "remark-validate-links": "^10.0.0",
-    "rollup": "^2.7.6",
+    "remark-cli": "^10.0.1",
+    "remark-validate-links": "^11.0.2",
+    "rollup": "^2.70.2",
    "rollup-plugin-babel": "^4.4.0",
    "rollup-plugin-commonjs": "^10.1.0",
    "rollup-plugin-node-resolve": "^5.2.0",
-    "stylelint": "^13.3.3",
-    "stylelint-config-prettier": "^8.0.1",
-    "stylelint-config-recommended": "^3.0.0",
-    "stylelint-config-sass-guidelines": "^7.0.0",
-    "stylelint-order": "^4.0.0",
-    "stylelint-scss": "^3.17.1",
-    "stylelint-selector-bem-pattern": "^2.1.0",
-    "through2": "^3.0.1"
+    "sass": "^1.50.0",
+    "stylelint": "^14.7.1",
+    "stylelint-config-prettier": "^9.0.3",
+    "stylelint-config-sass-guidelines": "^9.0.1",
+    "stylelint-selector-bem-pattern": "^2.1.1"
  },
  "dependencies": {
-    "core-js": "^3.6.5",
+    "core-js": "^3.22.0",
    "custom-event-polyfill": "^1.0.7",
    "loadjs": "^4.2.0",
    "rangetouch": "^2.0.1",
-    "url-polyfill": "^1.1.8"
+    "url-polyfill": "^1.1.12"
  }
 }
@@ -12,7 +12,9 @@

    // Linting
    "stylelint.enable": true,
+    "stylelint.validate": ["css", "scss"],
    "css.validate": false,
+    "less.validate": false,
    "scss.validate": false,
    "javascript.validate.enable": false,

@@ -56,7 +56,7 @@ const captions = {
    if (browser.isIE && window.URL) {
      const elements = this.media.querySelectorAll('track');

-      Array.from(elements).forEach(track => {
+      Array.from(elements).forEach((track) => {
        const src = track.getAttribute('src');
        const url = parseUrl(src);

@@ -66,7 +66,7 @@ const captions = {
          ['http:', 'https:'].includes(url.protocol)
        ) {
          fetch(src, 'blob')
-            .then(blob => {
+            .then((blob) => {
              track.setAttribute('src', window.URL.createObjectURL(blob));
            })
            .catch(() => {
@@ -84,7 +84,7 @@ const captions = {
    // * toggled:   The real captions state

    const browserLanguages = navigator.languages || [navigator.language || navigator.userLanguage || 'en'];
-    const languages = dedupe(browserLanguages.map(language => language.split('-')[0]));
+    const languages = dedupe(browserLanguages.map((language) => language.split('-')[0]));
    let language = (this.storage.get('language') || this.config.captions.language || 'auto').toLowerCase();

    // Use first browser language when language is 'auto'
@@ -119,13 +119,13 @@ const captions = {
    const tracks = captions.getTracks.call(this, true);
    // Get the wanted language
    const { active, language, meta, currentTrackNode } = this.captions;
-    const languageExists = Boolean(tracks.find(track => track.language === language));
+    const languageExists = Boolean(tracks.find((track) => track.language === language));

    // Handle tracks (add event listener and "pseudo"-default)
    if (this.isHTML5 && this.isVideo) {
      tracks
-        .filter(track => !meta.get(track))
-        .forEach(track => {
+        .filter((track) => !meta.get(track))
+        .forEach((track) => {
          this.debug.log('Track added', track);

          // Attempt to store if the original dom element was "default"
@@ -154,7 +154,9 @@ const captions = {
    }

    // Enable or disable captions based on track length
-    toggleClass(this.elements.container, this.config.classNames.captions.enabled, !is.empty(tracks));
+    if (this.elements) {
+      toggleClass(this.elements.container, this.config.classNames.captions.enabled, !is.empty(tracks));
+    }

    // Update available languages in list
    if (
@@ -309,19 +311,19 @@ const captions = {
    // For HTML5, use cache instead of current tracks when it exists (if captions.update is false)
    // Filter out removed tracks and tracks that aren't captions/subtitles (for example metadata)
    return tracks
-      .filter(track => !this.isHTML5 || update || this.captions.meta.has(track))
-      .filter(track => ['captions', 'subtitles'].includes(track.kind));
+      .filter((track) => !this.isHTML5 || update || this.captions.meta.has(track))
+      .filter((track) => ['captions', 'subtitles'].includes(track.kind));
  },

  // Match tracks based on languages and get the first
  findTrack(languages, force = false) {
    const tracks = captions.getTracks.call(this);
-    const sortIsDefault = track => Number((this.captions.meta.get(track) || {}).default);
+    const sortIsDefault = (track) => Number((this.captions.meta.get(track) || {}).default);
    const sorted = Array.from(tracks).sort((a, b) => sortIsDefault(b) - sortIsDefault(a));
    let track;

-    languages.every(language => {
-      track = sorted.find(t => t.language === language);
+    languages.every((language) => {
+      track = sorted.find((t) => t.language === language);
      return !track; // Break iteration if there is a match
    });

@@ -383,12 +385,12 @@ const captions = {
      const track = captions.getCurrentTrack.call(this);

      cues = Array.from((track || {}).activeCues || [])
-        .map(cue => cue.getCueAsHTML())
+        .map((cue) => cue.getCueAsHTML())
        .map(getHTML);
    }

    // Set new caption text
-    const content = cues.map(cueText => cueText.trim()).join('\n');
+    const content = cues.map((cueText) => cueText.trim()).join('\n');
    const changed = content !== this.elements.captions.innerHTML;

    if (changed) {
@@ -61,7 +61,7 @@ const defaults = {
  // Sprite (for icons)
  loadSprite: true,
  iconPrefix: 'plyr',
-  iconUrl: 'https://cdn.plyr.io/3.6.2/plyr.svg',
+  iconUrl: 'https://cdn.plyr.io/3.7.1/plyr.svg',

  // Blank video (used to prevent errors on source change)
  blankVideo: 'https://cdn.plyr.io/static/blank.mp4',
@@ -200,7 +200,7 @@ const defaults = {
    vimeo: {
      sdk: 'https://player.vimeo.com/api/player.js',
      iframe: 'https://player.vimeo.com/video/{0}?{1}',
-      api: 'https://vimeo.com/api/v2/video/{0}.json',
+      api: 'https://vimeo.com/api/oembed.json?url={0}',
    },
    youtube: {
      sdk: 'https://www.youtube.com/iframe_api',
@@ -350,6 +350,7 @@ const defaults = {
    hover: 'plyr--hover',
    tooltip: 'plyr__tooltip',
    cues: 'plyr__cues',
+    marker: 'plyr__progress__marker',
    hidden: 'plyr__sr-only',
    hideControls: 'plyr--hide-controls',
    isIos: 'plyr--is-ios',
@@ -398,6 +399,7 @@ const defaults = {
    embed: {
      provider: 'data-plyr-provider',
      id: 'data-plyr-embed-id',
+      hash: 'data-plyr-embed-hash',
    },
  },

@@ -422,20 +424,37 @@ const defaults = {
    title: false,
    speed: true,
    transparent: false,
+    // Custom settings from Plyr
+    customControls: true,
+    referrerPolicy: null, // https://developer.mozilla.org/en-US/docs/Web/API/HTMLIFrameElement/referrerPolicy
    // Whether the owner of the video has a Pro or Business account
    // (which allows us to properly hide controls without CSS hacks, etc)
    premium: false,
-    // Custom settings from Plyr
-    referrerPolicy: null, // https://developer.mozilla.org/en-US/docs/Web/API/HTMLIFrameElement/referrerPolicy
  },

  // YouTube plugin
  youtube: {
-    noCookie: true, // Whether to use an alternative version of YouTube without cookies
    rel: 0, // No related vids
    showinfo: 0, // Hide info
    iv_load_policy: 3, // Hide annotations
    modestbranding: 1, // Hide logos as much as possible (they still show one in the corner when paused)
+    // Custom settings from Plyr
+    customControls: true,
+    noCookie: false, // Whether to use an alternative version of YouTube without cookies
+  },
+
+  // Media Metadata
+  mediaMetadata: {
+    title: '',
+    artist: '',
+    album: '',
+    artwork: [],
+  },
+
+  // Markers
+  markers: {
+    enabled: false,
+    points: [],
  },
 };

@@ -38,7 +38,8 @@ const controls = {
  // Get icon URL
  getIconUrl() {
    const url = new URL(this.config.iconUrl, window.location);
-    const cors = url.host !== window.location.host || (browser.isIE && !window.svg4everybody);
+    const host = window.location.host ? window.location.host : window.top.location.host;
+    const cors = url.host !== host || (browser.isIE && !window.svg4everybody);

    return {
      url: this.config.iconUrl,
@@ -179,7 +180,7 @@ const controls = {
      iconPressed: null,
    };

-    ['element', 'icon', 'label'].forEach(key => {
+    ['element', 'icon', 'label'].forEach((key) => {
      if (Object.keys(attributes).includes(key)) {
        props[key] = attributes[key];
        delete attributes[key];
@@ -193,7 +194,7 @@ const controls = {

    // Set class name
    if (Object.keys(attributes).includes('class')) {
-      if (!attributes.class.split(' ').some(c => c === this.config.classNames.control)) {
+      if (!attributes.class.split(' ').some((c) => c === this.config.classNames.control)) {
        extend(attributes, {
          class: `${attributes.class} ${this.config.classNames.control}`,
        });
@@ -401,9 +402,9 @@ const controls = {
      this,
      menuItem,
      'keydown keyup',
-      event => {
+      (event) => {
        // We only care about space and ⬆️ ⬇️️ ➡️
-        if (![32, 38, 39, 40].includes(event.which)) {
+        if (!['Space', 'ArrowUp', 'ArrowDown', 'ArrowRight'].includes(event.key)) {
          return;
        }

@@ -419,13 +420,13 @@ const controls = {
        const isRadioButton = matches(menuItem, '[role="menuitemradio"]');

        // Show the respective menu
-        if (!isRadioButton && [32, 39].includes(event.which)) {
+        if (!isRadioButton && ['Space', 'ArrowRight'].includes(event.key)) {
          controls.showMenuPanel.call(this, type, true);
        } else {
          let target;

-          if (event.which !== 32) {
-            if (event.which === 40 || (isRadioButton && event.which === 39)) {
+          if (event.key !== 'Space') {
+            if (event.key === 'ArrowDown' || (isRadioButton && event.key === 'ArrowRight')) {
              target = menuItem.nextElementSibling;

              if (!is.element(target)) {
@@ -448,10 +449,8 @@ const controls = {

    // Enter will fire a `click` event but we still need to manage focus
    // So we bind to keyup which fires after and set focus here
-    on.call(this, menuItem, 'keyup', event => {
-      if (event.which !== 13) {
-        return;
-      }
+    on.call(this, menuItem, 'keyup', (event) => {
+      if (event.key !== 'Return') return;

      controls.focusFirstMenuItem.call(this, null, true);
    });
@@ -483,7 +482,7 @@ const controls = {

    menuItem.appendChild(flex);

-    // Replicate radio button behaviour
+    // Replicate radio button behavior
    Object.defineProperty(menuItem, 'checked', {
      enumerable: true,
      get() {
@@ -493,8 +492,8 @@ const controls = {
        // Ensure exclusivity
        if (check) {
          Array.from(menuItem.parentNode.children)
-            .filter(node => matches(node, '[role="menuitemradio"]'))
-            .forEach(node => node.setAttribute('aria-checked', 'false'));
+            .filter((node) => matches(node, '[role="menuitemradio"]'))
+            .forEach((node) => node.setAttribute('aria-checked', 'false'));
        }

        menuItem.setAttribute('aria-checked', check ? 'true' : 'false');
@@ -504,8 +503,8 @@ const controls = {
    this.listeners.bind(
      menuItem,
      'click keyup',
-      event => {
-        if (is.keyboardEvent(event) && event.which !== 32) {
+      (event) => {
+        if (is.keyboardEvent(event) && event.key !== 'Space') {
          return;
        }

@@ -697,8 +696,9 @@ const controls = {
      return;
    }

+    const tipElement = this.elements.display.seekTooltip;
    const visible = `${this.config.classNames.tooltip}--visible`;
-    const toggle = show => toggleClass(this.elements.display.seekTooltip, visible, show);
+    const toggle = (show) => toggleClass(tipElement, visible, show);

    // Hide on touch
    if (this.touch) {
@@ -712,8 +712,8 @@ const controls = {

    if (is.event(event)) {
      percent = (100 / clientRect.width) * (event.pageX - clientRect.left);
-    } else if (hasClass(this.elements.display.seekTooltip, visible)) {
-      percent = parseFloat(this.elements.display.seekTooltip.style.left, 10);
+    } else if (hasClass(tipElement, visible)) {
+      percent = parseFloat(tipElement.style.left, 10);
    } else {
      return;
    }
@@ -725,11 +725,21 @@ const controls = {
      percent = 100;
    }

+    const time = (this.duration / 100) * percent;
+
    // Display the time a click would seek to
-    controls.updateTimeDisplay.call(this, this.elements.display.seekTooltip, (this.duration / 100) * percent);
+    tipElement.innerText = controls.formatTime(time);
+
+    // Get marker point for time
+    const point = this.config.markers?.points?.find(({ time: t }) => t === Math.round(time));
+
+    // Append the point label to the tooltip
+    if (point) {
+      tipElement.insertAdjacentHTML('afterbegin', `${point.label}<br>`);
+    }

    // Set position
-    this.elements.display.seekTooltip.style.left = `${percent}%`;
+    tipElement.style.left = `${percent}%`;

    // Show/hide the tooltip
    // If the event is a moues in/out and percentage is inside bounds
@@ -795,6 +805,10 @@ const controls = {
      controls.updateTimeDisplay.call(this, this.elements.display.duration, this.duration);
    }

+    if (this.config.markers.enabled) {
+      controls.setMarkers.call(this);
+    }
+
    // Update the tooltip (if visible)
    controls.updateSeekTooltip.call(this);
  },
@@ -894,7 +908,7 @@ const controls = {

    // Set options if passed and filter based on uniqueness and config
    if (is.array(options)) {
-      this.options.quality = dedupe(options).filter(quality => this.config.quality.options.includes(quality));
+      this.options.quality = dedupe(options).filter((quality) => this.config.quality.options.includes(quality));
    }

    // Toggle the pane and tab
@@ -913,7 +927,7 @@ const controls = {
    }

    // Get the badge HTML for HD, 4K etc
-    const getBadge = quality => {
+    const getBadge = (quality) => {
      const label = i18n.get(`qualityBadge.${quality}`, this.config);

      if (!label.length) {
@@ -929,7 +943,7 @@ const controls = {
        const sorting = this.config.quality.options;
        return sorting.indexOf(a) > sorting.indexOf(b) ? 1 : -1;
      })
-      .forEach(quality => {
+      .forEach((quality) => {
        controls.createMenuItem.call(this, {
          value: quality,
          list,
@@ -1052,7 +1066,7 @@ const controls = {
    const list = this.elements.settings.panels.speed.querySelector('[role="menu"]');

    // Filter out invalid speeds
-    this.options.speed = this.options.speed.filter(o => o >= this.minimumSpeed && o <= this.maximumSpeed);
+    this.options.speed = this.options.speed.filter((o) => o >= this.minimumSpeed && o <= this.maximumSpeed);

    // Toggle the pane and tab
    const toggle = !is.empty(this.options.speed) && this.options.speed.length > 1;
@@ -1070,7 +1084,7 @@ const controls = {
    }

    // Create items
-    this.options.speed.forEach(speed => {
+    this.options.speed.forEach((speed) => {
      controls.createMenuItem.call(this, {
        value: speed,
        list,
@@ -1085,7 +1099,7 @@ const controls = {
  // Check if we need to hide/show the settings menu
  checkMenu() {
    const { buttons } = this.elements.settings;
-    const visible = !is.empty(buttons) && Object.values(buttons).some(button => !button.hidden);
+    const visible = !is.empty(buttons) && Object.values(buttons).some((button) => !button.hidden);

    toggleHidden(this.elements.settings.menu, !visible);
  },
@@ -1099,7 +1113,7 @@ const controls = {
    let target = pane;

    if (!is.element(target)) {
-      target = Object.values(this.elements.settings.panels).find(p => !p.hidden);
+      target = Object.values(this.elements.settings.panels).find((p) => !p.hidden);
    }

    const firstItem = target.querySelector('[role^="menuitem"]');
@@ -1123,7 +1137,7 @@ const controls = {

    if (is.boolean(input)) {
      show = input;
-    } else if (is.keyboardEvent(input) && input.which === 27) {
+    } else if (is.keyboardEvent(input) && input.key === 'Escape') {
      show = false;
    } else if (is.event(input)) {
      // If Plyr is in a shadowDOM, the event target is set to the component, instead of the
@@ -1191,7 +1205,7 @@ const controls = {

    // Hide all other panels
    const container = target.parentNode;
-    const current = Array.from(container.children).find(node => !node.hidden);
+    const current = Array.from(container.children).find((node) => !node.hidden);

    // If we can do fancy animations, we'll animate the height/width
    if (support.transitions && !support.reducedMotion) {
@@ -1203,7 +1217,7 @@ const controls = {
      const size = controls.getMenuSize.call(this, target);

      // Restore auto height/width
-      const restore = event => {
+      const restore = (event) => {
        // We're only bothered about height and width on the container
        if (event.target !== container || !['width', 'height'].includes(event.propertyName)) {
          return;
@@ -1275,7 +1289,7 @@ const controls = {
    const defaultAttributes = { class: 'plyr__controls__item' };

    // Loop through controls in order
-    dedupe(is.array(this.config.controls) ? this.config.controls: []).forEach(control => {
+    dedupe(is.array(this.config.controls) ? this.config.controls : []).forEach((control) => {
      // Restart button
      if (control === 'restart') {
        container.appendChild(createButton.call(this, 'restart', defaultAttributes));
@@ -1437,7 +1451,7 @@ const controls = {
        this.elements.settings.panels.home = home;

        // Build the menu items
-        this.config.settings.forEach(type => {
+        this.config.settings.forEach((type) => {
          // TODO: bundle this with the createMenuItem helper and bindings
          const menuItem = createElement(
            'button',
@@ -1510,11 +1524,8 @@ const controls = {
            this,
            pane,
            'keydown',
-            event => {
-              // We only care about <-
-              if (event.which !== 37) {
-                return;
-              }
+            (event) => {
+              if (event.key !== 'ArrowLeft') return;

              // Prevent seek
              event.preventDefault();
@@ -1661,7 +1672,7 @@ const controls = {
    }

    // Replace props with their value
-    const replace = input => {
+    const replace = (input) => {
      let result = input;

      Object.entries(props).forEach(([key, value]) => {
@@ -1702,7 +1713,7 @@ const controls = {

    // Add pressed property to buttons
    if (!is.empty(this.elements.buttons)) {
-      const addProperty = button => {
+      const addProperty = (button) => {
        const className = this.config.classNames.controlPressed;
        Object.defineProperty(button, 'pressed', {
          enumerable: true,
@@ -1718,11 +1729,9 @@ const controls = {
      // Toggle classname when pressed property is set
      Object.values(this.elements.buttons)
        .filter(Boolean)
-        .forEach(button => {
+        .forEach((button) => {
          if (is.array(button) || is.nodeList(button)) {
-            Array.from(button)
-              .filter(Boolean)
-              .forEach(addProperty);
+            Array.from(button).filter(Boolean).forEach(addProperty);
          } else {
            addProperty(button);
          }
@@ -1740,12 +1749,100 @@ const controls = {
      const selector = `${selectors.controls.wrapper} ${selectors.labels} .${classNames.hidden}`;
      const labels = getElements.call(this, selector);

-      Array.from(labels).forEach(label => {
+      Array.from(labels).forEach((label) => {
        toggleClass(label, this.config.classNames.hidden, false);
        toggleClass(label, this.config.classNames.tooltip, true);
      });
    }
  },
+
+  // Set media metadata
+  setMediaMetadata() {
+    try {
+      if ('mediaSession' in navigator) {
+        navigator.mediaSession.metadata = new window.MediaMetadata({
+          title: this.config.mediaMetadata.title,
+          artist: this.config.mediaMetadata.artist,
+          album: this.config.mediaMetadata.album,
+          artwork: this.config.mediaMetadata.artwork,
+        });
+      }
+    } catch (_) {
+      // Do nothing
+    }
+  },
+
+  // Add markers
+  setMarkers() {
+    if (!this.duration || this.elements.markers) return;
+
+    // Get valid points
+    const points = this.config.markers?.points?.filter(({ time }) => time > 0 && time < this.duration);
+    if (!points?.length) return;
+
+    const containerFragment = document.createDocumentFragment();
+    const pointsFragment = document.createDocumentFragment();
+    let tipElement = null;
+    const tipVisible = `${this.config.classNames.tooltip}--visible`;
+    const toggleTip = (show) => toggleClass(tipElement, tipVisible, show);
+
+    // Inject markers to progress container
+    points.forEach((point) => {
+      const markerElement = createElement(
+        'span',
+        {
+          class: this.config.classNames.marker,
+        },
+        '',
+      );
+
+      const left = `${(point.time / this.duration) * 100}%`;
+
+      if (tipElement) {
+        // Show on hover
+        markerElement.addEventListener('mouseenter', () => {
+          if (point.label) return;
+          tipElement.style.left = left;
+          tipElement.innerHTML = point.label;
+          toggleTip(true);
+        });
+
+        // Hide on leave
+        markerElement.addEventListener('mouseleave', () => {
+          toggleTip(false);
+        });
+      }
+
+      markerElement.addEventListener('click', () => {
+        this.currentTime = point.time;
+      });
+
+      markerElement.style.left = left;
+      pointsFragment.appendChild(markerElement);
+    });
+
+    containerFragment.appendChild(pointsFragment);
+
+    // Inject a tooltip if needed
+    if (!this.config.tooltips.seek) {
+      tipElement = createElement(
+        'span',
+        {
+          class: this.config.classNames.tooltip,
+        },
+        '',
+      );
+
+      containerFragment.appendChild(tipElement);
+    }
+
+    this.elements.markers = {
+      points: pointsFragment,
+      tip: tipElement,
+    };
+
+    this.elements.progress.appendChild(containerFragment);
+  },
 };

 export default controls;
@@ -5,7 +5,7 @@
 // ==========================================================================

 import browser from './utils/browser';
-import { closest,getElements, hasClass, toggleClass } from './utils/elements';
+import { closest, getElements, hasClass, toggleClass } from './utils/elements';
 import { on, triggerEvent } from './utils/events';
 import is from './utils/is';
 import { silencePromise } from './utils/promise';
@@ -43,20 +43,22 @@ class Fullscreen {
    );

    // Fullscreen toggle on double click
-    on.call(this.player, this.player.elements.container, 'dblclick', event => {
+    on.call(this.player, this.player.elements.container, 'dblclick', (event) => {
      // Ignore double click in controls
      if (is.element(this.player.elements.controls) && this.player.elements.controls.contains(event.target)) {
        return;
      }

-      this.toggle();
+      this.player.listeners.proxy(event, this.toggle, 'fullscreen');
    });

    // Tap focus when in fullscreen
-    on.call(this, this.player.elements.container, 'keydown', event => this.trapFocus(event));
+    on.call(this, this.player.elements.container, 'keydown', (event) => this.trapFocus(event));

    // Update the UI
    this.update();
+
+    // this.toggle = this.toggle.bind(this);
  }

  // Determine if native supported
@@ -85,7 +87,7 @@ class Fullscreen {
    let value = '';
    const prefixes = ['webkit', 'moz', 'ms'];

-    prefixes.some(pre => {
+    prefixes.some((pre) => {
      if (is.function(document[`${pre}ExitFullscreen`]) || is.function(document[`${pre}CancelFullScreen`])) {
        value = pre;
        return true;
@@ -122,7 +124,9 @@ class Fullscreen {
      return hasClass(this.target, this.player.config.classNames.fullscreen.fallback);
    }

-    const element = !this.prefix ? document.fullscreenElement : document[`${this.prefix}${this.property}Element`];
+    const element = !this.prefix
+      ? this.target.getRootNode().fullscreenElement
+      : this.target.getRootNode()[`${this.prefix}${this.property}Element`];

    return element && element.shadowRoot ? element === this.target.getRootNode().host : element === this.target;
  }
@@ -134,7 +138,7 @@ class Fullscreen {
      : this.player.elements.fullscreen || this.player.elements.container;
  }

-  onChange() {
+  onChange = () => {
    if (!this.enabled) {
      return;
    }
@@ -145,11 +149,13 @@ class Fullscreen {
      button.pressed = this.active;
    }

+    // Always trigger events on the plyr / media element (not a fullscreen container) and let them bubble up
+    const target = this.target === this.player.media ? this.target : this.player.elements.container;
    // Trigger an event
-    triggerEvent.call(this.player, this.target, this.active ? 'enterfullscreen' : 'exitfullscreen', true);
-  }
+    triggerEvent.call(this.player, target, this.active ? 'enterfullscreen' : 'exitfullscreen', true);
+  };

-  toggleFallback(toggle = false) {
+  toggleFallback = (toggle = false) => {
    // Store or restore scroll position
    if (toggle) {
      this.scrollPosition = {
@@ -189,19 +195,19 @@ class Fullscreen {
      } else if (this.cleanupViewport) {
        viewport.content = viewport.content
          .split(',')
-          .filter(part => part.trim() !== property)
+          .filter((part) => part.trim() !== property)
          .join(',');
      }
    }

    // Toggle button and fire events
    this.onChange();
-  }
+  };

  // Trap focus inside container
-  trapFocus(event) {
+  trapFocus = (event) => {
    // Bail if iOS, not active, not the tab key
-    if (browser.isIos || !this.active || event.key !== 'Tab' || event.keyCode !== 9) {
+    if (browser.isIos || !this.active || event.key !== 'Tab') {
      return;
    }

@@ -220,10 +226,10 @@ class Fullscreen {
      last.focus();
      event.preventDefault();
    }
-  }
+  };

  // Update UI
-  update() {
+  update = () => {
    if (this.enabled) {
      let mode;

@@ -242,17 +248,21 @@ class Fullscreen {

    // Add styling hook to show button
    toggleClass(this.player.elements.container, this.player.config.classNames.fullscreen.enabled, this.enabled);
-  }
+  };

  // Make an element fullscreen
-  enter() {
+  enter = () => {
    if (!this.enabled) {
      return;
    }

    // iOS native fullscreen doesn't need the request step
    if (browser.isIos && this.player.config.fullscreen.iosNative) {
-      this.target.webkitEnterFullscreen();
+      if (this.player.isVimeo) {
+        this.player.embed.requestFullscreen();
+      } else {
+        this.target.webkitEnterFullscreen();
+      }
    } else if (!Fullscreen.native || this.forceFallback) {
      this.toggleFallback(true);
    } else if (!this.prefix) {
@@ -260,10 +270,10 @@ class Fullscreen {
    } else if (!is.empty(this.prefix)) {
      this.target[`${this.prefix}Request${this.property}`]();
    }
-  }
+  };

  // Bail from fullscreen
-  exit() {
+  exit = () => {
    if (!this.enabled) {
      return;
    }
@@ -280,16 +290,16 @@ class Fullscreen {
      const action = this.prefix === 'moz' ? 'Cancel' : 'Exit';
      document[`${this.prefix}${action}${this.property}`]();
    }
-  }
+  };

  // Toggle state
-  toggle() {
+  toggle = () => {
    if (!this.active) {
      this.enter();
    } else {
      this.exit();
    }
-  }
+  };
 }

 export default Fullscreen;
@@ -18,7 +18,7 @@ const html5 = {
    const sources = Array.from(this.media.querySelectorAll('source'));

    // Filter out unsupported sources (if type is specified)
-    return sources.filter(source => {
+    return sources.filter((source) => {
      const type = source.getAttribute('type');

      if (is.empty(type)) {
@@ -39,7 +39,7 @@ const html5 = {
    // Get sizes from <source> elements
    return html5.getSources
      .call(this)
-      .map(source => Number(source.getAttribute('size')))
+      .map((source) => Number(source.getAttribute('size')))
      .filter(Boolean);
  },

@@ -63,7 +63,7 @@ const html5 = {
      get() {
        // Get sources
        const sources = html5.getSources.call(player);
-        const source = sources.find(s => s.getAttribute('src') === player.source);
+        const source = sources.find((s) => s.getAttribute('src') === player.source);

        // Return size, if match is found
        return source && Number(source.getAttribute('size'));
@@ -73,14 +73,14 @@ const html5 = {
          return;
        }

-        // If we're using an an external handler...
+        // If we're using an external handler...
        if (player.config.quality.forced && is.function(player.config.quality.onChange)) {
          player.config.quality.onChange(input);
        } else {
          // Get sources
          const sources = html5.getSources.call(player);
          // Get first match for requested size
-          const source = sources.find(s => Number(s.getAttribute('size')) === input);
+          const source = sources.find((s) => Number(s.getAttribute('size')) === input);

          // No matching source found
          if (!source) {
@@ -10,7 +10,7 @@ import { getElement, getElements, matches, toggleClass } from './utils/elements'
 import { off, on, once, toggleListener, triggerEvent } from './utils/events';
 import is from './utils/is';
 import { silencePromise } from './utils/promise';
-import { getAspectRatio, setAspectRatio } from './utils/style';
+import { getAspectRatio, getViewportSize, supportsCSS } from './utils/style';

 class Listeners {
  constructor(player) {
@@ -29,25 +29,25 @@ class Listeners {
  handleKey(event) {
    const { player } = this;
    const { elements } = player;
-    const code = event.keyCode ? event.keyCode : event.which;
-    const pressed = event.type === 'keydown';
-    const repeat = pressed && code === this.lastKey;
+    const { key, type, altKey, ctrlKey, metaKey, shiftKey } = event;
+    const pressed = type === 'keydown';
+    const repeat = pressed && key === this.lastKey;

    // Bail if a modifier key is set
-    if (event.altKey || event.ctrlKey || event.metaKey || event.shiftKey) {
+    if (altKey || ctrlKey || metaKey || shiftKey) {
      return;
    }

    // If the event is bubbled from the media element
-    // Firefox doesn't get the keycode for whatever reason
-    if (!is.number(code)) {
+    // Firefox doesn't get the key for whatever reason
+    if (!key) {
      return;
    }

-    // Seek by the number keys
-    const seekByKey = () => {
+    // Seek by increment
+    const seekByIncrement = (increment) => {
      // Divide the max duration into 10th's and times by the number value
-      player.currentTime = (player.duration / 10) * (code - 48);
+      player.currentTime = (player.duration / 10) * increment;
    };

    // Handle the key on keydown
@@ -65,113 +65,114 @@ class Listeners {
          return;
        }

-        if (event.which === 32 && matches(focused, 'button, [role^="menuitem"]')) {
+        if (event.key === 'Space' && matches(focused, 'button, [role^="menuitem"]')) {
          return;
        }
      }

-      // Which keycodes should we prevent default
-      const preventDefault = [32, 37, 38, 39, 40, 48, 49, 50, 51, 52, 53, 54, 56, 57, 67, 70, 73, 75, 76, 77, 79];
+      // Which keys should we prevent default
+      const preventDefault = [
+        'Space',
+        'ArrowLeft',
+        'ArrowUp',
+        'ArrowRight',
+        'ArrowDown',

-      // If the code is found prevent default (e.g. prevent scrolling for arrows)
-      if (preventDefault.includes(code)) {
+        '0',
+        '1',
+        '2',
+        '3',
+        '4',
+        '5',
+        '6',
+        '7',
+        '8',
+        '9',
+
+        'c',
+        'f',
+        'k',
+        'l',
+        'm',
+      ];
+
+      // If the key is found prevent default (e.g. prevent scrolling for arrows)
+      if (preventDefault.includes(key)) {
        event.preventDefault();
        event.stopPropagation();
      }

-      switch (code) {
-        case 48:
-        case 49:
-        case 50:
-        case 51:
-        case 52:
-        case 53:
-        case 54:
-        case 55:
-        case 56:
-        case 57:
-          // 0-9
+      switch (key) {
+        case '0':
+        case '1':
+        case '2':
+        case '3':
+        case '4':
+        case '5':
+        case '6':
+        case '7':
+        case '8':
+        case '9':
          if (!repeat) {
-            seekByKey();
+            seekByIncrement(parseInt(key, 10));
          }
          break;

-        case 32:
-        case 75:
-          // Space and K key
+        case 'Space':
+        case 'k':
          if (!repeat) {
            silencePromise(player.togglePlay());
          }
          break;

-        case 38:
-          // Arrow up
+        case 'ArrowUp':
          player.increaseVolume(0.1);
          break;

-        case 40:
-          // Arrow down
+        case 'ArrowDown':
          player.decreaseVolume(0.1);
          break;

-        case 77:
-          // M key
+        case 'm':
          if (!repeat) {
            player.muted = !player.muted;
          }
          break;

-        case 39:
-          // Arrow forward
+        case 'ArrowRight':
          player.forward();
          break;

-        case 37:
-          // Arrow back
+        case 'ArrowLeft':
          player.rewind();
          break;

-        case 70:
-          // F key
+        case 'f':
          player.fullscreen.toggle();
          break;

-        case 67:
-          // C key
+        case 'c':
          if (!repeat) {
            player.toggleCaptions();
          }
          break;

-        case 76:
-          // L key
+        case 'l':
          player.loop = !player.loop;
          break;

-        /* case 73:
-                    this.setLoop('start');
-                    break;
-
-                case 76:
-                    this.setLoop();
-                    break;
-
-                case 79:
-                    this.setLoop('end');
-                    break; */
-
        default:
          break;
      }

      // Escape is handle natively when in full screen
      // So we only need to worry about non native
-      if (code === 27 && !player.fullscreen.usingNative && player.fullscreen.active) {
+      if (key === 'Escape' && !player.fullscreen.usingNative && player.fullscreen.active) {
        player.fullscreen.toggle();
      }

-      // Store last code for next cycle
-      this.lastKey = code;
+      // Store last key for next cycle
+      this.lastKey = key;
    } else {
      this.lastKey = null;
    }
@@ -183,7 +184,7 @@ class Listeners {
  }

  // Device is touch enabled
-  firstTouch() {
+  firstTouch = () => {
    const { player } = this;
    const { elements } = player;

@@ -191,22 +192,23 @@ class Listeners {

    // Add touch class
    toggleClass(elements.container, player.config.classNames.isTouch, true);
-  }
+  };

-  setTabFocus(event) {
+  setTabFocus = (event) => {
    const { player } = this;
    const { elements } = player;
+    const { key, type, timeStamp } = event;

    clearTimeout(this.focusTimer);

    // Ignore any key other than tab
-    if (event.type === 'keydown' && event.which !== 9) {
+    if (type === 'keydown' && key !== 'Tab') {
      return;
    }

    // Store reference to event timeStamp
-    if (event.type === 'keydown') {
-      this.lastKeyDown = event.timeStamp;
+    if (type === 'keydown') {
+      this.lastKeyDown = timeStamp;
    }

    // Remove current classes
@@ -217,10 +219,10 @@ class Listeners {
    };

    // Determine if a key was pressed to trigger this event
-    const wasKeyDown = event.timeStamp - this.lastKeyDown <= 20;
+    const wasKeyDown = timeStamp - this.lastKeyDown <= 20;

    // Ignore focus events if a key was pressed prior
-    if (event.type === 'focus' && !wasKeyDown) {
+    if (type === 'focus' && !wasKeyDown) {
      return;
    }

@@ -229,7 +231,7 @@ class Listeners {

    // Delay the adding of classname until the focus has changed
    // This event fires before the focusin event
-    if (event.type !== 'focusout') {
+    if (type !== 'focusout') {
      this.focusTimer = setTimeout(() => {
        const focused = document.activeElement;

@@ -241,10 +243,10 @@ class Listeners {
        toggleClass(document.activeElement, player.config.classNames.tabFocus, true);
      }, 10);
    }
-  }
+  };

  // Global window & document listeners
-  global(toggle = true) {
+  global = (toggle = true) => {
    const { player } = this;

    // Keyboard shortcuts
@@ -260,10 +262,10 @@ class Listeners {

    // Tab focus detection
    toggleListener.call(player, document.body, 'keydown focus blur focusout', this.setTabFocus, toggle, false, true);
-  }
+  };

  // Container listeners
-  container() {
+  container = () => {
    const { player } = this;
    const { config, elements, timers } = player;

@@ -277,7 +279,7 @@ class Listeners {
      player,
      elements.container,
      'mousemove mouseleave touchstart touchmove enterfullscreen exitfullscreen',
-      event => {
+      (event) => {
        const { controls: controlsElement } = elements;

        // Remove button states for fullscreen
@@ -305,39 +307,49 @@ class Listeners {
    );

    // Set a gutter for Vimeo
-    const setGutter = (ratio, padding, toggle) => {
+    const setGutter = () => {
      if (!player.isVimeo || player.config.vimeo.premium) {
        return;
      }

-      const target = player.elements.wrapper.firstChild;
-      const [, y] = ratio;
-      const [videoX, videoY] = getAspectRatio.call(player);
+      const target = elements.wrapper;
+      const { active } = player.fullscreen;
+      const [videoWidth, videoHeight] = getAspectRatio.call(player);
+      const useNativeAspectRatio = supportsCSS(`aspect-ratio: ${videoWidth} / ${videoHeight}`);

-      target.style.maxWidth = toggle ? `${(y / videoY) * videoX}px` : null;
-      target.style.margin = toggle ? '0 auto' : null;
-    };
-
-    // Resize on fullscreen change
-    const setPlayerSize = measure => {
-      // If we don't need to measure the viewport
-      if (!measure) {
-        return setAspectRatio.call(player);
+      // If not active, remove styles
+      if (!active) {
+        if (useNativeAspectRatio) {
+          target.style.width = null;
+          target.style.height = null;
+        } else {
+          target.style.maxWidth = null;
+          target.style.margin = null;
+        }
+        return;
      }

-      const rect = elements.container.getBoundingClientRect();
-      const { width, height } = rect;
+      // Determine which dimension will overflow and constrain view
+      const [viewportWidth, viewportHeight] = getViewportSize();
+      const overflow = viewportWidth / viewportHeight > videoWidth / videoHeight;

-      return setAspectRatio.call(player, `${width}:${height}`);
+      if (useNativeAspectRatio) {
+        target.style.width = overflow ? 'auto' : '100%';
+        target.style.height = overflow ? '100%' : 'auto';
+      } else {
+        target.style.maxWidth = overflow ? `${(viewportHeight / videoHeight) * videoWidth}px` : null;
+        target.style.margin = overflow ? '0 auto' : null;
+      }
    };

+    // Handle resizing
    const resized = () => {
      clearTimeout(timers.resized);
-      timers.resized = setTimeout(setPlayerSize, 50);
+      timers.resized = setTimeout(setGutter, 50);
    };

-    on.call(player, elements.container, 'enterfullscreen exitfullscreen', event => {
-      const { target, usingNative } = player.fullscreen;
+    on.call(player, elements.container, 'enterfullscreen exitfullscreen', (event) => {
+      const { target } = player.fullscreen;

      // Ignore events not from target
      if (target !== elements.container) {
@@ -349,34 +361,25 @@ class Listeners {
        return;
      }

-      const isEnter = event.type === 'enterfullscreen';
-      // Set the player size when entering fullscreen to viewport size
-      const { padding, ratio } = setPlayerSize(isEnter);
-
      // Set Vimeo gutter
-      setGutter(ratio, padding, isEnter);
+      setGutter();

-      // If not using native browser fullscreen API, we need to check for resizes of viewport
-      if (!usingNative) {
-        if (isEnter) {
-          on.call(player, window, 'resize', resized);
-        } else {
-          off.call(player, window, 'resize', resized);
-        }
-      }
+      // Watch for resizes
+      const method = event.type === 'enterfullscreen' ? on : off;
+      method.call(player, window, 'resize', resized);
    });
-  }
+  };

  // Listen for media events
-  media() {
+  media = () => {
    const { player } = this;
    const { elements } = player;

    // Time change on media
-    on.call(player, player.media, 'timeupdate seeking seeked', event => controls.timeUpdate.call(player, event));
+    on.call(player, player.media, 'timeupdate seeking seeked', (event) => controls.timeUpdate.call(player, event));

    // Display duration
-    on.call(player, player.media, 'durationchange loadeddata loadedmetadata', event =>
+    on.call(player, player.media, 'durationchange loadeddata loadedmetadata', (event) =>
      controls.durationUpdate.call(player, event),
    );

@@ -393,20 +396,20 @@ class Listeners {
    });

    // Check for buffer progress
-    on.call(player, player.media, 'progress playing seeking seeked', event =>
+    on.call(player, player.media, 'progress playing seeking seeked', (event) =>
      controls.updateProgress.call(player, event),
    );

    // Handle volume changes
-    on.call(player, player.media, 'volumechange', event => controls.updateVolume.call(player, event));
+    on.call(player, player.media, 'volumechange', (event) => controls.updateVolume.call(player, event));

    // Handle play/pause
-    on.call(player, player.media, 'playing play pause ended emptied timeupdate', event =>
+    on.call(player, player.media, 'playing play pause ended emptied timeupdate', (event) =>
      ui.checkPlaying.call(player, event),
    );

    // Loading state
-    on.call(player, player.media, 'waiting canplay seeked playing', event => ui.checkLoading.call(player, event));
+    on.call(player, player.media, 'waiting canplay seeked playing', (event) => ui.checkLoading.call(player, event));

    // Click video
    if (player.supported.ui && player.config.clickToPlay && !player.isAudio) {
@@ -419,7 +422,7 @@ class Listeners {
      }

      // On click play, pause or restart
-      on.call(player, elements.container, 'click', event => {
+      on.call(player, elements.container, 'click', (event) => {
        const targets = [elements.container, wrapper];

        // Ignore if click if not container or in video wrapper
@@ -459,7 +462,7 @@ class Listeners {
        player,
        elements.wrapper,
        'contextmenu',
-        event => {
+        (event) => {
          event.preventDefault();
        },
        false,
@@ -485,7 +488,7 @@ class Listeners {
    });

    // Quality change
-    on.call(player, player.media, 'qualitychange', event => {
+    on.call(player, player.media, 'qualitychange', (event) => {
      // Update UI
      controls.updateSetting.call(player, 'quality', null, event.detail.quality);
    });
@@ -499,7 +502,7 @@ class Listeners {
    // Bubble up key events for Edge
    const proxyEvents = player.config.events.concat(['keyup', 'keydown']).join(' ');

-    on.call(player, player.media, proxyEvents, event => {
+    on.call(player, player.media, proxyEvents, (event) => {
      let { detail = {} } = event;

      // Get error details from media
@@ -509,10 +512,10 @@ class Listeners {

      triggerEvent.call(player, elements.container, event.type, true, detail);
    });
-  }
+  };

  // Run default and custom handlers
-  proxy(event, defaultHandler, customHandlerKey) {
+  proxy = (event, defaultHandler, customHandlerKey) => {
    const { player } = this;
    const customHandler = player.config.listeners[customHandlerKey];
    const hasCustomHandler = is.function(customHandler);
@@ -527,10 +530,10 @@ class Listeners {
    if (returned !== false && is.function(defaultHandler)) {
      defaultHandler.call(player, event);
    }
-  }
+  };

  // Trigger custom and default handlers
-  bind(element, type, defaultHandler, customHandlerKey, passive = true) {
+  bind = (element, type, defaultHandler, customHandlerKey, passive = true) => {
    const { player } = this;
    const customHandler = player.config.listeners[customHandlerKey];
    const hasCustomHandler = is.function(customHandler);
@@ -539,13 +542,13 @@ class Listeners {
      player,
      element,
      type,
-      event => this.proxy(event, defaultHandler, customHandlerKey),
+      (event) => this.proxy(event, defaultHandler, customHandlerKey),
      passive && !hasCustomHandler,
    );
-  }
+  };

  // Listen for control events
-  controls() {
+  controls = () => {
    const { player } = this;
    const { elements } = player;
    // IE doesn't support input event, so we fallback to change
@@ -553,7 +556,7 @@ class Listeners {

    // Play/pause toggle
    if (elements.buttons.play) {
-      Array.from(elements.buttons.play).forEach(button => {
+      Array.from(elements.buttons.play).forEach((button) => {
        this.bind(
          button,
          'click',
@@ -569,10 +572,28 @@ class Listeners {
    this.bind(elements.buttons.restart, 'click', player.restart, 'restart');

    // Rewind
-    this.bind(elements.buttons.rewind, 'click', player.rewind, 'rewind');
+    this.bind(
+      elements.buttons.rewind,
+      'click',
+      () => {
+        // Record seek time so we can prevent hiding controls for a few seconds after rewind
+        player.lastSeekTime = Date.now();
+        player.rewind();
+      },
+      'rewind',
+    );

    // Rewind
-    this.bind(elements.buttons.fastForward, 'click', player.forward, 'fastForward');
+    this.bind(
+      elements.buttons.fastForward,
+      'click',
+      () => {
+        // Record seek time so we can prevent hiding controls for a few seconds after fast forward
+        player.lastSeekTime = Date.now();
+        player.forward();
+      },
+      'fastForward',
+    );

    // Mute toggle
    this.bind(
@@ -624,7 +645,7 @@ class Listeners {
    this.bind(
      elements.buttons.settings,
      'click',
-      event => {
+      (event) => {
        // Prevent the document click listener closing the menu
        event.stopPropagation();
        event.preventDefault();
@@ -641,16 +662,13 @@ class Listeners {
    this.bind(
      elements.buttons.settings,
      'keyup',
-      event => {
-        const code = event.which;
-
-        // We only care about space and return
-        if (![13, 32].includes(code)) {
+      (event) => {
+        if (!['Space', 'Enter'].includes(event.key)) {
          return;
        }

        // Because return triggers a click anyway, all we need to do is set focus
-        if (code === 13) {
+        if (event.key === 'Enter') {
          controls.focusFirstMenuItem.call(player, null, true);
          return;
        }
@@ -669,26 +687,25 @@ class Listeners {
    );

    // Escape closes menu
-    this.bind(elements.settings.menu, 'keydown', event => {
-      if (event.which === 27) {
+    this.bind(elements.settings.menu, 'keydown', (event) => {
+      if (event.key === 'Escape') {
        controls.toggleMenu.call(player, event);
      }
    });

    // Set range input alternative "value", which matches the tooltip time (#954)
-    this.bind(elements.inputs.seek, 'mousedown mousemove', event => {
+    this.bind(elements.inputs.seek, 'mousedown mousemove', (event) => {
      const rect = elements.progress.getBoundingClientRect();
      const percent = (100 / rect.width) * (event.pageX - rect.left);
      event.currentTarget.setAttribute('seek-value', percent);
    });

    // Pause while seeking
-    this.bind(elements.inputs.seek, 'mousedown mouseup keydown keyup touchstart touchend', event => {
+    this.bind(elements.inputs.seek, 'mousedown mouseup keydown keyup touchstart touchend', (event) => {
      const seek = event.currentTarget;
-      const code = event.keyCode ? event.keyCode : event.which;
      const attribute = 'play-on-seeked';

-      if (is.keyboardEvent(event) && code !== 39 && code !== 37) {
+      if (is.keyboardEvent(event) && !['ArrowLeft', 'ArrowRight'].includes(event.key)) {
        return;
      }

@@ -715,14 +732,14 @@ class Listeners {
    // it takes over further interactions on the page. This is a hack
    if (browser.isIos) {
      const inputs = getElements.call(player, 'input[type="range"]');
-      Array.from(inputs).forEach(input => this.bind(input, inputEvent, event => repaint(event.target)));
+      Array.from(inputs).forEach((input) => this.bind(input, inputEvent, (event) => repaint(event.target)));
    }

    // Seek
    this.bind(
      elements.inputs.seek,
      inputEvent,
-      event => {
+      (event) => {
        const seek = event.currentTarget;
        // If it exists, use seek-value instead of "value" for consistency with tooltip time (#954)
        let seekTo = seek.getAttribute('seek-value');
@@ -739,13 +756,13 @@ class Listeners {
    );

    // Seek tooltip
-    this.bind(elements.progress, 'mouseenter mouseleave mousemove', event =>
+    this.bind(elements.progress, 'mouseenter mouseleave mousemove', (event) =>
      controls.updateSeekTooltip.call(player, event),
    );

    // Preview thumbnails plugin
    // TODO: Really need to work on some sort of plug-in wide event bus or pub-sub for this
-    this.bind(elements.progress, 'mousemove touchmove', event => {
+    this.bind(elements.progress, 'mousemove touchmove', (event) => {
      const { previewThumbnails } = player;

      if (previewThumbnails && previewThumbnails.loaded) {
@@ -763,7 +780,7 @@ class Listeners {
    });

    // Show scrubbing preview
-    this.bind(elements.progress, 'mousedown touchstart', event => {
+    this.bind(elements.progress, 'mousedown touchstart', (event) => {
      const { previewThumbnails } = player;

      if (previewThumbnails && previewThumbnails.loaded) {
@@ -771,7 +788,7 @@ class Listeners {
      }
    });

-    this.bind(elements.progress, 'mouseup touchend', event => {
+    this.bind(elements.progress, 'mouseup touchend', (event) => {
      const { previewThumbnails } = player;

      if (previewThumbnails && previewThumbnails.loaded) {
@@ -781,8 +798,8 @@ class Listeners {

    // Polyfill for lower fill in <input type="range"> for webkit
    if (browser.isWebkit) {
-      Array.from(getElements.call(player, 'input[type="range"]')).forEach(element => {
-        this.bind(element, 'input', event => controls.updateRangeFill.call(player, event.target));
+      Array.from(getElements.call(player, 'input[type="range"]')).forEach((element) => {
+        this.bind(element, 'input', (event) => controls.updateRangeFill.call(player, event.target));
      });
    }

@@ -805,30 +822,32 @@ class Listeners {
    this.bind(
      elements.inputs.volume,
      inputEvent,
-      event => {
+      (event) => {
        player.volume = event.target.value;
      },
      'volume',
    );

    // Update controls.hover state (used for ui.toggleControls to avoid hiding when interacting)
-    this.bind(elements.controls, 'mouseenter mouseleave', event => {
+    this.bind(elements.controls, 'mouseenter mouseleave', (event) => {
      elements.controls.hover = !player.touch && event.type === 'mouseenter';
    });

    // Also update controls.hover state for any non-player children of fullscreen element (as above)
    if (elements.fullscreen) {
      Array.from(elements.fullscreen.children)
-        .filter(c => !c.contains(elements.container))
-        .forEach(child => {
-          this.bind(child, 'mouseenter mouseleave', event => {
-            elements.controls.hover = !player.touch && event.type === 'mouseenter';
+        .filter((c) => !c.contains(elements.container))
+        .forEach((child) => {
+          this.bind(child, 'mouseenter mouseleave', (event) => {
+            if (elements.controls) {
+              elements.controls.hover = !player.touch && event.type === 'mouseenter';
+            }
          });
        });
    }

    // Update controls.pressed state (used for ui.toggleControls to avoid hiding when interacting)
-    this.bind(elements.controls, 'mousedown mouseup touchstart touchend touchcancel', event => {
+    this.bind(elements.controls, 'mousedown mouseup touchstart touchend touchcancel', (event) => {
      elements.controls.pressed = ['mousedown', 'touchstart'].includes(event.type);
    });

@@ -861,12 +880,12 @@ class Listeners {
    this.bind(
      elements.inputs.volume,
      'wheel',
-      event => {
-        // Detect "natural" scroll - suppored on OS X Safari only
+      (event) => {
+        // Detect "natural" scroll - supported on OS X Safari only
        // Other browsers on OS X will be inverted until support improves
        const inverted = event.webkitDirectionInvertedFromDevice;
        // Get delta from event. Invert if `inverted` is true
-        const [x, y] = [event.deltaX, -event.deltaY].map(value => (inverted ? -value : value));
+        const [x, y] = [event.deltaX, -event.deltaY].map((value) => (inverted ? -value : value));
        // Using the biggest delta, normalize to 1 or -1 (or 0 if no delta)
        const direction = Math.sign(Math.abs(x) > Math.abs(y) ? x : y);

@@ -882,7 +901,7 @@ class Listeners {
      'volume',
      false,
    );
-  }
+  };
 }

 export default Listeners;
@@ -15,7 +15,7 @@ import { silencePromise } from '../utils/promise';
 import { formatTime } from '../utils/time';
 import { buildUrlParams } from '../utils/urls';

-const destroy = instance => {
+const destroy = (instance) => {
  // Destroy our adsManager
  if (instance.manager) {
    instance.manager.destroy();
@@ -77,7 +77,7 @@ class Ads {
  /**
   * Load the IMA SDK
   */
-  load() {
+  load = () => {
    if (!this.enabled) {
      return;
    }
@@ -95,12 +95,12 @@ class Ads {
    } else {
      this.ready();
    }
-  }
+  };

  /**
   * Get the ads instance ready
   */
-  ready() {
+  ready = () => {
    // Double check we're enabled
    if (!this.enabled) {
      destroy(this);
@@ -120,7 +120,7 @@ class Ads {

    // Setup the IMA SDK
    this.setupIMA();
-  }
+  };

  // Build the tag URL
  get tagUrl() {
@@ -153,7 +153,7 @@ class Ads {
   * properly place mid-rolls. After we create the ad display container, we initialize it. On
   * mobile devices, this initialization is done as the result of a user action.
   */
-  setupIMA() {
+  setupIMA = () => {
    // Create the container for our advertisements
    this.elements.container = createElement('div', {
      class: this.player.config.classNames.ads,
@@ -179,19 +179,19 @@ class Ads {
    // Listen and respond to ads loaded and error events
    this.loader.addEventListener(
      google.ima.AdsManagerLoadedEvent.Type.ADS_MANAGER_LOADED,
-      event => this.onAdsManagerLoaded(event),
+      (event) => this.onAdsManagerLoaded(event),
      false,
    );
-    this.loader.addEventListener(google.ima.AdErrorEvent.Type.AD_ERROR, error => this.onAdError(error), false);
+    this.loader.addEventListener(google.ima.AdErrorEvent.Type.AD_ERROR, (error) => this.onAdError(error), false);

    // Request video ads to be pre-loaded
    this.requestAds();
-  }
+  };

  /**
   * Request advertisements
   */
-  requestAds() {
+  requestAds = () => {
    const { container } = this.player.elements;

    try {
@@ -213,16 +213,16 @@ class Ads {
      request.setAdWillPlayMuted(!this.player.muted);

      this.loader.requestAds(request);
-    } catch (e) {
-      this.onAdError(e);
+    } catch (error) {
+      this.onAdError(error);
    }
-  }
+  };

  /**
   * Update the ad countdown
   * @param {Boolean} start
   */
-  pollCountdown(start = false) {
+  pollCountdown = (start = false) => {
    if (!start) {
      clearInterval(this.countdownTimer);
      this.elements.container.removeAttribute('data-badge-text');
@@ -236,13 +236,13 @@ class Ads {
    };

    this.countdownTimer = setInterval(update, 100);
-  }
+  };

  /**
   * This method is called whenever the ads are ready inside the AdDisplayContainer
-   * @param {Event} adsManagerLoadedEvent
+   * @param {Event} event - adsManagerLoadedEvent
   */
-  onAdsManagerLoaded(event) {
+  onAdsManagerLoaded = (event) => {
    // Load could occur after a source change (race condition)
    if (!this.enabled) {
      return;
@@ -264,21 +264,21 @@ class Ads {

    // Add listeners to the required events
    // Advertisement error events
-    this.manager.addEventListener(google.ima.AdErrorEvent.Type.AD_ERROR, error => this.onAdError(error));
+    this.manager.addEventListener(google.ima.AdErrorEvent.Type.AD_ERROR, (error) => this.onAdError(error));

    // Advertisement regular events
-    Object.keys(google.ima.AdEvent.Type).forEach(type => {
-      this.manager.addEventListener(google.ima.AdEvent.Type[type], e => this.onAdEvent(e));
+    Object.keys(google.ima.AdEvent.Type).forEach((type) => {
+      this.manager.addEventListener(google.ima.AdEvent.Type[type], (e) => this.onAdEvent(e));
    });

    // Resolve our adsManager
    this.trigger('loaded');
-  }
+  };

-  addCuePoints() {
+  addCuePoints = () => {
    // Add advertisement cue's within the time line if available
    if (!is.empty(this.cuePoints)) {
-      this.cuePoints.forEach(cuePoint => {
+      this.cuePoints.forEach((cuePoint) => {
        if (cuePoint !== 0 && cuePoint !== -1 && cuePoint < this.player.duration) {
          const seekElement = this.player.elements.progress;

@@ -294,7 +294,7 @@ class Ads {
        }
      });
    }
-  }
+  };

  /**
   * This is where all the event handling takes place. Retrieve the ad from the event. Some
@@ -302,7 +302,7 @@ class Ads {
   * https://developers.google.com/interactive-media-ads/docs/sdks/html5/v3/apis#ima.AdEvent.Type
   * @param {Event} event
   */
-  onAdEvent(event) {
+  onAdEvent = (event) => {
    const { container } = this.player.elements;
    // Retrieve the ad from the event. Some events (e.g. ALL_ADS_COMPLETED)
    // don't have ad object associated
@@ -310,7 +310,7 @@ class Ads {
    const adData = event.getAdData();

    // Proxy event
-    const dispatchEvent = type => {
+    const dispatchEvent = (type) => {
      triggerEvent.call(this.player, this.player.media, `ads${type.replace(/_/g, '').toLowerCase()}`);
    };

@@ -410,23 +410,23 @@ class Ads {
      default:
        break;
    }
-  }
+  };

  /**
   * Any ad error handling comes through here
   * @param {Event} event
   */
-  onAdError(event) {
+  onAdError = (event) => {
    this.cancel();
    this.player.debug.warn('Ads error', event);
-  }
+  };

  /**
   * Setup hooks for Plyr and window events. This ensures
   * the mid- and post-roll launch at the correct time. And
   * resize the advertisement when the player resizes
   */
-  listeners() {
+  listeners = () => {
    const { container } = this.player.elements;
    let time;

@@ -464,12 +464,12 @@ class Ads {
        this.manager.resize(container.offsetWidth, container.offsetHeight, google.ima.ViewMode.NORMAL);
      }
    });
-  }
+  };

  /**
   * Initialize the adsManager and start playing advertisements
   */
-  play() {
+  play = () => {
    const { container } = this.player.elements;

    if (!this.managerPromise) {
@@ -503,12 +503,12 @@ class Ads {
        }
      })
      .catch(() => {});
-  }
+  };

  /**
   * Resume our video
   */
-  resumeContent() {
+  resumeContent = () => {
    // Hide the advertisement container
    this.elements.container.style.zIndex = '';

@@ -517,12 +517,12 @@ class Ads {

    // Play video
    silencePromise(this.player.media.play());
-  }
+  };

  /**
   * Pause our video
   */
-  pauseContent() {
+  pauseContent = () => {
    // Show the advertisement container
    this.elements.container.style.zIndex = 3;

@@ -531,7 +531,7 @@ class Ads {

    // Pause our video.
    this.player.media.pause();
-  }
+  };

  /**
   * Destroy the adsManager so we can grab new ads after this. If we don't then we're not
@@ -539,7 +539,7 @@ class Ads {
   * video requests. https://developers.google.com/interactive-
   * media-ads/docs/sdks/android/faq#8
   */
-  cancel() {
+  cancel = () => {
    // Pause our video
    if (this.initialized) {
      this.resumeContent();
@@ -550,12 +550,12 @@ class Ads {

    // Re-create our adsManager
    this.loadAds();
-  }
+  };

  /**
   * Re-create our adsManager
   */
-  loadAds() {
+  loadAds = () => {
    // Tell our adsManager to go bye bye
    this.managerPromise
      .then(() => {
@@ -565,7 +565,7 @@ class Ads {
        }

        // Re-set our adsManager promises
-        this.managerPromise = new Promise(resolve => {
+        this.managerPromise = new Promise((resolve) => {
          this.on('loaded', resolve);
          this.player.debug.log(this.manager);
        });
@@ -576,23 +576,24 @@ class Ads {
        this.requestAds();
      })
      .catch(() => {});
-  }
+  };

  /**
   * Handles callbacks after an ad event was invoked
   * @param {String} event - Event type
+   * @param args
   */
-  trigger(event, ...args) {
+  trigger = (event, ...args) => {
    const handlers = this.events[event];

    if (is.array(handlers)) {
-      handlers.forEach(handler => {
+      handlers.forEach((handler) => {
        if (is.function(handler)) {
          handler.apply(this, args);
        }
      });
    }
-  }
+  };

  /**
   * Add event listeners
@@ -600,7 +601,7 @@ class Ads {
   * @param {Function} callback - Callback for when event occurs
   * @return {Ads}
   */
-  on(event, callback) {
+  on = (event, callback) => {
    if (!is.array(this.events[event])) {
      this.events[event] = [];
    }
@@ -608,7 +609,7 @@ class Ads {
    this.events[event].push(callback);

    return this;
-  }
+  };

  /**
   * Setup a safety timer for when the ad network doesn't respond for whatever reason.
@@ -618,27 +619,27 @@ class Ads {
   * @param {Number} time
   * @param {String} from
   */
-  startSafetyTimer(time, from) {
+  startSafetyTimer = (time, from) => {
    this.player.debug.log(`Safety timer invoked from: ${from}`);

    this.safetyTimer = setTimeout(() => {
      this.cancel();
      this.clearSafetyTimer('startSafetyTimer()');
    }, time);
-  }
+  };

  /**
   * Clear our safety timer(s)
   * @param {String} from
   */
-  clearSafetyTimer(from) {
+  clearSafetyTimer = (from) => {
    if (!is.nullOrUndefined(this.safetyTimer)) {
      this.player.debug.log(`Safety timer cleared from: ${from}`);

      clearTimeout(this.safetyTimer);
      this.safetyTimer = null;
    }
-  }
+  };
 }

 export default Ads;
@@ -2,18 +2,19 @@ import { createElement } from '../utils/elements';
 import { once } from '../utils/events';
 import fetch from '../utils/fetch';
 import is from '../utils/is';
+import { clamp } from '../utils/numbers';
 import { formatTime } from '../utils/time';

 // Arg: vttDataString example: "WEBVTT\n\n1\n00:00:05.000 --> 00:00:10.000\n1080p-00001.jpg"
-const parseVtt = vttDataString => {
+const parseVtt = (vttDataString) => {
  const processedList = [];
  const frames = vttDataString.split(/\r\n\r\n|\n\n|\r\r/);

-  frames.forEach(frame => {
+  frames.forEach((frame) => {
    const result = {};
    const lines = frame.split(/\r\n|\n|\r/);

-    lines.forEach(line => {
+    lines.forEach((line) => {
      if (!is.number(result.startTime)) {
        // The line with start and end times on it is the first line of interest
        const matchTimes = line.match(
@@ -103,15 +104,13 @@ class PreviewThumbnails {
    return this.player.isHTML5 && this.player.isVideo && this.player.config.previewThumbnails.enabled;
  }

-  load() {
+  load = () => {
    // Toggle the regular seek tooltip
    if (this.player.elements.display.seekTooltip) {
      this.player.elements.display.seekTooltip.hidden = this.enabled;
    }

-    if (!this.enabled) {
-      return;
-    }
+    if (!this.enabled) return;

    this.getThumbnails().then(() => {
      if (!this.enabled) {
@@ -126,11 +125,11 @@ class PreviewThumbnails {

      this.loaded = true;
    });
-  }
+  };

  // Download VTT files and parse them
-  getThumbnails() {
-    return new Promise(resolve => {
+  getThumbnails = () => {
+    return new Promise((resolve) => {
      const { src } = this.player.config.previewThumbnails;

      if (is.empty(src)) {
@@ -149,7 +148,7 @@ class PreviewThumbnails {

      // Via callback()
      if (is.function(src)) {
-        src(thumbnails => {
+        src((thumbnails) => {
          this.thumbnails = thumbnails;
          sortAndResolve();
        });
@@ -159,17 +158,17 @@ class PreviewThumbnails {
        // If string, convert into single-element list
        const urls = is.string(src) ? [src] : src;
        // Loop through each src URL. Download and process the VTT file, storing the resulting data in this.thumbnails
-        const promises = urls.map(u => this.getThumbnail(u));
+        const promises = urls.map((u) => this.getThumbnail(u));
        // Resolve
        Promise.all(promises).then(sortAndResolve);
      }
    });
-  }
+  };

  // Process individual VTT file
-  getThumbnail(url) {
-    return new Promise(resolve => {
-      fetch(url).then(response => {
+  getThumbnail = (url) => {
+    return new Promise((resolve) => {
+      fetch(url).then((response) => {
        const thumbnail = {
          frames: parseVtt(response),
          height: null,
@@ -202,21 +201,15 @@ class PreviewThumbnails {
        tempImage.src = thumbnail.urlPrefix + thumbnail.frames[0].text;
      });
    });
-  }
+  };

-  startMove(event) {
-    if (!this.loaded) {
-      return;
-    }
+  startMove = (event) => {
+    if (!this.loaded) return;

-    if (!is.event(event) || !['touchmove', 'mousemove'].includes(event.type)) {
-      return;
-    }
+    if (!is.event(event) || !['touchmove', 'mousemove'].includes(event.type)) return;

    // Wait until media has a duration
-    if (!this.player.media.duration) {
-      return;
-    }
+    if (!this.player.media.duration) return;

    if (event.type === 'touchmove') {
      // Calculate seek hover position as approx video seconds
@@ -241,17 +234,26 @@ class PreviewThumbnails {

      // Set time text inside image container
      this.elements.thumb.time.innerText = formatTime(this.seekTime);
+
+      // Get marker point for time
+      const point = this.player.config.markers?.points?.find(({ time: t }) => t === Math.round(this.seekTime));
+
+      // Append the point label to the tooltip
+      if (point) {
+        // this.elements.thumb.time.innerText.concat('\n');
+        this.elements.thumb.time.insertAdjacentHTML('afterbegin', `${point.label}<br>`);
+      }
    }

    // Download and show image
    this.showImageAtCurrentTime();
-  }
+  };

-  endMove() {
+  endMove = () => {
    this.toggleThumbContainer(false, true);
-  }
+  };

-  startScrubbing(event) {
+  startScrubbing = (event) => {
    // Only act on left mouse button (0), or touch device (event.button does not exist or is false)
    if (is.nullOrUndefined(event.button) || event.button === false || event.button === 0) {
      this.mouseDown = true;
@@ -265,9 +267,9 @@ class PreviewThumbnails {
        this.showImageAtCurrentTime();
      }
    }
-  }
+  };

-  endScrubbing() {
+  endScrubbing = () => {
    this.mouseDown = false;

    // Hide scrubbing preview. But wait until the video has successfully seeked before hiding the scrubbing preview
@@ -283,12 +285,12 @@ class PreviewThumbnails {
        }
      });
    }
-  }
+  };

  /**
   * Setup hooks for Plyr and window events
   */
-  listeners() {
+  listeners = () => {
    // Hide thumbnail preview - on mouse click, mouse leave (in listeners.js for now), and video play/seek. All four are required, e.g., for buffering
    this.player.on('play', () => {
      this.toggleThumbContainer(false, true);
@@ -301,12 +303,12 @@ class PreviewThumbnails {
    this.player.on('timeupdate', () => {
      this.lastTime = this.player.media.currentTime;
    });
-  }
+  };

  /**
   * Create HTML elements for image containers
   */
-  render() {
+  render = () => {
    // Create HTML element: plyr__preview-thumbnail-container
    this.elements.thumb.container = createElement('div', {
      class: this.player.config.classNames.previewThumbnails.thumbContainer,
@@ -326,7 +328,7 @@ class PreviewThumbnails {
    this.elements.thumb.time = createElement('span', {}, '00:00');
    timeContainer.appendChild(this.elements.thumb.time);

-    this.elements.thumb.container.appendChild(timeContainer);
+    this.elements.thumb.imageContainer.appendChild(timeContainer);

    // Inject the whole thumb
    if (is.element(this.player.elements.progress)) {
@@ -339,18 +341,18 @@ class PreviewThumbnails {
    });

    this.player.elements.wrapper.appendChild(this.elements.scrubbing.container);
-  }
+  };

-  destroy() {
+  destroy = () => {
    if (this.elements.thumb.container) {
      this.elements.thumb.container.remove();
    }
    if (this.elements.scrubbing.container) {
      this.elements.scrubbing.container.remove();
    }
-  }
+  };

-  showImageAtCurrentTime() {
+  showImageAtCurrentTime = () => {
    if (this.mouseDown) {
      this.setScrubbingContainerSize();
    } else {
@@ -360,7 +362,7 @@ class PreviewThumbnails {
    // Find the desired thumbnail index
    // TODO: Handle a video longer than the thumbs where thumbNum is null
    const thumbNum = this.thumbnails[0].frames.findIndex(
-      frame => this.seekTime >= frame.startTime && this.seekTime <= frame.endTime,
+      (frame) => this.seekTime >= frame.startTime && this.seekTime <= frame.endTime,
    );
    const hasThumb = thumbNum >= 0;
    let qualityIndex = 0;
@@ -382,15 +384,15 @@ class PreviewThumbnails {
      }
    });

-    // Only proceed if either thumbnum or thumbfilename has changed
+    // Only proceed if either thumb num or thumbfilename has changed
    if (thumbNum !== this.showingThumb) {
      this.showingThumb = thumbNum;
      this.loadImage(qualityIndex);
    }
-  }
+  };

  // Show the image that's currently specified in this.showingThumb
-  loadImage(qualityIndex = 0) {
+  loadImage = (qualityIndex = 0) => {
    const thumbNum = this.showingThumb;
    const thumbnail = this.thumbnails[qualityIndex];
    const { urlPrefix } = thumbnail;
@@ -426,9 +428,9 @@ class PreviewThumbnails {
      this.currentImageElement.dataset.index = thumbNum;
      this.removeOldImages(this.currentImageElement);
    }
-  }
+  };

-  showImage(previewImage, frame, qualityIndex, thumbNum, thumbFilename, newImage = true) {
+  showImage = (previewImage, frame, qualityIndex, thumbNum, thumbFilename, newImage = true) => {
    this.player.debug.log(
      `Showing thumb: ${thumbFilename}. num: ${thumbNum}. qual: ${qualityIndex}. newimg: ${newImage}`,
    );
@@ -449,12 +451,12 @@ class PreviewThumbnails {
    this.preloadNearby(thumbNum, true)
      .then(this.preloadNearby(thumbNum, false))
      .then(this.getHigherQuality(qualityIndex, previewImage, frame, thumbFilename));
-  }
+  };

  // Remove all preview images that aren't the designated current image
-  removeOldImages(currentImage) {
+  removeOldImages = (currentImage) => {
    // Get a list of all images, convert it from a DOM list to an array
-    Array.from(this.currentImageContainer.children).forEach(image => {
+    Array.from(this.currentImageContainer.children).forEach((image) => {
      if (image.tagName.toLowerCase() !== 'img') {
        return;
      }
@@ -476,12 +478,12 @@ class PreviewThumbnails {
        }, removeDelay);
      }
    });
-  }
+  };

  // Preload images before and after the current one. Only if the user is still hovering/seeking the same frame
  // This will only preload the lowest quality
-  preloadNearby(thumbNum, forward = true) {
-    return new Promise(resolve => {
+  preloadNearby = (thumbNum, forward = true) => {
+    return new Promise((resolve) => {
      setTimeout(() => {
        const oldThumbFilename = this.thumbnails[0].frames[thumbNum].text;

@@ -496,7 +498,7 @@ class PreviewThumbnails {

          let foundOne = false;

-          thumbnailsClone.forEach(frame => {
+          thumbnailsClone.forEach((frame) => {
            const newThumbFilename = frame.text;

            if (newThumbFilename !== oldThumbFilename) {
@@ -527,10 +529,10 @@ class PreviewThumbnails {
        }
      }, 300);
    });
-  }
+  };

  // If user has been hovering current image for half a second, look for a higher quality one
-  getHigherQuality(currentQualityIndex, previewImage, frame, thumbFilename) {
+  getHigherQuality = (currentQualityIndex, previewImage, frame, thumbFilename) => {
    if (currentQualityIndex < this.thumbnails.length - 1) {
      // Only use the higher quality version if it's going to look any better - if the current thumb is of a lower pixel density than the thumbnail container
      let previewImageHeight = previewImage.naturalHeight;
@@ -550,14 +552,10 @@ class PreviewThumbnails {
        }, 300);
      }
    }
-  }
+  };

  get currentImageContainer() {
-    if (this.mouseDown) {
-      return this.elements.scrubbing.container;
-    }
-
-    return this.elements.thumb.imageContainer;
+    return this.mouseDown ? this.elements.scrubbing.container : this.elements.thumb.imageContainer;
  }

  get usingSprites() {
@@ -590,11 +588,7 @@ class PreviewThumbnails {
  }

  get currentImageElement() {
-    if (this.mouseDown) {
-      return this.currentScrubbingImageElement;
-    }
-
-    return this.currentThumbnailImageElement;
+    return this.mouseDown ? this.currentScrubbingImageElement : this.currentThumbnailImageElement;
  }

  set currentImageElement(element) {
@@ -605,7 +599,7 @@ class PreviewThumbnails {
    }
  }

-  toggleThumbContainer(toggle = false, clearShowing = false) {
+  toggleThumbContainer = (toggle = false, clearShowing = false) => {
    const className = this.player.config.classNames.previewThumbnails.thumbContainerShown;
    this.elements.thumb.container.classList.toggle(className, toggle);

@@ -613,9 +607,9 @@ class PreviewThumbnails {
      this.showingThumb = null;
      this.showingThumbFilename = null;
    }
-  }
+  };

-  toggleScrubbingContainer(toggle = false) {
+  toggleScrubbingContainer = (toggle = false) => {
    const className = this.player.config.classNames.previewThumbnails.scrubbingContainerShown;
    this.elements.scrubbing.container.classList.toggle(className, toggle);

@@ -623,74 +617,65 @@ class PreviewThumbnails {
      this.showingThumb = null;
      this.showingThumbFilename = null;
    }
-  }
+  };

-  determineContainerAutoSizing() {
+  determineContainerAutoSizing = () => {
    if (this.elements.thumb.imageContainer.clientHeight > 20 || this.elements.thumb.imageContainer.clientWidth > 20) {
      // This will prevent auto sizing in this.setThumbContainerSizeAndPos()
      this.sizeSpecifiedInCSS = true;
    }
-  }
+  };

  // Set the size to be about a quarter of the size of video. Unless option dynamicSize === false, in which case it needs to be set in CSS
-  setThumbContainerSizeAndPos() {
+  setThumbContainerSizeAndPos = () => {
+    const { imageContainer } = this.elements.thumb;
+
    if (!this.sizeSpecifiedInCSS) {
      const thumbWidth = Math.floor(this.thumbContainerHeight * this.thumbAspectRatio);
-      this.elements.thumb.imageContainer.style.height = `${this.thumbContainerHeight}px`;
-      this.elements.thumb.imageContainer.style.width = `${thumbWidth}px`;
-    } else if (
-      this.elements.thumb.imageContainer.clientHeight > 20 &&
-      this.elements.thumb.imageContainer.clientWidth < 20
-    ) {
-      const thumbWidth = Math.floor(this.elements.thumb.imageContainer.clientHeight * this.thumbAspectRatio);
-      this.elements.thumb.imageContainer.style.width = `${thumbWidth}px`;
-    } else if (
-      this.elements.thumb.imageContainer.clientHeight < 20 &&
-      this.elements.thumb.imageContainer.clientWidth > 20
-    ) {
-      const thumbHeight = Math.floor(this.elements.thumb.imageContainer.clientWidth / this.thumbAspectRatio);
-      this.elements.thumb.imageContainer.style.height = `${thumbHeight}px`;
+      imageContainer.style.height = `${this.thumbContainerHeight}px`;
+      imageContainer.style.width = `${thumbWidth}px`;
+    } else if (imageContainer.clientHeight > 20 && imageContainer.clientWidth < 20) {
+      const thumbWidth = Math.floor(imageContainer.clientHeight * this.thumbAspectRatio);
+      imageContainer.style.width = `${thumbWidth}px`;
+    } else if (imageContainer.clientHeight < 20 && imageContainer.clientWidth > 20) {
+      const thumbHeight = Math.floor(imageContainer.clientWidth / this.thumbAspectRatio);
+      imageContainer.style.height = `${thumbHeight}px`;
    }

    this.setThumbContainerPos();
-  }
+  };

-  setThumbContainerPos() {
-    const seekbarRect = this.player.elements.progress.getBoundingClientRect();
-    const plyrRect = this.player.elements.container.getBoundingClientRect();
+  setThumbContainerPos = () => {
+    const scrubberRect = this.player.elements.progress.getBoundingClientRect();
+    const containerRect = this.player.elements.container.getBoundingClientRect();
    const { container } = this.elements.thumb;
    // Find the lowest and highest desired left-position, so we don't slide out the side of the video container
-    const minVal = plyrRect.left - seekbarRect.left + 10;
-    const maxVal = plyrRect.right - seekbarRect.left - container.clientWidth - 10;
+    const min = containerRect.left - scrubberRect.left + 10;
+    const max = containerRect.right - scrubberRect.left - container.clientWidth - 10;
    // Set preview container position to: mousepos, minus seekbar.left, minus half of previewContainer.clientWidth
-    let previewPos = this.mousePosX - seekbarRect.left - container.clientWidth / 2;
+    const position = this.mousePosX - scrubberRect.left - container.clientWidth / 2;
+    const clamped = clamp(position, min, max);

-    if (previewPos < minVal) {
-      previewPos = minVal;
-    }
+    // Move the popover position
+    container.style.left = `${clamped}px`;

-    if (previewPos > maxVal) {
-      previewPos = maxVal;
-    }
-
-    container.style.left = `${previewPos}px`;
-  }
+    // The arrow can follow the cursor
+    container.style.setProperty('--preview-arrow-offset', `${position - clamped}px`);
+  };

  // Can't use 100% width, in case the video is a different aspect ratio to the video container
-  setScrubbingContainerSize() {
+  setScrubbingContainerSize = () => {
    const { width, height } = fitRatio(this.thumbAspectRatio, {
      width: this.player.media.clientWidth,
      height: this.player.media.clientHeight,
    });
    this.elements.scrubbing.container.style.width = `${width}px`;
    this.elements.scrubbing.container.style.height = `${height}px`;
-  }
+  };

  // Sprites need to be offset to the correct location
-  setImageSizeAndOffset(previewImage, frame) {
-    if (!this.usingSprites) {
-      return;
-    }
+  setImageSizeAndOffset = (previewImage, frame) => {
+    if (!this.usingSprites) return;

    // Find difference between height and preview container height
    const multiplier = this.thumbContainerHeight / frame.h;
@@ -703,7 +688,7 @@ class PreviewThumbnails {
    previewImage.style.left = `-${frame.x * multiplier}px`;
    // eslint-disable-next-line no-param-reassign
    previewImage.style.top = `-${frame.y * multiplier}px`;
-  }
+  };
 }

 export default PreviewThumbnails;
@@ -11,7 +11,7 @@ import fetch from '../utils/fetch';
 import is from '../utils/is';
 import loadScript from '../utils/load-script';
 import { format, stripHTML } from '../utils/strings';
-import { setAspectRatio } from '../utils/style';
+import { roundAspectRatio, setAspectRatio } from '../utils/style';
 import { buildUrlParams } from '../utils/urls';

 // Parse Vimeo ID from URL
@@ -28,6 +28,21 @@ function parseId(url) {
  return url.match(regex) ? RegExp.$2 : url;
 }

+// Try to extract a hash for private videos from the URL
+function parseHash(url) {
+  /* This regex matches a hexadecimal hash if given in any of these forms:
+   *  - [https://player.]vimeo.com/video/{id}/{hash}[?params]
+   *  - [https://player.]vimeo.com/video/{id}?h={hash}[&params]
+   *  - [https://player.]vimeo.com/video/{id}?[params]&h={hash}
+   *  - video/{id}/{hash}
+   * If matched, the hash is available in capture group 4
+   */
+  const regex = /^.*(vimeo.com\/|video\/)(\d+)(\?.*&*h=|\/)+([\d,a-f]+)/;
+  const found = url.match(regex);
+
+  return found && found.length === 5 ? found[4] : null;
+}
+
 // Set playback state and trigger change (only on actual change)
 function assurePlaybackState(play) {
  if (play && !this.embed.hasPlayed) {
@@ -58,7 +73,7 @@ const vimeo = {
        .then(() => {
          vimeo.ready.call(player);
        })
-        .catch(error => {
+        .catch((error) => {
          player.debug.warn('Vimeo SDK (player.js) failed to load', error);
        });
    } else {
@@ -71,6 +86,18 @@ const vimeo = {
    const player = this;
    const config = player.config.vimeo;
    const { premium, referrerPolicy, ...frameParams } = config;
+    // Get the source URL or ID
+    let source = player.media.getAttribute('src');
+    let hash = '';
+    // Get from <div> if needed
+    if (is.empty(source)) {
+      source = player.media.getAttribute(player.config.attributes.embed.id);
+      // hash can also be set as attribute on the <div>
+      hash = player.media.getAttribute(player.config.attributes.embed.hash);
+    } else {
+      hash = parseHash(source);
+    }
+    const hashParam = hash ? { h: hash } : {};

    // If the owner has a pro or premium account then we can hide controls etc
    if (premium) {
@@ -87,24 +114,21 @@ const vimeo = {
      muted: player.muted,
      gesture: 'media',
      playsinline: !this.config.fullscreen.iosNative,
+      // hash has to be added to iframe-URL
+      ...hashParam,
      ...frameParams,
    });

-    // Get the source URL or ID
-    let source = player.media.getAttribute('src');
-
-    // Get from <div> if needed
-    if (is.empty(source)) {
-      source = player.media.getAttribute(player.config.attributes.embed.id);
-    }
-
    const id = parseId(source);
    // Build an iframe
    const iframe = createElement('iframe');
    const src = format(player.config.urls.vimeo.iframe, id, params);
    iframe.setAttribute('src', src);
    iframe.setAttribute('allowfullscreen', '');
-    iframe.setAttribute('allow', 'autoplay,fullscreen,picture-in-picture');
+    iframe.setAttribute(
+      'allow',
+      ['autoplay', 'fullscreen', 'picture-in-picture', 'encrypted-media', 'accelerometer', 'gyroscope'].join('; '),
+    );

    // Set the referrer policy if required
    if (!is.empty(referrerPolicy)) {
@@ -112,31 +136,29 @@ const vimeo = {
    }

    // Inject the package
-    const { poster } = player;
-    if (premium) {
-      iframe.setAttribute('data-poster', poster);
+    if (premium || !config.customControls) {
+      iframe.setAttribute('data-poster', player.poster);
      player.media = replaceElement(iframe, player.media);
    } else {
-      const wrapper = createElement('div', { class: player.config.classNames.embedContainer, 'data-poster': poster });
+      const wrapper = createElement('div', {
+        class: player.config.classNames.embedContainer,
+        'data-poster': player.poster,
+      });
      wrapper.appendChild(iframe);
      player.media = replaceElement(wrapper, player.media);
    }

    // Get poster image
-    fetch(format(player.config.urls.vimeo.api, id), 'json').then(response => {
-      if (is.empty(response)) {
-        return;
-      }
+    if (!config.customControls) {
+      fetch(format(player.config.urls.vimeo.api, src)).then((response) => {
+        if (is.empty(response) || !response.thumbnail_url) {
+          return;
+        }

-      // Get the URL for thumbnail
-      const url = new URL(response[0].thumbnail_large);
-
-      // Get original image
-      url.pathname = `${url.pathname.split('_')[0]}.jpg`;
-
-      // Set and show poster
-      ui.setPoster.call(player, url.href).catch(() => {});
-    });
+        // Set and show poster
+        ui.setPoster.call(player, response.thumbnail_url).catch(() => {});
+      });
+    }

    // Setup instance
    // https://github.com/vimeo/player.js
@@ -269,11 +291,11 @@ const vimeo = {
    let currentSrc;
    player.embed
      .getVideoUrl()
-      .then(value => {
+      .then((value) => {
        currentSrc = value;
        controls.setDownloadUrl.call(player);
      })
-      .catch(error => {
+      .catch((error) => {
        this.debug.warn(error);
      });

@@ -291,49 +313,49 @@ const vimeo = {
    });

    // Set aspect ratio based on video size
-    Promise.all([player.embed.getVideoWidth(), player.embed.getVideoHeight()]).then(dimensions => {
+    Promise.all([player.embed.getVideoWidth(), player.embed.getVideoHeight()]).then((dimensions) => {
      const [width, height] = dimensions;
-      player.embed.ratio = [width, height];
+      player.embed.ratio = roundAspectRatio(width, height);
      setAspectRatio.call(this);
    });

    // Set autopause
-    player.embed.setAutopause(player.config.autopause).then(state => {
+    player.embed.setAutopause(player.config.autopause).then((state) => {
      player.config.autopause = state;
    });

    // Get title
-    player.embed.getVideoTitle().then(title => {
+    player.embed.getVideoTitle().then((title) => {
      player.config.title = title;
      ui.setTitle.call(this);
    });

    // Get current time
-    player.embed.getCurrentTime().then(value => {
+    player.embed.getCurrentTime().then((value) => {
      currentTime = value;
      triggerEvent.call(player, player.media, 'timeupdate');
    });

    // Get duration
-    player.embed.getDuration().then(value => {
+    player.embed.getDuration().then((value) => {
      player.media.duration = value;
      triggerEvent.call(player, player.media, 'durationchange');
    });

    // Get captions
-    player.embed.getTextTracks().then(tracks => {
+    player.embed.getTextTracks().then((tracks) => {
      player.media.textTracks = tracks;
      captions.setup.call(player);
    });

    player.embed.on('cuechange', ({ cues = [] }) => {
-      const strippedCues = cues.map(cue => stripHTML(cue.text));
+      const strippedCues = cues.map((cue) => stripHTML(cue.text));
      captions.updateCues.call(player, strippedCues);
    });

    player.embed.on('loaded', () => {
      // Assure state and events are updated on autoplay
-      player.embed.getPaused().then(paused => {
+      player.embed.getPaused().then((paused) => {
        assurePlaybackState.call(player, !paused);
        if (!paused) {
          triggerEvent.call(player, player.media, 'playing');
@@ -366,13 +388,13 @@ const vimeo = {
      assurePlaybackState.call(player, false);
    });

-    player.embed.on('timeupdate', data => {
+    player.embed.on('timeupdate', (data) => {
      player.media.seeking = false;
      currentTime = data.seconds;
      triggerEvent.call(player, player.media, 'timeupdate');
    });

-    player.embed.on('progress', data => {
+    player.embed.on('progress', (data) => {
      player.media.buffered = data.percent;
      triggerEvent.call(player, player.media, 'progress');

@@ -383,7 +405,7 @@ const vimeo = {

      // Get duration as if we do it before load, it gives an incorrect value
      // https://github.com/sampotts/plyr/issues/891
-      player.embed.getDuration().then(value => {
+      player.embed.getDuration().then((value) => {
        if (value !== player.media.duration) {
          player.media.duration = value;
          triggerEvent.call(player, player.media, 'durationchange');
@@ -401,13 +423,15 @@ const vimeo = {
      triggerEvent.call(player, player.media, 'ended');
    });

-    player.embed.on('error', detail => {
+    player.embed.on('error', (detail) => {
      player.media.error = detail;
      triggerEvent.call(player, player.media, 'error');
    });

    // Rebuild UI
-    setTimeout(() => ui.build.call(player), 0);
+    if (config.customControls) {
+      setTimeout(() => ui.build.call(player), 0);
+    }
  },
 };

@@ -11,7 +11,7 @@ import loadImage from '../utils/load-image';
 import loadScript from '../utils/load-script';
 import { extend } from '../utils/objects';
 import { format, generateId } from '../utils/strings';
-import { setAspectRatio } from '../utils/style';
+import { roundAspectRatio, setAspectRatio } from '../utils/style';

 // Parse YouTube ID from URL
 function parseId(url) {
@@ -70,7 +70,7 @@ const youtube = {
      };

      // Load the SDK
-      loadScript(this.config.urls.youtube.sdk).catch(error => {
+      loadScript(this.config.urls.youtube.sdk).catch((error) => {
        this.debug.warn('YouTube API failed to load', error);
      });
    }
@@ -81,7 +81,7 @@ const youtube = {
    const url = format(this.config.urls.youtube.api, videoId);

    fetch(url)
-      .then(data => {
+      .then((data) => {
        if (is.object(data)) {
          const { title, height, width } = data;

@@ -90,7 +90,7 @@ const youtube = {
          ui.setTitle.call(this);

          // Set aspect ratio
-          this.embed.ratio = [width, height];
+          this.embed.ratio = roundAspectRatio(width, height);
        }

        setAspectRatio.call(this);
@@ -104,6 +104,7 @@ const youtube = {
  // API ready
  ready() {
    const player = this;
+    const config = player.config.youtube;
    // Ignore already setup (race condition)
    const currentId = player.media && player.media.getAttribute('id');
    if (!is.empty(currentId) && currentId.startsWith('youtube-')) {
@@ -121,43 +122,46 @@ const youtube = {
    // Replace the <iframe> with a <div> due to YouTube API issues
    const videoId = parseId(source);
    const id = generateId(player.provider);
-    // Get poster, if already set
-    const { poster } = player;
    // Replace media element
-    const container = createElement('div', { id, 'data-poster': poster });
+    const container = createElement('div', { id, 'data-poster': config.customControls ? player.poster : undefined });
    player.media = replaceElement(container, player.media);

-    // Id to poster wrapper
-    const posterSrc = s => `https://i.ytimg.com/vi/${videoId}/${s}default.jpg`;
+    // Only load the poster when using custom controls
+    if (config.customControls) {
+      const posterSrc = (s) => `https://i.ytimg.com/vi/${videoId}/${s}default.jpg`;

-    // Check thumbnail images in order of quality, but reject fallback thumbnails (120px wide)
-    loadImage(posterSrc('maxres'), 121) // Higest quality and unpadded
-      .catch(() => loadImage(posterSrc('sd'), 121)) // 480p padded 4:3
-      .catch(() => loadImage(posterSrc('hq'))) // 360p padded 4:3. Always exists
-      .then(image => ui.setPoster.call(player, image.src))
-      .then(src => {
-        // If the image is padded, use background-size "cover" instead (like youtube does too with their posters)
-        if (!src.includes('maxres')) {
-          player.elements.poster.style.backgroundSize = 'cover';
-        }
-      })
-      .catch(() => {});
-
-    const config = player.config.youtube;
+      // Check thumbnail images in order of quality, but reject fallback thumbnails (120px wide)
+      loadImage(posterSrc('maxres'), 121) // Higest quality and unpadded
+        .catch(() => loadImage(posterSrc('sd'), 121)) // 480p padded 4:3
+        .catch(() => loadImage(posterSrc('hq'))) // 360p padded 4:3. Always exists
+        .then((image) => ui.setPoster.call(player, image.src))
+        .then((src) => {
+          // If the image is padded, use background-size "cover" instead (like youtube does too with their posters)
+          if (!src.includes('maxres')) {
+            player.elements.poster.style.backgroundSize = 'cover';
+          }
+        })
+        .catch(() => {});
+    }

    // Setup instance
    // https://developers.google.com/youtube/iframe_api_reference
-    player.embed = new window.YT.Player(id, {
+    player.embed = new window.YT.Player(player.media, {
      videoId,
      host: getHost(config),
      playerVars: extend(
        {},
        {
-          autoplay: player.config.autoplay ? 1 : 0, // Autoplay
-          hl: player.config.hl, // iframe interface language
-          controls: player.supported.ui ? 0 : 1, // Only show controls if not fully supported
-          disablekb: 1, // Disable keyboard as we handle it
-          playsinline: !player.config.fullscreen.iosNative ? 1 : 0, // Allow iOS inline playback
+          // Autoplay
+          autoplay: player.config.autoplay ? 1 : 0,
+          // iframe interface language
+          hl: player.config.hl,
+          // Only show controls if not fully supported or opted out
+          controls: player.supported.ui && config.customControls ? 0 : 1,
+          // Disable keyboard as we handle it
+          disablekb: 1,
+          // Allow iOS inline playback
+          playsinline: !player.config.fullscreen.iosNative ? 1 : 0,
          // Captions are flaky on YouTube
          cc_load_policy: player.captions.active ? 1 : 0,
          cc_lang_pref: player.config.captions.language,
@@ -278,6 +282,7 @@ const youtube = {
              const toggle = is.boolean(input) ? input : muted;
              muted = toggle;
              instance[toggle ? 'mute' : 'unMute']();
+              instance.setVolume(volume * 100);
              triggerEvent.call(player, player.media, 'volumechange');
            },
          });
@@ -299,10 +304,10 @@ const youtube = {
          // Get available speeds
          const speeds = instance.getAvailablePlaybackRates();
          // Filter based on config
-          player.options.speed = speeds.filter(s => player.config.speed.options.includes(s));
+          player.options.speed = speeds.filter((s) => player.config.speed.options.includes(s));

          // Set the tabindex to avoid focus entering iframe
-          if (player.supported.ui) {
+          if (player.supported.ui && config.customControls) {
            player.media.setAttribute('tabindex', -1);
          }

@@ -335,7 +340,9 @@ const youtube = {
          }, 200);

          // Rebuild UI
-          setTimeout(() => ui.build.call(player), 50);
+          if (config.customControls) {
+            setTimeout(() => ui.build.call(player), 50);
+          }
        },
        onStateChange(event) {
          // Get the instance
@@ -386,7 +393,7 @@ const youtube = {

            case 1:
              // Restore paused state (YouTube starts playing on seek if the video hasn't been played yet)
-              if (!player.config.autoplay && player.media.paused && !player.embed.hasPlayed) {
+              if (config.customControls && !player.config.autoplay && player.media.paused && !player.embed.hasPlayed) {
                player.media.pause();
              } else {
                assurePlaybackState.call(player, true);
@@ -138,10 +138,15 @@ declare class Plyr {
   */
  ratio?: string;

+  /**
+   * Access Elements cache
+   */
+  elements: Plyr.Elements;
+
  /**
   * Returns the current video Provider
   */
-  readonly provider: 'html5' | 'vimeo' | 'youtube';
+  readonly provider: Plyr.Provider;

  /**
   * Returns the native API for Vimeo or Youtube players
@@ -206,6 +211,11 @@ declare class Plyr {
   */
  airplay(): void;

+  /**
+   * Sets the preview thumbnails for the current source.
+   */
+  setPreviewThumbnails(source: Plyr.PreviewThumbnailsOptions): void;
+
  /**
   * Toggle the controls (video only). Takes optional truthy value to force it on/off.
   */
@@ -214,26 +224,17 @@ declare class Plyr {
  /**
   * Add an event listener for the specified event.
   */
-  on(
-    event: Plyr.StandardEvent | Plyr.Html5Event | Plyr.YoutubeEvent,
-    callback: (this: this, event: Plyr.PlyrEvent) => void,
-  ): void;
+  on<K extends keyof Plyr.PlyrEventMap>(event: K, callback: (this: this, event: Plyr.PlyrEventMap[K]) => void): void;

  /**
   * Add an event listener for the specified event once.
   */
-  once(
-    event: Plyr.StandardEvent | Plyr.Html5Event | Plyr.YoutubeEvent,
-    callback: (this: this, event: Plyr.PlyrEvent) => void,
-  ): void;
+  once<K extends keyof Plyr.PlyrEventMap>(event: K, callback: (this: this, event: Plyr.PlyrEventMap[K]) => void): void;

  /**
   * Remove an event listener for the specified event.
   */
-  off(
-    event: Plyr.StandardEvent | Plyr.Html5Event | Plyr.YoutubeEvent,
-    callback: (this: this, event: Plyr.PlyrEvent) => void,
-  ): void;
+  off<K extends keyof Plyr.PlyrEventMap>(event: K, callback: (this: this, event: Plyr.PlyrEventMap[K]) => void): void;

  /**
   * Check support for a mime type.
@@ -242,44 +243,60 @@ declare class Plyr {

  /**
   * Destroy lib instance
+   * @param {Function} callback - Callback for when destroy is complete
+   * @param {Boolean} soft - Whether it's a soft destroy (for source changes etc)
   */
-  destroy(): void;
+  destroy(callback?: (...args: any[]) => void, soft?: boolean): void;
 }

 declare namespace Plyr {
  type MediaType = 'audio' | 'video';
  type Provider = 'html5' | 'youtube' | 'vimeo';
-  type StandardEvent =
-    | 'progress'
-    | 'playing'
-    | 'play'
-    | 'pause'
-    | 'timeupdate'
-    | 'volumechange'
-    | 'seeking'
-    | 'seeked'
-    | 'ratechange'
-    | 'ended'
-    | 'enterfullscreen'
-    | 'exitfullscreen'
-    | 'captionsenabled'
-    | 'captionsdisabled'
-    | 'languagechange'
-    | 'controlshidden'
-    | 'controlsshown'
-    | 'ready';
-  type Html5Event =
-    | 'loadstart'
-    | 'loadeddata'
-    | 'loadedmetadata'
-    | 'canplay'
-    | 'canplaythrough'
-    | 'stalled'
-    | 'waiting'
-    | 'emptied'
-    | 'cuechange'
-    | 'error';
-  type YoutubeEvent = 'statechange' | 'qualitychange' | 'qualityrequested';
+  type StandardEventMap = {
+    progress: PlyrEvent;
+    playing: PlyrEvent;
+    play: PlyrEvent;
+    pause: PlyrEvent;
+    timeupdate: PlyrEvent;
+    volumechange: PlyrEvent;
+    seeking: PlyrEvent;
+    seeked: PlyrEvent;
+    ratechange: PlyrEvent;
+    ended: PlyrEvent;
+    enterfullscreen: PlyrEvent;
+    exitfullscreen: PlyrEvent;
+    captionsenabled: PlyrEvent;
+    captionsdisabled: PlyrEvent;
+    languagechange: PlyrEvent;
+    controlshidden: PlyrEvent;
+    controlsshown: PlyrEvent;
+    ready: PlyrEvent;
+  };
+  // For retrocompatibility, we keep StandardEvent
+  type StandardEvent = keyof Plyr.StandardEventMap;
+  type Html5EventMap = {
+    loadstart: PlyrEvent;
+    loadeddata: PlyrEvent;
+    loadedmetadata: PlyrEvent;
+    canplay: PlyrEvent;
+    canplaythrough: PlyrEvent;
+    stalled: PlyrEvent;
+    waiting: PlyrEvent;
+    emptied: PlyrEvent;
+    cuechange: PlyrEvent;
+    error: PlyrEvent;
+  };
+  // For retrocompatibility, we keep Html5Event
+  type Html5Event = keyof Plyr.Html5EventMap;
+  type YoutubeEventMap = {
+    statechange: PlyrStateChangeEvent;
+    qualitychange: PlyrEvent;
+    qualityrequested: PlyrEvent;
+  };
+  // For retrocompatibility, we keep YoutubeEvent
+  type YoutubeEvent = keyof Plyr.YoutubeEventMap;
+
+  type PlyrEventMap = StandardEventMap & Html5EventMap & YoutubeEventMap;

  interface FullscreenControl {
    /**
@@ -357,7 +374,7 @@ declare namespace Plyr {
    /**
     * Specify a URL or path to a blank video file used to properly cancel network requests.
     */
-    blankUrl?: string;
+    blankVideo?: string;

    /**
     * Autoplay the media on load. This is generally advised against on UX grounds. It is also disabled by default in some browsers.
@@ -442,7 +459,7 @@ declare namespace Plyr {
     * Allows binding of event listeners to the controls before the default handlers. See the defaults.js for available listeners.
     * If your handler prevents default on the event (event.preventDefault()), the default handler will not fire.
     */
-    listeners?: { [key: string]: (error: PlyrEvent) => void };
+    listeners?: {[key: string]: (error: PlyrEvent) => void};

    /**
     * active: Toggles if captions should be active by default. language: Sets the default language to load (if available). 'auto' uses the browser language.
@@ -501,10 +518,22 @@ declare namespace Plyr {
     * Preview Thumbnails Options.
     */
    previewThumbnails?: PreviewThumbnailsOptions;
+
+    /**
+     * Media Metadata Options.
+     */
+    mediaMetadata?: MediaMetadataOptions;
+
+    /**
+     * Markers Options
+     */
+    markers?: MarkersOptions;
  }

  interface QualityOptions {
    default: number;
+    forced?: boolean;
+    onChange?: (quality: number) => void;
    options: number[];
  }

@@ -514,7 +543,8 @@ declare namespace Plyr {

  interface AdOptions {
    enabled: boolean;
-    publisherId: string;
+    publisherId?: string;
+    tagUrl?: string;
  }

  interface SpeedOptions {
@@ -534,9 +564,10 @@ declare namespace Plyr {

  interface FullScreenOptions {
    enabled?: boolean;
-    fallback?: boolean;
+    fallback?: boolean | 'force';
    allowAudio?: boolean;
    iosNative?: boolean;
+    container?: string;
  }

  interface CaptionOptions {
@@ -552,7 +583,51 @@ declare namespace Plyr {

  interface PreviewThumbnailsOptions {
    enabled?: boolean;
-    src?: string;
+    src?: string | string[];
+  }
+
+  interface MediaMetadataArtwork {
+    src: string;
+    sizes?: string;
+    type: string;
+  }
+
+  interface MediaMetadataOptions {
+    title?: string;
+    artist?: string;
+    album?: string;
+    artwork?: MediaMetadataArtwork[];
+  }
+
+  interface MarkersPoints {
+    time: number;
+    label: string;
+  }
+
+  interface MarkersOptions {
+    enabled: boolean;
+    points: MarkersPoints[]
+  }
+
+  export interface Elements {
+    buttons: {
+      airplay?: HTMLButtonElement;
+      captions?: HTMLButtonElement;
+      download?: HTMLButtonElement;
+      fastForward?: HTMLButtonElement;
+      fullscreen?: HTMLButtonElement;
+      mute?: HTMLButtonElement;
+      pip?: HTMLButtonElement;
+      play?: HTMLButtonElement | HTMLButtonElement[];
+      restart?: HTMLButtonElement;
+      rewind?: HTMLButtonElement;
+      settings?: HTMLButtonElement;
+    };
+    captions: HTMLElement | null;
+    container: HTMLElement | null;
+    controls: HTMLElement | null;
+    fullscreen: HTMLElement | null;
+    wrapper: HTMLElement | null;
  }

  interface SourceInfo {
@@ -582,6 +657,11 @@ declare namespace Plyr {
     * Booleans are converted to HTML5 value-less attributes.
     */
    tracks?: Track[];
+
+    /**
+     * Enable or disable preview thumbnails for current source
+     */
+    previewThumbnails?: Plyr.PreviewThumbnailsOptions;
  }

  interface Source {
@@ -620,7 +700,23 @@ declare namespace Plyr {
  }

  interface PlyrEvent extends CustomEvent {
-    readonly detail: { readonly plyr: Plyr };
+    readonly detail: {readonly plyr: Plyr};
+  }
+
+  enum YoutubeState {
+    UNSTARTED = -1,
+    ENDED = 0,
+    PLAYING = 1,
+    PAUSED = 2,
+    BUFFERING = 3,
+    CUED = 5,
+  }
+
+  interface PlyrStateChangeEvent extends CustomEvent {
+    readonly detail: {
+      readonly plyr: Plyr;
+      readonly code: YoutubeState;
+    };
  }

  interface Support {
@@ -1,6 +1,6 @@
 // ==========================================================================
 // Plyr
-// plyr.js v3.6.2
+// plyr.js v3.7.1
 // https://github.com/sampotts/plyr
 // License: The MIT License (MIT)
 // ==========================================================================
@@ -12,6 +12,7 @@ import { getProviderByUrl, providers, types } from './config/types';
 import Console from './console';
 import controls from './controls';
 import Fullscreen from './fullscreen';
+import html5 from './html5';
 import Listeners from './listeners';
 import media from './media';
 import Ads from './plugins/ads';
@@ -28,7 +29,7 @@ import loadSprite from './utils/load-sprite';
 import { clamp } from './utils/numbers';
 import { cloneDeep, extend } from './utils/objects';
 import { silencePromise } from './utils/promise';
-import { getAspectRatio, reduceAspectRatio, setAspectRatio, validateRatio } from './utils/style';
+import { getAspectRatio, reduceAspectRatio, setAspectRatio, validateAspectRatio } from './utils/style';
 import { parseUrl } from './utils/urls';

 // Private properties
@@ -71,7 +72,7 @@ class Plyr {
      (() => {
        try {
          return JSON.parse(this.media.getAttribute('data-plyr-config'));
-        } catch (e) {
+        } catch (_) {
          return {};
        }
      })(),
@@ -205,7 +206,7 @@ class Plyr {
        }

        // Unsupported or missing provider
-        if (is.empty(this.provider) || !Object.keys(providers).includes(this.provider)) {
+        if (is.empty(this.provider) || !Object.values(providers).includes(this.provider)) {
          this.debug.error('Setup failed: Invalid provider');
          return;
        }
@@ -281,7 +282,7 @@ class Plyr {

    // Listen for events if debugging
    if (this.config.debug) {
-      on.call(this, this.elements.container, this.config.events.join(' '), event => {
+      on.call(this, this.elements.container, this.config.events.join(' '), (event) => {
        this.debug.log(`event: ${event.type}`);
      });
    }
@@ -308,7 +309,7 @@ class Plyr {

    // Autoplay if required
    if (this.isHTML5 && this.config.autoplay) {
-      setTimeout(() => silencePromise(this.play()), 10);
+      this.once('canplay', () => silencePromise(this.play()));
    }

    // Seek time will be recorded (in listeners.js) so we can prevent hiding controls for a few seconds after seek
@@ -354,7 +355,7 @@ class Plyr {
  /**
   * Play the media, or play the advertisement (if they are not blocked)
   */
-  play() {
+  play = () => {
    if (!is.function(this.media.play)) {
      return null;
    }
@@ -366,18 +367,18 @@ class Plyr {

    // Return the promise (for HTML5)
    return this.media.play();
-  }
+  };

  /**
   * Pause the media
   */
-  pause() {
+  pause = () => {
    if (!this.playing || !is.function(this.media.pause)) {
      return null;
    }

    return this.media.pause();
-  }
+  };

  /**
   * Get playing state
@@ -411,7 +412,7 @@ class Plyr {
   * Toggle playback based on current status
   * @param {Boolean} input
   */
-  togglePlay(input) {
+  togglePlay = (input) => {
    // Toggle based on current state if nothing passed
    const toggle = is.boolean(input) ? input : !this.playing;

@@ -420,42 +421,42 @@ class Plyr {
    }

    return this.pause();
-  }
+  };

  /**
   * Stop playback
   */
-  stop() {
+  stop = () => {
    if (this.isHTML5) {
      this.pause();
      this.restart();
    } else if (is.function(this.media.stop)) {
      this.media.stop();
    }
-  }
+  };

  /**
   * Restart playback
   */
-  restart() {
+  restart = () => {
    this.currentTime = 0;
-  }
+  };

  /**
   * Rewind
   * @param {Number} seekTime - how far to rewind in seconds. Defaults to the config.seekTime
   */
-  rewind(seekTime) {
+  rewind = (seekTime) => {
    this.currentTime -= is.number(seekTime) ? seekTime : this.config.seekTime;
-  }
+  };

  /**
   * Fast forward
   * @param {Number} seekTime - how far to fast forward in seconds. Defaults to the config.seekTime
   */
-  forward(seekTime) {
+  forward = (seekTime) => {
    this.currentTime += is.number(seekTime) ? seekTime : this.config.seekTime;
-  }
+  };

  /**
   * Seek to a time
@@ -581,18 +582,18 @@ class Plyr {
   * Increase volume
   * @param {Boolean} step - How much to decrease by (between 0 and 1)
   */
-  increaseVolume(step) {
+  increaseVolume = (step) => {
    const volume = this.media.muted ? 0 : this.volume;
    this.volume = volume + (is.number(step) ? step : 0);
-  }
+  };

  /**
   * Decrease volume
   * @param {Boolean} step - How much to decrease by (between 0 and 1)
   */
-  decreaseVolume(step) {
+  decreaseVolume = (step) => {
    this.increaseVolume(-step);
-  }
+  };

  /**
   * Set muted state
@@ -648,7 +649,7 @@ class Plyr {

  /**
   * Set playback speed
-   * @param {Number} speed - the speed of playback (0.5-2.0)
+   * @param {Number} input - the speed of playback (0.5-2.0)
   */
  set speed(input) {
    let speed = null;
@@ -674,7 +675,9 @@ class Plyr {

    // Set media speed
    setTimeout(() => {
-      this.media.playbackRate = speed;
+      if (this.media) {
+        this.media.playbackRate = speed;
+      }
    }, 0);
  }

@@ -915,12 +918,12 @@ class Plyr {
      return;
    }

-    if (!is.string(input) || !validateRatio(input)) {
+    if (!is.string(input) || !validateAspectRatio(input)) {
      this.debug.error(`Invalid aspect ratio specified (${input})`);
      return;
    }

-    this.config.ratio = input;
+    this.config.ratio = reduceAspectRatio(input);

    setAspectRatio.call(this);
  }
@@ -930,8 +933,7 @@ class Plyr {
   * @param {Boolean} input - Whether to autoplay or not
   */
  set autoplay(input) {
-    const toggle = is.boolean(input) ? input : this.config.autoplay;
-    this.config.autoplay = toggle;
+    this.config.autoplay = is.boolean(input) ? input : this.config.autoplay;
  }

  /**
@@ -951,10 +953,11 @@ class Plyr {

  /**
   * Set the caption track by index
-   * @param {Number} - Caption index
+   * @param {Number} input - Caption index
   */
  set currentTrack(input) {
    captions.set.call(this, input, false);
+    captions.setup.call(this);
  }

  /**
@@ -968,7 +971,7 @@ class Plyr {
  /**
   * Set the wanted language for captions
   * Since tracks can be added later it won't update the actual caption track until there is a matching track
-   * @param {String} - Two character ISO language code (e.g. EN, FR, PT, etc)
+   * @param {String} input - Two character ISO language code (e.g. EN, FR, PT, etc)
   */
  set language(input) {
    captions.setLanguage.call(this, input, false);
@@ -1028,22 +1031,39 @@ class Plyr {
    return this.media === document.pictureInPictureElement;
  }

+  /**
+   * Sets the preview thubmnails for the current source
+   */
+  setPreviewThumbnails(thumbnailSource) {
+    if (this.previewThumbnails && this.previewThumbnails.loaded) {
+      this.previewThumbnails.destroy();
+      this.previewThumbnails = null;
+    }
+
+    Object.assign(this.config.previewThumbnails, thumbnailSource);
+
+    // Create new instance if it is still enabled
+    if (this.config.previewThumbnails.enabled) {
+      this.previewThumbnails = new PreviewThumbnails(this);
+    }
+  }
+
  /**
   * Trigger the airplay dialog
   * TODO: update player with state, support, enabled
   */
-  airplay() {
+  airplay = () => {
    // Show dialog if supported
    if (support.airplay) {
      this.media.webkitShowPlaybackTargetPicker();
    }
-  }
+  };

  /**
   * Toggle the player controls
   * @param {Boolean} [toggle] - Whether to show the controls
   */
-  toggleControls(toggle) {
+  toggleControls = (toggle) => {
    // Don't toggle if missing UI support or if it's audio
    if (this.supported.ui && !this.isAudio) {
      // Get state before change
@@ -1054,7 +1074,12 @@ class Plyr {
      const hiding = toggleClass(this.elements.container, this.config.classNames.hideControls, force);

      // Close menu
-      if (hiding && is.array(this.config.controls) && this.config.controls.includes('settings') && !is.empty(this.config.settings)) {
+      if (
+        hiding &&
+        is.array(this.config.controls) &&
+        this.config.controls.includes('settings') &&
+        !is.empty(this.config.settings)
+      ) {
        controls.toggleMenu.call(this, false);
      }

@@ -1068,34 +1093,34 @@ class Plyr {
    }

    return false;
-  }
+  };

  /**
   * Add event listeners
   * @param {String} event - Event type
   * @param {Function} callback - Callback for when event occurs
   */
-  on(event, callback) {
+  on = (event, callback) => {
    on.call(this, this.elements.container, event, callback);
-  }
+  };

  /**
   * Add event listeners once
   * @param {String} event - Event type
   * @param {Function} callback - Callback for when event occurs
   */
-  once(event, callback) {
+  once = (event, callback) => {
    once.call(this, this.elements.container, event, callback);
-  }
+  };

  /**
   * Remove event listeners
   * @param {String} event - Event type
   * @param {Function} callback - Callback for when event occurs
   */
-  off(event, callback) {
+  off = (event, callback) => {
    off(this.elements.container, event, callback);
-  }
+  };

  /**
   * Destroy an instance
@@ -1104,7 +1129,7 @@ class Plyr {
   * @param {Function} callback - Callback for when destroy is complete
   * @param {Boolean} soft - Whether it's a soft destroy (for source changes etc)
   */
-  destroy(callback, soft = false) {
+  destroy = (callback, soft = false) => {
    if (!this.ready) {
      return;
    }
@@ -1140,6 +1165,9 @@ class Plyr {
        // Unbind listeners
        unbindListeners.call(this);

+        // Cancel current network requests
+        html5.cancelRequests.call(this);
+
        // Replace the container with the original element provided
        replaceElement(this.elements.original, this.elements.container);

@@ -1199,15 +1227,13 @@ class Plyr {
      // Vimeo does not always return
      setTimeout(done, 200);
    }
-  }
+  };

  /**
   * Check for support for a mime type (HTML5 only)
   * @param {String} type - Mime type
   */
-  supports(type) {
-    return support.mime.call(this, type);
-  }
+  supports = (type) => support.mime.call(this, type);

  /**
   * Check for support
@@ -1248,7 +1274,7 @@ class Plyr {
      return null;
    }

-    return targets.map(t => new Plyr(t, options));
+    return targets.map((t) => new Plyr(t, options));
  }
 }

@@ -1,6 +1,6 @@
 // ==========================================================================
 // Plyr Polyfilled Build
-// plyr.js v3.6.2
+// plyr.js v3.7.1
 // https://github.com/sampotts/plyr
 // License: The MIT License (MIT)
 // ==========================================================================
@@ -20,7 +20,7 @@ const source = {
        src: attributes,
      });
    } else if (is.array(attributes)) {
-      attributes.forEach(attribute => {
+      attributes.forEach((attribute) => {
        insertElement(type, this.media, attribute);
      });
    }
@@ -26,12 +26,12 @@ class Storage {
      window.localStorage.removeItem(test);

      return true;
-    } catch (e) {
+    } catch (_) {
      return false;
    }
  }

-  get(key) {
+  get = (key) => {
    if (!Storage.supported || !this.enabled) {
      return null;
    }
@@ -45,9 +45,9 @@ class Storage {
    const json = JSON.parse(store);

    return is.string(key) && key.length ? json[key] : json;
-  }
+  };

-  set(object) {
+  set = (object) => {
    // Bail if we don't have localStorage support or it's disabled
    if (!Storage.supported || !this.enabled) {
      return;
@@ -70,8 +70,12 @@ class Storage {
    extend(storage, object);

    // Update storage
-    window.localStorage.setItem(this.key, JSON.stringify(storage));
-  }
+    try {
+      window.localStorage.setItem(this.key, JSON.stringify(storage));
+    } catch (_) {
+      // Do nothing
+    }
+  };
 }

 export default Storage;
@@ -88,7 +88,7 @@ const support = {

    try {
      return Boolean(type && this.media.canPlayType(type).replace(/no/, ''));
-    } catch (e) {
+    } catch (_) {
      return false;
    }
  },
@@ -82,6 +82,9 @@ const ui = {
    // Reset time display
    controls.timeUpdate.call(this);

+    // Reset duration display
+    controls.durationUpdate.call(this);
+
    // Update the UI
    ui.checkPlaying.call(this);

@@ -122,6 +125,11 @@ const ui = {
    if (this.config.duration) {
      controls.durationUpdate.call(this);
    }
+
+    // Media metadata
+    if (this.config.mediaMetadata) {
+      controls.setMediaMetadata.call(this);
+    }
  },

  // Setup aria attribute for play and iframe title
@@ -135,7 +143,7 @@ const ui = {
    }

    // If there's a play button, set label
-    Array.from(this.elements.buttons.play || []).forEach(button => {
+    Array.from(this.elements.buttons.play || []).forEach((button) => {
      button.setAttribute('aria-label', label);
    });

@@ -172,19 +180,22 @@ const ui = {
    // Set property synchronously to respect the call order
    this.media.setAttribute('data-poster', poster);

+    // Show the poster
+    this.elements.poster.removeAttribute('hidden');
+
    // Wait until ui is ready
    return (
      ready
        .call(this)
        // Load image
        .then(() => loadImage(poster))
-        .catch(err => {
+        .catch((error) => {
          // Hide poster on error unless it's been set by another call
          if (poster === this.poster) {
            ui.togglePoster.call(this, false);
          }
          // Rethrow
-          throw err;
+          throw error;
        })
        .then(() => {
          // Prevent race conditions
@@ -214,7 +225,7 @@ const ui = {
    toggleClass(this.elements.container, this.config.classNames.stopped, this.stopped);

    // Set state
-    Array.from(this.elements.buttons.play || []).forEach(target => {
+    Array.from(this.elements.buttons.play || []).forEach((target) => {
      Object.assign(target, { pressed: this.playing });
      target.setAttribute('aria-label', i18n.get(this.playing ? 'pause' : 'play', this.config));
    });
@@ -270,8 +281,8 @@ const ui = {
    // Loop through values (as they are the keys when the object is spread 🤔)
    Object.values({ ...this.media.style })
      // We're only fussed about Plyr specific properties
-      .filter(key => !is.empty(key) && key.startsWith('--plyr'))
-      .forEach(key => {
+      .filter((key) => !is.empty(key) && is.string(key) && key.startsWith('--plyr'))
+      .forEach((key) => {
        // Set on the container
        this.elements.container.style.setProperty(key, this.media.style.getPropertyValue(key));

@@ -14,7 +14,7 @@ export const transitionEndEvent = (() => {
    transition: 'transitionend',
  };

-  const type = Object.keys(events).find(event => element.style[event] !== undefined);
+  const type = Object.keys(events).find((event) => element.style[event] !== undefined);

  return is.string(type) ? events[type] : false;
 })();
@@ -31,7 +31,7 @@ export function repaint(element, delay) {

      // eslint-disable-next-line no-param-reassign
      element.hidden = false;
-    } catch (e) {
+    } catch (_) {
      // Do nothing
    }
  }, delay);
@@ -4,11 +4,13 @@
 // ==========================================================================

 const browser = {
-  isIE: /* @cc_on!@ */ false || !!document.documentMode,
+  isIE: Boolean(window.document.documentMode),
  isEdge: window.navigator.userAgent.includes('Edge'),
  isWebkit: 'WebkitAppearance' in document.documentElement.style && !/Edge/.test(navigator.userAgent),
  isIPhone: /(iPhone|iPod)/gi.test(navigator.platform),
-  isIos: /(iPad|iPhone|iPod)/gi.test(navigator.platform),
+  isIos:
+    (navigator.platform === 'MacIntel' && navigator.maxTouchPoints > 1) ||
+    /(iPad|iPhone|iPod)/gi.test(navigator.platform),
 };

 export default browser;
@@ -138,7 +138,7 @@ export function getAttributesFromSelector(sel, existingAttributes) {
  const attributes = {};
  const existing = extend({}, existingAttributes);

-  sel.split(',').forEach(s => {
+  sel.split(',').forEach((s) => {
    // Remove whitespace
    const selector = s.trim();
    const className = selector.replace('.', '');
@@ -198,7 +198,7 @@ export function toggleHidden(element, hidden) {
 // Mirror Element.classList.toggle, with IE compatibility for "force" argument
 export function toggleClass(element, className, force) {
  if (is.nodeList(element)) {
-    return Array.from(element).map(e => toggleClass(e, className, force));
+    return Array.from(element).map((e) => toggleClass(e, className, force));
  }

  if (is.element(element)) {
@@ -19,7 +19,7 @@ const supportsPassiveListeners = (() => {
    });
    window.addEventListener('test', null, options);
    window.removeEventListener('test', null, options);
-  } catch (e) {
+  } catch (_) {
    // Do nothing
  }

@@ -50,7 +50,7 @@ export function toggleListener(element, event, callback, toggle = false, passive
  }

  // If a single node is passed, bind the event listener
-  events.forEach(type => {
+  events.forEach((type) => {
    if (this && this.eventListeners && toggle) {
      // Cache event listener
      this.eventListeners.push({ element, type, callback, options });
@@ -100,7 +100,7 @@ export function triggerEvent(element, type = '', bubbles = false, detail = {}) {
 // Unbind all cached event listeners
 export function unbindListeners() {
  if (this && this.eventListeners) {
-    this.eventListeners.forEach(item => {
+    this.eventListeners.forEach((item) => {
      const { element, type, callback, options } = item;
      element.removeEventListener(type, callback, options);
    });
@@ -111,7 +111,7 @@ export function unbindListeners() {

 // Run method when / if player is ready
 export function ready() {
-  return new Promise(resolve =>
+  return new Promise((resolve) =>
    this.ready ? setTimeout(resolve, 0) : on.call(this, this.elements.container, 'ready', resolve),
  ).then(() => {});
 }
@@ -17,7 +17,7 @@ export default function fetch(url, responseType = 'text') {
        if (responseType === 'text') {
          try {
            resolve(JSON.parse(request.responseText));
-          } catch (e) {
+          } catch (_) {
            resolve(request.responseText);
          }
        } else {
@@ -35,8 +35,8 @@ export default function fetch(url, responseType = 'text') {
      request.responseType = responseType;

      request.send();
-    } catch (e) {
-      reject(e);
+    } catch (error) {
+      reject(error);
    }
  });
 }
@@ -2,31 +2,37 @@
 // Type checking utils
 // ==========================================================================

-const getConstructor = input => (input !== null && typeof input !== 'undefined' ? input.constructor : null);
+const getConstructor = (input) => (input !== null && typeof input !== 'undefined' ? input.constructor : null);
 const instanceOf = (input, constructor) => Boolean(input && constructor && input instanceof constructor);
-const isNullOrUndefined = input => input === null || typeof input === 'undefined';
-const isObject = input => getConstructor(input) === Object;
-const isNumber = input => getConstructor(input) === Number && !Number.isNaN(input);
-const isString = input => getConstructor(input) === String;
-const isBoolean = input => getConstructor(input) === Boolean;
-const isFunction = input => getConstructor(input) === Function;
-const isArray = input => Array.isArray(input);
-const isWeakMap = input => instanceOf(input, WeakMap);
-const isNodeList = input => instanceOf(input, NodeList);
-const isElement = input => instanceOf(input, Element);
-const isTextNode = input => getConstructor(input) === Text;
-const isEvent = input => instanceOf(input, Event);
-const isKeyboardEvent = input => instanceOf(input, KeyboardEvent);
-const isCue = input => instanceOf(input, window.TextTrackCue) || instanceOf(input, window.VTTCue);
-const isTrack = input => instanceOf(input, TextTrack) || (!isNullOrUndefined(input) && isString(input.kind));
-const isPromise = input => instanceOf(input, Promise) && isFunction(input.then);
+const isNullOrUndefined = (input) => input === null || typeof input === 'undefined';
+const isObject = (input) => getConstructor(input) === Object;
+const isNumber = (input) => getConstructor(input) === Number && !Number.isNaN(input);
+const isString = (input) => getConstructor(input) === String;
+const isBoolean = (input) => getConstructor(input) === Boolean;
+const isFunction = (input) => getConstructor(input) === Function;
+const isArray = (input) => Array.isArray(input);
+const isWeakMap = (input) => instanceOf(input, WeakMap);
+const isNodeList = (input) => instanceOf(input, NodeList);
+const isTextNode = (input) => getConstructor(input) === Text;
+const isEvent = (input) => instanceOf(input, Event);
+const isKeyboardEvent = (input) => instanceOf(input, KeyboardEvent);
+const isCue = (input) => instanceOf(input, window.TextTrackCue) || instanceOf(input, window.VTTCue);
+const isTrack = (input) => instanceOf(input, TextTrack) || (!isNullOrUndefined(input) && isString(input.kind));
+const isPromise = (input) => instanceOf(input, Promise) && isFunction(input.then);

-const isEmpty = input =>
+const isElement = (input) =>
+  input !== null &&
+  typeof input === 'object' &&
+  input.nodeType === 1 &&
+  typeof input.style === 'object' &&
+  typeof input.ownerDocument === 'object';
+
+const isEmpty = (input) =>
  isNullOrUndefined(input) ||
  ((isString(input) || isArray(input) || isNodeList(input)) && !input.length) ||
  (isObject(input) && !Object.keys(input).length);

-const isUrl = input => {
+const isUrl = (input) => {
  // Accept a URL object
  if (instanceOf(input, window.URL)) {
    return true;
@@ -45,7 +51,7 @@ const isUrl = input => {

  try {
    return !isEmpty(new URL(string).hostname);
-  } catch (e) {
+  } catch (_) {
    return false;
  }
 };
@@ -54,18 +54,22 @@ export default function loadSprite(url, id) {

    // Get the sprite
    fetch(url)
-      .then(result => {
+      .then((result) => {
        if (is.empty(result)) {
          return;
        }

        if (useStorage) {
-          window.localStorage.setItem(
-            `${prefix}-${id}`,
-            JSON.stringify({
-              content: result,
-            }),
-          );
+          try {
+            window.localStorage.setItem(
+              `${prefix}-${id}`,
+              JSON.stringify({
+                content: result,
+              }),
+            );
+          } catch (_) {
+            // Do nothing
+          }
        }

        update(container, result);
@@ -7,7 +7,7 @@
 * @param {Number} input
 * @param {Number} min The lower boundary of the output range
 * @param {Number} max The upper boundary of the output range
- * @returns A number in the range [min, max]
+ * @returns A number within the bounds of min and max
 * @type Number
 */
 export function clamp(input = 0, min = 0, max = 255) {
@@ -26,7 +26,7 @@ export function extend(target = {}, ...sources) {
    return target;
  }

-  Object.keys(source).forEach(key => {
+  Object.keys(source).forEach((key) => {
    if (is.object(source[key])) {
      if (!Object.keys(target).includes(key)) {
        Object.assign(target, { [key]: {} });
@@ -11,9 +11,7 @@ export function generateId(prefix) {

 // Format string
 export function format(input, ...args) {
-  if (is.empty(input)) {
-    return input;
-  }
+  if (is.empty(input)) return input;

  return input.toString().replace(/{(\d+)}/g, (match, i) => args[i].toString());
 }
@@ -27,13 +25,13 @@ export function getPercentage(current, max) {
  return ((current / max) * 100).toFixed(2);
 }

-// Replace all occurances of a string in a string
+// Replace all occurrences of a string in a string
 export const replaceAll = (input = '', find = '', replace = '') =>
  input.replace(new RegExp(find.toString().replace(/([.*+?^=!:${}()|[\]/\\])/g, '\\$1'), 'g'), replace.toString());

 // Convert to title case
 export const toTitleCase = (input = '') =>
-  input.toString().replace(/\w\S*/g, text => text.charAt(0).toUpperCase() + text.substr(1).toLowerCase());
+  input.toString().replace(/\w\S*/g, (text) => text.charAt(0).toUpperCase() + text.slice(1).toLowerCase());

 // Convert string to pascalCase
 export function toPascalCase(input = '') {
@@ -2,9 +2,39 @@
 // Style utils
 // ==========================================================================

+import { closest } from './arrays';
 import is from './is';

-export function validateRatio(input) {
+// Check support for a CSS declaration
+export function supportsCSS(declaration) {
+  if (!window || !window.CSS) {
+    return false;
+  }
+
+  return window.CSS.supports(declaration);
+}
+
+// Standard/common aspect ratios
+const standardRatios = [
+  [1, 1],
+  [4, 3],
+  [3, 4],
+  [5, 4],
+  [4, 5],
+  [3, 2],
+  [2, 3],
+  [16, 10],
+  [10, 16],
+  [16, 9],
+  [9, 16],
+  [21, 9],
+  [9, 21],
+  [32, 9],
+  [9, 32],
+].reduce((out, [x, y]) => ({ ...out, [x / y]: [x, y] }), {});
+
+// Validate an aspect ratio
+export function validateAspectRatio(input) {
  if (!is.array(input) && (!is.string(input) || !input.includes(':'))) {
    return false;
  }
@@ -14,6 +44,7 @@ export function validateRatio(input) {
  return ratio.map(Number).every(is.number);
 }

+// Reduce an aspect ratio to it's lowest form
 export function reduceAspectRatio(ratio) {
  if (!is.array(ratio) || !ratio.every(is.number)) {
    return null;
@@ -26,8 +57,9 @@ export function reduceAspectRatio(ratio) {
  return [width / divider, height / divider];
 }

+// Calculate an aspect ratio
 export function getAspectRatio(input) {
-  const parse = ratio => (validateRatio(ratio) ? ratio.split(':').map(Number) : null);
+  const parse = (ratio) => (validateAspectRatio(ratio) ? ratio.split(':').map(Number) : null);
  // Try provided ratio
  let ratio = parse(input);

@@ -44,10 +76,10 @@ export function getAspectRatio(input) {
  // Get from HTML5 video
  if (ratio === null && this.isHTML5) {
    const { videoWidth, videoHeight } = this.media;
-    ratio = reduceAspectRatio([videoWidth, videoHeight]);
+    ratio = [videoWidth, videoHeight];
  }

-  return ratio;
+  return reduceAspectRatio(ratio);
 }

 // Set aspect ratio for responsive container
@@ -58,22 +90,56 @@ export function setAspectRatio(input) {

  const { wrapper } = this.elements;
  const ratio = getAspectRatio.call(this, input);
-  const [w, h] = is.array(ratio) ? ratio : [0, 0];
-  const padding = (100 / w) * h;

-  wrapper.style.paddingBottom = `${padding}%`;
+  if (!is.array(ratio)) {
+    return {};
+  }
+
+  const [x, y] = reduceAspectRatio(ratio);
+  const useNative = supportsCSS(`aspect-ratio: ${x}/${y}`);
+  const padding = (100 / x) * y;
+
+  if (useNative) {
+    wrapper.style.aspectRatio = `${x}/${y}`;
+  } else {
+    wrapper.style.paddingBottom = `${padding}%`;
+  }

  // For Vimeo we have an extra <div> to hide the standard controls and UI
  if (this.isVimeo && !this.config.vimeo.premium && this.supported.ui) {
    const height = (100 / this.media.offsetWidth) * parseInt(window.getComputedStyle(this.media).paddingBottom, 10);
    const offset = (height - padding) / (height / 50);

-    this.media.style.transform = `translateY(-${offset}%)`;
+    if (this.fullscreen.active) {
+      wrapper.style.paddingBottom = null;
+    } else {
+      this.media.style.transform = `translateY(-${offset}%)`;
+    }
  } else if (this.isHTML5) {
-    wrapper.classList.toggle(this.config.classNames.videoFixedRatio, ratio !== null);
+    wrapper.classList.add(this.config.classNames.videoFixedRatio);
  }

  return { padding, ratio };
 }

-export default { setAspectRatio };
+// Round an aspect ratio to closest standard ratio
+export function roundAspectRatio(x, y, tolerance = 0.05) {
+  const ratio = x / y;
+  const closestRatio = closest(Object.keys(standardRatios), ratio);
+
+  // Check match is within tolerance
+  if (Math.abs(closestRatio - ratio) <= tolerance) {
+    return standardRatios[closestRatio];
+  }
+
+  // No match
+  return [x, y];
+}
+
+// Get the size of the viewport
+// https://stackoverflow.com/questions/1248081/how-to-get-the-browser-viewport-dimensions
+export function getViewportSize() {
+  const width = Math.max(document.documentElement.clientWidth || 0, window.innerWidth || 0);
+  const height = Math.max(document.documentElement.clientHeight || 0, window.innerHeight || 0);
+  return [width, height];
+}
@@ -5,9 +5,9 @@
 import is from './is';

 // Time helpers
-export const getHours = value => Math.trunc((value / 60 / 60) % 60, 10);
-export const getMinutes = value => Math.trunc((value / 60) % 60, 10);
-export const getSeconds = value => Math.trunc(value % 60, 10);
+export const getHours = (value) => Math.trunc((value / 60 / 60) % 60, 10);
+export const getMinutes = (value) => Math.trunc((value / 60) % 60, 10);
+export const getSeconds = (value) => Math.trunc(value % 60, 10);

 // Format time to UI friendly string
 export function formatTime(time = 0, displayHours = false, inverted = false) {
@@ -17,7 +17,7 @@ export function formatTime(time = 0, displayHours = false, inverted = false) {
  }

  // Format time component to add leading zero
-  const format = value => `0${value}`.slice(-2);
+  const format = (value) => `0${value}`.slice(-2);
  // Breakdown to hours, mins, secs
  let hours = getHours(time);
  const mins = getMinutes(time);
@@ -20,7 +20,7 @@ export function parseUrl(input, safe = true) {

  try {
    return new URL(url);
-  } catch (e) {
+  } catch (_) {
    return null;
  }
 }
@@ -5,6 +5,7 @@
 // Base
 .plyr {
  @include plyr-font-smoothing($plyr-font-smoothing);
+
  align-items: center;
  direction: ltr;
  display: flex;
@@ -12,7 +13,6 @@
  font-family: $plyr-font-family;
  font-variant-numeric: tabular-nums; // Force monosace-esque number widths
  font-weight: $plyr-font-weight-regular;
-  height: 100%;
  line-height: $plyr-line-height;
  max-width: 100%;
  min-width: 200px;
@@ -29,7 +29,7 @@

  // Tab focus
  &.plyr__tab-focus {
-    @include plyr-tab-focus();
+    @include plyr-tab-focus;
  }
 }

@@ -56,6 +56,7 @@
 .plyr [data-plyr='fullscreen'] {
  display: none;
 }
+
 .plyr--captions-enabled [data-plyr='captions'],
 .plyr--pip-supported [data-plyr='pip'],
 .plyr--airplay-supported [data-plyr='airplay'],
@@ -10,6 +10,7 @@
  .plyr__control svg {
    transition: transform 0.3s ease;
  }
+
  .plyr__control[aria-expanded='true'] {
    svg {
      transform: rotate(90deg);
@@ -73,10 +74,7 @@
      color: $plyr-menu-color;
      display: flex;
      font-size: $plyr-font-size-menu;
-      padding-bottom: calc(#{$plyr-control-padding} / 1.5);
-      padding-left: calc(#{$plyr-control-padding} * 1.5);
-      padding-right: calc(#{$plyr-control-padding} * 1.5);
-      padding-top: calc(#{$plyr-control-padding} / 1.5);
+      padding: calc(#{$plyr-control-padding} / 1.5) calc(#{$plyr-control-padding} * 1.5);
      user-select: none;
      width: 100%;

@@ -176,6 +174,7 @@
        &::before {
          background: $plyr-control-toggle-checked-background;
        }
+
        &::after {
          opacity: 1;
          transform: translateY(-50%) scale(1);
@@ -3,7 +3,7 @@
 // --------------------------------------------------------------

 .plyr__poster {
-  background-color: #000;
+  background-color: var(--plyr-video-background, $plyr-video-background);
  background-position: 50% 50%;
  background-repeat: no-repeat;
  background-size: contain;
@@ -20,3 +20,8 @@
 .plyr--stopped.plyr__poster-enabled .plyr__poster {
  opacity: 1;
 }
+
+// Allow interaction with YouTube controls while paused
+.plyr--youtube.plyr--paused.plyr__poster-enabled:not(.plyr--stopped) .plyr__poster {
+  display: none;
+}
@@ -24,8 +24,10 @@ $plyr-progress-offset: $plyr-range-thumb-height;

  // Seek tooltip to show time
  .plyr__tooltip {
-    font-size: $plyr-font-size-time;
    left: 0;
+    max-width: 120px;
+    overflow-wrap: break-word;
+    white-space: normal;
  }
 }

@@ -92,3 +94,15 @@ $plyr-progress-offset: $plyr-range-thumb-height;
 .plyr--audio.plyr--loading .plyr__progress__buffer {
  background-color: $plyr-audio-progress-buffered-background;
 }
+
+// Markers
+.plyr__progress__marker {
+  background-color: $plyr-progress-marker-background;
+  border-radius: 1px;
+  height: $plyr-range-track-height;
+  position: absolute;
+  top: 50%;
+  transform: translate(-50%, -50%);
+  width: $plyr-progress-marker-width;
+  z-index: 3;
+}
@@ -3,38 +3,41 @@
 // --------------------------------------------------------------

 .plyr--full-ui input[type='range'] {
-  // WebKit
-  -webkit-appearance: none; /* stylelint-disable-line */
+  appearance: none;
  background: transparent;
  border: 0;
  border-radius: calc(#{$plyr-range-thumb-height} * 2);
+
  // `color` property is used in JS to populate lower fill for WebKit
  color: $plyr-range-fill-background;
  display: block;
  height: calc((#{$plyr-range-thumb-active-shadow-width} * 2) + #{$plyr-range-thumb-height});
  margin: 0;
+  min-width: 0;
  padding: 0;
  transition: box-shadow 0.3s ease;
  width: 100%;

  &::-webkit-slider-runnable-track {
-    @include plyr-range-track();
+    @include plyr-range-track;
+
    background-image: linear-gradient(to right, currentColor var(--value, 0%), transparent var(--value, 0%));
  }

  &::-webkit-slider-thumb {
-    @include plyr-range-thumb();
-    -webkit-appearance: none; /* stylelint-disable-line */
+    @include plyr-range-thumb;
+
+    appearance: none;
    margin-top: calc(((#{$plyr-range-thumb-height} - #{$plyr-range-track-height}) / 2) * -1);
  }

  // Mozilla
  &::-moz-range-track {
-    @include plyr-range-track();
+    @include plyr-range-track;
  }

  &::-moz-range-thumb {
-    @include plyr-range-thumb();
+    @include plyr-range-thumb;
  }

  &::-moz-range-progress {
@@ -45,22 +48,24 @@

  // Microsoft
  &::-ms-track {
-    @include plyr-range-track();
+    @include plyr-range-track;
+
    color: transparent;
  }

  &::-ms-fill-upper {
-    @include plyr-range-track();
+    @include plyr-range-track;
  }

  &::-ms-fill-lower {
-    @include plyr-range-track();
+    @include plyr-range-track;

    background: currentColor;
  }

  &::-ms-thumb {
-    @include plyr-range-thumb();
+    @include plyr-range-thumb;
+
    // For some reason, Edge uses the -webkit margin above
    margin-top: 0;
  }
@@ -70,25 +75,25 @@
  }

  // Focus styles
-  &:focus {
-    outline: 0;
-  }
-
  &::-moz-focus-outer {
    border: 0;
  }

+  &:focus {
+    outline: 0;
+  }
+
  &.plyr__tab-focus {
    &::-webkit-slider-runnable-track {
-      @include plyr-tab-focus();
+      @include plyr-tab-focus;
    }

    &::-moz-range-track {
-      @include plyr-tab-focus();
+      @include plyr-tab-focus;
    }

    &::-ms-track {
-      @include plyr-tab-focus();
+      @include plyr-tab-focus;
    }
  }
 }
@@ -14,7 +14,7 @@
    margin-right: $plyr-control-spacing;
  }

-  @media (max-width: calc(#{$plyr-bp-md} - 1)) {
+  @media (max-width: ($plyr-bp-md - 1px)) {
    display: none;
  }
 }
@@ -1,3 +1,4 @@
+/* stylelint-disable selector-max-compound-selectors */
 // --------------------------------------------------------------
 // Tooltips
 // --------------------------------------------------------------
@@ -1,5 +1,8 @@
 // Downloaded from https://github.com/malyw/css-vars (and modified)

+@use 'sass:list';
+@use 'sass:map';
+
 // global map to be filled via variables
 $css-vars: ();

@@ -21,36 +24,35 @@ $css-vars-use-native: false !default;

 ///
 // Emulates var() CSS native function behavior
-//
 // $args[0] {String} "--" + variable name
 // [$args[1]] Optional default value if variable is not assigned yet
-//
 // E.G.:
 // color: var(--main-color);
 // background: var(--main-background, green);
 ///
@function var($args...) {
  // CHECK PARAMS
-  @if (length($args) ==0) {
+  @if length($args) == 0 {
    @error 'Variable name is expected to be passed to the var() function';
  }
-  @if (str-length(nth($args, 1)) < 2 or str-slice(nth($args, 1), 0, 2) != '--') {
+
+  @if str-length(nth($args, 1)) < 2 or str-slice(nth($args, 1), 0, 2) != '--' {
    @error "Variable name is expected to start from '--'";
  }

  // PROCESS
-  $var-name: nth($args, 1);
-  $var-value: map-get($css-vars, $var-name);
+  $var-name: list.nth($args, 1);
+  $var-value: map.get($css-vars, $var-name);

-  @if ($css-vars-use-native) {
+  @if $css-vars-use-native {
    // CSS variables
    // Native CSS: don't process function in case of native
    @return unquote('var(' + $args + ')');
  } @else {
-    @if ($var-value == null) {
+    @if not $var-value {
      // variable is not provided so far
-      @if (length($args) == 2) {
-        $var-value: nth($args, 2);
+      @if length($args) == 2 {
+        $var-value: list.nth($args, 2);
      }
    }

@@ -60,7 +62,7 @@ $css-vars-use-native: false !default;
 }

 ///
-// SASS mixin to provide variables
+// Sass mixin to provide variables
 // E.G.:
 // @include css-vars((
 //    --color: rebeccapurple,
@@ -70,20 +72,21 @@ $css-vars-use-native: false !default;
 ///
@mixin css-vars($var-map: null) {
  // CHECK PARAMS
-  @if ($var-map == null) {
+  @if not $var-map {
    @error 'Map of variables is expected, instead got: null';
  }
-  @if (type_of($var-map) != map) {
+
+  @if type_of($var-map) != map {
    @error 'Map of variables is expected, instead got another type passed: #{type_of($var, ap)}';
  }

  // PROCESS
-  @if ($css-vars-use-native) {
+  @if $css-vars-use-native {
    // CSS variables
    // Native CSS: assign CSS custom properties to the global scope
    @at-root :root {
      @each $var-name, $var-value in $var-map {
-        @if (type_of($var-value) == string) {
+        @if type_of($var-value) == string {
          #{$var-name}: $var-value; // to prevent quotes interpolation
        } @else {
          #{$var-name}: #{$var-value};
--- a/Show More
+++ b/Show More