Merge remote-tracking branch 'origin/main' into uzu

2026-07-12 22:15:27 -04:00 · 2025-05-01 11:15:24 +02:00
parent 243adda3dd d6c2a88496
commit 2da03ab46f
43 changed files with 1726 additions and 418 deletions
@@ -11,7 +11,9 @@ export const flashField = StateField.define({
      for (let e of tr.effects) {
        if (e.is(setFlash)) {
          if (e.value && tr.newDoc.length > 0) {
-            const mark = Decoration.mark({ attributes: { style: `background-color: #FFCA2880` } });
+            const mark = Decoration.mark({
+              attributes: { style: `background-color: rgba(255,255,255, .4); filter: invert(10%)` },
+            });
            flash = Decoration.set([mark.range(0, tr.newDoc.length)]);
          } else {
            flash = Decoration.set([]);
@@ -5,16 +5,15 @@ import whitescreen, { settings as whitescreenSettings } from './themes/whitescre
 import teletext, { settings as teletextSettings } from './themes/teletext.mjs';
 import algoboy, { settings as algoboySettings } from './themes/algoboy.mjs';
 import CutiePi, { settings as CutiePiSettings } from './themes/CutiePi.mjs';
-import terminal, { settings as terminalSettings } from './themes/terminal.mjs';
-import abcdef, { settings as abcdefSettings } from './themes/abcdef.mjs';
+import sonicPink, { settings as sonicPinkSettings } from './themes/sonic-pink.mjs';
+import redText, { settings as redTextSettings } from './themes/red-text.mjs';
+import greenText, { settings as greenTextSettings } from './themes/green-text.mjs';
 import androidstudio, { settings as androidstudioSettings } from './themes/androidstudio.mjs';
 import atomone, { settings as atomOneSettings } from './themes/atomone.mjs';
 import aura, { settings as auraSettings } from './themes/aura.mjs';
-import bespin, { settings as bespinSettings } from './themes/bespin.mjs';
 import darcula, { settings as darculaSettings } from './themes/darcula.mjs';
 import dracula, { settings as draculaSettings } from './themes/dracula.mjs';
 import duotoneDark, { settings as duotoneDarkSettings } from './themes/duotoneDark.mjs';
-import duotoneLight, { settings as duotoneLightSettings } from './themes/duotoneLight.mjs';
 import eclipse, { settings as eclipseSettings } from './themes/eclipse.mjs';
 import githubDark, { settings as githubDarkSettings } from './themes/githubDark.mjs';
 import githubLight, { settings as githubLightSettings } from './themes/githubLight.mjs';
@@ -32,52 +31,47 @@ import tokyoNightStorm, { settings as tokyoNightStormSettings } from './themes/t
 import tokyoNightDay, { settings as tokyoNightDaySettings } from './themes/tokyoNightDay.mjs';
 import vscodeDark, { settings as vscodeDarkSettings } from './themes/vscodeDark.mjs';
 import vscodeLight, { settings as vscodeLightSettings } from './themes/vscodeLight.mjs';
-// import xcodeDark, { settings as xcodeDarkSettings } from './themes/xcodeDark.mjs';
 import xcodeLight, { settings as xcodeLightSettings } from './themes/xcodeLight.mjs';
 import bbedit, { settings as bbeditSettings } from './themes/bbedit.mjs';
 import noctisLilac, { settings as noctisLilacSettings } from './themes/noctisLilac.mjs';

 import { setTheme } from '@strudel/draw';
-
 export const themes = {
  strudelTheme,
-  bluescreen,
-  blackscreen,
-  whitescreen,
-  teletext,
  algoboy,
+  androidstudio,
  atomone,
  aura,
+  bbedit,
+  blackscreen,
+  bluescreen,
+  CutiePi,
  darcula,
  dracula,
-  // todo: optimize
-  // bespin,
-  //abcdef,
-  androidstudio,
  duotoneDark,
+  eclipse,
  githubDark,
-  CutiePi,
+  githubLight,
+  greenText,
  gruvboxDark,
+  gruvboxLight,
+  sonicPink,
  materialDark,
-  nord,
+  materialLight,
  monokai,
+  noctisLilac,
+  nord,
+  redText,
  solarizedDark,
+  solarizedLight,
  sublime,
+  teletext,
  tokyoNight,
+  tokyoNightDay,
  tokyoNightStorm,
  vscodeDark,
-  //xcodeDark,
-  // LIGHT
-  bbedit,
-  //duotoneLight,
-  eclipse,
-  githubLight,
-  gruvboxLight,
-  materialLight,
  vscodeLight,
-  noctisLilac,
-  solarizedLight,
-  tokyoNightDay,
+  whitescreen,
  xcodeLight,
 };

@@ -88,21 +82,19 @@ export const settings = {
  whitescreen: whitescreenSettings,
  teletext: teletextSettings,
  algoboy: algoboySettings,
-  terminal: terminalSettings,
-  abcdef: abcdefSettings,
  androidstudio: androidstudioSettings,
  atomone: atomOneSettings,
  aura: auraSettings,
  bbedit: bbeditSettings,
-  bespin: bespinSettings,
  darcula: darculaSettings,
  dracula: draculaSettings,
-  duotoneLight: duotoneLightSettings,
  duotoneDark: duotoneDarkSettings,
  eclipse: eclipseSettings,
  CutiePi: CutiePiSettings,
+  sonicPink: sonicPinkSettings,
  githubLight: githubLightSettings,
  githubDark: githubDarkSettings,
+  greenText: greenTextSettings,
  gruvboxDark: gruvboxDarkSettings,
  gruvboxLight: gruvboxLightSettings,
  materialDark: materialDarkSettings,
@@ -110,6 +102,7 @@ export const settings = {
  noctisLilac: noctisLilacSettings,
  nord: nordSettings,
  monokai: monokaiSettings,
+  redText: redTextSettings,
  solarizedLight: solarizedLightSettings,
  solarizedDark: solarizedDarkSettings,
  sublime: sublimeSettings,
@@ -118,7 +111,6 @@ export const settings = {
  vscodeDark: vscodeDarkSettings,
  vscodeLight: vscodeLightSettings,
  xcodeLight: xcodeLightSettings,
-  //xcodeDark: xcodeDarkSettings,
  tokyoNightDay: tokyoNightDaySettings,
 };

@@ -1,55 +0,0 @@
-/**
- * @name abcdef
- * @author codemirror.net
- * https://codemirror.net/5/theme/abcdef.css
- */
-import { tags as t } from '@lezer/highlight';
-import { createTheme } from './theme-helper.mjs';
-
-export const settings = {
-  background: '#0f0f0f',
-  lineBackground: '#0f0f0f99',
-  foreground: '#defdef',
-  caret: '#00FF00',
-  selection: '#515151',
-  selectionMatch: '#515151',
-  gutterBackground: '#555',
-  gutterForeground: '#FFFFFF',
-  lineHighlight: '#314151',
-};
-
-export default createTheme({
-  theme: 'dark',
-  settings: {
-    background: '#0f0f0f',
-    foreground: '#defdef',
-    caret: '#00FF00',
-    selection: '#515151',
-    selectionMatch: '#515151',
-    // gutterBackground: '#555',
-    gutterBackground: 'transparent',
-    /* gutterForeground: '#FFFFFF', */
-    gutterForeground: '#7a7b7c',
-    lineHighlight: '#0a6bcb3d',
-  },
-  styles: [
-    { tag: t.labelName, color: 'inherit' },
-    { tag: t.keyword, color: 'darkgoldenrod', fontWeight: 'bold' },
-    { tag: t.atom, color: '#77F' },
-    { tag: t.comment, color: '#7a7b7c', fontStyle: 'italic' },
-    { tag: t.number, color: 'violet' },
-    { tag: t.definition(t.variableName), color: '#fffabc' },
-    { tag: t.variableName, color: '#abcdef' },
-    { tag: t.function(t.variableName), color: '#fffabc' },
-    { tag: t.typeName, color: '#FFDD44' },
-    { tag: t.tagName, color: '#def' },
-    { tag: t.string, color: '#2b4' },
-    { tag: t.meta, color: '#C9F' },
-    // { tag: t.qualifier, color: '#FFF700' },
-    // { tag: t.builtin, color: '#30aabc' },
-    { tag: t.bracket, color: '#8a8a8a' },
-    { tag: t.attributeName, color: '#DDFF00' },
-    { tag: t.heading, color: 'aquamarine', fontWeight: 'bold' },
-    { tag: t.link, color: 'blueviolet', fontWeight: 'bold' },
-  ],
-});
@@ -54,6 +54,7 @@ export default createTheme({
      tag: [t.keyword, t.tagName, t.arithmeticOperator],
      color: palette[1],
    },
+    { tag: [t.atom, t.bool, t.special(t.variableName)], color: palette[0] },
    { tag: [t.function(t.variableName), t.propertyName], color: palette[0] },
    { tag: t.atom, color: palette[1] },
  ],
@@ -38,12 +38,14 @@ export default createTheme({
      tag: [t.function(t.variableName), t.function(t.propertyName), t.url, t.processingInstruction],
      color: 'hsl(207, 82%, 66%)',
    },
+    { tag: [t.atom, t.bool, t.special(t.variableName)], color: 'hsl( 29, 54%, 61%)' },
    { tag: [t.tagName, t.heading], color: '#e06c75' },
    { tag: t.comment, color: '#54636D' },
    { tag: [t.variableName, t.propertyName, t.labelName], color: 'hsl(220, 14%, 71%)' },
    { tag: [t.attributeName, t.number], color: 'hsl( 29, 54%, 61%)' },
    { tag: t.className, color: 'hsl( 39, 67%, 69%)' },
    { tag: t.keyword, color: 'hsl(286, 60%, 67%)' },
+
    { tag: [t.string, t.regexp, t.special(t.propertyName)], color: '#98c379' },
  ],
 });
@@ -1,39 +0,0 @@
-// this is different from https://thememirror.net/bespin
-import { tags as t } from '@lezer/highlight';
-import { createTheme } from './theme-helper.mjs';
-
-export const settings = {
-  background: '#28211c',
-  lineBackground: '#28211c99',
-  foreground: '#9d9b97',
-  caret: '#797977',
-  selection: '#36312e',
-  selectionMatch: '#4f382b',
-  gutterBackground: '#28211c',
-  gutterForeground: '#666666',
-  lineHighlight: 'rgba(255, 255, 255, 0.1)',
-};
-export default createTheme({
-  theme: 'dark',
-  settings: {
-    background: '#28211c',
-    foreground: '#9d9b97',
-    caret: '#797977',
-    selection: '#4f382b',
-    selectionMatch: '#4f382b',
-    gutterBackground: '#28211c',
-    gutterForeground: '#666666',
-    lineHighlight: '#ffffff1a',
-  },
-  styles: [
-    { tag: [t.atom, t.number, t.link, t.bool], color: '#9b859d' },
-    { tag: t.comment, color: '#937121' },
-    { tag: [t.keyword, t.tagName], color: '#cf6a4c' },
-    { tag: t.string, color: '#f9ee98' },
-    { tag: t.bracket, color: '#9d9b97' },
-    { tag: [t.variableName], color: '#5ea6ea' },
-    { tag: t.definition(t.variableName), color: '#cf7d34' },
-    { tag: [t.function(t.variableName), t.className], color: '#cf7d34' },
-    { tag: [t.propertyName, t.attributeName], color: '#54be0d' },
-  ],
-});
@@ -0,0 +1,39 @@
+/**
+ * @name Atom One
+ * Atom One dark syntax theme
+ *
+ * https://github.com/atom/one-dark-syntax
+ */
+import { tags as t } from '@lezer/highlight';
+import { createTheme } from './theme-helper.mjs';
+
+const hex = ['#000000', '#8ed675', '#56bd2a', '#54636D', '#171717'];
+
+export const settings = {
+  background: hex[0],
+  lineBackground: 'transparent',
+  foreground: hex[2],
+  selection: hex[4],
+  selectionMatch: hex[0],
+  gutterBackground: hex[0],
+  gutterForeground: hex[3],
+  gutterBorder: 'transparent',
+  lineHighlight: hex[0],
+};
+
+export default createTheme({
+  theme: 'dark',
+  settings,
+  styles: [
+    {
+      tag: [t.function(t.variableName), t.function(t.propertyName), t.url, t.processingInstruction],
+      color: hex[2],
+    },
+    { tag: [t.atom, t.bool, t.special(t.variableName)], color: hex[1] },
+    { tag: t.comment, color: hex[3] },
+    { tag: [t.variableName, t.propertyName, t.labelName], color: hex[2] },
+    { tag: [t.attributeName, t.number], color: hex[1] },
+    { tag: t.keyword, color: hex[2] },
+    { tag: [t.string, t.regexp, t.special(t.propertyName)], color: hex[1] },
+  ],
+});
@@ -0,0 +1,39 @@
+/**
+ * @name Atom One
+ * Atom One dark syntax theme
+ *
+ * https://github.com/atom/one-dark-syntax
+ */
+import { tags as t } from '@lezer/highlight';
+import { createTheme } from './theme-helper.mjs';
+
+const hex = ['#000000', '#ff5356', '#bd312a', '#54636D', '#171717'];
+
+export const settings = {
+  background: hex[0],
+  lineBackground: 'transparent',
+  foreground: hex[2],
+  selection: hex[4],
+  selectionMatch: hex[0],
+  gutterBackground: hex[0],
+  gutterForeground: hex[3],
+  gutterBorder: 'transparent',
+  lineHighlight: hex[0],
+};
+
+export default createTheme({
+  theme: 'dark',
+  settings,
+  styles: [
+    {
+      tag: [t.function(t.variableName), t.function(t.propertyName), t.url, t.processingInstruction],
+      color: hex[2],
+    },
+    { tag: [t.atom, t.bool, t.special(t.variableName)], color: hex[1] },
+    { tag: t.comment, color: hex[3] },
+    { tag: [t.variableName, t.propertyName, t.labelName], color: hex[2] },
+    { tag: [t.attributeName, t.number], color: hex[1] },
+    { tag: t.keyword, color: hex[2] },
+    { tag: [t.string, t.regexp, t.special(t.propertyName)], color: hex[1] },
+  ],
+});
@@ -0,0 +1,39 @@
+/**
+ * @name Atom One
+ * Atom One dark syntax theme
+ *
+ * https://github.com/atom/one-dark-syntax
+ */
+import { tags as t } from '@lezer/highlight';
+import { createTheme } from './theme-helper.mjs';
+
+const hex = ['#1e1e1e', '#fbde2d', '#ff1493', '#4c83ff', '#ededed', '#cccccc', '#ffffff30', '#dc2f8c'];
+
+export const settings = {
+  background: '#000000',
+  lineBackground: 'transparent',
+  foreground: hex[4],
+  selection: hex[6],
+  gutterBackground: hex[0],
+  gutterForeground: hex[5],
+  gutterBorder: 'transparent',
+  lineHighlight: hex[0],
+};
+
+export default createTheme({
+  theme: 'dark',
+  settings,
+  styles: [
+    {
+      tag: [t.function(t.variableName), t.function(t.propertyName), t.url, t.processingInstruction],
+      color: hex[4],
+    },
+    { tag: [t.atom, t.bool, t.special(t.variableName)], color: hex[3] },
+
+    { tag: t.comment, color: '#54636D' },
+    { tag: [t.variableName, t.propertyName, t.labelName], color: hex[4] },
+    { tag: [t.attributeName, t.number], color: hex[3] },
+    { tag: t.keyword, color: hex[1] },
+    { tag: [t.string, t.regexp, t.special(t.propertyName)], color: hex[2] },
+  ],
+});
@@ -5,14 +5,11 @@ export const settings = {
  background: '#222',
  lineBackground: '#22222299',
  foreground: '#fff',
-  // foreground: '#75baff',
  caret: '#ffcc00',
  selection: 'rgba(128, 203, 196, 0.5)',
  selectionMatch: '#036dd626',
-  // lineHighlight: '#8a91991a', // original
  lineHighlight: '#00000050',
  gutterBackground: 'transparent',
-  // gutterForeground: '#8a919966',
  gutterForeground: '#8a919966',
 };

@@ -20,6 +17,7 @@ export default createTheme({
  theme: 'dark',
  settings,
  styles: [
+    { tag: [t.atom, t.bool, t.special(t.variableName)], color: '#89ddff' },
    { tag: t.labelName, color: '#89ddff' },
    { tag: t.keyword, color: '#c792ea' },
    { tag: t.operator, color: '#89ddff' },
@@ -1,34 +0,0 @@
-import { tags as t } from '@lezer/highlight';
-import { createTheme } from './theme-helper.mjs';
-
-export const settings = {
-  background: '#292A30',
-  lineBackground: '#292A3099',
-  foreground: '#CECFD0',
-  caret: '#fff',
-  selection: '#727377',
-  selectionMatch: '#727377',
-  lineHighlight: '#2F3239',
-};
-
-export default createTheme({
-  theme: 'dark',
-  settings: {
-    background: '#292A30',
-    foreground: '#CECFD0',
-    caret: '#fff',
-    selection: '#727377',
-    selectionMatch: '#727377',
-    lineHighlight: '#ffffff0f',
-  },
-  styles: [
-    { tag: [t.comment, t.quote], color: '#7F8C98' },
-    { tag: [t.keyword], color: '#FF7AB2', fontWeight: 'bold' },
-    { tag: [t.string, t.meta], color: '#FF8170' },
-    { tag: [t.typeName], color: '#DABAFF' },
-    { tag: [t.definition(t.variableName)], color: '#6BDFFF' },
-    { tag: [t.name], color: '#6BAA9F' },
-    { tag: [t.variableName], color: '#ACF2E4' },
-    { tag: [t.regexp, t.link], color: '#FF8170' },
-  ],
-});
@@ -1,5 +1,5 @@
 /*
-controls.mjs - <short description TODO>
+controls.mjs - Registers audio controls for pattern manipulation and effects.
 Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/core/controls.mjs>
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
@@ -1523,22 +1523,11 @@ export const { scram } = registerControl('scram');
 export const { binshift } = registerControl('binshift');
 export const { hbrick } = registerControl('hbrick');
 export const { lbrick } = registerControl('lbrick');
-export const { midichan } = registerControl('midichan');
-export const { midimap } = registerControl('midimap');
-export const { midiport } = registerControl('midiport');
-export const { control } = registerControl('control');
-export const { ccn } = registerControl('ccn');
-export const { ccv } = registerControl('ccv');
-export const { polyTouch } = registerControl('polyTouch');
-export const { midibend } = registerControl('midibend');
-export const { miditouch } = registerControl('miditouch');
-export const { ctlNum } = registerControl('ctlNum');
+
 export const { frameRate } = registerControl('frameRate');
 export const { frames } = registerControl('frames');
 export const { hours } = registerControl('hours');
-export const { midicmd } = registerControl('midicmd');
 export const { minutes } = registerControl('minutes');
-export const { progNum } = registerControl('progNum');
 export const { seconds } = registerControl('seconds');
 export const { songPtr } = registerControl('songPtr');
 export const { uid } = registerControl('uid');
@@ -1631,6 +1620,151 @@ export const ar = register('ar', (t, pat) => {
  return pat.set({ attack, release });
 });

+//MIDI
+
+/**
+ * MIDI channel: Sets the MIDI channel for the event.
+ *
+ * @name midichan
+ * @param {number | Pattern} channel MIDI channel number (0-15)
+ * @example
+ * note("c4").midichan(1).midi()
+ */
+export const { midichan } = registerControl('midichan');
+
+export const { midimap } = registerControl('midimap');
+
+/**
+ * MIDI port: Sets the MIDI port for the event.
+ *
+ * @name midiport
+ * @param {number | Pattern} port MIDI port
+ * @example
+ * note("c a f e").midiport("<0 1 2 3>").midi()
+ */
+export const { midiport } = registerControl('midiport');
+
+/**
+ * MIDI command: Sends a MIDI command message.
+ *
+ * @name midicmd
+ * @param {number | Pattern} command MIDI command
+ * @example
+ * midicmd("clock*48,<start stop>/2").midi()
+ */
+export const { midicmd } = registerControl('midicmd');
+
+/**
+ * MIDI control: Sends a MIDI control change message.
+ *
+ * @name control
+ * @param {number | Pattern}  MIDI control number (0-127)
+ * @param {number | Pattern}  MIDI controller value (0-127)
+ */
+export const control = register('control', (args, pat) => {
+  if (!Array.isArray(args)) {
+    throw new Error('control expects an array of [ccn, ccv]');
+  }
+  const [_ccn, _ccv] = args;
+  return pat.ccn(_ccn).ccv(_ccv);
+});
+
+/**
+ * MIDI control number: Sends a MIDI control change message.
+ *
+ * @name ccn
+ * @param {number | Pattern}  MIDI control number (0-127)
+ */
+export const { ccn } = registerControl('ccn');
+/**
+ * MIDI control value: Sends a MIDI control change message.
+ *
+ * @name ccv
+ * @param {number | Pattern}  MIDI control value (0-127)
+ */
+export const { ccv } = registerControl('ccv');
+export const { ctlNum } = registerControl('ctlNum');
+// TODO: ctlVal?
+
+/**
+ * MIDI NRPN non-registered parameter number: Sends a MIDI NRPN non-registered parameter number message.
+ * @name nrpnn
+ * @param {number | Pattern} nrpnn MIDI NRPN non-registered parameter number (0-127)
+ * @example
+ * note("c4").nrpnn("1:8").nrpv("123").midichan(1).midi()
+ */
+export const { nrpnn } = registerControl('nrpnn');
+/**
+ * MIDI NRPN non-registered parameter value: Sends a MIDI NRPN non-registered parameter value message.
+ * @name nrpv
+ * @param {number | Pattern} nrpv MIDI NRPN non-registered parameter value (0-127)
+ * @example
+ * note("c4").nrpnn("1:8").nrpv("123").midichan(1).midi()
+ */
+export const { nrpv } = registerControl('nrpv');
+
+/**
+ * MIDI program number: Sends a MIDI program change message.
+ *
+ * @name progNum
+ * @param {number | Pattern} program MIDI program number (0-127)
+ * @example
+ * note("c4").progNum(10).midichan(1).midi()
+ */
+export const { progNum } = registerControl('progNum');
+
+/**
+ * MIDI sysex: Sends a MIDI sysex message.
+ * @name sysex
+ * @param {number | Pattern} id Sysex ID
+ * @param {number | Pattern} data Sysex data
+ * @example
+ * note("c4").sysex(["0x77", "0x01:0x02:0x03:0x04"]).midichan(1).midi()
+ */
+export const sysex = register('sysex', (args, pat) => {
+  if (!Array.isArray(args)) {
+    throw new Error('sysex expects an array of [id, data]');
+  }
+  const [id, data] = args;
+  return pat.sysexid(id).sysexdata(data);
+});
+/**
+ * MIDI sysex ID: Sends a MIDI sysex identifier message.
+ * @name sysexid
+ * @param {number | Pattern} id Sysex ID
+ * @example
+ * note("c4").sysexid("0x77").sysexdata("0x01:0x02:0x03:0x04").midichan(1).midi()
+ */
+export const { sysexid } = registerControl('sysexid');
+/**
+ * MIDI sysex data: Sends a MIDI sysex message.
+ * @name sysexdata
+ * @param {number | Pattern} data Sysex data
+ * @example
+ * note("c4").sysexid("0x77").sysexdata("0x01:0x02:0x03:0x04").midichan(1).midi()
+ */
+export const { sysexdata } = registerControl('sysexdata');
+
+/**
+ * MIDI pitch bend: Sends a MIDI pitch bend message.
+ * @name midibend
+ * @param {number | Pattern} midibend MIDI pitch bend (-1 - 1)
+ * @example
+ * note("c4").midibend(sine.slow(4).range(-0.4,0.4)).midi()
+ */
+export const { midibend } = registerControl('midibend');
+/**
+ * MIDI key after touch: Sends a MIDI key after touch message.
+ * @name miditouch
+ * @param {number | Pattern} miditouch MIDI key after touch (0-1)
+ * @example
+ * note("c4").miditouch(sine.slow(4).range(0,1)).midi()
+ */
+export const { miditouch } = registerControl('miditouch');
+
+// TODO: what is this?
+export const { polyTouch } = registerControl('polyTouch');
+
 export const getControlName = (alias) => {
  if (controlAlias.has(alias)) {
    return controlAlias.get(alias);
@@ -1642,14 +1776,46 @@ export const getControlName = (alias) => {
 * Sets properties in a batch.
 *
 * @name as
- * @param {Array} mapping the control names that are set
+ * @param {String | Array} mapping the control names that are set
 * @example
 * "c:.5 a:1 f:.25 e:.8".as("note:clip")
+ * @example
+ * "{0@2 0.25 0 0.5 .3 .5}%8".as("begin").s("sax_vib").clip(1)
 */
 export const as = register('as', (mapping, pat) => {
+  mapping = Array.isArray(mapping) ? mapping : [mapping];
  return pat.fmap((v) => {
    v = Array.isArray(v) ? v : [v];
    v = Object.fromEntries(mapping.map((prop, i) => [getControlName(prop), v[i]]));
    return v;
  });
 });
+
+/**
+ * Allows you to scrub an audio file like a tape loop by passing values that represents the position in the audio file
+ * in the optional array syntax ex: "0.5:2", the second value controls the speed of playback
+ * @name scrub
+ * @memberof Pattern
+ * @returns Pattern
+ * @example
+ * samples('github:switchangel/pad')
+ * s("swpad:0").scrub("{0.1!2 .25@3 0.7!2 <0.8:1.5>}%8")
+ * @example
+ * samples('github:yaxu/clean-breaks/main');
+ * s("amen/4").fit().scrub("{0@3 0@2 4@3}%8".div(16))
+ */
+
+export const scrub = register(
+  'scrub',
+  (beginPat, pat) => {
+    return beginPat.outerBind((v) => {
+      if (!Array.isArray(v)) {
+        v = [v];
+      }
+      const [beginVal, speedMultiplier = 1] = v;
+
+      return pat.begin(beginVal).mul(speed(speedMultiplier)).clip(1);
+    });
+  },
+  false,
+);
@@ -2108,11 +2108,13 @@ export const linger = register(

 /**
 * Samples the pattern at a rate of n events per cycle. Useful for turning a continuous pattern into a discrete one.
+ * @name segment
+ * @synonyms seg
 * @param {number} segments number of segments per cycle
 * @example
 * note(saw.range(40,52).segment(24))
 */
-export const segment = register('segment', function (rate, pat) {
+export const { segment, seg } = register(['segment', 'seg'], function (rate, pat) {
  return pat.struct(pure(true)._fast(rate)).setSteps(rate);
 });

@@ -2488,16 +2490,24 @@ export const bypass = register(
 );

 /**
- * Loops the pattern inside at `offset` for `cycles`.
+ * Loops the pattern inside an `offset` for `cycles`.
+ * If you think of the entire span of time in cycles as a ribbon, you can cut a single piece and loop it.
+ * @name ribbon
+ * @synonym rib
 * @param {number} offset start point of loop in cycles
 * @param {number} cycles loop length in cycles
 * @example
- * note("<c d e f>").ribbon(1, 2).fast(2)
+ * note("<c d e f>").ribbon(1, 2)
 * @example
 * // Looping a portion of randomness
- * note(irand(8).segment(4).scale('C3 minor')).ribbon(1337, 2)
+ * n(irand(8).segment(4)).scale("c:pentatonic").ribbon(1337, 2)
+ * @example
+ * // rhythm generator
+ * s("bd!16?").ribbon(29,.5)
 */
-export const ribbon = register('ribbon', (offset, cycles, pat) => pat.early(offset).restart(pure(1).slow(cycles)));
+export const { ribbon, rib } = register(['ribbon', 'rib'], (offset, cycles, pat) =>
+  pat.early(offset).restart(pure(1).slow(cycles)),
+);

 export const hsla = register('hsla', (h, s, l, a, pat) => {
  return pat.color(`hsla(${h}turn,${s * 100}%,${l * 100}%,${a})`);
@@ -528,6 +528,9 @@ export const degradeByWith = register(
 * s("hh*8").degradeBy(0.2)
 * @example
 * s("[hh?0.2]*8")
+ * @example
+ * //beat generator
+ * s("bd").segment(16).degradeBy(.5).ribbon(16,1)
 */
 export const degradeBy = register(
  'degradeBy',
@@ -7,3 +7,187 @@ This package adds midi functionality to strudel Patterns.
 ```sh
 npm i @strudel/midi --save
 ```
+
+## Available Controls
+
+The following MIDI controls are available:
+
+OUTPUT:
+
+- `midi` - opens a midi output device.
+- `note` - Sends MIDI note messages. Can accept note names (e.g. "c4") or MIDI note numbers (0-127)
+- `midichan` - Sets the MIDI channel (1-16, defaults to 1)
+- `velocity` - Sets note velocity (0-1, defaults to 0.9)
+- `gain` - Modifies velocity by multiplying with it (0-1, defaults to 1)
+- `control` - Sets MIDI control change messages
+- `ccn` - Sets MIDI CC controller number (0-127)
+- `ccv` - Sets MIDI CC value (0-1)
+- `progNum` - Sends MIDI program change messages (0-127)
+- `sysex` - Sends MIDI System Exclusive messages (id: number 0-127 or array of bytes 0-127, data: array of bytes 0-127)
+- `sysexid` - Sets MIDI System Exclusive ID (number 0-127 or array of bytes 0-127)
+- `sysexdata` - Sets MIDI System Exclusive data (array of bytes 0-127)
+- `midibend` - Sets MIDI pitch bend (-1 - 1)
+- `miditouch` - Sets MIDI key after touch (0-1)
+- `midicmd` - Sends MIDI system real-time messages to control timing and transport on MIDI devices.
+- `nrpnn` - Sets MIDI NRPN non-registered parameter number (array of bytes 0-127)
+- `nrpv` - Sets MIDI NRPN non-registered parameter value (0-127)
+
+
+INPUT:
+
+- `midin` - Opens a MIDI input port to receive MIDI control change messages.
+
+Additional controls can be mapped using the mapping object passed to `.midi()`:
+
+## Examples
+
+### midi(outputName?, options?)
+
+Either connect a midi device or use the IAC Driver (Mac) or Midi Through Port (Linux) for internal midi messages.
+If no outputName is given, it uses the first midi output it finds.
+
+```javascript
+$: chord("<C^7 A7 Dm7 G7>").voicing().midi('IAC Driver')
+```
+
+In the console, you will see a log of the available MIDI devices as soon as you run the code, e.g. `Midi connected! Using "Midi Through Port-0".`
+
+### Options
+
+The `.midi()` function accepts an options object with the following properties:
+
+```javascript
+$: note("c a f e").midi('IAC Driver', { isController: true, midimap: 'default'})
+```
+
+<details>
+<summary>Available Options</summary>
+
+| Option | Type | Default | Description |
+|--------|------|---------|-------------|
+| isController | boolean | false | When true, disables sending note messages. Useful for MIDI controllers |
+| latencyMs | number | 34 | Latency in milliseconds to align MIDI with audio engine |
+| noteOffsetMs | number | 10 | Offset in milliseconds for note-off messages to prevent glitching |
+| midichannel | number | 1 | Default MIDI channel (1-16) |
+| velocity | number | 0.9 | Default note velocity (0-1) |
+| gain | number | 1 | Default gain multiplier for velocity (0-1) |
+| midimap | string | 'default' | Name of MIDI mapping to use for control changes |
+| midiport | string/number | - | MIDI device name or index |
+
+</details>
+
+
+
+
+### midiport(outputName)
+
+Selects the MIDI output device to use, pattern can be used to switch between devices.
+
+```javascript
+$: midiport('IAC Driver')
+$: note("c a f e").midiport("<0 1 2 3>").midi()
+```
+
+### midichan(number)
+
+Selects the MIDI channel to use. If not used, `.midi` will use channel 1 by default.
+
+### control, ccn && ccv
+
+`control` sends MIDI control change messages to your MIDI device.
+
+- `ccn` sets the cc number. Depends on your synths midi mapping
+- `ccv` sets the cc value. normalized from 0 to 1.
+
+```javascript
+$: note("c a f e").control([74, sine.slow(4)]).midi()
+$: note("c a f e").ccn(74).ccv(sine.slow(4)).midi()
+```
+
+In the above snippet, `ccn` is set to 74, which is the filter cutoff for many synths. `ccv` is controlled by a saw pattern.
+Having everything in one pattern, the `ccv` pattern will be aligned to the note pattern, because the structure comes from the left by default.
+But you can also control cc messages separately like this:
+
+```javascript
+$: note("c a f e").midi()
+$: ccv(sine.segment(16).slow(4)).ccn(74).midi()
+```
+
+### progNum (Program Change)
+
+`progNum` control sends MIDI program change messages to switch between different presets/patches on your MIDI device.
+Program change values should be numbers between 0 and 127.
+
+```javascript
+// Play notes while changing programs
+note("c3 e3 g3").progNum("<0 1 2>").midi()
+```
+
+Program change messages are useful for switching between different instrument sounds or presets during a performance. 
+The exact sound that each program number maps to depends on your MIDI device's configuration.
+
+## sysex,  sysexid && sysexdata (System Exclusive Message)
+
+`sysex`, `sysexid` and `sysexdata` control sends MIDI System Exclusive (SysEx) messages to your MIDI device. 
+sysEx messages are device-specific commands that allow deeper control over synthesizer parameters. 
+The value should be an array of numbers between 0-255 representing the SysEx data bytes.
+
+```javascript
+// Send a simple SysEx message
+let id = 0x43; //Yamaha
+//let id = "0x00:0x20:0x32"; //Behringer ID can be an array of numbers
+let data = "0x79:0x09:0x11:0x0A:0x00:0x00"; // Set NSX-39 voice to say "Aa"
+$: note("c d e f e d c").sysex(id, data).midi();
+$: note("c d e f e d c").sysexid(id).sysexdata(data).midi();
+```
+
+The exact format of SysEx messages depends on your MIDI device's specification.
+Consult your device's MIDI implementation guide for details on supported SysEx messages.
+
+### midibend && miditouch
+
+`midibend` sets MIDI pitch bend (-1 - 1)
+`miditouch` sets MIDI key after touch (0-1)
+
+```javascript
+
+$: note("c d e f e d c").midibend(sine.slow(4).range(-0.4,0.4)).midi();
+$: note("c d e f e d c").miditouch(sine.slow(4).range(0,1)).midi();
+
+```
+
+### midicmd
+
+`midicmd` sends MIDI system real-time messages to control timing and transport on MIDI devices.
+
+It supports the following commands:
+
+- `clock`/`midiClock` - Sends MIDI timing clock messages
+- `start` - Sends MIDI start message
+- `stop` - Sends MIDI stop message
+- `continue` - Sends MIDI continue message
+
+```javascript
+// You can control the clock with a pattern and ensure it starts in sync when the repl begins.
+// Note: It might act unexpectedly if MIDI isn't set up initially.
+stack(
+  midicmd("clock*48,<start stop>/2").midi('IAC Driver') 
+)
+```
+
+`midicmd` also supports sending control change, program change and sysex messages.
+
+- `cc` - sends MIDI control change messages.
+- `progNum` - sends MIDI program change messages.
+- `sysex` - sends MIDI system exclusive messages.
+
+```javascript
+stack(
+  // "cc:ccn:ccv"
+  midicmd("cc:74:1").midi('IAC Driver'),
+  // "progNum:progNum"
+  midicmd("progNum:1").midi('IAC Driver'),
+  // "sysex:[sysexid]:[sysexdata]"
+  midicmd("sysex:[0x43]:[0x79:0x09:0x11:0x0A:0x00:0x00]").midi('IAC Driver')
+)
+```
@@ -8,6 +8,7 @@ import * as _WebMidi from 'webmidi';
 import { Pattern, getEventOffsetMs, isPattern, logger, ref } from '@strudel/core';
 import { noteToMidi, getControlName } from '@strudel/core';
 import { Note } from 'webmidi';
+
 // if you use WebMidi from outside of this package, make sure to import that instance:
 export const { WebMidi } = _WebMidi;

@@ -43,13 +44,16 @@ export function enableWebMidi(options = {}) {
      resolve(WebMidi);
      return;
    }
-    WebMidi.enable((err) => {
-      if (err) {
-        reject(err);
-      }
-      onReady?.(WebMidi);
-      resolve(WebMidi);
-    });
+    WebMidi.enable(
+      (err) => {
+        if (err) {
+          reject(err);
+        }
+        onReady?.(WebMidi);
+        resolve(WebMidi);
+      },
+      { sysex: true },
+    );
  });
 }

@@ -174,6 +178,7 @@ function normalize(value = 0, min = 0, max = 1, exp = 1) {
  normalized = Math.min(1, Math.max(0, normalized));
  return Math.pow(normalized, exp);
 }
+
 function mapCC(mapping, value) {
  return Object.keys(value)
    .filter((key) => !!mapping[getControlName(key)])
@@ -196,18 +201,127 @@ function sendCC(ccn, ccv, device, midichan, timeOffsetString) {
  device.sendControlChange(ccn, scaled, midichan, { time: timeOffsetString });
 }

-Pattern.prototype.midi = function (output) {
-  if (isPattern(output)) {
+// sends a program change message to the given device on the given channel
+function sendProgramChange(progNum, device, midichan, timeOffsetString) {
+  if (typeof progNum !== 'number' || progNum < 0 || progNum > 127) {
+    throw new Error('expected progNum (program change) to be a number between 0 and 127');
+  }
+  device.sendProgramChange(progNum, midichan, { time: timeOffsetString });
+}
+
+// sends a sysex message to the given device on the given channel
+function sendSysex(sysexid, sysexdata, device, timeOffsetString) {
+  if (Array.isArray(sysexid)) {
+    if (!sysexid.every((byte) => Number.isInteger(byte) && byte >= 0 && byte <= 255)) {
+      throw new Error('all sysexid bytes must be integers between 0 and 255');
+    }
+  } else if (!Number.isInteger(sysexid) || sysexid < 0 || sysexid > 255) {
+    throw new Error('A:sysexid must be an number between 0 and 255 or an array of such integers');
+  }
+
+  if (!Array.isArray(sysexdata)) {
+    throw new Error('expected sysex to be an array of numbers (0-255)');
+  }
+  if (!sysexdata.every((byte) => Number.isInteger(byte) && byte >= 0 && byte <= 255)) {
+    throw new Error('all sysex bytes must be integers between 0 and 255');
+  }
+  device.sendSysex(sysexid, sysexdata, { time: timeOffsetString });
+}
+
+// sends a NRPN message to the given device on the given channel
+function sendNRPN(nrpnn, nrpv, device, midichan, timeOffsetString) {
+  if (Array.isArray(nrpnn)) {
+    if (!nrpnn.every((byte) => Number.isInteger(byte) && byte >= 0 && byte <= 255)) {
+      throw new Error('all nrpnn bytes must be integers between 0 and 255');
+    }
+  } else if (!Number.isInteger(nrpv) || nrpv < 0 || nrpv > 255) {
+    throw new Error('A:sysexid must be an number between 0 and 255 or an array of such integers');
+  }
+
+  device.sendNRPN(nrpnn, nrpv, midichan, { time: timeOffsetString });
+}
+
+// sends a pitch bend message to the given device on the given channel
+function sendPitchBend(midibend, device, midichan, timeOffsetString) {
+  if (typeof midibend !== 'number' || midibend < -1 || midibend > 1) {
+    throw new Error('expected midibend to be a number between -1 and 1');
+  }
+  device.sendPitchBend(midibend, midichan, { time: timeOffsetString });
+}
+
+// sends a channel aftertouch message to the given device on the given channel
+function sendAftertouch(miditouch, device, midichan, timeOffsetString) {
+  if (typeof miditouch !== 'number' || miditouch < 0 || miditouch > 1) {
+    throw new Error('expected miditouch to be a number between 0 and 1');
+  }
+  device.sendChannelAftertouch(miditouch, midichan, { time: timeOffsetString });
+}
+
+// sends a note message to the given device on the given channel
+function sendNote(note, velocity, duration, device, midichan, timeOffsetString) {
+  if (note == null || note === '') {
+    throw new Error('note cannot be null or empty');
+  }
+  if (velocity != null && (typeof velocity !== 'number' || velocity < 0 || velocity > 1)) {
+    throw new Error('velocity must be a number between 0 and 1');
+  }
+  if (duration != null && (typeof duration !== 'number' || duration < 0)) {
+    throw new Error('duration must be a positive number');
+  }
+
+  const midiNumber = typeof note === 'number' ? note : noteToMidi(note);
+  const midiNote = new Note(midiNumber, { attack: velocity, duration });
+  device.playNote(midiNote, midichan, {
+    time: timeOffsetString,
+  });
+}
+
+/**
+ * MIDI output: Opens a MIDI output port.
+ * @param {string | number} midiport MIDI device name or index defaulting to 0
+ * @param {object} options Additional MIDI configuration options
+ * @example
+ * note("c4").midichan(1).midi('IAC Driver Bus 1')
+ * @example
+ * note("c4").midichan(1).midi('IAC Driver Bus 1', { controller: true, latency: 50 })
+ */
+
+Pattern.prototype.midi = function (midiport, options = {}) {
+  if (isPattern(midiport)) {
    throw new Error(
-      `.midi does not accept Pattern input. Make sure to pass device name with single quotes. Example: .midi('${
+      `.midi does not accept Pattern input for midiport. Make sure to pass device name with single quotes. Example: .midi('${
        WebMidi.outputs?.[0]?.name || 'IAC Driver Bus 1'
      }')`,
    );
  }

+  // For backward compatibility
+  if (typeof midiport === 'object') {
+    const { port, isController = false, ...configOptions } = midiport;
+    options = {
+      isController,
+      ...configOptions,
+      ...options, // Keep any options passed separately
+    };
+    midiport = port;
+  }
+
+  let midiConfig = {
+    // Default configuration values
+    isController: false, // Disable sending notes for midi controllers
+    latencyMs: 34, // Default latency to get audio engine to line up in ms
+    noteOffsetMs: 10, // Default note-off offset to prevent glitching in ms
+    midichannel: 1, // Default MIDI channel
+    velocity: 0.9, // Default velocity
+    gain: 1, // Default gain
+    midimap: 'default', // Default MIDI map
+    midiport: midiport, // Store the port in the config
+    ...options, // Override defaults with provided options
+  };
+
  enableWebMidi({
    onEnabled: ({ outputs }) => {
-      const device = getDevice(output, outputs);
+      const device = getDevice(midiConfig.midiport, outputs);
      const otherOutputs = outputs.filter((o) => o.name !== device.name);
      logger(
        `Midi enabled! Using "${device.name}". ${
@@ -221,26 +335,35 @@ Pattern.prototype.midi = function (output) {

  return this.onTrigger((time_deprecate, hap, currentTime, cps, targetTime) => {
    if (!WebMidi.enabled) {
-      console.log('not enabled');
+      logger('Midi not enabled');
      return;
    }
    hap.ensureObjectValue();
+
    //magic number to get audio engine to line up, can probably be calculated somehow
-    const latencyMs = 34;
+    const latencyMs = midiConfig.latencyMs;
    // passing a string with a +num into the webmidi api adds an offset to the current time https://webmidijs.org/api/classes/Output
    const timeOffsetString = `+${getEventOffsetMs(targetTime, currentTime) + latencyMs}`;

-    // destructure value
+    // midi event values from hap with configurable defaults
    let {
      note,
+      nrpnn,
+      nrpv,
      ccn,
      ccv,
-      midichan = 1,
+      midichan = midiConfig.midichannel,
      midicmd,
-      gain = 1,
-      velocity = 0.9,
-      midimap = 'default',
-      midiport = output,
+      midibend,
+      miditouch,
+      polyTouch,
+      gain = midiConfig.gain,
+      velocity = midiConfig.velocity,
+      progNum,
+      sysexid,
+      sysexdata,
+      midimap = midiConfig.midimap,
+      midiport = midiConfig.midiport,
    } = hap.value;

    const device = getDevice(midiport, WebMidi.outputs);
@@ -252,24 +375,62 @@ Pattern.prototype.midi = function (output) {
    }

    velocity = gain * velocity;
+
+    // Handle midimap
    // if midimap is set, send a cc messages from defined controls
    if (midicontrolMap.has(midimap)) {
      const ccs = mapCC(midicontrolMap.get(midimap), hap.value);
      ccs.forEach(({ ccn, ccv }) => sendCC(ccn, ccv, device, midichan, timeOffsetString));
+    } else if (midimap !== 'default') {
+      // Add warning when a non-existent midimap is specified
+      logger(`[midi] midimap "${midimap}" not found! Available maps: ${[...midicontrolMap.keys()].join(', ')}`);
    }

-    // note off messages will often a few ms arrive late, try to prevent glitching by subtracting from the duration length
-    const duration = (hap.duration.valueOf() / cps) * 1000 - 10;
-    if (note != null) {
-      const midiNumber = typeof note === 'number' ? note : noteToMidi(note);
-      const midiNote = new Note(midiNumber, { attack: velocity, duration });
-      device.playNote(midiNote, midichan, {
-        time: timeOffsetString,
-      });
+    // Handle note
+    if (note !== undefined && !midiConfig.isController) {
+      // note off messages will often a few ms arrive late,
+      // try to prevent glitching by subtracting noteOffsetMs from the duration length
+      const duration = (hap.duration.valueOf() / cps) * 1000 - midiConfig.noteOffsetMs;
+
+      sendNote(note, velocity, duration, device, midichan, timeOffsetString);
    }
+
+    // Handle program change
+    if (progNum !== undefined) {
+      sendProgramChange(progNum, device, midichan, timeOffsetString);
+    }
+
+    // Handle sysex
+    // sysex data is consist of 2 arrays, first is sysexid, second is sysexdata
+    // sysexid is a manufacturer id it is either a number or an array of 3 numbers.
+    // list of manufacturer ids can be found here : https://midi.org/sysexidtable
+    // if sysexid is an array the first byte is 0x00
+
+    if (sysexid !== undefined && sysexdata !== undefined) {
+      sendSysex(sysexid, sysexdata, device, timeOffsetString);
+    }
+
+    // Handle control change
    if (ccv !== undefined && ccn !== undefined) {
      sendCC(ccn, ccv, device, midichan, timeOffsetString);
    }
+
+    // Handle NRPN non-registered parameter number
+    if (nrpnn !== undefined && nrpv !== undefined) {
+      sendNRPN(nrpnn, nrpv, device, midichan, timeOffsetString);
+    }
+
+    // Handle midibend
+    if (midibend !== undefined) {
+      sendPitchBend(midibend, device, midichan, timeOffsetString);
+    }
+
+    // Handle miditouch
+    if (miditouch !== undefined) {
+      sendAftertouch(miditouch, device, midichan, timeOffsetString);
+    }
+
+    // Handle midicmd
    if (hap.whole.begin + 0 === 0) {
      // we need to start here because we have the timing info
      device.sendStart({ time: timeOffsetString });
@@ -282,6 +443,19 @@ Pattern.prototype.midi = function (output) {
      device.sendStop({ time: timeOffsetString });
    } else if (['continue'].includes(midicmd)) {
      device.sendContinue({ time: timeOffsetString });
+    } else if (Array.isArray(midicmd)) {
+      if (midicmd[0] === 'progNum') {
+        sendProgramChange(midicmd[1], device, midichan, timeOffsetString);
+      } else if (midicmd[0] === 'cc') {
+        if (midicmd.length === 2) {
+          sendCC(midicmd[0], midicmd[1] / 127, device, midichan, timeOffsetString);
+        }
+      } else if (midicmd[0] === 'sysex') {
+        if (midicmd.length === 3) {
+          const [_, id, data] = midicmd;
+          sendSysex(id, data, device, timeOffsetString);
+        }
+      }
    }
  });
 };
@@ -289,6 +463,14 @@ Pattern.prototype.midi = function (output) {
 let listeners = {};
 const refs = {};

+/**
+ * MIDI input: Opens a MIDI input port to receive MIDI control change messages.
+ * @param {string | number} input MIDI device name or index defaulting to 0
+ * @returns {Function}
+ * @example
+ * let cc = await midin('IAC Driver Bus 1')
+ * note("c a f e").lpf(cc(0).range(0, 1000)).lpq(cc(1).range(0, 10)).sound("sawtooth")
+ */
 export async function midin(input) {
  if (isPattern(input)) {
    throw new Error(
@@ -37,7 +37,7 @@ function connect() {
 export function parseControlsFromHap(hap, cps) {
  hap.ensureObjectValue();
  const cycle = hap.wholeOrPart().begin.valueOf();
-  const delta = hap.duration.valueOf();
+  const delta = hap.duration.valueOf() / cps;
  const controls = Object.assign({}, { cps, cycle, delta }, hap.value);
  // make sure n and note are numbers
  controls.n && (controls.n = parseNumeral(controls.n));
@@ -1,7 +1,7 @@
 #!/usr/bin/env node

 import cowsay from 'cowsay';
-import { createReadStream } from 'fs';
+import { createReadStream, existsSync } from 'fs';
 import { readdir } from 'fs/promises';
 import http from 'http';
 import { join, sep } from 'path';
@@ -70,12 +70,15 @@ const server = http.createServer(async (req, res) => {
    return res.end(JSON.stringify(banks));
  }
  let subpath = decodeURIComponent(req.url);
-  if (!files.includes(subpath)) {
+  const filePath = join(directory, subpath.split('/').join(sep));
+
+  //console.log('GET:', filePath);
+  const isFound = existsSync(filePath);
+  if (!isFound) {
    res.statusCode = 404;
    res.end('File not found');
    return;
  }
-  const filePath = join(directory, subpath.split('/').join(sep));
  const readStream = createReadStream(filePath);
  readStream.on('error', (err) => {
    res.statusCode = 500;
@@ -99,12 +102,6 @@ Object.keys(networkInterfaces).forEach((key) => {
  });
 });

-if (!IP) {
-  console.error("Unable to determine server's IP address.");
-  // eslint-disable-next-line
-  process.exit(1);
-}
-
 server.listen(PORT, IP_ADDRESS, () => {
  console.log(`@strudel/sampler is now serving audio files from:
 ${directory}
@@ -113,6 +110,6 @@ To use them in the Strudel REPL, run:
 samples('http://localhost:${PORT}')

 Or on a machine in the same network:
- samples('http://${IP}:${PORT}')
+ ${IP ? `samples('http://${IP}:${PORT}')` : `Unable to determine server's IP address.`}
 `);
 });
@@ -9,6 +9,13 @@ import {
 } from '@strudel/webaudio';
 import gm from './gm.mjs';

+let defaultSoundfontUrl = 'https://felixroos.github.io/webaudiofontdata/sound';
+let soundfontUrl = defaultSoundfontUrl;
+
+export function setSoundfontUrl(value) {
+  soundfontUrl = value;
+}
+
 let loadCache = {};
 async function loadFont(name) {
  if (loadCache[name]) {
@@ -16,7 +23,7 @@ async function loadFont(name) {
  }
  const load = async () => {
    // TODO: make soundfont source configurable
-    const url = `https://felixroos.github.io/webaudiofontdata/sound/${name}.js`;
+    const url = `${soundfontUrl}/${name}.js`;
    const preset = await fetch(url).then((res) => res.text());
    let [_, data] = preset.split('={');
    return eval('{' + data);
@@ -1,6 +1,6 @@
-import { getFontBufferSource, registerSoundfonts } from './fontloader.mjs';
+import { getFontBufferSource, registerSoundfonts, setSoundfontUrl } from './fontloader.mjs';
 import * as soundfontList from './list.mjs';
 import { startPresetNote } from 'sfumato';
 import { loadSoundfont } from './sfumato.mjs';

-export { loadSoundfont, startPresetNote, getFontBufferSource, soundfontList, registerSoundfonts };
+export { loadSoundfont, startPresetNote, getFontBufferSource, soundfontList, registerSoundfonts, setSoundfontUrl };
@@ -212,6 +212,7 @@ export function webAudioTimeout(audioContext, onComplete, startTime, stopTime) {
  constantNode.onended = () => {
    onComplete();
  };
+  return constantNode;
 }
 const mod = (freq, range = 1, type = 'sine') => {
  const ctx = getAudioContext();
@@ -344,7 +344,9 @@ export async function onTriggerSample(t, value, onended, bank, resolveUrl) {
  };
  let envEnd = holdEnd + release + 0.01;
  bufferSource.stop(envEnd);
-  const stop = (endTime, playWholeBuffer) => {};
+  const stop = (endTime) => {
+    bufferSource.stop(endTime);
+  };
  const handle = { node: out, bufferSource, stop };

  // cut groups
@@ -14,10 +14,29 @@ import { map } from 'nanostores';
 import { logger } from './logger.mjs';
 import { loadBuffer } from './sampler.mjs';

+export const DEFAULT_MAX_POLYPHONY = 128;
+const DEFAULT_AUDIO_DEVICE_NAME = 'System Standard';
+
+let maxPolyphony = DEFAULT_MAX_POLYPHONY;
+
+export function setMaxPolyphony(polyphony) {
+  maxPolyphony = parseInt(polyphony) ?? DEFAULT_MAX_POLYPHONY;
+}
 export const soundMap = map();

 export function registerSound(key, onTrigger, data = {}) {
-  soundMap.setKey(key.toLowerCase(), { onTrigger, data });
+  key = key.toLowerCase().replace(/\s+/g, '_');
+  soundMap.setKey(key, { onTrigger, data });
+}
+
+let gainCurveFunc = (val) => val;
+
+export function applyGainCurve(val) {
+  return gainCurveFunc(val);
+}
+
+export function setGainCurve(newGainCurveFunc) {
+  gainCurveFunc = newGainCurveFunc;
 }

 function aliasBankMap(aliasMap) {
@@ -85,6 +104,18 @@ export function getSound(s) {
  return soundMap.get()[s.toLowerCase()];
 }

+export const getAudioDevices = async () => {
+  await navigator.mediaDevices.getUserMedia({ audio: true });
+  let mediaDevices = await navigator.mediaDevices.enumerateDevices();
+  mediaDevices = mediaDevices.filter((device) => device.kind === 'audiooutput' && device.deviceId !== 'default');
+  const devicesMap = new Map();
+  devicesMap.set(DEFAULT_AUDIO_DEVICE_NAME, '');
+  mediaDevices.forEach((device) => {
+    devicesMap.set(device.label, device.deviceId);
+  });
+  return devicesMap;
+};
+
 const defaultDefaultValues = {
  s: 'triangle',
  gain: 0.8,
@@ -155,18 +186,40 @@ export function getAudioContextCurrentTime() {
 let workletsLoading;
 function loadWorklets() {
  if (!workletsLoading) {
-    workletsLoading = getAudioContext().audioWorklet.addModule(workletsUrl);
+    const audioCtx = getAudioContext();
+    workletsLoading = audioCtx.audioWorklet.addModule(workletsUrl);
  }
+
  return workletsLoading;
 }

 // this function should be called on first user interaction (to avoid console warning)
 export async function initAudio(options = {}) {
-  const { disableWorklets = false } = options;
+  const { disableWorklets = false, maxPolyphony, audioDeviceName = DEFAULT_AUDIO_DEVICE_NAME } = options;
+  setMaxPolyphony(maxPolyphony);
  if (typeof window === 'undefined') {
    return;
  }
-  await getAudioContext().resume();
+
+  const audioCtx = getAudioContext();
+
+  if (audioDeviceName != null && audioDeviceName != DEFAULT_AUDIO_DEVICE_NAME) {
+    try {
+      const devices = await getAudioDevices();
+      const id = devices.get(audioDeviceName);
+      const isValidID = (id ?? '').length > 0;
+      if (audioCtx.sinkId !== id && isValidID) {
+        await audioCtx.setSinkId(id);
+      }
+      logger(
+        `[superdough] Audio Device set to ${audioDeviceName}, it might take a few seconds before audio plays on all output channels`,
+      );
+    } catch {
+      logger('[superdough] failed to set audio interface', 'warning');
+    }
+  }
+
+  await audioCtx.resume();
  if (disableWorklets) {
    logger('[superdough]: AudioWorklets disabled with disableWorklets');
    return;
@@ -374,6 +427,8 @@ export function resetGlobalEffects() {
  analysersData = {};
 }

+let activeSoundSources = new Map();
+
 export const superdough = async (value, t, hapDuration) => {
  const ac = getAudioContext();
  t = typeof t === 'string' && t.startsWith('=') ? Number(t.slice(1)) : ac.currentTime + t;
@@ -471,16 +526,32 @@ export const superdough = async (value, t, hapDuration) => {
    compressorRelease,
  } = value;

-  gain = nanFallback(gain, 1);
+  gain = applyGainCurve(nanFallback(gain, 1));
+  postgain = applyGainCurve(postgain);
+  shapevol = applyGainCurve(shapevol);
+  distortvol = applyGainCurve(distortvol);
+  delay = applyGainCurve(delay);
+  velocity = applyGainCurve(velocity);
+  gain *= velocity; // velocity currently only multiplies with gain. it might do other things in the future
+
+  const chainID = Math.round(Math.random() * 1000000);
+
+  // oldest audio nodes will be destroyed if maximum polyphony is exceeded
+  for (let i = 0; i <= activeSoundSources.size - maxPolyphony; i++) {
+    const ch = activeSoundSources.entries().next();
+    const source = ch.value[1];
+    const chainID = ch.value[0];
+    const endTime = t + 0.25;
+    source?.node?.gain?.linearRampToValueAtTime(0, endTime);
+    source?.stop?.(endTime);
+    activeSoundSources.delete(chainID);
+  }

  //music programs/audio gear usually increments inputs/outputs from 1, so imitate that behavior
  channels = (Array.isArray(channels) ? channels : [channels]).map((ch) => ch - 1);

-  gain *= velocity; // velocity currently only multiplies with gain. it might do other things in the future
-  let toDisconnect = []; // audio nodes that will be disconnected when the source has ended
-  const onended = () => {
-    toDisconnect.forEach((n) => n?.disconnect());
-  };
+  let audioNodes = [];
+
  if (['-', '~'].includes(s)) {
    return;
  }
@@ -495,10 +566,15 @@ export const superdough = async (value, t, hapDuration) => {
    sourceNode = source(t, value, hapDuration);
  } else if (getSound(s)) {
    const { onTrigger } = getSound(s);
-    const soundHandle = await onTrigger(t, value, onended);
+    const onEnded = () => {
+      audioNodes.forEach((n) => n?.disconnect());
+      activeSoundSources.delete(chainID);
+    };
+    const soundHandle = await onTrigger(t, value, onEnded);
+
    if (soundHandle) {
      sourceNode = soundHandle.node;
-      soundHandle.stop(t + hapDuration);
+      activeSoundSources.set(chainID, soundHandle);
    }
  } else {
    throw new Error(`sound ${s} not found! Is it loaded?`);
@@ -628,6 +704,7 @@ export const superdough = async (value, t, hapDuration) => {
  if (delay > 0 && delaytime > 0 && delayfeedback > 0) {
    const delyNode = getDelay(orbit, delaytime, delayfeedback, t);
    delaySend = effectSend(post, delyNode, delay);
+    audioNodes.push(delaySend);
  }
  // reverb
  let reverbSend;
@@ -645,6 +722,7 @@ export const superdough = async (value, t, hapDuration) => {
    }
    const reverbNode = getReverb(orbit, roomsize, roomfade, roomlp, roomdim, roomIR);
    reverbSend = effectSend(post, reverbNode, room);
+    audioNodes.push(reverbSend);
  }

  // analyser
@@ -652,14 +730,12 @@ export const superdough = async (value, t, hapDuration) => {
  if (analyze) {
    const analyserNode = getAnalyserById(analyze, 2 ** (fft + 5));
    analyserSend = effectSend(post, analyserNode, 1);
+    audioNodes.push(analyserSend);
  }

  // connect chain elements together
  chain.slice(1).reduce((last, current) => last.connect(current), chain[0]);
-
-  // toDisconnect = all the node that should be disconnected in onended callback
-  // this is crucial for performance
-  toDisconnect = chain.concat([delaySend, reverbSend, analyserSend]);
+  audioNodes = audioNodes.concat(chain);
 };

 export const superdoughTrigger = (t, hap, ct, cps) => {
@@ -25,6 +25,10 @@ const getFrequencyFromValue = (value) => {

  return Number(freq);
 };
+function destroyAudioWorkletNode(node) {
+  node.disconnect();
+  node.parameters.get('end')?.setValueAtTime(0, 0);
+}

 const waveforms = ['triangle', 'square', 'sawtooth', 'sine'];
 const waveformAliases = [
@@ -69,7 +73,9 @@ export function registerSynthSounds() {
        stop(envEnd);
        return {
          node,
-          stop: (releaseTime) => {},
+          stop: (endTime) => {
+            stop(endTime);
+          },
        };
      },
      { type: 'synth', prebake: true },
@@ -116,10 +122,12 @@ export function registerSynthSounds() {
      let envGain = gainNode(1);
      envGain = o.connect(envGain);

-      webAudioTimeout(
+      getParamADSR(envGain.gain, attack, decay, sustain, release, 0, 0.3 * gainAdjustment, begin, holdend, 'linear');
+
+      let timeoutNode = webAudioTimeout(
        ac,
        () => {
-          o.disconnect();
+          destroyAudioWorkletNode(o);
          envGain.disconnect();
          onended();
          fm?.stop();
@@ -129,11 +137,11 @@ export function registerSynthSounds() {
        end,
      );

-      getParamADSR(envGain.gain, attack, decay, sustain, release, 0, 0.3 * gainAdjustment, begin, holdend, 'linear');
-
      return {
        node: envGain,
-        stop: (time) => {},
+        stop: (time) => {
+          timeoutNode.stop(time);
+        },
      };
    },
    { prebake: true, type: 'synth' },
@@ -175,10 +183,12 @@ export function registerSynthSounds() {
      let envGain = gainNode(1);
      envGain = o.connect(envGain);

-      webAudioTimeout(
+      getParamADSR(envGain.gain, attack, decay, sustain, release, 0, 1, begin, holdend, 'linear');
+
+      let timeoutNode = webAudioTimeout(
        ac,
        () => {
-          o.disconnect();
+          destroyAudioWorkletNode(o);
          envGain.disconnect();
          onended();
          fm?.stop();
@@ -188,11 +198,11 @@ export function registerSynthSounds() {
        end,
      );

-      getParamADSR(envGain.gain, attack, decay, sustain, release, 0, 1, begin, holdend, 'linear');
-
      return {
        node: envGain,
-        stop: (time) => {},
+        stop: (time) => {
+          timeoutNode.stop(time);
+        },
      };
    },
    { prebake: true, type: 'synth' },
@@ -235,7 +245,9 @@ export function registerSynthSounds() {
        stop(envEnd);
        return {
          node,
-          stop: (releaseTime) => {},
+          stop: (endTime) => {
+            stop(endTime);
+          },
        };
      },
      { type: 'synth', prebake: true },
@@ -710,6 +710,9 @@ class PulseOscillatorProcessor extends AudioWorkletProcessor {
  }

  process(inputs, outputs, params) {
+    if (this.disconnected) {
+      return false;
+    }
    if (currentTime <= params.begin[0]) {
      return true;
    }
@@ -933,6 +933,39 @@ exports[`runs examples > example "as" example index 0 1`] = `
 ]
 `;

+exports[`runs examples > example "as" example index 1 1`] = `
+[
+  "[ 0/1 → 1/4 | begin:0 s:sax_vib clip:1 ]",
+  "[ 1/4 → 3/8 | begin:0.25 s:sax_vib clip:1 ]",
+  "[ 3/8 → 1/2 | begin:0 s:sax_vib clip:1 ]",
+  "[ 1/2 → 5/8 | begin:0.5 s:sax_vib clip:1 ]",
+  "[ 5/8 → 3/4 | begin:0.3 s:sax_vib clip:1 ]",
+  "[ 3/4 → 7/8 | begin:0.5 s:sax_vib clip:1 ]",
+  "[ (7/8 → 1/1) ⇝ 9/8 | begin:0 s:sax_vib clip:1 ]",
+  "[ 7/8 ⇜ (1/1 → 9/8) | begin:0 s:sax_vib clip:1 ]",
+  "[ 9/8 → 5/4 | begin:0.25 s:sax_vib clip:1 ]",
+  "[ 5/4 → 11/8 | begin:0 s:sax_vib clip:1 ]",
+  "[ 11/8 → 3/2 | begin:0.5 s:sax_vib clip:1 ]",
+  "[ 3/2 → 13/8 | begin:0.3 s:sax_vib clip:1 ]",
+  "[ 13/8 → 7/4 | begin:0.5 s:sax_vib clip:1 ]",
+  "[ 7/4 → 2/1 | begin:0 s:sax_vib clip:1 ]",
+  "[ 2/1 → 17/8 | begin:0.25 s:sax_vib clip:1 ]",
+  "[ 17/8 → 9/4 | begin:0 s:sax_vib clip:1 ]",
+  "[ 9/4 → 19/8 | begin:0.5 s:sax_vib clip:1 ]",
+  "[ 19/8 → 5/2 | begin:0.3 s:sax_vib clip:1 ]",
+  "[ 5/2 → 21/8 | begin:0.5 s:sax_vib clip:1 ]",
+  "[ 21/8 → 23/8 | begin:0 s:sax_vib clip:1 ]",
+  "[ 23/8 → 3/1 | begin:0.25 s:sax_vib clip:1 ]",
+  "[ 3/1 → 25/8 | begin:0 s:sax_vib clip:1 ]",
+  "[ 25/8 → 13/4 | begin:0.5 s:sax_vib clip:1 ]",
+  "[ 13/4 → 27/8 | begin:0.3 s:sax_vib clip:1 ]",
+  "[ 27/8 → 7/2 | begin:0.5 s:sax_vib clip:1 ]",
+  "[ 7/2 → 15/4 | begin:0 s:sax_vib clip:1 ]",
+  "[ 15/4 → 31/8 | begin:0.25 s:sax_vib clip:1 ]",
+  "[ 31/8 → 4/1 | begin:0 s:sax_vib clip:1 ]",
+]
+`;
+
 exports[`runs examples > example "attack" example index 0 1`] = `
 [
  "[ 0/1 → 1/4 | note:c3 attack:0 ]",
@@ -2289,6 +2322,39 @@ exports[`runs examples > example "degradeBy" example index 1 1`] = `
 ]
 `;

+exports[`runs examples > example "degradeBy" example index 2 1`] = `
+[
+  "[ 1/8 → 3/16 | s:bd ]",
+  "[ 1/4 → 5/16 | s:bd ]",
+  "[ 5/16 → 3/8 | s:bd ]",
+  "[ 1/2 → 9/16 | s:bd ]",
+  "[ 9/16 → 5/8 | s:bd ]",
+  "[ 11/16 → 3/4 | s:bd ]",
+  "[ 15/16 → 1/1 | s:bd ]",
+  "[ 9/8 → 19/16 | s:bd ]",
+  "[ 5/4 → 21/16 | s:bd ]",
+  "[ 21/16 → 11/8 | s:bd ]",
+  "[ 3/2 → 25/16 | s:bd ]",
+  "[ 25/16 → 13/8 | s:bd ]",
+  "[ 27/16 → 7/4 | s:bd ]",
+  "[ 31/16 → 2/1 | s:bd ]",
+  "[ 17/8 → 35/16 | s:bd ]",
+  "[ 9/4 → 37/16 | s:bd ]",
+  "[ 37/16 → 19/8 | s:bd ]",
+  "[ 5/2 → 41/16 | s:bd ]",
+  "[ 41/16 → 21/8 | s:bd ]",
+  "[ 43/16 → 11/4 | s:bd ]",
+  "[ 47/16 → 3/1 | s:bd ]",
+  "[ 25/8 → 51/16 | s:bd ]",
+  "[ 13/4 → 53/16 | s:bd ]",
+  "[ 53/16 → 27/8 | s:bd ]",
+  "[ 7/2 → 57/16 | s:bd ]",
+  "[ 57/16 → 29/8 | s:bd ]",
+  "[ 59/16 → 15/4 | s:bd ]",
+  "[ 63/16 → 4/1 | s:bd ]",
+]
+`;
+
 exports[`runs examples > example "delay" example index 0 1`] = `
 [
  "[ 0/1 → 1/2 | s:bd delay:0 ]",
@@ -5206,6 +5272,292 @@ exports[`runs examples > example "mask" example index 0 1`] = `
 ]
 `;

+exports[`runs examples > example "midi" example index 0 1`] = `
+[
+  "[ 0/1 → 1/1 | note:c4 midichan:1 ]",
+  "[ 1/1 → 2/1 | note:c4 midichan:1 ]",
+  "[ 2/1 → 3/1 | note:c4 midichan:1 ]",
+  "[ 3/1 → 4/1 | note:c4 midichan:1 ]",
+]
+`;
+
+exports[`runs examples > example "midi" example index 1 1`] = `
+[
+  "[ 0/1 → 1/1 | note:c4 midichan:1 ]",
+  "[ 1/1 → 2/1 | note:c4 midichan:1 ]",
+  "[ 2/1 → 3/1 | note:c4 midichan:1 ]",
+  "[ 3/1 → 4/1 | note:c4 midichan:1 ]",
+]
+`;
+
+exports[`runs examples > example "midibend" example index 0 1`] = `
+[
+  "[ 0/1 → 1/1 | note:c4 midibend:0 ]",
+  "[ 1/1 → 2/1 | note:c4 midibend:0.4 ]",
+  "[ 2/1 → 3/1 | note:c4 midibend:1.1102230246251565e-16 ]",
+  "[ 3/1 → 4/1 | note:c4 midibend:-0.4 ]",
+]
+`;
+
+exports[`runs examples > example "midichan" example index 0 1`] = `
+[
+  "[ 0/1 → 1/1 | note:c4 midichan:1 ]",
+  "[ 1/1 → 2/1 | note:c4 midichan:1 ]",
+  "[ 2/1 → 3/1 | note:c4 midichan:1 ]",
+  "[ 3/1 → 4/1 | note:c4 midichan:1 ]",
+]
+`;
+
+exports[`runs examples > example "midicmd" example index 0 1`] = `
+[
+  "[ 0/1 → 1/48 | midicmd:clock ]",
+  "[ 0/1 → 2/1 | midicmd:start ]",
+  "[ 1/48 → 1/24 | midicmd:clock ]",
+  "[ 1/24 → 1/16 | midicmd:clock ]",
+  "[ 1/16 → 1/12 | midicmd:clock ]",
+  "[ 1/12 → 5/48 | midicmd:clock ]",
+  "[ 5/48 → 1/8 | midicmd:clock ]",
+  "[ 1/8 → 7/48 | midicmd:clock ]",
+  "[ 7/48 → 1/6 | midicmd:clock ]",
+  "[ 1/6 → 3/16 | midicmd:clock ]",
+  "[ 3/16 → 5/24 | midicmd:clock ]",
+  "[ 5/24 → 11/48 | midicmd:clock ]",
+  "[ 11/48 → 1/4 | midicmd:clock ]",
+  "[ 1/4 → 13/48 | midicmd:clock ]",
+  "[ 13/48 → 7/24 | midicmd:clock ]",
+  "[ 7/24 → 5/16 | midicmd:clock ]",
+  "[ 5/16 → 1/3 | midicmd:clock ]",
+  "[ 1/3 → 17/48 | midicmd:clock ]",
+  "[ 17/48 → 3/8 | midicmd:clock ]",
+  "[ 3/8 → 19/48 | midicmd:clock ]",
+  "[ 19/48 → 5/12 | midicmd:clock ]",
+  "[ 5/12 → 7/16 | midicmd:clock ]",
+  "[ 7/16 → 11/24 | midicmd:clock ]",
+  "[ 11/24 → 23/48 | midicmd:clock ]",
+  "[ 23/48 → 1/2 | midicmd:clock ]",
+  "[ 1/2 → 25/48 | midicmd:clock ]",
+  "[ 25/48 → 13/24 | midicmd:clock ]",
+  "[ 13/24 → 9/16 | midicmd:clock ]",
+  "[ 9/16 → 7/12 | midicmd:clock ]",
+  "[ 7/12 → 29/48 | midicmd:clock ]",
+  "[ 29/48 → 5/8 | midicmd:clock ]",
+  "[ 5/8 → 31/48 | midicmd:clock ]",
+  "[ 31/48 → 2/3 | midicmd:clock ]",
+  "[ 2/3 → 11/16 | midicmd:clock ]",
+  "[ 11/16 → 17/24 | midicmd:clock ]",
+  "[ 17/24 → 35/48 | midicmd:clock ]",
+  "[ 35/48 → 3/4 | midicmd:clock ]",
+  "[ 3/4 → 37/48 | midicmd:clock ]",
+  "[ 37/48 → 19/24 | midicmd:clock ]",
+  "[ 19/24 → 13/16 | midicmd:clock ]",
+  "[ 13/16 → 5/6 | midicmd:clock ]",
+  "[ 5/6 → 41/48 | midicmd:clock ]",
+  "[ 41/48 → 7/8 | midicmd:clock ]",
+  "[ 7/8 → 43/48 | midicmd:clock ]",
+  "[ 43/48 → 11/12 | midicmd:clock ]",
+  "[ 11/12 → 15/16 | midicmd:clock ]",
+  "[ 15/16 → 23/24 | midicmd:clock ]",
+  "[ 23/24 → 47/48 | midicmd:clock ]",
+  "[ 47/48 → 1/1 | midicmd:clock ]",
+  "[ 1/1 → 49/48 | midicmd:clock ]",
+  "[ 49/48 → 25/24 | midicmd:clock ]",
+  "[ 25/24 → 17/16 | midicmd:clock ]",
+  "[ 17/16 → 13/12 | midicmd:clock ]",
+  "[ 13/12 → 53/48 | midicmd:clock ]",
+  "[ 53/48 → 9/8 | midicmd:clock ]",
+  "[ 9/8 → 55/48 | midicmd:clock ]",
+  "[ 55/48 → 7/6 | midicmd:clock ]",
+  "[ 7/6 → 19/16 | midicmd:clock ]",
+  "[ 19/16 → 29/24 | midicmd:clock ]",
+  "[ 29/24 → 59/48 | midicmd:clock ]",
+  "[ 59/48 → 5/4 | midicmd:clock ]",
+  "[ 5/4 → 61/48 | midicmd:clock ]",
+  "[ 61/48 → 31/24 | midicmd:clock ]",
+  "[ 31/24 → 21/16 | midicmd:clock ]",
+  "[ 21/16 → 4/3 | midicmd:clock ]",
+  "[ 4/3 → 65/48 | midicmd:clock ]",
+  "[ 65/48 → 11/8 | midicmd:clock ]",
+  "[ 11/8 → 67/48 | midicmd:clock ]",
+  "[ 67/48 → 17/12 | midicmd:clock ]",
+  "[ 17/12 → 23/16 | midicmd:clock ]",
+  "[ 23/16 → 35/24 | midicmd:clock ]",
+  "[ 35/24 → 71/48 | midicmd:clock ]",
+  "[ 71/48 → 3/2 | midicmd:clock ]",
+  "[ 3/2 → 73/48 | midicmd:clock ]",
+  "[ 73/48 → 37/24 | midicmd:clock ]",
+  "[ 37/24 → 25/16 | midicmd:clock ]",
+  "[ 25/16 → 19/12 | midicmd:clock ]",
+  "[ 19/12 → 77/48 | midicmd:clock ]",
+  "[ 77/48 → 13/8 | midicmd:clock ]",
+  "[ 13/8 → 79/48 | midicmd:clock ]",
+  "[ 79/48 → 5/3 | midicmd:clock ]",
+  "[ 5/3 → 27/16 | midicmd:clock ]",
+  "[ 27/16 → 41/24 | midicmd:clock ]",
+  "[ 41/24 → 83/48 | midicmd:clock ]",
+  "[ 83/48 → 7/4 | midicmd:clock ]",
+  "[ 7/4 → 85/48 | midicmd:clock ]",
+  "[ 85/48 → 43/24 | midicmd:clock ]",
+  "[ 43/24 → 29/16 | midicmd:clock ]",
+  "[ 29/16 → 11/6 | midicmd:clock ]",
+  "[ 11/6 → 89/48 | midicmd:clock ]",
+  "[ 89/48 → 15/8 | midicmd:clock ]",
+  "[ 15/8 → 91/48 | midicmd:clock ]",
+  "[ 91/48 → 23/12 | midicmd:clock ]",
+  "[ 23/12 → 31/16 | midicmd:clock ]",
+  "[ 31/16 → 47/24 | midicmd:clock ]",
+  "[ 47/24 → 95/48 | midicmd:clock ]",
+  "[ 95/48 → 2/1 | midicmd:clock ]",
+  "[ 2/1 → 97/48 | midicmd:clock ]",
+  "[ 2/1 → 4/1 | midicmd:stop ]",
+  "[ 97/48 → 49/24 | midicmd:clock ]",
+  "[ 49/24 → 33/16 | midicmd:clock ]",
+  "[ 33/16 → 25/12 | midicmd:clock ]",
+  "[ 25/12 → 101/48 | midicmd:clock ]",
+  "[ 101/48 → 17/8 | midicmd:clock ]",
+  "[ 17/8 → 103/48 | midicmd:clock ]",
+  "[ 103/48 → 13/6 | midicmd:clock ]",
+  "[ 13/6 → 35/16 | midicmd:clock ]",
+  "[ 35/16 → 53/24 | midicmd:clock ]",
+  "[ 53/24 → 107/48 | midicmd:clock ]",
+  "[ 107/48 → 9/4 | midicmd:clock ]",
+  "[ 9/4 → 109/48 | midicmd:clock ]",
+  "[ 109/48 → 55/24 | midicmd:clock ]",
+  "[ 55/24 → 37/16 | midicmd:clock ]",
+  "[ 37/16 → 7/3 | midicmd:clock ]",
+  "[ 7/3 → 113/48 | midicmd:clock ]",
+  "[ 113/48 → 19/8 | midicmd:clock ]",
+  "[ 19/8 → 115/48 | midicmd:clock ]",
+  "[ 115/48 → 29/12 | midicmd:clock ]",
+  "[ 29/12 → 39/16 | midicmd:clock ]",
+  "[ 39/16 → 59/24 | midicmd:clock ]",
+  "[ 59/24 → 119/48 | midicmd:clock ]",
+  "[ 119/48 → 5/2 | midicmd:clock ]",
+  "[ 5/2 → 121/48 | midicmd:clock ]",
+  "[ 121/48 → 61/24 | midicmd:clock ]",
+  "[ 61/24 → 41/16 | midicmd:clock ]",
+  "[ 41/16 → 31/12 | midicmd:clock ]",
+  "[ 31/12 → 125/48 | midicmd:clock ]",
+  "[ 125/48 → 21/8 | midicmd:clock ]",
+  "[ 21/8 → 127/48 | midicmd:clock ]",
+  "[ 127/48 → 8/3 | midicmd:clock ]",
+  "[ 8/3 → 43/16 | midicmd:clock ]",
+  "[ 43/16 → 65/24 | midicmd:clock ]",
+  "[ 65/24 → 131/48 | midicmd:clock ]",
+  "[ 131/48 → 11/4 | midicmd:clock ]",
+  "[ 11/4 → 133/48 | midicmd:clock ]",
+  "[ 133/48 → 67/24 | midicmd:clock ]",
+  "[ 67/24 → 45/16 | midicmd:clock ]",
+  "[ 45/16 → 17/6 | midicmd:clock ]",
+  "[ 17/6 → 137/48 | midicmd:clock ]",
+  "[ 137/48 → 23/8 | midicmd:clock ]",
+  "[ 23/8 → 139/48 | midicmd:clock ]",
+  "[ 139/48 → 35/12 | midicmd:clock ]",
+  "[ 35/12 → 47/16 | midicmd:clock ]",
+  "[ 47/16 → 71/24 | midicmd:clock ]",
+  "[ 71/24 → 143/48 | midicmd:clock ]",
+  "[ 143/48 → 3/1 | midicmd:clock ]",
+  "[ 3/1 → 145/48 | midicmd:clock ]",
+  "[ 145/48 → 73/24 | midicmd:clock ]",
+  "[ 73/24 → 49/16 | midicmd:clock ]",
+  "[ 49/16 → 37/12 | midicmd:clock ]",
+  "[ 37/12 → 149/48 | midicmd:clock ]",
+  "[ 149/48 → 25/8 | midicmd:clock ]",
+  "[ 25/8 → 151/48 | midicmd:clock ]",
+  "[ 151/48 → 19/6 | midicmd:clock ]",
+  "[ 19/6 → 51/16 | midicmd:clock ]",
+  "[ 51/16 → 77/24 | midicmd:clock ]",
+  "[ 77/24 → 155/48 | midicmd:clock ]",
+  "[ 155/48 → 13/4 | midicmd:clock ]",
+  "[ 13/4 → 157/48 | midicmd:clock ]",
+  "[ 157/48 → 79/24 | midicmd:clock ]",
+  "[ 79/24 → 53/16 | midicmd:clock ]",
+  "[ 53/16 → 10/3 | midicmd:clock ]",
+  "[ 10/3 → 161/48 | midicmd:clock ]",
+  "[ 161/48 → 27/8 | midicmd:clock ]",
+  "[ 27/8 → 163/48 | midicmd:clock ]",
+  "[ 163/48 → 41/12 | midicmd:clock ]",
+  "[ 41/12 → 55/16 | midicmd:clock ]",
+  "[ 55/16 → 83/24 | midicmd:clock ]",
+  "[ 83/24 → 167/48 | midicmd:clock ]",
+  "[ 167/48 → 7/2 | midicmd:clock ]",
+  "[ 7/2 → 169/48 | midicmd:clock ]",
+  "[ 169/48 → 85/24 | midicmd:clock ]",
+  "[ 85/24 → 57/16 | midicmd:clock ]",
+  "[ 57/16 → 43/12 | midicmd:clock ]",
+  "[ 43/12 → 173/48 | midicmd:clock ]",
+  "[ 173/48 → 29/8 | midicmd:clock ]",
+  "[ 29/8 → 175/48 | midicmd:clock ]",
+  "[ 175/48 → 11/3 | midicmd:clock ]",
+  "[ 11/3 → 59/16 | midicmd:clock ]",
+  "[ 59/16 → 89/24 | midicmd:clock ]",
+  "[ 89/24 → 179/48 | midicmd:clock ]",
+  "[ 179/48 → 15/4 | midicmd:clock ]",
+  "[ 15/4 → 181/48 | midicmd:clock ]",
+  "[ 181/48 → 91/24 | midicmd:clock ]",
+  "[ 91/24 → 61/16 | midicmd:clock ]",
+  "[ 61/16 → 23/6 | midicmd:clock ]",
+  "[ 23/6 → 185/48 | midicmd:clock ]",
+  "[ 185/48 → 31/8 | midicmd:clock ]",
+  "[ 31/8 → 187/48 | midicmd:clock ]",
+  "[ 187/48 → 47/12 | midicmd:clock ]",
+  "[ 47/12 → 63/16 | midicmd:clock ]",
+  "[ 63/16 → 95/24 | midicmd:clock ]",
+  "[ 95/24 → 191/48 | midicmd:clock ]",
+  "[ 191/48 → 4/1 | midicmd:clock ]",
+]
+`;
+
+exports[`runs examples > example "midin" example index 0 1`] = `
+[
+  "[ 0/1 → 1/4 | note:c cutoff:0 resonance:0 s:sawtooth ]",
+  "[ 1/4 → 1/2 | note:a cutoff:0 resonance:0 s:sawtooth ]",
+  "[ 1/2 → 3/4 | note:f cutoff:0 resonance:0 s:sawtooth ]",
+  "[ 3/4 → 1/1 | note:e cutoff:0 resonance:0 s:sawtooth ]",
+  "[ 1/1 → 5/4 | note:c cutoff:0 resonance:0 s:sawtooth ]",
+  "[ 5/4 → 3/2 | note:a cutoff:0 resonance:0 s:sawtooth ]",
+  "[ 3/2 → 7/4 | note:f cutoff:0 resonance:0 s:sawtooth ]",
+  "[ 7/4 → 2/1 | note:e cutoff:0 resonance:0 s:sawtooth ]",
+  "[ 2/1 → 9/4 | note:c cutoff:0 resonance:0 s:sawtooth ]",
+  "[ 9/4 → 5/2 | note:a cutoff:0 resonance:0 s:sawtooth ]",
+  "[ 5/2 → 11/4 | note:f cutoff:0 resonance:0 s:sawtooth ]",
+  "[ 11/4 → 3/1 | note:e cutoff:0 resonance:0 s:sawtooth ]",
+  "[ 3/1 → 13/4 | note:c cutoff:0 resonance:0 s:sawtooth ]",
+  "[ 13/4 → 7/2 | note:a cutoff:0 resonance:0 s:sawtooth ]",
+  "[ 7/2 → 15/4 | note:f cutoff:0 resonance:0 s:sawtooth ]",
+  "[ 15/4 → 4/1 | note:e cutoff:0 resonance:0 s:sawtooth ]",
+]
+`;
+
+exports[`runs examples > example "midiport" example index 0 1`] = `
+[
+  "[ 0/1 → 1/4 | note:c midiport:0 ]",
+  "[ 1/4 → 1/2 | note:a midiport:0 ]",
+  "[ 1/2 → 3/4 | note:f midiport:0 ]",
+  "[ 3/4 → 1/1 | note:e midiport:0 ]",
+  "[ 1/1 → 5/4 | note:c midiport:1 ]",
+  "[ 5/4 → 3/2 | note:a midiport:1 ]",
+  "[ 3/2 → 7/4 | note:f midiport:1 ]",
+  "[ 7/4 → 2/1 | note:e midiport:1 ]",
+  "[ 2/1 → 9/4 | note:c midiport:2 ]",
+  "[ 9/4 → 5/2 | note:a midiport:2 ]",
+  "[ 5/2 → 11/4 | note:f midiport:2 ]",
+  "[ 11/4 → 3/1 | note:e midiport:2 ]",
+  "[ 3/1 → 13/4 | note:c midiport:3 ]",
+  "[ 13/4 → 7/2 | note:a midiport:3 ]",
+  "[ 7/2 → 15/4 | note:f midiport:3 ]",
+  "[ 15/4 → 4/1 | note:e midiport:3 ]",
+]
+`;
+
+exports[`runs examples > example "miditouch" example index 0 1`] = `
+[
+  "[ 0/1 → 1/1 | note:c4 miditouch:0.5 ]",
+  "[ 1/1 → 2/1 | note:c4 miditouch:1 ]",
+  "[ 2/1 → 3/1 | note:c4 miditouch:0.5000000000000001 ]",
+  "[ 3/1 → 4/1 | note:c4 miditouch:0 ]",
+]
+`;
+
 exports[`runs examples > example "mousex" example index 0 1`] = `
 [
  "[ 0/1 → 1/4 | note:C3 ]",
@@ -5426,6 +5778,24 @@ exports[`runs examples > example "note" example index 2 1`] = `
 ]
 `;

+exports[`runs examples > example "nrpnn" example index 0 1`] = `
+[
+  "[ 0/1 → 1/1 | note:c4 nrpnn:[1 8] nrpv:123 midichan:1 ]",
+  "[ 1/1 → 2/1 | note:c4 nrpnn:[1 8] nrpv:123 midichan:1 ]",
+  "[ 2/1 → 3/1 | note:c4 nrpnn:[1 8] nrpv:123 midichan:1 ]",
+  "[ 3/1 → 4/1 | note:c4 nrpnn:[1 8] nrpv:123 midichan:1 ]",
+]
+`;
+
+exports[`runs examples > example "nrpv" example index 0 1`] = `
+[
+  "[ 0/1 → 1/1 | note:c4 nrpnn:[1 8] nrpv:123 midichan:1 ]",
+  "[ 1/1 → 2/1 | note:c4 nrpnn:[1 8] nrpv:123 midichan:1 ]",
+  "[ 2/1 → 3/1 | note:c4 nrpnn:[1 8] nrpv:123 midichan:1 ]",
+  "[ 3/1 → 4/1 | note:c4 nrpnn:[1 8] nrpv:123 midichan:1 ]",
+]
+`;
+
 exports[`runs examples > example "octave" example index 0 1`] = `
 [
  "[ 0/1 → 1/1 | n:0 s:supersquare octave:3 ]",
@@ -6333,6 +6703,15 @@ exports[`runs examples > example "pressBy" example index 0 1`] = `
 ]
 `;

+exports[`runs examples > example "progNum" example index 0 1`] = `
+[
+  "[ 0/1 → 1/1 | note:c4 progNum:10 midichan:1 ]",
+  "[ 1/1 → 2/1 | note:c4 progNum:10 midichan:1 ]",
+  "[ 2/1 → 3/1 | note:c4 progNum:10 midichan:1 ]",
+  "[ 3/1 → 4/1 | note:c4 progNum:10 midichan:1 ]",
+]
+`;
+
 exports[`runs examples > example "pure" example index 0 1`] = `
 [
  "[ 0/1 → 1/1 | e4 ]",
@@ -6777,35 +7156,76 @@ exports[`runs examples > example "rev" example index 0 1`] = `

 exports[`runs examples > example "ribbon" example index 0 1`] = `
 [
-  "[ 0/1 → 1/2 | note:d ]",
-  "[ 1/2 → 1/1 | note:e ]",
-  "[ 1/1 → 3/2 | note:d ]",
-  "[ 3/2 → 2/1 | note:e ]",
-  "[ 2/1 → 5/2 | note:d ]",
-  "[ 5/2 → 3/1 | note:e ]",
-  "[ 3/1 → 7/2 | note:d ]",
-  "[ 7/2 → 4/1 | note:e ]",
+  "[ 0/1 → 1/1 | note:d ]",
+  "[ 1/1 → 2/1 | note:e ]",
+  "[ 2/1 → 3/1 | note:d ]",
+  "[ 3/1 → 4/1 | note:e ]",
 ]
 `;

 exports[`runs examples > example "ribbon" example index 1 1`] = `
 [
-  "[ 0/1 → 1/4 | note:G3 ]",
+  "[ 0/1 → 1/4 | note:A3 ]",
  "[ 1/4 → 1/2 | note:C3 ]",
  "[ 1/2 → 3/4 | note:D3 ]",
-  "[ 3/4 → 1/1 | note:F3 ]",
-  "[ 1/1 → 5/4 | note:Eb3 ]",
-  "[ 5/4 → 3/2 | note:Ab3 ]",
-  "[ 3/2 → 7/4 | note:G3 ]",
-  "[ 7/4 → 2/1 | note:C4 ]",
-  "[ 2/1 → 9/4 | note:G3 ]",
+  "[ 3/4 → 1/1 | note:G3 ]",
+  "[ 1/1 → 5/4 | note:E3 ]",
+  "[ 5/4 → 3/2 | note:C4 ]",
+  "[ 3/2 → 7/4 | note:A3 ]",
+  "[ 7/4 → 2/1 | note:E4 ]",
+  "[ 2/1 → 9/4 | note:A3 ]",
  "[ 9/4 → 5/2 | note:C3 ]",
  "[ 5/2 → 11/4 | note:D3 ]",
-  "[ 11/4 → 3/1 | note:F3 ]",
-  "[ 3/1 → 13/4 | note:Eb3 ]",
-  "[ 13/4 → 7/2 | note:Ab3 ]",
-  "[ 7/2 → 15/4 | note:G3 ]",
-  "[ 15/4 → 4/1 | note:C4 ]",
+  "[ 11/4 → 3/1 | note:G3 ]",
+  "[ 3/1 → 13/4 | note:E3 ]",
+  "[ 13/4 → 7/2 | note:C4 ]",
+  "[ 7/2 → 15/4 | note:A3 ]",
+  "[ 15/4 → 4/1 | note:E4 ]",
+]
+`;
+
+exports[`runs examples > example "ribbon" example index 2 1`] = `
+[
+  "[ 1/16 → 1/8 | s:bd ]",
+  "[ 1/8 → 3/16 | s:bd ]",
+  "[ 3/16 → 1/4 | s:bd ]",
+  "[ 1/4 → 5/16 | s:bd ]",
+  "[ 3/8 → 7/16 | s:bd ]",
+  "[ 9/16 → 5/8 | s:bd ]",
+  "[ 5/8 → 11/16 | s:bd ]",
+  "[ 11/16 → 3/4 | s:bd ]",
+  "[ 3/4 → 13/16 | s:bd ]",
+  "[ 7/8 → 15/16 | s:bd ]",
+  "[ 17/16 → 9/8 | s:bd ]",
+  "[ 9/8 → 19/16 | s:bd ]",
+  "[ 19/16 → 5/4 | s:bd ]",
+  "[ 5/4 → 21/16 | s:bd ]",
+  "[ 11/8 → 23/16 | s:bd ]",
+  "[ 25/16 → 13/8 | s:bd ]",
+  "[ 13/8 → 27/16 | s:bd ]",
+  "[ 27/16 → 7/4 | s:bd ]",
+  "[ 7/4 → 29/16 | s:bd ]",
+  "[ 15/8 → 31/16 | s:bd ]",
+  "[ 33/16 → 17/8 | s:bd ]",
+  "[ 17/8 → 35/16 | s:bd ]",
+  "[ 35/16 → 9/4 | s:bd ]",
+  "[ 9/4 → 37/16 | s:bd ]",
+  "[ 19/8 → 39/16 | s:bd ]",
+  "[ 41/16 → 21/8 | s:bd ]",
+  "[ 21/8 → 43/16 | s:bd ]",
+  "[ 43/16 → 11/4 | s:bd ]",
+  "[ 11/4 → 45/16 | s:bd ]",
+  "[ 23/8 → 47/16 | s:bd ]",
+  "[ 49/16 → 25/8 | s:bd ]",
+  "[ 25/8 → 51/16 | s:bd ]",
+  "[ 51/16 → 13/4 | s:bd ]",
+  "[ 13/4 → 53/16 | s:bd ]",
+  "[ 27/8 → 55/16 | s:bd ]",
+  "[ 57/16 → 29/8 | s:bd ]",
+  "[ 29/8 → 59/16 | s:bd ]",
+  "[ 59/16 → 15/4 | s:bd ]",
+  "[ 15/4 → 61/16 | s:bd ]",
+  "[ 31/8 → 63/16 | s:bd ]",
 ]
 `;

@@ -7447,6 +7867,52 @@ exports[`runs examples > example "scramble" example index 1 1`] = `
 ]
 `;

+exports[`runs examples > example "scrub" example index 0 1`] = `
+[
+  "[ 0/1 → 1/8 | s:swpad n:0 begin:0.1 speed:1 clip:1 ]",
+  "[ 1/8 → 1/4 | s:swpad n:0 begin:0.1 speed:1 clip:1 ]",
+  "[ 1/4 → 5/8 | s:swpad n:0 begin:0.25 speed:1 clip:1 ]",
+  "[ 5/8 → 3/4 | s:swpad n:0 begin:0.7 speed:1 clip:1 ]",
+  "[ 3/4 → 7/8 | s:swpad n:0 begin:0.7 speed:1 clip:1 ]",
+  "[ 7/8 → 1/1 | s:swpad n:0 begin:0.8 speed:1.5 clip:1 ]",
+  "[ 1/1 → 9/8 | s:swpad n:0 begin:0.1 speed:1 clip:1 ]",
+  "[ 9/8 → 5/4 | s:swpad n:0 begin:0.1 speed:1 clip:1 ]",
+  "[ 5/4 → 13/8 | s:swpad n:0 begin:0.25 speed:1 clip:1 ]",
+  "[ 13/8 → 7/4 | s:swpad n:0 begin:0.7 speed:1 clip:1 ]",
+  "[ 7/4 → 15/8 | s:swpad n:0 begin:0.7 speed:1 clip:1 ]",
+  "[ 15/8 → 2/1 | s:swpad n:0 begin:0.8 speed:1.5 clip:1 ]",
+  "[ 2/1 → 17/8 | s:swpad n:0 begin:0.1 speed:1 clip:1 ]",
+  "[ 17/8 → 9/4 | s:swpad n:0 begin:0.1 speed:1 clip:1 ]",
+  "[ 9/4 → 21/8 | s:swpad n:0 begin:0.25 speed:1 clip:1 ]",
+  "[ 21/8 → 11/4 | s:swpad n:0 begin:0.7 speed:1 clip:1 ]",
+  "[ 11/4 → 23/8 | s:swpad n:0 begin:0.7 speed:1 clip:1 ]",
+  "[ 23/8 → 3/1 | s:swpad n:0 begin:0.8 speed:1.5 clip:1 ]",
+  "[ 3/1 → 25/8 | s:swpad n:0 begin:0.1 speed:1 clip:1 ]",
+  "[ 25/8 → 13/4 | s:swpad n:0 begin:0.1 speed:1 clip:1 ]",
+  "[ 13/4 → 29/8 | s:swpad n:0 begin:0.25 speed:1 clip:1 ]",
+  "[ 29/8 → 15/4 | s:swpad n:0 begin:0.7 speed:1 clip:1 ]",
+  "[ 15/4 → 31/8 | s:swpad n:0 begin:0.7 speed:1 clip:1 ]",
+  "[ 31/8 → 4/1 | s:swpad n:0 begin:0.8 speed:1.5 clip:1 ]",
+]
+`;
+
+exports[`runs examples > example "scrub" example index 1 1`] = `
+[
+  "[ 0/1 → 3/8 | s:amen speed:0.25 unit:c begin:0 clip:1 ]",
+  "[ 3/8 → 5/8 | s:amen speed:0.25 unit:c begin:0 clip:1 ]",
+  "[ 5/8 → 1/1 | s:amen speed:0.25 unit:c begin:0.25 clip:1 ]",
+  "[ 1/1 → 11/8 | s:amen speed:0.25 unit:c begin:0 clip:1 ]",
+  "[ 11/8 → 13/8 | s:amen speed:0.25 unit:c begin:0 clip:1 ]",
+  "[ 13/8 → 2/1 | s:amen speed:0.25 unit:c begin:0.25 clip:1 ]",
+  "[ 2/1 → 19/8 | s:amen speed:0.25 unit:c begin:0 clip:1 ]",
+  "[ 19/8 → 21/8 | s:amen speed:0.25 unit:c begin:0 clip:1 ]",
+  "[ 21/8 → 3/1 | s:amen speed:0.25 unit:c begin:0.25 clip:1 ]",
+  "[ 3/1 → 27/8 | s:amen speed:0.25 unit:c begin:0 clip:1 ]",
+  "[ 27/8 → 29/8 | s:amen speed:0.25 unit:c begin:0 clip:1 ]",
+  "[ 29/8 → 4/1 | s:amen speed:0.25 unit:c begin:0.25 clip:1 ]",
+]
+`;
+
 exports[`runs examples > example "segment" example index 0 1`] = `
 [
  "[ 0/1 → 1/24 | note:40 ]",
@@ -8949,6 +9415,33 @@ exports[`runs examples > example "swingBy" example index 0 1`] = `
 ]
 `;

+exports[`runs examples > example "sysex" example index 0 1`] = `
+[
+  "[ 0/1 → 1/1 | note:c4 sysexid:119 sysexdata:[1 2 3 4] midichan:1 ]",
+  "[ 1/1 → 2/1 | note:c4 sysexid:119 sysexdata:[1 2 3 4] midichan:1 ]",
+  "[ 2/1 → 3/1 | note:c4 sysexid:119 sysexdata:[1 2 3 4] midichan:1 ]",
+  "[ 3/1 → 4/1 | note:c4 sysexid:119 sysexdata:[1 2 3 4] midichan:1 ]",
+]
+`;
+
+exports[`runs examples > example "sysexdata" example index 0 1`] = `
+[
+  "[ 0/1 → 1/1 | note:c4 sysexid:119 sysexdata:[1 2 3 4] midichan:1 ]",
+  "[ 1/1 → 2/1 | note:c4 sysexid:119 sysexdata:[1 2 3 4] midichan:1 ]",
+  "[ 2/1 → 3/1 | note:c4 sysexid:119 sysexdata:[1 2 3 4] midichan:1 ]",
+  "[ 3/1 → 4/1 | note:c4 sysexid:119 sysexdata:[1 2 3 4] midichan:1 ]",
+]
+`;
+
+exports[`runs examples > example "sysexid" example index 0 1`] = `
+[
+  "[ 0/1 → 1/1 | note:c4 sysexid:119 sysexdata:[1 2 3 4] midichan:1 ]",
+  "[ 1/1 → 2/1 | note:c4 sysexid:119 sysexdata:[1 2 3 4] midichan:1 ]",
+  "[ 2/1 → 3/1 | note:c4 sysexid:119 sysexdata:[1 2 3 4] midichan:1 ]",
+  "[ 3/1 → 4/1 | note:c4 sysexid:119 sysexdata:[1 2 3 4] midichan:1 ]",
+]
+`;
+
 exports[`runs examples > example "take" example index 0 1`] = `
 [
  "[ 0/1 → 1/2 | s:bd ]",
@@ -11,7 +11,7 @@ import * as webaudio from '@strudel/webaudio';
 import { mini, m } from '@strudel/mini/mini.mjs';
 // import * as voicingHelpers from '@strudel/tonal/voicings.mjs';
 // import euclid from '@strudel/core/euclid.mjs';
-// import '@strudel/midi/midi.mjs';
+//import '@strudel/midi/midi.mjs';
 import * as tonalHelpers from '@strudel/tonal';
 import '@strudel/xen/xen.mjs';
 // import '@strudel/xen/tune.mjs';
@@ -126,6 +126,12 @@ const loadCsound = () => {};
 const loadCSound = () => {};
 const loadcsound = () => {};

+const midin = () => {
+  return (ccNum) => strudel.ref(() => 0); // returns ref with default value 0
+};
+
+const sysex = ([id, data]) => {};
+
 // TODO: refactor to evalScope
 evalScope(
  // Tone,
@@ -142,6 +148,8 @@ evalScope(
  uiHelpers,
  */
  {
+    midin,
+    sysex,
    // gist,
    // euclid,
    csound: id,
@@ -16,24 +16,97 @@ It is also possible to pattern other things with Strudel, such as software and h

 Strudel supports MIDI without any additional software (thanks to [webmidi](https://npmjs.com/package/webmidi)), just by adding methods to your pattern:

-## midi(outputName?)
+## midiin(inputName?)
+
+<JsDoc client:idle name="midin" h={0} />
+
+## midi(outputName?,options?)

 Either connect a midi device or use the IAC Driver (Mac) or Midi Through Port (Linux) for internal midi messages.
 If no outputName is given, it uses the first midi output it finds.

-<MiniRepl client:idle tune={`chord("<C^7 A7 Dm7 G7>").voicing().midi()`} />
+<MiniRepl
+  client:idle
+  tune={`
+$: chord("<C^7 A7 Dm7 G7>").voicing().midi('IAC Driver')
+`}
+/>

-In the console, you will see a log of the available MIDI devices as soon as you run the code, e.g. `Midi connected! Using "Midi Through Port-0".`
+In the console, you will see a log of the available MIDI devices as soon as you run the code,
+e.g.
+
+```
+ `Midi connected! Using "Midi Through Port-0".`
+```
+
+The `.midi()` function accepts an options object with the following properties:
+
+<MiniRepl
+  client:idle
+  tune={`$: note("d e c a f").midi('IAC Driver', { isController: true, midimap: 'default'})
+`}
+/>
+
+<details>
+<summary>Available Options</summary>
+
+| Option       | Type          | Default   | Description                                                            |
+| ------------ | ------------- | --------- | ---------------------------------------------------------------------- |
+| isController | boolean       | false     | When true, disables sending note messages. Useful for MIDI controllers |
+| latencyMs    | number        | 34        | Latency in milliseconds to align MIDI with audio engine                |
+| noteOffsetMs | number        | 10        | Offset in milliseconds for note-off messages to prevent glitching      |
+| midichannel  | number        | 1         | Default MIDI channel (1-16)                                            |
+| velocity     | number        | 0.9       | Default note velocity (0-1)                                            |
+| gain         | number        | 1         | Default gain multiplier for velocity (0-1)                             |
+| midimap      | string        | 'default' | Name of MIDI mapping to use for control changes                        |
+| midiport     | string/number | -         | MIDI device name or index                                              |
+
+</details>
+
+### midiport(outputName)
+
+Selects the MIDI output device to use, pattern can be used to switch between devices.
+
+```javascript
+$: midiport('IAC Driver');
+$: note('c a f e').midiport('<0 1 2 3>').midi();
+```
+
+<JsDoc client:idle name="midiport" h={0} />

 ## midichan(number)

 Selects the MIDI channel to use. If not used, `.midi` will use channel 1 by default.

-## ccn && ccv
+## midicmd(command)

+`midicmd` sends MIDI system real-time messages to control timing and transport on MIDI devices.
+
+It supports the following commands:
+
+- `clock`/`midiClock` - Sends MIDI timing clock messages
+- `start` - Sends MIDI start message
+- `stop` - Sends MIDI stop message
+- `continue` - Sends MIDI continue message
+
+// You can control the clock with a pattern and ensure it starts in sync when the repl begins.
+// Note: It might act unexpectedly if MIDI isn't set up initially.
+
+<MiniRepl
+  client:idle
+  tune={`$:stack(
+  midicmd("clock*48,<start stop>/2").midi('IAC Driver')
+)`}
+/>
+
+## control, ccn && ccv
+
+- `control` sends MIDI control change messages to your MIDI device.
 - `ccn` sets the cc number. Depends on your synths midi mapping
 - `ccv` sets the cc value. normalized from 0 to 1.

+<MiniRepl client:idle tune={`note("c a f e").control([74, sine.slow(4)]).midi()`} />
+
 <MiniRepl client:idle tune={`note("c a f e").ccn(74).ccv(sine.slow(4)).midi()`} />

 In the above snippet, `ccn` is set to 74, which is the filter cutoff for many synths. `ccv` is controlled by a saw pattern.
@@ -56,6 +129,48 @@ Instead of setting `ccn` and `ccv` directly, you can also create mappings with `

 <JsDoc client:idle name="defaultmidimap" h={0} />

+## progNum (Program Change)
+
+`progNum` sends MIDI program change messages to switch between different presets/patches on your MIDI device.
+Program change values should be numbers between 0 and 127.
+
+<MiniRepl client:idle tune={`// Switch between programs 0 and 1 every cycle
+progNum("<0 1>").midi()
+
+// Play notes while changing programs
+note("c3 e3 g3").progNum("<0 1 2>").midi()`} />
+
+Program change messages are useful for switching between different instrument sounds or presets during a performance.
+The exact sound that each program number maps to depends on your MIDI device's configuration.
+
+## sysex, sysexid && sysexdata (System Exclusive Message)
+
+`sysex` sends MIDI System Exclusive (SysEx) messages to your MIDI device.
+ysEx messages are device-specific commands that allow deeper control over synthesizer parameters.
+The value should be an array of numbers between 0-255 representing the SysEx data bytes.
+
+<MiniRepl
+  client:idle
+  tune={`// Send a simple SysEx message
+let id = 0x43; //Yamaha
+//let id = "0x00:0x20:0x32"; //Behringer ID can be an array of numbers
+let data = "0x79:0x09:0x11:0x0A:0x00:0x00"; // Set NSX-39 voice to say "Aa"
+$: note("c a f e").sysex(id, data).midi();
+$: note("c a f e").sysexid(id).sysexdata(data).midi();`}
+/>
+
+The exact format of SysEx messages depends on your MIDI device's specification.
+Consult your device's MIDI implementation guide for details on supported SysEx messages.
+
+## midibend && miditouch
+
+`midibend` sets MIDI pitch bend (-1 - 1)
+`miditouch` sets MIDI key after touch (0-1)
+
+<MiniRepl client:idle tune={`note("c a f e").midibend(sine.slow(4).range(-0.4,0.4)).midi()`} />
+
+<MiniRepl client:idle tune={`note("c a f e").miditouch(sine.slow(4).range(0,1)).midi()`} />
+
 # OSC/SuperDirt/StrudelDirt

 In TidalCycles, sound is usually generated using [SuperDirt](https://github.com/musikinformatik/SuperDirt/), which runs inside SuperCollider. Strudel also supports using SuperDirt, although it requires installing some additional software.
@@ -118,8 +233,8 @@ The following example shows how to send a pattern to an MQTT broker:
  client:only="react"
  tune={`"hello world"
    .mqtt(undefined, // username (undefined for open/public servers)
-          undefined, // password 
-          '/strudel-pattern', // mqtt 'topic' 
+          undefined, // password
+          '/strudel-pattern', // mqtt 'topic'
          'wss://mqtt.eclipseprojects.io:443/mqtt', // MQTT server address
          'mystrudel', // MQTT client id - randomly generated if not supplied
          0 // latency / delay before sending messages (0 = no delay)
@@ -130,12 +245,14 @@ The following example shows how to send a pattern to an MQTT broker:
 Other software can then receive the messages. For example using the [mosquitto](https://mosquitto.org/) commandline client tools:

 ```
-> mosquitto_sub  -h mqtt.eclipseprojects.io -p 1883  -t "/strudel-pattern"
-hello
-world
-hello
-world
-...
+
+> mosquitto_sub -h mqtt.eclipseprojects.io -p 1883 -t "/strudel-pattern"
+> hello
+> world
+> hello
+> world
+> ...
+
 ```

 Control patterns will be encoded as JSON, for example:
@@ -155,11 +272,17 @@ Control patterns will be encoded as JSON, for example:
 Will send messages like the following:

 ```
+
 {"s":"sax","speed":2}
 {"s":"sax","speed":2}
 {"s":"sax","speed":3}
 {"s":"sax","speed":2}
 ...
+
 ```

 Libraries for receiving MQTT are available for many programming languages.
+
+```
+
+```
@@ -66,7 +66,7 @@ While it saves resources, it can also lead to sounds not being audible the first

 # Sound Banks

-If we open the `sounds` tab and then `drum machines`, we can see that the drum samples are all prefixed with drum machine names: `RolandTR808_bd`, `RolandTR808_sd`, `RolandTR808_hh` etc..
+If we open the `sounds` tab and then `drum-machines`, we can see that the drum samples are all prefixed with drum machine names: `RolandTR808_bd`, `RolandTR808_sd`, `RolandTR808_hh` etc..

 We _could_ use them like this:

@@ -180,11 +180,12 @@ It assumes a `strudel.json` file to be present at the root of the repository:
 https://raw.githubusercontent.com/<user>/<repo>/<branch>/strudel.json
 ```

-## From Disk via "Import Sounds"
+## From Disk via "Import Sounds Folder"

 If you don't want to upload your samples to the internet, you can also load them from your local disk.
-Go to the `sounds` tab in the REPL and press "import sounds".
-Then you can select a folder that contains audio files. The folder you select can also contain subfolders with audio files.
+Go to the `sounds` tab in the REPL and open the `import-sounds` tab below the search bar.
+Press the "import sounds folder" button and select a folder that contains audio files.
+The folder you select can also contain subfolders with audio files.
 Example:

 ```
@@ -200,12 +201,13 @@ Example:
 ```

 In the above example the folder `samples` contains 2 subfolders `swoop` and `smash`, which contain audio files.
-If you select that `samples` folder, the `user` tab (next to the import sounds button) will then contain 2 new sounds: `swoop(3) smash(3)`
+If you select that `samples` folder, the `user` tab (next to the `import-sounds` tab) will then contain 2 new sounds: `swoop(3) smash(3)`
 The individual samples can the be played normally like `s("swoop:0 swoop:1 smash:2")`.
+The samples within each sound use zero-based indexing in alphabetical order.

 ## From Disk via @strudel/sampler

-Instead of loading your samples into your browser with the "import sounds" button, you can also serve the samples from a local file server.
+Instead of loading your samples into your browser with the "import sounds folder" button, you can also serve the samples from a local file server.
 The easiest way to do this is using [@strudel/sampler](https://www.npmjs.com/package/@strudel/sampler):

 ```sh
@@ -24,7 +24,7 @@ With the new stepwise `stepcat` function, the steps of the two patterns will be

 By default, steps are counted according to the 'top level' in mini-notation. For example `"a [b c] d e"` has five events in it per cycle, but is counted as four steps, where `[b c]` is counted as a single step.

-However, you can mark a different metrical level to count steps relative to, using a `^` at the start of a sub-pattern. If we do this to the subpattern in our example: `"a [^b c] d e"`, then the pattern is now counted as having _eight_ steps. This is because 'b' and 'c' are each counted as single steps, and the events in the pattenr are twice as long, and so counted as two steps each.
+However, you can mark a different metrical level to count steps relative to, using a `^` at the start of a sub-pattern. If we do this to the subpattern in our example: `"a [^b c] d e"`, then the pattern is now counted as having _eight_ steps. This is because 'b' and 'c' are each counted as single steps, and the events in the pattern are twice as long, and so counted as two steps each.

 ## Pacing the steps

@@ -1,12 +1,14 @@
 ---
+import HeadCommon from '@components/HeadCommon.astro';
 import { Udels } from '../../components/Udels/Udels.jsx';
-
-
-const { BASE_URL } = import.meta.env;
-const baseNoTrailing = BASE_URL.endsWith('/') ? BASE_URL.slice(0, -1) : BASE_URL;
 ---

-
-<body class="m-0">
-  <Udels client:only="react" />
-</body>
+<html lang="en" class="m-0">
+  <head>
+    <HeadCommon />
+    <title>Strudel UDELS</title>
+  </head>
+  <body class="m-0">
+    <Udels client:only="react" />
+  </body>
+</html>
@@ -4,5 +4,9 @@ export default function UserFacingErrorMessage(Props) {
  if (error == null) {
    return;
  }
-  return <div className="text-red-500 p-4 bg-lineHighlight animate-pulse">{error.message || 'Unknown Error :-/'}</div>;
+  return (
+    <div className="text-background px-2 py-1 bg-foreground w-full ml-auto">
+      Error: {error.message || 'Unknown Error :-/'}
+    </div>
+  );
 }
@@ -1,6 +1,7 @@
 import React, { useState } from 'react';
-import { getAudioDevices, setAudioDevice } from '../../util.mjs';
+
 import { SelectInput } from './SelectInput';
+import { getAudioDevices } from '@strudel/webaudio';

 const initdevices = new Map();

@@ -21,9 +22,7 @@ export function AudioDeviceSelector({ audioDeviceName, onChange, isDisabled }) {
    if (!devicesInitialized) {
      return;
    }
-    const deviceID = devices.get(deviceName);
    onChange(deviceName);
-    setAudioDevice(deviceID);
  };
  const options = new Map();
  Array.from(devices.keys()).forEach((deviceName) => {
@@ -20,25 +20,42 @@ export default function ImportSoundsButton({ onComplete }) {
  });

  return (
-    <label
-      style={{ alignItems: 'center' }}
-      className="flex bg-background ml-2 pl-2 pr-2 max-w-[300px] rounded-md hover:opacity-50 whitespace-nowrap cursor-pointer"
-    >
-      <input
-        disabled={isUploading}
-        ref={fileUploadRef}
-        id="audio_file"
-        style={{ display: 'none' }}
-        type="file"
-        directory=""
-        webkitdirectory=""
-        multiple
-        accept="audio/*, .wav, .mp3, .m4a, .flac, .aac, .ogg"
-        onChange={() => {
-          onChange();
-        }}
-      />
-      {isUploading ? 'importing...' : 'import sounds'}
-    </label>
+    <div>
+      <label
+        style={{ alignItems: 'center', borderColor: 'red', border: 1 }}
+        className="flex bg-background  p-4  w-fit rounded-xl hover:opacity-50 whitespace-nowrap cursor-pointer"
+      >
+        <svg
+          xmlns="http://www.w3.org/2000/svg"
+          fill="none"
+          viewBox="0 0 24 24"
+          strokeWidth={1.5}
+          stroke="currentColor"
+          className="size-6 mr-2"
+        >
+          <path
+            strokeLinecap="round"
+            strokeLinejoin="round"
+            d="M7.5 7.5h-.75A2.25 2.25 0 0 0 4.5 9.75v7.5a2.25 2.25 0 0 0 2.25 2.25h7.5a2.25 2.25 0 0 0 2.25-2.25v-7.5a2.25 2.25 0 0 0-2.25-2.25h-.75m0-3-3-3m0 0-3 3m3-3v11.25m6-2.25h.75a2.25 2.25 0 0 1 2.25 2.25v7.5a2.25 2.25 0 0 1-2.25 2.25h-7.5a2.25 2.25 0 0 1-2.25-2.25v-.75"
+          />
+        </svg>
+
+        <input
+          disabled={isUploading}
+          ref={fileUploadRef}
+          id="audio_file"
+          style={{ display: 'none' }}
+          type="file"
+          directory=""
+          webkitdirectory=""
+          multiple
+          accept="audio/*, .wav, .mp3, .m4a, .flac, .aac, .ogg"
+          onChange={() => {
+            onChange();
+          }}
+        />
+        {isUploading ? 'importing...' : 'import sounds folder'}
+      </label>
+    </div>
  );
 }
@@ -5,7 +5,7 @@ export function SelectInput({ value, options, onChange, onClick, isDisabled }) {
    <select
      disabled={isDisabled}
      onClick={onClick}
-      className="p-2 bg-background rounded-md text-foreground"
+      className="p-2 bg-background rounded-md text-foreground  border-foreground"
      value={value ?? ''}
      onChange={(e) => onChange(e.target.value)}
    >
@@ -1,10 +1,12 @@
 import { defaultSettings, settingsMap, useSettings } from '../../../settings.mjs';
 import { themes } from '@strudel/codemirror';
+import { Textbox } from '../textbox/Textbox.jsx';
 import { isUdels } from '../../util.mjs';
 import { ButtonGroup } from './Forms.jsx';
 import { AudioDeviceSelector } from './AudioDeviceSelector.jsx';
 import { AudioEngineTargetSelector } from './AudioEngineTargetSelector.jsx';
 import { confirmDialog } from '../../util.mjs';
+import { DEFAULT_MAX_POLYPHONY, setMaxPolyphony } from '@strudel/webaudio';

 function Checkbox({ label, value, onChange, disabled = false }) {
  return (
@@ -18,7 +20,7 @@ function Checkbox({ label, value, onChange, disabled = false }) {
 function SelectInput({ value, options, onChange }) {
  return (
    <select
-      className="p-2 bg-background rounded-md text-foreground"
+      className="p-2 bg-background rounded-md text-foreground  border-foreground"
      value={value}
      onChange={(e) => onChange(e.target.value)}
    >
@@ -53,7 +55,7 @@ function NumberSlider({ value, onChange, step = 1, ...rest }) {
  );
 }

-function FormItem({ label, children }) {
+function FormItem({ label, children, sublabel }) {
  return (
    <div className="grid gap-2">
      <label>{label}</label>
@@ -105,6 +107,7 @@ export function SettingsTab({ started }) {
    audioDeviceName,
    audioEngineTarget,
    togglePanelTrigger,
+    maxPolyphony,
  } = useSettings();
  const shouldAlwaysSync = isUdels();
  const canChangeAudioDevice = AudioContext.prototype.setSinkId != null;
@@ -139,6 +142,26 @@ export function SettingsTab({ started }) {
          }}
        />
      </FormItem>
+
+      <FormItem label="Maximum Polyphony">
+        <Textbox
+          min={1}
+          max={Infinity}
+          onBlur={(e) => {
+            let v = parseInt(e.target.value);
+            v = isNaN(v) ? DEFAULT_MAX_POLYPHONY : v;
+            setMaxPolyphony(v);
+            settingsMap.setKey('maxPolyphony', v);
+          }}
+          onChange={(v) => {
+            v = Math.max(1, parseInt(v));
+            settingsMap.setKey('maxPolyphony', isNaN(v) ? undefined : v);
+          }}
+          type="number"
+          placeholder=""
+          value={maxPolyphony ?? ''}
+        />
+      </FormItem>
      <FormItem label="Theme">
        <SelectInput options={themeOptions} value={theme} onChange={(theme) => settingsMap.setKey('theme', theme)} />
      </FormItem>
@@ -179,25 +202,7 @@ export function SettingsTab({ started }) {
          value={togglePanelTrigger}
          onChange={(value) => settingsMap.setKey('togglePanelTrigger', value)}
          items={{ click: 'Click', hover: 'Hover' }}
-        ></ButtonGroup>
-        {/* <Checkbox
-          label="Click"
-          onChange={(cbEvent) => {
-            if (cbEvent.target.checked) {
-              settingsMap.setKey('togglePanelTrigger', 'click');
-            }
-          }}
-          value={togglePanelTrigger != 'hover'}
        />
-        <Checkbox
-          label="Hover"
-          onChange={(cbEvent) => {
-            if (cbEvent.target.checked) {
-              settingsMap.setKey('togglePanelTrigger', 'hover');
-            }
-          }}
-          value={togglePanelTrigger == 'hover'}
-        /> */}
      </FormItem>
      <FormItem label="More Settings">
        <Checkbox
@@ -14,6 +14,8 @@ export function SoundsTab() {
  const sounds = useStore(soundMap);
  const { soundsFilter } = useSettings();
  const [search, setSearch] = useState('');
+  const { BASE_URL } = import.meta.env;
+  const baseNoTrailing = BASE_URL.endsWith('/') ? BASE_URL.slice(0, -1) : BASE_URL;

  const soundEntries = useMemo(() => {
    if (!sounds) {
@@ -37,6 +39,9 @@ export function SoundsTab() {
    if (soundsFilter === 'synths') {
      return filtered.filter(([_, { data }]) => ['synth', 'soundfont'].includes(data.type));
    }
+    if (soundsFilter === 'importSounds') {
+      return [];
+    }
    return filtered;
  }, [sounds, soundsFilter, search]);

@@ -51,7 +56,6 @@ export function SoundsTab() {
      ref?.stop(getAudioContext().currentTime + 0.01);
    });
  });
-
  return (
    <div id="sounds-tab" className="px-4 flex flex-col w-full h-full text-foreground">
      <Textbox placeholder="Search" value={search} onChange={(v) => setSearch(v)} />
@@ -65,9 +69,9 @@ export function SoundsTab() {
            drums: 'drum-machines',
            synths: 'Synths',
            user: 'User',
+            importSounds: 'import-sounds',
          }}
        ></ButtonGroup>
-        <ImportSoundsButton onComplete={() => settingsMap.setKey('soundsFilter', 'user')} />
      </div>

      <div className="min-h-0 max-h-full grow overflow-auto  text-sm break-normal pb-2">
@@ -101,7 +105,55 @@ export function SoundsTab() {
            </span>
          );
        })}
-        {!soundEntries.length ? 'No custom sounds loaded in this pattern (yet).' : ''}
+        {!soundEntries.length && soundsFilter === 'importSounds' ? (
+          <div className="prose dark:prose-invert min-w-full pt-2 pb-8 px-4">
+            <ImportSoundsButton onComplete={() => settingsMap.setKey('soundsFilter', 'user')} />
+            <p>
+              To import sounds into strudel, they must be contained{' '}
+              <a href={`${baseNoTrailing}/learn/samples/#from-disk-via-import-sounds-folder`} target="_blank">
+                within a folder or subfolder
+              </a>
+              . The best way to do this is to upload a “samples” folder containing subfolders of individual sounds or
+              soundbanks (see diagram below).{' '}
+            </p>
+            <pre className="bg-background" key={'sample-diagram'}>
+              {`└─ samples <-- import this folder
+   ├─ swoop
+   │  ├─ swoopshort.wav
+   │  ├─ swooplong.wav
+   │  └─ swooptight.wav
+   └─ smash
+      ├─ smashhigh.wav
+      ├─ smashlow.wav
+      └─ smashmiddle.wav`}
+            </pre>
+            <p>
+              The name of a subfolder corresponds to the sound name under the “user” tab. Multiple samples within a
+              subfolder are all labelled with the same name, but can be accessed using “.n( )” - remember sounds are
+              zero-indexed and in alphabetical order!
+            </p>
+            <p>
+              For more information, and other ways to use your own sounds in strudel,{' '}
+              <a href={`${baseNoTrailing}/learn/samples/#from-disk-via-import-sounds-folder`} target="_blank">
+                check out the docs
+              </a>
+              !
+            </p>
+            <h3>Preview Sounds</h3>
+            <pre className="bg-background" key={'sample-preview'}>
+              n("0 1 2 3 4 5").s("sample-name")
+            </pre>
+            <p>
+              Paste the line above into the main editor to hear the uploaded folder. Remember to use the name of your
+              sample as it appears under the "user" tab.
+            </p>
+          </div>
+        ) : (
+          ''
+        )}
+        {!soundEntries.length && soundsFilter !== 'importSounds'
+          ? 'No custom sounds loaded in this pattern (yet).'
+          : ''}
      </div>
    </div>
  );
@@ -3,7 +3,10 @@ import cx from '@src/cx.mjs';
 export function Textbox({ onChange, className, ...inputProps }) {
  return (
    <input
-      className={cx('p-1 bg-background rounded-md my-2 border-foreground', className)}
+      className={cx(
+        'p-2 bg-background rounded-md  border-foreground text-foreground placeholder-foreground',
+        className,
+      )}
      onChange={(e) => onChange(e.target.value)}
      {...inputProps}
    />
@@ -54,25 +54,23 @@ export function registerSamplesFromDB(config = userSamplesDBConfig, onComplete =
              splitRelativePath[splitRelativePath.length - 2] ?? soundFile.id.split(/\W+/)[0] ?? 'user';
            const blob = soundFile.blob;

-            // Files used to be uploaded as base64 strings, After Jan 1 2025 this check can be safely deleted
-            if (typeof blob === 'string') {
-              const soundPaths = sounds.get(parentDirectory) ?? new Set();
-              soundPaths.add(blob);
-              sounds.set(parentDirectory, soundPaths);
-              return;
-            }
-
            return blobToDataUrl(blob).then((soundPath) => {
-              const soundPaths = sounds.get(parentDirectory) ?? new Set();
-              soundPaths.add(soundPath);
-              sounds.set(parentDirectory, soundPaths);
+              const titlePathMap = sounds.get(parentDirectory) ?? new Map();
+
+              titlePathMap.set(title, soundPath);
+
+              sounds.set(parentDirectory, titlePathMap);
              return;
            });
          }),
      )
        .then(() => {
-          sounds.forEach((soundPaths, key) => {
-            const value = Array.from(soundPaths);
+          sounds.forEach((titlePathMap, key) => {
+            const value = Array.from(titlePathMap.keys())
+              .sort((a, b) => {
+                return a.localeCompare(b);
+              })
+              .map((title) => titlePathMap.get(title));

            registerSound(key, (t, hapValue, onended) => onTriggerSample(t, hapValue, onended, value), {
              type: 'sample',
@@ -115,6 +115,29 @@ export async function prebake() {
          'numbers/7.wav',
          'numbers/8.wav',
        ],
+        num: [
+          'num/00.wav',
+          'num/01.wav',
+          'num/02.wav',
+          'num/03.wav',
+          'num/04.wav',
+          'num/05.wav',
+          'num/06.wav',
+          'num/07.wav',
+          'num/08.wav',
+          'num/09.wav',
+          'num/10.wav',
+          'num/11.wav',
+          'num/12.wav',
+          'num/13.wav',
+          'num/14.wav',
+          'num/15.wav',
+          'num/16.wav',
+          'num/17.wav',
+          'num/18.wav',
+          'num/19.wav',
+          'num/20.wav',
+        ],
      },
      'github:tidalcycles/dirt-samples',
      {
@@ -14,7 +14,7 @@ import {
  resetLoadedSounds,
  initAudioOnFirstClick,
 } from '@strudel/webaudio';
-import { getAudioDevices, setAudioDevice, setVersionDefaultsFrom } from './util.mjs';
+import { setVersionDefaultsFrom } from './util.mjs';
 import { StrudelMirror, defaultSettings } from '@strudel/codemirror';
 import { clearHydra } from '@strudel/hydra';
 import { useCallback, useEffect, useRef, useState } from 'react';
@@ -28,7 +28,7 @@ import {
  setViewingPatternData,
 } from '../user_pattern_utils.mjs';
 import { superdirtOutput } from '@strudel/osc/superdirtoutput';
-import { audioEngineTargets, defaultAudioDeviceName } from '../settings.mjs';
+import { audioEngineTargets } from '../settings.mjs';
 import { useStore } from '@nanostores/react';
 import { prebake } from './prebake.mjs';
 import { getRandomTune, initCode, loadModules, shareCode } from './util.mjs';
@@ -36,11 +36,11 @@ import './Repl.css';
 import { setInterval, clearInterval } from 'worker-timers';
 import { getMetadata } from '../metadata_parser';

-const { latestCode } = settingsMap.get();
+const { latestCode, maxPolyphony, audioDeviceName } = settingsMap.get();
 let modulesLoading, presets, drawContext, clearCanvas, audioReady;

 if (typeof window !== 'undefined') {
-  audioReady = initAudioOnFirstClick();
+  audioReady = initAudioOnFirstClick({ maxPolyphony, audioDeviceName });
  modulesLoading = loadModules();
  presets = prebake();
  drawContext = getDrawContext();
@@ -159,20 +159,6 @@ export function useReplContext() {
    editorRef.current?.updateSettings(editorSettings);
  }, [_settings]);

-  // on first load, set stored audio device if possible
-  useEffect(() => {
-    const { audioDeviceName } = _settings;
-    if (audioDeviceName !== defaultAudioDeviceName) {
-      getAudioDevices().then((devices) => {
-        const deviceID = devices.get(audioDeviceName);
-        if (deviceID == null) {
-          return;
-        }
-        setAudioDevice(deviceID);
-      });
-    }
-  }, []);
-
  //
  // UI Actions
  //
@@ -1,6 +1,6 @@
 import { evalScope, hash2code, logger } from '@strudel/core';
-import { settingPatterns, defaultAudioDeviceName } from '../settings.mjs';
-import { getAudioContext, initializeAudioOutput, setDefaultAudioContext, setVersionDefaults } from '@strudel/webaudio';
+import { settingPatterns } from '../settings.mjs';
+import { setVersionDefaults } from '@strudel/webaudio';
 import { getMetadata } from '../metadata_parser';
 import { isTauri } from '../tauri.mjs';
 import './Repl.css';
@@ -160,38 +160,6 @@ export const isUdels = () => {
  return window.top?.location?.pathname.includes('udels');
 };

-export const getAudioDevices = async () => {
-  await navigator.mediaDevices.getUserMedia({ audio: true });
-  let mediaDevices = await navigator.mediaDevices.enumerateDevices();
-  mediaDevices = mediaDevices.filter((device) => device.kind === 'audiooutput' && device.deviceId !== 'default');
-  const devicesMap = new Map();
-  devicesMap.set(defaultAudioDeviceName, '');
-  mediaDevices.forEach((device) => {
-    devicesMap.set(device.label, device.deviceId);
-  });
-  return devicesMap;
-};
-
-export const setAudioDevice = async (id) => {
-  let audioCtx = getAudioContext();
-  if (audioCtx.sinkId === id) {
-    return;
-  }
-  await audioCtx.suspend();
-  await audioCtx.close();
-  audioCtx = setDefaultAudioContext();
-  await audioCtx.resume();
-  const isValidID = (id ?? '').length > 0;
-  if (isValidID) {
-    try {
-      await audioCtx.setSinkId(id);
-    } catch {
-      logger('failed to set audio interface', 'warning');
-    }
-  }
-  initializeAudioOutput();
-};
-
 export function setVersionDefaultsFrom(code) {
  try {
    const metadata = getMetadata(code);
@@ -3,8 +3,6 @@ import { useStore } from '@nanostores/react';
 import { register } from '@strudel/core';
 import { isUdels } from './repl/util.mjs';

-export const defaultAudioDeviceName = 'System Standard';
-
 export const audioEngineTargets = {
  webaudio: 'webaudio',
  osc: 'osc',
@@ -36,10 +34,10 @@ export const defaultSettings = {
  isPanelOpen: true,
  togglePanelTrigger: 'click', //click | hover
  userPatterns: '{}',
-  audioDeviceName: defaultAudioDeviceName,
  audioEngineTarget: audioEngineTargets.webaudio,
  isButtonRowHidden: false,
  isCSSAnimationDisabled: false,
+  maxPolyphony: 128,
 };

 let search = null;