chore(release): Bump version for release

1req/s seems to still be too fast, too many 429s returned for this to be correct.

.gitignore

@@ -155,4 +155,8 @@ storybook-static
 *.db
 *.db*
 
-**/lexicons/**/*.json
+**/lexicons/**/*.json
+
+bun.lock
+.DS_Store
+**/.DS_Store

.mocharc.json

@@ -3,6 +3,7 @@
   "extension": "ts",
   "spec": "./src/backend/tests/**/*.test.ts",
   "file": [
+    "./src/backend/tests/utils/mswGlobalServer.ts",
     "./src/backend/tests/setup.ts"
   ],
   "exit": true

.vscode/launch.json

@@ -1,6 +1,24 @@
 {
     "version": "0.2.0",
     "configurations": [
+        {
+            "name": "Debug Zod Conversion",
+            "type": "node",
+            "request": "launch",
+            // Debug app in VSCode
+            "program": "${workspaceFolder}/ts-zod.ts",
+            "args": [
+                "${file}"
+            ],
+            "runtimeExecutable": "node",
+            "console": "integratedTerminal",
+            "internalConsoleOptions": "neverOpen",
+            "skipFiles": [
+                "<node_internals>/**",
+                // Ignore all dependencies (optional)
+                "${workspaceFolder}/node_modules/**",
+            ],
+        },
         {
             "name": "Run Canonical Replace",
             "program": "${workspaceFolder}/docsite/canonical-replace.ts",
@@ -20,7 +38,7 @@
             "request": "launch",
             // Debug app in VSCode
             "program": "${workspaceFolder}/src/backend/index.ts",
-            "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/tsx",
+            "runtimeExecutable": "node",
             "console": "integratedTerminal",
             "internalConsoleOptions": "neverOpen",
             "skipFiles": [
@@ -35,7 +53,7 @@
             "request": "launch",
             // Debug app in VSCode
             "program": "${workspaceFolder}/src/backend/index.ts",
-            "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/tsx",
+            "runtimeExecutable": "node",
             "console": "integratedTerminal",
             "envFile": "${workspaceFolder}/.env",
             "env": {
@@ -48,28 +66,13 @@
                 "${workspaceFolder}/node_modules/**",
             ],
         },
-        {
-            "name": "tsx",
-            "type": "node",
-            "request": "launch",
-            // Debug current file in VSCode
-            "program": "${file}",
-            "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/tsx",
-            "console": "integratedTerminal",
-            "internalConsoleOptions": "neverOpen",
-            "skipFiles": [
-                "<node_internals>/**",
-                // Ignore all dependencies (optional)
-                "${workspaceFolder}/node_modules/**",
-            ],
-        },
         {
             "name": "schema",
             "type": "node",
             "request": "launch",
             // Debug app in VSCode
-            "program": "${workspaceFolder}/src/backend/utils/SchemaStaticUtil.ts",
-            "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/tsx",
+            "program": "${workspaceFolder}/src/backend/utils/SchemaDocsStaticUtils.ts",
+            "runtimeExecutable": "node",
             "console": "integratedTerminal",
             "internalConsoleOptions": "neverOpen",
             "skipFiles": [
@@ -96,7 +99,7 @@
                 "--recursive",
                 "${workspaceFolder}/src/backend/tests/**/*.test.ts"
             ],
-            "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/tsx",
+            "runtimeExecutable": "node",
             "internalConsoleOptions": "openOnSessionStart",
             "name": "Mocha Tests",
             "program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
@@ -120,7 +123,7 @@
                 "--config", "${workspaceRoot}/.mocharc.json",
                 "${file}"
             ],
-            "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/tsx",
+            "runtimeExecutable": "node",
             "internalConsoleOptions": "openOnSessionStart",
             "name": "Mocha Test on File",
             "program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",

.vscode/settings.json

@@ -1,5 +1,4 @@
 {
-    "mochaExplorer.require": "tsx/esm",
     "mochaExplorer.timeout": 1200000,
     "mochaExplorer.exit": true,
     "search.exclude": {

Dockerfile

@@ -56,6 +56,7 @@ RUN npm install -g concurrently
 ARG data_dir=/config
 VOLUME $data_dir
 ENV CONFIG_DIR=$data_dir
+ENV DATA_DIR=$data_dir
 
 COPY docker/root /
 
@@ -114,8 +115,6 @@ ARG APP_BUILD_VERSION
 ENV APP_VERSION=$APP_BUILD_VERSION
 
 RUN npm ci --omit=dev --no-audit \
-    # we used compiled schema json for production so this isn't needed
-    && npm uninstall ts-json-schema-generator \
     && npm cache clean --force \
     && chown -R abc:abc node_modules \
     ## peerDependency of validbot and can(?) be removed for production

README.md

@@ -12,6 +12,7 @@ alt="multi-scrobbler logo" width="180" height="180">
 A dockerized app that monitors your music listening activity from *everywhere* and scrobbles it *anywhere*.
 
 * Supports scrobbling from many [**Sources**](https://docs.multi-scrobbler.app/configuration/sources)
+    * [Apple Music](https://docs.multi-scrobbler.app/configuration/sources/applemusic/?configType=file)
     * [Azuracast](https://docs.multi-scrobbler.app/configuration/sources/azuracast)
     * [Deezer](https://docs.multi-scrobbler.app/configuration/sources/deezer)
     * [Google Cast (Chromecast)](https://docs.multi-scrobbler.app/configuration/sources/google-cast)

config/applemusic.json.example

@@ -0,0 +1,29 @@
+[
+  {
+    "id": "myAppleMusic",
+    "name": "My Apple Music",
+    "enable": true,
+    "clients": [],
+    "data": {
+      // either key or token needs to be provided
+      "key": {
+        "id": "2HPSNJZ88N",
+        "teamId": "SN6YASW8G4",
+        "p8": "-----BEGIN PRIVATE KEY-----\nMIGTAgEAMBMGByqGSM49AgEG...-----END PRIVATE KEY-----"
+      },
+      "token": "your-jwt-token-here",
+      "mediaUserToken": "your-media-user-token-here",
+
+      // optional: Origin header for API requests (required when using a browser token)
+      "origin": "https://music.apple.com",
+
+      // optional: polling interval in seconds (default 60)
+      "interval": 60
+    },
+    "options": {
+      "logDiff": true,
+      "recoverUnchangedTopHistory": true,
+      "normalizeAlbum": true
+    }
+  }
+]

config/config.json.example

@@ -22,7 +22,8 @@
       "type": "spotify",
       "enable": true,
       "clients": ["myConfig"],
-      "name": "mySpotifySource",
+      "name": "Cool Spotify Name",
+      "id": "mySpotifyId",
       "data": {
         "clientId": "a89cba1569901a0671d5a9875fed4be1",
         "clientSecret": "ec42e09d5ae0ee0f0816ca151008412a",
@@ -34,7 +35,8 @@
     {
       "type": "maloja",
       "enable": true,
-      "name": "myConfig",
+      "name": "Foxx Maloja",
+      "id": "myMalojaId",
       "data": {
         "url": "http://localhost:42010",
         "apiKey": "myMalojaKey"

config/listenbrainz.json.example

@@ -7,7 +7,8 @@
     "data": {
       "token": "029b081ba-9156-4pe7-88e5-3be671f5ea2b",
       "username": "FoxxMD",
-      "url": "https://api.listenbrainz.org"
+      "url": "https://api.listenbrainz.org",
+      "contact": "contact@mydomain.com"
     }
   },
   {
@@ -18,7 +19,8 @@
     "data": {
       "token": "029b081ba-9156-4pe7-88e5-3be671f5ea2b",
       "username": "FoxxMD",
-      "url": "https://api.listenbrainz.org"
+      "url": "https://api.listenbrainz.org",
+      "contact": "contact@mydomain.com"
     }
   }
 ]

config/subsonic.json.example

@@ -7,7 +7,8 @@
       "url": "http://localhost:4040/airsonic",
       "user": "yourUser",
       "password": "yourPassword",
-      "usersAllow": ["yourUser"]
+      "usersAllow": ["yourUser"],
+      "detectStaleNowPlayingFromMinutesAgo": true
     }
   }
 ]

docker/root/etc/s6-overlay/s6-rc.d/init-ms-config/run

@@ -1,33 +1,19 @@
 #!/usr/bin/with-contenv bash
 
-# used https://github.com/linuxserver/docker-plex as a template
-
-POPULATE_EXAMPLES=false
-
 echo "-------------------------------------"
-echo -e "Setting up multi-scrobbler config directory based on CONFIG_DIR env: ${CONFIG_DIR}\n"
+echo -e "Verifying multi-scrobbler directory permissions based on CONFIG_DIR env: ${CONFIG_DIR} and DATA_DIR env: ${DATA_DIR}\n"
 
-# make config folder if it does not exist
-if [ ! -d "${CONFIG_DIR}" ]; then
-  echo "Directory does not exist! Creating..."
-  POPULATE_EXAMPLES=true
-  mkdir -p "${CONFIG_DIR}"
-else
-  if [ "$(ls -A ${CONFIG_DIR})" ]; then
-       echo "Directory is not empty, not creating examples."
-    else
-      POPULATE_EXAMPLES=true
-    fi
+if [ -d "${CONFIG_DIR}" ]; then
+  echo "chown'ing config directory to ensure correct permissions."
+  chown -R abc:abc "${CONFIG_DIR}"
+  echo "Done!"
 fi
 
-# add example configs
-if [ "$POPULATE_EXAMPLES" = true ]; then
-  echo "Directory is empty, adding examples..."
-  cp -r /app/config/. "${CONFIG_DIR}"/
+if [ -d "${DATA_DIR}" ]; then
+  echo "chown'ing data directory to ensure correct permissions."
+  chown -R abc:abc "${DATA_DIR}"
+  echo "Done!"
 fi
 
-# permissions
-echo "chown'ing directory to ensure correct permissions."
-chown -R abc:abc "${CONFIG_DIR}"
 echo "Done!"
 echo -e "-------------------------------------\n"

docsite/.gitignore

@@ -18,4 +18,7 @@
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
-lib
+lib
+
+docs/api/
+static/openapi.json

docsite/docs/configuration/clients/_env_configs/_discord.md

@@ -0,0 +1,12 @@
+| Environmental Variable             | Type                       | Default               | Description                             |
+| ---------------------------------- | -------------------------- | --------------------- | --------------------------------------- |
+| _**`DISCORD_ID`**_                 | string                     |                       | A globally unique ID EX `myComponentId` |
+| `DISCORD_NAME`                     | string                     | Value of `DISCORD_ID` | A vanity name EX `My Cool Component`    |
+| `DISCORD_ENABLE`                   | boolean                    | true                  | Should this component be used?          |
+| `DISCORD_TOKEN`                    | string                     |                       |                                         |
+| `DISCORD_ARTWORK`                  | boolean OR string OR array |                       |                                         |
+| `DISCORD_APPLICATION_ID`           | string                     |                       |                                         |
+| `DISCORD_IPC_LOCATIONS`            | string                     |                       |                                         |
+| `DISCORD_ARTWORK_DEFAULT_URL`      | string                     |                       |                                         |
+| `DISCORD_STATUS_OVERRIDE_ALLOW`    | string                     |                       |                                         |
+| `DISCORD_LISTENING_ACTIVITY_ALLOW` | string                     |                       |                                         |

docsite/docs/configuration/clients/_env_configs/_koito.md

@@ -0,0 +1,8 @@
+| Environmental Variable | Type    | Default             | Description                             |
+| ---------------------- | ------- | ------------------- | --------------------------------------- |
+| _**`KOITO_ID`**_       | string  |                     | A globally unique ID EX `myComponentId` |
+| `KOITO_NAME`           | string  | Value of `KOITO_ID` | A vanity name EX `My Cool Component`    |
+| `KOITO_ENABLE`         | boolean | true                | Should this component be used?          |
+| _**`KOITO_URL`**_      | string  |                     | URL for the Koito server                |
+| _**`KOITO_TOKEN`**_    | string  |                     | User token for the user to scrobble for |
+| _**`KOITO_USER`**_     | string  |                     | Username of the user to scrobble for    |

docsite/docs/configuration/clients/_env_configs/_lastfm.md

@@ -0,0 +1,9 @@
+| Environmental Variable | Type    | Default                               | Description                                             |
+| ---------------------- | ------- | ------------------------------------- | ------------------------------------------------------- |
+| _**`LASTFM_ID`**_      | string  |                                       | A globally unique ID EX `myComponentId`                 |
+| `LASTFM_NAME`          | string  | Value of `LASTFM_ID`                  | A vanity name EX `My Cool Component`                    |
+| `LASTFM_ENABLE`        | boolean | true                                  | Should this component be used?                          |
+| _**`LASTFM_API_KEY`**_ | string  |                                       | API Key generated from Last.fm/Libre.fm account         |
+| _**`LASTFM_SECRET`**_  | string  |                                       | Secret generated from Last.fm/Libre.fm account          |
+| `LASTFM_REDIRECT_URI`  | string  | http://localhost:9078/lastfm/callback | Optional URI to use for callback.                       |
+| `LASTFM_SESSION`       | string  |                                       | Optional session id returned from a completed auth flow |

docsite/docs/configuration/clients/_env_configs/_librefm.md

@@ -0,0 +1,10 @@
+| Environmental Variable | Type    | Default                                | Description                                                    |
+| ---------------------- | ------- | -------------------------------------- | -------------------------------------------------------------- |
+| _**`LIBREFM_ID`**_     | string  |                                        | A globally unique ID EX `myComponentId`                        |
+| `LIBREFM_NAME`         | string  | Value of `LIBREFM_ID`                  | A vanity name EX `My Cool Component`                           |
+| `LIBREFM_ENABLE`       | boolean | true                                   | Should this component be used?                                 |
+| `LIBREFM_API_KEY`      | string  |                                        | Optional Secret for Libre.fm account                           |
+| `LIBREFM_SECRET`       | string  |                                        | Optional Secret for Libre.fm account                           |
+| `LIBREFM_REDIRECT_URI` | string  | http://localhost:9078/librefm/callback | Optional URI to use for callback.                              |
+| `LIBREFM_SESSION`      | string  |                                        | Optional session id returned from a completed auth flow        |
+| `LIBREFM_URLBASE`      | string  | https://libre.fm/2.0/                  | (Optional) The host and path prefix for your Libre.fm instance |

docsite/docs/configuration/clients/_env_configs/_listenbrainz.md

@@ -0,0 +1,9 @@
+| Environmental Variable | Type    | Default                       | Description                                                                                                                   |
+| ---------------------- | ------- | ----------------------------- | ----------------------------------------------------------------------------------------------------------------------------- |
+| _**`LZ_ID`**_          | string  |                               | A globally unique ID EX `myComponentId`                                                                                       |
+| `LZ_NAME`              | string  | Value of `LZ_ID`              | A vanity name EX `My Cool Component`                                                                                          |
+| `LZ_ENABLE`            | boolean | true                          | Should this component be used?                                                                                                |
+| `LZ_URL`               | string  | https://api.listenbrainz.org/ | URL for the ListenBrainz server, if not using the default                                                                     |
+| _**`LZ_TOKEN`**_       | string  |                               | User token for the user to scrobble for                                                                                       |
+| _**`LZ_USER`**_        | string  |                               | Username of the user to scrobble for                                                                                          |
+| `LZ_CONTACT`           | string  |                               | A website or email Listenbrainz can contact you at in case of issues. **This will become a required property in the future.** |

docsite/docs/configuration/clients/_env_configs/_maloja.md

@@ -0,0 +1,7 @@
+| Environmental Variable | Type    | Default              | Description                             |
+| ---------------------- | ------- | -------------------- | --------------------------------------- |
+| _**`MALOJA_ID`**_      | string  |                      | A globally unique ID EX `myComponentId` |
+| `MALOJA_NAME`          | string  | Value of `MALOJA_ID` | A vanity name EX `My Cool Component`    |
+| `MALOJA_ENABLE`        | boolean | true                 | Should this component be used?          |
+| _**`MALOJA_URL`**_     | string  |                      | URL for maloja server                   |
+| _**`MALOJA_API_KEY`**_ | string  |                      | API Key for Maloja server               |

docsite/docs/configuration/clients/_env_configs/_rocksky.md

@@ -0,0 +1,8 @@
+| Environmental Variable | Type    | Default               | Description                                                                                                                                      |
+| ---------------------- | ------- | --------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------ |
+| _**`ROCKSKY_ID`**_     | string  |                       | A globally unique ID EX `myComponentId`                                                                                                          |
+| `ROCKSKY_NAME`         | string  | Value of `ROCKSKY_ID` | A vanity name EX `My Cool Component`                                                                                                             |
+| `ROCKSKY_ENABLE`       | boolean | true                  | Should this component be used?                                                                                                                   |
+| `ROCKSKY_KEY`          | string  |                       | API Key generated from [API Applications](https://docs.rocksky.app/migrating-from-listenbrainz-to-rocksky-1040189m0) in Rocksky for your account |
+| `ROCKSKY_TOKEN`        | string  |                       | Access Token generated from https://rocksky.app/access-tokens in Rocksky for your account                                                        |
+| _**`ROCKSKY_HANDLE`**_ | string  |                       | The **fully-qualified** handle for your ATPRoto/Bluesky account                                                                                  |

docsite/docs/configuration/clients/_env_configs/_tealfm.md

@@ -0,0 +1,7 @@
+| Environmental Variable    | Type    | Default              | Description                                                                                   |
+| ------------------------- | ------- | -------------------- | --------------------------------------------------------------------------------------------- |
+| _**`TEALFM_ID`**_         | string  |                      | A globally unique ID EX `myComponentId`                                                       |
+| `TEALFM_NAME`             | string  | Value of `TEALFM_ID` | A vanity name EX `My Cool Component`                                                          |
+| `TEALFM_ENABLE`           | boolean | true                 | Should this component be used?                                                                |
+| _**`TEALFM_IDENTIFIER`**_ | string  |                      | Identify the account to login as                                                              |
+| _**`TEALFM_APP_PW`**_     | string  |                      | The [App Password](https://atproto.com/specs/xrpc#app-passwords) you created for your account |

docsite/docs/configuration/clients/clients.mdx

@@ -17,10 +17,10 @@ A **Client** is an application that stores the historical information about what
 | [Last.fm](/configuration/clients/lastfm)            | ✅          |
 | [Libre.fm](/configuration/clients/librefm)          | ✅          |
 | [Listenbrainz](/configuration/clients/listenbrainz) | ✅          |
-| [Koito](/configuration/clients/koito)               | ❌          |
+| [Koito](/configuration/clients/koito)               | ✅          |
 | [Maloja](/configuration/clients/maloja)             | ❌          |
 | [Rocksky](/configuration/clients/rocksky)           | ❌          |
-| [Teal.fm](/configuration/clients/tealfm)            | ❌          |
+| [Teal.fm](/configuration/clients/tealfm)            | ✅          |
 
 ## Features
 

docsite/docs/configuration/clients/discord/discord-app.mdx

@@ -557,10 +557,12 @@ Remember, this URL need to be accessible on the public internet.
 ## Configuration
 
 <Config config="DiscordClientConfig" fileContent={JsonConfig} client name="discord">
-        | Environmental Variable        | Required? | Default | Description                                                                                                      |
-        | :---------------------------- | --------- | ------- | :--------------------------------------------------------------------------------------------------------------- |
-        | `DISCORD_APPLICATION_ID`      | Yes       |         | Application ID                                                                                                   |
-        | `DISCORD_IPC_LOCATIONS`       | No        |         | A commera-separated list of `host:port` network locations or file paths to unix socket for Discord               |
-        | `DISCORD_ARTWORK`             | No        |         | A boolean indicating if external artwork URLs should be used. Or a comma-separated list of allowed domains       |
-        | `DISCORD_ARTWORK_DEFAULT_URL` | No        |         | A URL of an image to use as a fallback if the album art URL cannot be used. Or `false` to use discord's default. |
+        | Environmental Variable         | Type              | Default               | Description                                                                                                      |
+        | :----------------------------- | ----------------- | --------------------- | :--------------------------------------------------------------------------------------------------------------- |
+        | _**`DISCORD_ID`**_             | string            |                       | A globally unique ID EX `myComponentId`                                                                          |
+        | `DISCORD_NAME`                 | string            | Value of `DISCORD_ID` | A vanity name EX `My Cool Component`                                                                             |
+        | _**`DISCORD_APPLICATION_ID`**_ | string            |                       | Application ID                                                                                                   |
+        | `DISCORD_IPC_LOCATIONS`        | string            |                       | A commera-separated list of `host:port` network locations or file paths to unix socket for Discord               |
+        | `DISCORD_ARTWORK`              | boolean           |                       | A boolean indicating if external artwork URLs should be used. Or a comma-separated list of allowed domains       |
+        | `DISCORD_ARTWORK_DEFAULT_URL`  | string or boolean |                       | A URL of an image to use as a fallback if the album art URL cannot be used. Or `false` to use discord's default. |
 </Config>

docsite/docs/configuration/clients/discord/discord-headless.mdx

@@ -323,12 +323,14 @@ The order in which multi-scrobbler determines what image to use is the same as t
 ## Configuration
 
 <Config config="DiscordClientConfig" fileContent={JsonConfig} client name="discord">
-        | Environmental Variable             | Required? | Default           | Description                                                                                                       |
-        | :--------------------------------- | --------- | ----------------- | :---------------------------------------------------------------------------------------------------------------- |
-        | `DISCORD_TOKEN`                    | Yes       |                   | User Token acquired from an active Discord sessions                                                               |
-        | `DISCORD_APPLICATION_ID`           | No        |                   | Application ID used to display album art                                                                          |
-        | `DISCORD_ARTWORK`                  | No        |                   | A boolean indicating if external artwork URLs should be used. Or a comma-separated list of allowed domains        |
-        | `DISCORD_ARTWORK_DEFAULT_URL`      | No        |                   | A URL of an image to use as a fallback if the album art URL cannot be used. Or `false` to use discord's default.  |
-        | `DISCORD_STATUS_OVERRIDE_ALLOW`    | No        | `online,idle,dnd` | A comma-separated list of statuses are allowed to have presence.                                                  |
-        | `DISCORD_LISTENING_ACTIVITY_ALLOW` | No        |                   | A commera-seperated list of listening activity names MS **is allowed** to broadcast presence at the same time as. |
+        | Environmental Variable             | Type              | Default               | Description                                                                                                       |
+        | :--------------------------------- | ----------------- | --------------------- | :---------------------------------------------------------------------------------------------------------------- |
+        | _**`DISCORD_ID`**_                 | string            |                       | A globally unique ID EX `myComponentId`                                                                           |
+        | `DISCORD_NAME`                     | string            | Value of `DISCORD_ID` | A vanity name EX `My Cool Component`                                                                              |
+        | _**`DISCORD_TOKEN`**_              | string            |                       | User Token acquired from an active Discord sessions                                                               |
+        | `DISCORD_APPLICATION_ID`           | string            |                       | Application ID used to display album art                                                                          |
+        | `DISCORD_ARTWORK`                  | boolean           |                       | A boolean indicating if external artwork URLs should be used. Or a comma-separated list of allowed domains        |
+        | `DISCORD_ARTWORK_DEFAULT_URL`      | string or boolean |                       | A URL of an image to use as a fallback if the album art URL cannot be used. Or `false` to use discord's default.  |
+        | `DISCORD_STATUS_OVERRIDE_ALLOW`    | string            | `online,idle,dnd`     | A comma-separated list of statuses are allowed to have presence.                                                  |
+        | `DISCORD_LISTENING_ACTIVITY_ALLOW` | string            |                       | A commera-seperated list of listening activity names MS **is allowed** to broadcast presence at the same time as. |
 </Config>

docsite/docs/configuration/clients/koito.mdx

@@ -8,6 +8,7 @@ import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 import CodeBlock from '@theme/CodeBlock';
 import JsonConfig from '!!raw-loader!@site/../config/koito.json.example';
+import ENVConfig from "@site/docs/configuration/clients/_env_configs/_koito.md"
 
 :::tip[Other Uses]
 
@@ -51,12 +52,6 @@ For Koito versions `<=0.1.7`, you must have the environment variable `KOITO_ALLO
 
 ## Configuration
 
-<Config config="KoitoClientConfig" fileContent={JsonConfig} client name="koito">
-        | Environmental Variable | Required? | Default | Description                       |
-        | :--------------------- | --------- | ------- | --------------------------------- |
-        | `KOITO_ID`             | Yes       |         | A unique id                       |
-        | `KOITO_TOKEN`          | Yes       |         | API Key from your Koito Account   |
-        | `KOITO_USER`           | Yes       |         | Your Koito username               |
-        | `KOITO_URL`            | No        |         | The base URL for the Koito server |
-        | `KOITO_NAME`           | No        |         | A vanity name, different than ID  |
+<Config config="KoitoClientConfig" fileContent={JsonConfig} client ambiguous name="koito">
+<ENVConfig/>
 </Config>

docsite/docs/configuration/clients/lastfm.mdx

@@ -8,6 +8,7 @@ import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 import CodeBlock from '@theme/CodeBlock';
 import JsonConfig from '!!raw-loader!@site/../config/lastfm.json.example';
+import ENVConfig from "@site/docs/configuration/clients/_env_configs/_lastfm.md"
 
 :::tip[Other Users]
 
@@ -62,13 +63,6 @@ The Redirect URL can be explicitly specified in the configuration below, or by u
 
 ## Configuration
 
-<Config config="LastfmClientConfig" fileContent={JsonConfig} client name="lastfm">
-        | Environmental Variable | Required? | Default                                 | Description                                                                   |
-        | ---------------------- | --------- | --------------------------------------- | ----------------------------------------------------------------------------- |
-        | `LASTFM_ID`            | Yes       |                                         | A unique id                                                                   |
-        | `LASTFM_API_KEY`       | Yes       |                                         | Api Key from your API Account                                                 |
-        | `LASTFM_SECRET`        | Yes       |                                         | Shared secret from your API Account                                           |
-        | `LASTFM_REDIRECT_URI`  | No        | `http://localhost:9078/lastfm/callback` | Url to use for authentication. Must include `lastfm/callback` somewhere in it |
-        | `LASTFM_SESSION`       | No        |                                         | Session id. Will be generated by authentication flow if not provided.         |
-        | `LASTFM_NAME`          | No        |                                         | A vanity name, different than ID                                              |
+<Config config="LastfmClientConfig" fileContent={JsonConfig} client ambiguous name="lastfm">
+<ENVConfig/>
 </Config>

docsite/docs/configuration/clients/librefm.mdx

@@ -8,6 +8,7 @@ import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 import CodeBlock from '@theme/CodeBlock';
 import JsonConfig from '!!raw-loader!@site/../config/librefm.json.example';
+import ENVConfig from "@site/docs/configuration/clients/_env_configs/_librefm.md"
 
 :::tip[Other Users]
 
@@ -15,9 +16,9 @@ import JsonConfig from '!!raw-loader!@site/../config/librefm.json.example';
 
 :::
 
-To use the official [Libre.fm](https://libre.fm/) instance you will need an account. Or, you can run your own Libre.fm instance [using the legacy source code](https://github.com/foocorp/gnu-fm).
+To use the official [Libre.fm](https://libre.fm/) website you will need an account. Or, you can run your own GNU FM instance [using the source code](https://github.com/foocorp/gnu-fm).
 
-No API account, [API Key, or Secret](https://github.com/libre-fm/developer/wiki/Libre.fm-fundamentals#api-keys) is needed to use the Libre.fm API. Instead, use **any values** for API Key/Secret in the configuration. Authentication is done by allowing access from your account on redirect.
+No API account, [API Key, or Secret](https://github.com/libre-fm/developer/wiki/Libre.fm-fundamentals#api-keys) is currently needed to use the Libre.fm API. Instead, use **any values** for API Key/Secret in the configuration. Authentication is done by allowing access from your account on redirect.
 
 ### Callback/Redirect URL
 
@@ -53,15 +54,6 @@ https://my.cool.libre.com/2.0/
 
 ## Configuration
 
-<Config config="LibrefmClientConfig" fileContent={JsonConfig} client name="librefm">
-        | Environmental Variable | Required? | Default                                  | Description                                                                                      |
-        | ---------------------- | --------- | ---------------------------------------- | ------------------------------------------------------------------------------------------------ |
-        | `LIBREFM_ID`           | Yes       |                                          | A unique ID                                                                                      |
-        | `LIBREFM_ENABLE`       | No        |                                          | Set to `true` to enable Libre.fm, if not using any of the below variables                        |
-        | `LIBREFM_API_KEY`      | No        | `anything`                               | Optional API Key                                                                                 |
-        | `LIBREFM_SECRET`       | No        | `anything`                               | Optional shared secret                                                                           |
-        | `LIBREFM_REDIRECT_URI` | No        | `http://localhost:9078/librefm/callback` | Url to use for authentication. Must include `librefm/callback` somewhere in it                   |
-        | `LIBREFM_SESSION`      | No        |                                          | Session id. Will be generated by authentication flow if not provided.                            |
-        | `LIBREFM_URLBASE`      | No        |                                          | Use for custom Libre.fm instance only. The host + path prefix EX `https://my.libre.example/2.0/` |
-        | `LIBREFM_NAME`         | No        |                                          | A vanity name different than ID                                                                  |
-</Config>
+<Config config="LibrefmClientConfig" fileContent={JsonConfig} client ambiguous name="librefm">
+<ENVConfig/>
+</Config>

docsite/docs/configuration/clients/listenbrainz.mdx

@@ -8,6 +8,7 @@ import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 import CodeBlock from '@theme/CodeBlock';
 import JsonConfig from '!!raw-loader!@site/../config/listenbrainz.json.example';
+import ENVConfig from "@site/docs/configuration/clients/_env_configs/_listenbrainz.md"
 
 :::tip[Other Users]
 
@@ -20,14 +21,20 @@ You will need to run your own Listenbrainz server or have an account [on the off
 
 On your [profile page](https://listenbrainz.org/profile/) find your **User Token** to use in the configuration.
 
+:::important[Contact]
+
+It is **strongly recommended** to include `contact` (File/AIO) or `LZ_CONTACT` (ENV) property in your configuration.
+
+This is a [new requirement from Listenbrainz](https://listenbrainz.readthedocs.io/en/latest/users/api/index.html#id5) to help with bot/spam prevention.
+
+**Your traffic to Listenbrainz is more likely to be blocked if this point of contact is not included!**
+
+It is currently optional due to backwards compatibility but will likely become mandatory for Multi-Scrobbler config in the future.
+
+:::
+
 ## Configuration
 
-<Config config="ListenBrainzClientConfig" fileContent={JsonConfig} client name="listenbrainz">
-        | Environmental Variable | Required? | Default                       | Description                     |
-        | ---------------------- | --------- | ----------------------------- | ------------------------------- |
-        | `LZE_ID`               | Yes       |                               | A unique ID                     |
-        | `LZ_TOKEN`             | Yes       |                               | User token from your LZ profile |
-        | `LZ_USER`              | Yes       |                               | Your LZ username                |
-        | `LZ_URL`               | No        | https://api.listenbrainz.org/ | The base URL for the LZ server  |
-        | `LZ_NAME`              | No        |                               | A vanity name different than ID |
+<Config config="ListenBrainzClientConfig" fileContent={JsonConfig} client ambiguous name="listenbrainz">
+<ENVConfig/>
 </Config>

docsite/docs/configuration/clients/maloja.mdx

@@ -8,6 +8,7 @@ import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 import CodeBlock from '@theme/CodeBlock';
 import JsonConfig from '!!raw-loader!@site/../config/maloja.json.example';
+import ENVConfig from "@site/docs/configuration/clients/_env_configs/_maloja.md"
 
 Setup a [Maloja server](https://github.com/krateng/maloja?tab=readme-ov-file#how-to-install) if you have not already done this.
 
@@ -37,11 +38,6 @@ Finally, add the Maloja server URL and API Key to the configuration type you cho
 
 ## Configuration
 
-<Config config="MalojaClientConfig" fileContent={JsonConfig} client name="maloja">
-        | Environmental Variable | Required? | Default | Description                     |
-        | ---------------------- | --------- | ------- | ------------------------------- |
-        | `MALOJA_ID`            | Yes       |         | A unique ID                     |
-        | `MALOJA_URL`           | Yes       |         | Base URL of your installation   |
-        | `MALOJA_API_KEY`       | Yes       |         | Api Key                         |
-        | `MALOJA_NAME`          | No        |         | A vanity name different than ID |
+<Config config="MalojaClientConfig" fileContent={JsonConfig} client ambiguous name="maloja">
+<ENVConfig/>
 </Config>

docsite/docs/configuration/clients/rocksky.mdx

@@ -6,6 +6,7 @@ toc_max_heading_level: 5
 
 import Bluesky from "@site/src/components/snippets/_bluesky.mdx";
 import JsonConfig from '!!raw-loader!@site/../config/rocksky.json.example';
+import ENVConfig from "@site/docs/configuration/clients/_env_configs/_rocksky.md"
 
 :::tip[Other Uses]
 
@@ -25,7 +26,7 @@ To monitor and re-scrobble activity **from** Rocksky create a [Rocksky (Source)]
 
 <DetailsAdmo type="important" summary="Your Data Is Public">
 
-The default Bluesky PDS is **public**, meaning your scrobbles are also public (read-only). This isn't any different than using Last.fm or Listenbrainz, in terms of privacy.
+Atproto PDS access is **public**, meaning your scrobbles are also public (read-only). This isn't any different than using Last.fm or Listenbrainz, in terms of privacy.
 
 </DetailsAdmo>
 
@@ -75,11 +76,6 @@ Keys are now **deprecated** and functionality for them will be removed in a futu
 
 </DetailsAdmo>
 
-<Config config="RockSkyClientConfig" fileContent={JsonConfig} client name="rocksky">
-        | Environmental Variable | Required? | Default | Description                                                                         |
-        | :--------------------- | --------- | ------- | ----------------------------------------------------------------------------------- |
-        | `ROCKSKY_ID`           | Yes       |         | A unique ID used in MS                                                              |
-        | `ROCKSKY_HANDLE`       | Yes       |         | Your **full** ATProto handle. For Bluesky account this is like `myUser.bsky.social` |
-        | `ROCKSKY_TOKEN`        | Yes       |         | Access Token obtained from Rocksky                                                  |
-        | `ROCKSKY_NAME`         | No        |         | A vanity name different than ID                                                     |
+<Config config="RockSkyClientConfig" fileContent={JsonConfig} client ambiguous name="rocksky">
+<ENVConfig/>
 </Config>

docsite/docs/configuration/clients/tealfm.mdx

@@ -9,6 +9,7 @@ import TabItem from '@theme/TabItem';
 import CodeBlock from '@theme/CodeBlock';
 import JsonConfig from '!!raw-loader!@site/../config/tealfm.json.example';
 import Bluesky from "@site/src/components/snippets/_bluesky.mdx";
+import ENVConfig from "@site/docs/configuration/clients/_env_configs/_tealfm.md"
 
 :::tip[Other Uses]
 
@@ -28,7 +29,7 @@ To monitor and re-scrobble activity from a ATProto Profile create a [teal.fm (So
 
 <DetailsAdmo type="warning" summary="Your Data Is Public">
 
-The default Bluesky PDS is **public**, meaning your scrobbles are also public (read-only). This isn't any different than using Last.fm or Listenbrainz, in terms of privacy.
+Atproto PDS access is **public**, meaning your scrobbles are also public (read-only). This isn't any different than using Last.fm or Listenbrainz, in terms of privacy.
 
 </DetailsAdmo>
 
@@ -38,7 +39,6 @@ The default Bluesky PDS is **public**, meaning your scrobbles are also public (r
 
 To view your teal.fm scrobble data you can:
 
-* use [teal-relay-production.up.railway.app](https://teal-relay-production.up.railway.app) or [teal-slice.wisp.place](https://tealfm-slice.wisp.place/) for a preview of teal.fm
 * use [yearinmusic.teal.fm](https://yearinmusic.teal.fm) or [wrapped.baileytownsend.dev](https://wrapped.baileytownsend.dev/) for wrapped-style stats of your teal.fm scrobbles
 * use [atproto.at](https://atproto.at) to view the raw data (convenience URLs are generated in multi-scrobbler, per scrobble, for you to do this)
 
@@ -77,11 +77,6 @@ If using a handle:
 
 If your identifier does not look like a DID and does not include a TLD then multi-scrobbler will automatically append `.bsky.social` to your handle value.
 
-<Config config="TealClientConfig" fileContent={JsonConfig} client name="tealfm">
-        | Environmental Variable | Required? | Default | Description                                                                                |
-        | :--------------------- | --------- | ------- | ------------------------------------------------------------------------------------------ |
-        | `TEAMFM_ID`            | Yes       |         | A unique ID                                                                                |
-        | `TEALFM_IDENTIFIER`    | Yes       |         | Your **full** ATProto handle or DID. For Bluesky account this is like `myUser.bsky.social` |
-        | `TEALFM_APP_PW`        | Yes       |         | Bluesky/ATProto network App Password                                                       |
-        | `TEALFM_NAME`          | No        |         | A vanity name different than ID                                                            |
+<Config config="TealClientConfig" fileContent={JsonConfig} client ambiguous name="tealfm">
+<ENVConfig/>
 </Config>

docsite/docs/configuration/configuration.mdx

@@ -13,7 +13,7 @@ import FileExample from "../../src/components/FileExample";
 import ScrobbleThreshold from "@site/src/components/snippets/_scrobble-threshold.mdx"
 
 import AIOConfig from '!!raw-loader!../../../config/config.json.example';
-import SpotifyConfig from '!!raw-loader!../../../config/spotify.json.example';
+import SingleConfig from '!!raw-loader!../../../config/jellyfin.json.example';
 
 :::tip
 
@@ -29,40 +29,35 @@ Check the [**FAQ**](../FAQ.md) if you have any issues after configuration!
 * client/source specific json config files
 * an all-in-one json config file
 
-**MS will parse configuration from all configuration types.** You can mix and match configurations but it is generally better to stick to one or the other.
+**MS will parse configuration from all configuration types.** You can mix and match configurations but it is generally better to stick to one type.
 
 <Tabs groupId="configType" queryString>
     <TabItem value="env" label="ENV">
-        MS will parse environmental variables present in the OS/container when it is run. **This method means MS does not require files to run.**
+        MS will parse environmental variables present in the OS/container when it is run.
+        
+        This method means MS **does not require config files** but it will still create and use data files in the [local](/installation/#config-and-data-directories) or [docker](/installation/?dockerSetting=storage#recommended-settings) data directory.
 
         <details>
           <summary>Use ENV-based configuration if...</summary>
 
-          * You are the only person for whom MS is scrobbling for
-          * You have a very simple setup for MS such as one scrobble [Client](/configuration/clients) and one [Source](/configuration/sources) IE Plex -> Maloja
+          * You are the only person for whom MS is scrobbling for or
+          * You have a very simple setup for MS such as one scrobble [Client](/configuration/clients) and one [Source](/configuration/sources) IE Jellyfin -> Koito, or
+          * You are not comfortable editing JSON files
 
         </details>
 
         <details>
           <summary>Config Example</summary>
 
-          For Docker container...
-
-          ```shell
-          docker run -e "SPOTIFY_CLIENT_ID=yourId" -e "SPOTIFY_CLIENT_SECRET=yourSecret" ...
-          ```
-
-          For Docker Compose
-
           ```yaml title="docker-compose.yml"
           services:
               multi-scrobbler:
                   image: foxxmd/multi-scrobbler
                   environment:
-                      - SPOTIFY_CLIENT_ID=yourId
-                      - SPOTIFY_CLIENT_SECRET=yourSecret
-                      - MALOJA_URL=http://domain.tld:42010
-                      - MALOJA_API_KEY=1234
+                      - JELLYFIN_URL=192.168.0.110:8096
+                      - JELLYFIN_APIKEY=c9fae8756fbf481ebd9c5bb56b
+                      - JELLYFIN_USER=MyUser
+                      - JELLYFIN_ID=myJellyin
                       # ...
                   # ...
           ```
@@ -77,77 +72,114 @@ Check the [**FAQ**](../FAQ.md) if you have any issues after configuration!
     <TabItem value="file" label="File">
         MS will parse configuration files located in the directory specified by the `CONFIG_DIR` environmental variable. This variable defaults to:
 
-        * Local installation -> `PROJECT_DIR/config`
-        * Docker -> `/config` (in the container) -- see the [install docs](../installation/installation.mdx#docker) for how to configure this correctly
+        * Local installation -> See [Config and Data Directories](/installation/#config-and-data-directories)
+        * Docker -> `/config` (in the container) -- see the [**Storage** tab in the Docker installation docs](/installation/?dockerSetting=storage#recommended-settings) for how to configure this correctly
 
         <details>
 
             <summary>Use File-based configuration if...</summary>
 
-            * You have many [Sources](/configuration/sources)
-            * You have many of each type of **Source** you want to scrobble from IE 2x Plex accounts, 3x Spotify accounts, 1x
-            Funkwhale...
-            * You have more than one scrobble **Client** you want to scrobble to IE multiple Maloja servers
-            * You want only to scrobble to specific **Clients**
+            * You are comfortable editing JSON files
+            * You have more than one of the same type of **Source/Client** you want to use EX 2x Last.fm accounts, 3x Jellyfin accounts
+            * You want activity from specific **Sources** to scrobble to specific **Clients**
             * You need to setup more advanced configuration for a Source/Client
-              * Most Source/Clients only support basic configuration through ENV, all configuration is possible using File/AIO
+              * Most Source/Clients only support basic configuration through ENV, more configuration is possible using File. AIO enables complete configuration.
 
         </details>
 
         :::tip
             * There are **example configurations** for all Source/Client types and AIO config located in the [`/config`](https://github.com/FoxxMD/multi-scrobbler/tree/master/config) directory of this project. These can be used as-is by renaming them to `.json`.
-            * For docker installations these examples are copied to your configuration directory on first-time use.
+              * These are the same examples you will find in the **Configuration** section of each Source/Client
             * There is also a [**kitchensink example**](/configuration/kitchensink) that provides examples of using all sources/clients in a complex configuration.
         :::
 
-        Each file is named by the **type** of the Client/Source found in below sections. Each file as an **array** of that type of Client/Source.
+        Each config file is named after the **type** of the Client/Source. Within each file, a JSON **array** defines all of the instances for that type of Client/Source.
 
         Example directory structure:
 
         ```
         /CONFIG_DIR
-            plex.json
-            spotify.json
-            maloja.json
+            jellyfin.json
+            lastfm.json
+            koito.json
         ```
 
         <details>
             <summary>Config Example</summary>
 
-            <CodeBlock title="CONFIG_DIR/spotify.json" language="json5">{SpotifyConfig}</CodeBlock>
+            ```yaml title="jellyfin.json"
+            [
+              {
+                "name": "Foxx JF Server",
+                "id": "foxxJf",
+                "data": {
+                  "url": "http://localhost:8096",
+                  "user": "FoxxMD",
+                  "apiKey": "c9fae8756fbf481ebd9c5bb56bd6540c"
+                }
+              }
+            ]
+            ```
 
         </details>
+        <details>
+            <summary>Multiple of Same Config Example</summary>
+
+            ```yaml title="jellyfin.json"
+            [
+              {
+                "name": "Foxx JF Server",
+                "id": "foxxJf",
+                "data": {
+                  "url": "http://localhost:8096",
+                  "user": "FoxxMD",
+                  "apiKey": "c9fae8756fbf481ebd9c5bb56bd6540c"
+                }
+              },
+              // highlight-start
+              {
+                "name": "Foo's JF Server",
+                "id": "fooJf",
+                "data": {
+                  "url": "http://192.168.0.150:8096",
+                  "user": "foo",
+                  "apiKey": "9c5bb56bd6540c756fbf481ebd9c5c40"
+                }
+              }
+              // highlight-end
+            ]
+            ```
+
+        </details>
+
+        You can find an example of the file name that should be used under the **File** Configuration for each Source/Client. Note: this is the same value that is used for `type` in AIO configs.
     </TabItem>
     <TabItem value="aio" label="File AIO">
-        MS will parse an **all-in-one** configuration file located in the directory specified by the `CONFIG_DIR` environmental variable. This variable defaults to:
+        MS will parse an **all-in-one** configuration file (`config.json`) located in the directory specified by the `CONFIG_DIR` environmental variable. The file's location defaults to:
 
-        * Local installation -> `PROJECT_DIR/config/config.json`
-        * Docker -> `/config/config.json` (in the container) -- see the [install docs](../installation/installation.mdx#docker) for how to configure this correctly
+        * Local installation -> See [Config and Data Directories](/installation/#config-and-data-directories)
+        * Docker -> `/config/config.json` (in the container) -- see the [**Storage** tab in the Docker installation docs](/installation/?dockerSetting=storage#recommended-settings) for how to configure this correctly
 
         <details>
 
             <summary>Use AIO-based configuration if...</summary>
 
-            * You have many [Sources](/configuration/sources)
-            * You have many of each type of **Source** you want to scrobble from IE 2x Plex accounts, 3x Spotify accounts, 1x
-            Funkwhale...
-            * You have more than one scrobble **Client** you want to scrobble to IE multiple Maloja servers
-            * You want only to scrobble to specific **Clients**
-            * You need to setup [monitoring/webhooks](#monitoring)
-            * You want to setup defaults for all Sources/Clients
+            * ...All of the reasons listed in [File](./?configType=file#configuration-types)
+            * You want to setup [monitoring/webhooks](#monitoring), default settings for all Sources/Clients, or global config options
+            * You want to use [Transformers](/configuration/transforms) (other than what is provided for [Musicbrainz ENV](/configuration/transforms/musicbrainz/#env-configuration))
+            * You want complete control over all potential MS configuration
 
         </details>
 
-        **The AIO config also enables setting default options for sources/clients as well as global options for MS itself.**
-
         :::tip
-            * An example AIO config files can be found in the project directory at [`/config/config.json.example`](https://github.com/FoxxMD/multi-scrobbler/tree/master/config/config.json.example)
-            * For docker installations this example is copied to your configuration directory on first-time use.
-            * There is also a [**kitchensink example**](/configuration/kitchensink) that provides examples of using all sources/clients in a complex configuration.
+            * **AIO config is the "complete" way to configure MS.**
+              * All settings available in File/ENV are available in AIO and AIO has *more* exclusive settings.
+              * AIO enables configuring **default settings** for all Sources/Clients
+            * There is a [**kitchensink example**](/configuration/kitchensink) that provides examples of using all sources/clients in a complex configuration.
+            * Use the [**Config Playground**](/playground) to explore the entire config schema with an editable example
+              * The example used can also be found in the repo directory at [`/config/config.json.example`](https://github.com/FoxxMD/multi-scrobbler/tree/master/config/config.json.example) in the example below
         :::
 
-        [**Explore the schema for this configuration, along with an example generator and validator, here**](https://json-schema.app/view/%23?url=https%3A%2F%2Fraw.githubusercontent.com%2FFoxxMD%2Fmulti-scrobbler%2Fmaster%2Fsrc%2Fbackend%2Fcommon%2Fschema%2Faio.json)
-
         <details>
 
             <summary>Config Example</summary>
@@ -155,6 +187,32 @@ Check the [**FAQ**](../FAQ.md) if you have any issues after configuration!
             <CodeBlock title="CONFIG_DIR/config.json" language="json5">{AIOConfig}</CodeBlock>
 
         </details>
+
+        <DetailsAdmo type="important" summary="Source/Client AIO Configs require a 'type' property">
+
+        Compared to their [File](./?configType=file#configuration-types) equivalent, Sources/Clients configured using AIO require an additional `type` property.
+
+        ```yaml title="config.json"
+        {
+          "sources": [
+            {
+              "name": "Foxx JF Server",
+              // highlight-start
+              "type: "jellyfin",
+              // highlight-end
+              "id": "foxxJf",
+              "data": {
+                "url": "http://localhost:8096",
+                "user": "FoxxMD",
+                "apiKey": "c9fae8756fbf481ebd9c5bb56bd6540c"
+              }
+            }
+          ]
+        }
+        ```
+
+        You can find an example of the required `type` value by referring to the **AIO** tab in each Source/Client's Configuration section example. This is the same value that is used as the name of individual [File](./?configType=file#configuration-types) config files.
+        </DetailsAdmo>
     </TabItem>
 </Tabs>
 
@@ -248,7 +306,7 @@ WARN : [App] [Sources] [spotify Secrets] Matched: None | Unmatched: SPOTIFY_SECR
 
 ## Base URL
 
-Defines the URL that is used to generate default redirect URLs for authentication on [spotify](/configuration/sources/spotify) and [lastfm](/configuration/clients/lastfm) -- as well as some logging hints.
+Defines the URL that is used to generate default redirect URLs for authentication for services like [spotify](/configuration/sources/spotify) and [lastfm](/configuration/clients/lastfm) -- as well as some logging hints.
 
 * Default => `http://localhost:9078`
 * Set with [ENV](./?configType=env#configuration-types) `BASE_URL` or `baseUrl` [all-in-one configuration](./?configType=aio#configuration-types)
@@ -279,7 +337,7 @@ Useful when running with [docker](../installation/installation.mdx#docker) so th
 
 ## Caching
 
-Multi-scrobbler implements caching to persist important data across restarts, reduce external API calls, and make some actions faster.
+Multi-scrobbler implements caching to reduce external API calls and make some actions faster.
 
 A default **in-memory** cache store is used so that you always benefit from some caching. An optional, [**secondary** store](#secondary-caching) can be configured for greater caching capabilities.
 
@@ -301,7 +359,7 @@ API Calls to external (metadata) services used to [Enhance Scrobbles](/configura
 
 <DetailsAdmo type="important" summary="Auth Cache Configuration">
 
-Auth caching defaults to a **file** that is stored in the `CONFIG_DIR` directory using the pre-defined file name `ms-auth.cache`.
+Auth caching defaults to a **file** that is stored in the `DATA_DIR` directory using the pre-defined file name `ms-auth.cache`.
 
 This provides automatic persistence across restarts for long-lived auth data/credentials if you have configured a [persisted volume/bind mount](/installation?dockerSetting=storage#recommended-settings) for configuration (`/config` is mounted in [docker compose](/quickstart#create-docker-compose-file)).
 
@@ -448,7 +506,7 @@ Multi-scrobbler depends on a SQLite database (`ms.db`) that is created on first
 
 The database stores *all* Plays for your Sources/Clients as well as metadata and debugging information to help troubleshoot issues. Each Play is associated with a Source/Config in the database based on your configuration.
 
-You **should set IDs for each Source/Client** so that the database can identify these even when the configuration is changed.
+You **must set IDs for each Source/Client** so that the database can identify these even when the configuration is changed.
 
 ### Retention
 
@@ -810,7 +868,7 @@ Webhooks are configured in the AIO [config.json](#configuration-types) file unde
 
 #### [Gotify](https://gotify.net/)
 
-Refer to the [config schema for GotifyConfig](https://json-schema.app/view/%23/%23%2Fdefinitions%2FGotifyConfig?url=https%3A%2F%2Fraw.githubusercontent.com%2FFoxxMD%2Fmulti-scrobbler%2Fmaster%2Fsrc%2Fbackend%2Fcommon%2Fschema%2Faio.json)
+Refer to the [config schema for GotifyConfig](/playground)
 
 multi-scrobbler optionally supports setting message notification priority via `info` `warn` and `error` mappings.
 
@@ -836,7 +894,7 @@ multi-scrobbler optionally supports setting message notification priority via `i
 
 #### [Ntfy](https://ntfy.sh/)
 
-Refer to the [config schema for NtfyConfig](https://json-schema.app/view/%23/%23%2Fdefinitions%2FNtfyConfig?url=https%3A%2F%2Fraw.githubusercontent.com%2FFoxxMD%2Fmulti-scrobbler%2Fmaster%2Fsrc%2Fbackend%2Fcommon%2Fschema%2Faio.json)
+Refer to the [config schema for NtfyConfig](/playground)
 
 multi-scrobbler optionally supports setting message notification priority via `info` `warn` and `error` mappings.
 
@@ -864,7 +922,7 @@ multi-scrobbler optionally supports setting message notification priority via `i
 
 #### [Apprise](https://github.com/caronc/apprise-api)
 
-Refer to the [config schema for AppriseConfig](https://json-schema.app/view/%23/%23%2Fdefinitions%2FAppriseConfig?url=https%3A%2F%2Fraw.githubusercontent.com%2FFoxxMD%2Fmulti-scrobbler%2Fmaster%2Fsrc%2Fbackend%2Fcommon%2Fschema%2Faio.json)
+Refer to the [config schema for AppriseConfig](/playground)
 
 multi-scrobbler supports [stateless](https://github.com/caronc/apprise-api?tab=readme-ov-file#stateless-solution) and [persistent storage](https://github.com/caronc/apprise-api?tab=readme-ov-file#persistent-storage-solution) endpoints as well as [tags](https://github.com/caronc/apprise-api?tab=readme-ov-file#tagging)/
 

docsite/docs/configuration/security.mdx

@@ -0,0 +1,204 @@
+---
+sidebar_position: 6
+title: Security
+description: Securing your instance
+toc_max_heading_level: 4
+---
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+
+:::important
+
+**Multi-scrobbler is not designed to accessible from the public internet.**
+
+It is designed for self-hosting on a **secure, private network** or in something like a tailscale mesh network. If you are considering exposing your instance publicly with no security, **DO NOT.**
+
+:::
+
+## Why Not Expose It?
+
+Currently, there are no *destructive* actions that can be taken in multi-scrobbler *but that will likely change in the near future.* Even without destructive actions, an actor can trigger bulk scrobble/retries that exhaust rate limits for things like tealfm or cause you to be blocked for excessive activity for services like listenbrainz/musicbrainz.
+
+Additionally, exposing MS without security can potentially leak **personally identifable information.** Consider:
+
+* some Services, like Spotify, have descriptive device names that can be seen in MS like `bobs-android-auto` or `marys-apartment-roku`
+  * these can potentially tell a bad actor *where you are* or what you are currently *not* doing (at home? in the car?)
+  * if the device name is named after a location it's even worse, like an airbnb: `123-fun-street-samsung-tv`
+* general listening activity can be a sign of your daily routine
+  * EX listening usually stops at 11:45pm -> you go to sleep before midnight
+  * EX high listening activity between 7:30 - 8:30am -> you are commuting
+
+## Securing Multi-Scrobbler
+
+If you absolutely need to host Multi-Scrobbler on a machine that is also accessible from the public internet then use one of the mitigating solutions below to harden your instance.
+
+### Without Ingress
+
+If you do not need 
+
+* any [Ingress-based Sources](/configuration/sources/?sourceComm=ingress#by-communication-method) like Webscrobbler, Listenbrainz Endpoint, or Last.fm Endpoint
+
+then use of these methods:
+
+#### Restrict Docker Port
+
+If running MS in a [Docker container](/installation#docker), you can run MS **headless** by removing the exposed port from the compose file. Note: this will also remove your ability to access the dashboard.
+
+```yaml
+services:
+  multi-scrobbler:
+  # ...
+  // highlight-start
+  # comment out ports section
+  #
+  # ports:
+  #  - 9078:9078
+  // highlight-end
+```
+
+Alternatively, lock the exposed port to a specific IP address:
+
+```yaml
+services:
+  multi-scrobbler:
+  # ...
+  // highlight-start
+   ports:
+    # only accessible from private ip or tailscale ip
+    - 192.168.0.101:9078:9078
+  // highlight-end
+```
+
+#### Disable Web
+
+Alternatively, use the [Disable Web](/configuration#disable-web) option to completely disable the web server. This is useful if you are not using the docker image or cannot control port exposure in your environment. Note: this will also remove your ability to access the dashboard.
+
+### With Ingress or Remote Instance Dashboard
+
+If you:
+
+* need to use an [Ingress-based Source](/configuration/sources/?sourceComm=ingress#by-communication-method)
+* or your instance is on a machine outside your private network and you cannot/do not want to run it [headlessly](#restrict-docker-port)
+
+then do one of these:
+
+<DetailsAdmo type="tip" summary="Alternative for Listenbrainz Endpoint">
+
+For Subsonic-based music services (like Navidrome) you can use a [Subsonic Source](/configuration/sources/subsonic) instead of a [Listenbrainz Endpoint](/configuration/sources/listenbrainz-endpoint) to avoid needing ingress.
+
+</DetailsAdmo>
+
+#### VPN
+
+Use something like [Tailscale](https://tailscale.com/) or [Netbird](https://netbird.io/) to create a private VPN-like mesh for your machines/devices to communicate over. **This is the most secure option since it does not require MS to be publicly exposed at all.**
+
+MS only needs to be on a mesh network with the devices that are sending it Ingress scrobbles, or with the devices that will be viewing the dashboard. It does not need to be in the same mesh as any other services it is monitoring.
+
+#### Reverse Proxy with Authentication
+
+Use a reverse proxy with some kind of authentication gate. Optionally, restrict the gate to protect all routes that are *not* related to ingress.
+
+The simplest (and least secure) version of this would be using [basic auth](https://developer.mozilla.org/en-US/docs/Web/HTTP/Guides/Authentication#basic_authentication_scheme).
+
+* Traefik [basic auth](https://doc.traefik.io/traefik/reference/routing-configuration/http/middlewares/basicauth/)
+* NPM [auth gatway](https://nginxproxymanager.com/third-party/npm-auth-gateway.html#npm-auth-gateway) or [nginx basic auth](https://docs.nginx.com/nginx-instance-manager/admin-guide/authentication/basic-auth/set-up-basic-authentication/)
+* Caddy [basic auth](https://caddyserver.com/docs/caddyfile/directives/basic_auth)
+
+:::note
+
+Optimally, you should be using a *more robust* authentication implementation IE tinyauth, authentik, keycloak, etc... that integrates into your reverse proxy.
+
+:::
+
+<DetailsAdmo type="tip" summary="List of Unprotected Routes">
+
+Routes that need to be unprotected in order for devices to communicate with MS:
+
+* `/1/*` - standard route for [Listenbrainz Endpoint](/configuration/sources/listenbrainz-endpoint)
+* `/api/listenbrainz*` - custom Listenbrainz Endpoint with slug
+* `/2.0/` - standard route for [Last.fm Endpoint](/configuration/sources/lastfm-endpoint)
+* `/api/lastfm*` - custom Last.fm Endpoint with slug
+* `/api/webscrobbler*` - standard/custom route for [Webscrobbler](/configuration/sources/webscrobbler)
+
+In the examples below you can remove any of the above routes for Sources/Clients you are not using.
+
+</DetailsAdmo>
+
+
+Below are examples of protecting all non-ingress and callback routes with basic auth for the above reverse proxies.
+
+<Tabs groupId="rpExample">
+    <TabItem value="traefik" label="Traefik">
+    Using a [file provider](https://doc.traefik.io/traefik/reference/install-configuration/providers/others/file/):
+
+    ```yaml
+    http:
+      routers:
+        ms-route:
+          entryPoints:
+            - "websecure"
+
+          # can remove any set in the parenthesis group that is unused. Order:
+          # LZ endpoint, webscrobbler, LFM endpoint
+          # 
+          # if not using any then leave only -> Host(`...`)
+          rule: >
+            Host(`ms.mydomain.com`) && (
+
+            !PathPrefix(`/1/`)
+            && !PathPrefix(`/api/listenbrainz`)
+
+            && !PathPrefix(`/api/webscrobbler`)
+
+            && !PathPrefix(`/2.0/`)
+            && !PathPrefix(`/api/lastfm`)
+
+            )
+
+        middlewares:
+            - ms-auth
+        service: ms-service
+      services:
+        ms-service:
+          loadBalancer:
+            servers:
+            # can use container/docker service name if
+            # traefik and MS are on the same docker network
+            # 
+            # otherwise replace domain with the host IP
+            - url: "http://multi-scrobbler:9078"
+      middlewares:
+        ms-auth:
+          basicAuth:
+            users:
+            # use htpasswd cli to generate password
+            #
+            # or self-hosted https://github.com/sharevb/it-tools/tree/v2026.7.11
+            # has an htpasswd generator tool
+            - "testUsername:$apr1$H6uskkkW$IgXLP6ewTrSuBkTrqE8wj/"
+    ```
+
+    The above could also be done using [docker provider labels](https://doc.traefik.io/traefik/reference/install-configuration/providers/docker/).
+    </TabItem>
+    <TabItem value="caddy" label="Caddy">
+    ```Caddyfile
+    multi-scrobbler.domain.tld {
+      # remove any paths you are NOT using from `not path` line.
+      # Order: LZ, LZ, WebScrobbler, LFM, LFM
+      @if-not-scrobble {
+        not path /1/* /api/listenbrainz* /api/webscrobbler* /2.0/* /api/lastfm*
+      }
+      # if request is to any route not listed above, force client to basic auth
+      # you must hash your password using `caddy hash-password`
+      # https://caddyserver.com/docs/command-line#caddy-hash-password
+      basic_auth @if-not-scrobble { 
+        msUser $2a$14$.UWNn4Zn.cQHY6Z1mkXXrOhO7mg4BC2wiC.4Tb8dNBMidjSRHAw3e
+      }
+      # requests will be proxied they are to a scrobble endpoint or basic auth has been passed.
+      # can use container/service name if Caddy & MS are on the same docker network.
+      # otherwise, replace `multi-scrobbler` with host IP
+      reverse_proxy multi-scrobbler:9078
+    }
+    ```
+    </TabItem>
+</Tabs>

docsite/docs/configuration/sources/_env_configs/_applemusic.md

@@ -0,0 +1,13 @@
+| Environmental Variable                     | Type    | Default                  | Description                                                          |
+| ------------------------------------------ | ------- | ------------------------ | -------------------------------------------------------------------- |
+| _**`APPLEMUSIC_ID`**_                      | string  |                          | A globally unique ID EX `myComponentId`                              |
+| `APPLEMUSIC_NAME`                          | string  | Value of `APPLEMUSIC_ID` | A vanity name EX `My Cool Component`                                 |
+| `APPLEMUSIC_ENABLE`                        | boolean | true                     | Should this component be used?                                       |
+| `APPLEMUSIC_KEY_ID`                        | string  |                          |                                                                      |
+| `APPLEMUSIC_TEAM_ID`                       | string  |                          |                                                                      |
+| `APPLEMUSIC_KEY_P8`                        | string  |                          |                                                                      |
+| _**`APPLEMUSIC_MEDIA_USER_TOKEN`**_        | string  |                          |                                                                      |
+| `APPLEMUSIC_TOKEN`                         | string  |                          |                                                                      |
+| `APPLEMUSIC_ORIGIN_HEADER`                 | string  |                          | Origin header to include in every Apple Music API request.           |
+| `APPLEMUSIC_RECOVER_UNCHANGED_TOP_HISTORY` | boolean | true                     | Fixes a quirk where Apple Music's history API hides duplicate plays. |
+| `APPLEMUSIC_NORMALIZE_ALBUM`               | boolean | true                     | Removes extraneous suffixes from album data                          |

docsite/docs/configuration/sources/_env_configs/_azuracast.md

@@ -0,0 +1,10 @@
+| Environmental Variable | Type    | Default             | Description                                       |
+| ---------------------- | ------- | ------------------- | ------------------------------------------------- |
+| _**`AZURA_ID`**_       | string  |                     | A globally unique ID EX `myComponentId`           |
+| `AZURA_NAME`           | string  | Value of `AZURA_ID` | A vanity name EX `My Cool Component`              |
+| `AZURA_ENABLE`         | boolean | true                | Should this component be used?                    |
+| _**`AZURA_STATION`**_  | string  |                     | The specific station to monitor                   |
+| _**`AZURA_URL`**_      | string  |                     | Base URL of the Azuracast instance                |
+| `AZURA_KEY`            | string  |                     | API Key used to access data about private streams |
+| `AZURA_LISTENERS_NUM`  | string  |                     |                                                   |
+| `AZURA_LIVE`           | boolean |                     |                                                   |

docsite/docs/configuration/sources/_env_configs/_chromecast.md

@@ -0,0 +1,9 @@
+| Environmental Variable | Type    | Default          | Description                                                                                     |
+| ---------------------- | ------- | ---------------- | ----------------------------------------------------------------------------------------------- |
+| _**`CC_ID`**_          | string  |                  | A globally unique ID EX `myComponentId`                                                         |
+| `CC_NAME`              | string  | Value of `CC_ID` | A vanity name EX `My Cool Component`                                                            |
+| `CC_ENABLE`            | boolean | true             | Should this component be used?                                                                  |
+| `CC_BLACKLIST_DEVICES` | string  |                  | DO NOT scrobble from any cast devices on this comma-delimited list that START WITH these values |
+| `CC_WHITELIST_DEVICES` | string  |                  | ONLY scrobble from any cast device on this comma-delimited list that START WITH these values    |
+| `CC_BLACKLIST_APPS`    | string  |                  | DO NOT scrobble from any application on this comma-delimited list that START WITH these values  |
+| `CC_WHITELIST_APPS`    | string  |                  | ONLY scrobble from any application on this comma-delimited list that START WITH these values    |

docsite/docs/configuration/sources/_env_configs/_deezer.md

@@ -0,0 +1,8 @@
+| Environmental Variable | Type    | Default                                                              | Description                                        |
+| ---------------------- | ------- | -------------------------------------------------------------------- | -------------------------------------------------- |
+| _**`DEEZER_ID`**_      | string  |                                                                      | A globally unique ID EX `myComponentId`            |
+| `DEEZER_NAME`          | string  | Value of `DEEZER_ID`                                                 | A vanity name EX `My Cool Component`               |
+| `DEEZER_ENABLE`        | boolean | true                                                                 | Should this component be used?                     |
+| _**`DEEZER_ARL`**_     | string  |                                                                      | ARL retrieved from Deezer response header          |
+| `DEEZER_ACCOUNT_ID`    | string  |                                                                      | The ID (USER_ID) of the linked account to monitor. |
+| `DEEZER_USER_AGENT`    | string  | Mozilla/5.0 (X11; Linux i686; rv:135.0) Gecko/20100101 Firefox/135.0 | User agent                                         |

docsite/docs/configuration/sources/_env_configs/_endpointlfm.md

@@ -0,0 +1,8 @@
+| Environmental Variable | Type    | Default           | Description                                                                                                                                                                      |
+| ---------------------- | ------- | ----------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| _**`LFM_ID`**_         | string  |                   | A globally unique ID EX `myComponentId`                                                                                                                                          |
+| `LFM_NAME`             | string  | Value of `LFM_ID` | A vanity name EX `My Cool Component`                                                                                                                                             |
+| `LFM_ENABLE`           | boolean | true              | Should this component be used?                                                                                                                                                   |
+| `LFM_SLUG`             | string  |                   | When using **multiple sources without apikey/user**, or **not** using the standard base URL, this is the URL base path that should be used to identify scrobbles for this source |
+| `LFM_USERNAME`         | string  |                   | A fake username to differentiate LFM Endpoint Sources                                                                                                                            |
+| `LFM_API_KEY`          | string  |                   | A fake api key to differentiate LFM Endpoint Sources                                                                                                                             |

docsite/docs/configuration/sources/_env_configs/_endpointlz.md

@@ -0,0 +1,8 @@
+| Environmental Variable | Type    | Default           | Description                                                                                                                                                               |
+| ---------------------- | ------- | ----------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| _**`LZE_ID`**_         | string  |                   | A globally unique ID EX `myComponentId`                                                                                                                                   |
+| `LZE_NAME`             | string  | Value of `LZE_ID` | A vanity name EX `My Cool Component`                                                                                                                                      |
+| `LZE_ENABLE`           | boolean | true              | Should this component be used?                                                                                                                                            |
+| `LZE_SLUG`             | string  |                   | When using **multiple sources without tokens**, or **not** using a standard base URL, this is the URL base path that should be used to identify scrobbles for this source |
+| `LZE_TOKEN`            | string  |                   | If an LZ submission request contains this token in the Authorization Header it will be used to match the submission with this Source                                      |
+| `LZE_USERNAME`         | string  |                   | The listenbrainz "username" to associate with this Source                                                                                                                 |

docsite/docs/configuration/sources/_env_configs/_icecast.md

@@ -0,0 +1,7 @@
+| Environmental Variable | Type    | Default               | Description                             |
+| ---------------------- | ------- | --------------------- | --------------------------------------- |
+| _**`ICECAST_ID`**_     | string  |                       | A globally unique ID EX `myComponentId` |
+| `ICECAST_NAME`         | string  | Value of `ICECAST_ID` | A vanity name EX `My Cool Component`    |
+| `ICECAST_ENABLE`       | boolean | true                  | Should this component be used?          |
+| _**`ICECAST_URL`**_    | string  |                       | The Icecast stream URL                  |
+| `ICECAST_AUTO_MONITOR` | boolean |                       |                                         |

docsite/docs/configuration/sources/_env_configs/_jellyfin.md

@@ -0,0 +1,17 @@
+| Environmental Variable           | Type           | Default                | Description                                                                                                                       |
+| -------------------------------- | -------------- | ---------------------- | --------------------------------------------------------------------------------------------------------------------------------- |
+| _**`JELLYFIN_ID`**_              | string         |                        | A globally unique ID EX `myComponentId`                                                                                           |
+| `JELLYFIN_NAME`                  | string         | Value of `JELLYFIN_ID` | A vanity name EX `My Cool Component`                                                                                              |
+| `JELLYFIN_ENABLE`                | boolean        | true                   | Should this component be used?                                                                                                    |
+| _**`JELLYFIN_USER`**_            | string         |                        | The username of the user to authenticate for or track scrobbles for                                                               |
+| `JELLYFIN_PASSWORD`              | string         |                        | Password of the username to authenticate for                                                                                      |
+| `JELLYFIN_APIKEY`                | string         |                        | API Key to authenticate with.                                                                                                     |
+| _**`JELLYFIN_URL`**_             | string         |                        | HOST:PORT of the Jellyfin server to connect to                                                                                    |
+| `JELLYFIN_USERS_ALLOW`           | string OR true |                        | Only scrobble for specific users from this comma-delimited list. If `true`, scrobble for all users.                               |
+| `JELLYFIN_USERS_BLOCK`           | string         |                        | Do not scrobble for users from this comma-delimited list                                                                          |
+| `JELLYFIN_DEVICES_ALLOW`         | string         |                        | Only scrobble if device or application name contains strings from this comma-delimited list                                       |
+| `JELLYFIN_DEVICES_BLOCK`         | string         |                        | Do not scrobble if device or application name contains strings from this comma-delimited list                                     |
+| `JELLYFIN_LIBRARIES_ALLOW`       | string         |                        | Only scrobble if library name contains string from this comma-delimited list                                                      |
+| `JELLYFIN_LIBRARIES_BLOCK`       | string         |                        | Do not scrobble if library name contains strings from this comma-delimited list                                                   |
+| `JELLYFIN_FRONTEND_URL_OVERRIDE` | string         |                        | HOST:PORT of the Jellyfin server that your browser will be able to access from the frontend (and thus load images and links from) |
+| `JELLYFIN_MEDIATYPES_ALLOW`      | string         |                        | Allow media types from this comma-delimited list to be scrobbled                                                                  |

docsite/docs/configuration/sources/_env_configs/_jriver.md

@@ -0,0 +1,8 @@
+| Environmental Variable | Type    | Default                         | Description                                              |
+| ---------------------- | ------- | ------------------------------- | -------------------------------------------------------- |
+| _**`JRIVER_ID`**_      | string  |                                 | A globally unique ID EX `myComponentId`                  |
+| `JRIVER_NAME`          | string  | Value of `JRIVER_ID`            | A vanity name EX `My Cool Component`                     |
+| `JRIVER_ENABLE`        | boolean | true                            | Should this component be used?                           |
+| _**`JRIVER_URL`**_     | string  | http://localhost:52199/MCWS/v1/ | URL of the JRiver HTTP server to connect to              |
+| `JRIVER_USER`          | string  |                                 | If you have enabled authentication, the username you set |
+| `JRIVER_PASSWORD`      | string  |                                 | If you have enabled authentication, the password you set |

docsite/docs/configuration/sources/_env_configs/_kodi.md

@@ -0,0 +1,8 @@
+| Environmental Variable | Type    | Default                       | Description                                       |
+| ---------------------- | ------- | ----------------------------- | ------------------------------------------------- |
+| _**`KODI_ID`**_        | string  |                               | A globally unique ID EX `myComponentId`           |
+| `KODI_NAME`            | string  | Value of `KODI_ID`            | A vanity name EX `My Cool Component`              |
+| `KODI_ENABLE`          | boolean | true                          | Should this component be used?                    |
+| _**`KODI_URL`**_       | string  | http://localhost:8080/jsonrpc | URL of the Kodi HTTP server to connect to         |
+| _**`KODI_USER`**_      | string  |                               | The username set for Remote Control via Web Sever |
+| _**`KODI_PASSWORD`**_  | string  |                               | The password set for Remote Control via Web Sever |

docsite/docs/configuration/sources/_env_configs/_koito.md

@@ -0,0 +1,8 @@
+| Environmental Variable     | Type    | Default                    | Description                             |
+| -------------------------- | ------- | -------------------------- | --------------------------------------- |
+| _**`SOURCE_KOITO_ID`**_    | string  |                            | A globally unique ID EX `myComponentId` |
+| `SOURCE_KOITO_NAME`        | string  | Value of `SOURCE_KOITO_ID` | A vanity name EX `My Cool Component`    |
+| `SOURCE_KOITO_ENABLE`      | boolean | true                       | Should this component be used?          |
+| _**`SOURCE_KOITO_URL`**_   | string  |                            | URL for the Koito server                |
+| _**`SOURCE_KOITO_TOKEN`**_ | string  |                            | User token for the user to scrobble for |
+| _**`SOURCE_KOITO_USER`**_  | string  |                            | Username of the user to scrobble for    |

docsite/docs/configuration/sources/_env_configs/_lastfm.md

@@ -0,0 +1,9 @@
+| Environmental Variable        | Type    | Default                               | Description                                             |
+| ----------------------------- | ------- | ------------------------------------- | ------------------------------------------------------- |
+| _**`SOURCE_LASTFM_ID`**_      | string  |                                       | A globally unique ID EX `myComponentId`                 |
+| `SOURCE_LASTFM_NAME`          | string  | Value of `SOURCE_LASTFM_ID`           | A vanity name EX `My Cool Component`                    |
+| `SOURCE_LASTFM_ENABLE`        | boolean | true                                  | Should this component be used?                          |
+| _**`SOURCE_LASTFM_API_KEY`**_ | string  |                                       | API Key generated from Last.fm/Libre.fm account         |
+| _**`SOURCE_LASTFM_SECRET`**_  | string  |                                       | Secret generated from Last.fm/Libre.fm account          |
+| `SOURCE_LASTFM_REDIRECT_URI`  | string  | http://localhost:9078/lastfm/callback | Optional URI to use for callback.                       |
+| `SOURCE_LASTFM_SESSION`       | string  |                                       | Optional session id returned from a completed auth flow |

docsite/docs/configuration/sources/_env_configs/_librefm.md

@@ -0,0 +1,10 @@
+| Environmental Variable        | Type    | Default                                | Description                                                    |
+| ----------------------------- | ------- | -------------------------------------- | -------------------------------------------------------------- |
+| _**`SOURCE_LIBREFM_ID`**_     | string  |                                        | A globally unique ID EX `myComponentId`                        |
+| `SOURCE_LIBREFM_NAME`         | string  | Value of `SOURCE_LIBREFM_ID`           | A vanity name EX `My Cool Component`                           |
+| `SOURCE_LIBREFM_ENABLE`       | boolean | true                                   | Should this component be used?                                 |
+| `SOURCE_LIBREFM_API_KEY`      | string  |                                        | Optional Secret for Libre.fm account                           |
+| `SOURCE_LIBREFM_SECRET`       | string  |                                        | Optional Secret for Libre.fm account                           |
+| `SOURCE_LIBREFM_REDIRECT_URI` | string  | http://localhost:9078/librefm/callback | Optional URI to use for callback.                              |
+| `SOURCE_LIBREFM_SESSION`      | string  |                                        | Optional session id returned from a completed auth flow        |
+| `SOURCE_LIBREFM_URLBASE`      | string  | https://libre.fm/2.0/                  | (Optional) The host and path prefix for your Libre.fm instance |

docsite/docs/configuration/sources/_env_configs/_listenbrainz.md

@@ -0,0 +1,9 @@
+| Environmental Variable  | Type    | Default                       | Description                                                                                                                   |
+| ----------------------- | ------- | ----------------------------- | ----------------------------------------------------------------------------------------------------------------------------- |
+| _**`SOURCE_LZ_ID`**_    | string  |                               | A globally unique ID EX `myComponentId`                                                                                       |
+| `SOURCE_LZ_NAME`        | string  | Value of `SOURCE_LZ_ID`       | A vanity name EX `My Cool Component`                                                                                          |
+| `SOURCE_LZ_ENABLE`      | boolean | true                          | Should this component be used?                                                                                                |
+| `SOURCE_LZ_URL`         | string  | https://api.listenbrainz.org/ | URL for the ListenBrainz server, if not using the default                                                                     |
+| _**`SOURCE_LZ_TOKEN`**_ | string  |                               | User token for the user to scrobble for                                                                                       |
+| _**`SOURCE_LZ_USER`**_  | string  |                               | Username of the user to scrobble for                                                                                          |
+| `SOURCE_LZ_CONTACT`     | string  |                               | A website or email Listenbrainz can contact you at in case of issues. **This will become a required property in the future.** |

docsite/docs/configuration/sources/_env_configs/_maloja.md

@@ -0,0 +1,7 @@
+| Environmental Variable        | Type    | Default                     | Description                             |
+| ----------------------------- | ------- | --------------------------- | --------------------------------------- |
+| _**`SOURCE_MALOJA_ID`**_      | string  |                             | A globally unique ID EX `myComponentId` |
+| `SOURCE_MALOJA_NAME`          | string  | Value of `SOURCE_MALOJA_ID` | A vanity name EX `My Cool Component`    |
+| `SOURCE_MALOJA_ENABLE`        | boolean | true                        | Should this component be used?          |
+| _**`SOURCE_MALOJA_URL`**_     | string  |                             | URL for maloja server                   |
+| _**`SOURCE_MALOJA_API_KEY`**_ | string  |                             | API Key for Maloja server               |

docsite/docs/configuration/sources/_env_configs/_mopidy.md

@@ -0,0 +1,9 @@
+| Environmental Variable  | Type    | Default                        | Description                                                                                |
+| ----------------------- | ------- | ------------------------------ | ------------------------------------------------------------------------------------------ |
+| _**`MOPIDY_ID`**_       | string  |                                | A globally unique ID EX `myComponentId`                                                    |
+| `MOPIDY_NAME`           | string  | Value of `MOPIDY_ID`           | A vanity name EX `My Cool Component`                                                       |
+| `MOPIDY_ENABLE`         | boolean | true                           | Should this component be used?                                                             |
+| `MOPIDY_URL`            | string  | ws://localhost:6680/mopidy/ws/ | URL of the Mopidy HTTP server to connect to                                                |
+| `MOPIDY_URI_DENYLIST`   | string  |                                | Do not scrobble tracks whose URI STARTS WITH any of these strings, case-insensitive        |
+| `MOPIDY_URI_ALLOWLIST`  | string  |                                | Only scrobble tracks whose URI STARTS WITH any of these strings, case-insensitive          |
+| `MOPIDY_ALBUM_DENYLIST` | string  | Soundcloud                     | Remove album data that matches any case-insensitive string from this list when scrobbling, |

docsite/docs/configuration/sources/_env_configs/_mpd.md

@@ -0,0 +1,7 @@
+| Environmental Variable | Type    | Default           | Description                                                                                              |
+| ---------------------- | ------- | ----------------- | -------------------------------------------------------------------------------------------------------- |
+| _**`MPD_ID`**_         | string  |                   | A globally unique ID EX `myComponentId`                                                                  |
+| `MPD_NAME`             | string  | Value of `MPD_ID` | A vanity name EX `My Cool Component`                                                                     |
+| `MPD_ENABLE`           | boolean | true              | Should this component be used?                                                                           |
+| `MPD_URL`              | string  | localhost:6600    | URL:PORT of the MPD server to connect to                                                                 |
+| `MPD_PASSWORD`         | string  |                   | Password for the server, if set https://mpd.readthedocs.io/en/stable/user.html#permissions-and-passwords |

docsite/docs/configuration/sources/_env_configs/_mpris.md

@@ -0,0 +1,7 @@
+| Environmental Variable | Type    | Default             | Description                                                                            |
+| ---------------------- | ------- | ------------------- | -------------------------------------------------------------------------------------- |
+| _**`MPRIS_ID`**_       | string  |                     | A globally unique ID EX `myComponentId`                                                |
+| `MPRIS_NAME`           | string  | Value of `MPRIS_ID` | A vanity name EX `My Cool Component`                                                   |
+| `MPRIS_ENABLE`         | boolean | true                | Should this component be used?                                                         |
+| `MPRIS_BLACKLIST`      | string  |                     | DO NOT scrobble from any players that START WITH values from this comma-delimited list |
+| `MPRIS_WHITELIST`      | string  |                     | ONLY scrobble from any players that START WITH values from this comma-delimited list   |

docsite/docs/configuration/sources/_env_configs/_musiccast.md

@@ -0,0 +1,6 @@
+| Environmental Variable | Type    | Default             | Description                                                  |
+| ---------------------- | ------- | ------------------- | ------------------------------------------------------------ |
+| _**`MCAST_ID`**_       | string  |                     | A globally unique ID EX `myComponentId`                      |
+| `MCAST_NAME`           | string  | Value of `MCAST_ID` | A vanity name EX `My Cool Component`                         |
+| `MCAST_ENABLE`         | boolean | true                | Should this component be used?                               |
+| _**`MCAST_URL`**_      | string  |                     | The host or URL of the YamahaExtendedControl endpoint to use |

docsite/docs/configuration/sources/_env_configs/_musikcube.md

@@ -0,0 +1,7 @@
+| Environmental Variable | Type    | Default             | Description                                                                                  |
+| ---------------------- | ------- | ------------------- | -------------------------------------------------------------------------------------------- |
+| _**`MC_ID`**_          | string  |                     | A globally unique ID EX `myComponentId`                                                      |
+| `MC_NAME`              | string  | Value of `MC_ID`    | A vanity name EX `My Cool Component`                                                         |
+| `MC_ENABLE`            | boolean | true                | Should this component be used?                                                               |
+| `MC_URL`               | string  | ws://localhost:7905 | URL of the Musikcube Websocket (Metadata) server to connect to                               |
+| _**`MC_PASSWORD`**_    | string  |                     | Password set in Musikcube https://github.com/clangen/musikcube/wiki/remote-api-documentation |

docsite/docs/configuration/sources/_env_configs/_plex.md

@@ -0,0 +1,13 @@
+| Environmental Variable | Type    | Default            | Description                                                                                   |
+| ---------------------- | ------- | ------------------ | --------------------------------------------------------------------------------------------- |
+| _**`PLEX_ID`**_        | string  |                    | A globally unique ID EX `myComponentId`                                                       |
+| `PLEX_NAME`            | string  | Value of `PLEX_ID` | A vanity name EX `My Cool Component`                                                          |
+| `PLEX_ENABLE`          | boolean | true               | Should this component be used?                                                                |
+| _**`PLEX_URL`**_       | string  |                    | http(s)://HOST:PORT of the Plex server to connect to                                          |
+| `PLEX_TOKEN`           | string  |                    |                                                                                               |
+| `PLEX_USERS_ALLOW`     | string  |                    | Only scrobble for specific users from this comma-delimited list                               |
+| `PLEX_USERS_BLOCK`     | string  |                    | Do not scrobble for users from this comma-delimited list                                      |
+| `PLEX_DEVICES_ALLOW`   | string  |                    | Do not scrobble if device or application name contains strings from this comma-delimited list |
+| `PLEX_DEVICES_BLOCK`   | string  |                    | Only scrobble if device or application name contains strings from this comma-delimited list   |
+| `PLEX_LIBRARIES_ALLOW` | string  |                    | Only scrobble if library name contains string from this comma-delimited list                  |
+| `PLEX_LIBRARIES_BLOCK` | string  |                    | Do not scrobble if library name contains strings from this comma-delimited list               |

docsite/docs/configuration/sources/_env_configs/_rocksky.md

@@ -0,0 +1,7 @@
+| Environmental Variable        | Type    | Default                      | Description                                                                                                                                      |
+| ----------------------------- | ------- | ---------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------ |
+| _**`SOURCE_ROCKSKY_ID`**_     | string  |                              | A globally unique ID EX `myComponentId`                                                                                                          |
+| `SOURCE_ROCKSKY_NAME`         | string  | Value of `SOURCE_ROCKSKY_ID` | A vanity name EX `My Cool Component`                                                                                                             |
+| `SOURCE_ROCKSKY_ENABLE`       | boolean | true                         | Should this component be used?                                                                                                                   |
+| `SOURCE_ROCKSKY_KEY`          | string  |                              | API Key generated from [API Applications](https://docs.rocksky.app/migrating-from-listenbrainz-to-rocksky-1040189m0) in Rocksky for your account |
+| _**`SOURCE_ROCKSKY_HANDLE`**_ | string  |                              | The **fully-qualified** handle for your ATPRoto/Bluesky account                                                                                  |

docsite/docs/configuration/sources/_env_configs/_sonos.md

@@ -0,0 +1,10 @@
+| Environmental Variable | Type    | Default             | Description                                                                                                          |
+| ---------------------- | ------- | ------------------- | -------------------------------------------------------------------------------------------------------------------- |
+| _**`SONOS_ID`**_       | string  |                     | A globally unique ID EX `myComponentId`                                                                              |
+| `SONOS_NAME`           | string  | Value of `SONOS_ID` | A vanity name EX `My Cool Component`                                                                                 |
+| `SONOS_ENABLE`         | boolean | true                | Should this component be used?                                                                                       |
+| _**`SONOS_HOST`**_     | string  |                     | IP address of any connected Sonos speaker or device                                                                  |
+| `SONOS_DEVICES_ALLOW`  | string  |                     | Only scrobble if device name contains strings from this comma-delimited list                                         |
+| `SONOS_DEVICES_BLOCK`  | string  |                     | Do not scrobble if device name contains strings from this comma-delimited list                                       |
+| `SONOS_GROUPS_ALLOW`   | string  |                     | Only scrobble if the name of a group the playing device belongs to contains strings from this comma-delimited list   |
+| `SONOS_GROUPS_BLOCK`   | string  |                     | Do not scrobble if the name of a group the playing device belongs to contains strings from this comma-delimited list |

docsite/docs/configuration/sources/_env_configs/_spotify.md

@@ -0,0 +1,8 @@
+| Environmental Variable        | Type    | Default                        | Description                                                          |
+| ----------------------------- | ------- | ------------------------------ | -------------------------------------------------------------------- |
+| _**`SPOTIFY_ID`**_            | string  |                                | A globally unique ID EX `myComponentId`                              |
+| `SPOTIFY_NAME`                | string  | Value of `SPOTIFY_ID`          | A vanity name EX `My Cool Component`                                 |
+| `SPOTIFY_ENABLE`              | boolean | true                           | Should this component be used?                                       |
+| _**`SPOTIFY_CLIENT_ID`**_     | string  |                                | spotify client id                                                    |
+| _**`SPOTIFY_CLIENT_SECRET`**_ | string  |                                | spotify client secret                                                |
+| `SPOTIFY_REDIRECT_URI`        | string  | http://localhost:9078/callback | spotify redirect URI -- required only if not the default shown here. |

docsite/docs/configuration/sources/_env_configs/_subsonic.md

@@ -0,0 +1,8 @@
+| Environmental Variable    | Type    | Default                | Description                                       |
+| ------------------------- | ------- | ---------------------- | ------------------------------------------------- |
+| _**`SUBSONIC_ID`**_       | string  |                        | A globally unique ID EX `myComponentId`           |
+| `SUBSONIC_NAME`           | string  | Value of `SUBSONIC_ID` | A vanity name EX `My Cool Component`              |
+| `SUBSONIC_ENABLE`         | boolean | true                   | Should this component be used?                    |
+| _**`SUBSONIC_USER`**_     | string  |                        | Username to login to the server with              |
+| _**`SUBSONIC_PASSWORD`**_ | string  |                        | Password for the user to login to the server with |
+| _**`SUBSONIC_URL`**_      | string  |                        | URL of the subsonic media server to query         |

docsite/docs/configuration/sources/_env_configs/_tealfm.md

@@ -0,0 +1,7 @@
+| Environmental Variable           | Type    | Default                     | Description                                                                                   |
+| -------------------------------- | ------- | --------------------------- | --------------------------------------------------------------------------------------------- |
+| _**`SOURCE_TEALFM_ID`**_         | string  |                             | A globally unique ID EX `myComponentId`                                                       |
+| `SOURCE_TEALFM_NAME`             | string  | Value of `SOURCE_TEALFM_ID` | A vanity name EX `My Cool Component`                                                          |
+| `SOURCE_TEALFM_ENABLE`           | boolean | true                        | Should this component be used?                                                                |
+| _**`SOURCE_TEALFM_IDENTIFIER`**_ | string  |                             | Identify the account to login as                                                              |
+| _**`SOURCE_TEALFM_APP_PW`**_     | string  |                             | The [App Password](https://atproto.com/specs/xrpc#app-passwords) you created for your account |

docsite/docs/configuration/sources/_env_configs/_vlc.md

@@ -0,0 +1,7 @@
+| Environmental Variable | Type    | Default           | Description                              |
+| ---------------------- | ------- | ----------------- | ---------------------------------------- |
+| _**`VLC_ID`**_         | string  |                   | A globally unique ID EX `myComponentId`  |
+| `VLC_NAME`             | string  | Value of `VLC_ID` | A vanity name EX `My Cool Component`     |
+| `VLC_ENABLE`           | boolean | true              | Should this component be used?           |
+| `VLC_URL`              | string  | localhost:8080    | URL:PORT of the VLC server to connect to |
+| _**`VLC_PASSWORD`**_   | string  |                   | Password for the server                  |

docsite/docs/configuration/sources/_env_configs/_webscrobbler.md

@@ -0,0 +1,7 @@
+| Environmental Variable | Type    | Default          | Description                                                 |
+| ---------------------- | ------- | ---------------- | ----------------------------------------------------------- |
+| _**`WS_ID`**_          | string  |                  | A globally unique ID EX `myComponentId`                     |
+| `WS_NAME`              | string  | Value of `WS_ID` | A vanity name EX `My Cool Component`                        |
+| `WS_ENABLE`            | boolean | true             | Should this component be used?                              |
+| `WS_BLACKLIST`         | string  |                  | Block scrobbling from specific WebScrobbler Connectors      |
+| `WS_WHITELIST`         | string  |                  | Only allow scrobbling from specific WebScrobbler Connectors |

docsite/docs/configuration/sources/_env_configs/_ymbridge.md

@@ -0,0 +1,7 @@
+| Environmental Variable | Type    | Default                | Description                                                                 |
+| ---------------------- | ------- | ---------------------- | --------------------------------------------------------------------------- |
+| _**`YMBRIDGE_ID`**_    | string  |                        | A globally unique ID EX `myComponentId`                                     |
+| `YMBRIDGE_NAME`        | string  | Value of `YMBRIDGE_ID` | A vanity name EX `My Cool Component`                                        |
+| `YMBRIDGE_ENABLE`      | boolean | true                   | Should this component be used?                                              |
+| _**`YMBRIDGE_URL`**_   | string  |                        | URL of the local Python bridge, for example http://yandex-music-bridge:9980 |
+| `YMBRIDGE_API_KEY`     | string  |                        | Optional API key sent as X-API-Key to the bridge                            |

docsite/docs/configuration/sources/_env_configs/_ytmusic.md

@@ -0,0 +1,9 @@
+| Environmental Variable | Type    | Default           | Description                                                                          |
+| ---------------------- | ------- | ----------------- | ------------------------------------------------------------------------------------ |
+| _**`YTM_ID`**_         | string  |                   | A globally unique ID EX `myComponentId`                                              |
+| `YTM_NAME`             | string  | Value of `YTM_ID` | A vanity name EX `My Cool Component`                                                 |
+| `YTM_ENABLE`           | boolean | true              | Should this component be used?                                                       |
+| `YTM_REDIRECT_URI`     | string  |                   | Google Cloud Console project OAuth Client Authorized redirect URI                    |
+| `YTM_CLIENT_ID`        | string  |                   | Google Cloud Console project OAuth Client ID                                         |
+| `YTM_CLIENT_SECRET`    | string  |                   | Google Cloud Console project OAuth Client Secret                                     |
+| `YTM_COOKIE`           | string  |                   | The cookie retrieved from the Request Headers of music.youtube.com after logging in. |

docsite/docs/configuration/sources/applemusic.mdx

@@ -0,0 +1,251 @@
+---
+title: Apple Music
+toc_min_heading_level: 2
+toc_max_heading_level: 5
+---
+
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+import CodeBlock from '@theme/CodeBlock';
+import AppleMusicConfig from '!!raw-loader!@site/../config/applemusic.json.example';
+import ENVConfig from "@site/docs/configuration/sources/_env_configs/_applemusic.md"
+
+This Source **monitors your Apple Music listening history** via the official Apple Music API and scrobbles new activity to your configured [Clients](/configuration/clients). 
+
+Because of how the Apple Music API works, Multi-Scrobbler (MS) requires two different tokens to function: a **Media User Token** (identifies your personal account) and an **Authentication Token** (authorizes API access).
+
+### 1. Getting a Media User Token
+
+The `mediaUserToken` is required to access your recently played history. You can extract it directly from the Apple Music web app:
+
+1. Visit [music.apple.com](https://music.apple.com) in your browser and log in.
+2. Open your browser's Developer Tools (usually `F12` or <kbd>⌘</kbd> + <kbd>⌥</kbd> + <kbd>I</kbd>).
+3. Navigate to the **Application** tab (Chrome/Edge) or **Storage** tab (Safari/Firefox).
+4. Expand **Cookies** in the left sidebar and select `https://music.apple.com`.
+5. Find the cookie named `media-user-token` and copy its value (it typically starts with `0.`).
+
+:::caution[Token Expiry]
+The `mediaUserToken` will eventually expire. If Multi-Scrobbler begins throwing authentication errors in the logs, simply repeat these steps to obtain and configure a fresh token.
+:::
+
+### 2. Authentication
+
+To authorize API access, Multi-Scrobbler requires an Authentication Token (JWT). Because the official Apple Music API is designed for developers, there are two ways to provide this token depending on your situation:
+
+* **Browser Token (Free & Most Common):** Best for 99% of users. You can easily extract a temporary token from the Apple Music web player without needing an Apple Developer account.
+* **MusicKit Key (Requires Paid Apple Developer Account):** If you happen to be enrolled in the paid Apple Developer Program ($99/year), you can provide a private key to automatically generate permanent tokens.
+
+Choose your preferred method below:
+
+<Tabs groupId="appleMusicAuth" queryString>
+    <TabItem value="token" label="Browser Token (Free)">
+
+        Since most users don't have a paid developer account, extracting the token from the web player is the standard approach.
+
+        Behind the scenes, the Apple Music website makes a lot of background requests, which can make finding the right token confusing. To filter out the noise and grab the exact token we need, follow the steps for your browser below:
+
+        <details>
+        <summary>Chrome, Edge & Firefox</summary>
+
+        1. Visit [music.apple.com](https://music.apple.com) and log in.
+        2. Open Developer Tools (`F12` or `Ctrl+Shift+I` / <kbd>⌘</kbd> + <kbd>⌥</kbd> + <kbd>I</kbd>) and navigate to the **Network** tab.
+        3. In the filter box at the top left, paste exactly: `https://amp-api.music.apple.com/v1/me/account` (**Label 1**).
+        4. Click the **Fetch/XHR** filter button to hide irrelevant requests (**Label 2**).
+        5. Reload the page (**Label 3**).
+        6. Under the "Name" column, click the request starting with `account?meta=` (**Label 4**).
+        7. In the panel that opens, scroll down to the **Request Headers** section.
+        8. Find the `authorization` header. Copy the long string of text **after** the `Bearer ` prefix (**Label 5**).
+
+        ![Chrome Network Tab Instructions](../applemusic_chrome_devtools.png)
+
+        </details>
+
+        <details>
+        <summary>Safari</summary>
+
+        Before you can extract the token in Safari, you must enable developer tools.
+
+        {/* This weird formatting is because ⌘ is usually incredibly tiny */}
+        1. Open Safari Settings (<kbd>⌘</kbd> + <kbd>,</kbd>), navigate to the **Advanced** tab, and check **"Show features for web developers"** at the very bottom.
+        
+        ![Safari Advanced Settings](../applemusic_safari_settings.png)
+        
+        2. Visit [music.apple.com](https://music.apple.com) and log in.
+        3. Open the Web Inspector (<kbd>⌘</kbd>+<kbd>⌥</kbd>+<kbd>I</kbd> or Develop > Show Web Inspector) and navigate to the **Network** tab.
+        4. In the filter bar on the left side of the inspector, paste exactly: `https://amp-api.music.apple.com/v1/me/account` (**Label 1**).
+        5. Reload the page (**Label 2**).
+        6. Click the `account` request that appears in the Name list (**Label 3**).
+        7. In the details sidebar, look under the **Request** section for the `Authorization` header. Copy the long string of text **after** the `Bearer ` prefix (**Label 4**).
+
+        ![Safari Network Tab Instructions](../applemusic_safari_devtools.png)
+
+        </details>
+        
+        <br />
+
+        Once you have your token, add it to your configuration file along with the origin header:
+
+        ```json title="applemusic.json"
+        {
+            "data": {
+                "token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJFUzI1NiIsIm...",
+                "mediaUserToken": "your-media-user-token-here",
+                "origin": "https://music.apple.com"
+            }
+        }
+        ```
+
+        :::info[Origin Header Required]
+        When using a JWT extracted from the browser, Apple requires the request to match the domain it was issued to. You **must** include the `origin` field in your config as shown above.
+        :::
+
+        *Note: Browser-generated JWTs are valid for a maximum of 35 days and must be updated manually when they expire.*
+
+    </TabItem>
+    <TabItem value="key" label="MusicKit Key (Paid Account)">
+
+        :::warning[Apple Developer Account Required]
+        To generate JWTs automatically, you must be enrolled in the paid [Apple Developer Program](https://developer.apple.com/programs/) ($99/year) and create a MusicKit key. If you don't have an account, use the **Browser Token (Free)** tab instead.
+        :::
+
+        To generate JWTs automatically and avoid manual token refreshes, you need an Apple Music API key:
+
+        1. Go to the [Apple Developer portal](https://developer.apple.com/account/resources/authkeys/list) and create a **MusicKit** key.
+        2. Download the `.p8` file — this is your private key.
+        3. Note your **Key ID** and **Team ID** (found in your Apple Developer account Membership details).
+
+        Add these details to your config:
+
+        ```json title="applemusic.json"
+        {
+            "data": {
+                "key": {
+                    "id": "2HPSNJZ88N",
+                    "teamId": "SN6YASW8G4",
+                    "p8": "-----BEGIN PRIVATE KEY-----\nMIGTAgEAMBMGByqGSM49AgEG...-----END PRIVATE KEY-----"
+                },
+                "mediaUserToken": "your-media-user-token-here"
+            }
+        }
+        ```
+
+        :::tip
+        When pasting the contents of your `.p8` file into JSON, make sure to replace physical line breaks with `\n` so it remains a valid, single-line JSON string.
+        :::
+
+    </TabItem>
+</Tabs>
+
+---
+
+### How Multi-Scrobbler handles Apple Music quirks
+
+#### Timestamp Estimation
+
+The Apple Music API **does not provide timestamps** for when tracks were played. Multi-Scrobbler estimates play times by taking the current time and subtracting track durations backwards:
+* The most recent track is assumed to have finished playing **now**.
+* Each older track is estimated to have played `duration` seconds before the previous one.
+
+*For the most accurate scrobble timestamps, it is highly recommended to keep the polling interval (`APPLEMUSIC_INTERVAL`) low (the default is 60 seconds).*
+
+#### Duplicate Play Recovery
+
+The Apple Music history API strictly deduplicates tracks. Instead of showing the same song multiple times in a row, it simply bumps the re-played track back to the #1 spot and removes the older entry. 
+
+For example, if you listen to **Song A** → **Song B**, your history is `[Song B, Song A]`. If you then listen to **Song A** again, the API returns `[Song A, Song B]` (Song A was bumped to the top). 
+
+If Multi-Scrobbler polled when the top track was Song A, and polls again after it's bumped back to the top, the top track appears functionally unchanged. This usually confuses standard scrobblers into ignoring the update entirely. By default, MS correctly detects this "top-rebound" pattern, extracts the intermediate tracks that were squeezed in (Song B), and scrobbles Song A again as a re-listen. 
+
+*Note: Because of this strict deduplication, **"pure loops"** (listening to Song A continuously on repeat without playing anything else in between) cannot be tracked. The history list never changes shape, so MS has no way of knowing it was played again.*
+
+If you ever experience false positives (tracks being scrobbled that you didn't actually re-listen to), you can disable this recovery behavior with `"recoverUnchangedTopHistory": false` in your config options or by setting the `APPLEMUSIC_RECOVER_UNCHANGED_TOP_HISTORY=false` env var.
+
+#### Album name normalization
+
+The Apple Music API appends ` - EP` or ` - Single` to the album name for EPs and singles. These suffixes are *not* part of the official names of the album and can cause issues when trying to scrobble or match metadata.
+
+By default, Multi-Scrobbler strips these suffixes out so only the official name is used.
+
+If you do not want this behavior it can be disabled with ENV `APPLEMUSIC_NORMALIZE_ALBUM=false` or File/AIO option `"normalizeAlbum": false`.
+
+<DetailsAdmo type="tip" summary="Stripping Suffix with User Stage">
+
+If you still want this stripping functionality but with more control over how it is applied you can use a [User Stage](/configuration/transforms/user).
+
+Here is an example of creating a User Stage to only strip suffixes for a specific scrobble client:
+
+<details>
+
+<summary>Example</summary>
+
+```json5 title="config.json"
+{
+  // ...
+  "transformers": [
+    {
+      "type": "user",
+      "name": "AppleAlbumStip",
+      "defaults": {
+        "album": [
+          "/ - (EP|Single)$/i"
+        ]
+      }
+    }
+  ]
+}
+```
+
+```json5 title="applemusic.json"
+{
+  {
+    "id": "myAppleMusic",
+    "name": "My Apple Music",
+    "data": {
+      // ...
+    },
+    // highlight-start
+    "options": {
+      "normalizeAlbum": false
+    }
+    // highlight-end
+  }
+}
+```
+
+```json5 title="lastfm.json"
+[
+  {
+    "name": "Foxx LFM Client",
+    "id": "myLastFmClient",
+    "enable": true,
+    "configureAs": "client",
+    "data": {
+      "apiKey": "a89cba1569901a0671d5a9875fed4be1",
+      "secret": "ec42e09d5ae0ee0f0816ca151008412a",
+      "redirectUri": "http://localhost:9078/lastfm/callback"
+    },
+    // highlight-start
+    "options": {
+      "playTransform": {
+        "preCompare": [
+          {
+            "type": "user",
+            "name": "AppleAlbumStip",
+          }
+        ]
+      }
+    }
+    // highlight-end
+  }
+]
+```
+
+</details>
+
+</DetailsAdmo>
+
+## Configuration Reference
+
+<Config config="AppleMusicSourceConfig" fileContent={AppleMusicConfig} name="applemusic">
+<ENVConfig/>
+</Config>

docsite/docs/configuration/sources/azuracast.mdx

@@ -8,6 +8,7 @@ import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 import CodeBlock from '@theme/CodeBlock';
 import AzuracastConfig from '!!raw-loader!@site/../config/azuracast.json.example';
+import ENVConfig from "@site/docs/configuration/sources/_env_configs/_azuracast.md"
 import ShouldScrobble from "@site/src/components/snippets/_should-scrobble-details.mdx"
 
 :::tip[Scrobbling Threshold]
@@ -38,14 +39,14 @@ URL From Config                => MS Uses
 
 <ShouldScrobble filename="azuracast"/>
 
-Multi-scrobbler will set the default **scrobbling behavior** based on if either of these settings is configured:
+When `autoMonitor` is not explicitly set, Multi-scrobbler will set the **default monitoring behavior** based on if either of these settings is configured:
 
 * live status (`AZURA_LIVE` or `monitorWhenLive`) or
 * listener count (`AZURA_LISTENERS_NUM` or `monitorWhenListeners`)
 
-If either is configured then MS will automatically scrobble based on when these conditions are met.
+If either is configured then MS will automatically monitor based on when these conditions are met.
 
-If neither is configured automatic scrobble defaults to **off** and you should either manually initiate it or explicitly set the default behavior.
+If neither is configured automatic monitoring defaults to **off** and you should either manually initiate it or explicitly set the default behavior.
 
 ### Station
 
@@ -112,12 +113,5 @@ For users who aren't administrators of Azuracast: if you can access the station
 ## Configuration
 
 <Config config="AzuracastSourceConfig" fileContent={AzuracastConfig} name="azuracast">
-        | Environmental Variable | Required? | Default | Description                                                                                    |
-        | :--------------------- | :-------- | :------ | ---------------------------------------------------------------------------------------------- |
-        | `AZURA_ID`             | Yes       |         | A unique ID                                                                                    |
-        | `AZURA_URL`            | Yes       |         | Azuracast URL *without station name*                                                           |
-        | `AZURA_STATION`        | Yes       |         | The station URL Stub or shortcode                                                              |
-        | `AZURA_LIVE`           | No        | Yes     | Only scrobble when station status is ONLINE                                                    |
-        | `AZURA_LISTENERS_NUM`  | No        | `true`  | Only scrobble if station has any listeners (`true`) or listeners are equal-to/greater-than `X` |
-        | `AZURA_NAME`           | No        |         | A vanity name different than ID                                                                |
+<ENVConfig/>
 </Config>

docsite/docs/configuration/sources/deezer.mdx

@@ -9,6 +9,7 @@ import TabItem from '@theme/TabItem';
 import CodeBlock from '@theme/CodeBlock';
 import DeezerConfig from '!!raw-loader!@site/../config/deezer.json.example';
 import DeezerDeprecatedConfig from '!!raw-loader!@site/../config/deezer-deprecated.json.example';
+import ENVConfig from "@site/docs/configuration/sources/_env_configs/_deezer.md"
 
 <Tabs groupId="deezerSource" queryString>
     <TabItem value="arl" label="Unofficial ARL">
@@ -134,9 +135,7 @@ import DeezerDeprecatedConfig from '!!raw-loader!@site/../config/deezer-deprecat
         ## Configuration
 
         <Config config="DeezerCompatConfig" fileContent={DeezerConfig} name="deezer">
-                | Environmental Variable | Required? | Default | Description                                      |
-                | :--------------------- | --------- | ------- | ------------------------------------------------ |
-                | `DEEZER_ARL`           | Yes       |         | The ARL cookie value retrieved from your browser |
+<ENVConfig/>
         </Config>
 
     </TabItem>

docsite/docs/configuration/sources/google-cast.mdx

@@ -8,6 +8,7 @@ import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 import CodeBlock from '@theme/CodeBlock';
 import ChromecastConfig from '!!raw-loader!@site/../config/chromecast.json.example';
+import ENVConfig from "@site/docs/configuration/sources/_env_configs/_chromecast.md"
 
 If your media device can be **Cast** to using this button ![Chromecast Icon](https://upload.wikimedia.org/wikipedia/commons/2/26/Chromecast_cast_button_icon.svg) on your phone/computer then multi-scrobbler can monitor it in order to scrobble music you play.
 
@@ -149,13 +150,5 @@ To diagnose bad/incomplete track information or strange MS player behavior pleas
         [Manually configuring cast device connections](#connecting-devices) is only available through file-based config.
         :::
 
-        | Environmental Variable | Required? | Default | Description                                                                          |
-        | ---------------------- | --------- | ------- | ------------------------------------------------------------------------------------ |
-        | `CC_ID`                | Yes       |         | A unique ID                                                                          |
-        | `CC_ENABLE`            | No        |         | Set to 'true' to enable Cast monitoring without needing to define other ENVs         |
-        | `CC_WHITELIST_DEVICES` | No        |         | Only scrobble from these Cast devices. Comma-delimited list. EX mini-home, family-tv |
-        | `CC_BLACKLIST_DEVICES` | No        |         | Do not scrobble from these Cast devices. Comma-delimited list                        |
-        | `CC_WHITELIST_APPS`    | No        |         | Only scrobble from these casted Apps. Comma-delimited list. EX spotify, pandora      |
-        | `CC_BLACKLIST_APPS`    | No        |         | Do not scrobble from these casted Apps. Comma-delimited list                         |
-        | `CC_NAME`              | No        |         | A vanity name different than ID                                                      |
+<ENVConfig/>
 </Config>

docsite/docs/configuration/sources/icecast.mdx

@@ -9,6 +9,7 @@ import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 import CodeBlock from '@theme/CodeBlock';
 import IcecastConfig from '!!raw-loader!@site/../config/icecast.json.example';
+import ENVConfig from "@site/docs/configuration/sources/_env_configs/_icecast.md"
 import ShouldScrobble from "@site/src/components/snippets/_should-scrobble-details.mdx"
 
 Parse metadata from any Icecast Station (streams) to use for scrobbling.
@@ -21,9 +22,9 @@ Multi-scrobbler will do its best to parse Artist/Album/Track information from th
 
 :::
 
-Multi-scrobbler cannot automatically determine if you are listening to a Station. Therefore, **automatic scrobbling for Icecast Sources is off by default.** Use **Should Scrobble Behavior** to initiate scrobbling or configure automatic scrobble.
+Multi-scrobbler cannot automatically determine if you are listening to a Station. Therefore, **automatic monitoring for Icecast Sources is off by default.** Use **Monitoring Behavior** to initiate scrobbling or configure automatic scrobble.
 
-<ShouldScrobble filename="icecast"/>
+<ShouldScrobble filename="icecast" defaultBehavior={false}/>
 
 :::tip[Scrobbling Threshold]
 
@@ -64,9 +65,5 @@ If no `sources` are configured for multi-scrobbler it will automatically try to
 ## Configuration
 
 <Config config="IcecastSourceConfig" fileContent={IcecastConfig} name="icecast">
-        | Environmental Variable | Required? | Default | Description                     |
-        | :--------------------- | :-------- | :------ | ------------------------------- |
-        | `ICECAST_ID`           | Yes       |         | A unique ID                     |
-        | `ICECAST_URL`          | Yes       |         | Icecast URL                     |
-        | `ICECAST_NAME`         | No        |         | A vanity name different than ID |
+<ENVConfig/>
 </Config>

docsite/docs/configuration/sources/jellyfin.mdx

@@ -8,6 +8,7 @@ import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 import CodeBlock from '@theme/CodeBlock';
 import JellyfinConfig from '!!raw-loader!@site/../config/jellyfin.json.example';
+import ENVConfig from "@site/docs/configuration/sources/_env_configs/_jellyfin.md"
 
 Must be using Jellyfin 10.7 or greater
 
@@ -52,20 +53,5 @@ Use `JELLYFIN_FRONTEND_URL_OVERRIDE=https://jellyfin.mydomain.com` in order for
 #### Configuration
 
 <Config config="JellyApiSourceConfig" fileContent={JellyfinConfig} name="jellyfin">
-        | Environmental Variable           | Required? | Default | Description                                                                                                                                                                                   |
-        | -------------------------------- | --------- | ------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-        | `JELLYFIN_ID`                    | **Yes**   |         | A unique ID                                                                                                                                                                                   |
-        | `JELLYFIN_URL`                   | **Yes**   |         | The URL of the Jellyfin server IE `http://localhost:8096`                                                                                                                                     |
-        | `JELLYFIN_USER`                  | **Yes**   |         | The user to authenticate with the API                                                                                                                                                         |
-        | `JELLYFIN_APIKEY`                | No        |         | The API Key to use for authentication **(Must provide either apikey or password)**                                                                                                            |
-        | `JELLYFIN_PASSWORD`              | No        |         | The password of the user to authenticate for. **(Must provide either apikey or password)**                                                                                                    |
-        | `JELLYFIN_USERS_ALLOW`           | No        |         | Comma-separated list of usernames (from Jellyfin) to scrobble for                                                                                                                             |
-        | `JELLYFIN_USERS_BLOCK`           | No        |         | Comma-separated list of usernames (from Jellyfin) to disallow scrobble for                                                                                                                    |
-        | `JELLYFIN_DEVICES_ALLOW`         | No        |         | Comma-separated list of devices to scrobble from                                                                                                                                              |
-        | `JELLYFIN_DEVICES_BLOCK`         | No        |         | Comma-separated list of devices to disallow scrobbles from                                                                                                                                    |
-        | `JELLYFIN_LIBRARIES_ALLOW`       | No        |         | Comma-separated list of libraries to allow scrobbles from                                                                                                                                     |
-        | `JELLYFIN_LIBRARIES_BLOCK`       | No        |         | Comma-separated list of libraries to disallow scrobbles from                                                                                                                                  |
-        | `JELLYFIN_MEDIATYPES_ALLOW`      | No        |         | Comma-separated list of [media types](https://github.com/jellyfin/jellyfin-sdk-typescript/blob/master/src/generated-client/models/media-type.ts#L22) to allow scrobbling. Defaults to `audio` |
-        | `JELLYFIN_FRONTEND_URL_OVERRIDE` | No        |         | The external URL to use for album art assets instead of `JELLYFIN_URL`                                                                                                                        |
-        | `JELLYFIN_NAME`                  | No        |         | A vanity name different than ID                                                                                                                                                               |
+<ENVConfig/>
 </Config>

docsite/docs/configuration/sources/jriver.mdx

@@ -8,6 +8,7 @@ import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 import CodeBlock from '@theme/CodeBlock';
 import JriverConfig from '!!raw-loader!@site/../config/jriver.json.example';
+import ENVConfig from "@site/docs/configuration/sources/_env_configs/_jriver.md"
 
 In order for multi-scrobbler to communicate with JRiver you must have [Web Server Interface](https://wiki.jriver.com/index.php/Web_Service_Interface#Documentation_of_Functions) enabled. This can be found in the JRiver GUI:
 
@@ -50,11 +51,5 @@ If any part of this URL is missing multi-scrobbler will use a default value. Thi
 ## Configuration
 
 <Config config="JRiverSourceConfig" fileContent={JriverConfig} name="jriver">
-        | Environmental Variable | Required | Default                         | Description                                    |
-        | ---------------------- | -------- | ------------------------------- | ---------------------------------------------- |
-        | JRIVER_ID              | Yes      |                                 | A unique ID                                    |
-        | JRIVER_URL             | Yes      | http://localhost:52199/MCWS/v1/ | The URL of the JRiver server                   |
-        | JRIVER_USERNAME        | No       |                                 | If authentication is enabled, the username set |
-        | JRIVER_PASSWORD        | No       |                                 | If authenticated is enabled, the password set  |
-        | JRIVER_NAME            | No       |                                 | A vanity name different than ID                |
+<ENVConfig/>
 </Config>

docsite/docs/configuration/sources/kodi.mdx

@@ -9,6 +9,7 @@ import TabItem from '@theme/TabItem';
 import CodeBlock from '@theme/CodeBlock';
 import KodiConfig from '!!raw-loader!@site/../config/kodi.json.example';
 import Config from '@site/src/components/GenericConfiguration.mdx';
+import ENVConfig from "@site/docs/configuration/sources/_env_configs/_kodi.md"
 
 In order for multi-scrobbler to communicate with Kodi you must have the [Web Interface](https://kodi.wiki/view/Web_interface) enabled. This can be done in the Kodi GUI:
 
@@ -51,11 +52,5 @@ If any part of this URL is missing multi-scrobbler will use a default value. Thi
 ## Configuration
 
 <Config config="KodiSourceConfig" fileContent={KodiConfig} name="kodi">
-        | Environmental Variable | Required | Default                       | Description                     |
-        | ---------------------- | -------- | ----------------------------- | ------------------------------- |
-        | KODI_ID                | Yes      |                               | A unique ID                     |
-        | KODI_URL               | Yes      | http://localhost:8080/jsonrpc | The URL of the Kodi server      |
-        | KODI_USERNAME          | No       |                               | The username set                |
-        | KODI_PASSWORD          | No       |                               | The password set                |
-        | KODI_NAME              | No       |                               | A vanity name different than ID |
+<ENVConfig/>
 </Config>

docsite/docs/configuration/sources/koito-source.mdx

@@ -9,6 +9,7 @@ import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 import CodeBlock from '@theme/CodeBlock';
 import KoitoConfig from '!!raw-loader!@site/../config/koito.json.example';
+import ENVConfig from "@site/docs/configuration/sources/_env_configs/_koito.md"
 
 This Source monitors a Koito account's scrobble history and then re-scrobbles discovered tracks to configured [Clients.](/configuration/clients)
 
@@ -24,12 +25,6 @@ See the [Koito (Client)](/configuration/clients/koito) configuration for general
 
 #### Configuration
 
-<Config config="KoitoSourceConfig" fileContent={KoitoConfig} name="koito">
-        | Environmental Variable | Required? | Default | Description                       |
-        | :--------------------- | --------- | ------- | --------------------------------- |
-        | `SOURCE_KOITO_ID`      | Yes       |         | A unique ID                       |
-        | `SOURCE_KOITO_TOKEN`   | Yes       |         | API Key from your Koito Account   |
-        | `SOURCE_KOITO_USER`    | Yes       |         | Your Koito username               |
-        | `SOURCE_KOITO_URL`     | No        |         | The base URL for the Koito server |
-        | `SOURCE_KOITO_NAME`    | No        |         | A vanity name differen than ID    |
+<Config config="KoitoSourceConfig" fileContent={KoitoConfig} configureAs ambiguous name="koito">
+<ENVConfig/>
 </Config>

docsite/docs/configuration/sources/lastfm-endpoint.mdx

@@ -8,6 +8,7 @@ import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 import CodeBlock from '@theme/CodeBlock';
 import LastfmEndpointConfig from '!!raw-loader!@site/../config/endpointlfm.json.example';
+import ENVConfig from "@site/docs/configuration/sources/_env_configs/_endpointlfm.md"
 
 This Source enables multi-scrobbler to accept scrobbles from outside applications as if it was a Last.fm server.
 
@@ -18,31 +19,147 @@ This Source enables multi-scrobbler to accept scrobbles from outside application
 
 :::
 
-### URL
+<DetailsAdmo type="tip" summary="Recommended Alternative">
 
-If a **slug** is **not** provided in configuration then multi-scrobbler will accept Last.fm scrobbles at
+This Source has the same data limitations as the [Last.fm (Source)](/configuration/sources/lastfm-source) and [Last.fm (Client)](/configuration/clients/lastfm) have: Last.fm does not support separating artists/album artists fields which means any multi-artist tracks will have all artists combined into one string. This makes scrobbling to other services, and using metadata corrections like [Musicbrainz](/configuration/transforms/musicbrainz), more difficult.
+
+If your application has the option to scrobble using Listenbrainz then use the [Listenbrainz (Endpoint)](/configuration/sources/listenbrainz-endpoint) Source instead.
+
+</DetailsAdmo>
+
+## Setup
+
+:::tip[Scenario Picker]
+
+Use **one** of the scenarios below based on how on your service(s) (things "scrobbling" to Multi-Scrobbler using this Source) will need to interact with MS.
+
+<Tabs groupId="scenario" queryString>
+    <TabItem value="single" label="One Service">
+      > You have **one** service, like Panoscrobbler, that will scrobble to Multi-Scrobbler.
+
+      Configure **one** Last.fm Endpoint Source. Use the [standard base URL](#standard-base-url) to configure your service and [apikey/user](#authentication), if necessary. Use the same apikey/user in MS as you do in your service.
+
+    </TabItem>
+    <TabItem value="multiple" label="Many Services, Same User">
+      > You may have **more than one** service that will scrobble to Multi-Scrobbler, like ArchiveTune and Panoscrobbler.
+      >
+      > All of these services will scrobble for the same user (you) and all of the scrobbles should go to the same [Clients](/configuration/clients).
+
+      Configure **one** Lastfm Endpoint Source. Use the [standard base URL](#standard-base-url) to configure your service and configure [apikey/user](#authentication) in MS, if necessary. Use the same apikey/user for all your services as you configure in MS.
+    </TabItem>
+    <TabItem value="multiple-tokens" label="Many Services, Many Users, Can use LFM Account">
+      > You have **more than one** service that will scrobble to Multi-Scrobbler, like ArchiveTune and Panoscrobbler.
+      >
+      > Some of these services should scrobble for different users, scrobble to different [Clients](/configuration/clients), or generally be treated differently (such as for transforms).
+      >
+      > **All** of these services can accept a [**apikey/user**](#authentication) to authenticate a Last.fm user/account.
+
+      Configure one Last.fm Endpoint Sources **per service that should be treated differently**. That is, if multiple services are all "the same user" then you only need one Source for that entire group of services.
+
+      For each Lastfm Endpoint Source, configure a different [apikey/user](#authentication). Use that same apikey/user when configuring Last.fm for the associated service.
+
+      All Last.fm Endpoint Sources should use the same [standard base URL](#standard-base-url).
+    </TabItem>
+    <TabItem value="multiple-slug" label="Many Services, Many Users, Cannot use LFM Account">
+      > You have **more than one** service that will scrobble to Multi-Scrobbler, like ArchiveTune and Panoscrobbler.
+      >
+      > Some of these services should scrobble for different users, scrobble to different [Clients](/configuration/clients), or generally be treated differently (such as for transforms).
+      >
+      > All, or some, of these services **cannot** accept an [apikey/user](#authentication) to authenticate a Last.fm user/account.
+
+      **This is not a common scenario** but if it fits your usecase then use these guidelines to differentiate your services:
+
+      Configure one Last.fm Endpoint Sources **per service that should be treated differently**. That is, if multiple services are all "the same user" then you only need one Source for that entire group of services.
+
+      * For any groups of services that **can use [apikey/user](#authentication)**, use the instructions for [Many Services, Many Users, Can use LFM Account](./?scenario=multiple-tokens#setup)
+      * For any groups of services that **cannot accept** an apikey/user...
+        * You can still configure a Source **without an [apikey/user](#authentication)**. Any services not using an account will use this "default" Source.
+        * If multiple groups cannot use an apikey/user, or the groups cannot use the [standard base URL](#standard-base-url), then use different [base url **Slugs**](#multiple-sources).
+    </TabItem>
+    <TabItem value="slug" label="Service cannot use standard URL">
+      > You have **one** service, like PanoScrobbler, that will scrobble to Multi-Scrobbler.
+      >
+      > You have already tried the [**One Service**](./?scenario=single#setup) scenario with the [standard base URL](#standard-base-url) but it is not working.
+
+      **This is not a common scenario.** Check the [**Troubleshooting URL**](#troubleshooting-url) section before trying this.
+
+      At this point, you can try to use a different [base url **Slug**](#multiple-sources). Your service must be able to set a "fully custom" URL for Last.fm IE it must allow you to set more than just a domain/host.
+    </TabItem>
+</Tabs>
+
+:::
+
+### Standard Base URL
+
+When setting up your Last.fm client to communicate with Multi-Scrobbler replace the Last.fm domain with your Multi-Scrobbler domain:
+
+https://**last.fm** => https://**yourMSDomain**
+
+MS accepts Last.fm API calls with the same **url base** and structure as the [last.fm api](https://www.last.fm/api/intro), IE `http://yourMSDomain/2.0/`
+
+### Authentication
+
+If you are only setting up **one** Lastfm Endpoint Source then you do not need to configure any explicit username/apiKey/password for MS. If your Last.fm Client requires these credentials use any fake values you want.
+
+<DetailsAdmo type="important" summary="Supported Auth Types">
+
+Currently, Multi-Scrobbler only supports the [**Mobile Application**](https://www.last.fm/api/mobileauth) auth flow. If your client requires one of the other authentication flows please [open an issue](https://github.com/FoxxMD/multi-scrobbler/issues/new?template=02-feature-request.yml).
+
+**Note:** Your client does not **need** to implement any auth in order to use a Lastfm Endpoint Source. You can directly make [`track.scrobble`](https://www.last.fm/api/show/track.scrobble) or [`track.updateNowPlaying`](https://www.last.fm/api/show/track.updateNowPlaying) api calls to `http://yourMSDomain/2.0/` with any fake auth data you want.
+
+</DetailsAdmo>
+
+### Multiple Sources
+
+If you need configure **more than one** Lastfm Endpoint Source then you should configure username/apiKey for MS, per Source. This enables MS to differentiate scrobbles for each Source.
+
+Use the same **username** and/or **API Key** you configure with MS when setting up your Last.fm Client. These values can be anything you want, as long as they match between MS and your client. Password can be anything and is not checked.
+
+However, if you cannot configure username/apiKeys for your scenario you may also use a URL **Slug** to tell MS which Source belongs to a specific user. **This is not a common scenario** and should only be used if username/apiKey configuration is not sufficient or not possible.
+
+<DetailsAdmo type="tip" summary="Different URL Base (Slug)">
+
+If you cannot use different username/apiKey per Source (or Last.fm Client) you can still differentiate Sources by using a different **url base (slug)** for Last.fm communication.
+
+Setting a **slug** in config will change the **url base** for MS like this:
 
 ```
-http://localhost:9078/2.0/
+slug: "mySlug"
+```
+```
+http://yourMsDomain/api/lastfm/mySlug
 ```
 
-which is the "standard" Last.fm server path for scrobbling
+The above url base is equivalent to making calls to `http://yourMSDomain/2.0/`
 
-Use a slug only if you need to setup multiple Last.fm Endpoint sources and cannot use different tokens.
+</DetailsAdmo>
 
-If a slug is used then the URL will be:
+## Troubleshooting URL
 
-```
-http://localhost:9078/api/lastfm/mySlug
-```
+If you think your service should be able to use the [standard base URL](#standard-base-url) but it is not working follow these steps before trying the [the base URL Slug](#multiple-sources).
+
+#### Verify URL Format
+
+Some service may require `http/https` in the URL format (`http://myMSDomainOrIp:9078`) while others may not (`myDomainOrIp:9078`). Check the docs for your service to see if they specify this or have an example. Try both versions, if possible, to see if one works.
+
+<DetailsAdmo type="note" summary="Some Services Require HTTPS">
+
+Some services that can scrobble to a custom Last.fm URL may require the URL to have a real domain (`example.com`) and/or use SSL (`https://`). In this case you should setup multi-scrobbler behind a reverse proxy to support this functionality.
+
+</DetailsAdmo>
+
+#### Is MS is Reachable?
+
+Verify that MS can be accessed by your service, or from the same host as the service is running. See the [**FAQ**](/FAQ/#ingress-connection) for guidance on troubleshooting ingress connection issues.
+
+#### Service Logging
+
+If you service has accessible logging, check to see if it outputs the URL it is trying to reach when authenticating the Last.fm apiKey/user, or trying to make a scrobble request.
+
+If you decide to report this issue, please include this logging in your issue.
 
 ## Configuration
 
 <Config config="LastFMEndpointSourceConfig" fileContent={LastfmEndpointConfig} name="endpointlfm">
-        | Environmental Variable | Required? | Default | Description                                                                                                        |
-        | :--------------------- | :-------- | ------- | ------------------------------------------------------------------------------------------------------------------ |
-        | `LFM_ID`               | Yes       |         | A unique ID                                                                                                        |
-        | `LFM_ENABLE`           | No        |         | Use LFM Endpoint as a Source without any other configuration. Only required if slug/token are not provided as ENVs |
-        | `LFM_SLUG`             | No        |         | (Optional) The URL suffix to use for accepting LFM scrobbles                                                       |
-        | `LFM_NAME`             | No        |         | A vanity name different than ID                                                                                    |
+<ENVConfig/>
 </Config>

docsite/docs/configuration/sources/lastfm-source.mdx

@@ -9,6 +9,7 @@ import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 import CodeBlock from '@theme/CodeBlock';
 import LastfmConfig from '!!raw-loader!@site/../config/lastfm.json.example';
+import ENVConfig from "@site/docs/configuration/sources/_env_configs/_lastfm.md"
 
 This Source **monitors your Last.fm scrobble history** and re-scrobbles new activity to configured [Clients.](/configuration/clients)
 
@@ -23,13 +24,6 @@ To configure this Source use the same registration instructions and configuratio
 
 ## Configuration
 
-<Config config="LastfmSourceConfig" fileContent={LastfmConfig} name="lastfm">
-        | Environmental Variable       | Required? | Default                                 | Description                                                                   |
-        | ---------------------------- | --------- | --------------------------------------- | ----------------------------------------------------------------------------- |
-        | `SOURCE_LASTFM_ID`           | Yes       |                                         | A unique ID                                                                   |
-        | `SOURCE_LASTFM_API_KEY`      | Yes       |                                         | Api Key from your API Account                                                 |
-        | `SOURCE_LASTFM_SECRET`       | Yes       |                                         | Shared secret from your API Account                                           |
-        | `SOURCE_LASTFM_REDIRECT_URI` | No        | `http://localhost:9078/lastfm/callback` | Url to use for authentication. Must include `lastfm/callback` somewhere in it |
-        | `SOURCE_LASTFM_SESSION`      | No        |                                         | Session id. Will be generated by authentication flow if not provided.         |
-        | `SOURCE_LASTFM_NAME`         | No        |                                         | A vanity name different than ID                                               |
+<Config config="LastfmSourceConfig" fileContent={LastfmConfig} configureAs ambiguous name="lastfm">
+<ENVConfig/>
 </Config>

docsite/docs/configuration/sources/librefm-source.mdx

@@ -9,6 +9,7 @@ import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 import CodeBlock from '@theme/CodeBlock';
 import JsonConfig from '!!raw-loader!@site/../config/librefm.json.example';
+import ENVConfig from "@site/docs/configuration/sources/_env_configs/_librefm.md"
 
 This Source **monitors your Libre.fm scrobble history** and re-scrobbles new activity to configured [Clients.](/configuration/clients)
 
@@ -22,15 +23,6 @@ To configure this Source use the same registration instructions and configuratio
 
 ## Configuration
 
-<Config config="LibrefmSourceConfig" fileContent={JsonConfig} name="librefm">
-        | Environmental Variable        | Required? | Default                                  | Description                                                                                      |
-        | ----------------------------- | --------- | ---------------------------------------- | ------------------------------------------------------------------------------------------------ |
-        | `SOURCE_LIBREFM_ID`           | Yes       |                                          | A unique ID                                                                                      |
-        | `SOURCE_LIBREFM_ENABLE`       | No        |                                          | Set to `true` to enable Libre.fm, if not using any of the below variables                        |
-        | `SOURCE_LIBREFM_API_KEY`      | No        | `anything`                               | Optional API Key                                                                                 |
-        | `SOURCE_LIBREFM_SECRET`       | No        | `anything`                               | Optional shared secret                                                                           |
-        | `SOURCE_LIBREFM_REDIRECT_URI` | No        | `http://localhost:9078/librefm/callback` | Url to use for authentication. Must include `librefm/callback` somewhere in it                   |
-        | `SOURCE_LIBREFM_SESSION`      | No        |                                          | Session id. Will be generated by authentication flow if not provided.                            |
-        | `SOURCE_LIBREFM_URLBASE`      | No        |                                          | Use for custom Libre.fm instance only. The host + path prefix EX `https://my.libre.example/2.0/` |
-        | `SOURCE_LIBREFM_NAME`         | No        |                                          | A vanity name different than ID                                                                  |
+<Config config="LibrefmSourceConfig" fileContent={JsonConfig} configureAs ambiguous name="librefm">
+<ENVConfig/>
 </Config>

docsite/docs/configuration/sources/listenbrainz-endpoint.mdx

@@ -8,6 +8,7 @@ import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 import CodeBlock from '@theme/CodeBlock';
 import ListenbrainzEndpointConfig from '!!raw-loader!@site/../config/endpointlz.json.example';
+import ENVConfig from "@site/docs/configuration/sources/_env_configs/_endpointlz.md"
 
 This Source enables multi-scrobbler to accept scrobbles from outside applications **as if it was a Listenbrainz server.**
 
@@ -22,16 +23,76 @@ If your service/player has a "Scrobble to Listenbrainz" feature and there is an
 
 ## Setup
 
-### URL
+:::tip[Scenario Picker]
 
-In general, you should use one of the following as the **base URL** when configuring your application to scrobble to multi-scrobbler:
+Use **one** of the scenarios below based on how on your service(s) (things "scrobbling" to Multi-Scrobbler using this Source) will need to interact with MS.
+
+<Tabs groupId="scenario" queryString>
+    <TabItem value="single" label="One Service">
+      > You have **one** service, like Navidrome, that will scrobble to Multi-Scrobbler.
+
+      Configure **one** Listenbrainz Endpoint Source. Use the [standard base URL](#standard-base-url) to configure your service and set a [Token](#token), if necessary. Use the same **Token** in MS as you do in your service.
+
+    </TabItem>
+    <TabItem value="multiple" label="Many Services, Same User">
+      > You may have **more than one** service that will scrobble to Multi-Scrobbler, like Navidrome and Panoscrobbler.
+      >
+      > All of these services will scrobble for the same user (you) and all of the scrobbles should go to the same [Clients](/configuration/clients).
+
+      Configure **one** Listenbrainz Endpoint Source. Use the [standard base URL](#standard-base-url) to configure your service and configure a [Token](#token) in MS, if necessary. Use the same token for all your services as you configure in MS.
+    </TabItem>
+    <TabItem value="multiple-tokens" label="Many Services, Many Users, Can use Tokens">
+      > You have **more than one** service that will scrobble to Multi-Scrobbler, like Navidrome and Panoscrobbler.
+      >
+      > Some of these services should scrobble for different users, scrobble to different [Clients](/configuration/clients), or generally be treated differently (such as for transforms).
+      >
+      > **All** of these services can accept a **Token** to authenticate a Listenbrainz user/account.
+
+      Configure one Listenbrainz Endpoint Sources **per service that should be treated differently**. That is, if multiple services are all "the same user" then you only need one Source for that entire group of services.
+
+      For each Listenbrainz Endpoint Source, configure a different [**Token**](#token). Use that same token when configuring Listenbrainz for the associated service.
+
+      All Listenbrainz Endpoint Sources should use the same [standard base URL](#standard-base-url).
+    </TabItem>
+    <TabItem value="multiple-slug" label="Many Services, Many Users, Cannot use Tokens">
+      > You have **more than one** service that will scrobble to Multi-Scrobbler, like Navidrome and Panoscrobbler.
+      >
+      > Some of these services should scrobble for different users, scrobble to different [Clients](/configuration/clients), or generally be treated differently (such as for transforms).
+      >
+      > All, or some, of these services **cannot** accept a **Token** to authenticate a Listenbrainz user/account.
+
+      **This is not a common scenario** but if it fits your usecase then use these guidelines to differentiate your services:
+
+      Configure one Listenbrainz Endpoint Sources **per service that should be treated differently**. That is, if multiple services are all "the same user" then you only need one Source for that entire group of services.
+
+      * For any groups of services that **can accept** a token, use the instructions for [Many Services, Many Users, Can use Tokens](./?scenario=multiple-tokens#setup)
+      * For any groups of services that **cannot accept** a token...
+        * You can still configure a Source **without a [Token](#token)**. Any services not using a token will use this "default" Source.
+        * If multiple groups cannot use a token, or the groups cannot use the [standard base URL](#standard-base-url), then use different [base url **Slugs**](#multiple-sources).
+    </TabItem>
+    <TabItem value="slug" label="Service cannot use standard URL">
+      > You have **one** service, like Navidrome, that will scrobble to Multi-Scrobbler.
+      >
+      > You have already tried the [**One Service**](./?scenario=single#setup) scenario with both [standard base URL](#standard-base-url) and neither is working.
+
+      **This is not a common scenario.** Check the [**Troubleshooting URL**](#troubleshooting-url) section before trying this.
+
+      At this point, you can try to use a different [base url **Slug**](#multiple-sources). Your service must be able to set a "fully custom" URL for Listenbrainz IE it must allow you to set more than just a domain/host.
+    </TabItem>
+</Tabs>
+
+:::
+
+### Standard Base URL
+
+In most scenarios you should use one of the following as the **base URL** when configuring your service to scrobble to multi-scrobbler:
 
 * `http://myMultiScrobblerIP:9078`
 * `http://myMultiScrobblerIP:9078/1/`
 
 <DetailsAdmo type="tip" summary="Default Scrobble Submit URL">
 
-If you are not using a [slug for multiple endpoints](#multiple-endpoints) then multi-scrobbler will accept Listenbrainz scrobbles at
+Multi-scrobbler will accept Listenbrainz scrobbles at
 
 ```
 http://myMultiScrobblerIP:9078/1/submit-listens
@@ -41,41 +102,34 @@ which is the **standard** Listenbrainz server path for scrobbling.
 
 </DetailsAdmo>
 
-<DetailsAdmo type="note" summary="Some Services Require HTTPS">
-
-Some services that can scrobble to a custom Listenbrainz URL may require the URL to have a real domain (`example.com`) and/or use SSL (`https://`). In this case you should setup multi-scrobbler behind a reverse proxy to support this functionality. It is out of the scope of this project to do this solely within multi-scrobbler.
-
-</DetailsAdmo>
-
 ### Token
 
-Most Listenbrainz clients require a token (Authentication Token) to be provided during setup. This value can be anything you want, just make sure to use the same value for `token` in your multi-scrobbler configuration for the endpoint.
+Most Listenbrainz clients require an Authentication Token to be provided during setup. This value can be anything you want but ensure you use the same value for `token` (ENV `LZE_TOKEN`) in your configuration for this Listenbrainz Endpoint Source.
 
-### Multiple Endpoints
+If your service does not require a token, or does not let you set one, then do not configure it for this Source either.
 
-If you are setting up multiple [Listenbrainz (Endpoint) Sources](/configuration/sources/listenbrainz-endpoint) MS can differentiate scrobbles based on [Token](#token) so that you can use the same endpoint for many users.
+### Multiple Sources
 
-However, if you cannot configure multiple tokens for your scenario you may also use a URL **Slug** to tell MS which Source belongs to a specific user.
+If you need configure **more than one** Listenbrainz Endpoint Source then MS can differentiate scrobbles based on [Token](#token) so that you can use the [**same, standard base URL**](#standard-base-url) for many users.
 
-<details>
+However, if you cannot configure multiple tokens for your scenario you may also use a URL **Slug** to tell MS which Source belongs to a specific user. **This is not a common scenario** and should only be used if **Token** configuration is not sufficient or not possible.
 
-<summary>Using a Slug</summary>
+<DetailsAdmo type="tip" summary="Different URL Base (Slug)">
 
-When a **slug** is defined in ENV/File config MS will listen for listenbrainz routes using the slug as a the route path. Example:
+When a **slug** is defined in ENV/File config MS will listen for listenbrainz `submit-listens` requests using the slug as the base route path. Example:
 
 ```
 LZE_SLUG=foobar
 ```
 
-MS will accept calls to 
+MS will accept requests for `submit-listens` (scrobble submissions and now playing) at 
 
 ```
 http://myMultiScrobblerIP:9078/api/listenbrainz/foobar
+http://myMultiScrobblerIP:9078/api/listenbrainz/foobar/submit-listens
 ```
 
-for scrobble submission.
-
-</details>
+</DetailsAdmo>
 
 ## Setup for Popular Apps
 
@@ -99,22 +153,39 @@ Set the [**ListenBrainz.BaseURL**](https://www.navidrome.org/docs/usage/configur
 * In the ListenBrainz Scrobbler configuration screen:
   * User Token is the [Token](#token) you configured
   * Toggle **Show advanced settings**
-    * Base URL is the [URL](#url) you can configured, or the equivalent of `http://myMultiScrobblerIP:9078` for your MS instance
+    * Base URL is the [URL](#standard-base-url) you can configured, or the equivalent of `http://myMultiScrobblerIP:9078` for your MS instance
 * Save the configuration and you are ready to scrobble
 
 To troubleshoot any errors, and assuming you are using Home Assistant, view the Logs in the Music Assistant Add-ons. Please include these logs in any reported issue.
 
 </details>
 
+## Troubleshooting URL
+
+If you think your service should be able to use the [standard base URL](#standard-base-url) but it is not working follow these steps before trying the [the base URL Slug](#multiple-sources).
+
+#### Verify URL Format
+
+Some service may require `http/https` in the URL format (`http://myMSDomainOrIp:9078`) while others may not (`myDomainOrIp:9078`). Check the docs for your service to see if they specify this or have an example. Try both versions, if possible, to see if one works.
+
+<DetailsAdmo type="note" summary="Some Services Require HTTPS">
+
+Some services that can scrobble to a custom Listenbrainz URL may require the URL to have a real domain (`example.com`) and/or use SSL (`https://`). In this case you should setup multi-scrobbler behind a reverse proxy to support this functionality.
+
+</DetailsAdmo>
+
+#### Is MS is Reachable?
+
+Verify that MS can be accessed by your service, or from the same host as the service is running. See the [**FAQ**](/FAQ/#ingress-connection) for guidance on troubleshooting ingress connection issues.
+
+#### Service Logging
+
+If you service has accessible logging, check to see if it outputs the URL it is trying to reach when authenticating the Listenbrainz account/user, or trying to make a scrobble request.
+
+If you decide to report this issue, please include this logging in your issue.
+
 ## Configuration
 
 <Config config="ListenbrainzEndpointSourceConfig" fileContent={ListenbrainzEndpointConfig} name="endpointlz">
-        | Environmental Variable | Required? | Default | Description                                                                                                                                                |
-        | :--------------------- | :-------- | ------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------- |
-        | `LZE_ID`               | Yes       |         | A unique ID                                                                                                                                                |
-        | `LZE_ENABLE`           | No        |         | Use LZ Endpoint as a Source without any other configuration. Only required if slug/token are not provided as ENVs                                          |
-        | `LZE_TOKEN`            | No        |         | LZ "Authentication Token" you provided to the scrobbling application                                                                                       |
-        | `LZE_SLUG`             | No        |         | (Optional) The URL suffix to use for accepting LZ scrobbles                                                                                                |
-        | `LZE_USERNAME`         | No        |         | (Optional) A fake username that will be returned for token validation and on now-playing responses. If none is provided the Source's name is used instead. |
-        | `LZE_NAME`             | No        |         | A vanity name different than ID                                                                                                                            |
+<ENVConfig/>
 </Config>

docsite/docs/configuration/sources/listenbrainz-source.mdx

@@ -9,6 +9,7 @@ import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 import CodeBlock from '@theme/CodeBlock';
 import ListenbrainzConfig from '!!raw-loader!@site/../config/listenbrainz.json.example';
+import ENVConfig from "@site/docs/configuration/sources/_env_configs/_listenbrainz.md"
 
 This Source monitors a Listenbrainz account's scrobble history and then re-scrobbles discovered tracks to configured clients.
 
@@ -23,14 +24,21 @@ You will need to run your own Listenbrainz server or have an account [on the off
 
 On your [profile page](https://listenbrainz.org/profile/) find your **User Token** to use in the configuration.
 
+:::important[Contact]
+
+It is **strongly recommended** to include `contact` (File/AIO) or `SOURCE_LZ_CONTACT` (ENV) property in your configuration.
+
+This is a [new requirement from Listenbrainz](https://listenbrainz.readthedocs.io/en/latest/users/api/index.html#id5) to help with bot/spam prevention.
+
+**Your traffic to Listenbrainz is more likely to be blocked if this point of contact is not included!**
+
+It is currently optional due to backwards compatibility but will likely become mandatory for Multi-Scrobbler config in the future.
+
+:::
+
+
 ## Configuration
 
-<Config config="ListenBrainzSourceConfig" fileContent={ListenbrainzConfig} name="listenbrainz">
-        | Environmental Variable | Required? | Default                       | Description                     |
-        | ---------------------- | --------- | ----------------------------- | ------------------------------- |
-        | `SOURCE_LZ_ID`         | Yes       |                               | A unique ID                     |
-        | `SOURCE_LZ_TOKEN`      | Yes       |                               | User token from your LZ profile |
-        | `SOURCE_LZ_USER`       | Yes       |                               | Your LZ username                |
-        | `SOURCE_LZ_URL`        | No        | https://api.listenbrainz.org/ | The base URL for the LZ server  |
-        | `SOURCE_LZ_NAME`       | No        |                               | A vanity name different than ID |d
+<Config config="ListenBrainzSourceConfig" fileContent={ListenbrainzConfig} configureAs ambiguous name="listenbrainz">
+<ENVConfig/>
 </Config>

docsite/docs/configuration/sources/maloja.mdx

@@ -8,6 +8,7 @@ import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 import CodeBlock from '@theme/CodeBlock';
 import MalojaConfig from '!!raw-loader!@site/../config/maloja.json.example';
+import ENVConfig from "@site/docs/configuration/sources/_env_configs/_maloja.md"
 
 :::tip[Other Uses]
 
@@ -21,11 +22,6 @@ See the [Maloja (Client)](/configuration/clients/maloja) configuration for gener
 
 ## Configuration
 
-<Config config="MalojaSourceConfig" fileContent={MalojaConfig} name="maloja">
-        | Environmental Variable  | Required? | Default | Description                     |
-        | ----------------------- | --------- | ------- | ------------------------------- |
-        | `SOURCE_MALOJA_ID`      | Yes       |         | A unique ID                     |
-        | `SOURCE_MALOJA_URL`     | Yes       |         | Base URL of your installation   |
-        | `SOURCE_MALOJA_API_KEY` | Yes       |         | Api Key                         |
-        | `SOURCE_MALOJA_NAME`    | Yes       |         | A vanity name different than ID |
+<Config config="MalojaSourceConfig" fileContent={MalojaConfig} configureAs ambiguous name="maloja">
+<ENVConfig/>
 </Config>

docsite/docs/configuration/sources/mopidy.mdx

@@ -8,6 +8,7 @@ import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 import CodeBlock from '@theme/CodeBlock';
 import MopidyConfig from '!!raw-loader!@site/../config/mopidy.json.example';
+import ENVConfig from "@site/docs/configuration/sources/_env_configs/_mopidy.md"
 
 Mopidy is a headless music server that supports playing music from many [standard and non-standard sources such as Pandora, Bandcamp, and Tunein.](https://mopidy.com/ext/)
 
@@ -98,5 +99,5 @@ For certain sources (Soundcloud) Mopidy does not have all track info (Album) and
 ## Configuration
 
 <Config config="MopidySourceConfig" fileContent={MopidyConfig} name="mopidy">
-No ENV support
+<ENVConfig/>
 </Config>

docsite/docs/configuration/sources/mpd.mdx

@@ -8,6 +8,7 @@ import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 import CodeBlock from '@theme/CodeBlock';
 import MPDConfig from '!!raw-loader!@site/../config/mpd.json.example';
+import ENVConfig from "@site/docs/configuration/sources/_env_configs/_mpd.md"
 
 MS communicates with MPD using the [TCP client connection.](https://mpd.readthedocs.io/en/stable/user.html#client-connections)
 
@@ -23,10 +24,5 @@ Multi-scrobbler requires only the [`read`](https://mpd.readthedocs.io/en/stable/
 ## Configuration
 
 <Config config="MPDSourceConfig" fileContent={MPDConfig} name="mpd">
-        | Environmental Variable | Required? | Default          | Description                     |
-        | ---------------------- | --------- | ---------------- | ------------------------------- |
-        | `MPD_ID`               | Yes       |                  | A unique ID                     |
-        | `MPD_URL`              | No        | `localhost:6600` |                                 |
-        | `MPD_PASSWORD`         | No        |                  |                                 |
-        | `MPD_NAME`             | No        |                  | A vanity name different than ID |
+<ENVConfig/>
 </Config>

docsite/docs/configuration/sources/mpris.mdx

@@ -8,6 +8,7 @@ import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 import CodeBlock from '@theme/CodeBlock';
 import MPRISConfig from '!!raw-loader!@site/../config/mpris.json.example';
+import ENVConfig from "@site/docs/configuration/sources/_env_configs/_mpris.md"
 
 [MPRIS](https://specifications.freedesktop.org/mpris-spec/latest) is a standard interface for communicating with Music Players on **linux operating systems.**
 
@@ -71,11 +72,5 @@ MPRIS communication requires multi-scrobbler to have access to the host's dbus-d
 ## Configuration
 
 <Config config="MPRISSourceConfig" fileContent={MPRISConfig} name="mpris">
-        | Environmental Variable | Required? | Default | Description                                                                      |
-        | ---------------------- | --------- | ------- | -------------------------------------------------------------------------------- |
-        | MPRIS_ID               | Yes       |         | A unique ID                                                                      |
-        | MPRIS_ENABLE           | No        |         | Use MPRIS as a Source (useful when you don't need any other options)             |
-        | MPRIS_BLACKLIST        | No        |         | Comma-delimited list of player names not to scrobble from                        |
-        | MPRIS_WHITELIST        | No        |         | Comma-delimited list of players names to ONLY scrobble from. Overrides blacklist |
-        | MPRIS_NAME             | No        |         | A vanity name different than ID                                                  |
+<ENVConfig/>
 </Config>

docsite/docs/configuration/sources/musikcube.mdx

@@ -8,6 +8,7 @@ import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 import CodeBlock from '@theme/CodeBlock';
 import MusikcubeConfig from '!!raw-loader!@site/../config/musikcube.json.example';
+import ENVConfig from "@site/docs/configuration/sources/_env_configs/_musikcube.md"
 
 In order to use [Musikcube](https://musikcube.com) configure it to accept [websocket connections](https://github.com/clangen/musikcube/wiki/remote-api-documentation) in **server setup**:
 
@@ -31,10 +32,5 @@ If no URL is provided to MS it will try to use `ws://localhost:7905`
 ## Configuration
 
 <Config config="MusikcubeSourceConfig" fileContent={MusikcubeConfig} name="musikcube">
-        | Environmental Variable | Required? | Default               | Description                          |
-        | ---------------------- | --------- | --------------------- | ------------------------------------ |
-        | `MC_ID`                | Yes       |                       | A unique ID                          |
-        | `MC_URL`               | No        | `ws://localhost:7905` | Use port set for **metadata server** |
-        | `MC_PASSWORD`          | Yes       |                       |                                      |
-        | `MC_NAME`              | No        |                       | A vanity name different than ID      |
+<ENVConfig/>
 </Config>

docsite/docs/configuration/sources/plex.mdx

@@ -9,6 +9,7 @@ import TabItem from '@theme/TabItem';
 import CodeBlock from '@theme/CodeBlock';
 import AzuracastConfig from '!!raw-loader!@site/../config/azuracast.json.example';
 import PlexConfig from '!!raw-loader!@site/../config/plex.json.example';
+import ENVConfig from "@site/docs/configuration/sources/_env_configs/_plex.md"
 
 Find your [**Plex Token**](https://support.plex.tv/articles/204059436-finding-an-authentication-token-x-plex-token/) and make note of the **URL** and **Port** used to connect to your Plex instance.
 
@@ -194,16 +195,5 @@ To configure MS to use Musicbrainz with your Plex metadata use one of the method
 #### Configuration
 
 <Config config="PlexApiSourceConfig" fileContent={PlexConfig} name="plex">
-        | Environmental Variable | Required? | Default | Description                                                            |
-        | ---------------------- | --------- | ------- | ---------------------------------------------------------------------- |
-        | `PLEX_ID`              | **Yes**   |         | A unique ID                                                            |
-        | `PLEX_URL`             | **Yes**   |         | The URL of the Plex server IE `http://localhost:32400`                 |
-        | `PLEX_TOKEN`           | **Yes**   |         | The **Plex Token** to use with the API                                 |
-        | `PLEX_USERS_ALLOW`     | No        |         | Comma-separated list of usernames (from Plex) to scrobble for          |
-        | `PLEX_USERS_BLOCK`     | No        |         | Comma-separated list of usernames (from Plex) to disallow scrobble for |
-        | `PLEX_DEVICES_ALLOW`   | No        |         | Comma-separated list of devices to scrobble from                       |
-        | `PLEX_DEVICES_BLOCK`   | No        |         | Comma-separated list of devices to disallow scrobbles from             |
-        | `PLEX_LIBRARIES_ALLOW` | No        |         | Comma-separated list of libraries to allow scrobbles from              |
-        | `PLEX_LIBRARIES_BLOCK` | No        |         | Comma-separated list of libraries to disallow scrobbles from           |
-        | `PLEX_NAME`            | No        |         | A vanity name different than ID                                        |
+<ENVConfig/>
 </Config>

docsite/docs/configuration/sources/rocksky-source.mdx

@@ -9,6 +9,7 @@ import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 import CodeBlock from '@theme/CodeBlock';
 import JsonConfig from '!!raw-loader!@site/../config/rocksky.json.example';
+import ENVConfig from "@site/docs/configuration/sources/_env_configs/_rocksky.md"
 
 :::tip[Other Uses]
 
@@ -32,11 +33,6 @@ See the [Rocksky (Client)](/configuration/clients/rocksky#setup) configuration f
 
 * [File/AIO config](/configuration?configType=file#configuration-types) must include `"configureAs": "source"`
 
-<Config config="RockskySourceConfig" fileContent={JsonConfig} name="rocksky">
-        | Environmental Variable  | Required? | Default | Description                                                                         |
-        | :---------------------- | --------- | ------- | ----------------------------------------------------------------------------------- |
-        | `SOURCE_ROCKSKY_ID`     | Yes       |         | A unique ID                                                                         |
-        | `SOURCE_ROCKSKY_HANDLE` | Yes       |         | Your **full** ATProto handle. For Bluesky account this is like `myUser.bsky.social` |
-        | `SOURCE_ROCKSKY_KEY`    | Yes       |         | API Key obtained from Rocksky developer dashboard                                   |
-        | `SOURCE_ROCKSKY_NAME`   | No        |         | A vanity name different than ID                                                     |
+<Config config="RockskySourceConfig" fileContent={JsonConfig} configureAs ambiguous name="rocksky">
+<ENVConfig/>
 </Config>

docsite/docs/configuration/sources/sonos.mdx

@@ -8,6 +8,7 @@ import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 import CodeBlock from '@theme/CodeBlock';
 import JsonConfig from '!!raw-loader!@site/../config/sonos.json.example';
+import ENVConfig from "@site/docs/configuration/sources/_env_configs/_sonos.md"
 
 Multi-scrobbler can use the [Sonos](https://www.sonos.com) [local API](https://docs.sonos.com/docs/control) to monitor what your Sonos system is playing.
 
@@ -90,13 +91,5 @@ The **optional** `devices` and `groups` related properties found in the config b
 You **must** define the IP address of at least one Sonos/accessory in order for Multi-scrobbler to connect to your Sonos system.
 
 <Config config="SonosSourceConfig" fileContent={JsonConfig} name="sonos">
-        | Environmental Variable | Required? | Default | Description                                                            |
-        | ---------------------- | --------- | ------- | :--------------------------------------------------------------------- |
-        | `SONOS_ID`             | Yes       |         | A unique ID                                                            |
-        | `SONOS_HOST`           | Yes       |         | The IP address of any active Sonos device/accessory EX `192.168.0.150` |
-        | `SONOS_DEVICES_ALLOW`  | No        |         | Comma-separated list of Sonos device names to scrobble from            |
-        | `SONOS_DEVICES_BLOCK`  | No        |         | Comma-separated list of Sonos device names to disallow scrobbles from  |
-        | `SONOS_GROUPS_ALLOW`   | No        |         | Comma-separated list of device group names to scrobble from            |
-        | `SONOS_GROUPS_BLOCK`   | No        |         | Comma-separated list of devices group names to disallow scrobbles from |
-        | `SONOS_NAME`           | No        |         | A vanity name different than ID                                        |
+<ENVConfig/>
 </Config>

docsite/docs/configuration/sources/sources.mdx

@@ -13,36 +13,37 @@ A **Source** is a data source that contains information about tracks you are pla
 
 ## Sources
 
-| Name                                                                    | Networking                                               | Scrobble SOT                                        | [Multi Device/User](#multi-deviceuser) | [Scrobble Destination](#limiting-scrobble-destination) | [Thresholds](#scrobble-thresholds) | [Should Scrobble](#should-scrobble-behavior) |
-| :---------------------------------------------------------------------- | :------------------------------------------------------- | :-------------------------------------------------- | :------------------------------------- | :----------------------------------------------------- | :--------------------------------- | :------------------------------------------- |
-| [Azuracast](/configuration/sources/azuracast)                           | [Active](./?sourceComm=active#by-communication-method)   | [Activity](./?sot=activity#by-data-source-of-truth) | ❌                                     | ✅                                                     | ✅                                 | ✅                                           |
-| [Deezer](/configuration/sources/deezer)                                 | [Active](./?sourceComm=active#by-communication-method)   | [History](./?sot=history#by-data-source-of-truth)   | ✅                                     | ✅                                                     | ❌                                 | ❌                                           |
-| [Google Cast (Chromecast)](/configuration/sources/google-cast)          | [Active](./?sourceComm=active#by-communication-method)   | [Activity](./?sot=activity#by-data-source-of-truth) | ✅                                     | ✅                                                     | ✅                                 | ❌                                           |
-| [Icecast](/configuration/sources/icecast)                               | [Active](./?sourceComm=active#by-communication-method)   | [Activity](./?sot=activity#by-data-source-of-truth) | ❌                                     | ✅                                                     | ✅                                 | ✅                                           |
-| [Jellyfin](/configuration/sources/jellyfin)                             | [Active](./?sourceComm=active#by-communication-method)   | [Activity](./?sot=activity#by-data-source-of-truth) | ✅                                     | ✅                                                     | ✅                                 | ❌                                           |
-| [JRiver](/configuration/sources/jriver)                                 | [Active](./?sourceComm=active#by-communication-method)   | [Activity](./?sot=activity#by-data-source-of-truth) | ❌                                     | ✅                                                     | ✅                                 | ❌                                           |
-| [Kodi](/configuration/sources/kodi)                                     | [Active](./?sourceComm=active#by-communication-method)   | [Activity](./?sot=activity#by-data-source-of-truth) | ❌                                     | ✅                                                     | ✅                                 | ❌                                           |
-| [Koito](/configuration/sources/koito-source)                            | [Active](./?sourceComm=active#by-communication-method)   | [History](./?sot=history#by-data-source-of-truth)   | ❌                                     | ✅                                                     | ❌                                 | ❌                                           |
-| [Last.fm](/configuration/sources/lastfm-source)                         | [Active](./?sourceComm=active#by-communication-method)   | [History](./?sot=history#by-data-source-of-truth)   | ❌                                     | ✅                                                     | ❌                                 | ❌                                           |
-| [Libre.fm](/configuration/sources/librefm-source)                       | [Active](./?sourceComm=active#by-communication-method)   | [History](./?sot=history#by-data-source-of-truth)   | ❌                                     | ✅                                                     | ❌                                 | ❌                                           |
-| [Last.fm (Endpoint)](/configuration/sources/lastfm-endpoint)            | [Ingress](./?sourceComm=ingress#by-communication-method) | [History](./?sot=history#by-data-source-of-truth)   | ❌                                     | ✅                                                     | ❌                                 | ❌                                           |
-| [ListenBrainz](/configuration/sources/listenbrainz-source)              | [Active](./?sourceComm=active#by-communication-method)   | [History](./?sot=history#by-data-source-of-truth)   | ❌                                     | ✅                                                     | ❌                                 | ❌                                           |
-| [ListenBrainz (Endpoint)](/configuration/sources/listenbrainz-endpoint) | [Ingress](./?sourceComm=ingress#by-communication-method) | [History](./?sot=history#by-data-source-of-truth)   | ❌                                     | ✅                                                     | ❌                                 | ❌                                           |
-| [Maloja](/configuration/sources/maloja)                                 | [Active](./?sourceComm=active#by-communication-method)   | [History](./?sot=history#by-data-source-of-truth)   | ❌                                     | ✅                                                     | ❌                                 | ❌                                           |
-| [Mopidy](/configuration/sources/mopidy)                                 | [Active](./?sourceComm=active#by-communication-method)   | [Activity](./?sot=activity#by-data-source-of-truth) | ❌                                     | ✅                                                     | ✅                                 | ❌                                           |
-| [MPD (Music Player Daemon)](/configuration/sources/mpd)                 | [Active](./?sourceComm=active#by-communication-method)   | [Activity](./?sot=activity#by-data-source-of-truth) | ❌                                     | ✅                                                     | ✅                                 | ❌                                           |
-| [Musikcube](/configuration/sources/musikcube)                           | [Active](./?sourceComm=active#by-communication-method)   | [Activity](./?sot=activity#by-data-source-of-truth) | ❌                                     | ✅                                                     | ✅                                 | ❌                                           |
-| [Plex](/configuration/sources/plex)                                     | [Active](./?sourceComm=active#by-communication-method)   | [Activity](./?sot=activity#by-data-source-of-truth) | ✅                                     | ✅                                                     | ✅                                 | ❌                                           |
-| [Rocksky](/configuration/sources/rocksky-source)                        | [Active](./?sourceComm=active#by-communication-method)   | [History](./?sot=history#by-data-source-of-truth)   | ❌                                     | ✅                                                     | ❌                                 | ❌                                           |
-| [Sonos](/configuration/sources/sonos)                                   | [Active](./?sourceComm=active#by-communication-method)   | [Activity](./?sot=activity#by-data-source-of-truth) | ✅                                     | ✅                                                     | ✅                                 | ❌                                           |
-| [Spotify](/configuration/sources/spotify)                               | [Active](./?sourceComm=active#by-communication-method)   | [Activity](./?sot=activity#by-data-source-of-truth) | ✅                                     | ✅                                                     | ✅                                 | ❌                                           |
-| [Subsonic-compatible APIs](/configuration/sources/subsonic)             | [Active](./?sourceComm=active#by-communication-method)   | [Activity](./?sot=activity#by-data-source-of-truth) | ✅                                     | ✅                                                     | ✅                                 | ❌                                           |
-| [teal.fm](/configuration/sources/tealfm-source)                         | [Active](./?sourceComm=active#by-communication-method)   | [History](./?sot=history#by-data-source-of-truth)   | ❌                                     | ✅                                                     | ❌                                 | ❌                                           |
-| [WebScrobbler](/configuration/sources/webscrobbler)                     | [Ingress](./?sourceComm=active#by-communication-method)  | [History](./?sot=history#by-data-source-of-truth)   | ❌                                     | ✅                                                     | ❌                                 | ❌                                           |
-| [VLC](/configuration/sources/vlc)                                       | [Active](./?sourceComm=active#by-communication-method)   | [Activity](./?sot=activity#by-data-source-of-truth) | ❌                                     | ✅                                                     | ✅                                 | ❌                                           |
-| [Yamaha MusicCast](/configuration/sources/yamaha-musiccast)             | [Active](./?sourceComm=active#by-communication-method)   | [Activity](./?sot=activity#by-data-source-of-truth) | ❌                                     | ✅                                                     | ✅                                 | ❌                                           |
-| [Yandex Music](/configuration/sources/yandex-music)                     | [Active](./?sourceComm=active#by-communication-method)   | [Activity](./?sot=activity#by-data-source-of-truth) |                                        | ✅                                                     | ✅                                 | ❌                                           |
-| [Youtube Music](/configuration/sources/youtube-music)                   | [Active](./?sourceComm=active#by-communication-method)   | [History](./?sot=history#by-data-source-of-truth)   | ❌                                     | ✅                                                     | ❌                                 | ❌                                           |
+| Name                                                                    | Networking                                               | Scrobble SOT                                        | [Multi Device/User](#multi-deviceuser) | [Scrobble Destination](#limiting-scrobble-destination) | [Thresholds](#scrobble-thresholds) | [Auto Monitoring](#monitoring) |
+| :---------------------------------------------------------------------- | :------------------------------------------------------- | :-------------------------------------------------- | :------------------------------------- | :----------------------------------------------------- | :--------------------------------- | :----------------------------- |
+| [Apple Music](/configuration/sources/applemusic)                        | [Active](./?sourceComm=active#by-communication-method)   | [History](./?sot=history#by-data-source-of-truth)   | ❌                                     | ✅                                                     | ❌                                 | ✅                             |
+| [Azuracast](/configuration/sources/azuracast)                           | [Active](./?sourceComm=active#by-communication-method)   | [Activity](./?sot=activity#by-data-source-of-truth) | ❌                                     | ✅                                                     | ✅                                 | ⚠️                             |
+| [Deezer](/configuration/sources/deezer)                                 | [Active](./?sourceComm=active#by-communication-method)   | [History](./?sot=history#by-data-source-of-truth)   | ✅                                     | ✅                                                     | ❌                                 | ✅                             |
+| [Google Cast (Chromecast)](/configuration/sources/google-cast)          | [Active](./?sourceComm=active#by-communication-method)   | [Activity](./?sot=activity#by-data-source-of-truth) | ✅                                     | ✅                                                     | ✅                                 | ✅                             |
+| [Icecast](/configuration/sources/icecast)                               | [Active](./?sourceComm=active#by-communication-method)   | [Activity](./?sot=activity#by-data-source-of-truth) | ❌                                     | ✅                                                     | ✅                                 | ⚠️                             |
+| [Jellyfin](/configuration/sources/jellyfin)                             | [Active](./?sourceComm=active#by-communication-method)   | [Activity](./?sot=activity#by-data-source-of-truth) | ✅                                     | ✅                                                     | ✅                                 | ✅                             |
+| [JRiver](/configuration/sources/jriver)                                 | [Active](./?sourceComm=active#by-communication-method)   | [Activity](./?sot=activity#by-data-source-of-truth) | ❌                                     | ✅                                                     | ✅                                 | ✅                             |
+| [Kodi](/configuration/sources/kodi)                                     | [Active](./?sourceComm=active#by-communication-method)   | [Activity](./?sot=activity#by-data-source-of-truth) | ❌                                     | ✅                                                     | ✅                                 | ✅                             |
+| [Koito](/configuration/sources/koito-source)                            | [Active](./?sourceComm=active#by-communication-method)   | [History](./?sot=history#by-data-source-of-truth)   | ❌                                     | ✅                                                     | ❌                                 | ✅                             |
+| [Last.fm](/configuration/sources/lastfm-source)                         | [Active](./?sourceComm=active#by-communication-method)   | [History](./?sot=history#by-data-source-of-truth)   | ❌                                     | ✅                                                     | ❌                                 | ✅                             |
+| [Libre.fm](/configuration/sources/librefm-source)                       | [Active](./?sourceComm=active#by-communication-method)   | [History](./?sot=history#by-data-source-of-truth)   | ❌                                     | ✅                                                     | ❌                                 | ✅                             |
+| [Last.fm (Endpoint)](/configuration/sources/lastfm-endpoint)            | [Ingress](./?sourceComm=ingress#by-communication-method) | [History](./?sot=history#by-data-source-of-truth)   | ❌                                     | ✅                                                     | ❌                                 | ✅                             |
+| [ListenBrainz](/configuration/sources/listenbrainz-source)              | [Active](./?sourceComm=active#by-communication-method)   | [History](./?sot=history#by-data-source-of-truth)   | ❌                                     | ✅                                                     | ❌                                 | ✅                             |
+| [ListenBrainz (Endpoint)](/configuration/sources/listenbrainz-endpoint) | [Ingress](./?sourceComm=ingress#by-communication-method) | [History](./?sot=history#by-data-source-of-truth)   | ❌                                     | ✅                                                     | ❌                                 | ✅                             |
+| [Maloja](/configuration/sources/maloja)                                 | [Active](./?sourceComm=active#by-communication-method)   | [History](./?sot=history#by-data-source-of-truth)   | ❌                                     | ✅                                                     | ❌                                 | ✅                             |
+| [Mopidy](/configuration/sources/mopidy)                                 | [Active](./?sourceComm=active#by-communication-method)   | [Activity](./?sot=activity#by-data-source-of-truth) | ❌                                     | ✅                                                     | ✅                                 | ✅                             |
+| [MPD (Music Player Daemon)](/configuration/sources/mpd)                 | [Active](./?sourceComm=active#by-communication-method)   | [Activity](./?sot=activity#by-data-source-of-truth) | ❌                                     | ✅                                                     | ✅                                 | ✅                             |
+| [Musikcube](/configuration/sources/musikcube)                           | [Active](./?sourceComm=active#by-communication-method)   | [Activity](./?sot=activity#by-data-source-of-truth) | ❌                                     | ✅                                                     | ✅                                 | ✅                             |
+| [Plex](/configuration/sources/plex)                                     | [Active](./?sourceComm=active#by-communication-method)   | [Activity](./?sot=activity#by-data-source-of-truth) | ✅                                     | ✅                                                     | ✅                                 | ✅                             |
+| [Rocksky](/configuration/sources/rocksky-source)                        | [Active](./?sourceComm=active#by-communication-method)   | [History](./?sot=history#by-data-source-of-truth)   | ❌                                     | ✅                                                     | ❌                                 | ✅                             |
+| [Sonos](/configuration/sources/sonos)                                   | [Active](./?sourceComm=active#by-communication-method)   | [Activity](./?sot=activity#by-data-source-of-truth) | ✅                                     | ✅                                                     | ✅                                 | ✅                             |
+| [Spotify](/configuration/sources/spotify)                               | [Active](./?sourceComm=active#by-communication-method)   | [Activity](./?sot=activity#by-data-source-of-truth) | ✅                                     | ✅                                                     | ✅                                 | ✅                             |
+| [Subsonic-compatible APIs](/configuration/sources/subsonic)             | [Active](./?sourceComm=active#by-communication-method)   | [Activity](./?sot=activity#by-data-source-of-truth) | ✅                                     | ✅                                                     | ✅                                 | ✅                             |
+| [teal.fm](/configuration/sources/tealfm-source)                         | [Active](./?sourceComm=active#by-communication-method)   | [History](./?sot=history#by-data-source-of-truth)   | ❌                                     | ✅                                                     | ❌                                 | ✅                             |
+| [WebScrobbler](/configuration/sources/webscrobbler)                     | [Ingress](./?sourceComm=active#by-communication-method)  | [History](./?sot=history#by-data-source-of-truth)   | ❌                                     | ✅                                                     | ❌                                 | ✅                             |
+| [VLC](/configuration/sources/vlc)                                       | [Active](./?sourceComm=active#by-communication-method)   | [Activity](./?sot=activity#by-data-source-of-truth) | ❌                                     | ✅                                                     | ✅                                 | ✅                             |
+| [Yamaha MusicCast](/configuration/sources/yamaha-musiccast)             | [Active](./?sourceComm=active#by-communication-method)   | [Activity](./?sot=activity#by-data-source-of-truth) | ❌                                     | ✅                                                     | ✅                                 | ✅                             |
+| [Yandex Music](/configuration/sources/yandex-music)                     | [Active](./?sourceComm=active#by-communication-method)   | [Activity](./?sot=activity#by-data-source-of-truth) |                                        | ✅                                                     | ✅                                 | ✅                             |
+| [Youtube Music](/configuration/sources/youtube-music)                   | [Active](./?sourceComm=active#by-communication-method)   | [History](./?sot=history#by-data-source-of-truth)   | ❌                                     | ✅                                                     | ❌                                 | ✅                             |
 
 ## Features
 
@@ -122,7 +123,23 @@ Otherwise, use the `name` property you gave the client in it's File/AIO config.
 
 :::
 
-### Scrobble Thresholds
+### When Is Activity Scrobbled?
+
+##### From Listening History
+
+For [**Listening History**](./?sot=history#by-data-source-of-truth) Source-Of-Truth based Sources, like Listenbrainz and Last.fm, newely discovered history is immediately forwarded to relevant Clients.
+
+##### From Ingress
+
+For [**Ingress**](./?sot=activity&sourceComm=ingress#by-communication-method) communication based Sources, like [Listenbrainz (Endpoint)](/configuration/sources/listenbrainz-endpoint) and [Webscrobbler](/configuration/sources/webscrobbler), the client sending data to Multi-Scrobbler is what determines when activity is scrobbled. This means that it up to the behavior and implementation of whatever application you point at these Source endpoints: when the client sends "this is scrobbled", MS immediately forwards it to relevant Clients.
+
+##### From Listening Activity
+
+For Sources that use [**Active**](./?sot=activity&sourceComm=active#by-communication-method) communication with [**Listening Activity**](./?sot=activity#by-data-source-of-truth) as the Source-Of-Truth -- like Jellyfin, Plex, Spotify, Subsonic, etc... -- *Multi-Scrobbler waits until the track changes or the active player becomes stale/disappears* before determining if the activity should be scrobbled.
+
+This allows MS to record how long you listened to the track for as well as more accurately determine if **Scrobble Thresholds** have been met.
+
+#### Scrobble Thresholds
 
 <ScrobbleThreshold filename="spotify"/>
 
@@ -133,7 +150,7 @@ SOURCE_SCROBBLE_DURATION=40
 SOURCE_SCROBBLE_PERCENT=20
 ```
 
-### Should Scrobble Behavior
+### Monitoring
 
 :::note
 
@@ -141,7 +158,7 @@ This feature is currently available only for some Sources. Check each Source's d
 
 :::
 
-For _most_ Sources multi-scrobbler can determine if a user is listening and scrobble automatically. For Sources which multi-scrobbler cannot do this or require additional configuration, a user can indicate to MS that it should or should not scrobble. This action can be taken on the Web Dashboard by clicking the link next to **Should Scrobble** found in each Source's status card.
+For _most_ Sources multi-scrobbler can determine if a user is listening and monitor activity automatically. For Sources which multi-scrobbler cannot do this or require additional configuration, a user can indicate to MS that it should or should not monitor activity. This action can be taken on the Web Dashboard by clicking the link next to **Monitoring** found in each Source's status card.
 
 Additionally, for these Sources, the default behavior for Scrobbling can be explicitly set by adding the following value to a Source's `options` in [file or aio config](/configuration?configType=file#configuration-types):
 
@@ -153,7 +170,7 @@ Additionally, for these Sources, the default behavior for Scrobbling can be expl
     "options": {
         // set to true to always scrobble automatically
         // set to false to never scrobble automatically
-        "systemScrobble": true
+        "autoMonitor": true
     }
 }
 ```

docsite/docs/configuration/sources/spotify.mdx

@@ -8,6 +8,7 @@ import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 import CodeBlock from '@theme/CodeBlock';
 import SpotifyConfig from '!!raw-loader!@site/../config/spotify.json.example';
+import ENVConfig from "@site/docs/configuration/sources/_env_configs/_spotify.md"
 import IconWarning from '@theme/Admonition/Icon/Warning';
 
 <DetailsAdmo type="note" summary="Spotify and Automix">
@@ -111,11 +112,5 @@ Use **one** of the following methods to specify a valid Redirect URI and complet
 ## Configuration
 
 <Config config="SpotifySourceConfig" fileContent={SpotifyConfig} name="spotify">
-    | Environmental Variable  | Required? | Default                          | Description                     |
-    | ----------------------- | --------- | -------------------------------- | ------------------------------- |
-    | `SPOTIFY_ID`            | Yes       |                                  | A unique ID                     |
-    | `SPOTIFY_CLIENT_ID`     | Yes       |                                  |                                 |
-    | `SPOTIFY_CLIENT_SECRET` | Yes       |                                  |                                 |
-    | `SPOTIFY_REDIRECT_URI`  | No        | `http://localhost:9078/callback` | URI must end in `callback`      |
-    | `SPOTIFY_NAME`          | No        |                                  | A vantiy name different than ID |
+<ENVConfig/>
 </Config>

docsite/docs/configuration/sources/subsonic.mdx

@@ -8,6 +8,7 @@ import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 import CodeBlock from '@theme/CodeBlock';
 import SubsonicConfig from '!!raw-loader!@site/../config/subsonic.json.example';
+import ENVConfig from "@site/docs/configuration/sources/_env_configs/_subsonic.md"
 
 This Source can be used for any application that implements the [Subsonic API](http://www.subsonic.org/pages/api.jsp) and supports the [`getNowPlaying`](http://www.subsonic.org/pages/api.jsp#getNowPlaying) endpoint (such as [Airsonic](https://airsonic.github.io/) and [Navidrome](https://www.navidrome.org/))
 
@@ -20,7 +21,7 @@ This Source can be used for any application that implements the [Subsonic API](h
 
 <DetailsAdmo type="tip" summary="Recommended Alternative Sources">
 
-If your serivce supports scrobbling to **Listenbrainz** (such as Navidrome), considering using a [**Listenbrainz (Endpoint)** Source](/configuration/sources/listenbrainz-endpoint) instead of this one.
+If your service supports scrobbling to **Listenbrainz** (such as Navidrome), considering using a [**Listenbrainz (Endpoint)** Source](/configuration/sources/listenbrainz-endpoint) instead of this one.
 
 Service-specific scrobble implementations tend to be more accurate and provide more information (multiple artists) compared to the Subsonic API.
 
@@ -28,14 +29,24 @@ Service-specific scrobble implementations tend to be more accurate and provide m
 
 Use the optional `usersAllow` property with **File** or **AIO** configuration to restrict scrobbling to a list of defined users.
 
+## Enhanced Playback Reporting
+
+Multi-Scrobbler supports the new [Open Subsonic](https://opensubsonic.netlify.app) extension, [Playback Report](https://opensubsonic.netlify.app/docs/extensions/playbackreport/), that enables millisecond-accurate player position and state reporting.
+
+To use this new data, your Subsonic server must support the extension **and** the active playback Client must report it. The UI for your Subsonic Source and active Player will indicate support using contextual icons.
+
+Usage of Enhanced Playback Reporting is optional: MS will fallback to classic, less accurate Subsonic Now Playing when it is not available.
+
+<DetailsAdmo type="info" summary="Stale Players without Playback Reporting">
+
+For Subsonic server/client combinations that do not support [Enhanced Playback Reporting](#enhanced-playback-reporting), multi-scrobbler will cleanup players that report they are playing for much longer period of time than the track's length (when length is reported). This prevents repeated scrobbles from Subsonic-compatible servers that continue returning a track after playback stops.
+
+If the server properly reports no playing song when playback has stopped or this causes issues for your setup, the detection can be disabled by setting `detectStaleNowPlayingFromMinutesAgo` to `false` in File/AIO config.
+
+</DetailsAdmo>
+
 ## Configuration
 
 <Config config="SubSonicSourceConfig" fileContent={SubsonicConfig} name="subsonic">
-        | Environmental Variable | Required? | Default | Description                          |
-        | ---------------------- | --------- | ------- | ------------------------------------ |
-        | `SUBSONIC_ID`          | Yes       |         | A unique ID                          |
-        | `SUBSONIC_USER`        | Yes       |         |                                      |
-        | `SUBSONIC_PASSWORD`    | Yes       |         |                                      |
-        | `SUBSONIC_URL`         | Yes       |         | Base url of your subsonic-api server |
-        | `SUBSONIC_NAME`        | No        |         | A vanity name different than ID      |
-</Config>
+<ENVConfig/>
+</Config>

docsite/docs/configuration/sources/tealfm-source.mdx

@@ -9,6 +9,7 @@ import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 import CodeBlock from '@theme/CodeBlock';
 import JsonConfig from '!!raw-loader!@site/../config/tealfm.json.example';
+import ENVConfig from "@site/docs/configuration/sources/_env_configs/_tealfm.md"
 
 :::tip[Other Uses]
 
@@ -103,11 +104,6 @@ Allow scrobbles from plyr.fm and unknown services:
 
 </details>
 
-<Config config="TealClientConfig" fileContent={JsonConfig} name="tealfm">
-        | Environmental Variable     | Required? | Default | Description                                                                                |
-        | :------------------------- | --------- | ------- | ------------------------------------------------------------------------------------------ |
-        | `SOURCE_TEALFM_ID`         | Yes       |         | A unique ID                                                                                |
-        | `SOURCE_TEALFM_IDENTIFIER` | Yes       |         | Your **full** ATProto handle or DID. For Bluesky account this is like `myUser.bsky.social` |
-        | `SOURCE_TEALFM_APP_PW`     | Yes       |         | Bluesky/ATProto network App Password                                                       |
-        | `SORUCE_TEALFM_NAME`       | No        |         | A vanity name different than ID                                                            |
+<Config config="TealClientConfig" fileContent={JsonConfig} configureAs ambiguous name="tealfm">
+<ENVConfig/>
 </Config>

docsite/docs/configuration/sources/vlc.mdx

@@ -8,6 +8,7 @@ import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 import CodeBlock from '@theme/CodeBlock';
 import JsonConfig from '!!raw-loader!@site/../config/vlc.json.example';
+import ENVConfig from "@site/docs/configuration/sources/_env_configs/_vlc.md"
 
 MS communicates with [VLC](https://www.videolan.org/vlc/) using the [Web (`http`) interface module](https://wiki.videolan.org/VLC_HTTP_requests/)
 
@@ -99,10 +100,5 @@ If you find that VLC is incorrectly reporting track information (in its interfac
 ## Configuration
 
 <Config config="VLCSourceConfig" fileContent={JsonConfig} name="vlc">
-        | Environmental Variable | Required? | Default          | Description                     |
-        | ---------------------- | --------- | ---------------- | ------------------------------- |
-        | `VLC_ID`               | Yes       |                  | A unique ID                     |
-        | `VLC_URL`              | No        | `localhost:8080` |                                 |
-        | `VLC_PASSWORD`         | Yes       |                  |                                 |
-        | `VLC_NAME`             | No        |                  | A vanity name different than ID |
+<ENVConfig/>
 </Config>

docsite/docs/configuration/sources/webscrobbler.mdx

@@ -8,6 +8,7 @@ import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 import CodeBlock from '@theme/CodeBlock';
 import JsonConfig from '!!raw-loader!@site/../config/webscrobbler.json.example';
+import ENVConfig from "@site/docs/configuration/sources/_env_configs/_webscrobbler.md"
 
 After installing the [Webscrobbler extension](https://web-scrobbler.com/) open the preferences/settings for it:
 
@@ -87,11 +88,5 @@ This affects **only** MS's behavior and does not affect the general connector be
 ## Configuration
 
 <Config config="WebScrobblerSourceConfig" fileContent={JsonConfig} name="webscrobbler">
-        | Environmental Variable | Required? | Default | Description                                                              |
-        | ---------------------- | --------- | ------- | ------------------------------------------------------------------------ |
-        | WS_ID                  | Yes       |         | A unique ID                                                              |
-        | WS_ENABLE              | No        |         | Set to 'true' to enable WS without needing to define other ENVs          |
-        | WS_WHITELIST           | No        |         | Only scrobble from these WebScrobbler Connectors. Comma-delimited list   |
-        | WS_BLACKLIST           | No        |         | Do not scrobble from these WebScrobbler Connectors. Comma-delimited list |
-        | WS_NAME                | No        |         | A vanity name different than ID                                          |
+<ENVConfig/>
 </Config>

docsite/docs/configuration/sources/yamaha-musiccast.mdx

@@ -8,6 +8,7 @@ import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 import CodeBlock from '@theme/CodeBlock';
 import JsonConfig from '!!raw-loader!@site/../config/musiccast.json.example';
+import ENVConfig from "@site/docs/configuration/sources/_env_configs/_musiccast.md"
 
 Monitor [MusicCast](https://usa.yamaha.com/products/contents/audio_visual/musiccast/index.html) device/receivers for music played on Network/USB/CD inputs.
 
@@ -31,9 +32,5 @@ EX
 ## Configuration
 
 <Config config="MusicCastSourceConfig" fileContent={JsonConfig} name="musiccast">
-        | Environmental Variable | Required? | Default | Description                     |
-        | :--------------------- | :-------- | ------- | :------------------------------ |
-        | `MCAST_ID`             | Yes       |         | A unique ID                     |
-        | `MCAST_URL`            | Yes       |         | The Musiccast device URL        |
-        | `MCAST_NAME`           | No        |         | A vanity name different than ID |
+<ENVConfig/>
 </Config>

docsite/docs/configuration/sources/yandex-music.mdx

@@ -8,6 +8,7 @@ import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 import CodeBlock from '@theme/CodeBlock';
 import JsonConfig from '!!raw-loader!@site/../config/ymbridge.json.example';
+import ENVConfig from "@site/docs/configuration/sources/_env_configs/_ymbridge.md"
 
 Monitor your [**Yandex Music**](https://music.yandex.com) listening activity in real-time.
 
@@ -72,10 +73,5 @@ If you have issues specifically with the MS Source please mention [**Druidblack*
 ## Configuration
 
 <Config config="YandexMusicBridgeSourceConfig" fileContent={JsonConfig} name="ymbridge">
-        | Environmental Variable | Required? | Default | Description                                                               |
-        | :--------------------- | :-------- | ------- | :------------------------------------------------------------------------ |
-        | `YMBRIDGE_ID`          | Yes       |         | A unique ID                                                               |
-        | `YMBRIDGE_URL`         | Yes       |         | `http://URL:PORT` for the `yandex-music-bridge` container                 |
-        | `YMBRIDGE_API_KEY`     | No        |         | The same key used for `YM_API_KEY` on the `yandex-music-bridge` container |
-        | `YMBRIDGE_NAME`        | No        |         | A vanity name different than ID                                           |
+<ENVConfig/>
 </Config>

docsite/docs/configuration/sources/youtube-music.mdx

@@ -8,6 +8,7 @@ import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 import CodeBlock from '@theme/CodeBlock';
 import JsonConfig from '!!raw-loader!@site/../config/ytmusic.json.example';
+import ENVConfig from "@site/docs/configuration/sources/_env_configs/_ytmusic.md"
 
 :::warning
 
@@ -179,13 +180,5 @@ Only one of these methods needs to be used.
 ## Configuration
 
 <Config config="YTMusicSourceConfig" fileContent={JsonConfig} name="ytmusic">
-| Environmental Variable | Required? | Default | Description                                   |
-| ---------------------- | --------- | ------- | --------------------------------------------- |
-| YTM_ID                 | Yes       |         | A unique ID                                   |
-| YTM_COOKIE             | No        |         | Value for Cookie Authentication               |
-| YTM_CLIENT_ID          | No        |         | Client ID for OAuth Athentication             |
-| YTM_CLIENT_SECRET      | No        |         | Client Secret for OAuth Athentication         |
-| YTM_REDIRECT_URI       | No        |         | A custom redirect URI for OAuth Athentication |
-| YTM_LOG_DIFF           | No        | false   | Log YTM history changes                       |
-| YTM_NAME               | No        |         | A vanity name different than ID               |
+<ENVConfig/>
 </Config>

docsite/docs/configuration/transforms/musicbrainz.mdx

@@ -109,6 +109,48 @@ Example of multiple servers:
 
 </details>
 
+<DetailsAdmo type="tip" summary="BrainzMash Musicbrainz Server">
+
+[**BrainzMash**](https://brainzmash.cc) can be used as a supplementary Musicbrainz Server (see **Additional Musicbrainz Servers** above).
+
+BrainzMash is a community-run pool of read-only hybrid Musicbrainz/[Lidarr](https://lidarr.audio/) metadata servers. Requests are made to one endpoint that load-balances traffic out to all participating servers. This service is **publicly available** and can be treated like a normal Musicbrainz server from Multi-Scrobbler's perspective.
+
+There are pros and cons to using this service. Read these carefully before using BrainzMash:
+
+* **Pros**
+  * Higher rate limit than official Musicbrainz server -- Multi-scrobbler can make requests more often and faster
+  * Potentially less downtime due to distributed nature
+* **Cons**
+  * There is implicit trust in how BrainzMash handles your traffic:
+    * you do not know which community server is getting your traffic and what the operator *may* be logging/collecting in terms of metrics
+    * the load balancer endpoint collects minimal metrics: it retains anonymized recent searches and network data for presenting aggregate stats on BrainzMash public dashboard
+  * Musicbrainz DB data is updated on a weekly basis so new entries and recent edits will lag behind the official server
+
+If these trade-offs are acceptable to you, add BrainzMash to your Musicbrainz config like this:
+
+```json5
+{
+  "contact": "anything@notused.com",
+  "url": "https://api.brainzmash.cc"
+}
+```
+
+The public dashboard can be found here: [https://dash.brainzmash.cc](https://dash.brainzmash.cc)
+
+Learn more about BrainzMash:
+
+* [Main website](https://brainzmash.cc/)
+* Join the [Discord server](https://discord.gg/MSTteNvANt) for updates, support, and lidarr instructions
+* Contribute your server to the community pool by deploying [brainzmash-hearring-aid](https://github.com/statichum/brainzmash-hearring-aid)
+
+:::important[Support and Bugs]
+
+If you have issues with the Musicbrainz Transformer and API communication then [**create an issue for Multi-Scrobbler first**](https://github.com/FoxxMD/multi-scrobbler/issues), do not use BrainzMash discord for general help.
+
+:::
+
+</DetailsAdmo>
+
 ### Stage Configuration
 
 All of the properties found in [**Matching with Musicbrainz**](#matching-with-musicbrainz) section are configured in [Stage Configuration](/configuration/transforms#configuring-stages) as `defaults`.

docsite/docs/configuration/transforms/user.mdx

@@ -67,7 +67,6 @@ In a [Subsonic](/configuration/sources/subsonic) [File Config](/configuration?co
         "preCompare": [
           {
             "type": "user",
-            // do not include name, the default user stage will be used
             "title": [
                 // removes badterm from track title
                 "badterm"
@@ -139,9 +138,9 @@ Each [Rule](/configuration/transforms#stage-rules) must be an array of [search-a
     },
     "options": {
       "playTransform": {
-        "type": "user",
         "preCompare": [
             {
+                "type": "user",
                 "title": [
                     // removes "badTerm" from title
                     "badTerm",
@@ -182,6 +181,7 @@ Using `when` for [Conditional Modification](/configuration/transforms#conditiona
 //
 //   Run live|remastered regex remove on title
 {
+    "type": "user",
     "title": [
         {
             "search": "/\\s\\-\\s滾石40\\s滾石撞樂隊\\s40團拚經典(.+)$/i",
@@ -210,6 +210,7 @@ Removes the phrase `(Album Version)` from the Title of a Play
 
 ```json5
 {
+    "type": "user",
     "title": [
         "(Album Version)"
     ]
@@ -227,11 +228,13 @@ Removes the phrase `(Album Version)` from the Title of a Play
 {
 "compare": {
         "candidate": {
+            "type": "user",
             "title": [
                 "/(\(.+\))\s*$/"
             ]
         },
         "existing": {
+            "type": "user",
             "title": [
                 "/(\(.+\))\s*$/"
             ]
@@ -248,6 +251,7 @@ Removes the phrase `(Album Version)` from the Title of a Play
     <summary>Example</summary>
 ```json5
 {
+    "type": "user",
     "artists": [
         {
         "search": "Boz Skaggs",
@@ -265,6 +269,7 @@ Removes the phrase `(Album Version)` from the Title of a Play
     <summary>Example</summary>
 ```json5
 {
+    "type": "user",
     "album": [
         {
         "search": "Various Artists",
@@ -299,6 +304,7 @@ Removes the phrase `(Album Version)` from the Title of a Play
       <summary>Example</summary>
 ```json
 {
+    "type": "user",
     "artists": [
         {
             "search": "(.*?)(?<delim>\\s*\\/\\s*)(.*$)",

docsite/docs/index.mdx

@@ -3,6 +3,8 @@ slug: /
 title: Overview
 sidebar_position: 1
 ---
+import Carousel from '@site/src/components/Carousel/NextCarousel';
+import BrowserOnly from '@docusaurus/BrowserOnly';
 
 ![Latest Release](https://img.shields.io/github/v/release/foxxmd/multi-scrobbler)
 ![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)
@@ -13,6 +15,7 @@ sidebar_position: 1
 A dockerized app that monitors your music listening activity from *everywhere* and scrobbles it *anywhere*.
 
 * Supports monitoring activity from many [**Sources**](/configuration/sources)
+    * [Apple Music](/configuration/sources/applemusic)
     * [Azuracast](/configuration/sources/azuracast)
     * [Deezer](/configuration/sources/deezer)
     * [Google Cast (Chromecast)](/configuration/sources/google-cast)
@@ -64,6 +67,18 @@ A dockerized app that monitors your music listening activity from *everywhere* a
 
 [**Quick Start Guide**](/quickstart)
 
+<DetailsAdmo type="tip" summary="New UI Preview">
+
+A **full rewrite** of the UI is now available for preview. The new UI modernizes Multi-Scrobbler and gives you in depth insight into how your scrobbles are handled end-to-end.
+
+<Carousel/>
+
+To try out the stable-release preview navigate to `http://yourMSDomain:9078/next`
+
+Or to try out the **latest preview snapshot** see the docker image pinned [in this comment.](https://github.com/FoxxMD/multi-scrobbler/issues/500#issuecomment-4917525794)
+
+</DetailsAdmo>
+
 <img src={require('/img/status-ui.png').default} width="800"/>
 
 **Why should I use this over a browser extension and/or mobile app scrobbler?**

docsite/docs/installation/installation.mdx

@@ -42,7 +42,7 @@ Cross-platform images are built for x86 (Intel/AMD) and ARM64 (IE Raspberry Pi)
 
 <Tabs groupId="dockerSetting" queryString>
 <TabItem value="storage" label="Storage">
-You **should** bind a host directory into the container for storing configurations and credentials. Otherwise, these will be lost when the container is updated.
+You **should** bind a host directory into the container for storing configurations, credentials, database, and other files. Otherwise, these will be lost when the container is updated.
 
 ```yaml title="docker-compose.yml"
 services:
@@ -54,6 +54,24 @@ services:
   // highlight-end
 ```
 
+Optionally, use a separate directory for data (database, cache, etc...) by mounting an additional directory and setting the `DATA_DIR` ENV to the directory that should be used inside the container:
+
+```yaml title="docker-compose.yml"
+services:
+  multi-scrobbler:
+  # ...
+  environment:
+    # ...
+    // highlight-start
+    - DATA_DIR=/msData
+    // highlight-end
+  volumes:
+    - "./config:/config" # used for config files
+  // highlight-start
+    - "./my/host/folder:/msData" # used for data files
+  // highlight-end
+```
+
 </TabItem>
 <TabItem value="networking" label="Networking">
 If you are using a [bridge network](https://www.appsdeveloperblog.com/docker-networking-bridging-host-and-overlay/) (default docker setup) you must map a port to the container in order to access the dashboard and use MS with some sources (Webscrobbler, LFM/LZ Endpoints). The default container port is `9078`.
@@ -68,6 +86,14 @@ services:
   // highlight-end
 ```
 
+:::important
+
+If your machine is accessible from the public internet consider installing multi-scrobbler on a different, private machine.
+
+**Read [Securing Multi-Scrobbler](/configuration/security)**
+
+:::
+
 </TabItem>
 <TabItem value="baseUrl" label="Base URL">
 **Optionally**, when
@@ -107,7 +133,7 @@ services:
 
 </TabItem>
 <TabItem value="linuxHost" label="Linux Host">
-If you are running this container with **Docker** on a **Linux Host** you **should** specify `user:group` permissions of the user who owns the **configuration directory** on the host to avoid [docker file permission problems.](https://ikriv.com/blog/?p=4698) These can be specified using the [environmental variables **PUID** and **PGID**.](https://docs.linuxserver.io/general/understanding-puid-and-pgid)
+If you are running this container with **Docker** on a **Linux Host** you **should** specify `user:group` permissions of the user who owns the **configuration and data directories** on the host to avoid [docker file permission problems.](https://ikriv.com/blog/?p=4698) These can be specified using the [environmental variables **PUID** and **PGID**.](https://docs.linuxserver.io/general/understanding-puid-and-pgid)
 
 To get the UID and GID for the current user run these commands from a terminal:
 
@@ -132,7 +158,7 @@ services:
 
 </TabItem>
 <TabItem value="caching" label="Caching">
-**Optionally**, add a [Valkey](https://valkey.io/) service to your stack for [secondary caching](/configuration#secondary-caching) to take advantage of faster performance and reduced memory usage.
+**Optionally**, add a [Valkey](https://valkey.io/) service to your stack for [secondary caching](/configuration#secondary-caching) to take advantage of faster performance, reduced memory usage, and cached api calls to external services.
 
 ```yaml title="docker-compose.yml"
 services:
@@ -197,8 +223,7 @@ services:
       - PUID=1000
       - PGID=1000
       # uncomment along with valkey service/volume below for better caching
-      #- CACHE_METADATA=valkey
-      #- CACHE_METADATA_CONN=redis://valkey:6379
+      #- CACHE_VALKEY=redis://valkey:6379
     volumes:
       - ./config:/config
     ports:
@@ -231,6 +256,33 @@ npm run docs:install && npm run build
 npm run start
 ```
 
+#### Config And Data Directories
+
+The directories MS uses for **Configuration** (`config.json`, `jellyfin.json`, etc...) and **Data** (database, cache, etc...) can be specified by environmental variables passed directly to `npm`/`node`, or set in an `.env` file in the working directory.
+
+When parsing these ENVs MS will resolve relative directories but *not* bash expansions like `~` for home. Examples:
+
+* `CONFIG_DIR=/my/absolute/path` => sets directory to use for config files
+* `DATA_DIR=./relative/data` => sets directory relative to working directory for data files
+
+If you do not set these environmental variables then MS will attempt to use OS-standardized directories:
+
+<Tabs>
+    <TabItem value="linux" label="Linux">
+        * Config => `$XDG_CONFIG_HOME/multi-scrobbler` or `~/.config/multi-scrobbler`
+        * Data => `$XDG_DATA_HOME/multi-scrobbler` or `~/.local/share/multi-scrobbler`
+    </TabItem>
+    <TabItem value="mac" label="MacOS">
+        * Config => `~/Library/Preferences/multi-scrobbler`
+        * Data => `~/Library/Application Support/multi-scrobbler`
+    </TabItem>
+    <TabItem value="win" label="Windows">
+        * Config => `%APPDATA%\multi-scrobbler\Config`
+        * Data => `%LOCALAPPDATA%\multi-scrobbler\Data`
+    </TabItem>
+</Tabs>
+
+
 #### Rollup build error
 
 During building if you encounter an error like: `Your current platform "XXX" and architecture "XXX" combination is not yet supported by the native Rollup build.`