mdeck 3.0.0 → 3.1.0

package/CHANGELOG.md

@@ -1,11 +1,21 @@
 # Changelog
 
+## 3.1.0 — 2026-10-07
+
+- Packs are gone: every theme and palette is installed on its own. `mdeck themes install duet` installs the theme with its default palette (`cobalt`), and `mdeck palettes install solarized` a palette; both have `search`, `remove`, `update` and `list`. A palette made for one theme (FHNW's `brand`) brings that theme along and goes with it. A palette an installed theme uses by default is not removed while that theme is there. Installs go into `themes/<id>/` and `palettes/<id>/` of the extensions folder, so a theme and a palette may share a name.
+- A theme or palette carries its version, author, licence and the oldest mdeck it needs in its own `extension.toml` (`version`, `author`, `license`, `homepage`, `mdeck`); `pack.toml` is gone. The built-in ones are back in `assets/extensions/themes` and `assets/extensions/palettes`, and are removed and installed again one by one (`theme:aurora` in `~/.mdeck/removed.json`).
+- The theme repository has a folder per theme and per palette (`themes/<id>`, `palettes/<id>`) and serves `catalogue.json`; mdeck 3.0 cannot read it. The design page lists themes and palettes to install one by one.
+- The palette `candy` works with every theme: raspberry and blue accents that can be read as text; `pop` takes its pastel fills from the palette (`--pop-fill-1`, `--pop-fill-2`, `--pop-line`, `--pop-shadow`, `--pop-ink`), with black shadows in the dark.
+- The palettes `graphite` and `ember` are gone from the theme repository: they looked almost the same as the built-in `nordic` and `paper`. A deck that names one is told which to use instead.
+- A deck that names a theme or palette that left mdeck in 3.0 is told the command for it, `mdeck themes install duet` or `mdeck palettes install forest`, not "beside the deck".
+- Tests run with an empty `MDECK_HOME`, so what is installed on the computer does not change their results.
+
 ## 3.0.0 — 2026-10-07
 
 - Every theme and palette now comes in a pack, also those that come with mdeck: `neue`, `academic`, `aurora` and `minimal` (each a theme with its palette) and the palette `lagoon`. `graphite`, close to `nordic`, moved to the theme repository as a pack of its own. They work right away and offline, and can be removed: `mdeck themes remove aurora` hides it from every deck, `mdeck themes install aurora` brings it back without the internet. A newer version from the theme repository replaces the bundled one. A deck without a theme still uses `neue`, and says so when it was removed; the last theme cannot be removed.
 - `mdeck themes install <pack>` installs for every deck by default; a slide file, a folder or `--local` installs beside that deck. Packs can require other packs (`requires = ["lagoon"]` in `pack.toml`) for palettes their themes use: installing one installs those too, and removing a pack another one needs is refused. The design page lists the packs you can install, including removed bundled ones, and removes a pack for every deck.
 - `mdeck check` no longer warns about themes installed for every deck.
-- Fewer built-in looks: mdeck now comes with the themes `neue`, `academic`, `aurora` and the new `minimal` and the palettes `swiss`, `nordic`, `neon`, `lagoon` and `graphite`. The others moved to the theme repository as packs of the same name: `duet` (with `cobalt`), `editorial` (with `terra`), `fhnw` (with `brand`), `terminal` (with `phosphor`) and `sketch` (with `pastel`), and the palettes `ember` and `forest` as `earth`. A deck that uses one gets an error that says what to run, for example `mdeck themes install duet my-talk.md`; files made with `mdeck send` or `mdeck build` keep working, because they carry their theme.
+- Fewer built-in looks: the themes `duet` (with `cobalt`), `editorial` (with `terra`), `fhnw` (with `brand`), `terminal` (with `phosphor`) and `sketch` (with `pastel`), and the palettes `ember` and `forest` (as `earth`) and `graphite`, moved to the theme repository as packs. A deck that uses one gets an error that names the command to run, for example `mdeck themes install duet`; files made with `mdeck send` or `mdeck build` keep working, because they carry their theme.
 - New theme `minimal`: nothing but the content, in the computer's own fonts (no web fonts, so it works offline), with medium weights, space instead of rules and boxes, and "Chapter 2" as a quiet label above chapter titles. Its default palette is the new `paper`: off-white and near-black with one orange accent, charcoal and a softer orange in the dark.
 - The sample deck's picture is a drawing in the palette's colours, and an SVG data URL that uses theme colours is drawn inline like an SVG file. A drawing in a picture's place now takes the space the layout gives it, like a photo, instead of pushing headings aside.
 - The launch page of `mdeck run` has a Theme editor tile under Write and learn; it opens the design page of the deck's editor.

package/assets/{packs/lagoon → extensions/palettes}/lagoon/extension.toml

@@ -3,6 +3,9 @@ kind = "palette"
 id = "lagoon"
 title = "Lagoon"
 description = "Teal on warm stone, with an orange second accent."
+version = "1.0.0"
+author = "Tilman Schieber"
+license = "MIT"
 
 [light]
 "--bg" = "#f8f8f6"

package/assets/{packs/aurora → extensions/palettes}/neon/extension.toml

@@ -3,6 +3,9 @@ kind = "palette"
 id = "neon"
 title = "Neon"
 description = "Violet and magenta; loud, for workshops."
+version = "1.0.0"
+author = "Tilman Schieber"
+license = "MIT"
 
 [light]
 "--bg" = "#ffffff"

package/assets/{packs/academic → extensions/palettes}/nordic/extension.toml

@@ -3,6 +3,9 @@ kind = "palette"
 id = "nordic"
 title = "Nordic"
 description = "Ice grey, deep navy and a cool steel blue; calm."
+version = "1.0.0"
+author = "Tilman Schieber"
+license = "MIT"
 
 [light]
 "--bg" = "#f3f6f8"

package/assets/{packs/minimal → extensions/palettes}/paper/extension.toml

@@ -3,6 +3,9 @@ kind = "palette"
 id = "paper"
 title = "Paper"
 description = "Off-white paper and near-black ink, with one orange accent; charcoal and a softer orange in the dark."
+version = "1.0.0"
+author = "Tilman Schieber"
+license = "MIT"
 
 [light]
 "--bg" = "#fbfaf7"

package/assets/{packs/neue → extensions/palettes}/swiss/extension.toml

@@ -3,6 +3,9 @@ kind = "palette"
 id = "swiss"
 title = "Swiss"
 description = "White, black and signal red, like a Swiss poster."
+version = "1.0.0"
+author = "Tilman Schieber"
+license = "MIT"
 
 [light]
 "--bg" = "#ffffff"

package/assets/{packs/academic → extensions/themes}/academic/extension.toml

@@ -3,6 +3,9 @@ kind = "theme"
 id = "academic"
 title = "Academic"
 description = "A lecture: Source Sans and Source Serif, compact slides with the heading in a fixed place, theorem and definition blocks, booktabs tables and a footnote rule."
+version = "1.0.0"
+author = "Tilman Schieber"
+license = "MIT"
 # The palette this theme uses unless the deck sets one; colours come only from palettes.
 palette = "nordic"
 fonts = [

package/assets/{packs/aurora → extensions/themes}/aurora/extension.toml

@@ -3,6 +3,9 @@ kind = "theme"
 id = "aurora"
 title = "Aurora"
 description = "Northern lights: curtains of light in the accent colours, night-sky chapter and statement slides, frosted glass."
+version = "1.0.0"
+author = "Tilman Schieber"
+license = "MIT"
 # The palette this theme uses unless the deck sets one; colours come only from palettes.
 palette = "neon"
 fonts = [

package/assets/{packs/minimal → extensions/themes}/minimal/extension.toml

@@ -3,6 +3,9 @@ kind = "theme"
 id = "minimal"
 title = "Minimal"
 description = "Nothing but the content: system fonts, calm type, plenty of space, no decoration. Works offline."
+version = "1.0.0"
+author = "Tilman Schieber"
+license = "MIT"
 # The palette this theme uses unless the deck sets one; colours come only from palettes.
 palette = "paper"
 # System fonts only: nothing to download, the same on every computer that has them.

package/assets/{packs/neue → extensions/themes}/neue/extension.toml

@@ -3,6 +3,9 @@ kind = "theme"
 id = "neue"
 title = "Neue"
 description = "Swiss typography: large flush-left type, rules instead of boxes, signal red on white."
+version = "1.0.0"
+author = "Tilman Schieber"
+license = "MIT"
 # The palette this theme uses unless the deck sets one; colours come only from palettes.
 palette = "swiss"
 fonts = [

package/docs/reference/authoring.md

@@ -109,7 +109,7 @@ view is reachable in any build through `?view=reader`.
 
 More themes (duet, editorial, fhnw, terminal, sketch) are in the theme
 repository: `mdeck themes search` lists them, and
-`mdeck themes install <pack> <deck>.md` puts one beside the deck.
+`mdeck themes install <theme> <deck>.md` puts one beside the deck.
 
 `mdeck list <deck>.md` lists the built-in themes together with any themes kept
 beside the deck.
@@ -128,8 +128,8 @@ Each palette has a light and a dark variant; `appearance:` picks one.
 | `lagoon` | Teal on warm stone | Bright teal on teal-black |
 | `paper` | Off-white, near-black, orange (minimal's default) | Charcoal, soft orange |
 
-More palettes (cobalt, terra, phosphor, pastel, ember, forest, among others)
-are in the theme repository; install them with `mdeck themes install <pack> <deck>.md`.
+More palettes (cobalt, terra, phosphor, pastel, forest, among others)
+are in the theme repository; install them with `mdeck palettes install <palette> <deck>.md`.
 
 ---
 

package/docs/reference/extensions.md

@@ -211,41 +211,46 @@ Built-in extensions cannot be changed; copy one under a new id to change it.
 New themes always start as a copy. Layouts are not edited there. The page
 writes the same files described above.
 
-## Installed extensions and packs
-
-Every theme and palette comes in a **pack**. mdeck looks for them in this
-order: the packs that come with mdeck (`assets/packs/`, minus those removed
-with `mdeck themes remove`, listed in `~/.mdeck/removed.json`), the user's
-folder (`~/.mdeck/extensions`, or `$MDECK_HOME/extensions`), and the
-`extensions/` folder beside the deck. For themes and palettes a later place
-replaces an earlier one with the same id: an installed newer version replaces
-the bundled one, and a deck's own copy replaces both (with a warning when it
-replaces one installed for every deck). Layouts are built in and may not be
-replaced; within one place an id may appear only once.
-
-`mdeck themes install <pack>` installs a pack for every deck, into the user's
-folder; given a slide file, a folder or `--local`, it installs into the
-`extensions/` folder beside the deck. Installing a bundled pack for every deck
-offers it again; beside a deck it is copied. A pack is a folder with a
-`pack.toml` (`schema`, `id`, `title`, `description`, `version`, `author`,
-`license`, `homepage`, `mdeck = ">=X.Y.Z"`, the oldest mdeck it works with,
-and `requires = [...]`, the packs it needs) and one folder per theme or
-palette, each holding only `extension.toml` and, for a theme, `styles.css`. A
-theme's palettes must be in its pack or in a pack it requires; installing a
-pack installs those too, and `remove` refuses while another installed pack
-needs one. Theme fonts must come from `https://fonts.googleapis.com/` or
-`https://fonts.bunny.net/`, and `styles.css` may contain neither `@import`
-nor `url()` other than `data:` URLs. Each installed folder gets a
-`.mdeck-pack.json` with the pack, its version, its requirements, its source
-and a checksum of every file; `update` and `remove` refuse to touch files
-changed since then unless given `--force`.
-
-The repository serves `index.json` (`{ schema: 1, packs: [...] }`, each with
-its ids, `requires`, `url`, `sha256`, `previews`, and `bundled` for the packs
-that come with mdeck) and one JSON file per pack version holding the text of
-its files. `mdeck themes build <packs> -o <out> [--check]` writes both from a
-folder of packs and mdeck's bundled packs; `MDECK_THEMES_URL` points mdeck at
-another index. Without a connection, mdeck offers its bundled packs.
+## Installed themes and palettes
+
+Every theme and palette can be installed on its own, as a package. mdeck looks
+for them in this order: its own (`assets/extensions/`, minus those removed
+with `mdeck themes remove` or `mdeck palettes remove`, listed in
+`~/.mdeck/removed.json` as `theme:<id>` or `palette:<id>`), the user's folder
+(`~/.mdeck/extensions`, or `$MDECK_HOME/extensions`), and the `extensions/`
+folder beside the deck. For themes and palettes a later place replaces an
+earlier one with the same id: an installed newer version replaces the built-in
+one, and a deck's own copy replaces both (with a warning when it replaces one
+installed for every deck). Layouts are built in and may not be replaced;
+within one place an id may appear only once per kind.
+
+A theme or palette meant to be installed carries a few more settings in its
+`extension.toml`: `version` (`1.0.0`), `author`, `license`, `homepage`, and
+`mdeck = ">=X.Y.Z"`, the oldest mdeck it works with. What it needs follows
+from its settings: a theme needs its default `palette`, and a palette with
+`theme = "<id>"` needs that theme. Installing one installs what it needs;
+removing a palette is refused while an installed theme uses it by default, and
+removing a theme removes the palettes that belong only to it.
+
+`mdeck themes install <theme>` and `mdeck palettes install <palette>` install
+for every deck, into `themes/<id>/` or `palettes/<id>/` in the user's folder;
+given a slide file, a folder or `--local`, into the `extensions/` folder
+beside the deck (what it needs too, unless it is built in). Installing a
+built-in one for every deck offers it again. A package holds only
+`extension.toml` and, for a theme, `styles.css`. Theme fonts must come from
+`https://fonts.googleapis.com/` or `https://fonts.bunny.net/`, and
+`styles.css` may contain neither `@import` nor `url()` other than `data:`
+URLs. Each installed folder gets a `.mdeck-package.json` with its kind, id,
+version, source and a checksum of every file; `update` and `remove` refuse to
+touch files changed since then unless given `--force`.
+
+The repository serves `catalogue.json` (`{ schema: 2, themes: [...],
+palettes: [...] }`, each with its id, version, default palette or theme,
+`url`, `sha256`, `preview`, and `builtIn` for those that come with mdeck) and
+one JSON file per version holding the text of its files.
+`mdeck themes build <repository> -o <out> [--check]` writes both from a
+folder with `themes/` and `palettes/`; `MDECK_THEMES_URL` points mdeck at
+another catalogue. Without a connection, mdeck offers its built-in ones.
 
 ## Listing what is available
 

package/docs/reference/palettes.md

@@ -30,7 +30,7 @@ The presenter view and the reader view switch palette and light or dark without
 
 Each theme names a default: neue uses `swiss`, academic `nordic`, aurora `neon`.
 
-More palettes are in the [theme repository](https://github.com/tilman-schieber/mdeck-themes). The palettes cobalt, terra, phosphor, pastel, ember and forest, built in before mdeck 3.0, are there: cobalt in the `duet` pack, terra in `editorial`, phosphor in `terminal`, pastel in `sketch`, and ember and forest in `earth`. Install one with `mdeck themes install <pack> my-talk.md`.
+More palettes are in the [theme repository](https://github.com/tilman-schieber/mdeck-themes). The palettes cobalt, terra, phosphor, pastel and forest, built in before mdeck 3.0, are there; installing the theme duet, editorial, terminal or sketch brings its palette along. Graphite and ember were removed because the built-in nordic and paper look almost the same; a deck that names them is told which to use. Install one with `mdeck palettes install <palette> my-talk.md`.
 
 ## Colours
 

package/docs/reference/themes.md

@@ -24,9 +24,9 @@ theme: neue
 `mdeck list my-talk.md` lists them with their descriptions.
 
 More themes are in the [theme repository](https://github.com/tilman-schieber/mdeck-themes):
-`mdeck themes search` lists them, and `mdeck themes install <pack> my-talk.md`
-puts one beside the deck. The themes duet, editorial, fhnw, terminal and sketch,
-built in before mdeck 3.0, are there as packs of the same name.
+`mdeck themes search` lists them, and `mdeck themes install <theme> my-talk.md`
+puts one beside the deck, with its default palette. The themes duet, editorial,
+fhnw, terminal and sketch, built in before mdeck 3.0, are there.
 
 ## Theme structure
 

package/docs/site/content/appearance.md

@@ -119,21 +119,23 @@ Its theme, palette and light or dark controls, under the notes, let you try othe
 
 ## More themes from other people
 
-The themes above come with mdeck as packs. The theme repository has more: `mdeck themes search` lists them, and `mdeck themes install <pack>` installs one for all your decks. You can also remove the ones you never use; see [Install, remove or share a theme](theme-repository.html).
+The themes above come with mdeck. The theme repository has more: `mdeck themes search` and `mdeck palettes search` list them, and `mdeck themes install <theme>` installs one for all your decks, with its palette. You can also remove the ones you never use; see [Install, remove or share a theme](theme-repository.html).
 
 ### Themes that moved to the repository
 
-Earlier versions of mdeck came with more themes and palettes. They are now packs in the theme repository:
+Earlier versions of mdeck came with more themes and palettes. They are now in the theme repository:
 
-| Pack | What it holds |
+| Theme | What it looks like (its palette) |
 |---|---|
-| `duet` | The duet theme (two accent colours that take turns, slab headings) and the `cobalt` palette |
-| `editorial` | The editorial theme (a magazine spread with serif headlines and pull quotes) and the `terra` palette |
+| `duet` | Two accent colours that take turns, slab headings (`cobalt`) |
+| `editorial` | A magazine spread with serif headlines and pull quotes (`terra`) |
 | `fhnw` | The FHNW visual identity, with its own `brand` palette only |
-| `terminal` | The terminal theme (headings typed at a prompt, a status bar) and the `phosphor` palette; it starts dark |
-| `sketch` | The sketch theme (handwriting, marker scribbles, sticky notes) and the `pastel` palette |
-| `earth` | The `ember` and `forest` palettes |
-| `graphite` | The `graphite` palette: black and white with a steel-blue accent |
+| `terminal` | Headings typed at a prompt, a status bar; it starts dark (`phosphor`) |
+| `sketch` | Handwriting, marker scribbles, sticky notes (`pastel`) |
+
+The palette `forest` is there too: `mdeck palettes install forest`.
+
+The palettes `graphite` and `ember` were removed: use `nordic` or `paper`, which come with mdeck and look almost the same.
 
 A deck that still names one of them stops with a message that tells you what to install, for example:
 

package/docs/site/content/commands.md

@@ -12,7 +12,8 @@ For how the commands, the views and the servers fit together, see [Views, comman
 | `mdeck new` | Make a presentation with guided questions |
 | `mdeck run my-talk.md` | Open the launch page: present, edit, check and send from one place; slides reload when you save |
 | `mdeck edit my-talk.md` | Edit slides, colors and themes in the browser; saves to the file |
-| `mdeck themes search`, `install <pack>`, `remove`, `update`, `list` | Themes and palettes: install more, remove the ones you do not use; see [Install, remove or share a theme](theme-repository.html) |
+| `mdeck themes search`, `install <theme>`, `remove`, `update`, `list` | Themes: install more (each with its palette), remove the ones you do not use; see [Install, remove or share a theme](theme-repository.html) |
+| `mdeck palettes search`, `install <palette>`, … | The same for palettes |
 | `mdeck design [my-talk.md or folder]` | Look at themes and palettes on a sample deck and fine-tune them; saves to `extensions/` |
 | `mdeck migrate my-talk.md --dry-run` | Preview the changes needed for API 2.0 |
 | `mdeck check my-talk.md` | Check settings and look for missing local files |

package/docs/site/content/theme-authoring.md

@@ -14,7 +14,7 @@ The rest of this page is the reference for what it writes, and for anyone comfor
 
 To look at the result and fine-tune it, run `mdeck design my-talk.md` (or `mdeck design` in a folder without a deck). It shows the theme or palette on a sample deck with every kind of slide, light and dark, and has forms for colours, fonts, sizes and spacing; see [Edit slides in your browser](editing.html). The files it writes are the ones described here.
 
-Someone may already have made what you need: `mdeck themes search` lists the theme repository, and [Install, remove or share a theme](theme-repository.html) explains how to install a pack or share yours.
+Someone may already have made what you need: `mdeck themes search` lists the theme repository, and [Install, remove or share a theme](theme-repository.html) explains how to install one or share yours.
 
 Themes and palettes are **extensions**: each one is a folder with an `extension.toml` file that says what it is. Slide layouts use the same idea. Put the folder in `extensions/` beside your slide file and mdeck finds it automatically; there is nothing to register. The [extensions reference](extensions.html) has the complete list of settings.
 

package/docs/site/content/theme-repository.md

@@ -1,80 +1,88 @@
 # Install, remove or share a theme
 
-Every theme and palette in mdeck comes in a **pack**: one theme with the palettes made for it, or a set of palettes. A few packs come with mdeck: `neue`, `academic`, `aurora` and `minimal`, each a theme with its own palette, and the palette `lagoon`. They work right away, also without an internet connection. More packs are in the **theme repository**; try them all on a sample deck at <https://gh.tschieber.de/mdeck-themes/>.
+mdeck comes with four themes, `neue`, `academic`, `aurora` and `minimal`, and five palettes, `swiss`, `nordic`, `neon`, `paper` and `lagoon`. They work right away, also without an internet connection. More themes and palettes are in the **theme repository**; try every one on a sample deck, light and dark, at <https://gh.tschieber.de/mdeck-themes/>.
 
 ## Find and install one
 
-See what there is:
+Themes and palettes each have their own command, with the same words:
 
 ```sh
 mdeck themes search
 mdeck themes search warm
+mdeck palettes search
 ```
 
-Install a pack:
+Install a theme:
 
 ```sh
 mdeck themes install duet
 ```
 
-It is installed for every deck on this computer, in a folder in your home folder (`~/.mdeck/extensions`). Then choose it at the top of a slide file (`theme: duet`) or in the editor's **Deck** tab. Some packs need another pack, for example for a palette their theme uses; `install` brings that one along.
+A theme comes with its default palette, so this installs the palette `cobalt` too. A palette installs on its own:
 
-The design page has the same: open it with `mdeck design`, choose **Show what you can install**, and press **Install** under a pack.
+```sh
+mdeck palettes install solarized
+```
+
+They are installed for every deck on this computer, in a folder in your home folder (`~/.mdeck/extensions`). Then choose one at the top of a slide file (`theme: duet`, `palette: solarized`) or in the editor's **Deck** tab.
+
+The design page has the same: open it with `mdeck design`, choose **Show what you can install**, and press **Install** beside a theme or palette.
 
 ## Beside one deck
 
-Give a slide file (or the folder it is in) to put the pack into the `extensions` folder next to it instead:
+Give a slide file (or the folder it is in) to put it into the `extensions` folder next to it instead:
 
 ```sh
 mdeck themes install duet my-talk.md
 ```
 
-The slide folder then carries the theme, so it works on a computer where the pack is not installed, for example when you send a colleague the folder. A deck's own copy is used before one installed for every deck. Files made with `mdeck send`, `mdeck build` or `mdeck pdf` always carry their theme, wherever it came from.
+The slide folder then carries the theme and its palette, so it works on a computer where they are not installed, for example when you send the folder to a colleague.
 
 ## Update and remove
 
 ```sh
 mdeck themes list                  # what comes with mdeck, and what is installed
-mdeck themes update                # newer versions of everything installed
+mdeck themes update                # newer versions of the installed themes
+mdeck palettes update
 mdeck themes remove duet
+mdeck palettes remove cobalt
 ```
 
-Add a slide file, or `--local`, to work on the packs beside that deck. If you changed an installed file by hand, `update` and `remove` stop and tell you which one, so your change is not lost; add `--force` to go ahead anyway. A pack that another installed pack needs stays until that one is removed.
+Add a slide file, or `--local`, to work beside that deck. If you changed an installed file by hand, `update` and `remove` stop and tell you which one, so your change is not lost; add `--force` to go ahead anyway.
+
+A palette that an installed theme uses by default stays until that theme is removed. A palette made for one theme only (like FHNW's `brand`) comes and goes with that theme.
 
-The packs that come with mdeck can be removed too: `mdeck themes remove aurora` hides it from every deck and from the lists. `mdeck themes install aurora` brings it back, without needing the internet. A deck that sets no theme uses `neue`; if you removed it, mdeck tells you to install it again or to choose another theme. The last theme cannot be removed: install another one first.
+The themes and palettes that come with mdeck can be removed too: `mdeck themes remove aurora` hides it from every deck and from the lists, and `mdeck themes install aurora` brings it back, without the internet. The last theme always stays. A deck without a `theme:` setting uses `neue`; if you removed it, `mdeck check` tells you.
 
-## What a pack may contain
+## What may be in one
 
-Packs hold only theme and palette settings (`extension.toml`) and theme stylesheets (`styles.css`). They never contain code that runs in your slides. Fonts may come only from Google Fonts or Bunny Fonts, and stylesheets may not load anything from the web. mdeck checks this again when it installs a pack, and refuses a pack that does not match the checksum the repository lists for it.
+A theme holds only its settings (`extension.toml`) and its stylesheet (`styles.css`); a palette only its settings. They never contain code that runs in your slides. Fonts may come only from Google Fonts or Bunny Fonts, and stylesheets may not load anything from the web. mdeck checks this again when it installs one, and refuses one that does not match the checksum the repository lists for it.
 
 ## Share your own
 
 1. Make the theme or palette as described in [Create a theme or palette](theme-authoring.html), and fine-tune it with `mdeck design`.
-2. Fork the theme repository and add a folder `packs/<your-pack>/` with a `pack.toml` and one folder per theme or palette:
+2. Fork the theme repository and add it as a folder of its own, `themes/<id>/` or `palettes/<id>/`:
 
 ```text
-packs/
+themes/
   harbour/
-    pack.toml
-    harbour/             a theme
-      extension.toml
-      styles.css
-    harbour-night/       its palette
-      extension.toml
+    extension.toml
+    styles.css
+palettes/
+  harbour-night/
+    extension.toml
 ```
 
+   with a few more settings at the top of `extension.toml`:
+
 ```toml
-schema = 1
-id = "harbour"
-title = "Harbour"
-description = "Navy and brass, with a serif for headings."
 version = "1.0.0"
 author = "Your Name"
 license = "MIT"
-mdeck = ">=3.0.0"
+mdeck = ">=3.1.0"
 ```
 
-   A pack whose theme uses a palette from another pack names that pack: `requires = ["lagoon"]`.
+   A theme names its default palette (`palette = "harbour-night"`); it must be in the repository or come with mdeck, and is installed along with the theme.
 
-3. Check it the way the repository will: `mdeck themes build packs -o site --check` shows every theme and palette in the pack on every kind of slide, light and dark, and fails on text that does not fit or is hard to read.
-4. Open a pull request. Once it is merged, `mdeck themes search` lists it. For a new version, raise `version` in `pack.toml`.
+3. Check it the way the repository will: `mdeck themes build . -o site --check` shows every theme and palette on every kind of slide, light and dark, and fails on text that does not fit or is hard to read.
+4. Open a pull request. Once it is merged, `mdeck themes search` or `mdeck palettes search` lists it. For a new version, raise `version`.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mdeck",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "type": "module",
   "description": "Write slides as a plain text file, present them in the browser, share them as one HTML file or PDF.",
   "license": "MIT",
@@ -40,7 +40,7 @@
     "CHANGELOG.md"
   ],
   "scripts": {
-    "test": "node --test",
+    "test": "node --test --import ./tests/isolate-home.js",
     "test:browser": "node tools/browser-check.mjs",
     "test:server": "node tools/server-check.mjs",
     "test:docs": "node tools/docs-check.mjs",

package/skills/write-slides/SKILL.md

@@ -135,7 +135,7 @@ Fix anything it reports. When you worked from source material, list what you lef
 
 ## 5. A new look: themes and palettes
 
-When the user wants a look the built-in themes and palettes do not give (their institute's colours, a font, the style of a poster or picture), first run `mdeck themes search` (with a word or two): someone may have shared it, and `mdeck themes install <pack> <deck>.md` puts it beside the deck, so the slide folder carries it. Otherwise make it as an extension in `extensions/` beside the deck, never as styling on single slides. Read `extensions.md` from the reference folder first; it lists every setting.
+When the user wants a look the built-in themes and palettes do not give (their institute's colours, a font, the style of a poster or picture), first run `mdeck themes search` or `mdeck palettes search` (with a word or two): someone may have shared it, and `mdeck themes install <theme> <deck>.md` (with its palette) or `mdeck palettes install <palette> <deck>.md` puts it beside the deck, so the slide folder carries it. Otherwise make it as an extension in `extensions/` beside the deck, never as styling on single slides. Read `extensions.md` from the reference folder first; it lists every setting.
 
 - **Colours only: a palette.** `extensions/<id>/extension.toml` with `kind = "palette"`, and every colour role (`--bg`, `--surface`, `--ink`, `--ink-soft`, `--muted`, `--rule`, `--accent`, `--accent-2`, `--on-accent`) in both `[light]` and `[dark]`. Text colours must stay readable on `--bg` and `--surface` in both variants, because themes use the other variant for inverted slides.
 - **Fonts, sizes, spacing or arrangement: a theme.** Copy the folder of the closest built-in theme (`assets/extensions/themes/<id>/` in the mdeck repository or in `$(npm root -g)/mdeck/`) to `extensions/<new-id>/`, change `id` and `title`, then its tokens and `styles.css`. A theme takes no colours of its own: it names its default `palette`, and the colours come from palettes.

package/src/build/editorPlugin.js

@@ -5,9 +5,9 @@
 import { createHash } from 'node:crypto'
 import { existsSync, readFileSync, writeFileSync, mkdirSync, readdirSync, rmSync, unlinkSync } from 'node:fs'
 import { resolve, basename, dirname, relative } from 'node:path'
-import { bundledPacks, loadRegistry, removedPacks, serializeRegistry } from '../extensions/discover.js'
-import { findPack, loadCatalogue, PackError } from '../extensions/packs.js'
-import { installHere, packsAt, removeHere, target } from '../extensions/installed.js'
+import { loadRegistry, removedBuiltIns, serializeRegistry, userExtensionsDir } from '../extensions/discover.js'
+import { findEntry, installedPackages, keyOf, loadCatalogue, PackageError } from '../extensions/packages.js'
+import { installHere, removeHere, target } from '../extensions/installed.js'
 import { createRequire } from 'node:module'
 import { ManifestError, KINDS, ID_RE, MANIFEST_FILENAME, parseManifestText, validateManifest } from '../extensions/manifest.js'
 
@@ -201,26 +201,31 @@ export function editorMiddleware(deckFile, { registryFor, extensions = createExt
         response.setHeader('Allow', 'GET, PUT, DELETE')
         return send(response, 405, { error: 'Method not allowed' })
       }
-      // Packs: what the repository and mdeck offer, and installing one for
-      // every deck (as mdeck themes install does).
-      if (pathname === '/themes/index' && request.method === 'GET') {
-        const catalogue = await loadCatalogue({ bundled: bundledPacks({ all: true }) })
-        const removed = removedPacks()
-        const installed = Object.fromEntries(Object.entries(packsAt(target(null, false))).map(([id, pack]) => [id, { version: pack.version ?? null, bundled: Boolean(pack.bundled) }]))
-        return send(response, 200, { url: catalogue.url, offline: catalogue.offline, packs: catalogue.packs.map(({ dir, ...pack }) => ({ ...pack, removed: removed.includes(pack.id) })), installed })
+      // Themes and palettes: what mdeck and the repository offer, and
+      // installing or removing one for every deck (as mdeck themes does).
+      if (pathname === '/themes/catalogue' && request.method === 'GET') {
+        const catalogue = await loadCatalogue()
+        const hidden = removedBuiltIns()
+        const installed = installedPackages(userExtensionsDir())
+        const entries = catalogue.entries.map(({ dir, ...entry }) => {
+          const key = keyOf(entry.kind, entry.id)
+          const removed = entry.builtIn && hidden.includes(key)
+          return { ...entry, removed, available: Boolean(installed[key]) || (entry.builtIn && !removed), ...(entry.preview ? { preview: new URL(entry.preview, catalogue.url).href } : {}) }
+        })
+        return send(response, 200, { url: catalogue.url, offline: catalogue.offline, entries })
       }
       if (pathname === '/themes/install' && request.method === 'POST') {
         const body = await readJson(request)
-        const catalogue = await loadCatalogue({ bundled: bundledPacks({ all: true }) })
-        findPack(catalogue, String(body?.id ?? ''))
-        const steps = await installHere(catalogue, String(body.id), target(null, false), { mdeckVersion: VERSION })
+        const kind = String(body?.kind ?? ''), id = String(body?.id ?? '')
+        const catalogue = await loadCatalogue()
+        findEntry(catalogue, kind, id)
+        const steps = await installHere(catalogue, kind, id, target(null, false), { mdeckVersion: VERSION })
         return send(response, 200, { steps, registry: serializeRegistry(registryFor()) })
       }
       if (pathname === '/themes/remove' && request.method === 'POST') {
         const body = await readJson(request)
-        const catalogue = await loadCatalogue({ bundled: bundledPacks({ all: true }), online: false })
-        const removed = removeHere(catalogue, String(body?.id ?? ''), target(null, false))
-        return send(response, 200, { ...removed, registry: serializeRegistry(registryFor()) })
+        const removed = removeHere(String(body?.kind ?? ''), String(body?.id ?? ''), target(null, false))
+        return send(response, 200, { removed, registry: serializeRegistry(registryFor()) })
       }
       if (pathname === '/deck' && request.method === 'GET') {
         const registry = registryFor()
@@ -238,7 +243,7 @@ export function editorMiddleware(deckFile, { registryFor, extensions = createExt
       if (['/deck', '/source'].includes(pathname)) { response.setHeader('Allow', pathname === '/deck' ? 'GET' : 'POST'); return send(response, 405, { error: 'Method not allowed' }) }
       return next()
     } catch (error) {
-      if (error instanceof PackError) return send(response, 400, { error: error.message })
+      if (error instanceof PackageError) return send(response, 400, { error: error.message })
       if (error instanceof ManifestError) return send(response, 500, { error: error.message })
       return send(response, error.status ?? 500, { error: error.message })
     }

package/src/build/themeCheck.js

@@ -89,7 +89,8 @@ export function buildSampleDeck({ extensions = {}, outDir }) {
   try {
     writeFileSync(resolve(temp, 'slides.md'), sampleDeck())
     writeFileSync(resolve(temp, 'picture.svg'), SAMPLE_PICTURE)
-    for (const [id, dir] of Object.entries(extensions)) cpSync(dir, resolve(temp, 'extensions', id), { recursive: true })
+    // Keyed by id, or by "kind:id" to keep a theme and a palette of one name apart.
+    for (const [key, dir] of Object.entries(extensions)) cpSync(dir, resolve(temp, 'extensions', ...key.split(':').map((part, i, all) => all.length > 1 && i === 0 ? `${part}s` : part)), { recursive: true })
     mkdirSync(resolve(temp, 'home'))
     execFileSync(process.execPath, [resolve(frameworkRoot, 'bin/mdeck.js'), 'build', resolve(temp, 'slides.md'), '-o', resolve(outDir, 'index.html')],
       { cwd: temp, stdio: 'pipe', env: { ...process.env, MDECK_HOME: resolve(temp, 'home') } })

package/src/cli/args.js

@@ -7,7 +7,8 @@ const commands = {
   run: { ...common, '--network': flag, '--server': optional, max: 1 },
   edit: { ...common, max: 1 },
   design: { ...common, max: 1 },
-  themes: { '--local': flag, '--global': flag, '--force': flag, '--check': flag, '--output': value, '-o': '--output', max: 4 },
+  themes: { '--local': flag, '--force': flag, '--check': flag, '--output': value, '-o': '--output', max: 4 },
+  palettes: { '--local': flag, '--force': flag, max: 4 },
   build: { ...output, '--single-file': flag, '--launchers': flag, '--reader': flag, '--notes': flag, max: 1 },
   send: { ...output, '--notes': flag, '--no-pdf': flag, max: 1 },
   pdf: { ...output, max: 1 },

package/src/cli/index.js

@@ -19,7 +19,7 @@ import { createPairing, pairingPlugin } from '../build/pairing.js'
 import { isAllowedRequest } from '../build/editorPlugin.js'
 import { renderPdf, attachPdf, findChrome } from '../build/pdf.js'
 import { installSkill, readSkill, TARGETS } from './skill.js'
-import { runThemes } from './themes.js'
+import { runPackages } from './themes.js'
 import { ManifestError, KINDS } from '../extensions/manifest.js'
 
 import { frameworkRoot } from '../paths.js'
@@ -313,9 +313,10 @@ const HELP = `
     ${c.green}mdeck edit${c.reset} [slides.md]                    Edit slides in the browser; saves to the file
     ${c.green}mdeck design${c.reset} [folder | slides.md]         Look at and fine-tune themes and palettes on a sample deck;
                                               saves to the folder's extensions/ (default: this folder)
-    ${c.green}mdeck themes${c.reset} search [words]               Themes and palettes: those that come with mdeck and the online repository
-      install <pack>, remove <pack>         for every deck; add slides.md or --local for one deck only
-      update [pack], list                   --force replaces files changed by hand
+    ${c.green}mdeck themes${c.reset} search [words]               Themes from mdeck and the theme repository; install <theme>
+      install <theme>, remove <theme>       brings its default palette along; for every deck, or add
+      update [theme], list                  slides.md or --local for one deck; --force replaces edited files
+    ${c.green}mdeck palettes${c.reset} search | install | remove | update | list   The same for palettes
 
   ${c.dim}Make something to hand out${c.reset}
     ${c.green}mdeck build${c.reset} [slides.md] [-o dir/index.html]   A folder to host
@@ -613,8 +614,8 @@ if (command === 'new') {
   tip(`Changes are saved to the file as you type. Before the first change, a copy goes to ${BACKUP_DIR}/ beside it.\n`)
 
 // ── themes ────────────────────────────────────────────────────────────────────
-} else if (command === 'themes') {
-  await runThemes({ positionals: positionals(), flag: name => hasFlag(name), output: outputOption, ui: { ok, err, tip, c } })
+} else if (command === 'themes' || command === 'palettes') {
+  await runPackages({ kind: command.slice(0, -1), positionals: positionals(), flag: name => hasFlag(name), output: outputOption, ui: { ok, err, tip, c } })
 
 // ── design ────────────────────────────────────────────────────────────────────
 // The design page: with a deck, beside its editor; with a folder (or nothing),