From 80ed37298b5dd29403c0e904830c7cc221613dc9 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 17 May 2026 14:12:01 +0100
Subject: [PATCH] not sure

---
 e2e/app.spec.ts                               |  14 +
 index.html                                    |  17 +-
 src/audio/garden-audio-config.ts              | 190 ++++++
 src/audio/garden-audio-gesture-state.test.ts  | 100 ++-
 src/audio/garden-audio-gesture-state.ts       |  91 ++-
 src/audio/garden-audio-graph.test.ts          |  92 +++
 src/audio/garden-audio-graph.ts               |  98 ++-
 src/audio/garden-audio-input.test.ts          |  52 ++
 src/audio/garden-audio-input.ts               |  34 +-
 src/audio/garden-audio-music.ts               |  18 +-
 src/audio/garden-audio-types.ts               |  10 +
 src/audio/garden-audio.test.ts                |  44 +-
 src/audio/garden-audio.ts                     |  25 +-
 src/audio/generative-piano.test.ts            |  59 ++
 src/audio/generative-piano.ts                 | 588 +++++++++++++-----
 src/audio/noise-burst-player.ts               |   9 +-
 src/audio/piano-sampler.test.ts               |   1 +
 src/audio/piano-sampler.ts                    |   6 +-
 src/audio/piano-samples.ts                    |  11 +-
 src/config.ts                                 | 280 ++++++++-
 src/config/default-settings.ts                |  47 ++
 src/config/runtime-controls.ts                | 264 ++++++++
 src/config/types.ts                           |  73 +++
 src/config/vibe-presets.ts                    |  13 +-
 src/game-loop/agent-population.ts             |  81 ++-
 src/game-loop/export-4k-renderer.ts           |  11 +-
 src/game-loop/export-4k.ts                    |  31 +-
 src/game-loop/frame-performance.ts            |  10 +-
 src/game-loop/game-loop-ping-pong.test.ts     |   4 +-
 src/game-loop/game-loop-resources.ts          |  14 +-
 src/game-loop/game-loop.ts                    |  55 +-
 src/game-loop/intro-prompt.test.ts            |  58 ++
 src/game-loop/intro-prompt.ts                 |  38 +-
 src/game-loop/intro-title-agents.test.ts      |  97 +++
 src/game-loop/intro-title-agents.ts           | 113 +++-
 src/game-loop/pointer-input.test.ts           |  25 +
 src/game-loop/pointer-input.ts                |  31 +-
 src/game-loop/simulation-frame.ts             |  15 +-
 src/game-loop/simulation-textures.ts          |  44 +-
 src/game-loop/toolbar-contrast-monitor.ts     |  69 +-
 src/index.ts                                  |  89 ++-
 .../agent-generation/agent-compaction.wgsl    |  35 +-
 .../agent-generation-pipeline.test.ts         |   9 +-
 .../agent-generation-pipeline.ts              | 150 +++--
 .../agents/agent-generation/agent-resize.wgsl |  10 +-
 .../agent-generation/agent-schema.test.ts     |   9 +-
 src/pipelines/agents/agent-pipeline.ts        |  91 ++-
 src/pipelines/agents/agent-settings.ts        |  15 +
 src/pipelines/agents/agent.wgsl               | 154 +++--
 src/pipelines/brush/brush-pipeline.ts         | 123 +---
 src/pipelines/brush/brush-settings.ts         |  10 +
 src/pipelines/brush/brush.wgsl                |  98 ++-
 src/pipelines/common-state/common-state.ts    |   6 +-
 src/pipelines/copy/copy-pipeline.ts           | 189 ------
 src/pipelines/copy/copy.wgsl                  |  19 -
 src/pipelines/diffusion/diffuse.wgsl          |  98 ++-
 .../diffusion/diffusion-pipeline.test.ts      |  12 +-
 src/pipelines/diffusion/diffusion-pipeline.ts | 125 ++--
 src/pipelines/diffusion/diffusion-settings.ts |   3 +
 src/pipelines/eraser/eraser-agent-pipeline.ts |  30 +-
 src/pipelines/eraser/eraser-agent.wgsl        |  13 +-
 .../eraser/eraser-texture-pipeline.ts         | 189 +++---
 src/pipelines/eraser/eraser-texture.wgsl      |  92 ++-
 src/pipelines/render/render-pipeline.ts       |  34 +-
 src/pipelines/render/render-settings.ts       |   4 +
 src/pipelines/render/render.wgsl              |  53 +-
 src/pipelines/wgsl-uniform-layout.test.ts     |  64 +-
 src/style/_toolbar.scss                       | 156 ++++-
 src/utils/delta-time-calculator.ts            |  16 +-
 src/utils/graphics/full-screen-quad.ts        |  84 +--
 src/utils/graphics/noise.ts                   |  37 +-
 src/utils/graphics/resizable-texture.ts       |  27 +-
 src/vibes.test.ts                             |  42 ++
 73 files changed, 3621 insertions(+), 1297 deletions(-)
 create mode 100644 src/audio/garden-audio-graph.test.ts
 create mode 100644 src/audio/garden-audio-input.test.ts
 create mode 100644 src/game-loop/intro-prompt.test.ts
 create mode 100644 src/game-loop/intro-title-agents.test.ts
 delete mode 100644 src/pipelines/copy/copy-pipeline.ts
 delete mode 100644 src/pipelines/copy/copy.wgsl

diff --git a/e2e/app.spec.ts b/e2e/app.spec.ts
index c641649..8a9b30f 100644
--- a/e2e/app.spec.ts
+++ b/e2e/app.spec.ts
@@ -86,6 +86,15 @@ test('keeps fallback controls interactive and accessible', async ({ page }) => {
   await expect(settingsButton).toHaveAttribute('aria-expanded', 'false');
 
   const soundButton = page.locator('button.sound');
+  const volumeSlider = page.getByLabel('Master volume');
+  await expect(volumeSlider).toHaveValue('0.42');
+  await volumeSlider.evaluate((input) => {
+    const slider = input as HTMLInputElement;
+    slider.value = '0.25';
+    slider.dispatchEvent(new Event('input', { bubbles: true }));
+  });
+  await expect(volumeSlider).toHaveValue('0.25');
+  await expect(volumeSlider).toHaveAttribute('aria-valuetext', '25%');
   await expect(soundButton).toHaveAttribute('aria-pressed', 'false');
   await soundButton.click();
   await expect(soundButton).toHaveAttribute('aria-pressed', 'true');
@@ -93,6 +102,11 @@ test('keeps fallback controls interactive and accessible', async ({ page }) => {
   await page.reload();
   await expect(page.locator('body')).not.toHaveClass(/is-loading/);
   await expect(page.locator('button.sound')).toHaveAttribute('aria-pressed', 'true');
+  await expect(page.getByLabel('Master volume')).toHaveValue('0.25');
+  await expect(page.getByLabel('Master volume')).toHaveAttribute(
+    'aria-valuetext',
+    'Muted, 25%'
+  );
 
   const initialSwatchColor = await getFirstSwatchColor(page);
   const initialBackground = await getGardenBackground(page);
diff --git a/index.html b/index.html
index 0a66ab3..884b053 100644
--- a/index.html
+++ b/index.html
@@ -167,12 +167,17 @@
               aria-expanded="false"
               title="Show config overlay"
             ></button>
-            <button
-              class="sound"
-              aria-label="Mute audio"
-              aria-pressed="false"
-              title="Mute audio"
-            ></button>
+            <div class="audio-control">
+              <button
+                class="sound"
+                aria-label="Mute audio"
+                aria-pressed="false"
+                title="Mute audio"
+              ></button>
+              <label class="volume-control" title="Master volume">
+                <input class="volume-slider" type="range" aria-label="Master volume" />
+              </label>
+            </div>
             <button
               class="export-4k"
               aria-label="Download 4K upscale image"
diff --git a/src/audio/garden-audio-config.ts b/src/audio/garden-audio-config.ts
index 3566c39..5b5129a 100644
--- a/src/audio/garden-audio-config.ts
+++ b/src/audio/garden-audio-config.ts
@@ -1,4 +1,5 @@
 import { appConfig } from '../config';
+import type { PianoNoteRole } from './garden-audio-types';
 
 type GardenAudioChordQuality = 'major' | 'minor';
 
@@ -27,7 +28,154 @@ export interface GardenAudioStylePool extends GardenAudioRegister {
 interface GardenAudioGenerativePianoConfig {
   stylePools: [GardenAudioStylePool, GardenAudioStylePool, GardenAudioStylePool];
   padRegisters: [GardenAudioRegister, GardenAudioRegister, GardenAudioRegister];
+  chordVoicings: {
+    majorOpen: Array<number>;
+    minorOpen: Array<number>;
+    majorClosed: Array<number>;
+    minorClosed: Array<number>;
+  };
+  vibeChangeStinger: {
+    velocities: [number, number, number];
+    pans: [number, number, number];
+    delaySends: [number, number, number];
+    lowpassExpression: number;
+  };
+  highActivityExtra: {
+    barOffset: number;
+    expressionMultiplier: number;
+  };
+  padChord: {
+    velocities: [number, number, number];
+    expressionVelocityWeight: number;
+    delaySend: number;
+    lowpassExpressionWeight: number;
+  };
+  supportNote: {
+    velocityBase: number;
+    velocityExpressionWeight: number;
+    durationBaseSeconds: number;
+    durationExpressionSeconds: number;
+    delaySendBase: number;
+    delaySendExpressionWeight: number;
+    lowpassExpressionWeight: number;
+    expressionThreshold: number;
+    offsetsByStyle: [Array<number>, Array<number>, Array<number>];
+  };
+  textureNote: {
+    velocityBase: number;
+    velocityExpressionWeight: number;
+    durationBaseSeconds: number;
+    durationExpressionSeconds: number;
+    delaySendBase: number;
+    delaySendExpressionWeight: number;
+    idleExpressionThreshold: number;
+    mediumExpressionThreshold: number;
+    intenseSpacing: number;
+    idlePhase: number;
+  };
+  gestureAccent: {
+    rotationStrengthMultiplier: number;
+    quantizeStepLookahead: number;
+    velocityBase: number;
+    velocityStrengthWeight: number;
+    durationBaseSeconds: number;
+    durationStrengthSeconds: number;
+    delaySend: number;
+  };
+  touchNote: {
+    registerBiasManiaAmount: number;
+    velocityBase: number;
+    velocityStrengthWeight: number;
+    durationBaseSeconds: number;
+    durationStrengthSeconds: number;
+    delaySend: number;
+    lowpassBaseExpression: number;
+    lowpassStrengthWeight: number;
+  };
+  brushPhrase: {
+    initialMotifOffset: number;
+    energyRetain: number;
+    maniaRetain: number;
+    energyDecaySeconds: number;
+    maniaDecaySeconds: number;
+    fadeMinimumLifetimeSeconds: number;
+    layerIntensityBase: number;
+    layerIntensityManiaWeight: number;
+    frameActivityWeight: number;
+    frameManiaWeight: number;
+  };
+  brushStream: {
+    inferredManiaThreshold: number;
+    inferredManiaRange: number;
+    registerManiaShift: number;
+    chordToneEverySteps: number;
+    durationBaseSeconds: number;
+    durationIntensitySeconds: number;
+    durationManiaSeconds: number;
+    durationMinSeconds: number;
+    durationMaxSeconds: number;
+    delaySendBase: number;
+    delaySendIntensityWeight: number;
+    delaySendManiaWeight: number;
+    delaySendMin: number;
+    delaySendMax: number;
+    velocityBase: number;
+    velocityIntensityWeight: number;
+    lowpassBaseExpression: number;
+    lowpassIntensityWeight: number;
+    lowpassManiaWeight: number;
+    manicThreshold: number;
+    intenseThreshold: number;
+    activeThreshold: number;
+  };
+  brushStreamEcho: {
+    maniaThreshold: number;
+    stepModulo: number;
+    stepRemainder: number;
+    intensityThreshold: number;
+    octaveSemitones: number;
+    maxMidi: number;
+    velocityBase: number;
+    velocityIntensityWeight: number;
+    durationMinSeconds: number;
+    durationScale: number;
+    panScale: number;
+    delaySendMin: number;
+    delaySendScale: number;
+    lowpassBaseExpression: number;
+    lowpassManiaWeight: number;
+  };
+  brushMotif: {
+    highThreshold: number;
+    mediumThreshold: number;
+    highOffset: number;
+    mediumOffset: number;
+    lowOffset: number;
+    minOffset: number;
+    maxOffset: number;
+  };
+  registerBias: {
+    maniaShiftSemitones: number;
+    midiMin: number;
+    midiMaxForMin: number;
+    minimumSpan: number;
+    midiMax: number;
+  };
+  candidateOctaveSearch: {
+    min: number;
+    max: number;
+  };
+  styleRotationMinSeconds: number;
+  stylePanOffsetScale: number;
+  lowpass: {
+    midiBase: number;
+    midiRange: number;
+    midiLiftHz: number;
+    expressionBase: number;
+    expressionWeight: number;
+  };
   styleRotationSeconds: number;
+  styleRotationBars: number;
   chordBars: number;
   supportBarSpacing: number;
   supportBarOffset: number;
@@ -38,13 +186,16 @@ interface GardenAudioGenerativePianoConfig {
   highActivityExtraThreshold: number;
   noteScorePreferenceWeight: number;
   noteScoreRegisterWeight: number;
+  noteScoreChordToneWeight: number;
   noteScoreRepeatPenalty: number;
   gestureAccentMinIntervalSeconds: number;
   strokeAccentMinIntervalSeconds: number;
+  strokeAccentMinSteps: number;
   strokeAccentThreshold: number;
   stingerDurationSeconds: number;
   stingerSpacingSeconds: number;
   maxBrushPhraseLayers: number;
+  maxBrushStreamNotesPerBar: number;
   brushLayerBaseSeconds: number;
   brushLayerEnergySeconds: number;
   brushLayerMinIntensity: number;
@@ -80,10 +231,15 @@ export interface GardenAudioConfig {
     feedbackMin: number;
     outputActivityWeight: number;
     outputBase: number;
+    outputActivityDuck: number;
     timeRampSeconds: number;
+    feedbackHighPassHz: number;
+    feedbackLowPassHz: number;
+    returnLowPassHz: number;
   };
   piano: {
     maxVoices: number;
+    filterType: BiquadFilterType;
     gain: number;
     sustainSeconds: number;
     sustainLevel: number;
@@ -103,6 +259,12 @@ export interface GardenAudioConfig {
     tailStopExtraSeconds: number;
     voiceStealFadeSeconds: number;
     voiceStealStopSeconds: number;
+    sampleBaseUrl: string;
+    preloadDecode: {
+      channels: number;
+      frames: number;
+      sampleRateHz: number;
+    };
   };
   rhythm: {
     bpm: number;
@@ -117,6 +279,8 @@ export interface GardenAudioConfig {
     filterMinHz: number;
     filterMaxHz: number;
     durationSeconds: number;
+    pan: number;
+    pianoActivity: number;
   };
   energy: {
     attackSeconds: number;
@@ -134,12 +298,37 @@ export interface GardenAudioConfig {
     noiseMin: number;
     unlockTickFrequencyHz: number;
     unlockTickSeconds: number;
+    unlockTickType: OscillatorType;
+    latencyHint: AudioContextLatencyCategory;
+    outputFilterType: BiquadFilterType;
+    noiseBufferChannels: number;
+    noiseBufferDurationSeconds: number;
+    pianoBusGains: Record<PianoNoteRole, number>;
+    pianoBusActivityDucking: Record<PianoNoteRole, number>;
+    noiseBusGain: number;
+    compressor: {
+      thresholdDb: number;
+      kneeDb: number;
+      ratio: number;
+      attackSeconds: number;
+      releaseSeconds: number;
+    };
   };
   input: {
     distanceWindowForFullActivityPixels: number;
     distanceWindowSeconds: number;
     fallbackFrameSeconds: number;
+    fullActivitySpeed: number;
+    activityNoiseFloorSpeed: number;
+    activityCurve: number;
+    activitySoftCeiling: number;
+    activityAttackSeconds: number;
+    activityReleaseSeconds: number;
+    minAudibleDistance: number;
     manicActivityThreshold: number;
+    manicReleaseThreshold: number;
+    maniaSmoothingSeconds: number;
+    minElapsedSeconds: number;
   };
   muteGain: number;
   muteRampSeconds: number;
@@ -149,6 +338,7 @@ export interface GardenAudioConfig {
     offsetRandomSeconds: number;
     scheduleAheadSeconds: number;
     silentGain: number;
+    filterType: BiquadFilterType;
   };
   startDelaySeconds: number;
   vibeChangeStingerMinIntervalSeconds: number;
diff --git a/src/audio/garden-audio-gesture-state.test.ts b/src/audio/garden-audio-gesture-state.test.ts
index 712f98a..20ee038 100644
--- a/src/audio/garden-audio-gesture-state.test.ts
+++ b/src/audio/garden-audio-gesture-state.test.ts
@@ -2,38 +2,94 @@ import { describe, expect, it } from 'vitest';
 
 import { gardenAudioConfig } from './garden-audio-config';
 import { GardenAudioGestureState } from './garden-audio-gesture-state';
+import type { GardenAudioStrokeMetrics } from './garden-audio-input';
+
+const makeMetrics = ({
+  elapsedSeconds,
+  normalizedDistance,
+}: {
+  elapsedSeconds: number;
+  normalizedDistance: number;
+}): GardenAudioStrokeMetrics => ({
+  distancePixels: normalizedDistance * 1000,
+  elapsedSeconds,
+  normalizedDistance,
+  normalizedSpeed: normalizedDistance / elapsedSeconds,
+});
 
 describe('GardenAudioGestureState', () => {
-  it('uses only distance accumulated in the last half second', () => {
+  it('ignores tiny jitter below the activity speed floor', () => {
     const state = new GardenAudioGestureState(gardenAudioConfig.input);
 
     state.beginGesture();
 
     expect(
       state.recordStroke({
-        metrics: {
-          distancePixels: 70,
+        metrics: makeMetrics({
           elapsedSeconds: 0.1,
-        },
-      }).activity
-    ).toBeCloseTo(0.5);
-
-    expect(
-      state.recordStroke({
-        metrics: {
-          distancePixels: 70,
-          elapsedSeconds: 0.1,
-        },
-      }).activity
-    ).toBe(1);
-
-    expect(
-      state.recordStroke({
-        metrics: {
-          distancePixels: 0,
-          elapsedSeconds: 0.51,
-        },
+          normalizedDistance: 0.001,
+        }),
       }).activity
     ).toBe(0);
   });
+
+  it('normalizes equal drawing speeds across pointer sample rates', () => {
+    const lowRate = new GardenAudioGestureState(gardenAudioConfig.input);
+    const highRate = new GardenAudioGestureState(gardenAudioConfig.input);
+
+    lowRate.beginGesture();
+    highRate.beginGesture();
+
+    const lowRateFrame = lowRate.recordStroke({
+      metrics: makeMetrics({
+        elapsedSeconds: 0.1,
+        normalizedDistance: 0.07,
+      }),
+    });
+
+    let highRateFrame = { activity: 0, maniaAmount: 0 };
+    for (let index = 0; index < 5; index += 1) {
+      highRateFrame = highRate.recordStroke({
+        metrics: makeMetrics({
+          elapsedSeconds: 0.02,
+          normalizedDistance: 0.014,
+        }),
+      });
+    }
+
+    expect(highRateFrame.activity).toBeCloseTo(lowRateFrame.activity, 5);
+  });
+
+  it('holds mania with hysteresis before releasing', () => {
+    const state = new GardenAudioGestureState(gardenAudioConfig.input);
+
+    state.beginGesture();
+
+    const manicFrame = state.recordStroke({
+      metrics: makeMetrics({
+        elapsedSeconds: 0.25,
+        normalizedDistance: 0.3,
+      }),
+    });
+
+    expect(manicFrame.maniaAmount).toBeGreaterThan(0);
+
+    const heldFrame = state.recordStroke({
+      metrics: makeMetrics({
+        elapsedSeconds: 0.06,
+        normalizedDistance: 0.04,
+      }),
+    });
+
+    expect(heldFrame.maniaAmount).toBeGreaterThan(0);
+
+    const releasedFrame = state.recordStroke({
+      metrics: makeMetrics({
+        elapsedSeconds: 0.7,
+        normalizedDistance: 0,
+      }),
+    });
+
+    expect(releasedFrame.maniaAmount).toBeLessThan(heldFrame.maniaAmount);
+  });
 });
diff --git a/src/audio/garden-audio-gesture-state.ts b/src/audio/garden-audio-gesture-state.ts
index 984f9a6..4551adb 100644
--- a/src/audio/garden-audio-gesture-state.ts
+++ b/src/audio/garden-audio-gesture-state.ts
@@ -1,4 +1,4 @@
-import { clamp01 } from '../utils/clamp';
+import { clamp, clamp01 } from '../utils/clamp';
 import type { GardenAudioConfig } from './garden-audio-config';
 import type { GardenAudioStrokeMetrics } from './garden-audio-input';
 
@@ -7,14 +7,11 @@ interface GardenAudioGestureFrame {
   maniaAmount: number;
 }
 
-interface GestureDistanceSample {
-  at: number;
-  distancePixels: number;
-}
-
 export class GardenAudioGestureState {
-  private readonly samples: Array<GestureDistanceSample> = [];
   private gestureClockSeconds = 0;
+  private activity = 0;
+  private maniaAmount = 0;
+  private isManic = false;
 
   public constructor(private readonly inputConfig: GardenAudioConfig['input']) {}
 
@@ -33,41 +30,79 @@ export class GardenAudioGestureState {
   }): GardenAudioGestureFrame {
     this.gestureClockSeconds += metrics.elapsedSeconds;
 
-    if (metrics.distancePixels > 0) {
-      this.samples.push({
-        at: this.gestureClockSeconds,
-        distancePixels: metrics.distancePixels,
-      });
-    }
-    this.trimSamples();
-
-    const windowDistancePixels = this.samples.reduce(
-      (total, sample) => total + sample.distancePixels,
-      0
+    const targetActivity = this.getTargetActivity(metrics);
+    const activityTimeConstant =
+      targetActivity > this.activity
+        ? this.inputConfig.activityAttackSeconds
+        : this.inputConfig.activityReleaseSeconds;
+    this.activity = approach(
+      this.activity,
+      targetActivity,
+      metrics.elapsedSeconds,
+      activityTimeConstant
     );
-    const activity = clamp01(
-      windowDistancePixels / this.inputConfig.distanceWindowForFullActivityPixels
+
+    if (this.activity >= this.inputConfig.manicActivityThreshold) {
+      this.isManic = true;
+    } else if (this.activity <= this.inputConfig.manicReleaseThreshold) {
+      this.isManic = false;
+    }
+
+    const maniaTarget = this.isManic
+      ? smoothstep(this.inputConfig.manicReleaseThreshold, 1, this.activity)
+      : 0;
+    this.maniaAmount = approach(
+      this.maniaAmount,
+      maniaTarget,
+      metrics.elapsedSeconds,
+      this.inputConfig.maniaSmoothingSeconds
     );
 
     return {
-      activity,
-      maniaAmount: smoothstep(this.inputConfig.manicActivityThreshold, 1, activity),
+      activity: this.activity,
+      maniaAmount: this.maniaAmount,
     };
   }
 
   public reset(): void {
-    this.samples.length = 0;
     this.gestureClockSeconds = 0;
+    this.activity = 0;
+    this.maniaAmount = 0;
+    this.isManic = false;
   }
 
-  private trimSamples(): void {
-    const earliest = this.gestureClockSeconds - this.inputConfig.distanceWindowSeconds;
-    while (this.samples.length > 0 && this.samples[0].at < earliest) {
-      this.samples.shift();
-    }
+  private getTargetActivity(metrics: GardenAudioStrokeMetrics): number {
+    const normalizedSpeed = Math.max(0, metrics.normalizedSpeed);
+    const activeSpeed = Math.max(
+      this.inputConfig.activityNoiseFloorSpeed,
+      this.inputConfig.fullActivitySpeed
+    );
+    const speedAmount = clamp01(
+      (normalizedSpeed - this.inputConfig.activityNoiseFloorSpeed) /
+        (activeSpeed - this.inputConfig.activityNoiseFloorSpeed)
+    );
+    const distanceAmount = clamp01(
+      metrics.normalizedDistance / this.inputConfig.minAudibleDistance
+    );
+    const activity = Math.pow(
+      speedAmount,
+      Math.max(0.001, this.inputConfig.activityCurve)
+    );
+
+    return clamp(activity * distanceAmount, 0, this.inputConfig.activitySoftCeiling);
   }
 }
 
+const approach = (
+  current: number,
+  target: number,
+  elapsedSeconds: number,
+  timeConstantSeconds: number
+): number => {
+  const amount = 1 - Math.exp(-elapsedSeconds / Math.max(0.001, timeConstantSeconds));
+  return current + (target - current) * amount;
+};
+
 const smoothstep = (edge0: number, edge1: number, value: number): number => {
   const amount = clamp01((value - edge0) / (edge1 - edge0));
   return amount * amount * (3 - 2 * amount);
diff --git a/src/audio/garden-audio-graph.test.ts b/src/audio/garden-audio-graph.test.ts
new file mode 100644
index 0000000..8d5031d
--- /dev/null
+++ b/src/audio/garden-audio-graph.test.ts
@@ -0,0 +1,92 @@
+import { afterEach, describe, expect, it, vi } from 'vitest';
+
+import { VIBE_PRESETS } from '../vibes';
+import { gardenAudioConfig } from './garden-audio-config';
+import { GardenAudioGraph } from './garden-audio-graph';
+
+class FakeAudioParam {
+  public value = 0;
+  public setTargetAtTime = vi.fn();
+}
+
+class FakeAudioNode {
+  public readonly gain = new FakeAudioParam();
+  public readonly frequency = new FakeAudioParam();
+  public readonly threshold = new FakeAudioParam();
+  public readonly knee = new FakeAudioParam();
+  public readonly ratio = new FakeAudioParam();
+  public readonly attack = new FakeAudioParam();
+  public readonly release = new FakeAudioParam();
+  public readonly delayTime = new FakeAudioParam();
+  public readonly connections: Array<unknown> = [];
+  public type = '';
+
+  public connect(target: unknown): unknown {
+    this.connections.push(target);
+    return target;
+  }
+}
+
+class FakeAudioBuffer {
+  private readonly data: Float32Array;
+
+  public constructor(length: number) {
+    this.data = new Float32Array(length);
+  }
+
+  public getChannelData(): Float32Array {
+    return this.data;
+  }
+}
+
+class FakeAudioContext {
+  public readonly currentTime = 1;
+  public readonly destination = new FakeAudioNode() as unknown as AudioDestinationNode;
+  public readonly sampleRate = 16;
+  public readonly state = 'running';
+  public readonly compressors: Array<FakeAudioNode> = [];
+
+  public createGain(): GainNode {
+    return new FakeAudioNode() as unknown as GainNode;
+  }
+
+  public createBiquadFilter(): BiquadFilterNode {
+    return new FakeAudioNode() as unknown as BiquadFilterNode;
+  }
+
+  public createDelay(): DelayNode {
+    return new FakeAudioNode() as unknown as DelayNode;
+  }
+
+  public createDynamicsCompressor(): DynamicsCompressorNode {
+    const node = new FakeAudioNode();
+    this.compressors.push(node);
+    return node as unknown as DynamicsCompressorNode;
+  }
+
+  public createBuffer(_channels: number, length: number): AudioBuffer {
+    return new FakeAudioBuffer(length) as unknown as AudioBuffer;
+  }
+}
+
+describe('GardenAudioGraph', () => {
+  afterEach(() => {
+    vi.unstubAllGlobals();
+  });
+
+  it('builds controlled output, role buses, and delay automation', () => {
+    vi.stubGlobal('AudioContext', FakeAudioContext);
+    const graph = new GardenAudioGraph(gardenAudioConfig);
+    const context = graph.ensureContext(true) as unknown as FakeAudioContext;
+
+    expect(context.compressors).toHaveLength(1);
+    expect(graph.getPianoBus('pad')).not.toBeNull();
+    expect(graph.getPianoBus('pad')).not.toBe(graph.getPianoBus('gesture'));
+    expect(graph.noiseBus).not.toBeNull();
+
+    graph.updateDelay(VIBE_PRESETS[0].audio, 1);
+
+    expect(graph.getPianoBus('pad')?.gain.setTargetAtTime).toHaveBeenCalled();
+    expect(graph.getPianoBus('brush')?.gain.setTargetAtTime).toHaveBeenCalled();
+  });
+});
diff --git a/src/audio/garden-audio-graph.ts b/src/audio/garden-audio-graph.ts
index 0364c21..cd6c4bb 100644
--- a/src/audio/garden-audio-graph.ts
+++ b/src/audio/garden-audio-graph.ts
@@ -1,16 +1,19 @@
 import { clamp } from '../utils/clamp';
 import { GardenAudioConfig, GardenAudioVibeProfile } from './garden-audio-config';
+import type { PianoNoteRole } from './garden-audio-types';
 
 export class GardenAudioGraph {
   public context: AudioContext | null = null;
   public eventBus: GainNode | null = null;
   public delayInput: GainNode | null = null;
+  public noiseBus: GainNode | null = null;
   public noiseBuffer: AudioBuffer | null = null;
 
   private masterGain: GainNode | null = null;
   private delayNode: DelayNode | null = null;
   private delayFeedback: GainNode | null = null;
   private delayOutput: GainNode | null = null;
+  private readonly pianoBuses = new Map<PianoNoteRole, GainNode>();
 
   public constructor(private readonly config: GardenAudioConfig) {}
 
@@ -30,19 +33,28 @@ export class GardenAudioGraph {
 
     let context: AudioContext;
     try {
-      context = new AudioContextConstructor({ latencyHint: 'interactive' });
+      context = new AudioContextConstructor({
+        latencyHint: this.config.graph.latencyHint,
+      });
     } catch {
       context = new AudioContextConstructor();
     }
     const masterGain = context.createGain();
     const highPass = context.createBiquadFilter();
+    const compressor = context.createDynamicsCompressor();
 
     masterGain.gain.value = 0;
-    highPass.type = 'highpass';
+    highPass.type = this.config.graph.outputFilterType;
     highPass.frequency.value = this.config.highPassFrequencyHz;
+    compressor.threshold.value = this.config.graph.compressor.thresholdDb;
+    compressor.knee.value = this.config.graph.compressor.kneeDb;
+    compressor.ratio.value = this.config.graph.compressor.ratio;
+    compressor.attack.value = this.config.graph.compressor.attackSeconds;
+    compressor.release.value = this.config.graph.compressor.releaseSeconds;
 
     masterGain.connect(highPass);
-    highPass.connect(context.destination);
+    highPass.connect(compressor);
+    compressor.connect(context.destination);
 
     this.context = context;
     this.masterGain = masterGain;
@@ -65,7 +77,7 @@ export class GardenAudioGraph {
     const source = this.context.createOscillator();
     const gain = this.context.createGain();
 
-    source.type = 'sine';
+    source.type = this.config.graph.unlockTickType;
     source.frequency.setValueAtTime(this.config.graph.unlockTickFrequencyHz, now);
     gain.gain.setValueAtTime(this.config.piano.minGain, now);
     gain.gain.exponentialRampToValueAtTime(
@@ -116,6 +128,7 @@ export class GardenAudioGraph {
     }
 
     const now = this.context.currentTime;
+    const normalizedActivity = clamp(activity, 0, 1);
     this.delayNode.delayTime.setTargetAtTime(
       this.config.delay.timeSeconds * profile.delayTimeMultiplier,
       now,
@@ -123,7 +136,8 @@ export class GardenAudioGraph {
     );
     this.delayFeedback.gain.setTargetAtTime(
       clamp(
-        this.config.delay.feedback + activity * this.config.delay.activityFeedbackWeight,
+        this.config.delay.feedback +
+          normalizedActivity * this.config.delay.activityFeedbackWeight,
         this.config.delay.feedbackMin,
         this.config.delay.feedbackMax
       ),
@@ -133,10 +147,16 @@ export class GardenAudioGraph {
     this.delayOutput.gain.setTargetAtTime(
       this.config.delay.wetGain *
         (this.config.delay.outputBase +
-          activity * this.config.delay.outputActivityWeight),
+          normalizedActivity * this.config.delay.outputActivityWeight) *
+        (1 - normalizedActivity * this.config.delay.outputActivityDuck),
       now,
       this.config.updateRampSeconds
     );
+    this.updatePianoBusGains(normalizedActivity, now);
+  }
+
+  public getPianoBus(role: PianoNoteRole | undefined): GainNode | null {
+    return this.pianoBuses.get(role ?? 'gesture') ?? this.eventBus;
   }
 
   public async close(): Promise<void> {
@@ -165,15 +185,27 @@ export class GardenAudioGraph {
     const delayNode = context.createDelay(this.config.graph.delayMaxSeconds);
     const delayFeedback = context.createGain();
     const delayOutput = context.createGain();
+    const feedbackHighPass = context.createBiquadFilter();
+    const feedbackLowPass = context.createBiquadFilter();
+    const returnLowPass = context.createBiquadFilter();
 
     delayNode.delayTime.value = this.config.delay.timeSeconds;
     delayFeedback.gain.value = this.config.delay.feedback;
     delayOutput.gain.value = this.config.delay.wetGain;
+    feedbackHighPass.type = 'highpass';
+    feedbackHighPass.frequency.value = this.config.delay.feedbackHighPassHz;
+    feedbackLowPass.type = 'lowpass';
+    feedbackLowPass.frequency.value = this.config.delay.feedbackLowPassHz;
+    returnLowPass.type = 'lowpass';
+    returnLowPass.frequency.value = this.config.delay.returnLowPassHz;
 
     delayInput.connect(delayNode);
-    delayNode.connect(delayFeedback);
+    delayNode.connect(feedbackHighPass);
+    feedbackHighPass.connect(feedbackLowPass);
+    feedbackLowPass.connect(delayFeedback);
     delayFeedback.connect(delayNode);
-    delayNode.connect(delayOutput);
+    delayNode.connect(returnLowPass);
+    returnLowPass.connect(delayOutput);
     delayOutput.connect(masterGain);
 
     this.delayInput = delayInput;
@@ -183,13 +215,50 @@ export class GardenAudioGraph {
   }
 
   private createBuses(context: AudioContext, masterGain: GainNode): void {
-    this.eventBus = context.createGain();
-    this.eventBus.gain.value = this.config.graph.eventBusGain;
-    this.eventBus.connect(masterGain);
+    const eventBus = context.createGain();
+    eventBus.gain.value = this.config.graph.eventBusGain;
+    eventBus.connect(masterGain);
+    this.eventBus = eventBus;
+    this.pianoBuses.clear();
+
+    (Object.keys(this.config.graph.pianoBusGains) as Array<PianoNoteRole>).forEach(
+      (role) => {
+        const bus = context.createGain();
+        bus.gain.value = this.config.graph.pianoBusGains[role];
+        bus.connect(eventBus);
+        this.pianoBuses.set(role, bus);
+      }
+    );
+
+    this.noiseBus = context.createGain();
+    this.noiseBus.gain.value = this.config.graph.noiseBusGain;
+    this.noiseBus.connect(eventBus);
+  }
+
+  private updatePianoBusGains(activity: number, now: number): void {
+    this.pianoBuses.forEach((bus, role) => {
+      const baseGain = this.config.graph.pianoBusGains[role];
+      const ducking = this.config.graph.pianoBusActivityDucking[role];
+      bus.gain.setTargetAtTime(
+        Math.max(0, baseGain * (1 - activity * ducking)),
+        now,
+        this.config.updateRampSeconds
+      );
+    });
   }
 
   private createNoiseBuffer(context: AudioContext): AudioBuffer {
-    const buffer = context.createBuffer(1, context.sampleRate, context.sampleRate);
+    const buffer = context.createBuffer(
+      appPositiveInteger(this.config.graph.noiseBufferChannels),
+      Math.max(
+        1,
+        Math.floor(
+          context.sampleRate *
+            Math.max(0.001, this.config.graph.noiseBufferDurationSeconds)
+        )
+      ),
+      context.sampleRate
+    );
     const data = buffer.getChannelData(0);
 
     for (let index = 0; index < data.length; index++) {
@@ -205,10 +274,15 @@ export class GardenAudioGraph {
     this.context = null;
     this.eventBus = null;
     this.delayInput = null;
+    this.noiseBus = null;
     this.noiseBuffer = null;
     this.masterGain = null;
     this.delayNode = null;
     this.delayFeedback = null;
     this.delayOutput = null;
+    this.pianoBuses.clear();
   }
 }
+
+const appPositiveInteger = (value: number): number =>
+  Math.max(1, Math.floor(Number.isFinite(value) ? value : 1));
diff --git a/src/audio/garden-audio-input.test.ts b/src/audio/garden-audio-input.test.ts
new file mode 100644
index 0000000..32cc1f6
--- /dev/null
+++ b/src/audio/garden-audio-input.test.ts
@@ -0,0 +1,52 @@
+import { describe, expect, it } from 'vitest';
+
+import { gardenAudioConfig } from './garden-audio-config';
+import { getStrokeMetrics } from './garden-audio-input';
+
+describe('getStrokeMetrics', () => {
+  it('normalizes stroke distance against canvas size', () => {
+    const standardDensity = getStrokeMetrics(
+      {
+        vibe: {} as never,
+        from: [0, 0],
+        to: [100, 0],
+        canvasSize: [1000, 500],
+        elapsedSeconds: 0.1,
+        isErasing: false,
+      },
+      gardenAudioConfig.input
+    );
+    const highDensity = getStrokeMetrics(
+      {
+        vibe: {} as never,
+        from: [0, 0],
+        to: [200, 0],
+        canvasSize: [2000, 1000],
+        elapsedSeconds: 0.1,
+        isErasing: false,
+      },
+      gardenAudioConfig.input
+    );
+
+    expect(highDensity.normalizedDistance).toBeCloseTo(
+      standardDensity.normalizedDistance
+    );
+    expect(highDensity.normalizedSpeed).toBeCloseTo(standardDensity.normalizedSpeed);
+  });
+
+  it('uses configured elapsed-time floors for missing or invalid samples', () => {
+    const metrics = getStrokeMetrics(
+      {
+        vibe: {} as never,
+        from: [0, 0],
+        to: [10, 0],
+        elapsedSeconds: 0,
+        isErasing: false,
+      },
+      gardenAudioConfig.input
+    );
+
+    expect(metrics.elapsedSeconds).toBe(gardenAudioConfig.input.fallbackFrameSeconds);
+    expect(Number.isFinite(metrics.normalizedSpeed)).toBe(true);
+  });
+});
diff --git a/src/audio/garden-audio-input.ts b/src/audio/garden-audio-input.ts
index fb38f93..cf5f2e2 100644
--- a/src/audio/garden-audio-input.ts
+++ b/src/audio/garden-audio-input.ts
@@ -4,6 +4,8 @@ import type { GardenAudioStroke } from './garden-audio-types';
 export interface GardenAudioStrokeMetrics {
   distancePixels: number;
   elapsedSeconds: number;
+  normalizedDistance: number;
+  normalizedSpeed: number;
 }
 
 export const getStrokeMetrics = (
@@ -12,10 +14,16 @@ export const getStrokeMetrics = (
 ): GardenAudioStrokeMetrics => {
   const dx = stroke.to[0] - stroke.from[0];
   const dy = stroke.to[1] - stroke.from[1];
+  const distancePixels = Math.hypot(dx, dy);
+  const elapsedSeconds = getElapsedSeconds(stroke, inputConfig);
+  const normalizedDistance =
+    distancePixels / getStrokeNormalizationPixels(stroke, inputConfig);
 
   return {
-    distancePixels: Math.hypot(dx, dy),
-    elapsedSeconds: getElapsedSeconds(stroke, inputConfig),
+    distancePixels,
+    elapsedSeconds,
+    normalizedDistance,
+    normalizedSpeed: normalizedDistance / elapsedSeconds,
   };
 };
 
@@ -28,8 +36,28 @@ const getElapsedSeconds = (
     Number.isFinite(stroke.elapsedSeconds) &&
     stroke.elapsedSeconds > 0
   ) {
-    return Math.max(0.001, stroke.elapsedSeconds);
+    return Math.max(inputConfig.minElapsedSeconds, stroke.elapsedSeconds);
   }
 
   return inputConfig.fallbackFrameSeconds;
 };
+
+const getStrokeNormalizationPixels = (
+  stroke: GardenAudioStroke,
+  inputConfig: GardenAudioConfig['input']
+): number => {
+  const width = stroke.canvasSize?.[0];
+  const height = stroke.canvasSize?.[1];
+  if (
+    width !== undefined &&
+    height !== undefined &&
+    Number.isFinite(width) &&
+    Number.isFinite(height) &&
+    width > 0 &&
+    height > 0
+  ) {
+    return Math.max(1, Math.min(width, height));
+  }
+
+  return Math.max(1, inputConfig.distanceWindowForFullActivityPixels);
+};
diff --git a/src/audio/garden-audio-music.ts b/src/audio/garden-audio-music.ts
index 563c76b..417065c 100644
--- a/src/audio/garden-audio-music.ts
+++ b/src/audio/garden-audio-music.ts
@@ -1,5 +1,9 @@
 import { VibePreset } from '../vibes';
-import { GardenAudioChord, GardenAudioVibeProfile } from './garden-audio-config';
+import {
+  GardenAudioChord,
+  gardenAudioConfig,
+  GardenAudioVibeProfile,
+} from './garden-audio-config';
 
 export const getVibeProfile = (vibe: VibePreset): GardenAudioVibeProfile => vibe.audio;
 
@@ -8,10 +12,14 @@ export const getChordIntervals = (
   openVoicing: boolean
 ): Array<number> => {
   if (openVoicing) {
-    return chord.quality === 'major' ? [0, 7, 12, 16] : [0, 7, 12, 15];
+    return chord.quality === 'major'
+      ? gardenAudioConfig.generativePiano.chordVoicings.majorOpen
+      : gardenAudioConfig.generativePiano.chordVoicings.minorOpen;
   }
 
-  return chord.quality === 'major' ? [0, 4, 7, 12, 16] : [0, 3, 7, 12, 15];
+  return chord.quality === 'major'
+    ? gardenAudioConfig.generativePiano.chordVoicings.majorClosed
+    : gardenAudioConfig.generativePiano.chordVoicings.minorClosed;
 };
 
 export const degreeToSemitone = (
@@ -21,5 +29,7 @@ export const degreeToSemitone = (
   const scaleIndex =
     ((degree % profile.scale.length) + profile.scale.length) % profile.scale.length;
   const octave = Math.floor(degree / profile.scale.length);
-  return profile.scale[scaleIndex] + octave * 12;
+  return (
+    profile.scale[scaleIndex] + octave * gardenAudioConfig.piano.pitchSemitonesPerOctave
+  );
 };
diff --git a/src/audio/garden-audio-types.ts b/src/audio/garden-audio-types.ts
index 2eb9793..b0d58a9 100644
--- a/src/audio/garden-audio-types.ts
+++ b/src/audio/garden-audio-types.ts
@@ -9,6 +9,7 @@ export interface GardenAudioStroke {
   vibe: VibePreset;
   from: ArrayLike<number>;
   to: ArrayLike<number>;
+  canvasSize?: ArrayLike<number>;
   isErasing: boolean;
   elapsedSeconds?: number;
 }
@@ -34,10 +35,19 @@ export interface PianoNote {
   startTime: number;
   durationSeconds: number;
   pan: number;
+  role?: PianoNoteRole;
   delaySend?: number;
   lowpassHz?: number;
 }
 
+export type PianoNoteRole =
+  | 'pad'
+  | 'support'
+  | 'texture'
+  | 'gesture'
+  | 'brush'
+  | 'stinger';
+
 export interface NoiseBurst {
   startTime: number;
   durationSeconds: number;
diff --git a/src/audio/garden-audio.test.ts b/src/audio/garden-audio.test.ts
index 4e8aa58..ba15c57 100644
--- a/src/audio/garden-audio.test.ts
+++ b/src/audio/garden-audio.test.ts
@@ -14,6 +14,7 @@ const calls = {
   resumed: 0,
   sourcesStarted: 0,
   sources: [] as Array<FakeScheduledSourceNode>,
+  gains: [] as Array<FakeAudioNode>,
 };
 
 let contextState: AudioContextState = 'suspended';
@@ -80,7 +81,9 @@ class FakeAudioContext {
   }
 
   public createGain(): GainNode {
-    return new FakeAudioNode() as unknown as GainNode;
+    const node = new FakeAudioNode();
+    calls.gains.push(node);
+    return node as unknown as GainNode;
   }
 
   public createBiquadFilter(): BiquadFilterNode {
@@ -91,6 +94,10 @@ class FakeAudioContext {
     return new FakeAudioNode() as unknown as DelayNode;
   }
 
+  public createDynamicsCompressor(): DynamicsCompressorNode {
+    return new FakeAudioNode() as unknown as DynamicsCompressorNode;
+  }
+
   public createStereoPanner(): StereoPannerNode {
     return new FakeAudioNode() as unknown as StereoPannerNode;
   }
@@ -151,6 +158,7 @@ describe('GardenAudio startup policy', () => {
     calls.resumed = 0;
     calls.sourcesStarted = 0;
     calls.sources = [];
+    calls.gains = [];
     contextState = 'suspended';
     resumeError = null;
     vi.stubGlobal('AudioContext', FakeAudioContext);
@@ -210,6 +218,40 @@ describe('GardenAudio startup policy', () => {
     });
   });
 
+  it('updates live master gain from adjustable volume', () => {
+    const config = makeConfig();
+    const audio = new GardenAudio(config);
+    const vibe = VIBE_PRESETS[0];
+
+    audio.start(vibe, { userGesture: true });
+    const masterGain = calls.gains[0]?.gain;
+    if (!masterGain) {
+      throw new Error('Missing fake master gain');
+    }
+
+    audio.setMasterVolume(0.2);
+
+    expect(masterGain.setTargetAtTime).toHaveBeenLastCalledWith(
+      0.2,
+      1,
+      config.updateRampSeconds
+    );
+
+    audio.setMuted(true);
+    const mutedCallCount = masterGain.setTargetAtTime.mock.calls.length;
+    audio.setMasterVolume(0.8);
+
+    expect(masterGain.setTargetAtTime).toHaveBeenCalledTimes(mutedCallCount);
+
+    audio.setMuted(false);
+
+    expect(masterGain.setTargetAtTime).toHaveBeenLastCalledWith(
+      0.8,
+      1,
+      config.fadeInSeconds
+    );
+  });
+
   it('stays silent without piano samples while preserving eraser noise', () => {
     const audio = new GardenAudio(makeConfig());
     const vibe = VIBE_PRESETS[0];
diff --git a/src/audio/garden-audio.ts b/src/audio/garden-audio.ts
index 9e55a6b..af4e9f4 100644
--- a/src/audio/garden-audio.ts
+++ b/src/audio/garden-audio.ts
@@ -34,12 +34,14 @@ export class GardenAudio {
   private hasStarted = false;
   private isDestroyed = false;
   private isMuted = false;
+  private masterVolume: number;
   private isGestureActive = false;
   private hasQueuedPianoLoad = false;
   private lastEraserAt = Number.NEGATIVE_INFINITY;
   private lastVibeStingerAt = Number.NEGATIVE_INFINITY;
 
   public constructor(private readonly config: GardenAudioConfig) {
+    this.masterVolume = clamp01(config.masterVolume);
     this.graph = new GardenAudioGraph(config);
     this.piano = new PianoSampler(config, this.graph);
     this.noise = new NoiseBurstPlayer(config, this.graph);
@@ -81,7 +83,7 @@ export class GardenAudio {
         .then(() => {
           if (this.graph.context === context && !this.isDestroyed && !this.isMuted) {
             this.graph.unlock();
-            this.graph.setMasterGain(this.config.masterVolume, startupRampSeconds);
+            this.graph.setMasterGain(this.masterVolume, startupRampSeconds);
           }
         })
         .catch((error) => {
@@ -95,7 +97,7 @@ export class GardenAudio {
     this.hasStarted = true;
     this.applyVibe(vibe);
     this.pianoEngine.prime(context.currentTime);
-    this.graph.setMasterGain(this.config.masterVolume, startupRampSeconds);
+    this.graph.setMasterGain(this.masterVolume, startupRampSeconds);
 
     if (!this.hasQueuedPianoLoad) {
       this.hasQueuedPianoLoad = true;
@@ -132,13 +134,24 @@ export class GardenAudio {
   }
 
   public setMuted(isMuted: boolean): void {
+    if (this.isMuted === isMuted) {
+      return;
+    }
+
     this.isMuted = isMuted;
     this.graph.setMasterGain(
-      isMuted ? this.config.muteGain : this.config.masterVolume,
+      isMuted ? this.config.muteGain : this.masterVolume,
       isMuted ? this.config.muteRampSeconds : this.config.fadeInSeconds
     );
   }
 
+  public setMasterVolume(masterVolume: number): void {
+    this.masterVolume = clamp01(masterVolume);
+    if (!this.isMuted) {
+      this.graph.setMasterGain(this.masterVolume, this.config.updateRampSeconds);
+    }
+  }
+
   public beginGesture(): void {
     const context = this.graph.context;
     if (!context) {
@@ -174,7 +187,9 @@ export class GardenAudio {
     this.pianoEngine.renderLookahead({
       vibe: snapshot.vibe,
       now: context.currentTime,
-      activity: snapshot.isErasing ? 0 : this.energy.getLevel(),
+      activity: snapshot.isErasing
+        ? this.config.eraser.pianoActivity
+        : this.energy.getLevel(),
     });
     this.updateDelay(snapshot);
   }
@@ -267,7 +282,7 @@ export class GardenAudio {
         durationSeconds: this.config.eraser.durationSeconds,
         gain: this.config.eraser.noiseGain * distanceActivity,
         filterHz,
-        pan: 0,
+        pan: this.config.eraser.pan,
       });
     }
   }
diff --git a/src/audio/generative-piano.test.ts b/src/audio/generative-piano.test.ts
index 1f807a8..59b4135 100644
--- a/src/audio/generative-piano.test.ts
+++ b/src/audio/generative-piano.test.ts
@@ -49,6 +49,14 @@ const countNotesBetween = (
   notes.filter((note) => note.startTime >= startSeconds && note.startTime < endSeconds)
     .length;
 
+const getNoteKey = (note: PianoNote): string =>
+  [
+    note.startTime.toFixed(3),
+    note.midi,
+    note.role ?? 'none',
+    note.pan.toFixed(3),
+  ].join(':');
+
 describe('GenerativePianoEngine', () => {
   it('plays quiet background music even when the garden is idle', () => {
     const { engine, notes } = makeEngine();
@@ -187,4 +195,55 @@ describe('GenerativePianoEngine', () => {
 
     expect(second.notes).toEqual(first.notes);
   });
+
+  it('does not duplicate notes across overlapping lookahead windows', () => {
+    const { engine, notes } = makeEngine();
+
+    engine.renderLookahead({
+      vibe: VIBE_PRESETS[0],
+      now: 0,
+      activity: 0.72,
+      lookaheadSeconds: getBeatSeconds() * 2,
+    });
+    engine.renderLookahead({
+      vibe: VIBE_PRESETS[0],
+      now: getBeatSeconds() * 0.5,
+      activity: 0.72,
+      lookaheadSeconds: getBeatSeconds() * 2,
+    });
+
+    const noteKeys = notes.map(getNoteKey);
+    expect(new Set(noteKeys).size).toBe(noteKeys.length);
+  });
+
+  it('keeps generated notes inside the audio contract', () => {
+    const { engine, notes } = makeEngine();
+
+    VIBE_PRESETS.forEach((vibe) => {
+      engine.cue(0);
+      engine.renderLookahead({
+        vibe,
+        now: 0,
+        activity: 1,
+        lookaheadSeconds: getBeatSeconds() * getBeatsPerBar() * 4,
+      });
+    });
+
+    notes.forEach((note) => {
+      expect(Number.isFinite(note.startTime)).toBe(true);
+      expect(note.midi).toBeGreaterThanOrEqual(21);
+      expect(note.midi).toBeLessThanOrEqual(108);
+      expect(note.velocity).toBeGreaterThan(0);
+      expect(note.velocity).toBeLessThanOrEqual(0.4);
+      expect(note.pan).toBeGreaterThanOrEqual(-1);
+      expect(note.pan).toBeLessThanOrEqual(1);
+      expect(note.durationSeconds).toBeGreaterThan(0);
+      expect(note.lowpassHz ?? gardenAudioConfig.piano.lowpassHz).toBeGreaterThanOrEqual(
+        gardenAudioConfig.piano.lowpassMinHz
+      );
+      expect(note.lowpassHz ?? gardenAudioConfig.piano.lowpassHz).toBeLessThanOrEqual(
+        gardenAudioConfig.piano.lowpassMaxHz
+      );
+    });
+  });
 });
diff --git a/src/audio/generative-piano.ts b/src/audio/generative-piano.ts
index dd5e8f9..c0971fe 100644
--- a/src/audio/generative-piano.ts
+++ b/src/audio/generative-piano.ts
@@ -40,16 +40,19 @@ interface TouchDownRequest {
 interface PitchCandidate {
   midi: number;
   preference: number;
+  chordToneDistance: number;
 }
 
 interface PitchSource {
   baseMidi: number;
   offsets: ReadonlyArray<number>;
+  chordOffsets?: ReadonlyArray<number>;
 }
 
 interface BrushPhraseLayer {
   vibe: VibePreset;
   startedAt: number;
+  lastUpdatedAt: number;
   expiresAt: number;
   styleIndex: GardenAudioStyleIndex;
   energy: number;
@@ -58,21 +61,26 @@ interface BrushPhraseLayer {
 }
 
 export class GenerativePianoEngine {
-  private nextBeatAt: number | null = null;
+  private nextBeatStep: number | null = null;
   private timelineStartedAt: number | null = null;
-  private beatIndex = 0;
   private isWaitingForGestureAccent = false;
   private lastGestureAccentAt = Number.NEGATIVE_INFINITY;
-  private lastStrokeAccentAt = Number.NEGATIVE_INFINITY;
+  private lastStrokeAccentStep = Number.NEGATIVE_INFINITY;
   private readonly lastMidiByStyle: [number | null, number | null, number | null] = [
     null,
     null,
     null,
   ];
+  private readonly lastPadMidiByVoice: [number | null, number | null, number | null] = [
+    null,
+    null,
+    null,
+  ];
   private brushPhraseLayers: Array<BrushPhraseLayer> = [];
-  private nextBrushStreamAt: number | null = null;
+  private nextBrushStreamStep: number | null = null;
   private brushStreamNoteIndex = 0;
   private lastBrushStreamMidi: number | null = null;
+  private readonly brushStreamNoteCountsByBar = new Map<number, number>();
 
   public constructor(
     private readonly config: GardenAudioConfig,
@@ -84,20 +92,18 @@ export class GenerativePianoEngine {
   }
 
   public prime(now: number): void {
-    if (this.nextBeatAt === null) {
-      this.nextBeatAt = now + this.config.startDelaySeconds;
-    }
     this.timelineStartedAt ??= now;
-    this.nextBrushStreamAt ??= now + this.config.startDelaySeconds;
+    this.nextBeatStep ??= 0;
+    this.nextBrushStreamStep ??= 0;
   }
 
   public cue(now: number): void {
-    this.nextBeatAt = now + this.config.startDelaySeconds;
+    this.nextBeatStep = 0;
     this.timelineStartedAt = now;
-    this.beatIndex = 0;
-    this.nextBrushStreamAt = now + this.config.startDelaySeconds;
+    this.nextBrushStreamStep = 0;
     this.brushStreamNoteIndex = 0;
     this.lastBrushStreamMidi = null;
+    this.brushStreamNoteCountsByBar.clear();
   }
 
   public beginGesture(): void {
@@ -120,7 +126,7 @@ export class GenerativePianoEngine {
 
     this.isWaitingForGestureAccent = false;
     this.lastGestureAccentAt = now;
-    this.lastStrokeAccentAt = now;
+    this.lastStrokeAccentStep = this.getStepIndexAtTime(now);
     this.startBrushPhraseLayer({
       vibe,
       now,
@@ -142,9 +148,14 @@ export class GenerativePianoEngine {
     activity,
     maniaAmount = 0,
   }: StrokeAccentRequest): void {
+    this.prime(now);
     const strength = clamp01(activity);
     const normalizedManiaAmount = clamp01(maniaAmount);
     const styleIndex = this.getStyleIndex(now);
+    const accentStep = this.getNextStepIndexAt(
+      now,
+      this.generation.gestureAccent.quantizeStepLookahead
+    );
 
     if (
       this.isWaitingForGestureAccent &&
@@ -168,10 +179,10 @@ export class GenerativePianoEngine {
     });
     if (
       strength >= this.generation.strokeAccentThreshold &&
-      now - this.lastStrokeAccentAt >= this.generation.strokeAccentMinIntervalSeconds
+      accentStep - this.lastStrokeAccentStep >= this.generation.strokeAccentMinSteps
     ) {
-      this.lastStrokeAccentAt = now;
-      this.playGestureAccent(vibe, now, styleIndex, strength);
+      this.lastStrokeAccentStep = accentStep;
+      this.playGestureAccent(vibe, accentStep, styleIndex, strength);
     }
   }
 
@@ -182,23 +193,23 @@ export class GenerativePianoEngine {
     lookaheadSeconds = this.config.rhythm.lookaheadSeconds,
   }: RenderLookaheadRequest): void {
     this.prime(now);
-    this.skipLateBeats(now, this.getBeatDurationSeconds());
+    this.skipLateBeats(now);
 
-    if (this.nextBeatAt === null) {
+    if (this.nextBeatStep === null) {
       return;
     }
 
     const profile = getVibeProfile(vibe);
     const lookaheadEnd = now + lookaheadSeconds;
-    while (this.nextBeatAt <= lookaheadEnd) {
+    while (this.getTimeForStep(this.nextBeatStep) <= lookaheadEnd) {
+      const beatIndex = this.getBeatIndexForStep(this.nextBeatStep);
       this.renderBeat({
         profile,
-        beatIndex: this.beatIndex,
-        startTime: this.nextBeatAt,
+        beatIndex,
+        startTime: this.getTimeForStep(this.nextBeatStep),
         expression: this.getExpression(activity),
       });
-      this.nextBeatAt += this.getBeatDurationSeconds();
-      this.beatIndex += 1;
+      this.nextBeatStep += this.config.rhythm.stepsPerBeat;
     }
     this.renderBrushPhraseLayers({
       vibe,
@@ -219,27 +230,27 @@ export class GenerativePianoEngine {
           { baseMidi: rootMidi, offsets: [0] },
           this.generation.padRegisters[0]
         ),
-        velocity: 0.1,
-        pan: -0.16,
-        delaySend: 0.012,
+        velocity: this.generation.vibeChangeStinger.velocities[0],
+        pan: this.generation.vibeChangeStinger.pans[0],
+        delaySend: this.generation.vibeChangeStinger.delaySends[0],
       },
       {
         midi: this.chooseMidi(
           { baseMidi: rootMidi, offsets: [intervals[1], intervals[2]] },
           this.generation.padRegisters[1]
         ),
-        velocity: 0.085,
-        pan: 0,
-        delaySend: 0.014,
+        velocity: this.generation.vibeChangeStinger.velocities[1],
+        pan: this.generation.vibeChangeStinger.pans[1],
+        delaySend: this.generation.vibeChangeStinger.delaySends[1],
       },
       {
         midi: this.chooseMidi(
           { baseMidi: rootMidi, offsets: [intervals[3], intervals[2]] },
           this.generation.padRegisters[2]
         ),
-        velocity: 0.07,
-        pan: 0.16,
-        delaySend: 0.016,
+        velocity: this.generation.vibeChangeStinger.velocities[2],
+        pan: this.generation.vibeChangeStinger.pans[2],
+        delaySend: this.generation.vibeChangeStinger.delaySends[2],
       },
     ];
 
@@ -247,26 +258,34 @@ export class GenerativePianoEngine {
       this.playNote({
         ...note,
         durationSeconds: this.generation.stingerDurationSeconds,
-        lowpassHz: this.getLowpassHz(profile, note.midi, 0.35),
+        role: 'stinger',
+        lowpassHz: this.getLowpassHz(
+          profile,
+          note.midi,
+          this.generation.vibeChangeStinger.lowpassExpression
+        ),
         startTime: now + index * this.generation.stingerSpacingSeconds,
       });
     });
   }
 
   public reset(): void {
-    this.nextBeatAt = null;
+    this.nextBeatStep = null;
     this.timelineStartedAt = null;
-    this.beatIndex = 0;
     this.isWaitingForGestureAccent = false;
     this.lastGestureAccentAt = Number.NEGATIVE_INFINITY;
-    this.lastStrokeAccentAt = Number.NEGATIVE_INFINITY;
+    this.lastStrokeAccentStep = Number.NEGATIVE_INFINITY;
     this.lastMidiByStyle[0] = null;
     this.lastMidiByStyle[1] = null;
     this.lastMidiByStyle[2] = null;
+    this.lastPadMidiByVoice[0] = null;
+    this.lastPadMidiByVoice[1] = null;
+    this.lastPadMidiByVoice[2] = null;
     this.brushPhraseLayers = [];
-    this.nextBrushStreamAt = null;
+    this.nextBrushStreamStep = null;
     this.brushStreamNoteIndex = 0;
     this.lastBrushStreamMidi = null;
+    this.brushStreamNoteCountsByBar.clear();
   }
 
   private renderBeat({
@@ -306,9 +325,9 @@ export class GenerativePianoEngine {
     ) {
       this.playTextureNote(
         profile,
-        barIndex + 1,
+        barIndex + this.generation.highActivityExtra.barOffset,
         startTime,
-        expression * 0.9,
+        expression * this.generation.highActivityExtra.expressionMultiplier,
         styleIndex
       );
     }
@@ -331,30 +350,42 @@ export class GenerativePianoEngine {
       {
         source: { baseMidi: rootMidi, offsets: [0] },
         register: this.generation.padRegisters[0],
-        velocity: 0.052,
+        velocity: this.generation.padChord.velocities[0],
       },
       {
         source: { baseMidi: rootMidi, offsets: [intervals[1]] },
         register: this.generation.padRegisters[1],
-        velocity: 0.041,
+        velocity: this.generation.padChord.velocities[1],
       },
       {
         source: { baseMidi: rootMidi, offsets: [intervals[3], intervals[2]] },
         register: this.generation.padRegisters[2],
-        velocity: 0.033,
+        velocity: this.generation.padChord.velocities[2],
       },
     ];
 
-    notes.forEach(({ source, register, velocity }) => {
-      const midi = this.chooseMidi(source, register);
+    notes.forEach(({ source, register, velocity }, index) => {
+      const midi = this.chooseMidi(
+        source,
+        register,
+        this.lastPadMidiByVoice[index],
+        false
+      );
+      this.lastPadMidiByVoice[index] = midi;
       this.playNote({
         midi,
-        velocity: velocity + expression * 0.02,
+        velocity:
+          velocity + expression * this.generation.padChord.expressionVelocityWeight,
         startTime,
         durationSeconds,
         pan: register.pan,
-        delaySend: 0.008,
-        lowpassHz: this.getLowpassHz(profile, midi, expression * 0.28),
+        role: 'pad',
+        delaySend: this.generation.padChord.delaySend,
+        lowpassHz: this.getLowpassHz(
+          profile,
+          midi,
+          expression * this.generation.padChord.lowpassExpressionWeight
+        ),
       });
     });
   }
@@ -374,6 +405,7 @@ export class GenerativePianoEngine {
       {
         baseMidi: rootMidi,
         offsets: this.getSupportOffsets(chordIntervals, styleIndex),
+        chordOffsets: chordIntervals,
       },
       pool,
       this.lastMidiByStyle[styleIndex],
@@ -384,13 +416,23 @@ export class GenerativePianoEngine {
     this.playNote({
       midi,
       velocity:
-        (0.105 + expression * 0.07) *
+        (this.generation.supportNote.velocityBase +
+          expression * this.generation.supportNote.velocityExpressionWeight) *
         this.config.styleVoices[styleIndex].velocityMultiplier,
       startTime,
-      durationSeconds: 1.35 + expression * 0.4,
+      durationSeconds:
+        this.generation.supportNote.durationBaseSeconds +
+        expression * this.generation.supportNote.durationExpressionSeconds,
       pan: this.getStylePan(styleIndex),
-      delaySend: 0.016 + expression * 0.006,
-      lowpassHz: this.getLowpassHz(profile, midi, expression * 0.7),
+      role: 'support',
+      delaySend:
+        this.generation.supportNote.delaySendBase +
+        expression * this.generation.supportNote.delaySendExpressionWeight,
+      lowpassHz: this.getLowpassHz(
+        profile,
+        midi,
+        expression * this.generation.supportNote.lowpassExpressionWeight
+      ),
     });
   }
 
@@ -402,11 +444,14 @@ export class GenerativePianoEngine {
     styleIndex: GardenAudioStyleIndex
   ): void {
     const pool = this.generation.stylePools[styleIndex];
+    const chord = this.getChord(profile, barIndex);
+    const chordIntervals = getChordIntervals(chord, false);
     const degrees = this.rotate(pool.scaleDegrees, barIndex + styleIndex);
     const midi = this.chooseMidi(
       {
         baseMidi: profile.rootMidi,
         offsets: degrees.map((degree) => degreeToSemitone(profile, degree)),
+        chordOffsets: this.getChordOffsets(chord, chordIntervals),
       },
       pool,
       this.lastMidiByStyle[styleIndex],
@@ -417,30 +462,43 @@ export class GenerativePianoEngine {
     this.playNote({
       midi,
       velocity:
-        (0.09 + expression * 0.08) *
+        (this.generation.textureNote.velocityBase +
+          expression * this.generation.textureNote.velocityExpressionWeight) *
         this.config.styleVoices[styleIndex].velocityMultiplier,
       startTime,
-      durationSeconds: 0.62 + expression * 0.24,
+      durationSeconds:
+        this.generation.textureNote.durationBaseSeconds +
+        expression * this.generation.textureNote.durationExpressionSeconds,
       pan: this.getStylePan(styleIndex),
-      delaySend: 0.016 + expression * 0.006,
+      role: 'texture',
+      delaySend:
+        this.generation.textureNote.delaySendBase +
+        expression * this.generation.textureNote.delaySendExpressionWeight,
       lowpassHz: this.getLowpassHz(profile, midi, expression),
     });
   }
 
   private playGestureAccent(
     vibe: VibePreset,
-    now: number,
+    stepIndex: number,
     styleIndex: GardenAudioStyleIndex,
     strength: number
   ): void {
     const profile = getVibeProfile(vibe);
     const pool = this.generation.stylePools[styleIndex];
-    const degrees = this.rotate(pool.scaleDegrees, Math.round(strength * 3));
+    const startTime = this.getTimeForStep(stepIndex);
+    const chord = this.getChord(profile, this.getBarIndexForStep(stepIndex));
+    const chordIntervals = getChordIntervals(chord, false);
+    const degrees = this.rotate(
+      pool.scaleDegrees,
+      Math.round(strength * this.generation.gestureAccent.rotationStrengthMultiplier)
+    );
 
     const midi = this.chooseMidi(
       {
         baseMidi: profile.rootMidi,
         offsets: degrees.map((degree) => degreeToSemitone(profile, degree)),
+        chordOffsets: this.getChordOffsets(chord, chordIntervals),
       },
       pool,
       this.lastMidiByStyle[styleIndex],
@@ -451,11 +509,16 @@ export class GenerativePianoEngine {
     this.playNote({
       midi,
       velocity:
-        (0.12 + strength * 0.09) * this.config.styleVoices[styleIndex].velocityMultiplier,
-      startTime: now + this.config.startDelaySeconds,
-      durationSeconds: 0.48 + strength * 0.22,
+        (this.generation.gestureAccent.velocityBase +
+          strength * this.generation.gestureAccent.velocityStrengthWeight) *
+        this.config.styleVoices[styleIndex].velocityMultiplier,
+      startTime,
+      durationSeconds:
+        this.generation.gestureAccent.durationBaseSeconds +
+        strength * this.generation.gestureAccent.durationStrengthSeconds,
       pan: this.getStylePan(styleIndex),
-      delaySend: 0.012,
+      role: 'gesture',
+      delaySend: this.generation.gestureAccent.delaySend,
       lowpassHz: this.getLowpassHz(profile, midi, strength),
     });
   }
@@ -473,7 +536,10 @@ export class GenerativePianoEngine {
   }): void {
     const profile = getVibeProfile(vibe);
     const pool = this.generation.stylePools[styleIndex];
-    const register = this.getBiasedRegister(pool, 0);
+    const register = this.getBiasedRegister(
+      pool,
+      this.generation.touchNote.registerBiasManiaAmount
+    );
     const chord = this.getChord(profile, this.getGlobalBarIndex(now));
     const chordIntervals = getChordIntervals(chord, false);
     const rootMidi = profile.rootMidi + chord.rootOffset;
@@ -492,12 +558,24 @@ export class GenerativePianoEngine {
     this.playNote({
       midi,
       velocity:
-        (0.14 + strength * 0.11) * this.config.styleVoices[styleIndex].velocityMultiplier,
+        (this.generation.touchNote.velocityBase +
+          strength * this.generation.touchNote.velocityStrengthWeight) *
+        this.config.styleVoices[styleIndex].velocityMultiplier,
       startTime: now,
-      durationSeconds: 0.55 + strength * 0.18,
+      durationSeconds:
+        this.generation.touchNote.durationBaseSeconds +
+        strength * this.generation.touchNote.durationStrengthSeconds,
       pan: this.getStylePan(styleIndex),
-      delaySend: 0.006,
-      lowpassHz: this.getLowpassHz(profile, midi, clamp01(0.55 + strength * 0.35)),
+      role: 'gesture',
+      delaySend: this.generation.touchNote.delaySend,
+      lowpassHz: this.getLowpassHz(
+        profile,
+        midi,
+        clamp01(
+          this.generation.touchNote.lowpassBaseExpression +
+            strength * this.generation.touchNote.lowpassStrengthWeight
+        )
+      ),
     });
   }
 
@@ -517,14 +595,16 @@ export class GenerativePianoEngine {
     const lifetimeSeconds =
       this.generation.brushLayerBaseSeconds +
       strength * this.generation.brushLayerEnergySeconds;
+    const expiresAt = this.getNextBarTimeAt(now + lifetimeSeconds);
 
     this.brushPhraseLayers.push({
       vibe,
       startedAt: now,
-      expiresAt: now + lifetimeSeconds,
+      lastUpdatedAt: now,
+      expiresAt,
       styleIndex,
       energy: strength,
-      motifOffsets: [styleIndex - 1],
+      motifOffsets: [styleIndex + this.generation.brushPhrase.initialMotifOffset],
       maniaAmount,
     });
 
@@ -551,9 +631,19 @@ export class GenerativePianoEngine {
       return;
     }
 
+    const elapsedSeconds = Math.max(0, now - layer.lastUpdatedAt);
+    layer.lastUpdatedAt = now;
     layer.styleIndex = styleIndex;
-    layer.energy = Math.max(layer.energy * 0.94, strength);
-    layer.maniaAmount = Math.max(layer.maniaAmount * 0.92, maniaAmount);
+    layer.energy = Math.max(
+      layer.energy *
+        Math.exp(-elapsedSeconds / this.generation.brushPhrase.energyDecaySeconds),
+      strength
+    );
+    layer.maniaAmount = Math.max(
+      layer.maniaAmount *
+        Math.exp(-elapsedSeconds / this.generation.brushPhrase.maniaDecaySeconds),
+      maniaAmount
+    );
     layer.motifOffsets.push(this.getMotifOffset(strength));
     if (layer.motifOffsets.length > this.generation.brushMotifMaxSteps) {
       layer.motifOffsets = layer.motifOffsets.slice(-this.generation.brushMotifMaxSteps);
@@ -572,30 +662,39 @@ export class GenerativePianoEngine {
     activity: number;
   }): void {
     const earliestStart = now + this.config.piano.scheduleAheadSeconds;
-    this.nextBrushStreamAt ??= now + this.config.startDelaySeconds;
+    this.nextBrushStreamStep ??= 0;
+    this.pruneBrushStreamNoteCounts(this.getGlobalBarIndex(now) - 1);
 
     this.brushPhraseLayers = this.brushPhraseLayers.filter(
       (layer) => layer.expiresAt > earliestStart
     );
 
-    while (this.nextBrushStreamAt < earliestStart) {
-      const frame = this.getBrushStreamFrame(this.nextBrushStreamAt, activity);
-      this.nextBrushStreamAt += this.getBrushStreamIntervalSeconds(frame.intensity);
+    while (this.getTimeForStep(this.nextBrushStreamStep) < earliestStart) {
+      const frame = this.getBrushStreamFrame(
+        this.getTimeForStep(this.nextBrushStreamStep),
+        activity
+      );
+      this.nextBrushStreamStep += this.getBrushStreamIntervalSteps(frame.intensity);
       this.brushStreamNoteIndex += 1;
     }
 
-    while (this.nextBrushStreamAt <= lookaheadEnd) {
-      const frame = this.getBrushStreamFrame(this.nextBrushStreamAt, activity);
-      if (frame.intensity >= this.generation.brushLayerMinIntensity) {
+    while (this.getTimeForStep(this.nextBrushStreamStep) <= lookaheadEnd) {
+      const startTime = this.getTimeForStep(this.nextBrushStreamStep);
+      const frame = this.getBrushStreamFrame(startTime, activity);
+      if (
+        frame.intensity >= this.generation.brushLayerMinIntensity &&
+        this.reserveBrushStreamNote(this.nextBrushStreamStep)
+      ) {
         this.playBrushStreamNote({
           vibe,
-          startTime: this.nextBrushStreamAt,
+          startTime,
+          stepIndex: this.nextBrushStreamStep,
           intensity: frame.intensity,
-          styleIndex: this.getStyleIndex(this.nextBrushStreamAt),
+          styleIndex: this.getStyleIndex(startTime),
           layer: frame.layer,
         });
       }
-      this.nextBrushStreamAt += this.getBrushStreamIntervalSeconds(frame.intensity);
+      this.nextBrushStreamStep += this.getBrushStreamIntervalSteps(frame.intensity);
       this.brushStreamNoteIndex += 1;
     }
   }
@@ -603,28 +702,40 @@ export class GenerativePianoEngine {
   private playBrushStreamNote({
     vibe,
     startTime,
+    stepIndex,
     intensity,
     styleIndex,
     layer,
   }: {
     vibe: VibePreset;
     startTime: number;
+    stepIndex: number;
     intensity: number;
     styleIndex: GardenAudioStyleIndex;
     layer: BrushPhraseLayer | null;
   }): void {
     const profile = getVibeProfile(vibe);
     const pool = this.generation.stylePools[styleIndex];
-    const maniaAmount = layer?.maniaAmount ?? clamp01((intensity - 0.82) / 0.18);
-    const register = this.getBiasedRegister(pool, maniaAmount * 0.45);
-    const chord = this.getChord(profile, this.getGlobalBarIndex(startTime));
+    const maniaAmount =
+      layer?.maniaAmount ??
+      clamp01(
+        (intensity - this.generation.brushStream.inferredManiaThreshold) /
+          this.generation.brushStream.inferredManiaRange
+      );
+    const register = this.getBiasedRegister(
+      pool,
+      maniaAmount * this.generation.brushStream.registerManiaShift
+    );
+    const chord = this.getChord(profile, this.getBarIndexForStep(stepIndex));
     const chordIntervals = getChordIntervals(chord, false);
     const rootMidi = profile.rootMidi + chord.rootOffset;
-    const useChordTone = this.brushStreamNoteIndex % 4 === 0;
+    const useChordTone =
+      this.brushStreamNoteIndex % this.generation.brushStream.chordToneEverySteps === 0;
     const source = useChordTone
       ? {
           baseMidi: rootMidi,
           offsets: this.getSupportOffsets(chordIntervals, styleIndex),
+          chordOffsets: chordIntervals,
         }
       : {
           baseMidi: profile.rootMidi,
@@ -633,18 +744,23 @@ export class GenerativePianoEngine {
             pool,
             styleIndex,
           }).map((degree) => degreeToSemitone(profile, degree)),
+          chordOffsets: this.getChordOffsets(chord, chordIntervals),
         };
     const midi = this.chooseMidi(source, register, this.lastBrushStreamMidi, true);
     const pan = this.getStylePan(styleIndex);
     const durationSeconds = clamp(
-      0.48 + intensity * 0.08 - maniaAmount * 0.34,
-      0.14,
-      0.62
+      this.generation.brushStream.durationBaseSeconds +
+        intensity * this.generation.brushStream.durationIntensitySeconds -
+        maniaAmount * this.generation.brushStream.durationManiaSeconds,
+      this.generation.brushStream.durationMinSeconds,
+      this.generation.brushStream.durationMaxSeconds
     );
     const delaySend = clamp(
-      0.012 + intensity * 0.011 - maniaAmount * 0.006,
-      0.006,
-      0.032
+      this.generation.brushStream.delaySendBase +
+        intensity * this.generation.brushStream.delaySendIntensityWeight -
+        maniaAmount * this.generation.brushStream.delaySendManiaWeight,
+      this.generation.brushStream.delaySendMin,
+      this.generation.brushStream.delaySendMax
     );
 
     this.lastBrushStreamMidi = midi;
@@ -652,33 +768,59 @@ export class GenerativePianoEngine {
     this.playNote({
       midi,
       velocity:
-        (0.1 + intensity * 0.13) * this.config.styleVoices[styleIndex].velocityMultiplier,
+        (this.generation.brushStream.velocityBase +
+          intensity * this.generation.brushStream.velocityIntensityWeight) *
+        this.config.styleVoices[styleIndex].velocityMultiplier,
       startTime,
       durationSeconds,
       pan,
+      role: 'brush',
       delaySend,
       lowpassHz: this.getLowpassHz(
         profile,
         midi,
-        clamp01(0.39 + intensity * 0.48 + maniaAmount * 0.18)
+        clamp01(
+          this.generation.brushStream.lowpassBaseExpression +
+            intensity * this.generation.brushStream.lowpassIntensityWeight +
+            maniaAmount * this.generation.brushStream.lowpassManiaWeight
+        )
       ),
     });
 
     if (
-      maniaAmount >= 0.62 &&
-      (this.brushStreamNoteIndex % 2 === 1 || intensity >= 0.9)
+      maniaAmount >= this.generation.brushStreamEcho.maniaThreshold &&
+      (this.brushStreamNoteIndex % this.generation.brushStreamEcho.stepModulo ===
+        this.generation.brushStreamEcho.stepRemainder ||
+        intensity >= this.generation.brushStreamEcho.intensityThreshold)
     ) {
-      const echoMidi = midi + 12 <= 88 ? midi + 12 : midi - 12;
+      const echoMidi =
+        midi + this.generation.brushStreamEcho.octaveSemitones <=
+        this.generation.brushStreamEcho.maxMidi
+          ? midi + this.generation.brushStreamEcho.octaveSemitones
+          : midi - this.generation.brushStreamEcho.octaveSemitones;
       this.playNote({
         midi: echoMidi,
         velocity:
-          (0.045 + intensity * 0.05) *
+          (this.generation.brushStreamEcho.velocityBase +
+            intensity * this.generation.brushStreamEcho.velocityIntensityWeight) *
           this.config.styleVoices[styleIndex].velocityMultiplier,
         startTime: startTime + this.generation.brushMotifCanonDelaySeconds,
-        durationSeconds: Math.max(0.11, durationSeconds * 0.68),
-        pan: clamp(-pan * 0.75, -1, 1),
-        delaySend: Math.max(0.006, delaySend * 0.72),
-        lowpassHz: this.getLowpassHz(profile, echoMidi, 0.62 + maniaAmount * 0.24),
+        durationSeconds: Math.max(
+          this.generation.brushStreamEcho.durationMinSeconds,
+          durationSeconds * this.generation.brushStreamEcho.durationScale
+        ),
+        pan: clamp(pan * this.generation.brushStreamEcho.panScale, -1, 1),
+        role: 'brush',
+        delaySend: Math.max(
+          this.generation.brushStreamEcho.delaySendMin,
+          delaySend * this.generation.brushStreamEcho.delaySendScale
+        ),
+        lowpassHz: this.getLowpassHz(
+          profile,
+          echoMidi,
+          this.generation.brushStreamEcho.lowpassBaseExpression +
+            maniaAmount * this.generation.brushStreamEcho.lowpassManiaWeight
+        ),
       });
     }
   }
@@ -695,7 +837,8 @@ export class GenerativePianoEngine {
       intensity:
         layer.energy *
         this.getBrushPhraseFade(layer, startTime) *
-        (0.8 + layer.maniaAmount * 0.42),
+        (this.generation.brushPhrase.layerIntensityBase +
+          layer.maniaAmount * this.generation.brushPhrase.layerIntensityManiaWeight),
     }));
     const dominant = layerStates.reduce<{
       layer: BrushPhraseLayer;
@@ -713,33 +856,52 @@ export class GenerativePianoEngine {
 
     return {
       intensity: clamp01(
-        activity * 0.42 + layeredIntensity + (dominant?.layer.maniaAmount ?? 0) * 0.18
+        activity * this.generation.brushPhrase.frameActivityWeight +
+          layeredIntensity +
+          (dominant?.layer.maniaAmount ?? 0) *
+            this.generation.brushPhrase.frameManiaWeight
       ),
       layer: dominant?.layer ?? null,
     };
   }
 
-  private getBrushStreamIntervalSeconds(intensity: number): number {
+  private getBrushStreamIntervalSteps(intensity: number): number {
     const intervalBeats =
-      intensity >= 0.85
+      intensity >= this.generation.brushStream.manicThreshold
         ? this.generation.brushStreamManicIntervalBeats
-        : intensity >= 0.62
+        : intensity >= this.generation.brushStream.intenseThreshold
           ? this.generation.brushStreamIntenseIntervalBeats
-          : intensity >= 0.34
-            ? this.generation.brushStreamActiveIntervalBeats
-            : this.generation.brushStreamIdleIntervalBeats;
-    return this.getBeatDurationSeconds() * intervalBeats;
+          : intensity >= this.generation.brushStream.activeThreshold
+          ? this.generation.brushStreamActiveIntervalBeats
+          : this.generation.brushStreamIdleIntervalBeats;
+    return Math.max(1, Math.round(intervalBeats * this.config.rhythm.stepsPerBeat));
   }
 
   private getBrushPhraseFade(layer: BrushPhraseLayer, startTime: number): number {
     const lifetimeSeconds = layer.expiresAt - layer.startedAt;
     const ageSeconds = startTime - layer.startedAt;
-    return clamp01(1 - ageSeconds / Math.max(0.001, lifetimeSeconds));
+    return clamp01(
+      1 -
+        ageSeconds /
+          Math.max(
+            this.generation.brushPhrase.fadeMinimumLifetimeSeconds,
+            lifetimeSeconds
+          )
+    );
   }
 
   private getMotifOffset(strength: number): number {
-    const energyStep = strength >= 0.82 ? 1 : strength >= 0.55 ? 0 : -1;
-    return clamp(energyStep, -3, 4);
+    const energyStep =
+      strength >= this.generation.brushMotif.highThreshold
+        ? this.generation.brushMotif.highOffset
+        : strength >= this.generation.brushMotif.mediumThreshold
+          ? this.generation.brushMotif.mediumOffset
+          : this.generation.brushMotif.lowOffset;
+    return clamp(
+      energyStep,
+      this.generation.brushMotif.minOffset,
+      this.generation.brushMotif.maxOffset
+    );
   }
 
   private getBrushMotifDegrees({
@@ -770,9 +932,19 @@ export class GenerativePianoEngine {
     register: GardenAudioRegister,
     maniaAmount: number
   ): GardenAudioRegister {
-    const shift = Math.round(maniaAmount * 4);
-    const midiMin = clamp(register.midiMin + shift, 36, 86);
-    const midiMax = clamp(register.midiMax + shift, midiMin + 4, 91);
+    const shift = Math.round(
+      maniaAmount * this.generation.registerBias.maniaShiftSemitones
+    );
+    const midiMin = clamp(
+      register.midiMin + shift,
+      this.generation.registerBias.midiMin,
+      this.generation.registerBias.midiMaxForMin
+    );
+    const midiMax = clamp(
+      register.midiMax + shift,
+      midiMin + this.generation.registerBias.minimumSpan,
+      this.generation.registerBias.midiMax
+    );
 
     return {
       midiMin,
@@ -808,12 +980,27 @@ export class GenerativePianoEngine {
     register: GardenAudioRegister
   ): Array<PitchCandidate> {
     const candidates: Array<PitchCandidate> = [];
+    const chordPitchClasses = pitchSource.chordOffsets?.map((offset) =>
+      getPitchClass(pitchSource.baseMidi + offset)
+    );
 
     pitchSource.offsets.forEach((offset, preference) => {
-      for (let octave = -3; octave <= 3; octave += 1) {
-        const midi = pitchSource.baseMidi + offset + octave * 12;
+      for (
+        let octave = this.generation.candidateOctaveSearch.min;
+        octave <= this.generation.candidateOctaveSearch.max;
+        octave += 1
+      ) {
+        const midi =
+          pitchSource.baseMidi +
+          offset +
+          octave * this.config.piano.pitchSemitonesPerOctave;
         if (midi >= register.midiMin && midi <= register.midiMax) {
-          candidates.push({ midi: Math.round(midi), preference });
+          const roundedMidi = Math.round(midi);
+          candidates.push({
+            midi: roundedMidi,
+            preference,
+            chordToneDistance: getPitchClassDistance(roundedMidi, chordPitchClasses),
+          });
         }
       }
     });
@@ -832,6 +1019,7 @@ export class GenerativePianoEngine {
       Math.abs(candidate.midi - register.preferredMidi) *
         this.generation.noteScoreRegisterWeight +
       candidate.preference * this.generation.noteScorePreferenceWeight +
+      candidate.chordToneDistance * this.generation.noteScoreChordToneWeight +
       (avoidRepeat && candidate.midi === previousMidi
         ? this.generation.noteScoreRepeatPenalty
         : 0)
@@ -839,7 +1027,7 @@ export class GenerativePianoEngine {
   }
 
   private shouldPlaySupport(expression: number, barIndex: number): boolean {
-    if (expression >= 0.55) {
+    if (expression >= this.generation.supportNote.expressionThreshold) {
       return true;
     }
 
@@ -850,28 +1038,27 @@ export class GenerativePianoEngine {
 
   private shouldPlayTexture(expression: number, barIndex: number): boolean {
     const spacing =
-      expression < 0.35
+      expression < this.generation.textureNote.idleExpressionThreshold
         ? this.generation.idleTextureBarSpacing
-        : expression < 0.7
+        : expression < this.generation.textureNote.mediumExpressionThreshold
           ? this.generation.mediumTextureBarSpacing
-          : 1;
+          : this.generation.textureNote.intenseSpacing;
 
-    return barIndex % spacing === (spacing === 1 ? 0 : 1);
+    return (
+      barIndex % spacing ===
+      (spacing === this.generation.textureNote.intenseSpacing
+        ? 0
+        : this.generation.textureNote.idlePhase)
+    );
   }
 
   private getSupportOffsets(
     chordIntervals: ReadonlyArray<number>,
     styleIndex: GardenAudioStyleIndex
   ): Array<number> {
-    if (styleIndex === 0) {
-      return [0, chordIntervals[2], 12];
-    }
-
-    if (styleIndex === 1) {
-      return [chordIntervals[1], chordIntervals[2], 0, 12];
-    }
-
-    return [chordIntervals[2], 12, chordIntervals[3], chordIntervals[1] + 12];
+    return this.generation.supportNote.offsetsByStyle[styleIndex].map((offset) =>
+      getConfiguredChordOffset(chordIntervals, offset)
+    );
   }
 
   private getChord(profile: GardenAudioVibeProfile, barIndex: number): GardenAudioChord {
@@ -881,24 +1068,24 @@ export class GenerativePianoEngine {
   }
 
   private getGlobalBarIndex(startTime: number): number {
-    const timelineStartedAt = this.timelineStartedAt ?? startTime;
-    const elapsedSeconds = Math.max(0, startTime - timelineStartedAt);
-    return Math.floor(elapsedSeconds / this.getBarDurationSeconds());
+    return this.getBarIndexForStep(this.getStepIndexAtTime(startTime));
   }
 
   private getStyleIndex(startTime: number): GardenAudioStyleIndex {
-    const timelineStartedAt = this.timelineStartedAt ?? startTime;
-    const elapsedSeconds = Math.max(0, startTime - timelineStartedAt);
     const styleCount = this.generation.stylePools.length;
-    const rotationSeconds = Math.max(0.001, this.generation.styleRotationSeconds);
-    return (Math.floor(elapsedSeconds / rotationSeconds) %
+    const rotationBars = Math.max(1, Math.round(this.generation.styleRotationBars));
+    return (Math.floor(this.getGlobalBarIndex(startTime) / rotationBars) %
       styleCount) as GardenAudioStyleIndex;
   }
 
   private getStylePan(styleIndex: GardenAudioStyleIndex): number {
     const pool = this.generation.stylePools[styleIndex];
     const styleVoice = this.config.styleVoices[styleIndex];
-    return clamp(pool.pan + styleVoice.panOffset * 0.35, -1, 1);
+    return clamp(
+      pool.pan + styleVoice.panOffset * this.generation.stylePanOffsetScale,
+      -1,
+      1
+    );
   }
 
   private getLowpassHz(
@@ -906,28 +1093,34 @@ export class GenerativePianoEngine {
     midi: number,
     expression: number
   ): number {
-    const midiLift = clamp01((midi - 48) / 33) * 720;
+    const midiLift =
+      clamp01(
+        (midi - this.generation.lowpass.midiBase) / this.generation.lowpass.midiRange
+      ) * this.generation.lowpass.midiLiftHz;
     return clamp(
-      this.config.piano.lowpassHz * profile.brightness * (0.58 + expression * 0.32) +
+      this.config.piano.lowpassHz *
+        profile.brightness *
+        (this.generation.lowpass.expressionBase +
+          expression * this.generation.lowpass.expressionWeight) +
         midiLift,
       this.config.piano.lowpassMinHz,
       this.config.piano.lowpassMaxHz
     );
   }
 
-  private skipLateBeats(now: number, beatSeconds: number): void {
-    if (this.nextBeatAt === null) {
+  private skipLateBeats(now: number): void {
+    if (this.nextBeatStep === null) {
       return;
     }
 
     const earliestStart = now + this.config.piano.scheduleAheadSeconds;
-    if (this.nextBeatAt >= earliestStart) {
+    if (this.getTimeForStep(this.nextBeatStep) >= earliestStart) {
       return;
     }
 
-    const skippedBeats = Math.floor((earliestStart - this.nextBeatAt) / beatSeconds) + 1;
-    this.nextBeatAt += skippedBeats * beatSeconds;
-    this.beatIndex += skippedBeats;
+    const earliestStep = this.getNextStepIndexAt(earliestStart, 0);
+    const stepsPerBeat = this.config.rhythm.stepsPerBeat;
+    this.nextBeatStep = Math.ceil(earliestStep / stepsPerBeat) * stepsPerBeat;
   }
 
   private getExpression(activity: number): number {
@@ -941,6 +1134,10 @@ export class GenerativePianoEngine {
     return 60 / this.config.rhythm.bpm;
   }
 
+  private getStepDurationSeconds(): number {
+    return this.getBeatDurationSeconds() / this.config.rhythm.stepsPerBeat;
+  }
+
   private getBarDurationSeconds(): number {
     return this.getBeatDurationSeconds() * this.getBeatsPerBar();
   }
@@ -952,7 +1149,106 @@ export class GenerativePianoEngine {
     );
   }
 
+  private getTimeForStep(stepIndex: number): number {
+    return (
+      (this.timelineStartedAt ?? 0) +
+      this.config.startDelaySeconds +
+      stepIndex * this.getStepDurationSeconds()
+    );
+  }
+
+  private getStepIndexAtTime(startTime: number): number {
+    const timelineStartedAt = this.timelineStartedAt ?? startTime;
+    const elapsedSeconds = Math.max(
+      0,
+      startTime - timelineStartedAt - this.config.startDelaySeconds
+    );
+    return Math.floor(elapsedSeconds / this.getStepDurationSeconds());
+  }
+
+  private getNextStepIndexAt(startTime: number, lookaheadSteps: number): number {
+    const timelineStartedAt = this.timelineStartedAt ?? startTime;
+    const elapsedSeconds = Math.max(
+      0,
+      startTime - timelineStartedAt - this.config.startDelaySeconds
+    );
+    return Math.max(
+      0,
+      Math.ceil(elapsedSeconds / this.getStepDurationSeconds()) + lookaheadSteps
+    );
+  }
+
+  private getNextBarTimeAt(startTime: number): number {
+    const nextBarStep =
+      Math.ceil(this.getStepIndexAtTime(startTime) / this.config.rhythm.stepsPerBar) *
+      this.config.rhythm.stepsPerBar;
+    return this.getTimeForStep(nextBarStep);
+  }
+
+  private getBeatIndexForStep(stepIndex: number): number {
+    return Math.floor(stepIndex / this.config.rhythm.stepsPerBeat);
+  }
+
+  private getBarIndexForStep(stepIndex: number): number {
+    return Math.floor(stepIndex / this.config.rhythm.stepsPerBar);
+  }
+
+  private reserveBrushStreamNote(stepIndex: number): boolean {
+    const barIndex = this.getBarIndexForStep(stepIndex);
+    const noteCount = this.brushStreamNoteCountsByBar.get(barIndex) ?? 0;
+    if (noteCount >= this.generation.maxBrushStreamNotesPerBar) {
+      return false;
+    }
+
+    this.brushStreamNoteCountsByBar.set(barIndex, noteCount + 1);
+    return true;
+  }
+
+  private pruneBrushStreamNoteCounts(earliestBarIndex: number): void {
+    this.brushStreamNoteCountsByBar.forEach((_, barIndex) => {
+      if (barIndex < earliestBarIndex) {
+        this.brushStreamNoteCountsByBar.delete(barIndex);
+      }
+    });
+  }
+
+  private getChordOffsets(
+    chord: GardenAudioChord,
+    chordIntervals: ReadonlyArray<number>
+  ): Array<number> {
+    return chordIntervals.map((interval) => chord.rootOffset + interval);
+  }
+
   private rotate<T>(values: ReadonlyArray<T>, offset: number): Array<T> {
     return values.map((_, index) => values[(index + offset) % values.length]);
   }
 }
+
+const getPitchClass = (midi: number): number => ((midi % 12) + 12) % 12;
+
+const getPitchClassDistance = (
+  midi: number,
+  chordPitchClasses: ReadonlyArray<number> | undefined
+): number => {
+  if (!chordPitchClasses || chordPitchClasses.length === 0) {
+    return 0;
+  }
+
+  const pitchClass = getPitchClass(midi);
+  return chordPitchClasses.reduce((best, chordPitchClass) => {
+    const distance = Math.abs(pitchClass - chordPitchClass);
+    return Math.min(best, Math.min(distance, 12 - distance));
+  }, 6);
+};
+
+const getConfiguredChordOffset = (
+  chordIntervals: ReadonlyArray<number>,
+  configuredOffset: number
+): number => {
+  if (configuredOffset >= 12) {
+    const interval = chordIntervals[configuredOffset - 12] ?? 0;
+    return interval + 12;
+  }
+
+  return chordIntervals[configuredOffset] ?? configuredOffset;
+};
diff --git a/src/audio/noise-burst-player.ts b/src/audio/noise-burst-player.ts
index 9b1341e..f9c7f6b 100644
--- a/src/audio/noise-burst-player.ts
+++ b/src/audio/noise-burst-player.ts
@@ -9,8 +9,9 @@ export class NoiseBurstPlayer {
   ) {}
 
   public play({ startTime, durationSeconds, gain, filterHz, pan }: NoiseBurst): void {
-    const { context, eventBus, noiseBuffer } = this.graph;
-    if (!context || !eventBus || !noiseBuffer) {
+    const { context, eventBus, noiseBus, noiseBuffer } = this.graph;
+    const outputBus = noiseBus ?? eventBus;
+    if (!context || !outputBus || !noiseBuffer) {
       return;
     }
 
@@ -25,7 +26,7 @@ export class NoiseBurstPlayer {
     const stopAt = scheduledStart + durationSeconds;
 
     source.buffer = noiseBuffer;
-    filter.type = 'bandpass';
+    filter.type = this.config.noiseBurst.filterType;
     filter.frequency.setValueAtTime(filterHz, scheduledStart);
     filter.Q.value = this.config.noiseBurst.filterQ;
     envelope.gain.setValueAtTime(this.config.noiseBurst.silentGain, scheduledStart);
@@ -39,7 +40,7 @@ export class NoiseBurstPlayer {
     source.connect(filter);
     filter.connect(envelope);
     envelope.connect(panner);
-    panner.connect(eventBus);
+    panner.connect(outputBus);
     source.start(
       scheduledStart,
       Math.random() * this.config.noiseBurst.offsetRandomSeconds
diff --git a/src/audio/piano-sampler.test.ts b/src/audio/piano-sampler.test.ts
index 41bc190..e8403b6 100644
--- a/src/audio/piano-sampler.test.ts
+++ b/src/audio/piano-sampler.test.ts
@@ -68,6 +68,7 @@ const makeSampler = async (context: AudioContext): Promise<PianoSampler> => {
     context,
     delayInput: null,
     eventBus,
+    getPianoBus: vi.fn(() => eventBus),
   } as unknown as GardenAudioGraph;
 
   return new PianoSampler(gardenAudioConfig, graph);
diff --git a/src/audio/piano-sampler.ts b/src/audio/piano-sampler.ts
index fcb15f7..ba8d771 100644
--- a/src/audio/piano-sampler.ts
+++ b/src/audio/piano-sampler.ts
@@ -38,10 +38,12 @@ export class PianoSampler {
     startTime,
     durationSeconds,
     pan,
+    role,
     delaySend = 0,
     lowpassHz = this.config.piano.lowpassHz,
   }: PianoNote): void {
-    const { context, eventBus, delayInput } = this.graph;
+    const { context, delayInput } = this.graph;
+    const eventBus = this.graph.getPianoBus(role);
     if (!context || !eventBus) {
       return;
     }
@@ -88,7 +90,7 @@ export class PianoSampler {
       Math.pow(2, (midi - sample.midi) / this.config.piano.pitchSemitonesPerOctave),
       scheduledStart
     );
-    filter.type = 'lowpass';
+    filter.type = this.config.piano.filterType;
     filter.frequency.setValueAtTime(
       clamp(lowpassHz, this.config.piano.lowpassMinHz, this.config.piano.lowpassMaxHz),
       scheduledStart
diff --git a/src/audio/piano-samples.ts b/src/audio/piano-samples.ts
index 776b285..914e831 100644
--- a/src/audio/piano-samples.ts
+++ b/src/audio/piano-samples.ts
@@ -1,3 +1,4 @@
+import { gardenAudioConfig } from './garden-audio-config';
 import type { LoadedPianoSample } from './garden-audio-types';
 
 interface PianoSampleDefinition {
@@ -11,8 +12,6 @@ export interface PianoSampleLoadProgress {
   sample?: PianoSampleDefinition;
 }
 
-const sampleBaseUrl = `${import.meta.env.BASE_URL}audio/piano/`;
-
 const sampleFiles: Array<[fileName: string, midi: number]> = [
   ['A0v12.m4a', 21],
   ['C1v12.m4a', 24],
@@ -49,7 +48,7 @@ const sampleFiles: Array<[fileName: string, midi: number]> = [
 const pianoSampleDefinitions: Array<PianoSampleDefinition> = sampleFiles
   .map(([fileName, midi]) => ({
     midi,
-    url: `${sampleBaseUrl}${fileName}`,
+    url: `${gardenAudioConfig.piano.sampleBaseUrl}${fileName}`,
   }))
   .sort((a, b) => a.midi - b.midi);
 
@@ -68,7 +67,11 @@ export const preloadPianoSamples = (
     );
   }
 
-  const decodeContext = new OfflineAudioContextConstructor(1, 1, 44_100);
+  const decodeContext = new OfflineAudioContextConstructor(
+    gardenAudioConfig.piano.preloadDecode.channels,
+    gardenAudioConfig.piano.preloadDecode.frames,
+    gardenAudioConfig.piano.preloadDecode.sampleRateHz
+  );
   return loadPianoSamples(decodeContext, onProgress);
 };
 
diff --git a/src/config.ts b/src/config.ts
index be5a860..4427c33 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -3,6 +3,8 @@ import { runtimeControls } from './config/runtime-controls';
 import type { GardenAppConfig } from './config/types';
 import { defaultVibeId, vibePresets } from './config/vibe-presets';
 
+const defaultAudioMasterVolume = 0.42;
+
 export type {
   GardenAppConfig,
   GardenRuntimeSettings,
@@ -12,7 +14,7 @@ export type {
 
 export const appConfig = {
   audio: {
-    masterVolume: 0.42,
+    masterVolume: defaultAudioMasterVolume,
     fadeInSeconds: 0.45,
     updateRampSeconds: 0.08,
     highPassFrequencyHz: 45,
@@ -26,10 +28,15 @@ export const appConfig = {
       feedbackMin: 0.04,
       outputActivityWeight: 0.5,
       outputBase: 0.65,
+      outputActivityDuck: 0.28,
       timeRampSeconds: 0.12,
+      feedbackHighPassHz: 180,
+      feedbackLowPassHz: 5200,
+      returnLowPassHz: 6200,
     },
     piano: {
       maxVoices: 24,
+      filterType: 'lowpass',
       gain: 0.48,
       sustainSeconds: 0.42,
       sustainLevel: 0.32,
@@ -49,6 +56,12 @@ export const appConfig = {
       tailStopExtraSeconds: 0.05,
       voiceStealFadeSeconds: 0.025,
       voiceStealStopSeconds: 0.05,
+      sampleBaseUrl: `${import.meta.env.BASE_URL}audio/piano/`,
+      preloadDecode: {
+        channels: 1,
+        frames: 1,
+        sampleRateHz: 44_100,
+      },
     },
     rhythm: {
       bpm: 74,
@@ -63,6 +76,8 @@ export const appConfig = {
       filterMinHz: 650,
       filterMaxHz: 3600,
       durationSeconds: 0.08,
+      pan: 0,
+      pianoActivity: 0,
     },
     energy: {
       attackSeconds: 0.08,
@@ -80,12 +95,51 @@ export const appConfig = {
       noiseMin: -1,
       unlockTickFrequencyHz: 440,
       unlockTickSeconds: 0.035,
+      unlockTickType: 'sine',
+      latencyHint: 'interactive',
+      outputFilterType: 'highpass',
+      noiseBufferChannels: 1,
+      noiseBufferDurationSeconds: 1,
+      pianoBusGains: {
+        pad: 0.86,
+        support: 0.94,
+        texture: 0.88,
+        gesture: 1,
+        brush: 0.9,
+        stinger: 0.92,
+      },
+      pianoBusActivityDucking: {
+        pad: 0.42,
+        support: 0.18,
+        texture: -0.06,
+        gesture: 0,
+        brush: -0.08,
+        stinger: 0,
+      },
+      noiseBusGain: 0.72,
+      compressor: {
+        thresholdDb: -18,
+        kneeDb: 18,
+        ratio: 2.1,
+        attackSeconds: 0.018,
+        releaseSeconds: 0.18,
+      },
     },
     input: {
       distanceWindowForFullActivityPixels: 140,
       distanceWindowSeconds: 0.5,
       fallbackFrameSeconds: 1 / 60,
-      manicActivityThreshold: 0.82,
+      fullActivitySpeed: 0.86,
+      activityNoiseFloorSpeed: 0.025,
+      activityCurve: 0.74,
+      activitySoftCeiling: 0.96,
+      activityAttackSeconds: 0.055,
+      activityReleaseSeconds: 0.2,
+      minAudibleDistance: 0.0025,
+      manicActivityThreshold: 0.9,
+      manicReleaseThreshold: 0.76,
+      maniaSmoothingSeconds: 0.12,
+      minElapsedSeconds: 0.001,
     },
     muteGain: 0.0001,
     muteRampSeconds: 0.02,
@@ -95,6 +149,7 @@ export const appConfig = {
       offsetRandomSeconds: 0.4,
       scheduleAheadSeconds: 0.002,
       silentGain: 0.0001,
+      filterType: 'bandpass',
     },
     startDelaySeconds: 0.02,
     vibeChangeStingerMinIntervalSeconds: 0.45,
@@ -142,7 +197,158 @@ export const appConfig = {
           pan: 0.2,
         },
       ],
+      chordVoicings: {
+        majorOpen: [0, 7, 12, 16],
+        minorOpen: [0, 7, 12, 15],
+        majorClosed: [0, 4, 7, 12, 16],
+        minorClosed: [0, 3, 7, 12, 15],
+      },
+      vibeChangeStinger: {
+        velocities: [0.1, 0.085, 0.07],
+        pans: [-0.16, 0, 0.16],
+        delaySends: [0.012, 0.014, 0.016],
+        lowpassExpression: 0.35,
+      },
+      highActivityExtra: {
+        barOffset: 1,
+        expressionMultiplier: 0.9,
+      },
+      padChord: {
+        velocities: [0.052, 0.041, 0.033],
+        expressionVelocityWeight: 0.02,
+        delaySend: 0.008,
+        lowpassExpressionWeight: 0.28,
+      },
+      supportNote: {
+        velocityBase: 0.105,
+        velocityExpressionWeight: 0.07,
+        durationBaseSeconds: 1.35,
+        durationExpressionSeconds: 0.4,
+        delaySendBase: 0.016,
+        delaySendExpressionWeight: 0.006,
+        lowpassExpressionWeight: 0.7,
+        expressionThreshold: 0.55,
+        offsetsByStyle: [
+          [0, 2, 12],
+          [1, 2, 0, 12],
+          [2, 12, 3, 13],
+        ],
+      },
+      textureNote: {
+        velocityBase: 0.09,
+        velocityExpressionWeight: 0.08,
+        durationBaseSeconds: 0.62,
+        durationExpressionSeconds: 0.24,
+        delaySendBase: 0.016,
+        delaySendExpressionWeight: 0.006,
+        idleExpressionThreshold: 0.35,
+        mediumExpressionThreshold: 0.7,
+        intenseSpacing: 1,
+        idlePhase: 1,
+      },
+      gestureAccent: {
+        rotationStrengthMultiplier: 3,
+        quantizeStepLookahead: 1,
+        velocityBase: 0.12,
+        velocityStrengthWeight: 0.09,
+        durationBaseSeconds: 0.48,
+        durationStrengthSeconds: 0.22,
+        delaySend: 0.012,
+      },
+      touchNote: {
+        registerBiasManiaAmount: 0,
+        velocityBase: 0.14,
+        velocityStrengthWeight: 0.11,
+        durationBaseSeconds: 0.55,
+        durationStrengthSeconds: 0.18,
+        delaySend: 0.006,
+        lowpassBaseExpression: 0.55,
+        lowpassStrengthWeight: 0.35,
+      },
+      brushPhrase: {
+        initialMotifOffset: -1,
+        energyRetain: 0.94,
+        maniaRetain: 0.92,
+        energyDecaySeconds: 0.72,
+        maniaDecaySeconds: 0.54,
+        fadeMinimumLifetimeSeconds: 0.001,
+        layerIntensityBase: 0.8,
+        layerIntensityManiaWeight: 0.42,
+        frameActivityWeight: 0.42,
+        frameManiaWeight: 0.18,
+      },
+      brushStream: {
+        inferredManiaThreshold: 0.82,
+        inferredManiaRange: 0.18,
+        registerManiaShift: 0.45,
+        chordToneEverySteps: 4,
+        durationBaseSeconds: 0.48,
+        durationIntensitySeconds: 0.08,
+        durationManiaSeconds: 0.34,
+        durationMinSeconds: 0.14,
+        durationMaxSeconds: 0.62,
+        delaySendBase: 0.012,
+        delaySendIntensityWeight: 0.011,
+        delaySendManiaWeight: 0.006,
+        delaySendMin: 0.006,
+        delaySendMax: 0.032,
+        velocityBase: 0.1,
+        velocityIntensityWeight: 0.13,
+        lowpassBaseExpression: 0.39,
+        lowpassIntensityWeight: 0.48,
+        lowpassManiaWeight: 0.18,
+        manicThreshold: 0.85,
+        intenseThreshold: 0.62,
+        activeThreshold: 0.34,
+      },
+      brushStreamEcho: {
+        maniaThreshold: 0.86,
+        stepModulo: 2,
+        stepRemainder: 1,
+        intensityThreshold: 0.95,
+        octaveSemitones: 12,
+        maxMidi: 88,
+        velocityBase: 0.045,
+        velocityIntensityWeight: 0.05,
+        durationMinSeconds: 0.11,
+        durationScale: 0.68,
+        panScale: -0.75,
+        delaySendMin: 0.006,
+        delaySendScale: 0.72,
+        lowpassBaseExpression: 0.62,
+        lowpassManiaWeight: 0.24,
+      },
+      brushMotif: {
+        highThreshold: 0.82,
+        mediumThreshold: 0.55,
+        highOffset: 1,
+        mediumOffset: 0,
+        lowOffset: -1,
+        minOffset: -3,
+        maxOffset: 4,
+      },
+      registerBias: {
+        maniaShiftSemitones: 4,
+        midiMin: 36,
+        midiMaxForMin: 86,
+        minimumSpan: 4,
+        midiMax: 91,
+      },
+      candidateOctaveSearch: {
+        min: -3,
+        max: 3,
+      },
+      styleRotationMinSeconds: 0.001,
+      stylePanOffsetScale: 0.35,
+      lowpass: {
+        midiBase: 48,
+        midiRange: 33,
+        midiLiftHz: 720,
+        expressionBase: 0.58,
+        expressionWeight: 0.32,
+      },
       styleRotationSeconds: 8,
+      styleRotationBars: 2,
       chordBars: 4,
       supportBarSpacing: 2,
       supportBarOffset: 1,
@@ -153,20 +359,23 @@ export const appConfig = {
       highActivityExtraThreshold: 0.45,
       noteScorePreferenceWeight: 1.8,
       noteScoreRegisterWeight: 0.28,
+      noteScoreChordToneWeight: 0.75,
       noteScoreRepeatPenalty: 3.2,
       gestureAccentMinIntervalSeconds: 2.5,
       strokeAccentMinIntervalSeconds: 3.2,
+      strokeAccentMinSteps: 12,
       strokeAccentThreshold: 0.58,
       stingerSpacingSeconds: 0.08,
       stingerDurationSeconds: 1.1,
-      maxBrushPhraseLayers: 5,
+      maxBrushPhraseLayers: 3,
+      maxBrushStreamNotesPerBar: 9,
       brushLayerBaseSeconds: 5.5,
       brushLayerEnergySeconds: 2.5,
-      brushLayerMinIntensity: 0.08,
+      brushLayerMinIntensity: 0.12,
       brushStreamIdleIntervalBeats: 2,
       brushStreamActiveIntervalBeats: 1,
       brushStreamIntenseIntervalBeats: 0.5,
-      brushStreamManicIntervalBeats: 0.25,
+      brushStreamManicIntervalBeats: 0.5,
       brushMotifMaxSteps: 8,
       brushMotifCanonDelaySeconds: 0.055,
       padDurationBarScale: 0.46,
@@ -195,10 +404,15 @@ export const appConfig = {
   },
   export4k: {
     bytesPerPixel: 4,
+    filenameExtension: 'png',
+    filenamePrefix: 'fleeting-garden',
+    filenameSuffix: '-upscale',
     height: 2160,
     jsHeapSafetyMultiplier: 1.5,
+    jsHeapTextureBytesMultiplier: 4,
     lowMemoryDeviceGiB: 2,
     lowMemoryExportFraction: 0.08,
+    mimeType: 'image/png',
     rowAlignmentBytes: 256,
     width: 3840,
   },
@@ -208,6 +422,17 @@ export const appConfig = {
     hideDelayMs: 3000,
   },
   pipelines: {
+    common: {
+      noiseChannelSeeds: [0, 1, 2, 3],
+      noiseClearValue: { r: 1, g: 1, b: 1, a: 1 },
+      noiseDrawInstanceCount: 1,
+      noiseDrawVertexCount: 3,
+      noiseHashMultiplier: 43758.5453123,
+      noiseHashX: 12.9898,
+      noiseHashY: 78.233,
+      noiseTextureFormat: 'rgba8unorm',
+      noiseTextureSize: 2048,
+    },
     brush: {
       maxLineCount: 240,
     },
@@ -228,20 +453,27 @@ export const appConfig = {
       adaptiveCapInitial: 1_000_000,
       adaptiveCapMax: 2_000_000,
       adaptiveCapMin: 500_000,
+      adaptiveRefreshTargetFps: 60,
+      frameGapResetSeconds: 1,
       fpsHeadroom: 0.95,
       fpsSmoothingNew: 0.06,
       fpsSmoothingRetain: 0.94,
+      initialFps: 60,
     },
     brushEffectFramesPerSecond: 60,
+    clearColor: { r: 0, g: 0, b: 0, a: 0 },
     initialAgentCount: 180_000,
     intro: {
       angleJitterRadians: Math.PI * 0.08,
+      angleEaseEnd: 1,
+      angleEaseStart: 0.6,
       circleMaxSideRatio: 0.46,
       circleMinSideRatio: 0.32,
       drawHintDelayMs: 3000,
       durationSeconds: 4,
       entryJitterSideRatio: 0.035,
       fontScaleDown: 0.94,
+      fontFamily: '"Open Sans", sans-serif',
       initialFontHeightRatio: 0.28,
       initialFontWidthRatio: 0.19,
       letterSpacingEm: 0.07,
@@ -253,7 +485,12 @@ export const appConfig = {
       minEntryJitterPx: 6,
       minFontSizePx: 18,
       minTargetJitterPx: 1,
+      pathEasing: 'easeOutQuad' as GardenAppConfig['simulation']['intro']['pathEasing'],
+      pathProgressEpsilon: 0.001,
       radialJitterRatio: 0.35,
+      radialStartEpsilon: 0.001,
+      resizeMinimumRemainingSeconds: 1.4,
+      resizeSettleMs: 120,
       targetDelayDistanceMultiplier: 0.12,
       targetDelayMax: 0.22,
       targetDelayRandomMultiplier: 0.06,
@@ -272,10 +509,12 @@ export const appConfig = {
       densityMultiplier: 110,
       maxAgentCount: 2_400,
       minAgentCount: 140,
+      minSegmentLengthPx: 1,
     },
   },
   storage: {
     audioMutedKey: 'fleeting-garden:audio-muted',
+    audioVolumeKey: 'fleeting-garden:audio-volume',
     vibeKey: 'fleeting-garden:vibe',
   },
   toolbar: {
@@ -289,6 +528,7 @@ export const appConfig = {
     },
     mirror: {
       default: 1,
+      fallbackSegmentName: 'slices',
       max: 12,
       min: 1,
       names: {
@@ -304,8 +544,38 @@ export const appConfig = {
         11: 'elevenths',
         12: 'twelfths',
       },
+      offLabel: 'Mirror off',
       step: 1,
     },
+    contrast: {
+      backgroundOpacityMax: 0.82,
+      brightLuminanceThreshold: 0.32,
+      brightWeight: 0.65,
+      bytesPerSample: 4,
+      contrastOffset: 0.05,
+      linearChannelBreakpoint: 0.03928,
+      linearChannelDivisor: 12.92,
+      linearChannelGamma: 2.4,
+      linearChannelOffset: 0.055,
+      linearChannelScale: 1.055,
+      lowContrastThreshold: 3,
+      lowContrastWeight: 1.8,
+      luminanceBase: 0.11,
+      luminanceBlueWeight: 0.0722,
+      luminanceGreenWeight: 0.7152,
+      luminanceRange: 0.28,
+      luminanceRedWeight: 0.2126,
+      sampleColumns: 13,
+      sampleIntervalMs: 300,
+      sampleRows: 7,
+      whiteContrastNumerator: 1.05,
+    },
+    volume: {
+      default: defaultAudioMasterVolume,
+      max: 1,
+      min: 0,
+      step: 0.01,
+    },
   },
   tuningPane: {
     expandedDepth: 1,
diff --git a/src/config/default-settings.ts b/src/config/default-settings.ts
index eaae74c..aa20316 100644
--- a/src/config/default-settings.ts
+++ b/src/config/default-settings.ts
@@ -6,12 +6,59 @@ export const defaultSettings: GardenAppConfig['defaultSettings'] = {
   ...colorInteractionSettings,
 
   turnWhenLost: 0.8,
+  sourceAttractionWeight: 24,
+  sourceSlowMoveRate: 0.08,
+  sourceTrailWeightMultiplier: 16,
+  forwardRotationScale: 0.25,
+  introNearDistanceMin: 28,
+  introNearDistanceInner: 4,
+  introNearSensorOffsetMultiplier: 0.75,
+  introTargetAngleBlend: 0.2,
+  introProgressCutoff: 0.999,
+  introTurnRateMultiplier: 3.4,
+  introRandomTurnMultiplier: 0.18,
+  introFarMoveMultiplier: 2.65,
+  introNearMoveMultiplier: 0.01,
+  introStepStopDistance: 0.5,
+  randomTimeScale: 0.34816,
 
   diffusionRateBrush: 0.35,
   decayRateBrush: 18,
+  diffusionDecayRateDivisor: 1000,
+  diffusionNeighborDivisor: 8,
+  brushDecayAlphaOffset: 1.001,
   brushEffectDuration: 8,
 
   brushCurveResolution: 12,
+  brushCurveMinBrushRadius: 1,
+  brushCurveMinSegmentSpacing: 4,
+  brushCurveMirrorResolutionExponent: 0.5,
+  brushCurveSegmentBrushRadiusRatio: 0.65,
+  brushSmoothingMinSampleDistance: 0.5,
 
   brushSizeVariation: 0.5,
+  brushAlpha: 1,
+  brushFeatherRatio: 0.22,
+  brushMinimumFeather: 1,
+  brushDiscardThreshold: 0.02,
+  brushCoarseNoiseScale: 160,
+  brushGrainNoiseScale: 22,
+  brushGrainNoiseOffsetX: 0.31,
+  brushGrainNoiseOffsetY: 0.67,
+  brushGrainMinStrength: 0.45,
+  brushGrainMaxStrength: 1,
+
+  eraserClearAlpha: 0,
+  eraserClearBlue: 0,
+  eraserClearGreen: 0,
+  eraserClearRed: 0,
+  eraserLineDistanceEpsilon: 0.0001,
+  eraserMaskAlphaThreshold: 0.5,
+
+  strokeSpawnSpreadBrushSizeMultiplier: 1,
+
+  renderTraceNormalizationFloor: 1,
+  renderBrushColorBase: 1.2,
+  renderBrushColorStrengthMultiplier: 1.6,
+  backgroundGrainStrength: 0.018,
 };
diff --git a/src/config/runtime-controls.ts b/src/config/runtime-controls.ts
index e208bbf..b526d34 100644
--- a/src/config/runtime-controls.ts
+++ b/src/config/runtime-controls.ts
@@ -29,6 +29,66 @@ export const runtimeControls: GardenAppConfig['runtimeSettings']['controls'] = {
     max: 1,
     step: 0.01,
   },
+  brushAlpha: {
+    folder: 'Brush',
+    min: 0,
+    max: 1,
+    step: 0.001,
+  },
+  brushFeatherRatio: {
+    folder: 'Brush',
+    min: 0,
+    max: 1,
+    step: 0.001,
+  },
+  brushMinimumFeather: {
+    folder: 'Brush',
+    min: 0,
+    max: 8,
+    step: 0.1,
+  },
+  brushDiscardThreshold: {
+    folder: 'Brush',
+    min: 0,
+    max: 0.25,
+    step: 0.001,
+  },
+  brushCoarseNoiseScale: {
+    folder: 'Brush',
+    min: 1,
+    max: 480,
+    step: 1,
+  },
+  brushGrainNoiseScale: {
+    folder: 'Brush',
+    min: 1,
+    max: 180,
+    step: 1,
+  },
+  brushGrainNoiseOffsetX: {
+    folder: 'Brush',
+    min: -2,
+    max: 2,
+    step: 0.01,
+  },
+  brushGrainNoiseOffsetY: {
+    folder: 'Brush',
+    min: -2,
+    max: 2,
+    step: 0.01,
+  },
+  brushGrainMinStrength: {
+    folder: 'Brush',
+    min: 0,
+    max: 1,
+    step: 0.001,
+  },
+  brushGrainMaxStrength: {
+    folder: 'Brush',
+    min: 0,
+    max: 2,
+    step: 0.001,
+  },
   brushCurveResolution: {
     folder: 'Brush',
     integer: true,
@@ -37,12 +97,66 @@ export const runtimeControls: GardenAppConfig['runtimeSettings']['controls'] = {
     max: 32,
     step: 1,
   },
+  brushSmoothingMinSampleDistance: {
+    folder: 'Brush',
+    min: 0,
+    max: 4,
+    step: 0.01,
+  },
+  brushCurveMinSegmentSpacing: {
+    folder: 'Brush',
+    min: 0.1,
+    max: 32,
+    step: 0.1,
+  },
+  brushCurveSegmentBrushRadiusRatio: {
+    folder: 'Brush',
+    min: 0,
+    max: 4,
+    step: 0.01,
+  },
+  brushCurveMinBrushRadius: {
+    folder: 'Brush',
+    min: 0.1,
+    max: 16,
+    step: 0.1,
+  },
+  brushCurveMirrorResolutionExponent: {
+    folder: 'Brush',
+    min: 0,
+    max: 2,
+    step: 0.01,
+  },
   clarity: {
     folder: 'Render',
     min: 0.00001,
     max: 1,
     step: 0.001,
   },
+  renderTraceNormalizationFloor: {
+    folder: 'Render',
+    min: 0.01,
+    max: 4,
+    step: 0.01,
+  },
+  renderBrushColorBase: {
+    folder: 'Render',
+    min: 0,
+    max: 4,
+    step: 0.01,
+  },
+  renderBrushColorStrengthMultiplier: {
+    folder: 'Render',
+    min: 0,
+    max: 4,
+    step: 0.01,
+  },
+  backgroundGrainStrength: {
+    folder: 'Render',
+    min: 0,
+    max: 0.12,
+    step: 0.001,
+  },
   decayRateBrush: {
     folder: 'Diffusion',
     min: 0.1,
@@ -61,6 +175,24 @@ export const runtimeControls: GardenAppConfig['runtimeSettings']['controls'] = {
     max: 1,
     step: 0.001,
   },
+  diffusionDecayRateDivisor: {
+    folder: 'Diffusion',
+    min: 1,
+    max: 5000,
+    step: 1,
+  },
+  diffusionNeighborDivisor: {
+    folder: 'Diffusion',
+    min: 1,
+    max: 16,
+    step: 0.1,
+  },
+  brushDecayAlphaOffset: {
+    folder: 'Diffusion',
+    min: 1,
+    max: 1.1,
+    step: 0.0001,
+  },
   diffusionRateTrails: {
     folder: 'Diffusion',
     min: 0,
@@ -74,6 +206,42 @@ export const runtimeControls: GardenAppConfig['runtimeSettings']['controls'] = {
     max: 240,
     step: 1,
   },
+  eraserMaskAlphaThreshold: {
+    folder: 'Eraser',
+    min: 0,
+    max: 1,
+    step: 0.001,
+  },
+  eraserLineDistanceEpsilon: {
+    folder: 'Eraser',
+    min: 0,
+    max: 0.01,
+    step: 0.00001,
+  },
+  eraserClearRed: {
+    folder: 'Eraser',
+    min: 0,
+    max: 1,
+    step: 0.001,
+  },
+  eraserClearGreen: {
+    folder: 'Eraser',
+    min: 0,
+    max: 1,
+    step: 0.001,
+  },
+  eraserClearBlue: {
+    folder: 'Eraser',
+    min: 0,
+    max: 1,
+    step: 0.001,
+  },
+  eraserClearAlpha: {
+    folder: 'Eraser',
+    min: 0,
+    max: 1,
+    step: 0.001,
+  },
   individualTrailWeight: {
     folder: 'Agent',
     min: 0,
@@ -118,6 +286,12 @@ export const runtimeControls: GardenAppConfig['runtimeSettings']['controls'] = {
     max: 1,
     step: 0.001,
   },
+  strokeSpawnSpreadBrushSizeMultiplier: {
+    folder: 'Agent',
+    min: 0,
+    max: 4,
+    step: 0.01,
+  },
   turnSpeed: {
     folder: 'Agent',
     min: 1,
@@ -130,4 +304,94 @@ export const runtimeControls: GardenAppConfig['runtimeSettings']['controls'] = {
     max: 1,
     step: 0.001,
   },
+  sourceAttractionWeight: {
+    folder: 'Agent',
+    min: 0,
+    max: 64,
+    step: 0.1,
+  },
+  sourceSlowMoveRate: {
+    folder: 'Agent',
+    min: 0,
+    max: 1,
+    step: 0.001,
+  },
+  sourceTrailWeightMultiplier: {
+    folder: 'Agent',
+    min: 0,
+    max: 64,
+    step: 0.1,
+  },
+  forwardRotationScale: {
+    folder: 'Agent',
+    min: 0,
+    max: 1,
+    step: 0.001,
+  },
+  introNearDistanceMin: {
+    folder: 'Agent',
+    min: 0,
+    max: 100,
+    step: 0.1,
+  },
+  introNearDistanceInner: {
+    folder: 'Agent',
+    min: 0,
+    max: 100,
+    step: 0.1,
+  },
+  introNearSensorOffsetMultiplier: {
+    folder: 'Agent',
+    min: 0,
+    max: 4,
+    step: 0.01,
+  },
+  introTargetAngleBlend: {
+    folder: 'Agent',
+    min: 0,
+    max: 1,
+    step: 0.001,
+  },
+  introProgressCutoff: {
+    folder: 'Agent',
+    min: 0,
+    max: 1,
+    step: 0.001,
+  },
+  introTurnRateMultiplier: {
+    folder: 'Agent',
+    min: 0,
+    max: 8,
+    step: 0.01,
+  },
+  introRandomTurnMultiplier: {
+    folder: 'Agent',
+    min: 0,
+    max: 2,
+    step: 0.001,
+  },
+  introFarMoveMultiplier: {
+    folder: 'Agent',
+    min: 0,
+    max: 6,
+    step: 0.01,
+  },
+  introNearMoveMultiplier: {
+    folder: 'Agent',
+    min: 0,
+    max: 1,
+    step: 0.001,
+  },
+  introStepStopDistance: {
+    folder: 'Agent',
+    min: 0,
+    max: 8,
+    step: 0.01,
+  },
+  randomTimeScale: {
+    folder: 'Agent',
+    min: 0,
+    max: 4,
+    step: 0.00001,
+  },
 };
diff --git a/src/config/types.ts b/src/config/types.ts
index a680917..8b0e1c2 100644
--- a/src/config/types.ts
+++ b/src/config/types.ts
@@ -19,11 +19,23 @@ export interface NumberControlConfig {
 
 export type GardenRuntimeSettings = {
   brushCurveResolution: number;
+  brushCurveMinBrushRadius: number;
+  brushCurveMinSegmentSpacing: number;
+  brushCurveMirrorResolutionExponent: number;
+  brushCurveSegmentBrushRadiusRatio: number;
   brushEffectDuration: number;
+  brushSmoothingMinSampleDistance: number;
+  eraserClearAlpha: number;
+  eraserClearBlue: number;
+  eraserClearGreen: number;
+  eraserClearRed: number;
+  eraserLineDistanceEpsilon: number;
+  eraserMaskAlphaThreshold: number;
   eraserSize: number;
   mirrorSegmentCount: number;
   selectedColorIndex: number;
   spawnPerPixel: number;
+  strokeSpawnSpreadBrushSizeMultiplier: number;
 } & AgentSettings &
   BrushSettings &
   DiffusionSettings &
@@ -69,10 +81,15 @@ export interface GardenAppConfig {
   };
   export4k: {
     bytesPerPixel: number;
+    filenameExtension: string;
+    filenamePrefix: string;
+    filenameSuffix: string;
     height: number;
     jsHeapSafetyMultiplier: number;
+    jsHeapTextureBytesMultiplier: number;
     lowMemoryDeviceGiB: number;
     lowMemoryExportFraction: number;
+    mimeType: string;
     rowAlignmentBytes: number;
     width: number;
   };
@@ -82,6 +99,17 @@ export interface GardenAppConfig {
     hideDelayMs: number;
   };
   pipelines: {
+    common: {
+      noiseChannelSeeds: [number, number, number, number];
+      noiseClearValue: GPUColor;
+      noiseDrawInstanceCount: number;
+      noiseDrawVertexCount: number;
+      noiseHashMultiplier: number;
+      noiseHashX: number;
+      noiseHashY: number;
+      noiseTextureFormat: GPUTextureFormat;
+      noiseTextureSize: number;
+    };
     brush: {
       maxLineCount: number;
     };
@@ -102,20 +130,27 @@ export interface GardenAppConfig {
       adaptiveCapInitial: number;
       adaptiveCapMax: number;
       adaptiveCapMin: number;
+      adaptiveRefreshTargetFps: number;
+      frameGapResetSeconds: number;
       fpsHeadroom: number;
       fpsSmoothingNew: number;
       fpsSmoothingRetain: number;
+      initialFps: number;
     };
     brushEffectFramesPerSecond: number;
+    clearColor: GPUColor;
     initialAgentCount: number;
     intro: {
       angleJitterRadians: number;
+      angleEaseEnd: number;
+      angleEaseStart: number;
       circleMaxSideRatio: number;
       circleMinSideRatio: number;
       drawHintDelayMs: number;
       durationSeconds: number;
       entryJitterSideRatio: number;
       fontScaleDown: number;
+      fontFamily: string;
       initialFontHeightRatio: number;
       initialFontWidthRatio: number;
       letterSpacingEm: number;
@@ -127,7 +162,12 @@ export interface GardenAppConfig {
       minEntryJitterPx: number;
       minFontSizePx: number;
       minTargetJitterPx: number;
+      pathEasing: 'easeOutQuad' | 'linear';
+      pathProgressEpsilon: number;
       radialJitterRatio: number;
+      radialStartEpsilon: number;
+      resizeMinimumRemainingSeconds: number;
+      resizeSettleMs: number;
       targetDelayDistanceMultiplier: number;
       targetDelayMax: number;
       targetDelayRandomMultiplier: number;
@@ -146,10 +186,12 @@ export interface GardenAppConfig {
       densityMultiplier: number;
       maxAgentCount: number;
       minAgentCount: number;
+      minSegmentLengthPx: number;
     };
   };
   storage: {
     audioMutedKey: string;
+    audioVolumeKey: string;
     vibeKey: string;
   };
   toolbar: {
@@ -163,9 +205,40 @@ export interface GardenAppConfig {
     };
     mirror: {
       default: number;
+      fallbackSegmentName: string;
       max: number;
       min: number;
       names: Record<number, string>;
+      offLabel: string;
+      step: number;
+    };
+    contrast: {
+      backgroundOpacityMax: number;
+      brightLuminanceThreshold: number;
+      brightWeight: number;
+      bytesPerSample: number;
+      contrastOffset: number;
+      linearChannelBreakpoint: number;
+      linearChannelDivisor: number;
+      linearChannelGamma: number;
+      linearChannelOffset: number;
+      linearChannelScale: number;
+      lowContrastThreshold: number;
+      lowContrastWeight: number;
+      luminanceBase: number;
+      luminanceBlueWeight: number;
+      luminanceGreenWeight: number;
+      luminanceRange: number;
+      luminanceRedWeight: number;
+      sampleColumns: number;
+      sampleIntervalMs: number;
+      sampleRows: number;
+      whiteContrastNumerator: number;
+    };
+    volume: {
+      default: number;
+      max: number;
+      min: number;
       step: number;
     };
   };
diff --git a/src/config/vibe-presets.ts b/src/config/vibe-presets.ts
index ea2bf0c..40fbfe3 100644
--- a/src/config/vibe-presets.ts
+++ b/src/config/vibe-presets.ts
@@ -16,7 +16,10 @@ const minorProgression: Array<GardenAudioChord> = [
 ];
 
 const majorPentatonic = [0, 2, 4, 7, 9];
-const minorPentatonic = [0, 3, 5, 7, 10];
+const suspendedPentatonic = [0, 2, 5, 7, 9];
+const mixolydianPentatonic = [0, 2, 4, 7, 10];
+const dorianHexatonic = [0, 2, 3, 5, 7, 10];
+const darkMinorPentatonic = [0, 2, 3, 7, 10];
 
 export const defaultVibeId = 'candy-rain';
 
@@ -65,7 +68,7 @@ export const vibePresets: Array<VibePreset> = [
     },
     audio: {
       rootMidi: 53,
-      scale: majorPentatonic,
+      scale: mixolydianPentatonic,
       brightness: 0.92,
       delayTimeMultiplier: 1.08,
       progression: [
@@ -95,7 +98,7 @@ export const vibePresets: Array<VibePreset> = [
     },
     audio: {
       rootMidi: 50,
-      scale: minorPentatonic,
+      scale: dorianHexatonic,
       brightness: 1,
       delayTimeMultiplier: 1.12,
       progression: minorProgression,
@@ -120,7 +123,7 @@ export const vibePresets: Array<VibePreset> = [
     },
     audio: {
       rootMidi: 49,
-      scale: minorPentatonic,
+      scale: darkMinorPentatonic,
       brightness: 0.9,
       delayTimeMultiplier: 1.24,
       progression: minorProgression,
@@ -170,7 +173,7 @@ export const vibePresets: Array<VibePreset> = [
     },
     audio: {
       rootMidi: 62,
-      scale: majorPentatonic,
+      scale: suspendedPentatonic,
       brightness: 0.88,
       delayTimeMultiplier: 1.32,
       progression: [
diff --git a/src/game-loop/agent-population.ts b/src/game-loop/agent-population.ts
index 7e66f4c..b65b2be 100644
--- a/src/game-loop/agent-population.ts
+++ b/src/game-loop/agent-population.ts
@@ -6,17 +6,6 @@ import { AgentGenerationPipeline } from '../pipelines/agents/agent-generation/ag
 import { settings } from '../settings';
 import { createIntroTitleAgents } from './intro-title-agents';
 
-const INITIAL_AGENT_COUNT = appConfig.simulation.initialAgentCount;
-const MIN_STROKE_AGENT_COUNT = appConfig.simulation.stroke.minAgentCount;
-const MAX_STROKE_AGENT_COUNT = appConfig.simulation.stroke.maxAgentCount;
-const STROKE_AGENT_DENSITY_MULTIPLIER = appConfig.simulation.stroke.densityMultiplier;
-const ADAPTIVE_CAP_MAX = appConfig.simulation.budget.adaptiveCapMax;
-const ADAPTIVE_CAP_MIN = appConfig.simulation.budget.adaptiveCapMin;
-const ADAPTIVE_CAP_INITIAL = appConfig.simulation.budget.adaptiveCapInitial;
-const ADAPTIVE_CAP_DECREASE_AGENTS_PER_SECOND =
-  appConfig.simulation.budget.adaptiveCapDecreaseAgentsPerSecond;
-const ADAPTIVE_REFRESH_TARGET_FPS = 60;
-
 export class AgentPopulation {
   private activeCount = 0;
   private adaptiveCap: number;
@@ -25,11 +14,16 @@ export class AgentPopulation {
   private shouldCompactAfterErase = false;
   private isCompacting = false;
   private readonly strokeAgentData = new Float32Array(
-    MAX_STROKE_AGENT_COUNT * AGENT_FLOAT_COUNT
+    appConfig.simulation.stroke.maxAgentCount * AGENT_FLOAT_COUNT
   );
 
-  public constructor(private readonly pipeline: AgentGenerationPipeline) {
-    this.adaptiveCap = this.clampAdaptiveCap(ADAPTIVE_CAP_INITIAL);
+  public constructor(
+    private readonly pipeline: AgentGenerationPipeline,
+    private readonly introSeed = Math.floor(Math.random() * 0xffffffff)
+  ) {
+    this.adaptiveCap = this.clampAdaptiveCap(
+      appConfig.simulation.budget.adaptiveCapInitial
+    );
   }
 
   public get activeAgentCount(): number {
@@ -37,15 +31,30 @@ export class AgentPopulation {
   }
 
   public initializeIntroAgents(canvasSize: vec2): void {
+    this.replaceIntroAgents(canvasSize, 0);
+  }
+
+  public replaceIntroAgents(canvasSize: vec2, progress: number): void {
     this.adaptiveCap = this.clampAdaptiveCap(this.adaptiveCap);
-    const introAgentCount = Math.min(this.adaptiveCap, INITIAL_AGENT_COUNT);
-    this.writeAgentBatch(
-      createIntroTitleAgents({
-        count: introAgentCount,
-        width: canvasSize[0],
-        height: canvasSize[1],
-      })
+    const introAgentCount = Math.min(
+      this.adaptiveCap,
+      appConfig.simulation.initialAgentCount
     );
+    const data = createIntroTitleAgents({
+      count: introAgentCount,
+      width: canvasSize[0],
+      height: canvasSize[1],
+      progress,
+      seed: this.introSeed,
+    });
+
+    if (data.length === 0) {
+      return;
+    }
+
+    this.pipeline.writeAgents(0, data);
+    this.activeCount = data.length / AGENT_FLOAT_COUNT;
+    this.replacementCursor = 0;
   }
 
   public onVibeChanged(): void {
@@ -87,12 +96,18 @@ export class AgentPopulation {
   }
 
   public spawnStrokeAgents(from: vec2, to: vec2): void {
-    const length = Math.max(1, vec2.dist(from, to));
+    const length = Math.max(
+      appConfig.simulation.stroke.minSegmentLengthPx,
+      vec2.dist(from, to)
+    );
     const count = Math.max(
-      MIN_STROKE_AGENT_COUNT,
+      appConfig.simulation.stroke.minAgentCount,
       Math.min(
-        MAX_STROKE_AGENT_COUNT,
-        Math.ceil(length * settings.spawnPerPixel * STROKE_AGENT_DENSITY_MULTIPLIER)
+        appConfig.simulation.stroke.maxAgentCount,
+        this.strokeAgentData.length / AGENT_FLOAT_COUNT,
+        Math.ceil(
+          length * settings.spawnPerPixel * appConfig.simulation.stroke.densityMultiplier
+        )
       )
     );
     const direction = vec2.sub(vec2.create(), to, from);
@@ -106,8 +121,9 @@ export class AgentPopulation {
         baseAngle +
         (Math.random() - 0.5) * appConfig.simulation.stroke.angleJitterRadians;
       const base = i * AGENT_FLOAT_COUNT;
-      this.strokeAgentData[base] = x + (Math.random() - 0.5) * settings.brushSize;
-      this.strokeAgentData[base + 1] = y + (Math.random() - 0.5) * settings.brushSize;
+      const spread = settings.brushSize * settings.strokeSpawnSpreadBrushSizeMultiplier;
+      this.strokeAgentData[base] = x + (Math.random() - 0.5) * spread;
+      this.strokeAgentData[base + 1] = y + (Math.random() - 0.5) * spread;
       this.strokeAgentData[base + 2] = angle;
       this.strokeAgentData[base + 3] = settings.selectedColorIndex;
       this.strokeAgentData[base + 4] = -1;
@@ -164,7 +180,8 @@ export class AgentPopulation {
     const previousCap = this.clampAdaptiveCap(this.adaptiveCap);
     this.canExpandAdaptiveCap =
       smoothedFps >=
-      ADAPTIVE_REFRESH_TARGET_FPS * appConfig.simulation.budget.fpsHeadroom;
+      appConfig.simulation.budget.adaptiveRefreshTargetFps *
+        appConfig.simulation.budget.fpsHeadroom;
 
     if (this.canExpandAdaptiveCap) {
       this.adaptiveCap = previousCap;
@@ -174,7 +191,9 @@ export class AgentPopulation {
 
     const decrease = Math.max(
       1,
-      Math.ceil(ADAPTIVE_CAP_DECREASE_AGENTS_PER_SECOND * deltaTime)
+      Math.ceil(
+        appConfig.simulation.budget.adaptiveCapDecreaseAgentsPerSecond * deltaTime
+      )
     );
     const nextCap = this.clampAdaptiveCap(previousCap - decrease);
     this.adaptiveCap = nextCap;
@@ -207,8 +226,8 @@ export class AgentPopulation {
 
   private clampAdaptiveCap(value: number): number {
     const pipelineCap = Math.max(0, Math.floor(this.pipeline.maxAgentCount));
-    const maxCap = Math.min(ADAPTIVE_CAP_MAX, pipelineCap);
-    const minCap = Math.min(ADAPTIVE_CAP_MIN, maxCap);
+    const maxCap = Math.min(appConfig.simulation.budget.adaptiveCapMax, pipelineCap);
+    const minCap = Math.min(appConfig.simulation.budget.adaptiveCapMin, maxCap);
     const finiteValue = Number.isFinite(value) ? value : minCap;
     return Math.min(maxCap, Math.max(minCap, Math.round(finiteValue)));
   }
diff --git a/src/game-loop/export-4k-renderer.ts b/src/game-loop/export-4k-renderer.ts
index f9a5b92..32375d2 100644
--- a/src/game-loop/export-4k-renderer.ts
+++ b/src/game-loop/export-4k-renderer.ts
@@ -1,3 +1,4 @@
+import { appConfig } from '../config';
 import { RenderPipeline } from '../pipelines/render/render-pipeline';
 import {
   estimateExport4KMemory,
@@ -133,14 +134,14 @@ export class Export4KRenderer {
       throw new Error('Could not create export canvas');
     }
     context.putImageData(new ImageData(pixels, width, height), 0, 0);
-    const blob = await canvas.convertToBlob({ type: 'image/png' });
+    const blob = await canvas.convertToBlob({ type: appConfig.export4k.mimeType });
     const link = document.createElement('a');
     const objectUrl = URL.createObjectURL(blob);
     try {
       link.href = objectUrl;
-      link.download = `fleeting-garden_${this.options.getVibeId()}_${
+      link.download = `${appConfig.export4k.filenamePrefix}_${this.options.getVibeId()}_${
         this.options.seed
-      }_${width}x${height}-upscale.png`;
+      }_${width}x${height}${appConfig.export4k.filenameSuffix}.${appConfig.export4k.filenameExtension}`;
       link.click();
     } finally {
       URL.revokeObjectURL(objectUrl);
@@ -178,8 +179,8 @@ const readExportPixels = ({
     const sourceOffset = y * bytesPerRow;
     const targetOffset = y * unpaddedBytesPerRow;
     for (let x = 0; x < width; x++) {
-      const source = sourceOffset + x * 4;
-      const target = targetOffset + x * 4;
+      const source = sourceOffset + x * appConfig.export4k.bytesPerPixel;
+      const target = targetOffset + x * appConfig.export4k.bytesPerPixel;
       pixels[target] = isBgra ? mapped[source + 2] : mapped[source];
       pixels[target + 1] = mapped[source + 1];
       pixels[target + 2] = isBgra ? mapped[source] : mapped[source + 2];
diff --git a/src/game-loop/export-4k.ts b/src/game-loop/export-4k.ts
index 9acc46d..8adf5ec 100644
--- a/src/game-loop/export-4k.ts
+++ b/src/game-loop/export-4k.ts
@@ -1,15 +1,7 @@
 import { appConfig } from '../config';
 import { RuntimeError } from '../utils/error-handler';
 
-const EXPORT_4K_WIDTH = appConfig.export4k.width;
-const EXPORT_4K_HEIGHT = appConfig.export4k.height;
-
-const BYTES_PER_PIXEL = appConfig.export4k.bytesPerPixel;
-const ROW_ALIGNMENT_BYTES = appConfig.export4k.rowAlignmentBytes;
 const GIBIBYTE = 1024 ** 3;
-const LOW_MEMORY_DEVICE_GIB = appConfig.export4k.lowMemoryDeviceGiB;
-const LOW_MEMORY_EXPORT_FRACTION = appConfig.export4k.lowMemoryExportFraction;
-const JS_HEAP_SAFETY_MULTIPLIER = appConfig.export4k.jsHeapSafetyMultiplier;
 
 interface Export4KMemoryEstimate {
   width: number;
@@ -50,8 +42,8 @@ const formatByteSize = (bytes: number): string => `${Math.ceil(bytes / 1024 / 10
 export const getAspectFitExport4KDimensions = (
   sourceWidth: number,
   sourceHeight: number,
-  maxWidth = EXPORT_4K_WIDTH,
-  maxHeight = EXPORT_4K_HEIGHT
+  maxWidth = appConfig.export4k.width,
+  maxHeight = appConfig.export4k.height
 ): Export4KDimensions => {
   if (
     !Number.isFinite(sourceWidth) ||
@@ -71,14 +63,15 @@ export const getAspectFitExport4KDimensions = (
 };
 
 export const estimateExport4KMemory = (
-  width = EXPORT_4K_WIDTH,
-  height = EXPORT_4K_HEIGHT
+  width = appConfig.export4k.width,
+  height = appConfig.export4k.height
 ): Export4KMemoryEstimate => {
-  const unpaddedBytesPerRow = width * BYTES_PER_PIXEL;
-  const bytesPerRow = alignTo(unpaddedBytesPerRow, ROW_ALIGNMENT_BYTES);
+  const unpaddedBytesPerRow = width * appConfig.export4k.bytesPerPixel;
+  const bytesPerRow = alignTo(unpaddedBytesPerRow, appConfig.export4k.rowAlignmentBytes);
   const textureBytes = unpaddedBytesPerRow * height;
   const readbackBufferBytes = bytesPerRow * height;
-  const estimatedJsHeapBytes = textureBytes * 4;
+  const estimatedJsHeapBytes =
+    textureBytes * appConfig.export4k.jsHeapTextureBytesMultiplier;
 
   return {
     width,
@@ -135,7 +128,7 @@ export const getExport4KPreflightError = ({
   ) {
     return new RuntimeError(
       'export-4k-texture-too-large',
-      'This GPU cannot create a 3840x2160 export texture.',
+      `This GPU cannot create a ${estimate.width}x${estimate.height} export texture.`,
       {
         details: {
           exportWidth: estimate.width,
@@ -161,9 +154,9 @@ export const getExport4KPreflightError = ({
 
   if (
     memoryInfo.deviceMemoryBytes !== undefined &&
-    memoryInfo.deviceMemoryBytes <= LOW_MEMORY_DEVICE_GIB * GIBIBYTE &&
+    memoryInfo.deviceMemoryBytes <= appConfig.export4k.lowMemoryDeviceGiB * GIBIBYTE &&
     estimate.estimatedPeakBytes >
-      memoryInfo.deviceMemoryBytes * LOW_MEMORY_EXPORT_FRACTION
+      memoryInfo.deviceMemoryBytes * appConfig.export4k.lowMemoryExportFraction
   ) {
     return new RuntimeError(
       'export-4k-low-device-memory',
@@ -187,7 +180,7 @@ export const getExport4KPreflightError = ({
       memoryInfo.jsHeapSizeLimitBytes - memoryInfo.usedJsHeapSizeBytes;
     if (
       availableJsHeapBytes <
-      estimate.estimatedJsHeapBytes * JS_HEAP_SAFETY_MULTIPLIER
+      estimate.estimatedJsHeapBytes * appConfig.export4k.jsHeapSafetyMultiplier
     ) {
       return new RuntimeError(
         'export-4k-low-js-heap',
diff --git a/src/game-loop/frame-performance.ts b/src/game-loop/frame-performance.ts
index 7fe2112..ac3e18f 100644
--- a/src/game-loop/frame-performance.ts
+++ b/src/game-loop/frame-performance.ts
@@ -1,10 +1,7 @@
 import { appConfig } from '../config';
 
-const INITIAL_FPS = 60;
-const FRAME_GAP_RESET_SECONDS = 1;
-
 export class FramePerformance {
-  public smoothedFps = INITIAL_FPS;
+  public smoothedFps = appConfig.simulation.budget.initialFps;
 
   private previousFrameTime: DOMHighResTimeStamp | null = null;
 
@@ -16,7 +13,10 @@ export class FramePerformance {
     }
 
     const deltaSeconds = (time - previous) / 1000;
-    if (deltaSeconds <= 0 || deltaSeconds > FRAME_GAP_RESET_SECONDS) {
+    if (
+      deltaSeconds <= 0 ||
+      deltaSeconds > appConfig.simulation.budget.frameGapResetSeconds
+    ) {
       return;
     }
 
diff --git a/src/game-loop/game-loop-ping-pong.test.ts b/src/game-loop/game-loop-ping-pong.test.ts
index 60ff81c..588725b 100644
--- a/src/game-loop/game-loop-ping-pong.test.ts
+++ b/src/game-loop/game-loop-ping-pong.test.ts
@@ -47,8 +47,8 @@ describe('GameLoop ping-pong texture flow', () => {
     expect(resizableTextureSource).toContain('public getTexture(): GPUTexture');
     expect(resizableTextureSource).toContain('GPUTextureUsage.COPY_SRC');
     expect(resizableTextureSource).toContain('GPUTextureUsage.COPY_DST');
-    expect(resizableTextureSource).toContain('this.copyPipeline.execute(');
-    expect(simulationTexturesSource).toContain('private readonly copyPipeline');
+    expect(resizableTextureSource).toContain('commandEncoder.copyTextureToTexture(');
+    expect(simulationTexturesSource).not.toContain('private readonly copyPipeline');
   });
 
   it('keeps ping-pong texture references mutable and swaps A/B identities', () => {
diff --git a/src/game-loop/game-loop-resources.ts b/src/game-loop/game-loop-resources.ts
index 8511de6..d285719 100644
--- a/src/game-loop/game-loop-resources.ts
+++ b/src/game-loop/game-loop-resources.ts
@@ -63,12 +63,12 @@ export class GameLoopResources {
     this.agentPipeline = new AgentPipeline(
       this.device,
       this.commonState,
-      this.agentGenerationPipeline.agentsBuffer
+      () => this.agentGenerationPipeline.agentsBuffer
     );
     this.brushPipeline = new BrushPipeline(this.device, this.commonState);
     this.eraserAgentPipeline = new EraserAgentPipeline(
       this.device,
-      this.agentGenerationPipeline.agentsBuffer
+      () => this.agentGenerationPipeline.agentsBuffer
     );
     this.eraserTexturePipeline = new EraserTexturePipeline(this.device, this.commonState);
     this.diffusionPipeline = new DiffusionPipeline(this.device);
@@ -90,6 +90,10 @@ export class GameLoopResources {
     return this.textures.resizeTo(nextSize);
   }
 
+  public clearSimulation(): void {
+    this.textures.clear();
+  }
+
   public setFrameParameters({
     time,
     deltaTime,
@@ -129,9 +133,15 @@ export class GameLoopResources {
     });
     this.eraserAgentPipeline.setParameters({
       agentCount: activeAgentCount,
+      eraserMaskAlphaThreshold: settings.eraserMaskAlphaThreshold,
     });
     this.eraserTexturePipeline.setParameters({
       eraserSize: eraserPixelSize,
+      eraserLineDistanceEpsilon: settings.eraserLineDistanceEpsilon,
+      eraserClearRed: settings.eraserClearRed,
+      eraserClearGreen: settings.eraserClearGreen,
+      eraserClearBlue: settings.eraserClearBlue,
+      eraserClearAlpha: settings.eraserClearAlpha,
     });
     this.setBrushEffectDiffusionParameters();
   }
diff --git a/src/game-loop/game-loop.ts b/src/game-loop/game-loop.ts
index 305b91a..dcf46b6 100644
--- a/src/game-loop/game-loop.ts
+++ b/src/game-loop/game-loop.ts
@@ -17,8 +17,6 @@ import { RenderInputCache } from './render-input-cache';
 import { ToolbarContrastMonitor } from './toolbar-contrast-monitor';
 
 export default class GameLoop {
-  private static readonly MAX_MIRROR_SEGMENT_COUNT = appConfig.toolbar.mirror.max;
-
   private readonly resources: GameLoopResources;
   private readonly audio = new GardenAudio(gardenAudioConfig);
   private readonly renderInputs = new RenderInputCache();
@@ -29,10 +27,12 @@ export default class GameLoop {
   private readonly export4KRenderer: Export4KRenderer;
   private readonly framePerformance = new FramePerformance();
   private readonly toolbarContrastMonitor: ToolbarContrastMonitor;
-  private readonly seed = Math.floor(Math.random() * 0xffffffff).toString(16);
+  private readonly seedValue = Math.floor(Math.random() * 0xffffffff);
+  private readonly seed = this.seedValue.toString(16);
   private readonly resizeListener = this.resize.bind(this);
   private readonly keydownListener: (event: KeyboardEvent) => void;
 
+  private pendingIntroResizeAt: DOMHighResTimeStamp | null = null;
   private hasFinished = false;
   private readonly finished = Promise.withResolvers<void>();
 
@@ -47,7 +47,10 @@ export default class GameLoop {
     this.introPrompt = new IntroPrompt(ui.prompt);
     this.eraserPreview = new EraserPreview(canvas, ui.eraserPreview);
     this.toolbarContrastMonitor = new ToolbarContrastMonitor(canvas, ui.toolbar, device);
-    this.agentPopulation = new AgentPopulation(this.resources.agentGenerationPipeline);
+    this.agentPopulation = new AgentPopulation(
+      this.resources.agentGenerationPipeline,
+      this.seedValue
+    );
     this.agentPopulation.initializeIntroAgents(this.canvasSize);
     this.pointerInput = new GardenPointerInput({
       canvas,
@@ -102,6 +105,10 @@ export default class GameLoop {
     this.audio.setMuted(isMuted);
   }
 
+  public setAudioVolume(volume: number): void {
+    this.audio.setMasterVolume(volume);
+  }
+
   public startAudio(userGesture = false): void {
     this.audio.start(activeVibe, { userGesture });
   }
@@ -141,9 +148,10 @@ export default class GameLoop {
     const deltaTime = this.deltaTimeCalculator.calculateDeltaTimeInSeconds(time);
     this.framePerformance.update(time);
     this.agentPopulation.growBudget(deltaTime, this.framePerformance.smoothedFps);
-    this.introPrompt.update();
+    this.introPrompt.update(this.pendingIntroResizeAt === null ? deltaTime : 0);
     this.resize();
-    this.resizeSimulationToCanvas();
+    this.resizeSimulationToCanvas(time);
+    this.regenerateIntroAfterSettledResize(time);
 
     const { channelColors, backgroundColor } = this.renderInputs.get();
     const introProgress = this.introPrompt.progress;
@@ -198,7 +206,7 @@ export default class GameLoop {
     this.canvas.height = height;
   }
 
-  private resizeSimulationToCanvas(): void {
+  private resizeSimulationToCanvas(time: DOMHighResTimeStamp): void {
     const scale = this.resources.resizeSimulationTo(this.canvasSize);
     if (!scale) {
       return;
@@ -206,6 +214,32 @@ export default class GameLoop {
 
     this.agentPopulation.resizeAgents(scale);
     this.pointerInput.scaleLastPointerPosition(scale);
+
+    if (this.introPrompt.shouldRegenerateTitleOnResize) {
+      this.pendingIntroResizeAt = time;
+    }
+  }
+
+  private regenerateIntroAfterSettledResize(time: DOMHighResTimeStamp): void {
+    if (this.pendingIntroResizeAt === null) {
+      return;
+    }
+
+    if (!this.introPrompt.shouldRegenerateTitleOnResize) {
+      this.pendingIntroResizeAt = null;
+      return;
+    }
+
+    if (time - this.pendingIntroResizeAt < appConfig.simulation.intro.resizeSettleMs) {
+      return;
+    }
+
+    this.introPrompt.rewindToLeaveRemainingTime(
+      appConfig.simulation.intro.resizeMinimumRemainingSeconds
+    );
+    this.resources.clearSimulation();
+    this.agentPopulation.replaceIntroAgents(this.canvasSize, this.introPrompt.progress);
+    this.pendingIntroResizeAt = null;
   }
 
   private get canvasSize(): vec2 {
@@ -220,7 +254,10 @@ export default class GameLoop {
   private get mirrorSegmentCount(): number {
     const count = Number.isFinite(settings.mirrorSegmentCount)
       ? settings.mirrorSegmentCount
-      : 1;
-    return Math.min(GameLoop.MAX_MIRROR_SEGMENT_COUNT, Math.max(1, Math.round(count)));
+      : appConfig.toolbar.mirror.min;
+    return Math.min(
+      appConfig.toolbar.mirror.max,
+      Math.max(appConfig.toolbar.mirror.min, Math.round(count))
+    );
   }
 }
diff --git a/src/game-loop/intro-prompt.test.ts b/src/game-loop/intro-prompt.test.ts
new file mode 100644
index 0000000..90650fe
--- /dev/null
+++ b/src/game-loop/intro-prompt.test.ts
@@ -0,0 +1,58 @@
+import { describe, expect, it, vi } from 'vitest';
+
+import { appConfig } from '../config';
+import { IntroPrompt } from './intro-prompt';
+
+const createPromptElement = (): HTMLElement =>
+  ({
+    classList: {
+      add: vi.fn(),
+      contains: vi.fn(() => false),
+      remove: vi.fn(),
+    },
+    innerHTML: '',
+    replaceChildren: vi.fn(),
+  }) as unknown as HTMLElement;
+
+describe('IntroPrompt', () => {
+  it('advances progress from simulation delta time', () => {
+    const prompt = new IntroPrompt(createPromptElement());
+
+    prompt.update(appConfig.simulation.intro.durationSeconds / 2);
+
+    expect(prompt.progress).toBeCloseTo(0.5);
+  });
+
+  it('caps progress when the intro completes', () => {
+    const prompt = new IntroPrompt(createPromptElement());
+
+    prompt.update(appConfig.simulation.intro.durationSeconds * 2);
+    prompt.update(appConfig.simulation.intro.durationSeconds);
+
+    expect(prompt.progress).toBe(1);
+  });
+
+  it('can rewind an active intro to leave a minimum resize paint window', () => {
+    const prompt = new IntroPrompt(createPromptElement());
+
+    prompt.update(appConfig.simulation.intro.durationSeconds * 0.95);
+    prompt.rewindToLeaveRemainingTime(appConfig.simulation.intro.durationSeconds * 0.25);
+
+    expect(prompt.progress).toBeCloseTo(0.75);
+  });
+
+  it('allows title regeneration only before drawing or completion', () => {
+    const prompt = new IntroPrompt(createPromptElement());
+
+    expect(prompt.shouldRegenerateTitleOnResize).toBe(true);
+
+    prompt.markStartedDrawing();
+
+    expect(prompt.shouldRegenerateTitleOnResize).toBe(false);
+
+    const completedPrompt = new IntroPrompt(createPromptElement());
+    completedPrompt.complete();
+
+    expect(completedPrompt.shouldRegenerateTitleOnResize).toBe(false);
+  });
+});
diff --git a/src/game-loop/intro-prompt.ts b/src/game-loop/intro-prompt.ts
index 874a5ba..cd9468d 100644
--- a/src/game-loop/intro-prompt.ts
+++ b/src/game-loop/intro-prompt.ts
@@ -1,11 +1,10 @@
 import { appConfig } from '../config';
 
-const INTRO_TITLE_DURATION_MS = appConfig.simulation.intro.durationSeconds * 1000;
 const DRAW_HINT_CLASS = 'draw-hint';
 
 export class IntroPrompt {
   private introComplete = false;
-  private introStartedAt = performance.now();
+  private introElapsedSeconds = 0;
   private introCompletedAt: number | null = null;
   private hasStartedDrawing = false;
 
@@ -14,13 +13,42 @@ export class IntroPrompt {
   public get progress(): number {
     return this.introComplete
       ? 1
-      : Math.min(1, (performance.now() - this.introStartedAt) / INTRO_TITLE_DURATION_MS);
+      : Math.min(
+          1,
+          this.introElapsedSeconds / appConfig.simulation.intro.durationSeconds
+        );
   }
 
-  public update(): void {
+  public get shouldRegenerateTitleOnResize(): boolean {
+    return !this.introComplete && !this.hasStartedDrawing;
+  }
+
+  public rewindToLeaveRemainingTime(remainingSeconds: number): void {
+    if (this.introComplete) {
+      return;
+    }
+
+    const safeRemainingSeconds = Number.isFinite(remainingSeconds)
+      ? Math.max(0, remainingSeconds)
+      : 0;
+    this.introElapsedSeconds = Math.min(
+      this.introElapsedSeconds,
+      Math.max(0, appConfig.simulation.intro.durationSeconds - safeRemainingSeconds)
+    );
+  }
+
+  public update(deltaTime: number): void {
     const now = performance.now();
 
-    if (!this.introComplete && now - this.introStartedAt > INTRO_TITLE_DURATION_MS) {
+    if (!this.introComplete) {
+      const safeDeltaTime = Number.isFinite(deltaTime) ? Math.max(0, deltaTime) : 0;
+      this.introElapsedSeconds += safeDeltaTime;
+    }
+
+    if (
+      !this.introComplete &&
+      this.introElapsedSeconds >= appConfig.simulation.intro.durationSeconds
+    ) {
       this.complete(now);
     }
 
diff --git a/src/game-loop/intro-title-agents.test.ts b/src/game-loop/intro-title-agents.test.ts
new file mode 100644
index 0000000..03a8688
--- /dev/null
+++ b/src/game-loop/intro-title-agents.test.ts
@@ -0,0 +1,97 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+
+import { AGENT_FLOAT_COUNT } from '../pipelines/agents/agent-generation/agent';
+import { createIntroTitleAgents } from './intro-title-agents';
+
+const installCanvasMask = () => {
+  Object.defineProperty(globalThis, 'document', {
+    configurable: true,
+    value: {
+      createElement: vi.fn(() => {
+        const canvas = {
+          width: 0,
+          height: 0,
+          getContext: vi.fn(() => ({
+            clearRect: vi.fn(),
+            fillStyle: '',
+            fillText: vi.fn(),
+            font: '',
+            getImageData: vi.fn(() => {
+              const data = new Uint8ClampedArray(canvas.width * canvas.height * 4);
+              for (let i = 3; i < data.length; i += 4) {
+                data[i] = 255;
+              }
+              return { data };
+            }),
+            lineJoin: '',
+            lineWidth: 0,
+            measureText: vi.fn((text: string) => ({
+              actualBoundingBoxAscent: 10,
+              actualBoundingBoxDescent: 4,
+              width: text.length * 10,
+            })),
+            strokeStyle: '',
+            strokeText: vi.fn(),
+            textAlign: '',
+            textBaseline: '',
+          })),
+        };
+
+        return canvas;
+      }),
+    },
+  });
+};
+
+describe('createIntroTitleAgents', () => {
+  beforeEach(() => {
+    installCanvasMask();
+  });
+
+  afterEach(() => {
+    Reflect.deleteProperty(globalThis, 'document');
+  });
+
+  it('creates deterministic agents for the same seed and progress', () => {
+    const first = createIntroTitleAgents({
+      count: 4,
+      height: 32,
+      progress: 0.4,
+      seed: 123,
+      width: 64,
+    });
+    const second = createIntroTitleAgents({
+      count: 4,
+      height: 32,
+      progress: 0.4,
+      seed: 123,
+      width: 64,
+    });
+
+    expect(Array.from(first)).toEqual(Array.from(second));
+  });
+
+  it('preserves targets while advancing positions for a later intro progress', () => {
+    const initial = createIntroTitleAgents({
+      count: 1,
+      height: 32,
+      progress: 0,
+      seed: 456,
+      width: 64,
+    });
+    const later = createIntroTitleAgents({
+      count: 1,
+      height: 32,
+      progress: 0.8,
+      seed: 456,
+      width: 64,
+    });
+
+    expect(later[0]).not.toBe(initial[0]);
+    expect(later[1]).not.toBe(initial[1]);
+    expect(later[4]).toBe(initial[4]);
+    expect(later[5]).toBe(initial[5]);
+    expect(later[7]).toBe(initial[7]);
+    expect(later.length).toBe(AGENT_FLOAT_COUNT);
+  });
+});
diff --git a/src/game-loop/intro-title-agents.ts b/src/game-loop/intro-title-agents.ts
index a22fc0f..b102ae1 100644
--- a/src/game-loop/intro-title-agents.ts
+++ b/src/game-loop/intro-title-agents.ts
@@ -12,19 +12,27 @@ interface IntroTitleAgentOptions {
   count: number;
   width: number;
   height: number;
+  progress?: number;
+  seed?: number;
 }
 
+type RandomSource = () => number;
+
 const INTRO_TITLE = appConfig.simulation.intro.title;
 
 export const createIntroTitleAgents = ({
   count,
   width,
   height,
+  progress = 0,
+  seed,
 }: IntroTitleAgentOptions): Float32Array => {
   if (count <= 0) {
     return new Float32Array();
   }
 
+  const random = seed === undefined ? Math.random : createSeededRandom(seed);
+  const introProgress = clamp(progress, 0, 1);
   const safeWidth = Math.max(1, width);
   const safeHeight = Math.max(1, height);
   const points = createIntroTitlePoints(safeWidth, safeHeight);
@@ -62,14 +70,14 @@ export const createIntroTitleAgents = ({
   );
 
   for (let i = 0; i < count; i++) {
-    const point = points[Math.floor(Math.random() * points.length)];
+    const point = points[Math.floor(random() * points.length)];
     const targetX = Math.max(
       0,
-      Math.min(safeWidth - 1, point.x + (Math.random() - 0.5) * targetJitter)
+      Math.min(safeWidth - 1, point.x + (random() - 0.5) * targetJitter)
     );
     const targetY = Math.max(
       0,
-      Math.min(safeHeight - 1, point.y + (Math.random() - 0.5) * targetJitter)
+      Math.min(safeHeight - 1, point.y + (random() - 0.5) * targetJitter)
     );
     const [startX, startY] = getIntroRadialStart(
       targetX,
@@ -77,7 +85,8 @@ export const createIntroTitleAgents = ({
       safeWidth,
       safeHeight,
       introCircleRadius,
-      entryJitter
+      entryJitter,
+      random
     );
     const approachAngle = Math.atan2(targetY - startY, targetX - startX);
     let targetAngle = point.tangent ?? approachAngle;
@@ -87,21 +96,32 @@ export const createIntroTitleAgents = ({
 
     const distanceFraction =
       Math.hypot(targetX - startX, targetY - startY) / Math.hypot(safeWidth, safeHeight);
+    const introDelay = Math.min(
+      appConfig.simulation.intro.targetDelayMax,
+      distanceFraction * appConfig.simulation.intro.targetDelayDistanceMultiplier +
+        random() * appConfig.simulation.intro.targetDelayRandomMultiplier
+    );
+    const pathProgress = getIntroAgentPathProgress(introProgress, introDelay);
+    const initialAngle =
+      approachAngle + (random() - 0.5) * appConfig.simulation.intro.angleJitterRadians;
+    const currentAngle = mixAngle(
+      initialAngle,
+      targetAngle,
+      smoothstep(
+        appConfig.simulation.intro.angleEaseStart,
+        appConfig.simulation.intro.angleEaseEnd,
+        pathProgress
+      )
+    );
     const base = i * AGENT_FLOAT_COUNT;
-    data[base] = startX;
-    data[base + 1] = startY;
-    data[base + 2] =
-      approachAngle +
-      (Math.random() - 0.5) * appConfig.simulation.intro.angleJitterRadians;
+    data[base] = mix(startX, targetX, pathProgress);
+    data[base + 1] = mix(startY, targetY, pathProgress);
+    data[base + 2] = currentAngle;
     data[base + 3] = point.colorIndex;
     data[base + 4] = targetX;
     data[base + 5] = targetY;
     data[base + 6] = targetAngle;
-    data[base + 7] = Math.min(
-      appConfig.simulation.intro.targetDelayMax,
-      distanceFraction * appConfig.simulation.intro.targetDelayDistanceMultiplier +
-        Math.random() * appConfig.simulation.intro.targetDelayRandomMultiplier
-    );
+    data[base + 7] = introDelay;
   }
 
   return data;
@@ -113,7 +133,8 @@ const getIntroRadialStart = (
   width: number,
   height: number,
   radius: number,
-  jitter: number
+  jitter: number,
+  random: RandomSource
 ): [number, number] => {
   const centerX = width / 2;
   const centerY = height * appConfig.simulation.intro.verticalAnchor;
@@ -121,14 +142,16 @@ const getIntroRadialStart = (
   const offsetY = targetY - centerY;
   const length = Math.hypot(offsetX, offsetY);
   const angle =
-    length > 0.001 ? Math.atan2(offsetY, offsetX) : Math.random() * Math.PI * 2;
+    length > appConfig.simulation.intro.radialStartEpsilon
+      ? Math.atan2(offsetY, offsetX)
+      : random() * Math.PI * 2;
   const directionX = Math.cos(angle);
   const directionY = Math.sin(angle);
   const tangentX = -directionY;
   const tangentY = directionX;
-  const tangentJitter = (Math.random() - 0.5) * jitter;
+  const tangentJitter = (random() - 0.5) * jitter;
   const radialJitter =
-    (Math.random() - 0.5) * jitter * appConfig.simulation.intro.radialJitterRatio;
+    (random() - 0.5) * jitter * appConfig.simulation.intro.radialJitterRatio;
   const startX =
     centerX + directionX * (radius + radialJitter) + tangentX * tangentJitter;
   const startY =
@@ -154,7 +177,7 @@ const createIntroTitlePoints = (
 
   const fontSize = getIntroTitleFontSize(context, width, height);
   context.clearRect(0, 0, width, height);
-  context.font = `${fontSize}px "Open Sans", sans-serif`;
+  context.font = `${fontSize}px ${appConfig.simulation.intro.fontFamily}`;
   context.textAlign = 'center';
   context.textBaseline = 'middle';
   context.fillStyle = '#fff';
@@ -302,7 +325,7 @@ const getIntroTitleFontSize = (
   );
 
   while (fontSize > appConfig.simulation.intro.minFontSizePx) {
-    context.font = `${fontSize}px "Open Sans", sans-serif`;
+    context.font = `${fontSize}px ${appConfig.simulation.intro.fontFamily}`;
     const metrics = context.measureText(INTRO_TITLE);
     const measuredHeight =
       metrics.actualBoundingBoxAscent + metrics.actualBoundingBoxDescent || fontSize;
@@ -352,3 +375,53 @@ const getMaskAlpha = (
   const clampedY = Math.max(0, Math.min(height - 1, Math.round(y)));
   return data[(clampedY * width + clampedX) * 4 + 3];
 };
+
+const getIntroAgentPathProgress = (introProgress: number, introDelay: number): number => {
+  if (introProgress <= introDelay) {
+    return 0;
+  }
+
+  const activeProgress =
+    (introProgress - introDelay) /
+    Math.max(appConfig.simulation.intro.pathProgressEpsilon, 1 - introDelay);
+  return easePathProgress(clamp(activeProgress, 0, 1));
+};
+
+const createSeededRandom = (seed: number): RandomSource => {
+  let state = seed >>> 0;
+
+  return () => {
+    let value = (state += 0x6d2b79f5);
+    value = Math.imul(value ^ (value >>> 15), value | 1);
+    value ^= value + Math.imul(value ^ (value >>> 7), value | 61);
+    return ((value ^ (value >>> 14)) >>> 0) / 4294967296;
+  };
+};
+
+const mix = (from: number, to: number, amount: number): number =>
+  from + (to - from) * amount;
+
+const mixAngle = (from: number, to: number, amount: number): number => {
+  const delta = Math.atan2(Math.sin(to - from), Math.cos(to - from));
+  return from + delta * amount;
+};
+
+const smoothstep = (edge0: number, edge1: number, value: number): number => {
+  const t = clamp((value - edge0) / (edge1 - edge0), 0, 1);
+  return t * t * (3 - 2 * t);
+};
+
+const easePathProgress = (amount: number): number => {
+  if (appConfig.simulation.intro.pathEasing === 'linear') {
+    return amount;
+  }
+
+  return easeOutQuad(amount);
+};
+
+const easeOutQuad = (value: number): number => value * (2 - value);
+
+const clamp = (value: number, min: number, max: number): number => {
+  const safeValue = Number.isFinite(value) ? value : min;
+  return Math.min(max, Math.max(min, safeValue));
+};
diff --git a/src/game-loop/pointer-input.test.ts b/src/game-loop/pointer-input.test.ts
index 7fe3cc8..a8057aa 100644
--- a/src/game-loop/pointer-input.test.ts
+++ b/src/game-loop/pointer-input.test.ts
@@ -252,6 +252,31 @@ describe('GardenPointerInput drawing startup', () => {
     expect(brushPipeline.addSwipeSegment.mock.calls.length).toBeGreaterThan(3);
   });
 
+  it('passes normalized audio geometry context with stroke events', async () => {
+    const { audio, canvas } = await createPointerInput();
+
+    canvas.dispatchPointerEvent('pointerdown', { pointerId: 9, timeStamp: 100 });
+    canvas.dispatchPointerEvent('pointermove', {
+      clientX: 40,
+      clientY: 50,
+      pointerId: 9,
+      timeStamp: 150,
+    });
+
+    expect(audio.stroke).toHaveBeenCalledWith(
+      expect.objectContaining({
+        canvasSize: [300, 200],
+        elapsedSeconds: 0.05,
+        from: expect.anything(),
+        isErasing: false,
+        to: expect.anything(),
+      })
+    );
+    const stroke = audio.stroke.mock.calls[0][0];
+    expect(toPoint(stroke.from)).toEqual([10, 20]);
+    expect(toPoint(stroke.to)).toEqual([40, 50]);
+  });
+
   it('caps curve tessellation with the brush curve resolution setting', async () => {
     const { brushPipeline, canvas, runtimeSettings } = await createPointerInput();
     runtimeSettings.brushCurveResolution = 2;
diff --git a/src/game-loop/pointer-input.ts b/src/game-loop/pointer-input.ts
index 917c917..699610b 100644
--- a/src/game-loop/pointer-input.ts
+++ b/src/game-loop/pointer-input.ts
@@ -24,10 +24,6 @@ interface GardenPointerInputOptions {
 }
 
 export class GardenPointerInput {
-  private static readonly MIN_SMOOTH_SAMPLE_DISTANCE_SQUARED = 0.25;
-  private static readonly MIN_CURVE_SEGMENT_SPACING_PIXELS = 4;
-  private static readonly CURVE_SEGMENT_BRUSH_RADIUS_RATIO = 0.65;
-
   private activePointerId: number | null = null;
   private lastPointerPosition: vec2 | null = null;
   private lastPointerEventTimeMs: number | null = null;
@@ -194,6 +190,7 @@ export class GardenPointerInput {
         vibe: activeVibe,
         from: previousPosition,
         to: position,
+        canvasSize: [this.canvas.width, this.canvas.height],
         isErasing: this.isErasing,
         elapsedSeconds,
       });
@@ -216,8 +213,7 @@ export class GardenPointerInput {
       this.smoothedStrokePoints[this.smoothedStrokePoints.length - 1];
     if (
       previousSample !== undefined &&
-      vec2.squaredDistance(previousSample, position) <=
-        GardenPointerInput.MIN_SMOOTH_SAMPLE_DISTANCE_SQUARED
+      vec2.squaredDistance(previousSample, position) <= getBrushSmoothingDistanceSquared()
     ) {
       return;
     }
@@ -251,16 +247,22 @@ export class GardenPointerInput {
 
   private addQuadraticBrushSegments(start: vec2, control: vec2, end: vec2): void {
     const curveLength = vec2.distance(start, control) + vec2.distance(control, end);
-    const brushRadius = Math.max(1, settings.brushSize / 2);
+    const brushRadius = Math.max(
+      settings.brushCurveMinBrushRadius,
+      settings.brushSize / 2
+    );
     const segmentSpacing = Math.max(
-      GardenPointerInput.MIN_CURVE_SEGMENT_SPACING_PIXELS,
-      brushRadius * GardenPointerInput.CURVE_SEGMENT_BRUSH_RADIUS_RATIO
+      settings.brushCurveMinSegmentSpacing,
+      brushRadius * settings.brushCurveSegmentBrushRadiusRatio
     );
     const mirrorSegmentCount = Math.max(1, this.options.getMirrorSegmentCount());
     const curveResolution = getBrushCurveResolution();
     const maxCurveSegments = Math.max(
       1,
-      Math.floor(curveResolution / Math.sqrt(mirrorSegmentCount))
+      Math.floor(
+        curveResolution /
+          Math.max(1, mirrorSegmentCount ** settings.brushCurveMirrorResolutionExponent)
+      )
     );
     const segmentCount = Math.min(
       maxCurveSegments,
@@ -290,7 +292,7 @@ export class GardenPointerInput {
     if (
       this.lastSmoothedBrushPosition !== null &&
       vec2.squaredDistance(this.lastSmoothedBrushPosition, finalSample) >
-        GardenPointerInput.MIN_SMOOTH_SAMPLE_DISTANCE_SQUARED
+        getBrushSmoothingDistanceSquared()
     ) {
       this.addMirroredBrushSegment(this.lastSmoothedBrushPosition, finalSample);
     }
@@ -372,6 +374,13 @@ const getBrushCurveResolution = (): number => {
   return Math.max(1, Math.floor(resolution));
 };
 
+const getBrushSmoothingDistanceSquared = (): number => {
+  const distance = Number.isFinite(settings.brushSmoothingMinSampleDistance)
+    ? settings.brushSmoothingMinSampleDistance
+    : appConfig.defaultSettings.brushSmoothingMinSampleDistance;
+  return Math.max(0, distance) ** 2;
+};
+
 const isSamePointerSample = (left: PointerEvent, right: PointerEvent): boolean =>
   left.clientX === right.clientX &&
   left.clientY === right.clientY &&
diff --git a/src/game-loop/simulation-frame.ts b/src/game-loop/simulation-frame.ts
index d74144d..96ef477 100644
--- a/src/game-loop/simulation-frame.ts
+++ b/src/game-loop/simulation-frame.ts
@@ -33,10 +33,10 @@ export class SimulationFrameRenderer {
     this.textures.copyTrailMapAToB(commandEncoder);
     if (isErasing) {
       if (this.pipelines.eraserAgentPipeline.hasActiveMask()) {
-        const eraserMask = this.textures.clearEraserMask(commandEncoder);
-        this.pipelines.eraserTexturePipeline.execute(commandEncoder, eraserMask);
-        this.pipelines.eraserTexturePipeline.executeMultiTarget(
+        const eraserMask = this.textures.eraserMask.getTextureView();
+        this.pipelines.eraserTexturePipeline.executeCombined(
           commandEncoder,
+          eraserMask,
           this.textures.sourceMapA.getTextureView(),
           this.textures.influenceMapA.getTextureView(),
           this.textures.trailMapB.getTextureView()
@@ -59,7 +59,8 @@ export class SimulationFrameRenderer {
     this.pipelines.diffusionPipeline.execute(
       commandEncoder,
       this.textures.trailMapB.getTextureView(),
-      this.textures.trailMapA.getTextureView()
+      this.textures.trailMapA.getTextureView(),
+      this.textures.trailMapA.getSize()
     );
     const canvasTexture = this.pipelines.renderPipeline.execute(
       commandEncoder,
@@ -70,12 +71,14 @@ export class SimulationFrameRenderer {
     this.pipelines.diffusionPipeline.execute(
       commandEncoder,
       this.textures.sourceMapA.getTextureView(),
-      this.textures.sourceMapB.getTextureView()
+      this.textures.sourceMapB.getTextureView(),
+      this.textures.sourceMapB.getSize()
     );
     this.pipelines.brushEffectDiffusionPipeline.execute(
       commandEncoder,
       this.textures.influenceMapA.getTextureView(),
-      this.textures.influenceMapB.getTextureView()
+      this.textures.influenceMapB.getTextureView(),
+      this.textures.influenceMapB.getSize()
     );
 
     this.device.queue.submit([commandEncoder.finish()]);
diff --git a/src/game-loop/simulation-textures.ts b/src/game-loop/simulation-textures.ts
index 7d6855b..825f014 100644
--- a/src/game-loop/simulation-textures.ts
+++ b/src/game-loop/simulation-textures.ts
@@ -1,6 +1,6 @@
 import { vec2 } from 'gl-matrix';
 
-import { CopyPipeline } from '../pipelines/copy/copy-pipeline';
+import { appConfig } from '../config';
 import { ResizableTexture } from '../utils/graphics/resizable-texture';
 
 export class SimulationTextures {
@@ -11,13 +11,11 @@ export class SimulationTextures {
   public influenceMapA: ResizableTexture;
   public influenceMapB: ResizableTexture;
   public eraserMask: ResizableTexture;
-  private readonly copyPipeline: CopyPipeline;
 
   public constructor(
     private readonly device: GPUDevice,
     canvasSize: vec2
   ) {
-    this.copyPipeline = new CopyPipeline(this.device);
     this.trailMapA = this.createTexture(canvasSize);
     this.trailMapB = this.createTexture(canvasSize);
     this.sourceMapA = this.createTexture(canvasSize);
@@ -45,21 +43,30 @@ export class SimulationTextures {
     return scale;
   }
 
-  public clearEraserMask(commandEncoder: GPUCommandEncoder): GPUTextureView {
-    const eraserMaskView = this.eraserMask.getTextureView();
-    const passEncoder = commandEncoder.beginRenderPass({
-      colorAttachments: [
-        {
-          view: eraserMaskView,
-          clearValue: { r: 1, g: 1, b: 1, a: 1 },
-          loadOp: 'clear',
-          storeOp: 'store',
-        },
-      ],
+  public clear(): void {
+    const commandEncoder = this.device.createCommandEncoder();
+    [
+      this.trailMapA,
+      this.trailMapB,
+      this.sourceMapA,
+      this.sourceMapB,
+      this.influenceMapA,
+      this.influenceMapB,
+      this.eraserMask,
+    ].forEach((texture) => {
+      const passEncoder = commandEncoder.beginRenderPass({
+        colorAttachments: [
+          {
+            view: texture.getTextureView(),
+            clearValue: appConfig.simulation.clearColor,
+            loadOp: 'clear',
+            storeOp: 'store',
+          },
+        ],
+      });
+      passEncoder.end();
     });
-    passEncoder.end();
-
-    return eraserMaskView;
+    this.device.queue.submit([commandEncoder.finish()]);
   }
 
   public copyTrailMapAToB(commandEncoder: GPUCommandEncoder): void {
@@ -85,10 +92,9 @@ export class SimulationTextures {
     this.influenceMapA.destroy();
     this.influenceMapB.destroy();
     this.eraserMask.destroy();
-    this.copyPipeline.destroy();
   }
 
   private createTexture(size: vec2): ResizableTexture {
-    return new ResizableTexture(this.device, this.copyPipeline, size);
+    return new ResizableTexture(this.device, size);
   }
 }
diff --git a/src/game-loop/toolbar-contrast-monitor.ts b/src/game-loop/toolbar-contrast-monitor.ts
index 73bb3ef..5b90562 100644
--- a/src/game-loop/toolbar-contrast-monitor.ts
+++ b/src/game-loop/toolbar-contrast-monitor.ts
@@ -1,3 +1,4 @@
+import { appConfig } from '../config';
 import type { CanvasReadbackRequest } from './game-loop-types';
 
 interface CanvasSamplePoint {
@@ -12,11 +13,6 @@ interface ToolbarContrastMetrics {
   lowContrastRatio: number;
 }
 
-const BYTES_PER_SAMPLE = 4;
-const SAMPLE_COLUMNS = 13;
-const SAMPLE_ROWS = 7;
-const SAMPLE_INTERVAL_MS = 300;
-const BACKGROUND_OPACITY_MAX = 0.82;
 const TOOLBAR_BACKGROUND_OPACITY_PROPERTY = '--toolbar-background-opacity';
 const TOOLBAR_BACKGROUND_STRENGTH_PROPERTY = '--toolbar-background-strength';
 
@@ -24,22 +20,30 @@ const clamp01 = (value: number): number => Math.min(1, Math.max(0, value));
 
 const getLinearChannel = (channel: number): number => {
   const normalized = channel / 255;
-  return normalized <= 0.03928
-    ? normalized / 12.92
-    : ((normalized + 0.055) / 1.055) ** 2.4;
+  return normalized <= appConfig.toolbar.contrast.linearChannelBreakpoint
+    ? normalized / appConfig.toolbar.contrast.linearChannelDivisor
+    : ((normalized + appConfig.toolbar.contrast.linearChannelOffset) /
+        appConfig.toolbar.contrast.linearChannelScale) **
+        appConfig.toolbar.contrast.linearChannelGamma;
 };
 
 const getRelativeLuminance = (red: number, green: number, blue: number): number =>
-  0.2126 * getLinearChannel(red) +
-  0.7152 * getLinearChannel(green) +
-  0.0722 * getLinearChannel(blue);
+  appConfig.toolbar.contrast.luminanceRedWeight * getLinearChannel(red) +
+  appConfig.toolbar.contrast.luminanceGreenWeight * getLinearChannel(green) +
+  appConfig.toolbar.contrast.luminanceBlueWeight * getLinearChannel(blue);
 
 export const getToolbarContrastMetrics = (
   pixels: Uint8Array,
   sampleCount: number,
   isBgra: boolean
 ): ToolbarContrastMetrics => {
-  const count = Math.max(0, Math.min(sampleCount, Math.floor(pixels.length / 4)));
+  const count = Math.max(
+    0,
+    Math.min(
+      sampleCount,
+      Math.floor(pixels.length / appConfig.toolbar.contrast.bytesPerSample)
+    )
+  );
   if (count === 0) {
     return {
       averageLuminance: 0,
@@ -54,18 +58,20 @@ export const getToolbarContrastMetrics = (
   let lowContrastCount = 0;
 
   for (let i = 0; i < count; i++) {
-    const offset = i * BYTES_PER_SAMPLE;
+    const offset = i * appConfig.toolbar.contrast.bytesPerSample;
     const red = pixels[offset + (isBgra ? 2 : 0)];
     const green = pixels[offset + 1];
     const blue = pixels[offset + (isBgra ? 0 : 2)];
     const luminance = getRelativeLuminance(red, green, blue);
-    const contrastWithWhite = 1.05 / (luminance + 0.05);
+    const contrastWithWhite =
+      appConfig.toolbar.contrast.whiteContrastNumerator /
+      (luminance + appConfig.toolbar.contrast.contrastOffset);
 
     luminanceTotal += luminance;
-    if (luminance > 0.32) {
+    if (luminance > appConfig.toolbar.contrast.brightLuminanceThreshold) {
       brightCount++;
     }
-    if (contrastWithWhite < 3) {
+    if (contrastWithWhite < appConfig.toolbar.contrast.lowContrastThreshold) {
       lowContrastCount++;
     }
   }
@@ -74,11 +80,13 @@ export const getToolbarContrastMetrics = (
   const brightRatio = brightCount / count;
   const lowContrastRatio = lowContrastCount / count;
   const backgroundStrength = clamp01(
-    Math.max(0, averageLuminance - 0.11) / 0.28 +
-      brightRatio * 0.65 +
-      lowContrastRatio * 1.8
+    Math.max(0, averageLuminance - appConfig.toolbar.contrast.luminanceBase) /
+      appConfig.toolbar.contrast.luminanceRange +
+      brightRatio * appConfig.toolbar.contrast.brightWeight +
+      lowContrastRatio * appConfig.toolbar.contrast.lowContrastWeight
   );
-  const backgroundOpacity = backgroundStrength * BACKGROUND_OPACITY_MAX;
+  const backgroundOpacity =
+    backgroundStrength * appConfig.toolbar.contrast.backgroundOpacityMax;
 
   return {
     averageLuminance,
@@ -106,7 +114,7 @@ export class ToolbarContrastMonitor {
     if (
       this.isDestroyed ||
       this.isReadbackPending ||
-      time - this.lastSampleAt < SAMPLE_INTERVAL_MS
+      time - this.lastSampleAt < appConfig.toolbar.contrast.sampleIntervalMs
     ) {
       return null;
     }
@@ -119,7 +127,7 @@ export class ToolbarContrastMonitor {
     let buffer: GPUBuffer;
     try {
       buffer = this.device.createBuffer({
-        size: samplePoints.length * BYTES_PER_SAMPLE,
+        size: samplePoints.length * appConfig.toolbar.contrast.bytesPerSample,
         usage: GPUBufferUsage.COPY_DST | GPUBufferUsage.MAP_READ,
       });
     } catch {
@@ -167,7 +175,7 @@ export class ToolbarContrastMonitor {
               },
               {
                 buffer,
-                offset: index * BYTES_PER_SAMPLE,
+                offset: index * appConfig.toolbar.contrast.bytesPerSample,
               },
               {
                 depthOrArrayLayers: 1,
@@ -205,12 +213,12 @@ export class ToolbarContrastMonitor {
 
   private setToolbarBackgroundOpacity(backgroundOpacity: number): void {
     const safeBackgroundOpacity = Math.min(
-      BACKGROUND_OPACITY_MAX,
+      appConfig.toolbar.contrast.backgroundOpacityMax,
       Math.max(0, backgroundOpacity)
     );
     const backgroundStrength =
-      BACKGROUND_OPACITY_MAX > 0
-        ? clamp01(safeBackgroundOpacity / BACKGROUND_OPACITY_MAX)
+      appConfig.toolbar.contrast.backgroundOpacityMax > 0
+        ? clamp01(safeBackgroundOpacity / appConfig.toolbar.contrast.backgroundOpacityMax)
         : 0;
 
     this.toolbar.style.setProperty(
@@ -249,15 +257,16 @@ export class ToolbarContrastMonitor {
     const height = bottom - top;
     const points = new Map<string, CanvasSamplePoint>();
 
-    for (let row = 0; row < SAMPLE_ROWS; row++) {
-      const cssY = top + ((row + 0.5) / SAMPLE_ROWS) * height;
+    for (let row = 0; row < appConfig.toolbar.contrast.sampleRows; row++) {
+      const cssY = top + ((row + 0.5) / appConfig.toolbar.contrast.sampleRows) * height;
       const y = Math.min(
         this.canvas.height - 1,
         Math.max(0, Math.floor((cssY - canvasRect.top) * yScale))
       );
 
-      for (let column = 0; column < SAMPLE_COLUMNS; column++) {
-        const cssX = left + ((column + 0.5) / SAMPLE_COLUMNS) * width;
+      for (let column = 0; column < appConfig.toolbar.contrast.sampleColumns; column++) {
+        const cssX =
+          left + ((column + 0.5) / appConfig.toolbar.contrast.sampleColumns) * width;
         const x = Math.min(
           this.canvas.width - 1,
           Math.max(0, Math.floor((cssX - canvasRect.left) * xScale))
diff --git a/src/index.ts b/src/index.ts
index 755f1c9..44cb627 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -11,6 +11,7 @@ import { FullScreenHandler } from './page/full-screen-handler';
 import { MenuHider } from './page/menu-hider';
 import { activeVibe, applyVibeSettings, resetSettings, settings } from './settings';
 import { readBrowserStorage, writeBrowserStorage } from './utils/browser-storage';
+import { clamp } from './utils/clamp';
 import { DeltaTimeCalculator } from './utils/delta-time-calculator';
 import { queryRequiredElement, queryRequiredElements } from './utils/dom';
 import {
@@ -51,8 +52,30 @@ const mirrorSegmentNames: Readonly<Record<number, string>> =
 
 const formatMirrorSegmentCount = (count: number): string =>
   count === appConfig.toolbar.mirror.default
-    ? 'Mirror off'
-    : `${count} ${mirrorSegmentNames[count] ?? 'slices'}`;
+    ? appConfig.toolbar.mirror.offLabel
+    : `${count} ${mirrorSegmentNames[count] ?? appConfig.toolbar.mirror.fallbackSegmentName}`;
+
+const clampAudioVolume = (value: number): number => {
+  const safeValue = Number.isFinite(value) ? value : appConfig.toolbar.volume.default;
+  return clamp(safeValue, appConfig.toolbar.volume.min, appConfig.toolbar.volume.max);
+};
+
+const getAudioVolumeRatio = (volume: number): number =>
+  (volume - appConfig.toolbar.volume.min) /
+  (appConfig.toolbar.volume.max - appConfig.toolbar.volume.min);
+
+const getAudioVolumePercent = (volume: number): number =>
+  Math.round(getAudioVolumeRatio(volume) * 100);
+
+const readInitialAudioVolume = (): number => {
+  const storedVolume = readBrowserStorage(appConfig.storage.audioVolumeKey);
+  return storedVolume === null
+    ? appConfig.toolbar.volume.default
+    : clampAudioVolume(Number(storedVolume));
+};
+
+const formatStoredAudioVolume = (volume: number): string =>
+  clampAudioVolume(volume).toFixed(2);
 
 type RuntimeUiError = Parameters<
   Parameters<typeof ErrorHandler.addOnErrorListener>[0]
@@ -112,6 +135,8 @@ const queryAppElements = () => ({
   ),
   settingsButton: queryRequiredElement('button.settings', HTMLButtonElement),
   soundButton: queryRequiredElement('button.sound', HTMLButtonElement),
+  volumeControl: queryRequiredElement('.volume-control', HTMLLabelElement),
+  volumeSlider: queryRequiredElement('.volume-slider', HTMLInputElement),
   restartButton: queryRequiredElement('button.restart', HTMLButtonElement),
   canvas: queryRequiredElement('canvas', HTMLCanvasElement),
   eraserPreview: queryRequiredElement('.eraser-preview', HTMLDivElement),
@@ -141,18 +166,49 @@ const setLoadingStage = (label: string, ratio: number) => {
   elements.loadingProgress.setAttribute('aria-valuenow', String(percent));
 };
 
-let isAudioMuted = readBrowserStorage(appConfig.storage.audioMutedKey) === '1';
+let audioVolume = readInitialAudioVolume();
+let isAudioMuted =
+  readBrowserStorage(appConfig.storage.audioMutedKey) === '1' ||
+  audioVolume <= appConfig.toolbar.volume.min;
 let isEraserActive = false;
 
+const persistAudioUiState = () => {
+  writeBrowserStorage(appConfig.storage.audioMutedKey, isAudioMuted ? '1' : '0');
+  writeBrowserStorage(
+    appConfig.storage.audioVolumeKey,
+    formatStoredAudioVolume(audioVolume)
+  );
+};
+
 const renderAudioUi = (game: GameLoop | null) => {
-  elements.soundButton.classList.toggle('muted', isAudioMuted);
-  elements.soundButton.setAttribute('aria-pressed', String(isAudioMuted));
+  audioVolume = clampAudioVolume(audioVolume);
+  const isEffectivelyMuted = isAudioMuted || audioVolume <= appConfig.toolbar.volume.min;
+  const volumePercent = getAudioVolumePercent(audioVolume);
+
+  elements.soundButton.classList.toggle('muted', isEffectivelyMuted);
+  elements.soundButton.setAttribute('aria-pressed', String(isEffectivelyMuted));
   elements.soundButton.setAttribute(
     'aria-label',
-    isAudioMuted ? 'Unmute audio' : 'Mute audio'
+    isEffectivelyMuted ? 'Unmute audio' : 'Mute audio'
   );
-  elements.soundButton.title = isAudioMuted ? 'Unmute audio' : 'Mute audio';
-  game?.setAudioMuted(isAudioMuted);
+  elements.soundButton.title = isEffectivelyMuted ? 'Unmute audio' : 'Mute audio';
+
+  elements.volumeSlider.min = appConfig.toolbar.volume.min.toString();
+  elements.volumeSlider.max = appConfig.toolbar.volume.max.toString();
+  elements.volumeSlider.step = appConfig.toolbar.volume.step.toString();
+  elements.volumeSlider.value = formatStoredAudioVolume(audioVolume);
+  elements.volumeSlider.setAttribute(
+    'aria-valuetext',
+    isEffectivelyMuted ? `Muted, ${volumePercent}%` : `${volumePercent}%`
+  );
+  elements.volumeControl.classList.toggle('muted', isEffectivelyMuted);
+  elements.volumeControl.title = isEffectivelyMuted
+    ? `Muted, ${volumePercent}% volume`
+    : `${volumePercent}% volume`;
+  elements.volumeControl.style.setProperty('--volume-progress', `${volumePercent}%`);
+
+  game?.setAudioVolume(audioVolume);
+  game?.setAudioMuted(isEffectivelyMuted);
 };
 
 const renderPaletteUi = (game: GameLoop | null) => {
@@ -322,8 +378,21 @@ const main = async () => {
 
     elements.restartButton.addEventListener('click', () => game?.destroy());
     elements.soundButton.addEventListener('click', () => {
-      isAudioMuted = !isAudioMuted;
-      writeBrowserStorage(appConfig.storage.audioMutedKey, isAudioMuted ? '1' : '0');
+      const shouldUnmute = isAudioMuted || audioVolume <= appConfig.toolbar.volume.min;
+      if (shouldUnmute && audioVolume <= appConfig.toolbar.volume.min) {
+        audioVolume = appConfig.toolbar.volume.default;
+      }
+      isAudioMuted = !shouldUnmute;
+      persistAudioUiState();
+      renderAudioUi(game);
+      if (!isAudioMuted) {
+        game?.startAudio(true);
+      }
+    });
+    elements.volumeSlider.addEventListener('input', () => {
+      audioVolume = clampAudioVolume(Number(elements.volumeSlider.value));
+      isAudioMuted = audioVolume <= appConfig.toolbar.volume.min;
+      persistAudioUiState();
       renderAudioUi(game);
       if (!isAudioMuted) {
         game?.startAudio(true);
diff --git a/src/pipelines/agents/agent-generation/agent-compaction.wgsl b/src/pipelines/agents/agent-generation/agent-compaction.wgsl
index 855f9be..7ae140a 100644
--- a/src/pipelines/agents/agent-generation/agent-compaction.wgsl
+++ b/src/pipelines/agents/agent-generation/agent-compaction.wgsl
@@ -15,7 +15,6 @@ struct Counters {
 
 var<workgroup> workgroupAliveCount: atomic<u32>;
 var<workgroup> workgroupCompactedOffset: u32;
-var<workgroup> workgroupCopyCount: u32;
 
 @compute @workgroup_size(64)
 fn main(
@@ -31,9 +30,12 @@ fn main(
   workgroupBarrier();
 
   var localCompactedIndex = 0u;
+  var agent = Agent(vec2<f32>(0.0, 0.0), 0.0, -1.0, vec2<f32>(-1.0, -1.0), 0.0, 0.0);
+  var isAlive = false;
   if id < settings.agentCount {
-    let agent = agents[id];
-    if agent.colorIndex >= 0.0 {
+    agent = agents[id];
+    isAlive = agent.colorIndex >= 0.0;
+    if isAlive {
       localCompactedIndex = atomicAdd(&workgroupAliveCount, 1u);
     }
   }
@@ -51,30 +53,7 @@ fn main(
 
   workgroupBarrier();
 
-  if id < settings.agentCount {
-    let agent = agents[id];
-    if agent.colorIndex >= 0.0 {
-      compactedAgents[workgroupCompactedOffset + localCompactedIndex] = agent;
-    }
+  if isAlive {
+    compactedAgents[workgroupCompactedOffset + localCompactedIndex] = agent;
   }
 }
-
-@compute @workgroup_size(64)
-fn copyCompactedAgents(
-  @builtin(global_invocation_id) global_id: vec3<u32>,
-  @builtin(local_invocation_id) local_id: vec3<u32>
-) {
-  let id = get_id(global_id);
-
-  if local_id.x == 0u {
-    workgroupCopyCount = atomicLoad(&counters.aliveAgentCount);
-  }
-
-  workgroupBarrier();
-
-  if id >= workgroupCopyCount {
-    return;
-  }
-
-  agents[id] = compactedAgents[id];
-}
diff --git a/src/pipelines/agents/agent-generation/agent-generation-pipeline.test.ts b/src/pipelines/agents/agent-generation/agent-generation-pipeline.test.ts
index 388f263..0758b4c 100644
--- a/src/pipelines/agents/agent-generation/agent-generation-pipeline.test.ts
+++ b/src/pipelines/agents/agent-generation/agent-generation-pipeline.test.ts
@@ -177,17 +177,14 @@ const createPipeline = (compactedCount: number) => {
 };
 
 describe('AgentGenerationPipeline compaction', () => {
-  it('copies compacted agents back with compute instead of a full agent buffer copy', async () => {
+  it('swaps compacted agents into the active buffer without a copy-back dispatch', async () => {
     const agentCount = 10;
     const { device, pipeline } = createPipeline(3);
 
     await expect(pipeline.compactAgents(agentCount)).resolves.toBe(3);
 
-    expect(device.createdComputeEntryPoints).toContain('copyCompactedAgents');
-    expect(device.dispatchCalls.map((call) => call.entryPoint)).toEqual([
-      'main',
-      'copyCompactedAgents',
-    ]);
+    expect(device.createdComputeEntryPoints).not.toContain('copyCompactedAgents');
+    expect(device.dispatchCalls.map((call) => call.entryPoint)).toEqual(['main']);
     expect(device.copyCalls.map((call) => call.size)).toEqual([
       Uint32Array.BYTES_PER_ELEMENT,
     ]);
diff --git a/src/pipelines/agents/agent-generation/agent-generation-pipeline.ts b/src/pipelines/agents/agent-generation/agent-generation-pipeline.ts
index bcb96fc..79abf51 100644
--- a/src/pipelines/agents/agent-generation/agent-generation-pipeline.ts
+++ b/src/pipelines/agents/agent-generation/agent-generation-pipeline.ts
@@ -14,14 +14,16 @@ export class AgentGenerationPipeline {
 
   private readonly bindGroupLayout: GPUBindGroupLayout;
   private readonly uniforms: GPUBuffer;
-  private readonly bindGroup: GPUBindGroup;
+  private readonly bindGroupsByActiveBuffer = new WeakMap<
+    GPUBuffer,
+    WeakMap<GPUBuffer, GPUBindGroup>
+  >();
 
   private readonly resizePipeline: GPUComputePipeline;
   private readonly compactionPipeline: GPUComputePipeline;
-  private readonly compactedAgentsCopyPipeline: GPUComputePipeline;
 
-  public readonly agentsBuffer: GPUBuffer;
-  private readonly compactedAgentsBuffer: GPUBuffer;
+  private activeAgentsBuffer: GPUBuffer;
+  private inactiveAgentsBuffer: GPUBuffer;
   private readonly countersBuffer: GPUBuffer;
   private readonly countersStagingBuffer: GPUBuffer;
   private readonly counterClearValues = new Uint32Array(
@@ -69,15 +71,8 @@ export class AgentGenerationPipeline {
       ],
     });
 
-    this.agentsBuffer = this.device.createBuffer({
-      size: this.maxAgentCount * AGENT_SIZE_IN_BYTES,
-      usage: GPUBufferUsage.STORAGE | GPUBufferUsage.COPY_DST,
-    });
-
-    this.compactedAgentsBuffer = this.device.createBuffer({
-      size: this.maxAgentCount * AGENT_SIZE_IN_BYTES,
-      usage: GPUBufferUsage.STORAGE,
-    });
+    this.activeAgentsBuffer = this.createAgentsBuffer();
+    this.inactiveAgentsBuffer = this.createAgentsBuffer();
 
     this.countersBuffer = this.device.createBuffer({
       size: AgentGenerationPipeline.COUNTER_COUNT * Uint32Array.BYTES_PER_ELEMENT,
@@ -94,36 +89,6 @@ export class AgentGenerationPipeline {
       usage: GPUBufferUsage.UNIFORM | GPUBufferUsage.COPY_DST,
     });
 
-    this.bindGroup = this.device.createBindGroup({
-      layout: this.bindGroupLayout,
-      entries: [
-        {
-          binding: 0,
-          resource: {
-            buffer: this.uniforms,
-          },
-        },
-        {
-          binding: 1,
-          resource: {
-            buffer: this.agentsBuffer,
-          },
-        },
-        {
-          binding: 2,
-          resource: {
-            buffer: this.countersBuffer,
-          },
-        },
-        {
-          binding: 3,
-          resource: {
-            buffer: this.compactedAgentsBuffer,
-          },
-        },
-      ],
-    });
-
     this.resizePipeline = device.createComputePipeline({
       layout: device.createPipelineLayout({
         bindGroupLayouts: [emptyBindGroupLayout, this.bindGroupLayout],
@@ -145,15 +110,16 @@ export class AgentGenerationPipeline {
         entryPoint: 'main',
       },
     });
+  }
 
-    this.compactedAgentsCopyPipeline = device.createComputePipeline({
-      layout: device.createPipelineLayout({
-        bindGroupLayouts: [emptyBindGroupLayout, this.bindGroupLayout],
-      }),
-      compute: {
-        module: compactionModule,
-        entryPoint: 'copyCompactedAgents',
-      },
+  public get agentsBuffer(): GPUBuffer {
+    return this.activeAgentsBuffer;
+  }
+
+  private createAgentsBuffer(): GPUBuffer {
+    return this.device.createBuffer({
+      size: this.maxAgentCount * AGENT_SIZE_IN_BYTES,
+      usage: GPUBufferUsage.STORAGE | GPUBufferUsage.COPY_DST,
     });
   }
 
@@ -163,6 +129,10 @@ export class AgentGenerationPipeline {
         ? this.maxAgentCountUpperLimit
         : Number.POSITIVE_INFINITY,
       Math.floor(this.device.limits.maxBufferSize / AGENT_SIZE_IN_BYTES) - 1,
+      Math.floor(
+        ((this.device.limits as GPUSupportedLimits).maxStorageBufferBindingSize ??
+          this.device.limits.maxBufferSize) / AGENT_SIZE_IN_BYTES
+      ) - 1,
       this.device.limits.maxComputeWorkgroupsPerDimension *
         AgentGenerationPipeline.WORKGROUP_SIZE
     );
@@ -170,7 +140,7 @@ export class AgentGenerationPipeline {
 
   public writeAgents(agentOffset: number, data: Float32Array): void {
     this.device.queue.writeBuffer(
-      this.agentsBuffer,
+      this.activeAgentsBuffer,
       agentOffset * AGENT_SIZE_IN_BYTES,
       data
     );
@@ -190,7 +160,7 @@ export class AgentGenerationPipeline {
     const commandEncoder = this.device.createCommandEncoder();
     const passEncoder = commandEncoder.beginComputePass();
     passEncoder.setPipeline(this.resizePipeline);
-    passEncoder.setBindGroup(1, this.bindGroup);
+    passEncoder.setBindGroup(1, this.getBindGroup());
     passEncoder.dispatchWorkgroups(
       getWorkgroupCount(agentCount, AgentGenerationPipeline.WORKGROUP_SIZE)
     );
@@ -204,8 +174,6 @@ export class AgentGenerationPipeline {
       return 0;
     }
 
-    this.counterClearValues.fill(0);
-    this.agentCountUniformValues.fill(0);
     this.agentCountUniformValues[0] = agentCount;
     this.device.queue.writeBuffer(this.countersBuffer, 0, this.counterClearValues);
     this.device.queue.writeBuffer(this.uniforms, 0, this.agentCountUniformValues);
@@ -213,20 +181,12 @@ export class AgentGenerationPipeline {
     const commandEncoder = this.device.createCommandEncoder();
     const passEncoder = commandEncoder.beginComputePass();
     passEncoder.setPipeline(this.compactionPipeline);
-    passEncoder.setBindGroup(1, this.bindGroup);
+    passEncoder.setBindGroup(1, this.getBindGroup());
     passEncoder.dispatchWorkgroups(
       getWorkgroupCount(agentCount, AgentGenerationPipeline.WORKGROUP_SIZE)
     );
     passEncoder.end();
 
-    const copyPassEncoder = commandEncoder.beginComputePass();
-    copyPassEncoder.setPipeline(this.compactedAgentsCopyPipeline);
-    copyPassEncoder.setBindGroup(1, this.bindGroup);
-    copyPassEncoder.dispatchWorkgroups(
-      getWorkgroupCount(agentCount, AgentGenerationPipeline.WORKGROUP_SIZE)
-    );
-    copyPassEncoder.end();
-
     commandEncoder.copyBufferToBuffer(
       this.countersBuffer,
       0,
@@ -239,18 +199,74 @@ export class AgentGenerationPipeline {
 
     await this.countersStagingBuffer.mapAsync(GPUMapMode.READ);
     const compactedCount = new Uint32Array(
-      this.countersStagingBuffer.getMappedRange().slice(0, Uint32Array.BYTES_PER_ELEMENT)
+      this.countersStagingBuffer.getMappedRange(),
+      0,
+      1
     )[0];
     this.countersStagingBuffer.unmap();
+    this.swapAgentBuffers();
 
     return compactedCount;
   }
 
+  private getBindGroup(): GPUBindGroup {
+    let inactiveCache = this.bindGroupsByActiveBuffer.get(this.activeAgentsBuffer);
+    if (!inactiveCache) {
+      inactiveCache = new WeakMap<GPUBuffer, GPUBindGroup>();
+      this.bindGroupsByActiveBuffer.set(this.activeAgentsBuffer, inactiveCache);
+    }
+
+    const cached = inactiveCache.get(this.inactiveAgentsBuffer);
+    if (cached) {
+      return cached;
+    }
+
+    const bindGroup = this.device.createBindGroup({
+      layout: this.bindGroupLayout,
+      entries: [
+        {
+          binding: 0,
+          resource: {
+            buffer: this.uniforms,
+          },
+        },
+        {
+          binding: 1,
+          resource: {
+            buffer: this.activeAgentsBuffer,
+          },
+        },
+        {
+          binding: 2,
+          resource: {
+            buffer: this.countersBuffer,
+          },
+        },
+        {
+          binding: 3,
+          resource: {
+            buffer: this.inactiveAgentsBuffer,
+          },
+        },
+      ],
+    });
+
+    inactiveCache.set(this.inactiveAgentsBuffer, bindGroup);
+    return bindGroup;
+  }
+
+  private swapAgentBuffers(): void {
+    [this.activeAgentsBuffer, this.inactiveAgentsBuffer] = [
+      this.inactiveAgentsBuffer,
+      this.activeAgentsBuffer,
+    ];
+  }
+
   public destroy() {
     this.uniforms.destroy();
     this.countersBuffer.destroy();
     this.countersStagingBuffer.destroy();
-    this.compactedAgentsBuffer.destroy();
-    this.agentsBuffer.destroy();
+    this.inactiveAgentsBuffer.destroy();
+    this.activeAgentsBuffer.destroy();
   }
 }
diff --git a/src/pipelines/agents/agent-generation/agent-resize.wgsl b/src/pipelines/agents/agent-generation/agent-resize.wgsl
index cc18660..601a260 100644
--- a/src/pipelines/agents/agent-generation/agent-resize.wgsl
+++ b/src/pipelines/agents/agent-generation/agent-resize.wgsl
@@ -16,12 +16,6 @@ fn main(
     return;
   }
 
-  var agent = agents[id];
-  agent.position *= resizeSettings.scale;
-
-  if agent.targetPosition.x >= 0.0 && agent.targetPosition.y >= 0.0 {
-    agent.targetPosition *= resizeSettings.scale;
-  }
-
-  agents[id] = agent;
+  agents[id].position = agents[id].position * resizeSettings.scale;
+  agents[id].targetPosition = agents[id].targetPosition * resizeSettings.scale;
 }
diff --git a/src/pipelines/agents/agent-generation/agent-schema.test.ts b/src/pipelines/agents/agent-generation/agent-schema.test.ts
index 7c1b937..13aee8d 100644
--- a/src/pipelines/agents/agent-generation/agent-schema.test.ts
+++ b/src/pipelines/agents/agent-generation/agent-schema.test.ts
@@ -67,13 +67,12 @@ describe('Agent TS/WGSL contract', () => {
     expect(compactionShader).toContain('if id < settings.agentCount');
   });
 
-  it('keeps compaction copy-back bounded by the compacted count', () => {
-    expect(compactionShader).toContain('fn copyCompactedAgents');
+  it('keeps compaction as a ping-pong write without copy-back shader work', () => {
+    expect(compactionShader).not.toContain('fn copyCompactedAgents');
+    expect(compactionShader).not.toContain('agents[id] = compactedAgents[id];');
     expect(compactionShader).toContain(
-      'workgroupCopyCount = atomicLoad(&counters.aliveAgentCount);'
+      'compactedAgents[workgroupCompactedOffset + localCompactedIndex] = agent;'
     );
-    expect(compactionShader).toContain('if id >= workgroupCopyCount');
-    expect(compactionShader).toContain('agents[id] = compactedAgents[id];');
   });
 
   it('uses workgroup-local counting before allocating global compacted ranges', () => {
diff --git a/src/pipelines/agents/agent-pipeline.ts b/src/pipelines/agents/agent-pipeline.ts
index d68eaee..f49c287 100644
--- a/src/pipelines/agents/agent-pipeline.ts
+++ b/src/pipelines/agents/agent-pipeline.ts
@@ -11,7 +11,7 @@ import shader from './agent.wgsl?raw';
 
 export class AgentPipeline {
   private static readonly WORKGROUP_SIZE = 64;
-  private static readonly UNIFORM_COUNT = 17;
+  private static readonly UNIFORM_COUNT = 33;
 
   private readonly bindGroupLayout: GPUBindGroupLayout;
   private readonly pipeline: GPUComputePipeline;
@@ -20,9 +20,12 @@ export class AgentPipeline {
   private readonly uniformCache = createCachedFloat32BufferWrite(
     AgentPipeline.UNIFORM_COUNT
   );
-  private readonly bindGroupsByTexture = new WeakMap<
-    GPUTextureView,
-    WeakMap<GPUTextureView, WeakMap<GPUTextureView, GPUBindGroup>>
+  private readonly bindGroupsByAgentsBuffer = new WeakMap<
+    GPUBuffer,
+    WeakMap<
+      GPUTextureView,
+      WeakMap<GPUTextureView, WeakMap<GPUTextureView, GPUBindGroup>>
+    >
   >();
 
   private agentCount = 0;
@@ -30,7 +33,7 @@ export class AgentPipeline {
   public constructor(
     private readonly device: GPUDevice,
     private readonly commonState: CommonState,
-    private readonly agentsBuffer: GPUBuffer // doesn't get destroyed
+    private readonly getAgentsBuffer: () => GPUBuffer // doesn't get destroyed
   ) {
     this.bindGroupLayout = device.createBindGroupLayout(AgentPipeline.bindGroupLayout);
 
@@ -67,6 +70,21 @@ export class AgentPipeline {
     color3ToColor1,
     color3ToColor2,
     color3ToColor3,
+    sourceAttractionWeight,
+    sourceSlowMoveRate,
+    sourceTrailWeightMultiplier,
+    forwardRotationScale,
+    introNearDistanceInner,
+    introNearDistanceMin,
+    introNearSensorOffsetMultiplier,
+    introTargetAngleBlend,
+    introProgressCutoff,
+    introTurnRateMultiplier,
+    introRandomTurnMultiplier,
+    introFarMoveMultiplier,
+    introNearMoveMultiplier,
+    introStepStopDistance,
+    randomTimeScale,
     agentCount,
     introProgress,
   }: AgentSettings & {
@@ -77,21 +95,38 @@ export class AgentPipeline {
     this.agentCount = agentCount;
     this.uniformValues[0] = moveSpeed * deltaTime;
     this.uniformValues[1] = turnSpeed * deltaTime;
-    this.uniformValues[2] = (sensorOffsetAngle * Math.PI) / 180;
-    this.uniformValues[3] = sensorOffsetDistance;
-    this.uniformValues[4] = turnWhenLost;
-    this.uniformValues[5] = individualTrailWeight;
-    this.uniformValues[6] = agentCount;
-    this.uniformValues[7] = introProgress ?? 1;
-    this.uniformValues[8] = color1ToColor1;
-    this.uniformValues[9] = color1ToColor2;
-    this.uniformValues[10] = color1ToColor3;
-    this.uniformValues[11] = color2ToColor1;
-    this.uniformValues[12] = color2ToColor2;
-    this.uniformValues[13] = color2ToColor3;
-    this.uniformValues[14] = color3ToColor1;
-    this.uniformValues[15] = color3ToColor2;
-    this.uniformValues[16] = color3ToColor3;
+    const sensorAngle = (sensorOffsetAngle * Math.PI) / 180;
+    this.uniformValues[2] = Math.sin(sensorAngle);
+    this.uniformValues[3] = Math.cos(sensorAngle);
+    this.uniformValues[4] = sensorOffsetDistance;
+    this.uniformValues[5] = turnWhenLost;
+    this.uniformValues[6] = individualTrailWeight;
+    this.uniformValues[7] = agentCount;
+    this.uniformValues[8] = introProgress ?? 1;
+    this.uniformValues[9] = color1ToColor1;
+    this.uniformValues[10] = color1ToColor2;
+    this.uniformValues[11] = color1ToColor3;
+    this.uniformValues[12] = color2ToColor1;
+    this.uniformValues[13] = color2ToColor2;
+    this.uniformValues[14] = color2ToColor3;
+    this.uniformValues[15] = color3ToColor1;
+    this.uniformValues[16] = color3ToColor2;
+    this.uniformValues[17] = color3ToColor3;
+    this.uniformValues[18] = sourceAttractionWeight;
+    this.uniformValues[19] = sourceSlowMoveRate;
+    this.uniformValues[20] = sourceTrailWeightMultiplier;
+    this.uniformValues[21] = forwardRotationScale;
+    this.uniformValues[22] = introNearDistanceInner;
+    this.uniformValues[23] = introNearDistanceMin;
+    this.uniformValues[24] = introNearSensorOffsetMultiplier;
+    this.uniformValues[25] = introTargetAngleBlend;
+    this.uniformValues[26] = introProgressCutoff;
+    this.uniformValues[27] = introTurnRateMultiplier;
+    this.uniformValues[28] = introRandomTurnMultiplier;
+    this.uniformValues[29] = introFarMoveMultiplier;
+    this.uniformValues[30] = introNearMoveMultiplier;
+    this.uniformValues[31] = introStepStopDistance;
+    this.uniformValues[32] = randomTimeScale;
     writeFloat32BufferIfChanged(
       this.device,
       this.uniforms,
@@ -127,10 +162,20 @@ export class AgentPipeline {
     trailMapOut: GPUTextureView,
     sourceMap: GPUTextureView
   ): GPUBindGroup {
-    let outputCache = this.bindGroupsByTexture.get(trailMapIn);
+    const agentsBuffer = this.getAgentsBuffer();
+    let textureCache = this.bindGroupsByAgentsBuffer.get(agentsBuffer);
+    if (!textureCache) {
+      textureCache = new WeakMap<
+        GPUTextureView,
+        WeakMap<GPUTextureView, WeakMap<GPUTextureView, GPUBindGroup>>
+      >();
+      this.bindGroupsByAgentsBuffer.set(agentsBuffer, textureCache);
+    }
+
+    let outputCache = textureCache.get(trailMapIn);
     if (!outputCache) {
       outputCache = new WeakMap<GPUTextureView, WeakMap<GPUTextureView, GPUBindGroup>>();
-      this.bindGroupsByTexture.set(trailMapIn, outputCache);
+      textureCache.set(trailMapIn, outputCache);
     }
 
     let sourceCache = outputCache.get(trailMapOut);
@@ -156,7 +201,7 @@ export class AgentPipeline {
         {
           binding: 1,
           resource: {
-            buffer: this.agentsBuffer,
+            buffer: agentsBuffer,
           },
         },
         {
diff --git a/src/pipelines/agents/agent-settings.ts b/src/pipelines/agents/agent-settings.ts
index cdd4601..2517791 100644
--- a/src/pipelines/agents/agent-settings.ts
+++ b/src/pipelines/agents/agent-settings.ts
@@ -14,4 +14,19 @@ export interface AgentSettings {
   sensorOffsetDistance: number;
   turnWhenLost: number;
   individualTrailWeight: number;
+  sourceAttractionWeight: number;
+  sourceSlowMoveRate: number;
+  sourceTrailWeightMultiplier: number;
+  forwardRotationScale: number;
+  introNearDistanceMin: number;
+  introNearSensorOffsetMultiplier: number;
+  introTargetAngleBlend: number;
+  introProgressCutoff: number;
+  introNearDistanceInner: number;
+  introTurnRateMultiplier: number;
+  introRandomTurnMultiplier: number;
+  introFarMoveMultiplier: number;
+  introNearMoveMultiplier: number;
+  introStepStopDistance: number;
+  randomTimeScale: number;
 }
diff --git a/src/pipelines/agents/agent.wgsl b/src/pipelines/agents/agent.wgsl
index 5778e3b..491b04a 100644
--- a/src/pipelines/agents/agent.wgsl
+++ b/src/pipelines/agents/agent.wgsl
@@ -1,7 +1,8 @@
 struct Settings {
   moveRate: f32,
   turnRate: f32,
-  sensorAngle: f32,
+  sensorAngleSin: f32,
+  sensorAngleCos: f32,
   sensorOffset: f32,
   turnWhenLost: f32,
   individualTrailWeight: f32,
@@ -16,6 +17,21 @@ struct Settings {
   color3ToColor1: f32,
   color3ToColor2: f32,
   color3ToColor3: f32,
+  sourceAttractionWeight: f32,
+  sourceSlowMoveRate: f32,
+  sourceTrailWeightMultiplier: f32,
+  forwardRotationScale: f32,
+  introNearDistanceInner: f32,
+  introNearDistanceMin: f32,
+  introNearSensorOffsetMultiplier: f32,
+  introTargetAngleBlend: f32,
+  introProgressCutoff: f32,
+  introTurnRateMultiplier: f32,
+  introRandomTurnMultiplier: f32,
+  introFarMoveMultiplier: f32,
+  introNearMoveMultiplier: f32,
+  introStepStopDistance: f32,
+  randomTimeScale: f32,
 };
 
 @group(1) @binding(0) var<uniform> settings: Settings;
@@ -33,25 +49,38 @@ fn main(
     return;
   }
 
-  var agent = agents[id];
-  if agent.colorIndex < 0.0 || agent.colorIndex >= 2.5 {
+  let colorIndex = agents[id].colorIndex;
+  if colorIndex < 0.0 || colorIndex >= 2.5 {
     return;
   }
 
-  let hasIntroTarget =
-    settings.introProgress < 0.999 &&
-    agent.targetPosition.x >= 0.0 &&
-    agent.targetPosition.y >= 0.0;
-
-  if hasIntroTarget && settings.introProgress < agent.introDelay {
-    return;
+  var position = agents[id].position;
+  var angle = agents[id].angle;
+  var targetPosition = vec2<f32>(-1.0, -1.0);
+  var hasIntroTarget = false;
+  if settings.introProgress < settings.introProgressCutoff {
+    targetPosition = agents[id].targetPosition;
+    hasIntroTarget = targetPosition.x >= 0.0 && targetPosition.y >= 0.0;
+    if hasIntroTarget && settings.introProgress < agents[id].introDelay {
+      return;
+    }
   }
 
-  let random = random_vec4(id, state.time);
+  let randomSeed = random_seed(id, state.time);
+  let randomTurn = random_float(randomSeed);
+  let direction = vec2(cos(angle), sin(angle));
 
-  let forwardSensor = sensor_position(agent.position, agent.angle, settings.sensorOffset, 0);
-  let leftSensor = sensor_position(agent.position, agent.angle, settings.sensorOffset, settings.sensorAngle);
-  let rightSensor = sensor_position(agent.position, agent.angle, settings.sensorOffset, -settings.sensorAngle);
+  let forwardSensor = sensor_position(position, direction, settings.sensorOffset);
+  let leftSensor = sensor_position(
+    position,
+    rotate_direction(direction, settings.sensorAngleSin, settings.sensorAngleCos),
+    settings.sensorOffset
+  );
+  let rightSensor = sensor_position(
+    position,
+    rotate_direction(direction, -settings.sensorAngleSin, settings.sensorAngleCos),
+    settings.sensorOffset
+  );
 
   let trailForward = textureLoad(trailMapIn, forwardSensor, 0);
   let trailLeft = textureLoad(trailMapIn, leftSensor, 0);
@@ -60,8 +89,8 @@ fn main(
   let sourceLeftSample = textureLoad(sourceMap, leftSensor, 0);
   let sourceRightSample = textureLoad(sourceMap, rightSensor, 0);
 
-  let channelMask = get_channel_mask(agent.colorIndex);
-  let reactionMask = get_reaction_mask(agent.colorIndex);
+  let channelMask = get_channel_mask(colorIndex);
+  let reactionMask = get_reaction_mask(colorIndex);
 
   let trailForwardWeight = dot(trailForward.rgb, reactionMask);
   let trailLeftWeight = dot(trailLeft.rgb, reactionMask);
@@ -71,76 +100,105 @@ fn main(
   let sourceLeftWeight = dot(sourceLeftSample.rgb, reactionMask);
   let sourceRightWeight = dot(sourceRightSample.rgb, reactionMask);
 
-  let weightForward = trailForwardWeight + sourceForwardWeight * 24.0;
-  let weightLeft = trailLeftWeight + sourceLeftWeight * 24.0;
-  let weightRight = trailRightWeight + sourceRightWeight * 24.0;
+  let weightForward =
+    trailForwardWeight + sourceForwardWeight * settings.sourceAttractionWeight;
+  let weightLeft = trailLeftWeight + sourceLeftWeight * settings.sourceAttractionWeight;
+  let weightRight =
+    trailRightWeight + sourceRightWeight * settings.sourceAttractionWeight;
 
-  var rotation = (random.r - 0.5) * settings.turnWhenLost;
+  var rotation = (randomTurn - 0.5) * settings.turnWhenLost;
   if weightForward >= weightLeft && weightForward >= weightRight {
-    rotation = rotation * 0.25;
+    rotation = rotation * settings.forwardRotationScale;
   } else {
     rotation += sign(weightLeft - weightRight) * settings.turnRate;
   }
 
-  let sourceAtAgent = textureLoad(sourceMap, vec2<i32>(agent.position), 0);
+  let sourceAtAgent = textureLoad(sourceMap, vec2<i32>(position), 0);
   let positiveReactionMask = max(reactionMask, vec3<f32>(0.0));
   let sourceAtAgentStrength = clamp(dot(sourceAtAgent.rgb, positiveReactionMask), 0.0, 1.0);
-  var moveRate = settings.moveRate * mix(1.0, 0.08, sourceAtAgentStrength);
+  var moveRate = settings.moveRate * mix(1.0, settings.sourceSlowMoveRate, sourceAtAgentStrength);
   var introTargetOffset = vec2<f32>(0.0, 0.0);
   var introTargetDistance = 0.0;
 
   if hasIntroTarget {
-    introTargetOffset = agent.targetPosition - agent.position;
+    introTargetOffset = targetPosition - position;
     introTargetDistance = length(introTargetOffset);
     let targetAngle = atan2(introTargetOffset.y, introTargetOffset.x);
-    let nearTitle = 1.0 - smoothstep(4.0, max(28.0, settings.sensorOffset * 0.75), introTargetDistance);
-    let desiredAngle = mix(targetAngle, agent.targetAngle, nearTitle * 0.2);
-    let introTurn = angle_delta(agent.angle, desiredAngle);
+    let nearTitle = 1.0 - smoothstep(
+      settings.introNearDistanceInner,
+      max(
+        settings.introNearDistanceMin,
+        settings.sensorOffset * settings.introNearSensorOffsetMultiplier
+      ),
+      introTargetDistance
+    );
+    let desiredAngle = mix(
+      targetAngle,
+      agents[id].targetAngle,
+      nearTitle * settings.introTargetAngleBlend
+    );
+    let introTurn = angle_delta(angle, desiredAngle);
 
-    rotation = clamp(introTurn, -settings.turnRate * 3.4, settings.turnRate * 3.4)
-      + (random.g - 0.5) * settings.turnWhenLost * 0.18;
-    moveRate = min(settings.moveRate * mix(2.65, 0.01, nearTitle), introTargetDistance);
+    rotation = clamp(
+        introTurn,
+        -settings.turnRate * settings.introTurnRateMultiplier,
+        settings.turnRate * settings.introTurnRateMultiplier
+      )
+      + (random_float(randomSeed + 1013904223u) - 0.5) *
+        settings.turnWhenLost *
+        settings.introRandomTurnMultiplier;
+    moveRate = min(
+      settings.moveRate *
+        mix(settings.introFarMoveMultiplier, settings.introNearMoveMultiplier, nearTitle),
+      introTargetDistance
+    );
   }
 
-  var step = vec2(cos(agent.angle), sin(agent.angle)) * moveRate;
+  var step = direction * moveRate;
   if hasIntroTarget {
     step = vec2<f32>(0.0, 0.0);
-    if introTargetDistance > 0.5 {
+    if introTargetDistance > settings.introStepStopDistance {
       step = introTargetOffset / introTargetDistance * moveRate;
     }
   }
 
   let maxPosition = state.size - vec2<f32>(1.0, 1.0);
-  let nextPosition = clamp(agent.position + step, vec2<f32>(0, 0), maxPosition);
+  let nextPosition = clamp(position + step, vec2<f32>(0, 0), maxPosition);
   if nextPosition.x == 0 || nextPosition.x == maxPosition.x || nextPosition.y == 0 || nextPosition.y == maxPosition.y {
-    rotation = 3.14159265359 + random.a - 0.5;
+    rotation = 3.14159265359 + random_float(randomSeed + 22695477u) - 0.5;
   }
 
   let sourceBelow = textureLoad(sourceMap, vec2<i32>(nextPosition), 0);
   let sourceBelowStrength = clamp(dot(sourceBelow.rgb, positiveReactionMask), 0.0, 1.0);
-  let trailWeight = settings.individualTrailWeight * (1.0 + sourceBelowStrength * 16.0);
+  let trailWeight =
+    settings.individualTrailWeight *
+    (1.0 + sourceBelowStrength * settings.sourceTrailWeightMultiplier);
   var trailBelow = textureLoad(trailMapIn, vec2<i32>(nextPosition), 0);
   trailBelow = vec4<f32>(
     trailBelow.rgb + channelMask * trailWeight,
     max(trailBelow.a, 0.0)
   );
 
-  agent.angle += rotation;
-  agent.position = nextPosition;
-
   textureStore(trailMapOut, vec2<i32>(nextPosition), trailBelow);
-  agents[id] = agent;
+  agents[id].angle = angle + rotation;
+  agents[id].position = nextPosition;
 }
 
-fn sensor_position(agentPosition: vec2<f32>, agentAngle: f32, sensorOffset: f32, sensorOffsetAngle: f32) -> vec2<i32> {
-  let sensorAngle = agentAngle + sensorOffsetAngle;
+fn sensor_position(agentPosition: vec2<f32>, direction: vec2<f32>, sensorOffset: f32) -> vec2<i32> {
   return vec2<i32>(clamp(
-    agentPosition + vec2(cos(sensorAngle), sin(sensorAngle)) * sensorOffset,
+    agentPosition + direction * sensorOffset,
     vec2<f32>(0, 0),
     state.size - vec2<f32>(1, 1)
   ));
 }
 
+fn rotate_direction(direction: vec2<f32>, angleSin: f32, angleCos: f32) -> vec2<f32> {
+  return vec2<f32>(
+    direction.x * angleCos - direction.y * angleSin,
+    direction.x * angleSin + direction.y * angleCos
+  );
+}
+
 fn get_channel_mask(colorIndex: f32) -> vec3<f32> {
   if colorIndex < 0.5 {
     return vec3<f32>(1, 0, 0);
@@ -183,15 +241,9 @@ fn angle_delta(sourceAngle: f32, targetAngle: f32) -> f32 {
   return atan2(sin(targetAngle - sourceAngle), cos(targetAngle - sourceAngle));
 }
 
-fn random_vec4(id: u32, time: f32) -> vec4<f32> {
-  let timeSeed = u32(time * 0.34816);
-  let seed = id * 747796405u + timeSeed * 2891336453u;
-  return vec4<f32>(
-    random_float(seed),
-    random_float(seed + 1013904223u),
-    random_float(seed + 1664525u),
-    random_float(seed + 22695477u)
-  );
+fn random_seed(id: u32, time: f32) -> u32 {
+  let timeSeed = u32(time * settings.randomTimeScale);
+  return id * 747796405u + timeSeed * 2891336453u;
 }
 
 fn random_float(seed: u32) -> f32 {
diff --git a/src/pipelines/brush/brush-pipeline.ts b/src/pipelines/brush/brush-pipeline.ts
index ec3ab76..f99b60c 100644
--- a/src/pipelines/brush/brush-pipeline.ts
+++ b/src/pipelines/brush/brush-pipeline.ts
@@ -16,11 +16,10 @@ interface LineSegment {
 }
 
 export class BrushPipeline {
-  private static readonly UNIFORM_COUNT = 8;
+  private static readonly UNIFORM_COUNT = 16;
   private static readonly MAX_LINE_COUNT = appConfig.pipelines.brush.maxLineCount;
   private static readonly VERTICES_PER_LINE_SEGMENT = 6;
-  private static readonly ATTRIBUTES_PER_LINE_SEGMENT = 6;
-  private static readonly FEATHER_RADIUS_RATIO = 0.22;
+  private static readonly ATTRIBUTES_PER_LINE_SEGMENT = 4;
 
   private readonly bindGroupLayout: GPUBindGroupLayout;
   private readonly bindGroup: GPUBindGroup;
@@ -91,22 +90,40 @@ export class BrushPipeline {
   public setParameters({
     brushSize,
     brushSizeVariation,
+    brushAlpha,
+    brushFeatherRatio,
+    brushMinimumFeather,
+    brushDiscardThreshold,
+    brushCoarseNoiseScale,
+    brushGrainNoiseScale,
+    brushGrainNoiseOffsetX,
+    brushGrainNoiseOffsetY,
+    brushGrainMinStrength,
+    brushGrainMaxStrength,
     selectedColorIndex,
   }: BrushSettings & { selectedColorIndex: number }) {
     const brushRadius = brushSize / 2;
     const brushRadiusVariation = Math.floor(brushRadius * brushSizeVariation);
-    const brushFeather = Math.max(1, brushRadius * BrushPipeline.FEATHER_RADIUS_RATIO);
+    const brushFeather = Math.max(brushMinimumFeather, brushRadius * brushFeatherRatio);
     const brushGeometryRadius =
       brushRadius + Math.max(0, brushRadiusVariation) + brushFeather;
 
     this.uniformValues[0] = brushRadius;
     this.uniformValues[1] = brushRadiusVariation;
-    this.uniformValues[2] = 0;
-    this.uniformValues[3] = 0;
+    this.uniformValues[2] = brushFeatherRatio;
+    this.uniformValues[3] = brushMinimumFeather;
     this.uniformValues[4] = selectedColorIndex === 0 ? 1 : 0;
     this.uniformValues[5] = selectedColorIndex === 1 ? 1 : 0;
     this.uniformValues[6] = selectedColorIndex === 2 ? 1 : 0;
-    this.uniformValues[7] = 1;
+    this.uniformValues[7] = brushAlpha;
+    this.uniformValues[8] = brushCoarseNoiseScale;
+    this.uniformValues[9] = brushGrainNoiseScale;
+    this.uniformValues[10] = brushGrainNoiseOffsetX;
+    this.uniformValues[11] = brushGrainNoiseOffsetY;
+    this.uniformValues[12] = brushDiscardThreshold;
+    this.uniformValues[13] = brushGrainMinStrength;
+    this.uniformValues[14] = brushGrainMaxStrength;
+    this.uniformValues[15] = brushGeometryRadius;
     writeFloat32BufferIfChanged(
       this.device,
       this.uniforms,
@@ -133,8 +150,7 @@ export class BrushPipeline {
         this.vertexUploadData,
         floatOffset,
         segment.from,
-        segment.to,
-        brushGeometryRadius
+        segment.to
       );
     }
 
@@ -167,84 +183,8 @@ export class BrushPipeline {
     target: Float32Array,
     offset: number,
     from: vec2,
-    to: vec2,
-    width: number
-  ): number {
-    const dx = to[0] - from[0];
-    const dy = to[1] - from[1];
-    const length = Math.hypot(dx, dy);
-    const directionX = length > 0 ? dx / length : 1;
-    const directionY = length > 0 ? dy / length : 0;
-    const scaledDirectionX = directionX * width;
-    const scaledDirectionY = directionY * width;
-    const perpendicularX = directionY * width;
-    const perpendicularY = -directionX * width;
-
-    const startX = from[0] - scaledDirectionX;
-    const startY = from[1] - scaledDirectionY;
-    const endX = to[0] + scaledDirectionX;
-    const endY = to[1] + scaledDirectionY;
-
-    offset = this.writeVertex(
-      target,
-      offset,
-      startX + perpendicularX,
-      startY + perpendicularY,
-      from,
-      to
-    );
-    offset = this.writeVertex(
-      target,
-      offset,
-      startX - perpendicularX,
-      startY - perpendicularY,
-      from,
-      to
-    );
-    offset = this.writeVertex(
-      target,
-      offset,
-      endX + perpendicularX,
-      endY + perpendicularY,
-      from,
-      to
-    );
-    offset = this.writeVertex(
-      target,
-      offset,
-      startX - perpendicularX,
-      startY - perpendicularY,
-      from,
-      to
-    );
-    offset = this.writeVertex(
-      target,
-      offset,
-      endX + perpendicularX,
-      endY + perpendicularY,
-      from,
-      to
-    );
-    return this.writeVertex(
-      target,
-      offset,
-      endX - perpendicularX,
-      endY - perpendicularY,
-      from,
-      to
-    );
-  }
-
-  private writeVertex(
-    target: Float32Array,
-    offset: number,
-    screenX: number,
-    screenY: number,
-    from: vec2,
     to: vec2
   ): number {
-    target[offset++] = screenX;
-    target[offset++] = screenY;
     target[offset++] = from[0];
     target[offset++] = from[1];
     target[offset++] = to[0];
@@ -285,7 +225,7 @@ export class BrushPipeline {
     this.commonState.execute(passEncoder);
     passEncoder.setBindGroup(1, this.bindGroup);
     passEncoder.setVertexBuffer(0, this.vertexBuffer);
-    passEncoder.draw(BrushPipeline.VERTICES_PER_LINE_SEGMENT * this.lineCount, 1);
+    passEncoder.draw(BrushPipeline.VERTICES_PER_LINE_SEGMENT, this.lineCount);
     passEncoder.end();
   }
 
@@ -308,7 +248,9 @@ export class BrushPipeline {
         entryPoint: 'vertex',
         buffers: [
           {
-            arrayStride: Float32Array.BYTES_PER_ELEMENT * 6,
+            arrayStride:
+              Float32Array.BYTES_PER_ELEMENT * BrushPipeline.ATTRIBUTES_PER_LINE_SEGMENT,
+            stepMode: 'instance',
             attributes: [
               {
                 shaderLocation: 0,
@@ -320,11 +262,6 @@ export class BrushPipeline {
                 format: 'float32x2',
                 offset: Float32Array.BYTES_PER_ELEMENT * 2,
               },
-              {
-                shaderLocation: 2,
-                format: 'float32x2',
-                offset: Float32Array.BYTES_PER_ELEMENT * 4,
-              },
             ],
           },
         ],
@@ -366,7 +303,7 @@ export class BrushPipeline {
       entries: [
         {
           binding: 0,
-          visibility: GPUShaderStage.FRAGMENT,
+          visibility: GPUShaderStage.VERTEX | GPUShaderStage.FRAGMENT,
           buffer: {
             type: 'uniform',
           },
diff --git a/src/pipelines/brush/brush-settings.ts b/src/pipelines/brush/brush-settings.ts
index cecb7a1..75c68b8 100644
--- a/src/pipelines/brush/brush-settings.ts
+++ b/src/pipelines/brush/brush-settings.ts
@@ -1,4 +1,14 @@
 export interface BrushSettings {
   brushSize: number;
   brushSizeVariation: number;
+  brushAlpha: number;
+  brushFeatherRatio: number;
+  brushMinimumFeather: number;
+  brushDiscardThreshold: number;
+  brushCoarseNoiseScale: number;
+  brushGrainNoiseScale: number;
+  brushGrainNoiseOffsetX: number;
+  brushGrainNoiseOffsetY: number;
+  brushGrainMinStrength: number;
+  brushGrainMaxStrength: number;
 }
diff --git a/src/pipelines/brush/brush.wgsl b/src/pipelines/brush/brush.wgsl
index 7794cbc..e88c38e 100644
--- a/src/pipelines/brush/brush.wgsl
+++ b/src/pipelines/brush/brush.wgsl
@@ -1,9 +1,17 @@
 struct Settings {
   brushSize: f32,
   brushSizeVariation: f32,
-  padding0: f32,
-  padding1: f32,
+  brushFeatherRatio: f32,
+  brushMinimumFeather: f32,
   brushValue: vec4<f32>,
+  brushCoarseNoiseScale: f32,
+  brushGrainNoiseScale: f32,
+  brushGrainNoiseOffsetX: f32,
+  brushGrainNoiseOffsetY: f32,
+  brushDiscardThreshold: f32,
+  brushGrainMinStrength: f32,
+  brushGrainMaxStrength: f32,
+  brushGeometryRadius: f32,
 };
 
 @group(1) @binding(0) var<uniform> settings: Settings;
@@ -11,8 +19,8 @@ struct Settings {
 struct VertexOutput {
   @builtin(position) position: vec4<f32>,
   @location(0) screenPosition: vec2<f32>,
-  @location(1) start: vec2<f32>,
-  @location(2) end: vec2<f32>
+  @location(1) @interpolate(flat) start: vec2<f32>,
+  @location(2) @interpolate(flat) end: vec2<f32>
 }
 
 struct BrushTargets {
@@ -22,10 +30,11 @@ struct BrushTargets {
 
 @vertex
 fn vertex(
-  @location(0) screenPosition: vec2<f32>,
-  @location(1) @interpolate(flat) start: vec2<f32>,
-  @location(2) @interpolate(flat) end: vec2<f32>
+  @builtin(vertex_index) vertexIndex: u32,
+  @location(0) start: vec2<f32>,
+  @location(1) end: vec2<f32>
 ) -> VertexOutput {
+  let screenPosition = segment_vertex_position(vertexIndex, start, end, settings.brushGeometryRadius);
   let uv = screenPosition / state.size;
   let position = vec2(uv.x * 2.0 - 1.0, 1.0 - uv.y * 2.0);
   return VertexOutput(vec4(position, 0.0, 1.0), screenPosition, start, end);
@@ -34,12 +43,17 @@ fn vertex(
 @fragment
 fn fragmentMrt(
   @location(0) screenPosition: vec2<f32>,
-  @location(1) start: vec2<f32>,
-  @location(2) end: vec2<f32>
+  @location(1) @interpolate(flat) start: vec2<f32>,
+  @location(2) @interpolate(flat) end: vec2<f32>
 ) -> BrushTargets {
-  let strength = brushStrength(screenPosition, start, end);
+  let distanceSquared = distanceSquaredFromLine(screenPosition, start, end);
+  if distanceSquared > settings.brushGeometryRadius * settings.brushGeometryRadius {
+    discard;
+  }
 
-  if(strength < 0.02) {
+  let strength = brushStrength(screenPosition, start, end, distanceSquared);
+
+  if(strength < settings.brushDiscardThreshold) {
     discard;
   }
 
@@ -47,33 +61,77 @@ fn fragmentMrt(
   return BrushTargets(color, color);
 }
 
-fn brushStrength(screenPosition: vec2<f32>, start: vec2<f32>, end: vec2<f32>) -> f32 {
-  let distance = distanceFromLine(screenPosition, start, end);
-  let coarseNoise = textureSample(noise, noiseSampler, fract(screenPosition / 160.0)).r;
+fn brushStrength(
+  screenPosition: vec2<f32>,
+  start: vec2<f32>,
+  end: vec2<f32>,
+  distanceSquared: f32
+) -> f32 {
+  let distance = sqrt(distanceSquared);
+  let coarseNoise = textureSample(
+    noise,
+    noiseSampler,
+    fract(screenPosition / settings.brushCoarseNoiseScale)
+  ).r;
   let grainNoise = textureSample(
     noise,
     noiseSampler,
-    fract(screenPosition / 22.0 + vec2(0.31, 0.67))
+    fract(
+      screenPosition / settings.brushGrainNoiseScale +
+      vec2(settings.brushGrainNoiseOffsetX, settings.brushGrainNoiseOffsetY)
+    )
   ).r;
   let radius = settings.brushSize + (coarseNoise - 0.5) * settings.brushSizeVariation * 2.0;
-  let feather = max(1.0, settings.brushSize * 0.22);
+  let feather = max(settings.brushMinimumFeather, settings.brushSize * settings.brushFeatherRatio);
   let edge = 1.0 - smoothstep(radius - feather, radius + feather, distance);
-  return edge * mix(0.45, 1.0, grainNoise);
+  return edge * mix(settings.brushGrainMinStrength, settings.brushGrainMaxStrength, grainNoise);
 }
 
 fn brushOutput(strength: f32) -> vec4<f32> {
   return vec4(settings.brushValue.rgb * strength, settings.brushValue.a * strength);
 }
 
-fn distanceFromLine(position: vec2<f32>, start: vec2<f32>, end: vec2<f32>) -> f32 {
+fn distanceSquaredFromLine(position: vec2<f32>, start: vec2<f32>, end: vec2<f32>) -> f32 {
   let pa = position - start;
   let direction = end - start;
   let denominator = dot(direction, direction);
 
   if denominator <= 0.0001 {
-    return length(pa);
+    return dot(pa, pa);
   }
 
   let q = clamp(dot(pa, direction) / denominator, 0, 1);
-  return length(pa - direction * q);
+  let nearestOffset = pa - direction * q;
+  return dot(nearestOffset, nearestOffset);
+}
+
+fn segment_vertex_position(
+  vertexIndex: u32,
+  start: vec2<f32>,
+  end: vec2<f32>,
+  radius: f32
+) -> vec2<f32> {
+  let directionVector = end - start;
+  let segmentLength = length(directionVector);
+  var direction = vec2<f32>(1.0, 0.0);
+  if segmentLength > 0.0 {
+    direction = directionVector / segmentLength;
+  }
+  let perpendicular = vec2<f32>(direction.y, -direction.x);
+  let corner = segment_vertex_corner(vertexIndex % 6u);
+  let center = mix(start, end, (corner.x + 1.0) * 0.5);
+  return center + direction * corner.x * radius + perpendicular * corner.y * radius;
+}
+
+fn segment_vertex_corner(index: u32) -> vec2<f32> {
+  if index == 0u {
+    return vec2<f32>(-1.0, 1.0);
+  }
+  if index == 1u || index == 3u {
+    return vec2<f32>(-1.0, -1.0);
+  }
+  if index == 2u || index == 4u {
+    return vec2<f32>(1.0, 1.0);
+  }
+  return vec2<f32>(1.0, -1.0);
 }
diff --git a/src/pipelines/common-state/common-state.ts b/src/pipelines/common-state/common-state.ts
index 130104d..8be1f8f 100644
--- a/src/pipelines/common-state/common-state.ts
+++ b/src/pipelines/common-state/common-state.ts
@@ -1,5 +1,6 @@
 import { vec2 } from 'gl-matrix';
 
+import { appConfig } from '../../config';
 import {
   createCachedFloat32BufferWrite,
   writeFloat32BufferIfChanged,
@@ -8,7 +9,6 @@ import { generateNoise } from '../../utils/graphics/noise';
 
 export class CommonState {
   private static readonly UNIFORM_COUNT = 4;
-  private static readonly NOISE_TEXTURE_SIZE = 2048;
 
   private readonly uniforms: GPUBuffer;
   private readonly uniformValues = new Float32Array(CommonState.UNIFORM_COUNT);
@@ -40,8 +40,8 @@ export class CommonState {
 
     this.noise = generateNoise({
       device,
-      width: CommonState.NOISE_TEXTURE_SIZE,
-      height: CommonState.NOISE_TEXTURE_SIZE,
+      width: appConfig.pipelines.common.noiseTextureSize,
+      height: appConfig.pipelines.common.noiseTextureSize,
     });
 
     this.bindGroupLayout = device.createBindGroupLayout({
diff --git a/src/pipelines/copy/copy-pipeline.ts b/src/pipelines/copy/copy-pipeline.ts
deleted file mode 100644
index f404716..0000000
--- a/src/pipelines/copy/copy-pipeline.ts
+++ /dev/null
@@ -1,189 +0,0 @@
-import { vec2 } from 'gl-matrix';
-
-import {
-  createCachedFloat32BufferWrite,
-  writeFloat32BufferIfChanged,
-} from '../../utils/graphics/cached-buffer-write';
-import { smartCompile } from '../../utils/graphics/smart-compile';
-import shader from './copy.wgsl?raw';
-
-export class CopyPipeline {
-  private static readonly UNIFORM_COUNT = 2;
-  private static readonly DEFAULT_SCALE = vec2.fromValues(1, 1);
-
-  private readonly bindGroupLayout: GPUBindGroupLayout;
-  private readonly pipeline: GPURenderPipeline;
-  private readonly uniforms: GPUBuffer;
-  private readonly uniformValues = new Float32Array(CopyPipeline.UNIFORM_COUNT);
-  private readonly uniformCache = createCachedFloat32BufferWrite(
-    CopyPipeline.UNIFORM_COUNT
-  );
-  private readonly sampler: GPUSampler;
-
-  private readonly vertexBuffer: GPUBuffer;
-
-  private readonly bindGroupsByInput = new WeakMap<GPUTextureView, GPUBindGroup>();
-
-  public constructor(private readonly device: GPUDevice) {
-    this.bindGroupLayout = device.createBindGroupLayout(CopyPipeline.bindGroupLayout);
-
-    this.uniforms = this.device.createBuffer({
-      size: CopyPipeline.UNIFORM_COUNT * Float32Array.BYTES_PER_ELEMENT,
-      usage: GPUBufferUsage.UNIFORM | GPUBufferUsage.COPY_DST,
-    });
-
-    this.sampler = this.device.createSampler({
-      magFilter: 'linear',
-      minFilter: 'linear',
-    });
-
-    this.vertexBuffer = device.createBuffer({
-      size: 2 * 4 * Float32Array.BYTES_PER_ELEMENT, // 4 x vec2<f32>
-      usage: GPUBufferUsage.VERTEX,
-      mappedAtCreation: true,
-    });
-    // prettier-ignore
-    const vertexData = [
-    // U    V
-      0.0, 1.0,
-      1.0, 1.0,
-      0.0, 0.0,
-      1.0, 0.0,
-    ];
-    new Float32Array(this.vertexBuffer.getMappedRange()).set(vertexData);
-    this.vertexBuffer.unmap();
-
-    const shaderModule = smartCompile(device, shader);
-    this.pipeline = device.createRenderPipeline({
-      layout: device.createPipelineLayout({
-        bindGroupLayouts: [this.bindGroupLayout],
-      }),
-      vertex: {
-        module: shaderModule,
-        entryPoint: 'vertex',
-        buffers: [
-          {
-            arrayStride: 2 * Float32Array.BYTES_PER_ELEMENT,
-            stepMode: 'vertex',
-            attributes: [
-              {
-                shaderLocation: 0,
-                offset: 0,
-                format: 'float32x2',
-              },
-            ],
-          },
-        ],
-      },
-      fragment: {
-        module: shaderModule,
-        entryPoint: 'fragment',
-        targets: [
-          {
-            format: 'rgba16float',
-          },
-        ],
-      },
-      primitive: {
-        topology: 'triangle-strip',
-      },
-    });
-  }
-
-  public execute(
-    commandEncoder: GPUCommandEncoder,
-    trailMapIn: GPUTextureView,
-    trailMapOut: GPUTextureView,
-    scale: vec2 = CopyPipeline.DEFAULT_SCALE
-  ) {
-    this.uniformValues[0] = scale[0];
-    this.uniformValues[1] = scale[1];
-    writeFloat32BufferIfChanged(
-      this.device,
-      this.uniforms,
-      this.uniformValues,
-      this.uniformCache
-    );
-
-    const renderPassDescriptor: GPURenderPassDescriptor = {
-      colorAttachments: [
-        {
-          view: trailMapOut,
-          loadOp: 'clear',
-          storeOp: 'store',
-        },
-      ],
-    };
-
-    const bindGroup = this.getBindGroup(trailMapIn);
-    const passEncoder = commandEncoder.beginRenderPass(renderPassDescriptor);
-    passEncoder.setPipeline(this.pipeline);
-    passEncoder.setBindGroup(0, bindGroup);
-    passEncoder.setVertexBuffer(0, this.vertexBuffer);
-    passEncoder.draw(4, 1);
-    passEncoder.end();
-  }
-
-  public destroy() {
-    this.vertexBuffer.destroy();
-    this.uniforms.destroy();
-  }
-
-  private getBindGroup(trailMapIn: GPUTextureView): GPUBindGroup {
-    const cached = this.bindGroupsByInput.get(trailMapIn);
-    if (cached) {
-      return cached;
-    }
-
-    const bindGroup = this.device.createBindGroup({
-      layout: this.bindGroupLayout,
-      entries: [
-        {
-          binding: 0,
-          resource: {
-            buffer: this.uniforms,
-          },
-        },
-        {
-          binding: 1,
-          resource: this.sampler,
-        },
-        {
-          binding: 2,
-          resource: trailMapIn,
-        },
-      ],
-    });
-
-    this.bindGroupsByInput.set(trailMapIn, bindGroup);
-    return bindGroup;
-  }
-
-  private static get bindGroupLayout(): GPUBindGroupLayoutDescriptor {
-    return {
-      entries: [
-        {
-          binding: 0,
-          visibility: GPUShaderStage.VERTEX,
-          buffer: {
-            type: 'uniform',
-          },
-        },
-        {
-          binding: 1,
-          visibility: GPUShaderStage.FRAGMENT,
-          sampler: {
-            type: 'filtering',
-          },
-        },
-        {
-          binding: 2,
-          visibility: GPUShaderStage.FRAGMENT,
-          texture: {
-            sampleType: 'float',
-          },
-        },
-      ],
-    };
-  }
-}
diff --git a/src/pipelines/copy/copy.wgsl b/src/pipelines/copy/copy.wgsl
deleted file mode 100644
index 94b017f..0000000
--- a/src/pipelines/copy/copy.wgsl
+++ /dev/null
@@ -1,19 +0,0 @@
-struct VertexOutput {
-  @builtin(position) position: vec4<f32>,
-  @location(0) uv: vec2<f32>,
-}
-
-@vertex
-fn vertex(@location(0) uv: vec2<f32>) -> VertexOutput {
-  let ndc = uv * sourceScaler * vec2(2) - vec2(1);
-  return VertexOutput(vec4(ndc.x, -ndc.y, 0, 1), uv);
-}
-
-@group(0) @binding(0) var<uniform> sourceScaler: vec2<f32>;
-@group(0) @binding(1) var Sampler: sampler;
-@group(0) @binding(2) var original: texture_2d<f32>;
-
-@fragment
-fn fragment(@location(0) uv: vec2<f32>) -> @location(0) vec4<f32> {
-  return textureSample(original, Sampler, uv);
-}
diff --git a/src/pipelines/diffusion/diffuse.wgsl b/src/pipelines/diffusion/diffuse.wgsl
index 5ef590d..c0ee060 100644
--- a/src/pipelines/diffusion/diffuse.wgsl
+++ b/src/pipelines/diffusion/diffuse.wgsl
@@ -3,56 +3,96 @@ struct Settings {
   decayRateTrails: f32,
   inverseDiffusionRateBrush: f32,
   decayRateBrush: f32,
+  diffusionNeighborDivisor: f32,
+  brushDecayAlphaOffset: f32,
+  padding0: f32,
+  padding1: f32,
 };
 
+const WORKGROUP_SIZE_X = 16u;
+const WORKGROUP_SIZE_Y = 16u;
+const TILE_SIZE_X = WORKGROUP_SIZE_X + 2u;
+const TILE_SIZE_Y = WORKGROUP_SIZE_Y + 2u;
+const TILE_TEXEL_COUNT = TILE_SIZE_X * TILE_SIZE_Y;
 
 @group(0) @binding(0) var<uniform> settings: Settings;
-@group(0) @binding(2) var trailMap: texture_2d<f32>;
+@group(0) @binding(1) var trailMap: texture_2d<f32>;
+@group(0) @binding(2) var trailMapOut: texture_storage_2d<rgba16float, write>;
 
+var<workgroup> tile: array<vec4<f32>, 324>;
 
-@fragment
-fn fragment(@builtin(position) position: vec4<f32>) -> @location(0) vec4<f32> {
+@compute @workgroup_size(16, 16)
+fn main(
+  @builtin(global_invocation_id) global_id: vec3<u32>,
+  @builtin(local_invocation_id) local_id: vec3<u32>,
+  @builtin(workgroup_id) workgroup_id: vec3<u32>
+) {
   let textureSize = vec2<i32>(textureDimensions(trailMap, 0));
-  let pixel = clamp(vec2<i32>(position.xy), vec2<i32>(0), textureSize - vec2<i32>(1));
-  var current = textureLoad(trailMap, pixel, 0);
+  let localLinearIndex = local_id.y * WORKGROUP_SIZE_X + local_id.x;
+  var tileIndex = localLinearIndex;
+
+  loop {
+    if tileIndex >= TILE_TEXEL_COUNT {
+      break;
+    }
+
+    let tilePosition = vec2<u32>(tileIndex % TILE_SIZE_X, tileIndex / TILE_SIZE_X);
+    let sourcePixelU32 =
+      workgroup_id.xy * vec2<u32>(WORKGROUP_SIZE_X, WORKGROUP_SIZE_Y) +
+      tilePosition;
+    let sourcePixel = clamp(
+      vec2<i32>(i32(sourcePixelU32.x), i32(sourcePixelU32.y)) - vec2<i32>(1, 1),
+      vec2<i32>(0, 0),
+      textureSize - vec2<i32>(1, 1)
+    );
+    tile[tileIndex] = textureLoad(trailMap, sourcePixel, 0);
+    tileIndex += WORKGROUP_SIZE_X * WORKGROUP_SIZE_Y;
+  }
+
+  workgroupBarrier();
+
+  let pixel = vec2<i32>(i32(global_id.x), i32(global_id.y));
+  if pixel.x >= textureSize.x || pixel.y >= textureSize.y {
+    return;
+  }
+
+  let centerTilePosition = local_id.xy + vec2<u32>(1u, 1u);
+  let centerTileIndex = centerTilePosition.y * TILE_SIZE_X + centerTilePosition.x;
+  var current = tile[centerTileIndex];
   let random = random_from_pixel(pixel);
   let trailWeight = diffusion_weight(random, settings.inverseDiffusionRateTrails);
   let brushWeight = diffusion_weight(random, settings.inverseDiffusionRateBrush);
 
   current += (
-        propagate(pixel, textureSize, vec2<i32>(-1, -1), current, trailWeight, brushWeight)
-      + propagate(pixel, textureSize, vec2<i32>(-1, 1), current, trailWeight, brushWeight)
-      + propagate(pixel, textureSize, vec2<i32>(1, -1), current, trailWeight, brushWeight)
-      + propagate(pixel, textureSize, vec2<i32>(1, 1), current, trailWeight, brushWeight)
+      propagate(centerTileIndex, -1, -1, current, trailWeight, brushWeight)
+    + propagate(centerTileIndex, -1, 1, current, trailWeight, brushWeight)
+    + propagate(centerTileIndex, 1, -1, current, trailWeight, brushWeight)
+    + propagate(centerTileIndex, 1, 1, current, trailWeight, brushWeight)
 
-      + propagate(pixel, textureSize, vec2<i32>(-1, 0), current, trailWeight, brushWeight)
-      + propagate(pixel, textureSize, vec2<i32>(0, -1), current, trailWeight, brushWeight)
-      + propagate(pixel, textureSize, vec2<i32>(1, 0), current, trailWeight, brushWeight)
-      + propagate(pixel, textureSize, vec2<i32>(0, 1), current, trailWeight, brushWeight)
-  ) / 8;
+    + propagate(centerTileIndex, -1, 0, current, trailWeight, brushWeight)
+    + propagate(centerTileIndex, 0, -1, current, trailWeight, brushWeight)
+    + propagate(centerTileIndex, 1, 0, current, trailWeight, brushWeight)
+    + propagate(centerTileIndex, 0, 1, current, trailWeight, brushWeight)
+  ) / max(1.0, settings.diffusionNeighborDivisor);
 
   let decayed = clamp(vec4(
     current.rgb * settings.decayRateTrails,
-    max(0, current.a + (current.a - 1.001) * settings.decayRateBrush)
+    max(0, current.a + (current.a - settings.brushDecayAlphaOffset) * settings.decayRateBrush)
   ), vec4(0), vec4(1));
- 
-  return decayed;
+
+  textureStore(trailMapOut, pixel, decayed);
 }
 
-
 fn propagate(
-  pixel: vec2<i32>,
-  textureSize: vec2<i32>,
-  offset: vec2<i32>,
+  centerTileIndex: u32,
+  offsetX: i32,
+  offsetY: i32,
   currentColor: vec4<f32>,
   trailWeight: f32,
   brushWeight: f32
 ) -> vec4<f32> {
-  let neighbour = textureLoad(
-    trailMap,
-    clamp(pixel + offset, vec2<i32>(0), textureSize - vec2<i32>(1)),
-    0
-  );
+  let neighbourIndex = i32(centerTileIndex) + offsetY * i32(TILE_SIZE_X) + offsetX;
+  let neighbour = tile[u32(neighbourIndex)];
   let difference = clamp(neighbour - currentColor, vec4(0), vec4(1));
 
   return vec4(
@@ -72,9 +112,6 @@ fn random_from_pixel(pixel: vec2<i32>) -> f32 {
 
 fn diffusion_weight(random: f32, inverseRate: f32) -> f32 {
   let r = clamp(random, 0.0, 1.0);
-  let r2 = r * r;
-  let r4 = r2 * r2;
-  let r8 = r4 * r4;
 
   if inverseRate < 1.0 {
     let rootApproximation = r / max(0.5 + r * 0.5, 0.0001);
@@ -85,14 +122,17 @@ fn diffusion_weight(random: f32, inverseRate: f32) -> f32 {
     );
   }
 
+  let r2 = r * r;
   if inverseRate < 2.0 {
     return mix(r, r2, inverseRate - 1.0);
   }
 
+  let r4 = r2 * r2;
   if inverseRate < 4.0 {
     return mix(r2, r4, (inverseRate - 2.0) * 0.5);
   }
 
+  let r8 = r4 * r4;
   if inverseRate < 8.0 {
     return mix(r4, r8, (inverseRate - 4.0) * 0.25);
   }
diff --git a/src/pipelines/diffusion/diffusion-pipeline.test.ts b/src/pipelines/diffusion/diffusion-pipeline.test.ts
index 8992d2b..c352d28 100644
--- a/src/pipelines/diffusion/diffusion-pipeline.test.ts
+++ b/src/pipelines/diffusion/diffusion-pipeline.test.ts
@@ -8,11 +8,14 @@ import {
 
 describe('diffusion pipeline parameters', () => {
   it('keeps zero diffusion rates finite before writing shader uniforms', () => {
-    const uniformValues = new Float32Array(4);
+    const uniformValues = new Float32Array(8);
 
     setDiffusionUniformValues(uniformValues, {
+      brushDecayAlphaOffset: 1.001,
       decayRateBrush: 900,
       decayRateTrails: 970,
+      diffusionDecayRateDivisor: 1000,
+      diffusionNeighborDivisor: 8,
       diffusionRateBrush: 0,
       diffusionRateTrails: 0,
     });
@@ -28,7 +31,9 @@ describe('diffusion pipeline parameters', () => {
     expect(getSafeInverseDiffusionRate(0.25)).toBe(4);
   });
 
-  it('keeps the diffusion shader on the low-cost trail sampling path', () => {
+  it('keeps the diffusion shader on the tiled compute sampling path', () => {
+    expect(shader).toContain('@compute @workgroup_size(16, 16)');
+    expect(shader).toContain('var<workgroup> tile');
     expect(shader).toContain('textureLoad');
     expect(shader).not.toContain('textureSample');
     expect(shader).not.toContain('pow(');
@@ -37,7 +42,8 @@ describe('diffusion pipeline parameters', () => {
 
   it('keeps shader resource groups aligned with the simplified pipeline layout', () => {
     expect(shader).toContain('@group(0) @binding(0) var<uniform> settings');
-    expect(shader).toContain('@group(0) @binding(2) var trailMap');
+    expect(shader).toContain('@group(0) @binding(1) var trailMap');
+    expect(shader).toContain('@group(0) @binding(2) var trailMapOut');
     expect(shader).not.toContain('@group(1)');
   });
 });
diff --git a/src/pipelines/diffusion/diffusion-pipeline.ts b/src/pipelines/diffusion/diffusion-pipeline.ts
index f279849..898503c 100644
--- a/src/pipelines/diffusion/diffusion-pipeline.ts
+++ b/src/pipelines/diffusion/diffusion-pipeline.ts
@@ -1,25 +1,32 @@
+import { vec2 } from 'gl-matrix';
+
 import { appConfig } from '../../config';
 import {
   createCachedFloat32BufferWrite,
   writeFloat32BufferIfChanged,
 } from '../../utils/graphics/cached-buffer-write';
-import { setUpFullScreenQuad } from '../../utils/graphics/full-screen-quad';
+import { getWorkgroupCount } from '../../utils/graphics/get-workgroup-count';
 import { smartCompile } from '../../utils/graphics/smart-compile';
 import shader from './diffuse.wgsl?raw';
 import { DiffusionSettings } from './diffusion-settings';
 
-const MIN_DIFFUSION_RATE = appConfig.pipelines.diffusion.minDiffusionRate;
-
 type DiffusionUniformSettings = Pick<
   DiffusionSettings,
-  'diffusionRateTrails' | 'decayRateTrails' | 'diffusionRateBrush' | 'decayRateBrush'
+  | 'diffusionRateTrails'
+  | 'decayRateTrails'
+  | 'diffusionRateBrush'
+  | 'decayRateBrush'
+  | 'diffusionDecayRateDivisor'
+  | 'diffusionNeighborDivisor'
+  | 'brushDecayAlphaOffset'
 >;
 
 export const getSafeInverseDiffusionRate = (diffusionRate: number): number =>
   1 /
-  (Number.isFinite(diffusionRate) && diffusionRate > MIN_DIFFUSION_RATE
+  (Number.isFinite(diffusionRate) &&
+  diffusionRate > appConfig.pipelines.diffusion.minDiffusionRate
     ? diffusionRate
-    : MIN_DIFFUSION_RATE);
+    : appConfig.pipelines.diffusion.minDiffusionRate);
 
 export const setDiffusionUniformValues = (
   target: Float32Array,
@@ -28,52 +35,48 @@ export const setDiffusionUniformValues = (
     decayRateTrails,
     diffusionRateBrush,
     decayRateBrush,
+    diffusionDecayRateDivisor,
+    diffusionNeighborDivisor,
+    brushDecayAlphaOffset,
   }: DiffusionUniformSettings
 ): void => {
+  const decayDivisor = Math.max(Number.EPSILON, diffusionDecayRateDivisor);
   target[0] = getSafeInverseDiffusionRate(diffusionRateTrails);
-  target[1] = decayRateTrails / 1000;
+  target[1] = decayRateTrails / decayDivisor;
   target[2] = getSafeInverseDiffusionRate(diffusionRateBrush);
-  target[3] = decayRateBrush / 1000;
+  target[3] = decayRateBrush / decayDivisor;
+  target[4] = diffusionNeighborDivisor;
+  target[5] = brushDecayAlphaOffset;
 };
 
 export class DiffusionPipeline {
-  private static readonly UNIFORM_COUNT = 4;
+  private static readonly WORKGROUP_SIZE = 16;
+  private static readonly UNIFORM_COUNT = 8;
 
   private readonly bindGroupLayout: GPUBindGroupLayout;
-  private readonly pipeline: GPURenderPipeline;
+  private readonly pipeline: GPUComputePipeline;
   private readonly uniforms: GPUBuffer;
   private readonly uniformValues = new Float32Array(DiffusionPipeline.UNIFORM_COUNT);
   private readonly uniformCache = createCachedFloat32BufferWrite(
     DiffusionPipeline.UNIFORM_COUNT
   );
-  private readonly vertexBuffer: GPUBuffer;
-
-  private readonly bindGroupsByInput = new WeakMap<GPUTextureView, GPUBindGroup>();
+  private readonly bindGroupsByInput = new WeakMap<
+    GPUTextureView,
+    WeakMap<GPUTextureView, GPUBindGroup>
+  >();
 
   public constructor(private readonly device: GPUDevice) {
     this.bindGroupLayout = device.createBindGroupLayout(
       DiffusionPipeline.bindGroupLayout
     );
 
-    const { buffer, vertex } = setUpFullScreenQuad(device);
-    this.vertexBuffer = buffer;
-
-    this.pipeline = device.createRenderPipeline({
+    this.pipeline = device.createComputePipeline({
       layout: device.createPipelineLayout({
         bindGroupLayouts: [this.bindGroupLayout],
       }),
-      vertex,
-      fragment: {
+      compute: {
         module: smartCompile(device, shader),
-        entryPoint: 'fragment',
-        targets: [
-          {
-            format: 'rgba16float',
-          },
-        ],
-      },
-      primitive: {
-        topology: 'triangle-strip',
+        entryPoint: 'main',
       },
     });
 
@@ -88,12 +91,18 @@ export class DiffusionPipeline {
     decayRateTrails,
     diffusionRateBrush,
     decayRateBrush,
+    diffusionDecayRateDivisor,
+    diffusionNeighborDivisor,
+    brushDecayAlphaOffset,
   }: DiffusionSettings) {
     setDiffusionUniformValues(this.uniformValues, {
       diffusionRateTrails,
       decayRateTrails,
       diffusionRateBrush,
       decayRateBrush,
+      diffusionDecayRateDivisor,
+      diffusionNeighborDivisor,
+      brushDecayAlphaOffset,
     });
     writeFloat32BufferIfChanged(
       this.device,
@@ -106,31 +115,32 @@ export class DiffusionPipeline {
   public execute(
     commandEncoder: GPUCommandEncoder,
     trailMapIn: GPUTextureView,
-    trailMapOut: GPUTextureView
+    trailMapOut: GPUTextureView,
+    size: vec2
   ) {
-    const bindGroup = this.getBindGroup(trailMapIn);
+    const bindGroup = this.getBindGroup(trailMapIn, trailMapOut);
 
-    const renderPassDescriptor: GPURenderPassDescriptor = {
-      colorAttachments: [
-        {
-          view: trailMapOut,
-          clearValue: { r: 0, g: 0, b: 0, a: 0 },
-          loadOp: 'clear',
-          storeOp: 'store',
-        },
-      ],
-    };
-
-    const passEncoder = commandEncoder.beginRenderPass(renderPassDescriptor);
+    const passEncoder = commandEncoder.beginComputePass();
     passEncoder.setPipeline(this.pipeline);
-    passEncoder.setVertexBuffer(0, this.vertexBuffer);
     passEncoder.setBindGroup(0, bindGroup);
-    passEncoder.draw(4, 1);
+    passEncoder.dispatchWorkgroups(
+      getWorkgroupCount(size[0], DiffusionPipeline.WORKGROUP_SIZE),
+      getWorkgroupCount(size[1], DiffusionPipeline.WORKGROUP_SIZE)
+    );
     passEncoder.end();
   }
 
-  private getBindGroup(trailMapIn: GPUTextureView): GPUBindGroup {
-    const cached = this.bindGroupsByInput.get(trailMapIn);
+  private getBindGroup(
+    trailMapIn: GPUTextureView,
+    trailMapOut: GPUTextureView
+  ): GPUBindGroup {
+    let outputCache = this.bindGroupsByInput.get(trailMapIn);
+    if (!outputCache) {
+      outputCache = new WeakMap<GPUTextureView, GPUBindGroup>();
+      this.bindGroupsByInput.set(trailMapIn, outputCache);
+    }
+
+    const cached = outputCache.get(trailMapOut);
     if (cached) {
       return cached;
     }
@@ -145,18 +155,21 @@ export class DiffusionPipeline {
           },
         },
         {
-          binding: 2,
+          binding: 1,
           resource: trailMapIn,
         },
+        {
+          binding: 2,
+          resource: trailMapOut,
+        },
       ],
     });
 
-    this.bindGroupsByInput.set(trailMapIn, bindGroup);
+    outputCache.set(trailMapOut, bindGroup);
     return bindGroup;
   }
 
   public destroy() {
-    this.vertexBuffer.destroy();
     this.uniforms.destroy();
   }
 
@@ -165,18 +178,26 @@ export class DiffusionPipeline {
       entries: [
         {
           binding: 0,
-          visibility: GPUShaderStage.FRAGMENT,
+          visibility: GPUShaderStage.COMPUTE,
           buffer: {
             type: 'uniform',
           },
         },
         {
-          binding: 2,
-          visibility: GPUShaderStage.FRAGMENT,
+          binding: 1,
+          visibility: GPUShaderStage.COMPUTE,
           texture: {
             sampleType: 'float',
           },
         },
+        {
+          binding: 2,
+          visibility: GPUShaderStage.COMPUTE,
+          storageTexture: {
+            access: 'write-only',
+            format: 'rgba16float',
+          },
+        },
       ],
     };
   }
diff --git a/src/pipelines/diffusion/diffusion-settings.ts b/src/pipelines/diffusion/diffusion-settings.ts
index 909101b..bd9717d 100644
--- a/src/pipelines/diffusion/diffusion-settings.ts
+++ b/src/pipelines/diffusion/diffusion-settings.ts
@@ -3,4 +3,7 @@ export interface DiffusionSettings {
   decayRateTrails: number;
   diffusionRateBrush: number;
   decayRateBrush: number;
+  diffusionDecayRateDivisor: number;
+  diffusionNeighborDivisor: number;
+  brushDecayAlphaOffset: number;
 }
diff --git a/src/pipelines/eraser/eraser-agent-pipeline.ts b/src/pipelines/eraser/eraser-agent-pipeline.ts
index 5e46f65..145a783 100644
--- a/src/pipelines/eraser/eraser-agent-pipeline.ts
+++ b/src/pipelines/eraser/eraser-agent-pipeline.ts
@@ -18,7 +18,10 @@ export class EraserAgentPipeline {
   private readonly uniformCache = createCachedFloat32BufferWrite(
     EraserAgentPipeline.UNIFORM_COUNT
   );
-  private readonly bindGroupsByMask = new WeakMap<GPUTextureView, GPUBindGroup>();
+  private readonly bindGroupsByAgentsBuffer = new WeakMap<
+    GPUBuffer,
+    WeakMap<GPUTextureView, GPUBindGroup>
+  >();
 
   private pendingSegmentCount = 0;
   private activeSegmentCount = 0;
@@ -26,7 +29,7 @@ export class EraserAgentPipeline {
 
   public constructor(
     private readonly device: GPUDevice,
-    private readonly agentsBuffer: GPUBuffer
+    private readonly getAgentsBuffer: () => GPUBuffer
   ) {
     const emptyBindGroupLayout = device.createBindGroupLayout({ entries: [] });
     this.bindGroupLayout = device.createBindGroupLayout({
@@ -80,13 +83,19 @@ export class EraserAgentPipeline {
     this.activeSegmentCount = 0;
   }
 
-  public setParameters({ agentCount }: { agentCount: number }): void {
+  public setParameters({
+    agentCount,
+    eraserMaskAlphaThreshold,
+  }: {
+    agentCount: number;
+    eraserMaskAlphaThreshold: number;
+  }): void {
     this.agentCount = agentCount;
     this.activeSegmentCount = this.pendingSegmentCount;
     this.pendingSegmentCount = 0;
 
     this.uniformValues[0] = agentCount;
-    this.uniformValues[1] = 0;
+    this.uniformValues[1] = eraserMaskAlphaThreshold;
     this.uniformValues[2] = 0;
     this.uniformValues[3] = 0;
     writeFloat32BufferIfChanged(
@@ -120,7 +129,14 @@ export class EraserAgentPipeline {
   }
 
   private getBindGroup(eraserMask: GPUTextureView): GPUBindGroup {
-    const cached = this.bindGroupsByMask.get(eraserMask);
+    const agentsBuffer = this.getAgentsBuffer();
+    let maskCache = this.bindGroupsByAgentsBuffer.get(agentsBuffer);
+    if (!maskCache) {
+      maskCache = new WeakMap<GPUTextureView, GPUBindGroup>();
+      this.bindGroupsByAgentsBuffer.set(agentsBuffer, maskCache);
+    }
+
+    const cached = maskCache.get(eraserMask);
     if (cached) {
       return cached;
     }
@@ -137,7 +153,7 @@ export class EraserAgentPipeline {
         {
           binding: 1,
           resource: {
-            buffer: this.agentsBuffer,
+            buffer: agentsBuffer,
           },
         },
         {
@@ -147,7 +163,7 @@ export class EraserAgentPipeline {
       ],
     });
 
-    this.bindGroupsByMask.set(eraserMask, bindGroup);
+    maskCache.set(eraserMask, bindGroup);
     return bindGroup;
   }
 }
diff --git a/src/pipelines/eraser/eraser-agent.wgsl b/src/pipelines/eraser/eraser-agent.wgsl
index 36bc7dc..9c7b57c 100644
--- a/src/pipelines/eraser/eraser-agent.wgsl
+++ b/src/pipelines/eraser/eraser-agent.wgsl
@@ -1,6 +1,6 @@
 struct Settings {
   agentCount: f32,
-  padding0: f32,
+  eraserMaskAlphaThreshold: f32,
   padding1: f32,
   padding2: f32,
 };
@@ -18,21 +18,20 @@ fn main(
     return;
   }
 
-  var agent = agents[id];
-  if agent.colorIndex < 0.0 {
+  let colorIndex = agents[id].colorIndex;
+  if colorIndex < 0.0 {
     return;
   }
 
   let maskSize = vec2<i32>(textureDimensions(eraserMask));
   let maskPosition = clamp(
-    vec2<i32>(agent.position),
+    vec2<i32>(agents[id].position),
     vec2<i32>(0, 0),
     maskSize - vec2<i32>(1, 1)
   );
   let maskSample = textureLoad(eraserMask, maskPosition, 0);
 
-  if maskSample.a < 0.5 {
-    agent.colorIndex = -1.0;
-    agents[id] = agent;
+  if maskSample.a < settings.eraserMaskAlphaThreshold {
+    agents[id].colorIndex = -1.0;
   }
 }
diff --git a/src/pipelines/eraser/eraser-texture-pipeline.ts b/src/pipelines/eraser/eraser-texture-pipeline.ts
index 2ef8455..c3da496 100644
--- a/src/pipelines/eraser/eraser-texture-pipeline.ts
+++ b/src/pipelines/eraser/eraser-texture-pipeline.ts
@@ -15,15 +15,14 @@ interface LineSegment {
 }
 
 export class EraserTexturePipeline {
-  private static readonly UNIFORM_COUNT = 4;
+  private static readonly UNIFORM_COUNT = 8;
   private static readonly MAX_LINE_COUNT = appConfig.pipelines.eraser.maxTextureLineCount;
   private static readonly VERTICES_PER_LINE_SEGMENT = 6;
-  private static readonly ATTRIBUTES_PER_LINE_SEGMENT = 6;
+  private static readonly ATTRIBUTES_PER_LINE_SEGMENT = 4;
 
   private readonly bindGroupLayout: GPUBindGroupLayout;
   private readonly bindGroup: GPUBindGroup;
-  private readonly pipeline: GPURenderPipeline;
-  private readonly multiTargetPipeline: GPURenderPipeline;
+  private readonly combinedPipeline: GPURenderPipeline;
   private readonly uniforms: GPUBuffer;
   private readonly uniformValues = new Float32Array(EraserTexturePipeline.UNIFORM_COUNT);
   private readonly uniformCache = createCachedFloat32BufferWrite(
@@ -47,7 +46,7 @@ export class EraserTexturePipeline {
       entries: [
         {
           binding: 0,
-          visibility: GPUShaderStage.FRAGMENT,
+          visibility: GPUShaderStage.VERTEX | GPUShaderStage.FRAGMENT,
           buffer: {
             type: 'uniform',
           },
@@ -65,8 +64,7 @@ export class EraserTexturePipeline {
     });
 
     const shaderModule = smartCompile(device, CommonState.shaderCode, shader);
-    this.pipeline = this.createPipeline(shaderModule, 'fragment', 1);
-    this.multiTargetPipeline = this.createPipeline(shaderModule, 'fragmentMrt', 3);
+    this.combinedPipeline = this.createPipeline(shaderModule, 'fragmentCombined', 4);
 
     this.uniforms = this.device.createBuffer({
       size: EraserTexturePipeline.UNIFORM_COUNT * Float32Array.BYTES_PER_ELEMENT,
@@ -98,13 +96,31 @@ export class EraserTexturePipeline {
     this.actualSegments.length = 0;
   }
 
-  public setParameters({ eraserSize }: { eraserSize: number }): void {
+  public setParameters({
+    eraserSize,
+    eraserLineDistanceEpsilon,
+    eraserClearRed,
+    eraserClearGreen,
+    eraserClearBlue,
+    eraserClearAlpha,
+  }: {
+    eraserSize: number;
+    eraserLineDistanceEpsilon: number;
+    eraserClearRed: number;
+    eraserClearGreen: number;
+    eraserClearBlue: number;
+    eraserClearAlpha: number;
+  }): void {
     const eraserRadius = eraserSize / 2;
 
     this.uniformValues[0] = eraserRadius * eraserRadius;
-    this.uniformValues[1] = 0;
-    this.uniformValues[2] = 0;
-    this.uniformValues[3] = 0;
+    this.uniformValues[1] = eraserLineDistanceEpsilon;
+    this.uniformValues[2] = eraserClearRed;
+    this.uniformValues[3] = eraserClearGreen;
+    this.uniformValues[4] = eraserClearBlue;
+    this.uniformValues[5] = eraserClearAlpha;
+    this.uniformValues[6] = 0;
+    this.uniformValues[7] = 0;
     writeFloat32BufferIfChanged(
       this.device,
       this.uniforms,
@@ -131,8 +147,7 @@ export class EraserTexturePipeline {
         this.vertexUploadData,
         floatOffset,
         segment.from,
-        segment.to,
-        eraserRadius
+        segment.to
       );
     }
 
@@ -145,46 +160,60 @@ export class EraserTexturePipeline {
     );
   }
 
-  public execute(commandEncoder: GPUCommandEncoder, textureOut: GPUTextureView): void {
-    this.executeWithPipeline(commandEncoder, this.pipeline, [textureOut]);
-  }
-
-  public executeMultiTarget(
+  public executeCombined(
     commandEncoder: GPUCommandEncoder,
+    eraserMaskOut: GPUTextureView,
     sourceMapOut: GPUTextureView,
     influenceMapOut: GPUTextureView,
     trailMapOut: GPUTextureView
-  ): void {
-    this.executeWithPipeline(commandEncoder, this.multiTargetPipeline, [
-      sourceMapOut,
-      influenceMapOut,
-      trailMapOut,
-    ]);
-  }
-
-  private executeWithPipeline(
-    commandEncoder: GPUCommandEncoder,
-    pipeline: GPURenderPipeline,
-    textureViews: Array<GPUTextureView>
   ): void {
     if (this.lineCount === 0) {
+      const passEncoder = commandEncoder.beginRenderPass({
+        colorAttachments: [
+          {
+            view: eraserMaskOut,
+            clearValue: { r: 1, g: 1, b: 1, a: 1 },
+            loadOp: 'clear',
+            storeOp: 'store',
+          },
+        ],
+      });
+      passEncoder.end();
       return;
     }
 
     const renderPassDescriptor: GPURenderPassDescriptor = {
-      colorAttachments: textureViews.map<GPURenderPassColorAttachment>((view) => ({
-        view,
-        loadOp: 'load',
-        storeOp: 'store',
-      })),
+      colorAttachments: [
+        {
+          view: eraserMaskOut,
+          clearValue: { r: 1, g: 1, b: 1, a: 1 },
+          loadOp: 'clear',
+          storeOp: 'store',
+        },
+        {
+          view: sourceMapOut,
+          loadOp: 'load',
+          storeOp: 'store',
+        },
+        {
+          view: influenceMapOut,
+          loadOp: 'load',
+          storeOp: 'store',
+        },
+        {
+          view: trailMapOut,
+          loadOp: 'load',
+          storeOp: 'store',
+        },
+      ],
     };
 
     const passEncoder = commandEncoder.beginRenderPass(renderPassDescriptor);
-    passEncoder.setPipeline(pipeline);
+    passEncoder.setPipeline(this.combinedPipeline);
     this.commonState.execute(passEncoder);
     passEncoder.setBindGroup(1, this.bindGroup);
     passEncoder.setVertexBuffer(0, this.vertexBuffer);
-    passEncoder.draw(EraserTexturePipeline.VERTICES_PER_LINE_SEGMENT * this.lineCount, 1);
+    passEncoder.draw(EraserTexturePipeline.VERTICES_PER_LINE_SEGMENT, this.lineCount);
     passEncoder.end();
   }
 
@@ -207,7 +236,10 @@ export class EraserTexturePipeline {
         entryPoint: 'vertex',
         buffers: [
           {
-            arrayStride: Float32Array.BYTES_PER_ELEMENT * 6,
+            arrayStride:
+              Float32Array.BYTES_PER_ELEMENT *
+              EraserTexturePipeline.ATTRIBUTES_PER_LINE_SEGMENT,
+            stepMode: 'instance',
             attributes: [
               {
                 shaderLocation: 0,
@@ -219,11 +251,6 @@ export class EraserTexturePipeline {
                 format: 'float32x2',
                 offset: Float32Array.BYTES_PER_ELEMENT * 2,
               },
-              {
-                shaderLocation: 2,
-                format: 'float32x2',
-                offset: Float32Array.BYTES_PER_ELEMENT * 4,
-              },
             ],
           },
         ],
@@ -261,84 +288,8 @@ export class EraserTexturePipeline {
     target: Float32Array,
     offset: number,
     from: vec2,
-    to: vec2,
-    width: number
-  ): number {
-    const dx = to[0] - from[0];
-    const dy = to[1] - from[1];
-    const length = Math.hypot(dx, dy);
-    const directionX = length > 0 ? dx / length : 1;
-    const directionY = length > 0 ? dy / length : 0;
-    const scaledDirectionX = directionX * width;
-    const scaledDirectionY = directionY * width;
-    const perpendicularX = directionY * width;
-    const perpendicularY = -directionX * width;
-
-    const startX = from[0] - scaledDirectionX;
-    const startY = from[1] - scaledDirectionY;
-    const endX = to[0] + scaledDirectionX;
-    const endY = to[1] + scaledDirectionY;
-
-    offset = this.writeVertex(
-      target,
-      offset,
-      startX + perpendicularX,
-      startY + perpendicularY,
-      from,
-      to
-    );
-    offset = this.writeVertex(
-      target,
-      offset,
-      startX - perpendicularX,
-      startY - perpendicularY,
-      from,
-      to
-    );
-    offset = this.writeVertex(
-      target,
-      offset,
-      endX + perpendicularX,
-      endY + perpendicularY,
-      from,
-      to
-    );
-    offset = this.writeVertex(
-      target,
-      offset,
-      startX - perpendicularX,
-      startY - perpendicularY,
-      from,
-      to
-    );
-    offset = this.writeVertex(
-      target,
-      offset,
-      endX + perpendicularX,
-      endY + perpendicularY,
-      from,
-      to
-    );
-    return this.writeVertex(
-      target,
-      offset,
-      endX - perpendicularX,
-      endY - perpendicularY,
-      from,
-      to
-    );
-  }
-
-  private writeVertex(
-    target: Float32Array,
-    offset: number,
-    screenX: number,
-    screenY: number,
-    from: vec2,
     to: vec2
   ): number {
-    target[offset++] = screenX;
-    target[offset++] = screenY;
     target[offset++] = from[0];
     target[offset++] = from[1];
     target[offset++] = to[0];
diff --git a/src/pipelines/eraser/eraser-texture.wgsl b/src/pipelines/eraser/eraser-texture.wgsl
index 7055f09..38b083f 100644
--- a/src/pipelines/eraser/eraser-texture.wgsl
+++ b/src/pipelines/eraser/eraser-texture.wgsl
@@ -1,8 +1,12 @@
 struct Settings {
   eraserRadiusSquared: f32,
+  lineDistanceEpsilon: f32,
+  clearRed: f32,
+  clearGreen: f32,
+  clearBlue: f32,
+  clearAlpha: f32,
   padding0: f32,
   padding1: f32,
-  padding2: f32,
 };
 
 @group(1) @binding(0) var<uniform> settings: Settings;
@@ -10,8 +14,8 @@ struct Settings {
 struct VertexOutput {
   @builtin(position) position: vec4<f32>,
   @location(0) screenPosition: vec2<f32>,
-  @location(1) start: vec2<f32>,
-  @location(2) end: vec2<f32>
+  @location(1) @interpolate(flat) start: vec2<f32>,
+  @location(2) @interpolate(flat) end: vec2<f32>
 }
 
 struct EraserTextureTargets {
@@ -20,12 +24,20 @@ struct EraserTextureTargets {
   @location(2) trail: vec4<f32>,
 }
 
+struct EraserCombinedTargets {
+  @location(0) mask: vec4<f32>,
+  @location(1) source: vec4<f32>,
+  @location(2) influence: vec4<f32>,
+  @location(3) trail: vec4<f32>,
+}
+
 @vertex
 fn vertex(
-  @location(0) screenPosition: vec2<f32>,
-  @location(1) @interpolate(flat) start: vec2<f32>,
-  @location(2) @interpolate(flat) end: vec2<f32>
+  @builtin(vertex_index) vertexIndex: u32,
+  @location(0) start: vec2<f32>,
+  @location(1) end: vec2<f32>
 ) -> VertexOutput {
+  let screenPosition = segment_vertex_position(vertexIndex, start, end, sqrt(settings.eraserRadiusSquared));
   let uv = screenPosition / state.size;
   let position = vec2(uv.x * 2.0 - 1.0, 1.0 - uv.y * 2.0);
   return VertexOutput(vec4(position, 0.0, 1.0), screenPosition, start, end);
@@ -34,30 +46,53 @@ fn vertex(
 @fragment
 fn fragment(
   @location(0) screenPosition: vec2<f32>,
-  @location(1) start: vec2<f32>,
-  @location(2) end: vec2<f32>
+  @location(1) @interpolate(flat) start: vec2<f32>,
+  @location(2) @interpolate(flat) end: vec2<f32>
 ) -> @location(0) vec4<f32> {
   if shouldDiscardEraserFragment(screenPosition, start, end) {
     discard;
   }
 
-  return vec4<f32>(0.0, 0.0, 0.0, 0.0);
+  return getEraserClearValue();
 }
 
 @fragment
 fn fragmentMrt(
   @location(0) screenPosition: vec2<f32>,
-  @location(1) start: vec2<f32>,
-  @location(2) end: vec2<f32>
+  @location(1) @interpolate(flat) start: vec2<f32>,
+  @location(2) @interpolate(flat) end: vec2<f32>
 ) -> EraserTextureTargets {
   if shouldDiscardEraserFragment(screenPosition, start, end) {
     discard;
   }
 
-  let cleared = vec4<f32>(0.0, 0.0, 0.0, 0.0);
+  let cleared = getEraserClearValue();
   return EraserTextureTargets(cleared, cleared, cleared);
 }
 
+@fragment
+fn fragmentCombined(
+  @location(0) screenPosition: vec2<f32>,
+  @location(1) @interpolate(flat) start: vec2<f32>,
+  @location(2) @interpolate(flat) end: vec2<f32>
+) -> EraserCombinedTargets {
+  if shouldDiscardEraserFragment(screenPosition, start, end) {
+    discard;
+  }
+
+  let cleared = getEraserClearValue();
+  return EraserCombinedTargets(cleared, cleared, cleared, cleared);
+}
+
+fn getEraserClearValue() -> vec4<f32> {
+  return vec4<f32>(
+    settings.clearRed,
+    settings.clearGreen,
+    settings.clearBlue,
+    settings.clearAlpha
+  );
+}
+
 fn shouldDiscardEraserFragment(
   screenPosition: vec2<f32>,
   start: vec2<f32>,
@@ -71,7 +106,7 @@ fn distanceSquaredFromLine(position: vec2<f32>, start: vec2<f32>, end: vec2<f32>
   let direction = end - start;
   let denominator = dot(direction, direction);
 
-  if denominator <= 0.0001 {
+  if denominator <= settings.lineDistanceEpsilon {
     return dot(pa, pa);
   }
 
@@ -79,3 +114,34 @@ fn distanceSquaredFromLine(position: vec2<f32>, start: vec2<f32>, end: vec2<f32>
   let nearestOffset = pa - direction * q;
   return dot(nearestOffset, nearestOffset);
 }
+
+fn segment_vertex_position(
+  vertexIndex: u32,
+  start: vec2<f32>,
+  end: vec2<f32>,
+  radius: f32
+) -> vec2<f32> {
+  let directionVector = end - start;
+  let segmentLength = length(directionVector);
+  var direction = vec2<f32>(1.0, 0.0);
+  if segmentLength > 0.0 {
+    direction = directionVector / segmentLength;
+  }
+  let perpendicular = vec2<f32>(direction.y, -direction.x);
+  let corner = segment_vertex_corner(vertexIndex % 6u);
+  let center = mix(start, end, (corner.x + 1.0) * 0.5);
+  return center + direction * corner.x * radius + perpendicular * corner.y * radius;
+}
+
+fn segment_vertex_corner(index: u32) -> vec2<f32> {
+  if index == 0u {
+    return vec2<f32>(-1.0, 1.0);
+  }
+  if index == 1u || index == 3u {
+    return vec2<f32>(-1.0, -1.0);
+  }
+  if index == 2u || index == 4u {
+    return vec2<f32>(1.0, 1.0);
+  }
+  return vec2<f32>(1.0, -1.0);
+}
diff --git a/src/pipelines/render/render-pipeline.ts b/src/pipelines/render/render-pipeline.ts
index 96a7055..74cb5e5 100644
--- a/src/pipelines/render/render-pipeline.ts
+++ b/src/pipelines/render/render-pipeline.ts
@@ -9,17 +9,17 @@ import { RenderSettings } from './render-settings';
 import shader from './render.wgsl?raw';
 
 export class RenderPipeline {
-  private static readonly UNIFORM_COUNT = 16;
+  private static readonly UNIFORM_COUNT = 20;
 
   private readonly bindGroupLayout: GPUBindGroupLayout;
   private readonly pipeline: GPURenderPipeline;
+  private readonly sampledPipeline: GPURenderPipeline;
   private readonly sampler: GPUSampler;
   private readonly uniforms: GPUBuffer;
   private readonly uniformValues = new Float32Array(RenderPipeline.UNIFORM_COUNT);
   private readonly uniformCache = createCachedFloat32BufferWrite(
     RenderPipeline.UNIFORM_COUNT
   );
-  private readonly vertexBuffer: GPUBuffer;
 
   private readonly bindGroupsByTexture = new WeakMap<
     GPUTextureView,
@@ -33,8 +33,7 @@ export class RenderPipeline {
   ) {
     this.bindGroupLayout = device.createBindGroupLayout(RenderPipeline.bindGroupLayout);
 
-    const { buffer, vertex } = setUpFullScreenQuad(device);
-    this.vertexBuffer = buffer;
+    const vertex = setUpFullScreenQuad(device);
 
     this.sampler = device.createSampler({
       magFilter: 'linear',
@@ -42,7 +41,8 @@ export class RenderPipeline {
     });
 
     const format = navigator.gpu.getPreferredCanvasFormat();
-    this.pipeline = this.createPipeline(format, vertex);
+    this.pipeline = this.createPipeline(format, vertex, 'fragment');
+    this.sampledPipeline = this.createPipeline(format, vertex, 'fragmentSampled');
 
     this.uniforms = this.device.createBuffer({
       size: RenderPipeline.UNIFORM_COUNT * Float32Array.BYTES_PER_ELEMENT,
@@ -52,7 +52,8 @@ export class RenderPipeline {
 
   private createPipeline(
     format: GPUTextureFormat,
-    vertex: GPUVertexState
+    vertex: GPUVertexState,
+    fragmentEntryPoint: string
   ): GPURenderPipeline {
     return this.device.createRenderPipeline({
       layout: this.device.createPipelineLayout({
@@ -61,7 +62,7 @@ export class RenderPipeline {
       vertex,
       fragment: {
         module: smartCompile(this.device, CommonState.shaderCode, shader),
-        entryPoint: 'fragment',
+        entryPoint: fragmentEntryPoint,
         targets: [
           {
             format,
@@ -69,7 +70,7 @@ export class RenderPipeline {
         ],
       },
       primitive: {
-        topology: 'triangle-strip',
+        topology: 'triangle-list',
       },
     });
   }
@@ -78,6 +79,10 @@ export class RenderPipeline {
     channelColors,
     backgroundColor,
     clarity,
+    renderTraceNormalizationFloor,
+    renderBrushColorBase,
+    renderBrushColorStrengthMultiplier,
+    backgroundGrainStrength,
   }: RenderSettings & {
     channelColors: Array<[number, number, number]>;
     backgroundColor: [number, number, number];
@@ -99,6 +104,10 @@ export class RenderPipeline {
     this.uniformValues[13] = backgroundColor[1];
     this.uniformValues[14] = backgroundColor[2];
     this.uniformValues[15] = clarity;
+    this.uniformValues[16] = renderTraceNormalizationFloor;
+    this.uniformValues[17] = renderBrushColorBase;
+    this.uniformValues[18] = renderBrushColorStrengthMultiplier;
+    this.uniformValues[19] = backgroundGrainStrength;
     writeFloat32BufferIfChanged(
       this.device,
       this.uniforms,
@@ -128,9 +137,8 @@ export class RenderPipeline {
     const passEncoder = commandEncoder.beginRenderPass(renderPassDescriptor);
     passEncoder.setPipeline(this.pipeline);
     this.commonState.execute(passEncoder);
-    passEncoder.setVertexBuffer(0, this.vertexBuffer);
     passEncoder.setBindGroup(1, bindGroup);
-    passEncoder.draw(4, 1);
+    passEncoder.draw(3, 1);
     passEncoder.end();
 
     return canvasTexture;
@@ -154,11 +162,10 @@ export class RenderPipeline {
         },
       ],
     });
-    passEncoder.setPipeline(this.pipeline);
+    passEncoder.setPipeline(this.sampledPipeline);
     this.commonState.execute(passEncoder);
-    passEncoder.setVertexBuffer(0, this.vertexBuffer);
     passEncoder.setBindGroup(1, bindGroup);
-    passEncoder.draw(4, 1);
+    passEncoder.draw(3, 1);
     passEncoder.end();
   }
 
@@ -206,7 +213,6 @@ export class RenderPipeline {
   }
 
   public destroy() {
-    this.vertexBuffer.destroy();
     this.uniforms.destroy();
   }
 
diff --git a/src/pipelines/render/render-settings.ts b/src/pipelines/render/render-settings.ts
index c329309..1b2d523 100644
--- a/src/pipelines/render/render-settings.ts
+++ b/src/pipelines/render/render-settings.ts
@@ -1,3 +1,7 @@
 export interface RenderSettings {
   clarity: number;
+  renderTraceNormalizationFloor: number;
+  renderBrushColorBase: number;
+  renderBrushColorStrengthMultiplier: number;
+  backgroundGrainStrength: number;
 }
diff --git a/src/pipelines/render/render.wgsl b/src/pipelines/render/render.wgsl
index a7d82d4..05f5c20 100644
--- a/src/pipelines/render/render.wgsl
+++ b/src/pipelines/render/render.wgsl
@@ -7,6 +7,10 @@ struct Settings {
   backgroundColorPadding2: f32,
   backgroundColor: vec3<f32>,
   clarity: f32,
+  traceNormalizationFloor: f32,
+  brushColorBase: f32,
+  brushColorStrengthMultiplier: f32,
+  backgroundGrainStrength: f32,
 };
 
 @group(1) @binding(0) var<uniform> settings: Settings;
@@ -15,9 +19,29 @@ struct Settings {
 @group(1) @binding(3) var sourceMap: texture_2d<f32>;
 
 @fragment
-fn fragment(@location(0) uv: vec2<f32>) -> @location(0) vec4<f32> {
+fn fragment(@builtin(position) position: vec4<f32>) -> @location(0) vec4<f32> {
+  let textureSize = vec2<i32>(textureDimensions(trailMap, 0));
+  let pixel = clamp(vec2<i32>(position.xy), vec2<i32>(0, 0), textureSize - vec2<i32>(1, 1));
+  let traces = textureLoad(trailMap, pixel, 0);
+  let sources = textureLoad(sourceMap, pixel, 0);
+  return renderColor(traces, sources, vec2<i32>(position.xy));
+}
+
+@fragment
+fn fragmentSampled(
+  @location(0) uv: vec2<f32>,
+  @builtin(position) position: vec4<f32>
+) -> @location(0) vec4<f32> {
   let traces = textureSample(trailMap, Sampler, uv);
   let sources = textureSample(sourceMap, Sampler, uv);
+  return renderColor(traces, sources, vec2<i32>(position.xy));
+}
+
+fn renderColor(traces: vec4<f32>, sources: vec4<f32>, pixel: vec2<i32>) -> vec4<f32> {
+  let background = getTexturedBackground(pixel);
+  if max(max(max(traces.r, traces.g), traces.b), max(max(sources.r, sources.g), sources.b)) <= 0.0 {
+    return vec4(background, 1);
+  }
 
   let traceStrengths = vec3(
     clarity(traces.r),
@@ -34,17 +58,19 @@ fn fragment(@location(0) uv: vec2<f32>) -> @location(0) vec4<f32> {
       strengths.r * settings.colorA
     + strengths.g * settings.colorB
     + strengths.b * settings.colorC;
-  let normalizedTraceColor = traceColor / max(1.0, strengths.r + strengths.g + strengths.b);
+  let normalizedTraceColor =
+    traceColor / max(settings.traceNormalizationFloor, strengths.r + strengths.g + strengths.b);
   let brushColor =
       sourceStrengths.r * settings.colorA
     + sourceStrengths.g * settings.colorB
     + sourceStrengths.b * settings.colorC;
-  let brushStrength = clamp(max(max(sourceStrengths.r, sourceStrengths.g), sourceStrengths.b), 0, 1);
-  let color = max(normalizedTraceColor, brushColor * (1.2 + brushStrength * 1.6));
-
-  let strength = clamp(max(max(max(strengths.r, strengths.g), strengths.b), brushStrength), 0, 1);
-  let background = getTexturedBackground(uv);
+  let brushStrength = max(max(sourceStrengths.r, sourceStrengths.g), sourceStrengths.b);
+  let color = max(
+    normalizedTraceColor,
+    brushColor * (settings.brushColorBase + brushStrength * settings.brushColorStrengthMultiplier)
+  );
 
+  let strength = max(max(strengths.r, strengths.g), strengths.b);
   return vec4(mix(background, clamp(color, vec3(0), vec3(1)), strength), 1);
 }
 
@@ -52,11 +78,14 @@ fn clarity(strength: f32) -> f32 {
   return pow(clamp(strength, 0, 1), settings.clarity);
 }
 
-fn getTexturedBackground(uv: vec2<f32>) -> vec3<f32> {
-  let noiseSize = vec2<f32>(textureDimensions(noise, 0));
-  let pixel = floor(uv * state.size);
-  let noiseCoord = vec2<i32>(fract(pixel / noiseSize) * noiseSize);
+fn getTexturedBackground(pixel: vec2<i32>) -> vec3<f32> {
+  let noiseSize = vec2<i32>(textureDimensions(noise, 0));
+  let noiseCoord = pixel % noiseSize;
   let grain = textureLoad(noise, noiseCoord, 0).r - 0.5;
 
-  return clamp(settings.backgroundColor + vec3(grain * 0.018), vec3(0), vec3(1));
+  return clamp(
+    settings.backgroundColor + vec3(grain * settings.backgroundGrainStrength),
+    vec3(0),
+    vec3(1)
+  );
 }
diff --git a/src/pipelines/wgsl-uniform-layout.test.ts b/src/pipelines/wgsl-uniform-layout.test.ts
index 62f8b26..1ccc1a9 100644
--- a/src/pipelines/wgsl-uniform-layout.test.ts
+++ b/src/pipelines/wgsl-uniform-layout.test.ts
@@ -8,8 +8,6 @@ import agentShader from './agents/agent.wgsl?raw';
 import { BrushPipeline } from './brush/brush-pipeline';
 import brushShader from './brush/brush.wgsl?raw';
 import { CommonState } from './common-state/common-state';
-import { CopyPipeline } from './copy/copy-pipeline';
-import copyShader from './copy/copy.wgsl?raw';
 import diffusionShader from './diffusion/diffuse.wgsl?raw';
 import { DiffusionPipeline } from './diffusion/diffusion-pipeline';
 import { EraserAgentPipeline } from './eraser/eraser-agent-pipeline';
@@ -103,7 +101,8 @@ describe('WGSL uniform layout contracts', () => {
       fieldNames: [
         'moveRate',
         'turnRate',
-        'sensorAngle',
+        'sensorAngleSin',
+        'sensorAngleCos',
         'sensorOffset',
         'turnWhenLost',
         'individualTrailWeight',
@@ -118,6 +117,21 @@ describe('WGSL uniform layout contracts', () => {
         'color3ToColor1',
         'color3ToColor2',
         'color3ToColor3',
+        'sourceAttractionWeight',
+        'sourceSlowMoveRate',
+        'sourceTrailWeightMultiplier',
+        'forwardRotationScale',
+        'introNearDistanceInner',
+        'introNearDistanceMin',
+        'introNearSensorOffsetMultiplier',
+        'introTargetAngleBlend',
+        'introProgressCutoff',
+        'introTurnRateMultiplier',
+        'introRandomTurnMultiplier',
+        'introFarMoveMultiplier',
+        'introNearMoveMultiplier',
+        'introStepStopDistance',
+        'randomTimeScale',
       ],
     });
     expectStructUniformLayout({
@@ -127,9 +141,17 @@ describe('WGSL uniform layout contracts', () => {
       fieldNames: [
         'brushSize',
         'brushSizeVariation',
-        'padding0',
-        'padding1',
+        'brushFeatherRatio',
+        'brushMinimumFeather',
         'brushValue',
+        'brushCoarseNoiseScale',
+        'brushGrainNoiseScale',
+        'brushGrainNoiseOffsetX',
+        'brushGrainNoiseOffsetY',
+        'brushDiscardThreshold',
+        'brushGrainMinStrength',
+        'brushGrainMaxStrength',
+        'brushGeometryRadius',
       ],
     });
     expectStructUniformLayout({
@@ -141,6 +163,10 @@ describe('WGSL uniform layout contracts', () => {
         'decayRateTrails',
         'inverseDiffusionRateBrush',
         'decayRateBrush',
+        'diffusionNeighborDivisor',
+        'brushDecayAlphaOffset',
+        'padding0',
+        'padding1',
       ],
     });
     expectStructUniformLayout({
@@ -156,6 +182,10 @@ describe('WGSL uniform layout contracts', () => {
         'backgroundColorPadding2',
         'backgroundColor',
         'clarity',
+        'traceNormalizationFloor',
+        'brushColorBase',
+        'brushColorStrengthMultiplier',
+        'backgroundGrainStrength',
       ],
     });
   });
@@ -165,25 +195,25 @@ describe('WGSL uniform layout contracts', () => {
       pipeline: EraserAgentPipeline,
       source: eraserAgentShader,
       structName: 'Settings',
-      fieldNames: ['agentCount', 'padding0', 'padding1', 'padding2'],
+      fieldNames: ['agentCount', 'eraserMaskAlphaThreshold', 'padding1', 'padding2'],
     });
     expectStructUniformLayout({
       pipeline: EraserTexturePipeline,
       source: eraserTextureShader,
       structName: 'Settings',
-      fieldNames: ['eraserRadiusSquared', 'padding0', 'padding1', 'padding2'],
+      fieldNames: [
+        'eraserRadiusSquared',
+        'lineDistanceEpsilon',
+        'clearRed',
+        'clearGreen',
+        'clearBlue',
+        'clearAlpha',
+        'padding0',
+        'padding1',
+      ],
     });
   });
 
-  it('keeps copy uniforms aligned with WGSL', () => {
-    const match = /var<uniform>\s+sourceScaler:\s*(?<type>[^;]+);/.exec(copyShader);
-
-    expect(match?.groups?.type).toBe('vec2<f32>');
-    expect(wgslFloatCountsByType[match?.groups?.type ?? '']).toBe(
-      getUniformCount(CopyPipeline)
-    );
-  });
-
   it('keeps agent-generation uniforms large enough for every generation shader', () => {
     const generationUniformCounts = [
       countUniformScalars(resizeShader, 'ResizeSettings'),
@@ -196,7 +226,7 @@ describe('WGSL uniform layout contracts', () => {
   });
 
   it('guards invalid high agent color indexes instead of treating them as color 3', () => {
-    expect(agentShader).toContain('agent.colorIndex < 0.0 || agent.colorIndex >= 2.5');
+    expect(agentShader).toContain('colorIndex < 0.0 || colorIndex >= 2.5');
     expect(agentShader).toContain('if colorIndex < 2.5');
     expect(agentShader).toContain('return vec3<f32>(0.0, 0.0, 0.0);');
   });
diff --git a/src/style/_toolbar.scss b/src/style/_toolbar.scss
index 4a1fede..b2ca779 100644
--- a/src/style/_toolbar.scss
+++ b/src/style/_toolbar.scss
@@ -161,7 +161,8 @@ html > body > aside.control-dock > .toolbar-row {
     padding-top: 7px;
     border-top: 1px solid rgb(255 255 255 / 12%);
 
-    > button {
+    > button,
+    > .audio-control > button {
       position: relative;
       width: 44px;
       height: 44px;
@@ -229,6 +230,143 @@ html > body > aside.control-dock > .toolbar-row {
       }
     }
 
+    > .audio-control {
+      display: flex;
+      align-items: center;
+      width: 132px;
+      height: 44px;
+      flex: 0 0 132px;
+      min-width: 0;
+      padding-right: 10px;
+      border: 1px solid transparent;
+      border-radius: 8px;
+      background: rgb(255 255 255 / 4%);
+      transition:
+        border-color var(--transition-time),
+        background-color var(--transition-time),
+        box-shadow var(--transition-time),
+        opacity var(--transition-time);
+
+      &:hover {
+        border-color: rgb(255 255 255 / 10%);
+        background: rgb(255 255 255 / 7%);
+      }
+
+      &:focus-within {
+        outline: 2px solid white;
+        outline-offset: 2px;
+      }
+
+      > button {
+        flex: 0 0 42px;
+        min-width: 42px;
+        border-color: transparent;
+
+        &:focus-visible {
+          outline: none;
+        }
+      }
+
+      > .volume-control {
+        position: relative;
+        display: grid;
+        align-items: center;
+        height: 44px;
+        flex: 1 1 auto;
+        min-width: 0;
+        padding-left: 3px;
+        cursor: ew-resize;
+        opacity: 0.96;
+        transition: opacity var(--transition-time);
+
+        &.muted {
+          opacity: 0.56;
+        }
+      }
+
+      > .volume-control input[type='range'] {
+        position: relative;
+        z-index: 1;
+        width: 100%;
+        height: 100%;
+        appearance: none;
+        background: transparent;
+        cursor: ew-resize;
+        outline: none;
+        touch-action: pan-y;
+
+        &:focus-visible {
+          outline: none;
+        }
+
+        &::-webkit-slider-runnable-track {
+          height: 4px;
+          border-radius: 999px;
+          background: linear-gradient(
+            90deg,
+            color-mix(in srgb, var(--accent-color) 62%, white 8%) 0
+              var(--volume-progress, 42%),
+            rgb(255 255 255 / 18%) var(--volume-progress, 42%) 100%
+          );
+          box-shadow:
+            inset 0 1px 1px rgb(0 0 0 / 24%),
+            0 1px 0 rgb(255 255 255 / 8%);
+          cursor: ew-resize;
+        }
+
+        &::-webkit-slider-thumb {
+          width: 12px;
+          height: 12px;
+          border: 2px solid rgb(13 18 24);
+          border-radius: 50%;
+          background: rgb(245 250 244);
+          box-shadow:
+            0 0 0 1px rgb(255 255 255 / 46%),
+            0 3px 8px rgb(0 0 0 / 28%);
+          margin-top: -4px;
+          appearance: none;
+          transition:
+            box-shadow var(--transition-time),
+            transform var(--transition-time);
+        }
+
+        &::-webkit-slider-thumb:hover {
+          box-shadow:
+            0 0 0 1px rgb(255 255 255 / 56%),
+            0 0 0 5px color-mix(in srgb, var(--accent-color) 25%, transparent),
+            0 4px 10px rgb(0 0 0 / 34%);
+          transform: scale(1.08);
+        }
+
+        &::-moz-range-track {
+          height: 4px;
+          border: 0;
+          border-radius: 999px;
+          background: linear-gradient(
+            90deg,
+            color-mix(in srgb, var(--accent-color) 62%, white 8%) 0
+              var(--volume-progress, 42%),
+            rgb(255 255 255 / 18%) var(--volume-progress, 42%) 100%
+          );
+          box-shadow:
+            inset 0 1px 1px rgb(0 0 0 / 24%),
+            0 1px 0 rgb(255 255 255 / 8%);
+        }
+
+        &::-moz-range-thumb {
+          width: 12px;
+          height: 12px;
+          border: 2px solid rgb(13 18 24);
+          border-radius: 50%;
+          background: rgb(245 250 244);
+          box-shadow:
+            0 0 0 1px rgb(255 255 255 / 46%),
+            0 3px 8px rgb(0 0 0 / 28%);
+          cursor: ew-resize;
+        }
+      }
+    }
+
     > .export-status {
       flex: 0 1 140px;
       min-height: 20px;
@@ -451,6 +589,22 @@ html > body > aside.control-dock > .toolbar-row {
           }
         }
 
+        > .audio-control {
+          width: 118px;
+          height: 38px;
+          flex-basis: 118px;
+          padding-right: 9px;
+
+          > button {
+            flex-basis: 38px;
+            min-width: 38px;
+          }
+
+          > .volume-control {
+            height: 38px;
+          }
+        }
+
         > .export-status {
           flex-basis: 100%;
           max-width: 100%;
diff --git a/src/utils/delta-time-calculator.ts b/src/utils/delta-time-calculator.ts
index c2c02d5..9603bea 100644
--- a/src/utils/delta-time-calculator.ts
+++ b/src/utils/delta-time-calculator.ts
@@ -5,10 +5,8 @@ export class DeltaTimeCalculator {
   private previousTime: DOMHighResTimeStamp | null = null;
 
   constructor(
-    private readonly maxDeltaTimeInSeconds: number = appConfig.deltaTime
-      .maxDeltaTimeSeconds,
-    private readonly minDeltaTimeInSeconds: number = appConfig.deltaTime
-      .minDeltaTimeSeconds
+    private readonly maxDeltaTimeInSeconds?: number,
+    private readonly minDeltaTimeInSeconds?: number
   ) {
     document.addEventListener('visibilitychange', this.handleVisibilityChange.bind(this));
   }
@@ -22,7 +20,7 @@ export class DeltaTimeCalculator {
 
     const delta = currentTime - this.previousTime;
     this.previousTime = currentTime;
-    return clamp(delta / 1000, this.minDeltaTimeInSeconds, this.maxDeltaTimeInSeconds);
+    return clamp(delta / 1000, this.minDeltaTime, this.maxDeltaTime);
   }
 
   private handleVisibilityChange() {
@@ -30,4 +28,12 @@ export class DeltaTimeCalculator {
       this.previousTime = null;
     }
   }
+
+  private get maxDeltaTime(): number {
+    return this.maxDeltaTimeInSeconds ?? appConfig.deltaTime.maxDeltaTimeSeconds;
+  }
+
+  private get minDeltaTime(): number {
+    return this.minDeltaTimeInSeconds ?? appConfig.deltaTime.minDeltaTimeSeconds;
+  }
 }
diff --git a/src/utils/graphics/full-screen-quad.ts b/src/utils/graphics/full-screen-quad.ts
index 3e9dbec..6a38f2a 100644
--- a/src/utils/graphics/full-screen-quad.ts
+++ b/src/utils/graphics/full-screen-quad.ts
@@ -1,65 +1,25 @@
 import { smartCompile } from './smart-compile';
 
-export const setUpFullScreenQuad = (
-  device: GPUDevice
-): {
-  buffer: GPUBuffer;
-  vertex: GPUVertexState;
-} => {
-  const buffer = device.createBuffer({
-    size: 4 * 4 * Float32Array.BYTES_PER_ELEMENT, // 4 x vec4<f32>
-    usage: GPUBufferUsage.VERTEX,
-    mappedAtCreation: true,
-  });
-  // prettier-ignore
-  const vertexData = [
-    // posX  posY U    V
-      -1.0, -1.0, 0.0, 1.0,
-      +1.0, -1.0, 1.0, 1.0,
-      -1.0, +1.0, 0.0, 0.0,
-      +1.0, +1.0, 1.0, 0.0,
-  ];
-  new Float32Array(buffer.getMappedRange()).set(vertexData);
-  buffer.unmap();
+export const setUpFullScreenQuad = (device: GPUDevice): GPUVertexState => ({
+  module: smartCompile(
+    device,
+    /* wgsl */ `
+    struct VertexOutput {
+      @builtin(position) position: vec4<f32>,
+      @location(0) uv: vec2<f32>,
+    }
 
-  return {
-    buffer,
-    vertex: {
-      module: smartCompile(
-        device,
-        /* wgsl */ `
-        struct VertexOutput {
-          @builtin(position) position: vec4<f32>,
-          @location(0) uv: vec2<f32>,
-        }
-        
-        @vertex
-        fn vertex(
-          @location(0) position: vec2<f32>,
-          @location(1) uv: vec2<f32>
-        ) -> VertexOutput {
-          return VertexOutput(vec4(position, 0.0, 1.0), uv);
-        }`
-      ),
-      entryPoint: 'vertex',
-      buffers: [
-        {
-          arrayStride: 4 * Float32Array.BYTES_PER_ELEMENT,
-          stepMode: 'vertex',
-          attributes: [
-            {
-              shaderLocation: 0,
-              offset: 0,
-              format: 'float32x2',
-            },
-            {
-              shaderLocation: 1,
-              offset: 8,
-              format: 'float32x2',
-            },
-          ],
-        },
-      ],
-    },
-  };
-};
+    @vertex
+    fn vertex(@builtin(vertex_index) vertexIndex: u32) -> VertexOutput {
+      let positions = array<vec2<f32>, 3>(
+        vec2<f32>(-1.0, -1.0),
+        vec2<f32>(3.0, -1.0),
+        vec2<f32>(-1.0, 3.0)
+      );
+      let position = positions[vertexIndex];
+      let uv = vec2<f32>(position.x * 0.5 + 0.5, 0.5 - position.y * 0.5);
+      return VertexOutput(vec4(position, 0.0, 1.0), uv);
+    }`
+  ),
+  entryPoint: 'vertex',
+});
diff --git a/src/utils/graphics/noise.ts b/src/utils/graphics/noise.ts
index da68d39..e267a85 100644
--- a/src/utils/graphics/noise.ts
+++ b/src/utils/graphics/noise.ts
@@ -1,8 +1,8 @@
+import { appConfig } from '../../config';
 import { setUpFullScreenQuad } from './full-screen-quad';
 import { smartCompile } from './smart-compile';
 
 const textureCache = new WeakMap<GPUDevice, Map<string, GPUTexture>>();
-const NOISE_TEXTURE_FORMAT: GPUTextureFormat = 'rgba8unorm';
 
 export const generateNoise = ({
   device,
@@ -13,7 +13,7 @@ export const generateNoise = ({
   width: number;
   height: number;
 }): GPUTextureView => {
-  const cacheKey = `${width}x${height}`;
+  const cacheKey = `${width}x${height}:${appConfig.pipelines.common.noiseTextureFormat}`;
   let deviceCache = textureCache.get(device);
   if (!deviceCache) {
     deviceCache = new Map<string, GPUTexture>();
@@ -25,8 +25,7 @@ export const generateNoise = ({
     return cached.createView();
   }
 
-  const { buffer, vertex } = setUpFullScreenQuad(device);
-  const vertexBuffer = buffer;
+  const vertex = setUpFullScreenQuad(device);
 
   const pipeline = device.createRenderPipeline({
     layout: 'auto',
@@ -36,28 +35,34 @@ export const generateNoise = ({
         device,
         /* wgsl */ `
         fn random_with_seed(uv: vec2<f32>, seed: f32) -> f32 {
-          return fract(sin(dot(uv, vec2(12.9898 + seed, 78.233 + seed)))* 43758.5453123 + seed);
+          return fract(sin(dot(
+            uv,
+            vec2(
+              ${appConfig.pipelines.common.noiseHashX} + seed,
+              ${appConfig.pipelines.common.noiseHashY} + seed
+            )
+          )) * ${appConfig.pipelines.common.noiseHashMultiplier} + seed);
         }
 
         @fragment
         fn fragment(@location(0) uv: vec2<f32>) -> @location(0) vec4<f32> {
           return vec4(
-            random_with_seed(uv, 0),
-            random_with_seed(uv, 1),
-            random_with_seed(uv, 2),
-            random_with_seed(uv, 3),
+            random_with_seed(uv, ${appConfig.pipelines.common.noiseChannelSeeds[0]}),
+            random_with_seed(uv, ${appConfig.pipelines.common.noiseChannelSeeds[1]}),
+            random_with_seed(uv, ${appConfig.pipelines.common.noiseChannelSeeds[2]}),
+            random_with_seed(uv, ${appConfig.pipelines.common.noiseChannelSeeds[3]}),
           );
         }`
       ),
       entryPoint: 'fragment',
       targets: [
         {
-          format: NOISE_TEXTURE_FORMAT,
+          format: appConfig.pipelines.common.noiseTextureFormat,
         },
       ],
     },
     primitive: {
-      topology: 'triangle-strip',
+      topology: 'triangle-list',
     },
   });
 
@@ -67,7 +72,7 @@ export const generateNoise = ({
       height,
       depthOrArrayLayers: 1,
     },
-    format: NOISE_TEXTURE_FORMAT,
+    format: appConfig.pipelines.common.noiseTextureFormat,
     usage: GPUTextureUsage.TEXTURE_BINDING | GPUTextureUsage.RENDER_ATTACHMENT,
   });
 
@@ -75,7 +80,7 @@ export const generateNoise = ({
     colorAttachments: [
       {
         view: colorTexture.createView(),
-        clearValue: { r: 1.0, g: 1.0, b: 1.0, a: 1.0 },
+        clearValue: appConfig.pipelines.common.noiseClearValue,
         loadOp: 'clear',
         storeOp: 'store',
       },
@@ -86,8 +91,10 @@ export const generateNoise = ({
 
   const passEncoder = commandEncoder.beginRenderPass(renderPassDescriptor);
   passEncoder.setPipeline(pipeline);
-  passEncoder.setVertexBuffer(0, vertexBuffer);
-  passEncoder.draw(4, 1);
+  passEncoder.draw(
+    appConfig.pipelines.common.noiseDrawVertexCount,
+    appConfig.pipelines.common.noiseDrawInstanceCount
+  );
   passEncoder.end();
 
   device.queue.submit([commandEncoder.finish()]);
diff --git a/src/utils/graphics/resizable-texture.ts b/src/utils/graphics/resizable-texture.ts
index 8099611..dd53998 100644
--- a/src/utils/graphics/resizable-texture.ts
+++ b/src/utils/graphics/resizable-texture.ts
@@ -1,7 +1,5 @@
 import { vec2 } from 'gl-matrix';
 
-import { CopyPipeline } from '../../pipelines/copy/copy-pipeline';
-
 export class ResizableTexture {
   private texture: GPUTexture;
   private textureView: GPUTextureView;
@@ -9,7 +7,6 @@ export class ResizableTexture {
 
   public constructor(
     private readonly device: GPUDevice,
-    private readonly copyPipeline: CopyPipeline,
     size: vec2
   ) {
     this.size = vec2.clone(size);
@@ -24,13 +21,27 @@ export class ResizableTexture {
 
     const newTexture = this.createTexture(size);
     const newTextureView = newTexture.createView();
+    const copySize = {
+      width: Math.min(this.size[0], size[0]),
+      height: Math.min(this.size[1], size[1]),
+    };
 
     const commandEncoder = this.device.createCommandEncoder();
-    this.copyPipeline.execute(
-      commandEncoder,
-      this.textureView,
-      newTextureView,
-      vec2.div(vec2.create(), this.size, size)
+    const clearPass = commandEncoder.beginRenderPass({
+      colorAttachments: [
+        {
+          view: newTextureView,
+          clearValue: { r: 0, g: 0, b: 0, a: 0 },
+          loadOp: 'clear',
+          storeOp: 'store',
+        },
+      ],
+    });
+    clearPass.end();
+    commandEncoder.copyTextureToTexture(
+      { texture: this.texture },
+      { texture: newTexture },
+      copySize
     );
     this.device.queue.submit([commandEncoder.finish()]);
     this.texture.destroy();
diff --git a/src/vibes.test.ts b/src/vibes.test.ts
index 730e2b4..198c87d 100644
--- a/src/vibes.test.ts
+++ b/src/vibes.test.ts
@@ -85,6 +85,48 @@ describe('vibe and audio config contract', () => {
     });
   });
 
+  it('keeps audio timing, graph, and density settings bounded', () => {
+    const { delay, generativePiano, graph, piano, rhythm } = gardenAudioConfig;
+
+    expect(rhythm.bpm).toBeGreaterThan(0);
+    expect(rhythm.stepsPerBeat).toBeGreaterThan(0);
+    expect(rhythm.stepsPerBar).toBeGreaterThanOrEqual(rhythm.stepsPerBeat);
+    expect(rhythm.lookaheadSeconds).toBeGreaterThanOrEqual(piano.scheduleAheadSeconds);
+
+    expect(delay.feedbackMin).toBeLessThanOrEqual(delay.feedback);
+    expect(delay.feedback).toBeLessThanOrEqual(delay.feedbackMax);
+    expect(delay.feedbackHighPassHz).toBeLessThan(delay.feedbackLowPassHz);
+    expect(delay.returnLowPassHz).toBeGreaterThan(delay.feedbackHighPassHz);
+
+    generativePiano.stylePools.forEach((register) => {
+      expect(register.midiMin).toBeLessThan(register.preferredMidi);
+      expect(register.preferredMidi).toBeLessThan(register.midiMax);
+    });
+    generativePiano.padRegisters.forEach((register) => {
+      expect(register.midiMin).toBeLessThan(register.preferredMidi);
+      expect(register.preferredMidi).toBeLessThan(register.midiMax);
+    });
+
+    expect(generativePiano.brushStreamIdleIntervalBeats).toBeGreaterThanOrEqual(
+      generativePiano.brushStreamActiveIntervalBeats
+    );
+    expect(generativePiano.brushStreamActiveIntervalBeats).toBeGreaterThanOrEqual(
+      generativePiano.brushStreamIntenseIntervalBeats
+    );
+    expect(generativePiano.brushStreamIntenseIntervalBeats).toBeGreaterThanOrEqual(
+      generativePiano.brushStreamManicIntervalBeats
+    );
+    expect(generativePiano.maxBrushPhraseLayers).toBeLessThanOrEqual(3);
+    expect(generativePiano.maxBrushStreamNotesPerBar).toBeLessThanOrEqual(
+      rhythm.stepsPerBar
+    );
+
+    Object.values(graph.pianoBusGains).forEach((gain) => {
+      expect(gain).toBeGreaterThan(0);
+      expect(gain).toBeLessThanOrEqual(1.2);
+    });
+  });
+
   it('falls back to finite RGB channels for malformed hex colors', () => {
     expect(hexToRgb('not-a-color')).toEqual([0, 0, 0]);
     expect(hexToRgb('#abcdzz')).toEqual([0, 0, 0]);